Add /clear and /new commands (#256)

Author: cmpatino

agent/context_manager/manager.py

@@ -184,9 +184,13 @@ def __init__(
         hf_token: str | None = None,
         local_mode: bool = False,
     ):
+        self.prompt_file_suffix = prompt_file_suffix
+        self.tool_specs = tool_specs or []
+        self.hf_token = hf_token
+        self.local_mode = local_mode
         self.system_prompt = self._load_system_prompt(
-            tool_specs or [],
-            prompt_file_suffix="system_prompt_v3.yaml",
+            self.tool_specs,
+            prompt_file_suffix=self.prompt_file_suffix,
             hf_token=hf_token,
             local_mode=local_mode,
         )
@@ -203,6 +207,30 @@ def __init__(
         self.items: list[Message] = [Message(role="system", content=self.system_prompt)]
         self.on_message_added = None
 
+    def refresh_system_prompt(
+        self,
+        *,
+        tool_specs: list[dict[str, Any]] | None = None,
+        hf_token: str | None = None,
+        local_mode: bool | None = None,
+    ) -> Message:
+        """Re-render the system prompt and return it as a system message."""
+        if tool_specs is not None:
+            self.tool_specs = tool_specs
+        if hf_token is not None:
+            self.hf_token = hf_token
+        if local_mode is not None:
+            self.local_mode = local_mode
+        self.system_prompt = self._load_system_prompt(
+            self.tool_specs,
+            prompt_file_suffix=getattr(
+                self, "prompt_file_suffix", "system_prompt_v3.yaml"
+            ),
+            hf_token=getattr(self, "hf_token", None),
+            local_mode=getattr(self, "local_mode", False),
+        )
+        return Message(role="system", content=self.system_prompt)
+
     def _load_system_prompt(
         self,
         tool_specs: list[dict[str, Any]],

agent/core/agent_loop.py

@@ -1756,6 +1756,19 @@ async def undo(session: Session) -> None:
             logger.warning("Undo: no user message found to remove")
         await session.send_event(Event(event_type="undo_complete"))
 
+    @staticmethod
+    async def new_conversation(session: Session, *, clear_screen: bool = False) -> None:
+        """Start a fresh conversation inside the active runtime."""
+        try:
+            result = session.start_new_conversation()
+        except Exception as e:
+            await session.send_event(
+                Event(event_type="error", data={"error": f"New chat failed: {e}"})
+            )
+            return
+        result["clear_screen"] = clear_screen
+        await session.send_event(Event(event_type="new_complete", data=result))
+
     @staticmethod
     async def resume(session: Session, path: str) -> None:
         """Reload context from a saved session log into the active session."""
@@ -2058,6 +2071,11 @@ async def process_submission(session: Session, submission) -> bool:
         await Handlers.undo(session)
         return True
 
+    if op.op_type == OpType.NEW:
+        clear_screen = bool((op.data or {}).get("clear_screen"))
+        await Handlers.new_conversation(session, clear_screen=clear_screen)
+        return True
+
     if op.op_type == OpType.RESUME:
         path = op.data.get("path") if op.data else None
         if path:

agent/core/session.py

@@ -11,6 +11,8 @@
 from pathlib import Path
 from typing import Any, Optional
 
+from litellm import Message
+
 from agent.config import Config
 from agent.context_manager.manager import ContextManager
 from agent.messaging.gateway import NotificationGateway
@@ -62,6 +64,7 @@ class OpType(Enum):
     INTERRUPT = "interrupt"
     UNDO = "undo"
     COMPACT = "compact"
+    NEW = "new"
     RESUME = "resume"
     SHUTDOWN = "shutdown"
 
@@ -376,6 +379,82 @@ def increment_turn(self) -> None:
         """Increment turn counter (called after each user interaction)"""
         self.turn_count += 1
 
+    def start_new_conversation(self) -> dict[str, Any]:
+        """Rotate this runtime into a fresh conversation.
+
+        The tool router, model/config choices, user identity, and external
+        resources stay attached to the CLI process. Conversation-specific state
+        gets reset so later saves do not merge with the prior chat. Warm runtime
+        resources such as the sandbox, in-flight job tracking, and probed
+        model-effort cache are deliberately preserved.
+        """
+        previous_session_id = self.session_id
+        previous_turn_count = self.turn_count
+        previous_message_count = len(self.context_manager.items)
+        previous_non_system_count = sum(
+            1
+            for item in self.context_manager.items
+            if getattr(item, "role", None) != "system"
+        )
+
+        saved_path: str | None = None
+        if self.config.save_sessions and previous_non_system_count:
+            saved_path = self.save_and_upload_detached(self.config.session_dataset_repo)
+
+        from agent.tools.plan_tool import reset_current_plan
+
+        self.current_plan = []
+        reset_current_plan()
+
+        system_msg = self._fresh_system_message()
+        self.context_manager.items = [system_msg] if system_msg is not None else []
+        self.context_manager.running_context_usage = 0
+
+        self.session_id = str(uuid.uuid4())
+        self.session_start_time = datetime.now().isoformat()
+        self.turn_count = 0
+        self.last_auto_save_turn = 0
+        self.logged_events = []
+        self._local_save_path = None
+        self._last_heartbeat_ts = None
+        self.pending_approval = None
+        self.auto_approval_estimated_spend_usd = 0.0
+        self.reset_cancel()
+
+        # Previous-session metadata is intentionally included for event
+        # consumers and telemetry, even though the CLI currently prints only
+        # the optional save path.
+        return {
+            "session_id": self.session_id,
+            "previous_session_id": previous_session_id,
+            "previous_turn_count": previous_turn_count,
+            "previous_message_count": previous_message_count,
+            "saved_path": saved_path,
+        }
+
+    def _fresh_system_message(self) -> Message | None:
+        existing = (
+            self.context_manager.items[0]
+            if self.context_manager.items
+            and getattr(self.context_manager.items[0], "role", None) == "system"
+            else None
+        )
+        refresh = getattr(self.context_manager, "refresh_system_prompt", None)
+        if refresh is None:
+            return existing
+        try:
+            tool_specs = (
+                self.tool_router.get_tool_specs_for_llm() if self.tool_router else []
+            )
+            return refresh(
+                tool_specs=tool_specs,
+                hf_token=self.hf_token,
+                local_mode=self.local_mode,
+            )
+        except Exception as e:
+            logger.warning("Failed to refresh system prompt for new chat: %s", e)
+            return existing
+
     async def auto_save_if_needed(self) -> None:
         """Check if auto-save should trigger and save if so (completely non-blocking)"""
         if not self.config.save_sessions:

agent/main.py

@@ -12,6 +12,7 @@
 import logging
 import os
 import signal
+import subprocess
 import sys
 import time
 from dataclasses import dataclass
@@ -195,6 +196,14 @@ def _create_rich_console():
     return get_console()
 
 
+def _clear_terminal() -> None:
+    command = ["cmd", "/c", "cls"] if os.name == "nt" else ["clear"]
+    try:
+        subprocess.run(command, check=False)
+    except OSError:
+        pass
+
+
 class _ThinkingShimmer:
     """Animated shiny/shimmer thinking indicator — a bright gradient sweeps across the text."""
 
@@ -398,6 +407,18 @@ def _cancel_event():
             elif event.event_type == "undo_complete":
                 console.print("[dim]Undone.[/dim]")
                 turn_complete_event.set()
+            elif event.event_type == "new_complete":
+                data = event.data or {}
+                if data.get("clear_screen"):
+                    _clear_terminal()
+                saved_path = data.get("saved_path")
+                if saved_path:
+                    console.print(
+                        f"[dim]Started new chat. Prior chat saved to {saved_path}.[/dim]"
+                    )
+                else:
+                    console.print("[dim]Started new chat.[/dim]")
+                turn_complete_event.set()
             elif event.event_type == "resume_complete":
                 data = event.data or {}
                 path = data.get("path", "?")
@@ -902,6 +923,20 @@ async def _handle_slash_command(
             operation=Operation(op_type=OpType.COMPACT),
         )
 
+    if command in {"/new", "/clear"}:
+        session = session_holder[0] if session_holder else None
+        if session is None:
+            get_console().print("[bold red]No active session to reset.[/bold red]")
+            return None
+        submission_id[0] += 1
+        return Submission(
+            id=f"sub_{submission_id[0]}",
+            operation=Operation(
+                op_type=OpType.NEW,
+                data={"clear_screen": command == "/clear"},
+            ),
+        )
+
     if command == "/resume":
         session = session_holder[0] if session_holder else None
         if session is None:
@@ -1109,7 +1144,7 @@ async def main(model: str | None = None, sandbox_tools: bool = False):
     """Interactive chat with the agent"""
 
     # Clear screen
-    os.system("clear" if os.name != "nt" else "cls")
+    _clear_terminal()
 
     # Create prompt session for input (needed early for token prompt)
     prompt_session = PromptSession()

agent/tools/plan_tool.py

@@ -9,6 +9,13 @@
 _current_plan: List[Dict[str, str]] = []
 
 
+def reset_current_plan() -> None:
+    """Clear the CLI-visible in-memory plan."""
+    global _current_plan
+
+    _current_plan = []
+
+
 class PlanTool:
     """Tool for managing a list of todos with status tracking."""
 

agent/utils/terminal_display.py

@@ -454,6 +454,8 @@ def print_yolo_approve(count: int) -> None:
 
 HELP_ROWS: tuple[tuple[str, str, str], ...] = (
     ("/help", "", "Show this help"),
+    ("/new", "", "Start a fresh chat"),
+    ("/clear", "", "Clear terminal and start fresh"),
     ("/undo", "", "Undo last turn"),
     ("/compact", "", "Compact context window"),
     ("/resume", "[index|id|path]", "Pick up from ./session_logs"),