@agent-vm/agent-vm 0.0.20

package/dist/controller/controller-runtime.js

@@ -0,0 +1,326 @@
+import { createOpCliSecretResolver } from '@agent-vm/gondolin-adapter';
+import { deleteGatewayRuntimeRecord as deleteGatewayRuntimeRecordDefault } from '../gateway/gateway-runtime-record.js';
+import { startGatewayZone } from '../gateway/gateway-zone-orchestrator.js';
+import { runTaskWithResult } from '../shared/run-task.js';
+import { cleanToolVmWorkspace, createToolVm, resolveToolVmWorkspaceDirectory, } from '../tool-vm/tool-vm-lifecycle.js';
+import { ActiveTaskRegistry } from './active-task-registry.js';
+import { createControllerRuntimeOperations, createStopControllerOperation, } from './controller-runtime-operations.js';
+import { createSecretResolver, findConfiguredZone, resolveControllerGithubToken, } from './controller-runtime-support.js';
+import { pullDefaultForTask, PullDefaultValidationError, } from './git-pull-default-operations.js';
+import { pushBranchesForTask, PushBranchesValidationError, } from './git-push-operations.js';
+import { ControllerRuntimeAtCapacityError, ControllerTaskNotReadyError, } from './http/controller-http-route-support.js';
+import { createControllerService } from './http/controller-http-routes.js';
+import { startControllerHttpServer } from './http/controller-http-server.js';
+import { createIdleReaper } from './leases/idle-reaper.js';
+import { createLeaseManager } from './leases/lease-manager.js';
+import { createTcpPool } from './leases/tcp-pool.js';
+import { RequestHeartbeatRegistry } from './request-heartbeat-registry.js';
+import { createTaskStateReader } from './task-state-reader.js';
+import { executeWorkerTask as executeWorkerTaskDefault, prepareWorkerTask as prepareWorkerTaskDefault, } from './worker-task-runner.js';
+const MAX_ACTIVE_TASKS_PER_RUNTIME = 1;
+function writeControllerRuntimeLog(message) {
+    process.stderr.write(`[agent-vm] ${message}\n`);
+}
+function formatUnknownError(error) {
+    if (error instanceof Error) {
+        return error.message;
+    }
+    return typeof error === 'string' ? error : JSON.stringify(error);
+}
+export async function startControllerRuntime(options, dependencies) {
+    const now = dependencies.now ?? Date.now;
+    const runTaskStep = dependencies.runTask ?? (async (_title, fn) => await fn());
+    const secretResolver = await runTaskWithResult(runTaskStep, 'Resolving 1Password secrets', async () => await createSecretResolver(options.systemConfig, dependencies.createSecretResolver ?? createOpCliSecretResolver));
+    const controllerGithubToken = await resolveControllerGithubToken(options.systemConfig, secretResolver);
+    const callerUrl = process.env.CALLER_URL;
+    const createManagedToolVm = dependencies.createManagedToolVm ??
+        (async (toolVmOptions) => await createToolVm({
+            cacheDir: options.systemConfig.cacheDir,
+            profile: toolVmOptions.profile,
+            systemConfig: options.systemConfig,
+            tcpSlot: toolVmOptions.tcpSlot,
+            workspaceDir: toolVmOptions.workspaceDir,
+            zoneId: toolVmOptions.zoneId,
+        }));
+    const tcpPool = createTcpPool(options.systemConfig.tcpPool);
+    const activeTaskRegistry = new ActiveTaskRegistry();
+    const requestHeartbeatRegistry = new RequestHeartbeatRegistry();
+    const activeZone = findConfiguredZone(options.systemConfig, options.zoneId);
+    const leaseManager = createLeaseManager({
+        cleanWorkspace: async ({ profile, tcpSlot, zoneId }) => {
+            await cleanToolVmWorkspace(resolveToolVmWorkspaceDirectory({
+                profile,
+                tcpSlot,
+                zoneId,
+            }));
+        },
+        createManagedVm: async (leaseOptions) => await createManagedToolVm({
+            profile: leaseOptions.profile,
+            tcpSlot: leaseOptions.tcpSlot,
+            workspaceDir: leaseOptions.workspaceDir,
+            zoneId: leaseOptions.zoneId,
+        }),
+        now,
+        tcpPool,
+    });
+    const idleReaper = createIdleReaper({
+        getLeases: () => leaseManager.listLeases(),
+        now,
+        releaseLease: async (leaseId) => {
+            await leaseManager.releaseLease(leaseId);
+        },
+        ttlMs: 30 * 60 * 1000,
+    });
+    const reaperTimer = (dependencies.setIntervalImpl ?? setInterval)(() => void idleReaper.reapExpiredLeases(), 60_000);
+    const clearReaperTimer = () => (dependencies.clearIntervalImpl ?? clearInterval)(reaperTimer);
+    const releaseAllLeases = async () => {
+        let releaseError;
+        for (const lease of leaseManager.listLeases()) {
+            try {
+                // oxlint-disable-next-line eslint/no-await-in-loop -- sequential release avoids TCP slot races
+                await leaseManager.releaseLease(lease.id);
+            }
+            catch (error) {
+                releaseError ??= error instanceof Error ? error : new Error(formatUnknownError(error));
+                writeControllerRuntimeLog(`Failed to release lease '${lease.id}' during controller shutdown: ${formatUnknownError(error)}`);
+            }
+        }
+        return releaseError;
+    };
+    const startGateway = async () => await (dependencies.startGatewayZone ?? startGatewayZone)({
+        runTask: runTaskStep,
+        secretResolver,
+        systemConfig: options.systemConfig,
+        zoneId: options.zoneId,
+    });
+    const zone = findConfiguredZone(options.systemConfig, options.zoneId);
+    let gateway;
+    const requireGateway = () => {
+        if (!gateway) {
+            throw new Error('Gateway runtime is unavailable because the last restart did not complete.');
+        }
+        return gateway;
+    };
+    if (activeZone.gateway.type !== 'worker') {
+        await runTaskStep('Starting gateway zone', async () => {
+            gateway = await startGateway();
+        });
+    }
+    const stopGatewayZone = async () => {
+        if (!gateway) {
+            return;
+        }
+        const activeGateway = gateway;
+        gateway = undefined;
+        let closeError;
+        try {
+            await activeGateway.vm.close();
+        }
+        catch (error) {
+            closeError = error;
+        }
+        let deleteRecordError;
+        try {
+            await (dependencies.deleteGatewayRuntimeRecord ?? deleteGatewayRuntimeRecordDefault)(zone.gateway.stateDir);
+        }
+        catch (error) {
+            deleteRecordError = error;
+        }
+        if (closeError) {
+            throw closeError;
+        }
+        if (deleteRecordError) {
+            throw deleteRecordError;
+        }
+    };
+    const restartGatewayZone = async () => {
+        await stopGatewayZone();
+        gateway = await startGateway();
+    };
+    const serverRef = {};
+    const stopController = createStopControllerOperation({
+        clearReaperTimer,
+        closeControllerServer: () => setTimeout(() => void serverRef.current?.close(), 100),
+        getLeases: () => leaseManager.listLeases(),
+        releaseLease: async (leaseId) => await leaseManager.releaseLease(leaseId),
+        stopGatewayZone,
+    });
+    const controllerOperations = activeZone.gateway.type !== 'worker'
+        ? {
+            ...createControllerRuntimeOperations({
+                activeZoneId: options.zoneId,
+                getGateway: () => requireGateway(),
+                getZone: (zoneId) => findConfiguredZone(options.systemConfig, zoneId),
+                leaseManager,
+                restartGatewayZone,
+                secretResolver,
+                stopGatewayZone,
+                systemConfig: options.systemConfig,
+            }),
+            stopController,
+        }
+        : { stopController };
+    const prepareWorkerTaskForZone = activeZone.gateway.type === 'worker'
+        ? async (zoneId, input) => {
+            const reservationId = activeTaskRegistry.tryReserve(zoneId, MAX_ACTIVE_TASKS_PER_RUNTIME);
+            if (!reservationId) {
+                throw new ControllerRuntimeAtCapacityError(`Worker pod for zone '${zoneId}' is at capacity.`);
+            }
+            try {
+                return await (dependencies.prepareWorkerTask ?? prepareWorkerTaskDefault)({
+                    input,
+                    systemConfig: options.systemConfig,
+                    zoneId,
+                    ...(controllerGithubToken ? { githubToken: controllerGithubToken } : {}),
+                    onTaskPrepared: async (task) => {
+                        activeTaskRegistry.activateReservation(zoneId, reservationId, task);
+                        try {
+                            await dependencies.onWorkerTaskPrepared?.(task);
+                        }
+                        catch (error) {
+                            activeTaskRegistry.clear(task.zoneId, task.taskId);
+                            throw error;
+                        }
+                    },
+                });
+            }
+            catch (error) {
+                activeTaskRegistry.releaseReservation(zoneId, reservationId);
+                throw error;
+            }
+        }
+        : undefined;
+    const executePreparedWorkerTask = activeZone.gateway.type === 'worker'
+        ? async (prepared) => {
+            let heartbeatAcquired = false;
+            try {
+                if (callerUrl) {
+                    requestHeartbeatRegistry.acquire(prepared.input.requestTaskId, callerUrl);
+                    heartbeatAcquired = true;
+                }
+                return await (dependencies.executeWorkerTask ?? executeWorkerTaskDefault)(prepared, {
+                    secretResolver,
+                    systemConfig: options.systemConfig,
+                    onWorkerTaskIngress: async (zoneId, taskId, workerIngress) => {
+                        activeTaskRegistry.setWorkerIngress(zoneId, taskId, workerIngress);
+                        await dependencies.onWorkerTaskIngress?.(zoneId, taskId, workerIngress);
+                    },
+                    onTaskFinished: async (finishedZoneId, taskId) => {
+                        activeTaskRegistry.clear(finishedZoneId, taskId);
+                        await dependencies.onWorkerTaskFinished?.(finishedZoneId, taskId);
+                    },
+                });
+            }
+            catch (error) {
+                if (activeTaskRegistry.get(prepared.zoneId, prepared.taskId)) {
+                    activeTaskRegistry.clear(prepared.zoneId, prepared.taskId);
+                }
+                throw error;
+            }
+            finally {
+                if (heartbeatAcquired) {
+                    requestHeartbeatRegistry.release(prepared.input.requestTaskId);
+                }
+            }
+        }
+        : undefined;
+    const getTaskState = activeZone.gateway.type === 'worker'
+        ? createTaskStateReader({ systemConfig: options.systemConfig }).read
+        : undefined;
+    const closeTaskForZone = activeZone.gateway.type === 'worker'
+        ? async (zoneId, taskId) => {
+            const activeTask = activeTaskRegistry.get(zoneId, taskId);
+            if (!activeTask) {
+                throw new Error(`Task '${taskId}' is not active for zone '${zoneId}'.`);
+            }
+            if (!activeTask.workerIngress) {
+                throw new ControllerTaskNotReadyError(`Task '${taskId}' in zone '${zoneId}' does not have a worker ingress yet.`);
+            }
+            const response = await fetch(`http://${activeTask.workerIngress.host}:${String(activeTask.workerIngress.port)}/tasks/${taskId}/close`, { method: 'POST' });
+            if (!response.ok) {
+                throw new Error(`worker close returned HTTP ${String(response.status)}`);
+            }
+            return { status: 'closed' };
+        }
+        : undefined;
+    const pushTaskBranches = activeZone.gateway.type === 'worker'
+        ? async (zoneId, taskId, input) => {
+            const activeTask = activeTaskRegistry.get(zoneId, taskId);
+            if (!activeTask) {
+                throw new PushBranchesValidationError(`Task '${taskId}' is not active for zone '${zoneId}'.`);
+            }
+            if (!controllerGithubToken) {
+                throw new Error('Controller GitHub token is not configured. Set host.githubToken or process.env.GITHUB_TOKEN.');
+            }
+            return await pushBranchesForTask({
+                activeTask,
+                branches: input.branches,
+                githubToken: controllerGithubToken,
+            });
+        }
+        : undefined;
+    const pullDefaultForActiveTask = activeZone.gateway.type === 'worker'
+        ? async (zoneId, taskId, input) => {
+            const activeTask = activeTaskRegistry.get(zoneId, taskId);
+            if (!activeTask) {
+                throw new PullDefaultValidationError(`Task '${taskId}' is not active for zone '${zoneId}'.`);
+            }
+            if (!controllerGithubToken) {
+                throw new Error('Controller GitHub token is not configured. Set host.githubToken or process.env.GITHUB_TOKEN.');
+            }
+            return await pullDefaultForTask({
+                activeTask,
+                repoUrl: input.repoUrl,
+                githubToken: controllerGithubToken,
+            });
+        }
+        : undefined;
+    const operations = {
+        ...controllerOperations,
+        ...(prepareWorkerTaskForZone ? { prepareWorkerTask: prepareWorkerTaskForZone } : {}),
+        ...(executePreparedWorkerTask ? { executeWorkerTask: executePreparedWorkerTask } : {}),
+        ...(getTaskState ? { getTaskState } : {}),
+        ...(closeTaskForZone ? { closeTaskForZone } : {}),
+        ...(pushTaskBranches ? { pushTaskBranches } : {}),
+        ...(pullDefaultForActiveTask ? { pullDefaultForTask: pullDefaultForActiveTask } : {}),
+    };
+    const controllerApp = createControllerService({
+        leaseManager,
+        operations,
+        systemConfig: options.systemConfig,
+    });
+    await runTaskStep(`Controller API on :${options.systemConfig.host.controllerPort}`, async () => {
+        serverRef.current = await (dependencies.startHttpServer ?? startControllerHttpServer)({
+            app: controllerApp,
+            port: options.systemConfig.host.controllerPort,
+        });
+    });
+    await idleReaper.reapExpiredLeases();
+    return {
+        async close() {
+            clearReaperTimer();
+            requestHeartbeatRegistry.stopAll();
+            const releaseError = await releaseAllLeases();
+            try {
+                await stopGatewayZone();
+            }
+            finally {
+                await serverRef.current?.close();
+            }
+            if (releaseError) {
+                throw releaseError;
+            }
+        },
+        controllerPort: options.systemConfig.host.controllerPort,
+        ...(gateway
+            ? {
+                gateway: {
+                    ingress: requireGateway().ingress,
+                    processSpec: requireGateway().processSpec,
+                    vm: requireGateway().vm,
+                },
+            }
+            : {}),
+    };
+}
+//# sourceMappingURL=controller-runtime.js.map

package/dist/controller/controller-runtime.js.map

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

package/dist/controller/git-auth-support.d.ts

@@ -0,0 +1,3 @@
+export declare function buildGithubAuthConfigArgs(githubToken: string): readonly string[];
+export declare function scrubGithubTokenFromOutput(text: string): string;
+//# sourceMappingURL=git-auth-support.d.ts.map

package/dist/controller/git-auth-support.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-auth-support.d.ts","sourceRoot":"","sources":["../../src/controller/git-auth-support.ts"],"names":[],"mappings":"AAEA,wBAAgB,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAGhF;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI/D"}

package/dist/controller/git-auth-support.js

@@ -0,0 +1,11 @@
+import { Buffer } from 'node:buffer';
+export function buildGithubAuthConfigArgs(githubToken) {
+    const header = `Authorization: Basic ${Buffer.from(`x-access-token:${githubToken}`).toString('base64')}`;
+    return ['-c', `http.https://github.com/.extraheader=${header}`];
+}
+export function scrubGithubTokenFromOutput(text) {
+    return text
+        .replace(/https:\/\/x-access-token:[^@]*@/gu, 'https://x-access-token:***@')
+        .replace(/Authorization: Basic [A-Za-z0-9+/=]+/gu, 'Authorization: Basic ***');
+}
+//# sourceMappingURL=git-auth-support.js.map

package/dist/controller/git-auth-support.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-auth-support.js","sourceRoot":"","sources":["../../src/controller/git-auth-support.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,UAAU,yBAAyB,CAAC,WAAmB;IAC5D,MAAM,MAAM,GAAG,wBAAwB,MAAM,CAAC,IAAI,CAAC,kBAAkB,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;IACzG,OAAO,CAAC,IAAI,EAAE,wCAAwC,MAAM,EAAE,CAAC,CAAC;AACjE,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,IAAY;IACtD,OAAO,IAAI;SACT,OAAO,CAAC,mCAAmC,EAAE,6BAA6B,CAAC;SAC3E,OAAO,CAAC,wCAAwC,EAAE,0BAA0B,CAAC,CAAC;AACjF,CAAC"}

package/dist/controller/git-pull-default-operations.d.ts

@@ -0,0 +1,34 @@
+import type { ActiveWorkerTask } from './active-task-registry.js';
+export interface PullDefaultRequest {
+    readonly repoUrl: string;
+}
+export interface PullDefaultCommitSummary {
+    readonly sha: string;
+    readonly subject: string;
+    readonly author?: string;
+    readonly date?: string;
+}
+export interface PullDefaultResult {
+    readonly repoUrl: string;
+    readonly success: boolean;
+    readonly error?: string;
+    readonly defaultBranch?: string;
+    readonly remoteDefaultHead?: string;
+    readonly localDefaultHead?: string;
+    readonly currentBranch?: string | null;
+    readonly fetchedCommits?: readonly PullDefaultCommitSummary[];
+    readonly commitsSinceForkPoint?: readonly PullDefaultCommitSummary[];
+    readonly divergence?: {
+        readonly aheadOfDefault: number;
+        readonly behindDefault: number;
+        readonly forkPoint: string;
+    };
+}
+export declare class PullDefaultValidationError extends Error {
+}
+export declare function pullDefaultForTask(options: {
+    readonly activeTask: ActiveWorkerTask;
+    readonly repoUrl: string;
+    readonly githubToken: string;
+}): Promise<PullDefaultResult>;
+//# sourceMappingURL=git-pull-default-operations.d.ts.map

package/dist/controller/git-pull-default-operations.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"git-pull-default-operations.d.ts","sourceRoot":"","sources":["../../src/controller/git-pull-default-operations.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAKlE,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,wBAAwB;IACxC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACvB;AASD,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,QAAQ,CAAC,cAAc,CAAC,EAAE,SAAS,wBAAwB,EAAE,CAAC;IAC9D,QAAQ,CAAC,qBAAqB,CAAC,EAAE,SAAS,wBAAwB,EAAE,CAAC;IACrE,QAAQ,CAAC,UAAU,CAAC,EAAE;QACrB,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;QAChC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;QAC/B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;KAC3B,CAAC;CACF;AAED,qBAAa,0BAA2B,SAAQ,KAAK;CAAG;AAgGxD,wBAAsB,kBAAkB,CAAC,OAAO,EAAE;IACjD,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC7B,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAoG7B"}

package/dist/controller/git-pull-default-operations.js

@@ -0,0 +1,175 @@
+import { execa } from 'execa';
+import { scrubGithubTokenFromOutput } from './git-auth-support.js';
+const GIT_OPERATION_TIMEOUT_MS = 120_000;
+export class PullDefaultValidationError extends Error {
+}
+function parseRepoFromUrl(repoUrl) {
+    const cleaned = repoUrl.replace(/\.git$/, '');
+    const urlPattern = /(?:https?:\/\/)?github\.com\/([^/]+\/[^/]+)$/u;
+    const match = urlPattern.exec(cleaned);
+    if (match?.[1])
+        return match[1];
+    if (/^[^\s/]+\/[^\s/]+$/u.test(cleaned))
+        return cleaned;
+    throw new PullDefaultValidationError(`Invalid GitHub repository: ${repoUrl}`);
+}
+function buildPushUrl(repoUrl, githubToken) {
+    return `https://x-access-token:${githubToken}@github.com/${parseRepoFromUrl(repoUrl)}.git`;
+}
+async function git(options) {
+    const result = await execa('git', [...options.args], {
+        cwd: options.cwd,
+        reject: false,
+        timeout: GIT_OPERATION_TIMEOUT_MS,
+    });
+    const normalized = {
+        stdout: result.stdout,
+        stderr: result.stderr,
+        exitCode: result.exitCode ?? 0,
+    };
+    if (options.reject === true && normalized.exitCode !== 0) {
+        throw new Error(`git ${options.args.join(' ')} failed\n${normalized.stdout}\n${normalized.stderr}`.trim());
+    }
+    return normalized;
+}
+async function gitStdout(cwd, args) {
+    return (await git({ cwd, args, reject: true })).stdout.trim();
+}
+function parseCommitSummaries(output) {
+    if (output.trim().length === 0)
+        return [];
+    return output
+        .trim()
+        .split('\n')
+        .map((line) => {
+        const [sha = '', subject = '', author = '', date = ''] = line.split('\t');
+        const summary = {
+            sha,
+            subject,
+        };
+        if (author) {
+            summary.author = author;
+        }
+        if (date) {
+            summary.date = date;
+        }
+        return summary;
+    });
+}
+async function commitSummaries(cwd, range) {
+    const result = await git({
+        cwd,
+        args: ['log', range, '--format=%H%x09%s%x09%an%x09%aI'],
+        reject: false,
+    });
+    if (result.exitCode !== 0)
+        return [];
+    return parseCommitSummaries(result.stdout);
+}
+async function refExists(cwd, ref) {
+    return ((await git({ cwd, args: ['rev-parse', '--verify', '--quiet', ref], reject: false }))
+        .exitCode === 0);
+}
+async function countRange(cwd, range) {
+    const result = await git({ cwd, args: ['rev-list', '--count', range], reject: false });
+    if (result.exitCode !== 0)
+        return 0;
+    return Number.parseInt(result.stdout.trim(), 10) || 0;
+}
+async function currentBranch(cwd) {
+    const result = await git({ cwd, args: ['branch', '--show-current'], reject: false });
+    if (result.exitCode !== 0)
+        return null;
+    const branch = result.stdout.trim();
+    return branch.length > 0 ? branch : null;
+}
+export async function pullDefaultForTask(options) {
+    const repo = options.activeTask.repos.find((candidate) => candidate.repoUrl === options.repoUrl);
+    if (!repo) {
+        throw new PullDefaultValidationError(`Repo '${options.repoUrl}' is not registered for active task '${options.activeTask.taskId}'.`);
+    }
+    try {
+        const defaultBranch = repo.baseBranch;
+        const defaultRef = `refs/heads/${defaultBranch}`;
+        const remoteDefaultRef = `refs/remotes/origin/${defaultBranch}`;
+        const previousRemoteDefaultHead = (await refExists(repo.hostWorkspacePath, remoteDefaultRef))
+            ? await gitStdout(repo.hostWorkspacePath, ['rev-parse', remoteDefaultRef])
+            : null;
+        const fetchResult = await git({
+            cwd: repo.hostWorkspacePath,
+            args: [
+                'fetch',
+                '--prune',
+                buildPushUrl(options.repoUrl, options.githubToken),
+                `${defaultBranch}:${remoteDefaultRef}`,
+            ],
+            reject: false,
+        });
+        if (fetchResult.exitCode !== 0) {
+            return {
+                repoUrl: options.repoUrl,
+                success: false,
+                error: `Fetch failed: ${scrubGithubTokenFromOutput(`${fetchResult.stdout}\n${fetchResult.stderr}`).trim()}`,
+            };
+        }
+        const remoteDefaultHead = await gitStdout(repo.hostWorkspacePath, [
+            'rev-parse',
+            remoteDefaultRef,
+        ]);
+        const fetchedCommits = previousRemoteDefaultHead
+            ? await commitSummaries(repo.hostWorkspacePath, `${previousRemoteDefaultHead}..${remoteDefaultRef}`)
+            : [];
+        if (await refExists(repo.hostWorkspacePath, defaultRef)) {
+            const fastForwardCheck = await git({
+                cwd: repo.hostWorkspacePath,
+                args: ['merge-base', '--is-ancestor', defaultRef, remoteDefaultRef],
+                reject: false,
+            });
+            if (fastForwardCheck.exitCode !== 0) {
+                return {
+                    repoUrl: options.repoUrl,
+                    success: false,
+                    defaultBranch,
+                    remoteDefaultHead,
+                    error: `Local ${defaultBranch} cannot be fast-forwarded to origin/${defaultBranch}; inspect it manually.`,
+                };
+            }
+        }
+        await git({
+            cwd: repo.hostWorkspacePath,
+            args: ['update-ref', defaultRef, remoteDefaultRef],
+            reject: true,
+        });
+        const localDefaultHead = await gitStdout(repo.hostWorkspacePath, ['rev-parse', defaultRef]);
+        const branch = await currentBranch(repo.hostWorkspacePath);
+        const forkPoint = await gitStdout(repo.hostWorkspacePath, [
+            'merge-base',
+            'HEAD',
+            remoteDefaultRef,
+        ]);
+        const commitsSinceForkPoint = await commitSummaries(repo.hostWorkspacePath, `${forkPoint}..${remoteDefaultRef}`);
+        return {
+            repoUrl: options.repoUrl,
+            success: true,
+            defaultBranch,
+            remoteDefaultHead,
+            localDefaultHead,
+            currentBranch: branch,
+            fetchedCommits,
+            commitsSinceForkPoint,
+            divergence: {
+                aheadOfDefault: await countRange(repo.hostWorkspacePath, `${remoteDefaultRef}..HEAD`),
+                behindDefault: await countRange(repo.hostWorkspacePath, `HEAD..${remoteDefaultRef}`),
+                forkPoint,
+            },
+        };
+    }
+    catch (error) {
+        return {
+            repoUrl: options.repoUrl,
+            success: false,
+            error: error instanceof Error ? error.message : String(error),
+        };
+    }
+}
+//# sourceMappingURL=git-pull-default-operations.js.map

package/dist/controller/git-pull-default-operations.js.map

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

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

@@ -0,0 +1,38 @@
+import type { ActiveWorkerTask } from './active-task-registry.js';
+export interface PushBranchRequest {
+    readonly repoUrl: string;
+    readonly branchName: string;
+}
+export interface PushCommitSummary {
+    readonly sha: string;
+    readonly subject: string;
+    readonly author?: string;
+    readonly date?: string;
+}
+export interface PushBranchResult {
+    readonly repoUrl: string;
+    readonly branch: string;
+    readonly success: boolean;
+    readonly error?: string;
+    readonly localHead?: string;
+    readonly remoteBranchHead?: string;
+    readonly defaultBranch?: string;
+    readonly remoteDefaultHead?: string;
+    readonly commitsOnBranch?: readonly PushCommitSummary[];
+    readonly pushedInThisCall?: readonly PushCommitSummary[];
+    readonly remoteAlreadyHadBranch?: boolean;
+    readonly divergence?: {
+        readonly aheadOfDefault: number;
+        readonly behindDefault: number;
+    };
+}
+export declare class PushBranchesValidationError extends Error {
+}
+export declare function pushBranchesForTask(options: {
+    readonly activeTask: ActiveWorkerTask;
+    readonly branches: readonly PushBranchRequest[];
+    readonly githubToken: string;
+}): Promise<{
+    readonly results: readonly PushBranchResult[];
+}>;
+//# sourceMappingURL=git-push-operations.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"git-push-operations.d.ts","sourceRoot":"","sources":["../../src/controller/git-push-operations.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAKlE,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC5B;AAED,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACvB;AASD,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,eAAe,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACxD,QAAQ,CAAC,gBAAgB,CAAC,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACzD,QAAQ,CAAC,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAC1C,QAAQ,CAAC,UAAU,CAAC,EAAE;QAAE,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC;CAC1F;AAED,qBAAa,2BAA4B,SAAQ,KAAK;CAAG;AAiMzD,wBAAsB,mBAAmB,CAAC,OAAO,EAAE;IAClD,QAAQ,CAAC,UAAU,EAAE,gBAAgB,CAAC;IACtC,QAAQ,CAAC,QAAQ,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAChD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC7B,GAAG,OAAO,CAAC;IAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,gBAAgB,EAAE,CAAA;CAAE,CAAC,CAsG7D"}