claude-evolve 1.6.9 → 1.6.11

package/bin/claude-evolve-worker

@@ -26,10 +26,22 @@ TERMINATION_SIGNAL=""
 cleanup_on_exit() {
   if [[ -n "$CURRENT_CANDIDATE_ID" ]]; then
     echo "[WORKER-$$] Worker terminated while processing $CURRENT_CANDIDATE_ID" >&2
-    # If we're interrupted while processing, leave it as "running"
-    # This prevents other workers from picking it up in the same session
-    # A human can manually reset to pending if needed
-    echo "[WORKER-$$] Leaving $CURRENT_CANDIDATE_ID in current state" >&2
+    # Atomically reset status to pending only if it is not already complete
+    echo "[WORKER-$$] Determining status before resetting" >&2
+    "$PYTHON_CMD" -c "
+import sys
+from lib.evolution_csv import EvolutionCSV
+csv = EvolutionCSV('$FULL_CSV_PATH')
+# Acquire lock and read current status safely
+info = csv.get_candidate_info('$CURRENT_CANDIDATE_ID')
+if info and info.get('status', '').lower() != 'complete':
+    csv.update_candidate_status('$CURRENT_CANDIDATE_ID', 'pending')
+    print('reset')
+    sys.exit(0)
+else:
+    # No reset needed
+    sys.exit(0)
+" 2>/dev/null || echo "[WORKER-$$] Warning: failed to reset status" >&2
   fi
 }
 
@@ -139,6 +151,8 @@ call_ai_for_evolution() {
         # Exhausted retries
         echo "[WORKER-$$] All models hit usage limits after $max_retries retries" >&2
         echo "[WORKER-$$] Unable to complete evolution due to API limits" >&2
+        # Clean up any partial target file before exiting
+        rm -f "$target_file"
         exit 3
       fi
     fi
@@ -156,19 +170,18 @@ call_ai_for_evolution() {
       fi
     fi
 
-    # Success if file was modified OR exit code is 0 (for cases where file validation isn't applicable)
-    if [[ "$file_was_modified" == "true" ]] || [[ $ai_exit_code -eq 0 ]]; then
-      if [[ "$file_was_modified" == "true" ]]; then
-        echo "[WORKER-$$] AI successfully modified $target_file (exit code: $ai_exit_code)" >&2
-      else
-        echo "[WORKER-$$] AI succeeded with exit code 0" >&2
-      fi
+    # Success only if the target file was actually modified.
+    # Even if AI exited with code 0, if there were no changes, treat as failure to avoid stale copies.
+    if [[ "$file_was_modified" == "true" ]]; then
+      echo "[WORKER-$$] AI successfully modified $target_file (exit code: $ai_exit_code)" >&2
       # Output the result for the worker to use
       echo "$ai_output"
       return 0
     fi
 
-    # Non-limit failure - don't retry
+    # Non-limit failure - no modification detected; clean up the copied file
+    echo "[WORKER-$$] AI changed nothing or failed; cleaning up temporary file" >&2
+    rm -f "$target_file"
     echo "[WORKER-$$] AI failed: exit code $ai_exit_code, no file changes detected" >&2
     return 1
   done
@@ -580,4 +593,4 @@ with EvolutionCSV('$FULL_CSV_PATH') as csv:
   CURRENT_CANDIDATE_ID=""
 done
 
-echo "[WORKER-$$] No more pending candidates, worker exiting"
+echo "[WORKER-$$] No more pending candidates, worker exiting"

package/lib/ai-cli.sh

@@ -99,13 +99,13 @@ $prompt"
     codex-qwen3)
       # Qwen3-Coder via Codex CLI with Ollama backend (only mildly agentic)
       local ai_output
-      ai_output=$(timeout 600 codex exec --dangerously-bypass-approvals-and-sandbox --skip-git-repo-check --oss --model qwen3-coder:30b "$prompt" 2>&1)
+      ai_output=$(timeout 1200 codex exec --dangerously-bypass-approvals-and-sandbox --skip-git-repo-check --oss --model qwen3-coder:30b "$prompt" 2>&1)
       local ai_exit_code=$?
       ;;
     codex-oss)
-      # Codex-OSS via Codex CLI with Ollama backend
+      # Codex-OSS via Codex CLI with Ollama backend (longer timeout)
       local ai_output
-      ai_output=$(timeout 600 codex exec --dangerously-bypass-approvals-and-sandbox --skip-git-repo-check --oss "$prompt" 2>&1)
+      ai_output=$(timeout 1200 codex exec --dangerously-bypass-approvals-and-sandbox --skip-git-repo-check --oss "$prompt" 2>&1)
       local ai_exit_code=$?
       ;;
     aider-qwen3|qwen3)

package/lib/config.sh

@@ -61,8 +61,20 @@ DEFAULT_LLM_IDEATE="gemini sonnet-think gpt5high o3high glm grok-4 codex-qwen3 c
 
 # Load configuration from config file
 load_config() {
-  # Accept config file path as parameter
-  local config_file="${1:-evolution/config.yaml}"
+  # Accept config file path as parameter. If not supplied, look for a user override in
+  # $HOME/.config/claude-evolve/config.yaml first, then fall back to the repo default.
+  local user_config="$1"
+
+  if [[ -n "$user_config" ]]; then
+    config_file="$user_config"
+  else
+    local home_config="$HOME/.config/claude-evolve/config.yaml"
+    if [[ -f "$home_config" ]]; then
+      config_file="$home_config"
+    else
+      config_file="evolution/config.yaml"
+    fi
+  fi
   
   # Set defaults first
   EVOLUTION_DIR="$DEFAULT_EVOLUTION_DIR"

package/package.json

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