code-puppy 0.0.343__py3-none-any.whl → 0.0.345__py3-none-any.whl

code_puppy/agents/base_agent.py

@@ -24,7 +24,6 @@ from typing import (
 import mcp
 import pydantic
 import pydantic_ai.models
-from dbos import DBOS, SetWorkflowID
 from pydantic_ai import Agent as PydanticAgent
 from pydantic_ai import (
     BinaryContent,
@@ -35,7 +34,6 @@ from pydantic_ai import (
     UsageLimitExceeded,
     UsageLimits,
 )
-from pydantic_ai.durable_exec.dbos import DBOSAgent
 from pydantic_ai.messages import (
     ModelMessage,
     ModelRequest,
@@ -56,7 +54,6 @@ from code_puppy.config import (
     get_global_model_name,
     get_message_limit,
     get_protected_token_count,
-    get_use_dbos,
     get_value,
 )
 from code_puppy.error_logging import log_error
@@ -1212,56 +1209,25 @@ class BaseAgent(ABC):
 
         self._last_model_name = resolved_model_name
         # expose for run_with_mcp
-        # Wrap it with DBOS, but handle MCP servers separately to avoid serialization issues
         global _reload_count
         _reload_count += 1
-        if get_use_dbos():
-            # Don't pass MCP servers to the agent constructor when using DBOS
-            # This prevents the "cannot pickle async_generator object" error
-            # MCP servers will be handled separately in run_with_mcp
-            agent_without_mcp = PydanticAgent(
-                model=model,
-                instructions=instructions,
-                output_type=str,
-                retries=3,
-                toolsets=[],  # Don't include MCP servers here
-                history_processors=[self.message_history_accumulator],
-                model_settings=model_settings,
-            )
-
-            # Register regular tools (non-MCP) on the new agent
-            agent_tools = self.get_available_tools()
-            register_tools_for_agent(agent_without_mcp, agent_tools)
-
-            # Wrap with DBOS
-            dbos_agent = DBOSAgent(
-                agent_without_mcp, name=f"{self.name}-{_reload_count}"
-            )
-            self.pydantic_agent = dbos_agent
-            self._code_generation_agent = dbos_agent
+        # Include filtered MCP servers in the agent
+        p_agent = PydanticAgent(
+            model=model,
+            instructions=instructions,
+            output_type=str,
+            retries=3,
+            toolsets=filtered_mcp_servers if filtered_mcp_servers else [],
+            history_processors=[self.message_history_accumulator],
+            model_settings=model_settings,
+        )
+        # Register regular tools on the agent
+        agent_tools = self.get_available_tools()
+        register_tools_for_agent(p_agent, agent_tools)
 
-            # Store filtered MCP servers separately for runtime use
-            self._mcp_servers = filtered_mcp_servers
-        else:
-            # Normal path without DBOS - include filtered MCP servers in the agent
-            # Re-create agent with filtered MCP servers
-            p_agent = PydanticAgent(
-                model=model,
-                instructions=instructions,
-                output_type=str,
-                retries=3,
-                toolsets=filtered_mcp_servers,
-                history_processors=[self.message_history_accumulator],
-                model_settings=model_settings,
-            )
-            # Register regular tools on the agent
-            agent_tools = self.get_available_tools()
-            register_tools_for_agent(p_agent, agent_tools)
-
-            self.pydantic_agent = p_agent
-            self._code_generation_agent = p_agent
-            self._mcp_servers = filtered_mcp_servers
-            self._mcp_servers = mcp_servers
+        self.pydantic_agent = p_agent
+        self._code_generation_agent = p_agent
+        self._mcp_servers = filtered_mcp_servers
         return self._code_generation_agent
 
     def _create_agent_with_output_type(self, output_type: Type[Any]) -> PydanticAgent:
@@ -1275,7 +1241,7 @@ class BaseAgent(ABC):
             output_type: The Pydantic model or type for structured output.
 
         Returns:
-            A configured PydanticAgent (or DBOSAgent wrapper) with the custom output_type.
+            A configured PydanticAgent with the custom output_type.
         """
         from code_puppy.model_utils import prepare_prompt_for_model
         from code_puppy.tools import register_tools_for_agent
@@ -1302,38 +1268,19 @@ class BaseAgent(ABC):
         global _reload_count
         _reload_count += 1
 
-        if get_use_dbos():
-            temp_agent = PydanticAgent(
-                model=model,
-                instructions=instructions,
-                output_type=output_type,
-                retries=3,
-                toolsets=[],
-                history_processors=[self.message_history_accumulator],
-                model_settings=model_settings,
-            )
-            agent_tools = self.get_available_tools()
-            register_tools_for_agent(temp_agent, agent_tools)
-            dbos_agent = DBOSAgent(
-                temp_agent, name=f"{self.name}-structured-{_reload_count}"
-            )
-            return dbos_agent
-        else:
-            temp_agent = PydanticAgent(
-                model=model,
-                instructions=instructions,
-                output_type=output_type,
-                retries=3,
-                toolsets=mcp_servers,
-                history_processors=[self.message_history_accumulator],
-                model_settings=model_settings,
-            )
-            agent_tools = self.get_available_tools()
-            register_tools_for_agent(temp_agent, agent_tools)
-            return temp_agent
+        temp_agent = PydanticAgent(
+            model=model,
+            instructions=instructions,
+            output_type=output_type,
+            retries=3,
+            toolsets=mcp_servers,
+            history_processors=[self.message_history_accumulator],
+            model_settings=model_settings,
+        )
+        agent_tools = self.get_available_tools()
+        register_tools_for_agent(temp_agent, agent_tools)
+        return temp_agent
 
-    # It's okay to decorate it with DBOS.step even if not using DBOS; the decorator is a no-op in that case.
-    @DBOS.step()
     def message_history_accumulator(self, ctx: RunContext, messages: List[Any]):
         _message_history = self.get_message_history()
         message_history_hashes = set([self.hash_message(m) for m in _message_history])
@@ -1841,49 +1788,14 @@ class BaseAgent(ABC):
 
                 usage_limits = UsageLimits(request_limit=get_message_limit())
 
-                # Handle MCP servers - add them temporarily when using DBOS
-                if (
-                    get_use_dbos()
-                    and hasattr(self, "_mcp_servers")
-                    and self._mcp_servers
-                ):
-                    # Temporarily add MCP servers to the DBOS agent using internal _toolsets
-                    original_toolsets = pydantic_agent._toolsets
-                    pydantic_agent._toolsets = original_toolsets + self._mcp_servers
-                    pydantic_agent._toolsets = original_toolsets + self._mcp_servers
-
-                    try:
-                        # Set the workflow ID for DBOS context so DBOS and Code Puppy ID match
-                        with SetWorkflowID(group_id):
-                            result_ = await pydantic_agent.run(
-                                prompt_payload,
-                                message_history=self.get_message_history(),
-                                usage_limits=usage_limits,
-                                event_stream_handler=self._event_stream_handler,
-                                **kwargs,
-                            )
-                    finally:
-                        # Always restore original toolsets
-                        pydantic_agent._toolsets = original_toolsets
-                elif get_use_dbos():
-                    # DBOS without MCP servers
-                    with SetWorkflowID(group_id):
-                        result_ = await pydantic_agent.run(
-                            prompt_payload,
-                            message_history=self.get_message_history(),
-                            usage_limits=usage_limits,
-                            event_stream_handler=self._event_stream_handler,
-                            **kwargs,
-                        )
-                else:
-                    # Non-DBOS path (MCP servers are already included)
-                    result_ = await pydantic_agent.run(
-                        prompt_payload,
-                        message_history=self.get_message_history(),
-                        usage_limits=usage_limits,
-                        event_stream_handler=self._event_stream_handler,
-                        **kwargs,
-                    )
+                # MCP servers are already included in the agent
+                result_ = await pydantic_agent.run(
+                    prompt_payload,
+                    message_history=self.get_message_history(),
+                    usage_limits=usage_limits,
+                    event_stream_handler=self._event_stream_handler,
+                    **kwargs,
+                )
                 return result_
             except* UsageLimitExceeded as ule:
                 emit_info(f"Usage limit exceeded: {str(ule)}", group_id=group_id)
@@ -1899,12 +1811,8 @@ class BaseAgent(ABC):
                 )
             except* asyncio.exceptions.CancelledError:
                 emit_info("Cancelled")
-                if get_use_dbos():
-                    await DBOS.cancel_workflow_async(group_id)
             except* InterruptedError as ie:
                 emit_info(f"Interrupted: {str(ie)}")
-                if get_use_dbos():
-                    await DBOS.cancel_workflow_async(group_id)
             except* Exception as other_error:
                 # Filter out CancelledError and UsageLimitExceeded from the exception group - let it propagate
                 remaining_exceptions = []

code_puppy/cli_runner.py

@@ -12,11 +12,9 @@ import argparse
 import asyncio
 import os
 import sys
-import time
 import traceback
 from pathlib import Path
 
-from dbos import DBOS, DBOSConfig
 from rich.console import Console
 
 from code_puppy import __version__, callbacks, plugins
@@ -26,10 +24,8 @@ from code_puppy.command_line.clipboard import get_clipboard_manager
 from code_puppy.config import (
     AUTOSAVE_DIR,
     COMMAND_HISTORY_FILE,
-    DBOS_DATABASE_URL,
     ensure_config_exists,
     finalize_autosave_session,
-    get_use_dbos,
     initialize_command_history_file,
     save_command_to_history,
 )
@@ -287,33 +283,6 @@ async def main():
 
     await callbacks.on_startup()
 
-    # Initialize DBOS if not disabled
-    if get_use_dbos():
-        # Append a Unix timestamp in ms to the version for uniqueness
-        dbos_app_version = os.environ.get(
-            "DBOS_APP_VERSION", f"{current_version}-{int(time.time() * 1000)}"
-        )
-        dbos_config: DBOSConfig = {
-            "name": "dbos-code-puppy",
-            "system_database_url": DBOS_DATABASE_URL,
-            "run_admin_server": False,
-            "conductor_key": os.environ.get(
-                "DBOS_CONDUCTOR_KEY"
-            ),  # Optional, if set in env, connect to conductor
-            "log_level": os.environ.get(
-                "DBOS_LOG_LEVEL", "ERROR"
-            ),  # Default to ERROR level to suppress verbose logs
-            "application_version": dbos_app_version,  # Match DBOS app version to Code Puppy version
-        }
-        try:
-            DBOS(config=dbos_config)
-            DBOS.launch()
-        except Exception as e:
-            emit_error(f"Error initializing DBOS: {e}")
-            sys.exit(1)
-    else:
-        pass
-
     global shutdown_flag
     shutdown_flag = False
     try:
@@ -338,8 +307,6 @@ async def main():
         if bus_renderer:
             bus_renderer.stop()
         await callbacks.on_shutdown()
-        if get_use_dbos():
-            DBOS.destroy()
 
 
 async def interactive_mode(message_renderer, initial_command: str = None) -> None:
@@ -907,8 +874,6 @@ def main_entry():
     except KeyboardInterrupt:
         # Note: Using sys.stderr for crash output - messaging system may not be available
         sys.stderr.write(traceback.format_exc())
-        if get_use_dbos():
-            DBOS.destroy()
         return 0
     finally:
         # Reset terminal on Unix-like systems (not Windows)

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/command_line/config_commands.py

@@ -43,7 +43,6 @@ def handle_show_command(command: str) -> bool:
         get_protected_token_count,
         get_puppy_name,
         get_temperature,
-        get_use_dbos,
         get_yolo_mode,
     )
     from code_puppy.keymap import get_cancel_agent_display_name
@@ -72,7 +71,6 @@ def handle_show_command(command: str) -> bool:
 [bold]default_agent:[/bold]        [cyan]{default_agent}[/cyan]
 [bold]model:[/bold]                 [green]{model}[/green]
 [bold]YOLO_MODE:[/bold]             {"[red]ON[/red]" if yolo_mode else "[yellow]off[/yellow]"}
-[bold]DBOS:[/bold]                  {"[green]enabled[/green]" if get_use_dbos() else "[yellow]disabled[/yellow]"} (toggle: /set enable_dbos true|false)
 [bold]auto_save_session:[/bold]     {"[green]enabled[/green]" if auto_save else "[yellow]disabled[/yellow]"}
 [bold]protected_tokens:[/bold]      [cyan]{protected_tokens:,}[/cyan] recent tokens preserved
 [bold]compaction_threshold:[/bold]     [cyan]{compaction_threshold:.1%}[/cyan] context usage triggers compaction
@@ -213,14 +211,6 @@ def handle_set_command(command: str) -> bool:
         )
         return True
     if key:
-        # Check if we're toggling DBOS enablement
-        if key == "enable_dbos":
-            emit_info(
-                Text.from_markup(
-                    "[yellow]⚠️ DBOS configuration changed. Please restart Code Puppy for this change to take effect.[/yellow]"
-                )
-            )
-
         # Validate cancel_agent_key before setting
         if key == "cancel_agent_key":
             from code_puppy.keymap import VALID_CANCEL_KEYS

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/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