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

package/README.md

@@ -1,9 +1,9 @@
 # @morlay/session-rdb
 
-RDB（SQLite / PostgreSQL）持久会话后端（`ctx.sessionPersistence`）：通过 drizzle
-实现 `PersistenceBackend<number>`，复用上游 `PersistenceCoordinator` 与契约测试套件，
-支持配置选择 SQLite 或 PostgreSQL 后端。设计细节（表结构、delta 过滤、并发写、
-方言差异、仓库结构）见 [docs/design.md](docs/design.md)。
+RDB（SQLite / PostgreSQL）持久会话后端（`ctx.sessionPersistence`）：实现上游
+`SessionHandle` 模型（`create`/`open`/`flush`/`stat`/`list`），支持配置选择
+SQLite 或 PostgreSQL 后端。设计细节（表结构、原样存储、并发写、方言差异、
+仓库结构）见 [docs/design.md](docs/design.md)。
 
 ## 配置
 
@@ -59,18 +59,16 @@ type Config =
 provider 抽象并**随插件自动注册 `ctx.sessionBranch`**（`SessionBranchRdb`），
 在不修改上游代码的前提下提供 `rewind / retry / fork` 的持久化闭环：
 
-- **`forkFrom`**：走标准 coordinator 路径（`create` + `append`）从闭合边界
+- **`forkFrom`**：走标准 handle 路径（`create` + `append`）从闭合边界
   派生新会话（纯 append，`parentSession` / `seedLength` lineage）；
 - **`rewind`**：直接操作后端事务截断到闭合边界（DELETE 尾部 + head 回退 +
-  revision bump），随后重新 `load` 同步 coordinator 状态，并更新并发写
-  检测 head；**支持 live 会话**（`ctx.sessions` 有 owner 时同样就地工作：
-  先 flush write-behind 缓冲 → 截断 RDB → 截断 live 内存 log 并复位
-  surface/header/context/derived 派生缓存 → 重置 agent 请求头标记 →
-  同步 coordinator cursor；不调用 `load`——live 时 load 会先 flush 撤销
-  截断）；
+  revision bump），并更新并发写检测 head；**支持 live 会话**（`ctx.sessions`
+  有 owner 时同样就地工作：先 flush write-behind 缓冲 → 截断 RDB → 截断
+  live 内存 log 并复位 surface/header/context/derived 派生缓存 → 重置 agent
+  请求头标记 → 对齐 handle cursor；不调用 `load`——live 时 load 会先 flush
+  撤销截断）；
 - **`timeline`**：`parentSession` + `seedLength` 版本树投影（live 会话含
-  版本效果；cold 会话因版本事件携带 `ignorable` 不进 canonical log 而只有
-  lineage 骨架）。
+  版本效果；cold 会话版本事件原样落库，效果详情可恢复）。
 
 上层编排（edit / reroll / retry / rewind / fork 完整功能）由
 `@morlay/ui-conversation-message-actions` 提供，或直接在 `ctx.sessionBranch` /

package/dist/artifact.d.mts

@@ -1,7 +1,7 @@
-import { b as EventRow, x as SessionRow } from "./schema-CFXZURX7.mjs";
-import { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, expandProvenanceFromStorage, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport } from "./import.mjs";
+import { v as EventRow, y as SessionRow } from "./schema-COK7-wRV.mjs";
+import { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport } from "./import.mjs";
 import { SessionStorageMetadata } from "@deepseek-ai/dsh-session-persistence";
-import { SessionEvent, SessionHeader, SurfaceOp } from "@deepseek-ai/dsh-session";
+import { SessionEvent, SessionHeader } from "@deepseek-ai/dsh-session";
 //#region src/log.d.ts
 declare function rowToMeta(row: SessionRow): SessionHeader;
 declare function sessionInsertRow(storage: SessionStorageMetadata, incarnation: string): {
@@ -27,17 +27,7 @@ declare function sessionConflictRow(storage: SessionStorageMetadata): {
   fOrigin: string | null;
   fDelegationDepth: number | null;
 };
-declare function remapSurfaceOp(op: SurfaceOp, remap: (seq: number) => number): SurfaceOp;
-declare function remapShadowedRange(range: {
-  start: number;
-  end: number;
-}, remap: (seq: number) => number): {
-  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>;
+declare function rowToEvent(row: EventRow): SessionEvent;
 /**
  * 读取时重计算 replace 的 sourceEventSeqs（sourceEventSeqs 不落库）。
  *
@@ -55,8 +45,32 @@ declare function findSurfaceRepairs(events: readonly SessionEvent[]): {
   degradeToAppend: Set<number>;
   addAppendMarker: Set<number>;
   clearSurfaceOp: Set<number>;
+  clampEnd: Map<number, number>;
 };
 declare function repairSurfaceOps(events: SessionEvent[]): void;
+/**
+ * 读取时补全 assistant 结算字段：旧写入器不落库 `stream`（v2 才把流式记录
+ * 嵌入消息），读回时缺失即补空数组——上游 seed 校验要求 turn/step/stream
+ * 三者齐备，缺失会让整个会话加载失败。
+ */
+declare function repairAssistantSettlement(events: SessionEvent[]): void;
+/**
+ * 把紧邻 replace 的 metering 事件的 `shadowedRange` / `shadowedSeqs` 对齐到
+ * replace 最终的稠密 range。
+ *
+ * 旧写入器重编号事件后，metering 与 replace 一起落在旧坐标空间：二者数值
+ * 相等但与当前 surface 无关。夹取（或 range 本身已落在稠密空间而 metering
+ * 仍是旧值）后二者不再相等，而上游 token-meter 契约要求紧邻的 metering
+ * range 与 replace range 完全一致（否则报 no adjacent shadow price）。range
+ * 已一致时不改写——当前写入器保证一致，shadowedSeqs 的额外并发节点因此
+ * 原样保留。
+ */
+declare function syncMeteringRanges(events: SessionEvent[]): void;
+/**
+ * 读取视图修复总入口：结算字段补全 → surface 语义修复 → metering 对齐 →
+ * provenance 重算 → 孤儿 inbox splice 改写。全部只作用于内存视图，不落库。
+ */
+declare function repairReadView(events: SessionEvent[]): void;
 /**
  * 定位无法从空状态增量重放的 agent/inbox/spliced 事件（孤儿操作）。
  *
@@ -68,10 +82,10 @@ declare function repairSurfaceOps(events: SessionEvent[]): void;
 declare function orphanInboxSpliceSeqs(events: readonly SessionEvent[]): Set<number>;
 /** 内存修复：把孤儿 inbox splice 改写为 no-op（调用方负责持久化）。 */
 declare function repairOrphanInboxSplices(events: SessionEvent[]): void;
-declare function scanRows(rows: readonly EventRow[], base?: number, seqMap?: ReadonlyMap<number, number>): {
+declare function scanRows(rows: readonly EventRow[], base?: number): {
   preserved: SessionEvent[];
   tornFrom?: number;
 };
 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, remapShadowedSeqs, remapSurfaceOp, repairOrphanInboxSplices, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sessionConflictRow, sessionInsertRow, toJsonlArtifact };
+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 };

package/dist/artifact.mjs

@@ -1,3 +1,3 @@
-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 };
+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 };

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

@@ -1,6 +1,7 @@
-import { D as rowToMeta, l as isPersistedEvent } from "./schema-vwzwEXNE.mjs";
+import { l as rowToMeta } from "./log-DBFUBPhv.mjs";
 import { randomUUID } from "node:crypto";
-import { SESSION_FORMAT_VERSION, SessionLogOffset, decodeSeqRanges, decodeStorageRecord } from "@deepseek-ai/dsh-session";
+import { SESSION_FORMAT_VERSION, SessionLogOffset } from "@deepseek-ai/dsh-session";
+import { sessionFormatCatalog } from "@deepseek-ai/dsh-session-format-catalog";
 import { SessionBranch, SessionBranchError, balanceRewindPrefix, buildTimeline } from "@morlay/session-branch";
 import { unzipSync } from "fflate";
 //#region src/branch.ts
@@ -78,10 +79,7 @@ var SessionBranchRdbProvider = class {
 	constructor(persistence, live = {
 		getSession: () => void 0,
 		getAgent: () => void 0,
-		flush: async () => true,
-		setCoordinatorCursor: () => {},
-		setCoordinatorState: () => {},
-		setCoordinatorSeedLength: () => {}
+		flush: async () => true
 	}) {
 		this.persistence = persistence;
 		this.live = live;
@@ -95,7 +93,7 @@ var SessionBranchRdbProvider = class {
 		};
 	}
 	async readRawEvents(id, signal) {
-		const stored = await this.persistence.loadStored(id, signal);
+		const stored = await this.persistence.readLog(id, {}, signal);
 		if (stored === void 0) throw new SessionBranchError(`session "${id}" not found`, "SESSION_NOT_FOUND");
 		return {
 			meta: stored.meta,
@@ -105,7 +103,8 @@ var SessionBranchRdbProvider = class {
 	async forkFrom(sourceId, options = {}, signal) {
 		signal?.throwIfAborted();
 		const { atSeq, anchorMode = "after", seedSuffix = [], childSessionId, meta = {} } = options;
-		const source = await this.persistence.inspect(sourceId, signal);
+		const source = await this.persistence.readLog(sourceId, {}, signal);
+		if (source === void 0) throw new SessionBranchError(`session "${sourceId}" not found`, "SESSION_NOT_FOUND");
 		const boundary = locateTurnEnd(source.events, atSeq, anchorMode);
 		const prefix = source.events.slice(0, boundary + 1);
 		const childId = childSessionId ?? mintSessionId();
@@ -123,15 +122,19 @@ var SessionBranchRdbProvider = class {
 		const seed = [...renumber(prefix, 0), ...renumber(seedSuffix, prefix.length)];
 		const internals = this.persistence.internals();
 		const sourceRows = await internals.backend.getEventRows(sourceId);
-		const sourceEventIds = new Map(sourceRows.map((row) => [row.fOriginalSeq, row.fEventId]));
+		const sourceEventIds = new Map(sourceRows.map((row) => [row.fSequence, row.fEventId]));
 		const reuse = /* @__PURE__ */ new Map();
 		for (const event of prefix) {
 			const eventId = sourceEventIds.get(event.seq);
 			if (eventId !== void 0) reuse.set(event.seq, eventId);
 		}
 		internals.registerReuseEventIds(childId, reuse);
-		await this.persistence.create(childMeta, prefix.length);
-		if (seed.length > 0) await this.persistence.append(childId, seed);
+		const handle = await this.persistence.create(childMeta, { inheritedEventCount: SessionLogOffset(prefix.length) });
+		try {
+			if (seed.length > 0) await handle.append(seed);
+		} finally {
+			await handle.close();
+		}
 		return childId;
 	}
 	async rewind(id, toBoundary, signal) {
@@ -140,7 +143,7 @@ var SessionBranchRdbProvider = class {
 		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 inspection = live === void 0 ? void 0 : await this.persistence.inspect(id, signal);
+		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;
 		const boundaryEvent = events[toBoundary];
@@ -149,7 +152,7 @@ var SessionBranchRdbProvider = class {
 		const rawKeepLength = toBoundary === -1 ? 0 : boundaryEvent.type === "turn/end" ? toBoundary + 1 : toBoundary;
 		const keepLength = balanceRewindPrefix(events.slice(0, rawKeepLength)).length;
 		const internals = this.persistence.internals();
-		const denseBoundary = live === void 0 ? keepLength - 1 : events.slice(0, keepLength).filter(isPersistedEvent).length - 1;
+		const denseBoundary = keepLength - 1;
 		const newSeedLength = await internals.backend.transaction(async (tx) => {
 			signal?.throwIfAborted();
 			const head = await tx.getHead(id);
@@ -169,7 +172,6 @@ var SessionBranchRdbProvider = class {
 			await tx.bumpRevision(id);
 			return shrunk;
 		});
-		if (newSeedLength !== null) this.live.setCoordinatorSeedLength(id, newSeedLength);
 		internals.writeGuard.confirmHead(id, denseBoundary);
 		if (live !== void 0) {
 			truncateLiveSession(live, keepLength);
@@ -180,9 +182,9 @@ var SessionBranchRdbProvider = class {
 				const phase = agent.phase;
 				if (phase !== void 0) phase.lastTurn = lastTurn;
 			}
-			this.live.setCoordinatorCursor(id, keepLength);
-		} else if (boundaryEvent?.type === "user/message") this.live.setCoordinatorState(id, keepLength, meta);
-		else await this.persistence.load(id);
+			const handle = this.persistence.tracker.writerOf(id);
+			if (handle !== void 0) handle.resetAfterRewind(keepLength, newSeedLength === null ? void 0 : newSeedLength);
+		}
 		const row = await internals.backend.getSession(id);
 		if (row === void 0) return {
 			header: {
@@ -214,29 +216,7 @@ var SessionBranchRdb = class extends SessionBranch {
 		getAgent: (id) => {
 			return this.ctx.get("agents")?.get(id);
 		},
-		flush: (session) => this.ctx.sessions.flush(session),
-		setCoordinatorCursor: (id, cursor) => {
-			const state = this.ctx.sessionPersistence.coordinator?.states?.get(id);
-			if (state !== void 0) state.cursor = cursor;
-		},
-		setCoordinatorState: (id, cursor, meta) => {
-			const states = this.ctx.sessionPersistence.coordinator?.states;
-			if (states === void 0) return;
-			const state = states.get(id);
-			if (state !== void 0) state.cursor = cursor;
-			else states.set(id, {
-				meta,
-				cursor,
-				materialized: true
-			});
-		},
-		setCoordinatorSeedLength: (id, seedLength) => {
-			const state = this.ctx.sessionPersistence.coordinator?.states?.get(id);
-			if (state?.storage !== void 0 && state.storage.inheritedEventCount > seedLength) state.storage = {
-				...state.storage,
-				inheritedEventCount: seedLength
-			};
-		}
+		flush: (session) => this.ctx.sessions.flush(session)
 	});
 	readBranchPrefix(id, atSeq, mode, signal) {
 		return this.provider.readBranchPrefix(id, atSeq, mode, signal);
@@ -250,22 +230,13 @@ var SessionBranchRdb = class extends SessionBranch {
 	rewind(id, toBoundary, signal) {
 		return this.provider.rewind(id, toBoundary, signal);
 	}
-	syncLiveCursor(sessionId) {
-		const live = this.ctx.sessions.get(sessionId);
-		if (live === void 0) return;
-		const state = this.ctx.sessionPersistence.coordinator?.states?.get(sessionId);
-		if (state === void 0) return;
-		let cursor = state.cursor;
-		while (live.snapshotEvents()[cursor]?.ignorable === true) cursor += 1;
-		state.cursor = cursor;
-	}
 	async timeline(sessionId, signal) {
 		const persistence = this.ctx.sessionPersistence;
 		const snapshots = await persistence.listSnapshots(signal);
 		const readOwnEvents = async (id, fromSeq, s) => {
 			const live = this.ctx.sessions.get(id);
 			if (live !== void 0) return live.snapshotEvents().slice(fromSeq);
-			return (await persistence.readFrom(id, fromSeq, s)).events;
+			return (await persistence.internals().readFrom(id, fromSeq, s)).events;
 		};
 		return buildTimeline(snapshots, readOwnEvents, sessionId, signal);
 	}
@@ -275,16 +246,6 @@ var SessionBranchRdb = class extends SessionBranch {
 const SESSION_LOG_ARTIFACT_FILENAME = "session.jsonl";
 const SESSION_IMPORT_PATH = "/api/session.import";
 const MAX_IMPORT_ZIP_BYTES = 67108864;
-function expandProvenanceFromStorage(parsed) {
-	if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) throw new TypeError("imported session records must be objects");
-	const record = parsed;
-	if (record.sourceEventSeqs === void 0) return parsed;
-	if (!Number.isSafeInteger(record.seq) || record.seq < 0) throw new TypeError("imported session event seq must be a non-negative safe integer");
-	return {
-		...record,
-		sourceEventSeqs: decodeSeqRanges(record.sourceEventSeqs, record.seq + 1)
-	};
-}
 function parseJsonlArtifact(content) {
 	const lines = content.split("\n");
 	if (lines.length === 0 || lines[0] === "") throw new Error("imported session log is empty");
@@ -294,10 +255,15 @@ function parseJsonlArtifact(content) {
 	} catch {
 		throw new Error("imported session log has an unparsable header line");
 	}
-	if (typeof header !== "object" || header === null || header["type"] !== "session" || typeof header["id"] !== "string" || typeof header["version"] !== "number" || !Number.isSafeInteger(header["createdAt"]) || header["createdAt"] < 0) throw new Error("imported session log has an invalid header line");
-	const seedLength = header["seedLength"];
-	if (seedLength !== void 0 && (!Number.isSafeInteger(seedLength) || seedLength < 0)) throw new Error("imported session log has an invalid seedLength");
-	const events = [];
+	let restore;
+	try {
+		restore = sessionFormatCatalog.createRestore(header, {
+			recovery: "strict",
+			validation: "transformed"
+		});
+	} catch (error) {
+		throw new Error(`imported session log has an invalid header line: ${error instanceof Error ? error.message : String(error)}`);
+	}
 	for (let i = 1; i < lines.length; i++) {
 		const line = lines[i];
 		if (line === void 0 || line === "") continue;
@@ -307,23 +273,33 @@ function parseJsonlArtifact(content) {
 		} catch {
 			throw new Error(`imported session log has an unparsable event line at ${i}`);
 		}
-		for (const event of decodeStorageRecord(expandProvenanceFromStorage(parsed))) events.push(event);
+		try {
+			restore.decodeRow(parsed);
+		} catch (error) {
+			throw new Error(`imported session log has an invalid event line at ${i}: ${error instanceof Error ? error.message : String(error)}`);
+		}
+	}
+	let artifact;
+	try {
+		artifact = restore.finish();
+	} catch (error) {
+		throw new Error(`imported session log is incomplete: ${error instanceof Error ? error.message : String(error)}`);
 	}
+	const meta = artifact.header;
+	const events = artifact.events;
 	for (let i = 0; i < events.length; i++) if (events[i].seq !== i) throw new Error(`imported session log seq gap at ${i} (got ${events[i].seq}); import requires a dense log`);
-	const origin = header["origin"];
-	const delegationDepth = header["delegationDepth"];
-	const inheritedEventCount = Math.min(seedLength ?? 0, events.length);
+	const inheritedEventCount = Math.min(artifact.inheritedEventCount, events.length);
 	return {
 		meta: {
-			version: header["version"],
-			id: header["id"],
-			createdAt: header["createdAt"],
-			...typeof header["cwd"] === "string" ? { cwd: header["cwd"] } : {},
-			...typeof header["parentSession"] === "string" ? { parentSession: header["parentSession"] } : {},
-			isSeeded: seedLength !== void 0,
-			...origin === "subagent" ? { origin } : {},
-			...Number.isSafeInteger(delegationDepth) && delegationDepth > 0 ? { delegationDepth } : {},
-			...typeof header["agentPreset"] === "string" ? { agentPreset: header["agentPreset"] } : {}
+			version: SESSION_FORMAT_VERSION,
+			id: meta.id,
+			createdAt: meta.createdAt,
+			...meta.cwd === void 0 ? {} : { cwd: meta.cwd },
+			...meta.parentSession === void 0 ? {} : { parentSession: meta.parentSession },
+			isSeeded: meta.isSeeded,
+			...meta.origin === void 0 ? {} : { origin: meta.origin },
+			...meta.delegationDepth === void 0 ? {} : { delegationDepth: meta.delegationDepth },
+			...meta.agentPreset === void 0 ? {} : { agentPreset: meta.agentPreset }
 		},
 		inheritedEventCount: SessionLogOffset(inheritedEventCount),
 		events
@@ -345,11 +321,25 @@ async function persistImport(persistence, branch, imported, targetId, sessions)
 	if (targetId !== void 0) {
 		if (branch === void 0) throw new Error("sessionBranch service is unavailable");
 		await branch.rewind(targetId, -1);
-	} else await persistence.create({
-		...imported.meta,
-		id
-	}, imported.inheritedEventCount);
-	if (imported.events.length > 0) await persistence.append(id, imported.events);
+		const liveHandle = persistence.tracker.writerOf(targetId);
+		if (liveHandle !== void 0) {
+			if (imported.events.length > 0) await liveHandle.append(imported.events);
+		} else {
+			const handle = await persistence.open(targetId, "write");
+			try {
+				if (imported.events.length > 0) await handle.append(imported.events);
+			} finally {
+				await handle.close();
+			}
+		}
+	} else {
+		const handle = await persistence.create({
+			...imported.meta,
+			id
+		}, { inheritedEventCount: imported.inheritedEventCount });
+		if (imported.events.length > 0) await handle.append(imported.events);
+		await handle.close();
+	}
 	if (targetId !== void 0) {
 		const live = sessions?.get(targetId);
 		if (live !== void 0) replaceLiveSessionLog(live, imported.events);
@@ -435,4 +425,4 @@ function registerSessionImport(ctx, persistence) {
 	});
 }
 //#endregion
-export { parseJsonlArtifact as a, SessionBranchRdb as c, parseImportZip as i, SessionBranchRdbProvider as l, SESSION_LOG_ARTIFACT_FILENAME as n, persistImport as o, expandProvenanceFromStorage as r, registerSessionImport as s, SESSION_IMPORT_PATH as t, locateTurnEnd as u };
+export { persistImport as a, SessionBranchRdbProvider as c, parseJsonlArtifact as i, locateTurnEnd as l, SESSION_LOG_ARTIFACT_FILENAME as n, registerSessionImport as o, parseImportZip as r, SessionBranchRdb as s, SESSION_IMPORT_PATH as t };

package/dist/import.d.mts

@@ -1,11 +1,10 @@
-import { n as SessionPersistenceRdb } from "./index-uUvn6gYp.mjs";
+import { n as SessionPersistenceRdb } from "./index-GdKkSSb-.mjs";
 import { SessionStorageMetadata } from "@deepseek-ai/dsh-session-persistence";
 import { Session, SessionEvent, SessionId } from "@deepseek-ai/dsh-session";
 import { Context } from "@deepseek-ai/cordis";
 //#region src/import.d.ts
 declare const SESSION_LOG_ARTIFACT_FILENAME = "session.jsonl";
 declare const SESSION_IMPORT_PATH = "/api/session.import";
-declare function expandProvenanceFromStorage(parsed: unknown): unknown;
 declare function parseJsonlArtifact(content: string): SessionStorageMetadata & {
   events: SessionEvent[];
 };
@@ -21,4 +20,4 @@ declare function persistImport(persistence: SessionPersistenceRdb, branch: {
 }): Promise<SessionId>;
 declare function registerSessionImport(ctx: Context, persistence: SessionPersistenceRdb): void;
 //#endregion
-export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, expandProvenanceFromStorage, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport };
+export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport };

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-DFed8DBt.mjs";
-export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, expandProvenanceFromStorage, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport };
+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, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport };