@telora/daemon 0.22.131 → 0.22.136

package/dist/resolvers/shared/delivery-trailer.d.ts

@@ -0,0 +1,99 @@
+/**
+ * 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";
+/**
+ * The explicit non-delivery sentinel trailer VALUE. A commit that legitimately
+ * belongs to no delivery -- daemon housekeeping (safety commit, WIP-on-exit
+ * capture, generated-lockfile remediation), or any genuinely delivery-less
+ * commit -- declares that by stamping `Telora-Delivery: none` rather than
+ * omitting the trailer or borrowing a real delivery id.
+ *
+ * It is a TRAILER value, not a bypass token: git's own trailer parser reads it
+ * back, so a sentinel commit is still a LABELLED commit. That keeps the verify
+ * gate's partition TOTAL -- a batch of sentinel commits is fully accounted for
+ * and stays distinguishable from a legacy pre-convention batch where the
+ * trailer is genuinely absent. The single source of truth for the literal:
+ * both the commit-msg guard (audit-hooks) and the daemon-side stamp
+ * (worktree/scratch-guard) import it from here, and the partition read below
+ * classifies it as its own third state. Compared case-insensitively.
+ */
+export declare const NON_DELIVERY_SENTINEL = "none";
+/**
+ * The trailer VALUE for delivery work the daemon captured without being able to
+ * tell which delivery it belongs to (an agent-exit or safety capture whose paths
+ * no delivery claims, or whose delivery read failed). Distinct from
+ * {@link NON_DELIVERY_SENTINEL} on purpose: `none` declares housekeeping that
+ * belongs to no delivery, while this declares real delivery work whose delivery
+ * is unknown. A capture stamped `none` held a delivery's whole implementation
+ * and verify dropped it as housekeeping on every pass (Tinker Tailor 1bc76c8e).
+ * Compared case-insensitively.
+ */
+export declare const UNATTRIBUTED_CAPTURE_SENTINEL = "unattributed";
+/**
+ * Read the RAW `Telora-Delivery` trailer value of a single commit -- the trimmed
+ * string exactly as git's trailer parser returns it. That is a delivery UUID, the
+ * literal non-delivery sentinel {@link NON_DELIVERY_SENTINEL} (`none`), or '' when
+ * the commit carries no such trailer. Empty on any git failure.
+ *
+ * NOTE: '' here collapses TWO facts (no trailer at all -- a legacy commit or a
+ * merge) and is distinct from the sentinel string. Callers that must reason about
+ * "deliberately non-delivery" vs "genuinely unattributed" -- the verify-gate
+ * partition -- MUST use {@link classifyDeliveryTrailer}, which resolves the raw
+ * value into the three states explicitly rather than overloading this string.
+ * This raw reader is retained for the write-time round-trip (confirmDeliveryTrailer)
+ * and the id-equality confirmation in resolveGitTrailerCommitSet.
+ */
+export declare function readDeliveryTrailer(worktreePath: string, sha: string): string;
+/**
+ * The four attribution states a commit's `Telora-Delivery` trailer can hold --
+ * the partition the verify gate reasons over.
+ *
+ *  - `delivery`: attributed to a specific delivery (a UUID). Its work belongs to
+ *    that delivery's evidence.
+ *  - `sentinel`: the explicit non-delivery marker ({@link NON_DELIVERY_SENTINEL}).
+ *    A DELIBERATELY unattributed commit -- daemon housekeeping (safety / WIP /
+ *    lockfile). Fully accounted for, but belongs to NO delivery's evidence.
+ *  - `unattributed_capture`: the {@link UNATTRIBUTED_CAPTURE_SENTINEL} marker. Delivery
+ *    work the daemon captured without knowing its delivery. Labelled (so a batch
+ *    of them is partitionable, like sentinels) and in NO delivery's evidence, but
+ *    it is work, not housekeeping: verify names these commits instead of
+ *    dropping them silently.
+ *  - `unattributed`: no parseable trailer. A merge commit (exempt by shape at the
+ *    hook), or a legacy / genuinely-negligent commit whose attribution is missing.
+ *    This is the state the total-attribution-failure guard reacts to.
+ *
+ * The point of the discriminated result is that `sentinel` and `unattributed` are
+ * NOT the same fact, even though the raw trailer read collapses both toward ''
+ * (unattributed) vs the literal 'none' (sentinel): a batch of all-sentinel commits
+ * is COMPLETELY attributed and the gate can render a verdict, whereas a batch with
+ * genuinely `unattributed` commits (and no delivery anchor) is the loud
+ * total-attribution failure that must NOT be laundered into apparent completeness.
+ */
+export type TrailerAttribution = {
+    readonly kind: 'delivery';
+    readonly deliveryId: string;
+} | {
+    readonly kind: 'sentinel';
+} | {
+    readonly kind: 'unattributed_capture';
+} | {
+    readonly kind: 'unattributed';
+};
+/**
+ * Classify a single commit's `Telora-Delivery` trailer into its four-state
+ * attribution. Sentinel matches are case-insensitive (matching the commit-msg
+ * guard and the stamp). A merge commit carries no trailer, so it classifies as
+ * `unattributed` -- deliberately its own-and-same as a missing-trailer commit for
+ * the read: both are excluded from every delivery's evidence, and both only feed
+ * the loudness check when there is no delivery anchor in the batch (so an
+ * incidental merge among real delivery commits never trips it).
+ */
+export declare function classifyDeliveryTrailer(worktreePath: string, sha: string): TrailerAttribution;
+/** The same rule over a trimmed value git's trailer parser already read (the batched review-window read). */
+export declare function classifyTrailerValue(raw: string): TrailerAttribution;
+//# sourceMappingURL=delivery-trailer.d.ts.map

package/dist/resolvers/shared/delivery-trailer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"delivery-trailer.d.ts","sourceRoot":"","sources":["../../../src/resolvers/shared/delivery-trailer.ts"],"names":[],"mappings":"AAkBA;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,oBAAoB,CAAC;AAEtD;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,qBAAqB,SAAS,CAAC;AAE5C;;;;;;;;;GASG;AACH,eAAO,MAAM,6BAA6B,iBAAiB,CAAC;AAE5D;;;;;;;;;;;;;GAaG;AACH,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAe7E;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,MAAM,kBAAkB,GAC1B;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC;IAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAC1D;IAAE,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;CAAE,GAC7B;IAAE,QAAQ,CAAC,IAAI,EAAE,sBAAsB,CAAA;CAAE,GACzC;IAAE,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;AAEtC;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAE7F;AAED,6GAA6G;AAC7G,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,CAKpE"}

package/dist/resolvers/shared/delivery-trailer.js

@@ -0,0 +1,103 @@
+// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
+// Pinned by: packages/daemon/src/merge/attributed-capture-merge-gate.test.ts,
+//   packages/daemon/src/resolvers/git-diff-delivery-attribution.test.ts,
+//   packages/daemon/src/shell/safety-capture-entry-points.test.ts,
+//   packages/daemon/src/worktree/capture-attribution-commit.test.ts
+// PINNED-BY-END
+/**
+ * The Telora-Delivery trailer vocabulary: the trailer key, the sentinel values a
+ * commit may carry instead of a delivery id, and the one classification rule
+ * every reader of attribution applies.
+ *
+ * Split out of resolvers/shared/git-diff.ts (file-size limit), which re-exports
+ * every name here so existing importers keep working.
+ */
+import { execSync } from 'node:child_process';
+/**
+ * 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';
+/**
+ * The explicit non-delivery sentinel trailer VALUE. A commit that legitimately
+ * belongs to no delivery -- daemon housekeeping (safety commit, WIP-on-exit
+ * capture, generated-lockfile remediation), or any genuinely delivery-less
+ * commit -- declares that by stamping `Telora-Delivery: none` rather than
+ * omitting the trailer or borrowing a real delivery id.
+ *
+ * It is a TRAILER value, not a bypass token: git's own trailer parser reads it
+ * back, so a sentinel commit is still a LABELLED commit. That keeps the verify
+ * gate's partition TOTAL -- a batch of sentinel commits is fully accounted for
+ * and stays distinguishable from a legacy pre-convention batch where the
+ * trailer is genuinely absent. The single source of truth for the literal:
+ * both the commit-msg guard (audit-hooks) and the daemon-side stamp
+ * (worktree/scratch-guard) import it from here, and the partition read below
+ * classifies it as its own third state. Compared case-insensitively.
+ */
+export const NON_DELIVERY_SENTINEL = 'none';
+/**
+ * The trailer VALUE for delivery work the daemon captured without being able to
+ * tell which delivery it belongs to (an agent-exit or safety capture whose paths
+ * no delivery claims, or whose delivery read failed). Distinct from
+ * {@link NON_DELIVERY_SENTINEL} on purpose: `none` declares housekeeping that
+ * belongs to no delivery, while this declares real delivery work whose delivery
+ * is unknown. A capture stamped `none` held a delivery's whole implementation
+ * and verify dropped it as housekeeping on every pass (Tinker Tailor 1bc76c8e).
+ * Compared case-insensitively.
+ */
+export const UNATTRIBUTED_CAPTURE_SENTINEL = 'unattributed';
+/**
+ * Read the RAW `Telora-Delivery` trailer value of a single commit -- the trimmed
+ * string exactly as git's trailer parser returns it. That is a delivery UUID, the
+ * literal non-delivery sentinel {@link NON_DELIVERY_SENTINEL} (`none`), or '' when
+ * the commit carries no such trailer. Empty on any git failure.
+ *
+ * NOTE: '' here collapses TWO facts (no trailer at all -- a legacy commit or a
+ * merge) and is distinct from the sentinel string. Callers that must reason about
+ * "deliberately non-delivery" vs "genuinely unattributed" -- the verify-gate
+ * partition -- MUST use {@link classifyDeliveryTrailer}, which resolves the raw
+ * value into the three states explicitly rather than overloading this string.
+ * This raw reader is retained for the write-time round-trip (confirmDeliveryTrailer)
+ * and the id-equality confirmation in resolveGitTrailerCommitSet.
+ */
+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 '';
+    }
+}
+/**
+ * Classify a single commit's `Telora-Delivery` trailer into its four-state
+ * attribution. Sentinel matches are case-insensitive (matching the commit-msg
+ * guard and the stamp). A merge commit carries no trailer, so it classifies as
+ * `unattributed` -- deliberately its own-and-same as a missing-trailer commit for
+ * the read: both are excluded from every delivery's evidence, and both only feed
+ * the loudness check when there is no delivery anchor in the batch (so an
+ * incidental merge among real delivery commits never trips it).
+ */
+export function classifyDeliveryTrailer(worktreePath, sha) {
+    return classifyTrailerValue(readDeliveryTrailer(worktreePath, sha));
+}
+/** The same rule over a trimmed value git's trailer parser already read (the batched review-window read). */
+export function classifyTrailerValue(raw) {
+    if (raw === '')
+        return { kind: 'unattributed' };
+    if (raw.toLowerCase() === NON_DELIVERY_SENTINEL.toLowerCase())
+        return { kind: 'sentinel' };
+    if (raw.toLowerCase() === UNATTRIBUTED_CAPTURE_SENTINEL.toLowerCase())
+        return { kind: 'unattributed_capture' };
+    return { kind: 'delivery', deliveryId: raw };
+}
+//# sourceMappingURL=delivery-trailer.js.map

package/dist/resolvers/shared/delivery-trailer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"delivery-trailer.js","sourceRoot":"","sources":["../../../src/resolvers/shared/delivery-trailer.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,8EAA8E;AAC9E,yEAAyE;AACzE,mEAAmE;AACnE,oEAAoE;AACpE,gBAAgB;AAEhB;;;;;;;GAOG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAE9C;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC;AAEtD;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC;AAE5C;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,cAAc,CAAC;AAE5D;;;;;;;;;;;;;GAaG;AACH,MAAM,UAAU,mBAAmB,CAAC,YAAoB,EAAE,GAAW;IACnE,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IACjC,IAAI,KAAK,KAAK,EAAE;QAAE,OAAO,EAAE,CAAC;IAC5B,IAAI,CAAC;QACH,8EAA8E;QAC9E,MAAM,GAAG,GAAG,QAAQ,CAClB,wCAAwC,oBAAoB,gBAAgB,KAAK,WAAW,EAC5F,EAAE,GAAG,EAAE,YAAY,EAAE,SAAS,EAAE,IAAI,GAAG,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CACjE,CAAC;QACF,wEAAwE;QACxE,qEAAqE;QACrE,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;IAC1E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAiCD;;;;;;;;GAQG;AACH,MAAM,UAAU,uBAAuB,CAAC,YAAoB,EAAE,GAAW;IACvE,OAAO,oBAAoB,CAAC,mBAAmB,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,6GAA6G;AAC7G,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,IAAI,GAAG,KAAK,EAAE;QAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC;IAChD,IAAI,GAAG,CAAC,WAAW,EAAE,KAAK,qBAAqB,CAAC,WAAW,EAAE;QAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;IAC3F,IAAI,GAAG,CAAC,WAAW,EAAE,KAAK,6BAA6B,CAAC,WAAW,EAAE;QAAE,OAAO,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC;IAC/G,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,EAAE,CAAC;AAC/C,CAAC"}

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

@@ -1,3 +1,4 @@
+export { DELIVERY_TRAILER_KEY, NON_DELIVERY_SENTINEL, UNATTRIBUTED_CAPTURE_SENTINEL, readDeliveryTrailer, classifyDeliveryTrailer, classifyTrailerValue, type TrailerAttribution, } from './delivery-trailer.js';
 export declare const MAX_DIFF_BYTES: number;
 /**
  * Run `git diff <range>` in a worktree. Returns the raw diff output, or empty
@@ -112,86 +113,6 @@ export declare function resolveRecordedCommitRange(worktreePath: string, commitS
  * the reason this source exists rather than deriving the boundary from that array.
  */
 export declare function resolveRecordedFastForwardRange(worktreePath: string, preMergeRef: string | null | undefined, mergeBackSha: 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";
-/**
- * The explicit non-delivery sentinel trailer VALUE. A commit that legitimately
- * belongs to no delivery -- daemon housekeeping (safety commit, WIP-on-exit
- * capture, generated-lockfile remediation), or any genuinely delivery-less
- * commit -- declares that by stamping `Telora-Delivery: none` rather than
- * omitting the trailer or borrowing a real delivery id.
- *
- * It is a TRAILER value, not a bypass token: git's own trailer parser reads it
- * back, so a sentinel commit is still a LABELLED commit. That keeps the verify
- * gate's partition TOTAL -- a batch of sentinel commits is fully accounted for
- * and stays distinguishable from a legacy pre-convention batch where the
- * trailer is genuinely absent. The single source of truth for the literal:
- * both the commit-msg guard (audit-hooks) and the daemon-side stamp
- * (worktree/scratch-guard) import it from here, and the partition read below
- * classifies it as its own third state. Compared case-insensitively.
- */
-export declare const NON_DELIVERY_SENTINEL = "none";
-/**
- * Read the RAW `Telora-Delivery` trailer value of a single commit -- the trimmed
- * string exactly as git's trailer parser returns it. That is a delivery UUID, the
- * literal non-delivery sentinel {@link NON_DELIVERY_SENTINEL} (`none`), or '' when
- * the commit carries no such trailer. Empty on any git failure.
- *
- * NOTE: '' here collapses TWO facts (no trailer at all -- a legacy commit or a
- * merge) and is distinct from the sentinel string. Callers that must reason about
- * "deliberately non-delivery" vs "genuinely unattributed" -- the verify-gate
- * partition -- MUST use {@link classifyDeliveryTrailer}, which resolves the raw
- * value into the three states explicitly rather than overloading this string.
- * This raw reader is retained for the write-time round-trip (confirmDeliveryTrailer)
- * and the id-equality confirmation in resolveGitTrailerCommitSet.
- */
-export declare function readDeliveryTrailer(worktreePath: string, sha: string): string;
-/**
- * The three attribution states a commit's `Telora-Delivery` trailer can hold --
- * the partition the verify gate reasons over.
- *
- *  - `delivery`: attributed to a specific delivery (a UUID). Its work belongs to
- *    that delivery's evidence.
- *  - `sentinel`: the explicit non-delivery marker ({@link NON_DELIVERY_SENTINEL}).
- *    A DELIBERATELY unattributed commit -- daemon housekeeping (safety / WIP /
- *    lockfile). Fully accounted for, but belongs to NO delivery's evidence.
- *  - `unattributed`: no parseable trailer. A merge commit (exempt by shape at the
- *    hook), or a legacy / genuinely-negligent commit whose attribution is missing.
- *    This is the state the total-attribution-failure guard reacts to.
- *
- * The point of the discriminated result is that `sentinel` and `unattributed` are
- * NOT the same fact, even though the raw trailer read collapses both toward ''
- * (unattributed) vs the literal 'none' (sentinel): a batch of all-sentinel commits
- * is COMPLETELY attributed and the gate can render a verdict, whereas a batch with
- * genuinely `unattributed` commits (and no delivery anchor) is the loud
- * total-attribution failure that must NOT be laundered into apparent completeness.
- */
-export type TrailerAttribution = {
-    readonly kind: 'delivery';
-    readonly deliveryId: string;
-} | {
-    readonly kind: 'sentinel';
-} | {
-    readonly kind: 'unattributed';
-};
-/**
- * Classify a single commit's `Telora-Delivery` trailer into its three-state
- * attribution. Sentinel match is case-insensitive (matching the commit-msg guard
- * and the stamp). A merge commit carries no trailer, so it classifies as
- * `unattributed` -- deliberately its own-and-same as a missing-trailer commit for
- * the read: both are excluded from every delivery's evidence, and both only feed
- * the loudness check when there is no delivery anchor in the batch (so an
- * incidental merge among real delivery commits never trips it).
- */
-export declare function classifyDeliveryTrailer(worktreePath: string, sha: string): TrailerAttribution;
-/** The same rule over a trimmed value git's trailer parser already read (the batched review-window read). */
-export declare function classifyTrailerValue(raw: string): TrailerAttribution;
 /** Outcome of a write-time trailer confirmation (confirmDeliveryTrailer). */
 export interface TrailerConfirmation {
     /** True when the commit's Telora-Delivery trailer parses AFTER this call. */
@@ -230,6 +151,12 @@ export interface TrailerConfirmation {
  * a commit whose trailer already parses returns ok:true, amended:false untouched.
  */
 export declare function confirmDeliveryTrailer(worktreePath: string, sha: string, expectedDeliveryId?: string): TrailerConfirmation;
+/**
+ * Recorded commit credits (commit_attributions): sha (lower-case) -> the delivery
+ * the commit is credited to, whatever its trailer says. Read by the verify deps
+ * layer and passed into the selection functions below, which stay pure over it.
+ */
+export type CommitCredits = ReadonlyMap<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
@@ -252,7 +179,7 @@ export declare function confirmDeliveryTrailer(worktreePath: string, sha: string
  * 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[];
+export declare function filterCommitsByDelivery(worktreePath: string, commitShas: string[] | null | undefined, deliveryId: string, credits?: CommitCredits): string[];
 /**
  * From a focus's WHOLE recorded merge history (every batch's commit set), return
  * exactly THIS delivery's own commits -- the commits whose `Telora-Delivery`
@@ -279,7 +206,7 @@ export declare function filterCommitsByDelivery(worktreePath: string, commitShas
  * expects; a delivery split across batches is non-contiguous and resolves to a
  * `commits` source (diffed commit-by-commit) downstream.
  */
-export declare function selectDeliveryCommitsAcrossBatches(worktreePath: string, batches: (string[] | null | undefined)[], deliveryId: string): string[] | null;
+export declare function selectDeliveryCommitsAcrossBatches(worktreePath: string, batches: (string[] | null | undefined)[], deliveryId: string, credits?: CommitCredits): string[] | null;
 /**
  * Does ANY commit in a batch attribute to a real DELIVERY (a UUID trailer)?
  *
@@ -294,7 +221,7 @@ export declare function selectDeliveryCommitsAcrossBatches(worktreePath: string,
  * with unattributed commits and no delivery anchor is broken). The caller combines
  * these.
  */
-export declare function batchHasDeliveryTrailer(worktreePath: string, commitShas: string[] | null | undefined): boolean;
+export declare function batchHasDeliveryTrailer(worktreePath: string, commitShas: string[] | null | undefined, credits?: CommitCredits): boolean;
 /**
  * Does ANY commit in a batch carry NO parseable attribution at all -- neither a
  * delivery trailer nor the non-delivery sentinel?
@@ -305,7 +232,7 @@ export declare function batchHasDeliveryTrailer(worktreePath: string, commitShas
  * work or an explicit sentinel. When it is true and the batch carries no delivery
  * anchor, on a multi-delivery focus, that is the loud total-attribution failure.
  */
-export declare function batchHasUnattributedCommit(worktreePath: string, commitShas: string[] | null | undefined): boolean;
+export declare function batchHasUnattributedCommit(worktreePath: string, commitShas: string[] | null | undefined, credits?: CommitCredits): boolean;
 /**
  * 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

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":"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"}
+{"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

@@ -20,6 +20,8 @@
  * Git diff helpers shared across resolvers.
  */
 import { execSync } from 'node:child_process';
+import { DELIVERY_TRAILER_KEY, classifyDeliveryTrailer, readDeliveryTrailer, } from './delivery-trailer.js';
+export { DELIVERY_TRAILER_KEY, NON_DELIVERY_SENTINEL, UNATTRIBUTED_CAPTURE_SENTINEL, readDeliveryTrailer, classifyDeliveryTrailer, classifyTrailerValue, } from './delivery-trailer.js';
 export const MAX_DIFF_BYTES = 50 * 1024; // 50 KB truncation limit for git diffs
 /**
  * Run `git diff <range>` in a worktree. Returns the raw diff output, or empty
@@ -266,80 +268,6 @@ export function resolveRecordedFastForwardRange(worktreePath, preMergeRef, merge
     }
     return `${baseSha}...${tipSha}`;
 }
-/**
- * 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';
-/**
- * The explicit non-delivery sentinel trailer VALUE. A commit that legitimately
- * belongs to no delivery -- daemon housekeeping (safety commit, WIP-on-exit
- * capture, generated-lockfile remediation), or any genuinely delivery-less
- * commit -- declares that by stamping `Telora-Delivery: none` rather than
- * omitting the trailer or borrowing a real delivery id.
- *
- * It is a TRAILER value, not a bypass token: git's own trailer parser reads it
- * back, so a sentinel commit is still a LABELLED commit. That keeps the verify
- * gate's partition TOTAL -- a batch of sentinel commits is fully accounted for
- * and stays distinguishable from a legacy pre-convention batch where the
- * trailer is genuinely absent. The single source of truth for the literal:
- * both the commit-msg guard (audit-hooks) and the daemon-side stamp
- * (worktree/scratch-guard) import it from here, and the partition read below
- * classifies it as its own third state. Compared case-insensitively.
- */
-export const NON_DELIVERY_SENTINEL = 'none';
-/**
- * Read the RAW `Telora-Delivery` trailer value of a single commit -- the trimmed
- * string exactly as git's trailer parser returns it. That is a delivery UUID, the
- * literal non-delivery sentinel {@link NON_DELIVERY_SENTINEL} (`none`), or '' when
- * the commit carries no such trailer. Empty on any git failure.
- *
- * NOTE: '' here collapses TWO facts (no trailer at all -- a legacy commit or a
- * merge) and is distinct from the sentinel string. Callers that must reason about
- * "deliberately non-delivery" vs "genuinely unattributed" -- the verify-gate
- * partition -- MUST use {@link classifyDeliveryTrailer}, which resolves the raw
- * value into the three states explicitly rather than overloading this string.
- * This raw reader is retained for the write-time round-trip (confirmDeliveryTrailer)
- * and the id-equality confirmation in resolveGitTrailerCommitSet.
- */
-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 '';
-    }
-}
-/**
- * Classify a single commit's `Telora-Delivery` trailer into its three-state
- * attribution. Sentinel match is case-insensitive (matching the commit-msg guard
- * and the stamp). A merge commit carries no trailer, so it classifies as
- * `unattributed` -- deliberately its own-and-same as a missing-trailer commit for
- * the read: both are excluded from every delivery's evidence, and both only feed
- * the loudness check when there is no delivery anchor in the batch (so an
- * incidental merge among real delivery commits never trips it).
- */
-export function classifyDeliveryTrailer(worktreePath, sha) {
-    return classifyTrailerValue(readDeliveryTrailer(worktreePath, sha));
-}
-/** The same rule over a trimmed value git's trailer parser already read (the batched review-window read). */
-export function classifyTrailerValue(raw) {
-    if (raw === '')
-        return { kind: 'unattributed' };
-    if (raw.toLowerCase() === NON_DELIVERY_SENTINEL.toLowerCase())
-        return { kind: 'sentinel' };
-    return { kind: 'delivery', deliveryId: raw };
-}
 /**
  * The intended delivery id carried by a commit whose `Telora-Delivery` trailer
  * did NOT parse -- recovered from a `Telora-Delivery:` line sitting in the commit
@@ -431,6 +359,11 @@ export function confirmDeliveryTrailer(worktreePath, sha, expectedDeliveryId) {
     }
     return { ok: true, amended: true, deliveryId: reparsed };
 }
+/** A commit's attribution: its recorded credit when there is one, else its trailer. */
+function classifyCredited(worktreePath, sha, credits) {
+    const credited = credits?.get(sha.toLowerCase());
+    return credited ? { kind: 'delivery', deliveryId: credited } : classifyDeliveryTrailer(worktreePath, sha);
+}
 /**
  * Partition a RECORDED batch commit set (focus_merges.commit_shas, which spans
  * every delivery merged together) down to the commits attributable to ONE
@@ -453,12 +386,12 @@ export function confirmDeliveryTrailer(worktreePath, sha, expectedDeliveryId) {
  * Order is preserved (newest-first), so the result still forms the contiguous
  * chain resolveRecordedCommitRange expects.
  */
-export function filterCommitsByDelivery(worktreePath, commitShas, deliveryId) {
+export function filterCommitsByDelivery(worktreePath, commitShas, deliveryId, credits) {
     const shas = (commitShas ?? []).map((s) => s.trim()).filter((s) => s !== '');
     if (shas.length === 0)
         return [];
     const wanted = (deliveryId ?? '').trim();
-    const classified = shas.map((sha) => ({ sha, attr: classifyDeliveryTrailer(worktreePath, sha) }));
+    const classified = shas.map((sha) => ({ sha, attr: classifyCredited(worktreePath, sha, credits) }));
     // Partitionable when SOME commit carries attribution -- a delivery id or the
     // sentinel. An all-`unattributed` batch is the un-partitionable legacy case.
     const anyAttributed = classified.some((c) => c.attr.kind !== 'unattributed');
@@ -496,7 +429,7 @@ export function filterCommitsByDelivery(worktreePath, commitShas, deliveryId) {
  * expects; a delivery split across batches is non-contiguous and resolves to a
  * `commits` source (diffed commit-by-commit) downstream.
  */
-export function selectDeliveryCommitsAcrossBatches(worktreePath, batches, deliveryId) {
+export function selectDeliveryCommitsAcrossBatches(worktreePath, batches, deliveryId, credits) {
     const wanted = (deliveryId ?? '').trim();
     const seen = new Set();
     const flat = [];
@@ -511,14 +444,14 @@ export function selectDeliveryCommitsAcrossBatches(worktreePath, batches, delive
     }
     if (flat.length === 0)
         return null; // nothing recorded -> caller uses single-row fallback
-    const classified = flat.map((sha) => ({ sha, attr: classifyDeliveryTrailer(worktreePath, sha) }));
+    const classified = flat.map((sha) => ({ sha, attr: classifyCredited(worktreePath, sha, credits) }));
     const anyAttributed = classified.some((c) => c.attr.kind !== 'unattributed');
     if (!anyAttributed)
         return null; // un-partitionable legacy focus -> single-row fallback
     if (wanted === '')
         return null; // no delivery to attribute by -> single-row fallback
-    // Only this delivery's own commits: sentinel (housekeeping) and other-delivery
-    // and untrailered commits all fall out.
+    // Only this delivery's own commits: sentinel (housekeeping), unattributed
+    // capture, other-delivery and untrailered commits all fall out.
     return classified
         .filter((c) => c.attr.kind === 'delivery' && c.attr.deliveryId === wanted)
         .map((c) => c.sha);
@@ -537,9 +470,9 @@ export function selectDeliveryCommitsAcrossBatches(worktreePath, batches, delive
  * with unattributed commits and no delivery anchor is broken). The caller combines
  * these.
  */
-export function batchHasDeliveryTrailer(worktreePath, commitShas) {
+export function batchHasDeliveryTrailer(worktreePath, commitShas, credits) {
     const shas = (commitShas ?? []).map((s) => s.trim()).filter((s) => s !== '');
-    return shas.some((sha) => classifyDeliveryTrailer(worktreePath, sha).kind === 'delivery');
+    return shas.some((sha) => classifyCredited(worktreePath, sha, credits).kind === 'delivery');
 }
 /**
  * Does ANY commit in a batch carry NO parseable attribution at all -- neither a
@@ -551,9 +484,9 @@ export function batchHasDeliveryTrailer(worktreePath, commitShas) {
  * work or an explicit sentinel. When it is true and the batch carries no delivery
  * anchor, on a multi-delivery focus, that is the loud total-attribution failure.
  */
-export function batchHasUnattributedCommit(worktreePath, commitShas) {
+export function batchHasUnattributedCommit(worktreePath, commitShas, credits) {
     const shas = (commitShas ?? []).map((s) => s.trim()).filter((s) => s !== '');
-    return shas.some((sha) => classifyDeliveryTrailer(worktreePath, sha).kind === 'unattributed');
+    return shas.some((sha) => classifyCredited(worktreePath, sha, credits).kind === 'unattributed');
 }
 /**
  * The commit SHAs contained in a diff range (`git rev-list <range>`). Empty on