@cleocode/core 2026.10.23 → 2026.10.24-rc.ci.695

package/dist/orchestrate/worktree-complete.js

@@ -40,7 +40,6 @@
  */
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { getLogger } from '../logger.js';
 import { completeAgentWorktreeIntegration, resolveAgentWorktreeRoot, } from '../spawn/branch-lock.js';
 import { appendWorktreeAuditEntry, resolveWorktreeAuditActor, WORKTREE_LIFECYCLE_AUDIT_FILE, } from '../worktree/audit.js';
 // ---------------------------------------------------------------------------
@@ -231,6 +230,57 @@ export function completeWorktreeForTask(taskId, projectRoot, opts = {}) {
                 : `No worktree or task branch for ${taskId} — nothing to integrate (task was not worked on a task branch).`,
         };
     }
+    // ---- Not provisioned by CLEO: never merged (T14053). --------------------
+    if (integration.notProvisioned) {
+        appendWorktreeAuditEntry(projectRoot, {
+            actor,
+            action: 'complete-skip',
+            target: worktreePath,
+            branch,
+            taskId,
+            reason: `'${branch}' not provisioned by CLEO — not merged (T14053)`,
+            success: true,
+        }, opts.lifecycleAuditPath);
+        return {
+            taskId,
+            outcome: 'noop',
+            integration,
+            reason: integration.hint ?? `'${branch}' was not provisioned by CLEO, so it is not merged.`,
+        };
+    }
+    // ---- Main checkout would be disturbed: refused before any merge. -------
+    //
+    // T14053 — the merge checks out the default branch in the main checkout, so
+    // a checkout on another branch or with uncommitted tracked changes is left
+    // alone. Nothing was switched or merged; the worktree is preserved.
+    if (integration.rootRefused) {
+        appendWorktreeAuditEntry(projectRoot, 
+        // @sync-invariant none:local-only the main checkout's git state on this machine; an audit-file row, never replicated
+        {
+            actor,
+            action: 'complete-conflict',
+            target: worktreePath,
+            branch,
+            taskId,
+            reason: 'main checkout not mergeable as-is — local merge refused (T14053)',
+            success: false,
+            error: integration.error,
+        }, opts.lifecycleAuditPath);
+        return {
+            taskId,
+            outcome: 'conflict',
+            integration,
+            reason: `Local merge refused: ${integration.error ?? 'the main checkout cannot take it'}`,
+            recovery: {
+                worktreePath,
+                branch,
+                steps: [
+                    `git -C ${JSON.stringify(projectRoot)} status   # needs '${integration.targetBranch}' checked out, no uncommitted changes`,
+                    `cleo orchestrate worktree-complete ${taskId}`,
+                ],
+            },
+        };
+    }
     // ---- Stale target: refused before any merge, not a conflict. ------------
     //
     // T12773 — the local default branch is behind (or diverged from) origin,
@@ -298,12 +348,12 @@ export function completeWorktreeForTask(taskId, projectRoot, opts = {}) {
  */
 export { WORKTREE_LIFECYCLE_AUDIT_FILE };
 // ---------------------------------------------------------------------------
-// Auto-invoke wrapper for cleo complete <taskId> (Saga T10176 · D010)
+// Integration opt-out for cleo complete <taskId> (T9548 · T14053)
 // ---------------------------------------------------------------------------
 /**
  * Environment variable that, when set to a truthy value (`'1'`, `'true'`,
- * any non-empty string other than `'0'` / `'false'`), disables the
- * auto-invoke wrapper {@link maybeAutoCompleteWorktreeForTask}.
+ * any non-empty string other than `'0'` / `'false'`), switches off the worktree
+ * integration `cleo complete` runs, like `--no-integrate` (T14053).
  *
  * Use this for manual flows where the operator wants to inspect the worktree
  * before integration, or for CI smoke tests that exercise `cleo complete`
@@ -331,82 +381,26 @@ export function isAutoWorktreeCompleteDisabled(env = process.env) {
     return true;
 }
 /**
- * Best-effort wrapper that auto-invokes {@link completeWorktreeForTask} from
- * the `cleo complete <taskId>` path.
- *
- * Behaviour:
+ * Why completion leaves the task's worktree branch alone, or `undefined` when
+ * it integrates: `--no-integrate` first, then {@link AUTO_WORKTREE_COMPLETE_ENV}.
+ * `cleo complete` and `cleo done --plan` share it, so both say the same (T14053).
  *
- * 1. **Env skip** — when {@link AUTO_WORKTREE_COMPLETE_ENV} is set, the
- *    wrapper returns `outcome: 'env-disabled'` and NEVER touches git or the
- *    audit log. No `complete` audit row is written.
- * 2. **Worktree absence** — when no CLEO worktree exists for the task
- *    (under {@link resolveAgentWorktreeRoot}), the wrapper returns
- *    `outcome: 'no-worktree'` immediately. Idempotent: re-running a second
- *    time produces the same envelope. The wrapper writes NO audit row in
- *    this case — the absence of a worktree is the natural identity element
- *    for "already complete".
- * 3. **SDK invoke** — otherwise the wrapper calls
- *    {@link completeWorktreeForTask} and maps its outcome into the
- *    diagnostic envelope. The SDK itself owns audit-row emission for every
- *    real lifecycle event (`complete`, `complete-skip`, `complete-conflict`,
- *    `complete-manual`).
- * 4. **Never throw** — the SDK call is wrapped in `try/catch`. A throw is
- *    surfaced as `outcome: 'sdk-threw'` with the message in `reason`, so the
- *    parent `cleo complete` envelope is never derailed by an auto-merge
- *    hiccup. The task completion has already landed — the worktree integration
- *    is strictly a best-effort post-step.
+ * @param noIntegrate - Whether `--no-integrate` was passed.
+ * @param env - Environment to read (defaults to `process.env`).
+ * @returns The skip reason, or `undefined`.
  *
- * @param taskId       - Task ID whose worktree should be integrated.
- * @param projectRoot  - Absolute path to the project root (canonical, NOT the
- *                       worktree path — `getProjectRoot()` already walks up
- *                       from a worktree gitlink to the main repo, see T9092).
- * @param opts         - Optional pass-through to {@link CompleteWorktreeForTaskOpts}
- *                       (used by tests to override audit paths + skip fetch).
- * @returns Diagnostic envelope describing what happened.
- *
- * @task T9548
+ * @example
+ * ```ts
+ * integrationDisabledReason(true); // '--no-integrate was passed; …'
+ * ```
+ * @task T14053
  */
-export function maybeAutoCompleteWorktreeForTask(taskId, projectRoot, opts = {}) {
-    const log = getLogger('orchestrate:auto-complete');
-    // 1. Env-var skip.
-    if (isAutoWorktreeCompleteDisabled()) {
-        log.debug({ taskId, env: AUTO_WORKTREE_COMPLETE_ENV }, 'auto-worktree-complete disabled via env-var — skipping');
-        return {
-            ran: false,
-            outcome: 'env-disabled',
-            reason: `${AUTO_WORKTREE_COMPLETE_ENV} is set — auto-merge skipped`,
-        };
-    }
-    // 2. Worktree absence check.
-    const worktreeRoot = resolveAgentWorktreeRoot(projectRoot);
-    const worktreePath = join(worktreeRoot, taskId);
-    if (!existsSync(worktreePath)) {
-        log.debug({ taskId, worktreePath }, 'no CLEO worktree found for task — skipping auto-complete');
-        return {
-            ran: false,
-            outcome: 'no-worktree',
-            reason: `No CLEO worktree at ${worktreePath} — nothing to integrate`,
-        };
-    }
-    // 3. Invoke the SDK. Catch any throw so task-completion is never derailed.
-    try {
-        const integration = completeWorktreeForTask(taskId, projectRoot, opts);
-        log.info({ taskId, outcome: integration.outcome, reason: integration.reason }, 'auto-worktree-complete invoked from cleo complete');
-        return {
-            ran: true,
-            outcome: integration.outcome,
-            reason: integration.reason,
-            integration,
-        };
-    }
-    catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
-        log.warn({ taskId, err: message }, 'auto-worktree-complete SDK threw — task completion preserved');
-        return {
-            ran: false,
-            outcome: 'sdk-threw',
-            reason: `completeWorktreeForTask threw: ${message}`,
-        };
+export function integrationDisabledReason(noIntegrate, env = process.env) {
+    if (noIntegrate)
+        return '--no-integrate was passed; the task branch and worktree are left as they are';
+    if (isAutoWorktreeCompleteDisabled(env)) {
+        return `${AUTO_WORKTREE_COMPLETE_ENV} is set; the task branch and worktree are left as they are`;
     }
+    return undefined;
 }
 //# sourceMappingURL=worktree-complete.js.map

package/dist/orchestrate/worktree-complete.js.map

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

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

@@ -18,7 +18,7 @@
  * @adr ADR-055
  * @adr ADR-062
  */
-import type { AgentWorktreeState, EvidenceAtom, FsHardenCapabilities, FsHardenState, WorktreeCleanupResult, WorktreeDisposalBlockers, WorktreeMergeResult, WorktreeSpawnResult } from '@cleocode/contracts';
+import type { AgentWorktreeState, EvidenceAtom, FsHardenCapabilities, FsHardenState, WorktreeCleanupResult, WorktreeDisposalBlockers, WorktreeIntegrationOutcome, WorktreeIntegrationPlan, WorktreeMergeResult, WorktreeSpawnResult } from '@cleocode/contracts';
 import { getGitRoot } from '@cleocode/worktree';
 export { getGitRoot };
 /**
@@ -269,6 +269,40 @@ export declare function assessUpstreamIntegration(gitRoot: string, branch: strin
     remote?: string;
     fetchTimeoutMs?: number;
 }): UpstreamIntegrationAssessment;
+/**
+ * Options for {@link planWorktreeIntegration} and the merge run that shares
+ * its decision (T14053).
+ */
+export interface WorktreeIntegrationDecisionOptions {
+    /** Override the resolved default branch. */
+    targetBranch?: string;
+    /**
+     * Set when integration is switched off (`cleo complete --no-integrate`,
+     * `CLEO_NO_AUTO_WORKTREE_COMPLETE`): the decision is `skip` with this reason.
+     */
+    disabledReason?: string;
+    /** Skip the upstream `git fetch` (the plan never fetches). */
+    skipFetch?: boolean;
+    /** Timeout for the upstream fetch. */
+    fetchTimeoutMs?: number;
+}
+/**
+ * Preview what completing `taskId` does with its worktree branch, without
+ * changing git: the same decision the merge run makes, from local refs only
+ * (no fetch). Shown by `cleo done --plan` (T14053).
+ *
+ * @param taskId - The CLEO task ID.
+ * @param projectRoot - Absolute path to the project root.
+ * @param opts - Target override and the switched-off reason, if any.
+ * @returns Branch, worktree path, target branch, `merge`/`skip`/`refuse` and why.
+ *
+ * @example
+ * ```ts
+ * planWorktreeIntegration('T123', root).action; // 'skip' for a task merged by PR
+ * ```
+ * @task T14053
+ */
+export declare function planWorktreeIntegration(taskId: string, projectRoot: string, opts?: Omit<WorktreeIntegrationDecisionOptions, 'skipFetch' | 'fetchTimeoutMs'>): WorktreeIntegrationPlan;
 /**
  * Complete a worker task's worktree via `git merge --no-ff` (ADR-062).
  *
@@ -281,6 +315,11 @@ export declare function assessUpstreamIntegration(gitRoot: string, branch: strin
  *
  * 1. Resolve target branch via {@link getDefaultBranch} (or `opts.targetBranch`
  *    override). NEVER hardcodes "main".
+ * 1. T14053: {@link decideWorktreeIntegration} first — the same decision
+ *    `cleo done --plan` shows. A branch CLEO did not provision is skipped
+ *    (`notProvisioned`), never merged; a main checkout on another branch,
+ *    with uncommitted tracked changes, or a linked worktree is refused
+ *    (`rootRefused`) without switching or merging anything.
  * 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
@@ -308,13 +347,16 @@ export declare function assessUpstreamIntegration(gitRoot: string, branch: strin
  * @param opts.evidence - The task's evidence atoms; the prune keeps a worktree holding the only copy (T13696).
  * @param opts.fetchTimeoutMs - Timeout for the upstream fetch (default
  *   {@link UPSTREAM_FETCH_TIMEOUT_MS}).
- * @returns Merge integration result.
+ * @param opts.disabledReason - Integration is switched off; nothing is touched (T14053).
+ * @returns Merge integration result, with the decision it acted on in `plan`.
  *
  * @task T1587
+ * @task T14053
  * @adr ADR-062
  */
 export declare function completeAgentWorktreeViaMerge(taskId: string, projectRoot: string, opts?: {
     targetBranch?: string;
+    disabledReason?: string;
     taskTitle?: string;
     skipFetch?: boolean;
     fetchTimeoutMs?: number;
@@ -364,6 +406,21 @@ export declare function completeAgentWorktreeIntegration(taskId: string, project
     auditLogPath?: string;
     evidence?: readonly EvidenceAtom[];
 }): WorktreeIntegrationResult;
+/**
+ * The single integration result for a completion envelope (T14053): what the
+ * run actually did, so it can never contradict the merge. `merge` only when a
+ * merge commit was made; a decided merge that failed reads as `refuse`.
+ *
+ * @param result - The merge run's result (its `plan` is the decision it acted on).
+ * @returns `{branch, worktreePath, targetBranch, action, reason, mergeCommit?, pushed: false}`.
+ *
+ * @example
+ * ```ts
+ * integrationOutcome(completeAgentWorktreeIntegration('T1', root)).action; // 'skip'
+ * ```
+ * @task T14053
+ */
+export declare function integrationOutcome(result: WorktreeMergeResult): WorktreeIntegrationOutcome;
 /** Result of {@link ensureGitShimDir}. */
 export interface GitShimInstall {
     /** Directory to prepend to a worker's PATH. */

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":"AACA;;;;;;;;;;;;;;;;;;;GAmBG;AAiBH,OAAO,KAAK,EACV,kBAAkB,EAClB,YAAY,EACZ,oBAAoB,EACpB,aAAa,EACb,qBAAqB,EACrB,wBAAwB,EACxB,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAc7B,OAAO,EAGL,UAAU,EAQX,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;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,wBAAwB,CACtC,QAAQ,EAAE,kBAAkB,EAC5B,IAAI,EAAE,MAAM,GAAG,cAAc,EAC7B,QAAQ,GAAE;IAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAO,GACpE,mBAAmB,CAuDrB;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;IACf,kHAAkH;IAClH,IAAI,CAAC,EAAE,wBAAwB,CAAC;CACjC;AAwBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,IAAI,GAAE;IAAE,YAAY,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,SAAS,YAAY,EAAE,CAAA;CAAO,GACvE,mBAAmB,CAwLrB;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;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;IACxB,QAAQ,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;CAC/B,GACL,mBAAmB,CAuKrB;AAMD;;;;;;;GAOG;AACH,MAAM,WAAW,yBAA0B,SAAQ,mBAAmB;IACpE,6DAA6D;IAC7D,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;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;IACtB,QAAQ,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;CAC/B,GACL,yBAAyB,CAkC3B;AAMD,0CAA0C;AAC1C,MAAM,WAAW,cAAc;IAC7B,+CAA+C;IAC/C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,+EAA+E;IAC/E,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,qDAAqD;IACrD,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,qCAAqC;IACrC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,gBAAgB,CAC9B,WAAW,EAAE,MAAM,EACnB,WAAW,GAAE,MAA6B,GACzC,cAAc,CA4BhB;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"}
+{"version":3,"file":"branch-lock.d.ts","sourceRoot":"","sources":["../../src/spawn/branch-lock.ts"],"names":[],"mappings":"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"}