code-puppy 0.0.287__py3-none-any.whl → 0.0.323__py3-none-any.whl

code_puppy/command_line/mcp/custom_server_form.py

@@ -25,6 +25,7 @@ from prompt_toolkit.lexers import PygmentsLexer
 from prompt_toolkit.widgets import Frame, TextArea
 from pygments.lexers.data import JsonLexer
 
+from code_puppy.messaging import emit_info, emit_success
 from code_puppy.tools.command_runner import set_awaiting_user_input
 
 # Example configurations for each server type
@@ -106,6 +107,10 @@ class CustomServerForm:
         # Focus state: 0=name, 1=type, 2=json
         self.focused_field = 0
 
+        # Status message for user feedback (e.g., "Save failed: ...")
+        self.status_message: Optional[str] = None
+        self.status_is_error: bool = False
+
         # Result
         self.result = None  # "installed", "cancelled", None
 
@@ -136,6 +141,12 @@ class CustomServerForm:
         else:
             name_display = self.server_name if self.server_name else "(not set)"
             lines.append(("fg:ansibrightblack", f"     {name_display}"))
+
+        # Show name validation hint inline
+        name_error = self._validate_server_name(self.server_name)
+        if name_error and self.server_name:  # Only show if there's input
+            lines.append(("", "\n"))
+            lines.append(("fg:ansiyellow", f"     ⚠ {name_error}"))
         lines.append(("", "\n\n"))
 
         # Server Type field
@@ -201,6 +212,16 @@ class CustomServerForm:
         lines.append(("fg:ansired", "  Ctrl+C/Esc "))
         lines.append(("", "Cancel"))
 
+        # Status message bar - shows feedback for user actions
+        if self.status_message:
+            lines.append(("", "\n\n"))
+            lines.append(("bold", "  ─" * 20))
+            lines.append(("", "\n"))
+            if self.status_is_error:
+                lines.append(("fg:ansired bold", f"  ⚠️  {self.status_message}"))
+            else:
+                lines.append(("fg:ansigreen bold", f"  ✓ {self.status_message}"))
+
         return lines
 
     def _render_preview(self) -> List:
@@ -269,6 +290,30 @@ class CustomServerForm:
 
         return lines
 
+    def _validate_server_name(self, name: str) -> Optional[str]:
+        """Validate server name format.
+
+        Args:
+            name: Server name to validate
+
+        Returns:
+            Error message if invalid, None if valid
+        """
+        if not name or not name.strip():
+            return "Server name is required"
+
+        name = name.strip()
+
+        # Check for valid characters (alphanumeric, hyphens, underscores)
+        if not name.replace("-", "").replace("_", "").isalnum():
+            return "Name must be alphanumeric (hyphens/underscores OK)"
+
+        # Check for reasonable length
+        if len(name) > 64:
+            return "Name too long (max 64 characters)"
+
+        return None
+
     def _validate_json(self) -> bool:
         """Validate the current JSON configuration.
 
@@ -304,11 +349,17 @@ class CustomServerForm:
         from code_puppy.config import MCP_SERVERS_FILE
         from code_puppy.mcp_.managed_server import ServerConfig
 
-        if not self.server_name.strip():
-            self.validation_error = "Server name is required"
+        # Validate server name first
+        name_error = self._validate_server_name(self.server_name)
+        if name_error:
+            self.validation_error = name_error
+            self.status_message = f"Save failed: {name_error}"
+            self.status_is_error = True
             return False
 
         if not self._validate_json():
+            self.status_message = f"Save failed: {self.validation_error}"
+            self.status_is_error = True
             return False
 
         server_name = self.server_name.strip()
@@ -329,6 +380,10 @@ class CustomServerForm:
 
             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
@@ -363,6 +418,8 @@ class CustomServerForm:
 
         except Exception as e:
             self.validation_error = f"Error: {e}"
+            self.status_message = f"Save failed: {e}"
+            self.status_is_error = True
             return False
 
     def run(self) -> bool:
@@ -550,10 +607,14 @@ class CustomServerForm:
         # Handle result
         if self.result == "installed":
             if self.edit_mode:
-                print(f"\n  ✅ Successfully updated server '{self.server_name}'!")
+                emit_success(
+                    f"\n  ✅ Successfully updated server '{self.server_name}'!"
+                )
             else:
-                print(f"\n  ✅ Successfully added custom server '{self.server_name}'!")
-            print(f"  Use '/mcp start {self.server_name}' to start the server.\n")
+                emit_success(
+                    f"\n  ✅ Successfully added custom server '{self.server_name}'!"
+                )
+            emit_info(f"  Use '/mcp start {self.server_name}' to start the server.\n")
             return True
 
         return False

code_puppy/command_line/mcp/custom_server_installer.py

@@ -7,7 +7,7 @@ custom MCP servers with JSON configuration.
 import json
 import os
 
-from code_puppy.messaging import emit_error, emit_warning
+from code_puppy.messaging import emit_error, emit_info, emit_success, emit_warning
 
 # Example configurations for each server type
 CUSTOM_SERVER_EXAMPLES = {
@@ -53,8 +53,8 @@ def prompt_and_install_custom_server(manager) -> bool:
 
     from .utils import find_server_id_by_name
 
-    print("\n➕ Add Custom MCP Server\n")
-    print("  Configure your own MCP server using JSON.\n")
+    emit_info("\n➕ Add Custom MCP Server\n")
+    emit_info("  Configure your own MCP server using JSON.\n")
 
     # Get server name
     try:
@@ -63,7 +63,7 @@ def prompt_and_install_custom_server(manager) -> bool:
             emit_warning("Server name is required")
             return False
     except (KeyboardInterrupt, EOFError):
-        print("")
+        emit_info("")
         emit_warning("Cancelled")
         return False
 
@@ -78,20 +78,20 @@ def prompt_and_install_custom_server(manager) -> bool:
                 emit_warning("Cancelled")
                 return False
         except (KeyboardInterrupt, EOFError):
-            print("")
+            emit_info("")
             emit_warning("Cancelled")
             return False
 
     # Select server type
-    print("\n  Select server type:\n")
-    print("    1. 📟 stdio  - Local command (npx, python, uvx, etc.)")
-    print("    2. 🌐 http   - HTTP endpoint")
-    print("    3. 📡 sse    - Server-Sent Events\n")
+    emit_info("\n  Select server type:\n")
+    emit_info("    1. 📟 stdio  - Local command (npx, python, uvx, etc.)")
+    emit_info("    2. 🌐 http   - HTTP endpoint")
+    emit_info("    3. 📡 sse    - Server-Sent Events\n")
 
     try:
         type_choice = input("  Enter choice [1-3]: ").strip()
     except (KeyboardInterrupt, EOFError):
-        print("")
+        emit_info("")
         emit_warning("Cancelled")
         return False
 
@@ -103,13 +103,13 @@ def prompt_and_install_custom_server(manager) -> bool:
 
     # Show example for selected type
     example = CUSTOM_SERVER_EXAMPLES.get(server_type, "{}")
-    print(f"\n  Example {server_type} configuration:\n")
+    emit_info(f"\n  Example {server_type} configuration:\n")
     for line in example.split("\n"):
-        print(f"    {line}")
-    print("")
+        emit_info(f"    {line}")
+    emit_info("")
 
     # Get JSON configuration
-    print("  Enter your JSON configuration (paste and press Enter twice):\n")
+    emit_info("  Enter your JSON configuration (paste and press Enter twice):\n")
 
     json_lines = []
     empty_count = 0
@@ -125,7 +125,7 @@ def prompt_and_install_custom_server(manager) -> bool:
                 empty_count = 0
                 json_lines.append(line)
     except (KeyboardInterrupt, EOFError):
-        print("")
+        emit_info("")
         emit_warning("Cancelled")
         return False
 
@@ -187,8 +187,8 @@ def prompt_and_install_custom_server(manager) -> bool:
         with open(MCP_SERVERS_FILE, "w") as f:
             json.dump(data, f, indent=2)
 
-        print(f"\n  ✅ Successfully added custom server '{server_name}'!")
-        print(f"  Use '/mcp start {server_name}' to start the server.\n")
+        emit_success(f"\n  ✅ Successfully added custom server '{server_name}'!")
+        emit_info(f"  Use '/mcp start {server_name}' to start the server.\n")
         return True
 
     except Exception as e:

code_puppy/command_line/mcp/edit_command.py

@@ -8,9 +8,10 @@ import logging
 import os
 from typing import List, Optional
 
+from rich.text import Text
+
 from code_puppy.config import MCP_SERVERS_FILE
-from code_puppy.messaging import emit_info
-from code_puppy.tui_state import is_tui_mode
+from code_puppy.messaging import emit_error, emit_info, emit_warning
 
 from .base import MCPCommandBase
 from .custom_server_form import run_custom_server_form
@@ -37,18 +38,10 @@ class EditCommand(MCPCommandBase):
             group_id = self.generate_group_id()
 
         try:
-            # If in TUI mode, show message
-            if is_tui_mode():
-                emit_info(
-                    "In TUI mode, use Ctrl+T to manage MCP servers",
-                    message_group=group_id,
-                )
-                return
-
             # Need a server name
             if not args:
                 emit_info(
-                    "[yellow]Usage: /mcp edit <server_name>[/yellow]",
+                    Text.from_markup("[yellow]Usage: /mcp edit <server_name>[/yellow]"),
                     message_group=group_id,
                 )
                 emit_info(
@@ -86,7 +79,7 @@ class EditCommand(MCPCommandBase):
 
         except Exception as e:
             logger.error(f"Error editing server: {e}")
-            emit_info(f"[red]Error: {e}[/red]", message_group=group_id)
+            emit_error(f"Error: {e}", message_group=group_id)
 
     def _load_server_config(
         self, server_name: str, group_id: str
@@ -101,8 +94,8 @@ class EditCommand(MCPCommandBase):
             Tuple of (server_type, config_dict) or None if not found
         """
         if not os.path.exists(MCP_SERVERS_FILE):
-            emit_info(
-                "[red]No MCP servers configured yet.[/red]",
+            emit_error(
+                "No MCP servers configured yet.",
                 message_group=group_id,
             )
             emit_info(
@@ -118,14 +111,14 @@ class EditCommand(MCPCommandBase):
             servers = data.get("mcp_servers", {})
 
             if server_name not in servers:
-                emit_info(
-                    f"[red]Server '{server_name}' not found.[/red]",
+                emit_error(
+                    f"Server '{server_name}' not found.",
                     message_group=group_id,
                 )
                 # Show available servers
                 if servers:
-                    emit_info(
-                        "\n[yellow]Available servers:[/yellow]",
+                    emit_warning(
+                        "\nAvailable servers:",
                         message_group=group_id,
                     )
                     for name in sorted(servers.keys()):
@@ -142,14 +135,14 @@ class EditCommand(MCPCommandBase):
             return (server_type, config)
 
         except json.JSONDecodeError as e:
-            emit_info(
-                f"[red]Error reading config file: {e}[/red]",
+            emit_error(
+                f"Error reading config file: {e}",
                 message_group=group_id,
             )
             return None
         except Exception as e:
-            emit_info(
-                f"[red]Error loading server config: {e}[/red]",
+            emit_error(
+                f"Error loading server config: {e}",
                 message_group=group_id,
             )
             return None

code_puppy/command_line/mcp/handler.py

@@ -8,6 +8,8 @@ to their respective command modules.
 import logging
 import shlex
 
+from rich.text import Text
+
 from code_puppy.messaging import emit_info
 
 from .add_command import AddCommand
@@ -103,7 +105,8 @@ class MCPCommandHandler(MCPCommandBase):
                 args = shlex.split(args_str)
             except ValueError as e:
                 emit_info(
-                    f"[red]Invalid command syntax: {e}[/red]", message_group=group_id
+                    Text.from_markup(f"[red]Invalid command syntax: {e}[/red]"),
+                    message_group=group_id,
                 )
                 return True
 
@@ -121,7 +124,9 @@ class MCPCommandHandler(MCPCommandBase):
                 return True
             else:
                 emit_info(
-                    f"[yellow]Unknown MCP subcommand: {subcommand}[/yellow]",
+                    Text.from_markup(
+                        f"[yellow]Unknown MCP subcommand: {subcommand}[/yellow]"
+                    ),
                     message_group=group_id,
                 )
                 emit_info(

code_puppy/command_line/mcp/help_command.py

@@ -7,7 +7,7 @@ from typing import List, Optional
 
 from rich.text import Text
 
-from code_puppy.messaging import emit_info
+from code_puppy.messaging import emit_error, emit_info
 
 from .base import MCPCommandBase
 
@@ -148,4 +148,4 @@ class HelpCommand(MCPCommandBase):
 
         except Exception as e:
             logger.error(f"Error showing help: {e}")
-            emit_info(f"[red]Error showing help: {e}[/red]", message_group=group_id)
+            emit_error(f"Error showing help: {e}", message_group=group_id)

code_puppy/command_line/mcp/install_command.py

@@ -5,8 +5,9 @@ MCP Install Command - Installs pre-configured MCP servers from the registry.
 import logging
 from typing import List, Optional
 
-from code_puppy.messaging import emit_info
-from code_puppy.tui_state import is_tui_mode
+from rich.text import Text
+
+from code_puppy.messaging import emit_error, emit_info
 
 from .base import MCPCommandBase
 from .install_menu import run_mcp_install_menu
@@ -34,14 +35,6 @@ class InstallCommand(MCPCommandBase):
             group_id = self.generate_group_id()
 
         try:
-            # If in TUI mode, show message to use Ctrl+T
-            if is_tui_mode():
-                emit_info(
-                    "In TUI mode, use Ctrl+T to open the MCP Install Wizard",
-                    message_group=group_id,
-                )
-                return
-
             # In interactive mode, use the menu-based browser
             if not args:
                 # No args - launch interactive menu
@@ -159,7 +152,9 @@ class InstallCommand(MCPCommandBase):
             required_env_vars = selected_server.get_environment_vars()
             if required_env_vars:
                 emit_info(
-                    "\n[yellow]Required Environment Variables:[/yellow]",
+                    Text.from_markup(
+                        "\n[yellow]Required Environment Variables:[/yellow]"
+                    ),
                     message_group=group_id,
                 )
                 for var in required_env_vars:
@@ -169,7 +164,7 @@ class InstallCommand(MCPCommandBase):
                     current_value = os.environ.get(var, "")
                     if current_value:
                         emit_info(
-                            f"  {var}: [green]Already set[/green]",
+                            Text.from_markup(f"  {var}: [green]Already set[/green]"),
                             message_group=group_id,
                         )
                         env_vars[var] = current_value
@@ -182,7 +177,8 @@ class InstallCommand(MCPCommandBase):
             required_cmd_args = selected_server.get_command_line_args()
             if required_cmd_args:
                 emit_info(
-                    "\n[yellow]Command Line Arguments:[/yellow]", message_group=group_id
+                    Text.from_markup("\n[yellow]Command Line Arguments:[/yellow]"),
+                    message_group=group_id,
                 )
                 for arg_config in required_cmd_args:
                     name = arg_config.get("name", "")
@@ -214,5 +210,5 @@ class InstallCommand(MCPCommandBase):
             return False
         except Exception as e:
             logger.error(f"Error installing from catalog: {e}")
-            emit_info(f"[red]Installation error: {e}[/red]", message_group=group_id)
+            emit_error(f"Installation error: {e}", message_group=group_id)
             return False

code_puppy/command_line/mcp/install_menu.py

@@ -16,7 +16,7 @@ from prompt_toolkit.layout import Dimension, Layout, VSplit, Window
 from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.widgets import Frame
 
-from code_puppy.messaging import emit_error
+from code_puppy.messaging import emit_error, emit_warning
 from code_puppy.tools.command_runner import set_awaiting_user_input
 
 from .catalog_server_installer import (
@@ -501,11 +501,7 @@ class MCPInstallMenu:
             True if a server was installed, False otherwise
         """
         if not self.categories:
-            set_awaiting_user_input(True)
-            try:
-                print("No MCP server catalog available.")
-            finally:
-                set_awaiting_user_input(False)
+            emit_warning("No MCP server catalog available.")
             return False
 
         # Build UI

code_puppy/command_line/mcp/list_command.py

@@ -9,7 +9,7 @@ from rich.table import Table
 from rich.text import Text
 
 from code_puppy.mcp_.managed_server import ServerState
-from code_puppy.messaging import emit_info
+from code_puppy.messaging import emit_error, emit_info
 
 from .base import MCPCommandBase
 from .utils import format_state_indicator, format_uptime
@@ -91,4 +91,4 @@ class ListCommand(MCPCommandBase):
 
         except Exception as e:
             logger.error(f"Error listing MCP servers: {e}")
-            emit_info(f"[red]Error listing servers: {e}[/red]", message_group=group_id)
+            emit_error(f"Error listing servers: {e}", message_group=group_id)