code-puppy 0.0.369__py3-none-any.whl → 0.0.371__py3-none-any.whl

code_puppy/command_line/agent_menu.py

@@ -16,11 +16,22 @@ from prompt_toolkit.layout.controls import FormattedTextControl
 from prompt_toolkit.widgets import Frame
 
 from code_puppy.agents import (
+    clone_agent,
+    delete_clone_agent,
     get_agent_descriptions,
     get_available_agents,
     get_current_agent,
+    is_clone_agent_name,
 )
+from code_puppy.command_line.model_picker_completion import load_model_names
+from code_puppy.config import (
+    clear_agent_pinned_model,
+    get_agent_pinned_model,
+    set_agent_pinned_model,
+)
+from code_puppy.messaging import emit_info, emit_success, emit_warning
 from code_puppy.tools.command_runner import set_awaiting_user_input
+from code_puppy.tools.common import arrow_select_async
 
 PAGE_SIZE = 10  # Agents per page
 
@@ -87,6 +98,166 @@ def _sanitize_display_text(text: str) -> str:
     return cleaned
 
 
+def _get_pinned_model(agent_name: str) -> Optional[str]:
+    """Return the pinned model for an agent, if any.
+
+    Checks both built-in agent config and JSON agent files.
+    """
+    import json
+
+    # First check built-in agent config
+    try:
+        pinned = get_agent_pinned_model(agent_name)
+        if pinned:
+            return pinned
+    except Exception:
+        pass  # Continue to check JSON agents
+
+    # Check if it's a JSON agent
+    try:
+        from code_puppy.agents.json_agent import discover_json_agents
+
+        json_agents = discover_json_agents()
+        if agent_name in json_agents:
+            agent_file_path = json_agents[agent_name]
+            with open(agent_file_path, "r", encoding="utf-8") as f:
+                agent_config = json.load(f)
+            model = agent_config.get("model")
+            return model if model else None
+    except Exception:
+        pass  # Return None if we can't read the JSON file
+
+    return None
+
+
+def _build_model_picker_choices(
+    pinned_model: Optional[str],
+    model_names: List[str],
+) -> List[str]:
+    """Build model picker choices with pinned/unpin indicators."""
+    choices = ["✓ (unpin)" if not pinned_model else "  (unpin)"]
+
+    for model_name in model_names:
+        if model_name == pinned_model:
+            choices.append(f"✓ {model_name} (pinned)")
+        else:
+            choices.append(f"  {model_name}")
+
+    return choices
+
+
+def _normalize_model_choice(choice: str) -> str:
+    """Normalize a picker choice into a model name or '(unpin)' string."""
+    cleaned = choice.strip()
+    if cleaned.startswith("✓"):
+        cleaned = cleaned.lstrip("✓").strip()
+    if cleaned.endswith(" (pinned)"):
+        cleaned = cleaned[: -len(" (pinned)")].strip()
+    return cleaned
+
+
+async def _select_pinned_model(agent_name: str) -> Optional[str]:
+    """Prompt for a model to pin to the agent."""
+    try:
+        model_names = load_model_names() or []
+    except Exception as exc:
+        emit_warning(f"Failed to load models: {exc}")
+        return None
+
+    pinned_model = _get_pinned_model(agent_name)
+    choices = _build_model_picker_choices(pinned_model, model_names)
+    if not choices:
+        emit_warning("No models available to pin.")
+        return None
+
+    try:
+        choice = await arrow_select_async(
+            f"Select a model to pin for '{agent_name}'",
+            choices,
+        )
+    except KeyboardInterrupt:
+        emit_info("Model pinning cancelled")
+        return None
+
+    return _normalize_model_choice(choice)
+
+
+def _reload_agent_if_current(
+    agent_name: str,
+    pinned_model: Optional[str],
+) -> None:
+    """Reload the current agent when its pinned model changes."""
+    current_agent = get_current_agent()
+    if not current_agent or current_agent.name != agent_name:
+        return
+
+    try:
+        if hasattr(current_agent, "refresh_config"):
+            current_agent.refresh_config()
+        current_agent.reload_code_generation_agent()
+        if pinned_model:
+            emit_info(f"Active agent reloaded with pinned model '{pinned_model}'")
+        else:
+            emit_info("Active agent reloaded with default model")
+    except Exception as exc:
+        emit_warning(f"Pinned model applied but reload failed: {exc}")
+
+
+def _apply_pinned_model(agent_name: str, model_choice: str) -> None:
+    """Persist a pinned model selection for an agent.
+
+    Handles both built-in agents (via config) and JSON agents (via JSON file).
+    """
+    import json
+
+    # Check if this is a JSON agent or a built-in agent
+    try:
+        from code_puppy.agents.json_agent import discover_json_agents
+
+        json_agents = discover_json_agents()
+        is_json_agent = agent_name in json_agents
+    except Exception:
+        is_json_agent = False
+
+    try:
+        if is_json_agent:
+            # Handle JSON agent - modify the JSON file
+            agent_file_path = json_agents[agent_name]
+
+            with open(agent_file_path, "r", encoding="utf-8") as f:
+                agent_config = json.load(f)
+
+            if model_choice == "(unpin)":
+                # Remove the model key if it exists
+                if "model" in agent_config:
+                    del agent_config["model"]
+                emit_success(f"Model pin cleared for '{agent_name}'")
+                pinned_model = None
+            else:
+                # Set the model
+                agent_config["model"] = model_choice
+                emit_success(f"Pinned '{model_choice}' to '{agent_name}'")
+                pinned_model = model_choice
+
+            # Save the updated configuration
+            with open(agent_file_path, "w", encoding="utf-8") as f:
+                json.dump(agent_config, f, indent=2, ensure_ascii=False)
+        else:
+            # Handle built-in Python agent - use config functions
+            if model_choice == "(unpin)":
+                clear_agent_pinned_model(agent_name)
+                emit_success(f"Model pin cleared for '{agent_name}'")
+                pinned_model = None
+            else:
+                set_agent_pinned_model(agent_name, model_choice)
+                emit_success(f"Pinned '{model_choice}' to '{agent_name}'")
+                pinned_model = model_choice
+
+        _reload_agent_if_current(agent_name, pinned_model)
+    except Exception as exc:
+        emit_warning(f"Failed to apply pinned model: {exc}")
+
+
 def _get_agent_entries() -> List[Tuple[str, str, str]]:
     """Get all agents with their display names and descriptions.
 
@@ -141,6 +312,7 @@ def _render_menu_panel(
             name, display_name, _ = entries[i]
             is_selected = i == selected_idx
             is_current = name == current_agent_name
+            pinned_model = _get_pinned_model(name)
 
             # Sanitize display name to avoid emoji rendering issues
             safe_display_name = _sanitize_display_text(display_name)
@@ -153,6 +325,10 @@ def _render_menu_panel(
                 lines.append(("", "  "))
                 lines.append(("", safe_display_name))
 
+            if pinned_model:
+                safe_pinned_model = _sanitize_display_text(pinned_model)
+                lines.append(("fg:ansiyellow", f" → {safe_pinned_model}"))
+
             # Add current marker
             if is_current:
                 lines.append(("fg:ansicyan", " ← current"))
@@ -167,6 +343,12 @@ def _render_menu_panel(
     lines.append(("", "Page\n"))
     lines.append(("fg:green", "  Enter  "))
     lines.append(("", "Select\n"))
+    lines.append(("fg:ansibrightblack", "  P "))
+    lines.append(("", "Pin model\n"))
+    lines.append(("fg:ansibrightblack", "  C "))
+    lines.append(("", "Clone\n"))
+    lines.append(("fg:ansibrightblack", "  D "))
+    lines.append(("", "Delete clone\n"))
     lines.append(("fg:ansibrightred", "  Ctrl+C "))
     lines.append(("", "Cancel"))
 
@@ -198,6 +380,7 @@ def _render_preview_panel(
 
     name, display_name, description = entry
     is_current = name == current_agent_name
+    pinned_model = _get_pinned_model(name)
 
     # Sanitize text to avoid emoji rendering issues
     safe_display_name = _sanitize_display_text(display_name)
@@ -213,6 +396,15 @@ def _render_preview_panel(
     lines.append(("fg:ansicyan", safe_display_name))
     lines.append(("", "\n\n"))
 
+    # Pinned model
+    lines.append(("bold", "Pinned Model: "))
+    if pinned_model:
+        safe_pinned_model = _sanitize_display_text(pinned_model)
+        lines.append(("fg:ansiyellow", safe_pinned_model))
+    else:
+        lines.append(("fg:ansibrightblack", "default"))
+    lines.append(("", "\n\n"))
+
     # Description
     lines.append(("bold", "Description:"))
     lines.append(("", "\n"))
@@ -261,8 +453,6 @@ async def interactive_agent_picker() -> Optional[str]:
     current_agent_name = current_agent.name if current_agent else ""
 
     if not entries:
-        from code_puppy.messaging import emit_info
-
         emit_info("No agents found.")
         return None
 
@@ -270,14 +460,38 @@ async def interactive_agent_picker() -> Optional[str]:
     selected_idx = [0]  # Current selection (global index)
     current_page = [0]  # Current page
     result = [None]  # Selected agent name
+    pending_action = [None]  # 'pin', 'clone', 'delete', or None
 
-    total_pages = (len(entries) + PAGE_SIZE - 1) // PAGE_SIZE
+    total_pages = [max(1, (len(entries) + PAGE_SIZE - 1) // PAGE_SIZE)]
 
     def get_current_entry() -> Optional[Tuple[str, str, str]]:
         if 0 <= selected_idx[0] < len(entries):
             return entries[selected_idx[0]]
         return None
 
+    def refresh_entries(selected_name: Optional[str] = None) -> None:
+        nonlocal entries
+
+        entries = _get_agent_entries()
+        total_pages[0] = max(1, (len(entries) + PAGE_SIZE - 1) // PAGE_SIZE)
+
+        if not entries:
+            selected_idx[0] = 0
+            current_page[0] = 0
+            return
+
+        if selected_name:
+            for idx, (name, _, _) in enumerate(entries):
+                if name == selected_name:
+                    selected_idx[0] = idx
+                    break
+            else:
+                selected_idx[0] = min(selected_idx[0], len(entries) - 1)
+        else:
+            selected_idx[0] = min(selected_idx[0], len(entries) - 1)
+
+        current_page[0] = selected_idx[0] // PAGE_SIZE
+
     # Build UI
     menu_control = FormattedTextControl(text="")
     preview_control = FormattedTextControl(text="")
@@ -336,11 +550,29 @@ async def interactive_agent_picker() -> Optional[str]:
 
     @kb.add("right")
     def _(event):
-        if current_page[0] < total_pages - 1:
+        if current_page[0] < total_pages[0] - 1:
             current_page[0] += 1
             selected_idx[0] = current_page[0] * PAGE_SIZE
             update_display()
 
+    @kb.add("p")
+    def _(event):
+        if get_current_entry():
+            pending_action[0] = "pin"
+            event.app.exit()
+
+    @kb.add("c")
+    def _(event):
+        if get_current_entry():
+            pending_action[0] = "clone"
+            event.app.exit()
+
+    @kb.add("d")
+    def _(event):
+        if get_current_entry():
+            pending_action[0] = "delete"
+            event.app.exit()
+
     @kb.add("enter")
     def _(event):
         entry = get_current_entry()
@@ -370,15 +602,52 @@ async def interactive_agent_picker() -> Optional[str]:
     time.sleep(0.05)
 
     try:
-        # Initial display
-        update_display()
-
-        # Clear the current buffer
-        sys.stdout.write("\033[2J\033[H")
-        sys.stdout.flush()
+        while True:
+            pending_action[0] = None
+            result[0] = None
+            update_display()
 
-        # Run application
-        await app.run_async()
+            # Clear the current buffer
+            sys.stdout.write("\033[2J\033[H")
+            sys.stdout.flush()
+
+            # Run application
+            await app.run_async()
+
+            if pending_action[0] == "pin":
+                entry = get_current_entry()
+                if entry:
+                    selected_model = await _select_pinned_model(entry[0])
+                    if selected_model:
+                        _apply_pinned_model(entry[0], selected_model)
+                continue
+
+            if pending_action[0] == "clone":
+                entry = get_current_entry()
+                selected_name = None
+                if entry:
+                    cloned_name = clone_agent(entry[0])
+                    selected_name = cloned_name or entry[0]
+                refresh_entries(selected_name=selected_name)
+                continue
+
+            if pending_action[0] == "delete":
+                entry = get_current_entry()
+                selected_name = None
+                if entry:
+                    agent_name = entry[0]
+                    selected_name = agent_name
+                    if not is_clone_agent_name(agent_name):
+                        emit_warning("Only cloned agents can be deleted.")
+                    elif agent_name == current_agent_name:
+                        emit_warning("Cannot delete the active agent. Switch first.")
+                    else:
+                        if delete_clone_agent(agent_name):
+                            selected_name = None
+                refresh_entries(selected_name=selected_name)
+                continue
+
+            break
 
     finally:
         # Exit alternate screen buffer once at end
@@ -388,8 +657,6 @@ async def interactive_agent_picker() -> Optional[str]:
         set_awaiting_user_input(False)
 
     # Clear exit message
-    from code_puppy.messaging import emit_info
-
     emit_info("✓ Exited agent picker")
 
     return result[0]

code_puppy/command_line/core_commands.py

@@ -169,7 +169,7 @@ def handle_tutorial_command(command: str) -> bool:
         reset_onboarding,
         run_onboarding_wizard,
     )
-    from code_puppy.config import set_model_name
+    from code_puppy.model_switching import set_model_and_reload_agent
 
     # Always reset so user can re-run the tutorial anytime
     reset_onboarding()
@@ -184,7 +184,7 @@ def handle_tutorial_command(command: str) -> bool:
         from code_puppy.plugins.chatgpt_oauth.oauth_flow import run_oauth_flow
 
         run_oauth_flow()
-        set_model_name("chatgpt-gpt-5.2-codex")
+        set_model_and_reload_agent("chatgpt-gpt-5.2-codex")
     elif result == "claude":
         emit_info("🔐 Starting Claude Code OAuth flow...")
         from code_puppy.plugins.claude_code_oauth.register_callbacks import (
@@ -192,7 +192,7 @@ def handle_tutorial_command(command: str) -> bool:
         )
 
         _perform_authentication()
-        set_model_name("claude-code-claude-opus-4-5-20251101")
+        set_model_and_reload_agent("claude-code-claude-opus-4-5-20251101")
     elif result == "completed":
         emit_info("🎉 Tutorial complete! Happy coding!")
     elif result == "skipped":

code_puppy/command_line/model_picker_completion.py

@@ -6,8 +6,9 @@ from prompt_toolkit.completion import Completer, Completion
 from prompt_toolkit.document import Document
 from prompt_toolkit.history import FileHistory
 
-from code_puppy.config import get_global_model_name, set_model_name
+from code_puppy.config import get_global_model_name
 from code_puppy.model_factory import ModelFactory
+from code_puppy.model_switching import set_model_and_reload_agent
 
 
 def load_model_names():
@@ -28,25 +29,7 @@ def set_active_model(model_name: str):
     """
     Sets the active model name by updating the config (for persistence).
     """
-    from code_puppy.messaging import emit_info, emit_warning
-
-    set_model_name(model_name)
-    # Reload the currently active agent so the new model takes effect immediately
-    try:
-        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()
-        emit_info("Active agent reloaded")
-    except Exception as e:
-        emit_warning(f"Model changed but agent reload failed: {e}")
+    set_model_and_reload_agent(model_name)
 
 
 class ModelNameCompleter(Completer):

code_puppy/config.py

@@ -123,6 +123,9 @@ REQUIRED_KEYS = ["puppy_name", "owner_name"]
 # Runtime-only autosave session ID (per-process)
 _CURRENT_AUTOSAVE_ID: Optional[str] = None
 
+# Session-local model name (initialized from file on first access, then cached)
+_SESSION_MODEL: Optional[str] = None
+
 # Cache containers for model validation and defaults
 _model_validation_cache = {}
 _default_model_cache = None
@@ -419,6 +422,16 @@ def clear_model_cache():
     _default_vision_model_cache = None
 
 
+def reset_session_model():
+    """Reset the session-local model cache.
+
+    This is primarily for testing purposes. In normal operation, the session
+    model is set once at startup and only changes via set_model_name().
+    """
+    global _SESSION_MODEL
+    _SESSION_MODEL = None
+
+
 def model_supports_setting(model_name: str, setting: str) -> bool:
     """Check if a model supports a particular setting (e.g., 'temperature', 'seed').
 
@@ -459,26 +472,49 @@ def model_supports_setting(model_name: str, setting: str) -> bool:
 def get_global_model_name():
     """Return a valid model name for Code Puppy to use.
 
-    1. Look at ``model`` in *puppy.cfg*.
-    2. If that value exists **and** is present in *models.json*, use it.
-    3. Otherwise return the first model listed in *models.json*.
-    4. As a last resort (e.g.
-       *models.json* unreadable) fall back to ``claude-4-0-sonnet``.
+    Uses session-local caching so that model changes in other terminals
+    don't affect this running instance. The file is only read once at startup.
+
+    1. If _SESSION_MODEL is set, return it (session cache)
+    2. Otherwise, look at ``model`` in *puppy.cfg*
+    3. If that value exists **and** is present in *models.json*, use it
+    4. Otherwise return the first model listed in *models.json*
+    5. As a last resort fall back to ``claude-4-0-sonnet``
+
+    The result is cached in _SESSION_MODEL for subsequent calls.
     """
+    global _SESSION_MODEL
+
+    # Return cached session model if already initialized
+    if _SESSION_MODEL is not None:
+        return _SESSION_MODEL
 
+    # First access - initialize from file
     stored_model = get_value("model")
 
     if stored_model:
         # Use cached validation to avoid hitting ModelFactory every time
         if _validate_model_exists(stored_model):
-            return stored_model
+            _SESSION_MODEL = stored_model
+            return _SESSION_MODEL
 
     # Either no stored model or it's not valid – choose default from models.json
-    return _default_model_from_models_json()
+    _SESSION_MODEL = _default_model_from_models_json()
+    return _SESSION_MODEL
 
 
 def set_model_name(model: str):
-    """Sets the model name in the persistent config file."""
+    """Sets the model name in both the session cache and persistent config file.
+
+    Updates _SESSION_MODEL immediately for this process, and writes to the
+    config file so new terminals will pick up this model as their default.
+    """
+    global _SESSION_MODEL
+
+    # Update session cache immediately
+    _SESSION_MODEL = model
+
+    # Also persist to file for new terminal sessions
     config = configparser.ConfigParser()
     config.read(CONFIG_FILE)
     if DEFAULT_SECTION not in config:

code_puppy/model_switching.py

@@ -0,0 +1,63 @@
+"""Shared helpers for switching models and reloading agents safely."""
+
+from __future__ import annotations
+
+from typing import Optional
+
+from code_puppy.config import set_model_name
+
+
+def _get_effective_agent_model(agent) -> Optional[str]:
+    """Safely fetch the effective model name for an agent."""
+    try:
+        return agent.get_model_name()
+    except Exception:
+        return None
+
+
+def set_model_and_reload_agent(
+    model_name: str,
+    *,
+    warn_on_pinned_mismatch: bool = True,
+) -> None:
+    """Set the global model and reload the active agent.
+
+    This keeps model switching consistent across commands while avoiding
+    direct imports that can trigger circular dependencies.
+    """
+    from code_puppy.messaging import emit_info, emit_warning
+
+    set_model_name(model_name)
+
+    try:
+        from code_puppy.agents import get_current_agent
+
+        current_agent = get_current_agent()
+        if current_agent is None:
+            emit_warning("Model changed but no active agent was found to reload")
+            return
+
+        # 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
+                ...
+
+        if warn_on_pinned_mismatch:
+            effective_model = _get_effective_agent_model(current_agent)
+            if effective_model and effective_model != model_name:
+                display_name = getattr(
+                    current_agent, "display_name", current_agent.name
+                )
+                emit_warning(
+                    "Active agent "
+                    f"'{display_name}' is pinned to '{effective_model}', "
+                    f"so '{model_name}' will not take effect until unpinned."
+                )
+
+        current_agent.reload_code_generation_agent()
+        emit_info("Active agent reloaded")
+    except Exception as exc:
+        emit_warning(f"Model changed but agent reload failed: {exc}")