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

package/dist/{src-BWqePRA7.mjs → src-BZ1tffd5.mjs}

@@ -1,7 +1,10 @@
-import { C as postgresTableDefs, T as WriteGuard, a as EVENT_ENCODING, c as eventDimensions, i as DEFAULT_BUSY_TIMEOUT_MS, r as createStorageRepository, t as SqliteBackend, w as toPostgresSchema } from "./sqlite-ChM_sHAG.mjs";
-import { A as registerSessionUsage, C as COUNTED_EVENT_TYPES, D as addTotals, E as addTokenTotals, O as emptyTotals, S as usageRowOf, T as addActivityTotals, _ as sessionConflictRow, b as titleOfEventData, g as sealOwnEvents, h as scanRows, k as localDayKey, m as rowToMeta, r as needsShapeAdoption, u as repairReadView, v as sessionInsertRow, w as addActivityCount, x as toJsonlArtifact } from "./log-DTcvsMz7.mjs";
-import { c as isLegacyVersion, o as adoptLegacyRows, s as convertLegacyRows, t as SessionBranchRdb } from "./branch-7eOh_tbO.mjs";
+import { C as postgresTableDefs, T as WriteGuard, a as EVENT_ENCODING, c as eventDimensions, i as DEFAULT_BUSY_TIMEOUT_MS, r as createStorageRepository, t as SqliteBackend, w as toPostgresSchema } from "./sqlite-SCiSnwaz.mjs";
+import { COUNTED_EVENT_TYPES, addActivityCount, addActivityTotals, addTokenTotals, addTotals, emptyTotals, localDayKey, registerSessionUsage } from "./usage.mjs";
+import { S as usageRowOf, _ as sessionConflictRow, b as titleOfEventData, g as sealOwnEvents, h as scanRows, m as rowToMeta, r as needsShapeAdoption, u as repairReadView, v as sessionInsertRow, x as toJsonlArtifact } from "./log-BWVFYAh5.mjs";
+import { c as isLegacyVersion, o as adoptLegacyRows, s as convertLegacyRows, t as SessionBranchRdb } from "./branch-D4nVzQQM.mjs";
 import { registerSessionImport } from "./import.mjs";
+import { registerSessionExport } from "./export.mjs";
+import { registerSessionGc } from "./gc.mjs";
 import z from "@deepseek-ai/schemastery";
 import { randomUUID } from "node:crypto";
 import { Pool } from "pg";
@@ -14,7 +17,6 @@ import { readdir } from "node:fs/promises";
 import { fileURLToPath } from "node:url";
 import { migrate } from "drizzle-orm/node-postgres/migrator";
 import { balanceRewindPrefix } from "@morlay/session-branch";
-import { strToU8, zip } from "fflate";
 import { SessionQueryEngine, SessionQueryError } from "@deepseek-ai/dsh-session-query";
 import { StorageError, storageBackendServiceKey } from "@deepseek-ai/dsh-storage";
 import { Service } from "@deepseek-ai/cordis";
@@ -703,130 +705,6 @@ function registerSessionDeletion(ctx, persistence) {
 	});
 }
 //#endregion
-//#region src/export.ts
-const SESSION_EXPORT_PATH = "/api/session.export";
-/** 文件名只保留安全字符：会话 id 来自请求体，会写进 Content-Disposition。 */
-function safeFilename(sessionId) {
-	return sessionId.replace(/[^A-Za-z0-9._-]/gu, "_");
-}
-/** fflate 只给回调式异步 API（同步变体被 node/no-sync 禁止）。 */
-function zipBytes(files) {
-	return new Promise((resolve, reject) => {
-		zip(files, (error, data) => {
-			if (error === null) resolve(data);
-			else reject(error);
-		});
-	});
-}
-/** 导出通道：直接把会话日志打成 zip 响应体，与导入通道读同一份 artifact。 */
-function registerSessionExport(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_EXPORT_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);
-				let envelope;
-				try {
-					envelope = JSON.parse(Buffer.concat(chunks).toString("utf8"));
-				} catch {
-					res.writeHead(400, { "content-type": "application/json" });
-					res.end(JSON.stringify({ error: "request body is not JSON" }));
-					return;
-				}
-				if (typeof envelope.sessionId !== "string" || envelope.sessionId === "") {
-					res.writeHead(400, { "content-type": "application/json" });
-					res.end(JSON.stringify({ error: "missing sessionId field" }));
-					return;
-				}
-				const sessionId = envelope.sessionId;
-				try {
-					const raw = await persistence.readRaw(sessionId);
-					if (raw === void 0) {
-						res.writeHead(404, { "content-type": "application/json" });
-						res.end(JSON.stringify({ error: `session "${sessionId}" not found` }));
-						return;
-					}
-					const zipFile = await zipBytes({ [raw.filename]: strToU8(raw.content) });
-					res.writeHead(200, {
-						"content-type": "application/zip",
-						"content-length": String(zipFile.byteLength),
-						"content-disposition": `attachment; filename="${safeFilename(sessionId)}.zip"`
-					});
-					res.end(Buffer.from(zipFile));
-				} catch (error) {
-					res.writeHead(500, { "content-type": "application/json" });
-					res.end(JSON.stringify({ error: error instanceof Error ? error.message : "session export failed" }));
-				}
-			}
-		}), `session-rdb: ${SESSION_EXPORT_PATH} route`);
-	});
-}
-//#endregion
-//#region src/gc.ts
-const SESSION_GC_PATH = "/api/session.gc";
-/** 让所有运行中的 agent 先退场：GC 要重写事件表，运行中的写路径必须停下来。 */
-async function stopRunningAgents(ctx) {
-	const running = ctx.get("agents")?.list() ?? [];
-	for (const agent of running) agent.cancel?.({ kind: "user" }, { keepInbox: true });
-	await Promise.all(running.map((agent) => agent.whenIdle()));
-	return running.length;
-}
-/** GC 通道：停 agent → 回收孤儿事件行 → VACUUM，一次请求完成。 */
-function registerSessionGc(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_GC_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;
-				}
-				try {
-					const stoppedAgents = await stopRunningAgents(webCtx);
-					const orphanSessions = await persistence.collectOrphanSessions();
-					const orphanEvents = await persistence.collectOrphans();
-					await persistence.vacuum();
-					res.writeHead(200, { "content-type": "application/json" });
-					res.end(JSON.stringify({
-						orphanSessions,
-						orphanEvents,
-						stoppedAgents,
-						vacuumed: true
-					}));
-				} catch (error) {
-					res.writeHead(500, { "content-type": "application/json" });
-					res.end(JSON.stringify({ error: error instanceof Error ? error.message : "gc failed" }));
-				}
-			}
-		}), `session-rdb: ${SESSION_GC_PATH} route`);
-	});
-}
-//#endregion
 //#region src/rows.ts
 /**
 * 管理面的会话列表：**我们自己的**一条路由（完整语料，含归档），与官方 `session/list` 分开。
@@ -1548,38 +1426,62 @@ var RdbSessionHandle = class RdbSessionHandle {
 	}
 	static LIVE_WRITE_BATCH_MAX_DELAY_MS = 200;
 };
+/**
+* 本地化说明：`description()` 的类型签名只声明 `string`，而 meta 本身接受 `Dict<string>`
+* （`vendor/schemastery/src/index.ts` 的 `mergeDesc` 就是按字典合并的），所以这里只做一次类型放行。
+*/
+const localized = (text) => text;
+/** 投影 checkpoint 的写回节流：两个分支共用。 */
+const projectionCacheSchema = z.object({
+	writeEveryEvents: z.natural().min(1).default(DEFAULT_PROJECTION_WRITE_EVERY_EVENTS).description(localized({
+		zh: "每累计这么多事件写回一次投影 checkpoint。",
+		en: "Write the projection checkpoint back after this many events."
+	})),
+	writeIntervalMs: z.natural().min(1).default(DEFAULT_PROJECTION_WRITE_INTERVAL_MS).description(localized({
+		zh: "距离上次写回超过这个间隔（毫秒）时也写一次。",
+		en: "Also write back when this many ms passed since the last one."
+	}))
+}).default({
+	writeEveryEvents: DEFAULT_PROJECTION_WRITE_EVERY_EVENTS,
+	writeIntervalMs: DEFAULT_PROJECTION_WRITE_INTERVAL_MS
+});
 var SessionPersistenceRdb = class extends SessionPersistence {
-	config;
 	static inject = ["sessions"];
 	static Config = z.union([z.object({
 		type: z.const("sqlite"),
-		path: z.string().required(),
+		path: z.string().required().description(localized({
+			zh: "SQLite 数据库文件路径；`:memory:` 是内存库（进程结束即丢）。",
+			en: "SQLite database file path; `:memory:` keeps it in memory and loses it with the process."
+		})),
 		journalMode: z.union([
 			"wal",
 			"delete",
 			"truncate",
 			"persist"
-		]).default("wal"),
-		busyTimeout: z.number().step(1).min(0).default(DEFAULT_BUSY_TIMEOUT_MS),
-		projectionCache: z.object({
-			writeEveryEvents: z.natural().min(1).default(DEFAULT_PROJECTION_WRITE_EVERY_EVENTS),
-			writeIntervalMs: z.natural().min(1).default(DEFAULT_PROJECTION_WRITE_INTERVAL_MS)
-		}).default({
-			writeEveryEvents: DEFAULT_PROJECTION_WRITE_EVERY_EVENTS,
-			writeIntervalMs: DEFAULT_PROJECTION_WRITE_INTERVAL_MS
-		})
+		]).default("wal").description(localized({
+			zh: "SQLite 日志模式；默认 wal（并发读最好）。",
+			en: "SQLite journal mode; `wal` by default (best concurrent reads)."
+		})),
+		busyTimeout: z.number().step(1).min(0).default(DEFAULT_BUSY_TIMEOUT_MS).description(localized({
+			zh: "写锁冲突时的忙等超时（毫秒）。",
+			en: "Busy timeout in ms while a write lock is contended."
+		})),
+		projectionCache: projectionCacheSchema
 	}), z.object({
 		type: z.const("postgres"),
-		connectionString: z.string().required(),
-		schema: z.string().default("public"),
-		projectionCache: z.object({
-			writeEveryEvents: z.natural().min(1).default(DEFAULT_PROJECTION_WRITE_EVERY_EVENTS),
-			writeIntervalMs: z.natural().min(1).default(DEFAULT_PROJECTION_WRITE_INTERVAL_MS)
-		}).default({
-			writeEveryEvents: DEFAULT_PROJECTION_WRITE_EVERY_EVENTS,
-			writeIntervalMs: DEFAULT_PROJECTION_WRITE_INTERVAL_MS
-		})
-	})]);
+		connectionString: z.string().required().description(localized({
+			zh: "PostgreSQL 连接串（含库名与凭证）。",
+			en: "PostgreSQL connection string (database and credentials)."
+		})),
+		schema: z.string().default("public").description(localized({
+			zh: "库内的 schema 名；默认 public。",
+			en: "Schema name inside the database; `public` by default."
+		})),
+		projectionCache: projectionCacheSchema
+	})]).description(localized({
+		zh: "会话持久化后端：改这里的连接参数会在这一行重挂时生效（Loader 会重装被改的行）。",
+		en: "Session persistence backend: edits apply when this row is remounted (the Loader re-installs changed rows)."
+	})).volatile();
 	name = "session-rdb";
 	tracker = new RdbBackendTracker(this.name);
 	backend;
@@ -1589,10 +1491,12 @@ var SessionPersistenceRdb = class extends SessionPersistence {
 	reuseEventIds = /* @__PURE__ */ new Map();
 	liveBuffers = /* @__PURE__ */ new Map();
 	liveReady = /* @__PURE__ */ new Map();
+	/** 本次装配用的配置快照（整段 Config 是 volatile，重挂会给新的）。 */
+	config;
 	constructor(ctx, config, injectedBackend) {
 		super(ctx);
-		this.config = config;
-		this.backend = injectedBackend ?? createBackend(config);
+		this.config = config.get();
+		this.backend = injectedBackend ?? createBackend(this.config);
 		this.ready = this.init();
 		this.installLiveRouting(ctx);
 		new SessionBranchRdb(this.ctx);

package/dist/storage.d.mts

@@ -1,4 +1,4 @@
-import { $ as eventDimensions, A as SessionRow, D as SessionCountBucket, E as EventRow, J as EventKind, K as DEFAULT_BUSY_TIMEOUT_MS, M as UsageAggregate, O as SessionListRowsPage, Q as SESSION_PERSISTENCE_SQLITE_APPLICATION_ID, T as BackendTx, X as JournalMode, Y as EventRole, Z as SCHEMA_VERSION, at as tSessionCounts, ct as tSessionUsage, dt as tWorkspaceSessions, et as eventKind, ft as tWorkspaceState, ht as StorageRepository, it as tSchemaMeta, j as SessionUsageBucket, k as SessionListRowsQuery, lt as tSessions, mt as WriteGuard, nt as tEvents, ot as tSessionEvents, pt as tWorkspaces, q as EVENT_ENCODING, rt as tPersistenceState, st as tSessionProjcacheRows, tt as tEventUsage, ut as tStorageUnits, w as Backend } from "./log-BbleqD1M.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

package/dist/storage.mjs

@@ -1,2 +1,2 @@
-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-ChM_sHAG.mjs";
+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 { H as truncateLiveSession } from "./log-BbleqD1M.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-7eOh_tbO.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 };