Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Fix worker thread cleanup roster handling (#7262)

Nick Gomezd805ea999270
diff --git a/knip.config.ts b/knip.config.ts
index 03ef8d4a4..36a395261 100644
--- a/knip.config.ts
+++ b/knip.config.ts
@@ -155,15 +155,11 @@ export default {
'src/shadow-fixture-launch.test-helper.mjs',
],
project: 'src/**',
- ignoreDependencies: [
- '@types/shell-quote',
- ],
+ ignoreDependencies: ['@types/shell-quote'],
},
'packages/cli': {
entry: ['src/**/*.test.ts', 'scripts/*.ts', 'tests/**/*.ts', 'src/parse-worker.ts'],
- ignoreDependencies: [
- 'yjs',
- ],
+ ignoreDependencies: ['yjs'],
},
'packages/desktop': {
entry: [
diff --git a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
index 4549c74b3..a50b00123 100644
--- a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
+++ b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
@@ -1,4 +1,3 @@
-
import { readFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
index 4fc2c11f9..6fcdc23f2 100644
--- a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
+++ b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { normalizeBridge } from '@inkeep/open-knowledge-core';
import { updateYFragment } from '@tiptap/y-tiptap';
diff --git a/packages/app/tests/integration/interior-edit-freshness.test.ts b/packages/app/tests/integration/interior-edit-freshness.test.ts
index 9f2f6feb6..40b5cdfd6 100644
--- a/packages/app/tests/integration/interior-edit-freshness.test.ts
+++ b/packages/app/tests/integration/interior-edit-freshness.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
index 2a085742b..93666af70 100644
--- a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
+++ b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/producer-guard-wiring.test.ts b/packages/app/tests/integration/producer-guard-wiring.test.ts
index 878d5196b..867598d34 100644
--- a/packages/app/tests/integration/producer-guard-wiring.test.ts
+++ b/packages/app/tests/integration/producer-guard-wiring.test.ts
@@ -1,4 +1,3 @@
-
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
index 4ada3cf26..0970ac12f 100644
--- a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
+++ b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
@@ -1,4 +1,3 @@
-
import { randomUUID } from 'node:crypto';
import { afterEach, describe, expect, test } from 'vitest';
import { agentWriteMd, createTestServer, type TestServer } from './test-harness';
diff --git a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
index cbe2b705f..b632185e1 100644
--- a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
+++ b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
@@ -1,4 +1,3 @@
-
import { execFileSync } from 'node:child_process';
import { randomUUID } from 'node:crypto';
import { join } from 'node:path';
diff --git a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
index 89bc9b4d9..c530ce4ba 100644
--- a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
+++ b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
@@ -1,4 +1,3 @@
-
import { randomUUID } from 'node:crypto';
import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
import type * as Y from 'yjs';
diff --git a/packages/app/tests/integration/undo-after-rollback.test.ts b/packages/app/tests/integration/undo-after-rollback.test.ts
index a78aeb0e4..d3767adc9 100644
--- a/packages/app/tests/integration/undo-after-rollback.test.ts
+++ b/packages/app/tests/integration/undo-after-rollback.test.ts
@@ -1,4 +1,3 @@
-
import { ROLLBACK_ORIGIN } from '@inkeep/open-knowledge-server';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
import * as Y from 'yjs';
diff --git a/packages/app/tests/integration/undo-recycle-reset.test.ts b/packages/app/tests/integration/undo-recycle-reset.test.ts
index e7cc69c3f..b076f955c 100644
--- a/packages/app/tests/integration/undo-recycle-reset.test.ts
+++ b/packages/app/tests/integration/undo-recycle-reset.test.ts
@@ -1,4 +1,3 @@
-
import { writeFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/undo-rederive-survival.test.ts b/packages/app/tests/integration/undo-rederive-survival.test.ts
index 9ddcd0730..7935e35f8 100644
--- a/packages/app/tests/integration/undo-rederive-survival.test.ts
+++ b/packages/app/tests/integration/undo-rederive-survival.test.ts
@@ -1,4 +1,3 @@
-
import { prependFrontmatter } from '@inkeep/open-knowledge-core';
import { Plugin, PluginKey } from '@tiptap/pm/state';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
diff --git a/packages/app/tests/stress/agents-panel-reload-visibility.e2e.ts b/packages/app/tests/stress/agents-panel-reload-visibility.e2e.ts
index bb528f88d..3f16d4051 100644
--- a/packages/app/tests/stress/agents-panel-reload-visibility.e2e.ts
+++ b/packages/app/tests/stress/agents-panel-reload-visibility.e2e.ts
@@ -147,41 +147,46 @@ async function latestRoster(
);
}
-async function purgeLiveThreads(port: number): Promise<void> {
- const live = (await withThreadSocket(port, latestRoster)).filter(
- (thread) => thread.archived !== true,
- );
- for (const thread of live) {
+async function purgeThreadRoster(port: number): Promise<void> {
+ const observed = await withThreadSocket(port, latestRoster);
+ for (const thread of observed) {
await withThreadSocket(port, async (send, frames, recorder) => {
- send({ op: 'close', threadId: thread.threadId });
- const closeDeadline = Date.now() + 20_000;
- let archived = false;
- let discarded = false;
- while (Date.now() < closeDeadline) {
- const errored = recorder.frames.find((frame) => frame.op === 'error');
- if (errored) {
+ let archived = thread.archived === true;
+ if (!archived) {
+ const closeFromIndex = frames.length;
+ send({ op: 'close', threadId: thread.threadId });
+ const closeDeadline = Date.now() + 20_000;
+ while (Date.now() < closeDeadline) {
+ const errored = recorder.frames.find((frame) => frame.op === 'error');
+ if (errored) {
+ throw new Error(
+ `purge close rejected for ${thread.threadId}: ${JSON.stringify(errored)}`,
+ );
+ }
+ const snapshot = frames
+ .slice(closeFromIndex)
+ .filter((frame) => frame.op === 'threads')
+ .at(-1);
+ if (!snapshot?.threads) {
+ await new Promise((resolve) => setTimeout(resolve, 100));
+ continue;
+ }
+ const entry = snapshot.threads.find((t) => t.threadId === thread.threadId);
+ if (entry === undefined) return;
+ if (entry.archived === true) {
+ archived = true;
+ break;
+ }
+ send({ op: 'list' });
+ await new Promise((resolve) => setTimeout(resolve, 100));
+ }
+ if (!archived) {
throw new Error(
- `purge close rejected for ${thread.threadId}: ${JSON.stringify(errored)}`,
+ `purge close confirmation never arrived for ${thread.threadId} (${recorder.unparseableCount} unparseable frame(s) observed)`,
);
}
- const snapshot = frames.filter((frame) => frame.op === 'threads').at(-1);
- const entry = snapshot?.threads?.find((t) => t.threadId === thread.threadId);
- if (entry === undefined) {
- discarded = true;
- break;
- }
- if (entry.archived === true) {
- archived = true;
- break;
- }
- await new Promise((resolve) => setTimeout(resolve, 100));
}
- if (!archived && !discarded) {
- throw new Error(
- `purge close confirmation never arrived for ${thread.threadId} (${recorder.unparseableCount} unparseable frame(s) observed)`,
- );
- }
- if (discarded) return;
+ const deleteFromIndex = frames.length;
send({ op: 'delete', threadId: thread.threadId });
const deadline = Date.now() + 20_000;
while (Date.now() < deadline) {
@@ -191,7 +196,10 @@ async function purgeLiveThreads(port: number): Promise<void> {
`purge delete rejected for ${thread.threadId}: ${JSON.stringify(errored)}`,
);
}
- const snapshot = frames.filter((frame) => frame.op === 'threads').at(-1);
+ const snapshot = frames
+ .slice(deleteFromIndex)
+ .filter((frame) => frame.op === 'threads')
+ .at(-1);
if (snapshot?.threads && !snapshot.threads.some((t) => t.threadId === thread.threadId)) {
return;
}
@@ -202,12 +210,10 @@ async function purgeLiveThreads(port: number): Promise<void> {
);
});
}
- const remaining = (await withThreadSocket(port, latestRoster)).filter(
- (thread) => thread.archived !== true,
- );
+ const remaining = await withThreadSocket(port, latestRoster);
if (remaining.length > 0) {
throw new Error(
- `live threads survived the roster purge: ${remaining.map((t) => t.threadId).join(', ')}`,
+ `threads survived the roster purge: ${remaining.map((t) => t.threadId).join(', ')}`,
);
}
}
@@ -621,7 +627,7 @@ test.describe('agents panel resize', () => {
test.describe('header Agents button', () => {
test.afterEach(async ({ page, workerServer }) => {
await page.evaluate(() => window.__acpThreadHarness?.reset());
- await purgeLiveThreads(workerServer.port);
+ await purgeThreadRoster(workerServer.port);
});
test('clicking Agents while chat is hidden shows it at the share seeded from its stored width, with focus inside it', async ({
@@ -649,7 +655,7 @@ test.describe('header Agents button', () => {
page,
workerServer,
}) => {
- await purgeLiveThreads(workerServer.port);
+ await purgeThreadRoster(workerServer.port);
writeSeedAgentFile(workerServer.contentDir);
await registerSeedAgentAsDefault(page);
await page.setViewportSize({ width: 1600, height: 900 });
@@ -1185,14 +1191,14 @@ test.describe('chat history navigation', () => {
test.describe('agents panel reload visibility level', () => {
test.afterEach(async ({ workerServer }) => {
- await purgeLiveThreads(workerServer.port);
+ await purgeThreadRoster(workerServer.port);
});
test('a panel closed before a roster-delayed reload stays closed after it (level written by real open and close clicks on the header Agents button and asserted in localStorage before reload; storage-coercion edge cases are pinned by the co-located DOM suites)', async ({
page,
workerServer,
}) => {
- await purgeLiveThreads(workerServer.port);
+ await purgeThreadRoster(workerServer.port);
await seedLiveThread(workerServer.port, workerServer.contentDir);
await stubAgentCatalog(page);
await openAppWithRoster(page);
@@ -1232,7 +1238,7 @@ test.describe('agents panel reload visibility level', () => {
page,
workerServer,
}) => {
- await purgeLiveThreads(workerServer.port);
+ await purgeThreadRoster(workerServer.port);
await seedLiveThread(workerServer.port, workerServer.contentDir);
await stubAgentCatalog(page);
await openAppWithRoster(page);
@@ -1279,7 +1285,7 @@ test.describe('agents panel reload visibility level', () => {
page,
workerServer,
}) => {
- await purgeLiveThreads(workerServer.port);
+ await purgeThreadRoster(workerServer.port);
await seedLiveThread(workerServer.port, workerServer.contentDir);
await stubAgentCatalog(page);
await openAppWithRoster(page);
@@ -1296,7 +1302,7 @@ test.describe('agents panel reload visibility level', () => {
page,
workerServer,
}) => {
- await purgeLiveThreads(workerServer.port);
+ await purgeThreadRoster(workerServer.port);
await seedLiveThread(workerServer.port, workerServer.contentDir);
await stubAgentCatalog(page);
await openAppWithRoster(page);
@@ -1319,7 +1325,7 @@ test.describe('agents panel reload visibility level', () => {
page,
workerServer,
}) => {
- await purgeLiveThreads(workerServer.port);
+ await purgeThreadRoster(workerServer.port);
await seedLiveThread(workerServer.port, workerServer.contentDir);
await stubAgentCatalog(page);
await openAppWithRoster(page);
@@ -1339,7 +1345,7 @@ test.describe('agents panel reload visibility level', () => {
page,
workerServer,
}) => {
- await purgeLiveThreads(workerServer.port);
+ await purgeThreadRoster(workerServer.port);
await seedLiveThread(workerServer.port, workerServer.contentDir);
await stubAgentCatalog(page);
await openAppWithRoster(page);
diff --git a/packages/core/src/bridge/compose.ts b/packages/core/src/bridge/compose.ts
index 2a597ec3d..f4cc8a286 100644
--- a/packages/core/src/bridge/compose.ts
+++ b/packages/core/src/bridge/compose.ts
@@ -1,4 +1,3 @@
-
import { prependFrontmatter, stripFrontmatter } from '../extensions/frontmatter.ts';
export type ComposeAdjustment = 'none' | 'body' | 'frontmatter' | 'unresolved';
diff --git a/packages/core/src/bridge/doc-boundary-space.ts b/packages/core/src/bridge/doc-boundary-space.ts
index ffd8fce06..e7e63f43d 100644
--- a/packages/core/src/bridge/doc-boundary-space.ts
+++ b/packages/core/src/bridge/doc-boundary-space.ts
@@ -1,4 +1,3 @@
-
import { FRONTMATTER_RE, stripFrontmatter } from '../extensions/frontmatter.ts';
import { carriedEdgeEmpties, type DocEdgeEmpties } from '../markdown/doc-edge-blank-runs.ts';
diff --git a/packages/core/src/markdown/comment-promoter.ts b/packages/core/src/markdown/comment-promoter.ts
index fb0ba5a7c..fc267cbea 100644
--- a/packages/core/src/markdown/comment-promoter.ts
+++ b/packages/core/src/markdown/comment-promoter.ts
@@ -1,4 +1,3 @@
-
import type { Nodes, Paragraph, PhrasingContent, Root, RootContent, Text } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/merged-walker.ts b/packages/core/src/markdown/merged-walker.ts
index ae8cb390b..861003fb4 100644
--- a/packages/core/src/markdown/merged-walker.ts
+++ b/packages/core/src/markdown/merged-walker.ts
@@ -1,4 +1,3 @@
-
import type { Nodes, Parent, Root } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/safe-url.ts b/packages/core/src/markdown/safe-url.ts
index 8be632ba4..4d3250d3a 100644
--- a/packages/core/src/markdown/safe-url.ts
+++ b/packages/core/src/markdown/safe-url.ts
@@ -1,4 +1,3 @@
-
export const SAFE_URL_SCHEMES = ['https', 'http', 'mailto', 'tel', 'ftp', 'sms'] as const;
const SCHEME_ALT = SAFE_URL_SCHEMES.map((s) => `${s}:`).join('|');