@morlay/session-rdb 0.0.21-alpha.5 → 0.0.21-alpha.7

package/dist/{branch-Dlmbkfjj.mjs → branch-BjUR6wfe.mjs}

@@ -1,7 +1,7 @@
-import { c as repairRequestHeaders, d as rowToMeta, f as scanRows } from "./log-C-rbdFwK.mjs";
+import { d as repairRequestHeaders, h as scanRows, i as normalizeToCurrentShape, m as rowToMeta } from "./log-qCNkDjh5.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";
+import { createSessionFormatCatalogWithChildren } from "@deepseek-ai/dsh-session-format-catalog";
 import { SessionBranch, SessionBranchError, balanceRewindPrefix, rewindKeepLength } from "@morlay/session-branch";
 //#region src/legacy.ts
 function physicalHeader(row) {
@@ -13,7 +13,8 @@ function physicalHeader(row) {
 		...row.fCwd !== null ? { cwd: row.fCwd } : {},
 		...row.fParentSession !== null ? { parentSession: row.fParentSession } : {},
 		...row.fOrigin !== null ? { origin: row.fOrigin } : {},
-		delegationDepth: row.fDelegationDepth ?? 0
+		delegationDepth: row.fDelegationDepth ?? 0,
+		...row.fAgentPreset !== null ? { agentPreset: row.fAgentPreset } : {}
 	};
 	return row.fVersion < 2 ? {
 		...common,
@@ -34,8 +35,14 @@ function physicalEvent(row) {
 		...row.fSurfaceOp !== null ? { surfaceOp: JSON.parse(row.fSurfaceOp) } : {}
 	};
 }
+/**
+* 读旧格式用的 catalog：v3→v4 这条边要求显式子会话证据（上游 0.1.7 起），本仓库声明
+* **无子会话证据**——v3 的目录事实由父会话自己在成功路径上写成 `subagent/catalog` 事件，
+* 迁移的 child evidence 只是补偿入口；我们没有更权威的子集合来源可给（见 ADR-跟随上游session-format-v4）。
+*/
+const restoreCatalog = createSessionFormatCatalogWithChildren([]);
 function convertLegacyRows(row, eventRows) {
-	const restore = sessionFormatCatalog.createRestore(physicalHeader(row), {
+	const restore = restoreCatalog.createRestore(physicalHeader(row), {
 		recovery: "strict",
 		validation: "transformed"
 	});
@@ -53,6 +60,7 @@ function isLegacyVersion(version) {
 function adoptLegacyRows(row, eventRows) {
 	const { preserved, tornFrom } = scanRows(eventRows, 0);
 	repairRequestHeaders(preserved);
+	normalizeToCurrentShape(preserved);
 	return {
 		meta: {
 			...rowToMeta(row),
@@ -187,19 +195,27 @@ 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.fSequence, row.fEventId]));
+		const reusable = !source.migrated && source.events.length === source.storedCount;
 		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);
-		}
+		if (reusable) {
+			const sourceRows = await internals.backend.getEventRows(sourceId);
+			const sourceEventIds = new Map(sourceRows.map((row) => [row.fSequence, row.fEventId]));
+			for (const event of prefix) {
+				const eventId = sourceEventIds.get(event.seq);
+				if (eventId !== void 0) reuse.set(event.seq, eventId);
+			}
+		} else if (prefix.length > 0) this.live.warn?.(`session-rdb: fork "${sourceId}" copies event rows instead of reusing them — its read view comes from a migration, so stored seqs need not line up`);
 		internals.registerReuseEventIds(childId, reuse);
-		const handle = await this.persistence.create(childMeta, { inheritedEventCount: SessionLogOffset(prefix.length) });
 		try {
-			if (seed.length > 0) await handle.append(seed);
-		} finally {
-			await handle.close();
+			const handle = await this.persistence.create(childMeta, { inheritedEventCount: SessionLogOffset(prefix.length) });
+			try {
+				if (seed.length > 0) await handle.append(seed);
+			} finally {
+				await handle.close();
+			}
+		} catch (error) {
+			internals.dropReuseEventIds(childId);
+			throw error;
 		}
 		await this.persistence.rebuildEventCounts(childId);
 		return childId;
@@ -379,4 +395,4 @@ var SessionBranchRdb = class extends SessionBranch {
 	}
 };
 //#endregion
-export { truncateLiveSession as a, isLegacyVersion as c, replaceLiveSessionLog as i, SessionBranchRdbProvider as n, adoptLegacyRows as o, locateTurnEnd as r, convertLegacyRows as s, SessionBranchRdb as t };
+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 };

package/dist/deletion.d.mts

@@ -1,4 +1,4 @@
-import { d as SessionPersistenceRdb } from "./backend-a0xDrUFG.mjs";
+import { p as SessionPersistenceRdb } from "./backend-E0bmTXpz.mjs";
 import { Context } from "@deepseek-ai/cordis";
 //#region src/deletion.d.ts
 declare const SESSION_DELETE_PATH = "/api/session.delete";

package/dist/deletion.mjs

@@ -1,2 +1,2 @@
-import { i as registerSessionDeletion, r as SESSION_DELETE_PATH } from "./src-Bn0038Sp.mjs";
+import { a as registerSessionDeletion, i as SESSION_DELETE_PATH } from "./src-B9X8BKyh.mjs";
 export { SESSION_DELETE_PATH, registerSessionDeletion };

package/dist/import.d.mts

@@ -1,4 +1,4 @@
-import { d as SessionPersistenceRdb } from "./backend-a0xDrUFG.mjs";
+import { p as SessionPersistenceRdb } from "./backend-E0bmTXpz.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,8 +1,7 @@
-import { i as replaceLiveSessionLog } from "./branch-Dlmbkfjj.mjs";
+import { i as replaceLiveSessionLog, l as restoreCatalog } from "./branch-BjUR6wfe.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 { balanceRewindPrefix } from "@morlay/session-branch";
 import { unzip } from "fflate";
 //#region src/import.ts
@@ -20,7 +19,7 @@ function parseJsonlArtifact(content) {
 	}
 	let restore;
 	try {
-		restore = sessionFormatCatalog.createRestore(header, {
+		restore = restoreCatalog.createRestore(header, {
 			recovery: "strict",
 			validation: "transformed"
 		});

package/dist/index.d.mts

@@ -1,2 +1,2 @@
-import { S as SCHEMA_VERSION, c as ProjectionCacheOptions, d as SessionPersistenceRdb, f as SessionPersistenceRdbInternals, h as locateTurnEnd, l as SessionDeletionError, m as SessionBranchRdbProvider, p as SessionBranchRdb, s as Config, u as SessionDeletionErrorCode } from "./backend-a0xDrUFG.mjs";
-export { Config, ProjectionCacheOptions, SCHEMA_VERSION, SessionBranchRdb, SessionBranchRdbProvider, SessionDeletionError, SessionDeletionErrorCode, SessionPersistenceRdb, SessionPersistenceRdb as default, SessionPersistenceRdbInternals, locateTurnEnd };
+import { D as SCHEMA_VERSION, _ as locateTurnEnd, b as SessionRowsItem, d as SessionDeletionError, f as SessionDeletionErrorCode, g as SessionBranchRdbProvider, h as SessionBranchRdb, l as Config, m as SessionPersistenceRdbInternals, p as SessionPersistenceRdb, u as ProjectionCacheOptions, x as SessionRowsValue, y as SESSION_ROWS_PATH } from "./backend-E0bmTXpz.mjs";
+export { Config, ProjectionCacheOptions, SCHEMA_VERSION, SESSION_ROWS_PATH, SessionBranchRdb, SessionBranchRdbProvider, SessionDeletionError, SessionDeletionErrorCode, SessionPersistenceRdb, SessionPersistenceRdb as default, SessionPersistenceRdbInternals, type SessionRowsItem, type SessionRowsValue, locateTurnEnd };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { p as SCHEMA_VERSION } from "./sqlite-C3LHLzYW.mjs";
-import { n as SessionPersistenceRdb, t as SessionDeletionError } from "./src-Bn0038Sp.mjs";
-import { n as SessionBranchRdbProvider, r as locateTurnEnd, t as SessionBranchRdb } from "./branch-Dlmbkfjj.mjs";
-export { SCHEMA_VERSION, SessionBranchRdb, SessionBranchRdbProvider, SessionDeletionError, SessionPersistenceRdb, SessionPersistenceRdb as default, locateTurnEnd };
+import { p as SCHEMA_VERSION } from "./sqlite-zcXVyMxr.mjs";
+import { n as SessionPersistenceRdb, r as SESSION_ROWS_PATH, t as SessionDeletionError } from "./src-B9X8BKyh.mjs";
+import { n as SessionBranchRdbProvider, r as locateTurnEnd, t as SessionBranchRdb } from "./branch-BjUR6wfe.mjs";
+export { SCHEMA_VERSION, SESSION_ROWS_PATH, SessionBranchRdb, SessionBranchRdbProvider, SessionDeletionError, SessionPersistenceRdb, SessionPersistenceRdb as default, locateTurnEnd };

package/dist/{log-C-rbdFwK.mjs → log-qCNkDjh5.mjs}

@@ -24,7 +24,8 @@ function rowToMeta(row) {
 		...row.fParentSession !== null ? { parentSession: row.fParentSession } : {},
 		isSeeded: row.fSeedLength !== null,
 		...row.fOrigin !== null ? { origin: row.fOrigin } : {},
-		...row.fDelegationDepth === null ? {} : { delegationDepth: row.fDelegationDepth }
+		...row.fDelegationDepth === null ? {} : { delegationDepth: row.fDelegationDepth },
+		...row.fAgentPreset === null ? {} : { agentPreset: row.fAgentPreset }
 	};
 }
 function sessionInsertRow(storage, incarnation) {
@@ -40,6 +41,7 @@ function sessionInsertRow(storage, incarnation) {
 		fSeedLength: meta.isSeeded ? storage.inheritedEventCount : null,
 		fOrigin: meta.origin ?? null,
 		fDelegationDepth: meta.delegationDepth ?? null,
+		fAgentPreset: meta.agentPreset ?? null,
 		fIncarnation: incarnation,
 		fRevision: 0
 	};
@@ -53,7 +55,8 @@ function sessionConflictRow(storage) {
 		fParentSession: meta.parentSession ?? null,
 		fSeedLength: meta.isSeeded ? storage.inheritedEventCount : null,
 		fOrigin: meta.origin ?? null,
-		fDelegationDepth: meta.delegationDepth ?? null
+		fDelegationDepth: meta.delegationDepth ?? null,
+		fAgentPreset: meta.agentPreset ?? null
 	};
 }
 function rowToEvent(row) {
@@ -144,28 +147,15 @@ function toolResultRewriteContentOnly(original, replacement) {
 	const replacementData = replacement.data;
 	const originalMessage = originalData["message"];
 	const replacementMessage = replacementData["message"];
-	const originalContent = Array.isArray(originalMessage?.content) ? originalMessage.content : void 0;
-	const replacementContent = Array.isArray(replacementMessage?.content) ? replacementMessage.content : void 0;
-	if (originalContent === void 0 || replacementContent === void 0) return false;
-	return isDeepEqualJson({
-		...originalData,
-		message: {
-			...originalMessage,
-			content: [{
-				...originalContent[0],
-				content: null
-			}]
-		}
-	}, {
-		...replacementData,
+	if (!Array.isArray(originalMessage?.content) || !Array.isArray(replacementMessage?.content)) return false;
+	const rest = (data, message) => ({
+		...data,
 		message: {
-			...replacementMessage,
-			content: [{
-				...replacementContent[0],
-				content: null
-			}]
+			...message,
+			content: null
 		}
 	});
+	return isDeepEqualJson(rest(originalData, originalMessage), rest(replacementData, replacementMessage));
 }
 function findSurfaceRepairs(events) {
 	const nodes = [];
@@ -355,6 +345,87 @@ function renameLegacyPtcEvents(events) {
 		}
 	}
 }
+/**
+* 把**旧代（v3 及更早）的消息形状**归一到当前格式（v4）：迁移链（严格）拒绝那些形状时，读路径仍要
+* 能把它们读出来——只动字段与标记，不改坐标、不改内容。
+*
+* 三件事：
+* - `system/message` 的 source：`{ kind: 'plugin', plugin: '@deepseek-ai/dsh-system-prompt' }` → `{ kind: 'system-prompt' }`
+*   （v4 起 system 消息只认这个 kind）；
+* - `tool/result` 的消息：v3 是 user 角色、结果块包在 `content[0]`；v4 是 `role: 'tool'` + 顶层
+*   `toolCallId` + `content` 就是结果块；
+* - 本仓库自己写过、上游已删除的事件类型（见 `LEGACY_OWN_EVENT_TYPES`）标 `ignorable: true`——v4 的
+*   校验对未知类型只接受可忽略信封。
+*
+* 只认这张白名单：**其它未知类型保持 fail loud**（那是「数据来自更新的 harness」的信号，不能吞掉）。
+*/
+function normalizeToCurrentShape(events) {
+	for (const event of events) {
+		const type = event.type;
+		if (LEGACY_OWN_EVENT_TYPES.has(type)) {
+			event.ignorable = true;
+			continue;
+		}
+		if (type === "system/message") {
+			const message = event.data["message"];
+			liftSystemMessageSource(message);
+			continue;
+		}
+		if (type === "tool/result") {
+			const message = event.data["message"];
+			liftToolResultMessage(message);
+		}
+	}
+}
+function liftSystemMessageSource(message) {
+	if (typeof message !== "object" || message === null) return;
+	const record = message;
+	const source = record["source"];
+	if (typeof source !== "object" || source === null) return;
+	if (source["kind"] !== "plugin") return;
+	record["source"] = { kind: "system-prompt" };
+}
+function liftToolResultMessage(message) {
+	if (typeof message !== "object" || message === null) return;
+	const record = message;
+	if (record["role"] === "tool" && typeof record["toolCallId"] === "string") return;
+	const source = record["source"];
+	const block = Array.isArray(record["content"]) ? record["content"][0] : void 0;
+	if (typeof block !== "object" || block === null) return;
+	const lifted = block;
+	const callId = lifted["toolCallId"] ?? source?.["callId"];
+	if (typeof callId !== "string") return;
+	record["role"] = "tool";
+	record["toolCallId"] = callId;
+	record["content"] = Array.isArray(lifted["content"]) ? lifted["content"] : [];
+	if (typeof lifted["isError"] === "boolean") record["isError"] = lifted["isError"];
+	record["source"] = {
+		kind: "tool",
+		callId
+	};
+}
+/**
+* 本仓库写过、后来连同机制一起删除的事件类型：读的时候标 `ignorable: true` 让校验跳过它们。
+* 新增历史类型时登记到这里——**不要**用「所有未知类型」代替（那会掩盖更新版本的未知事件）。
+*/
+const LEGACY_OWN_EVENT_TYPES = /* @__PURE__ */ new Set(["session-branch/version"]);
+/** 行里是否还带着旧代消息形状（`session-branch/version` 这类自造事件也算）——写路径曾把回退视图的结果
+* 以当前版本号落库，所以**版本号不可信**，读之前要按内容判一次。 */
+function hasLegacyShape(events) {
+	for (const event of events) {
+		const type = event.type;
+		if (LEGACY_OWN_EVENT_TYPES.has(type)) return true;
+		if (type === "system/message") {
+			if ((event.data["message"]?.["source"])?.["kind"] === "plugin") return true;
+			continue;
+		}
+		if (type === "tool/result") {
+			const message = event.data["message"];
+			if (message !== void 0 && message["role"] !== "tool") return true;
+		}
+	}
+	return false;
+}
 function repairReadView(events) {
 	repairAssistantSettlement(events);
 	repairRequestHeaders(events);
@@ -512,4 +583,4 @@ function usageRowOf(event) {
 	};
 }
 //#endregion
-export { toJsonlArtifact as _, repairAssistantSettlement as a, repairRequestHeaders as c, rowToMeta as d, scanRows as f, titleOfEventData 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, usageRowOf as v };
+export { sessionInsertRow as _, orphanInboxSpliceSeqs as a, toJsonlArtifact as b, repairAssistantSettlement as c, repairRequestHeaders as d, repairSurfaceOps as f, sessionConflictRow as g, scanRows as h, normalizeToCurrentShape as i, repairOrphanInboxSplices as l, rowToMeta as m, findSurfaceRepairs as n, recomputeReplaceProvenance as o, rowToEvent as p, hasLegacyShape as r, renameLegacyPtcEvents as s, LEGACY_OWN_EVENT_TYPES as t, repairReadView as u, syncMeteringRanges as v, usageRowOf as x, titleOfEventData as y };

package/dist/{sqlite-C3LHLzYW.mjs → sqlite-zcXVyMxr.mjs}

@@ -1,4 +1,4 @@
-import { g as titleOfEventData, m as sessionInsertRow, p as sessionConflictRow, v as usageRowOf } from "./log-C-rbdFwK.mjs";
+import { _ as sessionInsertRow, g as sessionConflictRow, x as usageRowOf, y as titleOfEventData } from "./log-qCNkDjh5.mjs";
 import { randomUUID } from "node:crypto";
 import { SESSION_FORMAT_VERSION, SessionId, SessionLogOffset, SessionSeq } from "@deepseek-ai/dsh-session";
 import { and, desc, eq, gte, inArray, isNotNull, lt, notInArray, sql } from "drizzle-orm";
@@ -16,6 +16,10 @@ var WriteGuard = class {
 	confirmHead(id, head) {
 		this.headSeqs.set(id, head);
 	}
+	/** 本实例有没有这条会话的 head 记录（迁移重写用它决定是"登记基准"还是"严格比较"）。 */
+	has(id) {
+		return this.headSeqs.has(id);
+	}
 	assertNoConcurrentWriter(id, storedHead) {
 		const known = this.headSeqs.get(id);
 		if (known === void 0) {
@@ -189,6 +193,7 @@ const sessions = {
 		f_seed_length: { type: "integer" },
 		f_origin: { type: "text" },
 		f_delegation_depth: { type: "integer" },
+		f_agent_preset: { type: "text" },
 		f_incarnation: {
 			type: "text",
 			notNull: true
@@ -198,6 +203,8 @@ const sessions = {
 			notNull: true
 		},
 		f_archived_at: { type: "bigint" },
+		f_pinned_seq: { type: "integer" },
+		f_last_event_at: { type: "bigint" },
 		f_title: { type: "text" },
 		f_title_seq: { type: "integer" }
 	}
@@ -468,23 +475,28 @@ const eventUsage = {
 		f_model: { type: "text" },
 		f_input_tokens: {
 			type: "integer",
-			notNull: true
+			notNull: true,
+			default: 0
 		},
 		f_output_tokens: {
 			type: "integer",
-			notNull: true
+			notNull: true,
+			default: 0
 		},
 		f_cache_read_tokens: {
 			type: "integer",
-			notNull: true
+			notNull: true,
+			default: 0
 		},
 		f_reasoning_tokens: {
 			type: "integer",
-			notNull: true
+			notNull: true,
+			default: 0
 		},
 		f_total_tokens: {
 			type: "integer",
-			notNull: true
+			notNull: true,
+			default: 0
 		}
 	},
 	indexes: { idx_event_usage_created_at: { columns: ["f_created_at"] } }
@@ -616,7 +628,7 @@ function eventDimensions(event) {
 			kind,
 			role: "tool",
 			name: "",
-			actionId: data["message"]?.content?.[0]?.toolCallId ?? ""
+			actionId: data["message"]?.toolCallId ?? ""
 		};
 		case "tool/call": return {
 			kind,
@@ -962,11 +974,16 @@ function createStorageRepository(host) {
 			if (row === void 0) return null;
 			const ordered = await allRows(db.select().from(tWorkspaces).where(gte(tWorkspaces.fPosition, 0)).orderBy(tWorkspaces.fPosition));
 			const archives = await allRows(db.select({ fSessionId: tSessions.fSessionId }).from(tSessions).where(isNotNull(tSessions.fArchivedAt)).orderBy(tSessions.fArchivedAt));
+			const pinned = await allRows(db.select({
+				fSessionId: tSessions.fSessionId,
+				fPinnedSeq: tSessions.fPinnedSeq
+			}).from(tSessions).where(isNotNull(tSessions.fPinnedSeq)).orderBy(tSessions.fPinnedSeq));
 			const pendingMutation = pendingMutationOf(row);
 			return {
 				initialized: row.fInitialized !== 0,
 				workspaceIds: ordered.map((entry) => entry.fWorkspaceId),
 				archivedSessionIds: archives.map((entry) => entry.fSessionId),
+				pinnedSessionIds: pinned.map((entry) => entry.fSessionId),
 				...pendingMutation === void 0 ? {} : { pendingMutation }
 			};
 		},
@@ -986,6 +1003,9 @@ function createStorageRepository(host) {
 				}));
 				await runQuery(db.update(tWorkspaces).set({ fPosition: -1 }));
 				for (const [position, workspaceId] of state.workspaceIds.entries()) await runQuery(db.update(tWorkspaces).set({ fPosition: position }).where(eq(tWorkspaces.fWorkspaceId, workspaceId)));
+				const pinned = state.pinnedSessionIds ?? [];
+				await runQuery(pinned.length === 0 ? db.update(tSessions).set({ fPinnedSeq: null }).where(isNotNull(tSessions.fPinnedSeq)) : db.update(tSessions).set({ fPinnedSeq: null }).where(and(isNotNull(tSessions.fPinnedSeq), notInArray(tSessions.fSessionId, pinned))));
+				for (const [position, sessionId] of pinned.entries()) await runQuery(db.update(tSessions).set({ fPinnedSeq: position }).where(eq(tSessions.fSessionId, sessionId)));
 				const archived = state.archivedSessionIds;
 				await runQuery(archived.length === 0 ? db.update(tSessions).set({ fArchivedAt: null }).where(isNotNull(tSessions.fArchivedAt)) : db.update(tSessions).set({ fArchivedAt: null }).where(and(isNotNull(tSessions.fArchivedAt), notInArray(tSessions.fSessionId, archived))));
 				const stamp = Date.now();
@@ -1141,6 +1161,19 @@ function backfillEventUsage(db) {
        AND (json_extract(e.f_data, '$.data.usage') IS NOT NULL
             OR json_extract(e.f_data, '$.usage') IS NOT NULL)`);
 }
+function sessionListRowOf(row) {
+	return {
+		sessionId: typeof row["session_id"] === "string" ? row["session_id"] : String(row["session_id"]),
+		title: typeof row["title"] === "string" ? row["title"] : null,
+		origin: typeof row["origin"] === "string" ? row["origin"] : null,
+		cwd: typeof row["cwd"] === "string" ? row["cwd"] : null,
+		createdAt: Number(row["created_at"]),
+		updatedAt: Number(row["updated_at"]),
+		archived: row["archived"] === 1 || row["archived"] === true,
+		subagent: row["origin"] === "subagent",
+		workspace: typeof row["workspace"] === "string" ? row["workspace"] : null
+	};
+}
 /** SQL 的缺失求和是 NULL：没有 usage 字段的行使该字段计 0。 */
 function tokenTotalsOf(row) {
 	return {
@@ -1369,7 +1402,7 @@ var SqliteBackend = class SqliteBackend {
 		insertEvents: (events) => this.insertEvents(events),
 		insertBridges: (rows) => this.insertBridges(rows),
 		updateHead: (id, headEventId, headSequence) => this.updateHead(id, headEventId, headSequence),
-		bumpRevision: (id) => this.bumpRevision(id),
+		bumpRevision: (id, lastEventAt) => this.bumpRevision(id, lastEventAt),
 		refreshTitle: (id) => this.refreshTitle(id),
 		deleteBridgeTail: (id, fromSequence) => this.deleteBridgeTail(id, fromSequence),
 		getPrevBridge: (id, sequence) => this.getPrevBridge(id, sequence),
@@ -1418,8 +1451,11 @@ var SqliteBackend = class SqliteBackend {
 			fHeadSequence: headSequence
 		}).where(eq(tSessions.fSessionId, id)).run();
 	}
-	async bumpRevision(id) {
-		this.db.update(tSessions).set({ fRevision: sql`${tSessions.fRevision} + 1` }).where(eq(tSessions.fSessionId, id)).run();
+	async bumpRevision(id, lastEventAt) {
+		this.db.update(tSessions).set({
+			fRevision: sql`${tSessions.fRevision} + 1`,
+			...lastEventAt === void 0 ? {} : { fLastEventAt: sql`MAX(COALESCE(${tSessions.fLastEventAt}, 0), ${lastEventAt})` }
+		}).where(eq(tSessions.fSessionId, id)).run();
 	}
 	async refreshTitle(id) {
 		const row = this.db.select({
@@ -1474,6 +1510,45 @@ var SqliteBackend = class SqliteBackend {
 	* 沿 `t_events` 的事件类型数——两者限定在**有 token 用量的会话**里，时间范围各自按自己的
 	* `f_created_at`（同一时刻写入，口径一致）。
 	*/
+	async listSessionRows(query = {}) {
+		const needle = query.query?.trim().toLowerCase() ?? "";
+		const like = `%${needle}%`;
+		const where = `WHERE (? = '' OR lower(COALESCE(s.f_title, '')) LIKE ? OR lower(COALESCE(w.f_title, '')) LIKE ?)
+                     AND (? = 1 OR s.f_origin IS NOT 'subagent')`;
+		const filterParams = [
+			needle,
+			like,
+			like,
+			query.includeSubagents === true ? 1 : 0
+		];
+		const limit = query.limit ?? 20;
+		const offset = query.offset ?? 0;
+		const rows = this.db.$client.prepare(`SELECT s.f_session_id AS session_id,
+                s.f_title AS title,
+                s.f_origin AS origin,
+                s.f_cwd AS cwd,
+                s.f_created_at AS created_at,
+                (s.f_archived_at IS NOT NULL) AS archived,
+                COALESCE(s.f_last_event_at, s.f_created_at) AS updated_at,
+                w.f_title AS workspace
+           FROM t_sessions s
+           LEFT JOIN t_workspaces w ON w.f_workspace_id = (
+                 SELECT b.f_workspace_id FROM t_workspace_sessions b
+                  WHERE b.f_session_id = s.f_session_id ORDER BY b.f_position LIMIT 1)
+          ${where}
+          ORDER BY updated_at DESC, s.f_session_id
+          LIMIT ? OFFSET ?`).all(...filterParams, limit, offset);
+		const counted = this.db.$client.prepare(`SELECT count(*) AS n
+           FROM t_sessions s
+           LEFT JOIN t_workspaces w ON w.f_workspace_id = (
+                 SELECT b.f_workspace_id FROM t_workspace_sessions b
+                  WHERE b.f_session_id = s.f_session_id ORDER BY b.f_position LIMIT 1)
+          ${where}`).get(...filterParams);
+		return {
+			items: rows.map((row) => sessionListRowOf(row)),
+			total: Number(counted.n)
+		};
+	}
 	async usageReport(sinceMs) {
 		const usageSince = sinceMs === void 0 ? "" : " AND u.f_created_at >= ?";
 		const params = sinceMs === void 0 ? [] : [sinceMs];