From 10ad8aa8d5d1b39ef26892ab6bea75c9957dc872 Mon Sep 17 00:00:00 2001
From: Jose M Leon <leonj1@gmail.com>
Date: Wed, 12 Feb 2025 21:46:14 -0500
Subject: [PATCH] FIX aider flags (#89)

---
 ra_aid/tools/programmer.py      | 34 +++++++++++++++++++++++++--------
 tests/ra_aid/test_programmer.py | 31 ++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/ra_aid/tools/programmer.py b/ra_aid/tools/programmer.py
index ad68689..4d9df17 100644
--- a/ra_aid/tools/programmer.py
+++ b/ra_aid/tools/programmer.py
@@ -65,7 +65,7 @@ def run_programming_task(
 
     If new files are created, emit them after finishing.
 
-    They can add/modify files, but not remove. Use run_shell_command to remove files. If referencing files you’ll delete, remove them after they finish.
+    They can add/modify files, but not remove. Use run_shell_command to remove files. If referencing files you'll delete, remove them after they finish.
   
     Use write_file_tool instead if you need to write the entire contents of file(s).
 
@@ -163,20 +163,23 @@ def run_programming_task(
 
 
 def parse_aider_flags(aider_flags: str) -> List[str]:
-    """Parse a string of aider flags into a list of flags.
+    """Parse a string of aider flags into a list of flags and their values.
 
     Args:
         aider_flags: A string containing comma-separated flags, with or without leading dashes.
                     Can contain spaces around flags and commas.
+                    Supports flags with values (e.g. --analytics-log filename.json)
 
     Returns:
-        A list of flags with proper '--' prefix.
+        A list of flags with proper '--' prefix and their values as separate elements.
 
     Examples:
         >>> parse_aider_flags("yes-always,dark-mode")
         ['--yes-always', '--dark-mode']
         >>> parse_aider_flags("--yes-always, --dark-mode")
         ['--yes-always', '--dark-mode']
+        >>> parse_aider_flags("--analytics-log filename.json")
+        ['--analytics-log', 'filename.json']
         >>> parse_aider_flags("")
         []
     """
@@ -184,12 +187,27 @@ def parse_aider_flags(aider_flags: str) -> List[str]:
         return []
 
     # Split by comma and strip whitespace
-    flags = [flag.strip() for flag in aider_flags.split(",")]
-
-    # Add '--' prefix if not present and filter out empty flags
-    return [f"--{flag.lstrip('-')}" for flag in flags if flag.strip()]
-
+    flag_groups = [group.strip() for group in aider_flags.split(",")]
+    
+    result = []
+    for group in flag_groups:
+        if not group:
+            continue
+            
+        # Split by space to separate flag from value
+        parts = group.split()
+        
+        # Add '--' prefix to the flag if not present, stripping any extra dashes
+        flag = parts[0].lstrip("-")  # Remove all leading dashes
+        flag = f"--{flag}"  # Add exactly two dashes
+        
+        result.append(flag)
+        
+        # Add any remaining parts as separate values
+        if len(parts) > 1:
+            result.extend(parts[1:])
 
+    return result
 
 
 # Export the functions
diff --git a/tests/ra_aid/test_programmer.py b/tests/ra_aid/test_programmer.py
index 994f65b..4540cbc 100644
--- a/tests/ra_aid/test_programmer.py
+++ b/tests/ra_aid/test_programmer.py
@@ -34,6 +34,37 @@ test_cases = [
     ),
     ("--yes-always", ["--yes-always"], "single flag with dashes"),
     ("yes-always", ["--yes-always"], "single flag without dashes"),
+    # New test cases for flags with values
+    (
+        "--analytics-log filename.json",
+        ["--analytics-log", "filename.json"],
+        "flag with value",
+    ),
+    (
+        "--analytics-log filename.json, --model gpt4",
+        ["--analytics-log", "filename.json", "--model", "gpt4"],
+        "multiple flags with values",
+    ),
+    (
+        "--dark-mode, --analytics-log filename.json",
+        ["--dark-mode", "--analytics-log", "filename.json"],
+        "mix of simple flags and flags with values",
+    ),
+    (
+        "  --dark-mode  ,  --model  gpt4  ",
+        ["--dark-mode", "--model", "gpt4"],
+        "flags with values and extra whitespace",
+    ),
+    (
+        "--analytics-log    filename.json",
+        ["--analytics-log", "filename.json"],
+        "multiple spaces between flag and value",
+    ),
+    (
+        "---dark-mode,----model gpt4",
+        ["--dark-mode", "--model", "gpt4"],
+        "stripping extra dashes",
+    ),
 ]