claude-evolve 1.8.42 → 1.8.44

package/bin/claude-evolve-ideate

@@ -236,10 +236,11 @@ if [[ $use_strategies == true ]]; then
 fi
 
 # Get next generation number that doesn't have existing Python files
+# AIDEV-NOTE: Returns zero-padded generation number (e.g., "02" not "2")
 get_next_generation() {
   # Start with generation 1 if no CSV exists
   local start_gen=1
-  
+
   if [[ -f "$FULL_CSV_PATH" ]]; then
     # Use Python for proper CSV parsing to find max generation
     local max_gen
@@ -264,21 +265,25 @@ print(max_gen)
     # Start checking from the next generation after max
     start_gen=$((max_gen + 1))
   fi
-  
+
   # Keep incrementing until we find a generation with no Python files
   local candidate_gen=$start_gen
   while true; do
-    # No padding - generation numbers are used as-is in filenames
-    local gen_formatted="$candidate_gen"
+    # Zero-pad to 2 digits for consistency (gen01, gen02, etc.)
+    local gen_formatted
+    gen_formatted=$(printf "%02d" "$candidate_gen")
 
-    # Check if any Python files exist for this generation
+    # Check if any Python files exist for this generation (check both padded and unpadded)
     local py_files_exist=false
     if ls "$FULL_OUTPUT_DIR"/evolution_gen${gen_formatted}-*.py >/dev/null 2>&1; then
       py_files_exist=true
+    elif ls "$FULL_OUTPUT_DIR"/evolution_gen${candidate_gen}-*.py >/dev/null 2>&1; then
+      # Also check unpadded format for legacy compatibility
+      py_files_exist=true
     fi
 
     if [[ "$py_files_exist" == "false" ]]; then
-      # This generation is safe to use
+      # This generation is safe to use - return padded format
       echo "$gen_formatted"
       return
     else
@@ -1710,30 +1715,44 @@ count_generation_pending() {
 }
 
 # Find the right generation to use
+# AIDEV-NOTE: Generation numbers must be zero-padded to 2 digits (gen01, gen02, etc.)
+# to maintain consistency with existing CSV data format
 highest_gen=$(get_highest_generation)
 if [[ $highest_gen -eq 0 ]]; then
-  # No generations yet, start with 1
-  CURRENT_GENERATION=1
-  echo "[INFO] No existing generations, starting with generation 1"
+  # No generations yet, start with 01
+  CURRENT_GENERATION="01"
+  echo "[INFO] No existing generations, starting with generation 01"
 else
   # Check if highest generation needs more ideas
+  # Use unpadded for grep patterns (matches both gen1- and gen01-)
   existing_ideas=$(count_generation_ideas "$highest_gen")
   pending_ideas=$(count_generation_pending "$highest_gen")
+  # Also check padded format
+  padded_gen=$(printf "%02d" "$highest_gen")
+  existing_ideas_padded=$(count_generation_ideas "$padded_gen")
+  pending_ideas_padded=$(count_generation_pending "$padded_gen")
+  # Use whichever found more (handles both gen1 and gen01 formats)
+  if [[ $existing_ideas_padded -gt $existing_ideas ]]; then
+    existing_ideas=$existing_ideas_padded
+    pending_ideas=$pending_ideas_padded
+  fi
 
   echo "[INFO] Highest generation: $highest_gen with $existing_ideas total ideas ($pending_ideas pending)"
 
   if [[ $existing_ideas -ge $TOTAL_IDEAS ]]; then
     # Highest generation is full, create a new one
     CURRENT_GENERATION=$(get_next_generation)
+    # Ensure it's zero-padded
+    CURRENT_GENERATION=$(printf "%02d" "$CURRENT_GENERATION")
     echo "[INFO] Generation $highest_gen is full ($existing_ideas >= $TOTAL_IDEAS), creating generation $CURRENT_GENERATION"
   elif [[ $pending_ideas -ge $TOTAL_IDEAS ]]; then
     # Already have enough pending, skip ideation
-    echo "[INFO] Generation $highest_gen already has $pending_ideas pending ideas (target: $TOTAL_IDEAS)"
+    echo "[INFO] Generation $padded_gen already has $pending_ideas pending ideas (target: $TOTAL_IDEAS)"
     echo "[INFO] Skipping ideation - workers will process existing ideas"
     exit 0
   else
-    # Continue filling the current highest generation
-    CURRENT_GENERATION=$highest_gen
+    # Continue filling the current highest generation - use padded format
+    CURRENT_GENERATION=$(printf "%02d" "$highest_gen")
     echo "[INFO] Continuing generation $CURRENT_GENERATION (need $((TOTAL_IDEAS - existing_ideas)) more ideas)"
   fi
 fi

package/bin/claude-evolve-worker

@@ -111,6 +111,8 @@ else
 fi
 
 # AI random selection function for code evolution
+# AIDEV-NOTE: This function reads the model name from a temp file written by call_ai_random
+# because exports don't propagate from subshells. The model is stored in SUCCESSFUL_RUN_MODEL.
 call_ai_for_evolution() {
   local prompt="$1"
   local candidate_id="$2"
@@ -131,6 +133,17 @@ call_ai_for_evolution() {
   ai_output=$(call_ai_random "$prompt" "run")
   local ai_exit_code=$?
 
+  # Read the model name from temp file (written by call_ai_random in subshell)
+  local model_file="/tmp/.claude-evolve-model-$$"
+  if [[ -f "$model_file" ]]; then
+    SUCCESSFUL_RUN_MODEL=$(cat "$model_file")
+    rm -f "$model_file"
+    echo "[WORKER-$$] AI model used: $SUCCESSFUL_RUN_MODEL" >&2
+  else
+    echo "[WORKER-$$] Warning: Could not determine which AI model was used" >&2
+    SUCCESSFUL_RUN_MODEL=""
+  fi
+
   # Check if the target file was actually modified
   local file_was_modified=false
   if [[ -f "$target_file" ]]; then
@@ -310,20 +323,48 @@ CRITICAL: If you do not know how to implement what was asked for, or if the requ
         return 1
       }
 
-      # Call AI with random model selection
-      if ! call_ai_for_evolution "$evolution_prompt" "$candidate_id"; then
-        echo "[WORKER-$$] ERROR: AI model failed to generate code - leaving as pending for retry" >&2
+      # AIDEV-NOTE: Retry logic for AI code generation
+      # Try up to 3 times with different random models before giving up
+      # This handles transient failures like rate limits or capacity issues
+      local max_retries=3
+      local retry_count=0
+      local ai_success=false
+
+      while [[ $retry_count -lt $max_retries ]]; do
+        ((retry_count++))
+        echo "[WORKER-$$] AI attempt $retry_count/$max_retries for $candidate_id" >&2
+
+        # Re-copy source file if this is a retry (previous attempt may have corrupted it)
+        if [[ $retry_count -gt 1 ]]; then
+          echo "[WORKER-$$] Re-copying source file for retry attempt" >&2
+          cp "$source_file" "$target_file"
+        fi
+
+        if call_ai_for_evolution "$evolution_prompt" "$candidate_id"; then
+          ai_success=true
+          break
+        else
+          echo "[WORKER-$$] AI attempt $retry_count failed" >&2
+          if [[ $retry_count -lt $max_retries ]]; then
+            echo "[WORKER-$$] Will retry with a different model..." >&2
+            sleep 2  # Brief pause before retry
+          fi
+        fi
+      done
+
+      if [[ "$ai_success" != "true" ]]; then
+        echo "[WORKER-$$] ERROR: All $max_retries AI attempts failed for $candidate_id" >&2
         safe_popd
         rm -f "$target_file"  # Clean up on failure
-        # Return with special code to indicate AI failure (should remain pending)
+        # Return with special code to indicate AI failure after all retries exhausted
         return 77
       fi
 
       # Restore working directory
       safe_popd
-      
-      echo "[WORKER-$$] Evolution applied successfully"
-      
+
+      echo "[WORKER-$$] Evolution applied successfully (attempt $retry_count/$max_retries)"
+
       # Record which AI model generated the code (regardless of evaluation outcome)
       if [[ -n "${SUCCESSFUL_RUN_MODEL:-}" ]]; then
         echo "[WORKER-$$] Recording that $SUCCESSFUL_RUN_MODEL generated the code" >&2

package/lib/ai-cli.sh

@@ -302,6 +302,9 @@ get_models_for_command() {
 # Usage: call_ai_random <prompt> <command>
 # command: "run" or "ideate"
 # Picks one random model from the list and uses it
+# AIDEV-NOTE: This function writes the selected model to a temp file because
+# export doesn't work from subshells (command substitution creates a subshell).
+# The parent process should read /tmp/.claude-evolve-model-$$ to get the model name.
 call_ai_random() {
   local prompt="$1"
   local command="$2"
@@ -330,6 +333,11 @@ call_ai_random() {
 
   echo "[AI] Selected $model for $command (random from $num_models models)" >&2
 
+  # Write model to temp file so parent can read it
+  # (exports don't propagate from subshells created by $(...) command substitution)
+  local model_file="/tmp/.claude-evolve-model-$$"
+  echo "$model" > "$model_file"
+
   # Call the AI model
   local ai_output
   ai_output=$(call_ai_model_configured "$model" "$prompt")
@@ -338,9 +346,6 @@ call_ai_random() {
   # Clean output if needed
   ai_output=$(clean_ai_output "$ai_output" "$model")
 
-  # Export the model used for tracking (used by worker)
-  export SUCCESSFUL_RUN_MODEL="$model"
-
   # Log result
   if [[ $ai_exit_code -eq 0 ]]; then
     echo "[AI] $model returned exit code 0" >&2

package/lib/config.sh

@@ -58,9 +58,9 @@ DEFAULT_MEMORY_LIMIT_MB=12288
 DEFAULT_WORKER_MAX_CANDIDATES=3
 
 # Default LLM CLI configuration
-DEFAULT_LLM_RUN="glm-zai kimi-coder glm-zai kimi-coder glm-zai kimi-coder codex-oss-local haiku"
+DEFAULT_LLM_RUN="glm-zai glm-zai glm-zai glm-zai glm-zai kimi-coder codex-oss-local haiku"
 # Ideate: Commercial models for idea generation + local fallback
-DEFAULT_LLM_IDEATE="opus-think kimi-k2-openrouter gemini-3-pro-preview gpt5high grok-4-openrouter deepseek-openrouter glm-zai kimi-coder"
+DEFAULT_LLM_IDEATE="opus-think kimi-k2-openrouter gemini-3-pro-preview gpt5high grok-4-openrouter deepseek-openrouter glm-zai"
 
 # Load configuration from a YAML file and update variables
 _load_yaml_config() {

package/package.json

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