gitarsenal-cli 1.0.2 → 1.0.5

package/package.json

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

package/python/test_modalSandboxScript.py

@@ -2310,45 +2310,95 @@ if __name__ == "__main__":
         )
         
         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']
-                elif hasattr(result, 'container_id'):
-                    container_id = result.container_id
-            
-            # 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}")
+        try:
+            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']
+                    elif hasattr(result, 'container_id'):
+                        container_id = result.container_id
+                
+                # 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"🚀 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
+                    '''
+                    
+                    try:
+                        # Run osascript to open a new terminal window
+                        subprocess.run(['osascript', '-e', terminal_script], 
+                                      capture_output=True, text=True, timeout=30)
+                        print("✅ New terminal window opened successfully")
+                    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:
+                            iterm_result = subprocess.run(['osascript', '-e', iterm_script], 
+                                                      capture_output=True, text=True, timeout=30)
+                            print("✅ New iTerm2 window opened successfully")
+                        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}")
+                else:
+                    print("⚠️ Could not determine container ID")
+                    print("📝 You can manually connect using:")
+                    print("   modal container list")
+                    print("   modal shell <CONTAINER_ID>")
             
-            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>")
+            # 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")
+        sys.exit(0)
+    except Exception as e:
+        print(f"❌ Error: {e}")
+        sys.exit(1)

package/scripts/postinstall.js

@@ -30,6 +30,10 @@ async function postinstall() {
       if (stats.size > 5000) {
         console.log(chalk.green('✅ Found existing full Python script. Keeping it.'));
         scriptFound = true;
+        // Skip the rest of the script to avoid overwriting the existing file
+        console.log(chalk.blue('📦 GitArsenal CLI installation complete!'));
+        console.log(chalk.blue('🚀 Run "gitarsenal" to start using the CLI.'));
+        return;
       } else {
         console.log(chalk.yellow('⚠️ Existing Python script appears to be minimal. Looking for full version...'));
       }