@cleocode/core 2026.9.23 → 2026.9.25

package/dist/snapshot/index.js

@@ -13,6 +13,7 @@ import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { resolveCleoDir } from '../paths.js';
 import { getTaskAccessor } from '../store/data-accessor.js';
+import { queryTasksIncludingArchived } from '../store/import-remap.js';
 /** Snapshot format version. */
 const SNAPSHOT_FORMAT_VERSION = '1.0.0';
 /**
@@ -125,7 +126,9 @@ export function getDefaultSnapshotPath(cwd) {
 // SSoT-EXEMPT: snapshot fns use file-path/cwd args, not projectRoot+params; distinct from dispatch API signature convention per ADR-057 D1
 export async function importSnapshot(snapshot, cwd) {
     const accessor = await getTaskAccessor(cwd);
-    const { tasks: localTasks } = await accessor.queryTasks({});
+    // Every stored task, archived included: an archived task is still local, so
+    // re-importing a snapshot that holds it stays idempotent (T12724).
+    const localTasks = await queryTasksIncludingArchived(accessor);
     const result = {
         added: 0,
         updated: 0,
@@ -133,60 +136,64 @@ export async function importSnapshot(snapshot, cwd) {
         conflicts: [],
     };
     const localTaskMap = new Map(localTasks.map((t) => [t.id, t]));
-    for (const snapshotTask of snapshot.tasks) {
-        const localTask = localTaskMap.get(snapshotTask.id);
-        if (!localTask) {
-            // New task -- add it
-            const newTask = {
-                id: snapshotTask.id,
-                title: snapshotTask.title,
-                status: snapshotTask.status,
-                priority: snapshotTask.priority,
-                type: snapshotTask.type,
-                parentId: snapshotTask.parentId,
-                size: snapshotTask.size,
-                phase: snapshotTask.phase,
-                description: snapshotTask.description ?? '',
-                depends: snapshotTask.depends,
-                labels: snapshotTask.labels,
-                createdAt: snapshotTask.createdAt,
-                updatedAt: snapshotTask.updatedAt,
-                completedAt: snapshotTask.completedAt,
-            };
-            await accessor.upsertSingleTask(newTask);
-            result.added++;
-            continue;
-        }
-        // Task exists locally -- compare timestamps
-        const localUpdated = localTask.updatedAt ?? localTask.createdAt;
-        const snapshotUpdated = snapshotTask.updatedAt ?? snapshotTask.createdAt;
-        if (snapshotUpdated > localUpdated) {
-            // Snapshot is newer -- update local via upsert (preserves fields not in snapshot)
-            const updatedTask = {
-                ...localTask,
-                title: snapshotTask.title,
-                status: snapshotTask.status,
-                priority: snapshotTask.priority,
-                ...(snapshotTask.description != null && { description: snapshotTask.description }),
-                ...(snapshotTask.labels != null && { labels: snapshotTask.labels }),
-                ...(snapshotTask.depends != null && { depends: snapshotTask.depends }),
-                updatedAt: snapshotTask.updatedAt,
-                ...(snapshotTask.completedAt != null && { completedAt: snapshotTask.completedAt }),
-            };
-            await accessor.upsertSingleTask(updatedTask);
-            result.updated++;
-        }
-        else if (snapshotUpdated === localUpdated) {
-            result.skipped++;
-        }
-        else {
-            // Local is newer -- skip but note conflict
-            result.skipped++;
-            if (localTask.title !== snapshotTask.title || localTask.status !== snapshotTask.status) {
-                result.conflicts.push(`${snapshotTask.id}: local is newer (local: ${localUpdated}, snapshot: ${snapshotUpdated})`);
+    // One transaction: a collision on any task leaves nothing half-imported (T12724).
+    await accessor.transaction(async (tx) => {
+        for (const snapshotTask of snapshot.tasks) {
+            const localTask = localTaskMap.get(snapshotTask.id);
+            if (!localTask) {
+                // New task -- add it
+                const newTask = {
+                    id: snapshotTask.id,
+                    title: snapshotTask.title,
+                    status: snapshotTask.status,
+                    priority: snapshotTask.priority,
+                    type: snapshotTask.type,
+                    parentId: snapshotTask.parentId,
+                    size: snapshotTask.size,
+                    phase: snapshotTask.phase,
+                    description: snapshotTask.description ?? '',
+                    depends: snapshotTask.depends,
+                    labels: snapshotTask.labels,
+                    createdAt: snapshotTask.createdAt,
+                    updatedAt: snapshotTask.updatedAt,
+                    completedAt: snapshotTask.completedAt,
+                };
+                // Missing locally: insert, never overwrite a task stored since (T12724).
+                await tx.insertNewTask(newTask);
+                result.added++;
+                continue;
+            }
+            // Task exists locally -- compare timestamps
+            const localUpdated = localTask.updatedAt ?? localTask.createdAt;
+            const snapshotUpdated = snapshotTask.updatedAt ?? snapshotTask.createdAt;
+            if (snapshotUpdated > localUpdated) {
+                // Snapshot is newer -- update local via upsert (preserves fields not in snapshot)
+                const updatedTask = {
+                    ...localTask,
+                    title: snapshotTask.title,
+                    status: snapshotTask.status,
+                    priority: snapshotTask.priority,
+                    ...(snapshotTask.description != null && { description: snapshotTask.description }),
+                    ...(snapshotTask.labels != null && { labels: snapshotTask.labels }),
+                    ...(snapshotTask.depends != null && { depends: snapshotTask.depends }),
+                    updatedAt: snapshotTask.updatedAt,
+                    ...(snapshotTask.completedAt != null && { completedAt: snapshotTask.completedAt }),
+                };
+                await tx.upsertSingleTask(updatedTask);
+                result.updated++;
+            }
+            else if (snapshotUpdated === localUpdated) {
+                result.skipped++;
+            }
+            else {
+                // Local is newer -- skip but note conflict
+                result.skipped++;
+                if (localTask.title !== snapshotTask.title || localTask.status !== snapshotTask.status) {
+                    result.conflicts.push(`${snapshotTask.id}: local is newer (local: ${localUpdated}, snapshot: ${snapshotUpdated})`);
+                }
             }
         }
-    }
+    });
     return result;
 }
 //# sourceMappingURL=index.js.map

package/dist/snapshot/index.js.map

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

package/dist/spawn/agent-identity.d.ts

@@ -17,6 +17,7 @@
  * @epic T11284
  */
 import type { Session } from '@cleocode/contracts';
+import { type SpawnClaimReceipt } from '../task-work/claims.js';
 /**
  * Resolved per-agent spawn identity returned by {@link allocateSpawnSession}.
  *
@@ -88,6 +89,11 @@ export declare function electSpawnSession(candidates: readonly Session[]): Sessi
 export type SpawnSessionResolution = {
     readonly ok: true;
     readonly identity: SpawnAgentIdentity;
+    /**
+     * The task claim this spawn took (T12502). Pass the resolution to
+     * {@link abandonSpawnSession} when the spawn fails after this point.
+     */
+    readonly claim: SpawnClaimReceipt;
 } | {
     readonly ok: false;
     /**
@@ -100,8 +106,13 @@ export type SpawnSessionResolution = {
     readonly exitCode: number;
     readonly message: string;
     readonly fix: string;
-    /** Why allocation failed. */
+    /** Why allocation (or the task claim) failed. */
     readonly cause: string;
+    /**
+     * Structured refusal details — for `E_TASK_CLAIMED`, the
+     * `TaskClaimedDetails` naming the holder and lease expiry (T12502).
+     */
+    readonly details?: Record<string, unknown>;
 };
 /**
  * Allocate the spawned agent's OWN session, or refuse the spawn (T12500 · epic T12497).
@@ -115,9 +126,30 @@ export type SpawnSessionResolution = {
  *
  * @param projectRoot - Absolute path to the project root.
  * @param taskId - The task being spawned.
+ * T12502: the spawned session then takes the task's claim lease
+ * ({@link claimSpawnedTask}). Another session's claim refuses the spawn with
+ * `E_TASK_CLAIMED` naming the holder, and a session created for this refused
+ * spawn is ended again so it does not leak.
+ *
  * @param allocate - Allocation strategy (defaults to {@link allocateSpawnSession}; tests inject failures).
  * @returns The explicit per-agent identity, or a typed refusal.
  * @task T12500
+ * @task T12502
  */
 export declare function requireSpawnSession(projectRoot: string, taskId: string, allocate?: (root: string, id: string) => Promise<SpawnAgentIdentity>): Promise<SpawnSessionResolution>;
+/**
+ * Undo a {@link requireSpawnSession} whose spawn then failed (T12502): give
+ * the task claim back to its previous holder (the orchestrator on a
+ * hand-off) and end the per-agent session if this spawn created it, so a
+ * failed spawn strands neither a lease nor an active session. A re-spawn's
+ * reused session and its own earlier lease are kept. Best-effort.
+ *
+ * @param projectRoot - Absolute path to the project root.
+ * @param taskId - The task whose spawn failed.
+ * @param resolution - The successful resolution returned for this spawn.
+ * @task T12502
+ */
+export declare function abandonSpawnSession(projectRoot: string, taskId: string, resolution: Extract<SpawnSessionResolution, {
+    ok: true;
+}>): Promise<void>;
 //# sourceMappingURL=agent-identity.d.ts.map

package/dist/spawn/agent-identity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-identity.d.ts","sourceRoot":"","sources":["../../src/spawn/agent-identity.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAQnD;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,oEAAoE;IACpE,SAAS,EAAE,MAAM,CAAC;IAClB,kEAAkE;IAClE,OAAO,EAAE,MAAM,CAAC;IAChB,+DAA+D;IAC/D,WAAW,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAExD;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CA4C7B;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,GAAG,SAAS,CAIrF;AAED,2FAA2F;AAC3F,MAAM,MAAM,sBAAsB,GAC9B;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAA;CAAE,GAC5D;IACE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB;;;;OAIG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,+CAA+C;IAC/C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,6BAA6B;IAC7B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB,CAAC;AAEN;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,QAAQ,GAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,kBAAkB,CAAwB,GACzF,OAAO,CAAC,sBAAsB,CAAC,CAmBjC"}
+{"version":3,"file":"agent-identity.d.ts","sourceRoot":"","sources":["../../src/spawn/agent-identity.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAIH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAQnD,OAAO,EAGL,KAAK,iBAAiB,EACvB,MAAM,wBAAwB,CAAC;AAEhC;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,oEAAoE;IACpE,SAAS,EAAE,MAAM,CAAC;IAClB,kEAAkE;IAClE,OAAO,EAAE,MAAM,CAAC;IAChB,+DAA+D;IAC/D,WAAW,EAAE,MAAM,CAAC;IACpB;;;OAGG;IACH,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAExD;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CA4C7B;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,SAAS,OAAO,EAAE,GAAG,OAAO,GAAG,SAAS,CAIrF;AAED,2FAA2F;AAC3F,MAAM,MAAM,sBAAsB,GAC9B;IACE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAClB,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC;IACtC;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,iBAAiB,CAAC;CACnC,GACD;IACE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IACnB;;;;OAIG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,+CAA+C;IAC/C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,iDAAiD;IACjD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB;;;OAGG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC5C,CAAC;AAEN;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,QAAQ,GAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,kBAAkB,CAAwB,GACzF,OAAO,CAAC,sBAAsB,CAAC,CA6CjC;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,OAAO,CAAC,sBAAsB,EAAE;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,CAAC,GACxD,OAAO,CAAC,IAAI,CAAC,CAQf"}

package/dist/spawn/agent-identity.js

@@ -24,6 +24,8 @@ import { CleoError } from '../errors.js';
 import { generateSessionId } from '../sessions/session-id.js';
 import { getTaskAccessor } from '../store/data-accessor.js';
 import { withLock } from '../store/lock.js';
+import { endSession } from '../store/session-store.js';
+import { claimSpawnedTask, releaseSpawnClaim, } from '../task-work/claims.js';
 /**
  * Derive a deterministic agent handle for a spawned task.
  *
@@ -123,13 +125,20 @@ export function electSpawnSession(candidates) {
  *
  * @param projectRoot - Absolute path to the project root.
  * @param taskId - The task being spawned.
+ * T12502: the spawned session then takes the task's claim lease
+ * ({@link claimSpawnedTask}). Another session's claim refuses the spawn with
+ * `E_TASK_CLAIMED` naming the holder, and a session created for this refused
+ * spawn is ended again so it does not leak.
+ *
  * @param allocate - Allocation strategy (defaults to {@link allocateSpawnSession}; tests inject failures).
  * @returns The explicit per-agent identity, or a typed refusal.
  * @task T12500
+ * @task T12502
  */
 export async function requireSpawnSession(projectRoot, taskId, allocate = allocateSpawnSession) {
+    let identity;
     try {
-        return { ok: true, identity: await allocate(projectRoot, taskId) };
+        identity = await allocate(projectRoot, taskId);
     }
     catch (err) {
         const cause = err instanceof Error ? err.message : String(err);
@@ -145,5 +154,48 @@ export async function requireSpawnSession(projectRoot, taskId, allocate = alloca
             cause,
         };
     }
+    let claim;
+    try {
+        claim = await claimSpawnedTask(projectRoot, taskId, {
+            sessionId: identity.sessionId,
+            agentId: identity.agentId,
+        });
+    }
+    catch (err) {
+        if (!identity.reused) {
+            await endSession(identity.sessionId, 'spawn refused: task claimed', projectRoot).catch(() => undefined);
+        }
+        const cause = err instanceof Error ? err.message : String(err);
+        const cleo = err instanceof CleoError ? err : undefined;
+        return {
+            ok: false,
+            code: (cleo && getErrorDefinition(cleo.code)?.lafsCode) ?? 'E_INTERNAL',
+            exitCode: cleo?.code ?? ExitCode.GENERAL_ERROR,
+            message: `Refusing to spawn ${taskId}: ${cause}`,
+            fix: cleo?.fix ?? "Check the task store with 'cleo doctor', then retry the spawn.",
+            cause,
+            ...(cleo?.details ? { details: cleo.details } : {}),
+        };
+    }
+    return { ok: true, identity, claim };
+}
+/**
+ * Undo a {@link requireSpawnSession} whose spawn then failed (T12502): give
+ * the task claim back to its previous holder (the orchestrator on a
+ * hand-off) and end the per-agent session if this spawn created it, so a
+ * failed spawn strands neither a lease nor an active session. A re-spawn's
+ * reused session and its own earlier lease are kept. Best-effort.
+ *
+ * @param projectRoot - Absolute path to the project root.
+ * @param taskId - The task whose spawn failed.
+ * @param resolution - The successful resolution returned for this spawn.
+ * @task T12502
+ */
+export async function abandonSpawnSession(projectRoot, taskId, resolution) {
+    const { identity, claim } = resolution;
+    await releaseSpawnClaim(projectRoot, taskId, identity.sessionId, claim);
+    if (!identity.reused) {
+        await endSession(identity.sessionId, 'spawn failed before dispatch', projectRoot).catch(() => undefined);
+    }
 }
 //# sourceMappingURL=agent-identity.js.map

package/dist/spawn/agent-identity.js.map

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

package/dist/spawn/branch-lock.d.ts

@@ -167,6 +167,100 @@ export declare function pruneWorktree(taskId: string, projectRoot: string, opts?
  * @adr ADR-062
  */
 export declare function getDefaultBranch(projectRoot: string): string;
+/**
+ * Verdict of {@link assessUpstreamIntegration}.
+ *
+ * - `landed` — the task branch is already on the upstream default branch
+ *   (ancestor of it, or its changes are fully contained in it). No local
+ *   merge may run.
+ * - `nothing` — the task branch has no commits beyond the local default
+ *   branch (e.g. a worktree that was never committed to). There is nothing to
+ *   integrate, and it is NOT reported as landed upstream.
+ * - `stale-target` — the local default branch is behind the upstream default
+ *   branch (possibly also ahead of it — diverged); a merge there would fork it
+ *   from upstream. No local merge may run.
+ * - `proceed` — no upstream to compare against, or the local default branch is
+ *   current; the ADR-062 local `--no-ff` integration may run.
+ *
+ * @task T12773
+ */
+export type UpstreamIntegrationKind = 'landed' | 'nothing' | 'stale-target' | 'proceed';
+/**
+ * Result of {@link assessUpstreamIntegration}.
+ *
+ * @task T12773
+ */
+export interface UpstreamIntegrationAssessment {
+    /** What the caller may do next. */
+    kind: UpstreamIntegrationKind;
+    /** Remote-tracking ref compared against (e.g. `refs/remotes/origin/main`), or null. */
+    upstreamRef: string | null;
+    /**
+     * True when this assessment ran `git fetch <remote> <targetBranch>` (whether
+     * or not it succeeded), so a later integration step need not fetch again.
+     */
+    fetched: boolean;
+    /** Commits on the upstream ref missing from the local default branch. */
+    behind: number;
+    /** Commits on the local default branch missing from the upstream ref. */
+    ahead: number;
+    /**
+     * Exact shell command that syncs the local default branch with upstream,
+     * or empty when no sync is needed. NEVER run by CLEO — the operator's
+     * checkout is never moved (hint-only policy).
+     */
+    syncCommand: string;
+    /** Operator-facing explanation / next step (empty for `proceed`). */
+    hint: string;
+}
+/**
+ * Default timeout for the upstream `git fetch` in
+ * {@link assessUpstreamIntegration}. Short on purpose: the fetch is
+ * best-effort, and a hung network or credential prompt must never stall
+ * `cleo done` for the 180s generic git timeout.
+ *
+ * @task T12773
+ */
+export declare const UPSTREAM_FETCH_TIMEOUT_MS = 20000;
+/**
+ * Decide whether a local ADR-062 `--no-ff` integration of `branch` into
+ * `targetBranch` is safe, by comparing against the upstream default branch
+ * (`<remote>/<targetBranch>`).
+ *
+ * T12773: `cleo done --pr <n>` for a task whose PR had already merged on
+ * origin ran `git merge --no-ff task/<id>` into a local `main` that was 199
+ * commits behind origin, creating a local merge commit that forked `main`
+ * from `origin/main`. This check runs BEFORE any checkout or merge:
+ *
+ * - branch has no commits beyond the local default branch → `nothing`.
+ * - branch already on upstream → `landed`; when the local default branch is
+ *   behind, the hint names the exact sync command. The checkout is never
+ *   moved (hint-only).
+ * - local default branch behind upstream → `stale-target`; a distinct hint
+ *   when it is also ahead (diverged: unpushed local commits).
+ * - otherwise (no remote, no upstream ref, current target) → `proceed`.
+ *
+ * The fetch is best-effort, non-interactive (`GIT_TERMINAL_PROMPT=0`, ssh
+ * `BatchMode`) and bounded by {@link UPSTREAM_FETCH_TIMEOUT_MS}; offline, the
+ * last-known remote-tracking ref is used. Never creates a commit and never
+ * moves any ref other than the remote-tracking one the fetch updates.
+ *
+ * @param gitRoot - Absolute git root of the project checkout.
+ * @param branch - Task branch (e.g. `task/T123`).
+ * @param targetBranch - Resolved default branch (e.g. `main`).
+ * @param opts.skipFetch - Skip `git fetch <remote> <targetBranch>` (fixtures).
+ * @param opts.remote - Remote name (default `origin`).
+ * @param opts.fetchTimeoutMs - Fetch timeout (default {@link UPSTREAM_FETCH_TIMEOUT_MS}).
+ * @returns The assessment.
+ *
+ * @task T12773
+ * @adr ADR-062
+ */
+export declare function assessUpstreamIntegration(gitRoot: string, branch: string, targetBranch: string, opts?: {
+    skipFetch?: boolean;
+    remote?: string;
+    fetchTimeoutMs?: number;
+}): UpstreamIntegrationAssessment;
 /**
  * Complete a worker task's worktree via `git merge --no-ff` (ADR-062).
  *
@@ -179,12 +273,19 @@ export declare function getDefaultBranch(projectRoot: string): string;
  *
  * 1. Resolve target branch via {@link getDefaultBranch} (or `opts.targetBranch`
  *    override). NEVER hardcodes "main".
- * 2. `git fetch origin` then `git rebase origin/<targetBranch>` inside the
- *    worktree. Conflicts cause an early non-fatal return — the agent must
- *    re-resolve before completion.
- * 3. From the project's git root on `<targetBranch>`, run
- *    `git merge --no-ff task/<taskId> -m "Merge T<id>: <title>"` so the
- *    merge commit subject is `git log --grep`-friendly.
+ * 1a. T12773: {@link assessUpstreamIntegration} — when `task/<id>` already
+ *    landed on `origin/<targetBranch>` the merge is skipped
+ *    (`landedUpstream: true`); when it has no commits beyond the local
+ *    target it is `nothingToIntegrate` without `landedUpstream`; when the
+ *    local target is behind (or diverged from) origin the merge is refused
+ *    (`staleTarget: true`) with a `hint`. None of these paths creates a
+ *    commit or moves the operator's checkout — syncing is hint-only.
+ * 2. Optionally `git fetch` (skipped when step 1a already fetched), then
+ *    `git checkout <targetBranch>` in the project's git root. The task
+ *    branch is NOT rebased — agent SHAs are preserved.
+ * 3. Run `git merge --no-ff task/<taskId> -m "<taskId>: <title> (worktree
+ *    merge)"`; a failed merge is aborted so the repo is left clean, and the
+ *    worktree is preserved.
  * 4. Capture the merge commit SHA and report it.
  * 5. Delegate worktree+branch removal to {@link pruneWorktree} (T1462).
  *
@@ -195,7 +296,9 @@ export declare function getDefaultBranch(projectRoot: string): string;
  * @param projectRoot - Absolute path to the project root.
  * @param opts.targetBranch - Override the resolved default branch.
  * @param opts.taskTitle - Task title used in the merge commit message subject.
- * @param opts.skipFetch - Skip the `git fetch origin` step (test fixtures).
+ * @param opts.skipFetch - Skip every `git fetch` (test fixtures).
+ * @param opts.fetchTimeoutMs - Timeout for the upstream fetch (default
+ *   {@link UPSTREAM_FETCH_TIMEOUT_MS}).
  * @returns Merge integration result.
  *
  * @task T1587
@@ -205,6 +308,7 @@ export declare function completeAgentWorktreeViaMerge(taskId: string, projectRoo
     targetBranch?: string;
     taskTitle?: string;
     skipFetch?: boolean;
+    fetchTimeoutMs?: number;
 }): WorktreeMergeResult;
 /**
  * Result of a complete post-merge worktree integration.

package/dist/spawn/branch-lock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branch-lock.d.ts","sourceRoot":"","sources":["../../src/spawn/branch-lock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"branch-lock.d.ts","sourceRoot":"","sources":["../../src/spawn/branch-lock.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;GAmBG;AAgBH,OAAO,KAAK,EACV,kBAAkB,EAClB,oBAAoB,EACpB,aAAa,EACb,qBAAqB,EACrB,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAc7B,OAAO,EAEL,UAAU,EAOX,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,UAAU,EAAE,CAAC;AAMtB;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAGpE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,kBAAkB,CAqE3F;AAeD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,kBAAkB,EAC5B,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAO,GACpE,mBAAmB,CA+CrB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,sBAAsB,CACpC,WAAW,EAAE,MAAM,EACnB,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,GACpB,qBAAqB,CASvB;AAED;;;;GAIG;AACH,MAAM,WAAW,mBAAmB;IAClC,2CAA2C;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,uFAAuF;IACvF,MAAM,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC;IACvC,kDAAkD;IAClD,eAAe,EAAE,OAAO,CAAC;IACzB,2CAA2C;IAC3C,aAAa,EAAE,OAAO,CAAC;IACvB,4EAA4E;IAC5E,QAAQ,EAAE,OAAO,CAAC;IAClB,wCAAwC;IACxC,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAwBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,IAAI,GAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAA;CAAO,GACnC,mBAAmB,CAkJrB;AAiBD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CA4C5D;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,MAAM,uBAAuB,GAAG,QAAQ,GAAG,SAAS,GAAG,cAAc,GAAG,SAAS,CAAC;AAExF;;;;GAIG;AACH,MAAM,WAAW,6BAA6B;IAC5C,mCAAmC;IACnC,IAAI,EAAE,uBAAuB,CAAC;IAC9B,uFAAuF;IACvF,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B;;;OAGG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB,yEAAyE;IACzE,MAAM,EAAE,MAAM,CAAC;IACf,yEAAyE;IACzE,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB,qEAAqE;IACrE,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,yBAAyB,QAAS,CAAC;AAiGhD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,IAAI,GAAE;IAAE,SAAS,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,cAAc,CAAC,EAAE,MAAM,CAAA;CAAO,GAC3E,6BAA6B,CA+F/B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAgB,6BAA6B,CAC3C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,IAAI,GAAE;IACJ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;CACpB,GACL,mBAAmB,CAiKrB;AAMD;;;;;;;GAOG;AACH,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB;IACpE,6DAA6D;IAC7D,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,IAAI,GAAE;IACJ,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CAClB,GACL,yBAAyB,CAgC3B;AAuBD;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CA2C5D;AAMD;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,IAAI,oBAAoB,CA+BjE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,aAAa,CAyC/F;AAED;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,WAAW,EAAE,aAAa,GAAG,IAAI,CA0B/D;AAMD;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,cAAc,EAAE,mBAAmB,EACnC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAyC,GACtE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAExB"}