@morlay/session-rdb 0.0.13 → 0.0.15

package/dist/artifact.d.mts

@@ -35,8 +35,21 @@ declare function remapShadowedRange(range: {
   start: number;
   end: number;
 };
+declare function remapShadowedSeqs(seqs: readonly number[], seqMap: ReadonlyMap<number, number>): number[];
 declare function rowToEvent(row: EventRow, seqMap: ReadonlyMap<number, number>): SessionEvent;
 declare function buildSeqMap(rows: readonly Pick<EventRow, "fSequence" | "fOriginalSeq">[]): Map<number, number>;
+/**
+ * 读取时重计算 replace 的 sourceEventSeqs（sourceEventSeqs 不落库）。
+ *
+ * 优先采用紧邻 metering 事件（compaction/summary | compaction/prune）的
+ * shadowedSeqs：它是压缩事务落库的**权威被遮蔽节点列表**（range 只是首尾
+ * 边界对，压缩竞态下可能漏掉并发落地的节点——range 数值扫描会漏掉这些
+ * 节点，使上游 assertProvenance 报 missing）。shadowedSeqs 已由 rowToEvent
+ * 重映射到稠密坐标，与 replace 的 surfaceOp range 同空间。
+ *
+ * 无紧邻 metering 事件时回退到 range 数值扫描（历史数据 / 非压缩 replace，
+ * 如 tool-result pruner 的旧样式），保证既有行为不变。
+ */
 declare function recomputeReplaceProvenance(events: SessionEvent[]): void;
 declare function findSurfaceRepairs(events: readonly SessionEvent[]): {
   degradeToAppend: Set<number>;
@@ -61,4 +74,4 @@ declare function scanRows(rows: readonly EventRow[], base?: number, seqMap?: Rea
 };
 declare function toJsonlArtifact(meta: SessionHeader, inheritedEventCount: number, events: readonly SessionEvent[]): string;
 //#endregion
-export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, buildSeqMap, expandProvenanceFromStorage, findSurfaceRepairs, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, remapShadowedRange, remapSurfaceOp, repairOrphanInboxSplices, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sessionConflictRow, sessionInsertRow, toJsonlArtifact };
+export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, buildSeqMap, expandProvenanceFromStorage, findSurfaceRepairs, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, remapShadowedRange, remapShadowedSeqs, remapSurfaceOp, repairOrphanInboxSplices, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sessionConflictRow, sessionInsertRow, toJsonlArtifact };

package/dist/artifact.mjs

@@ -1,3 +1,3 @@
-import { A as toJsonlArtifact, C as repairOrphanInboxSplices, D as scanRows, E as rowToMeta, O as sessionConflictRow, S as remapSurfaceOp, T as rowToEvent, _ as buildSeqMap, b as recomputeReplaceProvenance, k as sessionInsertRow, v as findSurfaceRepairs, w as repairSurfaceOps, x as remapShadowedRange, y as orphanInboxSpliceSeqs } from "./schema-B-8G4lWc.mjs";
-import { a as parseJsonlArtifact, i as parseImportZip, n as SESSION_LOG_ARTIFACT_FILENAME, o as persistImport, r as expandProvenanceFromStorage, s as registerSessionImport, t as SESSION_IMPORT_PATH } from "./import-D2vUnUZe.mjs";
-export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, buildSeqMap, expandProvenanceFromStorage, findSurfaceRepairs, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, remapShadowedRange, remapSurfaceOp, repairOrphanInboxSplices, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sessionConflictRow, sessionInsertRow, toJsonlArtifact };
+import { A as sessionInsertRow, C as remapSurfaceOp, D as rowToMeta, E as rowToEvent, O as scanRows, S as remapShadowedSeqs, T as repairSurfaceOps, _ as buildSeqMap, b as recomputeReplaceProvenance, j as toJsonlArtifact, k as sessionConflictRow, v as findSurfaceRepairs, w as repairOrphanInboxSplices, x as remapShadowedRange, y as orphanInboxSpliceSeqs } from "./schema-vwzwEXNE.mjs";
+import { a as parseJsonlArtifact, i as parseImportZip, n as SESSION_LOG_ARTIFACT_FILENAME, o as persistImport, r as expandProvenanceFromStorage, s as registerSessionImport, t as SESSION_IMPORT_PATH } from "./import-DFed8DBt.mjs";
+export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, buildSeqMap, expandProvenanceFromStorage, findSurfaceRepairs, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, remapShadowedRange, remapShadowedSeqs, remapSurfaceOp, repairOrphanInboxSplices, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sessionConflictRow, sessionInsertRow, toJsonlArtifact };

package/dist/{import-D2vUnUZe.mjs → import-DFed8DBt.mjs}

@@ -1,4 +1,4 @@
-import { E as rowToMeta, l as isPersistedEvent } from "./schema-B-8G4lWc.mjs";
+import { D as rowToMeta, l as isPersistedEvent } from "./schema-vwzwEXNE.mjs";
 import { randomUUID } from "node:crypto";
 import { SESSION_FORMAT_VERSION, SessionLogOffset, decodeSeqRanges, decodeStorageRecord } from "@deepseek-ai/dsh-session";
 import { SessionBranch, SessionBranchError, balanceRewindPrefix, buildTimeline } from "@morlay/session-branch";

package/dist/import.mjs

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

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { i as WriteGuard, r as createTablesSql, t as SqliteBackend } from "./sqlite-DIXY-dFZ.mjs";
-import { A as toJsonlArtifact, C as repairOrphanInboxSplices, D as scanRows, E as rowToMeta, O as sessionConflictRow, _ as buildSeqMap, a as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, b as recomputeReplaceProvenance, g as toPostgresSchema, i as SCHEMA_VERSION, k as sessionInsertRow, l as isPersistedEvent, m as postgresTableDefs, n as EPHEMERAL_EVENT_TYPES, o as eventDimensions, r as EVENT_ENCODING, t as DEFAULT_BUSY_TIMEOUT_MS, w as repairSurfaceOps } from "./schema-B-8G4lWc.mjs";
-import { c as SessionBranchRdb, l as SessionBranchRdbProvider, s as registerSessionImport, u as locateTurnEnd } from "./import-D2vUnUZe.mjs";
+import { i as WriteGuard, r as createTablesSql, t as SqliteBackend } from "./sqlite-CG_Qcx5C.mjs";
+import { A as sessionInsertRow, D as rowToMeta, O as scanRows, T as repairSurfaceOps, _ as buildSeqMap, a as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, b as recomputeReplaceProvenance, g as toPostgresSchema, i as SCHEMA_VERSION, j as toJsonlArtifact, k as sessionConflictRow, l as isPersistedEvent, m as postgresTableDefs, n as EPHEMERAL_EVENT_TYPES, o as eventDimensions, r as EVENT_ENCODING, t as DEFAULT_BUSY_TIMEOUT_MS, w as repairOrphanInboxSplices } from "./schema-vwzwEXNE.mjs";
+import { c as SessionBranchRdb, l as SessionBranchRdbProvider, s as registerSessionImport, u as locateTurnEnd } from "./import-DFed8DBt.mjs";
 import z from "@deepseek-ai/schemastery";
 import { randomUUID } from "node:crypto";
 import { Pool } from "pg";

package/dist/{schema-B-8G4lWc.mjs → schema-vwzwEXNE.mjs}

@@ -59,6 +59,12 @@ function remapShadowedRange(range, remap) {
 		end: remap(range.end)
 	};
 }
+function remapShadowedSeqs(seqs, seqMap) {
+	return seqs.flatMap((seq) => {
+		const dense = seqMap.get(seq);
+		return dense === void 0 ? [] : [dense];
+	});
+}
 function rowToEvent(row, seqMap) {
 	const remap = (seq) => seqMap.get(seq) ?? seq;
 	const surfaceOp = row.fSurfaceOp !== null ? remapSurfaceOp(JSON.parse(row.fSurfaceOp), remap) : void 0;
@@ -66,6 +72,7 @@ function rowToEvent(row, seqMap) {
 	if (row.fType === "compaction/summary" || row.fType === "compaction/prune") {
 		const metering = data;
 		if (metering.shadowedRange !== void 0) metering.shadowedRange = remapShadowedRange(metering.shadowedRange, remap);
+		if (metering.shadowedSeqs !== void 0) metering.shadowedSeqs = remapShadowedSeqs(metering.shadowedSeqs, seqMap);
 	}
 	return {
 		type: row.fType,
@@ -85,12 +92,31 @@ const SURFACE_EVENT_TYPES = /* @__PURE__ */ new Set([
 	"assistant/message",
 	"tool/result"
 ]);
+const METERING_EVENT_TYPES = /* @__PURE__ */ new Set(["compaction/summary", "compaction/prune"]);
+/**
+* 读取时重计算 replace 的 sourceEventSeqs（sourceEventSeqs 不落库）。
+*
+* 优先采用紧邻 metering 事件（compaction/summary | compaction/prune）的
+* shadowedSeqs：它是压缩事务落库的**权威被遮蔽节点列表**（range 只是首尾
+* 边界对，压缩竞态下可能漏掉并发落地的节点——range 数值扫描会漏掉这些
+* 节点，使上游 assertProvenance 报 missing）。shadowedSeqs 已由 rowToEvent
+* 重映射到稠密坐标，与 replace 的 surfaceOp range 同空间。
+*
+* 无紧邻 metering 事件时回退到 range 数值扫描（历史数据 / 非压缩 replace，
+* 如 tool-result pruner 的旧样式），保证既有行为不变。
+*/
 function recomputeReplaceProvenance(events) {
-	for (const event of events) {
-		const raw = event;
+	for (let i = 0; i < events.length; i++) {
+		const raw = events[i];
 		const op = raw.surfaceOp;
 		if (typeof op !== "object" || op === null || op.op !== "replace") continue;
 		const { start, end } = 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) {
+			raw.sourceEventSeqs = meteringData.shadowedSeqs;
+			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);
 		raw.sourceEventSeqs = refs;
@@ -849,4 +875,4 @@ function eventDimensions(event) {
 	}
 }
 //#endregion
-export { toJsonlArtifact as A, repairOrphanInboxSplices as C, scanRows as D, rowToMeta as E, sessionConflictRow as O, remapSurfaceOp as S, rowToEvent as T, buildSeqMap as _, SESSION_PERSISTENCE_SQLITE_APPLICATION_ID as a, recomputeReplaceProvenance as b, isEphemeralType as c, tPersistenceState as d, tSessionEvents as f, toPostgresSchema as g, sqliteTableDefs as h, SCHEMA_VERSION as i, sessionInsertRow as k, isPersistedEvent as l, postgresTableDefs as m, EPHEMERAL_EVENT_TYPES as n, eventDimensions as o, tSessions as p, EVENT_ENCODING as r, eventKind as s, DEFAULT_BUSY_TIMEOUT_MS as t, tEvents as u, findSurfaceRepairs as v, repairSurfaceOps as w, remapShadowedRange as x, orphanInboxSpliceSeqs as y };
+export { sessionInsertRow as A, remapSurfaceOp as C, rowToMeta as D, rowToEvent as E, scanRows as O, remapShadowedSeqs as S, repairSurfaceOps as T, buildSeqMap as _, SESSION_PERSISTENCE_SQLITE_APPLICATION_ID as a, recomputeReplaceProvenance as b, isEphemeralType as c, tPersistenceState as d, tSessionEvents as f, toPostgresSchema as g, sqliteTableDefs as h, SCHEMA_VERSION as i, toJsonlArtifact as j, sessionConflictRow as k, isPersistedEvent as l, postgresTableDefs as m, EPHEMERAL_EVENT_TYPES as n, eventDimensions as o, tSessions as p, EVENT_ENCODING as r, eventKind as s, DEFAULT_BUSY_TIMEOUT_MS as t, tEvents as u, findSurfaceRepairs as v, repairOrphanInboxSplices as w, remapShadowedRange as x, orphanInboxSpliceSeqs as y };

package/dist/{sqlite-DIXY-dFZ.mjs → sqlite-CG_Qcx5C.mjs}

@@ -1,4 +1,4 @@
-import { O as sessionConflictRow, a as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, d as tPersistenceState, f as tSessionEvents, h as sqliteTableDefs, k as sessionInsertRow, o as eventDimensions, p as tSessions, t as DEFAULT_BUSY_TIMEOUT_MS, u as tEvents } from "./schema-B-8G4lWc.mjs";
+import { A as sessionInsertRow, a as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, d as tPersistenceState, f as tSessionEvents, h as sqliteTableDefs, k as sessionConflictRow, o as eventDimensions, p as tSessions, t as DEFAULT_BUSY_TIMEOUT_MS, u as tEvents } from "./schema-vwzwEXNE.mjs";
 import { randomUUID } from "node:crypto";
 import { and, desc, eq, gte, sql } from "drizzle-orm";
 import { statSync } from "node:fs";

package/dist/storage.mjs

@@ -1,3 +1,3 @@
-import { i as WriteGuard, n as openDatabase, t as SqliteBackend } from "./sqlite-DIXY-dFZ.mjs";
-import { a as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, c as isEphemeralType, d as tPersistenceState, f as tSessionEvents, i as SCHEMA_VERSION, l as isPersistedEvent, n as EPHEMERAL_EVENT_TYPES, o as eventDimensions, p as tSessions, r as EVENT_ENCODING, s as eventKind, t as DEFAULT_BUSY_TIMEOUT_MS, u as tEvents } from "./schema-B-8G4lWc.mjs";
+import { i as WriteGuard, n as openDatabase, t as SqliteBackend } from "./sqlite-CG_Qcx5C.mjs";
+import { a as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, c as isEphemeralType, d as tPersistenceState, f as tSessionEvents, i as SCHEMA_VERSION, l as isPersistedEvent, n as EPHEMERAL_EVENT_TYPES, o as eventDimensions, p as tSessions, r as EVENT_ENCODING, s as eventKind, t as DEFAULT_BUSY_TIMEOUT_MS, u as tEvents } from "./schema-vwzwEXNE.mjs";
 export { DEFAULT_BUSY_TIMEOUT_MS, EPHEMERAL_EVENT_TYPES, EVENT_ENCODING, SCHEMA_VERSION, SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, SqliteBackend, WriteGuard, eventDimensions, eventKind, isEphemeralType, isPersistedEvent, openDatabase, tEvents, tPersistenceState, tSessionEvents, tSessions };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/session-rdb",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "RDB durable session backend for DeepSeek Harness: implements both session-persistence and session-branch (rewind / retry / fork) providers.",
   "keywords": [
     "branch",

package/src/log.ts

@@ -90,6 +90,19 @@ export function remapShadowedRange(
   return { start: remap(range.start), end: remap(range.end) };
 }
 
+export function remapShadowedSeqs(
+  seqs: readonly number[],
+  seqMap: ReadonlyMap<number, number>,
+): number[] {
+  // 未持久化的引用（分支裁剪等）直接丢弃：恒等回退会留下陈旧的上游 seq，
+  // 稠密坐标通常被压缩，它可能大于 replace 事件的稠密 seq，上游
+  // assertProvenance 会以 "must reference earlier events" 拒绝整个会话。
+  return seqs.flatMap((seq) => {
+    const dense = seqMap.get(seq);
+    return dense === undefined ? [] : [dense];
+  });
+}
+
 export function rowToEvent(row: EventRow, seqMap: ReadonlyMap<number, number>): SessionEvent {
   const remap = (seq: number): number => seqMap.get(seq) ?? seq;
   const surfaceOp =
@@ -97,12 +110,21 @@ export function rowToEvent(row: EventRow, seqMap: ReadonlyMap<number, number>):
       ? remapSurfaceOp(JSON.parse(row.fSurfaceOp) as SurfaceOp, remap)
       : undefined;
   const data = JSON.parse(row.fData) as SessionEvent["data"];
-  // compaction 事件的 shadowedRange 是插件合并字段，经结构化视图重映射。
+  // compaction 事件的 shadowedRange / shadowedSeqs 是插件合并字段，经结构化
+  // 视图重映射到稠密坐标。shadowedSeqs 是权威的被遮蔽节点列表（range 只是
+  // 首尾边界对，压缩竞态下可能漏掉并发落地的节点），replace 的 provenance
+  // 重计算依赖它，必须与 range 同空间。
   if (row.fType === "compaction/summary" || row.fType === "compaction/prune") {
-    const metering = data as unknown as { shadowedRange?: { start: number; end: number } };
+    const metering = data as unknown as {
+      shadowedRange?: { start: number; end: number };
+      shadowedSeqs?: number[];
+    };
     if (metering.shadowedRange !== undefined) {
       metering.shadowedRange = remapShadowedRange(metering.shadowedRange, remap);
     }
+    if (metering.shadowedSeqs !== undefined) {
+      metering.shadowedSeqs = remapShadowedSeqs(metering.shadowedSeqs, seqMap);
+    }
   }
   return {
     type: row.fType as SessionEvent["type"],
@@ -125,14 +147,38 @@ export function buildSeqMap(
 
 const SURFACE_EVENT_TYPES = new Set(["user/message", "assistant/message", "tool/result"]);
 
+const METERING_EVENT_TYPES = new Set(["compaction/summary", "compaction/prune"]);
+
+/**
+ * 读取时重计算 replace 的 sourceEventSeqs（sourceEventSeqs 不落库）。
+ *
+ * 优先采用紧邻 metering 事件（compaction/summary | compaction/prune）的
+ * shadowedSeqs：它是压缩事务落库的**权威被遮蔽节点列表**（range 只是首尾
+ * 边界对，压缩竞态下可能漏掉并发落地的节点——range 数值扫描会漏掉这些
+ * 节点，使上游 assertProvenance 报 missing）。shadowedSeqs 已由 rowToEvent
+ * 重映射到稠密坐标，与 replace 的 surfaceOp range 同空间。
+ *
+ * 无紧邻 metering 事件时回退到 range 数值扫描（历史数据 / 非压缩 replace，
+ * 如 tool-result pruner 的旧样式），保证既有行为不变。
+ */
 export function recomputeReplaceProvenance(events: SessionEvent[]): void {
-  for (const event of events) {
+  for (let i = 0; i < events.length; i++) {
+    const event = events[i]!;
     const raw = event as SessionEvent & { 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 metering = i > 0 ? events[i - 1] : undefined;
+    const meteringData =
+      metering !== undefined && METERING_EVENT_TYPES.has(metering.type)
+        ? (metering.data as unknown as { shadowedSeqs?: number[] })
+        : undefined;
+    if (meteringData?.shadowedSeqs !== undefined) {
+      raw.sourceEventSeqs = meteringData.shadowedSeqs;
+      continue;
+    }
     const refs: number[] = [];
     for (const candidate of events) {
       if (