prizmkit 1.1.7 → 1.1.9

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

@@ -38,13 +38,13 @@ def parse_args():
     parser = argparse.ArgumentParser(
         description=(
             "Generate a session-specific bootstrap prompt from a template "
-            "and feature-list.json."
+            "and .prizmkit/plans/feature-list.json."
         )
     )
     parser.add_argument(
         "--feature-list",
         required=True,
-        help="Path to feature-list.json",
+        help="Path to .prizmkit/plans/feature-list.json",
     )
     parser.add_argument(
         "--feature-id",
@@ -274,7 +274,12 @@ def format_global_context(global_context, project_root=None):
 
 
 def get_completed_dependencies(features, feature):
-    """Look up dependency features and list those with status=completed."""
+    """Look up dependency features and list those with status=completed.
+
+    When a completed dependency has completion_notes (written by the AI
+    session and propagated by the pipeline runner), include them as rich
+    context so the downstream session knows what was built.
+    """
     deps = feature.get("dependencies", [])
     if not deps:
         return "- (no dependencies)"
@@ -285,17 +290,26 @@ def get_completed_dependencies(features, feature):
         if isinstance(f, dict) and "id" in f:
             feature_map[f["id"]] = f
 
-    completed = []
+    sections = []
     for dep_id in deps:
         dep = feature_map.get(dep_id)
         if dep and dep.get("status") == "completed":
-            completed.append("- {} - {} (completed)".format(
+            header = "- **{}** — {} (completed)".format(
                 dep_id, dep.get("title", "Untitled")
-            ))
+            )
+            notes = dep.get("completion_notes", [])
+            if notes and isinstance(notes, list):
+                note_lines = "\n".join(
+                    "  - {}".format(n) for n in notes
+                    if isinstance(n, str) and n.strip()
+                )
+                if note_lines:
+                    header += "\n" + note_lines
+            sections.append(header)
 
-    if not completed:
+    if not sections:
         return "- (no completed dependencies yet)"
-    return "\n".join(completed)
+    return "\n".join(sections)
 
 
 def get_prev_session_status(state_dir, feature_id):
@@ -348,7 +362,7 @@ def get_prev_session_status(state_dir, feature_id):
 
 
 def _read_project_brief(project_root):
-    """Read project-brief.md from project root if it exists.
+    """Read project-brief.md from new or old location with fallback.
 
     Returns the file content as a string, or a fallback message if absent.
     This brief is generated by app-planner during interactive planning and
@@ -356,13 +370,25 @@ def _read_project_brief(project_root):
     marked [ ] for pending or [x] for completed. Feature sessions should mark
     items [x] and append key file paths when implementing relevant ideas.
     """
-    brief_path = os.path.join(project_root, "project-brief.md")
-    if os.path.isfile(brief_path):
-        try:
-            with open(brief_path, "r", encoding="utf-8") as f:
-                return f.read().strip()
-        except IOError:
-            return "(project-brief.md exists but could not be read)"
+    # Check both new and old paths for backward compatibility
+    new_path = os.path.join(project_root, ".prizmkit", "plans", "project-brief.md")
+    old_path = os.path.join(project_root, "project-brief.md")
+
+    for brief_path in [new_path, old_path]:
+        if os.path.isfile(brief_path):
+            try:
+                with open(brief_path, "r", encoding="utf-8") as f:
+                    content = f.read().strip()
+                    if brief_path == old_path:
+                        # Warn user about old path
+                        import sys
+                        print("⚠️  Migration notice: project-brief.md found in root. "
+                              "Please move to .prizmkit/plans/project-brief.md",
+                              file=sys.stderr)
+                    return content
+            except IOError:
+                return "(project-brief.md exists but could not be read)"
+
     return "(No project brief available)"
 
 
@@ -549,7 +575,6 @@ SECTION_TO_SKILL = {
                             ".prizmkit/specs/{slug}/plan.md"]),
     "phase-plan": ("prizmkit-plan", "Plan & Tasks",
                    [".prizmkit/specs/{slug}/plan.md"]),
-    "phase-analyze": ("prizmkit-analyze", "Analyze", []),
     "phase-critic-plan": ("critic-plan-review", "Critic: Plan Review", []),
     "phase-implement": ("prizmkit-implement", "Implement + Test", []),
     "phase-critic-code": ("critic-code-review", "Critic: Code Review", []),
@@ -945,16 +970,6 @@ def assemble_sections(pipeline_mode, sections_dir, init_done, is_resume,
                               load_section(sections_dir,
                                            "phase-plan-agent.md")))
 
-    # --- Analyze (only for agent tiers) ---
-    if pipeline_mode == "standard":
-        sections.append(("phase-analyze",
-                          load_section(sections_dir,
-                                       "phase-analyze-agent.md")))
-    elif pipeline_mode == "full":
-        sections.append(("phase-analyze",
-                          load_section(sections_dir,
-                                       "phase-analyze-full.md")))
-
     # --- Critic: Plan Challenge (only if critic enabled) ---
     if critic_enabled:
         if pipeline_mode == "full":
@@ -980,12 +995,23 @@ def assemble_sections(pipeline_mode, sections_dir, init_done, is_resume,
                           load_section(sections_dir,
                                        "phase-implement-agent.md")))
 
+    # --- Test Failure Recovery Protocol (all tiers) ---
+    sections.append(("test-failure-recovery",
+                      load_section(sections_dir, "test-failure-recovery.md")))
+
     # --- Critic: Code Challenge (only if critic enabled, agent tiers) ---
     if critic_enabled and pipeline_mode in ("standard", "full"):
         sections.append(("phase-critic-code",
                           load_section(sections_dir,
                                        "phase-critic-code.md")))
 
+    # --- AC Verification Checklist (all tiers) ---
+    ac_checklist_path = os.path.join(sections_dir, "ac-verification-checklist.md")
+    if os.path.isfile(ac_checklist_path):
+        sections.append(("ac-verification-checklist",
+                          load_section(sections_dir,
+                                       "ac-verification-checklist.md")))
+
     # --- Review (only for agent tiers) ---
     if pipeline_mode == "full":
         sections.append(("phase-review",
@@ -1179,12 +1205,12 @@ def build_replacements(args, feature, features, global_context, script_dir):
     validator_scripts_dir = os.path.join(project_root, "dev-pipeline", "scripts")
     init_script_path = os.path.join(validator_scripts_dir, "init-dev-team.py")
 
-    # Session status path (relative to dev-pipeline/)
+    # Session status path (relative to project root)
     session_status_path = os.path.join(
-        "dev-pipeline", "state", "features", args.feature_id,
+        ".prizmkit", "state", "features", args.feature_id,
         "sessions", args.session_id, "session-status.json",
     )
-    # Make it relative from project root
+    # Make it absolute from project root
     session_status_abs = os.path.join(project_root, session_status_path)
 
     prev_status = get_prev_session_status(args.state_dir, args.feature_id)
@@ -1221,7 +1247,7 @@ def build_replacements(args, feature, features, global_context, script_dir):
         critic_enabled = bool(feature.get("critic", False))
 
     # Determine critic count (from feature field, default 1)
-    # Multi-critic voting (3) must be explicitly set by the user in feature-list.json
+    # Multi-critic voting (3) must be explicitly set by the user in .prizmkit/plans/feature-list.json
     critic_count = feature.get("critic_count", 1)
 
     # Guard: if critic enabled but agent file missing, force disable and warn
@@ -1309,7 +1335,6 @@ def build_replacements(args, feature, features, global_context, script_dir):
         "{{DEV_SUBAGENT_PATH}}": dev_subagent,
         "{{REVIEWER_SUBAGENT_PATH}}": reviewer_subagent,
         "{{CRITIC_SUBAGENT_PATH}}": critic_subagent,
-        "{{VALIDATOR_SCRIPTS_DIR}}": validator_scripts_dir,
         "{{INIT_SCRIPT_PATH}}": init_script_path,
         "{{SESSION_STATUS_PATH}}": session_status_abs,
         "{{PROJECT_ROOT}}": project_root,
@@ -1324,7 +1349,6 @@ def build_replacements(args, feature, features, global_context, script_dir):
         "{{INIT_DONE}}": "true" if init_done else "false",
         "{{HAS_SPEC}}": "true" if artifacts["has_spec"] else "false",
         "{{HAS_PLAN}}": "true" if artifacts["has_plan"] else "false",
-        "{{ARTIFACTS_COMPLETE}}": "true" if artifacts["all_complete"] else "false",
         "{{BROWSER_URL}}": browser_url,
         "{{BROWSER_SETUP_COMMAND}}": browser_setup_command,
         "{{BROWSER_VERIFY_STEPS}}": browser_verify_steps,

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
-"""Generate a session-specific bug fix bootstrap prompt from template and bug-fix-list.json.
+"""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 bug-fix-list.json, resolves all
+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.
 
@@ -31,18 +31,20 @@ def parse_args():
     parser = argparse.ArgumentParser(
         description=(
             "Generate a session-specific bug fix bootstrap prompt from a template "
-            "and bug-fix-list.json."
+            "and .prizmkit/plans/bug-fix-list.json."
         )
     )
-    parser.add_argument("--bug-list", required=True, help="Path to bug-fix-list.json")
+    parser.add_argument("--bug-list", required=True, help="Path to .prizmkit/plans/bug-fix-list.json")
     parser.add_argument("--bug-id", required=True, help="Bug ID to generate prompt for (e.g. B-001)")
     parser.add_argument("--session-id", required=True, help="Session ID for this pipeline session")
     parser.add_argument("--run-id", required=True, help="Pipeline run ID")
     parser.add_argument("--retry-count", required=True, help="Current retry count")
     parser.add_argument("--resume-phase", required=True, help='Phase to resume from, or "null" for fresh start')
-    parser.add_argument("--state-dir", default=None, help="State directory path for reading previous session info")
+    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("--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")
     return parser.parse_args()
 
 
@@ -217,7 +219,7 @@ def build_replacements(args, bug, global_context, script_dir):
 
     # Session status path
     session_status_path = os.path.join(
-        project_root, "dev-pipeline", "bugfix-state", "bugs", args.bug_id,
+        project_root, ".prizmkit", "state", "bugfix", "bugs", args.bug_id,
         "sessions", args.session_id, "session-status.json"
     )
 
@@ -254,7 +256,6 @@ def build_replacements(args, bug, global_context, script_dir):
         "{{ACCEPTANCE_CRITERIA}}": format_acceptance_criteria(
             bug.get("acceptance_criteria", [])
         ),
-        "{{AFFECTED_FEATURE}}": bug.get("affected_feature", "N/A"),
         "{{ENVIRONMENT}}": format_environment(bug.get("environment")),
         "{{GLOBAL_CONTEXT}}": format_global_context(global_context, project_root),
         "{{TEAM_CONFIG_PATH}}": team_config_path,
@@ -263,7 +264,7 @@ def build_replacements(args, bug, global_context, script_dir):
         "{{SESSION_STATUS_PATH}}": session_status_path,
         "{{PROJECT_ROOT}}": project_root,
         "{{FIX_SCOPE}}": fix_scope,
-        "{{TIMESTAMP}}": "",  # 占位符，agent 自行填写时间戳
+        "{{TIMESTAMP}}": "",  # Placeholder, agent fills in the timestamp
     }
 
     return replacements
@@ -280,7 +281,7 @@ def process_conditional_blocks(content, bug):
         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,
@@ -497,11 +498,26 @@ def main():
         json.dump(checkpoint, f, indent=2, ensure_ascii=False)
     LOGGER.info("Wrote bugfix checkpoint to %s", checkpoint_path)
 
+    # 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", "")
     output = {
         "success": True,
         "output_path": os.path.abspath(args.output),
         "checkpoint_path": checkpoint_path,
+        "model": bug_model,
+        "pipeline_mode": pipeline_mode,
+        "agent_count": agent_count,
+        "critic_enabled": critic_enabled,
     }
     print(json.dumps(output, indent=2, ensure_ascii=False))
     sys.exit(0)

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
-"""Generate a session-specific refactor bootstrap prompt from template and refactor-list.json.
+"""Generate a session-specific refactor bootstrap prompt from template and .prizmkit/plans/refactor-list.json.
 
-Reads the refactor-bootstrap-prompt.md template and a refactor-list.json, resolves all
+Reads the refactor-bootstrap-prompt.md template and a .prizmkit/plans/refactor-list.json, resolves all
 {{PLACEHOLDER}} variables, handles conditional blocks, and writes the rendered
 prompt to the specified output path.
 
@@ -16,6 +16,7 @@ Usage:
 import argparse
 import json
 import os
+import re
 import sys
 
 from utils import enrich_global_context, load_json_file, setup_logging
@@ -30,18 +31,20 @@ def parse_args():
     parser = argparse.ArgumentParser(
         description=(
             "Generate a session-specific refactor bootstrap prompt from a template "
-            "and refactor-list.json."
+            "and .prizmkit/plans/refactor-list.json."
         )
     )
-    parser.add_argument("--refactor-list", required=True, help="Path to refactor-list.json")
+    parser.add_argument("--refactor-list", required=True, help="Path to .prizmkit/plans/refactor-list.json")
     parser.add_argument("--refactor-id", required=True, help="Refactor ID to generate prompt for (e.g. R-001)")
     parser.add_argument("--session-id", required=True, help="Session ID for this pipeline session")
     parser.add_argument("--run-id", required=True, help="Pipeline run ID")
     parser.add_argument("--retry-count", required=True, help="Current retry count")
     parser.add_argument("--resume-phase", required=True, help='Phase to resume from, or "null" for fresh start')
-    parser.add_argument("--state-dir", default=None, help="State directory path for reading previous session info")
+    parser.add_argument("--state-dir", default=None, help="State directory (default: .prizmkit/state/refactor)")
     parser.add_argument("--output", required=True, help="Output path for the rendered prompt")
     parser.add_argument("--template", default=None, help="Custom template path. Defaults to {script_dir}/../templates/refactor-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")
     return parser.parse_args()
 
 
@@ -161,15 +164,42 @@ def format_behavior_preservation(bp):
     return "\n".join(lines)
 
 
-def format_dependencies(dependencies):
-    """Format dependencies list as a markdown bullet list."""
+def format_dependencies(dependencies, refactors=None):
+    """Format dependencies list as a markdown bullet list with completion context.
+
+    When refactors list is provided, look up completed dependencies and include
+    their completion_notes for rich context propagation.
+    """
     if not dependencies or not isinstance(dependencies, list):
         return "- (none)"
     if len(dependencies) == 0:
         return "- (none)"
+
+    # Build lookup map if refactors list is provided
+    refactor_map = {}
+    if refactors:
+        for r in refactors:
+            if isinstance(r, dict) and "id" in r:
+                refactor_map[r["id"]] = r
+
     lines = []
     for dep in dependencies:
-        lines.append("- `{}`".format(dep))
+        dep_info = refactor_map.get(dep)
+        if dep_info and dep_info.get("status") == "completed":
+            header = "- **{}** — {} (completed)".format(
+                dep, dep_info.get("title", "Untitled")
+            )
+            notes = dep_info.get("completion_notes", [])
+            if notes and isinstance(notes, list):
+                note_lines = [
+                    "  - {}".format(n) for n in notes
+                    if isinstance(n, str) and n.strip()
+                ]
+                if note_lines:
+                    header += "\n" + "\n".join(note_lines)
+            lines.append(header)
+        else:
+            lines.append("- `{}`".format(dep))
     return "\n".join(lines)
 
 
@@ -219,7 +249,7 @@ def resolve_project_root(script_dir):
     return os.path.abspath(project_root)
 
 
-def build_replacements(args, refactor, global_context, script_dir):
+def build_replacements(args, refactor, refactors, global_context, script_dir):
     """Build the full dict of placeholder -> replacement value."""
     project_root = resolve_project_root(script_dir)
 
@@ -247,7 +277,7 @@ def build_replacements(args, refactor, global_context, script_dir):
 
     # Session status path
     session_status_path = os.path.join(
-        project_root, "dev-pipeline", "refactor-state", "refactors", args.refactor_id,
+        project_root, ".prizmkit", "state", "refactor", "refactors", args.refactor_id,
         "sessions", args.session_id, "session-status.json"
     )
 
@@ -260,7 +290,11 @@ def build_replacements(args, refactor, global_context, script_dir):
     bp = refactor.get("behavior_preservation", {})
     behavior_strategy = bp.get("strategy", "test-gate") if isinstance(bp, dict) else "test-gate"
     existing_tests = bp.get("existing_tests", []) if isinstance(bp, dict) else []
+    if not isinstance(existing_tests, list):
+        existing_tests = []
     new_tests_needed = bp.get("new_tests_needed", []) if isinstance(bp, dict) else []
+    if not isinstance(new_tests_needed, list):
+        new_tests_needed = []
 
     # Format existing tests
     if existing_tests:
@@ -296,7 +330,7 @@ def build_replacements(args, refactor, global_context, script_dir):
             refactor.get("acceptance_criteria", [])
         ),
         "{{DEPENDENCIES}}": format_dependencies(
-            refactor.get("dependencies", [])
+            refactor.get("dependencies", []), refactors
         ),
         "{{GLOBAL_CONTEXT}}": format_global_context(global_context, project_root),
         "{{TEAM_CONFIG_PATH}}": team_config_path,
@@ -304,17 +338,55 @@ def build_replacements(args, refactor, global_context, script_dir):
         "{{REVIEWER_SUBAGENT_PATH}}": reviewer_subagent,
         "{{SESSION_STATUS_PATH}}": session_status_path,
         "{{PROJECT_ROOT}}": project_root,
+        "{{CHECKPOINT_PATH}}": os.path.join(
+            ".prizmkit", "refactor", args.refactor_id, "workflow-checkpoint.json",
+        ),
         "{{TIMESTAMP}}": "",  # Placeholder — agent fills in timestamp
     }
 
     return replacements
 
 
-def render_template(template_content, replacements):
-    """Render the template by replacing all {{PLACEHOLDER}} variables."""
-    content = template_content
+def process_conditional_blocks(content, resume_phase):
+    """Handle conditional blocks based on resume_phase.
+
+    - {{IF_RESUME}}...{{END_IF_RESUME}} — include only when resuming (resume_phase != "null")
+    - {{IF_FRESH_START}}...{{END_IF_FRESH_START}} — include only on fresh start (resume_phase == "null")
+    """
+    is_resume = resume_phase != "null"
+
+    if is_resume:
+        # Keep IF_RESUME content, strip markers
+        content = content.replace("{{IF_RESUME}}\n", "")
+        content = content.replace("{{IF_RESUME}}", "")
+        content = content.replace("{{END_IF_RESUME}}\n", "")
+        content = content.replace("{{END_IF_RESUME}}", "")
+        # Remove IF_FRESH_START blocks entirely
+        content = re.sub(
+            r"\{\{IF_FRESH_START\}\}.*?\{\{END_IF_FRESH_START\}\}\n?",
+            "", content, flags=re.DOTALL,
+        )
+    else:
+        # Keep IF_FRESH_START content, strip markers
+        content = content.replace("{{IF_FRESH_START}}\n", "")
+        content = content.replace("{{IF_FRESH_START}}", "")
+        content = content.replace("{{END_IF_FRESH_START}}\n", "")
+        content = content.replace("{{END_IF_FRESH_START}}", "")
+        # Remove IF_RESUME blocks entirely
+        content = re.sub(
+            r"\{\{IF_RESUME\}\}.*?\{\{END_IF_RESUME\}\}\n?",
+            "", content, flags=re.DOTALL,
+        )
+
+    return content
+
 
-    # Replace all {{PLACEHOLDER}} variables
+def render_template(template_content, replacements, resume_phase):
+    """Render the template by processing conditionals and replacing placeholders."""
+    # Step 1: Process conditional blocks
+    content = process_conditional_blocks(template_content, resume_phase)
+
+    # Step 2: Replace all {{PLACEHOLDER}} variables
     for placeholder, value in replacements.items():
         content = content.replace(placeholder, value)
 
@@ -388,20 +460,35 @@ def main():
         global_context = {}
 
     # Build replacements
-    replacements = build_replacements(args, refactor, global_context, script_dir)
+    replacements = build_replacements(args, refactor, refactors, global_context, script_dir)
 
     # Render the template
-    rendered = render_template(template_content, replacements)
+    rendered = render_template(template_content, replacements, args.resume_phase)
 
     # Write the output
     err = write_output(args.output, rendered)
     if err:
         emit_failure(err)
 
+    # Resolve critic and mode
+    refactor_critic = refactor.get("critic", False)
+    if args.critic is not None:
+        critic_enabled = str(args.critic).lower() == "true"
+    else:
+        critic_enabled = bool(refactor_critic)
+
+    pipeline_mode = args.mode or "standard"
+    agent_count = 5 if critic_enabled else 3
+
     # Success
+    refactor_model = refactor.get("model", "")
     output = {
         "success": True,
         "output_path": os.path.abspath(args.output),
+        "model": refactor_model,
+        "pipeline_mode": pipeline_mode,
+        "agent_count": agent_count,
+        "critic_enabled": critic_enabled,
     }
     print(json.dumps(output, indent=2, ensure_ascii=False))
     sys.exit(0)

package/bundled/dev-pipeline/scripts/init-bugfix-pipeline.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-"""Initialize the bug-fix pipeline state directory from a bug-fix-list.json file.
+"""Initialize the bug-fix pipeline state directory from a .prizmkit/plans/bug-fix-list.json file.
 
 Validates the bug fix list schema, sorts by priority/severity, and creates
 the state directory structure with pipeline and per-bug status files.
@@ -33,24 +33,28 @@ REQUIRED_BUG_FIELDS = [
 VALID_SEVERITIES = ["critical", "high", "medium", "low"]
 VALID_VERIFICATION_TYPES = ["automated", "manual", "hybrid"]
 VALID_STATUSES = [
-    "pending", "triaging", "reproducing", "fixing",
-    "verifying", "completed", "failed", "needs_info", "skipped",
+    "pending", "in_progress", "completed", "failed",
+    "skipped", "needs_info",
+]
+TERMINAL_STATUSES = {"completed", "failed", "skipped", "needs_info"}
+VALID_ERROR_SOURCE_TYPES = [
+    "stack_trace", "user_report", "failed_test", "log_pattern", "monitoring_alert",
 ]
 
 
 def parse_args():
     parser = argparse.ArgumentParser(
-        description="Initialize bug-fix pipeline state from a bug-fix-list.json file."
+        description="Initialize bug-fix pipeline state from a .prizmkit/plans/bug-fix-list.json file."
     )
     parser.add_argument(
         "--bug-list",
         required=True,
-        help="Path to the bug-fix-list.json file",
+        help="Path to the .prizmkit/plans/bug-fix-list.json file",
     )
     parser.add_argument(
         "--state-dir",
         required=True,
-        help="Path to the state directory to create/initialize",
+        help="Path to the state directory (default: .prizmkit/state/bugfix)",
     )
     return parser.parse_args()
 
@@ -173,6 +177,17 @@ def validate_bugs(bugs):
                         bid or "index {}".format(i)
                     )
                 )
+            else:
+                es_type = error_source["type"]
+                if es_type not in VALID_ERROR_SOURCE_TYPES:
+                    # Warn but don't error — the pipeline can still attempt the fix
+                    print(
+                        "WARNING: Bug '{}' error_source.type '{}' is not one of {} "
+                        "— pipeline will still attempt to process this bug".format(
+                            bid or "index {}".format(i), es_type, VALID_ERROR_SOURCE_TYPES
+                        ),
+                        file=sys.stderr,
+                    )
 
         # Validate acceptance_criteria is a list
         ac = bug.get("acceptance_criteria")
@@ -195,12 +210,18 @@ def create_state_directory(state_dir, bug_list_path, bugs):
     bugs_dir = os.path.join(abs_state_dir, "bugs")
 
     now = datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
-    run_id = "bugfix-run-" + datetime.now(timezone.utc).strftime("%Y%m%d%H%M")
+    run_id = "bugfix-run-" + datetime.now(timezone.utc).strftime("%Y%m%d%H%M%S")
 
     # Create top-level state directory
     os.makedirs(abs_state_dir, exist_ok=True)
     os.makedirs(bugs_dir, exist_ok=True)
 
+    # Count bugs already in terminal status at init time
+    completed_count = sum(
+        1 for b in bugs
+        if isinstance(b, dict) and b.get("status") in TERMINAL_STATUSES
+    )
+
     # Write pipeline.json
     pipeline_state = {
         "run_id": run_id,
@@ -209,7 +230,7 @@ def create_state_directory(state_dir, bug_list_path, bugs):
         "bug_list_path": rel_bug_list_path,
         "created_at": now,
         "total_bugs": len(bugs),
-        "completed_bugs": 0,
+        "completed_bugs": completed_count,
     }
     pipeline_path = os.path.join(abs_state_dir, "pipeline.json")
     with open(pipeline_path, "w", encoding="utf-8") as f:
@@ -228,9 +249,13 @@ def create_state_directory(state_dir, bug_list_path, bugs):
         sessions_dir = os.path.join(bug_dir, "sessions")
         os.makedirs(sessions_dir, exist_ok=True)
 
+        # Respect existing terminal status from bug-fix-list.json
+        bl_status = bug.get("status", "pending")
+        init_status = bl_status if bl_status in TERMINAL_STATUSES else "pending"
+
         bug_status = {
             "bug_id": bid,
-            "status": "pending",
+            "status": init_status,
             "retry_count": 0,
             "max_retries": 3,
             "sessions": [],