@morlay/session-rdb 0.0.20 → 0.0.21-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/session-rdb",
-  "version": "0.0.20",
+  "version": "0.0.21-alpha.0",
   "description": "RDB durable session backend for DeepSeek Harness: implements both session-persistence and session-branch (rewind / retry / fork) providers.",
   "keywords": [
     "branch",
@@ -14,7 +14,7 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/morlay/session-rdb.git"
+    "url": "https://github.com/morlay/dsh-plugin.git"
   },
   "files": [
     "dist",
@@ -27,42 +27,46 @@
   "exports": {
     ".": "./dist/index.mjs",
     "./artifact": "./dist/artifact.mjs",
+    "./deletion": "./dist/deletion.mjs",
+    "./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",
     "./package.json": "./package.json",
     "./cordis.patch.yml": "./cordis.patch.yml"
   },
   "dependencies": {
-    "@morlay/session-branch": "^0.0.8",
+    "@morlay/session-branch": "^0.0.9-alpha.0",
     "drizzle-orm": "^1.0.0-rc.5-ab785fc",
     "fflate": "^0.8.2",
     "pg": "^8.23.0"
   },
   "devDependencies": {
-    "@deepseek-ai/dsh-session-projection": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-session-projection-cache": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-session-turn-outline": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-storage": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-storage-domain": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-token-meter": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-workspace": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-session-projection": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-session-projection-cache": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-session-turn-outline": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-storage": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-storage-domain": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-token-meter": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-workspace": "^0.1.6-alpha.2",
     "@types/pg": "^8.23.1",
     "drizzle-kit": "1.0.0-rc.5-ab785fc"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.2",
-    "@deepseek-ai/dsh-invariants": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-llm": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-scope": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-session": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-session-format": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-session-format-catalog": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-session-persistence": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-session-query": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-settings": "^0.1.5-rc.2",
-    "@deepseek-ai/dsh-storage": "^0.1.5-rc.2",
+    "@deepseek-ai/dsh-invariants": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-llm": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-scope": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-session-format": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-session-format-catalog": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-session-persistence": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-session-query": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-settings": "^0.1.6-alpha.2",
+    "@deepseek-ai/dsh-storage": "^0.1.6-alpha.2",
     "@deepseek-ai/schemastery": "^3.18.2"
   },
   "dsh": {
@@ -72,16 +76,11 @@
   },
   "inlinedDependencies": {
     "@jridgewell/sourcemap-codec": "1.6.0",
-    "@vitest/expect": "4.1.11",
-    "@vitest/pretty-format": "4.1.11",
-    "@vitest/runner": "4.1.11",
-    "@vitest/snapshot": "4.1.11",
-    "@vitest/spy": "4.1.11",
-    "@vitest/utils": "4.1.11",
     "chai": "6.2.2",
-    "magic-string": "0.30.21",
-    "tinyrainbow": "3.1.1",
-    "vitest": "4.1.11",
+    "expect-type": "1.4.0",
+    "magic-string": "1.4.1",
+    "tinybench": "6.1.4",
+    "vitest": "5.0.0",
     "zod": "4.6.5"
   },
   "scripts": {

package/src/adapters/to-postgres.ts

@@ -18,7 +18,6 @@ import { toProperty, type ColumnDef, type TableDef } from "./types.ts";
 type TableRegistry = Record<string, AnyPgTable>;
 
 function buildColumn(name: string, c: ColumnDef, tables: TableRegistry): AnyPgColumnBuilder {
-  // 具体 builder 类型与 AnyPgColumnBuilder 在方法层面不兼容，构建阶段用宽松类型。
   let col: any;
   switch (c.type) {
     case "text": {
@@ -58,8 +57,7 @@ export function toPostgresSchema(
   schemaName = "public",
 ): Record<string, AnyPgTable> {
   const tables: TableRegistry = {};
-  // `pgSchema(name).table` 使表对象携带 schema 限定（查询/DDL 显式引用，
-  // 不依赖 search_path）；public 与无 schema 行为一致。
+
   const table = schemaName === "public" ? pgTable : pgSchema(schemaName).table;
   for (const def of defs) {
     const columns: Record<string, AnyPgColumnBuilder> = {};

package/src/adapters/to-sqlite.ts

@@ -15,8 +15,6 @@ import { toProperty, type ColumnDef, type TableDef } from "./types.ts";
 type TableRegistry = Record<string, AnySQLiteTable>;
 
 function buildColumn(name: string, c: ColumnDef, tables: TableRegistry): SQLiteColumnBuilder {
-  // 具体 builder 类型与基类在方法层面不兼容（泛型逆变），构建阶段用宽松
-  // 类型合并，返回时收窄为基类；查询类型安全由手写行接口兜底。
   let col: any;
   switch (c.type) {
     case "text": {

package/src/adapters/types.ts

@@ -1,5 +1,3 @@
-/** drizzle util 层：方言无关的表结构描述（entities 与 adapters 共用）。 */
-
 export type ColumnTypeName = "serial" | "integer" | "bigint" | "text";
 
 export type DeleteAction = "cascade" | "set null" | "restrict" | "no action";
@@ -33,7 +31,6 @@ export interface IndexDef {
   columns: string[];
 }
 
-/** 表结构描述：columns / checks / uniques / indexes 以 Record 键为名，天然唯一。 */
 export interface TableDef {
   name: string;
   columns: Record<string, ColumnDef>;

package/src/artifact.ts

@@ -1,4 +1,2 @@
-// 日志 / artifact 格式层：会话日志行处理（scanRows / rowToEvent / 修复）与
-// 导入导出 artifact 解析（jsonl / zip）。文件物理分开，经本入口聚合导出。
 export * from "./log.ts";
 export * from "./import.ts";

package/src/backend.ts

@@ -1,6 +1,7 @@
 import type { SessionId } from "@deepseek-ai/dsh-session";
 import type { SessionStorageMetadata } from "@deepseek-ai/dsh-session-persistence";
 import type { StorageRepository } from "./storage-takeover/types.ts";
+import type { UsageAggregate } from "./usage.ts";
 
 export interface SessionRow {
   fSessionId: string;
@@ -18,6 +19,8 @@ export interface SessionRow {
   fIncarnation: string;
 
   fRevision: number;
+
+  fArchivedAt: number | null;
 }
 
 export interface EventInsert {
@@ -64,7 +67,6 @@ export interface BackendTx {
 
   updateSeedLength(id: SessionId, seedLength: number): Promise<void>;
 
-  /** 从事件表重算会话标题（最后一条 `session/title`）并写回会话行。 */
   refreshTitle(id: SessionId): Promise<void>;
 
   insertEvents(events: EventInsert[]): Promise<void>;
@@ -88,6 +90,11 @@ export interface BackendTx {
     id: SessionId,
     sequence: number,
   ): Promise<{ fEventId: string; fSequence: number } | undefined>;
+
+  deleteSession(id: SessionId): Promise<void>;
+
+  /** 批量删除整条会话：桥接行、workspace 归属行、投影行与会话行。 */
+  deleteSessions(ids: SessionId[]): Promise<number>;
 }
 
 export interface Backend {
@@ -95,7 +102,6 @@ export interface Backend {
 
   readonly storeIdentity: string;
 
-  /** storages 接管表（workspace 域与投影 checkpoint）的访问层：与事件日志同介质。 */
   readonly storage: StorageRepository;
 
   open(): Promise<void>;
@@ -104,9 +110,32 @@ export interface Backend {
 
   getEventRows(id: SessionId, fromSequence?: number): Promise<EventRow[]>;
 
+  getEventTypeAt(id: SessionId, sequence: number): Promise<string | undefined>;
+
+  getEventTypesBefore(
+    id: SessionId,
+    beforeSequence: number,
+    limit: number,
+  ): Promise<Array<Pick<EventRow, "fSequence" | "fType">>>;
+
   listSessions(): Promise<SessionRow[]>;
 
   transaction<T>(fn: (tx: BackendTx) => Promise<T>): Promise<T>;
 
+  /** 删除已无桥接行引用的事件行（孤儿），返回删除行数。 */
+  collectOrphans(): Promise<number>;
+
+  /** 父会话已不存在（或没有父）的 subagent 会话：父被删后它们成了孤儿。 */
+  listOrphanSubagentSessions(): Promise<SessionId[]>;
+
+  /**
+   * 用量统计的原始聚合：按天×模型×subagent 的桶与按会话的行（事件行去重、排除孤儿）。
+   * @param sinceMs - 只算该时刻（含）之后的事件行；省略即全量。
+   */
+  usageReport(sinceMs?: number): Promise<UsageAggregate>;
+
+  /** 回收空间与统计（含 VACUUM）；不得在事务内执行。 */
+  vacuum(): Promise<void>;
+
   close(): Promise<void>;
 }