claude-evolve 1.3.10 → 1.3.12

package/bin/claude-evolve-run-parallel

@@ -63,7 +63,18 @@ count_pending() {
     return
   fi
   
-  echo "$csv_content" | awk -F',' 'NR>1 && ($5 == "pending" || $5 == "") { count++ } END { print count+0 }'
+  # Use Python for proper CSV parsing with quoted fields
+  echo "$csv_content" | "$PYTHON_CMD" -c "
+import csv
+import sys
+reader = csv.reader(sys.stdin)
+next(reader)  # Skip header
+count = 0
+for row in reader:
+    if len(row) >= 5 and (row[4] == 'pending' or row[4] == ''):
+        count += 1
+print(count)
+"
 }
 
 # Start a worker
@@ -198,20 +209,42 @@ trap 'echo "[DISPATCHER] Exiting with code $?" >&2' EXIT
 # Check for stuck "running" candidates from previous runs
 check_stuck_candidates() {
   if read_csv_with_lock csv_content; then
-    local stuck_count=$(echo "$csv_content" | awk -F',' 'NR>1 && $5 == "running" { count++ } END { print count+0 }')
+    local stuck_count=$(echo "$csv_content" | "$PYTHON_CMD" -c "
+import csv
+import sys
+reader = csv.reader(sys.stdin)
+next(reader)  # Skip header
+count = 0
+for row in reader:
+    if len(row) >= 5 and row[4] == 'running':
+        count += 1
+print(count)
+")
     if [[ $stuck_count -gt 0 ]]; then
       echo "[DISPATCHER] Found $stuck_count candidates stuck in 'running' status"
       echo "[DISPATCHER] Resetting them to 'pending' for retry..."
       
       # Reset stuck candidates
       if acquire_csv_lock; then
-        awk -F',' -v OFS=',' '
-          NR==1 { print }
-          NR>1 { 
-            if ($5 == "running") $5 = "pending"
-            print 
-          }
-        ' "$FULL_CSV_PATH" > "${FULL_CSV_PATH}.tmp" && mv -f "${FULL_CSV_PATH}.tmp" "$FULL_CSV_PATH"
+        "$PYTHON_CMD" -c "
+import csv
+import sys
+
+# Read CSV
+with open('$FULL_CSV_PATH', 'r') as f:
+    reader = csv.reader(f)
+    rows = list(reader)
+
+# Reset running to pending
+for i in range(1, len(rows)):
+    if len(rows[i]) >= 5 and rows[i][4] == 'running':
+        rows[i][4] = 'pending'
+
+# Write back
+with open('${FULL_CSV_PATH}.tmp', 'w', newline='') as f:
+    writer = csv.writer(f)
+    writer.writerows(rows)
+" && mv -f "${FULL_CSV_PATH}.tmp" "$FULL_CSV_PATH"
         release_csv_lock
       fi
     fi
@@ -247,7 +280,17 @@ while true; do
   # Debug: Show CSV status if no pending
   if [[ $pending_count -eq 0 ]]; then
     total_rows=$(read_csv_with_lock csv_content && echo "$csv_content" | wc -l | xargs)
-    complete_count=$(read_csv_with_lock csv_content && echo "$csv_content" | awk -F',' 'NR>1 && $5 == "complete" { count++ } END { print count+0 }')
+    complete_count=$(read_csv_with_lock csv_content && echo "$csv_content" | "$PYTHON_CMD" -c "
+import csv
+import sys
+reader = csv.reader(sys.stdin)
+next(reader)  # Skip header
+count = 0
+for row in reader:
+    if len(row) >= 5 and row[4] == 'complete':
+        count += 1
+print(count)
+")
     echo "[DISPATCHER] CSV has $((total_rows-1)) total candidates, $complete_count complete"
   fi
   

package/bin/claude-evolve-worker

@@ -74,29 +74,39 @@ if ! read_csv_with_lock csv_content; then
   exit 1
 fi
 
-# Extract candidate data
-found=false
-while IFS=, read -r csv_id csv_based_on csv_desc csv_perf csv_stat; do
-  if [[ $csv_id == "$candidate_id" ]]; then
-    id="$csv_id"
-    based_on_id="$csv_based_on"
-    description="$csv_desc"
-    performance="$csv_perf"
-    status="$csv_stat"
-    found=true
-    break
-  fi
-done <<< "$csv_content"
+# Extract candidate data using Python
+eval "$("$PYTHON_CMD" -c "
+import csv
+import sys
+import io
+
+csv_content = '''$csv_content'''
+reader = csv.reader(io.StringIO(csv_content))
+next(reader)  # Skip header
+
+found = False
+for row in reader:
+    if len(row) >= 5 and row[0] == '$candidate_id':
+        # Escape special characters for shell
+        desc = row[2].replace('\\\\', '\\\\\\\\').replace('\"', '\\\\\"').replace('\$', '\\\\\$').replace('\`', '\\\\\`')
+        print(f'id=\"{row[0]}\"')
+        print(f'based_on_id=\"{row[1]}\"')
+        print(f'description=\"{desc}\"')
+        print(f'performance=\"{row[3]}\"')
+        print(f'status=\"{row[4]}\"')
+        print('found=true')
+        found = True
+        break
+
+if not found:
+    print('found=false')
+")"
 
 if [[ $found == false ]]; then
   echo "[ERROR] Candidate ID not found: $candidate_id" >&2
   exit 1
 fi
 
-# Clean up description
-description=${description#\"}
-description=${description%\"}
-
 echo "[WORKER-$$] Description: $description"
 echo "[WORKER-$$] Based on ID: $based_on_id"
 

package/lib/config.sh

@@ -150,16 +150,22 @@ load_config() {
   fi
   
   # Create full paths - ALL paths are relative to evolution_dir
-  FULL_EVOLUTION_DIR="$EVOLUTION_DIR"
-  FULL_ALGORITHM_PATH="$EVOLUTION_DIR/$ALGORITHM_FILE"
-  FULL_EVALUATOR_PATH="$EVOLUTION_DIR/$EVALUATOR_FILE"
-  FULL_BRIEF_PATH="$EVOLUTION_DIR/$BRIEF_FILE"
-  FULL_CSV_PATH="$EVOLUTION_DIR/$EVOLUTION_CSV"
+  # Make evolution_dir absolute if it's relative
+  if [[ "$EVOLUTION_DIR" = /* ]]; then
+    FULL_EVOLUTION_DIR="$EVOLUTION_DIR"
+  else
+    FULL_EVOLUTION_DIR="$(cd "$EVOLUTION_DIR" 2>/dev/null && pwd)" || FULL_EVOLUTION_DIR="$EVOLUTION_DIR"
+  fi
+  
+  FULL_ALGORITHM_PATH="$FULL_EVOLUTION_DIR/$ALGORITHM_FILE"
+  FULL_EVALUATOR_PATH="$FULL_EVOLUTION_DIR/$EVALUATOR_FILE"
+  FULL_BRIEF_PATH="$FULL_EVOLUTION_DIR/$BRIEF_FILE"
+  FULL_CSV_PATH="$FULL_EVOLUTION_DIR/$EVOLUTION_CSV"
   
   if [[ -n $OUTPUT_DIR ]]; then
-    FULL_OUTPUT_DIR="$EVOLUTION_DIR/$OUTPUT_DIR"
+    FULL_OUTPUT_DIR="$FULL_EVOLUTION_DIR/$OUTPUT_DIR"
   else
-    FULL_OUTPUT_DIR="$EVOLUTION_DIR"
+    FULL_OUTPUT_DIR="$FULL_EVOLUTION_DIR"
   fi
 }
 

package/lib/csv-lock.sh

@@ -94,19 +94,19 @@ update_csv_row_with_lock() {
     local target_id="$1"
     local field="$2"
     local value="$3"
-    local csv_file="${EVOLUTION_DIR:-evolution}/evolution.csv"
+    local csv_file="${FULL_CSV_PATH:-${EVOLUTION_DIR:-evolution}/evolution.csv}"
     
     if ! acquire_csv_lock; then
         return 1
     fi
     
-    # Determine field position
+    # Determine field position (0-based for Python)
     local field_pos
     case "$field" in
-        "status") field_pos=5 ;;
-        "performance") field_pos=4 ;;
-        "description") field_pos=3 ;;
-        "basedOnId") field_pos=2 ;;
+        "status") field_pos=4 ;;
+        "performance") field_pos=3 ;;
+        "description") field_pos=2 ;;
+        "basedOnId") field_pos=1 ;;
         *) 
             echo "ERROR: Unknown field: $field" >&2
             release_csv_lock
@@ -114,11 +114,27 @@ update_csv_row_with_lock() {
             ;;
     esac
     
-    # Update CSV using awk
-    awk -F',' -v OFS=',' -v id="$target_id" -v pos="$field_pos" -v val="$value" '
-        NR==1 || $1 != id { print }
-        $1 == id { $pos = val; print }
-    ' "$csv_file" > "${csv_file}.tmp" && mv -f "${csv_file}.tmp" "$csv_file"
+    # Update CSV using Python
+    "$PYTHON_CMD" -c "
+import csv
+import sys
+
+# Read CSV
+with open('$csv_file', 'r') as f:
+    reader = csv.reader(f)
+    rows = list(reader)
+
+# Update the specific field
+for i in range(1, len(rows)):
+    if rows[i][0] == '$target_id':
+        rows[i][$field_pos] = '$value'
+        break
+
+# Write back
+with open('${csv_file}.tmp', 'w', newline='') as f:
+    writer = csv.writer(f)
+    writer.writerows(rows)
+" && mv -f "${csv_file}.tmp" "$csv_file"
     
     release_csv_lock
     return 0
@@ -127,27 +143,40 @@ update_csv_row_with_lock() {
 # Find next pending candidate with lock
 # Usage: next_pending=$(find_next_pending_with_lock)
 find_next_pending_with_lock() {
-    local csv_file="${EVOLUTION_DIR:-evolution}/evolution.csv"
+    local csv_file="${FULL_CSV_PATH:-${EVOLUTION_DIR:-evolution}/evolution.csv}"
     
     if ! acquire_csv_lock; then
         return 1
     fi
     
-    # Find oldest pending candidate and update to running
-    local candidate=$(awk -F',' '
-        NR>1 && ($5 == "pending" || $5 == "") { print $1; exit }
-    ' "$csv_file")
+    # Find oldest pending candidate and update to running using Python
+    local candidate=$("$PYTHON_CMD" -c "
+import csv
+import sys
+
+# Read CSV
+with open('$csv_file', 'r') as f:
+    reader = csv.reader(f)
+    rows = list(reader)
+
+# Find first pending candidate
+candidate_id = None
+for i in range(1, len(rows)):
+    if len(rows[i]) >= 5 and (rows[i][4] == 'pending' or rows[i][4] == ''):
+        candidate_id = rows[i][0]
+        rows[i][4] = 'running'  # Update status
+        break
+
+# Write back if we found a candidate
+if candidate_id:
+    with open('${csv_file}.tmp', 'w', newline='') as f:
+        writer = csv.writer(f)
+        writer.writerows(rows)
+    print(candidate_id)
+")
     
     if [ -n "$candidate" ]; then
-        # Update status to running while we have the lock
-        awk -F',' -v OFS=',' -v id="$candidate" '
-            NR==1 || $1 != id { print }
-            $1 == id { 
-                # Preserve existing fields but set status to running
-                if ($5 == "" || $5 == "pending") $5 = "running"
-                print 
-            }
-        ' "$csv_file" > "${csv_file}.tmp" && mv -f "${csv_file}.tmp" "$csv_file"
+        mv -f "${csv_file}.tmp" "$csv_file"
     fi
     
     release_csv_lock

package/package.json

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