code-puppy 0.0.132__py3-none-any.whl → 0.0.134__py3-none-any.whl

code_puppy/command_line/mcp_commands.py

@@ -597,6 +597,12 @@ class MCPCommandHandler:
         import uuid
         group_id = str(uuid.uuid4())
         
+        # Check if in TUI mode and guide user to use Ctrl+T instead
+        if is_tui_mode() and not args:
+            emit_info("💡 In TUI mode, press Ctrl+T to open the MCP Install Wizard", message_group=group_id)
+            emit_info("   The wizard provides a better interface for browsing and installing MCP servers.", message_group=group_id)
+            return
+        
         try:
             if args:
                 # Parse JSON from arguments

code_puppy/mcp/managed_server.py

@@ -18,6 +18,7 @@ from pydantic_ai import RunContext
 
 from pydantic_ai.mcp import MCPServerSSE, MCPServerStdio, MCPServerStreamableHTTP, CallToolFunc, ToolResult
 
+from code_puppy.http_utils import create_async_client
 from code_puppy.messaging import emit_info
 from code_puppy.mcp.blocking_startup import BlockingMCPServerStdio
 
@@ -251,11 +252,11 @@ class ManagedMCPServer:
         """
         headers = self.config.config.get("headers", {})
         timeout = self.config.config.get("timeout", 30)
-        
-        return httpx.AsyncClient(
+        client = create_async_client(
             headers=headers,
             timeout=timeout
         )
+        return client
     
     def enable(self) -> None:
         """Enable server availability."""

code_puppy/tui/screens/mcp_install_wizard.py

@@ -31,8 +31,9 @@ class MCPInstallWizardScreen(ModalScreen):
         super().__init__(**kwargs)
         self.selected_server = None
         self.env_vars = {}
-        self.step = "search"  # search -> configure -> install
+        self.step = "search"  # search -> configure -> install -> custom_json
         self.search_counter = 0  # Counter to ensure unique IDs
+        self.custom_json_mode = False  # Track if we're in custom JSON mode
 
     DEFAULT_CSS = """
     MCPInstallWizardScreen {
@@ -139,6 +140,43 @@ class MCPInstallWizardScreen(ModalScreen):
         width: 2fr;
         border: solid $primary;
     }
+    
+    #custom-json-container {
+        width: 100%;
+        height: 1fr;
+        layout: vertical;
+        display: none;
+        padding: 1;
+    }
+    
+    #custom-json-header {
+        width: 100%;
+        height: 2;
+        text-align: left;
+        color: $warning;
+        margin-bottom: 1;
+    }
+    
+    #custom-name-input {
+        width: 100%;
+        margin-bottom: 1;
+        border: solid $primary;
+    }
+    
+    #custom-json-input {
+        width: 100%;
+        height: 1fr;
+        border: solid $primary;
+        margin-bottom: 1;
+        background: $surface-darken-1;
+    }
+    
+    #custom-json-button {
+        width: auto;
+        height: 3;
+        margin: 0 1;
+        min-width: 14;
+    }
     """
 
     def compose(self) -> ComposeResult:
@@ -157,10 +195,17 @@ class MCPInstallWizardScreen(ModalScreen):
                 yield Container(id="server-info")
                 yield Container(id="env-vars-container")
             
+            # Step 3: Custom JSON configuration (hidden initially)
+            with Container(id="custom-json-container"):
+                yield Static("📝 Custom JSON Configuration", id="custom-json-header")
+                yield Input(placeholder="Server name (e.g. 'my-sqlite-db')", id="custom-name-input")
+                yield TextArea(id="custom-json-input")
+            
             # Navigation buttons
             with Horizontal(id="button-container"):
                 yield Button("Cancel", id="cancel-button", variant="default")
                 yield Button("Back", id="back-button", variant="default")
+                yield Button("Custom JSON", id="custom-json-button", variant="warning")
                 yield Button("Next", id="next-button", variant="primary")
                 yield Button("Install", id="install-button", variant="success")
 
@@ -176,40 +221,78 @@ class MCPInstallWizardScreen(ModalScreen):
     def _show_search_step(self) -> None:
         """Show the search step."""
         self.step = "search"
+        self.custom_json_mode = False
         self.query_one("#search-container").display = True
         self.query_one("#config-container").display = False
+        self.query_one("#custom-json-container").display = False
         
         self.query_one("#back-button").display = False
+        self.query_one("#custom-json-button").display = True
         self.query_one("#next-button").display = True
         self.query_one("#install-button").display = False
 
     def _show_config_step(self) -> None:
         """Show the configuration step."""
         self.step = "configure"
+        self.custom_json_mode = False
         self.query_one("#search-container").display = False
         self.query_one("#config-container").display = True
+        self.query_one("#custom-json-container").display = False
         
         self.query_one("#back-button").display = True
+        self.query_one("#custom-json-button").display = False
         self.query_one("#next-button").display = False
         self.query_one("#install-button").display = True
         
         self._setup_server_config()
+    
+    def _show_custom_json_step(self) -> None:
+        """Show the custom JSON configuration step."""
+        self.step = "custom_json"
+        self.custom_json_mode = True
+        self.query_one("#search-container").display = False
+        self.query_one("#config-container").display = False
+        self.query_one("#custom-json-container").display = True
+        
+        self.query_one("#back-button").display = True
+        self.query_one("#custom-json-button").display = False
+        self.query_one("#next-button").display = False
+        self.query_one("#install-button").display = True
+        
+        # Pre-populate with SQLite example
+        name_input = self.query_one("#custom-name-input", Input)
+        name_input.value = "my-sqlite-db"
+        
+        json_input = self.query_one("#custom-json-input", TextArea)
+        json_input.text = """{
+  "type": "stdio",
+  "command": "npx",
+  "args": ["-y", "@modelcontextprotocol/server-sqlite", "./database.db"],
+  "timeout": 30
+}"""
+        
+        # Focus the name input
+        name_input.focus()
 
     def _load_popular_servers(self) -> None:
-        """Load popular servers into the list."""
+        """Load all available servers into the list."""
         self.search_counter += 1
         counter = self.search_counter
         
         try:
             from code_puppy.mcp.server_registry_catalog import catalog
-            servers = catalog.get_popular(10)
+            # Load ALL servers instead of just popular ones
+            servers = catalog.servers
             
             results_list = self.query_one("#results-list", ListView)
             # Force clear by removing all children
             results_list.remove_children()
             
             if servers:
-                for i, server in enumerate(servers):
+                # Sort servers to show popular and verified first
+                sorted_servers = sorted(servers, key=lambda s: (not s.popular, not s.verified, s.display_name))
+                
+                for i, server in enumerate(sorted_servers):
                     indicators = []
                     if server.verified:
                         indicators.append("✓")
@@ -240,7 +323,7 @@ class MCPInstallWizardScreen(ModalScreen):
         query = event.value.strip()
         
         if not query:
-            self._load_popular_servers()
+            self._load_popular_servers()  # This now loads all servers
             return
         
         self.search_counter += 1
@@ -301,12 +384,21 @@ class MCPInstallWizardScreen(ModalScreen):
         """Handle back button click."""
         if self.step == "configure":
             self._show_search_step()
+        elif self.step == "custom_json":
+            self._show_search_step()
 
+    @on(Button.Pressed, "#custom-json-button")
+    def on_custom_json_clicked(self) -> None:
+        """Handle custom JSON button click."""
+        self._show_custom_json_step()
+    
     @on(Button.Pressed, "#install-button")
     def on_install_clicked(self) -> None:
         """Handle install button click."""
         if self.step == "configure" and self.selected_server:
             self._install_server()
+        elif self.step == "custom_json":
+            self._install_custom_json()
 
     @on(Button.Pressed, "#cancel-button")
     def on_cancel_clicked(self) -> None:
@@ -587,6 +679,95 @@ class MCPInstallWizardScreen(ModalScreen):
                 "message": f"Installation failed: {str(e)}"
             })
 
+    def _install_custom_json(self) -> None:
+        """Install server from custom JSON configuration."""
+        try:
+            name_input = self.query_one("#custom-name-input", Input)
+            json_input = self.query_one("#custom-json-input", TextArea)
+            
+            server_name = name_input.value.strip()
+            json_text = json_input.text.strip()
+            
+            if not server_name:
+                # Show error - need a name
+                return
+            
+            if not json_text:
+                # Show error - need JSON config
+                return
+            
+            # Parse JSON
+            try:
+                config_dict = json.loads(json_text)
+            except json.JSONDecodeError as e:
+                # Show error - invalid JSON
+                return
+            
+            # Validate required fields
+            if 'type' not in config_dict:
+                # Show error - missing type
+                return
+            
+            # Extract type and create server config
+            server_type = config_dict.pop('type')
+            
+            # Create and register the server
+            from code_puppy.mcp import ServerConfig
+            from code_puppy.mcp.manager import get_mcp_manager
+            
+            server_config = ServerConfig(
+                id=server_name,
+                name=server_name,
+                type=server_type,
+                enabled=True,
+                config=config_dict
+            )
+            
+            manager = get_mcp_manager()
+            server_id = manager.register_server(server_config)
+            
+            if server_id:
+                # Save to mcp_servers.json
+                from code_puppy.config import MCP_SERVERS_FILE
+                
+                if os.path.exists(MCP_SERVERS_FILE):
+                    with open(MCP_SERVERS_FILE, 'r') as f:
+                        data = json.load(f)
+                        servers = data.get("mcp_servers", {})
+                else:
+                    servers = {}
+                    data = {"mcp_servers": servers}
+                
+                # Add the full config including type
+                full_config = config_dict.copy()
+                full_config['type'] = server_type
+                servers[server_name] = full_config
+                
+                os.makedirs(os.path.dirname(MCP_SERVERS_FILE), exist_ok=True)
+                with open(MCP_SERVERS_FILE, 'w') as f:
+                    json.dump(data, f, indent=2)
+                
+                # Reload MCP servers
+                from code_puppy.agent import reload_mcp_servers
+                reload_mcp_servers()
+                
+                self.dismiss({
+                    "success": True,
+                    "message": f"Successfully installed custom server '{server_name}'",
+                    "server_name": server_name
+                })
+            else:
+                self.dismiss({
+                    "success": False,
+                    "message": "Failed to register custom server"
+                })
+                
+        except Exception as e:
+            self.dismiss({
+                "success": False,
+                "message": f"Installation failed: {str(e)}"
+            })
+    
     def on_key(self, event) -> None:
         """Handle key events."""
         if event.key == "escape":

{code_puppy-0.0.132.dist-info → code_puppy-0.0.134.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.132
+Version: 0.0.134
 Summary: Code generation agent
 Project-URL: repository, https://github.com/mpfaffenberger/code_puppy
 Project-URL: HomePage, https://github.com/mpfaffenberger/code_puppy

{code_puppy-0.0.132.dist-info → code_puppy-0.0.134.dist-info}/RECORD

@@ -25,7 +25,7 @@ code_puppy/command_line/__init__.py,sha256=y7WeRemfYppk8KVbCGeAIiTuiOszIURCDjOMZ
 code_puppy/command_line/command_handler.py,sha256=IhDaDa0GmpW0BCFfmkgpL_6iQBJlXEKQC9SDmpj_XeI,20730
 code_puppy/command_line/file_path_completion.py,sha256=gw8NpIxa6GOpczUJRyh7VNZwoXKKn-yvCqit7h2y6Gg,2931
 code_puppy/command_line/load_context_completion.py,sha256=6eZxV6Bs-EFwZjN93V8ZDZUC-6RaWxvtZk-04Wtikyw,2240
-code_puppy/command_line/mcp_commands.py,sha256=X0Djmcr1ZAVZyr9DkQWb9uMrQDa4lBU28b4m_qteBvI,78406
+code_puppy/command_line/mcp_commands.py,sha256=v9faF0G3Ux_JwiQRUPEfvvy1DRDylHyrhCPnrBuwngM,78784
 code_puppy/command_line/meta_command_handler.py,sha256=02NU4Lspf5qRMPTsrGiMRLSUshZhdmS0XQA26k8vUjw,5665
 code_puppy/command_line/model_picker_completion.py,sha256=xvwgthVmLRA9a8RJG6iFImxR2yD6rJYPJJav0YJoVCc,3599
 code_puppy/command_line/motd.py,sha256=PEdkp3ZnydVfvd7mNJylm8YyFNUKg9jmY6uwkA1em8c,2152
@@ -40,7 +40,7 @@ code_puppy/mcp/config_wizard.py,sha256=d0o29ZcnGLdpV778nwTUAPH7B8lHAC2XggU-ql37F
 code_puppy/mcp/dashboard.py,sha256=fHBdAVidQUWuhjMjF7hIy0SjrQlrz31zSqzqJv8H2eI,9396
 code_puppy/mcp/error_isolation.py,sha256=xw8DGTItT8-RY5TVYzORtrtfdI1s1ZfUUT88Pr7h_pI,12270
 code_puppy/mcp/health_monitor.py,sha256=oNgPyEwzkF61gNc7nk-FJU_yO2MERjASn4g5shcabic,20428
-code_puppy/mcp/managed_server.py,sha256=z0uA9JFtThVxno0TZpa5nlsvRVe2tNnZrMJYymj600E,14932
+code_puppy/mcp/managed_server.py,sha256=ULz4AF9bBasg6Ou0HBZ9YPqmxc1eB1-o5dXOBq-l-BA,15003
 code_puppy/mcp/manager.py,sha256=ZfYoz3nmQqrkSnDzgr9s_QvGKFCthA1bvt3gQm0W6VI,27280
 code_puppy/mcp/registry.py,sha256=YJ-VPFjk1ZFrSftbu9bKVIWvGYX4zIk2TnrM_h_us1M,15841
 code_puppy/mcp/retry_manager.py,sha256=B4q1MyzZQ9RZRW3FKhyqhq-ebSG8Do01j4A70zHTxgA,10988
@@ -82,7 +82,7 @@ code_puppy/tui/models/command_history.py,sha256=bPWr_xnyQvjG5tPg_5pwqlEzn2fR170H
 code_puppy/tui/models/enums.py,sha256=1ulsei95Gxy4r1sk-m-Sm5rdmejYCGRI-YtUwJmKFfM,501
 code_puppy/tui/screens/__init__.py,sha256=Sa_R_caykfsa7D55Zuc9VYpFfmQZAYxBFxfn_7Qe41M,287
 code_puppy/tui/screens/help.py,sha256=eJuPaOOCp7ZSUlecearqsuX6caxWv7NQszUh0tZJjBM,3232
-code_puppy/tui/screens/mcp_install_wizard.py,sha256=bw16ygvulKYaz8TkYXl0C6wGsMoay4oIIHyVWXnCA2I,21641
+code_puppy/tui/screens/mcp_install_wizard.py,sha256=sUaoJa03xqpK5CUCOYbnMffD8IrLRzPid82o2SupVF4,28219
 code_puppy/tui/screens/settings.py,sha256=GMpv-qa08rorAE9mj3AjmqjZFPhmeJ_GWd-DBHG6iAA,10671
 code_puppy/tui/screens/tools.py,sha256=3pr2Xkpa9Js6Yhf1A3_wQVRzFOui-KDB82LwrsdBtyk,1715
 code_puppy/tui/tests/__init__.py,sha256=Fzb4un4eeKfaKsIa5tqI5pTuwfpS8qD7Z6W7KeqWe84,23
@@ -105,9 +105,9 @@ code_puppy/tui/tests/test_sidebar_history_navigation.py,sha256=JGiyua8A2B8dLfwiE
 code_puppy/tui/tests/test_status_bar.py,sha256=nYT_FZGdmqnnbn6o0ZuOkLtNUtJzLSmtX8P72liQ5Vo,1797
 code_puppy/tui/tests/test_timestamped_history.py,sha256=nVXt9hExZZ_8MFP-AZj4L4bB_1Eo_mc-ZhVICzTuw3I,1799
 code_puppy/tui/tests/test_tools.py,sha256=kgzzAkK4r0DPzQwHHD4cePpVNgrHor6cFr05Pg6DBWg,2687
-code_puppy-0.0.132.data/data/code_puppy/models.json,sha256=GpvtWnBKERm6T7HCZJQUIVAS5256-tZ_bFuRtnKXEsY,3128
-code_puppy-0.0.132.dist-info/METADATA,sha256=0uc8Pfj8Q1TUbxKCS3woA3ezguSmOrMN_if4tEFQLIA,19873
-code_puppy-0.0.132.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-code_puppy-0.0.132.dist-info/entry_points.txt,sha256=d8YkBvIUxF-dHNJAj-x4fPEqizbY5d_TwvYpc01U5kw,58
-code_puppy-0.0.132.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
-code_puppy-0.0.132.dist-info/RECORD,,
+code_puppy-0.0.134.data/data/code_puppy/models.json,sha256=GpvtWnBKERm6T7HCZJQUIVAS5256-tZ_bFuRtnKXEsY,3128
+code_puppy-0.0.134.dist-info/METADATA,sha256=l6rRGnt2D52-BORKDBDxSrjQPh6lrE4EPKPeTG7Ptmg,19873
+code_puppy-0.0.134.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+code_puppy-0.0.134.dist-info/entry_points.txt,sha256=d8YkBvIUxF-dHNJAj-x4fPEqizbY5d_TwvYpc01U5kw,58
+code_puppy-0.0.134.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
+code_puppy-0.0.134.dist-info/RECORD,,