claude-evolve 1.5.27 → 1.5.29

package/bin/claude-evolve-worker

@@ -72,68 +72,106 @@ fi
 call_ai_for_evolution() {
   local prompt="$1"
   local candidate_id="$2"
-  
+
   # Get target file path from worker context
   local target_file="$FULL_OUTPUT_DIR/evolution_${candidate_id}.py"
-  
-  # Capture file state before AI call
-  local file_hash_before=""
-  local file_mtime_before=""
-  if [[ -f "$target_file" ]]; then
-    file_hash_before=$(shasum -a 256 "$target_file" 2>/dev/null | cut -d' ' -f1)
-    file_mtime_before=$(stat -f %m "$target_file" 2>/dev/null || stat -c %Y "$target_file" 2>/dev/null)
-  fi
-  
-  # Extract generation and ID numbers for round-robin calculation
-  local gen_num=0
-  local id_num=0
-  if [[ $candidate_id =~ ^gen([0-9]+)-([0-9]+)$ ]]; then
-    gen_num=$((10#${BASH_REMATCH[1]}))
-    id_num=$((10#${BASH_REMATCH[2]}))
-  fi
-  
-  # Calculate hash for round-robin (combine generation and ID)
-  local hash_value=$((gen_num * 1000 + id_num))
-  
-  # Use the centralized AI library for evolution (run command)
-  local ai_output
-  ai_output=$(call_ai_with_round_robin "$prompt" "run" "$hash_value")
-  local ai_exit_code=$?
-  
-  # Handle special exit codes
-  if [[ $ai_exit_code -eq 3 ]]; then
-    echo "[WORKER-$$] All models hit usage limits" >&2
-    echo "[WORKER-$$] Unable to complete evolution due to API limits" >&2
-    exit 3
-  fi
-  
-  # Check if the target file was actually modified
-  local file_was_modified=false
-  if [[ -f "$target_file" ]]; then
-    local file_hash_after
-    local file_mtime_after
-    file_hash_after=$(shasum -a 256 "$target_file" 2>/dev/null | cut -d' ' -f1)
-    file_mtime_after=$(stat -f %m "$target_file" 2>/dev/null || stat -c %Y "$target_file" 2>/dev/null)
-    
-    if [[ "$file_hash_before" != "$file_hash_after" ]] || [[ "$file_mtime_before" != "$file_mtime_after" ]]; then
-      file_was_modified=true
+
+  # Retry configuration for API limits
+  local retry_count=0
+  local max_retries=3
+  local wait_seconds=300  # Start with 5 minutes
+  local max_wait_seconds=1800  # Cap at 30 minutes
+
+  while true; do
+    # Capture file state before AI call
+    local file_hash_before=""
+    local file_mtime_before=""
+    if [[ -f "$target_file" ]]; then
+      file_hash_before=$(shasum -a 256 "$target_file" 2>/dev/null | cut -d' ' -f1)
+      file_mtime_before=$(stat -f %m "$target_file" 2>/dev/null || stat -c %Y "$target_file" 2>/dev/null)
     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
+
+    # Extract generation and ID numbers for round-robin calculation
+    local gen_num=0
+    local id_num=0
+    if [[ $candidate_id =~ ^gen([0-9]+)-([0-9]+)$ ]]; then
+      gen_num=$((10#${BASH_REMATCH[1]}))
+      id_num=$((10#${BASH_REMATCH[2]}))
     fi
-    # Output the result for the worker to use
-    echo "$ai_output"
-    return 0
-  fi
-  
-  echo "[WORKER-$$] AI failed: exit code $ai_exit_code, no file changes detected" >&2
-  return 1
+
+    # Calculate hash for round-robin (combine generation and ID)
+    local hash_value=$((gen_num * 1000 + id_num))
+
+    # Use the centralized AI library for evolution (run command)
+    local ai_output
+    ai_output=$(call_ai_with_round_robin "$prompt" "run" "$hash_value")
+    local ai_exit_code=$?
+
+    # Handle special exit codes
+    if [[ $ai_exit_code -eq 3 ]]; then
+      # All models hit usage limits
+      if [[ $retry_count -lt $max_retries ]]; then
+        ((retry_count++))
+        echo "[WORKER-$$] All models hit usage limits (retry $retry_count/$max_retries)" >&2
+        echo "[WORKER-$$] Waiting $wait_seconds seconds ($(($wait_seconds / 60)) minutes) before retrying..." >&2
+
+        # Sleep with countdown
+        local remaining=$wait_seconds
+        while [[ $remaining -gt 0 ]]; do
+          if [[ $((remaining % 60)) -eq 0 ]]; then
+            echo "[WORKER-$$] Retrying in $((remaining / 60)) minutes..." >&2
+          fi
+          sleep 60
+          remaining=$((remaining - 60))
+        done
+
+        echo "[WORKER-$$] Retrying AI call (attempt #$((retry_count + 1)))..." >&2
+
+        # Exponential backoff: double the wait time, up to max
+        wait_seconds=$((wait_seconds * 2))
+        if [[ $wait_seconds -gt $max_wait_seconds ]]; then
+          wait_seconds=$max_wait_seconds
+        fi
+
+        # Continue to retry
+        continue
+      else
+        # 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
+        exit 3
+      fi
+    fi
+
+    # Check if the target file was actually modified
+    local file_was_modified=false
+    if [[ -f "$target_file" ]]; then
+      local file_hash_after
+      local file_mtime_after
+      file_hash_after=$(shasum -a 256 "$target_file" 2>/dev/null | cut -d' ' -f1)
+      file_mtime_after=$(stat -f %m "$target_file" 2>/dev/null || stat -c %Y "$target_file" 2>/dev/null)
+
+      if [[ "$file_hash_before" != "$file_hash_after" ]] || [[ "$file_mtime_before" != "$file_mtime_after" ]]; then
+        file_was_modified=true
+      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
+      # Output the result for the worker to use
+      echo "$ai_output"
+      return 0
+    fi
+
+    # Non-limit failure - don't retry
+    echo "[WORKER-$$] AI failed: exit code $ai_exit_code, no file changes detected" >&2
+    return 1
+  done
 }
 
 # Validate paths

package/lib/ai-cli.sh

@@ -19,7 +19,7 @@ call_ai_model_configured() {
   case "$model_name" in
     opus|sonnet)
       local ai_output
-      ai_output=$(timeout 300 claude --dangerously-skip-permissions --model "$model_name" -p "$prompt" 2>&1)
+      ai_output=$(timeout 300 claude --dangerously-skip-permissions --mcp-config '' --model "$model_name" -p "$prompt" 2>&1)
       local ai_exit_code=$?
       ;;
     sonnet-think)
@@ -28,7 +28,7 @@ call_ai_model_configured() {
       local think_prompt="ultrathink
 
 $prompt"
-      ai_output=$(timeout 600 claude --dangerously-skip-permissions --model sonnet -p "$think_prompt" 2>&1)
+      ai_output=$(timeout 600 claude --dangerously-skip-permissions --mcp-config '' --model sonnet -p "$think_prompt" 2>&1)
       local ai_exit_code=$?
       ;;
     opus-think)
@@ -37,7 +37,7 @@ $prompt"
       local think_prompt="ultrathink
 
 $prompt"
-      ai_output=$(timeout 600 claude --dangerously-skip-permissions --model opus -p "$think_prompt" 2>&1)
+      ai_output=$(timeout 600 claude --dangerously-skip-permissions --mcp-config '' --model opus -p "$think_prompt" 2>&1)
       local ai_exit_code=$?
       ;;
     gpt5high)
@@ -76,6 +76,11 @@ $prompt"
       ai_output=$(timeout 300 cursor-agent opus -p "$prompt" 2>&1)
       local ai_exit_code=$?
       ;;
+    glm)
+      local ai_output
+      ai_output=$(timeout 300 opencode -m openrouter/z-ai/glm-4.6 run "$prompt" 2>&1)
+      local ai_exit_code=$?
+      ;;
     *)
       echo "[ERROR] Unknown model: $model_name" >&2
       return 1

package/lib/config.sh

@@ -54,7 +54,7 @@ DEFAULT_MAX_RETRIES=3
 DEFAULT_MEMORY_LIMIT_MB=12288
 
 # Default LLM CLI configuration - use simple variables instead of arrays
-DEFAULT_LLM_RUN="sonnet gpt5 cursor-sonnet"
+DEFAULT_LLM_RUN="sonnet gpt5 cursor-sonnet glm"
 DEFAULT_LLM_IDEATE="gemini sonnet-think sonnet-think gpt5high sonnet-think o3high"
 
 # Load configuration from config file
@@ -102,12 +102,13 @@ load_config() {
   LLM_CLI_o3high='codex exec --profile o3high --dangerously-bypass-approvals-and-sandbox "{{PROMPT}}"'
   LLM_CLI_codex='codex exec --dangerously-bypass-approvals-and-sandbox "{{PROMPT}}"'
   LLM_CLI_gemini='gemini -y -p "{{PROMPT}}"'
-  LLM_CLI_opus='claude --dangerously-skip-permissions --model opus -p "{{PROMPT}}"'
-  LLM_CLI_opus_think='claude --dangerously-skip-permissions --model opus -p "ultrathink\n\n{{PROMPT}}"'
-  LLM_CLI_sonnet='claude --dangerously-skip-permissions --model sonnet -p "{{PROMPT}}"'
-  LLM_CLI_sonnet_think='claude --dangerously-skip-permissions --model sonnet -p "ultrathink\n\n{{PROMPT}}"'
+  LLM_CLI_opus='claude --dangerously-skip-permissions --mcp-config "" --model opus -p "{{PROMPT}}"'
+  LLM_CLI_opus_think='claude --dangerously-skip-permissions --mcp-config "" --model opus -p "ultrathink\n\n{{PROMPT}}"'
+  LLM_CLI_sonnet='claude --dangerously-skip-permissions --mcp-config "" --model sonnet -p "{{PROMPT}}"'
+  LLM_CLI_sonnet_think='claude --dangerously-skip-permissions --mcp-config "" --model sonnet -p "ultrathink\n\n{{PROMPT}}"'
   LLM_CLI_cursor_sonnet='cursor-agent sonnet -p "{{PROMPT}}"'
   LLM_CLI_cursor_opus='cursor-agent opus -p "{{PROMPT}}"'
+  LLM_CLI_glm='opencode -m openrouter/z-ai/glm-4.6 run "{{PROMPT}}"'
   LLM_RUN="$DEFAULT_LLM_RUN"
   LLM_IDEATE="$DEFAULT_LLM_IDEATE"
   
@@ -327,7 +328,7 @@ show_config() {
   echo "  Memory limit: ${MEMORY_LIMIT_MB}MB"
   echo "  LLM configuration:"
   # Show LLM configurations using dynamic variable names
-  for model in gpt5high o3high codex gemini opus opus_think sonnet sonnet_think cursor_sonnet cursor_opus; do
+  for model in gpt5high o3high codex gemini opus opus_think sonnet sonnet_think cursor_sonnet cursor_opus glm; do
     var_name="LLM_CLI_${model}"
     var_value=$(eval echo "\$$var_name")
     if [[ -n "$var_value" ]]; then

package/package.json

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

package/templates/config.yaml

@@ -72,7 +72,7 @@ llm_cli:
 
   # commented out because these change over time; if you want to fix them in a particular
   # configuration, uncomment them and set them
-  #run: sonnet gpt5 cursor-sonnet
+  #run: sonnet gpt5 cursor-sonnet glm
   #ideate: gemini sonnet-think sonnet-think gpt5high sonnet-think o3high
 
   # Available models:
@@ -86,3 +86,4 @@ llm_cli:
   # - o3high: O3 via Codex CLI (high reasoning)
   # - cursor-sonnet: Claude 3.5 Sonnet via Cursor Agent CLI
   # - cursor-opus: Claude 3 Opus via Cursor Agent CLI
+  # - glm: GLM-4.6 via OpenCode CLI