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

fix: Match rig add architecture to working gastown pattern

Browse Source 
- Mayor is now a regular clone (doesn't need branch visibility)
- Refinery is a worktree on main (can see polecat branches, direct merge)
- This matches migrated gastown and satisfies doctor branch check
This commit is contained in:
Steve Yegge
2025-12-25 18:58:12 -08:00
parent a2307511ae
commit 1569ba2290
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/cmd/rig.go
View File

@@ -217,11 +217,11 @@ func runRigAdd(cmd *cobra.Command, args []string) error {
fmt.Printf("\nStructure:\n")
fmt.Printf(" %s/\n", name)
fmt.Printf(" ├── config.json\n")
fmt.Printf(" ├── .repo.git/ (shared bare repo)\n")
fmt.Printf(" ├── .repo.git/ (shared bare repo for refinery+polecats)\n")
fmt.Printf(" ├── .beads/ (prefix: %s)\n", newRig.Config.Prefix)
fmt.Printf(" ├── plugins/ (rig-level plugins)\n")
fmt.Printf(" ├── mayor/rig/ (worktree: main)\n")
fmt.Printf(" ├── refinery/rig/ (worktree: refinery)\n")
fmt.Printf(" ├── mayor/rig/ (clone: main)\n")
fmt.Printf(" ├── refinery/rig/ (worktree: main, sees polecat branches)\n")
fmt.Printf(" ├── crew/%s/ (your workspace)\n", crewName)
fmt.Printf(" ├── witness/\n")
fmt.Printf(" └── polecats/\n")

26
internal/rig/manager.go
View File

@@ -217,40 +217,38 @@ func (m *Manager) AddRig(opts AddRigOptions) (*Rig, error) {
return nil, fmt.Errorf("saving rig config: %w", err)
}
// Create shared bare repo as single source of truth for all worktrees.
// This architecture allows all worktrees (mayor, refinery, polecats) to share
// branch visibility without needing to push to remote.
// Create shared bare repo as source of truth for refinery and polecats.
// This allows refinery to see polecat branches without pushing to remote.
// Mayor remains a separate clone (doesn't need branch visibility).
bareRepoPath := filepath.Join(rigPath, ".repo.git")
if err := m.git.CloneBare(opts.GitURL, bareRepoPath); err != nil {
return nil, fmt.Errorf("creating bare repo: %w", err)
}
bareGit := git.NewGitWithDir(bareRepoPath, "")
// Create mayor as worktree from bare repo on main
// Create mayor as regular clone (separate from bare repo).
// Mayor doesn't need to see polecat branches - that's refinery's job.
// This also allows mayor to stay on main without conflicting with refinery.
mayorRigPath := filepath.Join(rigPath, "mayor", "rig")
if err := os.MkdirAll(filepath.Dir(mayorRigPath), 0755); err != nil {
return nil, fmt.Errorf("creating mayor dir: %w", err)
}
if err := bareGit.WorktreeAddExisting(mayorRigPath, "main"); err != nil {
return nil, fmt.Errorf("creating mayor worktree: %w", err)
if err := m.git.Clone(opts.GitURL, mayorRigPath); err != nil {
return nil, fmt.Errorf("cloning for mayor: %w", err)
}
// Create mayor CLAUDE.md (overrides any from cloned repo)
if err := m.createRoleCLAUDEmd(mayorRigPath, "mayor", opts.Name, ""); err != nil {
return nil, fmt.Errorf("creating mayor CLAUDE.md: %w", err)
}
// Create refinery as worktree from bare repo on its own branch.
// Refinery can see all polecat branches (shared .repo.git) and merges them to main.
// Uses a separate "refinery" branch to avoid conflict with mayor on main.
// Create refinery as worktree from bare repo on main.
// Refinery needs to see polecat branches (shared .repo.git) and merges them to main.
// Being on main allows direct merge workflow.
refineryRigPath := filepath.Join(rigPath, "refinery", "rig")
if err := os.MkdirAll(filepath.Dir(refineryRigPath), 0755); err != nil {
return nil, fmt.Errorf("creating refinery dir: %w", err)
}
// Create a refinery branch from main for the worktree
if err := bareGit.CreateBranchFrom("refinery", "main"); err != nil {
return nil, fmt.Errorf("creating refinery branch: %w", err)
}
if err := bareGit.WorktreeAddExisting(refineryRigPath, "refinery"); err != nil {
if err := bareGit.WorktreeAddExisting(refineryRigPath, "main"); err != nil {
return nil, fmt.Errorf("creating refinery worktree: %w", err)
}
// Create refinery CLAUDE.md (overrides any from cloned repo)