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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.195
+Version: 0.0.197
 Summary: Code generation agent
 Project-URL: repository, https://github.com/mpfaffenberger/code_puppy
 Project-URL: HomePage, https://github.com/mpfaffenberger/code_puppy
@@ -25,7 +25,7 @@ Requires-Dist: logfire>=0.7.1
 Requires-Dist: openai>=1.99.1
 Requires-Dist: pathspec>=0.11.0
 Requires-Dist: playwright>=1.40.0
-Requires-Dist: prompt-toolkit>=3.0.38
+Requires-Dist: prompt-toolkit>=3.0.52
 Requires-Dist: pydantic-ai==1.0.6
 Requires-Dist: pydantic>=2.4.0
 Requires-Dist: pyjwt>=2.8.0
@@ -69,6 +69,17 @@ Code Puppy is an AI-powered code generation agent, designed to understand progra
 
 ## Features
 
+### Session Autosave & Contexts
+- Autosaves live in `~/.code_puppy/autosaves` and include a `.pkl` and `_meta.json` per session.
+- On startup, you’ll be prompted to optionally load a recent autosave (with message counts and timestamps).
+- Autosaves use a stable session ID per interactive run so subsequent prompts overwrite the same session (not N new files). Rotate via `/session new` when you want a fresh session.
+- Loading an autosave makes it the active autosave target (future autosaves overwrite that loaded session).
+- Loading a manual context with `/load_context <name>` automatically rotates the autosave ID to avoid overwriting anything.
+- Helpers:
+  - `/session id` shows the current autosave ID and file prefix
+  - `/session new` rotates the autosave ID
+
+
 - **Multi-language support**: Capable of generating code in various programming languages.
 - **Interactive CLI**: A command-line interface for interactive use.
 - **Detailed explanations**: Provides insights into generated code to understand its logic and structure.

{code_puppy-0.0.195 → code_puppy-0.0.197}/README.md

@@ -25,6 +25,17 @@ Code Puppy is an AI-powered code generation agent, designed to understand progra
 
 ## Features
 
+### Session Autosave & Contexts
+- Autosaves live in `~/.code_puppy/autosaves` and include a `.pkl` and `_meta.json` per session.
+- On startup, you’ll be prompted to optionally load a recent autosave (with message counts and timestamps).
+- Autosaves use a stable session ID per interactive run so subsequent prompts overwrite the same session (not N new files). Rotate via `/session new` when you want a fresh session.
+- Loading an autosave makes it the active autosave target (future autosaves overwrite that loaded session).
+- Loading a manual context with `/load_context <name>` automatically rotates the autosave ID to avoid overwriting anything.
+- Helpers:
+  - `/session id` shows the current autosave ID and file prefix
+  - `/session new` rotates the autosave ID
+
+
 - **Multi-language support**: Capable of generating code in various programming languages.
 - **Interactive CLI**: A command-line interface for interactive use.
 - **Detailed explanations**: Provides insights into generated code to understand its logic and structure.

{code_puppy-0.0.195 → code_puppy-0.0.197}/code_puppy/agents/base_agent.py

@@ -720,10 +720,7 @@ class BaseAgent(ABC):
             emit_system_message(
                 f"[green]Successfully loaded {len(servers)} MCP server(s)[/green]"
             )
-        else:
-            emit_system_message(
-                "[yellow]No MCP servers available (check if servers are enabled)[/yellow]"
-            )
+        # Stay silent when there are no servers configured/available
         return servers
 
     def reload_mcp_servers(self):
@@ -891,7 +888,8 @@ class BaseAgent(ABC):
             asyncio.CancelledError: When execution is cancelled by user
         """
         group_id = str(uuid.uuid4())
-        pydantic_agent = self.reload_code_generation_agent()
+        # Avoid double-loading: reuse existing agent if already built
+        pydantic_agent = self._code_generation_agent or self.reload_code_generation_agent()
 
         async def run_agent_task():
             try:

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

@@ -11,125 +11,93 @@ from code_puppy.tools.tools_content import tools_content
 
 
 def get_commands_help():
-    """Generate commands help using Rich Text objects to avoid markup conflicts."""
+    """Generate aligned commands help using Rich Text for safe markup."""
     from rich.text import Text
 
     # Ensure plugins are loaded so custom help can register
     _ensure_plugins_loaded()
 
-    # Build help text programmatically
-    help_lines = []
-
-    # Title
-    help_lines.append(Text("Commands Help", style="bold magenta"))
-
-    # Commands - build each line programmatically
-    help_lines.append(
-        Text("/help, /h", style="cyan") + Text("             Show this help message")
-    )
-    help_lines.append(
-        Text("/cd", style="cyan")
-        + Text(" <dir>             Change directory or show directories")
-    )
-    help_lines.append(
-        Text("/agent", style="cyan")
-        + Text(" <name>         Switch to a different agent or show available agents")
-    )
-    help_lines.append(
-        Text("/exit, /quit", style="cyan") + Text("          Exit interactive mode")
-    )
-    help_lines.append(
-        Text("/generate-pr-description", style="cyan")
-        + Text(" [@dir]  Generate comprehensive PR description")
-    )
-    help_lines.append(
-        Text("/model, /m", style="cyan") + Text(" <model>   Set active model")
-    )
-    help_lines.append(
-        Text("/reasoning", style="cyan")
-        + Text(" <low|medium|high>  Set OpenAI reasoning effort for GPT-5 models")
-    )
-    help_lines.append(
-        Text("/pin_model", style="cyan")
-        + Text(" <agent> <model>  Pin a specific model to an agent")
-    )
-    help_lines.append(
-        Text("/mcp", style="cyan")
-        + Text("                  Manage MCP servers (list, start, stop, status, etc.)")
-    )
-    help_lines.append(
-        Text("/motd", style="cyan")
-        + Text("                 Show the latest message of the day (MOTD)")
-    )
-    help_lines.append(
-        Text("/show", style="cyan")
-        + Text("                 Show puppy config key-values")
-    )
-    help_lines.append(
-        Text("/compact", style="cyan")
-        + Text(
-            "              Summarize and compact current chat history (uses compaction_strategy config)"
-        )
-    )
-    help_lines.append(
-        Text("/dump_context", style="cyan")
-        + Text(" <name>  Save current message history to file")
-    )
-    help_lines.append(
-        Text("/load_context", style="cyan")
-        + Text(" <name>  Load message history from file")
-    )
-    help_lines.append(
-        Text("/set", style="cyan")
-        + Text(
-            "                  Set puppy config key-values (e.g., /set yolo_mode true, /set auto_save_session true, /set max_saved_sessions 20)"
-        )
-    )
-    help_lines.append(
-        Text("/tools", style="cyan")
-        + Text("                Show available tools and capabilities")
-    )
-    help_lines.append(
-        Text("/truncate", style="cyan")
-        + Text(
-            " <N>              Truncate message history to N most recent messages (keeping system message)"
-        )
-    )
-    help_lines.append(
-        Text("/<unknown>", style="cyan")
-        + Text("            Show unknown command warning")
-    )
+    # Collect core commands with their syntax parts and descriptions
+    # (cmd_syntax, description)
+    core_cmds = [
+        ("/help, /h", "Show this help message"),
+        ("/cd <dir>", "Change directory or show directories"),
+        (
+            "/agent <name>",
+            "Switch to a different agent or show available agents",
+        ),
+        ("/exit, /quit", "Exit interactive mode"),
+        ("/generate-pr-description [@dir]", "Generate comprehensive PR description"),
+        ("/model, /m <model>", "Set active model"),
+        ("/reasoning <low|medium|high>", "Set OpenAI reasoning effort for GPT-5 models"),
+        ("/pin_model <agent> <model>", "Pin a specific model to an agent"),
+        ("/mcp", "Manage MCP servers (list, start, stop, status, etc.)"),
+        ("/motd", "Show the latest message of the day (MOTD)"),
+        ("/show", "Show puppy config key-values"),
+        (
+            "/compact",
+            "Summarize and compact current chat history (uses compaction_strategy config)",
+        ),
+        ("/dump_context <name>", "Save current message history to file"),
+        ("/load_context <name>", "Load message history from file"),
+        (
+            "/set",
+            "Set puppy config (e.g., /set yolo_mode true, /set auto_save_session true)",
+        ),
+        ("/tools", "Show available tools and capabilities"),
+        (
+            "/truncate <N>",
+            "Truncate history to N most recent messages (keeping system message)",
+        ),
+        ("/<unknown>", "Show unknown command warning"),
+    ]
+
+    # Determine padding width for the left column
+    left_width = max(len(cmd) for cmd, _ in core_cmds) + 2  # add spacing
+
+    lines: list[Text] = []
+    lines.append(Text("Commands Help", style="bold magenta"))
+
+    for cmd, desc in core_cmds:
+        left = Text(cmd.ljust(left_width), style="cyan")
+        right = Text(desc)
+        line = Text()
+        line.append_text(left)
+        line.append_text(right)
+        lines.append(line)
 
     # Add custom commands from plugins (if any)
     try:
         from code_puppy import callbacks
 
         custom_help_results = callbacks.on_custom_command_help()
-        # Flatten various returns into a list of (name, description)
-        custom_entries = []
+        custom_entries: list[tuple[str, str]] = []
         for res in custom_help_results:
             if not res:
                 continue
             if isinstance(res, tuple) and len(res) == 2:
-                custom_entries.append(res)
+                custom_entries.append((str(res[0]), str(res[1])))
             elif isinstance(res, list):
                 for item in res:
                     if isinstance(item, tuple) and len(item) == 2:
-                        custom_entries.append(item)
+                        custom_entries.append((str(item[0]), str(item[1])))
         if custom_entries:
-            help_lines.append(Text("\n", style="dim"))
-            help_lines.append(Text("Custom Commands", style="bold magenta"))
+            lines.append(Text("", style="dim"))
+            lines.append(Text("Custom Commands", style="bold magenta"))
+            # Compute padding for custom commands as well
+            custom_left_width = max(len(name) for name, _ in custom_entries) + 3
             for name, desc in custom_entries:
-                help_lines.append(
-                    Text(f"/{name}", style="cyan") + Text(f"  {desc}")
-                )
+                left = Text(f"/{name}".ljust(custom_left_width), style="cyan")
+                right = Text(desc)
+                line = Text()
+                line.append_text(left)
+                line.append_text(right)
+                lines.append(line)
     except Exception:
-        # If callbacks fail, skip custom help silently
         pass
 
-    # Combine all lines
     final_text = Text()
-    for i, line in enumerate(help_lines):
+    for i, line in enumerate(lines):
         if i > 0:
             final_text.append("\n")
         final_text.append_text(line)
@@ -336,6 +304,30 @@ def handle_command(command: str):
         )
         return True
 
+    if command.startswith("/session"):
+        # /session id -> show current autosave id
+        # /session new -> rotate autosave id
+        tokens = command.split()
+        from code_puppy.config import (
+            AUTOSAVE_DIR,
+            get_current_autosave_id,
+            get_current_autosave_session_name,
+            rotate_autosave_id,
+        )
+        if len(tokens) == 1 or tokens[1] == "id":
+            sid = get_current_autosave_id()
+            emit_info(
+                f"[bold magenta]Autosave Session[/bold magenta]: {sid}\n"
+                f"Files prefix: {Path(AUTOSAVE_DIR) / get_current_autosave_session_name()}"
+            )
+            return True
+        if tokens[1] == "new":
+            new_sid = rotate_autosave_id()
+            emit_success(f"New autosave session id: {new_sid}")
+            return True
+        emit_warning("Usage: /session [id|new]")
+        return True
+
     if command.startswith("/set"):
         # Syntax: /set KEY=VALUE or /set KEY VALUE
         from code_puppy.config import set_config_value
@@ -361,7 +353,6 @@ def handle_command(command: str):
             session_help = (
                 "\n[yellow]Session Management[/yellow]"
                 "\n  [cyan]auto_save_session[/cyan]    Auto-save chat after every response (true/false)"
-                "\n  [cyan]max_saved_sessions[/cyan]  Cap how many auto-saves to keep (0 = unlimited)"
             )
             emit_warning(
                 f"Usage: /set KEY=VALUE or /set KEY VALUE\nConfig keys: {', '.join(config_keys)}\n[dim]Note: compaction_strategy can be 'summarization' or 'truncation'[/dim]{session_help}"
@@ -712,9 +703,17 @@ def handle_command(command: str):
         agent.set_message_history(history)
         total_tokens = sum(agent.estimate_tokens_for_message(m) for m in history)
 
+        # Rotate autosave id to avoid overwriting any existing autosave
+        try:
+            from code_puppy.config import rotate_autosave_id
+            new_id = rotate_autosave_id()
+            autosave_info = f"\n[dim]Autosave session rotated to: {new_id}[/dim]"
+        except Exception:
+            autosave_info = ""
+
         emit_success(
             f"✅ Context loaded: {len(history)} messages ({total_tokens} tokens)\n"
-            f"📁 From: {session_path}"
+            f"📁 From: {session_path}{autosave_info}"
         )
         return True
 

{code_puppy-0.0.195 → code_puppy-0.0.197}/code_puppy/command_line/prompt_toolkit_completion.py

@@ -194,24 +194,48 @@ async def get_input_with_combined_completion(
             LoadContextCompleter(trigger="/load_context"),
         ]
     )
-    # Add custom key bindings for multiline input
+    # Add custom key bindings and multiline toggle
     bindings = KeyBindings()
 
-    @bindings.add(Keys.Escape, "m")  # Alt+M (legacy support)
+    # Multiline mode state
+    multiline = {"enabled": False}
+
+    # Toggle multiline with Alt+M
+    @bindings.add(Keys.Escape, "m")
     def _(event):
-        event.app.current_buffer.insert_text("\n")
+        multiline["enabled"] = not multiline["enabled"]
+        status = "ON" if multiline["enabled"] else "OFF"
+        # Print status for user feedback (version-agnostic)
+        print(f"[multiline] {status}", flush=True)
+
+    # Also toggle multiline with F2 (more reliable across platforms)
+    @bindings.add("f2")
+    def _(event):
+        multiline["enabled"] = not multiline["enabled"]
+        status = "ON" if multiline["enabled"] else "OFF"
+        print(f"[multiline] {status}", flush=True)
 
-    # Create a special binding for shift+enter
-    @bindings.add("escape", "enter")
+    # Newline insert bindings — robust and explicit
+    # Ctrl+J (line feed) works in virtually all terminals; mark eager so it wins
+    @bindings.add("c-j", eager=True)
     def _(event):
-        """Pressing alt+enter (meta+enter) inserts a newline."""
         event.app.current_buffer.insert_text("\n")
 
-    # Override the default enter behavior to check for shift
-    @bindings.add("enter", filter=~is_searching)
+    # Also allow Ctrl+Enter for newline (terminal-dependent)
+    try:
+        @bindings.add("c-enter", eager=True)
+        def _(event):
+            event.app.current_buffer.insert_text("\n")
+    except Exception:
+        pass
+
+    # Enter behavior depends on multiline mode
+    @bindings.add("enter", filter=~is_searching, eager=True)
     def _(event):
-        """Accept input only when we're not in an interactive search buffer."""
-        event.current_buffer.validate_and_handle()
+        if multiline["enabled"]:
+            event.app.current_buffer.insert_text("\n")
+        else:
+            event.current_buffer.validate_and_handle()
 
     @bindings.add(Keys.Escape)
     def _(event):

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

@@ -3,8 +3,9 @@ import datetime
 import json
 import os
 import pathlib
+from typing import Optional
 
-from code_puppy.session_storage import cleanup_sessions, save_session
+from code_puppy.session_storage import save_session
 
 CONFIG_DIR = os.path.join(os.path.expanduser("~"), ".code_puppy")
 CONFIG_FILE = os.path.join(CONFIG_DIR, "puppy.cfg")
@@ -19,6 +20,9 @@ AUTOSAVE_DIR = os.path.join(CONFIG_DIR, "autosaves")
 DEFAULT_SECTION = "puppy"
 REQUIRED_KEYS = ["puppy_name", "owner_name"]
 
+# Runtime-only autosave session ID (per-process)
+_CURRENT_AUTOSAVE_ID: Optional[str] = None
+
 # Cache containers for model validation and defaults
 _model_validation_cache = {}
 _default_model_cache = None
@@ -702,22 +706,40 @@ def set_max_saved_sessions(max_sessions: int):
     set_config_value("max_saved_sessions", str(max_sessions))
 
 
-def _cleanup_old_sessions():
-    """Remove oldest auto-saved sessions if we exceed the max_saved_sessions limit."""
-    max_sessions = get_max_saved_sessions()
-    if max_sessions <= 0:
-        return
+def get_current_autosave_id() -> str:
+    """Get or create the current autosave session ID for this process."""
+    global _CURRENT_AUTOSAVE_ID
+    if not _CURRENT_AUTOSAVE_ID:
+        # Use a full timestamp so tests and UX can predict the name if needed
+        _CURRENT_AUTOSAVE_ID = datetime.datetime.now().strftime('%Y%m%d_%H%M%S')
+    return _CURRENT_AUTOSAVE_ID
 
-    autosave_dir = pathlib.Path(AUTOSAVE_DIR)
-    removed_sessions = cleanup_sessions(autosave_dir, max_sessions)
-    if not removed_sessions:
-        return
 
-    from rich.console import Console
+def rotate_autosave_id() -> str:
+    """Force a new autosave session ID and return it."""
+    global _CURRENT_AUTOSAVE_ID
+    _CURRENT_AUTOSAVE_ID = datetime.datetime.now().strftime('%Y%m%d_%H%M%S')
+    return _CURRENT_AUTOSAVE_ID
+
 
-    console = Console()
-    for session_name in removed_sessions:
-        console.print(f"[dim]🗑️  Removed old session: {session_name}.pkl[/dim]")
+def get_current_autosave_session_name() -> str:
+    """Return the full session name used for autosaves (no file extension)."""
+    return f"auto_session_{get_current_autosave_id()}"
+
+
+def set_current_autosave_from_session_name(session_name: str) -> str:
+    """Set the current autosave ID based on a full session name.
+
+    Accepts names like 'auto_session_YYYYMMDD_HHMMSS' and extracts the ID part.
+    Returns the ID that was set.
+    """
+    global _CURRENT_AUTOSAVE_ID
+    prefix = "auto_session_"
+    if session_name.startswith(prefix):
+        _CURRENT_AUTOSAVE_ID = session_name[len(prefix):]
+    else:
+        _CURRENT_AUTOSAVE_ID = session_name
+    return _CURRENT_AUTOSAVE_ID
 
 
 def auto_save_session_if_enabled() -> bool:
@@ -739,7 +761,7 @@ def auto_save_session_if_enabled() -> bool:
             return False
 
         now = datetime.datetime.now()
-        session_name = f"auto_session_{now.strftime('%Y%m%d_%H%M%S')}"
+        session_name = get_current_autosave_session_name()
         autosave_dir = pathlib.Path(AUTOSAVE_DIR)
 
         metadata = save_session(
@@ -755,7 +777,6 @@ def auto_save_session_if_enabled() -> bool:
             f"🐾 [dim]Auto-saved session: {metadata.message_count} messages ({metadata.total_tokens} tokens)[/dim]"
         )
 
-        _cleanup_old_sessions()
         return True
 
     except Exception as exc:  # pragma: no cover - defensive logging

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

@@ -272,16 +272,13 @@ async def interactive_mode(message_renderer, initial_command: str = None) -> Non
     emit_info("[bold green]Code Puppy[/bold green] - Interactive Mode")
     emit_system_message("Type '/exit' or '/quit' to exit the interactive mode.")
     emit_system_message("Type 'clear' to reset the conversation history.")
+    emit_system_message("[dim]Type /help to view all commands[/dim]")
     emit_system_message(
-        "Type [bold blue]@[/bold blue] for path completion, or [bold blue]/m[/bold blue] to pick a model. Use [bold blue]Esc+Enter[/bold blue] for multi-line input."
+        "Type [bold blue]@[/bold blue] for path completion, or [bold blue]/m[/bold blue] to pick a model. Toggle multiline with [bold blue]Alt+M[/bold blue] or [bold blue]F2[/bold blue]; newline: [bold blue]Ctrl+J[/bold blue]."
     )
     emit_system_message(
         "Press [bold red]Ctrl+C[/bold red] during processing to cancel the current task or inference."
     )
-    from code_puppy.command_line.command_handler import get_commands_help
-
-    help_text = get_commands_help()
-    emit_system_message(help_text)
     try:
         from code_puppy.command_line.motd import print_motd
 

{code_puppy-0.0.195 → code_puppy-0.0.197}/code_puppy/session_storage.py

@@ -96,6 +96,12 @@ def load_session(session_name: str, base_dir: Path) -> SessionHistory:
         return pickle.load(pickle_file)
 
 
+def list_sessions(base_dir: Path) -> List[str]:
+    if not base_dir.exists():
+        return []
+    return sorted(path.stem for path in base_dir.glob("*.pkl"))
+
+
 def cleanup_sessions(base_dir: Path, max_sessions: int) -> List[str]:
     if max_sessions <= 0:
         return []
@@ -126,12 +132,6 @@ def cleanup_sessions(base_dir: Path, max_sessions: int) -> List[str]:
     return removed_sessions
 
 
-def list_sessions(base_dir: Path) -> List[str]:
-    if not base_dir.exists():
-        return []
-    return sorted(path.stem for path in base_dir.glob("*.pkl"))
-
-
 async def restore_autosave_interactively(base_dir: Path) -> None:
     """Prompt the user to load an autosave session from base_dir, if any exist.
 
@@ -232,6 +232,15 @@ async def restore_autosave_interactively(base_dir: Path) -> None:
 
     agent = get_current_agent()
     agent.set_message_history(history)
+
+    # Set current autosave session id so subsequent autosaves overwrite this session
+    try:
+        from code_puppy.config import set_current_autosave_from_session_name
+
+        set_current_autosave_from_session_name(chosen_name)
+    except Exception:
+        pass
+
     total_tokens = sum(agent.estimate_tokens_for_message(msg) for msg in history)
 
     session_path = base_dir / f"{chosen_name}.pkl"