Merge pull request #20 from damassi/feat/scroll-through-convos

feat: Add prev/next message navigation

Author: damassi

docs/architecture.md

@@ -103,14 +103,32 @@ Text input with:
 - Enter to submit
 - Ctrl+J for newlines
 - `/` opens slash command menu
+- Up/Down arrows to navigate message history (bash-like command history)
 
 **SlashCommandMenu** (`components/slash_command_menu.py`)
 Command menu triggered by `/`:
 - Fuzzy filtering as you type (text shows in input)
-- Commands: `/new`, `/clear`, `/exit`
+- Commands: `/new`, `/clear`, `/save`, `/exit`
 - Backspace removes filter chars; closes menu when empty
 - Escape closes and clears
 
+### Message History Navigation
+
+The UserInput component maintains a bash-like command history:
+- **Up arrow**: Navigate backward through previous messages
+- **Down arrow**: Navigate forward through history
+- **Draft preservation**: Current input is saved when navigating and restored when returning to present
+- History persists for the app session
+- Empty history is handled gracefully
+
+### Save Conversation
+
+The `/save` slash command saves the current conversation to a markdown file:
+- Output location: `~/.claude/agent-chat-cli/convo-{timestamp}.md`
+- Includes all message types: system, user, agent, and tool messages
+- Tool messages are formatted as JSON code blocks
+- Messages are separated by markdown horizontal rules
+
 **ToolPermissionPrompt** (`components/tool_permission_prompt.py`)
 Modal prompt for tool permission requests:
 - Shows tool name and MCP server

src/agent_chat_cli/components/user_input.py

@@ -20,6 +20,10 @@ def __init__(self, actions: Actions) -> None:
         super().__init__()
         self.actions = actions
 
+        self.message_history: list[str] = []
+        self.history_index: int | None = None
+        self.draft_message: str = ""
+
     def compose(self) -> ComposeResult:
         with Flex():
             yield Caret()
@@ -64,14 +68,23 @@ def on_text_area_changed(self, event: TextArea.Changed) -> None:
             menu.show()
 
     async def on_key(self, event) -> None:
-        if event.key == Key.CTRL_J.value:
-            self._insert_newline(event)
-            return
-
         menu = self.query_one(SlashCommandMenu)
 
         if menu.is_visible:
             self._close_menu(event)
+            return
+
+        if event.key == "up":
+            await self._navigate_history(event, direction=-1)
+            return
+
+        if event.key == "down":
+            await self._navigate_history(event, direction=1)
+            return
+
+        if event.key == Key.CTRL_J.value:
+            self._insert_newline(event)
+            return
 
     def _insert_newline(self, event) -> None:
         event.stop()
@@ -104,6 +117,36 @@ def _close_menu(self, event) -> None:
                 input_widget.clear()
                 input_widget.focus()
 
+    async def _navigate_history(self, event, direction: int) -> None:
+        event.stop()
+        event.prevent_default()
+
+        input_widget = self.query_one(TextArea)
+
+        if direction < 0:
+            if not self.message_history:
+                return
+
+            if self.history_index is None:
+                self.draft_message = input_widget.text
+                self.history_index = len(self.message_history) - 1
+            elif self.history_index > 0:
+                self.history_index -= 1
+        else:
+            if self.history_index is None:
+                return
+
+            self.history_index += 1
+
+            if self.history_index >= len(self.message_history):
+                self.history_index = None
+                input_widget.text = self.draft_message
+                input_widget.move_cursor_relative(rows=999, columns=999)
+                return
+
+        input_widget.text = self.message_history[self.history_index]
+        input_widget.move_cursor_relative(rows=999, columns=999)
+
     async def action_submit(self) -> None:
         menu = self.query_one(SlashCommandMenu)
 
@@ -121,5 +164,9 @@ async def action_submit(self) -> None:
         if not user_message:
             return
 
+        self.message_history.append(user_message)
+        self.history_index = None
+        self.draft_message = ""
+
         input_widget.clear()
         await self.actions.post_user_message(user_message)

src/agent_chat_cli/prompts/system.md

@@ -3,6 +3,8 @@
 You are a helpful AI assistant in a terminal-based chat application.
 
 You should:
+
+- Address yourself as Agent, not Claude
 - Provide clear, concise responses
 - Use markdown formatting when helpful
 - Be direct and efficient in your communication

src/agent_chat_cli/utils/save_conversation.py

@@ -10,6 +10,8 @@
 )
 from agent_chat_cli.components.chat_history import ChatHistory
 
+CONVERSATION_OUTPUT_DIR = Path.home() / ".claude" / "agent-chat-cli"
+
 
 def save_conversation(chat_history: ChatHistory) -> str:
     messages = []
@@ -31,10 +33,9 @@ def save_conversation(chat_history: ChatHistory) -> str:
 
     content = "\n---\n\n".join(messages)
     timestamp = datetime.now().strftime("%Y-%m-%d_%H-%M-%S")
-    output_dir = Path.home() / ".claude" / "agent-chat-cli"
-    output_dir.mkdir(parents=True, exist_ok=True)
+    CONVERSATION_OUTPUT_DIR.mkdir(parents=True, exist_ok=True)
 
-    output_file = output_dir / f"convo-{timestamp}.md"
+    output_file = CONVERSATION_OUTPUT_DIR / f"convo-{timestamp}.md"
     output_file.write_text(content)
 
     return str(output_file)

tests/components/test_user_input.py

@@ -131,3 +131,188 @@ async def test_clears_input_after_filtering_and_selecting(self, app):
 
             assert text_area.text == ""
             app.mock_actions.save.assert_called_once()
+
+
+class TestUserInputHistory:
+    @pytest.fixture
+    def app(self):
+        return UserInputApp()
+
+    async def test_up_arrow_on_empty_history_does_nothing(self, app):
+        async with app.run_test() as pilot:
+            user_input = app.query_one(UserInput)
+            text_area = user_input.query_one(TextArea)
+
+            await pilot.press("up")
+
+            assert text_area.text == ""
+            assert user_input.history_index is None
+
+    async def test_up_arrow_loads_last_message(self, app):
+        async with app.run_test() as pilot:
+            user_input = app.query_one(UserInput)
+            text_area = user_input.query_one(TextArea)
+
+            text_area.insert("first message")
+            await pilot.press("enter")
+
+            await pilot.press("up")
+
+            assert text_area.text == "first message"
+            assert user_input.history_index == 0
+
+    async def test_up_arrow_twice_loads_older_messages(self, app):
+        async with app.run_test() as pilot:
+            user_input = app.query_one(UserInput)
+            text_area = user_input.query_one(TextArea)
+
+            text_area.insert("first message")
+            await pilot.press("enter")
+
+            text_area.insert("second message")
+            await pilot.press("enter")
+
+            await pilot.press("up")
+            assert text_area.text == "second message"
+            assert user_input.history_index == 1
+
+            await pilot.press("up")
+            assert text_area.text == "first message"
+            assert user_input.history_index == 0
+
+    async def test_up_arrow_at_oldest_does_nothing(self, app):
+        async with app.run_test() as pilot:
+            user_input = app.query_one(UserInput)
+            text_area = user_input.query_one(TextArea)
+
+            text_area.insert("only message")
+            await pilot.press("enter")
+
+            await pilot.press("up")
+            await pilot.press("up")
+
+            assert text_area.text == "only message"
+            assert user_input.history_index == 0
+
+    async def test_down_arrow_navigates_forward(self, app):
+        async with app.run_test() as pilot:
+            user_input = app.query_one(UserInput)
+            text_area = user_input.query_one(TextArea)
+
+            text_area.insert("first message")
+            await pilot.press("enter")
+
+            text_area.insert("second message")
+            await pilot.press("enter")
+
+            await pilot.press("up")
+            await pilot.press("up")
+            assert text_area.text == "first message"
+
+            await pilot.press("down")
+            assert text_area.text == "second message"
+            assert user_input.history_index == 1
+
+    async def test_down_arrow_at_present_does_nothing(self, app):
+        async with app.run_test() as pilot:
+            user_input = app.query_one(UserInput)
+            text_area = user_input.query_one(TextArea)
+
+            text_area.insert("test message")
+            await pilot.press("enter")
+
+            await pilot.press("down")
+
+            assert text_area.text == ""
+            assert user_input.history_index is None
+
+    async def test_down_arrow_from_history_restores_draft(self, app):
+        async with app.run_test() as pilot:
+            user_input = app.query_one(UserInput)
+            text_area = user_input.query_one(TextArea)
+
+            text_area.insert("first message")
+            await pilot.press("enter")
+
+            text_area.insert("my draft")
+            await pilot.press("up")
+            assert text_area.text == "first message"
+
+            await pilot.press("down")
+            assert text_area.text == "my draft"
+            assert user_input.history_index is None
+
+    async def test_empty_draft_preserved(self, app):
+        async with app.run_test() as pilot:
+            user_input = app.query_one(UserInput)
+            text_area = user_input.query_one(TextArea)
+
+            text_area.insert("first message")
+            await pilot.press("enter")
+
+            await pilot.press("up")
+            assert text_area.text == "first message"
+
+            await pilot.press("down")
+            assert text_area.text == ""
+            assert user_input.history_index is None
+
+    async def test_submit_adds_to_history(self, app):
+        async with app.run_test() as pilot:
+            user_input = app.query_one(UserInput)
+            text_area = user_input.query_one(TextArea)
+
+            text_area.insert("test message")
+            await pilot.press("enter")
+
+            assert len(user_input.message_history) == 1
+            assert user_input.message_history[0] == "test message"
+
+    async def test_submit_resets_history_state(self, app):
+        async with app.run_test() as pilot:
+            user_input = app.query_one(UserInput)
+            text_area = user_input.query_one(TextArea)
+
+            text_area.insert("first message")
+            await pilot.press("enter")
+
+            await pilot.press("up")
+            assert user_input.history_index == 0
+
+            text_area.clear()
+            text_area.insert("second message")
+            await pilot.press("enter")
+
+            assert user_input.history_index is None
+            assert user_input.draft_message == ""
+
+    async def test_multiline_message_in_history(self, app):
+        async with app.run_test() as pilot:
+            user_input = app.query_one(UserInput)
+            text_area = user_input.query_one(TextArea)
+
+            text_area.insert("line1")
+            await pilot.press("ctrl+j")
+            text_area.insert("line2")
+            await pilot.press("enter")
+
+            await pilot.press("up")
+
+            assert "line1\nline2" in text_area.text
+
+    async def test_history_with_slash_menu_open(self, app):
+        async with app.run_test() as pilot:
+            user_input = app.query_one(UserInput)
+            text_area = user_input.query_one(TextArea)
+            menu = user_input.query_one(SlashCommandMenu)
+
+            text_area.insert("test message")
+            await pilot.press("enter")
+
+            await pilot.press("/")
+            assert menu.is_visible is True
+
+            await pilot.press("up")
+
+            assert text_area.text == ""
+            assert user_input.history_index is None

tests/core/test_actions.py

@@ -1,5 +1,4 @@
 import pytest
-from pathlib import Path
 from unittest.mock import AsyncMock, MagicMock, patch
 
 from agent_chat_cli.app import AgentChatCLIApp
@@ -12,6 +11,7 @@
 )
 from agent_chat_cli.components.tool_permission_prompt import ToolPermissionPrompt
 from agent_chat_cli.utils.enums import ControlCommand
+from agent_chat_cli.utils import save_conversation
 
 
 @pytest.fixture
@@ -205,7 +205,8 @@ class TestActionsSave:
     async def test_saves_conversation_to_file(
         self, mock_agent_loop, mock_config, tmp_path, monkeypatch
     ):
-        monkeypatch.setattr(Path, "home", lambda: tmp_path)
+        output_dir = tmp_path / ".claude" / "agent-chat-cli"
+        monkeypatch.setattr(save_conversation, "CONVERSATION_OUTPUT_DIR", output_dir)
 
         app = AgentChatCLIApp()
         async with app.run_test():
@@ -221,7 +222,8 @@ async def test_saves_conversation_to_file(
     async def test_adds_system_message_with_file_path(
         self, mock_agent_loop, mock_config, tmp_path, monkeypatch
     ):
-        monkeypatch.setattr(Path, "home", lambda: tmp_path)
+        output_dir = tmp_path / ".claude" / "agent-chat-cli"
+        monkeypatch.setattr(save_conversation, "CONVERSATION_OUTPUT_DIR", output_dir)
 
         app = AgentChatCLIApp()
         async with app.run_test():
@@ -241,7 +243,8 @@ async def test_does_not_trigger_thinking(
     ):
         from agent_chat_cli.components.thinking_indicator import ThinkingIndicator
 
-        monkeypatch.setattr(Path, "home", lambda: tmp_path)
+        output_dir = tmp_path / ".claude" / "agent-chat-cli"
+        monkeypatch.setattr(save_conversation, "CONVERSATION_OUTPUT_DIR", output_dir)
 
         app = AgentChatCLIApp()
         async with app.run_test():