fix: use CLIDir for dolt remote operations instead of root Path (GH#2306, GH#2311)

Remote add/list/remove in cmd/bd/dolt.go used st.Path() which returns
.beads/dolt/ (the server root), not .beads/dolt/{database}/ where the
actual database lives. This caused remotes to be registered in the wrong
directory, making push/pull fail with "remote not found" or target the
empty root database.

Exported cliDir() as CLIDir() and switched all three remote operations
to use it, matching the behavior already used by Push() and Pull().

Reported-by: Shybko (GH#2306)
Reported-by: tha-hammer (GH#2311)
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: steveyegge

cmd/bd/dolt.go

@@ -555,7 +555,7 @@ var doltRemoteAddCmd = &cobra.Command{
 			os.Exit(1)
 		}
 		name, url := args[0], args[1]
-		dbPath := st.Path()
+		dbPath := st.CLIDir()
 
 		// Check existing remotes on both surfaces
 		sqlRemotes, _ := st.ListRemotes(ctx)
@@ -640,7 +640,7 @@ var doltRemoteListCmd = &cobra.Command{
 			fmt.Fprintf(os.Stderr, "Error: no store available\n")
 			os.Exit(1)
 		}
-		dbPath := st.Path()
+		dbPath := st.CLIDir()
 
 		sqlRemotes, sqlErr := st.ListRemotes(ctx)
 		if sqlErr != nil {
@@ -751,7 +751,7 @@ var doltRemoteRemoveCmd = &cobra.Command{
 			os.Exit(1)
 		}
 		name := args[0]
-		dbPath := st.Path()
+		dbPath := st.CLIDir()
 
 		// Check both surfaces for conflicts
 		sqlRemotes, _ := st.ListRemotes(ctx)

internal/storage/dolt/federation.go

@@ -278,12 +278,12 @@ func (s *DoltStore) isPeerGitProtocolRemote(ctx context.Context, peer string) bo
 				if !doltutil.IsGitProtocolURL(r.URL) {
 					return false
 				}
-				return s.cliDir() != "" && doltutil.FindCLIRemote(s.cliDir(), peer) != ""
+				return s.CLIDir() != "" && doltutil.FindCLIRemote(s.CLIDir(), peer) != ""
 			}
 		}
 	}
-	if s.cliDir() != "" {
-		if url := doltutil.FindCLIRemote(s.cliDir(), peer); url != "" {
+	if s.CLIDir() != "" {
+		if url := doltutil.FindCLIRemote(s.CLIDir(), peer); url != "" {
 			return doltutil.IsGitProtocolURL(url)
 		}
 	}
@@ -295,7 +295,7 @@ func (s *DoltStore) isPeerGitProtocolRemote(ctx context.Context, peer string) bo
 // Credentials are set on the subprocess environment only via cmd.Env.
 func (s *DoltStore) doltCLIPushToPeer(ctx context.Context, peer string, creds *remoteCredentials) error {
 	cmd := exec.CommandContext(ctx, "dolt", "push", peer, s.branch) // #nosec G204 -- fixed command with validated peer/branch
-	cmd.Dir = s.cliDir()
+	cmd.Dir = s.CLIDir()
 	creds.applyToCmd(cmd)
 	out, err := cmd.CombinedOutput()
 	if err != nil {
@@ -309,7 +309,7 @@ func (s *DoltStore) doltCLIPushToPeer(ctx context.Context, peer string, creds *r
 // Credentials are set on the subprocess environment only via cmd.Env.
 func (s *DoltStore) doltCLIPullFromPeer(ctx context.Context, peer string, creds *remoteCredentials) error {
 	cmd := exec.CommandContext(ctx, "dolt", "pull", peer, s.branch) // #nosec G204 -- fixed command with validated peer/branch
-	cmd.Dir = s.cliDir()
+	cmd.Dir = s.CLIDir()
 	creds.applyToCmd(cmd)
 	out, err := cmd.CombinedOutput()
 	if err != nil {
@@ -323,7 +323,7 @@ func (s *DoltStore) doltCLIPullFromPeer(ctx context.Context, peer string, creds
 // Credentials are set on the subprocess environment only via cmd.Env.
 func (s *DoltStore) doltCLIFetchFromPeer(ctx context.Context, peer string, creds *remoteCredentials) error {
 	cmd := exec.CommandContext(ctx, "dolt", "fetch", peer) // #nosec G204 -- fixed command with validated peer
-	cmd.Dir = s.cliDir()
+	cmd.Dir = s.CLIDir()
 	creds.applyToCmd(cmd)
 	out, err := cmd.CombinedOutput()
 	if err != nil {

internal/storage/dolt/store.go

@@ -1172,9 +1172,9 @@ func (s *DoltStore) Path() string {
 	return s.dbPath
 }
 
-// cliDir returns the directory for dolt CLI operations (push/pull/remote/fetch).
+// CLIDir returns the directory for dolt CLI operations (push/pull/remote/fetch).
 // The actual database lives in a subdirectory of dbPath named after the database.
-func (s *DoltStore) cliDir() string {
+func (s *DoltStore) CLIDir() string {
 	if s.dbPath == "" {
 		return ""
 	}
@@ -1409,13 +1409,13 @@ func (s *DoltStore) isGitProtocolRemote(ctx context.Context) bool {
 				// Verify remote exists in CLI directory before routing to CLI push/pull.
 				// When the dolt sql-server is externally managed, remotes may exist only
 				// on the server's filesystem, not in the local dbPath.
-				return s.cliDir() != "" && doltutil.FindCLIRemote(s.cliDir(), s.remote) != ""
+				return s.CLIDir() != "" && doltutil.FindCLIRemote(s.CLIDir(), s.remote) != ""
 			}
 		}
 	}
 	// Fall back to CLI remotes (covers drift where remote exists only in filesystem)
-	if s.cliDir() != "" {
-		if url := doltutil.FindCLIRemote(s.cliDir(), s.remote); url != "" {
+	if s.CLIDir() != "" {
+		if url := doltutil.FindCLIRemote(s.CLIDir(), s.remote); url != "" {
 			return doltutil.IsGitProtocolURL(url)
 		}
 	}
@@ -1443,7 +1443,7 @@ func (s *DoltStore) doltCLIPush(ctx context.Context, force bool, creds *remoteCr
 	}
 	args = append(args, s.remote, s.branch)
 	cmd := exec.CommandContext(ctx, "dolt", args...) // #nosec G204 -- fixed command with validated remote/branch
-	cmd.Dir = s.cliDir()
+	cmd.Dir = s.CLIDir()
 	creds.applyToCmd(cmd)
 	out, err := cmd.CombinedOutput()
 	if err != nil {
@@ -1459,7 +1459,7 @@ func (s *DoltStore) doltCLIPull(ctx context.Context, creds *remoteCredentials) e
 	ctx, cancel := context.WithTimeout(ctx, cliExecTimeout)
 	defer cancel()
 	cmd := exec.CommandContext(ctx, "dolt", "pull", s.remote, s.branch) // #nosec G204 -- fixed command
-	cmd.Dir = s.cliDir()
+	cmd.Dir = s.CLIDir()
 	creds.applyToCmd(cmd)
 	out, err := cmd.CombinedOutput()
 	if err != nil {