prizmkit 1.1.111 → 1.1.113

package/bundled/dev-pipeline/scripts/generate-bugfix-prompt.py

@@ -1,16 +1,8 @@
 #!/usr/bin/env python3
-"""Generate a session-specific bug fix bootstrap prompt from template and .prizmkit/plans/bug-fix-list.json.
-
-Reads the bugfix-bootstrap-prompt.md template and a .prizmkit/plans/bug-fix-list.json, resolves all
-{{PLACEHOLDER}} variables, handles conditional blocks, and writes the rendered
-prompt to the specified output path.
-
-Usage:
-    python3 generate-bugfix-prompt.py \
-        --bug-list <path> --bug-id <id> \
-        --session-id <id> --run-id <id> \
-        --retry-count <n> --resume-phase <n|null> \
-        --state-dir <path> --output <path>
+"""Generate a session-specific bug fix bootstrap prompt from bug-fix-list.json.
+
+The default path uses modular prompt sections. The legacy monolithic template is
+kept only for explicit --template compatibility.
 """
 
 import argparse
@@ -19,20 +11,55 @@ import os
 import re
 import sys
 
-from utils import enrich_global_context, helper_replacements, load_json_file, read_checkpoint_system_section, resolve_prompt_platform, setup_logging
 from continuation import add_continuation_args, append_continuation_handoff, is_continuation
+from prompt_framework import (
+    browser_enabled_from_item,
+    detect_dev_server_port,
+    generate_checkpoint_from_sections,
+    load_section,
+    merge_checkpoint_state,
+    mode_agent_count,
+    normalize_mode,
+    read_text_file,
+    render_from_sections,
+    replace_placeholders,
+    validate_rendered,
+    write_output,
+)
+from utils import enrich_global_context, helper_replacements, load_json_file, read_checkpoint_system_section, resolve_prompt_platform, setup_logging
 
 
-DEFAULT_MAX_RETRIES = 3
-
 LOGGER = setup_logging("generate-bugfix-prompt")
 
 
+# Section name -> checkpoint contract.
+BUGFIX_SECTION_TO_SKILL = {
+    "bugfix-phase-init": ("prizmkit-init", "Initialize", [".prizmkit/bugfix/{slug}"]),
+    "bugfix-phase-diagnose-plan": (
+        "bug-diagnosis-and-plan", "Diagnose & Plan",
+        [".prizmkit/bugfix/{slug}/spec.md", ".prizmkit/bugfix/{slug}/plan.md"],
+    ),
+    "bugfix-phase-critic": ("critic-plan-review", "Critic: Root Cause & Fix Plan Review", []),
+    "bugfix-phase-implement": ("prizmkit-implement", "Implement Fix", []),
+    "bugfix-phase-review": ("prizmkit-code-review", "Code Review", []),
+    "phase-browser": ("browser-verification", "Browser Verification", []),
+    "bugfix-phase-commit-report": None,
+}
+
+BUGFIX_SPLIT_STEPS = {
+    "bugfix-phase-commit-report": [
+        ("prizmkit-retrospective", "Retrospective", []),
+        ("prizmkit-committer", "Commit", []),
+        ("bug-report", "Generate Fix Report", [".prizmkit/bugfix/{slug}/fix-report.md"]),
+    ],
+}
+
+
 def parse_args():
     parser = argparse.ArgumentParser(
         description=(
-            "Generate a session-specific bug fix bootstrap prompt from a template "
-            "and .prizmkit/plans/bug-fix-list.json."
+            "Generate a session-specific bug fix bootstrap prompt from "
+            ".prizmkit/plans/bug-fix-list.json."
         )
     )
     parser.add_argument("--bug-list", required=True, help="Path to .prizmkit/plans/bug-fix-list.json")
@@ -44,27 +71,13 @@ def parse_args():
     parser.add_argument("--state-dir", default=None, help="State directory (default: .prizmkit/state/bugfix)")
     parser.add_argument("--output", required=True, help="Output path for the rendered prompt")
     parser.add_argument("--project-root", default=None, help="AI-visible project root used for rendered prompt paths")
-    parser.add_argument("--template", default=None, help="Custom template path. Defaults to {script_dir}/../templates/bugfix-bootstrap-prompt.md")
-    parser.add_argument("--mode", default=None, help="Pipeline execution mode override: lite, standard, full")
-    parser.add_argument("--critic", default=None, help="Enable critic agent: true/false")
+    parser.add_argument("--template", default=None, help="Custom legacy template path. Defaults to section assembly.")
+    parser.add_argument("--mode", choices=["lite", "standard", "full"], default=None, help="Pipeline execution mode override")
+    parser.add_argument("--critic", choices=["true", "false"], default=None, help="Enable critic agent: true/false")
     add_continuation_args(parser, "bugfix")
-
     return parser.parse_args()
 
 
-def read_text_file(path):
-    """Read and return the text content of a file."""
-    abs_path = os.path.abspath(path)
-    if not os.path.isfile(abs_path):
-        return None, "File not found: {}".format(abs_path)
-    try:
-        with open(abs_path, "r", encoding="utf-8") as f:
-            return f.read(), None
-    except IOError as e:
-        return None, "Cannot read file: {}".format(str(e))
-
-
-
 def _parse_positive_int_env(name, default):
     """Parse a positive integer environment variable."""
     value = os.environ.get(name, str(default))
@@ -89,27 +102,26 @@ def format_acceptance_criteria(criteria):
     """Format acceptance criteria as a markdown bullet list."""
     if not criteria:
         return "- (none specified)"
-    lines = []
-    for item in criteria:
-        lines.append("- {}".format(item))
-    return "\n".join(lines)
+    return "\n".join("- {}".format(item) for item in criteria)
 
 
-def format_global_context(global_context, project_root=None):
-    """Format global_context dict as a key-value list.
+def format_ac_checklist(criteria):
+    """Format acceptance criteria as a checkbox list."""
+    if not criteria:
+        return "- [ ] (no acceptance criteria specified)"
+    return "\n".join("- [ ] {}".format(item) for item in criteria)
+
 
-    If global_context is empty/sparse and project_root is provided,
-    auto-detect tech stack from project files to fill gaps.
-    """
+def format_global_context(global_context, project_root=None):
+    """Format global_context dict as a key-value list."""
     if project_root:
         enrich_global_context(global_context, project_root)
-
     if not global_context:
         return "- (none specified)"
-    lines = []
-    for key, value in sorted(global_context.items()):
-        lines.append("- **{}**: {}".format(key, value))
-    return "\n".join(lines)
+    return "\n".join(
+        "- **{}**: {}".format(key, value)
+        for key, value in sorted(global_context.items())
+    )
 
 
 def format_error_source_details(error_source):
@@ -120,35 +132,23 @@ def format_error_source_details(error_source):
     etype = error_source.get("type", "unknown")
 
     if etype == "stack_trace" and error_source.get("stack_trace"):
-        lines.append("- **Stack Trace**:")
-        lines.append("```")
-        lines.append(error_source["stack_trace"])
-        lines.append("```")
+        lines.extend(["- **Stack Trace**:", "```", error_source["stack_trace"], "```"])
     if error_source.get("error_message"):
         lines.append("- **Error Message**: {}".format(error_source["error_message"]))
     if etype == "log_pattern" and error_source.get("log_snippet"):
-        lines.append("- **Log Snippet**:")
-        lines.append("```")
-        lines.append(error_source["log_snippet"])
-        lines.append("```")
+        lines.extend(["- **Log Snippet**:", "```", error_source["log_snippet"], "```"])
     if etype == "failed_test" and error_source.get("failed_test_path"):
         lines.append("- **Failed Test**: `{}`".format(error_source["failed_test_path"]))
     if etype == "user_report" and error_source.get("reproduction_steps"):
         lines.append("- **Reproduction Steps**:")
-        for i, step in enumerate(error_source["reproduction_steps"], 1):
-            lines.append("  {}. {}".format(i, step))
+        for index, step in enumerate(error_source["reproduction_steps"], 1):
+            lines.append("  {}. {}".format(index, step))
 
-    if not lines:
-        lines.append("- (no additional details)")
-    return "\n".join(lines)
+    return "\n".join(lines or ["- (no additional details)"])
 
 
 def format_user_context(user_context):
-    """Format user_context array as a markdown section.
-
-    Returns empty string if user_context is empty or absent,
-    so the template placeholder resolves to nothing.
-    """
+    """Format user_context array as a markdown section."""
     if not user_context or not isinstance(user_context, list):
         return ""
     items = [item for item in user_context if isinstance(item, str) and item.strip()]
@@ -157,12 +157,10 @@ def format_user_context(user_context):
     lines = [
         "### User-Provided Context (HIGHEST PRIORITY)",
         "",
-        "> The following materials were provided by the user. "
-        "They take precedence over AI inference.",
+        "> The following materials were provided by the user. They take precedence over AI inference.",
         "",
     ]
-    for item in items:
-        lines.append("- {}".format(item))
+    lines.extend("- {}".format(item) for item in items)
     return "\n".join(lines)
 
 
@@ -170,64 +168,50 @@ def format_environment(env):
     """Format environment dict as a key-value list."""
     if not env or not isinstance(env, dict):
         return "- (not specified)"
-    lines = []
-    for key, value in sorted(env.items()):
-        if value:
-            lines.append("- **{}**: {}".format(key, value))
-    if not lines:
-        return "- (not specified)"
-    return "\n".join(lines)
+    lines = [
+        "- **{}**: {}".format(key, value)
+        for key, value in sorted(env.items())
+        if value
+    ]
+    return "\n".join(lines) if lines else "- (not specified)"
 
 
 def get_prev_session_status(state_dir, bug_id):
     """Read previous session status from state dir if available."""
     if not state_dir:
         return "N/A (first run)"
-
     bug_status_path = os.path.join(state_dir, bug_id, "status.json")
     if not os.path.isfile(bug_status_path):
         return "N/A (first run)"
-
     try:
         with open(bug_status_path, "r", encoding="utf-8") as f:
             bug_status = json.load(f)
     except (json.JSONDecodeError, IOError):
         return "N/A (could not read bug status)"
-
     last_session_id = bug_status.get("last_session_id")
     if not last_session_id:
         return "N/A (first run)"
-
-    session_status_path = os.path.join(state_dir, bug_id, "sessions",
-        last_session_id, "session-status.json"
-    )
+    session_status_path = os.path.join(state_dir, bug_id, "sessions", last_session_id, "session-status.json")
     if not os.path.isfile(session_status_path):
         return "N/A (previous session status file not found)"
-
     try:
         with open(session_status_path, "r", encoding="utf-8") as f:
             session_data = json.load(f)
     except (json.JSONDecodeError, IOError):
         return "N/A (could not read previous session status)"
-
-    status = session_data.get("status", "unknown")
-    checkpoint = session_data.get("checkpoint_reached", "none")
-    current_phase = session_data.get("current_phase", "unknown")
-    errors = session_data.get("errors", [])
-
     result = "{} (checkpoint: {}, last phase: {})".format(
-        status, checkpoint, current_phase
+        session_data.get("status", "unknown"),
+        session_data.get("checkpoint_reached", "none"),
+        session_data.get("current_phase", "unknown"),
     )
+    errors = session_data.get("errors", [])
     if errors:
         result += " — errors: {}".format("; ".join(str(e) for e in errors))
     return result
 
 
 def resolve_project_root(script_dir):
-    """Resolve project root. Layout-aware:
-      <project>/.prizmkit/dev-pipeline/scripts/  → <project>
-      <repo>/dev-pipeline/scripts/               → <repo>
-    """
+    """Resolve project root from script location."""
     pipeline_dir = os.path.dirname(script_dir)
     pipeline_parent = os.path.dirname(pipeline_dir)
     if os.path.basename(pipeline_parent) == ".prizmkit":
@@ -236,18 +220,34 @@ def resolve_project_root(script_dir):
 
 
 def _args_project_root(args, script_dir):
-    """Return explicit AI-visible project root or script-layout default."""
     explicit = getattr(args, "project_root", None)
     if explicit:
         return os.path.abspath(explicit)
     return resolve_project_root(script_dir)
 
 
+def determine_bugfix_mode(args, bug):
+    if args.mode:
+        return args.mode
+    return normalize_mode(
+        {"low": "lite", "medium": "lite", "high": "standard", "critical": "full"}.get(
+            str(bug.get("severity", "medium")).lower(), "lite"
+        )
+    )
+
+
+def is_recovery_like(args):
+    retry_count = 0
+    try:
+        retry_count = int(getattr(args, "retry_count", 0))
+    except (TypeError, ValueError):
+        retry_count = 0
+    return is_continuation(args) or getattr(args, "resume_phase", "null") != "null" or retry_count > 0
+
+
 def build_replacements(args, bug, global_context, script_dir):
     """Build the full dict of placeholder -> replacement value."""
     project_root = _args_project_root(args, script_dir)
-
-    # Platform-aware agent/team path resolution
     platform = resolve_prompt_platform(project_root)
     home_dir = os.path.expanduser("~")
 
@@ -259,221 +259,206 @@ def build_replacements(args, bug, global_context, script_dir):
         team_config_path = os.path.join(project_root, ".codex", "team-info.json")
     else:
         agents_dir = os.path.join(project_root, ".codebuddy", "agents")
-        team_config_path = os.path.join(
-            home_dir, ".codebuddy", "teams", "prizm-dev-team", "config.json"
-        )
+        team_config_path = os.path.join(home_dir, ".codebuddy", "teams", "prizm-dev-team", "config.json")
 
     agent_ext = ".toml" if platform == "codex" else ".md"
-    dev_subagent = os.path.join(agents_dir, f"prizm-dev-team-dev{agent_ext}")
-    reviewer_subagent = os.path.join(agents_dir, f"prizm-dev-team-reviewer{agent_ext}")
+    dev_subagent = os.path.join(agents_dir, "prizm-dev-team-dev{}".format(agent_ext))
+    reviewer_subagent = os.path.join(agents_dir, "prizm-dev-team-reviewer{}".format(agent_ext))
+    critic_subagent = os.path.join(agents_dir, "prizm-dev-team-critic{}".format(agent_ext))
 
-    # Session status is controlled by the main runner state dir, even when
-    # rendered project paths are AI-visible worktree paths.
     state_dir = (
         os.path.abspath(args.state_dir)
         if args.state_dir
         else os.path.join(project_root, ".prizmkit", "state", "bugfix")
     )
-    session_status_path = os.path.join(
-        state_dir, args.bug_id, "sessions", args.session_id,
-        "session-status.json",
-    )
+    session_status_path = os.path.join(state_dir, args.bug_id, "sessions", args.session_id, "session-status.json")
 
-    # Error source
     error_source = bug.get("error_source", {})
     error_type = error_source.get("type", "unknown") if isinstance(error_source, dict) else "unknown"
-
-    # Determine fix scope from affected_modules or title
     affected_modules = bug.get("affected_modules", [])
-    if affected_modules:
-        fix_scope = affected_modules[0]
-    else:
-        fix_scope = bug.get("title", "unknown").split()[0].lower() if bug.get("title") else "unknown"
-
-    # Determine verification type
-    vtype = bug.get("verification_type", "automated")
-
-    # Browser interaction - extract from bug if present
-    browser_interaction = bug.get("browser_interaction")
-    browser_enabled = False
-    browser_verify_steps = ""
-    browser_tool = "auto"
-
-    # Environment override
-    browser_verify_env = os.environ.get("BROWSER_VERIFY", "").lower()
-    if browser_verify_env == "false":
-        browser_interaction = None
-
-    # Extract browser config (same logic as feature pipeline)
-    if browser_interaction and isinstance(browser_interaction, bool):
-        browser_enabled = True
-        browser_tool = "auto"
-        browser_verify_steps = "   # (no specific verify goals — reproduce the bug and verify it's fixed)"
-    elif browser_interaction and isinstance(browser_interaction, dict):
-        browser_tool = browser_interaction.get("tool", "auto")
-        if browser_tool not in ("playwright-cli", "opencli", "auto"):
-            LOGGER.warning("Unknown browser_interaction.tool '%s', defaulting to 'auto'", browser_tool)
-            browser_tool = "auto"
-
-        steps = browser_interaction.get("verify_steps", [])
-        if steps:
-            browser_enabled = True
-            browser_verify_steps = "\n".join(
-                "   # Step {}: {}".format(i + 1, step)
-                for i, step in enumerate(steps)
-            )
-        elif browser_interaction.get("url") or browser_interaction.get("enabled", True):
-            browser_enabled = True
-            browser_verify_steps = "   # (reproduce bug and verify fix)"
+    fix_scope = affected_modules[0] if affected_modules else (bug.get("title", "unknown").split()[0].lower() if bug.get("title") else "unknown")
+    verification_type = bug.get("verification_type", "automated")
+
+    browser_enabled, browser_tool, browser_verify_steps, browser_blocking = browser_enabled_from_item(bug)
+    dev_port = detect_dev_server_port(project_root)
+    dev_url = "http://localhost:{}".format(dev_port) if dev_port.isdigit() else "<UNKNOWN_DETECT_FROM_PROJECT_CONFIG>"
+
+    pipeline_mode = determine_bugfix_mode(args, bug)
+    critic_requested = args.critic == "true" if args.critic is not None else bool(bug.get("critic", False))
+    critic_enabled = critic_requested and pipeline_mode != "lite"
+    if critic_requested and pipeline_mode == "lite":
+        LOGGER.warning("Critic requested for bug %s but lite mode skips critic phases", args.bug_id)
+    if critic_enabled and not os.path.isfile(critic_subagent):
+        LOGGER.warning("Critic enabled but agent file not found: %s. Critic phase will be skipped.", critic_subagent)
+        critic_enabled = False
+
+    recovery_like = is_recovery_like(args)
+    manual_or_hybrid = verification_type in ("manual", "hybrid")
+    manual_policy = (
+        "Recovery-class session: automated verification may substitute for manual/hybrid UAT when evidence is documented."
+        if manual_or_hybrid and recovery_like
+        else "Fresh manual/hybrid bugfix: stop as partial before commit after automated checks; manual UAT is required."
+        if manual_or_hybrid
+        else "Automated verification: complete tests/review and proceed to commit when gates pass."
+    )
 
     replacements = {
-        "{{SESSION_LOG_PATH}}": os.path.join(
-            ".prizmkit", "state", "bugfix", args.bug_id,
-            "sessions", args.session_id, "logs", "session.log",
-        ),
+        "{{SESSION_LOG_PATH}}": os.path.join(".prizmkit", "state", "bugfix", args.bug_id, "sessions", args.session_id, "logs", "session.log"),
         "{{RUN_ID}}": args.run_id,
         "{{SESSION_ID}}": args.session_id,
         "{{BUG_ID}}": args.bug_id,
+        "{{TASK_ID}}": args.bug_id,
+        "{{TASK_TITLE}}": bug.get("title", ""),
         "{{BUG_TITLE}}": bug.get("title", ""),
         "{{SEVERITY}}": bug.get("severity", "medium"),
-        "{{VERIFICATION_TYPE}}": vtype,
+        "{{PIPELINE_MODE}}": pipeline_mode,
+        "{{CRITIC_ENABLED}}": "true" if critic_enabled else "false",
+        "{{CRITIC_COUNT}}": str(bug.get("critic_count", 1)),
+        "{{VERIFICATION_TYPE}}": verification_type,
+        "{{MANUAL_VERIFICATION_POLICY}}": manual_policy,
         "{{BUG_DESCRIPTION}}": bug.get("description", ""),
         "{{USER_CONTEXT}}": format_user_context(bug.get("user_context", [])),
         "{{ERROR_SOURCE_TYPE}}": error_type,
         "{{ERROR_SOURCE_DETAILS}}": format_error_source_details(error_source),
-        "{{ACCEPTANCE_CRITERIA}}": format_acceptance_criteria(
-            bug.get("acceptance_criteria", [])
-        ),
+        "{{ACCEPTANCE_CRITERIA}}": format_acceptance_criteria(bug.get("acceptance_criteria", [])),
+        "{{AC_CHECKLIST}}": format_ac_checklist(bug.get("acceptance_criteria", [])),
         "{{ENVIRONMENT}}": format_environment(bug.get("environment")),
         "{{GLOBAL_CONTEXT}}": format_global_context(global_context, project_root),
         "{{TEAM_CONFIG_PATH}}": team_config_path,
         "{{DEV_SUBAGENT_PATH}}": dev_subagent,
         "{{REVIEWER_SUBAGENT_PATH}}": reviewer_subagent,
+        "{{CRITIC_SUBAGENT_PATH}}": critic_subagent,
         "{{SESSION_STATUS_PATH}}": session_status_path,
         "{{PROJECT_ROOT}}": project_root,
-        "{{CHECKPOINT_PATH}}": os.path.join(
-            ".prizmkit", "bugfix", args.bug_id, "workflow-checkpoint.json",
-        ),
+        "{{ARTIFACT_DIR}}": ".prizmkit/bugfix/{}".format(args.bug_id),
+        "{{CHECKPOINT_PATH}}": os.path.join(".prizmkit", "bugfix", args.bug_id, "workflow-checkpoint.json"),
         "{{CHECKPOINT_SYSTEM}}": read_checkpoint_system_section(script_dir),
         "{{FIX_SCOPE}}": fix_scope,
-        "{{TIMESTAMP}}": "",  # Placeholder, agent fills in the timestamp
+        "{{TIMESTAMP}}": "",
         "{{BROWSER_ENABLED}}": "true" if browser_enabled else "false",
         "{{BROWSER_TOOL}}": browser_tool,
         "{{BROWSER_VERIFY_STEPS}}": browser_verify_steps,
+        "{{BROWSER_BLOCKING}}": "true" if browser_blocking else "false",
+        "{{DEV_PORT}}": dev_port,
+        "{{DEV_URL}}": dev_url,
     }
-
     replacements.update(helper_replacements(script_dir))
-
     return replacements
 
 
 def process_conditional_blocks(content, bug):
-    """Handle conditional blocks based on verification_type and browser_interaction."""
-    # Handle verification type blocks
+    """Handle legacy conditional blocks based on verification_type and browser_interaction."""
     vtype = bug.get("verification_type", "automated")
     is_manual_or_hybrid = vtype in ("manual", "hybrid")
-
     if is_manual_or_hybrid:
         content = content.replace("{{IF_VERIFICATION_MANUAL_OR_HYBRID}}\n", "")
         content = content.replace("{{IF_VERIFICATION_MANUAL_OR_HYBRID}}", "")
         content = content.replace("{{END_IF_VERIFICATION_MANUAL_OR_HYBRID}}\n", "")
         content = content.replace("{{END_IF_VERIFICATION_MANUAL_OR_HYBRID}}", "")
     else:
-        # Remove the entire conditional block
-        content = re.sub(
-            r"\{\{IF_VERIFICATION_MANUAL_OR_HYBRID\}\}.*?\{\{END_IF_VERIFICATION_MANUAL_OR_HYBRID\}\}\n?",
-            "", content, flags=re.DOTALL,
-        )
+        content = re.sub(r"\{\{IF_VERIFICATION_MANUAL_OR_HYBRID\}\}.*?\{\{END_IF_VERIFICATION_MANUAL_OR_HYBRID\}\}\n?", "", content, flags=re.DOTALL)
 
-    # Handle browser interaction blocks
-    browser_interaction = bug.get("browser_interaction")
-    browser_enabled = False
-    browser_tool = "auto"
-
-    # Check environment override
-    browser_verify_env = os.environ.get("BROWSER_VERIFY", "").lower()
-    if browser_verify_env == "false":
-        browser_interaction = None
-
-    # Determine if browser is enabled
-    if browser_interaction:
-        if isinstance(browser_interaction, bool):
-            browser_enabled = True
-        elif isinstance(browser_interaction, dict):
-            steps = browser_interaction.get("verify_steps", [])
-            if steps or browser_interaction.get("url") or browser_interaction.get("enabled", True):
-                browser_enabled = True
-            browser_tool = browser_interaction.get("tool", "auto")
-
-    # Process browser interaction blocks
+    browser_enabled, browser_tool, _steps, _blocking = browser_enabled_from_item(bug)
     browser_open = "{{IF_BROWSER_INTERACTION}}"
     browser_close = "{{END_IF_BROWSER_INTERACTION}}"
-
     if browser_enabled:
-        # Keep content, remove tags
-        content = content.replace(browser_open + "\n", "")
-        content = content.replace(browser_open, "")
-        content = content.replace(browser_close + "\n", "")
-        content = content.replace(browser_close, "")
+        content = content.replace(browser_open + "\n", "").replace(browser_open, "")
+        content = content.replace(browser_close + "\n", "").replace(browser_close, "")
     else:
-        # Remove entire block
-        pattern = re.escape(browser_open) + r".*?" + re.escape(browser_close) + r"\n?"
-        content = re.sub(pattern, "", content, flags=re.DOTALL)
-
-    # Process browser tool selection blocks (nested inside browser interaction)
-    tool_variants = ["PLAYWRIGHT", "OPENCLI", "AUTO"]
-    active_variant = {
-        "playwright-cli": "PLAYWRIGHT",
-        "opencli": "OPENCLI",
-        "auto": "AUTO",
-    }.get(browser_tool, "AUTO")
-
-    for variant in tool_variants:
+        content = re.sub(re.escape(browser_open) + r".*?" + re.escape(browser_close) + r"\n?", "", content, flags=re.DOTALL)
+
+    active_variant = {"playwright-cli": "PLAYWRIGHT", "opencli": "OPENCLI", "auto": "AUTO"}.get(browser_tool, "AUTO")
+    for variant in ("PLAYWRIGHT", "OPENCLI", "AUTO"):
         tool_open = "{{{{IF_BROWSER_TOOL_{}}}}}".format(variant)
         tool_close = "{{{{END_IF_BROWSER_TOOL_{}}}}}".format(variant)
-
         if variant == active_variant and browser_enabled:
-            # Keep content, remove tags
-            content = content.replace(tool_open + "\n", "")
-            content = content.replace(tool_open, "")
-            content = content.replace(tool_close + "\n", "")
-            content = content.replace(tool_close, "")
+            content = content.replace(tool_open + "\n", "").replace(tool_open, "")
+            content = content.replace(tool_close + "\n", "").replace(tool_close, "")
         else:
-            # Remove entire block
-            pat = re.escape(tool_open) + r".*?" + re.escape(tool_close) + r"\n?"
-            content = re.sub(pat, "", content, flags=re.DOTALL)
-
+            content = re.sub(re.escape(tool_open) + r".*?" + re.escape(tool_close) + r"\n?", "", content, flags=re.DOTALL)
     return content
 
 
 def render_template(template_content, replacements, bug):
-    """Render the template by processing conditionals and replacing placeholders."""
-    # Step 1: Process conditional blocks
-    content = process_conditional_blocks(template_content, bug)
-
-    # Step 2: Replace all {{PLACEHOLDER}} variables (two passes for nested sections)
-    for _pass in range(2):
-        for placeholder, value in replacements.items():
-            content = content.replace(placeholder, value)
-
-    return content
+    """Render the legacy template by processing conditionals and placeholders."""
+    return replace_placeholders(process_conditional_blocks(template_content, bug), replacements)
+
+
+def _bugfix_header(pipeline_mode):
+    title = "# Dev-Pipeline Bug Fix Session Bootstrap — {}\n".format(pipeline_mode.title())
+    desc = {
+        "lite": "**Tier 1 — Single Agent**: direct root-cause fix by the main orchestrator.",
+        "standard": "**Tier 2 — Orchestrator + optional Critic**: direct implementation with review gates.",
+        "full": "**Tier 3 — Full Bugfix Guardrails**: direct implementation with stronger diagnosis and critic checks.",
+    }.get(pipeline_mode, "**Bugfix pipeline**")
+    return title + "\n" + desc + "\n"
+
+
+def assemble_bugfix_sections(pipeline_mode, sections_dir, critic_enabled, browser_enabled, manual_gate):
+    sections = [
+        ("header", _bugfix_header(pipeline_mode)),
+        ("bugfix-session-context", load_section(sections_dir, "bugfix-session-context.md")),
+        ("mission", load_section(sections_dir, "bugfix-mission.md")),
+        ("bugfix-task-contract", load_section(sections_dir, "bugfix-task-contract.md")),
+        ("context-budget-rules", load_section(sections_dir, "context-budget-rules.md")),
+        ("bugfix-artifacts", load_section(sections_dir, "bugfix-artifacts.md")),
+        ("checkpoint-system", load_section(sections_dir, "checkpoint-system.md")),
+        ("execution-header", "---\n\n## Execution\n"),
+        ("bugfix-phase-init", load_section(sections_dir, "bugfix-phase-init.md")),
+        ("bugfix-phase-diagnose-plan", load_section(sections_dir, "bugfix-phase-diagnose-plan.md")),
+    ]
+    if critic_enabled:
+        sections.append(("bugfix-phase-critic", load_section(sections_dir, "bugfix-phase-critic.md")))
+    sections.extend([
+        ("bugfix-phase-implement", load_section(sections_dir, "bugfix-phase-implement.md")),
+        ("bugfix-phase-review", load_section(sections_dir, "bugfix-phase-review.md")),
+    ])
+    if browser_enabled:
+        sections.append(("phase-browser", load_section(sections_dir, "phase-browser-verification-auto.md")))
+    if manual_gate:
+        sections.append(("bugfix-manual-gate", load_section(sections_dir, "bugfix-phase-manual-verification.md")))
+        sections.extend([
+            ("bugfix-session-status", load_section(sections_dir, "bugfix-session-status.md")),
+            ("bugfix-critical-paths", load_section(sections_dir, "bugfix-critical-paths.md")),
+            ("failure-capture", load_section(sections_dir, "failure-capture.md")),
+            ("bugfix-reminders", load_section(sections_dir, "bugfix-reminders.md")),
+        ])
+        return sections
+    sections.extend([
+        ("bugfix-phase-commit-report", load_section(sections_dir, "bugfix-phase-commit-report.md")),
+        ("bugfix-session-status", load_section(sections_dir, "bugfix-session-status.md")),
+        ("bugfix-critical-paths", load_section(sections_dir, "bugfix-critical-paths.md")),
+        ("failure-capture", load_section(sections_dir, "failure-capture.md")),
+        ("bugfix-reminders", load_section(sections_dir, "bugfix-reminders.md")),
+    ])
+    return sections
+
+
+def generate_bugfix_checkpoint(bug_id, session_id, pipeline_mode="standard", sections=None):
+    """Generate a checkpoint definition for bugfix pipeline."""
+    if sections is None:
+        sections = [
+            ("bugfix-phase-init", ""),
+            ("bugfix-phase-diagnose-plan", ""),
+            ("bugfix-phase-implement", ""),
+            ("bugfix-phase-review", ""),
+            ("bugfix-phase-commit-report", ""),
+        ]
+    return generate_checkpoint_from_sections(
+        sections,
+        BUGFIX_SECTION_TO_SKILL,
+        pipeline_mode,
+        "bugfix-pipeline",
+        bug_id,
+        bug_id,
+        session_id,
+        split_steps=BUGFIX_SPLIT_STEPS,
+    )
 
 
-def write_output(output_path, content):
-    """Write the rendered content to the output file."""
-    abs_path = os.path.abspath(output_path)
-    output_dir = os.path.dirname(abs_path)
-    if output_dir and not os.path.isdir(output_dir):
-        try:
-            os.makedirs(output_dir, exist_ok=True)
-        except OSError as e:
-            return "Cannot create output directory: {}".format(str(e))
-    try:
-        with open(abs_path, "w", encoding="utf-8") as f:
-            f.write(content)
-    except IOError as e:
-        return "Cannot write output file: {}".format(str(e))
-    return None
+def merge_bugfix_checkpoint_state(existing, fresh, project_root):
+    """Merge existing bugfix checkpoint state into fresh definition."""
+    return merge_checkpoint_state(existing, fresh, project_root, logger=LOGGER)
 
 
 def emit_failure(message):
@@ -482,168 +467,81 @@ def emit_failure(message):
     sys.exit(1)
 
 
-# ============================================================
-# Checkpoint generation for bugfix pipeline
-# ============================================================
-
-BUGFIX_STEPS = [
-    ("prizmkit-init", "Initialize", []),
-    ("bug-diagnosis-and-plan", "Diagnose & Plan",
-     [".prizmkit/bugfix/{slug}/spec.md",
-      ".prizmkit/bugfix/{slug}/plan.md"]),
-    ("prizmkit-implement", "Implement Fix", []),
-    ("prizmkit-code-review", "Code Review", []),
-    ("prizmkit-committer", "Commit", ["--headless"]),
-    ("bug-report", "Generate Fix Report",
-     [".prizmkit/bugfix/{slug}/fix-report.md"]),
-]
-
-
-def generate_bugfix_checkpoint(bug_id, session_id):
-    """Generate a checkpoint definition for bugfix pipeline.
-
-    Returns a dict suitable for writing as workflow-checkpoint.json.
-    """
-    steps = []
-    prev_id = None
-    for i, (skill, name, artifacts) in enumerate(BUGFIX_STEPS, 1):
-        step_id = "S{:02d}".format(i)
-        steps.append({
-            "id": step_id,
-            "skill": skill,
-            "name": name,
-            "status": "pending",
-            "required_artifacts": [a.replace("{slug}", bug_id) for a in artifacts],
-            "depends_on": prev_id,
-        })
-        prev_id = step_id
-
-    return {
-        "version": 1,
-        "workflow_type": "bugfix-pipeline",
-        "pipeline_mode": "single",
-        "item_id": bug_id,
-        "item_slug": bug_id,
-        "session_id": session_id,
-        "steps": steps,
-    }
-
-
-def merge_bugfix_checkpoint_state(existing, fresh, project_root):
-    """Merge existing bugfix checkpoint state into fresh definition.
-
-    Same logic as feature pipeline: validate artifacts, break chain on
-    first invalid step.
-    """
-    existing_status = {}
-    existing_artifacts = {}
-    for step in existing.get("steps", []):
-        existing_status[step["skill"]] = step["status"]
-        existing_artifacts[step["skill"]] = step.get("required_artifacts", [])
-
-    valid_completed = set()
-    for skill_key, status in existing_status.items():
-        if status == "completed":
-            artifacts = existing_artifacts.get(skill_key, [])
-            if all(os.path.exists(os.path.join(project_root, a))
-                   for a in artifacts):
-                valid_completed.add(skill_key)
-            else:
-                LOGGER.warning(
-                    "Step '%s' was completed but artifacts missing — "
-                    "resetting to pending", skill_key
-                )
-        elif status == "skipped":
-            valid_completed.add(skill_key)
-
-    chain_broken = False
-    for step in fresh["steps"]:
-        if chain_broken:
-            step["status"] = "pending"
-            continue
-        prev = existing_status.get(step["skill"])
-        if step["skill"] in valid_completed:
-            step["status"] = prev
-        else:
-            chain_broken = True
-            step["status"] = "pending"
-
-    return fresh
-
-
 def main():
     args = parse_args()
-
-    # Resolve script directory
     script_dir = os.path.dirname(os.path.abspath(__file__))
+    templates_dir = os.path.join(script_dir, "..", "templates")
+    sections_dir = os.path.join(templates_dir, "sections")
 
-    # Resolve template path
-    if args.template:
-        template_path = args.template
-    else:
-        template_path = os.path.join(
-            script_dir, "..", "templates", "bugfix-bootstrap-prompt.md"
-        )
-
-    # Load template
-    template_content, err = read_text_file(template_path)
-    if err:
-        emit_failure("Template error: {}".format(err))
-
-    # Load bug fix list
     bug_list_data, err = load_json_file(args.bug_list)
     if err:
         emit_failure("Bug list error: {}".format(err))
-
-    # Extract bugs array
     bugs = bug_list_data.get("bugs")
     if not isinstance(bugs, list):
         emit_failure("Bug fix list does not contain a 'bugs' array")
-
-    # Find the target bug
     bug = find_bug(bugs, args.bug_id)
     if bug is None:
         emit_failure("Bug '{}' not found in bug fix list".format(args.bug_id))
-
-    # Extract global context
     global_context = bug_list_data.get("global_context", {})
     if not isinstance(global_context, dict):
         global_context = {}
 
-    # Build replacements
     replacements = build_replacements(args, bug, global_context, script_dir)
-    # Render the template
-    rendered = render_template(template_content, replacements, bug)
+    pipeline_mode = replacements["{{PIPELINE_MODE}}"]
+    critic_enabled = replacements["{{CRITIC_ENABLED}}"] == "true"
+    browser_enabled = replacements["{{BROWSER_ENABLED}}"] == "true"
+    manual_gate = bug.get("verification_type", "automated") in ("manual", "hybrid") and not is_recovery_like(args)
+
+    use_sections = os.path.isdir(sections_dir) and not args.template
+    sections = []
+    if use_sections:
+        try:
+            sections = assemble_bugfix_sections(
+                pipeline_mode, sections_dir, critic_enabled, browser_enabled, manual_gate,
+            )
+            rendered = render_from_sections(sections, replacements)
+        except FileNotFoundError as exc:
+            LOGGER.warning("Bugfix section assembly failed (%s), falling back to legacy template", exc)
+            use_sections = False
+
+    if not use_sections:
+        template_path = args.template or os.path.join(templates_dir, "bugfix-bootstrap-prompt.md")
+        template_content, err = read_text_file(template_path)
+        if err:
+            emit_failure("Template error: {}".format(err))
+        rendered = render_template(template_content, replacements, bug)
+
+    is_valid, warnings, errors = validate_rendered(
+        rendered,
+        required_markers=[
+            ("## Your Mission", "Mission section"),
+            ("## Execution", "Execution section"),
+            ("## Failure Capture", "Failure Capture Protocol"),
+        ],
+        logger=LOGGER,
+    )
+    if not is_valid:
+        LOGGER.error("Rendered bugfix prompt failed validation: %s", "; ".join(errors))
 
-    # Write the output
     err = write_output(args.output, rendered)
     if err:
         emit_failure(err)
 
-    # Generate checkpoint file
     project_root = _args_project_root(args, script_dir)
-    checkpoint_rel = replacements["{{CHECKPOINT_PATH}}"]
-    checkpoint_path = os.path.join(project_root, checkpoint_rel)
-    checkpoint_dir = os.path.dirname(checkpoint_path)
-    os.makedirs(checkpoint_dir, exist_ok=True)
-
-    checkpoint = generate_bugfix_checkpoint(args.bug_id, args.session_id)
+    checkpoint_path = os.path.join(project_root, replacements["{{CHECKPOINT_PATH}}"])
+    os.makedirs(os.path.dirname(checkpoint_path), exist_ok=True)
+    checkpoint = generate_bugfix_checkpoint(
+        args.bug_id, args.session_id, pipeline_mode, sections if use_sections else None,
+    )
 
-    is_resume = args.resume_phase != "null"
-    if (is_resume or is_continuation(args)) and os.path.exists(checkpoint_path):
+    if (args.resume_phase != "null" or is_continuation(args)) and os.path.exists(checkpoint_path):
         try:
             with open(checkpoint_path, "r", encoding="utf-8") as f:
                 existing = json.load(f)
-            checkpoint = merge_bugfix_checkpoint_state(
-                existing, checkpoint, project_root,
-            )
-            LOGGER.info("Merged existing bugfix checkpoint from %s",
-                        checkpoint_path)
+            checkpoint = merge_bugfix_checkpoint_state(existing, checkpoint, project_root)
+            LOGGER.info("Merged existing bugfix checkpoint from %s", checkpoint_path)
         except (json.JSONDecodeError, KeyError) as exc:
-            LOGGER.warning(
-                "Existing bugfix checkpoint corrupted (%s) — generating fresh",
-                exc,
-            )
+            LOGGER.warning("Existing bugfix checkpoint corrupted (%s) — generating fresh", exc)
 
     with open(checkpoint_path, "w", encoding="utf-8") as f:
         json.dump(checkpoint, f, indent=2, ensure_ascii=False)
@@ -651,55 +549,26 @@ def main():
 
     if is_continuation(args):
         rendered = append_continuation_handoff(
-            rendered, args, project_root, args.task_type, args.bug_id,
-            args.bug_id, checkpoint,
+            rendered, args, project_root, args.task_type, args.bug_id, args.bug_id, checkpoint,
         )
         err = write_output(args.output, rendered)
         if err:
             emit_failure(err)
 
-    # Resolve critic and mode
-    bug_critic = bug.get("critic", False)
-    if args.critic is not None:
-        critic_enabled = str(args.critic).lower() == "true"
-    else:
-        critic_enabled = bool(bug_critic)
-
-    pipeline_mode = args.mode or "standard"
-    agent_count = 5 if critic_enabled else 3
-
-    # Success
-    bug_model = bug.get("model", "")
-    # Extract browser interaction state for output
-    browser_interaction = bug.get("browser_interaction")
-    browser_enabled = False
-    browser_tool = "auto"
-
-    browser_verify_env = os.environ.get("BROWSER_VERIFY", "").lower()
-    if browser_verify_env == "false":
-        browser_interaction = None
-
-    if browser_interaction:
-        if isinstance(browser_interaction, bool):
-            browser_enabled = True
-        elif isinstance(browser_interaction, dict):
-            steps = browser_interaction.get("verify_steps", [])
-            if steps or browser_interaction.get("url") or browser_interaction.get("enabled", True):
-                browser_enabled = True
-            browser_tool = browser_interaction.get("tool", "auto")
-            if browser_tool not in ("playwright-cli", "opencli", "auto"):
-                browser_tool = "auto"
-
+    critic_count = int(replacements.get("{{CRITIC_COUNT}}", "1"))
     output = {
         "success": True,
         "output_path": os.path.abspath(args.output),
         "checkpoint_path": checkpoint_path,
-        "model": bug_model,
+        "model": bug.get("model", ""),
         "pipeline_mode": pipeline_mode,
-        "agent_count": agent_count,
+        "agent_count": mode_agent_count(pipeline_mode, critic_enabled, critic_count),
         "critic_enabled": critic_enabled,
-        "browser_enabled": browser_enabled,
-        "browser_tool": browser_tool
+        "render_mode": "sections" if use_sections else "legacy",
+        "validation_warnings": len(warnings),
+        "validation_errors": len(errors),
+        "browser_enabled": replacements["{{BROWSER_ENABLED}}"] == "true",
+        "browser_tool": replacements["{{BROWSER_TOOL}}"],
     }
     print(json.dumps(output, indent=2, ensure_ascii=False))
     sys.exit(0)