code-puppy 0.0.196__tar.gz → 0.0.198__tar.gz

{code_puppy-0.0.196 → code_puppy-0.0.198}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: code-puppy
-Version: 0.0.196
+Version: 0.0.198
 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.196 → code_puppy-0.0.198}/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.196 → code_puppy-0.0.198}/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.196 → code_puppy-0.0.198}/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.196 → code_puppy-0.0.198}/code_puppy/command_line/command_handler.py

@@ -5,131 +5,103 @@ 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
 
 
 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)"
-        )
-    )
-    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)
@@ -461,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
@@ -625,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.196 → code_puppy-0.0.198}/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.196 → code_puppy-0.0.198}/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.196 → code_puppy-0.0.198}/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,
 )
@@ -272,16 +273,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
 
@@ -417,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