code-puppy 0.0.197__tar.gz → 0.0.199__tar.gz

{code_puppy-0.0.197 → code_puppy-0.0.199}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.197
+Version: 0.0.199
 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.197 → code_puppy-0.0.199}/code_puppy/agents/base_agent.py

@@ -460,16 +460,21 @@ class BaseAgent(ABC):
 
     def get_model_context_length(self) -> int:
         """
-        Get the context length for the currently configured model from models.json
-        """
-        model_configs = ModelFactory.load_config()
-        model_name = get_global_model_name()
-
-        # Get context length from model config
-        model_config = model_configs.get(model_name, {})
-        context_length = model_config.get("context_length", 128000)  # Default value
+        Return the context length for this agent's effective model.
 
-        return int(context_length)
+        Honors per-agent pinned model via `self.get_model_name()`; falls back
+        to global model when no pin is set. Defaults conservatively on failure.
+        """
+        try:
+            model_configs = ModelFactory.load_config()
+            # Use the agent's effective model (respects /pin_model)
+            model_name = self.get_model_name()
+            model_config = model_configs.get(model_name, {})
+            context_length = model_config.get("context_length", 128000)
+            return int(context_length)
+        except Exception:
+            # Be safe; don't blow up status/compaction if model lookup fails
+            return 128000
 
     def prune_interrupted_tool_calls(
         self, messages: List[ModelMessage]

{code_puppy-0.0.197 → code_puppy-0.0.199}/code_puppy/agents/json_agent.py

@@ -101,6 +101,14 @@ class JSONAgent(BaseAgent):
         """Get tool configuration from JSON config."""
         return self._config.get("tools_config")
 
+    def refresh_config(self) -> None:
+        """Reload the agent configuration from disk.
+
+        This keeps long-lived agent instances in sync after external edits.
+        """
+        self._config = self._load_config()
+        self._validate_config()
+
     def get_model_name(self) -> Optional[str]:
         """Get pinned model name from JSON config, if specified.
 

{code_puppy-0.0.197 → code_puppy-0.0.199}/code_puppy/command_line/command_handler.py

@@ -5,7 +5,11 @@ from pathlib import Path
 from code_puppy.command_line.model_picker_completion import update_model_in_input
 from code_puppy.command_line.motd import print_motd
 from code_puppy.command_line.utils import make_directory_table
-from code_puppy.config import CONTEXTS_DIR, get_config_keys
+from code_puppy.config import (
+    CONTEXTS_DIR,
+    finalize_autosave_session,
+    get_config_keys,
+)
 from code_puppy.session_storage import list_sessions, load_session, save_session
 from code_puppy.tools.tools_content import tools_content
 
@@ -429,31 +433,44 @@ def handle_command(command: str):
             import uuid
 
             group_id = str(uuid.uuid4())
+            available_agents = get_available_agents()
 
-            if set_current_agent(agent_name):
-                # Reload the agent with new configuration
-                agent = get_current_agent()
-                agent.reload_code_generation_agent()
-                new_agent = get_current_agent()
-                emit_success(
-                    f"Switched to agent: {new_agent.display_name}",
+            if agent_name not in available_agents:
+                emit_error(f"Agent '{agent_name}' not found", message_group=group_id)
+                emit_warning(
+                    f"Available agents: {', '.join(available_agents.keys())}",
                     message_group=group_id,
                 )
-                emit_info(f"[dim]{new_agent.description}[/dim]", message_group=group_id)
                 return True
-            else:
-                # Generate a group ID for all messages in this command
-                import uuid
 
-                group_id = str(uuid.uuid4())
+            current_agent = get_current_agent()
+            if current_agent.name == agent_name:
+                emit_info(
+                    f"Already using agent: {current_agent.display_name}",
+                    message_group=group_id,
+                )
+                return True
 
-                available_agents = get_available_agents()
-                emit_error(f"Agent '{agent_name}' not found", message_group=group_id)
+            new_session_id = finalize_autosave_session()
+            if not set_current_agent(agent_name):
                 emit_warning(
-                    f"Available agents: {', '.join(available_agents.keys())}",
+                    "Agent switch failed after autosave rotation. Your context was preserved.",
                     message_group=group_id,
                 )
                 return True
+
+            new_agent = get_current_agent()
+            new_agent.reload_code_generation_agent()
+            emit_success(
+                f"Switched to agent: {new_agent.display_name}",
+                message_group=group_id,
+            )
+            emit_info(f"[dim]{new_agent.description}[/dim]", message_group=group_id)
+            emit_info(
+                f"[dim]Auto-save session rotated to: {new_session_id}[/dim]",
+                message_group=group_id,
+            )
+            return True
         else:
             emit_warning("Usage: /agent [agent-name]")
             return True
@@ -593,12 +610,22 @@ def handle_command(command: str):
 
             emit_success(f"Model '{model_name}' pinned to agent '{agent_name}'")
 
-            # If this is the current agent, reload it to use the new model
+            # If this is the current agent, refresh it so the prompt updates immediately
             from code_puppy.agents import get_current_agent
 
             current_agent = get_current_agent()
             if current_agent.name == agent_name:
-                emit_info(f"Active agent reloaded with pinned model '{model_name}'")
+                try:
+                    if is_json_agent and hasattr(current_agent, "refresh_config"):
+                        current_agent.refresh_config()
+                    current_agent.reload_code_generation_agent()
+                    emit_info(
+                        f"Active agent reloaded with pinned model '{model_name}'"
+                    )
+                except Exception as reload_error:
+                    emit_warning(
+                        f"Pinned model applied but reload failed: {reload_error}"
+                    )
 
             return True
 

{code_puppy-0.0.197 → code_puppy-0.0.199}/code_puppy/command_line/model_picker_completion.py

@@ -29,13 +29,22 @@ def set_active_model(model_name: str):
     Sets the active model name by updating the config (for persistence).
     """
     set_model_name(model_name)
-    # Reload agent globally
+    # Reload the currently active agent so the new model takes effect immediately
     try:
-        from code_puppy.agent import reload_code_generation_agent
-
-        reload_code_generation_agent()  # This will reload dynamically everywhere
+        from code_puppy.agents import get_current_agent
+
+        current_agent = get_current_agent()
+        # JSON agents may need to refresh their config before reload
+        if hasattr(current_agent, "refresh_config"):
+            try:
+                current_agent.refresh_config()
+            except Exception:
+                # Non-fatal, continue to reload
+                ...
+        current_agent.reload_code_generation_agent()
     except Exception:
-        pass  # If reload fails, agent will still be switched next interpreter run
+        # Swallow errors to avoid breaking the prompt flow; model persists for next run
+        pass
 
 
 class ModelNameCompleter(Completer):

{code_puppy-0.0.197 → code_puppy-0.0.199}/code_puppy/config.py

@@ -784,3 +784,9 @@ def auto_save_session_if_enabled() -> bool:
 
         Console().print(f"[dim]❌ Failed to auto-save session: {exc}[/dim]")
         return False
+
+
+def finalize_autosave_session() -> str:
+    """Persist the current autosave snapshot and rotate to a fresh session."""
+    auto_save_session_if_enabled()
+    return rotate_autosave_id()

{code_puppy-0.0.197 → code_puppy-0.0.199}/code_puppy/main.py

@@ -24,6 +24,7 @@ from code_puppy.config import (
     AUTOSAVE_DIR,
     COMMAND_HISTORY_FILE,
     ensure_config_exists,
+    finalize_autosave_session,
     initialize_command_history_file,
     save_command_to_history,
 )
@@ -414,12 +415,14 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
 
         # Check for clear command (supports both `clear` and `/clear`)
         if task.strip().lower() in ("clear", "/clear"):
-            from code_puppy.messaging import emit_system_message, emit_warning
+            from code_puppy.messaging import emit_info, emit_system_message, emit_warning
 
             agent = get_current_agent()
+            new_session_id = finalize_autosave_session()
             agent.clear_message_history()
             emit_warning("Conversation history cleared!")
             emit_system_message("The agent will not remember previous interactions.\n")
+            emit_info(f"[dim]Auto-save session rotated to: {new_session_id}[/dim]")
             continue
 
         # Handle / commands before anything else

{code_puppy-0.0.197 → code_puppy-0.0.199}/code_puppy/tui/screens/settings.py

@@ -217,6 +217,20 @@ class SettingsScreen(ModalScreen):
             # Save model selection
             if selected_model:
                 set_model_name(selected_model)
+                # Reload the active agent so model switch takes effect immediately
+                try:
+                    from code_puppy.agents import get_current_agent
+
+                    current_agent = get_current_agent()
+                    if hasattr(current_agent, "refresh_config"):
+                        try:
+                            current_agent.refresh_config()
+                        except Exception:
+                            ...
+                    current_agent.reload_code_generation_agent()
+                except Exception:
+                    # Non-fatal: settings saved; reload will happen on next run if needed
+                    pass
 
             set_config_value("yolo_mode", yolo_mode)
 

{code_puppy-0.0.197 → code_puppy-0.0.199}/pyproject.toml

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