feat(session): block resume and error when session directory mismatches cwd

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 }));
@@ -260,6 +262,25 @@ describe('cli', () => {
     expect(renderApp).toHaveBeenCalledWith('session-1');
   });
 
+  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,17 @@ 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 !== 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';