Merge polecat/nux: fix patrol wisp database routing (gt-ctir)

Author: steveyegge

internal/beads/beads_agent.go

@@ -84,6 +84,7 @@ type AgentFields struct {
 // Agent state constants for the agent_state field in agent beads.
 // These represent the beads-level agent lifecycle state, which is distinct from
 // the polecat.State lifecycle type (though values overlap).
+// Note: AgentStateIdle and AgentStateStuck are declared above in the primary block.
 const (
 	AgentStateAwaitingGate = "awaiting-gate" // Waiting for a gate condition, intentional pause
 )

internal/cmd/bd_helpers.go

@@ -17,6 +17,7 @@ type bdCmd struct {
 	stderr     io.Writer
 	autoCommit bool
 	gtRoot     string
+	beadsDir   string
 }
 
 // BdCmd creates a new bd command builder with the given arguments.
@@ -50,6 +51,15 @@ func (b *bdCmd) WithGTRoot(root string) *bdCmd {
 	return b
 }
 
+// WithBeadsDir sets BEADS_DIR explicitly in the environment.
+// This prevents inherited BEADS_DIR from the parent process from causing
+// bd to write to the wrong database. The dir should be the resolved
+// .beads directory path (e.g., from beads.ResolveBeadsDir).
+func (b *bdCmd) WithBeadsDir(dir string) *bdCmd {
+	b.beadsDir = dir
+	return b
+}
+
 // Dir sets the working directory for the command.
 func (b *bdCmd) Dir(dir string) *bdCmd {
 	b.dir = dir
@@ -96,6 +106,14 @@ func (b *bdCmd) buildEnv() []string {
 		env = append(env, "GT_ROOT="+b.gtRoot)
 	}
 
+	// Add BEADS_DIR if specified.
+	// This prevents inherited BEADS_DIR from causing bd to target the wrong
+	// database (e.g., HQ instead of rig). See gt-ctir.
+	if b.beadsDir != "" {
+		env = filterEnvKey(env, "BEADS_DIR")
+		env = append(env, "BEADS_DIR="+b.beadsDir)
+	}
+
 	return env
 }
 

internal/cmd/bd_helpers_test.go

@@ -400,6 +400,71 @@ func TestBdCmd_EnvImmutability(t *testing.T) {
 	}
 }
 
+func TestBdCmd_WithBeadsDir_SetsEnv(t *testing.T) {
+	// WithBeadsDir should set BEADS_DIR in the environment
+	bdc := BdCmd("show", "id").
+		WithBeadsDir("/town/rig/mayor/rig/.beads")
+	cmd := bdc.Build()
+	envMap := parseEnv(cmd.Env)
+
+	if envMap["BEADS_DIR"] != "/town/rig/mayor/rig/.beads" {
+		t.Errorf("BEADS_DIR = %q, want %q", envMap["BEADS_DIR"], "/town/rig/mayor/rig/.beads")
+	}
+}
+
+func TestBdCmd_WithBeadsDir_OverridesInherited(t *testing.T) {
+	// WithBeadsDir should override an inherited BEADS_DIR from the parent
+	// process. This is the core fix for gt-ctir: without overriding,
+	// bd could write to the wrong database (HQ instead of rig).
+	baseEnv := []string{"PATH=/usr/bin", "BEADS_DIR=/town/.beads", "HOME=/home/user"}
+
+	bdc := &bdCmd{
+		args:   []string{"mol", "wisp", "create", "proto-id"},
+		env:    baseEnv,
+		stderr: os.Stderr,
+	}
+	bdc.WithBeadsDir("/town/rig/mayor/rig/.beads")
+	cmd := bdc.Build()
+	envMap := parseEnv(cmd.Env)
+
+	if envMap["BEADS_DIR"] != "/town/rig/mayor/rig/.beads" {
+		t.Errorf("BEADS_DIR = %q, want %q (should override inherited)", envMap["BEADS_DIR"], "/town/rig/mayor/rig/.beads")
+	}
+
+	// Verify exactly one BEADS_DIR entry (deduplication)
+	count := 0
+	for _, e := range cmd.Env {
+		if strings.HasPrefix(e, "BEADS_DIR=") {
+			count++
+		}
+	}
+	if count != 1 {
+		t.Errorf("found %d BEADS_DIR entries, want 1 (dedup must remove old)", count)
+	}
+}
+
+func TestBdCmd_EmptyBeadsDir_Skipped(t *testing.T) {
+	// Empty WithBeadsDir should not add BEADS_DIR to env
+	bdc := BdCmd("show", "id").
+		WithBeadsDir("")
+	bdc.env = filterEnv(bdc.env, "BEADS_DIR")
+	cmd := bdc.Build()
+
+	for _, e := range cmd.Env {
+		if strings.HasPrefix(e, "BEADS_DIR=") {
+			t.Errorf("BEADS_DIR should not be added when empty, found: %s", e)
+		}
+	}
+}
+
+func TestBdCmd_WithBeadsDir_Chaining(t *testing.T) {
+	// WithBeadsDir should return receiver for chaining
+	bdc := BdCmd("test")
+	if bdc.WithBeadsDir("/test") != bdc {
+		t.Error("WithBeadsDir() should return receiver for chaining")
+	}
+}
+
 // filterEnv returns env with all entries matching the given key prefix removed.
 func filterEnv(env []string, key string) []string {
 	prefix := key + "="

internal/cmd/patrol_helpers.go

@@ -144,6 +144,11 @@ func formatBeadLine(issue *beads.Issue) string {
 // autoSpawnPatrol creates and pins a new patrol wisp.
 // Returns the patrol ID or an error.
 func autoSpawnPatrol(cfg PatrolConfig) (string, error) {
+	// Resolve the beads directory following redirects.
+	// This ensures bd targets the correct database (e.g., rig database
+	// instead of HQ) regardless of inherited BEADS_DIR. See gt-ctir.
+	resolvedBeadsDir := beads.ResolveBeadsDir(cfg.BeadsDir)
+
 	// Find the proto ID for the patrol molecule
 	cmdCatalog := exec.Command("gt", "formula", "list")
 	cmdCatalog.Dir = cfg.BeadsDir
@@ -184,6 +189,7 @@ func autoSpawnPatrol(cfg PatrolConfig) (string, error) {
 	}
 	cmdSpawn := BdCmd(spawnArgs...).
 		WithAutoCommit().
+		WithBeadsDir(resolvedBeadsDir).
 		Dir(cfg.BeadsDir).
 		Build()
 	var stdoutSpawn, stderrSpawn bytes.Buffer
@@ -227,6 +233,7 @@ func autoSpawnPatrol(cfg PatrolConfig) (string, error) {
 	// Hook the wisp to the agent so gt mol status sees it
 	if err := BdCmd("update", patrolID, "--status=hooked", "--assignee="+cfg.Assignee).
 		WithAutoCommit().
+		WithBeadsDir(resolvedBeadsDir).
 		Dir(cfg.BeadsDir).
 		Run(); err != nil {
 		return patrolID, fmt.Errorf("created wisp %s but failed to hook", patrolID)