prizmkit 1.1.119 → 1.1.120

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

@@ -811,8 +811,8 @@ def test_prompt_generation_passes_explicit_execution_root_to_generator(monkeypat
                     "output_path": str(session_paths.prompt_path),
                     "checkpoint_path": str(execution_root / ".prizmkit" / "specs" / "001-low" / "workflow-checkpoint.json"),
                     "model": "",
-                    "pipeline_mode": "lite",
-                    "agent_count": 1,
+                    "pipeline_mode": "full",
+                    "agent_count": 3,
                 }
             ),
             stderr="",
@@ -876,8 +876,8 @@ def _install_runner_session_fakes(monkeypatch, runners, *, statuses=("success",)
         return PromptGenerationResult(
             output_path=session_paths.prompt_path,
             model="per-item-model",
-            pipeline_mode="lite",
-            agent_count=1,
+            pipeline_mode="full",
+            agent_count=3,
             checkpoint_path=execution_root / ".prizmkit" / "specs" / "001-low" / "workflow-checkpoint.json",
             artifact_path=execution_root / ".prizmkit" / "specs" / "001-low",
             raw={},
@@ -1090,13 +1090,12 @@ def test_explicit_worktree_materializes_ignored_support_assets_before_prompt_and
     subprocess.run(["git", "add", ".gitignore", "tracked.txt"], cwd=project, check=True)
     subprocess.run(["git", "commit", "-m", "base"], cwd=project, check=True, stdout=subprocess.DEVNULL)
 
-    (project / ".claude" / "agents").mkdir(parents=True)
-    (project / ".claude" / "agents" / "prizm-dev-team-dev.md").write_text("dev agent", encoding="utf-8")
-    (project / ".claude" / "team-info.json").write_text("{}", encoding="utf-8")
+    (project / ".claude" / "commands").mkdir(parents=True)
+    (project / ".claude" / "commands" / "prizmkit.md").write_text("skill", encoding="utf-8")
     (project / ".prizmkit" / "prizm-docs").mkdir(parents=True)
     (project / ".prizmkit" / "prizm-docs" / "root.prizm").write_text("PRIZM_VERSION: 1\n", encoding="utf-8")
     (project / ".prizmkit" / "dev-pipeline" / "scripts").mkdir(parents=True)
-    (project / ".prizmkit" / "dev-pipeline" / "scripts" / "init-dev-team.py").write_text("# init", encoding="utf-8")
+    (project / ".prizmkit" / "dev-pipeline" / "scripts" / "init-change-artifact.py").write_text("# init", encoding="utf-8")
     (project / ".prizmkit" / "config.json").write_text("{}", encoding="utf-8")
     (project / ".prizmkit" / "manifest.json").write_text("{}", encoding="utf-8")
 
@@ -1128,18 +1127,18 @@ def test_explicit_worktree_materializes_ignored_support_assets_before_prompt_and
     def fake_generate_prompt(family, invocation, **kwargs):
         execution_root = kwargs["execution_root"]
         assert execution_root != project
-        assert (execution_root / ".claude" / "agents" / "prizm-dev-team-dev.md").is_file()
+        assert (execution_root / ".claude" / "commands" / "prizmkit.md").is_file()
         assert (execution_root / ".prizmkit" / "prizm-docs" / "root.prizm").is_file()
         assert (execution_root / ".prizmkit" / "config.json").is_file()
         assert (execution_root / ".prizmkit" / "manifest.json").is_file()
-        assert (execution_root / ".prizmkit" / "dev-pipeline" / "scripts" / "init-dev-team.py").is_file()
+        assert (execution_root / ".prizmkit" / "dev-pipeline" / "scripts" / "init-change-artifact.py").is_file()
         assert not (execution_root / ".prizmkit" / "dev-pipeline" / "run-feature.sh").exists()
         session_paths = kwargs["session_paths"]
         return PromptGenerationResult(
             output_path=session_paths.prompt_path,
             model="",
-            pipeline_mode="lite",
-            agent_count=1,
+            pipeline_mode="full",
+            agent_count=3,
             checkpoint_path=execution_root / ".prizmkit" / "specs" / "001-support" / "workflow-checkpoint.json",
             artifact_path=execution_root / ".prizmkit" / "specs" / "001-support",
             raw={},
@@ -1535,8 +1534,8 @@ def test_foreground_runner_emits_structured_feature_progress(monkeypatch, tmp_pa
     assert "Feature: F-001 — Readable output" in captured.err
     assert "Code retry: 1 / 3" in captured.err
     assert "Preflight: no user-visible changes to preserve before feature task F-001" in captured.err
-    assert "Pipeline mode: lite (Tier 1 — Single Agent)" in captured.err
-    assert "Agents: 1" in captured.err
+    assert "Pipeline mode: full (Tier 3 — Orchestrator + Reviewer)" in captured.err
+    assert "Agents: 3" in captured.err
     assert "Spawning AI CLI session: F-001-session-1" in captured.err
     assert "Session result: success" in captured.err
 

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

@@ -41,6 +41,17 @@ def run_cli(*args):
     )
 
 
+def _load_progress_parser_module():
+    import importlib.util
+
+    parser_path = PIPELINE_ROOT / "scripts" / "parse-stream-progress.py"
+    spec = importlib.util.spec_from_file_location("parse_stream_progress", parser_path)
+    module = importlib.util.module_from_spec(spec)
+    assert spec.loader is not None
+    spec.loader.exec_module(module)
+    return module
+
+
 def test_cli_help_exposes_python_runtime_command_groups():
     result = run_cli("--help")
 
@@ -793,7 +804,7 @@ def test_session_preamble_writes_redacted_start_command_for_all_launch_profiles(
 
 def test_headless_subagent_prompt_guidance_keeps_no_worktree_boundary_visible():
     guidance_files = [
-        REPO_ROOT / "dev-pipeline" / "templates" / "bootstrap-tier2.md",
+        REPO_ROOT / "dev-pipeline" / "templates" / "sections" / "phase-review-full.md",
         REPO_ROOT / "dev-pipeline" / "templates" / "bootstrap-tier3.md",
         REPO_ROOT / "core" / "skills" / "prizmkit-skill" / "prizmkit-code-review" / "SKILL.md",
     ]
@@ -840,6 +851,145 @@ def test_progress_parser_adds_required_metadata(tmp_path):
     assert data["permission_denial_count"] == 1
 
 
+
+def test_progress_parser_normalizes_claude_subagents_without_double_counting(tmp_path):
+    module = _load_progress_parser_module()
+    tracker = module.ProgressTracker()
+
+    tracker.process_event({"type": "system", "subtype": "init", "session_id": "claude-session", "cwd": str(tmp_path)})
+    tracker.process_event({
+        "type": "assistant",
+        "message": {"content": [{
+            "type": "tool_use",
+            "id": "tool-1",
+            "name": "Agent",
+            "input": {"description": "review code", "prompt": "check", "subagent_type": "reviewer"},
+        }]},
+    })
+    tracker.process_event({
+        "type": "system",
+        "subtype": "task_started",
+        "task_id": "task-1",
+        "tool_use_id": "tool-1",
+        "task_type": "in_process_teammate",
+        "subagent_type": "reviewer",
+        "description": "review code",
+    })
+    tracker.process_event({"type": "assistant", "parent_tool_use_id": "tool-1", "message": {"content": [{"type": "text", "text": "child activity"}]}})
+    tracker.process_event({"type": "system", "subtype": "task_started", "task_id": "bash-1", "task_type": "local_bash", "description": "ls"})
+    tracker.process_event({"type": "system", "subtype": "task_notification", "task_id": "task-1", "tool_use_id": "tool-1", "status": "completed", "summary": "done"})
+
+    data = tracker.to_dict()
+
+    assert data["subagent_stats_source"] == "session_log"
+    assert data["subagent_spawn_count"] == 1
+    assert data["active_subagent_count"] == 0
+    assert data["subagent_states"] == [{"status": "completed", "count": 1}]
+    assert "task-1" in data["subagent_observed_ids"]
+    assert "tool-1" in data["subagent_statistics"]["parent_activity_ids"]
+    assert all("bash" not in record["id"] for record in data["subagent_statistics"]["records"])
+
+
+def test_progress_parser_normalizes_codebuddy_agent_tools_with_deduplication():
+    module = _load_progress_parser_module()
+    tracker = module.ProgressTracker()
+    args = {"prompt": "inspect", "description": "inspect", "subagent_type": "Explore"}
+
+    tracker.process_event({
+        "type": "message",
+        "sessionId": "cb-session",
+        "cwd": "/tmp/project",
+        "role": "assistant",
+        "content": [{"type": "tool_use", "id": "call-1", "name": "Agent", "input": args}],
+    })
+    tracker.process_event({
+        "type": "function_call",
+        "sessionId": "cb-session",
+        "cwd": "/tmp/project",
+        "id": "call-1",
+        "name": "Agent",
+        "arguments": json.dumps(args),
+    })
+    tracker.process_event({
+        "type": "function_call",
+        "sessionId": "cb-session",
+        "cwd": "/tmp/project",
+        "id": "task-call",
+        "name": "TaskCreate",
+        "arguments": json.dumps({"description": "background", "subject": "status"}),
+    })
+
+    data = tracker.to_dict()
+
+    assert data["cb_session_id"] == "cb-session"
+    assert data["subagent_provider"] == "codebuddy"
+    assert data["subagent_spawn_count"] == 2
+    assert data["active_subagent_count"] == 2
+    assert {item["status"] for item in data["subagent_states"]} == {"running"}
+    assert len(data["subagent_statistics"]["records"]) == 2
+
+
+def test_progress_parser_normalizes_codex_collab_metadata_with_missing_fields():
+    module = _load_progress_parser_module()
+    tracker = module.ProgressTracker()
+
+    tracker.process_event({"type": "thread.started", "thread_id": "parent"})
+    tracker.process_event({
+        "type": "item.started",
+        "item": {
+            "type": "collab_tool_call",
+            "tool": "delegate",
+            "receiver_thread_ids": ["thread-a", "thread-b"],
+            "agents_states": {
+                "thread-a": {"status": "running", "message": "working"},
+                "thread-b": {"status": "completed", "message": "done"},
+            },
+        },
+    })
+    tracker.process_event({"type": "item.completed", "item": {"type": "collab_tool_call", "tool": "delegate"}})
+
+    data = tracker.to_dict()
+
+    assert data["event_format"] == "codex-json"
+    assert data["child_thread_ids"] == ["thread-a", "thread-b"]
+    assert data["subagent_spawn_count"] == 2
+    assert data["active_subagent_count"] == 1
+    assert {state["status"]: state["count"] for state in data["subagent_states"]} == {"running": 1, "completed": 1}
+    assert data["subagent_source_metadata"]["child_activity_source"] == "filesystem_liveness_only"
+
+
+def test_progress_parser_keeps_child_files_liveness_only(tmp_path, monkeypatch):
+    module = _load_progress_parser_module()
+    claude_home = tmp_path / "claude"
+    project_key = str(tmp_path).replace("\\", "-").replace("/", "-").replace(":", "")
+    subagents_dir = claude_home / "projects" / project_key / "parent-session" / "subagents"
+    subagents_dir.mkdir(parents=True)
+    child_log = subagents_dir / "agent-child.jsonl"
+    child_log.write_text("child activity", encoding="utf-8")
+    monkeypatch.setenv("CLAUDE_HOME", str(claude_home))
+
+    tracker = module.ProgressTracker()
+    tracker.process_event({"type": "system", "subtype": "init", "session_id": "parent-session", "cwd": str(tmp_path)})
+    tracker.process_event({
+        "type": "system",
+        "subtype": "task_started",
+        "task_id": "task-1",
+        "tool_use_id": "tool-1",
+        "task_type": "in_process_teammate",
+        "description": "agent",
+    })
+    first = tracker.to_dict()
+    child_log.write_text("child activity grew", encoding="utf-8")
+    tracker.refresh_child_session_activity(force=True)
+    second = tracker.to_dict()
+
+    assert first["subagent_spawn_count"] == 1
+    assert second["subagent_spawn_count"] == 1
+    assert second["child_total_bytes"] > first["child_total_bytes"]
+    assert second["child_session_files"]
+    assert second["child_activity_source"] == "filesystem_liveness_only"
+    assert second["subagent_statistics"]["source"] == "session_log"
+
 def test_session_dual_writes_progress_and_recovers_backup(tmp_path):
     from prizmkit_runtime.sessions import AISessionConfig, AISessionLauncher, recover_session_log
 
@@ -935,6 +1085,10 @@ def test_custom_session_launch_writes_existing_logs_and_progress(tmp_path):
     progress_data = json.loads(progress.read_text(encoding="utf-8"))
     assert progress_data["event_type_counts"]["result"] == 1
     assert progress_data["has_usage"] is True
+    assert progress_data["subagent_stats_source"] == "session_log"
+    assert progress_data["subagent_spawn_count"] == 0
+    assert progress_data["subagent_statistics"]["providers"] == []
+    assert progress_data["child_activity_source"] == "filesystem_liveness_only"
 
 
 @pytest.mark.parametrize("platform", ["claude", "codex", "codebuddy"])
@@ -1031,7 +1185,10 @@ def test_compact_progress_line_hides_stale_until_no_progress(tmp_path):
         json.dumps(
             {
                 "child_total_bytes": 2 * 1024 * 1024,
+                "child_session_files": [{"path": "a"}, {"path": "b"}],
                 "subagent_spawn_count": 5,
+                "active_subagent_count": 2,
+                "subagent_states": [{"status": "running", "count": 2}, {"status": "completed", "count": 3}],
                 "current_phase": "stream-derived-phase",
                 "current_tool": "Read",
                 "message_count": 465,
@@ -1059,7 +1216,9 @@ def test_compact_progress_line_hides_stale_until_no_progress(tmp_path):
 
     assert "▶ [HEARTBEAT]" in running_line
     assert "log: 4MB" in running_line
-    assert "child: 2MB/5" in running_line
+    assert "subagents: spawned=5 active=2 states:running=2,completed=3" in running_line
+    assert "child logs: 2MB/2 files" in running_line
+    assert "child: 2MB/5" not in running_line
     assert "phase: Retrospective" in running_line
     assert "stream-derived-phase" not in running_line
     assert "tool: Read" in running_line
@@ -1417,6 +1576,46 @@ def test_recovery_sessions_receive_live_heartbeat_configuration(tmp_path, monkey
     assert config.suppress_stream_output is True
 
 
+
+def test_session_summary_reports_normalized_subagents_and_child_liveness(tmp_path, capsys):
+    import prizmkit_runtime.runners as runners
+    from prizmkit_runtime.runner_models import SessionPaths
+
+    logs = tmp_path / "sessions" / "s1" / "logs"
+    logs.mkdir(parents=True)
+    session_log = logs / "session.log"
+    progress = logs / "progress.json"
+    session_log.write_text("one\ntwo\n", encoding="utf-8")
+    progress.write_text(
+        json.dumps({
+            "subagent_spawn_count": 2,
+            "active_subagent_count": 1,
+            "subagent_states": [{"status": "running", "count": 1}, {"status": "completed", "count": 1}],
+            "subagent_statistics": {"spawned": 2, "active": 1, "providers": ["claude"], "source": "session_log"},
+            "child_total_bytes": 2048,
+            "child_session_files": [{"path": "child-a"}],
+        }),
+        encoding="utf-8",
+    )
+    paths = SessionPaths(
+        session_dir=logs.parent,
+        prompt_path=logs.parent / "bootstrap-prompt.md",
+        logs_dir=logs,
+        session_log=session_log,
+        progress_json=progress,
+        heartbeat_json=logs / "heartbeat.json",
+        session_status_json=logs / "session-status.json",
+    )
+    result = type("Result", (), {"exit_code": 0})()
+    classification = type("Classification", (), {"session_status": "success"})()
+
+    runners._emit_session_summary(result, paths, classification)
+
+    captured = capsys.readouterr()
+    assert "Subagents: spawned=2, active=1, states: running=1, completed=1 (claude; source=session.log)" in captured.err
+    assert "Child log activity: 2KB across 1 files (heartbeat liveness only)" in captured.err
+    assert "Subagent calls detected" not in captured.err
+
 def test_session_live_output_does_not_forward_cli_output_without_verbose(tmp_path, capsys):
     from prizmkit_runtime.sessions import AISessionConfig, AISessionLauncher
 
@@ -1995,8 +2194,8 @@ def test_materialize_worktree_support_assets_copies_ignored_assets_without_retir
     subprocess.run(["git", "add", ".gitignore"], cwd=repo, check=True)
     subprocess.run(["git", "commit", "-m", "ignore support"], cwd=repo, check=True, stdout=subprocess.DEVNULL)
 
-    (repo / ".claude" / "agents").mkdir(parents=True)
-    (repo / ".claude" / "agents" / "prizm-dev-team-dev.md").write_text("dev", encoding="utf-8")
+    (repo / ".claude" / "commands").mkdir(parents=True)
+    (repo / ".claude" / "commands" / "prizmkit.md").write_text("skill", encoding="utf-8")
     (repo / ".prizmkit" / "prizm-docs").mkdir(parents=True)
     (repo / ".prizmkit" / "prizm-docs" / "root.prizm").write_text("PRIZM_VERSION: 1\n", encoding="utf-8")
     (repo / ".prizmkit" / "config.json").write_text("{}", encoding="utf-8")
@@ -2014,12 +2213,12 @@ def test_materialize_worktree_support_assets_copies_ignored_assets_without_retir
     )
     setup = ensure_linked_worktree(runtime)
     assert setup.ok
-    assert not (runtime.worktree_path / ".claude" / "agents" / "prizm-dev-team-dev.md").exists()
+    assert not (runtime.worktree_path / ".claude" / "commands" / "prizmkit.md").exists()
 
     result = materialize_worktree_support_assets(runtime)
 
     assert result.ok
-    assert (runtime.worktree_path / ".claude" / "agents" / "prizm-dev-team-dev.md").is_file()
+    assert (runtime.worktree_path / ".claude" / "commands" / "prizmkit.md").is_file()
     assert (runtime.worktree_path / ".prizmkit" / "prizm-docs" / "root.prizm").is_file()
     assert (runtime.worktree_path / ".prizmkit" / "config.json").is_file()
     assert (runtime.worktree_path / ".prizmkit" / "manifest.json").is_file()

package/bundled/skills/_metadata.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.1.119",
+  "version": "1.1.120",
   "skills": {
     "prizmkit": {
       "description": "Full-lifecycle dev toolkit. Covers spec-driven development, Prizm context docs, code quality, debugging, deployment, and knowledge management.",

package/bundled/skills/app-planner/SKILL.md

@@ -47,7 +47,7 @@ If you believe the task is better suited for a different workflow, you MUST:
 - Claude Code → `CLAUDE.md`
 - CodeBuddy → `CODEBUDDY.md`
 - `all` → all three files.
-- Only when the manifest is missing, fall back to installed PrizmKit-owned platform files such as `.codex/agents/*.toml`, `.claude/commands/prizmkit.md`, or `.codebuddy/skills/prizmkit/SKILL.md`. Do not treat a generic `.agents/` directory as Codex.
+- Only when the manifest is missing, fall back to installed PrizmKit-owned platform files such as `.claude/commands/prizmkit.md`, `.agents/skills/prizmkit/SKILL.md`, or `.codebuddy/skills/prizmkit/SKILL.md`. Do not treat a generic `.agents/` directory as Codex.
 
 **After planning is complete**, you MUST:
 1. Present the summary of captured project-level context (vision, conventions, architecture decisions, project brief)
@@ -126,7 +126,7 @@ Before questions, check optional context files (never block if absent):
 Note:
 - This skill **reads** `.prizmkit/config.json` if present.
 - This skill does **not** create `.prizmkit/config.json` directly.
-- Creation/update is handled by bootstrap/init flows (e.g., `prizmkit-init`, `.prizmkit/dev-pipeline/scripts/init-dev-team.py`).
+- Creation/update is handled by bootstrap/init flows (e.g., `prizmkit-init`, `.prizmkit/dev-pipeline/scripts/init-change-artifact.py`).
 
 ## Interaction Style (Hard Rule)
 

package/bundled/skills/app-planner/references/architecture-decisions.md

@@ -29,9 +29,7 @@ After Phase 2 (Confirm constraints and tech assumptions), before Phase 3 (Captur
    - `codex` → append to `AGENTS.md`
    - `claude` → append to `CLAUDE.md`
    - `codebuddy` → append to `CODEBUDDY.md`
-   - `all` → append to all three files. Legacy manifests may contain `both`; treat it as read-only compatibility and append to `CLAUDE.md` and `CODEBUDDY.md` only when encountered.
-   - Only when the manifest is missing, fall back to PrizmKit-owned install artifacts: `.codex/agents/*.toml`, `.claude/commands/prizmkit.md`, `.codebuddy/skills/prizmkit/SKILL.md`.
-   - Do not treat a generic `.agents/` directory as Codex; it may contain unrelated third-party skills.
+   - `all` → append to all three files. 
    - If no platform can be determined, skip (no project instruction file).
 
 2. **Check for existing section** — read the target file and look for `### Architecture Decisions` heading:

package/bundled/skills/prizmkit-code-review/SKILL.md

@@ -1,20 +1,20 @@
 ---
 name: "prizmkit-code-review"
-description: "Iterative review-fix loop against spec and plan. Always uses the dedicated prizm-dev-team-reviewer agent in the active checkout with current-workspace / active-checkout / no-worktree launch; the Main Agent filters findings and applies accepted fixes directly. If the current platform cannot start an active-checkout reviewer, stop with tool incompatibility instead of falling back to Main-Agent self-review. Loops until PASS or max 3 rounds. Use after /prizmkit-implement for Full path quality gate or when the user says 'review', 'check code', 'code review', or 'is it ready to commit'. (project)"
+description: "Iterative review-fix loop against spec and plan. Always uses an independent inline reviewer subagent in the active checkout with a skill-owned prompt reference and no worktree/copy/remote isolation; the Main Agent filters findings and applies accepted fixes directly. If the platform cannot start an active-checkout inline reviewer, stop with checkout-isolation incompatibility instead of falling back to Main-Agent self-review. Loops until PASS or max 3 rounds. Use after /prizmkit-implement for Full path quality gate or when the user says 'review', 'check code', 'code review', or 'is it ready to commit'. (project)"
 ---
 
 # PrizmKit Code Review
 
-An iterative review-fix loop that checks workspace changes against the task spec and plan. It separates review judgment from fix application by requiring a dedicated `prizm-dev-team-reviewer` subagent in the active checkout. Main Agent applies accepted fixes directly after filtering reviewer findings.
+An iterative review-fix loop that checks workspace changes against the task spec and plan. It separates review judgment from fix application by requiring an independent inline reviewer subagent launched from the active checkout with a prompt loaded from this skill's references. Main Agent applies accepted fixes directly after filtering reviewer findings.
 
 Review modes:
-- `reviewer-agent-active-checkout`: required mode. Always spawn `prizm-dev-team-reviewer` in the current active checkout with no worktree or remote isolation.
+- `inline-reviewer-active-checkout`: required mode. Always spawn an independent reviewer subagent in the current active checkout with no worktree, copied checkout, remote checkout, or branch isolation.
 - `not-run-no-changes`: no workspace changes were detected.
 
-If the platform cannot launch `prizm-dev-team-reviewer` in current-workspace / active-checkout / no-worktree mode, stop with this tool incompatibility message:
+If the platform cannot launch an inline reviewer subagent in current-workspace / active-checkout / no-worktree mode, stop with this checkout-isolation incompatibility message:
 
 ```text
-Cannot run /prizmkit-code-review because this platform cannot start prizm-dev-team-reviewer in the active checkout without worktree isolation.
+Cannot run /prizmkit-code-review because this platform cannot start an inline reviewer subagent in the active checkout without worktree, copy, remote, or branch isolation.
 ```
 
 ### When to Use
@@ -48,6 +48,7 @@ Cannot run /prizmkit-code-review because this platform cannot start prizm-dev-te
    - `git diff`
    - `git diff --cached`
    - full paths for untracked and renamed files
+   - expected active checkout git top-level from `git rev-parse --show-toplevel`
    - relevant root.prizm RULES and plan decisions
 6. If no changes are detected, skip Phase 1 and write `review-report.md` with verdict PASS, rounds 0, and review mode `not-run-no-changes`.
 
@@ -69,22 +70,23 @@ python3 --version 2>/dev/null && echo "SCRIPT_MODE" || echo "TEXT_MODE"
 - `round = 1`
 - `max_rounds = 3`
 - `findings_history = []`
-- `review_mode = reviewer-agent-active-checkout` after confirming the dedicated reviewer can launch in the active checkout
+- `review_mode = inline-reviewer-active-checkout` after confirming an inline reviewer subagent can launch in the active checkout
 
-### Step 1: Launch Required Reviewer
+### Step 1: Launch Required Inline Reviewer
 
-Always spawn `prizm-dev-team-reviewer` using the dedicated subagent contract:
+Always spawn an independent reviewer subagent using this skill-owned inline contract:
 
 ```yaml
-subagent_type: prizm-dev-team-reviewer
+prompt_reference: ${SKILL_DIR}/references/reviewer-agent-prompt.md
 isolation: current-workspace / active-checkout / no-worktree
+subagent_kind: inline reviewer prompt, not a platform-installed named agent
 ```
 
-1. Pass the active-checkout context from Phase 0 and the prompt template from `${SKILL_DIR}/references/reviewer-agent-prompt.md`.
+1. Read `${SKILL_DIR}/references/reviewer-agent-prompt.md` and fill it with the active-checkout context from Phase 0.
 2. The captured git diff, staged diff, untracked files, spec, plan, dev rules, and scoped test report are the primary review scope.
-3. Never use `worktree`, remote isolation, copied checkouts, `Explore`, or a generic code explorer as a substitute for the PrizmKit reviewer. Do not request or create worktree isolation for this review path, including tool-created `.claude/worktrees/...` directories or pipeline-managed `.prizmkit/state/worktrees/...` directories. Pipeline `USE_WORKTREE` controls implementation infrastructure only; it does not change `/prizmkit-code-review` active-checkout review location.
+3. Never use worktree isolation, remote isolation, copied checkouts, branch switching, broad repository exploration, or a generic code explorer as a substitute for the required inline reviewer prompt. Do not request or create tool-managed worktrees, pipeline-managed worktrees, copied repositories, or remote checkouts. Do not use `.claude/worktrees/...` or `.prizmkit/state/worktrees/...`. Pipeline runner `USE_WORKTREE` controls outer infrastructure only; it does not change this skill's active-checkout reviewer requirement.
 4. Never perform Main-Agent self-review or fallback review; the Main Agent's job is filtering and fixing, not acting as the reviewer.
-5. If the platform cannot launch the reviewer in the active checkout without worktree isolation, stop with the tool incompatibility message from this skill's introduction.
+5. If the platform cannot launch the reviewer in the active checkout without worktree/copy/remote/branch isolation, stop with the checkout-isolation incompatibility message from this skill's introduction.
 
 ### Step 2: Run Review
 
@@ -141,7 +143,7 @@ After filtering, call the Loop Exit Gate. If `endLoop=true`, proceed to Phase 2.
 
 ### Step 5: Main Agent Applies Accepted Fixes
 
-The Main Agent applies accepted findings directly in the active checkout. Do not spawn a separate Dev Agent for fixes.
+The Main Agent applies accepted findings directly in the active checkout. Do not spawn a separate implementation subagent for review fixes.
 
 If an accepted finding cannot be safely fixed within scope, record the reason and carry it into `review-report.md` as unresolved.
 
@@ -153,7 +155,7 @@ Always write `review-report.md` to the artifact directory, including no-change P
 
 Required report fields:
 - Verdict: `PASS` or `NEEDS_FIXES`
-- Review Mode: `reviewer-agent-active-checkout` or `not-run-no-changes`
+- Review Mode: `inline-reviewer-active-checkout` or `not-run-no-changes`
 - Rounds and total findings
 - Fixed, rejected, and unresolved findings
 - Final summary

package/bundled/skills/prizmkit-code-review/references/reviewer-agent-prompt.md

@@ -1,9 +1,9 @@
-# Reviewer Agent Prompt Template
+# Reviewer Subagent Prompt Template
 
-Used in Phase 1 Step 1 of `/prizmkit-code-review`. The orchestrator fills `{goals}`, `{plan decisions}`, `{scoped test report}`, `{workspace context}`, `{dev rules}`, `{round N}`, and `{round_context}` before spawning the dedicated `prizm-dev-team-reviewer` agent.
+Used in Phase 1 Step 1 of `/prizmkit-code-review`. The orchestrator fills `{goals}`, `{plan decisions}`, `{scoped test report}`, `{workspace context}`, `{dev rules}`, `{round N}`, and `{round_context}` before spawning an independent inline reviewer subagent from the active checkout.
 
 ```
-You are the dedicated PrizmKit Reviewer agent (`prizm-dev-team-reviewer`). Review workspace changes against the spec goals, plan decisions, scoped test evidence, and per-layer dev rules. Do not modify files and do not apply fixes; the Main Agent will filter findings and apply accepted fixes directly.
+You are an independent PrizmKit reviewer subagent launched by `/prizmkit-code-review` from the active checkout. Review workspace changes against the spec goals, plan decisions, scoped test evidence, and per-layer dev rules. Do not modify files and do not apply fixes; the Main Agent will filter findings and apply accepted fixes directly.
 
 ## Spec Goals
 {goals and acceptance criteria from spec.md}
@@ -15,18 +15,18 @@ You are the dedicated PrizmKit Reviewer agent (`prizm-dev-team-reviewer`). Revie
 {summary from artifact_dir/test-report-path.txt and test-report.md, including Scope, Generated / Updated Tests, In-Scope Failures, Baseline Failures, Out of Scope Gaps, Boundary Matrix / Boundary Completion Gate if present, and Verdict. If no scoped report exists for a change artifact, write "No scoped /prizmkit-test report found (expected for pre-test review)." Treat that absence as informational unless the calling workflow explicitly requires a prior test report.}
 
 ## Workspace Context
-{git status, unstaged diff summary, staged diff summary, current working directory, expected active checkout git top-level, and new-file paths captured by the Main Agent in Phase 0 from the active checkout. This is your primary review scope — use this context to understand what changed. Request targeted file reads only when you need specific line-level detail for a finding, not to re-discover or re-index the repository. Do not read files that are not in the workspace context unless you need them to verify impact (callers, dependents, shared patterns). Do not switch to a separate worktree or repository copy — the Main Agent has provided everything needed to understand the change set.}
+{git status, unstaged diff summary, staged diff summary, current working directory, expected active checkout git top-level, and new-file paths captured by the Main Agent in Phase 0 from the active checkout. This is your primary review scope — use this context to understand what changed. Request targeted file reads only when you need specific line-level detail for a finding, not to re-discover or re-index the repository. Do not read files that are not in the workspace context unless you need them to verify impact (callers, dependents, shared patterns).}
 
 ## Active Checkout Guard
 The orchestrator must provide the expected active checkout git top-level in Workspace Context. Before reviewing, verify that your current git top-level matches that expected active checkout.
 
-If your current checkout is different, or appears to be under `.claude/worktrees/`, `.prizmkit/state/worktrees/`, a remote checkout, or any copied/temporary checkout:
+If your current checkout is different, or appears to be under `.claude/worktrees/`, `.prizmkit/state/worktrees/`, a copied checkout, a remote isolated checkout, a temporary repository clone, or any branch/top-level other than the orchestrator-provided active checkout:
 - Stop immediately.
 - Do not review files.
 - Do not produce normal findings.
 - Report `WRONG_CHECKOUT` and state that `/prizmkit-code-review` cannot continue because the reviewer subagent was not started in the active checkout/no-worktree mode required by this skill.
 
-Worktree review is not supported by `/prizmkit-code-review`; do not continue from a worktree even if the files appear similar.
+Worktree, copied-checkout, remote-checkout, and branch-switched review are not supported by `/prizmkit-code-review`; do not continue even if the files appear similar. Do not request or create worktrees, copied repositories, branch switches, or remote checkouts.
 
 ## Dev Rules (per-layer conventions)
 {rules from .prizmkit/rules/<layer>-rules.md, or "No custom dev rules configured — use general best practices."}
@@ -38,7 +38,7 @@ Round {N}. {round_context}
 Use the orchestrator-provided workspace context as the source of truth for changed files:
 - For new files listed in workspace status, read their full content.
 - For modified files, read enough surrounding context to understand the change.
-- Do not edit files, stage changes, run test suites, or spawn other agents.
+- Do not edit files, stage changes, run test suites, spawn other agents, or invoke tools that modify the workspace.
 - Do not request or create worktrees — you are reviewing the active checkout's changes. The orchestrator has already captured the full diff and status context; re-discovering the whole repository is wasteful and unnecessary.
 
 ## Review Dimensions
@@ -55,10 +55,10 @@ Evaluate the changes across these dimensions (focus on what's relevant):
 ## Output Format
 Respond with EXACTLY this format:
 
-### Result: PASS | NEEDS_FIXES
+### Result: PASS | NEEDS_FIXES | WRONG_CHECKOUT
 
 ### Findings
-(If PASS, write "No issues found.")
+(If PASS, write "No issues found." If WRONG_CHECKOUT, include only checkout mismatch evidence and do not include normal review findings.)
 
 #### Finding N
 - **Severity**: high | medium | low

package/bundled/skills/prizmkit-implement/SKILL.md

@@ -1,6 +1,6 @@
 ---
 name: "prizmkit-implement"
-description: "Execute plan.md tasks with a TDD-oriented approach. Respects task ordering, checkpoints, and dependencies for Fast path or Full path change artifacts. Reads Prizm docs before editing; when relevant L2 docs are missing, falls back to target source files and lets /prizmkit-retrospective create L2 later if needed. Use after /prizmkit-plan. Trigger on: 'implement', 'build', 'code it', 'start coding', 'execute', 'write the code'. (project)"
+description: "Execute plan.md tasks with a TDD-oriented approach. Respects task ordering, checkpoints, and dependencies for Fast path or Full path change artifacts. Reads Prizm docs before editing; optional inline implementation subagent delegation uses this skill's references and active-checkout/no-worktree constraints. Use after /prizmkit-plan. Trigger on: 'implement', 'build', 'code it', 'start coding', 'execute', 'write the code'. (project)"
 ---
 
 # PrizmKit Implement
@@ -39,6 +39,26 @@ Before implementation, load context once:
 
 If a dev rule conflicts with `plan.md`, call out the conflict and ask the user unless the plan clearly supersedes the rule.
 
+## Optional Inline Implementation Subagent Delegation
+
+The default execution mode is direct Main Agent implementation. If delegation is useful for a narrow implementation slice, use only this skill's local reference:
+
+```yaml
+prompt_reference: ${SKILL_DIR}/references/implementation-subagent-procedure.md
+isolation: current-workspace / active-checkout / no-worktree
+subagent_kind: inline implementation prompt, not a platform-installed named agent
+```
+
+Delegation rules:
+- Read `${SKILL_DIR}/references/implementation-subagent-procedure.md` before preparing the subagent prompt.
+- Pass the expected active checkout git top-level and the exact delegated task/file scope.
+- Do not use worktree isolation, copied checkouts, remote isolated checkouts, branch switching, or a platform-installed named implementation agent.
+- If active-checkout/no-worktree launch cannot be satisfied, stop with:
+
+```text
+Cannot delegate /prizmkit-implement because this platform cannot start an inline implementation subagent in the active checkout without worktree, copy, remote, or branch isolation.
+```
+
 ## Execution
 
 For each unchecked task in `plan.md`, in order: