refactor: share best-effort daemon test cleanup

Author: thymikee

test/integration/daemon-replace-exit-flush.test.ts

@@ -1,3 +1,4 @@
+import { cleanupDaemonTestState } from './support/daemon-test-cleanup.ts';
 import test from 'node:test';
 import assert from 'node:assert/strict';
 import fs from 'node:fs';
@@ -84,20 +85,8 @@ test('daemon replace mid-command returns a structured, parseable error and exits
     // `finally` retry below rather than have
     // the state dir removed out from under a daemon that is still running.
     await assertNoDaemonLeaks({ stateDir, daemonPids, phase: 'after-shutdown' });
-    info = null;
   } finally {
-    try {
-      if (info) {
-        const termination = await stopDaemonProcess(
-          { pid: info.pid, startTime: info.processStartTime ?? null },
-          { mode: 'graceful', termTimeoutMs: 1_500, killTimeoutMs: 1_500 },
-        );
-        assert.notEqual(termination.status, 'retained', JSON.stringify(termination));
-      }
-      fs.rmSync(stateDir, { recursive: true, force: true });
-    } catch (error) {
-      console.warn('Daemon test cleanup retained state:', stateDir, error);
-    }
+    await cleanupDaemonTestState(stateDir, info);
   }
 });
 

test/integration/smoke-daemon-clean.test.ts

@@ -1,3 +1,4 @@
+import { cleanupDaemonTestState } from './support/daemon-test-cleanup.ts';
 import test from 'node:test';
 import assert from 'node:assert/strict';
 import fs from 'node:fs';
@@ -6,7 +7,6 @@ import path from 'node:path';
 import { skipWhenLoopbackUnavailable } from '../../src/__tests__/test-utils/loopback.ts';
 import { runCmdSync } from '@agent-device/host-kit/command';
 import { isProcessAlive, readProcessStartTime } from '@agent-device/host-kit/process';
-import { stopDaemonProcess } from '../../src/daemon-process.ts';
 
 import { assertNoDaemonLeaks } from './support/daemon-leak-oracle.ts';
 import { runCliJson } from './test-helpers.ts';
@@ -77,18 +77,7 @@ test('clean daemon script stops a live daemon before removing metadata', async (
     // leave only classified artifacts in its state dir.
     await assertNoDaemonLeaks({ stateDir, daemonPids: [info.pid], phase: 'after-shutdown' });
   } finally {
-    try {
-      if (info) {
-        const termination = await stopDaemonProcess(
-          { pid: info.pid, startTime: info.processStartTime ?? null },
-          { mode: 'graceful', termTimeoutMs: 1_500, killTimeoutMs: 1_500 },
-        );
-        assert.notEqual(termination.status, 'retained', JSON.stringify(termination));
-      }
-      fs.rmSync(stateDir, { recursive: true, force: true });
-    } catch (error) {
-      console.warn('Daemon test cleanup retained state:', stateDir, error);
-    }
+    await cleanupDaemonTestState(stateDir, info);
   }
 });
 

test/integration/smoke-daemon-http.test.ts

@@ -1,3 +1,4 @@
+import { cleanupDaemonTestState } from './support/daemon-test-cleanup.ts';
 import test from 'node:test';
 import assert from 'node:assert/strict';
 import fs from 'node:fs';
@@ -24,6 +25,7 @@ test('daemon HTTP transport starts from CLI and accepts a command RPC', async (t
   }
 
   const stateDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agent-device-http-smoke-'));
+  let info: DaemonInfo | null = null;
   try {
     const args = [
       'session',
@@ -46,7 +48,7 @@ test('daemon HTTP transport starts from CLI and accepts a command RPC', async (t
     assert.equal(cli.status, 0, formatResultDebug('start HTTP daemon', ['session', 'list'], cli));
     assert.equal(cli.json?.success, true, JSON.stringify(cli.json));
 
-    const info = readDaemonInfo(stateDir);
+    info = readDaemonInfo(stateDir);
     assert.equal(info.transport, 'http');
     assert.equal(typeof info.httpPort, 'number');
     assert.ok((info.httpPort ?? 0) > 0);
@@ -73,14 +75,7 @@ test('daemon HTTP transport starts from CLI and accepts a command RPC', async (t
     await stopDaemon(info);
     await assertNoDaemonLeaks({ stateDir, daemonPids: [info.pid], phase: 'after-shutdown' });
   } finally {
-    try {
-      if (fs.existsSync(path.join(stateDir, 'daemon.json'))) {
-        await stopDaemon(readDaemonInfo(stateDir));
-      }
-      fs.rmSync(stateDir, { recursive: true, force: true });
-    } catch (error) {
-      console.warn('Daemon test cleanup retained state:', stateDir, error);
-    }
+    await cleanupDaemonTestState(stateDir, info);
   }
 });
 

test/integration/support/daemon-test-cleanup.ts

@@ -0,0 +1,39 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import { normalizeError } from '@agent-device/kernel/errors';
+import { stopDaemonProcess } from '../../../src/daemon-process.ts';
+
+type TestDaemonIdentity = { pid: number; processStartTime?: string };
+
+/** Best-effort cleanup keeps primary test failures and unconfirmed daemon state. */
+export async function cleanupDaemonTestState(
+  stateDir: string,
+  observed: TestDaemonIdentity | null,
+): Promise<void> {
+  try {
+    const identity = observed ?? readIdentity(stateDir);
+    if (!identity) throw new Error('No daemon lifetime was observed');
+    const termination = await stopDaemonProcess(
+      { pid: identity.pid, startTime: identity.processStartTime ?? null },
+      { mode: 'graceful', termTimeoutMs: 1_500, killTimeoutMs: 1_500 },
+    );
+    if (termination.status !== 'exited') {
+      console.warn('Daemon test cleanup retained state:', stateDir, termination);
+      return;
+    }
+    fs.rmSync(stateDir, { recursive: true, force: true });
+  } catch (error) {
+    console.warn('Daemon test cleanup retained state:', stateDir, normalizeError(error));
+  }
+}
+
+function readIdentity(stateDir: string): TestDaemonIdentity | null {
+  try {
+    return JSON.parse(
+      fs.readFileSync(path.join(stateDir, 'daemon.json'), 'utf8'),
+    ) as TestDaemonIdentity;
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code === 'ENOENT') return null;
+    throw error;
+  }
+}