@morlay/session-rdb 0.0.14 → 0.0.16-alpha.0

package/drizzle/sqlite/20260908072752_v3_drop_original_seq/snapshot.json

@@ -0,0 +1,513 @@
+{
+  "version": "7",
+  "dialect": "sqlite",
+  "id": "73c73ac0-f96e-4579-8784-04343de1a0d7",
+  "prevIds": ["fb2bcab4-68a8-41b5-8493-804915c1ab54"],
+  "ddl": [
+    {
+      "name": "t_events",
+      "entityType": "tables"
+    },
+    {
+      "name": "t_persistence_state",
+      "entityType": "tables"
+    },
+    {
+      "name": "t_schema_meta",
+      "entityType": "tables"
+    },
+    {
+      "name": "t_session_events",
+      "entityType": "tables"
+    },
+    {
+      "name": "t_sessions",
+      "entityType": "tables"
+    },
+    {
+      "type": "integer",
+      "notNull": false,
+      "autoincrement": true,
+      "default": null,
+      "generated": null,
+      "name": "f_id",
+      "entityType": "columns",
+      "table": "t_events"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_event_id",
+      "entityType": "columns",
+      "table": "t_events"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": "''",
+      "generated": null,
+      "name": "f_parent_id",
+      "entityType": "columns",
+      "table": "t_events"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": "''",
+      "generated": null,
+      "name": "f_type",
+      "entityType": "columns",
+      "table": "t_events"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": "''",
+      "generated": null,
+      "name": "f_kind",
+      "entityType": "columns",
+      "table": "t_events"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": "''",
+      "generated": null,
+      "name": "f_role",
+      "entityType": "columns",
+      "table": "t_events"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": "''",
+      "generated": null,
+      "name": "f_name",
+      "entityType": "columns",
+      "table": "t_events"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": "''",
+      "generated": null,
+      "name": "f_action_id",
+      "entityType": "columns",
+      "table": "t_events"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": "''",
+      "generated": null,
+      "name": "f_encoding",
+      "entityType": "columns",
+      "table": "t_events"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_data",
+      "entityType": "columns",
+      "table": "t_events"
+    },
+    {
+      "type": "integer",
+      "notNull": true,
+      "autoincrement": false,
+      "default": "0",
+      "generated": null,
+      "name": "f_created_at",
+      "entityType": "columns",
+      "table": "t_events"
+    },
+    {
+      "type": "integer",
+      "notNull": false,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_singleton",
+      "entityType": "columns",
+      "table": "t_persistence_state"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_store_id",
+      "entityType": "columns",
+      "table": "t_persistence_state"
+    },
+    {
+      "type": "text",
+      "notNull": false,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_key",
+      "entityType": "columns",
+      "table": "t_schema_meta"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_value",
+      "entityType": "columns",
+      "table": "t_schema_meta"
+    },
+    {
+      "type": "integer",
+      "notNull": false,
+      "autoincrement": true,
+      "default": null,
+      "generated": null,
+      "name": "f_id",
+      "entityType": "columns",
+      "table": "t_session_events"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_session_id",
+      "entityType": "columns",
+      "table": "t_session_events"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_event_id",
+      "entityType": "columns",
+      "table": "t_session_events"
+    },
+    {
+      "type": "integer",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_sequence",
+      "entityType": "columns",
+      "table": "t_session_events"
+    },
+    {
+      "type": "text",
+      "notNull": false,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_surface_op",
+      "entityType": "columns",
+      "table": "t_session_events"
+    },
+    {
+      "type": "integer",
+      "notNull": false,
+      "autoincrement": true,
+      "default": null,
+      "generated": null,
+      "name": "f_id",
+      "entityType": "columns",
+      "table": "t_sessions"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_session_id",
+      "entityType": "columns",
+      "table": "t_sessions"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": "''",
+      "generated": null,
+      "name": "f_head_event_id",
+      "entityType": "columns",
+      "table": "t_sessions"
+    },
+    {
+      "type": "integer",
+      "notNull": true,
+      "autoincrement": false,
+      "default": "-1",
+      "generated": null,
+      "name": "f_head_sequence",
+      "entityType": "columns",
+      "table": "t_sessions"
+    },
+    {
+      "type": "integer",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_version",
+      "entityType": "columns",
+      "table": "t_sessions"
+    },
+    {
+      "type": "integer",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_created_at",
+      "entityType": "columns",
+      "table": "t_sessions"
+    },
+    {
+      "type": "text",
+      "notNull": false,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_cwd",
+      "entityType": "columns",
+      "table": "t_sessions"
+    },
+    {
+      "type": "text",
+      "notNull": false,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_parent_session",
+      "entityType": "columns",
+      "table": "t_sessions"
+    },
+    {
+      "type": "integer",
+      "notNull": false,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_seed_length",
+      "entityType": "columns",
+      "table": "t_sessions"
+    },
+    {
+      "type": "text",
+      "notNull": false,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_origin",
+      "entityType": "columns",
+      "table": "t_sessions"
+    },
+    {
+      "type": "integer",
+      "notNull": false,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_delegation_depth",
+      "entityType": "columns",
+      "table": "t_sessions"
+    },
+    {
+      "type": "text",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_incarnation",
+      "entityType": "columns",
+      "table": "t_sessions"
+    },
+    {
+      "type": "integer",
+      "notNull": true,
+      "autoincrement": false,
+      "default": null,
+      "generated": null,
+      "name": "f_revision",
+      "entityType": "columns",
+      "table": "t_sessions"
+    },
+    {
+      "columns": ["f_session_id"],
+      "tableTo": "t_sessions",
+      "columnsTo": ["f_session_id"],
+      "onUpdate": "NO ACTION",
+      "onDelete": "CASCADE",
+      "nameExplicit": false,
+      "name": "fk_t_session_events_f_session_id_t_sessions_f_session_id_fk",
+      "entityType": "fks",
+      "table": "t_session_events"
+    },
+    {
+      "columns": ["f_event_id"],
+      "tableTo": "t_events",
+      "columnsTo": ["f_event_id"],
+      "onUpdate": "NO ACTION",
+      "onDelete": "CASCADE",
+      "nameExplicit": false,
+      "name": "fk_t_session_events_f_event_id_t_events_f_event_id_fk",
+      "entityType": "fks",
+      "table": "t_session_events"
+    },
+    {
+      "columns": ["f_id"],
+      "nameExplicit": false,
+      "name": "t_events_pk",
+      "table": "t_events",
+      "entityType": "pks"
+    },
+    {
+      "columns": ["f_singleton"],
+      "nameExplicit": false,
+      "name": "t_persistence_state_pk",
+      "table": "t_persistence_state",
+      "entityType": "pks"
+    },
+    {
+      "columns": ["f_key"],
+      "nameExplicit": false,
+      "name": "t_schema_meta_pk",
+      "table": "t_schema_meta",
+      "entityType": "pks"
+    },
+    {
+      "columns": ["f_id"],
+      "nameExplicit": false,
+      "name": "t_session_events_pk",
+      "table": "t_session_events",
+      "entityType": "pks"
+    },
+    {
+      "columns": ["f_id"],
+      "nameExplicit": false,
+      "name": "t_sessions_pk",
+      "table": "t_sessions",
+      "entityType": "pks"
+    },
+    {
+      "columns": [
+        {
+          "value": "f_kind",
+          "isExpression": false
+        }
+      ],
+      "isUnique": false,
+      "where": null,
+      "origin": "manual",
+      "name": "idx_events_kind",
+      "entityType": "indexes",
+      "table": "t_events"
+    },
+    {
+      "columns": [
+        {
+          "value": "f_role",
+          "isExpression": false
+        }
+      ],
+      "isUnique": false,
+      "where": null,
+      "origin": "manual",
+      "name": "idx_events_role",
+      "entityType": "indexes",
+      "table": "t_events"
+    },
+    {
+      "columns": [
+        {
+          "value": "f_name",
+          "isExpression": false
+        }
+      ],
+      "isUnique": false,
+      "where": null,
+      "origin": "manual",
+      "name": "idx_events_name",
+      "entityType": "indexes",
+      "table": "t_events"
+    },
+    {
+      "columns": [
+        {
+          "value": "f_action_id",
+          "isExpression": false
+        }
+      ],
+      "isUnique": false,
+      "where": null,
+      "origin": "manual",
+      "name": "idx_events_action_id",
+      "entityType": "indexes",
+      "table": "t_events"
+    },
+    {
+      "columns": [
+        {
+          "value": "f_event_id",
+          "isExpression": false
+        }
+      ],
+      "isUnique": false,
+      "where": null,
+      "origin": "manual",
+      "name": "idx_session_events_event_id",
+      "entityType": "indexes",
+      "table": "t_session_events"
+    },
+    {
+      "columns": ["f_session_id", "f_sequence"],
+      "nameExplicit": true,
+      "name": "uq_session_events_session_sequence",
+      "entityType": "uniques",
+      "table": "t_session_events"
+    },
+    {
+      "columns": ["f_event_id"],
+      "nameExplicit": false,
+      "name": "t_events_f_event_id_unique",
+      "entityType": "uniques",
+      "table": "t_events"
+    },
+    {
+      "columns": ["f_session_id"],
+      "nameExplicit": false,
+      "name": "t_sessions_f_session_id_unique",
+      "entityType": "uniques",
+      "table": "t_sessions"
+    },
+    {
+      "value": "f_singleton = 1",
+      "name": "ck_persistence_state_singleton",
+      "entityType": "checks",
+      "table": "t_persistence_state"
+    }
+  ],
+  "renames": []
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morlay/session-rdb",
-  "version": "0.0.14",
+  "version": "0.0.16-alpha.0",
   "description": "RDB durable session backend for DeepSeek Harness: implements both session-persistence and session-branch (rewind / retry / fork) providers.",
   "keywords": [
     "branch",
@@ -19,6 +19,7 @@
   "files": [
     "dist",
     "src",
+    "drizzle",
     "cordis.patch.yml",
     "!**/__tests__"
   ],
@@ -34,24 +35,27 @@
     "./cordis.patch.yml": "./cordis.patch.yml"
   },
   "dependencies": {
-    "@morlay/session-branch": "^0.0.3",
+    "@morlay/session-branch": "^0.0.4-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.2-rc.1",
-    "@deepseek-ai/dsh-token-meter": "^0.1.2-rc.1",
-    "@types/pg": "^8.23.1"
+    "@deepseek-ai/dsh-session-projection": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-token-meter": "^0.1.3-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.2-rc.1",
-    "@deepseek-ai/dsh-llm": "^0.1.2-rc.1",
-    "@deepseek-ai/dsh-scope": "^0.1.2-rc.1",
-    "@deepseek-ai/dsh-session": "^0.1.2-rc.1",
-    "@deepseek-ai/dsh-session-persistence": "^0.1.2-rc.1",
-    "@deepseek-ai/dsh-settings": "^0.1.2-rc.1",
+    "@deepseek-ai/dsh-invariants": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-llm": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-scope": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-session": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-session-format": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-session-format-catalog": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-session-persistence": "^0.1.3-alpha.2",
+    "@deepseek-ai/dsh-settings": "^0.1.3-alpha.2",
     "@deepseek-ai/schemastery": "^3.18.2"
   },
   "dsh": {
@@ -73,6 +77,7 @@
     "vitest": "4.1.11"
   },
   "scripts": {
-    "build": "pnpm exec tsdown"
+    "build": "pnpm exec tsdown",
+    "db:generate": "drizzle-kit generate --config drizzle.config.ts && drizzle-kit generate --config drizzle.pg.config.ts"
   }
 }

package/src/adapters/index.ts

@@ -1,4 +1,12 @@
 export { toSqliteSchema } from "./to-sqlite.ts";
 export { toPostgresSchema } from "./to-postgres.ts";
-export { createTableSql, createIndexSql, createTablesSql } from "./ddl.ts";
-export type { Dialect } from "./ddl.ts";
+export type {
+  ColumnDef,
+  TableDef,
+  CheckDef,
+  UniqueDef,
+  IndexDef,
+  ColumnTypeName,
+  DeleteAction,
+} from "./types.ts";
+export { toProperty } from "./types.ts";

package/src/adapters/to-postgres.ts

@@ -13,27 +13,29 @@ import {
   type AnyPgColumnBuilder,
   type AnyPgTable,
 } from "drizzle-orm/pg-core";
-import { toProperty, type ColumnDef, type TableDef } from "../entities/types.ts";
+import { toProperty, type ColumnDef, type TableDef } from "./types.ts";
 
 type TableRegistry = Record<string, AnyPgTable>;
 
-function buildColumn(c: ColumnDef, tables: TableRegistry): AnyPgColumnBuilder {
+function buildColumn(name: string, c: ColumnDef, tables: TableRegistry): AnyPgColumnBuilder {
   // 具体 builder 类型与 AnyPgColumnBuilder 在方法层面不兼容，构建阶段用宽松类型。
   let col: any;
   switch (c.type) {
-    case "text":
-      col = text(c.name);
+    case "text": {
+      const built = text(name);
+      col = c.primaryKey ? built.primaryKey() : built;
       break;
+    }
     case "serial":
-      col = serial(c.name).primaryKey();
+      col = serial(name).primaryKey();
       break;
     case "integer": {
-      const built = integer(c.name);
+      const built = integer(name);
       col = c.primaryKey ? built.primaryKey() : built;
       break;
     }
     case "bigint": {
-      const built = bigint(c.name, { mode: "number" });
+      const built = bigint(name, { mode: "number" });
       col = c.primaryKey ? built.primaryKey() : built;
       break;
     }
@@ -61,20 +63,22 @@ export function toPostgresSchema(
   const table = schemaName === "public" ? pgTable : pgSchema(schemaName).table;
   for (const def of defs) {
     const columns: Record<string, AnyPgColumnBuilder> = {};
-    for (const c of def.columns) columns[toProperty(c.name)] = buildColumn(c, tables);
+    for (const [name, c] of Object.entries(def.columns)) {
+      columns[toProperty(name)] = buildColumn(name, c, tables);
+    }
     const extra = (self: Record<string, unknown>) => [
-      ...(def.checks ?? []).map((c) => pgCheck(c.name, sql.raw(c.expression))),
-      ...(def.uniques ?? []).map((u) =>
-        unique(u.name).on(
-          ...(u.columns.map((name) => self[toProperty(name)] as AnyPgColumn) as [
+      ...Object.entries(def.checks ?? {}).map(([name, c]) => pgCheck(name, sql.raw(c.expression))),
+      ...Object.entries(def.uniques ?? {}).map(([name, u]) =>
+        unique(name).on(
+          ...(u.columns.map((n) => self[toProperty(n)] as AnyPgColumn) as [
             AnyPgColumn,
             ...AnyPgColumn[],
           ]),
         ),
       ),
-      ...(def.indexes ?? []).map((i) =>
-        index(i.name).on(
-          ...(i.columns.map((name) => self[toProperty(name)] as AnyPgColumn) as [
+      ...Object.entries(def.indexes ?? {}).map(([name, i]) =>
+        index(name).on(
+          ...(i.columns.map((n) => self[toProperty(n)] as AnyPgColumn) as [
             AnyPgColumn,
             ...AnyPgColumn[],
           ]),