@deftai/directive-core 0.104.0 → 0.105.0

package/dist/run-summary/emit.js

@@ -12,6 +12,7 @@ import { readCorePackageVersion } from "../engine-version.js";
 import { ContainedWriteError, ContainedWriteErrorCode, containedWrite, } from "../fs/contained-write.js";
 import { assertWriteTargetSafe } from "../fs/projection-containment.js";
 import { resolveRunSummaryDestination } from "./path.js";
+import { resolveRunSummarySessionId } from "./session-id.js";
 import { ENV_TOTAL_TOOL_TURNS, RUN_SUMMARY_SCHEMA_VERSION, RUN_SUMMARY_STDOUT_PREFIX, RUN_SUMMARY_WRITE_WARNING, } from "./types.js";
 function sortKeysDeep(value) {
     if (Array.isArray(value)) {
@@ -250,6 +251,7 @@ export class RunSummaryEmitter {
     warned = false;
     projectRoot;
     sessionId;
+    component;
     frameworkVersion;
     now;
     destination;
@@ -258,7 +260,12 @@ export class RunSummaryEmitter {
     writeStderr;
     constructor(options) {
         this.projectRoot = options.projectRoot;
-        this.sessionId = options.sessionId;
+        this.sessionId = resolveRunSummarySessionId({
+            projectRoot: options.projectRoot,
+            explicit: options.sessionId,
+            env: options.env,
+        });
+        this.component = options.component?.trim() || undefined;
         this.frameworkVersion = options.frameworkVersion ?? readCorePackageVersion();
         this.now = options.now ?? (() => new Date());
         this.env = options.env ?? process.env;
@@ -285,6 +292,7 @@ export class RunSummaryEmitter {
             ts: this.now().toISOString(),
             event,
             payload,
+            ...(this.component !== undefined ? { component: this.component } : {}),
             ...(denominator !== undefined ? { total_tool_turns: denominator } : {}),
         };
     }
@@ -352,6 +360,9 @@ export class RunSummaryEmitter {
     emitAcceptanceStamp(payload) {
         return this.emit("acceptance_stamp", payload);
     }
+    emitAcPassBank(payload) {
+        return this.emit("ac_pass_bank", payload);
+    }
     /** Emit the harness-supplied denominator when DEFT_TOTAL_TOOL_TURNS is set. */
     emitKnownToolTurnDenominator() {
         const n = readEnvToolTurnDenominator(this.env);
@@ -361,14 +372,16 @@ export class RunSummaryEmitter {
         return this.emitToolTurnDenominator({ total_tool_turns: n });
     }
     /**
-     * Always emit a session denominator when the destination is live (#3356).
+     * Emit a session denominator only when a host/harness value is known (#3399).
      * `emitKnownToolTurnDenominator` stays silent unless DEFT_TOTAL_TOOL_TURNS is
-     * set; this caller records host planned turns or the session:start CLI floor.
+     * set; this caller also records DEFT_MAX_TURNS / host maxTurns.
      */
     emitSessionToolTurnDenominator(hostMaxTurns) {
-        return this.emitToolTurnDenominator({
-            total_tool_turns: resolveSessionToolTurnDenominator(this.env, hostMaxTurns),
-        });
+        const resolved = resolveSessionToolTurnDenominator(this.env, hostMaxTurns);
+        if (resolved === undefined) {
+            return { emitted: false, destination: this.destination, line: null, warning: false };
+        }
+        return this.emitToolTurnDenominator(resolved);
     }
 }
 function readPayloadToolTurnDenominator(payload) {
@@ -384,8 +397,6 @@ export function readEnvToolTurnDenominator(env) {
 }
 /** Canonical host planned-turn budget recorded at session:start (#3356). */
 export const ENV_MAX_TURNS_DENOMINATOR = "DEFT_MAX_TURNS";
-/** session:start is one CLI invocation when no host/harness count is known (#3356). */
-export const SESSION_START_CLI_INVOCATION_DENOMINATOR = 1;
 function isPositiveIntegerDenominator(value) {
     return (typeof value === "number" && Number.isInteger(value) && Number.isFinite(value) && value > 0);
 }
@@ -408,26 +419,26 @@ function readPositiveIntegerEnv(env, key) {
     return isPositiveIntegerDenominator(n) ? n : undefined;
 }
 /**
- * Resolve the session tool/turn denominator (#3356).
+ * Resolve the session tool/turn denominator (#3399).
  *
  * Prefer harness actuals (`DEFT_TOTAL_TOOL_TURNS`), then a host planned-turn
- * budget (`DEFT_MAX_TURNS` or `hostMaxTurns` from the session:start descriptor),
- * else this CLI invocation (1). An emitted proxy beats a perfect unused kind.
+ * budget (`DEFT_MAX_TURNS` or `hostMaxTurns`). Unset → undefined (no event).
+ * Share is unevaluable without a host/harness value.
  */
 export function resolveSessionToolTurnDenominator(env, hostMaxTurns) {
     const known = readEnvToolTurnDenominator(env);
     if (known !== undefined) {
-        return known;
+        return { total_tool_turns: known, denominator_source: "harness_actual" };
     }
     const planned = readPositiveIntegerEnv(env, ENV_MAX_TURNS_DENOMINATOR);
     if (planned !== undefined) {
-        return planned;
+        return { total_tool_turns: planned, denominator_source: "host_planned" };
     }
     const host = coercePositiveHostDenominator(hostMaxTurns);
     if (host !== undefined) {
-        return host;
+        return { total_tool_turns: host, denominator_source: "host_planned" };
     }
-    return SESSION_START_CLI_INVOCATION_DENOMINATOR;
+    return undefined;
 }
 /**
  * One-shot helper for call sites that do not hold an emitter (e.g. dial escalate).

package/dist/run-summary/index.d.ts

@@ -1,5 +1,6 @@
-export { type EmitRunSummaryResult, ENV_MAX_TURNS_DENOMINATOR, emitRunSummaryEvent, RunSummaryEmitter, type RunSummaryEmitterOptions, resolveSessionToolTurnDenominator, SESSION_START_CLI_INVOCATION_DENOMINATOR, } from "./emit.js";
+export { type EmitRunSummaryResult, ENV_MAX_TURNS_DENOMINATOR, emitRunSummaryEvent, type ResolvedSessionToolTurnDenominator, RunSummaryEmitter, type RunSummaryEmitterOptions, resolveSessionToolTurnDenominator, } from "./emit.js";
 export { gitignoreCoversRunSummary, type ResolveRunSummaryDestinationOptions, resolveRunSummaryDestination, } from "./path.js";
+export { type ResolveRunSummarySessionIdInput, resolveRunSummarySessionId, } from "./session-id.js";
 export { computeRitualGateShare, parseRunSummaryJsonl, type RitualGateShare, readToolTurnDenominator, } from "./share.js";
-export { type AcceptanceClauseOutcomeRow, type AcceptanceRunSummaryOutcome, type AcceptanceRunSummaryPayload, type AcceptanceStampRunSummaryPayload, type CheckGateOutcome, type CheckInvocationRunSummaryPayload, DEFAULT_RUN_SUMMARY_BASENAME, type DialEscalationEvaluationOutcome, type DialEscalationEvaluationRunSummaryPayload, type DialTransitionRunSummaryPayload, ENV_RUN_SUMMARY_PATH, ENV_TOTAL_TOOL_TURNS, RUN_SUMMARY_EVENT_KINDS, RUN_SUMMARY_SCHEMA_VERSION, RUN_SUMMARY_STDOUT_PREFIX, RUN_SUMMARY_WRITE_WARNING, type RunSummaryBaseFields, type RunSummaryDestination, type RunSummaryEventKind, type RunSummaryLine, type RunSummaryPayload, type SessionStartRunSummaryPayload, type ToolTurnDenominatorRunSummaryPayload, type VerificationOutcome, type VerificationRunSummaryPayload, } from "./types.js";
+export { type AcceptanceClauseOutcomeRow, type AcceptanceRunSummaryOutcome, type AcceptanceRunSummaryPayload, type AcceptanceStampRunSummaryPayload, type AcPassBankRunSummaryPayload, type CheckGateOutcome, type CheckInvocationRunSummaryPayload, DEFAULT_RUN_SUMMARY_BASENAME, type DialEscalationEvaluationOutcome, type DialEscalationEvaluationRunSummaryPayload, type DialTransitionRunSummaryPayload, ENV_RUN_SUMMARY_PATH, ENV_TOTAL_TOOL_TURNS, RUN_SUMMARY_EVENT_KINDS, RUN_SUMMARY_SCHEMA_VERSION, RUN_SUMMARY_STDOUT_PREFIX, RUN_SUMMARY_WRITE_WARNING, type RunSummaryBaseFields, type RunSummaryDestination, type RunSummaryEventKind, type RunSummaryLine, type RunSummaryPayload, type SessionStartRunSummaryPayload, type ToolTurnDenominatorRunSummaryPayload, type ToolTurnDenominatorSource, type VerificationOutcome, type VerificationRunSummaryPayload, } from "./types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/run-summary/index.js

@@ -1,5 +1,6 @@
-export { ENV_MAX_TURNS_DENOMINATOR, emitRunSummaryEvent, RunSummaryEmitter, resolveSessionToolTurnDenominator, SESSION_START_CLI_INVOCATION_DENOMINATOR, } from "./emit.js";
+export { ENV_MAX_TURNS_DENOMINATOR, emitRunSummaryEvent, RunSummaryEmitter, resolveSessionToolTurnDenominator, } from "./emit.js";
 export { gitignoreCoversRunSummary, resolveRunSummaryDestination, } from "./path.js";
+export { resolveRunSummarySessionId, } from "./session-id.js";
 export { computeRitualGateShare, parseRunSummaryJsonl, readToolTurnDenominator, } from "./share.js";
 export { DEFAULT_RUN_SUMMARY_BASENAME, ENV_RUN_SUMMARY_PATH, ENV_TOTAL_TOOL_TURNS, RUN_SUMMARY_EVENT_KINDS, RUN_SUMMARY_SCHEMA_VERSION, RUN_SUMMARY_STDOUT_PREFIX, RUN_SUMMARY_WRITE_WARNING, } from "./types.js";
 //# sourceMappingURL=index.js.map

package/dist/run-summary/session-id.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Shared workspace session identity for run-summary emitters (#3399).
+ *
+ * Ritual-state holds the workspace session id written by session:start.
+ * #3350 persisted seq by counting JSONL lines; it is not the identity store.
+ */
+export interface ResolveRunSummarySessionIdInput {
+    readonly projectRoot: string;
+    readonly explicit?: string | null;
+    readonly env?: NodeJS.ProcessEnv;
+    readonly mint?: () => string;
+}
+/**
+ * Resolve one workspace session id for a run-summary line.
+ *
+ * Order: explicit option → DEFT_SESSION_ID → ritual-state session_id →
+ * last session_id already in the destination JSONL → mint only when no
+ * workspace session exists yet.
+ */
+export declare function resolveRunSummarySessionId(input: ResolveRunSummarySessionIdInput): string;
+//# sourceMappingURL=session-id.d.ts.map

package/dist/run-summary/session-id.js

@@ -0,0 +1,92 @@
+/**
+ * Shared workspace session identity for run-summary emitters (#3399).
+ *
+ * Ritual-state holds the workspace session id written by session:start.
+ * #3350 persisted seq by counting JSONL lines; it is not the identity store.
+ */
+import { randomUUID } from "node:crypto";
+import { existsSync, readFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { readRitualState } from "../session/ritual-sentinel.js";
+import { resolveRunSummaryDestination } from "./path.js";
+import { parseRunSummaryJsonl } from "./share.js";
+const mintedByProjectRoot = new Map();
+function trimNonEmpty(value) {
+    if (typeof value !== "string") {
+        return undefined;
+    }
+    const trimmed = value.trim();
+    return trimmed.length > 0 ? trimmed : undefined;
+}
+function lastSessionIdFromJsonl(path) {
+    try {
+        if (!existsSync(path)) {
+            return undefined;
+        }
+        const lines = parseRunSummaryJsonl(readFileSync(path, "utf8"));
+        for (let i = lines.length - 1; i >= 0; i -= 1) {
+            const id = trimNonEmpty(lines[i]?.session_id);
+            if (id !== undefined) {
+                return id;
+            }
+        }
+        return undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function ritualSessionId(projectRoot) {
+    try {
+        const [state] = readRitualState(projectRoot);
+        return trimNonEmpty(state?.sessionId);
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Resolve one workspace session id for a run-summary line.
+ *
+ * Order: explicit option → DEFT_SESSION_ID → ritual-state session_id →
+ * last session_id already in the destination JSONL → mint only when no
+ * workspace session exists yet.
+ */
+export function resolveRunSummarySessionId(input) {
+    const explicit = trimNonEmpty(input.explicit);
+    if (explicit !== undefined) {
+        return explicit;
+    }
+    const env = input.env ?? process.env;
+    const fromEnv = trimNonEmpty(env.DEFT_SESSION_ID);
+    if (fromEnv !== undefined) {
+        return fromEnv;
+    }
+    const fromRitual = ritualSessionId(input.projectRoot);
+    if (fromRitual !== undefined) {
+        return fromRitual;
+    }
+    const dest = resolveRunSummaryDestination(input.projectRoot, { env });
+    if (dest.kind === "file") {
+        const fromJsonl = lastSessionIdFromJsonl(dest.path);
+        if (fromJsonl !== undefined) {
+            return fromJsonl;
+        }
+    }
+    const rootKey = resolve(input.projectRoot);
+    if (input.mint !== undefined) {
+        const minted = trimNonEmpty(input.mint());
+        if (minted !== undefined) {
+            mintedByProjectRoot.set(rootKey, minted);
+            return minted;
+        }
+    }
+    const cached = mintedByProjectRoot.get(rootKey);
+    if (cached !== undefined) {
+        return cached;
+    }
+    const minted = randomUUID();
+    mintedByProjectRoot.set(rootKey, minted);
+    return minted;
+}
+//# sourceMappingURL=session-id.js.map

package/dist/run-summary/types.d.ts

@@ -15,7 +15,7 @@ export declare const DEFAULT_RUN_SUMMARY_BASENAME = ".deft-run-summary.json";
 export declare const RUN_SUMMARY_STDOUT_PREFIX = "DEFT-TLM:";
 /** One warning when an explicitly requested write fails. */
 export declare const RUN_SUMMARY_WRITE_WARNING = "[deft run-summary] failed to write DEFT_RUN_SUMMARY_PATH telemetry (fail-open; exit codes unchanged)";
-export declare const RUN_SUMMARY_EVENT_KINDS: readonly ["session_start", "dial_transition", "dial_escalation_evaluation", "check_invocation", "tool_turn_denominator", "verification", "acceptance", "acceptance_stamp"];
+export declare const RUN_SUMMARY_EVENT_KINDS: readonly ["session_start", "dial_transition", "dial_escalation_evaluation", "check_invocation", "tool_turn_denominator", "verification", "acceptance", "acceptance_stamp", "ac_pass_bank"];
 export type RunSummaryEventKind = (typeof RUN_SUMMARY_EVENT_KINDS)[number];
 export interface RunSummaryBaseFields {
     readonly schema_version: typeof RUN_SUMMARY_SCHEMA_VERSION;
@@ -32,6 +32,11 @@ export interface RunSummaryBaseFields {
     readonly seq: number;
     readonly ts: string;
     readonly event: RunSummaryEventKind;
+    /**
+     * Optional emitter label (verify-ac, clause-derivation, …). Not a closed
+     * union — new callers add a string without a schema bump (#3399).
+     */
+    readonly component?: string;
     /**
      * Session total tool/turn count (#3320). Present so ritual+gate share is
      * computable from the summary alone. Absence means the #3286 trigger is unevaluable.
@@ -88,14 +93,32 @@ export interface CheckInvocationRunSummaryPayload {
     readonly none_stated?: boolean;
     readonly clause_outcomes?: readonly AcceptanceClauseOutcomeRow[];
 }
-/** Total tool/turn count for the session (#3320). */
+/** How a tool_turn_denominator value was obtained (#3399). */
+export type ToolTurnDenominatorSource = "harness_actual" | "host_planned";
+/** Total tool/turn count for the session (#3320 / #3399). */
 export interface ToolTurnDenominatorRunSummaryPayload {
     readonly total_tool_turns: number;
+    readonly denominator_source?: ToolTurnDenominatorSource;
+}
+/** Bank checkpoint JSONL payload. Disk ledger stays camelCase (#3387). */
+export interface AcPassBankRunSummaryPayload {
+    readonly scope_id: string;
+    readonly banked_at: string;
+    readonly next_action?: string;
+    readonly had_surplus?: boolean;
+    readonly surplus_threshold?: number;
+    readonly remaining_fraction?: number | null;
+    readonly remaining_turns?: number | null;
+    readonly remaining_budget?: number | null;
+    readonly max_turns?: number | null;
+    readonly max_budget?: number | null;
+    readonly head_sha?: string | null;
+    readonly path?: string;
 }
 /** Product-oracle attempt (#3322). Same emitter as #3319 / #3320. */
 export type VerificationOutcome = "pass" | "fail";
 /** verify:ac resolution telemetry (#3334 / #3355). Distinct from verification pass/fail. */
-export type AcceptanceRunSummaryOutcome = "verified-pass" | "empty-pass" | "soft_empty" | "fail" | "config-error" | "soft-missing";
+export type AcceptanceRunSummaryOutcome = "verified-pass" | "empty-pass" | "soft_empty" | "fail" | "config-error" | "soft-missing" | "rejected-noop";
 export interface AcceptanceRunSummaryPayload {
     readonly resolved_command_count: number;
     readonly outcome: AcceptanceRunSummaryOutcome;
@@ -103,6 +126,8 @@ export interface AcceptanceRunSummaryPayload {
     readonly none_stated?: boolean;
     readonly clause_count?: number;
     readonly clause_outcomes?: readonly AcceptanceClauseOutcomeRow[];
+    /** bank | cache | executed — how verify:ac obtained this result (#3387). */
+    readonly served_from?: "bank" | "cache" | "executed";
 }
 /** Intake-time stamp: which rung locked, whether commands were stated, counts (#3323). */
 export interface AcceptanceStampRunSummaryPayload {
@@ -122,7 +147,7 @@ export interface VerificationRunSummaryPayload {
      */
     readonly independent_rederivation?: boolean;
 }
-export type RunSummaryPayload = SessionStartRunSummaryPayload | DialTransitionRunSummaryPayload | DialEscalationEvaluationRunSummaryPayload | CheckInvocationRunSummaryPayload | ToolTurnDenominatorRunSummaryPayload | VerificationRunSummaryPayload | AcceptanceRunSummaryPayload | AcceptanceStampRunSummaryPayload;
+export type RunSummaryPayload = SessionStartRunSummaryPayload | DialTransitionRunSummaryPayload | DialEscalationEvaluationRunSummaryPayload | CheckInvocationRunSummaryPayload | ToolTurnDenominatorRunSummaryPayload | VerificationRunSummaryPayload | AcceptanceRunSummaryPayload | AcceptanceStampRunSummaryPayload | AcPassBankRunSummaryPayload;
 export type RunSummaryLine = RunSummaryBaseFields & {
     readonly payload: RunSummaryPayload;
 };

package/dist/run-summary/types.js

@@ -24,5 +24,6 @@ export const RUN_SUMMARY_EVENT_KINDS = [
     "verification",
     "acceptance",
     "acceptance_stamp",
+    "ac_pass_bank",
 ];
 //# sourceMappingURL=types.js.map

package/dist/scope/acceptance-evidence.d.ts

@@ -13,6 +13,7 @@
  * ITEM_CORE is not expanded with bare keys; verify:vbrief-conformance rejects them.
  */
 import type { GrantOrigin } from "../authz/types.js";
+import { type AcceptancePredicate } from "../product-first-done-gate/acceptance-resolver.js";
 import { type EvaluateVerifyAcOptions } from "../product-first-done-gate/evaluate.js";
 /** Canonical namespaced key for typed acceptance evidence (#3305 / #1620). */
 export declare const ACCEPTANCE_EVIDENCE_KEY: "x-directive/evidence";
@@ -56,6 +57,10 @@ export interface AcceptanceEvidenceGateResult {
     readonly ok: boolean;
     readonly message: string;
     readonly reports: readonly CriterionAcceptanceReport[];
+    /** How the #3357 walk obtained AC (#3387). */
+    readonly servedFrom?: "bank" | "cache" | "executed";
+    /** Which acceptance check decided the walk (#3497). Undefined when no walk ran. */
+    readonly predicate?: AcceptancePredicate;
 }
 export declare function isAcceptanceEvidenceKind(value: unknown): value is AcceptanceEvidenceKind;
 export declare function isAcceptanceDispositionKind(value: unknown): value is AcceptanceDispositionKind;
@@ -100,17 +105,24 @@ export declare function stampNamespacedEvidence(item: Record<string, unknown>, r
  */
 export declare function stampNamespacedDisposition(item: Record<string, unknown>, record: AcceptanceDispositionRecord): void;
 /**
- * One remediation when scope:complete cannot accept empty or failing product AC (#3357).
- * Item-level disposition is not a substitute for the acceptance walk.
+ * Standing contract for scope:complete's acceptance precondition (#3357 / #3497).
+ *
+ * It no longer asserts a predicate ("empty or failing") — the actual predicate is
+ * named per refusal by the shared resolver. It also no longer tells operators to
+ * stamp by running verify:ac: verify:ac is the verifier and never writes the brief
+ * (a verifier that authors the acceptance it then checks is not a gate). Stamping
+ * happens at intake / promote via clause derivation (#3323).
  */
-export declare const SCOPE_COMPLETE_ACCEPTANCE_REMEDIATION = "Run task verify:ac -- <completing-xbrief> and stamp executable plan.acceptance; scope:complete refuses empty or failing acceptance (disposition is not a substitute) (#3357)";
+export declare const SCOPE_COMPLETE_ACCEPTANCE_REMEDIATION: string;
 /**
  * Hard precondition for scope:complete (#3357 / #3267 / #3284).
  *
- * Runs the same verify:ac walk check uses. Disposition on plan items does not
- * skip it. Briefs with no stamped plan.acceptance and no executable commands
- * keep the legacy #3267 "nothing to run" pass so existing evidence-only
- * fixtures stay valid.
+ * Runs the same verify:ac walk check uses, through the one shared option profile and
+ * the one shared verdict resolver (#3497) — so scope:complete can no longer report a
+ * different story than verify:ac about the same artifact. Disposition on plan items
+ * does not skip it. Briefs with no stamped plan.acceptance and no executable commands
+ * keep the legacy #3267 "nothing to run" pass so existing evidence-only fixtures stay
+ * valid.
  */
 export declare function evaluateScopeCompleteAcceptanceWalk(plan: Record<string, unknown>, options?: EvaluateVerifyAcOptions): AcceptanceEvidenceGateResult;
 /**

package/dist/scope/acceptance-evidence.js

@@ -13,6 +13,7 @@
  * ITEM_CORE is not expanded with bare keys; verify:vbrief-conformance rejects them.
  */
 import { isHumanOrigin } from "../authz/origin.js";
+import { formatAcceptanceVerdict, resolveAcceptanceGateProfile, resolveAcceptanceVerdict, } from "../product-first-done-gate/acceptance-resolver.js";
 import { evaluateVerifyAcFromPlan, } from "../product-first-done-gate/evaluate.js";
 /** Canonical namespaced key for typed acceptance evidence (#3305 / #1620). */
 export const ACCEPTANCE_EVIDENCE_KEY = "x-directive/evidence";
@@ -371,41 +372,67 @@ function walkItems(items, pathPrefix, reports) {
     });
 }
 /**
- * One remediation when scope:complete cannot accept empty or failing product AC (#3357).
- * Item-level disposition is not a substitute for the acceptance walk.
+ * Standing contract for scope:complete's acceptance precondition (#3357 / #3497).
+ *
+ * It no longer asserts a predicate ("empty or failing") — the actual predicate is
+ * named per refusal by the shared resolver. It also no longer tells operators to
+ * stamp by running verify:ac: verify:ac is the verifier and never writes the brief
+ * (a verifier that authors the acceptance it then checks is not a gate). Stamping
+ * happens at intake / promote via clause derivation (#3323).
  */
-export const SCOPE_COMPLETE_ACCEPTANCE_REMEDIATION = "Run task verify:ac -- <completing-xbrief> and stamp executable plan.acceptance; scope:complete refuses empty or failing acceptance (disposition is not a substitute) (#3357)";
+export const SCOPE_COMPLETE_ACCEPTANCE_REMEDIATION = "scope:complete requires executable plan.acceptance that runs green; stamp commands on " +
+    "plan.acceptance.commands (or plan.metadata.swarm.verify_commands) — task verify:ac verifies, " +
+    "it does not stamp — then re-run task verify:ac -- <completing-xbrief> " +
+    "(disposition is not a substitute) (#3357/#3497)";
 /**
  * Hard precondition for scope:complete (#3357 / #3267 / #3284).
  *
- * Runs the same verify:ac walk check uses. Disposition on plan items does not
- * skip it. Briefs with no stamped plan.acceptance and no executable commands
- * keep the legacy #3267 "nothing to run" pass so existing evidence-only
- * fixtures stay valid.
+ * Runs the same verify:ac walk check uses, through the one shared option profile and
+ * the one shared verdict resolver (#3497) — so scope:complete can no longer report a
+ * different story than verify:ac about the same artifact. Disposition on plan items
+ * does not skip it. Briefs with no stamped plan.acceptance and no executable commands
+ * keep the legacy #3267 "nothing to run" pass so existing evidence-only fixtures stay
+ * valid.
  */
 export function evaluateScopeCompleteAcceptanceWalk(plan, options = {}) {
     const stamped = plan.acceptance !== undefined;
+    const profile = resolveAcceptanceGateProfile("complete");
     const walk = evaluateVerifyAcFromPlan(plan, {
         ...options,
-        checkIntegrated: false,
-        captureFromNarratives: options.captureFromNarratives ?? true,
+        checkIntegrated: profile.checkIntegrated,
+        captureFromNarratives: options.captureFromNarratives ?? profile.captureFromNarratives,
+        reuseMode: options.reuseMode ?? profile.reuseMode,
     });
     const rejectedCount = walk.rejected?.length ?? 0;
     const hadWork = walk.runs.length > 0 || walk.commands.length > 0 || rejectedCount > 0;
+    const servedFrom = walk.servedFrom ?? "executed";
     if (!stamped && !hadWork) {
         return {
             ok: true,
             message: "Acceptance walk not required (no stamped plan.acceptance) (#3357)",
             reports: [],
+            servedFrom: "executed",
         };
     }
+    const verdict = resolveAcceptanceVerdict(walk);
     if (walk.ok) {
-        return { ok: true, message: walk.message, reports: [] };
+        return {
+            ok: true,
+            message: walk.message,
+            reports: [],
+            servedFrom,
+            predicate: verdict.predicate,
+        };
     }
     return {
         ok: false,
-        message: `${SCOPE_COMPLETE_ACCEPTANCE_REMEDIATION}\n${walk.message}`,
+        // Name the check that refused and the value it read BEFORE the standing
+        // contract, so the first line the operator sees is the actual cause (#3497).
+        message: `scope:complete refused acceptance — ${formatAcceptanceVerdict(verdict)}\n` +
+            `${SCOPE_COMPLETE_ACCEPTANCE_REMEDIATION}\n${walk.message}`,
         reports: [],
+        servedFrom,
+        predicate: verdict.predicate,
     };
 }
 /**

package/dist/scope/delivery-evidence.d.ts

@@ -99,13 +99,13 @@ export declare function verifyDeliveryAncestry(projectRoot: string, mergeCommit:
     remoteTip: string | null;
 };
 /**
- * Gate delivered completion for a code-bearing scope (#3041).
+ * Gate delivered completion for a code-bearing scope (#3041 / #3380).
  *
  * Returns ok=true with provenance when:
  * - scope is not code-bearing (provenance may be null or non-code note), OR
  * - explicit non-delivery disposition is provided, OR
- * - durable delivery evidence validates (PR base == deliveryBranch, merge commit
- *   ancestor of refreshed remote delivery ref).
+ * - merge commit is an ancestor of the refreshed remote delivery ref (prBase is
+ *   provenance only; it need not equal deliveryBranch).
  */
 export declare function evaluateDeliveryGate(options: DeliveryGateOptions): DeliveryGateResult;
 /** Stamp completion provenance onto plan.metadata (mutates plan). */

package/dist/scope/delivery-evidence.js

@@ -175,7 +175,7 @@ export function verifyDeliveryAncestry(projectRoot, mergeCommit, deliveryBranch,
         return {
             ok: false,
             error: `merge commit ${mergeCommit} is not an ancestor of refreshed remote delivery ref ` +
-                `${refresh.remoteRef} (${remoteTip}). Intermediate/integration-only merges are not delivery evidence (#3041).`,
+                `${refresh.remoteRef} (${remoteTip}).`,
             remoteTip,
         };
     }
@@ -199,14 +199,21 @@ function buildProvenance(input) {
         uatVerified: e.uatVerified ?? null,
     };
 }
+function deliveryEvidenceRemediation(deliveryBranch) {
+    return (`Pass scope:complete -- --merge-commit <sha> (and --pr <n> if you have one). ` +
+        `When develop is the real delivery target, type plan.policy.deliveryBranch ` +
+        `(task policy:show --field=deliveryBranch). ` +
+        `When ${deliveryBranch} is delivery, wait until the merge commit is an ancestor of ` +
+        `origin/${deliveryBranch}, then complete. Do not use --non-delivery for work that shipped.`);
+}
 /**
- * Gate delivered completion for a code-bearing scope (#3041).
+ * Gate delivered completion for a code-bearing scope (#3041 / #3380).
  *
  * Returns ok=true with provenance when:
  * - scope is not code-bearing (provenance may be null or non-code note), OR
  * - explicit non-delivery disposition is provided, OR
- * - durable delivery evidence validates (PR base == deliveryBranch, merge commit
- *   ancestor of refreshed remote delivery ref).
+ * - merge commit is an ancestor of the refreshed remote delivery ref (prBase is
+ *   provenance only; it need not equal deliveryBranch).
  */
 export function evaluateDeliveryGate(options) {
     const runGit = options.runGit ?? defaultGitRunner;
@@ -267,10 +274,8 @@ export function evaluateDeliveryGate(options) {
         return {
             ok: false,
             message: `Delivery evidence required for code-bearing scope completion (#3041). ` +
-                `Provide merge/PR delivery proof (merge commit ancestor of remote ` +
-                `'${deliveryBranch}') or an explicit --non-delivery disposition ` +
-                `(${NON_DELIVERY_DISPOSITIONS.join("|")}). ` +
-                `Merged-to-integration alone is not delivery.`,
+                `A merge commit that is an ancestor of refreshed origin/${deliveryBranch} is delivery; ` +
+                `PR base is provenance only. ${deliveryEvidenceRemediation(deliveryBranch)}`,
             provenance: null,
             codeBearing: true,
         };
@@ -294,27 +299,11 @@ export function evaluateDeliveryGate(options) {
             };
         }
     }
-    if (prBase !== null && prBase !== deliveryBranch) {
-        const provenance = buildProvenance({
-            evidence,
-            deliveryBranch,
-            disposition: "merged_to_integration",
-            handoffState: "merged_to_integration",
-            nowIso: options.nowIso,
-            verifier,
-        });
-        return {
-            ok: false,
-            message: `PR base '${prBase}' is not the configured delivery branch '${deliveryBranch}'. ` +
-                `A merge into an intermediate/feature/integration branch is not delivery evidence (#3041).`,
-            provenance,
-            codeBearing: true,
-        };
-    }
     if (mergeCommit === null) {
         return {
             ok: false,
-            message: "Delivery evidence missing merge_commit_sha; cannot prove ancestry on delivery branch (#3041).",
+            message: "Delivery evidence missing merge_commit_sha; cannot prove ancestry on delivery branch (#3041). " +
+                deliveryEvidenceRemediation(deliveryBranch),
             provenance: null,
             codeBearing: true,
         };
@@ -339,9 +328,15 @@ export function evaluateDeliveryGate(options) {
     const ancestry = verifyDeliveryAncestry(options.projectRoot, mergeCommit, deliveryBranch, runGit);
     if (!ancestry.ok) {
         const integrationOnly = prBase !== null && prBase !== deliveryBranch;
+        const ancestryMsg = ancestry.error ?? "delivery ancestry check failed";
+        const rem = deliveryEvidenceRemediation(deliveryBranch);
+        const message = integrationOnly
+            ? `${ancestryMsg} PR base '${prBase}' is provenance only; ` +
+                `the merge is not yet on origin/${deliveryBranch}. ${rem}`
+            : `${ancestryMsg} ${rem}`;
         return {
             ok: false,
-            message: ancestry.error ?? "delivery ancestry check failed",
+            message,
             provenance: buildProvenance({
                 evidence,
                 deliveryBranch,

package/dist/scope/index.d.ts

@@ -12,6 +12,7 @@ export * from "./main.js";
 export * from "./open-umbrella-warning.js";
 export * from "./parent-lineage.js";
 export * from "./project-context.js";
+export * from "./project-invariant-coverage.js";
 export * from "./promote-from-issue.js";
 export * from "./promote-path.js";
 export * from "./transition.js";

package/dist/scope/index.js

@@ -12,6 +12,7 @@ export * from "./main.js";
 export * from "./open-umbrella-warning.js";
 export * from "./parent-lineage.js";
 export * from "./project-context.js";
+export * from "./project-invariant-coverage.js";
 export * from "./promote-from-issue.js";
 export * from "./promote-path.js";
 export * from "./transition.js";

package/dist/scope/parent-lineage.js

@@ -98,20 +98,21 @@ export function extractChildCoverageDraft(child) {
     candidates.push({ source: "plan", obj: plan });
     candidates.push({ source: "root", obj: root });
     for (const c of candidates) {
+        const nestedCoverage = asRecord(c.obj.coverage);
         const hasMap = "coverage_map" in c.obj ||
             "coverageMap" in c.obj ||
-            asRecord(c.obj.coverage)?.coverage_map !== undefined;
+            nestedCoverage?.coverage_map !== undefined ||
+            nestedCoverage?.coverageMap !== undefined;
         if (!hasMap)
             continue;
-        const coverageNested = asRecord(c.obj.coverage);
         const coverage_map = c.obj.coverage_map ??
             c.obj.coverageMap ??
-            coverageNested?.coverage_map ??
-            coverageNested?.coverageMap;
+            nestedCoverage?.coverage_map ??
+            nestedCoverage?.coverageMap;
         const behavioral_deltas = c.obj.behavioral_deltas ??
             c.obj.behavioralDeltas ??
-            coverageNested?.behavioral_deltas ??
-            coverageNested?.behavioralDeltas;
+            nestedCoverage?.behavioral_deltas ??
+            nestedCoverage?.behavioralDeltas;
         return {
             draft: {
                 coverage_map,