prizmkit 1.1.8 → 1.1.10

package/bundled/dev-pipeline/launch-bugfix-daemon.sh

@@ -8,11 +8,11 @@ set -euo pipefail
 # log consolidation, and lifecycle commands.
 #
 # Usage:
-#   ./launch-bugfix-daemon.sh start [.prizmkit/plans/bug-fix-list.json] [--env "KEY=VAL ..."]
+#   ./launch-bugfix-daemon.sh start [.prizmkit/plans/bug-fix-list.json] [--mode <mode>] [--critic] [--env "KEY=VAL ..."]
 #   ./launch-bugfix-daemon.sh stop
 #   ./launch-bugfix-daemon.sh status
 #   ./launch-bugfix-daemon.sh logs [--lines N] [--follow]
-#   ./launch-bugfix-daemon.sh restart [.prizmkit/plans/bug-fix-list.json] [--env "KEY=VAL ..."]
+#   ./launch-bugfix-daemon.sh restart [.prizmkit/plans/bug-fix-list.json] [--mode <mode>] [--critic] [--env "KEY=VAL ..."]
 #
 # NOTE:
 #   In AI skill sessions, always use this daemon wrapper.
@@ -93,6 +93,31 @@ cmd_start() {
     while [[ $# -gt 0 ]]; do
         case "$1" in
             --env) shift; env_overrides="${1:-}"; 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)
+                        PIPELINE_MODE="$1"
+                        ;;
+                    *)
+                        log_error "Invalid mode: $1 (must be lite, standard, or full)"
+                        exit 1
+                        ;;
+                esac
+                shift
+                ;;
+            --critic)
+                ENABLE_CRITIC=true
+                shift
+                ;;
+            --no-critic)
+                ENABLE_CRITIC=false
+                shift
+                ;;
             *) bug_list="$1"; shift ;;
         esac
     done
@@ -166,6 +191,9 @@ cmd_start() {
         echo ""
     } >> "$LOG_FILE"
 
+    [[ -n "${PIPELINE_MODE:-}" ]] && export PIPELINE_MODE
+    [[ -n "${ENABLE_CRITIC:-}" ]] && export ENABLE_CRITIC
+
     if [[ -n "$env_cmd" ]]; then
         nohup $env_cmd "$RUN_SCRIPT" run "$bug_list" >> "$LOG_FILE" 2>&1 &
     else
@@ -174,11 +202,12 @@ cmd_start() {
     local pipeline_pid=$!
     disown "$pipeline_pid" 2>/dev/null || true
 
-    echo "$pipeline_pid" > "$PID_FILE"
+    echo "$pipeline_pid" > "${PID_FILE}.tmp"
+    mv "${PID_FILE}.tmp" "$PID_FILE"
 
+    # Write start metadata (atomic)
     python3 -c "
-import json
-from datetime import datetime
+import json, os
 data = {
     'pid': $pipeline_pid,
     'pipeline_type': 'bugfix',
@@ -187,8 +216,11 @@ data = {
     'env_overrides': '$env_overrides',
     'log_file': '$LOG_FILE'
 }
-with open('$STATE_DIR/.pipeline-meta.json', 'w') as f:
+target = os.path.join('$STATE_DIR', '.pipeline-meta.json')
+tmp = target + '.tmp'
+with open(tmp, 'w') as f:
     json.dump(data, f, indent=2)
+os.replace(tmp, target)
 " 2>/dev/null || true
 
     sleep 2
@@ -234,7 +266,10 @@ cmd_stop() {
     fi
 
     log_info "Stopping bugfix pipeline (PID: $pid)..."
-    kill -TERM "$pid" 2>/dev/null || true
+
+    # Kill the entire process group to include child processes (claude-internal, etc.)
+    # First try SIGTERM to the process group (negative PID)
+    kill -TERM -- -"$pid" 2>/dev/null || kill -TERM "$pid" 2>/dev/null || true
 
     local waited=0
     while [[ $waited -lt 30 ]]; do
@@ -245,9 +280,10 @@ cmd_stop() {
         waited=$((waited + 1))
     done
 
+    # Force kill if still alive (process group first, then individual)
     if kill -0 "$pid" 2>/dev/null; then
         log_warn "Process did not exit after 30s, sending SIGKILL..."
-        kill -9 "$pid" 2>/dev/null || true
+        kill -9 -- -"$pid" 2>/dev/null || kill -9 "$pid" 2>/dev/null || true
         sleep 1
     fi
 
@@ -342,7 +378,7 @@ import json, os
 bl = json.load(open('$bug_list_path'))
 bugs = bl.get('bugs', [])
 total = len(bugs)
-counts = {'completed': 0, 'in_progress': 0, 'failed': 0, 'pending': 0, 'needs_info': 0}
+counts = {'completed': 0, 'in_progress': 0, 'failed': 0, 'pending': 0, 'needs_info': 0, 'skipped': 0}
 for bug in bugs:
     bid = bug.get('id', '')
     sp = os.path.join('$STATE_DIR', 'bugs', bid, 'status.json')
@@ -356,7 +392,7 @@ for bug in bugs:
     else:
         counts['pending'] += 1
 pct = round(counts['completed'] / total * 100, 1) if total > 0 else 0
-print(json.dumps({'total': total, 'completed': counts['completed'], 'in_progress': counts['in_progress'], 'failed': counts['failed'], 'pending': counts['pending'], 'needs_info': counts['needs_info'], 'percent': pct}))
+print(json.dumps({'total': total, 'completed': counts['completed'], 'in_progress': counts['in_progress'], 'failed': counts['failed'], 'pending': counts['pending'], 'needs_info': counts['needs_info'], 'skipped': counts['skipped'], 'percent': pct}))
 " 2>/dev/null || echo "")
     fi
 
@@ -416,17 +452,26 @@ show_help() {
 Usage: launch-bugfix-daemon.sh <command> [options]
 
 Commands:
-  start [.prizmkit/plans/bug-fix-list.json] [--env "K=V ..."]   Start bugfix pipeline in background
+  start [.prizmkit/plans/bug-fix-list.json] [--mode <mode>] [--critic] [--env "K=V ..."]   Start bugfix pipeline in background
   stop                                            Gracefully stop pipeline
   status                                          Check if pipeline is running
   logs [--lines N] [--follow]                     View pipeline logs
-  restart [.prizmkit/plans/bug-fix-list.json] [--env "K=V ..."]  Stop + start pipeline
+  restart [.prizmkit/plans/bug-fix-list.json] [--mode <mode>] [--critic] [--env "K=V ..."]  Stop + start pipeline
   help                                            Show this help
 
+Options:
+  --mode <lite|standard|full>              Override pipeline mode for all bugs
+  --critic                                 Enable adversarial critic review for all bugs
+  --no-critic                              Disable adversarial critic review for all bugs
+  --env "KEY=VAL ..."                        Set environment variables
+
 Examples:
   ./launch-bugfix-daemon.sh start                         # Start with default .prizmkit/plans/bug-fix-list.json
   ./launch-bugfix-daemon.sh start my-bugs.json            # Start with custom bug list
+  ./launch-bugfix-daemon.sh start --mode full             # Full mode for complex bugs
+  ./launch-bugfix-daemon.sh start --critic                # Enable adversarial critic review
   ./launch-bugfix-daemon.sh start --env "MAX_RETRIES=5"
+  ./launch-bugfix-daemon.sh start .prizmkit/plans/bug-fix-list.json --mode full --critic --env "VERBOSE=1"
   ./launch-bugfix-daemon.sh status                        # Check if running (JSON on stdout)
   ./launch-bugfix-daemon.sh logs --follow                 # Live log tailing
   ./launch-bugfix-daemon.sh stop                          # Graceful shutdown

package/bundled/dev-pipeline/launch-feature-daemon.sh

@@ -481,7 +481,7 @@ feature_list_path, state_dir = sys.argv[1], sys.argv[2]
 fl = load_json(feature_list_path)
 features = fl.get('features', [])
 total = len(features)
-counts = {'completed': 0, 'in_progress': 0, 'failed': 0, 'pending': 0, 'skipped': 0}
+counts = {'completed': 0, 'in_progress': 0, 'failed': 0, 'pending': 0, 'skipped': 0, 'auto_skipped': 0}
 for feat in features:
     fid = feat.get('id', '')
     sp = os.path.join(state_dir, 'features', fid, 'status.json')
@@ -502,6 +502,8 @@ print(json.dumps({
     'in_progress': counts['in_progress'],
     'failed': counts['failed'],
     'pending': counts['pending'],
+    'skipped': counts['skipped'],
+    'auto_skipped': counts['auto_skipped'],
     'percent': pct
 }))
 " "$feature_list_path" "$STATE_DIR" 2>/dev/null || echo "")

package/bundled/dev-pipeline/launch-refactor-daemon.sh

@@ -8,11 +8,11 @@ set -euo pipefail
 # log consolidation, and lifecycle commands.
 #
 # Usage:
-#   ./launch-refactor-daemon.sh start [.prizmkit/plans/refactor-list.json] [--env "KEY=VAL ..."]
+#   ./launch-refactor-daemon.sh start [.prizmkit/plans/refactor-list.json] [--mode <mode>] [--critic] [--env "KEY=VAL ..."]
 #   ./launch-refactor-daemon.sh stop
 #   ./launch-refactor-daemon.sh status
 #   ./launch-refactor-daemon.sh logs [--lines N] [--follow]
-#   ./launch-refactor-daemon.sh restart [.prizmkit/plans/refactor-list.json] [--env "KEY=VAL ..."]
+#   ./launch-refactor-daemon.sh restart [.prizmkit/plans/refactor-list.json] [--mode <mode>] [--critic] [--env "KEY=VAL ..."]
 #
 # NOTE:
 #   In AI skill sessions, always use this daemon wrapper.
@@ -93,6 +93,31 @@ cmd_start() {
     while [[ $# -gt 0 ]]; do
         case "$1" in
             --env) shift; env_overrides="${1:-}"; 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)
+                        PIPELINE_MODE="$1"
+                        ;;
+                    *)
+                        log_error "Invalid mode: $1 (must be lite, standard, or full)"
+                        exit 1
+                        ;;
+                esac
+                shift
+                ;;
+            --critic)
+                ENABLE_CRITIC=true
+                shift
+                ;;
+            --no-critic)
+                ENABLE_CRITIC=false
+                shift
+                ;;
             *) refactor_list="$1"; shift ;;
         esac
     done
@@ -166,6 +191,9 @@ cmd_start() {
         echo ""
     } >> "$LOG_FILE"
 
+    [[ -n "${PIPELINE_MODE:-}" ]] && export PIPELINE_MODE
+    [[ -n "${ENABLE_CRITIC:-}" ]] && export ENABLE_CRITIC
+
     if [[ -n "$env_cmd" ]]; then
         nohup $env_cmd "$RUN_SCRIPT" run "$refactor_list" >> "$LOG_FILE" 2>&1 &
     else
@@ -174,11 +202,12 @@ cmd_start() {
     local pipeline_pid=$!
     disown "$pipeline_pid" 2>/dev/null || true
 
-    echo "$pipeline_pid" > "$PID_FILE"
+    echo "$pipeline_pid" > "${PID_FILE}.tmp"
+    mv "${PID_FILE}.tmp" "$PID_FILE"
 
+    # Write start metadata (atomic)
     python3 -c "
-import json
-from datetime import datetime
+import json, os
 data = {
     'pid': $pipeline_pid,
     'pipeline_type': 'refactor',
@@ -187,8 +216,11 @@ data = {
     'env_overrides': '$env_overrides',
     'log_file': '$LOG_FILE'
 }
-with open('$STATE_DIR/.pipeline-meta.json', 'w') as f:
+target = os.path.join('$STATE_DIR', '.pipeline-meta.json')
+tmp = target + '.tmp'
+with open(tmp, 'w') as f:
     json.dump(data, f, indent=2)
+os.replace(tmp, target)
 " 2>/dev/null || true
 
     sleep 2
@@ -234,7 +266,10 @@ cmd_stop() {
     fi
 
     log_info "Stopping refactor pipeline (PID: $pid)..."
-    kill -TERM "$pid" 2>/dev/null || true
+
+    # Kill the entire process group to include child processes (claude-internal, etc.)
+    # First try SIGTERM to the process group (negative PID)
+    kill -TERM -- -"$pid" 2>/dev/null || kill -TERM "$pid" 2>/dev/null || true
 
     local waited=0
     while [[ $waited -lt 30 ]]; do
@@ -245,9 +280,10 @@ cmd_stop() {
         waited=$((waited + 1))
     done
 
+    # Force kill if still alive (process group first, then individual)
     if kill -0 "$pid" 2>/dev/null; then
         log_warn "Process did not exit after 30s, sending SIGKILL..."
-        kill -9 "$pid" 2>/dev/null || true
+        kill -9 -- -"$pid" 2>/dev/null || kill -9 "$pid" 2>/dev/null || true
         sleep 1
     fi
 
@@ -342,7 +378,7 @@ import json, os
 bl = json.load(open('$refactor_list_path'))
 items = bl.get('refactors', [])
 total = len(items)
-counts = {'completed': 0, 'in_progress': 0, 'failed': 0, 'pending': 0, 'needs_info': 0}
+counts = {'completed': 0, 'in_progress': 0, 'failed': 0, 'pending': 0, 'skipped': 0, 'auto_skipped': 0}
 for item in items:
     rid = item.get('id', '')
     sp = os.path.join('$STATE_DIR', 'refactors', rid, 'status.json')
@@ -356,7 +392,7 @@ for item in items:
     else:
         counts['pending'] += 1
 pct = round(counts['completed'] / total * 100, 1) if total > 0 else 0
-print(json.dumps({'total': total, 'completed': counts['completed'], 'in_progress': counts['in_progress'], 'failed': counts['failed'], 'pending': counts['pending'], 'needs_info': counts['needs_info'], 'percent': pct}))
+print(json.dumps({'total': total, 'completed': counts['completed'], 'in_progress': counts['in_progress'], 'failed': counts['failed'], 'pending': counts['pending'], 'skipped': counts['skipped'], 'auto_skipped': counts['auto_skipped'], 'percent': pct}))
 " 2>/dev/null || echo "")
     fi
 
@@ -416,18 +452,27 @@ show_help() {
 Usage: launch-refactor-daemon.sh <command> [options]
 
 Commands:
-  start [.prizmkit/plans/refactor-list.json] [--env "K=V ..."]   Start refactor pipeline in background
+  start [.prizmkit/plans/refactor-list.json] [--mode <mode>] [--critic] [--env "K=V ..."]   Start refactor pipeline in background
   stop                                             Gracefully stop pipeline
   status                                           Check if pipeline is running
   logs [--lines N] [--follow]                      View pipeline logs
-  restart [.prizmkit/plans/refactor-list.json] [--env "K=V ..."]  Stop + start pipeline
+  restart [.prizmkit/plans/refactor-list.json] [--mode <mode>] [--critic] [--env "K=V ..."]  Stop + start pipeline
   help                                             Show this help
 
+Options:
+  --mode <lite|standard|full>              Override pipeline mode for all refactors
+  --critic                                 Enable adversarial critic review for all refactors
+  --no-critic                              Disable adversarial critic review for all refactors
+  --env "KEY=VAL ..."                        Set environment variables
+
 Examples:
   ./launch-refactor-daemon.sh start                              # Start with default .prizmkit/plans/refactor-list.json
   ./launch-refactor-daemon.sh start my-refactors.json            # Start with custom refactor list
+  ./launch-refactor-daemon.sh start --mode full                  # Full mode for complex refactors
+  ./launch-refactor-daemon.sh start --critic                     # Enable adversarial critic review
   ./launch-refactor-daemon.sh start --env "MAX_RETRIES=5"
   ./launch-refactor-daemon.sh start --env "STRICT_BEHAVIOR_CHECK=0"
+  ./launch-refactor-daemon.sh start .prizmkit/plans/refactor-list.json --mode full --critic --env "VERBOSE=1"
   ./launch-refactor-daemon.sh status                             # Check if running (JSON on stdout)
   ./launch-refactor-daemon.sh logs --follow                      # Live log tailing
   ./launch-refactor-daemon.sh stop                               # Graceful shutdown

package/bundled/dev-pipeline/lib/branch.sh

@@ -99,7 +99,12 @@ branch_merge() {
     local remaining_dirty
     remaining_dirty=$(git -C "$project_root" status --porcelain 2>/dev/null || true)
     if [[ -n "$remaining_dirty" ]]; then
-        git -C "$project_root" stash push --include-untracked -m "pipeline-merge-stash" 2>/dev/null && had_stash=true || true
+        if git -C "$project_root" stash push --include-untracked -m "pipeline-merge-stash" 2>/dev/null; then
+            had_stash=true
+        else
+            log_warn "git stash failed — uncommitted changes may not be preserved during merge"
+            had_stash=false
+        fi
     fi
 
     # Step 2: Rebase dev branch onto original to make it fast-forwardable.

package/bundled/dev-pipeline/lib/common.sh

@@ -23,6 +23,70 @@ log_warn()    { echo -e "${YELLOW}[WARN]${NC}    $(date '+%Y-%m-%d %H:%M:%S') $*
 log_error()   { echo -e "${RED}[ERROR]${NC}   $(date '+%Y-%m-%d %H:%M:%S') $*"; }
 log_success() { echo -e "${GREEN}[SUCCESS]${NC} $(date '+%Y-%m-%d %H:%M:%S') $*"; }
 
+# ============================================================
+# .env file loading
+# ============================================================
+
+# Load .env file if it exists. Does NOT override already-set env vars.
+# Supports: KEY=VALUE, KEY="VALUE", KEY='VALUE', comments (#), empty lines.
+# If the file does not exist, silently continues (no error).
+prizm_load_env() {
+    local env_file="${1:-.env}"
+    [[ -f "$env_file" ]] || return 0
+
+    while IFS= read -r line || [[ -n "$line" ]]; do
+        # Skip empty lines and comments
+        [[ -z "$line" || "$line" =~ ^[[:space:]]*# ]] && continue
+        # Remove inline comments (not inside quotes)
+        line="${line%%#*}"
+        # Trim whitespace
+        line="$(echo "$line" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')"
+        [[ -z "$line" ]] && continue
+        # Parse KEY=VALUE
+        if [[ "$line" =~ ^([A-Za-z_][A-Za-z0-9_]*)=(.*)$ ]]; then
+            local key="${BASH_REMATCH[1]}"
+            local val="${BASH_REMATCH[2]}"
+            # Strip surrounding quotes
+            val="${val#\"}" ; val="${val%\"}"
+            val="${val#\'}" ; val="${val%\'}"
+            # Only set if not already defined in environment
+            if [[ -z "${!key+x}" ]]; then
+                export "$key=$val"
+            fi
+        fi
+    done < "$env_file"
+}
+
+# ============================================================
+# Test mode: bootstrap prompt logging
+# ============================================================
+
+# Log bootstrap prompt content when PRIZMKIT_ENV=test.
+# Called after prompt generation, before AI CLI session spawn.
+# Usage: prizm_log_bootstrap_prompt <prompt_path> <item_id>
+prizm_log_bootstrap_prompt() {
+    local prompt_path="$1"
+    local item_id="$2"
+
+    [[ "${PRIZMKIT_ENV:-}" == "test" ]] || return 0
+    [[ -f "$prompt_path" ]] || return 0
+
+    local lines size
+    lines=$(wc -l < "$prompt_path" 2>/dev/null | tr -d ' ')
+    size=$(wc -c < "$prompt_path" 2>/dev/null | tr -d ' ')
+
+    echo ""
+    echo -e "${MAGENTA}[TEST]${NC} ════════════════════════════════════════════════════"
+    echo -e "${MAGENTA}[TEST]${NC} Bootstrap Prompt for $item_id"
+    echo -e "${MAGENTA}[TEST]${NC} Lines: $lines | Size: $((size / 1024))KB"
+    echo -e "${MAGENTA}[TEST]${NC} Path: $prompt_path"
+    echo -e "${MAGENTA}[TEST]${NC} ════════════════════════════════════════════════════"
+    cat "$prompt_path"
+    echo ""
+    echo -e "${MAGENTA}[TEST]${NC} ════════════════════════ END ═══════════════════════"
+    echo ""
+}
+
 # Detect AI CLI + platform.
 # Priority:
 #   AI_CLI env > .prizmkit/config.json > CODEBUDDY_CLI > auto-detect(cbc/claude) > error
@@ -32,6 +96,13 @@ log_success() { echo -e "${GREEN}[SUCCESS]${NC} $(date '+%Y-%m-%d %H:%M:%S') $*"
 #   PLATFORM
 #   PRIZMKIT_PLATFORM
 prizm_detect_cli_and_platform() {
+    # Load .env from project root if it exists (does not override existing env vars)
+    local _env_root
+    _env_root="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." 2>/dev/null && pwd)" || true
+    if [[ -n "$_env_root" ]]; then
+        prizm_load_env "$_env_root/.env"
+    fi
+
     local _raw_cli=""
 
     if [[ -n "${AI_CLI:-}" ]]; then

package/bundled/dev-pipeline/lib/heartbeat.sh

@@ -73,7 +73,7 @@ start_heartbeat() {
                 phase=$(python3 -c "
 import json, sys
 try:
-    with open('$progress_json') as f:
+    with open(sys.argv[1]) as f:
         d = json.load(f)
     parts = []
     if d.get('current_phase'):
@@ -85,7 +85,7 @@ try:
     print(' | '.join(parts))
 except Exception:
     sys.exit(1)
-" 2>/dev/null) && {
+" "$progress_json" 2>/dev/null) && {
                     echo -e "  ${status_icon} ${BLUE}[HEARTBEAT]${NC} ${mins}m${secs}s | log: ${size_display} | ${phase}"
                     continue
                 }

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

@@ -127,15 +127,28 @@ ORIGINAL_BRANCH=$(git -C "$PROJECT_ROOT" rev-parse --abbrev-ref HEAD 2>/dev/null
 # Branch tracking (for cleanup on interrupt)
 _DEV_BRANCH_NAME=""
 
-log_info "Cleaning $BUG_ID artifacts for full restart..."
-python3 "$SCRIPTS_DIR/update-bug-status.py" \
-    --bug-list "$BUG_LIST" \
-    --state-dir "$STATE_DIR" \
-    --bug-id "$BUG_ID" \
-    --project-root "$PROJECT_ROOT" \
-    --action clean >/dev/null 2>&1 || {
-    log_warn "Failed to clean bug artifacts (continuing with fresh session only)"
-}
+log_info "Reading retry state for $BUG_ID..."
+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")
+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 "Retry count: $RETRY_COUNT, Resume phase: $RESUME_PHASE"
 
 # ============================================================
 # Generate bootstrap prompt
@@ -149,15 +162,34 @@ mkdir -p "$SESSION_DIR/logs"
 BOOTSTRAP_PROMPT="$SESSION_DIR/bootstrap-prompt.md"
 
 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
+GEN_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
+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-bugfix-prompt.py" "${GEN_ARGS[@]}" 2>/dev/null) || {
+    log_error "Failed to generate bootstrap prompt"
+    exit 1
+}
+BUG_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
@@ -178,8 +210,9 @@ echo -e "${BOLD}  Retry Bug Fix: $BUG_ID — $BUG_TITLE${NC}"
 echo -e "${BOLD}  Severity: $BUG_SEVERITY${NC}"
 echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
 log_info "CLI: $CLI_CMD (platform: $PLATFORM)"
-if [[ -n "${MODEL:-}" ]]; then
-    log_info "Model: $MODEL"
+EFFECTIVE_MODEL="${BUG_MODEL:-${MODEL:-}}"
+if [[ -n "$EFFECTIVE_MODEL" ]]; then
+    log_info "Model: $EFFECTIVE_MODEL"
 else
     log_info "Model: (CLI default)"
 fi
@@ -208,14 +241,18 @@ if [[ "$USE_STREAM_JSON" == "true" ]]; then
     VERBOSE_FLAG="--verbose"
 fi
 
-# Spawn AI CLI session
+# Spawn AI CLI session — model priority: bug.model > $MODEL env > none
+EFFECTIVE_MODEL="${BUG_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" "$BUG_ID"
+
 case "$CLI_CMD" in
     *claude*)
         # Claude Code: prompt via -p argument, --dangerously-skip-permissions for auto-accept

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

@@ -119,16 +119,28 @@ title = re.sub(r'-+', '-', title).strip('-') or 'feature'
 print(f'{fid}-{title}')
 " 2>/dev/null)
 
-log_info "Cleaning $FEATURE_ID artifacts for full restart..."
-python3 "$SCRIPTS_DIR/update-feature-status.py" \
-    --feature-list "$FEATURE_LIST" \
-    --state-dir "$STATE_DIR" \
-    --feature-id "$FEATURE_ID" \
-    --feature-slug "$FEATURE_SLUG" \
-    --project-root "$PROJECT_ROOT" \
-    --action clean >/dev/null 2>&1 || {
-    log_warn "Failed to clean feature artifacts (continuing with fresh session only)"
-}
+log_info "Reading retry state for $FEATURE_ID..."
+RETRY_COUNT=$(python3 -c "
+import json, os
+status_path = os.path.join('$STATE_DIR', 'features', '$FEATURE_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', 'features', '$FEATURE_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
@@ -147,12 +159,17 @@ GEN_ARGS=(
     --feature-id "$FEATURE_ID"
     --session-id "$SESSION_ID"
     --run-id "$RUN_ID"
-    --retry-count 0
-    --resume-phase "null"
+    --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")
@@ -233,6 +250,9 @@ fi
 
 unset CLAUDECODE 2>/dev/null || true
 
+# Log bootstrap prompt in test mode
+prizm_log_bootstrap_prompt "$BOOTSTRAP_PROMPT" "$FEATURE_ID"
+
 case "$CLI_CMD" in
     *claude*)
         # Claude Code: prompt via -p argument, --dangerously-skip-permissions for auto-accept
@@ -367,6 +387,21 @@ if [[ "$SESSION_STATUS" == "success" ]]; then
     fi
 fi
 
+# ── Propagate completion notes for dependency context ─────────────────
+if [[ "$SESSION_STATUS" == "success" && -n "$FEATURE_SLUG" ]]; then
+    SUMMARY_PATH="$PROJECT_ROOT/.prizmkit/specs/$FEATURE_SLUG/completion-summary.json"
+    if [[ -f "$SUMMARY_PATH" ]]; then
+        python3 "$SCRIPTS_DIR/patch-completion-notes.py" \
+            --feature-list "$FEATURE_LIST" \
+            --feature-id "$FEATURE_ID" \
+            --summary "$SUMMARY_PATH" >/dev/null 2>&1 && {
+            log_info "Propagated completion notes for $FEATURE_ID"
+        } || {
+            log_warn "Failed to propagate completion notes for $FEATURE_ID"
+        }
+    fi
+fi
+
 # Update feature status
 python3 "$SCRIPTS_DIR/update-feature-status.py" \
     --feature-list "$FEATURE_LIST" \