Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

fix(acp): reopen archived chats without reloading (#7465)

Andrew Mikofalvy51df34ccb510
diff --git a/.changeset/archived-thread-replay.md b/.changeset/archived-thread-replay.md
new file mode 100644
index 000000000..9a3675b30
--- /dev/null
+++ b/.changeset/archived-thread-replay.md
@@ -0,0 +1,6 @@
+---
+'@inkeep/open-knowledge': patch
+'@inkeep/open-knowledge-server': patch
+---
+
+Archived chats now reopen from Chat history without an app reload, and failed history loads show a helpful error.
diff --git a/packages/app/src/lib/acp/thread-client.test.ts b/packages/app/src/lib/acp/thread-client.test.ts
index 820050353..c3fa92502 100644
--- a/packages/app/src/lib/acp/thread-client.test.ts
+++ b/packages/app/src/lib/acp/thread-client.test.ts
@@ -5,12 +5,124 @@ import {
type ThreadInfo,
type ThreadServerFrame,
} from '@inkeep/open-knowledge-core/acp/thread-protocol';
+import { toast } from 'sonner';
import { describe, expect, test, vi } from 'vitest';
import fixture from '../../../../../test-support/fixtures/codex-legacy-warning-envelopes.json' with {
type: 'json',
};
import { AgentThreadClient, ThreadChannelUnavailableError } from './thread-client';
+describe('archived history subscription failures', () => {
+ const info: ThreadInfo = {
+ threadId: 'history-load',
+ agent: { id: 'a', name: 'A', source: 'custom' },
+ title: 'History',
+ status: 'exited',
+ createdAt: 1,
+ lastActivityAt: 1,
+ lastSeq: 0,
+ modes: null,
+ configOptions: null,
+ archived: true,
+ };
+
+ function openHistory() {
+ const client = new AgentThreadClient();
+ const sent: Array<Record<string, unknown>> = [];
+ const internals = client as unknown as { ws: unknown };
+ internals.ws = {
+ readyState: 1,
+ send: (raw: string) => sent.push(JSON.parse(raw) as Record<string, unknown>),
+ };
+ const frame = (value: ThreadServerFrame) => client.receiveServerFrame(JSON.stringify(value));
+ frame({ op: 'threads', threads: [info] });
+ client.openArchivedThread(info.threadId);
+ return { client, sent, frame };
+ }
+
+ test('a failed subscription closes the loading tab and can be retried from history', () => {
+ const error = vi.spyOn(toast, 'error').mockImplementation(() => 'toast');
+ const warning = vi.spyOn(console, 'warn').mockImplementation(() => {});
+ try {
+ const { client, sent, frame } = openHistory();
+ frame({ op: 'error', code: 'internal', message: 'internal error', threadId: info.threadId });
+
+ expect(client.getOpenTabs()).toEqual([]);
+ expect(client.getThread(info.threadId)?.events).toEqual([]);
+ expect(error).toHaveBeenCalledWith(
+ 'Chat history could not be loaded. Try opening the chat again from Chat history.',
+ );
+ expect(warning).toHaveBeenCalledWith(
+ '[agent-threads] server error frame:',
+ 'internal',
+ 'internal error',
+ );
+ client.openArchivedThread(info.threadId);
+ expect(client.getOpenTabs()).toEqual([info]);
+ expect(sent.filter((value) => value.op === 'subscribe')).toHaveLength(2);
+ expect(sent).toContainEqual({ op: 'unsubscribe', threadId: info.threadId });
+ } finally {
+ error.mockRestore();
+ warning.mockRestore();
+ }
+ });
+
+ test.each(['before opening', 'after opening'])(
+ 'delayed terminal frames %s do not replace the archived transcript',
+ (timing) => {
+ const { client, sent, frame } = openHistory();
+ const message: ThreadEvent = { kind: 'user_message', content: 'original message', ts: 1 };
+ const exited: ThreadEvent = { kind: 'status', status: 'exited', ts: 2 };
+ const warning = vi.spyOn(console, 'warn').mockImplementation(() => {});
+ try {
+ frame({ op: 'info', info: { ...info, archived: false, status: 'ready' } });
+ frame({ op: 'events', threadId: info.threadId, fromSeq: 0, events: [message] });
+ frame({ op: 'info', info: { ...info, lastSeq: 1 } });
+ if (timing === 'before opening') {
+ frame({ op: 'event', threadId: info.threadId, seq: 1, event: exited });
+ }
+
+ client.openArchivedThread(info.threadId);
+ if (timing === 'after opening') {
+ frame({ op: 'event', threadId: info.threadId, seq: 1, event: exited });
+ }
+
+ expect(sent.at(-1)).toEqual({ op: 'subscribe', threadId: info.threadId, sinceSeq: 0 });
+ expect(client.getThread(info.threadId)?.events).toEqual([]);
+ frame({
+ op: 'subscribed',
+ threadId: info.threadId,
+ fromSeq: 0,
+ info: { ...info, lastSeq: 1 },
+ });
+ frame({ op: 'events', threadId: info.threadId, fromSeq: 0, events: [message, exited] });
+ expect(client.getThread(info.threadId)?.events).toEqual([message, exited]);
+ } finally {
+ warning.mockRestore();
+ }
+ },
+ );
+
+ test('a non-subscription error preserves a completely replayed transcript', () => {
+ const error = vi.spyOn(toast, 'error').mockImplementation(() => 'toast');
+ const warning = vi.spyOn(console, 'warn').mockImplementation(() => {});
+ try {
+ const { client, frame } = openHistory();
+ frame({ op: 'subscribed', threadId: info.threadId, fromSeq: 0, info });
+ const event: ThreadEvent = { kind: 'user_message', content: 'kept', ts: 1 };
+ frame({ op: 'events', threadId: info.threadId, fromSeq: 0, events: [event] });
+ frame({ op: 'error', code: 'internal', message: 'rename failed', threadId: info.threadId });
+
+ expect(client.getOpenTabs()).toEqual([info]);
+ expect(client.getThread(info.threadId)?.events).toEqual([event]);
+ expect(error).not.toHaveBeenCalled();
+ } finally {
+ error.mockRestore();
+ warning.mockRestore();
+ }
+ });
+});
+
describe('AgentThreadClient store snapshots', () => {
test('getThreads returns a referentially stable snapshot until the store changes', () => {
const client = new AgentThreadClient();
@@ -1155,6 +1267,7 @@ describe('a refused resume keeps the archived thread open', () => {
const frame = (f: ThreadServerFrame) => internals.handleFrame.call(client, f);
frame({ op: 'threads', threads: [archivedInfo] });
client.openArchivedThread('t1');
+ frame({ op: 'subscribed', threadId: 't1', fromSeq: 0, info: archivedInfo });
frame({ op: 'events', threadId: 't1', fromSeq: 0, events: [ev(0), ev(1), ev(2), ev(3)] });
return { client, sent, frame };
}
diff --git a/packages/app/src/lib/acp/thread-client.ts b/packages/app/src/lib/acp/thread-client.ts
index 2852bc906..5ccf2a0d3 100644
--- a/packages/app/src/lib/acp/thread-client.ts
+++ b/packages/app/src/lib/acp/thread-client.ts
@@ -857,6 +857,20 @@ export class AgentThreadClient {
}
}
console.warn('[agent-threads] server error frame:', frame.code, frame.message);
+ if (
+ frame.reqId === undefined &&
+ frame.threadId !== undefined &&
+ this.openedArchived.has(frame.threadId)
+ ) {
+ const state = this.threads.get(frame.threadId);
+ if (state !== undefined && state.lastSeq < state.replayThroughSeq) {
+ this.closeThread(frame.threadId);
+ toast.error(
+ t`Chat history could not be loaded. Try opening the chat again from Chat history.`,
+ );
+ return;
+ }
+ }
return;
}
default:
@@ -867,6 +881,9 @@ export class AgentThreadClient {
private appendEvents(threadId: string, fromSeq: number, events: readonly ThreadEvent[]): void {
const state = this.threads.get(threadId);
if (state === undefined || events.length === 0) return;
+ if (state.info.archived === true && state.replayThroughSeq === Number.POSITIVE_INFINITY) {
+ return;
+ }
const skip = Math.max(state.lastSeq + 1 - fromSeq, 0);
if (skip >= events.length) return;
const fresh = skip === 0 ? events : events.slice(skip);
diff --git a/packages/app/src/locales/ar/messages.po b/packages/app/src/locales/ar/messages.po
index 5c715399e..5a6023ba4 100644
--- a/packages/app/src/locales/ar/messages.po
+++ b/packages/app/src/locales/ar/messages.po
@@ -2073,6 +2073,9 @@ msgstr "أحرف"
msgid "Chat history"
msgstr "سجل الدردشة"
+msgid "Chat history could not be loaded. Try opening the chat again from Chat history."
+msgstr "تعذّر تحميل سجل الدردشة. حاول فتح الدردشة مجددًا من سجل الدردشة."
+
msgid "Chat name"
msgstr "اسم المحادثة"
diff --git a/packages/app/src/locales/bn/messages.po b/packages/app/src/locales/bn/messages.po
index 744442b71..c1f11ea00 100644
--- a/packages/app/src/locales/bn/messages.po
+++ b/packages/app/src/locales/bn/messages.po
@@ -2069,6 +2069,9 @@ msgstr "অক্ষর"
msgid "Chat history"
msgstr "চ্যাটের ইতিহাস"
+msgid "Chat history could not be loaded. Try opening the chat again from Chat history."
+msgstr "চ্যাটের ইতিহাস লোড করা যায়নি। চ্যাটের ইতিহাস থেকে চ্যাটটি আবার খোলার চেষ্টা করুন।"
+
msgid "Chat name"
msgstr "চ্যাটের নাম"
diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.po
index b20d21a11..befd35f4f 100644
--- a/packages/app/src/locales/en/messages.po
+++ b/packages/app/src/locales/en/messages.po
@@ -2073,6 +2073,9 @@ msgstr "characters"
msgid "Chat history"
msgstr "Chat history"
+msgid "Chat history could not be loaded. Try opening the chat again from Chat history."
+msgstr "Chat history could not be loaded. Try opening the chat again from Chat history."
+
msgid "Chat name"
msgstr "Chat name"
diff --git a/packages/app/src/locales/es/messages.po b/packages/app/src/locales/es/messages.po
index c1f33996f..71c8105e8 100644
--- a/packages/app/src/locales/es/messages.po
+++ b/packages/app/src/locales/es/messages.po
@@ -2073,6 +2073,9 @@ msgstr "caracteres"
msgid "Chat history"
msgstr "Historial de chats"
+msgid "Chat history could not be loaded. Try opening the chat again from Chat history."
+msgstr "No se pudo cargar el historial del chat. Intenta abrir el chat de nuevo desde Historial de chats."
+
msgid "Chat name"
msgstr "Nombre del chat"
diff --git a/packages/app/src/locales/fr/messages.po b/packages/app/src/locales/fr/messages.po
index eaa997b8c..d1f07d8c5 100644
--- a/packages/app/src/locales/fr/messages.po
+++ b/packages/app/src/locales/fr/messages.po
@@ -2073,6 +2073,9 @@ msgstr "caractères"
msgid "Chat history"
msgstr "Historique des discussions"
+msgid "Chat history could not be loaded. Try opening the chat again from Chat history."
+msgstr "Impossible de charger l’historique de la discussion. Essayez de rouvrir la discussion depuis Historique des discussions."
+
msgid "Chat name"
msgstr "Nom du chat"
diff --git a/packages/app/src/locales/hi/messages.po b/packages/app/src/locales/hi/messages.po
index bd5556143..eaa903ca5 100644
--- a/packages/app/src/locales/hi/messages.po
+++ b/packages/app/src/locales/hi/messages.po
@@ -2069,6 +2069,9 @@ msgstr "अक्षर"
msgid "Chat history"
msgstr "चैट का इतिहास"
+msgid "Chat history could not be loaded. Try opening the chat again from Chat history."
+msgstr "चैट का इतिहास लोड नहीं हो सका। “चैट का इतिहास” से चैट फिर से खोलने की कोशिश करें।"
+
msgid "Chat name"
msgstr "चैट का नाम"
diff --git a/packages/app/src/locales/id/messages.po b/packages/app/src/locales/id/messages.po
index 3ad0284f1..b9b8dcbd9 100644
--- a/packages/app/src/locales/id/messages.po
+++ b/packages/app/src/locales/id/messages.po
@@ -2069,6 +2069,9 @@ msgstr "karakter"
msgid "Chat history"
msgstr "Riwayat chat"
+msgid "Chat history could not be loaded. Try opening the chat again from Chat history."
+msgstr "Riwayat chat tidak dapat dimuat. Coba buka kembali chat dari Riwayat chat."
+
msgid "Chat name"
msgstr "Nama obrolan"
diff --git a/packages/app/src/locales/ko/messages.po b/packages/app/src/locales/ko/messages.po
index 7fb07e736..7ba54715c 100644
--- a/packages/app/src/locales/ko/messages.po
+++ b/packages/app/src/locales/ko/messages.po
@@ -2073,6 +2073,9 @@ msgstr "문자"
msgid "Chat history"
msgstr "채팅 기록"
+msgid "Chat history could not be loaded. Try opening the chat again from Chat history."
+msgstr "채팅 기록을 불러올 수 없습니다. 채팅 기록에서 채팅을 다시 열어 보세요."
+
msgid "Chat name"
msgstr "채팅 이름"
diff --git a/packages/app/src/locales/pl/messages.po b/packages/app/src/locales/pl/messages.po
index f9bf4a906..90e6941df 100644
--- a/packages/app/src/locales/pl/messages.po
+++ b/packages/app/src/locales/pl/messages.po
@@ -2073,6 +2073,9 @@ msgstr "znaki"
msgid "Chat history"
msgstr "Historia czatu"
+msgid "Chat history could not be loaded. Try opening the chat again from Chat history."
+msgstr "Nie udało się wczytać historii czatu. Spróbuj ponownie otworzyć czat z sekcji Historia czatu."
+
msgid "Chat name"
msgstr "Nazwa czatu"
diff --git a/packages/app/src/locales/pt-BR/messages.po b/packages/app/src/locales/pt-BR/messages.po
index 8ec953952..c7e3c1196 100644
--- a/packages/app/src/locales/pt-BR/messages.po
+++ b/packages/app/src/locales/pt-BR/messages.po
@@ -2069,6 +2069,9 @@ msgstr "caracteres"
msgid "Chat history"
msgstr "Histórico de chats"
+msgid "Chat history could not be loaded. Try opening the chat again from Chat history."
+msgstr "Não foi possível carregar o histórico do chat. Tente abrir o chat novamente pelo Histórico de chats."
+
msgid "Chat name"
msgstr "Nome do chat"
diff --git a/packages/app/src/locales/ur/messages.po b/packages/app/src/locales/ur/messages.po
index 72459467c..49918906d 100644
--- a/packages/app/src/locales/ur/messages.po
+++ b/packages/app/src/locales/ur/messages.po
@@ -2073,6 +2073,9 @@ msgstr "حروف"
msgid "Chat history"
msgstr "چیٹ کی سرگزشت"
+msgid "Chat history could not be loaded. Try opening the chat again from Chat history."
+msgstr "چیٹ کی سرگزشت لوڈ نہیں ہو سکی۔ چیٹ کی سرگزشت سے چیٹ دوبارہ کھولنے کی کوشش کریں۔"
+
msgid "Chat name"
msgstr "چیٹ کا نام"
diff --git a/packages/app/src/locales/zh-Hans/messages.po b/packages/app/src/locales/zh-Hans/messages.po
index d4743ced9..4bc1606fc 100644
--- a/packages/app/src/locales/zh-Hans/messages.po
+++ b/packages/app/src/locales/zh-Hans/messages.po
@@ -2073,6 +2073,9 @@ msgstr "字符"
msgid "Chat history"
msgstr "聊天记录"
+msgid "Chat history could not be loaded. Try opening the chat again from Chat history."
+msgstr "无法加载聊天记录。请尝试从“聊天记录”重新打开此聊天。"
+
msgid "Chat name"
msgstr "对话名称"
diff --git a/packages/app/src/locales/zh-Hant/messages.po b/packages/app/src/locales/zh-Hant/messages.po
index f5db3f0de..b99c582a5 100644
--- a/packages/app/src/locales/zh-Hant/messages.po
+++ b/packages/app/src/locales/zh-Hant/messages.po
@@ -2073,6 +2073,9 @@ msgstr "字元"
msgid "Chat history"
msgstr "聊天記錄"
+msgid "Chat history could not be loaded. Try opening the chat again from Chat history."
+msgstr "無法載入聊天記錄。請嘗試從「聊天記錄」重新開啟此聊天。"
+
msgid "Chat name"
msgstr "對話名稱"
diff --git a/packages/app/tests/integration/mid-drain-restart.test.ts b/packages/app/tests/integration/mid-drain-restart.test.ts
index d3e31a39e..21abc6916 100644
--- a/packages/app/tests/integration/mid-drain-restart.test.ts
+++ b/packages/app/tests/integration/mid-drain-restart.test.ts
@@ -9,6 +9,7 @@ import {
createRestartableServer,
pollDiskContentStable,
pollUntil,
+ refreshServerInfoAndAwaitMismatch,
seedPoolServerInstanceId,
} from './test-harness';
@@ -64,6 +65,7 @@ describe('T11: Mid-drain server restart', () => {
server = await server.killAndRestartOnSamePort({ downtimeMs: 300 });
cleanups.unshift(() => server.shutdown());
+ await refreshServerInfoAndAwaitMismatch(pool, `http://127.0.0.1:${server.port}`);
await pollUntil(() => pool.getActive()?.provider.isSynced === true, 10_000, 50);
await wait(500);
diff --git a/packages/app/tests/stress/archived-thread-replay.e2e.ts b/packages/app/tests/stress/archived-thread-replay.e2e.ts
new file mode 100644
index 000000000..d34b73494
--- /dev/null
+++ b/packages/app/tests/stress/archived-thread-replay.e2e.ts
@@ -0,0 +1,126 @@
+import { randomUUID } from 'node:crypto';
+import { mkdirSync, writeFileSync } from 'node:fs';
+import { join } from 'node:path';
+import type { ThreadServerFrame } from '@inkeep/open-knowledge-core/acp/thread-protocol';
+import { expect, stubAgentCatalog, test, threadRosterDelivered } from './_helpers';
+
+test('history replays a conversation archived from another connection without reloading', async ({
+ page,
+ api,
+ workerServer,
+}) => {
+ const uid = randomUUID();
+ const docName = `history-replay-${uid}`;
+ const agentId = `history-agent-${uid}`;
+ const message = `Message preserved through archive ${uid}`;
+ await api.seedDocs([{ name: docName, markdown: '# History replay\n' }]);
+ const localDir = join(workerServer.contentDir, '.ok', 'local');
+ mkdirSync(localDir, { recursive: true });
+ const agentPath = join(localDir, 'history-replay-agent.mjs');
+ writeFileSync(
+ agentPath,
+ `let buffer = '';
+process.stdin.setEncoding('utf8');
+process.stdin.on('data', (chunk) => {
+ buffer += chunk;
+ let end;
+ while ((end = buffer.indexOf('\\n')) !== -1) {
+ const line = buffer.slice(0, end);
+ buffer = buffer.slice(end + 1);
+ if (!line.trim()) continue;
+ const request = JSON.parse(line);
+ if (request.id === undefined) continue;
+ const result = request.method === 'initialize'
+ ? { protocolVersion: 1, agentCapabilities: {} }
+ : request.method === 'session/new'
+ ? { sessionId: 'history-replay' }
+ : request.method === 'session/prompt'
+ ? { stopReason: 'end_turn' }
+ : {};
+ process.stdout.write(JSON.stringify({ jsonrpc: '2.0', id: request.id, result }) + '\\n');
+ }
+});
+`,
+ );
+ writeFileSync(
+ join(localDir, 'acp-agents.json'),
+ JSON.stringify([
+ { id: agentId, name: 'History Replay Agent', command: process.execPath, args: [agentPath] },
+ ]),
+ );
+ await page.addInitScript((id) => {
+ window.localStorage.setItem(
+ 'ok-acp-registered-agents-v1',
+ JSON.stringify({
+ agents: [{ source: 'custom', id, name: 'History Replay Agent' }],
+ defaultKey: `custom:${id}`,
+ }),
+ );
+ }, agentId);
+ const frames: ThreadServerFrame[] = [];
+ const sent: unknown[] = [];
+ let threadConnections = 0;
+ page.on('websocket', (socket) => {
+ if (!socket.url().endsWith('/collab/thread')) return;
+ threadConnections += 1;
+ socket.on('framereceived', ({ payload }) => {
+ frames.push(JSON.parse(String(payload)) as ThreadServerFrame);
+ });
+ socket.on('framesent', ({ payload }) => sent.push(JSON.parse(String(payload))));
+ });
+ await stubAgentCatalog(page);
+ const roster = threadRosterDelivered(page);
+ await page.goto(`/#/${docName}`);
+ await roster;
+ await page.getByTestId('header-pane-button-agents').click();
+ const panel = page.locator('[data-agents-panel-mount]');
+ await expect(panel.getByRole('tab')).toHaveCount(1);
+ await expect
+ .poll(() => frames.find((frame) => frame.op === 'created')?.info.threadId)
+ .toBeDefined();
+ const created = frames.find((frame) => frame.op === 'created');
+ if (created?.op !== 'created') throw new Error('The UI did not create its thread');
+ const threadId = created.info.threadId;
+ await expect
+ .poll(() => frames.some((frame) => frame.op === 'info' && frame.info.status === 'ready'))
+ .toBe(true);
+ const composer = panel.getByTestId('agent-thread-composer');
+ await composer.fill(message);
+ await composer.press('Enter');
+ await expect(panel.getByText(message, { exact: true })).toBeVisible();
+ const connectionCount = threadConnections;
+ const controller = new WebSocket(`ws://127.0.0.1:${workerServer.port}/collab/thread`);
+ try {
+ await new Promise<void>((resolve, reject) => {
+ controller.addEventListener('open', () => {
+ controller.send(JSON.stringify({ op: 'close', threadId }));
+ });
+ controller.addEventListener('message', ({ data }) => {
+ const frame = JSON.parse(String(data)) as ThreadServerFrame;
+ if (frame.op === 'error') reject(new Error(frame.message));
+ if (
+ frame.op === 'threads' &&
+ frame.threads.some((info) => info.threadId === threadId && info.archived === true)
+ ) {
+ resolve();
+ }
+ });
+ controller.addEventListener('error', () => reject(new Error('Archive socket failed')));
+ });
+ await expect(panel.getByRole('tab')).toHaveCount(0);
+ await panel.getByRole('button', { name: 'Chat history' }).click();
+ await page.getByTestId(`agent-thread-history-open-${threadId}`).click();
+ await expect(panel.getByText(message, { exact: true })).toBeVisible();
+ expect(threadConnections).toBe(connectionCount);
+ await page.screenshot({ path: test.info().outputPath('archived-replay.png') });
+ } finally {
+ await test.info().attach('thread-frames', {
+ body: JSON.stringify({ frames, sent, threadConnections }),
+ contentType: 'application/json',
+ });
+ if (controller.readyState === WebSocket.OPEN) {
+ controller.send(JSON.stringify({ op: 'delete', threadId }));
+ }
+ controller.close();
+ }
+});
diff --git a/packages/server/src/acp/thread-socket.test.ts b/packages/server/src/acp/thread-socket.test.ts
index 98986a2ac..7e78b3afd 100644
--- a/packages/server/src/acp/thread-socket.test.ts
+++ b/packages/server/src/acp/thread-socket.test.ts
@@ -5,12 +5,12 @@ import type {
ThreadEvent,
ThreadServerFrame,
} from '@inkeep/open-knowledge-core/acp/thread-protocol';
-import { afterEach, describe, expect, onTestFailed, test } from 'vitest';
+import { afterEach, describe, expect, onTestFailed, test, vi } from 'vitest';
import type { AgentSessionManager } from '../agent-sessions.ts';
import { getLogger } from '../logger.ts';
import { AcpPermissionStore } from './permissions.ts';
import { AcpRegistry } from './registry.ts';
-import { AcpThreadManager } from './thread-manager.ts';
+import { AcpThreadManager, ThreadOpError } from './thread-manager.ts';
import { attachAcpThreadSocket } from './thread-socket.ts';
const log = getLogger('acp-thread-socket-test');
@@ -483,44 +483,49 @@ describe('/collab/thread socket — history ops', () => {
socket.close();
}, 45_000);
- test('archived subscribe replays the transcript through the socket', async () => {
- const localDir = tmp();
- writeFixtureAgent(localDir, 'resume');
- const manager = makeManager(tmp(), localDir);
- await manager.init();
- const socket = attachFakeSocket(manager);
+ test.each(['fresh', 'same'])(
+ 'archived subscribe replays the transcript through the %s socket',
+ async (connection) => {
+ const localDir = tmp();
+ writeFixtureAgent(localDir, 'resume');
+ const manager = makeManager(tmp(), localDir);
+ await manager.init();
+ const socket = attachFakeSocket(manager);
- socket.emit(
- JSON.stringify({
- op: 'create',
- reqId: 'c1',
- agent: { source: 'custom', id: 'fixture' },
- prompt: 'hello world',
- }),
- );
- const created = await socket.awaitFrame('created');
- const threadId = created.info.threadId;
- await waitStatus(manager, threadId, 'ready');
- socket.emit(JSON.stringify({ op: 'close', threadId }));
- await waitStatus(manager, threadId, 'exited');
-
- const viewer = attachFakeSocket(manager);
- viewer.emit(JSON.stringify({ op: 'subscribe', threadId, sinceSeq: 0 }));
- await viewer.awaitFrame('subscribed');
- const events = await viewer.awaitFrame('events');
- expect(events.fromSeq).toBe(0);
- const deadline = Date.now() + 10_000;
- for (;;) {
- const all = viewer.frames
- .filter((f): f is Extract<ThreadServerFrame, { op: 'events' }> => f.op === 'events')
- .flatMap((f) => f.events);
- if (all.some((e) => e.kind === 'user_message' && e.content === 'hello world')) break;
- if (Date.now() > deadline) throw new Error('replay never delivered the user message');
- await new Promise((r) => setTimeout(r, 25));
- }
- socket.close();
- viewer.close();
- }, 45_000);
+ socket.emit(
+ JSON.stringify({
+ op: 'create',
+ reqId: 'c1',
+ agent: { source: 'custom', id: 'fixture' },
+ prompt: 'hello world',
+ }),
+ );
+ const created = await socket.awaitFrame('created');
+ const threadId = created.info.threadId;
+ await waitStatus(manager, threadId, 'ready');
+ await manager.closeThread(threadId);
+
+ const viewer = connection === 'same' ? socket : attachFakeSocket(manager);
+ const subscribed = viewer.nextFrame('subscribed');
+ const replay = viewer.nextFrame('events');
+ viewer.emit(JSON.stringify({ op: 'subscribe', threadId, sinceSeq: 0 }));
+ await subscribed;
+ const events = await replay;
+ expect(events.fromSeq).toBe(0);
+ const deadline = Date.now() + 10_000;
+ for (;;) {
+ const all = viewer.frames
+ .filter((f): f is Extract<ThreadServerFrame, { op: 'events' }> => f.op === 'events')
+ .flatMap((f) => f.events);
+ if (all.some((e) => e.kind === 'user_message' && e.content === 'hello world')) break;
+ if (Date.now() > deadline) throw new Error('replay never delivered the user message');
+ await new Promise((r) => setTimeout(r, 25));
+ }
+ socket.close();
+ viewer.close();
+ },
+ 45_000,
+ );
});
describe('/collab/thread socket — steer', () => {
@@ -802,7 +807,8 @@ describe('/collab/thread socket — crash-recovered replay bound', () => {
const failing = attachFakeSocket(manager);
failing.emit(JSON.stringify({ op: 'subscribe', threadId, sinceSeq: 0 }));
- await failing.awaitFrame('error');
+ const failure = await failing.awaitFrame('error');
+ expect(failure).toMatchObject({ code: 'internal', threadId });
expect(failing.frames.map((f) => f.op)).not.toContain('subscribed');
failing.close();
@@ -828,4 +834,83 @@ describe('/collab/thread socket — crash-recovered replay bound', () => {
expect(socket.frames.map((f) => f.op)).not.toContain('subscribed');
socket.close();
}, 45_000);
+
+ test.each(['succeeds', 'fails', 'is refused'])(
+ 'a superseded in-flight subscribe that %s cannot replay or retain a second listener',
+ async (outcome) => {
+ const localDir = tmp();
+ const threadId = '0a1b2c3d-0000-4000-8000-0000000000c3';
+ writeCrashStaleThread(localDir, threadId, MULTI_CHUNK_EVENTS, 2);
+ const manager = makeManager(tmp(), localDir);
+ await manager.init();
+ const entered = Promise.withResolvers<void>();
+ const release = Promise.withResolvers<void>();
+ const finished = Promise.withResolvers<void>();
+ const replacementFinished = Promise.withResolvers<void>();
+ const obsoleteError = new Error('obsolete log read failed');
+ const realSubscribe = manager.subscribe.bind(manager);
+ const subscribe = vi
+ .spyOn(manager, 'subscribe')
+ .mockImplementation(async (...args) => {
+ try {
+ return await realSubscribe(...args);
+ } finally {
+ replacementFinished.resolve();
+ }
+ })
+ .mockImplementationOnce(async (...args) => {
+ entered.resolve();
+ await release.promise;
+ try {
+ if (outcome === 'fails') throw obsoleteError;
+ if (outcome === 'is refused') throw new ThreadOpError('unknown-thread', 'missing');
+ return await realSubscribe(...args);
+ } finally {
+ finished.resolve();
+ }
+ });
+ const unsubscribe = vi.spyOn(manager, 'unsubscribe');
+ const loggedError = vi.spyOn(log, 'error');
+ const socket = attachFakeSocket(manager);
+ try {
+ socket.emit(JSON.stringify({ op: 'subscribe', threadId, sinceSeq: 0 }));
+ await entered.promise;
+ const latest = socket.nextFrame('subscribed', (frame) => frame.fromSeq === 1);
+ socket.emit(JSON.stringify({ op: 'subscribe', threadId, sinceSeq: 1 }));
+ expect(subscribe).toHaveBeenCalledTimes(2);
+ await latest;
+ release.resolve();
+ await finished.promise;
+ await replacementFinished.promise;
+ await Promise.resolve();
+
+ expect(socket.frames.filter((frame) => frame.op === 'subscribed')).toEqual([
+ expect.objectContaining({ fromSeq: 1 }),
+ ]);
+ expect(socket.frames.filter((frame) => frame.op === 'error')).toEqual([]);
+ if (outcome === 'fails') {
+ expect(loggedError).toHaveBeenCalledWith(
+ { err: obsoleteError, threadId },
+ '[acp-thread-socket] superseded subscription failed',
+ );
+ } else {
+ expect(loggedError).not.toHaveBeenCalled();
+ }
+ const oldSink = subscribe.mock.calls[0][2];
+ expect(unsubscribe.mock.calls.filter(([, sink]) => sink === oldSink)).toHaveLength(2);
+ expect(unsubscribe).not.toHaveBeenCalledWith(threadId, subscribe.mock.calls[1][2]);
+ const update = socket.nextFrame('info');
+ await manager.renameThread(threadId, 'Renamed');
+ await update;
+ expect(socket.frames.filter((frame) => frame.op === 'info')).toHaveLength(1);
+ } finally {
+ release.resolve();
+ socket.close();
+ subscribe.mockRestore();
+ unsubscribe.mockRestore();
+ loggedError.mockRestore();
+ }
+ },
+ 45_000,
+ );
});
diff --git a/packages/server/src/acp/thread-socket.ts b/packages/server/src/acp/thread-socket.ts
index c83c72954..9d404d7f6 100644
--- a/packages/server/src/acp/thread-socket.ts
+++ b/packages/server/src/acp/thread-socket.ts
@@ -64,7 +64,7 @@ export function attachAcpThreadSocket(
return;
}
case 'subscribe': {
- await subscribeTo(frame.threadId, frame.sinceSeq ?? 0);
+ await subscribeTo(frame.threadId, frame.sinceSeq ?? 0, true);
return;
}
case 'resume': {
@@ -203,19 +203,39 @@ export function attachAcpThreadSocket(
log.error({ err, op: frame.op }, '[acp-thread-socket] frame handling failed');
sendError('internal', 'internal error', {
reqId: 'reqId' in frame ? (frame as { reqId?: string }).reqId : undefined,
+ threadId: 'threadId' in frame ? frame.threadId : undefined,
});
}
}
})();
});
- const subscribeTo = async (threadId: string, sinceSeq: number): Promise<void> => {
- if (subscriptions.has(threadId)) return;
- const sink = (frame: ThreadServerFrame): void => send(frame);
+ const subscribeTo = async (
+ threadId: string,
+ sinceSeq: number,
+ replace = false,
+ ): Promise<void> => {
+ const existing = subscriptions.get(threadId);
+ if (existing !== undefined) {
+ if (!replace) return;
+ manager.unsubscribe(threadId, existing);
+ subscriptions.delete(threadId);
+ }
+ const sink = (frame: ThreadServerFrame): void => {
+ if (subscriptions.get(threadId) === sink) send(frame);
+ };
subscriptions.set(threadId, sink);
try {
await manager.subscribe(threadId, sinceSeq, sink);
+ if (subscriptions.get(threadId) !== sink) manager.unsubscribe(threadId, sink);
} catch (err) {
+ manager.unsubscribe(threadId, sink);
+ if (subscriptions.get(threadId) !== sink) {
+ if (!(err instanceof ThreadOpError)) {
+ log.error({ err, threadId }, '[acp-thread-socket] superseded subscription failed');
+ }
+ return;
+ }
subscriptions.delete(threadId);
if (err instanceof ThreadOpError) {
sendError(err.code, err.message, { threadId });