@sema-agent/client-core 0.93.0 → 0.94.0

package/dist/hitl/toolApprovalWire.js

@@ -1,17 +1,21 @@
 import { APPROVAL_CARD_PORT_KEY_MISMATCH_REASON, DEFAULT_DENY_REASON, DecideTransportRetryExhaustedError, HitlBridge, NO_APPROVAL_CARD_PORT_REASON, HitlSafetyError, denyReasonForWire, findPendingForTask, readDecideCurrentPending, readWireErrorCode, } from './hitlBridge.js';
 import { askParkRowArm } from './askParkRowRouting.js';
 import { hostLog } from '../host.js';
-import { readOwnDataValue, readOwnNonEmptyString } from '../ownKey.js';
+import { readOwnDataNonEmptyString, readOwnDataValue, readOwnNonEmptyString } from '../ownKey.js';
 import { readAskClassPair } from './askClassPair.js';
 import { legacyShadowedRuleTextOf, readAllowRuleShadowFromWire } from './allowRuleShadow.js';
 import { createSessionSlot, DEFAULT_SESSION_KEY } from '../sessionSlot.js';
 import { readEngineActiveBgTasks } from '../fleet/fleetLedger.js';
-import { observeCancelByDeny, surfaceRememberNotApplied, surfaceEditNotForwarded, surfaceEditRefusedOnBlindAsk, surfaceRuleArmNotSent, surfaceRuleArmRejected } from './hitlHostSurface.js';
+import { INTERRUPT_DENY_REASON, observeCancelByDeny, surfaceApprovalParking, surfaceRememberNotApplied, surfaceEditNotForwarded, surfaceEditRefusedOnBlindAsk, surfaceRuleArmNotSent, surfaceRuleArmRejected } from './hitlHostSurface.js';
 import { approvalCallKey, liveFrameCallKey } from './gateIdentity.js';
+import { displayUntrusted } from '../displayUntrusted.js';
+import { approvalDecisionHolds, holdLiveCard, joinLiveCard, liveCardHoldOf } from './approvalHolds.js';
+import { approvalResolutionOf } from './approvalResolution.js';
 import { isApprovalMandateWord } from '../gateVocabulary.js';
 import { denyAttributionRefusalFromError } from '../wireRefusalCopy.js';
 import { approvalDecidedByAdmitted } from '../approvalDecidedByCapability.js';
 import { decideFailureNote } from '../decideFailureNote.js';
+import { wireFailureTextsOf } from '../wireFailureShape.js';
 import { refusalSaysStillPending } from '../engineErrorCodes.js';
 import { readDecideReceipt } from '../decideReceipt.js';
 import { RULE_OFFER_MATCHES, RULE_OFFER_BATCH_MEMBER_KINDS, RULE_OFFER_UNCOVERED_REASONS, RULE_OFFERS_ABSENCE_REASONS, ASK_ORIGINS, PERSISTED_RULE_MANDATES, } from '@sema-agent/sdk';
@@ -110,6 +114,7 @@ export function approvalCardPortFor(sessionKey) {
 export function _resetApprovalCardPortForTest() {
     cardPortByKey.clear();
     cardPortMissesByKey.clear();
+    callCardLedger.clear();
 }
 export function surfaceApprovalCard(req) {
     const cardPort = approvalCardPortFor(DEFAULT_SESSION_KEY);
@@ -170,11 +175,122 @@ function isParkRowInputSizeMarker(v) {
     const o = v;
     return o.truncated === true && typeof o.bytes === 'number' && Number.isFinite(o.bytes) && o.bytes >= 0;
 }
+function durableHoldKey(row, callKey) {
+    const createdAt = typeof row.createdAt === 'number' && Number.isFinite(row.createdAt) ? row.createdAt : null;
+    return JSON.stringify([typeof row.sessionId === 'string' ? row.sessionId : null, typeof row.taskId === 'string' ? row.taskId : null, callKey, createdAt]);
+}
+function openDurableRead() {
+    const mark = ++approvalDecisionHolds.clock;
+    approvalDecisionHolds.openReads.add(mark);
+    return mark;
+}
+function closeDurableRead(mark) {
+    const h = approvalDecisionHolds;
+    h.openReads.delete(mark);
+    let oldest = Infinity;
+    for (const m of h.openReads)
+        if (m < oldest)
+            oldest = m;
+    for (const [key, s] of h.settled)
+        if (s.at <= oldest)
+            h.settled.delete(key);
+}
+function heldDurableDecision(holdKey, readMark) {
+    const live = approvalDecisionHolds.inFlight.get(holdKey);
+    if (live !== undefined)
+        return live.lane === 'durable' ? live : undefined;
+    const recent = approvalDecisionHolds.settled.get(holdKey);
+    return recent !== undefined && recent.at > readMark ? recent.hold : undefined;
+}
+function holdDurableDecision(holdKey, callerSignal, decide) {
+    const h = approvalDecisionHolds;
+    const interruption = new AbortController();
+    let settled = false;
+    const interrupt = () => {
+        if (!settled && !interruption.signal.aborted)
+            interruption.abort();
+    };
+    if (callerSignal?.aborted === true)
+        interrupt();
+    else
+        callerSignal?.addEventListener('abort', interrupt, { once: true });
+    let resolveOutcome = () => { };
+    let rejectOutcome = () => { };
+    const outcome = new Promise((resolve, reject) => {
+        resolveOutcome = resolve;
+        rejectOutcome = reject;
+    });
+    const hold = { lane: 'durable', outcome, presented: false, interrupt, cardSignal: interruption.signal };
+    h.inFlight.set(holdKey, hold);
+    const release = () => {
+        if (h.inFlight.get(holdKey) === hold)
+            h.inFlight.delete(holdKey);
+        if (h.openReads.size > 0)
+            h.settled.set(holdKey, { at: ++h.clock, hold });
+    };
+    const settle = (give) => {
+        settled = true;
+        callerSignal?.removeEventListener('abort', interrupt);
+        const trailing = hold.trailing;
+        if (trailing === undefined) {
+            release();
+            give();
+            return;
+        }
+        give();
+        trailing.then(release, release);
+    };
+    decide(hold).then((o) => settle(() => resolveOutcome(o)), (e) => settle(() => rejectOutcome(e)));
+    return outcome;
+}
+async function joinDurableDecision(hold, deps, signal) {
+    if (signal?.aborted === true)
+        hold.interrupt();
+    else
+        signal?.addEventListener('abort', hold.interrupt, { once: true });
+    let o;
+    try {
+        o = await hold.outcome;
+    }
+    finally {
+        signal?.removeEventListener('abort', hold.interrupt);
+    }
+    if (hold.presented) {
+        try {
+            deps.onPresented?.();
+        }
+        catch {
+        }
+    }
+    return { ...o, joinedInFlight: true };
+}
 export async function surfaceFsApprovalAndDecide(deps, taskId, argsByCall, signal, parkGatedCallId) {
     const decidedByReading = decidedByReadingSnapshotOf(deps);
-    const found = await findPendingForTask(deps.client, taskId, (toolName) => toolName !== undefined && (toolNameIsFsWrite(toolName) || toolNameIsShellExec(toolName)), signal ? { signal } : undefined, parkGatedCallId, (row) => askParkRowArm(row) === 'tool-gate');
+    const readMark = openDurableRead();
+    let found;
+    let held;
+    try {
+        found = await findPendingForTask(deps.client, taskId, (toolName) => toolName !== undefined && (toolNameIsFsWrite(toolName) || toolNameIsShellExec(toolName)), signal ? { signal } : undefined, parkGatedCallId, (row) => askParkRowArm(row) === 'tool-gate');
+        if (found.ok)
+            held = heldDurableDecision(durableHoldKey(found.pending, approvalCallKey(found.gatedCallId, taskId)), readMark);
+    }
+    finally {
+        closeDurableRead(readMark);
+    }
     if (!found.ok)
         return { kind: 'failed', stage: 'fetch', reason: found.reason, ...(found.code !== undefined ? { code: found.code } : {}) };
+    if (held !== undefined)
+        return joinDurableDecision(held, deps, signal);
+    const callKey = approvalCallKey(found.gatedCallId, taskId);
+    const fetched = found;
+    return holdDurableDecision(durableHoldKey(fetched.pending, callKey), signal, async (hold) => {
+        const slot = {};
+        const out = await presentFsApprovalAndDecide(deps, taskId, argsByCall, signal, fetched, decidedByReading, callKey, hold, slot);
+        noteCallOutcome(slot, out);
+        return out;
+    });
+}
+async function presentFsApprovalAndDecide(deps, taskId, argsByCall, signal, found, decidedByReading, callKey, hold, ledgerSlot) {
     const { pending, gatedCallId } = found;
     const toolName = typeof pending.toolName === 'string' ? pending.toolName : '';
     const streamArgs = gatedCallId !== undefined ? argsByCall.get(gatedCallId) : undefined;
@@ -191,18 +307,18 @@ export async function surfaceFsApprovalAndDecide(deps, taskId, argsByCall, signa
         return { kind: 'failed', stage: 'input', gatedCallId, reason: 'gate has no tool input payload' };
     }
     const bridge = new HitlBridge(deps.client, taskId, deps.onDecideOperation ? { onDecideOperation: deps.onDecideOperation } : undefined);
-    const callKey = approvalCallKey(gatedCallId, taskId);
     const ruleOffersReadOnly = readRuleOffers(pending.ruleOffers);
     const durableProbeCause = pending.riskDescriptor?.probeCause;
     const durableProbeReason = readProbeReason(pending.riskDescriptor);
     const durableShadow = readAllowRuleShadowFromWire(pending, 'row');
     const durableRuleOffersAbsence = pending.ruleOffersAbsence;
+    hold.presented = true;
     deps.onPresented?.();
-    const card = await surfaceApprovalCard({
+    const card = await surfaceCallTrackedCard(gatedCallId, undefined, ledgerSlot, {
         toolName,
         args,
         callKey,
-        ...(signal ? { signal } : {}),
+        signal: hold.cardSignal,
         ...(rowArgsGap !== undefined
             ? {
                 argsUnavailable: true,
@@ -245,7 +361,11 @@ export async function surfaceFsApprovalAndDecide(deps, taskId, argsByCall, signa
                 hostLog('debug', `liveHitlAskWire: approval card retracted without a decision for ${gatedCallId ?? '(no call)'} — nothing sent`);
                 return { kind: 'retracted', gatedCallId };
             case 'aborted':
-                observeCancelByDeny(bridge.decideTool({ decision: 'deny', reason: 'Interrupted by user' }, gatedCallId, undefined, pending), taskId);
+                {
+                    const cancelDeny = bridge.decideTool({ decision: 'deny', reason: INTERRUPT_DENY_REASON }, gatedCallId, undefined, pending);
+                    hold.trailing = cancelDeny;
+                    observeCancelByDeny(cancelDeny, taskId);
+                }
                 return { kind: 'aborted', gatedCallId };
             case 'allow':
                 try {
@@ -283,11 +403,13 @@ export async function surfaceFsApprovalAndDecide(deps, taskId, argsByCall, signa
                     const wireCode = readWireErrorCode(e);
                     const wireRetriable = typeof e === 'object' && e !== null && refusalSaysStillPending(e);
                     const safetyCode = e instanceof HitlSafetyError ? e.code : undefined;
+                    const failureTexts = wireFailureTextsOf(e);
+                    hostLog('debug', `liveToolApprovalWire: decide(approve) failed: ${failureTexts.log}`);
                     return {
                         kind: 'failed',
                         stage: 'decide',
                         gatedCallId,
-                        reason: `decide(approve) failed: ${String(e)}${decideFailureNote(e, 'approve')}`,
+                        reason: `decide(approve) failed: ${failureTexts.reason}${decideFailureNote(e, 'approve')}`,
                         ...(e instanceof DecideTransportRetryExhaustedError ? { retryExhausted: true } : {}),
                         ...(currentPending !== undefined ? { currentPending } : {}),
                         ...(wireCode !== undefined ? { errorCode: wireCode } : {}),
@@ -368,11 +490,13 @@ export async function surfaceFsApprovalAndDecide(deps, taskId, argsByCall, signa
                     const wireRetriable = typeof e === 'object' && e !== null && refusalSaysStillPending(e);
                     const safetyCode = e instanceof HitlSafetyError ? e.code : undefined;
                     const attributionRefusal = denyAttributionRefusalFromError(e, lastSendCarriedAttribution);
+                    const failureTexts = wireFailureTextsOf(e);
+                    hostLog('debug', `liveToolApprovalWire: decide(deny) failed: ${failureTexts.log}`);
                     return {
                         kind: 'failed',
                         stage: 'decide',
                         gatedCallId,
-                        reason: `decide(deny) failed: ${String(e)}${decideFailureNote(e, 'deny')}`,
+                        reason: `decide(deny) failed: ${failureTexts.reason}${decideFailureNote(e, 'deny')}`,
                         ...(e instanceof DecideTransportRetryExhaustedError ? { retryExhausted: true } : {}),
                         ...(currentPending !== undefined ? { currentPending } : {}),
                         ...(wireCode !== undefined ? { errorCode: wireCode } : {}),
@@ -546,6 +670,36 @@ export function readToolApprovalRespondAck(v) {
     }
     return out;
 }
+export function readToolApprovalRespondParking(v) {
+    if (typeof v !== 'object' || v === null)
+        return undefined;
+    const read = (fn) => {
+        try {
+            return fn();
+        }
+        catch {
+            return undefined;
+        }
+    };
+    if (read(() => readOwnDataNonEmptyString(v, 'reason')) !== 'parking_in_progress')
+        return undefined;
+    const approvalId = read(() => readOwnDataNonEmptyString(v, 'approvalId'));
+    if (approvalId === undefined)
+        return { kind: 'claimed_unreadable' };
+    const hint = read(() => readOwnDataValue(v, 'retryAfterMs'));
+    const retryAfterMs = typeof hint === 'number' && Number.isFinite(hint) && hint >= 0 ? hint : undefined;
+    const decidePath = read(() => readOwnDataNonEmptyString(v, 'decidePath'));
+    const message = read(() => readOwnDataNonEmptyString(v, 'message'));
+    return {
+        kind: 'parking',
+        view: {
+            approvalId,
+            ...(retryAfterMs !== undefined ? { retryAfterMs } : {}),
+            ...(decidePath !== undefined ? { decidePath } : {}),
+            ...(message !== undefined ? { message } : {}),
+        },
+    };
+}
 function isNonEmptyStringArray(v) {
     return Array.isArray(v) && v.length > 0 && v.every(x => typeof x === 'string' && x !== '');
 }
@@ -699,13 +853,27 @@ function readProbeReason(v) {
     try {
         if (typeof v !== 'object' || v === null || !Object.hasOwn(v, 'probeReason'))
             return undefined;
-        const raw = v.probeReason;
-        return typeof raw === 'string' && raw.trim() !== '' ? raw : undefined;
+        return usableProbeReason(v.probeReason);
     }
     catch {
         return undefined;
     }
 }
+function usableProbeReason(raw) {
+    return typeof raw === 'string' && raw.trim() !== '' ? raw : undefined;
+}
+const PROBE_CAUSE_CODE_WORD = /^[a-z][a-z0-9_]{0,31}(?:\.[a-z][a-z0-9_]{0,31}){1,3}$/;
+export function askProbeReasonDetail(card) {
+    const reason = usableProbeReason(ownDataValue(card, 'probeReason'));
+    if (reason !== undefined)
+        return displayUntrusted(reason);
+    const cause = ownDataValue(card, 'probeCause');
+    if (!isWireRecordCarrier(cause))
+        return undefined;
+    const code = ownDataValue(cause, 'code');
+    const head = 'An automatic check could not clear this call, so it is asking you; the engine did not say the specific reason';
+    return typeof code === 'string' && PROBE_CAUSE_CODE_WORD.test(code) ? `${head} (check code: ${code}).` : `${head}.`;
+}
 function readRememberRefused(v) {
     try {
         return typeof v === 'object' && v !== null && Object.hasOwn(v, 'rememberRefused') && v.rememberRefused === true;
@@ -714,6 +882,167 @@ function readRememberRefused(v) {
         return false;
     }
 }
+function ownDataValue(v, key) {
+    if (typeof v !== 'object' || v === null)
+        return undefined;
+    try {
+        const d = Object.getOwnPropertyDescriptor(v, key);
+        return d !== undefined && 'value' in d ? d.value : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function ownStringList(v) {
+    if (!Array.isArray(v))
+        return undefined;
+    try {
+        const length = v.length;
+        if (typeof length !== 'number' || !Number.isSafeInteger(length) || length < 0)
+            return undefined;
+        const out = [];
+        for (let i = 0; i < length; i++) {
+            const d = Object.getOwnPropertyDescriptor(v, i);
+            if (d === undefined || !('value' in d) || typeof d.value !== 'string' || d.value === '')
+                return undefined;
+            out.push(d.value);
+        }
+        return v.length === length ? Object.freeze(out) : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+export function readApprovalBoundGrants(v) {
+    const g = ownDataValue(v, 'boundGrants');
+    if (typeof g !== 'object' || g === null || Array.isArray(g))
+        return undefined;
+    const skill = ownDataValue(g, 'skill');
+    if (!(skill === null || (typeof skill === 'string' && skill !== '')))
+        return undefined;
+    const allowedTools = ownStringList(ownDataValue(g, 'allowedTools'));
+    const disallowedTools = ownStringList(ownDataValue(g, 'disallowedTools'));
+    if (allowedTools === undefined || disallowedTools === undefined)
+        return undefined;
+    return Object.freeze({ skill, allowedTools, disallowedTools });
+}
+const CAUSE_WORD = /^[a-z][a-z0-9_]{0,63}$/;
+export function readApprovalClassifierNoRuling(v) {
+    const w = ownDataValue(v, 'classifierNoRuling');
+    return typeof w === 'string' && CAUSE_WORD.test(w) ? w : undefined;
+}
+const CLASSIFIER_NO_RULING_REASONS = Object.freeze({
+    error: 'could not run for this call (it failed)',
+    timeout: 'could not run for this call (it timed out)',
+    parse_error: 'answered for this call but gave no verdict it could use',
+});
+const _noRulingPin = [true, true];
+void _noRulingPin;
+export function classifierNoRulingDetail(word) {
+    if (typeof word === 'string' && Object.hasOwn(CLASSIFIER_NO_RULING_REASONS, word)) {
+        return `The auto-mode classifier ${CLASSIFIER_NO_RULING_REASONS[word]}, so it is asking you instead.`;
+    }
+    if (typeof word === 'string' && CAUSE_WORD.test(word))
+        return `The auto-mode classifier did not rule on this call (reason: ${word}), so it is asking you instead.`;
+    return 'The auto-mode classifier did not rule on this call, so it is asking you instead.';
+}
+const entries = (n) => (n === 1 ? '1 tool entry' : `${String(n)} tool entries`);
+export function approvalBoundGrantsDetail(grants) {
+    const g = readApprovalBoundGrants({ boundGrants: grants });
+    if (g === undefined)
+        return undefined;
+    if (g.skill === null)
+        return 'This call names no loaded skill, so approving it grants nothing beyond this call.';
+    const a = g.allowedTools.length;
+    const d = g.disallowedTools.length;
+    if (a === 0 && d === 0)
+        return 'Approving this activates the skill shown on the card; it lists no tools to run without asking and none to refuse.';
+    const allow = `${entries(a)} it lists ${a === 1 ? 'runs' : 'run'} without asking once it is active`;
+    const deny = `${entries(d)} ${d === 1 ? 'is' : 'are'} refused for the rest of this run`;
+    return `Approving this activates the skill shown on the card: ${allow}, and ${deny}.`;
+}
+const CALL_LEDGER_MAX_CALLS = 256;
+const CALL_LEDGER_MAX_ASKS_PER_CALL = 8;
+const callCardLedger = new Map();
+function askSignatureOf(req) {
+    return JSON.stringify([req.classes !== undefined ? [...req.classes] : null, req.origin ?? null, req.mandate ?? null]);
+}
+function priorCardView(a) {
+    return Object.freeze({
+        ...(a.approvalId !== undefined ? { approvalId: a.approvalId } : {}),
+        ...(a.origin !== undefined ? { origin: a.origin } : {}),
+        ...(a.mandate !== undefined ? { mandate: a.mandate } : {}),
+        ...(a.outcome !== undefined ? { outcome: a.outcome } : {}),
+    });
+}
+function noteCardOnCall(callId, approvalId, req) {
+    const sig = askSignatureOf(req);
+    let asks = callCardLedger.get(callId);
+    if (asks === undefined) {
+        asks = [];
+        callCardLedger.set(callId, asks);
+        while (callCardLedger.size > CALL_LEDGER_MAX_CALLS) {
+            const oldest = callCardLedger.keys().next().value;
+            if (oldest === undefined)
+                break;
+            callCardLedger.delete(oldest);
+        }
+    }
+    let at = asks.findIndex((a) => a.sig === sig);
+    if (at < 0) {
+        asks.push({ sig, ...(approvalId !== undefined ? { approvalId } : {}), ...(req.origin !== undefined ? { origin: req.origin } : {}), ...(req.mandate !== undefined ? { mandate: req.mandate } : {}) });
+        while (asks.length > CALL_LEDGER_MAX_ASKS_PER_CALL)
+            asks.shift();
+        at = asks.length - 1;
+    }
+    else if (asks[at].approvalId === undefined && approvalId !== undefined) {
+        asks[at].approvalId = approvalId;
+    }
+    const entry = asks[at];
+    const prior = asks.slice(0, at);
+    return { entry, ...(prior.length > 0 ? { prior: Object.freeze(prior.map(priorCardView)) } : {}) };
+}
+async function surfaceCallTrackedCard(callId, approvalId, slot, req) {
+    if (callId === undefined || callId === '')
+        return surfaceApprovalCard(req);
+    const { entry, prior } = noteCardOnCall(callId, approvalId, req);
+    slot.entry = entry;
+    return surfaceApprovalCard(prior !== undefined ? { ...req, priorCardsForCall: prior } : req);
+}
+function noteCallOutcome(slot, outcome) {
+    const entry = slot.entry;
+    if (entry === undefined)
+        return;
+    const r = approvalResolutionOf(outcome);
+    if (r.kind === 'decided')
+        entry.outcome = r.decision === 'deny' ? 'denied' : 'allowed';
+}
+export function approvalPriorCardsDetail(card) {
+    const prior = ownDataValue(card, 'priorCardsForCall');
+    let isList = false;
+    try {
+        isList = Array.isArray(prior);
+    }
+    catch {
+        return undefined;
+    }
+    if (!isList)
+        return undefined;
+    const length = ownDataValue(prior, 'length');
+    if (typeof length !== 'number' || !Number.isSafeInteger(length) || length <= 0 || length > CALL_LEDGER_MAX_ASKS_PER_CALL)
+        return undefined;
+    const items = [];
+    for (let i = 0; i < length; i++)
+        items.push(ownDataValue(prior, String(i)));
+    const outcome = ownDataValue(items[length - 1], 'outcome');
+    const earlier = outcome === 'allowed' ? 'you already approved an earlier one' : outcome === 'denied' ? 'an earlier one was denied' : 'an earlier one was shown first';
+    const fromRule = items.some((p) => ownDataValue(p, 'origin') === 'ask_rule');
+    const thisFromRule = ownDataValue(card, 'origin') === 'ask_rule';
+    if (fromRule && !thisFromRule) {
+        return `This is a second approval for the same call: ${earlier}, which your ask rule asked for. This one is a separate check, not from your ask rule, and needs its own answer.`;
+    }
+    return `This is a second approval for the same call: ${earlier}. This one is a separate check and needs its own answer.`;
+}
 function isNonNegativeFinite(v) {
     return typeof v === 'number' && Number.isFinite(v) && v >= 0;
 }
@@ -881,6 +1210,18 @@ function subagentBadgeFor(frame) {
 const MAX_RESPOND_NOTE_CHARS = 2048;
 export async function surfaceToolApprovalFrameAndRespond(frame, respond, streamArgs, signal, lane) {
     const approvalId = frame.approvalId;
+    const key = liveFrameCallKey(approvalId);
+    const held = liveCardHoldOf(key);
+    if (held !== undefined)
+        return joinLiveCard(held, signal);
+    return holdLiveCard(key, signal, async (hold) => {
+        const slot = {};
+        const out = await presentToolApprovalFrameAndRespond(frame, approvalId, respond, streamArgs, signal, lane, hold, slot);
+        noteCallOutcome(slot, out);
+        return out;
+    });
+}
+async function presentToolApprovalFrameAndRespond(frame, approvalId, respond, streamArgs, signal, lane, hold, ledgerSlot) {
     const frameToolCallId = typeof frame.toolCallId === 'string' && frame.toolCallId !== '' ? frame.toolCallId : undefined;
     const decidedByReading = decidedByReadingSnapshotOf(lane);
     const toolName = typeof frame.toolName === 'string' ? frame.toolName : 'Write';
@@ -910,14 +1251,14 @@ export async function surfaceToolApprovalFrameAndRespond(frame, respond, streamA
     const ruleOffers = readRuleOffers(frame.ruleOffers);
     const denialLimitFallback = readDenialLimitFallback(frame.denialLimitFallback);
     const frameShadow = readAllowRuleShadowFromWire(frame, 'frame');
-    const card = await surfaceApprovalCard({
+    const card = await surfaceCallTrackedCard(frameToolCallId, approvalId, ledgerSlot, {
         toolName,
         args: args,
         callKey: liveFrameCallKey(approvalId),
         ...(frameToolCallId !== undefined
             ? { toolCallId: frameToolCallId }
             : {}),
-        ...(signal ? { signal } : {}),
+        signal: hold.cardSignal,
         ...(isFromSubagent(frame) ? { workerBadge: subagentBadgeFor(frame) } : {}),
         ...(wireNote !== undefined ? { wireNote } : {}),
         ...(argsNotRealInput ? { argsUnavailable: true } : {}),
@@ -953,7 +1294,16 @@ export async function surfaceToolApprovalFrameAndRespond(frame, respond, streamA
         ...(denialLimitFallback !== undefined ? { denialLimitFallback } : {}),
         ...((o) => (o !== undefined ? { origin: o } : {}))(readOwnNonEmptyString(frame, 'origin')),
         ...(readAskClassPair(frame) ?? {}),
+        ...((g) => (g !== undefined ? { boundGrants: g } : {}))(readApprovalBoundGrants(frame)),
+        ...((w) => (w !== undefined ? { classifierNoRuling: w } : {}))(readApprovalClassifierNoRuling(frame)),
     });
+    if (hold.superseded !== undefined) {
+        hostLog('debug', `liveToolApprovalWire: ${approvalId} was settled by the engine while its card was up${hold.superseded.parked ? ' (parked)' : ''} — card withdrawn; ` +
+            `the card came back ${card.kind}; nothing sent`);
+        if (hold.superseded.parked && (card.kind === 'allow' || card.kind === 'deny'))
+            surfaceApprovalParking();
+        return { decision: 'unresolved', retracted: true };
+    }
     if (argsNotRealInput && card.kind === 'allow' && card.updatedInput !== undefined) {
         hostLog('error', `liveToolApprovalWire: ${approvalId} card returned an edited approval on a card whose arguments are not the tool's real input (${lane?.argsUnavailable === true ? 'args-unavailable ask' : 'arguments omitted or absent on the frame'}) — nothing sent (the ask stays pending)`);
         surfaceEditRefusedOnBlindAsk();
@@ -963,6 +1313,22 @@ export async function surfaceToolApprovalFrameAndRespond(frame, respond, streamA
         hostLog('debug', `liveToolApprovalWire: ${approvalId} card retracted without a decision${card.reason ? ` (${card.reason})` : ''} — nothing sent`);
         return { decision: 'unresolved', retracted: true };
     }
+    if (card.kind === 'aborted') {
+        hold.phase = 'respond';
+        const interruptOpts = lane?.approvalDecisionNoteCapable === true ? { note: INTERRUPT_DENY_REASON } : {};
+        let interruptDeny;
+        try {
+            interruptDeny = Promise.resolve(respond(approvalId, 'deny', interruptOpts));
+        }
+        catch (e) {
+            interruptDeny = Promise.reject(e);
+        }
+        hold.trailing = interruptDeny.then(() => undefined, () => undefined);
+        observeCancelByDeny(interruptDeny, approvalId);
+        hostLog('debug', `liveToolApprovalWire: ${approvalId} card aborted — one tool-level deny issued to settle the pending ask`);
+        return { decision: 'unresolved', aborted: true };
+    }
+    hold.phase = 'respond';
     const decision = card.kind === 'allow' ? (card.allowSession ? 'allow_session' : 'allow') : 'deny';
     const denySettledByForWire = card.kind === 'deny' ? readApprovalDenySettledBy(card) : undefined;
     const attributionKeys = decision === 'deny' ? decisionAttributionKeyOf(decidedByReading, denySettledByForWire) : {};
@@ -1101,6 +1467,19 @@ export async function surfaceToolApprovalFrameAndRespond(frame, respond, streamA
                 throw first;
             }
         }
+        const parkingBody = readToolApprovalRespondParking(raw);
+        if (parkingBody !== undefined) {
+            const parking = parkingBody.kind === 'parking' && parkingBody.view.approvalId === approvalId ? parkingBody.view : undefined;
+            if (parking !== undefined) {
+                hostLog('debug', `liveToolApprovalWire: respond(${decision}) for ${approvalId} answered 202 parking_in_progress${parking.retryAfterMs !== undefined ? ` (retryAfterMs=${parking.retryAfterMs})` : ''} — ` +
+                    `the answer did NOT take effect${parking.decidePath !== undefined ? ' (the engine pointed at a decide path for the parked card)' : ''}; not re-sent, not reported as decided; the user is told to answer again on the parked card`);
+                surfaceApprovalParking(parking.retryAfterMs);
+                return { decision: 'unresolved', parking };
+            }
+            hostLog('error', `liveToolApprovalWire: 202 parking body for ${approvalId} is ${parkingBody.kind === 'parking' ? `for another approval (${parkingBody.view.approvalId})` : 'unreadable (approvalId is not usable)'} — ` +
+                'reporting the answer as NOT settled (never as decided, never as parked); not re-sent');
+            return { decision: 'unresolved' };
+        }
         const parsed = readToolApprovalRespondAck(raw);
         let ack = parsed;
         if (parsed !== undefined && (parsed.approvalId !== approvalId || parsed.decision !== decision)) {

package/dist/humanTurnRead.d.ts

@@ -1,5 +1,5 @@
 import type { ImageInput } from './imagesWireCaps.js';
-import type { UserAttachmentDescriptor, UserAttachmentNotIncludedReason, UserAttachmentSource } from './userAttachmentEnvelope.js';
+import type { UserAttachmentDescriptor, UserAttachmentMcpResourcePart, UserAttachmentNotIncludedReason, UserAttachmentSource } from './userAttachmentEnvelope.js';
 import type { HumanTurnAttachment, HumanTurnEncoding, HumanTurnInput, HumanTurnMissing } from './humanTurn.js';
 import type { ImageVision } from './liveModelCatalog.js';
 export interface CellView {
@@ -55,6 +55,20 @@ export type DescriptorView = {
     path: string;
     sizeBytes: number | null;
     reason: UserAttachmentNotIncludedReason;
+} | {
+    kind: 'not-included';
+    target: 'mcp-resource';
+    server: string;
+    uri: string;
+    name: string;
+    reason: UserAttachmentNotIncludedReason;
+} | {
+    kind: 'mcp-resource';
+    server: string;
+    uri: string;
+    name: string;
+    parts: UserAttachmentMcpResourcePart[];
+    truncated: boolean;
 };
 export declare function readDescriptor(x: UserAttachmentDescriptor | HumanTurnAttachment['descriptor'], imageDelivery: 'required' | 'ignored'): DescriptorView | undefined;
 type Reason = Exclude<Extract<HumanTurnEncoding, {

package/dist/humanTurnRead.js

@@ -40,6 +40,23 @@ const strArray = (v) => ownArray(v).map(str);
 const sizeOf = (v) => (v === null ? null : typeof v === 'number' ? v : bad());
 const posInt = (v) => (typeof v === 'number' && Number.isSafeInteger(v) && v >= 1 ? v : bad());
 const natInt = (v) => (typeof v === 'number' && Number.isSafeInteger(v) && v >= 0 ? v : bad());
+const NOT_INCLUDED_REASON_LIST = ['too-large', 'unreadable', 'read-denied', 'approval-required', 'server-not-connected', 'resource-not-listed', 'read-failed'];
+const notIncludedReasonsExhaustive = true;
+void notIncludedReasonsExhaustive;
+const NOT_INCLUDED_REASONS = new Set(NOT_INCLUDED_REASON_LIST);
+function readMcpPart(x) {
+    if (!isPlainObject(x))
+        bad();
+    const o = x;
+    const kind = ownData(o, 'kind');
+    if (kind === 'text')
+        return { kind, text: str(ownData(o, 'text')) };
+    if (kind === 'binary') {
+        const mt = ownData(o, 'mimeType');
+        return { kind, mimeType: mt === null ? null : str(mt) };
+    }
+    return bad();
+}
 function sourceOf(v) {
     return v === 'at-mention' || v === 'compact-restore' ? v : bad();
 }
@@ -120,9 +137,12 @@ function readDescriptorAny(x, imageDelivery) {
             case 'not-included': {
                 const target = ownData(o, 'target');
                 const reason = ownData(o, 'reason');
-                if (target !== 'file' && target !== 'directory' && target !== 'path')
+                if (!NOT_INCLUDED_REASONS.has(reason))
                     bad();
-                if (reason !== 'too-large' && reason !== 'unreadable' && reason !== 'read-denied')
+                if (target === 'mcp-resource') {
+                    return { kind, target, server: str(ownData(o, 'server')), uri: str(ownData(o, 'uri')), name: name(), reason: reason };
+                }
+                if (target !== 'file' && target !== 'directory' && target !== 'path')
                     bad();
                 return {
                     kind,
@@ -133,6 +153,12 @@ function readDescriptorAny(x, imageDelivery) {
                     reason: reason,
                 };
             }
+            case 'mcp-resource': {
+                const truncated = ownData(o, 'truncated');
+                if (typeof truncated !== 'boolean')
+                    bad();
+                return { kind, server: str(ownData(o, 'server')), uri: str(ownData(o, 'uri')), name: name(), parts: ownArray(ownData(o, 'parts')).map(readMcpPart), truncated: truncated };
+            }
             default:
                 return undefined;
         }