fix(skills): restore worktree step in brainstorming workflow

[qishaoyumu]

Summary

• Restore the using-git-worktrees invocation lost during brainstorming skill simplification (8e38ab8, 7f2ee61)
• Fix stale "Phase 4" cross-reference in using-git-worktrees Integration section
• Update terminal state note to reflect the restored worktree step

Problem

writing-plans expects to run in a worktree created by brainstorming ("This should be run in a dedicated worktree (created by brainstorming skill)."), but brainstorming never invokes using-git-worktrees. The step was unintentionally dropped during two rounds of simplification. Related: #186

Changes

skills/brainstorming/SKILL.md:

• Checklist: insert step 6 (Set up worktree) between design doc and writing-plans
• Process flow diagram: add worktree node with correct edges
• "After the Design": add Workspace isolation section
• Terminal state note: replace "The ONLY skill" with explicit worktree → writing-plans flow

skills/using-git-worktrees/SKILL.md:

• Integration: fix "brainstorming (Phase 4)" → "brainstorming (Step 6)"

Test Plan

• Invoke brainstorming skill and verify worktree step appears in task checklist
• Verify writing-plans runs inside the created worktree
• Verify using-git-worktrees Integration section references correct step number

Summary by CodeRabbit

Release Notes

• Documentation
  • Updated brainstorming workflow to include an isolated workspace setup step before implementation planning
  • Restructured process flow with enhanced workspace isolation guidance

[coderabbitai]

📝 Walkthrough

Walkthrough

The brainstorming skill workflow now requires setting up a git worktree before transitioning to implementation planning. The using-git-worktrees skill integration condition was updated to reflect this new workflow position, changing from Phase 4 to Step 6 with clarified timing requirements.

Changes

Cohort / File(s)	Summary
Brainstorming Workflow skills/brainstorming/SKILL.md	Added "Set up worktree" step invoking using-git-worktrees before final implementation transition. Updated terminal state description and added new "Workspace isolation" section documenting git worktree approach. Process Flow diagram updated with new worktree node.
Git Worktrees Integration skills/using-git-worktrees/SKILL.md	Updated Integration section to reflect new workflow position: changed from Phase 4 to Step 6, and refined REQUIRED condition wording to specify timing as "after writing design doc, before invoking writing-plans".

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~8 minutes

Possibly related PRs

• fix: require worktree setup before subagent-driven-development and executing-plans #382: Modifies workflow to require setup of git worktrees before implementation-writing skills.
• Enforce brainstorming workflow with hard gates and process flow #462: Updates brainstorming skill's process flow and writing-plans skill transitions.
• fix: use git check-ignore for worktree gitignore verification #160: Modifies using-git-worktrees skill workflow integration and verification steps.

Suggested reviewers

• yoavsion

Poem

🐰 A worktree before we write the plans so grand,
Isolation first, as nature would command!
Git branches nested, workspace clean and bright,
The brainstorm flows into the work just right! 🌿

🚥 Pre-merge checks | ✅ 4

✅ Passed checks (4 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately captures the main change: restoring the worktree step in the brainstorming workflow, which aligns with the primary objective of fixing the removed using-git-worktrees invocation.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Merge Conflict Detection	✅ Passed	✅ No merge conflicts detected when merging into main

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing touches

🧪 Generate unit tests (beta)

• Create PR with unit tests
• Post copyable unit tests in a comment

---

No actionable comments were generated in the recent review. 🎉

Tip

Issue Planner is now in beta. Read the docs and try it out! Share your feedback on Discord.

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[qishaoyumu]

Hey @obra,

The worktree step got lost from brainstorming when the hard-gate enforcement was added (7f2ee61). This adds it back — same idea as #382 but for the brainstorming entry point.

In practice, the current workflow never auto-invokes using-git-worktrees. I have to manually stop after writing-plans kicks in and call using-git-worktrees myself, otherwise the implementation plan and all subsequent work end up in the main working tree instead of an isolated worktree.

Let me know if anything needs adjusting.