prizmkit 1.1.7 → 1.1.9

package/bundled/dev-pipeline/scripts/update-bug-status.py

@@ -1,18 +1,20 @@
 #!/usr/bin/env python3
 """Core state machine for updating bug status in the bug-fix pipeline.
 
-Handles six actions:
+Handles eight actions:
   - get_next: Find the next bug to process based on priority and severity
+  - start: Mark a bug as fixing when a session starts
   - update: Update a bug's status based on session outcome
   - status: Print a formatted overview of all bugs
   - pause: Save pipeline state for graceful shutdown
   - reset: Reset a bug to pending (status + retry count)
   - clean: Reset + delete session history + delete bugfix artifacts
+  - unskip: Reset skipped bugs back to pending
 
 Usage:
     python3 update-bug-status.py \
         --bug-list <path> --state-dir <path> \
-        --action <get_next|update|status|pause|reset|clean> \
+        --action <get_next|start|update|status|pause|reset|clean|unskip> \
         [--bug-id <id>] [--session-status <status>] \
         [--session-id <id>] [--max-retries <n>]
 """
@@ -39,12 +41,14 @@ SESSION_STATUS_VALUES = [
     "failed",
     "crashed",
     "timed_out",
+    "commit_missing",
+    "docs_missing",
     "merge_conflict",
 ]
 
 TERMINAL_STATUSES = {"completed", "failed", "skipped", "needs_info"}
 
-# 严重度优先级（数值越小越优先）
+# Severity priority (lower value = higher priority)
 SEVERITY_PRIORITY = {
     "critical": 0,
     "high": 1,
@@ -57,11 +61,11 @@ def parse_args():
     parser = argparse.ArgumentParser(
         description="Core state machine for bug-fix pipeline bug status management."
     )
-    parser.add_argument("--bug-list", required=True, help="Path to the bug-fix-list.json file")
-    parser.add_argument("--state-dir", required=True, help="Path to the bugfix-state/ directory")
+    parser.add_argument("--bug-list", required=True, help="Path to the .prizmkit/plans/bug-fix-list.json file")
+    parser.add_argument("--state-dir", required=True, help="Path to the state directory (default: .prizmkit/state/bugfix)")
     parser.add_argument(
         "--action", required=True,
-        choices=["get_next", "update", "status", "pause", "reset", "clean"],
+        choices=["get_next", "start", "update", "status", "pause", "reset", "clean", "unskip", "complete"],
         help="Action to perform",
     )
     parser.add_argument("--bug-id", default=None, help="Bug ID (required for 'update'/'reset'/'clean' actions)")
@@ -128,7 +132,7 @@ def update_bug_in_list(bug_list_path, bug_id, new_status):
             found = True
             break
     if not found:
-        return "Bug '{}' not found in bug-fix-list.json".format(bug_id)
+        return "Bug '{}' not found in .prizmkit/plans/bug-fix-list.json".format(bug_id)
     return write_json_file(bug_list_path, data)
 
 
@@ -183,12 +187,12 @@ def action_get_next(bug_list_data, state_dir):
         elif bstatus == "pending":
             pending_bugs.append(bug)
 
-    _PRIORITY_ORDER = {"critical": 0, "high": 1, "medium": 2, "low": 3}
+    _PRIORITY_ORDER = {"high": 0, "medium": 1, "low": 2}
 
     def sort_key(b):
         severity = b.get("severity", "medium")
         sev_order = SEVERITY_PRIORITY.get(severity, 2)
-        priority = _PRIORITY_ORDER.get(b.get("priority", "low"), 3)
+        priority = _PRIORITY_ORDER.get(b.get("priority", "low"), 2)
         return (sev_order, priority)
 
     if in_progress_bugs:
@@ -196,7 +200,7 @@ def action_get_next(bug_list_data, state_dir):
     elif pending_bugs:
         candidates = sorted(pending_bugs, key=sort_key)
     else:
-        # 所有剩余的 bug 都处于非终端但也非 pending/in_progress 状态
+        # All remaining bugs are in non-terminal but also non-pending/in_progress states
         print("PIPELINE_BLOCKED")
         return
 
@@ -238,26 +242,32 @@ def action_update(args, bug_list_path, state_dir):
         bs["resume_from_phase"] = None
         err = update_bug_in_list(bug_list_path, bug_id, "completed")
         if err:
-            error_out("Failed to update bug-fix-list.json: {}".format(err))
+            error_out("Failed to update .prizmkit/plans/bug-fix-list.json: {}".format(err))
             return
-    elif session_status == "merge_conflict":
-        # Degraded outcome: keep artifacts for retry (branch preserves work)
+    elif session_status in ("commit_missing", "docs_missing", "merge_conflict"):
+        # Degraded outcome: keep artifacts for retry (branch preserves work).
+        # Write schema-valid status to bug-fix-list.json ("pending" for retry,
+        # "failed" if max retries exceeded). Store the granular degraded reason
+        # in status.json only (internal pipeline state, not schema-bound).
         bs["retry_count"] = bs.get("retry_count", 0) + 1
 
         if bs["retry_count"] >= max_retries:
             bs["status"] = "failed"
             target_status = "failed"
         else:
-            bs["status"] = "merge_conflict"
-            target_status = "merge_conflict"
+            # status.json keeps the granular degraded reason for diagnostics
+            bs["status"] = session_status
+            # bug-fix-list.json gets schema-valid "pending" (will be retried)
+            target_status = "pending"
 
+        bs["degraded_reason"] = session_status
         bs["resume_from_phase"] = None
         bs["sessions"] = []
         bs["last_session_id"] = None
 
         err = update_bug_in_list(bug_list_path, bug_id, target_status)
         if err:
-            error_out("Failed to update bug-fix-list.json: {}".format(err))
+            error_out("Failed to update .prizmkit/plans/bug-fix-list.json: {}".format(err))
             return
     else:
         bs["retry_count"] = bs.get("retry_count", 0) + 1
@@ -281,7 +291,7 @@ def action_update(args, bug_list_path, state_dir):
 
         err = update_bug_in_list(bug_list_path, bug_id, target_status)
         if err:
-            error_out("Failed to update bug-fix-list.json: {}".format(err))
+            error_out("Failed to update .prizmkit/plans/bug-fix-list.json: {}".format(err))
             return
 
     if session_status == "success" and session_id:
@@ -307,8 +317,8 @@ def action_update(args, bug_list_path, state_dir):
         "resume_from_phase": bs.get("resume_from_phase"),
         "updated_at": bs["updated_at"],
     }
-    if session_status == "merge_conflict":
-        summary["degraded_reason"] = "merge_conflict"
+    if session_status in ("commit_missing", "docs_missing", "merge_conflict"):
+        summary["degraded_reason"] = session_status
         summary["restart_policy"] = "finalization_retry"
     elif session_status != "success":
         summary["restart_policy"] = "full_restart"
@@ -544,7 +554,7 @@ def action_reset(args, bug_list_path, state_dir):
 
     err = update_bug_in_list(bug_list_path, bug_id, "pending")
     if err:
-        error_out("Failed to update bug-fix-list.json: {}".format(err))
+        error_out("Failed to update .prizmkit/plans/bug-fix-list.json: {}".format(err))
         return
 
     result = {
@@ -620,7 +630,7 @@ def action_clean(args, bug_list_path, state_dir):
 
     err = update_bug_in_list(bug_list_path, bug_id, "pending")
     if err:
-        error_out("Failed to update bug-fix-list.json: {}".format(err))
+        error_out("Failed to update .prizmkit/plans/bug-fix-list.json: {}".format(err))
         return
 
     result = {
@@ -661,6 +671,133 @@ def action_pause(state_dir):
     print(json.dumps(result, indent=2, ensure_ascii=False))
 
 
+# ---------------------------------------------------------------------------
+# Action: start
+# ---------------------------------------------------------------------------
+
+def action_start(args, bug_list_path, state_dir):
+    """Mark a bug as in_progress when a session starts.
+
+    This keeps bug-fix-list.json/state status in sync during execution,
+    instead of only updating after session end.
+    """
+    bug_id = args.bug_id
+    if not bug_id:
+        error_out("--bug-id is required for 'start' action")
+        return
+
+    bs = load_bug_status(state_dir, bug_id)
+    old_status = bs.get("status", "pending")
+
+    bs["status"] = "in_progress"
+    bs["updated_at"] = now_iso()
+
+    err = save_bug_status(state_dir, bug_id, bs)
+    if err:
+        error_out("Failed to save bug status: {}".format(err))
+        return
+
+    err = update_bug_in_list(bug_list_path, bug_id, "in_progress")
+    if err:
+        error_out("Failed to update .prizmkit/plans/bug-fix-list.json: {}".format(err))
+        return
+
+    result = {
+        "action": "start",
+        "bug_id": bug_id,
+        "old_status": old_status,
+        "new_status": "in_progress",
+        "updated_at": bs["updated_at"],
+    }
+    print(json.dumps(result, indent=2, ensure_ascii=False))
+
+
+# ---------------------------------------------------------------------------
+# Action: unskip
+# ---------------------------------------------------------------------------
+
+def action_unskip(args, bug_list_path, state_dir):
+    """Reset skipped bugs back to pending.
+
+    Two modes:
+    - --bug-id B-001: Reset the specified skipped bug to pending.
+    - No --bug-id: Reset ALL skipped bugs to pending.
+    """
+    bug_id = args.bug_id
+
+    data, err = load_json_file(bug_list_path)
+    if err:
+        error_out("Cannot load bug fix list: {}".format(err))
+        return
+    bugs = data.get("bugs", [])
+
+    to_reset = set()
+
+    if bug_id:
+        # Find the target bug
+        target = None
+        for b in bugs:
+            if isinstance(b, dict) and b.get("id") == bug_id:
+                target = b
+                break
+        if not target:
+            error_out("Bug '{}' not found in .prizmkit/plans/bug-fix-list.json".format(bug_id))
+            return
+        if target.get("status") not in ("failed", "skipped", "needs_info"):
+            error_out(
+                "Bug '{}' has status '{}', expected 'failed', 'skipped', or 'needs_info'".format(
+                    bug_id, target.get("status", "unknown")
+                )
+            )
+            return
+        to_reset.add(bug_id)
+    else:
+        # No bug-id: reset ALL skipped/failed/needs_info bugs
+        for b in bugs:
+            if isinstance(b, dict) and b.get("id"):
+                if b.get("status") in ("failed", "skipped", "needs_info"):
+                    to_reset.add(b["id"])
+
+    if not to_reset:
+        error_out("No bugs to unskip")
+        return
+
+    # Reset all collected bugs in bug-fix-list.json
+    reset_details = []
+    for b in bugs:
+        if isinstance(b, dict) and b.get("id") in to_reset:
+            old_status = b.get("status", "unknown")
+            b["status"] = "pending"
+            reset_details.append({
+                "bug_id": b["id"],
+                "title": b.get("title", ""),
+                "old_status": old_status,
+            })
+
+    err = write_json_file(bug_list_path, data)
+    if err:
+        error_out("Failed to write .prizmkit/plans/bug-fix-list.json: {}".format(err))
+        return
+
+    # Reset status.json for each bug
+    for bid in to_reset:
+        bs = load_bug_status(state_dir, bid)
+        bs["status"] = "pending"
+        bs["retry_count"] = 0
+        bs["sessions"] = []
+        bs["last_session_id"] = None
+        bs["resume_from_phase"] = None
+        bs["updated_at"] = now_iso()
+        save_bug_status(state_dir, bid, bs)
+
+    result = {
+        "action": "unskip",
+        "reset_count": len(to_reset),
+        "bugs": reset_details,
+    }
+    print(json.dumps(result, indent=2, ensure_ascii=False))
+
+
 # ---------------------------------------------------------------------------
 # Main
 # ---------------------------------------------------------------------------
@@ -673,7 +810,7 @@ def main():
             error_out("--bug-id is required for 'update' action")
         if not args.session_status:
             error_out("--session-status is required for 'update' action")
-    if args.action in ("reset", "clean"):
+    if args.action in ("start", "reset", "clean", "complete"):
         if not args.bug_id:
             error_out("--bug-id is required for '{}' action".format(args.action))
     if args.action == "clean":
@@ -686,6 +823,8 @@ def main():
 
     if args.action == "get_next":
         action_get_next(bug_list_data, args.state_dir)
+    elif args.action == "start":
+        action_start(args, args.bug_list, args.state_dir)
     elif args.action == "update":
         action_update(args, args.bug_list, args.state_dir)
     elif args.action == "status":
@@ -696,6 +835,12 @@ def main():
         action_clean(args, args.bug_list, args.state_dir)
     elif args.action == "pause":
         action_pause(args.state_dir)
+    elif args.action == "unskip":
+        action_unskip(args, args.bug_list, args.state_dir)
+    elif args.action == "complete":
+        # Shortcut: 'complete' is equivalent to 'update --session-status success'
+        args.session_status = "success"
+        action_update(args, args.bug_list, args.state_dir)
 
 
 if __name__ == "__main__":