@agent-vm/agent-vm 0.0.57 → 0.0.58

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"}

package/dist/controller/zone-git/zone-git-operations.js

@@ -0,0 +1,323 @@
+import { mkdir, stat, unlink, writeFile } from 'node:fs/promises';
+import path from 'node:path';
+import { execa } from 'execa';
+import { buildGithubTokenUrl, scrubGithubTokenFromOutput } from '../git-auth-support.js';
+import { OPENCLAW_ZONE_GIT_GUEST_DIR, resolveZoneGitPaths } from './zone-git-paths.js';
+const GIT_OPERATION_TIMEOUT_MS = 120_000;
+export class ZoneGitConflictError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'ZoneGitConflictError';
+    }
+}
+function isLocalRemoteUrl(remoteUrl) {
+    return path.isAbsolute(remoteUrl) || remoteUrl.startsWith('file://');
+}
+function buildRemoteUrl(options) {
+    if (isLocalRemoteUrl(options.remoteUrl)) {
+        return options.remoteUrl;
+    }
+    if (!options.githubToken) {
+        throw new Error('zoneGit remote requires githubToken for GitHub pushes.');
+    }
+    return buildGithubTokenUrl(options.remoteUrl, options.githubToken);
+}
+function buildGitArgs(options) {
+    return [
+        '-c',
+        'core.hooksPath=/dev/null',
+        `--git-dir=${options.gitDir}`,
+        `--work-tree=${options.workTree}`,
+        ...options.args,
+    ];
+}
+async function pathExists(filePath) {
+    try {
+        await stat(filePath);
+        return true;
+    }
+    catch (error) {
+        if (error && typeof error === 'object' && 'code' in error && error.code === 'ENOENT') {
+            return false;
+        }
+        throw error;
+    }
+}
+async function unlinkFileIfExists(filePath) {
+    try {
+        await unlink(filePath);
+    }
+    catch (error) {
+        if (error && typeof error === 'object' && 'code' in error && error.code === 'ENOENT') {
+            return;
+        }
+        throw error;
+    }
+}
+async function git(options) {
+    const result = await execa('git', buildGitArgs({
+        args: options.args,
+        gitDir: options.gitDir,
+        workTree: options.workTree,
+    }), {
+        reject: false,
+        timeout: GIT_OPERATION_TIMEOUT_MS,
+    });
+    const exitCode = typeof result.exitCode === 'number' ? result.exitCode : 128;
+    const normalized = {
+        stdout: result.stdout,
+        stderr: typeof result.exitCode === 'number'
+            ? result.stderr
+            : `${result.stderr}\ngit ${options.args.join(' ')} terminated without an exit code`.trim(),
+        exitCode,
+    };
+    const scrubbed = {
+        ...normalized,
+        stdout: scrubGithubTokenFromOutput(normalized.stdout),
+        stderr: scrubGithubTokenFromOutput(normalized.stderr),
+    };
+    if (options.reject === true && scrubbed.exitCode !== 0) {
+        throw new Error(scrubGithubTokenFromOutput(`git ${options.args.join(' ')} failed\n${scrubbed.stdout}\n${scrubbed.stderr}`.trim()));
+    }
+    return scrubbed;
+}
+async function gitStdout(options) {
+    return (await git({
+        args: options.args,
+        gitDir: options.gitDir,
+        reject: true,
+        workTree: options.workTree,
+    })).stdout.trim();
+}
+async function maybeGitStdout(options) {
+    const result = await git({
+        args: options.args,
+        gitDir: options.gitDir,
+        workTree: options.workTree,
+    });
+    return result.exitCode === 0 ? result.stdout.trim() : null;
+}
+function parseCommitSummaries(output) {
+    if (output.trim().length === 0) {
+        return [];
+    }
+    return output
+        .trim()
+        .split('\n')
+        .map((line) => {
+        const [sha = '', subject = ''] = line.split('\t');
+        if (!sha) {
+            throw new Error(`Failed to parse zone Git commit summary line: '${line}'.`);
+        }
+        return { sha, subject };
+    });
+}
+async function fetchRemoteBranch(options) {
+    const remoteUrl = buildRemoteUrl(options);
+    const result = await git({
+        args: [
+            'fetch',
+            '--prune',
+            remoteUrl,
+            `+refs/heads/${options.branch}:refs/remotes/origin/${options.branch}`,
+        ],
+        gitDir: options.gitDir,
+        workTree: options.zoneFilesDir,
+    });
+    if (result.exitCode === 0) {
+        return;
+    }
+    if (result.stderr.includes("couldn't find remote ref")) {
+        await git({
+            args: ['update-ref', '-d', `refs/remotes/origin/${options.branch}`],
+            gitDir: options.gitDir,
+            workTree: options.zoneFilesDir,
+        });
+        return;
+    }
+    throw new Error(`git fetch ${options.branch} failed\n${result.stdout}\n${result.stderr}`.trim());
+}
+async function readHead(options) {
+    return await maybeGitStdout({
+        args: ['rev-parse', '--verify', options.ref],
+        gitDir: options.gitDir,
+        workTree: options.workTree,
+    });
+}
+async function countCommits(options) {
+    const stdout = await gitStdout({
+        args: ['rev-list', '--count', options.range],
+        gitDir: options.gitDir,
+        workTree: options.workTree,
+    });
+    return Number.parseInt(stdout, 10);
+}
+export async function ensureZoneGitRepository(options) {
+    const zoneGitPaths = resolveZoneGitPaths({
+        runtimeDir: options.runtimeDir,
+        zoneId: options.zoneId,
+    });
+    await mkdir(zoneGitPaths.hostZoneGitRoot, { recursive: true });
+    if (!(await pathExists(zoneGitPaths.hostGitDir))) {
+        await unlinkFileIfExists(path.join(options.zoneFilesDir, '.git'));
+        await execa('git', [
+            'init',
+            `--separate-git-dir=${zoneGitPaths.hostGitDir}`,
+            `--initial-branch=${options.branch}`,
+            options.zoneFilesDir,
+        ], {
+            reject: true,
+            timeout: GIT_OPERATION_TIMEOUT_MS,
+        });
+    }
+    await writeFile(path.join(options.zoneFilesDir, '.git'), `gitdir: ${OPENCLAW_ZONE_GIT_GUEST_DIR}\n`, {
+        encoding: 'utf8',
+        mode: 0o644,
+    });
+    await git({
+        args: ['symbolic-ref', 'HEAD', `refs/heads/${options.branch}`],
+        gitDir: zoneGitPaths.hostGitDir,
+        reject: true,
+        workTree: options.zoneFilesDir,
+    });
+    await git({
+        args: ['config', 'core.worktree', '/zone'],
+        gitDir: zoneGitPaths.hostGitDir,
+        reject: true,
+        workTree: options.zoneFilesDir,
+    });
+    await git({
+        args: ['config', 'commit.gpgsign', 'false'],
+        gitDir: zoneGitPaths.hostGitDir,
+        reject: true,
+        workTree: options.zoneFilesDir,
+    });
+    await git({
+        args: ['config', 'core.hooksPath', '/dev/null'],
+        gitDir: zoneGitPaths.hostGitDir,
+        reject: true,
+        workTree: options.zoneFilesDir,
+    });
+    const originUrl = await maybeGitStdout({
+        args: ['remote', 'get-url', 'origin'],
+        gitDir: zoneGitPaths.hostGitDir,
+        workTree: options.zoneFilesDir,
+    });
+    await git({
+        args: originUrl === null
+            ? ['remote', 'add', 'origin', options.remoteUrl]
+            : ['remote', 'set-url', 'origin', options.remoteUrl],
+        gitDir: zoneGitPaths.hostGitDir,
+        reject: true,
+        workTree: options.zoneFilesDir,
+    });
+}
+export async function getZoneGitStatus(options) {
+    const zoneGitPaths = resolveZoneGitPaths({
+        runtimeDir: options.runtimeDir,
+        zoneId: options.zoneId,
+    });
+    if (!(await pathExists(zoneGitPaths.hostGitDir))) {
+        return {
+            aheadOfRemote: 0,
+            behindRemote: 0,
+            branch: options.branch,
+            dirty: false,
+            initialized: false,
+            kind: 'uninitialized',
+            localHead: null,
+            remoteHead: null,
+        };
+    }
+    await fetchRemoteBranch({ ...options, gitDir: zoneGitPaths.hostGitDir });
+    const statusOutput = await gitStdout({
+        args: ['status', '--porcelain'],
+        gitDir: zoneGitPaths.hostGitDir,
+        workTree: options.zoneFilesDir,
+    });
+    const localHead = await readHead({
+        gitDir: zoneGitPaths.hostGitDir,
+        ref: 'HEAD',
+        workTree: options.zoneFilesDir,
+    });
+    const remoteRef = `refs/remotes/origin/${options.branch}`;
+    const remoteHead = await readHead({
+        gitDir: zoneGitPaths.hostGitDir,
+        ref: remoteRef,
+        workTree: options.zoneFilesDir,
+    });
+    let aheadOfRemote = 0;
+    let behindRemote = 0;
+    if (localHead && remoteHead) {
+        const counts = await gitStdout({
+            args: ['rev-list', '--left-right', '--count', `HEAD...${remoteRef}`],
+            gitDir: zoneGitPaths.hostGitDir,
+            workTree: options.zoneFilesDir,
+        });
+        const [aheadText = '0', behindText = '0'] = counts.split(/\s+/u);
+        aheadOfRemote = Number.parseInt(aheadText, 10);
+        behindRemote = Number.parseInt(behindText, 10);
+    }
+    else if (localHead) {
+        aheadOfRemote = await countCommits({
+            gitDir: zoneGitPaths.hostGitDir,
+            range: 'HEAD',
+            workTree: options.zoneFilesDir,
+        });
+    }
+    return {
+        aheadOfRemote,
+        behindRemote,
+        branch: options.branch,
+        dirty: statusOutput.length > 0,
+        initialized: true,
+        kind: 'initialized',
+        localHead,
+        remoteHead,
+    };
+}
+export async function pushZoneGit(options) {
+    const zoneGitPaths = resolveZoneGitPaths({
+        runtimeDir: options.runtimeDir,
+        zoneId: options.zoneId,
+    });
+    if (!(await pathExists(zoneGitPaths.hostGitDir))) {
+        throw new Error(`Zone Git repository for zone '${options.zoneId}' is not initialized.`);
+    }
+    const status = await getZoneGitStatus(options);
+    if (!status.localHead) {
+        throw new Error(`Zone Git repository for zone '${options.zoneId}' has no local commits to push.`);
+    }
+    if (status.localHead !== options.expectedHead) {
+        throw new ZoneGitConflictError(`Zone Git repository for zone '${options.zoneId}' local HEAD '${status.localHead}' does not match expectedHead '${options.expectedHead}'.`);
+    }
+    const remoteRef = `refs/remotes/origin/${options.branch}`;
+    const commitRange = status.remoteHead ? `${remoteRef}..${status.localHead}` : status.localHead;
+    const pushedCommits = parseCommitSummaries(await gitStdout({
+        args: ['log', '--reverse', `--format=%H%x09%s`, commitRange],
+        gitDir: zoneGitPaths.hostGitDir,
+        workTree: options.zoneFilesDir,
+    }));
+    await git({
+        args: ['push', buildRemoteUrl(options), `${status.localHead}:refs/heads/${options.branch}`],
+        gitDir: zoneGitPaths.hostGitDir,
+        reject: true,
+        workTree: options.zoneFilesDir,
+    });
+    await fetchRemoteBranch({ ...options, gitDir: zoneGitPaths.hostGitDir });
+    const remoteHead = await readHead({
+        gitDir: zoneGitPaths.hostGitDir,
+        ref: remoteRef,
+        workTree: options.zoneFilesDir,
+    });
+    if (!remoteHead) {
+        throw new Error(`Zone Git push for zone '${options.zoneId}' did not produce remote head.`);
+    }
+    return {
+        branch: options.branch,
+        localHead: status.localHead,
+        pushedCommits,
+        remoteHead,
+    };
+}
+//# sourceMappingURL=zone-git-operations.js.map

package/dist/controller/zone-git/zone-git-operations.js.map

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

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

@@ -0,0 +1,28 @@
+import type { SystemConfig } from '../../config/system-config.js';
+export declare const OPENCLAW_ZONE_FILES_GUEST_ROOT = "/zone";
+export declare const OPENCLAW_ZONE_GIT_GUEST_ROOT = "/agent-vm/zone-git";
+export declare const OPENCLAW_ZONE_GIT_GUEST_DIR = "/agent-vm/zone-git/zone-files.git";
+export interface ZoneGitPaths {
+    readonly guestGitDir: typeof OPENCLAW_ZONE_GIT_GUEST_DIR;
+    readonly guestZoneGitRoot: typeof OPENCLAW_ZONE_GIT_GUEST_ROOT;
+    readonly hostGitDir: string;
+    readonly hostZoneGitRoot: string;
+}
+export interface ZoneGitToolVmMount {
+    readonly hostZoneFilesDir: string;
+    readonly hostZoneGitRoot: string;
+}
+export declare function resolveZoneGitPaths(options: {
+    readonly runtimeDir: string;
+    readonly zoneId: string;
+}): ZoneGitPaths;
+export declare function isOpenClawZoneGitConfigured(zone: SystemConfig['zones'][number]): zone is SystemConfig['zones'][number] & {
+    readonly gateway: Extract<SystemConfig['zones'][number]['gateway'], {
+        readonly type: 'openclaw';
+    }> & {
+        readonly zoneGit: NonNullable<Extract<SystemConfig['zones'][number]['gateway'], {
+            readonly type: 'openclaw';
+        }>['zoneGit']>;
+    };
+};
+//# sourceMappingURL=zone-git-paths.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"zone-git-paths.d.ts","sourceRoot":"","sources":["../../../src/controller/zone-git/zone-git-paths.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAElE,eAAO,MAAM,8BAA8B,UAAU,CAAC;AACtD,eAAO,MAAM,4BAA4B,uBAAuB,CAAC;AACjE,eAAO,MAAM,2BAA2B,sCAAmD,CAAC;AAE5F,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,WAAW,EAAE,OAAO,2BAA2B,CAAC;IACzD,QAAQ,CAAC,gBAAgB,EAAE,OAAO,4BAA4B,CAAC;IAC/D,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC;CACjC;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE;IAC5C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB,GAAG,YAAY,CAQf;AAED,wBAAgB,2BAA2B,CAC1C,IAAI,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GACjC,IAAI,IAAI,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,GAAG;IAC1C,QAAQ,CAAC,OAAO,EAAE,OAAO,CACxB,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EACxC;QAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;KAAE,CAC7B,GAAG;QACH,QAAQ,CAAC,OAAO,EAAE,WAAW,CAC5B,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;SAAE,CAAC,CAAC,SAAS,CAAC,CAC3F,CAAC;KACF,CAAC;CACF,CAEA"}

package/dist/controller/zone-git/zone-git-paths.js

@@ -0,0 +1,17 @@
+import path from 'node:path';
+export const OPENCLAW_ZONE_FILES_GUEST_ROOT = '/zone';
+export const OPENCLAW_ZONE_GIT_GUEST_ROOT = '/agent-vm/zone-git';
+export const OPENCLAW_ZONE_GIT_GUEST_DIR = `${OPENCLAW_ZONE_GIT_GUEST_ROOT}/zone-files.git`;
+export function resolveZoneGitPaths(options) {
+    const hostZoneGitRoot = path.join(options.runtimeDir, 'zones', options.zoneId, 'zone-git');
+    return {
+        guestGitDir: OPENCLAW_ZONE_GIT_GUEST_DIR,
+        guestZoneGitRoot: OPENCLAW_ZONE_GIT_GUEST_ROOT,
+        hostGitDir: path.join(hostZoneGitRoot, 'zone-files.git'),
+        hostZoneGitRoot,
+    };
+}
+export function isOpenClawZoneGitConfigured(zone) {
+    return zone.gateway.type === 'openclaw' && zone.gateway.zoneGit !== undefined;
+}
+//# sourceMappingURL=zone-git-paths.js.map

package/dist/controller/zone-git/zone-git-paths.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"zone-git-paths.js","sourceRoot":"","sources":["../../../src/controller/zone-git/zone-git-paths.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAI7B,MAAM,CAAC,MAAM,8BAA8B,GAAG,OAAO,CAAC;AACtD,MAAM,CAAC,MAAM,4BAA4B,GAAG,oBAAoB,CAAC;AACjE,MAAM,CAAC,MAAM,2BAA2B,GAAG,GAAG,4BAA4B,iBAAiB,CAAC;AAc5F,MAAM,UAAU,mBAAmB,CAAC,OAGnC;IACA,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAC3F,OAAO;QACN,WAAW,EAAE,2BAA2B;QACxC,gBAAgB,EAAE,4BAA4B;QAC9C,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,gBAAgB,CAAC;QACxD,eAAe;KACf,CAAC;AACH,CAAC;AAED,MAAM,UAAU,2BAA2B,CAC1C,IAAmC;IAWnC,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,UAAU,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC;AAC/E,CAAC"}

package/dist/controller/zone-runtimes/zone-runtime-types.d.ts

@@ -11,6 +11,7 @@ import type { PushBranchRequest, PushBranchResult } from '../git-push-operations
 import type { LeaseManager, ToolVmProfile } from '../leases/lease-manager.js';
 import type { RequestHeartbeatRegistry } from '../request-heartbeat-registry.js';
 import type { PreparedWorkerTask, WorkerTaskInput, WorkerTaskResult } from '../worker-task-runner.js';
+import type { ZoneGitToolVmMount } from '../zone-git/zone-git-paths.js';
 export type ControllerZoneConfig = SystemConfig['zones'][number];
 export interface GatewayZoneRuntimeHandle {
     readonly ingress: GatewayZoneStartResult['ingress'];
@@ -81,6 +82,7 @@ export interface SharedZoneRuntimeDependencies {
         readonly profile: ToolVmProfile;
         readonly tcpSlot: number;
         readonly hostWorkMountDir: string;
+        readonly zoneGitMount?: ZoneGitToolVmMount;
         readonly zoneId: string;
     }) => Promise<ManagedVm>;
     readonly deleteGatewayRuntimeRecord: (stateDirectory: string) => Promise<void>;

package/dist/controller/zone-runtimes/zone-runtime-types.d.ts.map

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

package/dist/gateway/gateway-zone-orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gateway-zone-orchestrator.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-zone-orchestrator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEX,gBAAgB,EAChB,iBAAiB,EACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEN,KAAK,SAAS,EACd,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EAEN,KAAK,+BAA+B,EACpC,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAGN,KAAK,oBAAoB,EACzB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAIN,KAAK,8BAA8B,EACnC,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC5B,MAAM,2BAA2B,CAAC;AAQnC,MAAM,WAAW,0BAA2B,SAAQ,+BAA+B;IAClF,QAAQ,CAAC,+BAA+B,CAAC,EAAE,OAAO,+BAA+B,CAAC;IAClF,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,8BAA8B,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IAC3F,QAAQ,CAAC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IAC9C,QAAQ,CAAC,4BAA4B,CAAC,EAAE,MAAM,CAAC;IAC/C,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,gBAAgB,CAAC;IACjG,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CACpC,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,oBAAoB,KACxB,OAAO,CAAC,IAAI,CAAC,CAAC;CACnB;AAiHD,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,uBAAuB,EAChC,YAAY,GAAE,0BAA+B,GAC3C,OAAO,CAAC,sBAAsB,CAAC,CAkKjC"}
+{"version":3,"file":"gateway-zone-orchestrator.d.ts","sourceRoot":"","sources":["../../src/gateway/gateway-zone-orchestrator.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEX,gBAAgB,EAChB,iBAAiB,EACjB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAEN,KAAK,SAAS,EACd,MAAM,4BAA4B,CAAC;AAKpC,OAAO,EAEN,KAAK,+BAA+B,EACpC,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAAE,+BAA+B,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAGN,KAAK,oBAAoB,EACzB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAIN,KAAK,8BAA8B,EACnC,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC5B,MAAM,2BAA2B,CAAC;AAQnC,MAAM,WAAW,0BAA2B,SAAQ,+BAA+B;IAClF,QAAQ,CAAC,+BAA+B,CAAC,EAAE,OAAO,+BAA+B,CAAC;IAClF,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,OAAO,EAAE,8BAA8B,KAAK,OAAO,CAAC,SAAS,CAAC,CAAC;IAC3F,QAAQ,CAAC,2BAA2B,CAAC,EAAE,MAAM,CAAC;IAC9C,QAAQ,CAAC,4BAA4B,CAAC,EAAE,MAAM,CAAC;IAC/C,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,gBAAgB,CAAC;IACjG,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CACpC,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,oBAAoB,KACxB,OAAO,CAAC,IAAI,CAAC,CAAC;CACnB;AAiHD,wBAAsB,gBAAgB,CACrC,OAAO,EAAE,uBAAuB,EAChC,YAAY,GAAE,0BAA+B,GAC3C,OAAO,CAAC,sBAAsB,CAAC,CA2KjC"}

package/dist/gateway/gateway-zone-orchestrator.js

@@ -83,7 +83,16 @@ async function waitForHealth(options) {
 export async function startGatewayZone(options, dependencies = {}) {
     const runTaskStep = options.runTask ?? (async (_title, fn) => await fn());
     const zone = options.zoneOverride ?? findGatewayZone(options.systemConfig, options.zoneId);
-    const lifecycleZone = mapSystemGatewayZoneToLifecycleZone(zone);
+    const mappedLifecycleZone = mapSystemGatewayZoneToLifecycleZone(zone);
+    const lifecycleZone = {
+        ...mappedLifecycleZone,
+        ...(options.runtimeEnvironment === undefined
+            ? {}
+            : { runtimeEnvironment: options.runtimeEnvironment }),
+        ...(options.runtimePluginConfigs === undefined
+            ? {}
+            : { runtimePluginConfigs: options.runtimePluginConfigs }),
+    };
     await runTaskStep('Cleaning orphaned gateway runtime', async () => {
         await (dependencies.cleanupOrphanedGatewayIfPresent ?? cleanupOrphanedGatewayIfPresent)({
             stateDir: zone.gateway.stateDir,