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

package/dist/testing.mjs

@@ -1,4 +1,4 @@
-import { a as truncateLiveSession } from "./branch-5JzX9rUq.mjs";
+import { a as truncateLiveSession } from "./branch-Dlmbkfjj.mjs";
 import { SessionAlreadyExistsError, SessionAlreadyOwnedError, SessionFormatUnsupportedError, SessionHandleClosedError, SessionPersistenceNotFoundError, SessionReadOnlyError } from "@deepseek-ai/dsh-session-persistence";
 import SessionStore, { SESSION_FORMAT_VERSION, SessionId, SessionLogOffset, SessionSeq } from "@deepseek-ai/dsh-session";
 import { Context } from "@deepseek-ai/cordis";
@@ -23,7 +23,7 @@ var EmptySettings = class extends SettingsProvider {
 	}
 };
 //#endregion
-//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.1_happy-dom@20.14.5_jsdom@30.1.0_a01b6ab7ee56d44cea1102049009c3c3/node_modules/vitest/dist/chunks/tinyrainbow.Ht9iggcq.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.2_happy-dom@20.14.5_jsdom@30.1.0_35ad368e4c4a4b8f279ac875fcf2bfae/node_modules/vitest/dist/chunks/tinyrainbow.Ht9iggcq.js
 var b$1 = {
 	reset: [0, 0],
 	bold: [
@@ -106,7 +106,7 @@ function C({ force: e } = {}) {
 }
 var y$1 = C();
 //#endregion
-//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.1_happy-dom@20.14.5_jsdom@30.1.0_a01b6ab7ee56d44cea1102049009c3c3/node_modules/vitest/dist/chunks/index.M2dsQ_UQ.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.2_happy-dom@20.14.5_jsdom@30.1.0_35ad368e4c4a4b8f279ac875fcf2bfae/node_modules/vitest/dist/chunks/index.M2dsQ_UQ.js
 function _mergeNamespaces$1(n, m) {
 	m.forEach(function(e) {
 		e && typeof e !== "string" && !Array.isArray(e) && Object.keys(e).forEach(function(k) {
@@ -1005,7 +1005,7 @@ const plugins = {
 	Error: ErrorPlugin
 };
 //#endregion
-//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.1_happy-dom@20.14.5_jsdom@30.1.0_a01b6ab7ee56d44cea1102049009c3c3/node_modules/vitest/dist/chunks/display.pkpxlVcY.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.2_happy-dom@20.14.5_jsdom@30.1.0_35ad368e4c4a4b8f279ac875fcf2bfae/node_modules/vitest/dist/chunks/display.pkpxlVcY.js
 const { AsymmetricMatcher: AsymmetricMatcher$3, DOMCollection: DOMCollection$2, DOMElement: DOMElement$2, Immutable: Immutable$2, ReactElement: ReactElement$2, ReactTestComponent: ReactTestComponent$2 } = plugins;
 const PLUGINS$2 = [
 	ReactTestComponent$2,
@@ -1466,7 +1466,7 @@ const isAbsolute = function(p) {
 	return _IS_ABSOLUTE_RE.test(p);
 };
 //#endregion
-//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.1_happy-dom@20.14.5_jsdom@30.1.0_a01b6ab7ee56d44cea1102049009c3c3/node_modules/vitest/dist/chunks/source-map.BH0bbrs9.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.2_happy-dom@20.14.5_jsdom@30.1.0_35ad368e4c4a4b8f279ac875fcf2bfae/node_modules/vitest/dist/chunks/source-map.BH0bbrs9.js
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 function getDefaultExportFromCjs(x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
@@ -2249,7 +2249,7 @@ function getOriginalPosition(map, needle) {
 	return result;
 }
 //#endregion
-//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.1_happy-dom@20.14.5_jsdom@30.1.0_a01b6ab7ee56d44cea1102049009c3c3/node_modules/vitest/dist/task-utils.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.2_happy-dom@20.14.5_jsdom@30.1.0_35ad368e4c4a4b8f279ac875fcf2bfae/node_modules/vitest/dist/task-utils.js
 /* @__NO_SIDE_EFFECTS__ */
 function getNames(task) {
 	const names = [task.name];
@@ -2266,7 +2266,7 @@ function createTaskName(names, separator = " > ") {
 	return names.filter((name) => name !== void 0).join(separator);
 }
 //#endregion
-//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.1_happy-dom@20.14.5_jsdom@30.1.0_a01b6ab7ee56d44cea1102049009c3c3/node_modules/vitest/dist/chunks/run.C5UmxDPh.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.2_happy-dom@20.14.5_jsdom@30.1.0_35ad368e4c4a4b8f279ac875fcf2bfae/node_modules/vitest/dist/chunks/run.C5UmxDPh.js
 /**
 * Diff Match and Patch
 * Copyright 2018 The diff-match-patch Authors.
@@ -4917,7 +4917,7 @@ async function finishSendTasksUpdate(runner) {
 	await Promise.all(pendingTasksUpdates);
 }
 //#endregion
-//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.1_happy-dom@20.14.5_jsdom@30.1.0_a01b6ab7ee56d44cea1102049009c3c3/node_modules/vitest/dist/chunks/utils.DYj33du9.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.2_happy-dom@20.14.5_jsdom@30.1.0_35ad368e4c4a4b8f279ac875fcf2bfae/node_modules/vitest/dist/chunks/utils.DYj33du9.js
 const NAME_WORKER_STATE = "__vitest_worker__";
 function getWorkerState() {
 	const workerState = globalThis[NAME_WORKER_STATE];
@@ -4943,7 +4943,7 @@ function resetModules(modules, resetMocks = false) {
 	});
 }
 //#endregion
-//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.1_happy-dom@20.14.5_jsdom@30.1.0_a01b6ab7ee56d44cea1102049009c3c3/node_modules/vitest/dist/chunks/spy.DQ0ZsPbi.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.2_happy-dom@20.14.5_jsdom@30.1.0_35ad368e4c4a4b8f279ac875fcf2bfae/node_modules/vitest/dist/chunks/spy.DQ0ZsPbi.js
 function isMockFunction(fn) {
 	return typeof fn === "function" && "_isMockFunction" in fn && fn._isMockFunction === true;
 }
@@ -8339,7 +8339,7 @@ function use(fn) {
 }
 __name(use, "use");
 //#endregion
-//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.1_happy-dom@20.14.5_jsdom@30.1.0_a01b6ab7ee56d44cea1102049009c3c3/node_modules/vitest/dist/chunks/plugins.Cigb0uSy.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.2_happy-dom@20.14.5_jsdom@30.1.0_35ad368e4c4a4b8f279ac875fcf2bfae/node_modules/vitest/dist/chunks/plugins.Cigb0uSy.js
 const serialize$1 = (val, config, indentation, depth, refs, printer) => {
 	const name = val.getMockName();
 	const nameString = name === "vi.fn()" ? "" : ` ${name}`;
@@ -8372,7 +8372,7 @@ function getSerializers() {
 	return PLUGINS;
 }
 //#endregion
-//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.1_happy-dom@20.14.5_jsdom@30.1.0_a01b6ab7ee56d44cea1102049009c3c3/node_modules/vitest/dist/chunks/offset.Dy-5Fdfn.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.1_@opentelemetry+api@1.9.1_@types+node@26.6.2_happy-dom@20.14.5_jsdom@30.1.0_35ad368e4c4a4b8f279ac875fcf2bfae/node_modules/vitest/dist/chunks/offset.Dy-5Fdfn.js
 const lineSplitRE = /\r?\n/;
 function positionToOffset(source, lineNumber, columnNumber) {
 	const lines = source.split(lineSplitRE);

package/drizzle/postgres/20260918120000_v3_event_usage/migration.sql

@@ -1,6 +1,6 @@
 CREATE TABLE "t_event_usage" (
 	"f_event_id" text PRIMARY KEY NOT NULL,
-	"f_created_at" integer NOT NULL,
+	"f_created_at" bigint NOT NULL,
 	"f_provider" text,
 	"f_model" text,
 	"f_input_tokens" integer DEFAULT 0 NOT NULL,

package/drizzle/sqlite/20260918120000_v3_event_usage/migration.sql

@@ -1,6 +1,6 @@
 CREATE TABLE `t_event_usage` (
 	`f_event_id` text PRIMARY KEY NOT NULL,
-	`f_created_at` integer NOT NULL,
+	`f_created_at` bigint NOT NULL,
 	`f_provider` text,
 	`f_model` text,
 	`f_input_tokens` integer DEFAULT 0 NOT NULL,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/session-rdb",
-  "version": "0.0.21-alpha.3",
+  "version": "0.0.21-alpha.5",
   "description": "RDB durable session backend for DeepSeek Harness: implements both session-persistence and session-branch (rewind / retry / fork) providers.",
   "keywords": [
     "branch",
@@ -39,7 +39,7 @@
     "./cordis.patch.yml": "./cordis.patch.yml"
   },
   "dependencies": {
-    "@morlay/session-branch": "0.0.10-alpha.3",
+    "@morlay/session-branch": "0.0.10-alpha.5",
     "drizzle-orm": "^1.0.0-rc.5-ab785fc",
     "fflate": "^0.8.2",
     "pg": "^8.23.0"

package/src/backend.ts

@@ -97,6 +97,13 @@ export interface BackendTx {
   deleteSessions(ids: SessionId[]): Promise<number>;
 }
 
+/** 活动计数的一个桶：本地日 + 事件类型 + 计数。 */
+export interface EventCountBucket {
+  day: string;
+  type: string;
+  count: number;
+}
+
 export interface Backend {
   readonly kind: "sqlite" | "postgres";
 
@@ -129,11 +136,29 @@ export interface Backend {
   listOrphanSubagentSessions(): Promise<SessionId[]>;
 
   /**
-   * 用量统计的原始聚合：按天×模型×subagent 的桶与按会话的行（事件行去重、排除孤儿）。
+   * 用量统计的原始聚合：token 用量读 `t_event_usage`、活动计数读派生表 `t_event_counts`，
+   * 加按天×模型的桶与按会话的行（事件行去重、排除孤儿）。
    * @param sinceMs - 只算该时刻（含）之后的事件行；省略即全量。
    */
   usageReport(sinceMs?: number): Promise<UsageAggregate>;
 
+  /**
+   * 活动计数**旁路累加**（派生表 `t_event_counts`，不参与写事务、失败可丢——表可销毁重建）：
+   * 每个 (会话, 本地日, 事件类型) 记一行计数。
+   * @param id - 会话 id。
+   * @param buckets - 本批要累加的 (day, type, count)。
+   */
+  incrementEventCounts(id: SessionId, buckets: readonly EventCountBucket[]): Promise<void>;
+
+  /**
+   * 按会话从事件表重算活动计数（rewind / fork 之后调用）：先删该会话的行再重算。
+   * @param id - 会话 id。
+   */
+  rebuildEventCounts(id: SessionId): Promise<void>;
+
+  /** 删掉一个会话的活动计数行（会话删除时）。 */
+  deleteEventCounts(id: SessionId): Promise<void>;
+
   /** 回收空间与统计（含 VACUUM）；不得在事务内执行。 */
   vacuum(): Promise<void>;
 

package/src/branch.ts

@@ -11,7 +11,6 @@ import {
   SessionBranch,
   SessionBranchError,
   balanceRewindPrefix,
-  buildTimeline,
   rewindKeepLength,
   type BranchAnchorMode,
   type BranchBoundary,
@@ -295,6 +294,8 @@ export class SessionBranchRdbProvider implements SessionBranchProvider {
     } finally {
       await handle.close();
     }
+    // 子会话继承了前缀事件：活动计数按子会话重算（派生表，best-effort）。
+    await this.persistence.rebuildEventCounts(childId);
     return childId;
   }
 
@@ -425,6 +426,9 @@ export class SessionBranchRdbProvider implements SessionBranchProvider {
       });
     }
 
+    // 截断后该会话的事件集合变了：活动计数跟着重算（派生表，best-effort）。
+    await this.persistence.rebuildEventCounts(id);
+
     return { header: rowToMeta(row), revision: (await internals.readStoredRevision(id))! };
   }
 
@@ -596,18 +600,6 @@ export class SessionBranchRdb extends SessionBranch {
   ): Promise<SessionPersistenceSnapshot> {
     return this.provider.rewind(id, toBoundary, signal);
   }
-
-  async timeline(sessionId: SessionId, signal?: AbortSignal) {
-    const persistence = this.ctx.sessionPersistence as SessionPersistenceRdb;
-    const snapshots = await persistence.listSnapshots(signal);
-
-    const readOwnEvents = async (id: SessionId, fromSeq: number, s?: AbortSignal) => {
-      const live = this.ctx.sessions.get(id);
-      if (live !== undefined) return live.snapshotEvents().slice(fromSeq);
-      return (await persistence.internals().readFrom(id, fromSeq, s)).events;
-    };
-    return buildTimeline(snapshots, readOwnEvents, sessionId, signal);
-  }
 }
 
 export default SessionBranchRdb;

package/src/entities/v3/event-usage.ts

@@ -12,7 +12,8 @@ export const eventUsage: TableDef = {
       primaryKey: true,
       references: { table: "t_events", column: "f_event_id", onDelete: "cascade" },
     },
-    f_created_at: { type: "integer", notNull: true },
+    // 毫秒时间戳：SQLite 的 integer 是 64 位，PG 的 integer 只有 int4（21 亿上限）——必须是 bigint。
+    f_created_at: { type: "bigint", notNull: true },
     f_provider: { type: "text" },
     f_model: { type: "text" },
     f_input_tokens: { type: "integer", notNull: true },

package/src/index.ts

@@ -39,7 +39,12 @@ import {
   type SurfaceEventType,
 } from "@deepseek-ai/dsh-session";
 import { sessionFormatLogFilename } from "@deepseek-ai/dsh-session-format";
-import { type Backend, type BackendTx, type EventInsert } from "./backend.ts";
+import {
+  type Backend,
+  type BackendTx,
+  type EventCountBucket,
+  type EventInsert,
+} from "./backend.ts";
 import { WriteGuard } from "./write-guard.ts";
 import { repairReadView, rowToMeta, scanRows, toJsonlArtifact } from "./log.ts";
 import {
@@ -56,7 +61,7 @@ import { registerSessionImport } from "./import.ts";
 import { registerSessionDeletion } from "./deletion.ts";
 import { registerSessionExport } from "./export.ts";
 import { registerSessionGc } from "./gc.ts";
-import { registerSessionUsage } from "./usage.ts";
+import { COUNTED_EVENT_TYPES, localDayKey, registerSessionUsage } from "./usage.ts";
 import type { UsageAggregate } from "./usage.ts";
 import { SessionQueryRdb } from "./session-query.ts";
 import { adoptLegacyRows, convertLegacyRows, isLegacyVersion } from "./legacy.ts";
@@ -742,7 +747,10 @@ export class SessionPersistenceRdb extends SessionPersistence {
     });
     this.liveBuffers.delete(id);
     this.liveReady.delete(id);
+    this.liveFailures.delete(id);
+    this.liveDropWarned.delete(id);
     this.reuseEventIds.delete(id);
+    await this.deleteEventCounts(id);
   }
 
   /** GC 通道：回收已无桥接行引用的事件行（孤儿），返回删除行数。 */
@@ -763,7 +771,10 @@ export class SessionPersistenceRdb extends SessionPersistence {
     for (const id of deletable) {
       this.liveBuffers.delete(id);
       this.liveReady.delete(id);
+      this.liveFailures.delete(id);
+      this.liveDropWarned.delete(id);
       this.reuseEventIds.delete(id);
+      await this.deleteEventCounts(id);
     }
     return deleted;
   }
@@ -872,6 +883,7 @@ export class SessionPersistenceRdb extends SessionPersistence {
 
     this.writeGuard.confirmHead(meta.id, confirmedHead);
     this.tracker.materialized(meta.id);
+    await this.recordEventCounts(meta.id, events);
     return true;
   }
 
@@ -951,6 +963,44 @@ export class SessionPersistenceRdb extends SessionPersistence {
     };
   }
 
+  /**
+   * 活动计数**旁路累加**：不在写事务里、失败只 warn——`t_event_counts` 是可销毁重建的派生表，
+   * 丢几次累加不影响可用性（需要时用 `rebuildEventCounts` 重算）。
+   */
+  private async recordEventCounts(id: SessionId, events: readonly SessionEvent[]): Promise<void> {
+    const buckets = eventCountBuckets(events);
+    if (buckets.length === 0) return;
+    try {
+      await this.backend.incrementEventCounts(id, buckets);
+    } catch (error: unknown) {
+      this.ctx.logger.warn(
+        `session-rdb: activity counts for "${id}" not updated (${describeError(error)})`,
+      );
+    }
+  }
+
+  /** 重算一个会话的活动计数（rewind / fork 之后；best-effort，同 `recordEventCounts`）。 */
+  async rebuildEventCounts(id: SessionId): Promise<void> {
+    try {
+      await this.backend.rebuildEventCounts(id);
+    } catch (error: unknown) {
+      this.ctx.logger.warn(
+        `session-rdb: activity counts for "${id}" not rebuilt (${describeError(error)})`,
+      );
+    }
+  }
+
+  /** 会话删除时清掉它的活动计数行（best-effort）。 */
+  private async deleteEventCounts(id: SessionId): Promise<void> {
+    try {
+      await this.backend.deleteEventCounts(id);
+    } catch (error: unknown) {
+      this.ctx.logger.warn(
+        `session-rdb: activity counts for "${id}" not deleted (${describeError(error)})`,
+      );
+    }
+  }
+
   private async rewriteMigratedLog(
     id: SessionId,
     log: { meta: SessionHeader; inheritedEventCount: number; events: SessionEvent[] },
@@ -1033,31 +1083,31 @@ export class SessionPersistenceRdb extends SessionPersistence {
     id: SessionId,
     signal?: AbortSignal,
   ): Promise<import("@deepseek-ai/dsh-session-persistence").SessionInspection> {
-    const handle = await this.open(id, "read", signal === undefined ? undefined : { signal });
-    try {
-      const { events } = await handle.read(
-        0,
-        undefined,
-        signal === undefined ? undefined : { signal },
-      );
-      const row = await this.backend.getSession(id);
-      if (row === undefined) throw new SessionPersistenceNotFoundError(id);
-
-      if (isLegacyVersion(row.fVersion)) {
+    signal?.throwIfAborted();
+    await this.ready;
+    signal?.throwIfAborted();
+    // 一条读取路径：load 的语义就是「读一次完整快照」，不再经 handle 面再读一遍
+    // （原先 open(read) 读一次 + handle.read 又读一次，等于把最贵的读付两遍）。
+    const log = await this.readLog(id, {}, signal);
+    if (log === undefined) {
+      // 未落库的 live 会话没有磁盘视图：与 handle.read 的 detached 口径一致，返回空日志。
+      const pending = this.tracker.pendingOf(id);
+      if (pending !== undefined) {
         return {
-          meta: handle.header,
-          inheritedEventCount: handle.inheritedEventCount,
-          events,
+          meta: pending.header,
+          inheritedEventCount: SessionLogOffset(pending.inheritedEventCount),
+          events: [],
         };
       }
-      return {
-        meta: rowToMeta(row),
-        inheritedEventCount: SessionLogOffset(row.fSeedLength ?? 0),
-        events,
-      };
-    } finally {
-      await handle.close();
+      throw new SessionPersistenceNotFoundError(id);
     }
+    repairReadView(log.events);
+    validateStoredEvents(log.meta, log.events);
+    return {
+      meta: log.meta,
+      inheritedEventCount: SessionLogOffset(log.inheritedEventCount),
+      events: log.events,
+    };
   }
 
   async append(id: SessionId, events: readonly SessionEvent[]): Promise<void> {
@@ -1123,27 +1173,41 @@ export class SessionPersistenceRdb extends SessionPersistence {
     );
   }
 
+  private readonly liveFailures = new Map<SessionId, Error>();
+  private readonly liveDropWarned = new Set<SessionId>();
+
+  // live 会话的持久化初始化失败是**终态**（cwd / 继承前缀冲突、id 碰撞、后端打不开都不自愈）：
+  // 记账一条 error、丢掉已缓冲的事件，之后该会话的事件不再进内存缓冲（否则表现为
+  // 「聊了一整轮、重启后全丢，内存里还留一份无界副本」），flush 把失败抛回上游。
+  private watchLiveReady(ctx: Context, session: Session, ready: Promise<void>): void {
+    void ready.catch((error: unknown) => {
+      const failure =
+        error instanceof Error
+          ? error
+          : new Error(
+              typeof error === "string" ? error : `live session "${session.id}" persistence failed`,
+            );
+      this.liveFailures.set(session.id, failure);
+      this.liveBuffers.delete(session.id);
+      ctx.logger.error(
+        `session-rdb: live session "${session.id}" persistence unavailable (${failure.message}); its events will not be persisted`,
+      );
+    });
+  }
+
   private installLiveRouting(ctx: Context): void {
     ctx.on("session/created", (session: Session) => {
       this.liveBuffers.set(session.id, []);
       const ready = this.ensureLiveHandle(session);
       this.liveReady.set(session.id, ready);
-      void ready.catch((error: unknown) => {
-        ctx.logger.warn(
-          `session-rdb: live session "${session.id}" persistence init failed: ${String(error)}`,
-        );
-      });
+      this.watchLiveReady(ctx, session, ready);
     });
 
     for (const session of ctx.sessions.list()) {
       this.liveBuffers.set(session.id, []);
       const ready = this.ensureLiveHandle(session);
       this.liveReady.set(session.id, ready);
-      void ready.catch((error: unknown) => {
-        ctx.logger.warn(
-          `session-rdb: live session "${session.id}" persistence init failed: ${String(error)}`,
-        );
-      });
+      this.watchLiveReady(ctx, session, ready);
     }
     ctx.on("session/event", (session: Session, event: SessionEvent) => {
       const handle = this.tracker.writerOf(session.id);
@@ -1155,9 +1219,20 @@ export class SessionPersistenceRdb extends SessionPersistence {
         });
         return;
       }
+      if (this.liveFailures.has(session.id)) {
+        if (!this.liveDropWarned.has(session.id)) {
+          this.liveDropWarned.add(session.id);
+          ctx.logger.warn(
+            `session-rdb: dropping events for live session "${session.id}" because persistence failed earlier`,
+          );
+        }
+        return;
+      }
       this.liveBuffers.get(session.id)?.push(structuredClone(event));
     });
     ctx.on("session/flush", (session: Session) => {
+      const failure = this.liveFailures.get(session.id);
+      if (failure !== undefined) return Promise.reject(failure);
       const handle = this.tracker.writerOf(session.id);
       if (handle === undefined) {
         const ready = this.liveReady.get(session.id);
@@ -1174,6 +1249,8 @@ export class SessionPersistenceRdb extends SessionPersistence {
       const ready = this.liveReady.get(session.id);
       this.liveBuffers.delete(session.id);
       this.liveReady.delete(session.id);
+      this.liveFailures.delete(session.id);
+      this.liveDropWarned.delete(session.id);
       const closeHandle = (): void => {
         const handle = this.tracker.writerOf(session.id);
         if (handle === undefined) return;
@@ -1193,6 +1270,10 @@ export class SessionPersistenceRdb extends SessionPersistence {
     ctx.effect(
       () => async () => {
         await Promise.allSettled(this.liveReady.values());
+        this.liveBuffers.clear();
+        this.liveReady.clear();
+        this.liveFailures.clear();
+        this.liveDropWarned.clear();
         await this.tracker.closeAll();
 
         await this.close();
@@ -1259,6 +1340,24 @@ function seedCoversPrefix(seed: readonly SessionEvent[], prefix: readonly Sessio
   );
 }
 
+/** 一批事件折成活动计数的桶：只数四种类型，按本地日聚合。 */
+function eventCountBuckets(events: readonly SessionEvent[]): EventCountBucket[] {
+  const counted = new Map<string, EventCountBucket>();
+  for (const event of events) {
+    if (!(COUNTED_EVENT_TYPES as readonly string[]).includes(event.type)) continue;
+    const day = localDayKey(event.time);
+    const key = `${day}#${event.type}`;
+    const bucket = counted.get(key) ?? { day, type: event.type, count: 0 };
+    bucket.count += 1;
+    counted.set(key, bucket);
+  }
+  return [...counted.values()];
+}
+
+function describeError(error: unknown): string {
+  return error instanceof Error ? error.message : "unknown error";
+}
+
 function createBackend(config: Config): Backend {
   if (config.type === "sqlite") {
     return new SqliteBackend({

package/src/log.ts

@@ -127,7 +127,40 @@ const SURFACE_EVENT_TYPES = new Set([
 
 const METERING_EVENT_TYPES = new Set(["compaction/summary", "compaction/prune"]);
 
+/**
+ * 升序的 surface 事件 seq 索引：读视图修复里的溯源（replace 的 `sourceEventSeqs` 与
+ * metering 的 `shadowedSeqs`）共用这一份，避免每个 replace 各扫一遍全量事件。
+ * 前提是输入按 seq 有序（`readLog` 与 live snapshot 都如此）。
+ */
+function surfaceSeqIndex(events: readonly SessionEvent[]): number[] {
+  const seqs: number[] = [];
+  for (const event of events) {
+    if (SURFACE_EVENT_TYPES.has(event.type)) seqs.push(event.seq);
+  }
+  return seqs;
+}
+
+/** `[startSeq, endSeq]` 内的 surface seq（含端点），二分定位后切片。 */
+function surfaceSeqsInRange(seqs: readonly number[], startSeq: number, endSeq: number): number[] {
+  let low = 0;
+  let high = seqs.length;
+  while (low < high) {
+    const mid = (low + high) >> 1;
+    if (seqs[mid]! < startSeq) low = mid + 1;
+    else high = mid;
+  }
+  const from = low;
+  high = seqs.length;
+  while (low < high) {
+    const mid = (low + high) >> 1;
+    if (seqs[mid]! <= endSeq) low = mid + 1;
+    else high = mid;
+  }
+  return seqs.slice(from, low);
+}
+
 export function recomputeReplaceProvenance(events: SessionEvent[]): void {
+  const seqs = surfaceSeqIndex(events);
   for (let i = 0; i < events.length; i++) {
     const event = events[i]!;
     const raw = event as unknown as { surfaceOp?: unknown; sourceEventSeqs?: number[] };
@@ -145,17 +178,7 @@ export function recomputeReplaceProvenance(events: SessionEvent[]): void {
       raw.sourceEventSeqs = meteringData.shadowedSeqs;
       continue;
     }
-    const refs: number[] = [];
-    for (const candidate of events) {
-      if (
-        candidate.seq >= startSeq &&
-        candidate.seq <= endSeq &&
-        SURFACE_EVENT_TYPES.has(candidate.type)
-      ) {
-        refs.push(candidate.seq);
-      }
-    }
-    raw.sourceEventSeqs = refs;
+    raw.sourceEventSeqs = surfaceSeqsInRange(seqs, startSeq, endSeq);
   }
 }
 
@@ -359,6 +382,7 @@ export function repairRequestHeaders(events: SessionEvent[]): void {
 }
 
 export function syncMeteringRanges(events: SessionEvent[]): void {
+  const seqs = surfaceSeqIndex(events);
   for (let i = 1; i < events.length; i++) {
     const metering = events[i - 1]!;
     if (!METERING_EVENT_TYPES.has(metering.type)) continue;
@@ -372,14 +396,7 @@ export function syncMeteringRanges(events: SessionEvent[]): void {
     };
     if (data.shadowedRange?.start === startSeq && data.shadowedRange.end === endSeq) continue;
     data.shadowedRange = { start: startSeq, end: endSeq };
-    data.shadowedSeqs = events
-      .filter(
-        (candidate) =>
-          candidate.seq >= startSeq &&
-          candidate.seq <= endSeq &&
-          SURFACE_EVENT_TYPES.has(candidate.type),
-      )
-      .map((candidate) => candidate.seq);
+    data.shadowedSeqs = surfaceSeqsInRange(seqs, startSeq, endSeq);
   }
 }