prizmkit 1.1.92 → 1.1.94

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

@@ -17,7 +17,6 @@ set -euo pipefail
 # Environment Variables:
 #   MAX_RETRIES           Max code retries per feature (default: 3)
 #   MAX_INFRA_RETRIES     Max infrastructure/provider retries per feature (default: 3)
-#   SESSION_TIMEOUT       Session timeout in seconds (default: 0 = no limit)
 #   AI_CLI                AI CLI command name (override; also readable from .prizmkit/config.json)
 #   CODEBUDDY_CLI         Legacy alias for AI_CLI (deprecated, use AI_CLI instead)
 #   PRIZMKIT_PLATFORM     Platform hint for custom AI_CLI wrappers: codebuddy, claude, or codex
@@ -26,9 +25,6 @@ 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)
-#   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)
 #   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.
@@ -47,13 +43,9 @@ SCRIPTS_DIR="$SCRIPT_DIR/scripts"
 # Configuration (override via environment variables)
 MAX_RETRIES=${MAX_RETRIES:-3}
 MAX_INFRA_RETRIES=${MAX_INFRA_RETRIES:-3}
-SESSION_TIMEOUT=${SESSION_TIMEOUT:-0}
 HEARTBEAT_STALE_THRESHOLD=${HEARTBEAT_STALE_THRESHOLD:-600}
 HEARTBEAT_INTERVAL=${HEARTBEAT_INTERVAL:-30}
 STALE_KILL_THRESHOLD=${STALE_KILL_THRESHOLD:-900}
-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}
 MODEL=${MODEL:-""}
 PRIZMKIT_EFFORT=${PRIZMKIT_EFFORT:-""}
@@ -126,13 +118,6 @@ spawn_and_wait_session() {
     start_progress_parser "$session_log" "$progress_json" "$SCRIPTS_DIR"
     local parser_pid="${_PARSER_PID:-}"
 
-    # Timeout watchdog (only if SESSION_TIMEOUT > 0)
-    local watcher_pid=""
-    if [[ $SESSION_TIMEOUT -gt 0 ]]; then
-        ( sleep "$SESSION_TIMEOUT" && kill -TERM "$cbc_pid" 2>/dev/null ) &
-        watcher_pid=$!
-    fi
-
     # Heartbeat monitor (reads progress.json when available, falls back to tail)
     # Also monitors for stale sessions and auto-kills if no progress for STALE_KILL_THRESHOLD seconds
     start_heartbeat "$cbc_pid" "$session_log" "$progress_json" "$HEARTBEAT_INTERVAL" "$STALE_KILL_THRESHOLD"
@@ -146,19 +131,13 @@ spawn_and_wait_session() {
         exit_code=$?
     fi
 
-    # Clean up watcher, heartbeat, and parser
-    [[ -n "$watcher_pid" ]] && kill "$watcher_pid" 2>/dev/null || true
+    # Clean up heartbeat and parser
     stop_heartbeat "$heartbeat_pid"
     stop_progress_parser "$parser_pid"
-    [[ -n "$watcher_pid" ]] && wait "$watcher_pid" 2>/dev/null || true
 
     # Recover session log from backup if truncated by subagent stdout redirection
     prizm_recover_session_log "$session_log"
 
-    # Map SIGTERM (143) to timeout code 124
-    if [[ $exit_code -eq 143 ]]; then
-        exit_code=124
-    fi
     _SPAWN_EXIT_CODE="$exit_code"
 
     # Check for stale-kill marker (heartbeat killed the process due to no progress)
@@ -176,11 +155,7 @@ except Exception:
     pass
 PY
 )
-        if [[ "$stale_kill_reason" == "error_loop" ]]; then
-            log_warn "Session was killed by heartbeat monitor due to repeated read-offset/wasted-call errors"
-        else
-            log_warn "Session was stale-killed by heartbeat monitor (no progress for too long)"
-        fi
+        log_warn "Session was stale-killed by heartbeat monitor (no progress for too long)"
     fi
 
     local was_infra_error=false
@@ -229,19 +204,12 @@ PY
         log_warn "Session failed due to structured AI runtime/context error"
         log_warn "AI runtime errors are retried without consuming code retry budget"
         session_status="infra_error"
-    elif [[ $exit_code -eq 124 ]]; then
-        log_warn "Session timed out after ${SESSION_TIMEOUT}s"
-        session_status="timed_out"
     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"
     elif [[ "$was_stale_killed" == true ]]; then
-        if [[ "$stale_kill_reason" == "error_loop" ]]; then
-            log_warn "Session killed due to repeated read-offset/wasted-call error loop"
-        else
-            log_warn "Session stale-killed (no progress for ${STALE_KILL_THRESHOLD}s)"
-        fi
+        log_warn "Session stale-killed (no progress for ${STALE_KILL_THRESHOLD}s)"
         log_warn "Heartbeat-killed sessions are treated as failed; dev branch is preserved for inspection"
         session_status="crashed"
     elif [[ $exit_code -ne 0 ]]; then
@@ -521,29 +489,6 @@ check_dependencies() {
     prizm_ensure_git_repo "$_project_root"
 }
 
-run_log_cleanup() {
-    if [[ "$LOG_CLEANUP_ENABLED" != "1" ]]; then
-        return 0
-    fi
-
-    local cleanup_result
-    cleanup_result=$(python3 "$SCRIPTS_DIR/cleanup-logs.py" \
-        --state-dir "$STATE_DIR" \
-        --retention-days "$LOG_RETENTION_DAYS" \
-        --max-total-mb "$LOG_MAX_TOTAL_MB" 2>/dev/null) || {
-        log_warn "Log cleanup failed (continuing)"
-        return 0
-    }
-
-    local deleted reclaimed_kb
-    deleted=$(echo "$cleanup_result" | python3 -c "import sys,json; print(json.load(sys.stdin).get('deleted_files', 0))" 2>/dev/null || echo "0")
-    reclaimed_kb=$(echo "$cleanup_result" | python3 -c "import sys,json; print(int(json.load(sys.stdin).get('reclaimed_bytes', 0)/1024))" 2>/dev/null || echo "0")
-
-    if [[ "$deleted" -gt 0 ]]; then
-        log_info "Log cleanup: deleted $deleted files, reclaimed ${reclaimed_kb}KB"
-    fi
-}
-
 # ============================================================
 # run-one: Run a single feature with full control
 # ============================================================
@@ -607,15 +552,6 @@ run_one() {
                 critic_override="false"
                 shift
                 ;;
-            --timeout)
-                shift
-                if [[ $# -eq 0 ]]; then
-                    log_error "--timeout requires a value in seconds"
-                    exit 1
-                fi
-                SESSION_TIMEOUT="$1"
-                shift
-                ;;
             --max-infra-retries)
                 shift
                 if [[ $# -eq 0 ]]; then
@@ -669,7 +605,6 @@ run_one() {
     fi
 
     check_dependencies
-    run_log_cleanup
 
     # Initialize pipeline state if needed (same logic as run_all)
     if [[ ! -f "$STATE_DIR/pipeline.json" ]]; then
@@ -921,11 +856,6 @@ else:
     esac
     log_info "Pipeline mode: ${BOLD}$pipeline_mode${NC} ($_run_one_mode_desc)"
     log_info "Agents: $agent_count (critic: $([ "$critic_enabled" = "true" ] && echo "enabled" || echo "disabled"))"
-    if [[ $SESSION_TIMEOUT -gt 0 ]]; then
-        log_info "Session timeout: ${SESSION_TIMEOUT}s"
-    else
-        log_info "Session timeout: none"
-    fi
     log_info "Prompt: $bootstrap_prompt"
     log_info "Log: $session_dir/logs/session.log"
     echo -e "${BOLD}════════════════════════════════════════════════════${NC}"
@@ -1065,7 +995,6 @@ main() {
     fi
 
     check_dependencies
-    run_log_cleanup
 
     # Initialize pipeline state if needed
     if [[ ! -f "$STATE_DIR/pipeline.json" ]]; then
@@ -1118,11 +1047,6 @@ main() {
     fi
     log_info "Max code retries per feature: $MAX_RETRIES"
     log_info "Max infrastructure retries per feature: $MAX_INFRA_RETRIES"
-    if [[ $SESSION_TIMEOUT -gt 0 ]]; then
-        log_info "Session timeout: ${SESSION_TIMEOUT}s"
-    else
-        log_info "Session timeout: none"
-    fi
     log_info "AI CLI: $CLI_CMD (platform: $PLATFORM)"
     if [[ -n "${MODEL:-}" ]]; then
         log_info "Default Model: $MODEL"
@@ -1313,17 +1237,14 @@ DEPLOY_PROMPT_EOF
         fi
         echo -e "${BOLD}────────────────────────────────────────────────────${NC}"
 
-        # Do not auto-commit an arbitrary dirty baseline on the original branch.
-        # Only pipeline bookkeeping is committed explicitly; user/source WIP,
-        # submodule dirt, specs, and root-level hidden tool temporary worktrees
-        # must never be swept into main by a broad git add.
+        # Auto-commit any uncommitted workspace changes before starting the pipeline.
+        # This ensures a clean baseline without blocking execution.
         local _dirty_files=""
         _dirty_files=$(prizm_git_status_non_bookkeeping "$_proj_root" "$STATE_DIR" "$feature_list" || true)
         if [[ -n "$_dirty_files" ]]; then
-            log_error "Dirty working tree detected before $feature_id; refusing to commit it on $_ORIGINAL_BRANCH."
-            log_error "Commit/stash your changes or start from a clean branch, then rerun the pipeline."
-            printf '%s\n' "$_dirty_files" | sed 's/^/  /'
-            break
+            log_info "Auto-committing workspace changes before $feature_id..."
+            prizm_git_add_all_safe "$_proj_root"
+            git -C "$_proj_root" commit --no-verify -m "chore: workspace snapshot ready for run $feature_id" 2>/dev/null || true
         fi
 
         local _bookkeeping_dirty=""
@@ -1508,7 +1429,6 @@ show_help() {
     echo "  --no-critic                 Disable critic review (overrides feature-list setting)"
     echo "  --clean                     Delete artifacts and reset before running"
     echo "  --no-reset                  Skip feature status reset step"
-    echo "  --timeout N                 Session timeout in seconds (default: 0 = no limit)"
     echo "  --max-infra-retries N       Max infrastructure/provider retries (default: 3)"
     echo ""
     echo "Pipeline Options (run all):"
@@ -1517,16 +1437,12 @@ show_help() {
     echo "Environment Variables:"
     echo "  MAX_RETRIES           Max code retries per feature (default: 3)"
     echo "  MAX_INFRA_RETRIES     Max infrastructure/provider retries per feature (default: 3)"
-    echo "  SESSION_TIMEOUT       Session timeout in seconds (default: 0 = no limit)"
     echo "  AI_CLI                AI CLI command name (auto-detected: cbc, claude, or codex)"
     echo "  MODEL                 AI model ID (e.g. claude-opus-4.6, claude-sonnet-4.6, claude-haiku-4.5)"
     echo "  PRIZMKIT_EFFORT       AI reasoning effort (low|medium|high|xhigh|max; max is Claude Code only)"
     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 "  LOG_CLEANUP_ENABLED   Run log cleanup before execution (default: 1)"
-    echo "  LOG_RETENTION_DAYS    Delete logs older than N days (default: 14)"
-    echo "  LOG_MAX_TOTAL_MB      Keep total logs under N MB (default: 1024)"
     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)"
@@ -1538,10 +1454,8 @@ show_help() {
     echo "  ./run-feature.sh run F-007 --dry-run                          # Inspect generated prompt"
     echo "  ./run-feature.sh run F-007 --dry-run --mode lite               # Test lite mode"
     echo "  ./run-feature.sh run F-007 --resume-phase 6                    # Skip to implementation"
-    echo "  ./run-feature.sh run F-007 --mode full --timeout 3600          # Full mode, 1h timeout"
     echo "  ./run-feature.sh run F-007 --clean --mode standard             # Clean + run standard"
     echo "  ./run-feature.sh status                                        # Show pipeline status"
-    echo "  MAX_RETRIES=5 SESSION_TIMEOUT=7200 ./run-feature.sh run        # Custom config"
     echo "  MODEL=claude-sonnet-4.6 ./run-feature.sh run                    # Use Sonnet model"
     echo "  MODEL=claude-haiku-4.5 ./run-feature.sh test-cli                # Test with Haiku"
 }

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

@@ -23,7 +23,6 @@ set -euo pipefail
 #   ./run-recovery.sh help                  Show help
 #
 # Environment Variables:
-#   SESSION_TIMEOUT       Session timeout in seconds (default: 0 = no limit)
 #   AI_CLI                AI CLI command name (auto-detected: cbc, claude, or codex)
 #   PRIZMKIT_PLATFORM     Platform hint for custom AI_CLI wrappers: codebuddy, claude, or codex
 #   MODEL                 AI model to use (e.g. claude-opus-4.6)
@@ -62,7 +61,6 @@ if [[ -z "$RECOVERY_DETECT_SCRIPT" ]]; then
 fi
 
 # Configuration
-SESSION_TIMEOUT=${SESSION_TIMEOUT:-0}
 HEARTBEAT_INTERVAL=${HEARTBEAT_INTERVAL:-30}
 STALE_KILL_THRESHOLD=${STALE_KILL_THRESHOLD:-900}
 VERBOSE=${VERBOSE:-0}
@@ -108,7 +106,6 @@ Options (for 'run' command):
   --model M   Override AI model (e.g. claude-opus-4.6)
 
 Environment Variables:
-  SESSION_TIMEOUT       Session timeout in seconds (default: 0 = no limit)
   MODEL                 AI model to use
   PRIZMKIT_EFFORT       AI reasoning effort (low|medium|high|xhigh|max; max is Claude Code only)
   VERBOSE               Set to 1 for verbose AI CLI output
@@ -283,13 +280,6 @@ spawn_recovery_session() {
     start_progress_parser "$session_log" "$progress_json" "$SCRIPTS_DIR"
     local parser_pid="${_PARSER_PID:-}"
 
-    # Timeout watchdog
-    local watcher_pid=""
-    if [[ $SESSION_TIMEOUT -gt 0 ]]; then
-        ( sleep "$SESSION_TIMEOUT" && kill -TERM "$_SESSION_PID" 2>/dev/null ) &
-        watcher_pid=$!
-    fi
-
     # Heartbeat monitor
     start_heartbeat "$_SESSION_PID" "$session_log" "$progress_json" "$HEARTBEAT_INTERVAL" "$STALE_KILL_THRESHOLD"
     _HEARTBEAT_PID="${_HEARTBEAT_PID:-}"
@@ -303,17 +293,10 @@ spawn_recovery_session() {
     fi
     _SESSION_PID=""
 
-    # Cleanup background processes
-    [[ -n "$watcher_pid" ]] && kill "$watcher_pid" 2>/dev/null || true
+    # Clean up heartbeat and parser
     stop_heartbeat "${_HEARTBEAT_PID:-}"
     _HEARTBEAT_PID=""
     stop_progress_parser "$parser_pid"
-    [[ -n "$watcher_pid" ]] && wait "$watcher_pid" 2>/dev/null || true
-
-    # Map SIGTERM to timeout
-    if [[ $exit_code -eq 143 ]]; then
-        exit_code=124
-    fi
 
     # Check for stale-kill
     local stale_kill_marker="$session_dir/logs/stale-kill.json"
@@ -347,12 +330,6 @@ detect_session_outcome() {
     local was_stale_killed=false
     [[ -f "$stale_kill_marker" ]] && was_stale_killed=true
 
-    if [[ $exit_code -eq 124 ]]; then
-        log_warn "Session timed out"
-        echo "timed_out"
-        return
-    fi
-
     if [[ "$was_stale_killed" == true ]]; then
         log_warn "Session stale-killed"
     fi
@@ -611,14 +588,6 @@ cmd_run() {
             echo "    • Commit manually: git add <files> && git commit"
             echo ""
             ;;
-        timed_out)
-            log_warn "Session timed out before completing."
-            echo ""
-            echo "  Options:"
-            echo "    • Run recovery again: ./run-recovery.sh"
-            echo "    • Increase timeout: SESSION_TIMEOUT=3600 ./run-recovery.sh"
-            echo ""
-            ;;
         no_changes)
             log_warn "Session completed but produced no changes."
             echo ""

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

@@ -16,7 +16,6 @@ set -euo pipefail
 # Environment Variables:
 #   MAX_RETRIES           Max code retries per refactor (default: 3)
 #   MAX_INFRA_RETRIES     Max infrastructure/provider retries per refactor (default: 3)
-#   SESSION_TIMEOUT       Session timeout in seconds (default: 0 = no limit)
 #   AI_CLI                AI CLI command name (auto-detected: cbc, claude, or codex)
 #   CODEBUDDY_CLI         Legacy alias for AI_CLI (deprecated, use AI_CLI instead)
 #   PRIZMKIT_PLATFORM     Platform hint for custom AI_CLI wrappers: codebuddy, claude, or codex
@@ -24,9 +23,6 @@ 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)
-#   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)
 #   DEV_BRANCH            Custom dev branch name (default: auto-generated refactor/pipeline-{run_id})
 #   AUTO_PUSH             Auto-push to remote after successful refactor (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.
@@ -45,13 +41,9 @@ SCRIPTS_DIR="$SCRIPT_DIR/scripts"
 # Configuration
 MAX_RETRIES=${MAX_RETRIES:-3}
 MAX_INFRA_RETRIES=${MAX_INFRA_RETRIES:-3}
-SESSION_TIMEOUT=${SESSION_TIMEOUT:-0}
 HEARTBEAT_STALE_THRESHOLD=${HEARTBEAT_STALE_THRESHOLD:-600}
 HEARTBEAT_INTERVAL=${HEARTBEAT_INTERVAL:-30}
 STALE_KILL_THRESHOLD=${STALE_KILL_THRESHOLD:-900}
-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}
 MODEL=${MODEL:-""}
 PRIZMKIT_EFFORT=${PRIZMKIT_EFFORT:-""}
@@ -119,13 +111,6 @@ spawn_and_wait_session() {
     start_progress_parser "$session_log" "$progress_json" "$SCRIPTS_DIR"
     local parser_pid="${_PARSER_PID:-}"
 
-    # Timeout watchdog
-    local watcher_pid=""
-    if [[ $SESSION_TIMEOUT -gt 0 ]]; then
-        ( sleep "$SESSION_TIMEOUT" && kill -TERM "$cli_pid" 2>/dev/null ) &
-        watcher_pid=$!
-    fi
-
     # Heartbeat monitor (with stale-kill protection)
     start_heartbeat "$cli_pid" "$session_log" "$progress_json" "$HEARTBEAT_INTERVAL" "$STALE_KILL_THRESHOLD"
     local heartbeat_pid="${_HEARTBEAT_PID:-}"
@@ -139,16 +124,12 @@ spawn_and_wait_session() {
     fi
 
     # Cleanup
-    [[ -n "$watcher_pid" ]] && kill "$watcher_pid" 2>/dev/null || true
     stop_heartbeat "$heartbeat_pid"
     stop_progress_parser "$parser_pid"
-    [[ -n "$watcher_pid" ]] && wait "$watcher_pid" 2>/dev/null || true
 
     # Recover session log from backup if truncated by subagent stdout redirection
     prizm_recover_session_log "$session_log"
 
-    [[ $exit_code -eq 143 ]] && exit_code=124
-
     # Check for stale-kill marker (heartbeat killed the process due to no progress)
     local stale_kill_marker="$session_dir/logs/stale-kill.json"
     local was_stale_killed=false
@@ -164,11 +145,7 @@ except Exception:
     pass
 PY
 )
-        if [[ "$stale_kill_reason" == "error_loop" ]]; then
-            log_warn "Session was killed by heartbeat monitor due to repeated read-offset/wasted-call errors"
-        else
-            log_warn "Session was stale-killed by heartbeat monitor (no progress for too long)"
-        fi
+        log_warn "Session was stale-killed by heartbeat monitor (no progress for too long)"
     fi
 
     local was_infra_error=false
@@ -194,19 +171,12 @@ PY
     project_root="$PROJECT_ROOT"
     local default_branch="$base_branch"
 
-    if [[ $exit_code -eq 124 ]]; then
-        log_warn "Session timed out after ${SESSION_TIMEOUT}s"
-        session_status="timed_out"
-    elif [[ "$was_infra_error" == true ]]; then
+    if [[ "$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"
     elif [[ "$was_stale_killed" == true ]]; then
-        if [[ "$stale_kill_reason" == "error_loop" ]]; then
-            log_warn "Session killed due to repeated read-offset/wasted-call error loop"
-        else
-            log_warn "Session stale-killed (no progress for ${STALE_KILL_THRESHOLD}s)"
-        fi
+        log_warn "Session stale-killed (no progress for ${STALE_KILL_THRESHOLD}s)"
         log_warn "Stale-killed sessions are treated as failed; dev branch is preserved for inspection"
         session_status="crashed"
     elif [[ $exit_code -ne 0 ]]; then
@@ -426,29 +396,6 @@ check_dependencies() {
     prizm_ensure_git_repo "$_project_root"
 }
 
-run_log_cleanup() {
-    if [[ "$LOG_CLEANUP_ENABLED" != "1" ]]; then
-        return 0
-    fi
-
-    local cleanup_result
-    cleanup_result=$(python3 "$SCRIPTS_DIR/cleanup-logs.py" \
-        --state-dir "$STATE_DIR" \
-        --retention-days "$LOG_RETENTION_DAYS" \
-        --max-total-mb "$LOG_MAX_TOTAL_MB" 2>/dev/null) || {
-        log_warn "Log cleanup failed (continuing)"
-        return 0
-    }
-
-    local deleted reclaimed_kb
-    deleted=$(echo "$cleanup_result" | python3 -c "import sys,json; print(json.load(sys.stdin).get('deleted_files', 0))" 2>/dev/null || echo "0")
-    reclaimed_kb=$(echo "$cleanup_result" | python3 -c "import sys,json; print(int(json.load(sys.stdin).get('reclaimed_bytes', 0)/1024))" 2>/dev/null || echo "0")
-
-    if [[ "$deleted" -gt 0 ]]; then
-        log_info "Log cleanup: deleted $deleted files, reclaimed ${reclaimed_kb}KB"
-    fi
-}
-
 # ============================================================
 # run-one: Run a single refactor
 # ============================================================
@@ -467,7 +414,6 @@ run_one() {
             --dry-run) dry_run=true; shift ;;
             --clean) do_clean=true; shift ;;
             --no-reset) no_reset=true; shift ;;
-            --timeout) shift; SESSION_TIMEOUT="${1:-0}"; shift ;;
             --max-infra-retries)
                 shift
                 if [[ $# -eq 0 ]]; then
@@ -518,7 +464,6 @@ run_one() {
     fi
 
     check_dependencies
-    run_log_cleanup
 
     # Initialize state if needed
     if [[ ! -f "$STATE_DIR/pipeline.json" ]]; then
@@ -907,7 +852,6 @@ main() {
     fi
 
     check_dependencies
-    run_log_cleanup
 
     # Initialize pipeline state if needed
     if [[ ! -f "$STATE_DIR/pipeline.json" ]]; then
@@ -956,11 +900,6 @@ main() {
     log_info "Refactor list: $refactor_list"
     log_info "Max code retries per refactor: $MAX_RETRIES"
     log_info "Max infrastructure retries per refactor: $MAX_INFRA_RETRIES"
-    if [[ $SESSION_TIMEOUT -gt 0 ]]; then
-        log_info "Session timeout: ${SESSION_TIMEOUT}s"
-    else
-        log_info "Session timeout: none"
-    fi
     log_info "AI CLI: $CLI_CMD (platform: $PLATFORM)"
     if [[ -n "${MODEL:-}" ]]; then
         log_info "Default Model: $MODEL"
@@ -1112,17 +1051,14 @@ DEPLOY_PROMPT_EOF
         fi
         echo -e "${BOLD}────────────────────────────────────────────────────${NC}"
 
-        # Do not auto-commit an arbitrary dirty baseline on the original branch.
-        # Only pipeline bookkeeping is committed explicitly; user/source WIP,
-        # submodule dirt, specs, and root-level hidden tool temporary worktrees
-        # must never be swept into main by a broad git add.
+        # Auto-commit any uncommitted workspace changes before starting the pipeline.
+        # This ensures a clean baseline without blocking execution.
         local _dirty_files=""
         _dirty_files=$(prizm_git_status_non_bookkeeping "$_proj_root" "$STATE_DIR" "$refactor_list" || true)
         if [[ -n "$_dirty_files" ]]; then
-            log_error "Dirty working tree detected before $refactor_id; refusing to commit it on $_ORIGINAL_BRANCH."
-            log_error "Commit/stash your changes or start from a clean branch, then rerun the pipeline."
-            printf '%s\n' "$_dirty_files" | sed 's/^/  /'
-            break
+            log_info "Auto-committing workspace changes before $refactor_id..."
+            prizm_git_add_all_safe "$_proj_root"
+            git -C "$_proj_root" commit --no-verify -m "chore: workspace snapshot ready for run $refactor_id" 2>/dev/null || true
         fi
 
         local _bookkeeping_dirty=""
@@ -1315,7 +1251,6 @@ show_help() {
     echo "  --dry-run                   Generate bootstrap prompt only, don't spawn session"
     echo "  --clean                     Delete artifacts and reset before running"
     echo "  --no-reset                  Skip status reset (preserve retry count)"
-    echo "  --timeout N                 Session timeout in seconds (default: 0 = no limit)"
     echo "  --max-infra-retries N       Max infrastructure/provider retries (default: 3)"
     echo "  --mode <lite|standard|full> Override pipeline mode"
     echo "  --critic                    Enable adversarial critic review"
@@ -1327,7 +1262,6 @@ show_help() {
     echo "Environment Variables:"
     echo "  MAX_RETRIES              Max code retries per refactor (default: 3)"
     echo "  MAX_INFRA_RETRIES     Max infrastructure/provider retries per refactor (default: 3)"
-    echo "  SESSION_TIMEOUT          Session timeout in seconds (default: 0 = no limit)"
     echo "  MODEL                    Default AI model (overridden by per-refactor model in refactor list)"
     echo "  PRIZMKIT_EFFORT          AI reasoning effort (low|medium|high|xhigh|max; max is Claude Code only)"
     echo "  PIPELINE_MODE            Default pipeline mode: lite|standard|full (overridden by --mode)"
@@ -1338,15 +1272,11 @@ 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 "  STOP_ON_FAILURE          Stop pipeline when a task exhausts retries: 0|1 (default: 0)"
-    echo "  LOG_CLEANUP_ENABLED      Run log cleanup before execution (default: 1)"
-    echo "  LOG_RETENTION_DAYS       Delete logs older than N days (default: 14)"
-    echo "  LOG_MAX_TOTAL_MB         Keep total logs under N MB (default: 1024)"
     echo ""
     echo "Examples:"
     echo "  ./run-refactor.sh run                                    # Run all refactors"
     echo "  ./run-refactor.sh run .prizmkit/plans/refactor-list.json                 # Custom refactor list"
     echo "  ./run-refactor.sh run R-001 --dry-run                    # Inspect generated prompt"
-    echo "  ./run-refactor.sh run R-001 --timeout 3600               # 1h timeout"
     echo "  ./run-refactor.sh status                                 # Show status"
     echo "  STRICT_BEHAVIOR_CHECK=0 ./run-refactor.sh run            # Skip full test suite"
     echo "  MAX_RETRIES=5 ./run-refactor.sh run                      # Custom retries"

package/bundled/dev-pipeline/tests/test-deploy-safety.sh

@@ -80,10 +80,10 @@ else
     fail "incomplete_count=$count, expected 0"
 fi
 
-# --- Test 4: Timed-out status -> deploy blocked ---
-echo "[Test 4] 'timed_out' status: incomplete_count should be 1"
+# --- Test 4: auto_skipped status -> deploy blocked ---
+echo "[Test 4] 'auto_skipped' status: incomplete_count should be 1"
 cat > /tmp/test-deploy-timeout.json << 'JSON'
-{"features": [{"id": "F-A", "status": "completed"}, {"id": "F-B", "status": "timed_out"}]}
+{"features": [{"id": "F-A", "status": "completed"}, {"id": "F-B", "status": "auto_skipped"}]}
 JSON
 count=$(python3 -c "
 import json

package/bundled/dev-pipeline-windows/.env.example

@@ -19,16 +19,12 @@
 
 # ─── Pipeline Execution ──────────────────────────────────────────────
 # MAX_RETRIES=3              # Max retry attempts per task before marking failed
-# SESSION_TIMEOUT=0          # Session timeout in seconds (0 = no limit)
 # VERBOSE=1                  # Verbose logging (1=on, 0=off)
 # HEARTBEAT_INTERVAL=30      # Poll interval for session progress/stale checks
 # STALE_KILL_THRESHOLD=900   # Auto-kill session after N seconds without parent log progress (0 = disabled)
 # STALE_KILL_GRACE_SECONDS=10  # Grace period after stale-kill before force-stopping the job
 # CODEX_WAIT_STALE_KILL_THRESHOLD=3600  # Longer no-log window while Codex waits on subagents
 # CODEX_SUBAGENT_TIMEOUT_SECONDS=3300  # Codex subagent max runtime; defaults to wait threshold - 300
-# LOG_CLEANUP_ENABLED=1      # Run periodic session log cleanup
-# LOG_RETENTION_DAYS=14      # Delete session logs older than N days
-# LOG_MAX_TOTAL_MB=1024      # Keep total logs under N MB via oldest-first cleanup
 # STOP_ON_FAILURE=0          # Stop after the first failed task (1=stop, 0=continue)
 # ENABLE_DEPLOY=0            # Start a deploy session after all tasks complete successfully
 # DEV_BRANCH=                # Optional custom dev branch name for each task

package/bundled/dev-pipeline-windows/SCHEMA_ANALYSIS.md

@@ -343,16 +343,12 @@ pending, in_progress, completed, failed, skipped
 | `AI_CLI` | string | auto-detect | codex, claude, or cbc |
 | `MODEL` | string | (unset) | AI model override (per-task overrides this) |
 | `MAX_RETRIES` | integer | (not specified) | Retry attempts per task |
-| `SESSION_TIMEOUT` | integer | 0 | 0 = no limit |
 | `VERBOSE` | integer | (not specified) | 1=on, 0=off |
 | `HEARTBEAT_INTERVAL` | integer | 30 | Poll interval for session progress/stale checks |
 | `STALE_KILL_THRESHOLD` | integer | 900 | Auto-kill after N seconds without parent log progress; 0 disables |
 | `STALE_KILL_GRACE_SECONDS` | integer | 10 | Grace period after stale-kill before force-stopping |
 | `CODEX_WAIT_STALE_KILL_THRESHOLD` | integer | 3600 | Longer no-log stale window while Codex waits on subagents |
 | `CODEX_SUBAGENT_TIMEOUT_SECONDS` | integer | 3300 | Codex subagent max runtime |
-| `LOG_CLEANUP_ENABLED` | boolean | 1 | Periodic session log cleanup |
-| `LOG_RETENTION_DAYS` | integer | 14 | Delete session logs older than N days |
-| `LOG_MAX_TOTAL_MB` | integer | 1024 | Keep total logs under N MB |
 | `STOP_ON_FAILURE` | boolean | 0 | Stop after a task exhausts retries |
 | `ENABLE_DEPLOY` | boolean | 0 | Start deploy session after all tasks complete |
 | `DEV_BRANCH` | string | auto-generated | Optional custom dev branch name |

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

@@ -51,7 +51,6 @@ Located at `.prizmkit/dev-pipeline/scripts/`:
 | `check-session-status.py` | Read and validate session-status.json output |
 | `detect-stuck.py` | Detect stuck/hung pipeline sessions via heartbeat |
 | `parse-stream-progress.py` | Parse AI CLI output stream for progress tracking |
-| `cleanup-logs.py` | Clean up old pipeline logs and state files |
 | `utils.py` | Shared utility functions for pipeline scripts |
 
 ## Artifact Mapping
@@ -125,7 +124,6 @@ The agent MUST write `session-status.json` before exiting:
 | `status: "partial"`, `can_resume: false` | Retry from scratch |
 | `status: "failed"` | Retry (up to MAX_RETRIES) |
 | No status file (crash) | Treat as failed, retry |
-| Timeout (exit 124) | Treat as timed_out, retry |
 
 ## Team Naming Convention