@productbrain/cli 0.1.0-beta.14 → 0.1.0-beta.14010

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

@@ -0,0 +1,341 @@
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+const mockKernelCall = vi.fn();
+vi.mock('../lib/client.js', () => ({
+    kernelCall: (...a) => mockKernelCall(...a),
+    kernelCallWithSession: vi.fn(),
+}));
+const mockGetConfigOrGuide = vi.fn(async () => ({ apiKey: 'pb_sk_test', siteUrl: 'https://test.convex.site' }));
+const mockResolveEffectiveProfile = vi.fn(() => ({ profile: 'p', source: 'local' }));
+const mockReadLocalProjectConfig = vi.fn(() => null);
+vi.mock('../lib/config.js', () => ({
+    getConfigOrGuide: (...a) => mockGetConfigOrGuide(...a),
+    resolveEffectiveProfile: () => mockResolveEffectiveProfile(),
+    readLocalProjectConfig: () => mockReadLocalProjectConfig(),
+    refreshPreviewApiKeyFromDisk: vi.fn(() => 'not-bound'),
+}));
+const mockGetActiveProfile = vi.fn(() => 'global-profile');
+vi.mock('../lib/profiles.js', () => ({ getActiveProfile: () => mockGetActiveProfile() }));
+const mockReadSession = vi.fn();
+const mockWriteSession = vi.fn();
+const mockDiscardSession = vi.fn();
+const mockReadClosedMarker = vi.fn(() => null);
+vi.mock('../lib/session.js', () => ({
+    readSession: () => mockReadSession(),
+    writeSession: (...a) => mockWriteSession(...a),
+    clearSession: vi.fn(),
+    discardSession: () => mockDiscardSession(),
+    readClosedMarker: () => mockReadClosedMarker(),
+    addCapturedEntry: vi.fn(),
+}));
+// session.ts resolves its profile label through the reporting leaf (WP-700). DELEGATE to this
+// file's own resolveEffectiveProfile mock, which each test sets — so every existing case keeps
+// exactly the profile it was written against. sessionBinding.ts (unmocked here) also imports
+// isEnvKeyBinding from this module.
+vi.mock('../lib/reportedProfile.js', () => ({
+    resolveReportedProfile: () => mockResolveEffectiveProfile(),
+    isEnvKeyBinding: () => false,
+}));
+// TEN-3238 leftover: session start now names its target. Mocked so these tests assert WHETHER it
+// fires without pulling the real notice's config cascade through this file's config.js mock.
+const mockEmitWriteTargetNotice = vi.fn(async () => { });
+vi.mock('../lib/workspaceNotice.js', () => ({
+    emitEffectiveTenantNotice: (...a) => mockEmitWriteTargetNotice(...a),
+}));
+import { runSessionStart, runSessionClose } from '../commands/session.js';
+describe('runSessionStart switch-backstop', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockGetConfigOrGuide.mockResolvedValue({ apiKey: 'pb_sk_test', siteUrl: 'https://test.convex.site' });
+        mockReadClosedMarker.mockReturnValue(null);
+        mockReadLocalProjectConfig.mockReturnValue(null);
+        delete process.env.PRODUCTBRAIN_API_KEY;
+        delete process.env.CONVEX_SITE_URL;
+    });
+    it('discards a session whose profile differs from the current effective profile, then starts fresh', async () => {
+        mockReadSession.mockReturnValue({
+            sessionId: 's-old', workspaceId: 'w-old', workspaceName: 'Old',
+            startedAt: '2026-01-01T00:00:00Z', entriesCaptured: [], profile: 'old',
+        });
+        mockResolveEffectiveProfile.mockReturnValue({ profile: 'new', source: 'local' });
+        mockKernelCall.mockImplementation(async (method) => {
+            if (method === 'resolveWorkspace')
+                return { _id: 'w-new', keyId: 'k1' };
+            if (method === 'agent.startSession')
+                return { sessionId: 's-new', workspaceName: 'New', initiatedBy: 'cli', toolsScope: 'rw' };
+            return {};
+        });
+        await runSessionStart({ json: true });
+        expect(mockDiscardSession).toHaveBeenCalled();
+        // WP-479 E2: writeSession's 2nd arg is the (undefined, absent identity) conversationId override.
+        expect(mockWriteSession).toHaveBeenCalledWith(expect.objectContaining({ sessionId: 's-new', profile: 'new' }), undefined);
+    });
+    it('discards a session whose CREDENTIAL was swapped while the profile name held still (TEN-3240)', async () => {
+        // The exact blind spot: a raw exported PRODUCTBRAIN_API_KEY carries no profile name, so
+        // repointing it at another workspace left the name-only backstop reporting alreadyActive.
+        mockResolveEffectiveProfile.mockReturnValue({ profile: 'p', source: 'local' });
+        mockReadSession.mockReturnValue({
+            sessionId: 's-old', workspaceId: 'w-old', workspaceName: 'Old',
+            startedAt: '2026-01-01T00:00:00Z', entriesCaptured: [], profile: 'p',
+            bindingFingerprint: 'deadbeefdeadbeef',
+        });
+        process.env.PRODUCTBRAIN_API_KEY = 'pb_sk_a_different_workspaces_key';
+        mockKernelCall.mockImplementation(async (method) => {
+            if (method === 'resolveWorkspace')
+                return { _id: 'w-new', keyId: 'k1' };
+            if (method === 'agent.startSession')
+                return { sessionId: 's-new', workspaceName: 'New', initiatedBy: 'cli', toolsScope: 'rw' };
+            return {};
+        });
+        await runSessionStart({ json: true });
+        expect(mockDiscardSession).toHaveBeenCalled();
+        expect(mockWriteSession).toHaveBeenCalledWith(expect.objectContaining({ sessionId: 's-new', bindingFingerprint: expect.any(String) }), undefined);
+    });
+    it('keeps a session already active when the same credential is still bound', async () => {
+        process.env.PRODUCTBRAIN_API_KEY = 'pb_sk_unchanged_key';
+        process.env.CONVEX_SITE_URL = 'https://test.convex.site';
+        mockResolveEffectiveProfile.mockReturnValue({ profile: 'p', source: 'local' });
+        // Start once to learn the fingerprint this binding produces, rather than hardcoding a digest.
+        mockReadSession.mockReturnValue(null);
+        mockKernelCall.mockImplementation(async (method) => {
+            if (method === 'resolveWorkspace')
+                return { _id: 'w1', keyId: 'k1' };
+            if (method === 'agent.startSession')
+                return { sessionId: 's1', workspaceName: 'WS', initiatedBy: 'cli', toolsScope: 'rw' };
+            return {};
+        });
+        await runSessionStart({ json: true });
+        const written = mockWriteSession.mock.calls.at(-1)?.[0];
+        expect(written.bindingFingerprint).toEqual(expect.any(String));
+        vi.clearAllMocks();
+        mockReadClosedMarker.mockReturnValue(null);
+        mockReadSession.mockReturnValue({
+            sessionId: 's1', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: '2026-01-01T00:00:00Z', entriesCaptured: [], profile: 'p',
+            bindingFingerprint: written.bindingFingerprint,
+        });
+        await runSessionStart({ json: true });
+        expect(mockDiscardSession).not.toHaveBeenCalled();
+        // WP-777: the kept marker is rewritten only to take the server's workspace name; it is the same session.
+        expect(mockWriteSession).toHaveBeenCalledWith(expect.objectContaining({ sessionId: 's1', startedAt: '2026-01-01T00:00:00Z' }), undefined);
+    });
+    it('restarts a pre-fingerprint session ONCE on upgrade (Codex P1 r13, fail-closed)', async () => {
+        // A marker written before `bindingFingerprint` existed cannot be compared on the credential,
+        // and a matching profile name is not proof (`pb connect` can overwrite a profile in place).
+        // So it restarts once, then carries a fingerprint and never trips this again.
+        process.env.PRODUCTBRAIN_API_KEY = 'pb_sk_whatever';
+        mockResolveEffectiveProfile.mockReturnValue({ profile: 'p', source: 'local' });
+        mockReadSession.mockReturnValue({
+            sessionId: 's-old', workspaceId: 'w-old', workspaceName: 'Old',
+            startedAt: '2026-01-01T00:00:00Z', entriesCaptured: [], profile: 'p',
+            // no bindingFingerprint — written before this field existed
+        });
+        mockKernelCall.mockImplementation(async (method) => {
+            if (method === 'resolveWorkspace')
+                return { _id: 'w-new', keyId: 'k1' };
+            if (method === 'agent.startSession')
+                return { sessionId: 's-new', workspaceName: 'New', initiatedBy: 'cli', toolsScope: 'rw' };
+            return {};
+        });
+        await runSessionStart({ json: true });
+        expect(mockDiscardSession).toHaveBeenCalled();
+        expect(mockWriteSession).toHaveBeenCalledWith(expect.objectContaining({ bindingFingerprint: expect.any(String) }), undefined);
+    });
+    it('names its target workspace on the fresh start path, but not on the already-active one (WP-696)', async () => {
+        mockResolveEffectiveProfile.mockReturnValue({ profile: 'p', source: 'local' });
+        mockReadSession.mockReturnValue({
+            sessionId: 's1', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: '2026-01-01T00:00:00Z', entriesCaptured: [], profile: 'p',
+        });
+        mockKernelCall.mockImplementation(async (method) => {
+            if (method === 'resolveWorkspace')
+                return { _id: 'w1', keyId: 'k1' };
+            if (method === 'agent.startSession')
+                return { sessionId: 's1', workspaceName: 'WS', initiatedBy: 'cli', toolsScope: 'rw' };
+            return {};
+        });
+        await runSessionStart({ json: true });
+        expect(mockEmitWriteTargetNotice).not.toHaveBeenCalled();
+        vi.clearAllMocks();
+        mockReadClosedMarker.mockReturnValue(null);
+        mockReadSession.mockReturnValue(null);
+        mockKernelCall.mockImplementation(async (method) => {
+            if (method === 'resolveWorkspace')
+                return { _id: 'w1', keyId: 'k1' };
+            if (method === 'agent.startSession')
+                return { sessionId: 's1', workspaceName: 'WS', initiatedBy: 'cli', toolsScope: 'rw' };
+            return {};
+        });
+        await runSessionStart({ json: true });
+        expect(mockEmitWriteTargetNotice).toHaveBeenCalled();
+    });
+    it('reports the effective repo profile on the fresh JSON session path', async () => {
+        mockReadSession.mockReturnValue(null);
+        mockResolveEffectiveProfile.mockReturnValue({ profile: 'repo-profile', source: 'local' });
+        mockGetActiveProfile.mockReturnValue('global-profile');
+        mockKernelCall.mockImplementation(async (method) => {
+            if (method === 'resolveWorkspace')
+                return { _id: 'w-repo', keyId: 'k1' };
+            if (method === 'agent.startSession') {
+                return { sessionId: 's-new', workspaceName: 'Repo workspace', initiatedBy: 'cli', toolsScope: 'rw' };
+            }
+            return {};
+        });
+        const writeSpy = vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
+        try {
+            await runSessionStart({ json: true });
+            const output = writeSpy.mock.calls.map((call) => String(call[0])).join('');
+            expect(JSON.parse(output)).toMatchObject({
+                sessionId: 's-new',
+                workspaceName: 'Repo workspace',
+                activeProfile: 'repo-profile',
+            });
+            expect(mockGetActiveProfile).not.toHaveBeenCalled();
+        }
+        finally {
+            writeSpy.mockRestore();
+        }
+    });
+    it('discards and starts fresh on a profile switch in pretty (non-json) mode too', async () => {
+        mockReadSession.mockReturnValue({
+            sessionId: 's-old', workspaceId: 'w-old', workspaceName: 'Old',
+            startedAt: '2026-01-01T00:00:00Z', entriesCaptured: [], profile: 'old',
+        });
+        mockResolveEffectiveProfile.mockReturnValue({ profile: 'new', source: 'local' });
+        mockKernelCall.mockImplementation(async (method) => {
+            if (method === 'resolveWorkspace')
+                return { _id: 'w-new', keyId: 'k1' };
+            if (method === 'agent.startSession')
+                return { sessionId: 's-new', workspaceName: 'New', initiatedBy: 'cli', toolsScope: 'rw' };
+            return {};
+        });
+        const writeSpy = vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
+        try {
+            await runSessionStart({}); // no json → pretty mode
+            expect(mockDiscardSession).toHaveBeenCalled();
+            expect(mockKernelCall).toHaveBeenCalledWith('agent.startSession', expect.anything());
+            // WP-479 E2: writeSession's 2nd arg is the (undefined, absent identity) conversationId override.
+            expect(mockWriteSession).toHaveBeenCalledWith(expect.objectContaining({ sessionId: 's-new', profile: 'new' }), undefined);
+        }
+        finally {
+            writeSpy.mockRestore();
+        }
+    });
+    it('preserves alreadyActive for a legacy session with no profile field (no discard)', async () => {
+        mockReadSession.mockReturnValue({
+            sessionId: 's1', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: '2026-01-01T00:00:00Z', entriesCaptured: [], // NOTE: no `profile`
+        });
+        mockResolveEffectiveProfile.mockReturnValue({ profile: 'new', source: 'local' });
+        mockKernelCall.mockImplementation(liveSessionKernel('s1'));
+        const writeSpy = vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
+        try {
+            await runSessionStart({ json: true });
+            const out = writeSpy.mock.calls.map((c) => String(c[0])).join('');
+            expect(out).toMatch(/alreadyActive/);
+            expect(mockDiscardSession).not.toHaveBeenCalled();
+        }
+        finally {
+            writeSpy.mockRestore();
+        }
+    });
+    it('keeps alreadyActive when the effective profile is unchanged', async () => {
+        mockReadSession.mockReturnValue({
+            sessionId: 's1', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: '2026-01-01T00:00:00Z', entriesCaptured: [], profile: 'same',
+        });
+        mockResolveEffectiveProfile.mockReturnValue({ profile: 'same', source: 'local' });
+        mockKernelCall.mockImplementation(liveSessionKernel('s1'));
+        const writeSpy = vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
+        try {
+            await runSessionStart({ json: true });
+            const out = writeSpy.mock.calls.map((c) => String(c[0])).join('');
+            expect(out).toMatch(/alreadyActive/);
+            expect(mockDiscardSession).not.toHaveBeenCalled();
+        }
+        finally {
+            writeSpy.mockRestore();
+        }
+    });
+    // WP-777, DEC-1888, INS-2674: an agent re-running session start after a compaction gets the
+    // briefing the server serves on its reuse branch, in JSON and in text.
+    it('serves the full briefing on an already-active start, keeping the local marker', async () => {
+        mockReadSession.mockReturnValue({
+            sessionId: 's1', workspaceId: 'w1', workspaceName: 'Old name',
+            startedAt: '2026-01-01T00:00:00Z', entriesCaptured: ['DEC-1'], profile: 'same',
+        });
+        mockResolveEffectiveProfile.mockReturnValue({ profile: 'same', source: 'local' });
+        mockKernelCall.mockImplementation(liveSessionKernel('s1'));
+        const writeSpy = vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
+        try {
+            await runSessionStart({ json: true });
+            const json = JSON.parse(writeSpy.mock.calls.map((c) => String(c[0])).join(''));
+            expect(json).toMatchObject({ sessionId: 's1', alreadyActive: true, startedAt: '2026-01-01T00:00:00Z', workspaceName: 'WS', roleName: 'Team Lead', briefing: { purpose: 'One truth.' } });
+            expect(json.ruleLists.everyone.rows[0].entryId).toBe('RULE-3');
+            expect(mockKernelCall).toHaveBeenCalledWith('agent.startSession', expect.anything());
+            // The captures and start time stand; the renamed workspace's name comes from the server.
+            expect(mockWriteSession).toHaveBeenCalledWith(expect.objectContaining({ sessionId: 's1', workspaceName: 'WS', entriesCaptured: ['DEC-1'], startedAt: '2026-01-01T00:00:00Z' }), undefined);
+            writeSpy.mockClear();
+            await runSessionStart({});
+            const text = writeSpy.mock.calls.map((c) => String(c[0])).join('');
+            expect(text).toContain('Session already active: s1');
+            expect(text).toContain('Entries captured: 1');
+            expect(text).toContain('RULE-3: Every write names its owner'); // TASK-763: one line per rule, title only
+            expect(text).not.toContain('Starting session...');
+        }
+        finally {
+            writeSpy.mockRestore();
+        }
+    });
+    it('replaces the marker and names the ended session when the server had already ended it', async () => {
+        mockReadSession.mockReturnValue({
+            sessionId: 's-gone', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: '2026-01-01T00:00:00Z', entriesCaptured: [], profile: 'same',
+        });
+        mockResolveEffectiveProfile.mockReturnValue({ profile: 'same', source: 'local' });
+        mockKernelCall.mockImplementation(liveSessionKernel('s-new'));
+        const writeSpy = vi.spyOn(process.stdout, 'write').mockImplementation(() => true);
+        try {
+            await runSessionStart({ json: true });
+            const json = JSON.parse(writeSpy.mock.calls.map((c) => String(c[0])).join(''));
+            expect(json).toMatchObject({ sessionId: 's-new', endedSessionId: 's-gone' });
+            expect(json.alreadyActive).toBeUndefined();
+            expect(mockWriteSession).toHaveBeenCalledWith(expect.objectContaining({ sessionId: 's-new' }), undefined);
+        }
+        finally {
+            writeSpy.mockRestore();
+        }
+    });
+});
+/** The server's start response for a live (or newly minted) session, briefing included. */
+function liveSessionKernel(sessionId) {
+    return async (method) => {
+        if (method === 'resolveWorkspace')
+            return { _id: 'w1', keyId: 'k1' };
+        if (method === 'agent.startSession') {
+            return {
+                sessionId, workspaceName: 'WS', initiatedBy: 'cli', toolsScope: 'rw', roleEntryId: 'ROL-23', roleName: 'Team Lead',
+                briefing: { purpose: 'One truth.' },
+                ruleLists: {
+                    everyone: { rows: [{ entryId: 'RULE-3', bucket: 'everyone', ownerRoleId: 'ROL-23', ownerRoleName: 'Team Lead', name: 'Every write names its owner' }], overCap: 0 },
+                    team: null, role: { rows: [], overCap: 0 }, unassigned: 0, truncated: false,
+                },
+            };
+        }
+        return {};
+    };
+}
+describe('runSessionClose --force hint', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        mockGetConfigOrGuide.mockResolvedValue({ apiKey: 'pb_sk_test', siteUrl: 'https://test.convex.site' });
+        mockReadSession.mockReturnValue({
+            sessionId: 's1', workspaceId: 'w1', workspaceName: 'WS',
+            startedAt: '2026-01-01T00:00:00Z', entriesCaptured: [],
+        });
+    });
+    it('puts the --force instruction in the error message itself', async () => {
+        mockKernelCall.mockImplementation((fn) => fn === 'agent.getSessionWrapup' ? Promise.resolve({ committed: [], drafts: [], canClose: true }) : Promise.reject(new Error('Internal server error')));
+        await expect(runSessionClose({})).rejects.toThrow(/pb session close --force/);
+    });
+});
+//# sourceMappingURL=session-switch.test.js.map

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

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

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

@@ -1,16 +1,11 @@
 /**
- * session-touch — verify mcpCallWithSession auto-renews the session TTL.
- * BET-181 Slice 1: Session Auto-Renew on Write.
- *
- * Done-when criteria tested:
- * 1. After a successful mcpCallWithSession, agent.touchSession is called with the current session ID
- * 2. Touch happens in exactly ONE place (mcpCallWithSession) — not per-command
- * 3. Touch is fire-and-forget (does not block the write response)
- * 4. When no session is active (session.json absent), no touch is attempted
- * 5. When mcpCallWithSession fails (write error), touch is NOT called
+ * session-touch: kernelCallWithSession renews the session TTL (BET-181 Slice 1).
+ * TASK-894 (DEC-2113): the write itself carries `x-pb-session` and the gateway touches the session,
+ * so a write is one request. The header is set in the one fetch function, under the same condition
+ * as the old post-write touch: an ambient session, not opted out, outside the 5 s throttle (TEN-2923).
+ * Reads (kernelCall) never carry it (orient.ts avoids a touch on purpose), except a read-back marked recall (TASK-911).
  */
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-// We need to control what readSession() returns per test.
 let mockSession = null;
 vi.mock('../lib/session.js', () => ({
     readSession: () => mockSession,
@@ -18,117 +13,101 @@ vi.mock('../lib/session.js', () => ({
 vi.mock('../lib/config.js', () => ({
     getConfig: vi.fn(() => ({ apiKey: 'pb_sk_test', siteUrl: 'https://test.convex.site' })),
 }));
-// Import the module under test AFTER setting up mocks.
-import { mcpCallWithSession } from '../lib/client.js';
-// Helper: build a fetch mock that returns different responses based on `fn`.
-function makeFetch({ writeOk = true, writeData = { ok: true }, } = {}) {
-    return vi.fn(async (_input, init) => {
-        const body = JSON.parse(String(init?.body ?? '{}'));
-        if (body.fn === 'agent.touchSession') {
-            return {
-                ok: true,
-                json: async () => ({ data: {} }),
-            };
-        }
-        // Default: the write call
-        return {
-            ok: writeOk,
-            statusText: writeOk ? 'OK' : 'Internal Server Error',
-            json: async () => (writeOk ? { data: writeData } : { error: 'Server error' }),
-        };
-    });
+import { kernelCall, kernelCallWithSession, resetTouchThrottle } from '../lib/client.js';
+function makeFetch(writeOk = true) {
+    return vi.fn(async () => ({
+        ok: writeOk,
+        statusText: writeOk ? 'OK' : 'Internal Server Error',
+        json: async () => (writeOk ? { data: { entryId: 'BET-181' } } : { error: 'Server error' }),
+    }));
 }
-async function flushMicrotasks() {
-    // Two rounds of microtask flushing to allow the fire-and-forget .catch chain to settle.
-    await Promise.resolve();
-    await Promise.resolve();
+/** Each request's function name and the session its header named, if any. */
+function sent() {
+    return global.fetch.mock.calls.map(([, init]) => ({
+        fn: JSON.parse(String(init?.body ?? '{}')).fn,
+        session: (init?.headers)['x-pb-session'],
+    }));
 }
-describe('mcpCallWithSession — session touch on write', () => {
+describe('kernelCallWithSession: the session touch rides the write', () => {
     beforeEach(() => {
         vi.clearAllMocks();
-        mockSession = {
-            sessionId: 'sess-abc123',
-            workspaceId: 'ws-1',
-            workspaceName: 'Product Brain',
-            startedAt: '2026-03-23T12:00:00Z',
-            entriesCaptured: [],
-        };
+        resetTouchThrottle(); // WP-579: touches are throttled per session, so each test starts with a clear window
+        mockSession = { sessionId: 'sess-abc123' };
     });
     afterEach(() => {
         vi.restoreAllMocks();
     });
-    it('calls agent.touchSession with the current session ID after a successful write', async () => {
-        global.fetch = makeFetch({ writeOk: true, writeData: { entryId: 'BET-181' } });
-        await mcpCallWithSession('chain.updateEntry', { entryId: 'BET-181', name: 'New name' });
-        await flushMicrotasks();
-        const calls = global.fetch.mock.calls;
-        // Expect exactly 2 fetch calls: the write + the touch
-        expect(calls).toHaveLength(2);
-        // First call: the actual write
-        const writeBody = JSON.parse(String(calls[0][1]?.body ?? '{}'));
-        expect(writeBody.fn).toBe('chain.updateEntry');
-        // Second call: the touch
-        const touchBody = JSON.parse(String(calls[1][1]?.body ?? '{}'));
-        expect(touchBody.fn).toBe('agent.touchSession');
-        expect(touchBody.args.sessionId).toBe('sess-abc123');
+    it('a write is one request carrying x-pb-session, never a second agent.touchSession request', async () => {
+        global.fetch = makeFetch();
+        await expect(kernelCallWithSession('chain.updateEntry', { entryId: 'BET-181' })).resolves.toEqual({ entryId: 'BET-181' });
+        expect(sent()).toEqual([{ fn: 'chain.updateEntry', session: 'sess-abc123' }]);
     });
-    it('does NOT call agent.touchSession when no session is active', async () => {
+    it('no session, no header', async () => {
         mockSession = null;
-        global.fetch = makeFetch({ writeOk: true });
-        await mcpCallWithSession('chain.updateEntry', { entryId: 'BET-100' });
-        await flushMicrotasks();
-        const calls = global.fetch.mock.calls;
-        // Only the write call — no touch
-        expect(calls).toHaveLength(1);
-        const body = JSON.parse(String(calls[0][1]?.body ?? '{}'));
-        expect(body.fn).toBe('chain.updateEntry');
+        global.fetch = makeFetch();
+        await kernelCallWithSession('chain.updateEntry', { entryId: 'BET-100' });
+        expect(sent()).toEqual([{ fn: 'chain.updateEntry', session: undefined }]);
+    });
+    it('a second write inside the 5 s window carries no header; another session has its own window', async () => {
+        global.fetch = makeFetch();
+        await kernelCallWithSession('chain.updateEntry', { entryId: 'BET-1' });
+        await kernelCallWithSession('chain.updateEntry', { entryId: 'BET-2' });
+        mockSession = { sessionId: 'sess-other' };
+        await kernelCallWithSession('chain.updateEntry', { entryId: 'BET-3' });
+        expect(sent().map((r) => r.session)).toEqual(['sess-abc123', undefined, 'sess-other']);
     });
-    it('does NOT call agent.touchSession when the write fails', async () => {
-        global.fetch = makeFetch({ writeOk: false });
-        await expect(mcpCallWithSession('chain.updateEntry', { entryId: 'BET-100' })).rejects.toThrow('Server error');
-        await flushMicrotasks();
-        const calls = global.fetch.mock.calls;
-        // Only the write call — no touch because write threw
-        expect(calls).toHaveLength(1);
-        const body = JSON.parse(String(calls[0][1]?.body ?? '{}'));
-        expect(body.fn).toBe('chain.updateEntry');
+    it('skipSessionTouch opts a --dry-run-style caller out (WP-688 S2a)', async () => {
+        global.fetch = makeFetch();
+        await kernelCallWithSession('chain.createEntryRelation', { preview: true }, { skipSessionTouch: true });
+        expect(sent()).toEqual([{ fn: 'chain.createEntryRelation', session: undefined }]);
     });
-    it('touch errors are silently swallowed — write result is returned regardless', async () => {
-        // Touch call throws a network error
-        global.fetch = vi.fn(async (_input, init) => {
-            const body = JSON.parse(String(init?.body ?? '{}'));
-            if (body.fn === 'agent.touchSession') {
-                throw new Error('Network error');
-            }
-            return {
-                ok: true,
-                json: async () => ({ data: { entryId: 'BET-181' } }),
-            };
-        });
-        // Should resolve successfully despite touch throwing
-        const result = await mcpCallWithSession('chain.updateEntry', { entryId: 'BET-181' });
-        await flushMicrotasks();
-        expect(result).toEqual({ entryId: 'BET-181' });
+    it('every request names the session for its call log row, outside the touch window and on reads too', async () => {
+        global.fetch = makeFetch();
+        await kernelCallWithSession('chain.updateEntry', { entryId: 'BET-1' });
+        await kernelCallWithSession('chain.updateEntry', { entryId: 'BET-2' });
+        await kernelCall('chain.getEntry', { entryId: 'BET-181' });
+        mockSession = null;
+        await kernelCall('chain.getEntry', { entryId: 'BET-181' });
+        const acting = global.fetch.mock.calls.map(([, init]) => init.headers['x-pb-acting-session']);
+        expect(acting).toEqual(['sess-abc123', 'sess-abc123', 'sess-abc123', undefined]);
+    });
+    it('a call made before its marker is written names the session it was given, over the marker on disk', async () => {
+        global.fetch = makeFetch();
+        mockSession = { sessionId: 'sess-ended' };
+        await kernelCall('usage.getWorkspaceSummary', { periodDays: 1 }, { actingSessionId: 'sess-new' });
+        mockSession = null;
+        await kernelCall('usage.getWorkspaceSummary', { periodDays: 1 }, { actingSessionId: 'sess-new' });
+        const acting = global.fetch.mock.calls.map(([, init]) => init.headers['x-pb-acting-session']);
+        expect(acting).toEqual(['sess-new', 'sess-new']);
+    });
+    it('a read carries the header once per throttle window, so read-only work keeps the seat live', async () => {
+        global.fetch = makeFetch();
+        await kernelCall('chain.getEntry', { entryId: 'BET-181' });
+        await kernelCall('chain.search', { query: 'seat' });
+        expect(sent()).toEqual([{ fn: 'chain.getEntry', session: 'sess-abc123' }, { fn: 'chain.search', session: undefined }]);
+    });
+    it('the start\'s own routes carry no header', async () => {
+        global.fetch = makeFetch();
+        for (const fn of ['agent.startSession', 'agent.resumeSession', 'agent.sessionStartNotes', 'agent.sessionStartStamp'])
+            await kernelCall(fn, {});
+        expect(sent().map((r) => r.session)).toEqual([undefined, undefined, undefined, undefined]);
+    });
+    it('TASK-911: a read-back always names the session and marks recall, inside the throttle window too; a plain read does neither', async () => {
+        global.fetch = makeFetch();
+        await kernelCallWithSession('chain.updateEntry', { entryId: 'BET-1' }); // takes the 5 s window
+        await kernelCall('chain.getEntry', { entryId: 'BET-181' }, { recall: true });
+        await kernelCall('chain.getEntry', { entryId: 'BET-181' });
+        const bodies = global.fetch.mock.calls.map(([, init]) => JSON.parse(String(init.body)));
+        expect(sent().map((r) => r.session)).toEqual(['sess-abc123', 'sess-abc123', undefined]); // the plain read sits inside the write's window
+        expect(bodies.map((b) => b.recall)).toEqual([undefined, true, undefined]);
+        mockSession = null;
+        await kernelCall('chain.getEntry', { entryId: 'BET-181' }, { recall: true });
+        expect(sent()[3].session).toBeUndefined(); // no session, nothing to name
     });
-    it('touch is non-blocking — write resolves before touch completes', async () => {
-        const order = [];
-        global.fetch = vi.fn(async (_input, init) => {
-            const body = JSON.parse(String(init?.body ?? '{}'));
-            if (body.fn === 'agent.touchSession') {
-                // Simulate a slow touch
-                await new Promise((resolve) => setTimeout(resolve, 10));
-                order.push('touch-complete');
-                return { ok: true, json: async () => ({ data: {} }) };
-            }
-            order.push('write-complete');
-            return { ok: true, json: async () => ({ data: { entryId: 'BET-181' } }) };
-        });
-        await mcpCallWithSession('chain.updateEntry', { entryId: 'BET-181' });
-        // Write has resolved — touch has NOT yet completed (it's still pending)
-        expect(order).toEqual(['write-complete']);
-        // After waiting for the touch to finish
-        await new Promise((resolve) => setTimeout(resolve, 20));
-        expect(order).toEqual(['write-complete', 'touch-complete']);
+    it('a failed write still throws its own error, one request', async () => {
+        global.fetch = makeFetch(false);
+        await expect(kernelCallWithSession('chain.updateEntry', { entryId: 'BET-100' })).rejects.toThrow('Server error');
+        expect(sent()).toHaveLength(1);
     });
 });
 //# sourceMappingURL=session-touch.test.js.map