claude-evolve 1.6.4 → 1.6.7

package/lib/ai-cli.sh

@@ -96,28 +96,63 @@ $prompt"
       ai_output=$(timeout 300 opencode -m openrouter/x-ai/grok-4 run "$prompt" 2>&1)
       local ai_exit_code=$?
       ;;
-    aider-qwen3)
-      # Aider with Qwen3-Coder via Ollama
-      # Aider edits files in place, so we need to create a temp file
-      local temp_file=$(mktemp /tmp/aider-edit-XXXXXX.py)
-
-      # Extract current algorithm from prompt if present, or create empty file
-      # The prompt usually contains the algorithm to improve
-      echo "# Algorithm to improve" > "$temp_file"
-
-      # Run aider with the prompt
+    codex-qwen3)
+      # Qwen3-Coder via Codex CLI with Ollama backend (agentic, explores files)
       local ai_output
-      ai_output=$(timeout 600 aider --yes --no-git --no-show-model-warnings --model ollama/qwen3-coder:30b --message "$prompt" "$temp_file" 2>&1)
+      ai_output=$(timeout 600 codex exec --dangerously-bypass-approvals-and-sandbox --skip-git-repo-check --oss --model qwen3-coder:30b "$prompt" 2>&1)
       local ai_exit_code=$?
+      ;;
+    aider-qwen3|qwen3)
+      # Qwen3-Coder via Aider + Ollama
+      # Extract the target filename from the prompt (e.g., "Modify the algorithm in evolution_gen01-001.py...")
+      local target_file
+      target_file=$(echo "$prompt" | sed -n 's/.*algorithm in \([^ ]*\.py\).*/\1/p' | head -1)
+
+      if [[ -z "$target_file" ]]; then
+        echo "[ERROR] Could not extract target filename from prompt" >&2
+        return 1
+      fi
+
+      # Check if file exists in current directory
+      if [[ ! -f "$target_file" ]]; then
+        echo "[ERROR] Target file not found: $target_file" >&2
+        return 1
+      fi
+
+      # Build context files list (read-only)
+      local context_args=""
 
-      # If successful, output the modified file content
-      if [[ $ai_exit_code -eq 0 ]]; then
-        cat "$temp_file"
-        ai_exit_code=$?
+      # Add BRIEF.md if it exists
+      if [[ -f "BRIEF.md" ]]; then
+        context_args="$context_args --read BRIEF.md"
       fi
 
-      # Clean up
-      rm -f "$temp_file"
+      # Add base algorithm.py as reference
+      if [[ -f "algorithm.py" ]]; then
+        context_args="$context_args --read algorithm.py"
+      fi
+
+      # IMPORTANT: Detect and add parent file for comparison
+      # Extract parent ID from target filename (e.g., evolution_gen05-013.py came from gen04-005)
+      # The file being edited is already a COPY of the parent, but we want the original
+      # parent file as read-only context so the AI can understand what it's building on
+      local target_basename=$(basename "$target_file" .py)
+      if [[ "$target_basename" =~ ^evolution_gen([0-9]+)-([0-9]+)$ ]]; then
+        local current_gen="${BASH_REMATCH[1]}"
+        # Look for parent in previous generation or same generation
+        # We can't easily determine the exact parent, so include all recent evolution files
+        # Actually, the file being edited IS the parent content already (it was copied)
+        # So we don't need to add the parent separately
+        :
+      fi
+
+      # Run aider with context files and the target file to edit
+      local ai_output
+      ai_output=$(timeout 600 aider --yes --no-git --model ollama/qwen3-coder:30b --no-show-model-warnings $context_args --message "$prompt" "$target_file" 2>&1)
+      local ai_exit_code=$?
+
+      # Aider modifies the file in place, so we don't need to output anything
+      # The file has been edited directly
       ;;
     *)
       echo "[ERROR] Unknown model: $model_name" >&2

package/lib/config.sh

@@ -54,10 +54,10 @@ DEFAULT_MAX_RETRIES=3
 DEFAULT_MEMORY_LIMIT_MB=12288
 
 # Default LLM CLI configuration - use simple variables instead of arrays
-# Run: 100% local with qwen3 via Ollama
-DEFAULT_LLM_RUN="aider-qwen3"
-# Ideate: Commercial models for idea generation
-DEFAULT_LLM_IDEATE="gemini sonnet-think gpt5high o3high glm grok-4"
+# Run: 100% local with qwen3 via Codex+Ollama (more reliable than aider)
+DEFAULT_LLM_RUN="codex-qwen3"
+# Ideate: Commercial models for idea generation + local fallback
+DEFAULT_LLM_IDEATE="gemini sonnet-think gpt5high o3high glm grok-4 codex-qwen3"
 
 # Load configuration from config file
 load_config() {

package/package.json

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

package/templates/config.yaml

@@ -70,10 +70,10 @@ llm_cli:
   # Models are tried in order, with round-robin distribution across candidates
   # You can repeat models for weighted selection (e.g., "sonnet sonnet gemini" for 2:1 ratio)
 
-  # Default configuration: 100% local code generation, commercial ideation
+  # Default configuration: 100% local code generation, commercial ideation + local fallback
   # Commented out because these change over time; uncomment to override
-  #run: aider-qwen3
-  #ideate: gemini sonnet-think gpt5high o3high glm grok-4
+  #run: codex-qwen3
+  #ideate: gemini sonnet-think gpt5high o3high glm grok-4 codex-qwen3
 
   # Available models:
   # - sonnet: Claude 3.5 Sonnet via Claude CLI
@@ -89,4 +89,5 @@ llm_cli:
   # - glm: GLM-4.6 via OpenCode CLI
   # - grok-code-fast: Grok Code Fast 1 via OpenRouter
   # - grok-4: Grok 4 via OpenRouter
-  # - aider-qwen3: Qwen3-Coder via Aider + Ollama (local, free)
+  # - codex-qwen3: Qwen3-Coder via Codex + Ollama (local, free, RECOMMENDED)
+  # - aider-qwen3: Qwen3-Coder via Aider + Ollama (local, free, experimental)