prizmkit 1.1.98 → 1.1.100

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

@@ -23,8 +23,7 @@ set -euo pipefail
 #   HEARTBEAT_INTERVAL    Heartbeat log interval in seconds (default: 30)
 #   STALE_KILL_THRESHOLD   Auto-kill session after N seconds of no progress (default: 900)
 #   HEARTBEAT_STALE_THRESHOLD  Heartbeat stale threshold in seconds (default: 600)
-#   MAX_LOG_SIZE         Session log size threshold for compact warning (default: 2097152 = 2MB, set 0 to disable)
-#   LOG_MONITOR_POLL_INTERVAL  Log monitor poll interval in seconds (default: 30)
+#   MAX_LOG_SIZE         Include passive log-size checkpoint guidance above this threshold (default: 2097152 = 2MB, set 0 to disable)
 #   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.
 #   STOP_ON_FAILURE       Stop pipeline after a task exhausts all retries (default: 0). Set to 1 to stop.
@@ -139,6 +138,16 @@ spawn_and_wait_session() {
         log_warn "Session was stale-killed by heartbeat monitor (no progress for too long)"
     fi
 
+    local was_context_overflow=false
+    if prizm_detect_context_overflow_error "$session_log" "$progress_json"; then
+        was_context_overflow=true
+    fi
+
+    local was_ai_runtime_error=false
+    if prizm_detect_ai_runtime_error "$session_log" "$progress_json"; then
+        was_ai_runtime_error=true
+    fi
+
     local was_infra_error=false
     if [[ $exit_code -ne 0 ]] && prizm_detect_infra_error "$session_log" "$progress_json"; then
         was_infra_error=true
@@ -162,7 +171,22 @@ spawn_and_wait_session() {
     project_root="$PROJECT_ROOT"
     local default_branch="$base_branch"
 
-    if [[ "$was_infra_error" == true ]]; then
+    local has_commits=""
+    if git -C "$project_root" rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+        has_commits=$(git -C "$project_root" log "${default_branch}..HEAD" --oneline 2>/dev/null | head -1)
+    fi
+
+    if [[ -n "$has_commits" ]]; then
+        session_status="success"
+    elif [[ "$was_context_overflow" == true ]]; then
+        log_warn "Session failed because the AI CLI exceeded the model context window"
+        log_warn "Context overflow is retried without consuming code retry budget"
+        session_status="context_overflow"
+    elif [[ "$was_ai_runtime_error" == true ]]; then
+        log_warn "Session failed due to structured AI runtime error"
+        log_warn "AI runtime errors are retried without consuming code retry budget"
+        session_status="infra_error"
+    elif [[ "$was_infra_error" == true ]]; then
         log_warn "Session failed due to AI CLI/provider infrastructure error"
         log_warn "Infrastructure errors are retried without consuming code retry budget"
         session_status="infra_error"
@@ -273,6 +297,12 @@ finalize_bug_status_after_branch_return() {
     local session_status="$4"
     local max_retries="$5"
     local max_infra_retries="$6"
+    local base_branch="${7:-main}"
+    local active_dev_branch="${8:-}"
+    local fatal_error_code="${9:-}"
+    local continuation_summary_path="${10:-}"
+    local no_progress_count="${11:-0}"
+    local progress_fingerprint="${12:-}"
 
     # Update bug status on the original branch. The caller commits the resulting
     # bug-list diff immediately after this helper returns.
@@ -285,6 +315,12 @@ finalize_bug_status_after_branch_return() {
         --session-id "$session_id" \
         --max-retries "$max_retries" \
         --max-infra-retries "$max_infra_retries" \
+        --active-dev-branch "$active_dev_branch" \
+        --base-branch "$base_branch" \
+        --last-fatal-error-code "$fatal_error_code" \
+        --continuation-summary-path "$continuation_summary_path" \
+        --no-progress-count "$no_progress_count" \
+        --progress-fingerprint "$progress_fingerprint" \
         --action update) || {
         log_error "Failed to update bug status: $update_output"
         update_output=""
@@ -519,7 +555,7 @@ sys.exit(1)
                 log_info "Removed $dev_team_dir"
             fi
 
-            local bug_state_dir="$STATE_DIR/bugs/$bug_id"
+            local bug_state_dir="$STATE_DIR/$bug_id"
             if [[ -d "$bug_state_dir" ]]; then
                 rm -rf "$bug_state_dir"
                 log_info "Removed $bug_state_dir"
@@ -544,7 +580,7 @@ sys.exit(1)
     local run_id session_id session_dir bootstrap_prompt
     run_id=$(jq -r '.run_id' "$STATE_DIR/pipeline.json")
     session_id="${bug_id}-$(date +%Y%m%d%H%M%S)"
-    session_dir="$STATE_DIR/bugs/$bug_id/sessions/$session_id"
+    session_dir="$STATE_DIR/$bug_id/sessions/$session_id"
     mkdir -p "$session_dir/logs"
 
     bootstrap_prompt="$session_dir/bootstrap-prompt.md"
@@ -553,7 +589,7 @@ sys.exit(1)
     local retry_count
     retry_count=$(python3 -c "
 import json, os
-status_path = os.path.join('$STATE_DIR', 'bugs', '$bug_id', 'status.json')
+status_path = os.path.join('$STATE_DIR', '$bug_id', 'status.json')
 if os.path.isfile(status_path):
     with open(status_path) as f:
         d = json.load(f)
@@ -564,7 +600,7 @@ else:
     local resume_phase
     resume_phase=$(python3 -c "
 import json, os
-status_path = os.path.join('$STATE_DIR', 'bugs', '$bug_id', 'status.json')
+status_path = os.path.join('$STATE_DIR', '$bug_id', 'status.json')
 if os.path.isfile(status_path):
     with open(status_path) as f:
         d = json.load(f)
@@ -723,6 +759,11 @@ else:
         "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES" "$MAX_INFRA_RETRIES" "$bug_model" "$_ORIGINAL_BRANCH"
     local session_status="$_SPAWN_RESULT"
 
+    local active_dev_branch_for_status="$_DEV_BRANCH_NAME"
+    local continuation_summary_path=""
+    local no_progress_count=0
+    local progress_after=""
+
     # 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
@@ -742,7 +783,7 @@ else:
     branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
 
     finalize_bug_status_after_branch_return \
-        "$bug_id" "$bug_list" "$session_id" "$session_status" "$MAX_RETRIES" "$MAX_INFRA_RETRIES"
+        "$bug_id" "$bug_list" "$session_id" "$session_status" "$MAX_RETRIES" "$MAX_INFRA_RETRIES" "$_ORIGINAL_BRANCH" "$active_dev_branch_for_status" "context_overflow" "$continuation_summary_path" "$no_progress_count" "${progress_after:-}"
 
     # Commit bug status update on the original branch (after guaranteed return)
     if ! git -C "$_proj_root" diff --quiet "$bug_list" 2>/dev/null; then
@@ -991,13 +1032,21 @@ DEPLOY_PROMPT_EOF
         fi
 
         # Parse bug info
-        local bug_id bug_title bug_severity retry_count infra_error_count resume_phase
+        local bug_id bug_title bug_severity retry_count infra_error_count resume_phase active_dev_branch base_branch continuation_pending continuation_reason context_overflow_count continuation_count previous_session_id no_progress_count
         bug_id=$(echo "$next_bug" | jq -r '.bug_id')
         bug_title=$(echo "$next_bug" | jq -r '.title')
         bug_severity=$(echo "$next_bug" | jq -r '.severity')
         retry_count=$(echo "$next_bug" | jq -r '.retry_count // 0')
         infra_error_count=$(echo "$next_bug" | jq -r '.infra_error_count // 0')
         resume_phase=$(echo "$next_bug" | jq -r '.resume_from_phase // "null"')
+        active_dev_branch=$(echo "$next_bug" | jq -r '.active_dev_branch // ""')
+        base_branch=$(echo "$next_bug" | jq -r '.base_branch // ""')
+        continuation_pending=$(echo "$next_bug" | jq -r '.continuation_pending // false')
+        continuation_reason=$(echo "$next_bug" | jq -r '.continuation_reason // ""')
+        context_overflow_count=$(echo "$next_bug" | jq -r '.context_overflow_count // 0')
+        continuation_count=$(echo "$next_bug" | jq -r '.continuation_count // 0')
+        previous_session_id=$(echo "$next_bug" | jq -r '.last_context_overflow_session_id // ""')
+        no_progress_count=$(echo "$next_bug" | jq -r '.no_progress_count // 0')
 
         echo ""
         echo -e "${BOLD}────────────────────────────────────────────────────${NC}"
@@ -1008,6 +1057,10 @@ DEPLOY_PROMPT_EOF
         if [[ "$resume_phase" != "null" ]]; then
             log_info "Resuming from Phase $resume_phase"
         fi
+        if [[ "$continuation_pending" == "true" && -n "$active_dev_branch" ]]; then
+            log_info "Continuation pending (${continuation_reason:-context_overflow}); reusing dev branch: $active_dev_branch"
+            log_info "Continuation count: $continuation_count (context overflows: $context_overflow_count)"
+        fi
         echo -e "${BOLD}────────────────────────────────────────────────────${NC}"
 
         # Auto-commit any uncommitted workspace changes before starting the pipeline.
@@ -1040,8 +1093,20 @@ DEPLOY_PROMPT_EOF
             prizm_git_commit_paths "$_proj_root" "chore($bug_id): mark in_progress" "$bug_list"
         fi
 
-        # Create per-bug dev branch (from the now-updated original branch)
-        local _bug_branch="${DEV_BRANCH:-bugfix/${bug_id}-$(date +%Y%m%d%H%M)}"
+        # Continuation base branch from runtime state is authoritative for branch reuse.
+        if [[ "$continuation_pending" == "true" && -n "$base_branch" ]]; then
+            _ORIGINAL_BRANCH="$base_branch"
+        fi
+
+        # Create or reuse per-bug dev branch (from the now-updated original branch)
+        local _bug_branch
+        if [[ -n "$DEV_BRANCH" ]]; then
+            _bug_branch="$DEV_BRANCH"
+        elif [[ "$continuation_pending" == "true" && -n "$active_dev_branch" ]]; then
+            _bug_branch="$active_dev_branch"
+        else
+            _bug_branch="bugfix/${bug_id}-$(date +%Y%m%d%H%M)"
+        fi
         if branch_create "$_proj_root" "$_bug_branch" "$_ORIGINAL_BRANCH"; then
             _DEV_BRANCH_NAME="$_bug_branch"
             log_info "Dev branch: $_bug_branch"
@@ -1051,15 +1116,17 @@ DEPLOY_PROMPT_EOF
             break
         fi
 
+        while true; do
         # Generate session
         local session_id run_id
         run_id=$(jq -r '.run_id' "$STATE_DIR/pipeline.json")
         session_id="${bug_id}-$(date +%Y%m%d%H%M%S)"
 
-        local session_dir="$STATE_DIR/bugs/$bug_id/sessions/$session_id"
+        local session_dir="$STATE_DIR/$bug_id/sessions/$session_id"
         mkdir -p "$session_dir/logs"
 
         local bootstrap_prompt="$session_dir/bootstrap-prompt.md"
+        local continuation_summary_path=".prizmkit/bugfix/${bug_id}/continuation-summary.md"
 
         local main_prompt_args=(
             --bug-list "$bug_list"
@@ -1072,6 +1139,19 @@ DEPLOY_PROMPT_EOF
             --output "$bootstrap_prompt"
         )
 
+        if [[ "$continuation_pending" == "true" ]]; then
+            main_prompt_args+=(
+                --continuation-mode "${continuation_reason:-context_overflow}"
+                --previous-session-id "$previous_session_id"
+                --continuation-count "$continuation_count"
+                --context-overflow-count "$context_overflow_count"
+                --task-type "bugfix"
+                --active-dev-branch "$active_dev_branch"
+                --base-branch "$base_branch"
+                --continuation-summary-path "$continuation_summary_path"
+            )
+        fi
+
         # Support PIPELINE_MODE env var (set by launch-bugfix-daemon.sh --mode)
         if [[ -n "${PIPELINE_MODE:-}" ]]; then
             main_prompt_args+=(--mode "$PIPELINE_MODE")
@@ -1089,7 +1169,7 @@ DEPLOY_PROMPT_EOF
             log_error "Failed to generate bootstrap prompt for $bug_id"
             branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
             _DEV_BRANCH_NAME=""
-            continue
+            continue 2
         }
         local bug_model pipeline_mode agent_count critic_enabled
         bug_model=$(echo "$gen_output" | python3 -c "import json,sys; print(json.load(sys.stdin).get('model',''))" 2>/dev/null || echo "")
@@ -1111,6 +1191,11 @@ DEPLOY_PROMPT_EOF
             log_info "Bug model: $bug_model"
         fi
 
+        local continuation_artifact_dir=".prizmkit/bugfix/${bug_id}"
+        local continuation_checkpoint_path="$continuation_artifact_dir/workflow-checkpoint.json"
+        local progress_before progress_after
+        progress_before=$(prizm_context_progress_fingerprint "$_proj_root" "bugfix" "$bug_id" "$continuation_artifact_dir" "$continuation_checkpoint_path")
+
         # Spawn session
         log_info "Spawning AI CLI session: $session_id"
         _SPAWN_RESULT=""
@@ -1123,7 +1208,37 @@ DEPLOY_PROMPT_EOF
         local session_status="$_SPAWN_RESULT"
 
         # Merge per-bug dev branch back to original on success
-        if [[ "$session_status" == "success" && -n "$_DEV_BRANCH_NAME" ]]; then
+        local active_dev_branch_for_status="$_DEV_BRANCH_NAME"
+        if [[ "$session_status" == "context_overflow" ]]; then
+            progress_after=$(prizm_context_progress_fingerprint "$_proj_root" "bugfix" "$bug_id" "$continuation_artifact_dir" "$continuation_checkpoint_path")
+            if prizm_context_progress_changed "$progress_before" "$progress_after"; then
+                no_progress_count=0
+                log_info "Context-overflow session made observable progress; continuing on $_DEV_BRANCH_NAME"
+            else
+                no_progress_count=$((no_progress_count + 1))
+                log_warn "Context-overflow session made no observable progress ($no_progress_count consecutive)"
+            fi
+            if [[ "$no_progress_count" -ge 2 ]]; then
+                log_warn "Pausing automatic continuation: context_overflow_without_git_checkpoint_or_artifact_progress"
+                session_status="stalled_context_continuation"
+            else
+                finalize_bug_status_after_branch_return \
+                    "$bug_id" "$bug_list" "$session_id" "$session_status" "$MAX_RETRIES" "$MAX_INFRA_RETRIES" "$_ORIGINAL_BRANCH" "$active_dev_branch_for_status" "context_overflow" "$continuation_summary_path" "$no_progress_count" "$progress_after"
+                session_count=$((session_count + 1))
+                total_subagent_calls=$((total_subagent_calls + _SUBAGENT_COUNT))
+                continuation_pending="true"
+                continuation_reason="context_overflow"
+                previous_session_id="$session_id"
+                active_dev_branch="$_DEV_BRANCH_NAME"
+                base_branch="$_ORIGINAL_BRANCH"
+                context_overflow_count=$((context_overflow_count + 1))
+                continuation_count=$((continuation_count + 1))
+                log_info "Launching automatic continuation for $bug_id on same branch/worktree"
+                continue
+            fi
+        fi
+
+    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
@@ -1134,14 +1249,13 @@ DEPLOY_PROMPT_EOF
         elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
             # Session failed — preserve dev branch for inspection
             log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
-            _DEV_BRANCH_NAME=""
         fi
 
         # GUARANTEED: always return to original branch regardless of success/failure/merge outcome
         branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
 
         finalize_bug_status_after_branch_return \
-            "$bug_id" "$bug_list" "$session_id" "$session_status" "$MAX_RETRIES" "$MAX_INFRA_RETRIES"
+            "$bug_id" "$bug_list" "$session_id" "$session_status" "$MAX_RETRIES" "$MAX_INFRA_RETRIES" "$_ORIGINAL_BRANCH" "$active_dev_branch_for_status" "context_overflow" "$continuation_summary_path" "$no_progress_count" "${progress_after:-}"
         local item_status_after_session="${_SPAWN_ITEM_STATUS:-}"
 
         # Commit bug status update on the original branch (after guaranteed return)
@@ -1151,6 +1265,8 @@ DEPLOY_PROMPT_EOF
 
         session_count=$((session_count + 1))
         total_subagent_calls=$((total_subagent_calls + _SUBAGENT_COUNT))
+        break
+        done
 
         # Stop-on-failure: abort only after the task is actually marked failed.
         # Pending retry outcomes, including infrastructure errors, keep running.
@@ -1229,8 +1345,7 @@ show_help() {
     echo "  VERBOSE               Set to 1 for verbose AI CLI output"
     echo "  HEARTBEAT_INTERVAL    Heartbeat log interval in seconds (default: 30)"
     echo "  STALE_KILL_THRESHOLD  Auto-kill session after N seconds of no progress (default: 900)"
-    echo "  MAX_LOG_SIZE          Session log size threshold for compact warning (default: 2097152 = 2MB, set 0 to disable)"
-    echo "  LOG_MONITOR_POLL_INTERVAL  Log monitor poll interval in seconds (default: 30)"
+    echo "  MAX_LOG_SIZE          Include passive log-size checkpoint guidance above this threshold (default: 2097152 = 2MB, set 0 to disable)"
     echo "  STOP_ON_FAILURE       Stop pipeline when a task exhausts retries: 0|1 (default: 0)"
     echo ""
     echo "Examples:"

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

@@ -25,8 +25,7 @@ set -euo pipefail
 #   HEARTBEAT_INTERVAL    Heartbeat log interval in seconds (default: 30)
 #   STALE_KILL_THRESHOLD   Auto-kill session after N seconds of no progress (default: 900)
 #   HEARTBEAT_STALE_THRESHOLD  Heartbeat stale threshold in seconds (default: 600)
-#   MAX_LOG_SIZE         Session log size threshold for compact warning (default: 2097152 = 2MB, set 0 to disable)
-#   LOG_MONITOR_POLL_INTERVAL  Log monitor poll interval in seconds (default: 30)
+#   MAX_LOG_SIZE         Include passive log-size checkpoint guidance above this threshold (default: 2097152 = 2MB, set 0 to disable)
 #   PIPELINE_MODE         Override mode for all features: lite|standard|full (used by daemon)
 #   DEV_BRANCH            Custom dev branch name (default: auto-generated dev/{feature_id}-YYYYMMDDHHmm)
 #   AUTO_PUSH             Auto-push to remote after successful feature (default: 0). Set to 1 to enable.
@@ -150,6 +149,11 @@ spawn_and_wait_session() {
         log_warn "Session was stale-killed by heartbeat monitor (no progress for too long)"
     fi
 
+    local was_context_overflow=false
+    if prizm_detect_context_overflow_error "$session_log" "$progress_json"; then
+        was_context_overflow=true
+    fi
+
     local was_infra_error=false
     if [[ $exit_code -ne 0 ]] && prizm_detect_infra_error "$session_log" "$progress_json"; then
         was_infra_error=true
@@ -187,13 +191,17 @@ spawn_and_wait_session() {
         semantic_finalized=true
         semantic_feature_slug="$PRIZM_SEMANTIC_FEATURE_SLUG"
         semantic_commit_sha="$PRIZM_SEMANTIC_COMMIT_SHA"
-        if [[ $exit_code -ne 0 || "$was_stale_killed" == true || "$was_ai_runtime_error" == true ]]; then
+        if [[ $exit_code -ne 0 || "$was_stale_killed" == true || "$was_context_overflow" == true || "$was_ai_runtime_error" == true ]]; then
             log_warn "Session ended with a failure signal after semantic completion; treating as finalized success"
             log_warn "Semantic completion commit: ${semantic_commit_sha:-unknown}"
         fi
         session_status="success"
+    elif [[ "$was_context_overflow" == true ]]; then
+        log_warn "Session failed because the AI CLI exceeded the model context window"
+        log_warn "Context overflow is retried without consuming code retry budget"
+        session_status="context_overflow"
     elif [[ "$was_ai_runtime_error" == true ]]; then
-        log_warn "Session failed due to structured AI runtime/context error"
+        log_warn "Session failed due to structured AI runtime error"
         log_warn "AI runtime errors are retried without consuming code retry budget"
         session_status="infra_error"
     elif [[ "$was_infra_error" == true ]]; then
@@ -368,6 +376,11 @@ finalize_feature_status_after_branch_return() {
     local max_infra_retries="$6"
     local session_dir="$7"
     local base_branch="${8:-main}"
+    local active_dev_branch="${9:-}"
+    local fatal_error_code="${10:-}"
+    local continuation_summary_path="${11:-}"
+    local no_progress_count="${12:-0}"
+    local progress_fingerprint="${13:-}"
 
     local feature_slug="${_SPAWN_FEATURE_SLUG:-}"
     local progress_json="$session_dir/logs/progress.json"
@@ -404,6 +417,12 @@ finalize_feature_status_after_branch_return() {
         --session-id "$session_id" \
         --max-retries "$max_retries" \
         --max-infra-retries "$max_infra_retries" \
+        --active-dev-branch "$active_dev_branch" \
+        --base-branch "$base_branch" \
+        --last-fatal-error-code "$fatal_error_code" \
+        --continuation-summary-path "$continuation_summary_path" \
+        --no-progress-count "$no_progress_count" \
+        --progress-fingerprint "$progress_fingerprint" \
         --action update) || {
         log_error "Failed to update feature status: $update_output"
         log_error ".prizmkit/plans/feature-list.json may be out of sync. Manual intervention needed."
@@ -698,7 +717,7 @@ sys.exit(1)
                 log_info "Removed $dev_team_dir"
             fi
 
-            local feature_state_dir="$STATE_DIR/features/$feature_id"
+            local feature_state_dir="$STATE_DIR/$feature_id"
             if [[ -d "$feature_state_dir" ]]; then
                 rm -rf "$feature_state_dir"
                 log_info "Removed $feature_state_dir"
@@ -724,7 +743,7 @@ sys.exit(1)
     local run_id session_id session_dir bootstrap_prompt
     run_id=$(jq -r '.run_id' "$STATE_DIR/pipeline.json")
     session_id="${feature_id}-$(date +%Y%m%d%H%M%S)"
-    session_dir="$STATE_DIR/features/$feature_id/sessions/$session_id"
+    session_dir="$STATE_DIR/$feature_id/sessions/$session_id"
     mkdir -p "$session_dir/logs"
 
     bootstrap_prompt="$session_dir/bootstrap-prompt.md"
@@ -733,7 +752,7 @@ sys.exit(1)
     local retry_count
     retry_count=$(python3 -c "
 import json, os
-status_path = os.path.join('$STATE_DIR', 'features', '$feature_id', 'status.json')
+status_path = os.path.join('$STATE_DIR', '$feature_id', 'status.json')
 if os.path.isfile(status_path):
     with open(status_path) as f:
         d = json.load(f)
@@ -916,6 +935,11 @@ else:
         "$bootstrap_prompt" "$session_dir" "$MAX_RETRIES" "$feature_model" "$_ORIGINAL_BRANCH"
     local session_status="$_SPAWN_RESULT"
 
+    local active_dev_branch_for_status="$_DEV_BRANCH_NAME"
+    local continuation_summary_path=""
+    local no_progress_count=0
+    local progress_after=""
+
     # 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
@@ -935,7 +959,7 @@ else:
     branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
 
     finalize_feature_status_after_branch_return \
-        "$feature_id" "$feature_list" "$session_id" "$session_status" "$MAX_RETRIES" "$MAX_INFRA_RETRIES" "$session_dir" "$_ORIGINAL_BRANCH"
+        "$feature_id" "$feature_list" "$session_id" "$session_status" "$MAX_RETRIES" "$MAX_INFRA_RETRIES" "$session_dir" "$_ORIGINAL_BRANCH" "$active_dev_branch_for_status" "context_overflow" "$continuation_summary_path" "$no_progress_count" "${progress_after:-}"
 
     # Commit feature status update on the original branch (after guaranteed return)
     if ! git -C "$_proj_root" diff --quiet "$feature_list" 2>/dev/null; then
@@ -1212,12 +1236,20 @@ DEPLOY_PROMPT_EOF
         fi
 
         # Parse feature info
-        local feature_id feature_title retry_count infra_error_count resume_phase
+        local feature_id feature_title retry_count infra_error_count resume_phase active_dev_branch base_branch continuation_pending continuation_reason context_overflow_count continuation_count previous_session_id no_progress_count
         feature_id=$(echo "$next_feature" | jq -r '.feature_id')
         feature_title=$(echo "$next_feature" | jq -r '.title')
         retry_count=$(echo "$next_feature" | jq -r '.retry_count // 0')
         infra_error_count=$(echo "$next_feature" | jq -r '.infra_error_count // 0')
         resume_phase=$(echo "$next_feature" | jq -r '.resume_from_phase // "null"')
+        active_dev_branch=$(echo "$next_feature" | jq -r '.active_dev_branch // ""')
+        base_branch=$(echo "$next_feature" | jq -r '.base_branch // ""')
+        continuation_pending=$(echo "$next_feature" | jq -r '.continuation_pending // false')
+        continuation_reason=$(echo "$next_feature" | jq -r '.continuation_reason // ""')
+        context_overflow_count=$(echo "$next_feature" | jq -r '.context_overflow_count // 0')
+        continuation_count=$(echo "$next_feature" | jq -r '.continuation_count // 0')
+        previous_session_id=$(echo "$next_feature" | jq -r '.last_context_overflow_session_id // ""')
+        no_progress_count=$(echo "$next_feature" | jq -r '.no_progress_count // 0')
 
         echo ""
         echo -e "${BOLD}────────────────────────────────────────────────────${NC}"
@@ -1227,6 +1259,10 @@ DEPLOY_PROMPT_EOF
         if [[ "$resume_phase" != "null" ]]; then
             log_info "Resuming from Phase $resume_phase"
         fi
+        if [[ "$continuation_pending" == "true" && -n "$active_dev_branch" ]]; then
+            log_info "Continuation pending (${continuation_reason:-context_overflow}); reusing dev branch: $active_dev_branch"
+            log_info "Continuation count: $continuation_count (context overflows: $context_overflow_count)"
+        fi
         echo -e "${BOLD}────────────────────────────────────────────────────${NC}"
 
         # Auto-commit any uncommitted workspace changes before starting the pipeline.
@@ -1259,8 +1295,20 @@ DEPLOY_PROMPT_EOF
             prizm_git_commit_paths "$_proj_root" "chore($feature_id): mark in_progress" "$feature_list"
         fi
 
-        # Create per-feature dev branch (from the now-updated original branch)
-        local _feature_branch="${DEV_BRANCH:-dev/${feature_id}-$(date +%Y%m%d%H%M)}"
+        # Continuation base branch from runtime state is authoritative for branch reuse.
+        if [[ "$continuation_pending" == "true" && -n "$base_branch" ]]; then
+            _ORIGINAL_BRANCH="$base_branch"
+        fi
+
+        # Create or reuse per-feature dev branch (from the now-updated original branch)
+        local _feature_branch
+        if [[ -n "$DEV_BRANCH" ]]; then
+            _feature_branch="$DEV_BRANCH"
+        elif [[ "$continuation_pending" == "true" && -n "$active_dev_branch" ]]; then
+            _feature_branch="$active_dev_branch"
+        else
+            _feature_branch="dev/${feature_id}-$(date +%Y%m%d%H%M)"
+        fi
         if branch_create "$_proj_root" "$_feature_branch" "$_ORIGINAL_BRANCH"; then
             _DEV_BRANCH_NAME="$_feature_branch"
             log_info "Dev branch: $_feature_branch"
@@ -1270,15 +1318,33 @@ DEPLOY_PROMPT_EOF
             break
         fi
 
+        while true; do
         # Generate session ID and bootstrap prompt
         local session_id run_id
         run_id=$(jq -r '.run_id' "$STATE_DIR/pipeline.json")
         session_id="${feature_id}-$(date +%Y%m%d%H%M%S)"
 
-        local session_dir="$STATE_DIR/features/$feature_id/sessions/$session_id"
+        local session_dir="$STATE_DIR/$feature_id/sessions/$session_id"
         mkdir -p "$session_dir/logs"
 
         local bootstrap_prompt="$session_dir/bootstrap-prompt.md"
+        local continuation_summary_path
+        continuation_summary_path=$(python3 -c "
+import json, re, sys
+feature_list, feature_id = sys.argv[1], sys.argv[2]
+with open(feature_list) as f:
+    data = json.load(f)
+for feature in data.get('features', []):
+    if feature.get('id') == feature_id:
+        numeric = feature_id.replace('F-', '').replace('f-', '').zfill(3)
+        title = feature.get('title', '').lower()
+        title = re.sub(r'[^a-z0-9\s-]', '', title)
+        title = re.sub(r'[\s]+', '-', title.strip())
+        title = re.sub(r'-+', '-', title).strip('-')
+        print(f'.prizmkit/specs/{numeric}-{title}/continuation-summary.md')
+        sys.exit(0)
+sys.exit(1)
+" "$feature_list" "$feature_id" 2>/dev/null || echo "")
 
         local main_prompt_args=(
             --feature-list "$feature_list"
@@ -1291,6 +1357,21 @@ DEPLOY_PROMPT_EOF
             --output "$bootstrap_prompt"
         )
 
+        if [[ "$continuation_pending" == "true" ]]; then
+            main_prompt_args+=(
+                --continuation-mode "${continuation_reason:-context_overflow}"
+                --previous-session-id "$previous_session_id"
+                --continuation-count "$continuation_count"
+                --context-overflow-count "$context_overflow_count"
+                --task-type "feature"
+                --active-dev-branch "$active_dev_branch"
+                --base-branch "$base_branch"
+            )
+            if [[ -n "$continuation_summary_path" ]]; then
+                main_prompt_args+=(--continuation-summary-path "$continuation_summary_path")
+            fi
+        fi
+
         # Support PIPELINE_MODE env var (set by launch-feature-daemon.sh --mode)
         if [[ -n "${PIPELINE_MODE:-}" ]]; then
             main_prompt_args+=(--mode "$PIPELINE_MODE")
@@ -1308,7 +1389,7 @@ DEPLOY_PROMPT_EOF
             log_error "Failed to generate bootstrap prompt for $feature_id"
             branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
             _DEV_BRANCH_NAME=""
-            continue
+            continue 2
         }
         local feature_model pipeline_mode agent_count critic_enabled
         feature_model=$(echo "$gen_output" | python3 -c "import json,sys; print(json.load(sys.stdin).get('model',''))" 2>/dev/null || echo "")
@@ -1327,6 +1408,11 @@ DEPLOY_PROMPT_EOF
         log_info "Pipeline mode: ${BOLD}$pipeline_mode${NC} ($_mode_desc)"
         log_info "Agents: $agent_count (critic: $([ "$critic_enabled" = "true" ] && echo "enabled" || echo "disabled"))"
 
+        local continuation_artifact_dir="${continuation_summary_path%/continuation-summary.md}"
+        local continuation_checkpoint_path="$continuation_artifact_dir/workflow-checkpoint.json"
+        local progress_before progress_after
+        progress_before=$(prizm_context_progress_fingerprint "$_proj_root" "feature" "$feature_id" "$continuation_artifact_dir" "$continuation_checkpoint_path")
+
         # Spawn session and wait
         prizm_log_bootstrap_prompt "$bootstrap_prompt" "$feature_id"
         log_info "Spawning AI CLI session: $session_id"
@@ -1342,7 +1428,37 @@ DEPLOY_PROMPT_EOF
         local session_status="$_SPAWN_RESULT"
 
         # Merge per-feature dev branch back to original on success
-        if [[ "$session_status" == "success" && -n "$_DEV_BRANCH_NAME" ]]; then
+        local active_dev_branch_for_status="$_DEV_BRANCH_NAME"
+        if [[ "$session_status" == "context_overflow" ]]; then
+            progress_after=$(prizm_context_progress_fingerprint "$_proj_root" "feature" "$feature_id" "$continuation_artifact_dir" "$continuation_checkpoint_path")
+            if prizm_context_progress_changed "$progress_before" "$progress_after"; then
+                no_progress_count=0
+                log_info "Context-overflow session made observable progress; continuing on $_DEV_BRANCH_NAME"
+            else
+                no_progress_count=$((no_progress_count + 1))
+                log_warn "Context-overflow session made no observable progress ($no_progress_count consecutive)"
+            fi
+            if [[ "$no_progress_count" -ge 2 ]]; then
+                log_warn "Pausing automatic continuation: context_overflow_without_git_checkpoint_or_artifact_progress"
+                session_status="stalled_context_continuation"
+            else
+                finalize_feature_status_after_branch_return \
+                    "$feature_id" "$feature_list" "$session_id" "$session_status" "$MAX_RETRIES" "$MAX_INFRA_RETRIES" "$session_dir" "$_ORIGINAL_BRANCH" "$active_dev_branch_for_status" "context_overflow" "$continuation_summary_path" "$no_progress_count" "$progress_after"
+                session_count=$((session_count + 1))
+                total_subagent_calls=$((total_subagent_calls + _SUBAGENT_COUNT))
+                continuation_pending="true"
+                continuation_reason="context_overflow"
+                previous_session_id="$session_id"
+                active_dev_branch="$_DEV_BRANCH_NAME"
+                base_branch="$_ORIGINAL_BRANCH"
+                context_overflow_count=$((context_overflow_count + 1))
+                continuation_count=$((continuation_count + 1))
+                log_info "Launching automatic continuation for $feature_id on same branch/worktree"
+                continue
+            fi
+        fi
+
+    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
@@ -1353,14 +1469,13 @@ DEPLOY_PROMPT_EOF
         elif [[ -n "$_DEV_BRANCH_NAME" ]]; then
             # Session failed — preserve dev branch for inspection
             log_warn "Session failed — dev branch preserved for inspection: $_DEV_BRANCH_NAME"
-            _DEV_BRANCH_NAME=""
         fi
 
         # GUARANTEED: always return to original branch regardless of success/failure/merge outcome
         branch_ensure_return "$_proj_root" "$_ORIGINAL_BRANCH"
 
         finalize_feature_status_after_branch_return \
-            "$feature_id" "$feature_list" "$session_id" "$session_status" "$MAX_RETRIES" "$MAX_INFRA_RETRIES" "$session_dir" "$_ORIGINAL_BRANCH"
+            "$feature_id" "$feature_list" "$session_id" "$session_status" "$MAX_RETRIES" "$MAX_INFRA_RETRIES" "$session_dir" "$_ORIGINAL_BRANCH" "$active_dev_branch_for_status" "context_overflow" "$continuation_summary_path" "$no_progress_count" "${progress_after:-}"
         local item_status_after_session="${_SPAWN_ITEM_STATUS:-}"
 
         # Commit feature status update on the original branch (after guaranteed return)
@@ -1370,6 +1485,8 @@ DEPLOY_PROMPT_EOF
 
         session_count=$((session_count + 1))
         total_subagent_calls=$((total_subagent_calls + _SUBAGENT_COUNT))
+        break
+        done
 
         # Stop-on-failure: abort only after the task is actually marked failed.
         # Pending retry outcomes keep running; both code and infra failures have
@@ -1435,8 +1552,7 @@ show_help() {
     echo "  HEARTBEAT_INTERVAL    Heartbeat log interval in seconds (default: 30)"
     echo "  STALE_KILL_THRESHOLD  Auto-kill session after N seconds of no progress (default: 900)"
     echo "  HEARTBEAT_STALE_THRESHOLD  Heartbeat stale threshold in seconds (default: 600)"
-    echo "  MAX_LOG_SIZE          Session log size threshold for compact warning (default: 2097152 = 2MB, set 0 to disable)"
-    echo "  LOG_MONITOR_POLL_INTERVAL  Log monitor poll interval in seconds (default: 30)"
+    echo "  MAX_LOG_SIZE          Include passive log-size checkpoint guidance above this threshold (default: 2097152 = 2MB, set 0 to disable)"
     echo "  PIPELINE_MODE         Override mode for all features: lite|standard|full"
     echo "  ENABLE_CRITIC         Enable critic review for all features: true|false"
     echo "  STOP_ON_FAILURE       Stop pipeline when a task exhausts retries: 0|1 (default: 0)"