gitarsenal-cli 1.9.66 → 1.9.68

package/.venv_status.json

@@ -1 +1 @@
-{"created":"2025-08-14T20:40:04.217Z","packages":["modal","gitingest","requests","anthropic"],"uv_version":"uv 0.8.4 (Homebrew 2025-07-30)"}
+{"created":"2025-08-15T04:06:48.506Z","packages":["modal","gitingest","requests","anthropic"],"uv_version":"uv 0.8.4 (Homebrew 2025-07-30)"}

package/package.json

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

package/python/test_modalSandboxScript.py

@@ -203,8 +203,8 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                                volume_name=None, timeout_minutes=60, ssh_password=None, interactive=False, gpu_count=1):
     """Create a Modal SSH container with GPU support and intelligent repository setup.
     
-    When repo_url is provided, uses Claude Code Agent for intelligent repository setup.
-    The setup_commands parameter is maintained for backwards compatibility but ignored when using Claude Code Agent.
+    When repo_url is provided, uses Agent for intelligent repository setup.
+    The setup_commands parameter is maintained for backwards compatibility but ignored when using Agent.
     """
     
     # Use interactive mode if specified
@@ -388,29 +388,12 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
             # Set up a nice bash prompt
             "echo 'export PS1=\"\\[\\e[1;32m\\]modal:\\[\\e[1;34m\\]\\w\\[\\e[0m\\]$ \"' >> /root/.bashrc",
             
-            # Create directories for Claude Code Agent
-            "mkdir -p /python/kill_claude/tools /python/kill_claude/prompts",
+            # Create base directories (subdirectories will be created automatically when mounting)
+            "mkdir -p /python",
         )
-        # Mount all local files (must be done after run_commands)
-        .add_local_file(os.path.join(current_dir, "shell.py"), "/python/shell.py")  # Mount shell.py
-        .add_local_file(os.path.join(current_dir, "command_manager.py"), "/python/command_manager.py")  # Mount command_manager.py
-        .add_local_file(os.path.join(current_dir, "fetch_modal_tokens.py"), "/python/fetch_modal_tokens.py")  # Mount fetch_modal_token.py
-        .add_local_file(os.path.join(current_dir, "llm_debugging.py"), "/python/llm_debugging.py")  # Mount llm_debugging.py
-        .add_local_file(os.path.join(current_dir, "credentials_manager.py"), "/python/credentials_manager.py")  # Mount credentials_manager.py
-        # Mount Claude Code Agent and its dependencies
-        .add_local_file(os.path.join(gitarsenal_root, "kill_claude", "claude_code_agent.py"), "/python/kill_claude/claude_code_agent.py")
-        # Mount the tools and prompts directories manually with key files
-        .add_local_file(os.path.join(gitarsenal_root, "kill_claude", "tools", "__init__.py"), "/python/kill_claude/tools/__init__.py")
-        .add_local_file(os.path.join(gitarsenal_root, "kill_claude", "tools", "bash_tool.py"), "/python/kill_claude/tools/bash_tool.py")
-        .add_local_file(os.path.join(gitarsenal_root, "kill_claude", "tools", "read_tool.py"), "/python/kill_claude/tools/read_tool.py")
-        .add_local_file(os.path.join(gitarsenal_root, "kill_claude", "tools", "write_tool.py"), "/python/kill_claude/tools/write_tool.py")
-        .add_local_file(os.path.join(gitarsenal_root, "kill_claude", "tools", "ls_tool.py"), "/python/kill_claude/tools/ls_tool.py")
-        .add_local_file(os.path.join(gitarsenal_root, "kill_claude", "tools", "edit_tool.py"), "/python/kill_claude/tools/edit_tool.py")
-        .add_local_file(os.path.join(gitarsenal_root, "kill_claude", "tools", "grep_tool.py"), "/python/kill_claude/tools/grep_tool.py")
-        .add_local_file(os.path.join(gitarsenal_root, "kill_claude", "tools", "glob_tool.py"), "/python/kill_claude/tools/glob_tool.py")
-        .add_local_file(os.path.join(gitarsenal_root, "kill_claude", "tools", "todo_write_tool.py"), "/python/kill_claude/tools/todo_write_tool.py")
-        .add_local_file(os.path.join(gitarsenal_root, "kill_claude", "prompts", "claude-code-system-prompt.md"), "/python/kill_claude/prompts/claude-code-system-prompt.md")
-        .add_local_file(os.path.join(gitarsenal_root, "kill_claude", "prompts", "claude-code-agent-prompts.md"), "/python/kill_claude/prompts/claude-code-agent-prompts.md")
+        # Mount entire directories instead of individual files
+        .add_local_dir(current_dir, "/python", ignore=lambda p: not p.name.endswith('.py'))  # Mount all Python files from current directory
+        .add_local_dir(os.path.join(gitarsenal_root, "kill_claude"), "/python/kill_claude")  # Mount entire kill_claude directory with all subdirectories
 
     )
     print("✅ SSH image built successfully")
@@ -437,7 +420,7 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
         volumes=volumes_config if volumes_config else None,
     )
     def ssh_container_function(ssh_password=None, repo_url=None, repo_name=None, setup_commands=None, openai_api_key=None, anthropic_api_key=None, stored_credentials=None):
-        """Start SSH container with password authentication and intelligent repository setup using Claude Code Agent."""
+        """Start SSH container with password authentication and intelligent repository setup using Agent."""
         import subprocess
         import time
         import os
@@ -514,11 +497,11 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
         # Start SSH service
         subprocess.run(["service", "ssh", "start"], check=True)
         
-        # Use Claude Code Agent for intelligent repository setup
+        # Use Agent for intelligent repository setup
         if repo_url:
-            print("🤖 Using Claude Code Agent for intelligent repository setup...")
+            print("🤖 Using Agent for intelligent repository setup...")
             
-            # Set up environment variables for the Claude Code Agent
+            # Set up environment variables for the Agent
             if openai_api_key:
                 os.environ['OPENAI_API_KEY'] = openai_api_key
             if anthropic_api_key:
@@ -537,13 +520,13 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                         
                 if not anthropic_api_key:
                     print("⚠️ No Anthropic API key found in stored credentials")
-                    print("💡 Claude Code Agent will require an Anthropic API key for operation")
+                    print("💡 Agent will require an Anthropic API key for operation")
             
             try:
-                print("🔧 Running Claude Code Agent for repository setup...")
+                print("🔧 Running Agent for repository setup...")
                 
                 print("\n" + "="*80)
-                print("🤖 CLAUDE CODE AGENT REPOSITORY SETUP")
+                print("🤖 AGENT REPOSITORY SETUP")
                 print("="*80)
                 print(f"Repository: {repo_url}")
                 print(f"Working Directory: /root")
@@ -551,36 +534,51 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
                     print(f"Available Credentials: {len(stored_credentials)} items")
                 print("="*80 + "\n")
                 
-                # Call Claude Code Agent directly as subprocess
-                claude_prompt = f"clone and setup {repo_url}"
-                print(f"🚀 Executing: python /python/kill_claude/claude_code_agent.py \"{claude_prompt}\"")
+                # Call Agent directly as subprocess with real-time output
+                claude_prompt = f"clone, setup and run {repo_url}"
+                print(f"🚀 Executing the task: \"{claude_prompt}\"")
+                print("\n" + "="*60)
+                print("🎉 AGENT OUTPUT (LIVE)")
+                print("="*60)
                 
-                result = subprocess.run(
+                # Use Popen for real-time output streaming
+                process = subprocess.Popen(
                     ["python", "/python/kill_claude/claude_code_agent.py", claude_prompt],
                     cwd="/root",
-                    capture_output=True,
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.STDOUT,  # Merge stderr into stdout
                     text=True,
-                    timeout=600  # 10 minute timeout
+                    bufsize=1,  # Line buffered
+                    universal_newlines=True
                 )
                 
-                print("\n" + "="*60)
-                print("🎉 CLAUDE CODE AGENT OUTPUT")
-                print("="*60)
-                
-                if result.stdout:
-                    print("📋 STDOUT:")
-                    print(result.stdout)
+                # Stream output in real-time
+                try:
+                    while True:
+                        output = process.stdout.readline()
+                        if output == '' and process.poll() is not None:
+                            break
+                        if output:
+                            print(output.rstrip())
                     
-                if result.stderr:
-                    print("⚠️ STDERR:")
-                    print(result.stderr)
+                    # Wait for process to complete and get return code
+                    return_code = process.wait(timeout=600)  # 10 minute timeout
                     
-                if result.returncode == 0:
-                    print("✅ Claude Code Agent completed successfully!")
-                else:
-                    print(f"⚠️ Claude Code Agent exited with code: {result.returncode}")
-                
-                print("="*60)
+                    print("\n" + "="*60)
+                    if return_code == 0:
+                        print("✅ Agent completed successfully!")
+                    else:
+                        print(f"⚠️ Agent exited with code: {return_code}")
+                    print("="*60)
+                    
+                except subprocess.TimeoutExpired:
+                    print("\n⚠️ Agent timed out after 10 minutes")
+                    process.kill()
+                    process.wait()
+                except Exception as stream_error:
+                    print(f"\n⚠️ Error streaming output: {stream_error}")
+                    process.kill()
+                    process.wait()
                 
             except Exception as e:
                 print(f"❌ Error during repository setup: {e}")
@@ -626,11 +624,11 @@ def create_modal_ssh_container(gpu_type, repo_url=None, repo_name=None, setup_co
             with app.run():
                 # Get the API key from environment
                 api_key = os.environ.get("OPENAI_API_KEY")
-                print(f"🔐 API key: {api_key}")
+                # print(f"🔐 API key: {api_key}")
                 
                 # Get stored credentials from local file
                 stored_credentials = get_stored_credentials()
-                print(f"🔐 Stored credentials: {stored_credentials}")
+                # print(f"🔐 Stored credentials: {stored_credentials}")
                 if stored_credentials:
                     print(f"🔐 Found {len(stored_credentials)} stored credentials to send to container")
                 else:
@@ -1093,10 +1091,10 @@ def show_usage_examples():
     print("│ gitarsenal --auth                         # Interactive auth management         │")
     print("└────────────────────────────────────────────────────────────────────────────────────┘\n")
     
-    print("Basic Container Creation with Claude Code Agent")
+    print("Basic Container Creation with Agent")
     print("┌────────────────────────────────────────────────────────────────────────┐")
     print("│ gitarsenal --gpu A10G --repo-url https://github.com/username/repo.git  │")
-    print("│ # Claude Code Agent will intelligently clone and setup the repository  │")
+    print("│ # Agent will intelligently clone and setup the repository  │")
     print("└────────────────────────────────────────────────────────────────────────┘\n")
     
     print("With Persistent Storage")
@@ -1114,13 +1112,13 @@ def show_usage_examples():
     print("Intelligent Repository Setup (default)")
     print("┌────────────────────────────────────────────────────────────────────────────────────┐")
     print("│ gitarsenal --gpu A10G --repo-url https://github.com/username/repo.git             │")
-    print("│ # Claude Code Agent analyzes repo and sets up environment automatically           │")
+    print("│ # Agent analyzes repo and sets up environment automatically           │")
     print("└────────────────────────────────────────────────────────────────────────────────────┘\n")
     
     print("With Manual Setup Commands (Advanced)")
     print("┌────────────────────────────────────────────────────────────────────────────────────┐")
     print("│ gitarsenal --gpu A10G --setup-commands \"pip install torch\" \"python train.py\"     │")
-    print("│ # Only use when not providing --repo-url (bypasses Claude Code Agent)            │")
+    print("│ # Only use when not providing --repo-url (bypasses Agent)            │")
     print("└────────────────────────────────────────────────────────────────────────────────────┘\n")
     
     print("Development Mode (Skip Authentication)")
@@ -1142,7 +1140,7 @@ def show_usage_examples():
     print("  • Without --gpu: Shows interactive GPU selection menu")
     print()
     print("Repository Setup Behavior:")
-    print("  • With --repo-url: Claude Code Agent intelligently clones and sets up repository")
+    print("  • With --repo-url Agent intelligently clones and sets up repository")
     print("  • Without --repo-url: Manual container setup (no automatic repository setup)")
     print("  • Legacy --setup-commands: Only used when --repo-url not provided")
     print()
@@ -1816,9 +1814,9 @@ if __name__ == "__main__":
     parser.add_argument('--volume-name', type=str, help='Name of the Modal volume for persistent storage')
     parser.add_argument('--timeout', type=int, default=60, help='Container timeout in minutes (default: 60)')
     parser.add_argument('--ssh-password', type=str, help='SSH password (random if not provided)')
-    parser.add_argument('--use-api', action='store_true', help='[DEPRECATED] Fetch setup commands from original API (use --repo-url for Claude Code Agent instead)')
-    parser.add_argument('--use-gitingest', action='store_true', default=True, help='[DEPRECATED] Use gitingest approach (Claude Code Agent is now used when --repo-url is provided)')
-    parser.add_argument('--no-gitingest', action='store_true', help='[DEPRECATED] Disable gitingest approach (no longer needed with Claude Code Agent)')
+    parser.add_argument('--use-api', action='store_true', help='[DEPRECATED] Fetch setup commands from original API (use --repo-url for Agent instead)')
+    parser.add_argument('--use-gitingest', action='store_true', default=True, help='[DEPRECATED] Use gitingest approach (Agent is now used when --repo-url is provided)')
+    parser.add_argument('--no-gitingest', action='store_true', help='[DEPRECATED] Disable gitingest approach (no longer needed with Agent)')
     parser.add_argument('--show-examples', action='store_true', help='Show usage examples')
     parser.add_argument('--list-gpus', action='store_true', help='List available GPU types with their specifications')
     parser.add_argument('--interactive', action='store_true', help='Run in interactive mode with prompts')
@@ -1951,7 +1949,7 @@ if __name__ == "__main__":
         print(f"GPU Type: {gpu_type}")
     print(f"Volume: {args.volume_name or 'None'}")
     if args.repo_url:
-        print("Repository Setup: Claude Code Agent (intelligent)")
+        print("Repository Setup: Agent (intelligent)")
     elif args.use_api:
         print("Setup Commands: Auto-detect from repository")
     elif args.setup_commands:
@@ -2037,13 +2035,13 @@ if __name__ == "__main__":
         args.use_gitingest = use_gitingest
     
     try:    
-        # Setup commands are no longer used when repo_url is provided (Claude Code Agent handles setup)
+        # Setup commands are no longer used when repo_url is provided ( Agent handles setup)
         setup_commands = args.setup_commands or []
         
         # Repository setup approach
         if args.repo_url:
-            print("🤖 Repository setup will be handled by Claude Code Agent in container")
-            setup_commands = []  # Claude Code Agent will handle setup intelligently
+            print("🤖 Repository setup will be handled by Agent in container")
+            setup_commands = []  # Agent will handle setup intelligently
         else:
             print("⚠️ No repository URL provided - setup commands may be needed manually")