code-puppy 0.0.196__py3-none-any.whl → 0.0.198__py3-none-any.whl

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/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/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/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/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/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

code_puppy/tui/app.py

@@ -176,6 +176,13 @@ class CodePuppyTUI(App):
         # Start the message renderer EARLY to catch startup messages
         # Using call_after_refresh to start it as soon as possible after mount
         self.call_after_refresh(self.start_message_renderer_sync)
+        
+        # Kick off a non-blocking preload of the agent/model so the
+        # status bar shows loading before first prompt
+        self.call_after_refresh(self.preload_agent_on_startup)
+        
+        # After preload, offer to restore an autosave session (like interactive mode)
+        self.call_after_refresh(self.maybe_prompt_restore_autosave)
 
         # Apply responsive design adjustments
         self.apply_responsive_layout()
@@ -187,16 +194,40 @@ class CodePuppyTUI(App):
         if self.initial_command:
             self.call_after_refresh(self.process_initial_command)
 
+    def _tighten_text(self, text: str) -> str:
+        """Aggressively tighten whitespace: trim lines, collapse multiples, drop extra blanks."""
+        try:
+            import re
+
+            # Split into lines, strip each, drop empty runs
+            lines = [re.sub(r"\s+", " ", ln.strip()) for ln in text.splitlines()]
+            # Remove consecutive blank lines
+            tight_lines = []
+            last_blank = False
+            for ln in lines:
+                is_blank = (ln == "")
+                if is_blank and last_blank:
+                    continue
+                tight_lines.append(ln)
+                last_blank = is_blank
+            return "\n".join(tight_lines).strip()
+        except Exception:
+            return text.strip()
+
     def add_system_message(
         self, content: str, message_group: str = None, group_id: str = None
     ) -> None:
         """Add a system message to the chat."""
         # Support both parameter names for backward compatibility
         final_group_id = message_group or group_id
+        # Tighten only plain strings
+        content_to_use = (
+            self._tighten_text(content) if isinstance(content, str) else content
+        )
         message = ChatMessage(
             id=f"sys_{datetime.now(timezone.utc).timestamp()}",
             type=MessageType.SYSTEM,
-            content=content,
+            content=content_to_use,
             timestamp=datetime.now(timezone.utc),
             group_id=final_group_id,
         )
@@ -245,10 +276,13 @@ class CodePuppyTUI(App):
 
     def add_error_message(self, content: str, message_group: str = None) -> None:
         """Add an error message to the chat."""
+        content_to_use = (
+            self._tighten_text(content) if isinstance(content, str) else content
+        )
         message = ChatMessage(
             id=f"error_{datetime.now(timezone.utc).timestamp()}",
             type=MessageType.ERROR,
-            content=content,
+            content=content_to_use,
             timestamp=datetime.now(timezone.utc),
             group_id=message_group,
         )
@@ -303,9 +337,9 @@ class CodePuppyTUI(App):
 
         # Only handle keys when input field is focused
         if input_field.has_focus:
-            # Handle Ctrl+Enter for new lines (more reliable than Shift+Enter)
-            if event.key == "ctrl+enter":
-                input_field.insert("\\n")
+            # Handle Ctrl+Enter or Shift+Enter for a new line
+            if event.key in ("ctrl+enter", "shift+enter"):
+                input_field.insert("\n")
                 event.prevent_default()
                 return
 
@@ -484,6 +518,14 @@ class CodePuppyTUI(App):
                     self.update_agent_progress("Processing", 75)
                     agent_response = result.output
                     self.add_agent_message(agent_response)
+
+                    # Auto-save session if enabled (mirror --interactive)
+                    try:
+                        from code_puppy.config import auto_save_session_if_enabled
+                        auto_save_session_if_enabled()
+                    except Exception:
+                        pass
+
                     # Refresh history display to show new interaction
                     self.refresh_history_display()
 
@@ -842,6 +884,36 @@ class CodePuppyTUI(App):
         """Synchronous wrapper to start message renderer via run_worker."""
         self.run_worker(self.start_message_renderer(), exclusive=False)
 
+    async def preload_agent_on_startup(self) -> None:
+        """Preload the agent/model at startup so loading status is visible."""
+        try:
+            # Show loading in status bar and spinner
+            self.start_agent_progress("Loading")
+
+            # Warm up agent/model without blocking UI
+            import asyncio
+
+            from code_puppy.agents.agent_manager import get_current_agent
+
+            agent = get_current_agent()
+
+            # Run the synchronous reload in a worker thread
+            await asyncio.to_thread(agent.reload_code_generation_agent)
+
+            # After load, refresh current model (in case of fallback or changes)
+            from code_puppy.config import get_global_model_name
+
+            self.current_model = get_global_model_name()
+
+            # Let the user know model/agent are ready
+            self.add_system_message("Model and agent preloaded. Ready to roll 🛼")
+        except Exception as e:
+            # Surface any preload issues but keep app usable
+            self.add_error_message(f"Startup preload failed: {e}")
+        finally:
+            # Always stop spinner and set ready state
+            self.stop_agent_progress()
+
     async def start_message_renderer(self):
         """Start the message renderer to consume messages from the queue."""
         if not self._renderer_started:
@@ -884,9 +956,9 @@ class CodePuppyTUI(App):
                             f"Error processing startup message: {e}"
                         )
 
-                # Create a single grouped startup message
+                # Create a single grouped startup message (tightened)
                 grouped_content = "\n".join(startup_content_lines)
-                self.add_system_message(grouped_content)
+                self.add_system_message(self._tighten_text(grouped_content))
 
                 # Clear the startup buffer after processing
                 self.message_queue.clear_startup_buffer()
@@ -894,6 +966,80 @@ class CodePuppyTUI(App):
             # Now start the regular message renderer
             await self.message_renderer.start()
 
+    async def maybe_prompt_restore_autosave(self) -> None:
+        """Offer to restore an autosave session at startup (TUI version)."""
+        try:
+            import asyncio
+            from pathlib import Path
+
+            from code_puppy.config import AUTOSAVE_DIR, set_current_autosave_from_session_name
+            from code_puppy.session_storage import list_sessions, load_session
+
+            base_dir = Path(AUTOSAVE_DIR)
+            sessions = list_sessions(base_dir)
+            if not sessions:
+                return
+
+            # Show modal picker for selection
+            from .screens.autosave_picker import AutosavePicker
+
+            async def handle_result(result_name: str | None):
+                if not result_name:
+                    return
+                try:
+                    # Load history and set into agent
+                    from code_puppy.agents.agent_manager import get_current_agent
+
+                    history = load_session(result_name, base_dir)
+                    agent = get_current_agent()
+                    agent.set_message_history(history)
+
+                    # Set current autosave session id so subsequent autosaves overwrite this session
+                    try:
+                        set_current_autosave_from_session_name(result_name)
+                    except Exception:
+                        pass
+
+                    # Update token info/status bar
+                    total_tokens = sum(
+                        agent.estimate_tokens_for_message(msg) for msg in history
+                    )
+                    try:
+                        status_bar = self.query_one(StatusBar)
+                        status_bar.update_token_info(
+                            total_tokens,
+                            agent.get_model_context_length(),
+                            total_tokens / max(1, agent.get_model_context_length()),
+                        )
+                    except Exception:
+                        pass
+
+                    # Notify
+                    session_path = base_dir / f"{result_name}.pkl"
+                    self.add_system_message(
+                        f"✅ Autosave loaded: {len(history)} messages ({total_tokens} tokens)\n"
+                        f"📁 From: {session_path}"
+                    )
+
+                    # Refresh history sidebar
+                    self.refresh_history_display()
+                except Exception as e:
+                    self.add_error_message(f"Failed to load autosave: {e}")
+
+            # Push modal and await result
+            picker = AutosavePicker(base_dir)
+
+            # Use Textual's push_screen with a result callback
+            def on_picker_result(result_name=None):
+                # Schedule async handler to avoid blocking UI
+                import asyncio
+                self.run_worker(handle_result(result_name), exclusive=False)
+
+            self.push_screen(picker, on_picker_result)
+        except Exception as e:
+            # Fail silently but show debug in chat
+            self.add_system_message(f"[dim]Autosave prompt error: {e}[/dim]")
+
     async def stop_message_renderer(self):
         """Stop the message renderer."""
         if self._renderer_started:

code_puppy/tui/components/input_area.py

@@ -133,7 +133,7 @@ class InputArea(Container):
             yield CustomTextArea(id="input-field", show_line_numbers=False)
             yield SubmitCancelButton()
         yield Static(
-            "Enter to send • Alt+Enter for new line • Ctrl+1 for help",
+            "Enter to send • Shift+Enter for new line • Ctrl+1 for help",
             id="input-help",
         )
 

code_puppy/tui/components/status_bar.py

@@ -83,7 +83,10 @@ class StatusBar(Static):
         elif self.agent_status == "Busy":
             status_indicator = "🔄"
             status_color = "orange"
-        else:  # Ready
+        elif self.agent_status == "Loading":
+            status_indicator = "⏳"
+            status_color = "cyan"
+        else:  # Ready or anything else
             status_indicator = "✅"
             status_color = "green"
 

code_puppy/tui/screens/__init__.py

@@ -6,10 +6,12 @@ from .help import HelpScreen
 from .mcp_install_wizard import MCPInstallWizardScreen
 from .settings import SettingsScreen
 from .tools import ToolsScreen
+from .autosave_picker import AutosavePicker
 
 __all__ = [
     "HelpScreen",
     "SettingsScreen",
     "ToolsScreen",
     "MCPInstallWizardScreen",
+    "AutosavePicker",
 ]

code_puppy/tui/screens/autosave_picker.py

@@ -0,0 +1,166 @@
+"""
+Autosave Picker modal for TUI.
+Lists recent autosave sessions and lets the user load one.
+"""
+from __future__ import annotations
+
+import json
+from dataclasses import dataclass
+from datetime import datetime
+from pathlib import Path
+from typing import List, Optional, Tuple
+
+from textual import on
+from textual.app import ComposeResult
+from textual.containers import Container, Horizontal
+from textual.screen import ModalScreen
+from textual.widgets import Button, Label, ListItem, ListView, Static
+
+from code_puppy.session_storage import list_sessions
+
+
+@dataclass(slots=True)
+class AutosaveEntry:
+    name: str
+    timestamp: Optional[str]
+    message_count: Optional[int]
+
+
+def _load_metadata(base_dir: Path, name: str) -> Tuple[Optional[str], Optional[int]]:
+    meta_path = base_dir / f"{name}_meta.json"
+    try:
+        with meta_path.open("r", encoding="utf-8") as meta_file:
+            data = json.load(meta_file)
+        return data.get("timestamp"), data.get("message_count")
+    except Exception:
+        return None, None
+
+
+class AutosavePicker(ModalScreen):
+    """Modal to present available autosave sessions for selection."""
+
+    DEFAULT_CSS = """
+    AutosavePicker {
+        align: center middle;
+    }
+
+    #modal-container {
+        width: 80%;
+        max-width: 100;
+        height: 24;
+        min-height: 18;
+        background: $surface;
+        border: solid $primary;
+        padding: 1 2;
+        layout: vertical;
+    }
+
+    #list-label {
+        width: 100%;
+        height: 1;
+        color: $text;
+        text-align: left;
+    }
+
+    #autosave-list {
+        height: 1fr;
+        overflow: auto;
+        border: solid $primary-darken-2;
+        background: $surface-darken-1;
+        margin: 1 0;
+    }
+
+    .button-row {
+        height: 3;
+        align-horizontal: right;
+        margin-top: 1;
+    }
+
+    #cancel-button { background: $primary-darken-1; }
+    #load-button { background: $success; }
+    """
+
+    def __init__(self, autosave_dir: Path, **kwargs):
+        super().__init__(**kwargs)
+        self.autosave_dir = autosave_dir
+        self.entries: List[AutosaveEntry] = []
+        self.list_view: Optional[ListView] = None
+
+    def on_mount(self) -> None:
+        names = list_sessions(self.autosave_dir)
+        raw_entries: List[Tuple[str, Optional[str], Optional[int]]] = []
+        for name in names:
+            ts, count = _load_metadata(self.autosave_dir, name)
+            raw_entries.append((name, ts, count))
+
+        def sort_key(entry):
+            _, ts, _ = entry
+            if ts:
+                try:
+                    return datetime.fromisoformat(ts)
+                except ValueError:
+                    return datetime.min
+            return datetime.min
+
+        raw_entries.sort(key=sort_key, reverse=True)
+        self.entries = [AutosaveEntry(*e) for e in raw_entries]
+
+        # Populate the ListView now that entries are ready
+        if self.list_view is None:
+            try:
+                self.list_view = self.query_one("#autosave-list", ListView)
+            except Exception:
+                self.list_view = None
+
+        if self.list_view is not None:
+            # Clear existing items if any
+            try:
+                self.list_view.clear()
+            except Exception:
+                # Fallback: remove children manually
+                self.list_view.children.clear()  # type: ignore
+
+            for entry in self.entries[:50]:
+                ts = entry.timestamp or "unknown time"
+                count = f"{entry.message_count} msgs" if entry.message_count is not None else "unknown size"
+                label = f"{entry.name} — {count}, saved at {ts}"
+                self.list_view.append(ListItem(Static(label)))
+
+            # Focus and select first item for better UX
+            if len(self.entries) > 0:
+                self.list_view.index = 0
+                self.list_view.focus()
+
+    def compose(self) -> ComposeResult:
+        with Container(id="modal-container"):
+            yield Label("Select an autosave to load (Esc to cancel)", id="list-label")
+            self.list_view = ListView(id="autosave-list")
+            # populate items
+            for entry in self.entries[:50]:  # cap to avoid long lists
+                ts = entry.timestamp or "unknown time"
+                count = f"{entry.message_count} msgs" if entry.message_count is not None else "unknown size"
+                label = f"{entry.name} — {count}, saved at {ts}"
+                self.list_view.append(ListItem(Static(label)))
+            yield self.list_view
+            with Horizontal(classes="button-row"):
+                yield Button("Cancel", id="cancel-button")
+                yield Button("Load", id="load-button", variant="primary")
+
+    @on(Button.Pressed, "#cancel-button")
+    def cancel(self) -> None:
+        self.dismiss(None)
+
+    @on(Button.Pressed, "#load-button")
+    def load_selected(self) -> None:
+        if not self.list_view or not self.entries:
+            self.dismiss(None)
+            return
+        idx = self.list_view.index if self.list_view.index is not None else 0
+        if 0 <= idx < len(self.entries):
+            self.dismiss(self.entries[idx].name)
+        else:
+            self.dismiss(None)
+
+    def on_list_view_selected(self, event: ListView.Selected) -> None:  # type: ignore
+        # Double-enter may select; we just map to load button
+        self.load_selected()

code_puppy/tui/screens/settings.py

@@ -4,7 +4,7 @@ Settings modal screen.
 
 from textual import on
 from textual.app import ComposeResult
-from textual.containers import Container
+from textual.containers import Container, VerticalScroll
 from textual.screen import ModalScreen
 from textual.widgets import Button, Input, Select, Static
 
@@ -27,6 +27,7 @@ class SettingsScreen(ModalScreen):
 
     #settings-form {
         height: 1fr;
+        overflow: auto;
     }
 
     .setting-row {
@@ -70,7 +71,8 @@ class SettingsScreen(ModalScreen):
     def compose(self) -> ComposeResult:
         with Container(id="settings-dialog"):
             yield Static("⚙️  Settings Configuration", id="settings-title")
-            with Container(id="settings-form"):
+            # Make the form scrollable so long content fits
+            with VerticalScroll(id="settings-form"):
                 with Container(classes="setting-row"):
                     yield Static("Puppy Name:", classes="setting-label")
                     yield Input(id="puppy-name-input", classes="setting-input")

{code_puppy-0.0.196.dist-info → code_puppy-0.0.198.dist-info}/METADATA

@@ -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.dist-info → code_puppy-0.0.198.dist-info}/RECORD

@@ -1,9 +1,9 @@
 code_puppy/__init__.py,sha256=ehbM1-wMjNmOXk_DBhhJECFyBv2dRHwwo7ucjHeM68E,107
 code_puppy/__main__.py,sha256=pDVssJOWP8A83iFkxMLY9YteHYat0EyWDQqMkKHpWp4,203
 code_puppy/callbacks.py,sha256=ukSgVFaEO68o6J09qFwDrnmNanrVv3toTLQhS504Meo,6162
-code_puppy/config.py,sha256=S-VcC97Syz8j-bVNBr85DlhOr6exxAHQQR9JdHYOODs,25877
+code_puppy/config.py,sha256=xT-nU1U4n7u8pyzJPG18-cJZBKv5OZI2CtHLt9DGRzU,26065
 code_puppy/http_utils.py,sha256=YLd8Y16idbI32JGeBXG8n5rT4o4X_zxk9FgUvK9XFo8,8248
-code_puppy/main.py,sha256=Csdkoufbgt3aTQBopQqq29XDyHIy84Ink6M7H5NBrXs,22076
+code_puppy/main.py,sha256=TIFaySHV3um9Q3BDUjCjh6s-WWqcNnTY3EsD2WdW6MQ,22245
 code_puppy/model_factory.py,sha256=ZbIAJWMNKNdTCEMQK8Ig6TDDZlVNyGO9hOLHoLLPMYw,15397
 code_puppy/models.json,sha256=dClUciCo2RlVDs0ZAQCIur8MOavZUEAXHEecn0uPa-4,1629
 code_puppy/reopenable_async_client.py,sha256=4UJRaMp5np8cbef9F0zKQ7TPKOfyf5U-Kv-0zYUWDho,8274
@@ -27,15 +27,15 @@ code_puppy/agents/agent_qa_expert.py,sha256=wCGXzuAVElT5c-QigQVb8JX9Gw0JmViCUQQn
 code_puppy/agents/agent_qa_kitten.py,sha256=5PeFFSwCFlTUvP6h5bGntx0xv5NmRwBiw0HnMqY8nLI,9107
 code_puppy/agents/agent_security_auditor.py,sha256=ADafi2x4gqXw6m-Nch5vjiKjO0Urcbj0x4zxHti3gDw,3712
 code_puppy/agents/agent_typescript_reviewer.py,sha256=EDY1mFkVpuJ1BPXsJFu2wQ2pfAV-90ipc_8w9ymrKPg,4054
-code_puppy/agents/base_agent.py,sha256=rJm0xA9kLT_NU9MSZIrN-Z_T5O4Q-QuUmQM8paGZKHQ,39066
-code_puppy/agents/json_agent.py,sha256=KPS1q-Rr3b5ekem4i3wtu8eLJRDd5nSPiZ8duJ_tn0U,4630
+code_puppy/agents/base_agent.py,sha256=ikeV6Sui3HAagJBPTtI9T9pCDCFTCYDNEkFFw7XU21Y,39084
+code_puppy/agents/json_agent.py,sha256=lhopDJDoiSGHvD8A6t50hi9ZBoNRKgUywfxd0Po_Dzc,4886
 code_puppy/command_line/__init__.py,sha256=y7WeRemfYppk8KVbCGeAIiTuiOszIURCDjOMZv_YRmU,45
-code_puppy/command_line/command_handler.py,sha256=1oR2pvTX7-3ciHqb3kVTfpVfsZdExmN8CfbyWiATkOQ,31274
+code_puppy/command_line/command_handler.py,sha256=alxMe5v_4jq8Sm6HETsgfF-VoDtgExj9dVzxP77fwmY,31614
 code_puppy/command_line/file_path_completion.py,sha256=gw8NpIxa6GOpczUJRyh7VNZwoXKKn-yvCqit7h2y6Gg,2931
 code_puppy/command_line/load_context_completion.py,sha256=6eZxV6Bs-EFwZjN93V8ZDZUC-6RaWxvtZk-04Wtikyw,2240
 code_puppy/command_line/model_picker_completion.py,sha256=vYNCZS1QWu6fxF__hTwpc7jwH7h_48wUxrnITawc83E,4140
 code_puppy/command_line/motd.py,sha256=PEdkp3ZnydVfvd7mNJylm8YyFNUKg9jmY6uwkA1em8c,2152
-code_puppy/command_line/prompt_toolkit_completion.py,sha256=NbagxHj950ADRncqXuVM8gAwqdrfKeGfC0x6-IhrsXM,9860
+code_puppy/command_line/prompt_toolkit_completion.py,sha256=_8SUUCKfjOxgNMkcHTeB08NIjCeqL3utHljROXLTEZE,10656
 code_puppy/command_line/utils.py,sha256=7eyxDHjPjPB9wGDJQQcXV_zOsGdYsFgI0SGCetVmTqE,1251
 code_puppy/command_line/mcp/__init__.py,sha256=0-OQuwjq_pLiTVJ1_NrirVwdRerghyKs_MTZkwPC7YY,315
 code_puppy/command_line/mcp/add_command.py,sha256=lZ09RpFDIeghX1zhc2YIAqBASs5Ra52x5YAasUKvqJg,6409
@@ -101,7 +101,7 @@ code_puppy/tools/browser/browser_workflows.py,sha256=jplJ1T60W3G4-dhVJX-CXkm9ssk
 code_puppy/tools/browser/camoufox_manager.py,sha256=RYvLcs0iAoVNtpLjrrA1uu6a5k9tAdBbmhWFGSWjX_A,6106
 code_puppy/tools/browser/vqa_agent.py,sha256=0GMDgJAK728rIuSQxAVytFSNagjo0LCjCUxBTm3w9Po,1952
 code_puppy/tui/__init__.py,sha256=XesAxIn32zLPOmvpR2wIDxDAnnJr81a5pBJB4cZp1Xs,321
-code_puppy/tui/app.py,sha256=t9HAmf58_0Qo-MMosvMWBfRurbhJIcEpgMBsUc52v38,38246
+code_puppy/tui/app.py,sha256=D-8qHzxYbe-bVgrkBLl2lLBw7HRbUoVqDTRKy1gaE-E,44279
 code_puppy/tui/messages.py,sha256=zQoToWI0eWdT36NEsY6RdCFzcDfAmfvoPlHv8jiCbgo,720
 code_puppy/tui/components/__init__.py,sha256=uj5pnk3s6SEN3SbFI0ZnzaA2KK1NNg8TfUj6U-Z732U,455
 code_puppy/tui/components/chat_view.py,sha256=Ff6uM6J0yENISNAOYroX7F-JL73_ajUUcP5IZSf2mng,19914
@@ -109,21 +109,22 @@ code_puppy/tui/components/command_history_modal.py,sha256=pUPEQvoCWa2iUnuMgNwO22
 code_puppy/tui/components/copy_button.py,sha256=E4-OJYk5YNzDf-E81NyiVGKsTRPrUX-RnQ8qFuVnabw,4375
 code_puppy/tui/components/custom_widgets.py,sha256=qsVsPLh_oUjMWBznewH8Ya1BdGSiIwNiad2qkdfvCJk,2114
 code_puppy/tui/components/human_input_modal.py,sha256=isj-zrSIcK5iy3L7HJNgDFWN1zhxY4f3zvp4krbs07E,5424
-code_puppy/tui/components/input_area.py,sha256=R4R32eXPZ2R8KFisIbldNGq60KMk7kCxWrdbeTgJUr8,4395
+code_puppy/tui/components/input_area.py,sha256=RRnprt1_mIelXla_tmv1PFS8oTwdDAuB054S5Pnbea8,4397
 code_puppy/tui/components/sidebar.py,sha256=nGtCiYzZalPmiFaJ4dwj2S4EJBu5wQZVzhoigYYY7U4,10369
-code_puppy/tui/components/status_bar.py,sha256=GgznJqF8Wk6XkurBuKohLyu75eT_ucBTvl9oPcySmnM,6338
+code_puppy/tui/components/status_bar.py,sha256=TCtfQ0w6NXjaN-0eRsbhKrufDQNEKJ5UiBNj_r70664,6471
 code_puppy/tui/models/__init__.py,sha256=5Eq7BMibz-z_t_v7B4H4tCdKRG41i2CaCuNQf_lteAE,140
 code_puppy/tui/models/chat_message.py,sha256=2fSqsl4EHKgGsi_cVKWBbFq1NQwZyledGuJ9djovtLY,477
 code_puppy/tui/models/command_history.py,sha256=bPWr_xnyQvjG5tPg_5pwqlEzn2fR170HlvBJwAXRpAE,2895
 code_puppy/tui/models/enums.py,sha256=1ulsei95Gxy4r1sk-m-Sm5rdmejYCGRI-YtUwJmKFfM,501
-code_puppy/tui/screens/__init__.py,sha256=tJ00d0aYQ9kzOGHRChqy6cCQ6JUKKXBzLUTEbk_eA2Y,286
+code_puppy/tui/screens/__init__.py,sha256=qxiJKyO3MKCNdPjUuHA2-Pnpda0JN20n7e9sU25eC9M,352
+code_puppy/tui/screens/autosave_picker.py,sha256=9bazha2C5N3Xg_VcmpcTv-CYOBq_mwcECBfrQM9tHxA,5416
 code_puppy/tui/screens/help.py,sha256=eJuPaOOCp7ZSUlecearqsuX6caxWv7NQszUh0tZJjBM,3232
 code_puppy/tui/screens/mcp_install_wizard.py,sha256=vObpQwLbXjQsxmSg-WCasoev1usEi0pollKnL0SHu9U,27693
-code_puppy/tui/screens/settings.py,sha256=-WLldnKyWVKUYVPJcfOn1UU6eP9t8lLPUAVI317SOOM,10685
+code_puppy/tui/screens/settings.py,sha256=EsoL_gbN5FpEXGuDqhtdDznNZy_eGNMMuZnWuARSWi8,10790
 code_puppy/tui/screens/tools.py,sha256=3pr2Xkpa9Js6Yhf1A3_wQVRzFOui-KDB82LwrsdBtyk,1715
-code_puppy-0.0.196.data/data/code_puppy/models.json,sha256=dClUciCo2RlVDs0ZAQCIur8MOavZUEAXHEecn0uPa-4,1629
-code_puppy-0.0.196.dist-info/METADATA,sha256=o-3kdJ2IzyMxkaEa4_XOH7StuqfcZX3YwjZF3Sy4Yv8,19987
-code_puppy-0.0.196.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-code_puppy-0.0.196.dist-info/entry_points.txt,sha256=Tp4eQC99WY3HOKd3sdvb22vZODRq0XkZVNpXOag_KdI,91
-code_puppy-0.0.196.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
-code_puppy-0.0.196.dist-info/RECORD,,
+code_puppy-0.0.198.data/data/code_puppy/models.json,sha256=dClUciCo2RlVDs0ZAQCIur8MOavZUEAXHEecn0uPa-4,1629
+code_puppy-0.0.198.dist-info/METADATA,sha256=p-54EnWxhZ2h9yAcVbjToU39Fqch7Si6kmSVHCtqAWA,20759
+code_puppy-0.0.198.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+code_puppy-0.0.198.dist-info/entry_points.txt,sha256=Tp4eQC99WY3HOKd3sdvb22vZODRq0XkZVNpXOag_KdI,91
+code_puppy-0.0.198.dist-info/licenses/LICENSE,sha256=31u8x0SPgdOq3izJX41kgFazWsM43zPEF9eskzqbJMY,1075
+code_puppy-0.0.198.dist-info/RECORD,,