@sema-agent/server 7.141.0 → 7.143.0

package/dist/tool-approval.js

@@ -1,5 +1,5 @@
 import { readApprovalCard } from "./approval-content-kind.js";
-import { heldAskOf, liveSettledBy, readDecidedBy, retiredDecisionKeyFacts, DECIDED_BY_OUTSIDE_CLOSED_SET, POLICY_CANNOT_ALLOW_PERSON_ASK } from "./host-decision.js";
+import { heldAskOf, liveHostSource, readDecider, retiredDecisionKeyFacts, POLICY_CANNOT_ALLOW_PERSON_ASK } from "./host-decision.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { uuidv7, classifyAsk, foldArbitrationRow, policyCannotAnswer, screenAskClassMembers, MAX_RULE_TEXT_CHARS, READ_ROOT_CANDIDATE_DIR_MAX, parseRuleText, pathConfinableWriteToolNames } from "@sema-agent/core";
 import { precheckCardRuleText } from "./rules-consent.js";
@@ -12,14 +12,14 @@ import { createLogger } from "./observability/logger.js";
 import { errorKindOf } from "./observability/err-text.js";
 import { recordFailOpen } from "./observability/fail-open.js";
 import { ownerOfCheckpointScope } from "./security.js";
-import { deriveAskId, deriveAskScopedBatchId, deriveBatchId, MAX_DECISION_NOTE_CHARS, noteLandedOnRow, noteRecordedReceipt } from "./approval-ask-machine.js";
-import { currentParkArm, MAX_RULE_OFFERS, buildApprovalCard, buildApprovalCardEnvelope, buildApprovalRequestFrame, buildReplayFrame, buildRevokeFrame, readDenialLimitFallback, readProbeCause, readProbeReason, readReadRootCandidate, readStoredCardEnvelope, readRuleEvidence, readAllowRuleShadowed, readRuleOffersAbsence, readRuleOffersAbsenceSeat, readParkRowTrueSeat, readAskClassPair, readClosedWordSeat, buildApprovalCompleteFrame, readRuleOfferList, } from "./approval-card.js";
+import { deriveAskId, deriveAskScopedBatchId, deriveBatchId, MAX_DECISION_NOTE_CHARS, noteLandedOnRow, noteRecordedReceipt, readBoundInputHash } from "./approval-ask-machine.js";
+import { currentParkArm, MAX_RULE_OFFERS, buildApprovalCard, buildApprovalCardEnvelope, adoptStoredLiveFacts, buildApprovalRequestFrame, buildReplayFrame, buildRevokeFrame, readDenialLimitFallback, readProbeCause, readProbeReason, readReadRootCandidate, readStoredCardEnvelope, readRuleEvidence, readAllowRuleShadowed, readRuleOffersAbsence, readRuleOffersAbsenceSeat, readParkRowTrueSeat, readAskClassPair, readAskReasons, readClosedWordSeat, buildApprovalCompleteFrame, readRuleOfferList, } from "./approval-card.js";
 import { askOwnerAdmits, askRowCarriesOwner, POLICY_REFUSAL_DECISION, projectAskTerminalClaimTruth } from "./plugins/approval-ask-store-sql.js";
-import { APPROVAL_ENDING_CAUSES, SETTLE_OUTCOME, causeOfAskRow } from "./approval-deny-reasons.js";
+import { APPROVAL_ENDING_CAUSES, SETTLE_OUTCOME, askRowEndingCause, askRowParkTrigger } from "./approval-deny-reasons.js";
 import { settleByPolicy } from "./approval-policy-settlement.js";
 import { governanceAskMarksFor, runWithGovernanceAskScope } from "./governance-ask-marks.js";
 import { governanceOriginOf } from "./runtime-governance.js";
-import { grantBindingOf } from "./standing-answer-grant.js";
+import { agreedGrantBinding, grantBindingOf } from "./standing-answer-grant.js";
 import { operatorAsk } from "./operator-ask.js";
 import { APPROVAL_EXEMPTED_EVENT } from "./plugins/approval-exemption-store.js";
 import { refusalBody } from "./http/refusal-body.js";
@@ -47,7 +47,7 @@ export function approvalDecidePath(sessionId) {
     return `/v1/approvals/${encodeURIComponent(sessionId)}/decide`;
 }
 function parkSessionOf(row) {
-    return row.sourceTaskId === row.sessionId && row.sessionId !== row.taskId ? row.sessionId : undefined;
+    return row.sourceSessionId === row.sessionId && row.sessionId !== row.taskId ? row.sessionId : undefined;
 }
 function ruleMaterialCarriesCredentialShape(command) {
     return redactSecretsWithArms(command, { observe: false }).arms.has("full");
@@ -223,10 +223,11 @@ function livePendingRowOf(e) {
         ...(e.sessionId !== undefined ? { sessionId: e.sessionId } : {}),
         ...(e.requiresRealApproval ? { requiresRealApproval: true } : {}),
         ...(e.governanceForced ? { governanceForced: true } : {}),
-        ...(e.mandated ? { mandated: true } : {}),
+        ...(listFrame.mandated === true ? { mandated: true } : {}),
         ...(standingAnswerHome(pendingEntryStandingAnswerFacts(e)) === "none" ? { rememberRefused: true } : {}),
-        ...(e.mandate !== undefined ? { mandate: e.mandate } : {}),
-        ...(e.origin !== undefined ? { origin: e.origin } : {}),
+        ...(listFrame.mandate !== undefined ? { mandate: listFrame.mandate } : {}),
+        ...(listFrame.origin !== undefined ? { origin: listFrame.origin } : {}),
+        ...(listFrame.type === "approval_request" && listFrame.liveFactsUnknown === true ? { liveFactsUnknown: true } : {}),
         ...(e.originTaskId !== undefined ? { fromSubagent: true, originTaskId: e.originTaskId } : {}),
         ...(approvalCard !== undefined ? { approvalCard } : {}),
         frame: listFrame,
@@ -294,17 +295,17 @@ function parseToolApprovalFields(body, retired) {
         }
         if (retired !== undefined)
             return { ok: false, error: retired.error };
-        const decidedByReading = readDecidedBy(body.decidedBy, false);
-        let decidedBy;
-        switch (decidedByReading.kind) {
+        const deciderReading = readDecider(body, false);
+        let decider;
+        switch (deciderReading.kind) {
             case "outside_closed_set":
-                return { ok: false, error: DECIDED_BY_OUTSIDE_CLOSED_SET };
+                return { ok: false, error: deciderReading.message };
             case "accepted":
-                decidedBy = decidedByReading.decidedBy;
+                decider = deciderReading.decider;
                 break;
             default: {
-                const unreachable = decidedByReading;
-                throw new Error(`unhandled decidedBy reading: ${JSON.stringify(unreachable)}`);
+                const unreachable = deciderReading;
+                throw new Error(`unhandled decider reading: ${JSON.stringify(unreachable)}`);
             }
         }
         const rawGrant = body.readRootGrant;
@@ -319,7 +320,7 @@ function parseToolApprovalFields(body, retired) {
             ...(d !== "deny" && u !== undefined ? { updatedInput: u } : {}),
             ...(persistRule !== undefined ? { persistRule } : {}),
             ...(note !== undefined ? { note } : {}),
-            decidedBy,
+            decider,
             ...(readRootGrant !== undefined ? { readRootGrant } : {}),
         };
     }
@@ -357,12 +358,6 @@ function boundArgs(args) {
     }
     return { args: redacted, omitted: false, hasBidi };
 }
-function readBoundInputHash(req) {
-    if (req === null || typeof req !== "object")
-        return null;
-    const v = Reflect.get(req, "boundInputHash");
-    return typeof v === "string" && v.length > 0 ? v : null;
-}
 export function resolveStreamApprovalGate(input) {
     if (!input.toolApprovalEnabled)
         return { active: false, reason: "no_tool_approval" };
@@ -492,7 +487,7 @@ function replayTerminalAskRow(row) {
 }
 export function outcomeOfDecidedRow(row) {
     const allow = row.decision === "approve";
-    const source = row.settledBy !== null ? { settledBy: row.settledBy } : {};
+    const source = row.settledBy !== null ? { settledBy: row.settledBy, ...(row.decidedVia !== null ? { decidedVia: row.decidedVia } : {}) } : {};
     const edit = allow && row.updatedInput !== undefined ? { updatedInput: row.updatedInput } : {};
     return row.settledBy === null && !("updatedInput" in edit) ? allow : { allow, ...edit, ...source };
 }
@@ -502,7 +497,7 @@ function settleArgsOfDecided(outcome) {
     return {
         allowed: outcome.allow,
         ...(outcome.updatedInput !== undefined ? { updatedInput: outcome.updatedInput } : {}),
-        ...(outcome.settledBy !== undefined ? { settledBy: outcome.settledBy } : {}),
+        ...(outcome.settledBy !== undefined ? { source: { settledBy: outcome.settledBy, ...(outcome.decidedVia !== undefined ? { decidedVia: outcome.decidedVia } : {}) } } : {}),
     };
 }
 function verdictOfDecided(args) {
@@ -510,7 +505,7 @@ function verdictOfDecided(args) {
         by: "human",
         allowed: args.allowed,
         ...(args.updatedInput !== undefined ? { updatedInput: args.updatedInput } : {}),
-        ...(args.settledBy !== undefined ? { hostSettledBy: args.settledBy } : {}),
+        ...(args.source !== undefined ? { hostSource: args.source } : {}),
     };
 }
 function settleArgsOf(outcome) {
@@ -633,8 +628,8 @@ export class ToolApprovalCoordinator {
     get unattendedRoutesToPark() {
         return this.unattendedPolicy !== "deny";
     }
-    batchIdFor(askId, sourceTaskId, runId, legKey) {
-        return this.unattendedRoutesToPark ? deriveBatchId(sourceTaskId, runId, legKey) : deriveAskScopedBatchId(askId);
+    batchIdFor(askId, sourceSessionId, runId, legKey) {
+        return this.unattendedRoutesToPark ? deriveBatchId(sourceSessionId, runId, legKey) : deriveAskScopedBatchId(askId);
     }
     unattendedAskOutcome(site) {
         const facts = {
@@ -898,7 +893,7 @@ export class ToolApprovalCoordinator {
             await new Promise((r) => setTimeout(r, SHUTDOWN_DRAIN_POLL_MS));
         }
         await this.parkCommits?.quiesce(deadlineMs);
-        this.askAudit?.noteLegsInterruptedByShutdown();
+        this.askAudit?.noteInterruptedByShutdown();
         return { uncommittedParks: [...this.parksAwaitingCommit].map((p) => ({ approvalId: p.approvalId, taskId: p.taskId })) };
     }
     noteParkCommitted(calls) {
@@ -1024,7 +1019,7 @@ export class ToolApprovalCoordinator {
     async sessionGrantUncontestedByRow(origin, req) {
         if (!this.askStore)
             return true;
-        const call = { taskId: origin.taskId, legKey: origin.legKey, toolCallId: req.toolCallId, sourceTaskId: req.sourceTaskId ?? origin.taskId };
+        const call = { taskId: origin.taskId, legKey: origin.legKey, toolCallId: req.toolCallId, sourceSessionId: req.sourceSessionId ?? origin.taskId };
         try {
             const rows = await this.withStoreDeadline(this.askStore.listByCall(call), "listByCall(session-grant-provenance)", DURABLE_CONVERGE_READ_TIMEOUT_MS);
             return rows.length === 0;
@@ -1057,12 +1052,11 @@ export class ToolApprovalCoordinator {
     classifyClaimLoss(askId, current, _where) {
         if (current.state === "absent")
             return { kind: "absent" };
-        const rowCause = current.cause;
-        if (rowCause?.kind === "ending")
-            return { kind: "ended", cause: rowCause.cause };
+        if (current.endingCause !== undefined)
+            return { kind: "ended", cause: current.endingCause };
         const replayedOutcome = replayTerminalAskRow(current);
         if (replayedOutcome === "unavailable") {
-            return rowCause?.kind === "park_trigger" ? { kind: "parked", cause: rowCause.cause } : { kind: "parked" };
+            return current.parkTrigger !== undefined ? { kind: "parked", cause: current.parkTrigger } : { kind: "parked" };
         }
         const replayed = settleArgsOfDecided(replayedOutcome);
         if (!replayed.allowed)
@@ -1331,6 +1325,7 @@ export class ToolApprovalCoordinator {
         const cardWord = readApprovalCard(req.approvalCard);
         const originWord = typeof req.origin === "string" && req.origin.length > 0 ? req.origin : undefined;
         const askClassPair = readAskClassPair(req);
+        const askReasonsOfReq = readAskReasons(req);
         const requester = extensionRequesterOf(req.requestedBy, "tool_approval");
         const frame = {
             type: "tool_approval",
@@ -1339,7 +1334,7 @@ export class ToolApprovalCoordinator {
             ...(typeof req.toolCallId === "string" && req.toolCallId !== "" ? { toolCallId: req.toolCallId } : {}),
             ...(child
                 ? {
-                    sourceTaskId: req.sourceTaskId,
+                    sourceSessionId: req.sourceSessionId,
                     fromSubagent: true,
                     ...(typeof req.sourceAgentName === "string" ? { sourceAgentName: redactSecrets(req.sourceAgentName) } : {}),
                     ...(req.delegation
@@ -1353,7 +1348,9 @@ export class ToolApprovalCoordinator {
                         : {}),
                 }
                 : {}),
+            ...(typeof req.agentId === "string" && req.agentId !== "" ? { agentId: req.agentId } : {}),
             message: typeof req.message === "string" ? redactDeep(req.message) : "",
+            ...(askReasonsOfReq !== undefined ? { askReasons: askReasonsOfReq } : {}),
             ...(governanceForced ? { governanceForced: true } : {}),
             ...(req.requiresRealApproval === true ? { requiresRealApproval: true } : {}),
             ...(req.mandated === true ? { mandated: true } : {}),
@@ -1385,6 +1382,7 @@ export class ToolApprovalCoordinator {
         const card = this.askStore ? buildApprovalCard(frame, req, req.requiresRealApproval === true) : undefined;
         let cardForFrame = card;
         let persistedExpiresAtMs = expiresAtMs;
+        let factsOfRecord;
         let entryExecutionLane = origin.executionLane;
         let lateEnsuredRow;
         let lateTerminalRow;
@@ -1413,16 +1411,16 @@ export class ToolApprovalCoordinator {
                 : replayed;
         };
         if (this.askStore && card) {
-            const sourceTaskId = req.sourceTaskId ?? origin.taskId;
+            const sourceSessionId = req.sourceSessionId ?? origin.taskId;
             const runId = origin.taskId;
             const legKey = origin.legKey;
-            askId = deriveAskId(sourceTaskId, runId, legKey, req);
-            batchId = this.batchIdFor(askId, sourceTaskId, runId, legKey);
+            askId = deriveAskId(sourceSessionId, runId, legKey, req);
+            batchId = this.batchIdFor(askId, sourceSessionId, runId, legKey);
             try {
                 const existingOrCreated = await this.withStoreDeadline(this.askStore.ensureAsk({
                     askId,
                     taskId: origin.taskId,
-                    sourceTaskId,
+                    sourceSessionId,
                     sessionId: origin.sessionId ?? origin.taskId,
                     owner: origin.owner,
                     executionLane: origin.executionLane,
@@ -1430,7 +1428,7 @@ export class ToolApprovalCoordinator {
                     toolCallId: req.toolCallId,
                     legKey,
                     parentToolCallId: req.delegation?.parentToolCallId ?? null,
-                    cardJson: buildApprovalCardEnvelope(askId, card),
+                    cardJson: buildApprovalCardEnvelope(askId, card, frame),
                     boundInputHash: readBoundInputHash(req),
                     ...durableRuleMaterial(ruleLaneMaterial),
                     schemaVersion: 1,
@@ -1464,6 +1462,9 @@ export class ToolApprovalCoordinator {
                 persistedExpiresAtMs = existingOrCreated.row.expiresAtMs;
                 entryExecutionLane = existingOrCreated.row.executionLane;
                 cardForFrame = persistedEnvelope.card;
+                factsOfRecord = existingOrCreated.inserted ? undefined : persistedEnvelope.liveFacts;
+                if (factsOfRecord !== undefined)
+                    adoptStoredLiveFacts(frame, factsOfRecord);
                 if (cardForFrame.governanceForced === true)
                     frame.governanceForced = true;
                 else
@@ -1561,7 +1562,7 @@ export class ToolApprovalCoordinator {
             if (hostSettled !== undefined || (denyReasonSettled !== undefined && denyReasonSettled !== "")) {
                 return {
                     allow: false,
-                    ...(hostSettled !== undefined ? { settledBy: hostSettled } : {}),
+                    ...hostSettled,
                     ...(denyReasonSettled !== undefined && denyReasonSettled !== "" ? { reason: denyReasonSettled } : {}),
                 };
             }
@@ -1578,7 +1579,7 @@ export class ToolApprovalCoordinator {
                 return {
                     allow: true,
                     ...(settled.updatedInput !== undefined ? { updatedInput: settled.updatedInput } : {}),
-                    ...(hostSettled !== undefined ? { settledBy: hostSettled } : {}),
+                    ...hostSettled,
                     ...(settled.readRootGrant !== undefined ? { readRootGrant: settled.readRootGrant } : {}),
                 };
             }
@@ -1590,10 +1591,10 @@ export class ToolApprovalCoordinator {
             done = true;
             const allowed = verdict.by === "human" && verdict.allowed;
             const outcome = verdict.by === "system" ? SETTLE_OUTCOME.EXPIRED : verdict.allowed ? SETTLE_OUTCOME.ALLOWED : SETTLE_OUTCOME.DENIED;
-            const hostSettledBy = verdict.hostSettledBy;
+            const hostSource = verdict.hostSource;
             const updatedInput = verdict.by === "human" ? verdict.updatedInput : undefined;
             const readRootGrant = verdict.by === "human" ? verdict.readRootGrant : undefined;
-            hostSettled = hostSettledBy;
+            hostSettled = hostSource;
             denyReasonSettled = verdict.by === "human" && !verdict.allowed ? verdict.denyReason : undefined;
             if (timer)
                 clearTimeout(timer);
@@ -1627,7 +1628,7 @@ export class ToolApprovalCoordinator {
                 const common = {
                     approvalId: wireApprovalId,
                     ...(windowRouteUnavailable ? { parkRouted: true } : {}),
-                    ...(hostSettledBy !== undefined ? { settledBy: hostSettledBy } : {}),
+                    ...(hostSource !== undefined ? { settledBy: hostSource.settledBy } : {}),
                     settledAtMs: Date.now(),
                 };
                 return verdict.by === "system"
@@ -1639,7 +1640,7 @@ export class ToolApprovalCoordinator {
                     approvalId: wireApprovalId,
                     taskId: origin.taskId,
                     carrierLeg,
-                    executingSessionId: req.sourceTaskId,
+                    executingSessionId: req.sourceSessionId,
                     toolCallId: req.toolCallId,
                     settleRecord,
                 });
@@ -1793,7 +1794,7 @@ export class ToolApprovalCoordinator {
             if (done)
                 return;
             windowRouteUnavailable = true;
-            settle({ by: "system", cause, ...(hostSettledBy !== undefined ? { hostSettledBy } : {}) });
+            settle({ by: "system", cause, ...(hostSettledBy !== undefined ? { hostSource: { settledBy: hostSettledBy } } : {}) });
         };
         const windowExpired = (hostSelfReport, cause) => {
             void (async () => {
@@ -1902,11 +1903,13 @@ export class ToolApprovalCoordinator {
         }
         const entryClasses = askClassPair?.classes;
         const entryDeploymentListQuestion = carriesDeploymentListQuestion(deploymentListAsks, entryClasses);
-        const entryGrantBinding = grantBindingOf(req);
+        const legGrantBinding = grantBindingOf(req);
+        const entryGrantBinding = factsOfRecord === undefined ? legGrantBinding : agreedGrantBinding(legGrantBinding, grantBindingOf(factsOfRecord));
+        const entryMandated = req.mandated === true || factsOfRecord?.mandated === true;
         const rememberRefused = standingAnswerHome(pendingEntryStandingAnswerFacts({
             ...(effectiveGovernanceForced ? { governanceForced: true } : {}),
             ...(req.requiresRealApproval === true ? { requiresRealApproval: true } : {}),
-            ...(req.mandated === true ? { mandated: true } : {}),
+            ...(entryMandated ? { mandated: true } : {}),
             grantBinding: entryGrantBinding,
             classes: entryClasses,
             ...(entryDeploymentListQuestion ? { deploymentListQuestion: true } : {}),
@@ -1929,7 +1932,7 @@ export class ToolApprovalCoordinator {
             owner: origin.owner,
             ...(primary ? { ctxTaskId: primary.taskId, originCtx: primary } : {}),
             ...(reachability === "unreached" ? { suspended: true } : {}),
-            ...(child ? { originTaskId: req.sourceTaskId } : primary ? { targetCtxs: new Set(aliveCtxs), onTargetGone } : {}),
+            ...(child ? { originTaskId: req.sourceSessionId } : primary ? { targetCtxs: new Set(aliveCtxs), onTargetGone } : {}),
             ...(origin.sessionId ? { sessionId: origin.sessionId } : {}),
             frame,
             ...(cardFrame !== undefined ? { cardFrame } : {}),
@@ -1945,9 +1948,7 @@ export class ToolApprovalCoordinator {
             ...(ruleLaneMaterial !== undefined ? { ruleLane: ruleLaneMaterial } : {}),
             ...(effectiveGovernanceForced ? { governanceForced: true } : {}),
             ...(req.requiresRealApproval === true ? { requiresRealApproval: true } : {}),
-            ...(req.mandated === true ? { mandated: true } : {}),
-            ...(mandateWord !== undefined ? { mandate: mandateWord } : {}),
-            ...(originWord !== undefined ? { origin: originWord } : {}),
+            ...(entryMandated ? { mandated: true } : {}),
             ...(askId !== undefined && batchId !== undefined ? { askId, batchId } : {}),
         };
         selfEntry = pendingEntry;
@@ -1964,7 +1965,7 @@ export class ToolApprovalCoordinator {
         this.askAudit?.recordAsk({
             approvalId: wireApprovalId,
             taskId: origin.taskId,
-            ...(req.sourceTaskId !== undefined ? { sourceTaskId: req.sourceTaskId } : {}),
+            ...(req.sourceSessionId !== undefined ? { sourceSessionId: req.sourceSessionId } : {}),
             ...(origin.sessionId !== undefined ? { sessionId: origin.sessionId } : {}),
             owner: origin.owner,
             toolName: req.toolName,
@@ -2124,7 +2125,7 @@ export class ToolApprovalCoordinator {
         const preRule = this.precheckEditedRuleBeforeDecision(entry, judgedOwner, parsed);
         if (preRule !== undefined)
             return preRule;
-        if (parsed.value !== "deny" && policyCannotAnswer(heldAskOf(entry.requiresRealApproval === true), parsed.decidedBy)) {
+        if (parsed.value !== "deny" && policyCannotAnswer(heldAskOf(entry.requiresRealApproval === true), parsed.decider.decidedBy)) {
             return { status: 400, body: refusalBody({ errorCode: "request.body_shape", message: POLICY_CANNOT_ALLOW_PERSON_ASK }) };
         }
         const ruleEligibility = { eligible: true };
@@ -2300,8 +2301,8 @@ export class ToolApprovalCoordinator {
             }
             case "DENIED":
             case "VOID": {
-                const rowCause = causeOfAskRow(row);
-                body = { state: "void", ...projection, ...(rowCause?.kind === "ending" ? { cause: rowCause.cause } : {}) };
+                const endingCause = askRowEndingCause(row);
+                body = { state: "void", ...projection, ...(endingCause !== undefined ? { cause: endingCause } : {}) };
                 break;
             }
             case "STREAM_PENDING":
@@ -2413,8 +2414,7 @@ export class ToolApprovalCoordinator {
             }
             case "DENIED":
             case "VOID": {
-                const rowCause = causeOfAskRow(row);
-                return this.notPending(rowCause?.kind === "ending" ? rowCause.cause : undefined);
+                return this.notPending(askRowEndingCause(row));
             }
             case "STREAM_PENDING":
                 return this.notPending(NOT_PENDING_UNKNOWN_CAUSE);
@@ -2488,7 +2488,7 @@ export class ToolApprovalCoordinator {
                     gateBoundInputHash: row.gateBoundInputHash,
                     decision,
                     ...(parsed.note !== undefined ? { note: parsed.note } : {}),
-                    decidedBy: parsed.decidedBy,
+                    decider: parsed.decider,
                     ...(parsed.updatedInput !== undefined && parsed.value !== "deny" ? { updatedInput: parsed.updatedInput } : {}),
                     ...(principal !== undefined ? { principal } : {}),
                     ...(httpReq !== undefined ? { httpReq } : {}),
@@ -2731,7 +2731,7 @@ export class ToolApprovalCoordinator {
                 decision: parsed.value === "deny" ? "deny" : "approve",
                 ...(parsed.note !== undefined ? { decisionNote: parsed.note } : {}),
                 ...(parsed.value !== "deny" && parsed.updatedInput !== undefined ? { updatedInput: parsed.updatedInput } : {}),
-                ...((sb) => (sb !== undefined ? { settledBy: sb } : {}))(liveSettledBy(parsed.decidedBy)),
+                ...liveHostSource(parsed.decider),
             }), "decideAsk", DURABLE_CALL_TIMEOUT_MS, (late) => {
                 if (late.ok)
                     this.notifyExternalDecision(askId, outcomeOfDecidedRow(late.row));
@@ -2811,13 +2811,13 @@ export class ToolApprovalCoordinator {
             this.allowAllSessions.add(sessionAllowKey(judgedOwner, entry.sessionId, sessionAllowCategory(entry.toolName), entry.grantBinding));
         }
         const allowed = parsed.value !== "deny";
-        const settleArgs = opts?.settleOutcome !== undefined ? settleArgsOfDecided(opts.settleOutcome) : { allowed, updatedInput: parsed.updatedInput, settledBy: liveSettledBy(parsed.decidedBy) };
+        const settleArgs = opts?.settleOutcome !== undefined ? settleArgsOfDecided(opts.settleOutcome) : { allowed, updatedInput: parsed.updatedInput, source: liveHostSource(parsed.decider) };
         const readRootGrant = opts?.settleOutcome === undefined || opts.settleOutcomeIsThisRequest === true ? parsed.readRootGrant : undefined;
         entry.settle({
             by: "human",
             allowed: settleArgs.allowed,
             updatedInput: settleArgs.updatedInput,
-            ...(settleArgs.settledBy !== undefined ? { hostSettledBy: settleArgs.settledBy } : {}),
+            ...(settleArgs.source !== undefined ? { hostSource: settleArgs.source } : {}),
             ...(!settleArgs.allowed && parsed.note !== undefined ? { denyReason: parsed.note } : {}),
             ...(readRootGrant !== undefined ? { readRootGrant } : {}),
         });
@@ -2873,6 +2873,7 @@ export class ToolApprovalCoordinator {
         const facts = {
             ...(card.governanceForced === true ? { governanceForced: true } : {}),
             ...(card.risk.requiresRealApproval ? { requiresRealApproval: true } : {}),
+            ...(replayFrame.mandated === true ? { mandated: true } : {}),
             grantBinding: { kind: "unreadable" },
             ...(card.classes !== undefined ? { classes: card.classes } : {}),
         };
@@ -2907,7 +2908,7 @@ export class ToolApprovalCoordinator {
             owner: row.owner,
             executionLane: row.executionLane,
             ...(row.sessionId !== row.taskId ? { sessionId: row.sessionId } : {}),
-            ...(card.fromSubagent === true ? { originTaskId: row.sourceTaskId } : {}),
+            ...(card.fromSubagent === true ? { originTaskId: row.sourceSessionId } : {}),
             toolName: card.toolName,
             ...facts,
             approvalId: row.askId,
@@ -2964,10 +2965,16 @@ export class ToolApprovalCoordinator {
         }
         return rows;
     }
-    hasLivePendingFrom(originTaskId) {
-        for (const e of this.pending.values())
-            if (e.originTaskId === originTaskId && e.adopted !== true)
+    hasLivePendingFromLeg(names) {
+        if (names.length === 0)
+            return false;
+        for (const e of this.pending.values()) {
+            if (e.adopted === true)
+                continue;
+            const { agentId, sourceSessionId } = e.frame;
+            if ((agentId !== undefined && names.includes(agentId)) || (sourceSessionId !== undefined && names.includes(sourceSessionId)))
                 return true;
+        }
         return false;
     }
     async pollSuspendedDecisions() {
@@ -3028,17 +3035,17 @@ export class ToolApprovalCoordinator {
             }
             if (this.editedDecisionInFlight(askId))
                 continue;
-            const rowCause = causeOfAskRow(row);
-            if (rowCause?.kind === "ending") {
+            const endingCause = askRowEndingCause(row);
+            if (endingCause !== undefined) {
                 const before = this.waitingRegistrationCount(askId);
-                this.settleVoidedSiblings([askId], rowCause.cause);
+                this.settleVoidedSiblings([askId], endingCause);
                 settled += before;
                 continue;
             }
             const outcome = replayTerminalAskRow(row);
             if (outcome === "unavailable") {
                 const before = this.waitingRegistrationCount(askId);
-                const parkCause = (rowCause?.kind === "park_trigger" ? rowCause.cause : undefined) ?? (Date.now() >= row.expiresAtMs ? APPROVAL_ENDING_CAUSES.TTL_EXPIRED : APPROVAL_ENDING_CAUSES.SHUTDOWN_BEFORE_PARK);
+                const parkCause = askRowParkTrigger(row) ?? (Date.now() >= row.expiresAtMs ? APPROVAL_ENDING_CAUSES.TTL_EXPIRED : APPROVAL_ENDING_CAUSES.SHUTDOWN_BEFORE_PARK);
                 this.settleSameAskIdParkRoute(askId, parkCause);
                 settled += before;
                 continue;