fix: require worktree setup before subagent-driven-development and executing-plans

[clkao]

Summary

• Add using-git-worktrees as a required prerequisite for subagent-driven-development and executing-plans skills
• Add "never start on main/master without explicit user consent" to red flags
• Update using-git-worktrees to list these skills as callers
• Fix flaky test case-sensitivity and add tests for the new requirements

Problem

The subagent-driven-development and executing-plans skills execute implementation plans but don't require setting up an isolated workspace first. This leads to implementations being committed directly to main/master, which:

• Pollutes main with WIP commits
• Makes rollback difficult
• Prevents code review via PR
• Causes finishing-a-development-branch to fail (nothing to merge/PR)

Solution

• Make using-git-worktrees a required prerequisite in both skills
• Add explicit red flag warning about starting on main without consent
• Create bidirectional cross-references between the skills

Files Changed

File	Change
skills/subagent-driven-development/SKILL.md	Added worktree to required skills, added main branch red flag
skills/executing-plans/SKILL.md	Added Integration section with worktree requirement, added main branch warning
skills/using-git-worktrees/SKILL.md	Added subagent-driven-development and executing-plans as callers
tests/claude-code/test-subagent-driven-development.sh	Fixed case-sensitivity bug, added Tests 8 & 9

Test Plan

• Test 8 verifies worktree requirement is mentioned in skill
• Test 9 verifies main branch warning is present
• Cross-references are symmetric between skills

🤖 Generated with Claude Code

Summary by CodeRabbit

Release Notes

• Documentation

  • Added explicit policy requiring user consent before implementing changes on main/master branches
  • Introduced workflow prerequisites specifying required setup steps before task execution

• Tests

  • Added test coverage for branch policy enforcement and workflow prerequisite validation

_{✏️ Tip: You can customize this high-level summary in your review settings.}

[coderabbitai]

📝 Walkthrough

Walkthrough

Updates to workflow skill documentation and tests establish explicit prerequisites for git worktree setup and enforce safeguards against starting implementation on main/master branches without user consent. Changes span three skill definitions and related test validations.

Changes

Cohort / File(s)	Summary
Skill Documentation Updates skills/executing-plans/SKILL.md, skills/subagent-driven-development/SKILL.md, skills/using-git-worktrees/SKILL.md	Added explicit policies against main/master branch work without consent, introduced integration requirements for git worktree setup, and clarified prerequisite relationships between workflow skills.
Test Updates tests/claude-code/test-subagent-driven-development.sh	Extended test assertions to match multiple skill name variants and added validation for worktree prerequisites and main branch safeguard warnings.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Possibly related issues

• finishing-a-development-branch fails when run from within a worktree #167: Changes directly address workflow assumptions about git worktree integration with finishing-a-development-branch by establishing explicit prerequisites and safeguards that affect both skills' runtime context.

Possibly related PRs

• Add problem-solving skills from amplifier patterns #1: Modifies the same executing-plans skill documentation with related workflow governance changes.

Suggested reviewers

• yoavsion

Poem

🐰 A rabbit hops through git branches tall,
With worktrees set, they'll never fall,
"Not on main!" the warnings say,
Skills aligned in every way! 🌱

🚥 Pre-merge checks | ✅ 3

✅ Passed checks (3 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title directly and accurately describes the main change: making worktree setup a required prerequisite for two specific skills.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.

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

✨ Finishing touches

• 📝 Generate docstrings

🧪 Generate unit tests (beta)

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

Tip

🧪 Unit Test Generation v2 is now available!

We have significantly improved our unit test generation capabilities.

To enable: Add this to your .coderabbit.yaml configuration:

reviews:
  finishing_touches:
    unit_tests:
      enabled: true

Try it out by using the @coderabbitai generate unit tests command on your code files or under ✨ Finishing Touches on the walkthrough!

Have feedback? Share your thoughts on our Discord thread!

---

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

[obra]

Thanks! merged