@morlay/session-rdb 0.0.16 → 0.0.18

package/README.md

@@ -50,6 +50,8 @@ type Config =
       type: "postgres";
       /** node-postgres 连接串；首次打开自动建表并写入 store 身份。 */
       connectionString: string;
+      /** 目标 schema（默认 public，必须已存在）；见 docs/schema.md。 */
+      schema?: string;
     };
 ```
 
@@ -59,17 +61,49 @@ type Config =
 provider 抽象并**随插件自动注册 `ctx.sessionBranch`**（`SessionBranchRdb`），
 在不修改上游代码的前提下提供 `rewind / retry / fork` 的持久化闭环：
 
-- **`forkFrom`**：走标准 handle 路径（`create` + `append`）从闭合边界
-  派生新会话（纯 append，`parentSession` / `seedLength` lineage）；
-- **`rewind`**：直接操作后端事务截断到闭合边界（DELETE 尾部 + head 回退 +
-  revision bump），并更新并发写检测 head；**支持 live 会话**（`ctx.sessions`
-  有 owner 时同样就地工作：先 flush write-behind 缓冲 → 截断 RDB → 截断
-  live 内存 log 并复位 surface/header/context/derived 派生缓存 → 重置 agent
-  请求头标记 → 对齐 handle cursor；不调用 `load`——live 时 load 会先 flush
-  撤销截断）；
-- **`timeline`**：`parentSession` + `seedLength` 版本树投影（live 会话含
-  版本效果；cold 会话版本事件原样落库，效果详情可恢复）。
+- `forkFrom`：纯 append 从闭合边界派生新会话（事件行复用，不复制）；
+- `rewind`：直接操作后端事务截断（只删桥接行），支持 live 与 cold 会话；
+- `timeline`：lineage 版本树投影。
+
+三个原语的完整语义（含 live 同步步骤、事件行复用机制、坐标论证与已知限制）
+见 [docs/branch.md](docs/branch.md)。
 
 上层编排（edit / reroll / retry / rewind / fork 完整功能）由
 `@morlay/ui-conversation-message-actions` 提供，或直接在 `ctx.sessionBranch` /
 `ctx.sessionEditor` 之上编程。
+
+## storages 接管（workspace 与投影缓存）
+
+`$DSH_HOME/storages` 不再产生文件：官方 `storage-json` 与
+`session-projection-cache` 由 `@morlay/better-session` 的 patch 禁用，数据落本包
+的语义专用表（表结构见 [docs/schema.md](docs/schema.md)，决策见
+[docs/adr/0009](docs/adr/0009-接管storages到rdb语义表.md)）：
+
+- **workspace 域**：官方 `workspace` 插件保留，本包在 storage hub 注册 `rdb`
+  KV 后端（`storage-domain` 的 backend 路由为 `rdb`），记录、归属、显示顺序
+  与归档分别落 `t_workspaces` / `t_workspace_sessions` / `t_workspace_state`
+  与 `t_sessions.f_archived_at`；
+- **投影 checkpoint**：本包提供 `ctx.sessionProjectionCache` 服务（替换官方
+  插件，API 与语义逐一对齐），每个投影 key 一行落 `t_session_projcache_row`
+  （identity 直接复用 `t_sessions` 的会话行）；SQLite 下读路径**直接查表**
+  （进程内不再维护 checkpoint 镜像），PostgreSQL 因驱动异步保留写穿镜像。
+- **会话标题是会话数据**：`t_sessions.f_title` 由 rdb 按 `session/title` 事件
+  维护（rewind 截断后重算），列表消费在没有 checkpoint 行时直接取该列。
+
+写节流参数（默认 200 / 5000，与官方 base 装配一致）可经 settings 覆盖：
+
+```yaml
+session-rdb:
+  type: sqlite
+  path: /absolute/path/to/sessions.sqlite
+  projectionCache:
+    writeEveryEvents: 200
+    writeIntervalMs: 5000
+```
+
+旧 `storages` JSON 用显式命令导入（先停掉 dsh，旧文件保留不删）：
+
+```sh
+just import-storages --dsh-home apps/dsh-custom-next/.dsh-store \
+  --path apps/dsh-custom-next/.dsh-store/sessions/sessions.sqlite
+```

package/dist/artifact.d.mts

@@ -1,4 +1,4 @@
-import { v as EventRow, y as SessionRow } from "./schema-COK7-wRV.mjs";
+import { C as EventRow, w as SessionRow } from "./schema-Bo6Hy5gW.mjs";
 import { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport } from "./import.mjs";
 import { SessionStorageMetadata } from "@deepseek-ai/dsh-session-persistence";
 import { SessionEvent, SessionHeader } from "@deepseek-ai/dsh-session";
@@ -106,5 +106,12 @@ declare function scanRows(rows: readonly EventRow[], base?: number): {
   tornFrom?: number;
 };
 declare function toJsonlArtifact(meta: SessionHeader, inheritedEventCount: number, events: readonly SessionEvent[]): string;
+/**
+ * 事件行 JSON → `session/title` 的标题文本。存储层写路径保证 `f_data` 是完整
+ * 事件 JSON；形状不符（或损坏）按「无标题」处理——标题是派生显示数据。
+ * @param data - `t_events.f_data` 原文。
+ * @returns 标题文本，或 `undefined`。
+ */
+declare function titleOfEventData(data: string): string | undefined;
 //#endregion
-export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, findSurfaceRepairs, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, renameLegacyPtcEvents, repairAssistantSettlement, repairOrphanInboxSplices, repairReadView, repairRequestHeaders, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sessionConflictRow, sessionInsertRow, syncMeteringRanges, toJsonlArtifact };
+export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, findSurfaceRepairs, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, renameLegacyPtcEvents, repairAssistantSettlement, repairOrphanInboxSplices, repairReadView, repairRequestHeaders, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sessionConflictRow, sessionInsertRow, syncMeteringRanges, titleOfEventData, toJsonlArtifact };

package/dist/artifact.mjs

@@ -1,3 +1,3 @@
-import { a as repairAssistantSettlement, c as repairRequestHeaders, d as rowToMeta, f as scanRows, g as toJsonlArtifact, h as syncMeteringRanges, i as renameLegacyPtcEvents, l as repairSurfaceOps, m as sessionInsertRow, n as orphanInboxSpliceSeqs, o as repairOrphanInboxSplices, p as sessionConflictRow, r as recomputeReplaceProvenance, s as repairReadView, t as findSurfaceRepairs, u as rowToEvent } from "./log-BIuXv09P.mjs";
-import { a as persistImport, i as parseJsonlArtifact, n as SESSION_LOG_ARTIFACT_FILENAME, o as registerSessionImport, r as parseImportZip, t as SESSION_IMPORT_PATH } from "./import-BPEHfHNk.mjs";
-export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, findSurfaceRepairs, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, renameLegacyPtcEvents, repairAssistantSettlement, repairOrphanInboxSplices, repairReadView, repairRequestHeaders, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sessionConflictRow, sessionInsertRow, syncMeteringRanges, toJsonlArtifact };
+import { _ as toJsonlArtifact, a as repairAssistantSettlement, c as repairRequestHeaders, d as rowToMeta, f as scanRows, g as titleOfEventData, h as syncMeteringRanges, i as renameLegacyPtcEvents, l as repairSurfaceOps, m as sessionInsertRow, n as orphanInboxSpliceSeqs, o as repairOrphanInboxSplices, p as sessionConflictRow, r as recomputeReplaceProvenance, s as repairReadView, t as findSurfaceRepairs, u as rowToEvent } from "./log-DO69NQnn.mjs";
+import { a as persistImport, i as parseJsonlArtifact, n as SESSION_LOG_ARTIFACT_FILENAME, o as registerSessionImport, r as parseImportZip, t as SESSION_IMPORT_PATH } from "./import-DZIAjOUr.mjs";
+export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, findSurfaceRepairs, orphanInboxSpliceSeqs, parseImportZip, parseJsonlArtifact, persistImport, recomputeReplaceProvenance, registerSessionImport, renameLegacyPtcEvents, repairAssistantSettlement, repairOrphanInboxSplices, repairReadView, repairRequestHeaders, repairSurfaceOps, rowToEvent, rowToMeta, scanRows, sessionConflictRow, sessionInsertRow, syncMeteringRanges, titleOfEventData, toJsonlArtifact };

package/dist/{import-BPEHfHNk.mjs → import-DZIAjOUr.mjs}

@@ -1,4 +1,4 @@
-import { d as rowToMeta } from "./log-BIuXv09P.mjs";
+import { d as rowToMeta } from "./log-DO69NQnn.mjs";
 import { randomUUID } from "node:crypto";
 import { SESSION_FORMAT_VERSION, SessionLogOffset } from "@deepseek-ai/dsh-session";
 import { sessionFormatCatalog } from "@deepseek-ai/dsh-session-format-catalog";
@@ -171,6 +171,7 @@ var SessionBranchRdbProvider = class {
 				await tx.updateSeedLength(id, denseBoundary + 1);
 				shrunk = denseBoundary + 1;
 			}
+			await tx.refreshTitle(id);
 			await tx.bumpRevision(id);
 			return shrunk;
 		});

package/dist/import.d.mts

@@ -1,4 +1,4 @@
-import { n as SessionPersistenceRdb } from "./index-CgAqCQAb.mjs";
+import { r as SessionPersistenceRdb } from "./index-BEKoV1Uy.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,2 +1,2 @@
-import { a as persistImport, i as parseJsonlArtifact, n as SESSION_LOG_ARTIFACT_FILENAME, o as registerSessionImport, r as parseImportZip, t as SESSION_IMPORT_PATH } from "./import-BPEHfHNk.mjs";
+import { a as persistImport, i as parseJsonlArtifact, n as SESSION_LOG_ARTIFACT_FILENAME, o as registerSessionImport, r as parseImportZip, t as SESSION_IMPORT_PATH } from "./import-DZIAjOUr.mjs";
 export { SESSION_IMPORT_PATH, SESSION_LOG_ARTIFACT_FILENAME, parseImportZip, parseJsonlArtifact, persistImport, registerSessionImport };

package/dist/{index-CgAqCQAb.d.mts → index-BEKoV1Uy.d.mts}

@@ -1,4 +1,4 @@
-import { a as JournalMode, g as Backend, h as WriteGuard } from "./schema-COK7-wRV.mjs";
+import { a as JournalMode, b as WriteGuard, x as Backend } from "./schema-Bo6Hy5gW.mjs";
 import z from "@deepseek-ai/schemastery";
 import { SessionAccess, SessionHandle, SessionHandleAppendOptions, SessionHandleFlushOptions, SessionHandleReadOptions, SessionHandleReadResult, SessionPersistence, SessionPersistenceCreateOptions, SessionPersistenceListOptions, SessionPersistenceOpenOptions, SessionPersistenceRevision, SessionPersistenceSnapshot, SessionPersistenceStatOptions } from "@deepseek-ai/dsh-session-persistence";
 import { Session, SessionEvent, SessionHeader, SessionId, SessionLogOffset } from "@deepseek-ai/dsh-session";
@@ -81,15 +81,24 @@ interface SessionPersistenceRdbInternals {
   readStoredRevision(id: SessionId, signal?: AbortSignal): Promise<import("@deepseek-ai/dsh-session-persistence").SessionPersistenceRevision | undefined>;
   registerReuseEventIds(childId: SessionId, map: ReadonlyMap<number, string>): void;
 }
+/** 投影 checkpoint 写节流（替换上游 `session-projection-cache` 的 Config）。 */
+interface ProjectionCacheOptions {
+  /** 两次强制点之间累积多少已提交事件强制落盘（默认 200）。 */
+  writeEveryEvents?: number;
+  /** 脏 checkpoint 在强制点之间允许滞留的最长毫秒数（默认 5000）。 */
+  writeIntervalMs?: number;
+}
 type Config = {
   type: "sqlite";
   path: string;
   journalMode?: JournalMode;
   busyTimeout?: number;
+  projectionCache?: ProjectionCacheOptions;
 } | {
   type: "postgres";
   connectionString: string;
   schema?: string;
+  projectionCache?: ProjectionCacheOptions;
 };
 /** 一个已创建但未 materialize 的会话（本进程可见，其他进程不可见）。 */
 interface PendingSession {
@@ -258,4 +267,4 @@ declare class SessionPersistenceRdb extends SessionPersistence {
   private ensureLiveHandle;
 }
 //#endregion
-export { SessionBranchRdbProvider as a, SessionBranchRdb as i, SessionPersistenceRdb as n, locateTurnEnd as o, SessionPersistenceRdbInternals as r, Config as t };
+export { SessionBranchRdb as a, SessionPersistenceRdbInternals as i, ProjectionCacheOptions as n, SessionBranchRdbProvider as o, SessionPersistenceRdb as r, locateTurnEnd as s, Config as t };

package/dist/index.d.mts

@@ -1,3 +1,3 @@
-import { o as SCHEMA_VERSION } from "./schema-COK7-wRV.mjs";
-import { a as SessionBranchRdbProvider, i as SessionBranchRdb, n as SessionPersistenceRdb, o as locateTurnEnd, r as SessionPersistenceRdbInternals, t as Config } from "./index-CgAqCQAb.mjs";
-export { Config, SCHEMA_VERSION, SessionBranchRdb, SessionBranchRdbProvider, SessionPersistenceRdb, SessionPersistenceRdb as default, SessionPersistenceRdbInternals, locateTurnEnd };
+import { o as SCHEMA_VERSION } from "./schema-Bo6Hy5gW.mjs";
+import { a as SessionBranchRdb, i as SessionPersistenceRdbInternals, n as ProjectionCacheOptions, o as SessionBranchRdbProvider, r as SessionPersistenceRdb, s as locateTurnEnd, t as Config } from "./index-BEKoV1Uy.mjs";
+export { Config, ProjectionCacheOptions, SCHEMA_VERSION, SessionBranchRdb, SessionBranchRdbProvider, SessionPersistenceRdb, SessionPersistenceRdb as default, SessionPersistenceRdbInternals, locateTurnEnd };