@telora/daemon 0.20.78 → 0.20.95

package/dist/resolvers/index.js

@@ -125,6 +125,6 @@ export function initResolvers() {
     return keys;
 }
 // ── Shared public surface (re-exports for external consumers) ─────────
-export { MAX_DIFF_BYTES, getGitDiff, getDiffStatSummary, getChangedFiles, getCommitsAhead, getGitDiffRange, getDiffStatRange, getChangedFilesRange, findDeliveryMergeCommit, resolveDeliveryDiffRange, getDeliveryDiff, } from './shared/git-diff.js';
+export { MAX_DIFF_BYTES, getGitDiff, getDiffStatSummary, getChangedFiles, getCommitsAhead, getGitDiffRange, getDiffStatRange, getChangedFilesRange, findDeliveryMergeCommit, resolveRecordedMergeRange, resolveRecordedCommitRange, listRangeCommits, resolveDeliveryDiffRange, resolveDeliveryDiffSource, getDeliveryDiffFromSource, getDeliveryChangedFilesFromSource, getDeliveryDiffStatFromSource, listSourceCommits, getDeliveryDiff, readDeliveryTrailer, filterCommitsByDelivery, DELIVERY_TRAILER_KEY, } from './shared/git-diff.js';
 export { CRT_DUMP_BUDGET_CHARS, renderRealityTreeDump, FOCUS_REALITY_TREE_EMPTY_STATE, } from './shared/reality-tree.js';
 //# sourceMappingURL=index.js.map

package/dist/resolvers/index.js.map

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

package/dist/resolvers/shared/git-diff.d.ts

@@ -52,38 +52,159 @@ export declare function getCommitsAhead(worktreePath: string, baseBranch: string
  */
 export declare function findDeliveryMergeCommit(worktreePath: string, baseBranch: string): string | null;
 /**
- * Verify a commit sha exists locally and, if so, return the first-parent diff
- * range that recovers a merge commit's second-parent contribution
- * (`<sha>^1...<sha>`). Returns null when the sha is empty, malformed, or not
- * present in the repo (e.g. not yet fetched) -- the caller then falls through
- * to its other evidence sources rather than diffing against a phantom ref.
+ * Verify a commit sha exists locally AND is a real MERGE commit (>= 2 parents),
+ * and if so return the first-parent diff range that recovers its second-parent
+ * contribution (`<sha>^1...<sha>`).
+ *
+ * Returns null when the sha is empty, malformed, not present in the repo (e.g.
+ * not yet fetched), OR has fewer than two parents. That last guard is
+ * load-bearing: the recorded merge_commit_sha was observed to be
+ * HEAD-at-stamp-time -- an ordinary sequential commit shared across several
+ * deliveries, NOT a per-delivery merge (and a FAST-FORWARDED merge-back leaves
+ * no merge commit at all). On such a sha `<sha>^1...<sha>` is that ONE commit's
+ * own diff -- WRONG attribution masquerading as a verdict, not the delivery's
+ * contribution. `^1...` only recovers a delivery's contribution when `<sha>` is
+ * a genuine merge whose non-first parent is the merged-in tip. Refusing it here
+ * makes the caller fall through to the recorded-commit-set range
+ * (resolveRecordedCommitRange) or live topology instead of judging a whole
+ * focus against a single trailing commit.
  */
 export declare function resolveRecordedMergeRange(worktreePath: string, mergeCommitSha: string | null | undefined): string | null;
 /**
- * Resolve the git range that contains a delivery's work, robust to the focus
- * branch having already merged into its base:
+ * Derive a diff range from a delivery's RECORDED constituent commit set
+ * (focus_merges.commit_shas -- the durable record the daemon writes at merge
+ * time via extractConstituentCommits/recordFocusMerge). The set is authored by
+ * `git log --format=%H <preMergeRef>..<branch>`, so it is newest-first and
+ * forms a contiguous first-parent chain for the ff / no-ff merge-back
+ * strategies the daemon uses. The range is `<oldest>^1...<newest>` -- the whole
+ * recorded set diffed against the commit just before it.
  *
- *   - branch AHEAD of base            -> `base...HEAD` (historic behaviour,
- *                                        byte-identical to the old getGitDiff)
- *   - RECORDED merge commit present   -> `<sha>^1...<sha>` (the daemon already
- *                                        recorded the merge sha on the delivery
- *                                        row; trust it directly rather than
- *                                        re-searching -- survives a stale/teamless
- *                                        worktree whose integration ref is not
- *                                        current, which the search-based fallback
- *                                        does not)
- *   - branch LEVEL/BEHIND after merge -> `<merge>^1...<merge>` (recovered by
- *                                        SEARCHING the base for the merge commit
- *                                        that brought it in -- fallback for when
- *                                        no sha was recorded)
- *   - no attributable commits         -> null (caller yields empty; the
- *                                        instrument-fault path handles it)
+ * Both boundaries (and the parent of the oldest) are verified reachable in the
+ * worktree; returns null when the set is empty or a boundary is absent (e.g. a
+ * --squash merge rewrote history, breaking the recorded shas' reachability, or
+ * the oldest commit is a root with no parent) so the caller falls through to
+ * its live-topology sources. This is the record-sourced path that survives a
+ * FAST-FORWARD (no merge marker to search for) and a REBASE (merge-base moved),
+ * both of which corrupt a topology-derived range.
+ */
+export declare function resolveRecordedCommitRange(worktreePath: string, commitShas: string[] | null | undefined): string | null;
+/**
+ * The git trailer key that attributes a commit to the delivery whose work it is.
+ * Stamped by agents at commit time (see execution-sections / the agent CLAUDE.md
+ * template). The value is the delivery UUID. The trailer travels with the commit
+ * object, so it survives fast-forward and rebase exactly like the recorded commit
+ * set -- reading it is reading a durable fact, not re-deriving from branch topology.
+ */
+export declare const DELIVERY_TRAILER_KEY = "Telora-Delivery";
+/**
+ * Read the `Telora-Delivery` trailer of a single commit. Returns the trimmed
+ * delivery id, or '' when the commit carries no such trailer (a merge-back / daemon
+ * commit, or an agent commit made before the convention). Empty on any git failure.
+ */
+export declare function readDeliveryTrailer(worktreePath: string, sha: string): string;
+/**
+ * Partition a RECORDED batch commit set (focus_merges.commit_shas, which spans
+ * every delivery merged together) down to the commits attributable to ONE
+ * delivery, using each commit's `Telora-Delivery` trailer.
  *
- * `recordedMergeSha` is the delivery row's merge_commit_sha (populated by the
- * merge-back loop). Passing it lets a merged-back delivery in verify be judged
- * from its own recorded merge commit with no live search and no operator hold.
+ * This is what gives a delivery merged alongside siblings its OWN commits instead
+ * of the batch's combined set: the trailer is the per-commit fact that a shared
+ * focus branch's interleaved commits cannot otherwise be partitioned by.
+ *
+ * GRACEFUL FALLBACK: when NO commit in the set carries a Telora-Delivery trailer
+ * (a legacy / pre-convention batch), the set cannot be partitioned, so the whole
+ * set is returned unchanged -- exactly today's behavior, no regression. When ANY
+ * commit is trailered, the set IS partitionable and only this delivery's commits
+ * are returned; untrailered commits (merge-back / daemon) fall out naturally, and
+ * a delivery with no trailered commits of its own correctly resolves to an empty
+ * set (which the completeness gate then treats as nothing-to-measure).
+ *
+ * Order is preserved (newest-first), so the result still forms the contiguous
+ * chain resolveRecordedCommitRange expects.
+ */
+export declare function filterCommitsByDelivery(worktreePath: string, commitShas: string[] | null | undefined, deliveryId: string): string[];
+/**
+ * The commit SHAs contained in a diff range (`git rev-list <range>`). Empty on
+ * failure. Used by the verify COMPLETENESS check to prove the resolved range
+ * actually covers a delivery's recorded commits before rendering a verdict.
+ */
+export declare function listRangeCommits(worktreePath: string, range: string): string[];
+/**
+ * How a delivery's evidence is produced from git.
+ *
+ * Most deliveries resolve to a single contiguous `range` (topology, a recorded
+ * merge commit, or a recorded commit set whose members happen to sit contiguously
+ * on the branch). But a delivery whose OWN recorded commits INTERLEAVE with a
+ * sibling's on a shared focus branch cannot be expressed as one `<a>^1...<b>`
+ * span -- that span's diff re-absorbs every sibling commit that lives between its
+ * endpoints. Such a set is carried as an explicit `commits` list and diffed
+ * commit-by-commit, so an interleaved sibling's commit never leaks into the
+ * delivery's evidence (the AC: "judged against its own commits only").
+ */
+export type DeliveryDiffSource = {
+    readonly kind: 'range';
+    readonly range: string;
+} | {
+    readonly kind: 'commits';
+    readonly commits: readonly string[];
+};
+/**
+ * Resolve HOW to produce a delivery's evidence, sourced from the DURABLE recorded
+ * attribution first and live branch topology only as a fallback (defects #2/#3).
+ * Order:
+ *
+ *   1. RECORDED commit set present, CONTIGUOUS -> `{range: <oldest>^1...<newest>}`
+ *      from focus_merges.commit_shas (the delivery's own, trailer-filtered set) --
+ *      the exact record written at merge time, immune to fast-forward and rebase.
+ *   1b. RECORDED commit set present, INTERLEAVED with a sibling's commits, OR its
+ *      span boundary is unreachable (e.g. --squash rewrote history) but the
+ *      commits themselves survive -> `{commits}` (diffed one by one, so the span
+ *      never re-absorbs a sibling that sits between the endpoints).
+ *   2. RECORDED merge commit present -> `{range: <sha>^1...<sha>}`, ONLY for a real
+ *      >=2-parent merge (single-parent ff commits are refused -- see
+ *      resolveRecordedMergeRange).
+ *   3. branch AHEAD of base -> `{range: base...HEAD}` (an unmerged branch has no
+ *      focus_merges row; topology is correct and byte-identical to the old path).
+ *   4. branch LEVEL/BEHIND after merge -> `{range: <merge>^1...<merge>}` (searched
+ *      merge commit -- last-ditch when nothing was recorded).
+ *   5. no attributable commits -> null (caller yields empty; instrument-fault path).
+ *
+ * The recorded sources are preferred over `getCommitsAhead` so a merged-back
+ * branch that has since taken one new commit (routine: every spawn rebases onto
+ * integration) is NOT truncated to that single trailing commit.
+ *
+ * `recordedCommitShas` is the delivery's OWN commit set (focus_merges.commit_shas
+ * already partitioned per-delivery by the Telora-Delivery trailer); `recordedMergeSha`
+ * is the row's merge_commit_sha. Callers without a record (assembly resolvers) pass
+ * neither and get the topology path.
+ */
+export declare function resolveDeliveryDiffSource(worktreePath: string, baseBranch: string, recordedMergeSha?: string | null, recordedCommitShas?: string[] | null): DeliveryDiffSource | null;
+/**
+ * String-range view of {@link resolveDeliveryDiffSource}, for consumers that need
+ * a single range expression (assembly resolvers). Those callers pass no recorded
+ * commit set, so they always resolve to a `range` source; a `commits` source
+ * (interleaved per-delivery set) degrades to its best-effort span here -- only the
+ * verify path, which uses the source API directly, isolates interleaved commits.
+ */
+export declare function resolveDeliveryDiffRange(worktreePath: string, baseBranch: string, recordedMergeSha?: string | null, recordedCommitShas?: string[] | null): string | null;
+/**
+ * The delivery's diff, from a resolved source. A `range` source diffs the span
+ * directly (byte-identical to the old range path). A `commits` source sums each
+ * commit's own patch (oldest-first for readable order), so interleaved siblings
+ * never appear.
+ */
+export declare function getDeliveryDiffFromSource(worktreePath: string, source: DeliveryDiffSource): string;
+/** Changed-files for a source: the range's name-only list, or the UNION per commit. */
+export declare function getDeliveryChangedFilesFromSource(worktreePath: string, source: DeliveryDiffSource): string[];
+/** Diff-stat for a source: the range's stat, or per-commit stats concatenated. */
+export declare function getDeliveryDiffStatFromSource(worktreePath: string, source: DeliveryDiffSource): string;
+/**
+ * The commits a source actually diffs, for the completeness check. A `range`
+ * source lists the range; a `commits` source is exactly its (existing) commits --
+ * so a per-delivery commit set covers itself by construction and never reads as
+ * half-blind for interleaving alone.
  */
-export declare function resolveDeliveryDiffRange(worktreePath: string, baseBranch: string, recordedMergeSha?: string | null): string | null;
+export declare function listSourceCommits(worktreePath: string, source: DeliveryDiffSource): string[];
 /**
  * The delivery's diff, resolved from the range that actually contains its work
  * (see resolveDeliveryDiffRange). For a branch still ahead of base this is

package/dist/resolvers/shared/git-diff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"git-diff.d.ts","sourceRoot":"","sources":["../../../src/resolvers/shared/git-diff.ts"],"names":[],"mappings":"AAAA;;GAEG;AAIH,eAAO,MAAM,cAAc,QAAY,CAAC;AAExC;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAU3E;AAED,+EAA+E;AAC/E,wBAAgB,gBAAgB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAS5E;AAED,0EAA0E;AAC1E,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAUlF;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAE3E;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAEnF;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,EAAE,CAElF;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAWhF;AAKD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAsB/F;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CAAC,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,MAAM,GAAG,IAAI,CAYxH;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,wBAAwB,CACtC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,GAC/B,MAAM,GAAG,IAAI,CAOf;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAGhF"}
+{"version":3,"file":"git-diff.d.ts","sourceRoot":"","sources":["../../../src/resolvers/shared/git-diff.ts"],"names":[],"mappings":"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"}

package/dist/resolvers/shared/git-diff.js

@@ -116,62 +116,302 @@ export function findDeliveryMergeCommit(worktreePath, baseBranch) {
     }
 }
 /**
- * Verify a commit sha exists locally and, if so, return the first-parent diff
- * range that recovers a merge commit's second-parent contribution
- * (`<sha>^1...<sha>`). Returns null when the sha is empty, malformed, or not
- * present in the repo (e.g. not yet fetched) -- the caller then falls through
- * to its other evidence sources rather than diffing against a phantom ref.
+ * Verify a commit sha exists locally AND is a real MERGE commit (>= 2 parents),
+ * and if so return the first-parent diff range that recovers its second-parent
+ * contribution (`<sha>^1...<sha>`).
+ *
+ * Returns null when the sha is empty, malformed, not present in the repo (e.g.
+ * not yet fetched), OR has fewer than two parents. That last guard is
+ * load-bearing: the recorded merge_commit_sha was observed to be
+ * HEAD-at-stamp-time -- an ordinary sequential commit shared across several
+ * deliveries, NOT a per-delivery merge (and a FAST-FORWARDED merge-back leaves
+ * no merge commit at all). On such a sha `<sha>^1...<sha>` is that ONE commit's
+ * own diff -- WRONG attribution masquerading as a verdict, not the delivery's
+ * contribution. `^1...` only recovers a delivery's contribution when `<sha>` is
+ * a genuine merge whose non-first parent is the merged-in tip. Refusing it here
+ * makes the caller fall through to the recorded-commit-set range
+ * (resolveRecordedCommitRange) or live topology instead of judging a whole
+ * focus against a single trailing commit.
  */
 export function resolveRecordedMergeRange(worktreePath, mergeCommitSha) {
     const sha = (mergeCommitSha ?? '').trim();
     if (sha === '')
         return null;
+    let parentCount;
     try {
-        // `--verify <sha>^{commit}` confirms the object exists AND is a commit.
-        execSync(`git rev-parse --verify --quiet ${sha}^{commit}`, {
+        // `--parents -n 1 <sha>^{commit}` confirms the object exists AND is a
+        // commit, and yields `<sha> <parent1> [<parent2> ...]` in one call.
+        const out = execSync(`git rev-list --parents -n 1 ${sha}^{commit}`, {
             cwd: worktreePath, maxBuffer: 1024 * 1024, encoding: 'utf-8',
         });
+        const parts = out.trim().split(/\s+/).filter((p) => p !== '');
+        parentCount = Math.max(0, parts.length - 1); // first token is the commit itself
     }
     catch {
         return null;
     }
+    if (parentCount < 2)
+        return null; // not a merge commit -> `^1...` is meaningless
     return `${sha}^1...${sha}`;
 }
 /**
- * Resolve the git range that contains a delivery's work, robust to the focus
- * branch having already merged into its base:
+ * Derive a diff range from a delivery's RECORDED constituent commit set
+ * (focus_merges.commit_shas -- the durable record the daemon writes at merge
+ * time via extractConstituentCommits/recordFocusMerge). The set is authored by
+ * `git log --format=%H <preMergeRef>..<branch>`, so it is newest-first and
+ * forms a contiguous first-parent chain for the ff / no-ff merge-back
+ * strategies the daemon uses. The range is `<oldest>^1...<newest>` -- the whole
+ * recorded set diffed against the commit just before it.
+ *
+ * Both boundaries (and the parent of the oldest) are verified reachable in the
+ * worktree; returns null when the set is empty or a boundary is absent (e.g. a
+ * --squash merge rewrote history, breaking the recorded shas' reachability, or
+ * the oldest commit is a root with no parent) so the caller falls through to
+ * its live-topology sources. This is the record-sourced path that survives a
+ * FAST-FORWARD (no merge marker to search for) and a REBASE (merge-base moved),
+ * both of which corrupt a topology-derived range.
+ */
+export function resolveRecordedCommitRange(worktreePath, commitShas) {
+    const shas = (commitShas ?? []).map((s) => s.trim()).filter((s) => s !== '');
+    if (shas.length === 0)
+        return null;
+    const newest = shas[0];
+    const oldest = shas[shas.length - 1];
+    try {
+        for (const ref of [`${newest}^{commit}`, `${oldest}^{commit}`, `${oldest}^1^{commit}`]) {
+            execSync(`git rev-parse --verify --quiet ${ref}`, {
+                cwd: worktreePath, maxBuffer: 1024 * 1024, encoding: 'utf-8',
+            });
+        }
+    }
+    catch {
+        return null;
+    }
+    return `${oldest}^1...${newest}`;
+}
+/**
+ * The git trailer key that attributes a commit to the delivery whose work it is.
+ * Stamped by agents at commit time (see execution-sections / the agent CLAUDE.md
+ * template). The value is the delivery UUID. The trailer travels with the commit
+ * object, so it survives fast-forward and rebase exactly like the recorded commit
+ * set -- reading it is reading a durable fact, not re-deriving from branch topology.
+ */
+export const DELIVERY_TRAILER_KEY = 'Telora-Delivery';
+/**
+ * Read the `Telora-Delivery` trailer of a single commit. Returns the trimmed
+ * delivery id, or '' when the commit carries no such trailer (a merge-back / daemon
+ * commit, or an agent commit made before the convention). Empty on any git failure.
+ */
+export function readDeliveryTrailer(worktreePath, sha) {
+    const clean = (sha ?? '').trim();
+    if (clean === '')
+        return '';
+    try {
+        // Single-quote the format: the `%(...)` parentheses are shell metacharacters.
+        const out = execSync(`git show -s '--format=%(trailers:key=${DELIVERY_TRAILER_KEY},valueonly)' ${clean}^{commit}`, { cwd: worktreePath, maxBuffer: 1024 * 1024, encoding: 'utf-8' });
+        // A commit can in principle carry several trailer lines; take the first
+        // non-empty value -- attribution is single-delivery by construction.
+        return out.split('\n').map((l) => l.trim()).find((l) => l !== '') ?? '';
+    }
+    catch {
+        return '';
+    }
+}
+/**
+ * Partition a RECORDED batch commit set (focus_merges.commit_shas, which spans
+ * every delivery merged together) down to the commits attributable to ONE
+ * delivery, using each commit's `Telora-Delivery` trailer.
+ *
+ * This is what gives a delivery merged alongside siblings its OWN commits instead
+ * of the batch's combined set: the trailer is the per-commit fact that a shared
+ * focus branch's interleaved commits cannot otherwise be partitioned by.
+ *
+ * GRACEFUL FALLBACK: when NO commit in the set carries a Telora-Delivery trailer
+ * (a legacy / pre-convention batch), the set cannot be partitioned, so the whole
+ * set is returned unchanged -- exactly today's behavior, no regression. When ANY
+ * commit is trailered, the set IS partitionable and only this delivery's commits
+ * are returned; untrailered commits (merge-back / daemon) fall out naturally, and
+ * a delivery with no trailered commits of its own correctly resolves to an empty
+ * set (which the completeness gate then treats as nothing-to-measure).
+ *
+ * Order is preserved (newest-first), so the result still forms the contiguous
+ * chain resolveRecordedCommitRange expects.
+ */
+export function filterCommitsByDelivery(worktreePath, commitShas, deliveryId) {
+    const shas = (commitShas ?? []).map((s) => s.trim()).filter((s) => s !== '');
+    if (shas.length === 0)
+        return [];
+    const wanted = (deliveryId ?? '').trim();
+    const trailers = shas.map((sha) => ({ sha, delivery: readDeliveryTrailer(worktreePath, sha) }));
+    const anyTrailered = trailers.some((t) => t.delivery !== '');
+    if (!anyTrailered)
+        return shas; // un-partitionable legacy batch -> preserve current behavior
+    if (wanted === '')
+        return shas; // no delivery to filter by -> do not silently drop work
+    return trailers.filter((t) => t.delivery === wanted).map((t) => t.sha);
+}
+/**
+ * The commit SHAs contained in a diff range (`git rev-list <range>`). Empty on
+ * failure. Used by the verify COMPLETENESS check to prove the resolved range
+ * actually covers a delivery's recorded commits before rendering a verdict.
+ */
+export function listRangeCommits(worktreePath, range) {
+    try {
+        const out = execSync(`git rev-list ${range}`, { cwd: worktreePath, maxBuffer: 10 * 1024 * 1024, encoding: 'utf-8' });
+        return out.split('\n').map((l) => l.trim()).filter((l) => l !== '');
+    }
+    catch {
+        return [];
+    }
+}
+/** Confirm a sha names a commit that exists locally. */
+function commitExists(worktreePath, sha) {
+    const clean = (sha ?? '').trim();
+    if (clean === '')
+        return false;
+    try {
+        execSync(`git rev-parse --verify --quiet ${clean}^{commit}`, {
+            cwd: worktreePath, maxBuffer: 1024 * 1024, encoding: 'utf-8',
+        });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * True when `span` (a `<oldest>^1...<newest>` range) contains EXACTLY the recorded
+ * set -- no interleaved foreign commits. When true the cheap span is exact; when
+ * false a sibling's commits sit between the endpoints and the set must be diffed
+ * commit-by-commit. `shas` is the delivery's own (already trailer-filtered) set.
+ */
+function spanCoversRecordedExactly(worktreePath, span, shas) {
+    const inSpan = new Set(listRangeCommits(worktreePath, span));
+    return inSpan.size === shas.length && shas.every((s) => inSpan.has(s));
+}
+/**
+ * Resolve HOW to produce a delivery's evidence, sourced from the DURABLE recorded
+ * attribution first and live branch topology only as a fallback (defects #2/#3).
+ * Order:
+ *
+ *   1. RECORDED commit set present, CONTIGUOUS -> `{range: <oldest>^1...<newest>}`
+ *      from focus_merges.commit_shas (the delivery's own, trailer-filtered set) --
+ *      the exact record written at merge time, immune to fast-forward and rebase.
+ *   1b. RECORDED commit set present, INTERLEAVED with a sibling's commits, OR its
+ *      span boundary is unreachable (e.g. --squash rewrote history) but the
+ *      commits themselves survive -> `{commits}` (diffed one by one, so the span
+ *      never re-absorbs a sibling that sits between the endpoints).
+ *   2. RECORDED merge commit present -> `{range: <sha>^1...<sha>}`, ONLY for a real
+ *      >=2-parent merge (single-parent ff commits are refused -- see
+ *      resolveRecordedMergeRange).
+ *   3. branch AHEAD of base -> `{range: base...HEAD}` (an unmerged branch has no
+ *      focus_merges row; topology is correct and byte-identical to the old path).
+ *   4. branch LEVEL/BEHIND after merge -> `{range: <merge>^1...<merge>}` (searched
+ *      merge commit -- last-ditch when nothing was recorded).
+ *   5. no attributable commits -> null (caller yields empty; instrument-fault path).
  *
- *   - branch AHEAD of base            -> `base...HEAD` (historic behaviour,
- *                                        byte-identical to the old getGitDiff)
- *   - RECORDED merge commit present   -> `<sha>^1...<sha>` (the daemon already
- *                                        recorded the merge sha on the delivery
- *                                        row; trust it directly rather than
- *                                        re-searching -- survives a stale/teamless
- *                                        worktree whose integration ref is not
- *                                        current, which the search-based fallback
- *                                        does not)
- *   - branch LEVEL/BEHIND after merge -> `<merge>^1...<merge>` (recovered by
- *                                        SEARCHING the base for the merge commit
- *                                        that brought it in -- fallback for when
- *                                        no sha was recorded)
- *   - no attributable commits         -> null (caller yields empty; the
- *                                        instrument-fault path handles it)
+ * The recorded sources are preferred over `getCommitsAhead` so a merged-back
+ * branch that has since taken one new commit (routine: every spawn rebases onto
+ * integration) is NOT truncated to that single trailing commit.
  *
- * `recordedMergeSha` is the delivery row's merge_commit_sha (populated by the
- * merge-back loop). Passing it lets a merged-back delivery in verify be judged
- * from its own recorded merge commit with no live search and no operator hold.
+ * `recordedCommitShas` is the delivery's OWN commit set (focus_merges.commit_shas
+ * already partitioned per-delivery by the Telora-Delivery trailer); `recordedMergeSha`
+ * is the row's merge_commit_sha. Callers without a record (assembly resolvers) pass
+ * neither and get the topology path.
  */
-export function resolveDeliveryDiffRange(worktreePath, baseBranch, recordedMergeSha) {
+export function resolveDeliveryDiffSource(worktreePath, baseBranch, recordedMergeSha, recordedCommitShas) {
+    const shas = (recordedCommitShas ?? []).map((s) => s.trim()).filter((s) => s !== '');
+    if (shas.length > 0) {
+        const span = resolveRecordedCommitRange(worktreePath, shas);
+        if (span) {
+            // A span is exact only when it re-lists ONLY the delivery's own commits.
+            // When a sibling interleaves, the span re-absorbs it -> diff commit-by-commit.
+            if (spanCoversRecordedExactly(worktreePath, span, shas))
+                return { kind: 'range', range: span };
+            return { kind: 'commits', commits: shas };
+        }
+        // Span boundary unreachable (e.g. --squash, or oldest is a root): if the
+        // commits themselves still exist, diff them directly; else fall through to
+        // topology rather than fabricate a range from missing commits.
+        if (shas.every((s) => commitExists(worktreePath, s)))
+            return { kind: 'commits', commits: shas };
+    }
+    const recordedMerge = resolveRecordedMergeRange(worktreePath, recordedMergeSha);
+    if (recordedMerge)
+        return { kind: 'range', range: recordedMerge };
     if (getCommitsAhead(worktreePath, baseBranch) > 0)
-        return `${baseBranch}...HEAD`;
-    const recorded = resolveRecordedMergeRange(worktreePath, recordedMergeSha);
-    if (recorded)
-        return recorded;
+        return { kind: 'range', range: `${baseBranch}...HEAD` };
     const merge = findDeliveryMergeCommit(worktreePath, baseBranch);
     if (merge)
-        return `${merge}^1...${merge}`;
+        return { kind: 'range', range: `${merge}^1...${merge}` };
     return null;
 }
+/**
+ * String-range view of {@link resolveDeliveryDiffSource}, for consumers that need
+ * a single range expression (assembly resolvers). Those callers pass no recorded
+ * commit set, so they always resolve to a `range` source; a `commits` source
+ * (interleaved per-delivery set) degrades to its best-effort span here -- only the
+ * verify path, which uses the source API directly, isolates interleaved commits.
+ */
+export function resolveDeliveryDiffRange(worktreePath, baseBranch, recordedMergeSha, recordedCommitShas) {
+    const source = resolveDeliveryDiffSource(worktreePath, baseBranch, recordedMergeSha, recordedCommitShas);
+    if (!source)
+        return null;
+    if (source.kind === 'range')
+        return source.range;
+    return resolveRecordedCommitRange(worktreePath, [...source.commits]);
+}
+/** The per-commit patch range (`<sha>^ <sha>`) that yields a single commit's own diff. */
+function commitDiffRange(sha) {
+    return `${sha}^ ${sha}`;
+}
+/**
+ * The delivery's diff, from a resolved source. A `range` source diffs the span
+ * directly (byte-identical to the old range path). A `commits` source sums each
+ * commit's own patch (oldest-first for readable order), so interleaved siblings
+ * never appear.
+ */
+export function getDeliveryDiffFromSource(worktreePath, source) {
+    if (source.kind === 'range')
+        return getGitDiffRange(worktreePath, source.range);
+    return [...source.commits]
+        .reverse()
+        .map((sha) => getGitDiffRange(worktreePath, commitDiffRange(sha)))
+        .filter((p) => p !== '')
+        .join('\n');
+}
+/** Changed-files for a source: the range's name-only list, or the UNION per commit. */
+export function getDeliveryChangedFilesFromSource(worktreePath, source) {
+    if (source.kind === 'range')
+        return getChangedFilesRange(worktreePath, source.range);
+    const files = new Set();
+    for (const sha of source.commits) {
+        for (const f of getChangedFilesRange(worktreePath, commitDiffRange(sha)))
+            files.add(f);
+    }
+    return [...files];
+}
+/** Diff-stat for a source: the range's stat, or per-commit stats concatenated. */
+export function getDeliveryDiffStatFromSource(worktreePath, source) {
+    if (source.kind === 'range')
+        return getDiffStatRange(worktreePath, source.range);
+    return [...source.commits]
+        .reverse()
+        .map((sha) => getDiffStatRange(worktreePath, commitDiffRange(sha)))
+        .filter((s) => s.trim() !== '')
+        .join('\n');
+}
+/**
+ * The commits a source actually diffs, for the completeness check. A `range`
+ * source lists the range; a `commits` source is exactly its (existing) commits --
+ * so a per-delivery commit set covers itself by construction and never reads as
+ * half-blind for interleaving alone.
+ */
+export function listSourceCommits(worktreePath, source) {
+    if (source.kind === 'range')
+        return listRangeCommits(worktreePath, source.range);
+    return source.commits.filter((sha) => commitExists(worktreePath, sha));
+}
 /**
  * The delivery's diff, resolved from the range that actually contains its work
  * (see resolveDeliveryDiffRange). For a branch still ahead of base this is
@@ -180,7 +420,7 @@ export function resolveDeliveryDiffRange(worktreePath, baseBranch, recordedMerge
  * with no attributable commits it returns ''.
  */
 export function getDeliveryDiff(worktreePath, baseBranch) {
-    const range = resolveDeliveryDiffRange(worktreePath, baseBranch);
-    return range ? getGitDiffRange(worktreePath, range) : '';
+    const source = resolveDeliveryDiffSource(worktreePath, baseBranch);
+    return source ? getDeliveryDiffFromSource(worktreePath, source) : '';
 }
 //# sourceMappingURL=git-diff.js.map

package/dist/resolvers/shared/git-diff.js.map

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

package/dist/templates/agents-md.d.ts

@@ -44,6 +44,22 @@ export interface AgentsMdConnectionInvariant {
      */
     mcpRegistrationSentence?: string;
 }
+/**
+ * Render the header-LESS Codex operator seed block: the shared seed prose only,
+ * with NO per-product connection-invariant header.
+ *
+ * Used for the workstation-shared carriers a Codex session reads from the
+ * operator's own `~/.codex` -- the interactive operator AND daemon-spawned
+ * HOSTED Codex agents (whose ChatGPT-account auth lives in `~/.codex/auth.json`,
+ * so their CODEX_HOME cannot be redirected to a per-product isolated home). One
+ * workstation hosts many products, so a single shared file cannot bake a correct
+ * per-product header for more than one; the identity is resolved on demand via
+ * `telora-daemon status` instead. This is the accepted downgrade of Codex having
+ * no SessionStart hook. The per-product baked header (`renderAgentsMd`) is used
+ * only where the destination is genuinely per-product (the isolated CODEX_HOME
+ * of a local-model Codex product).
+ */
+export declare function renderCodexOperatorSeed(): string;
 /**
  * Render a fresh-repo AGENTS.md seed block.
  *