prizmkit 1.0.45 → 1.0.58

package/bundled/VERSION.json

@@ -1,5 +1,5 @@
 {
-  "frameworkVersion": "1.0.45",
-  "bundledAt": "2026-03-18T12:24:34.664Z",
-  "bundledFrom": "6127c1a"
+  "frameworkVersion": "1.0.58",
+  "bundledAt": "2026-03-19T03:51:21.257Z",
+  "bundledFrom": "ce2eaa5"
 }

package/bundled/adapters/claude/agent-adapter.js

@@ -65,7 +65,8 @@ export function convertAgent(agentContent, options = {}) {
     'run `/$1` command'
   );
 
-  // Replace prizmkit.xxx shorthand with /prizmkit-xxx
+  // Legacy fallback: replace any remaining prizmkit.xxx shorthand with /prizmkit-xxx
+  // Core files now use /prizmkit-xxx natively, but this catches any stragglers
   convertedBody = convertedBody.replace(
     /prizmkit\.(\w+)/g,
     (match, sub) => `/prizmkit-${sub.replace(/_/g, '-')}`

package/bundled/adapters/claude/command-adapter.js

@@ -56,7 +56,7 @@ export function convertSkillToCommand(skillContent, skillName) {
   const { frontmatter, body } = parseFrontmatter(skillContent);
 
   // Claude Code command frontmatter only uses description
-  // Also convert prizmkit.xxx references in the description field
+  // Also convert any remaining prizmkit.xxx references in the description field (legacy fallback)
   let desc = frontmatter.description || `PrizmKit ${skillName} command`;
   desc = desc.replace(/prizmkit\.(\w+)/g, (_m, sub) => `/${toClaudePrizmkitCommand(sub)}`);
 
@@ -74,13 +74,14 @@ export function convertSkillToCommand(skillContent, skillName) {
     `.claude/command-assets/${skillName}`
   );
 
-  // Replace "invoke the X skill" or "prizmkit.X" patterns with /X slash command
+  // Replace "invoke the X skill" or "prizmkit.X" patterns with /X slash command (legacy fallback)
   convertedBody = convertedBody.replace(
     /invoke\s+(?:the\s+)?[`"]?(\w[\w-]*)[`"]?\s+skill/gi,
     'run the `/$1` command'
   );
 
-  // Replace prizmkit.xxx with /prizmkit-xxx for Claude Code
+  // Legacy fallback: replace any remaining prizmkit.xxx with /prizmkit-xxx for Claude Code
+  // Core files now use /prizmkit-xxx natively, but this catches any stragglers
   convertedBody = convertedBody.replace(
     /prizmkit\.(\w+)/g,
     (_match, sub) => {

package/bundled/agents/prizm-dev-team-dev.md

@@ -47,7 +47,7 @@ skills: prizmkit-implement, prizmkit-prizm-docs
 - 不进行集成测试（Reviewer 的职责）
 - **不执行任何 git 操作**（git commit / git add / git reset / git push 均禁止 — 由 Orchestrator 通过 /prizmkit-committer 统一提交）
 - 不修改 `.prizmkit/specs/` 中除 `plan.md`（标记 Tasks section [x]）以外的任何文件
-- 不为 bug 修复创建新的文档条目；bug 修复是现有功能的完善，应更新原始功能的文档而非在 REGISTRY.md 中创建新条目
+- 不为 bug 修复创建新的文档条目；bug 修复是现有功能的完善，应更新原始功能的文档
 - 不使用 TaskCreate/TaskUpdate 创建或修改 Orchestrator 层的任务（Task 工具仅用于内部进度追踪，且任务 ID 在各 agent 子会话中互不共享）
 
 ### 行为规则

package/bundled/dev-pipeline/README.md

@@ -221,7 +221,7 @@ run.sh main loop
   ├─ AI CLI session            # cbc --print -y < prompt (CodeBuddy)
   │   │                        # claude --print -p "$(cat prompt)" --yes (Claude Code)
   │   └─ prizm-dev-team       # Multi-agent team implements the feature
-  │       ├─ Orchestrator    # Main agent: init, plan, schedule, summarize, commit
+  │       ├─ Orchestrator    # Main agent: init, plan, schedule, retrospective, commit
   │       ├─ Dev x N          # Implementation with TDD
   │       └─ Reviewer        # Analyze + code review
   │
@@ -247,7 +247,7 @@ Each AI CLI session drives the prizm-dev-team through these phases. **All phases
 | 5 | Implement | Dev x N | `prizmkit-implement` | Code + tests, plan.md Tasks marked `[x]` |
 | 6 | Review | Reviewer | `prizmkit-code-review` | Integration tests, review report |
 | 7 | Fix Loop | Dev | — | Max 3 rounds of fixes |
-| 8 | Summarize & Commit | Orchestrator | `prizmkit-summarize`, `prizmkit-committer`, `prizmkit-retrospective` | REGISTRY.md, git commit, .prizm-docs/ updated |
+| 8 | Retrospective & Commit | Orchestrator | `prizmkit-retrospective`, `prizmkit-committer` | .prizm-docs/ synced + enriched, git commit |
 
 ### Feature Dependency Resolution
 
@@ -383,7 +383,6 @@ Each feature generates artifacts in a dedicated subdirectory under `.prizmkit/sp
 .prizmkit/
 ├── config.json                          # PrizmKit configuration
 └── specs/
-    ├── REGISTRY.md                      # Feature registry (Phase 9 appends here)
     ├── 001-project-infrastructure-setup/
     │   ├── spec.md                      # Phase 1: Feature specification
     │   ├── checklists/
@@ -574,7 +573,7 @@ dev-pipeline/bugfix-state/        # Runtime state (gitignored)
 | Ordering | Dependencies DAG → priority | N/A (single refactor per session) | Severity → priority (no dependencies) |
 | Phases | 10-phase (specify → plan → tasks → implement → review) | 6-phase (analyze → plan → tasks → implement → review → commit) | 5-phase (triage → reproduce → fix → verify → commit) |
 | Agents | Orchestrator + Dev + Reviewer | Dev + Reviewer only | Dev + Reviewer only |
-| Artifacts | spec.md, plan.md, tasks.md, REGISTRY.md | refactor-analysis.md, plan.md, tasks.md | fix-plan.md, fix-report.md only |
+| Artifacts | spec.md, plan.md, tasks.md | refactor-analysis.md, plan.md, tasks.md | fix-plan.md, fix-report.md only |
 | Commit prefix | `feat(<scope>):` | `refactor(<scope>):` | `fix(<scope>):` |
 | Scope Guard | N/A | ✅ (behavior change → STOP) | N/A |
 | Test Strategy | TDD per task | Full suite after EVERY task | Reproduction test |

package/bundled/dev-pipeline/assets/prizm-dev-team-integration.md

@@ -20,7 +20,7 @@ dev-pipeline (outer loop)
             ├── Phase 3-4: Analyze (Reviewer agent)
             ├── Phase 5: Implement (Dev agent)
             ├── Phase 6: Review (Reviewer agent)
-            └── Phase 7: Summarize & Commit (Orchestrator)
+            └── Phase 7: Retrospective & Commit (Orchestrator)
             │
             └── Write session-status.json → exit
 ```
@@ -56,7 +56,6 @@ Located at `dev-pipeline/scripts/`:
 | 2 | `plans/plan.md` | Technical plan (architecture, API, tests) |
 | 3 | `tasks/tasks.md` | Executable task list with `[ ]` / `[x]` |
 | 4 | `analysis/analyze-report.md` | Consistency analysis |
-| 9 | `specs/REGISTRY.md` | Completed features archive |
 
 ### Dev-Team Artifacts (.dev-team/)
 
@@ -78,7 +77,7 @@ Located at `dev-pipeline/scripts/`:
 The bootstrap prompt instructs the agent to:
 - Execute phases directly as the session orchestrator
 - Spawn Dev and Reviewer agents as subagents for implementation and review phases
-- The orchestrator handles context building, planning, summarize, and commit phases directly
+- The orchestrator handles context building, planning, retrospective, and commit phases directly
 
 ### 2. Pipeline Execution
 

package/bundled/dev-pipeline/launch-bugfix-daemon.sh

@@ -436,8 +436,8 @@ Environment Variables (pass via --env):
   SESSION_TIMEOUT       Session timeout in seconds (default: 0 = no limit)
   VERBOSE               Set to 1 for verbose AI CLI output
   HEARTBEAT_INTERVAL    Heartbeat log interval in seconds (default: 30)
-  USE_WORKTREE          Enable git worktree isolation per session (default: 1, set 0 to disable)
-  AUTO_PUSH             Auto-push to remote after successful worktree merge (default: 0, set 1 to enable)
+  DEV_BRANCH            Custom dev branch name (default: auto-generated)
+  AUTO_PUSH             Auto-push to remote after successful bug fix (default: 0, set 1 to enable)
 HELP
 }
 

package/bundled/dev-pipeline/launch-daemon.sh

@@ -576,8 +576,8 @@ Environment Variables (pass via --env):
   SESSION_TIMEOUT       Session timeout in seconds (default: 0 = no limit)
   VERBOSE               Set to 1 for verbose AI CLI output
   HEARTBEAT_INTERVAL    Heartbeat log interval in seconds (default: 30)
-  USE_WORKTREE          Enable git worktree isolation per session (default: 1, set 0 to disable)
-  AUTO_PUSH             Auto-push to remote after successful worktree merge (default: 0, set 1 to enable)
+  DEV_BRANCH            Custom dev branch name (default: auto-generated)
+  AUTO_PUSH             Auto-push to remote after successful feature (default: 0, set 1 to enable)
 HELP
 }
 

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

@@ -0,0 +1,76 @@
+#!/usr/bin/env bash
+# ============================================================
+# dev-pipeline/lib/branch.sh - Git Branch Lifecycle Library
+#
+# Shared by run.sh and run-bugfix.sh for branch-based serial
+# development. Each pipeline run creates a dev branch and all
+# features/bugs commit directly on it in sequence.
+#
+# Functions:
+#   branch_create  — Create and checkout a new branch
+#   branch_return  — Checkout back to original branch
+#
+# Environment:
+#   DEV_BRANCH    — Optional custom branch name override
+#   AUTO_PUSH     — Set to 1 to auto-push after successful feature
+# ============================================================
+
+# branch_create <project_root> <branch_name> <source_branch>
+#
+# Creates a new branch from source_branch and checks it out.
+# If the branch already exists, checks it out instead.
+#
+# Returns 0 on success, 1 on failure.
+branch_create() {
+    local project_root="$1"
+    local branch_name="$2"
+    local source_branch="$3"
+
+    # Check if branch already exists
+    if git -C "$project_root" rev-parse --verify "$branch_name" >/dev/null 2>&1; then
+        log_info "Branch already exists: $branch_name — checking out"
+        if ! git -C "$project_root" checkout "$branch_name" 2>/dev/null; then
+            log_error "Failed to checkout existing branch: $branch_name"
+            return 1
+        fi
+        return 0
+    fi
+
+    # Create and checkout new branch
+    if ! git -C "$project_root" checkout -b "$branch_name" "$source_branch" 2>/dev/null; then
+        log_error "Failed to create branch: $branch_name from $source_branch"
+        return 1
+    fi
+
+    log_info "Created and checked out branch: $branch_name (from $source_branch)"
+    return 0
+}
+
+# branch_return <project_root> <original_branch>
+#
+# Checks out the original branch after pipeline completes.
+# Safe to call even if already on the original branch.
+#
+# Returns 0 on success, 1 on failure.
+branch_return() {
+    local project_root="$1"
+    local original_branch="$2"
+
+    local current_branch
+    current_branch=$(git -C "$project_root" rev-parse --abbrev-ref HEAD 2>/dev/null) || {
+        log_error "Failed to determine current branch"
+        return 1
+    }
+
+    if [[ "$current_branch" == "$original_branch" ]]; then
+        return 0
+    fi
+
+    if ! git -C "$project_root" checkout "$original_branch" 2>/dev/null; then
+        log_error "Failed to checkout original branch: $original_branch"
+        return 1
+    fi
+
+    log_info "Returned to branch: $original_branch"
+    return 0
+}

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

@@ -25,8 +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.
+#   DEV_BRANCH            Custom dev branch name (default: auto-generated bugfix/pipeline-{run_id})
+#   AUTO_PUSH             Auto-push to remote after successful bug fix (default: 0). Set to 1 to enable.
 # ============================================================
 
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -42,7 +42,7 @@ 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}
+DEV_BRANCH=${DEV_BRANCH:-""}
 AUTO_PUSH=${AUTO_PUSH:-0}
 
 # Source shared common helpers (CLI/platform detection + logs + deps)
@@ -52,8 +52,8 @@ 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"
+# Source shared branch library
+source "$SCRIPT_DIR/lib/branch.sh"
 
 # Detect stream-json support
 detect_stream_json_support "$CLI_CMD"
@@ -61,9 +61,9 @@ 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=""
+# Branch tracking (for cleanup on interrupt)
+_ORIGINAL_BRANCH=""
+_DEV_BRANCH_NAME=""
 
 # ============================================================
 # Shared: Spawn AI CLI session and wait for result
@@ -76,7 +76,6 @@ 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"
@@ -100,14 +99,6 @@ 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
@@ -133,11 +124,6 @@ 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:-}"
@@ -231,13 +217,10 @@ 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=""
+    # Log current branch info for recovery
+    if [[ -n "$_DEV_BRANCH_NAME" ]]; then
+        log_info "Development was on branch: $_DEV_BRANCH_NAME"
+        log_info "Original branch was: $_ORIGINAL_BRANCH"
     fi
 
     if [[ -n "$BUG_LIST" && -f "$BUG_LIST" ]]; then
@@ -420,13 +403,9 @@ 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=""
+        # Log current branch info
+        if [[ -n "$_DEV_BRANCH_NAME" ]]; then
+            log_info "Development was on branch: $_DEV_BRANCH_NAME"
         fi
         log_info "Session log: $session_dir/logs/session.log"
         exit 130
@@ -435,63 +414,31 @@ sys.exit(1)
 
     _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
+    # Branch lifecycle: create and checkout bugfix branch
+    local _proj_root
+    _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+    local _source_branch
+    _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
+    _ORIGINAL_BRANCH="$_source_branch"
+
+    local _branch_name="${DEV_BRANCH:-bugfix/${bug_id}-$(date +%s)}"
+    if branch_create "$_proj_root" "$_branch_name" "$_source_branch"; then
+        _DEV_BRANCH_NAME="$_branch_name"
+    else
+        log_warn "Failed to create branch; running session on current branch"
     fi
 
     spawn_and_wait_session \
         "$bug_id" "$bug_list" "$session_id" \
-        "$bootstrap_prompt" "$session_dir" 999 "$_wt_path"
+        "$bootstrap_prompt" "$session_dir" 999
     local session_status="$_SPAWN_RESULT"
 
-    # Worktree lifecycle: merge and cleanup after session
-    if [[ -n "$_wt_path" && -n "$_wt_branch" ]]; then
+    # Auto-push after successful session
+    if [[ "$session_status" == "success" && "$AUTO_PUSH" == "1" ]]; 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=""
+        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"
     fi
 
     echo ""
@@ -529,13 +476,6 @@ 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..."
@@ -576,6 +516,23 @@ main() {
     echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
     echo ""
 
+    # Branch lifecycle: create bugfix branch for this pipeline run
+    local _proj_root
+    _proj_root="$(cd "$SCRIPT_DIR/.." && pwd)"
+    local _source_branch
+    _source_branch=$(git -C "$_proj_root" rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
+    _ORIGINAL_BRANCH="$_source_branch"
+
+    local run_id_for_branch
+    run_id_for_branch=$(jq -r '.run_id' "$STATE_DIR/pipeline.json" 2>/dev/null || echo "$$")
+    local _branch_name="${DEV_BRANCH:-bugfix/pipeline-${run_id_for_branch}}"
+    if branch_create "$_proj_root" "$_branch_name" "$_source_branch"; then
+        _DEV_BRANCH_NAME="$_branch_name"
+        log_info "Dev branch: $_branch_name"
+    else
+        log_warn "Failed to create bugfix branch; running on current branch: $_source_branch"
+    fi
+
     local session_count=0
 
     while true; do
@@ -592,6 +549,10 @@ 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"
             break
@@ -662,68 +623,16 @@ os.replace(tmp, target)
         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" "$_wt_path"
+            "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES"
 
-        # Worktree lifecycle: merge and cleanup after session
-        if [[ -n "$_wt_path" && -n "$_wt_branch" ]]; then
+        # Auto-push after successful session
+        if [[ "$_SPAWN_RESULT" == "success" && "$AUTO_PUSH" == "1" ]]; 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=""
+            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))