feat(config): add workflow.use_worktrees toggle to disable worktree isolation
Adds `workflow.use_worktrees` config option (default: `true`) that allows users to disable git worktree isolation for executor agents. When set to `false`: - Executor agents run without `isolation="worktree"` - Plans execute sequentially on the main working tree - No worktree merge ordering issues or orphaned worktrees - Normal git hooks run (no --no-verify needed) This provides an escape hatch for solo developers and users who experience worktree merge conflicts, as worktree ordering issues are inherently difficult when parallel agents modify overlapping files. Usage: /gsd:settings → set workflow.use_worktrees to false Or directly: gsd-tools config-set workflow.use_worktrees false Changes: - config.cjs: add workflow.use_worktrees to valid keys - planning-config.md: document the option - execute-phase.md: read config, conditional worktree + sequential mode - execute-plan.md: conditional worktree in Pattern A - quick.md: conditional worktree for quick executor - diagnose-issues.md: conditional worktree for debug agents - 2 new tests (config set + workflow structural check) Closes #1451 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -126,6 +126,10 @@ AGENT_SKILLS_VERIFIER=$(node "$HOME/.claude/get-shit-done/bin/gsd-tools.cjs" age
|
||||
|
||||
Parse JSON for: `planner_model`, `executor_model`, `checker_model`, `verifier_model`, `commit_docs`, `branch_name`, `quick_id`, `slug`, `date`, `timestamp`, `quick_dir`, `task_dir`, `roadmap_exists`, `planning_exists`.
|
||||
|
||||
```bash
|
||||
USE_WORKTREES=$(node "$HOME/.claude/get-shit-done/bin/gsd-tools.cjs" config-get workflow.use_worktrees 2>/dev/null || echo "true")
|
||||
```
|
||||
|
||||
**If `roadmap_exists` is false:** Error — Quick mode requires an active project with ROADMAP.md. Run `/gsd:new-project` first.
|
||||
|
||||
Quick tasks can run mid-phase - validation only checks ROADMAP.md exists, not phase status.
|
||||
@@ -559,7 +563,7 @@ ${AGENT_SKILLS_EXECUTOR}
|
||||
",
|
||||
subagent_type="gsd-executor",
|
||||
model="{executor_model}",
|
||||
isolation="worktree",
|
||||
${USE_WORKTREES !== "false" ? 'isolation="worktree",' : ''}
|
||||
description="Execute: ${DESCRIPTION}"
|
||||
)
|
||||
```
|
||||
|
||||
Reference in New Issue
Block a user