gitarsenal-cli 1.6.12 → 1.6.14

package/lib/sandbox.js

@@ -110,8 +110,8 @@ async function runContainer(options) {
   // Log the command being executed
   console.log(chalk.dim(`\nExecuting: python ${args.join(' ')}`));
   
-  // Start the spinner
-  const spinner = ora('Launching container...').start();
+  // Run the Python script without spinner to avoid terminal interference
+  console.log(chalk.dim('Launching container...'));
   
   try {
     // Run the Python script
@@ -123,22 +123,22 @@ async function runContainer(options) {
     return new Promise((resolve, reject) => {
       pythonProcess.on('close', (code) => {
         if (code === 0) {
-          spinner.succeed('Container launched successfully');
+          console.log(chalk.green('✅ Container launched successfully'));
           resolve();
         } else {
-          spinner.fail(`Container launch failed with exit code ${code}`);
+          console.log(chalk.red(`❌ Container launch failed with exit code ${code}`));
           reject(new Error(`Process exited with code ${code}`));
         }
       });
       
       // Handle process errors
       pythonProcess.on('error', (error) => {
-        spinner.fail(`Failed to start Python process: ${error.message}`);
+        console.log(chalk.red(`❌ Failed to start Python process: ${error.message}`));
         reject(error);
       });
     });
   } catch (error) {
-    spinner.fail(`Error launching container: ${error.message}`);
+    console.log(chalk.red(`❌ Error launching container: ${error.message}`));
     throw error;
   }
 }

package/package.json

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

package/python/fix_modal_token.py

@@ -64,15 +64,15 @@ except (ImportError, ValueError) as e:
 modal_dir = Path.home() / ".modal"
 modal_dir.mkdir(exist_ok=True)
 token_file = modal_dir / "token.json"
-with open(token_file, 'w') as f:
-    f.write(f'{{"token_id": "{TOKEN_ID}", "token_secret": "{TOKEN_SECRET}"}}')
-print(f"✅ Created token file at {token_file}")
+# with open(token_file, 'w') as f:
+#     f.write(f'{{"token_id": "{TOKEN_ID}", "token_secret": "{TOKEN_SECRET}"}}')
+# print(f"✅ Created token file at {token_file}")
 
 # Create .modalconfig file
 modalconfig_file = Path.home() / ".modalconfig"
-with open(modalconfig_file, 'w') as f:
-    f.write(f"token_id = {TOKEN_ID}\n")
-    f.write(f"token_secret = {TOKEN_SECRET}\n")
+# with open(modalconfig_file, 'w') as f:
+#     f.write(f"token_id = {TOKEN_ID}\n")
+#     f.write(f"token_secret = {TOKEN_SECRET}\n")
 print(f"✅ Created .modalconfig file at {modalconfig_file}")
 
 print("\n✅ Done fixing Modal token. Please try your command again.") 

package/python/fix_modal_token_advanced.py

@@ -19,23 +19,13 @@ import inspect
 from pathlib import Path
 import time
 
-# Try to get tokens from the proxy server
-try:
-    # First, try to import the fetch_modal_tokens module
-    from fetch_modal_tokens import get_tokens
-    TOKEN_ID, TOKEN_SECRET = get_tokens()
-    # print(f"✅ Using tokens from proxy server or defaults")
-except ImportError:
-    # If the module is not available, use hardcoded tokens
-    # print(f"⚠️ Using default tokens")
-    print("")
 
 # print("🔧 Advanced Modal Token Fixer")
 
 # Approach 1: Set environment variables
 # print("\n📋 Approach 1: Setting environment variables")
-os.environ["MODAL_TOKEN_ID"] = TOKEN_ID
-os.environ["MODAL_TOKEN_SECRET"] = TOKEN_SECRET
+# os.environ["MODAL_TOKEN_ID"] = TOKEN_ID
+# os.environ["MODAL_TOKEN_SECRET"] = TOKEN_SECRET
 # print(f"✅ Set MODAL_TOKEN_ID = [HIDDEN]")
 # print(f"✅ Set MODAL_TOKEN_SECRET = [HIDDEN]")
 

package/python/test_modalSandboxScript.py

@@ -2359,6 +2359,29 @@ def get_setup_commands_from_gitingest(repo_url):
                 if commands:
                     print(f"✅ Successfully fetched {len(commands)} setup commands from API at {api_url}")
                     
+                    # Enhanced response handling for API key detection
+                    if "requiredApiKeys" in result:
+                        api_keys = result.get("requiredApiKeys", [])
+                        if api_keys:
+                            print(f"\n🔑 Required API Keys ({len(api_keys)}):")
+                            for i, api_key in enumerate(api_keys, 1):
+                                status = "🔴 Required" if api_key.get("required", False) else "🟡 Optional"
+                                print(f"  {i}. {api_key.get('name', 'Unknown')} - {status}")
+                                print(f"     Service: {api_key.get('service', 'Unknown')}")
+                                print(f"     Description: {api_key.get('description', 'No description')}")
+                                if api_key.get('example'):
+                                    print(f"     Example: {api_key.get('example')}")
+                                if api_key.get('documentation_url'):
+                                    print(f"     Docs: {api_key.get('documentation_url')}")
+                                print()
+                    
+                    # Display setup complexity if available
+                    if "setupComplexity" in result:
+                        complexity = result.get("setupComplexity", "medium")
+                        estimated_time = result.get("estimatedSetupTime", "Unknown")
+                        print(f"📊 Setup Complexity: {complexity.upper()}")
+                        print(f"⏱️  Estimated Time: {estimated_time}")
+                    
                     # Print the commands
                     print("\n📋 Setup Commands:")
                     for i, cmd in enumerate(commands, 1):

package/test_modalSandboxScript.py

@@ -2359,6 +2359,29 @@ def get_setup_commands_from_gitingest(repo_url):
                 if commands:
                     print(f"✅ Successfully fetched {len(commands)} setup commands from API at {api_url}")
                     
+                    # Enhanced response handling for API key detection
+                    if "requiredApiKeys" in result:
+                        api_keys = result.get("requiredApiKeys", [])
+                        if api_keys:
+                            print(f"\n🔑 Required API Keys ({len(api_keys)}):")
+                            for i, api_key in enumerate(api_keys, 1):
+                                status = "🔴 Required" if api_key.get("required", False) else "🟡 Optional"
+                                print(f"  {i}. {api_key.get('name', 'Unknown')} - {status}")
+                                print(f"     Service: {api_key.get('service', 'Unknown')}")
+                                print(f"     Description: {api_key.get('description', 'No description')}")
+                                if api_key.get('example'):
+                                    print(f"     Example: {api_key.get('example')}")
+                                if api_key.get('documentation_url'):
+                                    print(f"     Docs: {api_key.get('documentation_url')}")
+                                print()
+                    
+                    # Display setup complexity if available
+                    if "setupComplexity" in result:
+                        complexity = result.get("setupComplexity", "medium")
+                        estimated_time = result.get("estimatedSetupTime", "Unknown")
+                        print(f"📊 Setup Complexity: {complexity.upper()}")
+                        print(f"⏱️  Estimated Time: {estimated_time}")
+                    
                     # Print the commands
                     print("\n📋 Setup Commands:")
                     for i, cmd in enumerate(commands, 1):

package/python/test_dynamic_services.py

@@ -1,67 +0,0 @@
-#!/usr/bin/env python3
-"""
-Test script to verify dynamic service support
-"""
-
-import sys
-import os
-from gitarsenal_keys import main
-
-def test_dynamic_services():
-    print("🧪 Testing GitArsenal Dynamic Service Support")
-    print("=" * 60)
-    
-    # Test adding a new service (claude)
-    print("\n1. Testing Claude service addition...")
-    sys.argv = ['gitarsenal_keys.py', 'add', '--service', 'claude', '--key', 'sk-test-claude-key']
-    
-    try:
-        main()
-        print("✅ Claude service test completed")
-    except SystemExit as e:
-        if e.code == 0:
-            print("✅ Claude service test completed successfully")
-        else:
-            print(f"❌ Claude service test failed with exit code {e.code}")
-    
-    # Test adding another new service (custom-service)
-    print("\n2. Testing custom service addition...")
-    sys.argv = ['gitarsenal_keys.py', 'add', '--service', 'custom-service', '--key', 'custom-key-123']
-    
-    try:
-        main()
-        print("✅ Custom service test completed")
-    except SystemExit as e:
-        if e.code == 0:
-            print("✅ Custom service test completed successfully")
-        else:
-            print(f"❌ Custom service test failed with exit code {e.code}")
-    
-    # Test listing to see all services
-    print("\n3. Testing service listing...")
-    sys.argv = ['gitarsenal_keys.py', 'list']
-    
-    try:
-        main()
-        print("✅ Service listing test completed")
-    except SystemExit as e:
-        if e.code == 0:
-            print("✅ Service listing test completed successfully")
-        else:
-            print(f"❌ Service listing test failed with exit code {e.code}")
-    
-    # Test viewing a specific service
-    print("\n4. Testing service viewing...")
-    sys.argv = ['gitarsenal_keys.py', 'view', '--service', 'claude']
-    
-    try:
-        main()
-        print("✅ Service viewing test completed")
-    except SystemExit as e:
-        if e.code == 0:
-            print("✅ Service viewing test completed successfully")
-        else:
-            print(f"❌ Service viewing test failed with exit code {e.code}")
-
-if __name__ == "__main__":
-    test_dynamic_services() 

package/python/test_interactive_keys.py

@@ -1,34 +0,0 @@
-#!/usr/bin/env python3
-"""
-Test script to verify interactive key prompting functionality
-"""
-
-import sys
-import os
-from gitarsenal_keys import main
-
-def test_interactive_prompting():
-    print("🧪 Testing GitArsenal Interactive Key Prompting")
-    print("=" * 60)
-    
-    # Test that the script can be called with just service
-    print("\n1. Testing interactive prompting...")
-    print("   This should prompt for the API key when only service is provided")
-    
-    # Simulate command line arguments
-    sys.argv = ['gitarsenal_keys.py', 'add', '--service', 'huggingface']
-    
-    try:
-        # This will prompt for the key interactively
-        main()
-        print("✅ Interactive prompting test completed")
-    except SystemExit as e:
-        if e.code == 0:
-            print("✅ Interactive prompting test completed successfully")
-        else:
-            print(f"❌ Interactive prompting test failed with exit code {e.code}")
-    except Exception as e:
-        print(f"❌ Interactive prompting test failed with error: {e}")
-
-if __name__ == "__main__":
-    test_interactive_prompting()