@shravansunder/agent-vm 0.0.1 → 0.0.3

package/dist/controller/leases/lease-manager.js

@@ -68,9 +68,7 @@ export function createLeaseManager(options) {
                 await lease.cleanWorkspace?.();
             }
             catch (error) {
-                if (!releaseError) {
-                    releaseError = error instanceof Error ? error : new Error(String(error));
-                }
+                releaseError ??= error instanceof Error ? error : new Error(String(error));
             }
             leases.delete(leaseId);
             options.tcpPool.release(lease.tcpSlot);

package/dist/controller/leases/lease-manager.js.map

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

package/dist/controller/worker-task-runner.d.ts

@@ -0,0 +1,39 @@
+import type { SecretResolver } from '@shravansunder/gondolin-core';
+import type { SystemConfig } from '../config/system-config.js';
+import type { GatewayZone } from '../gateway/gateway-zone-support.js';
+export interface WorkerTaskInput {
+    readonly prompt: string;
+    readonly repos: readonly {
+        readonly repoUrl: string;
+        readonly baseBranch: string;
+    }[];
+    readonly context: Record<string, unknown>;
+}
+export interface PreStartResult {
+    readonly taskId: string;
+    readonly taskRoot: string;
+    readonly workspaceDir: string;
+    readonly stateDir: string;
+    readonly composeFilePaths: readonly string[];
+    readonly tcpHosts: Record<string, string>;
+    readonly repos: readonly {
+        readonly repoUrl: string;
+        readonly baseBranch: string;
+        readonly workspacePath: string;
+    }[];
+}
+export interface WorkerTaskResult {
+    readonly taskId: string;
+    readonly finalState: unknown;
+    readonly taskRoot: string;
+}
+export declare function preStartGateway(taskInput: WorkerTaskInput, zoneConfig: GatewayZone): Promise<PreStartResult>;
+export declare function postStopGateway(taskId: string, zoneConfig: GatewayZone, composeFilePaths?: readonly string[]): Promise<void>;
+export declare function runWorkerTask(options: {
+    readonly input: WorkerTaskInput;
+    readonly secretResolver: SecretResolver;
+    readonly systemConfig: SystemConfig;
+    readonly zoneId: string;
+    readonly timeoutMs?: number;
+}): Promise<WorkerTaskResult>;
+//# sourceMappingURL=worker-task-runner.d.ts.map

package/dist/controller/worker-task-runner.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"worker-task-runner.d.ts","sourceRoot":"","sources":["../../src/controller/worker-task-runner.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAInE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAqDtE,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,SAAS;QAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IACrF,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC7C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC1C,QAAQ,CAAC,KAAK,EAAE,SAAS;QACxB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;QACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAC5B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;KAC/B,EAAE,CAAC;CACJ;AAeD,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAsB,eAAe,CACpC,SAAS,EAAE,eAAe,EAC1B,UAAU,EAAE,WAAW,GACrB,OAAO,CAAC,cAAc,CAAC,CA2EzB;AAED,wBAAsB,eAAe,CACpC,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,WAAW,EACvB,gBAAgB,GAAE,SAAS,MAAM,EAAO,GACtC,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAUD,wBAAsB,aAAa,CAAC,OAAO,EAAE;IAC5C,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC;IAChC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC5B,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAqG5B"}

package/dist/controller/worker-task-runner.js

@@ -0,0 +1,242 @@
+import crypto from 'node:crypto';
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { workerConfigSchema } from '@shravansunder/agent-vm-worker';
+import { execa } from 'execa';
+import { z } from 'zod';
+import { startGatewayZone } from '../gateway/gateway-zone-orchestrator.js';
+import { DockerServiceRoutingError, startDockerServicesForTask, stopDockerServicesForTask, } from './docker-service-routing.js';
+function isPlainObject(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function deepMerge(base, override) {
+    if (Array.isArray(base) || Array.isArray(override)) {
+        return override ?? base;
+    }
+    if (isPlainObject(base) && isPlainObject(override)) {
+        const keys = new Set([...Object.keys(base), ...Object.keys(override)]);
+        const mergedEntries = [...keys].map((key) => [key, deepMerge(base[key], override[key])]);
+        return Object.fromEntries(mergedEntries);
+    }
+    return override ?? base;
+}
+function writeStderr(message) {
+    process.stderr.write(`${message}\n`);
+}
+const taskStatusResponseSchema = z
+    .object({
+    status: z.string(),
+})
+    .passthrough();
+async function readJsonObjectFile(filePath, options) {
+    try {
+        const raw = await fs.readFile(filePath, 'utf8');
+        const parsed = JSON.parse(raw);
+        if (!isPlainObject(parsed)) {
+            throw new Error(`${options.label} must be a JSON object`);
+        }
+        return parsed;
+    }
+    catch (error) {
+        if (error && typeof error === 'object' && 'code' in error && error.code === 'ENOENT') {
+            return options.missingValue;
+        }
+        const message = error instanceof Error ? error.message : String(error);
+        throw new Error(`Invalid ${options.label}: ${message}`, { cause: error });
+    }
+}
+function deriveRepoDirectoryName(repoUrl, usedNames) {
+    const cleanedUrl = repoUrl.replace(/\.git$/, '');
+    const baseName = cleanedUrl.split('/').pop()?.trim() ?? 'repo';
+    let candidate = baseName.replace(/[^a-zA-Z0-9._-]/g, '-');
+    let counter = 2;
+    while (usedNames.has(candidate)) {
+        candidate = `${baseName}-${counter}`;
+        counter += 1;
+    }
+    usedNames.add(candidate);
+    return candidate;
+}
+export async function preStartGateway(taskInput, zoneConfig) {
+    const taskId = crypto.randomUUID();
+    const taskRoot = path.join(zoneConfig.gateway.stateDir, 'tasks', taskId);
+    const workspaceDir = path.join(taskRoot, 'workspace');
+    const stateDir = path.join(taskRoot, 'state');
+    let composeFilePaths = [];
+    await fs.mkdir(workspaceDir, { recursive: true });
+    await fs.mkdir(stateDir, { recursive: true });
+    try {
+        const usedRepoNames = new Set();
+        const clonedRepoHostDirs = [];
+        const clonedRepos = [];
+        for (const repo of taskInput.repos) {
+            const repoDirectoryName = deriveRepoDirectoryName(repo.repoUrl, usedRepoNames);
+            const repoWorkspaceDir = path.join(workspaceDir, repoDirectoryName);
+            const cloneArgs = ['clone', '--branch', repo.baseBranch, repo.repoUrl, repoWorkspaceDir];
+            // Repo cloning is intentionally sequential to keep host-side side effects easy to reason about.
+            // oxlint-disable-next-line eslint/no-await-in-loop
+            await execa('git', cloneArgs);
+            clonedRepoHostDirs.push(repoWorkspaceDir);
+            clonedRepos.push({
+                repoUrl: repo.repoUrl,
+                baseBranch: repo.baseBranch,
+                workspacePath: `/workspace/${repoDirectoryName}`,
+            });
+        }
+        const primaryRepoWorkspaceDir = clonedRepoHostDirs[0] ?? workspaceDir;
+        const projectConfigPath = path.join(primaryRepoWorkspaceDir, '.agent-vm', 'config.json');
+        const projectConfig = await readJsonObjectFile(projectConfigPath, {
+            label: 'project config',
+            missingValue: {},
+        });
+        const baseConfig = await readJsonObjectFile(zoneConfig.gateway.gatewayConfig, {
+            label: 'gateway config',
+            missingValue: {},
+        });
+        const effectiveConfig = workerConfigSchema.parse(deepMerge(baseConfig, projectConfig));
+        await fs.writeFile(path.join(stateDir, 'effective-worker.json'), JSON.stringify(effectiveConfig, null, 2), { encoding: 'utf8', mode: 0o600 });
+        const dockerRouting = await startDockerServicesForTask(workspaceDir, clonedRepoHostDirs);
+        composeFilePaths = dockerRouting.composeFilePaths;
+        return {
+            taskId,
+            taskRoot,
+            workspaceDir,
+            stateDir,
+            composeFilePaths,
+            tcpHosts: dockerRouting.tcpHosts,
+            repos: clonedRepos,
+        };
+    }
+    catch (error) {
+        const composeFilesToStop = error instanceof DockerServiceRoutingError ? error.startedComposeFilePaths : composeFilePaths;
+        try {
+            await stopDockerServicesForTask(composeFilesToStop);
+        }
+        finally {
+            await fs.rm(taskRoot, { recursive: true, force: true });
+        }
+        throw error;
+    }
+}
+export async function postStopGateway(taskId, zoneConfig, composeFilePaths = []) {
+    const taskRoot = path.join(zoneConfig.gateway.stateDir, 'tasks', taskId);
+    let cleanupError = null;
+    let removalError = null;
+    try {
+        await stopDockerServicesForTask(composeFilePaths);
+    }
+    catch (error) {
+        cleanupError = error instanceof Error ? error : new Error(String(error));
+    }
+    try {
+        await fs.rm(taskRoot, { recursive: true, force: true });
+    }
+    catch (error) {
+        removalError = error instanceof Error ? error : new Error(String(error));
+    }
+    if (cleanupError && removalError) {
+        throw new AggregateError([cleanupError, removalError], `Failed to stop Docker services and delete task root for ${taskId}.`);
+    }
+    if (cleanupError) {
+        throw cleanupError;
+    }
+    if (removalError) {
+        throw removalError;
+    }
+}
+async function fetchJson(url, init) {
+    const response = await fetch(url, init);
+    if (!response.ok) {
+        throw new Error(`${init?.method ?? 'GET'} ${url} failed with ${response.status}`);
+    }
+    return await response.json();
+}
+export async function runWorkerTask(options) {
+    const zone = options.systemConfig.zones.find((candidateZone) => candidateZone.id === options.zoneId);
+    if (!zone) {
+        throw new Error(`Unknown zone '${options.zoneId}'.`);
+    }
+    if (zone.gateway.type !== 'worker') {
+        throw new Error(`Zone '${options.zoneId}' is not a worker zone.`);
+    }
+    const preStartResult = await preStartGateway(options.input, zone);
+    const taskZoneConfig = {
+        ...zone,
+        gateway: {
+            ...zone.gateway,
+            workspaceDir: preStartResult.workspaceDir,
+            stateDir: preStartResult.stateDir,
+        },
+    };
+    let gateway;
+    try {
+        gateway = await startGatewayZone({
+            secretResolver: options.secretResolver,
+            systemConfig: options.systemConfig,
+            tcpHostsOverride: preStartResult.tcpHosts,
+            zoneId: options.zoneId,
+            zoneOverride: taskZoneConfig,
+        });
+        const baseUrl = `http://${gateway.ingress.host}:${gateway.ingress.port}`;
+        await fetchJson(`${baseUrl}/tasks`, {
+            method: 'POST',
+            headers: { 'content-type': 'application/json' },
+            body: JSON.stringify({
+                taskId: preStartResult.taskId,
+                prompt: options.input.prompt,
+                repos: preStartResult.repos,
+                context: options.input.context,
+            }),
+        });
+        const timeoutMs = options.timeoutMs ?? 30 * 60 * 1000;
+        const start = Date.now();
+        let consecutivePollFailures = 0;
+        while (Date.now() - start < timeoutMs) {
+            let state;
+            try {
+                // Polling task state is intentionally sequential because each request depends on prior status.
+                // oxlint-disable-next-line eslint/no-await-in-loop
+                const response = await fetchJson(`${baseUrl}/tasks/${preStartResult.taskId}`);
+                state = taskStatusResponseSchema.parse(response);
+                consecutivePollFailures = 0;
+            }
+            catch (error) {
+                if (error instanceof z.ZodError) {
+                    throw new Error(`Worker task status response did not match the expected schema for task ${preStartResult.taskId}.`, { cause: error });
+                }
+                consecutivePollFailures += 1;
+                const message = error instanceof Error ? error.message : String(error);
+                writeStderr(`[worker-task-runner] Poll failure ${consecutivePollFailures} for task ${preStartResult.taskId}: ${message}`);
+                if (consecutivePollFailures >= 3) {
+                    throw error;
+                }
+            }
+            if (!state) {
+                // Poll retry loop intentionally sleeps before the next serial attempt.
+                // oxlint-disable-next-line eslint/no-await-in-loop
+                await new Promise((resolve) => setTimeout(resolve, 1000));
+                continue;
+            }
+            if (state.status === 'completed' || state.status === 'failed' || state.status === 'closed') {
+                return {
+                    taskId: preStartResult.taskId,
+                    finalState: state,
+                    taskRoot: preStartResult.taskRoot,
+                };
+            }
+            // The sleep is part of the serial poll loop and cannot be parallelized.
+            // oxlint-disable-next-line eslint/no-await-in-loop
+            await new Promise((resolve) => setTimeout(resolve, 1000));
+        }
+        throw new Error(`Worker task timed out after ${timeoutMs}ms.`);
+    }
+    finally {
+        try {
+            await gateway?.vm.close();
+        }
+        finally {
+            await postStopGateway(preStartResult.taskId, zone, preStartResult.composeFilePaths);
+        }
+    }
+}
+//# sourceMappingURL=worker-task-runner.js.map

package/dist/controller/worker-task-runner.js.map

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

package/dist/gateway/credential-manager.d.ts

@@ -1,4 +1,4 @@
-import type { SecretResolver } from '@shravansunder/agent-vm-gondolin-core';
+import type { SecretResolver } from '@shravansunder/gondolin-core';
 import type { SystemConfig } from '../config/system-config.js';
 export declare function resolveZoneSecrets(options: {
     readonly systemConfig: SystemConfig;

package/dist/gateway/credential-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"credential-manager.d.ts","sourceRoot":"","sources":["../../src/gateway/credential-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAEvF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AA0B/D,wBAAsB,kBAAkB,CAAC,OAAO,EAAE;IACjD,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;CACxC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CA+BlC"}
+{"version":3,"file":"credential-manager.d.ts","sourceRoot":"","sources":["../../src/gateway/credential-manager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AA0B/D,wBAAsB,kBAAkB,CAAC,OAAO,EAAE;IACjD,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;CACxC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAwDlC"}

package/dist/gateway/credential-manager.js

@@ -24,21 +24,40 @@ export async function resolveZoneSecrets(options) {
     }
     const resolvedSecrets = {};
     for (const [secretName, secretConfig] of Object.entries(zone.secrets)) {
-        if (!secretConfig.ref) {
-            throw new Error(`Zone '${zone.id}' secret '${secretName}' is missing 'ref'. Add an explicit 1Password reference such as '${buildSuggestedSecretRef(zone.id, secretName)}'.`);
+        let secretRef;
+        switch (secretConfig.source) {
+            case 'environment':
+                if (!secretConfig.envVar) {
+                    throw new Error(`Zone '${zone.id}' secret '${secretName}' is missing 'envVar'. Add an explicit environment variable name.`);
+                }
+                secretRef = {
+                    ref: secretConfig.envVar,
+                    source: 'environment',
+                };
+                break;
+            case '1password':
+                if (!secretConfig.ref) {
+                    throw new Error(`Zone '${zone.id}' secret '${secretName}' is missing 'ref'. Add an explicit 1Password reference such as '${buildSuggestedSecretRef(zone.id, secretName)}'.`);
+                }
+                secretRef = {
+                    ref: secretConfig.ref,
+                    source: '1password',
+                };
+                break;
+            default: {
+                const exhaustiveCheck = secretConfig;
+                throw new Error(`Unsupported secret config for '${secretName}': ${JSON.stringify(exhaustiveCheck)}`);
+            }
         }
         try {
-            const secretRef = {
-                ref: secretConfig.ref,
-                source: secretConfig.source,
-            };
             // Sequential resolution gives the user exact secret context on failure.
             // oxlint-disable-next-line eslint/no-await-in-loop
             resolvedSecrets[secretName] = await options.secretResolver.resolve(secretRef);
         }
         catch (error) {
             const message = error instanceof Error ? error.message : String(error);
-            throw new Error(`Failed to resolve secret '${secretName}' for zone '${zone.id}' from '${secretConfig.ref}': ${message}`, { cause: error });
+            const sourceReference = secretConfig.source === 'environment' ? secretConfig.envVar : secretConfig.ref;
+            throw new Error(`Failed to resolve secret '${secretName}' for zone '${zone.id}' from '${sourceReference}': ${message}`, { cause: error });
         }
     }
     return resolvedSecrets;

package/dist/gateway/credential-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"credential-manager.js","sourceRoot":"","sources":["../../src/gateway/credential-manager.ts"],"names":[],"mappings":"AAIA,SAAS,uBAAuB,CAAC,MAAc,EAAE,UAAkB;IAClE,QAAQ,UAAU,EAAE,CAAC;QACpB,KAAK,mBAAmB;YACvB,OAAO,iBAAiB,MAAM,oBAAoB,CAAC;QACpD,KAAK,oBAAoB;YACxB,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;QACxD,KAAK,wBAAwB;YAC5B,OAAO,iBAAiB,MAAM,wBAAwB,CAAC;QACxD,KAAK,gBAAgB;YACpB,OAAO,iBAAiB,MAAM,oBAAoB,CAAC;QACpD,KAAK,mBAAmB;YACvB,OAAO,iBAAiB,MAAM,uBAAuB,CAAC;QACvD;YACC,OAAO,iBAAiB,MAAM,IAAI,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,aAAa,CAAC;IAC9F,CAAC;AACF,CAAC;AAED,SAAS,QAAQ,CAChB,YAA0B,EAC1B,MAAc;IAEd,OAAO,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,MAAM,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAIxC;IACA,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAC5D,IAAI,CAAC,IAAI,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,CAAC,MAAM,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,MAAM,eAAe,GAA2B,EAAE,CAAC;IACnD,KAAK,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACvE,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CACd,SAAS,IAAI,CAAC,EAAE,aAAa,UAAU,oEAAoE,uBAAuB,CAAC,IAAI,CAAC,EAAE,EAAE,UAAU,CAAC,IAAI,CAC3J,CAAC;QACH,CAAC;QACD,IAAI,CAAC;YACJ,MAAM,SAAS,GAAc;gBAC5B,GAAG,EAAE,YAAY,CAAC,GAAG;gBACrB,MAAM,EAAE,YAAY,CAAC,MAAM;aAC3B,CAAC;YACF,wEAAwE;YACxE,mDAAmD;YACnD,eAAe,CAAC,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC/E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACvE,MAAM,IAAI,KAAK,CACd,6BAA6B,UAAU,eAAe,IAAI,CAAC,EAAE,WAAW,YAAY,CAAC,GAAG,MAAM,OAAO,EAAE,EACvG,EAAE,KAAK,EAAE,KAAK,EAAE,CAChB,CAAC;QACH,CAAC;IACF,CAAC;IAED,OAAO,eAAe,CAAC;AACxB,CAAC"}
+{"version":3,"file":"credential-manager.js","sourceRoot":"","sources":["../../src/gateway/credential-manager.ts"],"names":[],"mappings":"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"}

package/dist/gateway/gateway-image-builder.d.ts

@@ -1,4 +1,4 @@
-import type { BuildImageResult } from '@shravansunder/agent-vm-gondolin-core';
+import type { BuildImageResult } from '@shravansunder/gondolin-core';
 import { type GondolinImageBuilderDependencies } from '../build/gondolin-image-builder.js';
 import type { GatewayBuildImageOptions } from './gateway-zone-support.js';
 export interface GatewayImageBuilderDependencies {

package/dist/gateway/gateway-image-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway-image-builder.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-image-builder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAe,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAE3F,OAAO,EAEN,KAAK,gCAAgC,EACrC,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAE1E,MAAM,WAAW,+BAA+B;IAC/C,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,wBAAwB,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACvF,QAAQ,CAAC,kBAAkB,CAAC,EAAE,gCAAgC,CAAC,YAAY,CAAC,CAAC;IAC7E,QAAQ,CAAC,eAAe,CAAC,EAAE,gCAAgC,CAAC,iBAAiB,CAAC,CAAC;CAC/E;AAMD,wBAAsB,iBAAiB,CACtC,OAAO,EAAE;IACR,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC1B,EACD,YAAY,GAAE,+BAAoC,GAChD,OAAO,CAAC,gBAAgB,CAAC,CAa3B"}
+{"version":3,"file":"gateway-image-builder.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-image-builder.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAe,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAElF,OAAO,EAEN,KAAK,gCAAgC,EACrC,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,2BAA2B,CAAC;AAE1E,MAAM,WAAW,+BAA+B;IAC/C,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,wBAAwB,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACvF,QAAQ,CAAC,kBAAkB,CAAC,EAAE,gCAAgC,CAAC,YAAY,CAAC,CAAC;IAC7E,QAAQ,CAAC,eAAe,CAAC,EAAE,gCAAgC,CAAC,iBAAiB,CAAC,CAAC;CAC/E;AAMD,wBAAsB,iBAAiB,CACtC,OAAO,EAAE;IACR,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC1B,EACD,YAAY,GAAE,+BAAoC,GAChD,OAAO,CAAC,gBAAgB,CAAC,CAa3B"}

package/dist/gateway/gateway-lifecycle-loader.d.ts

@@ -1,3 +1,3 @@
-import type { GatewayLifecycle, GatewayZoneConfig } from '@shravansunder/agent-vm-gateway-interface';
+import type { GatewayLifecycle, GatewayZoneConfig } from '@shravansunder/gateway-interface';
 export declare function loadGatewayLifecycle(type: GatewayZoneConfig['gateway']['type']): GatewayLifecycle;
 //# sourceMappingURL=gateway-lifecycle-loader.d.ts.map

package/dist/gateway/gateway-lifecycle-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway-lifecycle-loader.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-lifecycle-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,gBAAgB,EAChB,iBAAiB,EACjB,MAAM,2CAA2C,CAAC;AASnD,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAEjG"}
+{"version":3,"file":"gateway-lifecycle-loader.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-lifecycle-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAS5F,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,gBAAgB,CAEjG"}

package/dist/gateway/gateway-lifecycle-loader.js

@@ -1,7 +1,7 @@
-import { openclawLifecycle } from '@shravansunder/agent-vm-openclaw-gateway';
-import { workerLifecycle } from '@shravansunder/agent-vm-worker-gateway';
+import { openclawLifecycle } from '@shravansunder/openclaw-gateway';
+import { workerLifecycle } from '@shravansunder/worker-gateway';
 const lifecycleByType = {
-    coding: workerLifecycle,
+    worker: workerLifecycle,
     openclaw: openclawLifecycle,
 };
 export function loadGatewayLifecycle(type) {

package/dist/gateway/gateway-lifecycle-loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"gateway-lifecycle-loader.js","sourceRoot":"","sources":["../../src/gateway/gateway-lifecycle-loader.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAEzE,MAAM,eAAe,GAAG;IACvB,MAAM,EAAE,eAAe;IACvB,QAAQ,EAAE,iBAAiB;CACgB,CAAC;AAE7C,MAAM,UAAU,oBAAoB,CAAC,IAA0C;IAC9E,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"gateway-lifecycle-loader.js","sourceRoot":"","sources":["../../src/gateway/gateway-lifecycle-loader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,eAAe,GAAG;IACvB,MAAM,EAAE,eAAe;IACvB,QAAQ,EAAE,iBAAiB;CACgB,CAAC;AAE7C,MAAM,UAAU,oBAAoB,CAAC,IAA0C;IAC9E,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC;AAC9B,CAAC"}

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

@@ -0,0 +1,19 @@
+import { deleteGatewayRuntimeRecord, loadGatewayRuntimeRecord } 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 log?: (message: string) => void;
+    readonly readProcessCommand?: (pid: number) => Promise<string | null>;
+    readonly sleep?: (delayMs: number) => Promise<void>;
+}
+export declare function cleanupOrphanedGatewayIfPresent(options: {
+    readonly stateDir: string;
+    readonly zoneId: string;
+}, dependencies?: GatewayRecoveryDependencies): Promise<{
+    readonly cleanedUp: boolean;
+    readonly cleanupWarning?: string;
+    readonly killedPid: number | null;
+}>;
+//# sourceMappingURL=gateway-recovery.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"gateway-recovery.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-recovery.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,0BAA0B,EAAE,wBAAwB,EAAE,MAAM,6BAA6B,CAAC;AAiJnG,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,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACpD;AAED,wBAAsB,+BAA+B,CACpD,OAAO,EAAE;IACR,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,CAwCD"}

package/dist/gateway/gateway-recovery.js

@@ -0,0 +1,147 @@
+import { execFile } from 'node:child_process';
+import { promisify } from 'node:util';
+import { deleteGatewayRuntimeRecord, loadGatewayRuntimeRecord } 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);
+}
+function writeRecoveryLog(message) {
+    process.stderr.write(`[agent-vm] ${message}\n`);
+}
+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({
+        pid: runtimeRecord.qemuPid,
+        processIsAlive: dependencies.isProcessAlive,
+        sleep: dependencies.sleep,
+        timeoutMs: 2_000,
+    })) {
+        return runtimeRecord.qemuPid;
+    }
+    try {
+        dependencies.killProcess(runtimeRecord.qemuPid, 'SIGKILL');
+    }
+    catch (error) {
+        if (!isNoSuchProcessError(error)) {
+            throw error;
+        }
+    }
+    if (await waitForExit({
+        pid: runtimeRecord.qemuPid,
+        processIsAlive: dependencies.isProcessAlive,
+        sleep: dependencies.sleep,
+        timeoutMs: 2_000,
+    })) {
+        return runtimeRecord.qemuPid;
+    }
+    throw new Error(`Failed to terminate orphaned gateway VM process ${runtimeRecord.qemuPid} for zone '${runtimeRecord.zoneId}'.`);
+}
+export async function cleanupOrphanedGatewayIfPresent(options, dependencies = {}) {
+    const log = dependencies.log ?? writeRecoveryLog;
+    const runtimeRecord = await (dependencies.loadGatewayRuntimeRecord ?? loadGatewayRuntimeRecord)(options.stateDir, { log });
+    if (!runtimeRecord) {
+        return { cleanedUp: false, killedPid: null };
+    }
+    log(`Found persisted gateway runtime for zone '${runtimeRecord.zoneId}' (pid ${runtimeRecord.qemuPid}, vm ${runtimeRecord.vmId}).`);
+    const killedPid = await killOrphanedGatewayProcess(runtimeRecord, {
+        isProcessAlive: dependencies.isProcessAlive ?? isProcessAlive,
+        killProcess: dependencies.killProcess ?? killProcess,
+        readProcessCommand: dependencies.readProcessCommand ?? readProcessCommand,
+        sleep: dependencies.sleep ?? sleep,
+    });
+    try {
+        await (dependencies.deleteGatewayRuntimeRecord ?? deleteGatewayRuntimeRecord)(options.stateDir);
+    }
+    catch (error) {
+        const cleanupWarning = `Failed to remove stale gateway runtime record for zone '${runtimeRecord.zoneId}' at '${options.stateDir}': ${error instanceof Error ? error.message : JSON.stringify(error)}`;
+        log(cleanupWarning);
+        return {
+            cleanedUp: false,
+            cleanupWarning,
+            killedPid,
+        };
+    }
+    log(killedPid === null
+        ? `Removed stale gateway runtime record for zone '${runtimeRecord.zoneId}' after confirming the orphaned process was already gone.`
+        : `Removed stale gateway runtime record for zone '${runtimeRecord.zoneId}' after terminating orphaned gateway pid ${killedPid}.`);
+    return {
+        cleanedUp: true,
+        killedPid,
+    };
+}
+//# sourceMappingURL=gateway-recovery.js.map

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

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