prizmkit 1.1.98 → 1.1.100

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

@@ -42,6 +42,8 @@ SESSION_STATUS_VALUES = [
     "crashed",
     "timed_out",
     "infra_error",
+    "context_overflow",
+    "stalled_context_continuation",
     "commit_missing",
     "docs_missing",
     "merge_conflict",
@@ -78,6 +80,12 @@ def parse_args():
     parser.add_argument("--max-retries", type=int, default=3, help="Maximum code retry count (default: 3)")
     parser.add_argument("--max-infra-retries", type=int, default=3, help="Maximum infrastructure retry count (default: 3)")
     parser.add_argument("--project-root", default=None, help="Project root directory. Required for 'clean' action.")
+    parser.add_argument("--active-dev-branch", default=None, help="Development branch preserved for continuation after context overflow.")
+    parser.add_argument("--base-branch", default=None, help="Original/base branch for continuation branch reuse.")
+    parser.add_argument("--last-fatal-error-code", default=None, help="Fatal runtime error code associated with continuation.")
+    parser.add_argument("--continuation-summary-path", default=None, help="Optional continuation summary artifact path.")
+    parser.add_argument("--no-progress-count", type=int, default=None, help="Consecutive context-overflow sessions without objective progress.")
+    parser.add_argument("--progress-fingerprint", default=None, help="JSON progress fingerprint captured after the session.")
     return parser.parse_args()
 
 
@@ -92,7 +100,7 @@ def load_bug_status(state_dir, bug_id):
     The 'status' field is NOT included — status lives exclusively
     in bug-fix-list.json.
     """
-    status_path = os.path.join(state_dir, "bugs", bug_id, "status.json")
+    status_path = os.path.join(state_dir, bug_id, "status.json")
     if not os.path.isfile(status_path):
         now = now_iso()
         return {
@@ -133,7 +141,7 @@ def save_bug_status(state_dir, bug_id, status_data):
     """Write the status.json for a bug (runtime fields only)."""
     # Defensively strip status — it belongs in bug-fix-list.json
     status_data.pop("status", None)
-    status_path = os.path.join(state_dir, "bugs", bug_id, "status.json")
+    status_path = os.path.join(state_dir, bug_id, "status.json")
     return write_json_file(status_path, status_data)
 
 
@@ -164,6 +172,128 @@ def update_bug_in_list(bug_list_path, bug_id, new_status):
     return write_json_file(bug_list_path, data)
 
 
+CONTINUATION_PENDING_FIELDS = [
+    "active_dev_branch",
+    "base_branch",
+    "continuation_pending",
+    "continuation_reason",
+    "last_context_overflow_session_id",
+    "previous_session_id",
+    "last_fatal_error_code",
+    "continuation_summary_path",
+    "no_progress_count",
+    "last_progress_fingerprint",
+    "needs_attention",
+    "stalled_context_continuation",
+    "stalled_reason",
+]
+
+CONTINUATION_COUNTER_FIELDS = [
+    "context_overflow_count",
+    "continuation_count",
+]
+
+
+def has_pending_continuation_metadata(status_data):
+    """Return True when runtime state still has pending continuation metadata."""
+    return any(key in status_data for key in CONTINUATION_PENDING_FIELDS)
+
+
+def clear_pending_continuation_metadata(status_data):
+    """Clear branch/pending continuation fields while preserving observability counters."""
+    for key in CONTINUATION_PENDING_FIELDS:
+        status_data.pop(key, None)
+
+
+def reset_continuation_metadata(status_data):
+    """Clear all continuation runtime metadata, including manual-reset counters."""
+    clear_pending_continuation_metadata(status_data)
+    for key in CONTINUATION_COUNTER_FIELDS:
+        status_data.pop(key, None)
+
+
+STALL_REASON = "context_overflow_without_git_checkpoint_or_artifact_progress"
+
+
+def _load_progress_fingerprint(raw):
+    if not raw:
+        return None
+    try:
+        return json.loads(raw)
+    except (TypeError, ValueError):
+        return {"unparsed": str(raw)}
+
+
+def _set_continuation_common(status_data, args, session_id):
+    if args.active_dev_branch:
+        status_data["active_dev_branch"] = args.active_dev_branch
+    if args.base_branch:
+        status_data["base_branch"] = args.base_branch
+    status_data["last_context_overflow_session_id"] = session_id
+    status_data["previous_session_id"] = session_id
+    status_data["last_fatal_error_code"] = args.last_fatal_error_code or "context_overflow"
+    if args.continuation_summary_path:
+        status_data["continuation_summary_path"] = args.continuation_summary_path
+    else:
+        status_data.pop("continuation_summary_path", None)
+    if args.no_progress_count is not None:
+        status_data["no_progress_count"] = max(0, args.no_progress_count)
+    fingerprint = _load_progress_fingerprint(args.progress_fingerprint)
+    if fingerprint is not None:
+        status_data["last_progress_fingerprint"] = fingerprint
+    status_data["last_infra_error_session_id"] = None
+    status_data["resume_from_phase"] = None
+    if session_id:
+        status_data["last_session_id"] = session_id
+
+
+def set_context_overflow_continuation_metadata(status_data, args, session_id):
+    """Record continuation metadata for a context-overflow outcome in status.json."""
+    status_data["context_overflow_count"] = status_data.get("context_overflow_count", 0) + 1
+    status_data["continuation_count"] = status_data.get("continuation_count", 0) + 1
+    status_data["continuation_pending"] = True
+    status_data["continuation_reason"] = "context_overflow"
+    status_data.pop("needs_attention", None)
+    status_data.pop("stalled_context_continuation", None)
+    status_data.pop("stalled_reason", None)
+    _set_continuation_common(status_data, args, session_id)
+
+
+def set_stalled_context_continuation_metadata(status_data, args, session_id):
+    """Record no-progress context-overflow stall without consuming retry budgets."""
+    status_data["context_overflow_count"] = status_data.get("context_overflow_count", 0) + 1
+    status_data["continuation_count"] = status_data.get("continuation_count", 0) + 1
+    _set_continuation_common(status_data, args, session_id)
+    status_data["continuation_pending"] = False
+    status_data["continuation_reason"] = STALL_REASON
+    status_data["needs_attention"] = True
+    status_data["stalled_context_continuation"] = True
+    status_data["stalled_reason"] = STALL_REASON
+    if args.no_progress_count is None or args.no_progress_count < 2:
+        status_data["no_progress_count"] = 2
+
+
+def continuation_metadata_summary(status_data):
+    """Return additive continuation fields for CLI JSON outputs."""
+    return {
+        "active_dev_branch": status_data.get("active_dev_branch"),
+        "base_branch": status_data.get("base_branch"),
+        "continuation_pending": status_data.get("continuation_pending", False),
+        "continuation_reason": status_data.get("continuation_reason"),
+        "last_context_overflow_session_id": status_data.get("last_context_overflow_session_id"),
+        "last_fatal_error_code": status_data.get("last_fatal_error_code"),
+        "previous_session_id": status_data.get("previous_session_id"),
+        "context_overflow_count": status_data.get("context_overflow_count", 0),
+        "continuation_count": status_data.get("continuation_count", 0),
+        "no_progress_count": status_data.get("no_progress_count", 0),
+        "last_progress_fingerprint": status_data.get("last_progress_fingerprint"),
+        "needs_attention": status_data.get("needs_attention", False),
+        "stalled_context_continuation": status_data.get("stalled_context_continuation", False),
+        "stalled_reason": status_data.get("stalled_reason"),
+        "continuation_summary_path": status_data.get("continuation_summary_path"),
+    }
+
+
 # ---------------------------------------------------------------------------
 # Action: get_next
 # ---------------------------------------------------------------------------
@@ -244,6 +374,7 @@ def action_get_next(bug_list_data, state_dir):
         "infra_error_count": chosen_status_data.get("infra_error_count", 0),
         "resume_from_phase": chosen_status_data.get("resume_from_phase", None),
     }
+    result.update(continuation_metadata_summary(chosen_status_data))
     print(json.dumps(result, indent=2, ensure_ascii=False))
 
 
@@ -267,12 +398,15 @@ def action_update(args, bug_list_path, state_dir):
 
     bs = load_bug_status(state_dir, bug_id)
 
+    current_list_status = get_bug_status_from_list(bug_list_path, bug_id)
+
     # Track what status we write to bug-fix-list.json
-    new_status = get_bug_status_from_list(bug_list_path, bug_id)
+    new_status = current_list_status
 
     if session_status == "success":
         bs["infra_error_count"] = 0
         bs["last_infra_error_session_id"] = None
+        clear_pending_continuation_metadata(bs)
         new_status = "completed"
         bs["resume_from_phase"] = None
         err = update_bug_in_list(bug_list_path, bug_id, "completed")
@@ -304,7 +438,7 @@ def action_update(args, bug_list_path, state_dir):
         bs["infra_error_count"] = infra_error_count
         bs["last_infra_error_session_id"] = session_id
         bs["max_infra_retries"] = max_infra_retries
-        bs["degraded_reason"] = "infra_error"
+        bs["degraded_reason"] = session_status
         if session_id:
             bs["last_session_id"] = session_id
         bs["resume_from_phase"] = None
@@ -316,6 +450,23 @@ def action_update(args, bug_list_path, state_dir):
         else:
             new_status = "pending"
 
+        err = update_bug_in_list(bug_list_path, bug_id, new_status)
+        if err:
+            error_out("Failed to update .prizmkit/plans/bug-fix-list.json: {}".format(err))
+            return
+    elif session_status == "context_overflow":
+        # Context overflow is continuation state, not code or infra retry state.
+        set_context_overflow_continuation_metadata(bs, args, session_id)
+        new_status = "in_progress"
+        if current_list_status != "in_progress":
+            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
+    elif session_status == "stalled_context_continuation":
+        # No-progress context-overflow stall pauses automation without consuming retry budgets.
+        set_stalled_context_continuation_metadata(bs, args, session_id)
+        new_status = "needs_info"
         err = update_bug_in_list(bug_list_path, bug_id, new_status)
         if err:
             error_out("Failed to update .prizmkit/plans/bug-fix-list.json: {}".format(err))
@@ -375,6 +526,14 @@ def action_update(args, bug_list_path, state_dir):
         summary["restart_policy"] = "infra_retry"
         summary["infra_error_count"] = bs.get("infra_error_count", 0)
         summary["artifacts_preserved"] = True
+    elif session_status == "context_overflow":
+        summary["restart_policy"] = "context_overflow_continuation"
+        summary.update(continuation_metadata_summary(bs))
+        summary["artifacts_preserved"] = True
+    elif session_status == "stalled_context_continuation":
+        summary["restart_policy"] = "needs_attention"
+        summary.update(continuation_metadata_summary(bs))
+        summary["artifacts_preserved"] = True
     elif session_status != "success":
         summary["restart_policy"] = "full_restart"
         summary["cleanup_performed"] = cleaned
@@ -402,7 +561,7 @@ def cleanup_bug_artifacts(state_dir, bug_id, project_root=None):
     cleaned = []
 
     # 1) Remove all session history
-    sessions_dir = os.path.join(state_dir, "bugs", bug_id, "sessions")
+    sessions_dir = os.path.join(state_dir, bug_id, "sessions")
     sessions_deleted = 0
     if os.path.isdir(sessions_dir):
         for entry in os.listdir(sessions_dir):
@@ -413,7 +572,7 @@ def cleanup_bug_artifacts(state_dir, bug_id, project_root=None):
         cleaned.append("Deleted {} session(s) from {}".format(sessions_deleted, sessions_dir))
 
     # 2) Remove transient files under bug dir (keep status.json)
-    bug_dir = os.path.join(state_dir, "bugs", bug_id)
+    bug_dir = os.path.join(state_dir, bug_id)
     if os.path.isdir(bug_dir):
         for entry in os.listdir(bug_dir):
             if entry == "status.json" or entry == "sessions":
@@ -445,9 +604,47 @@ def cleanup_bug_artifacts(state_dir, bug_id, project_root=None):
     return cleaned
 
 
+def _resolve_project_file(project_root, path):
+    if not path:
+        return None
+    if os.path.isabs(path):
+        target = os.path.abspath(path)
+    else:
+        target = os.path.abspath(os.path.join(project_root, path))
+    root = os.path.abspath(project_root)
+    try:
+        rel = os.path.relpath(target, root)
+    except ValueError:
+        return None
+    if rel == os.pardir or rel.startswith(os.pardir + os.sep):
+        return None
+    return target
+
+
+def cleanup_continuation_artifacts(project_root, status_data, candidate_paths=None):
+    """Delete durable continuation handoff files for a manual clean reset."""
+    candidates = []
+    if isinstance(status_data, dict):
+        candidates.append(status_data.get("continuation_summary_path"))
+    candidates.extend(candidate_paths or [])
+
+    cleaned = []
+    seen = set()
+    for candidate in candidates:
+        target = _resolve_project_file(project_root, candidate)
+        if not target or target in seen:
+            continue
+        seen.add(target)
+        if os.path.basename(target) != "continuation-summary.md":
+            continue
+        if os.path.isfile(target):
+            os.remove(target)
+            cleaned.append("Deleted continuation artifact {}".format(target))
+    return cleaned
+
+
 def load_session_status(state_dir, bug_id, session_id):
-    session_status_path = os.path.join(
-        state_dir, "bugs", bug_id, "sessions",
+    session_status_path = os.path.join(state_dir, bug_id, "sessions",
         session_id, "session-status.json"
     )
     data, err = load_json_file(session_status_path)
@@ -609,6 +806,7 @@ def action_reset(args, bug_list_path, state_dir):
     bs["sessions"] = []
     bs["last_session_id"] = None
     bs["resume_from_phase"] = None
+    reset_continuation_metadata(bs)
     bs["updated_at"] = now_iso()
 
     err = save_bug_status(state_dir, bug_id, bs)
@@ -649,7 +847,7 @@ def action_clean(args, bug_list_path, state_dir):
     cleaned = []
 
     # 1. Delete session history
-    sessions_dir = os.path.join(state_dir, "bugs", bug_id, "sessions")
+    sessions_dir = os.path.join(state_dir, bug_id, "sessions")
     sessions_deleted = 0
     if os.path.isdir(sessions_dir):
         for entry in os.listdir(sessions_dir):
@@ -680,12 +878,19 @@ def action_clean(args, bug_list_path, state_dir):
     old_status = get_bug_status_from_list(bug_list_path, bug_id)
     old_retry = bs.get("retry_count", 0)
 
+    continuation_candidates = [
+        os.path.join(".prizmkit", "bugfix", bug_id, "continuation-summary.md"),
+        os.path.join(".prizmkit", "specs", bug_id, "continuation-summary.md"),
+    ]
+    cleaned.extend(cleanup_continuation_artifacts(project_root, bs, continuation_candidates))
+
     bs["retry_count"] = 0
     bs["infra_error_count"] = 0
     bs["last_infra_error_session_id"] = None
     bs["sessions"] = []
     bs["last_session_id"] = None
     bs["resume_from_phase"] = None
+    reset_continuation_metadata(bs)
     bs["updated_at"] = now_iso()
 
     err = save_bug_status(state_dir, bug_id, bs)
@@ -761,10 +966,11 @@ def action_start(args, bug_list_path, state_dir):
         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
+    if old_status != "in_progress":
+        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",
@@ -854,6 +1060,7 @@ def action_unskip(args, bug_list_path, state_dir):
         bs["sessions"] = []
         bs["last_session_id"] = None
         bs["resume_from_phase"] = None
+        reset_continuation_metadata(bs)
         bs["updated_at"] = now_iso()
         save_bug_status(state_dir, bid, bs)