code-puppy 0.0.344__tar.gz → 0.0.345__tar.gz

{code_puppy-0.0.344 → code_puppy-0.0.345}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.344
+Version: 0.0.345
 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.344 → code_puppy-0.0.345}/code_puppy/command_line/add_model_menu.py

@@ -17,6 +17,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.command_line.utils import safe_input
 from code_puppy.config import EXTRA_MODELS_FILE, set_config_value
 from code_puppy.messaging import emit_error, emit_info, emit_warning
 from code_puppy.models_dev_parser import ModelInfo, ModelsDevRegistry, ProviderInfo
@@ -724,8 +725,8 @@ class AddModelMenu:
                 emit_info(f"  {hint}")
 
             try:
-                # Use regular input - simpler and works in threaded context
-                value = input(f"  Enter {env_var} (or press Enter to skip): ").strip()
+                # Use safe_input for cross-platform compatibility (Windows fix)
+                value = safe_input(f"  Enter {env_var} (or press Enter to skip): ")
 
                 if not value:
                     emit_warning(
@@ -785,7 +786,7 @@ class AddModelMenu:
         )
 
         try:
-            model_name = input("  Model ID: ").strip()
+            model_name = safe_input("  Model ID: ")
 
             if not model_name:
                 emit_warning("No model name provided, cancelled.")
@@ -795,7 +796,7 @@ class AddModelMenu:
             emit_info("\n  Enter the context window size (in tokens).")
             emit_info("  Common sizes: 8192, 32768, 128000, 200000, 1000000\n")
 
-            context_input = input("  Context size [128000]: ").strip()
+            context_input = safe_input("  Context size [128000]: ")
 
             if not context_input:
                 context_length = 128000  # Default
@@ -1045,11 +1046,9 @@ class AddModelMenu:
                     f"   It will be very limited for coding tasks."
                 )
                 try:
-                    confirm = (
-                        input("\n  Are you sure you want to add this model? (y/N): ")
-                        .strip()
-                        .lower()
-                    )
+                    confirm = safe_input(
+                        "\n  Are you sure you want to add this model? (y/N): "
+                    ).lower()
                     if confirm not in ("y", "yes"):
                         emit_info("Model addition cancelled.")
                         return False

{code_puppy-0.0.344 → code_puppy-0.0.345}/code_puppy/command_line/mcp/catalog_server_installer.py

@@ -7,6 +7,7 @@ MCP servers from the catalog.
 import os
 from typing import Dict, Optional
 
+from code_puppy.command_line.utils import safe_input
 from code_puppy.messaging import emit_info, emit_success, emit_warning
 
 # Helpful hints for common environment variables
@@ -52,7 +53,7 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
     # Get custom name
     default_name = server.name
     try:
-        name_input = input(f"  Server name [{default_name}]: ").strip()
+        name_input = safe_input(f"  Server name [{default_name}]: ")
         server_name = name_input if name_input else default_name
     except (KeyboardInterrupt, EOFError):
         emit_info("")
@@ -63,9 +64,7 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
     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("Installation cancelled")
                 return None
@@ -91,7 +90,7 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
                     hint = get_env_var_hint(var)
                     if hint:
                         emit_info(f"     {hint}")
-                    value = input(f"     Enter {var}: ").strip()
+                    value = safe_input(f"     Enter {var}: ")
                     if value:
                         env_vars[var] = value
                         # Save to config for future use
@@ -119,7 +118,7 @@ def prompt_for_server_config(manager, server) -> Optional[Dict]:
                 prompt_str += " (optional)"
 
             try:
-                value = input(f"{prompt_str}: ").strip()
+                value = safe_input(f"{prompt_str}: ")
                 if value:
                     cmd_args[name] = value
                 elif default:

{code_puppy-0.0.344 → code_puppy-0.0.345}/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
@@ -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-0.0.345/code_puppy/command_line/utils.py

@@ -0,0 +1,93 @@
+import os
+from typing import List, Tuple
+
+from rich.table import Table
+
+
+def list_directory(path: str = None) -> Tuple[List[str], List[str]]:
+    """
+    Returns (dirs, files) for the specified path, splitting out directories and files.
+    """
+    if path is None:
+        path = os.getcwd()
+    entries = []
+    try:
+        entries = [e for e in os.listdir(path)]
+    except Exception as e:
+        raise RuntimeError(f"Error listing directory: {e}")
+    dirs = [e for e in entries if os.path.isdir(os.path.join(path, e))]
+    files = [e for e in entries if not os.path.isdir(os.path.join(path, e))]
+    return dirs, files
+
+
+def make_directory_table(path: str = None) -> Table:
+    """
+    Returns a rich.Table object containing the directory listing.
+    """
+    if path is None:
+        path = os.getcwd()
+    dirs, files = list_directory(path)
+    table = Table(
+        title=f"\U0001f4c1 [bold blue]Current directory:[/bold blue] [cyan]{path}[/cyan]"
+    )
+    table.add_column("Type", style="dim", width=8)
+    table.add_column("Name", style="bold")
+    for d in sorted(dirs):
+        table.add_row("[green]dir[/green]", f"[cyan]{d}[/cyan]")
+    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 ""

{code_puppy-0.0.344 → code_puppy-0.0.345}/code_puppy/mcp_/managed_server.py

@@ -219,8 +219,9 @@ class ManagedMCPServer:
                     stdio_kwargs["env"] = _expand_env_vars(config["env"])
                 if "cwd" in config:
                     stdio_kwargs["cwd"] = _expand_env_vars(config["cwd"])
-                if "timeout" in config:
-                    stdio_kwargs["timeout"] = config["timeout"]
+                # Default timeout of 60s for stdio servers - some servers like Serena take a while to start
+                # Users can override this in their config
+                stdio_kwargs["timeout"] = config.get("timeout", 60)
                 if "read_timeout" in config:
                     stdio_kwargs["read_timeout"] = config["read_timeout"]
 

{code_puppy-0.0.344 → code_puppy-0.0.345}/code_puppy/messaging/message_queue.py

@@ -329,31 +329,19 @@ def emit_divider(content: str = "─" * 100 + "\n", **metadata):
 
 
 def emit_prompt(prompt_text: str, timeout: float = None) -> str:
-    """Emit a human input request and wait for response."""
-    # TUI mode has been removed, always use interactive mode input
-    if True:
-        # Emit the prompt as a message for display
-        from code_puppy.messaging import emit_info
+    """Emit a human input request and wait for response.
 
-        emit_info(prompt_text)
+    Uses safe_input for cross-platform compatibility, especially on Windows
+    where raw input() can fail after prompt_toolkit Applications.
+    """
+    from code_puppy.command_line.utils import safe_input
+    from code_puppy.messaging import emit_info
 
-        # Get input directly
-        try:
-            # Try to use rich console for better formatting
-            from rich.console import Console
-
-            console = Console()
-            response = console.input("[cyan]>>> [/cyan]")
-            return response
-        except Exception:
-            # Fallback to basic input
-            response = input(">>> ")
-            return response
-
-    # In TUI mode, use the queue system
-    queue = get_global_queue()
-    prompt_id = queue.create_prompt_request(prompt_text)
-    return queue.wait_for_prompt_response(prompt_id, timeout)
+    emit_info(prompt_text)
+
+    # Use safe_input which resets Windows console state before reading
+    response = safe_input(">>> ")
+    return response
 
 
 def provide_prompt_response(prompt_id: str, response: str):

{code_puppy-0.0.344 → code_puppy-0.0.345}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "code-puppy"
-version = "0.0.344"
+version = "0.0.345"
 description = "Code generation agent"
 readme = "README.md"
 requires-python = ">=3.11,<3.14"

code_puppy-0.0.344/code_puppy/command_line/utils.py

@@ -1,39 +0,0 @@
-import os
-from typing import List, Tuple
-
-from rich.table import Table
-
-
-def list_directory(path: str = None) -> Tuple[List[str], List[str]]:
-    """
-    Returns (dirs, files) for the specified path, splitting out directories and files.
-    """
-    if path is None:
-        path = os.getcwd()
-    entries = []
-    try:
-        entries = [e for e in os.listdir(path)]
-    except Exception as e:
-        raise RuntimeError(f"Error listing directory: {e}")
-    dirs = [e for e in entries if os.path.isdir(os.path.join(path, e))]
-    files = [e for e in entries if not os.path.isdir(os.path.join(path, e))]
-    return dirs, files
-
-
-def make_directory_table(path: str = None) -> Table:
-    """
-    Returns a rich.Table object containing the directory listing.
-    """
-    if path is None:
-        path = os.getcwd()
-    dirs, files = list_directory(path)
-    table = Table(
-        title=f"\U0001f4c1 [bold blue]Current directory:[/bold blue] [cyan]{path}[/cyan]"
-    )
-    table.add_column("Type", style="dim", width=8)
-    table.add_column("Name", style="bold")
-    for d in sorted(dirs):
-        table.add_row("[green]dir[/green]", f"[cyan]{d}[/cyan]")
-    for f in sorted(files):
-        table.add_row("[yellow]file[/yellow]", f"{f}")
-    return table