prizmkit 1.0.85 → 1.0.87

package/bundled/VERSION.json

@@ -1,5 +1,5 @@
 {
-  "frameworkVersion": "1.0.85",
-  "bundledAt": "2026-03-22T07:41:52.990Z",
-  "bundledFrom": "cf22ce6"
+  "frameworkVersion": "1.0.87",
+  "bundledAt": "2026-03-22T10:36:51.328Z",
+  "bundledFrom": "35c970f"
 }

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

@@ -328,21 +328,50 @@ fi
 
 SESSION_STATUS_FILE="$SESSION_DIR/session-status.json"
 
+# ── Determine session outcome from observable signals ──────────────
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+
 if [[ $EXIT_CODE -eq 124 ]]; then
     log_warn "Session timed out after ${SESSION_TIMEOUT}s"
     SESSION_STATUS="timed_out"
-elif [[ -f "$SESSION_STATUS_FILE" ]]; then
-    SESSION_STATUS=$(python3 "$SCRIPTS_DIR/check-session-status.py" \
-        --status-file "$SESSION_STATUS_FILE" 2>/dev/null) || SESSION_STATUS="crashed"
-else
-    log_warn "Session ended without status file"
+elif [[ $EXIT_CODE -ne 0 ]]; then
+    log_warn "Session exited with code $EXIT_CODE"
     SESSION_STATUS="crashed"
+else
+    # Exit code 0 — check if the session produced commits
+    SESSION_START_ISO=$(python3 -c "
+import os, sys
+from datetime import datetime, timezone
+p = sys.argv[1]
+if os.path.isdir(p):
+    ts = os.path.getctime(p)
+    print(datetime.fromtimestamp(ts, tz=timezone.utc).strftime('%Y-%m-%dT%H:%M:%SZ'))
+else:
+    print('')
+" "$SESSION_DIR" 2>/dev/null) || SESSION_START_ISO=""
+
+    HAS_COMMITS=""
+    if [[ -n "$SESSION_START_ISO" ]] && git -C "$PROJECT_ROOT" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+        HAS_COMMITS=$(git -C "$PROJECT_ROOT" log --since="$SESSION_START_ISO" --oneline --grep="$BUG_ID" 2>/dev/null | head -1)
+    fi
+
+    if [[ -n "$HAS_COMMITS" ]]; then
+        SESSION_STATUS="success"
+    else
+        UNCOMMITTED=$(git -C "$PROJECT_ROOT" status --porcelain 2>/dev/null | head -1 || true)
+        if [[ -n "$UNCOMMITTED" ]]; then
+            log_warn "Session exited cleanly but produced no commits (uncommitted changes found)"
+            SESSION_STATUS="commit_missing"
+        else
+            log_warn "Session exited cleanly but produced no commits and no changes"
+            SESSION_STATUS="crashed"
+        fi
+    fi
 fi
 
+# ── Post-success validation ──────────────────────────────────────────
 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..."
@@ -350,11 +379,9 @@ if [[ "$SESSION_STATUS" == "success" ]]; then
             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."
+            log_error "Git working tree still not clean after auto-commit."
             echo "$DIRTY_FILES" | sed 's/^/  - /'
             SESSION_STATUS="failed"
         fi

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

@@ -340,21 +340,18 @@ fi
 
 SESSION_STATUS_FILE="$SESSION_DIR/session-status.json"
 
+# ── Determine session outcome from observable signals ──────────────
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
+
 if [[ $EXIT_CODE -eq 124 ]]; then
     log_warn "Session timed out after ${SESSION_TIMEOUT}s"
     SESSION_STATUS="timed_out"
-elif [[ -f "$SESSION_STATUS_FILE" ]]; then
-    SESSION_STATUS=$(python3 "$SCRIPTS_DIR/check-session-status.py" \
-        --status-file "$SESSION_STATUS_FILE" 2>/dev/null) || SESSION_STATUS="crashed"
+elif [[ $EXIT_CODE -ne 0 ]]; then
+    log_warn "Session exited with code $EXIT_CODE"
+    SESSION_STATUS="crashed"
 else
-    # No session-status.json found. Check if session produced git commits
-    # (e.g., context window exhausted after committing but before writing status).
-    log_warn "Session ended without status file"
-    PROJECT_ROOT_CHECK="$(cd "$SCRIPT_DIR/.." && pwd)"
-    RECENT_FEATURE_COMMITS=""
-    if git -C "$PROJECT_ROOT_CHECK" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
-        # Use session directory creation time as lower bound for commit search
-        SESSION_START_ISO=$(python3 -c "
+    # Exit code 0 — check if the session produced commits
+    SESSION_START_ISO=$(python3 -c "
 import os, sys
 from datetime import datetime, timezone
 p = sys.argv[1]
@@ -364,25 +361,29 @@ if os.path.isdir(p):
 else:
     print('')
 " "$SESSION_DIR" 2>/dev/null) || SESSION_START_ISO=""
-        if [[ -n "$SESSION_START_ISO" ]]; then
-            RECENT_FEATURE_COMMITS=$(git -C "$PROJECT_ROOT_CHECK" log --since="$SESSION_START_ISO" --oneline --grep="$FEATURE_ID" 2>/dev/null | head -5)
-        fi
+
+    HAS_COMMITS=""
+    if [[ -n "$SESSION_START_ISO" ]] && git -C "$PROJECT_ROOT" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+        HAS_COMMITS=$(git -C "$PROJECT_ROOT" log --since="$SESSION_START_ISO" --oneline --grep="$FEATURE_ID" 2>/dev/null | head -1)
     fi
 
-    if [[ -n "$RECENT_FEATURE_COMMITS" ]]; then
-        log_warn "Found commits from this session:"
-        echo "$RECENT_FEATURE_COMMITS" | sed 's/^/  - /'
-        log_warn "Treating as commit_missing (artifacts preserved for retry)"
-        SESSION_STATUS="commit_missing"
+    if [[ -n "$HAS_COMMITS" ]]; then
+        SESSION_STATUS="success"
     else
-        SESSION_STATUS="crashed"
+        UNCOMMITTED=$(git -C "$PROJECT_ROOT" status --porcelain 2>/dev/null | head -1 || true)
+        if [[ -n "$UNCOMMITTED" ]]; then
+            log_warn "Session exited cleanly but produced no commits (uncommitted changes found)"
+            SESSION_STATUS="commit_missing"
+        else
+            log_warn "Session exited cleanly but produced no commits and no changes"
+            SESSION_STATUS="crashed"
+        fi
     fi
 fi
 
+# ── Post-success validation ──────────────────────────────────────────
 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..."
@@ -390,11 +391,9 @@ if [[ "$SESSION_STATUS" == "success" ]]; then
             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."
+            log_error "Git working tree still not clean after auto-commit."
             echo "$DIRTY_FILES" | sed 's/^/  - /'
             SESSION_STATUS="failed"
         fi

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

@@ -164,26 +164,51 @@ spawn_and_wait_session() {
         log_info "Session log: $final_lines lines, $((final_size / 1024))KB"
     fi
 
-    # Check session outcome
-    local session_status_file="$session_dir/session-status.json"
+    # ── Determine session outcome from observable signals ──────────────
     local session_status
+    local project_root
+    project_root="$(cd "$SCRIPT_DIR/.." && pwd)"
 
     if [[ $exit_code -eq 124 ]]; then
         log_warn "Session timed out after ${SESSION_TIMEOUT}s"
         session_status="timed_out"
-    elif [[ -f "$session_status_file" ]]; then
-        session_status=$(python3 "$SCRIPTS_DIR/check-session-status.py" \
-            --status-file "$session_status_file" 2>/dev/null) || session_status="crashed"
-    else
-        log_warn "Session ended without status file — treating as crashed"
+    elif [[ $exit_code -ne 0 ]]; then
+        log_warn "Session exited with code $exit_code"
         session_status="crashed"
+    else
+        # Exit code 0 — check if the session actually produced commits
+        local session_start_iso=""
+        session_start_iso=$(python3 -c "
+import json, sys, os
+p = os.path.join(sys.argv[1], 'current-session.json')
+if os.path.isfile(p):
+    with open(p) as f: print(json.load(f).get('started_at', ''))
+else: print('')
+" "$STATE_DIR" 2>/dev/null) || session_start_iso=""
+
+        local has_commits=""
+        if [[ -n "$session_start_iso" ]] && git -C "$project_root" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+            has_commits=$(git -C "$project_root" log --since="$session_start_iso" --oneline --grep="$bug_id" 2>/dev/null | head -1)
+        fi
+
+        if [[ -n "$has_commits" ]]; then
+            session_status="success"
+        else
+            local uncommitted=""
+            uncommitted=$(git -C "$project_root" status --porcelain 2>/dev/null | head -1 || true)
+            if [[ -n "$uncommitted" ]]; then
+                log_warn "Session exited cleanly but produced no commits (uncommitted changes found)"
+                session_status="commit_missing"
+            else
+                log_warn "Session exited cleanly but produced no commits and no changes"
+                session_status="crashed"
+            fi
+        fi
     fi
 
+    # ── Post-success validation ──────────────────────────────────────────
     if [[ "$session_status" == "success" ]]; then
-        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
@@ -192,10 +217,9 @@ spawn_and_wait_session() {
                 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."
+                log_error "Git working tree still not clean after auto-commit."
                 echo "$dirty_files" | sed 's/^/  - /'
                 session_status="failed"
             fi
@@ -444,12 +468,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 ""
@@ -563,12 +588,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
 
@@ -641,14 +672,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

@@ -184,24 +184,21 @@ spawn_and_wait_session() {
         log_info "Session log: $final_lines lines, $((final_size / 1024))KB"
     fi
 
-    # Check session outcome
-    local session_status_file="$session_dir/session-status.json"
+    # ── Determine session outcome from observable signals ──────────────
+    # No dependency on session-status.json — uses exit code, git commits,
+    # and working tree cleanliness as the single source of truth.
     local session_status
+    local project_root
+    project_root="$(cd "$SCRIPT_DIR/.." && pwd)"
 
     if [[ $exit_code -eq 124 ]]; then
         log_warn "Session timed out after ${SESSION_TIMEOUT}s"
         session_status="timed_out"
-    elif [[ -f "$session_status_file" ]]; then
-        session_status=$(python3 "$SCRIPTS_DIR/check-session-status.py" \
-            --status-file "$session_status_file" 2>/dev/null) || session_status="crashed"
+    elif [[ $exit_code -ne 0 ]]; then
+        log_warn "Session exited with code $exit_code"
+        session_status="crashed"
     else
-        # No session-status.json found. Before treating as crashed, check if the
-        # session produced any git commits. If commits exist, the session likely
-        # completed its work but terminated before writing session-status.json
-        # (e.g., context window exhausted). Treat as commit_missing to preserve
-        # artifacts instead of wiping everything via the crashed cleanup path.
-        local project_root_check
-        project_root_check="$(cd "$SCRIPT_DIR/.." && pwd)"
+        # Exit code 0 — check if the session actually produced commits
         local session_start_iso=""
         session_start_iso=$(python3 -c "
 import json, sys, os
@@ -211,28 +208,32 @@ if os.path.isfile(p):
 else: print('')
 " "$STATE_DIR" 2>/dev/null) || session_start_iso=""
 
-        local recent_feature_commits=""
-        if [[ -n "$session_start_iso" ]] && git -C "$project_root_check" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
-            recent_feature_commits=$(git -C "$project_root_check" log --since="$session_start_iso" --oneline --grep="$feature_id" 2>/dev/null | head -5)
+        local has_commits=""
+        if [[ -n "$session_start_iso" ]] && git -C "$project_root" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+            has_commits=$(git -C "$project_root" log --since="$session_start_iso" --oneline --grep="$feature_id" 2>/dev/null | head -1)
         fi
 
-        if [[ -n "$recent_feature_commits" ]]; then
-            log_warn "Session ended without status file, but found commits from this session:"
-            echo "$recent_feature_commits" | sed 's/^/  - /'
-            log_warn "Treating as commit_missing (artifacts preserved for retry)"
-            session_status="commit_missing"
+        if [[ -n "$has_commits" ]]; then
+            session_status="success"
         else
-            log_warn "Session ended without status file — treating as crashed"
-            session_status="crashed"
+            # No commits found — check if there are uncommitted changes (session
+            # did work but didn't commit, e.g. context window exhausted)
+            local uncommitted=""
+            uncommitted=$(git -C "$project_root" status --porcelain 2>/dev/null | head -1 || true)
+            if [[ -n "$uncommitted" ]]; then
+                log_warn "Session exited cleanly but produced no commits (uncommitted changes found)"
+                session_status="commit_missing"
+            else
+                log_warn "Session exited cleanly but produced no commits and no changes"
+                session_status="crashed"
+            fi
         fi
     fi
 
+    # ── Post-success validation ──────────────────────────────────────────
     if [[ "$session_status" == "success" ]]; then
-        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
@@ -244,7 +245,7 @@ else: print('')
             # 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."
+                log_warn "Git working tree still not clean after auto-commit."
                 echo "$dirty_files" | sed 's/^/  - /'
                 session_status="commit_missing"
             else
@@ -266,20 +267,6 @@ else: print('')
         fi
     fi
 
-    # Persist final pipeline-resolved status back to session-status.json
-    # only for post-check statuses introduced by the pipeline itself.
-    if [[ -f "$session_status_file" && ( "$session_status" == "commit_missing" || "$session_status" == "docs_missing" ) ]]; then
-        python3 -c "
-import json, sys
-p, st = sys.argv[1], sys.argv[2]
-with open(p, 'r', encoding='utf-8') as f:
-    data = json.load(f)
-data['status'] = st
-with open(p, 'w', encoding='utf-8') as f:
-    json.dump(data, f, indent=2, ensure_ascii=False)
-" "$session_status_file" "$session_status" >/dev/null 2>&1 || true
-    fi
-
     log_info "Session result: $session_status"
 
     # Write lightweight session summary for post-session inspection
@@ -788,12 +775,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 ""
@@ -981,12 +969,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
 
@@ -1096,14 +1090,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

@@ -11,7 +11,7 @@
 
 You are the **session orchestrator**. Implement Feature {{FEATURE_ID}}: "{{FEATURE_TITLE}}".
 
-**CRITICAL**: You MUST NOT exit until ALL work is complete and session-status.json is written.
+**CRITICAL**: You MUST NOT exit until ALL work is complete and committed.
 
 **Tier 1 — Single Agent**: You handle everything directly. No subagents, no TeamCreate.
 
@@ -40,8 +40,7 @@ You are running in headless mode with a FINITE context window. Exceeding it will
 3. **Stay focused** — Do NOT explore code unrelated to this feature. No curiosity-driven reads.
 4. **One task at a time** — In Phase 3 (implement), complete and test one task before starting the next.
 5. **Minimize tool output** — When running commands, use `| head -20` or `| tail -20` to limit output. Never dump entire test suites or logs.
-6. **Write session-status.json early** — Write a preliminary status file at the START of Phase 3, not just at the end.
-7. **Incremental commits when possible** — If a feature has multiple independent tasks, commit after each completed task rather than one big commit at the end.
+6. **Incremental commits when possible** — If a feature has multiple independent tasks, commit after each completed task rather than one big commit at the end.
 
 ---
 
@@ -98,19 +97,7 @@ If plan.md missing, write it directly:
 
 **CP-1**: plan.md exists with Tasks section.
 
-### Phase 3: Implement
-
-**Before starting implementation**, write a preliminary session-status.json to `{{SESSION_STATUS_PATH}}`:
-```json
-{
-  "status": "partial",
-  "current_phase": 3,
-  "feature_id": "{{FEATURE_ID}}",
-  "session_id": "{{SESSION_ID}}",
-  "started_at": "<current ISO timestamp>"
-}
-```
-This ensures the pipeline sees a "partial" status even if the session crashes mid-implementation.
+### Phase 3: Implement + Test
 
 For each task in plan.md Tasks section:
 1. Read the relevant section from `context-snapshot.md` (no need to re-read individual files)
@@ -118,25 +105,23 @@ For each task in plan.md Tasks section:
 3. Run tests after each task
 3. Mark task `[x]` in plan.md Tasks section immediately
 
-After all tasks complete, append to `context-snapshot.md`:
+After all tasks complete:
+1. Run the full test suite to ensure nothing is broken
+2. Verify each acceptance criterion from Section 1 of context-snapshot.md is met — check mentally, do NOT re-read files you already wrote
+3. If any criterion is not met, fix it now (max 2 fix rounds)
+
+**CP-2**: All acceptance criteria met, all tests pass.
+
+After verification, append to `context-snapshot.md`:
 ```
 ## Implementation Log
 Files changed/created: [list]
 Key decisions: [list]
 ```
 
-### Phase 4: Code Review (mandatory)
-
-1. Re-read acceptance criteria from Section 1 of context-snapshot.md
-2. Run `/prizmkit-code-review` — verify all acceptance criteria, check code quality and correctness
-3. Run the full test suite
-4. If review uncovers issues, fix them (max 2 fix rounds)
-
-**CP-2**: All acceptance criteria met, tests pass, code review passed.
+### Phase 4: Architecture Sync & Commit
 
-### Phase 4.5: Architecture Sync & Memory Sedimentation (mandatory before commit)
-
-Run `/prizmkit-retrospective` — maintains `.prizm-docs/` (architecture index) and platform memory files:
+**4a.** Run `/prizmkit-retrospective` — maintains `.prizm-docs/` (architecture index) and platform memory files:
 1. **Structural sync**: Use `git diff --cached --name-status` to locate changed modules, update KEY_FILES/INTERFACES/DEPENDENCIES/file counts in affected `.prizm-docs/` files
 2. **Architecture knowledge** (feature sessions only): Extract TRAPS/RULES from completed work into `.prizm-docs/`
 3. **Memory sedimentation** (feature sessions only): Sediment DECISIONS and interface conventions to platform memory file (`CLAUDE.md` for Claude Code, BOTH `CODEBUDDY.md` AND `memory/MEMORY.md` for CodeBuddy)
@@ -144,49 +129,11 @@ Run `/prizmkit-retrospective` — maintains `.prizm-docs/` (architecture index)
 
 Doc maintenance pass condition (pipeline-enforced): `.prizm-docs/` changed in the final commit.
 
-### Phase 5: Session Status + Commit
-
-**5a. Write preliminary session-status.json** (safety net — ensures pipeline sees a status file even if session terminates during commit):
-
-Write to: `{{SESSION_STATUS_PATH}}`
-
-```json
-{
-  "session_id": "{{SESSION_ID}}",
-  "feature_id": "{{FEATURE_ID}}",
-  "feature_slug": "{{FEATURE_SLUG}}",
-  "exec_tier": 1,
-  "status": "partial",
-  "completed_phases": [0, 1, 2, 3, 4],
-  "current_phase": 5,
-  "checkpoint_reached": "CP-2",
-  "tasks_completed": 0,
-  "tasks_total": 0,
-  "errors": [],
-  "can_resume": false,
-  "resume_from_phase": null,
-  "docs_maintained": true,
-  "retrospective_done": true,
-  "artifacts": {
-    "context_snapshot_path": ".prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md",
-    "plan_path": ".prizmkit/specs/{{FEATURE_SLUG}}/plan.md"
-  },
-  "git_commit": "",
-  "timestamp": "<current ISO timestamp>"
-}
-```
-
-**5b. Commit** — Run `/prizmkit-committer` → `feat({{FEATURE_ID}}): {{FEATURE_TITLE}}`, do NOT push
+**4b. Commit** — Run `/prizmkit-committer` → `feat({{FEATURE_ID}}): {{FEATURE_TITLE}}`, do NOT push
 - MANDATORY: commit must be done via `/prizmkit-committer` skill. Do NOT run manual `git add`/`git commit` as a substitute.
 - Do NOT run `update-feature-status.py` here — the pipeline runner handles feature-list.json updates automatically after session exit.
 
-**5c. Update session-status.json to success** — After commit succeeds, update `{{SESSION_STATUS_PATH}}`:
-- Set `"status": "success"`
-- Set `"completed_phases": [0, 1, 2, 3, 4, 5]`
-- Set `"git_commit": "<actual commit hash from git log -1 --format=%H>"`
-- Set `"timestamp": "<current ISO timestamp>"`
-
-**5d. Final Clean Check** — Verify repository is clean:
+**4c. Final Clean Check** — Verify repository is clean:
 
 ```bash
 git status --short
@@ -207,15 +154,13 @@ git commit -m "chore({{FEATURE_ID}}): include session artifacts"
 |----------|------|
 | Feature Artifacts Dir | `.prizmkit/specs/{{FEATURE_SLUG}}/` |
 | Context Snapshot | `.prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md` |
-| Session Status Output | {{SESSION_STATUS_PATH}} |
 | Project Root | {{PROJECT_ROOT}} |
 
 ## Reminders
 
-- Tier 1: you handle everything directly — invoke skills yourself (no subagents needed for simple tasks)
-- MANDATORY skills: `/prizmkit-code-review`, `/prizmkit-retrospective`, `/prizmkit-committer` — never skip these
+- Tier 1: you handle everything directly — no subagents needed
+- MANDATORY skills: `/prizmkit-retrospective`, `/prizmkit-committer` — never skip these
 - 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, 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

@@ -11,7 +11,7 @@
 
 You are the **session orchestrator**. Implement Feature {{FEATURE_ID}}: "{{FEATURE_TITLE}}".
 
-**CRITICAL**: You MUST NOT exit until ALL work is complete and session-status.json is written. When you spawn subagents, wait for each to finish (run_in_background=false).
+**CRITICAL**: You MUST NOT exit until ALL work is complete and committed. When you spawn subagents, wait for each to finish (run_in_background=false).
 
 **Tier 2 — Dual Agent**: You handle context + planning directly. Then spawn Dev and Reviewer subagents. Spawn Dev and Reviewer agents via the Agent tool.
 
@@ -40,8 +40,7 @@ You are running in headless mode with a FINITE context window. Exceeding it will
 3. **Stay focused** — Do NOT explore code unrelated to this feature. No curiosity-driven reads.
 4. **One task at a time** — In Phase 3 (implement), complete and test one task before starting the next.
 5. **Minimize tool output** — When running commands, use `| head -20` or `| tail -20` to limit output. Never dump entire test suites or logs.
-6. **Write session-status.json early** — Write a preliminary status file at the START of Phase 3, not just at the end.
-7. **Incremental commits when possible** — If a feature has multiple independent tasks, commit after each completed task rather than one big commit at the end.
+6. **Incremental commits when possible** — If a feature has multiple independent tasks, commit after each completed task rather than one big commit at the end.
 
 ---
 
@@ -121,18 +120,6 @@ If either missing, write them yourself:
 
 ### Phase 3: Implement — Dev Subagent
 
-**Before spawning Dev**, write a preliminary session-status.json to `{{SESSION_STATUS_PATH}}`:
-```json
-{
-  "status": "partial",
-  "current_phase": 3,
-  "feature_id": "{{FEATURE_ID}}",
-  "session_id": "{{SESSION_ID}}",
-  "started_at": "<current ISO timestamp>"
-}
-```
-This ensures the pipeline sees a "partial" status even if the session crashes mid-implementation.
-
 Spawn Dev subagent (Agent tool, subagent_type="prizm-dev-team-dev", run_in_background=false).
 
 Prompt:
@@ -160,7 +147,7 @@ grep -q "## Implementation Log" .prizmkit/specs/{{FEATURE_SLUG}}/context-snapsho
 ```
 If GATE:MISSING — send message to Dev (re-spawn if needed): "Write the '## Implementation Log' section to context-snapshot.md before I can proceed to review. Include: files changed/created, key decisions, deviations from plan, notable discoveries."
 
-### Phase 4: Review — Reviewer Subagent
+### Phase 4: Review + Test — Reviewer Subagent
 
 Spawn Reviewer subagent (Agent tool, subagent_type="prizm-dev-team-reviewer", run_in_background=false).
 
@@ -172,7 +159,7 @@ Prompt:
 >    - Section 4: File Manifest (original file structure)
 >    - '## Implementation Log': what Dev changed, key decisions, discoveries
 > 2. Run prizmkit-code-review: spec compliance (against spec.md), code quality, correctness. Read ONLY files listed in Implementation Log.
-> 3. Write and execute integration tests covering all user stories from spec.md. Use `TEST_CMD=<TEST_CMD>` — do NOT try alternative test commands.
+> 3. Run the full test suite using `TEST_CMD=<TEST_CMD>`. Write and execute integration tests covering all user stories.
 > 4. Append '## Review Notes' to context-snapshot.md: issues found (with severity), test results, final verdict.
 > Report verdict: PASS, PASS_WITH_WARNINGS, or NEEDS_FIXES."
 
@@ -189,9 +176,9 @@ If GATE:MISSING — send message to Reviewer (re-spawn if needed): "Write the '#
 
 **CP-2**: Tests pass, verdict is not NEEDS_FIXES.
 
-### Phase 4.5: Architecture Sync & Memory Sedimentation (mandatory before commit)
+### Phase 5: Architecture Sync & Commit
 
-Run `/prizmkit-retrospective` — maintains `.prizm-docs/` (architecture index) and platform memory files:
+**5a.** Run `/prizmkit-retrospective` — maintains `.prizm-docs/` (architecture index) and platform memory files:
 1. **Structural sync**: Use `git diff --cached --name-status` to locate changed modules, update KEY_FILES/INTERFACES/DEPENDENCIES/file counts in affected `.prizm-docs/` files
 2. **Architecture knowledge** (feature sessions only): Extract TRAPS/RULES from completed work into `.prizm-docs/`
 3. **Memory sedimentation** (feature sessions only): Sediment DECISIONS and interface conventions to platform memory file (`CLAUDE.md` for Claude Code, BOTH `CODEBUDDY.md` AND `memory/MEMORY.md` for CodeBuddy)
@@ -199,49 +186,11 @@ Run `/prizmkit-retrospective` — maintains `.prizm-docs/` (architecture index)
 
 Doc maintenance pass condition (pipeline-enforced): `.prizm-docs/` changed in the final commit.
 
-### Phase 5: Session Status + Commit
-
-**5a. Write preliminary session-status.json** (safety net — ensures pipeline sees a status file even if session terminates during commit):
-
-Write to: `{{SESSION_STATUS_PATH}}`
-
-```json
-{
-  "session_id": "{{SESSION_ID}}",
-  "feature_id": "{{FEATURE_ID}}",
-  "feature_slug": "{{FEATURE_SLUG}}",
-  "exec_tier": 2,
-  "status": "partial",
-  "completed_phases": [0, 1, 2, 3, 4],
-  "current_phase": 5,
-  "checkpoint_reached": "CP-2",
-  "tasks_completed": 0,
-  "tasks_total": 0,
-  "errors": [],
-  "can_resume": false,
-  "resume_from_phase": null,
-  "docs_maintained": true,
-  "retrospective_done": true,
-  "artifacts": {
-    "context_snapshot_path": ".prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md",
-    "plan_path": ".prizmkit/specs/{{FEATURE_SLUG}}/plan.md"
-  },
-  "git_commit": "",
-  "timestamp": "<current ISO timestamp>"
-}
-```
-
 **5b. Commit** — Run `/prizmkit-committer` → `feat({{FEATURE_ID}}): {{FEATURE_TITLE}}`, do NOT push
 - MANDATORY: commit must be done via `/prizmkit-committer` skill. Do NOT run manual `git add`/`git commit` as a substitute.
 - Do NOT run `update-feature-status.py` here — the pipeline runner handles feature-list.json updates automatically after session exit.
 
-**5c. Update session-status.json to success** — After commit succeeds, update `{{SESSION_STATUS_PATH}}`:
-- Set `"status": "success"`
-- Set `"completed_phases": [0, 1, 2, 3, 4, 5]`
-- Set `"git_commit": "<actual commit hash from git log -1 --format=%H>"`
-- Set `"timestamp": "<current ISO timestamp>"`
-
-**5d. Final Clean Check** — Verify repository is clean:
+**5c. Final Clean Check** — Verify repository is clean:
 
 ```bash
 git status --short
@@ -264,17 +213,15 @@ git commit -m "chore({{FEATURE_ID}}): include session artifacts"
 | Context Snapshot | `.prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md` |
 | Dev Agent Def | {{DEV_SUBAGENT_PATH}} |
 | Reviewer Agent Def | {{REVIEWER_SUBAGENT_PATH}} |
-| Session Status Output | {{SESSION_STATUS_PATH}} |
 | Project Root | {{PROJECT_ROOT}} |
 
 ## Reminders
 
-- Tier 2: orchestrator builds context+plan, Dev implements, Reviewer reviews — use direct Agent spawn for agents
+- Tier 2: orchestrator builds context+plan, Dev implements, Reviewer reviews+tests — use direct Agent spawn for agents
 - Build context-snapshot.md FIRST; all subagents read it instead of re-reading source files
 - context-snapshot.md is append-only: orchestrator writes Sections 1-4, Dev appends Implementation Log, Reviewer appends Review Notes
 - Gate checks enforce Implementation Log and Review Notes are written before proceeding
 - 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, 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-tier3.md

@@ -11,7 +11,7 @@
 
 You are the **session orchestrator**. Implement Feature {{FEATURE_ID}}: "{{FEATURE_TITLE}}".
 
-**CRITICAL**: You MUST NOT exit until ALL work is complete and session-status.json is written. When you spawn subagents, wait for each to finish (run_in_background=false). Do NOT spawn agents in background and exit — that kills the session.
+**CRITICAL**: You MUST NOT exit until ALL work is complete and committed. When you spawn subagents, wait for each to finish (run_in_background=false). Do NOT spawn agents in background and exit — that kills the session.
 
 **Tier 3 — Full Team**: For complex features, use the full pipeline (Phase 0–6) with Dev + Reviewer agents spawned via the Agent tool.
 
@@ -61,8 +61,6 @@ tests/                — Validation + unit tests
 ### Version Isolation
 
 LLM context is frozen at prompt time. Modifying a skill source file during this session will NOT change the behavior of that skill within this session. The real risk is structural inconsistency.
-
-**When you modify any file in `dev-pipeline/scripts/`, `dev-pipeline/templates/`, or `core/skills/` that this pipeline actively uses**: set `reload_needed: true` in `session-status.json`. The pipeline runner will warn the operator after session completion.
 {{END_IF_MODE_SELF_EVOLVE}}
 
 ## ⚠️ Context Budget Rules (CRITICAL — read before any phase)
@@ -74,8 +72,7 @@ You are running in headless mode with a FINITE context window. Exceeding it will
 3. **Stay focused** — Do NOT explore code unrelated to this feature. No curiosity-driven reads.
 4. **One task at a time** — In Phase 4 (implement), complete and test one task before starting the next.
 5. **Minimize tool output** — When running commands, use `| head -20` or `| tail -20` to limit output. Never dump entire test suites or logs.
-6. **Write session-status.json early** — Write a preliminary status file at the START of Phase 4, not just at the end.
-7. **Incremental commits when possible** — If a feature has multiple independent tasks, commit after each completed task rather than one big commit at the end.
+6. **Incremental commits when possible** — If a feature has multiple independent tasks, commit after each completed task rather than one big commit at the end.
 
 ---
 
@@ -222,18 +219,6 @@ Wait for Reviewer to return.
 
 ### Phase 4: Implement — Dev Agent
 
-**Before spawning Dev**, write a preliminary session-status.json to `{{SESSION_STATUS_PATH}}`:
-```json
-{
-  "status": "partial",
-  "current_phase": 4,
-  "feature_id": "{{FEATURE_ID}}",
-  "session_id": "{{SESSION_ID}}",
-  "started_at": "<current ISO timestamp>"
-}
-```
-This ensures the pipeline sees a "partial" status even if the session crashes mid-implementation.
-
 Before spawning Dev, check plan.md Tasks section:
 ```bash
 grep -c '^\- \[ \]' .prizmkit/specs/{{FEATURE_SLUG}}/plan.md 2>/dev/null || echo 0
@@ -291,7 +276,7 @@ Wait for Dev to return. **If Dev times out before all tasks are `[x]`**:
 
 All tasks `[x]`, tests pass.
 
-### Phase 5: Review — Reviewer Agent
+### Phase 5: Review + Test — Reviewer Agent
 
 Spawn Reviewer agent (Agent tool, subagent_type="prizm-dev-team-reviewer", run_in_background=false).
 
@@ -315,7 +300,7 @@ Prompt:
 >    - Section 4: File Manifest (original file structure)
 >    - '## Implementation Log': what Dev changed, key decisions, discoveries
 > 2. Run prizmkit-code-review: spec compliance (against spec.md), code quality, correctness. Read ONLY files listed in Implementation Log.
-> 3. Write and execute integration tests covering all user stories from spec.md. Use `TEST_CMD=<TEST_CMD>` — do NOT try alternative test commands.
+> 3. Run the full test suite using `TEST_CMD=<TEST_CMD>`. Write and execute integration tests covering all user stories from spec.md.
 > 4. Append '## Review Notes' to context-snapshot.md: issues found (with severity), test results, final verdict.
 > Report verdict: PASS, PASS_WITH_WARNINGS, or NEEDS_FIXES."
 
@@ -353,86 +338,34 @@ bash {{VALIDATOR_SCRIPTS_DIR}}/validate-framework.sh
 
 - If ALL steps pass → proceed with commit below.
 - If any step fails → fix the issue and re-run. Maximum 2 fix-and-retry rounds.
-- After 2 failed rounds → mark session as `framework_validation_failed`, write session-status.json, and exit.
-
-**reload_needed check**: Review the Implementation Log in context-snapshot.md. If ANY of these paths were modified:
-- `dev-pipeline/scripts/*.py` or `dev-pipeline/scripts/*.sh`
-- `dev-pipeline/templates/*.md`
-- `core/skills/` (any skill used by the pipeline)
-
-Then set `"reload_needed": true` in session-status.json.
+- After 2 failed rounds → exit and let the pipeline runner handle the failure.
 {{END_IF_MODE_SELF_EVOLVE}}
 
 **For bug fixes**: run `/prizmkit-retrospective` for structural sync only (skip knowledge injection unless a new TRAPS was discovered). Use `fix(<scope>):` commit prefix.
 
-**7a.** Check if feature already committed:
+**6a.** Check if feature already committed:
 ```bash
 git log --oneline | grep "{{FEATURE_ID}}" | head -3
 ```
-- If a commit for `{{FEATURE_ID}}` already exists → **skip 7c** (do NOT run /prizmkit-committer, do NOT run git reset, do NOT stage or unstage anything). Proceed directly to Step 3.
-- If no existing commit → proceed normally with 7a–7c.
+- If a commit for `{{FEATURE_ID}}` already exists → **skip 6c** (do NOT run /prizmkit-committer, do NOT run git reset, do NOT stage or unstage anything). Proceed directly to Final Clean Check.
+- If no existing commit → proceed normally with 6a–6c.
 
-**7b.** Run `/prizmkit-retrospective` (**before commit**, maintains `.prizm-docs/` architecture index and platform memory files):
+**6b.** Run `/prizmkit-retrospective` (**before commit**, maintains `.prizm-docs/` architecture index and platform memory files):
 - **Structural sync**: update KEY_FILES/INTERFACES/DEPENDENCIES/file counts for changed modules
 - **Architecture knowledge** (feature sessions only): extract TRAPS, RULES from completed work into `.prizm-docs/`
 - **Memory sedimentation** (feature sessions only): sediment DECISIONS and interface conventions to platform memory file (`CLAUDE.md` for Claude Code, BOTH `CODEBUDDY.md` AND `memory/MEMORY.md` for CodeBuddy)
 - Stage all doc changes: `git add .prizm-docs/`
 - **For bug-fix sessions**: structural sync only, skip knowledge injection and memory sedimentation unless a genuinely new pitfall was discovered
 
-**7b-safety.** Write preliminary session-status.json (safety net — ensures pipeline sees a status file even if session terminates during commit):
-
-Write to: `{{SESSION_STATUS_PATH}}`
-
-```json
-{
-  "session_id": "{{SESSION_ID}}",
-  "feature_id": "{{FEATURE_ID}}",
-  "feature_slug": "{{FEATURE_SLUG}}",
-  "exec_tier": 3,
-  "status": "partial",
-  "completed_phases": [0, 1, 2, 3, 4, 5],
-  "current_phase": 6,
-  "checkpoint_reached": "CP-3",
-  "tasks_completed": 0,
-  "tasks_total": 0,
-  "errors": [],
-  "can_resume": false,
-  "resume_from_phase": null,
-  "docs_maintained": true,
-  "retrospective_done": true,
-  "artifacts": {
-    "context_snapshot_path": ".prizmkit/specs/{{FEATURE_SLUG}}/context-snapshot.md",
-    "spec_path": ".prizmkit/specs/{{FEATURE_SLUG}}/spec.md",
-    "plan_path": ".prizmkit/specs/{{FEATURE_SLUG}}/plan.md"
-  },
-  "git_commit": "",
-  "timestamp": "<current ISO timestamp>"
-}
-```
-
-**7c.** Run `/prizmkit-committer` → `feat({{FEATURE_ID}}): {{FEATURE_TITLE}}`, do NOT push
-
-**7d.** MANDATORY: commit must be done via `/prizmkit-committer` skill. Do NOT run manual `git add`/`git commit` as a substitute.
-
-**7e.** Do NOT run `update-feature-status.py` here — the pipeline runner handles feature-list.json updates automatically after session exit.
-
----
-
-## Step 3: Commit & Finalize Session Status
-
-**3a. Commit** — The commit was handled in Phase 6 (7c) above via `/prizmkit-committer`.
+**6c.** Run `/prizmkit-committer` → `feat({{FEATURE_ID}}): {{FEATURE_TITLE}}`, do NOT push
 
-**3b. Update session-status.json to success** — After commit succeeds, update `{{SESSION_STATUS_PATH}}`:
+**6d.** MANDATORY: commit must be done via `/prizmkit-committer` skill. Do NOT run manual `git add`/`git commit` as a substitute.
 
-Update the file to reflect final success:
-- Set `"status": "success"`
-- Set `"completed_phases": [0, 1, 2, 3, 4, 5, 6]`
-- Set `"git_commit": "<actual commit hash from git log -1 --format=%H>"`
-- Set `"timestamp": "<current ISO timestamp>"`
+**6e.** Do NOT run `update-feature-status.py` here — the pipeline runner handles feature-list.json updates automatically after session exit.
 
-### Step 3.1: Final Clean Check (before exit)
+### Final Clean Check (before exit)
 
-After updating `session-status.json`, verify repository is clean:
+Verify repository is clean:
 
 ```bash
 git status --short
@@ -456,17 +389,15 @@ git commit -m "chore({{FEATURE_ID}}): include session artifacts"
 | Team Config | `{{TEAM_CONFIG_PATH}}` |
 | Dev Agent Def | {{DEV_SUBAGENT_PATH}} |
 | Reviewer Agent Def | {{REVIEWER_SUBAGENT_PATH}} |
-| Session Status Output | {{SESSION_STATUS_PATH}} |
 | Project Root | {{PROJECT_ROOT}} |
 | Feature List Path | {{FEATURE_LIST_PATH}} |
 
 ## Reminders
 
-- Tier 3: full team — Dev (implementation) → Reviewer (review) — spawn agents directly via Agent tool
+- Tier 3: full team — Dev (implementation) → Reviewer (review + test) — spawn agents directly via Agent tool
 - context-snapshot.md is append-only: orchestrator writes Sections 1-4, Dev appends Implementation Log, Reviewer appends Review Notes
 - Gate checks enforce Implementation Log and Review Notes are written before proceeding
 - 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, 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/skills/_metadata.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.85",
+  "version": "1.0.87",
   "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

@@ -25,37 +25,16 @@ git status
 - If "nothing to commit, working tree clean": inform user and stop
 - If there are changes: proceed
 
-#### Step 2: Diff Analysis
-```bash
-git diff HEAD
-```
-Analyze:
-- Type: feat, fix, refactor, docs, test, chore, perf, style, ci, build
-- Scope: affected module name
-- Description: imperative mood summary
+#### Step 2: Condense Commit
+By consulting the primary agent or based on the existing context, condense this commit message.
 
 #### Step 3: Update CHANGELOG.md
 If CHANGELOG.md exists in the project root, append an entry following Keep a Changelog format under the `[Unreleased]` section. Match the existing style in the file.
 
 #### Step 4: Git Commit
-
-4a. Safety check before staging:
 ```bash
-git diff --name-only
-git ls-files --others --exclude-standard
+git add .
 ```
-Review the output for sensitive files. If any file matches these patterns, **STOP and warn the user**:
-- `.env`, `.env.*`
-- `*.key`, `*.pem`, `*.p12`
-- `credentials.*`, `*secret*`
-- `*.sqlite`, `*.db` (database files)
-
-4b. Stage and commit:
-```bash
-git add <specific-files>
-git diff --cached --name-only
-```
-Stage files explicitly by name rather than using `git add -A`, which can accidentally include sensitive files or large binaries that appeared between the safety check and staging. Review staged file list one final time, then:
 ```bash
 git commit -m "<type>(<scope>): <description>"
 ```
@@ -72,19 +51,12 @@ Then verify working tree is clean:
 git status
 ```
 - If "nothing to commit, working tree clean": commit verified successfully, proceed
-- **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?"
 - Yes: `git push`
 - No: Stop
 
-### Error Handling
-- If git diff is empty but untracked files exist: run `git add -N .` first (respects .gitignore)
-- If CHANGELOG.md script fails: update manually or ask user
-- If sensitive files are detected during Step 4a safety check: warn user and do NOT stage them automatically
-
 ## Example
 
 **Feature commit:**

package/package.json

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