claude-evolve 1.3.0 → 1.3.2

package/bin/claude-evolve-run

@@ -29,6 +29,10 @@ while [[ $# -gt 0 ]]; do
     force_sequential="true"
     shift
     ;;
+  --keep-awake|--caffeinate)
+    use_caffeinate="true"
+    shift
+    ;;
   --help)
     cat <<EOF
 claude-evolve run - Execute evolution candidates
@@ -40,6 +44,7 @@ OPTIONS:
   --timeout <sec>  Kill evaluator after specified seconds (default: no timeout)
   --parallel       Force parallel execution mode
   --sequential     Force sequential execution mode
+  --keep-awake     Prevent system sleep during execution (macOS only)
   --help           Show this help message
 
 DESCRIPTION:
@@ -59,6 +64,13 @@ EOF
   esac
 done
 
+# Check if caffeinate should be used
+if [[ "$use_caffeinate" == "true" ]] && command -v caffeinate >/dev/null 2>&1; then
+  echo "[INFO] Using caffeinate to prevent system sleep"
+  # Re-run this script with caffeinate
+  exec caffeinate -dims "$0" "$@"
+fi
+
 # Determine execution mode
 use_parallel=false
 if [[ "$force_parallel" == "true" ]]; then

package/bin/claude-evolve-run-parallel

@@ -44,8 +44,8 @@ fi
 # Prepare logging
 mkdir -p logs
 
-# Track active workers
-declare -A worker_pids=()
+# Track active workers (using regular array for compatibility)
+worker_pids=()
 consecutive_failures=0
 MAX_FAILURES=10
 rate_limit_hit=false
@@ -57,7 +57,7 @@ count_pending() {
     return
   fi
   
-  echo "$csv_content" | awk -F',' 'NR>1 && $5 == "pending" { count++ } END { print count+0 }'
+  echo "$csv_content" | awk -F',' 'NR>1 && ($5 == "pending" || $5 == "") { count++ } END { print count+0 }'
 }
 
 # Start a worker
@@ -68,8 +68,16 @@ start_worker() {
   echo "[DISPATCHER] Starting worker..."
   $worker_cmd &
   local pid=$!
-  worker_pids[$pid]=1
-  echo "[DISPATCHER] Worker $pid started"
+  
+  # Verify worker started successfully
+  sleep 0.1
+  if kill -0 "$pid" 2>/dev/null; then
+    worker_pids+=($pid)
+    echo "[DISPATCHER] Worker $pid started"
+  else
+    echo "[ERROR] Worker failed to start" >&2
+    ((consecutive_failures++))
+  fi
 }
 
 # Check worker exit status and handle accordingly
@@ -100,13 +108,17 @@ handle_worker_exit() {
   esac
   
   # Remove from tracking
-  unset worker_pids[$pid]
+  local new_pids=()
+  for p in "${worker_pids[@]}"; do
+    [[ $p != "$pid" ]] && new_pids+=($p)
+  done
+  worker_pids=("${new_pids[@]}")
 }
 
 # Signal handler for graceful shutdown
 shutdown_workers() {
   echo "[DISPATCHER] Shutting down workers..."
-  for pid in "${!worker_pids[@]}"; do
+  for pid in "${worker_pids[@]}"; do
     if kill -0 "$pid" 2>/dev/null; then
       echo "[DISPATCHER] Stopping worker $pid"
       kill -TERM "$pid" 2>/dev/null || true
@@ -119,15 +131,17 @@ shutdown_workers() {
     sleep 1
     ((timeout--))
     
-    for pid in "${!worker_pids[@]}"; do
-      if ! kill -0 "$pid" 2>/dev/null; then
-        unset worker_pids[$pid]
+    local new_pids=()
+    for pid in "${worker_pids[@]}"; do
+      if kill -0 "$pid" 2>/dev/null; then
+        new_pids+=($pid)
       fi
     done
+    worker_pids=("${new_pids[@]}")
   done
   
   # Force kill remaining workers
-  for pid in "${!worker_pids[@]}"; do
+  for pid in "${worker_pids[@]}"; do
     if kill -0 "$pid" 2>/dev/null; then
       echo "[DISPATCHER] Force killing worker $pid"
       kill -KILL "$pid" 2>/dev/null || true
@@ -138,11 +152,75 @@ shutdown_workers() {
   exit 0
 }
 
-trap shutdown_workers INT TERM
+# Better signal handling with logging
+handle_signal() {
+  local signal="$1"
+  echo "[DISPATCHER] Received signal: $signal" >&2
+  echo "[DISPATCHER] Active workers: ${#worker_pids[@]}" >&2
+  
+  # For expensive workers, give option to continue
+  if [[ ${#worker_pids[@]} -gt 0 ]]; then
+    echo "[DISPATCHER] Warning: ${#worker_pids[@]} expensive workers are still running!" >&2
+    echo "[DISPATCHER] Press Ctrl+C again within 5 seconds to force shutdown, or wait..." >&2
+    
+    # Give 5 seconds to reconsider
+    local count=5
+    while [[ $count -gt 0 ]]; do
+      sleep 1
+      ((count--))
+      # Check if we got another signal
+      if [[ -f /tmp/evolve-force-shutdown-$$ ]]; then
+        echo "[DISPATCHER] Force shutdown requested" >&2
+        rm -f /tmp/evolve-force-shutdown-$$
+        shutdown_workers
+        exit 1
+      fi
+    done
+    
+    echo "[DISPATCHER] Continuing with active workers..." >&2
+    return
+  fi
+  
+  shutdown_workers
+}
+
+# Set up signal handlers
+trap 'handle_signal INT' INT
+trap 'handle_signal TERM' TERM
+trap 'echo "[DISPATCHER] Exiting with code $?" >&2' EXIT
+
+# Check for stuck "running" candidates from previous runs
+check_stuck_candidates() {
+  if read_csv_with_lock csv_content; then
+    local stuck_count=$(echo "$csv_content" | awk -F',' 'NR>1 && $5 == "running" { count++ } END { print count+0 }')
+    if [[ $stuck_count -gt 0 ]]; then
+      echo "[DISPATCHER] Found $stuck_count candidates stuck in 'running' status"
+      echo "[DISPATCHER] Resetting them to 'pending' for retry..."
+      
+      # Reset stuck candidates
+      if acquire_csv_lock; then
+        awk -F',' -v OFS=',' '
+          NR==1 { print }
+          NR>1 { 
+            if ($5 == "running") $5 = "pending"
+            print 
+          }
+        ' "$FULL_CSV_PATH" > "${FULL_CSV_PATH}.tmp" && mv -f "${FULL_CSV_PATH}.tmp" "$FULL_CSV_PATH"
+        release_csv_lock
+      fi
+    fi
+  fi
+}
 
 # Main dispatcher loop
 echo "[DISPATCHER] Starting main dispatch loop"
 
+# Check for stuck candidates from previous runs
+check_stuck_candidates
+
+# Set error handling
+set +e  # Don't exit on error in the main loop
+
 while true; do
   # Check if too many consecutive failures
   if [[ $consecutive_failures -ge $MAX_FAILURES ]]; then
@@ -158,29 +236,24 @@ while true; do
   fi
   
   # Count pending work
-  pending_count=$(count_pending)
+  pending_count=$(count_pending || echo "0")
   active_workers=${#worker_pids[@]}
   
   echo "[DISPATCHER] Status: $pending_count pending, $active_workers active workers"
   
-  # If no pending work and no active workers, try to generate more ideas
+  # Debug: Show CSV status if no pending
+  if [[ $pending_count -eq 0 ]]; then
+    total_rows=$(read_csv_with_lock csv_content && echo "$csv_content" | wc -l | xargs)
+    complete_count=$(read_csv_with_lock csv_content && echo "$csv_content" | awk -F',' 'NR>1 && $5 == "complete" { count++ } END { print count+0 }')
+    echo "[DISPATCHER] CSV has $((total_rows-1)) total candidates, $complete_count complete"
+  fi
+  
+  # If no pending work and no active workers, we're done
   if [[ $pending_count -eq 0 && $active_workers -eq 0 ]]; then
-    echo "[DISPATCHER] No work available. Generating new ideas..."
-    
-    ideate_script="$SCRIPT_DIR/claude-evolve-ideate"
-    if [[ ! -f "$ideate_script" ]]; then
-      echo "[DISPATCHER] No ideate script found. Evolution complete."
-      break
-    fi
-    
-    if ! "$ideate_script"; then
-      echo "[ERROR] Failed to generate new ideas" >&2
-      break
-    fi
-    
-    # Recount after ideation
-    pending_count=$(count_pending)
-    echo "[DISPATCHER] Generated ideas. New pending count: $pending_count"
+    echo "[DISPATCHER] No pending candidates found. Evolution complete."
+    echo "[DISPATCHER] Run 'claude-evolve ideate' to generate more candidates."
+    echo "[DISPATCHER] Exiting main loop: no work remaining" >&2
+    break
   fi
   
   # Start workers if we have pending work and capacity
@@ -198,22 +271,43 @@ while true; do
   
   # Wait for any worker to finish
   if [[ $active_workers -gt 0 ]]; then
-    # Wait for any child process to exit
-    wait -n
+    # Poll for finished workers (macOS compatible)
+    sleep 5  # Check every 5 seconds
     
     # Check which workers have finished
-    for pid in "${!worker_pids[@]}"; do
+    for pid in "${worker_pids[@]}"; do
       if ! kill -0 "$pid" 2>/dev/null; then
         # Get exit status
-        wait "$pid"
+        wait "$pid" 2>/dev/null
         exit_code=$?
         handle_worker_exit "$pid" "$exit_code"
       fi
     done
+    
+    # Safety check - if we have workers but the array is corrupted
+    if [[ ${#worker_pids[@]} -eq 0 ]] && jobs -r | grep -q .; then
+      echo "[DISPATCHER] Warning: Lost track of workers but jobs still running!" >&2
+      echo "[DISPATCHER] Attempting to recover..." >&2
+      
+      # Try to recover PIDs from jobs
+      while read -r job_info; do
+        if [[ $job_info =~ \[([0-9]+)\][[:space:]]+([0-9]+) ]]; then
+          local recovered_pid="${BASH_REMATCH[2]}"
+          echo "[DISPATCHER] Recovered worker PID: $recovered_pid" >&2
+          worker_pids+=($recovered_pid)
+        fi
+      done < <(jobs -l)
+    fi
   else
     # No active workers but we might be waiting for ideation or have pending work
     sleep 1
   fi
 done
 
-echo "[DISPATCHER] Evolution run complete"
+echo "[DISPATCHER] Evolution run complete"
+
+# Final cleanup check
+if [[ ${#worker_pids[@]} -gt 0 ]]; then
+  echo "[DISPATCHER] Warning: ${#worker_pids[@]} workers still active at exit"
+  shutdown_workers
+fi

package/bin/claude-evolve-worker

@@ -187,7 +187,8 @@ eval_exit_code=0
 
 if [[ -n $timeout_seconds ]]; then
   echo "[WORKER-$$] Evaluation timeout: ${timeout_seconds}s"
-  if eval_output=$(timeout "$timeout_seconds" "$PYTHON_CMD" "$FULL_EVALUATOR_PATH" "$output_file" 2>&1); then
+  # For Modal compatibility, don't capture stderr
+  if eval_output=$(timeout "$timeout_seconds" "$PYTHON_CMD" "$FULL_EVALUATOR_PATH" "$output_file"); then
     eval_exit_code=0
   else
     eval_exit_code=$?
@@ -198,7 +199,8 @@ if [[ -n $timeout_seconds ]]; then
     fi
   fi
 else
-  if eval_output=$("$PYTHON_CMD" "$FULL_EVALUATOR_PATH" "$output_file" 2>&1); then
+  # For Modal compatibility, don't capture stderr
+  if eval_output=$("$PYTHON_CMD" "$FULL_EVALUATOR_PATH" "$output_file"); then
     eval_exit_code=0
   else
     eval_exit_code=$?

package/lib/config.sh

@@ -58,14 +58,29 @@ load_config() {
     # Simple YAML parsing for key: value pairs and nested structures
     local in_ideation_section=false
     local in_parallel_section=false
-    while IFS=': ' read -r key value; do
+    while IFS='' read -r line; do
       # Skip comments and empty lines
-      [[ $key =~ ^[[:space:]]*# ]] || [[ -z $key ]] && continue
+      [[ $line =~ ^[[:space:]]*# ]] || [[ -z $line ]] && continue
+      
+      # Parse key:value from line
+      if [[ ! $line =~ ^([^:]+):(.*)$ ]]; then
+        continue
+      fi
+      key="${BASH_REMATCH[1]}"
+      value="${BASH_REMATCH[2]}"
+      
+      # Check if key is indented (for nested sections)
+      local is_indented=false
+      [[ $key =~ ^[[:space:]]+ ]] && is_indented=true
+      
       
       # Remove leading/trailing whitespace
       key=$(echo "$key" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
       value=$(echo "$value" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
       
+      # Remove inline comments from value
+      value=$(echo "$value" | sed 's/[[:space:]]*#.*$//')
+      
       # Remove quotes from value
       value=$(echo "$value" | sed 's/^"//;s/"$//')
       
@@ -78,8 +93,8 @@ load_config() {
         in_parallel_section=true
         in_ideation_section=false
         continue
-      elif [[ $key =~ ^[a-z_]+ ]] && [[ $in_ideation_section == true || $in_parallel_section == true ]]; then
-        # Top-level key found, exit nested sections
+      elif [[ $is_indented == false ]] && [[ $in_ideation_section == true || $in_parallel_section == true ]]; then
+        # Non-indented key found while in a section, exit nested sections
         in_ideation_section=false
         in_parallel_section=false
       fi

package/lib/csv-lock.sh

@@ -135,14 +135,18 @@ find_next_pending_with_lock() {
     
     # Find oldest pending candidate and update to running
     local candidate=$(awk -F',' '
-        NR>1 && $5 == "pending" { print $1; exit }
+        NR>1 && ($5 == "pending" || $5 == "") { print $1; exit }
     ' "$csv_file")
     
     if [ -n "$candidate" ]; then
         # Update status to running while we have the lock
         awk -F',' -v OFS=',' -v id="$candidate" '
             NR==1 || $1 != id { print }
-            $1 == id { $5 = "running"; print }
+            $1 == id { 
+                # Preserve existing fields but set status to running
+                if ($5 == "" || $5 == "pending") $5 = "running"
+                print 
+            }
         ' "$csv_file" > "${csv_file}.tmp" && mv -f "${csv_file}.tmp" "$csv_file"
     fi
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-evolve",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "bin": {
     "claude-evolve": "./bin/claude-evolve",
     "claude-evolve-main": "./bin/claude-evolve-main",