claude-evolve 1.0.10 → 1.0.12

package/bin/claude-evolve-analyze

@@ -2,10 +2,16 @@
 
 set -e
 
+# Load configuration
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=../lib/config.sh
+source "$SCRIPT_DIR/../lib/config.sh"
+load_config
+
 # Parse arguments
 open_chart=false
-csv_file="evolution/evolution.csv"
-output_file="evolution/performance.png"
+csv_file="$FULL_CSV_PATH"
+output_file="$FULL_OUTPUT_DIR/performance.png"
 
 while [[ $# -gt 0 ]]; do
   case $1 in

package/bin/claude-evolve-run

@@ -2,6 +2,12 @@
 
 set -e
 
+# Load configuration
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+# shellcheck source=../lib/config.sh
+source "$SCRIPT_DIR/../lib/config.sh"
+load_config
+
 # Parse arguments
 timeout_seconds=""
 
@@ -46,35 +52,45 @@ done
 echo "[INFO] Starting evolution run..."
 [[ -n $timeout_seconds ]] && echo "[INFO] Using timeout: ${timeout_seconds} seconds"
 
-# Validate workspace
-if [[ ! -d evolution ]]; then
-  echo "[ERROR] Evolution directory not found. Run 'claude-evolve setup' first." >&2
+# Validate workspace using config
+if [[ ! -d "$FULL_EVOLUTION_DIR" ]]; then
+  echo "[ERROR] Evolution directory not found: $FULL_EVOLUTION_DIR. Run 'claude-evolve setup' first." >&2
   exit 1
 fi
 
-for file in evolution.csv evaluator.py; do
-  if [[ ! -f evolution/$file ]]; then
-    echo "[ERROR] $file not found. Run 'claude-evolve setup' first." >&2
-    exit 1
-  fi
-done
+# Check required files
+if [[ ! -f "$FULL_CSV_PATH" ]]; then
+  echo "[ERROR] CSV file not found: $FULL_CSV_PATH" >&2
+  exit 1
+fi
+
+if [[ ! -f "$FULL_EVALUATOR_PATH" ]]; then
+  echo "[ERROR] Evaluator not found: $FULL_EVALUATOR_PATH" >&2
+  exit 1
+fi
+
+if [[ ! -f "$FULL_ALGORITHM_PATH" ]]; then
+  echo "[ERROR] Algorithm not found: $FULL_ALGORITHM_PATH" >&2
+  exit 1
+fi
 
-# Find oldest empty row (pure shell)
+# Find oldest pending row (pure shell)
 find_empty_row() {
   local row_num=2 # Start after header
   while IFS=, read -r id based_on desc perf status; do
-    if [[ -z $perf && -z $status ]]; then
+    # Look for rows with pending status or empty status (but not complete/failed/running)
+    if [[ $status == "pending" || (-z $perf && -z $status) ]]; then
       echo $row_num
       return 0
     fi
     ((row_num++))
-  done < <(tail -n +2 evolution/evolution.csv)
+  done < <(tail -n +2 "$FULL_CSV_PATH")
   return 1
 }
 
 # Get CSV row (pure shell)
 get_csv_row() {
-  sed -n "${1}p" evolution/evolution.csv
+  sed -n "${1}p" "$FULL_CSV_PATH"
 }
 
 # Update CSV row (pure shell with temp file)
@@ -84,7 +100,7 @@ update_csv_row() {
   local status="$3"
 
   # Read CSV and update specific row
-  local temp_file="evolution/evolution.csv.tmp"
+  local temp_file="${FULL_CSV_PATH}.tmp"
   local current_row=1
 
   while IFS=, read -r id based_on desc perf stat; do
@@ -96,14 +112,14 @@ update_csv_row() {
       echo "$id,$based_on,$desc,$perf,$stat"
     fi
     ((current_row++))
-  done <evolution/evolution.csv >"$temp_file"
+  done <"$FULL_CSV_PATH" >"$temp_file"
 
-  mv "$temp_file" evolution/evolution.csv
+  mv "$temp_file" "$FULL_CSV_PATH"
 }
 
 # Find next candidate
 if ! row_num=$(find_empty_row); then
-  echo "[ERROR] No empty rows found in CSV. Run 'claude-evolve ideate' to add candidates." >&2
+  echo "[ERROR] No pending candidates found in CSV. Run 'claude-evolve ideate' to add more candidates." >&2
   exit 1
 fi
 
@@ -111,6 +127,13 @@ fi
 row_data=$(get_csv_row "$row_num")
 IFS=, read -r id based_on_id description performance status <<<"$row_data"
 
+# Check if ID is empty
+if [[ -z $id ]]; then
+  echo "[ERROR] Empty ID found at row $row_num. CSV may be malformed." >&2
+  echo "[ERROR] Row data: $row_data" >&2
+  exit 1
+fi
+
 # Clean up description (remove quotes)
 description=${description#\"}
 description=${description%\"}
@@ -126,9 +149,12 @@ trap 'update_csv_row "$row_num" "" "interrupted"; echo "[INFO] Evolution interru
 update_csv_row "$row_num" "" "running"
 
 # Determine parent algorithm
-parent_file="evolution/algorithm.py"
-if [[ -n $based_on_id && $based_on_id != "0" ]]; then
-  parent_file="evolution/evolution_id${based_on_id}.py"
+if [[ -z $based_on_id || $based_on_id == "0" || $based_on_id == '""' ]]; then
+  # Empty or zero basedonID means use the base algorithm
+  parent_file="$FULL_ALGORITHM_PATH"
+  echo "[INFO] Using base algorithm (basedonID is empty or 0)"
+else
+  parent_file="$FULL_OUTPUT_DIR/evolution_id${based_on_id}.py"
   if [[ ! -f $parent_file ]]; then
     echo "[ERROR] Parent algorithm file not found: $parent_file" >&2
     update_csv_row "$row_num" "" "failed"
@@ -139,7 +165,7 @@ fi
 echo "[INFO] Using parent algorithm: $parent_file"
 
 # Generate mutation
-output_file="evolution/evolution_id${id}.py"
+output_file="$FULL_OUTPUT_DIR/evolution_id${id}.py"
 echo "[INFO] Generating algorithm mutation..."
 
 # Copy parent algorithm to output file first
@@ -156,8 +182,8 @@ fi
 
 # Implement claude-fsd style model selection
 # Read/create loop counter for megathinking mode
-if [[ -f evolution/.loop_counter ]]; then
-  LOOP_COUNTER=$(cat evolution/.loop_counter)
+if [[ -f "$FULL_EVOLUTION_DIR/.loop_counter" ]]; then
+  LOOP_COUNTER=$(cat "$FULL_EVOLUTION_DIR/.loop_counter")
 else
   LOOP_COUNTER=1
 fi
@@ -175,13 +201,13 @@ else
 fi
 
 # Increment and save counter
-echo $((LOOP_COUNTER + 1)) > evolution/.loop_counter
+echo $((LOOP_COUNTER + 1)) > "$FULL_EVOLUTION_DIR/.loop_counter"
 
 # Create mutation prompt
 prompt="${MEGATHINK_PREFIX}You are an AI assistant helping to evolve algorithms through mutations. Please modify the Python algorithm file at $output_file based on the requested modification.
 
 CONTEXT:
-$(cat evolution/BRIEF.md 2>/dev/null || echo "No brief available")
+$(cat "$FULL_BRIEF_PATH" 2>/dev/null || echo "No brief available")
 
 ALGORITHM FILE TO MODIFY: $output_file
 
@@ -216,7 +242,7 @@ eval_exit_code=0
 
 if [[ -n $timeout_seconds ]]; then
   echo "[INFO] Starting evaluation with ${timeout_seconds}s timeout..."
-  if eval_output=$(timeout "$timeout_seconds" python3 evolution/evaluator.py "$output_file" 2>&1); then
+  if eval_output=$(timeout "$timeout_seconds" "$PYTHON_CMD" "$FULL_EVALUATOR_PATH" "$output_file" 2>&1); then
     eval_exit_code=0
   else
     eval_exit_code=$?
@@ -227,7 +253,7 @@ if [[ -n $timeout_seconds ]]; then
     fi
   fi
 else
-  if eval_output=$(python3 evolution/evaluator.py "$output_file" 2>&1); then
+  if eval_output=$("$PYTHON_CMD" "$FULL_EVALUATOR_PATH" "$output_file" 2>&1); then
     eval_exit_code=0
   else
     eval_exit_code=$?

package/lib/config.sh

@@ -59,8 +59,29 @@ load_config() {
 
   # Create full paths
   FULL_EVOLUTION_DIR="$EVOLUTION_DIR"
-  FULL_ALGORITHM_PATH="$EVOLUTION_DIR/$ALGORITHM_FILE"
-  FULL_EVALUATOR_PATH="$EVOLUTION_DIR/$EVALUATOR_FILE"
+  
+  # Handle relative paths properly
+  if [[ $ALGORITHM_FILE == /* ]]; then
+    # Absolute path
+    FULL_ALGORITHM_PATH="$ALGORITHM_FILE"
+  elif [[ $ALGORITHM_FILE == ../* ]]; then
+    # Relative to parent directory
+    FULL_ALGORITHM_PATH="$ALGORITHM_FILE"
+  else
+    # Relative to evolution directory
+    FULL_ALGORITHM_PATH="$EVOLUTION_DIR/$ALGORITHM_FILE"
+  fi
+  
+  # Same for evaluator
+  if [[ $EVALUATOR_FILE == /* ]]; then
+    FULL_EVALUATOR_PATH="$EVALUATOR_FILE"
+  elif [[ $EVALUATOR_FILE == ../* ]]; then
+    FULL_EVALUATOR_PATH="$EVALUATOR_FILE"
+  else
+    FULL_EVALUATOR_PATH="$EVOLUTION_DIR/$EVALUATOR_FILE"
+  fi
+  
+  # Brief and CSV are always in evolution dir
   FULL_BRIEF_PATH="$EVOLUTION_DIR/$BRIEF_FILE"
   FULL_CSV_PATH="$EVOLUTION_DIR/$EVOLUTION_CSV"
   

package/package.json

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