@sema-agent/server 7.146.0 → 7.147.0

package/dist/http/principal-gate.d.ts

@@ -186,24 +186,13 @@ export type OperatorRoster = Pick<ServiceConfig, "operatorPrincipals" | "operato
  *  · 名单非空 ⇒ 验过的主体在名单里才是;
  *  · 单用户形显式声明 `OPERATOR_SINGLE_USER=true` ⇒ 这台部署的**每个调用方**都是(单用户形只有一位用户,能到这台部署的就是他;边界是部署自己的
  *    凭据门 —— 没配凭据的部署上,能连上端口的都是)。声明只在单用户形成立(起服不变量)。
- * `principal` 必须是验过的身份(`gatedPrincipal`),绝不是自述头。全部运维面(审批队列、steer.trusted、记忆运维口、bake 门……)读这一只;
+ * `principal` 必须是验过的身份(`gatedPrincipal`),绝不是自述头。全部运维面(审批队列、steer / interrupt / wake 的属主门旁路、记忆运维口、bake 门……)读这一只 —— 只答授权;
+ * 送话口的文本框架(`trusted`)从不读它(调用方的话恒 `trusted: false`,见 `routes/runs.ts` steer 口的注);
  * 🔴 SINGLE mint point (E1):不要再造兄弟。
  */
 export declare function explicitOperatorOk(principal: string | undefined, roster: OperatorRoster): boolean;
-/** 「这台部署**有没有**运维」的唯一读法(名单非空 ∨ 单用户声明在场)—— 能力事实 `operatorLane`、整理阀门的可达性告警、起服提示同读这一只。 */
+/** 「这台部署**有没有**运维」的唯一读法(名单非空 ∨ 单用户声明在场)—— 能力事实 `operatorLane` 读这一只(整理阀门的可达性告警随本条退役)。单用户形上,装了运维面的进程里它恒真(`operator-declaration-required`:服务进程起服第 1 段、`createHttpServer` 对不声明的单用户形拒),多租形上空名单 ⇒ 假。 */
 export declare function operatorRosterPresent(roster: OperatorRoster): boolean;
-/**
- * 起服提示([ref]):单用户形(`REQUIRE_PRINCIPAL` 未开)+ 没有运维名册 ⇒ 一行 warn。「空名单 = 人人是」那条读法退役之后这一形没有运维:
- * 运维口(诊断 `GET /v1/diagnostics/wiring` —— 每台 main.ts 装起来的部署都挂着它 —— 、`GET /v1/outcomes`、管理与记忆治理口)对谁都答 501,
- * 审批队列(挂着时)只给每个调用方看自己的;补回它们只要一行配置 —— 不拒启:升级那一拍打掉一台今天跑得好好的单用户机器比一条提示重。
- * 多租形不提示(它另有拒启不变量)。
- */
-export declare function buildOperatorUndeclaredNotice(config: OperatorRoster & Pick<ServiceConfig, "requirePrincipal">): {
-    event: "operator_undeclared_single_user";
-    fields: {
-        detail: string;
-    };
-} | undefined;
 /**
  * 起服一行:部署声明 `SERVICE_TOKEN_ACTS_FOR_DEPLOYMENT=false` ⇒ `service_token_posture { actsForDeployment: false }`(info);缺省不打。
  * 声明形让运维面板开位当天成片 401,而「位关了」与「token 错了」在 wire 上同体(反探测律),这一行是起服时唯一一处说清这台部署选了哪一读法的地方。

package/dist/http/principal-gate.js

@@ -209,19 +209,6 @@ export function explicitOperatorOk(principal, roster) {
 export function operatorRosterPresent(roster) {
     return roster.operatorSingleUser === true || roster.operatorPrincipals.length > 0;
 }
-export function buildOperatorUndeclaredNotice(config) {
-    if (config.requirePrincipal === true || operatorRosterPresent(config))
-        return undefined;
-    return {
-        event: "operator_undeclared_single_user",
-        fields: {
-            detail: "this single-user deployment declares no operator: OPERATOR_PRINCIPALS is empty and OPERATOR_SINGLE_USER is not set, so no caller is an operator — " +
-                "operator-only endpoints such as GET /v1/diagnostics/wiring, GET /v1/outcomes and the admin and memory-governance endpoints answer 501 capability.operator_principals_required to every caller, and " +
-                "the approval queues (GET /v1/approvals, its stream, /v1/assistant/inbox and /v1/assistant/tasks, where mounted) show each caller only its own pending approvals (a caller that sends no principal sees only the anonymous ones - the cards and tasks that were submitted without a principal - never a named principal's) and ignore ?owner=. " +
-                "To act as this deployment's operator, add one line: OPERATOR_SINGLE_USER=true",
-        },
-    };
-}
 export function buildServiceTokenPostureNotice(config) {
     if (serviceTokenDeclaredActsForDeployment(config))
         return undefined;

package/dist/http/request-guards.d.ts

@@ -23,7 +23,7 @@ import { type SqlWallSource, type SqlWallsReading } from "../plugins/sql-driver.
  *
  * 🔴 **包墙腿是同一只规则的提前一跑,不是第二套规则**([ref] 主会话裁定):包墙是物理连接的事实(会话值,连接建立时从全局拷一份、此后不变),
  * 终判在将要执行写入的那条连接上 —— 那是库自己(续跑输入那一笔被拒 ⇒ 店的带码拒 ⇒ 同一个 413;会话日志那一笔走它既有的失败面);SQL 快照 blob 则由
- * `blob-backend.ts` 经 `connectJudged` 在写入连接上判。受理时手里没有那条连接,判官 `sqlWallsOf` 读的 `facts` 是池里**最近一次初始化**的那条连接的读数
+ * 店的 blob 索引(`stores-sql/blob-index-sql.ts`)经 `connectJudged` 在写入连接上判。受理时手里没有那条连接,判官 `sqlWallsOf` 读的 `facts` 是池里**最近一次初始化**的那条连接的读数
  * (`SqlDriver.facts`:池见过的最新读数,只在有连接初始化时才更新),同一个折算 `packetWallStatementBytes`:拒 ⇒ 413 在任何副作用之前;收 ⇒ 写入那条连接上的判决仍是终判。
  * 这个读数是**缓存**,DBA 调了全局值之后、下一条连接初始化之前,它与库此刻的值两个方向都可能不一致:调大 ⇒ 受理口仍按旧的小值拒(新墙本装得下的体也 413,
  * 直到有连接按新值初始化 —— 快照 blob 的旧连接自换就会带来一条);调小 ⇒ 受理口按旧的大值放行,写入那条连接上的库再拒(续跑输入那一笔 = 同一个 413)。

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

@@ -12,13 +12,13 @@
  * (`RunRegistry` / `RouteHelpers` / `RouteLegs` / `ReturnType<typeof createRequestGuards>`),不手抄签名 ⇒ 不会漂。
  */
 import type { IncomingMessage } from "node:http";
-import { CheckpointError, type QuestionAnswer, type CheckpointToken } from "@sema-agent/core";
+import { CheckpointError, type QuestionAnswer, type CheckpointToken, type PendingSteerInput } from "@sema-agent/core";
 import type { DecideBinding, DecidedAction } 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, PreparedPlanReview, ResumeLegOutcome, WorkflowDecisionDelivery } from "./route-ctx.js";
+import type { RouteCtxBase, DriveResumeArgs, PreparedPlanReview, RememberSessionRequest, ResumeCheckpointOutcome, ResumeLegOutcome, WorkflowDecisionDelivery } from "./route-ctx.js";
 import type { RunRegistry, RouteHelpers, RouteLegs } from "./route-ctx.js";
 import type { createRequestGuards } from "./request-guards.js";
 import type { FlatServiceDeps } from "./server.js";
@@ -75,13 +75,10 @@ export declare function createResumeLegs(ctx: {
     runnerFor: FlatServiceDeps["runnerFor"];
 } & RunRegistry & RouteHelpers & Pick<RouteLegs, "prepareSpec" | "finalizeTaskResult"> & Pick<ReturnType<typeof createRequestGuards>, "ownerCostQuotaDenied" | "ownerFleetLeaseDenied" | "usageWindowDenialFor">): {
     routeCtxBase: RouteCtxBase;
-    resumeCheckpoint: (sessionId: string, decision: "approve" | "deny", reason: string | undefined, hostDecision: HostDecision, req: IncomingMessage | undefined, answer: QuestionAnswer | undefined, binding: DecideBinding, onResumeCommitted?: (grant: {
-        overrideSessionId?: string;
-        rememberableToolName: string | null;
-    }) => Promise<void>, acceptEarly?: boolean, decider?: {
+    resumeCheckpoint: (sessionId: string, decision: "approve" | "deny", reason: string | undefined, hostDecision: HostDecision, req: IncomingMessage | undefined, answer: QuestionAnswer | undefined, binding: DecideBinding, remember?: RememberSessionRequest, acceptEarly?: boolean, decider?: {
         principal?: string;
         explicitOperator: boolean;
-    }, restatement?: ResumeRestatement) => Promise<ResumeLegOutcome>;
+    }, restatement?: ResumeRestatement) => Promise<ResumeCheckpointOutcome>;
     driveResumeIntoRunLog: (args: DriveResumeArgs) => Promise<ResumeLegOutcome>;
     driveResumeLeg: (args: DriveResumeArgs, onAccepted?: (receipt: {
         status: number;
@@ -96,14 +93,14 @@ export declare function createResumeLegs(ctx: {
         explicitOperator: boolean;
     }, restatement?: ResumeRestatement) => Promise<ResumeLegOutcome>;
     startFreshHostTurn: (sessionId: string, objective: string, principal: string | undefined, req: IncomingMessage, workflowDecision: WorkflowDecisionDelivery, runId: string, restatement?: ResumeRestatement) => Promise<ResumeLegOutcome>;
-    resumeWake: (sessionId: string, message: string | undefined, caller: string | undefined, req: IncomingMessage | undefined, acceptEarly?: boolean, workflowDecision?: WorkflowDecisionDelivery, ownerLeaseAdmittedFor?: string, restatement?: ResumeRestatement) => Promise<ResumeLegOutcome>;
+    resumeWake: (sessionId: string, message: PendingSteerInput | undefined, caller: string | undefined, req: IncomingMessage | undefined, acceptEarly?: boolean, workflowDecision?: WorkflowDecisionDelivery, ownerLeaseAdmittedFor?: string, restatement?: ResumeRestatement) => Promise<ResumeLegOutcome>;
     preparePlanReview: (sessionId: string, log?: {
         taskId?: string;
         principalPresent?: boolean;
     }, decider?: {
         principal?: string;
         explicitOperator: boolean;
-    }, sighting?: GateSighting) => Promise<{
+    }, sighting?: GateSighting, restatement?: ResumeRestatement) => Promise<{
         readonly ok: false;
         readonly answer: {
             status: number;
@@ -113,7 +110,7 @@ export declare function createResumeLegs(ctx: {
         readonly ok: true;
         readonly prepared: PreparedPlanReview;
     }>;
-    drivePlanReview: (prepared: PreparedPlanReview, decision: "approve" | "edit" | "reject", editedPlan: string | undefined, reason: string | undefined, hostDecision: HostDecision, req: IncomingMessage | undefined, acceptEarly?: boolean, permissionModeAfter?: PlanApprovePermissionModeAfter, restatement?: ResumeRestatement) => Promise<ResumeLegOutcome>;
+    drivePlanReview: (prepared: PreparedPlanReview, decision: "approve" | "edit" | "reject", editedPlan: string | undefined, reason: string | undefined, hostDecision: HostDecision, req: IncomingMessage | undefined, acceptEarly?: boolean, permissionModeAfter?: PlanApprovePermissionModeAfter) => Promise<ResumeLegOutcome>;
     sessionNotifyDoor: import("../session-notify-door.js").SessionNotifyDoor;
 };
 //# sourceMappingURL=resume-legs.d.ts.map

package/dist/http/resume-legs.js

@@ -27,7 +27,7 @@ import { withPrincipal } from "../observability/principal-context.js";
 import { withModelReachScope } from "../model-reach-scope.js";
 import { legFactsOf } from "../leg-facts.js";
 import { createInstructionSelectionLeg } from "../instruction-selection.js";
-import { modelTextEventData, appendParkRow, 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, appendParkRow, turnEndEventData, contextUsageEventData, toolStartEventData, toolEndEventData, taskProgressEventData, taskStartedEventData, taskNotificationEventData, compactedEventData, diagnosticsEventData, brainStatusEventData, steeringInjectedEventData, compactionOutcomeEventData, compactionStartedEventData, workspaceChangedEventData, wiringManifestEventData, toolRosterDeltaEventData, toolDisclosureEventData, humanInputEventData, appendModelUsageDelta, attachModelUsage, createPromptManifestSeat } 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";
@@ -49,13 +49,14 @@ import { createCapabilitiesLocal } from "./routes/capabilities.js";
 import { gatedPrincipal, explicitOperatorOk, runIdentityOf } from "./principal-gate.js";
 import { buildActiveRunConflict, resumeEntryForGate } from "./active-run-conflict.js";
 import { commitExecutionContext, isRootSessionGoneError, resolveExecutionContext, rootSessionAbsentAnswer, stampSpecRoot } from "./execution-context.js";
+import { timeClaim } from "./claim-latency.js";
 import { commitSessionInheritEnv } from "./session-inherit-env.js";
 import { ASK_USER_QUESTION_TOOL_NAME, isApprovalGateKind, isEngineQuestionRow } from "../approval-content-kind.js";
 import { deploymentListAsks } from "../approval.js";
 import { isParkLedgerEventType } from "../trace/ledger-events.js";
 import { readResumeCtx, resumeCtxCorruptAnswer, resumeCtxUnsealableAnswer } from "./resume-ctx-read.js";
 import { objectiveWithheldIn } from "./submit-ctx.js";
-import { buildCheckpointVersionKeys, resumeBlockedByPolicyAnswer, resumeRefusalWithCard, sealCheckpointCtx, storedBodyReplayAnswer, storedBodyReplayLogFields, withPermissionModeRewritten } from "./checkpoint-ctx.js";
+import { buildCheckpointVersionKeys, resumeAssemblyRefusalAnswer, resumeRefusalWithCard, sealCheckpointCtx, storedBodyReplayAnswer, storedBodyReplayLogFields, withPermissionModeRewritten } from "./checkpoint-ctx.js";
 import { refusalBody, resumeRefusalFacts } from "./refusal-body.js";
 import { storedBodyReplayRefusal } from "./stored-body-replay.js";
 import { restateResumeCtx } from "./resume-restatement.js";
@@ -184,13 +185,13 @@ const WIRE_CODE_OF_DECISION_REFUSAL = {
     [APPROVAL_ENDING_CAUSES.ANSWER_INVALID]: "resume_outcome_invalid",
     [APPROVAL_ENDING_CAUSES.OUTCOME_CELL_INVALID]: "resume_outcome_invalid",
 };
-const UNCLASSIFIED_INVALID_OUTCOME_CODE = WIRE_CODE_OF_DECISION_REFUSAL[APPROVAL_ENDING_CAUSES.BINDING_CHANGED];
 function decisionRefusalCauseOf(e, gate) {
-    if (gate !== "policy_ask")
-        return APPROVAL_ENDING_CAUSES.OUTCOME_CELL_INVALID;
+    if (e.detail?.reason !== undefined)
+        return undefined;
     const field = e.detail?.field;
-    const role = field !== undefined && Object.hasOwn(CHECKPOINT_ERROR_FIELD_ROLE, field) ? CHECKPOINT_ERROR_FIELD_ROLE[field] : undefined;
-    return role === undefined ? undefined : FIELD_ROLE_CAUSE[role];
+    if (field !== undefined)
+        return Object.hasOwn(CHECKPOINT_ERROR_FIELD_ROLE, field) ? FIELD_ROLE_CAUSE[CHECKPOINT_ERROR_FIELD_ROLE[field]] : undefined;
+    return gate === "policy_ask" ? undefined : APPROVAL_ENDING_CAUSES.OUTCOME_CELL_INVALID;
 }
 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)" }) };
@@ -208,14 +209,12 @@ function approvalStaleAnswer(facts) {
         }),
     };
 }
-function rowRefusalMessageOf(verdict, diagnostic) {
-    if (verdict.kind === "ok")
-        return undefined;
-    return diagnostic === undefined ? verdict.sentence : `${verdict.sentence} Diagnostic: ${diagnostic}`;
+function rowRefusalAnswer(verdict, diagnostic, ctx) {
+    const refusal = new CheckpointError(verdict.code, diagnostic === undefined ? verdict.sentence : `${verdict.sentence} Diagnostic: ${diagnostic}`, verdict.reason === undefined ? undefined : { reason: verdict.reason });
+    return checkpointRefusalAnswer(refusal, { gate: "policy_ask", retriable: resumeRefusalDisposition(refusal) === "retriable", versionKeys: refusalVersionKeys(refusal, ctx) });
 }
-function unreadableRowMessageOf(e) {
-    const text = e instanceof Error ? e.message : String(e);
-    return (e instanceof UnreadableCheckpointRowError ? rowRefusalMessageOf(e.rowVerdict, text) : undefined) ?? text;
+function refusalVersionKeys(e, ctx) {
+    return e.code === "checkpoint.unsupported_version" ? buildCheckpointVersionKeys(ctx.writerVersion, serviceVersion()) : {};
 }
 function acceptableFormFacts(detail) {
     const rewritten = detail !== null && typeof detail === "object" ? detail.editRewritten : undefined;
@@ -231,7 +230,7 @@ export function checkpointRefusalAnswer(e, at) {
         status: e.code === "checkpoint.not_found" ? 404 : 409,
         body: refusalBody({
             message: e.message,
-            errorCode: e.code === "checkpoint.invalid_outcome" ? (refusalCause !== undefined ? WIRE_CODE_OF_DECISION_REFUSAL[refusalCause] : UNCLASSIFIED_INVALID_OUTCOME_CODE) : e.code,
+            errorCode: refusalCause === undefined ? e.code : WIRE_CODE_OF_DECISION_REFUSAL[refusalCause],
             facts: {
                 ...(at.taskId !== undefined ? { taskId: at.taskId } : {}),
                 ...resumeRefusalFacts(detail),
@@ -253,8 +252,33 @@ export function createResumeLegs(ctx) {
     const { deps, runnerFor, idemCache, inflightRuns, preemptableRuns, steerableRuns, wakeParkMints, counters, readJson, readRawBody, rateLimited, quotaExceeded, ownerQuotaDenied, leaseDenied, ownerLeaseDenied, usageWindowDenied, admitRun, safeDecode, runOwnerOk, sessionOwnerOk, runSessionAcceptOk, prepareSpec, finalizeTaskResult, ownerCostQuotaDenied, ownerFleetLeaseDenied, usageWindowDenialFor } = ctx;
     const ctxOpening = (sessionId) => ({ sessionId, opener: deps.checkpointCtxSealing });
     const resumeFleetScope = (req, auth) => req ? (gatedPrincipal(req, deps.config) ?? "default") : (auth.principal ?? "default");
-    async function resumeCheckpoint(sessionId, decision, reason, hostDecision, req, answer, binding, onResumeCommitted, acceptEarly, decider, restatement) {
+    function createRememberIntent(sessionId, remember) {
+        let pending;
+        return {
+            laneCannotRecord: remember.laneCannotRecord,
+            record: async (grant) => {
+                if (grant.rememberableToolName !== null)
+                    pending = { sessionId: grant.overrideSessionId ?? sessionId, toolName: grant.rememberableToolName };
+            },
+            settle: async (committed) => {
+                const store = deps.approvalExemptionStore;
+                if (!committed || pending === undefined || store === undefined)
+                    return false;
+                try {
+                    await store.grant(pending.sessionId, pending.toolName, remember.grantedBy);
+                    deps.logger?.info?.("approval_exemption_granted", { sessionId: pending.sessionId, toolName: pending.toolName, grantedBy: remember.grantedBy });
+                    return true;
+                }
+                catch (e) {
+                    deps.logger?.warn?.("approval_exemption_grant_failed", { sessionId: pending.sessionId, toolName: pending.toolName, error: String(e).slice(0, 200) });
+                    return false;
+                }
+            },
+        };
+    }
+    async function resumeCheckpoint(sessionId, decision, reason, hostDecision, req, answer, binding, remember, acceptEarly, decider, restatement) {
         const cs = deps.checkpointStore;
+        const intent = remember !== undefined ? createRememberIntent(sessionId, remember) : undefined;
         const token = await currentApprovalGateToken(cs, sessionId);
         if (binding.checkpointToken && !sightsCurrentGate({ face: "checkpointToken", value: binding.checkpointToken }, token ? { checkpointToken: token } : null)) {
             let seenUnreadable = false;
@@ -302,6 +326,7 @@ export function createResumeLegs(ctx) {
         const ctxPromise = cs.getCtx(sessionId);
         void ctxPromise.catch(() => { });
         const noApproval = { status: 404, body: refusalBody({ errorCode: "not_found.approval", message: "approval not found" }) };
+        const rowOwnRefusal = async (verdict, diagnostic) => rowRefusalAnswer(verdict, diagnostic, verdict.code === "checkpoint.unsupported_version" ? ((await ctxPromise.catch(() => null)) ?? {}) : {});
         let cp;
         try {
             cp = await cpPromise;
@@ -312,7 +337,9 @@ export function createResumeLegs(ctx) {
                 deps.logger?.warn?.("approval_decide_unreadable_row_withheld", { sessionId, note: "row unreadable and the caller's ownership of THAT token is unproven — folded into the uniform 404" });
                 return noApproval;
             }
-            return { status: 409, body: refusalBody({ errorCode: "conflict.checkpoint_unreadable", message: unreadableRowMessageOf(e) }) };
+            if (e instanceof UnreadableCheckpointRowError && e.rowVerdict.kind !== "ok")
+                return rowOwnRefusal(e.rowVerdict, errorText(e));
+            return { status: 409, body: refusalBody({ errorCode: "conflict.checkpoint_unreadable", message: errorText(e) }) };
         }
         if (!cp) {
             if (!(await mayDiscloseRowError(cs, token, decider)))
@@ -328,10 +355,10 @@ export function createResumeLegs(ctx) {
         }
         const decideGateKind = cp.gate?.kind;
         if (!isApprovalGateKind(decideGateKind)) {
+            const verdict = judgeCheckpointRow(cp);
+            if (verdict.kind !== "ok")
+                return rowOwnRefusal(verdict);
             if (typeof decideGateKind !== "string" || decideGateKind === "") {
-                const rowSentence = rowRefusalMessageOf(judgeCheckpointRow(cp));
-                if (rowSentence !== undefined)
-                    return { status: 409, body: refusalBody({ errorCode: "gate_not_tool_approval", message: rowSentence }) };
                 return { status: 409, body: refusalBody({ errorCode: "gate_not_tool_approval", message: "task is suspended on a gate whose kind this engine cannot read, so it cannot say which endpoint resolves it" }) };
             }
             const activeForPath = await deps.runStore?.getActiveTaskId(sessionId).catch(() => undefined);
@@ -379,8 +406,8 @@ export function createResumeLegs(ctx) {
             standingAnswerDurablyRecordable(parkRowStandingAnswerFacts(paForGrant, cp.gate, deps.config, deploymentListAsks(deps.config, { toolName: paForGrant.toolName })))
             ? paForGrant.toolName
             : null;
-        const boundGrant = onResumeCommitted
-            ? (overrideSessionId) => onResumeCommitted({ ...(overrideSessionId !== undefined ? { overrideSessionId } : {}), rememberableToolName: rememberableTool })
+        const boundGrant = intent
+            ? (overrideSessionId) => intent.record({ ...(overrideSessionId !== undefined ? { overrideSessionId } : {}), rememberableToolName: rememberableTool })
             : undefined;
         const lateSettleSink = deps.approvalLateSettle;
         const lateSettleAnchor = lateSettleSink !== undefined && req !== undefined && token
@@ -390,8 +417,8 @@ export function createResumeLegs(ctx) {
                 checkpointTokenHash: buildCheckpointAnchorHash(token),
             }
             : undefined;
-        const noteLateSettleIfAccepted = (out) => {
-            if (lateSettleSink === undefined || lateSettleAnchor === undefined || !decisionCommittedOf(out))
+        const noteLateSettleIfAccepted = (committed) => {
+            if (!committed || lateSettleSink === undefined || lateSettleAnchor === undefined)
                 return;
             try {
                 lateSettleSink.recordLateSettle({ ...lateSettleAnchor, outcome: decision === "approve" ? "allowed" : "denied", decidedBy: hostDecision.decidedBy, ...(hostDecision.approver !== undefined ? { approver: hostDecision.approver } : {}), settledAtMs: Date.now() });
@@ -400,6 +427,11 @@ export function createResumeLegs(ctx) {
                 recordFailOpen("server.approval-ask-audit.append-failed", `kind=late_settle err=${e instanceof Error ? e.message : String(e)}`);
             }
         };
+        const landAfterCommit = async (out) => {
+            const committed = decisionCommittedOf(out);
+            noteLateSettleIfAccepted(committed);
+            return intent === undefined ? out : { ...out, rememberApplied: await intent.settle(committed) };
+        };
         const parkedForkQuotaDenial = req !== undefined ? ownerCostQuotaDenied(decodeCheckpointScope(cp.scope)) : undefined;
         if (parkedForkQuotaDenial)
             return parkedForkQuotaDenial;
@@ -425,7 +457,7 @@ export function createResumeLegs(ctx) {
                 binding: { ...(({ checkpointToken: _staleGuardOnly, ...rest }) => rest)(binding), ...action },
                 ...(answer !== undefined ? { answer } : {}),
                 ...(restatement !== undefined ? { restatement } : {}),
-                ...(boundGrant ? { grantRemember: (rootSessionId) => boundGrant(rootSessionId) } : {}),
+                ...(boundGrant && intent ? { remember: { anchor: (rootSessionId) => boundGrant(rootSessionId), laneCannotRecord: intent.laneCannotRecord } } : {}),
             };
             if (origin?.kind === "background" && parkedAgentStore !== undefined && parkedSurface !== undefined) {
                 const parked = await withPrincipal(decodeCheckpointScope(cp.scope), () => decideParkedAgent({
@@ -446,7 +478,7 @@ export function createResumeLegs(ctx) {
                                 if (isRootSessionGoneError(e))
                                     return { ok: false, gone: true };
                                 if (e instanceof HttpError)
-                                    return { ok: false, gone: false, answer: resumeRefusalWithCard(resumeBlockedByPolicyAnswer(httpErrorRefusal(e)), true) };
+                                    return { ok: false, gone: false, answer: resumeRefusalWithCard(resumeAssemblyRefusalAnswer(e.status, httpErrorRefusal(e)), true) };
                                 throw e;
                             }
                             const occupant = ctx.occupant;
@@ -460,8 +492,7 @@ export function createResumeLegs(ctx) {
                     ...(deps.logger ? { warn: parkWarn } : {}),
                 }, { ...parkedReq, selectedGate: captureSelectedGate() }, { handle: origin.handle, row: origin.row }));
                 void ctxPromise.catch(() => { });
-                noteLateSettleIfAccepted(parked);
-                return parked;
+                return await landAfterCommit(parked);
             }
             if (origin?.kind === "workflow_parks_unreadable") {
                 void ctxPromise.catch(() => { });
@@ -512,7 +543,7 @@ export function createResumeLegs(ctx) {
                 const admittedPayer = decodeCheckpointScope(cp.scope);
                 const out = hostToken
                     ? await resumeWake(plan.hostSessionId, plan.message, decider?.principal, req, acceptEarly, delivery, admittedPayer, restatement)
-                    : await startFreshHostTurn(plan.hostSessionId, plan.message, admittedPayer, req, delivery, plan.runId, restatement);
+                    : await startFreshHostTurn(plan.hostSessionId, plan.message.text, admittedPayer, req, delivery, plan.runId, restatement);
                 if (recordFailure !== undefined)
                     throw recordFailure.err;
                 if (acceptedTaskIdOf(out) === undefined)
@@ -557,8 +588,7 @@ export function createResumeLegs(ctx) {
             };
             const verifyRounds = verifyRoundsFromBody(ctx.body);
             const driven = await driveResumeIntoRunLog({ peerLease: resolved.peerLease, execution: resolved.execution, runner: resolved.runner, legFacts: resolved.legFacts, token, sessionId: cp.sessionId, principal: auth.principal, fleetScope: resumeFleetScope(req, auth), taskConfig, resumeObjective, outcome, commitment: { kind: "gate_resolved", ...captureSelectedGate() }, verifyRounds, resumeCtx: { sessionId, ctx }, ...(engineNotices.length > 0 ? { engineNotices } : {}), ...(boundGrant ? { onResumeCommitted: boundGrant } : {}), ...(acceptEarly === true ? { acceptEarly: true } : {}), ...(req !== undefined ? { callerInitiated: true } : {}), ...(ownerLeaseAdmittedHere ? { ownerLeaseAdmitted: true } : {}) });
-            noteLateSettleIfAccepted(driven);
-            return driven;
+            return await landAfterCommit(driven);
         }
         finally {
             resolved.peerLease.release();
@@ -597,7 +627,7 @@ export function createResumeLegs(ctx) {
         catch (e) {
             lease.release();
             if (e instanceof HttpError) {
-                return { ok: false, answer: resumeRefusalWithCard(resumeBlockedByPolicyAnswer(httpErrorRefusal(e)), true) };
+                return { ok: false, answer: resumeRefusalWithCard(resumeAssemblyRefusalAnswer(e.status, httpErrorRefusal(e)), true) };
             }
             throw e;
         }
@@ -661,11 +691,11 @@ export function createResumeLegs(ctx) {
         }
         if (!taskId && args.mintFreshRun && deps.runStore) {
             const freshId = uuidv7();
-            const created = await deps.runStore.createRun(freshId, sessionId, principal ?? null, deps.instanceId ?? "default", {
+            const created = await timeClaim(deps.metrics, "run_claim", deps.runStore.createRun(freshId, sessionId, principal ?? null, deps.instanceId ?? "default", {
                 source: args.mintFreshRun.source,
                 identity: args.mintFreshRun.identity,
                 objectivePreview: heldObjective === undefined ? null : buildRunObjectivePreview(heldObjective),
-            });
+            }));
             if (created.existing) {
                 throw new Error(`wake fresh run: createRun observed an existing row for the freshly minted taskId ${freshId} (no idempotency key was sent) — refusing to treat it as a busy session`);
             }
@@ -751,7 +781,7 @@ export function createResumeLegs(ctx) {
             return { reopened: pending, leg };
         };
         let resumeHeartbeat;
-        let resumeManifestLease = 0;
+        let resumeManifestSeat;
         let resumeStreamRef;
         let resumeLegLive = false;
         const subagentHandleEvictions = [];
@@ -787,7 +817,7 @@ export function createResumeLegs(ctx) {
             }, HEARTBEAT_MS);
             resumeHeartbeat.unref?.();
             deps.modelUsage?.register(taskId);
-            resumeManifestLease = deps.promptManifests?.register(taskId) ?? 0;
+            resumeManifestSeat = createPromptManifestSeat(deps.promptManifests, taskId);
         }
         if (args.workflowDecision !== undefined && taskId === undefined) {
             throw new Error("workflow decision delivery: no run row was claimed for the delivering leg — refusing to start a delivery whose decision could not be recorded against it");
@@ -899,7 +929,7 @@ export function createResumeLegs(ctx) {
                         const rs2 = deps.runStore;
                         try {
                             const ap = vAppend;
-                            await appendPromptManifest(ap, deps.promptManifests, taskId);
+                            await resumeManifestSeat?.drain(ap);
                             if (reSuspended || vrReopened) {
                                 const vrParkCallId = reSuspended ? await parkToolCallId(vr, deps.checkpointStore) : undefined;
                                 await appendParkRow(ap, { modelUsage: deps.modelUsage, taskId }, reParkEvent ?? reparkStatus, { terminal: vrPaused, ...(vrParkCallId !== undefined ? { toolCallId: vrParkCallId } : {}) }, vrReopened ? (failureCodeOf(vr.terminal) ?? null) : undefined);
@@ -947,7 +977,7 @@ export function createResumeLegs(ctx) {
                     ? async (eventId) => { const leaf = (await headOf(sessionId))?.leafId; if (leaf)
                         await deps.resumeAnchorStore.put(sessionId, eventId, leaf, anchorOwner); }
                     : undefined;
-                const captureUserMessageAnchor = deps.resumeAnchorStore && taskId
+                const captureUserMessageAnchor = deps.resumeAnchorStore && taskId && freshRunClaimed
                     ? async (entryId) => { await deps.resumeAnchorStore.put(sessionId, taskId, entryId, anchorOwner); }
                     : undefined;
                 const anchor = new TurnAnchorCapture(captureTurnAnchor, "resume", captureUserMessageAnchor);
@@ -1048,7 +1078,7 @@ export function createResumeLegs(ctx) {
                         fleetPub?.onEvent(ev);
                         await deps.userInputLedger?.observeLegEvent(stream, ev);
                         await resumeWorkspace.observe(ev);
-                        await appendPromptManifest(append, deps.promptManifests, taskId);
+                        await resumeManifestSeat?.drain(append);
                         switch (ev.type) {
                             case "text_delta":
                                 block += ev.delta;
@@ -1256,7 +1286,7 @@ export function createResumeLegs(ctx) {
                         settleFleet("failed");
                     }
                 }
-                return checkpointRefusalAnswer(e, { gate: outcome.gate, retriable, ...(taskId !== undefined ? { taskId } : {}), versionKeys: e.code === "checkpoint.unsupported_version" ? buildCheckpointVersionKeys(resumeCtx.ctx.writerVersion, serviceVersion()) : {} });
+                return checkpointRefusalAnswer(e, { gate: outcome.gate, retriable, ...(taskId !== undefined ? { taskId } : {}), versionKeys: refusalVersionKeys(e, resumeCtx.ctx) });
             }
             const thrownCause = cancelCtrl.cause();
             if (thrownCause !== undefined) {
@@ -1290,7 +1320,7 @@ export function createResumeLegs(ctx) {
                 for (const evict of subagentHandleEvictions)
                     evict();
                 deps.modelUsage?.clear(taskId);
-                deps.promptManifests?.clear(taskId, resumeManifestLease);
+                resumeManifestSeat?.release();
             }
             if (resumeHeartbeat)
                 clearInterval(resumeHeartbeat);
@@ -1497,10 +1527,9 @@ export function createResumeLegs(ctx) {
         if (gateKind !== "task_done") {
             return { status: 409, body: refusalBody({ errorCode: "wake.gate_pending", message: `cannot wake: this session is waiting on a pending gate decision (gate "${gateKind ?? "unknown"}") — resolve it through its own decide entry` }) };
         }
-        const trusted = operator;
         if (message !== undefined) {
             try {
-                validatePendingSteer({ text: message, trusted });
+                validatePendingSteer(message);
             }
             catch (e) {
                 if (e instanceof CheckpointError && e.code === "steering.invalid_content") {
@@ -1535,7 +1564,7 @@ export function createResumeLegs(ctx) {
                 fleetScope: resumeFleetScope(req, auth),
                 taskConfig,
                 resumeObjective,
-                outcome: { gate: "wake", ...(message !== undefined ? { message: { text: message, trusted } } : {}) },
+                outcome: { gate: "wake", ...(message !== undefined ? { message } : {}) },
                 commitment: { kind: "delivered" },
                 verifyRounds: undefined,
                 resumeCtx: { sessionId, ctx },
@@ -1551,7 +1580,7 @@ export function createResumeLegs(ctx) {
             resolved.peerLease.release();
         }
     }
-    async function preparePlanReview(sessionId, log, decider, sighting) {
+    async function preparePlanReview(sessionId, log, decider, sighting, restatement) {
         const cs = deps.checkpointStore;
         const refuse = (answer) => ({ ok: false, answer });
         const log404 = (r) => deps.logger?.info?.("decide_404", {
@@ -1623,14 +1652,14 @@ export function createResumeLegs(ctx) {
             return refuse(resumeCtxUnsealableAnswer(ctxRead));
         if (ctxRead.kind === "absent")
             return refuse({ status: 409, body: refusalBody({ errorCode: "conflict.resume_context_unavailable", message: "resume context missing — cannot rebuild task config" }) });
-        const replay = storedBodyReplayRefusal(ctxRead.ctx, deps.config);
+        const ctx = restateResumeCtx(ctxRead.ctx, restatement);
+        const replay = storedBodyReplayRefusal(ctx, deps.config);
         if (replay !== undefined)
             return refuse(refuseStoredBodyReplay(sessionId, replay));
-        return { ok: true, prepared: { sessionId, token, cp, ctx: ctxRead.ctx } };
+        return { ok: true, prepared: { sessionId, token, cp, ctx } };
     }
-    async function drivePlanReview(prepared, decision, editedPlan, reason, hostDecision, req, acceptEarly, permissionModeAfter, restatement) {
-        const { sessionId, token, cp } = prepared;
-        const ctx = restateResumeCtx(prepared.ctx, restatement);
+    async function drivePlanReview(prepared, decision, editedPlan, reason, hostDecision, req, acceptEarly, permissionModeAfter) {
+        const { sessionId, token, cp, ctx } = prepared;
         if ((await deps.checkpointStore.findPendingTokenBySession(sessionId, undefined, { gateKinds: ["plan_review"] })) !== token)
             return notResumableAnswer();
         const auth = { sessionId: cp.sessionId, principal: decodeCheckpointScope(cp.scope), memoryScope: ctx.memoryScope };

package/dist/http/rewind-files-reply.d.ts

@@ -0,0 +1,34 @@
+/**
+ * run 外回退口 `POST /v1/sessions/:id/rewind-files` 的 200 体 —— 引擎 `Runner.rewindFiles` 的结果(`RewindFilesResult`)**原形**,文本叶经出口座出门。
+ *
+ * 规则一句:形照引擎(`dryRun:true` ⇒ `{ preview }`,`null` 仍是 `null`;`dryRun:false` ⇒ `{ restore }` 台账,空数组仍是空数组),每一片自由文本叶只经
+ * {@link seatText} 的一行 —— 被跟踪文件的路径(台账 `filesChanged` / `identicalSkipped` / `refused[].path` / `failed[].path`、预览 `filesChanged`;源头是模型交的
+ * 路径参数)走 `rewind-ledger-path`(不设界:截过的路径就不是那个文件了);拒因 / 故障句(`refused[].reason` / `failed[].reason` / `error.message`)走
+ * `rewind-ledger-reason`;闭集词 / 计数逐字。台账上的店故障(core `FileHistoryError`)按本仓错误体的唯一机读键律出门:引擎的 `code` 成员在 wire 上叫
+ * `errorCode`(值逐字),`message` 经座,`permanence` 逐字 —— 本仓的 wire 上没有叫 `code` 的错误键。两张叶表与故障的三键按 core 型的键穷举 ——
+ * core 给台账 / 统计 / 故障加一格而这里不表态 ⇒ tsc 红;表外的运行期键不出门(按表取键,不展开原对象)。唯一调用方 = `http/routes/sessions.ts` 的 `session-rewind-files` 臂。
+ */
+import type { FileHistoryDiffStats, FileHistoryError, FileHistoryRestoreResult, RewindFilesResult } from "@sema-agent/core";
+/** 台账上的店故障在 wire 上的形:码键 = `errorCode`(本仓错误体的唯一机读键),其余两键同引擎。 */
+export interface RewindLedgerError {
+    readonly errorCode: FileHistoryError["code"];
+    readonly message: string;
+    readonly permanence?: FileHistoryError["permanence"];
+}
+/** 台账在 wire 上的形 = 引擎台账,`error` 换成 {@link RewindLedgerError}。 */
+export type RewindLedgerReply = Omit<FileHistoryRestoreResult, "error"> & {
+    readonly error?: RewindLedgerError;
+};
+/** 200 体在 wire 上的形(引擎 `RewindFilesResult`,台账的 `error` 按 {@link RewindLedgerError})。 */
+export type RewindFilesReply = {
+    readonly dryRun: true;
+    readonly preview: FileHistoryDiffStats | null;
+} | {
+    readonly dryRun: false;
+    readonly restore: RewindLedgerReply & {
+        readonly outcome: "complete" | "partial";
+    };
+};
+/** 200 体(纯数据)。 */
+export declare function buildRewindFilesReply(result: RewindFilesResult): RewindFilesReply;
+//# sourceMappingURL=rewind-files-reply.d.ts.map

package/dist/http/rewind-files-reply.js

@@ -0,0 +1,36 @@
+import { seatText } from "../trace/exit-seat.js";
+function applyLeafTable(obj, table) {
+    const out = {};
+    for (const key of Object.keys(table)) {
+        const v = obj[key];
+        if (v !== undefined && v !== null)
+            out[key] = table[key](v);
+    }
+    return out;
+}
+const pathLeaf = (p) => seatText("rewind-ledger-path", p);
+const reasonLeaf = (t) => seatText("rewind-ledger-reason", t);
+function ledgerErrorOf(e) {
+    return { errorCode: e.code, message: reasonLeaf(e.message), ...(e.permanence !== undefined ? { permanence: e.permanence } : {}) };
+}
+const RESTORE_LEDGER_LEAVES = {
+    outcome: (v) => v,
+    filesChanged: (v) => v.map(pathLeaf),
+    identicalSkipped: (v) => v.map(pathLeaf),
+    refused: (v) => v.map((f) => ({ path: pathLeaf(f.path), reason: reasonLeaf(f.reason), class: f.class })),
+    failed: (v) => v.map((f) => ({ path: pathLeaf(f.path), reason: reasonLeaf(f.reason) })),
+    modeNotPreserved: (v) => v,
+};
+const DIFF_STATS_LEAVES = {
+    filesChanged: (v) => v.map(pathLeaf),
+    insertions: (v) => v,
+    deletions: (v) => v,
+};
+export function buildRewindFilesReply(result) {
+    if (result.dryRun)
+        return { dryRun: true, preview: result.preview === null ? null : applyLeafTable(result.preview, DIFF_STATS_LEAVES) };
+    const { error, ...ledger } = result.restore;
+    const projected = applyLeafTable(ledger, RESTORE_LEDGER_LEAVES);
+    return { dryRun: false, restore: { ...projected, outcome: result.restore.outcome, ...(error !== undefined ? { error: ledgerErrorOf(error) } : {}) } };
+}
+//# sourceMappingURL=rewind-files-reply.js.map