code-puppy 0.0.342__py3-none-any.whl → 0.0.344__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/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/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

@@ -24,7 +24,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 +33,7 @@ CUSTOM_SERVER_EXAMPLES = {
   "type": "sse",
   "url": "http://localhost:8080/sse",
   "headers": {
-    "Authorization": "Bearer YOUR_API_KEY"
+    "Authorization": "Bearer $MY_API_KEY"
   }
 }""",
 }

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

@@ -648,18 +648,38 @@ async def get_input_with_combined_completion(
         else:
             event.current_buffer.validate_and_handle()
 
-    # Handle bracketed paste - TEXT ONLY, never check clipboard for images.
-    # Drag-and-drop sends file paths through this handler (as text), and paste
-    # operations send text through here too. We should NOT conflate this with
-    # clipboard image capture - those are separate operations (Ctrl+V / F3).
+    # 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 - insert text data only."""
+        """Handle bracketed paste - smart text vs image detection."""
         pasted_data = event.data
-        if pasted_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)