Skip to content

Commit 11d469e

Browse files
steveyeggeclaude
andcommitted
fix(beads): SetupRedirect preserves tracked files (gt-fj0ol)
Previously, SetupRedirect used os.RemoveAll() which deleted all files in .beads/ including tracked files like formulas/, README.md, config.yaml. Now cleanBeadsRuntimeFiles() selectively removes only gitignored runtime files (*.db, daemon.*, issues.jsonl, etc.) while preserving tracked content. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent de37600 commit 11d469e

2 files changed

Lines changed: 67 additions & 12 deletions

File tree

internal/beads/beads.go

Lines changed: 46 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,47 @@ func resolveBeadsDirWithDepth(beadsDir string, maxDepth int) string {
110110
return resolveBeadsDirWithDepth(resolved, maxDepth-1)
111111
}
112112

113+
// cleanBeadsRuntimeFiles removes gitignored runtime files from a .beads directory
114+
// while preserving tracked files (formulas/, README.md, config.yaml, .gitignore).
115+
// This is safe to call even if the directory doesn't exist.
116+
func cleanBeadsRuntimeFiles(beadsDir string) error {
117+
if _, err := os.Stat(beadsDir); os.IsNotExist(err) {
118+
return nil // Nothing to clean
119+
}
120+
121+
// Runtime files/patterns that are gitignored and safe to remove
122+
runtimePatterns := []string{
123+
// SQLite databases
124+
"*.db", "*.db-*", "*.db?*",
125+
// Daemon runtime
126+
"daemon.lock", "daemon.log", "daemon.pid", "bd.sock",
127+
// Sync state
128+
"sync-state.json", "last-touched", "metadata.json",
129+
// Version tracking
130+
".local_version",
131+
// Redirect file (we're about to recreate it)
132+
"redirect",
133+
// Merge artifacts
134+
"beads.base.*", "beads.left.*", "beads.right.*",
135+
// JSONL files (tracked but will be redirected, safe to remove in worktrees)
136+
"issues.jsonl", "interactions.jsonl",
137+
// Runtime directories
138+
"mq",
139+
}
140+
141+
for _, pattern := range runtimePatterns {
142+
matches, err := filepath.Glob(filepath.Join(beadsDir, pattern))
143+
if err != nil {
144+
continue // Invalid pattern, skip
145+
}
146+
for _, match := range matches {
147+
os.RemoveAll(match) // Best effort, ignore errors
148+
}
149+
}
150+
151+
return nil
152+
}
153+
113154
// SetupRedirect creates a .beads/redirect file for a worktree to point to the rig's shared beads.
114155
// This is used by crew, polecats, and refinery worktrees to share the rig's beads database.
115156
//
@@ -119,7 +160,7 @@ func resolveBeadsDirWithDepth(beadsDir string, maxDepth int) string {
119160
//
120161
// The function:
121162
// 1. Computes the relative path from worktree to rig-level .beads
122-
// 2. Cleans up any existing .beads/ contents (from tracked branches)
163+
// 2. Cleans up runtime files (preserving tracked files like formulas/)
123164
// 3. Creates the redirect file
124165
//
125166
// Safety: This function refuses to create redirects in the canonical beads location
@@ -149,15 +190,13 @@ func SetupRedirect(townRoot, worktreePath string) error {
149190
return fmt.Errorf("no rig .beads found at %s", rigBeadsPath)
150191
}
151192

152-
// Clean up any existing .beads/ contents from the branch
193+
// Clean up runtime files in .beads/ but preserve tracked files (formulas/, README.md, etc.)
153194
worktreeBeadsDir := filepath.Join(worktreePath, ".beads")
154-
if _, err := os.Stat(worktreeBeadsDir); err == nil {
155-
if err := os.RemoveAll(worktreeBeadsDir); err != nil {
156-
return fmt.Errorf("cleaning existing .beads dir: %w", err)
157-
}
195+
if err := cleanBeadsRuntimeFiles(worktreeBeadsDir); err != nil {
196+
return fmt.Errorf("cleaning runtime files: %w", err)
158197
}
159198

160-
// Create .beads directory
199+
// Create .beads directory if it doesn't exist
161200
if err := os.MkdirAll(worktreeBeadsDir, 0755); err != nil {
162201
return fmt.Errorf("creating .beads dir: %w", err)
163202
}

internal/beads/beads_test.go

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1644,7 +1644,7 @@ func TestSetupRedirect(t *testing.T) {
16441644
}
16451645
})
16461646

1647-
t.Run("cleans existing tracked beads from worktree", func(t *testing.T) {
1647+
t.Run("cleans runtime files but preserves tracked files", func(t *testing.T) {
16481648
townRoot := t.TempDir()
16491649
rigRoot := filepath.Join(townRoot, "testrig")
16501650
rigBeads := filepath.Join(rigRoot, ".beads")
@@ -1654,27 +1654,43 @@ func TestSetupRedirect(t *testing.T) {
16541654
if err := os.MkdirAll(rigBeads, 0755); err != nil {
16551655
t.Fatalf("mkdir rig beads: %v", err)
16561656
}
1657-
// Simulate worktree with tracked .beads (has database files)
1657+
// Simulate worktree with both runtime and tracked files
16581658
if err := os.MkdirAll(crewBeads, 0755); err != nil {
16591659
t.Fatalf("mkdir crew beads: %v", err)
16601660
}
1661+
// Runtime files (should be removed)
16611662
if err := os.WriteFile(filepath.Join(crewBeads, "beads.db"), []byte("fake db"), 0644); err != nil {
16621663
t.Fatalf("write fake db: %v", err)
16631664
}
1665+
if err := os.WriteFile(filepath.Join(crewBeads, "issues.jsonl"), []byte("{}"), 0644); err != nil {
1666+
t.Fatalf("write issues.jsonl: %v", err)
1667+
}
1668+
// Tracked files (should be preserved)
16641669
if err := os.WriteFile(filepath.Join(crewBeads, "config.yaml"), []byte("prefix: test"), 0644); err != nil {
16651670
t.Fatalf("write config: %v", err)
16661671
}
1672+
if err := os.WriteFile(filepath.Join(crewBeads, "README.md"), []byte("# Beads"), 0644); err != nil {
1673+
t.Fatalf("write README: %v", err)
1674+
}
16671675

16681676
if err := SetupRedirect(townRoot, crewPath); err != nil {
16691677
t.Fatalf("SetupRedirect failed: %v", err)
16701678
}
16711679

1672-
// Verify old files were cleaned up
1680+
// Verify runtime files were cleaned up
16731681
if _, err := os.Stat(filepath.Join(crewBeads, "beads.db")); !os.IsNotExist(err) {
16741682
t.Error("beads.db should have been removed")
16751683
}
1676-
if _, err := os.Stat(filepath.Join(crewBeads, "config.yaml")); !os.IsNotExist(err) {
1677-
t.Error("config.yaml should have been removed")
1684+
if _, err := os.Stat(filepath.Join(crewBeads, "issues.jsonl")); !os.IsNotExist(err) {
1685+
t.Error("issues.jsonl should have been removed")
1686+
}
1687+
1688+
// Verify tracked files were preserved
1689+
if _, err := os.Stat(filepath.Join(crewBeads, "config.yaml")); err != nil {
1690+
t.Errorf("config.yaml should have been preserved: %v", err)
1691+
}
1692+
if _, err := os.Stat(filepath.Join(crewBeads, "README.md")); err != nil {
1693+
t.Errorf("README.md should have been preserved: %v", err)
16781694
}
16791695

16801696
// Verify redirect was created

0 commit comments

Comments
 (0)