refactor(config): remove BEADS_DIR from agent environment and add doctor check (#455)

* fix(sling_test): update test for cook dir change The cook command no longer needs database context and runs from cwd, not the target rig directory. Update test to match this behavior change from bd2a5ab5. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(tests): skip tests requiring missing binaries, handle --allow-stale - Add skipIfAgentBinaryMissing helper to skip tests when codex/gemini binaries aren't available in the test environment - Update rig manager test stub to handle --allow-stale flag Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * refactor(config): remove BEADS_DIR from agent environment Stop exporting BEADS_DIR in AgentEnv - agents should use beads redirect mechanism instead of relying on environment variable. This prevents prefix mismatches when agents operate across different beads databases. Changes: - Remove BeadsDir field from AgentEnvConfig - Remove BEADS_DIR from env vars set on agent sessions - Update doctor env_check to not expect BEADS_DIR - Update all manager Start() calls to not pass BeadsDir Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix(doctor): detect BEADS_DIR in tmux session environment Add a doctor check that warns when BEADS_DIR is set in any Gas Town tmux session. BEADS_DIR in the environment overrides prefix-based routing and breaks multi-rig lookups - agents should use the beads redirect mechanism instead. The check: - Iterates over all Gas Town tmux sessions (gt-* and hq-*) - Checks if BEADS_DIR is set in the session environment - Returns a warning with fix hint to restart sessions Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: julianknutsen <julianknutsen@users.noreply.github> Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
2026-01-14 06:13:57 +00:00
parent 3cf77b2e8b
commit e7ca4908dc
19 changed files with 252 additions and 126 deletions
--- a/internal/config/env.go
+++ b/internal/config/env.go
@@ -25,13 +25,13 @@ type AgentEnvConfig struct {
 	// Sets GT_ROOT environment variable.
 	TownRoot string

-	// BeadsDir is the resolved BEADS_DIR path.
-	// Callers should use beads.ResolveBeadsDir() to compute this.
-	BeadsDir string
-
 	// RuntimeConfigDir is the optional CLAUDE_CONFIG_DIR path
 	RuntimeConfigDir string

+	// SessionIDEnv is the environment variable name that holds the session ID.
+	// Sets GT_SESSION_ID_ENV so the runtime knows where to find the session ID.
+	SessionIDEnv string
+
 	// BeadsNoDaemon sets BEADS_NO_DAEMON=1 if true
 	// Used for polecats that should bypass the beads daemon
 	BeadsNoDaemon bool
@@ -81,14 +81,11 @@ func AgentEnv(cfg AgentEnvConfig) map[string]string {
 		env["GIT_AUTHOR_NAME"] = cfg.AgentName
 	}

-	// Only set GT_ROOT and BEADS_DIR if provided
+	// Only set GT_ROOT if provided
 	// Empty values would override tmux session environment
 	if cfg.TownRoot != "" {
 		env["GT_ROOT"] = cfg.TownRoot
 	}
-	if cfg.BeadsDir != "" {
-		env["BEADS_DIR"] = cfg.BeadsDir
-	}

 	// Set BEADS_AGENT_NAME for polecat/crew (uses same format as BD_ACTOR)
 	if cfg.Role == "polecat" || cfg.Role == "crew" {
@@ -104,6 +101,11 @@ func AgentEnv(cfg AgentEnvConfig) map[string]string {
 		env["CLAUDE_CONFIG_DIR"] = cfg.RuntimeConfigDir
 	}

+	// Add session ID env var name if provided
+	if cfg.SessionIDEnv != "" {
+		env["GT_SESSION_ID_ENV"] = cfg.SessionIDEnv
+	}
+
 	return env
 }

--- a/internal/config/env_test.go
+++ b/internal/config/env_test.go
@@ -9,14 +9,12 @@ func TestAgentEnv_Mayor(t *testing.T) {
 	env := AgentEnv(AgentEnvConfig{
 		Role:     "mayor",
 		TownRoot: "/town",
-		BeadsDir: "/town/.beads",
 	})

 	assertEnv(t, env, "GT_ROLE", "mayor")
 	assertEnv(t, env, "BD_ACTOR", "mayor")
 	assertEnv(t, env, "GIT_AUTHOR_NAME", "mayor")
 	assertEnv(t, env, "GT_ROOT", "/town")
-	assertEnv(t, env, "BEADS_DIR", "/town/.beads")
 	assertNotSet(t, env, "GT_RIG")
 	assertNotSet(t, env, "BEADS_NO_DAEMON")
 }
@@ -27,7 +25,6 @@ func TestAgentEnv_Witness(t *testing.T) {
 		Role:     "witness",
 		Rig:      "myrig",
 		TownRoot: "/town",
-		BeadsDir: "/town/myrig/.beads",
 	})

 	assertEnv(t, env, "GT_ROLE", "witness")
@@ -35,7 +32,6 @@ func TestAgentEnv_Witness(t *testing.T) {
 	assertEnv(t, env, "BD_ACTOR", "myrig/witness")
 	assertEnv(t, env, "GIT_AUTHOR_NAME", "myrig/witness")
 	assertEnv(t, env, "GT_ROOT", "/town")
-	assertEnv(t, env, "BEADS_DIR", "/town/myrig/.beads")
 }

 func TestAgentEnv_Polecat(t *testing.T) {
@@ -45,7 +41,6 @@ func TestAgentEnv_Polecat(t *testing.T) {
 		Rig:           "myrig",
 		AgentName:     "Toast",
 		TownRoot:      "/town",
-		BeadsDir:      "/town/myrig/.beads",
 		BeadsNoDaemon: true,
 	})

@@ -65,7 +60,6 @@ func TestAgentEnv_Crew(t *testing.T) {
 		Rig:           "myrig",
 		AgentName:     "emma",
 		TownRoot:      "/town",
-		BeadsDir:      "/town/myrig/.beads",
 		BeadsNoDaemon: true,
 	})

@@ -84,7 +78,6 @@ func TestAgentEnv_Refinery(t *testing.T) {
 		Role:          "refinery",
 		Rig:           "myrig",
 		TownRoot:      "/town",
-		BeadsDir:      "/town/myrig/.beads",
 		BeadsNoDaemon: true,
 	})

@@ -100,14 +93,12 @@ func TestAgentEnv_Deacon(t *testing.T) {
 	env := AgentEnv(AgentEnvConfig{
 		Role:     "deacon",
 		TownRoot: "/town",
-		BeadsDir: "/town/.beads",
 	})

 	assertEnv(t, env, "GT_ROLE", "deacon")
 	assertEnv(t, env, "BD_ACTOR", "deacon")
 	assertEnv(t, env, "GIT_AUTHOR_NAME", "deacon")
 	assertEnv(t, env, "GT_ROOT", "/town")
-	assertEnv(t, env, "BEADS_DIR", "/town/.beads")
 	assertNotSet(t, env, "GT_RIG")
 	assertNotSet(t, env, "BEADS_NO_DAEMON")
 }
@@ -117,14 +108,12 @@ func TestAgentEnv_Boot(t *testing.T) {
 	env := AgentEnv(AgentEnvConfig{
 		Role:     "boot",
 		TownRoot: "/town",
-		BeadsDir: "/town/.beads",
 	})

 	assertEnv(t, env, "GT_ROLE", "boot")
 	assertEnv(t, env, "BD_ACTOR", "deacon-boot")
 	assertEnv(t, env, "GIT_AUTHOR_NAME", "boot")
 	assertEnv(t, env, "GT_ROOT", "/town")
-	assertEnv(t, env, "BEADS_DIR", "/town/.beads")
 	assertNotSet(t, env, "GT_RIG")
 	assertNotSet(t, env, "BEADS_NO_DAEMON")
 }
@@ -136,7 +125,6 @@ func TestAgentEnv_WithRuntimeConfigDir(t *testing.T) {
 		Rig:              "myrig",
 		AgentName:        "Toast",
 		TownRoot:         "/town",
-		BeadsDir:         "/town/myrig/.beads",
 		RuntimeConfigDir: "/home/user/.config/claude",
 	})

@@ -150,7 +138,6 @@ func TestAgentEnv_WithoutRuntimeConfigDir(t *testing.T) {
 		Rig:       "myrig",
 		AgentName: "Toast",
 		TownRoot:  "/town",
-		BeadsDir:  "/town/myrig/.beads",
 	})

 	assertNotSet(t, env, "CLAUDE_CONFIG_DIR")
@@ -163,28 +150,25 @@ func TestAgentEnvSimple(t *testing.T) {
 	assertEnv(t, env, "GT_ROLE", "polecat")
 	assertEnv(t, env, "GT_RIG", "myrig")
 	assertEnv(t, env, "GT_POLECAT", "Toast")
-	// Simple doesn't set TownRoot/BeadsDir, so keys should be absent
-	// (not empty strings which would override tmux session environment)
+	// Simple doesn't set TownRoot, so key should be absent
+	// (not empty string which would override tmux session environment)
 	assertNotSet(t, env, "GT_ROOT")
-	assertNotSet(t, env, "BEADS_DIR")
 }

-func TestAgentEnv_EmptyTownRootBeadsDirOmitted(t *testing.T) {
+func TestAgentEnv_EmptyTownRootOmitted(t *testing.T) {
 	t.Parallel()
-	// Regression test: empty TownRoot/BeadsDir should NOT create keys in the map.
-	// If they were set to empty strings, ExportPrefix would generate "export GT_ROOT= ..."
-	// which overrides tmux session environment where these are correctly set.
+	// Regression test: empty TownRoot should NOT create keys in the map.
+	// If it was set to empty string, ExportPrefix would generate "export GT_ROOT= ..."
+	// which overrides tmux session environment where it's correctly set.
 	env := AgentEnv(AgentEnvConfig{
 		Role:      "polecat",
 		Rig:       "myrig",
 		AgentName: "Toast",
 		TownRoot:  "", // explicitly empty
-		BeadsDir:  "", // explicitly empty
 	})

-	// Keys should be absent, not empty strings
+	// Key should be absent, not empty string
 	assertNotSet(t, env, "GT_ROOT")
-	assertNotSet(t, env, "BEADS_DIR")

 	// Other keys should still be set
 	assertEnv(t, env, "GT_ROLE", "polecat")
--- a/internal/config/loader.go
+++ b/internal/config/loader.go
@@ -1376,47 +1376,88 @@ func BuildStartupCommandWithAgentOverride(envVars map[string]string, rigPath, pr
 }

 // BuildAgentStartupCommand is a convenience function for starting agent sessions.
-// It sets standard environment variables (GT_ROLE, BD_ACTOR, GIT_AUTHOR_NAME)
-// and builds the full startup command.
-func BuildAgentStartupCommand(role, bdActor, rigPath, prompt string) string {
-	envVars := map[string]string{
-		"GT_ROLE":         role,
-		"BD_ACTOR":        bdActor,
-		"GIT_AUTHOR_NAME": bdActor,
-	}
+// It uses AgentEnv to set all standard environment variables.
+// For rig-level roles (witness, refinery), pass the rig name and rigPath.
+// For town-level roles (mayor, deacon, boot), pass empty rig and rigPath, but provide townRoot.
+func BuildAgentStartupCommand(role, rig, townRoot, rigPath, prompt string) string {
+	envVars := AgentEnv(AgentEnvConfig{
+		Role:     role,
+		Rig:      rig,
+		TownRoot: townRoot,
+	})
 	return BuildStartupCommand(envVars, rigPath, prompt)
 }

 // BuildAgentStartupCommandWithAgentOverride is like BuildAgentStartupCommand, but uses agentOverride if non-empty.
-func BuildAgentStartupCommandWithAgentOverride(role, bdActor, rigPath, prompt, agentOverride string) (string, error) {
-	envVars := map[string]string{
-		"GT_ROLE":         role,
-		"BD_ACTOR":        bdActor,
-		"GIT_AUTHOR_NAME": bdActor,
-	}
+func BuildAgentStartupCommandWithAgentOverride(role, rig, townRoot, rigPath, prompt, agentOverride string) (string, error) {
+	envVars := AgentEnv(AgentEnvConfig{
+		Role:     role,
+		Rig:      rig,
+		TownRoot: townRoot,
+	})
 	return BuildStartupCommandWithAgentOverride(envVars, rigPath, prompt, agentOverride)
 }

 // BuildPolecatStartupCommand builds the startup command for a polecat.
-// Sets GT_ROLE, GT_RIG, GT_POLECAT, BD_ACTOR, and GIT_AUTHOR_NAME.
+// Sets GT_ROLE, GT_RIG, GT_POLECAT, BD_ACTOR, GIT_AUTHOR_NAME, and GT_ROOT.
 func BuildPolecatStartupCommand(rigName, polecatName, rigPath, prompt string) string {
-	return BuildStartupCommand(AgentEnvSimple("polecat", rigName, polecatName), rigPath, prompt)
+	var townRoot string
+	if rigPath != "" {
+		townRoot = filepath.Dir(rigPath)
+	}
+	envVars := AgentEnv(AgentEnvConfig{
+		Role:      "polecat",
+		Rig:       rigName,
+		AgentName: polecatName,
+		TownRoot:  townRoot,
+	})
+	return BuildStartupCommand(envVars, rigPath, prompt)
 }

 // BuildPolecatStartupCommandWithAgentOverride is like BuildPolecatStartupCommand, but uses agentOverride if non-empty.
 func BuildPolecatStartupCommandWithAgentOverride(rigName, polecatName, rigPath, prompt, agentOverride string) (string, error) {
-	return BuildStartupCommandWithAgentOverride(AgentEnvSimple("polecat", rigName, polecatName), rigPath, prompt, agentOverride)
+	var townRoot string
+	if rigPath != "" {
+		townRoot = filepath.Dir(rigPath)
+	}
+	envVars := AgentEnv(AgentEnvConfig{
+		Role:      "polecat",
+		Rig:       rigName,
+		AgentName: polecatName,
+		TownRoot:  townRoot,
+	})
+	return BuildStartupCommandWithAgentOverride(envVars, rigPath, prompt, agentOverride)
 }

 // BuildCrewStartupCommand builds the startup command for a crew member.
-// Sets GT_ROLE, GT_RIG, GT_CREW, BD_ACTOR, and GIT_AUTHOR_NAME.
+// Sets GT_ROLE, GT_RIG, GT_CREW, BD_ACTOR, GIT_AUTHOR_NAME, and GT_ROOT.
 func BuildCrewStartupCommand(rigName, crewName, rigPath, prompt string) string {
-	return BuildStartupCommand(AgentEnvSimple("crew", rigName, crewName), rigPath, prompt)
+	var townRoot string
+	if rigPath != "" {
+		townRoot = filepath.Dir(rigPath)
+	}
+	envVars := AgentEnv(AgentEnvConfig{
+		Role:      "crew",
+		Rig:       rigName,
+		AgentName: crewName,
+		TownRoot:  townRoot,
+	})
+	return BuildStartupCommand(envVars, rigPath, prompt)
 }

 // BuildCrewStartupCommandWithAgentOverride is like BuildCrewStartupCommand, but uses agentOverride if non-empty.
 func BuildCrewStartupCommandWithAgentOverride(rigName, crewName, rigPath, prompt, agentOverride string) (string, error) {
-	return BuildStartupCommandWithAgentOverride(AgentEnvSimple("crew", rigName, crewName), rigPath, prompt, agentOverride)
+	var townRoot string
+	if rigPath != "" {
+		townRoot = filepath.Dir(rigPath)
+	}
+	envVars := AgentEnv(AgentEnvConfig{
+		Role:      "crew",
+		Rig:       rigName,
+		AgentName: crewName,
+		TownRoot:  townRoot,
+	})
+	return BuildStartupCommandWithAgentOverride(envVars, rigPath, prompt, agentOverride)
 }

 // ExpectedPaneCommands returns tmux pane command names that indicate the runtime is running.
--- a/internal/config/loader_test.go
+++ b/internal/config/loader_test.go
@@ -939,7 +939,8 @@ func TestBuildAgentStartupCommand(t *testing.T) {
 	t.Cleanup(func() { _ = os.Chdir(origWD) })

 	// Test without rig config (uses defaults)
-	cmd := BuildAgentStartupCommand("witness", "gastown/witness", "", "")
+	// New signature: (role, rig, townRoot, rigPath, prompt)
+	cmd := BuildAgentStartupCommand("witness", "gastown", "", "", "")

 	// Should contain environment exports and claude command
 	if !strings.Contains(cmd, "export") {
@@ -1121,7 +1122,8 @@ func TestBuildAgentStartupCommandWithAgentOverride(t *testing.T) {
 	}

 	t.Run("empty override uses default agent", func(t *testing.T) {
-		cmd, err := BuildAgentStartupCommandWithAgentOverride("mayor", "mayor", "", "", "")
+		// New signature: (role, rig, townRoot, rigPath, prompt, agentOverride)
+		cmd, err := BuildAgentStartupCommandWithAgentOverride("mayor", "", "", "", "", "")
 		if err != nil {
 			t.Fatalf("BuildAgentStartupCommandWithAgentOverride: %v", err)
 		}
@@ -1137,7 +1139,8 @@ func TestBuildAgentStartupCommandWithAgentOverride(t *testing.T) {
 	})

 	t.Run("override switches agent", func(t *testing.T) {
-		cmd, err := BuildAgentStartupCommandWithAgentOverride("mayor", "mayor", "", "", "codex")
+		// New signature: (role, rig, townRoot, rigPath, prompt, agentOverride)
+		cmd, err := BuildAgentStartupCommandWithAgentOverride("mayor", "", "", "", "", "codex")
 		if err != nil {
 			t.Fatalf("BuildAgentStartupCommandWithAgentOverride: %v", err)
 		}
@@ -1317,7 +1320,7 @@ func TestBuildAgentStartupCommand_UsesRoleAgents(t *testing.T) {
 	}

 	// BuildAgentStartupCommand passes role via GT_ROLE env var
-	cmd := BuildAgentStartupCommand(constants.RoleRefinery, "testrig/refinery", rigPath, "")
+	cmd := BuildAgentStartupCommand(constants.RoleRefinery, "testrig", townRoot, rigPath, "")
 	if !strings.Contains(cmd, "codex") {
 		t.Fatalf("expected codex for refinery role, got: %q", cmd)
 	}