prizmkit 1.0.84 → 1.0.86

package/bundled/VERSION.json

@@ -1,5 +1,5 @@
 {
-  "frameworkVersion": "1.0.84",
-  "bundledAt": "2026-03-22T06:08:56.689Z",
-  "bundledFrom": "99e8cc5"
+  "frameworkVersion": "1.0.86",
+  "bundledAt": "2026-03-22T08:00:16.548Z",
+  "bundledFrom": "f16dcdb"
 }

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

@@ -9,6 +9,7 @@
 # Functions:
 #   branch_create  — Create and checkout a new branch
 #   branch_return  — Checkout back to original branch
+#   branch_merge   — Merge dev branch into original and optionally push
 #
 # Environment:
 #   DEV_BRANCH    — Optional custom branch name override
@@ -74,3 +75,55 @@ branch_return() {
     log_info "Returned to branch: $original_branch"
     return 0
 }
+
+# branch_merge <project_root> <dev_branch> <original_branch> [auto_push]
+#
+# Merges dev_branch into original_branch, then optionally pushes.
+# Steps:
+#   1. Checkout original_branch
+#   2. Merge dev_branch (fast-forward when possible)
+#   3. Push to remote if auto_push == "1"
+#   4. Delete dev_branch (local only, it's been merged)
+#
+# Returns 0 on success, 1 on failure.
+branch_merge() {
+    local project_root="$1"
+    local dev_branch="$2"
+    local original_branch="$3"
+    local auto_push="${4:-0}"
+
+    # Step 1: Checkout original branch
+    if ! git -C "$project_root" checkout "$original_branch" 2>/dev/null; then
+        log_error "Failed to checkout $original_branch for merge"
+        return 1
+    fi
+
+    # Step 2: Merge dev branch
+    log_info "Merging $dev_branch into $original_branch..."
+    if ! git -C "$project_root" merge "$dev_branch" 2>&1; then
+        log_error "Merge failed — resolve conflicts manually:"
+        log_error "  git checkout $original_branch && git merge $dev_branch"
+        # Return to dev branch so state is not lost
+        git -C "$project_root" merge --abort 2>/dev/null || true
+        git -C "$project_root" checkout "$dev_branch" 2>/dev/null || true
+        return 1
+    fi
+
+    log_success "Merged $dev_branch into $original_branch"
+
+    # Step 3: Push if AUTO_PUSH enabled
+    if [[ "$auto_push" == "1" ]]; then
+        log_info "Pushing $original_branch to remote..."
+        if git -C "$project_root" push 2>/dev/null; then
+            log_success "Pushed $original_branch to remote"
+        else
+            log_warn "Push failed — run 'git push' manually"
+        fi
+    fi
+
+    # Step 4: Delete merged dev branch
+    git -C "$project_root" branch -d "$dev_branch" 2>/dev/null && \
+        log_info "Deleted merged branch: $dev_branch" || true
+
+    return 0
+}

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

@@ -342,7 +342,17 @@ fi
 if [[ "$SESSION_STATUS" == "success" ]]; then
     PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
     if git -C "$PROJECT_ROOT" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+        # Auto-commit any remaining dirty files produced during the session
         DIRTY_FILES=$(git -C "$PROJECT_ROOT" status --porcelain 2>/dev/null || true)
+        if [[ -n "$DIRTY_FILES" ]]; then
+            log_info "Auto-committing remaining session artifacts..."
+            git -C "$PROJECT_ROOT" add -A 2>/dev/null || true
+            git -C "$PROJECT_ROOT" commit -m "chore($BUG_ID): include remaining session artifacts" 2>/dev/null || true
+        fi
+
+        # Re-check: if still dirty after auto-commit, flag as failed
+        DIRTY_FILES=$(git -C "$PROJECT_ROOT" status --porcelain 2>/dev/null || true)
+        if [[ -n "$DIRTY_FILES" ]]; then
         if [[ -n "$DIRTY_FILES" ]]; then
             log_error "Session reported success but git working tree is not clean."
             echo "$DIRTY_FILES" | sed 's/^/  - /'

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

@@ -382,7 +382,17 @@ fi
 if [[ "$SESSION_STATUS" == "success" ]]; then
     PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
     if git -C "$PROJECT_ROOT" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+        # Auto-commit any remaining dirty files produced during the session
         DIRTY_FILES=$(git -C "$PROJECT_ROOT" status --porcelain 2>/dev/null || true)
+        if [[ -n "$DIRTY_FILES" ]]; then
+            log_info "Auto-committing remaining session artifacts..."
+            git -C "$PROJECT_ROOT" add -A 2>/dev/null || true
+            git -C "$PROJECT_ROOT" commit -m "chore($FEATURE_ID): include remaining session artifacts" 2>/dev/null || true
+        fi
+
+        # Re-check: if still dirty after auto-commit, flag as failed
+        DIRTY_FILES=$(git -C "$PROJECT_ROOT" status --porcelain 2>/dev/null || true)
+        if [[ -n "$DIRTY_FILES" ]]; then
         if [[ -n "$DIRTY_FILES" ]]; then
             log_error "Session reported success but git working tree is not clean."
             echo "$DIRTY_FILES" | sed 's/^/  - /'

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

@@ -183,8 +183,17 @@ spawn_and_wait_session() {
         local project_root
         project_root="$(cd "$SCRIPT_DIR/.." && pwd)"
         if git -C "$project_root" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+            # Auto-commit any remaining dirty files produced during the session
             local dirty_files=""
             dirty_files=$(git -C "$project_root" status --porcelain 2>/dev/null || true)
+            if [[ -n "$dirty_files" ]]; then
+                log_info "Auto-committing remaining session artifacts..."
+                git -C "$project_root" add -A 2>/dev/null || true
+                git -C "$project_root" commit -m "chore($bug_id): include remaining session artifacts" 2>/dev/null || true
+            fi
+
+            # Re-check: if still dirty after auto-commit, flag as failed
+            dirty_files=$(git -C "$project_root" status --porcelain 2>/dev/null || true)
             if [[ -n "$dirty_files" ]]; then
                 log_error "Session reported success but git working tree is not clean."
                 echo "$dirty_files" | sed 's/^/  - /'
@@ -435,12 +444,13 @@ sys.exit(1)
         "$bootstrap_prompt" "$session_dir" 999
     local session_status="$_SPAWN_RESULT"
 
-    # Auto-push after successful session
-    if [[ "$session_status" == "success" && "$AUTO_PUSH" == "1" ]]; then
-        local _proj_root
-        _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
-        log_info "AUTO_PUSH enabled; pushing to remote..."
-        git -C "$_proj_root" push -u origin "$_DEV_BRANCH_NAME" 2>/dev/null || log_warn "Auto-push failed"
+    # Merge dev branch back to original on success
+    if [[ "$session_status" == "success" && -n "$_DEV_BRANCH_NAME" ]]; then
+        if branch_merge "$_proj_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
 
     echo ""
@@ -554,12 +564,18 @@ main() {
             log_success "════════════════════════════════════════════════════"
             log_success "  All bugs processed! Bug fix pipeline finished."
             log_success "  Total sessions: $session_count"
-            if [[ -n "$_DEV_BRANCH_NAME" ]]; then
-                log_success "  Dev branch: $_DEV_BRANCH_NAME"
-                log_success "  Merge with: git checkout $_ORIGINAL_BRANCH && git merge $_DEV_BRANCH_NAME"
-            fi
             log_success "════════════════════════════════════════════════════"
             rm -f "$STATE_DIR/current-session.json"
+
+            # Merge dev branch back to original
+            if [[ -n "$_DEV_BRANCH_NAME" ]]; then
+                if branch_merge "$_proj_root" "$_DEV_BRANCH_NAME" "$_ORIGINAL_BRANCH" "$AUTO_PUSH"; then
+                    _DEV_BRANCH_NAME=""
+                else
+                    log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
+                    log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git merge $_DEV_BRANCH_NAME"
+                fi
+            fi
             break
         fi
 
@@ -632,14 +648,6 @@ os.replace(tmp, target)
             "$bug_id" "$bug_list" "$session_id" \
             "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES"
 
-        # Auto-push after successful session
-        if [[ "$_SPAWN_RESULT" == "success" && "$AUTO_PUSH" == "1" ]]; then
-            local _proj_root
-            _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
-            log_info "AUTO_PUSH enabled; pushing to remote..."
-            git -C "$_proj_root" push 2>/dev/null || log_warn "Auto-push failed"
-        fi
-
         session_count=$((session_count + 1))
 
         log_info "Pausing 5s before next bug..."

package/bundled/dev-pipeline/run.sh

@@ -231,8 +231,18 @@ else: print('')
         local project_root
         project_root="$(cd "$SCRIPT_DIR/.." && pwd)"
         if git -C "$project_root" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+            # Auto-commit any remaining dirty files produced during the session
+            # (pipeline state, runtime data, files the AI session missed)
             local dirty_files=""
             dirty_files=$(git -C "$project_root" status --porcelain 2>/dev/null || true)
+            if [[ -n "$dirty_files" ]]; then
+                log_info "Auto-committing remaining session artifacts..."
+                git -C "$project_root" add -A 2>/dev/null || true
+                git -C "$project_root" commit -m "chore($feature_id): include remaining session artifacts" 2>/dev/null || true
+            fi
+
+            # Re-check: if still dirty after auto-commit, flag as commit_missing
+            dirty_files=$(git -C "$project_root" status --porcelain 2>/dev/null || true)
             if [[ -n "$dirty_files" ]]; then
                 log_warn "Session reported success but git working tree is not clean."
                 echo "$dirty_files" | sed 's/^/  - /'
@@ -778,12 +788,13 @@ sys.exit(1)
         "$bootstrap_prompt" "$session_dir" 999 "$feature_model"
     local session_status="$_SPAWN_RESULT"
 
-    # Auto-push after successful session
-    if [[ "$session_status" == "success" && "$AUTO_PUSH" == "1" ]]; then
-        local _proj_root
-        _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
-        log_info "AUTO_PUSH enabled; pushing to remote..."
-        git -C "$_proj_root" push -u origin "$_DEV_BRANCH_NAME" 2>/dev/null || log_warn "Auto-push failed"
+    # Merge dev branch back to original on success
+    if [[ "$session_status" == "success" && -n "$_DEV_BRANCH_NAME" ]]; then
+        if branch_merge "$_proj_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
 
     echo ""
@@ -971,12 +982,18 @@ for f in data.get('stuck_features', []):
             log_success "════════════════════════════════════════════════════"
             log_success "  All features completed! Pipeline finished."
             log_success "  Total sessions: $session_count"
-            if [[ -n "$_DEV_BRANCH_NAME" ]]; then
-                log_success "  Dev branch: $_DEV_BRANCH_NAME"
-                log_success "  Merge with: git checkout $_ORIGINAL_BRANCH && git merge $_DEV_BRANCH_NAME"
-            fi
             log_success "════════════════════════════════════════════════════"
             rm -f "$STATE_DIR/current-session.json"
+
+            # Merge dev branch back to original
+            if [[ -n "$_DEV_BRANCH_NAME" ]]; then
+                if branch_merge "$_proj_root" "$_DEV_BRANCH_NAME" "$_ORIGINAL_BRANCH" "$AUTO_PUSH"; then
+                    _DEV_BRANCH_NAME=""
+                else
+                    log_warn "Auto-merge failed — dev branch preserved: $_DEV_BRANCH_NAME"
+                    log_warn "Merge manually: git checkout $_ORIGINAL_BRANCH && git merge $_DEV_BRANCH_NAME"
+                fi
+            fi
             break
         fi
 
@@ -1086,14 +1103,6 @@ os.replace(tmp, target)
             "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES" "$feature_model"
         local session_status="$_SPAWN_RESULT"
 
-        # Auto-push after successful session
-        if [[ "$session_status" == "success" && "$AUTO_PUSH" == "1" ]]; then
-            local _proj_root
-            _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
-            log_info "AUTO_PUSH enabled; pushing to remote..."
-            git -C "$_proj_root" push 2>/dev/null || log_warn "Auto-push failed"
-        fi
-
         session_count=$((session_count + 1))
 
         # Brief pause before next iteration

package/bundled/dev-pipeline/templates/bootstrap-tier1.md

@@ -192,15 +192,15 @@ Write to: `{{SESSION_STATUS_PATH}}`
 git status --short
 ```
 
-If any files remain, stage them **explicitly by name** (do NOT use `git add -A`) and create a follow-up commit:
+**Note**: The pipeline runner will auto-commit any remaining dirty files after your session exits. You do NOT need to manually commit pipeline state files (`dev-pipeline/state/`) or runtime logs — just focus on committing your feature code via `/prizmkit-committer`.
+
+If any feature-related source files remain uncommitted, stage them **explicitly by name** (do NOT use `git add -A`) and create a follow-up commit:
 
 ```bash
 git add <specific-file-1> <specific-file-2>
 git commit -m "chore({{FEATURE_ID}}): include session artifacts"
 ```
 
-Re-check `git status --short` and ensure it is empty before exiting.
-
 ## Critical Paths
 
 | Resource | Path |
@@ -217,5 +217,5 @@ Re-check `git status --short` and ensure it is empty before exiting.
 - Build context-snapshot.md FIRST; use it throughout instead of re-reading files
 - Session-status.json is written BEFORE commit (as partial), then updated to success AFTER commit — this prevents pipeline from treating a terminated session as crashed
 - `/prizmkit-committer` is mandatory — do NOT skip the commit phase, and do NOT replace it with manual git commit commands
-- Before exiting, `git status --short` must be empty
+- Before exiting, commit your feature code via `/prizmkit-committer` — the pipeline runner auto-commits any remaining files after session exit
 - When staging leftover files in the final clean check, always use explicit file names — NEVER use `git add -A`

package/bundled/dev-pipeline/templates/bootstrap-tier2.md

@@ -247,15 +247,15 @@ Write to: `{{SESSION_STATUS_PATH}}`
 git status --short
 ```
 
-If any files remain, stage them **explicitly by name** (do NOT use `git add -A`) and create a follow-up commit:
+**Note**: The pipeline runner will auto-commit any remaining dirty files after your session exits. You do NOT need to manually commit pipeline state files (`dev-pipeline/state/`) or runtime logs — just focus on committing your feature code via `/prizmkit-committer`.
+
+If any feature-related source files remain uncommitted, stage them **explicitly by name** (do NOT use `git add -A`) and create a follow-up commit:
 
 ```bash
 git add <specific-file-1> <specific-file-2>
 git commit -m "chore({{FEATURE_ID}}): include session artifacts"
 ```
 
-Re-check `git status --short` and ensure it is empty before exiting.
-
 ## Critical Paths
 
 | Resource | Path |
@@ -276,6 +276,6 @@ Re-check `git status --short` and ensure it is empty before exiting.
 - Do NOT use `run_in_background=true` when spawning subagents
 - Session-status.json is written BEFORE commit (as partial), then updated to success AFTER commit — this prevents pipeline from treating a terminated session as crashed
 - `/prizmkit-committer` is mandatory, and must not be replaced with manual git commit commands
-- Before exiting, `git status --short` must be empty
+- Before exiting, commit your feature code via `/prizmkit-committer` — the pipeline runner auto-commits any remaining files after session exit
 - When staging leftover files in the final clean check, always use explicit file names — NEVER use `git add -A`
 - On timeout: check snapshot + git diff HEAD → model:lite → remaining steps only → max 2 retries per phase → orchestrator fallback

package/bundled/dev-pipeline/templates/bootstrap-tier3.md

@@ -438,15 +438,15 @@ After updating `session-status.json`, verify repository is clean:
 git status --short
 ```
 
-If any files remain, stage them **explicitly by name** (do NOT use `git add -A`) and create a follow-up commit:
+**Note**: The pipeline runner will auto-commit any remaining dirty files after your session exits. You do NOT need to manually commit pipeline state files (`dev-pipeline/state/`) or runtime logs — just focus on committing your feature code via `/prizmkit-committer`.
+
+If any feature-related source files remain uncommitted, stage them **explicitly by name** (do NOT use `git add -A`) and create a follow-up commit:
 
 ```bash
 git add <specific-file-1> <specific-file-2>
 git commit -m "chore({{FEATURE_ID}}): include session artifacts"
 ```
 
-Re-check `git status --short` and ensure it is empty before exiting.
-
 ## Critical Paths
 
 | Resource | Path |
@@ -468,6 +468,6 @@ Re-check `git status --short` and ensure it is empty before exiting.
 - Do NOT use `run_in_background=true` when spawning agents
 - ALWAYS write preliminary session-status.json BEFORE commit (as partial), then update to success AFTER commit — this prevents pipeline from treating a terminated session as crashed
 - Commit phase must use `/prizmkit-committer`; do NOT replace with manual git commit commands
-- Before exiting, `git status --short` must be empty
+- Before exiting, commit your feature code via `/prizmkit-committer` — the pipeline runner auto-commits any remaining files after session exit
 - When staging leftover files in the final clean check, always use explicit file names — NEVER use `git add -A`
 - On timeout: check snapshot → model:lite → remaining steps only → max 2 retries → orchestrator fallback

package/bundled/skills/_metadata.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.84",
+  "version": "1.0.86",
   "skills": {
     "prizm-kit": {
       "description": "Full-lifecycle dev toolkit. Covers spec-driven development, Prizm context docs, code quality, debugging, deployment, and knowledge management.",

package/bundled/skills/prizmkit-committer/SKILL.md

@@ -72,7 +72,8 @@ Then verify working tree is clean:
 git status
 ```
 - If "nothing to commit, working tree clean": commit verified successfully, proceed
-- If there are uncommitted changes remaining: **STOP** and report what files were missed. Stage the missed files explicitly by name and create a new commit (do NOT amend the previous commit — amending risks destroying unrelated changes from prior commits)
+- **Ignore `dev-pipeline/state/` files** — these are pipeline runtime artifacts written by the pipeline runner process, not part of your changes. They will always appear dirty during pipeline sessions.
+- If there are other uncommitted changes remaining (excluding `dev-pipeline/state/`): **STOP** and report what files were missed. Stage the missed files explicitly by name and create a new commit (do NOT amend the previous commit — amending risks destroying unrelated changes from prior commits)
 
 #### Step 6: Optional Push
 Ask user: "Push to remote?"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prizmkit",
-  "version": "1.0.84",
+  "version": "1.0.86",
   "description": "Create a new PrizmKit-powered project with clean initialization — no framework dev files, just what you need.",
   "type": "module",
   "bin": {