@agent-vm/agent-vm 0.0.78 → 0.0.80

package/dist/controller/leases/tool-vm-recovery.d.ts

@@ -0,0 +1,31 @@
+import { readProcessIdentity } from '../../shared/managed-vm-process.js';
+import { type PortOwner } from '../../shared/port-owner.js';
+import { deleteToolVmRuntimeRecord, loadAllToolVmRuntimeRecords } from './tool-vm-runtime-record.js';
+export interface ToolVmRecoveryDependencies {
+    readonly deleteToolVmRuntimeRecord?: typeof deleteToolVmRuntimeRecord;
+    readonly isProcessAlive?: (pid: number) => boolean;
+    readonly killProcess?: (pid: number, signal: NodeJS.Signals) => void;
+    readonly loadAllToolVmRuntimeRecords?: typeof loadAllToolVmRuntimeRecords;
+    readonly log?: (message: string) => void;
+    readonly portForSlot?: (slot: number) => number;
+    readonly readProcessCommand?: (pid: number) => Promise<string | null>;
+    readonly readProcessIdentity?: typeof readProcessIdentity;
+    readonly readTcpListenPortOwner?: (port: number) => Promise<PortOwner | null>;
+    readonly sleep?: (delayMs: number) => Promise<void>;
+}
+export interface ToolVmCleanupResult {
+    readonly cleanedCount: number;
+    readonly killedPids: readonly number[];
+    readonly quarantinedCount: number;
+    readonly warnings: readonly string[];
+}
+export declare function cleanupOrphanedToolVmsIfPresent(options: {
+    readonly expectedConfigPath: string;
+    readonly expectedControllerPort: number;
+    readonly mode?: 'in-process-recovery' | 'offline-cleanup';
+    readonly projectNamespace: string;
+    readonly stateDir: string;
+    readonly tcpBasePort?: number;
+    readonly zoneId: string;
+}, dependencies?: ToolVmRecoveryDependencies): Promise<ToolVmCleanupResult>;
+//# sourceMappingURL=tool-vm-recovery.d.ts.map

package/dist/controller/leases/tool-vm-recovery.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-vm-recovery.d.ts","sourceRoot":"","sources":["../../../src/controller/leases/tool-vm-recovery.ts"],"names":[],"mappings":"AAEA,OAAO,EAMN,mBAAmB,EAEnB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAEN,KAAK,SAAS,EACd,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACN,yBAAyB,EACzB,2BAA2B,EAC3B,MAAM,6BAA6B,CAAC;AA+GrC,MAAM,WAAW,0BAA0B;IAC1C,QAAQ,CAAC,yBAAyB,CAAC,EAAE,OAAO,yBAAyB,CAAC;IACtE,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACnD,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IACrE,QAAQ,CAAC,2BAA2B,CAAC,EAAE,OAAO,2BAA2B,CAAC;IAC1E,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAChD,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACtE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,mBAAmB,CAAC;IAC1D,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IAC9E,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACpD;AAED,MAAM,WAAW,mBAAmB;IACnC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,CAAC;CACrC;AAED,wBAAsB,+BAA+B,CACpD,OAAO,EAAE;IACR,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,sBAAsB,EAAE,MAAM,CAAC;IACxC,QAAQ,CAAC,IAAI,CAAC,EAAE,qBAAqB,GAAG,iBAAiB,CAAC;IAC1D,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,EACD,YAAY,GAAE,0BAA+B,GAC3C,OAAO,CAAC,mBAAmB,CAAC,CA+H9B"}

package/dist/controller/leases/tool-vm-recovery.js

@@ -0,0 +1,178 @@
+import { buildToolSessionLabel } from '@agent-vm/gateway-interface';
+import { isProcessAlive, isManagedVmProcess, killOrphanedManagedVmProcess, killProcess, readProcessCommand, readProcessIdentity, sleep, } from '../../shared/managed-vm-process.js';
+import { readTcpListenPortOwner as defaultReadTcpListenPortOwner, } from '../../shared/port-owner.js';
+import { deleteToolVmRuntimeRecord, loadAllToolVmRuntimeRecords, } from './tool-vm-runtime-record.js';
+function writeRecoveryLog(message) {
+    process.stderr.write(`[agent-vm] ${message}\n`);
+}
+// All five fences are required — there is no legacy/fallback path for tool
+// VMs because this format ships in the same release as the cleanup. Any
+// caller (Phase A or offline) must supply expectedConfigPath +
+// expectedControllerPort alongside the in-deployment projectNamespace /
+// zoneId. The fifth fence (sessionLabel) is recomputed from per-record
+// projectNamespace + zoneId + tcpSlot and must match what the record stored.
+function validateToolVmRecordCleanupScope(options) {
+    if (options.runtimeRecord.configPath !== options.expectedConfigPath) {
+        return `Tool VM runtime record for lease '${options.runtimeRecord.leaseId}' at '${options.stateDir}' belongs to configPath '${options.runtimeRecord.configPath}', not '${options.expectedConfigPath}'. Refusing scoped cleanup.`;
+    }
+    if (options.runtimeRecord.controllerPort !== options.expectedControllerPort) {
+        return `Tool VM runtime record for lease '${options.runtimeRecord.leaseId}' at '${options.stateDir}' belongs to controllerPort '${options.runtimeRecord.controllerPort}', not '${options.expectedControllerPort}'. Refusing scoped cleanup.`;
+    }
+    if (options.runtimeRecord.projectNamespace !== options.projectNamespace) {
+        return `Tool VM runtime record for lease '${options.runtimeRecord.leaseId}' at '${options.stateDir}' belongs to projectNamespace '${options.runtimeRecord.projectNamespace}', not '${options.projectNamespace}'. Refusing scoped cleanup.`;
+    }
+    if (options.runtimeRecord.zoneId !== options.zoneId) {
+        return `Tool VM runtime record for lease '${options.runtimeRecord.leaseId}' at '${options.stateDir}' belongs to zone '${options.runtimeRecord.zoneId}', not requested zone '${options.zoneId}'. Refusing scoped cleanup.`;
+    }
+    const expectedSessionLabel = buildToolSessionLabel(options.projectNamespace, options.zoneId, options.runtimeRecord.tcpSlot);
+    if (options.runtimeRecord.sessionLabel !== expectedSessionLabel) {
+        return `Tool VM runtime record for lease '${options.runtimeRecord.leaseId}' at '${options.stateDir}' session label '${options.runtimeRecord.sessionLabel}' does not match expected '${expectedSessionLabel}'. Refusing scoped cleanup.`;
+    }
+    return null;
+}
+async function killOrphanedToolVmProcess(runtimeRecord, dependencies) {
+    return await killOrphanedManagedVmProcess({
+        contextLabel: `Tool VM runtime record for lease '${runtimeRecord.leaseId}' (zone '${runtimeRecord.zoneId}', slot ${runtimeRecord.tcpSlot})`,
+        dependencies,
+        pid: runtimeRecord.qemuPid,
+        recordedIdentity: runtimeRecord.processIdentity,
+    });
+}
+async function verifyToolVmPortOwnership(options) {
+    if (!options.portForSlot && !options.readTcpListenPortOwner) {
+        return { kind: 'owned' };
+    }
+    if (!options.portForSlot) {
+        return {
+            kind: 'unproven',
+            warning: `Tool VM runtime record '${options.runtimeRecord.recordId}' cannot verify port ownership because no portForSlot dependency was provided.`,
+        };
+    }
+    const readTcpListenPortOwner = options.readTcpListenPortOwner ?? defaultReadTcpListenPortOwner;
+    const expectedPort = options.portForSlot(options.runtimeRecord.tcpSlot);
+    const portOwner = await readTcpListenPortOwner(expectedPort);
+    if (portOwner === null) {
+        return { kind: 'record-stale' };
+    }
+    if (portOwner.pid !== options.runtimeRecord.qemuPid) {
+        return {
+            kind: 'unproven',
+            warning: `Tool VM runtime record '${options.runtimeRecord.recordId}' port ${String(expectedPort)} is held by pid ${String(portOwner.pid)}, expected pid ${String(options.runtimeRecord.qemuPid)}.`,
+        };
+    }
+    if (!isManagedVmProcess(portOwner.command)) {
+        return {
+            kind: 'unproven',
+            warning: `Tool VM runtime record '${options.runtimeRecord.recordId}' port ${String(expectedPort)} is held by pid ${String(portOwner.pid)} but command is not a managed VM process: ${portOwner.command}.`,
+        };
+    }
+    return { kind: 'owned' };
+}
+export async function cleanupOrphanedToolVmsIfPresent(options, dependencies = {}) {
+    const log = dependencies.log ?? writeRecoveryLog;
+    const runtimeRecordResults = await (dependencies.loadAllToolVmRuntimeRecords ?? loadAllToolVmRuntimeRecords)(options.stateDir);
+    if (runtimeRecordResults.length === 0) {
+        return { cleanedCount: 0, killedPids: [], quarantinedCount: 0, warnings: [] };
+    }
+    const killedPids = [];
+    const warnings = [];
+    let cleanedCount = 0;
+    const killDependencies = {
+        isProcessAlive: dependencies.isProcessAlive ?? isProcessAlive,
+        killProcess: dependencies.killProcess ?? killProcess,
+        readProcessCommand: dependencies.readProcessCommand ?? readProcessCommand,
+        readProcessIdentity: dependencies.readProcessIdentity ?? readProcessIdentity,
+        sleep: dependencies.sleep ?? sleep,
+    };
+    const deleteRecord = dependencies.deleteToolVmRuntimeRecord ?? deleteToolVmRuntimeRecord;
+    const portForSlot = dependencies.portForSlot ??
+        (options.tcpBasePort === undefined
+            ? undefined
+            : ((tcpBasePort) => (slot) => tcpBasePort + slot)(options.tcpBasePort));
+    const validRuntimeRecords = [];
+    for (const runtimeRecordResult of runtimeRecordResults) {
+        if (runtimeRecordResult.kind === 'parse-error') {
+            const warning = `Tool VM runtime record at '${runtimeRecordResult.path}' failed to parse: ${runtimeRecordResult.error.message}. Skipping during in-process recovery without mutating the file.`;
+            if (options.mode !== 'in-process-recovery') {
+                throw new Error(warning);
+            }
+            log(warning);
+            warnings.push(warning);
+            continue;
+        }
+        const runtimeRecord = runtimeRecordResult.record;
+        const scopeMismatch = validateToolVmRecordCleanupScope({
+            expectedConfigPath: options.expectedConfigPath,
+            expectedControllerPort: options.expectedControllerPort,
+            projectNamespace: options.projectNamespace,
+            runtimeRecord,
+            stateDir: options.stateDir,
+            zoneId: options.zoneId,
+        });
+        if (scopeMismatch !== null) {
+            if (options.mode !== 'in-process-recovery') {
+                throw new Error(scopeMismatch);
+            }
+            const warning = `${scopeMismatch} Skipping the stale runtime record without signaling its recorded process during in-process recovery.`;
+            log(warning);
+            warnings.push(warning);
+            continue;
+        }
+        log(`Found persisted tool VM runtime for lease '${runtimeRecord.leaseId}' (zone '${runtimeRecord.zoneId}', slot ${runtimeRecord.tcpSlot}, pid ${runtimeRecord.qemuPid}, vm ${runtimeRecord.vmId}).`);
+        validRuntimeRecords.push(runtimeRecord);
+    }
+    const provenRuntimeRecords = await Promise.all(validRuntimeRecords.map(async (runtimeRecord) => ({
+        portOwnershipProof: await verifyToolVmPortOwnership({
+            ...(portForSlot ? { portForSlot } : {}),
+            ...(dependencies.readTcpListenPortOwner
+                ? { readTcpListenPortOwner: dependencies.readTcpListenPortOwner }
+                : {}),
+            runtimeRecord,
+        }),
+        runtimeRecord,
+    })));
+    const cleanupReadyRuntimeRecords = [];
+    for (const provenRuntimeRecord of provenRuntimeRecords) {
+        const { portOwnershipProof } = provenRuntimeRecord;
+        if (portOwnershipProof.kind === 'unproven') {
+            if (options.mode !== 'in-process-recovery') {
+                throw new Error(portOwnershipProof.warning);
+            }
+            const warning = `Skipping ${portOwnershipProof.warning}`;
+            log(warning);
+            warnings.push(warning);
+            continue;
+        }
+        cleanupReadyRuntimeRecords.push(provenRuntimeRecord);
+    }
+    const cleanupOutcomes = await Promise.all(cleanupReadyRuntimeRecords.map(async ({ runtimeRecord }) => {
+        const killedPid = await killOrphanedToolVmProcess(runtimeRecord, killDependencies);
+        try {
+            await deleteRecord(options.stateDir, runtimeRecord.recordId);
+        }
+        catch (error) {
+            const warning = `Failed to remove stale tool VM runtime record for lease '${runtimeRecord.leaseId}' at '${options.stateDir}': ${error instanceof Error ? error.message : JSON.stringify(error)}`;
+            log(warning);
+            return {
+                cleanedCount: 0,
+                killedPids: killedPid === null ? [] : [killedPid],
+                warnings: [warning],
+            };
+        }
+        log(killedPid === null
+            ? `Removed stale tool VM runtime record for lease '${runtimeRecord.leaseId}' after confirming the orphaned process was already gone.`
+            : `Removed stale tool VM runtime record for lease '${runtimeRecord.leaseId}' after terminating orphaned tool VM pid ${killedPid}.`);
+        return {
+            cleanedCount: 1,
+            killedPids: killedPid === null ? [] : [killedPid],
+            warnings: [],
+        };
+    }));
+    for (const cleanupOutcome of cleanupOutcomes) {
+        cleanedCount += cleanupOutcome.cleanedCount;
+        killedPids.push(...cleanupOutcome.killedPids);
+        warnings.push(...cleanupOutcome.warnings);
+    }
+    return { cleanedCount, killedPids, quarantinedCount: 0, warnings };
+}
+//# sourceMappingURL=tool-vm-recovery.js.map

package/dist/controller/leases/tool-vm-recovery.js.map

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

package/dist/controller/leases/tool-vm-runtime-record.d.ts

@@ -0,0 +1,59 @@
+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 toolVmRuntimeRecordSchema: z.ZodObject<{
+    schemaVersion: z.ZodLiteral<1>;
+    recordId: z.ZodUUID;
+    agentId: z.ZodString;
+    leaseId: z.ZodString;
+    vmId: z.ZodString;
+    qemuPid: z.ZodNumber;
+    processIdentity: z.ZodObject<{
+        command: z.ZodString;
+        lstart: z.ZodString;
+    }, z.core.$strict>;
+    configPath: z.ZodString;
+    controllerPort: z.ZodNumber;
+    projectNamespace: z.ZodString;
+    zoneId: z.ZodString;
+    gateway: z.ZodObject<{
+        sessionLabel: z.ZodString;
+        vmId: z.ZodOptional<z.ZodString>;
+    }, z.core.$strict>;
+    tcpSlot: z.ZodNumber;
+    sessionLabel: z.ZodString;
+    createdAt: z.ZodISODateTime;
+}, z.core.$strict>;
+export type ToolVmRuntimeRecord = z.infer<typeof toolVmRuntimeRecordSchema>;
+export type ToolVmRuntimeLog = (message: string) => void;
+export type ToolVmRuntimeRecordLoadResult = {
+    readonly kind: 'loaded';
+    readonly path: string;
+    readonly record: ToolVmRuntimeRecord;
+} | {
+    readonly error: Error;
+    readonly kind: 'parse-error';
+    readonly path: string;
+};
+export declare function toolVmRuntimeRecordFilename(record: ToolVmRuntimeRecord): string;
+export declare function loadToolVmRuntimeRecord(stateDirectory: string, recordId: string): Promise<ToolVmRuntimeRecord | null>;
+export declare function loadAllToolVmRuntimeRecords(stateDirectory: string): Promise<ToolVmRuntimeRecordLoadResult[]>;
+export declare function writeToolVmRuntimeRecord(stateDirectory: string, record: ToolVmRuntimeRecord): Promise<void>;
+export declare function deleteToolVmRuntimeRecord(stateDirectory: string, recordId: string): Promise<void>;
+export declare function buildToolVmRuntimeRecord(options: {
+    readonly agentId: string;
+    readonly controllerPort: number;
+    readonly gateway?: {
+        readonly sessionLabel: string;
+        readonly vmId?: string;
+    };
+    readonly leaseId: string;
+    readonly managedVm: ManagedVm;
+    readonly projectNamespace: string;
+    readonly readProcessIdentity?: typeof defaultReadProcessIdentity;
+    readonly recordId: string;
+    readonly systemConfigPath: string;
+    readonly tcpSlot: number;
+    readonly zoneId: string;
+}): Promise<ToolVmRuntimeRecord>;
+//# sourceMappingURL=tool-vm-runtime-record.d.ts.map

package/dist/controller/leases/tool-vm-runtime-record.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tool-vm-runtime-record.d.ts","sourceRoot":"","sources":["../../../src/controller/leases/tool-vm-runtime-record.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,SAAS,EAAuB,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAY,CAAC,EAAE,MAAM,KAAK,CAAC;AAElC,OAAO,EAAE,mBAAmB,IAAI,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAEvG,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;kBAsBpC,CAAC;AAEH,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,yBAAyB,CAAC,CAAC;AAC5E,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;AAEzD,MAAM,MAAM,6BAA6B,GACtC;IACA,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC;CACpC,GACD;IACA,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACrB,CAAC;AAYL,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAE/E;AAWD,wBAAsB,uBAAuB,CAC5C,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAYrC;AAuBD,wBAAsB,2BAA2B,CAChD,cAAc,EAAE,MAAM,GACpB,OAAO,CAAC,6BAA6B,EAAE,CAAC,CA0B1C;AAED,wBAAsB,wBAAwB,CAC7C,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,mBAAmB,GACzB,OAAO,CAAC,IAAI,CAAC,CAOf;AAED,wBAAsB,yBAAyB,CAC9C,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAEf;AAmBD,wBAAsB,wBAAwB,CAAC,OAAO,EAAE;IACvD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAClB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;KACvB,CAAC;IACF,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,0BAA0B,CAAC;IACjE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CA4B/B"}

package/dist/controller/leases/tool-vm-runtime-record.js

@@ -0,0 +1,159 @@
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { buildGatewaySessionLabel, buildToolSessionLabel } from '@agent-vm/gateway-interface';
+import { writeFileAtomically } from '@agent-vm/gondolin-adapter';
+import { ZodError, z } from 'zod';
+import { readProcessIdentity as defaultReadProcessIdentity } from '../../shared/managed-vm-process.js';
+export const toolVmRuntimeRecordSchema = z.strictObject({
+    schemaVersion: z.literal(1),
+    recordId: z.uuid(),
+    agentId: z.string().min(1),
+    leaseId: z.string().min(1),
+    vmId: z.string().min(1),
+    qemuPid: z.number().int().positive(),
+    processIdentity: z.strictObject({
+        command: z.string().min(1),
+        lstart: z.string().min(1),
+    }),
+    configPath: z.string().min(1),
+    controllerPort: z.number().int().positive(),
+    projectNamespace: z.string().min(1),
+    zoneId: z.string().min(1),
+    gateway: z.strictObject({
+        sessionLabel: z.string().min(1),
+        vmId: z.string().min(1).optional(),
+    }),
+    tcpSlot: z.number().int().nonnegative(),
+    sessionLabel: z.string().min(1),
+    createdAt: z.iso.datetime(),
+});
+const toolLeasesDirectoryName = 'tool-leases';
+function resolveToolLeasesDirectory(stateDirectory) {
+    return path.join(stateDirectory, toolLeasesDirectoryName);
+}
+function resolveToolVmRuntimeRecordPath(stateDirectory, recordId) {
+    return path.join(resolveToolLeasesDirectory(stateDirectory), `${recordId}.json`);
+}
+export function toolVmRuntimeRecordFilename(record) {
+    return `${record.recordId}.json`;
+}
+function parseToolVmRuntimeRecord(rawRuntimeRecord) {
+    const parsedRuntimeRecord = JSON.parse(rawRuntimeRecord);
+    return toolVmRuntimeRecordSchema.parse(parsedRuntimeRecord);
+}
+function runtimeRecordParseError(error) {
+    return error instanceof Error ? error : new Error(String(error));
+}
+export async function loadToolVmRuntimeRecord(stateDirectory, recordId) {
+    const runtimeRecordPath = resolveToolVmRuntimeRecordPath(stateDirectory, recordId);
+    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;
+    }
+    return parseToolVmRuntimeRecord(rawRuntimeRecord);
+}
+async function loadToolVmRuntimeRecordResult(runtimeRecordPath) {
+    try {
+        return {
+            kind: 'loaded',
+            path: runtimeRecordPath,
+            record: parseToolVmRuntimeRecord(await fs.readFile(runtimeRecordPath, 'utf8')),
+        };
+    }
+    catch (error) {
+        if (!(error instanceof SyntaxError) && !(error instanceof ZodError)) {
+            throw error;
+        }
+        return {
+            error: runtimeRecordParseError(error),
+            kind: 'parse-error',
+            path: runtimeRecordPath,
+        };
+    }
+}
+export async function loadAllToolVmRuntimeRecords(stateDirectory) {
+    const leasesDirectory = resolveToolLeasesDirectory(stateDirectory);
+    let entries;
+    try {
+        entries = await fs.readdir(leasesDirectory);
+    }
+    catch (error) {
+        if (typeof error === 'object' && error !== null && 'code' in error && error.code === 'ENOENT') {
+            return [];
+        }
+        throw error;
+    }
+    const results = [];
+    for (const entry of entries) {
+        if (!entry.endsWith('.json')) {
+            continue;
+        }
+        const runtimeRecordPath = path.join(leasesDirectory, entry);
+        // oxlint-disable-next-line no-await-in-loop -- per-entry parse errors need their own path.
+        results.push(await loadToolVmRuntimeRecordResult(runtimeRecordPath));
+    }
+    results.sort((left, right) => {
+        const leftCreatedAt = left.kind === 'loaded' ? left.record.createdAt : '';
+        const rightCreatedAt = right.kind === 'loaded' ? right.record.createdAt : '';
+        return leftCreatedAt.localeCompare(rightCreatedAt) || left.path.localeCompare(right.path);
+    });
+    return results;
+}
+export async function writeToolVmRuntimeRecord(stateDirectory, record) {
+    const parsedRecord = toolVmRuntimeRecordSchema.parse(record);
+    const runtimeRecordPath = resolveToolVmRuntimeRecordPath(stateDirectory, parsedRecord.recordId);
+    await fs.mkdir(resolveToolLeasesDirectory(stateDirectory), { recursive: true, mode: 0o700 });
+    await writeFileAtomically(runtimeRecordPath, `${JSON.stringify(parsedRecord, null, 2)}\n`, {
+        mode: 0o600,
+    });
+}
+export async function deleteToolVmRuntimeRecord(stateDirectory, recordId) {
+    await fs.rm(resolveToolVmRuntimeRecordPath(stateDirectory, recordId), { force: true });
+}
+function resolveManagedVmQemuPid(managedVm) {
+    if (typeof managedVm.getHostPid !== 'function') {
+        throw new Error('Managed VM wrapper is missing getHostPid(); update the Gondolin adapter.');
+    }
+    const qemuPid = managedVm.getHostPid();
+    if (qemuPid === null) {
+        throw new Error('Gondolin VM runtime does not expose an active host pid; upgrade @earendil-works/gondolin to a version with VM.getHostPid().');
+    }
+    if (!Number.isInteger(qemuPid) || qemuPid <= 0) {
+        throw new Error(`Gondolin VM runtime exposed an invalid host pid: ${qemuPid}.`);
+    }
+    return qemuPid;
+}
+export async function buildToolVmRuntimeRecord(options) {
+    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 Tool VM '${options.managedVm.id}' pid ${String(qemuPid)}.`);
+    }
+    return toolVmRuntimeRecordSchema.parse({
+        agentId: options.agentId,
+        configPath: options.systemConfigPath,
+        controllerPort: options.controllerPort,
+        createdAt: new Date().toISOString(),
+        gateway: options.gateway ?? {
+            sessionLabel: buildGatewaySessionLabel(options.projectNamespace, options.zoneId),
+        },
+        leaseId: options.leaseId,
+        processIdentity,
+        projectNamespace: options.projectNamespace,
+        qemuPid,
+        recordId: options.recordId,
+        schemaVersion: 1,
+        sessionLabel: buildToolSessionLabel(options.projectNamespace, options.zoneId, options.tcpSlot),
+        tcpSlot: options.tcpSlot,
+        vmId: options.managedVm.id,
+        zoneId: options.zoneId,
+    });
+}
+//# sourceMappingURL=tool-vm-runtime-record.js.map

package/dist/controller/leases/tool-vm-runtime-record.js.map

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

package/dist/gateway/gateway-recovery.d.ts

@@ -1,17 +1,20 @@
-import type { GatewayRuntimeRecordLegacyDefaults } from './gateway-runtime-record.js';
-import { deleteGatewayRuntimeRecord, loadGatewayRuntimeRecord, quarantineGatewayRuntimeRecord } from './gateway-runtime-record.js';
+import { readProcessIdentity } from '../shared/managed-vm-process.js';
+import { type PortOwner } from '../shared/port-owner.js';
+import { deleteGatewayRuntimeRecord, loadGatewayRuntimeRecordResult } from './gateway-runtime-record.js';
 export interface GatewayRecoveryDependencies {
     readonly deleteGatewayRuntimeRecord?: typeof deleteGatewayRuntimeRecord;
     readonly isProcessAlive?: (pid: number) => boolean;
     readonly killProcess?: (pid: number, signal: NodeJS.Signals) => void;
-    readonly loadGatewayRuntimeRecord?: typeof loadGatewayRuntimeRecord;
+    readonly loadGatewayRuntimeRecordResult?: typeof loadGatewayRuntimeRecordResult;
     readonly log?: (message: string) => void;
     readonly readProcessCommand?: (pid: number) => Promise<string | null>;
-    readonly quarantineGatewayRuntimeRecord?: typeof quarantineGatewayRuntimeRecord;
+    readonly readProcessIdentity?: typeof readProcessIdentity;
+    readonly readTcpListenPortOwner?: (port: number) => Promise<PortOwner | null>;
     readonly sleep?: (delayMs: number) => Promise<void>;
 }
 export declare function cleanupOrphanedGatewayIfPresent(options: {
-    readonly legacyRecordDefaults?: GatewayRuntimeRecordLegacyDefaults;
+    readonly expectedConfigPath: string;
+    readonly expectedControllerPort: number;
     readonly mode?: 'in-process-recovery' | 'offline-cleanup';
     readonly projectNamespace: string;
     readonly stateDir: string;

package/dist/gateway/gateway-recovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway-recovery.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-recovery.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEX,kCAAkC,EAClC,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACN,0BAA0B,EAC1B,wBAAwB,EACxB,8BAA8B,EAC9B,MAAM,6BAA6B,CAAC;AAwLrC,MAAM,WAAW,2BAA2B;IAC3C,QAAQ,CAAC,0BAA0B,CAAC,EAAE,OAAO,0BAA0B,CAAC;IACxE,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACnD,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IACrE,QAAQ,CAAC,wBAAwB,CAAC,EAAE,OAAO,wBAAwB,CAAC;IACpE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACtE,QAAQ,CAAC,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;IAChF,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACpD;AAED,wBAAsB,+BAA+B,CACpD,OAAO,EAAE;IACR,QAAQ,CAAC,oBAAoB,CAAC,EAAE,kCAAkC,CAAC;IACnE,QAAQ,CAAC,IAAI,CAAC,EAAE,qBAAqB,GAAG,iBAAiB,CAAC;IAC1D,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,EACD,YAAY,GAAE,2BAAgC,GAC5C,OAAO,CAAC;IACV,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,CAAC,CAuED"}
+{"version":3,"file":"gateway-recovery.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-recovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAMN,mBAAmB,EAEnB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAEN,KAAK,SAAS,EACd,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACN,0BAA0B,EAC1B,8BAA8B,EAC9B,MAAM,6BAA6B,CAAC;AAqFrC,MAAM,WAAW,2BAA2B;IAC3C,QAAQ,CAAC,0BAA0B,CAAC,EAAE,OAAO,0BAA0B,CAAC;IACxE,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACnD,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,KAAK,IAAI,CAAC;IACrE,QAAQ,CAAC,8BAA8B,CAAC,EAAE,OAAO,8BAA8B,CAAC;IAChF,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACzC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACtE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,mBAAmB,CAAC;IAC1D,QAAQ,CAAC,sBAAsB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC;IAC9E,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACpD;AAED,wBAAsB,+BAA+B,CACpD,OAAO,EAAE;IACR,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,sBAAsB,EAAE,MAAM,CAAC;IACxC,QAAQ,CAAC,IAAI,CAAC,EAAE,qBAAqB,GAAG,iBAAiB,CAAC;IAC1D,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,EACD,YAAY,GAAE,2BAAgC,GAC5C,OAAO,CAAC;IACV,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,CAAC,CAyFD"}