prizmkit 1.1.10 → 1.1.13

package/bundled/VERSION.json

@@ -1,5 +1,5 @@
 {
-  "frameworkVersion": "1.1.10",
-  "bundledAt": "2026-04-08T15:25:57.526Z",
-  "bundledFrom": "a243cb1"
+  "frameworkVersion": "1.1.13",
+  "bundledAt": "2026-04-09T09:50:44.583Z",
+  "bundledFrom": "fea93ab"
 }

package/bundled/dev-pipeline/README.md

@@ -80,33 +80,7 @@ If `.prizmkit/plans/feature-list.json` path is omitted, defaults to `.prizmkit/p
 
 ---
 
-### `retry-feature.sh` — Retry Single Failed Feature
-
-Runs exactly ONE AI CLI session for a specified feature, then exits.
-
-```bash
-./retry-feature.sh <feature-id> [.prizmkit/plans/feature-list.json]
-```
-
-**What it does:**
-1. Cleans feature artifacts for a fresh restart
-2. Generates a fresh bootstrap prompt
-3. Runs exactly one AI CLI session with heartbeat monitoring
-4. Updates feature status based on the result
-5. Exits (does not continue to other features)
-
-**Examples:**
-
-```bash
-./dev-pipeline/retry-feature.sh F-007
-./dev-pipeline/retry-feature.sh F-007 .prizmkit/plans/feature-list.json
-SESSION_TIMEOUT=7200 ./dev-pipeline/retry-feature.sh F-007
-MODEL=claude-opus-4.6 ./dev-pipeline/retry-feature.sh F-007
-```
-
----
-
-### `reset-feature.sh` — Reset Failed/Stuck Feature
+### `reset-feature.sh` — Reset & Retry Failed/Stuck Feature
 
 Resets a feature's state so it can be re-executed from scratch.
 
@@ -117,7 +91,7 @@ Resets a feature's state so it can be re-executed from scratch.
 | Flag | Description |
 |------|-------------|
 | `--clean` | Delete session history + `.prizmkit/specs/{slug}/` artifacts |
-| `--run` | Immediately retry after reset (calls `retry-feature.sh`) |
+| `--run` | Immediately run after reset |
 
 **What gets cleaned with `--clean`:**
 - `state/features/F-XXX/sessions/` — all session logs and prompts
@@ -209,16 +183,6 @@ Processes bugs by: **severity** (critical > high > medium > low) then **priority
 
 ---
 
-### `retry-bugfix.sh` — Retry Single Failed Bug
-
-```bash
-./retry-bugfix.sh <bug-id> [.prizmkit/plans/bug-fix-list.json]
-```
-
-Same behavior as `retry-feature.sh` but for bugs. Cleans bug artifacts, generates bugfix prompt, runs one session, updates status.
-
----
-
 ### `launch-bugfix-daemon.sh` — Bug-Fix Pipeline Daemon
 
 Identical interface to `launch-feature-daemon.sh` but manages `run-bugfix.sh` in background.
@@ -325,7 +289,7 @@ python3 scripts/generate-bootstrap-prompt.py \
 { "success": true, "output_path": "/absolute/path/prompt.md", "model": "claude-sonnet-4.6" }
 ```
 
-The `model` field is extracted from the feature's `"model"` field in .prizmkit/plans/feature-list.json (empty string if not specified). Used by `run-feature.sh` and `retry-feature.sh` to set `--model` on the AI CLI.
+The `model` field is extracted from the feature's `"model"` field in .prizmkit/plans/feature-list.json (empty string if not specified). Used by `run-feature.sh` to set `--model` on the AI CLI.
 
 **Conditional blocks resolved:**
 - `{{IF_RESUME}}` / `{{IF_FRESH_START}}` — Resume vs fresh start
@@ -569,7 +533,7 @@ Also exports: `log_info`, `log_warn`, `log_error`, `log_success` (with timestamp
 | Variable | Default | Used By | Description |
 |----------|---------|---------|-------------|
 | `MAX_RETRIES` | `3` | run-feature.sh | Max retry attempts per feature before marking as failed |
-| `SESSION_TIMEOUT` | `0` (none) | run-feature.sh, retry-feature.sh, run-bugfix.sh, retry-bugfix.sh | Timeout in seconds per AI CLI session. 0 = no timeout |
+| `SESSION_TIMEOUT` | `0` (none) | run-feature.sh, run-bugfix.sh | Timeout in seconds per AI CLI session. 0 = no timeout |
 | `PIPELINE_MODE` | (auto) | run-feature.sh, launch-feature-daemon.sh | Override mode for all features: `lite\|standard\|full` |
 | `ENABLE_CRITIC` | `false` | run-feature.sh, launch-feature-daemon.sh | Enable adversarial critic review: `true\|false` |
 | `DEV_BRANCH` | auto-generated | run-feature.sh | Custom git branch name (default: `dev/{feature-id}-{timestamp}`) |
@@ -581,15 +545,15 @@ Also exports: `log_info`, `log_warn`, `log_error`, `log_success` (with timestamp
 |----------|---------|---------|-------------|
 | `AI_CLI` | auto-detect | all shell scripts | AI CLI command name. Auto-detects `cbc` or `claude` |
 | `PRIZMKIT_PLATFORM` | auto-detect | all shell scripts | Force platform: `codebuddy` or `claude` |
-| `MODEL` | (none) | run-feature.sh, retry-feature.sh, run-bugfix.sh, retry-bugfix.sh | AI model fallback. Overridden by per-feature `model` field. See [Model Selection](#model-selection) |
+| `MODEL` | (none) | run-feature.sh, run-bugfix.sh | AI model fallback. Overridden by per-feature `model` field. See [Model Selection](#model-selection) |
 | `CODEBUDDY_CLI` | (deprecated) | all shell scripts | Legacy alias for `AI_CLI`. Prefer `AI_CLI` |
-| `VERBOSE` | `0` | run-feature.sh, retry-feature.sh | Set to `1` to enable `--verbose` on AI CLI |
+| `VERBOSE` | `0` | run-feature.sh | Set to `1` to enable `--verbose` on AI CLI |
 
 ### Monitoring & Logging
 
 | Variable | Default | Used By | Description |
 |----------|---------|---------|-------------|
-| `HEARTBEAT_INTERVAL` | `30` | run-feature.sh, retry-feature.sh | Seconds between heartbeat log output |
+| `HEARTBEAT_INTERVAL` | `30` | run-feature.sh | Seconds between heartbeat log output |
 | `HEARTBEAT_STALE_THRESHOLD` | `600` | run-feature.sh | Seconds before a session is considered stale/stuck |
 | `LOG_CLEANUP_ENABLED` | `1` | run-feature.sh | Run log cleanup before pipeline execution |
 | `LOG_RETENTION_DAYS` | `14` | run-feature.sh | Delete logs older than N days |
@@ -643,7 +607,7 @@ Specify a model for individual features in `.prizmkit/plans/feature-list.json`:
 MODEL=claude-sonnet-4.6 ./dev-pipeline/run-feature.sh run .prizmkit/plans/feature-list.json
 
 # Retry with Opus
-MODEL=claude-opus-4.6 ./dev-pipeline/retry-feature.sh F-007
+MODEL=claude-opus-4.6 ./dev-pipeline/reset-feature.sh F-007 --clean --run
 
 # Test which model the CLI is using
 MODEL=claude-sonnet-4.6 ./dev-pipeline/run-feature.sh test-cli
@@ -890,11 +854,11 @@ run-bugfix.sh main loop
 ```
 dev-pipeline/
 +-- run-feature.sh                           # Main pipeline runner (features)
-+-- retry-feature.sh                 # Retry single failed feature
++-- reset-feature.sh                 # Reset & retry failed feature
 +-- reset-feature.sh                 # Reset/clean feature for re-execution
 +-- launch-feature-daemon.sh                 # Background daemon for feature pipeline
 +-- run-bugfix.sh                    # Bug-fix pipeline runner
-+-- retry-bugfix.sh                     # Retry single failed bug
++-- reset-bugfix.sh                     # Reset & retry failed bug
 +-- launch-bugfix-daemon.sh          # Background daemon for bugfix pipeline
 +-- README.md                        # This file
 +-- .gitignore                       # Ignores .prizmkit/state/, __pycache__/

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

@@ -4,8 +4,12 @@ set -euo pipefail
 # ============================================================
 # dev-pipeline/reset-bug.sh - Reset a failed/stuck bug fix
 #
-# Clears all state and artifacts for a bug so it can be
-# re-executed from scratch by the pipeline.
+# Resets status and discards uncommitted working tree changes on
+# the bugfix branch, then returns to the original branch. Session
+# history and .prizmkit artifacts are preserved for debugging.
+#
+# With --clean, also deletes session history, .prizmkit/bugfix/
+# artifacts, and the bugfix branch itself.
 #
 # Usage:
 #   ./reset-bug.sh <bug-id|range> [options] [.prizmkit/plans/bug-fix-list.json]
@@ -18,12 +22,18 @@ set -euo pipefail
 #   --stalled          All non-completed bugs (failed + auto_skipped)
 #
 # Options:
-#   --clean    Also delete session history and .prizmkit/bugfix/{BUG_ID}/ artifacts
+#   --clean    Also delete session history, .prizmkit/bugfix/{BUG_ID}/ artifacts, and bugfix branch
 #   --run      After reset, immediately retry via pipeline (only with single bug)
 #
+# Normal reset (no --clean):
+#   - Resets status → pending, retry_count → 0
+#   - Discards uncommitted changes on bugfix branch (git checkout -- . && git clean -fd)
+#   - Returns to default branch (main/master)
+#   - Preserves bugfix branch, session history, and .prizmkit artifacts for debugging
+#
 # Examples:
-#   ./reset-bug.sh B-007                          # Reset status only
-#   ./reset-bug.sh B-007 --clean                  # Reset + delete artifacts
+#   ./reset-bug.sh B-007                          # Reset status + discard changes
+#   ./reset-bug.sh B-007 --clean                  # Reset + delete everything
 #   ./reset-bug.sh B-008:B-013 --clean            # Reset range
 #   ./reset-bug.sh --auto-skipped                 # Reset all auto_skipped
 #   ./reset-bug.sh --failed --clean               # Reset all failed + clean
@@ -76,7 +86,7 @@ for arg in "$@"; do
             echo "  --auto-skipped      Reset all auto_skipped bugs"
             echo "  --failed            Reset all failed bugs"
             echo "  --stalled           Reset all non-completed (failed + auto_skipped)"
-            echo "  --clean             Delete session history and .prizmkit artifacts"
+            echo "  --clean             Delete session history, .prizmkit artifacts, and bugfix branch"
             echo "  --run               Retry immediately after reset (single bug only)"
             echo "  .prizmkit/plans/bug-fix-list.json   Path to bug fix list (default: .prizmkit/plans/bug-fix-list.json)"
             exit 0
@@ -194,6 +204,18 @@ PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 RESET_COUNT=0
 FAIL_COUNT=0
 
+# Detect default branch (main or master)
+DEFAULT_BRANCH=$(git -C "$PROJECT_ROOT" symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@' || echo "")
+if [[ -z "$DEFAULT_BRANCH" ]]; then
+    if git -C "$PROJECT_ROOT" rev-parse --verify main >/dev/null 2>&1; then
+        DEFAULT_BRANCH="main"
+    elif git -C "$PROJECT_ROOT" rev-parse --verify master >/dev/null 2>&1; then
+        DEFAULT_BRANCH="master"
+    else
+        DEFAULT_BRANCH=$(git -C "$PROJECT_ROOT" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
+    fi
+fi
+
 for CUR_BUG_ID in "${BUG_IDS[@]}"; do
 
     # Get bug info from bug fix list
@@ -247,6 +269,58 @@ sys.exit(1)
 
     echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
 
+    # ── Git cleanup: discard dev branch changes ──
+    # Find dev branches matching this bug (pattern: bugfix/{BUG_ID}-*)
+    DEV_BRANCHES=$(git -C "$PROJECT_ROOT" branch --list "bugfix/${CUR_BUG_ID}-*" 2>/dev/null | sed 's/^[* ]*//')
+    CURRENT_BRANCH=$(git -C "$PROJECT_ROOT" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")
+
+    if [[ -n "$DEV_BRANCHES" ]]; then
+        while IFS= read -r branch; do
+            [[ -z "$branch" ]] && continue
+            if [[ "$CURRENT_BRANCH" == "$branch" ]]; then
+                # We're on the dev branch — discard uncommitted changes and return to default
+                log_info "Discarding uncommitted changes on dev branch: $branch"
+                git -C "$PROJECT_ROOT" reset HEAD 2>/dev/null || true
+                git -C "$PROJECT_ROOT" checkout -- . 2>/dev/null || true
+                git -C "$PROJECT_ROOT" clean -fd 2>/dev/null || true
+                log_info "Switching to $DEFAULT_BRANCH..."
+                if ! git -C "$PROJECT_ROOT" checkout "$DEFAULT_BRANCH" 2>/dev/null; then
+                    log_warn "Failed to checkout $DEFAULT_BRANCH — staying on $branch"
+                else
+                    CURRENT_BRANCH="$DEFAULT_BRANCH"
+                fi
+            else
+                # Not on the dev branch — discard its uncommitted changes
+                _stashed=false
+                _dirty=""
+                _dirty=$(git -C "$PROJECT_ROOT" status --porcelain 2>/dev/null || true)
+                if [[ -n "$_dirty" ]]; then
+                    git -C "$PROJECT_ROOT" stash push --include-untracked -m "reset-bug-temp" 2>/dev/null && _stashed=true
+                fi
+                if git -C "$PROJECT_ROOT" checkout "$branch" 2>/dev/null; then
+                    log_info "Discarding uncommitted changes on dev branch: $branch"
+                    git -C "$PROJECT_ROOT" reset HEAD 2>/dev/null || true
+                    git -C "$PROJECT_ROOT" checkout -- . 2>/dev/null || true
+                    git -C "$PROJECT_ROOT" clean -fd 2>/dev/null || true
+                    git -C "$PROJECT_ROOT" checkout "$CURRENT_BRANCH" 2>/dev/null || true
+                else
+                    log_warn "Could not checkout $branch to discard changes"
+                fi
+                [[ "$_stashed" == true ]] && git -C "$PROJECT_ROOT" stash pop 2>/dev/null || true
+            fi
+            # Only delete the dev branch in --clean mode
+            if [[ "$DO_CLEAN" == true ]]; then
+                if git -C "$PROJECT_ROOT" branch -D "$branch" 2>/dev/null; then
+                    log_success "Deleted dev branch: $branch"
+                else
+                    log_warn "Failed to delete branch: $branch"
+                fi
+            else
+                log_info "Dev branch preserved for debugging: $branch"
+            fi
+        done <<< "$DEV_BRANCHES"
+    fi
+
     # -- Execute reset --
     if [[ "$DO_CLEAN" == true ]]; then
         log_info "Cleaning $CUR_BUG_ID (reset + delete artifacts)..."
@@ -269,9 +343,9 @@ sys.exit(1)
     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_BUG_ID cleaned: status -> pending, $SESSIONS_COUNT session(s) deleted, $BUGFIX_COUNT artifact(s) deleted"
+            log_success "$CUR_BUG_ID cleaned: status -> pending, $SESSIONS_COUNT session(s) deleted, $BUGFIX_COUNT artifact(s) deleted, dev branch deleted"
         else
-            log_success "$CUR_BUG_ID reset: status -> pending, retry count -> 0"
+            log_success "$CUR_BUG_ID reset: status -> pending, retry count -> 0, dev branch discarded"
         fi
     else
         ERROR_MSG=$(echo "$RESULT" | python3 -c "import sys,json; print(json.load(sys.stdin).get('error','unknown'))" 2>/dev/null || echo "$RESULT")
@@ -295,11 +369,11 @@ echo -e "${BOLD}Next steps:${NC}"
 if [[ "$DO_RUN" == true && ${#BUG_IDS[@]} -eq 1 ]]; then
     log_info "Auto-retrying ${BUG_IDS[0]}..."
     echo ""
-    exec "$SCRIPT_DIR/retry-bugfix.sh" "${BUG_IDS[0]}" "$BUG_LIST"
+    exec "$SCRIPT_DIR/run-bugfix.sh" run "${BUG_IDS[0]}" "$BUG_LIST"
 else
     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"
+        log_info "  ./dev-pipeline/run-bugfix.sh run ${BUG_IDS[0]}     # Run single bug"
     fi
 fi
 echo ""

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

@@ -4,8 +4,12 @@ set -euo pipefail
 # ============================================================
 # dev-pipeline/reset-feature.sh - Reset a failed/stuck feature
 #
-# Clears all state and artifacts for a feature so it can be
-# re-executed from scratch by the pipeline.
+# Resets status and discards uncommitted working tree changes on
+# the dev branch, then returns to the original branch. Session
+# history and .prizmkit artifacts are preserved for debugging.
+#
+# With --clean, also deletes session history, .prizmkit/specs/
+# artifacts, and the dev branch itself.
 #
 # Usage:
 #   ./reset-feature.sh <feature-id|range> [options] [.prizmkit/plans/feature-list.json]
@@ -18,12 +22,18 @@ set -euo pipefail
 #   --stalled          All non-completed features (failed + auto_skipped)
 #
 # Options:
-#   --clean    Also delete session history and .prizmkit/specs/{slug}/ artifacts
+#   --clean    Also delete session history, .prizmkit/specs/{slug}/ artifacts, and dev branch
 #   --run      After reset, immediately retry via pipeline (only with single feature)
 #
+# Normal reset (no --clean):
+#   - Resets status → pending, retry_count → 0
+#   - Discards uncommitted changes on dev branch (git checkout -- . && git clean -fd)
+#   - Returns to default branch (main/master)
+#   - Preserves dev branch, session history, and .prizmkit artifacts for debugging
+#
 # Examples:
-#   ./reset-feature.sh F-007                          # Reset status only
-#   ./reset-feature.sh F-007 --clean                  # Reset + delete artifacts
+#   ./reset-feature.sh F-007                          # Reset status + discard changes
+#   ./reset-feature.sh F-007 --clean                  # Reset + delete everything
 #   ./reset-feature.sh F-008:F-013 --clean            # Reset range
 #   ./reset-feature.sh --auto-skipped                 # Reset all auto_skipped
 #   ./reset-feature.sh --failed --clean               # Reset all failed + clean
@@ -76,7 +86,7 @@ for arg in "$@"; do
             echo "  --auto-skipped      Reset all auto_skipped features"
             echo "  --failed            Reset all failed features"
             echo "  --stalled           Reset all non-completed (failed + auto_skipped)"
-            echo "  --clean             Delete session history and .prizmkit artifacts"
+            echo "  --clean             Delete session history, .prizmkit artifacts, and dev branch"
             echo "  --run               Retry immediately after reset (single feature only)"
             echo "  .prizmkit/plans/feature-list.json   Path to feature list (default: .prizmkit/plans/feature-list.json)"
             exit 0
@@ -194,6 +204,19 @@ PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 RESET_COUNT=0
 FAIL_COUNT=0
 
+# Detect default branch (main or master)
+DEFAULT_BRANCH=$(git -C "$PROJECT_ROOT" symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@' || echo "")
+if [[ -z "$DEFAULT_BRANCH" ]]; then
+    # Fallback: check if main or master exists
+    if git -C "$PROJECT_ROOT" rev-parse --verify main >/dev/null 2>&1; then
+        DEFAULT_BRANCH="main"
+    elif git -C "$PROJECT_ROOT" rev-parse --verify master >/dev/null 2>&1; then
+        DEFAULT_BRANCH="master"
+    else
+        DEFAULT_BRANCH=$(git -C "$PROJECT_ROOT" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
+    fi
+fi
+
 for CUR_FEATURE_ID in "${FEATURE_IDS[@]}"; do
 
     # Get feature info from feature list
@@ -255,6 +278,59 @@ sys.exit(1)
 
     echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
 
+    # ── Git cleanup: discard dev branch changes ──
+    # Find dev branches matching this feature (pattern: dev/{FEATURE_ID}-*)
+    DEV_BRANCHES=$(git -C "$PROJECT_ROOT" branch --list "dev/${CUR_FEATURE_ID}-*" 2>/dev/null | sed 's/^[* ]*//')
+    CURRENT_BRANCH=$(git -C "$PROJECT_ROOT" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")
+
+    if [[ -n "$DEV_BRANCHES" ]]; then
+        while IFS= read -r branch; do
+            [[ -z "$branch" ]] && continue
+            if [[ "$CURRENT_BRANCH" == "$branch" ]]; then
+                # We're on the dev branch — discard uncommitted changes and return to default
+                log_info "Discarding uncommitted changes on dev branch: $branch"
+                git -C "$PROJECT_ROOT" reset HEAD 2>/dev/null || true
+                git -C "$PROJECT_ROOT" checkout -- . 2>/dev/null || true
+                git -C "$PROJECT_ROOT" clean -fd 2>/dev/null || true
+                log_info "Switching to $DEFAULT_BRANCH..."
+                if ! git -C "$PROJECT_ROOT" checkout "$DEFAULT_BRANCH" 2>/dev/null; then
+                    log_warn "Failed to checkout $DEFAULT_BRANCH — staying on $branch"
+                else
+                    CURRENT_BRANCH="$DEFAULT_BRANCH"
+                fi
+            else
+                # Not on the dev branch — discard its uncommitted changes
+                # Temporarily switch, discard, switch back
+                _stashed=false
+                _dirty=""
+                _dirty=$(git -C "$PROJECT_ROOT" status --porcelain 2>/dev/null || true)
+                if [[ -n "$_dirty" ]]; then
+                    git -C "$PROJECT_ROOT" stash push --include-untracked -m "reset-feature-temp" 2>/dev/null && _stashed=true
+                fi
+                if git -C "$PROJECT_ROOT" checkout "$branch" 2>/dev/null; then
+                    log_info "Discarding uncommitted changes on dev branch: $branch"
+                    git -C "$PROJECT_ROOT" reset HEAD 2>/dev/null || true
+                    git -C "$PROJECT_ROOT" checkout -- . 2>/dev/null || true
+                    git -C "$PROJECT_ROOT" clean -fd 2>/dev/null || true
+                    git -C "$PROJECT_ROOT" checkout "$CURRENT_BRANCH" 2>/dev/null || true
+                else
+                    log_warn "Could not checkout $branch to discard changes"
+                fi
+                [[ "$_stashed" == true ]] && git -C "$PROJECT_ROOT" stash pop 2>/dev/null || true
+            fi
+            # Only delete the dev branch in --clean mode
+            if [[ "$DO_CLEAN" == true ]]; then
+                if git -C "$PROJECT_ROOT" branch -D "$branch" 2>/dev/null; then
+                    log_success "Deleted dev branch: $branch"
+                else
+                    log_warn "Failed to delete branch: $branch"
+                fi
+            else
+                log_info "Dev branch preserved for debugging: $branch"
+            fi
+        done <<< "$DEV_BRANCHES"
+    fi
+
     # ── Execute reset ──
     if [[ "$DO_CLEAN" == true ]]; then
         log_info "Cleaning $CUR_FEATURE_ID (reset + delete artifacts)..."
@@ -278,9 +354,9 @@ sys.exit(1)
     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_FEATURE_ID cleaned: status → pending, $SESSIONS_COUNT session(s) deleted, $SPECS_COUNT artifact(s) deleted"
+            log_success "$CUR_FEATURE_ID cleaned: status → pending, $SESSIONS_COUNT session(s) deleted, $SPECS_COUNT artifact(s) deleted, dev branch deleted"
         else
-            log_success "$CUR_FEATURE_ID reset: status → pending, retry count → 0"
+            log_success "$CUR_FEATURE_ID reset: status → pending, retry count → 0, dev branch discarded"
         fi
     else
         ERROR_MSG=$(echo "$RESULT" | python3 -c "import sys,json; print(json.load(sys.stdin).get('error','unknown'))" 2>/dev/null || echo "$RESULT")
@@ -304,11 +380,11 @@ echo -e "${BOLD}Next steps:${NC}"
 if [[ "$DO_RUN" == true && ${#FEATURE_IDS[@]} -eq 1 ]]; then
     log_info "Auto-retrying ${FEATURE_IDS[0]}..."
     echo ""
-    exec "$SCRIPT_DIR/retry-feature.sh" "${FEATURE_IDS[0]}" "$FEATURE_LIST"
+    exec "$SCRIPT_DIR/run-feature.sh" run "${FEATURE_IDS[0]}" "$FEATURE_LIST"
 else
     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"
+        log_info "  ./dev-pipeline/run-feature.sh run ${FEATURE_IDS[0]}     # Run single feature"
     fi
 fi
 echo ""

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

@@ -194,6 +194,18 @@ PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
 RESET_COUNT=0
 FAIL_COUNT=0
 
+# Detect default branch (main or master)
+DEFAULT_BRANCH=$(git -C "$PROJECT_ROOT" symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@' || echo "")
+if [[ -z "$DEFAULT_BRANCH" ]]; then
+    if git -C "$PROJECT_ROOT" rev-parse --verify main >/dev/null 2>&1; then
+        DEFAULT_BRANCH="main"
+    elif git -C "$PROJECT_ROOT" rev-parse --verify master >/dev/null 2>&1; then
+        DEFAULT_BRANCH="master"
+    else
+        DEFAULT_BRANCH=$(git -C "$PROJECT_ROOT" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
+    fi
+fi
+
 for CUR_REFACTOR_ID in "${REFACTOR_IDS[@]}"; do
 
     # Get refactor info from refactor list
@@ -255,6 +267,58 @@ sys.exit(1)
 
     echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
 
+    # ── Git cleanup: discard dev branch changes ──
+    # Find dev branches matching this refactor (pattern: refactor/{REFACTOR_ID}-*)
+    DEV_BRANCHES=$(git -C "$PROJECT_ROOT" branch --list "refactor/${CUR_REFACTOR_ID}-*" 2>/dev/null | sed 's/^[* ]*//')
+    CURRENT_BRANCH=$(git -C "$PROJECT_ROOT" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")
+
+    if [[ -n "$DEV_BRANCHES" ]]; then
+        while IFS= read -r branch; do
+            [[ -z "$branch" ]] && continue
+            if [[ "$CURRENT_BRANCH" == "$branch" ]]; then
+                # We're on the dev branch — discard uncommitted changes and return to default
+                log_info "Discarding uncommitted changes on dev branch: $branch"
+                git -C "$PROJECT_ROOT" reset HEAD 2>/dev/null || true
+                git -C "$PROJECT_ROOT" checkout -- . 2>/dev/null || true
+                git -C "$PROJECT_ROOT" clean -fd 2>/dev/null || true
+                log_info "Switching to $DEFAULT_BRANCH..."
+                if ! git -C "$PROJECT_ROOT" checkout "$DEFAULT_BRANCH" 2>/dev/null; then
+                    log_warn "Failed to checkout $DEFAULT_BRANCH — staying on $branch"
+                else
+                    CURRENT_BRANCH="$DEFAULT_BRANCH"
+                fi
+            else
+                # Not on the dev branch — discard its uncommitted changes
+                _stashed=false
+                _dirty=""
+                _dirty=$(git -C "$PROJECT_ROOT" status --porcelain 2>/dev/null || true)
+                if [[ -n "$_dirty" ]]; then
+                    git -C "$PROJECT_ROOT" stash push --include-untracked -m "reset-refactor-temp" 2>/dev/null && _stashed=true
+                fi
+                if git -C "$PROJECT_ROOT" checkout "$branch" 2>/dev/null; then
+                    log_info "Discarding uncommitted changes on dev branch: $branch"
+                    git -C "$PROJECT_ROOT" reset HEAD 2>/dev/null || true
+                    git -C "$PROJECT_ROOT" checkout -- . 2>/dev/null || true
+                    git -C "$PROJECT_ROOT" clean -fd 2>/dev/null || true
+                    git -C "$PROJECT_ROOT" checkout "$CURRENT_BRANCH" 2>/dev/null || true
+                else
+                    log_warn "Could not checkout $branch to discard changes"
+                fi
+                [[ "$_stashed" == true ]] && git -C "$PROJECT_ROOT" stash pop 2>/dev/null || true
+            fi
+            # Only delete the dev branch in --clean mode
+            if [[ "$DO_CLEAN" == true ]]; then
+                if git -C "$PROJECT_ROOT" branch -D "$branch" 2>/dev/null; then
+                    log_success "Deleted dev branch: $branch"
+                else
+                    log_warn "Failed to delete branch: $branch"
+                fi
+            else
+                log_info "Dev branch preserved for debugging: $branch"
+            fi
+        done <<< "$DEV_BRANCHES"
+    fi
+
     # -- Execute reset --
     if [[ "$DO_CLEAN" == true ]]; then
         log_info "Cleaning $CUR_REFACTOR_ID (reset + delete artifacts)..."
@@ -277,9 +341,9 @@ sys.exit(1)
     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"
+            log_success "$CUR_REFACTOR_ID cleaned: status -> pending, $SESSIONS_COUNT session(s) deleted, $SPECS_COUNT artifact(s) deleted, dev branch deleted"
         else
-            log_success "$CUR_REFACTOR_ID reset: status -> pending, retry count -> 0"
+            log_success "$CUR_REFACTOR_ID reset: status -> pending, retry count -> 0, dev branch discarded"
         fi
     else
         ERROR_MSG=$(echo "$RESULT" | python3 -c "import sys,json; print(json.load(sys.stdin).get('error','unknown'))" 2>/dev/null || echo "$RESULT")
@@ -303,11 +367,11 @@ 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"
+    exec "$SCRIPT_DIR/run-refactor.sh" run "${REFACTOR_IDS[0]}" "$REFACTOR_LIST"
 else
     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"
+        log_info "  ./dev-pipeline/run-refactor.sh run ${REFACTOR_IDS[0]}     # Run single refactor"
     fi
 fi
 echo ""