Skip to content

Commit 359e453

Browse files
committed
fix(daemon): retire only the captured failed startup
1 parent 681b785 commit 359e453

6 files changed

Lines changed: 93 additions & 373 deletions

‎src/daemon-client/__tests__/daemon-client-lifecycle.test.ts‎

Lines changed: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ function mockSocketErrorAfterWrite(failingPort: number): {
314314
};
315315
}
316316

317-
test('sendToDaemon retries daemon spawn failures and cleans partial metadata on terminal failure', async () => {
317+
test('sendToDaemon retains unknown metadata after a spawn failure', async () => {
318318
const stateDir = makeTempStateDir('agent-device-daemon-spawn-retry-');
319319
const paths = resolveDaemonPaths(stateDir);
320320
vi.stubEnv('AGENT_DEVICE_STATE_DIR', stateDir);
@@ -345,25 +345,17 @@ test('sendToDaemon retries daemon spawn failures and cleans partial metadata on
345345

346346
assert.ok(thrown instanceof AppError);
347347
assert.equal(thrown.message, 'Failed to start daemon');
348-
assert.equal(thrown.details?.startError, 'spawn failed 2');
349-
assert.equal(thrown.details?.startupAttempts, 2);
350-
const cleanupResults = thrown.details?.cleanupResults;
351-
assert.ok(Array.isArray(cleanupResults));
352-
assert.deepEqual(
353-
cleanupResults.map((result) => ({
354-
reason: result.reason,
355-
removedInfo: result.removedInfo,
356-
removedLock: result.removedLock,
357-
})),
358-
[
359-
{ reason: 'start_error', removedInfo: true, removedLock: true },
360-
{ reason: 'start_error', removedInfo: true, removedLock: true },
361-
],
362-
);
363-
assert.equal(attempts, 2);
364-
assert.equal(mockSleep.mock.calls[0]?.[0], 150);
365-
assert.equal(fs.existsSync(paths.infoPath), false);
366-
assert.equal(fs.existsSync(paths.lockPath), false);
348+
assert.equal(fs.readFileSync(paths.infoPath, 'utf8'), '{"partial":true}\n');
349+
assert.equal(fs.readFileSync(paths.lockPath, 'utf8'), 'not-json\n');
350+
assert.equal(thrown.details?.startError, 'spawn failed 1');
351+
assert.equal(thrown.details?.startupAttempts, 1);
352+
const results = thrown.details?.cleanupResults as Array<{
353+
status: string;
354+
removedInfo: boolean;
355+
}>;
356+
assert.equal(results[0]?.status, 'retained');
357+
assert.equal(results[0]?.removedInfo, false);
358+
assert.equal(attempts, 1);
367359
} finally {
368360
fs.rmSync(stateDir, { recursive: true, force: true });
369361
}

‎src/daemon-client/__tests__/daemon-client-metadata.test.ts‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ import path from 'node:path';
55
import { afterEach, test, vi } from 'vitest';
66
import type { DaemonCodeOrigin } from '@agent-device/host-kit/code-signature';
77
import { mkdtempForTestSync } from '../../__tests__/test-utils/tmp-dir.ts';
8-
import { tryAcquireDaemonRegistration } from '../../daemon-registration-owner.ts';
8+
import {
9+
stopAndRetireDaemon,
10+
tryAcquireDaemonRegistration,
11+
} from '../../daemon-registration-owner.ts';
912
import {
1013
readDaemonInfo,
11-
cleanupFailedDaemonStartupMetadata,
1214
stopDaemonProcessForTakeover,
1315
type DaemonInfo,
1416
} from '../daemon-client-metadata.ts';
@@ -81,13 +83,15 @@ for (const artifact of ['daemon.json', 'daemon.lock']) {
8183
fs.writeFileSync(file, contents);
8284
vi.mocked(isAgentDeviceDaemonProcess).mockReturnValue(true);
8385
vi.mocked(stopDaemonProcess).mockResolvedValue({ status: 'retained', reason: 'exit-timeout' });
84-
const result = await cleanupFailedDaemonStartupMetadata(paths, 'start_error');
86+
const result = await stopAndRetireDaemon({
87+
paths,
88+
observed: { pid: 7, startTime: 'start' },
89+
mode: 'graceful',
90+
});
8591
assert.equal(fs.readFileSync(file, 'utf8'), contents);
8692
assert.equal(result.removedInfo, false);
87-
assert.equal(result.removedLock, false);
88-
assert.equal(result.stoppedInfoProcess, false);
89-
assert.equal(result.stoppedLockProcess, false);
90-
assert.match(result.error ?? '', /exit could not be confirmed/);
93+
assert.equal(result.status, 'retained');
94+
if (result.status === 'retained') assert.equal(result.reason, 'exit-unconfirmed');
9195
});
9296
}
9397

‎src/daemon-client/__tests__/daemon-client-startup-race.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ test('a start race won by an older daemon replaces it instead of adopting it', a
200200
}),
201201
);
202202
assert.equal(fixture.rpcRequests.length, 0);
203-
assert.equal(launches, 2);
203+
assert.equal(launches, 1);
204204
assert.match(
205205
String(stderr.mock.calls.flat().join('')),
206206
/Replacing daemon \(pid 43300, v0\.0\.1\)/,

‎src/daemon-client/__tests__/daemon-client.test.ts‎

Lines changed: 3 additions & 180 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { RequestProgressEvent } from '@agent-device/contracts/progress';
2-
import { test, vi } from 'vitest';
2+
import { test } from 'vitest';
33
import assert from 'node:assert/strict';
44
import http from 'node:http';
55
import net from 'node:net';
@@ -11,57 +11,18 @@ import {
1111
listenOnLoopback,
1212
supportsLoopbackBind,
1313
} from '../../__tests__/test-utils/loopback.ts';
14-
import { runCmdBackground } from '@agent-device/host-kit/command';
15-
import {
16-
isProcessAlive,
17-
readProcessCommand,
18-
readProcessStartTime,
19-
waitForProcessExit,
20-
} from '@agent-device/host-kit/process';
14+
import { readProcessStartTime } from '@agent-device/host-kit/process';
2115
import { sendToDaemon } from '../daemon-client.ts';
2216
import { currentDaemonCodeSignature } from '../../__tests__/test-utils/daemon-http-fixture.ts';
2317
import { computeDaemonCodeSignature } from '@agent-device/host-kit/code-signature';
2418
import { downloadRemoteArtifact } from '../../remote/daemon-artifacts.ts';
25-
import {
26-
cleanupFailedDaemonStartupMetadata,
27-
resolveDaemonStartupHint,
28-
} from '../daemon-client-metadata.ts';
19+
import { resolveDaemonStartupHint } from '../daemon-client-metadata.ts';
2920
import { canConnectSocket } from '../daemon-client-transport.ts';
3021
import { DAEMON_RPC_PROTOCOL_VERSION } from '@agent-device/contracts/daemon-http';
3122
import { resolveDaemonPaths } from '../../daemon-resolution.ts';
3223
import { readVersion } from '@agent-device/host-kit/version';
3324
import { mkdtempForTestSync } from '../../__tests__/test-utils/tmp-dir.ts';
3425

35-
// readProcessStartTime/readProcessCommand shell out to `ps` with a 1s
36-
// timeout (see host-process.ts). isAgentDeviceDaemonProcess re-reads both for
37-
// every liveness check, so a spawned-daemon fixture that is proven live once
38-
// (a real read, right after the process starts) can still be misclassified
39-
// as dead later if a *subsequent* `ps` call happens to miss its deadline
40-
// under full-suite CPU contention. mockReadProcessStartTime/mockReadProcessCommand
41-
// default to `undefined`, which falls through to the real implementation for
42-
// every pid in every test in this file; only the one test below that needs a
43-
// stable answer for its spawned pid configures an override, and clears it
44-
// afterward.
45-
const { mockReadProcessStartTime, mockReadProcessCommand } = vi.hoisted(() => ({
46-
mockReadProcessStartTime: vi.fn<(pid: number) => string | null | undefined>(),
47-
mockReadProcessCommand: vi.fn<(pid: number) => string | null | undefined>(),
48-
}));
49-
50-
vi.mock('@agent-device/host-kit/process', async (importOriginal) => {
51-
const actual = await importOriginal<typeof import('@agent-device/host-kit/process')>();
52-
return {
53-
...actual,
54-
readProcessStartTime: (pid: number) => {
55-
const overridden = mockReadProcessStartTime(pid);
56-
return overridden !== undefined ? overridden : actual.readProcessStartTime(pid);
57-
},
58-
readProcessCommand: (pid: number) => {
59-
const overridden = mockReadProcessCommand(pid);
60-
return overridden !== undefined ? overridden : actual.readProcessCommand(pid);
61-
},
62-
};
63-
});
64-
6526
type MockHttpResponse = EventEmitter & {
6627
headers?: Record<string, string>;
6728
statusCode?: number;
@@ -219,144 +180,6 @@ test('resolveDaemonStartupHint shell-quotes cleanup paths', () => {
219180
);
220181
});
221182

222-
test('cleanupFailedDaemonStartupMetadata removes partial startup metadata', async () => {
223-
const stateDir = mkdtempForTestSync('agent-device-daemon-cleanup-');
224-
const paths = resolveDaemonPaths(stateDir);
225-
try {
226-
fs.mkdirSync(paths.baseDir, { recursive: true });
227-
fs.writeFileSync(paths.infoPath, '{"invalid":true}\n', 'utf8');
228-
fs.writeFileSync(paths.lockPath, 'not-json\n', 'utf8');
229-
230-
const result = await cleanupFailedDaemonStartupMetadata(paths, 'startup_timeout');
231-
232-
assert.deepEqual(result, {
233-
reason: 'startup_timeout',
234-
removedInfo: true,
235-
removedLock: true,
236-
stoppedInfoProcess: false,
237-
stoppedLockProcess: false,
238-
});
239-
assert.equal(fs.existsSync(paths.infoPath), false);
240-
assert.equal(fs.existsSync(paths.lockPath), false);
241-
} finally {
242-
fs.rmSync(stateDir, { recursive: true, force: true });
243-
}
244-
});
245-
246-
test('cleanupFailedDaemonStartupMetadata retains live startup daemon on timeout', async (t) => {
247-
const stateDir = mkdtempForTestSync('agent-device-daemon-live-cleanup-');
248-
const root = mkdtempForTestSync('agent-device-live-daemon-');
249-
const daemonDir = path.join(root, 'agent-device', 'dist', 'src', 'internal');
250-
const daemonScriptPath = path.join(daemonDir, 'daemon.js');
251-
fs.mkdirSync(daemonDir, { recursive: true });
252-
fs.writeFileSync(daemonScriptPath, 'setInterval(() => {}, 1000);\n', 'utf8');
253-
const daemonProcess = runCmdBackground(process.execPath, [daemonScriptPath], {
254-
stdio: 'ignore',
255-
allowFailure: true,
256-
captureOutput: false,
257-
});
258-
void daemonProcess.wait.catch(() => {});
259-
const pid = daemonProcess.child.pid;
260-
assert.ok(pid, 'spawned child should have a pid');
261-
262-
try {
263-
await new Promise((resolve) => setTimeout(resolve, 50));
264-
// Read the spawned daemon's real identity once (ground truth: it is
265-
// genuinely alive, with this real start time and command line), then
266-
// pin readProcessStartTime/readProcessCommand to keep returning these
267-
// same proven-real values for this pid. isAgentDeviceDaemonProcess reads
268-
// both again internally on every call inside cleanupFailedDaemonStartupMetadata;
269-
// without pinning, a second real `ps` call could miss its 1s timeout
270-
// under load and misclassify this genuinely-live daemon as dead.
271-
const processStartTime = readProcessStartTime(pid) ?? undefined;
272-
const command = readProcessCommand(pid);
273-
if (command === null || processStartTime === undefined) {
274-
t.skip('process command/start inspection is unavailable in this environment');
275-
return;
276-
}
277-
mockReadProcessStartTime.mockImplementation((queriedPid: number) =>
278-
queriedPid === pid ? processStartTime : undefined,
279-
);
280-
mockReadProcessCommand.mockImplementation((queriedPid: number) =>
281-
queriedPid === pid ? command : undefined,
282-
);
283-
284-
const paths = resolveDaemonPaths(stateDir);
285-
fs.mkdirSync(paths.baseDir, { recursive: true });
286-
fs.writeFileSync(
287-
paths.infoPath,
288-
`${JSON.stringify({
289-
token: 'startup-secret',
290-
port: 65530,
291-
transport: 'socket',
292-
pid,
293-
processStartTime,
294-
})}\n`,
295-
'utf8',
296-
);
297-
fs.writeFileSync(
298-
paths.lockPath,
299-
`${JSON.stringify({ pid, processStartTime, startedAt: Date.now() })}\n`,
300-
'utf8',
301-
);
302-
303-
const result = await cleanupFailedDaemonStartupMetadata(paths, 'startup_timeout', {
304-
stopLiveProcesses: false,
305-
});
306-
307-
assert.equal(result.retainedInfoProcess, true);
308-
assert.equal(result.retainedLockProcess, true);
309-
assert.equal(result.removedInfo, false);
310-
assert.equal(result.removedLock, false);
311-
assert.equal(isProcessAlive(pid), true);
312-
assert.equal(fs.existsSync(paths.infoPath), true);
313-
assert.equal(fs.existsSync(paths.lockPath), true);
314-
} finally {
315-
mockReadProcessStartTime.mockReset();
316-
mockReadProcessCommand.mockReset();
317-
if (isProcessAlive(pid)) {
318-
process.kill(pid, 'SIGKILL');
319-
await waitForProcessExit(pid, 1_500);
320-
}
321-
fs.rmSync(stateDir, { recursive: true, force: true });
322-
fs.rmSync(root, { recursive: true, force: true });
323-
}
324-
});
325-
326-
test('cleanupFailedDaemonStartupMetadata removes stale daemon metadata on timeout', async () => {
327-
const stateDir = mkdtempForTestSync('agent-device-daemon-stale-cleanup-');
328-
const paths = resolveDaemonPaths(stateDir);
329-
try {
330-
fs.mkdirSync(paths.baseDir, { recursive: true });
331-
fs.writeFileSync(
332-
paths.infoPath,
333-
`${JSON.stringify({
334-
token: 'startup-secret',
335-
port: 65530,
336-
transport: 'socket',
337-
pid: 999_999,
338-
})}\n`,
339-
'utf8',
340-
);
341-
fs.writeFileSync(
342-
paths.lockPath,
343-
`${JSON.stringify({ pid: 999_999, startedAt: Date.now() })}\n`,
344-
'utf8',
345-
);
346-
347-
const result = await cleanupFailedDaemonStartupMetadata(paths, 'startup_timeout', {
348-
stopLiveProcesses: false,
349-
});
350-
351-
assert.equal(result.removedInfo, true);
352-
assert.equal(result.removedLock, true);
353-
assert.equal(fs.existsSync(paths.infoPath), false);
354-
assert.equal(fs.existsSync(paths.lockPath), false);
355-
} finally {
356-
fs.rmSync(stateDir, { recursive: true, force: true });
357-
}
358-
});
359-
360183
test('canConnectSocket times out stalled local daemon probes', async () => {
361184
const originalCreateConnection = net.createConnection;
362185
let timeoutMs: number | undefined;

0 commit comments

Comments
 (0)