prizmkit 1.0.35 → 1.0.45

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

@@ -25,6 +25,8 @@ set -euo pipefail
 #   LOG_CLEANUP_ENABLED   Run periodic log cleanup (default: 1)
 #   LOG_RETENTION_DAYS    Delete logs older than N days (default: 14)
 #   LOG_MAX_TOTAL_MB      Keep total logs under N MB via oldest-first cleanup (default: 1024)
+#   USE_WORKTREE          Enable git worktree isolation per session (default: 1). Set to 0 to disable.
+#   AUTO_PUSH             Auto-push to remote after successful worktree merge (default: 0). Set to 1 to enable.
 # ============================================================
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -40,6 +42,8 @@ LOG_CLEANUP_ENABLED=${LOG_CLEANUP_ENABLED:-1}
 LOG_RETENTION_DAYS=${LOG_RETENTION_DAYS:-14}
 LOG_MAX_TOTAL_MB=${LOG_MAX_TOTAL_MB:-1024}
 VERBOSE=${VERBOSE:-0}
+USE_WORKTREE=${USE_WORKTREE:-1}
+AUTO_PUSH=${AUTO_PUSH:-0}
 
 # Source shared common helpers (CLI/platform detection + logs + deps)
 source "$SCRIPT_DIR/lib/common.sh"
@@ -48,12 +52,19 @@ prizm_detect_cli_and_platform
 # Source shared heartbeat library
 source "$SCRIPT_DIR/lib/heartbeat.sh"
 
+# Source shared worktree library
+source "$SCRIPT_DIR/lib/worktree.sh"
+
 # Detect stream-json support
 detect_stream_json_support "$CLI_CMD"
 
 # Bug list path (set in main, used by cleanup trap)
 BUG_LIST=""
 
+# Active worktree tracking (for cleanup on interrupt)
+_ACTIVE_WORKTREE_PATH=""
+_ACTIVE_WORKTREE_BRANCH=""
+
 # ============================================================
 # Shared: Spawn AI CLI session and wait for result
 # ============================================================
@@ -65,6 +76,7 @@ spawn_and_wait_session() {
     local bootstrap_prompt="$4"
     local session_dir="$5"
     local max_retries="$6"
+    local worktree_path="${7:-}"
 
     local session_log="$session_dir/logs/session.log"
     local progress_json="$session_dir/logs/progress.json"
@@ -88,6 +100,14 @@ spawn_and_wait_session() {
     # within an existing Claude Code session (e.g. via launch-bugfix-daemon.sh).
     unset CLAUDECODE 2>/dev/null || true
 
+    # If worktree path is provided, cd into it for the AI CLI session
+    local _saved_pwd=""
+    if [[ -n "$worktree_path" && -d "$worktree_path" ]]; then
+        _saved_pwd="$(pwd)"
+        cd "$worktree_path"
+        log_info "Running AI CLI in worktree: $worktree_path"
+    fi
+
     case "$CLI_CMD" in
         *claude*)
             # Claude Code: prompt via -p, --dangerously-skip-permissions for auto-accept
@@ -113,6 +133,11 @@ spawn_and_wait_session() {
     esac
     local cli_pid=$!
 
+    # Restore original directory if we changed it
+    if [[ -n "$_saved_pwd" ]]; then
+        cd "$_saved_pwd"
+    fi
+
     # Start progress parser (no-op if stream-json not supported)
     start_progress_parser "$session_log" "$progress_json" "$SCRIPTS_DIR"
     local parser_pid="${_PARSER_PID:-}"
@@ -206,6 +231,15 @@ cleanup() {
     # Kill all child processes (claude-internal, heartbeat, progress parser, etc.)
     kill 0 2>/dev/null || true
 
+    # Clean up active worktree if any
+    if [[ -n "$_ACTIVE_WORKTREE_PATH" ]]; then
+        local _project_root
+        _project_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+        worktree_cleanup "$_project_root" "$_ACTIVE_WORKTREE_PATH" "$_ACTIVE_WORKTREE_BRANCH"
+        _ACTIVE_WORKTREE_PATH=""
+        _ACTIVE_WORKTREE_BRANCH=""
+    fi
+
     if [[ -n "$BUG_LIST" && -f "$BUG_LIST" ]]; then
         python3 "$SCRIPTS_DIR/update-bug-status.py" \
             --bug-list "$BUG_LIST" \
@@ -386,17 +420,80 @@ sys.exit(1)
         echo ""
         log_warn "Interrupted. Killing session..."
         kill 0 2>/dev/null || true
+        # Clean up active worktree if any
+        if [[ -n "$_ACTIVE_WORKTREE_PATH" ]]; then
+            local _proj_root
+            _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+            worktree_cleanup "$_proj_root" "$_ACTIVE_WORKTREE_PATH" "$_ACTIVE_WORKTREE_BRANCH"
+            _ACTIVE_WORKTREE_PATH=""
+            _ACTIVE_WORKTREE_BRANCH=""
+        fi
         log_info "Session log: $session_dir/logs/session.log"
         exit 130
     }
     trap cleanup_single_bug SIGINT SIGTERM
 
     _SPAWN_RESULT=""
+
+    # Worktree lifecycle: create worktree before session if enabled
+    local _wt_path="" _wt_branch=""
+    if [[ "$USE_WORKTREE" == "1" ]]; then
+        local _proj_root
+        _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+        local _wt_base="$STATE_DIR/worktrees"
+        local _source_branch
+        _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
+
+        # Prune stale worktrees before creating new one
+        worktree_prune_stale "$_proj_root"
+
+        _WORKTREE_PATH=""
+        _WORKTREE_BRANCH=""
+        if worktree_create "$_proj_root" "$_wt_base" "$session_id" "$_source_branch"; then
+            _wt_path="$_WORKTREE_PATH"
+            _wt_branch="$_WORKTREE_BRANCH"
+            _ACTIVE_WORKTREE_PATH="$_wt_path"
+            _ACTIVE_WORKTREE_BRANCH="$_wt_branch"
+        else
+            log_warn "Failed to create worktree; running session in main working tree"
+        fi
+    fi
+
     spawn_and_wait_session \
         "$bug_id" "$bug_list" "$session_id" \
-        "$bootstrap_prompt" "$session_dir" 999
+        "$bootstrap_prompt" "$session_dir" 999 "$_wt_path"
     local session_status="$_SPAWN_RESULT"
 
+    # Worktree lifecycle: merge and cleanup after session
+    if [[ -n "$_wt_path" && -n "$_wt_branch" ]]; then
+        local _proj_root
+        _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+        local _target_branch
+        _target_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
+
+        if [[ "$session_status" == "success" ]]; then
+            _MERGE_RESULT=""
+            worktree_merge "$_proj_root" "$_wt_branch" "$_target_branch" "$bug_id" "$session_id" || true
+            if [[ "$_MERGE_RESULT" == "success" ]]; then
+                if [[ "$AUTO_PUSH" == "1" ]]; then
+                    log_info "AUTO_PUSH enabled; pushing to remote..."
+                    git -C "$_proj_root" push 2>/dev/null || log_warn "Auto-push failed"
+                fi
+                worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
+            elif [[ "$_MERGE_RESULT" == "conflict" ]]; then
+                session_status="merge_conflict"
+                _SPAWN_RESULT="merge_conflict"
+                log_warn "Worktree branch preserved for manual conflict resolution: $_wt_branch"
+            else
+                worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
+            fi
+        else
+            worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
+        fi
+        _ACTIVE_WORKTREE_PATH=""
+        _ACTIVE_WORKTREE_BRANCH=""
+    fi
+
     echo ""
     if [[ "$session_status" == "success" ]]; then
         log_success "════════════════════════════════════════════════════"
@@ -432,6 +529,13 @@ main() {
     check_dependencies
     run_log_cleanup
 
+    # Prune stale worktree references at startup
+    if [[ "$USE_WORKTREE" == "1" ]]; then
+        local _prune_root
+        _prune_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+        worktree_prune_stale "$_prune_root"
+    fi
+
     # Initialize pipeline state if needed
     if [[ ! -f "$STATE_DIR/pipeline.json" ]]; then
         log_info "Initializing bugfix pipeline state..."
@@ -557,9 +661,70 @@ os.replace(tmp, target)
         # Spawn session
         log_info "Spawning AI CLI session: $session_id"
         _SPAWN_RESULT=""
+
+        # Worktree lifecycle: create worktree before session if enabled
+        local _wt_path="" _wt_branch=""
+        if [[ "$USE_WORKTREE" == "1" ]]; then
+            local _proj_root
+            _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+            local _wt_base="$STATE_DIR/worktrees"
+            local _source_branch
+            _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
+
+            _WORKTREE_PATH=""
+            _WORKTREE_BRANCH=""
+            if worktree_create "$_proj_root" "$_wt_base" "$session_id" "$_source_branch"; then
+                _wt_path="$_WORKTREE_PATH"
+                _wt_branch="$_WORKTREE_BRANCH"
+                _ACTIVE_WORKTREE_PATH="$_wt_path"
+                _ACTIVE_WORKTREE_BRANCH="$_wt_branch"
+            else
+                log_warn "Failed to create worktree; running session in main working tree"
+            fi
+        fi
+
         spawn_and_wait_session \
             "$bug_id" "$bug_list" "$session_id" \
-            "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES"
+            "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES" "$_wt_path"
+
+        # Worktree lifecycle: merge and cleanup after session
+        if [[ -n "$_wt_path" && -n "$_wt_branch" ]]; then
+            local _proj_root
+            _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+            local _target_branch
+            _target_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
+            local _session_status="$_SPAWN_RESULT"
+
+            if [[ "$_session_status" == "success" ]]; then
+                _MERGE_RESULT=""
+                worktree_merge "$_proj_root" "$_wt_branch" "$_target_branch" "$bug_id" "$session_id" || true
+                if [[ "$_MERGE_RESULT" == "success" ]]; then
+                    if [[ "$AUTO_PUSH" == "1" ]]; then
+                        log_info "AUTO_PUSH enabled; pushing to remote..."
+                        git -C "$_proj_root" push 2>/dev/null || log_warn "Auto-push failed"
+                    fi
+                    worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
+                elif [[ "$_MERGE_RESULT" == "conflict" ]]; then
+                    _SPAWN_RESULT="merge_conflict"
+                    log_warn "Worktree branch preserved for manual conflict resolution: $_wt_branch"
+                    # Update bug status to merge_conflict
+                    python3 "$SCRIPTS_DIR/update-bug-status.py" \
+                        --bug-list "$bug_list" \
+                        --state-dir "$STATE_DIR" \
+                        --bug-id "$bug_id" \
+                        --session-status "merge_conflict" \
+                        --session-id "$session_id" \
+                        --max-retries "$MAX_RETRIES" \
+                        --action update >/dev/null 2>&1 || true
+                else
+                    worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
+                fi
+            else
+                worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
+            fi
+            _ACTIVE_WORKTREE_PATH=""
+            _ACTIVE_WORKTREE_BRANCH=""
+        fi
 
         session_count=$((session_count + 1))
 

package/bundled/dev-pipeline/run.sh

@@ -28,6 +28,8 @@ set -euo pipefail
 #   LOG_RETENTION_DAYS    Delete logs older than N days (default: 14)
 #   LOG_MAX_TOTAL_MB      Keep total logs under N MB via oldest-first cleanup (default: 1024)
 #   PIPELINE_MODE         Override mode for all features: lite|standard|full|self-evolve (used by daemon)
+#   USE_WORKTREE          Enable git worktree isolation per session (default: 1). Set to 0 to disable.
+#   AUTO_PUSH             Auto-push to remote after successful worktree merge (default: 0). Set to 1 to enable.
 # ============================================================
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -44,6 +46,8 @@ LOG_RETENTION_DAYS=${LOG_RETENTION_DAYS:-14}
 LOG_MAX_TOTAL_MB=${LOG_MAX_TOTAL_MB:-1024}
 VERBOSE=${VERBOSE:-0}
 MODEL=${MODEL:-""}
+USE_WORKTREE=${USE_WORKTREE:-1}
+AUTO_PUSH=${AUTO_PUSH:-0}
 
 # Source shared common helpers (CLI/platform detection + logs + deps)
 source "$SCRIPT_DIR/lib/common.sh"
@@ -52,12 +56,19 @@ prizm_detect_cli_and_platform
 # Source shared heartbeat library
 source "$SCRIPT_DIR/lib/heartbeat.sh"
 
+# Source shared worktree library
+source "$SCRIPT_DIR/lib/worktree.sh"
+
 # Detect stream-json support
 detect_stream_json_support "$CLI_CMD"
 
 # Feature list path (set in main, used by cleanup trap)
 FEATURE_LIST=""
 
+# Active worktree tracking (for cleanup on interrupt)
+_ACTIVE_WORKTREE_PATH=""
+_ACTIVE_WORKTREE_BRANCH=""
+
 # ============================================================
 # Shared: Spawn an AI CLI session and wait for result
 # ============================================================
@@ -72,6 +83,7 @@ FEATURE_LIST=""
 #   $4 - bootstrap_prompt (path)
 #   $5 - session_dir
 #   $6 - max_retries (for status update)
+#   $7 - worktree_path (optional; if set, AI CLI runs inside this directory)
 spawn_and_wait_session() {
     local feature_id="$1"
     local feature_list="$2"
@@ -79,6 +91,7 @@ spawn_and_wait_session() {
     local bootstrap_prompt="$4"
     local session_dir="$5"
     local max_retries="$6"
+    local worktree_path="${7:-}"
 
     local session_log="$session_dir/logs/session.log"
     local progress_json="$session_dir/logs/progress.json"
@@ -103,6 +116,14 @@ spawn_and_wait_session() {
     # within an existing Claude Code session (e.g. via launch-daemon.sh).
     unset CLAUDECODE 2>/dev/null || true
 
+    # If worktree path is provided, cd into it for the AI CLI session
+    local _saved_pwd=""
+    if [[ -n "$worktree_path" && -d "$worktree_path" ]]; then
+        _saved_pwd="$(pwd)"
+        cd "$worktree_path"
+        log_info "Running AI CLI in worktree: $worktree_path"
+    fi
+
     case "$CLI_CMD" in
         *claude*)
             # Claude Code: prompt via -p argument, --dangerously-skip-permissions for auto-accept
@@ -128,6 +149,11 @@ spawn_and_wait_session() {
     esac
     local cbc_pid=$!
 
+    # Restore original directory if we changed it
+    if [[ -n "$_saved_pwd" ]]; then
+        cd "$_saved_pwd"
+    fi
+
     # Start progress parser (no-op if stream-json not supported)
     start_progress_parser "$session_log" "$progress_json" "$SCRIPTS_DIR"
     local parser_pid="${_PARSER_PID:-}"
@@ -254,6 +280,15 @@ cleanup() {
     # Kill all child processes (claude-internal, heartbeat, progress parser, etc.)
     kill 0 2>/dev/null || true
 
+    # Clean up active worktree if any
+    if [[ -n "$_ACTIVE_WORKTREE_PATH" ]]; then
+        local _project_root
+        _project_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+        worktree_cleanup "$_project_root" "$_ACTIVE_WORKTREE_PATH" "$_ACTIVE_WORKTREE_BRANCH"
+        _ACTIVE_WORKTREE_PATH=""
+        _ACTIVE_WORKTREE_BRANCH=""
+    fi
+
     if [[ -n "$FEATURE_LIST" && -f "$FEATURE_LIST" ]]; then
         python3 "$SCRIPTS_DIR/update-feature-status.py" \
             --feature-list "$FEATURE_LIST" \
@@ -588,17 +623,80 @@ sys.exit(1)
         log_warn "Interrupted. Killing session..."
         # Kill all child processes
         kill 0 2>/dev/null || true
+        # Clean up active worktree if any
+        if [[ -n "$_ACTIVE_WORKTREE_PATH" ]]; then
+            local _proj_root
+            _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+            worktree_cleanup "$_proj_root" "$_ACTIVE_WORKTREE_PATH" "$_ACTIVE_WORKTREE_BRANCH"
+            _ACTIVE_WORKTREE_PATH=""
+            _ACTIVE_WORKTREE_BRANCH=""
+        fi
         log_info "Session log: $session_dir/logs/session.log"
         exit 130
     }
     trap cleanup_single_feature SIGINT SIGTERM
 
     _SPAWN_RESULT=""
+
+    # Worktree lifecycle: create worktree before session if enabled
+    local _wt_path="" _wt_branch=""
+    if [[ "$USE_WORKTREE" == "1" ]]; then
+        local _proj_root
+        _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+        local _wt_base="$STATE_DIR/worktrees"
+        local _source_branch
+        _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
+
+        # Prune stale worktrees before creating new one
+        worktree_prune_stale "$_proj_root"
+
+        _WORKTREE_PATH=""
+        _WORKTREE_BRANCH=""
+        if worktree_create "$_proj_root" "$_wt_base" "$session_id" "$_source_branch"; then
+            _wt_path="$_WORKTREE_PATH"
+            _wt_branch="$_WORKTREE_BRANCH"
+            _ACTIVE_WORKTREE_PATH="$_wt_path"
+            _ACTIVE_WORKTREE_BRANCH="$_wt_branch"
+        else
+            log_warn "Failed to create worktree; running session in main working tree"
+        fi
+    fi
+
     spawn_and_wait_session \
         "$feature_id" "$feature_list" "$session_id" \
-        "$bootstrap_prompt" "$session_dir" 999
+        "$bootstrap_prompt" "$session_dir" 999 "$_wt_path"
     local session_status="$_SPAWN_RESULT"
 
+    # Worktree lifecycle: merge and cleanup after session
+    if [[ -n "$_wt_path" && -n "$_wt_branch" ]]; then
+        local _proj_root
+        _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+        local _target_branch
+        _target_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
+
+        if [[ "$session_status" == "success" ]]; then
+            _MERGE_RESULT=""
+            worktree_merge "$_proj_root" "$_wt_branch" "$_target_branch" "$feature_id" "$session_id" || true
+            if [[ "$_MERGE_RESULT" == "success" ]]; then
+                if [[ "$AUTO_PUSH" == "1" ]]; then
+                    log_info "AUTO_PUSH enabled; pushing to remote..."
+                    git -C "$_proj_root" push 2>/dev/null || log_warn "Auto-push failed"
+                fi
+                worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
+            elif [[ "$_MERGE_RESULT" == "conflict" ]]; then
+                session_status="merge_conflict"
+                _SPAWN_RESULT="merge_conflict"
+                log_warn "Worktree branch preserved for manual conflict resolution: $_wt_branch"
+            else
+                worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
+            fi
+        else
+            worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
+        fi
+        _ACTIVE_WORKTREE_PATH=""
+        _ACTIVE_WORKTREE_BRANCH=""
+    fi
+
     echo ""
     if [[ "$session_status" == "success" ]]; then
         # Self-evolve mode: run framework validation after successful session
@@ -668,6 +766,13 @@ main() {
     check_dependencies
     run_log_cleanup
 
+    # Prune stale worktree references at startup
+    if [[ "$USE_WORKTREE" == "1" ]]; then
+        local _prune_root
+        _prune_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+        worktree_prune_stale "$_prune_root"
+    fi
+
     # Initialize pipeline state if needed
     if [[ ! -f "$STATE_DIR/pipeline.json" ]]; then
         log_info "Initializing pipeline state..."
@@ -842,11 +947,73 @@ os.replace(tmp, target)
         # Spawn session and wait
         log_info "Spawning AI CLI session: $session_id"
         _SPAWN_RESULT=""
+
+        # Worktree lifecycle: create worktree before session if enabled
+        local _wt_path="" _wt_branch=""
+        if [[ "$USE_WORKTREE" == "1" ]]; then
+            local _proj_root
+            _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+            local _wt_base="$STATE_DIR/worktrees"
+            local _source_branch
+            _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
+
+            _WORKTREE_PATH=""
+            _WORKTREE_BRANCH=""
+            if worktree_create "$_proj_root" "$_wt_base" "$session_id" "$_source_branch"; then
+                _wt_path="$_WORKTREE_PATH"
+                _wt_branch="$_WORKTREE_BRANCH"
+                _ACTIVE_WORKTREE_PATH="$_wt_path"
+                _ACTIVE_WORKTREE_BRANCH="$_wt_branch"
+            else
+                log_warn "Failed to create worktree; running session in main working tree"
+            fi
+        fi
+
         spawn_and_wait_session \
             "$feature_id" "$feature_list" "$session_id" \
-            "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES"
+            "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES" "$_wt_path"
         local session_status="$_SPAWN_RESULT"
 
+        # Worktree lifecycle: merge and cleanup after session
+        if [[ -n "$_wt_path" && -n "$_wt_branch" ]]; then
+            local _proj_root
+            _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+            local _target_branch
+            _target_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
+
+            if [[ "$session_status" == "success" ]]; then
+                _MERGE_RESULT=""
+                worktree_merge "$_proj_root" "$_wt_branch" "$_target_branch" "$feature_id" "$session_id" || true
+                if [[ "$_MERGE_RESULT" == "success" ]]; then
+                    if [[ "$AUTO_PUSH" == "1" ]]; then
+                        log_info "AUTO_PUSH enabled; pushing to remote..."
+                        git -C "$_proj_root" push 2>/dev/null || log_warn "Auto-push failed"
+                    fi
+                    worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
+                elif [[ "$_MERGE_RESULT" == "conflict" ]]; then
+                    session_status="merge_conflict"
+                    _SPAWN_RESULT="merge_conflict"
+                    log_warn "Worktree branch preserved for manual conflict resolution: $_wt_branch"
+                    # Update feature status to merge_conflict
+                    python3 "$SCRIPTS_DIR/update-feature-status.py" \
+                        --feature-list "$feature_list" \
+                        --state-dir "$STATE_DIR" \
+                        --feature-id "$feature_id" \
+                        --session-status "merge_conflict" \
+                        --session-id "$session_id" \
+                        --max-retries "$MAX_RETRIES" \
+                        --action update >/dev/null 2>&1 || true
+                else
+                    worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
+                fi
+            else
+                # Non-success: cleanup worktree
+                worktree_cleanup "$_proj_root" "$_wt_path" "$_wt_branch"
+            fi
+            _ACTIVE_WORKTREE_PATH=""
+            _ACTIVE_WORKTREE_BRANCH=""
+        fi
+
         session_count=$((session_count + 1))
 
         # Brief pause before next iteration

package/bundled/dev-pipeline/scripts/check-session-status.py

@@ -66,7 +66,7 @@ def determine_status(data):
     """Determine the single-line status string from the parsed data.
 
     Returns one of: success, partial_resumable, partial_not_resumable,
-    failed, commit_missing, docs_missing.
+    failed, commit_missing, docs_missing, merge_conflict.
     """
     status = data.get("status", "")
 
@@ -84,6 +84,8 @@ def determine_status(data):
         return "commit_missing"
     elif status == "docs_missing":
         return "docs_missing"
+    elif status == "merge_conflict":
+        return "merge_conflict"
     else:
         # Unknown status value — treat as crashed
         return "crashed"

package/bundled/dev-pipeline/scripts/generate-bootstrap-prompt.py

@@ -408,12 +408,6 @@ def build_replacements(args, feature, features, global_context, script_dir):
         )
 
     # Agent definitions are .md files in the platform-specific agents dir
-    coordinator_subagent = os.path.join(
-        agents_dir, "prizm-dev-team-coordinator.md",
-    )
-    pm_subagent = os.path.join(
-        agents_dir, "prizm-dev-team-pm.md",
-    )
     dev_subagent = os.path.join(
         agents_dir, "prizm-dev-team-dev.md",
     )
@@ -475,8 +469,6 @@ def build_replacements(args, feature, features, global_context, script_dir):
         ),
         "{{GLOBAL_CONTEXT}}": format_global_context(global_context),
         "{{TEAM_CONFIG_PATH}}": team_config_path,
-        "{{COORDINATOR_SUBAGENT_PATH}}": coordinator_subagent,
-        "{{PM_SUBAGENT_PATH}}": pm_subagent,
         "{{DEV_SUBAGENT_PATH}}": dev_subagent,
         "{{REVIEWER_SUBAGENT_PATH}}": reviewer_subagent,
         "{{VALIDATOR_SCRIPTS_DIR}}": validator_scripts_dir,

package/bundled/dev-pipeline/scripts/update-bug-status.py

@@ -39,6 +39,7 @@ SESSION_STATUS_VALUES = [
     "failed",
     "crashed",
     "timed_out",
+    "merge_conflict",
 ]
 
 TERMINAL_STATUSES = {"completed", "failed", "skipped", "needs_info"}
@@ -237,6 +238,25 @@ def action_update(args, bug_list_path, state_dir):
         if err:
             error_out("Failed to update bug-fix-list.json: {}".format(err))
             return
+    elif session_status == "merge_conflict":
+        # Degraded outcome: keep artifacts for retry (branch preserves work)
+        bs["retry_count"] = bs.get("retry_count", 0) + 1
+
+        if bs["retry_count"] >= max_retries:
+            bs["status"] = "failed"
+            target_status = "failed"
+        else:
+            bs["status"] = "merge_conflict"
+            target_status = "merge_conflict"
+
+        bs["resume_from_phase"] = None
+        bs["sessions"] = []
+        bs["last_session_id"] = None
+
+        err = update_bug_in_list(bug_list_path, bug_id, target_status)
+        if err:
+            error_out("Failed to update bug-fix-list.json: {}".format(err))
+            return
     else:
         bs["retry_count"] = bs.get("retry_count", 0) + 1
 
@@ -285,7 +305,10 @@ def action_update(args, bug_list_path, state_dir):
         "resume_from_phase": bs.get("resume_from_phase"),
         "updated_at": bs["updated_at"],
     }
-    if session_status != "success":
+    if session_status == "merge_conflict":
+        summary["degraded_reason"] = "merge_conflict"
+        summary["restart_policy"] = "finalization_retry"
+    elif session_status != "success":
         summary["restart_policy"] = "full_restart"
         summary["cleanup_performed"] = cleaned
 

package/bundled/dev-pipeline/scripts/update-feature-status.py

@@ -44,6 +44,7 @@ SESSION_STATUS_VALUES = [
     "timed_out",
     "commit_missing",
     "docs_missing",
+    "merge_conflict",
 ]
 
 TERMINAL_STATUSES = {"completed", "failed", "skipped"}
@@ -441,7 +442,7 @@ def action_update(args, feature_list_path, state_dir):
         if err:
             error_out("Failed to update feature-list.json: {}".format(err))
             return
-    elif session_status in ("commit_missing", "docs_missing"):
+    elif session_status in ("commit_missing", "docs_missing", "merge_conflict"):
         # Degraded outcome: keep artifacts for retry and expose specific status.
         fs["retry_count"] = fs.get("retry_count", 0) + 1
 
@@ -509,7 +510,7 @@ def action_update(args, feature_list_path, state_dir):
         "resume_from_phase": fs.get("resume_from_phase"),
         "updated_at": fs["updated_at"],
     }
-    if session_status in ("commit_missing", "docs_missing"):
+    if session_status in ("commit_missing", "docs_missing", "merge_conflict"):
         summary["degraded_reason"] = session_status
         summary["restart_policy"] = "finalization_retry"
     elif session_status != "success":

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

@@ -72,7 +72,7 @@ If MISSING — build it now:
    - **Section 1 — Feature Brief**: feature description + acceptance criteria (copy from above)
    - **Section 2 — Project Structure**: output of relevant `ls src/` calls
    - **Section 3 — Prizm Context**: content of root.prizm and relevant L1/L2 docs
-   - **Section 4 — Existing Source Files**: full content of each related file as code block
+   - **Section 4 — Existing Source Files**: **full verbatim content** of each related file in fenced code blocks (with `### path/to/file` heading and line count). Include ALL files needed for implementation and review — downstream phases read this section instead of re-reading individual source files
    - **Section 5 — Existing Tests**: full content of related test files as code block
 
 ### Phase 2: Plan & Tasks
@@ -81,7 +81,7 @@ If MISSING — build it now:
 ls .prizmkit/specs/{{FEATURE_SLUG}}/ 2>/dev/null
 ```
 
-If plan.md or tasks.md missing, write them directly (no PM needed):
+If plan.md or tasks.md missing, write them directly:
 - `plan.md`: key components, data flow, files to create/modify (under 80 lines)
 - `tasks.md`: checklist with `[ ]` checkboxes, each task = one implementable unit
 
@@ -129,15 +129,9 @@ Stage any `.prizm-docs/` changes produced: `git add .prizm-docs/`
 ### Phase 5: Commit
 
 - Run `/prizmkit-summarize` → archive to REGISTRY.md
-- Mark feature complete:
-  ```bash
-  python3 {{VALIDATOR_SCRIPTS_DIR}}/update-feature-status.py \
-    --feature-list "{{FEATURE_LIST_PATH}}" \
-    --state-dir "{{PROJECT_ROOT}}/dev-pipeline/state" \
-    --feature-id "{{FEATURE_ID}}" --session-id "{{SESSION_ID}}" --action complete
-  ```
 - 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.
 
 ---