Phase Orchestrator
Goal
Run a phase-based plan through a repeatable delegated workflow. The plan is
the source of truth, any PRD/spec is supporting context, and each phase should
move through orientation, implementation, validation, review, plan updates, and
commits by default.
Use this skill only when the user explicitly asks for delegated phase
orchestration, invokes this skill, or asks to implement a plan/checklist using
subagents.
Companion Skills
This skill is the parent of a five-skill workflow:
write-phase-plan — authors plans in the format this skill consumes best.
phase-implementer — the delegated worker contract for implementing exactly
one phase (Phase Loop step 2).
phase-reviewer — the delegated worker contract for the review-and-fix pass
on a completed phase (Phase Loop step 4).
phase-final-reviewer — the delegated worker contract for the end-to-end
review of the whole feature after all phases (Final Whole-Feature Pass).
Each worker skill carries that role's standing rules: single-phase or
single-pass scope, no-revert discipline, no-commit default, and the required
final-response format. The parent's prompt only needs to supply the per-run
context from the templates below.
How to dispatch a worker role depends on the host:
- Named custom agents. If the host supports named custom agents or
subagent types (Cursor custom agents, for example), prefer a dedicated
agent per role whose definition is the matching companion skill's body.
- General subagent + installed skill. Otherwise, launch a general-purpose
subagent and instruct it to load and follow the matching installed
companion skill by name.
- Inline rules. If the subagent cannot load skills, paste the companion
skill's standing rules into the prompt along with the per-run context.
Host Mapping
- Use the host's todo tracker (
TodoWrite in Cursor) for the in-chat
orchestration state. Keep exactly one phase or orchestration step
in_progress.
- Use the host's subagent or task tool (
Subagent in Cursor) for delegated
implementation, broad read-only exploration, review/fix passes, validation,
and shell/git work when delegation is useful.
- Use fast read-only subagents (Cursor's
explore type, where available) for
broad codebase discovery before implementation.
- Use shell-focused subagents only for command-heavy validation or git
operations.
- Respect the user's or host's model choice for workers. Pass a model
explicitly only when the user requests a specific model for the run or for
a specific worker.
- Use background subagents when the host supports them and independent
read-only investigations can run in parallel.
- Do not assume subagents can be "closed"; inspect their final response and
continue from the parent agent.
- Record every spawned subagent's ID in the main thread (alongside its phase
in the todo/phase notes) when the host exposes one. Some hosts can resume a
completed subagent by ID with its full context preserved (Cursor's task
tool
resume parameter). The user may ask for flows that reuse the same
agent across the run — the same reviewer re-checking its own earlier
findings, or an implementer revisiting its phase after review — and
resuming beats a fresh dispatch there because the agent keeps everything it
already learned. Keeping the IDs in thread history is what makes that
possible later.
- Treat worker responses as structured handoffs. Require the result fields
defined below so the parent can compare and combine results without
carrying an unstructured transcript in context.
- Follow the host's normal tool rules: read tool schemas before unfamiliar
calls, avoid destructive git commands, and never revert user-owned work.
Inputs
Accept any of these as the plan source:
- A path to a plan, checklist, task breakdown, issue list, or phase document.
- A pasted plan in the conversation.
- A PRD or spec plus a request to derive implementation phases.
Optional inputs:
- PRD, design doc, ticket, issue, or acceptance criteria.
- Branch, commit style, validation commands, release constraints, or PR target.
- A stopping point such as "phase 2 only", "implementation only", or "no commits".
If the plan does not name phases, derive a conservative dependency-ordered phase
list and record that grouping in the plan or in the in-chat todos before
starting implementation.
The companion write-phase-plan skill defines the plan format this skill
consumes best (phase sections with status, scope, acceptance criteria,
validation commands, and an implementation log). A plan in that shape needs no
derivation step; prefer it when authoring a plan ahead of an orchestration run.
Orchestrator Duties
Before spawning implementation workers:
- Read the plan, optional PRD/spec, repo instructions, relevant contributor
docs, and current git status.
- Identify phases, dependencies, validation requirements, ownership boundaries,
and whether the user opted out of the default commit workflow.
- Create or update the in-chat todo plan with one active phase or orchestration
step.
- Note existing dirty worktree changes and treat them as user-owned unless a
subagent clearly made them for this workflow.
During the run:
- Execute phases sequentially unless the plan marks phases as independent and
their write scopes are disjoint.
- Give every subagent enough context to act safely: plan path, PRD/spec path,
phase scope, prior phase results, repo rules, validation commands, ownership
scope, dirty-worktree notes, and commit policy.
- Tell coding subagents they are not alone in the worktree, must not revert work
they did not make, and must adapt to existing or concurrent changes.
- If new information invalidates the plan, update the plan and downstream phase
items instead of silently following stale instructions.
- Keep the user updated at phase boundaries, before edits, during long
validation, and whenever a blocker or plan deviation appears.
Phase Topologies
The default topology for a phase is one implementer, then validation, then one
reviewer. During orientation, pick a different topology when the phase's shape
calls for it:
- Batch migration — one worker discovers the target items, parallel
implementers each own a disjoint batch, then aggregate validation and one
reviewer over the combined diff. For mechanical changes across many files.
- Audit / sweep — parallel read-only workers each inspect a slice, a
separate verifier confirms each finding against the code, and the parent
deduplicates and ranks before acting. For phases whose output is findings
rather than edits.
- Fix-until-green — run the failing check, dispatch a fix worker, re-run,
repeat. Stop when the check passes or two consecutive rounds make no
progress; then escalate to the user or update the plan instead of looping.
- Competing drafts — for a high-stakes design decision inside a phase, two
or three workers draft independently; the parent compares and adopts or
synthesizes one before implementation proceeds.
Rules for every topology: parallel workers must have disjoint write scopes;
every loop needs an explicit stop condition (success, an attempt ceiling, or
no-progress detection); and results come back in the Worker Result Contract
shape so the parent can combine them without carrying transcripts.
Phase Loop
Run this loop for each phase in dependency order.
1. Orient The Phase
- Re-read the phase section, acceptance criteria, and prior logs.
- Inspect git status and recent relevant commits.
- Choose the phase's topology (see Phase Topologies): the default single
implementer, or a fan-out/loop shape when the phase calls for one.
- Update the todo tracker before spawning workers.
2. Implementation Worker
Spawn a worker under the phase-implementer contract to implement only the
active phase. The worker edits files directly. The parent orchestrator owns
commits by default unless the user opted out or explicitly delegated commits
to a worker.
After the worker returns:
- Note its agent ID in the phase's todo/notes for possible resumption.
- Inspect its summary, changed paths, validation results, blockers, and risks.
- Inspect git status and a focused diff.
- If implementation is incomplete because assumptions changed, send a bounded
follow-up (resume the same worker by ID so it keeps its context) or update
the plan before continuing.
3. Validation
Run or delegate affected validation for the phase. Use the repo's documented
commands when available, and include tests, lint, typecheck, migrations, or
browser checks when relevant.
If validation cannot run, record the exact command, blocker, and risk in the
phase notes or plan log.
4. Review And Fix Worker
Spawn a worker under the phase-reviewer contract after implementation and
initial validation. Note its agent ID alongside the phase.
Build the review prompt from primary evidence first: the plan and acceptance
criteria, the actual diff or commit range, repo rules, and validation results.
Do not lead with the implementer's summary. Include implementer notes only as
supplemental context for the reviewer to consult after independently inspecting
the change. This avoids anchoring the review to what the implementer believed it
changed.
The reviewer/fixer should:
- Review the phase against the plan, PRD/spec, repo rules, security, tenancy/data
ownership, migrations, tests, and likely regressions.
- Patch concrete issues directly when bounded and low-risk.
- Leave review fixes uncommitted for the parent orchestrator to commit unless
the user opted out or explicitly delegated commits to the reviewer/fixer.
- Report no-op clearly if no changes are needed.
- Report larger design issues with the exact plan changes needed.
5. Default Commit
Commit each completed phase by default unless the user requested "no commits",
"implementation only", or another no-commit constraint. Prefer the parent
agent's normal commit workflow unless a dedicated shell subagent is clearly
useful.
When committing:
- Follow the host's git safety rules.
- Inspect git status, full staged/unstaged diff, and recent log first.
- Stage only files that belong to the active phase.
- Run repo-required pre-commit validation and affected tests.
- Fix validation failures only when the fix is clearly in phase scope.
- Create a focused commit, or report an explicit no-op if there are no phase
changes.
6. Plan Finalization
Update the plan or phase log for the active phase.
Record:
- Phase status: Done, Partial, or Blocked.
- Implementation summary and changed behavior.
- Validation commands and results.
- Review outcome.
- Commit SHAs, if commits were created.
- Deviations from the original plan.
- Downstream changes, remaining risks, and manual checks not performed.
Commit the plan/log update separately from implementation changes unless the
user opted out of commits.
Final Whole-Feature Pass
After all requested phases are finalized:
- Run aggregate validation appropriate for the whole feature.
- Spawn a worker under the
phase-final-reviewer contract to inspect the
complete feature against the plan and PRD/spec.
- If the final reviewer changed files, validate those fixes.
- Commit final fixes or final plan/log updates unless the user opted out of
commits.
- Give the user a concise final summary with phase status, validation, commit
SHAs if any, remaining manual gaps, and branch/worktree status.
Give the final reviewer the plan, acceptance criteria, complete diff or commit
range, and aggregate validation before phase summaries. Phase summaries are
supplemental and should be read only after an independent pass over the primary
evidence.
Worktrees And Stacked PRs (Option For Complex Plans)
For a plan with sequenced phases plus parallel tracks — especially when the
user's checkout is on their own branch, is behind the default branch, or
carries dirty user-owned work — run the orchestration in dedicated git
worktrees and land each phase as a PR in a stack, instead of committing to the
user's checkout.
When to choose this mode:
- The plan names foundations that later phases build on, so phases must land
as separate reviewable PRs in dependency order.
- Two or more tracks touch disjoint areas (for example API vs web) and can run
as concurrent implementation workers without colliding.
- The current checkout is not a safe base: behind origin, on a personal
branch, or dirty with user-owned edits.
Setup:
- Choose worktree locations and branch names from the target repo's
contributor docs and the user's rules — conventions differ (some require a
specific in-repo directory, others forbid one). Only when no rule exists,
default to a sibling directory such as
../<repo>-<feature>-work.
- Fetch and branch from
origin/<default-branch>, not the local checkout:
git worktree add <worktree-path> origin/<default-branch> --detach.
- Make the worktree runnable before spawning workers: copy gitignored env
files from the user's checkout, install dependencies, run the repo's
build-before-measure steps (built packages, generated clients). Workers
inherit a broken toolchain otherwise.
- Create one additional worktree per concurrent track
(
git worktree add <track-worktree-path> <base-branch> -b <track-branch>)
so parallel workers never share a checkout. Point each worker at its own
worktree path in its prompt.
- Remove temporary worktrees when done (
git worktree remove <worktree-path>),
and if the host can point its diff view at a worktree (Cursor's
SetActiveBranch), do so, so the IDE diff follows the work.
Branching and stacking:
- One branch per phase, cut from the previous phase's branch when the phase
depends on it: foundations first, then tracks stacked on the last foundation
they need. Parallel tracks branch from the same base, not from each other.
- Commit each phase on its branch (orchestrator owns commits), push with
git push -u origin <branch>, then open the PR with the gh CLI, setting
--base to the parent branch for stacked phases and to the default branch
for the stack root:
gh pr create --title "type(scope): subject" --body "$(cat <<'EOF' ... EOF)" --base <parent-branch>.
- Record the PR number in the phase's todo item so the final summary can map
phases to PRs.
- A schema/migration phase ships as its own PR based on the default branch;
code that depends on it stacks on the migration branch (many repos require
this — check the repo's contributor docs).
Keeping the stack healthy during the run:
- Check CI on every open PR after pushes (
gh pr checks <n>); investigate
failures with gh api .../actions/jobs/<id>/logs before assuming a worker's
change caused them — a failure may predate the stack's base.
- If the default branch gains a fix the stack needs, merge it forward through
the stack in order (base branch first, then each child), using a temporary
worktree if the branches are checked out elsewhere. Never rebase or
force-push pushed branches.
- When an inner PR merges early, GitHub retargets its children automatically;
verify with
gh pr view <n> --json baseRefName.
- Follow the repo's stack-collapse rules before final review if it has them
(prove containment with
git merge-base --is-ancestor before closing inner
PRs; the survivor merges, never closes).
The final summary must report the stack shape: which PRs are open, their base
branches, merge order, CI state, and which worktrees were created or removed.
Prompt Templates
Adapt these to the repo and phase. These templates are the per-invocation
context to hand each worker — the standing role rules (scope discipline,
no-commit default, response format) live in the companion skills, so the
prompt's job is the run-specific facts. If the worker runs as a named custom
agent built from the companion skill, the template alone is enough; if it runs
as a general subagent, prepend an instruction to load and follow the matching
companion skill, or paste that skill's standing rules above the template.
When resuming a prior worker by ID instead of dispatching fresh, send only
what changed since its last response; it retains the rest.
Worker Result Contract
Every worker response must use these headings in this order:
Outcome — concise result or explicit no-op.
Changed files — files the worker changed, not every file it inspected.
Behavior or findings — implemented behavior or review findings and fixes.
Validation — exact commands or checks and their results.
Downstream impact — plan changes, follow-up work, or None.
Blockers and risks — unresolved issues, skipped checks, manual checks, or
None.
Keep Changed files proportional. List paths individually when the list is
short. When it would become a long, low-signal inventory, group paths by
module/directory, give counts, and name only high-signal or exceptional files.
Label a grouped list as a summary rather than exhaustive; the parent inspects
git status and the diff for the authoritative file list.
Implementation Worker (phase-implementer)
You are implementing phase {phase_name} of this plan.
Context:
- Plan: {plan_path_or_summary}
- PRD/spec: {prd_path_or_summary_or_none}
- Prior phase commits and notes: {prior_phase_summary}
- Repo instructions and validation requirements: {repo_rules_summary}
- Current dirty-worktree notes: {dirty_worktree_summary}
Ownership:
- You own {owned_files_or_modules}.
- Other agents or the user may have changes in the worktree. Do not revert work
you did not make. Adapt to existing changes.
Task:
- Implement only phase {phase_name}.
- It is acceptable to deviate from the plan when the codebase shows a better
path, but document the reason and downstream impact.
- Commit policy: {commit_policy}. The parent orchestrator commits by default;
do not commit from this worker unless this explicitly delegates commit
authority to you.
Validation:
- Run {affected_tests_or_checks} where practical.
- If a required check is not practical, explain why.
Final response:
- Use the Worker Result Contract headings in order.
- In `Behavior or findings`, describe the behavior implemented.
Review And Fix Worker (phase-reviewer)
Review and fix phase {phase_name}.
Context:
- Plan: {plan_path_or_summary}
- PRD/spec: {prd_path_or_summary_or_none}
- Change under review: {commit_range_or_diff_scope}
- Validation evidence: {phase_validation_results}
- Repo rules: {repo_rules_summary}
- Commit policy: {commit_policy}
- Supplemental implementer notes: {phase_result}
Task:
- First inspect the plan, acceptance criteria, and actual change. Form an
independent assessment before reading the supplemental implementer notes.
- Review the phase against acceptance criteria, repo conventions, security,
tenancy/data ownership, migrations, and test coverage.
- Patch concrete issues directly when bounded and low-risk.
- Do not commit from this worker unless the commit policy explicitly delegates
commit authority to you.
- If no changes are needed, say so clearly.
- If the plan should change, describe the exact plan and downstream updates.
Final response:
- Use the Worker Result Contract headings in order.
- In `Behavior or findings`, report findings fixed, the no-op result, and any
findings not fixed.
Final Reviewer (phase-final-reviewer)
Review the entire feature after all requested phases.
Context:
- Plan: {plan_path}
- PRD/spec: {prd_path_or_none}
- Complete change: {commit_range_or_diff_scope}
- Final validation results so far: {validation_summary}
- Supplemental phase results: {all_phase_results}
Task:
- First inspect the plan, acceptance criteria, and complete change. Form an
independent assessment before reading the supplemental phase results.
- Review end-to-end behavior against the plan and PRD/spec.
- Look for integration bugs, missing acceptance criteria, stale plan state,
validation gaps, unsafe data ownership, and regressions across phase
boundaries.
- Patch only concrete issues that are safe to fix now.
- Do not commit from this worker unless the commit policy explicitly delegates
commit authority to you.
Final response:
- Use the Worker Result Contract headings in order.
- In `Behavior or findings`, report findings fixed, the no-op result, and any
findings not fixed.
Plan Conventions
Prefer a stable plan structure:
- Phase status: Not started, In progress, Done, Partial, or Blocked.
- Implementation log entries with date, phase, summary, validation, review
result, commits if any, deviations, and remaining risks.
- Downstream changes called out where the original phase plan changed.
- Manual checks listed separately from automated checks.
Do not let the plan become ceremonial. If implementation or review shows that a
task is obsolete, split, merged, or better solved differently, update the plan
and explain why.
Git And Validation Rules
- Follow repo contributor instructions before every commit.
- Use non-interactive git commands.
- Stage intentionally and avoid unrelated dirty files.
- Never use destructive git commands unless the user explicitly requested them.
- Keep implementation, review fixes, plan finalization, and final feature fixes
distinct when committing.
- For multi-phase plans that should land as reviewable PRs rather than commits
on the user's checkout, use the worktree + stacked-PR mode above.
- If required validation cannot run, record the command, blocker, and risk in
both the subagent result and the plan log.
1---2name: phase-orchestrator3description: Orchestrates phase-based implementation plans using the host's todo tracker and subagents for implementation, review, validation, default phase commits, plan finalization, and a final end-to-end review. Delegates work through the companion phase-implementer, phase-reviewer, and phase-final-reviewer skills and consumes plans in the write-phase-plan format. Use when the user provides a plan, checklist, PRD, or phase document and asks for delegated multi-agent execution across phases.4license: MIT5---67# Phase Orchestrator89## Goal1011Run a phase-based plan through a repeatable delegated workflow. The plan is12the source of truth, any PRD/spec is supporting context, and each phase should13move through orientation, implementation, validation, review, plan updates, and14commits by default.1516Use this skill only when the user explicitly asks for delegated phase17orchestration, invokes this skill, or asks to implement a plan/checklist using18subagents.1920## Companion Skills2122This skill is the parent of a five-skill workflow:2324- `write-phase-plan` — authors plans in the format this skill consumes best.25- `phase-implementer` — the delegated worker contract for implementing exactly26 one phase (Phase Loop step 2).27- `phase-reviewer` — the delegated worker contract for the review-and-fix pass28 on a completed phase (Phase Loop step 4).29- `phase-final-reviewer` — the delegated worker contract for the end-to-end30 review of the whole feature after all phases (Final Whole-Feature Pass).3132Each worker skill carries that role's standing rules: single-phase or33single-pass scope, no-revert discipline, no-commit default, and the required34final-response format. The parent's prompt only needs to supply the per-run35context from the templates below.3637How to dispatch a worker role depends on the host:38391. **Named custom agents.** If the host supports named custom agents or40 subagent types (Cursor custom agents, for example), prefer a dedicated41 agent per role whose definition is the matching companion skill's body.422. **General subagent + installed skill.** Otherwise, launch a general-purpose43 subagent and instruct it to load and follow the matching installed44 companion skill by name.453. **Inline rules.** If the subagent cannot load skills, paste the companion46 skill's standing rules into the prompt along with the per-run context.4748## Host Mapping4950- Use the host's todo tracker (`TodoWrite` in Cursor) for the in-chat51 orchestration state. Keep exactly one phase or orchestration step52 `in_progress`.53- Use the host's subagent or task tool (`Subagent` in Cursor) for delegated54 implementation, broad read-only exploration, review/fix passes, validation,55 and shell/git work when delegation is useful.56- Use fast read-only subagents (Cursor's `explore` type, where available) for57 broad codebase discovery before implementation.58- Use shell-focused subagents only for command-heavy validation or git59 operations.60- Respect the user's or host's model choice for workers. Pass a model61 explicitly only when the user requests a specific model for the run or for62 a specific worker.63- Use background subagents when the host supports them and independent64 read-only investigations can run in parallel.65- Do not assume subagents can be "closed"; inspect their final response and66 continue from the parent agent.67- Record every spawned subagent's ID in the main thread (alongside its phase68 in the todo/phase notes) when the host exposes one. Some hosts can resume a69 completed subagent by ID with its full context preserved (Cursor's task70 tool `resume` parameter). The user may ask for flows that reuse the same71 agent across the run — the same reviewer re-checking its own earlier72 findings, or an implementer revisiting its phase after review — and73 resuming beats a fresh dispatch there because the agent keeps everything it74 already learned. Keeping the IDs in thread history is what makes that75 possible later.76- Treat worker responses as structured handoffs. Require the result fields77 defined below so the parent can compare and combine results without78 carrying an unstructured transcript in context.79- Follow the host's normal tool rules: read tool schemas before unfamiliar80 calls, avoid destructive git commands, and never revert user-owned work.8182## Inputs8384Accept any of these as the plan source:8586- A path to a plan, checklist, task breakdown, issue list, or phase document.87- A pasted plan in the conversation.88- A PRD or spec plus a request to derive implementation phases.8990Optional inputs:9192- PRD, design doc, ticket, issue, or acceptance criteria.93- Branch, commit style, validation commands, release constraints, or PR target.94- A stopping point such as "phase 2 only", "implementation only", or "no commits".9596If the plan does not name phases, derive a conservative dependency-ordered phase97list and record that grouping in the plan or in the in-chat todos before98starting implementation.99100The companion `write-phase-plan` skill defines the plan format this skill101consumes best (phase sections with status, scope, acceptance criteria,102validation commands, and an implementation log). A plan in that shape needs no103derivation step; prefer it when authoring a plan ahead of an orchestration run.104105## Orchestrator Duties106107Before spawning implementation workers:1081091. Read the plan, optional PRD/spec, repo instructions, relevant contributor110 docs, and current git status.1112. Identify phases, dependencies, validation requirements, ownership boundaries,112 and whether the user opted out of the default commit workflow.1133. Create or update the in-chat todo plan with one active phase or orchestration114 step.1154. Note existing dirty worktree changes and treat them as user-owned unless a116 subagent clearly made them for this workflow.117118During the run:119120- Execute phases sequentially unless the plan marks phases as independent and121 their write scopes are disjoint.122- Give every subagent enough context to act safely: plan path, PRD/spec path,123 phase scope, prior phase results, repo rules, validation commands, ownership124 scope, dirty-worktree notes, and commit policy.125- Tell coding subagents they are not alone in the worktree, must not revert work126 they did not make, and must adapt to existing or concurrent changes.127- If new information invalidates the plan, update the plan and downstream phase128 items instead of silently following stale instructions.129- Keep the user updated at phase boundaries, before edits, during long130 validation, and whenever a blocker or plan deviation appears.131132## Phase Topologies133134The default topology for a phase is one implementer, then validation, then one135reviewer. During orientation, pick a different topology when the phase's shape136calls for it:137138- **Batch migration** — one worker discovers the target items, parallel139 implementers each own a disjoint batch, then aggregate validation and one140 reviewer over the combined diff. For mechanical changes across many files.141- **Audit / sweep** — parallel read-only workers each inspect a slice, a142 separate verifier confirms each finding against the code, and the parent143 deduplicates and ranks before acting. For phases whose output is findings144 rather than edits.145- **Fix-until-green** — run the failing check, dispatch a fix worker, re-run,146 repeat. Stop when the check passes or two consecutive rounds make no147 progress; then escalate to the user or update the plan instead of looping.148- **Competing drafts** — for a high-stakes design decision inside a phase, two149 or three workers draft independently; the parent compares and adopts or150 synthesizes one before implementation proceeds.151152Rules for every topology: parallel workers must have disjoint write scopes;153every loop needs an explicit stop condition (success, an attempt ceiling, or154no-progress detection); and results come back in the Worker Result Contract155shape so the parent can combine them without carrying transcripts.156157## Phase Loop158159Run this loop for each phase in dependency order.160161### 1. Orient The Phase162163- Re-read the phase section, acceptance criteria, and prior logs.164- Inspect git status and recent relevant commits.165- Choose the phase's topology (see Phase Topologies): the default single166 implementer, or a fan-out/loop shape when the phase calls for one.167- Update the todo tracker before spawning workers.168169### 2. Implementation Worker170171Spawn a worker under the `phase-implementer` contract to implement only the172active phase. The worker edits files directly. The parent orchestrator owns173commits by default unless the user opted out or explicitly delegated commits174to a worker.175176After the worker returns:177178- Note its agent ID in the phase's todo/notes for possible resumption.179- Inspect its summary, changed paths, validation results, blockers, and risks.180- Inspect git status and a focused diff.181- If implementation is incomplete because assumptions changed, send a bounded182 follow-up (resume the same worker by ID so it keeps its context) or update183 the plan before continuing.184185### 3. Validation186187Run or delegate affected validation for the phase. Use the repo's documented188commands when available, and include tests, lint, typecheck, migrations, or189browser checks when relevant.190191If validation cannot run, record the exact command, blocker, and risk in the192phase notes or plan log.193194### 4. Review And Fix Worker195196Spawn a worker under the `phase-reviewer` contract after implementation and197initial validation. Note its agent ID alongside the phase.198199Build the review prompt from primary evidence first: the plan and acceptance200criteria, the actual diff or commit range, repo rules, and validation results.201Do not lead with the implementer's summary. Include implementer notes only as202supplemental context for the reviewer to consult after independently inspecting203the change. This avoids anchoring the review to what the implementer believed it204changed.205206The reviewer/fixer should:207208- Review the phase against the plan, PRD/spec, repo rules, security, tenancy/data209 ownership, migrations, tests, and likely regressions.210- Patch concrete issues directly when bounded and low-risk.211- Leave review fixes uncommitted for the parent orchestrator to commit unless212 the user opted out or explicitly delegated commits to the reviewer/fixer.213- Report no-op clearly if no changes are needed.214- Report larger design issues with the exact plan changes needed.215216### 5. Default Commit217218Commit each completed phase by default unless the user requested "no commits",219"implementation only", or another no-commit constraint. Prefer the parent220agent's normal commit workflow unless a dedicated shell subagent is clearly221useful.222223When committing:224225- Follow the host's git safety rules.226- Inspect git status, full staged/unstaged diff, and recent log first.227- Stage only files that belong to the active phase.228- Run repo-required pre-commit validation and affected tests.229- Fix validation failures only when the fix is clearly in phase scope.230- Create a focused commit, or report an explicit no-op if there are no phase231 changes.232233### 6. Plan Finalization234235Update the plan or phase log for the active phase.236237Record:238239- Phase status: Done, Partial, or Blocked.240- Implementation summary and changed behavior.241- Validation commands and results.242- Review outcome.243- Commit SHAs, if commits were created.244- Deviations from the original plan.245- Downstream changes, remaining risks, and manual checks not performed.246247Commit the plan/log update separately from implementation changes unless the248user opted out of commits.249250## Final Whole-Feature Pass251252After all requested phases are finalized:2532541. Run aggregate validation appropriate for the whole feature.2552. Spawn a worker under the `phase-final-reviewer` contract to inspect the256 complete feature against the plan and PRD/spec.2573. If the final reviewer changed files, validate those fixes.2584. Commit final fixes or final plan/log updates unless the user opted out of259 commits.2605. Give the user a concise final summary with phase status, validation, commit261 SHAs if any, remaining manual gaps, and branch/worktree status.262263Give the final reviewer the plan, acceptance criteria, complete diff or commit264range, and aggregate validation before phase summaries. Phase summaries are265supplemental and should be read only after an independent pass over the primary266evidence.267268## Worktrees And Stacked PRs (Option For Complex Plans)269270For a plan with sequenced phases plus parallel tracks — especially when the271user's checkout is on their own branch, is behind the default branch, or272carries dirty user-owned work — run the orchestration in dedicated git273worktrees and land each phase as a PR in a stack, instead of committing to the274user's checkout.275276When to choose this mode:277278- The plan names foundations that later phases build on, so phases must land279 as separate reviewable PRs in dependency order.280- Two or more tracks touch disjoint areas (for example API vs web) and can run281 as concurrent implementation workers without colliding.282- The current checkout is not a safe base: behind origin, on a personal283 branch, or dirty with user-owned edits.284285Setup:2862871. Choose worktree locations and branch names from the target repo's288 contributor docs and the user's rules — conventions differ (some require a289 specific in-repo directory, others forbid one). Only when no rule exists,290 default to a sibling directory such as `../<repo>-<feature>-work`.2912. Fetch and branch from `origin/<default-branch>`, not the local checkout:292 `git worktree add <worktree-path> origin/<default-branch> --detach`.2933. Make the worktree runnable before spawning workers: copy gitignored env294 files from the user's checkout, install dependencies, run the repo's295 build-before-measure steps (built packages, generated clients). Workers296 inherit a broken toolchain otherwise.2974. Create one additional worktree per concurrent track298 (`git worktree add <track-worktree-path> <base-branch> -b <track-branch>`)299 so parallel workers never share a checkout. Point each worker at its own300 worktree path in its prompt.3015. Remove temporary worktrees when done (`git worktree remove <worktree-path>`),302 and if the host can point its diff view at a worktree (Cursor's303 `SetActiveBranch`), do so, so the IDE diff follows the work.304305Branching and stacking:306307- One branch per phase, cut from the previous phase's branch when the phase308 depends on it: foundations first, then tracks stacked on the last foundation309 they need. Parallel tracks branch from the same base, not from each other.310- Commit each phase on its branch (orchestrator owns commits), push with311 `git push -u origin <branch>`, then open the PR with the `gh` CLI, setting312 `--base` to the parent branch for stacked phases and to the default branch313 for the stack root:314 `gh pr create --title "type(scope): subject" --body "$(cat <<'EOF' ... EOF)" --base <parent-branch>`.315- Record the PR number in the phase's todo item so the final summary can map316 phases to PRs.317- A schema/migration phase ships as its own PR based on the default branch;318 code that depends on it stacks on the migration branch (many repos require319 this — check the repo's contributor docs).320321Keeping the stack healthy during the run:322323- Check CI on every open PR after pushes (`gh pr checks <n>`); investigate324 failures with `gh api .../actions/jobs/<id>/logs` before assuming a worker's325 change caused them — a failure may predate the stack's base.326- If the default branch gains a fix the stack needs, merge it forward through327 the stack in order (base branch first, then each child), using a temporary328 worktree if the branches are checked out elsewhere. Never rebase or329 force-push pushed branches.330- When an inner PR merges early, GitHub retargets its children automatically;331 verify with `gh pr view <n> --json baseRefName`.332- Follow the repo's stack-collapse rules before final review if it has them333 (prove containment with `git merge-base --is-ancestor` before closing inner334 PRs; the survivor merges, never closes).335336The final summary must report the stack shape: which PRs are open, their base337branches, merge order, CI state, and which worktrees were created or removed.338339## Prompt Templates340341Adapt these to the repo and phase. These templates are the per-invocation342context to hand each worker — the standing role rules (scope discipline,343no-commit default, response format) live in the companion skills, so the344prompt's job is the run-specific facts. If the worker runs as a named custom345agent built from the companion skill, the template alone is enough; if it runs346as a general subagent, prepend an instruction to load and follow the matching347companion skill, or paste that skill's standing rules above the template.348When resuming a prior worker by ID instead of dispatching fresh, send only349what changed since its last response; it retains the rest.350351### Worker Result Contract352353Every worker response must use these headings in this order:3543551. `Outcome` — concise result or explicit no-op.3562. `Changed files` — files the worker changed, not every file it inspected.3573. `Behavior or findings` — implemented behavior or review findings and fixes.3584. `Validation` — exact commands or checks and their results.3595. `Downstream impact` — plan changes, follow-up work, or `None`.3606. `Blockers and risks` — unresolved issues, skipped checks, manual checks, or361 `None`.362363Keep `Changed files` proportional. List paths individually when the list is364short. When it would become a long, low-signal inventory, group paths by365module/directory, give counts, and name only high-signal or exceptional files.366Label a grouped list as a summary rather than exhaustive; the parent inspects367git status and the diff for the authoritative file list.368369### Implementation Worker (`phase-implementer`)370371```text372You are implementing phase {phase_name} of this plan.373374Context:375- Plan: {plan_path_or_summary}376- PRD/spec: {prd_path_or_summary_or_none}377- Prior phase commits and notes: {prior_phase_summary}378- Repo instructions and validation requirements: {repo_rules_summary}379- Current dirty-worktree notes: {dirty_worktree_summary}380381Ownership:382- You own {owned_files_or_modules}.383- Other agents or the user may have changes in the worktree. Do not revert work384 you did not make. Adapt to existing changes.385386Task:387- Implement only phase {phase_name}.388- It is acceptable to deviate from the plan when the codebase shows a better389 path, but document the reason and downstream impact.390- Commit policy: {commit_policy}. The parent orchestrator commits by default;391 do not commit from this worker unless this explicitly delegates commit392 authority to you.393394Validation:395- Run {affected_tests_or_checks} where practical.396- If a required check is not practical, explain why.397398Final response:399- Use the Worker Result Contract headings in order.400- In `Behavior or findings`, describe the behavior implemented.401```402403### Review And Fix Worker (`phase-reviewer`)404405```text406Review and fix phase {phase_name}.407408Context:409- Plan: {plan_path_or_summary}410- PRD/spec: {prd_path_or_summary_or_none}411- Change under review: {commit_range_or_diff_scope}412- Validation evidence: {phase_validation_results}413- Repo rules: {repo_rules_summary}414- Commit policy: {commit_policy}415- Supplemental implementer notes: {phase_result}416417Task:418- First inspect the plan, acceptance criteria, and actual change. Form an419 independent assessment before reading the supplemental implementer notes.420- Review the phase against acceptance criteria, repo conventions, security,421 tenancy/data ownership, migrations, and test coverage.422- Patch concrete issues directly when bounded and low-risk.423- Do not commit from this worker unless the commit policy explicitly delegates424 commit authority to you.425- If no changes are needed, say so clearly.426- If the plan should change, describe the exact plan and downstream updates.427428Final response:429- Use the Worker Result Contract headings in order.430- In `Behavior or findings`, report findings fixed, the no-op result, and any431 findings not fixed.432```433434### Final Reviewer (`phase-final-reviewer`)435436```text437Review the entire feature after all requested phases.438439Context:440- Plan: {plan_path}441- PRD/spec: {prd_path_or_none}442- Complete change: {commit_range_or_diff_scope}443- Final validation results so far: {validation_summary}444- Supplemental phase results: {all_phase_results}445446Task:447- First inspect the plan, acceptance criteria, and complete change. Form an448 independent assessment before reading the supplemental phase results.449- Review end-to-end behavior against the plan and PRD/spec.450- Look for integration bugs, missing acceptance criteria, stale plan state,451 validation gaps, unsafe data ownership, and regressions across phase452 boundaries.453- Patch only concrete issues that are safe to fix now.454- Do not commit from this worker unless the commit policy explicitly delegates455 commit authority to you.456457Final response:458- Use the Worker Result Contract headings in order.459- In `Behavior or findings`, report findings fixed, the no-op result, and any460 findings not fixed.461```462463## Plan Conventions464465Prefer a stable plan structure:466467- Phase status: Not started, In progress, Done, Partial, or Blocked.468- Implementation log entries with date, phase, summary, validation, review469 result, commits if any, deviations, and remaining risks.470- Downstream changes called out where the original phase plan changed.471- Manual checks listed separately from automated checks.472473Do not let the plan become ceremonial. If implementation or review shows that a474task is obsolete, split, merged, or better solved differently, update the plan475and explain why.476477## Git And Validation Rules478479- Follow repo contributor instructions before every commit.480- Use non-interactive git commands.481- Stage intentionally and avoid unrelated dirty files.482- Never use destructive git commands unless the user explicitly requested them.483- Keep implementation, review fixes, plan finalization, and final feature fixes484 distinct when committing.485- For multi-phase plans that should land as reviewable PRs rather than commits486 on the user's checkout, use the worktree + stacked-PR mode above.487- If required validation cannot run, record the command, blocker, and risk in488 both the subagent result and the plan log.