Skip to content

fix(skills): restore worktree step in brainstorming workflow #675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
qishaoyumu wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −5
Open

fix(skills): restore worktree step in brainstorming workflow #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions skills/brainstorming/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ You MUST create a task for each of these items and complete them in order:
6. **Write design doc** — save to `docs/superpowers/specs/YYYY-MM-DD-<topic>-design.md` and commit
7. **Spec review loop** — dispatch spec-document-reviewer subagent; fix issues and re-dispatch until approved (max 5 iterations, then surface to human)
8. **User reviews written spec** — ask user to review the spec file before proceeding
9. **Transition to implementation** — invoke writing-plans skill to create implementation plan
9. **Set up worktree** — invoke using-git-worktrees to create isolated implementation workspace
10. **Transition to implementation** — invoke writing-plans skill to create implementation plan

## Process Flow

Expand All @@ -46,6 +47,7 @@ digraph brainstorming {
"Spec review loop" [shape=box];
"Spec review passed?" [shape=diamond];
"User reviews spec?" [shape=diamond];
"Set up worktree\n(using-git-worktrees)" [shape=box];
"Invoke writing-plans skill" [shape=doublecircle];

"Explore project context" -> "Visual questions ahead?";
Expand All @@ -62,11 +64,12 @@ digraph brainstorming {
"Spec review passed?" -> "Spec review loop" [label="issues found,\nfix and re-dispatch"];
"Spec review passed?" -> "User reviews spec?" [label="approved"];
"User reviews spec?" -> "Write design doc" [label="changes requested"];
"User reviews spec?" -> "Invoke writing-plans skill" [label="approved"];
"User reviews spec?" -> "Set up worktree\n(using-git-worktrees)" [label="approved"];
"Set up worktree\n(using-git-worktrees)" -> "Invoke writing-plans skill";
}
```

**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.
**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.

## The Process

Expand Down Expand Up @@ -130,10 +133,15 @@ After the spec review loop passes, ask the user to review the written spec befor

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.

**Workspace isolation:**

- Invoke using-git-worktrees to create an isolated worktree for implementation
- This ensures implementation work doesn't affect the main working tree

**Implementation:**

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

## Key Principles

Expand Down
2 changes: 1 addition & 1 deletion skills/using-git-worktrees/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ Ready to implement auth feature
## Integration

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