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

fix: Use BeadsPath() for swarm status to read from git-synced beads (gt-1rxz5)

Browse Source 
The swarm status was stale because bd commands were running from the rig
root path instead of the mayor/rig clone which has proper beads sync config.

Changes:
- Add Rig.BeadsPath() method to return mayor/rig path when available
- Update all bd commands in swarm.go to use BeadsPath()
- Update swarm manager to use separate beadsDir and gitDir paths
- beadsDir for bd commands (git-synced location)
- gitDir for git operations and mail (rig root)

This ensures swarm status reflects the latest beads data from the
git-synced beads-sync branch instead of stale local daemon data.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Steve Yegge
2025-12-29 23:43:22 -08:00
parent deb58838ad
commit e362be3c41
5 changed files with 47 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
internal/swarm/manager.go
View File

@@ -23,15 +23,17 @@ var (
// Manager handles swarm lifecycle operations.
// Manager is stateless - all swarm state is discovered from beads.
type Manager struct {
rig *rig.Rig
workDir string
rig *rig.Rig
beadsDir string // Path for beads operations (git-synced)
gitDir string // Path for git operations (rig root)
}
// NewManager creates a new swarm manager for a rig.
func NewManager(r *rig.Rig) *Manager {
return &Manager{
rig: r,
workDir: r.Path,
rig: r,
beadsDir: r.BeadsPath(), // Use BeadsPath() for git-synced beads operations
gitDir: r.Path, // Use rig root for git operations
}
}
@@ -40,7 +42,7 @@ func NewManager(r *rig.Rig) *Manager {
func (m *Manager) LoadSwarm(epicID string) (*Swarm, error) {
// Query beads for the epic
cmd := exec.Command("bd", "show", epicID, "--json")
cmd.Dir = m.workDir
cmd.Dir = m.beadsDir
var stdout, stderr bytes.Buffer
cmd.Stdout = &stdout
@@ -126,7 +128,7 @@ func (m *Manager) GetSwarm(id string) (*Swarm, error) {
func (m *Manager) GetReadyTasks(swarmID string) ([]SwarmTask, error) {
// Use bd swarm status to get ready front
cmd := exec.Command("bd", "swarm", "status", swarmID, "--json")
cmd.Dir = m.workDir
cmd.Dir = m.beadsDir
var stdout bytes.Buffer
cmd.Stdout = &stdout
@@ -163,7 +165,7 @@ func (m *Manager) GetReadyTasks(swarmID string) ([]SwarmTask, error) {
// IsComplete checks if all tasks are closed by querying beads.
func (m *Manager) IsComplete(swarmID string) (bool, error) {
cmd := exec.Command("bd", "swarm", "status", swarmID, "--json")
cmd.Dir = m.workDir
cmd.Dir = m.beadsDir
var stdout bytes.Buffer
cmd.Stdout = &stdout
@@ -213,7 +215,7 @@ func isValidTransition(from, to SwarmState) bool {
func (m *Manager) loadTasksFromBeads(epicID string) ([]SwarmTask, error) {
// Run: bd show <epicID> --json to get epic with children
cmd := exec.Command("bd", "show", epicID, "--json")
cmd.Dir = m.workDir
cmd.Dir = m.beadsDir
var stdout, stderr bytes.Buffer
cmd.Stdout = &stdout
@@ -275,7 +277,7 @@ func (m *Manager) loadTasksFromBeads(epicID string) ([]SwarmTask, error) {
// getGitHead returns the current HEAD commit.
func (m *Manager) getGitHead() (string, error) {
cmd := exec.Command("git", "rev-parse", "HEAD")
cmd.Dir = m.workDir
cmd.Dir = m.gitDir
var stdout bytes.Buffer
cmd.Stdout = &stdout