claude-evolve 1.6.23 → 1.6.25

package/lib/config.py

@@ -11,7 +11,6 @@ class Config:
     
     # Default values matching config.sh
     DEFAULTS = {
-        'evolution_dir': 'evolution',
         'algorithm_file': 'algorithm.py',
         'evaluator_file': 'evaluator.py',
         'brief_file': 'BRIEF.md',
@@ -44,18 +43,24 @@ class Config:
     
     def load(self, config_path=None, working_dir=None):
         """Load configuration from YAML file."""
-        # Determine local config file path
+        # Initialize working_dir with a default
+        self.working_dir = Path('evolution')
+
+        # Determine self.working_dir (EVOLUTION_DIR equivalent) based on specified logic
+        if working_dir:
+            self.working_dir = Path(working_dir)
+        elif (Path('evolution') / 'evolution.csv').exists():
+            self.working_dir = Path('evolution')
+        elif Path('./evolution.csv').exists():
+            self.working_dir = Path('.')
+
+        # Determine local config file path relative to self.working_dir
         local_config_path = None
         if config_path:
             # Explicit config path provided, treat as local
             local_config_path = Path(config_path)
-        elif working_dir:
-            # Look for config.yaml in working directory
-            self.working_dir = Path(working_dir)
-            local_config_path = self.working_dir / 'config.yaml'
         else:
-            # Default to evolution/config.yaml
-            local_config_path = Path('evolution/config.yaml')
+            local_config_path = self.working_dir / 'config.yaml'
 
         # Store the resolved config_path for path resolution later
         self.config_path = local_config_path

package/lib/config.sh

@@ -173,7 +173,7 @@ _load_yaml_config() {
 # Load configuration from config file
 load_config() {
   # Set defaults first
-  EVOLUTION_DIR="$DEFAULT_EVOLUTION_DIR"
+  EVOLUTION_DIR="$DEFAULT_EVOLUTION_DIR" # Initialize with default
   ALGORITHM_FILE="$DEFAULT_ALGORITHM_FILE"
   EVALUATOR_FILE="$DEFAULT_EVALUATOR_FILE"
   BRIEF_FILE="$DEFAULT_BRIEF_FILE"
@@ -181,6 +181,16 @@ load_config() {
   OUTPUT_DIR="$DEFAULT_OUTPUT_DIR"
   PARENT_SELECTION="$DEFAULT_PARENT_SELECTION"
   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"
+  elif [[ -f "evolution/evolution.csv" ]]; then
+    EVOLUTION_DIR="evolution"
+  elif [[ -f "./evolution.csv" ]]; then
+    EVOLUTION_DIR="."
+  fi
   
   TOTAL_IDEAS="$DEFAULT_TOTAL_IDEAS"
   NOVEL_EXPLORATION="$DEFAULT_NOVEL_EXPLORATION"
@@ -214,11 +224,8 @@ load_config() {
   LLM_RUN="$DEFAULT_LLM_RUN"
   LLM_IDEATE="$DEFAULT_LLM_IDEATE"
 
-  # If a config file is explicitly provided, use it as the local config
-  local local_config_file="evolution/config.yaml"
-  if [[ -n "$1" ]]; then
-    local_config_file="$1"
-  fi
+  # Determine local config file path relative to EVOLUTION_DIR
+  local local_config_file="$EVOLUTION_DIR/config.yaml"
 
   # Load local config
   _load_yaml_config "$local_config_file"
@@ -227,11 +234,8 @@ load_config() {
   local global_config_file="$HOME/.config/claude-evolve/config.yaml"
   _load_yaml_config "$global_config_file"
   
-  # EVOLUTION_DIR should always be the project's evolution directory, not derived from config file location
-  # It is initialized to DEFAULT_EVOLUTION_DIR at the start of load_config and should not be changed here.
-  
-  # Create full paths - ALL paths are relative to evolution_dir
-  # Make evolution_dir absolute if it's relative
+  # Create full paths - ALL paths are relative to EVOLUTION_DIR
+  # 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.23",
+  "version": "1.6.25",
   "bin": {
     "claude-evolve": "./bin/claude-evolve",
     "claude-evolve-main": "./bin/claude-evolve-main",