@productbrain/cli 0.1.0-beta.1919 → 0.1.0-beta.1963

package/dist/__tests__/session-list-show.test.js

@@ -0,0 +1,174 @@
+/**
+ * pb session list / pb session show — command wiring tests (WP-479 E4).
+ *
+ * Verifies:
+ * - list calls agent.listSessions and renders quota gauge (pretty) / passes data through (json)
+ * - show resolves by BOTH arg kinds: a Convex-id-shaped arg goes out as sessionId (with a
+ *   conversationId retry when the server rejects it); a non-id-shaped arg goes straight out
+ *   as conversationId
+ * - json mode emits the structured payload
+ */
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { setOutputMode } from '../lib/runner.js';
+const kernelCallMock = vi.fn();
+vi.mock('../lib/client.js', () => ({
+    kernelCall: (...args) => kernelCallMock(...args),
+    kernelCallWithSession: vi.fn(),
+}));
+vi.mock('../lib/config.js', () => ({
+    getConfigOrGuide: vi.fn(async () => ({ apiKey: 'pb_sk_test', siteUrl: 'https://test.convex.site' })),
+    readLocalProjectConfig: vi.fn(() => null),
+    readProjectConfig: vi.fn(() => null),
+    resolveEffectiveProfile: vi.fn(() => ({ profile: 'p', source: 'local' })),
+    refreshPreviewApiKeyFromDisk: vi.fn(() => 'not-bound'),
+}));
+vi.mock('../lib/profiles.js', () => ({ getActiveProfile: vi.fn(() => 'p') }));
+vi.mock('../lib/session.js', () => ({
+    readSession: vi.fn(() => null),
+    writeSession: vi.fn(),
+    clearSession: vi.fn(),
+    discardSession: vi.fn(),
+    readClosedMarker: vi.fn(() => null),
+    sessionFileExists: vi.fn(() => false),
+    RESUME_WINDOW_MS: 2 * 60 * 60 * 1000,
+}));
+vi.mock('../commands/handshake.js', () => ({ runHandshake: vi.fn(async () => { }) }));
+import { runSessionList, runSessionShow } from '../commands/session.js';
+const LIST_FIXTURE = {
+    active: [
+        {
+            sessionId: 'js7abc123def456ghi789jkl012mno',
+            conversationId: 'conv-a',
+            label: 'session-attribution',
+            clientKind: 'cli',
+            initiatedBy: 'Randy',
+            status: 'active',
+            startedAt: Date.now() - 10 * 60_000,
+            lastToolCallAt: Date.now(),
+            entriesCreatedCount: 2,
+            entriesModifiedCount: 1,
+            purpose: null,
+        },
+    ],
+    recent: [],
+    quota: { activeCount: 1, cap: 50 },
+};
+const SHOW_FIXTURE = {
+    conversationId: 'conv-a',
+    sessions: [
+        {
+            sessionId: 'js7abc123def456ghi789jkl012mno',
+            conversationId: 'conv-a',
+            label: 'session-attribution',
+            clientKind: 'cli',
+            initiatedBy: 'Randy',
+            status: 'active',
+            startedAt: Date.now() - 10 * 60_000,
+            lastToolCallAt: Date.now(),
+            entriesCreatedCount: 1,
+            entriesModifiedCount: 0,
+            purpose: null,
+            entriesCreated: ['e1'],
+            entriesModified: [],
+            relationsCreated: 0,
+            gateFailures: 0,
+            contradictionWarnings: 0,
+        },
+    ],
+    serves: [
+        {
+            servedAt: Date.now() - 60_000,
+            entryId: 'STD-12',
+            surface: 'orient',
+            renderMode: 'brief',
+            task: 'a task',
+            sessionId: 'js7abc123def456ghi789jkl012mno',
+        },
+    ],
+};
+let stdoutOutput;
+let stdoutWriteSpy;
+beforeEach(() => {
+    stdoutOutput = '';
+    stdoutWriteSpy = vi.spyOn(process.stdout, 'write').mockImplementation((chunk) => {
+        stdoutOutput += String(chunk);
+        return true;
+    });
+    vi.clearAllMocks();
+    setOutputMode('auto');
+});
+afterEach(() => {
+    stdoutWriteSpy.mockRestore();
+    setOutputMode('auto');
+});
+describe('runSessionList', () => {
+    it('calls agent.listSessions and renders the quota gauge + collision-free labels in pretty mode', async () => {
+        setOutputMode('pretty');
+        kernelCallMock.mockResolvedValue(LIST_FIXTURE);
+        await runSessionList();
+        expect(kernelCallMock).toHaveBeenCalledWith('agent.listSessions', {});
+        expect(stdoutOutput).toContain('Quota: 1 of 50 active');
+        expect(stdoutOutput).toContain('session-attribution');
+        expect(stdoutOutput).toContain('js7abc123def456ghi789jkl012mno');
+    });
+    it('passes the structured payload through in json mode (full conversationId, quota object)', async () => {
+        setOutputMode('json');
+        kernelCallMock.mockResolvedValue({
+            ...LIST_FIXTURE,
+            active: [{ ...LIST_FIXTURE.active[0], conversationId: 'x'.repeat(64) }],
+        });
+        await runSessionList();
+        const parsed = JSON.parse(stdoutOutput);
+        expect(parsed.quota).toEqual({ activeCount: 1, cap: 50 });
+        // JSON carries the FULL conversationId — truncation is a pretty-mode concern only.
+        expect(parsed.active[0].conversationId).toBe('x'.repeat(64));
+    });
+});
+describe('runSessionShow', () => {
+    it('a Convex-id-shaped arg is sent as sessionId', async () => {
+        setOutputMode('pretty');
+        kernelCallMock.mockResolvedValue(SHOW_FIXTURE);
+        await runSessionShow('js7abc123def456ghi789jkl012mno');
+        expect(kernelCallMock).toHaveBeenCalledWith('agent.showConversation', {
+            sessionId: 'js7abc123def456ghi789jkl012mno',
+        });
+        expect(stdoutOutput).toContain('Conversation: conv-a');
+        expect(stdoutOutput).toContain('1 session(s) in lineage');
+        expect(stdoutOutput).toContain('STD-12');
+    });
+    it('a non-id-shaped arg (e.g. UUID with dashes) goes straight out as conversationId', async () => {
+        setOutputMode('pretty');
+        kernelCallMock.mockResolvedValue(SHOW_FIXTURE);
+        await runSessionShow('3f9a-uuid-with-dashes');
+        expect(kernelCallMock).toHaveBeenCalledTimes(1);
+        expect(kernelCallMock).toHaveBeenCalledWith('agent.showConversation', {
+            conversationId: '3f9a-uuid-with-dashes',
+        });
+    });
+    it('retries an id-shaped arg as conversationId when the sessionId call is rejected', async () => {
+        setOutputMode('pretty');
+        // A conversationId can coincidentally match the Convex id shape — first attempt 400s,
+        // the retry as conversationId succeeds (list-row copyability contract).
+        kernelCallMock
+            .mockRejectedValueOnce(new Error('ArgumentValidationError: not an Id<agentSessions>'))
+            .mockResolvedValueOnce(SHOW_FIXTURE);
+        const idShaped = 'abcdefghijklmnopqrstuvwxyz012345';
+        await runSessionShow(idShaped);
+        expect(kernelCallMock).toHaveBeenNthCalledWith(1, 'agent.showConversation', { sessionId: idShaped });
+        expect(kernelCallMock).toHaveBeenNthCalledWith(2, 'agent.showConversation', { conversationId: idShaped });
+        expect(stdoutOutput).toContain('Conversation: conv-a');
+    });
+    it('emits structured JSON in json mode', async () => {
+        setOutputMode('json');
+        kernelCallMock.mockResolvedValue(SHOW_FIXTURE);
+        await runSessionShow('conv-a');
+        const parsed = JSON.parse(stdoutOutput);
+        expect(parsed.conversationId).toBe('conv-a');
+        expect(parsed.sessions).toHaveLength(1);
+        expect(parsed.serves[0].entryId).toBe('STD-12');
+    });
+    it('rejects an empty argument with guidance', async () => {
+        await expect(runSessionShow('   ')).rejects.toThrow(/session id or conversation id/i);
+    });
+});
+//# sourceMappingURL=session-list-show.test.js.map

package/dist/__tests__/session-list-show.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session-list-show.test.js","sourceRoot":"","sources":["../../src/__tests__/session-list-show.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/session-reset.test.js

@@ -7,12 +7,18 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 const mockReadSession = vi.fn();
 const mockDiscardSession = vi.fn();
+const mockDiscardAllSessions = vi.fn();
 const mockSessionFileExists = vi.fn(() => false);
+const mockHasAnyActive = vi.fn(() => false);
 vi.mock('../lib/session.js', () => ({
     readSession: () => mockReadSession(),
     writeSession: vi.fn(),
     clearSession: vi.fn(),
     discardSession: () => mockDiscardSession(),
+    discardAllSessions: () => mockDiscardAllSessions(),
+    // reset now checks ALL markers (Codex re-review) — mirror sessionFileExists in the mock.
+    hasAnySessionMarker: () => mockSessionFileExists(),
+    hasAnyActiveSession: () => mockHasAnyActive(),
     sessionFileExists: () => mockSessionFileExists(),
     readClosedMarker: vi.fn(() => null),
     addCapturedEntry: vi.fn(),
@@ -41,7 +47,7 @@ describe('runSessionReset', () => {
             await runSessionReset({});
             const out = writeSpy.mock.calls.map((c) => String(c[0])).join('');
             expect(out).toMatch(/Nothing to reset/);
-            expect(mockDiscardSession).not.toHaveBeenCalled();
+            expect(mockDiscardAllSessions).not.toHaveBeenCalled();
         }
         finally {
             writeSpy.mockRestore();
@@ -56,7 +62,7 @@ describe('runSessionReset', () => {
             const out = writeSpy.mock.calls.map((c) => String(c[0])).join('');
             expect(out).toMatch(/Nothing to reset/);
             expect(out).not.toMatch(/PREVIEW_MODE/);
-            expect(mockDiscardSession).not.toHaveBeenCalled();
+            expect(mockDiscardAllSessions).not.toHaveBeenCalled();
         }
         finally {
             writeSpy.mockRestore();
@@ -68,7 +74,7 @@ describe('runSessionReset', () => {
         try {
             await runSessionReset({});
             expect(mockConfirm).not.toHaveBeenCalled();
-            expect(mockDiscardSession).toHaveBeenCalled();
+            expect(mockDiscardAllSessions).toHaveBeenCalled();
         }
         finally {
             writeSpy.mockRestore();
@@ -81,7 +87,7 @@ describe('runSessionReset', () => {
         try {
             await runSessionReset({});
             expect(mockConfirm).toHaveBeenCalled();
-            expect(mockDiscardSession).not.toHaveBeenCalled();
+            expect(mockDiscardAllSessions).not.toHaveBeenCalled();
         }
         finally {
             writeSpy.mockRestore();
@@ -94,7 +100,7 @@ describe('runSessionReset', () => {
         try {
             await runSessionReset({});
             expect(mockConfirm).toHaveBeenCalled();
-            expect(mockDiscardSession).toHaveBeenCalled();
+            expect(mockDiscardAllSessions).toHaveBeenCalled();
         }
         finally {
             writeSpy.mockRestore();
@@ -106,7 +112,7 @@ describe('runSessionReset', () => {
         try {
             await runSessionReset({ force: true });
             expect(mockConfirm).not.toHaveBeenCalled();
-            expect(mockDiscardSession).toHaveBeenCalled();
+            expect(mockDiscardAllSessions).toHaveBeenCalled();
         }
         finally {
             writeSpy.mockRestore();
@@ -116,7 +122,17 @@ describe('runSessionReset', () => {
         mockReadSession.mockReturnValue(ACTIVE);
         mockIsInteractive.mockReturnValue(false);
         await expect(runSessionReset({})).rejects.toThrow(/refusing to reset/);
-        expect(mockDiscardSession).not.toHaveBeenCalled();
+        expect(mockDiscardAllSessions).not.toHaveBeenCalled();
+    });
+    it('refuses when only a SIBLING conversation is active (current is null) — Codex re-review', async () => {
+        // Current conversation resolves to no session, but another conversation's marker is active.
+        mockReadSession.mockReturnValue(null);
+        mockSessionFileExists.mockReturnValue(true);
+        mockHasAnyActive.mockReturnValue(true);
+        mockIsInteractive.mockReturnValue(false);
+        // Must NOT silently delete the sibling active marker — requires confirmation/--force.
+        await expect(runSessionReset({})).rejects.toThrow(/refusing to reset/);
+        expect(mockDiscardAllSessions).not.toHaveBeenCalled();
     });
 });
 //# sourceMappingURL=session-reset.test.js.map

package/dist/__tests__/session-reset.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-reset.test.js","sourceRoot":"","sources":["../../src/__tests__/session-reset.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-reset.test.js","sourceRoot":"","sources":["../../src/__tests__/session-reset.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/session-resume-backstop.test.js

@@ -30,6 +30,8 @@ vi.mock('../lib/session.js', () => ({
     clearSession: vi.fn(),
     sessionFileExists: vi.fn(() => false),
     addCapturedEntry: vi.fn(),
+    // WP-479 E2: commands/session.ts imports the shared 2h resume-window constant from here.
+    RESUME_WINDOW_MS: 2 * 60 * 60 * 1000,
 }));
 vi.mock('../lib/runner.js', () => ({ isJsonMode: () => true }));
 vi.mock('../lib/profiles.js', () => ({ getActiveProfile: () => 'product-brain' }));

package/dist/__tests__/session-resume-backstop.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-resume-backstop.test.js","sourceRoot":"","sources":["../../src/__tests__/session-resume-backstop.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"session-resume-backstop.test.js","sourceRoot":"","sources":["../../src/__tests__/session-resume-backstop.test.ts"],"names":[],"mappings":"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"}

package/dist/__tests__/session-state-machine.test.js

@@ -13,24 +13,48 @@
  *   4. clearSession() on active session writes a closed marker (atomic tmp→rename)
  *   5. clearSession() on an existing marker deletes the file (no timestamp refresh)
  */
-import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 // ---------------------------------------------------------------------------
 // Virtual filesystem state — controlled per test
+//
+// WP-479 E2: extended to also virtualize `.productbrain/sessions/<conversationId>.json` — one
+// entry per conversation marker, keyed by filename (e.g. "conv-a.json"). Legacy `session.json`
+// handling is UNCHANGED (same branches, same behavior) — the sessions-dir branches are additive.
 // ---------------------------------------------------------------------------
-const fsState = { sessionJson: null };
+const fsState = {
+    sessionJson: null,
+    sessionsDir: {},
+};
+function sessionsDirEntryName(p) {
+    return String(p).split('/sessions/')[1].replace(/\.tmp$/, '');
+}
 vi.mock('fs', async (importOriginal) => {
     const actual = await importOriginal();
     return {
         ...actual,
         existsSync: (p) => {
-            if (String(p).endsWith('session.json'))
+            const s = String(p);
+            // Check the conversation-marker directory FIRST — a conversationId could itself end in
+            // "session" (e.g. "b-session"), which must never false-match the legacy branch below.
+            if (s.includes('/sessions/'))
+                return sessionsDirEntryName(s) in fsState.sessionsDir;
+            if (s.endsWith('/sessions'))
+                return true; // the dir itself — always "exists" for the mock
+            if (s.endsWith('session.json'))
                 return fsState.sessionJson !== null;
-            if (String(p).endsWith('session.json.tmp'))
+            if (s.endsWith('session.json.tmp'))
                 return false;
             return actual.existsSync(p);
         },
         readFileSync: (p, enc) => {
-            if (String(p).endsWith('session.json') && enc === 'utf8') {
+            const s = String(p);
+            if (s.includes('/sessions/') && enc === 'utf8') {
+                const name = sessionsDirEntryName(s);
+                if (!(name in fsState.sessionsDir))
+                    throw new Error('ENOENT');
+                return fsState.sessionsDir[name];
+            }
+            if (s.endsWith('session.json') && enc === 'utf8') {
                 if (fsState.sessionJson === null)
                     throw new Error('ENOENT');
                 return fsState.sessionJson;
@@ -38,29 +62,58 @@ vi.mock('fs', async (importOriginal) => {
             return actual.readFileSync(p, enc);
         },
         writeFileSync: (p, data, enc) => {
-            if (String(p).endsWith('session.json') || String(p).endsWith('session.json.tmp')) {
+            const s = String(p);
+            if (s.includes('/sessions/')) {
+                fsState.sessionsDir[sessionsDirEntryName(s)] = String(data);
+                return;
+            }
+            if (s.endsWith('session.json') || s.endsWith('session.json.tmp')) {
                 fsState.sessionJson = String(data);
                 return;
             }
             return actual.writeFileSync(p, data, enc);
         },
         renameSync: (src, dst) => {
-            // tmp → session.json: already written to fsState.sessionJson in writeFileSync above
-            if (String(src).endsWith('session.json.tmp') && String(dst).endsWith('session.json'))
+            // tmp → session.json: already written to fsState.sessionJson / sessionsDir in writeFileSync above
+            if (String(src).endsWith('.tmp'))
                 return;
             return actual.renameSync(src, dst);
         },
         unlinkSync: (p) => {
-            if (String(p).endsWith('session.json')) {
+            const s = String(p);
+            if (s.includes('/sessions/')) {
+                delete fsState.sessionsDir[sessionsDirEntryName(s)];
+                return;
+            }
+            if (s.endsWith('session.json')) {
                 fsState.sessionJson = null;
                 return;
             }
             return actual.unlinkSync(p);
         },
         mkdirSync: vi.fn(), // always succeeds
+        readdirSync: (p) => {
+            if (String(p).endsWith('/sessions'))
+                return Object.keys(fsState.sessionsDir);
+            return actual.readdirSync(p);
+        },
     };
 });
 import { readSession, writeSession, clearSession, readClosedMarker, discardSession, sessionFileExists, } from '../lib/session.js';
+// ---------------------------------------------------------------------------
+// Conversation-identity env helper — WP-479 E2. Real lib/conversation.js is NOT mocked (it is
+// pure env feature-detection), so isolation tests set/restore the relevant env var directly.
+// ---------------------------------------------------------------------------
+const CONV_ENV_KEYS = [
+    'PB_CONVERSATION_ID',
+    'CLAUDE_CODE_SESSION_ID',
+    'CURSOR_CONVERSATION_ID',
+    'CODEX_TUI_SESSION_LOG_PATH',
+];
+const savedConvEnv = {};
+function withConversationId(id) {
+    process.env.PB_CONVERSATION_ID = id;
+}
 const ACTIVE_SESSION = {
     sessionId: 'rd79aaa',
     workspaceId: 'ws-1',
@@ -74,8 +127,25 @@ const CLOSED_MARKER = {
 };
 beforeEach(() => {
     fsState.sessionJson = null;
+    fsState.sessionsDir = {};
+    // Guard every test (existing + new) against ambient identity env vars — e.g. this suite may
+    // itself run inside a Claude Code shell, where CLAUDE_CODE_SESSION_ID is genuinely set. Existing
+    // tests below assume the legacy no-identity path; clearing here makes that assumption hold
+    // regardless of the ambient shell (WP-479 E2 zero-config invariant, defense in depth).
+    for (const key of CONV_ENV_KEYS) {
+        savedConvEnv[key] = process.env[key];
+        delete process.env[key];
+    }
     vi.clearAllMocks();
 });
+afterEach(() => {
+    for (const key of CONV_ENV_KEYS) {
+        if (savedConvEnv[key] === undefined)
+            delete process.env[key];
+        else
+            process.env[key] = savedConvEnv[key];
+    }
+});
 describe('readSession()', () => {
     it('returns null when no file exists', () => {
         expect(readSession()).toBeNull();
@@ -195,4 +265,115 @@ describe('SessionState.profile round-trips', () => {
         expect(readSession()?.profile).toBe('product-brain');
     });
 });
+// ---------------------------------------------------------------------------
+// WP-479 E2 — conversation-aware marker layout
+// ---------------------------------------------------------------------------
+describe('legacy path stays byte-identical when no conversation identity resolves', () => {
+    it('with no env signal, writeSession/readSession target session.json — sessionsDir untouched', () => {
+        writeSession({
+            sessionId: 'legacy-1', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: new Date().toISOString(), entriesCaptured: [],
+        });
+        expect(fsState.sessionJson).not.toBeNull();
+        expect(Object.keys(fsState.sessionsDir)).toHaveLength(0);
+        expect(readSession()?.sessionId).toBe('legacy-1');
+        // The written state stamps conversationId as undefined, not a stray value.
+        expect(readSession()?.conversationId).toBeUndefined();
+    });
+});
+describe('per-conversation marker isolation', () => {
+    it('two distinct conversationIds write to two distinct marker files, no cross-talk', () => {
+        withConversationId('conv-a');
+        writeSession({
+            sessionId: 'sess-a', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: new Date().toISOString(), entriesCaptured: [],
+        });
+        withConversationId('conv-b');
+        writeSession({
+            sessionId: 'sess-b', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: new Date().toISOString(), entriesCaptured: [],
+        });
+        expect(Object.keys(fsState.sessionsDir).sort()).toEqual(['conv-a.json', 'conv-b.json']);
+        expect(fsState.sessionJson).toBeNull(); // legacy path never touched
+        withConversationId('conv-a');
+        expect(readSession()?.sessionId).toBe('sess-a');
+        withConversationId('conv-b');
+        expect(readSession()?.sessionId).toBe('sess-b');
+    });
+    it('stamps the resolved conversationId onto the written state', () => {
+        withConversationId('conv-c');
+        writeSession({
+            sessionId: 'sess-c', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: new Date().toISOString(), entriesCaptured: [],
+        });
+        expect(readSession()?.conversationId).toBe('conv-c');
+    });
+    it('clearSession on one conversation marker does not affect a sibling conversation', () => {
+        withConversationId('conv-x');
+        writeSession({
+            sessionId: 'sess-x', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: new Date().toISOString(), entriesCaptured: [],
+        });
+        withConversationId('conv-y');
+        writeSession({
+            sessionId: 'sess-y', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: new Date().toISOString(), entriesCaptured: [],
+        });
+        withConversationId('conv-x');
+        clearSession(); // closes conv-x only
+        expect(readSession()).toBeNull(); // conv-x now closed
+        withConversationId('conv-y');
+        expect(readSession()?.sessionId).toBe('sess-y'); // conv-y untouched
+    });
+    it('a long/unsafe-charset conversationId env value normalizes to the same hashed filename on every call', () => {
+        process.env.PB_CONVERSATION_ID = '../weird path/with spaces';
+        writeSession({
+            sessionId: 'sess-hashed', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: new Date().toISOString(), entriesCaptured: [],
+        });
+        const files = Object.keys(fsState.sessionsDir);
+        expect(files).toHaveLength(1);
+        // Filename is a safe sha256 hex digest, not the raw unsafe string.
+        expect(files[0]).toMatch(/^[0-9a-f]{64}\.json$/);
+        expect(readSession()?.sessionId).toBe('sess-hashed');
+    });
+});
+describe('GC of expired closed conversation markers', () => {
+    it('deletes a closed marker whose closedAt is older than the 2h resume window', () => {
+        const stale = {
+            sessionId: 'sess-stale', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: '2026-01-01T00:00:00.000Z', entriesCaptured: [],
+            closedAt: new Date(Date.now() - 3 * 60 * 60 * 1000).toISOString(), // 3h ago
+            conversationId: 'conv-stale',
+        };
+        fsState.sessionsDir['conv-stale.json'] = JSON.stringify(stale);
+        // Any call that touches the sessions dir triggers GC.
+        withConversationId('conv-unrelated');
+        readSession();
+        expect(fsState.sessionsDir['conv-stale.json']).toBeUndefined();
+    });
+    it('keeps a closed marker still within the 2h resume window', () => {
+        const recent = {
+            sessionId: 'sess-recent', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: '2026-01-01T00:00:00.000Z', entriesCaptured: [],
+            closedAt: new Date(Date.now() - 30 * 60 * 1000).toISOString(), // 30 min ago
+            conversationId: 'conv-recent',
+        };
+        fsState.sessionsDir['conv-recent.json'] = JSON.stringify(recent);
+        withConversationId('conv-unrelated');
+        readSession();
+        expect(fsState.sessionsDir['conv-recent.json']).toBeDefined();
+    });
+    it('never GCs an ACTIVE (no closedAt) conversation marker regardless of age', () => {
+        const activeOld = {
+            sessionId: 'sess-active-old', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: '2020-01-01T00:00:00.000Z', entriesCaptured: [],
+            conversationId: 'conv-active-old',
+        };
+        fsState.sessionsDir['conv-active-old.json'] = JSON.stringify(activeOld);
+        withConversationId('conv-unrelated');
+        readSession();
+        expect(fsState.sessionsDir['conv-active-old.json']).toBeDefined();
+    });
+});
 //# sourceMappingURL=session-state-machine.test.js.map