prizmkit 1.1.119 → 1.1.121

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

@@ -17,6 +17,7 @@ from generate_bootstrap_prompt import (
     format_global_context,
     get_completed_dependencies,
     determine_pipeline_mode,
+    determine_legacy_template_mode,
     process_conditional_blocks,
     process_mode_blocks,
     assemble_sections,
@@ -235,7 +236,7 @@ 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 "{{" + "DEV_" + "SUBAGENT_PATH" + "}}" not in replacements
         assert replacements["{{SESSION_LOG_PATH}}"].endswith(
             ".prizmkit/state/features/F-001/sessions/session-1/logs/session.log"
         )
@@ -254,9 +255,6 @@ class TestExplicitProjectRoot:
         feature_list.parent.mkdir(parents=True)
         state_dir.mkdir(parents=True)
         execution_root.mkdir(parents=True)
-        (execution_root / ".claude" / "agents").mkdir(parents=True)
-        (execution_root / ".claude" / "agents" / "prizm-dev-team-dev.md").write_text("dev", encoding="utf-8")
-        (execution_root / ".claude" / "agents" / "prizm-dev-team-reviewer.md").write_text("reviewer", encoding="utf-8")
         feature_list.write_text(
             json.dumps({"features": [{"id": "F-001", "title": "Worktree Prompt", "estimated_complexity": "medium", "status": "pending"}]}),
             encoding="utf-8",
@@ -285,7 +283,7 @@ class TestExplicitProjectRoot:
                 "--output",
                 str(output_path),
                 "--template",
-                str(pipeline_root / "templates" / "bootstrap-tier1.md"),
+                str(pipeline_root / "templates" / "bootstrap-tier3.md"),
             ],
         )
 
@@ -332,20 +330,16 @@ class TestGetCompletedDependencies:
 # ---------------------------------------------------------------------------
 
 class TestDeterminePipelineMode:
-    def test_low(self):
-        assert determine_pipeline_mode("low") == "lite"
+    def test_all_complexities_use_unified_full_guidance(self):
+        for complexity in ("low", "medium", "high", "critical", "banana", None):
+            assert determine_pipeline_mode(complexity) == "full"
 
-    def test_medium(self):
-        assert determine_pipeline_mode("medium") == "lite"
-
-    def test_high(self):
-        assert determine_pipeline_mode("high") == "standard"
-
-    def test_critical(self):
-        assert determine_pipeline_mode("critical") == "full"
-
-    def test_unknown(self):
-        assert determine_pipeline_mode("banana") == "lite"
+    def test_legacy_template_mode_mapping_remains_available_for_custom_templates(self):
+        assert determine_legacy_template_mode("low") == "lite"
+        assert determine_legacy_template_mode("medium") == "lite"
+        assert determine_legacy_template_mode("high") == "standard"
+        assert determine_legacy_template_mode("critical") == "full"
+        assert determine_legacy_template_mode("banana") == "lite"
 
 
 # ---------------------------------------------------------------------------
@@ -807,10 +801,6 @@ class TestHeadlessRecoveryReframing:
         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"),
@@ -894,33 +884,32 @@ class TestDirectOrchestratorImplementationPrompts:
             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"):
-            rendered = (Path("dev-pipeline/templates") / template_name).read_text(encoding="utf-8")
-
-            assert "/prizmkit-implement" in rendered
-            assert "Implement — Orchestrator Direct" in rendered
-            assert "Spawn Dev subagent" not in rendered
-            assert "Spawn Dev agent" not in rendered
-            assert "Spawn Reviewer agent" not in rendered
-            assert "Reviewer Agent Def" not in rendered
-            assert "subagent_type=\"prizm-dev-team-reviewer\"" not in rendered
-            assert "Implement — Dev" not in rendered
-            assert "{{AGENT_PROMPT_DEV_IMPLEMENT}}" not in rendered
-            assert "{{AGENT_PROMPT_REVIEWER_REVIEW}}" not in rendered
-            assert "reviewer-review.md" not in rendered
-            assert "dev-implement.md" not in rendered
-            assert "Bug Fix Documentation Policy" not in rendered
-            assert "For bug-fix sessions" not in rendered
-            assert "fix(<scope>)" not in rendered
-            assert "port check 3000" not in rendered
-            assert "localhost:3000" 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
+    def test_retained_tier3_fallback_template_uses_direct_orchestrator_implementation(self):
+        rendered = Path("dev-pipeline/templates/bootstrap-tier3.md").read_text(encoding="utf-8")
+
+        assert "/prizmkit-implement" in rendered
+        assert "Implement — Orchestrator Direct" in rendered
+        assert "Spawn Dev subagent" not in rendered
+        assert "Spawn Dev agent" not in rendered
+        assert "Spawn Reviewer agent" not in rendered
+        assert "Reviewer Agent Def" not in rendered
+        assert "subagent_type=\"" + "-".join(["prizm", "dev", "team", "reviewer"]) + "\"" not in rendered
+        assert "Implement — Dev" not in rendered
+        assert "{{AGENT_PROMPT_DEV_IMPLEMENT}}" not in rendered
+        assert "{{AGENT_PROMPT_REVIEWER_REVIEW}}" not in rendered
+        assert "reviewer-review.md" not in rendered
+        assert "dev-implement.md" not in rendered
+        assert "Bug Fix Documentation Policy" not in rendered
+        assert "For bug-fix sessions" not in rendered
+        assert "fix(<scope>)" not in rendered
+        assert "port check 3000" not in rendered
+        assert "localhost:3000" 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
 
 
 # ---------------------------------------------------------------------------
@@ -932,7 +921,14 @@ class TestContinuationHandoff:
         args = Namespace(
             output=str(tmp_path / ".prizmkit/state/features/F-123/sessions/F-123-new/bootstrap-prompt.md"),
             state_dir=str(tmp_path / ".prizmkit/state/features"),
-            continuation_mode="context_overflow",
+            continuation_mode="ai_error",
+            failure_classification="ai_runtime_or_provider_error",
+            code_retry_count="1",
+            infra_error_count="2",
+            max_code_retries="3",
+            max_infra_retries="3",
+            no_progress_count="0",
+            progress_fingerprint=json.dumps({"git_diff_fingerprint": "diff", "head_commit": "abc", "checkpoint_cursor": "S03:pending"}),
             previous_session_id="F-123-old",
             continuation_count="2",
             context_overflow_count="2",
@@ -953,11 +949,11 @@ class TestContinuationHandoff:
 
         assert rendered.startswith("NORMAL BOOTSTRAP")
         assert "## Continuation Addendum" in rendered
-        assert "This is an automatic continuation after context overflow." in rendered
+        assert "This is an automatic continuation after the previous launched AI session ended with `ai_runtime_or_provider_error`." in rendered
         assert "This is a fresh headless AI CLI session for the same task." in rendered
         assert "Continue on the current branch/worktree." in rendered
         assert "Do not reset, clean, switch branches, or discard work." in rendered
-        assert "Start with `git status` and `git diff`." in rendered
+        assert "Inspect `git status` and `git diff` before editing." in rendered
         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
@@ -1008,23 +1004,18 @@ def _write_feature_list(path, feature):
     path.write_text(json.dumps({"features": [feature], "global_context": {"language": "Python"}}), encoding="utf-8")
 
 
-def _render_feature_prompt(tmp_path, mode="standard", template=None, platform="claude", browser_interaction=None):
+def _render_feature_prompt(tmp_path, mode="standard", template=None, platform="claude", browser_interaction=None, complexity=None):
     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"):
-            (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],
+        "estimated_complexity": complexity or {"lite": "low", "standard": "medium", "full": "high"}[mode],
         "acceptance_criteria": ["Prompts are clean"],
     }
     if browser_interaction is not None:
@@ -1046,7 +1037,10 @@ def _render_feature_prompt(tmp_path, mode="standard", template=None, platform="c
         "--mode", mode,
     ]
     if template:
-        args.extend(["--template", str(Path("dev-pipeline/templates") / template)])
+        template_path = Path(template)
+        if not template_path.is_absolute():
+            template_path = Path("dev-pipeline/templates") / template_path
+        args.extend(["--template", str(template_path)])
     old_argv = os.sys.argv
     old_platform = os.environ.get("PRIZMKIT_PLATFORM")
     try:
@@ -1065,14 +1059,23 @@ def _render_feature_prompt(tmp_path, mode="standard", template=None, platform="c
     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"):
-            (agents_dir / f"prizm-dev-team-{name}{suffix}").write_text("agent\n", encoding="utf-8")
+def _ensure_skill_files(project, platforms=None):
+    """Create minimal skill files so platform resolution succeeds."""
+    if platforms is None:
+        platforms = ("claude", "codex")
+    for plat in platforms:
+        if plat == "codex":
+            skill_dir = project / ".agents" / "skills" / "prizmkit"
+            skill_dir.mkdir(parents=True, exist_ok=True)
+            (skill_dir / "SKILL.md").write_text("skill\n", encoding="utf-8")
+        elif plat == "codebuddy":
+            skill_dir = project / ".codebuddy" / "skills" / "prizmkit"
+            skill_dir.mkdir(parents=True, exist_ok=True)
+            (skill_dir / "SKILL.md").write_text("skill\n", encoding="utf-8")
+        else:
+            command_dir = project / ".claude" / "commands"
+            command_dir.mkdir(parents=True, exist_ok=True)
+            (command_dir / "prizmkit.md").write_text("skill\n", encoding="utf-8")
 
 
 def _render_bugfix_prompt(
@@ -1087,7 +1090,7 @@ def _render_bugfix_prompt(
     (project / ".prizmkit" / "config.json").write_text(
         json.dumps({"platform": platform, "ai_cli": platform}), encoding="utf-8"
     )
-    _ensure_agent_files(project)
+    _ensure_skill_files(project)
     bug_list = project / ".prizmkit" / "plans" / "bug-fix-list.json"
     bug_list.parent.mkdir(parents=True)
     bug = {"id": "B-001", "title": "Broken", "description": "Fix it", "acceptance_criteria": ["Works"]}
@@ -1140,7 +1143,7 @@ def _render_refactor_prompt(tmp_path, platform="claude", explicit_platform=None,
     (project / ".prizmkit" / "config.json").write_text(
         json.dumps({"platform": platform, "ai_cli": platform}), encoding="utf-8"
     )
-    _ensure_agent_files(project)
+    _ensure_skill_files(project)
     refactor_list = project / ".prizmkit" / "plans" / "refactor-list.json"
     refactor_list.parent.mkdir(parents=True)
     refactor = {
@@ -1190,6 +1193,100 @@ def _render_refactor_prompt(tmp_path, platform="claude", explicit_platform=None,
     return output.read_text(encoding="utf-8")
 
 
+class TestFeaturePromptUnifiedFullGuidance:
+    def test_default_sections_prompt_uses_full_guidance_for_all_complexities(self, tmp_path):
+        prompts = {
+            complexity: _render_feature_prompt(
+                tmp_path / f"complexity-{complexity}",
+                mode="lite",
+                complexity=complexity,
+            )
+            for complexity in ("low", "medium", "high", "critical")
+        }
+
+        for complexity, prompt in prompts.items():
+            assert f"**Complexity**: {complexity}" in prompt
+            assert "## Task Contract" in prompt
+            assert "## Workflow Checkpoint System" in prompt
+            assert "### Specify + Plan (Full Workflow)" in prompt
+            assert "### Plan Self-Check — Orchestrator Direct" in prompt
+            assert "### Scoped Feature Test Gate — PrizmKit Test" in prompt
+            assert "## Test Failure Recovery Protocol" in prompt
+            assert "Boundary Matrix" in prompt
+            assert "### Browser Verification — MANDATORY" in prompt
+            assert "### TERMINAL STOP — Commit Completed" in prompt
+            assert "# Dev-Pipeline Session Bootstrap — Tier 1" not in prompt
+            assert "# Dev-Pipeline Session Bootstrap — Tier 2" not in prompt
+            assert "### Phase 0: SKIP (already initialized)" not in prompt
+
+        # The complexity value remains planning metadata, but guidance markers are
+        # the same full/tier3-equivalent composition for every complexity.
+    def test_cli_mode_override_does_not_downgrade_default_sections_guidance(self, tmp_path):
+        prompt = _render_feature_prompt(tmp_path / "mode-lite", mode="lite", complexity="low")
+
+        assert "{{PIPELINE_MODE}}" not in prompt
+        assert "### Specify + Plan (Full Workflow)" in prompt
+        assert "### Plan Self-Check — Orchestrator Direct" in prompt
+        assert "### Phase 0: SKIP (already initialized)" not in prompt
+
+    def test_explicit_custom_template_override_still_renders(self, tmp_path):
+        custom = tmp_path / "custom-template.md"
+        custom.write_text(
+            "CUSTOM {{FEATURE_ID}} {{FEATURE_TITLE}} {{COMPLEXITY}} {{IF_FRESH_START}}fresh{{END_IF_FRESH_START}}",
+            encoding="utf-8",
+        )
+
+        prompt = _render_feature_prompt(
+            tmp_path / "custom-template-project",
+            mode="lite",
+            complexity="low",
+            template=custom,
+        )
+
+        assert prompt == "CUSTOM F-123 Prompt Cleanup low fresh"
+
+    def test_fallback_without_sections_prefers_tier3_then_bootstrap_prompt(self, tmp_path, monkeypatch):
+        import generate_bootstrap_prompt as gbp
+
+        original_isdir = os.path.isdir
+        original_isfile = os.path.isfile
+        requested = []
+
+        def fake_isdir(path):
+            if str(path).endswith(os.path.join("templates", "sections")):
+                return False
+            return original_isdir(path)
+
+        def fake_isfile(path):
+            requested.append(Path(path).name)
+            return original_isfile(path)
+
+        monkeypatch.setattr(gbp.os.path, "isdir", fake_isdir)
+        monkeypatch.setattr(gbp.os.path, "isfile", fake_isfile)
+        prompt = _render_feature_prompt(tmp_path / "fallback-tier3", mode="lite", complexity="low")
+
+        assert requested.index("bootstrap-tier3.md") < requested.index("bootstrap-prompt.md") if "bootstrap-prompt.md" in requested else True
+        assert "# Dev-Pipeline Session Bootstrap — Tier 3" in prompt
+        assert "bootstrap-tier1.md" not in requested
+        assert "bootstrap-tier2.md" not in requested
+
+        requested.clear()
+
+        def fake_isfile_without_tier3(path):
+            requested.append(Path(path).name)
+            if Path(path).name == "bootstrap-tier3.md":
+                return False
+            return original_isfile(path)
+
+        monkeypatch.setattr(gbp.os.path, "isfile", fake_isfile_without_tier3)
+        prompt = _render_feature_prompt(tmp_path / "fallback-bootstrap-prompt", mode="lite", complexity="low")
+
+        assert "bootstrap-tier3.md" in requested
+        assert "bootstrap-tier1.md" not in requested
+        assert "bootstrap-tier2.md" not in requested
+        assert "# Dev-Pipeline Fallback Bootstrap Prompt" in prompt
+
+
 class TestBrowserBlockingPromptPolicy:
     def test_feature_bugfix_refactor_blocking_browser_policy_stops_before_commit(self, tmp_path):
         browser_interaction = {
@@ -1282,21 +1379,24 @@ class TestHeadlessPromptCleanupF033:
                 assert "which " not in prompt  # no which-command shell glue
             assert "python3 {{INIT_SCRIPT_PATH}}" not 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, template=template)
-            for forbidden in HEADLESS_FORBIDDEN_PROMPT_STRINGS:
-                assert forbidden not in prompt
-            assert "prizmkit-test-gate.py" not in prompt
-            assert "python3 {{INIT_SCRIPT_PATH}}" not in prompt
-            assert "which playwright-cli" not in prompt
-            assert "lsof -ti" not in prompt
-            assert "sed -nE" not in prompt
-            assert ".prizmkit-test-started" in prompt
-            assert "{{RUNTIME_HELPER_CMD}}" not in prompt
-            assert "prizmkit-runtime-helper.py" in prompt
-
-    def test_legacy_feature_templates_with_browser_blocks_are_shell_free(self, tmp_path):
+    def test_retained_tier3_template_is_clean_when_rendered(self, tmp_path):
+        prompt = _render_feature_prompt(tmp_path / "bootstrap-tier3.md", mode="full", template="bootstrap-tier3.md")
+        for forbidden in HEADLESS_FORBIDDEN_PROMPT_STRINGS:
+            assert forbidden not in prompt
+        assert "prizmkit-test-gate.py" not in prompt
+        assert "python3 {{INIT_SCRIPT_PATH}}" not in prompt
+        assert "which playwright-cli" not in prompt
+        assert "lsof -ti" not in prompt
+        assert "sed -nE" not in prompt
+        assert ".prizmkit-test-started" in prompt
+        assert "{{RUNTIME_HELPER_CMD}}" not in prompt
+        assert "prizmkit-runtime-helper.py" in prompt
+
+    def test_retired_tier1_tier2_templates_are_removed(self):
+        assert not Path("dev-pipeline/templates/bootstrap-tier1.md").exists()
+        assert not Path("dev-pipeline/templates/bootstrap-tier2.md").exists()
+
+    def test_retained_tier3_template_with_browser_blocks_is_shell_free(self, tmp_path):
         forbidden = [
             "python3 {{INIT_SCRIPT_PATH}}",
             "which playwright-cli",
@@ -1308,21 +1408,15 @@ class TestHeadlessPromptCleanupF033:
             "opencli doctor 2>/dev/null ||",
             "echo \"=== playwright-cli ===\" &&",
         ]
-        cases = [
-            ("bootstrap-tier1.md", "lite"),
-            ("bootstrap-tier2.md", "standard"),
-            ("bootstrap-tier3.md", "full"),
-        ]
-        for template, mode in cases:
-            prompt = _render_feature_prompt(
-                tmp_path / f"browser-{template}",
-                mode=mode,
-                                template=template,
-                browser_interaction={"tool": "auto", "verify_steps": ["Open the page"]},
-            )
-            assert "prizmkit-runtime-helper.py" in prompt
-            for snippet in forbidden:
-                assert snippet not in prompt
+        prompt = _render_feature_prompt(
+            tmp_path / "browser-bootstrap-tier3.md",
+            mode="full",
+            template="bootstrap-tier3.md",
+            browser_interaction={"tool": "auto", "verify_steps": ["Open the page"]},
+        )
+        assert "prizmkit-runtime-helper.py" in prompt
+        for snippet in forbidden:
+            assert snippet 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
@@ -1334,7 +1428,7 @@ class TestHeadlessPromptCleanupF033:
         (bug_project / ".prizmkit" / "config.json").write_text(
             json.dumps({"platform": "claude", "ai_cli": "claude"}), encoding="utf-8"
         )
-        _ensure_agent_files(bug_project)
+        _ensure_skill_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,
@@ -1346,15 +1440,15 @@ class TestHeadlessPromptCleanupF033:
         )
         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 ".codex/agents/prizm-dev-team-reviewer.toml" not in refactor_prompt
+        assert "{{" + "REVIEWER_" + "SUBAGENT_PATH" + "}}" not in replacements
+        assert "reviewer-agent-prompt.md" 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)
+        _ensure_skill_files(bug_project)
         monkeypatch.setenv("PRIZMKIT_PLATFORM", "codex")
         args = Namespace(
             bug_id="B-001", session_id="session-1", run_id="run-1",
@@ -1367,8 +1461,8 @@ class TestHeadlessPromptCleanupF033:
         )
         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 ".claude/agents/prizm-dev-team-reviewer.md" not in refactor_prompt
+        assert "{{" + "REVIEWER_" + "SUBAGENT_PATH" + "}}" not in replacements
+        assert "reviewer-agent-prompt.md" in refactor_prompt
 
 
 class TestFeatureBootstrapShellExtraction:
@@ -1427,49 +1521,25 @@ class TestFeatureBootstrapShellExtraction:
             assert "port check 3000" not in prompt
             assert "localhost:3000" not in prompt
 
-    def test_rendered_legacy_tier_feature_prompts_use_runtime_helper_not_extracted_bash(self, tmp_path):
-        cases = [
-            ("bootstrap-tier1.md", "lite"),
-            ("bootstrap-tier2.md", "standard"),
-            ("bootstrap-tier3.md", "full"),
-        ]
-        for template, mode in cases:
-            prompt = _render_feature_prompt(
-                tmp_path / f"legacy-{template}",
-                mode=mode,
-                                template=template,
-                browser_interaction={"tool": "playwright-cli", "verify_steps": ["Open the page"]},
-            )
-
-            self.assert_shell_extracted_operations_removed(prompt)
-            assert "process start --pid-file .prizmkit/state/browser-dev-server.pid" in prompt
-            assert "process cleanup-pid <pid-from-.prizmkit/state/browser-dev-server.pid>" in prompt
-            assert "port check 3000" not in prompt
-            assert "localhost:3000" not in prompt
-
-    def test_legacy_tier_specific_extracted_operations_map_to_helper_commands(self, tmp_path):
-        tier1 = _render_feature_prompt(
-            tmp_path / "legacy-tier1-helper-map",
-            mode="lite",
-            template="bootstrap-tier1.md",
-        )
-        assert "artifact tree . --max-depth 2" in tier1
-        assert "text contains .gitignore --pattern \"/binary-name\"" in tier1
-        assert "NEEDS_IGNORE_ENTRY" in tier1
-
-        tier2 = _render_feature_prompt(
-            tmp_path / "legacy-tier2-helper-map",
-            mode="standard",
-                        template="bootstrap-tier2.md",
+    def test_rendered_retained_tier3_feature_prompt_uses_runtime_helper_not_extracted_bash(self, tmp_path):
+        prompt = _render_feature_prompt(
+            tmp_path / "legacy-bootstrap-tier3.md",
+            mode="full",
+            template="bootstrap-tier3.md",
+            browser_interaction={"tool": "playwright-cli", "verify_steps": ["Open the page"]},
         )
-        assert "artifact exists .prizmkit/specs/123-prompt-cleanup/failure-log.md" in tier2
-        assert "artifact tree . --max-depth 2" in tier2
-        assert "text count .prizmkit/specs/123-prompt-cleanup/plan.md --pattern \"- [ ]\"" in tier2
 
+        self.assert_shell_extracted_operations_removed(prompt)
+        assert "process start --pid-file .prizmkit/state/browser-dev-server.pid" in prompt
+        assert "process cleanup-pid <pid-from-.prizmkit/state/browser-dev-server.pid>" in prompt
+        assert "port check 3000" not in prompt
+        assert "localhost:3000" not in prompt
+
+    def test_retained_tier3_specific_extracted_operations_map_to_helper_commands(self, tmp_path):
         tier3 = _render_feature_prompt(
             tmp_path / "legacy-tier3-helper-map",
             mode="full",
-                        template="bootstrap-tier3.md",
+            template="bootstrap-tier3.md",
         )
         assert "text search . --pattern \"123-prompt-cleanup\" --json" in tier3
         assert "text count .prizmkit/specs/123-prompt-cleanup/plan.md --pattern \"- [ ]\"" in tier3

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

@@ -196,7 +196,7 @@ class TestExplicitProjectRoot:
             "sessions" / "session-1" / "session-status.json"
         )
         assert not replacements["{{SESSION_STATUS_PATH}}"].startswith(str(execution_root.resolve()))
-        assert replacements["{{DEV_SUBAGENT_PATH}}"].startswith(str(execution_root.resolve()))
+        assert "{{" + "DEV_" + "SUBAGENT_PATH" + "}}" not in replacements
         assert replacements["{{SESSION_LOG_PATH}}"].endswith(
             ".prizmkit/state/bugfix/B-001/sessions/session-1/logs/session.log"
         )
@@ -265,7 +265,14 @@ class TestBugfixContinuationHandoff:
         args = Namespace(
             output=str(tmp_path / ".prizmkit/state/bugfix/B-007/sessions/B-007-new/bootstrap-prompt.md"),
             state_dir=str(tmp_path / ".prizmkit/state/bugfix"),
-            continuation_mode="context_overflow",
+            continuation_mode="ai_error",
+            failure_classification="ai_runtime_or_provider_error",
+            code_retry_count="1",
+            infra_error_count="2",
+            max_code_retries="3",
+            max_infra_retries="3",
+            no_progress_count="0",
+            progress_fingerprint=json.dumps({"git_diff_fingerprint": "diff", "head_commit": "abc", "checkpoint_cursor": "S03:pending"}),
             previous_session_id="B-007-old",
             continuation_count="1",
             context_overflow_count="1",
@@ -279,7 +286,7 @@ class TestBugfixContinuationHandoff:
         )
 
         assert prompt.startswith("BUGFIX PROMPT")
-        assert "This is an automatic continuation after context overflow." in prompt
+        assert "This is an automatic continuation after the previous launched AI session ended with `ai_runtime_or_provider_error`." in prompt
         assert "Do not attempt `/compact` as the recovery mechanism." not in prompt
         assert ("Log " + "monitor") not in prompt
         assert ("log-" + "monitor") not in prompt
@@ -360,7 +367,7 @@ def _render_bugfix_prompt(tmp_path, platform="claude"):
     (project / ".prizmkit" / "config.json").write_text(
         json.dumps({"platform": platform, "ai_cli": platform}), encoding="utf-8"
     )
-    _ensure_agent_files(project)
+    _ensure_skill_files(project)
     bug_list = project / ".prizmkit" / "plans" / "bug-fix-list.json"
     bug_list.parent.mkdir(parents=True)
     bug_list.write_text(json.dumps({
@@ -399,17 +406,23 @@ def _render_bugfix_prompt(tmp_path, platform="claude"):
     return output.read_text(encoding="utf-8")
 
 
-def _ensure_agent_files(project, platforms=None):
-    """Create minimal agent files so platform resolution succeeds."""
+def _ensure_skill_files(project, platforms=None):
+    """Create minimal skill files so platform resolution succeeds."""
     if platforms is None:
         platforms = ("claude", "codex")
     for plat in platforms:
-        platform_dir = ".codex" if plat == "codex" else ".claude"
-        suffix = ".toml" if plat == "codex" else ".md"
-        agents_dir = project / platform_dir / "agents"
-        agents_dir.mkdir(parents=True, exist_ok=True)
-        for name in ("dev", "reviewer"):
-            (agents_dir / f"prizm-dev-team-{name}{suffix}").write_text("agent\n", encoding="utf-8")
+        if plat == "codex":
+            skill_dir = project / ".agents" / "skills" / "prizmkit"
+            skill_dir.mkdir(parents=True, exist_ok=True)
+            (skill_dir / "SKILL.md").write_text("skill\n", encoding="utf-8")
+        elif plat == "codebuddy":
+            skill_dir = project / ".codebuddy" / "skills" / "prizmkit"
+            skill_dir.mkdir(parents=True, exist_ok=True)
+            (skill_dir / "SKILL.md").write_text("skill\n", encoding="utf-8")
+        else:
+            command_dir = project / ".claude" / "commands"
+            command_dir.mkdir(parents=True, exist_ok=True)
+            (command_dir / "prizmkit.md").write_text("skill\n", encoding="utf-8")
 
 
 class TestBugfixBootstrapShellExtraction: