Merge pull request #106 from ai-action/feat/sessions

Author: remarkablemark

src/cli.test.ts

@@ -2,6 +2,7 @@ type RunAction = (model: string, prompt: string) => Promise<void>;
 type ResumeAction = (sessionId: string) => Promise<void>;
 
 const {
+  color,
   createSystemMessage,
   executeTool,
   loadSession,
@@ -12,6 +13,7 @@ const {
   write,
   writeError,
 } = vi.hoisted(() => ({
+  color: vi.fn((text: string) => text),
   createSystemMessage: vi.fn(() => ({
     role: 'system',
     content: 'system prompt',
@@ -38,7 +40,7 @@ vi.mock('./utils', () => ({
   ollama: { streamChat },
   screen: { reset: mockReset },
   session: { loadSession },
-  terminal: { write, writeError },
+  terminal: { color, write, writeError },
   tools: { TOOLS: ['mock-tool'], executeTool },
 }));
 vi.mock('./tui', () => ({ renderApp }));
@@ -249,7 +251,7 @@ describe('cli', () => {
 
   it('loads the requested session and renders the TUI for resume', async () => {
     loadSession.mockReturnValueOnce({
-      metadata: { id: 'session-1' },
+      metadata: { id: 'session-1', directory: process.cwd() },
       messages: [],
     });
 
@@ -260,6 +262,37 @@ describe('cli', () => {
     expect(renderApp).toHaveBeenCalledWith('session-1');
   });
 
+  it('allows resume when session has no directory field (legacy session)', async () => {
+    loadSession.mockReturnValueOnce({
+      metadata: { id: 'session-1', directory: undefined },
+      messages: [],
+    });
+
+    await commandState.resumeAction?.('session-1');
+
+    expect(renderApp).toHaveBeenCalledWith('session-1');
+    expect(writeError).not.toHaveBeenCalled();
+  });
+
+  it('blocks TUI and errors when resuming a session from a different directory', async () => {
+    loadSession.mockReturnValueOnce({
+      metadata: { id: 'session-1', directory: '/other/project' },
+      messages: [],
+    });
+
+    await commandState.resumeAction?.('session-1');
+
+    expect(color).toHaveBeenCalledWith(
+      expect.stringContaining(
+        'Cannot resume: session belongs to /other/project',
+      ),
+      'yellow',
+    );
+    expect(writeError).toHaveBeenCalledOnce();
+    expect(process.exitCode).toBe(1);
+    expect(renderApp).not.toHaveBeenCalled();
+  });
+
   it('reports resume errors and sets exit code', async () => {
     loadSession.mockImplementationOnce(() => {
       throw new Error('Session not found: missing');

src/cli.ts

@@ -4,7 +4,7 @@ import { realpathSync } from 'node:fs';
 
 import cac from 'cac';
 
-import { PACKAGE, ROLE } from './constants';
+import { PACKAGE, ROLE, UI } from './constants';
 import type { ToolName } from './types';
 import { agents, ollama, screen, session, terminal, tools } from './utils';
 
@@ -30,7 +30,20 @@ cli
   .command('resume <sessionId>', 'Resume a saved session')
   .action(async (sessionId: string) => {
     try {
-      session.loadSession(sessionId);
+      const loaded = session.loadSession(sessionId);
+      if (
+        loaded.metadata.directory &&
+        loaded.metadata.directory !== process.cwd()
+      ) {
+        terminal.writeError(
+          terminal.color(
+            `${UI.WARNING} Cannot resume: session belongs to ${loaded.metadata.directory}\n`,
+            'yellow',
+          ),
+        );
+        process.exitCode = 1;
+        return;
+      }
       await launchTui(sessionId);
     } catch (error) {
       const message = error instanceof Error ? error.message : 'Unknown error';

src/components/App/App.test.tsx

@@ -271,19 +271,23 @@ describe('App', () => {
         updatedAt: '2026-05-11T00:00:00.000Z',
         title: 'New session',
         model,
+        directory: process.cwd(),
       },
       messages: [],
     }));
+
     loadSession.mockImplementation((sessionId: string) => ({
       metadata: {
         id: sessionId,
         createdAt: '2026-05-11T00:00:00.000Z',
         updatedAt: '2026-05-11T00:00:00.000Z',
         title: sessionId,
         model: 'gemma4',
+        directory: process.cwd(),
       },
       messages: [],
     }));
+
     listSessions.mockReturnValue([
       {
         id: 'session-0',
@@ -293,20 +297,24 @@ describe('App', () => {
         model: 'gemma4',
       },
     ]);
+
     appendMessage.mockImplementation((_sessionId, _message, model: string) => ({
       id: 'session-0',
       createdAt: '2026-05-11T00:00:00.000Z',
       updatedAt: '2026-05-11T00:00:01.000Z',
       title: 'Session 0',
       model,
+      directory: process.cwd(),
     }));
+
     updateSessionModel.mockImplementation(
       (sessionId: string, model: string) => ({
         id: sessionId,
         createdAt: '2026-05-11T00:00:00.000Z',
         updatedAt: '2026-05-11T00:00:00.000Z',
         title: sessionId,
         model,
+        directory: process.cwd(),
       }),
     );
   });
@@ -448,14 +456,14 @@ describe('App', () => {
 
   it('prints a resume command when the app exits with session messages', async () => {
     deleteSessionIfEmpty.mockReturnValue(false);
-    const { unmount } = render(<App />);
+    const { unmount, rerender } = render(<App />);
     await time.tick();
 
     capturedCallbacks.onMessagesChange?.([
       { role: 'user', content: 'saved message' },
       { role: 'assistant', content: 'saved reply' },
     ]);
-
+    rerender(<App />);
     await time.tick();
     unmount();
 

src/utils/session.test.ts

@@ -52,6 +52,7 @@ describe('session', () => {
     expect(existsSync(getMetadataPath(session.metadata.id))).toBe(true);
     expect(existsSync(getMessagesPath(session.metadata.id))).toBe(true);
     expect(session.metadata.title).toBe('New session');
+    expect(session.metadata.directory).toBe(process.cwd());
     expect(session.messages).toEqual([]);
   });
 
@@ -137,6 +138,25 @@ describe('session', () => {
     ]);
   });
 
+  it('excludes sessions from other directories when listing', async () => {
+    const { createSession, listSessions } = await import('./session');
+    const current = createSession('gemma4');
+    const other = createSession('llama3');
+
+    writeFileSync(
+      getMetadataPath(other.metadata.id),
+      JSON.stringify(
+        { ...other.metadata, directory: '/other/project' },
+        null,
+        2,
+      ) + '\n',
+      'utf8',
+    );
+
+    const sessions = listSessions();
+    expect(sessions.map(({ id }) => id)).toEqual([current.metadata.id]);
+  });
+
   it('updates the stored model without changing updatedAt', async () => {
     const { createSession, loadSession, updateSessionModel } =
       await import('./session');

src/utils/session.ts

@@ -27,6 +27,7 @@ export interface SessionMetadata {
   updatedAt: string;
   title: string;
   model: string;
+  directory: string;
 }
 
 export interface SessionRecord {
@@ -140,6 +141,7 @@ export function createSession(model: string): SessionRecord {
     updatedAt: now,
     title: DEFAULT_TITLE,
     model,
+    directory: process.cwd(),
   };
 
   ensureSessionDirectory(id);
@@ -149,7 +151,7 @@ export function createSession(model: string): SessionRecord {
   return { metadata, messages: [] };
 }
 
-export function listSessions(): SessionMetadata[] {
+export function listSessions(directory = process.cwd()): SessionMetadata[] {
   if (!existsSync(SESSIONS_DIRECTORY)) {
     return [];
   }
@@ -163,6 +165,7 @@ export function listSessions(): SessionMetadata[] {
         return [];
       }
     })
+    .filter((metadata) => metadata.directory === directory)
     .sort((a, b) => b.updatedAt.localeCompare(a.updatedAt));
 }