code-puppy 0.0.154__py3-none-any.whl → 0.0.156__py3-none-any.whl

code_puppy/config.py

@@ -106,7 +106,13 @@ def get_config_keys():
     Returns the list of all config keys currently in puppy.cfg,
     plus certain preset expected keys (e.g. "yolo_mode", "model", "compaction_strategy", "message_limit", "allow_recursion").
     """
-    default_keys = ["yolo_mode", "model", "compaction_strategy", "message_limit", "allow_recursion"]
+    default_keys = [
+        "yolo_mode",
+        "model",
+        "compaction_strategy",
+        "message_limit",
+        "allow_recursion",
+    ]
     config = configparser.ConfigParser()
     config.read(CONFIG_FILE)
     keys = set(config[DEFAULT_SECTION].keys()) if DEFAULT_SECTION in config else set()
@@ -173,7 +179,7 @@ def _default_model_from_models_json():
         first_key = next(iter(models_config))  # Raises StopIteration if empty
         _default_model_cache = first_key
         return first_key
-    except Exception as e:
+    except Exception:
         # Any problem (network, file missing, empty dict, etc.) => fall back
         _default_model_cache = "gpt-5"
         return "gpt-5"

code_puppy/main.py

@@ -290,7 +290,9 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
             if awaiting_input:
                 # No spinner - use agent_manager's run_with_mcp method
                 response = await agent_manager.run_with_mcp(
-                    initial_command, usage_limits=get_custom_usage_limits()
+                    initial_command,
+                    message_history=get_message_history(),
+                    usage_limits=get_custom_usage_limits(),
                 )
             else:
                 # Use our custom spinner for better compatibility with user input
@@ -299,7 +301,11 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
                 with ConsoleSpinner(console=display_console):
                     # Use agent_manager's run_with_mcp method
                     response = await agent_manager.run_with_mcp(
-                        initial_command, usage_limits=get_custom_usage_limits()
+                        initial_command,
+                        message_history=prune_interrupted_tool_calls(
+                            get_message_history()
+                        ),
+                        usage_limits=get_custom_usage_limits(),
                     )
                     set_message_history(
                         prune_interrupted_tool_calls(get_message_history())
@@ -426,7 +432,13 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
 
                 runtime_manager = get_runtime_agent_manager()
                 with ConsoleSpinner(console=message_renderer.console):
-                    result = await runtime_manager.run_with_mcp(task, get_custom_usage_limits())
+                    result = await runtime_manager.run_with_mcp(
+                        task,
+                        get_custom_usage_limits(),
+                        message_history=prune_interrupted_tool_calls(
+                            get_message_history()
+                        ),
+                    )
                 # Check if the task was cancelled (but don't show message if we just killed processes)
                 if result is None:
                     continue
@@ -495,7 +507,8 @@ async def execute_single_prompt(prompt: str, message_renderer) -> None:
 
         with ConsoleSpinner(console=message_renderer.console):
             response = await agent_manager.run_with_mcp(
-                prompt, usage_limits=get_custom_usage_limits()
+                prompt,
+                usage_limits=get_custom_usage_limits(),
             )
 
         agent_response = response.output

code_puppy/mcp/__init__.py

@@ -1,7 +1,7 @@
 """MCP (Model Context Protocol) management system for Code Puppy.
 
-Note: Be careful not to create circular imports with config_wizard.py. 
-config_wizard.py imports ServerConfig and get_mcp_manager directly from 
+Note: Be careful not to create circular imports with config_wizard.py.
+config_wizard.py imports ServerConfig and get_mcp_manager directly from
 .manager to avoid circular dependencies with this package __init__.py
 """
 

code_puppy/mcp/config_wizard.py

@@ -1,7 +1,7 @@
 """
 MCP Configuration Wizard - Interactive setup for MCP servers.
 
-Note: This module imports ServerConfig and get_mcp_manager directly from 
+Note: This module imports ServerConfig and get_mcp_manager directly from
 .code_puppy.mcp.manager to avoid circular imports with the package __init__.py
 """
 

code_puppy/messaging/spinner/console_spinner.py

@@ -125,7 +125,7 @@ class ConsoleSpinner(SpinnerBase):
                     self._live.refresh()
 
                 # Short sleep to control animation speed
-                time.sleep(0.1)
+                time.sleep(0.05)
         except Exception as e:
             print(f"\nSpinner error: {e}")
             self._is_spinning = False

code_puppy/model_factory.py

@@ -6,9 +6,8 @@ from typing import Any, Dict
 
 import httpx
 from anthropic import AsyncAnthropic
-from openai import AsyncAzureOpenAI  # For Azure OpenAI client
+from openai import AsyncAzureOpenAI
 from pydantic_ai.models.anthropic import AnthropicModel
-from pydantic_ai.models.fallback import infer_model
 from pydantic_ai.models.gemini import GeminiModel
 from pydantic_ai.models.openai import OpenAIChatModel
 from pydantic_ai.providers.anthropic import AnthropicProvider
@@ -87,13 +86,13 @@ class ModelFactory:
         else:
             from code_puppy.config import MODELS_FILE
 
-            if not pathlib.Path(MODELS_FILE).exists():
-                with open(pathlib.Path(__file__).parent / "models.json", "r") as src:
-                    with open(pathlib.Path(MODELS_FILE), "w") as target:
-                        target.write(src.read())
+            with open(pathlib.Path(__file__).parent / "models.json", "r") as src:
+                with open(pathlib.Path(MODELS_FILE), "w") as target:
+                    target.write(src.read())
 
             with open(MODELS_FILE, "r") as f:
                 config = json.load(f)
+
         if pathlib.Path(EXTRA_MODELS_FILE).exists():
             with open(EXTRA_MODELS_FILE, "r") as f:
                 extra_config = json.load(f)
@@ -248,25 +247,27 @@ class ModelFactory:
             model = OpenAIChatModel(model_name=model_config["name"], provider=provider)
             setattr(model, "provider", provider)
             return model
-        
+
         elif model_type == "round_robin":
             # Get the list of model names to use in the round-robin
             model_names = model_config.get("models")
             if not model_names or not isinstance(model_names, list):
-                raise ValueError(f"Round-robin model '{model_name}' requires a 'models' list in its configuration.")
-            
+                raise ValueError(
+                    f"Round-robin model '{model_name}' requires a 'models' list in its configuration."
+                )
+
             # Get the rotate_every parameter (default: 1)
             rotate_every = model_config.get("rotate_every", 1)
-            
+
             # Resolve each model name to an actual model instance
             models = []
             for name in model_names:
                 # Recursively get each model using the factory
                 model = ModelFactory.get_model(name, config)
                 models.append(model)
-            
+
             # Create and return the round-robin model
             return RoundRobinModel(*models, rotate_every=rotate_every)
-        
+
         else:
             raise ValueError(f"Unsupported model type: {model_type}")

code_puppy/models.json

@@ -1,4 +1,30 @@
 {
+  "openrouter-sonoma-dusk-alpha": {
+    "type": "custom_openai",
+    "name": "openrouter/sonoma-dusk-alpha",
+    "custom_endpoint": {
+      "url": "https://openrouter.ai/api/v1",
+      "api_key": "$OPENROUTER_API_KEY",
+      "headers": {
+        "HTTP-Referer": "https://github.com/mpfaffenberger/code_puppy",
+        "X-Title": "Code Puppy"
+      }
+    },
+    "context_length": 2000000
+  },
+  "openrouter-sonoma-sky-alpha": {
+    "type": "custom_openai",
+    "name": "openrouter/sonoma-sky-alpha",
+    "custom_endpoint": {
+      "url": "https://openrouter.ai/api/v1",
+      "api_key": "$OPENROUTER_API_KEY",
+      "headers": {
+        "HTTP-Referer": "https://github.com/mpfaffenberger/code_puppy",
+        "X-Title": "Code Puppy"
+      }
+    },
+    "context_length": 2000000
+  },
   "gpt-5": {
     "type": "openai",
     "name": "gpt-5",

code_puppy/round_robin_model.py

@@ -1,10 +1,18 @@
-
 from contextlib import asynccontextmanager, suppress
 from dataclasses import dataclass, field
-from typing import Any, Callable, AsyncIterator, List
+from typing import Any, AsyncIterator, List
 
-from pydantic_ai.models import Model, ModelMessage, ModelSettings, ModelRequestParameters, ModelResponse, StreamedResponse
-from pydantic_ai.models.fallback import KnownModelName, infer_model, merge_model_settings
+from pydantic_ai.models import (
+    Model,
+    ModelMessage,
+    ModelSettings,
+    ModelRequestParameters,
+    ModelResponse,
+    StreamedResponse,
+)
+from pydantic_ai.models.fallback import (
+    merge_model_settings,
+)
 from pydantic_ai.result import RunContext
 
 try:
@@ -15,18 +23,21 @@ except ImportError:
         class DummySpan:
             def is_recording(self):
                 return False
+
             def set_attributes(self, attributes):
                 pass
+
         return DummySpan()
 
+
 @dataclass(init=False)
 class RoundRobinModel(Model):
     """A model that cycles through multiple models in a round-robin fashion.
-    
+
     This model distributes requests across multiple candidate models to help
     overcome rate limits or distribute load.
     """
-    
+
     models: List[Model]
     _current_index: int = field(default=0, repr=False)
     _model_name: str = field(repr=False)
@@ -37,10 +48,10 @@ class RoundRobinModel(Model):
         self,
         *models: Model,
         rotate_every: int = 1,
-        settings: ModelSettings | None = None
+        settings: ModelSettings | None = None,
     ):
         """Initialize a round-robin model instance.
-        
+
         Args:
             models: The model instances to cycle through.
             rotate_every: Number of requests before rotating to the next model (default: 1).
@@ -59,9 +70,9 @@ class RoundRobinModel(Model):
     @property
     def model_name(self) -> str:
         """The model name showing this is a round-robin model with its candidates."""
-        base_name = f'round_robin:{",".join(model.model_name for model in self.models)}'
+        base_name = f"round_robin:{','.join(model.model_name for model in self.models)}"
         if self._rotate_every != 1:
-            return f'{base_name}:rotate_every={self._rotate_every}'
+            return f"{base_name}:rotate_every={self._rotate_every}"
         return base_name
 
     @property
@@ -93,10 +104,14 @@ class RoundRobinModel(Model):
         current_model = self._get_next_model()
         # Use the current model's settings as base, then merge with provided settings
         merged_settings = merge_model_settings(current_model.settings, model_settings)
-        customized_model_request_parameters = current_model.customize_request_parameters(model_request_parameters)
-        
+        customized_model_request_parameters = (
+            current_model.customize_request_parameters(model_request_parameters)
+        )
+
         try:
-            response = await current_model.request(messages, merged_settings, customized_model_request_parameters)
+            response = await current_model.request(
+                messages, merged_settings, customized_model_request_parameters
+            )
             self._set_span_attributes(current_model)
             return response
         except Exception as exc:
@@ -116,8 +131,10 @@ class RoundRobinModel(Model):
         current_model = self._get_next_model()
         # Use the current model's settings as base, then merge with provided settings
         merged_settings = merge_model_settings(current_model.settings, model_settings)
-        customized_model_request_parameters = current_model.customize_request_parameters(model_request_parameters)
-        
+        customized_model_request_parameters = (
+            current_model.customize_request_parameters(model_request_parameters)
+        )
+
         async with current_model.request_stream(
             messages, merged_settings, customized_model_request_parameters, run_context
         ) as response:
@@ -129,6 +146,6 @@ class RoundRobinModel(Model):
         with suppress(Exception):
             span = get_current_span()
             if span.is_recording():
-                attributes = getattr(span, 'attributes', {})
-                if attributes.get('gen_ai.request.model') == self.model_name:
-                    span.set_attributes(model.model_attributes(model))
+                attributes = getattr(span, "attributes", {})
+                if attributes.get("gen_ai.request.model") == self.model_name:
+                    span.set_attributes(model.model_attributes(model))

code_puppy/summarization_agent.py

@@ -53,9 +53,7 @@ def run_summarization_sync(prompt: str, message_history: List) -> List:
 def reload_summarization_agent():
     """Create a specialized agent for summarizing messages when context limit is reached."""
     models_config = ModelFactory.load_config()
-    model_name = "gemini-2.5-pro"
-    if model_name not in models_config:
-        model_name = get_model_name()
+    model_name = get_model_name()
     model = ModelFactory.get_model(model_name, models_config)
 
     # Specialized instructions for summarization

code_puppy/tools/agent_tools.py

@@ -21,213 +21,113 @@ from code_puppy.config import get_model_name
 
 class AgentInfo(BaseModel):
     """Information about an available agent."""
+
     name: str
     display_name: str
 
 
 class ListAgentsOutput(BaseModel):
     """Output for the list_agents tool."""
+
     agents: List[AgentInfo]
     error: str | None = None
 
 
 class AgentInvokeOutput(BaseModel):
     """Output for the invoke_agent tool."""
+
     response: str | None
     agent_name: str
     error: str | None = None
 
 
-def _list_agents(context: RunContext) -> ListAgentsOutput:
-    """List all available sub-agents that can be invoked.
-    
-    Returns:
-        ListAgentsOutput: A list of available agents with their names and display names.
-    """
-    group_id = generate_group_id("list_agents")
-    
-    emit_info(
-        "\n[bold white on blue] LIST AGENTS [/bold white on blue]",
-        message_group=group_id
-    )
-    emit_divider(message_group=group_id)
-    
-    try:
-        # Get available agents from the agent manager
-        agents_dict = get_available_agents()
-        
-        # Convert to list of AgentInfo objects
-        agents = [
-            AgentInfo(name=name, display_name=display_name)
-            for name, display_name in agents_dict.items()
-        ]
-        
-        # Display the agents in the console
-        for agent in agents:
-            emit_system_message(
-                f"- [bold]{agent.name}[/bold]: {agent.display_name}", 
-                message_group=group_id
-            )
-            
-        emit_divider(message_group=group_id)
-        return ListAgentsOutput(agents=agents)
-        
-    except Exception as e:
-        error_msg = f"Error listing agents: {str(e)}"
-        emit_error(error_msg, message_group=group_id)
-        emit_divider(message_group=group_id)
-        return ListAgentsOutput(agents=[], error=error_msg)
-
-
-def _invoke_agent(context: RunContext, agent_name: str, prompt: str) -> AgentInvokeOutput:
-    """Invoke a specific sub-agent with a given prompt.
-    
-    Args:
-        agent_name: The name of the agent to invoke
-        prompt: The prompt to send to the agent
-        
-    Returns:
-        AgentInvokeOutput: The agent's response to the prompt
-    """
-    group_id = generate_group_id("invoke_agent", agent_name)
-    
-    emit_info(
-        f"\n[bold white on blue] INVOKE AGENT [/bold white on blue] {agent_name}",
-        message_group=group_id
-    )
-    emit_divider(message_group=group_id)
-    emit_system_message(f"Prompt: {prompt}", message_group=group_id)
-    emit_divider(message_group=group_id)
-    
-    try:
-        # Load the specified agent config
-        agent_config = load_agent_config(agent_name)
-        
-        # Get the current model for creating a temporary agent
-        model_name = get_model_name()
-        models_config = ModelFactory.load_config()
-        model = ModelFactory.get_model(model_name, models_config)
-        
-        # Create a temporary agent instance to avoid interfering with current agent state
-        instructions = agent_config.get_system_prompt()
-        temp_agent = Agent(
-            model=model,
-            instructions=instructions,
-            output_type=str,
-            retries=3,
-        )
-        
-        # Register the tools that the agent needs
-        from code_puppy.tools import register_tools_for_agent
-        agent_tools = agent_config.get_available_tools()
-        
-        # Avoid recursive tool registration - if the agent has the same tools
-        # as the current agent, skip registration to prevent conflicts
-        current_agent_tools = ["list_agents", "invoke_agent"]
-        if set(agent_tools) != set(current_agent_tools):
-            register_tools_for_agent(temp_agent, agent_tools)
-        
-        # Run the temporary agent with the provided prompt
-        result = temp_agent.run_sync(prompt)
-        
-        # Extract the response from the result
-        response = result.output
-        
-        emit_system_message(f"Response: {response}", message_group=group_id)
-        emit_divider(message_group=group_id)
-        
-        return AgentInvokeOutput(response=response, agent_name=agent_name)
-        
-    except Exception as e:
-        error_msg = f"Error invoking agent '{agent_name}': {str(e)}"
-        emit_error(error_msg, message_group=group_id)
-        emit_divider(message_group=group_id)
-        return AgentInvokeOutput(response=None, agent_name=agent_name, error=error_msg)
-
-
 def register_list_agents(agent):
     """Register the list_agents tool with the provided agent.
-    
+
     Args:
         agent: The agent to register the tool with
     """
+
     @agent.tool
     def list_agents(context: RunContext) -> ListAgentsOutput:
         """List all available sub-agents that can be invoked.
-        
+
         Returns:
             ListAgentsOutput: A list of available agents with their names and display names.
         """
         # Generate a group ID for this tool execution
         group_id = generate_group_id("list_agents")
-        
+
         emit_info(
             "\n[bold white on blue] LIST AGENTS [/bold white on blue]",
-            message_group=group_id
+            message_group=group_id,
         )
         emit_divider(message_group=group_id)
-        
+
         try:
             # Get available agents from the agent manager
             agents_dict = get_available_agents()
-            
+
             # Convert to list of AgentInfo objects
             agents = [
                 AgentInfo(name=name, display_name=display_name)
                 for name, display_name in agents_dict.items()
             ]
-            
+
             # Display the agents in the console
             for agent_item in agents:
                 emit_system_message(
-                    f"- [bold]{agent_item.name}[/bold]: {agent_item.display_name}", 
-                    message_group=group_id
+                    f"- [bold]{agent_item.name}[/bold]: {agent_item.display_name}",
+                    message_group=group_id,
                 )
-                
+
             emit_divider(message_group=group_id)
             return ListAgentsOutput(agents=agents)
-            
+
         except Exception as e:
             error_msg = f"Error listing agents: {str(e)}"
             emit_error(error_msg, message_group=group_id)
             emit_divider(message_group=group_id)
             return ListAgentsOutput(agents=[], error=error_msg)
-        
+
     return list_agents
 
 
 def register_invoke_agent(agent):
     """Register the invoke_agent tool with the provided agent.
-    
+
     Args:
         agent: The agent to register the tool with
     """
+
     @agent.tool
-    def invoke_agent(context: RunContext, agent_name: str, prompt: str) -> AgentInvokeOutput:
+    def invoke_agent(
+        context: RunContext, agent_name: str, prompt: str
+    ) -> AgentInvokeOutput:
         """Invoke a specific sub-agent with a given prompt.
-        
+
         Args:
             agent_name: The name of the agent to invoke
             prompt: The prompt to send to the agent
-            
+
         Returns:
             AgentInvokeOutput: The agent's response to the prompt
         """
         # Generate a group ID for this tool execution
         group_id = generate_group_id("invoke_agent", agent_name)
-        
+
         emit_info(
             f"\n[bold white on blue] INVOKE AGENT [/bold white on blue] {agent_name}",
-            message_group=group_id
+            message_group=group_id,
         )
         emit_divider(message_group=group_id)
         emit_system_message(f"Prompt: {prompt}", message_group=group_id)
         emit_divider(message_group=group_id)
-        
+
         try:
             # Load the specified agent config
             agent_config = load_agent_config(agent_name)
-            
+
             # Get the current model for creating a temporary agent
             model_name = get_model_name()
             models_config = ModelFactory.load_config()
@@ -235,9 +135,9 @@ def register_invoke_agent(agent):
             # Only proceed if we have a valid model configuration
             if model_name not in models_config:
                 raise ValueError(f"Model '{model_name}' not found in configuration")
-                
+
             model = ModelFactory.get_model(model_name, models_config)
-            
+
             # Create a temporary agent instance to avoid interfering with current agent state
             instructions = agent_config.get_system_prompt()
             temp_agent = Agent(
@@ -246,27 +146,30 @@ def register_invoke_agent(agent):
                 output_type=str,
                 retries=3,
             )
-            
+
             # Register the tools that the agent needs
             from code_puppy.tools import register_tools_for_agent
+
             agent_tools = agent_config.get_available_tools()
             register_tools_for_agent(temp_agent, agent_tools)
-            
+
             # Run the temporary agent with the provided prompt
             result = temp_agent.run_sync(prompt)
-            
+
             # Extract the response from the result
             response = result.output
-            
+
             emit_system_message(f"Response: {response}", message_group=group_id)
             emit_divider(message_group=group_id)
-            
+
             return AgentInvokeOutput(response=response, agent_name=agent_name)
-            
+
         except Exception as e:
             error_msg = f"Error invoking agent '{agent_name}': {str(e)}"
             emit_error(error_msg, message_group=group_id)
             emit_divider(message_group=group_id)
-            return AgentInvokeOutput(response=None, agent_name=agent_name, error=error_msg)
-            
-    return invoke_agent
+            return AgentInvokeOutput(
+                response=None, agent_name=agent_name, error=error_msg
+            )
+
+    return invoke_agent