prizmkit 1.1.7 → 1.1.9

package/bundled/dev-pipeline/reset-bug.sh

@@ -8,7 +8,7 @@ set -euo pipefail
 # re-executed from scratch by the pipeline.
 #
 # Usage:
-#   ./reset-bug.sh <bug-id|range> [options] [bug-fix-list.json]
+#   ./reset-bug.sh <bug-id|range> [options] [.prizmkit/plans/bug-fix-list.json]
 #
 # Bug selection:
 #   B-007              Single bug
@@ -33,7 +33,8 @@ set -euo pipefail
 # ============================================================
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-STATE_DIR="$SCRIPT_DIR/bugfix-state"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+STATE_DIR="${PROJECT_ROOT}/.prizmkit/state/bugfix"
 SCRIPTS_DIR="$SCRIPT_DIR/scripts"
 
 # Colors
@@ -68,7 +69,7 @@ for arg in "$@"; do
         --failed)         FILTER_MODE="failed" ;;
         --stalled)        FILTER_MODE="stalled" ;;
         -h|--help)
-            echo "Usage: $0 <bug-id|range> [--clean] [--run] [--auto-skipped|--failed|--stalled] [bug-fix-list.json]"
+            echo "Usage: $0 <bug-id|range> [--clean] [--run] [--auto-skipped|--failed|--stalled] [.prizmkit/plans/bug-fix-list.json]"
             echo ""
             echo "  bug-id              Single bug (e.g. B-007)"
             echo "  B-008:B-013         Range of bugs (inclusive)"
@@ -77,7 +78,7 @@ for arg in "$@"; do
             echo "  --stalled           Reset all non-completed (failed + auto_skipped)"
             echo "  --clean             Delete session history and .prizmkit artifacts"
             echo "  --run               Retry immediately after reset (single bug only)"
-            echo "  bug-fix-list.json   Path to bug fix list (default: bug-fix-list.json)"
+            echo "  .prizmkit/plans/bug-fix-list.json   Path to bug fix list (default: .prizmkit/plans/bug-fix-list.json)"
             exit 0
             ;;
         B-*:B-*|b-*:b-*)  BUG_RANGE="$arg" ;;
@@ -87,7 +88,7 @@ for arg in "$@"; do
 done
 
 if [[ -z "$BUG_ID" && -z "$BUG_RANGE" && -z "$FILTER_MODE" ]]; then
-    echo "Usage: $0 <bug-id|range> [--clean] [--run] [--auto-skipped|--failed|--stalled] [bug-fix-list.json]"
+    echo "Usage: $0 <bug-id|range> [--clean] [--run] [--auto-skipped|--failed|--stalled] [.prizmkit/plans/bug-fix-list.json]"
     echo ""
     echo "  bug-id              Single bug (e.g. B-007)"
     echo "  B-008:B-013         Range of bugs (inclusive)"
@@ -96,11 +97,11 @@ if [[ -z "$BUG_ID" && -z "$BUG_RANGE" && -z "$FILTER_MODE" ]]; then
     echo "  --stalled           Reset all non-completed (failed + auto_skipped)"
     echo "  --clean             Delete session history and .prizmkit artifacts"
     echo "  --run               Retry immediately after reset (single bug only)"
-    echo "  bug-fix-list.json   Path to bug fix list (default: bug-fix-list.json)"
+    echo "  .prizmkit/plans/bug-fix-list.json   Path to bug fix list (default: .prizmkit/plans/bug-fix-list.json)"
     exit 1
 fi
 
-BUG_LIST="${BUG_LIST:-bug-fix-list.json}"
+BUG_LIST="${BUG_LIST:-.prizmkit/plans/bug-fix-list.json}"
 
 # Resolve absolute path
 if [[ ! "$BUG_LIST" = /* ]]; then
@@ -128,7 +129,7 @@ fi
 BUG_IDS=()
 
 if [[ -n "$FILTER_MODE" ]]; then
-    # Filter by status from bugfix-state/bugs/*/status.json
+    # Filter by status from .prizmkit/state/bugfix/bugs/*/status.json
     while IFS= read -r bid; do
         [[ -n "$bid" ]] && BUG_IDS+=("$bid")
     done < <(python3 -c "
@@ -296,7 +297,7 @@ if [[ "$DO_RUN" == true && ${#BUG_IDS[@]} -eq 1 ]]; then
     echo ""
     exec "$SCRIPT_DIR/retry-bugfix.sh" "${BUG_IDS[0]}" "$BUG_LIST"
 else
-    log_info "  ./dev-pipeline/run-bugfix.sh run bug-fix-list.json         # Resume pipeline from first pending"
+    log_info "  ./dev-pipeline/run-bugfix.sh run .prizmkit/plans/bug-fix-list.json         # Resume pipeline from first pending"
     if [[ ${#BUG_IDS[@]} -eq 1 ]]; then
         log_info "  ./dev-pipeline/retry-bugfix.sh ${BUG_IDS[0]}        # Retry single bug"
     fi

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

@@ -8,7 +8,7 @@ set -euo pipefail
 # re-executed from scratch by the pipeline.
 #
 # Usage:
-#   ./reset-feature.sh <feature-id|range> [options] [feature-list.json]
+#   ./reset-feature.sh <feature-id|range> [options] [.prizmkit/plans/feature-list.json]
 #
 # Feature selection:
 #   F-007              Single feature
@@ -33,7 +33,8 @@ set -euo pipefail
 # ============================================================
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-STATE_DIR="$SCRIPT_DIR/state"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+STATE_DIR="${PROJECT_ROOT}/.prizmkit/state/features"
 SCRIPTS_DIR="$SCRIPT_DIR/scripts"
 
 # Colors
@@ -68,7 +69,7 @@ for arg in "$@"; do
         --failed)         FILTER_MODE="failed" ;;
         --stalled)        FILTER_MODE="stalled" ;;
         -h|--help)
-            echo "Usage: $0 <feature-id|range> [--clean] [--run] [--auto-skipped|--failed|--stalled] [feature-list.json]"
+            echo "Usage: $0 <feature-id|range> [--clean] [--run] [--auto-skipped|--failed|--stalled] [.prizmkit/plans/feature-list.json]"
             echo ""
             echo "  feature-id          Single feature (e.g. F-007)"
             echo "  F-008:F-013         Range of features (inclusive)"
@@ -77,7 +78,7 @@ for arg in "$@"; do
             echo "  --stalled           Reset all non-completed (failed + auto_skipped)"
             echo "  --clean             Delete session history and .prizmkit artifacts"
             echo "  --run               Retry immediately after reset (single feature only)"
-            echo "  feature-list.json   Path to feature list (default: feature-list.json)"
+            echo "  .prizmkit/plans/feature-list.json   Path to feature list (default: .prizmkit/plans/feature-list.json)"
             exit 0
             ;;
         F-*:F-*|f-*:f-*)  FEATURE_RANGE="$arg" ;;
@@ -87,7 +88,7 @@ for arg in "$@"; do
 done
 
 if [[ -z "$FEATURE_ID" && -z "$FEATURE_RANGE" && -z "$FILTER_MODE" ]]; then
-    echo "Usage: $0 <feature-id|range> [--clean] [--run] [--auto-skipped|--failed|--stalled] [feature-list.json]"
+    echo "Usage: $0 <feature-id|range> [--clean] [--run] [--auto-skipped|--failed|--stalled] [.prizmkit/plans/feature-list.json]"
     echo ""
     echo "  feature-id          Single feature (e.g. F-007)"
     echo "  F-008:F-013         Range of features (inclusive)"
@@ -96,11 +97,11 @@ if [[ -z "$FEATURE_ID" && -z "$FEATURE_RANGE" && -z "$FILTER_MODE" ]]; then
     echo "  --stalled           Reset all non-completed (failed + auto_skipped)"
     echo "  --clean             Delete session history and .prizmkit artifacts"
     echo "  --run               Retry immediately after reset (single feature only)"
-    echo "  feature-list.json   Path to feature list (default: feature-list.json)"
+    echo "  .prizmkit/plans/feature-list.json   Path to feature list (default: .prizmkit/plans/feature-list.json)"
     exit 1
 fi
 
-FEATURE_LIST="${FEATURE_LIST:-feature-list.json}"
+FEATURE_LIST="${FEATURE_LIST:-.prizmkit/plans/feature-list.json}"
 
 # Resolve absolute path
 if [[ ! "$FEATURE_LIST" = /* ]]; then
@@ -305,7 +306,7 @@ if [[ "$DO_RUN" == true && ${#FEATURE_IDS[@]} -eq 1 ]]; then
     echo ""
     exec "$SCRIPT_DIR/retry-feature.sh" "${FEATURE_IDS[0]}" "$FEATURE_LIST"
 else
-    log_info "  ./dev-pipeline/run-feature.sh run feature-list.json         # Resume pipeline from first pending"
+    log_info "  ./dev-pipeline/run-feature.sh run .prizmkit/plans/feature-list.json         # Resume pipeline from first pending"
     if [[ ${#FEATURE_IDS[@]} -eq 1 ]]; then
         log_info "  ./dev-pipeline/retry-feature.sh ${FEATURE_IDS[0]}        # Retry single feature"
     fi

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

@@ -8,7 +8,7 @@ set -euo pipefail
 # re-executed from scratch by the pipeline.
 #
 # Usage:
-#   ./reset-refactor.sh <refactor-id|range> [options] [refactor-list.json]
+#   ./reset-refactor.sh <refactor-id|range> [options] [.prizmkit/plans/refactor-list.json]
 #
 # Refactor selection:
 #   R-007              Single refactor
@@ -33,7 +33,8 @@ set -euo pipefail
 # ============================================================
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-STATE_DIR="$SCRIPT_DIR/refactor-state"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+STATE_DIR="${PROJECT_ROOT}/.prizmkit/state/refactor"
 SCRIPTS_DIR="$SCRIPT_DIR/scripts"
 
 # Colors
@@ -68,7 +69,7 @@ for arg in "$@"; do
         --failed)         FILTER_MODE="failed" ;;
         --stalled)        FILTER_MODE="stalled" ;;
         -h|--help)
-            echo "Usage: $0 <refactor-id|range> [--clean] [--run] [--auto-skipped|--failed|--stalled] [refactor-list.json]"
+            echo "Usage: $0 <refactor-id|range> [--clean] [--run] [--auto-skipped|--failed|--stalled] [.prizmkit/plans/refactor-list.json]"
             echo ""
             echo "  refactor-id          Single refactor (e.g. R-007)"
             echo "  R-008:R-013          Range of refactors (inclusive)"
@@ -77,7 +78,7 @@ for arg in "$@"; do
             echo "  --stalled            Reset all non-completed (failed + auto_skipped)"
             echo "  --clean              Delete session history and .prizmkit artifacts"
             echo "  --run                Retry immediately after reset (single refactor only)"
-            echo "  refactor-list.json   Path to refactor list (default: refactor-list.json)"
+            echo "  .prizmkit/plans/refactor-list.json   Path to refactor list (default: .prizmkit/plans/refactor-list.json)"
             exit 0
             ;;
         R-*:R-*|r-*:r-*)  REFACTOR_RANGE="$arg" ;;
@@ -87,7 +88,7 @@ for arg in "$@"; do
 done
 
 if [[ -z "$REFACTOR_ID" && -z "$REFACTOR_RANGE" && -z "$FILTER_MODE" ]]; then
-    echo "Usage: $0 <refactor-id|range> [--clean] [--run] [--auto-skipped|--failed|--stalled] [refactor-list.json]"
+    echo "Usage: $0 <refactor-id|range> [--clean] [--run] [--auto-skipped|--failed|--stalled] [.prizmkit/plans/refactor-list.json]"
     echo ""
     echo "  refactor-id          Single refactor (e.g. R-007)"
     echo "  R-008:R-013          Range of refactors (inclusive)"
@@ -96,11 +97,11 @@ if [[ -z "$REFACTOR_ID" && -z "$REFACTOR_RANGE" && -z "$FILTER_MODE" ]]; then
     echo "  --stalled            Reset all non-completed (failed + auto_skipped)"
     echo "  --clean              Delete session history and .prizmkit artifacts"
     echo "  --run                Retry immediately after reset (single refactor only)"
-    echo "  refactor-list.json   Path to refactor list (default: refactor-list.json)"
+    echo "  .prizmkit/plans/refactor-list.json   Path to refactor list (default: .prizmkit/plans/refactor-list.json)"
     exit 1
 fi
 
-REFACTOR_LIST="${REFACTOR_LIST:-refactor-list.json}"
+REFACTOR_LIST="${REFACTOR_LIST:-.prizmkit/plans/refactor-list.json}"
 
 # Resolve absolute path
 if [[ ! "$REFACTOR_LIST" = /* ]]; then
@@ -128,7 +129,7 @@ fi
 REFACTOR_IDS=()
 
 if [[ -n "$FILTER_MODE" ]]; then
-    # Filter by status from refactor-state/refactors/*/status.json
+    # Filter by status from .prizmkit/state/refactor/refactors/*/status.json
     while IFS= read -r rid; do
         [[ -n "$rid" ]] && REFACTOR_IDS+=("$rid")
     done < <(python3 -c "
@@ -304,7 +305,7 @@ if [[ "$DO_RUN" == true && ${#REFACTOR_IDS[@]} -eq 1 ]]; then
     echo ""
     exec "$SCRIPT_DIR/retry-refactor.sh" "${REFACTOR_IDS[0]}" "$REFACTOR_LIST"
 else
-    log_info "  ./dev-pipeline/run-refactor.sh run refactor-list.json         # Resume pipeline from first pending"
+    log_info "  ./dev-pipeline/run-refactor.sh run .prizmkit/plans/refactor-list.json         # Resume pipeline from first pending"
     if [[ ${#REFACTOR_IDS[@]} -eq 1 ]]; then
         log_info "  ./dev-pipeline/retry-refactor.sh ${REFACTOR_IDS[0]}        # Retry single refactor"
     fi

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

@@ -9,16 +9,17 @@ set -euo pipefail
 # the full bugfix pipeline.
 #
 # Usage:
-#   ./retry-bugfix.sh <bug-id> [bug-fix-list.json]
+#   ./retry-bugfix.sh <bug-id> [.prizmkit/plans/bug-fix-list.json]
 #
 # Examples:
 #   ./retry-bugfix.sh B-001
-#   ./retry-bugfix.sh B-001 bug-fix-list.json
+#   ./retry-bugfix.sh B-001 .prizmkit/plans/bug-fix-list.json
 #   SESSION_TIMEOUT=3600 ./retry-bugfix.sh B-001
 # ============================================================
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-STATE_DIR="$SCRIPT_DIR/bugfix-state"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+STATE_DIR="${PROJECT_ROOT}/.prizmkit/state/bugfix"
 SCRIPTS_DIR="$SCRIPT_DIR/scripts"
 
 SESSION_TIMEOUT=${SESSION_TIMEOUT:-0}
@@ -44,10 +45,10 @@ detect_stream_json_support "$CLI_CMD"
 # ============================================================
 
 if [[ $# -lt 1 ]]; then
-    echo "Usage: $0 <bug-id> [bug-fix-list.json]"
+    echo "Usage: $0 <bug-id> [.prizmkit/plans/bug-fix-list.json]"
     echo ""
     echo "  bug-id              Bug to retry (e.g. B-001)"
-    echo "  bug-fix-list.json   Path to bug fix list (default: bug-fix-list.json)"
+    echo "  bug-fix-list.json   Path to bug fix list (default: .prizmkit/plans/bug-fix-list.json)"
     echo ""
     echo "Environment Variables:"
     echo "  SESSION_TIMEOUT     Timeout in seconds (default: 0 = no limit)"
@@ -59,7 +60,7 @@ if [[ $# -lt 1 ]]; then
 fi
 
 BUG_ID="$1"
-BUG_LIST="${2:-bug-fix-list.json}"
+BUG_LIST="${2:-.prizmkit/plans/bug-fix-list.json}"
 
 if [[ ! "$BUG_LIST" = /* ]]; then
     BUG_LIST="$(pwd)/$BUG_LIST"
@@ -126,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
@@ -148,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
@@ -177,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
@@ -207,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

@@ -9,16 +9,17 @@ set -euo pipefail
 # the full pipeline.
 #
 # Usage:
-#   ./retry-feature.sh <feature-id> [feature-list.json]
+#   ./retry-feature.sh <feature-id> [.prizmkit/plans/feature-list.json]
 #
 # Examples:
 #   ./retry-feature.sh F-007
-#   ./retry-feature.sh F-007 feature-list.json
+#   ./retry-feature.sh F-007 .prizmkit/plans/feature-list.json
 #   SESSION_TIMEOUT=3600 ./retry-feature.sh F-007  # with 1h timeout
 # ============================================================
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-STATE_DIR="$SCRIPT_DIR/state"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+STATE_DIR="${PROJECT_ROOT}/.prizmkit/state/features"
 SCRIPTS_DIR="$SCRIPT_DIR/scripts"
 
 SESSION_TIMEOUT=${SESSION_TIMEOUT:-0}
@@ -47,10 +48,10 @@ AUTO_PUSH=${AUTO_PUSH:-0}
 # ============================================================
 
 if [[ $# -lt 1 ]]; then
-    echo "Usage: $0 <feature-id> [feature-list.json]"
+    echo "Usage: $0 <feature-id> [.prizmkit/plans/feature-list.json]"
     echo ""
     echo "  feature-id          Feature to retry (e.g. F-007)"
-    echo "  feature-list.json   Path to feature list (default: feature-list.json)"
+    echo "  feature-list.json   Path to feature list (default: .prizmkit/plans/feature-list.json)"
     echo ""
     echo "Environment Variables:"
     echo "  SESSION_TIMEOUT     Timeout in seconds (default: 0 = no limit)"
@@ -60,7 +61,7 @@ if [[ $# -lt 1 ]]; then
 fi
 
 FEATURE_ID="$1"
-FEATURE_LIST="${2:-feature-list.json}"
+FEATURE_LIST="${2:-.prizmkit/plans/feature-list.json}"
 
 # Resolve absolute path
 if [[ ! "$FEATURE_LIST" = /* ]]; then
@@ -118,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
@@ -146,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")
@@ -232,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
@@ -366,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" \