claude-evolve 1.9.6 → 1.9.7

package/lib/evolve_run.py

@@ -63,12 +63,9 @@ class WorkerPool:
             cmd.extend(['--timeout', str(self.timeout)])
 
         try:
-            proc = subprocess.Popen(
-                cmd,
-                stdout=subprocess.PIPE,
-                stderr=subprocess.STDOUT,
-                text=True
-            )
+            # Don't capture output - let it stream directly to terminal
+            # This provides real-time visibility into which models are being used
+            proc = subprocess.Popen(cmd)
             self.workers[proc.pid] = proc
             print(f"[RUN] Spawned worker {proc.pid}", file=sys.stderr)
             return proc.pid
@@ -86,14 +83,6 @@ class WorkerPool:
             if ret is not None:
                 finished_pids.append(pid)
                 exit_codes.append(ret)
-
-                # Log output
-                if proc.stdout:
-                    output = proc.stdout.read()
-                    if output:
-                        for line in output.strip().split('\n'):
-                            print(f"[WORKER-{pid}] {line}", file=sys.stderr)
-
                 print(f"[RUN] Worker {pid} exited with code {ret}", file=sys.stderr)
 
         for pid in finished_pids:

package/lib/evolve_worker.py

@@ -31,7 +31,7 @@ SCRIPT_DIR = Path(__file__).parent
 sys.path.insert(0, str(SCRIPT_DIR.parent))
 
 from lib.evolution_csv import EvolutionCSV
-from lib.ai_cli import call_ai, get_git_protection_warning, AIError, RateLimitError, APIExhaustedError, TimeoutError
+from lib.ai_cli import call_ai_with_backoff, get_git_protection_warning, AIError
 
 
 @dataclass
@@ -46,8 +46,11 @@ class Config:
     python_cmd: str = "python3"
     memory_limit_mb: int = 0
     timeout_seconds: int = 600
-    max_ai_retries: int = 3
     max_candidates: int = 5
+    # Retry configuration with exponential backoff
+    max_rounds: int = 10
+    initial_wait: int = 60
+    max_wait: int = 600
 
 
 @dataclass
@@ -139,52 +142,42 @@ This is especially important for models with smaller context windows (like GLM).
 
 CRITICAL: If you do not know how to implement what was asked for, or if the requested change is unclear or not feasible, you MUST refuse to make any changes. DO NOT modify the code if you are uncertain about the implementation. Simply respond that you cannot implement the requested change and explain why. It is better to refuse than to make incorrect or random changes."""
 
-    def _call_ai_with_retries(self, prompt: str, target_file: Path, source_file: Path) -> Tuple[bool, str]:
+    def _call_ai_with_backoff(self, prompt: str, target_file: Path) -> Tuple[bool, str]:
         """
-        Call AI with retries.
+        Call AI with round-based retry and exponential backoff.
+
+        AIDEV-NOTE: Uses call_ai_with_backoff which tries all models in the pool,
+        then waits with exponential backoff if all fail, and repeats.
 
         Returns:
             Tuple of (success, model_name)
         """
-        for attempt in range(1, self.config.max_ai_retries + 1):
-            print(f"[WORKER-{os.getpid()}] AI attempt {attempt}/{self.config.max_ai_retries}", file=sys.stderr)
+        # Get file hash before AI call
+        hash_before = self._file_hash(target_file) if target_file.exists() else None
 
-            # Re-copy source if this is a retry
-            if attempt > 1:
-                print(f"[WORKER-{os.getpid()}] Re-copying source file for retry", file=sys.stderr)
-                shutil.copy(source_file, target_file)
+        try:
+            output, model = call_ai_with_backoff(
+                prompt,
+                command="run",
+                working_dir=self.config.evolution_dir,
+                max_rounds=self.config.max_rounds,
+                initial_wait=self.config.initial_wait,
+                max_wait=self.config.max_wait
+            )
 
-            # Get file hash before AI call
-            hash_before = self._file_hash(target_file) if target_file.exists() else None
+            # Check if file was modified
+            hash_after = self._file_hash(target_file) if target_file.exists() else None
 
-            try:
-                output, model = call_ai(prompt, command="run", working_dir=self.config.evolution_dir)
-
-                # Check if file was modified
-                hash_after = self._file_hash(target_file) if target_file.exists() else None
-
-                if hash_before != hash_after and hash_after is not None:
-                    print(f"[WORKER-{os.getpid()}] AI successfully modified file (model: {model})", file=sys.stderr)
-                    return True, model
-                else:
-                    print(f"[WORKER-{os.getpid()}] AI did not modify file", file=sys.stderr)
-
-            except RateLimitError as e:
-                print(f"[WORKER-{os.getpid()}] Rate limit: {e}", file=sys.stderr)
-                raise  # Propagate to caller
-            except APIExhaustedError as e:
-                print(f"[WORKER-{os.getpid()}] API exhausted: {e}", file=sys.stderr)
-                raise  # Propagate to caller
-            except TimeoutError as e:
-                print(f"[WORKER-{os.getpid()}] Timeout: {e}", file=sys.stderr)
-            except AIError as e:
-                print(f"[WORKER-{os.getpid()}] AI error: {e}", file=sys.stderr)
-
-            if attempt < self.config.max_ai_retries:
-                print(f"[WORKER-{os.getpid()}] Will retry with different model...", file=sys.stderr)
-                time.sleep(2)
-
-        return False, ""
+            if hash_before != hash_after and hash_after is not None:
+                print(f"[WORKER-{os.getpid()}] AI successfully modified file (model: {model})", file=sys.stderr)
+                return True, model
+            else:
+                print(f"[WORKER-{os.getpid()}] AI completed but did not modify file", file=sys.stderr)
+                return False, model
+
+        except AIError as e:
+            print(f"[WORKER-{os.getpid()}] All AI retries exhausted: {e}", file=sys.stderr)
+            return False, ""
 
     def _file_hash(self, path: Path) -> Optional[str]:
         """Get file hash."""
@@ -329,33 +322,19 @@ CRITICAL: If you do not know how to implement what was asked for, or if the requ
             print(f"[WORKER-{os.getpid()}] Copying {source_file} to {target_file}", file=sys.stderr)
             shutil.copy(source_file, target_file)
 
-            # Call AI to modify
+            # Call AI to modify (uses round-based retry with backoff)
             prompt = self._build_prompt(candidate, target_file.name)
+            success, model = self._call_ai_with_backoff(prompt, target_file)
 
-            try:
-                success, model = self._call_ai_with_retries(prompt, target_file, source_file)
-
-                if not success:
-                    print(f"[WORKER-{os.getpid()}] AI failed after all retries", file=sys.stderr)
-                    target_file.unlink(missing_ok=True)
-                    return 77  # AI generation failed
-
-                # Record model used
-                if model:
-                    with EvolutionCSV(self.config.csv_path) as csv:
-                        csv.update_candidate_field(candidate.id, 'run-LLM', model)
-
-            except RateLimitError:
+            if not success:
+                print(f"[WORKER-{os.getpid()}] AI failed after all retries", file=sys.stderr)
                 target_file.unlink(missing_ok=True)
-                with EvolutionCSV(self.config.csv_path) as csv:
-                    csv.update_candidate_status(candidate.id, 'pending')
-                return 2  # Rate limit
+                return 77  # AI generation failed
 
-            except APIExhaustedError:
-                target_file.unlink(missing_ok=True)
+            # Record model used
+            if model:
                 with EvolutionCSV(self.config.csv_path) as csv:
-                    csv.update_candidate_status(candidate.id, 'pending')
-                return 3  # API exhausted
+                    csv.update_candidate_field(candidate.id, 'run-LLM', model)
 
             # Check syntax
             if not self._check_syntax(target_file):
@@ -475,6 +454,8 @@ def load_config_from_yaml(config_path: Optional[str] = None) -> Config:
             p = base_dir / p
         return str(p.resolve())
 
+    ideation = data.get('ideation', {})
+
     return Config(
         csv_path=resolve(data.get('csv_file', 'evolution.csv')),
         evolution_dir=str(base_dir.resolve()),
@@ -485,8 +466,10 @@ def load_config_from_yaml(config_path: Optional[str] = None) -> Config:
         python_cmd=data.get('python_cmd', 'python3'),
         memory_limit_mb=data.get('memory_limit_mb', 0),
         timeout_seconds=data.get('timeout_seconds', 600),
-        max_ai_retries=data.get('max_retries', 3),
-        max_candidates=data.get('worker_max_candidates', 5)
+        max_candidates=data.get('worker_max_candidates', 5),
+        max_rounds=ideation.get('max_rounds', 10),
+        initial_wait=ideation.get('initial_wait', 60),
+        max_wait=ideation.get('max_wait', 600)
     )
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-evolve",
-  "version": "1.9.6",
+  "version": "1.9.7",
   "bin": {
     "claude-evolve": "bin/claude-evolve",
     "claude-evolve-main": "bin/claude-evolve-main",