gitarsenal-cli 1.9.101 → 1.9.103

package/.venv_status.json

@@ -1 +1 @@
-{"created":"2025-09-14T10:50:06.062Z","packages":["modal","gitingest","requests","anthropic"],"uv_version":"uv 0.8.4 (Homebrew 2025-07-30)"}
+{"created":"2025-09-14T11:00:57.034Z","packages":["modal","gitingest","requests","anthropic"],"uv_version":"uv 0.8.4 (Homebrew 2025-07-30)"}

package/lib/e2b-sandbox.js

@@ -41,13 +41,41 @@ function getPythonExecutable() {
   return isWindows ? 'python' : 'python3';
 }
 
+/**
+ * Fetch Anthropic API key directly from the server
+ * @returns {Promise<string>} - The Anthropic API key
+ */
+async function fetchAnthropicApiKey() {
+  try {
+    const pythonExecutable = getPythonExecutable();
+    const fetchTokensScript = path.join(__dirname, '..', 'python', 'fetch_modal_tokens.py');
+    
+    // Run the fetch_modal_tokens.py script with --output-anthropic-key flag
+    const { stdout, stderr } = await execAsync(`${pythonExecutable} ${fetchTokensScript} --output-anthropic-key`, {
+      env: { ...process.env },
+      timeout: 30000 // 30 seconds timeout
+    });
+    
+    // Parse the output to find the Anthropic API key
+    const anthropicKeyMatch = stdout.match(/ANTHROPIC_API_KEY=([a-zA-Z0-9\-_]+)/);
+    if (anthropicKeyMatch && anthropicKeyMatch[1]) {
+      const anthropicApiKey = anthropicKeyMatch[1];
+      return anthropicApiKey;
+    }
+    
+    return null;
+  } catch (error) {
+    console.error(chalk.red(`❌ Error fetching Anthropic API key: ${error.message}`));
+    return null;
+  }
+}
+
 /**
  * Fetch E2B API key directly from the server
  * @returns {Promise<string>} - The E2B API key
  */
 async function fetchE2BApiKey() {
   try {
-    console.log(chalk.blue('🔄 Fetching E2B API key directly from server...'));
     
     const pythonExecutable = getPythonExecutable();
     const fetchTokensScript = path.join(__dirname, '..', 'python', 'fetch_modal_tokens.py');
@@ -151,8 +179,19 @@ async function runE2BSandbox(options) {
 
   // Get OpenAI and Anthropic API keys from environment or apiKeys
   const openaiApiKey = apiKeys.OPENAI_API_KEY || process.env.OPENAI_API_KEY;
-  const anthropicApiKey = apiKeys.ANTHROPIC_API_KEY || process.env.ANTHROPIC_API_KEY;
-
+  let anthropicApiKey = apiKeys.ANTHROPIC_API_KEY || process.env.ANTHROPIC_API_KEY;
+  
+  // If Anthropic API key is not found, try to fetch it directly from the server
+  if (!anthropicApiKey) {
+    console.log(chalk.blue('🔄 Fetching Anthropic API key directly from server...'));
+    anthropicApiKey = await fetchAnthropicApiKey();
+    if (anthropicApiKey) {
+      console.log(chalk.green('✅ Successfully fetched Anthropic API key from server'));
+      // Add it to apiKeys so it gets passed to the Python script
+      apiKeys.ANTHROPIC_API_KEY = anthropicApiKey;
+    }
+  }
+  
   // Run the e2b_sandbox_agent.py script with the repository URL
   const scriptPath = path.join(__dirname, '..', 'python', 'e2b_sandbox_agent.py');
   

package/package.json

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

package/python/e2b_sandbox_agent.py

@@ -19,7 +19,6 @@ def install_dependencies_in_sandbox(sandbox):
     """
     Install required packages in the sandbox
     """
-    print("📦 Installing required packages in sandbox...")
     
     # Install Python packages
     packages = [
@@ -154,7 +153,6 @@ with open('/home/user/kill_claude/requirements.txt', 'w') as f:
 with open('/home/user/kill_claude/prompts/{prompt_file}', 'w') as f:
     f.write({repr(prompt_content)})
 """)
-            print(f"Preparing Agents...")
     
     # Upload tools
     tools_dir = os.path.join(kill_claude_dir, "tools")
@@ -168,7 +166,6 @@ with open('/home/user/kill_claude/prompts/{prompt_file}', 'w') as f:
 with open('/home/user/kill_claude/tools/{tool_file}', 'w') as f:
     f.write({repr(tool_content)})
 """)
-            print(f"Preparing Tools...")
     
     # Create __init__.py in tools directory
     sandbox.run_code("""
@@ -484,18 +481,25 @@ def run_e2b_sandbox(repo_url, setup_commands=None, api_keys=None):
     try:
         # Fetch the E2B API key directly from the server
         try:
-            print("🔄 Fetching E2B API key directly from server...")
             from fetch_modal_tokens import fetch_default_tokens_from_gitarsenal
             token_id, token_secret, e2b_api_key, openai_api_key, anthropic_api_key, openrouter_api_key, groq_api_key = fetch_default_tokens_from_gitarsenal()
             
             if e2b_api_key and e2b_api_key != "your_e2b_api_key" and not e2b_api_key.startswith("placeholder"):
                 # Set it in the environment for the Sandbox.create() call
                 os.environ["E2B_API_KEY"] = e2b_api_key
+                print(f"✅ Successfully fetched E2B API key from server (format: {e2b_api_key[:6]}...)")
             else:
                 print("⚠️ Could not get valid E2B API key from server")
                 e2b_api_key = None
+                
+            # Also set the Anthropic API key if available
+            if anthropic_api_key and anthropic_api_key != "your_anthropic_api_key" and not anthropic_api_key.startswith("placeholder"):
+                if api_keys is None:
+                    api_keys = {}
+                api_keys["ANTHROPIC_API_KEY"] = anthropic_api_key
+                print(f"✅ Successfully fetched Anthropic API key from server (format: {anthropic_api_key[:5]}...)")
         except Exception as e:
-            print(f"⚠️ Could not fetch E2B API key from server: {e}")
+            print(f"⚠️ Could not fetch API keys from server: {e}")
             e2b_api_key = None
         
         # If we couldn't fetch the key directly, check if it's in api_keys
@@ -623,6 +627,18 @@ os.environ['{key_name}'] = '{key_value}'
 print(f"✅ Set {key_name} in sandbox environment")
 """)
             
+            # Double-check that the Anthropic API key is set in the sandbox environment
+            if api_keys and 'ANTHROPIC_API_KEY' in api_keys:
+                anthropic_key = api_keys['ANTHROPIC_API_KEY']
+                # Verify the key is set in the sandbox environment
+                sandbox.run_code("""
+import os
+if 'ANTHROPIC_API_KEY' in os.environ:
+    print(f"✅ Verified ANTHROPIC_API_KEY is set in sandbox environment (format: {os.environ['ANTHROPIC_API_KEY'][:5]}...)")
+else:
+    print("❌ ANTHROPIC_API_KEY is not set in sandbox environment")
+""")
+            
             print("\n" + "="*80)
             print("🤖 CLAUDE AGENT REPOSITORY SETUP")
             print("="*80)

package/python/fetch_modal_tokens.py

@@ -191,6 +191,7 @@ if __name__ == "__main__":
     parser.add_argument('--proxy-url', help='URL of the proxy server')
     parser.add_argument('--proxy-api-key', help='API key for the proxy server')
     parser.add_argument('--output-e2b-key', action='store_true', help='Output the E2B API key directly for JavaScript to use')
+    parser.add_argument('--output-anthropic-key', action='store_true', help='Output the Anthropic API key directly for JavaScript to use')
     args = parser.parse_args()
     
     # Set proxy URL and API key in environment variables if provided
@@ -210,6 +211,11 @@ if __name__ == "__main__":
         print(f"E2B_API_KEY={e2b_api_key}")
         sys.exit(0)
     
+    # If --output-anthropic-key is specified, output the Anthropic API key directly
+    if args.output_anthropic_key and anthropic_api_key:
+        print(f"ANTHROPIC_API_KEY={anthropic_api_key}")
+        sys.exit(0)
+    
     print(f"Token ID: {token_id}")
     print(f"Token Secret: {token_secret}")
     print(f"E2B API Key: {e2b_api_key[:5] + '...' if e2b_api_key else None}")