From f23dadc8d134fa0d647ac62065885195bbd25838 Mon Sep 17 00:00:00 2001 From: Steve Yegge Date: Mon, 22 Dec 2025 22:08:59 -0800 Subject: [PATCH] Remove bd sync --from-main from polecat startup workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Polecats already have synced beads at spawn time (spawn command syncs before spawning). Multiple polecats starting simultaneously were all trying to sync the same shared beads, causing git conflicts/failures. Fixes gt-oiv0 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- internal/cmd/spawn.go | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/internal/cmd/spawn.go b/internal/cmd/spawn.go index 2d3a0259..e18caabb 100644 --- a/internal/cmd/spawn.go +++ b/internal/cmd/spawn.go @@ -553,12 +553,11 @@ func buildSpawnContext(issue *BeadsIssue, message string) string { sb.WriteString("\n## Workflow\n") sb.WriteString("1. Run `gt prime` to load polecat context\n") - sb.WriteString("2. Run `bd sync --from-main` to get fresh beads\n") - sb.WriteString("3. Work on your task, commit changes regularly\n") - sb.WriteString("4. Run `bd close ` when done\n") - sb.WriteString("5. Run `bd sync` to push beads changes\n") - sb.WriteString("6. Push code: `git push origin HEAD`\n") - sb.WriteString("7. Run `gt done` to signal completion\n") + sb.WriteString("2. Work on your task, commit changes regularly\n") + sb.WriteString("3. Run `bd close ` when done\n") + sb.WriteString("4. Run `bd sync` to push beads changes\n") + sb.WriteString("5. Push code: `git push origin HEAD`\n") + sb.WriteString("6. Run `gt done` to signal completion\n") return sb.String() } @@ -617,17 +616,16 @@ func buildWorkAssignmentMail(issue *BeadsIssue, message, polecatAddress string, body.WriteString("\n## Workflow\n") body.WriteString("1. Run `gt prime` to load polecat context\n") - body.WriteString("2. Run `bd sync --from-main` to get fresh beads\n") - body.WriteString("3. Work on your task, commit changes regularly\n") - body.WriteString("4. Run `bd close ` when done\n") + body.WriteString("2. Work on your task, commit changes regularly\n") + body.WriteString("3. Run `bd close ` when done\n") if moleculeCtx != nil { - body.WriteString("5. Check `bd ready --parent " + moleculeCtx.RootIssueID + "` for more steps\n") - body.WriteString("6. Repeat steps 3-5 for each ready step\n") - body.WriteString("7. When all steps done: run `bd sync`, push code, run `gt done`\n") + body.WriteString("4. Check `bd ready --parent " + moleculeCtx.RootIssueID + "` for more steps\n") + body.WriteString("5. Repeat steps 2-4 for each ready step\n") + body.WriteString("6. When all steps done: run `bd sync`, push code, run `gt done`\n") } else { - body.WriteString("5. Run `bd sync` to push beads changes\n") - body.WriteString("6. Push code: `git push origin HEAD`\n") - body.WriteString("7. Run `gt done` to signal completion\n") + body.WriteString("4. Run `bd sync` to push beads changes\n") + body.WriteString("5. Push code: `git push origin HEAD`\n") + body.WriteString("6. Run `gt done` to signal completion\n") } body.WriteString("\n## Handoff Protocol\n") body.WriteString("Before signaling done, ensure:\n")