@sema-agent/server 7.141.0 → 7.142.0

package/dist/observability/run-terminal.js

@@ -3,7 +3,7 @@ import { redactSecrets } from "../trace/redact.js";
 import { isProviderEchoShape } from "@sema-agent/core";
 import { isModelTextLedgerEventType, isParkLedgerEventType } from "../trace/ledger-events.js";
 import { isUnsuccessfulRunStatus } from "../plugins/store-contracts.js";
-import { mapPauseSeats, PAUSE_SEATS, sealResultForExit } from "../terminal.js";
+import { mapPauseSeats, PAUSE_SEATS, sealResultForExit, sealStoredResult } from "../terminal.js";
 import { errorText } from "./err-text.js";
 import { recordFailOpen } from "./fail-open.js";
 import { toolEndMediaAsDescriptors } from "../trace/tool-output-media.js";
@@ -128,43 +128,138 @@ function shapeEchoMembers(node, table, seat) {
     }
     return out ?? node;
 }
-function shapeEchoRows(rows, table, seat) {
-    if (!Array.isArray(rows))
-        return rows;
-    const next = rows.map((row) => shapeEchoMembers(row, table, seat));
-    return next.every((x, i) => x === rows[i]) ? rows : next;
-}
 const MAX_EDITED_FILES = 1000;
-const RESULT_KEY_TREATMENT = {
-    terminal: "redacted",
-    remoteEnvFailures: "redacted",
-    editedFiles: "redacted",
-    responseModel: "provider-echo",
-    apiFailure: "provider-echo",
-    strandedHumanAnswers: "provider-echo",
+export const RESULT_TEXT_LEAVES = {
     taskId: "verbatim",
     runId: "verbatim",
     sessionId: "verbatim",
     model: "verbatim",
-    compaction: "verbatim",
-    effectiveReasoning: "verbatim",
-    result: "redacted",
-    salvagedOutput: "redacted",
-    retryAfterMs: "verbatim",
-    degraded: "verbatim",
+    "terminal.code": "outward-code",
+    "terminal.message": "error-text",
+    "terminal.reason": "error-text",
+    "terminal.detail": "terminal-detail",
+    "terminal.checkpointId": "verbatim",
+    "terminal.requestedByCallId": "provider-join-key",
+    "terminal.nestedPause.checkpointId": "verbatim",
+    "terminal.nestedPause.requestedByCallId": "provider-join-key",
+    result: "model-text",
+    salvagedOutput: "model-text",
+    "remoteEnvFailures.[].message": "error-text",
+    "rewindNotes.[].message": "error-text",
+    "editedFiles.[].path": "model-text",
+    responseModel: "provider-echo",
+    apiFailure: "api-failure",
+    "strandedHumanAnswers.[]": "stranded-answer",
+    "degraded.from": "verbatim",
+    "degraded.to": "verbatim",
+    "degraded.chain.[]": "verbatim",
+    "effectiveReasoning.endpoint": "verbatim",
+    "resultEntryIds.[]": "verbatim",
+    "pendingApproval.askIds.[]": "verbatim",
+    "effectiveReadDenyPatterns.[].pattern": "verbatim",
+    "effectiveMemoryScopes.writeScope": "verbatim",
+    "effectiveMemoryScopes.scopes.[].scope": "verbatim",
+    "effectiveMemoryScopes.projectKey.scope": "verbatim",
+    "effectiveMemoryScopes.materializedResidue.[]": "verbatim",
     structuredOutput: "verbatim",
-    resultEntryIds: "verbatim",
-    rewindNotes: "redacted",
-    haltedOnUserRejection: "verbatim",
-    haltedByUser: "verbatim",
-    pendingApproval: "verbatim",
-    approvalWaitedMs: "verbatim",
-    effectiveReadFace: "verbatim",
-    effectiveWriteFace: "verbatim",
-    effectiveReadDenyPatterns: "verbatim",
-    effectiveMemoryScopes: "verbatim",
-    stats: "redacted",
+    stats: "stats-tree",
+    "verification.findings.[]": "model-text",
+    "verification.evidence": "model-text",
+    "verification.verifierPause.sessionId": "verbatim",
+    "attempts.[].model": "verbatim",
+    "attempts.[].errorCode": "outward-code",
+    "attempts.[].gateError": "error-text",
+    "attempts.[].diagnostics": "model-text",
+    "cancelContext.lastEventKind": "verbatim",
+    "cancelContext.lastBrainStatus.phase": "verbatim",
+    "cancelContext.lastBrainStatus.errClass": "verbatim",
 };
+const DROP_LEAF = Symbol("drop-leaf");
+function textLeafAct(treatment) {
+    switch (treatment) {
+        case "verbatim":
+        case "provider-join-key":
+        case "outward-code":
+            return undefined;
+        case "model-text":
+            return (v) => (typeof v === "string" ? redactModelText(v) : v);
+        case "error-text":
+            return (v) => (typeof v === "string" ? redactErrorMessage(v) : v);
+        case "provider-echo":
+            return (v, _holder, seat) => (admitProviderEcho(v, seat) ? v : DROP_LEAF);
+        case "stats-tree":
+            return (v) => redactStats(v);
+        case "terminal-detail":
+            return (v, holder) => shapeTerminalDetail(v, holder);
+        case "api-failure":
+            return (v) => shapeEchoMembers(v, API_FAILURE_TREATMENT, "apiFailure");
+        case "stranded-answer":
+            return (v) => shapeEchoMembers(v, STRANDED_ANSWER_TREATMENT, "strandedHumanAnswers[]");
+        default: {
+            const unhandled = treatment;
+            throw new Error(`unhandled text-leaf treatment: ${String(unhandled)}`);
+        }
+    }
+}
+const ACTIVE_TEXT_LEAVES = Object.entries(RESULT_TEXT_LEAVES).flatMap(([seat, treatment]) => {
+    const act = textLeafAct(treatment);
+    return act === undefined ? [] : [{ seat, segments: seat.split("."), act }];
+});
+function mapTextLeaf(node, segments, depth, holder, act, seat) {
+    if (depth === segments.length)
+        return act(node, holder, seat);
+    if (node === null || typeof node !== "object")
+        return node;
+    const segment = segments[depth];
+    if (segment === "[]") {
+        if (!Array.isArray(node))
+            return node;
+        let changed = false;
+        const next = [];
+        for (const el of node) {
+            const n = el === undefined ? el : mapTextLeaf(el, segments, depth + 1, node, act, seat);
+            if (n === DROP_LEAF) {
+                changed = true;
+                continue;
+            }
+            if (!Object.is(n, el))
+                changed = true;
+            next.push(n);
+        }
+        return changed ? next : node;
+    }
+    if (Array.isArray(node))
+        return node;
+    const obj = node;
+    let out;
+    for (const key of segment === "*" ? Object.keys(obj) : Object.hasOwn(obj, segment) ? [segment] : []) {
+        const child = obj[key];
+        if (child === undefined)
+            continue;
+        const n = mapTextLeaf(child, segments, depth + 1, obj, act, seat);
+        if (n === DROP_LEAF)
+            delete (out ??= { ...obj })[key];
+        else if (!Object.is(n, child))
+            (out ??= { ...obj })[key] = n;
+    }
+    return out ?? node;
+}
+function applyResultTextLeaves(result) {
+    let out = result;
+    for (const row of ACTIVE_TEXT_LEAVES)
+        out = mapTextLeaf(out, row.segments, 0, undefined, row.act, row.seat);
+    return out;
+}
+function shapeTerminalDetail(detail, terminal) {
+    const kind = terminal !== null && typeof terminal === "object" ? terminal.kind : undefined;
+    if (kind === "failed")
+        return shapeArmedDetail(detail, TERMINAL_FAILURE_DETAIL_TREATMENT);
+    if (kind === "completed")
+        return shapeArmedDetail(detail, TERMINAL_COMPLETED_DETAIL_TREATMENT);
+    if (kind === "blocked")
+        return shapeTerminalBlockedDetail(detail);
+    return shapeArmedDetail(detail, {});
+}
 const API_FAILURE_TREATMENT = {
     status: "verbatim",
     requestId: "provider-echo",
@@ -209,12 +304,15 @@ function redactStringLeaves(node, depth = 0) {
 }
 const OFF_ARM_MEMBER_TREATMENT = "free-text-tree";
 const redactDetailMember = (v) => redactStringLeaves(v, 1);
-function shapeTerminalFailureDetail(detail) {
+const TERMINAL_COMPLETED_DETAIL_TREATMENT = {
+    finish_reason_unknown: { kind: "verbatim", finishReasonUnknown: "provider-echo" },
+};
+function shapeArmedDetail(detail, arms) {
     if (detail === null || typeof detail !== "object" || Array.isArray(detail))
         return detail;
     const d = detail;
     const kind = d.kind;
-    const arm = typeof kind === "string" && Object.hasOwn(TERMINAL_FAILURE_DETAIL_TREATMENT, kind) ? TERMINAL_FAILURE_DETAIL_TREATMENT[kind] : {};
+    const arm = typeof kind === "string" && Object.hasOwn(arms, kind) ? arms[kind] : {};
     let out;
     for (const key of Object.keys(d)) {
         const v = d[key];
@@ -237,7 +335,7 @@ function shapeTerminalFailureDetail(detail) {
             }
             default: {
                 const unhandled = treatment;
-                throw new Error(`unhandled failure-detail treatment: ${String(unhandled)}`);
+                throw new Error(`unhandled detail-member treatment: ${String(unhandled)}`);
             }
         }
     }
@@ -282,153 +380,60 @@ function shapeTerminalBlockedDetail(detail) {
     }
     return out ?? detail;
 }
-const PROVIDER_ECHO_SHAPERS = {
-    responseModel: (v) => (admitProviderEcho(v, "responseModel") ? v : undefined),
-    apiFailure: (v) => shapeEchoMembers(v, API_FAILURE_TREATMENT, "apiFailure"),
-    strandedHumanAnswers: (v) => shapeEchoRows(v, STRANDED_ANSWER_TREATMENT, "strandedHumanAnswers[]"),
-};
-{
-    const judged = Object.entries(RESULT_KEY_TREATMENT).filter(([, t]) => t === "provider-echo").map(([k]) => k).sort();
-    const wired = Object.keys(PROVIDER_ECHO_SHAPERS).sort();
-    if (judged.join(",") !== wired.join(","))
-        throw new Error(`run-terminal: provider-echo classification [${judged.join(",")}] ≠ shaper table [${wired.join(",")}]`);
-}
 const LEGACY_RESULT_LEAVES = ["errorMessage", "blockedReason", "checkpointGate"];
 export const TREATED_RESULT_LEAVES = [
     ...new Set([
-        ...Object.entries(RESULT_KEY_TREATMENT).filter(([, t]) => t !== "verbatim").map(([k]) => k),
+        ...ACTIVE_TEXT_LEAVES.map((row) => row.segments[0]),
         ...LEGACY_RESULT_LEAVES,
         ...PAUSE_SEATS.map((seat) => seat.path[0]),
+        "editedFiles",
     ]),
 ];
 export function redactTerminalResult(result) {
     if (result === undefined || result === null)
         return result;
-    const r = result;
-    let changed = false;
-    const out = { ...r };
-    if (typeof r.errorMessage === "string") {
-        out.errorMessage = redactErrorMessage(r.errorMessage);
-        changed = true;
-    }
-    if (typeof r.blockedReason === "string") {
-        out.blockedReason = redactErrorMessage(r.blockedReason);
-        changed = true;
-    }
-    if (r.checkpointGate !== undefined) {
-        const legacyGate = redactCheckpointGate(r.checkpointGate);
-        if (legacyGate !== r.checkpointGate) {
-            out.checkpointGate = legacyGate;
-            changed = true;
-        }
-    }
-    if (r.terminal !== null && typeof r.terminal === "object") {
-        const t = r.terminal;
-        let nt;
-        if (t.kind === "failed" && typeof t.message === "string")
-            nt = { ...t, message: redactErrorMessage(t.message) };
-        else if (t.kind === "blocked" && typeof t.reason === "string")
-            nt = { ...t, reason: redactErrorMessage(t.reason) };
-        if (t.kind === "blocked") {
-            const cur = nt ?? t;
-            const detail = cur.detail;
-            const shaped = shapeTerminalBlockedDetail(detail);
-            if (shaped !== detail)
-                nt = { ...cur, detail: shaped };
-        }
-        const base = nt ?? t;
-        if (t.kind === "failed") {
-            const cur = nt ?? base;
-            const detail = cur.detail;
-            const shaped = shapeTerminalFailureDetail(detail);
-            if (shaped !== detail)
-                nt = { ...cur, detail: shaped };
-        }
-        if (nt !== undefined) {
-            out.terminal = nt;
-            changed = true;
-        }
-    }
-    const gated = mapPauseSeats(out, (seat, keys) => {
+    return redactLegacyPlaneLeaves(redactPauseSeatGates(applyResultTextLeaves(capEditedFiles(result))));
+}
+function capEditedFiles(result) {
+    const files = result.editedFiles;
+    if (!Array.isArray(files) || files.length <= MAX_EDITED_FILES)
+        return result;
+    return { ...result, editedFiles: files.slice(0, MAX_EDITED_FILES) };
+}
+function redactPauseSeatGates(result) {
+    return mapPauseSeats(result, (seat, keys) => {
         if (!Object.hasOwn(seat, keys.gate))
             return seat;
         const g = seat[keys.gate];
         const ng = redactCheckpointGate(g);
         return ng === g ? seat : { ...seat, [keys.gate]: ng };
     });
-    if (gated !== out) {
-        Object.assign(out, gated);
-        changed = true;
-    }
-    if (r.remoteEnvFailures !== undefined) {
-        out.remoteEnvFailures = Array.isArray(r.remoteEnvFailures)
-            ? r.remoteEnvFailures.map((f) => (f && typeof f === "object" && typeof f.message === "string" ? { ...f, message: redactErrorMessage(f.message) } : f))
-            : r.remoteEnvFailures;
-        changed = true;
-    }
-    if (r.editedFiles !== undefined) {
-        out.editedFiles = Array.isArray(r.editedFiles)
-            ? r.editedFiles
-                .slice(0, MAX_EDITED_FILES)
-                .map((f) => {
-                if (f === null || typeof f !== "object")
-                    return f;
-                const path = f.path;
-                return typeof path === "string" ? { ...f, path: redactSecrets(path) } : f;
-            })
-            : r.editedFiles;
-        changed = true;
-    }
-    if (typeof r.result === "string") {
-        const next = redactModelText(r.result);
-        if (next !== r.result) {
-            out.result = next;
-            changed = true;
-        }
-    }
-    if (typeof r.salvagedOutput === "string") {
-        const next = redactModelText(r.salvagedOutput);
-        if (next !== r.salvagedOutput) {
-            out.salvagedOutput = next;
-            changed = true;
-        }
+}
+function redactLegacyPlaneLeaves(result) {
+    const r = result;
+    let out;
+    if (typeof r.errorMessage === "string") {
+        const next = redactErrorMessage(r.errorMessage);
+        if (next !== r.errorMessage)
+            (out ??= { ...result }).errorMessage = next;
     }
-    if (r.rewindNotes !== undefined) {
-        out.rewindNotes = Array.isArray(r.rewindNotes)
-            ? r.rewindNotes.map((n) => {
-                if (n === null || typeof n !== "object")
-                    return n;
-                const message = n.message;
-                return typeof message === "string" ? { ...n, message: redactErrorMessage(message) } : n;
-            })
-            : r.rewindNotes;
-        changed = true;
-    }
-    if (r.stats !== undefined) {
-        const next = redactStats(r.stats);
-        if (next !== r.stats) {
-            out.stats = next;
-            changed = true;
-        }
+    if (typeof r.blockedReason === "string") {
+        const next = redactErrorMessage(r.blockedReason);
+        if (next !== r.blockedReason)
+            (out ??= { ...result }).blockedReason = next;
     }
-    const rr = result;
-    for (const [key, shape] of Object.entries(PROVIDER_ECHO_SHAPERS)) {
-        const v = rr[key];
-        if (v === undefined || shape === undefined)
-            continue;
-        const next = shape(v);
-        if (next === v)
-            continue;
-        if (next === undefined)
-            delete out[key];
-        else
-            out[key] = next;
-        changed = true;
+    if (r.checkpointGate !== undefined) {
+        const next = redactCheckpointGate(r.checkpointGate);
+        if (next !== r.checkpointGate)
+            (out ??= { ...result }).checkpointGate = next;
     }
-    return changed ? out : result;
+    return out === undefined ? result : out;
+}
+export function sealRunRowResult(result) {
+    return result === null ? null : redactTerminalResult(sealResultForExit(result));
 }
-export function sealRunRowResult(result, readSeat) {
-    return result === null ? null : redactTerminalResult(sealResultForExit(result, readSeat));
+export function sealStoredRunRowResult(result, seat) {
+    return result === null ? null : redactTerminalResult(sealStoredResult(result, seat));
 }
 export function redactLedgerEventData(type, data) {
     if (data === null || typeof data !== "object" || Array.isArray(data))
@@ -897,7 +902,7 @@ export function memoRedactedRead(seat, raw, redact) {
 export function memoRedactTerminalResult(seat, raw) {
     if (raw === undefined || raw === null)
         return raw;
-    const result = sealResultForExit(raw, seat);
+    const result = sealStoredResult(raw, seat);
     const r = result;
     if (TREATED_RESULT_LEAVES.every((k) => r[k] === undefined))
         return result;

package/dist/plugins/approval-ask-store-file.d.ts

@@ -126,6 +126,10 @@ export declare class FileApprovalAskStore implements ApprovalAskStore {
     private replayRejectedCount;
     /** 重放期被丢弃的坏行数(撕尾不计:那是本格式存在的理由,由 {@link corruptQuarantinePath} 单独说)。 */
     private corruptLineCount;
+    /** 本次启动重放到的 v1 信封记录数(随 M34;{@link upgradeJournalEnvelope} 的读数)。 */
+    private journalV1Records;
+    /** 盘上还有 v1 信封记录(随 M34):重放到 v1 记录时置位,任何一次压实(整本重写成 v2)清位 —— 已被压实过的账本不再为升级重写第二次。 */
+    private journalV1OnDisk;
     /** 本次启动隔离出去的原件路径(无坏字节 ⇒ `undefined`)。 */
     readonly corruptQuarantinePath: string | undefined;
     /**
@@ -179,8 +183,8 @@ export declare class FileApprovalAskStore implements ApprovalAskStore {
      * 🔴 [ref] —— **出域的一次决议不落账本**。作用域的属主维(`owner`,判据 {@link askRowCarriesOwner})不在记录上:行此刻不带着门判过的那位属主
      * ⇒ 内核上这一笔必输、零写(读钟也在判定之后,不开账本窗)⇒ 没有要重放的东西,直调内核拿它的输者答案(与留存两动词「空的一次不落」同一条先例)。
      * 判定、落账、内核调用都在同一个同步前缀里,其间行不可能换属主。于是**落了账的每一条决议都在域内**,重放按行自己的属主喂属主维
-     * ({@link FileApprovalAskStore.replayOp})—— 记录形一个字节不变:升级前写下的账本、升级后写下的账本、降级回老版本时老读者读新账本,三者同读,
-     * 零迁移、零双读。
+     * ({@link FileApprovalAskStore.replayOp})—— 决议记录的形一个字节不变(没有属主格):升级前写下的决议记录与升级后写下的同读,零迁移、零双读
+     * (整本账的信封号另算 —— 见顶注「信封版本」)。
      */
     decideAsk(askId: string, batchId: string, owner: string | null, decision: DecideAskInput): Promise<DecideResult>;
     claimTerminal(askId: string, batchId: string, intent: AskTerminalClaimIntent, opts?: AskTerminalClaimOpts): Promise<AskTerminalClaimOutcome>;
@@ -208,14 +212,20 @@ export declare class FileApprovalAskStore implements ApprovalAskStore {
         corruptLines: number;
         records: number;
     };
-    /** 释放追加 fd(`LocalBackend.close` → 优雅重启重开)。不包 try/catch 的理由同
-     *  {@link FileApprovalNonceStore.dispose}:core 的 `AppendLog.close()` 自己就是全函数。 */
+    /**
+     * 问行成因两列的 local 腿(一次性迁移 M34,窗口见 `plugins/one-time-migrations.ts` 登记表;`LocalBackend.runOneTimeMigrations` 调):本次启动重放到的 v1 信封记录
+     * 已由读侧半场按意义译进内存({@link translateJournalV1Record}),这里**一次压实**把整本账重写成 v2 快照(压实 = 既有整本原子重写)。返回 v1 记录数;没有 ⇒ 零写、0。
+     * 本次启动里账本已被别的压实整本重写过(撕尾 / 坏行收拢、M32 的车道回填)⇒ 盘上已无 v1,不再重写,读数照报。
+     */
+    upgradeJournalEnvelope(): number;
     /**
      * 执行放置切换 ④b 的 local 腿(一次性迁移登记表 M32;`LocalBackend.runOneTimeMigrations` 在任何读者之前调):升级前写下的问(日志 `ensureAsk` 记录行 /
      * 压实快照行没有 `executionLane`)记成本部署车道表的唯一项,然后**一次压实**把整本账重写成带车道的快照(压实 = 既有整本原子重写)。
      * 没有缺车道的行 ⇒ 零写。车道表不是一元而还有缺车道的行 ⇒ 抛与 SQL 同一只拒(`backfill_ambiguous`,由调用方铸),一个字节没写。
      */
     backfillExecutionLanes(lanes: readonly ExecutionLane[], refuse: (pending: number) => never): number;
+    /** 释放追加 fd(`LocalBackend.close` → 优雅重启重开)。不包 try/catch 的理由同
+     *  {@link FileApprovalNonceStore.dispose}:core 的 `AppendLog.close()` 自己就是全函数。 */
     dispose(): void;
 }
 export {};

package/dist/plugins/approval-ask-store-file.js

@@ -30,6 +30,29 @@ const JOURNAL_OP_WORDS = new Set(JOURNAL_OPS);
 export const JOURNAL_OP_TABLE_GATE = true;
 const JOURNAL_V1_CLAIM_INTENTS = ["expire", "cancel"];
 const JOURNAL_V1_CLAIM_INTENT_WORDS = new Set(JOURNAL_V1_CLAIM_INTENTS);
+const JOURNAL_ENVELOPE = 2;
+const JOURNAL_V1_ENVELOPE = 1;
+const V1_ENDING_STATES = new Set(["VOID", "DENIED"]);
+const V1_TRIGGER_STATES = new Set(["PARKING", "PARKED"]);
+function translateJournalV1Record(raw, refuse) {
+    const rec = raw;
+    if (rec.k === "ask" && rec.row !== null && typeof rec.row === "object") {
+        const { deniedReason, ...row } = rec.row;
+        const cause = typeof deniedReason === "string" ? deniedReason : null;
+        if (cause !== null && row.state === "STREAM_PENDING") {
+            refuse(`an envelope-1 snapshot row in STREAM_PENDING carries the single cause field ${JSON.stringify(cause)} — no released server wrote that shape and it has no two-column reading`);
+        }
+        return { ...raw, row: { ...row, endingCause: V1_ENDING_STATES.has(row.state) ? cause : null, parkTrigger: V1_TRIGGER_STATES.has(row.state) ? cause : null } };
+    }
+    if (rec.k === "op" && (rec.op === "transitionAsk" || rec.op === "resolveProvisional") && rec.patch !== null && typeof rec.patch === "object" && "deniedReason" in rec.patch) {
+        const { deniedReason, ...patch } = rec.patch;
+        if (!V1_ENDING_STATES.has(rec.to) || (typeof deniedReason !== "string" && deniedReason !== null)) {
+            refuse(`an envelope-1 ${String(rec.op)} record sets the single cause field on a transition to ${JSON.stringify(rec.to)} with ${JSON.stringify(deniedReason)} — no released server wrote that shape and it has no two-column reading`);
+        }
+        return { ...raw, patch: { ...patch, endingCause: deniedReason } };
+    }
+    return raw;
+}
 const ASK_JOURNAL_SHAPE = {
     what: "approval-ask journal record",
     read: (record) => record,
@@ -57,6 +80,8 @@ export class FileApprovalAskStore {
     pinnedNow = null;
     replayRejectedCount = 0;
     corruptLineCount = 0;
+    journalV1Records = 0;
+    journalV1OnDisk = false;
     corruptQuarantinePath;
     constructor(root) {
         const dir = join(root, APPROVAL_ASK_DIR);
@@ -95,7 +120,7 @@ export class FileApprovalAskStore {
     }
     write(call, run) {
         const t = Date.now();
-        const record = { v: 1, k: "op", t, ...call };
+        const record = { v: JOURNAL_ENVELOPE, k: "op", t, ...call };
         const encoded = encodeStoreJsonPayload(`${call.op} call`, record);
         this.logFor().append(encoded, true);
         this.records += 1;
@@ -125,22 +150,29 @@ export class FileApprovalAskStore {
     }
     compact(snapshot = this.core.exportRows()) {
         const lines = [
-            ...snapshot.batches.map((row) => `${JSON.stringify({ v: 1, k: "batch", row })}\n`),
-            ...snapshot.asks.map((row) => `${JSON.stringify({ v: 1, k: "ask", row })}\n`),
+            ...snapshot.batches.map((row) => `${JSON.stringify({ v: JOURNAL_ENVELOPE, k: "batch", row })}\n`),
+            ...snapshot.asks.map((row) => `${JSON.stringify({ v: JOURNAL_ENVELOPE, k: "ask", row })}\n`),
         ];
         this.log?.closeForSwap();
         atomicWriteFile(this.tmpDir, this.path, lines.join(""));
+        this.journalV1OnDisk = false;
         this.records = lines.length;
     }
-    replayRecord(raw) {
-        const probe = raw;
+    replayRecord(disk) {
+        const head = disk;
         const refuse = (why) => {
             throw new StoreBootRefusalError(`FileApprovalAskStore: approval ask journal ${this.path} carries a record this build cannot replay — ${why} ` +
-                `(v=${JSON.stringify(probe.v)} k=${JSON.stringify(probe.k)} op=${JSON.stringify(probe.op)}). ` +
+                `(v=${JSON.stringify(head.v)} k=${JSON.stringify(head.k)} op=${JSON.stringify(head.op)}). ` +
                 "Replaying only the records it understands would resurrect decided asks or drop a human's approval. " +
                 "Run the server version that wrote this journal, or move the file aside (every approval on it is abandoned) to continue.");
         };
-        if (probe.v !== 1)
+        if (head.v === JOURNAL_V1_ENVELOPE) {
+            this.journalV1Records += 1;
+            this.journalV1OnDisk = true;
+        }
+        const raw = head.v === JOURNAL_V1_ENVELOPE ? translateJournalV1Record(disk, refuse) : disk;
+        const probe = raw;
+        if (probe.v !== JOURNAL_ENVELOPE && probe.v !== JOURNAL_V1_ENVELOPE)
             refuse("unknown envelope version");
         if (probe.k === "ask" || probe.k === "batch") {
             const row = probe.row;
@@ -296,6 +328,15 @@ export class FileApprovalAskStore {
     replayStats() {
         return { rejected: this.replayRejectedCount, corruptLines: this.corruptLineCount, records: this.records };
     }
+    upgradeJournalEnvelope() {
+        const upgraded = this.journalV1Records;
+        if (upgraded === 0)
+            return 0;
+        if (this.journalV1OnDisk)
+            this.compact();
+        this.journalV1Records = 0;
+        return upgraded;
+    }
     backfillExecutionLanes(lanes, refuse) {
         const pending = this.core.exportRows().asks.filter((r) => !isExecutionLane(String(r.executionLane ?? ""))).length;
         if (pending === 0)

package/dist/plugins/approval-ask-store-memory.d.ts

@@ -101,7 +101,8 @@ export declare class InMemoryApprovalAskStore implements ApprovalAskStore {
      * 单调性论证)。
      */
     claimTerminal(askId: string, batchId: string, intent: AskTerminalClaimIntent, opts?: AskTerminalClaimOpts): Promise<AskTerminalClaimOutcome>;
-    /** `cause`(可选)= 转 park 的触发成因,赢下 PARKING 的同一步落进 `deniedReason`(SQL twin 同一条 UPDATE 的镜像;接口上的 `expireAsk` 不带它,只有 `claimTerminal(expire, { cause })` 带)。 */
+    /** `cause`(可选)= 转 park 的触发成因,赢下 PARKING 的同一步落进 `parkTrigger`(SQL twin 同一条 UPDATE 的镜像;接口上的 `expireAsk` 不带它,只有 `claimTerminal(expire, { cause })` 带)——
+     *  `parkTrigger` 的唯一写点:此后的转移(补丁里没有这一键)不再碰它。 */
     expireAsk(askId: string, batchId: string, cause?: AskTerminalClaimOpts["cause"]): Promise<ExpireResult>;
     bindBatch(batchId: string, askId: string, gate: BindGateInput): Promise<BindResult>;
     deferReconcile(askId: string, expectedState: AskState, expectedRev: number, nowMs: number): Promise<boolean>;

package/dist/plugins/approval-ask-store-memory.js

@@ -11,8 +11,8 @@ function applyPatch(row, patch) {
         row.decisionNote = patch.decisionNote;
     if (patch.decidedAtMs !== undefined)
         row.decidedAtMs = patch.decidedAtMs;
-    if (patch.deniedReason !== undefined)
-        row.deniedReason = patch.deniedReason;
+    if (patch.endingCause !== undefined)
+        row.endingCause = patch.endingCause;
     if (patch.gateToken !== undefined)
         row.gateToken = patch.gateToken;
     if (patch.gateBoundCallId !== undefined)
@@ -99,7 +99,8 @@ export class InMemoryApprovalAskStore {
             decisionNote: null,
             settledBy: null,
             decidedAtMs: null,
-            deniedReason: null,
+            endingCause: null,
+            parkTrigger: null,
             gateToken: null,
             gateBoundCallId: null,
             gateBoundInputHash: null,
@@ -181,7 +182,7 @@ export class InMemoryApprovalAskStore {
                 const scoped = this.asks.get(askId);
                 if (scoped !== undefined && scoped.batchId !== batchId)
                     return { claimed: false, current: { state: "absent" } };
-                const won = await this.transitionAsk(askId, "STREAM_PENDING", "VOID", { updatedAtMs: this.now(), ...(opts?.cause !== undefined ? { deniedReason: opts.cause } : {}) });
+                const won = await this.transitionAsk(askId, "STREAM_PENDING", "VOID", { updatedAtMs: this.now(), ...(opts?.cause !== undefined ? { endingCause: opts.cause } : {}) });
                 if (won)
                     return { claimed: true, voidedSiblings: [] };
                 break;
@@ -222,7 +223,7 @@ export class InMemoryApprovalAskStore {
             return { won: false, voidedSiblings: [] };
         ask.state = "PARKING";
         if (cause !== undefined)
-            ask.deniedReason = cause;
+            ask.parkTrigger = cause;
         ask.rev += 1;
         ask.updatedAtMs = now;
         if (batch.state === "OPEN") {
@@ -234,7 +235,7 @@ export class InMemoryApprovalAskStore {
         for (const [id, r] of this.asks) {
             if (r.batchId === batchId && r.state === "STREAM_PENDING" && id !== askId) {
                 r.state = "VOID";
-                r.deniedReason = APPROVAL_ENDING_CAUSES.BATCH_SIBLING_WITHDRAWN;
+                r.endingCause = APPROVAL_ENDING_CAUSES.BATCH_SIBLING_WITHDRAWN;
                 r.rev += 1;
                 r.updatedAtMs = now;
                 voided.push(id);
@@ -267,7 +268,7 @@ export class InMemoryApprovalAskStore {
         for (const [id, r] of this.asks) {
             if (r.batchId === batchId && r.state === "PARKING" && id !== askId) {
                 r.state = "VOID";
-                r.deniedReason = APPROVAL_ENDING_CAUSES.BATCH_BOUND_ELSEWHERE;
+                r.endingCause = APPROVAL_ENDING_CAUSES.BATCH_BOUND_ELSEWHERE;
                 r.rev += 1;
                 r.updatedAtMs = now;
                 voidedSiblings.push(id);
@@ -295,7 +296,7 @@ export class InMemoryApprovalAskStore {
         for (const [id, r] of this.asks) {
             if (r.batchId === batchId && r.state === "STREAM_PENDING") {
                 r.state = "VOID";
-                r.deniedReason = APPROVAL_ENDING_CAUSES.BATCH_ABORTED;
+                r.endingCause = APPROVAL_ENDING_CAUSES.BATCH_ABORTED;
                 r.rev += 1;
                 r.updatedAtMs = now;
                 voided.push(id);