prizmkit 1.0.85 → 1.0.86

package/bundled/VERSION.json

@@ -1,5 +1,5 @@
 {
-  "frameworkVersion": "1.0.85",
-  "bundledAt": "2026-03-22T07:41:52.990Z",
-  "bundledFrom": "cf22ce6"
+  "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/run-bugfix.sh

@@ -444,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 ""
@@ -563,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
 
@@ -641,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

@@ -788,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 ""
@@ -981,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
 
@@ -1096,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/skills/_metadata.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.85",
+  "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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prizmkit",
-  "version": "1.0.85",
+  "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": {