claude-evolve 1.6.26 → 1.6.28

package/bin/claude-evolve-main

@@ -145,7 +145,7 @@ fi
 if [[ -n $WORKING_DIR ]]; then
   # Remove trailing slash if present
   WORKING_DIR="${WORKING_DIR%/}"
-  export CLAUDE_EVOLVE_CONFIG="$WORKING_DIR/config.yaml"
+  export CLAUDE_EVOLVE_WORKING_DIR="$WORKING_DIR"
 fi
 
 # Check for updates (quick, non-blocking)

package/bin/claude-evolve-run

@@ -7,25 +7,16 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # shellcheck source=../lib/config.sh
 source "$SCRIPT_DIR/../lib/config.sh"
 
-# Use CLAUDE_EVOLVE_CONFIG if set, otherwise default
-if [[ -n ${CLAUDE_EVOLVE_CONFIG:-} ]]; then
-  load_config "$CLAUDE_EVOLVE_CONFIG"
+# Use CLAUDE_EVOLVE_WORKING_DIR if set, otherwise default
+if [[ -n ${CLAUDE_EVOLVE_WORKING_DIR:-} ]]; then
+  load_config "$CLAUDE_EVOLVE_WORKING_DIR"
 else
-  # Check if config.yaml exists in current directory
-  if [[ -f "config.yaml" ]]; then
-    # Don't export to avoid collision with parallel runs
-    CONFIG_FILE="$(pwd)/config.yaml"
-    load_config "$CONFIG_FILE"
-  else
-    load_config
-  fi
+  load_config
 fi
 
 # Store the config path for workers (don't export to avoid collision)
-if [[ -n ${CLAUDE_EVOLVE_CONFIG:-} ]]; then
-  WORKER_CONFIG_PATH="$CLAUDE_EVOLVE_CONFIG"
-elif [[ -n ${CONFIG_FILE:-} ]]; then
-  WORKER_CONFIG_PATH="$CONFIG_FILE"
+if [[ -n ${CLAUDE_EVOLVE_WORKING_DIR:-} ]]; then
+  WORKER_CONFIG_PATH="$CLAUDE_EVOLVE_WORKING_DIR/config.yaml"
 elif [[ -f "config.yaml" ]]; then
   WORKER_CONFIG_PATH="$(pwd)/config.yaml"
 else

package/bin/claude-evolve-worker

@@ -590,6 +590,8 @@ from lib.evolution_csv import EvolutionCSV
 with EvolutionCSV('$FULL_CSV_PATH') as csv:
     csv.update_candidate_status('$candidate_id', 'failed-parent-missing')
 " 2>/dev/null || true
+    # Clear current candidate to avoid cleanup resetting it
+    CURRENT_CANDIDATE_ID=""
     # Stop looping so we don't keep retrying for missing dependency
     break
   else

package/lib/config.py

@@ -49,6 +49,8 @@ class Config:
         # Determine self.working_dir (EVOLUTION_DIR equivalent) based on specified logic
         if working_dir:
             self.working_dir = Path(working_dir)
+        elif os.environ.get('CLAUDE_EVOLVE_WORKING_DIR'):
+            self.working_dir = Path(os.environ.get('CLAUDE_EVOLVE_WORKING_DIR'))
         elif (Path('evolution') / 'evolution.csv').exists():
             self.working_dir = Path('evolution')
         elif Path('./evolution.csv').exists():

package/lib/config.sh

@@ -170,8 +170,9 @@ _load_yaml_config() {
   LAST_CONFIG_FILE_LOADED="$config_file"
 }
 
-# Load configuration from config file
 load_config() {
+  echo "[DEBUG] $1 at start of load_config: '$1'" >&2
+  echo "[DEBUG] DEFAULT_EVOLUTION_DIR: $DEFAULT_EVOLUTION_DIR" >&2
   # Set defaults first
   EVOLUTION_DIR="$DEFAULT_EVOLUTION_DIR" # Initialize with default
   ALGORITHM_FILE="$DEFAULT_ALGORITHM_FILE"
@@ -183,15 +184,20 @@ load_config() {
   PYTHON_CMD="$DEFAULT_PYTHON_CMD"
 
   # Determine EVOLUTION_DIR based on specified logic, overriding default if found
-  local user_working_dir="$1"
-  if [[ -n "$user_working_dir" ]]; then
-    EVOLUTION_DIR="$user_working_dir"
+  if [[ -n "$CLAUDE_EVOLVE_WORKING_DIR" ]]; then
+    echo "[DEBUG] EVOLUTION_DIR set by CLAUDE_EVOLVE_WORKING_DIR: $CLAUDE_EVOLVE_WORKING_DIR" >&2
+    EVOLUTION_DIR="$CLAUDE_EVOLVE_WORKING_DIR"
   elif [[ -f "evolution/evolution.csv" ]]; then
+    echo "[DEBUG] EVOLUTION_DIR set by evolution/evolution.csv: evolution" >&2
     EVOLUTION_DIR="evolution"
   elif [[ -f "./evolution.csv" ]]; then
+    echo "[DEBUG] EVOLUTION_DIR set by ./evolution.csv: ." >&2
     EVOLUTION_DIR="."
+  else
+    echo "[DEBUG] EVOLUTION_DIR defaulting to: $DEFAULT_EVOLUTION_DIR" >&2
   fi
-  
+  echo "[DEBUG] EVOLUTION_DIR after initial determination: $EVOLUTION_DIR" >&2
+
   TOTAL_IDEAS="$DEFAULT_TOTAL_IDEAS"
   NOVEL_EXPLORATION="$DEFAULT_NOVEL_EXPLORATION"
   HILL_CLIMBING="$DEFAULT_HILL_CLIMBING"
@@ -233,11 +239,11 @@ load_config() {
   # Load global config (overrides local config)
   local global_config_file="$HOME/.config/claude-evolve/config.yaml"
   _load_yaml_config "$global_config_file"
-
+  
   echo "[DEBUG] EVOLUTION_DIR before FULL_EVOLUTION_DIR calculation: $EVOLUTION_DIR" >&2
   
   # Create full paths - ALL paths are relative to EVOLUTION_DIR
-  # Make EVOLUTION_DIR absolute if it's relative
+  # Make EVOLUTION_DIR absolute if it\'s relative
   if [[ "$EVOLUTION_DIR" = /* ]]; then
     FULL_EVOLUTION_DIR="$EVOLUTION_DIR"
   else

package/package.json

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