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

package/README.md

@@ -60,7 +60,7 @@ type Config =
 除 `ctx.sessionPersistence` 外，本包还实现 `@morlay/session-branch` 的 provider
 抽象并**随插件自动注册 `ctx.sessionBranch`**（`SessionBranchRdb`），在不修改上游
 代码的前提下提供 `rewind / retry / fork` 的持久化闭环（原语：`forkFrom` 纯 append
-派生、`rewind` 后端事务截断、`timeline` 版本树投影）——语义、坐标论证与已知限制见
+派生、`rewind` 后端事务截断）——语义、坐标论证与已知限制见
 [分支能力](.agents/designs/20260917-分支能力.md)。
 
 上层编排（edit / reroll / retry / rewind / fork 完整功能）由

package/dist/artifact.d.mts

@@ -1,4 +1,4 @@
-import { i as SessionRow, r as EventRow } from "./backend-DpdtxYpz.mjs";
+import { a as SessionRow, i as EventRow } from "./backend-a0xDrUFG.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 } from "@deepseek-ai/dsh-session";

package/dist/artifact.mjs

@@ -1,3 +1,3 @@
-import { _ as toJsonlArtifact, a as repairAssistantSettlement, c as repairRequestHeaders, d as rowToMeta, f as scanRows, g as titleOfEventData, h as syncMeteringRanges, i as renameLegacyPtcEvents, l as repairSurfaceOps, m as sessionInsertRow, n as orphanInboxSpliceSeqs, o as repairOrphanInboxSplices, p as sessionConflictRow, r as recomputeReplaceProvenance, s as repairReadView, t as findSurfaceRepairs, u as rowToEvent, v as usageRowOf } from "./log-CnYct2Dv.mjs";
+import { _ as toJsonlArtifact, a as repairAssistantSettlement, c as repairRequestHeaders, d as rowToMeta, f as scanRows, g as titleOfEventData, h as syncMeteringRanges, i as renameLegacyPtcEvents, l as repairSurfaceOps, m as sessionInsertRow, n as orphanInboxSpliceSeqs, o as repairOrphanInboxSplices, p as sessionConflictRow, r as recomputeReplaceProvenance, s as repairReadView, t as findSurfaceRepairs, u as rowToEvent, v as usageRowOf } from "./log-C-rbdFwK.mjs";
 import { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport } from "./import.mjs";
 export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, findSurfaceRepairs, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, renameLegacyPtcEvents, repairAssistantSettlement, repairOrphanInboxSplices, repairReadView, repairRequestHeaders, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sessionConflictRow, sessionInsertRow, syncMeteringRanges, titleOfEventData, toJsonlArtifact, usageRowOf };

package/dist/{backend-DpdtxYpz.d.mts → backend-a0xDrUFG.d.mts}

@@ -3416,7 +3416,6 @@ declare class SessionBranchRdb extends SessionBranch {
   }>;
   forkFrom(sourceId: SessionId, options?: ForkFromOptions, signal?: AbortSignal): Promise<SessionId>;
   rewind(id: SessionId, toBoundary: number, signal?: AbortSignal): Promise<SessionPersistenceSnapshot>;
-  timeline(sessionId: SessionId, signal?: AbortSignal): Promise<import("@morlay/session-branch").BranchTimeline>;
 }
 //#endregion
 //#region src/index.d.ts
@@ -3575,6 +3574,15 @@ declare class SessionPersistenceRdb extends SessionPersistence {
     storedCount: number;
     migrated: boolean;
   } | undefined>;
+  /**
+   * 活动计数**旁路累加**：不在写事务里、失败只 warn——`t_event_counts` 是可销毁重建的派生表，
+   * 丢几次累加不影响可用性（需要时用 `rebuildEventCounts` 重算）。
+   */
+  private recordEventCounts;
+  /** 重算一个会话的活动计数（rewind / fork 之后；best-effort，同 `recordEventCounts`）。 */
+  rebuildEventCounts(id: SessionId): Promise<void>;
+  /** 会话删除时清掉它的活动计数行（best-effort）。 */
+  private deleteEventCounts;
   private rewriteMigratedLog;
   listSnapshots(signal?: AbortSignal): Promise<Array<SessionPersistenceSnapshot & {
     inheritedEventCount: number;
@@ -3592,22 +3600,39 @@ declare class SessionPersistenceRdb extends SessionPersistence {
   registerReuseEventIds(childId: SessionId, map: ReadonlyMap<number, string>): void;
   internals(): SessionPersistenceRdbInternals;
   private rowRevision;
+  private readonly liveFailures;
+  private readonly liveDropWarned;
+  private watchLiveReady;
   private installLiveRouting;
   private ensureLiveHandle;
 }
 //#endregion
 //#region src/usage.d.ts
-/** 一段用量合计（token 字段直接取事件里模型报的 usage）。 */
-interface UsageTotals {
-  events: number;
+/** 一段 token 用量（字段直接取事件里模型报的 usage）。 */
+interface UsageTokenTotals {
   inputTokens: number;
   outputTokens: number;
   cacheReadTokens: number;
   reasoningTokens: number;
   totalTokens: number;
 }
-/** 一天 × 一个模型 × 是否子代理 的用量桶：总览、按天、按模型都由它折叠。 */
-interface UsageBucket extends UsageTotals {
+/**
+ * 活动计数：与 token 用量同一时间范围、同一去重口径（只算被会话引用的事件行），
+ * 按事件类型数出来——「轮次 / 步骤 / 用户输入 / 工具调用」比「事件行数」有信息量。
+ */
+interface UsageActivityTotals {
+  turns: number;
+  steps: number;
+  userInputs: number;
+  toolCalls: number;
+}
+/** 总量与按会话行用的一整套指标（token + 活动）。 */
+interface UsageTotals extends UsageTokenTotals, UsageActivityTotals {}
+/**
+ * 一天 × 一个模型 × 是否子代理 的用量桶：总览、按天、按模型都由它折叠。
+ * 只有 token 用量——活动计数没有模型归属（一个轮次可能跨模型），挂在总量与按会话行上。
+ */
+interface UsageBucket extends UsageTokenTotals {
   day: string;
   provider: string | null;
   model: string | null;
@@ -3620,8 +3645,11 @@ interface UsageSessionRow extends UsageTotals {
   subagent: boolean;
   archived: boolean;
 }
-/** 后端的原始聚合结果。 */
+/** 后端的原始聚合结果（总量 / 其中子代理 / 人类、按天×模型的桶、按会话的行）。 */
 interface UsageAggregate {
+  totals: UsageTotals;
+  subagent: UsageTotals;
+  human: UsageTotals;
   buckets: UsageBucket[];
   sessions: UsageSessionRow[];
 }
@@ -3690,6 +3718,12 @@ interface BackendTx {
   /** 批量删除整条会话：桥接行、workspace 归属行、投影行与会话行。 */
   deleteSessions(ids: SessionId[]): Promise<number>;
 }
+/** 活动计数的一个桶：本地日 + 事件类型 + 计数。 */
+interface EventCountBucket {
+  day: string;
+  type: string;
+  count: number;
+}
 interface Backend {
   readonly kind: "sqlite" | "postgres";
   readonly storeIdentity: string;
@@ -3706,13 +3740,28 @@ interface Backend {
   /** 父会话已不存在（或没有父）的 subagent 会话：父被删后它们成了孤儿。 */
   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>;
   close(): Promise<void>;
 }
 //#endregion
-export { tSessionProjcacheRows as A, eventDimensions as C, tPersistenceState as D, tEvents as E, tWorkspaces as F, WriteGuard as I, StorageRepository as L, tStorageUnits as M, tWorkspaceSessions as N, tSchemaMeta as O, tWorkspaceState as P, SESSION_PERSISTENCE_SQLITE_APPLICATION_ID as S, tEventUsage as T, EVENT_ENCODING as _, UsageAggregate as a, JournalMode as b, SessionDeletionError as c, SessionPersistenceRdbInternals as d, SessionBranchRdb as f, DEFAULT_BUSY_TIMEOUT_MS as g, truncateLiveSession as h, SessionRow as i, tSessions as j, tSessionEvents as k, SessionDeletionErrorCode as l, locateTurnEnd as m, BackendTx as n, Config$1 as o, SessionBranchRdbProvider as p, EventRow as r, ProjectionCacheOptions as s, Backend as t, SessionPersistenceRdb as u, EventKind as v, eventKind as w, SCHEMA_VERSION as x, EventRole as y };
+export { tSessionEvents as A, SESSION_PERSISTENCE_SQLITE_APPLICATION_ID as C, tEvents as D, tEventUsage as E, tWorkspaceState as F, tWorkspaces as I, WriteGuard as L, tSessions as M, tStorageUnits as N, tPersistenceState as O, tWorkspaceSessions as P, StorageRepository as R, SCHEMA_VERSION as S, eventKind as T, DEFAULT_BUSY_TIMEOUT_MS as _, SessionRow as a, EventRole as b, ProjectionCacheOptions as c, SessionPersistenceRdb as d, SessionPersistenceRdbInternals as f, truncateLiveSession as g, locateTurnEnd as h, EventRow as i, tSessionProjcacheRows as j, tSchemaMeta as k, SessionDeletionError as l, SessionBranchRdbProvider as m, BackendTx as n, UsageAggregate as o, SessionBranchRdb as p, EventCountBucket as r, Config$1 as s, Backend as t, SessionDeletionErrorCode as u, EVENT_ENCODING as v, eventDimensions as w, JournalMode as x, EventKind as y };

package/dist/{branch-5JzX9rUq.mjs → branch-Dlmbkfjj.mjs}

@@ -1,8 +1,8 @@
-import { c as repairRequestHeaders, d as rowToMeta, f as scanRows } from "./log-CnYct2Dv.mjs";
+import { c as repairRequestHeaders, d as rowToMeta, f as scanRows } from "./log-C-rbdFwK.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 { SessionBranch, SessionBranchError, balanceRewindPrefix, buildTimeline, rewindKeepLength } from "@morlay/session-branch";
+import { SessionBranch, SessionBranchError, balanceRewindPrefix, rewindKeepLength } from "@morlay/session-branch";
 //#region src/legacy.ts
 function physicalHeader(row) {
 	const common = {
@@ -201,6 +201,7 @@ var SessionBranchRdbProvider = class {
 		} finally {
 			await handle.close();
 		}
+		await this.persistence.rebuildEventCounts(childId);
 		return childId;
 	}
 	async rewind(id, toBoundary, signal) {
@@ -273,6 +274,7 @@ var SessionBranchRdbProvider = class {
 			headSeq: keepLength - 1,
 			snapshotEvents: () => []
 		});
+		await this.persistence.rebuildEventCounts(id);
 		return {
 			header: rowToMeta(row),
 			revision: await internals.readStoredRevision(id)
@@ -375,16 +377,6 @@ var SessionBranchRdb = class extends SessionBranch {
 	rewind(id, toBoundary, signal) {
 		return this.provider.rewind(id, toBoundary, signal);
 	}
-	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.internals().readFrom(id, fromSeq, s)).events;
-		};
-		return buildTimeline(snapshots, readOwnEvents, sessionId, signal);
-	}
 };
 //#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 };

package/dist/deletion.d.mts

@@ -1,4 +1,4 @@
-import { u as SessionPersistenceRdb } from "./backend-DpdtxYpz.mjs";
+import { d as SessionPersistenceRdb } from "./backend-a0xDrUFG.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-CWTWV7vx.mjs";
+import { i as registerSessionDeletion, r as SESSION_DELETE_PATH } from "./src-Bn0038Sp.mjs";
 export { SESSION_DELETE_PATH, registerSessionDeletion };

package/dist/import.d.mts

@@ -1,4 +1,4 @@
-import { u as SessionPersistenceRdb } from "./backend-DpdtxYpz.mjs";
+import { d as SessionPersistenceRdb } from "./backend-a0xDrUFG.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,4 +1,4 @@
-import { i as replaceLiveSessionLog } from "./branch-5JzX9rUq.mjs";
+import { i as replaceLiveSessionLog } from "./branch-Dlmbkfjj.mjs";
 import { randomUUID } from "node:crypto";
 import { SESSION_FORMAT_VERSION, SessionLogOffset } from "@deepseek-ai/dsh-session";
 import { parseSessionFormatLogFilename } from "@deepseek-ai/dsh-session-format";

package/dist/index.d.mts

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

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { o as SCHEMA_VERSION } from "./sqlite-fpvm5Dzs.mjs";
-import { n as SessionPersistenceRdb, t as SessionDeletionError } from "./src-CWTWV7vx.mjs";
-import { n as SessionBranchRdbProvider, r as locateTurnEnd, t as SessionBranchRdb } from "./branch-5JzX9rUq.mjs";
+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 };

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

@@ -80,7 +80,36 @@ const SURFACE_EVENT_TYPES = /* @__PURE__ */ new Set([
 	"tool/result"
 ]);
 const METERING_EVENT_TYPES = /* @__PURE__ */ new Set(["compaction/summary", "compaction/prune"]);
+/**
+* 升序的 surface 事件 seq 索引：读视图修复里的溯源（replace 的 `sourceEventSeqs` 与
+* metering 的 `shadowedSeqs`）共用这一份，避免每个 replace 各扫一遍全量事件。
+* 前提是输入按 seq 有序（`readLog` 与 live snapshot 都如此）。
+*/
+function surfaceSeqIndex(events) {
+	const seqs = [];
+	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, startSeq, endSeq) {
+	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);
+}
 function recomputeReplaceProvenance(events) {
+	const seqs = surfaceSeqIndex(events);
 	for (let i = 0; i < events.length; i++) {
 		const raw = events[i];
 		const op = raw.surfaceOp;
@@ -92,9 +121,7 @@ function recomputeReplaceProvenance(events) {
 			raw.sourceEventSeqs = meteringData.shadowedSeqs;
 			continue;
 		}
-		const refs = [];
-		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);
 	}
 }
 function isEventSeqLike(value) {
@@ -247,6 +274,7 @@ function repairRequestHeaders(events) {
 	}
 }
 function syncMeteringRanges(events) {
+	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;
@@ -259,7 +287,7 @@ function syncMeteringRanges(events) {
 			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);
 	}
 }
 const PTC_EVENT_RENAMES = {