prizmkit 1.1.8 → 1.1.9

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

@@ -24,6 +24,8 @@ SCRIPTS_DIR="$SCRIPT_DIR/scripts"
 
 SESSION_TIMEOUT=${SESSION_TIMEOUT:-0}
 HEARTBEAT_INTERVAL=${HEARTBEAT_INTERVAL:-30}
+AUTO_PUSH=${AUTO_PUSH:-0}
+DEV_BRANCH=${DEV_BRANCH:-""}
 
 # Source shared common helpers (CLI/platform detection + logs + deps)
 source "$SCRIPT_DIR/lib/common.sh"
@@ -32,6 +34,9 @@ prizm_detect_cli_and_platform
 # Source shared heartbeat library
 source "$SCRIPT_DIR/lib/heartbeat.sh"
 
+# Source shared branch library
+source "$SCRIPT_DIR/lib/branch.sh"
+
 # Detect stream-json support
 detect_stream_json_support "$CLI_CMD"
 
@@ -116,15 +121,31 @@ sys.exit(1)
 PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 ORIGINAL_BRANCH=$(git -C "$PROJECT_ROOT" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
 
-log_info "Cleaning $REFACTOR_ID artifacts for full restart..."
-python3 "$SCRIPTS_DIR/update-refactor-status.py" \
-    --refactor-list "$REFACTOR_LIST" \
-    --state-dir "$STATE_DIR" \
-    --refactor-id "$REFACTOR_ID" \
-    --project-root "$PROJECT_ROOT" \
-    --action clean >/dev/null 2>&1 || {
-    log_warn "Failed to clean refactor artifacts (continuing with fresh session only)"
-}
+# Branch tracking (for cleanup on interrupt)
+_DEV_BRANCH_NAME=""
+
+log_info "Reading retry state for $REFACTOR_ID..."
+RETRY_COUNT=$(python3 -c "
+import json, os
+status_path = os.path.join('$STATE_DIR', 'refactors', '$REFACTOR_ID', 'status.json')
+if os.path.isfile(status_path):
+    with open(status_path) as f:
+        d = json.load(f)
+    print(d.get('retry_count', 0))
+else:
+    print(0)
+" 2>/dev/null || echo "0")
+RESUME_PHASE=$(python3 -c "
+import json, os
+status_path = os.path.join('$STATE_DIR', 'refactors', '$REFACTOR_ID', 'status.json')
+if os.path.isfile(status_path):
+    with open(status_path) as f:
+        d = json.load(f)
+    print(d.get('resume_from_phase') or 'null')
+else:
+    print('null')
+" 2>/dev/null || echo "null")
+log_info "Retry count: $RETRY_COUNT, Resume phase: $RESUME_PHASE"
 
 # ============================================================
 # Generate bootstrap prompt
@@ -138,28 +159,57 @@ mkdir -p "$SESSION_DIR/logs"
 BOOTSTRAP_PROMPT="$SESSION_DIR/bootstrap-prompt.md"
 
 log_info "Generating refactor bootstrap prompt..."
-python3 "$SCRIPTS_DIR/generate-refactor-prompt.py" \
-    --refactor-list "$REFACTOR_LIST" \
-    --refactor-id "$REFACTOR_ID" \
-    --session-id "$SESSION_ID" \
-    --run-id "$RUN_ID" \
-    --retry-count 0 \
-    --resume-phase "null" \
-    --state-dir "$STATE_DIR" \
-    --output "$BOOTSTRAP_PROMPT" >/dev/null 2>&1
+GEN_ARGS=(
+    --refactor-list "$REFACTOR_LIST"
+    --refactor-id "$REFACTOR_ID"
+    --session-id "$SESSION_ID"
+    --run-id "$RUN_ID"
+    --retry-count "$RETRY_COUNT"
+    --resume-phase "$RESUME_PHASE"
+    --state-dir "$STATE_DIR"
+    --output "$BOOTSTRAP_PROMPT"
+)
+
+# Support PIPELINE_MODE env var
+if [[ -n "${PIPELINE_MODE:-}" ]]; then
+    GEN_ARGS+=(--mode "$PIPELINE_MODE")
+fi
+
+# Support ENABLE_CRITIC env var
+if [[ "${ENABLE_CRITIC:-}" == "true" || "${ENABLE_CRITIC:-}" == "1" ]]; then
+    GEN_ARGS+=(--critic "true")
+elif [[ "${ENABLE_CRITIC:-}" == "false" || "${ENABLE_CRITIC:-}" == "0" ]]; then
+    GEN_ARGS+=(--critic "false")
+fi
+
+GEN_OUTPUT=$(python3 "$SCRIPTS_DIR/generate-refactor-prompt.py" "${GEN_ARGS[@]}" 2>/dev/null) || {
+    log_error "Failed to generate bootstrap prompt"
+    exit 1
+}
+REFACTOR_MODEL=$(echo "$GEN_OUTPUT" | python3 -c "import json,sys; print(json.load(sys.stdin).get('model',''))" 2>/dev/null || echo "")
 
 # ============================================================
 # Run single AI CLI session
 # ============================================================
 
+# Branch lifecycle: create and checkout refactor branch
+_branch_name="${DEV_BRANCH:-refactor/${REFACTOR_ID}-$(date +%s)}"
+if branch_create "$PROJECT_ROOT" "$_branch_name" "$ORIGINAL_BRANCH"; then
+    _DEV_BRANCH_NAME="$_branch_name"
+    log_info "Dev branch: $_branch_name"
+else
+    log_warn "Failed to create branch; running session on current branch"
+fi
+
 echo ""
 echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
 echo -e "${BOLD}  Retry Refactor: $REFACTOR_ID — $REFACTOR_TITLE${NC}"
 echo -e "${BOLD}  Complexity: $REFACTOR_COMPLEXITY${NC}"
 echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
 log_info "CLI: $CLI_CMD (platform: $PLATFORM)"
-if [[ -n "${MODEL:-}" ]]; then
-    log_info "Model: $MODEL"
+EFFECTIVE_MODEL="${REFACTOR_MODEL:-${MODEL:-}}"
+if [[ -n "$EFFECTIVE_MODEL" ]]; then
+    log_info "Model: $EFFECTIVE_MODEL"
 else
     log_info "Model: (CLI default)"
 fi
@@ -188,14 +238,18 @@ if [[ "$USE_STREAM_JSON" == "true" ]]; then
     VERBOSE_FLAG="--verbose"
 fi
 
-# Spawn AI CLI session
+# Spawn AI CLI session — model priority: refactor.model > $MODEL env > none
+EFFECTIVE_MODEL="${REFACTOR_MODEL:-${MODEL:-}}"
 MODEL_FLAG=""
-if [[ -n "${MODEL:-}" ]]; then
-    MODEL_FLAG="--model $MODEL"
+if [[ -n "$EFFECTIVE_MODEL" ]]; then
+    MODEL_FLAG="--model $EFFECTIVE_MODEL"
 fi
 
 unset CLAUDECODE 2>/dev/null || true
 
+# Log bootstrap prompt in test mode
+prizm_log_bootstrap_prompt "$BOOTSTRAP_PROMPT" "$REFACTOR_ID"
+
 case "$CLI_CMD" in
     *claude*)
         # Claude Code: prompt via -p argument, --dangerously-skip-permissions for auto-accept
@@ -245,6 +299,10 @@ cleanup() {
     stop_progress_parser "$PARSER_PID"
     wait "$CLI_PID" 2>/dev/null || true
     [[ -n "$WATCHER_PID" ]] && wait "$WATCHER_PID" 2>/dev/null || true
+    if [[ -n "$_DEV_BRANCH_NAME" ]]; then
+        log_info "Development was on branch: $_DEV_BRANCH_NAME"
+        log_info "Original branch was: $ORIGINAL_BRANCH"
+    fi
     log_info "Session log: $SESSION_LOG"
     exit 130
 }
@@ -330,6 +388,30 @@ if [[ "$SESSION_STATUS" == "success" ]]; then
     fi
 fi
 
+# ── Propagate completion notes for dependency context ─────────────────
+if [[ "$SESSION_STATUS" == "success" ]]; then
+    SUMMARY_PATH="$PROJECT_ROOT/.prizmkit/refactor/$REFACTOR_ID/completion-summary.json"
+    if [[ -f "$SUMMARY_PATH" ]]; then
+        python3 "$SCRIPTS_DIR/patch-completion-notes.py" \
+            --refactor-list "$REFACTOR_LIST" \
+            --refactor-id "$REFACTOR_ID" \
+            --summary "$SUMMARY_PATH" >/dev/null 2>&1 && {
+            log_info "Propagated completion notes for $REFACTOR_ID"
+        } || {
+            log_warn "Failed to propagate completion notes for $REFACTOR_ID"
+        }
+    fi
+fi
+
+# ── Merge dev branch back to original on success ────────────────────
+if [[ "$SESSION_STATUS" == "success" && -n "$_DEV_BRANCH_NAME" ]]; then
+    if branch_merge "$PROJECT_ROOT" "$_DEV_BRANCH_NAME" "$ORIGINAL_BRANCH" "$AUTO_PUSH"; then
+        _DEV_BRANCH_NAME=""
+    else
+        log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
+    fi
+fi
+
 # Update refactor status
 python3 "$SCRIPTS_DIR/update-refactor-status.py" \
     --refactor-list "$REFACTOR_LIST" \

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

@@ -43,6 +43,7 @@ LOG_CLEANUP_ENABLED=${LOG_CLEANUP_ENABLED:-1}
 LOG_RETENTION_DAYS=${LOG_RETENTION_DAYS:-14}
 LOG_MAX_TOTAL_MB=${LOG_MAX_TOTAL_MB:-1024}
 VERBOSE=${VERBOSE:-0}
+MODEL=${MODEL:-""}
 DEV_BRANCH=${DEV_BRANCH:-""}
 AUTO_PUSH=${AUTO_PUSH:-0}
 
@@ -77,7 +78,8 @@ spawn_and_wait_session() {
     local bootstrap_prompt="$4"
     local session_dir="$5"
     local max_retries="$6"
-    local base_branch="${7:-main}"
+    local item_model="${7:-}"
+    local base_branch="${8:-main}"
 
     local session_log="$session_dir/logs/session.log"
     local progress_json="$session_dir/logs/progress.json"
@@ -95,7 +97,9 @@ spawn_and_wait_session() {
     fi
 
     local model_flag=""
-    if [[ -n "${MODEL:-}" ]]; then
+    if [[ -n "$item_model" ]]; then
+        model_flag="--model $item_model"
+    elif [[ -n "${MODEL:-}" ]]; then
         model_flag="--model $MODEL"
     fi
 
@@ -103,6 +107,9 @@ spawn_and_wait_session() {
     # within an existing Claude Code session (e.g. via launch-bugfix-daemon.sh).
     unset CLAUDECODE 2>/dev/null || true
 
+    # Log bootstrap prompt in test mode
+    prizm_log_bootstrap_prompt "$bootstrap_prompt" "$bug_id"
+
     case "$CLI_CMD" in
         *claude*)
             # Claude Code: prompt via -p, --dangerously-skip-permissions for auto-accept
@@ -355,6 +362,8 @@ run_one() {
     local dry_run=false
     local do_clean=false
     local no_reset=false
+    local mode_override=""
+    local critic_override=""
 
     while [[ $# -gt 0 ]]; do
         case "$1" in
@@ -362,6 +371,20 @@ run_one() {
             --clean) do_clean=true; shift ;;
             --no-reset) no_reset=true; shift ;;
             --timeout) shift; SESSION_TIMEOUT="${1:-0}"; shift ;;
+            --mode)
+                shift
+                if [[ $# -eq 0 ]]; then
+                    log_error "--mode requires a value (lite|standard|full)"
+                    exit 1
+                fi
+                case "$1" in
+                    lite|standard|full) mode_override="$1" ;;
+                    *) log_error "Invalid mode: $1 (must be lite, standard, or full)"; exit 1 ;;
+                esac
+                shift
+                ;;
+            --critic) critic_override="true"; shift ;;
+            --no-critic) critic_override="false"; shift ;;
             B-*|b-*) bug_id="$1"; shift ;;
             *) bug_list="$1"; shift ;;
         esac
@@ -494,16 +517,66 @@ sys.exit(1)
 
     bootstrap_prompt="$session_dir/bootstrap-prompt.md"
 
+    # Read retry count from status.json
+    local retry_count
+    retry_count=$(python3 -c "
+import json, os
+status_path = os.path.join('$STATE_DIR', 'bugs', '$bug_id', 'status.json')
+if os.path.isfile(status_path):
+    with open(status_path) as f:
+        d = json.load(f)
+    print(d.get('retry_count', 0))
+else:
+    print(0)
+" 2>/dev/null || echo "0")
+    local resume_phase
+    resume_phase=$(python3 -c "
+import json, os
+status_path = os.path.join('$STATE_DIR', 'bugs', '$bug_id', 'status.json')
+if os.path.isfile(status_path):
+    with open(status_path) as f:
+        d = json.load(f)
+    print(d.get('resume_from_phase') or 'null')
+else:
+    print('null')
+" 2>/dev/null || echo "null")
+
     log_info "Generating bugfix bootstrap prompt..."
-    python3 "$SCRIPTS_DIR/generate-bugfix-prompt.py" \
-        --bug-list "$bug_list" \
-        --bug-id "$bug_id" \
-        --session-id "$session_id" \
-        --run-id "$run_id" \
-        --retry-count 0 \
-        --resume-phase "null" \
-        --state-dir "$STATE_DIR" \
-        --output "$bootstrap_prompt" >/dev/null 2>&1
+    local prompt_args=(
+        --bug-list "$bug_list"
+        --bug-id "$bug_id"
+        --session-id "$session_id"
+        --run-id "$run_id"
+        --retry-count "$retry_count"
+        --resume-phase "$resume_phase"
+        --state-dir "$STATE_DIR"
+        --output "$bootstrap_prompt"
+    )
+
+    if [[ -n "$mode_override" ]]; then
+        prompt_args+=(--mode "$mode_override")
+    elif [[ -n "${PIPELINE_MODE:-}" ]]; then
+        prompt_args+=(--mode "$PIPELINE_MODE")
+    fi
+
+    if [[ -n "${critic_override:-}" ]]; then
+        prompt_args+=(--critic "$critic_override")
+    elif [[ "${ENABLE_CRITIC:-}" == "true" || "${ENABLE_CRITIC:-}" == "1" ]]; then
+        prompt_args+=(--critic "true")
+    elif [[ "${ENABLE_CRITIC:-}" == "false" || "${ENABLE_CRITIC:-}" == "0" ]]; then
+        prompt_args+=(--critic "false")
+    fi
+
+    local gen_output
+    gen_output=$(python3 "$SCRIPTS_DIR/generate-bugfix-prompt.py" "${prompt_args[@]}" 2>/dev/null) || {
+        log_error "Failed to generate bootstrap prompt for $bug_id"
+        return 1
+    }
+    local bug_model pipeline_mode agent_count critic_enabled
+    bug_model=$(echo "$gen_output" | python3 -c "import json,sys; print(json.load(sys.stdin).get('model',''))" 2>/dev/null || echo "")
+    pipeline_mode=$(echo "$gen_output" | python3 -c "import json,sys; print(json.load(sys.stdin).get('pipeline_mode','standard'))" 2>/dev/null || echo "standard")
+    agent_count=$(echo "$gen_output" | python3 -c "import json,sys; print(json.load(sys.stdin).get('agent_count',3))" 2>/dev/null || echo "3")
+    critic_enabled=$(echo "$gen_output" | python3 -c "import json,sys; print(json.load(sys.stdin).get('critic_enabled','false'))" 2>/dev/null || echo "false")
 
     if [[ "$dry_run" == true ]]; then
         echo ""
@@ -512,6 +585,20 @@ sys.exit(1)
         echo -e "${BOLD}  Severity: $bug_severity${NC}"
         echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
         echo ""
+        log_info "Session ID:    $session_id"
+        if [[ -n "$mode_override" ]]; then
+            log_info "Mode Override: $mode_override"
+        fi
+        log_info "Pipeline mode: $pipeline_mode"
+        log_info "Agents:        $agent_count (critic: $([ "$critic_enabled" = "true" ] && echo "enabled" || echo "disabled"))"
+        if [[ -n "$bug_model" ]]; then
+            log_info "Bug Model:     $bug_model"
+        elif [[ -n "$MODEL" ]]; then
+            log_info "Model (env):   $MODEL"
+        else
+            log_info "Model:         (CLI default)"
+        fi
+        echo ""
         log_info "Bootstrap prompt written to:"
         echo "  $bootstrap_prompt"
         echo ""
@@ -528,6 +615,18 @@ sys.exit(1)
     log_info "Session ID: $session_id"
     log_info "Prompt: $bootstrap_prompt"
     log_info "Log: $session_dir/logs/session.log"
+    local _run_one_mode_desc
+    case "$pipeline_mode" in
+        lite)     _run_one_mode_desc="Tier 1 — Single Agent" ;;
+        standard) _run_one_mode_desc="Tier 2 — Orchestrator + Dev + Reviewer" ;;
+        full)     _run_one_mode_desc="Tier 3 — Full Team (+ Multi-Critic)" ;;
+        *)        _run_one_mode_desc="$pipeline_mode" ;;
+    esac
+    log_info "Pipeline mode: ${BOLD}$pipeline_mode${NC} ($_run_one_mode_desc)"
+    log_info "Agents: $agent_count (critic: $([ "$critic_enabled" = "true" ] && echo "enabled" || echo "disabled"))"
+    if [[ -n "$bug_model" ]]; then
+        log_info "Bug model: $bug_model"
+    fi
     echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
     echo ""
 
@@ -562,7 +661,7 @@ sys.exit(1)
 
     spawn_and_wait_session \
         "$bug_id" "$bug_list" "$session_id" \
-        "$bootstrap_prompt" "$session_dir" 999 "$_ORIGINAL_BRANCH"
+        "$bootstrap_prompt" "$session_dir" 999 "$bug_model" "$_ORIGINAL_BRANCH"
     local session_status="$_SPAWN_RESULT"
 
     # Merge dev branch back to original on success
@@ -665,23 +764,13 @@ main() {
     echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
     echo ""
 
-    # Branch lifecycle: create bugfix branch for this pipeline run
+    # Branch lifecycle: per-bug branches (like feature pipeline)
     local _proj_root
     _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
     local _source_branch
     _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
     _ORIGINAL_BRANCH="$_source_branch"
 
-    local run_id_for_branch
-    run_id_for_branch=$(jq -r '.run_id' "$STATE_DIR/pipeline.json" 2>/dev/null || echo "$$")
-    local _branch_name="${DEV_BRANCH:-bugfix/pipeline-${run_id_for_branch}}"
-    if branch_create "$_proj_root" "$_branch_name" "$_source_branch"; then
-        _DEV_BRANCH_NAME="$_branch_name"
-        log_info "Dev branch: $_branch_name"
-    else
-        log_warn "Failed to create bugfix branch; running on current branch: $_source_branch"
-    fi
-
     local session_count=0
     local total_subagent_calls=0
 
@@ -705,15 +794,6 @@ main() {
             log_success "  Total subagent calls: $total_subagent_calls"
             log_success "════════════════════════════════════════════════════"
 
-            # Merge dev branch back to original
-            if [[ -n "$_DEV_BRANCH_NAME" ]]; then
-                if branch_merge "$_proj_root" "$_DEV_BRANCH_NAME" "$_ORIGINAL_BRANCH" "$AUTO_PUSH"; then
-                    _DEV_BRANCH_NAME=""
-                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"
-                fi
-            fi
             break
         fi
 
@@ -742,6 +822,23 @@ main() {
         fi
         echo -e "${BOLD}────────────────────────────────────────────────────${NC}"
 
+        # Pre-commit any dirty tree from previous iteration
+        if ! git -C "$_proj_root" diff --quiet HEAD 2>/dev/null || [ -n "$(git -C "$_proj_root" ls-files --others --exclude-standard 2>/dev/null)" ]; then
+            log_info "Dirty working tree detected — committing before $bug_id..."
+            git -C "$_proj_root" add -A 2>/dev/null || true
+            git -C "$_proj_root" commit --no-verify -m "chore: capture artifacts before $bug_id session" 2>/dev/null || true
+        fi
+
+        # Create per-bug dev branch
+        local _bug_branch="${DEV_BRANCH:-bugfix/${bug_id}-$(date +%Y%m%d%H%M)}"
+        if branch_create "$_proj_root" "$_bug_branch" "$_ORIGINAL_BRANCH"; then
+            _DEV_BRANCH_NAME="$_bug_branch"
+            log_info "Dev branch: $_bug_branch"
+        else
+            log_warn "Failed to create dev branch; running on current branch: $_ORIGINAL_BRANCH"
+            _DEV_BRANCH_NAME=""
+        fi
+
         # Generate session
         local session_id run_id
         run_id=$(jq -r '.run_id' "$STATE_DIR/pipeline.json")
@@ -751,19 +848,61 @@ main() {
         mkdir -p "$session_dir/logs"
 
         local bootstrap_prompt="$session_dir/bootstrap-prompt.md"
-        python3 "$SCRIPTS_DIR/generate-bugfix-prompt.py" \
+
+        local main_prompt_args=(
+            --bug-list "$bug_list"
+            --bug-id "$bug_id"
+            --session-id "$session_id"
+            --run-id "$run_id"
+            --retry-count "$retry_count"
+            --resume-phase "$resume_phase"
+            --state-dir "$STATE_DIR"
+            --output "$bootstrap_prompt"
+        )
+
+        # Support PIPELINE_MODE env var (set by launch-bugfix-daemon.sh --mode)
+        if [[ -n "${PIPELINE_MODE:-}" ]]; then
+            main_prompt_args+=(--mode "$PIPELINE_MODE")
+        fi
+
+        # Support ENABLE_CRITIC env var (set by launch-bugfix-daemon.sh --critic)
+        if [[ "${ENABLE_CRITIC:-}" == "true" || "${ENABLE_CRITIC:-}" == "1" ]]; then
+            main_prompt_args+=(--critic "true")
+        elif [[ "${ENABLE_CRITIC:-}" == "false" || "${ENABLE_CRITIC:-}" == "0" ]]; then
+            main_prompt_args+=(--critic "false")
+        fi
+
+        local gen_output
+        gen_output=$(python3 "$SCRIPTS_DIR/generate-bugfix-prompt.py" "${main_prompt_args[@]}" 2>/dev/null) || {
+            log_error "Failed to generate bootstrap prompt for $bug_id"
+            continue
+        }
+        local bug_model pipeline_mode agent_count critic_enabled
+        bug_model=$(echo "$gen_output" | python3 -c "import json,sys; print(json.load(sys.stdin).get('model',''))" 2>/dev/null || echo "")
+        pipeline_mode=$(echo "$gen_output" | python3 -c "import json,sys; print(json.load(sys.stdin).get('pipeline_mode','standard'))" 2>/dev/null || echo "standard")
+        agent_count=$(echo "$gen_output" | python3 -c "import json,sys; print(json.load(sys.stdin).get('agent_count',3))" 2>/dev/null || echo "3")
+        critic_enabled=$(echo "$gen_output" | python3 -c "import json,sys; print(json.load(sys.stdin).get('critic_enabled','false'))" 2>/dev/null || echo "false")
+
+        # Log pipeline mode and agent configuration
+        local _mode_desc
+        case "$pipeline_mode" in
+            lite)     _mode_desc="Tier 1 — Single Agent" ;;
+            standard) _mode_desc="Tier 2 — Orchestrator + Dev + Reviewer" ;;
+            full)     _mode_desc="Tier 3 — Full Team (+ Multi-Critic)" ;;
+            *)        _mode_desc="$pipeline_mode" ;;
+        esac
+        log_info "Pipeline mode: ${BOLD}$pipeline_mode${NC} ($_mode_desc)"
+        log_info "Agents: $agent_count (critic: $([ "$critic_enabled" = "true" ] && echo "enabled" || echo "disabled"))"
+        if [[ -n "$bug_model" ]]; then
+            log_info "Bug model: $bug_model"
+        fi
+
+        # Mark bug as in-progress before spawning session
+        python3 "$SCRIPTS_DIR/update-bug-status.py" \
             --bug-list "$bug_list" \
-            --bug-id "$bug_id" \
-            --session-id "$session_id" \
-            --run-id "$run_id" \
-            --retry-count "$retry_count" \
-            --resume-phase "$resume_phase" \
             --state-dir "$STATE_DIR" \
-            --output "$bootstrap_prompt" >/dev/null 2>&1
-
-        # Log agent configuration (bugfix always uses dual-agent: Orchestrator + Dev + Reviewer)
-        log_info "Pipeline mode: ${BOLD}standard${NC} (Dual Agent — Orchestrator + Dev + Reviewer)"
-        log_info "Agents: 3 (critic: disabled)"
+            --bug-id "$bug_id" \
+            --action start >/dev/null 2>&1 || true
 
         # Spawn session
         log_info "Spawning AI CLI session: $session_id"
@@ -771,11 +910,53 @@ main() {
 
         spawn_and_wait_session \
             "$bug_id" "$bug_list" "$session_id" \
-            "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES" "$_ORIGINAL_BRANCH"
+            "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES" "$bug_model" "$_ORIGINAL_BRANCH"
+
+        local session_status="$_SPAWN_RESULT"
+
+        # Merge per-bug dev branch back to original on success
+        if [[ "$session_status" == "success" && -n "$_DEV_BRANCH_NAME" ]]; then
+            if branch_merge "$_proj_root" "$_DEV_BRANCH_NAME" "$_ORIGINAL_BRANCH" "$AUTO_PUSH"; then
+                _DEV_BRANCH_NAME=""
+            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
+            log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
+            _DEV_BRANCH_NAME=""
+        fi
 
         session_count=$((session_count + 1))
         total_subagent_calls=$((total_subagent_calls + _SUBAGENT_COUNT))
 
+        # Stuck detection
+        if python3 "$SCRIPTS_DIR/detect-stuck.py" \
+            --state-dir "$STATE_DIR" \
+            --pipeline-type bugfix \
+            --bug-list "$bug_list" \
+            --max-retries "$MAX_RETRIES" \
+            2>/dev/null | jq -e '.stuck_count > 0' >/dev/null 2>&1; then
+            log_warn "STUCK_DETECTED: Some bugs may be stuck — run detect-stuck.py for details"
+        fi
+
+        # Completion notes propagation (on success)
+        if [ "$_SPAWN_RESULT" = "success" ]; then
+            local _summary_path="$_proj_root/.prizmkit/bugfix/${bug_id}/completion-summary.json"
+            if [ -f "$_summary_path" ]; then
+                python3 "$SCRIPTS_DIR/patch-completion-notes.py" \
+                    --bug-list "$bug_list" \
+                    --bug-id "$bug_id" \
+                    --summary "$_summary_path" 2>/dev/null || true
+            fi
+        fi
+
         log_info "Pausing 5s before next bug..."
         sleep 5
     done
@@ -800,10 +981,16 @@ show_help() {
     echo "  --clean                     Delete artifacts and reset before running"
     echo "  --no-reset                  Skip status reset (preserve retry count)"
     echo "  --timeout N                 Session timeout in seconds (default: 0 = no limit)"
+    echo "  --mode <lite|standard|full> Override pipeline mode"
+    echo "  --critic                    Enable adversarial critic review"
+    echo "  --no-critic                 Disable adversarial critic review"
     echo ""
     echo "Environment Variables:"
     echo "  MAX_RETRIES           Max retries per bug (default: 3)"
     echo "  SESSION_TIMEOUT       Session timeout in seconds (default: 0 = no limit)"
+    echo "  MODEL                 Default AI model (overridden by per-bug model in bug list)"
+    echo "  PIPELINE_MODE         Default pipeline mode: lite|standard|full (overridden by --mode)"
+    echo "  ENABLE_CRITIC         Enable/disable critic: true|false|1|0 (overridden by --critic/--no-critic)"
     echo "  AI_CLI                AI CLI command name (auto-detected: cbc or claude)"
     echo "  VERBOSE               Set to 1 for verbose AI CLI output"
     echo "  HEARTBEAT_INTERVAL    Heartbeat log interval in seconds (default: 30)"
@@ -847,6 +1034,40 @@ case "${1:-run}" in
         rm -rf "$STATE_DIR"
         log_success "Bugfix state cleared. Run './run-bugfix.sh run' to start fresh."
         ;;
+    unskip)
+        check_dependencies
+        if [[ ! -f "$STATE_DIR/pipeline.json" ]]; then
+            log_error "No bugfix pipeline state found. Run './run-bugfix.sh run' first."
+            exit 1
+        fi
+        _unskip_bug_list=".prizmkit/plans/bug-fix-list.json"
+        _unskip_bug_id=""
+        shift || true
+        # Parse arguments: optional bug-id and bug-list path
+        while [[ $# -gt 0 ]]; do
+            if [[ "$1" =~ ^[Bb]-[0-9]+ ]]; then
+                _unskip_bug_id="$1"
+            else
+                _unskip_bug_list="$1"
+            fi
+            shift
+        done
+        _unskip_args=(
+            --bug-list "$_unskip_bug_list"
+            --state-dir "$STATE_DIR"
+            --action unskip
+        )
+        if [[ -n "$_unskip_bug_id" ]]; then
+            _unskip_args+=(--bug-id "$_unskip_bug_id")
+        fi
+        python3 "$SCRIPTS_DIR/update-bug-status.py" "${_unskip_args[@]}"
+
+        # Commit the status change
+        if ! git diff --quiet "$_unskip_bug_list" 2>/dev/null; then
+            git add "$_unskip_bug_list"
+            git commit -m "chore: unskip skipped bugs" 2>/dev/null || true
+        fi
+        ;;
     help|--help|-h)
         show_help
         ;;