@agent-vm/agent-vm 0.0.31 → 0.0.33

package/dist/controller/controller-runtime.js

@@ -1,23 +1,25 @@
 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 { createToolVm } 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 { createSecretResolver, resolveControllerGithubToken, } from './controller-runtime-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 { ttlForLeaseScope } from './leases/lease-idle-policy.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;
+import { createOpenClawZoneRuntime } from './zone-runtimes/openclaw-zone-runtime.js';
+import { createWorkerZoneRuntime } from './zone-runtimes/worker-zone-runtime.js';
+import { createZoneRuntimeRegistry } from './zone-runtimes/zone-runtime-registry.js';
+const defaultLeaseIdleTtlPolicy = {
+    defaultMs: 30 * 60 * 1000,
+    byScopeKind: {},
+    byScopePrefix: {},
+};
 function writeControllerRuntimeLog(message) {
     process.stderr.write(`[agent-vm] ${message}\n`);
 }
@@ -27,12 +29,17 @@ function formatUnknownError(error) {
     }
     return typeof error === 'string' ? error : JSON.stringify(error);
 }
+function isOpenClawZone(zone) {
+    return zone.gateway.type === 'openclaw';
+}
+function isWorkerZone(zone) {
+    return zone.gateway.type === 'worker';
+}
 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,
@@ -45,15 +52,7 @@ export async function startControllerRuntime(options, dependencies) {
     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,
@@ -66,234 +65,122 @@ export async function startControllerRuntime(options, dependencies) {
     const idleReaper = createIdleReaper({
         getLeases: () => leaseManager.listLeases(),
         now,
-        releaseLease: async (leaseId) => {
-            await leaseManager.releaseLease(leaseId);
+        releaseLease: async (leaseId, releaseOptions) => {
+            await leaseManager.releaseLease(leaseId, releaseOptions);
         },
-        ttlMs: 30 * 60 * 1000,
+        ttlForLease: (lease) => ttlForLeaseScope({
+            policy: options.systemConfig.leaseIdleTtl ?? defaultLeaseIdleTtlPolicy,
+            scopeKey: lease.scopeKey,
+        }),
     });
-    const reaperTimer = (dependencies.setIntervalImpl ?? setInterval)(() => void idleReaper.reapExpiredLeases(), 60_000);
+    const reaperTimer = (dependencies.setIntervalImpl ?? setInterval)(() => void idleReaper
+        .reapExpiredLeases()
+        .catch((error) => writeControllerRuntimeLog(`Idle lease reaper failed: ${error instanceof Error ? error.message : String(error)}`)), 60_000);
     const clearReaperTimer = () => (dependencies.clearIntervalImpl ?? clearInterval)(reaperTimer);
     const releaseAllLeases = async () => {
-        let releaseError;
+        const releaseErrors = [];
         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));
+                releaseErrors.push(error instanceof Error ? error : new Error(formatUnknownError(error)));
                 writeControllerRuntimeLog(`Failed to release lease '${lease.id}' during controller shutdown: ${formatUnknownError(error)}`);
             }
         }
-        return releaseError;
+        return releaseErrors.length === 0
+            ? undefined
+            : new AggregateError(releaseErrors, 'Failed to release one or more leases.');
     };
-    const startGateway = async () => await (dependencies.startGatewayZone ?? startGatewayZone)({
-        runTask: runTaskStep,
-        secretResolver,
+    const registry = createZoneRuntimeRegistry({
+        createRuntimeForZone: (zone) => isOpenClawZone(zone)
+            ? createOpenClawZoneRuntime({
+                ...(dependencies.deleteGatewayRuntimeRecord
+                    ? { deleteGatewayRuntimeRecord: dependencies.deleteGatewayRuntimeRecord }
+                    : {}),
+                leaseManager,
+                now,
+                restartGatewayZone: async (zoneId) => await (dependencies.startGatewayZone ?? startGatewayZone)({
+                    runTask: runTaskStep,
+                    secretResolver,
+                    systemConfig: options.systemConfig,
+                    zoneId,
+                }),
+                secretResolver,
+                systemConfig: options.systemConfig,
+                zone,
+            })
+            : isWorkerZone(zone)
+                ? createWorkerZoneRuntime({
+                    activeTaskRegistry,
+                    ...(process.env.CALLER_URL ? { callerUrl: process.env.CALLER_URL } : {}),
+                    controllerGithubToken,
+                    ...(dependencies.executeWorkerTask
+                        ? { executeWorkerTask: dependencies.executeWorkerTask }
+                        : {}),
+                    ...(dependencies.onWorkerTaskFinished
+                        ? { onWorkerTaskFinished: dependencies.onWorkerTaskFinished }
+                        : {}),
+                    ...(dependencies.onWorkerTaskIngress
+                        ? { onWorkerTaskIngress: dependencies.onWorkerTaskIngress }
+                        : {}),
+                    ...(dependencies.onWorkerTaskPrepared
+                        ? { onWorkerTaskPrepared: dependencies.onWorkerTaskPrepared }
+                        : {}),
+                    ...(dependencies.prepareWorkerTask
+                        ? { prepareWorkerTask: dependencies.prepareWorkerTask }
+                        : {}),
+                    requestHeartbeatRegistry,
+                    secretResolver,
+                    systemConfig: options.systemConfig,
+                    zone,
+                })
+                : (() => {
+                    throw new Error(`Unsupported gateway type for zone '${zone.id}'.`);
+                })(),
+        ...(options.startupFailures ? { startupFailures: options.startupFailures } : {}),
         systemConfig: options.systemConfig,
-        zoneId: options.zoneId,
+        writeLog: writeControllerRuntimeLog,
+        ...(options.zoneIds ? { zoneIds: options.zoneIds } : {}),
+    });
+    await runTaskStep('Starting selected gateway zones', async () => {
+        await registry.startSelectedZones();
     });
-    const zone = findConfiguredZone(options.systemConfig, options.zoneId);
-    let gateway;
-    let gatewayBootedAt;
-    const requireGateway = () => {
-        if (!gateway) {
-            throw new Error('Gateway runtime is unavailable because the last restart did not complete.');
-        }
-        return gateway;
-    };
-    const setGateway = (startedGateway) => {
-        gateway = startedGateway;
-        gatewayBootedAt = new Date(now()).toISOString();
-    };
-    if (activeZone.gateway.type !== 'worker') {
-        await runTaskStep('Starting gateway zone', async () => {
-            setGateway(await startGateway());
-        });
-    }
-    const stopGatewayZone = async () => {
-        if (!gateway) {
-            return;
-        }
-        const activeGateway = gateway;
-        gateway = undefined;
-        gatewayBootedAt = 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();
-        setGateway(await startGateway());
-    };
     const serverRef = {};
     const stopController = createStopControllerOperation({
         clearReaperTimer,
-        closeControllerServer: () => setTimeout(() => void serverRef.current?.close(), 100),
+        closeControllerServer: async () => {
+            setTimeout(() => {
+                void serverRef.current?.close().catch((error) => {
+                    writeControllerRuntimeLog(`Failed to close controller HTTP server after stop request: ${formatUnknownError(error)}`);
+                });
+            }, 100);
+        },
         getLeases: () => leaseManager.listLeases(),
         releaseLease: async (leaseId) => await leaseManager.releaseLease(leaseId),
-        stopGatewayZone,
+        stopAllZones: async () => await registry.stopAllZones(),
     });
-    const controllerOperations = activeZone.gateway.type !== 'worker'
-        ? {
-            ...createControllerRuntimeOperations({
-                activeZoneId: options.zoneId,
-                getGateway: () => requireGateway(),
-                getGatewayBootedAt: () => gatewayBootedAt,
-                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 } : {}),
+        ...createControllerRuntimeOperations({
+            destroyZoneRuntime: async (zoneId, purge) => await registry.destroyZone(zoneId, purge),
+            getActiveLeases: () => leaseManager.listLeases(),
+            getOpenClawRuntime: (zoneId) => registry.getOpenClawRuntime(zoneId),
+            getRuntimeStatusByZone: () => registry.getSnapshotByZone(),
+            systemConfig: options.systemConfig,
+        }),
+        closeTaskForZone: async (zoneId, taskId) => await registry.getWorkerRuntime(zoneId).closeTaskForZone(taskId),
+        executeWorkerTask: async (prepared) => await registry.getWorkerRuntime(prepared.zoneId).executeWorkerTask(prepared),
+        getTaskState: async (zoneId, taskId) => await registry.getWorkerRuntime(zoneId).getTaskState(taskId),
+        prepareWorkerTask: async (zoneId, input) => await registry.getWorkerRuntime(zoneId).prepareWorkerTask(input),
+        pullDefaultForTask: async (zoneId, taskId, input) => await registry.getWorkerRuntime(zoneId).pullDefaultForTask(taskId, input),
+        pushTaskBranches: async (zoneId, taskId, input) => await registry.getWorkerRuntime(zoneId).pushTaskBranches(taskId, input),
+        stopController,
     };
     const controllerApp = createControllerService({
         leaseManager,
         operations,
+        secretResolver,
         systemConfig: options.systemConfig,
     });
     await runTaskStep(`Controller API on :${options.systemConfig.host.controllerPort}`, async () => {
@@ -303,31 +190,39 @@ export async function startControllerRuntime(options, dependencies) {
         });
     });
     await idleReaper.reapExpiredLeases();
+    const snapshotByZone = registry.getSnapshotByZone();
     return {
         async close() {
             clearReaperTimer();
             requestHeartbeatRegistry.stopAll();
             const releaseError = await releaseAllLeases();
+            let stopError;
             try {
-                await stopGatewayZone();
+                await registry.stopAllZones();
+            }
+            catch (error) {
+                stopError = error instanceof Error ? error : new Error(formatUnknownError(error));
             }
             finally {
                 await serverRef.current?.close();
             }
-            if (releaseError) {
-                throw releaseError;
+            const closeErrors = [releaseError, stopError].filter((error) => error !== undefined);
+            if (closeErrors.length === 1) {
+                throw closeErrors[0];
+            }
+            if (closeErrors.length > 1) {
+                throw new AggregateError(closeErrors, 'Controller shutdown failed in multiple steps.');
             }
         },
         controllerPort: options.systemConfig.host.controllerPort,
-        ...(gateway
-            ? {
-                gateway: {
-                    ingress: requireGateway().ingress,
-                    processSpec: requireGateway().processSpec,
-                    vm: requireGateway().vm,
-                },
-            }
-            : {}),
+        zones: registry.selectedZoneIds.map((zoneId) => {
+            const snapshot = snapshotByZone[zoneId] ?? { lifecycleState: 'stopped' };
+            const runtimeZone = {
+                lifecycleState: snapshot.lifecycleState,
+                zoneId,
+            };
+            return Object.assign(runtimeZone, snapshot.gateway ? { ingress: snapshot.gateway.ingress, vmId: snapshot.gateway.vm.id } : {}, snapshot.lastError ? { lastError: snapshot.lastError } : {});
+        }),
     };
 }
 //# sourceMappingURL=controller-runtime.js.map

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

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

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

@@ -1,6 +1,10 @@
+import type { TaskEvent } from '@agent-vm/agent-vm-worker';
 import type { ActiveWorkerTask } from './active-task-registry.js';
 export interface PullDefaultRequest {
     readonly repoUrl: string;
+    readonly currentBranch?: string | null | undefined;
+    readonly currentHead?: string | undefined;
+    readonly worktreeDirty?: boolean | undefined;
 }
 export interface PullDefaultCommitSummary {
     readonly sha: string;
@@ -8,27 +12,115 @@ export interface PullDefaultCommitSummary {
     readonly author?: string;
     readonly date?: string;
 }
-export interface PullDefaultResult {
+interface PullDefaultResultBase {
     readonly repoUrl: string;
-    readonly success: boolean;
-    readonly error?: string;
-    readonly defaultBranch?: string;
-    readonly remoteDefaultHead?: string;
-    readonly localDefaultHead?: string;
+    readonly message: string;
+}
+export type PullDefaultResult = PullDefaultAdvancedResult | PullDefaultRefusedNotFastForwardResult | PullDefaultFailedResult;
+export interface PullDefaultAdvancedResult extends PullDefaultResultBase {
+    readonly kind: 'advanced';
+    readonly success: true;
+    readonly defaultBranch: string;
+    readonly remoteDefaultHead: string;
+    readonly localDefaultHead: string;
     readonly currentBranch?: string | null;
-    readonly fetchedCommits?: readonly PullDefaultCommitSummary[];
-    readonly commitsSinceForkPoint?: readonly PullDefaultCommitSummary[];
-    readonly divergence?: {
+    readonly fetchedCommits: readonly PullDefaultCommitSummary[];
+    readonly commitsSinceForkPoint: readonly PullDefaultCommitSummary[];
+    readonly currentBranchSync?: PullCurrentBranchSyncResult;
+    readonly divergence: {
         readonly aheadOfDefault: number;
         readonly behindDefault: number;
         readonly forkPoint: string;
     };
 }
+export interface PullDefaultRefusedNotFastForwardResult extends PullDefaultResultBase {
+    readonly kind: 'refused-not-fast-forward';
+    readonly success: false;
+    readonly error: string;
+    readonly defaultBranch: string;
+    readonly remoteDefaultHead: string;
+}
+export interface PullDefaultFailedResult extends PullDefaultResultBase {
+    readonly kind: 'failed';
+    readonly success: false;
+    readonly error: string;
+}
+export type PullCurrentBranchSyncResult = PullCurrentBranchAheadResult | PullCurrentBranchDefaultBranchResult | PullCurrentBranchDetachedResult | PullCurrentBranchDirtyWorktreeResult | PullCurrentBranchDivergedResult | PullCurrentBranchFastForwardedResult | PullCurrentBranchNoUpstreamResult | PullCurrentBranchUpToDateResult;
+interface PullCurrentBranchBaseResult {
+    readonly status: 'ahead' | 'default-branch' | 'detached' | 'dirty-worktree' | 'diverged' | 'fast-forwarded' | 'no-upstream' | 'up-to-date';
+    readonly branch: string | null;
+    readonly upstreamTrackingRef: string | null;
+}
+export interface PullCurrentBranchAheadResult extends PullCurrentBranchBaseResult {
+    readonly status: 'ahead';
+    readonly branch: string;
+    readonly upstreamTrackingRef: string;
+    readonly localHead: string;
+    readonly remoteHead: string;
+    readonly reason: string;
+}
+export interface PullCurrentBranchDefaultBranchResult extends PullCurrentBranchBaseResult {
+    readonly status: 'default-branch';
+    readonly branch: string;
+    readonly upstreamTrackingRef: string;
+    readonly localHead: string;
+    readonly remoteHead: string;
+    readonly reason: string;
+}
+export interface PullCurrentBranchDetachedResult extends PullCurrentBranchBaseResult {
+    readonly status: 'detached';
+    readonly branch: null;
+    readonly upstreamTrackingRef: null;
+    readonly localHead: string;
+    readonly reason: string;
+}
+export interface PullCurrentBranchDirtyWorktreeResult extends PullCurrentBranchBaseResult {
+    readonly status: 'dirty-worktree';
+    readonly branch: string;
+    readonly upstreamTrackingRef: string;
+    readonly localHead: string;
+    readonly remoteHead: string;
+    readonly reason: string;
+}
+export interface PullCurrentBranchDivergedResult extends PullCurrentBranchBaseResult {
+    readonly status: 'diverged';
+    readonly branch: string;
+    readonly upstreamTrackingRef: string;
+    readonly localHead: string;
+    readonly remoteHead: string;
+    readonly reason: string;
+}
+export interface PullCurrentBranchFastForwardedResult extends PullCurrentBranchBaseResult {
+    readonly status: 'fast-forwarded';
+    readonly branch: string;
+    readonly upstreamTrackingRef: string;
+    readonly localHead: string;
+    readonly remoteHead: string;
+}
+export interface PullCurrentBranchNoUpstreamResult extends PullCurrentBranchBaseResult {
+    readonly status: 'no-upstream';
+    readonly branch: string;
+    readonly upstreamTrackingRef: null;
+    readonly localHead?: string;
+    readonly reason: string;
+}
+export interface PullCurrentBranchUpToDateResult extends PullCurrentBranchBaseResult {
+    readonly status: 'up-to-date';
+    readonly branch: string;
+    readonly upstreamTrackingRef: string;
+    readonly localHead: string;
+    readonly remoteHead: string;
+}
 export declare class PullDefaultValidationError extends Error {
 }
 export declare function pullDefaultForTask(options: {
     readonly activeTask: ActiveWorkerTask;
+    readonly currentBranch?: string | null;
+    readonly currentHead?: string;
     readonly repoUrl: string;
     readonly githubToken: string;
+    readonly recordEvent?: (event: TaskEvent) => Promise<void>;
+    readonly worktreeDirty?: boolean;
 }): Promise<PullDefaultResult>;
+export {};
 //# sourceMappingURL=git-pull-default-operations.d.ts.map

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

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