@robota-sdk/agent-transport 3.0.0-beta.81 → 3.0.0-beta.83

package/src/__tests__/session-history-wire.test.ts

@@ -0,0 +1,342 @@
+/**
+ * #3189: what a client that renders the whole session (the TUI) needs over the wire, beside the
+ * streamed turn — the full history, the context window as it changes, a signal that the history
+ * changed, and where each turn came from.
+ */
+
+import { createTestInteractiveSession } from '@robota-sdk/agent-interface-session/testing';
+import { describe, expect, it, vi } from 'vitest';
+
+import { createOutboundDelivery } from '../outbound-delivery.js';
+import { createSessionMessageHandler } from '../session-message-handler.js';
+import { HISTORY_PAGE_MAX_BYTES } from '../session-query-messages.js';
+
+import type { IWireHistoryEntry, TClientMessage, TServerMessage } from '../wire-messages.js';
+import type { IHistoryEntry } from '@robota-sdk/agent-core';
+import type { IInteractiveSession } from '@robota-sdk/agent-interface-session';
+
+type TListener = (...args: unknown[]) => void;
+type TEmittingSession = IInteractiveSession & { emit: (event: string, payload?: unknown) => void };
+
+const RECORDED_AT = new Date('2026-09-26T01:02:03.004Z');
+
+function createSession(overrides: Partial<IInteractiveSession> = {}): TEmittingSession {
+  const listeners = new Map<string, Set<TListener>>();
+  const session = createTestInteractiveSession({
+    on: ((event: string, handler: TListener) => {
+      if (!listeners.has(event)) listeners.set(event, new Set());
+      listeners.get(event)!.add(handler);
+    }) as IInteractiveSession['on'],
+    off: ((event: string, handler: TListener) => {
+      listeners.get(event)?.delete(handler);
+    }) as IInteractiveSession['off'],
+    ...overrides,
+  });
+  return Object.assign(session, {
+    emit: (event: string, payload?: unknown) => {
+      listeners.get(event)?.forEach((handler) => handler(payload));
+    },
+  });
+}
+
+function attach(
+  session: IInteractiveSession,
+  role: 'drive' | 'observe' = 'drive',
+): { sent: TServerMessage[]; send: (message: TClientMessage) => void; leave: () => void } {
+  const sent: TServerMessage[] = [];
+  const { onMessage, cleanup } = createSessionMessageHandler({
+    session,
+    role,
+    deliver: createOutboundDelivery((message) => sent.push(message), vi.fn()),
+  });
+  return { sent, send: (message) => onMessage(JSON.stringify(message)), leave: cleanup };
+}
+
+type THistoryFrame = Extract<TServerMessage, { type: 'history' }>;
+
+function lastHistory(sent: readonly TServerMessage[]): THistoryFrame {
+  const frame = sent.at(-1);
+  if (frame?.type !== 'history') throw new Error(`expected a history frame, got ${frame?.type}`);
+  return frame;
+}
+
+/** Entries of about `bytes` serialized bytes each. */
+function historyOf(count: number, bytes: number): IHistoryEntry[] {
+  return Array.from({ length: count }, (_, index) => ({
+    id: `e${index}`,
+    timestamp: RECORDED_AT,
+    category: 'chat',
+    type: 'assistant',
+    data: { role: 'assistant', content: 'x'.repeat(bytes) },
+  }));
+}
+
+/** Read the whole history the way a client does: the next page only after the previous one. */
+function readAll(client: ReturnType<typeof attach>): {
+  pages: THistoryFrame[];
+  entries: IWireHistoryEntry[];
+} {
+  const pages: THistoryFrame[] = [];
+  const entries: IWireHistoryEntry[] = [];
+  client.send({ type: 'get-history' });
+  for (;;) {
+    const page = lastHistory(client.sent);
+    pages.push(page);
+    entries.push(...page.entries);
+    const next = page.startIndex + page.entries.length;
+    if (next >= page.total) return { pages, entries };
+    client.send({ type: 'get-history', fromIndex: next });
+  }
+}
+
+describe('get-history (#3189)', () => {
+  it('answers with the full history, each timestamp an ISO 8601 string', () => {
+    const session = createSession({
+      getFullHistory: () => [
+        {
+          id: 'm1',
+          timestamp: RECORDED_AT,
+          category: 'chat',
+          type: 'user',
+          data: { role: 'user', content: 'hi' },
+        },
+        { id: 'e1', timestamp: RECORDED_AT, category: 'event', type: 'skill-activation' },
+      ],
+    });
+    const client = attach(session);
+
+    client.send({ type: 'get-history' });
+
+    expect(client.sent).toEqual([
+      {
+        type: 'history',
+        startIndex: 0,
+        total: 2,
+        entries: [
+          {
+            id: 'm1',
+            timestamp: '2026-09-26T01:02:03.004Z',
+            category: 'chat',
+            type: 'user',
+            data: { role: 'user', content: 'hi' },
+          },
+          {
+            id: 'e1',
+            timestamp: '2026-09-26T01:02:03.004Z',
+            category: 'event',
+            type: 'skill-activation',
+          },
+        ],
+      },
+    ]);
+  });
+
+  it('carries a resumed entry, whose timestamp came back from JSON as a string, unchanged', () => {
+    const resumed = JSON.parse(
+      JSON.stringify([{ id: 'm1', timestamp: RECORDED_AT, category: 'chat', type: 'user' }]),
+    ) as ReturnType<IInteractiveSession['getFullHistory']>;
+    const client = attach(createSession({ getFullHistory: () => resumed }));
+
+    client.send({ type: 'get-history' });
+
+    expect(client.sent).toEqual([
+      {
+        type: 'history',
+        startIndex: 0,
+        total: 1,
+        entries: [
+          { id: 'm1', timestamp: '2026-09-26T01:02:03.004Z', category: 'chat', type: 'user' },
+        ],
+      },
+    ]);
+  });
+
+  it('is a read, so an observer may send it', () => {
+    const session = createSession({
+      getFullHistory: () => [{ id: 'm1', timestamp: RECORDED_AT, category: 'chat', type: 'user' }],
+    });
+    const observer = attach(session, 'observe');
+
+    observer.send({ type: 'get-history' });
+
+    expect(observer.sent).toEqual([
+      {
+        type: 'history',
+        startIndex: 0,
+        total: 1,
+        entries: [
+          { id: 'm1', timestamp: '2026-09-26T01:02:03.004Z', category: 'chat', type: 'user' },
+        ],
+      },
+    ]);
+  });
+
+  it('sends a long history in pages under the page budget, which read back to the whole of it', () => {
+    const history = historyOf(40, 20_000);
+    const client = attach(createSession({ getFullHistory: () => history }));
+
+    const { pages, entries } = readAll(client);
+
+    expect(pages.length).toBeGreaterThan(1);
+    for (const page of pages) {
+      expect(new TextEncoder().encode(JSON.stringify(page.entries)).byteLength).toBeLessThanOrEqual(
+        HISTORY_PAGE_MAX_BYTES,
+      );
+      expect(page.total).toBe(40);
+    }
+    expect(entries.map((entry) => entry.id)).toEqual(history.map((entry) => entry.id));
+  });
+
+  it('sends an entry larger than the page budget alone, so a reader still moves forward', () => {
+    const history = [...historyOf(1, 10), ...historyOf(1, HISTORY_PAGE_MAX_BYTES + 1)];
+    history[1] = { ...history[1]!, id: 'big' };
+    const client = attach(createSession({ getFullHistory: () => history }));
+
+    const { pages } = readAll(client);
+
+    expect(pages.map((page) => page.entries.map((entry) => entry.id))).toEqual([['e0'], ['big']]);
+  });
+
+  it('answers from the index asked, and says where the history ends when that is past it', () => {
+    const history = historyOf(3, 10);
+    const client = attach(createSession({ getFullHistory: () => history }));
+
+    client.send({ type: 'get-history', fromIndex: 2 });
+    expect(lastHistory(client.sent)).toMatchObject({ startIndex: 2, total: 3 });
+    expect(lastHistory(client.sent).entries.map((entry) => entry.id)).toEqual(['e2']);
+
+    // A client that knows more than the session holds learns it from `total`, and reads again.
+    client.send({ type: 'get-history', fromIndex: 7 });
+    expect(lastHistory(client.sent)).toEqual({
+      type: 'history',
+      startIndex: 3,
+      total: 3,
+      entries: [],
+    });
+  });
+});
+
+describe('turn results on the wire (#3189)', () => {
+  it.each(['complete', 'interrupted'] as const)(
+    'sends %s without the session history, which only grows',
+    (event) => {
+      const session = createSession();
+      const client = attach(session);
+      const contextState = { usedTokens: 1, maxTokens: 10, usedPercentage: 10 };
+
+      session.emit(event, {
+        response: 'done',
+        history: historyOf(50, 50_000),
+        toolSummaries: [],
+        contextState,
+      });
+
+      expect(client.sent).toEqual([
+        { type: event, result: { response: 'done', toolSummaries: [], contextState } },
+      ]);
+    },
+  );
+});
+
+describe('get-prompts (#3189)', () => {
+  const permission = { id: 'p1', toolName: 'Bash', toolArgs: { command: 'ls' } };
+  const ask = { id: 'a1', request: { kind: 'text', title: 'Name?' } };
+
+  it('sends a client that attached later the prompts still open, as the frames that asked them', () => {
+    const session = createSession();
+    const first = attach(session);
+    session.emit('permission_request', permission);
+    session.emit('ask_request', ask);
+    session.emit('prompt_resolved', { id: 'a1' });
+
+    const later = attach(session);
+    later.send({ type: 'get-prompts' });
+
+    expect(first.sent.map((frame) => frame.type)).toEqual([
+      'permission_request',
+      'ask_request',
+      'prompt_resolved',
+    ]);
+    expect(later.sent).toEqual([{ type: 'permission_request', event: permission }]);
+  });
+
+  it("forgets the previous session's prompts on a switch, and all of them once nobody can answer", () => {
+    const session = createSession();
+    const first = attach(session);
+    session.emit('permission_request', permission);
+    session.emit('session_switched', { sessionId: 'session-2' });
+    first.send({ type: 'get-prompts' });
+    expect(first.sent.at(-1)).toEqual({
+      type: 'session_switched',
+      event: { sessionId: 'session-2' },
+    });
+
+    session.emit('permission_request', { ...permission, id: 'p2' });
+    first.leave();
+    const next = attach(session);
+    next.send({ type: 'get-prompts' });
+    expect(next.sent).toEqual([]);
+  });
+
+  it('is not a read an observer may send: an observer never receives prompts', () => {
+    const session = createSession();
+    attach(session);
+    session.emit('permission_request', permission);
+    const observer = attach(session, 'observe');
+
+    observer.send({ type: 'get-prompts' });
+
+    expect(observer.sent).toEqual([
+      { type: 'protocol_error', message: 'Not permitted for an observer: get-prompts' },
+    ]);
+  });
+});
+
+describe('pushed session state (#3189)', () => {
+  it('delivers a context_update as the context frame get-context answers with', () => {
+    const session = createSession();
+    const client = attach(session);
+    const state = { usedTokens: 900, maxTokens: 1000, usedPercentage: 90, remainingPercentage: 10 };
+
+    session.emit('context_update', state);
+
+    expect(client.sent).toEqual([{ type: 'context', state }]);
+  });
+
+  it.each(['compact', 'skill_activation', 'memory_event'])(
+    'tells the client the history changed on %s, without sending the entries',
+    (event) => {
+      const session = createSession();
+      const client = attach(session);
+
+      session.emit(event, {});
+
+      expect(client.sent).toEqual([{ type: 'history_changed' }]);
+    },
+  );
+
+  it('delivers where a turn came from', () => {
+    const session = createSession();
+    const client = attach(session);
+
+    session.emit('turn_source', 'agent-wakeup');
+
+    expect(client.sent).toEqual([{ type: 'turn_source', source: 'agent-wakeup' }]);
+  });
+
+  it('pushes the same frames to an observer, which follows the session read-only', () => {
+    const session = createSession();
+    const observer = attach(session, 'observe');
+    const state = { usedTokens: 1, maxTokens: 10, usedPercentage: 10, remainingPercentage: 90 };
+
+    session.emit('context_update', state);
+    session.emit('compact', {});
+    session.emit('turn_source', 'user');
+
+    expect(observer.sent).toEqual([
+      { type: 'context', state },
+      { type: 'history_changed' },
+      { type: 'turn_source', source: 'user' },
+    ]);
+  });
+});

package/src/__tests__/session-message-handler-observe.test.ts

@@ -0,0 +1,193 @@
+/**
+ * The read-only `observe` role: an observer reads the session's own conversation and state, never
+ * counts as a surface that can answer a prompt, and cannot submit, answer, or control anything.
+ */
+
+import { createTestInteractiveSession } from '@robota-sdk/agent-interface-session/testing';
+import { describe, expect, it, vi } from 'vitest';
+
+import {
+  ATTACHED_SURFACE_MAX_PENDING_BYTES,
+  createOutboundDelivery,
+} from '../outbound-delivery.js';
+import { createSessionMessageHandler } from '../session-message-handler.js';
+
+import type { TClientMessage, TServerMessage } from '../wire-messages.js';
+import type { IInteractiveSession } from '@robota-sdk/agent-interface-session';
+
+type TListener = (...args: unknown[]) => void;
+
+function createSession(): IInteractiveSession & {
+  emit: (event: string, ...args: unknown[]) => void;
+  listenerCount: (event: string) => number;
+} {
+  const listeners = new Map<string, Set<TListener>>();
+  const session = createTestInteractiveSession({
+    submit: vi.fn(),
+    abort: vi.fn(),
+    cancelQueue: vi.fn(),
+    executeCommand: vi.fn(),
+    resolvePermission: vi.fn(),
+    resolveAsk: vi.fn(),
+    cancelBackgroundTask: vi.fn(),
+    closeBackgroundTask: vi.fn(),
+    sendBackgroundTask: vi.fn(),
+    getMessages: vi.fn().mockReturnValue([{ role: 'user', content: 'hi' }]),
+    isExecuting: vi.fn().mockReturnValue(true),
+    on: ((event: string, handler: TListener) => {
+      if (!listeners.has(event)) listeners.set(event, new Set());
+      listeners.get(event)!.add(handler);
+    }) as IInteractiveSession['on'],
+    off: ((event: string, handler: TListener) => {
+      listeners.get(event)?.delete(handler);
+    }) as IInteractiveSession['off'],
+  });
+  return Object.assign(session, {
+    emit: (event: string, ...args: unknown[]) => {
+      listeners.get(event)?.forEach((handler) => handler(...args));
+    },
+    listenerCount: (event: string) => listeners.get(event)?.size ?? 0,
+  });
+}
+
+function attach(
+  session: IInteractiveSession,
+  role?: 'drive' | 'observe',
+): { sent: TServerMessage[]; send: (message: TClientMessage) => void; cleanup: () => void } {
+  const sent: TServerMessage[] = [];
+  const { onMessage, cleanup } = createSessionMessageHandler({
+    session,
+    deliver: createOutboundDelivery((message) => sent.push(message), vi.fn()),
+    driverId: role === 'observe' ? 'attach:2' : 'attach:1',
+    ...(role === undefined ? {} : { role }),
+  });
+  return { sent, send: (message) => onMessage(JSON.stringify(message)), cleanup };
+}
+
+const MUTATING: readonly TClientMessage[] = [
+  { type: 'submit', prompt: 'hello' },
+  { type: 'command', name: 'exit' },
+  { type: 'abort' },
+  { type: 'cancel-queue' },
+  { type: 'cancel-background-task', taskId: 't1' },
+  { type: 'close-background-task', taskId: 't1' },
+  { type: 'send-background-task', taskId: 't1', input: { prompt: 'x' } },
+  { type: 'permission-response', id: 'p1', result: true },
+  { type: 'ask-response', id: 'a1', response: { type: 'answer', values: ['React'] } } as TClientMessage,
+  { type: 'get-personal-usage-report', requestId: 'r1', period: '7d', timezone: 'UTC' },
+  { type: 'get-stored-session-usage-report', requestId: 'r2', sessionId: 'other' },
+];
+
+describe('observe role', () => {
+  it('refuses every mutating or cross-session message with protocol_error and touches nothing', () => {
+    const session = createSession();
+    const observer = attach(session, 'observe');
+    for (const message of MUTATING) {
+      observer.sent.length = 0;
+      observer.send(message);
+      expect(observer.sent).toEqual([
+        { type: 'protocol_error', message: `Not permitted for an observer: ${message.type}` },
+      ]);
+    }
+    expect(session.submit).not.toHaveBeenCalled();
+    expect(session.executeCommand).not.toHaveBeenCalled();
+    expect(session.abort).not.toHaveBeenCalled();
+    expect(session.cancelQueue).not.toHaveBeenCalled();
+    expect(session.cancelBackgroundTask).not.toHaveBeenCalled();
+    expect(session.closeBackgroundTask).not.toHaveBeenCalled();
+    expect(session.sendBackgroundTask).not.toHaveBeenCalled();
+    expect(session.resolvePermission).not.toHaveBeenCalled();
+    expect(session.resolveAsk).not.toHaveBeenCalled();
+  });
+
+  it('keeps the read queries for this session', () => {
+    const session = createSession();
+    const observer = attach(session, 'observe');
+    observer.send({ type: 'get-messages' });
+    observer.send({ type: 'get-executing' });
+    expect(observer.sent).toEqual([
+      { type: 'messages', messages: [{ role: 'user', content: 'hi' }] },
+      { type: 'executing', executing: true },
+    ]);
+  });
+
+  it('#3186: reads the session status and the command catalog, which every client shows', () => {
+    const session = createSession();
+    const observer = attach(session, 'observe');
+    observer.send({ type: 'get-status' });
+    observer.send({ type: 'get-commands' });
+    expect(observer.sent).toEqual([
+      { type: 'session_status', status: session.getStatusSnapshot() },
+      { type: 'commands', commands: [], skills: [] },
+    ]);
+  });
+
+  it('never subscribes to prompt events, so it does not count as a surface that can answer', () => {
+    const session = createSession();
+    const observer = attach(session, 'observe');
+    expect(session.listenerCount('permission_request')).toBe(0);
+    expect(session.listenerCount('ask_request')).toBe(0);
+    expect(session.listenerCount('prompt_resolved')).toBe(1);
+    expect(session.listenerCount('text_delta')).toBe(1);
+    session.emit('permission_request', { id: 'p1', toolName: 'Bash', toolArgs: {} });
+    session.emit('ask_request', { id: 'a1', request: { id: 'r', title: 'Pick' } });
+    session.emit('prompt_resolved', { id: 'p1' });
+    expect(observer.sent).toEqual([{ type: 'prompt_resolved', event: { id: 'p1' } }]);
+    observer.cleanup();
+    expect(session.listenerCount('prompt_resolved')).toBe(0);
+  });
+
+  it('cannot answer a prompt that a drive surface holds', () => {
+    const session = createSession();
+    const drive = attach(session, 'drive');
+    const observer = attach(session, 'observe');
+    session.emit('permission_request', { id: 'p1', toolName: 'Bash', toolArgs: {} });
+    expect(drive.sent).toContainEqual({
+      type: 'permission_request',
+      event: { id: 'p1', toolName: 'Bash', toolArgs: {} },
+    });
+    observer.send({ type: 'permission-response', id: 'p1', result: true });
+    expect(session.resolvePermission).not.toHaveBeenCalled();
+    drive.send({ type: 'permission-response', id: 'p1', result: false });
+    expect(session.resolvePermission).toHaveBeenCalledExactlyOnceWith('p1', false, 'attach:1');
+  });
+
+  it('leaves the drive role unchanged', () => {
+    const session = createSession();
+    const drive = attach(session);
+    expect(session.listenerCount('permission_request')).toBe(1);
+    expect(session.listenerCount('ask_request')).toBe(1);
+    drive.send({ type: 'abort' });
+    drive.send({ type: 'permission-response', id: 'p1', result: true });
+    expect(session.abort).toHaveBeenCalledTimes(1);
+    expect(session.resolvePermission).toHaveBeenCalledExactlyOnceWith('p1', true, 'attach:1');
+    expect(drive.sent).toEqual([]);
+  });
+
+  it('disconnects an observer that stops reading while the session keeps streaming to others', () => {
+    const session = createSession();
+    const drive = attach(session, 'drive');
+    let pending = 0;
+    const onDeliveryError = vi.fn();
+    const received: TServerMessage[] = [];
+    createSessionMessageHandler({
+      session,
+      role: 'observe',
+      deliver: createOutboundDelivery(
+        (message) => {
+          received.push(message);
+          pending += 64 * 1024;
+        },
+        onDeliveryError,
+        () => pending,
+        ATTACHED_SURFACE_MAX_PENDING_BYTES,
+      ),
+    });
+    for (let index = 0; index < 64; index++) {
+      expect(() => session.emit('text_delta', `delta ${index}`)).not.toThrow();
+    }
+    expect(onDeliveryError).toHaveBeenCalledTimes(1);
+    expect(received.length).toBeLessThan(64);
+    expect(drive.sent.filter((message) => message.type === 'text_delta')).toHaveLength(64);
+  });
+});

package/src/__tests__/session-message-handler.test.ts

@@ -10,6 +10,7 @@ import { createSessionMessageHandler } from '../session-message-handler.js';
 import { PROTOCOL_SESSION_EVENT_CLASSIFICATION } from '../session-events.js';
 import type { TServerMessage } from '../wire-messages.js';
 import type { IInteractiveSession } from '@robota-sdk/agent-interface-session';
+import type { ICommandListEntry } from '@robota-sdk/agent-interface-command';
 import type {
   IBackgroundJobGroupState,
   IExecutionWorkspaceEvent,
@@ -157,6 +158,35 @@ describe('WebSocket Transport Handler', () => {
     expect(sent[0]!.type).toBe('context');
   });
 
+  it('#3186: get-commands sends the commands and skills a client can offer', () => {
+    const { onMessage, session, sent } = setup();
+    const command: ICommandListEntry = {
+      name: 'help',
+      description: 'Show commands',
+      modelInvocable: false,
+      runner: 'runtime',
+    };
+    const skill = {
+      name: 'parity-demo',
+      description: 'Demo',
+      source: 'project',
+      modelInvocable: true,
+      userInvocable: true,
+    };
+    Object.assign(session, {
+      listCommands: vi.fn().mockReturnValue([command]),
+      listSkills: vi.fn().mockReturnValue([skill]),
+    });
+    onMessage(JSON.stringify({ type: 'get-commands' }));
+    expect(sent).toEqual([{ type: 'commands', commands: [command], skills: [skill] }]);
+  });
+
+  it('#3186: get-status sends the session status snapshot', () => {
+    const { onMessage, session, sent } = setup();
+    onMessage(JSON.stringify({ type: 'get-status' }));
+    expect(sent).toEqual([{ type: 'session_status', status: session.getStatusSnapshot() }]);
+  });
+
   it('get-executing sends executing status', () => {
     const { onMessage, sent } = setup();
     onMessage(JSON.stringify({ type: 'get-executing' }));
@@ -166,7 +196,35 @@ describe('WebSocket Transport Handler', () => {
   it('get-pending sends pending prompt', () => {
     const { onMessage, sent } = setup();
     onMessage(JSON.stringify({ type: 'get-pending' }));
-    expect(sent[0]).toEqual({ type: 'pending', pending: null });
+    expect(sent[0]).toEqual({ type: 'pending', pending: null, pendingCount: 0 });
+  });
+
+  it('#3189: answers a submit with the queue once the prompt is taken, so a queued prompt shows', async () => {
+    const { onMessage, sent, session } = setup();
+    const mock = session as unknown as {
+      submit: ReturnType<typeof vi.fn>;
+      getPendingPrompt: ReturnType<typeof vi.fn>;
+      getPendingCount: ReturnType<typeof vi.fn>;
+    };
+    let queue: () => void = () => undefined;
+    // A turn is running: the session queues the prompt only after its own initialization yields.
+    mock.submit.mockImplementationOnce(
+      () =>
+        new Promise<void>((resolve) => {
+          queue = () => {
+            mock.getPendingPrompt.mockReturnValue('follow-up');
+            mock.getPendingCount.mockReturnValue(1);
+            resolve();
+          };
+        }),
+    );
+    onMessage(JSON.stringify({ type: 'submit', prompt: 'follow-up' }));
+    // A `get-pending` sent beside the submit is answered before the prompt is queued.
+    onMessage(JSON.stringify({ type: 'get-pending' }));
+    expect(sent).toEqual([{ type: 'pending', pending: null, pendingCount: 0 }]);
+    queue();
+    await new Promise((r) => setTimeout(r, 0));
+    expect(sent.at(-1)).toEqual({ type: 'pending', pending: 'follow-up', pendingCount: 1 });
   });
 
   it('get-background-tasks sends current background task list', () => {
@@ -447,6 +505,29 @@ describe('WebSocket Transport Handler', () => {
     expect(sent).toEqual([{ type: 'protocol_error', message: 'command failed' }]);
   });
 
+  it("#3189: echoes a command's requestId on its result and on its failure, and on nothing else", async () => {
+    const { onMessage, sent, session } = setup();
+    const { executeCommand, submit } = session as unknown as {
+      executeCommand: ReturnType<typeof vi.fn>;
+      submit: ReturnType<typeof vi.fn>;
+    };
+    executeCommand.mockResolvedValueOnce({ message: 'done', success: true });
+    executeCommand.mockRejectedValueOnce(new Error('command failed'));
+    submit.mockRejectedValueOnce(new Error('A turn is running.'));
+    onMessage(JSON.stringify({ type: 'command', name: 'clear', requestId: 'c1' }));
+    onMessage(JSON.stringify({ type: 'command', name: 'broken', requestId: 'c2' }));
+    onMessage(JSON.stringify({ type: 'submit', prompt: 'hello' }));
+    await new Promise((r) => setTimeout(r, 10));
+    expect(sent).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({ type: 'command_result', name: 'clear', requestId: 'c1' }),
+        { type: 'protocol_error', message: 'command failed', requestId: 'c2' },
+        { type: 'protocol_error', message: 'A turn is running.' },
+      ]),
+    );
+    expect(sent).toHaveLength(3);
+  });
+
   it('forwards InteractiveSession events to client', () => {
     const { session, sent } = setup();
     (session as unknown as { _emit: (e: string, ...args: unknown[]) => void })._emit(

package/src/__tests__/ws-broadcast-events.test.ts

@@ -81,4 +81,14 @@ describe('CMD-004 Stage E — session_renamed / history_cleared broadcast to EVE
     expect(sentA).toEqual([{ type: 'history_cleared' }]);
     expect(sentB).toEqual([{ type: 'history_cleared' }]);
   });
+
+  it('#3189: session_switched reaches both attached surfaces (each re-reads the new session)', () => {
+    const { session, sentA, sentB } = setupTwoSurfaces();
+
+    session._emit('session_switched', { sessionId: 'session-2' });
+
+    const expected = { type: 'session_switched', event: { sessionId: 'session-2' } };
+    expect(sentA).toEqual([expected]);
+    expect(sentB).toEqual([expected]);
+  });
 });

package/src/client.ts

@@ -6,4 +6,12 @@ export {
   decodeServerMessage,
 } from './message-decoders.js';
 export type { TMessageDecodeResult } from './message-decoders.js';
-export type { TClientMessage, TServerMessage, TSeqServerMessage } from './wire-messages.js';
+// The one list of messages an observer may send: the host refuses the rest, a client sends no others.
+export { isObserverMessageType } from './observer-messages.js';
+export type {
+  IWireHistoryEntry,
+  TClientMessage,
+  TServerMessage,
+  TSeqServerMessage,
+  TWireExecutionResult,
+} from './wire-messages.js';