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

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-BPEHfHNk.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-BPEHfHNk.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";
@@ -142,7 +142,8 @@ var SessionBranchRdbProvider = class {
 		if (!Number.isSafeInteger(toBoundary) || toBoundary < -1) throw new SessionBranchError(`rewind boundary must be a non-negative safe integer, got ${toBoundary}`, "INVALID_BOUNDARY");
 		const live = this.live.getSession(id);
 		if (live !== void 0) await this.live.flush(live);
-		const raw = live === void 0 ? await this.readRawEvents(id, signal) : void 0;
+		const raw = live === void 0 ? await this.persistence.readLog(id, {}, signal) : void 0;
+		if (live === void 0 && raw === void 0) throw new SessionBranchError(`session "${id}" not found`, "SESSION_NOT_FOUND");
 		const inspection = live === void 0 ? void 0 : await this.persistence.internals().inspect(id, signal);
 		const events = live === void 0 ? raw.events : inspection.events;
 		const meta = live === void 0 ? raw.meta : inspection.meta;
@@ -150,7 +151,8 @@ var SessionBranchRdbProvider = class {
 		if (toBoundary === -1) {} else if (boundaryEvent === void 0) throw new SessionBranchError(`rewind boundary ${toBoundary} does not exist in session "${id}"`, "INVALID_BOUNDARY");
 		else if (boundaryEvent.type !== "turn/end" && boundaryEvent.type !== "user/message") throw new SessionBranchError(`rewind boundary ${toBoundary} is not a turn/end or user/message (${boundaryEvent.type})`, "INVALID_BOUNDARY");
 		const rawKeepLength = toBoundary === -1 ? 0 : boundaryEvent.type === "turn/end" ? toBoundary + 1 : toBoundary;
-		const keepLength = balanceRewindPrefix(events.slice(0, rawKeepLength)).length;
+		const kept = balanceRewindPrefix(events.slice(0, rawKeepLength));
+		const keepLength = kept.length;
 		const internals = this.persistence.internals();
 		const denseBoundary = keepLength - 1;
 		const newSeedLength = await internals.backend.transaction(async (tx) => {
@@ -175,6 +177,7 @@ var SessionBranchRdbProvider = class {
 		internals.writeGuard.confirmHead(id, denseBoundary);
 		if (live !== void 0) {
 			truncateLiveSession(live, keepLength);
+			this.live.resetProjections?.(live);
 			const agent = this.live.getAgent(id);
 			if (agent !== void 0) {
 				agent.requestHeaderLogged = false;
@@ -184,7 +187,15 @@ var SessionBranchRdbProvider = class {
 			}
 			const handle = this.persistence.tracker.writerOf(id);
 			if (handle !== void 0) handle.resetAfterRewind(keepLength, newSeedLength === null ? void 0 : newSeedLength);
-		}
+			agent?.inbox?.clear();
+			await this.live.flush(live);
+			await this.refreshProjectionCache(live);
+		} else await this.refreshProjectionCache({
+			id,
+			header: meta,
+			inheritedEventCount: SessionLogOffset(raw.inheritedEventCount),
+			snapshotEvents: () => kept
+		});
 		const row = await internals.backend.getSession(id);
 		if (row === void 0) return {
 			header: {
@@ -205,6 +216,16 @@ var SessionBranchRdbProvider = class {
 			revision: await internals.readStoredRevision(id)
 		};
 	}
+	/**
+	* 让持久化投影检查点跟随截断后的 log（见 {@link LiveSessionHooks.refreshProjectionCache}）。
+	* 缓存是派生数据：刷新失败只让缓存多滞后一轮，不能让 rewind 失败。
+	*/
+	async refreshProjectionCache(session) {
+		if (this.live.refreshProjectionCache === void 0) return;
+		try {
+			await this.live.refreshProjectionCache(session);
+		} catch {}
+	}
 };
 var SessionBranchRdb = class extends SessionBranch {
 	static inject = ["sessionPersistence", "sessions"];
@@ -216,7 +237,21 @@ var SessionBranchRdb = class extends SessionBranch {
 		getAgent: (id) => {
 			return this.ctx.get("agents")?.get(id);
 		},
-		flush: (session) => this.ctx.sessions.flush(session)
+		flush: (session) => this.ctx.sessions.flush(session),
+		resetProjections: (session) => {
+			const registry = this.ctx.get("sessionProjections");
+			if (registry?.registrations === void 0) return;
+			for (const registration of registry.registrations.values()) registration.cells.delete(session);
+		},
+		refreshProjectionCache: async (session) => {
+			const cache = this.ctx.get("sessionProjectionCache");
+			if (cache === void 0) return;
+			try {
+				await cache.write(session);
+			} catch (error) {
+				this.ctx.logger.warn(`session-rdb: projection cache refresh after rewind for "${session.id}" failed (cache stays stale): ${String(error)}`);
+			}
+		}
 	});
 	readBranchPrefix(id, atSeq, mode, signal) {
 		return this.provider.readBranchPrefix(id, atSeq, mode, signal);

package/dist/import.d.mts

@@ -1,4 +1,4 @@
-import { n as SessionPersistenceRdb } from "./index-GdKkSSb-.mjs";
+import { n as SessionPersistenceRdb } from "./index-CgAqCQAb.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-BPEHfHNk.mjs";
 export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport };

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

@@ -10,10 +10,27 @@ interface LiveSessionHooks {
   getSession(id: SessionId): Session | undefined;
   getAgent(id: SessionId): LiveAgentLike | undefined;
   flush(session: Session): Promise<boolean>;
+  resetProjections?(session: Session): void;
+  refreshProjectionCache?(session: ProjectionCacheSession): Promise<void>;
+}
+/**
+ * 投影检查点刷新所需的最小会话面：cold rewind 没有 live Session 可复用，
+ * 而截断后的前缀未必是合法的独立会话（surface 引用可能悬空），不能走
+ * `Session.create` 的校验；缓存服务只读 id / header / inheritedEventCount
+ * 与事件前缀，用普通对象承载即可。
+ */
+interface ProjectionCacheSession {
+  readonly id: SessionId;
+  readonly header: SessionHeader;
+  readonly inheritedEventCount: SessionLogOffset;
+  snapshotEvents(): readonly SessionEvent[];
 }
 interface LiveAgentLike {
   session: Session;
   requestHeaderLogged?: boolean;
+  inbox?: {
+    clear(): void;
+  };
 }
 declare class SessionBranchRdbProvider implements SessionBranchProvider {
   private readonly persistence;
@@ -27,6 +44,11 @@ declare class SessionBranchRdbProvider implements SessionBranchProvider {
   }>;
   forkFrom(sourceId: SessionId, options?: ForkFromOptions, signal?: AbortSignal): Promise<SessionId>;
   rewind(id: SessionId, toBoundary: number, signal?: AbortSignal): Promise<SessionPersistenceSnapshot>;
+  /**
+   * 让持久化投影检查点跟随截断后的 log（见 {@link LiveSessionHooks.refreshProjectionCache}）。
+   * 缓存是派生数据：刷新失败只让缓存多滞后一轮，不能让 rewind 失败。
+   */
+  private refreshProjectionCache;
 }
 declare class SessionBranchRdb extends SessionBranch {
   static inject: string[];
@@ -182,9 +204,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 +220,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-CgAqCQAb.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-IH5I48aL.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-BPEHfHNk.mjs";
 import z from "@deepseek-ai/schemastery";
 import { randomUUID } from "node:crypto";
 import { Pool } from "pg";
@@ -10,10 +10,11 @@ import { SESSION_FORMAT_VERSION, SessionLogOffset } from "@deepseek-ai/dsh-sessi
 import { sessionFormatCatalog } from "@deepseek-ai/dsh-session-format-catalog";
 import { and, eq, gte, sql } from "drizzle-orm";
 import { readdirSync } from "node:fs";
+import { fileURLToPath } from "node:url";
 import { migrate } from "drizzle-orm/node-postgres/migrator";
 //#region src/postgres.ts
 /** drizzle-kit 生成的迁移目录（随包根 drizzle/ 发布；src/dist 形态经相对 URL 统一解析）。 */
-const postgresMigrationsDir = new URL("../drizzle/postgres/", import.meta.url).pathname;
+const postgresMigrationsDir = fileURLToPath(new URL("../drizzle/postgres/", import.meta.url));
 var PostgresBackend = class PostgresBackend {
 	db;
 	options;
@@ -161,35 +162,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 +214,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 +230,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 +238,7 @@ function isLegacyVersion(version) {
 */
 function adoptLegacyRows(row, eventRows) {
 	const { preserved, tornFrom } = scanRows(eventRows, 0);
+	repairRequestHeaders(preserved);
 	return {
 		meta: {
 			...rowToMeta(row),
@@ -578,6 +588,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 +605,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 +694,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 +777,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-IH5I48aL.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";
@@ -6,6 +6,7 @@ import { bigint, check as check$1, index as index$1, integer as integer$1, pgSch
 import { readdirSync, statSync } from "node:fs";
 import { mkdir, open } from "node:fs/promises";
 import { dirname, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
 import { DatabaseSync } from "node:sqlite";
 import { drizzle } from "drizzle-orm/node-sqlite";
 import { migrate } from "drizzle-orm/node-sqlite/migrator";
@@ -482,7 +483,7 @@ function eventDimensions(event) {
 //#endregion
 //#region src/sqlite.ts
 /** drizzle-kit 生成的迁移目录（随包根 drizzle/ 发布；src/dist 形态经相对 URL 统一解析）。 */
-const sqliteMigrationsDir = new URL("../drizzle/sqlite/", import.meta.url).pathname;
+const sqliteMigrationsDir = fileURLToPath(new URL("../drizzle/sqlite/", import.meta.url));
 const sqliteTxQueues = /* @__PURE__ */ new Map();
 function enqueueSqliteTx(path, fn) {
 	const run = (sqliteTxQueues.get(path) ?? Promise.resolve()).then(fn);

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-IH5I48aL.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 };