@morlay/session-rdb 0.1.10-alpha.0 → 0.1.10-alpha.2

package/README.md

@@ -2,8 +2,9 @@
 
 会话持久化与分支回退的 RDB 后端（SQLite / PostgreSQL）：提供 `ctx.sessionPersistence`（上游 `SessionHandle`
 模型：`create` / `open` / `flush` / `stat` / `list`）与 `ctx.sessionBranch`（`rewind` / `retry` / `fork` 的
-provider 面），并接管 `ctx.sessionQuery`（全文检索 disabled）与 `$DSH_HOME/storages` 的两个域
-（workspace、投影 checkpoint）。
+provider 面），并接管 `ctx.sessionQuery`（全文检索 disabled）、`ctx.sessionProjectionCache`
+（投影 checkpoint 落行级表）与 `$DSH_HOME/storages` 的**所有域**（workspace / schedule / cua 的授权域…）：
+按 `(域, 表, 键)` 落同一张 `t_storage_records`（`rdb` KV 后端），新增域不需要再加表或映射。
 
 ## 用法
 
@@ -24,6 +25,11 @@ provider 面），并接管 `ctx.sessionQuery`（全文检索 disabled）与 `$D
 PostgreSQL 同理：`type: postgres` + `connectionString`（可加 `schema`，默认 `public`）。字段、默认值、装配默认值的
 来源与「改配置由 Loader 重挂这一行生效」见[设计总览](./.agents/designs/20260917-设计总览.md)的「配置门面」。
 
+PG 的方言能力（连接、`PRAGMA` 库身份、聚合的 int8、JSON 提取、本地日、事务串行）由 `@morlay/rdbkit` 自己的
+`pg.spec.ts` 等用例验证；本包的契约与接管用例只在 SQLite 上跑（两个方言共用同一个后端实现，同一份逻辑不重复测）。
+本地跑 rdbkit 的 PG 用例时用它的 dev 实例起库（`just pg up`，端口 25433），再设
+`TEST_PG_URL=postgres://postgres:postgres@localhost:25433/postgres`。
+
 `preparedSessionCacheSize` 透传给上游 `session-query` 的冷会话观察缓存：缓存**按条目数**持有完整 `Session`
 （含整份 append-only log），被活跃观察租约钉住的条目不淘汰；一次读取中途转成 live 时会重试 live 路径，但不会
 顺手清掉已缓存的 cold 条目——同一个 id 因此可能同时有两份 log 驻留。上游默认 5，**本行默认 1**（本地单用户、
@@ -31,6 +37,15 @@ rdb 后端，冷读复用的收益不值这份内存放大）；上游校验下
 
 管理面的 HTTP 通道统一挂在 `/api/morlay/v1/session` 前缀下（均为 `POST`，body `{ sessionId }` 或列表请求
 `{ query?, includeSubagents?, page?, pageSize? }`）：`/rows`（完整语料，含归档）、`/export`、`/import`、
-`/delete`、`/gc`、`/usage`（前缀与上游分家的理由见
+`/delete`、`/organize`、`/usage`（前缀与上游分家的理由见
 [ADR-管理面HTTP路由前缀与上游分家](./.agents/adrs/20260929-管理面HTTP路由前缀与上游分家.md)）。旧
 `$DSH_HOME/storages` JSON 的导入是包内 API `importStorages`（`src/import-storages.ts`，不在包出口里）。
+
+## 与数据库的交互
+
+**本包不写 SQL**：所有查询、写入、结构与迁移都经 `@morlay/rdbkit` 的表句柄与表达式（`E.eq` / `E.coalesce` /
+`E.localDay` / `E.jsonInt` …）；方言相关的渲染落在 rdbkit 里，本包只表达语义。连接、事务、库身份（`PRAGMA`）、
+`VACUUM` 同样由 rdbkit 提供入口，本包看不到驱动与方言。
+
+SQLite 与 PostgreSQL 共用同一个后端实现 `src/backend-rdb.ts`（`RdbBackend`）：读模型、写事务、统计与域存储
+都只有一份代码，方言差异只出现在表达式层（[设计 数据库交互经 rdbkit](./.agents/designs/20261103-数据库交互经-rdbkit.md)）。

package/dist/artifact.d.mts

@@ -1,3 +1,119 @@
-import { C as usageRowOf, It as SESSION_IMPORT_PATH, 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-TYgd8Xkr.mjs";
+import { K as EventUsageRow, V as SESSION_IMPORT_PATH, c as SessionRow, q as usageRowOf, r as EventRow } from "./backend-BKtJ5sO5.mjs";
 import { 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 };
+import { InsertRow, RowOf } from "@morlay/rdbkit";
+import { SessionEvent, SessionHeader } from "@deepseek-ai/dsh-session";
+import { SessionStorageMetadata } from "@deepseek-ai/dsh-session-persistence";
+declare const sessions: import("@morlay/rdbkit").Table<{
+  readonly name: "t_sessions";
+  readonly columns: {
+    readonly f_id: {
+      readonly type: "serial";
+      readonly primaryKey: true;
+    };
+    readonly f_session_id: {
+      readonly type: "text";
+      readonly notNull: true;
+      readonly unique: true;
+    };
+    readonly f_head_event_id: {
+      readonly type: "text";
+      readonly notNull: true;
+      readonly default: "";
+    };
+    readonly f_head_sequence: {
+      readonly type: "integer";
+      readonly notNull: true;
+      readonly default: -1;
+    };
+    readonly f_version: {
+      readonly type: "integer";
+      readonly notNull: true;
+    };
+    readonly f_created_at: {
+      readonly type: "bigint";
+      readonly notNull: true;
+    };
+    readonly f_cwd: {
+      readonly type: "text";
+    };
+    readonly f_parent_session: {
+      readonly type: "text";
+    };
+    readonly f_seed_length: {
+      readonly type: "integer";
+    };
+    readonly f_origin: {
+      readonly type: "text";
+    };
+    readonly f_delegation_depth: {
+      readonly type: "integer";
+    };
+    readonly f_agent_preset: {
+      readonly type: "text";
+    };
+    readonly f_incarnation: {
+      readonly type: "text";
+      readonly notNull: true;
+    };
+    readonly f_revision: {
+      readonly type: "integer";
+      readonly notNull: true;
+    };
+    readonly f_archived_at: {
+      readonly type: "bigint";
+    };
+    readonly f_pinned_seq: {
+      readonly type: "integer";
+    };
+    readonly f_last_event_at: {
+      readonly type: "bigint";
+    };
+    readonly f_title: {
+      readonly type: "text";
+    };
+    readonly f_title_seq: {
+      readonly type: "integer";
+    };
+  };
+}>;
+export declare function rowToMeta(row: SessionRow): SessionHeader;
+/** 新建会话行（列名即表定义里的列，值全部显式给出）。 */
+export declare function sessionInsertColumns(storage: SessionStorageMetadata, incarnation: string): InsertRow<RowOf<typeof sessions>>;
+/** header 的八列（`upsert` 时「变了的列才写」判据也用它）。 */
+export declare function sessionHeaderColumns(storage: SessionStorageMetadata): {
+  f_version: number;
+  f_created_at: number;
+  f_cwd: string | null;
+  f_parent_session: string | null;
+  f_seed_length: number | null;
+  f_origin: string | null;
+  f_delegation_depth: number | null;
+  f_agent_preset: string | null;
+};
+export declare function rowToEvent(row: EventRow): SessionEvent;
+export declare function recomputeReplaceProvenance(events: SessionEvent[]): void;
+export declare function findSurfaceRepairs(events: readonly SessionEvent[]): {
+  degradeToAppend: Set<number>;
+  addAppendMarker: Set<number>;
+  clearSurfaceOp: Set<number>;
+  clampEnd: Map<number, number>;
+};
+export declare function repairSurfaceOps(events: SessionEvent[]): void;
+export declare function repairAssistantSettlement(events: SessionEvent[]): void;
+export declare function repairRequestHeaders(events: SessionEvent[]): void;
+export declare function syncMeteringRanges(events: SessionEvent[]): void;
+export declare function renameLegacyPtcEvents(events: SessionEvent[]): void;
+export declare function normalizeToCurrentShape(events: SessionEvent[]): void;
+export declare function sealOwnEvents(events: readonly SessionEvent[]): void;
+export declare const OWN_EVENT_TYPES: ReadonlySet<string>;
+export declare function needsShapeAdoption(events: readonly SessionEvent[]): boolean;
+export declare function repairReadView(events: SessionEvent[]): void;
+export declare function orphanInboxSpliceSeqs(events: readonly SessionEvent[]): Set<number>;
+export declare function repairOrphanInboxSplices(events: SessionEvent[]): void;
+export declare function scanRows(rows: readonly EventRow[], base?: number): {
+  preserved: SessionEvent[];
+  tornFrom?: number;
+};
+export declare function toJsonlArtifact(meta: SessionHeader, inheritedEventCount: number, events: readonly SessionEvent[]): string;
+export declare function titleOfEventData(data: string): string | undefined;
+export { EventUsageRow, SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport, usageRowOf };

package/dist/artifact.mjs

@@ -1,4 +1,6 @@
-import { i as SESSION_IMPORT_PATH } from "./routes-hZjTcX_R.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-CcWy46VE.mjs";
+import { a as rowToMeta, i as rowToEvent, n as titleOfEventData, o as sessionHeaderColumns, r as toJsonlArtifact, s as sessionInsertColumns, t as scanRows } from "./export-CfJQjQfr.mjs";
+import { C as sealOwnEvents, S as repairSurfaceOps, _ as renameLegacyPtcEvents, b as repairReadView, d as OWN_EVENT_TYPES, f as findSurfaceRepairs, g as recomputeReplaceProvenance, h as orphanInboxSpliceSeqs, m as normalizeToCurrentShape, p as needsShapeAdoption, v as repairAssistantSettlement, w as syncMeteringRanges, x as repairRequestHeaders, y as repairOrphanInboxSplices } from "./branch-CG1PUlO6.mjs";
+import { o as SESSION_IMPORT_PATH } from "./route-DpfY0zq-.mjs";
+import { t as usageRowOf } from "./usage-row-BQQM-_t6.mjs";
 import { 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 };
+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, sessionHeaderColumns, sessionInsertColumns, syncMeteringRanges, titleOfEventData, toJsonlArtifact, usageRowOf };