@agent-vm/agent-vm 0.0.78 → 0.0.79

package/dist/gateway/gateway-recovery.js

@@ -1,40 +1,6 @@
-import { execFile } from 'node:child_process';
-import { promisify } from 'node:util';
-import { deleteGatewayRuntimeRecord, loadGatewayRuntimeRecord, quarantineGatewayRuntimeRecord, } from './gateway-runtime-record.js';
-const execFileAsync = promisify(execFile);
-function isProcessAlive(pid) {
-    try {
-        process.kill(pid, 0);
-        return true;
-    }
-    catch (error) {
-        if (typeof error === 'object' && error !== null && 'code' in error) {
-            if (error.code === 'EPERM') {
-                return true;
-            }
-            if (error.code === 'ESRCH') {
-                return false;
-            }
-        }
-        throw error;
-    }
-}
-async function readProcessCommand(pid) {
-    try {
-        const { stdout } = await execFileAsync('ps', ['-p', String(pid), '-o', 'command=']);
-        const command = stdout.trim();
-        return command.length > 0 ? command : null;
-    }
-    catch (error) {
-        if (typeof error === 'object' && error !== null && 'code' in error && error.code === 1) {
-            return null;
-        }
-        throw error;
-    }
-}
-function isManagedGatewayProcess(command) {
-    return /\b(qemu-system|krun)\b/u.test(command);
-}
+import { isManagedVmProcess, isProcessAlive, killOrphanedManagedVmProcess, killProcess, readProcessCommand, readProcessIdentity, sleep, } from '../shared/managed-vm-process.js';
+import { readTcpListenPortOwner as defaultReadTcpListenPortOwner, } from '../shared/port-owner.js';
+import { deleteGatewayRuntimeRecord, loadGatewayRuntimeRecordResult, } from './gateway-runtime-record.js';
 function writeRecoveryLog(message) {
     process.stderr.write(`[agent-vm] ${message}\n`);
 }
@@ -42,13 +8,11 @@ function expectedGatewaySessionLabel(projectNamespace, zoneId) {
     return `${projectNamespace}:${zoneId}:gateway`;
 }
 function validateRuntimeRecordCleanupScope(options) {
-    if (options.legacyRecordDefaults !== undefined &&
-        options.runtimeRecord.configPath !== options.legacyRecordDefaults.configPath) {
-        return `Gateway runtime record at '${options.stateDir}' belongs to configPath '${options.runtimeRecord.configPath}', not '${options.legacyRecordDefaults.configPath}'. Refusing scoped cleanup.`;
+    if (options.runtimeRecord.configPath !== options.expectedConfigPath) {
+        return `Gateway runtime record at '${options.stateDir}' for zone '${options.runtimeRecord.zoneId}' belongs to configPath '${options.runtimeRecord.configPath}', not '${options.expectedConfigPath}'. Refusing scoped cleanup.`;
     }
-    if (options.legacyRecordDefaults !== undefined &&
-        options.runtimeRecord.controllerPort !== options.legacyRecordDefaults.controllerPort) {
-        return `Gateway runtime record at '${options.stateDir}' belongs to controllerPort '${options.runtimeRecord.controllerPort}', not '${options.legacyRecordDefaults.controllerPort}'. Refusing scoped cleanup.`;
+    if (options.runtimeRecord.controllerPort !== options.expectedControllerPort) {
+        return `Gateway runtime record at '${options.stateDir}' for zone '${options.runtimeRecord.zoneId}' belongs to controllerPort '${String(options.runtimeRecord.controllerPort)}', not '${String(options.expectedControllerPort)}'. Refusing scoped cleanup.`;
     }
     if (options.runtimeRecord.projectNamespace !== options.projectNamespace) {
         return `Gateway runtime record at '${options.stateDir}' for zone '${options.runtimeRecord.zoneId}' belongs to projectNamespace '${options.runtimeRecord.projectNamespace}', not '${options.projectNamespace}'. Refusing scoped cleanup.`;
@@ -62,92 +26,55 @@ function validateRuntimeRecordCleanupScope(options) {
     }
     return null;
 }
-function killProcess(pid, signal) {
-    try {
-        process.kill(pid, signal);
-    }
-    catch (error) {
-        if (typeof error === 'object' && error !== null && 'code' in error && error.code === 'ESRCH') {
-            return;
-        }
-        if (typeof error === 'object' && error !== null && 'code' in error && error.code === 'EPERM') {
-            throw new Error(`Permission denied while sending ${signal} to orphaned gateway pid ${pid}. The process is still running and may require elevated privileges to terminate.`, { cause: error });
-        }
-        throw error;
-    }
-}
-function isNoSuchProcessError(error) {
-    return typeof error === 'object' && error !== null && 'code' in error && error.code === 'ESRCH';
-}
-async function sleep(delayMs) {
-    await new Promise((resolve) => setTimeout(resolve, delayMs));
-}
-async function waitForExit(options) {
-    const deadline = Date.now() + options.timeoutMs;
-    while (Date.now() < deadline) {
-        if (!options.processIsAlive(options.pid)) {
-            return true;
-        }
-        // oxlint-disable-next-line no-await-in-loop -- polling loop must wait between liveness checks
-        await options.sleep(100);
-    }
-    return !options.processIsAlive(options.pid);
-}
 async function killOrphanedGatewayProcess(runtimeRecord, dependencies) {
-    if (!dependencies.isProcessAlive(runtimeRecord.qemuPid)) {
-        return null;
-    }
-    const processCommand = await dependencies.readProcessCommand(runtimeRecord.qemuPid);
-    if (!processCommand || !isManagedGatewayProcess(processCommand)) {
-        throw new Error(`Gateway runtime record for zone '${runtimeRecord.zoneId}' points at unexpected live process ${runtimeRecord.qemuPid}: ${processCommand ?? '(command unavailable)'}.`);
-    }
-    try {
-        dependencies.killProcess(runtimeRecord.qemuPid, 'SIGTERM');
-    }
-    catch (error) {
-        if (!isNoSuchProcessError(error)) {
-            throw error;
-        }
-    }
-    if (await waitForExit({
+    return await killOrphanedManagedVmProcess({
+        contextLabel: `Gateway runtime record for zone '${runtimeRecord.zoneId}'`,
+        dependencies,
         pid: runtimeRecord.qemuPid,
-        processIsAlive: dependencies.isProcessAlive,
-        sleep: dependencies.sleep,
-        timeoutMs: 2_000,
-    })) {
-        return runtimeRecord.qemuPid;
-    }
-    try {
-        dependencies.killProcess(runtimeRecord.qemuPid, 'SIGKILL');
+        recordedIdentity: runtimeRecord.processIdentity,
+    });
+}
+async function verifyGatewayPortOwnership(options) {
+    const portOwner = await options.readTcpListenPortOwner(options.runtimeRecord.ingressPort);
+    if (portOwner === null) {
+        return { kind: 'record-stale' };
     }
-    catch (error) {
-        if (!isNoSuchProcessError(error)) {
-            throw error;
-        }
+    if (portOwner.pid !== options.runtimeRecord.qemuPid) {
+        return {
+            kind: 'unproven',
+            warning: `Gateway runtime record for zone '${options.runtimeRecord.zoneId}' port ${String(options.runtimeRecord.ingressPort)} is held by pid ${String(portOwner.pid)}, expected pid ${String(options.runtimeRecord.qemuPid)}.`,
+        };
     }
-    if (await waitForExit({
-        pid: runtimeRecord.qemuPid,
-        processIsAlive: dependencies.isProcessAlive,
-        sleep: dependencies.sleep,
-        timeoutMs: 2_000,
-    })) {
-        return runtimeRecord.qemuPid;
+    if (!isManagedVmProcess(portOwner.command)) {
+        return {
+            kind: 'unproven',
+            warning: `Gateway runtime record for zone '${options.runtimeRecord.zoneId}' port ${String(options.runtimeRecord.ingressPort)} is held by pid ${String(portOwner.pid)} but command is not a managed VM process: ${portOwner.command}.`,
+        };
     }
-    throw new Error(`Failed to terminate orphaned gateway VM process ${runtimeRecord.qemuPid} for zone '${runtimeRecord.zoneId}'.`);
+    return { kind: 'owned' };
 }
 export async function cleanupOrphanedGatewayIfPresent(options, dependencies = {}) {
     const log = dependencies.log ?? writeRecoveryLog;
-    const runtimeRecord = await (dependencies.loadGatewayRuntimeRecord ?? loadGatewayRuntimeRecord)(options.stateDir, {
-        ...(options.legacyRecordDefaults
-            ? { legacyRecordDefaults: options.legacyRecordDefaults }
-            : {}),
-        log,
-    });
-    if (!runtimeRecord) {
+    const runtimeRecordResult = await (dependencies.loadGatewayRuntimeRecordResult ?? loadGatewayRuntimeRecordResult)(options.stateDir);
+    if (runtimeRecordResult.kind === 'missing') {
         return { cleanedUp: false, killedPid: null };
     }
+    if (runtimeRecordResult.kind === 'parse-error') {
+        const cleanupWarning = `Malformed gateway runtime record '${runtimeRecordResult.path}': ${runtimeRecordResult.error.message}.`;
+        if (options.mode !== 'in-process-recovery') {
+            throw new Error(cleanupWarning, { cause: runtimeRecordResult.error });
+        }
+        log(`Skipping ${cleanupWarning}`);
+        return {
+            cleanedUp: false,
+            cleanupWarning,
+            killedPid: null,
+        };
+    }
+    const runtimeRecord = runtimeRecordResult.record;
     const scopeMismatch = validateRuntimeRecordCleanupScope({
-        ...(options.legacyRecordDefaults ? { legacyRecordDefaults: options.legacyRecordDefaults } : {}),
+        expectedConfigPath: options.expectedConfigPath,
+        expectedControllerPort: options.expectedControllerPort,
         projectNamespace: options.projectNamespace,
         runtimeRecord,
         stateDir: options.stateDir,
@@ -157,12 +84,8 @@ export async function cleanupOrphanedGatewayIfPresent(options, dependencies = {}
         if (options.mode !== 'in-process-recovery') {
             throw new Error(scopeMismatch);
         }
-        const cleanupWarning = `${scopeMismatch} Quarantining the stale runtime record without signaling its recorded process during in-process recovery.`;
+        const cleanupWarning = `${scopeMismatch} Skipping the stale runtime record without signaling its recorded process during in-process recovery.`;
         log(cleanupWarning);
-        await (dependencies.quarantineGatewayRuntimeRecord ?? quarantineGatewayRuntimeRecord)(options.stateDir, {
-            log,
-            reason: cleanupWarning,
-        });
         return {
             cleanedUp: false,
             cleanupWarning,
@@ -170,10 +93,27 @@ export async function cleanupOrphanedGatewayIfPresent(options, dependencies = {}
         };
     }
     log(`Found persisted gateway runtime for zone '${runtimeRecord.zoneId}' (pid ${runtimeRecord.qemuPid}, vm ${runtimeRecord.vmId}).`);
+    const portOwnershipProof = await verifyGatewayPortOwnership({
+        readTcpListenPortOwner: dependencies.readTcpListenPortOwner ?? defaultReadTcpListenPortOwner,
+        runtimeRecord,
+    });
+    if (portOwnershipProof.kind === 'unproven') {
+        if (options.mode !== 'in-process-recovery') {
+            throw new Error(portOwnershipProof.warning);
+        }
+        const cleanupWarning = `Skipping ${portOwnershipProof.warning}`;
+        log(cleanupWarning);
+        return {
+            cleanedUp: false,
+            cleanupWarning,
+            killedPid: null,
+        };
+    }
     const killedPid = await killOrphanedGatewayProcess(runtimeRecord, {
         isProcessAlive: dependencies.isProcessAlive ?? isProcessAlive,
         killProcess: dependencies.killProcess ?? killProcess,
         readProcessCommand: dependencies.readProcessCommand ?? readProcessCommand,
+        readProcessIdentity: dependencies.readProcessIdentity ?? readProcessIdentity,
         sleep: dependencies.sleep ?? sleep,
     });
     try {

package/dist/gateway/gateway-recovery.js.map

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

package/dist/gateway/gateway-runtime-record.d.ts

@@ -1,36 +1,43 @@
 import { type GatewayProcessSpec, type GatewayType } from '@agent-vm/gateway-interface';
 import { type ManagedVm } from '@agent-vm/gondolin-adapter';
 import { z } from 'zod';
+import { readProcessIdentity as defaultReadProcessIdentity } from '../shared/managed-vm-process.js';
 export declare const gatewayRuntimeRecordSchema: z.ZodObject<{
+    schemaVersion: z.ZodLiteral<1>;
     configPath: z.ZodString;
     controllerPort: z.ZodNumber;
-    createdAt: z.ZodString;
+    createdAt: z.ZodISODateTime;
     gatewayType: z.ZodEnum<{
         openclaw: "openclaw";
         worker: "worker";
     }>;
     guestListenPort: z.ZodNumber;
     ingressPort: z.ZodNumber;
+    processIdentity: z.ZodObject<{
+        command: z.ZodString;
+        lstart: z.ZodString;
+    }, z.core.$strict>;
     projectNamespace: z.ZodString;
     qemuPid: z.ZodNumber;
     sessionLabel: z.ZodString;
     vmId: z.ZodString;
     zoneId: z.ZodString;
-}, z.core.$strip>;
+}, z.core.$strict>;
 export type GatewayRuntimeRecord = z.infer<typeof gatewayRuntimeRecordSchema>;
-export type GatewayRuntimeLog = (message: string) => void;
-export interface GatewayRuntimeRecordLegacyDefaults {
-    readonly configPath: string;
-    readonly controllerPort: number;
-}
-export declare function quarantineGatewayRuntimeRecord(stateDirectory: string, options?: {
-    readonly log?: GatewayRuntimeLog;
-    readonly reason: string;
-}): Promise<void>;
-export declare function loadGatewayRuntimeRecord(stateDirectory: string, options?: {
-    readonly legacyRecordDefaults?: GatewayRuntimeRecordLegacyDefaults;
-    readonly log?: GatewayRuntimeLog;
-}): Promise<GatewayRuntimeRecord | null>;
+export type GatewayRuntimeRecordLoadResult = {
+    readonly kind: 'loaded';
+    readonly path: string;
+    readonly record: GatewayRuntimeRecord;
+} | {
+    readonly kind: 'missing';
+    readonly path: string;
+} | {
+    readonly error: Error;
+    readonly kind: 'parse-error';
+    readonly path: string;
+};
+export declare function loadGatewayRuntimeRecordResult(stateDirectory: string): Promise<GatewayRuntimeRecordLoadResult>;
+export declare function loadGatewayRuntimeRecord(stateDirectory: string): Promise<GatewayRuntimeRecord | null>;
 export declare function writeGatewayRuntimeRecord(stateDirectory: string, record: GatewayRuntimeRecord): Promise<void>;
 export declare function deleteGatewayRuntimeRecord(stateDirectory: string): Promise<void>;
 export declare function buildGatewayRuntimeRecord(options: {
@@ -40,7 +47,8 @@ export declare function buildGatewayRuntimeRecord(options: {
     readonly managedVm: ManagedVm;
     readonly processSpec: GatewayProcessSpec;
     readonly projectNamespace: string;
+    readonly readProcessIdentity?: typeof defaultReadProcessIdentity;
     readonly systemConfigPath: string;
     readonly zoneId: string;
-}): GatewayRuntimeRecord;
+}): Promise<GatewayRuntimeRecord>;
 //# sourceMappingURL=gateway-runtime-record.d.ts.map

package/dist/gateway/gateway-runtime-record.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway-runtime-record.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-runtime-record.ts"],"names":[],"mappings":"AAGA,OAAO,EAGN,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,KAAK,SAAS,EAAuB,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAY,CAAC,EAAE,MAAM,KAAK,CAAC;AAElC,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;iBAYrC,CAAC;AAOH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAC9E,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;AAC1D,MAAM,WAAW,kCAAkC;IAClD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CAChC;AAgCD,wBAAsB,8BAA8B,CACnD,cAAc,EAAE,MAAM,EACtB,OAAO,GAAE;IACR,QAAQ,CAAC,GAAG,CAAC,EAAE,iBAAiB,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACkD,GACzE,OAAO,CAAC,IAAI,CAAC,CAiBf;AAMD,wBAAsB,wBAAwB,CAC7C,cAAc,EAAE,MAAM,EACtB,OAAO,GAAE;IACR,QAAQ,CAAC,oBAAoB,CAAC,EAAE,kCAAkC,CAAC;IACnE,QAAQ,CAAC,GAAG,CAAC,EAAE,iBAAiB,CAAC;CAC5B,GACJ,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CA2CtC;AAED,wBAAsB,yBAAyB,CAC9C,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,oBAAoB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAQf;AAED,wBAAsB,0BAA0B,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtF;AAmBD,wBAAgB,yBAAyB,CAAC,OAAO,EAAE;IAClD,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,GAAG,oBAAoB,CAgBvB"}
+{"version":3,"file":"gateway-runtime-record.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-runtime-record.ts"],"names":[],"mappings":"AAGA,OAAO,EAGN,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,KAAK,SAAS,EAAuB,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAY,CAAC,EAAE,MAAM,KAAK,CAAC;AAElC,OAAO,EAAE,mBAAmB,IAAI,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAEpG,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;;;;;kBAiBrC,CAAC;AAEH,MAAM,MAAM,oBAAoB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,0BAA0B,CAAC,CAAC;AAE9E,MAAM,MAAM,8BAA8B,GACvC;IACA,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;CACrC,GACD;IACA,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACrB,GACD;IACA,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACrB,CAAC;AAiBL,wBAAsB,8BAA8B,CACnD,cAAc,EAAE,MAAM,GACpB,OAAO,CAAC,8BAA8B,CAAC,CAwBzC;AAED,wBAAsB,wBAAwB,CAC7C,cAAc,EAAE,MAAM,GACpB,OAAO,CAAC,oBAAoB,GAAG,IAAI,CAAC,CAStC;AAED,wBAAsB,yBAAyB,CAC9C,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,oBAAoB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAsB,0BAA0B,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEtF;AAmBD,wBAAsB,yBAAyB,CAAC,OAAO,EAAE;IACxD,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,0BAA0B,CAAC;IACjE,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CA0BhC"}

package/dist/gateway/gateway-runtime-record.js

@@ -3,102 +3,79 @@ import path from 'node:path';
 import { buildGatewaySessionLabel, gatewayTypeValues, } from '@agent-vm/gateway-interface';
 import { writeFileAtomically } from '@agent-vm/gondolin-adapter';
 import { ZodError, z } from 'zod';
-export const gatewayRuntimeRecordSchema = z.object({
+import { readProcessIdentity as defaultReadProcessIdentity } from '../shared/managed-vm-process.js';
+export const gatewayRuntimeRecordSchema = z.strictObject({
+    schemaVersion: z.literal(1),
     configPath: z.string().min(1),
     controllerPort: z.number().int().positive(),
-    createdAt: z.string().datetime(),
+    createdAt: z.iso.datetime(),
     gatewayType: z.enum(gatewayTypeValues),
     guestListenPort: z.number().int().positive(),
     ingressPort: z.number().int().positive(),
+    processIdentity: z.strictObject({
+        command: z.string().min(1),
+        lstart: z.string().min(1),
+    }),
     projectNamespace: z.string().min(1),
     qemuPid: z.number().int().positive(),
     sessionLabel: z.string().min(1),
     vmId: z.string().min(1),
     zoneId: z.string().min(1),
 });
-const legacyGatewayRuntimeRecordSchema = gatewayRuntimeRecordSchema.omit({
-    configPath: true,
-    controllerPort: true,
-});
 const gatewayRuntimeRecordFileName = 'gateway-runtime.json';
 function resolveGatewayRuntimeRecordPath(stateDirectory) {
     return path.join(stateDirectory, gatewayRuntimeRecordFileName);
 }
-function resolveInvalidGatewayRuntimeRecordPath(stateDirectory) {
-    return path.join(stateDirectory, `gateway-runtime.invalid.${Date.now()}.json`);
+function parseGatewayRuntimeRecord(rawRuntimeRecord) {
+    const parsedRuntimeRecord = JSON.parse(rawRuntimeRecord);
+    return gatewayRuntimeRecordSchema.parse(parsedRuntimeRecord);
 }
-async function quarantineMalformedGatewayRuntimeRecord(stateDirectory, runtimeRecordPath, log) {
-    const invalidRuntimeRecordPath = resolveInvalidGatewayRuntimeRecordPath(stateDirectory);
-    try {
-        await fs.rename(runtimeRecordPath, invalidRuntimeRecordPath);
-        log(`Quarantined malformed gateway runtime record '${runtimeRecordPath}' to '${invalidRuntimeRecordPath}'.`);
-        return;
-    }
-    catch (error) {
-        await fs.rm(runtimeRecordPath, { force: true });
-        log(`Deleted malformed gateway runtime record '${runtimeRecordPath}' after quarantine rename failed: ${error instanceof Error ? error.message : JSON.stringify(error)}`);
-    }
+function runtimeRecordParseError(error) {
+    return error instanceof Error ? error : new Error(String(error));
 }
-export async function quarantineGatewayRuntimeRecord(stateDirectory, options = { reason: 'runtime record no longer matches the active cleanup scope' }) {
+export async function loadGatewayRuntimeRecordResult(stateDirectory) {
     const runtimeRecordPath = resolveGatewayRuntimeRecordPath(stateDirectory);
-    const quarantinedRuntimeRecordPath = path.join(stateDirectory, `gateway-runtime.quarantined.${Date.now()}.json`);
     try {
-        await fs.rename(runtimeRecordPath, quarantinedRuntimeRecordPath);
-        (options.log ?? writeGatewayRuntimeLog)(`Quarantined gateway runtime record '${runtimeRecordPath}' to '${quarantinedRuntimeRecordPath}': ${options.reason}.`);
+        return {
+            kind: 'loaded',
+            path: runtimeRecordPath,
+            record: parseGatewayRuntimeRecord(await fs.readFile(runtimeRecordPath, 'utf8')),
+        };
     }
     catch (error) {
         if (typeof error === 'object' && error !== null && 'code' in error && error.code === 'ENOENT') {
-            return;
+            return {
+                kind: 'missing',
+                path: runtimeRecordPath,
+            };
         }
-        throw error;
-    }
-}
-function writeGatewayRuntimeLog(message) {
-    process.stderr.write(`[agent-vm] ${message}\n`);
-}
-export async function loadGatewayRuntimeRecord(stateDirectory, options = {}) {
-    const runtimeRecordPath = resolveGatewayRuntimeRecordPath(stateDirectory);
-    let rawRuntimeRecord;
-    try {
-        rawRuntimeRecord = await fs.readFile(runtimeRecordPath, 'utf8');
-    }
-    catch (error) {
-        if (typeof error === 'object' && error !== null && 'code' in error && error.code === 'ENOENT') {
-            return null;
-        }
-        throw error;
-    }
-    try {
-        const parsedRuntimeRecord = JSON.parse(rawRuntimeRecord);
-        const currentRuntimeRecord = gatewayRuntimeRecordSchema.safeParse(parsedRuntimeRecord);
-        if (currentRuntimeRecord.success) {
-            return currentRuntimeRecord.data;
-        }
-        const legacyRuntimeRecord = legacyGatewayRuntimeRecordSchema.safeParse(parsedRuntimeRecord);
-        if (legacyRuntimeRecord.success && options.legacyRecordDefaults !== undefined) {
-            return gatewayRuntimeRecordSchema.parse({
-                ...legacyRuntimeRecord.data,
-                configPath: options.legacyRecordDefaults.configPath,
-                controllerPort: options.legacyRecordDefaults.controllerPort,
-            });
-        }
-        if (legacyRuntimeRecord.success) {
-            throw new Error(`Gateway runtime record '${runtimeRecordPath}' uses the legacy format and requires legacyRecordDefaults to supply configPath and controllerPort.`);
-        }
-        throw currentRuntimeRecord.error;
-    }
-    catch (error) {
         if (!(error instanceof SyntaxError) && !(error instanceof ZodError)) {
             throw error;
         }
-        await quarantineMalformedGatewayRuntimeRecord(stateDirectory, runtimeRecordPath, options.log ?? writeGatewayRuntimeLog);
+        return {
+            error: runtimeRecordParseError(error),
+            kind: 'parse-error',
+            path: runtimeRecordPath,
+        };
+    }
+}
+export async function loadGatewayRuntimeRecord(stateDirectory) {
+    const loadResult = await loadGatewayRuntimeRecordResult(stateDirectory);
+    if (loadResult.kind === 'missing') {
         return null;
     }
+    if (loadResult.kind === 'parse-error') {
+        throw loadResult.error;
+    }
+    return loadResult.record;
 }
 export async function writeGatewayRuntimeRecord(stateDirectory, record) {
+    const parsedRecord = gatewayRuntimeRecordSchema.parse(record);
     const runtimeRecordPath = resolveGatewayRuntimeRecordPath(stateDirectory);
     await fs.mkdir(stateDirectory, { recursive: true });
-    await writeFileAtomically(runtimeRecordPath, `${JSON.stringify(gatewayRuntimeRecordSchema.parse(record), null, 2)}\n`, { mode: 0o600 });
+    await writeFileAtomically(runtimeRecordPath, `${JSON.stringify(parsedRecord, null, 2)}\n`, {
+        mode: 0o600,
+    });
 }
 export async function deleteGatewayRuntimeRecord(stateDirectory) {
     await fs.rm(resolveGatewayRuntimeRecordPath(stateDirectory), { force: true });
@@ -116,20 +93,28 @@ function resolveManagedVmQemuPid(managedVm) {
     }
     return qemuPid;
 }
-export function buildGatewayRuntimeRecord(options) {
+export async function buildGatewayRuntimeRecord(options) {
     const gatewayType = gatewayRuntimeRecordSchema.shape.gatewayType.parse(options.gatewayType);
-    return {
+    const qemuPid = resolveManagedVmQemuPid(options.managedVm);
+    const processIdentityReader = options.readProcessIdentity ?? defaultReadProcessIdentity;
+    const processIdentity = await processIdentityReader(qemuPid);
+    if (processIdentity === null) {
+        throw new Error(`Failed to capture process identity for gateway VM '${options.managedVm.id}' pid ${String(qemuPid)}.`);
+    }
+    return gatewayRuntimeRecordSchema.parse({
         configPath: options.systemConfigPath,
         controllerPort: options.controllerPort,
         createdAt: new Date().toISOString(),
         gatewayType,
         guestListenPort: options.processSpec.guestListenPort,
         ingressPort: options.ingressPort,
+        processIdentity,
         projectNamespace: options.projectNamespace,
-        qemuPid: resolveManagedVmQemuPid(options.managedVm),
+        qemuPid,
+        schemaVersion: 1,
         sessionLabel: buildGatewaySessionLabel(options.projectNamespace, options.zoneId),
         vmId: options.managedVm.id,
         zoneId: options.zoneId,
-    };
+    });
 }
 //# sourceMappingURL=gateway-runtime-record.js.map

package/dist/gateway/gateway-runtime-record.js.map

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

package/dist/gateway/gateway-zone-orchestrator.d.ts

@@ -1,15 +1,21 @@
 import type { GatewayLifecycle, GatewayZoneConfig } from '@agent-vm/gateway-interface';
 import { type ManagedVm } from '@agent-vm/gondolin-adapter';
+import { cleanupOrphanedToolVmsIfPresent } from '../controller/leases/tool-vm-recovery.js';
 import { type GatewayImageBuilderDependencies } from './gateway-image-builder.js';
 import { cleanupOrphanedGatewayIfPresent } from './gateway-recovery.js';
 import { type GatewayRuntimeRecord } from './gateway-runtime-record.js';
 import { type GatewayManagedVmFactoryOptions, type GatewayZoneStartResult, type StartGatewayZoneOptions } from './gateway-zone-support.js';
 export interface GatewayManagerDependencies extends GatewayImageBuilderDependencies {
     readonly cleanupOrphanedGatewayIfPresent?: typeof cleanupOrphanedGatewayIfPresent;
+    readonly cleanupOrphanedToolVmsIfPresent?: typeof cleanupOrphanedToolVmsIfPresent;
     readonly createManagedVm?: (options: GatewayManagedVmFactoryOptions) => Promise<ManagedVm>;
     readonly gatewayReadinessMaxAttempts?: number;
     readonly gatewayReadinessRetryDelayMs?: number;
     readonly loadGatewayLifecycle?: (type: GatewayZoneConfig['gateway']['type']) => GatewayLifecycle;
+    readonly readProcessIdentity?: (pid: number) => Promise<{
+        readonly command: string;
+        readonly lstart: string;
+    } | null>;
     readonly writeGatewayRuntimeRecord?: (stateDirectory: string, record: GatewayRuntimeRecord) => Promise<void>;
 }
 export declare function startGatewayZone(options: StartGatewayZoneOptions, dependencies?: GatewayManagerDependencies): Promise<GatewayZoneStartResult>;

package/dist/gateway/gateway-zone-orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway-zone-orchestrator.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-zone-orchestrator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEX,gBAAgB,EAChB,iBAAiB,EACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEN,KAAK,SAAS,EACd,MAAM,4BAA4B,CAAC;AAMpC,OAAO,EAEN,KAAK,+BAA+B,EACpC,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAGN,KAAK,oBAAoB,EACzB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAIN,KAAK,8BAA8B,EACnC,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC5B,MAAM,2BAA2B,CAAC;AASnC,MAAM,WAAW,0BAA2B,SAAQ,+BAA+B;IAClF,QAAQ,CAAC,+BAA+B,CAAC,EAAE,OAAO,+BAA+B,CAAC;IAClF,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,8BAA8B,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IAC3F,QAAQ,CAAC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IAC9C,QAAQ,CAAC,4BAA4B,CAAC,EAAE,MAAM,CAAC;IAC/C,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,gBAAgB,CAAC;IACjG,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CACpC,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,oBAAoB,KACxB,OAAO,CAAC,IAAI,CAAC,CAAC;CACnB;AAkKD,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,uBAAuB,EAChC,YAAY,GAAE,0BAA+B,GAC3C,OAAO,CAAC,sBAAsB,CAAC,CAkNjC"}
+{"version":3,"file":"gateway-zone-orchestrator.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-zone-orchestrator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEX,gBAAgB,EAChB,iBAAiB,EACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEN,KAAK,SAAS,EACd,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,+BAA+B,EAAE,MAAM,0CAA0C,CAAC;AAK3F,OAAO,EAEN,KAAK,+BAA+B,EACpC,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAGN,KAAK,oBAAoB,EACzB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAIN,KAAK,8BAA8B,EACnC,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC5B,MAAM,2BAA2B,CAAC;AASnC,MAAM,WAAW,0BAA2B,SAAQ,+BAA+B;IAClF,QAAQ,CAAC,+BAA+B,CAAC,EAAE,OAAO,+BAA+B,CAAC;IAClF,QAAQ,CAAC,+BAA+B,CAAC,EAAE,OAAO,+BAA+B,CAAC;IAClF,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,8BAA8B,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IAC3F,QAAQ,CAAC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IAC9C,QAAQ,CAAC,4BAA4B,CAAC,EAAE,MAAM,CAAC;IAC/C,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,gBAAgB,CAAC;IAGjG,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAC9B,GAAG,EAAE,MAAM,KACP,OAAO,CAAC;QAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC,CAAC;IAC3E,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CACpC,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,oBAAoB,KACxB,OAAO,CAAC,IAAI,CAAC,CAAC;CACnB;AAsKD,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,uBAAuB,EAChC,YAAY,GAAE,0BAA+B,GAC3C,OAAO,CAAC,sBAAsB,CAAC,CA0UjC"}