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

package/README.md

@@ -7,8 +7,8 @@ SQLite 或 PostgreSQL 后端。表结构、原样存储与各条流程的设计
 
 ## 配置
 
-配置**就是这一行的 config**（`cordis.patch.yml` 的 `session-rdb` 行，或 profile patch /
-设置页改的那份 entry config）：
+配置**就是这一行的 config**（聚合层 `@morlay/better-session` 的 `session-rdb` 行、profile patch，
+或设置页改的那份 entry config）：
 
 ```yaml
 - id: session-rdb
@@ -54,6 +54,18 @@ type Config =
     };
 ```
 
+### 设置页上的这一行
+
+`Config` **整段标了 `.volatile()`**（判别式 union 只能整段标：schemastery 不许在 union 分支内部标 volatile），
+所以 host 会描述这一行，插件管理页里按 `type` 展开当前后端的字段——与上面 YAML 里的字段一一对应。
+
+- **切后端**：`type` 是各分支的判别标签，页面上那一行给的是一个**切换控件**（`"sqlite"` ↔ `"postgres"`）；选另一支
+  就换成那一套字段（`path` ↔ `connectionString` / `schema`），页面结构与 host 侧校验的选支依据同一份。
+- **生效方式**：settings 写完 → Loader 重装这一行（`reconcileProfilePatches`）→ 用新 config 重新建连接。所以这里
+  装配时取一次快照（`this.config = config.get()`），没有运行期重连逻辑；换后端 = 换库，旧数据留在旧后端。
+- 默认值都在 schema 上（`journalMode: wal`、`busyTimeout`、`schema: public`、`projectionCache` 的节流），页面上
+  清空即回到这些默认。
+
 ## 分支能力（session-branch 闭环）
 
 除 `ctx.sessionPersistence` 外，本包还实现 `@morlay/session-branch` 的 provider

package/dist/artifact.d.mts

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

package/dist/artifact.mjs

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

package/dist/{branch-7eOh_tbO.mjs → branch-D4nVzQQM.mjs}

@@ -1,4 +1,4 @@
-import { d as repairRequestHeaders, h as scanRows, i as normalizeToCurrentShape, m as rowToMeta } from "./log-DTcvsMz7.mjs";
+import { d as repairRequestHeaders, h as scanRows, i as normalizeToCurrentShape, m as rowToMeta } from "./log-BWVFYAh5.mjs";
 import { randomUUID } from "node:crypto";
 import { SESSION_FORMAT_VERSION, SessionLogOffset } from "@deepseek-ai/dsh-session";
 import { createSessionFormatCatalogWithChildren } from "@deepseek-ai/dsh-session-format-catalog";

package/dist/deletion.d.mts

@@ -1,4 +1,4 @@
-import { L as SessionPersistenceRdb } from "./log-BbleqD1M.mjs";
+import { tt as SessionPersistenceRdb } from "./log-CUjKQbOR.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 { a as registerSessionDeletion, i as SESSION_DELETE_PATH } from "./src-BWqePRA7.mjs";
+import { a as registerSessionDeletion, i as SESSION_DELETE_PATH } from "./src-BZ1tffd5.mjs";
 export { SESSION_DELETE_PATH, registerSessionDeletion };

package/dist/{dist-vIVO6bA-.mjs → dist-DHer1cql.mjs}

@@ -93,7 +93,7 @@ function encode(decoded) {
 	return writer.flush();
 }
 //#endregion
-//#region ../../../node_modules/.pnpm/magic-string@1.4.1/node_modules/magic-string/dist/index.mjs
+//#region ../../../node_modules/.pnpm/magic-string@1.4.2/node_modules/magic-string/dist/index.mjs
 var BitSet = class BitSet {
 	constructor(arg) {
 		this.bits = arg instanceof BitSet ? arg.bits.slice() : [];
@@ -187,7 +187,7 @@ var Chunk = class Chunk {
 		this.outro = "";
 		this.end = index;
 		if (this.edited) {
-			newChunk.edit("", false);
+			newChunk.edit("", false, true);
 			this.content = "";
 		} else this.content = originalBefore;
 		newChunk.next = this.next;
@@ -1149,7 +1149,7 @@ var MagicString = class MagicString {
 	* Content appended or prepended at positions strictly inside the range is removed with it, while
 	* content attached at `start` or `end` is preserved — use `s.overwrite(start, end, '')` to remove
 	* the range including its edge inserts.
-	* Removing the same content twice, or making removals that partially overlap, will cause an error.
+	* Repeated removals and removals with partially overlapping ranges are allowed.
 	*/
 	remove(start, end) {
 		start = start + this.offset;
@@ -1431,10 +1431,16 @@ var MagicString = class MagicString {
 	* @internal
 	*/
 	_hasRemovedContent(start, end) {
-		let chunk = this.firstChunk;
-		while (chunk) {
-			if (chunk.content === "" && chunk.start < end && chunk.end > start) return true;
-			chunk = chunk.next;
+		let chunk = this.byStart.get(start);
+		if (!chunk) {
+			chunk = this.lastSearchedChunk;
+			const searchForward = start >= chunk.end;
+			while (chunk && !chunk.contains(start)) chunk = searchForward ? this.byStart.get(chunk.end) : this.byEnd.get(chunk.start);
+			if (chunk) this.lastSearchedChunk = chunk;
+		}
+		while (chunk && chunk.start < end) {
+			if (chunk.content === "") return true;
+			chunk = this.byStart.get(chunk.end);
 		}
 		return false;
 	}
@@ -1498,6 +1504,7 @@ var MagicString = class MagicString {
 		const stringLength = string.length;
 		if (stringLength === 0) {
 			for (let index = 0; index <= original.length; index += 1) {
+				if (this._hasRemovedContent(index, index)) continue;
 				const _replacement = typeof replacement === "function" ? replacement("", index, original) : expandReplacement(replacement, "", index, original, [], void 0);
 				if (_replacement !== "") this.appendRight(index, _replacement);
 			}

package/dist/export.d.mts

@@ -0,0 +1,8 @@
+import { tt as SessionPersistenceRdb } from "./log-CUjKQbOR.mjs";
+import { Context } from "@deepseek-ai/cordis";
+//#region src/export.d.ts
+declare const SESSION_EXPORT_PATH = "/api/session.export";
+/** 导出通道：直接把会话日志打成 zip 响应体，与导入通道读同一份 artifact。 */
+declare function registerSessionExport(ctx: Context, persistence: SessionPersistenceRdb): void;
+//#endregion
+export { SESSION_EXPORT_PATH, registerSessionExport };

package/dist/export.mjs

@@ -0,0 +1,76 @@
+import { strToU8, zip } from "fflate";
+//#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
+export { SESSION_EXPORT_PATH, registerSessionExport };

package/dist/gc.d.mts

@@ -0,0 +1,8 @@
+import { tt as SessionPersistenceRdb } from "./log-CUjKQbOR.mjs";
+import { Context } from "@deepseek-ai/cordis";
+//#region src/gc.d.ts
+declare const SESSION_GC_PATH = "/api/session.gc";
+/** GC 通道：停 agent → 回收孤儿事件行 → VACUUM，一次请求完成。 */
+declare function registerSessionGc(ctx: Context, persistence: SessionPersistenceRdb): void;
+//#endregion
+export { SESSION_GC_PATH, registerSessionGc };

package/dist/gc.mjs

@@ -0,0 +1,51 @@
+//#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
+export { SESSION_GC_PATH, registerSessionGc };

package/dist/import.d.mts

@@ -1,4 +1,4 @@
-import { L as SessionPersistenceRdb } from "./log-BbleqD1M.mjs";
+import { tt as SessionPersistenceRdb } from "./log-CUjKQbOR.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, l as restoreCatalog } from "./branch-7eOh_tbO.mjs";
+import { i as replaceLiveSessionLog, l as restoreCatalog } from "./branch-D4nVzQQM.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 { B as SessionBranchRdbProvider, F as SessionDeletionError, G as SessionRowsValue, I as SessionDeletionErrorCode, L as SessionPersistenceRdb, N as Config, P as ProjectionCacheOptions, R as SessionPersistenceRdbInternals, U as SESSION_ROWS_PATH, V as locateTurnEnd, W as SessionRowsItem, Z as SCHEMA_VERSION, z as SessionBranchRdb } from "./log-BbleqD1M.mjs";
-export { Config, ProjectionCacheOptions, SCHEMA_VERSION, SESSION_ROWS_PATH, SessionBranchRdb, SessionBranchRdbProvider, SessionDeletionError, SessionDeletionErrorCode, SessionPersistenceRdb, SessionPersistenceRdb as default, SessionPersistenceRdbInternals, type SessionRowsItem, type SessionRowsValue, locateTurnEnd };
+import { $ as SessionDeletionError, Q as ResolvedConfig, X as Config, Z as ProjectionCacheOptions, at as locateTurnEnd, ct as SessionRowsItem, et as SessionDeletionErrorCode, ht as SCHEMA_VERSION, it as SessionBranchRdbProvider, lt as SessionRowsValue, nt as SessionPersistenceRdbInternals, rt as SessionBranchRdb, st as SESSION_ROWS_PATH, tt as SessionPersistenceRdb } from "./log-CUjKQbOR.mjs";
+export { Config, ProjectionCacheOptions, ResolvedConfig, SCHEMA_VERSION, SESSION_ROWS_PATH, SessionBranchRdb, SessionBranchRdbProvider, SessionDeletionError, SessionDeletionErrorCode, SessionPersistenceRdb, SessionPersistenceRdb as default, SessionPersistenceRdbInternals, type SessionRowsItem, type SessionRowsValue, locateTurnEnd };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { o as SCHEMA_VERSION } from "./sqlite-ChM_sHAG.mjs";
-import { n as SessionPersistenceRdb, r as SESSION_ROWS_PATH, t as SessionDeletionError } from "./src-BWqePRA7.mjs";
-import { n as SessionBranchRdbProvider, r as locateTurnEnd, t as SessionBranchRdb } from "./branch-7eOh_tbO.mjs";
+import { o as SCHEMA_VERSION } from "./sqlite-SCiSnwaz.mjs";
+import { n as SessionPersistenceRdb, r as SESSION_ROWS_PATH, t as SessionDeletionError } from "./src-BZ1tffd5.mjs";
+import { n as SessionBranchRdbProvider, r as locateTurnEnd, t as SessionBranchRdb } from "./branch-D4nVzQQM.mjs";
 export { SCHEMA_VERSION, SESSION_ROWS_PATH, SessionBranchRdb, SessionBranchRdbProvider, SessionDeletionError, SessionPersistenceRdb, SessionPersistenceRdb as default, locateTurnEnd };

package/dist/{log-DTcvsMz7.mjs → log-BWVFYAh5.mjs}

@@ -1,156 +1,6 @@
+import { localDayKey } from "./usage.mjs";
 import { SessionSeq } from "@deepseek-ai/dsh-session";
 import { sessionFormatCatalog } from "@deepseek-ai/dsh-session-format-catalog";
-//#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
 //#region src/log.ts
 function normalizeSurfaceOp(value) {
 	if (typeof value !== "object" || value === null || Array.isArray(value)) return value;
@@ -760,4 +610,4 @@ function usageRowOf(event, subagent) {
 	};
 }
 //#endregion
-export { registerSessionUsage as A, COUNTED_EVENT_TYPES as C, addTotals as D, addTokenTotals as E, emptyTotals as O, usageRowOf as S, addActivityTotals as T, sessionConflictRow as _, orphanInboxSpliceSeqs as a, titleOfEventData as b, repairAssistantSettlement as c, repairRequestHeaders as d, repairSurfaceOps as f, sealOwnEvents as g, scanRows as h, normalizeToCurrentShape as i, localDayKey as k, repairOrphanInboxSplices as l, rowToMeta as m, findSurfaceRepairs as n, recomputeReplaceProvenance as o, rowToEvent as p, needsShapeAdoption as r, renameLegacyPtcEvents as s, OWN_EVENT_TYPES as t, repairReadView as u, sessionInsertRow as v, addActivityCount as w, toJsonlArtifact as x, syncMeteringRanges as y };
+export { usageRowOf as S, sessionConflictRow as _, orphanInboxSpliceSeqs as a, titleOfEventData as b, repairAssistantSettlement as c, repairRequestHeaders as d, repairSurfaceOps as f, sealOwnEvents as g, scanRows as h, normalizeToCurrentShape as i, repairOrphanInboxSplices as l, rowToMeta as m, findSurfaceRepairs as n, recomputeReplaceProvenance as o, rowToEvent as p, needsShapeAdoption as r, renameLegacyPtcEvents as s, OWN_EVENT_TYPES as t, repairReadView as u, sessionInsertRow as v, toJsonlArtifact as x, syncMeteringRanges as y };

package/dist/{log-BbleqD1M.d.mts → log-CUjKQbOR.d.mts}

@@ -5,6 +5,7 @@ import { BranchAnchorMode, BranchBoundary, ForkFromOptions, SessionBranch, Sessi
 import { KvUnit } from "@deepseek-ai/dsh-storage";
 import { Context, Service } from "@deepseek-ai/cordis";
 import { SessionId as SessionId$1 } from "@deepseek-ai/dsh-session/types";
+import { Volatile } from "@deepseek-ai/cosmokit";
 //#region ../../../node_modules/.pnpm/zod@4.6.5/node_modules/zod/v4/core/json-schema.d.cts
 type _JSONSchema = boolean | JSONSchema;
 type SchemaType = "object" | "array" | "string" | "number" | "boolean" | "null" | "integer";
@@ -3285,16 +3286,15 @@ declare class WorkspaceRegistry extends Service {
    * Initialize the default Workspace only while both the registry and Session
    * history are empty. Repeated requests reuse its durable identity; deleting
    * that registration permanently disables automatic creation.
-   * @param resolveDirectory - resolve the absolute directory and initial title;
-   * called only for eligible creation, inside the registry mutation queue.
-   * Missing directories are created recursively before registration.
+   * @param resolveDirectory - resolve the absolute directory; called only for
+   * eligible creation, inside the registry mutation queue. Missing directories
+   * are created recursively before registration, and the initial title is the
+   * requested directory's own final segment — not the canonical one, so a
+   * symlink at that path does not retitle the Workspace after its target.
    * After resolution, caller cancellation does not roll back creation or registration.
    * @returns the initialized Workspace, or undefined when automatic creation is ineligible.
    */
-  initializeDefault(resolveDirectory: () => Promise<{
-    path: string;
-    title: string;
-  }>): Promise<Workspace | undefined>;
+  initializeDefault(resolveDirectory: () => Promise<string>): Promise<Workspace | undefined>;
   /**
    * Look up a workspace by id.
    * @param id - Workspace id.
@@ -3610,15 +3610,17 @@ interface ProjectionCacheOptions {
 type Config$1 = {
   type: "sqlite";
   path: string;
-  journalMode?: JournalMode;
-  busyTimeout?: number;
-  projectionCache?: ProjectionCacheOptions;
+  journalMode?: JournalMode | undefined;
+  busyTimeout?: number | undefined;
+  projectionCache?: ProjectionCacheOptions | undefined;
 } | {
   type: "postgres";
   connectionString: string;
-  schema?: string;
-  projectionCache?: ProjectionCacheOptions;
+  schema?: string | undefined;
+  projectionCache?: ProjectionCacheOptions | undefined;
 };
+/** schema 解析之后的形状：整段 Config 是 **volatile 稳定引用**（页面可编辑），读它要过 `.get()`。 */
+type ResolvedConfig = Volatile<Config$1>;
 type SessionDeletionErrorCode = "SESSION_NOT_FOUND" | "SESSION_NOT_ARCHIVED" | "SESSION_LIVE";
 declare class SessionDeletionError extends Error {
   readonly code: SessionDeletionErrorCode;
@@ -3692,9 +3694,8 @@ declare class RdbSessionHandle implements SessionHandle {
   static readonly LIVE_WRITE_BATCH_MAX_DELAY_MS = 200;
 }
 declare class SessionPersistenceRdb extends SessionPersistence {
-  config: Config$1;
   static inject: string[];
-  static Config: z<Config$1>;
+  static Config: z<Config$1, ResolvedConfig>;
   readonly name = "session-rdb";
   readonly tracker: RdbBackendTracker;
   private readonly backend;
@@ -3704,7 +3705,9 @@ declare class SessionPersistenceRdb extends SessionPersistence {
   private readonly reuseEventIds;
   private readonly liveBuffers;
   private readonly liveReady;
-  constructor(ctx: Context, config: Config$1, injectedBackend?: Backend);
+  /** 本次装配用的配置快照（整段 Config 是 volatile，重挂会给新的）。 */
+  readonly config: Config$1;
+  constructor(ctx: Context, config: ResolvedConfig, injectedBackend?: Backend);
   private init;
   create(header: SessionHeader, options?: SessionPersistenceCreateOptions): Promise<SessionHandle>;
   open(id: SessionId, access: SessionAccess, options?: SessionPersistenceOpenOptions): Promise<SessionHandle>;
@@ -3781,6 +3784,21 @@ declare class SessionPersistenceRdb extends SessionPersistence {
 }
 //#endregion
 //#region src/usage.d.ts
+declare const SESSION_USAGE_PATH = "/api/session.usage";
+/**
+ * 时间范围的语义键：`all` 不限；`day` / `week` 是**本地自然日 / 自然周**（周一起算）；
+ * `7d` / `30d` / `90d` 是**最近 N 个自然日**（含今天）。
+ */
+type UsageRangeKey = "all" | "day" | "week" | "7d" | "30d" | "90d";
+/**
+ * 范围起点（含），不限时为 undefined。**所有起点都对齐到 host 本地时区的零点**——`day` / `week` 是
+ * 今天 / 本周一的零点，`7d` / `30d` / `90d` 是「今天零点往前 N-1 天」（含今天共 N 个自然日）。
+ * 对齐的意义：事件级表按毫秒过滤、会话汇总表按本地日过滤，两者因此严格等价。
+ * @param range - 语义键。
+ * @param now - 当前时刻。
+ * @returns 起点毫秒时间戳，或 undefined。
+ */
+declare function resolveUsageSince(range: UsageRangeKey, now: number): number | undefined;
 /** 一段 token 用量（字段直接取事件里模型报的 usage）。 */
 interface UsageTokenTotals {
   inputTokens: number;
@@ -3826,6 +3844,24 @@ interface UsageAggregate {
   buckets: UsageBucket[];
   sessions: UsageSessionRow[];
 }
+/** 一次统计请求的完整回报。 */
+type SessionUsageReport = UsageAggregate;
+/** 计入活动计数的事件类型（轮次 / 步骤 / 用户输入 / 工具调用）。 */
+declare const COUNTED_EVENT_TYPES: readonly ["turn/start", "step/start", "user/message", "tool/call"];
+/** 按事件类型把计数累加到活动指标上（表里按类型存，读的时候折成四项）。 */
+declare function addActivityCount(target: UsageActivityTotals, type: string, count: number): UsageActivityTotals;
+/** 毫秒时间戳 → host 本地日（`YYYY-MM-DD`，与 SQL 的 localtime 口径一致）。 */
+declare function localDayKey(ms: number): string;
+declare function emptyTotals(): UsageTotals;
+declare function addTokenTotals(target: UsageTokenTotals, row: UsageTokenTotals): UsageTokenTotals;
+declare function addActivityTotals(target: UsageActivityTotals, row: UsageActivityTotals): UsageActivityTotals;
+/** 把一行的整套指标累加进目标（后端合并「是否子代理」两组时用）。 */
+declare function addTotals(target: UsageTotals, row: UsageTotals): UsageTotals;
+/**
+ * 用量统计通道：一次请求回报总览（含 subagent 拆分）、按天 × 模型的桶与按会话的行。
+ * 聚合只算被会话引用的事件行——fork 共享行因此只计一次，已删会话留下的孤儿行不计。
+ */
+declare function registerSessionUsage(ctx: Context, persistence: SessionPersistenceRdb): void;
 //#endregion
 //#region src/backend.d.ts
 interface SessionRow {
@@ -4117,4 +4153,4 @@ declare function usageRowOf(event: {
   fData: string;
 }, subagent: boolean): EventUsageRow | undefined;
 //#endregion
-export { eventDimensions as $, SessionRow as A, SessionBranchRdbProvider as B, usageRowOf as C, SessionCountBucket as D, EventRow as E, SessionDeletionError as F, SessionRowsValue as G, truncateLiveSession as H, SessionDeletionErrorCode as I, EventKind as J, DEFAULT_BUSY_TIMEOUT_MS as K, SessionPersistenceRdb as L, UsageAggregate as M, Config$1 as N, SessionListRowsPage as O, ProjectionCacheOptions as P, SESSION_PERSISTENCE_SQLITE_APPLICATION_ID as Q, SessionPersistenceRdbInternals as R, toJsonlArtifact as S, BackendTx as T, SESSION_ROWS_PATH as U, locateTurnEnd as V, SessionRowsItem as W, JournalMode as X, EventRole as Y, SCHEMA_VERSION as Z, sealOwnEvents as _, normalizeToCurrentShape as a, tSessionCounts as at, syncMeteringRanges as b, renameLegacyPtcEvents as c, tSessionUsage as ct, repairReadView as d, tWorkspaceSessions as dt, eventKind as et, repairRequestHeaders as f, tWorkspaceState as ft, scanRows as g, rowToMeta as h, StorageRepository as ht, needsShapeAdoption as i, tSchemaMeta as it, SessionUsageBucket as j, SessionListRowsQuery as k, repairAssistantSettlement as l, tSessions as lt, rowToEvent as m, WriteGuard as mt, OWN_EVENT_TYPES as n, tEvents as nt, orphanInboxSpliceSeqs as o, tSessionEvents as ot, repairSurfaceOps as p, tWorkspaces as pt, EVENT_ENCODING as q, findSurfaceRepairs as r, tPersistenceState as rt, recomputeReplaceProvenance as s, tSessionProjcacheRows as st, EventUsageRow as t, tEventUsage as tt, repairOrphanInboxSplices as u, tStorageUnits as ut, sessionConflictRow as v, Backend as w, titleOfEventData as x, sessionInsertRow as y, SessionBranchRdb as z };
+export { SessionDeletionError as $, SessionRow as A, tWorkspaceState as At, UsageTokenTotals as B, usageRowOf as C, tSessionCounts as Ct, SessionCountBucket as D, tSessions as Dt, EventRow as E, tSessionUsage as Et, UsageActivityTotals as F, addTotals as G, addActivityCount as H, UsageAggregate as I, registerSessionUsage as J, emptyTotals as K, UsageBucket as L, COUNTED_EVENT_TYPES as M, WriteGuard as Mt, SESSION_USAGE_PATH as N, StorageRepository as Nt, SessionListRowsPage as O, tStorageUnits as Ot, SessionUsageReport as P, ResolvedConfig as Q, UsageRangeKey as R, toJsonlArtifact as S, tSchemaMeta as St, BackendTx as T, tSessionProjcacheRows as Tt, addActivityTotals as U, UsageTotals as V, addTokenTotals as W, Config$1 as X, resolveUsageSince as Y, ProjectionCacheOptions as Z, sealOwnEvents as _, eventDimensions as _t, normalizeToCurrentShape as a, locateTurnEnd as at, syncMeteringRanges as b, tEvents as bt, renameLegacyPtcEvents as c, SessionRowsItem as ct, repairReadView as d, EVENT_ENCODING as dt, SessionDeletionErrorCode as et, repairRequestHeaders as f, EventKind as ft, scanRows as g, SESSION_PERSISTENCE_SQLITE_APPLICATION_ID as gt, rowToMeta as h, SCHEMA_VERSION as ht, needsShapeAdoption as i, SessionBranchRdbProvider as it, SessionUsageBucket as j, tWorkspaces as jt, SessionListRowsQuery as k, tWorkspaceSessions as kt, repairAssistantSettlement as l, SessionRowsValue as lt, rowToEvent as m, JournalMode as mt, OWN_EVENT_TYPES as n, SessionPersistenceRdbInternals as nt, orphanInboxSpliceSeqs as o, truncateLiveSession as ot, repairSurfaceOps as p, EventRole as pt, localDayKey as q, findSurfaceRepairs as r, SessionBranchRdb as rt, recomputeReplaceProvenance as s, SESSION_ROWS_PATH as st, EventUsageRow as t, SessionPersistenceRdb as tt, repairOrphanInboxSplices as u, DEFAULT_BUSY_TIMEOUT_MS as ut, sessionConflictRow as v, eventKind as vt, Backend as w, tSessionEvents as wt, titleOfEventData as x, tPersistenceState as xt, sessionInsertRow as y, tEventUsage as yt, UsageSessionRow as z };

package/dist/{sqlite-ChM_sHAG.mjs → sqlite-SCiSnwaz.mjs}

@@ -1,4 +1,5 @@
-import { C as COUNTED_EVENT_TYPES, D as addTotals, E as addTokenTotals, O as emptyTotals, T as addActivityTotals, _ as sessionConflictRow, b as titleOfEventData, k as localDayKey, v as sessionInsertRow } from "./log-DTcvsMz7.mjs";
+import { COUNTED_EVENT_TYPES, addActivityTotals, addTokenTotals, addTotals, emptyTotals, localDayKey } from "./usage.mjs";
+import { _ as sessionConflictRow, b as titleOfEventData, v as sessionInsertRow } from "./log-BWVFYAh5.mjs";
 import { randomUUID } from "node:crypto";
 import { SESSION_FORMAT_VERSION, SessionId, SessionLogOffset, SessionSeq } from "@deepseek-ai/dsh-session";
 import { and, desc, eq, gte, inArray, isNotNull, lt, notInArray, sql } from "drizzle-orm";