prizmkit 1.1.106 → 1.1.108

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

@@ -4,7 +4,7 @@ Review the completed implementation before the scoped feature test gate runs. Us
 
 Run `/prizmkit-code-review` with `artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/`.
 
-The skill runs an internal review-fix loop (Reviewer Agent → filter → Dev Agent fix, max 3 rounds) and writes `review-report.md` to the artifact directory.
+The skill runs an internal review-fix loop (Reviewer Agent → filter → orchestrator fix, max 3 rounds) and writes `review-report.md` to the artifact directory.
 
 **Gate Check — Review Report**:
 After `/prizmkit-code-review` returns, verify the review report:
@@ -13,8 +13,8 @@ grep -q "## Verdict" .prizmkit/specs/{{FEATURE_SLUG}}/review-report.md && echo "
 ```
 If GATE:MISSING:
 - Do not re-run `/prizmkit-code-review` in an unbounded report-repair loop.
-- Perform one bounded status check; retry at most once: inspect the skill output, `review-report.md` path, and any Reviewer/Dev spawn messages.
-- If the missing report is caused by team/config/lock errors from the internal Reviewer/Dev agent spawn, retry `/prizmkit-code-review` at most once only if it appears transient.
+- Perform one bounded status check; retry at most once: inspect the skill output, `review-report.md` path, and any Reviewer agent spawn messages.
+- If the missing report is caused by team/config/lock errors from the Reviewer agent spawn or review skill error, retry `/prizmkit-code-review` at most once only if it appears transient.
 - If the report is still missing after that single check/retry, write `failure-log.md` with the spawn/skill error and last observable state, then either perform a safe inline fallback review (spec/plan/diff/tests → write `review-report.md` with `## Verdict`) or stop with a clear recovery failure.
 
 Read `review-report.md` and check the Verdict:
@@ -24,10 +24,3 @@ Read `review-report.md` and check the Verdict:
 **CP-3**: Review complete, report written.
 
 
-**Checkpoint update**: Run the update script to set step `prizmkit-code-review` to `"completed"`:
-```bash
-python3 $PIPELINE_DIR/scripts/update-checkpoint.py \
-  --checkpoint-path {{CHECKPOINT_PATH}} \
-  --step prizmkit-code-review \
-  --status completed
-```

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

@@ -45,7 +45,7 @@ ls .prizmkit/specs/{{FEATURE_SLUG}}/ 2>/dev/null
 ls .prizmkit/specs/{{FEATURE_SLUG}}/spec.md .prizmkit/specs/{{FEATURE_SLUG}}/plan.md 2>/dev/null
 ```
 
-- spec.md missing: Run `/prizmkit-plan` → generate spec.md. Resolve any `[NEEDS CLARIFICATION]` markers using the task description — do NOT pause for interactive input.
+- spec.md missing: Run `/prizmkit-plan` → generate spec.md. Resolve uncertain requirements from the task description, existing code, and conservative existing-project patterns.
 - plan.md missing: Run `/prizmkit-plan` → generate plan.md (change approach, components, interface design, data model, testing strategy, risk assessment, and Tasks section with `[ ]` checkboxes)
 
 > All files go under `.prizmkit/specs/{{FEATURE_SLUG}}/`. Confirm each with `ls` after writing.
@@ -54,16 +54,9 @@ ls .prizmkit/specs/{{FEATURE_SLUG}}/spec.md .prizmkit/specs/{{FEATURE_SLUG}}/pla
 Before proceeding past CP-1, verify:
 1. Plan.md Data Model section references existing schema/model files (scan for `*.prisma`, `*.sql`, `migrations/`, `models/`, `*.entity.*` files; read them if not already in context-snapshot)
 2. All new tables/fields follow existing naming conventions, ID strategy, timestamp patterns, and constraint style
-3. No `[NEEDS CLARIFICATION]` remains in Data Model section — resolve by reading existing code and making a conservative choice that matches existing patterns. Document the resolution in plan.md.
+3. No unresolved data model uncertainty remains in the Data Model section — resolve by reading existing code and making a conservative choice that matches existing patterns. Document the resolution in plan.md.
 4. If a DB design decision genuinely cannot be resolved from existing code alone, document the assumption made and flag it in the Implementation Log for user review.
 
 **CP-1**: Both spec.md and plan.md exist.
 
 
-**Checkpoint update**: Run the update script to set step `context-snapshot-and-plan` to `"completed"`:
-```bash
-python3 $PIPELINE_DIR/scripts/update-checkpoint.py \
-  --checkpoint-path {{CHECKPOINT_PATH}} \
-  --step context-snapshot-and-plan \
-  --status completed
-```

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

@@ -4,10 +4,3 @@
 - **CP-0**: Verify `.prizmkit/prizm-docs/root.prizm`, `.prizmkit/config.json` exist
 
 
-**Checkpoint update**: Run the update script to set step `prizmkit-init` to `"completed"`:
-```bash
-python3 $PIPELINE_DIR/scripts/update-checkpoint.py \
-  --checkpoint-path {{CHECKPOINT_PATH}} \
-  --step prizmkit-init \
-  --status completed
-```

package/bundled/dev-pipeline/templates/sections/phase0-test-baseline.md

@@ -1,16 +1,3 @@
-### Phase 0: Detect Test Commands
+### Phase 0: Project Already Initialized
 
-**Step 1 — Detect test commands**: You know this project's tech stack. Identify ALL test commands that apply (e.g., `go test ./...`, `npm test`, `cargo test`, `pytest`, `make test`, etc.). Record them as `TEST_CMDS`.
-
-**Step 2 — Do not run tests yet**: This phase only records the commands that will be used by the post-review PrizmKit Test gate. Do not run baseline, periodic, or full-suite tests here; test execution happens after code review.
-
-> **Test Output Rule**: When the post-review gate runs, capture test output to a temp file (`tee /tmp/test-out.txt`). Then grep the file instead of re-running the suite.
-
-
-**Checkpoint update**: Run the update script to set step `test-baseline` to `"completed"`:
-```bash
-python3 $PIPELINE_DIR/scripts/update-checkpoint.py \
-  --checkpoint-path {{CHECKPOINT_PATH}} \
-  --step test-baseline \
-  --status completed
-```
+The project is already initialized. Proceed to context loading and planning. Test execution belongs to the post-review `/prizmkit-test` gate.

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

@@ -25,5 +25,4 @@ def _load_hyphenated_module(module_name, filename):
 _load_hyphenated_module("generate_bootstrap_prompt", "generate-bootstrap-prompt.py")
 _load_hyphenated_module("generate_bugfix_prompt", "generate-bugfix-prompt.py")
 _load_hyphenated_module("generate_refactor_prompt", "generate-refactor-prompt.py")
-_load_hyphenated_module("prizmkit_test_gate", "prizmkit-test-gate.py")
 _load_hyphenated_module("update_feature_status", "update-feature-status.py")

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

@@ -23,10 +23,24 @@ from generate_bootstrap_prompt import (
     generate_checkpoint_definition,
     merge_checkpoint_state,
     load_active_agent_prompts,
-    load_log_size_section,
     main as generate_bootstrap_main,
 )
 from continuation import append_continuation_handoff, checkpoint_cursor
+from utils import resolve_prompt_platform
+
+REMOVED_MAX_LOG_ENV = "MAX_" + "LOG_SIZE"
+REMOVED_MAX_LOG_HUMAN = REMOVED_MAX_LOG_ENV + "_HUMAN"
+
+FORBIDDEN_DEV_FIX_PROMPT = "dev-" + "fix.md"
+FORBIDDEN_DEV_RESUME_PROMPT = "dev-" + "resume.md"
+FORBIDDEN_DEV_FIX_PLACEHOLDER = "{{AGENT_PROMPT_DEV_" + "FIX}}"
+FORBIDDEN_DEV_RESUME_PLACEHOLDER = "{{AGENT_PROMPT_DEV_" + "RESUME}}"
+FORBIDDEN_REVIEW_DEV_FIX = "Reviewer Agent → filter → " + "Dev Agent fix"
+FORBIDDEN_REVIEWER_DEV_SPAWN = "Reviewer/" + "Dev agent spawn"
+FORBIDDEN_EXPLORE_SUBAGENT = "subagent_type: " + "Explore"
+FORBIDDEN_TEST_CMD_PLACEHOLDER = "(" + "$TEST_CMD" + ")"
+FORBIDDEN_THREE_STRIKE = "3-" + "strike"
+FORBIDDEN_TWENTY_STEP = "20-" + "step window"
 
 
 def scoped_report_text(verdict="PASS", boundary_missing=0,
@@ -222,6 +236,11 @@ class TestExplicitProjectRoot:
         assert not replacements["{{SESSION_STATUS_PATH}}"].startswith(str(execution_root.resolve()))
         assert replacements["{{PROJECT_BRIEF}}"] == "worktree brief"
         assert replacements["{{DEV_SUBAGENT_PATH}}"].startswith(str(execution_root.resolve()))
+        assert replacements["{{SESSION_LOG_PATH}}"].endswith(
+            ".prizmkit/state/features/F-001/sessions/session-1/logs/session.log"
+        )
+        assert "{{" + REMOVED_MAX_LOG_ENV + "}}" not in replacements
+        assert "{{" + REMOVED_MAX_LOG_HUMAN + "}}" not in replacements
 
 
     def test_main_writes_checkpoint_under_cli_project_root_and_status_under_state_dir(self, tmp_path, monkeypatch):
@@ -424,9 +443,14 @@ class TestScopedFeatureTestGate:
         assert names.index("phase-implement") < names.index("phase-review") < names.index("phase-prizmkit-test")
 
         rendered = "\n".join(content for _, content in sections)
-        assert "prizmkit-test-gate.py" in rendered
-        assert "prizmkit-test-gate.py\" start" in rendered
-        assert "prizmkit-test-gate.py\" check" in rendered
+        assert "prizmkit-test-gate.py" not in rendered
+        assert ".prizmkit-test-started" in rendered
+        assert "when present" not in rendered
+        assert "Boundary Matrix" in rendered
+        assert "Boundary Completion Gate" in rendered
+        assert "Boundary-missing: 0" in rendered
+        assert "Happy-path-only: 0" in rendered
+        assert "Validator result: passed" in rendered
         assert "/prizmkit-test scope=this-change artifact_dir=.prizmkit/specs/{{FEATURE_SLUG}}/" in rendered
         assert ".prizmkit/bugfix/" in rendered  # explicitly forbidden in the gate wording
         assert ".prizmkit/refactor/" in rendered  # explicitly forbidden in the gate wording
@@ -437,6 +461,25 @@ class TestScopedFeatureTestGate:
         assert "before code review" not in rendered
         assert "Precondition: the `prizmkit-test` checkpoint is completed" not in rendered
 
+    def test_standard_sections_include_central_checkpoint_helper(self):
+        sections_dir = Path(__file__).resolve().parents[1] / "templates" / "sections"
+        sections = assemble_sections(
+            "standard",
+            str(sections_dir),
+            init_done=True,
+            is_resume=False,
+            critic_enabled=False,
+            browser_enabled=False,
+        )
+        rendered = "\n".join(content for _, content in sections)
+
+        assert "### Checkpoint Update Helper" in rendered
+        assert "python3 .prizmkit/dev-pipeline/scripts/update-checkpoint.py" in rendered
+        assert "--checkpoint-path {{CHECKPOINT_PATH}}" in rendered
+        assert "--step <step-id-or-skill-name>" in rendered
+        assert "Do not hand-edit `workflow-checkpoint.json` directly." in rendered
+        assert "pipeline progress mechanism" not in rendered
+
     def test_lite_sections_include_review_before_prizmkit_test_and_commit(self):
         sections_dir = Path(__file__).resolve().parents[1] / "templates" / "sections"
         sections = assemble_sections(
@@ -776,22 +819,32 @@ class TestScopedFeatureTestGate:
 # ---------------------------------------------------------------------------
 
 class TestHeadlessRecoveryReframing:
-    def test_log_size_awareness_is_passive_checkpoint_guidance(self):
-        content = load_log_size_section(str(Path("dev-pipeline/scripts").resolve()))
-
-        assert "Session Log Budget Awareness" in content
-        assert "passive checkpoint guidance" in content
-        assert "durable checkpoints and artifacts" in content
-        assert "fresh continuation session" in content
-        assert "optional interactive convenience only" in content
-        assert "COMPACT_NEEDED" not in content
-        assert "monitor-log" not in content
-        assert "background monitoring subagent" not in content
-        assert "Execute `/compact`" not in content
-        assert "run `/compact`" not in content.lower()
+    def test_active_prompt_sources_do_not_reference_deleted_log_size_section(self):
+        deleted_section = "log-size-" + "awareness.md"
+        loader = "load_" + "log_size_section"
+        placeholder = "{{LOG_" + "SIZE_AWARENESS}}"
+        deleted_title = "Session " + "Checkpoint Awareness"
+        active_paths = [
+            Path("dev-pipeline/scripts/generate-bootstrap-prompt.py"),
+            Path("dev-pipeline/scripts/generate-bugfix-prompt.py"),
+            Path("dev-pipeline/scripts/generate-refactor-prompt.py"),
+            Path("dev-pipeline/templates/bootstrap-tier1.md"),
+            Path("dev-pipeline/templates/bootstrap-tier2.md"),
+            Path("dev-pipeline/templates/bootstrap-tier3.md"),
+            Path("dev-pipeline/templates/bugfix-bootstrap-prompt.md"),
+            Path("dev-pipeline/templates/refactor-bootstrap-prompt.md"),
+        ]
+
+        assert (Path("dev-pipeline/templates/sections") / deleted_section).exists() is False
+        for path in active_paths:
+            content = path.read_text(encoding="utf-8")
+            for forbidden in (deleted_section, loader, placeholder, deleted_title):
+                assert forbidden not in content
 
     def test_assembled_prompts_do_not_spawn_log_monitor_or_require_compact(self):
         sections_dir = Path("dev-pipeline/templates/sections").resolve()
+        deleted_title = "Session " + "Checkpoint Awareness"
+        placeholder = "{{LOG_" + "SIZE_AWARENESS}}"
 
         for mode in ("lite", "standard", "full"):
             rendered = "\n".join(
@@ -800,8 +853,12 @@ class TestHeadlessRecoveryReframing:
                     critic_enabled=False, browser_enabled=False,
                 )
             )
-            assert "Headless recovery must rely on durable checkpoints" in rendered
-            assert "fresh continuation session" in rendered
+            assert deleted_title not in rendered
+            assert placeholder not in rendered
+            assert REMOVED_MAX_LOG_ENV not in rendered
+            assert REMOVED_MAX_LOG_HUMAN not in rendered
+            assert ("209" + "7152") not in rendered
+            assert ("2" + "MB") not in rendered
             assert "monitor-log" not in rendered
             assert "COMPACT_NEEDED" not in rendered
             assert "log-size monitor" not in rendered
@@ -818,9 +875,16 @@ class TestDirectOrchestratorImplementationPrompts:
         replacements = load_active_agent_prompts(str(templates_dir))
 
         assert "dev-implement.md" not in ACTIVE_AGENT_PROMPTS
+        assert FORBIDDEN_DEV_FIX_PROMPT not in ACTIVE_AGENT_PROMPTS
+        assert FORBIDDEN_DEV_RESUME_PROMPT not in ACTIVE_AGENT_PROMPTS
         assert "{{AGENT_PROMPT_DEV_IMPLEMENT}}" not in replacements
+        assert FORBIDDEN_DEV_FIX_PLACEHOLDER not in replacements
+        assert FORBIDDEN_DEV_RESUME_PLACEHOLDER not in replacements
         assert "{{AGENT_PROMPT_CRITIC_PLAN_CHALLENGE}}" in replacements
+        assert "{{AGENT_PROMPT_REVIEWER_REVIEW}}" in replacements
         assert (templates_dir / "agent-prompts" / "dev-implement.md").exists() is False
+        assert (templates_dir / "agent-prompts" / FORBIDDEN_DEV_FIX_PROMPT).exists() is False
+        assert (templates_dir / "agent-prompts" / FORBIDDEN_DEV_RESUME_PROMPT).exists() is False
 
     def test_sections_all_modes_use_direct_orchestrator_implementation(self):
         sections_dir = Path("dev-pipeline/templates/sections").resolve()
@@ -840,7 +904,13 @@ class TestDirectOrchestratorImplementationPrompts:
             assert "Implement — Dev" not in rendered
             assert "{{AGENT_PROMPT_DEV_IMPLEMENT}}" not in rendered
             assert "dev-implement.md" not in rendered
-            assert "Reviewer Agent → filter → Dev Agent fix" in rendered
+            assert FORBIDDEN_REVIEW_DEV_FIX not in rendered
+            assert FORBIDDEN_REVIEWER_DEV_SPAWN not in rendered
+            assert FORBIDDEN_EXPLORE_SUBAGENT not in rendered
+            assert FORBIDDEN_TEST_CMD_PLACEHOLDER not in rendered
+            assert FORBIDDEN_THREE_STRIKE not in rendered
+            assert FORBIDDEN_TWENTY_STEP not in rendered
+            assert "Reviewer Agent → filter → orchestrator fix" in rendered
 
     def test_legacy_tier_templates_use_direct_orchestrator_implementation(self):
         for template_name in ("bootstrap-tier2.md", "bootstrap-tier3.md"):
@@ -853,6 +923,12 @@ class TestDirectOrchestratorImplementationPrompts:
             assert "Implement — Dev" not in rendered
             assert "{{AGENT_PROMPT_DEV_IMPLEMENT}}" not in rendered
             assert "dev-implement.md" not in rendered
+            assert FORBIDDEN_REVIEW_DEV_FIX not in rendered
+            assert FORBIDDEN_REVIEWER_DEV_SPAWN not in rendered
+            assert FORBIDDEN_EXPLORE_SUBAGENT not in rendered
+            assert FORBIDDEN_TEST_CMD_PLACEHOLDER not in rendered
+            assert FORBIDDEN_THREE_STRIKE not in rendered
+            assert FORBIDDEN_TWENTY_STEP not in rendered
 
 
 # ---------------------------------------------------------------------------
@@ -893,11 +969,13 @@ class TestContinuationHandoff:
         assert "Treat completed/skipped checkpoint steps as already done." in rendered
         assert "Do not read the previous full `session.log` unless explicitly necessary." in rendered
         assert "prefer synthesized artifacts and summaries over logs" in rendered
-        assert "Do not attempt `/compact` as the recovery mechanism." in rendered
+        assert "Do not attempt `/compact` as the recovery mechanism." not in rendered
         assert ".prizmkit/specs/123-continuation/workflow-checkpoint.json" in rendered
         assert ".prizmkit/state/features/F-123/sessions/F-123-new/logs/session.log" in rendered
         assert ".prizmkit/state/features/F-123/sessions/F-123-new/logs/progress.json" in rendered
         assert ".prizmkit/state/features/F-123/sessions/F-123-new/logs/ai.pid" in rendered
+        assert ("Log " + "monitor") not in rendered
+        assert ("log-" + "monitor") not in rendered
 
         summary = tmp_path / ".prizmkit/specs/123-continuation/continuation-summary.md"
         assert summary.exists()
@@ -913,3 +991,299 @@ class TestContinuationHandoff:
             {"id": "S03", "skill": "later", "status": "pending"},
         ]}
         assert checkpoint_cursor(checkpoint)["first_cursor"] == "S02 (active)"
+
+
+# ---------------------------------------------------------------------------
+# F-033 headless prompt cleanup and platform-aware critic paths
+# ---------------------------------------------------------------------------
+
+HEADLESS_FORBIDDEN_PROMPT_STRINGS = [
+    "### Interactive Claude Code Note",
+    "### Project Conventions",
+    "Read CLAUDE.md for project-level coding standards and architecture decisions.",
+    "Scaffold / generated file awareness",
+    "### Resume Behavior",
+    "[NEEDS CLARIFICATION]",
+    "pause for interactive input",
+    "prizmkit-test-gate.py",
+    "### Phase 0: Detect Test Commands",
+    "TEST_CMDS",
+]
+
+
+def _write_feature_list(path, feature):
+    path.parent.mkdir(parents=True, exist_ok=True)
+    path.write_text(json.dumps({"features": [feature], "global_context": {"language": "Python"}}), encoding="utf-8")
+
+
+def _render_feature_prompt(tmp_path, mode="standard", critic=False, template=None, platform="claude"):
+    project = tmp_path / "project"
+    project.mkdir(parents=True)
+    (project / ".prizmkit" / "plans").mkdir(parents=True)
+    (project / ".prizmkit" / "config.json").write_text(
+        json.dumps({"platform": platform, "ai_cli": platform}), encoding="utf-8"
+    )
+    for platform_dir, suffix in ((".claude", ".md"), (".codex", ".toml")):
+        agents_dir = project / platform_dir / "agents"
+        agents_dir.mkdir(parents=True)
+        for name in ("dev", "reviewer", "critic"):
+            (agents_dir / f"prizm-dev-team-{name}{suffix}").write_text("agent\n", encoding="utf-8")
+    feature = {
+        "id": "F-123",
+        "title": "Prompt Cleanup",
+        "description": "Clean prompt text",
+        "estimated_complexity": {"lite": "low", "standard": "medium", "full": "high"}[mode],
+        "acceptance_criteria": ["Prompts are clean"],
+        "critic": critic,
+    }
+    feature_list = project / ".prizmkit" / "plans" / "feature-list.json"
+    _write_feature_list(feature_list, feature)
+    output = project / "prompt.md"
+    args = [
+        "generate-bootstrap-prompt.py",
+        "--feature-list", str(feature_list),
+        "--feature-id", "F-123",
+        "--session-id", "session-1",
+        "--run-id", "run-1",
+        "--retry-count", "0",
+        "--resume-phase", "null",
+        "--state-dir", str(project / ".prizmkit" / "state" / "features"),
+        "--project-root", str(project),
+        "--output", str(output),
+        "--mode", mode,
+    ]
+    if critic:
+        args.extend(["--critic", "true"])
+    if template:
+        args.extend(["--template", str(Path("dev-pipeline/templates") / template)])
+    old_argv = os.sys.argv
+    old_platform = os.environ.get("PRIZMKIT_PLATFORM")
+    try:
+        os.sys.argv = args
+        if old_platform is not None:
+            os.environ.pop("PRIZMKIT_PLATFORM")
+        try:
+            generate_bootstrap_main()
+        except SystemExit as exc:
+            if exc.code not in (0, None):
+                raise
+    finally:
+        os.sys.argv = old_argv
+        if old_platform is not None:
+            os.environ["PRIZMKIT_PLATFORM"] = old_platform
+    return output.read_text(encoding="utf-8")
+
+
+def _ensure_agent_files(project, platforms=("claude", "codex")):
+    for platform in platforms:
+        platform_dir = ".codex" if platform == "codex" else ".claude"
+        suffix = ".toml" if platform == "codex" else ".md"
+        agents_dir = project / platform_dir / "agents"
+        agents_dir.mkdir(parents=True, exist_ok=True)
+        for name in ("dev", "reviewer", "critic"):
+            (agents_dir / f"prizm-dev-team-{name}{suffix}").write_text("agent\n", encoding="utf-8")
+
+
+def _render_bugfix_prompt(tmp_path, platform="claude", explicit_platform=None):
+    from generate_bugfix_prompt import main as bugfix_main
+
+    project = tmp_path / "bugfix-project"
+    project.mkdir(parents=True)
+    (project / ".prizmkit").mkdir(exist_ok=True)
+    (project / ".prizmkit" / "config.json").write_text(
+        json.dumps({"platform": platform, "ai_cli": platform}), encoding="utf-8"
+    )
+    _ensure_agent_files(project)
+    bug_list = project / ".prizmkit" / "plans" / "bug-fix-list.json"
+    bug_list.parent.mkdir(parents=True)
+    bug_list.write_text(json.dumps({
+        "bugs": [{"id": "B-001", "title": "Broken", "description": "Fix it", "acceptance_criteria": ["Works"]}],
+        "global_context": {"language": "Python"},
+    }), encoding="utf-8")
+    output = project / "bugfix-prompt.md"
+    old_argv = os.sys.argv
+    old_platform = os.environ.get("PRIZMKIT_PLATFORM")
+    try:
+        if explicit_platform is None:
+            os.environ.pop("PRIZMKIT_PLATFORM", None)
+        else:
+            os.environ["PRIZMKIT_PLATFORM"] = explicit_platform
+        os.sys.argv = [
+            "generate-bugfix-prompt.py",
+            "--bug-list", str(bug_list),
+            "--bug-id", "B-001",
+            "--session-id", "session-1",
+            "--run-id", "run-1",
+            "--retry-count", "0",
+            "--resume-phase", "null",
+            "--state-dir", str(project / ".prizmkit" / "state" / "bugfix"),
+            "--project-root", str(project),
+            "--output", str(output),
+        ]
+        try:
+            bugfix_main()
+        except SystemExit as exc:
+            if exc.code not in (0, None):
+                raise
+    finally:
+        os.sys.argv = old_argv
+        if old_platform is None:
+            os.environ.pop("PRIZMKIT_PLATFORM", None)
+        else:
+            os.environ["PRIZMKIT_PLATFORM"] = old_platform
+    return output.read_text(encoding="utf-8")
+
+
+def _render_refactor_prompt(tmp_path, platform="claude", explicit_platform=None):
+    from generate_refactor_prompt import main as refactor_main
+
+    project = tmp_path / "refactor-project"
+    project.mkdir(parents=True)
+    (project / ".prizmkit").mkdir(exist_ok=True)
+    (project / ".prizmkit" / "config.json").write_text(
+        json.dumps({"platform": platform, "ai_cli": platform}), encoding="utf-8"
+    )
+    _ensure_agent_files(project)
+    refactor_list = project / ".prizmkit" / "plans" / "refactor-list.json"
+    refactor_list.parent.mkdir(parents=True)
+    refactor_list.write_text(json.dumps({
+        "refactors": [{
+            "id": "R-001",
+            "title": "Restructure",
+            "description": "Preserve behavior",
+            "acceptance_criteria": ["Behavior preserved"],
+            "scope": {"files": ["src/a.py"], "modules": ["src"]},
+        }],
+        "global_context": {"language": "Python"},
+    }), encoding="utf-8")
+    output = project / "refactor-prompt.md"
+    old_argv = os.sys.argv
+    old_platform = os.environ.get("PRIZMKIT_PLATFORM")
+    try:
+        if explicit_platform is None:
+            os.environ.pop("PRIZMKIT_PLATFORM", None)
+        else:
+            os.environ["PRIZMKIT_PLATFORM"] = explicit_platform
+        os.sys.argv = [
+            "generate-refactor-prompt.py",
+            "--refactor-list", str(refactor_list),
+            "--refactor-id", "R-001",
+            "--session-id", "session-1",
+            "--run-id", "run-1",
+            "--retry-count", "0",
+            "--resume-phase", "null",
+            "--state-dir", str(project / ".prizmkit" / "state" / "refactor"),
+            "--output", str(output),
+        ]
+        old_cwd = os.getcwd()
+        os.chdir(project)
+        try:
+            try:
+                refactor_main()
+            except SystemExit as exc:
+                if exc.code not in (0, None):
+                    raise
+        finally:
+            os.chdir(old_cwd)
+    finally:
+        os.sys.argv = old_argv
+        if old_platform is None:
+            os.environ.pop("PRIZMKIT_PLATFORM", None)
+        else:
+            os.environ["PRIZMKIT_PLATFORM"] = old_platform
+    return output.read_text(encoding="utf-8")
+
+
+class TestHeadlessPromptCleanupF033:
+    def test_rendered_feature_bugfix_refactor_prompts_are_clean(self, tmp_path):
+        prompts = []
+        for mode in ("lite", "standard", "full"):
+            prompts.append(_render_feature_prompt(tmp_path / mode, mode=mode, critic=(mode != "lite")))
+        prompts.append(_render_bugfix_prompt(tmp_path))
+        prompts.append(_render_refactor_prompt(tmp_path))
+
+        for prompt in prompts:
+            for forbidden in HEADLESS_FORBIDDEN_PROMPT_STRINGS:
+                assert forbidden not in prompt
+            if "Feature ID" in prompt:
+                assert "/prizmkit-test scope=this-change artifact_dir=.prizmkit/specs/123-prompt-cleanup/" in prompt
+                assert ".prizmkit-test-started" in prompt
+
+    def test_legacy_feature_templates_are_clean_when_rendered(self, tmp_path):
+        for template, mode in (("bootstrap-tier1.md", "lite"), ("bootstrap-tier2.md", "standard"), ("bootstrap-tier3.md", "full")):
+            prompt = _render_feature_prompt(tmp_path / template, mode=mode, critic=(mode != "lite"), template=template)
+            for forbidden in HEADLESS_FORBIDDEN_PROMPT_STRINGS:
+                assert forbidden not in prompt
+            assert "prizmkit-test-gate.py" not in prompt
+            assert ".prizmkit-test-started" in prompt
+
+    def test_claude_config_wins_over_codex_directory_for_critic_path(self, tmp_path, monkeypatch):
+        project = tmp_path / "mixed"
+        (project / ".claude" / "agents").mkdir(parents=True)
+        (project / ".codex" / "agents").mkdir(parents=True)
+        (project / ".prizmkit").mkdir()
+        (project / ".prizmkit" / "config.json").write_text(
+            json.dumps({"platform": "claude", "ai_cli": "claude"}), encoding="utf-8"
+        )
+        monkeypatch.delenv("PRIZMKIT_PLATFORM", raising=False)
+
+        assert resolve_prompt_platform(str(project)) == "claude"
+        prompt = _render_feature_prompt(tmp_path / "rendered-mixed", mode="standard", critic=True, platform="claude")
+        assert ".claude/agents/prizm-dev-team-critic.md" in prompt
+        assert ".codex/agents/prizm-dev-team-critic.toml" not in prompt
+
+    def test_bugfix_refactor_share_claude_platform_resolution(self, tmp_path, monkeypatch):
+        from generate_bugfix_prompt import build_replacements as bugfix_build_replacements
+
+        monkeypatch.delenv("PRIZMKIT_PLATFORM", raising=False)
+        bug_project = tmp_path / "bugfix-replacements"
+        bug_project.mkdir()
+        (bug_project / ".prizmkit").mkdir()
+        (bug_project / ".prizmkit" / "config.json").write_text(
+            json.dumps({"platform": "claude", "ai_cli": "claude"}), encoding="utf-8"
+        )
+        _ensure_agent_files(bug_project)
+        args = Namespace(
+            bug_id="B-001", session_id="session-1", run_id="run-1",
+            retry_count="0", resume_phase="null", state_dir=None,
+            output="out.md", project_root=str(bug_project), template=None,
+            mode=None, critic=None,
+        )
+        replacements = bugfix_build_replacements(
+            args, {"id": "B-001", "title": "Broken"}, {}, str(Path("dev-pipeline/scripts").resolve())
+        )
+        refactor_prompt = _render_refactor_prompt(tmp_path / "refactor-mixed", platform="claude")
+
+        assert replacements["{{REVIEWER_SUBAGENT_PATH}}"].endswith(".claude/agents/prizm-dev-team-reviewer.md")
+        assert ".claude/agents/prizm-dev-team-reviewer.md" in refactor_prompt
+        assert ".codex/agents/prizm-dev-team-reviewer.toml" not in refactor_prompt
+
+    def test_bugfix_refactor_explicit_codex_override(self, tmp_path, monkeypatch):
+        from generate_bugfix_prompt import build_replacements as bugfix_build_replacements
+
+        bug_project = tmp_path / "bugfix-codex-replacements"
+        bug_project.mkdir()
+        _ensure_agent_files(bug_project)
+        monkeypatch.setenv("PRIZMKIT_PLATFORM", "codex")
+        args = Namespace(
+            bug_id="B-001", session_id="session-1", run_id="run-1",
+            retry_count="0", resume_phase="null", state_dir=None,
+            output="out.md", project_root=str(bug_project), template=None,
+            mode=None, critic=None,
+        )
+        replacements = bugfix_build_replacements(
+            args, {"id": "B-001", "title": "Broken"}, {}, str(Path("dev-pipeline/scripts").resolve())
+        )
+        refactor_prompt = _render_refactor_prompt(tmp_path / "refactor-codex", platform="claude", explicit_platform="codex")
+
+        assert replacements["{{REVIEWER_SUBAGENT_PATH}}"].endswith(".codex/agents/prizm-dev-team-reviewer.toml")
+        assert ".codex/agents/prizm-dev-team-reviewer.toml" in refactor_prompt
+        assert ".claude/agents/prizm-dev-team-reviewer.md" not in refactor_prompt
+
+    def test_explicit_codex_env_still_renders_codex_critic_path(self, tmp_path, monkeypatch):
+        project = tmp_path / "codex"
+        (project / ".claude" / "agents").mkdir(parents=True)
+        (project / ".codex" / "agents").mkdir(parents=True)
+        monkeypatch.setenv("PRIZMKIT_PLATFORM", "codex")
+
+        assert resolve_prompt_platform(str(project)) == "codex"