@sema-agent/server 7.135.0 → 7.137.0

package/dist/http/resume-legs.d.ts

@@ -16,6 +16,7 @@ import { CheckpointError, type QuestionAnswer, type CheckpointToken } from "@sem
 import type { DecideBinding } from "./wire-types.js";
 import type { CheckpointStoreFull } from "../plugins/store-backend.js";
 import type { HostDecision } from "../host-decision.js";
+import { type GateSighting } from "../approval-gate-currency.js";
 import { type PlanApprovePermissionModeAfter } from "../task-settings.js";
 import type { RouteCtxBase, DriveResumeArgs, HostLegOutcome, PreparedPlanReview, ResumeLegOutcome, WorkflowDecisionDelivery } from "./route-ctx.js";
 import type { RunRegistry, RouteHelpers, RouteLegs } from "./route-ctx.js";
@@ -28,25 +29,6 @@ import { type ResumeRefusalAnswer } from "./checkpoint-ctx.js";
  * ⇒ `"terminal"`:与 `by_reason` 认不得的词同一条 fail-closed 方向(不宽容默认成可重试),也与修前手列串的缺省逐字相同。
  */
 export declare function resumeRefusalDisposition(e: CheckpointError): "cancelled" | "retriable" | "terminal";
-/**
- * 🔴 **引擎拒一次续跑(`CheckpointError`)的 HTTP 答复 —— 唯一组句器**([ref] / [ref],core 7.52.0;五条续跑腿〔`/decide` · `/resume` · `/wake` · `plan_review` ·
- * workflow 决定在宿主会话上起的新一跑〕同经 `driveResumeLeg` 的 catch 臂到这里,SLA 拒扫腿与 PARKED 赎回席经 `resumeCheckpoint` 同得)。
- *
- * 规则(一条):**一次拒 = 一个答复形,与「谁发现的」无关**。引擎在认领前 / CAS 前拒的,与本服务在重放存量体之前自己拒的(`resume_blocked_by_policy`,
- * `checkpoint-ctx.ts` `resumeBlockedByPolicyAnswer`;续跑入口上卡仍 pending ⇒ 同样带 `retriable:true`)读同一组机读键;体经拒体组句器 `refusalBody` 铸,
- * `retriable` 经续跑家族的唯一写点 `resumeRefusalWithCard` 追加。
- * 后台停驻子代的 parked 赎回不经本函数(引擎交的是赎回回执,不是 `CheckpointError`):`parked-decide.ts` 答 `422 parked_resume.startup_failed`,体带成因词 `cause`,
- * 引擎 7.54.0 起回执的 `details.detail` 交出同三位判别位,经**同一只**读法 `resumeRefusalFacts` 落成同名三键(下面第二条)。键律:
- *  · `errorCode` —— 引擎码的原码镜像(`checkpoint.invalid_outcome` 按决断成因改铸,{@link decisionRefusalCauseOf});
- *  · 引擎 `detail` 的三个机读判别位原样过境,键名与 `resume_blocked_by_policy` 同义:`detail.code` ⇒ `blockedBy`(挡住它的准入码 = 同一份坏配置在新跑上报的 `errorCode`;
- *    今天只有 `checkpoint.config_refused` 带它)· `detail.field` ⇒ `field`(哪一侧 / 哪一格)· `detail.reason` ⇒ `reason`(同码多臂时哪一臂,闭集 `CheckpointErrorReason`)。
- *    缺席不造键(引擎没给就是没给)。`detail` 的其余成员(`requires` / `differs`)不在这组判别位里,不上 wire;`retryAfterMs` 折成族口径的 `retryAfterSec`(下面);
- *  · `retriable` —— 只在处置读口答 `retriable` 时在场(卡仍 pending、行重新 park;**不是**「原样重试会成功」—— 契约附录 A.1 注那一个意思,壳按它决定卡还挂不挂着)。
- *    出路(改那一格再决 / 只能在停它的那一版 worker 上跑完或取消 / 等一会)由 `errorCode` + `field` + `blockedBy` + `reason` 与引擎的句子说;
- *  · `error` —— 引擎的句子原样(它点名条目、哪一臂与出路);本层不另铸第二句;
- *  · `taskId`(抢到行才在)/ `retryAfterSec`(两码闭集)/ 两版本键(只在 `checkpoint.unsupported_version`:调用方按那一码交 `buildCheckpointVersionKeys` 的产物,本函数原样铺)—— 键律照旧。
- * 纯函数(钉直接调)。`retriable` 由调用方传入 —— 行的落点与 wire 的 `retriable` 读同一次求值(catch 臂一处),本函数不另判。
- */
 export declare function checkpointRefusalAnswer(e: CheckpointError, at: {
     readonly gate: string;
     readonly retriable: boolean;
@@ -89,7 +71,7 @@ export declare function createResumeLegs(ctx: {
     }, decider?: {
         principal?: string;
         explicitOperator: boolean;
-    }) => Promise<{
+    }, sighting?: GateSighting) => Promise<{
         readonly ok: false;
         readonly answer: {
             status: number;

package/dist/http/resume-legs.js

@@ -9,7 +9,7 @@ const headUnavailable = async (sessionId) => {
     throw new Error(`parked decide cannot verify which occupant session ${sessionId} belongs to: this deployment's session store has no head read (headOf; every built-in store has one) — refusing rather than resuming unverified`);
 };
 import { HttpError, decodeCheckpointScope, CHECKPOINT_PUBLIC_SCOPE } from "../security.js";
-import { parkToolCallId, TurnAnchorCapture, HEARTBEAT_MS, markChildrenStoppedByUserOnAbort } from "../runs.js";
+import { graftParkToolCallId, parkToolCallId, TurnAnchorCapture, HEARTBEAT_MS, markChildrenStoppedByUserOnAbort } from "../runs.js";
 import { failureCodeOf, nestedPauseOf, sealResultForExit, outwardPlane } from "../terminal.js";
 import { buildCancelledLedgerRow, createRunAbort, mintCancelledResult } from "../run-cancel-context.js";
 import { isTerminalRunStatus } from "../plugins/store-contracts.js";
@@ -18,16 +18,17 @@ import { recordResumeResourceWindow } from "../resource-window.js";
 import { emitPendingWorkflowCompletions, taskNotificationInboxEntry, taskNotificationStreamKeyOf, NotifiedKeys } from "../orchestration/workflow-completion-inbox.js";
 import { fleetRunPublisher, fleetRunLabels, fleetRunResiduals, isFleetAgentTerminalNotification } from "../fleet/fleet-bus.js";
 import { defaultSubagentTailBus } from "../fleet/subagent-tail-bus.js";
-import { currentApprovalGateToken } from "../approval-gate-currency.js";
-import { createApprovalCardEmitter, declaredApprovalFrameFamilies, parkRowStandingAnswerFacts, resolveApprovalLeg, resolveStreamApprovalGate, standingAnswerDurablyRecordable } from "../tool-approval.js";
+import { currentApprovalGateToken, currentGateFacesOf, sightsCurrentGate } from "../approval-gate-currency.js";
+import { approverFacingArgs, createApprovalCardEmitter, declaredApprovalFrameFamilies, parkRowStandingAnswerFacts, resolveApprovalLeg, resolveStreamApprovalGate, standingAnswerDurablyRecordable } from "../tool-approval.js";
 import { buildCheckpointAnchorHash } from "../approval-ask-audit-store.js";
 import { APPROVAL_ENDING_CAUSES } from "../approval-deny-reasons.js";
 import { serviceVersion } from "../service-version.js";
 import { TERMINAL_PARK_GATE_KINDS } from "../plugins/checkpoint-store-sql.js";
 import { withPrincipal } from "../observability/principal-context.js";
 import { withModelReachScope } from "../model-reach-scope.js";
+import { runSkillsOf } from "../capabilities/skills.js";
 import { createInstructionSelectionLeg } from "../instruction-selection.js";
-import { modelTextEventData, turnEndEventData, contextUsageEventData, toolStartEventData, toolEndEventData, taskProgressEventData, taskStartedEventData, taskNotificationEventData, compactedEventData, diagnosticsEventData, brainStatusEventData, steeringInjectedEventData, compactionOutcomeEventData, compactionStartedEventData, workspaceChangedEventData, wiringManifestEventData, toolRosterDeltaEventData, toolDisclosureEventData, humanInputEventData, appendModelUsageDelta, appendPromptManifest, attachModelUsage } from "../trace/project.js";
+import { modelTextEventData, parkEventData, turnEndEventData, contextUsageEventData, toolStartEventData, toolEndEventData, taskProgressEventData, taskStartedEventData, taskNotificationEventData, compactedEventData, diagnosticsEventData, brainStatusEventData, steeringInjectedEventData, compactionOutcomeEventData, compactionStartedEventData, workspaceChangedEventData, wiringManifestEventData, toolRosterDeltaEventData, toolDisclosureEventData, humanInputEventData, appendModelUsageDelta, appendPromptManifest, attachModelUsage } from "../trace/project.js";
 import { redactSecrets } from "../trace/redact.js";
 import { buildRunObjectivePreview } from "../user-authored-text.js";
 import { createForwardAppendFailedNote, createLedgerSink, createSerialLedgerAppend } from "../trace/ledger-sink.js";
@@ -43,11 +44,11 @@ import { createSessionsLocal } from "./routes/sessions.js";
 import { createSessionSyncLocal } from "./routes/session-sync.js";
 import { createImagesLocal } from "./routes/images.js";
 import { createCapabilitiesLocal } from "./routes/capabilities.js";
-import { gatedPrincipal, explicitOperatorOk } from "./principal-gate.js";
+import { gatedPrincipal, explicitOperatorOk, runIdentityOf } from "./principal-gate.js";
 import { buildActiveRunConflict, resumeEntryForGate } from "./active-run-conflict.js";
 import { commitPlacement, devicePlacementErrorBody } from "./device-placement.js";
 import { commitSessionInheritEnv } from "./session-inherit-env.js";
-import { ASK_USER_QUESTION_TOOL_NAME, isApprovalGateKind } from "../approval-content-kind.js";
+import { ASK_USER_QUESTION_TOOL_NAME, isApprovalGateKind, isEngineQuestionRow } from "../approval-content-kind.js";
 import { deploymentListAsks } from "../approval.js";
 import { readResumeCtx, resumeCtxCorruptAnswer, resumeCtxUnsealableAnswer } from "./resume-ctx-read.js";
 import { buildCheckpointVersionKeys, resumeBlockedByPolicyAnswer, resumeRefusalWithCard, sealCheckpointCtx, storedBodyReplayAnswer, storedBodyReplayLogFields, withPermissionModeRewritten } from "./checkpoint-ctx.js";
@@ -79,6 +80,7 @@ const WORKER_SWAP_REDEEMABLE = {
     read_face_forged: false,
     write_face_damaged: false,
     skill_grants_damaged: false,
+    skill_scopes_damaged: false,
     constraint_chain_missing: false,
     hands_coordinates_damaged: false,
     installation_record_absent: true,
@@ -111,6 +113,7 @@ const CHECKPOINT_ERROR_DISPOSITION = {
     "resume.principal_mismatch": "retriable",
     "resume.placement_mismatch": "retriable",
     "resume.preflight_rejected": "retriable",
+    "resume.holder_superseded": "retriable",
     "wake.gate_pending": "retriable",
     "wake.nothing_to_deliver": "retriable",
     "checkpoint.config_refused": "retriable",
@@ -183,6 +186,26 @@ function decisionRefusalCauseOf(e, gate) {
 function notResumableAnswer() {
     return { status: 409, body: refusalBody({ errorCode: "conflict.not_resumable", message: "run is not in a resumable (suspended) state (already resumed, decided, or expired)" }) };
 }
+function approvalStaleAnswer(facts) {
+    return {
+        status: 409,
+        body: refusalBody({
+            errorCode: "approval_stale",
+            message: "the approval you are deciding is no longer current (already resolved or superseded since you viewed it)",
+            facts: {
+                ...(facts.terminal !== undefined ? { terminal: facts.terminal } : {}),
+                ...(facts.currentPending !== undefined ? { currentPending: facts.currentPending } : {}),
+            },
+        }),
+    };
+}
+function acceptableFormFacts(detail) {
+    const rewritten = detail !== null && typeof detail === "object" ? detail.editRewritten : undefined;
+    if (rewritten === null || typeof rewritten !== "object" || !Object.hasOwn(rewritten, "acceptableForm"))
+        return {};
+    const shown = approverFacingArgs(rewritten.acceptableForm);
+    return shown === undefined ? {} : { acceptableForm: shown };
+}
 export function checkpointRefusalAnswer(e, at) {
     const refusalCause = e.code === "checkpoint.invalid_outcome" ? decisionRefusalCauseOf(e, at.gate) : undefined;
     const detail = e.detail;
@@ -198,6 +221,7 @@ export function checkpointRefusalAnswer(e, at) {
                     ? { retryAfterSec: Math.max(1, Math.ceil(detail.retryAfterMs / 1000)) }
                     : {}),
                 ...at.versionKeys,
+                ...(e.code === "resume.constraint_rejected" ? acceptableFormFacts(detail) : {}),
             },
         }),
     }, at.retriable);
@@ -209,7 +233,7 @@ export function createResumeLegs(ctx) {
     async function resumeCheckpoint(sessionId, decision, reason, hostDecision, req, answer, binding, onResumeCommitted, acceptEarly, decider) {
         const cs = deps.checkpointStore;
         const token = await currentApprovalGateToken(cs, sessionId);
-        if (binding?.checkpointToken && binding.checkpointToken !== token) {
+        if (binding?.checkpointToken && !sightsCurrentGate({ face: "checkpointToken", value: binding.checkpointToken }, token ? { checkpointToken: token } : null)) {
             let seenUnreadable = false;
             const seen = await cs.get(binding.checkpointToken).catch((e) => {
                 seenUnreadable = true;
@@ -245,17 +269,7 @@ export function createResumeLegs(ctx) {
                     };
                 }
             }
-            return {
-                status: 409,
-                body: refusalBody({
-                    errorCode: "approval_stale",
-                    message: "the approval you are deciding is no longer current (already resolved or superseded since you viewed it)",
-                    facts: {
-                        ...(attributable ? { terminal: "resolved" } : {}),
-                        ...(currentPending ? { currentPending } : {}),
-                    },
-                }),
-            };
+            return approvalStaleAnswer({ ...(attributable ? { terminal: "resolved" } : {}), ...(currentPending ? { currentPending } : {}) });
         }
         if (!token) {
             deps.logger?.info?.("approval_decide_no_pending", { sessionId });
@@ -330,16 +344,7 @@ export function createResumeLegs(ctx) {
                     ...(cp.pendingAction.boundInputHash ? { boundInputHash: cp.pendingAction.boundInputHash } : {}),
                 };
             }
-            return {
-                status: 409,
-                body: refusalBody({
-                    errorCode: "approval_stale",
-                    message: "the approval you are deciding is no longer current (already resolved or superseded since you viewed it)",
-                    facts: {
-                        ...(s57CurrentPending ? { currentPending: s57CurrentPending } : {}),
-                    },
-                }),
-            };
+            return approvalStaleAnswer(s57CurrentPending ? { currentPending: s57CurrentPending } : {});
         }
         const paForGrant = cp.pendingAction.kind === "tool_approval" ? cp.pendingAction : undefined;
         const rememberableTool = paForGrant !== undefined &&
@@ -498,7 +503,7 @@ export function createResumeLegs(ctx) {
             boundCallId: binding?.boundCallId ?? persistedCallId,
             boundInputHash: binding?.boundInputHash ?? persistedHash,
             decision: decision === "approve" ? "allow" : "deny",
-            ...(decision === "approve" && binding?.updatedInput !== undefined ? { updatedInput: binding.updatedInput } : {}),
+            ...(decision === "approve" && !isEngineQuestionRow(pa) && binding?.updatedInput !== undefined ? { updatedInput: binding.updatedInput } : {}),
             ...(reason ? { reason } : {}),
             ...(binding?.feedback !== undefined ? { feedback: binding.feedback } : {}),
             ...(answer !== undefined ? { answer } : {}),
@@ -599,6 +604,7 @@ export function createResumeLegs(ctx) {
             const freshId = uuidv7();
             const created = await deps.runStore.createRun(freshId, sessionId, principal ?? null, deps.instanceId ?? "default", {
                 source: args.mintFreshRun.source,
+                identity: args.mintFreshRun.identity,
                 objectivePreview: buildRunObjectivePreview(resumeObjective ?? ""),
             });
             if (created.existing) {
@@ -725,6 +731,7 @@ export function createResumeLegs(ctx) {
         let unregisterEngineNotice;
         try {
             const instructionLeg = createInstructionSelectionLeg();
+            const legWiringSections = () => ({ instructions: instructionLeg.segment(), skills: runSkillsOf(taskConfig) });
             result = await instructionLeg.run(sessionId, () => withModelReachScope({ sessionId, taskId }, () => withPrincipal(principal, async () => {
                 const resumeNotifiedKeys = new NotifiedKeys();
                 if (deps.runStore && taskId) {
@@ -748,7 +755,7 @@ export function createResumeLegs(ctx) {
                         persistThinking: deps.config.traceThinking,
                         notifiedKeys: resumeNotifiedKeys,
                         ...(taskId ? { onActivity: () => recordTurnActivity(taskId) } : {}),
-                        instructionsSegment: instructionLeg.segment,
+                        legSections: legWiringSections,
                     });
                     const vAppend = (type, data) => verifySink.append(type, data);
                     cancelLedgerAppend = vAppend;
@@ -820,7 +827,7 @@ export function createResumeLegs(ctx) {
                             if (reSuspended || vrReopened) {
                                 await appendModelUsageDelta(ap, deps.modelUsage, taskId);
                                 const vrParkCallId = vrNested !== undefined ? await parkToolCallId({ terminal: vrNested }, deps.checkpointStore) : undefined;
-                                await ap(reParkStatus ?? reparkStatus, { gate: vrNested?.gate ?? null, ...(vrParkCallId !== undefined ? { toolCallId: vrParkCallId } : {}), ...(vrReopened ? { reopened: failureCodeOf(vr.terminal) ?? null } : {}) });
+                                await ap(reParkStatus ?? reparkStatus, parkEventData({ terminal: vrNested, ...(vrParkCallId !== undefined ? { toolCallId: vrParkCallId } : {}) }, vrReopened ? (failureCodeOf(vr.terminal) ?? null) : undefined));
                             }
                             else {
                                 safe = await attachModelUsage(safe, { append: ap, getEvents: (id, a) => rs2.getEvents(id, a), modelUsage: deps.modelUsage, taskId });
@@ -1017,7 +1024,7 @@ export function createResumeLegs(ctx) {
                                 break;
                             case "wiring_manifest":
                                 await flush();
-                                await append("wiring_manifest", wiringManifestEventData(ev, instructionLeg.segment()));
+                                await append("wiring_manifest", wiringManifestEventData(ev, legWiringSections()));
                                 break;
                             case "tool_roster_delta": {
                                 await flush();
@@ -1074,20 +1081,19 @@ export function createResumeLegs(ctx) {
                     const r = causeAtDone !== undefined ? mintCancelledResult({ taskId, sessionId, startedAtMs: resumeLegStartedAt, message: "cancelled by user", engineResult: rEngine, cause: causeAtDone }) : rEngine;
                     const rPark = r.terminal.kind === "paused" ? outwardPlane(r.terminal).status : undefined;
                     if (rPark === "suspended") {
-                        const parkCallId = await parkToolCallId(r, deps.checkpointStore);
-                        await append("suspended", { gate: r.terminal.kind === "paused" ? r.terminal.gate : null, ...(parkCallId !== undefined ? { toolCallId: parkCallId } : {}) });
+                        await append("suspended", parkEventData(await graftParkToolCallId(r, deps.checkpointStore)));
                         await appendModelUsageDelta(append, deps.modelUsage, taskId);
                         return r;
                     }
                     if (rPark === "needs_review") {
-                        await append("needs_review", { gate: r.terminal.kind === "paused" ? r.terminal.gate : null });
+                        await append("needs_review", parkEventData(r));
                         await appendModelUsageDelta(append, deps.modelUsage, taskId);
                         return r;
                     }
                     if (await reopenedAfterLeg(r, causeAtDone !== undefined)) {
                         reopenConfirmedPark = true;
                         try {
-                            await append(reparkStatus, { gate: null, reopened: failureCodeOf(r.terminal) ?? null });
+                            await append(reparkStatus, parkEventData(r, failureCodeOf(r.terminal) ?? null));
                             await appendModelUsageDelta(append, deps.modelUsage, taskId);
                         }
                         catch {
@@ -1339,6 +1345,7 @@ export function createResumeLegs(ctx) {
             fleetScope: resumeFleetScope(req, auth),
             elicitOwner: principal ?? null,
             source: "workflow_parked_decide",
+            identity: runIdentityOf(req, deps.config, principal ?? null),
             workflowDecision,
         });
         if (out.existing) {
@@ -1424,7 +1431,7 @@ export function createResumeLegs(ctx) {
             outcome: { gate: "wake", ...(message !== undefined ? { message: { text: message, trusted } } : {}) },
             verifyRounds: undefined,
             resumeCtx: { sessionId, ctx },
-            mintFreshRun: { source: "wake" },
+            mintFreshRun: { source: "wake", identity: runIdentityOf(req, deps.config, auth.principal ?? null) },
             ...(workflowDecision !== undefined ? { workflowDecision } : {}),
             ...(engineNotices.length > 0 ? { engineNotices } : {}),
             ...(acceptEarly === true ? { acceptEarly: true } : {}),
@@ -1432,7 +1439,7 @@ export function createResumeLegs(ctx) {
             ...(ownerLeaseAdmittedFor !== undefined && auth.principal === ownerLeaseAdmittedFor ? { ownerLeaseAdmitted: true } : {}),
         }));
     }
-    async function preparePlanReview(sessionId, log, decider) {
+    async function preparePlanReview(sessionId, log, decider, sighting) {
         const cs = deps.checkpointStore;
         const refuse = (answer) => ({ ok: false, answer });
         const log404 = (r) => deps.logger?.info?.("decide_404", {
@@ -1490,6 +1497,13 @@ export function createResumeLegs(ctx) {
                 }),
             });
         }
+        if (sighting !== undefined) {
+            const current = currentGateFacesOf(token, cp);
+            if (!sightsCurrentGate(sighting, current)) {
+                const currentId = decider !== undefined && cp.status === "pending" ? current.checkpointId : undefined;
+                return refuse(approvalStaleAnswer(currentId !== undefined ? { currentPending: { checkpointId: currentId } } : {}));
+            }
+        }
         const ctxRead = await readResumeCtx(cs.getCtx(sessionId), ctxOpening(sessionId));
         if (ctxRead.kind === "corrupt")
             return refuse(resumeCtxCorruptAnswer(ctxRead.where));

package/dist/http/route-ctx.d.ts

@@ -27,8 +27,10 @@ import type { CapabilitiesLocal } from "./routes/capabilities.js";
 import type { SessionsLocal } from "./routes/sessions.js";
 import type { SessionSyncLocal } from "./routes/session-sync.js";
 import type { PlanApprovePermissionModeAfter } from "../task-settings.js";
+import type { GateSighting } from "../approval-gate-currency.js";
 import type { VerifyRoundsSpec } from "./verify-rounds.js";
 import type { RunAbort } from "../run-cancel-context.js";
+import type { RunIdentity } from "../identity-source.js";
 /** 跨域可变状态 = lens1 §C2 实测的那 8 条「运行期登记簿」,一个对象。
  *  [ref]:`cancelledViaVerb`(按 taskId 键控的「这次是取消动词」旁表)删除 —— 中止成因改挂在每条腿自己的
  *  {@link RunAbort} 句柄上(`inflightRuns` 的值),同寿同删,不再有一张与腿不同寿的旁表。 */
@@ -281,11 +283,13 @@ export interface DriveResumeArgs {
     /** [ref]/[ref]:调用方声明「本腿的 park 是终局后纯 park,session claim 已随终局 finalize 删除」——
      *  getActiveTaskId 缺席时**铸新 canonical taskId + createRun 全生命周期行**(wake 续跑=同 session 新一轮
      *  turn),而不是无行裸跑(不可取消/无计费归因/无 durable append/fleet 不可见,且 core `spec.taskId ??
-     *  sessionId` fallback 会把 lastRunId 铸成 sessionId)。`source` 进 run 行元数据(runMeta 同列)。
+     *  sessionId` fallback 会把 lastRunId 铸成 sessionId)。`source` 进 run 行元数据(runMeta 同列,只作归因);`identity` = 新行的身份元组(调用方经
+     *  `runIdentityOf(req, config, 卡属主)` 读凭据门铸下的那一份:按下按钮的就是卡属主才有,否则空)。
      *  decide/answer/plan_review 腿**不设**此位:它们的 claim 在 park 期间特意保留,缺席=行被 reap 的竞态,
      *  维持既有兜底(checkpoint token 同拍过期 ⇒ resumeStream 拒),不铸新行。 */
     mintFreshRun?: {
         source: string;
+        identity: RunIdentity | null;
     };
     /** `/decide` 第三条车道交给本腿的那一件决定投递(语义属主 = {@link WorkflowDecisionDelivery} 顶注)。缺席 ⇒ 只摊决定行(其余四条 resume 腿恒缺席)。 */
     workflowDecision?: WorkflowDecisionDelivery;
@@ -457,7 +461,9 @@ export interface RouteLegs {
     decider?: {
         principal?: string;
         explicitOperator: boolean;
-    }): Promise<{
+    }, 
+    /** [ref]:决断方看到的那道门(决断体的 `checkpointId`);不是当前门 ⇒ `409 approval_stale`(`approval_stale` 律,语义属主 = `resume-legs.ts` 的同名形参顶注)。 */
+    sighting?: GateSighting): Promise<{
         readonly ok: false;
         readonly answer: {
             status: number;

package/dist/http/routes/approvals-assistant.d.ts

@@ -102,8 +102,6 @@ export type QuestionAnswerCheck = {
  * [ref] 起**同时闭键**:词表外的键(拼错 / 未来键 / `__proto__`)拒不丢。
  */
 export declare function checkQuestionAnswer(v: unknown): QuestionAnswerCheck;
-/** 路由体 = 从 `server.ts` 的 `handle()` 里**整段剪切**过来的原文(唯一改动:统一去缩进两格)。裸 `return;`
- *  = 「本域已应答」;走到函数尾才是「没匹配上」。跨域的东西一律在首行解构出来。 */
 export declare function handleApprovalsAssistant(req: IncomingMessage, res: ServerResponse, match: RouteMatch<ApprovalsAssistantRouteId>, ctx: RouteCtx): Promise<void>;
 /**
  * 🔴 [ref]-2 / [ref]②:两条 durable 读面(`GET /v1/approvals` + `/v1/approvals/stream`)的**唯一**

package/dist/http/routes/approvals-assistant.js

@@ -1,6 +1,8 @@
 import { screenedGate } from "../../trace/project.js";
+import { skillCardFacts } from "../../approval-card.js";
 import { hostDecisionFacts, readDecidedBy, retiredDecisionKeyFacts, DECIDED_BY_NOT_IN_PROOF, DECIDED_BY_OUTSIDE_CLOSED_SET } from "../../host-decision.js";
 import { sameExecutionRecord } from "@sema-agent/core";
+import { findParkedAgentForCheckpoint } from "../../parked-decide.js";
 import { DECIDED_REPLAY_SCAN_CAP, approvalPayloadFingerprint } from "../../plugins/checkpoint-store-sql.js";
 import { carriesDeploymentListQuestion, standingAnswerDurablyRecordable } from "../../tool-approval.js";
 import { APPROVAL_GATE_KINDS } from "../../approval-content-kind.js";
@@ -24,10 +26,9 @@ import { callGrantBindingOf, questionGrantBindingOf } from "../../standing-answe
 import { sendResumeOutcome } from "../route-ctx.js";
 import { assertNever } from "../route-ctx.js";
 import * as facts from "../../capability-facts.js";
-import { KEEP_SEALED, readResumeCtx } from "../resume-ctx-read.js";
-import { StoreCorruptError } from "../../plugins/sql-json-column.js";
+import { storeFaultClassOf } from "../../plugins/store-fault.js";
 import { recordFailOpen } from "../../observability/fail-open.js";
-import { durableRowIdentity } from "../../checkpoint-identity.js";
+import { MAX_CHECKPOINT_ID_CHARS, durableRowIdentity } from "../../checkpoint-identity.js";
 import { MAX_KEY_ECHO, keyClosureClause, scanKeyClosure } from "../../request-key-closure.js";
 import { fieldConflictFacts } from "../../field-conflict.js";
 const DECIDE_BODY_DECLARED_KEYS = [
@@ -36,14 +37,15 @@ const DECIDE_BODY_DECLARED_KEYS = [
 const DECIDE_PROOF_COVERED_KEYS = ["answer", "boundCallId", "boundInputHash", "decision", "reason"];
 const DECIDE_NOT_IN_PROOF_KEYS = ["checkpointToken", "decidedBy", "feedback", "remember", "updatedInput"];
 const PLAN_REVIEW_BODY_DECLARED_KEYS = [
-    "boundCallId", "decidedBy", "decision", "editedPlan", "permissionModeAfter", "reason",
+    "boundCallId", "checkpointId", "decidedBy", "decision", "editedPlan", "permissionModeAfter", "reason",
 ];
-const PLAN_REVIEW_PROOF_COVERED_KEYS = ["boundCallId", "decision", "editedPlan", "permissionModeAfter", "reason"];
+const PLAN_REVIEW_PROOF_COVERED_KEYS = ["boundCallId", "checkpointId", "decision", "editedPlan", "permissionModeAfter", "reason"];
 const PLAN_REVIEW_NOT_IN_PROOF_KEYS = ["decidedBy"];
 const PROOF_SLOT_OF = {
     answer: "answer",
     boundCallId: "boundCallId",
     boundInputHash: "boundInputHash",
+    checkpointId: "checkpointId",
     decision: "decision",
     editedPlan: "boundInputHash",
     permissionModeAfter: "permissionModeAfter",
@@ -260,6 +262,26 @@ async function decideIdempotentReplay(cs, args) {
         },
     };
 }
+async function gateObjectivePreview(reader, runStore, agentStore, gate) {
+    const previewOf = async (taskId) => readOwnedRun(reader.config, runStore, reader.principal, taskId, "owner_or_operator");
+    const own = (await runStore.getActiveTaskId(gate.sessionId)) ?? (await runStore.latestRunForSession(gate.sessionId))?.taskId;
+    if (own !== undefined)
+        return (await previewOf(own))?.objectivePreview ?? null;
+    if (agentStore === undefined)
+        return null;
+    let row = (await findParkedAgentForCheckpoint(agentStore, gate))?.row;
+    for (let hop = 0; row !== undefined && hop < MAX_DELEGATION_HOPS; hop++) {
+        const spawner = row.parentTaskId;
+        if (spawner === undefined)
+            return null;
+        const run = await previewOf(spawner);
+        if (run !== undefined)
+            return run.objectivePreview ?? null;
+        row = (await agentStore.get(spawner, row.scope)) ?? undefined;
+    }
+    return null;
+}
+const MAX_DELEGATION_HOPS = 8;
 export async function handleApprovalsAssistant(req, res, match, ctx) {
     const { deps } = ctx;
     const { preemptableRuns } = ctx.registry;
@@ -357,13 +379,18 @@ export async function handleApprovalsAssistant(req, res, match, ctx) {
                 sendApprovalsReadFailure(req, res, deps.logger, err);
                 return;
             }
+            const ledger = facts.durableRuns(deps);
+            const agentStore = deps.backgroundAgentStore;
             const inbox = (await Promise.all(summaries.map(async (s) => {
-                const ctxRead = await readResumeCtx(cs.getCtx(s.sessionId), KEEP_SEALED);
-                if (ctxRead.kind === "corrupt")
-                    recordFailOpen("server.assistant-inbox.objective-ctx-corrupt", ctxRead.where);
-                const storedBody = ctxRead.kind === "ok" ? ctxRead.ctx.body : undefined;
-                const storedObjective = typeof storedBody === "object" && storedBody !== null ? storedBody.objective : undefined;
-                const objective = typeof storedObjective === "string" ? storedObjective : null;
+                let objective = null;
+                if (ledger.available) {
+                    try {
+                        objective = await gateObjectivePreview({ config: deps.config, principal }, ledger.runStore, agentStore, s);
+                    }
+                    catch (err) {
+                        recordFailOpen("server.assistant-inbox.objective-preview-unreadable", `run row read for the inbox row of session ${JSON.stringify(s.sessionId)} failed: ${err instanceof Error ? err.message : String(err)}`);
+                    }
+                }
                 const input = s.toolInput != null ? redactedPreview(s.toolInput) : null;
                 return {
                     sessionId: s.sessionId,
@@ -380,9 +407,7 @@ export async function handleApprovalsAssistant(req, res, match, ctx) {
                     ...(s.mandate !== undefined ? { mandate: s.mandate } : {}),
                     ...(s.denialLimitFallback !== undefined ? { denialLimitFallback: s.denialLimitFallback } : {}),
                     ...(s.origin !== undefined ? { origin: s.origin } : {}),
-                    ...(s.boundGrantDigest !== undefined ? { boundGrantDigest: s.boundGrantDigest } : {}),
-                    ...(s.boundGrants !== undefined ? { boundGrants: s.boundGrants } : {}),
-                    ...(s.classifierNoRuling !== undefined ? { classifierNoRuling: s.classifierNoRuling } : {}),
+                    ...skillCardFacts(s),
                     ...(s.boundGrantAbsence !== undefined ? { boundGrantAbsence: s.boundGrantAbsence } : {}),
                     objective,
                     input,
@@ -601,6 +626,17 @@ export async function handleApprovalsAssistant(req, res, match, ctx) {
                 }
             }
             const planNonce = typeof body.boundCallId === "string" ? body.boundCallId : undefined;
+            if (body.checkpointId !== undefined) {
+                if (typeof body.checkpointId !== "string" || body.checkpointId.length === 0) {
+                    sendError(res, 400, "request.field_invalid", "checkpointId must be a non-empty string (the identity of the plan gate you decided on: read terminal.checkpointId on the run result, or the checkpointId on its approvals / inbox entry)");
+                    return;
+                }
+                if (body.checkpointId.length > MAX_CHECKPOINT_ID_CHARS) {
+                    sendError(res, 400, "request.field_invalid", `checkpointId too large (max ${MAX_CHECKPOINT_ID_CHARS} chars)`);
+                    return;
+                }
+            }
+            const sighting = typeof body.checkpointId === "string" ? { face: "checkpointId", value: body.checkpointId } : undefined;
             const run = await runStore.getRun(taskId);
             if (!run) {
                 if (deps.config.directDoorActive) {
@@ -623,6 +659,7 @@ export async function handleApprovalsAssistant(req, res, match, ctx) {
                 const hdr = (n) => { const h = req.headers[n]; return Array.isArray(h) ? h[0] : h; };
                 const proof = verifyDirectDoorProof({ jwt: hdr(PRINCIPAL_TOKEN_HEADER), mac: hdr(APPROVAL_MAC_HEADER), kid: hdr(APPROVAL_MAC_KID_HEADER) }, buildApprovalEnvelope(run.sessionId, PLAN_REVIEW_PROOF_COVERED_KEYS, {
                     boundCallId: planNonce ?? null,
+                    checkpointId: sighting?.value,
                     decision,
                     editedPlan: decision === "edit" ? editedPlanBinding(body.editedPlan) : null,
                     permissionModeAfter: isPlanApprovePermissionModeAfter(body.permissionModeAfter) ? body.permissionModeAfter : undefined,
@@ -641,7 +678,7 @@ export async function handleApprovalsAssistant(req, res, match, ctx) {
                 sendError(res, 404, "not_found.run", "task not found");
                 return;
             }
-            const plan = await preparePlanReview(run.sessionId, { taskId, principalPresent: principal !== undefined }, { principal: deciderPrincipal, explicitOperator });
+            const plan = await preparePlanReview(run.sessionId, { taskId, principalPresent: principal !== undefined }, { principal: deciderPrincipal, explicitOperator }, sighting);
             if (!plan.ok) {
                 sendResumeOutcome(res, plan.answer, deps.logger);
                 return;
@@ -871,7 +908,19 @@ export async function handleApprovalsAssistant(req, res, match, ctx) {
 }
 const APPROVALS_STREAM_POLL_MS = 3000;
 function approvalsReadFailureOf(err) {
-    return err instanceof StoreCorruptError ? "approvals.read_corrupt" : "approvals.read_unavailable";
+    const fault = storeFaultClassOf(err);
+    switch (fault) {
+        case "corrupt":
+            return "approvals.read_corrupt";
+        case "connection":
+        case "deployment":
+        case "unclassified":
+            return "approvals.read_unavailable";
+        default: {
+            const unhandled = fault;
+            throw new Error(`store fault class without an approvals read answer: ${String(unhandled)}`);
+        }
+    }
 }
 function sendApprovalsReadFailure(req, res, logger, err) {
     logRequestError(logger, req, err);

package/dist/http/routes/capabilities.js

@@ -23,6 +23,7 @@ import { projectWriteProtectionCapability } from "../../write-protection.js";
 import { projectStoreCapability } from "../../store-posture.js";
 import { projectWebSearchCapability } from "../../plugins/web-search.js";
 import { projectExecutionLaneCapability } from "../../capabilities/execution-lane.js";
+import { judgeSandboxGitPlane, sandboxGitPlanePremisesOf } from "../../sandbox-git-plane.js";
 import { MCP_ASSERTION_HEADER_SENT } from "../../mcp-assertion-header.js";
 import { gateCompositeMembers } from "../../capabilities/composite-members.js";
 import { projectApprovalsStreamLiveCapability } from "../../capabilities/approvals-push.js";
@@ -88,7 +89,14 @@ export async function handleCapabilities(req, res, match, ctx) {
                 approvalReadRootGrant: facts.readRootGrant(deps).available,
                 sessions: facts.sessionAuditView(deps).available,
                 deviceExecutor: facts.deviceLane(deps).available
-                    ? { enabled: true, protocolVersion: DEVICE_PROTOCOL_VERSION, maxInflightPerDevice: deps.config.remoteExec?.provider === "device" ? (deps.config.remoteExec.maxInflightPerDevice ?? 4) : 4, wsPath: DEVICE_WS_PATH, management: facts.deviceManagement(deps).available }
+                    ? {
+                        enabled: true,
+                        protocolVersion: DEVICE_PROTOCOL_VERSION,
+                        maxInflightPerDevice: deps.config.remoteExec?.provider === "device" ? (deps.config.remoteExec.maxInflightPerDevice ?? 4) : 4,
+                        wsPath: DEVICE_WS_PATH,
+                        management: facts.deviceManagement(deps).available,
+                        ...(deps.config.remoteExec?.provider === "device" && deps.config.remoteExec.relayUrl !== undefined ? { relayUrl: deps.config.remoteExec.relayUrl } : {}),
+                    }
                     : false,
                 sessionEvents: facts.sessionEventStream(deps).available,
                 fleet: facts.fleetStream(deps).available
@@ -180,6 +188,7 @@ export async function handleCapabilities(req, res, match, ctx) {
                 approvalFrameFamilies: [...facts.approvalFrameFamilies(streamApprovalFact)],
                 approvalDecisionNote: true,
                 approvalDecidedBy: true,
+                planReviewCheckpointId: true,
                 permissionModes: [...PERMISSION_MODES],
                 sessionReadRedaction: true,
                 sideQuery: true,
@@ -224,6 +233,7 @@ export async function handleCapabilities(req, res, match, ctx) {
                 configCatalog: facts.configCatalog(deps).available,
                 sealedKey: projectSealedKeyCapability(deps.sealedKeyPublic),
                 workspaceSync: ((space, cache) => space.available || cache.available ? { ...(space.available ? space.policy : {}), ...(cache.available ? { cache: cache.cache } : {}) } : undefined)(facts.workspaceSpace(deps.config), facts.workspaceCache(deps.config)),
+                credentialPlane: { sandboxGit: deps.sandboxGitPlane ?? judgeSandboxGitPlane(sandboxGitPlanePremisesOf(deps.config, {})) },
             }));
             return;
         }

package/dist/http/routes/mcp-reconnect.d.ts

@@ -26,7 +26,7 @@
  *
  * ── 下一步动作按 `status`,不解析 `reason`(core [ref] 键表逐字)────────────────────────────────
  * `status.errorCode` / `status.httpStatus` 是机器面(`http_status` 401 是一扇重新授权的门,`spawn_failed` 是
- * 缺二进制);`reason` 是**人读**的一句话,经本仓 `redactSecrets` + 定长截断后投出(它可能嵌远端文本),
+ * 缺二进制);`reason` 是**人读**的一句话(它可能嵌远端文本:引擎铸点抹过请求回显与同主体词表,本仓那一遍只读引擎没抹的段、定长截断后投出 —— `http/mcp-remote-text.ts`),
  * 消费端**不许**解析它。名册**按 `tools` 的在场性**投成 `toolNames`(present-iff),**不按 `outcome`**。
  *
  * ── 查找与拒绝形(与 steer / capture-optout **同一只**,不新造)───────────────────────────────────

package/dist/http/routes/mcp-reconnect.js

@@ -1,6 +1,5 @@
 import { z } from "zod";
 import { isParkedRunStatus, isTerminalRunStatus, runProvenElsewhere } from "../../plugins/store-contracts.js";
-import { redactSecrets } from "../../trace/redact.js";
 import { DeadlineExceeded, MCP_DIAL_DEADLINE_MS, raceDeadline } from "../mcp-dial-deadline.js";
 import { sendJson, sendError } from "../send.js";
 import { gatedPrincipal, explicitOperatorOk, sendPrincipalRefusal } from "../principal-gate.js";
@@ -8,9 +7,8 @@ import {} from "../route-ctx.js";
 import { assertNever, SESSION_NOT_FOUND_MESSAGE } from "../route-ctx.js";
 import * as facts from "../../capability-facts.js";
 import { sessionOwnerCellOf } from "../../security.js";
+import { redactMcpRemoteText } from "../mcp-remote-text.js";
 const BodySchema = z.object({ server: z.string().min(1).max(190) }).strict();
-const NEUTRALIZED_TEXT_MAX = 200;
-const humanText = (s) => redactSecrets(s).slice(0, NEUTRALIZED_TEXT_MAX);
 function outcomeOf(coreOutcome) {
     switch (coreOutcome) {
         case "reconnected": return "accepted";
@@ -27,7 +25,7 @@ function projectStatus(s) {
         ...(s.httpStatus !== undefined ? { httpStatus: s.httpStatus } : {}),
         ...(s.delivered !== undefined ? { delivered: s.delivered } : {}),
         ...(s.serverInfo !== undefined ? { serverInfo: s.serverInfo } : {}),
-        ...(s.error !== undefined ? { error: humanText(String(s.error)) } : {}),
+        ...(s.error !== undefined ? { error: redactMcpRemoteText(String(s.error)) } : {}),
         ...(s.transportClosed !== undefined ? { transportClosed: s.transportClosed } : {}),
     };
 }
@@ -36,7 +34,7 @@ function projectListingIncomplete(l) {
         reason: l.reason,
         pages: l.pages,
         ...(l.budgetMs !== undefined ? { budgetMs: l.budgetMs } : {}),
-        ...(l.error !== undefined ? { error: humanText(l.error) } : {}),
+        ...(l.error !== undefined ? { error: redactMcpRemoteText(l.error) } : {}),
     };
 }
 function projectResult(r) {
@@ -48,7 +46,7 @@ function projectResult(r) {
         added: r.added,
         removed: r.removed,
         ...(r.tools !== undefined ? { toolNames: r.tools.map((t) => t.name) } : {}),
-        ...(r.reason !== undefined ? { reason: humanText(r.reason) } : {}),
+        ...(r.reason !== undefined ? { reason: redactMcpRemoteText(r.reason) } : {}),
         ...(r.status !== undefined ? { status: projectStatus(r.status) } : {}),
         ...(r.listingIncomplete !== undefined ? { listingIncomplete: projectListingIncomplete(r.listingIncomplete) } : {}),
     };
@@ -114,7 +112,7 @@ export async function handleMcpReconnect(req, res, match, ctx) {
                     const msg = e instanceof Error ? e.message : String(e);
                     switch (code) {
                         case "mcp.reconnect_unavailable":
-                            sendJson(res, 200, { taskId: activeTaskId, sessionId, server, outcome: "unsupported", reason: humanText(msg) });
+                            sendJson(res, 200, { taskId: activeTaskId, sessionId, server, outcome: "unsupported", reason: redactMcpRemoteText(msg) });
                             return;
                         case "steering.invalid_content":
                             sendError(res, 422, "steering.invalid_content", msg);