Merge pull request #20 from ai-action/feat/clear

Author: remarkablemark

src/cli.test.ts

@@ -3,15 +3,13 @@ import type { MockInstance } from 'vitest';
 type RunAction = (model: string, prompt: string) => Promise<void>;
 
 const {
-  clearScreen,
   createSystemMessage,
   executeTool,
   outputHelp,
   parse,
   renderApp,
   streamChat,
 } = vi.hoisted(() => ({
-  clearScreen: vi.fn(),
   createSystemMessage: vi.fn(() => ({
     role: 'system',
     content: 'system prompt',
@@ -30,7 +28,6 @@ const commandState = vi.hoisted(() => ({
 vi.mock('./utils', () => ({
   agents: { createSystemMessage },
   ollama: { streamChat },
-  screen: { clear: clearScreen },
   tools: { TOOLS: ['mock-tool'], executeTool },
 }));
 vi.mock('./tui', () => ({ renderApp }));
@@ -73,7 +70,7 @@ describe('cli', () => {
 
   it('renders TUI with no args', async () => {
     await main([]);
-    expect(clearScreen).toHaveBeenCalledOnce();
+    expect(stdoutSpy).toHaveBeenCalledWith('\x1Bc');
     expect(renderApp).toHaveBeenCalledOnce();
     expect(parse).not.toHaveBeenCalled();
   });

src/cli.ts

@@ -5,7 +5,7 @@ import { realpathSync } from 'node:fs';
 import cac from 'cac';
 
 import { PACKAGE, ROLE } from './constants';
-import { agents, ollama, screen, tools } from './utils';
+import { agents, ollama, tools } from './utils';
 
 const cli = cac('code-ollama');
 
@@ -79,15 +79,17 @@ export async function main(
   if (!args.length) {
     const { renderApp } = await import('./tui');
 
-    screen.clear();
+    // clear the tui
+    process.stdout.write('\x1Bc');
+
     renderApp();
     return;
   }
 
   cli.parse(['node', 'code-ollama', ...args]);
 }
 
-/* v8 ignore start */
+// v8 ignore start
 function isEntrypoint(argv1 = process.argv[1]): boolean {
   if (!argv1) {
     return false;
@@ -103,4 +105,4 @@ function isEntrypoint(argv1 = process.argv[1]): boolean {
 if (isEntrypoint()) {
   void main();
 }
-/* v8 ignore stop */
+// v8 ignore stop

src/components/App.test.tsx

@@ -3,8 +3,13 @@ import { render } from 'ink-testing-library';
 
 import { test } from '../utils';
 
+const resetSystemMessage = vi.hoisted(() => vi.fn());
+
 vi.mock('../utils', async () => ({
   ...(await vi.importActual('../utils')),
+  agents: {
+    resetSystemMessage,
+  },
   config: {
     loadConfig: vi.fn(() => ({
       host: 'http://localhost:11434',
@@ -32,15 +37,17 @@ vi.mock('./Chat', () => ({
   Chat: ({
     onCommand,
     onModeChange,
+    sessionId,
   }: {
     model: string;
     onCommand: (command: string) => void;
     mode: string;
     onModeChange: (mode: string) => void;
+    sessionId: number;
   }) => {
     capturedCallbacks.onCommand = onCommand;
     capturedCallbacks.onModeChange = onModeChange;
-    return <Text>{'>'}</Text>;
+    return <Text>{`> session:${String(sessionId)}`}</Text>;
   },
 }));
 
@@ -82,6 +89,7 @@ describe('App', () => {
     capturedCallbacks.onSelect = null;
     capturedCallbacks.onClose = null;
     capturedCallbacks.onToggleMode = null;
+    resetSystemMessage.mockClear();
   });
 
   it('renders title', () => {
@@ -134,6 +142,20 @@ describe('App', () => {
     expect(lastFrame()).not.toContain('ModelPicker');
   });
 
+  it('resets the chat session when /clear is issued', async () => {
+    const { lastFrame, rerender } = render(<App />);
+
+    expect(lastFrame()).toContain('session:0');
+
+    capturedCallbacks.onCommand?.('/clear');
+    rerender(<App />);
+    await test.tick();
+
+    expect(resetSystemMessage).toHaveBeenCalledOnce();
+    expect(lastFrame()).toContain('session:1');
+    expect(lastFrame()).not.toContain('ModelPicker');
+  });
+
   it('toggles mode via Footer onToggleMode callback (3-state cycle)', async () => {
     const { lastFrame, rerender } = render(<App />);
 

src/components/App.tsx

@@ -2,7 +2,7 @@ import { Box } from 'ink';
 import { useCallback, useState } from 'react';
 
 import { MODE } from '../constants';
-import { config } from '../utils';
+import { agents, config } from '../utils';
 import { Chat } from './Chat';
 import { Footer } from './Footer';
 import { Header } from './Header';
@@ -12,10 +12,19 @@ export function App() {
   const [model, setModel] = useState(() => config.loadConfig().model);
   const [picking, setPicking] = useState(false);
   const [mode, setMode] = useState<MODE.Name>(MODE.NAME.SAFE);
+  const [sessionId, setSessionId] = useState(0);
 
   const handleCommand = useCallback((command: string) => {
-    if (command === '/model') {
-      setPicking(true);
+    switch (command) {
+      case '/model':
+        setPicking(true);
+        break;
+
+      case '/clear':
+        agents.resetSystemMessage();
+        setPicking(false);
+        setSessionId((sessionId) => sessionId + 1);
+        break;
     }
   }, []);
 
@@ -29,42 +38,52 @@ export function App() {
     setPicking(false);
   }, []);
 
-  return (
-    <Box flexDirection="column">
-      <Header model={model} />
+  const handleToggleMode = useCallback(() => {
+    setMode((mode) => {
+      // Cycle: safe -> auto -> plan -> safe
+      switch (mode) {
+        case MODE.NAME.SAFE:
+          return MODE.NAME.AUTO;
+        case MODE.NAME.AUTO:
+          return MODE.NAME.PLAN;
+        case MODE.NAME.PLAN:
+        default:
+          return MODE.NAME.SAFE;
+      }
+    });
+  }, []);
 
-      {picking ? (
+  let body: React.ReactNode;
+
+  switch (true) {
+    case picking:
+      body = (
         <ModelPicker
           currentModel={model}
           onSelect={handleSelect}
           onClose={handleClose}
         />
-      ) : (
+      );
+      break;
+
+    default:
+      body = (
         <Chat
           model={model}
           onCommand={handleCommand}
           mode={mode}
           onModeChange={setMode}
+          sessionId={sessionId}
         />
-      )}
+      );
+      break;
+  }
 
-      <Footer
-        mode={mode}
-        onToggleMode={() => {
-          setMode((mode) => {
-            // Cycle: safe -> auto -> plan -> safe
-            switch (mode) {
-              case MODE.NAME.SAFE:
-                return MODE.NAME.AUTO;
-              case MODE.NAME.AUTO:
-                return MODE.NAME.PLAN;
-              case MODE.NAME.PLAN:
-              default:
-                return MODE.NAME.SAFE;
-            }
-          });
-        }}
-      />
+  return (
+    <Box flexDirection="column">
+      <Header model={model} />
+      {body}
+      <Footer mode={mode} onToggleMode={handleToggleMode} />
     </Box>
   );
 }