9d7dcde1e2
* feat: Beads redirect architecture for tracked and local beads This change implements proper redirect handling so that all rig agents (Witness, Refinery, Crew, Polecats) can work with both: - Tracked beads: .beads/ checked into git at mayor/rig/.beads - Local beads: .beads/ created at rig root during gt rig add Key changes: 1. SetupRedirect now handles tracked beads by skipping redirect chains. The bd CLI doesn't support chains (A→B→C), so worktrees redirect directly to the final destination (mayor/rig/.beads for tracked). 2. ResolveBeadsDir is now used consistently in polecat and refinery managers instead of hardcoded mayor/rig paths. 3. Rig-level agents (witness, refinery) now use rig beads with rig prefix instead of town beads. This follows the architecture where town beads are only for Mayor/Deacon. 4. prime.go simplified to always use ../../.beads for crew redirects, letting rig-level redirect handle tracked vs local routing. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * feat(doctor): Add beads-redirect check for tracked beads When a repo has .beads/ tracked in git (at mayor/rig/.beads), the rig root needs a redirect file pointing to that location. This check: - Detects missing rig-level redirect for tracked beads - Verifies redirect points to correct location (mayor/rig/.beads) - Auto-fixes with 'gt doctor --fix' 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> * fix: Handle fileLock.Unlock error in daemon Wrap fileLock.Unlock() return value to satisfy errcheck linter. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.5 <noreply@anthropic.com>
456 lines
13 KiB
Go
456 lines
13 KiB
Go
package doctor
|
|
|
|
import (
|
|
"os"
|
|
"path/filepath"
|
|
"strings"
|
|
"testing"
|
|
)
|
|
|
|
func TestNewBeadsRedirectCheck(t *testing.T) {
|
|
check := NewBeadsRedirectCheck()
|
|
|
|
if check.Name() != "beads-redirect" {
|
|
t.Errorf("expected name 'beads-redirect', got %q", check.Name())
|
|
}
|
|
|
|
if !check.CanFix() {
|
|
t.Error("expected CanFix to return true")
|
|
}
|
|
}
|
|
|
|
func TestBeadsRedirectCheck_NoRigSpecified(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
|
|
check := NewBeadsRedirectCheck()
|
|
ctx := &CheckContext{TownRoot: tmpDir, RigName: ""}
|
|
|
|
result := check.Run(ctx)
|
|
|
|
if result.Status != StatusOK {
|
|
t.Errorf("expected StatusOK when no rig specified, got %v", result.Status)
|
|
}
|
|
if !strings.Contains(result.Message, "skipping") {
|
|
t.Errorf("expected message about skipping, got %q", result.Message)
|
|
}
|
|
}
|
|
|
|
func TestBeadsRedirectCheck_NoBeadsAtAll(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
rigName := "testrig"
|
|
rigDir := filepath.Join(tmpDir, rigName)
|
|
if err := os.MkdirAll(rigDir, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
check := NewBeadsRedirectCheck()
|
|
ctx := &CheckContext{TownRoot: tmpDir, RigName: rigName}
|
|
|
|
result := check.Run(ctx)
|
|
|
|
if result.Status != StatusError {
|
|
t.Errorf("expected StatusError when no beads exist (fixable), got %v", result.Status)
|
|
}
|
|
}
|
|
|
|
func TestBeadsRedirectCheck_LocalBeadsOnly(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
rigName := "testrig"
|
|
rigDir := filepath.Join(tmpDir, rigName)
|
|
|
|
// Create local beads at rig root (no mayor/rig/.beads)
|
|
localBeads := filepath.Join(rigDir, ".beads")
|
|
if err := os.MkdirAll(localBeads, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
check := NewBeadsRedirectCheck()
|
|
ctx := &CheckContext{TownRoot: tmpDir, RigName: rigName}
|
|
|
|
result := check.Run(ctx)
|
|
|
|
if result.Status != StatusOK {
|
|
t.Errorf("expected StatusOK for local beads (no redirect needed), got %v", result.Status)
|
|
}
|
|
if !strings.Contains(result.Message, "local beads") {
|
|
t.Errorf("expected message about local beads, got %q", result.Message)
|
|
}
|
|
}
|
|
|
|
func TestBeadsRedirectCheck_TrackedBeadsMissingRedirect(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
rigName := "testrig"
|
|
rigDir := filepath.Join(tmpDir, rigName)
|
|
|
|
// Create tracked beads at mayor/rig/.beads
|
|
trackedBeads := filepath.Join(rigDir, "mayor", "rig", ".beads")
|
|
if err := os.MkdirAll(trackedBeads, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
check := NewBeadsRedirectCheck()
|
|
ctx := &CheckContext{TownRoot: tmpDir, RigName: rigName}
|
|
|
|
result := check.Run(ctx)
|
|
|
|
if result.Status != StatusError {
|
|
t.Errorf("expected StatusError for missing redirect, got %v", result.Status)
|
|
}
|
|
if !strings.Contains(result.Message, "Missing") {
|
|
t.Errorf("expected message about missing redirect, got %q", result.Message)
|
|
}
|
|
}
|
|
|
|
func TestBeadsRedirectCheck_TrackedBeadsCorrectRedirect(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
rigName := "testrig"
|
|
rigDir := filepath.Join(tmpDir, rigName)
|
|
|
|
// Create tracked beads at mayor/rig/.beads
|
|
trackedBeads := filepath.Join(rigDir, "mayor", "rig", ".beads")
|
|
if err := os.MkdirAll(trackedBeads, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Create rig-level .beads with correct redirect
|
|
rigBeads := filepath.Join(rigDir, ".beads")
|
|
if err := os.MkdirAll(rigBeads, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
redirectPath := filepath.Join(rigBeads, "redirect")
|
|
if err := os.WriteFile(redirectPath, []byte("mayor/rig/.beads\n"), 0644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
check := NewBeadsRedirectCheck()
|
|
ctx := &CheckContext{TownRoot: tmpDir, RigName: rigName}
|
|
|
|
result := check.Run(ctx)
|
|
|
|
if result.Status != StatusOK {
|
|
t.Errorf("expected StatusOK for correct redirect, got %v", result.Status)
|
|
}
|
|
if !strings.Contains(result.Message, "correctly configured") {
|
|
t.Errorf("expected message about correct config, got %q", result.Message)
|
|
}
|
|
}
|
|
|
|
func TestBeadsRedirectCheck_TrackedBeadsWrongRedirect(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
rigName := "testrig"
|
|
rigDir := filepath.Join(tmpDir, rigName)
|
|
|
|
// Create tracked beads at mayor/rig/.beads
|
|
trackedBeads := filepath.Join(rigDir, "mayor", "rig", ".beads")
|
|
if err := os.MkdirAll(trackedBeads, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Create rig-level .beads with wrong redirect
|
|
rigBeads := filepath.Join(rigDir, ".beads")
|
|
if err := os.MkdirAll(rigBeads, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
redirectPath := filepath.Join(rigBeads, "redirect")
|
|
if err := os.WriteFile(redirectPath, []byte("wrong/path\n"), 0644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
check := NewBeadsRedirectCheck()
|
|
ctx := &CheckContext{TownRoot: tmpDir, RigName: rigName}
|
|
|
|
result := check.Run(ctx)
|
|
|
|
if result.Status != StatusError {
|
|
t.Errorf("expected StatusError for wrong redirect (fixable), got %v", result.Status)
|
|
}
|
|
if !strings.Contains(result.Message, "wrong/path") {
|
|
t.Errorf("expected message to contain wrong path, got %q", result.Message)
|
|
}
|
|
}
|
|
|
|
func TestBeadsRedirectCheck_FixWrongRedirect(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
rigName := "testrig"
|
|
rigDir := filepath.Join(tmpDir, rigName)
|
|
|
|
// Create tracked beads at mayor/rig/.beads
|
|
trackedBeads := filepath.Join(rigDir, "mayor", "rig", ".beads")
|
|
if err := os.MkdirAll(trackedBeads, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Create rig-level .beads with wrong redirect
|
|
rigBeads := filepath.Join(rigDir, ".beads")
|
|
if err := os.MkdirAll(rigBeads, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
redirectPath := filepath.Join(rigBeads, "redirect")
|
|
if err := os.WriteFile(redirectPath, []byte("wrong/path\n"), 0644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
check := NewBeadsRedirectCheck()
|
|
ctx := &CheckContext{TownRoot: tmpDir, RigName: rigName}
|
|
|
|
// Verify fix is needed
|
|
result := check.Run(ctx)
|
|
if result.Status != StatusError {
|
|
t.Fatalf("expected StatusError before fix, got %v", result.Status)
|
|
}
|
|
|
|
// Apply fix
|
|
if err := check.Fix(ctx); err != nil {
|
|
t.Fatalf("Fix failed: %v", err)
|
|
}
|
|
|
|
// Verify redirect was corrected
|
|
content, err := os.ReadFile(redirectPath)
|
|
if err != nil {
|
|
t.Fatalf("redirect file not found: %v", err)
|
|
}
|
|
if string(content) != "mayor/rig/.beads\n" {
|
|
t.Errorf("redirect content = %q, want 'mayor/rig/.beads\\n'", string(content))
|
|
}
|
|
|
|
// Verify check now passes
|
|
result = check.Run(ctx)
|
|
if result.Status != StatusOK {
|
|
t.Errorf("expected StatusOK after fix, got %v", result.Status)
|
|
}
|
|
}
|
|
|
|
func TestBeadsRedirectCheck_Fix(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
rigName := "testrig"
|
|
rigDir := filepath.Join(tmpDir, rigName)
|
|
|
|
// Create tracked beads at mayor/rig/.beads
|
|
trackedBeads := filepath.Join(rigDir, "mayor", "rig", ".beads")
|
|
if err := os.MkdirAll(trackedBeads, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
check := NewBeadsRedirectCheck()
|
|
ctx := &CheckContext{TownRoot: tmpDir, RigName: rigName}
|
|
|
|
// Verify fix is needed
|
|
result := check.Run(ctx)
|
|
if result.Status != StatusError {
|
|
t.Fatalf("expected StatusError before fix, got %v", result.Status)
|
|
}
|
|
|
|
// Apply fix
|
|
if err := check.Fix(ctx); err != nil {
|
|
t.Fatalf("Fix failed: %v", err)
|
|
}
|
|
|
|
// Verify redirect file was created
|
|
redirectPath := filepath.Join(rigDir, ".beads", "redirect")
|
|
content, err := os.ReadFile(redirectPath)
|
|
if err != nil {
|
|
t.Fatalf("redirect file not created: %v", err)
|
|
}
|
|
|
|
expected := "mayor/rig/.beads\n"
|
|
if string(content) != expected {
|
|
t.Errorf("redirect content = %q, want %q", string(content), expected)
|
|
}
|
|
|
|
// Verify check now passes
|
|
result = check.Run(ctx)
|
|
if result.Status != StatusOK {
|
|
t.Errorf("expected StatusOK after fix, got %v", result.Status)
|
|
}
|
|
}
|
|
|
|
func TestBeadsRedirectCheck_FixNoOp_LocalBeads(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
rigName := "testrig"
|
|
rigDir := filepath.Join(tmpDir, rigName)
|
|
|
|
// Create only local beads (no tracked beads)
|
|
localBeads := filepath.Join(rigDir, ".beads")
|
|
if err := os.MkdirAll(localBeads, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
check := NewBeadsRedirectCheck()
|
|
ctx := &CheckContext{TownRoot: tmpDir, RigName: rigName}
|
|
|
|
// Fix should be a no-op
|
|
if err := check.Fix(ctx); err != nil {
|
|
t.Fatalf("Fix failed: %v", err)
|
|
}
|
|
|
|
// Verify no redirect was created
|
|
redirectPath := filepath.Join(rigDir, ".beads", "redirect")
|
|
if _, err := os.Stat(redirectPath); !os.IsNotExist(err) {
|
|
t.Error("redirect file should not be created for local beads")
|
|
}
|
|
}
|
|
|
|
func TestBeadsRedirectCheck_FixInitBeads(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
rigName := "testrig"
|
|
rigDir := filepath.Join(tmpDir, rigName)
|
|
|
|
// Create rig directory (no beads at all)
|
|
if err := os.MkdirAll(rigDir, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Create mayor/rigs.json with prefix for the rig
|
|
mayorDir := filepath.Join(tmpDir, "mayor")
|
|
if err := os.MkdirAll(mayorDir, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
rigsJSON := `{
|
|
"version": 1,
|
|
"rigs": {
|
|
"testrig": {
|
|
"git_url": "https://example.com/test.git",
|
|
"beads": {
|
|
"prefix": "tr"
|
|
}
|
|
}
|
|
}
|
|
}`
|
|
if err := os.WriteFile(filepath.Join(mayorDir, "rigs.json"), []byte(rigsJSON), 0644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
check := NewBeadsRedirectCheck()
|
|
ctx := &CheckContext{TownRoot: tmpDir, RigName: rigName}
|
|
|
|
// Verify fix is needed
|
|
result := check.Run(ctx)
|
|
if result.Status != StatusError {
|
|
t.Fatalf("expected StatusError before fix, got %v", result.Status)
|
|
}
|
|
|
|
// Apply fix - this will run 'bd init' if available, otherwise create config.yaml
|
|
if err := check.Fix(ctx); err != nil {
|
|
t.Fatalf("Fix failed: %v", err)
|
|
}
|
|
|
|
// Verify .beads directory was created
|
|
beadsDir := filepath.Join(rigDir, ".beads")
|
|
if _, err := os.Stat(beadsDir); os.IsNotExist(err) {
|
|
t.Fatal(".beads directory not created")
|
|
}
|
|
|
|
// Verify beads was initialized (either by bd init or fallback)
|
|
// bd init creates config.yaml, fallback creates config.yaml with prefix
|
|
configPath := filepath.Join(beadsDir, "config.yaml")
|
|
if _, err := os.Stat(configPath); os.IsNotExist(err) {
|
|
t.Fatal("config.yaml not created")
|
|
}
|
|
|
|
// Verify check now passes (local beads exist)
|
|
result = check.Run(ctx)
|
|
if result.Status != StatusOK {
|
|
t.Errorf("expected StatusOK after fix, got %v", result.Status)
|
|
}
|
|
}
|
|
|
|
func TestBeadsRedirectCheck_ConflictingLocalBeads(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
rigName := "testrig"
|
|
rigDir := filepath.Join(tmpDir, rigName)
|
|
|
|
// Create tracked beads at mayor/rig/.beads
|
|
trackedBeads := filepath.Join(rigDir, "mayor", "rig", ".beads")
|
|
if err := os.MkdirAll(trackedBeads, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
// Add some content to tracked beads
|
|
if err := os.WriteFile(filepath.Join(trackedBeads, "issues.jsonl"), []byte(`{"id":"tr-1"}`), 0644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Create conflicting local beads with actual data
|
|
localBeads := filepath.Join(rigDir, ".beads")
|
|
if err := os.MkdirAll(localBeads, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
// Add data to local beads (this is the conflict)
|
|
if err := os.WriteFile(filepath.Join(localBeads, "issues.jsonl"), []byte(`{"id":"local-1"}`), 0644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := os.WriteFile(filepath.Join(localBeads, "config.yaml"), []byte("prefix: local\n"), 0644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
check := NewBeadsRedirectCheck()
|
|
ctx := &CheckContext{TownRoot: tmpDir, RigName: rigName}
|
|
|
|
// Check should detect conflicting beads
|
|
result := check.Run(ctx)
|
|
if result.Status != StatusError {
|
|
t.Errorf("expected StatusError for conflicting beads, got %v", result.Status)
|
|
}
|
|
if !strings.Contains(result.Message, "Conflicting") {
|
|
t.Errorf("expected message about conflicting beads, got %q", result.Message)
|
|
}
|
|
}
|
|
|
|
func TestBeadsRedirectCheck_FixConflictingLocalBeads(t *testing.T) {
|
|
tmpDir := t.TempDir()
|
|
rigName := "testrig"
|
|
rigDir := filepath.Join(tmpDir, rigName)
|
|
|
|
// Create tracked beads at mayor/rig/.beads
|
|
trackedBeads := filepath.Join(rigDir, "mayor", "rig", ".beads")
|
|
if err := os.MkdirAll(trackedBeads, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := os.WriteFile(filepath.Join(trackedBeads, "issues.jsonl"), []byte(`{"id":"tr-1"}`), 0644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
// Create conflicting local beads with actual data
|
|
localBeads := filepath.Join(rigDir, ".beads")
|
|
if err := os.MkdirAll(localBeads, 0755); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
if err := os.WriteFile(filepath.Join(localBeads, "issues.jsonl"), []byte(`{"id":"local-1"}`), 0644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
|
|
check := NewBeadsRedirectCheck()
|
|
ctx := &CheckContext{TownRoot: tmpDir, RigName: rigName}
|
|
|
|
// Verify fix is needed
|
|
result := check.Run(ctx)
|
|
if result.Status != StatusError {
|
|
t.Fatalf("expected StatusError before fix, got %v", result.Status)
|
|
}
|
|
|
|
// Apply fix - should remove conflicting local beads and create redirect
|
|
if err := check.Fix(ctx); err != nil {
|
|
t.Fatalf("Fix failed: %v", err)
|
|
}
|
|
|
|
// Verify local issues.jsonl was removed
|
|
if _, err := os.Stat(filepath.Join(localBeads, "issues.jsonl")); !os.IsNotExist(err) {
|
|
t.Error("local issues.jsonl should have been removed")
|
|
}
|
|
|
|
// Verify redirect was created
|
|
redirectPath := filepath.Join(localBeads, "redirect")
|
|
content, err := os.ReadFile(redirectPath)
|
|
if err != nil {
|
|
t.Fatalf("redirect file not created: %v", err)
|
|
}
|
|
if string(content) != "mayor/rig/.beads\n" {
|
|
t.Errorf("redirect content = %q, want 'mayor/rig/.beads\\n'", string(content))
|
|
}
|
|
|
|
// Verify check now passes
|
|
result = check.Run(ctx)
|
|
if result.Status != StatusOK {
|
|
t.Errorf("expected StatusOK after fix, got %v", result.Status)
|
|
}
|
|
}
|