gitarsenal-cli 1.4.5 → 1.4.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gitarsenal-cli",
-  "version": "1.4.5",
+  "version": "1.4.6",
   "description": "CLI tool for creating Modal sandboxes with GitHub repositories",
   "main": "index.js",
   "bin": {

package/python/test_modalSandboxScript.py

@@ -720,85 +720,85 @@ Do not provide any explanations, just the exact command to run.
         print(f"❌ All model attempts failed. Last error: {last_error}")
         return None
     
-            # Process the response
-        try:
-            fix_command = result["choices"][0]["message"]["content"].strip()
-            
-            # Save the original response for debugging
-            original_response = fix_command
+    # Process the response
+    try:
+        fix_command = result["choices"][0]["message"]["content"].strip()
+        
+        # Save the original response for debugging
+        original_response = fix_command
+        
+        # Extract just the command if it's wrapped in backticks or explanation
+        if "```" in fix_command:
+            # Extract content between backticks
+            import re
+            code_blocks = re.findall(r'```(?:bash|sh)?\s*(.*?)\s*```', fix_command, re.DOTALL)
+            if code_blocks:
+                fix_command = code_blocks[0].strip()
+                print(f"✅ Extracted command from code block: {fix_command}")
+        
+        # If the response still has explanatory text, try to extract just the command
+        if len(fix_command.split('\n')) > 1:
+            # First try to find lines that look like commands (start with common command prefixes)
+            command_prefixes = ['sudo', 'apt', 'pip', 'npm', 'yarn', 'git', 'cd', 'mv', 'cp', 'rm', 'mkdir', 'touch', 
+                              'chmod', 'chown', 'echo', 'cat', 'python', 'python3', 'node', 'export',
+                              'curl', 'wget', 'docker', 'make', 'gcc', 'g++', 'javac', 'java',
+                              'conda', 'uv', 'poetry', 'nvm', 'rbenv', 'pyenv', 'rustup']
             
-            # Extract just the command if it's wrapped in backticks or explanation
-            if "```" in fix_command:
-                # Extract content between backticks
-                import re
-                code_blocks = re.findall(r'```(?:bash|sh)?\s*(.*?)\s*```', fix_command, re.DOTALL)
-                if code_blocks:
-                    fix_command = code_blocks[0].strip()
-                    print(f"✅ Extracted command from code block: {fix_command}")
+            # Check for lines that start with common command prefixes
+            command_lines = [line.strip() for line in fix_command.split('\n') 
+                           if any(line.strip().startswith(prefix) for prefix in command_prefixes)]
             
-            # If the response still has explanatory text, try to extract just the command
-            if len(fix_command.split('\n')) > 1:
-                # First try to find lines that look like commands (start with common command prefixes)
-                command_prefixes = ['sudo', 'apt', 'pip', 'npm', 'yarn', 'git', 'cd', 'mv', 'cp', 'rm', 'mkdir', 'touch', 
-                                  'chmod', 'chown', 'echo', 'cat', 'python', 'python3', 'node', 'export',
-                                  'curl', 'wget', 'docker', 'make', 'gcc', 'g++', 'javac', 'java',
-                                  'conda', 'uv', 'poetry', 'nvm', 'rbenv', 'pyenv', 'rustup']
-                
-                # Check for lines that start with common command prefixes
+            if command_lines:
+                # Use the first command line found
+                fix_command = command_lines[0]
+                print(f"✅ Identified command by prefix: {fix_command}")
+            else:
+                # Try to find lines that look like commands (contain common shell patterns)
+                shell_patterns = [' | ', ' > ', ' >> ', ' && ', ' || ', ' ; ', '$(',  '`', ' -y ', ' --yes ']
                 command_lines = [line.strip() for line in fix_command.split('\n') 
-                               if any(line.strip().startswith(prefix) for prefix in command_prefixes)]
+                              if any(pattern in line for pattern in shell_patterns)]
                 
                 if command_lines:
                     # Use the first command line found
                     fix_command = command_lines[0]
-                    print(f"✅ Identified command by prefix: {fix_command}")
+                    print(f"✅ Identified command by shell pattern: {fix_command}")
                 else:
-                    # Try to find lines that look like commands (contain common shell patterns)
-                    shell_patterns = [' | ', ' > ', ' >> ', ' && ', ' || ', ' ; ', '$(',  '`', ' -y ', ' --yes ']
-                    command_lines = [line.strip() for line in fix_command.split('\n') 
-                                  if any(pattern in line for pattern in shell_patterns)]
-                    
-                    if command_lines:
-                        # Use the first command line found
-                        fix_command = command_lines[0]
-                        print(f"✅ Identified command by shell pattern: {fix_command}")
-                    else:
-                        # Fall back to the shortest non-empty line as it's likely the command
-                        lines = [line.strip() for line in fix_command.split('\n') if line.strip()]
-                        if lines:
-                            # Exclude very short lines that are likely not commands
-                            valid_lines = [line for line in lines if len(line) > 5]
-                            if valid_lines:
-                                fix_command = min(valid_lines, key=len)
-                            else:
-                                fix_command = min(lines, key=len)
-                            print(f"✅ Selected shortest line as command: {fix_command}")
-            
-            # Clean up the command - remove any trailing periods or quotes
-            fix_command = fix_command.rstrip('.;"\'')
-            
-            # Remove common prefixes that LLMs sometimes add
-            prefixes_to_remove = [
-                "Run: ", "Execute: ", "Try: ", "Command: ", "Fix: ", "Solution: ",
-                "You should run: ", "You can run: ", "You need to run: "
-            ]
-            for prefix in prefixes_to_remove:
-                if fix_command.startswith(prefix):
-                    fix_command = fix_command[len(prefix):].strip()
-                    print(f"✅ Removed prefix: {prefix}")
-                    break
-            
-            # If the command is still multi-line or very long, it might not be a valid command
-            if len(fix_command.split('\n')) > 1 or len(fix_command) > 500:
-                print("⚠️ Extracted command appears invalid (multi-line or too long)")
-                print("🔍 Original response from LLM:")
-                print("-" * 60)
-                print(original_response)
-                print("-" * 60)
-                print("⚠️ Using best guess for command")
-            
-            print(f"🔧 Suggested fix: {fix_command}")
-            return fix_command
+                    # Fall back to the shortest non-empty line as it's likely the command
+                    lines = [line.strip() for line in fix_command.split('\n') if line.strip()]
+                    if lines:
+                        # Exclude very short lines that are likely not commands
+                        valid_lines = [line for line in lines if len(line) > 5]
+                        if valid_lines:
+                            fix_command = min(valid_lines, key=len)
+                        else:
+                            fix_command = min(lines, key=len)
+                        print(f"✅ Selected shortest line as command: {fix_command}")
+        
+        # Clean up the command - remove any trailing periods or quotes
+        fix_command = fix_command.rstrip('.;"\'')
+        
+        # Remove common prefixes that LLMs sometimes add
+        prefixes_to_remove = [
+            "Run: ", "Execute: ", "Try: ", "Command: ", "Fix: ", "Solution: ",
+            "You should run: ", "You can run: ", "You need to run: "
+        ]
+        for prefix in prefixes_to_remove:
+            if fix_command.startswith(prefix):
+                fix_command = fix_command[len(prefix):].strip()
+                print(f"✅ Removed prefix: {prefix}")
+                break
+        
+        # If the command is still multi-line or very long, it might not be a valid command
+        if len(fix_command.split('\n')) > 1 or len(fix_command) > 500:
+            print("⚠️ Extracted command appears invalid (multi-line or too long)")
+            print("🔍 Original response from LLM:")
+            print("-" * 60)
+            print(original_response)
+            print("-" * 60)
+            print("⚠️ Using best guess for command")
+        
+        print(f"🔧 Suggested fix: {fix_command}")
+        return fix_command
     except Exception as e:
         print(f"❌ Error processing OpenAI response: {e}")
         return None