gitarsenal-cli 1.0.5 → 1.0.7

package/package.json

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

package/python/test_modalSandboxScript.py

@@ -8,6 +8,8 @@ import re
 import datetime
 import getpass
 import requests
+import secrets
+import string
 
 def handle_interactive_input(prompt, is_password=False):
     """Handle interactive input from the user with optional password masking"""
@@ -1808,6 +1810,326 @@ cd "{current_dir}"
         "sandbox_id": sandbox_id
     }
 
+
+def handle_interactive_input(prompt, is_password=False):
+    """Handle interactive input from the user with optional password masking"""
+    print("\n" + "="*60)
+    print(f"{prompt}")
+    print("="*60)
+    
+    try:
+        if is_password:
+            user_input = getpass.getpass("Input (hidden): ").strip()
+        else:
+            user_input = input("Input: ").strip()
+            
+        if not user_input:
+            print("❌ No input provided.")
+            return None
+        print("✅ Input received successfully!")
+        return user_input
+    except KeyboardInterrupt:
+        print("\n❌ Input cancelled by user.")
+        return None
+    except Exception as e:
+        print(f"❌ Error getting input: {e}")
+        return None
+
+def generate_random_password(length=16):
+    """Generate a random password for SSH access"""
+    alphabet = string.ascii_letters + string.digits + "!@#$%^&*"
+    password = ''.join(secrets.choice(alphabet) for i in range(length))
+    return password
+
+# First, add the standalone ssh_container function at the module level, before the create_modal_ssh_container function
+
+# Define a module-level ssh container function
+ssh_app = modal.App("ssh-container-app")
+
+@ssh_app.function(
+    image=modal.Image.debian_slim()
+        .apt_install(
+            "openssh-server", "sudo", "curl", "wget", "vim", "htop", "git", 
+            "python3", "python3-pip", "build-essential", "tmux", "screen", "nano",
+            "gpg", "ca-certificates", "software-properties-common"
+        )
+        .pip_install("uv")
+        .run_commands(
+            # Create SSH directory
+            "mkdir -p /var/run/sshd",
+            "mkdir -p /root/.ssh",
+            "chmod 700 /root/.ssh",
+            
+            # Configure SSH server
+            "sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config",
+            "sed -i 's/#PasswordAuthentication yes/PasswordAuthentication yes/' /etc/ssh/sshd_config",
+            "sed -i 's/#PubkeyAuthentication yes/PubkeyAuthentication yes/' /etc/ssh/sshd_config",
+            
+            # SSH keep-alive settings
+            "echo 'ClientAliveInterval 60' >> /etc/ssh/sshd_config",
+            "echo 'ClientAliveCountMax 3' >> /etc/ssh/sshd_config",
+            
+            # Generate SSH host keys
+            "ssh-keygen -A",
+            
+            # Set up a nice bash prompt
+            "echo 'export PS1=\"\\[\\e[1;32m\\]modal:\\[\\e[1;34m\\]\\w\\[\\e[0m\\]$ \"' >> /root/.bashrc",
+        ),
+    timeout=3600,  # Default 1 hour timeout
+    gpu="a10g",    # Default GPU
+    cpu=2,
+    memory=8192,
+    serialized=True,
+)
+def ssh_container_function(ssh_password, repo_url=None, repo_name=None, setup_commands=None):
+    import subprocess
+    import time
+    import os
+    
+    # Set root password
+    subprocess.run(["bash", "-c", f"echo 'root:{ssh_password}' | chpasswd"], check=True)
+    
+    # Start SSH service
+    subprocess.run(["service", "ssh", "start"], check=True)
+    
+    # Setup environment
+    os.environ['PS1'] = r'\[\e[1;32m\]modal:\[\e[1;34m\]\w\[\e[0m\]$ '
+    
+    # Clone repository if provided
+    if repo_url:
+        repo_name_from_url = repo_name or repo_url.split('/')[-1].replace('.git', '')
+        print(f"📥 Cloning repository: {repo_url}")
+        
+        try:
+            subprocess.run(["git", "clone", repo_url], check=True, cwd="/root")
+            print(f"✅ Repository cloned successfully: {repo_name_from_url}")
+            
+            # Change to repository directory
+            repo_dir = f"/root/{repo_name_from_url}"
+            if os.path.exists(repo_dir):
+                os.chdir(repo_dir)
+                print(f"📂 Changed to repository directory: {repo_dir}")
+            
+        except subprocess.CalledProcessError as e:
+            print(f"❌ Failed to clone repository: {e}")
+    
+    # Run setup commands if provided
+    if setup_commands:
+        print(f"⚙️ Running {len(setup_commands)} setup commands...")
+        for i, cmd in enumerate(setup_commands, 1):
+            print(f"📋 Executing command {i}/{len(setup_commands)}: {cmd}")
+            try:
+                result = subprocess.run(cmd, shell=True, check=True, 
+                                      capture_output=True, text=True)
+                if result.stdout:
+                    print(f"✅ Output: {result.stdout}")
+            except subprocess.CalledProcessError as e:
+                print(f"❌ Command failed: {e}")
+                if e.stderr:
+                    print(f"❌ Error: {e.stderr}")
+    
+    # Get container info
+    print("🔍 Container started successfully!")
+    print(f"🆔 Container ID: {os.environ.get('MODAL_TASK_ID', 'unknown')}")
+    
+    # Keep the container running
+    while True:
+        time.sleep(30)
+        # Check if SSH service is still running
+        try:
+            subprocess.run(["service", "ssh", "status"], check=True, 
+                         capture_output=True)
+        except subprocess.CalledProcessError:
+            print("⚠️ SSH service stopped, restarting...")
+            subprocess.run(["service", "ssh", "start"], check=True)
+
+# Now modify the create_modal_ssh_container function to use the standalone ssh_container_function
+
+def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_commands=None, 
+                               volume_name=None, timeout_minutes=60, ssh_password=None):
+    """Create a Modal SSH container with GPU support"""
+    
+    # Generate a unique app name with timestamp to avoid conflicts
+    timestamp = datetime.datetime.now().strftime("%Y%m%d-%H%M%S")
+    app_name = f"ssh-container-{timestamp}"
+    
+    gpu_configs = {
+        'A10G': {'gpu': 'a10g', 'memory': 24},
+        'A100': {'gpu': 'a100', 'memory': 40},
+        'H100': {'gpu': 'h100', 'memory': 80},
+        'T4': {'gpu': 't4', 'memory': 16},
+        'V100': {'gpu': 'v100', 'memory': 16}
+    }
+    
+    if gpu_type not in gpu_configs:
+        print(f"⚠️ Unknown GPU type: {gpu_type}. Using A10G as default.")
+        gpu_type = 'A10G'
+    
+    gpu_spec = gpu_configs[gpu_type]
+    print(f"🚀 Creating Modal SSH container with {gpu_spec['gpu']} GPU ({gpu_spec['memory']}GB VRAM)")
+    
+    # Generate or use provided SSH password
+    if not ssh_password:
+        ssh_password = generate_random_password()
+        print(f"🔐 Generated SSH password: {ssh_password}")
+    
+    # Setup volume if specified
+    volume = None
+    volume_mount_path = "/persistent"
+    
+    if volume_name:
+        print(f"📦 Setting up volume: {volume_name}")
+        try:
+            volume = modal.Volume.from_name(volume_name, create_if_missing=True)
+            print(f"✅ Volume '{volume_name}' ready for use")
+        except Exception as e:
+            print(f"⚠️ Could not setup volume '{volume_name}': {e}")
+            print("⚠️ Continuing without persistent volume")
+            volume = None
+    else:
+        # Create a default volume for this session
+        default_volume_name = f"ssh-vol-{timestamp}"
+        print(f"📦 Creating default volume: {default_volume_name}")
+        try:
+            volume = modal.Volume.from_name(default_volume_name, create_if_missing=True)
+            volume_name = default_volume_name
+            print(f"✅ Default volume '{default_volume_name}' created")
+        except Exception as e:
+            print(f"⚠️ Could not create default volume: {e}")
+            print("⚠️ Continuing without persistent volume")
+            volume = None
+
+    # Create Modal app
+    with modal.enable_output():
+        print(f"🚀 Creating Modal app: {app_name}")
+        
+        # Configure the global ssh_container_function with the correct parameters
+        global ssh_container_function
+        
+        # Update the function's configuration with our specific needs
+        ssh_container_function = ssh_container_function.update(
+            gpu=gpu_spec['gpu'],
+            timeout=timeout_minutes * 60,
+            volumes={volume_mount_path: volume} if volume else None
+        )
+        
+        # Start the container
+        print("🚀 Starting SSH container...")
+        
+        # Use spawn to run the container in the background
+        container_handle = ssh_container_function.spawn(ssh_password, repo_url, repo_name, setup_commands)
+        
+        # Wait a moment for the container to start
+        print("⏳ Waiting for container to initialize...")
+        time.sleep(10)
+        
+        # Get container information
+        try:
+            # Try to get the container ID from Modal
+            container_id = None
+            
+            # Get container list to find our container
+            print("🔍 Looking for container information...")
+            result = subprocess.run(["modal", "container", "list", "--json"], 
+                                  capture_output=True, text=True)
+            
+            if result.returncode == 0:
+                try:
+                    containers = json.loads(result.stdout)
+                    if containers and isinstance(containers, list):
+                        # Find the most recent container
+                        for container in containers:
+                            if container.get("App") == "ssh-container-app":
+                                container_id = container.get("Container ID")
+                                break
+                        
+                        if not container_id and containers:
+                            # Fall back to the first container
+                            container_id = containers[0].get("Container ID")
+                            
+                except json.JSONDecodeError:
+                    pass
+            
+            if not container_id:
+                # Try text parsing
+                result = subprocess.run(["modal", "container", "list"], 
+                                      capture_output=True, text=True)
+                if result.returncode == 0:
+                    lines = result.stdout.split('\n')
+                    for line in lines:
+                        if "ssh-container-app" in line or ('ta-' in line and '│' in line):
+                            parts = line.split('│')
+                            if len(parts) >= 2:
+                                possible_id = parts[1].strip()
+                                if possible_id.startswith('ta-'):
+                                    container_id = possible_id
+                                    break
+            
+            if container_id:
+                print(f"📋 Container ID: {container_id}")
+                
+                # Get the external IP for SSH access
+                print("🔍 Getting container connection info...")
+                
+                # Try to get SSH connection details
+                try:
+                    # Modal containers typically expose SSH on port 22
+                    ssh_info = f"ssh root@{container_id}.modal.run"
+                    
+                    print("\n" + "="*80)
+                    print("🚀 SSH CONTAINER READY!")
+                    print("="*80)
+                    print(f"🆔 Container ID: {container_id}")
+                    print(f"🔐 SSH Password: {ssh_password}")
+                    print(f"📱 App Name: ssh-container-app")
+                    if volume:
+                        print(f"💾 Volume: {volume_name} (mounted at {volume_mount_path})")
+                    print("\n🔗 SSH Connection:")
+                    print(f"   {ssh_info}")
+                    print(f"   Password: {ssh_password}")
+                    print("\n💡 Alternative connection methods:")
+                    print(f"   modal container exec --pty {container_id} bash")
+                    print(f"   modal shell {container_id}")
+                    print("="*80)
+                    
+                    # Try to open SSH connection in a new terminal
+                    try:
+                        terminal_script = f'''
+                        tell application "Terminal"
+                            do script "echo 'Connecting to Modal SSH container...'; echo 'Password: {ssh_password}'; {ssh_info}"
+                            activate
+                        end tell
+                        '''
+                        
+                        subprocess.run(['osascript', '-e', terminal_script], 
+                                      capture_output=True, text=True, timeout=30)
+                        print("✅ New terminal window opened with SSH connection")
+                        
+                    except Exception as e:
+                        print(f"⚠️ Could not open terminal window: {e}")
+                        print("📝 You can manually connect using the SSH command above")
+                    
+                except Exception as e:
+                    print(f"⚠️ Error getting SSH connection info: {e}")
+                    print("📝 You can connect using:")
+                    print(f"   modal container exec --pty {container_id} bash")
+            else:
+                print("⚠️ Could not determine container ID")
+                print("📝 Check running containers with: modal container list")
+        
+        except Exception as e:
+            print(f"❌ Error getting container information: {e}")
+        
+        # Return container information
+        return {
+            "container_handle": container_handle,
+            "container_id": container_id,
+            "app_name": "ssh-container-app",
+            "ssh_password": ssh_password,
+            "volume_name": volume_name,
+            "volume_mount_path": volume_mount_path if volume else None
+        }
+
 def fetch_setup_commands_from_api(repo_url):
     """Fetch setup commands from the GitIngest API using real repository analysis."""
     import tempfile
@@ -2157,7 +2479,7 @@ if __name__ == "__main__":
     # Parse command line arguments when script is run directly
     import argparse
     
-    parser = argparse.ArgumentParser(description='Create a Modal sandbox with GPU')
+    parser = argparse.ArgumentParser(description='Create a Modal SSH container with GPU')
     parser.add_argument('--gpu', type=str, default='A10G', help='GPU type (default: A10G)')
     parser.add_argument('--repo-url', type=str, help='Repository URL to clone')
     parser.add_argument('--repo-name', type=str, help='Repository name override')
@@ -2167,6 +2489,8 @@ if __name__ == "__main__":
     parser.add_argument('--setup-script', type=str, help='Path to bash script containing setup commands')
     parser.add_argument('--working-dir', type=str, help='Working directory for the setup script')
     parser.add_argument('--volume-name', type=str, help='Name of the Modal volume for persistent storage')
+    parser.add_argument('--timeout', type=int, default=60, help='Container timeout in minutes (default: 60)')
+    parser.add_argument('--ssh-password', type=str, help='SSH password (random if not provided)')
     parser.add_argument('--use-api', action='store_true', help='Fetch setup commands from API')
     
     args = parser.parse_args()
@@ -2207,6 +2531,7 @@ if __name__ == "__main__":
         for i, cmd in enumerate(setup_commands, 1):
             print(f"  {i}. {cmd}")
             
+    # Load commands from file if specified
     if args.commands_file and os.path.exists(args.commands_file):
         try:
             with open(args.commands_file, 'r') as f:
@@ -2257,7 +2582,7 @@ if __name__ == "__main__":
             working_dir = args.working_dir or os.getcwd()
             print(f"📂 Using working directory: {working_dir}")
             
-            # Execute the script directly instead of through sandbox
+            # Execute the script directly instead of through container
             try:
                 print(f"🔄 Executing script directly: bash {args.setup_script} {working_dir}")
                 result = subprocess.run(['bash', args.setup_script, working_dir], 
@@ -2276,9 +2601,9 @@ if __name__ == "__main__":
                 setup_commands = []
             except Exception as e:
                 print(f"❌ Failed to execute script: {e}")
-                # Fall back to running the script through sandbox
+                # Fall back to running the script through container
                 setup_commands = [f"bash {args.setup_script} {working_dir}"]
-                print("🔄 Falling back to running script through sandbox")
+                print("🔄 Falling back to running script through container")
         else:
             print(f"❌ Script not found at: {args.setup_script}")
             # Try to find the script in common locations
@@ -2301,32 +2626,34 @@ if __name__ == "__main__":
                 setup_commands = []
     
     try:
-        result = create_modal_sandbox(
-            args.gpu, 
-            args.repo_url, 
-            args.repo_name, 
+        result = create_modal_ssh_container(
+            args.gpu,
+            args.repo_url,
+            args.repo_name,
             setup_commands,
-            getattr(args, 'volume_name', None)
+            getattr(args, 'volume_name', None),
+            args.timeout,
+            args.ssh_password
         )
         
-        print("\n⏳ Keeping the sandbox alive. Press Ctrl+C to exit (sandbox will continue running)...")
+        print("\n⏳ Keeping the SSH container alive. Press Ctrl+C to exit (container will continue running)...")
         try:
             while True:
                 time.sleep(90)
                 print(".", end="", flush=True)
         except KeyboardInterrupt:
-            print("\n👋 Script exited. The sandbox will continue running.")
+            print("\n👋 Script exited. The SSH container will continue running.")
             if 'result' in locals() and result:
                 container_id = None
-                # Try to get container ID from the result dictionary
+                ssh_password = None
+                
+                # Try to get container ID and SSH password from the result dictionary
                 if isinstance(result, dict):
-                    # The container ID might be stored in execution_history or elsewhere
-                    # Let's try to find it in the current_dir which might contain it
-                    current_dir = result.get('current_dir', '')
-                    if 'container_id' in result:
-                        container_id = result['container_id']
-                    elif hasattr(result, 'container_id'):
-                        container_id = result.container_id
+                    container_id = result.get('container_id')
+                    ssh_password = result.get('ssh_password')
+                elif hasattr(result, 'container_id'):
+                    container_id = result.container_id
+                    ssh_password = getattr(result, 'ssh_password', None)
                 
                 # If we still don't have the container ID, try to read it from the file
                 if not container_id:
@@ -2338,66 +2665,63 @@ if __name__ == "__main__":
                         print(f"⚠️ Could not read container ID from file: {e}")
                 
                 if container_id:
-                    print(f"🚀 Starting shell in container: {container_id}")
-                    
-                    # First try to open a new terminal window
-                    terminal_script = f'''
-                    tell application "Terminal"
-                        do script "modal shell {container_id}"
-                        activate
-                    end tell
-                    '''
+                    print(f"🚀 SSH connection information:")
+                    print(f"   ssh root@{container_id}.modal.run")
+                    if ssh_password:
+                        print(f"   Password: {ssh_password}")
                     
+                    # Try to open a new terminal window with SSH connection
                     try:
-                        # Run osascript to open a new terminal window
+                        terminal_script = f'''
+                        tell application "Terminal"
+                            do script "echo 'Connecting to Modal SSH container...'; echo 'Password: {ssh_password or 'unknown'}'; ssh root@{container_id}.modal.run"
+                            activate
+                        end tell
+                        '''
+                        
                         subprocess.run(['osascript', '-e', terminal_script], 
                                       capture_output=True, text=True, timeout=30)
-                        print("✅ New terminal window opened successfully")
+                        print("✅ New terminal window opened with SSH connection")
+                        
                     except Exception as e:
                         print(f"⚠️ Failed to open terminal window: {e}")
                         
-                        # Try alternative approach with iTerm2 if Terminal failed
-                        print("🔄 Trying with iTerm2 instead...")
-                        iterm_script = f'''
-                        tell application "iTerm"
-                            create window with default profile
-                            tell current session of current window
-                                write text "modal shell {container_id}"
-                            end tell
-                        end tell
-                        '''
-                        
+                        # Try alternative approach with iTerm2
                         try:
-                            iterm_result = subprocess.run(['osascript', '-e', iterm_script], 
-                                                      capture_output=True, text=True, timeout=30)
-                            print("✅ New iTerm2 window opened successfully")
+                            iterm_script = f'''
+                            tell application "iTerm" 
+                                create window with default profile
+                                tell current session of current window
+                                    write text "echo 'Connecting to Modal SSH container...'; echo 'Password: {ssh_password or 'unknown'}'; ssh root@{container_id}.modal.run"
+                                end tell
+                            end tell
+                            '''
+                            
+                            subprocess.run(['osascript', '-e', iterm_script], 
+                                          capture_output=True, text=True, timeout=30)
+                            print("✅ New iTerm2 window opened with SSH connection")
+                            
                         except Exception as e2:
-                            # As a last resort, try to run the modal shell command directly
                             print(f"⚠️ Failed to open iTerm2 window: {e2}")
-                            print("🔄 Trying direct modal shell command...")
-                            
-                            try:
-                                # Execute modal shell command directly without any flags
-                                shell_cmd = f"modal shell {container_id}"
-                                print(f"🔄 Executing: {shell_cmd}")
-                                subprocess.run(shell_cmd, shell=True)
-                                print("✅ Shell session completed")
-                            except Exception as e3:
-                                print(f"❌ Error starting shell: {e3}")
-                                print("📝 You can manually connect using:")
-                                print(f"   modal shell {container_id}")
+                            print("📝 You can manually connect using:")
+                            print(f"   ssh root@{container_id}.modal.run")
+                            if ssh_password:
+                                print(f"   Password: {ssh_password}")
+                            print("   Or use Modal exec:")
+                            print(f"   modal container exec --pty {container_id} bash")
                 else:
                     print("⚠️ Could not determine container ID")
                     print("📝 You can manually connect using:")
                     print("   modal container list")
-                    print("   modal shell <CONTAINER_ID>")
+                    print("   modal container exec --pty <CONTAINER_ID> bash")
             
             # Exit cleanly
             sys.exit(0)
+            
     except KeyboardInterrupt:
-        # Handle Ctrl+C during sandbox creation
-        print("\n👋 Script interrupted during sandbox creation.")
-        print("📝 You may need to check if a sandbox was created with: modal sandbox list")
+        # Handle Ctrl+C during container creation
+        print("\n👋 Script interrupted during container creation.")
+        print("📝 You may need to check if a container was created with: modal container list")
         sys.exit(0)
     except Exception as e:
         print(f"❌ Error: {e}")

package/test_modalSandboxScript.py

@@ -8,6 +8,8 @@ import re
 import datetime
 import getpass
 import requests
+import secrets
+import string
 
 def handle_interactive_input(prompt, is_password=False):
     """Handle interactive input from the user with optional password masking"""
@@ -1808,6 +1810,324 @@ cd "{current_dir}"
         "sandbox_id": sandbox_id
     }
 
+
+def handle_interactive_input(prompt, is_password=False):
+    """Handle interactive input from the user with optional password masking"""
+    print("\n" + "="*60)
+    print(f"{prompt}")
+    print("="*60)
+    
+    try:
+        if is_password:
+            user_input = getpass.getpass("Input (hidden): ").strip()
+        else:
+            user_input = input("Input: ").strip()
+            
+        if not user_input:
+            print("❌ No input provided.")
+            return None
+        print("✅ Input received successfully!")
+        return user_input
+    except KeyboardInterrupt:
+        print("\n❌ Input cancelled by user.")
+        return None
+    except Exception as e:
+        print(f"❌ Error getting input: {e}")
+        return None
+
+def generate_random_password(length=16):
+    """Generate a random password for SSH access"""
+    alphabet = string.ascii_letters + string.digits + "!@#$%^&*"
+    password = ''.join(secrets.choice(alphabet) for i in range(length))
+    return password
+
+
+
+def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_commands=None, 
+                               volume_name=None, timeout_minutes=60, ssh_password=None):
+    """Create a Modal SSH container with GPU support"""
+    
+    # Generate a unique app name with timestamp to avoid conflicts
+    timestamp = datetime.datetime.now().strftime("%Y%m%d-%H%M%S")
+    app_name = f"ssh-container-{timestamp}"
+    
+    gpu_configs = {
+        'A10G': {'gpu': 'a10g', 'memory': 24},
+        'A100': {'gpu': 'a100', 'memory': 40},
+        'H100': {'gpu': 'h100', 'memory': 80},
+        'T4': {'gpu': 't4', 'memory': 16},
+        'V100': {'gpu': 'v100', 'memory': 16}
+    }
+    
+    if gpu_type not in gpu_configs:
+        print(f"⚠️ Unknown GPU type: {gpu_type}. Using A10G as default.")
+        gpu_type = 'A10G'
+    
+    gpu_spec = gpu_configs[gpu_type]
+    print(f"🚀 Creating Modal SSH container with {gpu_spec['gpu']} GPU ({gpu_spec['memory']}GB VRAM)")
+    
+    # Generate or use provided SSH password
+    if not ssh_password:
+        ssh_password = generate_random_password()
+        print(f"🔐 Generated SSH password: {ssh_password}")
+    
+    # Setup volume if specified
+    volume = None
+    volume_mount_path = "/persistent"
+    
+    if volume_name:
+        print(f"📦 Setting up volume: {volume_name}")
+        try:
+            volume = modal.Volume.from_name(volume_name, create_if_missing=True)
+            print(f"✅ Volume '{volume_name}' ready for use")
+        except Exception as e:
+            print(f"⚠️ Could not setup volume '{volume_name}': {e}")
+            print("⚠️ Continuing without persistent volume")
+            volume = None
+    else:
+        # Create a default volume for this session
+        default_volume_name = f"ssh-vol-{timestamp}"
+        print(f"📦 Creating default volume: {default_volume_name}")
+        try:
+            volume = modal.Volume.from_name(default_volume_name, create_if_missing=True)
+            volume_name = default_volume_name
+            print(f"✅ Default volume '{default_volume_name}' created")
+        except Exception as e:
+            print(f"⚠️ Could not create default volume: {e}")
+            print("⚠️ Continuing without persistent volume")
+            volume = None
+
+    # Create SSH-enabled image
+    ssh_image = (
+        modal.Image.debian_slim()
+        .apt_install(
+            "openssh-server", "sudo", "curl", "wget", "vim", "htop", "git", 
+            "python3", "python3-pip", "build-essential", "tmux", "screen", "nano",
+            "gpg", "ca-certificates", "software-properties-common"
+        )
+        .pip_install("uv")  # Fast Python package installer
+        .run_commands(
+            # Create SSH directory
+            "mkdir -p /var/run/sshd",
+            "mkdir -p /root/.ssh",
+            "chmod 700 /root/.ssh",
+            
+            # Configure SSH server
+            "sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config",
+            "sed -i 's/#PasswordAuthentication yes/PasswordAuthentication yes/' /etc/ssh/sshd_config",
+            "sed -i 's/#PubkeyAuthentication yes/PubkeyAuthentication yes/' /etc/ssh/sshd_config",
+            
+            # SSH keep-alive settings
+            "echo 'ClientAliveInterval 60' >> /etc/ssh/sshd_config",
+            "echo 'ClientAliveCountMax 3' >> /etc/ssh/sshd_config",
+            
+            # Generate SSH host keys
+            "ssh-keygen -A",
+            
+            # Set up a nice bash prompt
+            "echo 'export PS1=\"\\[\\e[1;32m\\]modal:\\[\\e[1;34m\\]\\w\\[\\e[0m\\]$ \"' >> /root/.bashrc",
+        )
+    )
+
+    # Create Modal app
+    with modal.enable_output():
+        print(f"🚀 Creating Modal app: {app_name}")
+        app = modal.App.lookup(app_name, create_if_missing=True)
+        
+        # Setup volume mount if available
+        volumes = {}
+        if volume:
+            volumes[volume_mount_path] = volume
+            print(f"📦 Mounting volume '{volume_name}' at {volume_mount_path}")
+        
+        @app.function(
+            image=ssh_image,
+            timeout=timeout_minutes * 60,  # Convert to seconds
+            gpu=gpu_spec['gpu'],
+            cpu=2,
+            memory=8192,
+            serialized=True,
+            volumes=volumes if volumes else None,
+        )
+        def ssh_container():
+            import subprocess
+            import time
+            import os
+            
+            # Set root password
+            subprocess.run(["bash", "-c", f"echo 'root:{ssh_password}' | chpasswd"], check=True)
+            
+            # Start SSH service
+            subprocess.run(["service", "ssh", "start"], check=True)
+            
+            # Setup environment
+            os.environ['PS1'] = r'\[\e[1;32m\]modal:\[\e[1;34m\]\w\[\e[0m\]$ '
+            
+            # Clone repository if provided
+            if repo_url:
+                repo_name_from_url = repo_name or repo_url.split('/')[-1].replace('.git', '')
+                print(f"📥 Cloning repository: {repo_url}")
+                
+                try:
+                    subprocess.run(["git", "clone", repo_url], check=True, cwd="/root")
+                    print(f"✅ Repository cloned successfully: {repo_name_from_url}")
+                    
+                    # Change to repository directory
+                    repo_dir = f"/root/{repo_name_from_url}"
+                    if os.path.exists(repo_dir):
+                        os.chdir(repo_dir)
+                        print(f"📂 Changed to repository directory: {repo_dir}")
+                    
+                except subprocess.CalledProcessError as e:
+                    print(f"❌ Failed to clone repository: {e}")
+            
+            # Run setup commands if provided
+            if setup_commands:
+                print(f"⚙️ Running {len(setup_commands)} setup commands...")
+                for i, cmd in enumerate(setup_commands, 1):
+                    print(f"📋 Executing command {i}/{len(setup_commands)}: {cmd}")
+                    try:
+                        result = subprocess.run(cmd, shell=True, check=True, 
+                                              capture_output=True, text=True)
+                        if result.stdout:
+                            print(f"✅ Output: {result.stdout}")
+                    except subprocess.CalledProcessError as e:
+                        print(f"❌ Command failed: {e}")
+                        if e.stderr:
+                            print(f"❌ Error: {e.stderr}")
+            
+            # Get container info
+            print("🔍 Container started successfully!")
+            print(f"🆔 Container ID: {os.environ.get('MODAL_TASK_ID', 'unknown')}")
+            
+            # Keep the container running
+            while True:
+                time.sleep(30)
+                # Check if SSH service is still running
+                try:
+                    subprocess.run(["service", "ssh", "status"], check=True, 
+                                 capture_output=True)
+                except subprocess.CalledProcessError:
+                    print("⚠️ SSH service stopped, restarting...")
+                    subprocess.run(["service", "ssh", "start"], check=True)
+        
+        # Start the container
+        print("🚀 Starting SSH container...")
+        
+        # Use spawn to run the container in the background
+        container_handle = ssh_container.spawn()
+        
+        # Wait a moment for the container to start
+        print("⏳ Waiting for container to initialize...")
+        time.sleep(10)
+        
+        # Get container information
+        try:
+            # Try to get the container ID from Modal
+            container_id = None
+            
+            # Get container list to find our container
+            print("🔍 Looking for container information...")
+            result = subprocess.run(["modal", "container", "list", "--json"], 
+                                  capture_output=True, text=True)
+            
+            if result.returncode == 0:
+                try:
+                    containers = json.loads(result.stdout)
+                    if containers and isinstance(containers, list):
+                        # Find the most recent container
+                        for container in containers:
+                            if container.get("App") == app_name:
+                                container_id = container.get("Container ID")
+                                break
+                        
+                        if not container_id and containers:
+                            # Fall back to the first container
+                            container_id = containers[0].get("Container ID")
+                            
+                except json.JSONDecodeError:
+                    pass
+            
+            if not container_id:
+                # Try text parsing
+                result = subprocess.run(["modal", "container", "list"], 
+                                      capture_output=True, text=True)
+                if result.returncode == 0:
+                    lines = result.stdout.split('\n')
+                    for line in lines:
+                        if app_name in line or ('ta-' in line and '│' in line):
+                            parts = line.split('│')
+                            if len(parts) >= 2:
+                                possible_id = parts[1].strip()
+                                if possible_id.startswith('ta-'):
+                                    container_id = possible_id
+                                    break
+            
+            if container_id:
+                print(f"📋 Container ID: {container_id}")
+                
+                # Get the external IP for SSH access
+                print("🔍 Getting container connection info...")
+                
+                # Try to get SSH connection details
+                try:
+                    # Modal containers typically expose SSH on port 22
+                    ssh_info = f"ssh root@{container_id}.modal.run"
+                    
+                    print("\n" + "="*80)
+                    print("🚀 SSH CONTAINER READY!")
+                    print("="*80)
+                    print(f"🆔 Container ID: {container_id}")
+                    print(f"🔐 SSH Password: {ssh_password}")
+                    print(f"📱 App Name: {app_name}")
+                    if volume:
+                        print(f"💾 Volume: {volume_name} (mounted at {volume_mount_path})")
+                    print("\n🔗 SSH Connection:")
+                    print(f"   {ssh_info}")
+                    print(f"   Password: {ssh_password}")
+                    print("\n💡 Alternative connection methods:")
+                    print(f"   modal container exec --pty {container_id} bash")
+                    print(f"   modal shell {container_id}")
+                    print("="*80)
+                    
+                    # Try to open SSH connection in a new terminal
+                    try:
+                        terminal_script = f'''
+                        tell application "Terminal"
+                            do script "echo 'Connecting to Modal SSH container...'; echo 'Password: {ssh_password}'; {ssh_info}"
+                            activate
+                        end tell
+                        '''
+                        
+                        subprocess.run(['osascript', '-e', terminal_script], 
+                                      capture_output=True, text=True, timeout=30)
+                        print("✅ New terminal window opened with SSH connection")
+                        
+                    except Exception as e:
+                        print(f"⚠️ Could not open terminal window: {e}")
+                        print("📝 You can manually connect using the SSH command above")
+                    
+                except Exception as e:
+                    print(f"⚠️ Error getting SSH connection info: {e}")
+                    print("📝 You can connect using:")
+                    print(f"   modal container exec --pty {container_id} bash")
+            else:
+                print("⚠️ Could not determine container ID")
+                print("📝 Check running containers with: modal container list")
+        
+        except Exception as e:
+            print(f"❌ Error getting container information: {e}")
+        
+        # Return container information
+        return {
+            "container_handle": container_handle,
+            "container_id": container_id,
+            "app_name": app_name,
+            "ssh_password": ssh_password,
+            "volume_name": volume_name,
+            "volume_mount_path": volume_mount_path if volume else None
+        }
+
 def fetch_setup_commands_from_api(repo_url):
     """Fetch setup commands from the GitIngest API using real repository analysis."""
     import tempfile
@@ -2157,7 +2477,7 @@ if __name__ == "__main__":
     # Parse command line arguments when script is run directly
     import argparse
     
-    parser = argparse.ArgumentParser(description='Create a Modal sandbox with GPU')
+    parser = argparse.ArgumentParser(description='Create a Modal SSH container with GPU')
     parser.add_argument('--gpu', type=str, default='A10G', help='GPU type (default: A10G)')
     parser.add_argument('--repo-url', type=str, help='Repository URL to clone')
     parser.add_argument('--repo-name', type=str, help='Repository name override')
@@ -2167,6 +2487,8 @@ if __name__ == "__main__":
     parser.add_argument('--setup-script', type=str, help='Path to bash script containing setup commands')
     parser.add_argument('--working-dir', type=str, help='Working directory for the setup script')
     parser.add_argument('--volume-name', type=str, help='Name of the Modal volume for persistent storage')
+    parser.add_argument('--timeout', type=int, default=60, help='Container timeout in minutes (default: 60)')
+    parser.add_argument('--ssh-password', type=str, help='SSH password (random if not provided)')
     parser.add_argument('--use-api', action='store_true', help='Fetch setup commands from API')
     
     args = parser.parse_args()
@@ -2207,6 +2529,7 @@ if __name__ == "__main__":
         for i, cmd in enumerate(setup_commands, 1):
             print(f"  {i}. {cmd}")
             
+    # Load commands from file if specified
     if args.commands_file and os.path.exists(args.commands_file):
         try:
             with open(args.commands_file, 'r') as f:
@@ -2257,7 +2580,7 @@ if __name__ == "__main__":
             working_dir = args.working_dir or os.getcwd()
             print(f"📂 Using working directory: {working_dir}")
             
-            # Execute the script directly instead of through sandbox
+            # Execute the script directly instead of through container
             try:
                 print(f"🔄 Executing script directly: bash {args.setup_script} {working_dir}")
                 result = subprocess.run(['bash', args.setup_script, working_dir], 
@@ -2276,9 +2599,9 @@ if __name__ == "__main__":
                 setup_commands = []
             except Exception as e:
                 print(f"❌ Failed to execute script: {e}")
-                # Fall back to running the script through sandbox
+                # Fall back to running the script through container
                 setup_commands = [f"bash {args.setup_script} {working_dir}"]
-                print("🔄 Falling back to running script through sandbox")
+                print("🔄 Falling back to running script through container")
         else:
             print(f"❌ Script not found at: {args.setup_script}")
             # Try to find the script in common locations
@@ -2301,54 +2624,103 @@ if __name__ == "__main__":
                 setup_commands = []
     
     try:
-        result = create_modal_sandbox(
-            args.gpu, 
-            args.repo_url, 
-            args.repo_name, 
+        result = create_modal_ssh_container(
+            args.gpu,
+            args.repo_url,
+            args.repo_name,
             setup_commands,
-            getattr(args, 'volume_name', None)
+            getattr(args, 'volume_name', None),
+            args.timeout,
+            args.ssh_password
         )
         
-        print("\n⏳ Keeping the sandbox alive. Press Ctrl+C to exit (sandbox will continue running)...")
-        while True:
-            time.sleep(90)
-            print(".", end="", flush=True)
-    except KeyboardInterrupt:
-        print("\n👋 Script exited. The sandbox will continue running.")
-        if 'result' in locals() and result:
-            container_id = None
-            # Try to get container ID from the result dictionary
-            if isinstance(result, dict):
-                # The container ID might be stored in execution_history or elsewhere
-                # Let's try to find it in the current_dir which might contain it
-                current_dir = result.get('current_dir', '')
-                if 'container_id' in result:
-                    container_id = result['container_id']
+        print("\n⏳ Keeping the SSH container alive. Press Ctrl+C to exit (container will continue running)...")
+        try:
+            while True:
+                time.sleep(90)
+                print(".", end="", flush=True)
+        except KeyboardInterrupt:
+            print("\n👋 Script exited. The SSH container will continue running.")
+            if 'result' in locals() and result:
+                container_id = None
+                ssh_password = None
+                
+                # Try to get container ID and SSH password from the result dictionary
+                if isinstance(result, dict):
+                    container_id = result.get('container_id')
+                    ssh_password = result.get('ssh_password')
                 elif hasattr(result, 'container_id'):
                     container_id = result.container_id
+                    ssh_password = getattr(result, 'ssh_password', None)
+                
+                # If we still don't have the container ID, try to read it from the file
+                if not container_id:
+                    try:
+                        with open(os.path.expanduser("~/.modal_last_container_id"), "r") as f:
+                            container_id = f.read().strip()
+                        print(f"📋 Retrieved container ID from file: {container_id}")
+                    except Exception as e:
+                        print(f"⚠️ Could not read container ID from file: {e}")
+                
+                if container_id:
+                    print(f"🚀 SSH connection information:")
+                    print(f"   ssh root@{container_id}.modal.run")
+                    if ssh_password:
+                        print(f"   Password: {ssh_password}")
+                    
+                    # Try to open a new terminal window with SSH connection
+                    try:
+                        terminal_script = f'''
+                        tell application "Terminal"
+                            do script "echo 'Connecting to Modal SSH container...'; echo 'Password: {ssh_password or 'unknown'}'; ssh root@{container_id}.modal.run"
+                            activate
+                        end tell
+                        '''
+                        
+                        subprocess.run(['osascript', '-e', terminal_script], 
+                                      capture_output=True, text=True, timeout=30)
+                        print("✅ New terminal window opened with SSH connection")
+                        
+                    except Exception as e:
+                        print(f"⚠️ Failed to open terminal window: {e}")
+                        
+                        # Try alternative approach with iTerm2
+                        try:
+                            iterm_script = f'''
+                            tell application "iTerm"
+                                create window with default profile
+                                tell current session of current window
+                                    write text "echo 'Connecting to Modal SSH container...'; echo 'Password: {ssh_password or 'unknown'}'; ssh root@{container_id}.modal.run"
+                                end tell
+                            end tell
+                            '''
+                            
+                            subprocess.run(['osascript', '-e', iterm_script], 
+                                          capture_output=True, text=True, timeout=30)
+                            print("✅ New iTerm2 window opened with SSH connection")
+                            
+                        except Exception as e2:
+                            print(f"⚠️ Failed to open iTerm2 window: {e2}")
+                            print("📝 You can manually connect using:")
+                            print(f"   ssh root@{container_id}.modal.run")
+                            if ssh_password:
+                                print(f"   Password: {ssh_password}")
+                            print("   Or use Modal exec:")
+                            print(f"   modal container exec --pty {container_id} bash")
+                else:
+                    print("⚠️ Could not determine container ID")
+                    print("📝 You can manually connect using:")
+                    print("   modal container list")
+                    print("   modal container exec --pty <CONTAINER_ID> bash")
             
-            # If we still don't have the container ID, try to read it from the file
-            if not container_id:
-                try:
-                    with open(os.path.expanduser("~/.modal_last_container_id"), "r") as f:
-                        container_id = f.read().strip()
-                    print(f"📋 Retrieved container ID from file: {container_id}")
-                except Exception as e:
-                    print(f"⚠️ Could not read container ID from file: {e}")
+            # Exit cleanly
+            sys.exit(0)
             
-            if container_id:
-                print(f"🚀 Starting shell in container: {container_id}")
-                try:
-                    # Execute the modal shell command directly
-                    shell_cmd = f"modal shell {container_id}"
-                    print(f"🔄 Executing: {shell_cmd}")
-                    subprocess.run(shell_cmd, shell=True)
-                except Exception as e:
-                    print(f"❌ Error starting shell: {e}")
-                    print(f"📝 You can manually connect using:")
-                    print(f"   modal shell {container_id}")
-            else:
-                print("⚠️ Could not determine container ID")
-                print("📝 You can manually connect using:")
-                print("   modal container list")
-                print("   modal shell <CONTAINER_ID>")
+    except KeyboardInterrupt:
+        # Handle Ctrl+C during container creation
+        print("\n👋 Script interrupted during container creation.")
+        print("📝 You may need to check if a container was created with: modal container list")
+        sys.exit(0)
+    except Exception as e:
+        print(f"❌ Error: {e}")
+        sys.exit(1)