claude-evolve 1.8.5 → 1.8.6

package/bin/claude-evolve-run

@@ -583,44 +583,17 @@ while true; do
     if [[ -f "$FULL_CSV_PATH" && ${#worker_pids[@]} -eq 0 ]]; then
       echo "[DISPATCHER] Checking for stuck candidates (no active workers)..."
       "$PYTHON_CMD" -c "
-import csv
 import sys
-from pathlib import Path
-
-csv_file = '$FULL_CSV_PATH'
-rows = []
-
-with open(csv_file, 'r') as f:
-    rows = list(csv.reader(f))
-
-reset_count = 0
-has_header = rows and rows[0] and rows[0][0].lower() == 'id'
-start_idx = 1 if has_header else 0
+sys.path.insert(0, '$SCRIPT_DIR/..')
+from lib.evolution_csv import EvolutionCSV
 
-for i in range(start_idx, len(rows)):
-    if len(rows[i]) > 4:
-        status = rows[i][4].strip() if rows[i][4] else ''
-        candidate_id = rows[i][0] if rows[i] else ''
-
-        # Reset 'running' when no workers are active
-        if status == 'running':
-            print(f'[INFO] Resetting stuck running candidate: {candidate_id}', file=sys.stderr)
-            rows[i][4] = 'pending'
-            reset_count += 1
-        # Reset unknown statuses like 'ready'
-        elif status not in ['', 'pending', 'complete', 'failed', 'failed-ai-retry',
-                           'failed-retry1', 'failed-retry2', 'failed-retry3', 'skipped',
-                           'failed-parent-missing']:
-            print(f'[WARN] Resetting unknown status \"{status}\" to pending: {candidate_id}', file=sys.stderr)
-            rows[i][4] = 'pending'
-            reset_count += 1
-
-if reset_count > 0:
-    with open(csv_file + '.tmp', 'w', newline='') as f:
-        csv.writer(f).writerows(rows)
-    Path(csv_file + '.tmp').rename(csv_file)
-    print(f'[INFO] Reset {reset_count} stuck/unknown candidates to pending', file=sys.stderr)
-" || true
+try:
+    with EvolutionCSV('$FULL_CSV_PATH') as csv:
+        reset_count = csv.reset_stuck_candidates()
+except Exception as e:
+    print(f'[ERROR] Failed to reset stuck candidates: {e}', file=sys.stderr)
+    sys.exit(1)
+"
     fi
   fi
 
@@ -642,22 +615,17 @@ if reset_count > 0:
     # Before blocking, do final check for stuck work (immediate, not periodic)
     echo "[DISPATCHER] Performing final verification for stuck candidates..."
     stuck_work_count=$("$PYTHON_CMD" -c "
-import csv
-csv_file = '$FULL_CSV_PATH'
-stuck = 0
-with open(csv_file, 'r') as f:
-    reader = csv.reader(f)
-    next(reader, None)  # Skip header
-    for row in reader:
-        if len(row) > 4:
-            status = row[4].strip() if row[4] else ''
-            # Count running, unknown, and retry statuses
-            if status in ['running'] or \
-               (status and status not in ['', 'pending', 'complete', 'failed', 'skipped',
-                                          'failed-ai-retry', 'failed-retry1', 'failed-retry2', 'failed-retry3',
-                                          'failed-parent-missing']):
-                stuck += 1
-print(stuck)
+import sys
+sys.path.insert(0, '$SCRIPT_DIR/..')
+from lib.evolution_csv import EvolutionCSV
+
+try:
+    with EvolutionCSV('$FULL_CSV_PATH') as csv:
+        stuck = csv.count_stuck_candidates()
+        print(stuck)
+except Exception as e:
+    print(f'[ERROR] Failed to count stuck candidates: {e}', file=sys.stderr)
+    print('0')  # Default to 0 on error
 " 2>/dev/null || echo "0")
 
     if [[ $stuck_work_count -gt 0 ]]; then

package/bin/claude-evolve-worker

@@ -297,13 +297,22 @@ with EvolutionCSV('$FULL_CSV_PATH') as csv:
     if [[ "$current_status" == "complete" ]]; then
       echo "[WORKER-$$] Already evaluated - skipping"
       # Reset status back to complete since get_next_pending_candidate() set it to running
-      "$PYTHON_CMD" -c "
+      if ! "$PYTHON_CMD" -c "
 import sys
 sys.path.insert(0, '$SCRIPT_DIR/..')
 from lib.evolution_csv import EvolutionCSV
 with EvolutionCSV('$FULL_CSV_PATH') as csv:
-    csv.update_candidate_status('$candidate_id', 'complete')
-" 2>/dev/null || true
+    success = csv.update_candidate_status('$candidate_id', 'complete')
+    if not success:
+        print(f'ERROR: Failed to update status for $candidate_id', file=sys.stderr)
+        sys.exit(1)
+"; then
+        echo "[WORKER-$$] ERROR: Failed to reset status to complete for $candidate_id" >&2
+        # Don't clear CURRENT_CANDIDATE_ID so cleanup handler can try again
+        return 1
+      fi
+
+      echo "[WORKER-$$] Status confirmed as complete"
       # Clear CURRENT_CANDIDATE_ID before returning to prevent cleanup from interfering
       CURRENT_CANDIDATE_ID=""
       return 0

package/lib/evolution_csv.py

@@ -416,6 +416,72 @@ class EvolutionCSV:
 
         return fixed_count
 
+    def reset_stuck_candidates(self) -> int:
+        """
+        Reset 'running' candidates and unknown statuses to 'pending'.
+        Should only be called when no workers are active.
+        Returns the number of candidates reset.
+        """
+        rows = self._read_csv()
+        if not rows:
+            return 0
+
+        reset_count = 0
+        has_header = rows and rows[0] and rows[0][0].lower() == 'id'
+        start_idx = 1 if has_header else 0
+
+        valid_statuses = {'', 'pending', 'complete', 'failed', 'failed-ai-retry',
+                         'failed-retry1', 'failed-retry2', 'failed-retry3', 'skipped',
+                         'failed-parent-missing', 'running'}
+
+        for i in range(start_idx, len(rows)):
+            if len(rows[i]) > 4:
+                status = rows[i][4].strip() if rows[i][4] else ''
+                candidate_id = rows[i][0] if rows[i] else ''
+
+                # Reset 'running' when no workers are active
+                if status == 'running':
+                    print(f'[INFO] Resetting stuck running candidate: {candidate_id}', file=sys.stderr)
+                    rows[i][4] = 'pending'
+                    reset_count += 1
+                # Reset unknown statuses
+                elif status not in valid_statuses:
+                    print(f'[WARN] Resetting unknown status "{status}" to pending: {candidate_id}', file=sys.stderr)
+                    rows[i][4] = 'pending'
+                    reset_count += 1
+
+        if reset_count > 0:
+            self._write_csv(rows)
+            print(f'[INFO] Reset {reset_count} stuck/unknown candidates to pending', file=sys.stderr)
+
+        return reset_count
+
+    def count_stuck_candidates(self) -> int:
+        """
+        Count candidates that are stuck (running or have unknown status).
+        Returns the number of stuck candidates.
+        """
+        rows = self._read_csv()
+        if not rows:
+            return 0
+
+        stuck = 0
+        has_header = rows and rows[0] and rows[0][0].lower() == 'id'
+        start_idx = 1 if has_header else 0
+
+        valid_statuses = {'', 'pending', 'complete', 'failed', 'failed-ai-retry',
+                         'failed-retry1', 'failed-retry2', 'failed-retry3', 'skipped',
+                         'failed-parent-missing'}
+
+        for i in range(start_idx, len(rows)):
+            if len(rows[i]) > 4:
+                status = rows[i][4].strip() if rows[i][4] else ''
+                # Count running and unknown statuses
+                if status == 'running' or (status and status not in valid_statuses):
+                    stuck += 1
+
+        return stuck
+
     def has_pending_work(self) -> bool:
         """Check if there are any pending candidates. Used by dispatcher."""
         return self.count_pending_candidates() > 0

package/package.json

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