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

package/dist/storage.d.mts

@@ -1,4 +1,4 @@
-import { A as eventKind, B as tWorkspaceState, C as EVENT_ENCODING, D as SCHEMA_VERSION, E as JournalMode, F as tSessionEvents, H as WriteGuard, I as tSessionProjcacheRows, L as tSessions, M as tEvents, N as tPersistenceState, O as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, P as tSchemaMeta, R as tStorageUnits, S as DEFAULT_BUSY_TIMEOUT_MS, T as EventRole, U as StorageRepository, V as tWorkspaces, a as SessionListRowsPage, c as UsageAggregate, i as EventRow, j as tEventUsage, k as eventDimensions, n as BackendTx, o as SessionListRowsQuery, r as EventCountBucket, s as SessionRow, t as Backend, w as EventKind, z as tWorkspaceSessions } from "./backend-E0bmTXpz.mjs";
+import { A as SessionRow, At as tWorkspaceState, Ct as tSessionCounts, D as SessionCountBucket, Dt as tSessions, E as EventRow, Et as tSessionUsage, I as UsageAggregate, Mt as WriteGuard, Nt as StorageRepository, O as SessionListRowsPage, Ot as tStorageUnits, St as tSchemaMeta, T as BackendTx, Tt as tSessionProjcacheRows, _t as eventDimensions, bt as tEvents, dt as EVENT_ENCODING, ft as EventKind, gt as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, ht as SCHEMA_VERSION, j as SessionUsageBucket, jt as tWorkspaces, k as SessionListRowsQuery, kt as tWorkspaceSessions, mt as JournalMode, pt as EventRole, ut as DEFAULT_BUSY_TIMEOUT_MS, vt as eventKind, w as Backend, wt as tSessionEvents, xt as tPersistenceState, yt as tEventUsage } from "./log-CUjKQbOR.mjs";
 import { SessionId } from "@deepseek-ai/dsh-session";
 import { DatabaseSync } from "node:sqlite";
 //#region src/sqlite.d.ts
@@ -53,14 +53,27 @@ declare class SqliteBackend implements Backend {
    * `f_created_at`（同一时刻写入，口径一致）。
    */
   listSessionRows(query?: SessionListRowsQuery): Promise<SessionListRowsPage>;
+  /**
+   * 用量聚合：只读三张派生统计表——事件级用量行给去重口径的总量与「天 × 模型」桶，
+   * `t_session_usage` / `t_session_counts` 给按会话的行（含 fork 继承前缀）。
+   * 归属、本地日与「是否被引用」都是物化列，这里不再现算、也不回连事件表。
+   * 事件级按毫秒时间戳过滤、汇总表按本地日过滤——`sinceMs` 对齐到本地零点时两者等价。
+   */
   usageReport(sinceMs?: number): Promise<UsageAggregate>;
-  /** 活动计数旁路累加：派生表 `t_event_counts`，不在写事务里（失败可丢，表可销毁重建）。 */
-  incrementEventCounts(id: SessionId, buckets: readonly EventCountBucket[]): Promise<void>;
-  /** 按会话重算活动计数（rewind / fork 之后）：先删该会话的行，再从事件表重算。 */
-  rebuildEventCounts(id: SessionId): Promise<void>;
-  deleteEventCounts(id: SessionId): Promise<void>;
+  /** token 用量旁路累加：派生表 `t_session_usage`，不在写事务里（失败可丢，表可销毁重建）。 */
+  incrementSessionUsage(id: SessionId, buckets: readonly SessionUsageBucket[]): Promise<void>;
+  /** 活动计数旁路累加：派生表 `t_session_counts`，同上（四项计数一次落）。 */
+  incrementSessionCounts(id: SessionId, buckets: readonly SessionCountBucket[]): Promise<void>;
+  /** 按会话重算两张汇总表（rewind / fork 之后）：先删该会话的行，再从事件表重算。 */
+  rebuildSessionStats(id: SessionId): Promise<void>;
+  /**
+   * 全量重算用量行的引用标记：rewind 截断 / fork 复用 / 会话删除都会让「引用」跨会话变化，
+   * 只按本会话判定不够。低频路径，一次全表 UPDATE（3 万行量级）。
+   */
+  refreshEventUsageFlags(): Promise<void>;
+  deleteSessionStats(id: SessionId): Promise<void>;
   vacuum(): Promise<void>;
   private eventRows;
 }
 //#endregion
-export { DEFAULT_BUSY_TIMEOUT_MS, EVENT_ENCODING, EventKind, EventRole, type EventRow, JournalMode, SCHEMA_VERSION, SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, type SessionRow, SqliteBackend, SqliteBackendOptions, WriteGuard, eventDimensions, eventKind, openDatabase, tEventUsage, tEvents, tPersistenceState, tSchemaMeta, tSessionEvents, tSessionProjcacheRows, tSessions, tStorageUnits, tWorkspaceSessions, tWorkspaceState, tWorkspaces };
+export { DEFAULT_BUSY_TIMEOUT_MS, EVENT_ENCODING, EventKind, EventRole, type EventRow, JournalMode, SCHEMA_VERSION, SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, type SessionRow, SqliteBackend, SqliteBackendOptions, WriteGuard, eventDimensions, eventKind, openDatabase, tEventUsage, tEvents, tPersistenceState, tSchemaMeta, tSessionCounts, tSessionEvents, tSessionProjcacheRows, tSessionUsage, tSessions, tStorageUnits, tWorkspaceSessions, tWorkspaceState, tWorkspaces };

package/dist/storage.mjs

@@ -1,2 +1,2 @@
-import { A as WriteGuard, C as tSessions, D as tWorkspaces, E as tWorkspaceState, S as tSessionProjcacheRows, T as tWorkspaceSessions, _ as tEventUsage, b as tSchemaMeta, d as DEFAULT_BUSY_TIMEOUT_MS, f as EVENT_ENCODING, g as eventKind, h as eventDimensions, m as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, n as openDatabase, p as SCHEMA_VERSION, t as SqliteBackend, v as tEvents, w as tStorageUnits, x as tSessionEvents, y as tPersistenceState } from "./sqlite-zcXVyMxr.mjs";
-export { DEFAULT_BUSY_TIMEOUT_MS, EVENT_ENCODING, SCHEMA_VERSION, SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, SqliteBackend, WriteGuard, eventDimensions, eventKind, openDatabase, tEventUsage, tEvents, tPersistenceState, tSchemaMeta, tSessionEvents, tSessionProjcacheRows, tSessions, tStorageUnits, tWorkspaceSessions, tWorkspaceState, tWorkspaces };
+import { S as tWorkspaces, T as WriteGuard, _ as tSessionUsage, a as EVENT_ENCODING, b as tWorkspaceSessions, c as eventDimensions, d as tEvents, f as tPersistenceState, g as tSessionProjcacheRows, h as tSessionEvents, i as DEFAULT_BUSY_TIMEOUT_MS, l as eventKind, m as tSessionCounts, n as openDatabase, o as SCHEMA_VERSION, p as tSchemaMeta, s as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, t as SqliteBackend, u as tEventUsage, v as tSessions, x as tWorkspaceState, y as tStorageUnits } from "./sqlite-SCiSnwaz.mjs";
+export { DEFAULT_BUSY_TIMEOUT_MS, EVENT_ENCODING, SCHEMA_VERSION, SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, SqliteBackend, WriteGuard, eventDimensions, eventKind, openDatabase, tEventUsage, tEvents, tPersistenceState, tSchemaMeta, tSessionCounts, tSessionEvents, tSessionProjcacheRows, tSessionUsage, tSessions, tStorageUnits, tWorkspaceSessions, tWorkspaceState, tWorkspaces };

package/dist/testing.d.mts

@@ -1,4 +1,4 @@
-import { v as truncateLiveSession } from "./backend-E0bmTXpz.mjs";
+import { ot as truncateLiveSession } from "./log-CUjKQbOR.mjs";
 import { SessionPersistence } from "@deepseek-ai/dsh-session-persistence";
 import { Session, SessionEvent, SessionHeader, SessionId } from "@deepseek-ai/dsh-session";
 import { Context, Fiber } from "@deepseek-ai/cordis";

package/dist/testing.mjs

@@ -1,4 +1,4 @@
-import { a as truncateLiveSession } from "./branch-BjUR6wfe.mjs";
+import { a as truncateLiveSession } from "./branch-D4nVzQQM.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";
@@ -6,7 +6,7 @@ import { MessageId, createUserMessage, freezeMessage } from "@deepseek-ai/dsh-ll
 //#region \0rolldown/runtime.js
 var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 //#endregion
-//#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.1_5c5cec99992ade60b7d45a9d0ac17da3/node_modules/vitest/dist/chunks/tinyrainbow.Ht9iggcq.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.2_@opentelemetry+api@1.9.1_@types+node@26.6.3_happy-dom@20.14.5_jsdom@30.1.1_5bd35cff0016eb681427af506a019366/node_modules/vitest/dist/chunks/tinyrainbow.Ht9iggcq.js
 var b$1 = {
 	reset: [0, 0],
 	bold: [
@@ -58,16 +58,16 @@ var b$1 = {
 	bgCyanBright: [106, 49],
 	bgWhiteBright: [107, 49]
 };
-function i$1(e) {
+function i(e) {
 	return String(e);
 }
-i$1.open = "";
-i$1.close = "";
+i.open = "";
+i.close = "";
 function B() {
 	let e = typeof process != "undefined" ? process : void 0, r = (e == null ? void 0 : e.env) || {}, a = r.FORCE_TTY !== "false", l = (e == null ? void 0 : e.argv) || [];
 	return !("NO_COLOR" in r || l.includes("--no-color")) && ("FORCE_COLOR" in r || l.includes("--color") || (e == null ? void 0 : e.platform) === "win32" || a && r.TERM !== "dumb" || "CI" in r) || typeof window != "undefined" && !!window.chrome;
 }
-function C({ force: e } = {}) {
+function C$1({ force: e } = {}) {
 	let r = e || B(), a = (t, o, u, n) => {
 		let g = "", s = 0;
 		do
@@ -83,13 +83,13 @@ function C({ force: e } = {}) {
 	}, c = { isColorSupported: r }, f = (t) => `\x1B[${t}m`;
 	for (let t in b$1) {
 		let o = b$1[t];
-		c[t] = r ? l(f(o[0]), f(o[1]), o[2]) : i$1;
+		c[t] = r ? l(f(o[0]), f(o[1]), o[2]) : i;
 	}
 	return c;
 }
-var y$1 = C();
+var y$1 = C$1();
 //#endregion
-//#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.1_5c5cec99992ade60b7d45a9d0ac17da3/node_modules/vitest/dist/chunks/index.M2dsQ_UQ.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.2_@opentelemetry+api@1.9.1_@types+node@26.6.3_happy-dom@20.14.5_jsdom@30.1.1_5bd35cff0016eb681427af506a019366/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) {
@@ -988,7 +988,7 @@ const plugins = {
 	Error: ErrorPlugin
 };
 //#endregion
-//#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.1_5c5cec99992ade60b7d45a9d0ac17da3/node_modules/vitest/dist/chunks/display.pkpxlVcY.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.2_@opentelemetry+api@1.9.1_@types+node@26.6.3_happy-dom@20.14.5_jsdom@30.1.1_5bd35cff0016eb681427af506a019366/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,
@@ -1449,7 +1449,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.2_happy-dom@20.14.5_jsdom@30.1.1_5c5cec99992ade60b7d45a9d0ac17da3/node_modules/vitest/dist/chunks/source-map.BH0bbrs9.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.2_@opentelemetry+api@1.9.1_@types+node@26.6.3_happy-dom@20.14.5_jsdom@30.1.1_5bd35cff0016eb681427af506a019366/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;
@@ -2232,7 +2232,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.2_happy-dom@20.14.5_jsdom@30.1.1_5c5cec99992ade60b7d45a9d0ac17da3/node_modules/vitest/dist/task-utils.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.2_@opentelemetry+api@1.9.1_@types+node@26.6.3_happy-dom@20.14.5_jsdom@30.1.1_5bd35cff0016eb681427af506a019366/node_modules/vitest/dist/task-utils.js
 /* @__NO_SIDE_EFFECTS__ */
 function getNames(task) {
 	const names = [task.name];
@@ -2249,7 +2249,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.2_happy-dom@20.14.5_jsdom@30.1.1_5c5cec99992ade60b7d45a9d0ac17da3/node_modules/vitest/dist/chunks/run.C5UmxDPh.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.2_@opentelemetry+api@1.9.1_@types+node@26.6.3_happy-dom@20.14.5_jsdom@30.1.1_5bd35cff0016eb681427af506a019366/node_modules/vitest/dist/chunks/run.C5UmxDPh.js
 /**
 * Diff Match and Patch
 * Copyright 2018 The diff-match-patch Authors.
@@ -4900,7 +4900,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.2_happy-dom@20.14.5_jsdom@30.1.1_5c5cec99992ade60b7d45a9d0ac17da3/node_modules/vitest/dist/chunks/utils.DYj33du9.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.2_@opentelemetry+api@1.9.1_@types+node@26.6.3_happy-dom@20.14.5_jsdom@30.1.1_5bd35cff0016eb681427af506a019366/node_modules/vitest/dist/chunks/utils.DYj33du9.js
 const NAME_WORKER_STATE = "__vitest_worker__";
 function getWorkerState() {
 	const workerState = globalThis[NAME_WORKER_STATE];
@@ -4926,12 +4926,13 @@ function resetModules(modules, resetMocks = false) {
 	});
 }
 //#endregion
-//#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.1_5c5cec99992ade60b7d45a9d0ac17da3/node_modules/vitest/dist/chunks/spy.DQ0ZsPbi.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.2_@opentelemetry+api@1.9.1_@types+node@26.6.3_happy-dom@20.14.5_jsdom@30.1.1_5bd35cff0016eb681427af506a019366/node_modules/vitest/dist/chunks/spy.KLHgXex_.js
 function isMockFunction(fn) {
 	return typeof fn === "function" && "_isMockFunction" in fn && fn._isMockFunction === true;
 }
 const MOCK_RESTORE = /* @__PURE__ */ new Set();
 const DIRTY_MOCK_STATES = /* @__PURE__ */ new Set();
+const addDirtyMock = DIRTY_MOCK_STATES.add.bind(DIRTY_MOCK_STATES);
 const REGISTERED_MOCKS = /* @__PURE__ */ new Set();
 const MOCK_FINALIZER = new FinalizationRegistry((ref) => {
 	REGISTERED_MOCKS.delete(ref);
@@ -5164,8 +5165,8 @@ function createMock({ state, config, name: mockName, prototypeState, prototypeCo
 	const noopImplementation = function() {};
 	const prototypeMock = prototypeState && MOCKS_BY_STATE.get(prototypeState);
 	const namedObject = { [name]: (function(...args) {
-		DIRTY_MOCK_STATES.add(namedObject[name]);
-		if (prototypeMock) DIRTY_MOCK_STATES.add(prototypeMock);
+		addDirtyMock(namedObject[name]);
+		if (prototypeMock) addDirtyMock(prototypeMock);
 		registerCalls(args, state, prototypeState);
 		registerInvocationOrder(invocationCallCounter++, state, prototypeState);
 		const result = {
@@ -8322,7 +8323,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.2_happy-dom@20.14.5_jsdom@30.1.1_5c5cec99992ade60b7d45a9d0ac17da3/node_modules/vitest/dist/chunks/plugins.Cigb0uSy.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.2_@opentelemetry+api@1.9.1_@types+node@26.6.3_happy-dom@20.14.5_jsdom@30.1.1_5bd35cff0016eb681427af506a019366/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}`;
@@ -8355,7 +8356,7 @@ function getSerializers() {
 	return PLUGINS;
 }
 //#endregion
-//#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.1_5c5cec99992ade60b7d45a9d0ac17da3/node_modules/vitest/dist/chunks/offset.Dy-5Fdfn.js
+//#region ../../../node_modules/.pnpm/vitest@5.0.2_@opentelemetry+api@1.9.1_@types+node@26.6.3_happy-dom@20.14.5_jsdom@30.1.1_5bd35cff0016eb681427af506a019366/node_modules/vitest/dist/chunks/offset.Dy-5Fdfn.js
 const lineSplitRE = /\r?\n/;
 function positionToOffset(source, lineNumber, columnNumber) {
 	const lines = source.split(lineSplitRE);
@@ -8380,18 +8381,27 @@ function offsetToLineNumber(source, offset) {
 }
 Object.freeze(() => {});
 globalThis.Event;
-function r(e = globalThis) {
+(async () => {}).constructor;
+function m(e = globalThis) {
 	let t = "unknown", n = "unknown";
-	return e.Bun || e.process && e.process.versions?.bun ? (t = "bun", n = e.Bun.version || "unknown") : e.Deno ? (t = "deno", n = e.Deno.version?.deno ?? "unknown") : e.process && e.process.release?.name === "node" ? (t = "node", n = e.process.versions?.node ?? "unknown") : e.HermesInternal ? (t = "hermes", n = e.HermesInternal.getRuntimeProperties?.()["OSS Release Version"] ?? "unknown") : i(e) && e.navigator.userAgent === "Cloudflare-Workers" ? t = "workerd" : i(e) && e.navigator.userAgent.toLowerCase().startsWith("quickjs-ng") ? (t = "quickjs-ng", n = e.navigator.userAgent.split("/")[1] ?? "unknown") : typeof e.Netlify == "object" ? t = "netlify" : typeof e.EdgeRuntime == "string" ? t = "edge-light" : e.__lagon__ ? t = "lagon" : e.fastly ? t = "fastly" : e.$262 && e.lockdown && e.AsyncDisposableStack ? t = "moddable" : e.d8 ? (t = "v8", n = typeof e.version == "function" ? e.version() : "unknown") : e.inIon && e.performance && e.performance.mozMemory ? t = "spidermonkey" : typeof e.$ == "object" && e.$ !== null && "IsHTMLDDA" in e.$ ? t = "jsc" : e.window && e.navigator && (t = "browser"), {
+	if (e.Bun || e.process && e.process.versions?.bun) {
+		t = "bun";
+		let r = e.Bun?.version;
+		if (r) n = r;
+		else {
+			let t = e.process?.versions?.bun;
+			t && (n = t);
+		}
+	} else e.Deno ? (t = "deno", n = e.Deno.version?.deno ?? "unknown") : e.process && e.process.release?.name === "node" ? (t = "node", n = e.process.versions?.node ?? "unknown") : e.HermesInternal ? (t = "hermes", n = e.HermesInternal.getRuntimeProperties?.()["OSS Release Version"] ?? "unknown") : h(e) && e.navigator.userAgent === "Cloudflare-Workers" ? t = "workerd" : h(e) && e.navigator.userAgent.toLowerCase().startsWith("quickjs-ng") ? (t = "quickjs-ng", n = e.navigator.userAgent.split("/")[1] ?? "unknown") : typeof e.Netlify == "object" ? t = "netlify" : typeof e.EdgeRuntime == "string" ? t = "edge-light" : e.__lagon__ ? t = "lagon" : e.fastly ? t = "fastly" : e.$262 && e.lockdown && e.AsyncDisposableStack ? t = "moddable" : e.d8 ? (t = "v8", n = typeof e.version == "function" ? e.version() : "unknown") : e.inIon && e.performance && e.performance.mozMemory ? t = "spidermonkey" : typeof e.$ == "object" && e.$ !== null && "IsHTMLDDA" in e.$ ? t = "jsc" : e.window && e.navigator && (t = "browser");
+	return {
 		runtime: t,
 		version: n
 	};
 }
-function i(e = globalThis) {
+function h(e = globalThis) {
 	return typeof e.navigator == "object" && e.navigator !== null && typeof e.navigator.userAgent == "string";
 }
-const { runtime: a, version: o } = r();
-(async () => {}).constructor;
+const { runtime: g, version: _ } = m();
 globalThis.performance.now.bind(globalThis.performance);
 globalThis.process?.hrtime?.bigint.bind(globalThis.process?.hrtime);
 globalThis.Bun?.nanoseconds;
@@ -8687,7 +8697,7 @@ function memo(fn) {
 	};
 }
 async function saveInlineSnapshots(environment, snapshots) {
-	const MagicString = (await import("./dist-vIVO6bA-.mjs")).default;
+	const MagicString = (await import("./dist-DHer1cql.mjs")).default;
 	const files = new Set(snapshots.map((i) => i.file));
 	await Promise.all(Array.from(files).map(async (file) => {
 		const snaps = snapshots.filter((i) => i.file === file);
@@ -9586,8 +9596,9 @@ function asymmetricMatch(a, b, customTesters) {
 	const asymmetricA = isAsymmetric(a);
 	const asymmetricB = isAsymmetric(b);
 	if (asymmetricA && asymmetricB) return;
-	if (asymmetricA) return a.asymmetricMatch(b, customTesters);
-	if (asymmetricB) return b.asymmetricMatch(a, customTesters);
+	const testers = customTesters.filter((tester) => !isSubsetEqualityTester(tester));
+	if (asymmetricA) return a.asymmetricMatch(b, testers);
+	if (asymmetricB) return b.asymmetricMatch(a, testers);
 }
 function isError(value) {
 	if (typeof Error.isError === "function") return Error.isError(value);
@@ -9790,9 +9801,17 @@ function hasPropertyInObject(object, key) {
 function isObjectWithKeys(a) {
 	return isObject(a) && !isError(a) && !Array.isArray(a) && !(a instanceof Date) && !(a instanceof Set) && !(a instanceof Map);
 }
+const subsetEqualityTesters = /* @__PURE__ */ new WeakSet();
+function registerSubsetEqualityTester(tester) {
+	subsetEqualityTesters.add(tester);
+	return tester;
+}
+function isSubsetEqualityTester(tester) {
+	return tester === subsetEquality || subsetEqualityTesters.has(tester);
+}
 function subsetEquality(object, subset, customTesters = []) {
 	const filteredCustomTesters = customTesters.filter((t) => t !== subsetEquality);
-	const subsetEqualityWithContext = (seenReferences = /* @__PURE__ */ new WeakMap()) => (object, subset) => {
+	const subsetEqualityWithContext = (seenReferences = /* @__PURE__ */ new WeakMap()) => registerSubsetEqualityTester((object, subset) => {
 		if (!isObjectWithKeys(subset)) return;
 		return Object.keys(subset).every((key) => {
 			if (subset[key] != null && typeof subset[key] === "object") {
@@ -9803,7 +9822,7 @@ function subsetEquality(object, subset, customTesters = []) {
 			seenReferences.delete(subset[key]);
 			return result;
 		});
-	};
+	});
 	return subsetEqualityWithContext()(object, subset);
 }
 function typeEquality(a, b) {

package/dist/usage.d.mts

@@ -0,0 +1,2 @@
+import { B as UsageTokenTotals, F as UsageActivityTotals, G as addTotals, H as addActivityCount, I as UsageAggregate, J as registerSessionUsage, K as emptyTotals, L as UsageBucket, M as COUNTED_EVENT_TYPES, N as SESSION_USAGE_PATH, P as SessionUsageReport, R as UsageRangeKey, U as addActivityTotals, V as UsageTotals, W as addTokenTotals, Y as resolveUsageSince, q as localDayKey, z as UsageSessionRow } from "./log-CUjKQbOR.mjs";
+export { COUNTED_EVENT_TYPES, SESSION_USAGE_PATH, SessionUsageReport, UsageActivityTotals, UsageAggregate, UsageBucket, UsageRangeKey, UsageSessionRow, UsageTokenTotals, UsageTotals, addActivityCount, addActivityTotals, addTokenTotals, addTotals, emptyTotals, localDayKey, registerSessionUsage, resolveUsageSince };

package/dist/usage.mjs

@@ -0,0 +1,152 @@
+//#region src/usage.ts
+const SESSION_USAGE_PATH = "/api/session.usage";
+const ROLLING_DAYS = {
+	"7d": 7,
+	"30d": 30,
+	"90d": 90
+};
+function localDayStart(now) {
+	const start = new Date(now);
+	start.setHours(0, 0, 0, 0);
+	return start;
+}
+/**
+* 范围起点（含），不限时为 undefined。**所有起点都对齐到 host 本地时区的零点**——`day` / `week` 是
+* 今天 / 本周一的零点，`7d` / `30d` / `90d` 是「今天零点往前 N-1 天」（含今天共 N 个自然日）。
+* 对齐的意义：事件级表按毫秒过滤、会话汇总表按本地日过滤，两者因此严格等价。
+* @param range - 语义键。
+* @param now - 当前时刻。
+* @returns 起点毫秒时间戳，或 undefined。
+*/
+function resolveUsageSince(range, now) {
+	switch (range) {
+		case "all": return;
+		case "day": return localDayStart(now).getTime();
+		case "week": {
+			const start = localDayStart(now);
+			start.setDate(start.getDate() - (start.getDay() + 6) % 7);
+			return start.getTime();
+		}
+		default: {
+			const start = localDayStart(now);
+			start.setDate(start.getDate() - (ROLLING_DAYS[range] - 1));
+			return start.getTime();
+		}
+	}
+}
+function parseUsageRange(value) {
+	return value === "day" || value === "week" || value === "7d" || value === "30d" || value === "90d" ? value : "all";
+}
+/** 计入活动计数的事件类型（轮次 / 步骤 / 用户输入 / 工具调用）。 */
+const COUNTED_EVENT_TYPES = [
+	"turn/start",
+	"step/start",
+	"user/message",
+	"tool/call"
+];
+/** 按事件类型把计数累加到活动指标上（表里按类型存，读的时候折成四项）。 */
+function addActivityCount(target, type, count) {
+	switch (type) {
+		case "turn/start":
+			target.turns += count;
+			return target;
+		case "step/start":
+			target.steps += count;
+			return target;
+		case "user/message":
+			target.userInputs += count;
+			return target;
+		case "tool/call":
+			target.toolCalls += count;
+			return target;
+		default: return target;
+	}
+}
+/** 毫秒时间戳 → host 本地日（`YYYY-MM-DD`，与 SQL 的 localtime 口径一致）。 */
+function localDayKey(ms) {
+	const date = new Date(ms);
+	const pad = (value) => String(value).padStart(2, "0");
+	return `${String(date.getFullYear())}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;
+}
+function emptyTotals() {
+	return {
+		turns: 0,
+		steps: 0,
+		userInputs: 0,
+		toolCalls: 0,
+		inputTokens: 0,
+		outputTokens: 0,
+		cacheReadTokens: 0,
+		reasoningTokens: 0,
+		totalTokens: 0
+	};
+}
+function addTokenTotals(target, row) {
+	target.inputTokens += row.inputTokens;
+	target.outputTokens += row.outputTokens;
+	target.cacheReadTokens += row.cacheReadTokens;
+	target.reasoningTokens += row.reasoningTokens;
+	target.totalTokens += row.totalTokens;
+	return target;
+}
+function addActivityTotals(target, row) {
+	target.turns += row.turns;
+	target.steps += row.steps;
+	target.userInputs += row.userInputs;
+	target.toolCalls += row.toolCalls;
+	return target;
+}
+/** 把一行的整套指标累加进目标（后端合并「是否子代理」两组时用）。 */
+function addTotals(target, row) {
+	addActivityTotals(target, row);
+	addTokenTotals(target, row);
+	return target;
+}
+/**
+* 用量统计通道：一次请求回报总览（含 subagent 拆分）、按天 × 模型的桶与按会话的行。
+* 聚合只算被会话引用的事件行——fork 共享行因此只计一次，已删会话留下的孤儿行不计。
+*/
+function registerSessionUsage(ctx, persistence) {
+	ctx.inject(["webServer", "connection"], (webCtx) => {
+		const webServer = webCtx.webServer;
+		const connection = webCtx.get("connection");
+		return webCtx.effect(() => webServer.register({
+			kind: "exact",
+			path: SESSION_USAGE_PATH,
+			handler: async (req, res) => {
+				const rejection = connection.requestRejection(req);
+				if (rejection !== void 0) {
+					res.writeHead(rejection);
+					res.end(rejection === 401 ? "unauthorized" : "forbidden");
+					return;
+				}
+				if (req.method !== "POST") {
+					res.writeHead(405, { "content-type": "application/json" });
+					res.end(JSON.stringify({ error: "method not allowed" }));
+					return;
+				}
+				const chunks = [];
+				for await (const chunk of req) chunks.push(chunk);
+				const raw = Buffer.concat(chunks).toString("utf8");
+				let envelope = {};
+				if (raw !== "") try {
+					envelope = JSON.parse(raw);
+				} catch {
+					res.writeHead(400, { "content-type": "application/json" });
+					res.end(JSON.stringify({ error: "request body is not JSON" }));
+					return;
+				}
+				try {
+					const report = await persistence.usageReport(resolveUsageSince(parseUsageRange(envelope.range), Date.now()));
+					res.writeHead(200, { "content-type": "application/json" });
+					res.end(JSON.stringify(report));
+				} catch (error) {
+					res.writeHead(500, { "content-type": "application/json" });
+					res.end(JSON.stringify({ error: error instanceof Error ? error.message : "usage report failed" }));
+				}
+			}
+		}), `session-rdb: ${SESSION_USAGE_PATH} route`);
+	});
+}
+//#endregion
+export { COUNTED_EVENT_TYPES, SESSION_USAGE_PATH, addActivityCount, addActivityTotals, addTokenTotals, addTotals, emptyTotals, localDayKey, registerSessionUsage, resolveUsageSince };

package/drizzle/postgres/20260923120000_v3_usage_materialized/migration.sql

@@ -0,0 +1,48 @@
+-- 统计衍生表：纯派生数据（打开库时按事件表全量回填），迁移直接先删后建，
+-- 不做 ALTER / 数据搬迁。结构与取舍见 ADR-统计衍生表物化归属与汇总。
+DROP TABLE IF EXISTS "t_event_usage";--> statement-breakpoint
+DROP TABLE IF EXISTS "t_event_counts";--> statement-breakpoint
+DROP TABLE IF EXISTS "t_session_usage";--> statement-breakpoint
+DROP TABLE IF EXISTS "t_session_counts";--> statement-breakpoint
+CREATE TABLE "t_event_usage" (
+	"f_event_id" text PRIMARY KEY NOT NULL,
+	"f_created_at" bigint NOT NULL,
+	"f_day" text NOT NULL,
+	"f_provider" text,
+	"f_model" text,
+	"f_referenced" integer DEFAULT 0 NOT NULL,
+	"f_subagent" integer DEFAULT 0 NOT NULL,
+	"f_input_tokens" integer DEFAULT 0 NOT NULL,
+	"f_output_tokens" integer DEFAULT 0 NOT NULL,
+	"f_cache_read_tokens" integer DEFAULT 0 NOT NULL,
+	"f_reasoning_tokens" integer DEFAULT 0 NOT NULL,
+	"f_total_tokens" integer DEFAULT 0 NOT NULL,
+	CONSTRAINT "fk_t_event_usage_f_event_id_t_events_f_event_id_fk" FOREIGN KEY ("f_event_id") REFERENCES "t_events"("f_event_id") ON DELETE CASCADE
+);
+--> statement-breakpoint
+CREATE INDEX "idx_event_usage_created_at" ON "t_event_usage" USING btree ("f_created_at");--> statement-breakpoint
+CREATE TABLE "t_session_usage" (
+	"f_session_id" text NOT NULL,
+	"f_day" text NOT NULL,
+	"f_provider" text DEFAULT '' NOT NULL,
+	"f_model" text DEFAULT '' NOT NULL,
+	"f_input_tokens" integer DEFAULT 0 NOT NULL,
+	"f_output_tokens" integer DEFAULT 0 NOT NULL,
+	"f_cache_read_tokens" integer DEFAULT 0 NOT NULL,
+	"f_reasoning_tokens" integer DEFAULT 0 NOT NULL,
+	"f_total_tokens" integer DEFAULT 0 NOT NULL,
+	CONSTRAINT "fk_t_session_usage_f_session_id_t_sessions_f_session_id_fk" FOREIGN KEY ("f_session_id") REFERENCES "t_sessions"("f_session_id") ON DELETE CASCADE
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX "uq_session_usage_key" ON "t_session_usage" ("f_session_id","f_day","f_provider","f_model");--> statement-breakpoint
+CREATE TABLE "t_session_counts" (
+	"f_session_id" text NOT NULL,
+	"f_day" text NOT NULL,
+	"f_turns" integer DEFAULT 0 NOT NULL,
+	"f_steps" integer DEFAULT 0 NOT NULL,
+	"f_user_inputs" integer DEFAULT 0 NOT NULL,
+	"f_tool_calls" integer DEFAULT 0 NOT NULL,
+	CONSTRAINT "fk_t_session_counts_f_session_id_t_sessions_f_session_id_fk" FOREIGN KEY ("f_session_id") REFERENCES "t_sessions"("f_session_id") ON DELETE CASCADE
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX "uq_session_counts_key" ON "t_session_counts" ("f_session_id","f_day");

package/drizzle/sqlite/20260923120000_v3_usage_materialized/migration.sql

@@ -0,0 +1,48 @@
+-- 统计衍生表：纯派生数据（打开库时按事件表全量回填），迁移直接先删后建，
+-- 不做 ALTER / 数据搬迁。结构与取舍见 ADR-统计衍生表物化归属与汇总。
+DROP TABLE IF EXISTS `t_event_usage`;--> statement-breakpoint
+DROP TABLE IF EXISTS `t_event_counts`;--> statement-breakpoint
+DROP TABLE IF EXISTS `t_session_usage`;--> statement-breakpoint
+DROP TABLE IF EXISTS `t_session_counts`;--> statement-breakpoint
+CREATE TABLE `t_event_usage` (
+	`f_event_id` text PRIMARY KEY NOT NULL,
+	`f_created_at` bigint NOT NULL,
+	`f_day` text NOT NULL,
+	`f_provider` text,
+	`f_model` text,
+	`f_referenced` integer DEFAULT 0 NOT NULL,
+	`f_subagent` integer DEFAULT 0 NOT NULL,
+	`f_input_tokens` integer DEFAULT 0 NOT NULL,
+	`f_output_tokens` integer DEFAULT 0 NOT NULL,
+	`f_cache_read_tokens` integer DEFAULT 0 NOT NULL,
+	`f_reasoning_tokens` integer DEFAULT 0 NOT NULL,
+	`f_total_tokens` integer DEFAULT 0 NOT NULL,
+	CONSTRAINT `fk_t_event_usage_f_event_id_t_events_f_event_id_fk` FOREIGN KEY (`f_event_id`) REFERENCES `t_events`(`f_event_id`) ON DELETE CASCADE
+);
+--> statement-breakpoint
+CREATE INDEX `idx_event_usage_created_at` ON `t_event_usage` (`f_created_at`);--> statement-breakpoint
+CREATE TABLE `t_session_usage` (
+	`f_session_id` text NOT NULL,
+	`f_day` text NOT NULL,
+	`f_provider` text DEFAULT '' NOT NULL,
+	`f_model` text DEFAULT '' NOT NULL,
+	`f_input_tokens` integer DEFAULT 0 NOT NULL,
+	`f_output_tokens` integer DEFAULT 0 NOT NULL,
+	`f_cache_read_tokens` integer DEFAULT 0 NOT NULL,
+	`f_reasoning_tokens` integer DEFAULT 0 NOT NULL,
+	`f_total_tokens` integer DEFAULT 0 NOT NULL,
+	CONSTRAINT `fk_t_session_usage_f_session_id_t_sessions_f_session_id_fk` FOREIGN KEY (`f_session_id`) REFERENCES `t_sessions`(`f_session_id`) ON DELETE CASCADE
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `uq_session_usage_key` ON `t_session_usage` (`f_session_id`,`f_day`,`f_provider`,`f_model`);--> statement-breakpoint
+CREATE TABLE `t_session_counts` (
+	`f_session_id` text NOT NULL,
+	`f_day` text NOT NULL,
+	`f_turns` integer DEFAULT 0 NOT NULL,
+	`f_steps` integer DEFAULT 0 NOT NULL,
+	`f_user_inputs` integer DEFAULT 0 NOT NULL,
+	`f_tool_calls` integer DEFAULT 0 NOT NULL,
+	CONSTRAINT `fk_t_session_counts_f_session_id_t_sessions_f_session_id_fk` FOREIGN KEY (`f_session_id`) REFERENCES `t_sessions`(`f_session_id`) ON DELETE CASCADE
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `uq_session_counts_key` ON `t_session_counts` (`f_session_id`,`f_day`);

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@morlay/session-rdb",
-  "version": "0.0.21-alpha.7",
+  "version": "0.0.21-alpha.9",
   "description": "RDB durable session backend for DeepSeek Harness: implements both session-persistence and session-branch (rewind / retry / fork) providers.",
   "keywords": [
     "branch",
     "dsh",
     "dsh-plugin",
-    "dsh-session-rdb",
     "rdb",
     "rewind",
+    "session-persistence",
     "session-rdb"
   ],
   "license": "MIT",
@@ -21,7 +21,6 @@
     "dist",
     "src",
     "drizzle",
-    "cordis.patch.yml",
     "!**/__tests__"
   ],
   "type": "module",
@@ -32,49 +31,45 @@
     "./export": "./dist/export.mjs",
     "./gc": "./dist/gc.mjs",
     "./import": "./dist/import.mjs",
-    "./invariant": "./dist/invariant.mjs",
     "./storage": "./dist/storage.mjs",
     "./testing": "./dist/testing.mjs",
     "./usage": "./dist/usage.mjs",
+    "./invariant": "./dist/invariant.mjs",
     "./package.json": "./package.json",
-    "./cordis.patch.yml": "./cordis.patch.yml",
     "./locale/*.json": "./locale/*.json"
   },
   "dependencies": {
-    "@morlay/session-branch": "0.0.10-alpha.7",
+    "@morlay/session-branch": "0.0.10-alpha.9",
     "drizzle-orm": "^1.0.0-rc.5-ab785fc",
     "fflate": "^0.8.2",
     "pg": "^8.23.0"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-compaction": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session-projection": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session-projection-cache": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session-turn-outline": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-storage": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-storage-domain": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-token-meter": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-workspace": "0.1.7-alpha.2",
+    "@deepseek-ai/cosmokit": "1.8.5",
+    "@deepseek-ai/dsh-compaction": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-projection": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-projection-cache": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-turn-outline": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-storage": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-storage-domain": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-token-meter": "0.1.7-rc.2",
+    "@deepseek-ai/dsh-workspace": "0.1.7-rc.2",
     "@types/pg": "^8.23.1",
     "drizzle-kit": "1.0.0-rc.5-ab785fc"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": "4.0.4",
-    "@deepseek-ai/dsh-invariants": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-llm": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-scope": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session-format": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session-format-catalog": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session-persistence": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-session-query": "0.1.7-alpha.2",
-    "@deepseek-ai/dsh-storage": "0.1.7-alpha.2",
-    "@deepseek-ai/schemastery": "3.18.4"
-  },
-  "dsh": {
-    "bundle": {
-      "patch": "./cordis.patch.yml"
-    }
+    "@deepseek-ai/cordis": "^4.0.4",
+    "@deepseek-ai/cosmokit": "^1.8.5",
+    "@deepseek-ai/dsh-invariants": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-llm": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-scope": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-session": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-format": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-format-catalog": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-persistence": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-session-query": "^0.1.7-rc.2",
+    "@deepseek-ai/dsh-storage": "^0.1.7-rc.2",
+    "@deepseek-ai/schemastery": "^3.18.4"
   },
   "inlinedDependencies": {
     "@jridgewell/sourcemap-codec": "1.6.0",