claude-evolve 1.6.21 → 1.6.23

package/lib/config.py

@@ -44,31 +44,44 @@ class Config:
     
     def load(self, config_path=None, working_dir=None):
         """Load configuration from YAML file."""
-        # Determine config file path
+        # Determine local config file path
+        local_config_path = None
         if config_path:
-            # Explicit config path provided
-            self.config_path = Path(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)
-            self.config_path = self.working_dir / 'config.yaml'
+            local_config_path = self.working_dir / 'config.yaml'
         else:
             # Default to evolution/config.yaml
-            self.config_path = Path('evolution/config.yaml')
-        
-        # Load config if it exists
-        if self.config_path.exists():
-            with open(self.config_path, 'r') as f:
-                yaml_data = yaml.safe_load(f) or {}
-                
-                # Merge with defaults
-                self.data.update(yaml_data)
-                
-                # Handle nested structures
-                if 'ideation' in yaml_data:
-                    self.data['ideation'] = {**self.DEFAULTS['ideation'], **yaml_data['ideation']}
-                if 'parallel' in yaml_data:
-                    self.data['parallel'] = {**self.DEFAULTS['parallel'], **yaml_data['parallel']}
+            local_config_path = Path('evolution/config.yaml')
+
+        # Store the resolved config_path for path resolution later
+        self.config_path = local_config_path
+
+        # Load local config if it exists
+        if local_config_path.exists():
+            with open(local_config_path, 'r') as f:
+                local_yaml_data = yaml.safe_load(f) or {}
+                self._merge_config_data(local_yaml_data)
+
+        # Load global config from ~/.config/claude-evolve/config.yaml
+        global_config_path = Path.home() / '.config' / 'claude-evolve' / 'config.yaml'
+        if global_config_path.exists():
+            with open(global_config_path, 'r') as f:
+                global_yaml_data = yaml.safe_load(f) or {}
+                self._merge_config_data(global_yaml_data)
+
+    def _merge_config_data(self, new_data):
+        """Helper to merge new data into self.data, handling nested structures."""
+        for key, value in new_data.items():
+            if key in self.data and isinstance(self.data[key], dict) and isinstance(value, dict):
+                # Recursively merge nested dictionaries
+                self.data[key].update(value)
+            else:
+                # Overwrite or add other types of values
+                self.data[key] = value
     
     def resolve_path(self, relative_path):
         """Resolve a path relative to the config directory."""

package/lib/config.sh

@@ -59,23 +59,119 @@ DEFAULT_LLM_RUN="codex-qwen3 codex-oss gemini-flash"
 # Ideate: Commercial models for idea generation + local fallback
 DEFAULT_LLM_IDEATE="gemini sonnet-think gpt5high glm grok-4 codex-qwen3 codex-oss"
 
-# Load configuration from config file
-load_config() {
-  # Accept config file path as parameter. If not supplied, look for a user override in
-  # $HOME/.config/claude-evolve/config.yaml first, then fall back to the repo default.
-  local user_config="$1"
+# Load configuration from a YAML file and update variables
+_load_yaml_config() {
+  local config_file="$1"
+  if [[ ! -f "$config_file" ]]; then
+    return 0 # File does not exist, nothing to load
+  fi
 
-  if [[ -n "$user_config" ]]; then
-    config_file="$user_config"
-  else
-    local home_config="$HOME/.config/claude-evolve/config.yaml"
-    if [[ -f "$home_config" ]]; then
-      config_file="$home_config"
+  echo "[DEBUG] Loading configuration from: $config_file" >&2
+
+  local in_ideation_section=false
+  local in_parallel_section=false
+  local in_llm_cli_section=false
+  local llm_cli_subsection=""
+
+  while IFS='' read -r line; do
+    [[ $line =~ ^[[:space:]]*# ]] || [[ -z $line ]] && continue
+
+    if [[ ! $line =~ ^([^:]+):(.*)$ ]]; then
+      continue
+    fi
+    local key="${BASH_REMATCH[1]}"
+    local value="${BASH_REMATCH[2]}"
+
+    local is_indented=false
+    [[ $key =~ ^[[:space:]]+ ]] && is_indented=true
+
+    key=$(echo "$key" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+    value=$(echo "$value" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
+
+    if [[ "${DEBUG_CONFIG:-}" == "true" ]]; then
+      echo "[CONFIG DEBUG] Before comment removal: key='$key' value='$value'" >&2
+    fi
+
+    value=$(echo "$value" | sed 's/[[:space:]]*#.*$//')
+    value=$(echo "$value" | sed 's/^"//;s/"$//')
+
+    if [[ $key == "ideation_strategies" ]]; then
+      in_ideation_section=true
+      in_parallel_section=false
+      in_llm_cli_section=false
+      continue
+    elif [[ $key == "parallel" ]]; then
+      in_parallel_section=true
+      in_ideation_section=false
+      in_llm_cli_section=false
+      continue
+    elif [[ $key == "llm_cli" ]]; then
+      in_llm_cli_section=true
+      in_ideation_section=false
+      in_parallel_section=false
+      llm_cli_subsection=""
+      continue
+    elif [[ $is_indented == false ]] && [[ $in_ideation_section == true || $in_parallel_section == true || $in_llm_cli_section == true ]]; then
+      in_ideation_section=false
+      in_parallel_section=false
+      in_llm_cli_section=false
+      llm_cli_subsection=""
+    fi
+
+    if [[ $in_ideation_section == true ]]; then
+      case $key in
+        total_ideas) TOTAL_IDEAS="$value" ;;
+        novel_exploration) NOVEL_EXPLORATION="$value" ;;
+        hill_climbing) HILL_CLIMBING="$value" ;;
+        structural_mutation) STRUCTURAL_MUTATION="$value" ;;
+        crossover_hybrid) CROSSOVER_HYBRID="$value" ;;
+        num_elites) NUM_ELITES="$value" ;;
+        num_revolution) NUM_REVOLUTION="$value" ;;
+      esac
+    elif [[ $in_parallel_section == true ]]; then
+      case $key in
+        enabled) PARALLEL_ENABLED="$value" ;;
+        max_workers) MAX_WORKERS="$value" ;;
+        lock_timeout) LOCK_TIMEOUT="$value" ;;
+      esac
+    elif [[ $in_llm_cli_section == true ]]; then
+      if [[ $key == "run" || $key == "ideate" ]]; then
+        case $key in
+          run) LLM_RUN="$value" ;;
+          ideate) LLM_IDEATE="$value" ;;
+        esac
+      else
+        value=$(echo "$value" | sed "s/^'//;s/'$//")
+        local var_key=$(echo "$key" | sed 's/-/_/g')
+        if [[ "${DEBUG_CONFIG:-}" == "true" ]]; then
+          echo "[CONFIG DEBUG] Setting LLM_CLI_${var_key} = '$value'" >&2
+        fi
+        eval "LLM_CLI_${var_key}=\"$value\""
+      fi
     else
-      config_file="evolution/config.yaml"
+      case $key in
+        algorithm_file) ALGORITHM_FILE="$value" ;;
+        evaluator_file) EVALUATOR_FILE="$value" ;;
+        brief_file) BRIEF_FILE="$value" ;;
+        evolution_csv) EVOLUTION_CSV="$value" ;;
+        output_dir) OUTPUT_DIR="$value" ;;
+        parent_selection) PARENT_SELECTION="$value" ;;
+        python_cmd) PYTHON_CMD="$value" ;;
+        auto_ideate) AUTO_IDEATE="$value" ;;
+        max_retries) MAX_RETRIES="$value" ;;
+        memory_limit_mb) MEMORY_LIMIT_MB="$value" ;;
+        evolution_dir):
+          echo "[WARN] evolution_dir in config is ignored - automatically inferred from config file location" >&2
+          ;;
+      esac
     fi
-  fi
-  
+  done < "$config_file"
+  # Keep track of the last config file loaded to infer evolution_dir
+  LAST_CONFIG_FILE_LOADED="$config_file"
+}
+
+# Load configuration from config file
+load_config() {
   # Set defaults first
   EVOLUTION_DIR="$DEFAULT_EVOLUTION_DIR"
   ALGORITHM_FILE="$DEFAULT_ALGORITHM_FILE"
@@ -86,7 +182,6 @@ load_config() {
   PARENT_SELECTION="$DEFAULT_PARENT_SELECTION"
   PYTHON_CMD="$DEFAULT_PYTHON_CMD"
   
-  # Set ideation strategy defaults
   TOTAL_IDEAS="$DEFAULT_TOTAL_IDEAS"
   NOVEL_EXPLORATION="$DEFAULT_NOVEL_EXPLORATION"
   HILL_CLIMBING="$DEFAULT_HILL_CLIMBING"
@@ -95,23 +190,14 @@ load_config() {
   NUM_ELITES="$DEFAULT_NUM_ELITES"
   NUM_REVOLUTION="$DEFAULT_NUM_REVOLUTION"
   
-  # Set parallel execution defaults
   PARALLEL_ENABLED="$DEFAULT_PARALLEL_ENABLED"
   MAX_WORKERS="$DEFAULT_MAX_WORKERS"
   LOCK_TIMEOUT="$DEFAULT_LOCK_TIMEOUT"
   
-  # Set auto ideation default
   AUTO_IDEATE="$DEFAULT_AUTO_IDEATE"
-  
-  # Set retry default
   MAX_RETRIES="$DEFAULT_MAX_RETRIES"
-  
-  # Set memory limit default
   MEMORY_LIMIT_MB="$DEFAULT_MEMORY_LIMIT_MB"
   
-  # Set LLM CLI defaults (compatibility for older bash)
-  # Initialize associative array for LLM commands
-  # Use simpler approach for compatibility
   LLM_CLI_gpt5high='codex exec --profile gpt5high --dangerously-bypass-approvals-and-sandbox "{{PROMPT}}"'
   LLM_CLI_o3high='codex exec --profile o3high --dangerously-bypass-approvals-and-sandbox "{{PROMPT}}"'
   LLM_CLI_codex='codex exec --dangerously-bypass-approvals-and-sandbox "{{PROMPT}}"'
@@ -127,142 +213,22 @@ load_config() {
   LLM_CLI_deepseek='opencode -m openrouter/deepseek/deepseek-v3.1-terminus run "{{PROMPT}}"'
   LLM_RUN="$DEFAULT_LLM_RUN"
   LLM_IDEATE="$DEFAULT_LLM_IDEATE"
-  
-  # Load config if found
-  if [[ -f "$config_file" ]]; then
-    echo "[DEBUG] Loading configuration from: $config_file" >&2
-    # Simple YAML parsing for key: value pairs and nested structures
-    local in_ideation_section=false
-    local in_parallel_section=false
-    local in_llm_cli_section=false
-    local llm_cli_subsection=""
-    while IFS='' read -r line; do
-      # Skip comments and empty lines
-      [[ $line =~ ^[[:space:]]*# ]] || [[ -z $line ]] && continue
-      
-      # Parse key:value from line
-      if [[ ! $line =~ ^([^:]+):(.*)$ ]]; then
-        continue
-      fi
-      key="${BASH_REMATCH[1]}"
-      value="${BASH_REMATCH[2]}"
-      
-      # Check if key is indented (for nested sections)
-      local is_indented=false
-      [[ $key =~ ^[[:space:]]+ ]] && is_indented=true
-      
-      
-      # Remove leading/trailing whitespace
-      key=$(echo "$key" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
-      value=$(echo "$value" | sed 's/^[[:space:]]*//;s/[[:space:]]*$//')
-      
-      # Debug before comment removal
-      if [[ "${DEBUG_CONFIG:-}" == "true" ]]; then
-        echo "[CONFIG DEBUG] Before comment removal: key='$key' value='$value'" >&2
-      fi
-      
-      # Remove inline comments from value
-      value=$(echo "$value" | sed 's/[[:space:]]*#.*$//')
-      
-      # Remove quotes from value
-      value=$(echo "$value" | sed 's/^"//;s/"$//')
-      
-      # Handle nested sections
-      if [[ $key == "ideation_strategies" ]]; then
-        in_ideation_section=true
-        in_parallel_section=false
-        in_llm_cli_section=false
-        continue
-      elif [[ $key == "parallel" ]]; then
-        in_parallel_section=true
-        in_ideation_section=false
-        in_llm_cli_section=false
-        continue
-      elif [[ $key == "llm_cli" ]]; then
-        in_llm_cli_section=true
-        in_ideation_section=false
-        in_parallel_section=false
-        llm_cli_subsection=""
-        continue
-      elif [[ $is_indented == false ]] && [[ $in_ideation_section == true || $in_parallel_section == true || $in_llm_cli_section == true ]]; then
-        # Non-indented key found while in a section, exit nested sections
-        in_ideation_section=false
-        in_parallel_section=false
-        in_llm_cli_section=false
-        llm_cli_subsection=""
-      fi
-      
-      if [[ $in_ideation_section == true ]]; then
-        # Handle indented keys in ideation_strategies
-        case $key in
-          total_ideas) TOTAL_IDEAS="$value" ;;
-          novel_exploration) NOVEL_EXPLORATION="$value" ;;
-          hill_climbing) HILL_CLIMBING="$value" ;;
-          structural_mutation) STRUCTURAL_MUTATION="$value" ;;
-          crossover_hybrid) CROSSOVER_HYBRID="$value" ;;
-          num_elites) NUM_ELITES="$value" ;;
-          num_revolution) NUM_REVOLUTION="$value" ;;
-        esac
-      elif [[ $in_parallel_section == true ]]; then
-        # Handle indented keys in parallel section
-        case $key in
-          enabled) PARALLEL_ENABLED="$value" ;;
-          max_workers) MAX_WORKERS="$value" ;;
-          lock_timeout) LOCK_TIMEOUT="$value" ;;
-        esac
-      elif [[ $in_llm_cli_section == true ]]; then
-        # Handle indented keys in llm_cli section
-        # Check if this is a model definition (o3, codex, gemini, etc.) or a command list (run, ideate)
-        if [[ $key == "run" || $key == "ideate" ]]; then
-          # Command list - value is a space-separated list of models
-          case $key in
-            run) LLM_RUN="$value" ;;
-            ideate) LLM_IDEATE="$value" ;;
-          esac
-        else
-          # Model definition - key is model name, value is command template
-          # Remove single quotes from value if present
-          value=$(echo "$value" | sed "s/^'//;s/'$//")
-          # Convert dashes to underscores for bash variable names
-          var_key=$(echo "$key" | sed 's/-/_/g')
-          # Debug config loading
-          if [[ "${DEBUG_CONFIG:-}" == "true" ]]; then
-            echo "[CONFIG DEBUG] Setting LLM_CLI_${var_key} = '$value'" >&2
-          fi
-          # Use dynamic variable name for compatibility
-          eval "LLM_CLI_${var_key}=\"$value\""
-        fi
-      else
-        # Handle top-level keys
-        case $key in
-          algorithm_file) ALGORITHM_FILE="$value" ;;
-          evaluator_file) EVALUATOR_FILE="$value" ;;
-          brief_file) BRIEF_FILE="$value" ;;
-          evolution_csv) EVOLUTION_CSV="$value" ;;
-          output_dir) OUTPUT_DIR="$value" ;;
-          parent_selection) PARENT_SELECTION="$value" ;;
-          python_cmd) PYTHON_CMD="$value" ;;
-          auto_ideate) AUTO_IDEATE="$value" ;;
-          max_retries) MAX_RETRIES="$value" ;;
-          memory_limit_mb) MEMORY_LIMIT_MB="$value" ;;
-          evolution_dir) 
-            echo "[WARN] evolution_dir in config is ignored - automatically inferred from config file location" >&2
-            ;;
-        esac
-      fi
-    done < "$config_file"
-  fi
 
-  # If config file is in a different directory, use that as the evolution dir
-  if [[ "$config_file" != "evolution/config.yaml" ]]; then
-    # Extract directory from config file path
-    local config_dir=$(dirname "$config_file")
-    # Use the config directory as evolution directory (including "." for current dir)
-    if [[ "$config_dir" != "" ]]; then
-      EVOLUTION_DIR="$config_dir"
-      echo "[DEBUG] Using evolution directory from config path: $EVOLUTION_DIR" >&2
-    fi
+  # 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
+
+  # Load local config
+  _load_yaml_config "$local_config_file"
+
+  # Load global config (overrides local 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

package/package.json

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