prizmkit 1.1.7 → 1.1.9

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

@@ -9,20 +9,23 @@ set -euo pipefail
 # the full refactor pipeline.
 #
 # Usage:
-#   ./retry-refactor.sh <refactor-id> [refactor-list.json]
+#   ./retry-refactor.sh <refactor-id> [.prizmkit/plans/refactor-list.json]
 #
 # Examples:
 #   ./retry-refactor.sh R-001
-#   ./retry-refactor.sh R-001 refactor-list.json
+#   ./retry-refactor.sh R-001 .prizmkit/plans/refactor-list.json
 #   SESSION_TIMEOUT=3600 ./retry-refactor.sh R-001
 # ============================================================
 
 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"
 
 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"
@@ -31,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"
 
@@ -39,10 +45,10 @@ detect_stream_json_support "$CLI_CMD"
 # ============================================================
 
 if [[ $# -lt 1 ]]; then
-    echo "Usage: $0 <refactor-id> [refactor-list.json]"
+    echo "Usage: $0 <refactor-id> [.prizmkit/plans/refactor-list.json]"
     echo ""
     echo "  refactor-id           Refactor to retry (e.g. R-001)"
-    echo "  refactor-list.json    Path to refactor list (default: refactor-list.json)"
+    echo "  refactor-list.json    Path to refactor list (default: .prizmkit/plans/refactor-list.json)"
     echo ""
     echo "Environment Variables:"
     echo "  SESSION_TIMEOUT     Timeout in seconds (default: 0 = no limit)"
@@ -51,7 +57,7 @@ if [[ $# -lt 1 ]]; then
 fi
 
 REFACTOR_ID="$1"
-REFACTOR_LIST="${2:-refactor-list.json}"
+REFACTOR_LIST="${2:-.prizmkit/plans/refactor-list.json}"
 
 if [[ ! "$REFACTOR_LIST" = /* ]]; then
     REFACTOR_LIST="$(pwd)/$REFACTOR_LIST"
@@ -115,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
@@ -137,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
@@ -187,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
@@ -244,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
 }
@@ -329,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" \