Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
Fix ConPTY test teardown before worker termination (#5748)
Nick Gomezf057576bedbf
diff --git a/knip.config.ts b/knip.config.tsindex 65f0e8807..d3638888e 100644--- a/knip.config.ts+++ b/knip.config.ts@@ -147,11 +147,15 @@ export default {'packages/server': {entry: ['src/**/*.test.ts', 'src/parse-worker.ts'],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.tsindex a50b00123..4549c74b3 100644--- a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts+++ b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts@@ -1,3 +1,4 @@+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.tsindex 6fcdc23f2..4fc2c11f9 100644--- a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts+++ b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts@@ -1,3 +1,4 @@+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.tsindex 40b5cdfd6..9f2f6feb6 100644--- a/packages/app/tests/integration/interior-edit-freshness.test.ts+++ b/packages/app/tests/integration/interior-edit-freshness.test.ts@@ -1,3 +1,4 @@+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.tsindex 93666af70..2a085742b 100644--- a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts+++ b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts@@ -1,3 +1,4 @@+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.tsindex 867598d34..878d5196b 100644--- a/packages/app/tests/integration/producer-guard-wiring.test.ts+++ b/packages/app/tests/integration/producer-guard-wiring.test.ts@@ -1,3 +1,4 @@+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.tsindex 0970ac12f..4ada3cf26 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,3 +1,4 @@+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.tsindex b632185e1..cbe2b705f 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,3 +1,4 @@+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.tsindex c530ce4ba..89bc9b4d9 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,3 +1,4 @@+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.tsindex d3767adc9..a78aeb0e4 100644--- a/packages/app/tests/integration/undo-after-rollback.test.ts+++ b/packages/app/tests/integration/undo-after-rollback.test.ts@@ -1,3 +1,4 @@+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.tsindex b076f955c..e7cc69c3f 100644--- a/packages/app/tests/integration/undo-recycle-reset.test.ts+++ b/packages/app/tests/integration/undo-recycle-reset.test.ts@@ -1,3 +1,4 @@+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.tsindex 7935e35f8..9ddcd0730 100644--- a/packages/app/tests/integration/undo-rederive-survival.test.ts+++ b/packages/app/tests/integration/undo-rederive-survival.test.ts@@ -1,3 +1,4 @@+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/core/src/bridge/compose.ts b/packages/core/src/bridge/compose.tsindex f4cc8a286..2a597ec3d 100644--- a/packages/core/src/bridge/compose.ts+++ b/packages/core/src/bridge/compose.ts@@ -1,3 +1,4 @@+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.tsindex 8fb428b90..01ef76a9f 100644--- a/packages/core/src/bridge/doc-boundary-space.ts+++ b/packages/core/src/bridge/doc-boundary-space.ts@@ -1,3 +1,4 @@+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.tsindex fc267cbea..fb0ba5a7c 100644--- a/packages/core/src/markdown/comment-promoter.ts+++ b/packages/core/src/markdown/comment-promoter.ts@@ -1,3 +1,4 @@+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.tsindex bfd7e3109..fa3cfcd86 100644--- a/packages/core/src/markdown/merged-walker.ts+++ b/packages/core/src/markdown/merged-walker.ts@@ -1,3 +1,4 @@+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.tsindex 4d3250d3a..8be632ba4 100644--- a/packages/core/src/markdown/safe-url.ts+++ b/packages/core/src/markdown/safe-url.ts@@ -1,3 +1,4 @@+export const SAFE_URL_SCHEMES = ['https', 'http', 'mailto', 'tel', 'ftp', 'sms'] as const;const SCHEME_ALT = SAFE_URL_SCHEMES.map((s) => `${s}:`).join('|');diff --git a/packages/desktop/tests/utility/pty-host-conpty-attach.test.ts b/packages/desktop/tests/utility/pty-host-conpty-attach.test.tsindex 1c3278f89..7da8f3b51 100644--- a/packages/desktop/tests/utility/pty-host-conpty-attach.test.ts+++ b/packages/desktop/tests/utility/pty-host-conpty-attach.test.ts@@ -31,6 +31,10 @@ interface NativeConptyFake {clear(...args: unknown[]): void;}+interface ConptyTerminal extends IPty {+ _agent: { inSocket: Socket; outSocket: Socket };+}+interface Scenario {backend: Backend;plan: AttachPlan;@@ -43,7 +47,8 @@ interface Scenario {pseudoconsoles: number;connectCalls: number;nativeExit: ((exitCode: number) => void) | null;- terminals: IPty[];+ terminals: ConptyTerminal[];+ terminalSockets: Array<{ socket: Socket; closed: Promise<void> }>;nodePtyExit: { pid: number; exitCode: number | undefined } | null;onNativeConnect?: () => void;}@@ -77,7 +82,11 @@ const { WindowsPtyAgent } = requireFromDesktop('node-pty/lib/windowsPtyAgent.js'WindowsPtyAgent: { prototype: { _getConsoleProcessList: () => Promise<number[]> } };};const { WindowsTerminal } = requireFromDesktop('node-pty/lib/windowsTerminal.js') as {- WindowsTerminal: new (file: string, args: string[] | string, options: PtySpawnOptions) => IPty;+ WindowsTerminal: new (+ file: string,+ args: string[] | string,+ options: PtySpawnOptions,+ ) => ConptyTerminal;};const workerThreads = requireFromDesktop('node:worker_threads') as {Worker: typeof Worker;@@ -178,11 +187,14 @@ async function openScenario(backend: Backend, plan: AttachPlan): Promise<ScenariconnectCalls: 0,nativeExit: null,terminals: [],+ terminalSockets: [],nodePtyExit: null,};}async function closeScenario(scenario: Scenario): Promise<void> {+ for (const { socket } of scenario.terminalSockets) socket.destroy();+ await Promise.all(scenario.terminalSockets.map(({ closed }) => closed));await Promise.all(spawnedWorkers.splice(0).map((worker) => worker.terminate()));for (const socket of scenario.conoutSockets) socket.destroy();await new Promise<void>((resolve) => scenario.conoutServer.close(() => resolve()));@@ -204,6 +216,10 @@ function scenarioSpawn(scenario: Scenario): SpawnPty {return (file, args, options) => {const terminal = new WindowsTerminal(file, args, options);scenario.terminals.push(terminal);+ for (const socket of [terminal._agent.inSocket, terminal._agent.outSocket]) {+ const closed = new Promise<void>((resolve) => socket.once('close', () => resolve()));+ scenario.terminalSockets.push({ socket, closed });+ }terminal.onExit(({ exitCode }) => {scenario.nodePtyExit = { pid: terminal.pid, exitCode };});@@ -523,6 +539,47 @@ describe.skipIf(process.platform === 'win32')(expect(outcome.trace.map((entry) => entry.stage)).not.toContain('native-connect-failed');});+ test('finishes silent terminal output before stopping its worker', async () => {+ await runTraced(backend, {+ kind: 'attached-then-silent-exit',+ shellPid: SILENT_SHELL_PID,+ nativeExitCode: -1,+ });+ const current = activeScenario();+ expect(current.nodePtyExit).toBeNull();+ const exitsAtWorkerShutdown: Scenario['nodePtyExit'][] = [];+ const observations = spawnedWorkers.map((worker) => {+ const terminate = worker.terminate.bind(worker);+ return vi.spyOn(worker, 'terminate').mockImplementation(() => {+ exitsAtWorkerShutdown.push(current.nodePtyExit);+ return terminate();+ });+ });+ try {+ await closeScenario(current);+ scenario = null;+ } finally {+ for (const observation of observations) observation.mockRestore();+ }+ expect(exitsAtWorkerShutdown).toEqual([{ pid: SILENT_SHELL_PID, exitCode: undefined }]);+ });++ test('releases the silent terminal input when the scenario closes', async () => {+ await runTraced(backend, {+ kind: 'attached-then-silent-exit',+ shellPid: SILENT_SHELL_PID,+ nativeExitCode: -1,+ });+ const current = activeScenario();+ const inputs = current.terminals.map((terminal) => terminal._agent.inSocket);+ expect(inputs.map((input) => input.writable)).toEqual([true]);+ const closedInputs = new Set<Socket>();+ for (const input of inputs) input.once('close', () => closedInputs.add(input));+ await closeScenario(current);+ scenario = null;+ expect(inputs.map((input) => closedInputs.has(input))).toEqual([true]);+ });+test('startup diagnostics preserve a worker error observed before READY', async () => {const outcome = await runTraced(backend, { kind: 'worker-cannot-reach-conout' });expect(outcome.trace).toContainEqual(expect.objectContaining({ stage: 'worker-error' }));