@sema-agent/client-core 0.95.0 → 0.97.0

package/dist/hitl/toolApprovalWire.js

@@ -1,31 +1,29 @@
-import { APPROVAL_CARD_PORT_KEY_MISMATCH_REASON, DEFAULT_DENY_REASON, DecideTransportRetryExhaustedError, HitlBridge, NO_APPROVAL_CARD_PORT_REASON, denyReasonForWire, findPendingForTask, hitlSafetyCodeOf, readDecideCurrentPending, readWireErrorCode, readWireErrorCodeReading, } from './hitlBridge.js';
+import { APPROVAL_CARD_PORT_KEY_MISMATCH_REASON, DEFAULT_DENY_REASON, DecideTransportRetryExhaustedError, HitlBridge, NO_APPROVAL_CARD_PORT_REASON, denyReasonForWire, findPendingForTask, hitlSafetyCodeOf, readDecideCurrentPending, readWireCodes, readWireErrorCodeReading, } from './hitlBridge.js';
 import { askParkRowArm } from './askParkRowRouting.js';
+import { parkGateArmOf } from './frameRouter.js';
+import { seatSessionRowOf } from './standingRows.js';
 import { hostLog } from '../host.js';
-import { readAskOrigin, readOwnDataNonEmptyString, readOwnDataValue, readOwnNonEmptyString } from '../ownKey.js';
+import { guardedRead, readAskOrigin, readOwnDataNonEmptyString, readOwnDataValue, readOwnNonEmptyString } from '../ownKey.js';
 import { readAskClassPair } from './askClassPair.js';
 import { readAllowRuleShadowFromWire } from './allowRuleShadow.js';
 import { createSessionSlot, DEFAULT_SESSION_KEY } from '../sessionSlot.js';
 import { readEngineActiveBgTasks } from '../fleet/fleetLedger.js';
+import { CORE_SKILL_TOOL_NAME } from '../generated/toolNameTables.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, awaitLiveCardHolder, holdLiveCard, joinLiveCard, liveCardHoldFor, liveCardHoldOf } from './approvalHolds.js';
+import { approvalDecisionHolds, awaitLiveCardHolder, holdLiveCard, joinLiveCard, liveCardHoldFor, liveCardHoldOf, clearSettledApprovals, settledApprovalOf, settledForDurableLane, settledLiveCardOutcome } 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 { thrownIsInstanceOf, wireFailureTextsOf } from '../wireFailureShape.js';
+import { readRefusalField, thrownIsInstanceOf, wireFailureTextsOf } from '../wireFailureShape.js';
+import { refusalCauseWordOf } from './approvalEndingCause.js';
+import { readDecisionRefusalAsk } from './decisionRefusal.js';
 import { DECIDE_WORKFLOW_REMEMBER_UNSUPPORTED, 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';
-export function isFsApprovalGate(gate) {
-    if (!gate)
-        return false;
-    if (gate.kind === 'tool_approval')
-        return true;
-    return typeof gate.toolName === 'string' && toolNameIsFsWrite(gate.toolName);
-}
+import { RULE_OFFER_MATCHES, RULE_OFFER_BATCH_MEMBER_KINDS, RULE_OFFER_UNCOVERED_REASONS, RULE_OFFERS_ABSENCE_REASONS, ASK_ORIGINS, TOOL_APPROVAL_CARD_WORDS, } from '@sema-agent/sdk';
 export function toolNameIsFsWrite(name) {
     const n = name.replace(/[\s_-]+/g, '').toLowerCase();
     return (n === 'write' || n === 'filewrite' || n === 'edit' || n === 'fileedit' || n === 'multiedit' || n === 'notebookedit');
@@ -34,9 +32,13 @@ export function toolNameIsShellExec(name) {
     return name.replace(/[\s_-]+/g, '').toLowerCase() === 'bash';
 }
 export function isToolApprovalGate(gate) {
-    if (isFsApprovalGate(gate))
-        return true;
-    return typeof gate?.toolName === 'string' && toolNameIsShellExec(gate.toolName);
+    return parkGateArmOf(gate) === 'fs';
+}
+function fallbackRowMatcherFor(parkToolName) {
+    const family = (toolName) => toolName !== undefined && (toolNameIsFsWrite(toolName) || toolNameIsShellExec(toolName));
+    if (parkToolName === undefined || parkToolName === '' || family(parkToolName))
+        return family;
+    return (toolName) => toolName === parkToolName;
 }
 export function structurallyEqual(a, b) {
     if (a === b)
@@ -61,7 +63,6 @@ export function structurallyEqual(a, b) {
 export { RULE_OFFER_MATCHES, RULE_OFFER_BATCH_MEMBER_KINDS, RULE_OFFER_UNCOVERED_REASONS };
 export { RULE_OFFERS_ABSENCE_REASONS };
 export const ASK_ORIGIN_WORDS = ASK_ORIGINS;
-export const APPROVAL_MANDATE_WORDS = PERSISTED_RULE_MANDATES;
 export const APPROVAL_DENY_SETTLED_BY_WORDS = Object.freeze(['human', 'policy']);
 export function readApprovalDenySettledBy(decision) {
     if (decision === null || typeof decision !== 'object')
@@ -111,6 +112,9 @@ export function hasApprovalCardPortFor(sessionKey) {
 export function approvalCardPortFor(sessionKey) {
     return cardPortByKey.get(sessionKey) ?? null;
 }
+export function __resetSettledApprovalsForTests() {
+    clearSettledApprovals();
+}
 export function _resetApprovalCardPortForTest() {
     cardPortByKey.clear();
     cardPortMissesByKey.clear();
@@ -166,6 +170,14 @@ const ARGS_OMITTED_PATH_RECOVERED_NOTE = 'tool arguments exceeded the wire cap a
 const ARGS_OMITTED_NOTHING_RECOVERED_NOTE = 'tool arguments exceeded the wire cap and were omitted, and nothing could be recovered from the approval question — ' +
     'you are deciding without seeing what this call will do; deny it if you are not sure. ' +
     'Edits are not accepted on this card: there is no original input to edit';
+function argsFallbackOf(message, argsOmitted) {
+    const p = pathFromGateMessage(typeof message === 'string' ? message : undefined);
+    return {
+        args: p !== undefined ? { file_path: p } : {},
+        pathRecovered: p !== undefined,
+        ...(argsOmitted === true ? { omittedNote: p !== undefined ? ARGS_OMITTED_PATH_RECOVERED_NOTE : ARGS_OMITTED_NOTHING_RECOVERED_NOTE } : {}),
+    };
+}
 const PARK_ROW_ARGS_ABSENT_NOTE = "this request's tool arguments are not available on this surface — neither the event stream nor the pending approval record " +
     'carries them, so you are deciding without seeing them; deny it if you are not sure what it will do. ' +
     'Edits are not accepted on this card: there is no original input to edit';
@@ -273,13 +285,13 @@ async function joinDurableDecision(hold, deps, signal) {
     }
     return { ...o, joinedInFlight: true };
 }
-export async function surfaceFsApprovalAndDecide(deps, taskId, argsByCall, signal, parkGatedCallId) {
+export async function surfaceFsApprovalAndDecide(deps, taskId, argsByCall, signal, parkGatedCallId, parkToolName) {
     const decidedByReading = decidedByReadingSnapshotOf(deps);
     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');
+        found = await findPendingForTask(deps.client, taskId, fallbackRowMatcherFor(parkToolName), signal ? { signal } : undefined, parkGatedCallId, (row) => askParkRowArm(row) === 'tool-gate');
         if (found.ok)
             held = heldDurableDecision(durableHoldKey(found.pending, approvalCallKey(found.gatedCallId, taskId)), readMark);
     }
@@ -295,7 +307,7 @@ export async function surfaceFsApprovalAndDecide(deps, taskId, argsByCall, signa
         const joined = await awaitLiveCardHolder(liveHolder, signal);
         if (joined !== undefined)
             return fsOutcomeOfJoinedLiveCard(joined, found.gatedCallId);
-        return surfaceFsApprovalAndDecide(deps, taskId, argsByCall, signal, parkGatedCallId);
+        return surfaceFsApprovalAndDecide(deps, taskId, argsByCall, signal, parkGatedCallId, parkToolName);
     }
     const callKey = approvalCallKey(found.gatedCallId, taskId);
     const fetched = found;
@@ -357,7 +369,7 @@ async function presentFsApprovalAndDecide(deps, taskId, argsByCall, signal, foun
     const durableRuleOffersAbsence = pending.ruleOffersAbsence;
     hold.presented = true;
     deps.onPresented?.();
-    const card = await surfaceCallTrackedCard(gatedCallId, undefined, ledgerSlot, {
+    const card = await surfaceCallTrackedCard(gatedCallId, undefined, ledgerSlot, withUnreadableEvidence(pending, 'row', {
         toolName,
         args,
         callKey,
@@ -373,6 +385,7 @@ async function presentFsApprovalAndDecide(deps, taskId, argsByCall, signal, foun
         ...(hasOwnStrictTrue(pending, 'mandated') ? { mandated: true } : {}),
         ...((w) => (w !== undefined ? { mandate: w } : {}))(readApprovalMandate(pending)),
         ...((o) => (o !== undefined ? { origin: o } : {}))(readAskOrigin(pending)),
+        ...((w) => (w !== undefined ? { approvalCard: w } : {}))(readApprovalCardWord(pending)),
         ...(readAskClassPair(pending) ?? {}),
         ...(pending.gateKind === 'irreversible_ask' ? { irreversibleParkGate: true } : {}),
         ...(pending.hasBidiControls === true ? { hasBidiControls: true } : {}),
@@ -387,7 +400,9 @@ async function presentFsApprovalAndDecide(deps, taskId, argsByCall, signal, foun
         ...(typeof pending.toolCallId === 'string' && pending.toolCallId !== ''
             ? { toolCallId: pending.toolCallId }
             : {}),
-    });
+        allowSessionCarried: true,
+        grantBinding: readApprovalGrantBinding(pending),
+    }));
     if (rowArgsGap !== undefined && card.kind === 'allow' && card.updatedInput !== undefined) {
         hostLog('error', `liveToolApprovalWire: approval card for ${gatedCallId ?? `task ${taskId}`} returned an edited approval, but the tool input is ${rowArgsGap === 'truncated' ? 'a size marker on the pending row' : 'missing from both the stream and the pending row'} — nothing sent (the park stays pending)`);
         surfaceEditRefusedOnBlindAsk();
@@ -441,7 +456,7 @@ async function presentFsApprovalAndDecide(deps, taskId, argsByCall, signal, foun
                 }
                 catch (e) {
                     const currentPending = readDecideCurrentPending(e);
-                    const wireCode = readWireErrorCode(e);
+                    const wireCodes = readWireCodes(e);
                     const wireRetriable = typeof e === 'object' && e !== null && refusalSaysStillPending(e);
                     const safetyCode = hitlSafetyCodeOf(e);
                     const failureTexts = wireFailureTextsOf(e);
@@ -453,7 +468,7 @@ async function presentFsApprovalAndDecide(deps, taskId, argsByCall, signal, foun
                         reason: `decide(approve) failed: ${failureTexts.reason}${decideFailureNote(e, 'approve')}`,
                         ...(thrownIsInstanceOf(e, DecideTransportRetryExhaustedError) ? { retryExhausted: true } : {}),
                         ...(currentPending !== undefined ? { currentPending } : {}),
-                        ...(wireCode !== undefined ? { errorCode: wireCode } : {}),
+                        ...wireCodes,
                         ...(wireRetriable ? { retriable: true } : {}),
                         ...(safetyCode !== undefined ? { safetyCode } : {}),
                     };
@@ -527,7 +542,7 @@ async function presentFsApprovalAndDecide(deps, taskId, argsByCall, signal, foun
                 }
                 catch (e) {
                     const currentPending = readDecideCurrentPending(e);
-                    const wireCode = readWireErrorCode(e);
+                    const wireCodes = readWireCodes(e);
                     const wireRetriable = typeof e === 'object' && e !== null && refusalSaysStillPending(e);
                     const safetyCode = hitlSafetyCodeOf(e);
                     const attributionRefusal = denyAttributionRefusalFromError(e, lastSendCarriedAttribution);
@@ -540,7 +555,7 @@ async function presentFsApprovalAndDecide(deps, taskId, argsByCall, signal, foun
                         reason: `decide(deny) failed: ${failureTexts.reason}${decideFailureNote(e, 'deny')}`,
                         ...(thrownIsInstanceOf(e, DecideTransportRetryExhaustedError) ? { retryExhausted: true } : {}),
                         ...(currentPending !== undefined ? { currentPending } : {}),
-                        ...(wireCode !== undefined ? { errorCode: wireCode } : {}),
+                        ...wireCodes,
                         ...(wireRetriable ? { retriable: true } : {}),
                         ...(safetyCode !== undefined ? { safetyCode } : {}),
                         ...(attributionRefusal !== null ? { denyAttributionRefusal: attributionRefusal } : {}),
@@ -584,6 +599,7 @@ export const TOOL_APPROVAL_FRAME_KEYS_MIRROR = [
     'mandated',
     'mandate',
     'origin',
+    'approvalCard',
     'askClass',
     'classes',
     'inputHasBidi',
@@ -625,7 +641,21 @@ export function readApprovalMandate(v) {
     const raw = v.mandate;
     return isApprovalMandateWord(raw) ? raw : undefined;
 }
-export function toolPermissionRequestAskBits(card) {
+const APPROVAL_CARD_WORD_SET = new Set(TOOL_APPROVAL_CARD_WORDS);
+export function readApprovalCardWord(carrier) {
+    try {
+        if (typeof carrier !== 'object' || carrier === null)
+            return undefined;
+        const d = Object.getOwnPropertyDescriptor(carrier, 'approvalCard');
+        if (d === undefined || !('value' in d))
+            return undefined;
+        return APPROVAL_CARD_WORD_SET.has(d.value) ? d.value : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+export function toolPermissionRequestAskBits(card, requestId) {
     if (typeof card !== 'object' || card === null)
         return {};
     const mandated = hasOwnStrictTrue(card, 'mandated');
@@ -639,6 +669,7 @@ export function toolPermissionRequestAskBits(card) {
         ...(origin !== undefined ? { origin } : {}),
         ...(ruleOffersAbsence !== undefined ? { ruleOffersAbsence } : {}),
         ...(askClassPair ?? {}),
+        ...(seatSessionRowOf(card, requestId) ? { sessionRow: true } : {}),
     };
 }
 function hasOwnStrictTrue(v, key) {
@@ -830,17 +861,28 @@ export function readToolApprovalRespondRefusal(err) {
             return undefined;
         }
     };
-    const rawStatus = pick('status');
-    const rawCode = pick('errorCode');
+    const pickMachine = (key) => guardedRead(() => (typeof err === 'object' && err !== null ? readOwnDataValue(err, key) : undefined));
+    const rawStatus = pickMachine('status');
+    const rawCode = pickMachine('errorCode');
     const status = typeof rawStatus === 'number' && Number.isFinite(rawStatus) ? rawStatus : undefined;
     const errorCode = typeof rawCode === 'string' && rawCode.length > 0 ? rawCode : undefined;
     const message = refusalTextOf(err, pick('message'));
     if (status === undefined && errorCode === undefined && message === undefined)
         return undefined;
+    const machine = typeof err === 'object' && err !== null ? err : undefined;
+    const retriable = machine !== undefined && refusalSaysStillPending(machine);
+    const cause = machine !== undefined ? refusalCauseWordOf(machine) : undefined;
+    const field = machine !== undefined ? readRefusalField(machine) : undefined;
+    const unreadable = machine !== undefined && readDecisionRefusalAsk(machine).reading === 'unreadable';
     const rest = {
         ...(status !== undefined ? { status } : {}),
         ...(errorCode !== undefined ? { errorCode } : {}),
         ...(message !== undefined ? { message } : {}),
+        ...(retriable ? { retriable: true } : {}),
+        ...(cause !== undefined || field !== undefined
+            ? { extra: { ...(cause !== undefined ? { cause } : {}), ...(field !== undefined ? { field } : {}) } }
+            : {}),
+        ...(unreadable ? { unreadable: true } : {}),
     };
     if (status !== undefined)
         return { ...rest, status };
@@ -906,15 +948,26 @@ function usableProbeReason(raw) {
 }
 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))
+    const prose = usableProbeReason(ownDataValue(card, 'probeReason'));
+    const shown = prose === undefined ? '' : displayUntrusted(prose);
+    const sentence = probeCauseSentence(ownDataValue(card, 'probeCause'), shown !== '');
+    if (sentence === undefined)
+        return shown === '' ? undefined : shown;
+    return shown === '' ? sentence : `${sentence} ${shown}`;
+}
+function probeCauseSentence(cause, withProse) {
+    try {
+        if (!isWireRecordCarrier(cause))
+            return undefined;
+        const code = ownDataValue(cause, 'code');
+        const head = withProse
+            ? 'An automatic check could not clear this call, so it is asking you'
+            : '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}.`;
+    }
+    catch {
         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}.`;
+    }
 }
 export function readApprovalRememberRefused(v) {
     try {
@@ -968,6 +1021,76 @@ export function readApprovalBoundGrants(v) {
         return undefined;
     return Object.freeze({ skill, allowedTools, disallowedTools });
 }
+function readApprovalGrantBinding(carrier) {
+    if (typeof carrier !== 'object' || carrier === null)
+        return 'unreadable';
+    try {
+        if (Object.hasOwn(carrier, 'boundGrantDigest')) {
+            const digest = ownDataValue(carrier, 'boundGrantDigest');
+            return typeof digest === 'string' && digest.length > 0 ? 'bound' : 'unreadable';
+        }
+        const tool = ownDataValue(carrier, 'toolName');
+        if (typeof tool !== 'string' || tool.length === 0)
+            return 'unreadable';
+        return tool === CORE_SKILL_TOOL_NAME ? 'unreadable' : 'none';
+    }
+    catch {
+        return 'unreadable';
+    }
+}
+const UNREADABLE_EVIDENCE_KEYS = Object.freeze({
+    frame: Object.freeze([
+        ['rememberRefused', 'rememberRefused'], ['governanceForced', 'governanceForced'], ['requiresRealApproval', 'requiresRealApproval'],
+        ['mandated', 'mandated'], ['mandate', 'mandate'], ['origin', 'origin'], ['ruleOffersAbsence', 'ruleOffersAbsence'], ['ruleOffers', 'ruleOffers'],
+        ['allowRuleShadowed', 'allowRuleShadow'], ['persistedRuleShadowed', 'allowRuleShadow'], ['askClass', 'askClass'], ['classes', 'classes'],
+    ]),
+    row: Object.freeze([
+        ['rememberRefused', 'rememberRefused'], ['governanceForced', 'governanceForced'], ['requiresRealApproval', 'requiresRealApproval'],
+        ['mandated', 'mandated'], ['mandate', 'mandate'], ['origin', 'origin'], ['ruleOffersAbsence', 'ruleOffersAbsence'], ['ruleOffers', 'ruleOffersReadOnly'],
+        ['askClass', 'askClass'], ['classes', 'classes'],
+    ]),
+    v1: Object.freeze([
+        ['rememberRefused', 'rememberRefused'], ['governanceForced', 'governanceForced'], ['ruleOffersAbsence', 'ruleOffersAbsence'], ['ruleOffers', 'ruleOffersReadOnly'],
+        ['allowRuleShadowed', 'allowRuleShadow'], ['persistedRuleShadowed', 'allowRuleShadow'], ['askClass', 'askClass'], ['classes', 'classes'],
+    ]),
+});
+function carrierHas(carrier, key) {
+    if (typeof carrier !== 'object' || carrier === null)
+        return false;
+    try {
+        return key in carrier;
+    }
+    catch {
+        return true;
+    }
+}
+function v1RiskUnreadable(card) {
+    if (!carrierHas(card, 'risk'))
+        return false;
+    try {
+        const risk = card.risk;
+        return typeof risk !== 'object' || risk === null || typeof risk.requiresRealApproval !== 'boolean';
+    }
+    catch {
+        return true;
+    }
+}
+function withUnreadableEvidence(carrier, leg, req) {
+    const keys = new Set();
+    for (const [from, to] of UNREADABLE_EVIDENCE_KEYS[leg]) {
+        if (carrierHas(carrier, from) && !Object.hasOwn(req, to))
+            keys.add(from);
+    }
+    if (leg === 'row') {
+        const rd = ownDataValue(carrier, 'riskDescriptor');
+        for (const k of ['allowRuleShadowed', 'shadowedRule'])
+            if (carrierHas(rd, k) && !Object.hasOwn(req, 'allowRuleShadow'))
+                keys.add(`riskDescriptor.${k}`);
+    }
+    if (leg === 'v1' && v1RiskUnreadable(carrier))
+        keys.add('risk');
+    return keys.size === 0 ? req : { ...req, unreadableEvidence: Object.freeze([...keys].sort()) };
+}
 const CAUSE_WORD = /^[a-z][a-z0-9_]{0,63}$/;
 export function readApprovalClassifierNoRuling(v) {
     const w = ownDataValue(v, 'classifierNoRuling');
@@ -1249,12 +1372,122 @@ function subagentBadgeFor(frame) {
         name = `${name.slice(0, 31)}…`;
     return { name, color: 'cyan' };
 }
+function v1Bit(stamp) {
+    try {
+        stamp();
+    }
+    catch {
+    }
+}
+export function approvalCardFactsOfV1(card) {
+    if (typeof card !== 'object' || card === null)
+        return undefined;
+    const c = card;
+    const asFrame = card;
+    const fromSubagent = (() => {
+        try {
+            return isFromSubagent(asFrame);
+        }
+        catch {
+            return false;
+        }
+    })();
+    const argsPart = (() => {
+        try {
+            const raw = c.args !== undefined && c.args !== null ? c.args : undefined;
+            if (typeof raw === 'object' && raw !== null)
+                return { args: raw };
+            const fallback = argsFallbackOf(c.message, c.argsOmitted);
+            return { args: fallback.args, argsUnavailable: true, ...(fallback.omittedNote !== undefined ? { wireNote: fallback.omittedNote } : {}) };
+        }
+        catch {
+            return { args: {}, argsUnavailable: true };
+        }
+    })();
+    const out = { toolName: '', ...argsPart };
+    v1Bit(() => {
+        if (typeof c.toolName === 'string')
+            out.toolName = c.toolName;
+    });
+    v1Bit(() => {
+        if (typeof c.toolCallId === 'string' && c.toolCallId !== '')
+            out.toolCallId = c.toolCallId;
+    });
+    v1Bit(() => {
+        if (fromSubagent)
+            out.workerBadge = subagentBadgeFor(asFrame);
+    });
+    v1Bit(() => {
+        if (c.governanceForced === true)
+            out.governanceForced = true;
+    });
+    v1Bit(() => {
+        const d = c.delegation;
+        if (fromSubagent && isToolApprovalDelegation(d))
+            out.delegation = d;
+    });
+    v1Bit(() => {
+        const offers = readRuleOffers(c.ruleOffers);
+        if (offers !== undefined)
+            out.ruleOffersReadOnly = offers;
+    });
+    v1Bit(() => {
+        const shadow = readAllowRuleShadowFromWire(card, 'frame');
+        if (shadow !== undefined)
+            out.allowRuleShadow = shadow;
+    });
+    v1Bit(() => {
+        const pc = c.probeCause;
+        if (isWireRecordCarrier(pc))
+            out.probeCause = pc;
+    });
+    v1Bit(() => {
+        if (readApprovalRememberRefused(card))
+            out.rememberRefused = true;
+    });
+    v1Bit(() => {
+        const re = c.ruleEvidence;
+        if (isWireRecordCarrier(re))
+            out.ruleEvidence = re;
+    });
+    v1Bit(() => {
+        const risk = c.risk;
+        if (typeof risk === 'object' && risk !== null && risk.requiresRealApproval === true)
+            out.requiresRealApproval = true;
+    });
+    v1Bit(() => {
+        if (c.inputHasBidi === true)
+            out.inputHasBidi = true;
+    });
+    v1Bit(() => {
+        const w = c.ruleOffersAbsence;
+        if (typeof w === 'string' && w !== '')
+            out.ruleOffersAbsence = w;
+    });
+    v1Bit(() => {
+        const dlf = readDenialLimitFallback(c.denialLimitFallback);
+        if (dlf !== undefined)
+            out.denialLimitFallback = dlf;
+    });
+    v1Bit(() => {
+        const pair = readAskClassPair(card);
+        if (pair !== undefined) {
+            out.askClass = pair.askClass;
+            out.classes = pair.classes;
+        }
+    });
+    out.grantBinding = readApprovalGrantBinding(card);
+    return Object.freeze(withUnreadableEvidence(card, 'v1', out));
+}
 const MAX_RESPOND_NOTE_CHARS = 2048;
 export async function surfaceToolApprovalFrameAndRespond(frame, respond, streamArgs, signal, lane, run) {
     const approvalId = frame.approvalId;
     const held = liveCardHoldOf(liveFrameCallKey(approvalId));
     if (held !== undefined)
         return joinLiveCard(held, signal);
+    const settled = settledLiveCardOutcome(approvalId);
+    if (settled !== undefined)
+        return Promise.resolve(settled);
     return holdLiveCard(liveCardIdentityOf(approvalId, frame, run), signal, async (hold) => {
         const slot = {};
         const out = await presentToolApprovalFrameAndRespond(frame, approvalId, respond, streamArgs, signal, lane, hold, slot);
@@ -1293,9 +1526,12 @@ function readApprovalHolderIdentity(v) {
     return out;
 }
 export async function joinApprovalHolder(identity, signal) {
-    const hold = liveCardHoldFor(readApprovalHolderIdentity(identity));
-    if (hold === undefined)
-        return { kind: 'free' };
+    const who = readApprovalHolderIdentity(identity);
+    const hold = liveCardHoldFor(who);
+    if (hold === undefined) {
+        const entry = settledApprovalOf(who.approvalId);
+        return settledForDurableLane(entry) && entry !== undefined ? { kind: 'joined', outcome: { ...entry.outcome, joinedInFlight: true } } : { kind: 'free' };
+    }
     const joined = await awaitLiveCardHolder(hold, signal);
     return joined !== undefined ? { kind: 'joined', outcome: joined } : { kind: 'free' };
 }
@@ -1312,11 +1548,11 @@ async function presentToolApprovalFrameAndRespond(frame, approvalId, respond, st
     let argsFallback = false;
     if (typeof args !== 'object' || args === null) {
         argsFallback = true;
-        const p = pathFromGateMessage(frame.message);
-        args = p !== undefined ? { file_path: p } : {};
-        if (frame.argsOmitted === true) {
-            wireNote = p !== undefined ? ARGS_OMITTED_PATH_RECOVERED_NOTE : ARGS_OMITTED_NOTHING_RECOVERED_NOTE;
-            hostLog('debug', `liveToolApprovalWire: frame ${approvalId} args omitted (>16KiB wire cap) — card falls back to ${p !== undefined ? 'the message-derived path' : 'an empty input (no path could be derived from the message)'}`);
+        const fallback = argsFallbackOf(frame.message, frame.argsOmitted);
+        args = fallback.args;
+        if (fallback.omittedNote !== undefined) {
+            wireNote = fallback.omittedNote;
+            hostLog('debug', `liveToolApprovalWire: frame ${approvalId} args omitted (>16KiB wire cap) — card falls back to ${fallback.pathRecovered ? 'the message-derived path' : 'an empty input (no path could be derived from the message)'}`);
         }
         if (lane?.argsUnavailable === true) {
             wireNote =
@@ -1329,7 +1565,7 @@ async function presentToolApprovalFrameAndRespond(frame, approvalId, respond, st
     const ruleOffers = readRuleOffers(frame.ruleOffers);
     const denialLimitFallback = readDenialLimitFallback(frame.denialLimitFallback);
     const frameShadow = readAllowRuleShadowFromWire(frame, 'frame');
-    const card = await surfaceCallTrackedCard(frameToolCallId, approvalId, ledgerSlot, {
+    const card = await surfaceCallTrackedCard(frameToolCallId, approvalId, ledgerSlot, withUnreadableEvidence(frame, 'frame', {
         toolName,
         args: args,
         callKey: liveFrameCallKey(approvalId),
@@ -1370,10 +1606,13 @@ async function presentToolApprovalFrameAndRespond(frame, approvalId, respond, st
             : {}),
         ...(denialLimitFallback !== undefined ? { denialLimitFallback } : {}),
         ...((o) => (o !== undefined ? { origin: o } : {}))(readAskOrigin(frame)),
+        ...((w) => (w !== undefined ? { approvalCard: w } : {}))(readApprovalCardWord(frame)),
         ...(readAskClassPair(frame) ?? {}),
         ...((g) => (g !== undefined ? { boundGrants: g } : {}))(readApprovalBoundGrants(frame)),
         ...((w) => (w !== undefined ? { classifierNoRuling: w } : {}))(readApprovalClassifierNoRuling(frame)),
-    });
+        allowSessionCarried: true,
+        grantBinding: readApprovalGrantBinding(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`);
@@ -1400,7 +1639,7 @@ async function presentToolApprovalFrameAndRespond(frame, approvalId, respond, st
         catch (e) {
             interruptDeny = Promise.reject(e);
         }
-        hold.trailing = interruptDeny.then(() => undefined, () => undefined);
+        hold.trailing = interruptDeny.then((body) => readToolApprovalRespondParking(body) === undefined, () => false);
         observeCancelByDeny(interruptDeny, approvalId);
         hostLog('debug', `liveToolApprovalWire: ${approvalId} card aborted — one tool-level deny issued to settle the pending ask`);
         return { decision: 'unresolved', aborted: true };

package/dist/hookMatcherVerdict.d.ts

@@ -3,15 +3,7 @@ export type HookMatcherVerdict = {
     readonly kind: 'matchesAll';
 } | {
     readonly kind: 'accepted';
-    readonly reading: 'names';
-    readonly names: readonly string[];
-    readonly aliases: readonly {
-        readonly alias: string;
-        readonly canonical: string;
-    }[];
-} | {
-    readonly kind: 'accepted';
-    readonly reading: 'pattern';
+    readonly reading: 'names' | 'pattern';
     readonly aliases: readonly {
         readonly alias: string;
         readonly canonical: string;