@sema-agent/server 7.52.1 → 7.54.0

package/dist/tool-approval.js

@@ -3,6 +3,7 @@ import { uuidv7, MAX_RULE_TEXT_CHARS } from "@sema-agent/core";
 import { precheckCardRuleText } from "./rules-consent.js";
 import { redactDeep, redactSecrets } from "./trace/redact.js";
 import { hasBidiControls } from "./text-bidi.js";
+import { approvalPayloadFingerprint } from "./plugins/approval-payload-fingerprint.js";
 import { createLogger } from "./observability/logger.js";
 import { recordFailOpen } from "./observability/fail-open.js";
 import { deriveAskId, deriveBatchId, MAX_DECISION_NOTE_CHARS } from "./approval-ask-machine.js";
@@ -45,6 +46,20 @@ export const ASK_DECISION_CONSUMER_ABSENT = "absent";
 const DURABLE_CONVERGE_BACKOFF_MS = [50, 100, 200, 400, 800, 1600];
 const DURABLE_CONVERGE_READ_TIMEOUT_MS = 2_000;
 const DURABLE_CALL_TIMEOUT_MS = 5_000;
+function ambiguousCasFailOpenTag(intent) {
+    switch (intent) {
+        case "expire":
+            return "server.approval.ambiguous-cas.expire";
+        case "cancel":
+            return "server.approval.ambiguous-cas.cancel";
+        case "unreachable":
+            return "server.approval.ambiguous-cas.unreachable";
+        default: {
+            const unreachable = intent;
+            throw new Error(`ambiguousCasFailOpenTag: unknown intent ${String(unreachable)}`);
+        }
+    }
+}
 class ApprovalStoreDeadlineError extends Error {
     constructor(label, timeoutMs) {
         super(`approval store call ${label} timed out after ${timeoutMs}ms`);
@@ -194,14 +209,21 @@ function effectiveAskWindowMs(ttlMs, windowMarginMs, legDeadlineMonotonic, nowMo
     return Math.min(ttlMs, Math.max(0, legRemainingMs - windowMarginMs));
 }
 function replayTerminalAskRow(row) {
-    if (row.state === "DECIDED")
-        return row.decision === "approve";
+    if (row.state === "DECIDED") {
+        if (row.decision !== "approve")
+            return false;
+        return row.updatedInput !== undefined ? { allow: true, updatedInput: row.updatedInput } : true;
+    }
     if (row.state === "PARKING" || row.state === "PARKED")
         return "unavailable";
     return false;
 }
-function recordRowDerivedApproveReplay(where) {
-    recordFailOpen("server.hitl.row-derived-approve-drops-updated-input", where);
+function settleArgsOf(outcome) {
+    if (outcome === "unavailable")
+        return "unavailable";
+    if (typeof outcome === "boolean")
+        return { allowed: outcome };
+    return { allowed: outcome.allow, ...(outcome.updatedInput !== undefined ? { updatedInput: outcome.updatedInput } : {}) };
 }
 export class ToolApprovalCoordinator {
     als = new AsyncLocalStorage();
@@ -432,26 +454,32 @@ export class ToolApprovalCoordinator {
             return false;
         }
     }
-    async readDecidedForRecovery(askId) {
+    async readRowForRecovery(askId, where) {
         if (!this.askStore)
-            return undefined;
+            return { kind: "absent" };
+        let row;
         try {
-            const row = await this.withStoreDeadline(this.askStore.getAsk(askId), "getAsk(expire-error-recovery)", DURABLE_CONVERGE_READ_TIMEOUT_MS);
-            if (row === null || row.state !== "DECIDED")
-                return undefined;
-            if (replayTerminalAskRow(row) === true && this.abandonedEditedDecisionPending(askId)) {
-                this.guardRowDerivedApprove(askId, true, "expire-error-recovery");
-                return undefined;
-            }
-            if (this.editedDecisionInFlight(askId))
-                return undefined;
-            const replayed = replayTerminalAskRow(row);
-            return typeof replayed === "boolean" ? replayed : undefined;
+            row = await this.withStoreDeadline(this.askStore.getAsk(askId), `getAsk(${where})`, DURABLE_CONVERGE_READ_TIMEOUT_MS);
         }
         catch (err) {
-            this.noteStoreError(err, "getAsk(expire-error-recovery)");
-            return undefined;
+            this.noteStoreError(err, `getAsk(${where})`);
+            return { kind: "unreadable" };
         }
+        if (row === null)
+            return { kind: "absent" };
+        if (row.state === "STREAM_PENDING") {
+            return this.editedDecisionInFlight(askId) ? { kind: "edit-in-flight" } : { kind: "pending" };
+        }
+        const replayed = settleArgsOf(this.guardRowDerivedApprove(askId, replayTerminalAskRow(row), where));
+        if (replayed === "unavailable")
+            return { kind: "parked" };
+        if (!replayed.allowed)
+            return { kind: "denied" };
+        if (replayed.updatedInput !== undefined)
+            return { kind: "approved", updatedInput: replayed.updatedInput };
+        if (this.editedDecisionInFlight(askId))
+            return { kind: "edit-in-flight" };
+        return { kind: "approved" };
     }
     hasOtherSuspendedOwner(askId, self) {
         if (askId === undefined)
@@ -482,13 +510,17 @@ export class ToolApprovalCoordinator {
         const now = Date.now();
         let ownCount = 0;
         let ownExpiredVictim;
+        let ownBridgeVictim;
         let ownPlainVictim;
         let ownEvictable;
         let globalExpiredVictim;
+        let globalBridgeVictim;
         for (const [k, t] of this.parkTombstones) {
             const expired = now - t.parkedAtMs > this.parkTombstoneTtlMs;
             if (globalExpiredVictim === undefined && expired && t.inflight === undefined)
                 globalExpiredVictim = k;
+            if (globalBridgeVictim === undefined && t.kind === "voidBridge" && t.inflight === undefined)
+                globalBridgeVictim = k;
             if (t.owner !== tomb.owner)
                 continue;
             ownCount++;
@@ -498,13 +530,16 @@ export class ToolApprovalCoordinator {
                 ownEvictable = k;
             if (ownExpiredVictim === undefined && expired)
                 ownExpiredVictim = k;
-            if (ownPlainVictim === undefined && t.redeemed === undefined)
+            if (ownBridgeVictim === undefined && t.kind === "voidBridge")
+                ownBridgeVictim = k;
+            if (ownPlainVictim === undefined && t.kind === "park" && t.redeemed === undefined)
                 ownPlainVictim = k;
         }
+        const insertingBridge = tomb.kind === "voidBridge";
         if (ownCount >= effectivePerPrincipalMax) {
-            const victim = ownExpiredVictim ?? ownPlainVictim ?? ownEvictable;
+            const victim = insertingBridge ? (ownExpiredVictim ?? ownBridgeVictim) : (ownExpiredVictim ?? ownBridgeVictim ?? ownPlainVictim ?? ownEvictable);
             if (victim === undefined) {
-                recordFailOpen("server.approval.park-tombstone-global-cap-refused", `owner=${tomb.owner ?? "<none>"} reason=all-inflight`);
+                recordFailOpen("server.approval.park-tombstone-global-cap-refused", `owner=${tomb.owner ?? "<none>"} reason=${insertingBridge ? "bridge-would-evict-redeemable" : "all-inflight"}`);
                 return;
             }
             this.parkTombstones.delete(victim);
@@ -512,8 +547,11 @@ export class ToolApprovalCoordinator {
         else if (this.parkTombstones.size >= this.parkTombstoneMax && globalExpiredVictim !== undefined) {
             this.parkTombstones.delete(globalExpiredVictim);
         }
+        else if (this.parkTombstones.size >= this.parkTombstoneMax && !insertingBridge && globalBridgeVictim !== undefined) {
+            this.parkTombstones.delete(globalBridgeVictim);
+        }
         else if (this.parkTombstones.size >= this.parkTombstoneMax) {
-            recordFailOpen("server.approval.park-tombstone-global-cap-refused", `owner=${tomb.owner ?? "<none>"}`);
+            recordFailOpen("server.approval.park-tombstone-global-cap-refused", `owner=${tomb.owner ?? "<none>"}${insertingBridge ? " reason=bridge-refused-at-global-cap" : ""}`);
             return;
         }
         this.parkTombstones.set(approvalId, tomb);
@@ -745,8 +783,6 @@ export class ToolApprovalCoordinator {
                 if (existingOrCreated.row.state !== "STREAM_PENDING") {
                     releaseAdmission();
                     const replayed = this.guardRowDerivedApprove(askId, replayTerminalAskRow(existingOrCreated.row), "ensure-ask-idempotent-replay");
-                    if (replayed === true)
-                        recordRowDerivedApproveReplay("ensure-ask-idempotent-replay");
                     return replayed === "unavailable" ? this.unattendedOutcome() : replayed;
                 }
                 const persistedEnvelope = ApprovalCardEnvelopeSchema.safeParse(existingOrCreated.row.cardJson);
@@ -872,7 +908,7 @@ export class ToolApprovalCoordinator {
                 sig.removeEventListener("abort", fn);
             this.pending.delete(id);
             if (windowRouteUnavailable && askId !== undefined && batchId !== undefined && this.unattendedOutcome() !== false) {
-                this.recordParkTombstone(wireApprovalId, { askId, batchId, owner: origin.owner, parkedAtMs: Date.now() });
+                this.recordParkTombstone(wireApprovalId, { kind: "park", askId, batchId, owner: origin.owner, parkedAtMs: Date.now() });
                 parkRouted = true;
             }
             if (askId !== undefined) {
@@ -892,40 +928,37 @@ export class ToolApprovalCoordinator {
         const convergeFromDurableState = async (where) => {
             if (!this.askStore || askId === undefined)
                 return;
-            const store = this.askStore;
             const pinnedAskId = askId;
-            for (let attempt = 0; attempt < DURABLE_CONVERGE_BACKOFF_MS.length; attempt++) {
+            for (let attempt = 0; attempt <= DURABLE_CONVERGE_BACKOFF_MS.length; attempt++) {
                 if (done)
                     return;
-                try {
-                    const row = await this.withStoreDeadline(store.getAsk(pinnedAskId), `getAsk(${where})`, DURABLE_CONVERGE_READ_TIMEOUT_MS);
-                    if (done)
-                        return;
-                    if (row === null) {
+                const read = await this.readRowForRecovery(pinnedAskId, `converge:${where}`);
+                if (done)
+                    return;
+                switch (read.kind) {
+                    case "absent":
                         settle(false, "expired");
                         return;
-                    }
-                    if (row.state === "STREAM_PENDING" || this.editedDecisionInFlight(pinnedAskId)) {
-                        await new Promise((r) => setTimeout(r, DURABLE_CONVERGE_BACKOFF_MS[attempt]).unref?.());
+                    case "pending":
+                    case "edit-in-flight":
+                    case "unreadable":
+                        if (attempt < DURABLE_CONVERGE_BACKOFF_MS.length)
+                            await new Promise((r) => setTimeout(r, DURABLE_CONVERGE_BACKOFF_MS[attempt]).unref?.());
                         continue;
-                    }
-                    const outcome = this.guardRowDerivedApprove(pinnedAskId, replayTerminalAskRow(row), `converge:${where}`);
-                    if (outcome === "unavailable") {
+                    case "parked":
                         windowRouteUnavailable = true;
                         settle(false, "expired");
-                    }
-                    else if (outcome === true) {
-                        recordRowDerivedApproveReplay(`converge:${where}`);
-                        settle(true, "allowed");
-                    }
-                    else {
+                        return;
+                    case "approved":
+                        settle(true, "allowed", read.updatedInput);
+                        return;
+                    case "denied":
                         settle(false, "denied");
+                        return;
+                    default: {
+                        const unreachable = read;
+                        throw new Error(`convergeFromDurableState: unknown recovery read ${String(unreachable)}`);
                     }
-                    return;
-                }
-                catch (err) {
-                    this.noteStoreError(err, `getAsk(${where})`);
-                    await new Promise((r) => setTimeout(r, DURABLE_CONVERGE_BACKOFF_MS[attempt]).unref?.());
                 }
             }
             if (!done) {
@@ -938,6 +971,90 @@ export class ToolApprovalCoordinator {
                 }
             }
         };
+        const recoverFromUnknownStore = async (arm, casStillInFlight) => {
+            if (askId === undefined) {
+                arm.settleByIntent();
+                return;
+            }
+            const pinnedAskId = askId;
+            for (let attempt = 0; attempt <= DURABLE_CONVERGE_BACKOFF_MS.length; attempt++) {
+                if (done)
+                    return;
+                const read = await this.readRowForRecovery(pinnedAskId, `recovery:${arm.intent}`);
+                if (done)
+                    return;
+                switch (read.kind) {
+                    case "approved":
+                        settle(true, "allowed", read.updatedInput);
+                        return;
+                    case "denied":
+                        settle(false, "denied");
+                        return;
+                    case "parked":
+                        windowRouteUnavailable = true;
+                        settle(false, "expired");
+                        return;
+                    case "pending": {
+                        if (casStillInFlight) {
+                            arm.settleByIntent();
+                            return;
+                        }
+                        let result;
+                        try {
+                            result = await arm.cas();
+                        }
+                        catch (err) {
+                            this.noteStoreError(err, arm.storeLabel);
+                            arm.settleByIntent();
+                            return;
+                        }
+                        if (arm.won(result)) {
+                            arm.onWon(result);
+                            return;
+                        }
+                        await convergeFromDurableState(arm.where);
+                        return;
+                    }
+                    case "absent":
+                        arm.settleByIntent();
+                        return;
+                    case "edit-in-flight":
+                    case "unreadable":
+                        if (attempt < DURABLE_CONVERGE_BACKOFF_MS.length)
+                            await new Promise((r) => setTimeout(r, DURABLE_CONVERGE_BACKOFF_MS[attempt]).unref?.());
+                        continue;
+                    default: {
+                        const unreachable = read;
+                        throw new Error(`recoverFromUnknownStore: unknown recovery read ${String(unreachable)}`);
+                    }
+                }
+            }
+            if (done)
+                return;
+            if (this.editedDecisionInFlight(pinnedAskId)) {
+                windowRouteUnavailable = true;
+                settle(false, "expired");
+                return;
+            }
+            recordFailOpen(ambiguousCasFailOpenTag(arm.intent), `askId=${pinnedAskId} reads=${DURABLE_CONVERGE_BACKOFF_MS.length + 1}`);
+            arm.settleByIntent();
+        };
+        const resolveLocalOutcome = async (arm) => {
+            let result;
+            try {
+                result = await arm.cas();
+            }
+            catch (err) {
+                this.noteStoreError(err, arm.storeLabel);
+                await recoverFromUnknownStore(arm, err instanceof ApprovalStoreDeadlineError);
+                return;
+            }
+            if (arm.won(result)) {
+                arm.onWon(result);
+                return;
+            }
+            await convergeFromDurableState(arm.where);
+        };
         const settleParkRouteIfUnsettled = (hostSettledBy) => {
             if (done)
                 return;
@@ -950,36 +1067,30 @@ export class ToolApprovalCoordinator {
                     settleParkRouteIfUnsettled(hostSelfReport);
                     return;
                 }
-                try {
-                    const res = await this.withStoreDeadline(this.askStore.expireAsk(askId, batchId), "expireAsk(window)", DURABLE_CALL_TIMEOUT_MS, (late) => {
+                const store = this.askStore;
+                const pinnedAskId = askId;
+                const pinnedBatchId = batchId;
+                await resolveLocalOutcome({
+                    intent: "expire",
+                    storeLabel: "expireAsk",
+                    where: "windowExpired",
+                    cas: () => this.withStoreDeadline(store.expireAsk(pinnedAskId, pinnedBatchId), "expireAsk(window)", DURABLE_CALL_TIMEOUT_MS, (late) => {
                         if (!late.won)
                             return;
-                        this.settleSameAskIdParkRoute(askId);
+                        this.settleSameAskIdParkRoute(pinnedAskId);
                         this.settleVoidedSiblings(late.voidedSiblings);
-                        this.emitRevokeTo(aliveCtxs, buildRevokeFrame(batchId, late.voidedSiblings, "superseded_by_park", Date.now()));
-                    });
-                    if (res.won) {
+                        this.emitRevokeTo(aliveCtxs, buildRevokeFrame(pinnedBatchId, late.voidedSiblings, "superseded_by_park", Date.now()));
+                    }),
+                    won: (res) => res.won,
+                    onWon: (res) => {
                         windowRouteUnavailable = true;
                         settle(false, "expired");
-                        this.settleSameAskIdParkRoute(askId);
+                        this.settleSameAskIdParkRoute(pinnedAskId);
                         this.settleVoidedSiblings(res.voidedSiblings);
-                        this.emitRevokeTo(aliveCtxs, buildRevokeFrame(batchId, res.voidedSiblings, "superseded_by_park", Date.now()));
-                    }
-                    else {
-                        await convergeFromDurableState("windowExpired");
-                    }
-                }
-                catch (err) {
-                    this.noteStoreError(err, "expireAsk");
-                    const decided = await this.readDecidedForRecovery(askId);
-                    if (decided !== undefined && !done) {
-                        if (decided)
-                            recordRowDerivedApproveReplay("expire-error-recovery");
-                        settle(decided, decided ? "allowed" : "denied");
-                        return;
-                    }
-                    settleParkRouteIfUnsettled(hostSelfReport);
-                }
+                        this.emitRevokeTo(aliveCtxs, buildRevokeFrame(pinnedBatchId, res.voidedSiblings, "superseded_by_park", Date.now()));
+                    },
+                    settleByIntent: () => settleParkRouteIfUnsettled(hostSelfReport),
+                });
             })();
         };
         const forceParkNow = () => {
@@ -1002,26 +1113,29 @@ export class ToolApprovalCoordinator {
                 settle(false, "expired");
                 return;
             }
-            try {
-                const won = await this.withStoreDeadline(this.askStore.transitionAsk(askId, "STREAM_PENDING", "VOID", { updatedAtMs: Date.now() }), "transitionAsk(cancel)", DURABLE_CALL_TIMEOUT_MS, (lateWon) => {
+            const store = this.askStore;
+            const pinnedAskId = askId;
+            const pinnedBatchId = batchId;
+            await resolveLocalOutcome({
+                intent: "cancel",
+                storeLabel: "transitionAsk(cancel)",
+                where: "runCancel",
+                cas: () => this.withStoreDeadline(store.transitionAsk(pinnedAskId, "STREAM_PENDING", "VOID", { updatedAtMs: Date.now() }), "transitionAsk(cancel)", DURABLE_CALL_TIMEOUT_MS, (lateWon) => {
                     if (!lateWon)
                         return;
-                    this.settleVoidedSiblings([askId]);
-                    this.emitRevokeTo(aliveCtxs, buildRevokeFrame(batchId, [askId], "aborted", Date.now()));
-                });
-                if (won) {
+                    this.settleVoidedSiblings([pinnedAskId]);
+                    this.recordParkTombstone(wireApprovalId, { kind: "voidBridge", askId: pinnedAskId, batchId: pinnedBatchId, owner: origin.owner, parkedAtMs: Date.now() });
+                    this.emitRevokeTo(aliveCtxs, buildRevokeFrame(pinnedBatchId, [pinnedAskId], "aborted", Date.now()));
+                }),
+                won: (won) => won,
+                onWon: () => {
                     settle(false, "expired");
-                    this.settleVoidedSiblings([askId]);
-                    this.emitRevokeTo(aliveCtxs, buildRevokeFrame(batchId, [askId], "aborted", Date.now()));
-                }
-                else {
-                    await convergeFromDurableState("runCancel");
-                }
-            }
-            catch (err) {
-                this.noteStoreError(err, "transitionAsk(cancel)");
-                settle(false, "expired");
-            }
+                    this.settleVoidedSiblings([pinnedAskId]);
+                    this.recordParkTombstone(wireApprovalId, { kind: "voidBridge", askId: pinnedAskId, batchId: pinnedBatchId, owner: origin.owner, parkedAtMs: Date.now() });
+                    this.emitRevokeTo(aliveCtxs, buildRevokeFrame(pinnedBatchId, [pinnedAskId], "aborted", Date.now()));
+                },
+                settleByIntent: () => settle(false, "expired"),
+            });
         };
         if (signal) {
             const onTaskAbort = () => void runCancel();
@@ -1111,31 +1225,42 @@ export class ToolApprovalCoordinator {
         const emitAllP = (async () => {
             const results = await Promise.all(openByCtx.values());
             const anySucceeded = reachability === "unreached" || this.hasOtherSuspendedOwner(askId, selfEntry) || results.some((r) => r.legacy || r.card);
+            emitSettled = true;
             if (!anySucceeded && !done) {
                 if (this.askStore && askId !== undefined && batchId !== undefined) {
-                    try {
-                        const res = await this.withStoreDeadline(this.askStore.expireAsk(askId, batchId), "expireAsk(emit-failed)");
-                        if (res.won && !done) {
-                            emitFailed = true;
-                            settle(false, "expired");
-                            this.settleSameAskIdParkRoute(askId);
+                    const store = this.askStore;
+                    const pinnedAskId = askId;
+                    const pinnedBatchId = batchId;
+                    const settleUnreachable = () => {
+                        if (done)
+                            return;
+                        emitFailed = true;
+                        settle(false, "expired");
+                    };
+                    await resolveLocalOutcome({
+                        intent: "unreachable",
+                        storeLabel: "expireAsk(emit-failed)",
+                        where: "emitFailed",
+                        cas: () => this.withStoreDeadline(store.expireAsk(pinnedAskId, pinnedBatchId), "expireAsk(emit-failed)", DURABLE_CALL_TIMEOUT_MS, (late) => {
+                            if (!late.won)
+                                return;
+                            this.settleSameAskIdParkRoute(pinnedAskId);
+                            this.settleVoidedSiblings(late.voidedSiblings);
+                        }),
+                        won: (res) => res.won,
+                        onWon: (res) => {
+                            settleUnreachable();
+                            this.settleSameAskIdParkRoute(pinnedAskId);
                             this.settleVoidedSiblings(res.voidedSiblings);
-                        }
-                    }
-                    catch (err) {
-                        this.noteStoreError(err, "expireAsk(emit-failed)");
-                        if (!done) {
-                            emitFailed = true;
-                            settle(false, "expired");
-                        }
-                    }
+                        },
+                        settleByIntent: settleUnreachable,
+                    });
                 }
                 else if (!done) {
                     emitFailed = true;
                     settle(false, "expired");
                 }
             }
-            emitSettled = true;
         })();
         await Promise.race([emitAllP, allowedP]);
         const settled = await allowedP;
@@ -1288,9 +1413,7 @@ export class ToolApprovalCoordinator {
             });
             return this.notPending();
         }
-        const settled = this.notifyExternalDecision(row.askId, row.decision === "approve");
-        if (row.decision === "approve" && settled.settled > 0)
-            recordRowDerivedApproveReplay("respond-late-replay");
+        this.notifyExternalDecision(row.askId, row.decision === "approve", row.updatedInput);
         return {
             status: 200,
             body: {
@@ -1559,11 +1682,13 @@ export class ToolApprovalCoordinator {
     }
     async respondWithCas(askStore, askId, batchId, id, entry, parsed, ruleEligibility) {
         let decidedWon = false;
+        let confirmedRowPayload;
         let noteLanded = false;
         try {
             const decided = await this.withStoreDeadline(askStore.decideAsk(askId, batchId, {
                 decision: parsed.value === "deny" ? "deny" : "approve",
                 ...(parsed.note !== undefined ? { decisionNote: parsed.note } : {}),
+                ...(parsed.value !== "deny" && parsed.updatedInput !== undefined ? { updatedInput: parsed.updatedInput } : {}),
             }), "decideAsk", DURABLE_CALL_TIMEOUT_MS, (late) => {
                 if (late.ok)
                     this.notifyExternalDecision(askId, parsed.value !== "deny", parsed.updatedInput);
@@ -1582,6 +1707,7 @@ export class ToolApprovalCoordinator {
                 const row = await this.withStoreDeadline(askStore.getAsk(askId), "getAsk(decideAsk-confirm)", DURABLE_CONVERGE_READ_TIMEOUT_MS);
                 if (row?.state === "DECIDED" && row.decision === (parsed.value === "deny" ? "deny" : "approve")) {
                     decidedWon = true;
+                    confirmedRowPayload = { updatedInput: row.updatedInput };
                     noteLanded = parsed.note === undefined || row.decisionNote === parsed.note;
                 }
             }
@@ -1592,15 +1718,20 @@ export class ToolApprovalCoordinator {
         const wantAllowed = parsed.value !== "deny";
         if (this.pending.get(id) !== entry) {
             if (decidedWon)
-                this.notifyExternalDecision(askId, wantAllowed, parsed.updatedInput);
+                this.notifyExternalDecision(askId, wantAllowed, confirmedRowPayload !== undefined ? confirmedRowPayload.updatedInput : parsed.updatedInput);
             const converged = decidedWon && entry.settledOutcome === (wantAllowed ? "allowed" : "denied");
             if (!converged) {
                 return this.notPending();
             }
             return this.finishRespond(id, entry, parsed, { updatedInputDelivered: false, noteRecorded: noteLanded });
         }
-        const result = this.finishRespond(id, entry, parsed, { noteRecorded: noteLanded });
-        this.notifyExternalDecision(askId, wantAllowed, parsed.updatedInput);
+        const payloadIsMine = confirmedRowPayload === undefined ||
+            approvalPayloadFingerprint({ updatedInput: confirmedRowPayload.updatedInput }) === approvalPayloadFingerprint({ updatedInput: parsed.updatedInput });
+        const result = this.finishRespond(id, entry, parsed, {
+            noteRecorded: noteLanded,
+            ...(confirmedRowPayload !== undefined ? { settlePayload: confirmedRowPayload, updatedInputDelivered: payloadIsMine } : {}),
+        });
+        this.notifyExternalDecision(askId, wantAllowed, confirmedRowPayload !== undefined ? confirmedRowPayload.updatedInput : parsed.updatedInput);
         return result;
     }
     finishRespond(id, entry, parsed, opts) {
@@ -1617,7 +1748,7 @@ export class ToolApprovalCoordinator {
             this.allowAllSessions.add(sessionAllowKey(entry.owner, entry.sessionId, sessionAllowCategory(entry.toolName)));
         }
         const allowed = parsed.value !== "deny";
-        entry.settle(allowed, allowed ? "allowed" : "denied", parsed.updatedInput, undefined, allowed ? undefined : parsed.note);
+        entry.settle(allowed, allowed ? "allowed" : "denied", opts?.settlePayload !== undefined ? opts.settlePayload.updatedInput : parsed.updatedInput, undefined, allowed ? undefined : parsed.note);
         const updatedInputDelivered = opts?.updatedInputDelivered ?? true;
         const noteRecorded = opts?.noteRecorded ?? false;
         return {
@@ -1687,18 +1818,14 @@ export class ToolApprovalCoordinator {
                 continue;
             if (this.editedDecisionInFlight(askId))
                 continue;
-            const outcome = replayTerminalAskRow(row);
+            const outcome = settleArgsOf(replayTerminalAskRow(row));
             if (outcome === "unavailable") {
                 const before = this.pendingByAskId.get(askId)?.size ?? 0;
                 this.settleSameAskIdParkRoute(askId);
                 settled += before;
                 continue;
             }
-            if (typeof outcome !== "boolean")
-                continue;
-            const delivered = this.notifyExternalDecision(askId, outcome).settled;
-            if (outcome && delivered > 0)
-                recordRowDerivedApproveReplay("poll-suspended");
+            const delivered = this.notifyExternalDecision(askId, outcome.allowed, outcome.updatedInput).settled;
             settled += delivered;
         }
         const backlog = Math.max(0, candidates.length - polled);

package/dist/trace/core-keyset-guard.d.ts

@@ -1,9 +1,9 @@
 /**
- * L1 键集机器门([1549] 方法论倡议 server 认领件;clay 令 2026-07-23「不能永远编码有限→复审补漏」)。
+ * L1 键集机器门([ref] 方法论倡议 server 认领件;clay 令 2026-07-23「不能永远编码有限→复审补漏」)。
  *
  * 病族:**投影白名单剥键**——core 给源类型加 additive 新键,server 的列投影/白名单静默丢,直到穿透
- * 审查才被人肉抓。已四案:RosterEntry.model([1532])、task_progress.status / TaskNotificationPayload
- * 四键 / BackgroundChildEvent.usage+transcriptId([1543] 族B)、SDK 0.0.72 fleet meta 剥键。
+ * 审查才被人肉抓。已四案:RosterEntry.model([ref])、task_progress.status / TaskNotificationPayload
+ * 四键 / BackgroundChildEvent.usage+transcriptId([ref] 族B)、SDK 0.0.72 fleet meta 剥键。
  *
  * 机制:对每个「core 源类型 → server 投影」面声明**已处置键集** = PROJECTED(真透传)∪ EXCLUDED
  * (显式记账不透传,理由必写)。`Exclude<keyof 源, 已处置>` 约束为 never——**升 core 后源类型出新键
@@ -14,8 +14,10 @@
  *
  * 维护:core 新键到来时,transparently 透传的加进对应 PROJECTED 并去实现投影;有意不上 wire 的加进
  * EXCLUDED 并写一行理由。谁改投影(project.ts / fleet-bus.ts / roster-store-sql.ts)谁同步本文件。
+ * ⑨⑩([ref],2026-08-31)把两个最大的 wire 面也纳入:TaskSpec 按「server 有无写点」记 Wired/Unwired,
+ * TaskResult 按「转发/摘除」记 Forwarded/Stripped —— 谁改 resolve-spec.ts / runs.ts 的发射点谁同步本文件。
  */
-import type { TaskNotificationPayload, BackgroundChildEvent, RosterEntry, AskRequest, CheckpointSummary, TaskEvent, TraceEvent, MailboxMessage, MailboxStore } from "@sema-agent/core";
+import type { TaskNotificationPayload, BackgroundChildEvent, RosterEntry, AskRequest, CheckpointSummary, TaskEvent, TraceEvent, MailboxMessage, MailboxStore, TaskSpec, TaskResult } from "@sema-agent/core";
 /** 编译期断言:T 必须收敛到 never(有残余键 = tsc 红)。 */
 type AssertAllKeysHandled<T extends never> = T;
 type NotificationProjected = "task_id" | "task_type" | "toolUseId" | "status" | "summary" | "result" | "output_file" | "usage" | "sessionId" | "seq" | "lines" | "stoppedBy" | "source" | "exitCode" | "partial" | "diagnostics" | "recentSteps" | "editedFiles" | "resumable" | "completionId" | "error" | "errorCode" | "apiFailure";
@@ -47,6 +49,14 @@ type _GuardPermissionTraceNonEmpty = AssertAllKeysHandled<AssertNonEmpty<Permiss
 type SummaryProjected = "sessionId" | "scope" | "createdAt" | "gateKind" | "severity" | "spentMicroUsd" | "deadline" | "hasBidiControls";
 type SummaryExcluded = "token" | "toolInput" | "toolName" | "toolCallId" | "preview" | "principal" | "sourceTaskId" | "contentKind" | "restoreMode" | "checkpointId" | "previewWithheld";
 type _GuardInboxSummary = AssertAllKeysHandled<Exclude<keyof CheckpointSummary, SummaryProjected | SummaryExcluded>>;
+type TaskSpecWired = "objective" | "principal" | "images" | "sessionId" | "requireExistingSession" | "oneShot" | "clientContext" | "resumeAt" | "resumeAtMode" | "model" | "compactionModel" | "thinking" | "systemPrompt" | "appendSystemPrompt" | "promptProvider" | "memory" | "suggestNextPrompts" | "restoreFiles" | "acceptPartialRestore" | "rewindFilesTo" | "tools" | "excludeTools" | "deferTools" | "toolMaterializeStrategy" | "promptProfile" | "toolPolicy" | "onAsk" | "onQuestion" | "hooks" | "durableApproval" | "resourceSuspend" | "resilience" | "finalVerification" | "checkpointStore" | "handsReadOnly" | "memoryPersistenceCapable" | "additionalDirectories" | "additionalReadDirectories" | "enablePlanMode" | "interactiveTools" | "enableFork" | "shellGate" | "mcp" | "a2a" | "skills" | "backgroundScope" | "envFacts" | "limits" | "configOverrides" | "forwardSubagentEvents" | "retainSubagentSessions" | "retainBackgroundProcesses" | "outputSchema" | "outputRetries" | "compaction" | "attachments" | "selfOrchestration" | "getApiKeyAndHeaders" | "interactionPosture" | "agents" | "taskId" | "signal" | "preemptSignal" | "modelRole" | "enableBlockedReport" | "maxSuspends";
+type TaskSpecUnwired = "actor" | "roles" | "lspManager" | "tracer" | "readFace" | "readDenyPatterns" | "interactiveQuestionFallback" | "alwaysLoadTools" | "restoreGatedTools" | "deferSelfResolve" | "basePolicyForResumeEdit" | "lspDiagnostics" | "streamingToolExecution" | "toolResultThresholdChars";
+type _GuardTaskSpec = AssertAllKeysHandled<Exclude<keyof TaskSpec, TaskSpecWired | TaskSpecUnwired>>;
+type _GuardTaskSpecReverse = AssertAllKeysHandled<Exclude<TaskSpecWired | TaskSpecUnwired, keyof TaskSpec>>;
+type TaskResultForwarded = "taskId" | "runId" | "sessionId" | "status" | "model" | "effectiveReasoning" | "result" | "salvagedOutput" | "blockedReason" | "checkpointId" | "checkpointGate" | "workspaceRestoreMode" | "remoteEnvFailures" | "errorMessage" | "errorCode" | "apiFailure" | "retryAfterMs" | "degraded" | "structuredOutput" | "rewindNotes" | "haltedOnUserRejection" | "haltedByUser" | "strandedHumanAnswers" | "pendingApproval" | "approvalWaitedMs" | "effectiveReadFace" | "effectiveReadDenyPatterns" | "effectiveMemoryScopes" | "stats";
+type TaskResultStripped = "checkpointToken";
+type _GuardTaskResult = AssertAllKeysHandled<Exclude<keyof TaskResult, TaskResultForwarded | TaskResultStripped>>;
+type _GuardTaskResultReverse = AssertAllKeysHandled<Exclude<TaskResultForwarded | TaskResultStripped, keyof TaskResult>>;
 export type CoreKeysetGuards = [
     _GuardNotification,
     _GuardBgNotif,
@@ -58,7 +68,11 @@ export type CoreKeysetGuards = [
     _GuardPermissionTrace,
     _GuardPermissionTraceReverse,
     _GuardPermissionTraceNonEmpty,
-    _GuardInboxSummary
+    _GuardInboxSummary,
+    _GuardTaskSpec,
+    _GuardTaskSpecReverse,
+    _GuardTaskResult,
+    _GuardTaskResultReverse
 ];
 export {};
 //# sourceMappingURL=core-keyset-guard.d.ts.map