@telora/daemon 0.22.245 → 0.22.289

package/dist/delivery/advance-hold.d.ts

@@ -0,0 +1,71 @@
+import { type DeliveryGateRowIo } from '../queries/deliveries/deliveries.js';
+import { type DeliveryGateState } from '../queries/delivery-gate-state/delivery-gate-state.js';
+import type { AdvanceHoldDetail } from '../queries/delivery-gate-state/delivery-gate-holds.js';
+import type { AdvancePrecheckHold, AdvancePrecheckResult } from './delivery-advance-block.js';
+/** The guard names of the paired `blocking` entries -- one per hold reason. */
+export declare const ADVANCE_HOLD_GUARDS: ReadonlySet<string>;
+/** At most this many paths are named; the count carries the rest. */
+export declare const ADVANCE_HOLD_PATH_CAP = 20;
+/**
+ * The uncommitted paths in a worktree, as `git status --porcelain` names them
+ * (a rename names its destination). Empty when git cannot be read -- the hold
+ * is still recorded, just without paths.
+ */
+export declare function listUncommittedPaths(worktreePath: string): string[];
+/** Build the hold detail for a precheck refusal. Pure over its inputs. */
+export declare function buildAdvanceHold(hold: AdvancePrecheckHold, uncommittedPaths: readonly string[], nowIso: string): AdvanceHoldDetail;
+/**
+ * The gate_state with `hold` recorded, merged over what the row already carries
+ * (verification history and any other key survive). Returns undefined when the
+ * same hold is already recorded, so a hold that stands across polls writes once.
+ * `heldSince` is kept from the standing record when only the paths changed.
+ */
+export declare function withAdvanceHold(prior: DeliveryGateState | null, hold: AdvanceHoldDetail): DeliveryGateState | undefined;
+/** The gate_state with any advance hold removed; undefined when there is none. */
+export declare function withoutAdvanceHold(prior: DeliveryGateState | null): DeliveryGateState | undefined;
+/**
+ * The collaborators an advance-hold write runs over: the delivery row IO, the
+ * uncommitted-path read and the clock. All required -- the composition root
+ * binds production (composition/advance-precheck-context.ts); a test
+ * passes its own.
+ */
+export interface AdvanceHoldDeps {
+    io: DeliveryGateRowIo;
+    listUncommittedPaths: (worktreePath: string) => string[];
+    now: () => string;
+}
+/** Record a precheck refusal on one delivery (recordAdvanceHold bound to its deps). */
+export type AdvanceHoldRecorder = (deliveryId: string, hold: AdvancePrecheckHold) => Promise<void>;
+/** Clear a recorded advance hold on one delivery (clearAdvanceHold bound to its deps). */
+export type AdvanceHoldClearer = (deliveryId: string) => Promise<void>;
+/**
+ * Record a precheck refusal on the delivery's gate_state, at the row's own
+ * status and in its serialized write turn. A standing identical hold writes
+ * nothing. Throws what the row read/write throws; the caller logs and moves on.
+ */
+export declare function recordAdvanceHold(deliveryId: string, hold: AdvancePrecheckHold, deps: AdvanceHoldDeps): Promise<void>;
+/**
+ * Clear a recorded advance hold (the delivery re-opened: it holds open work
+ * again, so nothing is waiting on the advance). No write when there is none.
+ */
+export declare function clearAdvanceHold(deliveryId: string, deps: Pick<AdvanceHoldDeps, 'io'>): Promise<void>;
+/** The record/clear pair bound to one set of deps -- what the advance passes take. */
+export declare function bindAdvanceHold(deps: AdvanceHoldDeps): {
+    record: AdvanceHoldRecorder;
+    clear: AdvanceHoldClearer;
+};
+/**
+ * An advance the precheck refused: log it, and name the hold where the team and
+ * the dashboard read it -- a finished delivery held at coding otherwise looks
+ * stuck, and a team that cannot see why escalates for a status the daemon owns.
+ * The live pass (focus/focus-poller-auto-advance.ts) and the team-exit pass
+ * (completion/team-exit/status-advance-phase.ts) both call it, each with the
+ * recorder the composition root bound. Logs, never throws.
+ */
+export declare function noteAdvanceRefused(delivery: {
+    id: string;
+    name: string;
+}, precheck: AdvancePrecheckResult, record: AdvanceHoldRecorder): Promise<void>;
+/** Whether a delivery's gate_state (as read) carries an advance hold. */
+export declare function hasAdvanceHold(gateState: unknown): boolean;
+//# sourceMappingURL=advance-hold.d.ts.map

package/dist/delivery/advance-hold.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"advance-hold.d.ts","sourceRoot":"","sources":["../../src/delivery/advance-hold.ts"],"names":[],"mappings":"AAkCA,OAAO,EAAuC,KAAK,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAClH,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,uDAAuD,CAAC;AAC/F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uDAAuD,CAAC;AAC/F,OAAO,KAAK,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,MAAM,6BAA6B,CAAC;AAK9F,+EAA+E;AAC/E,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,MAAM,CAGlD,CAAC;AAEH,qEAAqE;AACrE,eAAO,MAAM,qBAAqB,KAAK,CAAC;AAExC;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,CAcnE;AAED,0EAA0E;AAC1E,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,mBAAmB,EACzB,gBAAgB,EAAE,SAAS,MAAM,EAAE,EACnC,MAAM,EAAE,MAAM,GACb,iBAAiB,CAWnB;AAeD;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,iBAAiB,GAAG,IAAI,EAC/B,IAAI,EAAE,iBAAiB,GACtB,iBAAiB,GAAG,SAAS,CAW/B;AAED,kFAAkF;AAClF,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,iBAAiB,GAAG,IAAI,GAAG,iBAAiB,GAAG,SAAS,CAOjG;AAED;;;;;GAKG;AACH,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,iBAAiB,CAAC;IACtB,oBAAoB,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IACzD,GAAG,EAAE,MAAM,MAAM,CAAC;CACnB;AAED,uFAAuF;AACvF,MAAM,MAAM,mBAAmB,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEnG,0FAA0F;AAC1F,MAAM,MAAM,kBAAkB,GAAG,CAAC,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;AAEvE;;;;GAIG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,mBAAmB,EACzB,IAAI,EAAE,eAAe,GACpB,OAAO,CAAC,IAAI,CAAC,CAIf;AAED;;;GAGG;AACH,wBAAsB,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3G;AAED,sFAAsF;AACtF,wBAAgB,eAAe,CAAC,IAAI,EAAE,eAAe,GAAG;IAAE,MAAM,EAAE,mBAAmB,CAAC;IAAC,KAAK,EAAE,kBAAkB,CAAA;CAAE,CAKjH;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACtC,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,IAAI,CAAC,CAKf;AAED,yEAAyE;AACzE,wBAAgB,cAAc,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAG1D"}

package/dist/delivery/advance-hold.js

@@ -0,0 +1,161 @@
+// PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
+// Pinned by: packages/daemon/src/delivery/advance-hold.test.ts
+// PINNED-BY-END
+/**
+ * A held advance names its reason where the team reads it.
+ *
+ * A finished delivery (every work issue Done) advances coding -> verify on the
+ * live focus poller pass (focus/focus-poller-auto-advance.ts) only when the daemon's
+ * precheck (delivery/delivery-advance-block.ts ensureWorktreeCommittedBeforeAdvance)
+ * admits it: the focus worktree -- which EVERY delivery of the focus shares --
+ * must be committed, and no verify command may be running in it. The team
+ * prompt promises the advance is automatic, so a refusal must be visible to the
+ * team where it reads, not only in the daemon log.
+ *
+ * This module puts the refusal on the delivery's gate_state: a `blocking` entry
+ * named for the hold (the `verify_evidence_unavailable` shape -- a named guard
+ * plus its own detail key) and `advanceHold`, which names the worktree and, for
+ * uncommitted work, the paths. A sibling's uncommitted edits hold a finished
+ * delivery too, which is exactly why the paths are named. The dashboard's
+ * Waiting-on line (src/lib/dashboard/deliveryCardUtils.ts formatGateBlockers)
+ * and a team reading the delivery through telora_product_delivery both see it.
+ *
+ * Cleared on the tick the advance lands (the advance write carries only the
+ * verification history, so the entry does not survive it) and when the delivery
+ * re-opens with open work ({@link clearAdvanceHold}). A guard block is a
+ * different path (transition_blocks + a guard-recorded gate_state) and is untouched.
+ *
+ * History: docs/daemon/history-team-lifecycle.md (delivery/advance-hold.ts).
+ *
+ * @module delivery/advance-hold
+ */
+import { runGitSync } from '../git/index.js';
+import { rewriteDeliveryGateStateAtOwnStatus } from '../queries/deliveries/deliveries.js';
+import { createLogger } from '../log/daemon-log.js';
+const log = createLogger({ module: 'advance-hold' });
+/** The guard names of the paired `blocking` entries -- one per hold reason. */
+export const ADVANCE_HOLD_GUARDS = new Set([
+    'worktree_uncommitted',
+    'verify_in_flight',
+]);
+/** At most this many paths are named; the count carries the rest. */
+export const ADVANCE_HOLD_PATH_CAP = 20;
+/**
+ * The uncommitted paths in a worktree, as `git status --porcelain` names them
+ * (a rename names its destination). Empty when git cannot be read -- the hold
+ * is still recorded, just without paths.
+ */
+export function listUncommittedPaths(worktreePath) {
+    const result = runGitSync(['status', '--porcelain', '--untracked-files=all'], worktreePath);
+    if (!result.success)
+        return [];
+    // The runner trims its output, so the FIRST line may have lost the leading
+    // blank of its two-column status (" M a.ts" -> "M a.ts"): strip the status
+    // columns by pattern, never by a fixed width.
+    return result.output
+        .split('\n')
+        .map((line) => line.replace(/^[ MTADRCU?!]{1,2} /, ''))
+        .filter((path) => path.length > 0)
+        .map((path) => {
+        const arrow = path.indexOf(' -> ');
+        return arrow >= 0 ? path.slice(arrow + 4) : path;
+    });
+}
+/** Build the hold detail for a precheck refusal. Pure over its inputs. */
+export function buildAdvanceHold(hold, uncommittedPaths, nowIso) {
+    if (hold.kind === 'verify_in_flight') {
+        return { reason: hold.kind, worktreePath: hold.worktreePath, heldSince: nowIso };
+    }
+    return {
+        reason: hold.kind,
+        worktreePath: hold.worktreePath,
+        uncommittedPaths: uncommittedPaths.slice(0, ADVANCE_HOLD_PATH_CAP),
+        uncommittedPathCount: uncommittedPaths.length,
+        heldSince: nowIso,
+    };
+}
+function sameHold(a, b) {
+    return a !== undefined
+        && a.reason === b.reason
+        && a.worktreePath === b.worktreePath
+        && JSON.stringify(a.uncommittedPaths ?? []) === JSON.stringify(b.uncommittedPaths ?? [])
+        && (a.uncommittedPathCount ?? 0) === (b.uncommittedPathCount ?? 0);
+}
+/** Drop any advance-hold entry from a blocking list. */
+function withoutHoldGuards(blocking) {
+    return (blocking ?? []).filter((b) => !ADVANCE_HOLD_GUARDS.has(b.guardName));
+}
+/**
+ * The gate_state with `hold` recorded, merged over what the row already carries
+ * (verification history and any other key survive). Returns undefined when the
+ * same hold is already recorded, so a hold that stands across polls writes once.
+ * `heldSince` is kept from the standing record when only the paths changed.
+ */
+export function withAdvanceHold(prior, hold) {
+    const standing = prior?.advanceHold;
+    if (sameHold(standing, hold))
+        return undefined;
+    const heldSince = standing?.reason === hold.reason ? standing.heldSince : hold.heldSince;
+    return {
+        ...(prior ?? { warnings: [] }),
+        blocking: [...withoutHoldGuards(prior?.blocking), { guardName: hold.reason, passed: false }],
+        warnings: prior?.warnings ?? [],
+        evaluatedAt: hold.heldSince,
+        advanceHold: { ...hold, heldSince },
+    };
+}
+/** The gate_state with any advance hold removed; undefined when there is none. */
+export function withoutAdvanceHold(prior) {
+    if (!prior)
+        return undefined;
+    const hasEntry = (prior.blocking ?? []).some((b) => ADVANCE_HOLD_GUARDS.has(b.guardName));
+    if (prior.advanceHold === undefined && !hasEntry)
+        return undefined;
+    const next = { ...prior, blocking: withoutHoldGuards(prior.blocking) };
+    delete next.advanceHold;
+    return next;
+}
+/**
+ * Record a precheck refusal on the delivery's gate_state, at the row's own
+ * status and in its serialized write turn. A standing identical hold writes
+ * nothing. Throws what the row read/write throws; the caller logs and moves on.
+ */
+export async function recordAdvanceHold(deliveryId, hold, deps) {
+    const paths = hold.kind === 'worktree_uncommitted' ? deps.listUncommittedPaths(hold.worktreePath) : [];
+    const detail = buildAdvanceHold(hold, paths, deps.now());
+    await rewriteDeliveryGateStateAtOwnStatus(deliveryId, ({ gateState }) => withAdvanceHold(gateState, detail), { io: deps.io });
+}
+/**
+ * Clear a recorded advance hold (the delivery re-opened: it holds open work
+ * again, so nothing is waiting on the advance). No write when there is none.
+ */
+export async function clearAdvanceHold(deliveryId, deps) {
+    await rewriteDeliveryGateStateAtOwnStatus(deliveryId, ({ gateState }) => withoutAdvanceHold(gateState), { io: deps.io });
+}
+/** The record/clear pair bound to one set of deps -- what the advance passes take. */
+export function bindAdvanceHold(deps) {
+    return {
+        record: (deliveryId, hold) => recordAdvanceHold(deliveryId, hold, deps),
+        clear: (deliveryId) => clearAdvanceHold(deliveryId, deps),
+    };
+}
+/**
+ * An advance the precheck refused: log it, and name the hold where the team and
+ * the dashboard read it -- a finished delivery held at coding otherwise looks
+ * stuck, and a team that cannot see why escalates for a status the daemon owns.
+ * The live pass (focus/focus-poller-auto-advance.ts) and the team-exit pass
+ * (completion/team-exit/status-advance-phase.ts) both call it, each with the
+ * recorder the composition root bound. Logs, never throws.
+ */
+export async function noteAdvanceRefused(delivery, precheck, record) {
+    log.info(`Skip auto-advance of "${delivery.name}": ${precheck.reason}`);
+    if (!precheck.hold)
+        return;
+    await record(delivery.id, precheck.hold).catch((err) => log.warn(`Recording the advance hold on "${delivery.name}" failed: ${err.message}`));
+}
+/** Whether a delivery's gate_state (as read) carries an advance hold. */
+export function hasAdvanceHold(gateState) {
+    return gateState != null && typeof gateState === 'object'
+        && gateState.advanceHold != null;
+}
+//# sourceMappingURL=advance-hold.js.map

package/dist/delivery/advance-hold.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"advance-hold.js","sourceRoot":"","sources":["../../src/delivery/advance-hold.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAC9F,+DAA+D;AAC/D,gBAAgB;AAEhB;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,mCAAmC,EAA0B,MAAM,qCAAqC,CAAC;AAIlH,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;AAErD,+EAA+E;AAC/E,MAAM,CAAC,MAAM,mBAAmB,GAAwB,IAAI,GAAG,CAA8B;IAC3F,sBAAsB;IACtB,kBAAkB;CACnB,CAAC,CAAC;AAEH,qEAAqE;AACrE,MAAM,CAAC,MAAM,qBAAqB,GAAG,EAAE,CAAC;AAExC;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,YAAoB;IACvD,MAAM,MAAM,GAAG,UAAU,CAAC,CAAC,QAAQ,EAAE,aAAa,EAAE,uBAAuB,CAAC,EAAE,YAAY,CAAC,CAAC;IAC5F,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,OAAO,EAAE,CAAC;IAC/B,2EAA2E;IAC3E,2EAA2E;IAC3E,8CAA8C;IAC9C,OAAO,MAAM,CAAC,MAAM;SACjB,KAAK,CAAC,IAAI,CAAC;SACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC;SACtD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;SACjC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACZ,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACnC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACnD,CAAC,CAAC,CAAC;AACP,CAAC;AAED,0EAA0E;AAC1E,MAAM,UAAU,gBAAgB,CAC9B,IAAyB,EACzB,gBAAmC,EACnC,MAAc;IAEd,IAAI,IAAI,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACrC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;IACnF,CAAC;IACD,OAAO;QACL,MAAM,EAAE,IAAI,CAAC,IAAI;QACjB,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,gBAAgB,EAAE,gBAAgB,CAAC,KAAK,CAAC,CAAC,EAAE,qBAAqB,CAAC;QAClE,oBAAoB,EAAE,gBAAgB,CAAC,MAAM;QAC7C,SAAS,EAAE,MAAM;KAClB,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,CAAgC,EAAE,CAAoB;IACtE,OAAO,CAAC,KAAK,SAAS;WACjB,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM;WACrB,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,YAAY;WACjC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,gBAAgB,IAAI,EAAE,CAAC;WACrF,CAAC,CAAC,CAAC,oBAAoB,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,oBAAoB,IAAI,CAAC,CAAC,CAAC;AACvE,CAAC;AAED,wDAAwD;AACxD,SAAS,iBAAiB,CAAC,QAAmD;IAC5E,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAC/E,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAC7B,KAA+B,EAC/B,IAAuB;IAEvB,MAAM,QAAQ,GAAG,KAAK,EAAE,WAAW,CAAC;IACpC,IAAI,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC;QAAE,OAAO,SAAS,CAAC;IAC/C,MAAM,SAAS,GAAG,QAAQ,EAAE,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;IACzF,OAAO;QACL,GAAG,CAAC,KAAK,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QAC9B,QAAQ,EAAE,CAAC,GAAG,iBAAiB,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;QAC5F,QAAQ,EAAE,KAAK,EAAE,QAAQ,IAAI,EAAE;QAC/B,WAAW,EAAE,IAAI,CAAC,SAAS;QAC3B,WAAW,EAAE,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE;KACpC,CAAC;AACJ,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,kBAAkB,CAAC,KAA+B;IAChE,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAC1F,IAAI,KAAK,CAAC,WAAW,KAAK,SAAS,IAAI,CAAC,QAAQ;QAAE,OAAO,SAAS,CAAC;IACnE,MAAM,IAAI,GAAsB,EAAE,GAAG,KAAK,EAAE,QAAQ,EAAE,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC1F,OAAO,IAAI,CAAC,WAAW,CAAC;IACxB,OAAO,IAAI,CAAC;AACd,CAAC;AAoBD;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,UAAkB,EAClB,IAAyB,EACzB,IAAqB;IAErB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,KAAK,sBAAsB,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACvG,MAAM,MAAM,GAAG,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IACzD,MAAM,mCAAmC,CAAC,UAAU,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,eAAe,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;AAChI,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,UAAkB,EAAE,IAAiC;IAC1F,MAAM,mCAAmC,CAAC,UAAU,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,kBAAkB,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;AAC3H,CAAC;AAED,sFAAsF;AACtF,MAAM,UAAU,eAAe,CAAC,IAAqB;IACnD,OAAO;QACL,MAAM,EAAE,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC,iBAAiB,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC;QACvE,KAAK,EAAE,CAAC,UAAU,EAAE,EAAE,CAAC,gBAAgB,CAAC,UAAU,EAAE,IAAI,CAAC;KAC1D,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,QAAsC,EACtC,QAA+B,EAC/B,MAA2B;IAE3B,GAAG,CAAC,IAAI,CAAC,yBAAyB,QAAQ,CAAC,IAAI,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;IACxE,IAAI,CAAC,QAAQ,CAAC,IAAI;QAAE,OAAO;IAC3B,MAAM,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE,CAC9D,GAAG,CAAC,IAAI,CAAC,kCAAkC,QAAQ,CAAC,IAAI,aAAc,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;AACpG,CAAC;AAED,yEAAyE;AACzE,MAAM,UAAU,cAAc,CAAC,SAAkB;IAC/C,OAAO,SAAS,IAAI,IAAI,IAAI,OAAO,SAAS,KAAK,QAAQ;WACnD,SAAuC,CAAC,WAAW,IAAI,IAAI,CAAC;AACpE,CAAC"}

package/dist/delivery/commit-verdict-hold.d.ts

@@ -5,21 +5,21 @@
  * A review exit that would move a verify delivery to done while no passing
  * deterministic gate verdict exists for the commit it judges -- or to
  * verify_failed while a gate run judging that commit is still in flight -- leaves
- * the delivery in verify (completion/review-exit-verdict-gate.ts) and records WHY
+ * the delivery in verify (completion/review-exit-holds/review-exit-verdict-gate.ts) and records WHY
  * here, in gate_state.commitVerdictHold, with the route and the review exit it held. The marker
  * is what makes the wait visible (the dashboard's "Waiting on" line), durable (a
- * daemon restart keeps it), and releasable (completion/commit-verdict-release.ts
+ * daemon restart keeps it), and releasable (completion/review-exit-holds/commit-verdict-release.ts
  * replays the held exit once the verdict lands).
  *
  * A leaf on purpose: the review park (spawn/review-hold-park.ts) reads the marker
- * and is pulled into listener tests that use the module-mock loader, under which
+ * and is pulled into focus-poller tests that use the module-mock loader, under which
  * a bare @telora/* VALUE import mis-resolves -- so this module imports none (the
  * same rule as delivery/operator-hold.ts).
  *
  * @module delivery/commit-verdict-hold
  */
-import type { updateDeliveryStatus } from '../queries/deliveries.js';
-import { type CommitVerdictHoldState } from '../queries/delivery-gate-state.js';
+import type { updateDeliveryStatus } from '../queries/deliveries/deliveries.js';
+import { type CommitVerdictHoldState } from '../queries/delivery-gate-state/delivery-gate-holds.js';
 /** The slice of deps the marker writers need (structural, so no import cycle). */
 export interface CommitVerdictHoldDeps {
     updateDeliveryStatus: typeof updateDeliveryStatus;

package/dist/delivery/commit-verdict-hold.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"commit-verdict-hold.d.ts","sourceRoot":"","sources":["../../src/delivery/commit-verdict-hold.ts"],"names":[],"mappings":"AAaA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,EAEL,KAAK,sBAAsB,EAG5B,MAAM,mCAAmC,CAAC;AAQ3C,kFAAkF;AAClF,MAAM,WAAW,qBAAqB;IACpC,oBAAoB,EAAE,OAAO,oBAAoB,CAAC;CACnD;AA8BD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,OAAO,GAAG,sBAAsB,GAAG,IAAI,CAYvF;AAED,qFAAqF;AACrF,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAEtE;AAED;;;;;;;GAOG;AACH,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,qBAAqB,EAC3B,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,sBAAsB,EAC5B,cAAc,EAAE,OAAO,GACtB,OAAO,CAAC,OAAO,CAAC,CAalB;AAED;;;;;;GAMG;AACH,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,qBAAqB,EAC3B,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,OAAO,GACtB,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED,iDAAiD;AACjD,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,sBAAsB,GAAG,MAAM,CAK9E"}
+{"version":3,"file":"commit-verdict-hold.d.ts","sourceRoot":"","sources":["../../src/delivery/commit-verdict-hold.ts"],"names":[],"mappings":"AAaA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAEhF,OAAO,EAAE,KAAK,sBAAsB,EAAuB,MAAM,uDAAuD,CAAC;AAQzH,kFAAkF;AAClF,MAAM,WAAW,qBAAqB;IACpC,oBAAoB,EAAE,OAAO,oBAAoB,CAAC;CACnD;AA8BD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,SAAS,EAAE,OAAO,GAAG,sBAAsB,GAAG,IAAI,CAYvF;AAED,qFAAqF;AACrF,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAEtE;AAED;;;;;;;GAOG;AACH,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,qBAAqB,EAC3B,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,sBAAsB,EAC5B,cAAc,EAAE,OAAO,GACtB,OAAO,CAAC,OAAO,CAAC,CAalB;AAED;;;;;;GAMG;AACH,wBAAsB,+BAA+B,CACnD,IAAI,EAAE,qBAAqB,EAC3B,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,OAAO,GACtB,OAAO,CAAC,OAAO,CAAC,CAUlB;AAED,iDAAiD;AACjD,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,sBAAsB,GAAG,MAAM,CAK9E"}

package/dist/delivery/commit-verdict-hold.js

@@ -1,6 +1,6 @@
 // PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
-// Pinned by: packages/daemon/src/completion/commit-verdict-release.test.ts,
-//   packages/daemon/src/focus/listener-product-poll.test.ts,
+// Pinned by: packages/daemon/src/completion/review-exit-holds/commit-verdict-release.test.ts,
+//   packages/daemon/src/focus/focus-poller-product-poll.test.ts,
 //   packages/daemon/src/focus/verify-routing-passes.test.ts,
 //   packages/daemon/src/integration/delivery-gate-write-interleaving.test.ts,
 //   packages/daemon/src/integration/explicit-gate-identity-unreadable.test.ts,
@@ -10,8 +10,8 @@
 //   packages/daemon/src/integration/focus-commit-verdict-scenario.test.ts,
 //   packages/daemon/src/integration/held-route-pull-dispatch.test.ts
 // PINNED-BY-END
-import { carryVerificationHistory, } from '../queries/delivery-gate-state.js';
-import { createLogger } from '../shell/log.js';
+import { carryVerificationHistory } from '../queries/delivery-gate-state/delivery-gate-state.js';
+import { createLogger } from '../log/daemon-log.js';
 const log = createLogger({ module: 'commit-verdict-hold' });
 // Mirrors DELIVERY_STATUS.VERIFY; a daemon-local literal for the leaf rule above.
 const VERIFY_STATUS = 'verify';

package/dist/delivery/commit-verdict-hold.js.map

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

package/dist/delivery/delivery-advance-block.d.ts

@@ -1,20 +1,11 @@
-/**
- * Advance-block precondition for delivery progression.
- *
- * Extracted from delivery-lifecycle.ts (kept under the daemon file-size limit).
- * Owns the "agents must commit before the daemon advances" guard and its
- * durable, dedup-aware escalation. Re-exported from delivery-lifecycle.ts so
- * existing importers keep their import path.
- *
- * @module delivery-advance-block
- */
-import { createEscalation, hasOpenWorktreeDirtyEscalation, resolveOpenWorktreeDirtyEscalations } from '../queries/escalations.js';
-import { sendMessage } from '@telora/daemon-core';
+import type { CreateEscalationParams } from '../supervision/escalation-filing.js';
+import { type EscalationResolutionClass } from '@telora/daemon-core';
 import type { Writable } from 'node:stream';
-import { getFocusWorktree } from '../focus/focus-worktree-state.js';
-import { worktreeHasUncommittedChanges, dirtyChangesAreGeneratedLockfilesOnly, commitGeneratedLockfiles, safetyCommitWorktree, reconcileTornWrite, isWorktreeUnderVerify } from '../worktree/index.js';
-import { type CaptureAttributionInput } from '../worktree/capture-attribution-read.js';
-import { type UnmergedCaptureContext, type UnmergedCaptureEscalationReporter } from '../worktree/unmerged-capture-escalation.js';
+import type { FocusWorktreeInfo } from '../types/index.js';
+import type { CommitRefusalReporters } from '../worktree/scratch-guard.js';
+import type { WorktreeCaptureDeps } from '../worktree/safety.js';
+import type { CaptureAttributionInput } from '../worktree/capture-attribution-read.js';
+import type { UnmergedCaptureContext, UnmergedCaptureEscalationReporter } from '../worktree/unmerged-capture-escalation.js';
 /**
  * escalation_kind discriminator for the advance-block escalation class.
  *
@@ -63,50 +54,58 @@ interface AdvanceBlockTeamHandle {
     leadStdin: Writable | null;
 }
 /**
- * Injectable collaborators for ensureWorktreeCommittedBeforeAdvance. Defaults
- * to the real implementations; tests override them to drive the dedup +
- * auto-remediation paths without a live worktree, team, or Supabase.
+ * The collaborators ensureWorktreeCommittedBeforeAdvance runs over. All
+ * required: the composition root binds production once
+ * (composition/advance-precheck-context.ts), and a test passes its
+ * own -- so which worktree read, commit, escalation filer, team handle and
+ * clock the precheck uses is read from the root, never defaulted here.
  */
 export interface EnsureWorktreeCommittedDeps {
-    getFocusWorktree?: typeof getFocusWorktree;
-    worktreeHasUncommittedChanges?: typeof worktreeHasUncommittedChanges;
-    createEscalation?: typeof createEscalation;
-    hasOpenWorktreeDirtyEscalation?: typeof hasOpenWorktreeDirtyEscalation;
+    /** The safety capture's reporters, escalation filing and attribution read (composition root). */
+    worktreeCapture: WorktreeCaptureDeps;
+    getFocusWorktree: (focusId: string) => FocusWorktreeInfo | undefined;
+    worktreeHasUncommittedChanges: (worktreePath: string) => boolean;
+    createEscalation: (params: CreateEscalationParams) => Promise<unknown>;
+    /** Whether the focus already has an open worktree-dirty escalation (focus-grain dedup). */
+    hasOpenWorktreeDirtyEscalation: (focusId: string) => Promise<boolean>;
     /** Auto-close stale worktree-dirty escalations when the worktree goes clean. */
-    resolveOpenWorktreeDirtyEscalations?: typeof resolveOpenWorktreeDirtyEscalations;
+    resolveOpenWorktreeDirtyEscalations: (focusId: string, kinds: readonly string[], resolutionClass: EscalationResolutionClass) => Promise<number>;
     /**
      * Reconcile a pure torn-write index (staged entries with no worktree content
      * behind them) to HEAD. Runs BEFORE lockfile/re-wake/safety-commit so a torn
      * write self-clears without a pointless team nudge or an escalation.
      */
-    reconcileTornWrite?: typeof reconcileTornWrite;
+    reconcileTornWrite: (worktreePath: string) => {
+        reconciled: string[];
+    } | null;
     /** True while a verify command runs in the focus worktree -> defer, do not commit/escalate. */
-    isWorktreeUnderVerify?: typeof isWorktreeUnderVerify;
-    dirtyChangesAreGeneratedLockfilesOnly?: typeof dirtyChangesAreGeneratedLockfilesOnly;
-    commitGeneratedLockfiles?: typeof commitGeneratedLockfiles;
+    isWorktreeUnderVerify: (worktreePath: string) => boolean;
+    dirtyChangesAreGeneratedLockfilesOnly: (worktreePath: string) => boolean;
+    commitGeneratedLockfiles: (worktreePath: string, reporters: CommitRefusalReporters) => string | null;
     /**
      * Last-resort WIP safety-commit of real uncommitted agent work when no team
      * is reachable to re-wake (DECIDED 2026-06-22, Jeremy). Reuses the same
      * primitive crash-recovery and removeWorktree use.
      */
-    safetyCommitWorktree?: typeof safetyCommitWorktree;
+    safetyCommitWorktree: (worktreePath: string, deliveryName: string, reporters: CommitRefusalReporters, attribution?: CaptureAttributionInput) => string | null;
     /** Read the focus's deliveries and issues the safety-commit attributes paths against. */
-    readCaptureAttributionInput?: (focusId: string) => Promise<CaptureAttributionInput>;
+    readCaptureAttributionInput: (focusId: string) => Promise<CaptureAttributionInput>;
     /** The reporter a safety-commit refused for unmerged paths files its escalation through. */
-    createUnmergedCaptureReporter?: (ctx: UnmergedCaptureContext) => UnmergedCaptureEscalationReporter;
-    getActiveTeam?: (focusId: string) => AdvanceBlockTeamHandle | undefined;
-    sendMessage?: typeof sendMessage;
-    autoRemediationBudget?: number;
-    /** Min gap between re-wakes for a focus (default REWAKE_MIN_INTERVAL_MS). Tests pass 0. */
-    rewakeMinIntervalMs?: number;
-    /** Clock seam (default Date.now). */
-    now?: () => number;
+    createUnmergedCaptureReporter: (ctx: UnmergedCaptureContext) => UnmergedCaptureEscalationReporter;
+    getActiveTeam: (focusId: string) => AdvanceBlockTeamHandle | undefined;
+    sendMessage: (stdin: Writable, content: string) => boolean;
+    /** The re-wake budget, read per precheck (production: resolveAutoRemediationBudget). */
+    resolveAutoRemediationBudget: () => number;
+    /** Min gap between re-wakes for a focus (production: REWAKE_MIN_INTERVAL_MS). Tests pass 0. */
+    rewakeMinIntervalMs: number;
+    /** The clock (production: Date.now). */
+    now: () => number;
 }
 /**
  * Which hold refused an advance, when one did: the focus worktree carries
  * uncommitted changes, or a verify command is running in it. Named so the caller
  * can put the reason where the team and the dashboard read it
- * (focus/advance-hold.ts) instead of only in the daemon log.
+ * (delivery/advance-hold.ts) instead of only in the daemon log.
  */
 export interface AdvancePrecheckHold {
     kind: 'worktree_uncommitted' | 'verify_in_flight';
@@ -157,6 +156,6 @@ export declare function ensureWorktreeCommittedBeforeAdvance(params: {
     focusId: string;
     organizationId: string;
     sessionId: string | null;
-}, deps?: EnsureWorktreeCommittedDeps): Promise<AdvancePrecheckResult>;
+}, deps: EnsureWorktreeCommittedDeps): Promise<AdvancePrecheckResult>;
 export {};
 //# sourceMappingURL=delivery-advance-block.d.ts.map

package/dist/delivery/delivery-advance-block.d.ts.map

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

package/dist/delivery/delivery-advance-block.js

@@ -1,28 +1,28 @@
 // PINNED-BY-BEGIN (generated by gen:pinned-by -- do not hand-edit; checked by lint:pinned-by)
-// Pinned by: packages/daemon/src/focus/advance-hold.test.ts,
-//   packages/daemon/src/queries/incident-correlation.test.ts,
-//   packages/daemon/src/shell/safety-capture-entry-points.test.ts
+// Pinned by: packages/daemon/src/delivery/advance-block-auto-remediation.test.ts,
+//   packages/daemon/src/delivery/advance-hold.test.ts,
+//   packages/daemon/src/delivery/delivery-advance-block-dedup.test.ts,
+//   packages/daemon/src/focus/safety-capture-entry-points.test.ts,
+//   packages/daemon/src/supervision/incident-correlation.test.ts,
+//   packages/daemon/src/worktree/torn-write-wedge.test.ts,
+//   packages/daemon/src/worktree/verify-interlock.test.ts
 // PINNED-BY-END
 /**
  * Advance-block precondition for delivery progression.
  *
- * Extracted from delivery-lifecycle.ts (kept under the daemon file-size limit).
  * Owns the "agents must commit before the daemon advances" guard and its
- * durable, dedup-aware escalation. Re-exported from delivery-lifecycle.ts so
- * existing importers keep their import path.
+ * durable, dedup-aware escalation.
+ *
+ * History: docs/daemon/history-platform.md (delivery/delivery-advance-block.ts).
  *
  * @module delivery-advance-block
  */
-import { createEscalation, hasOpenWorktreeDirtyEscalation, resolveOpenWorktreeDirtyEscalations, MERGE_REFUSED_DIRTY_ESCALATION_KIND } from '../queries/escalations.js';
-import { NO_HUMAN_ACT } from '../queries/filing-observation.js';
-import { withRetry, sendMessage, loadEnvConfig, ESCALATION_REASONS, ESCALATION_DISPOSITIONS, ESCALATION_KINDS } from '@telora/daemon-core';
-import { getFocusWorktree } from '../focus/focus-worktree-state.js';
-import { worktreeHasUncommittedChanges, dirtyChangesAreGeneratedLockfilesOnly, commitGeneratedLockfiles, safetyCommitWorktree, reconcileTornWrite, isWorktreeUnderVerify, } from '../worktree/index.js';
-import { getActiveTeams } from '../focus/focus-team-state.js';
+import { MERGE_REFUSED_DIRTY_ESCALATION_KIND } from '../queries/escalations/escalations.js';
+import { NO_HUMAN_ACT } from '../queries/escalations/filing-observation.js';
+import { withRetry, loadEnvConfig, ESCALATION_REASONS, ESCALATION_DISPOSITIONS, ESCALATION_KINDS } from '@telora/daemon-core';
 import { nextResolverStep } from '../directive/resolver-dispatch.js';
-import { readCaptureAttributionInput } from '../worktree/capture-attribution-read.js';
-import { createUnmergedCaptureEscalationReporter, } from '../worktree/unmerged-capture-escalation.js';
-import { createLogger } from '../shell/log.js';
+import { createLogger } from '../log/daemon-log.js';
+import { evaluateStop } from '../supervision/stop-registry.js';
 const log = createLogger({ module: 'delivery-lifecycle' });
 /**
  * escalation_kind discriminator for the advance-block escalation class.
@@ -109,14 +109,12 @@ async function autoResolveClearedEscalations(resolveOpenEsc, focusId) {
  */
 async function safetyCommitStrandedWork(worktree, params, deps, onSweepRefusal) {
     const { deliveryName, focusId, organizationId } = params;
-    const read = deps.readCaptureAttributionInput ?? ((id) => readCaptureAttributionInput(id));
-    const createReporter = deps.createUnmergedCaptureReporter ?? ((ctx) => createUnmergedCaptureEscalationReporter(ctx));
-    const safetyCommit = deps.safetyCommitWorktree ?? safetyCommitWorktree;
+    const capture = deps.worktreeCapture;
     // Blocking this delivery's advance does not make it the owner of the worktree's
     // dirt: a path the focus issues do not place stays `unattributed`.
-    const attribution = await read(focusId);
-    const unmerged = createReporter({ organizationId, focusId, productId: worktree.productId, focusName: deliveryName });
-    const sha = safetyCommit(worktree.worktreePath, deliveryName, onSweepRefusal, unmerged.reporter, attribution);
+    const attribution = await deps.readCaptureAttributionInput(focusId);
+    const unmerged = deps.createUnmergedCaptureReporter({ organizationId, focusId, productId: worktree.productId, focusName: deliveryName });
+    const sha = deps.safetyCommitWorktree(worktree.worktreePath, deliveryName, { ...capture.refusalReporters, sweep: onSweepRefusal, unmerged: unmerged.reporter }, attribution);
     await unmerged.flush();
     return { sha, unmergedEscalated: unmerged.escalated() };
 }
@@ -153,10 +151,18 @@ async function safetyCommitStrandedWork(worktree, params, deps, onSweepRefusal)
  * -> N rows) to one row, suppresses across the merge paths, and is durable
  * across daemon restarts (it reads the DB, holds no in-memory state).
  */
-export async function ensureWorktreeCommittedBeforeAdvance(params, deps = {}) {
+export async function ensureWorktreeCommittedBeforeAdvance(params, deps) {
     const r = resolveAdvanceBlockDeps(deps);
     const { deliveryName, focusId } = params;
     const worktree = r.getWorktree(focusId);
+    // The precheck's hold decision is the registry's advance_hold row. The worktree
+    // is read for dirt only when no verify runs in it (a mid-verify tree is not work).
+    const verifyInFlight = worktree !== undefined && r.isUnderVerify(worktree.worktreePath);
+    const precheckHold = evaluateStop('advance_hold', {
+        worktreeRegistered: worktree !== undefined,
+        verifyInFlight,
+        uncommitted: worktree !== undefined && !verifyInFlight && r.hasUncommitted(worktree.worktreePath),
+    });
     if (!worktree)
         return { ok: true };
     // Verify interlock: if a verify command is running in this focus worktree, the
@@ -166,13 +172,13 @@ export async function ensureWorktreeCommittedBeforeAdvance(params, deps = {}) {
     // budget spent), so the next poll re-evaluates cleanly once the verify completes.
     // Guarding here as well as in guardedCommit keeps a transient mid-verify dirt
     // from ever being read as an uncommitted-work condition in the first place.
-    if (r.isUnderVerify(worktree.worktreePath)) {
+    if (precheckHold === 'verify_in_flight') {
         log.info(`[delivery-lifecycle] Deferring advance of "${deliveryName}": a verify command is ` +
             `running in ${worktree.worktreePath}. Not committing, re-waking, or escalating; ` +
             `the next poll retries once verify completes.`);
         return { ok: false, reason: 'verify in flight (safety-commit deferred)', hold: { kind: 'verify_in_flight', worktreePath: worktree.worktreePath } };
     }
-    if (!r.hasUncommitted(worktree.worktreePath)) {
+    if (precheckHold === null) {
         // Clean -- the dirty episode (if any) is over. Reset the retry budget so a
         // future episode starts fresh, and auto-close any worktree-dirty escalation
         // we filed for it so a resolved-in-fact condition stops sitting in the human
@@ -206,23 +212,23 @@ export async function ensureWorktreeCommittedBeforeAdvance(params, deps = {}) {
     await fileAdvanceBlockEscalation(params, worktree.worktreePath, step.escalationContext, r);
     return { ok: false, reason, hold };
 }
-/** ensureWorktreeCommittedBeforeAdvance's collaborators, each defaulted to the real one. */
+/** ensureWorktreeCommittedBeforeAdvance's collaborators under the names its steps use; the budget is read once per precheck. */
 function resolveAdvanceBlockDeps(deps) {
     return {
-        getWorktree: deps.getFocusWorktree ?? getFocusWorktree,
-        hasUncommitted: deps.worktreeHasUncommittedChanges ?? worktreeHasUncommittedChanges,
-        createEsc: deps.createEscalation ?? createEscalation,
-        hasOpenEsc: deps.hasOpenWorktreeDirtyEscalation ?? hasOpenWorktreeDirtyEscalation,
-        resolveOpenEsc: deps.resolveOpenWorktreeDirtyEscalations ?? resolveOpenWorktreeDirtyEscalations,
-        reconcileTorn: deps.reconcileTornWrite ?? reconcileTornWrite,
-        isUnderVerify: deps.isWorktreeUnderVerify ?? isWorktreeUnderVerify,
-        isLockfileOnly: deps.dirtyChangesAreGeneratedLockfilesOnly ?? dirtyChangesAreGeneratedLockfilesOnly,
-        commitLockfiles: deps.commitGeneratedLockfiles ?? commitGeneratedLockfiles,
-        getTeam: deps.getActiveTeam ?? ((id) => getActiveTeams().get(id)),
-        sendMsg: deps.sendMessage ?? sendMessage,
-        budget: deps.autoRemediationBudget ?? resolveAutoRemediationBudget(),
-        rewakeMinIntervalMs: deps.rewakeMinIntervalMs ?? REWAKE_MIN_INTERVAL_MS,
-        now: deps.now ?? Date.now,
+        getWorktree: deps.getFocusWorktree,
+        hasUncommitted: deps.worktreeHasUncommittedChanges,
+        createEsc: deps.createEscalation,
+        hasOpenEsc: deps.hasOpenWorktreeDirtyEscalation,
+        resolveOpenEsc: deps.resolveOpenWorktreeDirtyEscalations,
+        reconcileTorn: deps.reconcileTornWrite,
+        isUnderVerify: deps.isWorktreeUnderVerify,
+        isLockfileOnly: deps.dirtyChangesAreGeneratedLockfilesOnly,
+        commitLockfiles: (worktreePath) => deps.commitGeneratedLockfiles(worktreePath, deps.worktreeCapture.refusalReporters),
+        getTeam: deps.getActiveTeam,
+        sendMsg: deps.sendMessage,
+        budget: deps.resolveAutoRemediationBudget(),
+        rewakeMinIntervalMs: deps.rewakeMinIntervalMs,
+        now: deps.now,
     };
 }
 /** The dirty episode is over: forget its budget and close what it filed. */