@cleocode/core 2026.10.1 → 2026.10.2

package/dist/tasks/affected-scope.d.ts

@@ -1,26 +1,48 @@
 /**
- * When an affected-scope `testsPassed` stops counting (owner decision D11150).
+ * When a scoped `testsPassed` stops counting (owner decision D11150).
  *
- * A `tool:test-affected` run proves the packages a branch diff touches before
- * merge. Once the change has merged, only merged CI (`ci:<pr>`) or a full
- * `tool:test` proves `testsPassed`. This module is the single place that rule
- * lives: `cleo done` planning and `cleo complete` both ask it.
+ * A scoped run (`tool:test-affected`, a scope-aware `tool:test` that chose the
+ * affected packages, or a targeted `test-run:` report) proves what it ran
+ * before merge. Once the change has merged, only merged CI (`ci:<pr>`) or a
+ * full `tool:test` proves `testsPassed`. A tree-bound `test-run:` also stops
+ * counting as soon as the tree it ran on moves (T12965). This module
+ * is the single place both rules live: `cleo done` planning and
+ * `cleo complete` ask {@link testsPassedSupersededReason}, and they and a
+ * scope-aware `tool:test` all judge the merge — and the PR whose CI proves
+ * it — through {@link taskChangeMergeState} (T12959, T12656 AC2).
  *
  * @task T12656
+ * @task T12959
+ * @task T12960
+ * @task T12965
  */
-import type { ChangeSetMergeState, EvidenceAtom, Task, TaskChangeSet } from '@cleocode/contracts';
-import type { ChangeSetDeps } from './change-set.js';
+import type { ChangeSetMergeState, EvidenceAtom, TaskChangeSet } from '@cleocode/contracts';
+import type { ChangeSetDeps, ChangeSetTask, PatchEquivalenceUnknown } from './change-set.js';
 /** Whether the task's change has merged to the default branch. */
 export type ChangeMergeState = ChangeSetMergeState;
+/** A merge state and, when a lookup it needed failed, which one (T12959 review). */
+export interface MergeVerdict {
+    /** Merge state of the task's latest implementation. */
+    state: ChangeMergeState;
+    /**
+     * Why a lookup failed — `gh` unreachable, or commits missing from the
+     * local object store. With `state: 'unknown'` it is why the state is
+     * unknown; with `state: 'merged'` and no PR named, why the PR that carries
+     * the change is unknown.
+     */
+    lookupFailed?: string;
+}
 /**
- * Recorded `testsPassed` evidence whose only verification result is an
- * affected-scope run (no `ci:`, `test-run:` or full `tool:` result).
+ * Recorded `testsPassed` evidence whose only verification results are scoped:
+ * affected-scope tool runs and targeted `test-run:` reports (no `ci:` and no
+ * full `tool:` result).
  *
  * @param atoms - The gate's recorded atoms.
- * @returns True when every result atom is a `scope: 'affected'` tool run.
+ * @returns True when every result atom is scoped.
  * @task T12656
+ * @task T12965
  */
-export declare function isAffectedOnly(atoms: ReadonlyArray<EvidenceAtom>): boolean;
+export declare function isScopedOnly(atoms: ReadonlyArray<EvidenceAtom>): boolean;
 /**
  * The merge state a derived change set implies. What the PR lookup found
  * decides (`mergeState`), never `source` alone: a merged PR whose `pr:`
@@ -34,26 +56,131 @@ export declare function isAffectedOnly(atoms: ReadonlyArray<EvidenceAtom>): bool
  */
 export declare function mergeStateOfChangeSet(changeSet: Pick<TaskChangeSet, 'source' | 'prDiscoveryFailed' | 'mergeState'>): ChangeMergeState;
 /**
- * Why a recorded `testsPassed` no longer stands, or null when it does.
- * Fails closed: an affected-only result whose merge state is unknown does not
- * stand either, since a scoped run counts before merge ONLY.
+ * Why a scoped-only `testsPassed` no longer stands, or null when it does.
+ * Fails closed: a scoped result whose merge state is unknown does not stand
+ * either, since a scoped run counts before merge ONLY.
  *
  * @param atoms - Recorded `testsPassed` atoms.
  * @param state - Merge state of the task's change.
+ * @param lookupFailed - With `state: 'unknown'`, why (defaults to `gh` unreachable).
  * @returns The reason, or null.
  * @task T12656
  */
-export declare function affectedScopeSupersededReason(atoms: ReadonlyArray<EvidenceAtom>, state: ChangeMergeState): string | null;
+export declare function scopedRunSupersededReason(atoms: ReadonlyArray<EvidenceAtom>, state: ChangeMergeState, lookupFailed?: string): string | null;
 /**
- * The same rule for a stored task, deriving the merge state only when the
- * recorded `testsPassed` is affected-only (so ordinary completions pay
- * nothing). A recorded `pr:` implemented atom proves the merge on its own.
+ * Why a recorded `testsPassed` resting on a tree-bound `test-run:` no longer
+ * stands, or null when it does (T12965). A targeted report proves the tree it
+ * ran on; once that content moved, it proves nothing about the code
+ * being completed. A `ci:<pr>` or a full tool run in the same gate carries the
+ * gate on its own, and atoms recorded before T12965 (no `treeHash`) are not
+ * judged.
  *
- * @param task - The task being completed.
- * @param storeRoot - CLEO store root.
- * @param deps - Change-set I/O (tests inject `gh`).
- * @returns The reason `testsPassed` no longer stands, or null.
+ * @param atoms - Recorded `testsPassed` atoms.
+ * @param current - The current tree hash of the execution root, or null when
+ *   it cannot be computed (not a git checkout, or git failed).
+ * @returns The reason, or null.
+ * @task T12965
+ */
+export declare function testRunTreeMismatchReason(atoms: ReadonlyArray<EvidenceAtom>, current: string | null): string | null;
+/**
+ * Whether the recorded `testsPassed` atoms carry a tree-bound `test-run:`
+ * that {@link testRunTreeMismatchReason} would judge, so callers compute the
+ * current tree hash only when it matters.
+ *
+ * @param atoms - Recorded `testsPassed` atoms.
+ * @returns True when a tree-bound test-run is present.
+ * @task T12965
+ */
+export declare function hasTreeBoundTestRun(atoms: ReadonlyArray<EvidenceAtom>): boolean;
+/**
+ * The one rule for whether a recorded `testsPassed` still stands — shared by
+ * `cleo done` planning and `cleo complete` (T12656 AC2). A moved tree under a
+ * targeted test-run (T12965) is checked first, then a scoped-only result
+ * after (or with unknown) merge (D11150). Each input is resolved lazily, only
+ * when the recorded atoms make it relevant.
+ *
+ * @param atoms - Recorded `testsPassed` atoms.
+ * @param probe - Lazy merge state (with why a lookup failed, when known) and
+ *   current tree hash.
+ * @returns The reason it no longer stands, or null.
  * @task T12656
+ * @task T12965
+ */
+export declare function testsPassedSupersededReason(atoms: ReadonlyArray<EvidenceAtom>, probe: {
+    mergeState: () => Promise<ChangeMergeState | MergeVerdict> | ChangeMergeState | MergeVerdict;
+    currentTree: () => Promise<string | null> | string | null;
+}): Promise<string | null>;
+/** Git and `gh` probes {@link taskChangeMergeState} uses; injectable for tests. */
+export interface MergeProbeDeps {
+    /**
+     * Change-set I/O for the merged-PR lookup (tests inject `gh`). Its `viewPr`
+     * also lists a PR's own commits for the containment check, and its
+     * `listPrsForCommit` finds the PRs GitHub associates with a commit.
+     */
+    changeSet?: ChangeSetDeps;
+    /** A change set already derived for this task (`cleo done` planning), so it is not derived twice. */
+    derived?: TaskChangeSet;
+    /**
+     * Repository the implementation commits live in; defaults to the task's
+     * change-set root (its worktree when one is registered, T12965 review).
+     */
+    executionRoot?: string;
+    /**
+     * Whether `sha` is on origin's default branch; defaults to
+     * `git merge-base --is-ancestor`. A positive signal only: a local
+     * `origin/<default>` can be stale, and a squash or rebase merge never makes
+     * the recorded SHA an ancestor.
+     */
+    isLanded?: (root: string, sha: string) => boolean;
+    /** Whether `ancestor` is contained in `descendant`; defaults to `git merge-base --is-ancestor`. */
+    contains?: (root: string, ancestor: string, descendant: string) => boolean;
+    /**
+     * Whether `sha`'s patch is among `candidates`: null when git failed,
+     * `{ missing }` when commits it needs are not local; defaults to `git patch-id`.
+     */
+    equivalent?: (root: string, sha: string, candidates: readonly string[]) => boolean | null | PatchEquivalenceUnknown;
+}
+/** Where a task's change stands, and the PR whose CI would prove it. */
+export interface TaskMergeInfo extends MergeVerdict {
+    /** The derived change set, when one was derived. */
+    changeSet: TaskChangeSet | null;
+    /**
+     * The merged PR that carries the latest implementation (`<n>` or
+     * `<component>@<n>`), or null when none is known. Never a PR that merely
+     * cites the task: its CI must have run the recorded commits.
+     */
+    prRef: string | null;
+    /**
+     * With `state: 'merged'`, no {@link prRef} and no `lookupFailed`: why no
+     * merged PR is named — every lookup answered, and none carries the change.
+     */
+    unproven?: string;
+}
+/**
+ * Whether a task's LATEST implementation has merged, and through which PR —
+ * the one function `cleo done` planning, `cleo complete` and a scope-aware
+ * `tool:test` all ask (T12656 AC2).
+ *
+ * With recorded `commit:` atoms, the commits decide, never "any merged PR
+ * that cites the task": the PR named is one that carries every commit (see
+ * {@link carriesAll}) — a recorded `pr:` atom first (newest), then the PR the
+ * change-set derivation found, then a merged PR into the default branch that
+ * GitHub associates with the commits. Landing on the local `origin/<default>`
+ * is a positive signal only (merged, but no PR proves it); its absence proves
+ * nothing, since the ref may be stale and squash and rebase merges rewrite
+ * SHAs. With no sign of a merge, the state is unmerged — or unknown when a
+ * lookup it needed failed. A landed change with no carrier and a failed lookup
+ * names that lookup (`lookupFailed`): the carrier is unknown, which is not
+ * "no PR carries it" (`unproven`). Without commit atoms, the newest recorded
+ * `pr:` atom, else the derivation, decides.
+ *
+ * @param task - The task whose change is examined.
+ * @param storeRoot - CLEO store root.
+ * @param deps - Change-set I/O and git/`gh` probes.
+ * @returns The merge state, the PR, the change set when one was derived, and
+ *   any lookup that failed.
+ * @task T12959
+ * @task T12960
  */
-export declare function taskAffectedScopeSupersededReason(task: Task, storeRoot: string, deps?: ChangeSetDeps): Promise<string | null>;
+export declare function taskChangeMergeState(task: ChangeSetTask, storeRoot: string, deps?: MergeProbeDeps): Promise<TaskMergeInfo>;
 //# sourceMappingURL=affected-scope.d.ts.map

package/dist/tasks/affected-scope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"affected-scope.d.ts","sourceRoot":"","sources":["../../src/tasks/affected-scope.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,mBAAmB,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAClG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,kEAAkE;AAClE,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,CAAC;AAEnD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,aAAa,CAAC,YAAY,CAAC,GAAG,OAAO,CAK1E;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,IAAI,CAAC,aAAa,EAAE,QAAQ,GAAG,mBAAmB,GAAG,YAAY,CAAC,GAC5E,gBAAgB,CAIlB;AAED;;;;;;;;;GASG;AACH,wBAAgB,6BAA6B,CAC3C,KAAK,EAAE,aAAa,CAAC,YAAY,CAAC,EAClC,KAAK,EAAE,gBAAgB,GACtB,MAAM,GAAG,IAAI,CAKf;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,iCAAiC,CACrD,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,aAAa,GACnB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAUxB"}
+{"version":3,"file":"affected-scope.d.ts","sourceRoot":"","sources":["../../src/tasks/affected-scope.ts"],"names":[],"mappings":"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"}

package/dist/tasks/affected-scope.js

@@ -1,24 +1,41 @@
 /**
- * When an affected-scope `testsPassed` stops counting (owner decision D11150).
+ * When a scoped `testsPassed` stops counting (owner decision D11150).
  *
- * A `tool:test-affected` run proves the packages a branch diff touches before
- * merge. Once the change has merged, only merged CI (`ci:<pr>`) or a full
- * `tool:test` proves `testsPassed`. This module is the single place that rule
- * lives: `cleo done` planning and `cleo complete` both ask it.
+ * A scoped run (`tool:test-affected`, a scope-aware `tool:test` that chose the
+ * affected packages, or a targeted `test-run:` report) proves what it ran
+ * before merge. Once the change has merged, only merged CI (`ci:<pr>`) or a
+ * full `tool:test` proves `testsPassed`. A tree-bound `test-run:` also stops
+ * counting as soon as the tree it ran on moves (T12965). This module
+ * is the single place both rules live: `cleo done` planning and
+ * `cleo complete` ask {@link testsPassedSupersededReason}, and they and a
+ * scope-aware `tool:test` all judge the merge — and the PR whose CI proves
+ * it — through {@link taskChangeMergeState} (T12959, T12656 AC2).
  *
  * @task T12656
+ * @task T12959
+ * @task T12960
+ * @task T12965
  */
+/** What a failed `gh` lookup means for the caller, and the first thing to check. */
+const GH_UNREACHABLE = 'gh unreachable — check `gh auth status`';
+/** A full (unscoped) tool run that actually executed. */
+function isFullToolRun(a) {
+    return a.kind === 'tool' && a.scope !== 'affected' && a.notApplicable !== true;
+}
 /**
- * Recorded `testsPassed` evidence whose only verification result is an
- * affected-scope run (no `ci:`, `test-run:` or full `tool:` result).
+ * Recorded `testsPassed` evidence whose only verification results are scoped:
+ * affected-scope tool runs and targeted `test-run:` reports (no `ci:` and no
+ * full `tool:` result).
  *
  * @param atoms - The gate's recorded atoms.
- * @returns True when every result atom is a `scope: 'affected'` tool run.
+ * @returns True when every result atom is scoped.
  * @task T12656
+ * @task T12965
  */
-export function isAffectedOnly(atoms) {
+export function isScopedOnly(atoms) {
     const results = atoms.filter((a) => a.kind === 'tool' || a.kind === 'test-run' || a.kind === 'ci');
-    return results.length > 0 && results.every((a) => a.kind === 'tool' && a.scope === 'affected');
+    return (results.length > 0 &&
+        results.every((a) => (a.kind === 'tool' && a.scope === 'affected') || a.kind === 'test-run'));
 }
 /**
  * The merge state a derived change set implies. What the PR lookup found
@@ -39,43 +56,314 @@ export function mergeStateOfChangeSet(changeSet) {
     return changeSet.prDiscoveryFailed === true ? 'unknown' : 'unmerged';
 }
 /**
- * Why a recorded `testsPassed` no longer stands, or null when it does.
- * Fails closed: an affected-only result whose merge state is unknown does not
- * stand either, since a scoped run counts before merge ONLY.
+ * Why a scoped-only `testsPassed` no longer stands, or null when it does.
+ * Fails closed: a scoped result whose merge state is unknown does not stand
+ * either, since a scoped run counts before merge ONLY.
  *
  * @param atoms - Recorded `testsPassed` atoms.
  * @param state - Merge state of the task's change.
+ * @param lookupFailed - With `state: 'unknown'`, why (defaults to `gh` unreachable).
  * @returns The reason, or null.
  * @task T12656
  */
-export function affectedScopeSupersededReason(atoms, state) {
-    if (state === 'unmerged' || !isAffectedOnly(atoms))
+export function scopedRunSupersededReason(atoms, state, lookupFailed) {
+    if (state === 'unmerged' || !isScopedOnly(atoms))
         return null;
     return state === 'merged'
-        ? 'testsPassed was recorded from an affected-scope run; the merged change needs merged CI (ci:<pr>) or a full run (tool:test).'
-        : 'testsPassed was recorded from an affected-scope run, which counts before merge only, and whether the change has merged cannot be determined because gh was unreachable (check `gh auth status`); retry, or record tool:test (or ci:<pr>).';
+        ? 'testsPassed was recorded from a scoped run (affected packages or a targeted test-run); the merged change needs merged CI (ci:<pr>) or a full run (tool:test).'
+        : `testsPassed was recorded from a scoped run (affected packages or a targeted test-run), which counts before merge only, and whether the change has merged cannot be determined (${lookupFailed ?? GH_UNREACHABLE}); retry, or record tool:test (or ci:<pr>).`;
 }
 /**
- * The same rule for a stored task, deriving the merge state only when the
- * recorded `testsPassed` is affected-only (so ordinary completions pay
- * nothing). A recorded `pr:` implemented atom proves the merge on its own.
+ * Why a recorded `testsPassed` resting on a tree-bound `test-run:` no longer
+ * stands, or null when it does (T12965). A targeted report proves the tree it
+ * ran on; once that content moved, it proves nothing about the code
+ * being completed. A `ci:<pr>` or a full tool run in the same gate carries the
+ * gate on its own, and atoms recorded before T12965 (no `treeHash`) are not
+ * judged.
  *
- * @param task - The task being completed.
- * @param storeRoot - CLEO store root.
- * @param deps - Change-set I/O (tests inject `gh`).
- * @returns The reason `testsPassed` no longer stands, or null.
+ * @param atoms - Recorded `testsPassed` atoms.
+ * @param current - The current tree hash of the execution root, or null when
+ *   it cannot be computed (not a git checkout, or git failed).
+ * @returns The reason, or null.
+ * @task T12965
+ */
+export function testRunTreeMismatchReason(atoms, current) {
+    if (atoms.some((a) => a.kind === 'ci' || isFullToolRun(a)))
+        return null;
+    const moved = atoms.filter((a) => a.kind === 'test-run' && typeof a.treeHash === 'string' && a.treeHash !== current);
+    const first = moved[0];
+    if (!first?.treeHash)
+        return null;
+    return current === null
+        ? `testsPassed rests on test-run:${first.path}, bound to tree ${first.treeHash.slice(0, 12)}, and the current tree cannot be computed here (not a git checkout?); complete from the checkout the report ran in, or record ci:<pr> once the PR merges.`
+        : `testsPassed rests on test-run:${first.path}, recorded on tree ${first.treeHash.slice(0, 12)}, but the tree is now ${current.slice(0, 12)}; the report no longer describes this code. Re-run the targeted tests and record a fresh test-run, or record ci:<pr> once the PR merges.`;
+}
+/**
+ * Whether the recorded `testsPassed` atoms carry a tree-bound `test-run:`
+ * that {@link testRunTreeMismatchReason} would judge, so callers compute the
+ * current tree hash only when it matters.
+ *
+ * @param atoms - Recorded `testsPassed` atoms.
+ * @returns True when a tree-bound test-run is present.
+ * @task T12965
+ */
+export function hasTreeBoundTestRun(atoms) {
+    return atoms.some((a) => a.kind === 'test-run' && typeof a.treeHash === 'string');
+}
+/**
+ * The one rule for whether a recorded `testsPassed` still stands — shared by
+ * `cleo done` planning and `cleo complete` (T12656 AC2). A moved tree under a
+ * targeted test-run (T12965) is checked first, then a scoped-only result
+ * after (or with unknown) merge (D11150). Each input is resolved lazily, only
+ * when the recorded atoms make it relevant.
+ *
+ * @param atoms - Recorded `testsPassed` atoms.
+ * @param probe - Lazy merge state (with why a lookup failed, when known) and
+ *   current tree hash.
+ * @returns The reason it no longer stands, or null.
  * @task T12656
+ * @task T12965
  */
-export async function taskAffectedScopeSupersededReason(task, storeRoot, deps) {
-    const atoms = task.verification?.evidence?.testsPassed?.atoms ?? [];
-    if (!isAffectedOnly(atoms))
+export async function testsPassedSupersededReason(atoms, probe) {
+    if (hasTreeBoundTestRun(atoms)) {
+        const moved = testRunTreeMismatchReason(atoms, await probe.currentTree());
+        if (moved)
+            return moved;
+    }
+    if (!isScopedOnly(atoms))
         return null;
+    const merge = await probe.mergeState();
+    const verdict = typeof merge === 'string' ? { state: merge } : merge;
+    return scopedRunSupersededReason(atoms, verdict.state, verdict.lookupFailed);
+}
+function prRefOf(pr) {
+    return pr.componentPrNumber !== undefined
+        ? `${pr.componentPrNumber}@${pr.prNumber}`
+        : String(pr.prNumber);
+}
+function changeSetPrRef(cs) {
+    return cs.source === 'pr' && cs.prNumber !== undefined && cs.stackedOn === undefined
+        ? prRefOf({
+            prNumber: cs.prNumber,
+            ...(cs.componentPrNumber !== undefined ? { componentPrNumber: cs.componentPrNumber } : {}),
+        })
+        : null;
+}
+/** The same commit, whichever side is abbreviated. */
+function sameCommit(a, b) {
+    const [x, y] = [a.toLowerCase(), b.toLowerCase()];
+    return x.length >= 7 && y.length >= 7 && (x.startsWith(y) || y.startsWith(x));
+}
+/** The first 12 characters of each commit, comma-separated. */
+function shortShas(shas) {
+    return shas.map((sha) => sha.slice(0, 12)).join(', ');
+}
+/**
+ * Whether a merged PR carries every implementation commit, so its CI ran them
+ * (T12959 review). A commit is carried when it is an ancestor of the PR's
+ * merge commit, one of the PR's own commits as `gh` lists them (a squash or
+ * rebase merge rewrites the SHAs; a component's commits count for its
+ * integration PR), or a patch-equivalent of one of them (rebased before the
+ * PR merged). A commit built on top of the merge came after it and is never
+ * carried. `incomplete` names a lookup it needed that failed.
+ */
+async function carriesAll(root, pr, commits, probes) {
+    const merge = pr.mergeCommitSha ?? null;
+    let rest = merge === null ? [...commits] : commits.filter((sha) => !probes.contains(root, sha, merge));
+    if (rest.length === 0)
+        return { carried: true, incomplete: null };
+    if (merge !== null && rest.some((sha) => probes.contains(root, merge, sha))) {
+        return { carried: false, incomplete: null };
+    }
+    let incomplete = null;
+    const own = [];
+    for (const n of [pr.prNumber, pr.componentPrNumber]) {
+        if (n === undefined)
+            continue;
+        const view = await probes.viewPr(n, root);
+        if (view === null)
+            incomplete ??= `gh pr view ${n} failed (${GH_UNREACHABLE})`;
+        else
+            own.push(...(view.commits ?? []));
+    }
+    rest = rest.filter((sha) => !own.some((oid) => sameCommit(oid, sha)));
+    if (rest.length === 0)
+        return { carried: true, incomplete: null };
+    for (const sha of rest) {
+        const equivalent = own.length > 0 ? probes.equivalent(root, sha, own) : false;
+        if (equivalent === true)
+            continue;
+        if (equivalent === null) {
+            incomplete ??= `git could not compare ${shortShas([sha])} with the commits of PR #${pr.prNumber}`;
+        }
+        else if (equivalent !== false) {
+            incomplete ??= `commit(s) ${shortShas(equivalent.missing)} are not in the local object store — run \`git fetch\``;
+        }
+        return { carried: false, incomplete };
+    }
+    return { carried: true, incomplete: null };
+}
+/**
+ * Merged PRs into the default branch that GitHub associates with every
+ * commit, newest first — candidates only, which {@link carriesAll} then
+ * checks. `failed` names a lookup that failed: a `gh` call, or the default
+ * branch, which comes from origin's ref, else from `gh` (a PR merged into any
+ * other branch, such as a stacked PR's base, never counts).
+ */
+async function githubCarrierCandidates(root, commits, list, defaultBranch) {
+    const perCommit = [];
+    for (const sha of commits) {
+        const rows = await list(sha, root);
+        if (rows === null) {
+            return {
+                prs: [],
+                failed: `gh api commits/${shortShas([sha])}/pulls failed (${GH_UNREACHABLE})`,
+            };
+        }
+        const merged = new Map(rows.filter((pr) => pr.mergedAt !== null).map((pr) => [pr.number, pr]));
+        if (merged.size === 0)
+            return { prs: [], failed: null };
+        perCommit.push(merged);
+    }
+    const [first, ...others] = perCommit;
+    const common = [...(first?.values() ?? [])].filter((pr) => others.every((m) => m.has(pr.number)));
+    if (common.length === 0)
+        return { prs: [], failed: null };
+    const base = await defaultBranch();
+    if (base === null) {
+        return {
+            prs: [],
+            failed: `the default branch is unknown (no origin/HEAD, origin/main or origin/master, and gh repo view failed: ${GH_UNREACHABLE})`,
+        };
+    }
+    return {
+        prs: common
+            .filter((pr) => pr.baseRefName === base)
+            .sort((a, b) => (b.mergedAt ?? '').localeCompare(a.mergedAt ?? ''))
+            .map((pr) => ({ prNumber: pr.number, mergeCommitSha: pr.mergeCommitSha ?? null })),
+        failed: null,
+    };
+}
+/**
+ * Whether a task's LATEST implementation has merged, and through which PR —
+ * the one function `cleo done` planning, `cleo complete` and a scope-aware
+ * `tool:test` all ask (T12656 AC2).
+ *
+ * With recorded `commit:` atoms, the commits decide, never "any merged PR
+ * that cites the task": the PR named is one that carries every commit (see
+ * {@link carriesAll}) — a recorded `pr:` atom first (newest), then the PR the
+ * change-set derivation found, then a merged PR into the default branch that
+ * GitHub associates with the commits. Landing on the local `origin/<default>`
+ * is a positive signal only (merged, but no PR proves it); its absence proves
+ * nothing, since the ref may be stale and squash and rebase merges rewrite
+ * SHAs. With no sign of a merge, the state is unmerged — or unknown when a
+ * lookup it needed failed. A landed change with no carrier and a failed lookup
+ * names that lookup (`lookupFailed`): the carrier is unknown, which is not
+ * "no PR carries it" (`unproven`). Without commit atoms, the newest recorded
+ * `pr:` atom, else the derivation, decides.
+ *
+ * @param task - The task whose change is examined.
+ * @param storeRoot - CLEO store root.
+ * @param deps - Change-set I/O and git/`gh` probes.
+ * @returns The merge state, the PR, the change set when one was derived, and
+ *   any lookup that failed.
+ * @task T12959
+ * @task T12960
+ */
+export async function taskChangeMergeState(task, storeRoot, deps = {}) {
     const implemented = task.verification?.evidence?.implemented?.atoms ?? [];
-    if (implemented.some((a) => a.kind === 'pr')) {
-        return affectedScopeSupersededReason(atoms, 'merged');
+    const commits = implemented.flatMap((a) => (a.kind === 'commit' ? [a.sha] : []));
+    const prs = implemented
+        .filter((a) => a.kind === 'pr')
+        .toSorted((a, b) => (b.mergedAt ?? '').localeCompare(a.mergedAt ?? ''));
+    const cs = await import('./change-set.js');
+    const derive = async () => deps.derived ??
+        (await cs.deriveTaskChangeSet({ task, storeRoot, cwd: storeRoot }, deps.changeSet));
+    const failures = [];
+    const derivedFailure = (changeSet) => {
+        if (mergeStateOfChangeSet(changeSet) === 'unknown') {
+            failures.push(`the merged-PR lookup failed (${GH_UNREACHABLE})`);
+        }
+    };
+    const lookupFailed = () => failures.length > 0 ? { lookupFailed: [...new Set(failures)].join('; ') } : {};
+    if (commits.length === 0) {
+        const newest = prs[0];
+        if (newest)
+            return { state: 'merged', changeSet: null, prRef: prRefOf(newest) };
+        const changeSet = await derive();
+        derivedFailure(changeSet);
+        return {
+            state: mergeStateOfChangeSet(changeSet),
+            changeSet,
+            prRef: changeSetPrRef(changeSet),
+            ...lookupFailed(),
+        };
+    }
+    // T12965 review M2: the same root `cleo done` reads the change set from.
+    const at = deps.executionRoot ?? cs.resolveChangeSetRoot(storeRoot, task.id).root;
+    const probes = {
+        contains: deps.contains ?? cs.isAncestorCommit,
+        equivalent: deps.equivalent ?? cs.hasPatchEquivalent,
+        viewPr: deps.changeSet?.viewPr ?? cs.defaultViewPr,
+    };
+    const carries = async (pr) => {
+        const r = await carriesAll(at, pr, commits, probes);
+        if (r.incomplete !== null)
+            failures.push(r.incomplete);
+        return r.carried;
+    };
+    for (const pr of prs) {
+        if (await carries(pr))
+            return { state: 'merged', changeSet: null, prRef: prRefOf(pr) };
+    }
+    const changeSet = await derive();
+    derivedFailure(changeSet);
+    const derivedRef = changeSetPrRef(changeSet);
+    if (derivedRef !== null &&
+        changeSet.prNumber !== undefined &&
+        (await carries({
+            prNumber: changeSet.prNumber,
+            ...(changeSet.componentPrNumber !== undefined
+                ? { componentPrNumber: changeSet.componentPrNumber }
+                : {}),
+            mergeCommitSha: changeSet.mergeCommitSha ?? null,
+        }))) {
+        return { state: 'merged', changeSet, prRef: derivedRef };
+    }
+    // T12959 review: a PR GitHub associates with the commits is a candidate
+    // only; it is named when it carries them, like every other candidate.
+    const github = await githubCarrierCandidates(at, commits, deps.changeSet?.listPrsForCommit ?? cs.defaultListPrsForCommit, async () => {
+        const ref = cs.resolveOriginDefault(at);
+        if (ref !== null)
+            return ref.replace(/^origin\//, '');
+        const ask = deps.changeSet?.defaultBranch ??
+            (await import('../release/ci-evidence.js')).ghDefaultBranch;
+        return ask(at);
+    });
+    if (github.failed !== null)
+        failures.push(github.failed);
+    for (const pr of github.prs) {
+        if (await carries(pr))
+            return { state: 'merged', changeSet, prRef: prRefOf(pr) };
+    }
+    const isLanded = deps.isLanded ?? cs.isLandedOnOriginDefault;
+    if (commits.every((sha) => isLanded(at, sha))) {
+        // T12959 review: with a failed lookup the carrier is unknown, not absent.
+        if (failures.length > 0)
+            return { state: 'merged', changeSet, prRef: null, ...lookupFailed() };
+        return {
+            state: 'merged',
+            changeSet,
+            prRef: null,
+            unproven: `implementation commit(s) ${shortShas(commits)} reached the default branch, but no merged PR is known to carry them` +
+                (derivedRef !== null ? ` (PR #${derivedRef}, which cites ${task.id}, does not)` : ''),
+        };
     }
-    const { deriveTaskChangeSet } = await import('./change-set.js');
-    const changeSet = await deriveTaskChangeSet({ task, storeRoot, cwd: storeRoot }, deps);
-    return affectedScopeSupersededReason(atoms, mergeStateOfChangeSet(changeSet));
+    return {
+        state: failures.length > 0 ? 'unknown' : 'unmerged',
+        changeSet,
+        prRef: null,
+        ...lookupFailed(),
+    };
 }
 //# sourceMappingURL=affected-scope.js.map

package/dist/tasks/affected-scope.js.map

@@ -1 +1 @@
-{"version":3,"file":"affected-scope.js","sourceRoot":"","sources":["../../src/tasks/affected-scope.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAQH;;;;;;;GAOG;AACH,MAAM,UAAU,cAAc,CAAC,KAAkC;IAC/D,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAC1B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CACrE,CAAC;IACF,OAAO,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,CAAC,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC;AACjG,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,qBAAqB,CACnC,SAA6E;IAE7E,IAAI,SAAS,CAAC,UAAU;QAAE,OAAO,SAAS,CAAC,UAAU,CAAC;IACtD,IAAI,SAAS,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO,QAAQ,CAAC;IAC/C,OAAO,SAAS,CAAC,iBAAiB,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC;AACvE,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,6BAA6B,CAC3C,KAAkC,EAClC,KAAuB;IAEvB,IAAI,KAAK,KAAK,UAAU,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAChE,OAAO,KAAK,KAAK,QAAQ;QACvB,CAAC,CAAC,6HAA6H;QAC/H,CAAC,CAAC,2OAA2O,CAAC;AAClP,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,iCAAiC,CACrD,IAAU,EACV,SAAiB,EACjB,IAAoB;IAEpB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC;IACpE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACxC,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,IAAI,EAAE,CAAC;IAC1E,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;QAC7C,OAAO,6BAA6B,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAChE,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,SAAS,EAAE,EAAE,IAAI,CAAC,CAAC;IACvF,OAAO,6BAA6B,CAAC,KAAK,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAC;AAChF,CAAC"}
+{"version":3,"file":"affected-scope.js","sourceRoot":"","sources":["../../src/tasks/affected-scope.ts"],"names":[],"mappings":"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"}