@morlay/session-rdb 0.0.20 → 0.0.21-alpha.1

package/dist/import.d.mts

@@ -1,19 +1,19 @@
-import { r as SessionPersistenceRdb } from "./index-D55G9n4k.mjs";
+import { u as SessionPersistenceRdb } from "./backend-DpdtxYpz.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
-/** 当前世代产物的文件名（读入侧接受任意 canonical 世代名，见 parseImportZip）。 */
 declare const SESSION_LOG_ARTIFACT_FILENAME = "session.jsonl";
 declare const SESSION_IMPORT_PATH = "/api/session.import";
 declare function parseJsonlArtifact(content: string): SessionStorageMetadata & {
   events: SessionEvent[];
 };
-declare function parseImportZip(zip: Uint8Array): SessionStorageMetadata & {
+declare function parseImportZip(zip: Uint8Array): Promise<SessionStorageMetadata & {
   events: SessionEvent[];
-};
+}>;
 declare function persistImport(persistence: SessionPersistenceRdb, branch: {
   rewind(id: SessionId, toBoundary: number): Promise<unknown>;
+  resetLiveDerivedState?(session: Session): void;
 } | undefined, imported: SessionStorageMetadata & {
   events: SessionEvent[];
 }, targetId?: SessionId, sessions?: {

package/dist/import.mjs

@@ -1,11 +1,11 @@
-import { i as replaceLiveSessionLog } from "./branch-Co6xlbi0.mjs";
+import { i as replaceLiveSessionLog } from "./branch-5JzX9rUq.mjs";
 import { randomUUID } from "node:crypto";
 import { SESSION_FORMAT_VERSION, SessionLogOffset } from "@deepseek-ai/dsh-session";
 import { parseSessionFormatLogFilename } from "@deepseek-ai/dsh-session-format";
 import { sessionFormatCatalog } from "@deepseek-ai/dsh-session-format-catalog";
-import { unzipSync } from "fflate";
+import { balanceRewindPrefix } from "@morlay/session-branch";
+import { unzip } from "fflate";
 //#region src/import.ts
-/** 当前世代产物的文件名（读入侧接受任意 canonical 世代名，见 parseImportZip）。 */
 const SESSION_LOG_ARTIFACT_FILENAME = "session.jsonl";
 const SESSION_IMPORT_PATH = "/api/session.import";
 const MAX_IMPORT_ZIP_BYTES = 67108864;
@@ -68,10 +68,23 @@ function parseJsonlArtifact(content) {
 		events
 	};
 }
-function parseImportZip(zip) {
+/**
+* fflate 的 `unzip` 是回调式异步 API（node 侧内部走 worker_threads，浏览器侧走 Web Worker），
+* 这里桥成 Promise。它与 `unzipSync` 的差异只在同步/异步：非法 zip 走的是同一段校验代码，
+* 拒绝的错误对象与同步版一致，因此上层文案无需区分。
+*/
+function unzipAsync(data) {
+	return new Promise((resolve, reject) => {
+		unzip(data, (error, entries) => {
+			if (error === null) resolve(entries);
+			else reject(error);
+		});
+	});
+}
+async function parseImportZip(zip) {
 	let entries;
 	try {
-		entries = unzipSync(zip);
+		entries = await unzipAsync(zip);
 	} catch {
 		throw new Error("imported zip is not a valid ZIP archive");
 	}
@@ -87,17 +100,18 @@ async function stopAgentLoop(ctx, sessionId) {
 }
 async function persistImport(persistence, branch, imported, targetId, sessions, stopLoop) {
 	const id = targetId ?? `session-${randomUUID()}`;
+	const events = balanceRewindPrefix(imported.events, { keepOpenTail: true });
 	if (targetId !== void 0) {
 		if (branch === void 0) throw new Error("sessionBranch service is unavailable");
 		if (stopLoop !== void 0) await stopLoop(targetId);
 		await branch.rewind(targetId, -1);
 		const liveHandle = persistence.tracker.writerOf(targetId);
 		if (liveHandle !== void 0) {
-			if (imported.events.length > 0) await liveHandle.append(imported.events);
+			if (events.length > 0) await liveHandle.append(events);
 		} else {
 			const handle = await persistence.open(targetId, "write");
 			try {
-				if (imported.events.length > 0) await handle.append(imported.events);
+				if (events.length > 0) await handle.append(events);
 			} finally {
 				await handle.close();
 			}
@@ -106,13 +120,16 @@ async function persistImport(persistence, branch, imported, targetId, sessions,
 		const handle = await persistence.create({
 			...imported.meta,
 			id
-		}, { inheritedEventCount: imported.inheritedEventCount });
-		if (imported.events.length > 0) await handle.append(imported.events);
+		}, { inheritedEventCount: SessionLogOffset(Math.min(imported.inheritedEventCount, events.length)) });
+		if (events.length > 0) await handle.append(events);
 		await handle.close();
 	}
 	if (targetId !== void 0) {
 		const live = sessions?.get(targetId);
-		if (live !== void 0) replaceLiveSessionLog(live, imported.events);
+		if (live !== void 0) {
+			replaceLiveSessionLog(live, events);
+			branch?.resetLiveDerivedState?.(live);
+		}
 	}
 	return id;
 }
@@ -166,7 +183,7 @@ function registerSessionImport(ctx, persistence) {
 				}
 				let imported;
 				try {
-					imported = parseImportZip(zip);
+					imported = await parseImportZip(zip);
 				} catch (error) {
 					res.writeHead(400, { "content-type": "application/json" });
 					res.end(JSON.stringify({ error: error instanceof Error ? error.message : "imported zip is invalid" }));

package/dist/index.d.mts

@@ -1,3 +1,2 @@
-import { o as SCHEMA_VERSION } from "./schema-BkQN5GyT.mjs";
-import { a as SessionBranchRdb, i as SessionPersistenceRdbInternals, n as ProjectionCacheOptions, o as SessionBranchRdbProvider, r as SessionPersistenceRdb, s as locateTurnEnd, t as Config } from "./index-D55G9n4k.mjs";
-export { Config, ProjectionCacheOptions, SCHEMA_VERSION, SessionBranchRdb, SessionBranchRdbProvider, SessionPersistenceRdb, SessionPersistenceRdb as default, SessionPersistenceRdbInternals, locateTurnEnd };
+import { c as SessionDeletionError, d as SessionPersistenceRdbInternals, f as SessionBranchRdb, l as SessionDeletionErrorCode, m as locateTurnEnd, o as Config, p as SessionBranchRdbProvider, s as ProjectionCacheOptions, u as SessionPersistenceRdb, x as SCHEMA_VERSION } from "./backend-DpdtxYpz.mjs";
+export { Config, ProjectionCacheOptions, SCHEMA_VERSION, SessionBranchRdb, SessionBranchRdbProvider, SessionDeletionError, SessionDeletionErrorCode, SessionPersistenceRdb, SessionPersistenceRdb as default, SessionPersistenceRdbInternals, locateTurnEnd };