prizmkit 1.1.128 → 1.1.129

package/bundled/dev-pipeline/templates/bootstrap-prompt.md

@@ -30,7 +30,7 @@ Infer what needs to be done from the feature context above and follow the standa
 
 3. **Implement**: Run `/prizmkit-implement` with `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/` to execute the plan using TDD (write tests first, then implement).
 
-4. **Review**: Run `/prizmkit-code-review` with `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/`. The Main Agent reviews the complete current change for up to ten rounds, directly repairs accepted findings, verifies repairs, and converges when accepted and unresolved findings are both zero. Do not spawn a code-review-specific subagent. Require the last `## Final Result` verdict before continuing.
+4. **Review**: Run `/prizmkit-code-review` with `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/`. The current Main Agent is the only Code Review executor. It reviews the complete current change for up to ten rounds, directly repairs accepted findings, verifies repairs, and converges when accepted and unresolved findings are both zero. Do not delegate review directly or indirectly, invoke another review skill/workflow, or relabel delegated work as a finder, verifier, audit, compatibility review, verification, or gap sweep. `review-report.md` is the only persisted review artifact. Require the last `## Final Result` verdict before continuing.
 
 5. **Test**: Run `/prizmkit-test scope=this-change artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/` to generate and verify tests only for this feature's changed scope after review. Do not use bugfix/refactor artifact directories for this gate.
 
@@ -44,7 +44,7 @@ Infer what needs to be done from the feature context above and follow the standa
 - Do NOT push to remote — the user will push manually.
 - Write all artifacts to `.prizmkit/specs/{{FEATURE_SLUG}}/`.
 - If a step fails after 3 attempts, write a status report and stop.
-- **Never re-read unmodified files**: once you read a file into context, do NOT read it again unless it was modified by an Edit/Write after your last read — use `grep -n`/`sed -n` for specific lines. Before issuing a Read, ask: "Have I read this file before, and has it changed since?" If no — do NOT read it. Reviewer subagents must rely on context-snapshot.md rather than re-reading files the orchestrator already read.
+- **Never re-read unmodified files**: once you read a file into context, do NOT read it again unless it was modified by an Edit/Write after your last read — use `grep -n`/`sed -n` for specific lines. Before issuing a Read, ask: "Have I read this file before, and has it changed since?" If no — do NOT read it. Normal work delegation outside Code Review must rely on context-snapshot.md rather than re-reading files the Main Agent already read. Code Review runs only in the current Main Agent.
 - **Read offset safety**: if Read returns "shorter than offset"/"empty" — run `wc -l` then `sed -n`, do NOT retry same offset.
 - **Hard Round Cap**: after 6 total test-fix rounds, STOP trial-and-error. Switch to read-once-then-rewrite. Do NOT exceed 7 rounds.
 - **Layered test**: debug with single-file tests, only run full suite as gate when single-file is green.

package/bundled/dev-pipeline/templates/bootstrap-tier3.md

@@ -1,4 +1,4 @@
-# Dev-Pipeline Session Bootstrap — Tier 3 (Orchestrator + Reviewer)
+# Dev-Pipeline Session Bootstrap — Tier 3 (Main-Agent Full Guardrails)
 
 ## Session Context
 
@@ -10,12 +10,12 @@
 
 You are the **session orchestrator**. Implement Feature {{FEATURE_ID}}: "{{FEATURE_TITLE}}".
 
-**CRITICAL**: You MUST NOT exit until ALL work is complete and committed. When you spawn Reviewer agents, wait for each to finish (run_in_background=false). Do NOT spawn agents in background and exit — that kills the session.
+**CRITICAL**: You MUST NOT exit until ALL work is complete and committed. Normal work delegation outside Code Review must finish before exit (`run_in_background=false`). Code Review never uses direct or indirect delegation.
 
-**Tier 3 — Orchestrator + Reviewer**: For complex features, the main orchestrator handles context, planning, and implementation directly. Do not spawn top-level Dev or Reviewer subagents; code review runs later through `/prizmkit-code-review`.
+**Tier 3 — Main-Agent Full Guardrails**: For complex features, the Main Agent handles context, planning, implementation, and Code Review directly. Do not spawn a top-level Dev implementation subagent. Code Review runs through `/prizmkit-code-review` without direct or indirect delegation.
 
 **Agent spawn failure policy (all Agent tool calls)**:
-- If spawning Reviewer fails with team/config/lock errors, retry at most once.
+- Code Review must not invoke another review skill/workflow or relabel delegated work as a finder, verifier, audit, compatibility review, verification, or gap sweep.
 - If the second attempt fails, do not keep spawning variants and do not enter artifact polling for Implementation Log, challenge report, or review report markers.
 - Use the documented inline/recovery fallback for that phase: write the required report yourself where possible, complete remaining work directly in the orchestrator when safe, or write `failure-log.md` with the spawn error and last observable state before stopping for recovery.
 - Apply the same cap to any re-spawn for report repair or resume prompts; do not burn multiple minutes on identical team/config/lock failures.
@@ -52,7 +52,7 @@ You are running in **headless non-interactive mode** with a FINITE context windo
 
 1. **context-snapshot.md is your single source of truth** — After Phase 1-2 makes it available, use it instead of re-reading individual source files. If you just created or updated it in this session, continue from the in-context content; read it only when resuming/continuing, after context compaction/loss, or when handing work to a subagent.
 2. **Never re-read your own writes** — After you create/modify a file, do NOT read it back to verify. Trust your write was correct.
-3. **Never re-read unmodified files** — Once you have read a file into context, do NOT read it again unless it was modified by an Edit/Write operation after your last read. Use platform file/search tools for targeted lookup; when shell-free helper lookup is needed, run `{{RUNTIME_HELPER_CMD}} text search <file> --pattern "<pattern>" --json`, then read only the smallest bounded range with the platform file-reading tool instead of full-file Read. Before issuing a Read, ask yourself: "Have I read this file before, and has it changed since?" If the answer is "no, it hasn't changed" — do NOT read it. This applies to all files including those summarized in context-snapshot.md Section 4. Reviewer subagents must receive context-snapshot.md and rely on it rather than independently re-reading the same files the orchestrator already read.
+3. **Never re-read unmodified files** — Once you have read a file into context, do NOT read it again unless it was modified by an Edit/Write operation after your last read. Use platform file/search tools for targeted lookup; when shell-free helper lookup is needed, run `{{RUNTIME_HELPER_CMD}} text search <file> --pattern "<pattern>" --json`, then read only the smallest bounded range with the platform file-reading tool instead of full-file Read. Before issuing a Read, ask yourself: "Have I read this file before, and has it changed since?" If the answer is "no, it hasn't changed" — do NOT read it. This applies to all files including those summarized in context-snapshot.md Section 4. Normal work delegation outside Code Review must receive context-snapshot.md and rely on it rather than independently re-reading files the Main Agent already read. Code Review runs only in the current Main Agent.
 4. **Stay focused** — Do NOT explore code unrelated to this feature. No curiosity-driven reads.
 4. **One task at a time** — In Phase 4 (implement), complete and test one task before starting the next.
 5. **Minimize tool output** — Never load full command output into context. First capture command output to a temp file using the command/tool output option or the host-appropriate redirection, then inspect only the final relevant lines and use targeted search helpers to extract the information needed for the current task. Only read the filtered result — never the raw full output.
@@ -67,12 +67,12 @@ You are running in **headless non-interactive mode** with a FINITE context windo
 ## PrizmKit Directory Convention
 
 ```
-.prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md  ← orchestrator writes Sections 1-4 + Implementation Log; Reviewer appends Review Notes
+.prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md  ← Main Agent writes Sections 1-4 + Implementation Log
 .prizmkit/specs/{{FEATURE_SLUG}}/spec.md
 .prizmkit/specs/{{FEATURE_SLUG}}/plan.md              ← includes Tasks section
 ```
 
-**`context-snapshot.md`** is the shared knowledge base. Orchestrator writes Sections 1-4 and the Implementation Log; Reviewer appends Review Notes. This eliminates redundant I/O across review and orchestration phases.
+**`context-snapshot.md`** is the implementation knowledge base. The Main Agent writes Sections 1-4 and the Implementation Log. Code Review writes only `review-report.md` and never appends separate Review Notes.
 
 ---
 
@@ -80,7 +80,7 @@ You are running in **headless non-interactive mode** with a FINITE context windo
 
 If any agent times out:
 1. `{{RUNTIME_HELPER_CMD}} artifact list .prizmkit/specs/{{FEATURE_SLUG}}` — check what exists
-2. If `context-snapshot.md` exists: open recovery prompt with `"Read .prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md for project context and any Implementation Log/Review Notes from previous agents. Run git diff HEAD to see actual code changes already made. Do NOT re-read individual source files unless the File Manifest directs you to."` + only remaining steps + `model: "lite"`
+2. If `context-snapshot.md` exists: open recovery prompt with `"Read .prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md for project context and the Implementation Log from previous normal work execution. Run git diff HEAD to see actual code changes already made. Do NOT re-read individual source files unless the File Manifest directs you to."` + only remaining steps + `model: "lite"`
 3. Max 2 retries per phase. After 2 failures, orchestrator completes the work directly and appends a Recovery Note to context-snapshot.md.
 
 ---
@@ -90,22 +90,21 @@ If any agent times out:
 {{IF_INIT_NEEDED}}
 ### Phase 0: Project Bootstrap
 - Run `/prizmkit-init` (invoke the prizmkit-init skill)
-- Run `{{PYTHON_CMD}} {{INIT_SCRIPT_PATH}} --project-root {{PROJECT_ROOT}} --feature-id {{FEATURE_ID}} --feature-slug {{FEATURE_SLUG}}`
+- Run `{{PYTHON_CMD}} .prizmkit/dev-pipeline/scripts/init-change-artifact.py --project-root {{PROJECT_ROOT}} --feature-id {{FEATURE_ID}} --feature-slug {{FEATURE_SLUG}}`
 - **CP-0**: Verify `.prizmkit/prizm-docs/root.prizm`, `.prizmkit/config.json` exist
 {{END_IF_INIT_NEEDED}}
-{{IF_INIT_DONE}}
 
 ### Step 1: Initialize
 
 1. Run init script:
-   `{{PYTHON_CMD}} {{INIT_SCRIPT_PATH}} --project-root {{PROJECT_ROOT}} --feature-id {{FEATURE_ID}} --feature-slug {{FEATURE_SLUG}}`
+   `{{PYTHON_CMD}} .prizmkit/dev-pipeline/scripts/init-change-artifact.py --project-root {{PROJECT_ROOT}} --feature-id {{FEATURE_ID}} --feature-slug {{FEATURE_SLUG}}`
 
 2. Check for existing artifacts:
    `{{RUNTIME_HELPER_CMD}} artifact exists .prizmkit/specs/{{FEATURE_SLUG}}`
 
 {{IF_FRESH_START}}
 ```bash
-{{PYTHON_CMD}} {{INIT_SCRIPT_PATH}} --project-root {{PROJECT_ROOT}} --feature-id {{FEATURE_ID}} --feature-slug {{FEATURE_SLUG}}
+{{PYTHON_CMD}} .prizmkit/dev-pipeline/scripts/init-change-artifact.py --project-root {{PROJECT_ROOT}} --feature-id {{FEATURE_ID}} --feature-slug {{FEATURE_SLUG}}
 ```
 {{END_IF_FRESH_START}}
 
@@ -182,7 +181,7 @@ Before proceeding past CP-1, verify:
 
 ### Phase 3: Plan Self-Check — Orchestrator Direct
 
-Do not spawn a top-level Reviewer subagent for planning analysis. Perform a bounded self-check before implementation:
+Do not delegate planning analysis. The current Main Agent performs a bounded self-check before implementation:
 
 1. Re-read only `context-snapshot.md`, `spec.md`, and `plan.md`.
 2. Cross-check spec.md and plan.md Tasks against the feature description and acceptance criteria.
@@ -208,7 +207,7 @@ Before starting, check plan.md Tasks:
 **3a.** Run `/prizmkit-implement` directly:
 - Continue from the `spec.md` / `plan.md` / `context-snapshot.md` content you created in Phase 1-2; do not re-read self-authored artifacts just because implementation starts
 - Re-read `plan.md` or `context-snapshot.md` only when resuming/continuing, when current context was compacted or lost, or when task checkbox state may have changed outside this session
-- If implementation is delegated to a Dev subagent, the subagent must read `spec.md` if the artifact exists, plus `plan.md` and `context-snapshot.md`, before editing
+- Implementation remains in the current Main Agent; do not delegate it to a Dev subagent
 - Use context-snapshot.md Section 4 File Manifest for targeted source reads; avoid re-reading source files already summarized there unless they changed after the snapshot
 - Implements task-by-task, marking each `[x]` immediately
 - Remeber to update checkpoints after finishing a series of tasks
@@ -238,9 +237,11 @@ For each Verification Gate from the Task Contract, write one evidence line to Im
 
 ### Review — Code Review
 
-Review the completed implementation before the scoped feature test gate runs. Use `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/` so the code-review skill can read spec, plan, context snapshot, implementation log, and current diff artifacts. Do not require or read a prior `/prizmkit-test` report here; test generation and test-fix looping happen in the next phase.
+Review the completed implementation before the scoped feature test gate runs. Use `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/` so `/prizmkit-code-review` can read the spec, plan, context snapshot, implementation log, and current diff. Do not require or read a prior `/prizmkit-test` report here; test generation and test-fix looping happen in the next phase.
 
-Run `/prizmkit-code-review` with `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/`. The skill runs a Main-Agent review loop for up to ten completed rounds, directly repairs accepted findings, verifies repairs, and converges when accepted and unresolved findings are both zero. Do not spawn a code-review-specific subagent. Missing required evidence, unsafe repair, failed verification, or round-ten non-convergence produces `NEEDS_FIXES`. The skill owns append-only report progress.
+Run `/prizmkit-code-review` with `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/`. The skill runs a Main-Agent review loop for up to ten completed rounds. The current Main Agent is the only Code Review executor: it directly reviews, repairs accepted findings, verifies repairs, and converges when accepted and unresolved findings are both zero.
+
+The Code Review execution boundary is absolute: do not delegate review directly or indirectly. Do not invoke another review skill or review workflow. Do not relabel delegated work as a finder, verifier, audit, compatibility review, verification, or gap sweep. Direct reading, searching, editing, and testing by the current Main Agent remain allowed. `review-report.md` is the only persisted review artifact. Missing required evidence, unsafe repair, failed verification, or round-ten non-convergence produces `NEEDS_FIXES`.
 
 **Gate Check — Final Review Result**:
 ```bash
@@ -518,9 +519,9 @@ If you encounter an unrecoverable error, context overflow, or are about to exit
 ## Reminders
 
 - Tier 3: orchestrator implements directly; `/prizmkit-code-review` handles review later
-- context-snapshot.md is append-only: orchestrator writes Sections 1-4 + Implementation Log, Reviewer appends Review Notes
-- Gate checks enforce Implementation Log and Review Notes are written before proceeding
-- Do NOT use `run_in_background=true` when spawning Reviewer agents
+- context-snapshot.md contains Main-Agent implementation context; Code Review writes only review-report.md
+- Gate checks require the Implementation Log and a valid review-report.md Final Result before proceeding
+- Code Review never uses direct or indirect delegation; normal work delegation outside review must not use `run_in_background=true`
 - Commit phase must use `/prizmkit-committer`; do NOT replace with manual git commit commands
 - **NEVER delete, modify, or touch any file under `.prizmkit/state/`** — those are pipeline runtime files managed by the runner
 - NEVER run `rm -rf`, `git clean`, or any destructive filesystem operations

package/bundled/dev-pipeline/templates/refactor-bootstrap-prompt.md

@@ -17,7 +17,7 @@ You are the **refactor session orchestrator**. Execute Refactor {{REFACTOR_ID}}:
 
 **NON-INTERACTIVE MODE**: You are running in headless non-interactive mode. There is NO human on the other end. NEVER ask for user confirmation, NEVER wait for user input, and NEVER use interactive prompts. Resolve uncertainty from existing code, project docs, and conservative behavior-preserving defaults.
 
-**ORCHESTRATOR-DIRECT RULE**: Do not spawn top-level Dev or Reviewer subagents. The main orchestrator plans, implements via `/prizmkit-implement`, and runs `/prizmkit-code-review` directly.
+**MAIN-AGENT-DIRECT RULE**: Do not spawn a top-level Dev implementation subagent. The Main Agent plans, implements via `/prizmkit-implement`, and runs `/prizmkit-code-review` directly without direct or indirect review delegation.
 
 **REFACTOR DOCUMENTATION POLICY**:
 - Default: run `/prizmkit-retrospective` with full sync because refactoring changes structure and interfaces.
@@ -249,7 +249,7 @@ Before exiting, write `{{SESSION_STATUS_PATH}}`:
 ## Reminders
 
 - Use L1 skills: `/prizmkit-plan`, `/prizmkit-implement`, `/prizmkit-code-review`, `/prizmkit-retrospective`, `/prizmkit-committer`.
-- Do not spawn top-level Dev or Reviewer subagents.
+- Do not spawn a top-level Dev implementation subagent; Code Review runs only in the current Main Agent without delegation.
 - Behavior preservation is the first priority.
 - Browser verification is a mandatory attempt by default; it blocks only when explicitly required.
 - If `DEV_PORT` is unknown, discover it from project config; do not guess port 3000.

package/bundled/dev-pipeline/templates/sections/bugfix-mission.md

@@ -6,4 +6,4 @@ You are the **bug fix session orchestrator**. Fix Bug {{BUG_ID}}: "{{BUG_TITLE}}
 
 **NON-INTERACTIVE MODE**: There is NO human on the other end. NEVER ask for user confirmation, NEVER wait for user input. Make decisions autonomously from the bug report, existing code, tests, and conservative project patterns.
 
-**Execution model**: You implement directly in the current checkout. Do not spawn a top-level Dev subagent. `/prizmkit-code-review` owns its internal Reviewer Agent → filter → orchestrator fix loop.
+**Execution model**: You implement directly in the current checkout. Do not spawn a top-level Dev subagent. The current Main Agent runs `/prizmkit-code-review` directly and owns its complete review, repair, verification, and reporting loop without direct or indirect review delegation.

package/bundled/dev-pipeline/templates/sections/bugfix-phase-review.md

@@ -12,9 +12,17 @@ If `FAST_PATH=true`, skip this phase intentionally:
 
 Then continue to the next checkpoint step.
 
-Otherwise, run `/prizmkit-code-review` with `artifact_dir=.prizmkit/bugfix/{{BUG_ID}}/`. The skill runs a Main-Agent review loop for up to ten completed rounds. The Main Agent reviews the complete current change, rejects unsupported candidate findings, directly repairs accepted findings, verifies repairs, and repeats until `accepted = 0` with no unresolved findings.
+Otherwise, run `/prizmkit-code-review` with `artifact_dir=.prizmkit/bugfix/{{BUG_ID}}/`. The skill runs a Main-Agent review loop for up to ten completed rounds. The current Main Agent is the only Code Review executor: it reviews the complete current change, rejects unsupported candidate findings, directly repairs accepted findings, verifies repairs, and repeats until `accepted = 0` with no unresolved findings.
 
-The skill owns the full loop and append-only progress in `review-report.md`. Do not spawn a top-level or code-review-specific subagent. Missing required evidence, an unsafe repair, a failed verification, or failure to converge by round ten produces `NEEDS_FIXES`.
+The Code Review execution boundary is absolute for this phase:
+
+- Do not delegate any review work directly or indirectly.
+- Do not invoke another review skill or review workflow.
+- Do not use a general-purpose execution unit for review or relabel delegated work as a finder, verifier, audit, compatibility review, verification, or gap sweep.
+- Direct reading, searching, editing, and testing by the current Main Agent remain allowed.
+- `review-report.md` is the only persisted review artifact; do not append separate Review Notes to another artifact.
+
+Missing required evidence, an unsafe repair, a failed verification, or failure to converge by round ten produces `NEEDS_FIXES`.
 
 **Gate Check — Final Review Result**:
 

package/bundled/dev-pipeline/templates/sections/context-budget-rules.md

@@ -6,7 +6,7 @@ You are running in **headless non-interactive mode** with a FINITE context windo
 
 1. **context-snapshot.md is your single source of truth** — After it is available, use it instead of re-reading individual source files. If you just created or updated it in this session, continue from the in-context content; read it only when resuming/continuing, after context compaction/loss, or when handing work to a subagent.
 2. **Never re-read your own writes** — After you create/modify a file, do NOT read it back to verify. Trust your write was correct.
-3. **Never re-read unmodified files** — Once you have read a file into context, do NOT read it again unless it was modified by an Edit/Write operation after your last read. Use platform file/search tools for targeted lookup; when shell-free helper lookup is needed, run `{{RUNTIME_HELPER_CMD}} text search <file> --pattern "<pattern>" --json`, then read only the smallest bounded range with the platform file-reading tool instead of full-file Read. Before issuing a Read, ask yourself: "Have I read this file before, and has it changed since?" If the answer is "no, it hasn't changed" — do NOT read it. This applies to all files including those summarized in context-snapshot.md Section 4. Reviewer subagents must receive context-snapshot.md and rely on it rather than independently re-reading the same files the orchestrator already read.
+3. **Never re-read unmodified files** — Once you have read a file into context, do NOT read it again unless it was modified by an Edit/Write operation after your last read. Use platform file/search tools for targeted lookup; when shell-free helper lookup is needed, run `{{RUNTIME_HELPER_CMD}} text search <file> --pattern "<pattern>" --json`, then read only the smallest bounded range with the platform file-reading tool instead of full-file Read. Before issuing a Read, ask yourself: "Have I read this file before, and has it changed since?" If the answer is "no, it hasn't changed" — do NOT read it. This applies to all files summarized in context-snapshot.md Section 4. Normal work delegation outside Code Review must receive context-snapshot.md and rely on it rather than independently re-reading files the Main Agent already read. Code Review is excluded from normal work delegation and runs only in the current Main Agent.
 4. **Stay focused** — Do NOT explore code unrelated to this feature. No curiosity-driven reads.
 5. **One task at a time** — Complete and test one task before starting the next.
 6. **Minimize tool output** — Never load full command output into context. First capture command output to a temp file using the command/tool output option or the host-appropriate redirection, then inspect only the final relevant lines and use targeted search helpers to extract the information needed for the current task. Only read the filtered result — never the raw full output.

package/bundled/dev-pipeline/templates/sections/directory-convention-agent.md

@@ -1,8 +1,9 @@
 ## PrizmKit Directory Convention
 
 ```
-.prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md  ← orchestrator writes Sections 1-4 + Implementation Log; Reviewer appends Review Notes
+.prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md  ← Main Agent writes Sections 1-4 + Implementation Log
 .prizmkit/specs/{{FEATURE_SLUG}}/plan.md              ← includes Tasks section
+.prizmkit/specs/{{FEATURE_SLUG}}/review-report.md     ← Main Agent writes Code Review progress and Final Result
 ```
 
-**`context-snapshot.md`** is the shared knowledge base. Orchestrator writes Sections 1-4 and the Implementation Log; Reviewer appends Review Notes. Append-only after initial creation.
+**`context-snapshot.md`** is the implementation knowledge base and remains append-only after initial creation. Code Review writes only `review-report.md`; it does not append separate Review Notes to the context snapshot.

package/bundled/dev-pipeline/templates/sections/directory-convention-full.md

@@ -1,9 +1,10 @@
 ## PrizmKit Directory Convention
 
 ```
-.prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md  ← orchestrator writes Sections 1-4 + Implementation Log; Reviewer appends Review Notes
+.prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md  ← Main Agent writes Sections 1-4 + Implementation Log
 .prizmkit/specs/{{FEATURE_SLUG}}/spec.md
 .prizmkit/specs/{{FEATURE_SLUG}}/plan.md              ← includes Tasks section
+.prizmkit/specs/{{FEATURE_SLUG}}/review-report.md     ← Main Agent writes Code Review progress and Final Result
 ```
 
-**`context-snapshot.md`** is the shared knowledge base. Orchestrator writes Sections 1-4 and the Implementation Log; Reviewer appends Review Notes. This eliminates redundant I/O across review and orchestration phases.
+**`context-snapshot.md`** is the implementation knowledge base. The Main Agent writes Sections 1-4 and the Implementation Log. Code Review writes only `review-report.md`; it does not append separate Review Notes to the context snapshot.

package/bundled/dev-pipeline/templates/sections/phase-commit-full.md

@@ -72,4 +72,4 @@ After all of the following are true, the session is **TERMINAL**:
 - `.prizmkit/specs/{{FEATURE_SLUG}}/completion-summary.json` is written
 - the `prizmkit-committer` checkpoint is marked `completed`
 
-At that point, stop immediately. Do **not** process delayed teammate/reviewer findings, do **not** edit files, do **not** amend the commit, and do **not** start any new tool calls. Any findings that arrive after S09 is completed are follow-up work for a later session, not part of this feature commit.
+At that point, stop immediately. Do **not** process delayed normal-work results, edit files, amend the commit, or start any new tool calls. Code Review cannot have delayed delegated findings because it runs only in the current Main Agent. Any normal-work result that arrives after S09 is completed is follow-up work for a later session, not part of this feature commit.

package/bundled/dev-pipeline/templates/sections/phase-commit.md

@@ -58,4 +58,4 @@ After all of the following are true, the session is **TERMINAL**:
 - `.prizmkit/specs/{{FEATURE_SLUG}}/completion-summary.json` is written
 - the `prizmkit-committer` checkpoint is marked `completed`
 
-At that point, stop immediately. Do **not** process delayed teammate/reviewer findings, do **not** edit files, do **not** amend the commit, and do **not** start any new tool calls. Any findings that arrive after S09 is completed are follow-up work for a later session, not part of this feature commit.
+At that point, stop immediately. Do **not** process delayed normal-work results, edit files, amend the commit, or start any new tool calls. Code Review cannot have delayed delegated findings because it runs only in the current Main Agent. Any normal-work result that arrives after S09 is completed is follow-up work for a later session, not part of this feature commit.

package/bundled/dev-pipeline/templates/sections/phase-implement-agent.md

@@ -14,7 +14,7 @@ Before starting, check plan.md Tasks:
 **3a.** Run `/prizmkit-implement` directly:
 - Continue from the `spec.md` / `plan.md` / `context-snapshot.md` content you created in Phase 1-2; do not re-read self-authored artifacts just because implementation starts
 - Re-read `plan.md` or `context-snapshot.md` only when resuming/continuing, when current context was compacted or lost, or when task checkbox state may have changed outside this session
-- If implementation is delegated to a Dev subagent, the subagent must read `spec.md` if the artifact exists, plus `plan.md` and `context-snapshot.md`, before editing
+- Implementation remains in the current Main Agent; do not delegate it to a Dev subagent
 - Use context-snapshot.md Section 4 File Manifest for targeted source reads; avoid re-reading source files already summarized there unless they changed after the snapshot
 - Implements task-by-task, marking each `[x]` immediately
 - Remeber to update checkpoints after finishing a series of tasks

package/bundled/dev-pipeline/templates/sections/phase-implement-full.md

@@ -14,7 +14,7 @@ Before starting, check plan.md Tasks:
 **3a.** Run `/prizmkit-implement` directly:
 - Continue from the `spec.md` / `plan.md` / `context-snapshot.md` content you created in Phase 1-2; do not re-read self-authored artifacts just because implementation starts
 - Re-read `plan.md` or `context-snapshot.md` only when resuming/continuing, when current context was compacted or lost, or when task checkbox state may have changed outside this session
-- If implementation is delegated to a Dev subagent, the subagent must read `spec.md` if the artifact exists, plus `plan.md` and `context-snapshot.md`, before editing
+- Implementation remains in the current Main Agent; do not delegate it to a Dev subagent
 - Use context-snapshot.md Section 4 File Manifest for targeted source reads; avoid re-reading source files already summarized there unless they changed after the snapshot
 - Implements task-by-task, marking each `[x]` immediately
 - Remeber to update checkpoints after finishing a series of tasks

package/bundled/dev-pipeline/templates/sections/phase-review-agent.md

@@ -1,10 +1,18 @@
 ### Review — Code Review
 
-Review the completed implementation before the scoped feature test gate runs. Use `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/` so the code-review skill can read spec, plan, context snapshot, implementation log, and current diff artifacts. Do not require a prior `/prizmkit-test` report here; the next phase owns the formal test gate.
+Review the completed implementation before the scoped feature test gate runs. Use `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/` so `/prizmkit-code-review` can read the spec, plan, context snapshot, implementation log, and current diff. Do not require a prior `/prizmkit-test` report here; the next phase owns the formal test gate.
 
-Run `/prizmkit-code-review` with `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/`. The skill runs a Main-Agent review loop for up to ten completed rounds. The Main Agent reviews the complete current change, rejects unsupported candidate findings, directly repairs accepted findings, verifies repairs, and repeats until `accepted = 0` with no unresolved findings.
+Run `/prizmkit-code-review` with `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/`. The skill runs a Main-Agent review loop for up to ten completed rounds. The current Main Agent is the only Code Review executor: it reviews the complete current change, rejects unsupported candidate findings, directly repairs accepted findings, verifies repairs, and repeats until `accepted = 0` with no unresolved findings.
 
-The skill owns the full loop and append-only progress in `review-report.md`. Do not spawn a top-level or code-review-specific subagent. Missing required evidence, an unsafe repair, a failed verification, or failure to converge by round ten produces `NEEDS_FIXES`.
+The Code Review execution boundary is absolute for this phase:
+
+- Do not delegate any review work directly or indirectly.
+- Do not invoke another review skill or review workflow.
+- Do not use a general-purpose execution unit for review or relabel delegated work as a finder, verifier, audit, compatibility review, verification, or gap sweep.
+- Direct reading, searching, editing, and testing by the current Main Agent remain allowed.
+- `review-report.md` is the only persisted review artifact; do not append separate Review Notes to `context-snapshot.md`.
+
+Missing required evidence, an unsafe repair, a failed verification, or failure to converge by round ten produces `NEEDS_FIXES`.
 
 **Gate Check — Final Review Result**:
 

package/bundled/dev-pipeline/templates/sections/phase-review-full.md

@@ -1,10 +1,18 @@
 ### Review — Code Review
 
-Review the completed implementation before the scoped feature test gate runs. Use `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/` so the code-review skill can read spec, plan, context snapshot, implementation log, and current diff artifacts. Do not require a prior `/prizmkit-test` report here; the next phase owns the formal test gate.
+Review the completed implementation before the scoped feature test gate runs. Use `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/` so `/prizmkit-code-review` can read the spec, plan, context snapshot, implementation log, and current diff. Do not require a prior `/prizmkit-test` report here; the next phase owns the formal test gate.
 
-Run `/prizmkit-code-review` with `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/`. The skill runs a Main-Agent review loop for up to ten completed rounds. The Main Agent reviews the complete current change, rejects unsupported candidate findings, directly repairs accepted findings, verifies repairs, and repeats until `accepted = 0` with no unresolved findings.
+Run `/prizmkit-code-review` with `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/`. The skill runs a Main-Agent review loop for up to ten completed rounds. The current Main Agent is the only Code Review executor: it reviews the complete current change, rejects unsupported candidate findings, directly repairs accepted findings, verifies repairs, and repeats until `accepted = 0` with no unresolved findings.
 
-The skill owns the full loop and append-only progress in `review-report.md`. Do not spawn a top-level or code-review-specific subagent. Missing required evidence, an unsafe repair, a failed verification, or failure to converge by round ten produces `NEEDS_FIXES`.
+The Code Review execution boundary is absolute for this phase:
+
+- Do not delegate any review work directly or indirectly.
+- Do not invoke another review skill or review workflow.
+- Do not use a general-purpose execution unit for review or relabel delegated work as a finder, verifier, audit, compatibility review, verification, or gap sweep.
+- Direct reading, searching, editing, and testing by the current Main Agent remain allowed.
+- `review-report.md` is the only persisted review artifact; do not append separate Review Notes to `context-snapshot.md`.
+
+Missing required evidence, an unsafe repair, a failed verification, or failure to converge by round ten produces `NEEDS_FIXES`.
 
 **Gate Check — Final Review Result**:
 

package/bundled/dev-pipeline/templates/sections/phase-specify-plan-full.md

@@ -71,7 +71,7 @@ Before proceeding past CP-1, verify:
 
 ### Plan Self-Check — Orchestrator Direct
 
-Do not spawn a top-level Reviewer subagent for planning analysis. Perform a bounded self-check before implementation:
+Do not delegate planning analysis. The current Main Agent performs a bounded self-check before implementation:
 
 1. Re-read only `context-snapshot.md`, `spec.md`, and `plan.md`.
 2. Cross-check spec.md and plan.md Tasks against the feature description and Verification Gates in the Task Contract.

package/bundled/dev-pipeline/templates/sections/phase0-init.md

@@ -1,6 +1,6 @@
 ### Phase 0: Project Bootstrap
 - Run `/prizmkit-init` (invoke the prizmkit-init skill)
-- Run `{{PYTHON_CMD}} {{INIT_SCRIPT_PATH}} --project-root {{PROJECT_ROOT}} --feature-id {{FEATURE_ID}} --feature-slug {{FEATURE_SLUG}}`
+- Run `{{PYTHON_CMD}} .prizmkit/dev-pipeline/scripts/init-change-artifact.py --project-root {{PROJECT_ROOT}} --feature-id {{FEATURE_ID}} --feature-slug {{FEATURE_SLUG}}`
 - **CP-0**: Verify `.prizmkit/prizm-docs/root.prizm`, `.prizmkit/config.json` exist
 
 

package/bundled/dev-pipeline/templates/sections/refactor-mission.md

@@ -4,6 +4,6 @@ You are the **refactor session orchestrator**. Execute Refactor {{REFACTOR_ID}}:
 
 **CRITICAL**: Preserve observable behavior. Do not change product behavior unless the refactor contract explicitly requires it.
 
-**Execution model**: You implement directly in the current checkout. Do not spawn a top-level Dev subagent. Do not spawn a top-level Reviewer subagent. `/prizmkit-code-review` owns its internal Reviewer Agent → filter → orchestrator fix loop.
+**Execution model**: You implement directly in the current checkout. Do not spawn a top-level Dev subagent. The current Main Agent runs `/prizmkit-code-review` directly and owns its complete review, repair, verification, and reporting loop without direct or indirect review delegation.
 
 **NON-INTERACTIVE MODE**: There is NO human on the other end. Resolve uncertainty from existing code and conservative project patterns.

package/bundled/dev-pipeline/templates/sections/refactor-phase-review.md

@@ -1,8 +1,16 @@
 ### Phase 3: Review — Code Review & Behavior Verification
 
-Run `/prizmkit-code-review` directly with `artifact_dir=.prizmkit/refactor/{{REFACTOR_ID}}/`. The skill runs a Main-Agent review loop for up to ten completed rounds. The Main Agent reviews the complete current change, rejects unsupported candidate findings, directly repairs accepted findings, verifies repairs, and repeats until `accepted = 0` with no unresolved findings.
+Run `/prizmkit-code-review` directly with `artifact_dir=.prizmkit/refactor/{{REFACTOR_ID}}/`. The skill runs a Main-Agent review loop for up to ten completed rounds. The current Main Agent is the only Code Review executor: it reviews the complete current change, rejects unsupported candidate findings, directly repairs accepted findings, verifies repairs, and repeats until `accepted = 0` with no unresolved findings.
 
-Do not spawn a top-level or code-review-specific subagent. The code-review skill owns the complete loop and append-only report progress. Missing required evidence, an unsafe repair, a failed verification, or failure to converge by round ten produces `NEEDS_FIXES`.
+The Code Review execution boundary is absolute for this phase:
+
+- Do not delegate any review work directly or indirectly.
+- Do not invoke another review skill or review workflow.
+- Do not use a general-purpose execution unit for review or relabel delegated work as a finder, verifier, audit, compatibility review, verification, or gap sweep.
+- Direct reading, searching, editing, and testing by the current Main Agent remain allowed.
+- `review-report.md` is the only persisted review artifact; do not append separate Review Notes to another artifact.
+
+Missing required evidence, an unsafe repair, a failed verification, or failure to converge by round ten produces `NEEDS_FIXES`.
 
 **Gate Check — Final Review Result**:
 
@@ -14,6 +22,6 @@ Do not spawn a top-level or code-review-specific subagent. The code-review skill
 - `REVIEW_NEEDS_FIXES` → log unresolved findings and proceed only when they do not block behavior preservation under explicit task policy.
 - `REVIEW_INCOMPLETE` or `REVIEW_INVALID` → inspect progress once, write `failure-log.md`, and stop. Do not accept stale verdict text or synthesize a passing result outside the skill.
 
-Verify the review explicitly checks behavior preservation, public API compatibility, imports, tests, and rollback assumptions.
+Verify directly that the review checks behavior preservation, public API compatibility, imports, tests, and rollback assumptions.
 
 **Checkpoint update**: Set step `prizmkit-code-review` to `completed` only for an accepted valid Final Result. Do not complete the checkpoint for incomplete or invalid reports.

package/bundled/dev-pipeline/templates/sections/refactor-reminders.md

@@ -3,7 +3,7 @@
 - Use L1 skills: `/prizmkit-plan`, `/prizmkit-implement`, `/prizmkit-code-review`, `/prizmkit-retrospective`, `/prizmkit-committer`.
 - All refactor skills use `artifact_dir=.prizmkit/refactor/{{REFACTOR_ID}}/`.
 - Behavior preservation is the first priority.
-- Do not spawn top-level Dev or Reviewer subagents.
+- Do not spawn a top-level Dev implementation subagent; Code Review runs only in the current Main Agent without delegation.
 - Main orchestrator runs `/prizmkit-code-review` directly.
 - Commit with `refactor(<scope>):`, not `feat:` or `fix:`.
 - Checkpoint state is the recovery truth; skipped steps must be marked `skipped`.

package/bundled/dev-pipeline/templates/sections/subagent-timeout-recovery.md

@@ -1,6 +1,8 @@
-## Subagent Timeout Recovery
+## Normal Work Delegation Timeout Recovery
 
-If any agent times out:
+This recovery path applies only to normal work delegated outside Code Review. Code Review never uses delegated execution or this retry procedure.
+
+If a normal work execution unit times out:
 1. `{{RUNTIME_HELPER_CMD}} artifact list .prizmkit/specs/{{FEATURE_SLUG}}` — check what exists
-2. If `context-snapshot.md` exists: open recovery prompt with `"Read .prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md for project context and any Implementation Log/Review Notes from previous agents. Run git diff HEAD to see actual code changes already made. Do NOT re-read individual source files unless the File Manifest directs you to."` + only remaining steps + `model: "lite"`
-3. Max 2 retries per phase. After 2 failures, orchestrator completes the work directly and appends a Recovery Note to context-snapshot.md.
+2. If `context-snapshot.md` exists: open a recovery prompt with `"Read .prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md for project context and the Implementation Log. Run git diff HEAD to see actual code changes already made. Do NOT re-read individual source files unless the File Manifest directs you to."` + only remaining steps + `model: "lite"`
+3. Max 2 retries per phase. After 2 failures, the Main Agent completes the work directly and appends a Recovery Note to context-snapshot.md.

package/bundled/dev-pipeline/templates/sections/test-failure-recovery-agent.md

@@ -6,7 +6,7 @@ Use this protocol whenever the post-review PrizmKit Test gate fails. Its purpose
 
 | Class | Meaning | Required Action | May Continue? |
 |-------|---------|-----------------|---------------|
-| Baseline failure | Existed before this session | Document in Implementation Log or review notes | Yes |
+| Baseline failure | Existed before this session | Document in the Implementation Log or `failure-log.md` | Yes |
 | New regression | Introduced by this session | Fix before reporting success | No |
 | Brittle test | Test expectation/setup is wrong for the intended behavior | Fix the test or environment setup, then rerun | Only after fixed or documented as blocked |
 | Environment/tooling failure | External tool, network, install, or local environment prevents verification | Document in `failure-log.md` with impact on gates | Only if no Verification Gate is blocked |

package/bundled/dev-pipeline/tests/test_generate_bootstrap_prompt.py

@@ -1,6 +1,7 @@
 """Tests for generate-bootstrap-prompt.py core functions."""
 
 import json
+import importlib.util
 import os
 import re
 import time
@@ -25,6 +26,7 @@ from generate_bootstrap_prompt import (
     generate_checkpoint_definition,
     merge_checkpoint_state,
     load_active_agent_prompts,
+    validate_rendered,
     main as generate_bootstrap_main,
 )
 from continuation import append_continuation_handoff, checkpoint_cursor
@@ -44,6 +46,69 @@ FORBIDDEN_TEST_CMD_PLACEHOLDER = "(" + "$TEST_CMD" + ")"
 FORBIDDEN_THREE_STRIKE = "3-" + "strike"
 FORBIDDEN_TWENTY_STEP = "20-" + "step window"
 
+REVIEW_PROMPT_REQUIRED = (
+    "The current Main Agent is the only Code Review executor",
+    "Do not invoke another review skill or review workflow",
+    "finder, verifier, audit, compatibility review, verification, or gap sweep",
+    "`review-report.md` is the only persisted review artifact",
+)
+
+REVIEW_PROMPT_FORBIDDEN = (
+    "Orchestrator + Reviewer",
+    "Reviewer reviews",
+    "Reviewer subagents",
+    "Reviewer appends Review Notes",
+    "Implementation Log/Review Notes",
+    "internal Reviewer Agent",
+    "spawning Reviewer",
+    "delayed teammate/reviewer findings",
+    "Gate checks enforce Implementation Log and Review Notes",
+)
+
+
+def assert_unambiguous_main_agent_review(prompt):
+    for required in REVIEW_PROMPT_REQUIRED:
+        assert required in prompt
+    for forbidden in REVIEW_PROMPT_FORBIDDEN:
+        assert forbidden not in prompt
+
+
+PROMPT_RENDERING_FORBIDDEN = (
+    "If implementation is delegated to a Dev subagent",
+    "Document in Implementation Log or review notes",
+    "{{INIT_SCRIPT_PATH}}",
+)
+
+
+def assert_complete_prompt_rendering(prompt):
+    assert_unambiguous_main_agent_review(prompt)
+    for forbidden in PROMPT_RENDERING_FORBIDDEN:
+        assert forbidden not in prompt
+    assert re.findall(r"\{\{[A-Z][A-Z_0-9]+\}\}", prompt) == []
+
+
+def _load_recovery_prompt_module():
+    path = Path("dev-pipeline/scripts/generate-recovery-prompt.py")
+    spec = importlib.util.spec_from_file_location("generate_recovery_prompt", path)
+    module = importlib.util.module_from_spec(spec)
+    spec.loader.exec_module(module)
+    return module
+
+
+def test_rendered_prompt_validation_rejects_unresolved_control_placeholders():
+    content = (
+        "## Your Mission\n"
+        "## Execution\n"
+        "Run {{INIT_SCRIPT_PATH}}\n"
+        "## Failure Capture\n"
+    )
+
+    is_valid, warnings, errors = validate_rendered(content)
+
+    assert is_valid is False
+    assert warnings == []
+    assert errors == ["Unreplaced placeholders: {{INIT_SCRIPT_PATH}}"]
+
 
 def scoped_report_text(verdict="PASS", boundary_missing=0,
                        happy_path_only=0, completion_gate="yes",
@@ -884,10 +949,38 @@ class TestDirectOrchestratorImplementationPrompts:
             assert FORBIDDEN_TWENTY_STEP not in rendered
             assert "Main-Agent review loop" in rendered
             assert "up to ten completed rounds" in rendered
-            assert "code-review-specific subagent" in rendered
+            assert "The current Main Agent is the only Code Review executor" in rendered
+            assert "Do not invoke another review skill or review workflow" in rendered
             assert "low=0" not in rendered
             assert "Reviewer 3" not in rendered
 
+    def test_all_rendered_pipeline_prompts_have_one_main_agent_review_model(self, tmp_path):
+        recovery = _load_recovery_prompt_module()
+        prompts = [
+            _render_feature_prompt(tmp_path / "feature-lite", mode="lite"),
+            _render_feature_prompt(tmp_path / "feature-standard", mode="standard"),
+            _render_feature_prompt(tmp_path / "feature-full", mode="full"),
+            _render_feature_prompt(
+                tmp_path / "feature-tier3",
+                mode="full",
+                template="bootstrap-tier3.md",
+            ),
+            _render_bugfix_prompt(tmp_path / "bugfix"),
+            _render_refactor_prompt(tmp_path / "refactor"),
+            recovery.build_bugfix_prompt(
+                {
+                    "workflow_type": "bug-fix-workflow",
+                    "phase": 5,
+                    "phase_name": "Review",
+                    "workflow_data": {"bug_id": "B-001"},
+                },
+                str(tmp_path),
+            ),
+        ]
+
+        for prompt in prompts:
+            assert_complete_prompt_rendering(prompt)
+
     def test_retained_tier3_fallback_template_uses_direct_orchestrator_implementation(self):
         rendered = Path("dev-pipeline/templates/bootstrap-tier3.md").read_text(encoding="utf-8")
 
@@ -1446,7 +1539,8 @@ class TestHeadlessPromptCleanupF033:
 
         assert "{{" + "REVIEWER_" + "SUBAGENT_PATH" + "}}" not in replacements
         assert "Main-Agent review loop" in refactor_prompt
-        assert "code-review-specific subagent" in refactor_prompt
+        assert "The current Main Agent is the only Code Review executor" in refactor_prompt
+        assert "Do not invoke another review skill or review workflow" in refactor_prompt
         assert "Reviewer 3" not in refactor_prompt
 
     def test_bugfix_refactor_explicit_codex_override(self, tmp_path, monkeypatch):
@@ -1469,7 +1563,8 @@ class TestHeadlessPromptCleanupF033:
 
         assert "{{" + "REVIEWER_" + "SUBAGENT_PATH" + "}}" not in replacements
         assert "Main-Agent review loop" in refactor_prompt
-        assert "code-review-specific subagent" in refactor_prompt
+        assert "The current Main Agent is the only Code Review executor" in refactor_prompt
+        assert "Do not invoke another review skill or review workflow" in refactor_prompt
         assert "Reviewer 3" not in refactor_prompt