Skip to content

Commit 6079cd2

Browse files
qishaoyumufaytec-cuiyuqi
authored andcommitted
fix(skills): restore worktree step in brainstorming workflow
The brainstorming skill never invoked using-git-worktrees despite writing-plans expecting to run in a worktree "created by brainstorming skill" and using-git-worktrees listing brainstorming as a caller. This was unintentionally dropped during workflow simplification (8e38ab8, 7f2ee61) and remained missing after v5.0.0 rework. Changes to skills/brainstorming/SKILL.md: - Checklist: insert step 7 (Set up worktree) between design doc and writing-plans - Process flow diagram: add worktree node with correct edges - Terminal state note: update skill whitelist to include using-git-worktrees - After the Design: add Workspace isolation section, adjust Implementation prohibition from "any other skill" to "any implementation skill (frontend-design, mcp-builder, etc.)" Changes to skills/using-git-worktrees/SKILL.md: - Integration: fix stale "Phase 4" reference to "Step 7" Closes #574 Ref #186
1 parent 5ef73d2 commit 6079cd2

2 files changed

Lines changed: 13 additions & 5 deletions

File tree

skills/brainstorming/SKILL.md

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ You MUST create a task for each of these items and complete them in order:
2929
6. **Write design doc** — save to `docs/superpowers/specs/YYYY-MM-DD-<topic>-design.md` and commit
3030
7. **Spec review loop** — dispatch spec-document-reviewer subagent; fix issues and re-dispatch until approved (max 5 iterations, then surface to human)
3131
8. **User reviews written spec** — ask user to review the spec file before proceeding
32-
9. **Transition to implementation** — invoke writing-plans skill to create implementation plan
32+
9. **Set up worktree** — invoke using-git-worktrees to create isolated implementation workspace
33+
10. **Transition to implementation** — invoke writing-plans skill to create implementation plan
3334

3435
## Process Flow
3536

@@ -46,6 +47,7 @@ digraph brainstorming {
4647
"Spec review loop" [shape=box];
4748
"Spec review passed?" [shape=diamond];
4849
"User reviews spec?" [shape=diamond];
50+
"Set up worktree\n(using-git-worktrees)" [shape=box];
4951
"Invoke writing-plans skill" [shape=doublecircle];
5052
5153
"Explore project context" -> "Visual questions ahead?";
@@ -62,11 +64,12 @@ digraph brainstorming {
6264
"Spec review passed?" -> "Spec review loop" [label="issues found,\nfix and re-dispatch"];
6365
"Spec review passed?" -> "User reviews spec?" [label="approved"];
6466
"User reviews spec?" -> "Write design doc" [label="changes requested"];
65-
"User reviews spec?" -> "Invoke writing-plans skill" [label="approved"];
67+
"User reviews spec?" -> "Set up worktree\n(using-git-worktrees)" [label="approved"];
68+
"Set up worktree\n(using-git-worktrees)" -> "Invoke writing-plans skill";
6669
}
6770
```
6871

69-
**The terminal state is invoking writing-plans.** Do NOT invoke frontend-design, mcp-builder, or any other implementation skill. The ONLY skill you invoke after brainstorming is writing-plans.
72+
**The terminal state is invoking writing-plans.** Do NOT invoke frontend-design, mcp-builder, or any other implementation skill. The ONLY skills you invoke after brainstorming are using-git-worktrees (for workspace isolation) then writing-plans.
7073

7174
## The Process
7275

@@ -130,10 +133,15 @@ After the spec review loop passes, ask the user to review the written spec befor
130133
131134
Wait for the user's response. If they request changes, make them and re-run the spec review loop. Only proceed once the user approves.
132135

136+
**Workspace isolation:**
137+
138+
- Invoke using-git-worktrees to create an isolated worktree for implementation
139+
- This ensures implementation work doesn't affect the main working tree
140+
133141
**Implementation:**
134142

135143
- Invoke the writing-plans skill to create a detailed implementation plan
136-
- Do NOT invoke any other skill. writing-plans is the next step.
144+
- Do NOT invoke any implementation skill (frontend-design, mcp-builder, etc.). writing-plans is the next step after workspace isolation.
137145

138146
## Key Principles
139147

skills/using-git-worktrees/SKILL.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ Ready to implement auth feature
209209
## Integration
210210

211211
**Called by:**
212-
- **brainstorming** (Phase 4) - REQUIRED when design is approved and implementation follows
212+
- **brainstorming** (Step 9) - REQUIRED after user approves spec, before invoking writing-plans
213213
- **subagent-driven-development** - REQUIRED before executing any tasks
214214
- **executing-plans** - REQUIRED before executing any tasks
215215
- Any skill needing isolated workspace

0 commit comments

Comments
 (0)