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

package/dist/artifact.d.mts

@@ -54,6 +54,14 @@ declare function repairSurfaceOps(events: SessionEvent[]): void;
  * 三者齐备，缺失会让整个会话加载失败。
  */
 declare function repairAssistantSettlement(events: SessionEvent[]): void;
+/**
+ * 读取时把旧格式 `request/header` 归一为当前格式：v3 起 system prompt 由
+ * surface 上的 `system/message` 承载，header 必须省略 `system`，空 `tools` /
+ * `adapterDefaults` 也必须省略（上游 v3 事件校验 fail loud）。混合世代回退
+ * 视图直接采用存储行，不归一会让整个会话加载失败。system prompt 因此不再
+ * 进入模型请求；会话下次运行由 v3 的 system/message 机制重建。
+ */
+declare function repairRequestHeaders(events: SessionEvent[]): void;
 /**
  * 把紧邻 replace 的 metering 事件的 `shadowedRange` / `shadowedSeqs` 对齐到
  * replace 最终的稠密 range。
@@ -67,8 +75,19 @@ declare function repairAssistantSettlement(events: SessionEvent[]): void;
  */
 declare function syncMeteringRanges(events: SessionEvent[]): void;
 /**
- * 读取视图修复总入口：结算字段补全 → surface 语义修复 → metering 对齐 →
- * provenance 重算 → 孤儿 inbox splice 改写。全部只作用于内存视图，不落库。
+ * 读取时把 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 对齐。
+ */
+declare function renameLegacyPtcEvents(events: SessionEvent[]): void;
+/**
+ * 读取视图修复总入口：形状补全（结算字段 / request header）→ PTC 词汇归一
+ * → surface 语义修复 → metering 对齐 → provenance 重算 → 孤儿 inbox splice
+ * 改写。全部只作用于内存视图，不落库。
  */
 declare function repairReadView(events: SessionEvent[]): void;
 /**
@@ -88,4 +107,4 @@ declare function scanRows(rows: readonly EventRow[], base?: number): {
 };
 declare function toJsonlArtifact(meta: SessionHeader, inheritedEventCount: number, events: readonly SessionEvent[]): string;
 //#endregion
-export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, findSurfaceRepairs, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, repairAssistantSettlement, repairOrphanInboxSplices, repairReadView, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sessionConflictRow, sessionInsertRow, syncMeteringRanges, toJsonlArtifact };
+export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, findSurfaceRepairs, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, renameLegacyPtcEvents, repairAssistantSettlement, repairOrphanInboxSplices, repairReadView, repairRequestHeaders, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sessionConflictRow, sessionInsertRow, syncMeteringRanges, toJsonlArtifact };

package/dist/artifact.mjs

@@ -1,3 +1,3 @@
-import { a as repairOrphanInboxSplices, c as rowToEvent, d as sessionConflictRow, f as sessionInsertRow, i as repairAssistantSettlement, l as rowToMeta, m as toJsonlArtifact, n as orphanInboxSpliceSeqs, o as repairReadView, p as syncMeteringRanges, r as recomputeReplaceProvenance, s as repairSurfaceOps, t as findSurfaceRepairs, u as scanRows } from "./log-DBFUBPhv.mjs";
-import { a as persistImport, i as parseJsonlArtifact, n as SESSION_LOG_ARTIFACT_FILENAME, o as registerSessionImport, r as parseImportZip, t as SESSION_IMPORT_PATH } from "./import-mZZgDBLd.mjs";
-export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, findSurfaceRepairs, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, repairAssistantSettlement, repairOrphanInboxSplices, repairReadView, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sessionConflictRow, sessionInsertRow, syncMeteringRanges, toJsonlArtifact };
+import { a as repairAssistantSettlement, c as repairRequestHeaders, d as rowToMeta, f as scanRows, g as toJsonlArtifact, h as syncMeteringRanges, i as renameLegacyPtcEvents, l as repairSurfaceOps, m as sessionInsertRow, n as orphanInboxSpliceSeqs, o as repairOrphanInboxSplices, p as sessionConflictRow, r as recomputeReplaceProvenance, s as repairReadView, t as findSurfaceRepairs, u as rowToEvent } from "./log-BIuXv09P.mjs";
+import { a as persistImport, i as parseJsonlArtifact, n as SESSION_LOG_ARTIFACT_FILENAME, o as registerSessionImport, r as parseImportZip, t as SESSION_IMPORT_PATH } from "./import-eBSoCrxl.mjs";
+export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, findSurfaceRepairs, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, renameLegacyPtcEvents, repairAssistantSettlement, repairOrphanInboxSplices, repairReadView, repairRequestHeaders, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sessionConflictRow, sessionInsertRow, syncMeteringRanges, toJsonlArtifact };

package/dist/{import-mZZgDBLd.mjs → import-eBSoCrxl.mjs}

@@ -1,4 +1,4 @@
-import { l as rowToMeta } from "./log-DBFUBPhv.mjs";
+import { d as rowToMeta } from "./log-BIuXv09P.mjs";
 import { randomUUID } from "node:crypto";
 import { SESSION_FORMAT_VERSION, SessionLogOffset } from "@deepseek-ai/dsh-session";
 import { sessionFormatCatalog } from "@deepseek-ai/dsh-session-format-catalog";

package/dist/import.d.mts

@@ -1,4 +1,4 @@
-import { n as SessionPersistenceRdb } from "./index-GdKkSSb-.mjs";
+import { n as SessionPersistenceRdb } from "./index-DfS0PzGM.mjs";
 import { SessionStorageMetadata } from "@deepseek-ai/dsh-session-persistence";
 import { Session, SessionEvent, SessionId } from "@deepseek-ai/dsh-session";
 import { Context } from "@deepseek-ai/cordis";

package/dist/import.mjs

@@ -1,2 +1,2 @@
-import { a as persistImport, i as parseJsonlArtifact, n as SESSION_LOG_ARTIFACT_FILENAME, o as registerSessionImport, r as parseImportZip, t as SESSION_IMPORT_PATH } from "./import-mZZgDBLd.mjs";
+import { a as persistImport, i as parseJsonlArtifact, n as SESSION_LOG_ARTIFACT_FILENAME, o as registerSessionImport, r as parseImportZip, t as SESSION_IMPORT_PATH } from "./import-eBSoCrxl.mjs";
 export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport };

package/dist/{index-GdKkSSb-.d.mts → index-DfS0PzGM.d.mts}

@@ -182,9 +182,9 @@ declare class SessionPersistenceRdb extends SessionPersistence {
   /** 空会话 materialize（flush 的持久化屏障）。 */
   materializeEmpty(meta: SessionHeader, inheritedEventCount: SessionLogOffset): Promise<void>;
   /** 原样 append 落库（handle 已校验 contiguity；torn tail 先截断）。
-   *  与上游 JSONL 一致：ignorable 事件原样存储，不做过滤。写路径校验 v2
-   *  形状（fail-closed）：未知类型（非 ignorable）与非法消息形状拒绝入库；
-   *  旧格式（v0/v1）数据只在读取时经 legacy 转换链动态转换，不落新库。 */
+   *  与上游 JSONL 一致：ignorable 事件原样存储，不做过滤。写路径校验当前
+   *  格式形状（fail-closed）：未知类型（非 ignorable）与非法消息形状拒绝入库；
+   *  非当前格式（v0/v1/v2）数据只在读取时经 legacy 转换链动态转换，不落新库。 */
   appendBatch(meta: SessionHeader, inheritedEventCount: SessionLogOffset, events: readonly SessionEvent[], tornTruncateTo?: number): Promise<boolean>;
   /** 读取一个会话的稠密 log（含 torn tail 检测，不含修复改写）。 */
   readLog(id: SessionId, options?: {
@@ -198,11 +198,11 @@ declare class SessionPersistenceRdb extends SessionPersistence {
     revision: number;
     /** 存储桥接行数（迁移链可能生成/合并事件，与 `events.length` 不同）。 */
     storedCount: number;
-    /** 是否经上游迁移链转换（v0/v1 → 当前格式）。 */
+    /** 是否经上游迁移链转换（非当前格式 → 当前格式）。 */
     migrated: boolean;
   } | undefined>;
   /**
-   * 把迁移链读出的 v2 视图整体落库（旧格式会话写打开时的一次性迁移）。
+   * 把迁移链读出的当前格式视图整体落库（非当前格式会话写打开时的一次性迁移）。
    *
    * 迁移链会生成/合并事件（end-seed / attempt / chunk 合并），事件 seq 空间
    * 与存储桥接行数不再相等；写路径以存储 head 为锚点重编号，二者不一致会让

package/dist/index.d.mts

@@ -1,3 +1,3 @@
 import { o as SCHEMA_VERSION } from "./schema-COK7-wRV.mjs";
-import { a as SessionBranchRdbProvider, i as SessionBranchRdb, n as SessionPersistenceRdb, o as locateTurnEnd, r as SessionPersistenceRdbInternals, t as Config } from "./index-GdKkSSb-.mjs";
+import { a as SessionBranchRdbProvider, i as SessionBranchRdb, n as SessionPersistenceRdb, o as locateTurnEnd, r as SessionPersistenceRdbInternals, t as Config } from "./index-DfS0PzGM.mjs";
 export { Config, SCHEMA_VERSION, SessionBranchRdb, SessionBranchRdbProvider, SessionPersistenceRdb, SessionPersistenceRdb as default, SessionPersistenceRdbInternals, locateTurnEnd };

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { a as SCHEMA_VERSION, g as WriteGuard, h as toPostgresSchema, i as EVENT_ENCODING, m as postgresTableDefs, r as DEFAULT_BUSY_TIMEOUT_MS, s as eventDimensions, t as SqliteBackend } from "./sqlite-CnWwGToZ.mjs";
-import { d as sessionConflictRow, f as sessionInsertRow, l as rowToMeta, m as toJsonlArtifact, o as repairReadView, u as scanRows } from "./log-DBFUBPhv.mjs";
-import { c as SessionBranchRdbProvider, l as locateTurnEnd, o as registerSessionImport, s as SessionBranchRdb } from "./import-mZZgDBLd.mjs";
+import { a as SCHEMA_VERSION, g as WriteGuard, h as toPostgresSchema, i as EVENT_ENCODING, m as postgresTableDefs, r as DEFAULT_BUSY_TIMEOUT_MS, s as eventDimensions, t as SqliteBackend } from "./sqlite-Dpd17YhI.mjs";
+import { c as repairRequestHeaders, d as rowToMeta, f as scanRows, g as toJsonlArtifact, m as sessionInsertRow, p as sessionConflictRow, s as repairReadView } from "./log-BIuXv09P.mjs";
+import { c as SessionBranchRdbProvider, l as locateTurnEnd, o as registerSessionImport, s as SessionBranchRdb } from "./import-eBSoCrxl.mjs";
 import z from "@deepseek-ai/schemastery";
 import { randomUUID } from "node:crypto";
 import { Pool } from "pg";
@@ -161,35 +161,43 @@ var PostgresBackend = class PostgresBackend {
 };
 //#endregion
 //#region src/legacy.ts
-/** 重建 v0/v1 物理 header 记录（RDB 行 → 物理 JSON 对象）。 */
+/** 重建 v0/v1/v2 物理 header 记录（RDB 行 → 物理 JSON 对象）。 */
 function physicalHeader(row) {
-	return {
+	const common = {
 		type: "session",
 		version: row.fVersion,
 		id: row.fSessionId,
 		createdAt: row.fCreatedAt,
 		...row.fCwd !== null ? { cwd: row.fCwd } : {},
 		...row.fParentSession !== null ? { parentSession: row.fParentSession } : {},
-		...row.fSeedLength !== null ? { seedLength: row.fSeedLength } : {},
 		...row.fOrigin !== null ? { origin: row.fOrigin } : {},
 		delegationDepth: row.fDelegationDepth ?? 0
 	};
+	return row.fVersion < 2 ? {
+		...common,
+		...row.fSeedLength !== null ? { seedLength: row.fSeedLength } : {}
+	} : {
+		...common,
+		isSeeded: row.fSeedLength !== null
+	};
 }
-/** 重建一条 v0/v1 物理事件记录（桥接行 + 事件行 → 物理 JSON 对象）。 */
+/** 重建一条 v0/v1/v2 物理事件记录（桥接行 + 事件行 → 物理 JSON 对象）。 */
 function physicalEvent(row) {
+	const stored = JSON.parse(row.fData);
+	const full = typeof stored === "object" && stored !== null && !Array.isArray(stored) && typeof stored["type"] === "string" && "data" in stored;
 	return {
 		type: row.fType,
 		seq: row.fSequence,
 		time: row.fCreatedAt,
-		data: JSON.parse(row.fData),
+		data: full ? stored["data"] : stored,
 		...row.fSurfaceOp !== null ? { surfaceOp: JSON.parse(row.fSurfaceOp) } : {}
 	};
 }
 /**
-* 把旧格式（v0/v1）行转换为 v2 逻辑事件与 header。
-* @param row - 会话行（f_version < 2）。
+* 把非当前格式（v0/v1/v2）行转换为当前逻辑事件与 header。
+* @param row - 会话行（f_version < SESSION_FORMAT_VERSION）。
 * @param eventRows - 已扫描保留的桥接行（稠密 seq，torn tail 已剔除）。
-* @returns v2 逻辑 header、继承前缀长度与事件。
+* @returns 当前逻辑 header、继承前缀长度与事件。
 * @throws 迁移链拒绝（格式损坏 / 无法迁移）时原样抛出。
 */
 function convertLegacyRows(row, eventRows) {
@@ -205,9 +213,9 @@ function convertLegacyRows(row, eventRows) {
 		events: artifact.events
 	};
 }
-/** 会话行是否携带旧格式（v0/v1）数据。 */
+/** 会话行是否携带非当前格式（f_version < SESSION_FORMAT_VERSION）数据。 */
 function isLegacyVersion(version) {
-	return version < 2;
+	return version < SESSION_FORMAT_VERSION;
 }
 /**
 * 迁移链拒绝后，把旧格式行直接当**当前格式**事件视图采用。
@@ -221,7 +229,7 @@ function isLegacyVersion(version) {
 * 调用方须在此之后执行 `validateStoredEvents`：真正属于旧格式的类型
 * （`assistant/chunk` / `compact/*` 等）仍会被 fail-loud 拒绝。
 *
-* @param row - 会话行（f_version < 2）。
+* @param row - 会话行（f_version < SESSION_FORMAT_VERSION）。
 * @param eventRows - 该会话全部桥接行（按 f_sequence 升序）。
 * @returns 当前格式 header（version 归一到 SESSION_FORMAT_VERSION）、收缩后的
 *   继承前缀长度、稠密事件与可选 torn tail 起点。
@@ -229,6 +237,7 @@ function isLegacyVersion(version) {
 */
 function adoptLegacyRows(row, eventRows) {
 	const { preserved, tornFrom } = scanRows(eventRows, 0);
+	repairRequestHeaders(preserved);
 	return {
 		meta: {
 			...rowToMeta(row),
@@ -578,6 +587,7 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 			}));
 			const log = await this.readLog(id, {}, options?.signal);
 			if (log === void 0) throw new SessionPersistenceNotFoundError(id);
+			repairReadView(log.events);
 			validateStoredEvents(log.meta, log.events);
 			return this.tracker.adopt(new RdbSessionHandle(this, id, log.meta, "read", {
 				cursor: log.events.length,
@@ -594,6 +604,7 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 			}));
 			const log = await this.readLog(id, {}, options?.signal);
 			if (log === void 0) throw new SessionPersistenceNotFoundError(id);
+			repairReadView(log.events);
 			validateStoredEvents(log.meta, log.events);
 			if (log.migrated && log.events.length !== log.storedCount) await this.rewriteMigratedLog(id, log);
 			this.writeGuard.confirmHead(id, log.events.at(-1)?.seq ?? -1);
@@ -682,9 +693,9 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 		this.writeGuard.confirmHead(meta.id, -1);
 	}
 	/** 原样 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, inheritedEventCount, events, tornTruncateTo) {
 		await this.ready;
 		if (events.length === 0) return false;
@@ -765,7 +776,7 @@ var SessionPersistenceRdb = class SessionPersistenceRdb extends SessionPersisten
 		};
 	}
 	/**
-	* 把迁移链读出的 v2 视图整体落库（旧格式会话写打开时的一次性迁移）。
+	* 把迁移链读出的当前格式视图整体落库（非当前格式会话写打开时的一次性迁移）。
 	*
 	* 迁移链会生成/合并事件（end-seed / attempt / chunk 合并），事件 seq 空间
 	* 与存储桥接行数不再相等；写路径以存储 head 为锚点重编号，二者不一致会让

package/dist/{log-DBFUBPhv.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;
 	}
 }
@@ -163,8 +186,8 @@ 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;
 		let endIdx = shapeOk ? nodes.indexOf(end) : -1;
@@ -174,6 +197,7 @@ function findSurfaceRepairs(events) {
 			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);
@@ -183,7 +207,7 @@ 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;
@@ -220,12 +244,14 @@ function repairSurfaceOps(events) {
 		const raw = event;
 		const clamped = repairs.clampEnd.get(event.seq);
 		if (repairs.degradeToAppend.has(event.seq)) raw.surfaceOp = "append";
-		else if (clamped !== void 0) raw.surfaceOp = {
-			op: "replace",
-			start: raw.surfaceOp.start,
-			end: clamped
-		};
-		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;
 	}
 }
@@ -242,6 +268,25 @@ function repairAssistantSettlement(events) {
 	}
 }
 /**
+* 读取时把旧格式 `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。
 *
@@ -258,22 +303,100 @@ function syncMeteringRanges(events) {
 		if (!METERING_EVENT_TYPES.has(metering.type)) continue;
 		const op = events[i].surfaceOp;
 		if (typeof op !== "object" || op === null || op.op !== "replace") continue;
-		const { start, end } = op;
+		const { startSeq, endSeq } = op;
 		const data = metering.data;
-		if (data.shadowedRange?.start === start && data.shadowedRange.end === end) continue;
+		if (data.shadowedRange?.start === startSeq && data.shadowedRange.end === endSeq) continue;
 		data.shadowedRange = {
-			start,
-			end
+			start: startSeq,
+			end: endSeq
 		};
-		data.shadowedSeqs = events.filter((candidate) => candidate.seq >= start && candidate.seq <= end && SURFACE_EVENT_TYPES.has(candidate.type)).map((candidate) => candidate.seq);
+		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
+				}
+			};
+		}
 	}
 }
 /**
-* 读取视图修复总入口：结算字段补全 → surface 语义修复 → metering 对齐 →
-* provenance 重算 → 孤儿 inbox splice 改写。全部只作用于内存视图，不落库。
+* 读取视图修复总入口：形状补全（结算字段 / request header）→ PTC 词汇归一
+* → surface 语义修复 → metering 对齐 → provenance 重算 → 孤儿 inbox splice
+* 改写。全部只作用于内存视图，不落库。
 */
 function repairReadView(events) {
 	repairAssistantSettlement(events);
+	repairRequestHeaders(events);
+	renameLegacyPtcEvents(events);
 	repairSurfaceOps(events);
 	syncMeteringRanges(events);
 	recomputeReplaceProvenance(events);
@@ -391,4 +514,4 @@ function toJsonlArtifact(meta, inheritedEventCount, events) {
 	return lines.join("\n");
 }
 //#endregion
-export { repairOrphanInboxSplices as a, rowToEvent as c, sessionConflictRow as d, sessionInsertRow as f, repairAssistantSettlement as i, rowToMeta as l, toJsonlArtifact as m, orphanInboxSpliceSeqs as n, repairReadView as o, syncMeteringRanges as p, recomputeReplaceProvenance as r, repairSurfaceOps as s, findSurfaceRepairs as t, scanRows 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-CnWwGToZ.mjs → sqlite-Dpd17YhI.mjs}

@@ -1,4 +1,4 @@
-import { d as sessionConflictRow, f as sessionInsertRow } from "./log-DBFUBPhv.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-CnWwGToZ.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.1",
+  "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.1",
+    "@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

@@ -560,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(
@@ -584,6 +588,7 @@ 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 合并），事件坐标与
       // 存储桥接行数不再相等——写打开时把迁移视图整体落库，使读写同坐标；
@@ -692,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,
@@ -703,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);
@@ -763,7 +768,7 @@ export class SessionPersistenceRdb extends SessionPersistence {
         /** 存储桥接行数（迁移链可能生成/合并事件，与 `events.length` 不同）。 */
         storedCount: number;
 
-        /** 是否经上游迁移链转换（v0/v1 → 当前格式）。 */
+        /** 是否经上游迁移链转换（非当前格式 → 当前格式）。 */
         migrated: boolean;
       }
     | undefined
@@ -779,10 +784,11 @@ 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。
-    // 混合世代 log（旧写入器跨上游版本追加）不是任何单一已发布格式，迁移链
-    // 必然拒绝——回退为当前格式视图（header 版本归一 + 读取视图修复）。
+    // 非当前格式（v0/v1/v2）历史数据：行重建为物理记录，经上游迁移链转
+    // 当前逻辑事件。迁移链自带 seq gap / torn tail 校验（strict recovery），
+    // 无需 scanRows。混合世代 log（旧写入器跨上游版本追加）不是任何单一已
+    // 发布格式，迁移链必然拒绝——回退为当前格式视图（header 版本归一 +
+    // 读取视图修复）。
     if (isLegacyVersion(row.fVersion)) {
       try {
         const converted = convertLegacyRows(row, eventRows);
@@ -826,7 +832,7 @@ export class SessionPersistenceRdb extends SessionPersistence {
   }
 
   /**
-   * 把迁移链读出的 v2 视图整体落库（旧格式会话写打开时的一次性迁移）。
+   * 把迁移链读出的当前格式视图整体落库（非当前格式会话写打开时的一次性迁移）。
    *
    * 迁移链会生成/合并事件（end-seed / attempt / chunk 合并），事件 seq 空间
    * 与存储桥接行数不再相等；写路径以存储 head 为锚点重编号，二者不一致会让
@@ -927,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,

package/src/legacy.ts

@@ -1,5 +1,5 @@
-// 旧格式（v0/v1）历史数据读取转换：RDB 行 → v0/v1 物理记录 → 上游迁移链 →
-// v2 逻辑事件。RDB 写路径从不持久化 sourceEventSeqs（读取时重计算），且
+// 非当前格式（v0/v1/v2）历史数据读取转换：RDB 行 → 物理记录 → 上游迁移链 →
+// 当前逻辑事件。RDB 写路径从不持久化 sourceEventSeqs（读取时重计算），且
 // delta（assistant/chunk）落盘被过滤——v1→v2 迁移对无 chunk 引用的
 // assistant/message 走「无 pending 直接 emit」路径，生成 stream: [] 的 v2 事件。
 
@@ -11,39 +11,52 @@ import {
 } from "@deepseek-ai/dsh-session";
 import { sessionFormatCatalog } from "@deepseek-ai/dsh-session-format-catalog";
 import type { EventRow, SessionRow } from "./backend.ts";
-import { rowToMeta, scanRows } from "./log.ts";
+import { repairRequestHeaders, rowToMeta, scanRows } from "./log.ts";
 
-/** 重建 v0/v1 物理 header 记录（RDB 行 → 物理 JSON 对象）。 */
+/** 重建 v0/v1/v2 物理 header 记录（RDB 行 → 物理 JSON 对象）。 */
 function physicalHeader(row: SessionRow): Record<string, unknown> {
-  return {
+  const common = {
     type: "session",
     version: row.fVersion,
     id: row.fSessionId,
     createdAt: row.fCreatedAt,
     ...(row.fCwd !== null ? { cwd: row.fCwd } : {}),
     ...(row.fParentSession !== null ? { parentSession: row.fParentSession } : {}),
-    ...(row.fSeedLength !== null ? { seedLength: row.fSeedLength } : {}),
     ...(row.fOrigin !== null ? { origin: row.fOrigin } : {}),
     delegationDepth: row.fDelegationDepth ?? 0,
   };
+  // v0/v1 物理 header 用 seedLength 表达继承前缀；v2 起改用 isSeeded，
+  // 前缀长度由 log 里的 session/end-seed 标记推导。
+  return row.fVersion < 2
+    ? { ...common, ...(row.fSeedLength !== null ? { seedLength: row.fSeedLength } : {}) }
+    : { ...common, isSeeded: row.fSeedLength !== null };
 }
 
-/** 重建一条 v0/v1 物理事件记录（桥接行 + 事件行 → 物理 JSON 对象）。 */
+/** 重建一条 v0/v1/v2 物理事件记录（桥接行 + 事件行 → 物理 JSON 对象）。 */
 function physicalEvent(row: EventRow): Record<string, unknown> {
+  const stored = JSON.parse(row.fData) as unknown;
+  // 两种存储形状：当前写入器落完整事件信封（与 JSONL 每行同构），schema v2
+  // 时代只落 data 部分。迁移链要的是 payload，故信封形状取 `data`。
+  const full =
+    typeof stored === "object" &&
+    stored !== null &&
+    !Array.isArray(stored) &&
+    typeof (stored as Record<string, unknown>)["type"] === "string" &&
+    "data" in (stored as Record<string, unknown>);
   return {
     type: row.fType,
     seq: row.fSequence,
     time: row.fCreatedAt,
-    data: JSON.parse(row.fData) as unknown,
+    data: full ? (stored as Record<string, unknown>)["data"] : stored,
     ...(row.fSurfaceOp !== null ? { surfaceOp: JSON.parse(row.fSurfaceOp) as unknown } : {}),
   };
 }
 
 /**
- * 把旧格式（v0/v1）行转换为 v2 逻辑事件与 header。
- * @param row - 会话行（f_version < 2）。
+ * 把非当前格式（v0/v1/v2）行转换为当前逻辑事件与 header。
+ * @param row - 会话行（f_version < SESSION_FORMAT_VERSION）。
  * @param eventRows - 已扫描保留的桥接行（稠密 seq，torn tail 已剔除）。
- * @returns v2 逻辑 header、继承前缀长度与事件。
+ * @returns 当前逻辑 header、继承前缀长度与事件。
  * @throws 迁移链拒绝（格式损坏 / 无法迁移）时原样抛出。
  */
 export function convertLegacyRows(
@@ -65,9 +78,9 @@ export function convertLegacyRows(
   };
 }
 
-/** 会话行是否携带旧格式（v0/v1）数据。 */
+/** 会话行是否携带非当前格式（f_version < SESSION_FORMAT_VERSION）数据。 */
 export function isLegacyVersion(version: number): boolean {
-  return version < 2;
+  return version < SESSION_FORMAT_VERSION;
 }
 
 /**
@@ -82,7 +95,7 @@ export function isLegacyVersion(version: number): boolean {
  * 调用方须在此之后执行 `validateStoredEvents`：真正属于旧格式的类型
  * （`assistant/chunk` / `compact/*` 等）仍会被 fail-loud 拒绝。
  *
- * @param row - 会话行（f_version < 2）。
+ * @param row - 会话行（f_version < SESSION_FORMAT_VERSION）。
  * @param eventRows - 该会话全部桥接行（按 f_sequence 升序）。
  * @returns 当前格式 header（version 归一到 SESSION_FORMAT_VERSION）、收缩后的
  *   继承前缀长度、稠密事件与可选 torn tail 起点。
@@ -98,6 +111,11 @@ export function adoptLegacyRows(
   tornFrom?: number;
 } {
   const { preserved, tornFrom } = scanRows(eventRows, 0);
+  // 旧格式 request/header 归一为当前格式：v3 起 system prompt 由 surface 上的
+  // system/message 承载，header 必须省略 system / 空 tools / 空 adapterDefaults
+  // （上游事件校验 fail loud）。归一必须发生在调用方 `validateStoredEvents`
+  // 之前，否则整个会话加载失败。
+  repairRequestHeaders(preserved);
   return {
     meta: { ...rowToMeta(row), version: SESSION_FORMAT_VERSION },
     // 继承前缀不得超过事件数（历史 rewind 未收缩的损坏样式），上游 load 判损坏。

package/src/log.ts

@@ -1,9 +1,30 @@
+import { SessionSeq } from "@deepseek-ai/dsh-session";
 import type { SessionEvent, SessionHeader, SessionId, SurfaceOp } from "@deepseek-ai/dsh-session";
 import type { SessionFormatEvent, SessionFormatHeader } from "@deepseek-ai/dsh-session-format";
 import { sessionFormatCatalog } from "@deepseek-ai/dsh-session-format-catalog";
 import type { SessionStorageMetadata } from "@deepseek-ai/dsh-session-persistence";
 import type { EventRow, SessionRow } from "./backend.ts";
 
+/**
+ * 把桥接行列里的 replace surfaceOp 归一到当前字段名。
+ *
+ * v2 时代落库的 JSON 用 `start`/`end`，当前格式用 `startSeq`/`endSeq`；
+ * 混合世代回退路径直接采用存储行，必须在此归一，否则上游 v3 surface 校验
+ * 以「invalid replace surfaceOp」拒绝整个会话。非 replace 形状原样返回，
+ * 由读取视图修复决定降级。
+ */
+function normalizeSurfaceOp(value: unknown): SurfaceOp {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    return value as SurfaceOp;
+  }
+  const record = value as Record<string, unknown>;
+  if (record["op"] !== "replace") return value as SurfaceOp;
+  const startSeq = record["startSeq"] ?? record["start"];
+  const endSeq = record["endSeq"] ?? record["end"];
+  if (typeof startSeq !== "number" || typeof endSeq !== "number") return value as SurfaceOp;
+  return { op: "replace", startSeq: SessionSeq(startSeq), endSeq: SessionSeq(endSeq) };
+}
+
 export function rowToMeta(row: SessionRow): SessionHeader {
   if (!Number.isSafeInteger(row.fCreatedAt) || row.fCreatedAt < 0) {
     throw new Error("stored session createdAt must be a non-negative safe integer");
@@ -76,7 +97,8 @@ export function sessionConflictRow(storage: SessionStorageMetadata): {
 }
 
 export function rowToEvent(row: EventRow): SessionEvent {
-  const surfaceOp = row.fSurfaceOp !== null ? (JSON.parse(row.fSurfaceOp) as SurfaceOp) : undefined;
+  const surfaceOp =
+    row.fSurfaceOp !== null ? normalizeSurfaceOp(JSON.parse(row.fSurfaceOp) as unknown) : undefined;
   const record = JSON.parse(row.fData) as unknown;
   // fData 形状判别：新写入的完整事件（含 ignorable 信封，与 JSONL 每行
   // 同构）vs 旧 v2 库的纯 data 部分。完整事件必有 type/seq/time/data 四键。
@@ -107,7 +129,12 @@ export function rowToEvent(row: EventRow): SessionEvent {
   } as SessionEvent;
 }
 
-const SURFACE_EVENT_TYPES = new Set(["user/message", "assistant/message", "tool/result"]);
+const SURFACE_EVENT_TYPES = new Set([
+  "system/message",
+  "user/message",
+  "assistant/message",
+  "tool/result",
+]);
 
 const METERING_EVENT_TYPES = new Set(["compaction/summary", "compaction/prune"]);
 
@@ -126,12 +153,12 @@ const METERING_EVENT_TYPES = new Set(["compaction/summary", "compaction/prune"])
 export function recomputeReplaceProvenance(events: SessionEvent[]): void {
   for (let i = 0; i < events.length; i++) {
     const event = events[i]!;
-    const raw = event as SessionEvent & { surfaceOp?: unknown; sourceEventSeqs?: number[] };
+    const raw = event as unknown as { surfaceOp?: unknown; sourceEventSeqs?: number[] };
     const op = raw.surfaceOp;
     if (typeof op !== "object" || op === null || (op as { op?: string }).op !== "replace") {
       continue;
     }
-    const { start, end } = op as { start: number; end: number };
+    const { startSeq, endSeq } = op as { startSeq: number; endSeq: number };
     const metering = i > 0 ? events[i - 1] : undefined;
     const meteringData =
       metering !== undefined && METERING_EVENT_TYPES.has(metering.type)
@@ -144,8 +171,8 @@ export function recomputeReplaceProvenance(events: SessionEvent[]): void {
     const refs: number[] = [];
     for (const candidate of events) {
       if (
-        candidate.seq >= start &&
-        candidate.seq <= end &&
+        candidate.seq >= startSeq &&
+        candidate.seq <= endSeq &&
         SURFACE_EVENT_TYPES.has(candidate.type)
       ) {
         refs.push(candidate.seq);
@@ -242,8 +269,8 @@ export function findSurfaceRepairs(events: readonly SessionEvent[]): {
       typeof op === "object" && op !== null && !Array.isArray(op)
         ? (op as Record<string, unknown>)
         : undefined;
-    const start = replace?.["start"];
-    const end = replace?.["end"];
+    const start = replace?.["startSeq"];
+    const end = replace?.["endSeq"];
     const shapeOk =
       replace !== undefined &&
       replace["op"] === "replace" &&
@@ -261,6 +288,10 @@ export function findSurfaceRepairs(events: readonly SessionEvent[]): {
       if (clamped !== undefined) endIdx = nodes.indexOf(clamped);
     }
     const rangeOk = shapeOk && startIdx !== -1 && endIdx !== -1 && startIdx <= endIdx;
+    // assistant/message 的来源内嵌在 stream，上游禁止其携带 sourceEventSeqs，
+    // replace 的 provenance 因此永远无法满足 fold 校验——降级 append 是唯一
+    // 可加载形态。
+    const provenanceOk = event.type !== "assistant/message";
     let rewriteOk = true;
     if (rangeOk && event.type === "tool/result") {
       const shadowed = nodes.slice(startIdx, endIdx + 1);
@@ -272,7 +303,7 @@ export function findSurfaceRepairs(events: readonly SessionEvent[]): {
           original?.type === "tool/result" && toolResultRewriteContentOnly(original, event);
       }
     }
-    if (!rangeOk || !rewriteOk) {
+    if (!rangeOk || !rewriteOk || !provenanceOk) {
       degradeToAppend.add(event.seq);
       nodes.push(event.seq);
       continue;
@@ -320,8 +351,12 @@ export function repairSurfaceOps(events: SessionEvent[]): void {
     if (repairs.degradeToAppend.has(event.seq)) {
       raw.surfaceOp = "append";
     } else if (clamped !== undefined) {
-      const op = raw.surfaceOp as { start: number };
-      raw.surfaceOp = { op: "replace", start: op.start, end: clamped };
+      const op = raw.surfaceOp as { startSeq: number };
+      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)) {
@@ -343,6 +378,34 @@ export function repairAssistantSettlement(events: SessionEvent[]): void {
   }
 }
 
+/**
+ * 读取时把旧格式 `request/header` 归一为当前格式：v3 起 system prompt 由
+ * surface 上的 `system/message` 承载，header 必须省略 `system`，空 `tools` /
+ * `adapterDefaults` 也必须省略（上游 v3 事件校验 fail loud）。混合世代回退
+ * 视图直接采用存储行，不归一会让整个会话加载失败。system prompt 因此不再
+ * 进入模型请求；会话下次运行由 v3 的 system/message 机制重建。
+ */
+export function repairRequestHeaders(events: SessionEvent[]): void {
+  for (const event of events) {
+    if (event.type !== "request/header") continue;
+    const data = event.data as unknown as Record<string, unknown>;
+    const header = data["header"];
+    if (typeof header !== "object" || header === null || Array.isArray(header)) continue;
+    const record = header as Record<string, unknown>;
+    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。
@@ -361,28 +424,108 @@ export function syncMeteringRanges(events: SessionEvent[]): void {
     const event = events[i]!;
     const op = (event as SessionEvent & { surfaceOp?: unknown }).surfaceOp;
     if (typeof op !== "object" || op === null || (op as { op?: string }).op !== "replace") continue;
-    const { start, end } = op as { start: number; end: number };
+    const { startSeq, endSeq } = op as { startSeq: number; endSeq: number };
     const data = metering.data as unknown as {
       shadowedRange?: { start: number; end: number };
       shadowedSeqs?: number[];
     };
-    if (data.shadowedRange?.start === start && data.shadowedRange.end === end) continue;
-    data.shadowedRange = { start, end };
+    if (data.shadowedRange?.start === startSeq && data.shadowedRange.end === endSeq) continue;
+    data.shadowedRange = { start: startSeq, end: endSeq };
     data.shadowedSeqs = events
       .filter(
         (candidate) =>
-          candidate.seq >= start && candidate.seq <= end && SURFACE_EVENT_TYPES.has(candidate.type),
+          candidate.seq >= startSeq &&
+          candidate.seq <= endSeq &&
+          SURFACE_EVENT_TYPES.has(candidate.type),
       )
       .map((candidate) => candidate.seq);
   }
 }
 
+const PTC_EVENT_RENAMES: Record<string, string> = {
+  "tool/code-dispatch-start": "tool/ptc-dispatch-start",
+  "tool/code-dispatch": "tool/ptc-dispatch",
+};
+
+/** 把消息的 `tools-code-mode` 插件来源改写为 `tools-ptc`（非该来源原样返回）。 */
+function renamePtcMessageSource(message: unknown): unknown {
+  if (typeof message !== "object" || message === null || Array.isArray(message)) return message;
+  const record = message as Record<string, unknown>;
+  const source = record["source"];
+  if (typeof source !== "object" || source === null || Array.isArray(source)) return message;
+  const sourceRecord = source as Record<string, unknown>;
+  if (sourceRecord["kind"] !== "plugin" || sourceRecord["plugin"] !== "tools-code-mode") {
+    return message;
+  }
+  return { ...record, source: { ...sourceRecord, plugin: "tools-ptc" } };
+}
+
+/** 宽类型事件视图：PTC 词汇归一涉及本包 SessionEventMap 之外的插件类型。 */
+interface LegacyPtcEvent {
+  type: string;
+  data: unknown;
+  [key: string]: unknown;
+}
+
+/**
+ * 读取时把 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 对齐。
+ */
+export function renameLegacyPtcEvents(events: SessionEvent[]): void {
+  for (let index = 0; index < events.length; index++) {
+    const event = events[index] as unknown as LegacyPtcEvent;
+    const renamedType = PTC_EVENT_RENAMES[event.type];
+    if (renamedType !== undefined) {
+      events[index] = { ...event, type: renamedType } as unknown as SessionEvent;
+      continue;
+    }
+    if (event.type === "agent-preset/selected") {
+      const data = event.data as Record<string, unknown>;
+      if (data["agentPreset"] === "code") {
+        events[index] = {
+          ...event,
+          data: { ...data, agentPreset: "ptc" },
+        } as unknown as SessionEvent;
+      }
+      continue;
+    }
+    if (event.type === "user/message") {
+      const renamed = renamePtcMessageSource(event.data);
+      if (renamed !== event.data) {
+        events[index] = { ...event, data: renamed } as unknown as SessionEvent;
+      }
+      continue;
+    }
+    if (event.type === "agent/inbox/spliced" || event.type === "session/title-llm-request") {
+      const data = event.data as Record<string, unknown>;
+      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 },
+        } as unknown as SessionEvent;
+      }
+    }
+  }
+}
+
 /**
- * 读取视图修复总入口：结算字段补全 → surface 语义修复 → metering 对齐 →
- * provenance 重算 → 孤儿 inbox splice 改写。全部只作用于内存视图，不落库。
+ * 读取视图修复总入口：形状补全（结算字段 / request header）→ PTC 词汇归一
+ * → surface 语义修复 → metering 对齐 → provenance 重算 → 孤儿 inbox splice
+ * 改写。全部只作用于内存视图，不落库。
  */
 export function repairReadView(events: SessionEvent[]): void {
   repairAssistantSettlement(events);
+  repairRequestHeaders(events);
+  renameLegacyPtcEvents(events);
   repairSurfaceOps(events);
   syncMeteringRanges(events);
   recomputeReplaceProvenance(events);

package/src/testing/contract.ts

@@ -535,7 +535,7 @@ export function runPersistenceContract(name: string, make: () => Promise<Contrac
         const m = meta("foreign-vocabulary");
         const handle = await persistence.create(m);
         await handle.append(oneTurnLog());
-        // 写路径 v2 校验：未知类型（非 ignorable）拒绝入库，批次不落库。
+        // 写路径当前格式校验：未知类型（非 ignorable）拒绝入库，批次不落库。
         await expect(
           handle.append([
             { type: "mystery/event", seq: SessionSeq(6), time: 7, data: { payload: true } },