gitarsenal-cli 1.6.11 → 1.6.13

package/bin/gitarsenal.js

@@ -60,7 +60,7 @@ const keysCmd = program
 keysCmd
   .command('add')
   .description('Add an API key')
-  .option('-s, --service <service>', 'Service name (openai, wandb, huggingface)')
+  .option('-s, --service <service>', 'Service name (any service supported)')
   .option('-k, --key <key>', 'API key (if not provided, will prompt)')
   .action(async (options) => {
     await handleKeysAdd(options);
@@ -277,15 +277,10 @@ async function handleKeysAdd(options) {
       spinner.stop();
       const serviceAnswer = await inquirer.prompt([
         {
-          type: 'list',
+          type: 'input',
           name: 'service',
-          message: 'Select service:',
-          choices: [
-            { name: 'OpenAI', value: 'openai' },
-            { name: 'Weights & Biases', value: 'wandb' },
-            { name: 'Hugging Face', value: 'huggingface' },
-            { name: 'GitArsenal OpenAI (for debugging)', value: 'gitarsenal-openai' }
-          ]
+          message: 'Enter service name:',
+          validate: (input) => input.trim() !== '' ? true : 'Service name is required'
         }
       ]);
       service = serviceAnswer.service;
@@ -377,15 +372,10 @@ async function handleKeysView(options) {
       spinner.stop();
       const serviceAnswer = await inquirer.prompt([
         {
-          type: 'list',
+          type: 'input',
           name: 'service',
-          message: 'Select service:',
-          choices: [
-            { name: 'OpenAI', value: 'openai' },
-            { name: 'Weights & Biases', value: 'wandb' },
-            { name: 'Hugging Face', value: 'huggingface' },
-            { name: 'GitArsenal OpenAI (for debugging)', value: 'gitarsenal-openai' }
-          ]
+          message: 'Enter service name:',
+          validate: (input) => input.trim() !== '' ? true : 'Service name is required'
         }
       ]);
       service = serviceAnswer.service;
@@ -426,15 +416,10 @@ async function handleKeysDelete(options) {
       spinner.stop();
       const serviceAnswer = await inquirer.prompt([
         {
-          type: 'list',
+          type: 'input',
           name: 'service',
-          message: 'Select service:',
-          choices: [
-            { name: 'OpenAI', value: 'openai' },
-            { name: 'Weights & Biases', value: 'wandb' },
-            { name: 'Hugging Face', value: 'huggingface' },
-            { name: 'GitArsenal OpenAI (for debugging)', value: 'gitarsenal-openai' }
-          ]
+          message: 'Enter service name:',
+          validate: (input) => input.trim() !== '' ? true : 'Service name is required'
         }
       ]);
       service = serviceAnswer.service;

package/package.json

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

package/python/gitarsenal_keys.py

@@ -41,23 +41,51 @@ def handle_add(credentials_manager, args):
         sys.exit(1)
     
     if not key:
-        print("❌ API key is required. Use --key option.")
-        sys.exit(1)
-    
-    # Map service names to credential keys
-    service_mapping = {
+        # Prompt for the API key interactively
+        print(f"\n🔑 {service.upper()} API KEY REQUIRED")
+        print("=" * 50)
+        
+        # Get appropriate prompt based on service
+        prompts = {
+            'openai': "Please enter your OpenAI API key:\nYou can get your API key from: https://platform.openai.com/api-keys",
+            'wandb': "Please enter your Weights & Biases API key:\nYou can get your API key from: https://wandb.ai/authorize",
+            'huggingface': "Please enter your Hugging Face token:\nYou can get your token from: https://huggingface.co/settings/tokens",
+            'gitarsenal-openai': "Please enter GitArsenal's OpenAI API key for debugging:",
+            'claude': "Please enter your Claude API key:\nYou can get your API key from: https://console.anthropic.com/"
+        }
+        
+        prompt = prompts.get(service, f"Please enter your {service} API key:")
+        print(prompt)
+        print("-" * 50)
+        
+        try:
+            import getpass
+            key = getpass.getpass("API Key (hidden): ").strip()
+            if not key:
+                print("❌ No API key provided.")
+                sys.exit(1)
+            print("✅ API key received successfully!")
+        except KeyboardInterrupt:
+            print("\n❌ API key input cancelled by user.")
+            sys.exit(1)
+        except Exception as e:
+            print(f"❌ Error getting API key: {e}")
+            sys.exit(1)
+    
+    # Generate credential key from service name
+    # Convert service name to a standardized key format
+    credential_key = f"{service.replace('-', '_')}_api_key"
+    
+    # Special mappings for backward compatibility
+    special_mappings = {
         'openai': 'openai_api_key',
         'wandb': 'wandb_api_key', 
         'huggingface': 'huggingface_token',
         'gitarsenal-openai': 'gitarsenal_openai_api_key'
     }
     
-    if service not in service_mapping:
-        print(f"❌ Unsupported service: {service}")
-        print("Supported services: openai, wandb, huggingface, gitarsenal-openai")
-        sys.exit(1)
-    
-    credential_key = service_mapping[service]
+    # Use special mapping if it exists, otherwise use generated key
+    credential_key = special_mappings.get(service, credential_key)
     
     # Save the credential
     credentials = credentials_manager.load_credentials()
@@ -82,19 +110,26 @@ def handle_list(credentials_manager):
     print("🔑 Stored API Keys:")
     print("=" * 50)
     
-    # Map credential keys to display names
+    # Map credential keys to display names (for known services)
     key_mapping = {
         'openai_api_key': 'OpenAI',
         'wandb_api_key': 'Weights & Biases',
         'huggingface_token': 'Hugging Face',
-        'gitarsenal_openai_api_key': 'GitArsenal OpenAI'
+        'gitarsenal_openai_api_key': 'GitArsenal OpenAI',
+        'claude_api_key': 'Claude'
     }
     
     for key, value in credentials.items():
+        # Generate display name from key if not in mapping
         if key in key_mapping:
             display_name = key_mapping[key]
-            masked_value = value[:8] + "*" * (len(value) - 12) + value[-4:] if len(value) > 12 else "*" * len(value)
-            print(f"  {display_name}: {masked_value}")
+        else:
+            # Convert key back to service name for display
+            service_name = key.replace('_api_key', '').replace('_token', '').replace('_', '-')
+            display_name = service_name.title()
+        
+        masked_value = value[:8] + "*" * (len(value) - 12) + value[-4:] if len(value) > 12 else "*" * len(value)
+        print(f"  {display_name}: {masked_value}")
     
     print(f"\n📁 Storage location: {credentials_manager.credentials_file}")
 
@@ -106,20 +141,19 @@ def handle_view(credentials_manager, args):
         print("❌ Service name is required. Use --service option.")
         sys.exit(1)
     
-    # Map service names to credential keys
-    service_mapping = {
+    # Generate credential key from service name
+    credential_key = f"{service.replace('-', '_')}_api_key"
+    
+    # Special mappings for backward compatibility
+    special_mappings = {
         'openai': 'openai_api_key',
         'wandb': 'wandb_api_key',
         'huggingface': 'huggingface_token',
         'gitarsenal-openai': 'gitarsenal_openai_api_key'
     }
     
-    if service not in service_mapping:
-        print(f"❌ Unsupported service: {service}")
-        print("Supported services: openai, wandb, huggingface, gitarsenal-openai")
-        sys.exit(1)
-    
-    credential_key = service_mapping[service]
+    # Use special mapping if it exists, otherwise use generated key
+    credential_key = special_mappings.get(service, credential_key)
     credentials = credentials_manager.load_credentials()
     
     if credential_key not in credentials:
@@ -141,20 +175,19 @@ def handle_delete(credentials_manager, args):
         print("❌ Service name is required. Use --service option.")
         sys.exit(1)
     
-    # Map service names to credential keys
-    service_mapping = {
+    # Generate credential key from service name
+    credential_key = f"{service.replace('-', '_')}_api_key"
+    
+    # Special mappings for backward compatibility
+    special_mappings = {
         'openai': 'openai_api_key',
         'wandb': 'wandb_api_key',
         'huggingface': 'huggingface_token',
         'gitarsenal-openai': 'gitarsenal_openai_api_key'
     }
     
-    if service not in service_mapping:
-        print(f"❌ Unsupported service: {service}")
-        print("Supported services: openai, wandb, huggingface, gitarsenal-openai")
-        sys.exit(1)
-    
-    credential_key = service_mapping[service]
+    # Use special mapping if it exists, otherwise use generated key
+    credential_key = special_mappings.get(service, credential_key)
     success = credentials_manager.clear_credential(credential_key)
     
     if success:

package/python/test_modalSandboxScript.py

@@ -418,38 +418,59 @@ def call_openai_for_debug(command, error_output, api_key=None, current_dir=None,
             except Exception as e:
                 print(f"⚠️ Could not load saved API key: {e}")
         
-        # Then try credentials manager for GitArsenal's debugging key
+        # Then try credentials manager
         if not api_key:
-            print("🔍 DEBUG: Trying credentials manager for GitArsenal's debugging key...")
+            print("🔍 DEBUG: Trying credentials manager...")
             try:
                 from credentials_manager import CredentialsManager
                 credentials_manager = CredentialsManager()
-                api_key = credentials_manager.get_gitarsenal_openai_api_key()
+                api_key = credentials_manager.get_openai_api_key()
                 if api_key:
-                    print(f"🔍 DEBUG: GitArsenal API key from credentials manager: Found")
-                    print(f"🔍 DEBUG: GitArsenal API key value: {api_key}")
+                    print(f"🔍 DEBUG: API key from credentials manager: Found")
+                    print(f"🔍 DEBUG: Credentials manager API key value: {api_key}")
                     # Set in environment for this session
                     os.environ["OPENAI_API_KEY"] = api_key
                 else:
-                    print(f"🔍 DEBUG: GitArsenal API key from credentials manager: Not found")
+                    print(f"🔍 DEBUG: API key from credentials manager: Not found")
             except ImportError as e:
                 print(f"🔍 DEBUG: Credentials manager not available: {e}")
                 # Fall back to direct input if credentials_manager is not available
                 pass
         
-        # If still no GitArsenal API key found, skip debugging
+        # Finally, prompt the user if still no API key
         if not api_key:
-            print("🔍 DEBUG: No GitArsenal API key found for debugging")
-            print("⚠️ Skipping LLM debugging - GitArsenal's API key not available")
-            return None
+            print("🔍 DEBUG: No API key found in any source, prompting user...")
+            print("\n" + "="*60)
+            print("🔑 OPENAI API KEY REQUIRED FOR DEBUGGING")
+            print("="*60)
+            print("To debug failed commands, an OpenAI API key is needed.")
+            print("📝 Please paste your OpenAI API key below:")
+            print("   (Your input will be hidden for security)")
+            print("-" * 60)
+            
+            try:
+                api_key = getpass.getpass("OpenAI API Key: ").strip()
+                if not api_key:
+                    print("❌ No API key provided. Skipping debugging.")
+                    return None
+                print("✅ API key received successfully!")
+                print(f"🔍 DEBUG: User-provided API key: {api_key}")
+                # Save the API key to environment for future use in this session
+                os.environ["OPENAI_API_KEY"] = api_key
+            except KeyboardInterrupt:
+                print("\n❌ API key input cancelled by user.")
+                return None
+            except Exception as e:
+                print(f"❌ Error getting API key: {e}")
+                return None
     
     # If we still don't have an API key, we can't proceed
     if not api_key:
-        print("❌ No GitArsenal OpenAI API key available. Cannot perform LLM debugging.")
-        print("💡 GitArsenal's debugging API key is not available")
+        print("❌ No OpenAI API key available. Cannot perform LLM debugging.")
+        print("💡 To enable LLM debugging, set the OPENAI_API_KEY environment variable")
         return None
     
-    print(f"✅ GitArsenal OpenAI API key available for debugging (length: {len(api_key)})")
+    print(f"✅ OpenAI API key available (length: {len(api_key)})")
     
     # Gather additional context to help with debugging
     directory_context = ""
@@ -2338,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):