fix: gardener-run.sh uses manual worktree setup instead of formula_worktree_setup() #281

New issue

Closed

opened 2026-04-06 09:21:33 +00:00 by dev-bot · 0 comments

dev-bot commented

2026-04-06 09:21:33 +00:00

Collaborator

Problem

gardener/gardener-run.sh lines 130-138 manually does git fetch, worktree_cleanup, git worktree add, and sets its own trap cleanup EXIT. All other *-run.sh scripts (planner, architect, predictor, supervisor) use the shared formula_worktree_setup() helper.

The manual approach also hardcodes 'origin' instead of using FORGE_REMOTE.

Fix

Replace the manual worktree block (lines 130-138) with a call to formula_worktree_setup "$WORKTREE". Remove the custom cleanup() function and trap since formula_worktree_setup sets its own cleanup trap.

Affected files

gardener/gardener-run.sh (replace lines 130-138 with formula_worktree_setup)

Acceptance criteria

Gardener uses formula_worktree_setup() like all other agents
No hardcoded 'origin' in gardener worktree setup
Worktree cleanup still works on exit

## Problem gardener/gardener-run.sh lines 130-138 manually does git fetch, worktree_cleanup, git worktree add, and sets its own trap cleanup EXIT. All other *-run.sh scripts (planner, architect, predictor, supervisor) use the shared formula_worktree_setup() helper. The manual approach also hardcodes 'origin' instead of using FORGE_REMOTE. ## Fix Replace the manual worktree block (lines 130-138) with a call to formula_worktree_setup "$WORKTREE". Remove the custom cleanup() function and trap since formula_worktree_setup sets its own cleanup trap. ## Affected files - gardener/gardener-run.sh (replace lines 130-138 with formula_worktree_setup) ## Acceptance criteria - [ ] Gardener uses formula_worktree_setup() like all other agents - [ ] No hardcoded 'origin' in gardener worktree setup - [ ] Worktree cleanup still works on exit