gitarsenal-cli 1.6.14 → 1.7.1

package/package.json

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

package/python/test_modalSandboxScript.py

@@ -327,6 +327,37 @@ def handle_huggingface_login(sandbox, current_dir):
     return exit_code == 0, stdout_buffer, stderr_buffer
 
 
+def get_stored_credentials():
+    """Load stored credentials from ~/.gitarsenal/credentials.json"""
+    import json
+    from pathlib import Path
+    
+    try:
+        credentials_file = Path.home() / ".gitarsenal" / "credentials.json"
+        if credentials_file.exists():
+            with open(credentials_file, 'r') as f:
+                credentials = json.load(f)
+            return credentials
+        else:
+            return {}
+    except Exception as e:
+        print(f"⚠️ Error loading stored credentials: {e}")
+        return {}
+
+def generate_auth_context(stored_credentials):
+    """Generate simple authentication context for the OpenAI prompt"""
+    if not stored_credentials:
+        return "No stored credentials available."
+    
+    auth_context = "Available stored credentials (use actual values in commands):\n"
+    
+    for key, value in stored_credentials.items():
+        # Mask the actual value for security in logs, but provide the real value
+        masked_value = value[:8] + "..." if len(value) > 8 else "***"
+        auth_context += f"- {key}: {masked_value} (actual value: {value})\n"
+    
+    return auth_context
+
 def call_openai_for_debug(command, error_output, api_key=None, current_dir=None, sandbox=None):
     """Call OpenAI to debug a failed command and suggest a fix"""
     print("\n🔍 DEBUG: Starting LLM debugging...")
@@ -620,6 +651,9 @@ Directory contents:
         "Content-Type": "application/json",
         "Authorization": f"Bearer {api_key}"
     }
+
+    stored_credentials = get_stored_credentials()
+    auth_context = generate_auth_context(stored_credentials)
     
     # Create a prompt for the LLM
     print("\n" + "="*60)
@@ -644,29 +678,41 @@ But it failed with this error:
 {directory_context}
 {file_context}
 
+AVAILABLE CREDENTIALS:
+{auth_context}
+
 Please analyze the error and provide ONLY a single terminal command that would fix the issue.
-Consider the current directory, system information, and directory contents carefully before suggesting a solution.
+Consider the current directory, system information, directory contents, and available credentials carefully before suggesting a solution.
 
 IMPORTANT GUIDELINES:
 1. For any commands that might ask for yes/no confirmation, use the appropriate non-interactive flag:
    - For apt/apt-get: use -y or --yes
    - For pip: use --no-input
    - For rm: use -f or --force
-   - For other commands: check their documentation for the appropriate non-interactive flag
 
-2. If the error indicates a file is not found (e.g., "No such file or directory", "cannot open", "not found"):
+2. If the error indicates a file is not found:
    - FIRST try to search for the file using: find . -name "filename" -type f 2>/dev/null
    - If found, navigate to that directory using: cd /path/to/directory
    - If not found, then consider creating the file or installing missing packages
 
 3. For missing packages or dependencies:
    - Use pip install for Python packages
-   - Use apt-get install for system packages
+   - Use apt-get install -y for system packages
    - Use npm install for Node.js packages
 
 4. For authentication issues:
-   - For wandb login: suggest 'wandb login YOUR_API_KEY' (system will prompt for actual key)
-   - For huggingface: suggest 'huggingface-cli login' (system will prompt for token)
+   - Analyze the error to determine what type of authentication is needed
+   - Use the actual credential values provided above (not placeholders)
+   - Common patterns:
+     * wandb errors: use wandb login with WANDB_API_KEY
+     * huggingface errors: use huggingface-cli login with HF_TOKEN or HUGGINGFACE_TOKEN
+     * github errors: configure git credentials with GITHUB_TOKEN
+     * kaggle errors: create ~/.kaggle/kaggle.json with KAGGLE_USERNAME and KAGGLE_KEY
+     * API errors: export the appropriate API key as environment variable
+
+5. Environment variable exports:
+   - Use export commands for API keys that need to be in environment
+   - Use the actual credential values, not placeholders
 
 Do not provide any explanations, just the exact command to run.
 """
@@ -2364,9 +2410,39 @@ def get_setup_commands_from_gitingest(repo_url):
                         api_keys = result.get("requiredApiKeys", [])
                         if api_keys:
                             print(f"\n🔑 Required API Keys ({len(api_keys)}):")
+                            # Load stored GitArsenal credentials
+                            stored_credentials = {}
+                            try:
+                                credentials_file = Path.home() / ".gitarsenal" / "credentials.json"
+                                if credentials_file.exists():
+                                    with open(credentials_file, 'r') as f:
+                                        stored_credentials = json.load(f)
+                                    print(f"📋 Found {len(stored_credentials)} stored GitArsenal credentials")
+                                else:
+                                    print("📋 No stored GitArsenal credentials found")
+                            except Exception as e:
+                                print(f"⚠️ Error loading stored credentials: {e}")
+                            
+                            # Identify missing required API keys
+                            missing_required_keys = []
+                            available_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}")
+                                key_name = api_key.get('name', 'Unknown')
+                                is_required = api_key.get("required", False)
+                                has_stored_key = key_name in stored_credentials
+                                
+                                if is_required:
+                                    if has_stored_key:
+                                        status = "✅ Required (Available)"
+                                        available_keys.append(key_name)
+                                    else:
+                                        status = "🔴 Required (Missing)"
+                                        missing_required_keys.append(api_key)
+                                else:
+                                    status = "🟡 Optional"
+                                
+                                print(f"  {i}. {key_name} - {status}")
                                 print(f"     Service: {api_key.get('service', 'Unknown')}")
                                 print(f"     Description: {api_key.get('description', 'No description')}")
                                 if api_key.get('example'):
@@ -2374,6 +2450,67 @@ def get_setup_commands_from_gitingest(repo_url):
                                 if api_key.get('documentation_url'):
                                     print(f"     Docs: {api_key.get('documentation_url')}")
                                 print()
+                            
+                            # Prompt for missing required API keys
+                            if missing_required_keys:
+                                print("🔧 Setting up missing required API keys...")
+                                print("Press Enter to continue or Ctrl+C to skip...")
+                                
+                                for api_key in missing_required_keys:
+                                    key_name = api_key.get('name', 'Unknown')
+                                    service = api_key.get('service', 'Unknown')
+                                    description = api_key.get('description', 'No description')
+                                    example = api_key.get('example', '')
+                                    docs_url = api_key.get('documentation_url', '')
+                                    
+                                    print(f"\n📝 Setting up {key_name} for {service}:")
+                                    print(f"   Description: {description}")
+                                    if example:
+                                        print(f"   Example: {example}")
+                                    if docs_url:
+                                        print(f"   Documentation: {docs_url}")
+                                    
+                                    # Prompt user for the API key
+                                    try:
+                                        import getpass
+                                        print(f"\nPlease enter your {key_name}:")
+                                        new_key = getpass.getpass("API Key (hidden): ").strip()
+                                        
+                                        if new_key:
+                                            # Save to credentials file
+                                            credentials_file = Path.home() / ".gitarsenal" / "credentials.json"
+                                            credentials_file.parent.mkdir(parents=True, exist_ok=True)
+                                            
+                                            # Load existing credentials
+                                            if credentials_file.exists():
+                                                with open(credentials_file, 'r') as f:
+                                                    all_credentials = json.load(f)
+                                            else:
+                                                all_credentials = {}
+                                            
+                                            # Add new key
+                                            all_credentials[key_name] = new_key
+                                            
+                                            # Save back to file
+                                            with open(credentials_file, 'w') as f:
+                                                json.dump(all_credentials, f, indent=2)
+                                            
+                                            print(f"✅ {key_name} saved successfully!")
+                                            available_keys.append(key_name)
+                                        else:
+                                            print(f"⚠️ Skipping {key_name} (no input provided)")
+                                    except KeyboardInterrupt:
+                                        print(f"\n⚠️ Skipping {key_name} (cancelled by user)")
+                                    except Exception as e:
+                                        print(f"❌ Error saving {key_name}: {e}")
+                                
+                                # Show summary
+                                if available_keys:
+                                    print(f"✅ Available API keys: {', '.join(available_keys)}")
+                                if missing_required_keys:
+                                    print(f"⚠️ Missing required keys: {', '.join([k.get('name') for k in missing_required_keys])}")
+                            else:
+                                print("ℹ️ All required API keys are already available.")
                     
                     # Display setup complexity if available
                     if "setupComplexity" in result:

package/test_modalSandboxScript.py

@@ -327,6 +327,37 @@ def handle_huggingface_login(sandbox, current_dir):
     return exit_code == 0, stdout_buffer, stderr_buffer
 
 
+def get_stored_credentials():
+    """Load stored credentials from ~/.gitarsenal/credentials.json"""
+    import json
+    from pathlib import Path
+    
+    try:
+        credentials_file = Path.home() / ".gitarsenal" / "credentials.json"
+        if credentials_file.exists():
+            with open(credentials_file, 'r') as f:
+                credentials = json.load(f)
+            return credentials
+        else:
+            return {}
+    except Exception as e:
+        print(f"⚠️ Error loading stored credentials: {e}")
+        return {}
+
+def generate_auth_context(stored_credentials):
+    """Generate simple authentication context for the OpenAI prompt"""
+    if not stored_credentials:
+        return "No stored credentials available."
+    
+    auth_context = "Available stored credentials (use actual values in commands):\n"
+    
+    for key, value in stored_credentials.items():
+        # Mask the actual value for security in logs, but provide the real value
+        masked_value = value[:8] + "..." if len(value) > 8 else "***"
+        auth_context += f"- {key}: {masked_value} (actual value: {value})\n"
+    
+    return auth_context
+
 def call_openai_for_debug(command, error_output, api_key=None, current_dir=None, sandbox=None):
     """Call OpenAI to debug a failed command and suggest a fix"""
     print("\n🔍 DEBUG: Starting LLM debugging...")
@@ -620,6 +651,9 @@ Directory contents:
         "Content-Type": "application/json",
         "Authorization": f"Bearer {api_key}"
     }
+
+    stored_credentials = get_stored_credentials()
+    auth_context = generate_auth_context(stored_credentials)
     
     # Create a prompt for the LLM
     print("\n" + "="*60)
@@ -644,29 +678,41 @@ But it failed with this error:
 {directory_context}
 {file_context}
 
+AVAILABLE CREDENTIALS:
+{auth_context}
+
 Please analyze the error and provide ONLY a single terminal command that would fix the issue.
-Consider the current directory, system information, and directory contents carefully before suggesting a solution.
+Consider the current directory, system information, directory contents, and available credentials carefully before suggesting a solution.
 
 IMPORTANT GUIDELINES:
 1. For any commands that might ask for yes/no confirmation, use the appropriate non-interactive flag:
    - For apt/apt-get: use -y or --yes
    - For pip: use --no-input
    - For rm: use -f or --force
-   - For other commands: check their documentation for the appropriate non-interactive flag
 
-2. If the error indicates a file is not found (e.g., "No such file or directory", "cannot open", "not found"):
+2. If the error indicates a file is not found:
    - FIRST try to search for the file using: find . -name "filename" -type f 2>/dev/null
    - If found, navigate to that directory using: cd /path/to/directory
    - If not found, then consider creating the file or installing missing packages
 
 3. For missing packages or dependencies:
    - Use pip install for Python packages
-   - Use apt-get install for system packages
+   - Use apt-get install -y for system packages
    - Use npm install for Node.js packages
 
 4. For authentication issues:
-   - For wandb login: suggest 'wandb login YOUR_API_KEY' (system will prompt for actual key)
-   - For huggingface: suggest 'huggingface-cli login' (system will prompt for token)
+   - Analyze the error to determine what type of authentication is needed
+   - Use the actual credential values provided above (not placeholders)
+   - Common patterns:
+     * wandb errors: use wandb login with WANDB_API_KEY
+     * huggingface errors: use huggingface-cli login with HF_TOKEN or HUGGINGFACE_TOKEN
+     * github errors: configure git credentials with GITHUB_TOKEN
+     * kaggle errors: create ~/.kaggle/kaggle.json with KAGGLE_USERNAME and KAGGLE_KEY
+     * API errors: export the appropriate API key as environment variable
+
+5. Environment variable exports:
+   - Use export commands for API keys that need to be in environment
+   - Use the actual credential values, not placeholders
 
 Do not provide any explanations, just the exact command to run.
 """
@@ -2364,9 +2410,39 @@ def get_setup_commands_from_gitingest(repo_url):
                         api_keys = result.get("requiredApiKeys", [])
                         if api_keys:
                             print(f"\n🔑 Required API Keys ({len(api_keys)}):")
+                            # Load stored GitArsenal credentials
+                            stored_credentials = {}
+                            try:
+                                credentials_file = Path.home() / ".gitarsenal" / "credentials.json"
+                                if credentials_file.exists():
+                                    with open(credentials_file, 'r') as f:
+                                        stored_credentials = json.load(f)
+                                    print(f"📋 Found {len(stored_credentials)} stored GitArsenal credentials")
+                                else:
+                                    print("📋 No stored GitArsenal credentials found")
+                            except Exception as e:
+                                print(f"⚠️ Error loading stored credentials: {e}")
+                            
+                            # Identify missing required API keys
+                            missing_required_keys = []
+                            available_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}")
+                                key_name = api_key.get('name', 'Unknown')
+                                is_required = api_key.get("required", False)
+                                has_stored_key = key_name in stored_credentials
+                                
+                                if is_required:
+                                    if has_stored_key:
+                                        status = "✅ Required (Available)"
+                                        available_keys.append(key_name)
+                                    else:
+                                        status = "🔴 Required (Missing)"
+                                        missing_required_keys.append(api_key)
+                                else:
+                                    status = "🟡 Optional"
+                                
+                                print(f"  {i}. {key_name} - {status}")
                                 print(f"     Service: {api_key.get('service', 'Unknown')}")
                                 print(f"     Description: {api_key.get('description', 'No description')}")
                                 if api_key.get('example'):
@@ -2374,6 +2450,67 @@ def get_setup_commands_from_gitingest(repo_url):
                                 if api_key.get('documentation_url'):
                                     print(f"     Docs: {api_key.get('documentation_url')}")
                                 print()
+                            
+                            # Prompt for missing required API keys
+                            if missing_required_keys:
+                                print("🔧 Setting up missing required API keys...")
+                                print("Press Enter to continue or Ctrl+C to skip...")
+                                
+                                for api_key in missing_required_keys:
+                                    key_name = api_key.get('name', 'Unknown')
+                                    service = api_key.get('service', 'Unknown')
+                                    description = api_key.get('description', 'No description')
+                                    example = api_key.get('example', '')
+                                    docs_url = api_key.get('documentation_url', '')
+                                    
+                                    print(f"\n📝 Setting up {key_name} for {service}:")
+                                    print(f"   Description: {description}")
+                                    if example:
+                                        print(f"   Example: {example}")
+                                    if docs_url:
+                                        print(f"   Documentation: {docs_url}")
+                                    
+                                    # Prompt user for the API key
+                                    try:
+                                        import getpass
+                                        print(f"\nPlease enter your {key_name}:")
+                                        new_key = getpass.getpass("API Key (hidden): ").strip()
+                                        
+                                        if new_key:
+                                            # Save to credentials file
+                                            credentials_file = Path.home() / ".gitarsenal" / "credentials.json"
+                                            credentials_file.parent.mkdir(parents=True, exist_ok=True)
+                                            
+                                            # Load existing credentials
+                                            if credentials_file.exists():
+                                                with open(credentials_file, 'r') as f:
+                                                    all_credentials = json.load(f)
+                                            else:
+                                                all_credentials = {}
+                                            
+                                            # Add new key
+                                            all_credentials[key_name] = new_key
+                                            
+                                            # Save back to file
+                                            with open(credentials_file, 'w') as f:
+                                                json.dump(all_credentials, f, indent=2)
+                                            
+                                            print(f"✅ {key_name} saved successfully!")
+                                            available_keys.append(key_name)
+                                        else:
+                                            print(f"⚠️ Skipping {key_name} (no input provided)")
+                                    except KeyboardInterrupt:
+                                        print(f"\n⚠️ Skipping {key_name} (cancelled by user)")
+                                    except Exception as e:
+                                        print(f"❌ Error saving {key_name}: {e}")
+                                
+                                # Show summary
+                                if available_keys:
+                                    print(f"✅ Available API keys: {', '.join(available_keys)}")
+                                if missing_required_keys:
+                                    print(f"⚠️ Missing required keys: {', '.join([k.get('name') for k in missing_required_keys])}")
+                            else:
+                                print("ℹ️ All required API keys are already available.")
                     
                     # Display setup complexity if available
                     if "setupComplexity" in result: