gitarsenal-cli 1.6.2 → 1.6.4

package/package.json

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

package/python/credentials_manager.py

@@ -187,4 +187,37 @@ class CredentialsManager:
     
     def clear_all_credentials(self):
         """Clear all saved credentials"""
-        return self.save_credentials({}) 
+        return self.save_credentials({})
+    
+    def cleanup_security_files(self):
+        """Clean up all security-related files including legacy files"""
+        try:
+            # Clear all credentials from the main file
+            self.clear_all_credentials()
+            
+            # Remove legacy OpenAI key file
+            openai_key_file = self.config_dir / "openai_key"
+            if openai_key_file.exists():
+                openai_key_file.unlink()
+                print("✅ Removed legacy OpenAI API key file")
+            
+            # Remove environment variables
+            import os
+            security_vars = [
+                "OPENAI_API_KEY", 
+                "HUGGINGFACE_TOKEN", 
+                "WANDB_API_KEY",
+                "MODAL_TOKEN_ID",
+                "MODAL_TOKEN", 
+                "MODAL_TOKEN_SECRET"
+            ]
+            
+            for var in security_vars:
+                if var in os.environ:
+                    del os.environ[var]
+            
+            print("✅ Security cleanup completed successfully")
+            return True
+        except Exception as e:
+            print(f"❌ Error during security cleanup: {e}")
+            return False 

package/python/modal_proxy_service.py

@@ -210,23 +210,22 @@ def setup_modal_auth():
         logger.error(f"Error setting up Modal authentication: {e}")
         return False
 
-def cleanup_modal_token():
-    """Delete Modal token files and environment variables after SSH container is started"""
-    logger.info("🧹 Cleaning up Modal token for security...")
+def cleanup_security_tokens():
+    """Delete all security tokens and API keys after SSH container is started"""
+    logger.info("🧹 Cleaning up security tokens and API keys...")
     
     try:
-        # Remove token from environment variables
-        if "MODAL_TOKEN_ID" in os.environ:
-            del os.environ["MODAL_TOKEN_ID"]
-            logger.info("✅ Removed MODAL_TOKEN_ID from environment")
-        
-        if "MODAL_TOKEN" in os.environ:
-            del os.environ["MODAL_TOKEN"]
-            logger.info("✅ Removed MODAL_TOKEN from environment")
-            
-        if "MODAL_TOKEN_SECRET" in os.environ:
-            del os.environ["MODAL_TOKEN_SECRET"]
-            logger.info("✅ Removed MODAL_TOKEN_SECRET from environment")
+        # Remove Modal tokens from environment variables
+        modal_env_vars = ["MODAL_TOKEN_ID", "MODAL_TOKEN", "MODAL_TOKEN_SECRET"]
+        for var in modal_env_vars:
+            if var in os.environ:
+                del os.environ[var]
+                logger.info(f"✅ Removed {var} from environment")
+        
+        # Remove OpenAI API key from environment
+        if "OPENAI_API_KEY" in os.environ:
+            del os.environ["OPENAI_API_KEY"]
+            logger.info("✅ Removed OpenAI API key from environment")
         
         # Delete ~/.modal.toml file
         from pathlib import Path
@@ -235,9 +234,20 @@ def cleanup_modal_token():
             modal_toml.unlink()
             logger.info(f"✅ Deleted Modal token file at {modal_toml}")
         
-        logger.info("✅ Modal token cleanup completed successfully")
+        # Delete ~/.gitarsenal/openai_key file
+        openai_key_file = Path.home() / ".gitarsenal" / "openai_key"
+        if openai_key_file.exists():
+            openai_key_file.unlink()
+            logger.info(f"✅ Deleted OpenAI API key file at {openai_key_file}")
+        
+        logger.info("✅ Security cleanup completed successfully")
     except Exception as e:
-        logger.error(f"❌ Error during Modal token cleanup: {e}")
+        logger.error(f"❌ Error during security cleanup: {e}")
+
+# Keep the old function for backward compatibility
+def cleanup_modal_token():
+    """Legacy function - now calls the comprehensive cleanup"""
+    cleanup_security_tokens()
 
 @app.route('/api/health', methods=['GET'])
 def health_check():

package/python/test_modalSandboxScript.py

@@ -1640,15 +1640,6 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
         print(f"❌ Error running container: {e}")
         return None
 
-def is_local_server_running(url, timeout=2):
-    """Check if a local server is running by attempting a connection."""
-    import requests
-    try:
-        response = requests.get(url, timeout=timeout)
-        return True
-    except requests.exceptions.RequestException:
-        return False
-
 def fetch_setup_commands_from_api(repo_url):
     """Fetch setup commands from the GitIngest API using real repository analysis."""
     import tempfile
@@ -2258,74 +2249,6 @@ def find_entry_point(repo_dir):
     
     return None
 
-def analyze_directory_navigation_with_llm(current_dir, target_dir, current_contents, target_contents, api_key=None):
-    """Use LLM to analyze if directory navigation makes sense"""
-    if not api_key:
-        # Try to get API key from environment
-        api_key = os.environ.get("OPENAI_API_KEY")
-        
-    if not api_key:
-        print("⚠️ No OpenAI API key available for directory analysis")
-        return None
-        
-    # Create analysis prompt
-    analysis_prompt = f"""
-I'm trying to determine if a 'cd {target_dir}' command makes sense.
-
-CURRENT DIRECTORY: {current_dir}
-Current directory contents:
-{current_contents}
-
-TARGET DIRECTORY: {target_dir}
-Target directory contents:
-{target_contents}
-
-Please analyze if navigating to the target directory makes sense by considering:
-1. Are the contents significantly different?
-2. Does the target directory contain important files (like source code, config files, etc.)?
-3. Is this likely a nested project directory or just a duplicate?
-4. Would navigating provide access to different functionality or files?
-
-Respond with only 'NAVIGATE' if navigation makes sense, or 'SKIP' if it's redundant.
-"""
-    
-    # Prepare the API request
-    headers = {
-        "Content-Type": "application/json",
-        "Authorization": f"Bearer {api_key}"
-    }
-    
-    payload = {
-        "model": "gpt-4",
-        "messages": [
-            {"role": "system", "content": "You are a directory navigation assistant. Analyze if navigating to a target directory makes sense based on the contents of both directories. Respond with only 'NAVIGATE' or 'SKIP'."},
-            {"role": "user", "content": analysis_prompt}
-        ],
-        "temperature": 0.1,
-        "max_tokens": 50
-    }
-    
-    try:
-        print("🤖 Calling OpenAI for directory navigation analysis...")
-        response = requests.post(
-            "https://api.openai.com/v1/chat/completions",
-            headers=headers,
-            json=payload,
-            timeout=30
-        )
-        
-        if response.status_code == 200:
-            result = response.json()
-            llm_response = result["choices"][0]["message"]["content"].strip()
-            print(f"🤖 LLM Response: {llm_response}")
-            return llm_response
-        else:
-            print(f"❌ OpenAI API error: {response.status_code} - {response.text}")
-            return None
-    except Exception as e:
-        print(f"❌ Error calling OpenAI API: {e}")
-        return None
-
 def cleanup_modal_token():
     """Delete token files and environment variables after SSH container is started"""
     print("🧹 Cleaning up tokens for security...")
@@ -2355,6 +2278,45 @@ def cleanup_modal_token():
     except Exception as e:
         print(f"❌ Error during token cleanup: {e}")
 
+def cleanup_security_tokens():
+    """Delete all security tokens and API keys after SSH container is started"""
+    print("🧹 Cleaning up security tokens and API keys...")
+    
+    try:
+        # Remove Modal tokens from environment variables
+        modal_env_vars = ["MODAL_TOKEN_ID", "MODAL_TOKEN", "MODAL_TOKEN_SECRET"]
+        for var in modal_env_vars:
+            if var in os.environ:
+                del os.environ[var]
+                # print(f"✅ Removed {var} from environment")
+        
+        # Remove OpenAI API key from environment
+        if "OPENAI_API_KEY" in os.environ:
+            del os.environ["OPENAI_API_KEY"]
+            # print("✅ Removed OpenAI API key from environment")
+        
+        # Delete ~/.modal.toml file
+        home_dir = os.path.expanduser("~")
+        modal_toml = os.path.join(home_dir, ".modal.toml")
+        if os.path.exists(modal_toml):
+            os.remove(modal_toml)
+            # print(f"✅ Deleted Modal token file at {modal_toml}")
+        
+        # Delete ~/.gitarsenal/openai_key file
+        openai_key_file = os.path.join(home_dir, ".gitarsenal", "openai_key")
+        if os.path.exists(openai_key_file):
+            os.remove(openai_key_file)
+            # print(f"✅ Deleted OpenAI API key file at {openai_key_file}")
+        
+        # print("✅ Security cleanup completed successfully")
+    except Exception as e:
+        print(f"❌ Error during security cleanup: {e}")
+
+# Keep the old function for backward compatibility
+def cleanup_modal_token():
+    """Legacy function - now calls the comprehensive cleanup"""
+    cleanup_security_tokens()
+
 def show_usage_examples():
     """Display usage examples for the script."""
     print("Usage Examples\n")

package/test_modalSandboxScript.py

@@ -1640,15 +1640,6 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
         print(f"❌ Error running container: {e}")
         return None
 
-def is_local_server_running(url, timeout=2):
-    """Check if a local server is running by attempting a connection."""
-    import requests
-    try:
-        response = requests.get(url, timeout=timeout)
-        return True
-    except requests.exceptions.RequestException:
-        return False
-
 def fetch_setup_commands_from_api(repo_url):
     """Fetch setup commands from the GitIngest API using real repository analysis."""
     import tempfile
@@ -2258,74 +2249,6 @@ def find_entry_point(repo_dir):
     
     return None
 
-def analyze_directory_navigation_with_llm(current_dir, target_dir, current_contents, target_contents, api_key=None):
-    """Use LLM to analyze if directory navigation makes sense"""
-    if not api_key:
-        # Try to get API key from environment
-        api_key = os.environ.get("OPENAI_API_KEY")
-        
-    if not api_key:
-        print("⚠️ No OpenAI API key available for directory analysis")
-        return None
-        
-    # Create analysis prompt
-    analysis_prompt = f"""
-I'm trying to determine if a 'cd {target_dir}' command makes sense.
-
-CURRENT DIRECTORY: {current_dir}
-Current directory contents:
-{current_contents}
-
-TARGET DIRECTORY: {target_dir}
-Target directory contents:
-{target_contents}
-
-Please analyze if navigating to the target directory makes sense by considering:
-1. Are the contents significantly different?
-2. Does the target directory contain important files (like source code, config files, etc.)?
-3. Is this likely a nested project directory or just a duplicate?
-4. Would navigating provide access to different functionality or files?
-
-Respond with only 'NAVIGATE' if navigation makes sense, or 'SKIP' if it's redundant.
-"""
-    
-    # Prepare the API request
-    headers = {
-        "Content-Type": "application/json",
-        "Authorization": f"Bearer {api_key}"
-    }
-    
-    payload = {
-        "model": "gpt-4",
-        "messages": [
-            {"role": "system", "content": "You are a directory navigation assistant. Analyze if navigating to a target directory makes sense based on the contents of both directories. Respond with only 'NAVIGATE' or 'SKIP'."},
-            {"role": "user", "content": analysis_prompt}
-        ],
-        "temperature": 0.1,
-        "max_tokens": 50
-    }
-    
-    try:
-        print("🤖 Calling OpenAI for directory navigation analysis...")
-        response = requests.post(
-            "https://api.openai.com/v1/chat/completions",
-            headers=headers,
-            json=payload,
-            timeout=30
-        )
-        
-        if response.status_code == 200:
-            result = response.json()
-            llm_response = result["choices"][0]["message"]["content"].strip()
-            print(f"🤖 LLM Response: {llm_response}")
-            return llm_response
-        else:
-            print(f"❌ OpenAI API error: {response.status_code} - {response.text}")
-            return None
-    except Exception as e:
-        print(f"❌ Error calling OpenAI API: {e}")
-        return None
-
 def cleanup_modal_token():
     """Delete token files and environment variables after SSH container is started"""
     print("🧹 Cleaning up tokens for security...")
@@ -2355,6 +2278,45 @@ def cleanup_modal_token():
     except Exception as e:
         print(f"❌ Error during token cleanup: {e}")
 
+def cleanup_security_tokens():
+    """Delete all security tokens and API keys after SSH container is started"""
+    print("🧹 Cleaning up security tokens and API keys...")
+    
+    try:
+        # Remove Modal tokens from environment variables
+        modal_env_vars = ["MODAL_TOKEN_ID", "MODAL_TOKEN", "MODAL_TOKEN_SECRET"]
+        for var in modal_env_vars:
+            if var in os.environ:
+                del os.environ[var]
+                # print(f"✅ Removed {var} from environment")
+        
+        # Remove OpenAI API key from environment
+        if "OPENAI_API_KEY" in os.environ:
+            del os.environ["OPENAI_API_KEY"]
+            # print("✅ Removed OpenAI API key from environment")
+        
+        # Delete ~/.modal.toml file
+        home_dir = os.path.expanduser("~")
+        modal_toml = os.path.join(home_dir, ".modal.toml")
+        if os.path.exists(modal_toml):
+            os.remove(modal_toml)
+            # print(f"✅ Deleted Modal token file at {modal_toml}")
+        
+        # Delete ~/.gitarsenal/openai_key file
+        openai_key_file = os.path.join(home_dir, ".gitarsenal", "openai_key")
+        if os.path.exists(openai_key_file):
+            os.remove(openai_key_file)
+            # print(f"✅ Deleted OpenAI API key file at {openai_key_file}")
+        
+        # print("✅ Security cleanup completed successfully")
+    except Exception as e:
+        print(f"❌ Error during security cleanup: {e}")
+
+# Keep the old function for backward compatibility
+def cleanup_modal_token():
+    """Legacy function - now calls the comprehensive cleanup"""
+    cleanup_security_tokens()
+
 def show_usage_examples():
     """Display usage examples for the script."""
     print("Usage Examples\n")