gitarsenal-cli 1.3.11 → 1.4.1

package/package.json

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

package/python/modal_token_solution.py

@@ -29,8 +29,8 @@ try:
     print(f"✅ Using tokens from proxy server or defaults")
 except ImportError:
     # If the module is not available, use hardcoded tokens
-    TOKEN_ID = "ak-sLhYqCjkvixiYcb9LAuCHp"
-    TOKEN_SECRET = "as-fPzD0Zm0dl6IFAEkhaH9pq"  # Real token secret from fr8mafia profile
+    # TOKEN_ID = "ak-sLhYqCjkvixiYcb9LAuCHp"
+    # TOKEN_SECRET = "as-fPzD0Zm0dl6IFAEkhaH9pq"  # Real token secret from fr8mafia profile
     print(f"⚠️ Using default tokens")
 
 print("🔧 Modal Token Solution - Comprehensive Fix")

package/python/test_modalSandboxScript.py

@@ -962,6 +962,9 @@ def create_modal_sandbox(gpu_type, repo_url=None, repo_name=None, setup_commands
         When a command fails and is fixed by the LLM debugging system, the retry count
         is reset to 0, so successful fixes don't count against the maximum retry limit.
         This ensures that a command that's been fixed gets a fresh set of retry attempts.
+        
+        The debug_with_llm parameter controls whether to use OpenAI to debug failed commands.
+        By default, this is set to True to ensure all command failures are debugged.
         """
         # Use the outer scope variables
         nonlocal current_dir, execution_history, sandbox, previous_errors
@@ -1389,6 +1392,10 @@ cd "{current_dir}"
             # If command failed and we're debugging with LLM
             if debug_with_llm:
                 print("🔍 Attempting to debug the failed command with OpenAI...")
+                # Ensure we have a non-empty error message to debug
+                if not stderr_buffer.strip() and stdout_buffer.strip():
+                    print("⚠️ stderr is empty but stdout contains content, using stdout for debugging")
+                    stderr_buffer = stdout_buffer
                 
                 # Check if the command is a hanging huggingface-cli login
                 if "huggingface-cli login" in cmd_to_execute and not stderr_buffer.strip():
@@ -1426,6 +1433,36 @@ cd "{current_dir}"
                         print("✅ Successfully installed pytest, retrying original command...")
                         return run_command(cmd, show_output, retry_count + 1, max_retries)
                 
+                # Check for common errors that we can fix automatically
+                common_errors = [
+                    # Source command not found in sh shell
+                    {
+                        "pattern": "source: not found",
+                        "fix": lambda cmd: cmd.replace("source ", ". ")
+                    },
+                    # No virtual environment found for uv
+                    {
+                        "pattern": "No virtual environment found; run `uv venv`",
+                        "fix": lambda cmd: "uv venv .venv && . .venv/bin/activate && " + cmd
+                    }
+                ]
+                
+                # Check if any of the common errors match and apply automatic fix
+                for error_info in common_errors:
+                    if error_info["pattern"] in stderr_buffer:
+                        print(f"🔍 Detected common error: {error_info['pattern']}")
+                        fix_func = error_info["fix"]
+                        fixed_cmd = fix_func(cmd_to_execute)
+                        print(f"🔧 Applying automatic fix: {fixed_cmd}")
+                        
+                        # Run the fixed command
+                        fix_success, fix_stdout, fix_stderr = run_command(fixed_cmd, show_output=True, debug_with_llm=False)
+                        if fix_success:
+                            print("✅ Automatic fix succeeded!")
+                            return True, fix_stdout, ""
+                        else:
+                            print("❌ Automatic fix failed, continuing with LLM debugging")
+                
                 # Check for Python version-specific errors
                 python_version_errors = [
                     # Python 3.13 distutils issue
@@ -1898,13 +1935,29 @@ cd "{current_dir}"
             print(f"✅ Current directory verified: {verify_output.strip()}")
         
         # Execute each command individually in the repository directory within the container
+        # Set to track if we should stop execution due to critical failures
+        stop_execution = False
+        
         for i, cmd in enumerate(setup_commands, 1):
+            if stop_execution:
+                print(f"\n⚠️ Skipping command {i}/{len(setup_commands)} due to previous critical failure")
+                continue
+                
             print(f"\n📋 Executing command {i}/{len(setup_commands)} in container: {cmd}")
             
             # If this is a cd command, just run it directly
             if cmd.strip().startswith('cd '):
                 # Execute the command directly (we're already in the right directory)
                 success, stdout, stderr = run_command(cmd)
+                # If cd command fails, try to fix it before continuing
+                if not success:
+                    print(f"❌ Command failed in container: {cmd}")
+                    print(f"❌ Error: {stderr}")
+                    # Try to fix the cd command with LLM debugging
+                    print("🔄 Attempting to fix cd command before continuing...")
+                    retry_success, retry_stdout, retry_stderr = run_command(cmd, debug_with_llm=True)
+                    if not retry_success:
+                        print("⚠️ Failed to fix cd command, this may cause subsequent commands to fail")
                 continue
                 
             # For git clone commands, handle as before
@@ -1960,6 +2013,15 @@ cd "{current_dir}"
                                 print("🔍 Checking what was actually created:")
                                 run_command("find . -maxdepth 2 -name '*.git' -type d", show_output=True)
                                 run_command("ls -la", show_output=True)
+                else:
+                    print(f"❌ Command failed in container: {cmd}")
+                    print(f"❌ Error: {stderr}")
+                    # Try to fix the git clone command with LLM debugging
+                    print("🔄 Attempting to fix git clone command before continuing...")
+                    retry_success, retry_stdout, retry_stderr = run_command(cmd, debug_with_llm=True)
+                    if not retry_success:
+                        print("⚠️ Failed to fix git clone command, this may cause subsequent commands to fail")
+                        print("🔄 Continuing with next command...")
             else:
                 # For Python commands, make sure we're in the correct directory first
                 if cmd.startswith('python '):
@@ -1987,7 +2049,37 @@ cd "{current_dir}"
                 else:
                     print(f"❌ Command failed in container: {cmd}")
                     print(f"❌ Error: {stderr}")
-                    # Continue with next command even if this one failed
+                    
+                    # Try to fix the command with LLM debugging and retry up to 3 times
+                    max_fix_attempts = 3
+                    for attempt in range(max_fix_attempts):
+                        print(f"🔄 Attempting to fix command (attempt {attempt+1}/{max_fix_attempts})...")
+                        retry_success, retry_stdout, retry_stderr = run_command(cmd, debug_with_llm=True)
+                        if retry_success:
+                            print(f"✅ Command fixed and executed successfully on attempt {attempt+1}")
+                            break
+                        else:
+                            print(f"❌ Fix attempt {attempt+1} failed")
+                    
+                    if not retry_success:
+                        print("⚠️ Failed to fix command after multiple attempts")
+                        # Ask if user wants to continue with next command or abort
+                        try:
+                            continue_choice = input("Continue with next command? (y/n): ").strip().lower()
+                            if continue_choice != 'y':
+                                print("🛑 Aborting setup commands execution")
+                                stop_execution = True
+                                break
+                            print("🔄 Continuing with next command...")
+                        except:
+                            # In case we can't get user input, ask if the command is critical
+                            if "pip install" in cmd or "git clone" in cmd or "setup.py" in cmd:
+                                print("⚠️ Critical command failed and couldn't be fixed")
+                                print("⚠️ Subsequent commands likely to fail, stopping execution")
+                                stop_execution = True
+                                break
+                            else:
+                                print("⚠️ Unable to get user input, continuing with next command...")
                 
         # Show final status of the repository directory in container
         print(f"\n📂 Final directory contents in container ({repo_dir_name}):")