@agent-vm/agent-vm 0.0.56 → 0.0.58

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

@@ -13,10 +13,23 @@ function assertReusableScopeLease(existingLease, requestedLease) {
     if (existingLease.hostWorkMountDir !== requestedLease.hostWorkMountDir) {
         throw new LeaseScopeConflictError(`Tool VM lease scope conflict for zone '${requestedLease.zoneId}' scopeKey '${requestedLease.scopeKey}': existing hostWorkMountDir '${existingLease.hostWorkMountDir}' does not match requested hostWorkMountDir '${requestedLease.hostWorkMountDir}'.`);
     }
+    if (existingLease.guestWorkdir !== requestedLease.guestWorkdir) {
+        throw new LeaseScopeConflictError(`Tool VM lease scope conflict for zone '${requestedLease.zoneId}' scopeKey '${requestedLease.scopeKey}': existing guestWorkdir '${existingLease.guestWorkdir}' does not match requested guestWorkdir '${requestedLease.guestWorkdir}'.`);
+    }
+    if (!zoneGitMountsEqual(existingLease.zoneGitMount, requestedLease.zoneGitMount)) {
+        throw new LeaseScopeConflictError(`Tool VM lease scope conflict for zone '${requestedLease.zoneId}' scopeKey '${requestedLease.scopeKey}': existing zoneGitMount does not match requested zoneGitMount.`);
+    }
     if (existingLease.agentWorkspaceDir !== requestedLease.agentWorkspaceDir) {
         throw new LeaseScopeConflictError(`Tool VM lease scope conflict for zone '${requestedLease.zoneId}' scopeKey '${requestedLease.scopeKey}': existing agentWorkspaceDir '${existingLease.agentWorkspaceDir}' does not match requested agentWorkspaceDir '${requestedLease.agentWorkspaceDir}'.`);
     }
 }
+function zoneGitMountsEqual(leftMount, rightMount) {
+    if (!leftMount || !rightMount) {
+        return leftMount === rightMount;
+    }
+    return (leftMount.hostZoneFilesDir === rightMount.hostZoneFilesDir &&
+        leftMount.hostZoneGitRoot === rightMount.hostZoneGitRoot);
+}
 async function isLeaseVmLive(lease) {
     try {
         const result = await lease.vm.exec('true');
@@ -115,6 +128,7 @@ export function createLeaseManager(options) {
                         const lease = {
                             agentWorkspaceDir: leaseOptions.agentWorkspaceDir,
                             createdAt,
+                            guestWorkdir: leaseOptions.guestWorkdir,
                             id: `${leaseOptions.zoneId}-${leaseOptions.scopeKey}-${createdAt}`,
                             lastUsedAt: createdAt,
                             profileId: leaseOptions.profileId,
@@ -123,6 +137,7 @@ export function createLeaseManager(options) {
                             tcpSlot,
                             vm,
                             hostWorkMountDir: leaseOptions.hostWorkMountDir,
+                            ...(leaseOptions.zoneGitMount ? { zoneGitMount: leaseOptions.zoneGitMount } : {}),
                             zoneId: leaseOptions.zoneId,
                         };
                         storeLease(lease);

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/leases/lease-work-mount-paths.d.ts

@@ -1,17 +1,24 @@
 import type { SystemConfig } from '../../config/system-config.js';
+import { type ZoneGitToolVmMount } from '../zone-git/zone-git-paths.js';
 type ZoneConfig = SystemConfig['zones'][number];
 export type LeaseWorkMountValidationErrorKind = 'allowed-root-realpath-failed' | 'host-not-absolute' | 'host-outside-allowed-roots' | 'host-parent-traversal' | 'outside-allowed-roots' | 'realpath-failed' | 'root-mount-target' | 'unsupported-gateway' | 'work-mount-not-absolute' | 'work-mount-parent-traversal';
 export declare class LeaseWorkMountValidationError extends Error {
     readonly kind: LeaseWorkMountValidationErrorKind;
     constructor(kind: LeaseWorkMountValidationErrorKind, message: string, options?: ErrorOptions);
 }
+export interface ResolvedLeaseWorkMount {
+    readonly guestWorkdir: string;
+    readonly hostWorkMountDir: string;
+    readonly zoneGitMount?: ZoneGitToolVmMount;
+}
 export declare function validateResolvedToolWorkMountDir(options: {
     readonly hostWorkMountDir: string;
     readonly zone: ZoneConfig;
 }): Promise<string>;
 export declare function resolveLeaseWorkMountDir(options: {
+    readonly runtimeDir: string;
     readonly workMountDir: string;
     readonly zone: ZoneConfig;
-}): Promise<string>;
+}): Promise<ResolvedLeaseWorkMount>;
 export {};
 //# sourceMappingURL=lease-work-mount-paths.d.ts.map

package/dist/controller/leases/lease-work-mount-paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lease-work-mount-paths.d.ts","sourceRoot":"","sources":["../../../src/controller/leases/lease-work-mount-paths.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAQlE,KAAK,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhD,MAAM,MAAM,iCAAiC,GAC1C,8BAA8B,GAC9B,mBAAmB,GACnB,4BAA4B,GAC5B,uBAAuB,GACvB,uBAAuB,GACvB,iBAAiB,GACjB,mBAAmB,GACnB,qBAAqB,GACrB,yBAAyB,GACzB,6BAA6B,CAAC;AAEjC,qBAAa,6BAA8B,SAAQ,KAAK;IACvD,QAAQ,CAAC,IAAI,EAAE,iCAAiC,CAAC;gBAErC,IAAI,EAAE,iCAAiC,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY;CAI5F;AA2FD,wBAAsB,gCAAgC,CAAC,OAAO,EAAE;IAC/D,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBlB;AAED,wBAAsB,wBAAwB,CAAC,OAAO,EAAE;IACvD,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAoDlB"}
+{"version":3,"file":"lease-work-mount-paths.d.ts","sourceRoot":"","sources":["../../../src/controller/leases/lease-work-mount-paths.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAIN,KAAK,kBAAkB,EACvB,MAAM,+BAA+B,CAAC;AAQvC,KAAK,UAAU,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhD,MAAM,MAAM,iCAAiC,GAC1C,8BAA8B,GAC9B,mBAAmB,GACnB,4BAA4B,GAC5B,uBAAuB,GACvB,uBAAuB,GACvB,iBAAiB,GACjB,mBAAmB,GACnB,qBAAqB,GACrB,yBAAyB,GACzB,6BAA6B,CAAC;AAEjC,qBAAa,6BAA8B,SAAQ,KAAK;IACvD,QAAQ,CAAC,IAAI,EAAE,iCAAiC,CAAC;gBAErC,IAAI,EAAE,iCAAiC,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,YAAY;CAI5F;AAED,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,YAAY,CAAC,EAAE,kBAAkB,CAAC;CAC3C;AA2FD,wBAAsB,gCAAgC,CAAC,OAAO,EAAE;IAC/D,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBlB;AAED,wBAAsB,wBAAwB,CAAC,OAAO,EAAE;IACvD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;CAC1B,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAyElC"}

package/dist/controller/leases/lease-work-mount-paths.js

@@ -1,10 +1,11 @@
 import { realpath } from 'node:fs/promises';
 import path from 'node:path';
+import { OPENCLAW_ZONE_FILES_GUEST_ROOT, isOpenClawZoneGitConfigured, resolveZoneGitPaths, } from '../zone-git/zone-git-paths.js';
 // These guest roots are mounted by the OpenClaw gateway image. Lease callers
 // must speak in gateway paths; the controller owns translation to host paths.
 const OPENCLAW_STATE_VM_ROOT = '/home/openclaw/.openclaw/state';
 const OPENCLAW_STATE_SANDBOXES_VM_ROOT = `${OPENCLAW_STATE_VM_ROOT}/sandboxes`;
-const OPENCLAW_ZONE_FILES_VM_ROOT = '/zone';
+const OPENCLAW_ZONE_FILES_VM_ROOT = OPENCLAW_ZONE_FILES_GUEST_ROOT;
 export class LeaseWorkMountValidationError extends Error {
     kind;
     constructor(kind, message, options) {
@@ -112,9 +113,28 @@ export async function resolveLeaseWorkMountDir(options) {
     if (!hostWorkMountDir) {
         throw new LeaseWorkMountValidationError('outside-allowed-roots', `Lease workMountDir '${options.workMountDir}' must be under ${OPENCLAW_STATE_SANDBOXES_VM_ROOT} or ${OPENCLAW_ZONE_FILES_VM_ROOT}.`);
     }
-    return await validateResolvedLeaseWorkMountDir({
+    const realHostWorkMountDir = await validateResolvedLeaseWorkMountDir({
         hostWorkMountDir,
         zone: options.zone,
     });
+    if (isOpenClawZoneGitConfigured(options.zone) &&
+        normalizedWorkMountDir.startsWith(`${OPENCLAW_ZONE_FILES_VM_ROOT}/`)) {
+        const zoneGitPaths = resolveZoneGitPaths({
+            runtimeDir: options.runtimeDir,
+            zoneId: options.zone.id,
+        });
+        return {
+            guestWorkdir: normalizedWorkMountDir,
+            hostWorkMountDir: realHostWorkMountDir,
+            zoneGitMount: {
+                hostZoneFilesDir: options.zone.gateway.zoneFilesDir,
+                hostZoneGitRoot: zoneGitPaths.hostZoneGitRoot,
+            },
+        };
+    }
+    return {
+        guestWorkdir: '/work',
+        hostWorkMountDir: realHostWorkMountDir,
+    };
 }
 //# sourceMappingURL=lease-work-mount-paths.js.map

package/dist/controller/leases/lease-work-mount-paths.js.map

@@ -1 +1 @@
-{"version":3,"file":"lease-work-mount-paths.js","sourceRoot":"","sources":["../../../src/controller/leases/lease-work-mount-paths.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"lease-work-mount-paths.js","sourceRoot":"","sources":["../../../src/controller/leases/lease-work-mount-paths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EACN,8BAA8B,EAC9B,2BAA2B,EAC3B,mBAAmB,GAEnB,MAAM,+BAA+B,CAAC;AAEvC,6EAA6E;AAC7E,8EAA8E;AAC9E,MAAM,sBAAsB,GAAG,gCAAgC,CAAC;AAChE,MAAM,gCAAgC,GAAG,GAAG,sBAAsB,YAAY,CAAC;AAC/E,MAAM,2BAA2B,GAAG,8BAA8B,CAAC;AAgBnE,MAAM,OAAO,6BAA8B,SAAQ,KAAK;IAC9C,IAAI,CAAoC;IAEjD,YAAY,IAAuC,EAAE,OAAe,EAAE,OAAsB;QAC3F,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACxB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAClB,CAAC;CACD;AAQD,SAAS,2BAA2B,CAAC,SAAiB;IACrD,OAAO,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,0BAA0B,CAAC,YAAoB;IACvD,MAAM,sBAAsB,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAClE,OAAO,sBAAsB,CAAC,MAAM,GAAG,CAAC;QACvC,CAAC,CAAC,sBAAsB,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;QAC7C,CAAC,CAAC,sBAAsB,CAAC;AAC3B,CAAC;AAED,SAAS,YAAY,CAAC,aAAqB,EAAE,QAAgB;IAC5D,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAC5D,OAAO,YAAY,KAAK,EAAE,IAAI,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC;AAClG,CAAC;AAED,SAAS,sBAAsB,CAAC,OAI/B;IACA,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,SAAS,GAAG,CAAC,EAAE,CAAC;QACzE,OAAO,IAAI,CAAC;IACb,CAAC;IACD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAC5F,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;AAClD,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,aAAqB;IACvD,IAAI,CAAC;QACJ,OAAO,MAAM,QAAQ,CAAC,aAAa,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,GACT,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACxF,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,6BAA6B,CACtC,iBAAiB,EACjB,0BAA0B,aAAa,sCAAsC,IAAI,MAAM,OAAO,EAAE,EAChG,EAAE,KAAK,EAAE,KAAK,EAAE,CAChB,CAAC;IACH,CAAC;AACF,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,aAAqB;IACvD,IAAI,CAAC;QACJ,OAAO,MAAM,QAAQ,CAAC,aAAa,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAChB,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtF,OAAO,IAAI,CAAC;QACb,CAAC;QACD,MAAM,IAAI,GACT,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACxF,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,6BAA6B,CACtC,8BAA8B,EAC9B,kCAAkC,aAAa,sCAAsC,IAAI,MAAM,OAAO,EAAE,EACxG,EAAE,KAAK,EAAE,KAAK,EAAE,CAChB,CAAC;IACH,CAAC;AACF,CAAC;AAED,KAAK,UAAU,iCAAiC,CAAC,OAGhD;IACA,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC9C,MAAM,IAAI,6BAA6B,CACtC,qBAAqB,EACrB,SAAS,OAAO,CAAC,IAAI,CAAC,EAAE,6CAA6C,CACrE,CAAC;IACH,CAAC;IACD,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC9E,MAAM,CAAC,iBAAiB,EAAE,eAAe,EAAE,iBAAiB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACjF,mBAAmB,CAAC,OAAO,CAAC,gBAAgB,CAAC;QAC7C,mBAAmB,CAAC,eAAe,CAAC;QACpC,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;KACtD,CAAC,CAAC;IACH,MAAM,YAAY,GAAG,CAAC,eAAe,EAAE,iBAAiB,CAAC,CAAC,MAAM,CAC/D,CAAC,IAAI,EAAkB,EAAE,CAAC,IAAI,KAAK,IAAI,CACvC,CAAC;IACF,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;QACzE,MAAM,IAAI,6BAA6B,CACtC,4BAA4B,EAC5B,2BAA2B,OAAO,CAAC,gBAAgB,uEAAuE,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,CAC7I,CAAC;IACH,CAAC;IACD,OAAO,iBAAiB,CAAC;AAC1B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gCAAgC,CAAC,OAGtD;IACA,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC9C,MAAM,IAAI,6BAA6B,CACtC,qBAAqB,EACrB,SAAS,OAAO,CAAC,IAAI,CAAC,EAAE,6CAA6C,CACrE,CAAC;IACH,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,6BAA6B,CACtC,mBAAmB,EACnB,2BAA2B,OAAO,CAAC,gBAAgB,qBAAqB,CACxE,CAAC;IACH,CAAC;IACD,IAAI,2BAA2B,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAC3D,MAAM,IAAI,6BAA6B,CACtC,uBAAuB,EACvB,2BAA2B,OAAO,CAAC,gBAAgB,wCAAwC,CAC3F,CAAC;IACH,CAAC;IACD,OAAO,MAAM,iCAAiC,CAAC,OAAO,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAAC,OAI9C;IACA,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAC9C,MAAM,IAAI,6BAA6B,CACtC,qBAAqB,EACrB,SAAS,OAAO,CAAC,IAAI,CAAC,EAAE,6CAA6C,CACrE,CAAC;IACH,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QAC5C,MAAM,IAAI,6BAA6B,CACtC,yBAAyB,EACzB,uBAAuB,OAAO,CAAC,YAAY,qBAAqB,CAChE,CAAC;IACH,CAAC;IACD,IAAI,2BAA2B,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,6BAA6B,CACtC,6BAA6B,EAC7B,uBAAuB,OAAO,CAAC,YAAY,wCAAwC,CACnF,CAAC;IACH,CAAC;IACD,MAAM,sBAAsB,GAAG,0BAA0B,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAChF,IACC,sBAAsB,KAAK,gCAAgC;QAC3D,sBAAsB,KAAK,2BAA2B,EACrD,CAAC;QACF,MAAM,IAAI,6BAA6B,CACtC,mBAAmB,EACnB,uBAAuB,OAAO,CAAC,YAAY,kCAAkC,2BAA2B,OAAO,gCAAgC,wBAAwB,CACvK,CAAC;IACH,CAAC;IAED,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC9E,MAAM,gBAAgB,GACrB,sBAAsB,CAAC;QACtB,SAAS,EAAE,gCAAgC;QAC3C,QAAQ,EAAE,eAAe;QACzB,sBAAsB;KACtB,CAAC;QACF,sBAAsB,CAAC;YACtB,SAAS,EAAE,2BAA2B;YACtC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY;YAC3C,sBAAsB;SACtB,CAAC,CAAC;IACJ,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACvB,MAAM,IAAI,6BAA6B,CACtC,uBAAuB,EACvB,uBAAuB,OAAO,CAAC,YAAY,mBAAmB,gCAAgC,OAAO,2BAA2B,GAAG,CACnI,CAAC;IACH,CAAC;IACD,MAAM,oBAAoB,GAAG,MAAM,iCAAiC,CAAC;QACpE,gBAAgB;QAChB,IAAI,EAAE,OAAO,CAAC,IAAI;KAClB,CAAC,CAAC;IACH,IACC,2BAA2B,CAAC,OAAO,CAAC,IAAI,CAAC;QACzC,sBAAsB,CAAC,UAAU,CAAC,GAAG,2BAA2B,GAAG,CAAC,EACnE,CAAC;QACF,MAAM,YAAY,GAAG,mBAAmB,CAAC;YACxC,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;SACvB,CAAC,CAAC;QACH,OAAO;YACN,YAAY,EAAE,sBAAsB;YACpC,gBAAgB,EAAE,oBAAoB;YACtC,YAAY,EAAE;gBACb,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY;gBACnD,eAAe,EAAE,YAAY,CAAC,eAAe;aAC7C;SACD,CAAC;IACH,CAAC;IACD,OAAO;QACN,YAAY,EAAE,OAAO;QACrB,gBAAgB,EAAE,oBAAoB;KACtC,CAAC;AACH,CAAC"}

package/dist/controller/zone-git/zone-git-capability-store.d.ts

@@ -0,0 +1,16 @@
+export declare const ZONE_GIT_CAPABILITY_HEADER = "x-agent-vm-zone-git-token";
+export declare const ZONE_GIT_CAPABILITY_ENV_VAR = "AGENT_VM_ZONE_GIT_TOKEN";
+export type ZoneGitRuntimePluginConfig = Readonly<Record<string, Readonly<Record<string, unknown>>>>;
+export interface ZoneGitCapabilityStoreProps {
+    readonly generateToken?: () => string;
+}
+export declare class ZoneGitCapabilityStore {
+    private readonly generateToken;
+    private readonly tokensByZoneId;
+    constructor(props?: ZoneGitCapabilityStoreProps);
+    issueTokenForZone(zoneId: string): string;
+    buildRuntimePluginConfig(zoneId: string): ZoneGitRuntimePluginConfig;
+    buildRuntimeEnvironment(zoneId: string): Readonly<Record<string, string>>;
+    verifyTokenForZone(zoneId: string, token: string | undefined): boolean;
+}
+//# sourceMappingURL=zone-git-capability-store.d.ts.map

package/dist/controller/zone-git/zone-git-capability-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"zone-git-capability-store.d.ts","sourceRoot":"","sources":["../../../src/controller/zone-git/zone-git-capability-store.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,0BAA0B,8BAA8B,CAAC;AACtE,eAAO,MAAM,2BAA2B,4BAA4B,CAAC;AAErE,MAAM,MAAM,0BAA0B,GAAG,QAAQ,CAChD,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CACjD,CAAC;AAEF,MAAM,WAAW,2BAA2B;IAC3C,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,MAAM,CAAC;CACtC;AAYD,qBAAa,sBAAsB;IAClC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA6B;gBAEzC,KAAK,GAAE,2BAAgC;IAInD,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAUzC,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,0BAA0B;IASpE,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAMzE,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO;CAQ7E"}

package/dist/controller/zone-git/zone-git-capability-store.js

@@ -0,0 +1,47 @@
+import { randomBytes, timingSafeEqual } from 'node:crypto';
+export const ZONE_GIT_CAPABILITY_HEADER = 'x-agent-vm-zone-git-token';
+export const ZONE_GIT_CAPABILITY_ENV_VAR = 'AGENT_VM_ZONE_GIT_TOKEN';
+function generateDefaultToken() {
+    return randomBytes(32).toString('base64url');
+}
+function constantTimeStringEquals(left, right) {
+    const leftBuffer = Buffer.from(left);
+    const rightBuffer = Buffer.from(right);
+    return leftBuffer.length === rightBuffer.length && timingSafeEqual(leftBuffer, rightBuffer);
+}
+export class ZoneGitCapabilityStore {
+    generateToken;
+    tokensByZoneId = new Map();
+    constructor(props = {}) {
+        this.generateToken = props.generateToken ?? generateDefaultToken;
+    }
+    issueTokenForZone(zoneId) {
+        const existingToken = this.tokensByZoneId.get(zoneId);
+        if (existingToken) {
+            return existingToken;
+        }
+        const token = this.generateToken();
+        this.tokensByZoneId.set(zoneId, token);
+        return token;
+    }
+    buildRuntimePluginConfig(zoneId) {
+        this.issueTokenForZone(zoneId);
+        return {
+            gondolin: {
+                zoneGitTokenEnv: ZONE_GIT_CAPABILITY_ENV_VAR,
+            },
+        };
+    }
+    buildRuntimeEnvironment(zoneId) {
+        return {
+            [ZONE_GIT_CAPABILITY_ENV_VAR]: this.issueTokenForZone(zoneId),
+        };
+    }
+    verifyTokenForZone(zoneId, token) {
+        const expectedToken = this.tokensByZoneId.get(zoneId);
+        return (expectedToken !== undefined &&
+            token !== undefined &&
+            constantTimeStringEquals(token, expectedToken));
+    }
+}
+//# sourceMappingURL=zone-git-capability-store.js.map

package/dist/controller/zone-git/zone-git-capability-store.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zone-git-capability-store.js","sourceRoot":"","sources":["../../../src/controller/zone-git/zone-git-capability-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE3D,MAAM,CAAC,MAAM,0BAA0B,GAAG,2BAA2B,CAAC;AACtE,MAAM,CAAC,MAAM,2BAA2B,GAAG,yBAAyB,CAAC;AAUrE,SAAS,oBAAoB;IAC5B,OAAO,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAC9C,CAAC;AAED,SAAS,wBAAwB,CAAC,IAAY,EAAE,KAAa;IAC5D,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvC,OAAO,UAAU,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,IAAI,eAAe,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;AAC7F,CAAC;AAED,MAAM,OAAO,sBAAsB;IACjB,aAAa,CAAe;IAC5B,cAAc,GAAG,IAAI,GAAG,EAAkB,CAAC;IAE5D,YAAmB,QAAqC,EAAE;QACzD,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC,aAAa,IAAI,oBAAoB,CAAC;IAClE,CAAC;IAEM,iBAAiB,CAAC,MAAc;QACtC,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtD,IAAI,aAAa,EAAE,CAAC;YACnB,OAAO,aAAa,CAAC;QACtB,CAAC;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACnC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACvC,OAAO,KAAK,CAAC;IACd,CAAC;IAEM,wBAAwB,CAAC,MAAc;QAC7C,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAC/B,OAAO;YACN,QAAQ,EAAE;gBACT,eAAe,EAAE,2BAA2B;aAC5C;SACD,CAAC;IACH,CAAC;IAEM,uBAAuB,CAAC,MAAc;QAC5C,OAAO;YACN,CAAC,2BAA2B,CAAC,EAAE,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;SAC7D,CAAC;IACH,CAAC;IAEM,kBAAkB,CAAC,MAAc,EAAE,KAAyB;QAClE,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtD,OAAO,CACN,aAAa,KAAK,SAAS;YAC3B,KAAK,KAAK,SAAS;YACnB,wBAAwB,CAAC,KAAK,EAAE,aAAa,CAAC,CAC9C,CAAC;IACH,CAAC;CACD"}

package/dist/controller/zone-git/zone-git-operation-locks.d.ts

@@ -0,0 +1,5 @@
+export declare class ZoneGitOperationLocks {
+    private readonly queuesByZoneId;
+    runExclusive<TValue>(zoneId: string, operation: () => Promise<TValue>): Promise<TValue>;
+}
+//# sourceMappingURL=zone-git-operation-locks.d.ts.map

package/dist/controller/zone-git/zone-git-operation-locks.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"zone-git-operation-locks.d.ts","sourceRoot":"","sources":["../../../src/controller/zone-git/zone-git-operation-locks.ts"],"names":[],"mappings":"AAAA,qBAAa,qBAAqB;IACjC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAoC;IAEtD,YAAY,CAAC,MAAM,EAC/B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,GAC9B,OAAO,CAAC,MAAM,CAAC;CAkBlB"}

package/dist/controller/zone-git/zone-git-operation-locks.js

@@ -0,0 +1,23 @@
+export class ZoneGitOperationLocks {
+    queuesByZoneId = new Map();
+    async runExclusive(zoneId, operation) {
+        const previousQueue = this.queuesByZoneId.get(zoneId) ?? Promise.resolve();
+        let releaseCurrentQueue;
+        const currentQueue = new Promise((resolve) => {
+            releaseCurrentQueue = resolve;
+        });
+        const chainedQueue = previousQueue.then(async () => await currentQueue);
+        this.queuesByZoneId.set(zoneId, chainedQueue);
+        await previousQueue;
+        try {
+            return await operation();
+        }
+        finally {
+            releaseCurrentQueue();
+            if (this.queuesByZoneId.get(zoneId) === chainedQueue) {
+                this.queuesByZoneId.delete(zoneId);
+            }
+        }
+    }
+}
+//# sourceMappingURL=zone-git-operation-locks.js.map

package/dist/controller/zone-git/zone-git-operation-locks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zone-git-operation-locks.js","sourceRoot":"","sources":["../../../src/controller/zone-git/zone-git-operation-locks.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,qBAAqB;IAChB,cAAc,GAAG,IAAI,GAAG,EAAyB,CAAC;IAE5D,KAAK,CAAC,YAAY,CACxB,MAAc,EACd,SAAgC;QAEhC,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3E,IAAI,mBAAgC,CAAC;QACrC,MAAM,YAAY,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAClD,mBAAmB,GAAG,OAAO,CAAC;QAC/B,CAAC,CAAC,CAAC;QACH,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,YAAY,CAAC,CAAC;QACxE,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;QAC9C,MAAM,aAAa,CAAC;QACpB,IAAI,CAAC;YACJ,OAAO,MAAM,SAAS,EAAE,CAAC;QAC1B,CAAC;gBAAS,CAAC;YACV,mBAAmB,EAAE,CAAC;YACtB,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,YAAY,EAAE,CAAC;gBACtD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACpC,CAAC;QACF,CAAC;IACF,CAAC;CACD"}

package/dist/controller/zone-git/zone-git-operations.d.ts

@@ -0,0 +1,50 @@
+export interface ZoneGitReadConfig {
+    readonly branch: string;
+    readonly githubToken?: string;
+    readonly remoteUrl: string;
+    readonly runtimeDir: string;
+    readonly zoneFilesDir: string;
+    readonly zoneId: string;
+}
+interface InitializedZoneGitStatus {
+    readonly aheadOfRemote: number;
+    readonly behindRemote: number;
+    readonly branch: string;
+    readonly dirty: boolean;
+    readonly initialized: true;
+    readonly kind: 'initialized';
+    readonly localHead: string | null;
+    readonly remoteHead: string | null;
+}
+interface UninitializedZoneGitStatus {
+    readonly aheadOfRemote: 0;
+    readonly behindRemote: 0;
+    readonly branch: string;
+    readonly dirty: false;
+    readonly initialized: false;
+    readonly kind: 'uninitialized';
+    readonly localHead: null;
+    readonly remoteHead: null;
+}
+export type ZoneGitStatus = InitializedZoneGitStatus | UninitializedZoneGitStatus;
+export interface ZoneGitCommitSummary {
+    readonly sha: string;
+    readonly subject: string;
+}
+export interface ZoneGitPushResult {
+    readonly branch: string;
+    readonly localHead: string;
+    readonly pushedCommits: readonly ZoneGitCommitSummary[];
+    readonly remoteHead: string;
+}
+export interface ZoneGitPushOptions extends ZoneGitReadConfig {
+    readonly expectedHead: string;
+}
+export declare class ZoneGitConflictError extends Error {
+    constructor(message: string);
+}
+export declare function ensureZoneGitRepository(options: ZoneGitReadConfig): Promise<void>;
+export declare function getZoneGitStatus(options: ZoneGitReadConfig): Promise<ZoneGitStatus>;
+export declare function pushZoneGit(options: ZoneGitPushOptions): Promise<ZoneGitPushResult>;
+export {};
+//# sourceMappingURL=zone-git-operations.d.ts.map

package/dist/controller/zone-git/zone-git-operations.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"zone-git-operations.d.ts","sourceRoot":"","sources":["../../../src/controller/zone-git/zone-git-operations.ts"],"names":[],"mappings":"AAWA,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB;AAED,UAAU,wBAAwB;IACjC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,IAAI,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAED,UAAU,0BAA0B;IACnC,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;IAC1B,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IACtB,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,eAAe,CAAC;IAC/B,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,IAAI,CAAC;CAC1B;AAED,MAAM,MAAM,aAAa,GAAG,wBAAwB,GAAG,0BAA0B,CAAC;AAElF,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,aAAa,EAAE,SAAS,oBAAoB,EAAE,CAAC;IACxD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,kBAAmB,SAAQ,iBAAiB;IAC5D,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC9B;AAED,qBAAa,oBAAqB,SAAQ,KAAK;gBAC3B,OAAO,EAAE,MAAM;CAIlC;AAmMD,wBAAsB,uBAAuB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoEvF;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAC,CA+DzF;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAiDzF"}