npm - @agent-vm/agent-vm - Versions diffs - 0.0.32 → 0.0.33 - Mend

@agent-vm/agent-vm 0.0.32 → 0.0.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (96) hide show

package/dist/config/system-config.js CHANGED Viewed

@@ -1,10 +1,17 @@
-import fs from 'node:fs/promises';
+import { readFile } from 'node:fs/promises';
 import path from 'node:path';
 import { z } from 'zod';
 import { resolveConfigPath } from './path-resolver.js';
 import { zoneResourcesPolicySchema } from './resource-contracts/index.js';
 import { resolveSystemCacheIdentifierPath } from './system-cache-identifier.js';
 const gatewayTypeValues = ['openclaw', 'worker'];
+const agentIdSchema = z
+    .string()
+    .min(1)
+    .regex(/^[a-z0-9][a-z0-9._-]*$/u, 'agent id must start with a lowercase letter or number and contain only lowercase letters, numbers, dots, underscores, or hyphens');
+function pathContainsParentTraversal(inputPath) {
+    return inputPath.split(/[\\/]+/u).includes('..');
+}
 const secretInjectionSchema = z.enum(['env', 'http-mediation']);
 const onePasswordSecretSchema = z.object({
     source: z.literal('1password'),
@@ -65,6 +72,22 @@ const authProfilesSecretSchema = z.discriminatedUnion('source', [
         envVar: z.string().min(1),
     }),
 ]);
+const agentSandboxSeedSchema = z
+    .object({
+    source: authProfilesSecretSchema,
+    target: z.string().min(1),
+    mode: z.number().int().min(0).max(0o777).default(0o600),
+})
+    .strict()
+    .superRefine((seed, context) => {
+    if (path.posix.isAbsolute(seed.target) || pathContainsParentTraversal(seed.target)) {
+        context.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: 'agent sandbox seed target must be a relative path without parent traversal.',
+            path: ['target'],
+        });
+    }
+});
 const hostSecretReferenceSchema = z.discriminatedUnion('source', [
     z.object({
         source: z.literal('1password'),
@@ -89,6 +112,7 @@ const openClawZoneGatewaySchema = zoneGatewayBaseSchema
     .extend({
     type: z.literal('openclaw'),
     zoneFilesDir: z.string().min(1),
+    authProfilesByAgent: z.record(agentIdSchema, authProfilesSecretSchema).optional(),
 })
     .strict();
 const workerZoneGatewaySchema = zoneGatewayBaseSchema
@@ -100,13 +124,32 @@ const zoneGatewaySchema = z.discriminatedUnion('type', [
     openClawZoneGatewaySchema,
     workerZoneGatewaySchema,
 ]);
-const toolProfileSchema = z
+const toolVmProfileSchema = z
     .object({
     memory: z.string().min(1),
     cpus: z.number().int().positive(),
     imageProfile: z.string().min(1),
 })
     .strict();
+const leaseScopeKindSchema = z.enum([
+    'agent',
+    'discord',
+    'project',
+    'session',
+    'shared',
+    'workspace',
+]);
+const leaseIdleTtlSchema = z
+    .object({
+    defaultMs: z
+        .number()
+        .int()
+        .positive()
+        .default(30 * 60 * 1000),
+    byScopeKind: z.partialRecord(leaseScopeKindSchema, z.number().int().positive()).default({}),
+    byScopePrefix: z.record(z.string().min(1), z.number().int().positive()).default({}),
+})
+    .strict();
 const imageConfigSchema = z
     .object({
     buildConfig: z.string().min(1),
@@ -143,7 +186,8 @@ const systemConfigSchema = z
     runtimeDir: z.string().min(1).default('./runtime'),
     imageProfiles: imageProfilesSchema,
     zones: z
-        .array(z.object({
+        .array(z
+        .object({
         id: z.string().min(1),
         gateway: zoneGatewaySchema,
         resources: zoneResourcesPolicySchema.optional(),
@@ -151,18 +195,26 @@ const systemConfigSchema = z
         runtimeAuthHints: z.array(runtimeAuthHintSchema).optional(),
         allowedHosts: z.array(z.string().min(1)).min(1),
         websocketBypass: z.array(z.string().min(1)).default([]),
-        toolProfile: z.string().min(1).optional(),
-    }))
+        defaultToolVmProfile: z.string().min(1).optional(),
+        agentToolVmProfiles: z.record(agentIdSchema, z.string().min(1)).optional(),
+        agentSandboxSeeds: z.record(agentIdSchema, z.array(agentSandboxSeedSchema)).optional(),
+    })
+        .strict())
         .min(1, 'system config must define at least one zone'),
-    toolProfiles: z.record(z.string(), toolProfileSchema).default({}),
+    toolVmProfiles: z.record(z.string().min(1), toolVmProfileSchema).default({}),
     tcpPool: z.object({
         basePort: z.number().int().positive(),
         size: z.number().int().positive(),
     }),
+    leaseIdleTtl: leaseIdleTtlSchema.optional(),
 })
+    .strict()
     .superRefine((config, context) => {
     const hasOnePasswordSecrets = config.zones.some((zone) => Object.values(zone.secrets).some((secret) => secret.source === '1password') ||
-        zone.gateway.authProfilesRef?.source === '1password');
+        zone.gateway.authProfilesRef?.source === '1password' ||
+        (zone.gateway.type === 'openclaw' &&
+            Object.values(zone.gateway.authProfilesByAgent ?? {}).some((secret) => secret.source === '1password')) ||
+        Object.values(zone.agentSandboxSeeds ?? {}).some((seeds) => seeds.some((seed) => seed.source.source === '1password')));
     const hasOnePasswordGithubToken = config.host.githubToken?.source === '1password';
     if ((hasOnePasswordSecrets || hasOnePasswordGithubToken) && !config.host.secretsProvider) {
         context.addIssue({
@@ -198,19 +250,58 @@ const systemConfigSchema = z
                 path: ['zones', zoneIndex, 'gateway', 'imageProfile'],
             });
         }
-        if (zone.gateway.type === 'openclaw' && zone.toolProfile === undefined) {
+        if (zone.gateway.type !== 'openclaw' && zone.defaultToolVmProfile !== undefined) {
             context.addIssue({
                 code: z.ZodIssueCode.custom,
-                message: `OpenClaw zone '${zone.id}' must declare a toolProfile.`,
-                path: ['zones', zoneIndex, 'toolProfile'],
+                message: `Worker zone '${zone.id}' must not declare defaultToolVmProfile.`,
+                path: ['zones', zoneIndex, 'defaultToolVmProfile'],
+            });
+        }
+        if (zone.gateway.type !== 'openclaw' && zone.agentToolVmProfiles !== undefined) {
+            context.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: `Worker zone '${zone.id}' must not declare agentToolVmProfiles.`,
+                path: ['zones', zoneIndex, 'agentToolVmProfiles'],
             });
-            continue;
         }
-        if (zone.toolProfile !== undefined && !config.toolProfiles[zone.toolProfile]) {
+        if (zone.gateway.type !== 'openclaw' &&
+            Object.keys(zone.agentSandboxSeeds ?? {}).length > 0) {
+            context.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: `Worker zone '${zone.id}' must not declare agentSandboxSeeds.`,
+                path: ['zones', zoneIndex, 'agentSandboxSeeds'],
+            });
+        }
+        if (zone.gateway.type === 'openclaw' && zone.defaultToolVmProfile === undefined) {
+            context.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: `OpenClaw zone '${zone.id}' must declare a defaultToolVmProfile.`,
+                path: ['zones', zoneIndex, 'defaultToolVmProfile'],
+            });
+        }
+        if (zone.gateway.type === 'openclaw' && zone.agentToolVmProfiles === undefined) {
+            context.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: `OpenClaw zone '${zone.id}' must declare agentToolVmProfiles, even when it is empty.`,
+                path: ['zones', zoneIndex, 'agentToolVmProfiles'],
+            });
+        }
+        if (zone.defaultToolVmProfile !== undefined &&
+            !config.toolVmProfiles[zone.defaultToolVmProfile]) {
+            context.addIssue({
+                code: z.ZodIssueCode.custom,
+                message: `Zone '${zone.id}' references unknown defaultToolVmProfile '${zone.defaultToolVmProfile}'.`,
+                path: ['zones', zoneIndex, 'defaultToolVmProfile'],
+            });
+        }
+        for (const [agentId, toolVmProfileId] of Object.entries(zone.agentToolVmProfiles ?? {})) {
+            if (config.toolVmProfiles[toolVmProfileId]) {
+                continue;
+            }
             context.addIssue({
                 code: z.ZodIssueCode.custom,
-                message: `Zone '${zone.id}' references unknown toolProfile '${zone.toolProfile}'.`,
-                path: ['zones', zoneIndex, 'toolProfile'],
+                message: `Zone '${zone.id}' agentToolVmProfiles['${agentId}'] references unknown toolVmProfile '${toolVmProfileId}'.`,
+                path: ['zones', zoneIndex, 'agentToolVmProfiles', agentId],
             });
         }
         for (const [hintIndex, hint] of (zone.runtimeAuthHints ?? []).entries()) {
@@ -240,14 +331,14 @@ const systemConfigSchema = z
             }
         }
     }
-    for (const [profileId, profile] of Object.entries(config.toolProfiles)) {
+    for (const [profileId, profile] of Object.entries(config.toolVmProfiles)) {
         if (config.imageProfiles.toolVms[profile.imageProfile]) {
             continue;
         }
         context.addIssue({
             code: z.ZodIssueCode.custom,
-            message: `Tool profile '${profileId}' references unknown tool VM imageProfile '${profile.imageProfile}'.`,
-            path: ['toolProfiles', profileId, 'imageProfile'],
+            message: `Tool VM profile '${profileId}' references unknown tool VM imageProfile '${profile.imageProfile}'.`,
+            path: ['toolVmProfiles', profileId, 'imageProfile'],
         });
     }
 });
@@ -339,7 +430,7 @@ function resolveRelativePaths(config, configDir) {
             ...zone,
             gateway: resolveZoneGatewayPaths(zone.gateway),
         })),
-        toolProfiles: Object.fromEntries(Object.entries(config.toolProfiles).map(([profileId, profile]) => [
+        toolVmProfiles: Object.fromEntries(Object.entries(config.toolVmProfiles).map(([profileId, profile]) => [
             profileId,
             { ...profile },
         ])),
@@ -348,7 +439,7 @@ function resolveRelativePaths(config, configDir) {
 export async function loadSystemConfig(configPath) {
     const absoluteConfigPath = path.resolve(configPath);
     const configDir = path.dirname(absoluteConfigPath);
-    const rawConfig = await fs.readFile(absoluteConfigPath, 'utf8');
+    const rawConfig = await readFile(absoluteConfigPath, 'utf8');
     let parsedConfig;
     try {
         parsedConfig = JSON.parse(rawConfig);

package/dist/config/system-config.js.map CHANGED Viewed

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

package/dist/controller/active-task-registry.d.ts CHANGED Viewed

@@ -29,14 +29,17 @@ export interface ActiveWorkerTask {
 }
 export declare class ActiveTaskRegistry {
     private readonly tasksByZone;
+    private readonly destroyingZones;
     tryReserve(zoneId: string, maxActiveTasksPerPod: number): string | null;
     activateReservation(zoneId: string, reservationId: string, task: ActiveWorkerTask): void;
     releaseReservation(zoneId: string, reservationId: string): boolean;
     get(zoneId: string, taskId: string): ActiveWorkerTask | null;
     listForZone(zoneId: string): readonly ActiveWorkerTask[];
     countOccupiedForZone(zoneId: string): number;
+    beginZoneDestroy(zoneId: string): void;
+    endZoneDestroy(zoneId: string): void;
     setWorkerIngress(zoneId: string, taskId: string, workerIngress: ActiveWorkerTaskIngress): void;
-    clear(zoneId: string, taskId: string): void;
+    clear(zoneId: string, taskId: string): boolean;
     private getOrCreateZoneState;
     private deleteZoneIfEmpty;
 }

package/dist/controller/active-task-registry.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"active-task-registry.d.ts","sourceRoot":"","sources":["../../src/controller/active-task-registry.ts"],"names":[],"mappings":"AAEA,OAAO,CAAC,MAAM,eAAe,EAAE,OAAO,MAAM,CAAC;AAC7C,OAAO,CAAC,MAAM,eAAe,EAAE,OAAO,MAAM,CAAC;AAE7C,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,CAAC,eAAe,CAAC,EAAE,YAAY,CAAA;CAAE,CAAC;AAC/E,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,CAAC,eAAe,CAAC,EAAE,YAAY,CAAA;CAAE,CAAC;AAE/E,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAM1D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAM1D;AAED,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACvC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,SAAS,oBAAoB,EAAE,CAAC;IAChD,QAAQ,CAAC,aAAa,EAAE,uBAAuB,GAAG,IAAI,CAAC;CACvD;AAOD,qBAAa,kBAAkB;IAC9B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoC;~~IAEzD~~,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;~~IAUvE~~,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI;~~IAWxF~~,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO;IAUlE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAQ5D,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,gBAAgB,EAAE;IAIxD,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAQ5C,gBAAgB,CACtB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,uBAAuB,GACpC,IAAI;~~IASA~~,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,~~IAAI~~;~~IAWlD~~,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,iBAAiB;CAKzB"}
1	+ {"version":3,"file":"active-task-registry.d.ts","sourceRoot":"","sources":["../../src/controller/active-task-registry.ts"],"names":[],"mappings":"AAEA,OAAO,CAAC,MAAM,eAAe,EAAE,OAAO,MAAM,CAAC;AAC7C,OAAO,CAAC,MAAM,eAAe,EAAE,OAAO,MAAM,CAAC;AAE7C,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,CAAC,eAAe,CAAC,EAAE,YAAY,CAAA;CAAE,CAAC;AAC/E,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,CAAC,eAAe,CAAC,EAAE,YAAY,CAAA;CAAE,CAAC;AAE/E,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAM1D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAM1D;AAED,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;CAChC;AAED,MAAM,WAAW,uBAAuB;IACvC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,SAAS,oBAAoB,EAAE,CAAC;IAChD,QAAQ,CAAC,aAAa,EAAE,uBAAuB,GAAG,IAAI,CAAC;CACvD;AAOD,qBAAa,kBAAkB;IAC9B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAoC;IAChE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAqB;IAE9C,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAavE,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,IAAI,EAAE,gBAAgB,GAAG,IAAI;IAcxF,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO;IAUlE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,gBAAgB,GAAG,IAAI;IAQ5D,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,gBAAgB,EAAE;IAIxD,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAQ5C,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAItC,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAIpC,gBAAgB,CACtB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,uBAAuB,GACpC,IAAI;IAYA,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAYrD,OAAO,CAAC,oBAAoB;IAa5B,OAAO,CAAC,iBAAiB;CAKzB"}

package/dist/controller/active-task-registry.js CHANGED Viewed

@@ -15,7 +15,11 @@ export function createVmWorkPath(value) {
 }
 export class ActiveTaskRegistry {
     tasksByZone = new Map();
+    destroyingZones = new Set();
     tryReserve(zoneId, maxActiveTasksPerPod) {
+        if (this.destroyingZones.has(zoneId)) {
+            return null;
+        }
         const state = this.getOrCreateZoneState(zoneId);
         if (state.tasksById.size + state.reservations.size >= maxActiveTasksPerPod) {
             return null;
@@ -25,6 +29,9 @@ export class ActiveTaskRegistry {
         return reservationId;
     }
     activateReservation(zoneId, reservationId, task) {
+        if (this.destroyingZones.has(zoneId)) {
+            throw new Error(`Zone '${zoneId}' has a destroy in progress.`);
+        }
         const state = this.getOrCreateZoneState(zoneId);
         if (!state.reservations.has(reservationId)) {
             throw new Error(`Zone '${zoneId}' does not have reservation '${reservationId}' for task '${task.taskId}'.`);
@@ -58,7 +65,16 @@ export class ActiveTaskRegistry {
         }
         return state.tasksById.size + state.reservations.size;
     }
+    beginZoneDestroy(zoneId) {
+        this.destroyingZones.add(zoneId);
+    }
+    endZoneDestroy(zoneId) {
+        this.destroyingZones.delete(zoneId);
+    }
     setWorkerIngress(zoneId, taskId, workerIngress) {
+        if (this.destroyingZones.has(zoneId)) {
+            throw new Error(`Zone '${zoneId}' has a destroy in progress.`);
+        }
         const task = this.get(zoneId, taskId);
         if (!task) {
             throw new Error(`Zone '${zoneId}' has no active task '${taskId}' to update.`);
@@ -69,12 +85,13 @@ export class ActiveTaskRegistry {
     clear(zoneId, taskId) {
         const state = this.tasksByZone.get(zoneId);
         if (!state) {
-            throw new Error(`Zone '${zoneId}' has no active task '${taskId}' to clear.`);
+            return false;
         }
         if (!state.tasksById.delete(taskId)) {
-            throw new Error(`Zone '${zoneId}' has no active task '${taskId}' to clear.`);
+            return false;
         }
         this.deleteZoneIfEmpty(zoneId, state);
+        return true;
     }
     getOrCreateZoneState(zoneId) {
         const existingState = this.tasksByZone.get(zoneId);

package/dist/controller/active-task-registry.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"active-task-registry.js","sourceRoot":"","sources":["../../src/controller/active-task-registry.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAQjC,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC7C,IAAI,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,kDAAkD,KAAK,IAAI,CAAC,CAAC;IAC9E,CAAC;IACD,iJAAiJ;IACjJ,OAAO,KAAmB,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC7C,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,sDAAsD,KAAK,IAAI,CAAC,CAAC;IAClF,CAAC;IACD,iJAAiJ;IACjJ,OAAO,KAAmB,CAAC;AAC5B,CAAC;AA6BD,MAAM,OAAO,kBAAkB;IACb,WAAW,GAAG,IAAI,GAAG,EAAyB,CAAC;~~IAEzD~~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~~MAAM~~,~~IAAI,~~KAAK,CAAC~~,SAAS,MAAM,yBAAyB,MAAM,aAAa,CAAC,CAAC~~;~~QAC9E~~,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,~~MAAM~~,~~IAAI,~~KAAK,CAAC~~,SAAS,MAAM,yBAAyB,MAAM,aAAa,CAAC,CAAC~~;~~QAC9E~~,CAAC;QACD,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;~~IACvC~~,CAAC;IAEO,oBAAoB,CAAC,MAAc;QAC1C,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnD,IAAI,aAAa,EAAE,CAAC;YACnB,OAAO,aAAa,CAAC;QACtB,CAAC;QACD,MAAM,KAAK,GAAkB;YAC5B,YAAY,EAAE,IAAI,GAAG,EAAU;YAC/B,SAAS,EAAE,IAAI,GAAG,EAA4B;SAC9C,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACpC,OAAO,KAAK,CAAC;IACd,CAAC;IAEO,iBAAiB,CAAC,MAAc,EAAE,KAAoB;QAC7D,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACjE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC;IACF,CAAC;CACD"}
1	+ {"version":3,"file":"active-task-registry.js","sourceRoot":"","sources":["../../src/controller/active-task-registry.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAC;AAQjC,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC7C,IAAI,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,kDAAkD,KAAK,IAAI,CAAC,CAAC;IAC9E,CAAC;IACD,iJAAiJ;IACjJ,OAAO,KAAmB,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC7C,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QACvC,MAAM,IAAI,KAAK,CAAC,sDAAsD,KAAK,IAAI,CAAC,CAAC;IAClF,CAAC;IACD,iJAAiJ;IACjJ,OAAO,KAAmB,CAAC;AAC5B,CAAC;AA6BD,MAAM,OAAO,kBAAkB;IACb,WAAW,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC/C,eAAe,GAAG,IAAI,GAAG,EAAU,CAAC;IAE9C,UAAU,CAAC,MAAc,EAAE,oBAA4B;QAC7D,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC;QACb,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAChD,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,IAAI,oBAAoB,EAAE,CAAC;YAC5E,OAAO,IAAI,CAAC;QACb,CAAC;QACD,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QAC1C,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QACtC,OAAO,aAAa,CAAC;IACtB,CAAC;IAEM,mBAAmB,CAAC,MAAc,EAAE,aAAqB,EAAE,IAAsB;QACvF,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,SAAS,MAAM,8BAA8B,CAAC,CAAC;QAChE,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAChD,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;YAC5C,MAAM,IAAI,KAAK,CACd,SAAS,MAAM,gCAAgC,aAAa,eAAe,IAAI,CAAC,MAAM,IAAI,CAC1F,CAAC;QACH,CAAC;QACD,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACzC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACxC,CAAC;IAEM,kBAAkB,CAAC,MAAc,EAAE,aAAqB;QAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,KAAK,CAAC;QACd,CAAC;QACD,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QACzD,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACtC,OAAO,OAAO,CAAC;IAChB,CAAC;IAEM,GAAG,CAAC,MAAc,EAAE,MAAc;QACxC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QACb,CAAC;QACD,OAAO,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC;IAC5C,CAAC;IAEM,WAAW,CAAC,MAAc;QAChC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACtE,CAAC;IAEM,oBAAoB,CAAC,MAAc;QACzC,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,CAAC,CAAC;QACV,CAAC;QACD,OAAO,KAAK,CAAC,SAAS,CAAC,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC;IACvD,CAAC;IAEM,gBAAgB,CAAC,MAAc;QACrC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC;IAEM,cAAc,CAAC,MAAc;QACnC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACrC,CAAC;IAEM,gBAAgB,CACtB,MAAc,EACd,MAAc,EACd,aAAsC;QAEtC,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,KAAK,CAAC,SAAS,MAAM,8BAA8B,CAAC,CAAC;QAChE,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,SAAS,MAAM,yBAAyB,MAAM,cAAc,CAAC,CAAC;QAC/E,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAChD,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,EAAE,aAAa,EAAE,CAAC,CAAC;IACzD,CAAC;IAEM,KAAK,CAAC,MAAc,EAAE,MAAc;QAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO,KAAK,CAAC;QACd,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YACrC,OAAO,KAAK,CAAC;QACd,CAAC;QACD,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACtC,OAAO,IAAI,CAAC;IACb,CAAC;IAEO,oBAAoB,CAAC,MAAc;QAC1C,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACnD,IAAI,aAAa,EAAE,CAAC;YACnB,OAAO,aAAa,CAAC;QACtB,CAAC;QACD,MAAM,KAAK,GAAkB;YAC5B,YAAY,EAAE,IAAI,GAAG,EAAU;YAC/B,SAAS,EAAE,IAAI,GAAG,EAA4B;SAC9C,CAAC;QACF,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACpC,OAAO,KAAK,CAAC;IACd,CAAC;IAEO,iBAAiB,CAAC,MAAc,EAAE,KAAoB;QAC7D,IAAI,KAAK,CAAC,SAAS,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YACjE,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACjC,CAAC;IACF,CAAC;CACD"}

package/dist/controller/controller-runtime-operations.d.ts CHANGED Viewed

@@ -1,24 +1,6 @@
-import type { GatewayProcessSpec } from '@agent-vm/gateway-interface';
-import type { SecretResolver } from '@agent-vm/gondolin-adapter';
 import type { SystemConfig } from '../config/system-config.js';
-import type { LeaseManager } from './leases/lease-manager.js';
-interface GatewayZoneRuntime {
-    readonly ingress: {
-        readonly host: string;
-        readonly port: number;
-    };
-    readonly processSpec: GatewayProcessSpec;
-    readonly vm: {
-        readonly id: string;
-        close(): Promise<void>;
-        enableSsh(): Promise<unknown>;
-        exec(command: string): Promise<{
-            readonly exitCode: number;
-            readonly stderr: string;
-            readonly stdout: string;
-        }>;
-    };
-}
+import { type ControllerRuntimeStatus } from '../operations/controller-status.js';
+import type { OpenClawZoneRuntime } from './zone-runtimes/zone-runtime-types.js';
 interface ControllerRuntimeOperations {
     readonly destroyZone: (targetZoneId: string, purge: boolean) => Promise<unknown>;
     readonly enableSshForZone: (targetZoneId: string) => Promise<unknown>;
@@ -28,11 +10,11 @@ interface ControllerRuntimeOperations {
         readonly stdout: string;
     }>;
     readonly getStatus: () => Promise<unknown>;
-    readonly getZoneStatus: (targetZoneId: string) => Promise<unknown>;
     readonly getZoneLogs: (targetZoneId: string) => Promise<{
         readonly output: string;
         readonly zoneId: string;
     }>;
+    readonly getZoneStatus: (targetZoneId: string) => Promise<unknown>;
     readonly refreshZoneCredentials: (targetZoneId: string) => Promise<{
         readonly ok: true;
         readonly zoneId: string;
@@ -40,24 +22,26 @@ interface ControllerRuntimeOperations {
     readonly upgradeZone: (targetZoneId: string) => Promise<unknown>;
 }
 export declare function createControllerRuntimeOperations(options: {
-    readonly activeZoneId: string;
-    readonly getGateway: () => GatewayZoneRuntime;
-    readonly getGatewayBootedAt: () => string | undefined;
-    readonly getZone: (zoneId: string) => SystemConfig['zones'][number];
-    readonly leaseManager: Pick<LeaseManager, 'listLeases' | 'releaseLease'>;
-    readonly restartGatewayZone: () => Promise<void>;
-    readonly secretResolver: SecretResolver;
-    readonly stopGatewayZone: () => Promise<void>;
+    readonly getActiveLeases: () => readonly {
+        readonly zoneId: string;
+    }[];
+    readonly getOpenClawRuntime: (zoneId: string) => Pick<OpenClawZoneRuntime, 'destroy' | 'enableSsh' | 'exec' | 'getLogs' | 'refreshCredentials' | 'upgrade'>;
+    readonly destroyZoneRuntime: (zoneId: string, purge: boolean) => Promise<{
+        readonly ok: true;
+        readonly purged: boolean;
+        readonly zoneId: string;
+    }>;
+    readonly getRuntimeStatusByZone: () => ControllerRuntimeStatus['zones'];
     readonly systemConfig: SystemConfig;
 }): ControllerRuntimeOperations;
 export declare function createStopControllerOperation(options: {
     readonly clearReaperTimer: () => void;
-    readonly closeControllerServer: () => void;
+    readonly closeControllerServer: () => Promise<void>;
     readonly getLeases: () => readonly {
         readonly id: string;
     }[];
     readonly releaseLease: (leaseId: string) => Promise<void>;
-    readonly stopGatewayZone: () => Promise<void>;
+    readonly stopAllZones: () => Promise<void>;
 }): () => Promise<{
     readonly ok: true;
 }>;

package/dist/controller/controller-runtime-operations.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"controller-runtime-operations.d.ts","sourceRoot":"","sources":["../../src/controller/controller-runtime-operations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,~~kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,OAAO,KAAK,EAAE,~~YAAY,EAAE,MAAM,4BAA4B,CAAC;~~AAW~~/D,OAAO,KAAK,~~EAAE~~,~~YAAY~~,~~EAAE,~~MAAM,~~2BAA2B~~,CAAC;~~AAE9D~~,~~UAAU,kBAAkB;IAC3B,QAAQ,CAAC,~~OAAO,~~EAAE;QACjB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;IACzC,QAAQ,CAAC,EAAE,EAAE;QACZ,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QACpB,~~KAAK,~~IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;QACvB,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;QAC9B,IAAI,CAAC,OAAO,~~EAAE,~~MAAM~~,~~GAAG,OAAO,CAAC;YAC9B,QAAQ,CAAC,QAAQ,~~EAAE,MAAM,~~CAAC;YAC1B~~,~~QAAQ,~~CAAC~~,MAAM,EAAE,MAAM,CAAC~~;~~YACxB~~,~~QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;SACxB,CAAC,CAAC;KACH,CAAC;CACF;AAED,~~UAAU,2BAA2B;IACpC,QAAQ,CAAC,WAAW,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACjF,QAAQ,CAAC,gBAAgB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACtE,QAAQ,CAAC,UAAU,EAAE,CACpB,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,KACX,OAAO,CAAC;QACZ,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;KACxB,CAAC,CAAC;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,QAAQ,CAAC,~~aAAa~~,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC~~,OAAO,CAAC,CAAC~~;~~IACnE~~,QAAQ,CAAC,~~WAAW~~,EAAE,~~CAAC,YAAY,EAAE,~~MAAM,~~KAAK,OAAO,~~CAAC;~~QACvD~~,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;~~QACxB~~,QAAQ,CAAC,~~MAAM~~,EAAE,MAAM,CAAC~~;KACxB~~,CAAC,CAAC;~~IACH~~,QAAQ,CAAC,sBAAsB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC;QAClE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;QAClB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;KACxB,CAAC,CAAC;IACH,QAAQ,CAAC,WAAW,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;CACjE;AAED,wBAAgB,iCAAiC,CAAC,OAAO,EAAE;IAC1D,QAAQ,CAAC,~~YAAY~~,EAAE,MAAM,~~CAAC~~;~~IAC9B~~,QAAQ,CAAC,~~UAAU~~,EAAE,MAAM,~~kBAAkB~~,CAAC;~~IAC9C~~,QAAQ,CAAC,kBAAkB,EAAE,MAAM,MAAM,GAAG,SAAS,CAAC;~~IACtD~~,QAAQ,CAAC,~~OAAO~~,EAAE,~~CAAC~~,MAAM,EAAE,MAAM,KAAK,~~YAAY~~,~~CAAC,~~OAAO,~~CAAC~~,~~CAAC~~,~~MAAM,~~CAAC~~,CAAC~~;~~IACpE~~,QAAQ,CAAC,~~YAAY~~,EAAE,IAAI,CAAC,~~YAAY~~,~~EAAE~~,~~YAAY~~,~~GAAG~~,~~cAAc~~,CAAC~~,CAAC~~;~~IACzE~~,QAAQ,CAAC,~~kBAAkB~~,EAAE,MAAM,~~OAAO,~~CAAC~~,IAAI,CAAC,CAAC~~;~~IACjD~~,~~QAAQ,~~CAAC,~~cAAc,EAAE,cAAc,~~CAAC;~~IACxC~~,QAAQ,CAAC,~~eAAe~~,EAAE,MAAM,~~OAAO~~,CAAC,~~IAAI~~,CAAC,CAAC;~~IAC9C~~,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;CACpC,GAAG,2BAA2B,~~CA8G9B~~;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE;IACtD,QAAQ,CAAC,gBAAgB,EAAE,MAAM,IAAI,CAAC;IACtC,QAAQ,CAAC,qBAAqB,EAAE,MAAM,IAAI,CAAC;~~IAC3C~~,QAAQ,CAAC,SAAS,EAAE,MAAM,SAAS;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC7D,QAAQ,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,QAAQ,CAAC,~~eAAe~~,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;~~CAC9C~~,GAAG,MAAM,OAAO,CAAC;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAA;CAAE,CAAC,CAcvC"}
1	+ {"version":3,"file":"controller-runtime-operations.d.ts","sourceRoot":"","sources":["../../src/controller/controller-runtime-operations.ts"],"names":[],"mappings":"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"}

package/dist/controller/controller-runtime-operations.js CHANGED Viewed

@@ -1,102 +1,27 @@
-import { resolveZoneSecrets } from '../gateway/credential-manager.js';
 import { buildControllerStatus, buildControllerZoneStatus, } from '../operations/controller-status.js';
-import { runControllerCredentialsRefresh } from '../operations/credentials-refresh.js';
-import { runControllerDestroy } from '../operations/destroy-zone.js';
-import { runControllerUpgrade } from '../operations/upgrade-zone.js';
-import { runControllerLogs } from '../operations/zone-logs.js';
+import { ControllerZoneNotFoundError } from './zone-runtimes/zone-runtime-errors.js';
 export function createControllerRuntimeOperations(options) {
-    const assertActiveZone = (targetZoneId) => {
-        if (targetZoneId !== options.activeZoneId) {
-            throw new Error(`Controller is running zone '${options.activeZoneId}', not '${targetZoneId}'. Multi-zone runtime selection is not implemented yet.`);
-        }
-    };
-    const getGatewayIfAvailable = () => {
-        try {
-            return options.getGateway();
-        }
-        catch {
-            return undefined;
-        }
-    };
     const buildRuntimeStatus = () => {
-        const gateway = getGatewayIfAvailable();
-        const bootedAt = options.getGatewayBootedAt();
+        const zones = options.getRuntimeStatusByZone();
         return {
-            activeLeases: options.leaseManager.listLeases(),
-            activeZoneId: options.activeZoneId,
-            ...(gateway ? { gateway } : {}),
-            ...(gateway && bootedAt ? { bootedAt } : {}),
+            activeLeases: options.getActiveLeases(),
+            ...(zones ? { zones } : {}),
         };
     };
     return {
-        enableSshForZone: async (targetZoneId) => {
-            assertActiveZone(targetZoneId);
-            return await options.getGateway().vm.enableSsh();
-        },
-        execInZone: async (targetZoneId, command) => {
-            assertActiveZone(targetZoneId);
-            const result = await options.getGateway().vm.exec(command);
-            return {
-                exitCode: result.exitCode,
-                stderr: result.stderr,
-                stdout: result.stdout,
-            };
-        },
-        destroyZone: async (targetZoneId, purge) => {
-            assertActiveZone(targetZoneId);
-            return await runControllerDestroy({
-                purge,
-                systemConfig: options.systemConfig,
-                zoneId: targetZoneId,
-            }, {
-                releaseZoneLeases: async () => {
-                    for (const lease of options.leaseManager
-                        .listLeases()
-                        .filter((activeLease) => activeLease.zoneId === targetZoneId)) {
-                        // oxlint-disable-next-line eslint/no-await-in-loop -- sequential release avoids TCP slot races
-                        await options.leaseManager.releaseLease(lease.id);
-                    }
-                },
-                stopGatewayZone: options.stopGatewayZone,
-            });
-        },
+        destroyZone: async (targetZoneId, purge) => await options.destroyZoneRuntime(targetZoneId, purge),
+        enableSshForZone: async (targetZoneId) => await options.getOpenClawRuntime(targetZoneId).enableSsh(),
+        execInZone: async (targetZoneId, command) => await options.getOpenClawRuntime(targetZoneId).exec(command),
         getStatus: async () => buildControllerStatus(options.systemConfig, buildRuntimeStatus()),
-        getZoneStatus: async (targetZoneId) => buildControllerZoneStatus(options.systemConfig, targetZoneId, buildRuntimeStatus()),
-        getZoneLogs: async (targetZoneId) => {
-            assertActiveZone(targetZoneId);
-            const gateway = options.getGateway();
-            return await runControllerLogs({
-                zoneId: targetZoneId,
-            }, {
-                readGatewayLogs: async () => (await gateway.vm.exec(`cat ${gateway.processSpec.logPath} 2>/dev/null || echo ""`))
-                    .stdout,
-            });
-        },
-        refreshZoneCredentials: async (targetZoneId) => {
-            assertActiveZone(targetZoneId);
-            return await runControllerCredentialsRefresh({
-                zoneId: targetZoneId,
-            }, {
-                refreshZoneSecrets: async (zoneId) => {
-                    await resolveZoneSecrets({
-                        secretResolver: options.secretResolver,
-                        systemConfig: options.systemConfig,
-                        zoneId,
-                    });
-                },
-                restartGatewayZone: async () => await options.restartGatewayZone(),
-            });
-        },
-        upgradeZone: async (targetZoneId) => {
-            assertActiveZone(targetZoneId);
-            return await runControllerUpgrade({
-                systemConfig: options.systemConfig,
-                zoneId: targetZoneId,
-            }, {
-                rebuildGatewayImage: async () => { },
-                restartGatewayZone: options.restartGatewayZone,
-            });
+        getZoneLogs: async (targetZoneId) => await options.getOpenClawRuntime(targetZoneId).getLogs(),
+        getZoneStatus: async (targetZoneId) => {
+            if (!options.systemConfig.zones.some((zone) => zone.id === targetZoneId)) {
+                throw new ControllerZoneNotFoundError(targetZoneId);
+            }
+            return buildControllerZoneStatus(options.systemConfig, targetZoneId, buildRuntimeStatus());
         },
+        refreshZoneCredentials: async (targetZoneId) => await options.getOpenClawRuntime(targetZoneId).refreshCredentials(),
+        upgradeZone: async (targetZoneId) => await options.getOpenClawRuntime(targetZoneId).upgrade(),
     };
 }
 export function createStopControllerOperation(options) {
@@ -107,10 +32,10 @@ export function createStopControllerOperation(options) {
             await options.releaseLease(lease.id);
         }
         try {
-            await options.stopGatewayZone();
+            await options.stopAllZones();
         }
         finally {
-            options.closeControllerServer();
+            await options.closeControllerServer();
         }
         return { ok: true };
     };