claude-evolve 1.7.21 → 1.7.23

package/bin/claude-evolve-ideate

@@ -107,7 +107,7 @@ call_ai_for_ideation() {
 
   # Get the current row count before any modifications (from the pre-populated file with stubs)
   local original_csv_count
-  original_csv_count=$(grep -v '^[[:space:]]*$' "$temp_csv_file" | tail -n +2 | wc -l)
+  original_csv_count=$(grep -v '^[[:space:]]*$' "$temp_csv_file" | tail -n +2 | wc -l | tr -d '[:space:]')
 
   echo "[DEBUG] Pre-populated temp CSV has $original_csv_count rows (includes stub rows with placeholders)" >&2
 
@@ -152,7 +152,7 @@ call_ai_for_ideation() {
     # Check if the file was modified correctly
     if [[ -f "$temp_csv_file" ]]; then
       local new_csv_count
-      new_csv_count=$(grep -v '^[[:space:]]*$' "$temp_csv_file" | tail -n +2 | wc -l)
+      new_csv_count=$(grep -v '^[[:space:]]*$' "$temp_csv_file" | tail -n +2 | wc -l | tr -d '[:space:]')
       local added_count=$((new_csv_count - original_csv_count))
 
       echo "[DEBUG] After $model: original=$original_csv_count, new=$new_csv_count, added=$added_count" >&2
@@ -162,6 +162,9 @@ call_ai_for_ideation() {
         # Count remaining placeholders - there should be none if AI did its job
         local placeholder_count
         placeholder_count=$(grep -c "PLACEHOLDER" "$temp_csv_file" 2>/dev/null || echo "0")
+        # Strip whitespace and ensure we have a clean integer
+        placeholder_count=$(echo "$placeholder_count" | tr -d '[:space:]')
+        placeholder_count=${placeholder_count:-0}
 
         if [[ $placeholder_count -eq 0 ]]; then
           echo "[INFO] CSV modified by $model: filled $expected_count placeholder rows ✓" >&2
@@ -377,11 +380,11 @@ validate_direct_csv_modification() {
   # We need to track this before the AI runs by reading from the beginning state
   # First, get a fresh count from the current main CSV (which reflects any previous operations in this session)
   local current_original_count
-  current_original_count=$(grep -v '^[[:space:]]*$' "$FULL_CSV_PATH" | tail -n +2 | wc -l)
+  current_original_count=$(grep -v '^[[:space:]]*$' "$FULL_CSV_PATH" | tail -n +2 | wc -l | tr -d '[:space:]')
 
   # Count data rows in the modified temp CSV
   local new_count
-  new_count=$(grep -v '^[[:space:]]*$' "$temp_csv" | tail -n +2 | wc -l)
+  new_count=$(grep -v '^[[:space:]]*$' "$temp_csv" | tail -n +2 | wc -l | tr -d '[:space:]')
 
 
   # Check if AI overwrote the file instead of appending
@@ -442,7 +445,7 @@ validate_direct_csv_modification() {
   fi
   
   # Get just the new entries (skip header and existing entries)
-  local original_line_count=$(wc -l < "$FULL_CSV_PATH")
+  local original_line_count=$(wc -l < "$FULL_CSV_PATH" | tr -d '[:space:]')
   
   # Append only the new lines from temp CSV to the main CSV
   tail -n +$((original_line_count + 1)) "$temp_csv" >> "$FULL_CSV_PATH"
@@ -514,9 +517,9 @@ validate_and_apply_csv_modification_old() {
   
   # Validate the modified CSV has more entries than original
   local original_count
-  original_count=$(wc -l < "$FULL_CSV_PATH")
+  original_count=$(wc -l < "$FULL_CSV_PATH" | tr -d '[:space:]')
   local new_count
-  new_count=$(wc -l < "$temp_csv")
+  new_count=$(wc -l < "$temp_csv" | tr -d '[:space:]')
   
   
   if [[ $new_count -le $original_count ]]; then
@@ -543,7 +546,7 @@ validate_and_apply_csv_modification_old() {
   fi
   
   # Get just the new entries (skip header and existing entries)
-  local original_line_count=$(wc -l < "$FULL_CSV_PATH")
+  local original_line_count=$(wc -l < "$FULL_CSV_PATH" | tr -d '[:space:]')
   
   # Append only the new lines from temp CSV to the main CSV
   tail -n +$((original_line_count + 1)) "$temp_csv" >> "$FULL_CSV_PATH"
@@ -665,9 +668,9 @@ IMPORTANT: Output the complete modified CSV file. Do not add any explanation or
   
   # Validate the modified CSV has more entries than original
   local original_count
-  original_count=$(wc -l < "$FULL_CSV_PATH")
+  original_count=$(wc -l < "$FULL_CSV_PATH" | tr -d '[:space:]')
   local new_count
-  new_count=$(wc -l < "$temp_csv")
+  new_count=$(wc -l < "$temp_csv" | tr -d '[:space:]')
   
   
   if [[ $new_count -le $original_count ]]; then
@@ -696,7 +699,7 @@ IMPORTANT: Output the complete modified CSV file. Do not add any explanation or
   fi
   
   # Get just the new entries (skip header and existing entries)
-  local original_line_count=$(wc -l < "$FULL_CSV_PATH")
+  local original_line_count=$(wc -l < "$FULL_CSV_PATH" | tr -d '[:space:]')
   
   # Append only the new lines from temp CSV to the main CSV
   tail -n +$((original_line_count + 1)) "$temp_csv" >> "$FULL_CSV_PATH"
@@ -1007,7 +1010,7 @@ generate_novel_ideas_direct() {
 
   # Count total lines in temp CSV (including header)
   local total_lines
-  total_lines=$(wc -l < "$temp_csv")
+  total_lines=$(wc -l < "$temp_csv" | tr -d '[:space:]')
   local read_offset=$((total_lines - 25))
   if [[ $read_offset -lt 1 ]]; then
     read_offset=1
@@ -1145,7 +1148,7 @@ generate_hill_climbing_direct() {
 
   # Count total lines in temp CSV (including header)
   local total_lines
-  total_lines=$(wc -l < "$temp_csv")
+  total_lines=$(wc -l < "$temp_csv" | tr -d '[:space:]')
   local read_offset=$((total_lines - 25))
   if [[ $read_offset -lt 1 ]]; then
     read_offset=1
@@ -1274,7 +1277,7 @@ generate_structural_mutation_direct() {
 
   # Count total lines in temp CSV (including header)
   local total_lines
-  total_lines=$(wc -l < "$temp_csv")
+  total_lines=$(wc -l < "$temp_csv" | tr -d '[:space:]')
   local read_offset=$((total_lines - 25))
   if [[ $read_offset -lt 1 ]]; then
     read_offset=1
@@ -1394,7 +1397,7 @@ generate_crossover_direct() {
 
   # Count total lines in temp CSV (including header)
   local total_lines
-  total_lines=$(wc -l < "$temp_csv")
+  total_lines=$(wc -l < "$temp_csv" | tr -d '[:space:]')
   local read_offset=$((total_lines - 25))
   if [[ $read_offset -lt 1 ]]; then
     read_offset=1

package/bin/claude-evolve-ideate-py

@@ -0,0 +1,97 @@
+#!/bin/bash
+# Python-based ideation wrapper for claude-evolve
+# This is a simple wrapper that calls the Python ideation helper
+
+set -e
+
+# Load configuration to ensure paths are set up
+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"
+else
+  # Check if config.yaml exists in current directory
+  if [[ -f "config.yaml" ]]; then
+    CONFIG_FILE="$(pwd)/config.yaml"
+    load_config "$CONFIG_FILE"
+  else
+    load_config
+  fi
+fi
+
+# Setup logging to file
+if [[ -n "${FULL_EVOLUTION_DIR:-}" ]]; then
+  LOG_DIR="$FULL_EVOLUTION_DIR/logs"
+  mkdir -p "$LOG_DIR"
+  LOG_FILE="$LOG_DIR/ideate-py-$$-$(date +%Y%m%d-%H%M%S).log"
+
+  # Log to both terminal and file with timestamps
+  exec > >(while IFS= read -r line; do echo "$(date '+%Y-%m-%d %H:%M:%S'): $line"; done | tee -a "$LOG_FILE") 2>&1
+  echo "[IDEATE-PY-$$] Logging to: $LOG_FILE"
+fi
+
+# Parse arguments
+use_strategies=true
+
+while [[ $# -gt 0 ]]; do
+  case $1 in
+  --help)
+    cat <<EOF
+claude-evolve ideate (Python version) - Generate new algorithm ideas
+
+USAGE:
+  claude-evolve ideate-py [--legacy N]
+
+OPTIONS:
+  --legacy N  Use legacy mode with N ideas (ignores strategy config)
+  --help      Show this help message
+
+DESCRIPTION:
+  Python-based ideation that uses MD5 hashing to verify AI actually modified files.
+  This solves the problem where AIs claim they edited files but didn't.
+
+  Uses multi-strategy evolutionary approach:
+  - Novel exploration: Pure creativity, global search
+  - Hill climbing: Parameter tuning of top performers
+  - Structural mutation: Algorithmic changes to top performers
+  - Crossover hybrid: Combine successful approaches
+
+  Strategy distribution is configured in evolution/config.yaml
+EOF
+    exit 0
+    ;;
+  --legacy)
+    use_strategies=false
+    shift
+    if [[ $1 =~ ^[0-9]+$ ]]; then
+      export LEGACY_IDEA_COUNT=$1
+      shift
+    else
+      echo "[ERROR] --legacy requires a number" >&2
+      exit 1
+    fi
+    ;;
+  *)
+    echo "[ERROR] Unknown option: $1" >&2
+    exit 1
+    ;;
+  esac
+done
+
+# Check workspace using config
+if [[ ! -d "$FULL_EVOLUTION_DIR" ]]; then
+  echo "[ERROR] Evolution workspace not found: $FULL_EVOLUTION_DIR. Run 'claude-evolve setup' first." >&2
+  exit 1
+fi
+
+# Call Python helper
+echo "[INFO] Using Python ideation helper (more reliable AI result verification)"
+
+if [[ $use_strategies == true ]]; then
+  exec "$PYTHON_CMD" "$SCRIPT_DIR/../lib/ideation_helper.py" run
+else
+  exec "$PYTHON_CMD" "$SCRIPT_DIR/../lib/ideation_helper.py" run --legacy "$LEGACY_IDEA_COUNT"
+fi