Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
Fix Open Knowledge test fixture cleanup (#6577)
Nick Gomez592b51957bf8
diff --git a/packages/app/tests/integration/restartable-server.test-helper.ts b/packages/app/tests/integration/restartable-server.test-helper.tsindex 62514f82e..d405c2dde 100644--- a/packages/app/tests/integration/restartable-server.test-helper.ts+++ b/packages/app/tests/integration/restartable-server.test-helper.ts@@ -58,18 +58,28 @@ export async function createRestartableServer(const contentDir = realpathSync.native(options.contentDir ?? mkdtempSync(join(tmpdir(), 'ok-restartable-')),);- const home = options.configHomedirOverride ?? mkdtempSync(join(tmpdir(), 'ok-restart-home-'));- mkdirSync(join(contentDir, '.ok'), { recursive: true });- if (options.contentDir === undefined) {- writeFileSync(join(contentDir, 'test-doc.md'), '');- }- if (!existsSync(join(contentDir, '.ok', 'config.yml'))) {- writeFileSync(join(contentDir, '.ok', 'config.yml'), options.seedProjectConfigYml ?? '');+ let home = options.configHomedirOverride;+ let port: number;+ try {+ home ??= mkdtempSync(join(tmpdir(), 'ok-restart-home-'));+ mkdirSync(join(contentDir, '.ok'), { recursive: true });+ if (options.contentDir === undefined) {+ writeFileSync(join(contentDir, 'test-doc.md'), '');+ }+ if (!existsSync(join(contentDir, '.ok', 'config.yml'))) {+ writeFileSync(join(contentDir, '.ok', 'config.yml'), options.seedProjectConfigYml ?? '');+ }+ writeFileSync(join(contentDir, '.ok', '.gitignore'), '*\n');+ await ensureProjectGit(contentDir);+ configureTestGitRepository(contentDir);+ port = options.port ?? (await getFreePort());+ } catch (error) {+ removeAllStrictDuringTeardown(+ ...(options.configHomedirOverride === undefined && home !== undefined ? [home] : []),+ ...(options.contentDir === undefined ? [contentDir] : []),+ );+ throw error;}- writeFileSync(join(contentDir, '.ok', '.gitignore'), '*\n');- await ensureProjectGit(contentDir);- configureTestGitRepository(contentDir);- const port = options.port ?? (await getFreePort());const child = spawn(process.execPath,[@@ -140,8 +150,10 @@ export async function createRestartableServer(} catch (error) {kill();await exited;- if (options.configHomedirOverride === undefined) removeAllStrictDuringTeardown(home);- if (options.contentDir === undefined) removeAllStrictDuringTeardown(contentDir);+ removeAllStrictDuringTeardown(+ ...(options.configHomedirOverride === undefined ? [home] : []),+ ...(options.contentDir === undefined ? [contentDir] : []),+ );throw error;} finally {if (startupTimer !== undefined) clearTimeout(startupTimer);@@ -171,8 +183,10 @@ export async function createRestartableServer(if (timer !== undefined) clearTimeout(timer);kill();await exited;- if (options.configHomedirOverride === undefined) removeAllStrictDuringTeardown(home);- if (!options.keepContentDir && !restarted) removeAllStrictDuringTeardown(contentDir);+ removeAllStrictDuringTeardown(+ ...(options.configHomedirOverride === undefined ? [home] : []),+ ...(!options.keepContentDir && !restarted ? [contentDir] : []),+ );}})();return shutdownPromise;diff --git a/packages/app/tests/integration/test-harness.ts b/packages/app/tests/integration/test-harness.tsindex 356ab2d14..fca5deff1 100644--- a/packages/app/tests/integration/test-harness.ts+++ b/packages/app/tests/integration/test-harness.ts@@ -117,70 +117,85 @@ export async function createTestServer(options: CreateTestServerOptions = {}): Poptions.contentDir !== undefined? realpathSync(options.contentDir): realpathSync(mkdtempSync(join(tmpdir(), 'ok-test-')));- const ownedHomeDir =- options.configHomedirOverride === undefined- ? realpathSync(mkdtempSync(join(tmpdir(), 'ok-test-home-')))- : null;- const homeOverride = options.configHomedirOverride ?? (ownedHomeDir as string);- if (ownedHomeDir !== null && (options.seedSkillHostRoot ?? true)) {- mkdirSync(join(ownedHomeDir, '.claude', 'skills'), { recursive: true });- }-const createdProjectDir = ephemeral && options.projectDir === undefined;- const projectDir = options.projectDir- ? realpathSync(options.projectDir)- : ephemeral- ? realpathSync(mkdtempSync(join(tmpdir(), 'ok-ephemeral-test-')))- : contentDir;-- if (!ephemeral) {- if (options.contentDir === undefined) {- writeFileSync(join(contentDir, 'test-doc.md'), '', 'utf-8');+ let ownedHomeDir: string | null = null;+ let projectDir: string | undefined;+ let port: number;+ let srv: ServerInstance;+ try {+ if (options.configHomedirOverride === undefined) {+ ownedHomeDir = realpathSync(mkdtempSync(join(tmpdir(), 'ok-test-home-')));}+ const homeOverride = options.configHomedirOverride ?? (ownedHomeDir as string);- if (options.contentDir === undefined) {- mkdirSync(join(contentDir, '.ok'), { recursive: true });- const seedConfig =- options.seedProjectConfigYml ??- (options.markdownlintEnabled ? 'contentRules:\n markdownlint:\n enabled: true\n' : '');- writeFileSync(join(contentDir, '.ok', 'config.yml'), seedConfig, 'utf-8');+ if (ownedHomeDir !== null && (options.seedSkillHostRoot ?? true)) {+ mkdirSync(join(ownedHomeDir, '.claude', 'skills'), { recursive: true });}- if (options.contentDir === undefined && (options.seedSkillHostRoot ?? true)) {- mkdirSync(join(contentDir, '.claude', 'skills'), { recursive: true });- }+ projectDir = options.projectDir+ ? realpathSync(options.projectDir)+ : ephemeral+ ? realpathSync(mkdtempSync(join(tmpdir(), 'ok-ephemeral-test-')))+ : contentDir;- const gitSetup = await ensureProjectGit(contentDir);- if (gitSetup.didInit || existsSync(join(contentDir, '.git', 'config'))) {- configureTestGitRepository(contentDir);+ if (!ephemeral) {+ if (options.contentDir === undefined) {+ writeFileSync(join(contentDir, 'test-doc.md'), '', 'utf-8');+ }++ if (options.contentDir === undefined) {+ mkdirSync(join(contentDir, '.ok'), { recursive: true });+ const seedConfig =+ options.seedProjectConfigYml ??+ (options.markdownlintEnabled+ ? 'contentRules:\n markdownlint:\n enabled: true\n'+ : '');+ writeFileSync(join(contentDir, '.ok', 'config.yml'), seedConfig, 'utf-8');+ }++ if (options.contentDir === undefined && (options.seedSkillHostRoot ?? true)) {+ mkdirSync(join(contentDir, '.claude', 'skills'), { recursive: true });+ }++ const gitSetup = await ensureProjectGit(contentDir);+ if (gitSetup.didInit || existsSync(join(contentDir, '.git', 'config'))) {+ configureTestGitRepository(contentDir);+ }}- }- const port = await getFreePort();- const srv = createServer({- authorityRegistryPath: options.authorityRegistryPath ?? testAuthorityRegistryPath,- contentDir,- projectDir,- ingressPolicy: options.ingressPolicy,- quiet: true,- debounce: options.debounce ?? 200,- maxDebounce: options.maxDebounce ?? 1000,- stalenessGraceMs: options.stalenessGraceMs,- stalenessSweepIntervalMs: options.stalenessSweepIntervalMs,- gitEnabled: ephemeral ? false : (options.gitEnabled ?? false),- commitDebounceMs: options.commitDebounceMs ?? 200,- contentRoot: options.gitEnabled === true ? '.' : undefined,- enableTestRoutes: true,- localOpCliArgs: options.localOpCliArgs,- authStreamHeartbeatMs: options.authStreamHeartbeatMs,- configHomedirOverride: homeOverride,- mdManager: options.mdManager,- pullIntervalSeconds: options.pullIntervalSeconds,- pushIntervalSeconds: options.pushIntervalSeconds,- agentSessionOptions: options.agentSessionOptions,- ...(ephemeral ? { ephemeral: true, singleDocRelPath: options.singleDocRelPath } : {}),- skipStateManifestCheck: true,- });+ port = await getFreePort();+ srv = createServer({+ authorityRegistryPath: options.authorityRegistryPath ?? testAuthorityRegistryPath,+ contentDir,+ projectDir,+ ingressPolicy: options.ingressPolicy,+ quiet: true,+ debounce: options.debounce ?? 200,+ maxDebounce: options.maxDebounce ?? 1000,+ stalenessGraceMs: options.stalenessGraceMs,+ stalenessSweepIntervalMs: options.stalenessSweepIntervalMs,+ gitEnabled: ephemeral ? false : (options.gitEnabled ?? false),+ commitDebounceMs: options.commitDebounceMs ?? 200,+ contentRoot: options.gitEnabled === true ? '.' : undefined,+ enableTestRoutes: true,+ localOpCliArgs: options.localOpCliArgs,+ authStreamHeartbeatMs: options.authStreamHeartbeatMs,+ configHomedirOverride: homeOverride,+ mdManager: options.mdManager,+ pullIntervalSeconds: options.pullIntervalSeconds,+ pushIntervalSeconds: options.pushIntervalSeconds,+ agentSessionOptions: options.agentSessionOptions,+ ...(ephemeral ? { ephemeral: true, singleDocRelPath: options.singleDocRelPath } : {}),+ skipStateManifestCheck: true,+ });+ } catch (error) {+ removeAllStrictDuringTeardown(+ ...(options.contentDir === undefined ? [contentDir] : []),+ ...(ownedHomeDir !== null ? [ownedHomeDir] : []),+ ...(createdProjectDir && projectDir !== undefined ? [projectDir] : []),+ );+ throw error;+ }await srv.ready;diff --git a/packages/app/vitest.config.ts b/packages/app/vitest.config.tsindex dfdfffdd9..8d6f9dd35 100644--- a/packages/app/vitest.config.ts+++ b/packages/app/vitest.config.ts@@ -22,6 +22,9 @@ const srcDir = fileURLToPath(new URL('./src/', import.meta.url));const idbPreloadPath = fileURLToPath(new URL('./tests/integration/idb-preload.ts', import.meta.url),);+const serverAuthorityRegistrySetup = fileURLToPath(+ new URL('../../test-support/server-authority-registry.setup.ts', import.meta.url),+);export const appVitestConfig = {...okVitestBase,@@ -46,7 +49,7 @@ export const appVitestConfig = {'public/excalidraw-assets/**','.excalidraw-assets-staging-*',],- setupFiles: [...okVitestBase.test.setupFiles, idbPreloadPath],+ setupFiles: [...okVitestBase.test.setupFiles, idbPreloadPath, serverAuthorityRegistrySetup],globalSetup: [fileURLToPath(new URL('./scripts/compile-i18n-catalogs.ts', import.meta.url))],},} satisfies ViteUserConfig;diff --git a/packages/cli/vitest.config.ts b/packages/cli/vitest.config.tsindex efdce7ee4..836986ffa 100644--- a/packages/cli/vitest.config.ts+++ b/packages/cli/vitest.config.ts@@ -1,6 +1,11 @@+import { fileURLToPath } from 'node:url';import { defineConfig } from 'vitest/config';import { okVitestBase } from '../../test-support/vitest.base';+const serverAuthorityRegistrySetup = fileURLToPath(+ new URL('../../test-support/server-authority-registry.setup.ts', import.meta.url),+);+/*** Vitest config for packages/cli (unit + integration tier).*@@ -14,6 +19,7 @@ export default defineConfig({...okVitestBase,test: {...okVitestBase.test,+ setupFiles: [...okVitestBase.test.setupFiles, serverAuthorityRegistrySetup],exclude: [...okVitestBase.test.exclude, '.ok-skill-publish-*'],},});diff --git a/packages/server/src/composition-rig.test-helper.ts b/packages/server/src/composition-rig.test-helper.tsindex a8b71141e..7f364e498 100644--- a/packages/server/src/composition-rig.test-helper.ts+++ b/packages/server/src/composition-rig.test-helper.ts@@ -35,18 +35,26 @@ export async function bootCompositionRig(seedOkScaffold(contentDir);const ownedHome =overrides.configHomedirOverride ?? mkdtempSync(resolve(tmpdir(), 'ok-rig-home-'));- const booted = await bootServer({- host: '127.0.0.1',- config: TEST_CONFIG,- contentDir,- port: 0,- quiet: true,- gitEnabled: false,- idleShutdownMs: null,- authorityRegistryPath: testAuthorityRegistryPath,- ...overrides,- configHomedirOverride: ownedHome,- });+ let booted: BootedServer;+ try {+ booted = await bootServer({+ host: '127.0.0.1',+ config: TEST_CONFIG,+ contentDir,+ port: 0,+ quiet: true,+ gitEnabled: false,+ idleShutdownMs: null,+ authorityRegistryPath: testAuthorityRegistryPath,+ ...overrides,+ configHomedirOverride: ownedHome,+ });+ } catch (error) {+ if (overrides.configHomedirOverride === undefined) {+ rmSync(ownedHome, { recursive: true, force: true });+ }+ throw error;+ }if (overrides.configHomedirOverride === undefined) {const inner = booted.destroy;booted.destroy = async (reason) => {diff --git a/packages/server/vitest.config.ts b/packages/server/vitest.config.tsindex e9009fcdc..1a701000f 100644--- a/packages/server/vitest.config.ts+++ b/packages/server/vitest.config.ts@@ -1,10 +1,16 @@+import { fileURLToPath } from 'node:url';import { defineConfig } from 'vitest/config';import { okVitestBase } from '../../test-support/vitest.base';+const serverAuthorityRegistrySetup = fileURLToPath(+ new URL('../../test-support/server-authority-registry.setup.ts', import.meta.url),+);+export default defineConfig({...okVitestBase,test: {...okVitestBase.test,+ setupFiles: [...okVitestBase.test.setupFiles, serverAuthorityRegistrySetup],exclude: [...okVitestBase.test.exclude, '**/*.network.test.ts', '.ok-skill-publish-*'],},});diff --git a/test-support/fixtures/server-authority-collection-failure.fixture.ts b/test-support/fixtures/server-authority-collection-failure.fixture.tsnew file mode 100644index 000000000..b716d9c3a--- /dev/null+++ b/test-support/fixtures/server-authority-collection-failure.fixture.ts@@ -0,0 +1,5 @@+import { testAuthorityRegistryPath } from '../server-authority-registry.test-helper.ts';++throw new Error('Registry fixture collection failed after import', {+ cause: testAuthorityRegistryPath,+});diff --git a/test-support/fixtures/server-authority-observation.test-helper.ts b/test-support/fixtures/server-authority-observation.test-helper.tsnew file mode 100644index 000000000..748f1cdb1--- /dev/null+++ b/test-support/fixtures/server-authority-observation.test-helper.ts@@ -0,0 +1,17 @@+import { readdirSync } from 'node:fs';+import { tmpdir } from 'node:os';+import { join } from 'node:path';+import { afterEach } from 'vitest';++declare module 'vitest' {+ interface TaskMeta {+ authorityRegistryDirectories?: string[];+ }+}++afterEach(({ task }) => {+ const temp = tmpdir();+ task.meta.authorityRegistryDirectories = readdirSync(temp)+ .filter((entry) => entry.startsWith('ok-test-authority-'))+ .map((entry) => join(temp, entry));+});diff --git a/test-support/fixtures/server-authority-owner.test-helper.mjs b/test-support/fixtures/server-authority-owner.test-helper.mjsnew file mode 100644index 000000000..0aba57f5b--- /dev/null+++ b/test-support/fixtures/server-authority-owner.test-helper.mjs@@ -0,0 +1,5 @@+import { watchCliOwner } from '../../packages/cli/src/commands/cli-owner.test-helper.ts';++watchCliOwner({ connected: process.connected, once: process.once.bind(process) }, () =>+ process.exit(1),+);diff --git a/test-support/fixtures/server-authority-registry.fixture.ts b/test-support/fixtures/server-authority-registry.fixture.tsnew file mode 100644index 000000000..162bf78d4--- /dev/null+++ b/test-support/fixtures/server-authority-registry.fixture.ts@@ -0,0 +1,37 @@+import { existsSync } from 'node:fs';+import { expect, test } from 'vitest';+import { createRestartableServer } from '../../packages/app/tests/integration/restartable-server.test-helper.ts';+import { createTestServer } from '../../packages/app/tests/integration/test-harness.ts';+import { bootCompositionRig } from '../../packages/server/src/composition-rig.test-helper.ts';+import { testAuthorityRegistryPath } from '../server-authority-registry.test-helper.ts';+import { withTempDir } from '../temp-dir.test-helper.ts';++test('composition rig uses the shared authority registry', async () => {+ await withTempDir('ok-registry-composition-', async (content) => {+ const server = await bootCompositionRig(content);+ try {+ await server.ready;+ expect(existsSync(testAuthorityRegistryPath)).toBe(true);+ } finally {+ await server.destroy();+ }+ });+});++test('integration server uses the shared authority registry', async () => {+ const server = await createTestServer();+ try {+ expect(existsSync(testAuthorityRegistryPath)).toBe(true);+ } finally {+ await server.cleanup();+ }+});++test('restartable server uses the shared authority registry', async () => {+ const server = await createRestartableServer();+ try {+ expect(existsSync(testAuthorityRegistryPath)).toBe(true);+ } finally {+ await server.shutdown();+ }+});diff --git a/test-support/server-authority-registry.setup.ts b/test-support/server-authority-registry.setup.tsnew file mode 100644index 000000000..d7255e084--- /dev/null+++ b/test-support/server-authority-registry.setup.ts@@ -0,0 +1,4 @@+import { afterAll } from 'vitest';+import { releaseTestAuthorityRegistry } from './server-authority-registry.test-helper.ts';++afterAll(releaseTestAuthorityRegistry);diff --git a/test-support/server-authority-registry.test-helper.ts b/test-support/server-authority-registry.test-helper.tsindex 707c7559e..72960c56a 100644--- a/test-support/server-authority-registry.test-helper.ts+++ b/test-support/server-authority-registry.test-helper.ts@@ -1,8 +1,16 @@-import { mkdtempSync, rmSync } from 'node:fs';+import { randomUUID } from 'node:crypto';+import { rmSync } from 'node:fs';import { tmpdir } from 'node:os';import { join } from 'node:path';-const directory = mkdtempSync(join(tmpdir(), 'ok-test-authority-'));+const directory = join(tmpdir(), `ok-test-authority-${randomUUID()}`);export const testAuthorityRegistryPath = join(directory, 'authority.sqlite');-process.once('exit', () => rmSync(directory, { recursive: true, force: true }));+const releaseTestAuthorityRegistry = (): void => {+ rmSync(directory, { recursive: true, force: true });+ process.off('exit', releaseTestAuthorityRegistry);+};++export { releaseTestAuthorityRegistry };++process.once('exit', releaseTestAuthorityRegistry);diff --git a/test-support/server-authority-registry.uncached.test.ts b/test-support/server-authority-registry.uncached.test.tsnew file mode 100644index 000000000..458a583ad--- /dev/null+++ b/test-support/server-authority-registry.uncached.test.ts@@ -0,0 +1,243 @@+import { existsSync, readdirSync } from 'node:fs';+import { dirname, join, relative, sep } from 'node:path';+import { fileURLToPath } from 'node:url';+import { expect, test } from 'vitest';+import type { ViteUserConfig } from 'vitest/config';+import { createVitest, type Reporter, type TestModule } from 'vitest/node';+import type {} from './fixtures/server-authority-observation.test-helper.ts';+import { withTempDir } from './temp-dir.test-helper.ts';+import { trackedFiles } from './vitest-configs.test-helper.ts';++const root = fileURLToPath(new URL('..', import.meta.url));+const ownerPreload = new URL('./fixtures/server-authority-owner.test-helper.mjs', import.meta.url)+ .href;+const observationSetup = fileURLToPath(+ new URL('./fixtures/server-authority-observation.test-helper.ts', import.meta.url),+);+const observationOverrides: ViteUserConfig = { test: { setupFiles: [observationSetup] } };+const scriptsConfig = 'vitest.scripts.config.ts';+const serverConfig = 'packages/server/vitest.config.ts';+const helperFixture = relative(+ root,+ fileURLToPath(new URL('./fixtures/server-authority-registry.fixture.ts', import.meta.url)),+)+ .split(sep)+ .join('/');++function createRegistryRunner(+ temp: string,+ file: string,+ testNamePattern: string,+ config: string,+ reporter: Reporter,+) {+ const configPath = join(root, config);+ const projectRoot = dirname(configPath);+ return createVitest(+ {+ root: projectRoot,+ config: configPath,+ watch: false,+ include: [relative(projectRoot, join(root, file)).split(sep).join('/')],+ testNamePattern,+ maxWorkers: 1,+ pool: 'forks',+ execArgv: ['--import', ownerPreload],+ env: { TMPDIR: temp, TMP: temp, TEMP: temp },+ reporters: [reporter],+ },+ observationOverrides,+ );+}++async function runConsumer(+ temp: string,+ file: string,+ name: string,+ config: string,+): Promise<Set<string>> {+ const allocated = new Set<string>();+ let testModules: TestModule[] = [];+ const runner = await createRegistryRunner(temp, file, `^${name}$`, config, {});+ try {+ const result = await runner.start();+ expect(result.unhandledErrors).toEqual([]);+ testModules = result.testModules;+ } finally {+ await runner.close();+ }+ const executed = testModules+ .flatMap((module) => [...module.children.allTests()])+ .filter((testCase) => testCase.name === name);+ expect(+ executed.map((testCase) => ({+ name: testCase.name,+ state: testCase.result().state,+ errors: testCase.result().errors?.map(({ message }) => message) ?? [],+ })),+ ).toEqual([{ name, state: 'passed', errors: [] }]);+ for (const testCase of executed) {+ const directories = testCase.meta().authorityRegistryDirectories;+ if (directories === undefined) throw new Error(`No registry observation recorded for ${name}`);+ for (const directory of directories) allocated.add(directory);+ }+ return allocated;+}++test.each([+ {+ consumer: 'composition rig',+ file: helperFixture,+ name: 'composition rig uses the shared authority registry',+ config: scriptsConfig,+ },+ {+ consumer: 'integration server',+ file: helperFixture,+ name: 'integration server uses the shared authority registry',+ config: scriptsConfig,+ },+ {+ consumer: 'restartable server',+ file: helperFixture,+ name: 'restartable server uses the shared authority registry',+ config: scriptsConfig,+ },+ {+ consumer: 'nested project authority',+ file: 'packages/server/src/nested-project-authority.test.ts',+ name: 'missing cached documents wait for offline removal reconciliation, not existing documents',+ config: serverConfig,+ },+])(+ 'Vitest releases the shared authority registry after $consumer completes',+ async ({ file, name, config }) => {+ await withTempDir('ok-registry-lifecycle-', async (temp) => {+ const allocated = await runConsumer(temp, file, name, config);+ expect(allocated.size).toBeGreaterThan(0);+ expect([...allocated].filter((directory) => existsSync(directory))).toEqual([]);+ });+ },+);++test('native upload fixture remains usable through the composition rig', async () => {+ await withTempDir('ok-registry-native-consumer-', async (temp) => {+ await runConsumer(+ temp,+ 'packages/server/src/api-skill-import-composition.test.ts',+ 'disconnect during an incomplete multipart request retains staging while the listener stays usable',+ serverConfig,+ );+ });+});++test('Vitest leaves no authority directory when every importing fixture test is filtered out', async () => {+ await withTempDir('ok-registry-filtered-', async (temp) => {+ const previousExitCode = process.exitCode;+ const runner = await createRegistryRunner(+ temp,+ helperFixture,+ '^no authority fixture test has this name$',+ scriptsConfig,+ {},+ );+ try {+ const result = await runner.start();+ expect(result.unhandledErrors).toEqual([]);+ expect(+ result.testModules.map((module) => ({+ file: relative(root, module.moduleId).split(sep).join('/'),+ state: module.state(),+ errors: module.errors(),+ cases: [...module.children.allTests()].map((testCase) => ({+ name: testCase.name,+ state: testCase.result().state,+ })),+ })),+ ).toEqual([+ {+ file: helperFixture,+ state: 'skipped',+ errors: [],+ cases: [+ { name: 'composition rig uses the shared authority registry', state: 'skipped' },+ { name: 'integration server uses the shared authority registry', state: 'skipped' },+ { name: 'restartable server uses the shared authority registry', state: 'skipped' },+ ],+ },+ ]);+ } finally {+ try {+ await runner.close();+ } finally {+ process.exitCode = previousExitCode;+ }+ }+ expect(readdirSync(temp).filter((entry) => entry.startsWith('ok-test-authority-'))).toEqual([]);+ });+});++test('Vitest leaves no authority directory after an importing fixture fails collection', async () => {+ await withTempDir('ok-registry-collection-', async (temp) => {+ const file = relative(+ root,+ fileURLToPath(+ new URL('./fixtures/server-authority-collection-failure.fixture.ts', import.meta.url),+ ),+ )+ .split(sep)+ .join('/');+ const previousExitCode = process.exitCode;+ const runner = await createRegistryRunner(temp, file, '.*', scriptsConfig, {});+ try {+ const result = await runner.start();+ expect(result.unhandledErrors).toEqual([]);+ expect(+ result.testModules.map((module) => ({+ file: relative(root, module.moduleId).split(sep).join('/'),+ state: module.state(),+ errors: module.errors().map(({ message, cause }) => ({ message, cause })),+ cases: [...module.children.allTests()],+ })),+ ).toEqual([+ {+ file,+ state: 'failed',+ errors: [+ {+ message: 'Registry fixture collection failed after import',+ cause: expect.stringContaining(join(temp, 'ok-test-authority-')),+ },+ ],+ cases: [],+ },+ ]);+ } finally {+ try {+ await runner.close();+ } finally {+ process.exitCode = previousExitCode;+ }+ }+ expect(readdirSync(temp).filter((entry) => entry.startsWith('ok-test-authority-'))).toEqual([]);+ });+});++test.each([+ ...trackedFiles(root, ['vitest.config.ts']),+ scriptsConfig,+ serverConfig,+ 'packages/app/vitest.config.ts',+ 'packages/cli/vitest.config.ts',+])('Vitest releases the shared authority registry under %s', async (config) => {+ await withTempDir('ok-registry-config-', async (temp) => {+ const allocated = await runConsumer(+ temp,+ helperFixture,+ 'composition rig uses the shared authority registry',+ config,+ );+ expect(allocated.size).toBeGreaterThan(0);+ expect([...allocated].filter((directory) => existsSync(directory))).toEqual([]);+ });+});diff --git a/test-support/temporary-resource-cleanup.uncached.test.ts b/test-support/temporary-resource-cleanup.uncached.test.tsnew file mode 100644index 000000000..5e504507d--- /dev/null+++ b/test-support/temporary-resource-cleanup.uncached.test.ts@@ -0,0 +1,150 @@+import { existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync } from 'node:fs';+import { join } from 'node:path';+import { expect, test, vi } from 'vitest';+import { createRestartableServer } from '../packages/app/tests/integration/restartable-server.test-helper.ts';+import { createTestServer } from '../packages/app/tests/integration/test-harness.ts';+import { bootCompositionRig } from '../packages/server/src/composition-rig.test-helper.ts';+import { withTempDir } from './temp-dir.test-helper.ts';++async function withIsolatedTemp(fn: (root: string) => Promise<void>): Promise<void> {+ await withTempDir('ok-acquisition-cleanup-', async (root) => {+ for (const key of ['TMPDIR', 'TMP', 'TEMP']) vi.stubEnv(key, root);+ try {+ await fn(root);+ } finally {+ vi.unstubAllEnvs();+ }+ });+}++function callerHome(root: string, provided: boolean): string | undefined {+ const home = join(root, 'caller-home');+ mkdirSync(home);+ writeFileSync(join(home, 'keep.txt'), 'caller-owned');+ return provided ? home : undefined;+}++test.each([false, true])(+ 'composition rig releases a rejected acquisition without deleting caller paths (provided home: %s)',+ async (provided) => {+ await withIsolatedTemp(async (root) => {+ const content = join(root, 'content');+ mkdirSync(content);+ writeFileSync(join(content, 'one.md'), '# One\n');+ mkdirSync(join(root, 'preview', '.ok'), { recursive: true });+ writeFileSync(join(root, 'preview', '.ok', 'config.yml'), '');+ const configHomedirOverride = callerHome(root, provided);+ const owner = await bootCompositionRig(content, {+ projectDir: join(root, 'preview'),+ ephemeral: true,+ singleDocRelPath: 'one.md',+ });+ try {+ await owner.ready;+ const before = readdirSync(root).sort();+ expect(before.some((name) => name.startsWith('ok-rig-home-'))).toBe(true);+ const failure: unknown = await bootCompositionRig(content, {+ configHomedirOverride,+ }).then(+ async (unexpected) => {+ await unexpected.destroy();+ return undefined;+ },+ (error: unknown) => error,+ );+ expect(failure).toBeInstanceOf(Error);+ expect(String(failure)).toMatch(/content ownership is already held/i);+ expect.soft(readdirSync(root).sort()).toEqual(before);+ expect(readFileSync(join(content, 'one.md'), 'utf8')).toBe('# One\n');+ expect(readFileSync(join(root, 'caller-home', 'keep.txt'), 'utf8')).toBe('caller-owned');+ } finally {+ await owner.destroy();+ }+ });+ },+);++test.each([false, true])(+ 'integration server releases a rejected acquisition without deleting caller paths (provided home: %s)',+ async (provided) => {+ await withIsolatedTemp(async (root) => {+ const configHomedirOverride = callerHome(root, provided);+ const owner = await createTestServer();+ try {+ const before = readdirSync(root).sort();+ expect(before.some((name) => name.startsWith('ok-test-home-'))).toBe(true);+ const failure: unknown = await createTestServer({+ contentDir: owner.contentDir,+ keepContentDir: true,+ configHomedirOverride,+ }).then(+ async (unexpected) => {+ await unexpected.cleanup();+ return undefined;+ },+ (error: unknown) => error,+ );+ expect(failure).toMatchObject({ name: 'ServerLockCollisionError' });+ expect.soft(readdirSync(root).sort()).toEqual(before);+ expect(existsSync(join(owner.contentDir, 'test-doc.md'))).toBe(true);+ expect(readFileSync(join(root, 'caller-home', 'keep.txt'), 'utf8')).toBe('caller-owned');+ } finally {+ await owner.cleanup();+ }+ });+ },+);++test.each([false, true])(+ 'integration server releases owned paths when setup fails before the server exists (provided home: %s)',+ async (provided) => {+ await withIsolatedTemp(async (root) => {+ const configHomedirOverride = callerHome(root, provided);+ const missingProjectDir = join(root, 'missing-project');+ const before = readdirSync(root).sort();+ const failure: unknown = await createTestServer({+ configHomedirOverride,+ projectDir: missingProjectDir,+ }).then(+ async (unexpected) => {+ await unexpected.cleanup();+ return undefined;+ },+ (error: unknown) => error,+ );+ expect(failure).toMatchObject({+ code: 'ENOENT',+ path: expect.stringMatching(/missing-project$/),+ });+ expect.soft(readdirSync(root).sort()).toEqual(before);+ expect(readFileSync(join(root, 'caller-home', 'keep.txt'), 'utf8')).toBe('caller-owned');+ });+ },+);++test.each([false, true])(+ 'restartable server releases a rejected acquisition without deleting caller paths (provided home: %s)',+ async (provided) => {+ await withIsolatedTemp(async (root) => {+ const content = join(root, 'content');+ mkdirSync(content);+ writeFileSync(join(content, '.ok'), 'caller-owned file');+ const configHomedirOverride = callerHome(root, provided);+ const before = readdirSync(root).sort();+ const failure: unknown = await createRestartableServer({+ contentDir: content,+ configHomedirOverride,+ }).then(+ async (unexpected) => {+ await unexpected.shutdown();+ return undefined;+ },+ (error: unknown) => error,+ );+ expect(failure).toMatchObject({ code: 'EEXIST' });+ expect.soft(readdirSync(root).sort()).toEqual(before);+ expect(readFileSync(join(content, '.ok'), 'utf8')).toBe('caller-owned file');+ expect(readFileSync(join(root, 'caller-home', 'keep.txt'), 'utf8')).toBe('caller-owned');+ });+ },+);diff --git a/vitest.scripts.config.ts b/vitest.scripts.config.tsindex da4b38d7f..d7c567f14 100644--- a/vitest.scripts.config.ts+++ b/vitest.scripts.config.ts@@ -1,10 +1,16 @@+import { fileURLToPath } from 'node:url';import { defineConfig } from 'vitest/config';import { okVitestBase } from './test-support/vitest.base';+const serverAuthorityRegistrySetup = fileURLToPath(+ new URL('./test-support/server-authority-registry.setup.ts', import.meta.url),+);+export default defineConfig({...okVitestBase,test: {...okVitestBase.test,+ setupFiles: [...okVitestBase.test.setupFiles, serverAuthorityRegistrySetup],include: ['scripts/**/*.test.mjs','.github/scripts/**/*.test.mjs',