code-puppy 0.0.336__py3-none-any.whl → 0.0.348__py3-none-any.whl

code_puppy/command_line/mcp/custom_server_form.py

@@ -43,7 +43,7 @@ CUSTOM_SERVER_EXAMPLES = {
   "type": "http",
   "url": "http://localhost:8080/mcp",
   "headers": {
-    "Authorization": "Bearer YOUR_API_KEY",
+    "Authorization": "Bearer $MY_API_KEY",
     "Content-Type": "application/json"
   },
   "timeout": 30
@@ -52,7 +52,7 @@ CUSTOM_SERVER_EXAMPLES = {
   "type": "sse",
   "url": "http://localhost:8080/sse",
   "headers": {
-    "Authorization": "Bearer YOUR_API_KEY"
+    "Authorization": "Bearer $MY_API_KEY"
   }
 }""",
 }
@@ -367,24 +367,59 @@ class CustomServerForm:
         config_dict = json.loads(self.json_config)
 
         try:
-            server_config = ServerConfig(
-                id=server_name,
-                name=server_name,
-                type=server_type,
-                enabled=True,
-                config=config_dict,
-            )
-
-            # Register with manager
-            server_id = self.manager.register_server(server_config)
-
-            if not server_id:
-                self.validation_error = "Failed to register server"
-                self.status_message = (
-                    "Save failed: Could not register server (name may already exist)"
+            # In edit mode, find the existing server and update it
+            if self.edit_mode and self.original_name:
+                existing_config = self.manager.get_server_by_name(self.original_name)
+                if existing_config:
+                    # Use the existing server's ID for the update
+                    server_config = ServerConfig(
+                        id=existing_config.id,
+                        name=server_name,
+                        type=server_type,
+                        enabled=True,
+                        config=config_dict,
+                    )
+
+                    # Update the server in the manager
+                    success = self.manager.update_server(
+                        existing_config.id, server_config
+                    )
+
+                    if not success:
+                        self.validation_error = "Failed to update server"
+                        self.status_message = "Save failed: Could not update server"
+                        self.status_is_error = True
+                        return False
+
+                    server_id = existing_config.id
+                else:
+                    # Original server not found, treat as new registration
+                    server_config = ServerConfig(
+                        id=server_name,
+                        name=server_name,
+                        type=server_type,
+                        enabled=True,
+                        config=config_dict,
+                    )
+                    server_id = self.manager.register_server(server_config)
+            else:
+                # New server - register it
+                server_config = ServerConfig(
+                    id=server_name,
+                    name=server_name,
+                    type=server_type,
+                    enabled=True,
+                    config=config_dict,
                 )
-                self.status_is_error = True
-                return False
+
+                # Register with manager
+                server_id = self.manager.register_server(server_config)
+
+                if not server_id:
+                    self.validation_error = "Failed to register server"
+                    self.status_message = "Save failed: Could not register server (name may already exist)"
+                    self.status_is_error = True
+                    return False
 
             # Save to mcp_servers.json for persistence
             if os.path.exists(MCP_SERVERS_FILE):

code_puppy/command_line/mcp/custom_server_installer.py

@@ -7,6 +7,7 @@ custom MCP servers with JSON configuration.
 import json
 import os
 
+from code_puppy.command_line.utils import safe_input
 from code_puppy.messaging import emit_error, emit_info, emit_success, emit_warning
 
 # Example configurations for each server type
@@ -24,7 +25,7 @@ CUSTOM_SERVER_EXAMPLES = {
   "type": "http",
   "url": "http://localhost:8080/mcp",
   "headers": {
-    "Authorization": "Bearer YOUR_API_KEY",
+    "Authorization": "Bearer $MY_API_KEY",
     "Content-Type": "application/json"
   },
   "timeout": 30
@@ -33,7 +34,7 @@ CUSTOM_SERVER_EXAMPLES = {
   "type": "sse",
   "url": "http://localhost:8080/sse",
   "headers": {
-    "Authorization": "Bearer YOUR_API_KEY"
+    "Authorization": "Bearer $MY_API_KEY"
   }
 }""",
 }
@@ -58,7 +59,7 @@ def prompt_and_install_custom_server(manager) -> bool:
 
     # Get server name
     try:
-        server_name = input("  Server name: ").strip()
+        server_name = safe_input("  Server name: ")
         if not server_name:
             emit_warning("Server name is required")
             return False
@@ -71,9 +72,7 @@ def prompt_and_install_custom_server(manager) -> bool:
     existing = find_server_id_by_name(manager, server_name)
     if existing:
         try:
-            override = input(
-                f"  Server '{server_name}' exists. Override? [y/N]: "
-            ).strip()
+            override = safe_input(f"  Server '{server_name}' exists. Override? [y/N]: ")
             if not override.lower().startswith("y"):
                 emit_warning("Cancelled")
                 return False
@@ -89,7 +88,7 @@ def prompt_and_install_custom_server(manager) -> bool:
     emit_info("    3. 📡 sse    - Server-Sent Events\n")
 
     try:
-        type_choice = input("  Enter choice [1-3]: ").strip()
+        type_choice = safe_input("  Enter choice [1-3]: ")
     except (KeyboardInterrupt, EOFError):
         emit_info("")
         emit_warning("Cancelled")
@@ -115,8 +114,8 @@ def prompt_and_install_custom_server(manager) -> bool:
     empty_count = 0
     try:
         while True:
-            line = input()
-            if line.strip() == "":
+            line = safe_input("")
+            if line == "":
                 empty_count += 1
                 if empty_count >= 2:
                     break

code_puppy/command_line/mcp/handler.py

@@ -12,7 +12,6 @@ from rich.text import Text
 
 from code_puppy.messaging import emit_info
 
-from .add_command import AddCommand
 from .base import MCPCommandBase
 from .edit_command import EditCommand
 from .help_command import HelpCommand
@@ -63,7 +62,6 @@ class MCPCommandHandler(MCPCommandBase):
             "restart": RestartCommand(),
             "status": StatusCommand(),
             "test": TestCommand(),
-            "add": AddCommand(),
             "edit": EditCommand(),
             "remove": RemoveCommand(),
             "logs": LogsCommand(),

code_puppy/command_line/mcp/help_command.py

@@ -101,10 +101,6 @@ class HelpCommand(MCPCommandBase):
                 Text("/mcp logs", style="cyan")
                 + Text(" <name> [limit] Show recent events (default limit: 10)")
             )
-            help_lines.append(
-                Text("/mcp add", style="cyan")
-                + Text(" [json]         Add new server (JSON or wizard)")
-            )
             help_lines.append(
                 Text("/mcp edit", style="cyan")
                 + Text(" <name>        Edit existing server config")
@@ -134,7 +130,7 @@ class HelpCommand(MCPCommandBase):
 /mcp start-all           # Start all servers at once
 /mcp stop-all            # Stop all running servers
 /mcp edit filesystem     # Edit an existing server config
-/mcp add {"name": "test", "type": "stdio", "command": "echo"}"""
+/mcp remove filesystem # Remove a server"""
             help_lines.append(Text(examples_text, style="dim"))
 
             # Combine all lines

code_puppy/command_line/mcp/start_command.py

@@ -3,7 +3,6 @@ MCP Start Command - Starts a specific MCP server.
 """
 
 import logging
-import time
 from typing import List, Optional
 
 from rich.text import Text
@@ -23,6 +22,7 @@ class StartCommand(MCPCommandBase):
     Command handler for starting MCP servers.
 
     Starts a specific MCP server by name and reloads the agent.
+    The server subprocess starts asynchronously in the background.
     """
 
     def execute(self, args: List[str], group_id: Optional[str] = None) -> None:
@@ -56,31 +56,49 @@ class StartCommand(MCPCommandBase):
                 suggest_similar_servers(self.manager, server_name, group_id=group_id)
                 return
 
-            # Start the server (enable and start process)
+            # Get server info for better messaging (safely handle missing method)
+            server_type = "unknown"
+            try:
+                if hasattr(self.manager, "get_server_by_name"):
+                    server_config = self.manager.get_server_by_name(server_name)
+                    server_type = (
+                        getattr(server_config, "type", "unknown")
+                        if server_config
+                        else "unknown"
+                    )
+            except Exception:
+                pass  # Default to unknown type if we can't determine it
+
+            # Start the server (schedules async start in background)
             success = self.manager.start_server_sync(server_id)
 
             if success:
-                # This and subsequent messages will auto-group with the first message
-                emit_success(
-                    f"Started server: {server_name}",
-                    message_group=group_id,
-                )
-
-                # Give async tasks a moment to complete
-                try:
-                    import asyncio
-
-                    asyncio.get_running_loop()  # Check if in async context
-                    # If we're in async context, wait a bit for server to start
-                    time.sleep(0.5)  # Small delay to let async tasks progress
-                except RuntimeError:
-                    pass  # No async loop, server will start when agent uses it
+                if server_type == "stdio":
+                    # Stdio servers start subprocess asynchronously
+                    emit_success(
+                        f"🚀 Starting server: {server_name} (subprocess starting in background)",
+                        message_group=group_id,
+                    )
+                    emit_info(
+                        Text.from_markup(
+                            "[dim]Tip: Use /mcp status to check if the server is fully initialized[/dim]"
+                        ),
+                        message_group=group_id,
+                    )
+                else:
+                    # SSE/HTTP servers connect on first use
+                    emit_success(
+                        f"✅ Enabled server: {server_name}",
+                        message_group=group_id,
+                    )
 
                 # Reload the agent to pick up the newly enabled server
+                # NOTE: We don't block or wait - the server will be ready
+                # when the next prompt runs (pydantic-ai handles connection)
                 try:
                     agent = get_current_agent()
                     agent.reload_code_generation_agent()
-                    # Update MCP tool cache immediately so token counts reflect the change
+                    # Clear MCP tool cache - it will be repopulated on next run
                     agent.update_mcp_tool_cache_sync()
                     emit_info(
                         "Agent reloaded with updated servers",

code_puppy/command_line/onboarding_slides.py

@@ -122,7 +122,6 @@ def slide_mcp() -> str:
     content += "[white]Supercharge with external tools![/white]\n\n"
     content += "[green]Commands:[/green]\n"
     content += "  [cyan]/mcp install[/cyan]  Browse catalog\n"
-    content += "  [cyan]/mcp add[/cyan]      Add custom server\n"
     content += "  [cyan]/mcp list[/cyan]     See your servers\n\n"
     content += "[yellow]🌟 Popular picks:[/yellow]\n"
     content += "  • GitHub integration\n"

code_puppy/command_line/prompt_toolkit_completion.py

@@ -27,6 +27,10 @@ from code_puppy.command_line.attachments import (
     _detect_path_tokens,
     _tokenise,
 )
+from code_puppy.command_line.clipboard import (
+    capture_clipboard_image_to_pending,
+    has_image_in_clipboard,
+)
 from code_puppy.command_line.command_registry import get_unique_commands
 from code_puppy.command_line.file_path_completion import FilePathCompleter
 from code_puppy.command_line.load_context_completion import LoadContextCompleter
@@ -644,6 +648,126 @@ async def get_input_with_combined_completion(
         else:
             event.current_buffer.validate_and_handle()
 
+    # Handle bracketed paste - smart detection for text vs images.
+    # Most terminals (Windows included!) send Ctrl+V through bracketed paste.
+    # - If there's meaningful text content → paste as text (drag-and-drop file paths, copied text)
+    # - If text is empty/whitespace → check for clipboard image (image paste on Windows)
+    @bindings.add(Keys.BracketedPaste)
+    def handle_bracketed_paste(event):
+        """Handle bracketed paste - smart text vs image detection."""
+        pasted_data = event.data
+
+        # If we have meaningful text content, paste it (don't check for images)
+        # This handles drag-and-drop file paths and normal text paste
+        if pasted_data and pasted_data.strip():
+            # Normalize Windows line endings to Unix style
+            sanitized_data = pasted_data.replace("\r\n", "\n").replace("\r", "\n")
+            event.app.current_buffer.insert_text(sanitized_data)
+            return
+
+        # No meaningful text - check if clipboard has an image (Windows image paste!)
+        try:
+            if has_image_in_clipboard():
+                placeholder = capture_clipboard_image_to_pending()
+                if placeholder:
+                    event.app.current_buffer.insert_text(placeholder + " ")
+                    event.app.output.bell()
+                    return
+        except Exception:
+            pass
+
+        # Fallback: if there was whitespace-only data, paste it
+        if pasted_data:
+            sanitized_data = pasted_data.replace("\r\n", "\n").replace("\r", "\n")
+            event.app.current_buffer.insert_text(sanitized_data)
+
+    # Fallback Ctrl+V for terminals without bracketed paste support
+    @bindings.add("c-v", eager=True)
+    def handle_smart_paste(event):
+        """Handle Ctrl+V - auto-detect image vs text in clipboard."""
+        try:
+            # Check for image first
+            if has_image_in_clipboard():
+                placeholder = capture_clipboard_image_to_pending()
+                if placeholder:
+                    event.app.current_buffer.insert_text(placeholder + " ")
+                    # The placeholder itself is visible feedback - no need for extra output
+                    # Use bell for audible feedback (works in most terminals)
+                    event.app.output.bell()
+                    return  # Don't also paste text
+        except Exception:
+            pass  # Fall through to text paste on any error
+
+        # No image (or error) - do normal text paste
+        # prompt_toolkit doesn't have built-in paste, so we handle it manually
+        try:
+            import platform
+            import subprocess
+
+            text = None
+            system = platform.system()
+
+            if system == "Darwin":  # macOS
+                result = subprocess.run(
+                    ["pbpaste"], capture_output=True, text=True, timeout=2
+                )
+                if result.returncode == 0:
+                    text = result.stdout
+            elif system == "Windows":
+                # Windows - use powershell
+                result = subprocess.run(
+                    ["powershell", "-command", "Get-Clipboard"],
+                    capture_output=True,
+                    text=True,
+                    timeout=2,
+                )
+                if result.returncode == 0:
+                    text = result.stdout
+            else:  # Linux
+                # Try xclip first, then xsel
+                for cmd in [
+                    ["xclip", "-selection", "clipboard", "-o"],
+                    ["xsel", "--clipboard", "--output"],
+                ]:
+                    try:
+                        result = subprocess.run(
+                            cmd, capture_output=True, text=True, timeout=2
+                        )
+                        if result.returncode == 0:
+                            text = result.stdout
+                            break
+                    except FileNotFoundError:
+                        continue
+
+            if text:
+                # Normalize Windows line endings to Unix style
+                text = text.replace("\r\n", "\n").replace("\r", "\n")
+                # Strip trailing newline that clipboard tools often add
+                text = text.rstrip("\n")
+                event.app.current_buffer.insert_text(text)
+        except Exception:
+            pass  # Silently fail if text paste doesn't work
+
+    # F3 - dedicated image paste (shows error if no image)
+    @bindings.add("f3")
+    def handle_image_paste_f3(event):
+        """Handle F3 - paste image from clipboard (image-only, shows error if none)."""
+        try:
+            if has_image_in_clipboard():
+                placeholder = capture_clipboard_image_to_pending()
+                if placeholder:
+                    event.app.current_buffer.insert_text(placeholder + " ")
+                    # The placeholder itself is visible feedback
+                    # Use bell for audible feedback (works in most terminals)
+                    event.app.output.bell()
+            else:
+                # Insert a transient message that user can delete
+                event.app.current_buffer.insert_text("[⚠️ no image in clipboard] ")
+                event.app.output.bell()
+        except Exception:
+            event.app.current_buffer.insert_text("[❌ clipboard error] ")
+            event.app.output.bell()
+
     session = PromptSession(
         completer=completer,
         history=history,

code_puppy/command_line/utils.py

@@ -37,3 +37,57 @@ def make_directory_table(path: str = None) -> Table:
     for f in sorted(files):
         table.add_row("[yellow]file[/yellow]", f"{f}")
     return table
+
+
+def _reset_windows_console() -> None:
+    """Reset Windows console to normal input mode.
+
+    After a prompt_toolkit Application exits on Windows, the console can be
+    left in a weird state where Enter doesn't work properly. This resets it.
+    """
+    import sys
+
+    if sys.platform != "win32":
+        return
+
+    try:
+        import ctypes
+
+        kernel32 = ctypes.windll.kernel32
+        # Get handle to stdin
+        STD_INPUT_HANDLE = -10
+        handle = kernel32.GetStdHandle(STD_INPUT_HANDLE)
+
+        # Enable line input and echo (normal console mode)
+        # ENABLE_LINE_INPUT = 0x0002
+        # ENABLE_ECHO_INPUT = 0x0004
+        # ENABLE_PROCESSED_INPUT = 0x0001
+        NORMAL_MODE = 0x0007  # Line input + echo + processed
+        kernel32.SetConsoleMode(handle, NORMAL_MODE)
+    except Exception:
+        pass  # Silently ignore errors - this is best-effort
+
+
+def safe_input(prompt_text: str = "") -> str:
+    """Cross-platform safe input that works after prompt_toolkit Applications.
+
+    On Windows, raw input() can fail after a prompt_toolkit Application exits
+    because the terminal can be left in a weird state. This function resets
+    the Windows console mode before calling input().
+
+    Args:
+        prompt_text: The prompt to display to the user
+
+    Returns:
+        The user's input string (stripped)
+
+    Raises:
+        KeyboardInterrupt: If user presses Ctrl+C
+        EOFError: If user presses Ctrl+D/Ctrl+Z
+    """
+    # Reset Windows console to normal mode before reading input
+    _reset_windows_console()
+
+    # Use standard input() - now that console is reset, it should work
+    result = input(prompt_text)
+    return result.strip() if result else ""