prizmkit 1.1.1 → 1.1.3

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

@@ -0,0 +1,312 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# ============================================================
+# dev-pipeline/reset-refactor.sh - Reset a failed/stuck refactor
+#
+# Clears all state and artifacts for a refactor so it can be
+# re-executed from scratch by the pipeline.
+#
+# Usage:
+#   ./reset-refactor.sh <refactor-id|range> [options] [refactor-list.json]
+#
+# Refactor selection:
+#   R-007              Single refactor
+#   R-008:R-013        Range of refactors (inclusive)
+#   --auto-skipped     All refactors with auto_skipped status
+#   --failed           All refactors with failed status
+#   --stalled          All non-completed refactors (failed + auto_skipped)
+#
+# Options:
+#   --clean    Also delete session history and .prizmkit/specs/{slug}/ artifacts
+#   --run      After reset, immediately retry via pipeline (only with single refactor)
+#
+# Examples:
+#   ./reset-refactor.sh R-007                          # Reset status only
+#   ./reset-refactor.sh R-007 --clean                  # Reset + delete artifacts
+#   ./reset-refactor.sh R-008:R-013 --clean            # Reset range
+#   ./reset-refactor.sh --auto-skipped                 # Reset all auto_skipped
+#   ./reset-refactor.sh --failed --clean               # Reset all failed + clean
+#   ./reset-refactor.sh --stalled --clean              # Reset all non-completed
+#   ./reset-refactor.sh R-007 --clean --run            # Reset + delete + retry
+#   ./reset-refactor.sh R-007 --clean my-refactors.json  # Custom refactor list
+# ============================================================
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+STATE_DIR="$SCRIPT_DIR/refactor-state"
+SCRIPTS_DIR="$SCRIPT_DIR/scripts"
+
+# Colors
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+BOLD='\033[1m'
+NC='\033[0m'
+
+log_info()    { echo -e "${BLUE}[INFO]${NC}    $*"; }
+log_warn()    { echo -e "${YELLOW}[WARN]${NC}    $*"; }
+log_error()   { echo -e "${RED}[ERROR]${NC}   $*"; }
+log_success() { echo -e "${GREEN}[OK]${NC}      $*"; }
+
+# ============================================================
+# Parse args
+# ============================================================
+
+REFACTOR_ID=""
+REFACTOR_RANGE=""
+REFACTOR_LIST=""
+DO_CLEAN=false
+DO_RUN=false
+FILTER_MODE=""
+
+for arg in "$@"; do
+    case "$arg" in
+        --clean)          DO_CLEAN=true ;;
+        --run)            DO_RUN=true ;;
+        --auto-skipped)   FILTER_MODE="auto_skipped" ;;
+        --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 ""
+            echo "  refactor-id          Single refactor (e.g. R-007)"
+            echo "  R-008:R-013          Range of refactors (inclusive)"
+            echo "  --auto-skipped       Reset all auto_skipped refactors"
+            echo "  --failed             Reset all failed refactors"
+            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)"
+            exit 0
+            ;;
+        R-*:R-*|r-*:r-*)  REFACTOR_RANGE="$arg" ;;
+        R-*|r-*)           REFACTOR_ID="$arg" ;;
+        *)                 REFACTOR_LIST="$arg" ;;
+    esac
+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 ""
+    echo "  refactor-id          Single refactor (e.g. R-007)"
+    echo "  R-008:R-013          Range of refactors (inclusive)"
+    echo "  --auto-skipped       Reset all auto_skipped refactors"
+    echo "  --failed             Reset all failed refactors"
+    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)"
+    exit 1
+fi
+
+REFACTOR_LIST="${REFACTOR_LIST:-refactor-list.json}"
+
+# Resolve absolute path
+if [[ ! "$REFACTOR_LIST" = /* ]]; then
+    REFACTOR_LIST="$(pwd)/$REFACTOR_LIST"
+fi
+
+# ============================================================
+# Validation
+# ============================================================
+
+if [[ ! -f "$REFACTOR_LIST" ]]; then
+    log_error "Refactor list not found: $REFACTOR_LIST"
+    exit 1
+fi
+
+if [[ ! -f "$STATE_DIR/pipeline.json" ]]; then
+    log_error "No pipeline state found. Run './run-refactor.sh run' first to initialize."
+    exit 1
+fi
+
+# ============================================================
+# Resolve refactor IDs to process
+# ============================================================
+
+REFACTOR_IDS=()
+
+if [[ -n "$FILTER_MODE" ]]; then
+    # Filter by status from refactor-state/refactors/*/status.json
+    while IFS= read -r rid; do
+        [[ -n "$rid" ]] && REFACTOR_IDS+=("$rid")
+    done < <(python3 -c "
+import json, os, sys
+state_dir = '$STATE_DIR'
+filter_mode = '$FILTER_MODE'
+refactors_dir = os.path.join(state_dir, 'refactors')
+if not os.path.isdir(refactors_dir):
+    sys.exit(0)
+for rid in sorted(os.listdir(refactors_dir)):
+    status_file = os.path.join(refactors_dir, rid, 'status.json')
+    if not os.path.isfile(status_file):
+        continue
+    with open(status_file) as f:
+        status = json.load(f).get('status', '')
+    if filter_mode == 'auto_skipped' and status == 'auto_skipped':
+        print(rid)
+    elif filter_mode == 'failed' and status == 'failed':
+        print(rid)
+    elif filter_mode == 'stalled' and status in ('failed', 'auto_skipped'):
+        print(rid)
+" 2>/dev/null)
+
+    if [[ ${#REFACTOR_IDS[@]} -eq 0 ]]; then
+        log_info "No refactors found with status: $FILTER_MODE"
+        exit 0
+    fi
+    log_info "Found ${#REFACTOR_IDS[@]} refactor(s) matching --$FILTER_MODE: ${REFACTOR_IDS[*]}"
+
+elif [[ -n "$REFACTOR_RANGE" ]]; then
+    # Parse range R-NNN:R-MMM
+    RANGE_START="${REFACTOR_RANGE%%:*}"
+    RANGE_END="${REFACTOR_RANGE##*:}"
+    START_NUM=$(echo "$RANGE_START" | sed 's/[Rr]-//' | sed 's/^0*//')
+    END_NUM=$(echo "$RANGE_END" | sed 's/[Rr]-//' | sed 's/^0*//')
+
+    if [[ -z "$START_NUM" || -z "$END_NUM" || "$START_NUM" -gt "$END_NUM" ]]; then
+        log_error "Invalid range: $REFACTOR_RANGE (start must be <= end)"
+        exit 1
+    fi
+
+    for ((i=START_NUM; i<=END_NUM; i++)); do
+        REFACTOR_IDS+=("R-$(printf '%03d' "$i")")
+    done
+    log_info "Range $REFACTOR_RANGE -> ${REFACTOR_IDS[*]}"
+
+else
+    REFACTOR_IDS=("$REFACTOR_ID")
+fi
+
+# --run only works with single refactor
+if [[ "$DO_RUN" == true && ${#REFACTOR_IDS[@]} -gt 1 ]]; then
+    log_warn "--run is only supported for single refactor reset. Use './run-refactor.sh run' to resume pipeline after batch reset."
+    DO_RUN=false
+fi
+
+# ============================================================
+# Process each refactor
+# ============================================================
+
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+RESET_COUNT=0
+FAIL_COUNT=0
+
+for CUR_REFACTOR_ID in "${REFACTOR_IDS[@]}"; do
+
+    # Get refactor info from refactor list
+    REFACTOR_INFO=$(python3 -c "
+import json, sys, re
+with open('$REFACTOR_LIST') as f:
+    data = json.load(f)
+for item in data.get('refactors', []):
+    if item.get('id') == '$CUR_REFACTOR_ID':
+        title = item.get('title', '')
+        # Compute slug
+        numeric = '$CUR_REFACTOR_ID'.replace('R-', '').replace('r-', '').zfill(3)
+        slug = title.lower()
+        slug = re.sub(r'[^a-z0-9\s-]', '', slug)
+        slug = re.sub(r'[\s]+', '-', slug.strip())
+        slug = re.sub(r'-+', '-', slug).strip('-')
+        slug = '{}-{}'.format(numeric, slug)
+        print(json.dumps({'title': title, 'slug': slug, 'status': item.get('status', 'unknown')}))
+        sys.exit(0)
+sys.exit(1)
+" 2>/dev/null) || {
+        log_warn "Refactor $CUR_REFACTOR_ID not found in $REFACTOR_LIST -- skipping"
+        FAIL_COUNT=$((FAIL_COUNT + 1))
+        continue
+    }
+
+    REFACTOR_TITLE=$(echo "$REFACTOR_INFO" | python3 -c "import sys,json; print(json.load(sys.stdin)['title'])")
+    REFACTOR_SLUG=$(echo "$REFACTOR_INFO" | python3 -c "import sys,json; print(json.load(sys.stdin)['slug'])")
+
+    # -- Show current state --
+    echo ""
+    echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
+    echo -e "${BOLD}  Reset: $CUR_REFACTOR_ID — $REFACTOR_TITLE${NC}"
+    echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
+
+    STATUS_FILE="$STATE_DIR/refactors/$CUR_REFACTOR_ID/status.json"
+    if [[ -f "$STATUS_FILE" ]]; then
+        CURRENT_STATUS=$(python3 -c "import json; d=json.load(open('$STATUS_FILE')); print(d.get('status','?'))")
+        CURRENT_RETRY=$(python3 -c "import json; d=json.load(open('$STATUS_FILE')); print(d.get('retry_count',0))")
+        SESSION_COUNT=$(python3 -c "import json; d=json.load(open('$STATUS_FILE')); print(len(d.get('sessions',[])))")
+        log_info "Current status: $CURRENT_STATUS (retry $CURRENT_RETRY, $SESSION_COUNT sessions)"
+    else
+        log_info "No status file found (never executed)"
+    fi
+
+    SPECS_DIR="$PROJECT_ROOT/.prizmkit/specs/$REFACTOR_SLUG"
+    SPECS_COUNT=0
+    if [[ -d "$SPECS_DIR" ]]; then
+        SPECS_COUNT=$(find "$SPECS_DIR" -type f 2>/dev/null | wc -l | tr -d ' ')
+        log_info "PrizmKit artifacts: $SPECS_COUNT files in .prizmkit/specs/$REFACTOR_SLUG/"
+    fi
+
+    SESSIONS_DIR="$STATE_DIR/refactors/$CUR_REFACTOR_ID/sessions"
+    SESSIONS_COUNT=0
+    if [[ -d "$SESSIONS_DIR" ]]; then
+        SESSIONS_COUNT=$(find "$SESSIONS_DIR" -mindepth 1 -maxdepth 1 -type d 2>/dev/null | wc -l | tr -d ' ')
+        log_info "Session history: $SESSIONS_COUNT session(s)"
+    fi
+
+    echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
+
+    # -- Execute reset --
+    if [[ "$DO_CLEAN" == true ]]; then
+        log_info "Cleaning $CUR_REFACTOR_ID (reset + delete artifacts)..."
+        RESULT=$(python3 "$SCRIPTS_DIR/update-refactor-status.py" \
+            --refactor-list "$REFACTOR_LIST" \
+            --state-dir "$STATE_DIR" \
+            --refactor-id "$CUR_REFACTOR_ID" \
+            --project-root "$PROJECT_ROOT" \
+            --action clean 2>&1)
+    else
+        log_info "Resetting $CUR_REFACTOR_ID status..."
+        RESULT=$(python3 "$SCRIPTS_DIR/update-refactor-status.py" \
+            --refactor-list "$REFACTOR_LIST" \
+            --state-dir "$STATE_DIR" \
+            --refactor-id "$CUR_REFACTOR_ID" \
+            --action reset 2>&1)
+    fi
+
+    # Check for errors
+    if echo "$RESULT" | python3 -c "import sys,json; d=json.load(sys.stdin); sys.exit(0 if 'error' not in d else 1)" 2>/dev/null; then
+        RESET_COUNT=$((RESET_COUNT + 1))
+        if [[ "$DO_CLEAN" == true ]]; then
+            log_success "$CUR_REFACTOR_ID cleaned: status -> pending, $SESSIONS_COUNT session(s) deleted, $SPECS_COUNT artifact(s) deleted"
+        else
+            log_success "$CUR_REFACTOR_ID reset: status -> pending, retry count -> 0"
+        fi
+    else
+        ERROR_MSG=$(echo "$RESULT" | python3 -c "import sys,json; print(json.load(sys.stdin).get('error','unknown'))" 2>/dev/null || echo "$RESULT")
+        log_error "Reset $CUR_REFACTOR_ID failed: $ERROR_MSG"
+        FAIL_COUNT=$((FAIL_COUNT + 1))
+    fi
+
+done
+
+# ============================================================
+# Summary
+# ============================================================
+
+echo ""
+echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
+echo -e "${BOLD}  Reset complete: $RESET_COUNT succeeded, $FAIL_COUNT failed${NC}"
+echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
+
+echo ""
+echo -e "${BOLD}Next steps:${NC}"
+if [[ "$DO_RUN" == true && ${#REFACTOR_IDS[@]} -eq 1 ]]; then
+    log_info "Auto-retrying ${REFACTOR_IDS[0]}..."
+    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"
+    if [[ ${#REFACTOR_IDS[@]} -eq 1 ]]; then
+        log_info "  ./dev-pipeline/retry-refactor.sh ${REFACTOR_IDS[0]}        # Retry single refactor"
+    fi
+fi
+echo ""

package/bundled/dev-pipeline/{retry-bug.sh → retry-bugfix.sh}

@@ -2,19 +2,19 @@
 set -euo pipefail
 
 # ============================================================
-# dev-pipeline/retry-bug.sh - Retry a single failed bug fix
+# dev-pipeline/retry-bugfix.sh - Retry a single failed bug fix
 #
 # Runs exactly ONE AI CLI session for the specified bug, then exits.
 # Use this to manually retry a failed bug without restarting
 # the full bugfix pipeline.
 #
 # Usage:
-#   ./retry-bug.sh <bug-id> [bug-fix-list.json]
+#   ./retry-bugfix.sh <bug-id> [bug-fix-list.json]
 #
 # Examples:
-#   ./retry-bug.sh B-001
-#   ./retry-bug.sh B-001 bug-fix-list.json
-#   SESSION_TIMEOUT=3600 ./retry-bug.sh B-001
+#   ./retry-bugfix.sh B-001
+#   ./retry-bugfix.sh B-001 bug-fix-list.json
+#   SESSION_TIMEOUT=3600 ./retry-bugfix.sh B-001
 # ============================================================
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -23,68 +23,22 @@ SCRIPTS_DIR="$SCRIPT_DIR/scripts"
 
 SESSION_TIMEOUT=${SESSION_TIMEOUT:-0}
 HEARTBEAT_INTERVAL=${HEARTBEAT_INTERVAL:-30}
+AUTO_PUSH=${AUTO_PUSH:-0}
+DEV_BRANCH=${DEV_BRANCH:-""}
 
-# AI CLI detection: AI_CLI env > .prizmkit/config.json > CODEBUDDY_CLI > auto-detect
-if [[ -n "${AI_CLI:-}" ]]; then
-    CLI_CMD="$AI_CLI"
-elif [[ -f ".prizmkit/config.json" ]]; then
-    _config_cli=$(python3 -c "
-import json, sys
-try:
-    with open('.prizmkit/config.json') as f:
-        d = json.load(f)
-    v = d.get('ai_cli', '')
-    if v: print(v)
-except: pass
-" 2>/dev/null || true)
-    CLI_CMD="${_config_cli:-}"
-    if [[ -z "$CLI_CMD" ]]; then
-        if [[ -n "${CODEBUDDY_CLI:-}" ]]; then CLI_CMD="$CODEBUDDY_CLI"
-        elif command -v cbc &>/dev/null; then CLI_CMD="cbc"
-        elif command -v claude &>/dev/null; then CLI_CMD="claude"
-        else echo "ERROR: No AI CLI found. Set AI_CLI or configure .prizmkit/config.json" >&2; exit 1
-        fi
-    fi
-elif [[ -n "${CODEBUDDY_CLI:-}" ]]; then
-    CLI_CMD="$CODEBUDDY_CLI"
-elif command -v cbc &>/dev/null; then
-    CLI_CMD="cbc"
-elif command -v claude &>/dev/null; then
-    CLI_CMD="claude"
-else
-    echo "ERROR: No AI CLI found. Install CodeBuddy (cbc) or Claude Code (claude), or set AI_CLI." >&2
-    exit 1
-fi
-
-# Platform detection
-if [[ -n "${PRIZMKIT_PLATFORM:-}" ]]; then
-    PLATFORM="$PRIZMKIT_PLATFORM"
-elif [[ "$CLI_CMD" == *"claude"* ]]; then
-    PLATFORM="claude"
-else
-    PLATFORM="codebuddy"
-fi
-export PRIZMKIT_PLATFORM="$PLATFORM"
+# Source shared libraries (CLI/platform detection + logs + deps)
+source "$SCRIPT_DIR/lib/common.sh"
+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"
 
-# Colors
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-BOLD='\033[1m'
-NC='\033[0m'
-
-log_info()    { echo -e "${BLUE}[INFO]${NC}    $(date '+%Y-%m-%d %H:%M:%S') $*"; }
-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') $*"; }
-
 # ============================================================
 # Args
 # ============================================================
@@ -98,6 +52,9 @@ if [[ $# -lt 1 ]]; then
     echo "Environment Variables:"
     echo "  SESSION_TIMEOUT     Timeout in seconds (default: 0 = no limit)"
     echo "  HEARTBEAT_INTERVAL  Heartbeat interval in seconds (default: 30)"
+    echo "  AI_CLI              AI CLI command (auto-detected: cbc or claude)"
+    echo "  AUTO_PUSH           Auto-push to remote after fix (default: 0)"
+    echo "  DEV_BRANCH          Custom dev branch name (default: auto-generated)"
     exit 1
 fi
 
@@ -166,6 +123,9 @@ 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")
 
+# 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" \
@@ -202,6 +162,15 @@ python3 "$SCRIPTS_DIR/generate-bugfix-prompt.py" \
 # Run single AI CLI session
 # ============================================================
 
+# Branch lifecycle: create and checkout bugfix branch
+_branch_name="${DEV_BRANCH:-bugfix/${BUG_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 Bug Fix: $BUG_ID — $BUG_TITLE${NC}"
@@ -295,6 +264,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
 }
@@ -380,6 +353,15 @@ if [[ "$SESSION_STATUS" == "success" ]]; then
     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 bug status
 python3 "$SCRIPTS_DIR/update-bug-status.py" \
     --bug-list "$BUG_LIST" \
@@ -390,6 +372,12 @@ python3 "$SCRIPTS_DIR/update-bug-status.py" \
     --max-retries 999 \
     --action update >/dev/null 2>&1 || true
 
+# Commit bug-fix-list.json status update (pipeline management commit)
+if ! git -C "$PROJECT_ROOT" diff --quiet "$BUG_LIST" 2>/dev/null; then
+    git -C "$PROJECT_ROOT" add "$BUG_LIST"
+    git -C "$PROJECT_ROOT" commit --no-verify -m "chore($BUG_ID): update bug status" 2>/dev/null || true
+fi
+
 echo ""
 if [[ "$SESSION_STATUS" == "success" ]]; then
     log_success "════════════════════════════════════════════════════"

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

@@ -24,66 +24,23 @@ SCRIPTS_DIR="$SCRIPT_DIR/scripts"
 SESSION_TIMEOUT=${SESSION_TIMEOUT:-0}
 HEARTBEAT_INTERVAL=${HEARTBEAT_INTERVAL:-30}
 
-# AI CLI detection: AI_CLI env > .prizmkit/config.json > CODEBUDDY_CLI > auto-detect
-if [[ -n "${AI_CLI:-}" ]]; then
-    CLI_CMD="$AI_CLI"
-elif [[ -f ".prizmkit/config.json" ]]; then
-    _config_cli=$(python3 -c "
-import json, sys
-try:
-    with open('.prizmkit/config.json') as f:
-        d = json.load(f)
-    v = d.get('ai_cli', '')
-    if v: print(v)
-except: pass
-" 2>/dev/null || true)
-    CLI_CMD="${_config_cli:-}"
-    if [[ -z "$CLI_CMD" ]]; then
-        if [[ -n "${CODEBUDDY_CLI:-}" ]]; then CLI_CMD="$CODEBUDDY_CLI"
-        elif command -v cbc &>/dev/null; then CLI_CMD="cbc"
-        elif command -v claude &>/dev/null; then CLI_CMD="claude"
-        else echo "ERROR: No AI CLI found. Set AI_CLI or configure .prizmkit/config.json" >&2; exit 1
-        fi
-    fi
-elif [[ -n "${CODEBUDDY_CLI:-}" ]]; then
-    CLI_CMD="$CODEBUDDY_CLI"
-elif command -v cbc &>/dev/null; then
-    CLI_CMD="cbc"
-elif command -v claude &>/dev/null; then
-    CLI_CMD="claude"
-else
-    echo "ERROR: No AI CLI found. Install CodeBuddy (cbc) or Claude Code (claude), or set AI_CLI." >&2
-    exit 1
-fi
-
-# Platform detection
-if [[ -n "${PRIZMKIT_PLATFORM:-}" ]]; then
-    PLATFORM="$PRIZMKIT_PLATFORM"
-elif [[ "$CLI_CMD" == *"claude"* ]]; then
-    PLATFORM="claude"
-else
-    PLATFORM="codebuddy"
-fi
-export PRIZMKIT_PLATFORM="$PLATFORM"
+# Source shared common helpers (CLI/platform detection + logs + deps)
+source "$SCRIPT_DIR/lib/common.sh"
+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"
 
-# Colors
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-BOLD='\033[1m'
-NC='\033[0m'
-
-log_info()    { echo -e "${BLUE}[INFO]${NC}    $(date '+%Y-%m-%d %H:%M:%S') $*"; }
-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') $*"; }
+# Branch tracking
+_ORIGINAL_BRANCH=""
+_DEV_BRANCH_NAME=""
+AUTO_PUSH=${AUTO_PUSH:-0}
 
 # ============================================================
 # Args
@@ -120,7 +77,7 @@ if [[ ! -f "$FEATURE_LIST" ]]; then
 fi
 
 if [[ ! -f "$STATE_DIR/pipeline.json" ]]; then
-    log_error "No pipeline state found. Run './run.sh run' first to initialize."
+    log_error "No pipeline state found. Run './run-feature.sh run' first to initialize."
     exit 1
 fi
 
@@ -150,6 +107,7 @@ 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")
+_ORIGINAL_BRANCH="$ORIGINAL_BRANCH"
 FEATURE_SLUG=$(FEATURE_ID="$FEATURE_ID" FEATURE_TITLE="$FEATURE_TITLE" python3 -c "
 import os, re
 fid = os.environ['FEATURE_ID'].replace('F-', '').replace('f-', '').zfill(3)
@@ -232,6 +190,15 @@ log_info "Log: $SESSION_DIR/logs/session.log"
 echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
 echo ""
 
+# Create per-feature dev branch (consistent with run-feature.sh behavior)
+_feature_branch="${DEV_BRANCH:-dev/${FEATURE_ID}-retry-$(date +%Y%m%d%H%M)}"
+if branch_create "$PROJECT_ROOT" "$_feature_branch" "$_ORIGINAL_BRANCH"; then
+    _DEV_BRANCH_NAME="$_feature_branch"
+    log_info "Dev branch: $_feature_branch"
+else
+    log_warn "Failed to create dev branch; running on current branch"
+fi
+
 SESSION_LOG="$SESSION_DIR/logs/session.log"
 PROGRESS_JSON="$SESSION_DIR/logs/progress.json"
 
@@ -409,6 +376,26 @@ python3 "$SCRIPTS_DIR/update-feature-status.py" \
     --max-retries 999 \
     --action update >/dev/null 2>&1 || true
 
+# Commit feature-list.json status update (pipeline management commit)
+if ! git -C "$PROJECT_ROOT" diff --quiet "$FEATURE_LIST" 2>/dev/null; then
+    git -C "$PROJECT_ROOT" add "$FEATURE_LIST"
+    git -C "$PROJECT_ROOT" commit --no-verify -m "chore($FEATURE_ID): update feature status" 2>/dev/null || true
+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
+elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
+    # Session failed — return to original branch, preserve dev branch for inspection
+    git -C "$PROJECT_ROOT" checkout "$_ORIGINAL_BRANCH" 2>/dev/null || true
+    log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
+    _DEV_BRANCH_NAME=""
+fi
+
 echo ""
 if [[ "$SESSION_STATUS" == "success" ]]; then
     log_success "════════════════════════════════════════════════════"