code-puppy 0.0.129__py3-none-any.whl → 0.0.131__py3-none-any.whl

code_puppy/command_line/model_picker_completion.py

@@ -70,7 +70,7 @@ class ModelNameCompleter(Completer):
 
 
 def update_model_in_input(text: str) -> Optional[str]:
-    # If input starts with /model or /m and a model name, set model and strip it out
+    # If input starts with /model and a model name, set model and strip it out
     content = text.strip()
     
     # Check for /model command
@@ -84,17 +84,6 @@ def update_model_in_input(text: str) -> Optional[str]:
                 if idx != -1:
                     new_text = (text[:idx] + text[idx + len("/model" + model) :]).strip()
                     return new_text
-    # Also check for legacy /m command for backward compatibility
-    elif content.startswith("/m"):
-        rest = content[2:].strip()  # Remove '/m'
-        for model in load_model_names():
-            if rest == model:
-                set_active_model(model)
-                # Remove /m from the input
-                idx = text.find("/m" + model)
-                if idx != -1:
-                    new_text = (text[:idx] + text[idx + len("/m" + model) :]).strip()
-                    return new_text
     return None
 
 

code_puppy/command_line/prompt_toolkit_completion.py

@@ -163,7 +163,7 @@ async def get_input_with_combined_completion(
     completer = merge_completers(
         [
             FilePathCompleter(symbol="@"),
-            ModelNameCompleter(trigger="/m"),
+            ModelNameCompleter(trigger="/model"),
             CDCompleter(trigger="/cd"),
             SetCompleter(trigger="/set"),
             LoadContextCompleter(trigger="/load_context"),
@@ -226,7 +226,7 @@ async def get_input_with_combined_completion(
 
 
 if __name__ == "__main__":
-    print("Type '@' for path-completion or '/m' to pick a model. Ctrl+D to exit.")
+    print("Type '@' for path-completion or '/model' to pick a model. Ctrl+D to exit.")
 
     async def main():
         while True:

code_puppy/mcp/config_wizard.py

@@ -7,46 +7,101 @@ from typing import Dict, Optional
 from urllib.parse import urlparse
 
 from code_puppy.mcp import ServerConfig, get_mcp_manager
-from code_puppy.messaging import emit_error, emit_info, emit_success, emit_warning
-from rich.prompt import Prompt, Confirm
+from code_puppy.messaging import emit_error, emit_info, emit_success, emit_warning, emit_prompt
 from rich.console import Console
 
 console = Console()
 
 
+def prompt_ask(prompt_text: str, default: Optional[str] = None, choices: Optional[list] = None) -> Optional[str]:
+    """Helper function to replace rich.prompt.Prompt.ask with emit_prompt."""
+    try:
+        if default:
+            full_prompt = f"{prompt_text} [{default}]"
+        else:
+            full_prompt = prompt_text
+        
+        if choices:
+            full_prompt += f" ({'/'.join(choices)})"
+        
+        response = emit_prompt(full_prompt + ": ")
+        
+        # Handle default value
+        if not response.strip() and default:
+            return default
+        
+        # Handle choices validation
+        if choices and response.strip() and response.strip() not in choices:
+            emit_error(f"Invalid choice. Must be one of: {', '.join(choices)}")
+            return None
+        
+        return response.strip() if response.strip() else None
+    except Exception as e:
+        emit_error(f"Input error: {e}")
+        return None
+
+
+def confirm_ask(prompt_text: str, default: bool = True) -> bool:
+    """Helper function to replace rich.prompt.Confirm.ask with emit_prompt."""
+    try:
+        default_text = "[Y/n]" if default else "[y/N]"
+        response = emit_prompt(f"{prompt_text} {default_text}: ")
+        
+        if not response.strip():
+            return default
+        
+        response_lower = response.strip().lower()
+        if response_lower in ['y', 'yes', 'true', '1']:
+            return True
+        elif response_lower in ['n', 'no', 'false', '0']:
+            return False
+        else:
+            return default
+    except Exception as e:
+        emit_error(f"Input error: {e}")
+        return default
+
+
 class MCPConfigWizard:
     """Interactive wizard for configuring MCP servers."""
     
     def __init__(self):
         self.manager = get_mcp_manager()
     
-    def run_wizard(self) -> Optional[ServerConfig]:
+    def run_wizard(self, group_id: str = None) -> Optional[ServerConfig]:
         """
         Run the interactive configuration wizard.
         
+        Args:
+            group_id: Optional message group ID for grouping related messages
+        
         Returns:
             ServerConfig if successful, None if cancelled
         """
-        console.print("\n[bold cyan]🧙 MCP Server Configuration Wizard[/bold cyan]\n")
+        if group_id is None:
+            import uuid
+            group_id = str(uuid.uuid4())
+            
+        emit_info("🧙 MCP Server Configuration Wizard", message_group=group_id)
         
         # Step 1: Server name
-        name = self.prompt_server_name()
+        name = self.prompt_server_name(group_id)
         if not name:
             return None
         
         # Step 2: Server type
-        server_type = self.prompt_server_type()
+        server_type = self.prompt_server_type(group_id)
         if not server_type:
             return None
         
         # Step 3: Type-specific configuration
         config = {}
         if server_type == "sse":
-            config = self.prompt_sse_config()
+            config = self.prompt_sse_config(group_id)
         elif server_type == "http":
-            config = self.prompt_http_config()
+            config = self.prompt_http_config(group_id)
         elif server_type == "stdio":
-            config = self.prompt_stdio_config()
+            config = self.prompt_stdio_config(group_id)
         
         if not config:
             return None
@@ -61,62 +116,55 @@ class MCPConfigWizard:
         )
         
         # Step 5: Show summary and confirm
-        if self.prompt_confirmation(server_config):
+        if self.prompt_confirmation(server_config, group_id):
             return server_config
         
         return None
     
-    def prompt_server_name(self) -> Optional[str]:
+    def prompt_server_name(self, group_id: str = None) -> Optional[str]:
         """Prompt for server name with validation."""
         while True:
-            name = Prompt.ask(
-                "[yellow]Enter server name[/yellow]",
-                default=None
-            )
+            name = prompt_ask("Enter server name", default=None)
             
             if not name:
-                if not Confirm.ask("Cancel configuration?", default=False):
+                if not confirm_ask("Cancel configuration?", default=False):
                     continue
                 return None
             
             # Validate name
             if not self.validate_name(name):
-                emit_error("Name must be alphanumeric with hyphens/underscores only")
+                emit_error("Name must be alphanumeric with hyphens/underscores only", message_group=group_id)
                 continue
             
             # Check uniqueness
             existing = self.manager.registry.get_by_name(name)
             if existing:
-                emit_error(f"Server '{name}' already exists")
+                emit_error(f"Server '{name}' already exists", message_group=group_id)
                 continue
             
             return name
     
-    def prompt_server_type(self) -> Optional[str]:
+    def prompt_server_type(self, group_id: str = None) -> Optional[str]:
         """Prompt for server type."""
-        console.print("\n[cyan]Server types:[/cyan]")
-        console.print("  [bold]sse[/bold]   - Server-Sent Events (HTTP streaming)")
-        console.print("  [bold]http[/bold]  - HTTP/REST API")
-        console.print("  [bold]stdio[/bold] - Local command (subprocess)")
+        emit_info("\nServer types:", message_group=group_id)
+        emit_info("  sse   - Server-Sent Events (HTTP streaming)", message_group=group_id)
+        emit_info("  http  - HTTP/REST API", message_group=group_id) 
+        emit_info("  stdio - Local command (subprocess)", message_group=group_id)
         
         while True:
-            server_type = Prompt.ask(
-                "\n[yellow]Select server type[/yellow]",
-                choices=["sse", "http", "stdio"],
-                default="stdio"
-            )
+            server_type = prompt_ask("Select server type", choices=["sse", "http", "stdio"], default="stdio")
             
             if server_type in ["sse", "http", "stdio"]:
                 return server_type
             
-            emit_error("Invalid type. Choose: sse, http, or stdio")
+            emit_error("Invalid type. Choose: sse, http, or stdio", message_group=group_id)
     
-    def prompt_sse_config(self) -> Optional[Dict]:
+    def prompt_sse_config(self, group_id: str = None) -> Optional[Dict]:
         """Prompt for SSE server configuration."""
-        console.print("\n[cyan]Configuring SSE server[/cyan]")
+        emit_info("Configuring SSE server", message_group=group_id)
         
         # URL
-        url = self.prompt_url("SSE")
+        url = self.prompt_url("SSE", group_id)
         if not url:
             return None
         
@@ -127,16 +175,13 @@ class MCPConfigWizard:
         }
         
         # Headers (optional)
-        if Confirm.ask("Add custom headers?", default=False):
-            headers = self.prompt_headers()
+        if confirm_ask("Add custom headers?", default=False):
+            headers = self.prompt_headers(group_id)
             if headers:
                 config["headers"] = headers
         
         # Timeout
-        timeout_str = Prompt.ask(
-            "Connection timeout (seconds)",
-            default="30"
-        )
+        timeout_str = prompt_ask("Connection timeout (seconds)", default="30")
         try:
             config["timeout"] = int(timeout_str)
         except ValueError:
@@ -144,12 +189,12 @@ class MCPConfigWizard:
         
         return config
     
-    def prompt_http_config(self) -> Optional[Dict]:
+    def prompt_http_config(self, group_id: str = None) -> Optional[Dict]:
         """Prompt for HTTP server configuration."""
-        console.print("\n[cyan]Configuring HTTP server[/cyan]")
+        emit_info("Configuring HTTP server", message_group=group_id)
         
         # URL
-        url = self.prompt_url("HTTP")
+        url = self.prompt_url("HTTP", group_id)
         if not url:
             return None
         
@@ -160,16 +205,13 @@ class MCPConfigWizard:
         }
         
         # Headers (optional)
-        if Confirm.ask("Add custom headers?", default=False):
-            headers = self.prompt_headers()
+        if confirm_ask("Add custom headers?", default=False):
+            headers = self.prompt_headers(group_id)
             if headers:
                 config["headers"] = headers
         
         # Timeout
-        timeout_str = Prompt.ask(
-            "Request timeout (seconds)",
-            default="30"
-        )
+        timeout_str = prompt_ask("Request timeout (seconds)", default="30")
         try:
             config["timeout"] = int(timeout_str)
         except ValueError:
@@ -177,19 +219,16 @@ class MCPConfigWizard:
         
         return config
     
-    def prompt_stdio_config(self) -> Optional[Dict]:
+    def prompt_stdio_config(self, group_id: str = None) -> Optional[Dict]:
         """Prompt for Stdio server configuration."""
-        console.print("\n[cyan]Configuring Stdio server[/cyan]")
-        console.print("[dim]Examples:[/dim]")
-        console.print("[dim]  • npx -y @modelcontextprotocol/server-filesystem /path[/dim]")
-        console.print("[dim]  • python mcp_server.py[/dim]")
-        console.print("[dim]  • node server.js[/dim]")
+        emit_info("Configuring Stdio server", message_group=group_id)
+        emit_info("Examples:", message_group=group_id)
+        emit_info("  • npx -y @modelcontextprotocol/server-filesystem /path", message_group=group_id)
+        emit_info("  • python mcp_server.py", message_group=group_id) 
+        emit_info("  • node server.js", message_group=group_id)
         
         # Command
-        command = Prompt.ask(
-            "\n[yellow]Enter command[/yellow]",
-            default=None
-        )
+        command = prompt_ask("Enter command", default=None)
         
         if not command:
             return None
@@ -202,10 +241,7 @@ class MCPConfigWizard:
         }
         
         # Arguments
-        args_str = Prompt.ask(
-            "Enter arguments (space-separated)",
-            default=""
-        )
+        args_str = prompt_ask("Enter arguments (space-separated)", default="")
         if args_str:
             # Simple argument parsing (handles quoted strings)
             import shlex
@@ -215,28 +251,22 @@ class MCPConfigWizard:
                 config["args"] = args_str.split()
         
         # Working directory (optional)
-        cwd = Prompt.ask(
-            "Working directory (optional)",
-            default=""
-        )
+        cwd = prompt_ask("Working directory (optional)", default="")
         if cwd:
             import os
             if os.path.isdir(os.path.expanduser(cwd)):
                 config["cwd"] = os.path.expanduser(cwd)
             else:
-                emit_warning(f"Directory '{cwd}' not found, ignoring")
+                emit_warning(f"Directory '{cwd}' not found, ignoring", message_group=group_id)
         
         # Environment variables (optional)
-        if Confirm.ask("Add environment variables?", default=False):
-            env = self.prompt_env_vars()
+        if confirm_ask("Add environment variables?", default=False):
+            env = self.prompt_env_vars(group_id)
             if env:
                 config["env"] = env
         
         # Timeout
-        timeout_str = Prompt.ask(
-            "Startup timeout (seconds)",
-            default="30"
-        )
+        timeout_str = prompt_ask("Startup timeout (seconds)", default="30")
         try:
             config["timeout"] = int(timeout_str)
         except ValueError:
@@ -244,58 +274,55 @@ class MCPConfigWizard:
         
         return config
     
-    def prompt_url(self, server_type: str) -> Optional[str]:
+    def prompt_url(self, server_type: str, group_id: str = None) -> Optional[str]:
         """Prompt for and validate URL."""
         while True:
-            url = Prompt.ask(
-                f"[yellow]Enter {server_type} server URL[/yellow]",
-                default=None
-            )
+            url = prompt_ask(f"Enter {server_type} server URL", default=None)
             
             if not url:
-                if Confirm.ask("Cancel configuration?", default=False):
+                if confirm_ask("Cancel configuration?", default=False):
                     return None
                 continue
             
             if self.validate_url(url):
                 return url
             
-            emit_error("Invalid URL. Must be http:// or https://")
+            emit_error("Invalid URL. Must be http:// or https://", message_group=group_id)
     
-    def prompt_headers(self) -> Dict[str, str]:
+    def prompt_headers(self, group_id: str = None) -> Dict[str, str]:
         """Prompt for HTTP headers."""
         headers = {}
-        console.print("[dim]Enter headers (format: Name: Value)[/dim]")
-        console.print("[dim]Press Enter with empty name to finish[/dim]")
+        emit_info("Enter headers (format: Name: Value)", message_group=group_id)
+        emit_info("Press Enter with empty name to finish", message_group=group_id)
         
         while True:
-            name = Prompt.ask("Header name", default="")
+            name = prompt_ask("Header name", default="")
             if not name:
                 break
             
-            value = Prompt.ask(f"Value for '{name}'", default="")
+            value = prompt_ask(f"Value for '{name}'", default="")
             headers[name] = value
             
-            if not Confirm.ask("Add another header?", default=True):
+            if not confirm_ask("Add another header?", default=True):
                 break
         
         return headers
     
-    def prompt_env_vars(self) -> Dict[str, str]:
+    def prompt_env_vars(self, group_id: str = None) -> Dict[str, str]:
         """Prompt for environment variables."""
         env = {}
-        console.print("[dim]Enter environment variables[/dim]")
-        console.print("[dim]Press Enter with empty name to finish[/dim]")
+        emit_info("Enter environment variables", message_group=group_id)
+        emit_info("Press Enter with empty name to finish", message_group=group_id)
         
         while True:
-            name = Prompt.ask("Variable name", default="")
+            name = prompt_ask("Variable name", default="")
             if not name:
                 break
             
-            value = Prompt.ask(f"Value for '{name}'", default="")
+            value = prompt_ask(f"Value for '{name}'", default="")
             env[name] = value
             
-            if not Confirm.ask("Add another variable?", default=True):
+            if not confirm_ask("Add another variable?", default=True):
                 break
         
         return env
@@ -325,7 +352,7 @@ class MCPConfigWizard:
         # Otherwise check if it's in PATH
         return shutil.which(command) is not None
     
-    def test_connection(self, config: ServerConfig) -> bool:
+    def test_connection(self, config: ServerConfig, group_id: str = None) -> bool:
         """
         Test connection to the configured server.
         
@@ -335,7 +362,7 @@ class MCPConfigWizard:
         Returns:
             True if connection successful, False otherwise
         """
-        emit_info("Testing connection...")
+        emit_info("Testing connection...", message_group=group_id)
         
         try:
             # Try to create the server instance
@@ -349,60 +376,67 @@ class MCPConfigWizard:
                 # Try to get the pydantic server (this validates config)
                 server = managed.get_pydantic_server()
                 if server:
-                    emit_success("✓ Configuration valid")
+                    emit_success("✓ Configuration valid", message_group=group_id)
                     return True
             
-            emit_error("✗ Failed to create server instance")
+            emit_error("✗ Failed to create server instance", message_group=group_id)
             return False
             
         except Exception as e:
-            emit_error(f"✗ Configuration error: {e}")
+            emit_error(f"✗ Configuration error: {e}", message_group=group_id)
             return False
     
-    def prompt_confirmation(self, config: ServerConfig) -> bool:
+    def prompt_confirmation(self, config: ServerConfig, group_id: str = None) -> bool:
         """Show summary and ask for confirmation."""
-        console.print("\n[bold cyan]Configuration Summary:[/bold cyan]")
-        console.print(f"  [bold]Name:[/bold] {config.name}")
-        console.print(f"  [bold]Type:[/bold] {config.type}")
+        emit_info("Configuration Summary:", message_group=group_id)
+        emit_info(f"  Name: {config.name}", message_group=group_id)
+        emit_info(f"  Type: {config.type}", message_group=group_id)
         
         if config.type in ["sse", "http"]:
-            console.print(f"  [bold]URL:[/bold] {config.config.get('url')}")
+            emit_info(f"  URL: {config.config.get('url')}", message_group=group_id)
         elif config.type == "stdio":
-            console.print(f"  [bold]Command:[/bold] {config.config.get('command')}")
+            emit_info(f"  Command: {config.config.get('command')}", message_group=group_id)
             args = config.config.get('args', [])
             if args:
-                console.print(f"  [bold]Arguments:[/bold] {' '.join(args)}")
+                emit_info(f"  Arguments: {' '.join(args)}", message_group=group_id)
         
-        console.print(f"  [bold]Timeout:[/bold] {config.config.get('timeout', 30)}s")
+        emit_info(f"  Timeout: {config.config.get('timeout', 30)}s", message_group=group_id)
         
         # Test connection if requested
-        if Confirm.ask("\n[yellow]Test connection?[/yellow]", default=True):
-            if not self.test_connection(config):
-                if not Confirm.ask("Continue anyway?", default=False):
+        if confirm_ask("Test connection?", default=True):
+            if not self.test_connection(config, group_id):
+                if not confirm_ask("Continue anyway?", default=False):
                     return False
         
-        return Confirm.ask("\n[bold green]Save this configuration?[/bold green]", default=True)
+        return confirm_ask("Save this configuration?", default=True)
 
 
-def run_add_wizard() -> bool:
+def run_add_wizard(group_id: str = None) -> bool:
     """
     Run the MCP add wizard and register the server.
     
+    Args:
+        group_id: Optional message group ID for grouping related messages
+    
     Returns:
         True if server was added, False otherwise
     """
+    if group_id is None:
+        import uuid
+        group_id = str(uuid.uuid4())
+        
     wizard = MCPConfigWizard()
-    config = wizard.run_wizard()
+    config = wizard.run_wizard(group_id)
     
     if config:
         try:
             manager = get_mcp_manager()
             server_id = manager.register_server(config)
             
-            emit_success(f"\n✅ Server '{config.name}' added successfully!")
-            emit_info(f"Server ID: {server_id}")
-            emit_info("Use '/mcp list' to see all servers")
-            emit_info(f"Use '/mcp start {config.name}' to start the server")
+            emit_success(f"\n✅ Server '{config.name}' added successfully!", message_group=group_id)
+            emit_info(f"Server ID: {server_id}", message_group=group_id)
+            emit_info("Use '/mcp list' to see all servers", message_group=group_id)
+            emit_info(f"Use '/mcp start {config.name}' to start the server", message_group=group_id)
             
             # Also save to mcp_servers.json for persistence
             from code_puppy.config import MCP_SERVERS_FILE, load_mcp_server_configs
@@ -426,12 +460,12 @@ def run_add_wizard() -> bool:
             with open(MCP_SERVERS_FILE, 'w') as f:
                 json.dump(data, f, indent=2)
             
-            emit_info(f"[dim]Configuration saved to {MCP_SERVERS_FILE}[/dim]")
+            emit_info(f"[dim]Configuration saved to {MCP_SERVERS_FILE}[/dim]", message_group=group_id)
             return True
             
         except Exception as e:
-            emit_error(f"Failed to add server: {e}")
+            emit_error(f"Failed to add server: {e}", message_group=group_id)
             return False
     else:
-        emit_warning("Configuration cancelled")
+        emit_warning("Configuration cancelled", message_group=group_id)
         return False