prizmkit 1.1.20 → 1.1.23

package/bundled/dev-pipeline/run-refactor.sh

@@ -262,8 +262,15 @@ if incomplete:
     sys.exit(1)
 print('ALL_COMPLETE')
 sys.exit(0)
-" "$checkpoint_file" 2>&1)
+" "$checkpoint_file" 2>&1) || checkpoint_result="CHECK_FAILED"
             local check_exit=$?
+            if [[ "$checkpoint_result" == "CHECK_FAILED" ]]; then
+                check_exit=2
+            elif [[ "$checkpoint_result" == *"INCOMPLETE"* ]]; then
+                check_exit=1
+            else
+                check_exit=0
+            fi
             if [[ $check_exit -eq 2 ]]; then
                 log_warn "CHECKPOINT_CORRUPTED: workflow-checkpoint.json is not valid JSON"
             elif [[ $check_exit -eq 1 ]]; then
@@ -297,7 +304,7 @@ sys.exit(0)
         fi
     fi
 
-    # Update refactor status
+    # Update refactor status (do NOT commit on dev branch — commit happens after merge)
     python3 "$SCRIPTS_DIR/update-refactor-status.py" \
         --refactor-list "$refactor_list" \
         --state-dir "$STATE_DIR" \
@@ -307,12 +314,6 @@ sys.exit(0)
         --max-retries "$max_retries" \
         --action update >/dev/null 2>&1 || true
 
-    # Commit .prizmkit/plans/refactor-list.json status update (pipeline management commit)
-    if ! git -C "$project_root" diff --quiet "$refactor_list" 2>/dev/null; then
-        git -C "$project_root" add "$refactor_list"
-        git -C "$project_root" commit --no-verify -m "chore($refactor_id): update refactor status" 2>/dev/null || true
-    fi
-
     _SPAWN_RESULT="$session_status"
 }
 
@@ -333,13 +334,40 @@ cleanup() {
         log_info "Original branch was: $_ORIGINAL_BRANCH"
     fi
 
+    # Update status of currently in-progress refactor to interrupted
     if [[ -n "$REFACTOR_LIST" && -f "$REFACTOR_LIST" ]]; then
+        # Find any in-progress refactor and mark it as failed
+        local _interrupted_id
+        _interrupted_id=$(python3 -c "
+import json, sys
+with open(sys.argv[1]) as f:
+    data = json.load(f)
+for item in data.get('refactors', []):
+    if item.get('status') == 'in_progress':
+        print(item['id'])
+        break
+" "$REFACTOR_LIST" 2>/dev/null || echo "")
+
+        if [[ -n "$_interrupted_id" ]]; then
+            python3 "$SCRIPTS_DIR/update-refactor-status.py" \
+                --refactor-list "$REFACTOR_LIST" \
+                --state-dir "$STATE_DIR" \
+                --refactor-id "$_interrupted_id" \
+                --session-status "failed" \
+                --action update 2>/dev/null || true
+            log_info "Refactor $_interrupted_id marked as failed due to interrupt"
+        fi
+
+        # Pause the pipeline
         python3 "$SCRIPTS_DIR/update-refactor-status.py" \
             --refactor-list "$REFACTOR_LIST" \
             --state-dir "$STATE_DIR" \
             --action pause 2>/dev/null || true
     fi
 
+    # GUARANTEED: always return to original branch (save WIP on dev branch first)
+    branch_ensure_return "$(cd "$SCRIPT_DIR/.." && pwd)" "$_ORIGINAL_BRANCH" "$_DEV_BRANCH_NAME"
+
     log_info "Refactor pipeline paused. Run './run-refactor.sh run' to resume."
     exit 130
 }
@@ -669,6 +697,20 @@ else:
             log_info "Development was on branch: $_DEV_BRANCH_NAME"
         fi
         log_info "Session log: $session_dir/logs/session.log"
+
+        # Update refactor status to failed on interrupt
+        if [[ -n "$refactor_list" && -f "$refactor_list" ]]; then
+            python3 "$SCRIPTS_DIR/update-refactor-status.py" \
+                --refactor-list "$refactor_list" \
+                --state-dir "$STATE_DIR" \
+                --refactor-id "$refactor_id" \
+                --session-status "failed" \
+                --action update 2>/dev/null || true
+            log_info "Refactor $refactor_id marked as failed due to interrupt"
+        fi
+
+        # GUARANTEED: always return to original branch (save WIP on dev branch first)
+        branch_ensure_return "$(cd "$SCRIPT_DIR/.." && pwd)" "$_ORIGINAL_BRANCH" "$_DEV_BRANCH_NAME"
         exit 130
     }
     trap cleanup_single_refactor SIGINT SIGTERM
@@ -682,6 +724,20 @@ else:
     _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
     _ORIGINAL_BRANCH="$_source_branch"
 
+    # Mark refactor as in-progress BEFORE creating dev branch
+    # This ensures the in_progress status commit lands on the original branch,
+    # not the dev branch — preventing rebase conflicts in branch_merge later.
+    python3 "$SCRIPTS_DIR/update-refactor-status.py" \
+        --refactor-list "$refactor_list" \
+        --state-dir "$STATE_DIR" \
+        --refactor-id "$refactor_id" \
+        --action start >/dev/null 2>&1 || true
+    # Commit the in_progress status on the original branch
+    if ! git -C "$_proj_root" diff --quiet "$refactor_list" 2>/dev/null; then
+        git -C "$_proj_root" add "$refactor_list" 2>/dev/null || true
+        git -C "$_proj_root" commit --no-verify -m "chore($refactor_id): mark in_progress" 2>/dev/null || true
+    fi
+
     local _branch_name="${DEV_BRANCH:-refactor/${refactor_id}-$(date +%s)}"
     if branch_create "$_proj_root" "$_branch_name" "$_source_branch"; then
         _DEV_BRANCH_NAME="$_branch_name"
@@ -701,18 +757,23 @@ else:
         else
             log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
             log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git rebase $_DEV_BRANCH_NAME"
-            git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null || true
             _DEV_BRANCH_NAME=""
         fi
     elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
-        # Session failed — return to original branch, preserve dev branch for inspection
-        if ! git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null; then
-            log_warn "Failed to checkout $_ORIGINAL_BRANCH after session failure — staying on dev branch"
-        fi
+        # Session failed — preserve dev branch for inspection
         log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
         _DEV_BRANCH_NAME=""
     fi
 
+    # GUARANTEED: always return to original branch regardless of success/failure/merge outcome
+    branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
+
+    # Commit refactor status update on the original branch (after guaranteed return)
+    if ! git -C "$_proj_root" diff --quiet "$refactor_list" 2>/dev/null; then
+        git -C "$_proj_root" add "$refactor_list"
+        git -C "$_proj_root" commit --no-verify -m "chore($refactor_id): update refactor status" 2>/dev/null || true
+    fi
+
     echo ""
     if [[ "$session_status" == "success" ]]; then
         log_success "════════════════════════════════════════════════════"
@@ -820,6 +881,18 @@ main() {
     local total_subagent_calls=0
 
     while true; do
+        # Safety net: ensure we're on the original branch at the start of each iteration.
+        # If a previous iteration's `continue` skipped branch_ensure_return, we could
+        # still be on a dev branch. This prevents cascading branch confusion.
+        if [[ -n "$_ORIGINAL_BRANCH" ]]; then
+            local _cur_branch
+            _cur_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || true)
+            if [[ -n "$_cur_branch" && "$_cur_branch" != "$_ORIGINAL_BRANCH" ]]; then
+                log_warn "Still on branch $_cur_branch at loop start — returning to $_ORIGINAL_BRANCH"
+                branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
+            fi
+        fi
+
         # Find next refactor to process (dependency-topological order)
         local next_refactor
         if ! next_refactor=$(python3 "$SCRIPTS_DIR/update-refactor-status.py" \
@@ -874,7 +947,21 @@ main() {
             git -C "$_proj_root" commit --no-verify -m "chore: capture artifacts before $refactor_id session" 2>/dev/null || true
         fi
 
-        # Create per-refactor dev branch
+        # Mark refactor as in-progress BEFORE creating dev branch
+        # This ensures the in_progress status commit lands on the original branch,
+        # not the dev branch — preventing rebase conflicts in branch_merge later.
+        python3 "$SCRIPTS_DIR/update-refactor-status.py" \
+            --refactor-list "$refactor_list" \
+            --state-dir "$STATE_DIR" \
+            --refactor-id "$refactor_id" \
+            --action start >/dev/null 2>&1 || true
+        # Commit the in_progress status on the original branch
+        if ! git -C "$_proj_root" diff --quiet "$refactor_list" 2>/dev/null; then
+            git -C "$_proj_root" add "$refactor_list" 2>/dev/null || true
+            git -C "$_proj_root" commit --no-verify -m "chore($refactor_id): mark in_progress" 2>/dev/null || true
+        fi
+
+        # Create per-refactor dev branch (from the now-updated original branch)
         local _refactor_branch="${DEV_BRANCH:-refactor/${refactor_id}-$(date +%Y%m%d%H%M)}"
         if branch_create "$_proj_root" "$_refactor_branch" "$_ORIGINAL_BRANCH"; then
             _DEV_BRANCH_NAME="$_refactor_branch"
@@ -920,6 +1007,8 @@ main() {
         local gen_output
         gen_output=$(python3 "$SCRIPTS_DIR/generate-refactor-prompt.py" "${main_prompt_args[@]}" 2>/dev/null) || {
             log_error "Failed to generate bootstrap prompt for $refactor_id"
+            branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
+            _DEV_BRANCH_NAME=""
             continue
         }
         local refactor_model pipeline_mode agent_count critic_enabled
@@ -943,13 +1032,6 @@ main() {
             log_info "Refactor model: $refactor_model"
         fi
 
-        # Mark refactor as in-progress before spawning session
-        python3 "$SCRIPTS_DIR/update-refactor-status.py" \
-            --refactor-list "$refactor_list" \
-            --state-dir "$STATE_DIR" \
-            --refactor-id "$refactor_id" \
-            --action start >/dev/null 2>&1 || true
-
         # Spawn session
         log_info "Spawning AI CLI session: $session_id"
         _SPAWN_RESULT=""
@@ -979,18 +1061,23 @@ main() {
             else
                 log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
                 log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git rebase $_DEV_BRANCH_NAME"
-                git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null || true
                 _DEV_BRANCH_NAME=""
             fi
         elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
-            # Session failed — return to original branch, preserve dev branch for inspection
-            if ! git -C "$_proj_root" checkout "$_ORIGINAL_BRANCH" 2>/dev/null; then
-                log_warn "Failed to checkout $_ORIGINAL_BRANCH after session failure — staying on dev branch"
-            fi
+            # Session failed — preserve dev branch for inspection
             log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
             _DEV_BRANCH_NAME=""
         fi
 
+        # GUARANTEED: always return to original branch regardless of success/failure/merge outcome
+        branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
+
+        # Commit refactor status update on the original branch (after guaranteed return)
+        if ! git -C "$_proj_root" diff --quiet "$refactor_list" 2>/dev/null; then
+            git -C "$_proj_root" add "$refactor_list"
+            git -C "$_proj_root" commit --no-verify -m "chore($refactor_id): update refactor status" 2>/dev/null || true
+        fi
+
         # Stuck detection
         if python3 "$SCRIPTS_DIR/detect-stuck.py" \
             --state-dir "$STATE_DIR" \

package/bundled/dev-pipeline/scripts/detect-stuck.py

@@ -226,15 +226,16 @@ def check_stuck_checkpoint(item_dir):
     return None
 
 
-def check_stale_heartbeat(item_id, item_status, state_dir, items_subdir, stale_threshold):
+def check_stale_heartbeat(item_id, item_status, state_dir, items_subdir, stale_threshold, task_list_status=None):
     """Check 3: Is the heartbeat stale or missing for an in_progress item?
 
     Only applies to items whose status indicates active work.
-    Uses last_session_id from the item's own status to find the active session.
+    Status is read from task_list_status (task list JSON, single source of truth).
+    Uses last_session_id from the item's own status.json to find the active session.
 
     Returns a stuck-report dict or None.
     """
-    status = item_status.get("status")
+    status = task_list_status
     # All pipelines now use "in_progress" as the active status
     in_progress_statuses = {"in_progress"}
     if status not in in_progress_statuses:
@@ -287,6 +288,8 @@ def check_stale_heartbeat(item_id, item_status, state_dir, items_subdir, stale_t
 def check_dependency_deadlock(item_id, task_list_data, state_dir, items_subdir, items_key):
     """Check 4: Does this item depend on a failed item?
 
+    Reads dependency status from task list JSON (single source of truth).
+
     Returns a stuck-report dict or None.
     """
     if task_list_data is None:
@@ -296,6 +299,12 @@ def check_dependency_deadlock(item_id, task_list_data, state_dir, items_subdir,
     if not isinstance(items, list):
         return None
 
+    # Build status map from task list
+    status_map = {}
+    for item in items:
+        if isinstance(item, dict) and item.get("id"):
+            status_map[item["id"]] = item.get("status", "pending")
+
     # Find this item in the list to get its dependencies
     deps = None
     for item in items:
@@ -308,15 +317,9 @@ def check_dependency_deadlock(item_id, task_list_data, state_dir, items_subdir,
     if not deps or not isinstance(deps, list):
         return None
 
-    # Check each dependency's status in state
+    # Check each dependency's status from the task list
     for dep_id in deps:
-        dep_status_path = os.path.join(
-            state_dir, items_subdir, dep_id, "status.json"
-        )
-        dep_status = load_json(dep_status_path)
-        if dep_status is None:
-            continue
-        dep_state = dep_status.get("status")
+        dep_state = status_map.get(dep_id)
         if dep_state == "failed":
             return {
                 "reason": "dependency_failed",
@@ -376,8 +379,16 @@ def check_item(item_id, state_dir, items_subdir, items_key, task_list_data, max_
     item_status = load_json(status_path)
 
     if item_status is None:
-        # Cannot read status — skip silently
-        return []
+        # Create a minimal runtime dict so checks can proceed
+        item_status = {}
+
+    # Look up item status from task list (single source of truth)
+    task_list_status = None
+    if task_list_data:
+        for item in task_list_data.get(items_key, []):
+            if isinstance(item, dict) and item.get("id") == item_id:
+                task_list_status = item.get("status", "pending")
+                break
 
     reports = []
 
@@ -392,7 +403,7 @@ def check_item(item_id, state_dir, items_subdir, items_key, task_list_data, max_
         reports.append(result)
 
     # Check 3: Stale heartbeat
-    result = check_stale_heartbeat(item_id, item_status, state_dir, items_subdir, stale_threshold)
+    result = check_stale_heartbeat(item_id, item_status, state_dir, items_subdir, stale_threshold, task_list_status)
     if result is not None:
         reports.append(result)
 

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

@@ -1314,6 +1314,36 @@ def build_replacements(args, feature, features, global_context, script_dir):
     if isinstance(testing_config, dict):
         coverage_target = str(testing_config.get("coverage_target", 80))
 
+    # Detect dev server port from package.json
+    dev_port = "3000"  # Default fallback
+    try:
+        pkg_path = os.path.join(project_root, "package.json")
+        if os.path.isfile(pkg_path):
+            with open(pkg_path, "r", encoding="utf-8") as f:
+                pkg = json.load(f)
+            dev_script = pkg.get("scripts", {}).get("dev", "")
+            # Extract -p <port> from dev script
+            port_match = re.search(r"-p\s+(\d+)", dev_script)
+            if port_match:
+                dev_port = port_match.group(1)
+            else:
+                # Fallback: try NEXT_PUBLIC_SITE_URL from .env files
+                for env_file in [".env.local", ".env"]:
+                    env_path = os.path.join(project_root, env_file)
+                    if os.path.isfile(env_path):
+                        with open(env_path, "r", encoding="utf-8") as ef:
+                            for line in ef:
+                                m = re.match(
+                                    r"NEXT_PUBLIC_SITE_URL\s*=\s*.*?:([0-9]+)", line.strip()
+                                )
+                                if m:
+                                    dev_port = m.group(1)
+                                    break
+                        if dev_port != "3000":
+                            break
+    except Exception:
+        pass  # Keep default 3000 on any error
+    dev_url = f"http://localhost:{dev_port}"
 
     replacements = {
         "{{RUN_ID}}": args.run_id,
@@ -1356,6 +1386,8 @@ def build_replacements(args, feature, features, global_context, script_dir):
         "{{TEST_CMD}}": test_cmd,
         "{{BASELINE_FAILURES}}": baseline_failures,
         "{{COVERAGE_TARGET}}": coverage_target,
+        "{{DEV_PORT}}": dev_port,
+        "{{DEV_URL}}": dev_url,
     }
 
     return replacements, effective_resume, browser_enabled

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

@@ -249,13 +249,8 @@ 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": init_status,
             "retry_count": 0,
             "max_retries": 3,
             "sessions": [],

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

@@ -283,13 +283,8 @@ def create_state_directory(state_dir, feature_list_path, features):
         sessions_dir = os.path.join(feature_dir, "sessions")
         os.makedirs(sessions_dir, exist_ok=True)
 
-        # Respect existing terminal status from .prizmkit/plans/feature-list.json
-        fl_status = feature.get("status", "pending")
-        init_status = fl_status if fl_status in TERMINAL_STATUSES else "pending"
-
         feature_status = {
             "feature_id": fid,
-            "status": init_status,
             "retry_count": 0,
             "max_retries": 3,
             "sessions": [],

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

@@ -325,13 +325,8 @@ def create_state_directory(state_dir, refactor_list_path, refactors):
         sessions_dir = os.path.join(refactor_dir, "sessions")
         os.makedirs(sessions_dir, exist_ok=True)
 
-        # Respect existing terminal status from refactor-list.json
-        rl_status = refactor.get("status", "pending")
-        init_status = rl_status if rl_status in TERMINAL_STATUSES else "pending"
-
         refactor_status = {
             "refactor_id": rid,
-            "status": init_status,
             "retry_count": 0,
             "max_retries": 3,
             "sessions": [],

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

@@ -84,12 +84,17 @@ def now_iso():
 
 
 def load_bug_status(state_dir, bug_id):
+    """Load runtime state from status.json for a bug.
+
+    Returns runtime fields only (retry_count, sessions, etc.).
+    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")
     if not os.path.isfile(status_path):
         now = now_iso()
         return {
             "bug_id": bug_id,
-            "status": "pending",
             "retry_count": 0,
             "max_retries": 3,
             "sessions": [],
@@ -103,7 +108,6 @@ def load_bug_status(state_dir, bug_id):
         now = now_iso()
         return {
             "bug_id": bug_id,
-            "status": "pending",
             "retry_count": 0,
             "max_retries": 3,
             "sessions": [],
@@ -112,14 +116,30 @@ def load_bug_status(state_dir, bug_id):
             "created_at": now,
             "updated_at": now,
         }
+    # Defensively remove status if present (legacy data)
+    data.pop("status", None)
     return data
 
 
 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")
     return write_json_file(status_path, status_data)
 
 
+def get_bug_status_from_list(bug_list_path, bug_id):
+    """Read a single bug's status from bug-fix-list.json."""
+    data, err = load_json_file(bug_list_path)
+    if err:
+        return "pending"
+    for b in data.get("bugs", []):
+        if isinstance(b, dict) and b.get("id") == bug_id:
+            return b.get("status", "pending")
+    return "pending"
+
+
 def update_bug_in_list(bug_list_path, bug_id, new_status):
     data, err = load_json_file(bug_list_path)
     if err:
@@ -153,7 +173,7 @@ def action_get_next(bug_list_data, state_dir):
         print("PIPELINE_COMPLETE")
         return
 
-    # Build status map
+    # Build status map from bug-fix-list.json (single source of truth)
     status_map = {}
     status_data_map = {}
     for bug in bugs:
@@ -162,8 +182,8 @@ def action_get_next(bug_list_data, state_dir):
         bid = bug.get("id")
         if not bid:
             continue
+        status_map[bid] = bug.get("status", "pending")
         bs = load_bug_status(state_dir, bid)
-        status_map[bid] = bs.get("status", "pending")
         status_data_map[bid] = bs
 
     # Check if all bugs are terminal
@@ -237,35 +257,30 @@ def action_update(args, bug_list_path, state_dir):
 
     bs = load_bug_status(state_dir, bug_id)
 
+    # Track what status we write to bug-fix-list.json
+    new_status = get_bug_status_from_list(bug_list_path, bug_id)
+
     if session_status == "success":
-        bs["status"] = "completed"
+        new_status = "completed"
         bs["resume_from_phase"] = None
         err = update_bug_in_list(bug_list_path, bug_id, "completed")
         if err:
             error_out("Failed to update .prizmkit/plans/bug-fix-list.json: {}".format(err))
             return
     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"
+            new_status = "failed"
         else:
-            # 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"
+            new_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)
+        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
@@ -279,17 +294,15 @@ def action_update(args, bug_list_path, state_dir):
         )
 
         if bs["retry_count"] >= max_retries:
-            bs["status"] = "failed"
-            target_status = "failed"
+            new_status = "failed"
         else:
-            bs["status"] = "pending"
-            target_status = "pending"
+            new_status = "pending"
 
         bs["resume_from_phase"] = None
         bs["sessions"] = []
         bs["last_session_id"] = None
 
-        err = update_bug_in_list(bug_list_path, bug_id, target_status)
+        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
@@ -312,7 +325,7 @@ def action_update(args, bug_list_path, state_dir):
         "action": "update",
         "bug_id": bug_id,
         "session_status": session_status,
-        "new_status": bs["status"],
+        "new_status": new_status,
         "retry_count": bs["retry_count"],
         "resume_from_phase": bs.get("resume_from_phase"),
         "updated_at": bs["updated_at"],
@@ -432,8 +445,8 @@ def action_status(bug_list_data, state_dir):
         if not bid:
             continue
 
+        bstatus = bug.get("status", "pending")
         bs = load_bug_status(state_dir, bid)
-        bstatus = bs.get("status", "pending")
         retry_count = bs.get("retry_count", 0)
         max_retries_val = bs.get("max_retries", 3)
         resume_phase = bs.get("resume_from_phase")
@@ -537,10 +550,9 @@ def action_reset(args, bug_list_path, state_dir):
         return
 
     bs = load_bug_status(state_dir, bug_id)
-    old_status = bs.get("status", "unknown")
+    old_status = get_bug_status_from_list(bug_list_path, bug_id)
     old_retry = bs.get("retry_count", 0)
 
-    bs["status"] = "pending"
     bs["retry_count"] = 0
     bs["sessions"] = []
     bs["last_session_id"] = None
@@ -613,10 +625,9 @@ def action_clean(args, bug_list_path, state_dir):
 
     # 5. Reset status
     bs = load_bug_status(state_dir, bug_id)
-    old_status = bs.get("status", "unknown")
+    old_status = get_bug_status_from_list(bug_list_path, bug_id)
     old_retry = bs.get("retry_count", 0)
 
-    bs["status"] = "pending"
     bs["retry_count"] = 0
     bs["sessions"] = []
     bs["last_session_id"] = None
@@ -687,9 +698,8 @@ def action_start(args, bug_list_path, state_dir):
         return
 
     bs = load_bug_status(state_dir, bug_id)
-    old_status = bs.get("status", "pending")
+    old_status = get_bug_status_from_list(bug_list_path, bug_id)
 
-    bs["status"] = "in_progress"
     bs["updated_at"] = now_iso()
 
     err = save_bug_status(state_dir, bug_id, bs)
@@ -779,10 +789,9 @@ def action_unskip(args, bug_list_path, state_dir):
         error_out("Failed to write .prizmkit/plans/bug-fix-list.json: {}".format(err))
         return
 
-    # Reset status.json for each bug
+    # Reset runtime fields in 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