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

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/session-rdb",
-  "version": "0.0.21-alpha.8",
+  "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",
@@ -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.8",
+    "@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-rc.1",
-    "@deepseek-ai/dsh-session-projection": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-session-projection-cache": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-session-turn-outline": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-storage": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-storage-domain": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-token-meter": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-workspace": "0.1.7-rc.1",
+    "@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-rc.1",
-    "@deepseek-ai/dsh-llm": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-scope": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-session": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-session-format": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-session-format-catalog": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-session-persistence": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-session-query": "0.1.7-rc.1",
-    "@deepseek-ai/dsh-storage": "0.1.7-rc.1",
-    "@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",

package/src/index.ts

@@ -1,4 +1,5 @@
 import { Context } from "@deepseek-ai/cordis";
+import type { Volatile } from "@deepseek-ai/cosmokit";
 import z from "@deepseek-ai/schemastery";
 import { randomUUID } from "node:crypto";
 import { Pool } from "pg";
@@ -129,25 +130,21 @@ export interface ProjectionCacheOptions {
 export type Config =
   | {
       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()`。 */
+export type ResolvedConfig = Volatile<Config>;
+
 export type SessionDeletionErrorCode =
   | "SESSION_NOT_FOUND"
   | "SESSION_NOT_ARCHIVED"
@@ -491,40 +488,111 @@ class RdbSessionHandle implements SessionHandle {
   static readonly LIVE_WRITE_BATCH_MAX_DELAY_MS = 200;
 }
 
+/**
+ * 本地化说明：`description()` 的类型签名只声明 `string`，而 meta 本身接受 `Dict<string>`
+ * （`vendor/schemastery/src/index.ts` 的 `mergeDesc` 就是按字典合并的），所以这里只做一次类型放行。
+ */
+const localized = (text: { zh: string; en: string }): string => text as unknown as string;
+
+/** 投影 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,
+  });
+
 export class SessionPersistenceRdb extends SessionPersistence {
   static inject = ["sessions"];
 
-  static Config: z<Config> = z.union([
-    z.object({
-      type: z.const("sqlite"),
-      path: z.string().required(),
-      journalMode: z.union(["wal", "delete", "truncate", "persist"] as const).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,
-        }),
-    }),
-    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,
-        }),
-    }),
-  ]);
+  // 显式声明「输入 → 解析后」的形状：整段是 volatile，读它要过 `.get()`。union + volatile 的推断形状与手写类型
+  // 在可选性 / 索引签名上不完全对齐，所以这里断言一次，类型面由此固定。
+  static Config = z
+    .union([
+      z.object({
+        type: z.const("sqlite"),
+        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"] as const)
+          .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()
+          .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() as unknown as z<Config, ResolvedConfig>;
 
   override readonly name = "session-rdb";
 
@@ -541,9 +609,12 @@ export class SessionPersistenceRdb extends SessionPersistence {
   private readonly liveBuffers = new Map<SessionId, SessionEvent[]>();
   private readonly liveReady = new Map<SessionId, Promise<void>>();
 
+  /** 本次装配用的配置快照（整段 Config 是 volatile，重挂会给新的）。 */
+  readonly config: Config;
+
   constructor(
     ctx: Context,
-    public config: Config,
+    config: ResolvedConfig,
 
     injectedBackend?: Backend,
   ) {
@@ -551,7 +622,12 @@ export class SessionPersistenceRdb extends SessionPersistence {
 
     // 配置就是这一行的 config（cordis.patch.yml / profile patch，或设置页改它）；上游 0.1.7 的 settings
     // 不再提供 namespace section 覆盖，旧 `settings.yaml` 的 `session-rdb` 段由上游一次性导进同 id 的行。
-    this.backend = injectedBackend ?? createBackend(config);
+    //
+    // 整段 Config 标了 volatile（页面可编辑），而生效靠 **Loader 重挂这一行**（settings 写完经
+    // `reconcileProfilePatches` 让 Loader 重装受影响的 entry）：重挂会构造新实例、拿到新快照，所以这里取一次
+    // 就够，运行期不必反复读引用。
+    this.config = config.get();
+    this.backend = injectedBackend ?? createBackend(this.config);
     this.ready = this.init();
     this.installLiveRouting(ctx);
 

package/cordis.patch.yml

@@ -1,13 +0,0 @@
-# @morlay/session-rdb bundle patch.
-#
-# 在 profile 的 dsh.profile.bundles 中列出本包后，本 patch 在 base 层之后
-# 生效，插入 RDB 持久化后端插件行（默认 SQLite，库文件放
-# $DSH_HOME/sessions/sessions.sqlite）。用户可在 profile 的 cordis.patch.yml 中
-# 按 id 覆盖 config（例如切到 PostgreSQL）。
-
-- insert:
-    - id: session-rdb
-      name: "@morlay/session-rdb"
-      config:
-        type: sqlite
-        path: !!js dshHomePath('sessions', 'sessions.sqlite')