@amaster.ai/dsh-storage 0.1.1 → 0.1.2

package/lib/index.js

@@ -48,7 +48,7 @@ export function apply(ctx, config) {
     // Lifecycle: this cordis fork has no 'ready'/'dispose' events — startup
     // work goes in ctx.effect() (runs immediately at plugin load; the returned
     // disposer runs on fiber unload at shutdown). Event taps verified against
-    // @deepseek-ai/dsh-session@0.1.2-rc.1: session/event(session, event),
+    // @deepseek-ai/dsh-session@0.1.5-rc.1: session/event(session, event),
     // session/disposed(session), and the awaited session/flush(session)
     // durability checkpoint. The cast stays because the dsh-session types that
     // declare these event names are not installed.
@@ -171,7 +171,7 @@ export function apply(ctx, config) {
                 }
             }
             // Latest-wins title snapshot (log-only `session/title` event; payload
-            // { title, messageSeqs, source } verified against dsh-session-title@0.1.2-rc.1).
+            // { title, messageSeqs, source } verified against dsh-session-title@0.1.5-rc.1).
             if (event?.type === 'session/title' && typeof event.data?.title === 'string') {
                 accum.title = event.data.title;
             }

package/lib/projector.js

@@ -7,10 +7,11 @@
  * - 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`.
- * - token usage: `assistant/chunk` `{ type: 'usage' }` is authoritative per
- *   step; `assistant/message`'s `data.usage` only counts when no usage chunk
- *   was seen for the step (dedup in usageOf). `turn/end` carries none — it
- *   only serves as a rollup checkpoint.
+ * - 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
+ *   embedded compact stream (recovered in usageSampleOf). `turn/end` carries
+ *   none — it only serves as a rollup checkpoint.
  * - compaction summaries enter the surface as a `user/message` with
  *   `surfaceOp: replace`, so they flow through the user path unchanged.
  */
@@ -106,9 +107,9 @@ export function projectEvent(_session, event, sessionId) {
             };
         }
         default:
-            // Log-only events (assistant/chunk, turn/step lifecycle, approvals,
+            // Log-only events (assistant/attempt, turn/step lifecycle, approvals,
             // compaction markers, ...) are not standalone rows; usage rolls up into
-            // SessionRow via usageOf (usage chunks and assistant/message).
+            // SessionRow via usageSampleOf (assistant/message and assistant/attempt).
             return null;
     }
 }
@@ -116,17 +117,17 @@ export function projectEvent(_session, event, sessionId) {
  * Extract the usage sample carried by one event, keyed by its step, or null
  * when the event carries none.
  *
- * dsh-llm emits usage as:
- * - `assistant/chunk` with `chunk.type === 'usage'` — the step's accounting,
- *   emitted even when the request later fails (a failed step produces no
- *   assistant/message, so message-only accounting would miss it entirely);
- * - `assistant/message.data.usage` — the same step's final accounting.
+ * V3 session log (dsh-session@0.1.5-rc.1):
+ * - `assistant/message.data.usage` — the settled step's final accounting;
+ * - `assistant/attempt` — a failed/retried/cancelled step commits no surface
+ *   message; the adapter's usage chunk survives as a raw `chunk` record in the
+ *   embedded compact `stream` (deltas are packed, but usage is a raw type).
  *
  * Samples for one `(turn, step)` are REPLACEMENTS, not additive: later
- * samples supersede earlier ones (progressive chunks, then the message).
- * The caller keeps the latest sample per step and folds only the delta into
- * its rollup. Totals include the cache buckets: cacheRead/cacheWrite are
- * billed in their own buckets (observed cacheReadTokens ≫ inputTokens in
+ * samples supersede earlier ones (a failed attempt's usage, then the settled
+ * message's). The caller keeps the latest sample per step and folds only the
+ * delta into its rollup. Totals include the cache buckets: cacheRead/cacheWrite
+ * are billed in their own buckets (observed cacheReadTokens ≫ inputTokens in
  * dsh session logs — they are not subsets of inputTokens).
  */
 export function usageSampleOf(event) {
@@ -136,13 +137,13 @@ export function usageSampleOf(event) {
     });
     let data;
     let usage;
-    if (event?.type === 'assistant/chunk' && event.data?.chunk?.type === 'usage') {
+    if (event?.type === 'assistant/message') {
         data = event.data;
-        usage = data.chunk.usage;
+        usage = data?.usage;
     }
-    else if (event?.type === 'assistant/message') {
+    else if (event?.type === 'assistant/attempt') {
         data = event.data;
-        usage = data?.usage;
+        usage = (Array.isArray(data?.stream) ? data.stream : []).find((r) => r?.type === 'chunk' && r.chunk?.type === 'usage')?.chunk?.usage;
     }
     else {
         return null;

package/lib/types/projector.d.ts

@@ -7,10 +7,11 @@
  * - 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`.
- * - token usage: `assistant/chunk` `{ type: 'usage' }` is authoritative per
- *   step; `assistant/message`'s `data.usage` only counts when no usage chunk
- *   was seen for the step (dedup in usageOf). `turn/end` carries none — it
- *   only serves as a rollup checkpoint.
+ * - 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
+ *   embedded compact stream (recovered in usageSampleOf). `turn/end` carries
+ *   none — it only serves as a rollup checkpoint.
  * - compaction summaries enter the surface as a `user/message` with
  *   `surfaceOp: replace`, so they flow through the user path unchanged.
  */
@@ -29,17 +30,17 @@ export interface UsageSample {
  * Extract the usage sample carried by one event, keyed by its step, or null
  * when the event carries none.
  *
- * dsh-llm emits usage as:
- * - `assistant/chunk` with `chunk.type === 'usage'` — the step's accounting,
- *   emitted even when the request later fails (a failed step produces no
- *   assistant/message, so message-only accounting would miss it entirely);
- * - `assistant/message.data.usage` — the same step's final accounting.
+ * V3 session log (dsh-session@0.1.5-rc.1):
+ * - `assistant/message.data.usage` — the settled step's final accounting;
+ * - `assistant/attempt` — a failed/retried/cancelled step commits no surface
+ *   message; the adapter's usage chunk survives as a raw `chunk` record in the
+ *   embedded compact `stream` (deltas are packed, but usage is a raw type).
  *
  * Samples for one `(turn, step)` are REPLACEMENTS, not additive: later
- * samples supersede earlier ones (progressive chunks, then the message).
- * The caller keeps the latest sample per step and folds only the delta into
- * its rollup. Totals include the cache buckets: cacheRead/cacheWrite are
- * billed in their own buckets (observed cacheReadTokens ≫ inputTokens in
+ * samples supersede earlier ones (a failed attempt's usage, then the settled
+ * message's). The caller keeps the latest sample per step and folds only the
+ * delta into its rollup. Totals include the cache buckets: cacheRead/cacheWrite
+ * are billed in their own buckets (observed cacheReadTokens ≫ inputTokens in
  * dsh session logs — they are not subsets of inputTokens).
  */
 export declare function usageSampleOf(event: any): {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amaster.ai/dsh-storage",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "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",
@@ -37,7 +37,7 @@
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
-    "@deepseek-ai/dsh-session": "0.1.2-rc.1",
+    "@deepseek-ai/dsh-session": "0.1.5-rc.1",
     "@prisma/adapter-libsql": "^7.9.1",
     "@prisma/adapter-mariadb": "^7.9.1",
     "@prisma/adapter-mssql": "^7.9.1",