code-puppy 0.0.370__tar.gz → 0.0.371__tar.gz

{code_puppy-0.0.370 → code_puppy-0.0.371}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.370
+Version: 0.0.371
 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.370 → code_puppy-0.0.371}/code_puppy/agents/__init__.py

@@ -5,9 +5,12 @@ configurations, each with their own system prompts and tool sets.
 """
 
 from .agent_manager import (
+    clone_agent,
+    delete_clone_agent,
     get_agent_descriptions,
     get_available_agents,
     get_current_agent,
+    is_clone_agent_name,
     load_agent,
     refresh_agents,
     set_current_agent,
@@ -15,8 +18,11 @@ from .agent_manager import (
 from .subagent_stream_handler import subagent_stream_handler
 
 __all__ = [
+    "clone_agent",
+    "delete_clone_agent",
     "get_available_agents",
     "get_current_agent",
+    "is_clone_agent_name",
     "set_current_agent",
     "load_agent",
     "get_agent_descriptions",

{code_puppy-0.0.370 → code_puppy-0.0.371}/code_puppy/agents/agent_manager.py

@@ -4,6 +4,7 @@ import importlib
 import json
 import os
 import pkgutil
+import re
 import uuid
 from pathlib import Path
 from typing import Dict, List, Optional, Type, Union
@@ -13,7 +14,7 @@ from pydantic_ai.messages import ModelMessage
 from code_puppy.agents.base_agent import BaseAgent
 from code_puppy.agents.json_agent import JSONAgent, discover_json_agents
 from code_puppy.callbacks import on_agent_reload
-from code_puppy.messaging import emit_warning
+from code_puppy.messaging import emit_success, emit_warning
 
 # Registry of available agents (Python classes and JSON file paths)
 _AGENT_REGISTRY: Dict[str, Union[Type[BaseAgent], str]] = {}
@@ -467,3 +468,206 @@ def refresh_agents():
     # Generate a message group ID for agent refreshing
     message_group_id = str(uuid.uuid4())
     _discover_agents(message_group_id=message_group_id)
+
+
+_CLONE_NAME_PATTERN = re.compile(r"^(?P<base>.+)-clone-(?P<index>\d+)$")
+_CLONE_DISPLAY_PATTERN = re.compile(r"\s*\(Clone\s+\d+\)$", re.IGNORECASE)
+
+
+def _strip_clone_suffix(agent_name: str) -> str:
+    """Strip a trailing -clone-N suffix from a name if present."""
+    match = _CLONE_NAME_PATTERN.match(agent_name)
+    return match.group("base") if match else agent_name
+
+
+def _strip_clone_display_suffix(display_name: str) -> str:
+    """Remove a trailing "(Clone N)" suffix from display names."""
+    cleaned = _CLONE_DISPLAY_PATTERN.sub("", display_name).strip()
+    return cleaned or display_name
+
+
+def is_clone_agent_name(agent_name: str) -> bool:
+    """Return True if the agent name looks like a clone."""
+    return bool(_CLONE_NAME_PATTERN.match(agent_name))
+
+
+def _default_display_name(agent_name: str) -> str:
+    """Build a default display name from an agent name."""
+    title = agent_name.title()
+    return f"{title} 🤖"
+
+
+def _build_clone_display_name(display_name: str, clone_index: int) -> str:
+    """Build a clone display name based on the source display name."""
+    base_name = _strip_clone_display_suffix(display_name)
+    return f"{base_name} (Clone {clone_index})"
+
+
+def _filter_available_tools(tool_names: List[str]) -> List[str]:
+    """Filter a tool list to only available tool names."""
+    from code_puppy.tools import get_available_tool_names
+
+    available_tools = set(get_available_tool_names())
+    return [tool for tool in tool_names if tool in available_tools]
+
+
+def _next_clone_index(
+    base_name: str, existing_names: set[str], agents_dir: Path
+) -> int:
+    """Compute the next clone index for a base name."""
+    clone_pattern = re.compile(rf"^{re.escape(base_name)}-clone-(\\d+)$")
+    indices = []
+    for name in existing_names:
+        match = clone_pattern.match(name)
+        if match:
+            indices.append(int(match.group(1)))
+
+    next_index = max(indices, default=0) + 1
+    while True:
+        clone_name = f"{base_name}-clone-{next_index}"
+        clone_path = agents_dir / f"{clone_name}.json"
+        if clone_name not in existing_names and not clone_path.exists():
+            return next_index
+        next_index += 1
+
+
+def clone_agent(agent_name: str) -> Optional[str]:
+    """Clone an agent definition into the user agents directory.
+
+    Args:
+        agent_name: Source agent name to clone.
+
+    Returns:
+        The cloned agent name, or None if cloning failed.
+    """
+    # Generate a message group ID for agent cloning
+    message_group_id = str(uuid.uuid4())
+    _discover_agents(message_group_id=message_group_id)
+
+    agent_ref = _AGENT_REGISTRY.get(agent_name)
+    if agent_ref is None:
+        emit_warning(f"Agent '{agent_name}' not found for cloning.")
+        return None
+
+    from ..config import get_agent_pinned_model, get_user_agents_directory
+
+    agents_dir = Path(get_user_agents_directory())
+    base_name = _strip_clone_suffix(agent_name)
+    existing_names = set(_AGENT_REGISTRY.keys())
+    clone_index = _next_clone_index(base_name, existing_names, agents_dir)
+    clone_name = f"{base_name}-clone-{clone_index}"
+    clone_path = agents_dir / f"{clone_name}.json"
+
+    try:
+        if isinstance(agent_ref, str):
+            with open(agent_ref, "r", encoding="utf-8") as f:
+                source_config = json.load(f)
+
+            source_display_name = source_config.get("display_name")
+            if not source_display_name:
+                source_display_name = _default_display_name(base_name)
+
+            clone_config = dict(source_config)
+            clone_config["name"] = clone_name
+            clone_config["display_name"] = _build_clone_display_name(
+                source_display_name, clone_index
+            )
+
+            tools = source_config.get("tools", [])
+            clone_config["tools"] = (
+                _filter_available_tools(tools) if isinstance(tools, list) else []
+            )
+
+            if not clone_config.get("model"):
+                clone_config.pop("model", None)
+        else:
+            agent_instance = agent_ref()
+            clone_config = {
+                "name": clone_name,
+                "display_name": _build_clone_display_name(
+                    agent_instance.display_name, clone_index
+                ),
+                "description": agent_instance.description,
+                "system_prompt": agent_instance.get_system_prompt(),
+                "tools": _filter_available_tools(agent_instance.get_available_tools()),
+            }
+
+            user_prompt = agent_instance.get_user_prompt()
+            if user_prompt is not None:
+                clone_config["user_prompt"] = user_prompt
+
+            tools_config = agent_instance.get_tools_config()
+            if tools_config is not None:
+                clone_config["tools_config"] = tools_config
+
+            pinned_model = get_agent_pinned_model(agent_instance.name)
+            if pinned_model:
+                clone_config["model"] = pinned_model
+    except Exception as exc:
+        emit_warning(f"Failed to build clone for '{agent_name}': {exc}")
+        return None
+
+    if clone_path.exists():
+        emit_warning(f"Clone target '{clone_name}' already exists.")
+        return None
+
+    try:
+        with open(clone_path, "w", encoding="utf-8") as f:
+            json.dump(clone_config, f, indent=2, ensure_ascii=False)
+        emit_success(f"Cloned '{agent_name}' to '{clone_name}'.")
+        return clone_name
+    except Exception as exc:
+        emit_warning(f"Failed to write clone file '{clone_path}': {exc}")
+        return None
+
+
+def delete_clone_agent(agent_name: str) -> bool:
+    """Delete a cloned JSON agent definition.
+
+    Args:
+        agent_name: Clone agent name to delete.
+
+    Returns:
+        True if the clone was deleted, False otherwise.
+    """
+    message_group_id = str(uuid.uuid4())
+    _discover_agents(message_group_id=message_group_id)
+
+    if not is_clone_agent_name(agent_name):
+        emit_warning(f"Agent '{agent_name}' is not a clone.")
+        return False
+
+    if get_current_agent_name() == agent_name:
+        emit_warning("Cannot delete the active agent. Switch agents first.")
+        return False
+
+    agent_ref = _AGENT_REGISTRY.get(agent_name)
+    if agent_ref is None:
+        emit_warning(f"Clone '{agent_name}' not found.")
+        return False
+
+    if not isinstance(agent_ref, str):
+        emit_warning(f"Clone '{agent_name}' is not a JSON agent.")
+        return False
+
+    clone_path = Path(agent_ref)
+    if not clone_path.exists():
+        emit_warning(f"Clone file for '{agent_name}' does not exist.")
+        return False
+
+    from ..config import get_user_agents_directory
+
+    agents_dir = Path(get_user_agents_directory()).resolve()
+    if clone_path.resolve().parent != agents_dir:
+        emit_warning(f"Refusing to delete non-user clone '{agent_name}'.")
+        return False
+
+    try:
+        clone_path.unlink()
+        emit_success(f"Deleted clone '{agent_name}'.")
+        _AGENT_REGISTRY.pop(agent_name, None)
+        _AGENT_HISTORIES.pop(agent_name, None)
+        return True
+    except Exception as exc:
+        emit_warning(f"Failed to delete clone '{agent_name}': {exc}")
+        return False

{code_puppy-0.0.370 → code_puppy-0.0.371}/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-0.0.370 → code_puppy-0.0.371}/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":