@morlay/session-rdb 0.0.16-alpha.0 → 0.0.16-alpha.2

package/dist/{log-DTJsxMud.mjs → log-BIuXv09P.mjs}

@@ -1,5 +1,27 @@
+import { SessionSeq } from "@deepseek-ai/dsh-session";
 import { sessionFormatCatalog } from "@deepseek-ai/dsh-session-format-catalog";
 //#region src/log.ts
+/**
+* 把桥接行列里的 replace surfaceOp 归一到当前字段名。
+*
+* v2 时代落库的 JSON 用 `start`/`end`，当前格式用 `startSeq`/`endSeq`；
+* 混合世代回退路径直接采用存储行，必须在此归一，否则上游 v3 surface 校验
+* 以「invalid replace surfaceOp」拒绝整个会话。非 replace 形状原样返回，
+* 由读取视图修复决定降级。
+*/
+function normalizeSurfaceOp(value) {
+	if (typeof value !== "object" || value === null || Array.isArray(value)) return value;
+	const record = value;
+	if (record["op"] !== "replace") return value;
+	const startSeq = record["startSeq"] ?? record["start"];
+	const endSeq = record["endSeq"] ?? record["end"];
+	if (typeof startSeq !== "number" || typeof endSeq !== "number") return value;
+	return {
+		op: "replace",
+		startSeq: SessionSeq(startSeq),
+		endSeq: SessionSeq(endSeq)
+	};
+}
 function rowToMeta(row) {
 	if (!Number.isSafeInteger(row.fCreatedAt) || row.fCreatedAt < 0) throw new Error("stored session createdAt must be a non-negative safe integer");
 	return {
@@ -43,7 +65,7 @@ function sessionConflictRow(storage) {
 	};
 }
 function rowToEvent(row) {
-	const surfaceOp = row.fSurfaceOp !== null ? JSON.parse(row.fSurfaceOp) : void 0;
+	const surfaceOp = row.fSurfaceOp !== null ? normalizeSurfaceOp(JSON.parse(row.fSurfaceOp)) : void 0;
 	const record = JSON.parse(row.fData);
 	if (typeof record === "object" && record !== null && !Array.isArray(record) && typeof record["type"] === "string" && typeof record["seq"] === "number" && typeof record["time"] === "number" && "data" in record) return {
 		...record,
@@ -60,6 +82,7 @@ function rowToEvent(row) {
 	};
 }
 const SURFACE_EVENT_TYPES = /* @__PURE__ */ new Set([
+	"system/message",
 	"user/message",
 	"assistant/message",
 	"tool/result"
@@ -82,7 +105,7 @@ function recomputeReplaceProvenance(events) {
 		const raw = events[i];
 		const op = raw.surfaceOp;
 		if (typeof op !== "object" || op === null || op.op !== "replace") continue;
-		const { start, end } = op;
+		const { startSeq, endSeq } = op;
 		const metering = i > 0 ? events[i - 1] : void 0;
 		const meteringData = metering !== void 0 && METERING_EVENT_TYPES.has(metering.type) ? metering.data : void 0;
 		if (meteringData?.shadowedSeqs !== void 0) {
@@ -90,7 +113,7 @@ function recomputeReplaceProvenance(events) {
 			continue;
 		}
 		const refs = [];
-		for (const candidate of events) if (candidate.seq >= start && candidate.seq <= end && SURFACE_EVENT_TYPES.has(candidate.type)) refs.push(candidate.seq);
+		for (const candidate of events) if (candidate.seq >= startSeq && candidate.seq <= endSeq && SURFACE_EVENT_TYPES.has(candidate.type)) refs.push(candidate.seq);
 		raw.sourceEventSeqs = refs;
 	}
 }
@@ -142,7 +165,9 @@ function findSurfaceRepairs(events) {
 	const degradeToAppend = /* @__PURE__ */ new Set();
 	const addAppendMarker = /* @__PURE__ */ new Set();
 	const clearSurfaceOp = /* @__PURE__ */ new Set();
-	for (const event of events) {
+	const clampEnd = /* @__PURE__ */ new Map();
+	for (let index = 0; index < events.length; index++) {
+		const event = events[index];
 		const op = event.surfaceOp;
 		if (op === void 0) {
 			if (SURFACE_EVENT_TYPES.has(event.type)) {
@@ -161,12 +186,18 @@ function findSurfaceRepairs(events) {
 			continue;
 		}
 		const replace = typeof op === "object" && op !== null && !Array.isArray(op) ? op : void 0;
-		const start = replace?.["start"];
-		const end = replace?.["end"];
+		const start = replace?.["startSeq"];
+		const end = replace?.["endSeq"];
 		const shapeOk = replace !== void 0 && replace["op"] === "replace" && isEventSeqLike(start) && isEventSeqLike(end);
 		const startIdx = shapeOk ? nodes.indexOf(start) : -1;
-		const endIdx = shapeOk ? nodes.indexOf(end) : -1;
+		let endIdx = shapeOk ? nodes.indexOf(end) : -1;
+		let clamped;
+		if (shapeOk && startIdx !== -1 && endIdx === -1) {
+			clamped = clampReplaceEnd(events, index, nodes, startIdx);
+			if (clamped !== void 0) endIdx = nodes.indexOf(clamped);
+		}
 		const rangeOk = shapeOk && startIdx !== -1 && endIdx !== -1 && startIdx <= endIdx;
+		const provenanceOk = event.type !== "assistant/message";
 		let rewriteOk = true;
 		if (rangeOk && event.type === "tool/result") {
 			const shadowed = nodes.slice(startIdx, endIdx + 1);
@@ -176,30 +207,202 @@ function findSurfaceRepairs(events) {
 				rewriteOk = original?.type === "tool/result" && toolResultRewriteContentOnly(original, event);
 			}
 		}
-		if (!rangeOk || !rewriteOk) {
+		if (!rangeOk || !rewriteOk || !provenanceOk) {
 			degradeToAppend.add(event.seq);
 			nodes.push(event.seq);
 			continue;
 		}
+		if (clamped !== void 0) clampEnd.set(event.seq, clamped);
 		nodes.splice(startIdx, endIdx - startIdx + 1, event.seq);
 	}
 	return {
 		degradeToAppend,
 		addAppendMarker,
-		clearSurfaceOp
+		clearSurfaceOp,
+		clampEnd
 	};
 }
+/**
+* 夹取一个 end 落在旧坐标空间的 replace 的结尾。
+*
+* 仅当 replace 紧邻一个 metering 事件且其 `shadowedSeqs` 是权威数量时成立；
+* 夹取点是从 `start` 起的第 `shadowedSeqs.length` 个当前 surface 节点（不足
+* 则取当前 surface 末尾）。无法夹取（start 也不在当前 surface）时返回
+* `undefined`，由调用方降级为 append。
+*/
+function clampReplaceEnd(events, index, nodes, startIdx) {
+	const metering = index > 0 ? events[index - 1] : void 0;
+	if (metering === void 0 || !METERING_EVENT_TYPES.has(metering.type)) return void 0;
+	const shadowedSeqs = metering.data.shadowedSeqs;
+	if (!Array.isArray(shadowedSeqs) || shadowedSeqs.length === 0) return void 0;
+	return nodes[Math.min(startIdx + shadowedSeqs.length - 1, nodes.length - 1)];
+}
 function repairSurfaceOps(events) {
 	const repairs = findSurfaceRepairs(events);
-	if (repairs.degradeToAppend.size === 0 && repairs.addAppendMarker.size === 0 && repairs.clearSurfaceOp.size === 0) return;
+	if (repairs.degradeToAppend.size === 0 && repairs.addAppendMarker.size === 0 && repairs.clearSurfaceOp.size === 0 && repairs.clampEnd.size === 0) return;
 	for (const event of events) {
 		const raw = event;
+		const clamped = repairs.clampEnd.get(event.seq);
 		if (repairs.degradeToAppend.has(event.seq)) raw.surfaceOp = "append";
-		else if (repairs.addAppendMarker.has(event.seq)) raw.surfaceOp = "append";
+		else if (clamped !== void 0) {
+			const op = raw.surfaceOp;
+			raw.surfaceOp = {
+				op: "replace",
+				startSeq: SessionSeq(op.startSeq),
+				endSeq: SessionSeq(clamped)
+			};
+		} else if (repairs.addAppendMarker.has(event.seq)) raw.surfaceOp = "append";
 		else if (repairs.clearSurfaceOp.has(event.seq)) delete raw.surfaceOp;
 	}
 }
 /**
+* 读取时补全 assistant 结算字段：旧写入器不落库 `stream`（v2 才把流式记录
+* 嵌入消息），读回时缺失即补空数组——上游 seed 校验要求 turn/step/stream
+* 三者齐备，缺失会让整个会话加载失败。
+*/
+function repairAssistantSettlement(events) {
+	for (const event of events) {
+		if (event.type !== "assistant/message" && event.type !== "assistant/attempt") continue;
+		const data = event.data;
+		if (!Array.isArray(data["stream"])) data["stream"] = [];
+	}
+}
+/**
+* 读取时把旧格式 `request/header` 归一为当前格式：v3 起 system prompt 由
+* surface 上的 `system/message` 承载，header 必须省略 `system`，空 `tools` /
+* `adapterDefaults` 也必须省略（上游 v3 事件校验 fail loud）。混合世代回退
+* 视图直接采用存储行，不归一会让整个会话加载失败。system prompt 因此不再
+* 进入模型请求；会话下次运行由 v3 的 system/message 机制重建。
+*/
+function repairRequestHeaders(events) {
+	for (const event of events) {
+		if (event.type !== "request/header") continue;
+		const header = event.data["header"];
+		if (typeof header !== "object" || header === null || Array.isArray(header)) continue;
+		const record = header;
+		delete record["system"];
+		if (Array.isArray(record["tools"]) && record["tools"].length === 0) delete record["tools"];
+		const defaults = record["adapterDefaults"];
+		if (typeof defaults === "object" && defaults !== null && !Array.isArray(defaults) && Object.keys(defaults).length === 0) delete record["adapterDefaults"];
+	}
+}
+/**
+* 把紧邻 replace 的 metering 事件的 `shadowedRange` / `shadowedSeqs` 对齐到
+* replace 最终的稠密 range。
+*
+* 旧写入器重编号事件后，metering 与 replace 一起落在旧坐标空间：二者数值
+* 相等但与当前 surface 无关。夹取（或 range 本身已落在稠密空间而 metering
+* 仍是旧值）后二者不再相等，而上游 token-meter 契约要求紧邻的 metering
+* range 与 replace range 完全一致（否则报 no adjacent shadow price）。range
+* 已一致时不改写——当前写入器保证一致，shadowedSeqs 的额外并发节点因此
+* 原样保留。
+*/
+function syncMeteringRanges(events) {
+	for (let i = 1; i < events.length; i++) {
+		const metering = events[i - 1];
+		if (!METERING_EVENT_TYPES.has(metering.type)) continue;
+		const op = events[i].surfaceOp;
+		if (typeof op !== "object" || op === null || op.op !== "replace") continue;
+		const { startSeq, endSeq } = op;
+		const data = metering.data;
+		if (data.shadowedRange?.start === startSeq && data.shadowedRange.end === endSeq) continue;
+		data.shadowedRange = {
+			start: startSeq,
+			end: endSeq
+		};
+		data.shadowedSeqs = events.filter((candidate) => candidate.seq >= startSeq && candidate.seq <= endSeq && SURFACE_EVENT_TYPES.has(candidate.type)).map((candidate) => candidate.seq);
+	}
+}
+const PTC_EVENT_RENAMES = {
+	"tool/code-dispatch-start": "tool/ptc-dispatch-start",
+	"tool/code-dispatch": "tool/ptc-dispatch"
+};
+/** 把消息的 `tools-code-mode` 插件来源改写为 `tools-ptc`（非该来源原样返回）。 */
+function renamePtcMessageSource(message) {
+	if (typeof message !== "object" || message === null || Array.isArray(message)) return message;
+	const record = message;
+	const source = record["source"];
+	if (typeof source !== "object" || source === null || Array.isArray(source)) return message;
+	const sourceRecord = source;
+	if (sourceRecord["kind"] !== "plugin" || sourceRecord["plugin"] !== "tools-code-mode") return message;
+	return {
+		...record,
+		source: {
+			...sourceRecord,
+			plugin: "tools-ptc"
+		}
+	};
+}
+/**
+* 读取时把 v2 时代的 PTC 词汇归一为当前词汇。
+*
+* 上游 v2→v3 迁移把 `tool/code-dispatch(-start)` 改名为
+* `tool/ptc-dispatch(-start)`、把 `tools-code-mode` 插件来源改名为 `tools-ptc`、
+* 把 agent preset 值 `code` 改名为 `ptc`。混合世代回退视图直接采用存储行，
+* 不重命名会被上游 v3 校验以「unknown event type」拒绝整个会话。词汇改写
+* 与上游迁移链的 renamePtcEvent 对齐。
+*/
+function renameLegacyPtcEvents(events) {
+	for (let index = 0; index < events.length; index++) {
+		const event = events[index];
+		const renamedType = PTC_EVENT_RENAMES[event.type];
+		if (renamedType !== void 0) {
+			events[index] = {
+				...event,
+				type: renamedType
+			};
+			continue;
+		}
+		if (event.type === "agent-preset/selected") {
+			const data = event.data;
+			if (data["agentPreset"] === "code") events[index] = {
+				...event,
+				data: {
+					...data,
+					agentPreset: "ptc"
+				}
+			};
+			continue;
+		}
+		if (event.type === "user/message") {
+			const renamed = renamePtcMessageSource(event.data);
+			if (renamed !== event.data) events[index] = {
+				...event,
+				data: renamed
+			};
+			continue;
+		}
+		if (event.type === "agent/inbox/spliced" || event.type === "session/title-llm-request") {
+			const data = event.data;
+			const key = event.type === "agent/inbox/spliced" ? "inserted" : "messages";
+			const list = data[key];
+			if (!Array.isArray(list)) continue;
+			const renamed = list.map(renamePtcMessageSource);
+			if (renamed.some((message, position) => message !== list[position])) events[index] = {
+				...event,
+				data: {
+					...data,
+					[key]: renamed
+				}
+			};
+		}
+	}
+}
+/**
+* 读取视图修复总入口：形状补全（结算字段 / request header）→ PTC 词汇归一
+* → surface 语义修复 → metering 对齐 → provenance 重算 → 孤儿 inbox splice
+* 改写。全部只作用于内存视图，不落库。
+*/
+function repairReadView(events) {
+	repairAssistantSettlement(events);
+	repairRequestHeaders(events);
+	renameLegacyPtcEvents(events);
+	repairSurfaceOps(events);
+	syncMeteringRanges(events);
+	recomputeReplaceProvenance(events);
+	repairOrphanInboxSplices(events);
+}
+/**
 * 定位无法从空状态增量重放的 agent/inbox/spliced 事件（孤儿操作）。
 *
 * 上游 Inbox 每次构造都从会话起点重放全部 inbox splice，失败即拒绝整个
@@ -311,4 +514,4 @@ function toJsonlArtifact(meta, inheritedEventCount, events) {
 	return lines.join("\n");
 }
 //#endregion
-export { repairSurfaceOps as a, scanRows as c, toJsonlArtifact as d, repairOrphanInboxSplices as i, sessionConflictRow as l, orphanInboxSpliceSeqs as n, rowToEvent as o, recomputeReplaceProvenance as r, rowToMeta as s, findSurfaceRepairs as t, sessionInsertRow as u };
+export { repairAssistantSettlement as a, repairRequestHeaders as c, rowToMeta as d, scanRows as f, toJsonlArtifact as g, syncMeteringRanges as h, renameLegacyPtcEvents as i, repairSurfaceOps as l, sessionInsertRow as m, orphanInboxSpliceSeqs as n, repairOrphanInboxSplices as o, sessionConflictRow as p, recomputeReplaceProvenance as r, repairReadView as s, findSurfaceRepairs as t, rowToEvent as u };

package/dist/{sqlite-DCy4VTD8.mjs → sqlite-Dpd17YhI.mjs}

@@ -1,4 +1,4 @@
-import { l as sessionConflictRow, u as sessionInsertRow } from "./log-DTJsxMud.mjs";
+import { m as sessionInsertRow, p as sessionConflictRow } from "./log-BIuXv09P.mjs";
 import { randomUUID } from "node:crypto";
 import { and, eq, gte, sql } from "drizzle-orm";
 import { check, index, integer, sqliteTable, text, unique } from "drizzle-orm/sqlite-core";

package/dist/storage.mjs

@@ -1,2 +1,2 @@
-import { a as SCHEMA_VERSION, c as eventKind, d as tSchemaMeta, f as tSessionEvents, g as WriteGuard, i as EVENT_ENCODING, l as tEvents, n as openDatabase, o as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, p as tSessions, r as DEFAULT_BUSY_TIMEOUT_MS, s as eventDimensions, t as SqliteBackend, u as tPersistenceState } from "./sqlite-DCy4VTD8.mjs";
+import { a as SCHEMA_VERSION, c as eventKind, d as tSchemaMeta, f as tSessionEvents, g as WriteGuard, i as EVENT_ENCODING, l as tEvents, n as openDatabase, o as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, p as tSessions, r as DEFAULT_BUSY_TIMEOUT_MS, s as eventDimensions, t as SqliteBackend, u as tPersistenceState } from "./sqlite-Dpd17YhI.mjs";
 export { DEFAULT_BUSY_TIMEOUT_MS, EVENT_ENCODING, SCHEMA_VERSION, SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, SqliteBackend, WriteGuard, eventDimensions, eventKind, openDatabase, tEvents, tPersistenceState, tSchemaMeta, tSessionEvents, tSessions };

package/dist/testing.mjs

@@ -5116,7 +5116,7 @@ function manageArtifactAttachment(attachment) {
 	if (attachment.body != null) attachment.bodyEncoding ??= "base64";
 }
 //#endregion
-//#region ../../node_modules/.pnpm/vitest@4.1.11_@opentelemetry+api@1.9.1_@types+node@26.5.0_happy-dom@20.13.2_vite@8.2.2__9bde3b9553ba3388013323e9f29b314e/node_modules/vitest/dist/chunks/utils.BX5Fg8C4.js
+//#region ../../node_modules/.pnpm/vitest@4.1.11_@opentelemetry+api@1.9.1_@types+node@26.5.0_happy-dom@20.14.0_vite@8.2.2__b2fde82745a4512744fb5cfb49e8ecf4/node_modules/vitest/dist/chunks/utils.BX5Fg8C4.js
 const NAME_WORKER_STATE = "__vitest_worker__";
 function getWorkerState() {
 	const workerState = globalThis[NAME_WORKER_STATE];
@@ -10019,10 +10019,10 @@ function offsetToLineNumber(source, offset) {
 	return line + 1;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/vitest@4.1.11_@opentelemetry+api@1.9.1_@types+node@26.5.0_happy-dom@20.13.2_vite@8.2.2__9bde3b9553ba3388013323e9f29b314e/node_modules/vitest/dist/chunks/_commonjsHelpers.D26ty3Ew.js
+//#region ../../node_modules/.pnpm/vitest@4.1.11_@opentelemetry+api@1.9.1_@types+node@26.5.0_happy-dom@20.14.0_vite@8.2.2__b2fde82745a4512744fb5cfb49e8ecf4/node_modules/vitest/dist/chunks/_commonjsHelpers.D26ty3Ew.js
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 //#endregion
-//#region ../../node_modules/.pnpm/vitest@4.1.11_@opentelemetry+api@1.9.1_@types+node@26.5.0_happy-dom@20.13.2_vite@8.2.2__9bde3b9553ba3388013323e9f29b314e/node_modules/vitest/dist/chunks/rpc.MzXet3jl.js
+//#region ../../node_modules/.pnpm/vitest@4.1.11_@opentelemetry+api@1.9.1_@types+node@26.5.0_happy-dom@20.14.0_vite@8.2.2__b2fde82745a4512744fb5cfb49e8ecf4/node_modules/vitest/dist/chunks/rpc.MzXet3jl.js
 const RealDate = Date;
 let now = null;
 var MockDate = class MockDate extends RealDate {
@@ -10987,7 +10987,7 @@ function raceWith(promise, other) {
 	}))]);
 }
 //#endregion
-//#region ../../node_modules/.pnpm/vitest@4.1.11_@opentelemetry+api@1.9.1_@types+node@26.5.0_happy-dom@20.13.2_vite@8.2.2__9bde3b9553ba3388013323e9f29b314e/node_modules/vitest/dist/chunks/test.DNmyFkvJ.js
+//#region ../../node_modules/.pnpm/vitest@4.1.11_@opentelemetry+api@1.9.1_@types+node@26.5.0_happy-dom@20.14.0_vite@8.2.2__b2fde82745a4512744fb5cfb49e8ecf4/node_modules/vitest/dist/chunks/test.DNmyFkvJ.js
 var fakeTimersSrc = {};
 var global$1;
 var hasRequiredGlobal;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/session-rdb",
-  "version": "0.0.16-alpha.0",
+  "version": "0.0.16-alpha.2",
   "description": "RDB durable session backend for DeepSeek Harness: implements both session-persistence and session-branch (rewind / retry / fork) providers.",
   "keywords": [
     "branch",
@@ -35,27 +35,27 @@
     "./cordis.patch.yml": "./cordis.patch.yml"
   },
   "dependencies": {
-    "@morlay/session-branch": "^0.0.4-alpha.0",
+    "@morlay/session-branch": "^0.0.4-alpha.2",
     "drizzle-orm": "^1.0.0-rc.5-ab785fc",
     "fflate": "^0.8.2",
     "pg": "^8.23.0"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-session-projection": "^0.1.3-alpha.2",
-    "@deepseek-ai/dsh-token-meter": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-session-projection": "^0.1.5-alpha.1",
+    "@deepseek-ai/dsh-token-meter": "^0.1.5-alpha.1",
     "@types/pg": "^8.23.1",
     "drizzle-kit": "1.0.0-rc.5-ab785fc"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-invariants": "^0.1.3-alpha.2",
-    "@deepseek-ai/dsh-llm": "^0.1.3-alpha.2",
-    "@deepseek-ai/dsh-scope": "^0.1.3-alpha.2",
-    "@deepseek-ai/dsh-session": "^0.1.3-alpha.2",
-    "@deepseek-ai/dsh-session-format": "^0.1.3-alpha.2",
-    "@deepseek-ai/dsh-session-format-catalog": "^0.1.3-alpha.2",
-    "@deepseek-ai/dsh-session-persistence": "^0.1.3-alpha.2",
-    "@deepseek-ai/dsh-settings": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-invariants": "^0.1.5-alpha.1",
+    "@deepseek-ai/dsh-llm": "^0.1.5-alpha.1",
+    "@deepseek-ai/dsh-scope": "^0.1.5-alpha.1",
+    "@deepseek-ai/dsh-session": "^0.1.5-alpha.1",
+    "@deepseek-ai/dsh-session-format": "^0.1.5-alpha.1",
+    "@deepseek-ai/dsh-session-format-catalog": "^0.1.5-alpha.1",
+    "@deepseek-ai/dsh-session-persistence": "^0.1.5-alpha.1",
+    "@deepseek-ai/dsh-settings": "^0.1.5-alpha.1",
     "@deepseek-ai/schemastery": "^3.18.2"
   },
   "dsh": {

package/src/index.ts

@@ -39,14 +39,7 @@ import {
 } from "@deepseek-ai/dsh-session";
 import { type Backend, type BackendTx, type EventInsert } from "./backend.ts";
 import { WriteGuard } from "./write-guard.ts";
-import {
-  recomputeReplaceProvenance,
-  repairOrphanInboxSplices,
-  repairSurfaceOps,
-  rowToMeta,
-  scanRows,
-  toJsonlArtifact,
-} from "./log.ts";
+import { repairReadView, rowToMeta, scanRows, toJsonlArtifact } from "./log.ts";
 import {
   DEFAULT_BUSY_TIMEOUT_MS,
   eventDimensions,
@@ -57,7 +50,7 @@ import { SqliteBackend } from "./sqlite.ts";
 import { PostgresBackend } from "./postgres.ts";
 import { SessionBranchRdb } from "./branch.ts";
 import { registerSessionImport } from "./import.ts";
-import { convertLegacyRows, isLegacyVersion } from "./legacy.ts";
+import { adoptLegacyRows, convertLegacyRows, isLegacyVersion } from "./legacy.ts";
 
 export { SCHEMA_VERSION } from "./schema.ts";
 export { SessionBranchRdb, SessionBranchRdbProvider, locateTurnEnd } from "./branch.ts";
@@ -278,11 +271,10 @@ class RdbSessionHandle implements SessionHandle {
       }
       throw new SessionPersistenceNotFoundError(this.id);
     }
-    // 读取时修复（视图只读，不落库）：surface 替换 provenance 重计算、孤儿
-    // inbox splice 改写、非法 surface 替换降级。
-    repairSurfaceOps(log.events);
-    recomputeReplaceProvenance(log.events);
-    repairOrphanInboxSplices(log.events);
+    // 读取时修复（视图只读，不落库）：结算字段补全、非法 surface 替换降级
+    // 或按 metering 数量夹取、metering range 对齐、provenance 重算、孤儿
+    // inbox splice 改写。
+    repairReadView(log.events);
     return { eventState: "detached", events: log.events.slice(offset, offset + length) };
   }
 
@@ -568,6 +560,10 @@ export class SessionPersistenceRdb extends SessionPersistence {
       }
       const log = await this.readLog(id, {}, options?.signal);
       if (log === undefined) throw new SessionPersistenceNotFoundError(id);
+      // 读取视图修复必须先于校验：越界 replace（旧写入器重编号遗留的旧坐标）
+      // 降级/夹取、request/header 归一，否则上游事件校验 fail loud 拒绝整个
+      // 会话（load / open 是历史会话的加载入口，不能只依赖 handle.read）。
+      repairReadView(log.events);
       // fail-closed：未知事件类型（非 ignorable）拒绝解释。
       validateStoredEvents(log.meta, log.events);
       return this.tracker.adopt(
@@ -592,7 +588,14 @@ export class SessionPersistenceRdb extends SessionPersistence {
       }
       const log = await this.readLog(id, {}, options?.signal);
       if (log === undefined) throw new SessionPersistenceNotFoundError(id);
+      repairReadView(log.events);
       validateStoredEvents(log.meta, log.events);
+      // 迁移链会生成/合并事件（end-seed / attempt / chunk 合并），事件坐标与
+      // 存储桥接行数不再相等——写打开时把迁移视图整体落库，使读写同坐标；
+      // 否则 append 按存储 head 重编号会撞上已有行或写坏 log。
+      if (log.migrated && log.events.length !== log.storedCount) {
+        await this.rewriteMigratedLog(id, log);
+      }
       // 确认 head：本实例已读该会话，后续 append 的并发校验以此为基准。
       this.writeGuard.confirmHead(id, log.events.at(-1)?.seq ?? -1);
       return this.tracker.adopt(
@@ -669,8 +672,7 @@ export class SessionPersistenceRdb extends SessionPersistence {
     signal?.throwIfAborted();
     const log = await this.readLog(id, {}, signal);
     if (log === undefined) return undefined;
-    repairSurfaceOps(log.events);
-    recomputeReplaceProvenance(log.events);
+    repairReadView(log.events);
     const inheritedEventCount = Math.min(log.inheritedEventCount, log.events.length);
     return {
       meta: log.meta,
@@ -695,9 +697,9 @@ export class SessionPersistenceRdb extends SessionPersistence {
   }
 
   /** 原样 append 落库（handle 已校验 contiguity；torn tail 先截断）。
-   *  与上游 JSONL 一致：ignorable 事件原样存储，不做过滤。写路径校验 v2
-   *  形状（fail-closed）：未知类型（非 ignorable）与非法消息形状拒绝入库；
-   *  旧格式（v0/v1）数据只在读取时经 legacy 转换链动态转换，不落新库。 */
+   *  与上游 JSONL 一致：ignorable 事件原样存储，不做过滤。写路径校验当前
+   *  格式形状（fail-closed）：未知类型（非 ignorable）与非法消息形状拒绝入库；
+   *  非当前格式（v0/v1/v2）数据只在读取时经 legacy 转换链动态转换，不落新库。 */
   async appendBatch(
     meta: SessionHeader,
     inheritedEventCount: SessionLogOffset,
@@ -706,8 +708,8 @@ export class SessionPersistenceRdb extends SessionPersistence {
   ): Promise<boolean> {
     await this.ready;
     if (events.length === 0) return false;
-    // 写路径 v2 校验：与读路径同契约（validateStoredEvents），保证新入库
-    // 数据只能是 v2 形状。拷贝避免 adopt 替换污染调用方数组。
+    // 写路径当前格式校验：与读路径同契约（validateStoredEvents），保证新入库
+    // 数据只能是当前格式形状。拷贝避免 adopt 替换污染调用方数组。
     validateStoredEvents(meta, [...events]);
     // fork 派生会话的 seed 复用源会话事件行（不复制）；消费后清除。
     const reuse = this.reuseEventIds.get(meta.id);
@@ -762,6 +764,12 @@ export class SessionPersistenceRdb extends SessionPersistence {
         incarnation: string;
 
         revision: number;
+
+        /** 存储桥接行数（迁移链可能生成/合并事件，与 `events.length` 不同）。 */
+        storedCount: number;
+
+        /** 是否经上游迁移链转换（非当前格式 → 当前格式）。 */
+        migrated: boolean;
       }
     | undefined
   > {
@@ -776,17 +784,39 @@ export class SessionPersistenceRdb extends SessionPersistence {
         ? await this.backend.getEventRows(id)
         : await this.backend.getEventRows(id, options.fromSeq);
     signal?.throwIfAborted();
-    // 旧格式（v0/v1）历史数据：行重建为物理记录，经上游迁移链转 v2 逻辑事件。
-    // 迁移链自带 seq gap / torn tail 校验（strict recovery），无需 scanRows。
+    // 非当前格式（v0/v1/v2）历史数据：行重建为物理记录，经上游迁移链转
+    // 当前逻辑事件。迁移链自带 seq gap / torn tail 校验（strict recovery），
+    // 无需 scanRows。混合世代 log（旧写入器跨上游版本追加）不是任何单一已
+    // 发布格式，迁移链必然拒绝——回退为当前格式视图（header 版本归一 +
+    // 读取视图修复）。
     if (isLegacyVersion(row.fVersion)) {
-      const converted = convertLegacyRows(row, eventRows);
-      return {
-        meta: converted.meta,
-        inheritedEventCount: converted.inheritedEventCount,
-        events: converted.events,
-        incarnation: row.fIncarnation,
-        revision: row.fRevision,
-      };
+      try {
+        const converted = convertLegacyRows(row, eventRows);
+        return {
+          meta: converted.meta,
+          inheritedEventCount: converted.inheritedEventCount,
+          events: converted.events,
+          incarnation: row.fIncarnation,
+          revision: row.fRevision,
+          storedCount: eventRows.length,
+          migrated: true,
+        };
+      } catch (error: unknown) {
+        this.ctx.logger.warn(
+          `session-rdb: session "${id}" is not a single released format; adopting its stored rows as current-format data (${error instanceof Error ? error.message : String(error)})`,
+        );
+        const adopted = adoptLegacyRows(row, eventRows);
+        return {
+          meta: adopted.meta,
+          inheritedEventCount: adopted.inheritedEventCount,
+          events: adopted.events,
+          incarnation: row.fIncarnation,
+          revision: row.fRevision,
+          storedCount: eventRows.length,
+          migrated: false,
+          ...(adopted.tornFrom !== undefined ? { tornFrom: adopted.tornFrom } : {}),
+        };
+      }
     }
     const { preserved, tornFrom } = scanRows(eventRows, options.fromSeq ?? 0);
     return {
@@ -795,10 +825,40 @@ export class SessionPersistenceRdb extends SessionPersistence {
       events: preserved,
       incarnation: row.fIncarnation,
       revision: row.fRevision,
+      storedCount: eventRows.length,
+      migrated: false,
       ...(tornFrom !== undefined ? { tornFrom } : {}),
     };
   }
 
+  /**
+   * 把迁移链读出的当前格式视图整体落库（非当前格式会话写打开时的一次性迁移）。
+   *
+   * 迁移链会生成/合并事件（end-seed / attempt / chunk 合并），事件 seq 空间
+   * 与存储桥接行数不再相等；写路径以存储 head 为锚点重编号，二者不一致会让
+   * append 撞上已有行。这里在同一事务内删光本会话桥接行、按迁移视图重建
+   * （新事件行，完整信封），并更新 head 与 revision；旧事件行保留（可能被
+   * fork 子会话引用，孤儿由惰性 GC 处理）。
+   */
+  private async rewriteMigratedLog(
+    id: SessionId,
+    log: { meta: SessionHeader; inheritedEventCount: number; events: SessionEvent[] },
+  ): Promise<void> {
+    await this.backend.transaction(async (tx) => {
+      await tx.deleteBridgeTail(id, 0);
+      await tx.upsertSession(
+        { meta: log.meta, inheritedEventCount: SessionLogOffset(log.inheritedEventCount) },
+        randomUUID(),
+      );
+      const { headEventId, headSequence } = await appendEventTail(tx, log.meta, log.events, {
+        parentId: "",
+        nextSeq: 0,
+      });
+      await tx.updateHead(id, headEventId, headSequence);
+      await tx.bumpRevision(id);
+    });
+  }
+
   async listSnapshots(
     signal?: AbortSignal,
   ): Promise<Array<SessionPersistenceSnapshot & { inheritedEventCount: number }>> {
@@ -873,8 +933,8 @@ export class SessionPersistenceRdb extends SessionPersistence {
       );
       const row = await this.backend.getSession(id);
       if (row === undefined) throw new SessionPersistenceNotFoundError(id);
-      // 旧格式（v0/v1）会话：meta 与继承前缀来自转换链（handle.header 已是
-      // 转换后的 v2 header）；v2 会话用存储行。
+      // 非当前格式会话：meta 与继承前缀来自转换链（handle.header 已是转换后的
+      // 当前格式 header）；当前格式会话用存储行。
       if (isLegacyVersion(row.fVersion)) {
         return {
           meta: handle.header,
@@ -1068,6 +1128,9 @@ export class SessionPersistenceRdb extends SessionPersistence {
         );
       }
       assertVersion(stored.meta);
+      // adopt 比较必须与读取视图同源：live seed 来自修复后的读取视图（补
+      // stream、surface 修复），未修复的存储视图会把修复差异误判为 id 冲突。
+      repairReadView(stored.events);
       const seed = session.snapshotEvents();
       if (!seedCoversPrefix(seed, stored.events)) {
         throw new Error(