@morlay/session-rdb 0.1.8 → 0.1.10-alpha.0

package/README.md

@@ -18,11 +18,17 @@ provider 面），并接管 `ctx.sessionQuery`（全文检索 disabled）与 `$D
     path: /absolute/path/to/sessions.sqlite # 自定义路径请用绝对路径；省略则由 bundle patch 的默认值兜底
     journalMode: wal
     busyTimeout: 5000
+    preparedSessionCacheSize: 1 # 冷会话观察缓存容量（条数，最小 1）
 ```
 
 PostgreSQL 同理：`type: postgres` + `connectionString`（可加 `schema`，默认 `public`）。字段、默认值、装配默认值的
 来源与「改配置由 Loader 重挂这一行生效」见[设计总览](./.agents/designs/20260917-设计总览.md)的「配置门面」。
 
+`preparedSessionCacheSize` 透传给上游 `session-query` 的冷会话观察缓存：缓存**按条目数**持有完整 `Session`
+（含整份 append-only log），被活跃观察租约钉住的条目不淘汰；一次读取中途转成 live 时会重试 live 路径，但不会
+顺手清掉已缓存的 cold 条目——同一个 id 因此可能同时有两份 log 驻留。上游默认 5，**本行默认 1**（本地单用户、
+rdb 后端，冷读复用的收益不值这份内存放大）；上游校验下限是 1，不能设 0。
+
 管理面的 HTTP 通道统一挂在 `/api/morlay/v1/session` 前缀下（均为 `POST`，body `{ sessionId }` 或列表请求
 `{ query?, includeSubagents?, page?, pageSize? }`）：`/rows`（完整语料，含归档）、`/export`、`/import`、
 `/delete`、`/gc`、`/usage`（前缀与上游分家的理由见

package/dist/artifact.d.mts

@@ -1,4 +1,3 @@
-import { C as usageRowOf, Ft as SESSION_IMPORT_PATH, S as toJsonlArtifact, _ as sealOwnEvents, a as normalizeToCurrentShape, b as syncMeteringRanges, c as renameLegacyPtcEvents, d as repairReadView, f as repairRequestHeaders, g as scanRows, h as rowToMeta, i as needsShapeAdoption, l as repairAssistantSettlement, m as rowToEvent, n as OWN_EVENT_TYPES, o as orphanInboxSpliceSeqs, p as repairSurfaceOps, r as findSurfaceRepairs, s as recomputeReplaceProvenance, t as EventUsageRow, u as repairOrphanInboxSplices, v as sessionConflictRow, x as titleOfEventData, y as sessionInsertRow } from "./log-C0q5svm7.mjs";
+import { C as usageRowOf, It as SESSION_IMPORT_PATH, S as toJsonlArtifact, _ as sealOwnEvents, a as normalizeToCurrentShape, b as syncMeteringRanges, c as renameLegacyPtcEvents, d as repairReadView, f as repairRequestHeaders, g as scanRows, h as rowToMeta, i as needsShapeAdoption, l as repairAssistantSettlement, m as rowToEvent, n as OWN_EVENT_TYPES, o as orphanInboxSpliceSeqs, p as repairSurfaceOps, r as findSurfaceRepairs, s as recomputeReplaceProvenance, t as EventUsageRow, u as repairOrphanInboxSplices, v as sessionConflictRow, x as titleOfEventData, y as sessionInsertRow } from "./log-TYgd8Xkr.mjs";
 import { SESSION_LOG_ARTIFACT_FILENAME, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport } from "./import.mjs";
-//#endregion
 export { EventUsageRow, OWN_EVENT_TYPES, SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, findSurfaceRepairs, needsShapeAdoption, normalizeToCurrentShape, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, renameLegacyPtcEvents, repairAssistantSettlement, repairOrphanInboxSplices, repairReadView, repairRequestHeaders, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sealOwnEvents, sessionConflictRow, sessionInsertRow, syncMeteringRanges, titleOfEventData, toJsonlArtifact, usageRowOf };

package/dist/artifact.mjs

@@ -1,4 +1,4 @@
-import { i as SESSION_IMPORT_PATH } from "./routes-DGBlBE_I.mjs";
-import { S as usageRowOf, _ as sessionConflictRow, a as orphanInboxSpliceSeqs, b as titleOfEventData, c as repairAssistantSettlement, d as repairRequestHeaders, f as repairSurfaceOps, g as sealOwnEvents, h as scanRows, i as normalizeToCurrentShape, l as repairOrphanInboxSplices, m as rowToMeta, n as findSurfaceRepairs, o as recomputeReplaceProvenance, p as rowToEvent, r as needsShapeAdoption, s as renameLegacyPtcEvents, t as OWN_EVENT_TYPES, u as repairReadView, v as sessionInsertRow, x as toJsonlArtifact, y as syncMeteringRanges } from "./log-DYxdjJ-l.mjs";
+import { i as SESSION_IMPORT_PATH } from "./routes-hZjTcX_R.mjs";
+import { S as usageRowOf, _ as sessionConflictRow, a as orphanInboxSpliceSeqs, b as titleOfEventData, c as repairAssistantSettlement, d as repairRequestHeaders, f as repairSurfaceOps, g as sealOwnEvents, h as scanRows, i as normalizeToCurrentShape, l as repairOrphanInboxSplices, m as rowToMeta, n as findSurfaceRepairs, o as recomputeReplaceProvenance, p as rowToEvent, r as needsShapeAdoption, s as renameLegacyPtcEvents, t as OWN_EVENT_TYPES, u as repairReadView, v as sessionInsertRow, x as toJsonlArtifact, y as syncMeteringRanges } from "./log-CcWy46VE.mjs";
 import { SESSION_LOG_ARTIFACT_FILENAME, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport } from "./import.mjs";
 export { OWN_EVENT_TYPES, SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, findSurfaceRepairs, needsShapeAdoption, normalizeToCurrentShape, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, renameLegacyPtcEvents, repairAssistantSettlement, repairOrphanInboxSplices, repairReadView, repairRequestHeaders, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sealOwnEvents, sessionConflictRow, sessionInsertRow, syncMeteringRanges, titleOfEventData, toJsonlArtifact, usageRowOf };

package/dist/{branch-DbFW3rJX.mjs → branch-CoPCRKer.mjs}

@@ -1,9 +1,9 @@
-import { d as repairRequestHeaders, h as scanRows, i as normalizeToCurrentShape, m as rowToMeta } from "./log-DYxdjJ-l.mjs";
+import { d as repairRequestHeaders, h as scanRows, i as normalizeToCurrentShape, m as rowToMeta } from "./log-CcWy46VE.mjs";
 import { SESSION_FORMAT_VERSION, SessionLogOffset } from "@deepseek-ai/dsh-session";
 import { createSessionFormatCatalogWithChildren } from "@deepseek-ai/dsh-session-format-catalog";
 import { randomUUID } from "node:crypto";
 import { SessionBranch, SessionBranchError, balanceRewindPrefix, rewindKeepLength } from "@morlay/session-branch";
-//#region src/legacy.ts
+// src/legacy.ts
 function physicalHeader(row) {
 	const common = {
 		type: "session",
@@ -66,8 +66,7 @@ function adoptLegacyRows(row, eventRows) {
 		...tornFrom !== void 0 ? { tornFrom } : {}
 	};
 }
-//#endregion
-//#region src/branch.ts
+// src/branch.ts
 function assertRewindBoundary(id, toBoundary, boundaryType, head) {
 	if (toBoundary === -1) return;
 	if (toBoundary > head) throw new SessionBranchError(`rewind boundary ${toBoundary} is beyond the stored head ${head}`, "INVALID_BOUNDARY");
@@ -113,8 +112,20 @@ function resetSurfaceManager(surfaceManager) {
 	surfaceManager._lastProcessedSeq = surfaceManager.baseSeq - 1;
 	surfaceManager._pendingPlan = void 0;
 }
+/**
+* 会话**当前内存 log** 的快照（复制一份）。用于"需要完整序列"的操作（首次落库的 seed、rewind / fork 的历史），
+* 不走已弃用的同步历史读 `snapshotEvents()`——那三个读口上游已声明「新调用禁止」，而这里要的是当前内存里
+* 那份完整日志，不是按需分页的历史。
+* @param session - 会话。
+* @returns 事件副本（调用方可以自由遍历）。
+*/
+function liveEventsOf(session) {
+	return [...session.log];
+}
+/** @returns 截断后日志里最后一个 `turn/start` 的 turn 号（没有则 0）。 */
 function truncateLiveSession(session, newLength) {
 	const s = session;
+	const lastTurn = s.log.slice(0, newLength).findLast((event) => event.type === "turn/start")?.data.turn ?? 0;
 	s.log.length = newLength;
 	s.eventsSnapshot = void 0;
 	s.headerFold = void 0;
@@ -125,6 +136,7 @@ function truncateLiveSession(session, newLength) {
 	s.derivedNodes = 0;
 	s.derivedGeneration = 0;
 	resetSurfaceManager(s.surfaceManager);
+	return lastTurn;
 }
 function replaceLiveSessionLog(session, events) {
 	const s = session;
@@ -262,13 +274,12 @@ var SessionBranchRdbProvider = class {
 		});
 		internals.writeGuard.confirmHead(id, denseBoundary);
 		if (live !== void 0) {
-			truncateLiveSession(live, keepLength);
+			const lastTurn = truncateLiveSession(live, keepLength);
 			this.live.resetProjections?.(live);
 			this.live.resetTokenMeter?.(live);
 			const agent = this.live.getAgent(id);
 			if (agent !== void 0) {
 				agent.requestHeaderLogged = false;
-				const lastTurn = live.snapshotEvents().findLast((e) => e.type === "turn/start")?.data.turn ?? 0;
 				const phase = agent.phase;
 				if (phase !== void 0) phase.lastTurn = lastTurn;
 			}
@@ -387,5 +398,4 @@ var SessionBranchRdb = class extends SessionBranch {
 		return this.provider.rewind(id, toBoundary, signal);
 	}
 };
-//#endregion
-export { truncateLiveSession as a, isLegacyVersion as c, replaceLiveSessionLog as i, restoreCatalog as l, SessionBranchRdbProvider as n, adoptLegacyRows as o, locateTurnEnd as r, convertLegacyRows as s, SessionBranchRdb as t };
+export { replaceLiveSessionLog as a, convertLegacyRows as c, locateTurnEnd as i, isLegacyVersion as l, SessionBranchRdbProvider as n, truncateLiveSession as o, liveEventsOf as r, adoptLegacyRows as s, SessionBranchRdb as t, restoreCatalog as u };

package/dist/{deletion-ODZFcbZm.mjs → deletion-CWl89TIR.mjs}

@@ -1,9 +1,9 @@
-import { a as SESSION_ROWS_PATH, t as SESSION_DELETE_PATH } from "./routes-DGBlBE_I.mjs";
+import { a as SESSION_ROWS_PATH, t as SESSION_DELETE_PATH } from "./routes-hZjTcX_R.mjs";
 import { COUNTED_EVENT_TYPES, addActivityCount, addActivityTotals, addTokenTotals, addTotals, emptyTotals, localDayKey, registerSessionUsage } from "./usage.mjs";
-import { S as usageRowOf, _ as sessionConflictRow, b as titleOfEventData, g as sealOwnEvents, h as scanRows, m as rowToMeta, r as needsShapeAdoption, u as repairReadView, v as sessionInsertRow, x as toJsonlArtifact } from "./log-DYxdjJ-l.mjs";
-import { c as isLegacyVersion, o as adoptLegacyRows, s as convertLegacyRows, t as SessionBranchRdb } from "./branch-DbFW3rJX.mjs";
+import { S as usageRowOf, _ as sessionConflictRow, b as titleOfEventData, g as sealOwnEvents, h as scanRows, m as rowToMeta, r as needsShapeAdoption, u as repairReadView, v as sessionInsertRow, x as toJsonlArtifact } from "./log-CcWy46VE.mjs";
+import { c as convertLegacyRows, l as isLegacyVersion, r as liveEventsOf, s as adoptLegacyRows, t as SessionBranchRdb } from "./branch-CoPCRKer.mjs";
 import { registerSessionImport } from "./import.mjs";
-import { E as WriteGuard, T as toPostgresSchema, a as EVENT_ENCODING, c as eventDimensions, i as DEFAULT_BUSY_TIMEOUT_MS, r as createStorageRepository, t as SqliteBackend, w as postgresTableDefs } from "./sqlite-DjOnMRh2.mjs";
+import { E as WriteGuard, T as toPostgresSchema, a as EVENT_ENCODING, c as eventDimensions, i as DEFAULT_BUSY_TIMEOUT_MS, r as createStorageRepository, t as SqliteBackend, w as postgresTableDefs } from "./sqlite-BNRd1aqR.mjs";
 import { registerSessionExport } from "./export.mjs";
 import { registerSessionGc } from "./gc.mjs";
 import { SESSION_FORMAT_VERSION, SessionLogOffset } from "@deepseek-ai/dsh-session";
@@ -21,7 +21,7 @@ import { migrate } from "drizzle-orm/node-postgres/migrator";
 import { SessionQueryEngine, SessionQueryError } from "@deepseek-ai/dsh-session-query";
 import { StorageError, storageBackendServiceKey } from "@deepseek-ai/dsh-storage";
 import { Service } from "@deepseek-ai/cordis";
-//#region src/postgres.ts
+// src/postgres.ts
 const postgresMigrationsDir = fileURLToPath(new URL("../drizzle/postgres/", import.meta.url));
 const pgWriteQueues = /* @__PURE__ */ new Map();
 const REFRESH_FLAG_CHUNK = 400;
@@ -640,8 +640,7 @@ var PostgresBackend = class PostgresBackend {
 		}).from(this.tables["t_session_events"]).innerJoin(this.tables["t_events"], eq(this.tables["t_session_events"].fEventId, this.tables["t_events"].fEventId));
 	}
 };
-//#endregion
-//#region src/rows.ts
+// src/rows.ts
 const MAX_PAGE_SIZE = 200;
 const DEFAULT_PAGE_SIZE = 20;
 function registerSessionRows(ctx, backend) {
@@ -699,21 +698,27 @@ function registerSessionRows(ctx, backend) {
 		}), "session-rdb: session rows route");
 	});
 }
-//#endregion
-//#region src/session-query.ts
+// src/session-query.ts
 var SessionQueryRdb = class extends SessionQueryEngine {
+	/**
+	* 本次装配用的冷会话观察缓存容量（由 `session-rdb` 行的 `preparedSessionCacheSize` 透传；undefined 表示沿用
+	* 上游默认）。它是**按条目数**持有完整 Session 的缓存：条目多一条就多一份完整 append-only log 驻留。
+	*/
+	preparedSessionCacheSize;
 	constructor(ctx, config = {}) {
 		super(ctx, config);
+		this.preparedSessionCacheSize = config.preparedSessionCacheSize;
 	}
 	async listSessions(signal) {
 		const records = await super.listSessions(signal);
-		const archived = this.archivedSessionIds();
+		const archived = await this.archivedSessionIds();
 		if (archived.size === 0) return records;
 		return records.filter((record) => !archived.has(String(record.header.id)));
 	}
-	archivedSessionIds() {
+	async archivedSessionIds() {
 		const registry = this.ctx.get("workspaceRegistry");
-		return new Set(registry?.archivedSessionIds ?? []);
+		if (registry !== void 0) return new Set(registry.archivedSessionIds ?? []);
+		return await this.ctx.get("sessionPersistence")?.archivedSessionIds?.() ?? /* @__PURE__ */ new Set();
 	}
 	async searchSessions() {
 		throw searchDisabled();
@@ -725,8 +730,12 @@ var SessionQueryRdb = class extends SessionQueryEngine {
 function searchDisabled() {
 	return new SessionQueryError("session search is disabled: this deployment serves session queries from the rdb backend without a full-text index", "SESSION_QUERY_SEARCH_DISABLED");
 }
-//#endregion
-//#region src/storage-takeover/projection-cache.ts
+// src/storage-takeover/projection-cache.ts
+function selects(keys, key) {
+	if (keys === void 0) return true;
+	if ("has" in keys) return keys.has(key);
+	return keys.includes(key);
+}
 const SESSION_PROJECTION_CACHE_SERVICE = "sessionProjectionCache";
 const PREDECESSOR_TITLE_KEY = "title";
 var SessionProjectionCacheRdb = class extends Service {
@@ -770,7 +779,7 @@ var SessionProjectionCacheRdb = class extends Service {
 		return record === void 0 || !identityMatches(record.identity, lifecycleIdentityOf(meta)) ? void 0 : record;
 	}
 	withDirectTitle(id, keys, snapshot) {
-		if (keys !== void 0 && !keys.includes(PREDECESSOR_TITLE_KEY)) return snapshot;
+		if (!selects(keys, PREDECESSOR_TITLE_KEY)) return snapshot;
 		if (snapshot?.values[PREDECESSOR_TITLE_KEY] !== void 0) return snapshot;
 		const direct = this.repository.readSessionTitleDirect?.(id);
 		if (direct === void 0) return snapshot;
@@ -930,8 +939,7 @@ function predecessorIdentityMatches(stored, expected) {
 function lifecycleIdentityMatches(stored, expected) {
 	return stored.createdAt === expected.createdAt && stored.cwd === expected.cwd && (stored.isSeeded ?? false) === expected.isSeeded;
 }
-//#endregion
-//#region src/storage-takeover/storage-backend.ts
+// src/storage-takeover/storage-backend.ts
 const WORKSPACE_UNIT = "workspace";
 const WORKSPACE_TABLE = "workspaces";
 const SCHEDULE_UNIT = "schedule";
@@ -1038,6 +1046,11 @@ var WorkspaceKvUnit = class extends TrackedKvUnit {
 		this.assertTable(table);
 		await this.track(this.repository.deleteWorkspace(key));
 	}
+	async deleteRecords(table, keys) {
+		this.assertOpen();
+		this.assertTable(table);
+		await this.track(this.repository.deleteWorkspaces([...new Set(keys)]));
+	}
 	async setGlobal(value) {
 		this.assertOpen();
 		await this.track(this.repository.writeWorkspaceState(workspaceStateOf(value)));
@@ -1064,6 +1077,11 @@ var ScheduleKvUnit = class extends TrackedKvUnit {
 		this.assertTable(table);
 		await this.track(this.repository.deleteScheduleTask(key));
 	}
+	async deleteRecords(table, keys) {
+		this.assertOpen();
+		this.assertTable(table);
+		await this.track(this.repository.deleteScheduleTasks([...new Set(keys)]));
+	}
 	setGlobal(_value) {
 		throw new Error(`unit '${this.descriptor.name}' declares no global slot`);
 	}
@@ -1095,8 +1113,7 @@ function scheduleTaskOf(value) {
 	if (typeof task !== "object" || task === null || typeof task.sessionId !== "string" || typeof task.record !== "object" || task.record === null) throw new TypeError("schedule task does not match the stored shape");
 	return task;
 }
-//#endregion
-//#region src/storage-takeover/index.ts
+// src/storage-takeover/index.ts
 function installStorageTakeover(ctx, options) {
 	ctx.inject(["storage"], (storageCtx) => {
 		const backend = new RdbStorageBackend(options.repository);
@@ -1115,8 +1132,7 @@ function installStorageTakeover(ctx, options) {
 		ready: options.ready
 	});
 }
-//#endregion
-//#region src/index.ts
+// src/index.ts
 function maxEventTime(events) {
 	let max;
 	for (const event of events) {
@@ -1385,6 +1401,10 @@ var RdbSessionHandle = class RdbSessionHandle {
 	static LIVE_WRITE_BATCH_MAX_DELAY_MS = 200;
 };
 const localized = (text) => text;
+const preparedSessionCacheSchema = z.number().step(1).min(1).default(1).description(localized({
+	zh: "冷会话观察缓存容量（条数，最小 1）：每个条目持一份完整会话日志；本部署默认 1，把同 id 两份日志的驻留压到最小。",
+	en: "Cold prepared-Session observation cache size (entries, minimum 1): each entry holds one complete session log. This deployment defaults to 1, minimizing duplicate per-id residency."
+}));
 const projectionCacheSchema = z.object({
 	writeEveryEvents: z.natural().min(1).default(DEFAULT_PROJECTION_WRITE_EVERY_EVENTS).description(localized({
 		zh: "每累计这么多事件写回一次投影 checkpoint。",
@@ -1419,7 +1439,8 @@ var SessionPersistenceRdb = class extends SessionPersistence {
 			zh: "写锁冲突时的忙等超时（毫秒）。",
 			en: "Busy timeout in ms while a write lock is contended."
 		})),
-		projectionCache: projectionCacheSchema
+		projectionCache: projectionCacheSchema,
+		preparedSessionCacheSize: preparedSessionCacheSchema
 	}), z.object({
 		type: z.const("postgres"),
 		connectionString: z.string().required().description(localized({
@@ -1430,7 +1451,8 @@ var SessionPersistenceRdb = class extends SessionPersistence {
 			zh: "库内的 schema 名；默认 public。",
 			en: "Schema name inside the database; `public` by default."
 		})),
-		projectionCache: projectionCacheSchema
+		projectionCache: projectionCacheSchema,
+		preparedSessionCacheSize: preparedSessionCacheSchema
 	})]).description(localized({
 		zh: "会话持久化后端：改这里的连接参数会在这一行重挂时生效（Loader 会重装被改的行）。",
 		en: "Session persistence backend: edits apply when this row is remounted (the Loader re-installs changed rows)."
@@ -1452,7 +1474,8 @@ var SessionPersistenceRdb = class extends SessionPersistence {
 		this.ready = this.init();
 		this.installLiveRouting(ctx);
 		new SessionBranchRdb(this.ctx);
-		this.ctx.plugin(SessionQueryRdb, {});
+		const queryConfig = this.config.preparedSessionCacheSize === void 0 ? {} : { preparedSessionCacheSize: this.config.preparedSessionCacheSize };
+		this.ctx.plugin(SessionQueryRdb, queryConfig);
 		registerSessionImport(this.ctx, this);
 		registerSessionDeletion(this.ctx, this);
 		registerSessionExport(this.ctx, this);
@@ -1623,6 +1646,16 @@ var SessionPersistenceRdb = class extends SessionPersistence {
 		await this.ready;
 		await this.backend.vacuum();
 	}
+	/**
+	* 已归档的会话 id（`t_sessions.f_archived_at` 非空）。`session/list` 默认过滤掉它们。
+	* 读的是持久化里的归档标记，不依赖 `workspaceRegistry` 服务的就绪时机。
+	* @returns 归档过的 Session id 集。
+	*/
+	async archivedSessionIds() {
+		await this.ready;
+		const state = await this.backend.storage.readWorkspaceState();
+		return new Set((state?.archivedSessionIds ?? []).map(String));
+	}
 	async unarchiveBeforeDeletion(id) {
 		const registry = this.ctx.get("workspaceRegistry");
 		if (registry === void 0) return;
@@ -2011,14 +2044,14 @@ var SessionPersistenceRdb = class extends SessionPersistence {
 		let handle;
 		if (stored === void 0) {
 			handle = await this.create(session.header, { inheritedEventCount: session.inheritedEventCount });
-			const seed = session.snapshotEvents();
+			const seed = liveEventsOf(session);
 			if (seed.length > 0) await handle.append(seed);
 		} else {
 			if (stored.meta.cwd !== session.header.cwd) throw new Error(`session "${id}" is already persisted at a different cwd (persisted: ${String(stored.meta.cwd)}, live: ${String(session.header.cwd)}) (id collision)`);
 			if (stored.inheritedEventCount !== session.inheritedEventCount) throw new Error(`session "${id}" is already persisted with a different inherited event count (id collision)`);
 			assertVersion(stored.meta);
 			repairReadView(stored.events);
-			const seed = session.snapshotEvents();
+			const seed = liveEventsOf(session);
 			if (!seedCoversPrefix(seed, stored.events)) throw new Error(`session "${id}" already has a persisted log on disk that does not match this live session (id collision)`);
 			handle = await this.open(id, "write");
 			const suffix = seed.slice(stored.events.length);
@@ -2152,8 +2185,7 @@ async function appendEventTail(tx, meta, events, anchor, reuse) {
 		usageRows
 	};
 }
-//#endregion
-//#region src/deletion.ts
+// src/deletion.ts
 const STATUS_OF_DELETION_ERROR = {
 	SESSION_NOT_FOUND: 404,
 	SESSION_NOT_ARCHIVED: 409,
@@ -2214,5 +2246,4 @@ function registerSessionDeletion(ctx, persistence) {
 		}));
 	});
 }
-//#endregion
 export { SessionDeletionError as n, SessionPersistenceRdb as r, registerSessionDeletion as t };

package/dist/deletion.d.mts

@@ -1,6 +1,4 @@
-import { Mt as SESSION_DELETE_PATH, et as SessionPersistenceRdb } from "./log-C0q5svm7.mjs";
+import { Nt as SESSION_DELETE_PATH, et as SessionPersistenceRdb } from "./log-TYgd8Xkr.mjs";
 import { Context } from "@deepseek-ai/cordis";
-//#region src/deletion.d.ts
 export declare function registerSessionDeletion(ctx: Context, persistence: SessionPersistenceRdb): void;
-//#endregion
 export { SESSION_DELETE_PATH };

package/dist/deletion.mjs

@@ -1,3 +1,3 @@
-import { t as SESSION_DELETE_PATH } from "./routes-DGBlBE_I.mjs";
-import { t as registerSessionDeletion } from "./deletion-ODZFcbZm.mjs";
+import { t as SESSION_DELETE_PATH } from "./routes-hZjTcX_R.mjs";
+import { t as registerSessionDeletion } from "./deletion-CWl89TIR.mjs";
 export { SESSION_DELETE_PATH, registerSessionDeletion };

package/dist/export.d.mts

@@ -1,6 +1,4 @@
-import { Nt as SESSION_EXPORT_PATH, et as SessionPersistenceRdb } from "./log-C0q5svm7.mjs";
+import { Pt as SESSION_EXPORT_PATH, et as SessionPersistenceRdb } from "./log-TYgd8Xkr.mjs";
 import { Context } from "@deepseek-ai/cordis";
-//#region src/export.d.ts
 export declare function registerSessionExport(ctx: Context, persistence: SessionPersistenceRdb): void;
-//#endregion
 export { SESSION_EXPORT_PATH };

package/dist/export.mjs

@@ -1,6 +1,6 @@
-import { n as SESSION_EXPORT_PATH } from "./routes-DGBlBE_I.mjs";
+import { n as SESSION_EXPORT_PATH } from "./routes-hZjTcX_R.mjs";
 import { strToU8, zip } from "fflate";
-//#region src/export.ts
+// src/export.ts
 function safeFilename(sessionId) {
 	return sessionId.replace(/[^A-Za-z0-9._-]/gu, "_");
 }
@@ -69,5 +69,4 @@ function registerSessionExport(ctx, persistence) {
 		}), `session-rdb: ${SESSION_EXPORT_PATH} route`);
 	});
 }
-//#endregion
 export { SESSION_EXPORT_PATH, registerSessionExport };

package/dist/gc.d.mts

@@ -1,6 +1,4 @@
-import { Pt as SESSION_GC_PATH, et as SessionPersistenceRdb } from "./log-C0q5svm7.mjs";
+import { Ft as SESSION_GC_PATH, et as SessionPersistenceRdb } from "./log-TYgd8Xkr.mjs";
 import { Context } from "@deepseek-ai/cordis";
-//#region src/gc.d.ts
 export declare function registerSessionGc(ctx: Context, persistence: SessionPersistenceRdb): void;
-//#endregion
 export { SESSION_GC_PATH };

package/dist/gc.mjs

@@ -1,5 +1,5 @@
-import { r as SESSION_GC_PATH } from "./routes-DGBlBE_I.mjs";
-//#region src/gc.ts
+import { r as SESSION_GC_PATH } from "./routes-hZjTcX_R.mjs";
+// src/gc.ts
 async function stopRunningAgents(ctx) {
 	const running = ctx.get("agents")?.list() ?? [];
 	for (const agent of running) agent.cancel?.({ kind: "user" }, { keepInbox: true });
@@ -45,5 +45,4 @@ function registerSessionGc(ctx, persistence) {
 		}), `session-rdb: ${SESSION_GC_PATH} route`);
 	});
 }
-//#endregion
 export { SESSION_GC_PATH, registerSessionGc };

package/dist/import.d.mts

@@ -1,8 +1,7 @@
-import { Ft as SESSION_IMPORT_PATH, et as SessionPersistenceRdb } from "./log-C0q5svm7.mjs";
+import { It as SESSION_IMPORT_PATH, et as SessionPersistenceRdb } from "./log-TYgd8Xkr.mjs";
 import { Session, SessionEvent, SessionId } from "@deepseek-ai/dsh-session";
 import { SessionStorageMetadata } from "@deepseek-ai/dsh-session-persistence";
 import { Context } from "@deepseek-ai/cordis";
-//#region src/import.d.ts
 export declare const SESSION_LOG_ARTIFACT_FILENAME = "session.jsonl";
 export declare function parseJsonlArtifact(content: string): SessionStorageMetadata & {
   events: SessionEvent[];
@@ -19,5 +18,4 @@ export declare function persistImport(persistence: SessionPersistenceRdb, branch
   get(id: SessionId): Session | undefined;
 }, stopLoop?: (id: SessionId) => Promise<void>): Promise<SessionId>;
 export declare function registerSessionImport(ctx: Context, persistence: SessionPersistenceRdb): void;
-//#endregion
 export { SESSION_IMPORT_PATH };

package/dist/import.mjs

@@ -1,11 +1,11 @@
-import { i as SESSION_IMPORT_PATH } from "./routes-DGBlBE_I.mjs";
-import { i as replaceLiveSessionLog, l as restoreCatalog } from "./branch-DbFW3rJX.mjs";
+import { i as SESSION_IMPORT_PATH } from "./routes-hZjTcX_R.mjs";
+import { a as replaceLiveSessionLog, u as restoreCatalog } from "./branch-CoPCRKer.mjs";
 import { SESSION_FORMAT_VERSION, SessionLogOffset } from "@deepseek-ai/dsh-session";
 import { randomUUID } from "node:crypto";
 import { parseSessionFormatLogFilename } from "@deepseek-ai/dsh-session-format";
 import { balanceRewindPrefix } from "@morlay/session-branch";
 import { unzip } from "fflate";
-//#region src/import.ts
+// src/import.ts
 const SESSION_LOG_ARTIFACT_FILENAME = "session.jsonl";
 const MAX_IMPORT_ZIP_BYTES = 67108864;
 function parseJsonlArtifact(content) {
@@ -205,5 +205,4 @@ function registerSessionImport(ctx, persistence) {
 		}), `session-rdb: ${SESSION_IMPORT_PATH} route`);
 	});
 }
-//#endregion
 export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport };

package/dist/index.d.mts

@@ -1,2 +1,2 @@
-import { $ as SessionDeletionErrorCode, It as SESSION_ROWS_PATH, Q as SessionDeletionError, X as ProjectionCacheOptions, Y as Config, Z as ResolvedConfig, et as SessionPersistenceRdb, it as locateTurnEnd, nt as SessionBranchRdb, ot as SessionRowsItem, pt as SCHEMA_VERSION, rt as SessionBranchRdbProvider, st as SessionRowsValue, tt as SessionPersistenceRdbInternals } from "./log-C0q5svm7.mjs";
-export { Config, ProjectionCacheOptions, ResolvedConfig, SCHEMA_VERSION, SESSION_ROWS_PATH, SessionBranchRdb, SessionBranchRdbProvider, SessionDeletionError, SessionDeletionErrorCode, SessionPersistenceRdb, SessionPersistenceRdb as default, SessionPersistenceRdbInternals, type SessionRowsItem, type SessionRowsValue, locateTurnEnd };
+import { $ as SessionDeletionErrorCode, Lt as SESSION_ROWS_PATH, Q as SessionDeletionError, X as ProjectionCacheOptions, Y as Config, Z as ResolvedConfig, at as locateTurnEnd, ct as SessionRowsValue, et as SessionPersistenceRdb, it as liveEventsOf, mt as SCHEMA_VERSION, nt as SessionBranchRdb, rt as SessionBranchRdbProvider, st as SessionRowsItem, tt as SessionPersistenceRdbInternals } from "./log-TYgd8Xkr.mjs";
+export { Config, ProjectionCacheOptions, ResolvedConfig, SCHEMA_VERSION, SESSION_ROWS_PATH, SessionBranchRdb, SessionBranchRdbProvider, SessionDeletionError, SessionDeletionErrorCode, SessionPersistenceRdb, SessionPersistenceRdb as default, SessionPersistenceRdbInternals, type SessionRowsItem, type SessionRowsValue, liveEventsOf, locateTurnEnd };

package/dist/index.mjs

@@ -1,5 +1,5 @@
-import { a as SESSION_ROWS_PATH } from "./routes-DGBlBE_I.mjs";
-import { n as SessionBranchRdbProvider, r as locateTurnEnd, t as SessionBranchRdb } from "./branch-DbFW3rJX.mjs";
-import { o as SCHEMA_VERSION } from "./sqlite-DjOnMRh2.mjs";
-import { n as SessionDeletionError, r as SessionPersistenceRdb } from "./deletion-ODZFcbZm.mjs";
-export { SCHEMA_VERSION, SESSION_ROWS_PATH, SessionBranchRdb, SessionBranchRdbProvider, SessionDeletionError, SessionPersistenceRdb, SessionPersistenceRdb as default, locateTurnEnd };
+import { a as SESSION_ROWS_PATH } from "./routes-hZjTcX_R.mjs";
+import { i as locateTurnEnd, n as SessionBranchRdbProvider, r as liveEventsOf, t as SessionBranchRdb } from "./branch-CoPCRKer.mjs";
+import { o as SCHEMA_VERSION } from "./sqlite-BNRd1aqR.mjs";
+import { n as SessionDeletionError, r as SessionPersistenceRdb } from "./deletion-CWl89TIR.mjs";
+export { SCHEMA_VERSION, SESSION_ROWS_PATH, SessionBranchRdb, SessionBranchRdbProvider, SessionDeletionError, SessionPersistenceRdb, SessionPersistenceRdb as default, liveEventsOf, locateTurnEnd };

package/dist/{log-DYxdjJ-l.mjs → log-CcWy46VE.mjs}

@@ -1,7 +1,7 @@
 import { localDayKey } from "./usage.mjs";
 import { SessionSeq } from "@deepseek-ai/dsh-session";
 import { sessionFormatCatalog } from "@deepseek-ai/dsh-session-format-catalog";
-//#region src/log.ts
+// src/log.ts
 function normalizeSurfaceOp(value) {
 	if (typeof value !== "object" || value === null || Array.isArray(value)) return value;
 	const record = value;
@@ -63,12 +63,13 @@ function sessionConflictRow(storage) {
 function rowToEvent(row) {
 	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,
-		seq: row.fSequence,
-		time: row.fCreatedAt,
-		...surfaceOp === void 0 ? {} : { surfaceOp }
-	};
+	if (typeof record === "object" && record !== null && !Array.isArray(record) && typeof record["type"] === "string" && typeof record["seq"] === "number" && typeof record["time"] === "number" && "data" in record) {
+		const event = record;
+		event.seq = row.fSequence;
+		event.time = row.fCreatedAt;
+		if (surfaceOp !== void 0) event.surfaceOp = surfaceOp;
+		return event;
+	}
 	return {
 		type: row.fType,
 		seq: row.fSequence,
@@ -474,33 +475,29 @@ function repairOrphanInboxSplices(events) {
 	}
 }
 function scanRows(rows, base = 0) {
-	const parsed = rows.map((row) => {
-		try {
-			return {
-				ok: true,
-				event: rowToEvent(row)
-			};
-		} catch {
-			return { ok: false };
-		}
-	});
 	let lastTurnEnd = -1;
-	for (let i = parsed.length - 1; i >= 0; i--) if (parsed[i]?.ok && rows[i]?.fType === "turn/end") {
-		lastTurnEnd = i;
-		break;
+	for (let i = rows.length - 1; i >= 0; i--) {
+		if (rows[i]?.fType !== "turn/end") continue;
+		try {
+			rowToEvent(rows[i]);
+			lastTurnEnd = i;
+			break;
+		} catch {}
 	}
 	const preserved = [];
 	for (let i = 0; i < rows.length; i++) {
-		const p = parsed[i];
-		if (!p?.ok || p.event === void 0) {
+		let event;
+		try {
+			event = rowToEvent(rows[i]);
+		} catch {
 			if (i <= lastTurnEnd) throw new Error(`corrupt session log: unparsable committed event at seq ${rows[i]?.fSequence}`);
 			break;
 		}
-		if (p.event.seq !== base + i) {
-			if (i <= lastTurnEnd) throw new Error(`corrupt session log: seq gap in committed region (expected ${base + i}, got ${p.event.seq})`);
+		if (event.seq !== base + i) {
+			if (i <= lastTurnEnd) throw new Error(`corrupt session log: seq gap in committed region (expected ${base + i}, got ${event.seq})`);
 			break;
 		}
-		preserved.push(p.event);
+		preserved.push(event);
 	}
 	return preserved.length < rows.length ? {
 		preserved,
@@ -558,5 +555,4 @@ function usageRowOf(event, subagent) {
 		fTotalTokens: numericField(usage["totalTokens"])
 	};
 }
-//#endregion
 export { usageRowOf as S, sessionConflictRow as _, orphanInboxSpliceSeqs as a, titleOfEventData as b, repairAssistantSettlement as c, repairRequestHeaders as d, repairSurfaceOps as f, sealOwnEvents as g, scanRows as h, normalizeToCurrentShape as i, repairOrphanInboxSplices as l, rowToMeta as m, findSurfaceRepairs as n, recomputeReplaceProvenance as o, rowToEvent as p, needsShapeAdoption as r, renameLegacyPtcEvents as s, OWN_EVENT_TYPES as t, repairReadView as u, sessionInsertRow as v, toJsonlArtifact as x, syncMeteringRanges as y };