@agentteams/runner 0.0.102 → 0.0.105

package/dist/daemon-control.js

@@ -1,11 +1,32 @@
 import { setTimeout as delay } from 'node:timers/promises';
+import { randomUUID } from 'node:crypto';
 import { platform as getPlatform } from 'node:os';
-import { getAutostartStatus, launchWindowsHiddenDaemon, restartAutostartService, scheduleWindowsTaskRestart, } from './autostart.js';
+import { getAutostartStatus, launchWindowsHiddenDaemon, registerWindowsTask, restartAutostartService, scheduleWindowsTaskRestart, } from './autostart.js';
 import { logger } from './logger.js';
 import { getDaemonStatus } from './pid.js';
 import { spawnExecutable } from './executable.js';
+import { acknowledgePreparedRestartHandoff, buildRestartHandoffEnv, getRestartHandoffPath, waitForPreparedRestartHandoff, } from './restart-handoff.js';
+import { promises as fs } from 'node:fs';
 const restartPollIntervalMs = 100;
 const stopTimeoutMs = 10_000;
+const startTimeoutMs = 15_000;
+// A restart only *triggers* the replacement runner (a detached spawn, a
+// Task Scheduler `/Run`, or a supervised respawn); the new process needs a
+// moment to boot and write its PID file. Poll until it reports running so the
+// command can report accurately instead of racing an async startup.
+export const waitForDaemonToStart = async (deps = {}) => {
+    const resolvedGetDaemonStatus = deps.getDaemonStatus ?? getDaemonStatus;
+    const resolvedSleep = deps.sleep ?? ((milliseconds) => delay(milliseconds));
+    const resolvedNow = deps.now ?? (() => Date.now());
+    const timeoutMs = deps.timeoutMs ?? startTimeoutMs;
+    const deadline = resolvedNow() + timeoutMs;
+    let status = await resolvedGetDaemonStatus();
+    while (!status.running && resolvedNow() < deadline) {
+        await resolvedSleep(restartPollIntervalMs);
+        status = await resolvedGetDaemonStatus();
+    }
+    return status;
+};
 const waitForDaemonToStop = async (pid, deps) => {
     deps.kill(pid, 'SIGTERM');
     const deadline = Date.now() + stopTimeoutMs;
@@ -18,55 +39,219 @@ const waitForDaemonToStop = async (pid, deps) => {
     }
     throw new Error(`Timed out waiting for AgentRunner process ${pid} to stop.`);
 };
-export const spawnDetachedDaemon = () => {
+export const spawnDetachedDaemon = (launch) => {
+    const env = launch ? buildRestartHandoffEnv(launch) : process.env;
     // On Windows, use the dedicated hidden PowerShell launcher so the `.cmd`
     // shim never creates a visible console host.
     if (getPlatform() === 'win32') {
-        launchWindowsHiddenDaemon();
+        launchWindowsHiddenDaemon({ env });
         return;
     }
     const child = spawnExecutable('agentrunner', ['start'], {
         detached: true,
         stdio: 'ignore',
-        env: process.env,
+        env,
         cwd: process.cwd(),
     });
     child.unref();
     return child;
 };
+export const prepareDetachedRestartHandoff = async (deps = {}) => {
+    const handoffId = deps.handoffId ?? randomUUID();
+    const parentPid = deps.parentPid ?? process.pid;
+    const markerPath = deps.markerPath ?? getRestartHandoffPath(handoffId);
+    const launch = { handoffId, parentPid, markerPath };
+    try {
+        await (deps.unlink ?? fs.unlink)(markerPath);
+    }
+    catch {
+        // Missing or stale marker is fine.
+    }
+    let child;
+    try {
+        child = (deps.spawnDetachedDaemon ?? spawnDetachedDaemon)(launch);
+    }
+    catch (error) {
+        return {
+            status: 'retryable-failure',
+            handoffId,
+            replacementReady: false,
+            acknowledged: false,
+            retryableFailure: true,
+            reason: 'replacement-preparation-failed',
+            error: error instanceof Error ? error.message : String(error),
+        };
+    }
+    if (!child?.pid) {
+        return {
+            status: 'retryable-failure',
+            handoffId,
+            replacementReady: false,
+            acknowledged: false,
+            retryableFailure: true,
+            reason: 'replacement-preparation-failed',
+            error: 'Replacement runner process did not expose a PID.',
+        };
+    }
+    return (deps.waitForPreparedRestartHandoff ?? waitForPreparedRestartHandoff)(launch);
+};
 // Run from within the daemon itself when a web restart request is received.
 // We can't call restartDaemon() here because that would SIGTERM our own PID
 // before we get a chance to spawn the replacement; instead we either exit and
 // let the OS supervisor restart us, or spawn a replacement and exit cleanly.
-export const executeRestartRequest = (deps = {}) => {
+export const executeRestartRequest = async (deps = {}) => {
     const resolvedGetAutostartStatus = deps.getAutostartStatus ?? getAutostartStatus;
     const resolvedScheduleWindowsTaskRestart = deps.scheduleWindowsTaskRestart ?? scheduleWindowsTaskRestart;
+    const resolvedRegisterWindowsTask = deps.registerWindowsTask ?? registerWindowsTask;
     const resolvedSpawnDetachedDaemon = deps.spawnDetachedDaemon ?? spawnDetachedDaemon;
+    const acknowledgeRestart = deps.acknowledgeRestart ?? (async () => undefined);
+    const acknowledgePreparedHandoff = deps.acknowledgePreparedHandoff ?? acknowledgePreparedRestartHandoff;
     const resolvedPlatform = (deps.platform ?? getPlatform)();
     const exitProcess = deps.processExit ?? ((code) => process.exit(code));
     const resolvedLogger = deps.logger ?? logger;
-    const autostartStatus = resolvedGetAutostartStatus();
-    if (autostartStatus.registered && autostartStatus.platform === 'task-scheduler') {
-        resolvedLogger.info('Restart requested — scheduling explicit Task Scheduler restart');
-        resolvedScheduleWindowsTaskRestart();
+    let autostartStatus = resolvedGetAutostartStatus();
+    if (resolvedPlatform === 'win32' || autostartStatus.platform === 'task-scheduler') {
+        if (!autostartStatus.registered) {
+            if (!deps.config) {
+                return {
+                    status: 'retryable-failure',
+                    handoffId: randomUUID(),
+                    replacementReady: false,
+                    acknowledged: false,
+                    retryableFailure: true,
+                    reason: 'autostart-repair-failed',
+                    error: 'Windows Task Scheduler autostart is missing and runtime configuration is unavailable.',
+                };
+            }
+            try {
+                resolvedLogger.info('Windows Task Scheduler autostart is missing — repairing it before restart');
+                await resolvedRegisterWindowsTask({ token: deps.config.daemonToken, apiUrl: deps.config.apiUrl }, { startImmediately: false });
+                autostartStatus = { registered: true, platform: 'task-scheduler' };
+            }
+            catch (error) {
+                return {
+                    status: 'retryable-failure',
+                    handoffId: randomUUID(),
+                    replacementReady: false,
+                    acknowledged: false,
+                    retryableFailure: true,
+                    reason: 'autostart-repair-failed',
+                    error: error instanceof Error ? error.message : String(error),
+                };
+            }
+        }
+        resolvedLogger.info('Restart requested — preparing an out-of-job Task Scheduler handoff');
+        const preparation = await resolvedScheduleWindowsTaskRestart();
+        if (preparation.status === 'retryable-failure') {
+            resolvedLogger.info('Restart handoff preparation failed — keeping the current runner alive for retry');
+            return preparation;
+        }
+        try {
+            await acknowledgeRestart();
+        }
+        catch (error) {
+            return {
+                status: 'retryable-failure',
+                handoffId: preparation.handoffId,
+                replacementReady: false,
+                acknowledged: false,
+                retryableFailure: true,
+                reason: 'acknowledgement-failed',
+                error: error instanceof Error ? error.message : String(error),
+            };
+        }
+        if (!(await acknowledgePreparedHandoff(preparation))) {
+            return {
+                status: 'retryable-failure',
+                handoffId: preparation.handoffId,
+                replacementReady: false,
+                acknowledged: false,
+                retryableFailure: true,
+                reason: 'replacement-confirmation-failed',
+                error: 'The prepared Windows restart helper was no longer available after acknowledgement.',
+            };
+        }
         exitProcess(0);
-        return;
+        return {
+            status: 'acknowledged',
+            handoffId: preparation.handoffId,
+            replacementReady: true,
+            acknowledged: true,
+            retryableFailure: false,
+        };
     }
     const supervisedRespawn = autostartStatus.registered && (autostartStatus.platform === 'launchd' || autostartStatus.platform === 'systemd');
     if (supervisedRespawn) {
+        const handoffId = randomUUID();
+        try {
+            await acknowledgeRestart();
+        }
+        catch (error) {
+            return {
+                status: 'retryable-failure',
+                handoffId,
+                replacementReady: false,
+                acknowledged: false,
+                retryableFailure: true,
+                reason: 'acknowledgement-failed',
+                error: error instanceof Error ? error.message : String(error),
+            };
+        }
         resolvedLogger.info('Restart requested — exiting non-zero so the OS supervisor restarts the daemon', {
             platform: autostartStatus.platform,
         });
         exitProcess(1);
-        return;
+        return {
+            status: 'acknowledged',
+            handoffId,
+            replacementReady: true,
+            acknowledged: true,
+            retryableFailure: false,
+        };
     }
-    resolvedLogger.info('Restart requested — spawning new daemon and exiting', {
+    resolvedLogger.info('Restart requested — preparing a detached replacement runner', {
         platform: autostartStatus.platform,
         registered: autostartStatus.registered,
         osPlatform: resolvedPlatform,
     });
-    resolvedSpawnDetachedDaemon();
+    const preparation = await (deps.prepareDetachedDaemon ??
+        (() => prepareDetachedRestartHandoff({ spawnDetachedDaemon: resolvedSpawnDetachedDaemon })))();
+    if (preparation.status === 'retryable-failure') {
+        return preparation;
+    }
+    try {
+        await acknowledgeRestart();
+    }
+    catch (error) {
+        return {
+            status: 'retryable-failure',
+            handoffId: preparation.handoffId,
+            replacementReady: false,
+            acknowledged: false,
+            retryableFailure: true,
+            reason: 'acknowledgement-failed',
+            error: error instanceof Error ? error.message : String(error),
+        };
+    }
+    if (!(await acknowledgePreparedHandoff(preparation))) {
+        return {
+            status: 'retryable-failure',
+            handoffId: preparation.handoffId,
+            replacementReady: false,
+            acknowledged: false,
+            retryableFailure: true,
+            reason: 'replacement-confirmation-failed',
+            error: 'The prepared replacement runner was no longer available after acknowledgement.',
+        };
+    }
     exitProcess(0);
+    return {
+        status: 'acknowledged',
+        handoffId: preparation.handoffId,
+        replacementReady: true,
+        acknowledged: true,
+        retryableFailure: false,
+    };
 };
 export const restartDaemon = async (deps = {}) => {
     const resolvedGetDaemonStatus = deps.getDaemonStatus ?? getDaemonStatus;

package/dist/daemon-control.js.map

@@ -1 +1 @@
-{"version":3,"file":"daemon-control.js","sourceRoot":"","sources":["../src/daemon-control.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"daemon-control.js","sourceRoot":"","sources":["../src/daemon-control.ts"],"names":[],"mappings":"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"}

package/dist/daemon-control.test.js

@@ -1,6 +1,6 @@
 import assert from 'node:assert/strict';
 import test from 'node:test';
-import { executeRestartRequest, restartDaemon } from './daemon-control.js';
+import { executeRestartRequest, prepareDetachedRestartHandoff, restartDaemon, waitForDaemonToStart, } from './daemon-control.js';
 test('restartDaemon stops running daemon and restarts via autostart when registered', async () => {
     const signals = [];
     let statusChecks = 0;
@@ -64,81 +64,315 @@ test('restartDaemon delegates Windows task restart without signaling the daemon
     });
     assert.deepEqual(events, ['task-restart']);
 });
-test('executeRestartRequest exits non-zero when supervised by launchd', () => {
+test('waitForDaemonToStart returns once the runner reports running', async () => {
+    let checks = 0;
+    const sleeps = [];
+    const status = await waitForDaemonToStart({
+        getDaemonStatus: async () => {
+            checks += 1;
+            // Runner is still booting for the first two polls, then writes its PID.
+            return checks < 3 ? { running: false, pid: null } : { running: true, pid: 999 };
+        },
+        sleep: async (milliseconds) => {
+            sleeps.push(milliseconds);
+        },
+        now: () => 0,
+    });
+    assert.deepEqual(status, { running: true, pid: 999 });
+    assert.equal(checks, 3);
+    assert.equal(sleeps.length, 2);
+});
+test('waitForDaemonToStart gives up after the deadline and reports not running', async () => {
+    let checks = 0;
+    const now = [0, 5, 10, 20];
+    let tick = 0;
+    const status = await waitForDaemonToStart({
+        getDaemonStatus: async () => {
+            checks += 1;
+            return { running: false, pid: null };
+        },
+        sleep: async () => undefined,
+        now: () => now[Math.min(tick++, now.length - 1)] ?? 0,
+        timeoutMs: 15,
+    });
+    assert.equal(status.running, false);
+    // Stops polling once now() passes the deadline instead of looping forever.
+    assert.ok(checks >= 1);
+});
+test('executeRestartRequest exits non-zero when supervised by launchd', async () => {
     const exitCodes = [];
     let spawned = false;
-    executeRestartRequest({
+    await executeRestartRequest({
         getAutostartStatus: () => ({ registered: true, platform: 'launchd' }),
         spawnDetachedDaemon: () => {
             spawned = true;
         },
         platform: () => 'darwin',
-        processExit: ((code) => {
+        processExit: (code) => {
             exitCodes.push(code);
-            return undefined;
-        }),
+        },
         logger: { info: () => undefined },
     });
     assert.deepEqual(exitCodes, [1]);
     assert.equal(spawned, false);
 });
-test('executeRestartRequest exits non-zero when supervised by systemd', () => {
+test('executeRestartRequest exits non-zero when supervised by systemd', async () => {
     const exitCodes = [];
     let spawned = false;
-    executeRestartRequest({
+    await executeRestartRequest({
         getAutostartStatus: () => ({ registered: true, platform: 'systemd' }),
         spawnDetachedDaemon: () => {
             spawned = true;
         },
         platform: () => 'linux',
-        processExit: ((code) => {
+        processExit: (code) => {
             exitCodes.push(code);
-            return undefined;
-        }),
+        },
         logger: { info: () => undefined },
     });
     assert.deepEqual(exitCodes, [1]);
     assert.equal(spawned, false);
 });
-test('executeRestartRequest schedules an explicit restart and exits cleanly for Windows Task Scheduler', () => {
+test('executeRestartRequest schedules an explicit restart and exits cleanly for Windows Task Scheduler', async () => {
     const exitCodes = [];
     let spawned = false;
     let scheduled = false;
-    executeRestartRequest({
+    await executeRestartRequest({
         getAutostartStatus: () => ({ registered: true, platform: 'task-scheduler' }),
-        scheduleWindowsTaskRestart: () => {
+        scheduleWindowsTaskRestart: async () => {
             scheduled = true;
+            return {
+                status: 'prepared',
+                handoffId: 'windows-success',
+                markerPath: '/tmp/restart-handoff-windows-success.json',
+                replacementPid: 9002,
+                replacementReady: true,
+                acknowledged: false,
+                retryableFailure: false,
+            };
         },
         spawnDetachedDaemon: () => {
             spawned = true;
         },
         platform: () => 'win32',
-        processExit: ((code) => {
+        acknowledgePreparedHandoff: async () => true,
+        processExit: (code) => {
             exitCodes.push(code);
-            return undefined;
-        }),
+        },
         logger: { info: () => undefined },
     });
     assert.equal(spawned, false);
     assert.equal(scheduled, true);
     assert.deepEqual(exitCodes, [0]);
 });
-test('executeRestartRequest spawns a detached daemon when running manually on macOS', () => {
+test('executeRestartRequest keeps the daemon alive when the Windows restart helper fails to schedule', async () => {
     const exitCodes = [];
-    let spawned = false;
-    executeRestartRequest({
+    await executeRestartRequest({
+        getAutostartStatus: () => ({ registered: true, platform: 'task-scheduler' }),
+        // Helper creation failed — must NOT exit, or the runner dies with no replacement.
+        scheduleWindowsTaskRestart: async () => ({
+            status: 'retryable-failure',
+            handoffId: 'windows-failure',
+            replacementReady: false,
+            acknowledged: false,
+            retryableFailure: true,
+            reason: 'helper-preparation-failed',
+            error: 'helper creation failed',
+        }),
+        platform: () => 'win32',
+        processExit: (code) => {
+            exitCodes.push(code);
+        },
+        logger: { info: () => undefined },
+    });
+    assert.deepEqual(exitCodes, [], 'daemon must not exit when the restart helper could not be created');
+});
+test('executeRestartRequest acks and exits only after a manual replacement is prepared', async () => {
+    const events = [];
+    await executeRestartRequest({
         getAutostartStatus: () => ({ registered: false, platform: 'launchd' }),
-        spawnDetachedDaemon: () => {
-            spawned = true;
+        prepareDetachedDaemon: async () => {
+            events.push('prepared');
+            return {
+                status: 'prepared',
+                handoffId: 'manual-success',
+                markerPath: '/tmp/restart-handoff-manual-success.json',
+                replacementPid: 9002,
+                replacementReady: true,
+                acknowledged: false,
+                retryableFailure: false,
+            };
+        },
+        acknowledgeRestart: async () => {
+            events.push('ack');
+        },
+        acknowledgePreparedHandoff: async () => {
+            events.push('commit');
+            return true;
         },
         platform: () => 'darwin',
-        processExit: ((code) => {
+        processExit: (code) => {
+            events.push(`exit:${code}`);
+        },
+        logger: { info: () => undefined },
+    });
+    assert.deepEqual(events, ['prepared', 'ack', 'commit', 'exit:0']);
+});
+test('executeRestartRequest keeps the daemon alive when the prepared standby disappears during acknowledgement', async () => {
+    const events = [];
+    const result = await executeRestartRequest({
+        getAutostartStatus: () => ({ registered: false, platform: 'manual' }),
+        prepareDetachedDaemon: async () => ({
+            status: 'prepared',
+            handoffId: 'manual-disappeared',
+            markerPath: '/tmp/restart-handoff-manual-disappeared.json',
+            replacementPid: 9002,
+            replacementReady: true,
+            acknowledged: false,
+            retryableFailure: false,
+        }),
+        acknowledgeRestart: async () => {
+            events.push('ack');
+        },
+        acknowledgePreparedHandoff: async () => {
+            events.push('commit-failed');
+            return false;
+        },
+        processExit: (code) => {
+            events.push(`exit:${code}`);
+        },
+        platform: () => 'darwin',
+        logger: { info: () => undefined },
+    });
+    assert.deepEqual(events, ['ack', 'commit-failed']);
+    assert.equal(result.status, 'retryable-failure');
+});
+test('prepareDetachedRestartHandoff reports spawn failure without waiting for readiness', async () => {
+    let waited = false;
+    const result = await prepareDetachedRestartHandoff({
+        handoffId: 'manual-spawn-failure',
+        parentPid: 4321,
+        markerPath: '/tmp/restart-handoff.json',
+        unlink: async () => undefined,
+        spawnDetachedDaemon: () => {
+            throw new Error('spawn failed');
+        },
+        waitForPreparedRestartHandoff: async () => {
+            waited = true;
+            throw new Error('should not wait');
+        },
+    });
+    assert.equal(result.status, 'retryable-failure');
+    assert.equal(result.reason, 'replacement-preparation-failed');
+    assert.equal(waited, false);
+});
+test('executeRestartRequest keeps supervised runners alive when acknowledgement fails', async () => {
+    const exitCodes = [];
+    const result = await executeRestartRequest({
+        getAutostartStatus: () => ({ registered: true, platform: 'systemd' }),
+        acknowledgeRestart: async () => {
+            throw new Error('network down');
+        },
+        platform: () => 'linux',
+        processExit: (code) => {
             exitCodes.push(code);
-            return undefined;
+        },
+        logger: { info: () => undefined },
+    });
+    assert.equal(result.status, 'retryable-failure');
+    assert.equal(result.reason, 'acknowledgement-failed');
+    assert.deepEqual(exitCodes, []);
+});
+test('executeRestartRequest preserves the current runner and request when the Windows helper reports a post-create failure', async () => {
+    const events = [];
+    const result = await executeRestartRequest({
+        getAutostartStatus: () => ({ registered: true, platform: 'task-scheduler' }),
+        scheduleWindowsTaskRestart: async () => ({
+            status: 'retryable-failure',
+            handoffId: 'handoff-query-failure',
+            replacementReady: false,
+            acknowledged: false,
+            retryableFailure: true,
+            reason: 'helper-preparation-failed',
+            error: 'schtasks /Query failed with exit 1',
         }),
+        acknowledgeRestart: async () => {
+            events.push('ack');
+        },
+        spawnDetachedDaemon: () => {
+            events.push('spawn');
+        },
+        processExit: (code) => {
+            events.push(`exit:${code}`);
+        },
+        platform: () => 'win32',
         logger: { info: () => undefined },
     });
-    assert.equal(spawned, true);
-    assert.deepEqual(exitCodes, [0]);
+    assert.deepEqual(events, [], 'a post-create helper failure must not ack or terminate the current runner');
+    assert.equal(result.status, 'retryable-failure');
+});
+test('executeRestartRequest repairs a missing Windows scheduled task before preparing handoff', async () => {
+    const events = [];
+    const result = await executeRestartRequest({
+        getAutostartStatus: () => ({ registered: false, platform: 'task-scheduler' }),
+        registerWindowsTask: async () => {
+            events.push('register');
+            return { registered: true, servicePath: 'task.xml', platform: 'task-scheduler' };
+        },
+        scheduleWindowsTaskRestart: async () => {
+            events.push('prepare');
+            return {
+                status: 'retryable-failure',
+                handoffId: 'handoff-after-repair',
+                replacementReady: false,
+                acknowledged: false,
+                retryableFailure: true,
+                reason: 'helper-preparation-failed',
+                error: 'replacement did not become ready',
+            };
+        },
+        acknowledgeRestart: async () => {
+            events.push('ack');
+        },
+        spawnDetachedDaemon: () => {
+            events.push('spawn');
+        },
+        processExit: (code) => {
+            events.push(`exit:${code}`);
+        },
+        platform: () => 'win32',
+        config: { daemonToken: 'secret-token', apiUrl: 'https://api.example' },
+        logger: { info: () => undefined },
+    });
+    assert.deepEqual(events, ['register', 'prepare']);
+    assert.equal(result.status, 'retryable-failure');
+});
+test('executeRestartRequest does not ack or exit when a manual replacement never becomes ready', async () => {
+    const events = [];
+    const result = await executeRestartRequest({
+        getAutostartStatus: () => ({ registered: false, platform: 'manual' }),
+        prepareDetachedDaemon: async () => ({
+            status: 'retryable-failure',
+            handoffId: 'manual-timeout',
+            replacementReady: false,
+            acknowledged: false,
+            retryableFailure: true,
+            reason: 'replacement-preparation-failed',
+            error: 'replacement readiness timed out',
+        }),
+        acknowledgeRestart: async () => {
+            events.push('ack');
+        },
+        spawnDetachedDaemon: () => {
+            events.push('spawn');
+        },
+        processExit: (code) => {
+            events.push(`exit:${code}`);
+        },
+        platform: () => 'darwin',
+        logger: { info: () => undefined },
+    });
+    assert.deepEqual(events, [], 'spawn success alone must not ack or terminate the current runner');
+    assert.equal(result.status, 'retryable-failure');
 });
 //# sourceMappingURL=daemon-control.test.js.map