@amaster.ai/dsh-storage 0.1.7 → 0.1.9

package/README.md

@@ -48,11 +48,15 @@ npx prisma db push --schema node_modules/@amaster.ai/dsh-storage/prisma/schema.m
 
 ## Data model
 
-- **`ai_messages`** — one row per projected session event (user / model / tool), with `thoughts`, `tokens`, `tool_calls`, `agent_id`, `metadata` JSON columns and soft-delete.
+- **`ai_messages`** — user and model rows, with `thoughts`, `tokens`, `tool_calls`, `agent_id`, `metadata` JSON columns and soft-delete. A `tool/result` updates the matching model row's `tool_calls` entry by call ID; it does not create a `type=tool` row.
 - **`ai_chat_histories`** — per-session rollup (message count, total tokens, first/last message timestamps).
 
 The logical message id rides in `metadata.id`; message rows use a deterministic hash of `(session_id, message id)` as their primary key, so re-projected events upsert in place rather than duplicate — on every connector. Session rows are matched by `session_id` and keep their cuid primary keys. One deviation from the source project: no `user_id` column — tenancy rides on `session_id`.
 
+The `tool_calls` array retains dsh's tool-call blocks (`id`, `name`, `arguments`); the matching entry gains the structured `result` block and, on failure, an `error` identity. The plugin reads persisted model rows to match results across process restarts and upserts the same row ID, so duplicate results do not add rows or increment the session's message count. Existing historical `type=tool` rows are left intact.
+
+When an assistant message contains dsh `reasoning` blocks, `thoughts` is an array of `{ content }` entries in block order. If the adapter supplies a matching signature in the message's `source.replayState.blocks`, that entry also carries `thoughtSignature`. The full model `source`, including opaque `replayState`, is preserved in row metadata for lossless provider replay. The backend's `readMessages()` also accepts older `{ description }` entries and JSON string thoughts, returning them as `{ content }`. `subject` and a per-thought timestamp are not invented when the upstream message does not supply them.
+
 SQL Server note: Prisma's sqlserver connector has no `Json` type, so its variant maps the JSON columns to text — the backend serializes them on write automatically (SQL Server's `ISJSON` / `JSON_VALUE` still query the text as JSON).
 
 Mirroring is a no-throw seam: backend errors are logged with a `[dsh-storage]` prefix and never escape into the agent loop.

package/lib/backends/database.js

@@ -142,6 +142,52 @@ export class DatabaseBackend {
             update: data,
         });
     }
+    async readMessages(sessionId, messageId) {
+        if (!this.prisma)
+            return [];
+        // ponytail: tool-call lookup scans one session; add an indexed call lookup if that becomes slow.
+        const rows = await this.prisma.aiMessage.findMany({
+            where: {
+                sessionId,
+                deletedAt: null,
+                ...(messageId ? { id: pk(`message ${sessionId}\0${messageId}`) } : {}),
+            },
+            orderBy: { createdAt: 'asc' },
+        });
+        const json = (value) => (typeof value === 'string' ? JSON.parse(value) : value);
+        return rows.map((row) => {
+            const metadata = json(row.metadata) ?? {};
+            const storedThoughts = json(row.thoughts);
+            const thoughts = Array.isArray(storedThoughts)
+                ? storedThoughts.map((thought) => {
+                    if (thought &&
+                        typeof thought === 'object' &&
+                        !('content' in thought) &&
+                        'description' in thought) {
+                        const { description, ...rest } = thought;
+                        return { ...rest, content: description };
+                    }
+                    return thought;
+                })
+                : typeof storedThoughts === 'string'
+                    ? [{ content: storedThoughts }]
+                    : storedThoughts;
+            return {
+                id: typeof metadata.id === 'string' ? metadata.id : row.id,
+                sessionId: row.sessionId,
+                historyId: row.historyId,
+                type: row.type,
+                content: row.content,
+                thoughts,
+                model: row.model,
+                tokens: json(row.tokens),
+                toolCalls: json(row.toolCalls),
+                agentId: row.agentId,
+                metadata,
+                createdAt: row.createdAt,
+            };
+        });
+    }
     async readSession(sessionId) {
         if (!this.prisma)
             return null;

package/lib/generated/mysql/internal/class.js

@@ -15,7 +15,7 @@ const config = {
     "clientVersion": "7.9.1",
     "engineVersion": "e922089b7d7502aff4249d5da3420f6fa55fc6ad",
     "activeProvider": "mysql",
-    "inlineSchema": "// Prisma schema for the dsh-storage database backend — MySQL variant (Prisma 7).\n//\n// Table layout matches the source project's ai_messages / ai_chat_histories\n// (packages/core/prisma/schema.prisma) so existing data stays compatible:\n//   - `type` values come from the dsh session event map\n//     ('user' | 'model' | 'tool' | ...) instead of gemini-cli message roles.\n//   - `agent_id` distinguishes the main agent from subagent writers.\n//   - no user_id: tenancy is carried by session_id, not a column.\n//\n// The client is pre-generated at package build time (`pnpm generate`, output\n// src/generated/mysql, compiled into lib/generated) — consumers do NOT run\n// `prisma generate`. To create/upgrade tables, run `prisma db push` /\n// migrations against this file; the connection URL lives in prisma.config.ts\n// (Prisma 7 dropped datasource.url from the schema).\n\ngenerator client {\n  provider            = \"prisma-client\"\n  output              = \"../src/generated/mysql\"\n  importFileExtension = \"js\"\n}\n\ndatasource db {\n  provider = \"mysql\"\n}\n\n/// One row per projected session event (user message, assistant message,\n/// tool call/result, compression snapshot, ...).\nmodel AiMessage {\n  id        String    @id @default(cuid()) @db.Char(36)\n  sessionId String    @map(\"session_id\") @db.VarChar(100)\n  historyId String?   @map(\"history_id\") @db.Char(36)\n  type      String    @db.VarChar(50)\n  content   String    @db.LongText\n  thoughts  Json?\n  model     String?   @db.VarChar(100)\n  tokens    Json?\n  toolCalls Json?     @map(\"tool_calls\")\n  agentId   String?   @map(\"agent_id\") @db.VarChar(100)\n  metadata  Json?\n  createdAt DateTime  @default(now()) @map(\"created_at\") @db.Timestamp(0)\n  updatedAt DateTime  @default(now()) @updatedAt @map(\"updated_at\") @db.Timestamp(0)\n  deletedAt DateTime? @map(\"deleted_at\") @db.Timestamp(0)\n\n  // Relations\n  history AiChatHistory? @relation(fields: [historyId], references: [id], onDelete: NoAction)\n\n  @@index([sessionId], map: \"idx_session\")\n  @@index([historyId], map: \"idx_history\")\n  @@index([createdAt], map: \"idx_created\")\n  @@index([deletedAt], map: \"idx_deleted\")\n  @@index([agentId], map: \"idx_agent\")\n  @@index([sessionId, agentId, type, createdAt], map: \"idx_session_agent_type_created\")\n  @@map(\"ai_messages\")\n}\n\n/// Per-session rollup, maintained incrementally by the projector.\nmodel AiChatHistory {\n  id             String    @id @default(cuid()) @db.Char(36)\n  sessionId      String    @map(\"session_id\") @db.VarChar(100)\n  title          String?   @db.VarChar(255)\n  summary        String?   @db.Text\n  messageCount   Int       @default(0) @map(\"message_count\")\n  totalTokens    BigInt    @default(0) @map(\"total_tokens\")\n  firstMessageAt DateTime? @map(\"first_message_at\") @db.DateTime(6)\n  lastMessageAt  DateTime? @map(\"last_message_at\") @db.DateTime(6)\n  metadata       Json?\n  deletedAt      DateTime? @map(\"deleted_at\") @db.DateTime(6)\n\n  // Relations\n  messages AiMessage[]\n\n  @@index([sessionId], map: \"idx_chat_history_session\")\n  @@index([deletedAt], map: \"idx_chat_history_deleted\")\n  @@map(\"ai_chat_histories\")\n}\n",
+    "inlineSchema": "// Prisma schema for the dsh-storage database backend — MySQL variant (Prisma 7).\n//\n// Table layout matches the source project's ai_messages / ai_chat_histories\n// (packages/core/prisma/schema.prisma) so existing data stays compatible:\n//   - `type` values come from the dsh session event map\n//     ('user' | 'model' | 'tool' | ...) instead of gemini-cli message roles.\n//   - `agent_id` distinguishes the main agent from subagent writers.\n//   - no user_id: tenancy is carried by session_id, not a column.\n//\n// The client is pre-generated at package build time (`pnpm generate`, output\n// src/generated/mysql, compiled into lib/generated) — consumers do NOT run\n// `prisma generate`. To create/upgrade tables, run `prisma db push` /\n// migrations against this file; the connection URL lives in prisma.config.ts\n// (Prisma 7 dropped datasource.url from the schema).\n\ngenerator client {\n  provider            = \"prisma-client\"\n  output              = \"../src/generated/mysql\"\n  importFileExtension = \"js\"\n}\n\ndatasource db {\n  provider = \"mysql\"\n}\n\n/// User and assistant messages; tool results update the assistant row's tool_calls.\nmodel AiMessage {\n  id        String    @id @default(cuid()) @db.Char(36)\n  sessionId String    @map(\"session_id\") @db.VarChar(100)\n  historyId String?   @map(\"history_id\") @db.Char(36)\n  type      String    @db.VarChar(50)\n  content   String    @db.LongText\n  thoughts  Json?\n  model     String?   @db.VarChar(100)\n  tokens    Json?\n  toolCalls Json?     @map(\"tool_calls\")\n  agentId   String?   @map(\"agent_id\") @db.VarChar(100)\n  metadata  Json?\n  createdAt DateTime  @default(now()) @map(\"created_at\") @db.Timestamp(0)\n  updatedAt DateTime  @default(now()) @updatedAt @map(\"updated_at\") @db.Timestamp(0)\n  deletedAt DateTime? @map(\"deleted_at\") @db.Timestamp(0)\n\n  // Relations\n  history AiChatHistory? @relation(fields: [historyId], references: [id], onDelete: NoAction)\n\n  @@index([sessionId], map: \"idx_session\")\n  @@index([historyId], map: \"idx_history\")\n  @@index([createdAt], map: \"idx_created\")\n  @@index([deletedAt], map: \"idx_deleted\")\n  @@index([agentId], map: \"idx_agent\")\n  @@index([sessionId, agentId, type, createdAt], map: \"idx_session_agent_type_created\")\n  @@map(\"ai_messages\")\n}\n\n/// Per-session rollup, maintained incrementally by the projector.\nmodel AiChatHistory {\n  id             String    @id @default(cuid()) @db.Char(36)\n  sessionId      String    @map(\"session_id\") @db.VarChar(100)\n  title          String?   @db.VarChar(255)\n  summary        String?   @db.Text\n  messageCount   Int       @default(0) @map(\"message_count\")\n  totalTokens    BigInt    @default(0) @map(\"total_tokens\")\n  firstMessageAt DateTime? @map(\"first_message_at\") @db.DateTime(6)\n  lastMessageAt  DateTime? @map(\"last_message_at\") @db.DateTime(6)\n  metadata       Json?\n  deletedAt      DateTime? @map(\"deleted_at\") @db.DateTime(6)\n\n  // Relations\n  messages AiMessage[]\n\n  @@index([sessionId], map: \"idx_chat_history_session\")\n  @@index([deletedAt], map: \"idx_chat_history_deleted\")\n  @@map(\"ai_chat_histories\")\n}\n",
     "runtimeDataModel": {
         "models": {},
         "enums": {},

package/lib/generated/postgresql/internal/class.js

@@ -15,7 +15,7 @@ const config = {
     "clientVersion": "7.9.1",
     "engineVersion": "e922089b7d7502aff4249d5da3420f6fa55fc6ad",
     "activeProvider": "postgresql",
-    "inlineSchema": "// Prisma schema for the dsh-storage database backend — PostgreSQL variant (Prisma 7).\n//\n// Same models as schema.mysql.prisma, with PostgreSQL native types\n// (`@db.Text` instead of `@db.LongText`, `@db.Timestamp` instead of\n// `@db.DateTime`). Client pre-generation and table creation work as described\n// in schema.mysql.prisma's header.\n\ngenerator client {\n  provider            = \"prisma-client\"\n  output              = \"../src/generated/postgresql\"\n  importFileExtension = \"js\"\n}\n\ndatasource db {\n  provider = \"postgresql\"\n}\n\n/// One row per projected session event (user message, assistant message,\n/// tool call/result, compression snapshot, ...).\nmodel AiMessage {\n  id        String    @id @default(cuid()) @db.Char(36)\n  sessionId String    @map(\"session_id\") @db.VarChar(100)\n  historyId String?   @map(\"history_id\") @db.Char(36)\n  type      String    @db.VarChar(50)\n  content   String    @db.Text\n  thoughts  Json?\n  model     String?   @db.VarChar(100)\n  tokens    Json?\n  toolCalls Json?     @map(\"tool_calls\")\n  agentId   String?   @map(\"agent_id\") @db.VarChar(100)\n  metadata  Json?\n  createdAt DateTime  @default(now()) @map(\"created_at\") @db.Timestamp(0)\n  updatedAt DateTime  @default(now()) @updatedAt @map(\"updated_at\") @db.Timestamp(0)\n  deletedAt DateTime? @map(\"deleted_at\") @db.Timestamp(0)\n\n  // Relations\n  history AiChatHistory? @relation(fields: [historyId], references: [id], onDelete: NoAction)\n\n  @@index([sessionId], map: \"idx_session\")\n  @@index([historyId], map: \"idx_history\")\n  @@index([createdAt], map: \"idx_created\")\n  @@index([deletedAt], map: \"idx_deleted\")\n  @@index([agentId], map: \"idx_agent\")\n  @@index([sessionId, agentId, type, createdAt], map: \"idx_session_agent_type_created\")\n  @@map(\"ai_messages\")\n}\n\n/// Per-session rollup, maintained incrementally by the projector.\nmodel AiChatHistory {\n  id             String    @id @default(cuid()) @db.Char(36)\n  sessionId      String    @map(\"session_id\") @db.VarChar(100)\n  title          String?   @db.VarChar(255)\n  summary        String?   @db.Text\n  messageCount   Int       @default(0) @map(\"message_count\")\n  totalTokens    BigInt    @default(0) @map(\"total_tokens\")\n  firstMessageAt DateTime? @map(\"first_message_at\") @db.Timestamp(6)\n  lastMessageAt  DateTime? @map(\"last_message_at\") @db.Timestamp(6)\n  metadata       Json?\n  deletedAt      DateTime? @map(\"deleted_at\") @db.Timestamp(6)\n\n  // Relations\n  messages AiMessage[]\n\n  @@index([sessionId], map: \"idx_chat_history_session\")\n  @@index([deletedAt], map: \"idx_chat_history_deleted\")\n  @@map(\"ai_chat_histories\")\n}\n",
+    "inlineSchema": "// Prisma schema for the dsh-storage database backend — PostgreSQL variant (Prisma 7).\n//\n// Same models as schema.mysql.prisma, with PostgreSQL native types\n// (`@db.Text` instead of `@db.LongText`, `@db.Timestamp` instead of\n// `@db.DateTime`). Client pre-generation and table creation work as described\n// in schema.mysql.prisma's header.\n\ngenerator client {\n  provider            = \"prisma-client\"\n  output              = \"../src/generated/postgresql\"\n  importFileExtension = \"js\"\n}\n\ndatasource db {\n  provider = \"postgresql\"\n}\n\n/// User and assistant messages; tool results update the assistant row's tool_calls.\nmodel AiMessage {\n  id        String    @id @default(cuid()) @db.Char(36)\n  sessionId String    @map(\"session_id\") @db.VarChar(100)\n  historyId String?   @map(\"history_id\") @db.Char(36)\n  type      String    @db.VarChar(50)\n  content   String    @db.Text\n  thoughts  Json?\n  model     String?   @db.VarChar(100)\n  tokens    Json?\n  toolCalls Json?     @map(\"tool_calls\")\n  agentId   String?   @map(\"agent_id\") @db.VarChar(100)\n  metadata  Json?\n  createdAt DateTime  @default(now()) @map(\"created_at\") @db.Timestamp(0)\n  updatedAt DateTime  @default(now()) @updatedAt @map(\"updated_at\") @db.Timestamp(0)\n  deletedAt DateTime? @map(\"deleted_at\") @db.Timestamp(0)\n\n  // Relations\n  history AiChatHistory? @relation(fields: [historyId], references: [id], onDelete: NoAction)\n\n  @@index([sessionId], map: \"idx_session\")\n  @@index([historyId], map: \"idx_history\")\n  @@index([createdAt], map: \"idx_created\")\n  @@index([deletedAt], map: \"idx_deleted\")\n  @@index([agentId], map: \"idx_agent\")\n  @@index([sessionId, agentId, type, createdAt], map: \"idx_session_agent_type_created\")\n  @@map(\"ai_messages\")\n}\n\n/// Per-session rollup, maintained incrementally by the projector.\nmodel AiChatHistory {\n  id             String    @id @default(cuid()) @db.Char(36)\n  sessionId      String    @map(\"session_id\") @db.VarChar(100)\n  title          String?   @db.VarChar(255)\n  summary        String?   @db.Text\n  messageCount   Int       @default(0) @map(\"message_count\")\n  totalTokens    BigInt    @default(0) @map(\"total_tokens\")\n  firstMessageAt DateTime? @map(\"first_message_at\") @db.Timestamp(6)\n  lastMessageAt  DateTime? @map(\"last_message_at\") @db.Timestamp(6)\n  metadata       Json?\n  deletedAt      DateTime? @map(\"deleted_at\") @db.Timestamp(6)\n\n  // Relations\n  messages AiMessage[]\n\n  @@index([sessionId], map: \"idx_chat_history_session\")\n  @@index([deletedAt], map: \"idx_chat_history_deleted\")\n  @@map(\"ai_chat_histories\")\n}\n",
     "runtimeDataModel": {
         "models": {},
         "enums": {},

package/lib/generated/sqlite/internal/class.js

@@ -15,7 +15,7 @@ const config = {
     "clientVersion": "7.9.1",
     "engineVersion": "e922089b7d7502aff4249d5da3420f6fa55fc6ad",
     "activeProvider": "sqlite",
-    "inlineSchema": "// Prisma schema for the dsh-storage database backend — SQLite variant (Prisma 7).\n//\n// Same models as schema.mysql.prisma, without native type attributes\n// (SQLite has no `@db.*` vocabulary here). Client pre-generation and table\n// creation work as described in schema.mysql.prisma's header. Connection URL\n// shape: file:/absolute/path/to/db.sqlite.\n\ngenerator client {\n  provider            = \"prisma-client\"\n  output              = \"../src/generated/sqlite\"\n  importFileExtension = \"js\"\n}\n\ndatasource db {\n  provider = \"sqlite\"\n}\n\n/// One row per projected session event (user message, assistant message,\n/// tool call/result, compression snapshot, ...).\nmodel AiMessage {\n  id        String    @id @default(cuid())\n  sessionId String    @map(\"session_id\")\n  historyId String?   @map(\"history_id\")\n  type      String\n  content   String\n  thoughts  Json?\n  model     String?\n  tokens    Json?\n  toolCalls Json?     @map(\"tool_calls\")\n  agentId   String?   @map(\"agent_id\")\n  metadata  Json?\n  createdAt DateTime  @default(now()) @map(\"created_at\")\n  updatedAt DateTime  @default(now()) @updatedAt @map(\"updated_at\")\n  deletedAt DateTime? @map(\"deleted_at\")\n\n  // Relations\n  history AiChatHistory? @relation(fields: [historyId], references: [id], onDelete: NoAction)\n\n  @@index([sessionId], map: \"idx_session\")\n  @@index([historyId], map: \"idx_history\")\n  @@index([createdAt], map: \"idx_created\")\n  @@index([deletedAt], map: \"idx_deleted\")\n  @@index([agentId], map: \"idx_agent\")\n  @@index([sessionId, agentId, type, createdAt], map: \"idx_session_agent_type_created\")\n  @@map(\"ai_messages\")\n}\n\n/// Per-session rollup, maintained incrementally by the projector.\nmodel AiChatHistory {\n  id             String    @id @default(cuid())\n  sessionId      String    @map(\"session_id\")\n  title          String?\n  summary        String?\n  messageCount   Int       @default(0) @map(\"message_count\")\n  totalTokens    BigInt    @default(0) @map(\"total_tokens\")\n  firstMessageAt DateTime? @map(\"first_message_at\")\n  lastMessageAt  DateTime? @map(\"last_message_at\")\n  metadata       Json?\n  deletedAt      DateTime? @map(\"deleted_at\")\n\n  // Relations\n  messages AiMessage[]\n\n  @@index([sessionId], map: \"idx_chat_history_session\")\n  @@index([deletedAt], map: \"idx_chat_history_deleted\")\n  @@map(\"ai_chat_histories\")\n}\n",
+    "inlineSchema": "// Prisma schema for the dsh-storage database backend — SQLite variant (Prisma 7).\n//\n// Same models as schema.mysql.prisma, without native type attributes\n// (SQLite has no `@db.*` vocabulary here). Client pre-generation and table\n// creation work as described in schema.mysql.prisma's header. Connection URL\n// shape: file:/absolute/path/to/db.sqlite.\n\ngenerator client {\n  provider            = \"prisma-client\"\n  output              = \"../src/generated/sqlite\"\n  importFileExtension = \"js\"\n}\n\ndatasource db {\n  provider = \"sqlite\"\n}\n\n/// User and assistant messages; tool results update the assistant row's tool_calls.\nmodel AiMessage {\n  id        String    @id @default(cuid())\n  sessionId String    @map(\"session_id\")\n  historyId String?   @map(\"history_id\")\n  type      String\n  content   String\n  thoughts  Json?\n  model     String?\n  tokens    Json?\n  toolCalls Json?     @map(\"tool_calls\")\n  agentId   String?   @map(\"agent_id\")\n  metadata  Json?\n  createdAt DateTime  @default(now()) @map(\"created_at\")\n  updatedAt DateTime  @default(now()) @updatedAt @map(\"updated_at\")\n  deletedAt DateTime? @map(\"deleted_at\")\n\n  // Relations\n  history AiChatHistory? @relation(fields: [historyId], references: [id], onDelete: NoAction)\n\n  @@index([sessionId], map: \"idx_session\")\n  @@index([historyId], map: \"idx_history\")\n  @@index([createdAt], map: \"idx_created\")\n  @@index([deletedAt], map: \"idx_deleted\")\n  @@index([agentId], map: \"idx_agent\")\n  @@index([sessionId, agentId, type, createdAt], map: \"idx_session_agent_type_created\")\n  @@map(\"ai_messages\")\n}\n\n/// Per-session rollup, maintained incrementally by the projector.\nmodel AiChatHistory {\n  id             String    @id @default(cuid())\n  sessionId      String    @map(\"session_id\")\n  title          String?\n  summary        String?\n  messageCount   Int       @default(0) @map(\"message_count\")\n  totalTokens    BigInt    @default(0) @map(\"total_tokens\")\n  firstMessageAt DateTime? @map(\"first_message_at\")\n  lastMessageAt  DateTime? @map(\"last_message_at\")\n  metadata       Json?\n  deletedAt      DateTime? @map(\"deleted_at\")\n\n  // Relations\n  messages AiMessage[]\n\n  @@index([sessionId], map: \"idx_chat_history_session\")\n  @@index([deletedAt], map: \"idx_chat_history_deleted\")\n  @@map(\"ai_chat_histories\")\n}\n",
     "runtimeDataModel": {
         "models": {},
         "enums": {},

package/lib/generated/sqlserver/internal/class.js

@@ -15,7 +15,7 @@ const config = {
     "clientVersion": "7.9.1",
     "engineVersion": "e922089b7d7502aff4249d5da3420f6fa55fc6ad",
     "activeProvider": "sqlserver",
-    "inlineSchema": "// Prisma schema for the dsh-storage database backend — SQL Server variant (Prisma 7).\n//\n// Same models as schema.mysql.prisma, with SQL Server native types. Prisma's\n// sqlserver connector has NO Json type, so every JSON column is a plain text\n// column here — the backend serializes them on write automatically (derived\n// from `provider: sqlserver`; SQL Server's own ISJSON/JSON_VALUE still query\n// the text as JSON).\n//\n// Connection URL shape (parsed by the backend into a node-mssql config):\n//   sqlserver://host:1433;database=dbname;user=sa;password=p;encrypt=true;trustServerCertificate=true\n// Client pre-generation and table creation work as described in\n// schema.mysql.prisma's header.\n\ngenerator client {\n  provider            = \"prisma-client\"\n  output              = \"../src/generated/sqlserver\"\n  importFileExtension = \"js\"\n}\n\ndatasource db {\n  provider = \"sqlserver\"\n}\n\n/// One row per projected session event (user message, assistant message,\n/// tool call/result, compression snapshot, ...).\nmodel AiMessage {\n  id        String    @id @default(cuid()) @db.Char(36)\n  sessionId String    @map(\"session_id\") @db.VarChar(100)\n  historyId String?   @map(\"history_id\") @db.Char(36)\n  type      String    @db.VarChar(50)\n  content   String    @db.NVarChar(Max)\n  thoughts  String?   @db.NVarChar(Max)\n  model     String?   @db.VarChar(100)\n  tokens    String?   @db.NVarChar(Max)\n  toolCalls String?   @map(\"tool_calls\") @db.NVarChar(Max)\n  agentId   String?   @map(\"agent_id\") @db.VarChar(100)\n  metadata  String?   @db.NVarChar(Max)\n  createdAt DateTime  @default(now()) @map(\"created_at\") @db.DateTime2\n  updatedAt DateTime  @default(now()) @updatedAt @map(\"updated_at\") @db.DateTime2\n  deletedAt DateTime? @map(\"deleted_at\") @db.DateTime2\n\n  // Relations\n  history AiChatHistory? @relation(fields: [historyId], references: [id], onDelete: NoAction)\n\n  @@index([sessionId], map: \"idx_session\")\n  @@index([historyId], map: \"idx_history\")\n  @@index([createdAt], map: \"idx_created\")\n  @@index([deletedAt], map: \"idx_deleted\")\n  @@index([agentId], map: \"idx_agent\")\n  @@index([sessionId, agentId, type, createdAt], map: \"idx_session_agent_type_created\")\n  @@map(\"ai_messages\")\n}\n\n/// Per-session rollup, maintained incrementally by the projector.\nmodel AiChatHistory {\n  id             String    @id @default(cuid()) @db.Char(36)\n  sessionId      String    @map(\"session_id\") @db.VarChar(100)\n  title          String?   @db.VarChar(255)\n  summary        String?   @db.NVarChar(Max)\n  messageCount   Int       @default(0) @map(\"message_count\")\n  totalTokens    BigInt    @default(0) @map(\"total_tokens\")\n  firstMessageAt DateTime? @map(\"first_message_at\") @db.DateTime2\n  lastMessageAt  DateTime? @map(\"last_message_at\") @db.DateTime2\n  metadata       String?   @db.NVarChar(Max)\n  deletedAt      DateTime? @map(\"deleted_at\") @db.DateTime2\n\n  // Relations\n  messages AiMessage[]\n\n  @@index([sessionId], map: \"idx_chat_history_session\")\n  @@index([deletedAt], map: \"idx_chat_history_deleted\")\n  @@map(\"ai_chat_histories\")\n}\n",
+    "inlineSchema": "// Prisma schema for the dsh-storage database backend — SQL Server variant (Prisma 7).\n//\n// Same models as schema.mysql.prisma, with SQL Server native types. Prisma's\n// sqlserver connector has NO Json type, so every JSON column is a plain text\n// column here — the backend serializes them on write automatically (derived\n// from `provider: sqlserver`; SQL Server's own ISJSON/JSON_VALUE still query\n// the text as JSON).\n//\n// Connection URL shape (parsed by the backend into a node-mssql config):\n//   sqlserver://host:1433;database=dbname;user=sa;password=p;encrypt=true;trustServerCertificate=true\n// Client pre-generation and table creation work as described in\n// schema.mysql.prisma's header.\n\ngenerator client {\n  provider            = \"prisma-client\"\n  output              = \"../src/generated/sqlserver\"\n  importFileExtension = \"js\"\n}\n\ndatasource db {\n  provider = \"sqlserver\"\n}\n\n/// User and assistant messages; tool results update the assistant row's tool_calls.\nmodel AiMessage {\n  id        String    @id @default(cuid()) @db.Char(36)\n  sessionId String    @map(\"session_id\") @db.VarChar(100)\n  historyId String?   @map(\"history_id\") @db.Char(36)\n  type      String    @db.VarChar(50)\n  content   String    @db.NVarChar(Max)\n  thoughts  String?   @db.NVarChar(Max)\n  model     String?   @db.VarChar(100)\n  tokens    String?   @db.NVarChar(Max)\n  toolCalls String?   @map(\"tool_calls\") @db.NVarChar(Max)\n  agentId   String?   @map(\"agent_id\") @db.VarChar(100)\n  metadata  String?   @db.NVarChar(Max)\n  createdAt DateTime  @default(now()) @map(\"created_at\") @db.DateTime2\n  updatedAt DateTime  @default(now()) @updatedAt @map(\"updated_at\") @db.DateTime2\n  deletedAt DateTime? @map(\"deleted_at\") @db.DateTime2\n\n  // Relations\n  history AiChatHistory? @relation(fields: [historyId], references: [id], onDelete: NoAction)\n\n  @@index([sessionId], map: \"idx_session\")\n  @@index([historyId], map: \"idx_history\")\n  @@index([createdAt], map: \"idx_created\")\n  @@index([deletedAt], map: \"idx_deleted\")\n  @@index([agentId], map: \"idx_agent\")\n  @@index([sessionId, agentId, type, createdAt], map: \"idx_session_agent_type_created\")\n  @@map(\"ai_messages\")\n}\n\n/// Per-session rollup, maintained incrementally by the projector.\nmodel AiChatHistory {\n  id             String    @id @default(cuid()) @db.Char(36)\n  sessionId      String    @map(\"session_id\") @db.VarChar(100)\n  title          String?   @db.VarChar(255)\n  summary        String?   @db.NVarChar(Max)\n  messageCount   Int       @default(0) @map(\"message_count\")\n  totalTokens    BigInt    @default(0) @map(\"total_tokens\")\n  firstMessageAt DateTime? @map(\"first_message_at\") @db.DateTime2\n  lastMessageAt  DateTime? @map(\"last_message_at\") @db.DateTime2\n  metadata       String?   @db.NVarChar(Max)\n  deletedAt      DateTime? @map(\"deleted_at\") @db.DateTime2\n\n  // Relations\n  messages AiMessage[]\n\n  @@index([sessionId], map: \"idx_chat_history_session\")\n  @@index([deletedAt], map: \"idx_chat_history_deleted\")\n  @@map(\"ai_chat_histories\")\n}\n",
     "runtimeDataModel": {
         "models": {},
         "enums": {},

package/lib/index.js

@@ -19,7 +19,7 @@
  */
 import Schema from '@deepseek-ai/schemastery';
 import { DatabaseBackend } from './backends/database.js';
-import { projectEvent, usageSampleOf } from './projector.js';
+import { mergeToolResult, projectEvent, usageSampleOf } from './projector.js';
 export const name = 'dsh-storage';
 // Event-tap only: no hard service dependency. Add 'sessionPersistence' to
 // `inject` if you want fail-fast when persistence is not composed.
@@ -145,11 +145,36 @@ export function apply(ctx, config) {
                 accum = await seedAccum(sessionId);
                 sessions.set(sessionId, accum);
             }
-            const row = projectEvent(session, event, sessionId);
+            let row = projectEvent(session, event, sessionId);
+            const storedRows = row || event?.type === 'tool/result'
+                ? await backends[0].readMessages(sessionId, row?.id)
+                : [];
+            if (event?.type === 'tool/result')
+                row = mergeToolResult(event, storedRows);
+            const existing = row && storedRows.find((stored) => stored.id === row?.id);
+            if (event?.type === 'assistant/message' && row && existing && Array.isArray(row.toolCalls)) {
+                row.toolCalls = row.toolCalls.map((call) => {
+                    const previous = Array.isArray(existing.toolCalls)
+                        ? existing.toolCalls.find((stored) => stored?.id === call?.id)
+                        : undefined;
+                    return previous && 'result' in previous
+                        ? {
+                            ...call,
+                            result: previous.result,
+                            ...(previous.error ? { error: previous.error } : {}),
+                        }
+                        : call;
+                });
+            }
+            if (!row && event?.type === 'tool/result') {
+                console.error('[dsh-storage] no matching model tool call for result');
+            }
             if (row) {
-                accum.messageCount += 1;
-                accum.firstMessageAt ??= row.createdAt;
-                accum.lastMessageAt = row.createdAt;
+                if (!existing && event?.type !== 'tool/result') {
+                    accum.messageCount += 1;
+                    accum.firstMessageAt ??= row.createdAt;
+                    accum.lastMessageAt = row.createdAt;
+                }
                 await fanout((backend) => backend.upsertMessage(row));
             }
             // Replacement usage accounting: the latest sample for a (turn, step)

package/lib/projector.js

@@ -5,8 +5,8 @@
  * (https://deepseek-harness.github.io/deepseek-harness/reference/persistence-catalog)
  * and the @deepseek-ai/dsh-llm message types:
  * - envelope: `{ type, seq, time, data }` — payload lives under `data`.
- * - surface events (the only ones producing LLM messages, and the only ones
- *   projected to rows): `user/message`, `assistant/message`, `tool/result`.
+ * - `user/message` and `assistant/message` produce rows; `tool/result` updates
+ *   the matching assistant row's toolCalls instead of producing a tool row.
  * - token usage (V3 log): `assistant/message.data.usage` is the settled
  *   step's accounting; a failed/cancelled attempt commits `assistant/attempt`
  *   instead, with the adapter's usage chunk preserved as a raw record in its
@@ -30,14 +30,25 @@ function textOf(message) {
     })
         .join('');
 }
-/** Reasoning text of an assistant message, if it carried reasoning blocks. */
-function reasoningOf(message) {
+/** Reasoning blocks of an assistant message, in their original order. */
+function thoughtsOf(message) {
     const blocks = Array.isArray(message?.content) ? message.content : [];
-    const text = blocks
-        .filter((b) => b?.type === 'reasoning')
-        .map((b) => b.text)
-        .join('');
-    return text || undefined;
+    const replay = message?.source?.replayState?.blocks;
+    const thoughts = blocks
+        .map((b, index) => {
+        if (b?.type !== 'reasoning' || !b.text)
+            return null;
+        const metadata = Array.isArray(replay) ? replay[index] : undefined;
+        const signature = metadata?.type === 'reasoning'
+            ? (metadata.signature ?? metadata.thoughtSignature)
+            : undefined;
+        return {
+            content: b.text,
+            ...(typeof signature === 'string' ? { thoughtSignature: signature } : {}),
+        };
+    })
+        .filter((thought) => thought !== null);
+    return thoughts.length ? thoughts : undefined;
 }
 function toolPartsOf(message) {
     const blocks = Array.isArray(message?.content) ? message.content : [];
@@ -76,36 +87,18 @@ export function projectEvent(_session, event, sessionId) {
                 id: message?.id ?? randomUUID(),
                 type: 'model',
                 content: textOf(message),
-                thoughts: reasoningOf(message),
+                thoughts: thoughtsOf(message),
                 model: message?.source?.model ?? undefined,
                 tokens: data.usage ?? undefined,
                 toolCalls: toolPartsOf(message),
                 metadata: {
                     event: event.type,
                     seq: event.seq,
+                    ...(message?.source ? { source: message.source } : {}),
                     ...(data.interrupted ? { interrupted: true } : {}),
                 },
             };
         }
-        case 'tool/result': {
-            const message = data.message;
-            const callId = message?.source?.callId ?? undefined;
-            return {
-                ...base,
-                id: message?.id ?? randomUUID(),
-                type: 'tool',
-                content: textOf(message),
-                toolCalls: [
-                    {
-                        callId,
-                        result: message?.content?.[0] ?? null,
-                        // Internal failure identity, when the call failed.
-                        ...(data.error ? { error: { name: data.error.name, code: data.error.code } } : {}),
-                    },
-                ],
-                metadata: { event: event.type, seq: event.seq, callId },
-            };
-        }
         default:
             // Log-only events (assistant/attempt, turn/step lifecycle, approvals,
             // compaction markers, ...) are not standalone rows; usage rolls up into
@@ -113,6 +106,32 @@ export function projectEvent(_session, event, sessionId) {
             return null;
     }
 }
+/** Update the persisted assistant call identified by a tool result. */
+export function mergeToolResult(event, rows) {
+    const result = event?.data?.message?.content?.[0] ?? null;
+    const callId = event?.data?.message?.source?.callId ?? result?.toolCallId;
+    if (!callId)
+        return null;
+    const model = [...rows]
+        .reverse()
+        .find((row) => row.type === 'model' &&
+        Array.isArray(row.toolCalls) &&
+        row.toolCalls.some((call) => call?.id === callId));
+    if (!model)
+        return null;
+    return {
+        ...model,
+        toolCalls: model.toolCalls.map((call) => call?.id === callId
+            ? {
+                ...call,
+                result,
+                error: event.data.error
+                    ? { name: event.data.error.name, code: event.data.error.code }
+                    : undefined,
+            }
+            : call),
+    };
+}
 /**
  * Extract the usage sample carried by one event, keyed by its step, or null
  * when the event carries none.

package/lib/types/backends/database.d.ts

@@ -31,6 +31,7 @@ export declare class DatabaseBackend implements StorageBackend {
     private jsonField;
     private toDbData;
     upsertMessage(row: MessageRow): Promise<void>;
+    readMessages(sessionId: string, messageId?: string): Promise<MessageRow[]>;
     readSession(sessionId: string): Promise<SessionRow | null>;
     upsertSession(row: SessionRow): Promise<void>;
     close(): Promise<void>;

package/lib/types/generated/mysql/browser.d.ts

@@ -4,8 +4,7 @@ export * as $Enums from './enums.js';
 export * from './enums.js';
 /**
  * Model AiMessage
- * One row per projected session event (user message, assistant message,
- * tool call/result, compression snapshot, ...).
+ * User and assistant messages; tool results update the assistant row's tool_calls.
  */
 export type AiMessage = Prisma.AiMessageModel;
 /**

package/lib/types/generated/mysql/client.d.ts

@@ -23,8 +23,7 @@ export type PrismaClient<LogOpts extends Prisma.LogLevel = never, OmitOpts exten
 export { Prisma };
 /**
  * Model AiMessage
- * One row per projected session event (user message, assistant message,
- * tool call/result, compression snapshot, ...).
+ * User and assistant messages; tool results update the assistant row's tool_calls.
  */
 export type AiMessage = Prisma.AiMessageModel;
 /**

package/lib/types/generated/mysql/models/AiMessage.d.ts

@@ -2,8 +2,7 @@ import type * as runtime from "@prisma/client/runtime/client";
 import type * as Prisma from "../internal/prismaNamespace.js";
 /**
  * Model AiMessage
- * One row per projected session event (user message, assistant message,
- * tool call/result, compression snapshot, ...).
+ * User and assistant messages; tool results update the assistant row's tool_calls.
  */
 export type AiMessageModel = runtime.Types.Result.DefaultSelection<Prisma.$AiMessagePayload>;
 export type AggregateAiMessage = {

package/lib/types/generated/postgresql/browser.d.ts

@@ -4,8 +4,7 @@ export * as $Enums from './enums.js';
 export * from './enums.js';
 /**
  * Model AiMessage
- * One row per projected session event (user message, assistant message,
- * tool call/result, compression snapshot, ...).
+ * User and assistant messages; tool results update the assistant row's tool_calls.
  */
 export type AiMessage = Prisma.AiMessageModel;
 /**

package/lib/types/generated/postgresql/client.d.ts

@@ -23,8 +23,7 @@ export type PrismaClient<LogOpts extends Prisma.LogLevel = never, OmitOpts exten
 export { Prisma };
 /**
  * Model AiMessage
- * One row per projected session event (user message, assistant message,
- * tool call/result, compression snapshot, ...).
+ * User and assistant messages; tool results update the assistant row's tool_calls.
  */
 export type AiMessage = Prisma.AiMessageModel;
 /**

package/lib/types/generated/postgresql/models/AiMessage.d.ts

@@ -2,8 +2,7 @@ import type * as runtime from "@prisma/client/runtime/client";
 import type * as Prisma from "../internal/prismaNamespace.js";
 /**
  * Model AiMessage
- * One row per projected session event (user message, assistant message,
- * tool call/result, compression snapshot, ...).
+ * User and assistant messages; tool results update the assistant row's tool_calls.
  */
 export type AiMessageModel = runtime.Types.Result.DefaultSelection<Prisma.$AiMessagePayload>;
 export type AggregateAiMessage = {

package/lib/types/generated/sqlite/browser.d.ts

@@ -4,8 +4,7 @@ export * as $Enums from './enums.js';
 export * from './enums.js';
 /**
  * Model AiMessage
- * One row per projected session event (user message, assistant message,
- * tool call/result, compression snapshot, ...).
+ * User and assistant messages; tool results update the assistant row's tool_calls.
  */
 export type AiMessage = Prisma.AiMessageModel;
 /**

package/lib/types/generated/sqlite/client.d.ts

@@ -23,8 +23,7 @@ export type PrismaClient<LogOpts extends Prisma.LogLevel = never, OmitOpts exten
 export { Prisma };
 /**
  * Model AiMessage
- * One row per projected session event (user message, assistant message,
- * tool call/result, compression snapshot, ...).
+ * User and assistant messages; tool results update the assistant row's tool_calls.
  */
 export type AiMessage = Prisma.AiMessageModel;
 /**

package/lib/types/generated/sqlite/models/AiMessage.d.ts

@@ -2,8 +2,7 @@ import type * as runtime from "@prisma/client/runtime/client";
 import type * as Prisma from "../internal/prismaNamespace.js";
 /**
  * Model AiMessage
- * One row per projected session event (user message, assistant message,
- * tool call/result, compression snapshot, ...).
+ * User and assistant messages; tool results update the assistant row's tool_calls.
  */
 export type AiMessageModel = runtime.Types.Result.DefaultSelection<Prisma.$AiMessagePayload>;
 export type AggregateAiMessage = {

package/lib/types/generated/sqlserver/browser.d.ts

@@ -4,8 +4,7 @@ export * as $Enums from './enums.js';
 export * from './enums.js';
 /**
  * Model AiMessage
- * One row per projected session event (user message, assistant message,
- * tool call/result, compression snapshot, ...).
+ * User and assistant messages; tool results update the assistant row's tool_calls.
  */
 export type AiMessage = Prisma.AiMessageModel;
 /**

package/lib/types/generated/sqlserver/client.d.ts

@@ -23,8 +23,7 @@ export type PrismaClient<LogOpts extends Prisma.LogLevel = never, OmitOpts exten
 export { Prisma };
 /**
  * Model AiMessage
- * One row per projected session event (user message, assistant message,
- * tool call/result, compression snapshot, ...).
+ * User and assistant messages; tool results update the assistant row's tool_calls.
  */
 export type AiMessage = Prisma.AiMessageModel;
 /**

package/lib/types/generated/sqlserver/models/AiMessage.d.ts

@@ -2,8 +2,7 @@ import type * as runtime from "@prisma/client/runtime/client";
 import type * as Prisma from "../internal/prismaNamespace.js";
 /**
  * Model AiMessage
- * One row per projected session event (user message, assistant message,
- * tool call/result, compression snapshot, ...).
+ * User and assistant messages; tool results update the assistant row's tool_calls.
  */
 export type AiMessageModel = runtime.Types.Result.DefaultSelection<Prisma.$AiMessagePayload>;
 export type AggregateAiMessage = {

package/lib/types/projector.d.ts

@@ -5,8 +5,8 @@
  * (https://deepseek-harness.github.io/deepseek-harness/reference/persistence-catalog)
  * and the @deepseek-ai/dsh-llm message types:
  * - envelope: `{ type, seq, time, data }` — payload lives under `data`.
- * - surface events (the only ones producing LLM messages, and the only ones
- *   projected to rows): `user/message`, `assistant/message`, `tool/result`.
+ * - `user/message` and `assistant/message` produce rows; `tool/result` updates
+ *   the matching assistant row's toolCalls instead of producing a tool row.
  * - token usage (V3 log): `assistant/message.data.usage` is the settled
  *   step's accounting; a failed/cancelled attempt commits `assistant/attempt`
  *   instead, with the adapter's usage chunk preserved as a raw record in its
@@ -22,6 +22,8 @@ import type { MessageRow } from './types.js';
  * turn/step lifecycle, approvals, ...).
  */
 export declare function projectEvent(_session: any, event: any, sessionId: string): MessageRow | null;
+/** Update the persisted assistant call identified by a tool result. */
+export declare function mergeToolResult(event: any, rows: MessageRow[]): MessageRow | null;
 export interface UsageSample {
     input: number;
     output: number;

package/lib/types/types.d.ts

@@ -43,6 +43,8 @@ export interface StorageBackend {
     init?(): Promise<void>;
     /** Read the stored session row, for seeding the live rollup on resume. */
     readSession?(sessionId: string): Promise<SessionRow | null>;
+    /** Read persisted messages, optionally narrowing to one logical message ID. */
+    readMessages(sessionId: string, messageId?: string): Promise<MessageRow[]>;
     upsertMessage(row: MessageRow): Promise<void>;
     upsertSession(row: SessionRow): Promise<void>;
     close?(): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amaster.ai/dsh-storage",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Session storage mirror for DeepSeek Harness: projects the session event stream into MySQL/PostgreSQL/SQLite/SQL Server (ai_messages / ai_chat_histories) without replacing dsh's local persistence.",
   "type": "module",
   "main": "lib/index.js",

package/prisma/schema.mysql.prisma

@@ -23,8 +23,7 @@ datasource db {
   provider = "mysql"
 }
 
-/// One row per projected session event (user message, assistant message,
-/// tool call/result, compression snapshot, ...).
+/// User and assistant messages; tool results update the assistant row's tool_calls.
 model AiMessage {
   id            String    @id @default(cuid()) @db.Char(36)
   sessionId     String    @map("session_id") @db.VarChar(100)

package/prisma/schema.postgresql.prisma

@@ -15,8 +15,7 @@ datasource db {
   provider = "postgresql"
 }
 
-/// One row per projected session event (user message, assistant message,
-/// tool call/result, compression snapshot, ...).
+/// User and assistant messages; tool results update the assistant row's tool_calls.
 model AiMessage {
   id            String    @id @default(cuid()) @db.Char(36)
   sessionId     String    @map("session_id") @db.VarChar(100)

package/prisma/schema.sqlite.prisma

@@ -15,8 +15,7 @@ datasource db {
   provider = "sqlite"
 }
 
-/// One row per projected session event (user message, assistant message,
-/// tool call/result, compression snapshot, ...).
+/// User and assistant messages; tool results update the assistant row's tool_calls.
 model AiMessage {
   id            String    @id @default(cuid())
   sessionId     String    @map("session_id")

package/prisma/schema.sqlserver.prisma

@@ -21,8 +21,7 @@ datasource db {
   provider = "sqlserver"
 }
 
-/// One row per projected session event (user message, assistant message,
-/// tool call/result, compression snapshot, ...).
+/// User and assistant messages; tool results update the assistant row's tool_calls.
 model AiMessage {
   id            String    @id @default(cuid()) @db.Char(36)
   sessionId     String    @map("session_id") @db.VarChar(100)