diff --git a/packages/test-kit/src/registered-daemon-launch-plan.test.ts b/packages/test-kit/src/registered-daemon-launch-plan.test.ts index ab4a511bd8..dd6835ae0f 100644 --- a/packages/test-kit/src/registered-daemon-launch-plan.test.ts +++ b/packages/test-kit/src/registered-daemon-launch-plan.test.ts @@ -1,7 +1,7 @@ import assert from 'node:assert/strict'; import fs from 'node:fs'; import path from 'node:path'; -import { afterEach, test, vi } from 'vitest'; +import { afterEach, expectTypeOf, test, vi } from 'vitest'; import { createRegisteredDaemonFixtures, type RegisteredDaemonChild, @@ -155,3 +155,33 @@ test('a failed child join does not prevent teardown from stopping the remaining 'failed cleanup must retain state for diagnosis', ); }); + +test('exit gates delay the returned launch but are not accepted on companions', async () => { + const f = fixture(); + let release!: () => void; + const exitGate = new Promise((resolve) => { + release = resolve; + }); + const step = { kind: 'registered' as const, paths: f.paths, fields: {} }; + type RegisteredLaunch = Extract< + Parameters[0][number], + { kind: 'registered' } + >; + type Companion = NonNullable[number]; + expectTypeOf }>().not.toExtend(); + const launch = f.fixtures.planRegisteredDaemonLaunches([ + { ...step, exitGate, companions: [step] }, + ]); + const child = launch('node', []); + let exited = false; + void child.exited.then(() => { + exited = true; + }); + await Promise.resolve(); + assert.equal(f.launches(), 2); + assert.equal(exited, false, 'the returned child must wait for its exit gate'); + release(); + assert.equal(await child.exited, await f.child.exited); + await f.fixtures.finishRegisteredDaemonFixtures(); + assert.equal(f.stops(), 2); +}); diff --git a/packages/test-kit/src/registered-daemon-launch-plan.ts b/packages/test-kit/src/registered-daemon-launch-plan.ts index 2437d1b7b8..39def75b08 100644 --- a/packages/test-kit/src/registered-daemon-launch-plan.ts +++ b/packages/test-kit/src/registered-daemon-launch-plan.ts @@ -17,7 +17,9 @@ export type DaemonFixtureLaunch = }; exitGate?: Promise; observe?: (child: RegisteredDaemonChild) => void; - companions?: readonly Extract, { kind: 'registered' }>[]; + companions?: readonly (Extract, { kind: 'registered' }> & { + exitGate?: never; + })[]; }; export type DaemonFixtureLaunchStep = diff --git a/test/repo-guards/daemon-fixture-launches.test.ts b/test/repo-guards/daemon-fixture-launches.test.ts index 84ff915cef..4aa822c89e 100644 --- a/test/repo-guards/daemon-fixture-launches.test.ts +++ b/test/repo-guards/daemon-fixture-launches.test.ts @@ -7,13 +7,17 @@ import { REPO_ROOT } from '@agent-device/test-kit'; import { scanDaemonFixtureLaunches } from '../../scripts/lib/daemon-fixture-launch-guard.ts'; test('daemon fixture family mocks use declared launch plans', () => { - const files = execFileSync('git', ['ls-files', '--cached', '--others', '--exclude-standard'], { - cwd: REPO_ROOT, - encoding: 'utf8', - }) - .trim() - .split('\n') + const files = execFileSync( + 'git', + ['ls-files', '-z', '--cached', '--others', '--exclude-standard'], + { + cwd: REPO_ROOT, + encoding: 'utf8', + }, + ) + .split('\0') .filter((file) => /^(src\/|packages\/[^/]+\/src\/).*\.ts$/.test(file)) + .filter((file) => fs.existsSync(path.join(REPO_ROOT, file))) .map((file) => ({ file, source: fs.readFileSync(path.join(REPO_ROOT, file), 'utf8') })); assert.deepEqual(scanDaemonFixtureLaunches(files), []); });