johno/gastown
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: SetupRedirect now works with tracked beads architecture

Browse Source 
The SetupRedirect function was failing for rigs that use the tracked
beads architecture where the canonical beads location is mayor/rig/.beads
and there is no rig-level .beads directory.

This fix now checks for both locations:
1. rig/.beads (with optional redirect to mayor/rig/.beads)
2. mayor/rig/.beads directly (if no rig/.beads exists)

This ensures crew and polecat workspaces get the correct redirect file
pointing to the shared beads database in all configurations.

Closes: gt-jy77g

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
max
2026-01-07 22:09:53 -08:00
committed by Steve Yegge
parent c4d956ebe7
commit f4cbcb4ce9
2 changed files with 85 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
internal/beads/beads_test.go
View File

@@ -1741,7 +1741,7 @@ func TestSetupRedirect(t *testing.T) {
rigRoot := filepath.Join(townRoot, "testrig")
crewPath := filepath.Join(rigRoot, "crew", "max")
// No rig/.beads created
// No rig/.beads or mayor/rig/.beads created
if err := os.MkdirAll(crewPath, 0755); err != nil {
t.Fatalf("mkdir crew: %v", err)
}
@@ -1751,4 +1751,44 @@ func TestSetupRedirect(t *testing.T) {
t.Error("SetupRedirect should fail if rig .beads missing")
}
})
t.Run("crew worktree with mayor/rig beads only", func(t *testing.T) {
// Setup: no rig/.beads, only mayor/rig/.beads exists
// This is the tracked beads architecture where rig root has no .beads directory
townRoot := t.TempDir()
rigRoot := filepath.Join(townRoot, "testrig")
mayorRigBeads := filepath.Join(rigRoot, "mayor", "rig", ".beads")
crewPath := filepath.Join(rigRoot, "crew", "max")
// Create only mayor/rig/.beads (no rig/.beads)
if err := os.MkdirAll(mayorRigBeads, 0755); err != nil {
t.Fatalf("mkdir mayor/rig beads: %v", err)
}
if err := os.MkdirAll(crewPath, 0755); err != nil {
t.Fatalf("mkdir crew: %v", err)
}
// Run SetupRedirect - should succeed and point to mayor/rig/.beads
if err := SetupRedirect(townRoot, crewPath); err != nil {
t.Fatalf("SetupRedirect failed: %v", err)
}
// Verify redirect points to mayor/rig/.beads
redirectPath := filepath.Join(crewPath, ".beads", "redirect")
content, err := os.ReadFile(redirectPath)
if err != nil {
t.Fatalf("read redirect: %v", err)
}
want := "../../mayor/rig/.beads\n"
if string(content) != want {
t.Errorf("redirect content = %q, want %q", string(content), want)
}
// Verify redirect resolves correctly
resolved := ResolveBeadsDir(crewPath)
if resolved != mayorRigBeads {
t.Errorf("resolved = %q, want %q", resolved, mayorRigBeads)
}
})
}