code-puppy 0.0.135__py3-none-any.whl → 0.0.136__py3-none-any.whl

code_puppy/agent.py

@@ -3,15 +3,10 @@ from pathlib import Path
 from typing import Dict, Optional
 
 from pydantic_ai import Agent
-from pydantic_ai.mcp import MCPServerSSE, MCPServerStdio, MCPServerStreamableHTTP
 from pydantic_ai.settings import ModelSettings
 from pydantic_ai.usage import UsageLimits
 
 from code_puppy.agents import get_current_agent_config
-from code_puppy.http_utils import (
-    create_reopenable_async_client,
-    resolve_env_var_in_header,
-)
 from code_puppy.message_history_processor import (
     get_model_context_length,
     message_history_accumulator,
@@ -45,7 +40,7 @@ _code_generation_agent = None
 def _load_mcp_servers(extra_headers: Optional[Dict[str, str]] = None):
     """Load MCP servers using the new manager while maintaining backward compatibility."""
     from code_puppy.config import get_value, load_mcp_server_configs
-    from code_puppy.mcp import get_mcp_manager, ServerConfig
+    from code_puppy.mcp import ServerConfig, get_mcp_manager
 
     # Check if MCP servers are disabled
     mcp_disabled = get_value("disable_mcp_servers")
@@ -55,7 +50,7 @@ def _load_mcp_servers(extra_headers: Optional[Dict[str, str]] = None):
 
     # Get the MCP manager singleton
     manager = get_mcp_manager()
-    
+
     # Load configurations from legacy file for backward compatibility
     configs = load_mcp_server_configs()
     if not configs:
@@ -74,9 +69,9 @@ def _load_mcp_servers(extra_headers: Optional[Dict[str, str]] = None):
                     name=name,
                     type=conf.get("type", "sse"),
                     enabled=conf.get("enabled", True),
-                    config=conf
+                    config=conf,
                 )
-                
+
                 # Check if server already registered
                 existing = manager.get_server_by_name(name)
                 if not existing:
@@ -88,14 +83,14 @@ def _load_mcp_servers(extra_headers: Optional[Dict[str, str]] = None):
                     if existing.config != server_config.config:
                         manager.update_server(existing.id, server_config)
                         emit_system_message(f"[dim]Updated MCP server: {name}[/dim]")
-                        
+
             except Exception as e:
                 emit_error(f"Failed to register MCP server '{name}': {str(e)}")
                 continue
-    
+
     # Get pydantic-ai compatible servers from manager
     servers = manager.get_servers_for_agent()
-    
+
     if servers:
         emit_system_message(
             f"[green]Successfully loaded {len(servers)} MCP server(s)[/green]"
@@ -104,14 +99,14 @@ def _load_mcp_servers(extra_headers: Optional[Dict[str, str]] = None):
         emit_system_message(
             "[yellow]No MCP servers available (check if servers are enabled)[/yellow]"
         )
-    
+
     return servers
 
 
 def reload_mcp_servers():
     """Reload MCP servers without restarting the agent."""
     from code_puppy.mcp import get_mcp_manager
-    
+
     manager = get_mcp_manager()
     # Reload configurations
     _load_mcp_servers()
@@ -124,15 +119,18 @@ def reload_code_generation_agent(message_group: str | None):
     if message_group is None:
         message_group = str(uuid.uuid4())
     global _code_generation_agent, _LAST_MODEL_NAME
-    from code_puppy.config import clear_model_cache, get_model_name
     from code_puppy.agents import clear_agent_cache
+    from code_puppy.config import clear_model_cache, get_model_name
 
     # Clear both ModelFactory cache and config cache when force reloading
     clear_model_cache()
     clear_agent_cache()
 
     model_name = get_model_name()
-    emit_info(f"[bold cyan]Loading Model: {model_name}[/bold cyan]", message_group=message_group)
+    emit_info(
+        f"[bold cyan]Loading Model: {model_name}[/bold cyan]",
+        message_group=message_group,
+    )
     models_config = ModelFactory.load_config()
     model = ModelFactory.get_model(model_name, models_config)
 
@@ -140,7 +138,7 @@ def reload_code_generation_agent(message_group: str | None):
     agent_config = get_current_agent_config()
     emit_info(
         f"[bold magenta]Loading Agent: {agent_config.display_name}[/bold magenta]",
-        message_group=message_group
+        message_group=message_group,
     )
 
     instructions = agent_config.get_system_prompt()

code_puppy/agents/agent_manager.py

@@ -1,20 +1,185 @@
 """Agent manager for handling different agent configurations."""
 
 import importlib
+import json
+import os
 import pkgutil
 import uuid
+from pathlib import Path
 from typing import Dict, Optional, Type, Union
 
-from code_puppy.config import get_value, set_config_value
-from .base_agent import BaseAgent
-from .json_agent import JSONAgent, discover_json_agents
 from ..callbacks import on_agent_reload
 from ..messaging import emit_warning
+from .base_agent import BaseAgent
+from .json_agent import JSONAgent, discover_json_agents
 
 # Registry of available agents (Python classes and JSON file paths)
 _AGENT_REGISTRY: Dict[str, Union[Type[BaseAgent], str]] = {}
 _CURRENT_AGENT_CONFIG: Optional[BaseAgent] = None
 
+# Terminal session-based agent selection
+_SESSION_AGENTS_CACHE: dict[str, str] = {}
+_SESSION_FILE_LOADED: bool = False
+
+
+# Session persistence file path
+def _get_session_file_path() -> Path:
+    """Get the path to the terminal sessions file."""
+    from ..config import CONFIG_DIR
+
+    return Path(CONFIG_DIR) / "terminal_sessions.json"
+
+
+def get_terminal_session_id() -> str:
+    """Get a unique identifier for the current terminal session.
+
+    Uses parent process ID (PPID) as the session identifier.
+    This works across all platforms and provides session isolation.
+
+    Returns:
+        str: Unique session identifier (e.g., "session_12345")
+    """
+    try:
+        ppid = os.getppid()
+        return f"session_{ppid}"
+    except (OSError, AttributeError):
+        # Fallback to current process ID if PPID unavailable
+        return f"fallback_{os.getpid()}"
+
+
+def _is_process_alive(pid: int) -> bool:
+    """Check if a process with the given PID is still alive.
+
+    Args:
+        pid: Process ID to check
+
+    Returns:
+        bool: True if process exists, False otherwise
+    """
+    try:
+        # On Unix: os.kill(pid, 0) raises OSError if process doesn't exist
+        # On Windows: This also works with signal 0
+        os.kill(pid, 0)
+        return True
+    except (OSError, ProcessLookupError):
+        return False
+
+
+def _cleanup_dead_sessions(sessions: dict[str, str]) -> dict[str, str]:
+    """Remove sessions for processes that no longer exist.
+
+    Args:
+        sessions: Dictionary of session_id -> agent_name
+
+    Returns:
+        dict: Cleaned sessions dictionary
+    """
+    cleaned = {}
+    for session_id, agent_name in sessions.items():
+        if session_id.startswith("session_"):
+            try:
+                pid_str = session_id.replace("session_", "")
+                pid = int(pid_str)
+                if _is_process_alive(pid):
+                    cleaned[session_id] = agent_name
+                # else: skip dead session
+            except (ValueError, TypeError):
+                # Invalid session ID format, keep it anyway
+                cleaned[session_id] = agent_name
+        else:
+            # Non-standard session ID (like "fallback_"), keep it
+            cleaned[session_id] = agent_name
+    return cleaned
+
+
+def _load_session_data() -> dict[str, str]:
+    """Load terminal session data from the JSON file.
+
+    Returns:
+        dict: Session ID to agent name mapping
+    """
+    session_file = _get_session_file_path()
+    try:
+        if session_file.exists():
+            with open(session_file, "r", encoding="utf-8") as f:
+                data = json.load(f)
+                # Clean up dead sessions while loading
+                return _cleanup_dead_sessions(data)
+        return {}
+    except (json.JSONDecodeError, IOError, OSError):
+        # File corrupted or permission issues, start fresh
+        return {}
+
+
+def _save_session_data(sessions: dict[str, str]) -> None:
+    """Save terminal session data to the JSON file.
+
+    Args:
+        sessions: Session ID to agent name mapping
+    """
+    session_file = _get_session_file_path()
+    try:
+        # Ensure the config directory exists
+        session_file.parent.mkdir(parents=True, exist_ok=True)
+
+        # Clean up dead sessions before saving
+        cleaned_sessions = _cleanup_dead_sessions(sessions)
+
+        # Write to file atomically (write to temp file, then rename)
+        temp_file = session_file.with_suffix(".tmp")
+        with open(temp_file, "w", encoding="utf-8") as f:
+            json.dump(cleaned_sessions, f, indent=2)
+
+        # Atomic rename (works on all platforms)
+        temp_file.replace(session_file)
+
+    except (IOError, OSError):
+        # File permission issues, etc. - just continue without persistence
+        pass
+
+
+def _ensure_session_cache_loaded() -> None:
+    """Ensure the session cache is loaded from disk."""
+    global _SESSION_AGENTS_CACHE, _SESSION_FILE_LOADED
+    if not _SESSION_FILE_LOADED:
+        _SESSION_AGENTS_CACHE.update(_load_session_data())
+        _SESSION_FILE_LOADED = True
+
+
+# Persistent storage for agent message histories
+_AGENT_HISTORIES: Dict[str, Dict[str, any]] = {}
+# Structure: {agent_name: {"message_history": [...], "compacted_hashes": set(...)}}
+
+
+def _save_agent_history(agent_name: str, agent: BaseAgent) -> None:
+    """Save an agent's message history to persistent storage.
+
+    Args:
+        agent_name: The name of the agent
+        agent: The agent instance to save history from
+    """
+    global _AGENT_HISTORIES
+    _AGENT_HISTORIES[agent_name] = {
+        "message_history": agent.get_message_history().copy(),
+        "compacted_hashes": agent.get_compacted_message_hashes().copy(),
+    }
+
+
+def _restore_agent_history(agent_name: str, agent: BaseAgent) -> None:
+    """Restore an agent's message history from persistent storage.
+
+    Args:
+        agent_name: The name of the agent
+        agent: The agent instance to restore history to
+    """
+    global _AGENT_HISTORIES
+    if agent_name in _AGENT_HISTORIES:
+        stored_data = _AGENT_HISTORIES[agent_name]
+        agent.set_message_history(stored_data["message_history"])
+        # Restore compacted hashes
+        for hash_val in stored_data["compacted_hashes"]:
+            agent.add_compacted_message_hash(hash_val)
+
 
 def _discover_agents(message_group_id: Optional[str] = None):
     """Dynamically discover all agent classes and JSON agents."""
@@ -97,12 +262,14 @@ def get_available_agents() -> Dict[str, str]:
 
 
 def get_current_agent_name() -> str:
-    """Get the name of the currently active agent.
+    """Get the name of the currently active agent for this terminal session.
 
     Returns:
-        The name of the current agent, defaults to 'code-puppy'.
+        The name of the current agent for this session, defaults to 'code-puppy'.
     """
-    return get_value("current_agent") or "code-puppy"
+    _ensure_session_cache_loaded()
+    session_id = get_terminal_session_id()
+    return _SESSION_AGENTS_CACHE.get(session_id, "code-puppy")
 
 
 def set_current_agent(agent_name: str) -> bool:
@@ -117,12 +284,26 @@ def set_current_agent(agent_name: str) -> bool:
     # Generate a message group ID for agent switching
     message_group_id = str(uuid.uuid4())
     _discover_agents(message_group_id=message_group_id)
+
+    # Save current agent's history before switching
+    global _CURRENT_AGENT_CONFIG, _CURRENT_AGENT_NAME
+    if _CURRENT_AGENT_CONFIG is not None:
+        _save_agent_history(_CURRENT_AGENT_CONFIG.name, _CURRENT_AGENT_CONFIG)
+
     # Clear the cached config when switching agents
-    global _CURRENT_AGENT_CONFIG
     _CURRENT_AGENT_CONFIG = None
     agent_obj = load_agent_config(agent_name)
+
+    # Restore the agent's history if it exists
+    _restore_agent_history(agent_name, agent_obj)
+
+    # Update session-based agent selection and persist to disk
+    _ensure_session_cache_loaded()
+    session_id = get_terminal_session_id()
+    _SESSION_AGENTS_CACHE[session_id] = agent_name
+    _save_session_data(_SESSION_AGENTS_CACHE)
+
     on_agent_reload(agent_obj.id, agent_name)
-    set_config_value("current_agent", agent_name)
     return True
 
 
@@ -134,7 +315,11 @@ def get_current_agent_config() -> BaseAgent:
     """
     global _CURRENT_AGENT_CONFIG
 
-    _CURRENT_AGENT_CONFIG = load_agent_config(get_current_agent_name())
+    if _CURRENT_AGENT_CONFIG is None:
+        agent_name = get_current_agent_name()
+        _CURRENT_AGENT_CONFIG = load_agent_config(agent_name)
+        # Restore the agent's history if it exists
+        _restore_agent_history(agent_name, _CURRENT_AGENT_CONFIG)
 
     return _CURRENT_AGENT_CONFIG
 
@@ -201,6 +386,20 @@ def clear_agent_cache():
     _CURRENT_AGENT_CONFIG = None
 
 
+def reset_to_default_agent():
+    """Reset the current agent to the default (code-puppy) for this terminal session.
+
+    This is useful for testing or when you want to start fresh.
+    """
+    global _CURRENT_AGENT_CONFIG
+    _ensure_session_cache_loaded()
+    session_id = get_terminal_session_id()
+    if session_id in _SESSION_AGENTS_CACHE:
+        del _SESSION_AGENTS_CACHE[session_id]
+        _save_session_data(_SESSION_AGENTS_CACHE)
+    _CURRENT_AGENT_CONFIG = None
+
+
 def refresh_agents():
     """Refresh the agent discovery to pick up newly created agents.
 
@@ -209,3 +408,115 @@ 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)
+
+
+def clear_all_agent_histories():
+    """Clear all agent message histories from persistent storage.
+
+    This is useful for debugging or when you want a fresh start.
+    """
+    global _AGENT_HISTORIES
+    _AGENT_HISTORIES.clear()
+    # Also clear the current agent's history
+    if _CURRENT_AGENT_CONFIG is not None:
+        _CURRENT_AGENT_CONFIG.messages = []
+
+
+def cleanup_dead_terminal_sessions() -> int:
+    """Clean up terminal sessions for processes that no longer exist.
+
+    Returns:
+        int: Number of dead sessions removed
+    """
+    _ensure_session_cache_loaded()
+    original_count = len(_SESSION_AGENTS_CACHE)
+    cleaned_cache = _cleanup_dead_sessions(_SESSION_AGENTS_CACHE)
+
+    if len(cleaned_cache) != original_count:
+        _SESSION_AGENTS_CACHE.clear()
+        _SESSION_AGENTS_CACHE.update(cleaned_cache)
+        _save_session_data(_SESSION_AGENTS_CACHE)
+
+    return original_count - len(cleaned_cache)
+
+
+# Agent-aware message history functions
+def get_current_agent_message_history():
+    """Get the message history for the currently active agent.
+
+    Returns:
+        List of messages from the current agent's conversation history.
+    """
+    current_agent = get_current_agent_config()
+    return current_agent.get_message_history()
+
+
+def set_current_agent_message_history(history):
+    """Set the message history for the currently active agent.
+
+    Args:
+        history: List of messages to set as the current agent's conversation history.
+    """
+    current_agent = get_current_agent_config()
+    current_agent.set_message_history(history)
+    # Also update persistent storage
+    _save_agent_history(current_agent.name, current_agent)
+
+
+def clear_current_agent_message_history():
+    """Clear the message history for the currently active agent."""
+    current_agent = get_current_agent_config()
+    current_agent.clear_message_history()
+    # Also clear from persistent storage
+    global _AGENT_HISTORIES
+    if current_agent.name in _AGENT_HISTORIES:
+        _AGENT_HISTORIES[current_agent.name] = {
+            "message_history": [],
+            "compacted_hashes": set(),
+        }
+
+
+def append_to_current_agent_message_history(message):
+    """Append a message to the currently active agent's history.
+
+    Args:
+        message: Message to append to the current agent's conversation history.
+    """
+    current_agent = get_current_agent_config()
+    current_agent.append_to_message_history(message)
+    # Also update persistent storage
+    _save_agent_history(current_agent.name, current_agent)
+
+
+def extend_current_agent_message_history(history):
+    """Extend the currently active agent's message history with multiple messages.
+
+    Args:
+        history: List of messages to append to the current agent's conversation history.
+    """
+    current_agent = get_current_agent_config()
+    current_agent.extend_message_history(history)
+    # Also update persistent storage
+    _save_agent_history(current_agent.name, current_agent)
+
+
+def get_current_agent_compacted_message_hashes():
+    """Get the set of compacted message hashes for the currently active agent.
+
+    Returns:
+        Set of hashes for messages that have been compacted/summarized.
+    """
+    current_agent = get_current_agent_config()
+    return current_agent.get_compacted_message_hashes()
+
+
+def add_current_agent_compacted_message_hash(message_hash: str):
+    """Add a message hash to the current agent's set of compacted message hashes.
+
+    Args:
+        message_hash: Hash of a message that has been compacted/summarized.
+    """
+    current_agent = get_current_agent_config()
+    current_agent.add_compacted_message_hash(message_hash)
+    # Also update persistent storage
+    _save_agent_history(current_agent.name, current_agent)

code_puppy/agents/base_agent.py

@@ -1,8 +1,8 @@
 """Base agent configuration class for defining agent properties."""
 
-from abc import ABC, abstractmethod
-from typing import Any, Dict, List, Optional
 import uuid
+from abc import ABC, abstractmethod
+from typing import Any, Dict, List, Optional, Set
 
 
 class BaseAgent(ABC):
@@ -10,6 +10,8 @@ class BaseAgent(ABC):
 
     def __init__(self):
         self.id = str(uuid.uuid4())
+        self._message_history: List[Any] = []
+        self._compacted_message_hashes: Set[str] = set()
 
     @property
     @abstractmethod
@@ -58,3 +60,57 @@ class BaseAgent(ABC):
             Custom prompt string, or None to use default.
         """
         return None
+
+    # Message history management methods
+    def get_message_history(self) -> List[Any]:
+        """Get the message history for this agent.
+
+        Returns:
+            List of messages in this agent's conversation history.
+        """
+        return self._message_history
+
+    def set_message_history(self, history: List[Any]) -> None:
+        """Set the message history for this agent.
+
+        Args:
+            history: List of messages to set as the conversation history.
+        """
+        self._message_history = history
+
+    def clear_message_history(self) -> None:
+        """Clear the message history for this agent."""
+        self._message_history = []
+        self._compacted_message_hashes.clear()
+
+    def append_to_message_history(self, message: Any) -> None:
+        """Append a message to this agent's history.
+
+        Args:
+            message: Message to append to the conversation history.
+        """
+        self._message_history.append(message)
+
+    def extend_message_history(self, history: List[Any]) -> None:
+        """Extend this agent's message history with multiple messages.
+
+        Args:
+            history: List of messages to append to the conversation history.
+        """
+        self._message_history.extend(history)
+
+    def get_compacted_message_hashes(self) -> Set[str]:
+        """Get the set of compacted message hashes for this agent.
+
+        Returns:
+            Set of hashes for messages that have been compacted/summarized.
+        """
+        return self._compacted_message_hashes
+
+    def add_compacted_message_hash(self, message_hash: str) -> None:
+        """Add a message hash to the set of compacted message hashes.
+
+        Args:
+            message_hash: Hash of a message that has been compacted/summarized.
+        """
+        self._compacted_message_hashes.add(message_hash)