@morlay/session-rdb 0.0.17 → 0.0.19

package/drizzle/sqlite/20260910120000_v3_storage_tables/snapshot.json

@@ -2,9 +2,7 @@
   "version": "7",
   "dialect": "sqlite",
   "id": "1d8acf30-2759-4afb-9aa6-81ee2b470237",
-  "prevIds": [
-    "73c73ac0-f96e-4579-8784-04343de1a0d7"
-  ],
+  "prevIds": ["73c73ac0-f96e-4579-8784-04343de1a0d7"],
   "ddl": [
     {
       "name": "t_events",
@@ -357,13 +355,9 @@
       "table": "t_sessions"
     },
     {
-      "columns": [
-        "f_session_id"
-      ],
+      "columns": ["f_session_id"],
       "tableTo": "t_sessions",
-      "columnsTo": [
-        "f_session_id"
-      ],
+      "columnsTo": ["f_session_id"],
       "onUpdate": "NO ACTION",
       "onDelete": "CASCADE",
       "nameExplicit": false,
@@ -372,13 +366,9 @@
       "table": "t_session_events"
     },
     {
-      "columns": [
-        "f_event_id"
-      ],
+      "columns": ["f_event_id"],
       "tableTo": "t_events",
-      "columnsTo": [
-        "f_event_id"
-      ],
+      "columnsTo": ["f_event_id"],
       "onUpdate": "NO ACTION",
       "onDelete": "CASCADE",
       "nameExplicit": false,
@@ -387,45 +377,35 @@
       "table": "t_session_events"
     },
     {
-      "columns": [
-        "f_id"
-      ],
+      "columns": ["f_id"],
       "nameExplicit": false,
       "name": "t_events_pk",
       "table": "t_events",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_singleton"
-      ],
+      "columns": ["f_singleton"],
       "nameExplicit": false,
       "name": "t_persistence_state_pk",
       "table": "t_persistence_state",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_key"
-      ],
+      "columns": ["f_key"],
       "nameExplicit": false,
       "name": "t_schema_meta_pk",
       "table": "t_schema_meta",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_id"
-      ],
+      "columns": ["f_id"],
       "nameExplicit": false,
       "name": "t_session_events_pk",
       "table": "t_session_events",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_id"
-      ],
+      "columns": ["f_id"],
       "nameExplicit": false,
       "name": "t_sessions_pk",
       "table": "t_sessions",
@@ -502,28 +482,21 @@
       "table": "t_session_events"
     },
     {
-      "columns": [
-        "f_session_id",
-        "f_sequence"
-      ],
+      "columns": ["f_session_id", "f_sequence"],
       "nameExplicit": true,
       "name": "uq_session_events_session_sequence",
       "entityType": "uniques",
       "table": "t_session_events"
     },
     {
-      "columns": [
-        "f_event_id"
-      ],
+      "columns": ["f_event_id"],
       "nameExplicit": false,
       "name": "t_events_f_event_id_unique",
       "entityType": "uniques",
       "table": "t_events"
     },
     {
-      "columns": [
-        "f_session_id"
-      ],
+      "columns": ["f_session_id"],
       "nameExplicit": false,
       "name": "t_sessions_f_session_id_unique",
       "entityType": "uniques",
@@ -816,74 +789,56 @@
       "table": "t_workspace_sessions"
     },
     {
-      "columns": [
-        "f_id"
-      ],
+      "columns": ["f_id"],
       "nameExplicit": false,
       "name": "t_session_projcache_row_pk",
       "table": "t_session_projcache_row",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_name"
-      ],
+      "columns": ["f_name"],
       "nameExplicit": false,
       "name": "t_storage_units_pk",
       "table": "t_storage_units",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_singleton"
-      ],
+      "columns": ["f_singleton"],
       "nameExplicit": false,
       "name": "t_workspace_state_pk",
       "table": "t_workspace_state",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_id"
-      ],
+      "columns": ["f_id"],
       "nameExplicit": false,
       "name": "t_workspaces_pk",
       "table": "t_workspaces",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_id"
-      ],
+      "columns": ["f_id"],
       "nameExplicit": false,
       "name": "t_workspace_sessions_pk",
       "table": "t_workspace_sessions",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_session_id",
-        "f_key"
-      ],
+      "columns": ["f_session_id", "f_key"],
       "nameExplicit": true,
       "name": "uq_session_projcache_row_session_key",
       "entityType": "uniques",
       "table": "t_session_projcache_row"
     },
     {
-      "columns": [
-        "f_workspace_id"
-      ],
+      "columns": ["f_workspace_id"],
       "nameExplicit": false,
       "name": "t_workspaces_f_workspace_id_unique",
       "entityType": "uniques",
       "table": "t_workspaces"
     },
     {
-      "columns": [
-        "f_workspace_id",
-        "f_session_id"
-      ],
+      "columns": ["f_workspace_id", "f_session_id"],
       "nameExplicit": true,
       "name": "uq_workspace_sessions_workspace_session",
       "entityType": "uniques",
@@ -924,13 +879,9 @@
       "table": "t_workspace_state"
     },
     {
-      "columns": [
-        "f_session_id"
-      ],
+      "columns": ["f_session_id"],
       "tableTo": "t_sessions",
-      "columnsTo": [
-        "f_session_id"
-      ],
+      "columnsTo": ["f_session_id"],
       "onUpdate": "NO ACTION",
       "onDelete": "CASCADE",
       "nameExplicit": false,
@@ -939,13 +890,9 @@
       "table": "t_session_projcache_row"
     },
     {
-      "columns": [
-        "f_workspace_id"
-      ],
+      "columns": ["f_workspace_id"],
       "tableTo": "t_workspaces",
-      "columnsTo": [
-        "f_workspace_id"
-      ],
+      "columnsTo": ["f_workspace_id"],
       "onUpdate": "NO ACTION",
       "onDelete": "CASCADE",
       "nameExplicit": false,

package/drizzle/sqlite/20260910130000_v3_session_title_backfill/snapshot.json

@@ -2,9 +2,7 @@
   "version": "7",
   "dialect": "sqlite",
   "id": "9f0f3ef7-6951-441e-ac74-b4eb613de8b4",
-  "prevIds": [
-    "1d8acf30-2759-4afb-9aa6-81ee2b470237"
-  ],
+  "prevIds": ["1d8acf30-2759-4afb-9aa6-81ee2b470237"],
   "ddl": [
     {
       "name": "t_events",
@@ -357,13 +355,9 @@
       "table": "t_sessions"
     },
     {
-      "columns": [
-        "f_session_id"
-      ],
+      "columns": ["f_session_id"],
       "tableTo": "t_sessions",
-      "columnsTo": [
-        "f_session_id"
-      ],
+      "columnsTo": ["f_session_id"],
       "onUpdate": "NO ACTION",
       "onDelete": "CASCADE",
       "nameExplicit": false,
@@ -372,13 +366,9 @@
       "table": "t_session_events"
     },
     {
-      "columns": [
-        "f_event_id"
-      ],
+      "columns": ["f_event_id"],
       "tableTo": "t_events",
-      "columnsTo": [
-        "f_event_id"
-      ],
+      "columnsTo": ["f_event_id"],
       "onUpdate": "NO ACTION",
       "onDelete": "CASCADE",
       "nameExplicit": false,
@@ -387,45 +377,35 @@
       "table": "t_session_events"
     },
     {
-      "columns": [
-        "f_id"
-      ],
+      "columns": ["f_id"],
       "nameExplicit": false,
       "name": "t_events_pk",
       "table": "t_events",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_singleton"
-      ],
+      "columns": ["f_singleton"],
       "nameExplicit": false,
       "name": "t_persistence_state_pk",
       "table": "t_persistence_state",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_key"
-      ],
+      "columns": ["f_key"],
       "nameExplicit": false,
       "name": "t_schema_meta_pk",
       "table": "t_schema_meta",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_id"
-      ],
+      "columns": ["f_id"],
       "nameExplicit": false,
       "name": "t_session_events_pk",
       "table": "t_session_events",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_id"
-      ],
+      "columns": ["f_id"],
       "nameExplicit": false,
       "name": "t_sessions_pk",
       "table": "t_sessions",
@@ -502,28 +482,21 @@
       "table": "t_session_events"
     },
     {
-      "columns": [
-        "f_session_id",
-        "f_sequence"
-      ],
+      "columns": ["f_session_id", "f_sequence"],
       "nameExplicit": true,
       "name": "uq_session_events_session_sequence",
       "entityType": "uniques",
       "table": "t_session_events"
     },
     {
-      "columns": [
-        "f_event_id"
-      ],
+      "columns": ["f_event_id"],
       "nameExplicit": false,
       "name": "t_events_f_event_id_unique",
       "entityType": "uniques",
       "table": "t_events"
     },
     {
-      "columns": [
-        "f_session_id"
-      ],
+      "columns": ["f_session_id"],
       "nameExplicit": false,
       "name": "t_sessions_f_session_id_unique",
       "entityType": "uniques",
@@ -816,74 +789,56 @@
       "table": "t_workspace_sessions"
     },
     {
-      "columns": [
-        "f_id"
-      ],
+      "columns": ["f_id"],
       "nameExplicit": false,
       "name": "t_session_projcache_row_pk",
       "table": "t_session_projcache_row",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_name"
-      ],
+      "columns": ["f_name"],
       "nameExplicit": false,
       "name": "t_storage_units_pk",
       "table": "t_storage_units",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_singleton"
-      ],
+      "columns": ["f_singleton"],
       "nameExplicit": false,
       "name": "t_workspace_state_pk",
       "table": "t_workspace_state",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_id"
-      ],
+      "columns": ["f_id"],
       "nameExplicit": false,
       "name": "t_workspaces_pk",
       "table": "t_workspaces",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_id"
-      ],
+      "columns": ["f_id"],
       "nameExplicit": false,
       "name": "t_workspace_sessions_pk",
       "table": "t_workspace_sessions",
       "entityType": "pks"
     },
     {
-      "columns": [
-        "f_session_id",
-        "f_key"
-      ],
+      "columns": ["f_session_id", "f_key"],
       "nameExplicit": true,
       "name": "uq_session_projcache_row_session_key",
       "entityType": "uniques",
       "table": "t_session_projcache_row"
     },
     {
-      "columns": [
-        "f_workspace_id"
-      ],
+      "columns": ["f_workspace_id"],
       "nameExplicit": false,
       "name": "t_workspaces_f_workspace_id_unique",
       "entityType": "uniques",
       "table": "t_workspaces"
     },
     {
-      "columns": [
-        "f_workspace_id",
-        "f_session_id"
-      ],
+      "columns": ["f_workspace_id", "f_session_id"],
       "nameExplicit": true,
       "name": "uq_workspace_sessions_workspace_session",
       "entityType": "uniques",
@@ -924,13 +879,9 @@
       "table": "t_workspace_state"
     },
     {
-      "columns": [
-        "f_session_id"
-      ],
+      "columns": ["f_session_id"],
       "tableTo": "t_sessions",
-      "columnsTo": [
-        "f_session_id"
-      ],
+      "columnsTo": ["f_session_id"],
       "onUpdate": "NO ACTION",
       "onDelete": "CASCADE",
       "nameExplicit": false,
@@ -939,13 +890,9 @@
       "table": "t_session_projcache_row"
     },
     {
-      "columns": [
-        "f_workspace_id"
-      ],
+      "columns": ["f_workspace_id"],
       "tableTo": "t_workspaces",
-      "columnsTo": [
-        "f_workspace_id"
-      ],
+      "columnsTo": ["f_workspace_id"],
       "onUpdate": "NO ACTION",
       "onDelete": "CASCADE",
       "nameExplicit": false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/session-rdb",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "RDB durable session backend for DeepSeek Harness: implements both session-persistence and session-branch (rewind / retry / fork) providers.",
   "keywords": [
     "branch",
@@ -35,33 +35,34 @@
     "./cordis.patch.yml": "./cordis.patch.yml"
   },
   "dependencies": {
-    "@morlay/session-branch": "^0.0.5",
+    "@morlay/session-branch": "^0.0.7",
     "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.1",
-    "@deepseek-ai/dsh-session-projection-cache": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-session-turn-outline": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-storage": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-storage-domain": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-token-meter": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-workspace": "^0.1.5-rc.1",
+    "@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",
     "@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.1",
-    "@deepseek-ai/dsh-llm": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-scope": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-session": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-session-format": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-session-format-catalog": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-session-persistence": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-settings": "^0.1.5-rc.1",
-    "@deepseek-ai/dsh-storage": "^0.1.5-rc.1",
+    "@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/schemastery": "^3.18.2"
   },
   "dsh": {
@@ -81,7 +82,7 @@
     "magic-string": "0.30.21",
     "tinyrainbow": "3.1.1",
     "vitest": "4.1.11",
-    "zod": "4.6.1"
+    "zod": "4.6.4"
   },
   "scripts": {
     "build": "pnpm exec tsdown",

package/src/entities/v3/workspace-state.ts

@@ -4,7 +4,7 @@ import type { TableDef } from "../../adapters/types.ts";
  * workspace 域 global 单例（上游 `workspaceDomainState`）：`initialized` 是
  * 引导标记，`pendingMutation` 拆成操作与目标两列（create / delete 的可恢复
  * 两写标记）。显示顺序（`workspaceIds`）在 `t_workspaces.f_position`，
- * 归档集在 `t_session_archives`。
+ * 归档集由 `t_sessions.f_archived_at` 承载（归档不触碰归属槽位）。
  */
 export const workspaceState: TableDef = {
   name: "t_workspace_state",

package/src/import-storages.ts

@@ -42,9 +42,11 @@ export interface StoragesImportOptions {
 }
 
 const WORKSPACE_UNIT = "workspace";
-const WORKSPACE_UNIT_VERSIONS = new Set([2]);
+/** 旧 workspace 文档可接受的域版本集（对齐上游 `workspaceDomainSpec`，见对齐测试）。 */
+export const WORKSPACE_UNIT_VERSIONS: ReadonlySet<number> = new Set([2]);
 const PROJCACHE_UNIT = "session_projcache";
-const PROJCACHE_UNIT_VERSIONS = new Set([7, 3, 4, 5, 6]);
+/** 旧投影缓存文档可接受的域版本集（对齐上游 spec 的 version ∪ compatibleVersions）。 */
+export const PROJCACHE_UNIT_VERSIONS: ReadonlySet<number> = new Set([7, 3, 4, 5, 6]);
 
 /**
  * Import the legacy storages documents into the rdb tables.
@@ -62,7 +64,10 @@ export async function importStorages(
   const workspaceDocument = await readJson(join(storagesRoot, `${WORKSPACE_UNIT}.json`));
   if (workspaceDocument !== undefined) {
     const tables = unitTables(workspaceDocument, WORKSPACE_UNIT, WORKSPACE_UNIT_VERSIONS);
-    await repository.insertUnitVersion(WORKSPACE_UNIT, WORKSPACE_UNIT_VERSIONS.values().next().value as number);
+    await repository.insertUnitVersion(
+      WORKSPACE_UNIT,
+      WORKSPACE_UNIT_VERSIONS.values().next().value as number,
+    );
     for (const [id, record] of Object.entries(tables["workspaces"] ?? {})) {
       await repository.putWorkspace(id, record as WorkspaceRecord);
       result.workspaces += 1;

package/src/import.ts

@@ -2,12 +2,14 @@ import { randomUUID } from "node:crypto";
 import type { Context } from "@deepseek-ai/cordis";
 import { SESSION_FORMAT_VERSION, SessionLogOffset } from "@deepseek-ai/dsh-session";
 import type { Session, SessionEvent, SessionId, SessionHeader } from "@deepseek-ai/dsh-session";
+import { parseSessionFormatLogFilename } from "@deepseek-ai/dsh-session-format";
 import { sessionFormatCatalog } from "@deepseek-ai/dsh-session-format-catalog";
 import type { SessionStorageMetadata } from "@deepseek-ai/dsh-session-persistence";
 import { unzipSync } from "fflate";
 import { replaceLiveSessionLog } from "./branch.ts";
 import type { SessionPersistenceRdb } from "./index.ts";
 
+/** 当前世代产物的文件名（读入侧接受任意 canonical 世代名，见 parseImportZip）。 */
 export const SESSION_LOG_ARTIFACT_FILENAME = "session.jsonl";
 
 export const SESSION_IMPORT_PATH = "/api/session.import";
@@ -107,11 +109,36 @@ export function parseImportZip(zip: Uint8Array): SessionStorageMetadata & {
   } catch {
     throw new Error("imported zip is not a valid ZIP archive");
   }
-  const artifact = entries[SESSION_LOG_ARTIFACT_FILENAME];
+  // 上游导出按世代命名（`session.v3.jsonl`），早期 rdb 导出沿用 `session.jsonl`：
+  // 两者都接受，按 canonical 名字规则识别（临时/大写/压缩后缀名不视为产物）。
+  const artifact = Object.entries(entries).find(
+    ([name]) => parseSessionFormatLogFilename(name) !== undefined,
+  );
   if (artifact === undefined) {
-    throw new Error(`imported zip is missing ${SESSION_LOG_ARTIFACT_FILENAME}`);
+    throw new Error(
+      `imported zip has no session log artifact (expected ${SESSION_LOG_ARTIFACT_FILENAME} ` +
+        "or a canonical session.vN.jsonl)",
+    );
   }
-  return parseJsonlArtifact(new TextDecoder().decode(artifact));
+  return parseJsonlArtifact(new TextDecoder().decode(artifact[1]));
+}
+
+// 上游 Agent 的取消面（duck-type）：停止运行中的 loop。
+interface ImportAgentLike {
+  cancel?(cause: { kind: "user" }, options?: { keepInbox?: boolean }): void;
+  whenIdle(): Promise<void>;
+}
+
+// persistImport 会先 rewind(-1) 截断 live 会话的内存 log，不能与 agent 写日志
+// 并发；keepInbox 保留排队输入（截断后由 rewind 的 live 钩子 durable 取消）。
+async function stopAgentLoop(ctx: Context, sessionId: SessionId): Promise<void> {
+  const agents = ctx.get("agents") as
+    | { get(id: SessionId): ImportAgentLike | undefined }
+    | undefined;
+  const agent = agents?.get(sessionId);
+  if (agent === undefined) return;
+  agent.cancel?.({ kind: "user" }, { keepInbox: true });
+  await agent.whenIdle();
 }
 
 export async function persistImport(
@@ -120,12 +147,15 @@ export async function persistImport(
   imported: SessionStorageMetadata & { events: SessionEvent[] },
   targetId?: SessionId,
   sessions?: { get(id: SessionId): Session | undefined },
+  stopLoop?: (id: SessionId) => Promise<void>,
 ): Promise<SessionId> {
   const id = targetId ?? (`session-${randomUUID()}` as SessionId);
   if (targetId !== undefined) {
     if (branch === undefined) {
       throw new Error("sessionBranch service is unavailable");
     }
+    // 覆盖语义先 rewind(-1) 截断：停止运行中的 loop（未注入端口时空操作）。
+    if (stopLoop !== undefined) await stopLoop(targetId);
     await branch.rewind(targetId, -1);
     // rewind 截断后追加导入事件（覆盖语义）。live 会话的 write handle 由
     // live 路由持有——复用而非 open（open 会撞 SessionAlreadyOwnedError）。
@@ -252,7 +282,14 @@ export function registerSessionImport(ctx: Context, persistence: SessionPersiste
               const sessions = webCtx.get("sessions") as
                 | { get(id: SessionId): Session | undefined }
                 | undefined;
-              const id = await persistImport(persistence, branch, imported, targetId, sessions);
+              const id = await persistImport(
+                persistence,
+                branch,
+                imported,
+                targetId,
+                sessions,
+                (sessionId) => stopAgentLoop(webCtx, sessionId),
+              );
               res.writeHead(200, { "content-type": "application/json" });
               res.end(JSON.stringify({ sessionId: id }));
             } catch (error: unknown) {