@agent-vm/agent-vm 0.0.31 → 0.0.33

package/dist/controller/http/controller-client.js

@@ -1,3 +1,4 @@
+import { controllerLeasePeekResponseSchema, } from './controller-lease-response-types.js';
 async function readJsonResponse(response, context) {
     const responseBody = await response.text().catch(() => '(unreadable)');
     if (!response.ok) {
@@ -10,6 +11,14 @@ async function readJsonResponse(response, context) {
         throw new Error(`${context} returned invalid JSON: ${error instanceof Error ? error.message : String(error)}. Body: ${responseBody}`, { cause: error });
     }
 }
+async function readLeasePeekResponse(response, context) {
+    const payload = await readJsonResponse(response, context);
+    const parsedPayload = controllerLeasePeekResponseSchema.safeParse(payload);
+    if (!parsedPayload.success) {
+        throw new Error(`${context} returned an invalid lease peek response.`);
+    }
+    return parsedPayload.data;
+}
 export function createControllerClient(options) {
     const fetchImpl = options.fetchImpl ?? fetch;
     const baseUrl = options.baseUrl.replace(/\/$/u, '');
@@ -58,6 +67,10 @@ export function createControllerClient(options) {
             const response = await fetchImpl(`${baseUrl}/leases`);
             return await readJsonResponse(response, 'List leases');
         },
+        peekLease: async (leaseId) => {
+            const response = await fetchImpl(`${baseUrl}/lease/${leaseId}/peek`);
+            return await readLeasePeekResponse(response, `Peek lease '${leaseId}'`);
+        },
         releaseLease: async (leaseId) => {
             await fetchImpl(`${baseUrl}/lease/${leaseId}`, { method: 'DELETE' });
         },

package/dist/controller/http/controller-client.js.map

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

package/dist/controller/http/controller-http-route-support.d.ts

@@ -1,5 +1,6 @@
 import type { Lease, LeaseManager } from '../leases/lease-manager.js';
-import type { PreparedWorkerTask, WorkerTaskInput } from '../worker-task-runner.js';
+import type { PreparedWorkerTask, WorkerTaskInput, WorkerTaskResult } from '../worker-task-runner.js';
+import type { ControllerLeasePeekResponse } from './controller-lease-response-types.js';
 export declare class ControllerTaskNotReadyError extends Error {
 }
 export declare class ControllerRuntimeAtCapacityError extends Error {
@@ -14,7 +15,7 @@ export interface ControllerRouteOperations {
     readonly getZoneStatus: (zoneId: string) => Promise<unknown>;
     readonly refreshZoneCredentials: (zoneId: string) => Promise<unknown>;
     readonly prepareWorkerTask?: (zoneId: string, input: WorkerTaskInput) => Promise<PreparedWorkerTask>;
-    readonly executeWorkerTask?: (prepared: PreparedWorkerTask) => Promise<unknown>;
+    readonly executeWorkerTask?: (prepared: PreparedWorkerTask) => Promise<WorkerTaskResult>;
     readonly closeTaskForZone?: (zoneId: string, taskId: string) => Promise<{
         readonly status: 'closed';
     }>;
@@ -25,12 +26,15 @@ export interface ControllerRouteOperations {
         }[];
     }) => Promise<unknown>;
     readonly pullDefaultForTask?: (zoneId: string, taskId: string, input: {
+        readonly currentBranch?: string | null | undefined;
+        readonly currentHead?: string | undefined;
         readonly repoUrl: string;
+        readonly worktreeDirty?: boolean | undefined;
     }) => Promise<unknown>;
     readonly stopController?: () => Promise<unknown>;
     readonly upgradeZone: (zoneId: string) => Promise<unknown>;
 }
-export type ControllerLeaseManager = Pick<LeaseManager, 'createLease' | 'getLease' | 'listLeases' | 'releaseLease'>;
+export type ControllerLeaseManager = Pick<LeaseManager, 'createLease' | 'keepLeaseAlive' | 'listLeases' | 'peekLease' | 'releaseLease'>;
 export declare function readIdentityPemFromFile(identityFilePath: string): Promise<string>;
 export declare function serializeLeaseForResponse(lease: Lease, readIdentityPem: (identityFilePath: string) => Promise<string>): Promise<{
     readonly leaseId: string;
@@ -42,6 +46,7 @@ export declare function serializeLeaseForResponse(lease: Lease, readIdentityPem:
         readonly user: string;
     };
     readonly tcpSlot: number;
-    readonly workdir: '/workspace';
+    readonly workdir: '/work';
 }>;
+export declare function serializeLeasePeekForResponse(lease: Lease): ControllerLeasePeekResponse;
 //# sourceMappingURL=controller-http-route-support.d.ts.map

package/dist/controller/http/controller-http-route-support.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller-http-route-support.d.ts","sourceRoot":"","sources":["../../../src/controller/http/controller-http-route-support.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"controller-http-route-support.d.ts","sourceRoot":"","sources":["../../../src/controller/http/controller-http-route-support.ts"],"names":[],"mappings":"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"}

package/dist/controller/http/controller-http-route-support.js

@@ -19,7 +19,23 @@ export async function serializeLeaseForResponse(lease, readIdentityPem) {
             user: lease.sshAccess.user ?? 'root',
         },
         tcpSlot: lease.tcpSlot,
-        workdir: '/workspace',
+        workdir: '/work',
+    };
+}
+export function serializeLeasePeekForResponse(lease) {
+    return {
+        createdAt: lease.createdAt,
+        lastUsedAt: lease.lastUsedAt,
+        leaseId: lease.id,
+        profileId: lease.profileId,
+        scopeKey: lease.scopeKey,
+        ssh: {
+            host: lease.sshAccess.host,
+            port: lease.sshAccess.port,
+            user: lease.sshAccess.user ?? 'root',
+        },
+        tcpSlot: lease.tcpSlot,
+        zoneId: lease.zoneId,
     };
 }
 //# sourceMappingURL=controller-http-route-support.js.map

package/dist/controller/http/controller-http-route-support.js.map

@@ -1 +1 @@
-{"version":3,"file":"controller-http-route-support.js","sourceRoot":"","sources":["../../../src/controller/http/controller-http-route-support.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAKlC,MAAM,OAAO,2BAA4B,SAAQ,KAAK;CAAG;AACzD,MAAM,OAAO,gCAAiC,SAAQ,KAAK;CAAG;AA8C9D,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,gBAAwB;IACrE,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC9C,KAAY,EACZ,eAA8D;IAa9D,OAAO;QACN,OAAO,EAAE,KAAK,CAAC,EAAE;QACjB,GAAG,EAAE;YACJ,IAAI,EAAE,QAAQ,KAAK,CAAC,OAAO,UAAU;YACrC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,YAAY;gBACxC,CAAC,CAAC,MAAM,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC;gBACrD,CAAC,CAAC,EAAE;YACL,cAAc,EAAE,EAAE;YAClB,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,IAAI,MAAM;SACpC;QACD,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,OAAO,EAAE,YAAY;KACrB,CAAC;AACH,CAAC"}
+{"version":3,"file":"controller-http-route-support.js","sourceRoot":"","sources":["../../../src/controller/http/controller-http-route-support.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAUlC,MAAM,OAAO,2BAA4B,SAAQ,KAAK;CAAG;AACzD,MAAM,OAAO,gCAAiC,SAAQ,KAAK;CAAG;AAiD9D,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,gBAAwB;IACrE,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC9C,KAAY,EACZ,eAA8D;IAa9D,OAAO;QACN,OAAO,EAAE,KAAK,CAAC,EAAE;QACjB,GAAG,EAAE;YACJ,IAAI,EAAE,QAAQ,KAAK,CAAC,OAAO,UAAU;YACrC,WAAW,EAAE,KAAK,CAAC,SAAS,CAAC,YAAY;gBACxC,CAAC,CAAC,MAAM,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC;gBACrD,CAAC,CAAC,EAAE;YACL,cAAc,EAAE,EAAE;YAClB,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,IAAI,MAAM;SACpC;QACD,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,OAAO,EAAE,OAAO;KAChB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,6BAA6B,CAAC,KAAY;IACzD,OAAO;QACN,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,OAAO,EAAE,KAAK,CAAC,EAAE;QACjB,SAAS,EAAE,KAAK,CAAC,SAAS;QAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ;QACxB,GAAG,EAAE;YACJ,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI;YAC1B,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI;YAC1B,IAAI,EAAE,KAAK,CAAC,SAAS,CAAC,IAAI,IAAI,MAAM;SACpC;QACD,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,MAAM,EAAE,KAAK,CAAC,MAAM;KACpB,CAAC;AACH,CAAC"}

package/dist/controller/http/controller-http-routes.d.ts

@@ -1,22 +1,29 @@
+import type { SecretResolver } from '@agent-vm/gondolin-adapter';
 import { Hono } from 'hono';
 import type { SystemConfig } from '../../config/system-config.js';
 import { type ControllerLeaseManager, type ControllerRouteOperations } from './controller-http-route-support.js';
 export declare function createControllerApp(options: {
     readonly leaseManager: ControllerLeaseManager;
     readonly readIdentityPem?: (identityFilePath: string) => Promise<string>;
-    readonly toolProfiles?: Record<string, {
+    readonly toolVmProfiles?: Record<string, {
         readonly cpus: number;
         readonly imageProfile: string;
         readonly memory: string;
-        readonly workspaceRoot: string;
     }>;
-    readonly zoneToolProfiles?: Record<string, string>;
+    readonly zoneAgentToolVmProfiles?: Record<string, Record<string, string>>;
+    readonly zoneDefaultToolVmProfiles?: Record<string, string>;
     readonly zoneIds?: ReadonlySet<string>;
     readonly operations?: Partial<ControllerRouteOperations>;
+    readonly resolveLeaseWorkspaceDir?: (options: {
+        readonly scopeKey: string;
+        readonly workspaceDir: string;
+        readonly zoneId: string;
+    }) => Promise<string>;
 }): Hono;
 export declare function createControllerService(options: {
     readonly leaseManager: ControllerLeaseManager;
     readonly operations?: Partial<ControllerRouteOperations>;
+    readonly secretResolver?: SecretResolver;
     readonly systemConfig: SystemConfig;
 }): Hono;
 //# sourceMappingURL=controller-http-routes.d.ts.map

package/dist/controller/http/controller-http-routes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller-http-routes.d.ts","sourceRoot":"","sources":["../../../src/controller/http/controller-http-routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EACN,KAAK,sBAAsB,EAC3B,KAAK,yBAAyB,EAG9B,MAAM,oCAAoC,CAAC;AAI5C,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAC5C,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAC9C,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,gBAAgB,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACzE,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAC7B,MAAM,EACN;QACC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;QACxB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;KAC/B,CACD,CAAC;IACF,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnD,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACvC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC;CACzD,GAAG,IAAI,CA0GP;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAChD,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAC9C,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACzD,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;CACpC,GAAG,IAAI,CAqBP"}
+{"version":3,"file":"controller-http-routes.d.ts","sourceRoot":"","sources":["../../../src/controller/http/controller-http-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAWlE,OAAO,EACN,KAAK,sBAAsB,EAC3B,KAAK,yBAAyB,EAI9B,MAAM,oCAAoC,CAAC;AA0C5C,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAC5C,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAC9C,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,gBAAgB,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACzE,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAC/B,MAAM,EACN;QACC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;KACxB,CACD,CAAC;IACF,QAAQ,CAAC,uBAAuB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC1E,QAAQ,CAAC,yBAAyB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5D,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACvC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACzD,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC,OAAO,EAAE;QAC7C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;QAC1B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;QAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;KACxB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;CACtB,GAAG,IAAI,CAkIP;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAChD,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAC9C,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,yBAAyB,CAAC,CAAC;IACzD,QAAQ,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC;IACzC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;CACpC,GAAG,IAAI,CA8CP"}

package/dist/controller/http/controller-http-routes.js

@@ -1,7 +1,37 @@
 import { Hono } from 'hono';
-import { readIdentityPemFromFile, serializeLeaseForResponse, } from './controller-http-route-support.js';
+import { seedAgentSandboxWorkspace, } from '../leases/agent-sandbox-seeding.js';
+import { LeaseScopeConflictError } from '../leases/lease-manager.js';
+import { parseAgentIdFromScopeKey } from '../leases/lease-scope.js';
+import { LeaseWorkspaceValidationError, resolveLeaseWorkspaceDir as resolveLeaseWorkspaceDirForZone, } from '../leases/lease-workspace-paths.js';
+import { readIdentityPemFromFile, serializeLeasePeekForResponse, serializeLeaseForResponse, } from './controller-http-route-support.js';
 import { controllerLeaseCreateRequestSchema } from './controller-request-schemas.js';
 import { registerControllerZoneOperationRoutes } from './controller-zone-operation-routes.js';
+function writeControllerLeaseLog(message) {
+    process.stderr.write(`[controller-http-routes] ${message}\n`);
+}
+function logAgentSandboxSeedResult(result) {
+    switch (result.kind) {
+        case 'seeded':
+            writeControllerLeaseLog(`seeded sandbox for zone '${result.zoneId}' scope '${result.scopeKey}' agent '${result.agentId}': ${String(result.written)} written, ${String(result.alreadyExisted)} already existed`);
+            return;
+        case 'malformed-agent-scope':
+            writeControllerLeaseLog(`skipped sandbox seeding for zone '${result.zoneId}' scope '${result.scopeKey}': ${result.reason}`);
+            return;
+        case 'sandbox-root-missing':
+            writeControllerLeaseLog(`skipped sandbox seeding for zone '${result.zoneId}' scope '${result.scopeKey}': sandbox root '${result.sandboxRoot}' does not exist`);
+            return;
+        case 'workspace-missing':
+            writeControllerLeaseLog(`skipped sandbox seeding for zone '${result.zoneId}' scope '${result.scopeKey}': workspace '${result.workspaceDir}' does not exist`);
+            return;
+        case 'workspace-outside-sandbox':
+            writeControllerLeaseLog(`skipped sandbox seeding for zone '${result.zoneId}' scope '${result.scopeKey}': workspace '${result.workspaceDir}' is outside sandbox root '${result.sandboxRoot}'`);
+            return;
+        case 'no-seeds-configured':
+        case 'non-agent-scope':
+        case 'not-openclaw-zone':
+            return;
+    }
+}
 export function createControllerApp(options) {
     const app = new Hono();
     const readIdentityPem = options.readIdentityPem ?? readIdentityPemFromFile;
@@ -17,23 +47,34 @@ export function createControllerApp(options) {
             const payload = parsedPayload.data;
             if (options.zoneIds
                 ? !options.zoneIds.has(payload.zoneId)
-                : options.zoneToolProfiles && !(payload.zoneId in options.zoneToolProfiles)) {
+                : options.zoneDefaultToolVmProfiles &&
+                    !(payload.zoneId in options.zoneDefaultToolVmProfiles)) {
                 return context.json({ error: `Unknown zone '${payload.zoneId}'` }, 400);
             }
-            const resolvedProfileId = options.zoneToolProfiles?.[payload.zoneId] ?? payload.profileId;
+            const agentId = parseAgentIdFromScopeKey(payload.scopeKey);
+            const resolvedProfileId = (agentId ? options.zoneAgentToolVmProfiles?.[payload.zoneId]?.[agentId] : undefined) ??
+                options.zoneDefaultToolVmProfiles?.[payload.zoneId] ??
+                payload.profileId;
             if (!resolvedProfileId) {
-                return context.json({ error: `Zone '${payload.zoneId}' does not have a tool profile configured` }, 400);
+                return context.json({ error: `Zone '${payload.zoneId}' does not have a tool VM profile configured` }, 400);
             }
-            const toolProfile = options.toolProfiles?.[resolvedProfileId];
-            if (!toolProfile) {
-                return context.json({ error: `Unknown tool profile '${resolvedProfileId}'` }, 400);
+            const defaultToolVmProfile = options.toolVmProfiles?.[resolvedProfileId];
+            if (!defaultToolVmProfile) {
+                return context.json({ error: `Unknown tool VM profile '${resolvedProfileId}'` }, 400);
             }
+            const workspaceDir = options.resolveLeaseWorkspaceDir
+                ? await options.resolveLeaseWorkspaceDir({
+                    scopeKey: payload.scopeKey,
+                    workspaceDir: payload.workspaceDir,
+                    zoneId: payload.zoneId,
+                })
+                : payload.workspaceDir;
             const lease = await options.leaseManager.createLease({
                 agentWorkspaceDir: payload.agentWorkspaceDir,
-                profile: toolProfile,
+                profile: defaultToolVmProfile,
                 profileId: resolvedProfileId,
                 scopeKey: payload.scopeKey,
-                workspaceDir: payload.workspaceDir,
+                workspaceDir,
                 zoneId: payload.zoneId,
             });
             return context.json(await serializeLeaseForResponse(lease, readIdentityPem));
@@ -41,15 +82,26 @@ export function createControllerApp(options) {
         catch (error) {
             return context.json({
                 error: error instanceof Error ? error.message : 'lease-creation-failed',
-            }, 503);
+            }, error instanceof LeaseWorkspaceValidationError
+                ? 400
+                : error instanceof LeaseScopeConflictError
+                    ? 409
+                    : 503);
+        }
+    });
+    app.get('/lease/:leaseId/peek', async (context) => {
+        const leaseSnapshot = options.leaseManager.peekLease(context.req.param('leaseId'));
+        if (!leaseSnapshot) {
+            return context.json({ error: 'Lease not found' }, 404);
         }
+        return context.json(serializeLeasePeekForResponse(leaseSnapshot.lease));
     });
     app.get('/lease/:leaseId', async (context) => {
-        const lease = options.leaseManager.getLease(context.req.param('leaseId'));
-        if (!lease) {
+        const leaseRenewal = options.leaseManager.keepLeaseAlive(context.req.param('leaseId'));
+        if (!leaseRenewal) {
             return context.json({ error: 'Lease not found' }, 404);
         }
-        return context.json(await serializeLeaseForResponse(lease, readIdentityPem));
+        return context.json(await serializeLeaseForResponse(leaseRenewal.lease, readIdentityPem));
     });
     app.get('/leases', (context) => {
         const leases = options.leaseManager.listLeases().map((lease) => ({
@@ -94,12 +146,33 @@ export function createControllerApp(options) {
     return app;
 }
 export function createControllerService(options) {
+    const zonesById = new Map(options.systemConfig.zones.map((zone) => [zone.id, zone]));
     const app = createControllerApp({
         leaseManager: options.leaseManager,
-        toolProfiles: options.systemConfig.toolProfiles,
+        toolVmProfiles: options.systemConfig.toolVmProfiles,
         zoneIds: new Set(options.systemConfig.zones.map((zone) => zone.id)),
-        zoneToolProfiles: Object.fromEntries(options.systemConfig.zones.flatMap((zone) => zone.toolProfile === undefined ? [] : [[zone.id, zone.toolProfile]])),
+        zoneDefaultToolVmProfiles: Object.fromEntries(options.systemConfig.zones.flatMap((zone) => zone.defaultToolVmProfile === undefined ? [] : [[zone.id, zone.defaultToolVmProfile]])),
+        zoneAgentToolVmProfiles: Object.fromEntries(options.systemConfig.zones.flatMap((zone) => !zone.agentToolVmProfiles || Object.keys(zone.agentToolVmProfiles).length === 0
+            ? []
+            : [[zone.id, zone.agentToolVmProfiles]])),
         ...(options.operations ? { operations: options.operations } : {}),
+        resolveLeaseWorkspaceDir: async ({ scopeKey, workspaceDir, zoneId }) => {
+            const zone = zonesById.get(zoneId);
+            if (!zone) {
+                throw new Error(`Unknown zone '${zoneId}'`);
+            }
+            const resolvedWorkspaceDir = await resolveLeaseWorkspaceDirForZone({ workspaceDir, zone });
+            if (options.secretResolver) {
+                const seedResult = await seedAgentSandboxWorkspace({
+                    scopeKey,
+                    secretResolver: options.secretResolver,
+                    workspaceDir: resolvedWorkspaceDir,
+                    zone,
+                });
+                logAgentSandboxSeedResult(seedResult);
+            }
+            return resolvedWorkspaceDir;
+        },
     });
     app.get('/health', (context) => context.json({
         ok: true,

package/dist/controller/http/controller-http-routes.js.map

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

package/dist/controller/http/controller-lease-response-types.d.ts

@@ -0,0 +1,17 @@
+import { z } from 'zod';
+export declare const controllerLeasePeekResponseSchema: z.ZodObject<{
+    createdAt: z.ZodNumber;
+    lastUsedAt: z.ZodNumber;
+    leaseId: z.ZodString;
+    profileId: z.ZodString;
+    scopeKey: z.ZodString;
+    ssh: z.ZodObject<{
+        host: z.ZodString;
+        port: z.ZodNumber;
+        user: z.ZodString;
+    }, z.core.$strip>;
+    tcpSlot: z.ZodNumber;
+    zoneId: z.ZodString;
+}, z.core.$strip>;
+export type ControllerLeasePeekResponse = z.infer<typeof controllerLeasePeekResponseSchema>;
+//# sourceMappingURL=controller-lease-response-types.d.ts.map

package/dist/controller/http/controller-lease-response-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"controller-lease-response-types.d.ts","sourceRoot":"","sources":["../../../src/controller/http/controller-lease-response-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;iBAa5C,CAAC;AAEH,MAAM,MAAM,2BAA2B,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iCAAiC,CAAC,CAAC"}

package/dist/controller/http/controller-lease-response-types.js

@@ -0,0 +1,16 @@
+import { z } from 'zod';
+export const controllerLeasePeekResponseSchema = z.object({
+    createdAt: z.number(),
+    lastUsedAt: z.number(),
+    leaseId: z.string(),
+    profileId: z.string(),
+    scopeKey: z.string(),
+    ssh: z.object({
+        host: z.string(),
+        port: z.number().int(),
+        user: z.string(),
+    }),
+    tcpSlot: z.number().int(),
+    zoneId: z.string(),
+});
+//# sourceMappingURL=controller-lease-response-types.js.map

package/dist/controller/http/controller-lease-response-types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"controller-lease-response-types.js","sourceRoot":"","sources":["../../../src/controller/http/controller-lease-response-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,iCAAiC,GAAG,CAAC,CAAC,MAAM,CAAC;IACzD,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE;IACtB,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;IACnB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;IACrB,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC;QACb,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;QACtB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;KAChB,CAAC;IACF,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE;IACzB,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;CAClB,CAAC,CAAC"}

package/dist/controller/http/controller-request-schemas.d.ts

@@ -72,31 +72,102 @@ export declare const controllerPushBranchesResponseSchema: z.ZodObject<{
 }, z.core.$strip>;
 export declare const controllerPullDefaultRequestSchema: z.ZodObject<{
     repoUrl: z.ZodString;
+    currentBranch: z.ZodOptional<z.ZodNullable<z.ZodString>>;
+    currentHead: z.ZodOptional<z.ZodString>;
+    worktreeDirty: z.ZodOptional<z.ZodBoolean>;
 }, z.core.$strip>;
-export declare const controllerPullDefaultResponseSchema: z.ZodObject<{
+export declare const controllerPullDefaultResponseSchema: z.ZodDiscriminatedUnion<[z.ZodObject<{
+    kind: z.ZodLiteral<"advanced">;
     repoUrl: z.ZodString;
-    success: z.ZodBoolean;
-    error: z.ZodOptional<z.ZodString>;
-    defaultBranch: z.ZodOptional<z.ZodString>;
-    remoteDefaultHead: z.ZodOptional<z.ZodString>;
-    localDefaultHead: z.ZodOptional<z.ZodString>;
+    success: z.ZodLiteral<true>;
+    message: z.ZodString;
+    defaultBranch: z.ZodString;
+    remoteDefaultHead: z.ZodString;
+    localDefaultHead: z.ZodString;
     currentBranch: z.ZodOptional<z.ZodNullable<z.ZodString>>;
-    fetchedCommits: z.ZodOptional<z.ZodArray<z.ZodObject<{
+    fetchedCommits: z.ZodArray<z.ZodObject<{
         sha: z.ZodString;
         subject: z.ZodString;
         author: z.ZodOptional<z.ZodString>;
         date: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>>>;
-    commitsSinceForkPoint: z.ZodOptional<z.ZodArray<z.ZodObject<{
+    }, z.core.$strip>>;
+    commitsSinceForkPoint: z.ZodArray<z.ZodObject<{
         sha: z.ZodString;
         subject: z.ZodString;
         author: z.ZodOptional<z.ZodString>;
         date: z.ZodOptional<z.ZodString>;
-    }, z.core.$strip>>>;
-    divergence: z.ZodOptional<z.ZodObject<{
+    }, z.core.$strip>>;
+    divergence: z.ZodObject<{
         aheadOfDefault: z.ZodNumber;
         behindDefault: z.ZodNumber;
         forkPoint: z.ZodString;
-    }, z.core.$strip>>;
-}, z.core.$strip>;
+    }, z.core.$strip>;
+    currentBranchSync: z.ZodOptional<z.ZodDiscriminatedUnion<[z.ZodObject<{
+        status: z.ZodLiteral<"ahead">;
+        branch: z.ZodString;
+        upstreamTrackingRef: z.ZodString;
+        localHead: z.ZodString;
+        remoteHead: z.ZodString;
+        reason: z.ZodString;
+    }, z.core.$strip>, z.ZodObject<{
+        status: z.ZodLiteral<"default-branch">;
+        branch: z.ZodString;
+        upstreamTrackingRef: z.ZodString;
+        localHead: z.ZodString;
+        remoteHead: z.ZodString;
+        reason: z.ZodString;
+    }, z.core.$strip>, z.ZodObject<{
+        status: z.ZodLiteral<"detached">;
+        branch: z.ZodNull;
+        upstreamTrackingRef: z.ZodNull;
+        localHead: z.ZodString;
+        reason: z.ZodString;
+    }, z.core.$strip>, z.ZodObject<{
+        status: z.ZodLiteral<"dirty-worktree">;
+        branch: z.ZodString;
+        upstreamTrackingRef: z.ZodString;
+        localHead: z.ZodString;
+        remoteHead: z.ZodString;
+        reason: z.ZodString;
+    }, z.core.$strip>, z.ZodObject<{
+        status: z.ZodLiteral<"diverged">;
+        branch: z.ZodString;
+        upstreamTrackingRef: z.ZodString;
+        localHead: z.ZodString;
+        remoteHead: z.ZodString;
+        reason: z.ZodString;
+    }, z.core.$strip>, z.ZodObject<{
+        status: z.ZodLiteral<"fast-forwarded">;
+        branch: z.ZodString;
+        upstreamTrackingRef: z.ZodString;
+        localHead: z.ZodString;
+        remoteHead: z.ZodString;
+    }, z.core.$strip>, z.ZodObject<{
+        status: z.ZodLiteral<"no-upstream">;
+        branch: z.ZodString;
+        upstreamTrackingRef: z.ZodNull;
+        localHead: z.ZodOptional<z.ZodString>;
+        reason: z.ZodString;
+    }, z.core.$strip>, z.ZodObject<{
+        status: z.ZodLiteral<"up-to-date">;
+        branch: z.ZodString;
+        upstreamTrackingRef: z.ZodString;
+        localHead: z.ZodString;
+        remoteHead: z.ZodString;
+    }, z.core.$strip>], "status">>;
+}, z.core.$strip>, z.ZodObject<{
+    kind: z.ZodLiteral<"refused-not-fast-forward">;
+    repoUrl: z.ZodString;
+    success: z.ZodLiteral<false>;
+    message: z.ZodString;
+    error: z.ZodString;
+    defaultBranch: z.ZodString;
+    remoteDefaultHead: z.ZodString;
+}, z.core.$strip>, z.ZodObject<{
+    kind: z.ZodLiteral<"failed">;
+    repoUrl: z.ZodString;
+    success: z.ZodLiteral<false>;
+    message: z.ZodString;
+    error: z.ZodString;
+}, z.core.$strip>], "kind">;
 //# sourceMappingURL=controller-request-schemas.d.ts.map

package/dist/controller/http/controller-request-schemas.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller-request-schemas.d.ts","sourceRoot":"","sources":["../../../src/controller/http/controller-request-schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,kCAAkC;;;;;;iBAM7C,CAAC;AAEH,eAAO,MAAM,kCAAkC;;iBAE7C,CAAC;AAEH,eAAO,MAAM,qCAAqC;;iBAEhD,CAAC;AAEH,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;kBAAoC,CAAC;AAEnF,eAAO,MAAM,mCAAmC;;;;;iBAS9C,CAAC;AAcH,eAAO,MAAM,oCAAoC;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAiB/C,CAAC;AAEH,eAAO,MAAM,kCAAkC;;iBAE7C,CAAC;AAEH,eAAO,MAAM,mCAAmC;;;;;;;;;;;;;;;;;;;;;;;;;iBAW9C,CAAC"}
+{"version":3,"file":"controller-request-schemas.d.ts","sourceRoot":"","sources":["../../../src/controller/http/controller-request-schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,eAAO,MAAM,kCAAkC;;;;;;iBAM7C,CAAC;AAEH,eAAO,MAAM,kCAAkC;;iBAE7C,CAAC;AAEH,eAAO,MAAM,qCAAqC;;iBAEhD,CAAC;AAEH,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;kBAAoC,CAAC;AAEnF,eAAO,MAAM,mCAAmC;;;;;iBAS9C,CAAC;AAcH,eAAO,MAAM,oCAAoC;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAiB/C,CAAC;AAEH,eAAO,MAAM,kCAAkC;;;;;iBAU7C,CAAC;AAkHH,eAAO,MAAM,mCAAmC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2BAI9C,CAAC"}