dsh-observe 0.2.9 → 0.2.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -5,6 +5,33 @@ All notable changes to this project are documented in this file.
5
5
  The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
6
6
  and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
7
7
 
8
+ ## [0.2.11] - 2026-09-10
9
+
10
+ ### Changed
11
+
12
+ - Pin the `@deepseek-ai/dsh-*` dev/test dependencies to the published `0.1.5-rc.1` line and record `0.1.5-rc.1` in `dshWorkshop.compatibility.dshVersions`; the monthly Compat workflow now runs against `0.1.5-rc.1`. The peer range `>=0.1.2-rc.1 <0.2.0 || >=0.1.5-alpha.1 <0.2.0` is unchanged, so no supported host line is dropped.
13
+
14
+ ### Docs
15
+
16
+ - Refresh the five-language README compatibility baseline to `dsh-v0.1.5-rc.1` (verified 2026-09-10).
17
+
18
+
19
+ ## [0.2.10] - 2026-09-09
20
+
21
+ ### Fixed
22
+
23
+ - Adapt the collector to the host 0.1.5 session event vocabulary: `assistant/chunk` was removed from `SessionEventMap` (host commit `f99b06eaed`) and `EpochHeader.system` was removed (host commit `ee956c720d`). Finish reason and first-token timing now come from the required `assistant/message.stream` and the new `assistant/attempt.stream`; the system prompt is read from surface node 0 (`system/message`) instead of the header. The published `0.1.2-rc.1` runtime line keeps working through structural reads of the legacy `assistant/chunk` events and the legacy `header.system` field.
24
+ - Read `assistant/attempt.stream`, so a failed, cancelled, or stream-errored attempt that commits no message still contributes the dangling LLM span's finish reason instead of leaving it empty.
25
+
26
+ ### Changed
27
+
28
+ - Pin the devDependencies and the CI/compat probes to `@deepseek-ai/dsh@0.1.5-alpha.1`; the peer range stays the composite `>=0.1.2-rc.1 <0.2.0 || >=0.1.5-alpha.1 <0.2.0`, and `dshWorkshop.compatibility.dshVersions` lists both baselines.
29
+ - Rewrite the collector fixtures to the V3 event shapes (embedded streams, `system/message` as surface node 0) and add coverage for the legacy rc.1 chunk fallback and the failed-attempt stream: 124 tests across 18 suites.
30
+
31
+ ### Docs
32
+
33
+ - Refresh the five-language README compatibility sections: harness `dsh-v0.1.5-alpha.1` verified 2026-09-09, devDeps `0.1.5-alpha.1`, the composite peer range, and the corrected typecheck/test-count lines; align AGENTS.md with the 0.1.5 seams.
34
+
8
35
  ## [0.2.9] - 2026-09-07
9
36
 
10
37
  ### Docs
package/README.es.md CHANGED
@@ -9,6 +9,7 @@
9
9
 
10
10
  [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](LICENSE)
11
11
  [![DSH plugin](https://img.shields.io/badge/dsh--plugin-✅-green)](https://github.com/topics/dsh-plugin)
12
+ [![dsh-doctor](https://raw.githubusercontent.com/PerryLink/dsh-plugin-doctor/main/badges/PerryLink__dsh-observe.svg)](https://github.com/PerryLink/dsh-plugin-doctor#verified-徽章)
12
13
  [![Node](https://img.shields.io/badge/node-%5E22.19%20%7C%7C%20%3E%3D24-brightgreen.svg)](#)
13
14
  [![CI](https://img.shields.io/github/actions/workflow/status/PerryLink/dsh-observe/ci.yml?branch=main&label=CI)](https://github.com/PerryLink/dsh-observe/actions)
14
15
  [![Version](https://img.shields.io/github/v/tag/PerryLink/dsh-observe?label=version)](https://github.com/PerryLink/dsh-observe/releases)
@@ -25,7 +26,7 @@
25
26
 
26
27
  | Superficie | Estado |
27
28
  |---|---|
28
- | Harness | DeepSeek Harness `dsh-v0.1.3-alpha.1` (adaptado el 2026-09-02): el sobre de sesión conserva su campo ignorable solo para compatibilidad de lectura de logs almacenados - Session.append aún no puede estamparlo, por lo que el comportamiento de la puerta no cambia. Verificado el 2026-09-06 contra el master checkout dsh-v0.1.3-alpha.1 (cadena completa de puertas + smoke de instalación de perfil). |
29
+ | Harness | DeepSeek Harness `dsh-v0.1.5-rc.1` (adaptado el 2026-09-09): el formato de sesión V3 incorpora el flujo del asistente en `assistant/message` / `assistant/attempt` y representa el prompt de sistema como nodo 0 de la superficie (`system/message`); el plugin consume solo el flujo de eventos en vivo y nunca lee archivos de log de sesión. Verificado el 2026-09-10 contra el tag dsh-v0.1.5-rc.1 (cadena completa de puertas local; el workflow compat mensual cubre el smoke de instalación de perfil). |
29
30
  | Node | `^22.19.0 \|\| >=24.0.0` |
30
31
  | Backends | OpenTelemetry OTLP/HTTP (traces + metrics, codificación JSON) y Langfuse (observabilidad de LLM) — uno o ambos |
31
32
  | Modelo | Independiente del modelo: exporta el flujo `session/event`; no realiza llamadas a modelos |
@@ -165,11 +166,11 @@ Este plugin **no registra herramientas de modelo** — es un exportador en segun
165
166
  - **Sanear antes de enviar** — redacción estructural de claves, patrones de secretos integrados (claves de API, tokens de GitHub, claves de AWS, credenciales bearer, claves privadas), tus patrones y presupuestos de caracteres se aplican antes de que un registro salga de memoria.
166
167
  - **Re-validación en el límite duradero** — los registros leídos del almacenamiento se comprueban de nuevo antes de que un sink pueda verlos.
167
168
  - **Fallo ruidoso, fallo contenido** — los fallos de exportación avisan, cuentan, reintentan y finalmente se guardan en el spool; un manejador de sesión que falla se captura y registra, de modo que la observabilidad nunca puede romper la ruta caliente del harness.
168
- - **Model-visible ⟺ logged** — las exportaciones de prompt/completion proyectan solo la cabecera registrada y la superficie de sesión; el exportador no inventa contenido.
169
+ - **Model-visible ⟺ logged** — las exportaciones de prompt/completion proyectan solo la superficie de sesión (cuyo nodo 0 es el prompt de sistema) y la cabecera registrada (configuración de llamada y herramientas); el exportador no inventa contenido.
169
170
 
170
171
  ## Known limitations
171
172
 
172
- - **npm 0.1.2-rc.1** — el plugin se desarrolla y prueba contra `@deepseek-ai/dsh@0.1.2-rc.1`; se espera que baselines más nuevos funcionen y el workflow compat mensual los verifica.
173
+ - **npm 0.1.5-rc.1** — el plugin se desarrolla y prueba contra `@deepseek-ai/dsh@0.1.5-rc.1` (devDeps y CI fijados); el rango de peers `>=0.1.2-rc.1 <0.2.0 || >=0.1.5-alpha.1 <0.2.0` mantiene instalable la línea rc.1 publicada, y el workflow compat mensual cubre baselines más nuevos.
173
174
  - **Las métricas evitan la ruta de reintento/spool** — las métricas OTLP se agregan de forma acumulativa, así que un flush perdido se autocura en el siguiente (por diseño, no es un fallo).
174
175
  - **Sin muestreo** — toda familia de spans habilitada se exporta; ajusta los interruptores `capture.*` y `batch.maxBufferRecords` para sesiones de alto volumen.
175
176
 
@@ -177,9 +178,9 @@ Este plugin **no registra herramientas de modelo** — es un exportador en segun
177
178
 
178
179
  ```sh
179
180
  pnpm install # node ^22.19 || >=24
180
- pnpm run typecheck # tsc: src + tests contra el checkout local del harness
181
- pnpm run typecheck:ci # tsc contra los tipos publicados 0.1.2-rc.1 (sin paths)
182
- pnpm test # vitest: 114 tests, 18 suites (Context/Session/storage seam reales)
181
+ pnpm run typecheck # tsc: src + tests contra los devDeps fijados 0.1.5-rc.1 (sin tsconfig paths)
182
+ pnpm run typecheck:ci # tsc contra los tipos publicados 0.1.5-rc.1 (sin paths)
183
+ pnpm test # vitest: 124 tests, 18 suites (Context/Session/storage seam reales)
183
184
  pnpm run test:coverage # puerta de cobertura (90/80/90/90)
184
185
  pnpm run build # bundle tsdown + declaraciones tsc (lib/)
185
186
  pnpm run verify:self-contained # las especificaciones de dependencias resuelven desde el registry
package/README.hi.md CHANGED
@@ -9,6 +9,7 @@
9
9
 
10
10
  [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](LICENSE)
11
11
  [![DSH plugin](https://img.shields.io/badge/dsh--plugin-✅-green)](https://github.com/topics/dsh-plugin)
12
+ [![dsh-doctor](https://raw.githubusercontent.com/PerryLink/dsh-plugin-doctor/main/badges/PerryLink__dsh-observe.svg)](https://github.com/PerryLink/dsh-plugin-doctor#verified-徽章)
12
13
  [![Node](https://img.shields.io/badge/node-%5E22.19%20%7C%7C%20%3E%3D24-brightgreen.svg)](#)
13
14
  [![CI](https://img.shields.io/github/actions/workflow/status/PerryLink/dsh-observe/ci.yml?branch=main&label=CI)](https://github.com/PerryLink/dsh-observe/actions)
14
15
  [![Version](https://img.shields.io/github/v/tag/PerryLink/dsh-observe?label=version)](https://github.com/PerryLink/dsh-observe/releases)
@@ -25,7 +26,7 @@
25
26
 
26
27
  | सतह | स्थिति |
27
28
  |---|---|
28
- | Harness | DeepSeek Harness `dsh-v0.1.3-alpha.1` (2026-09-02 को अनुकूलित): सत्र लिफ़ाफ़ा अपना ignorable फ़ील्ड केवल संग्रहीत-लॉग पठन संगतता के लिए रखता है - Session.append अभी भी इसे स्टैम्प नहीं कर सकता, इसलिए गेट व्यवहार अपरिवर्तित है। 2026-09-06 को dsh-v0.1.3-alpha.1 master checkout के विरुद्ध सत्यापित (पूर्ण गेट श्रृंखला + प्रोफ़ाइल इंस्टॉल स्मोक)। |
29
+ | Harness | DeepSeek Harness `dsh-v0.1.5-rc.1` (2026-09-09 को अनुकूलित): सत्र प्रारूप V3 सहायक स्ट्रीम को `assistant/message` / `assistant/attempt` में एम्बेड करता है और सिस्टम प्रॉम्प्ट को सरफ़ेस नोड 0 (`system/message`) के रूप में रखता है; प्लगइन केवल लाइव इवेंट स्ट्रीम पढ़ता है और कभी सत्र लॉग फ़ाइलें नहीं पढ़ता। 2026-09-10 को dsh-v0.1.5-rc.1 tag के विरुद्ध सत्यापित (स्थानीय पूर्ण गेट श्रृंखला; प्रोफ़ाइल इंस्टॉल स्मोक मासिक compat वर्कफ़्लो कवर करता है)। |
29
30
  | Node | `^22.19.0 \|\| >=24.0.0` |
30
31
  | बैकएंड | OpenTelemetry OTLP/HTTP (traces + metrics, JSON एन्कोडिंग) और Langfuse (LLM ऑब्ज़र्वेबिलिटी) — एक या दोनों |
31
32
  | मॉडल | मॉडल-स्वतंत्र: यह `session/event` स्ट्रीम निर्यात करता है; कोई मॉडल कॉल नहीं करता |
@@ -165,11 +166,11 @@ dsh --profile web --dump-config | grep -A2 'id: dsh-observe'
165
166
  - **भेजने से पहले सैनिटाइज़** — संरचनात्मक कुंजी रिडैक्शन, अंतर्निहित गुप्त पैटर्न (API कुंजियाँ, GitHub टोकन, AWS कुंजियाँ, bearer क्रेडेंशियल, निजी कुंजियाँ), आपके पैटर्न और वर्ण बजट सभी किसी भी रिकॉर्ड के मेमोरी छोड़ने से पहले लागू होते हैं।
166
167
  - **टिकाऊ सीमा पर पुनः सत्यापन** — स्टोरेज से पढ़े रिकॉर्ड किसी sink के देखने से पहले फिर जाँचे जाते हैं।
167
168
  - **विफलता ज़ोर से, विफलता सीमित** — निर्यात विफलताएँ चेतावनी देती हैं, गिनती करती हैं, पुनर्प्रयास करती हैं और अंत में spool में जाती हैं; विफल सत्र हैंडलर पकड़ा और लॉग होता है, इसलिए ऑब्ज़र्वेबिलिटी कभी हार्नेस का हॉट पाथ नहीं तोड़ सकती।
168
- - **Model-visible ⟺ logged** — prompt/completion निर्यात केवल लॉग किए हेडर और सत्र सतह को प्रोजेक्ट करते हैं; निर्यातक कोई सामग्री नहीं गढ़ता।
169
+ - **Model-visible ⟺ logged** — prompt/completion निर्यात केवल सत्र सरफ़ेस (जिसका नोड 0 सिस्टम प्रॉम्प्ट है) और लॉग किए हेडर (कॉल कॉन्फ़िग और टूल्स) को प्रोजेक्ट करते हैं; निर्यातक कोई सामग्री नहीं गढ़ता।
169
170
 
170
171
  ## Known limitations
171
172
 
172
- - **npm 0.1.2-rc.1** — प्लगइन `@deepseek-ai/dsh@0.1.2-rc.1` के विरुद्ध विकसित और परीक्षित है; नए हार्नेस बेसलाइन काम करने चाहिए और मासिक compat वर्कफ़्लो उन्हें सत्यापित करता है।
173
+ - **npm 0.1.5-rc.1** — प्लगइन `@deepseek-ai/dsh@0.1.5-rc.1` के विरुद्ध विकसित और परीक्षित है (devDeps और CI इसी पर पिन); peer रेंज `>=0.1.2-rc.1 <0.2.0 || >=0.1.5-alpha.1 <0.2.0` प्रकाशित rc.1 लाइन को इंस्टॉल-योग्य रखती है, और मासिक compat वर्कफ़्लो नए बेसलाइन कवर करता है।
173
174
  - **मेट्रिक्स पुनर्प्रयास/spool पथ से बचती हैं** — OTLP मेट्रिक्स संचयी रूप से एकत्र होती हैं, इसलिए खोया flush अगले में स्वयं-सुधर जाता है (डिज़ाइन से, बग नहीं)।
174
175
  - **कोई सैंपलिंग नहीं** — हर सक्षम span परिवार निर्यात होता है; उच्च-मात्रा सत्रों के लिए `capture.*` स्विच और `batch.maxBufferRecords` समायोजित करें।
175
176
 
@@ -177,9 +178,9 @@ dsh --profile web --dump-config | grep -A2 'id: dsh-observe'
177
178
 
178
179
  ```sh
179
180
  pnpm install # node ^22.19 || >=24
180
- pnpm run typecheck # tsc: src + tests स्थानीय हार्नेस चेकआउट के विरुद्ध
181
- pnpm run typecheck:ci # tsc प्रकाशित 0.1.2-rc.1 प्रकारों के विरुद्ध (बिना paths)
182
- pnpm test # vitest: 95 टेस्ट, 13 सुइट (वास्तविक Context/Session/storage seam)
181
+ pnpm run typecheck # tsc: src + tests पिन किए 0.1.5-rc.1 devDeps के विरुद्ध (कोई tsconfig paths नहीं)
182
+ pnpm run typecheck:ci # tsc प्रकाशित 0.1.5-rc.1 प्रकारों के विरुद्ध (बिना paths)
183
+ pnpm test # vitest: 124 टेस्ट, 18 सुइट (वास्तविक Context/Session/storage seam)
183
184
  pnpm run test:coverage # कवरेज द्वार (90/80/90/90)
184
185
  pnpm run build # tsdown बंडल + tsc घोषणाएँ (lib/)
185
186
  pnpm run verify:self-contained # निर्भरता स्पेक registry से हल होती हैं
package/README.md CHANGED
@@ -10,6 +10,7 @@
10
10
 
11
11
  [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](LICENSE)
12
12
  [![DSH plugin](https://img.shields.io/badge/dsh--plugin-✅-green)](https://github.com/topics/dsh-plugin)
13
+ [![dsh-doctor](https://raw.githubusercontent.com/PerryLink/dsh-plugin-doctor/main/badges/PerryLink__dsh-observe.svg)](https://github.com/PerryLink/dsh-plugin-doctor#verified-徽章)
13
14
  [![Node](https://img.shields.io/badge/node-%5E22.19%20%7C%7C%20%3E%3D24-brightgreen.svg)](#)
14
15
  [![CI](https://img.shields.io/github/actions/workflow/status/PerryLink/dsh-observe/ci.yml?branch=main&label=CI)](https://github.com/PerryLink/dsh-observe/actions)
15
16
  [![Version](https://img.shields.io/github/v/tag/PerryLink/dsh-observe?label=version)](https://github.com/PerryLink/dsh-observe/releases)
@@ -26,7 +27,7 @@
26
27
 
27
28
  | Surface | Status |
28
29
  |---|---|
29
- | Harness | DeepSeek Harness `dsh-v0.1.3-alpha.1` (adapted 2026-09-02): the session envelope keeps its ignorable field for stored-log read compatibility only - Session.append still cannot stamp it, so audit-gate behavior is unchanged. Verified 2026-09-06 against the dsh-v0.1.3-alpha.1 master checkout (full gate chain + profile install smoke). |
30
+ | Harness | DeepSeek Harness `dsh-v0.1.5-rc.1` (adapted 2026-09-09): session format V3 embeds the assistant stream in `assistant/message` / `assistant/attempt` and represents the system prompt as surface node 0 (`system/message`); the plugin consumes only the live event stream and never reads session log files. Verified 2026-09-10 against the dsh-v0.1.5-rc.1 tag (full local gate chain; the monthly compat workflow covers the profile install smoke). |
30
31
  | Node | `^22.19.0 \|\| >=24.0.0` |
31
32
  | Backends | OpenTelemetry OTLP/HTTP (traces + metrics, JSON encoding) and Langfuse (LLM observability) — either or both |
32
33
  | Model | Model-agnostic: it exports the session/event stream; no model calls are made |
@@ -166,11 +167,11 @@ This plugin registers **no model tools** — it is a background exporter. Its su
166
167
  - **Sanitize before send** — structural key redaction, built-in secret patterns (API keys, GitHub tokens, AWS keys, bearer credentials, private keys), your patterns, and character budgets all apply before any record leaves memory.
167
168
  - **Durable boundary re-validation** — records read back from storage are checked again before a sink can see them.
168
169
  - **Failure loud, failure contained** — export failures warn, count, retry, and finally spool; a failing session handler is caught and logged so observability can never break the harness hot path.
169
- - **Model-visible ⟺ logged** — prompt/completion exports project only the logged header and the session surface; the exporter invents no content.
170
+ - **Model-visible ⟺ logged** — prompt/completion exports project only the session surface (whose node 0 is the system prompt) and the logged header (call config and tools); the exporter invents no content.
170
171
 
171
172
  ## Known limitations
172
173
 
173
- - **npm 0.1.2-rc.1** — the plugin is developed and tested against `@deepseek-ai/dsh@0.1.2-rc.1`; newer harness baselines stay covered by the monthly compat workflow.
174
+ - **npm 0.1.5-rc.1** — the plugin is developed and tested against `@deepseek-ai/dsh@0.1.5-rc.1` (devDeps and CI pinned); the peer range `>=0.1.2-rc.1 <0.2.0 || >=0.1.5-alpha.1 <0.2.0` keeps the published rc.1 line installable, and the monthly compat workflow covers newer baselines.
174
175
  - **Metrics bypass the retry/spool path** — OTLP metrics are aggregated cumulatively, so a lost flush self-heals on the next one (by design, not a bug).
175
176
  - **No sampling** — every enabled span family is exported; set `capture.*` switches and `batch.maxBufferRecords` for high-volume sessions.
176
177
 
@@ -178,9 +179,9 @@ This plugin registers **no model tools** — it is a background exporter. Its su
178
179
 
179
180
  ```sh
180
181
  pnpm install # node ^22.19 || >=24
181
- pnpm run typecheck # tsc: src + tests against the local harness checkout
182
- pnpm run typecheck:ci # tsc against the published 0.1.2-rc.1 types (no paths)
183
- pnpm test # vitest: 114 tests, 18 suites (real Context/Session/storage seam)
182
+ pnpm run typecheck # tsc: src + tests against the pinned 0.1.5-rc.1 devDeps (no tsconfig paths)
183
+ pnpm run typecheck:ci # tsc against the published 0.1.5-rc.1 types (no paths)
184
+ pnpm test # vitest: 124 tests, 18 suites (real Context/Session/storage seam)
184
185
  pnpm run test:coverage # coverage gate (90/80/90/90)
185
186
  pnpm run build # tsdown bundle + tsc declarations (lib/)
186
187
  pnpm run verify:self-contained # dependency specs resolve from the registry
package/README.pt.md CHANGED
@@ -9,6 +9,7 @@
9
9
 
10
10
  [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](LICENSE)
11
11
  [![DSH plugin](https://img.shields.io/badge/dsh--plugin-✅-green)](https://github.com/topics/dsh-plugin)
12
+ [![dsh-doctor](https://raw.githubusercontent.com/PerryLink/dsh-plugin-doctor/main/badges/PerryLink__dsh-observe.svg)](https://github.com/PerryLink/dsh-plugin-doctor#verified-徽章)
12
13
  [![Node](https://img.shields.io/badge/node-%5E22.19%20%7C%7C%20%3E%3D24-brightgreen.svg)](#)
13
14
  [![CI](https://img.shields.io/github/actions/workflow/status/PerryLink/dsh-observe/ci.yml?branch=main&label=CI)](https://github.com/PerryLink/dsh-observe/actions)
14
15
  [![Version](https://img.shields.io/github/v/tag/PerryLink/dsh-observe?label=version)](https://github.com/PerryLink/dsh-observe/releases)
@@ -25,7 +26,7 @@
25
26
 
26
27
  | Superfície | Status |
27
28
  |---|---|
28
- | Harness | DeepSeek Harness `dsh-v0.1.3-alpha.1` (adaptado em 2026-09-02): o envelope de sessão mantém seu campo ignorable apenas para compatibilidade de leitura de logs armazenados - o Session.append ainda não consegue estampá-lo, então o comportamento da porta não muda. Verificado em 2026-09-06 contra o checkout master dsh-v0.1.3-alpha.1 (cadeia completa de portas + smoke de instalação de perfil). |
29
+ | Harness | DeepSeek Harness `dsh-v0.1.5-rc.1` (adaptado em 2026-09-09): o formato de sessão V3 embute o fluxo do assistente em `assistant/message` / `assistant/attempt` e representa o prompt de sistema como nó 0 da superfície (`system/message`); o plugin consome apenas o fluxo de eventos ao vivo e nunca lê arquivos de log de sessão. Verificado em 2026-09-10 contra a tag dsh-v0.1.5-rc.1 (cadeia completa de portas local; o workflow compat mensal cobre o smoke de instalação de perfil). |
29
30
  | Node | `^22.19.0 \|\| >=24.0.0` |
30
31
  | Backends | OpenTelemetry OTLP/HTTP (traces + metrics, codificação JSON) e Langfuse (observabilidade de LLM) — um ou ambos |
31
32
  | Modelo | Independente de modelo: exporta o fluxo `session/event`; não faz chamadas a modelos |
@@ -165,11 +166,11 @@ Este plugin **não registra ferramentas de modelo** — é um exportador em segu
165
166
  - **Sanear antes de enviar** — redação estrutural de chaves, padrões de segredos embutidos (chaves de API, tokens do GitHub, chaves da AWS, credenciais bearer, chaves privadas), seus padrões e orçamentos de caracteres aplicam-se antes de qualquer registro sair da memória.
166
167
  - **Re-validação no limite durável** — registros lidos do armazenamento são checados novamente antes que um sink possa vê-los.
167
168
  - **Falha ruidosa, falha contida** — falhas de exportação avisam, contam, tentam de novo e por fim vão para o spool; um manipulador de sessão que falha é capturado e registrado, de modo que a observabilidade nunca pode quebrar o caminho quente do harness.
168
- - **Model-visible ⟺ logged** — as exportações de prompt/completion projetam apenas o cabeçalho registrado e a superfície da sessão; o exportador não inventa conteúdo.
169
+ - **Model-visible ⟺ logged** — as exportações de prompt/completion projetam apenas a superfície da sessão (cujo nó 0 é o prompt de sistema) e o cabeçalho registrado (configuração da chamada e ferramentas); o exportador não inventa conteúdo.
169
170
 
170
171
  ## Known limitations
171
172
 
172
- - **npm 0.1.2-rc.1** — o plugin é desenvolvido e testado contra `@deepseek-ai/dsh@0.1.2-rc.1`; baselines mais novos devem funcionar e são verificados pelo workflow compat mensal.
173
+ - **npm 0.1.5-rc.1** — o plugin é desenvolvido e testado contra `@deepseek-ai/dsh@0.1.5-rc.1` (devDeps e CI fixados); o intervalo de peers `>=0.1.2-rc.1 <0.2.0 || >=0.1.5-alpha.1 <0.2.0` mantém a linha rc.1 publicada instalável, e o workflow compat mensal cobre baselines mais novos.
173
174
  - **Métricas evitam o caminho de tentativa/spool** — as métricas OTLP são agregadas cumulativamente, então um flush perdido se autocura no seguinte (por design, não é um bug).
174
175
  - **Sem amostragem** — toda família de spans habilitada é exportada; ajuste os interruptores `capture.*` e `batch.maxBufferRecords` para sessões de alto volume.
175
176
 
@@ -177,9 +178,9 @@ Este plugin **não registra ferramentas de modelo** — é um exportador em segu
177
178
 
178
179
  ```sh
179
180
  pnpm install # node ^22.19 || >=24
180
- pnpm run typecheck # tsc: src + tests contra o checkout local do harness
181
- pnpm run typecheck:ci # tsc contra os tipos publicados 0.1.2-rc.1 (sem paths)
182
- pnpm test # vitest: 95 testes, 13 suítes (Context/Session/storage seam reais)
181
+ pnpm run typecheck # tsc: src + tests contra os devDeps fixados 0.1.5-rc.1 (sem tsconfig paths)
182
+ pnpm run typecheck:ci # tsc contra os tipos publicados 0.1.5-rc.1 (sem paths)
183
+ pnpm test # vitest: 124 testes, 18 suítes (Context/Session/storage seam reais)
183
184
  pnpm run test:coverage # porta de cobertura (90/80/90/90)
184
185
  pnpm run build # bundle tsdown + declarações tsc (lib/)
185
186
  pnpm run verify:self-contained # as especificações de dependências resolvem pelo registry
package/README.zh.md CHANGED
@@ -9,6 +9,7 @@
9
9
 
10
10
  [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](LICENSE)
11
11
  [![DSH plugin](https://img.shields.io/badge/dsh--plugin-✅-green)](https://github.com/topics/dsh-plugin)
12
+ [![dsh-doctor](https://raw.githubusercontent.com/PerryLink/dsh-plugin-doctor/main/badges/PerryLink__dsh-observe.svg)](https://github.com/PerryLink/dsh-plugin-doctor#verified-徽章)
12
13
  [![Node](https://img.shields.io/badge/node-%5E22.19%20%7C%7C%20%3E%3D24-brightgreen.svg)](#)
13
14
  [![CI](https://img.shields.io/github/actions/workflow/status/PerryLink/dsh-observe/ci.yml?branch=main&label=CI)](https://github.com/PerryLink/dsh-observe/actions)
14
15
  [![Version](https://img.shields.io/github/v/tag/PerryLink/dsh-observe?label=version)](https://github.com/PerryLink/dsh-observe/releases)
@@ -25,7 +26,7 @@
25
26
 
26
27
  | 方面 | 状态 |
27
28
  |---|---|
28
- | Harness | DeepSeek Harness `dsh-v0.1.3-alpha.1`(2026-09-02 已适配):会话信封保留 ignorable 字段但仅用于存量日志读取兼容——Session.append 仍无法盖章,门控行为不变。已于 2026-09-06 对照 dsh-v0.1.3-alpha.1 master 检出核验(完整门禁链 + profile 安装冒烟)。 |
29
+ | Harness | DeepSeek Harness `dsh-v0.1.5-rc.1`(2026-09-09 已适配):会话格式 V3 把助手流内嵌到 `assistant/message` / `assistant/attempt`,系统提示词成为 surface 节点 0(`system/message`);本插件只消费实时事件流,从不读取会话日志文件。已于 2026-09-10 对照 dsh-v0.1.5-rc.1 tag 核验(本地完整门禁链;profile 安装冒烟由月度 compat 工作流覆盖)。 |
29
30
  | Node | `^22.19.0 \|\| >=24.0.0` |
30
31
  | 后端 | OpenTelemetry OTLP/HTTP(traces + metrics,JSON 编码)与 Langfuse(LLM 可观测)——二选一或同时 |
31
32
  | 模型 | 与模型无关:它导出 session/event 流,自身不调用任何模型 |
@@ -165,11 +166,11 @@ dsh --profile web --dump-config | grep -A2 'id: dsh-observe'
165
166
  - **发送前脱敏** —— 结构性键名脱敏、内置密钥模式(API key、GitHub token、AWS key、bearer 凭据、私钥)、自定义模式与字符预算,全部在任何记录离开内存前生效。
166
167
  - **持久边界再校验** —— 从存储读回的记录在到达 sink 前再次检查。
167
168
  - **失败大声、失败隔离** —— 导出失败会告警、计数、重试并最终入缓冲;会话事件处理失败被捕获并记录,可观测性永远不会拖垮 harness 热路径。
168
- - **模型可见 ⟺ 已记录** —— prompt/completion 导出只投影已记录的 header 与会话 surface;导出器不发明任何内容。
169
+ - **模型可见 ⟺ 已记录** —— prompt/completion 导出只投影会话 surface(其节点 0 即系统提示词)与已记录的 header(调用配置与工具);导出器不发明任何内容。
169
170
 
170
171
  ## Known limitations
171
172
 
172
- - **npm 0.1.2-rc.1** —— 插件针对 `@deepseek-ai/dsh@0.1.2-rc.1` 开发与测试;更新的 harness 基线预期可用,由月度 compat 工作流验证。
173
+ - **npm 0.1.5-rc.1** —— 插件针对 `@deepseek-ai/dsh@0.1.5-rc.1` 开发与测试(devDeps 与 CI 均钉此版本);peer 复合范围 `>=0.1.2-rc.1 <0.2.0 || >=0.1.5-alpha.1 <0.2.0` 保持已发布的 rc.1 线可安装,更新的 harness 基线由月度 compat 工作流验证。
173
174
  - **Metrics 不走重试/缓冲路径** —— OTLP metrics 按累计聚合,丢失一次 flush 会在下一次自愈(设计如此,非缺陷)。
174
175
  - **无采样** —— 每个启用的 span 族都会导出;大流量会话请调整 `capture.*` 开关与 `batch.maxBufferRecords`。
175
176
 
@@ -177,9 +178,9 @@ dsh --profile web --dump-config | grep -A2 'id: dsh-observe'
177
178
 
178
179
  ```sh
179
180
  pnpm install # node ^22.19 || >=24
180
- pnpm run typecheck # tsc:src + tests,对照本地 harness checkout
181
- pnpm run typecheck:ci # tsc:对照已发布的 0.1.2-rc.1 类型(无 paths)
182
- pnpm test # vitest:95 个测试、13 个套件(真实 Context/Session/storage 接缝)
181
+ pnpm run typecheck # tsc:src + tests,对照钉定的 0.1.5-rc.1 devDeps(无 tsconfig paths)
182
+ pnpm run typecheck:ci # tsc:对照已发布的 0.1.5-rc.1 类型(无 paths)
183
+ pnpm test # vitest:124 个测试、18 个套件(真实 Context/Session/storage 接缝)
183
184
  pnpm run test:coverage # 覆盖率门禁(90/80/90/90)
184
185
  pnpm run build # tsdown bundle + tsc 声明(lib/)
185
186
  pnpm run verify:self-contained # 依赖声明全部来自 registry
package/lib/index.js CHANGED
@@ -571,7 +571,7 @@ function langfuseId(...parts) {
571
571
  * @module dsh-observe/version
572
572
  */
573
573
  /** The dsh-observe package version, kept in sync with package.json. */
574
- const VERSION = "0.2.9";
574
+ const VERSION = "0.2.11";
575
575
  //#endregion
576
576
  //#region src/sinks.ts
577
577
  /** POST a JSON body with a timeout; throws on non-2xx. */
@@ -1379,13 +1379,11 @@ function normalizeUsage(usage) {
1379
1379
  }
1380
1380
  /**
1381
1381
  * Whether a stream chunk carries visible model output (the first-token
1382
- * boundary). Local replication of the rc.2 `@deepseek-ai/dsh-llm/message`
1383
- * `isTokenDelta` helper, which host 0.1.2-alpha.1 removed from that module:
1384
- * the host's whole-log sessionStats projection now inlines the same switch
1385
- * (`packages/session/session-stats/src/projection.ts`), and the chunk
1386
- * grammar itself is unchanged, so this predicate stays identical on both
1387
- * rulers. Empty deltas (heartbeats, empty tool-call frames) do not count as
1388
- * a first token.
1382
+ * boundary). Local copy of the predicate host 0.1.5 exports as
1383
+ * `isTokenDelta` from `@deepseek-ai/dsh-llm/assistant-stream`; kept local
1384
+ * because the 0.1.2-rc.1 line has no such export and the chunk grammar is
1385
+ * unchanged, so the switch below stays identical on both rulers. Empty
1386
+ * deltas (heartbeats, empty tool-call frames) do not count as a first token.
1389
1387
  * @param chunk - the stream chunk to test.
1390
1388
  * @returns true when the chunk contains a non-empty text/reasoning/tool delta.
1391
1389
  */
@@ -1398,15 +1396,15 @@ function isTokenDelta(chunk) {
1398
1396
  }
1399
1397
  }
1400
1398
  /**
1401
- * Recover finish reason and first-token timing from the v2 embedded stream
1402
- * when an `assistant/message` event carries one. On the pinned rc.1 line the
1403
- * field is absent and the legacy `assistant/chunk` branch keeps doing the
1404
- * work; on 0.1.3-alpha.1 `assistant/chunk` no longer exists, so this path is
1405
- * the only source for those two span fields. Compact runs carry member i at
1406
- * `time0 + sum(dt[0..i-1])`; every member is a token-delta boundary, so the
1407
- * run's first non-empty member is the first token.
1399
+ * Recover finish reason and first-token timing from an embedded assistant
1400
+ * stream. Host 0.1.5 carries the exact timed model stream on the required
1401
+ * `assistant/message.stream` field and, for a failed/cancelled/stream-errored
1402
+ * attempt that never commits a message, on `assistant/attempt.stream`; the
1403
+ * removed `assistant/chunk` events were the rc.1-only equivalent. Compact runs
1404
+ * carry member i at `time0 + sum(dt[0..i-1])`; every member is a token-delta
1405
+ * boundary, so the run's first non-empty member is the first token.
1408
1406
  * @param state - the open step state to fill.
1409
- * @param data - the `assistant/message` event data.
1407
+ * @param data - the event data carrying the stream.
1410
1408
  */
1411
1409
  function consumeEmbeddedStream(state, data) {
1412
1410
  const stream = data?.stream;
@@ -1483,16 +1481,13 @@ var Collector = class {
1483
1481
  case "request/context":
1484
1482
  state.context = event.data;
1485
1483
  break;
1486
- case "assistant/chunk":
1487
- if (state.step !== void 0) {
1488
- if (event.data.chunk.type === "finish") state.step.finishReason = event.data.chunk.reason.kind;
1489
- else if (state.step.firstChunkUnixNano === void 0 && isTokenDelta(event.data.chunk)) state.step.firstChunkUnixNano = event.time * NANO;
1490
- }
1491
- break;
1492
1484
  case "assistant/message":
1493
1485
  consumeEmbeddedStream(state, event.data);
1494
1486
  this.assistantMessage(session, state, event);
1495
1487
  break;
1488
+ case "assistant/attempt":
1489
+ consumeEmbeddedStream(state, event.data);
1490
+ break;
1496
1491
  case "tool/call":
1497
1492
  this.toolCall(session, state, event);
1498
1493
  break;
@@ -1502,10 +1497,30 @@ var Collector = class {
1502
1497
  case "step/end":
1503
1498
  this.stepEnd(session, state, event);
1504
1499
  break;
1505
- case "turn/end": this.turnEnd(session, state, event);
1500
+ case "turn/end":
1501
+ this.turnEnd(session, state, event);
1502
+ break;
1503
+ default: this.legacyChunk(state, event);
1506
1504
  }
1507
1505
  }
1508
1506
  /**
1507
+ * Fold one legacy `assistant/chunk` event. The type is absent from the
1508
+ * 0.1.3+ SessionEventMap (streams are embedded in `assistant/message` and
1509
+ * `assistant/attempt`), so the read is structural and only the 0.1.2-rc.1
1510
+ * runtime line ever reaches it.
1511
+ * @param state - the session state.
1512
+ * @param event - the appended event.
1513
+ */
1514
+ legacyChunk(state, event) {
1515
+ const legacy = event;
1516
+ if (legacy.type !== "assistant/chunk") return;
1517
+ const chunk = legacy.data?.chunk;
1518
+ const step = state.step;
1519
+ if (chunk === void 0 || step === void 0) return;
1520
+ if (chunk.type === "finish") step.finishReason = chunk.reason.kind;
1521
+ else if (step.firstChunkUnixNano === void 0 && isTokenDelta(chunk)) step.firstChunkUnixNano = legacy.time * NANO;
1522
+ }
1523
+ /**
1509
1524
  * Close every open span for a session leaving the store.
1510
1525
  * @param session - the disposed session.
1511
1526
  */
@@ -1824,10 +1839,15 @@ var Collector = class {
1824
1839
  }
1825
1840
  });
1826
1841
  }
1827
- /** The sanitized prompt snapshot: logged system prompt plus the current session surface. */
1842
+ /**
1843
+ * The sanitized prompt snapshot: the current session surface, whose node 0
1844
+ * is the rendered system prompt (`system/message`, host 0.1.5), plus the
1845
+ * legacy logged `header.system` when a 0.1.2-rc.1 runtime still stamps it.
1846
+ */
1828
1847
  capturePrompt(session, header) {
1829
1848
  const parts = [];
1830
- if (header?.system !== void 0) parts.push(header.system);
1849
+ const legacySystem = header?.system;
1850
+ if (legacySystem !== void 0) parts.push(legacySystem);
1831
1851
  const events = typeof session.snapshotEvents === "function" ? session.snapshotEvents() : session.events;
1832
1852
  for (const seq of session.surface.nodes) {
1833
1853
  const event = events[seq];
@@ -7,7 +7,8 @@
7
7
  * with an error status at the latest observed event time. Everything
8
8
  * exported is reconstructable from the session log alone — the collector
9
9
  * invents no model-visible content, and prompt/completion bodies come from
10
- * the logged header and the session surface.
10
+ * the session surface and the logged header (call config and tools). The
11
+ * system prompt is surface node 0, a `system/message` event (host 0.1.5).
11
12
  * @module dsh-observe/collector
12
13
  */
13
14
  import type { Session, SessionEvent } from '@deepseek-ai/dsh-session';
@@ -52,6 +53,15 @@ export declare class Collector {
52
53
  * @param event - the appended event.
53
54
  */
54
55
  handleEvent(session: Session, event: SessionEvent): void;
56
+ /**
57
+ * Fold one legacy `assistant/chunk` event. The type is absent from the
58
+ * 0.1.3+ SessionEventMap (streams are embedded in `assistant/message` and
59
+ * `assistant/attempt`), so the read is structural and only the 0.1.2-rc.1
60
+ * runtime line ever reaches it.
61
+ * @param state - the session state.
62
+ * @param event - the appended event.
63
+ */
64
+ private legacyChunk;
55
65
  /**
56
66
  * Close every open span for a session leaving the store.
57
67
  * @param session - the disposed session.
@@ -71,7 +81,11 @@ export declare class Collector {
71
81
  private emitContextGauge;
72
82
  /** Token and cost counters for one LLM call. */
73
83
  private emitUsageMetrics;
74
- /** The sanitized prompt snapshot: logged system prompt plus the current session surface. */
84
+ /**
85
+ * The sanitized prompt snapshot: the current session surface, whose node 0
86
+ * is the rendered system prompt (`system/message`, host 0.1.5), plus the
87
+ * legacy logged `header.system` when a 0.1.2-rc.1 runtime still stamps it.
88
+ */
75
89
  private capturePrompt;
76
90
  /** The current provider/model attribution: request context first, then the logged header. */
77
91
  private modelOf;
@@ -1 +1 @@
1
- {"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../src/collector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAIH,OAAO,KAAK,EAA+B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAElG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,KAAK,EAAc,YAAY,EAAE,UAAU,EAAe,MAAM,YAAY,CAAA;AAInF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAK/C;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG;QACzB,WAAW,EAAE,MAAM,CAAA;QACnB,QAAQ,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAC7B,CAAA;CACF;AAmID;;;GAGG;AACH,qBAAa,SAAS;IAWlB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAdzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAE9D;;;;;;OAMG;gBAEgB,MAAM,EAAE,cAAc,EACtB,UAAU,EAAE,MAAM,iBAAiB,GAAG,SAAS,EAC/C,MAAM,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,EAClC,QAAQ,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,EACxC,MAAM,EAAE,aAAa;IAGxC;;;;OAIG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI;IAsDxD;;;OAGG;IACH,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAqB7C,OAAO,CAAC,OAAO;IAef,OAAO,CAAC,SAAS;IAmBjB,OAAO,CAAC,SAAS;IAejB,OAAO,CAAC,gBAAgB;IAiDxB,OAAO,CAAC,QAAQ;IAiBhB,OAAO,CAAC,UAAU;IA6ClB,OAAO,CAAC,OAAO;IAMf,OAAO,CAAC,OAAO;IA6Bf,oGAAoG;IACpG,OAAO,CAAC,SAAS;IAsEjB,4EAA4E;IAC5E,OAAO,CAAC,gBAAgB;IAuBxB,gDAAgD;IAChD,OAAO,CAAC,gBAAgB;IAqCxB,4FAA4F;IAC5F,OAAO,CAAC,aAAa;IAiBrB,6FAA6F;IAC7F,OAAO,CAAC,OAAO;IAOf,uDAAuD;IACvD,OAAO,CAAC,cAAc;IAatB,+CAA+C;IAC/C,OAAO,CAAC,IAAI;CAGb"}
1
+ {"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../src/collector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAIH,OAAO,KAAK,EAA+B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAElG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAA;AACjD,OAAO,KAAK,EAAc,YAAY,EAAE,UAAU,EAAe,MAAM,YAAY,CAAA;AAInF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAK/C;;;;GAIG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG;QACzB,WAAW,EAAE,MAAM,CAAA;QACnB,QAAQ,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAC7B,CAAA;CACF;AAiID;;;GAGG;AACH,qBAAa,SAAS;IAWlB,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM;IAdzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAuC;IAE9D;;;;;;OAMG;gBAEgB,MAAM,EAAE,cAAc,EACtB,UAAU,EAAE,MAAM,iBAAiB,GAAG,SAAS,EAC/C,MAAM,EAAE,CAAC,IAAI,EAAE,UAAU,KAAK,IAAI,EAClC,QAAQ,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,EACxC,MAAM,EAAE,aAAa;IAGxC;;;;OAIG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI;IAsDxD;;;;;;;OAOG;IACH,OAAO,CAAC,WAAW;IAanB;;;OAGG;IACH,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAqB7C,OAAO,CAAC,OAAO;IAef,OAAO,CAAC,SAAS;IAmBjB,OAAO,CAAC,SAAS;IAejB,OAAO,CAAC,gBAAgB;IAiDxB,OAAO,CAAC,QAAQ;IAiBhB,OAAO,CAAC,UAAU;IA6ClB,OAAO,CAAC,OAAO;IAMf,OAAO,CAAC,OAAO;IA6Bf,oGAAoG;IACpG,OAAO,CAAC,SAAS;IAsEjB,4EAA4E;IAC5E,OAAO,CAAC,gBAAgB;IAuBxB,gDAAgD;IAChD,OAAO,CAAC,gBAAgB;IAqCxB;;;;OAIG;IACH,OAAO,CAAC,aAAa;IAkBrB,6FAA6F;IAC7F,OAAO,CAAC,OAAO;IAOf,uDAAuD;IACvD,OAAO,CAAC,cAAc;IAatB,+CAA+C;IAC/C,OAAO,CAAC,IAAI;CAGb"}
@@ -7,7 +7,8 @@
7
7
  * with an error status at the latest observed event time. Everything
8
8
  * exported is reconstructable from the session log alone — the collector
9
9
  * invents no model-visible content, and prompt/completion bodies come from
10
- * the logged header and the session surface.
10
+ * the session surface and the logged header (call config and tools). The
11
+ * system prompt is surface node 0, a `system/message` event (host 0.1.5).
11
12
  * @module dsh-observe/collector
12
13
  */
13
14
  import { deriveEventMessage } from '@deepseek-ai/dsh-session';
@@ -30,13 +31,11 @@ function normalizeUsage(usage) {
30
31
  }
31
32
  /**
32
33
  * Whether a stream chunk carries visible model output (the first-token
33
- * boundary). Local replication of the rc.2 `@deepseek-ai/dsh-llm/message`
34
- * `isTokenDelta` helper, which host 0.1.2-alpha.1 removed from that module:
35
- * the host's whole-log sessionStats projection now inlines the same switch
36
- * (`packages/session/session-stats/src/projection.ts`), and the chunk
37
- * grammar itself is unchanged, so this predicate stays identical on both
38
- * rulers. Empty deltas (heartbeats, empty tool-call frames) do not count as
39
- * a first token.
34
+ * boundary). Local copy of the predicate host 0.1.5 exports as
35
+ * `isTokenDelta` from `@deepseek-ai/dsh-llm/assistant-stream`; kept local
36
+ * because the 0.1.2-rc.1 line has no such export and the chunk grammar is
37
+ * unchanged, so the switch below stays identical on both rulers. Empty
38
+ * deltas (heartbeats, empty tool-call frames) do not count as a first token.
40
39
  * @param chunk - the stream chunk to test.
41
40
  * @returns true when the chunk contains a non-empty text/reasoning/tool delta.
42
41
  */
@@ -52,15 +51,15 @@ function isTokenDelta(chunk) {
52
51
  }
53
52
  }
54
53
  /**
55
- * Recover finish reason and first-token timing from the v2 embedded stream
56
- * when an `assistant/message` event carries one. On the pinned rc.1 line the
57
- * field is absent and the legacy `assistant/chunk` branch keeps doing the
58
- * work; on 0.1.3-alpha.1 `assistant/chunk` no longer exists, so this path is
59
- * the only source for those two span fields. Compact runs carry member i at
60
- * `time0 + sum(dt[0..i-1])`; every member is a token-delta boundary, so the
61
- * run's first non-empty member is the first token.
54
+ * Recover finish reason and first-token timing from an embedded assistant
55
+ * stream. Host 0.1.5 carries the exact timed model stream on the required
56
+ * `assistant/message.stream` field and, for a failed/cancelled/stream-errored
57
+ * attempt that never commits a message, on `assistant/attempt.stream`; the
58
+ * removed `assistant/chunk` events were the rc.1-only equivalent. Compact runs
59
+ * carry member i at `time0 + sum(dt[0..i-1])`; every member is a token-delta
60
+ * boundary, so the run's first non-empty member is the first token.
62
61
  * @param state - the open step state to fill.
63
- * @param data - the `assistant/message` event data.
62
+ * @param data - the event data carrying the stream.
64
63
  */
65
64
  function consumeEmbeddedStream(state, data) {
66
65
  const stream = data?.stream;
@@ -152,20 +151,16 @@ export class Collector {
152
151
  case 'request/context':
153
152
  state.context = event.data;
154
153
  break;
155
- case 'assistant/chunk':
156
- if (state.step !== undefined) {
157
- if (event.data.chunk.type === 'finish') {
158
- state.step.finishReason = event.data.chunk.reason.kind;
159
- }
160
- else if (state.step.firstChunkUnixNano === undefined && isTokenDelta(event.data.chunk)) {
161
- state.step.firstChunkUnixNano = event.time * NANO;
162
- }
163
- }
164
- break;
165
154
  case 'assistant/message':
166
155
  consumeEmbeddedStream(state, event.data);
167
156
  this.assistantMessage(session, state, event);
168
157
  break;
158
+ case 'assistant/attempt':
159
+ // 0.1.3+ logs a failed, cancelled, or stream-errored attempt as its own
160
+ // event with no assistant/message following, so its stream is the only
161
+ // source for the dangling LLM span's finish reason and first token.
162
+ consumeEmbeddedStream(state, event.data);
163
+ break;
169
164
  case 'tool/call':
170
165
  this.toolCall(session, state, event);
171
166
  break;
@@ -179,10 +174,36 @@ export class Collector {
179
174
  this.turnEnd(session, state, event);
180
175
  break;
181
176
  default:
182
- // Unknown or plugin-owned session events: nothing to export.
177
+ // Unknown or plugin-owned session events. The published 0.1.2-rc.1
178
+ // line still streams `assistant/chunk`, which host commit f99b06eaed
179
+ // removed from SessionEventMap, so read it structurally when present.
180
+ this.legacyChunk(state, event);
183
181
  break;
184
182
  }
185
183
  }
184
+ /**
185
+ * Fold one legacy `assistant/chunk` event. The type is absent from the
186
+ * 0.1.3+ SessionEventMap (streams are embedded in `assistant/message` and
187
+ * `assistant/attempt`), so the read is structural and only the 0.1.2-rc.1
188
+ * runtime line ever reaches it.
189
+ * @param state - the session state.
190
+ * @param event - the appended event.
191
+ */
192
+ legacyChunk(state, event) {
193
+ const legacy = event;
194
+ if (legacy.type !== 'assistant/chunk')
195
+ return;
196
+ const chunk = legacy.data?.chunk;
197
+ const step = state.step;
198
+ if (chunk === undefined || step === undefined)
199
+ return;
200
+ if (chunk.type === 'finish') {
201
+ step.finishReason = chunk.reason.kind;
202
+ }
203
+ else if (step.firstChunkUnixNano === undefined && isTokenDelta(chunk)) {
204
+ step.firstChunkUnixNano = legacy.time * NANO;
205
+ }
206
+ }
186
207
  /**
187
208
  * Close every open span for a session leaving the store.
188
209
  * @param session - the disposed session.
@@ -532,11 +553,16 @@ export class Collector {
532
553
  });
533
554
  }
534
555
  }
535
- /** The sanitized prompt snapshot: logged system prompt plus the current session surface. */
556
+ /**
557
+ * The sanitized prompt snapshot: the current session surface, whose node 0
558
+ * is the rendered system prompt (`system/message`, host 0.1.5), plus the
559
+ * legacy logged `header.system` when a 0.1.2-rc.1 runtime still stamps it.
560
+ */
536
561
  capturePrompt(session, header) {
537
562
  const parts = [];
538
- if (header?.system !== undefined)
539
- parts.push(header.system);
563
+ const legacySystem = header?.system;
564
+ if (legacySystem !== undefined)
565
+ parts.push(legacySystem);
540
566
  // alpha.5 renamed the Session.events getter to snapshotEvents(); older hosts
541
567
  // (the >=0.1.0-rc.8 peer floor) still expose .events, so detect at runtime.
542
568
  const events = typeof session.snapshotEvents === 'function'
@@ -1 +1 @@
1
- {"version":3,"file":"collector.js","sourceRoot":"","sources":["../../src/collector.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"collector.js","sourceRoot":"","sources":["../../src/collector.ts"],"names":[],"mappings":"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"}
@@ -6,5 +6,5 @@
6
6
  * @module dsh-observe/version
7
7
  */
8
8
  /** The dsh-observe package version, kept in sync with package.json. */
9
- export declare const VERSION = "0.2.9";
9
+ export declare const VERSION = "0.2.11";
10
10
  //# sourceMappingURL=version.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,uEAAuE;AACvE,eAAO,MAAM,OAAO,UAAU,CAAA"}
1
+ {"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,uEAAuE;AACvE,eAAO,MAAM,OAAO,WAAW,CAAA"}
@@ -6,5 +6,5 @@
6
6
  * @module dsh-observe/version
7
7
  */
8
8
  /** The dsh-observe package version, kept in sync with package.json. */
9
- export const VERSION = '0.2.9';
9
+ export const VERSION = '0.2.11';
10
10
  //# sourceMappingURL=version.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,uEAAuE;AACvE,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAA"}
1
+ {"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,uEAAuE;AACvE,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dsh-observe",
3
- "version": "0.2.9",
3
+ "version": "0.2.11",
4
4
  "description": "OpenTelemetry and Langfuse observability exporter for DeepSeek Harness: turn/step/tool/LLM spans, token and cost metrics, and sanitized LLM prompt/completion capture from the session/event stream, with async batching, bounded offline buffering, and retry with backoff.",
5
5
  "repository": {
6
6
  "type": "git",
@@ -70,7 +70,8 @@
70
70
  ],
71
71
  "compatibility": {
72
72
  "dshVersions": [
73
- "0.1.2-rc.1"
73
+ "0.1.2-rc.1",
74
+ "0.1.5-rc.1"
74
75
  ]
75
76
  },
76
77
  "capability": {
@@ -107,12 +108,12 @@
107
108
  "packageManager": "pnpm@11.7.0",
108
109
  "peerDependencies": {
109
110
  "@deepseek-ai/cordis": "^4.0.2",
110
- "@deepseek-ai/dsh-llm": ">=0.1.2-rc.1 <0.2.0",
111
- "@deepseek-ai/dsh-session": ">=0.1.2-rc.1 <0.2.0",
112
- "@deepseek-ai/dsh-storage": ">=0.1.2-rc.1 <0.2.0",
113
- "@deepseek-ai/dsh-storage-domain": ">=0.1.2-rc.1 <0.2.0",
114
- "@deepseek-ai/dsh-storage-json": ">=0.1.2-rc.1 <0.2.0",
115
- "@deepseek-ai/dsh-typert-protocol": ">=0.1.2-rc.1 <0.2.0",
111
+ "@deepseek-ai/dsh-llm": ">=0.1.2-rc.1 <0.2.0 || >=0.1.5-alpha.1 <0.2.0",
112
+ "@deepseek-ai/dsh-session": ">=0.1.2-rc.1 <0.2.0 || >=0.1.5-alpha.1 <0.2.0",
113
+ "@deepseek-ai/dsh-storage": ">=0.1.2-rc.1 <0.2.0 || >=0.1.5-alpha.1 <0.2.0",
114
+ "@deepseek-ai/dsh-storage-domain": ">=0.1.2-rc.1 <0.2.0 || >=0.1.5-alpha.1 <0.2.0",
115
+ "@deepseek-ai/dsh-storage-json": ">=0.1.2-rc.1 <0.2.0 || >=0.1.5-alpha.1 <0.2.0",
116
+ "@deepseek-ai/dsh-typert-protocol": ">=0.1.2-rc.1 <0.2.0 || >=0.1.5-alpha.1 <0.2.0",
116
117
  "@deepseek-ai/schemastery": "^3.18.2"
117
118
  },
118
119
  "dependencies": {
@@ -121,16 +122,16 @@
121
122
  "zod": "^4.4.3"
122
123
  },
123
124
  "devDependencies": {
124
- "@deepseek-ai/dsh-attachment": "0.1.2-rc.1",
125
+ "@deepseek-ai/dsh-attachment": "0.1.5-rc.1",
125
126
  "@deepseek-ai/cordis": "^4.0.2",
126
127
  "@deepseek-ai/cordis-plugin-include": "^1.0.7",
127
128
  "@deepseek-ai/cordis-plugin-loader": "^1.0.3",
128
- "@deepseek-ai/dsh-llm": "0.1.2-rc.1",
129
- "@deepseek-ai/dsh-session": "0.1.2-rc.1",
130
- "@deepseek-ai/dsh-storage": "0.1.2-rc.1",
131
- "@deepseek-ai/dsh-storage-domain": "0.1.2-rc.1",
132
- "@deepseek-ai/dsh-storage-json": "0.1.2-rc.1",
133
- "@deepseek-ai/dsh-typert-protocol": "0.1.2-rc.1",
129
+ "@deepseek-ai/dsh-llm": "0.1.5-rc.1",
130
+ "@deepseek-ai/dsh-session": "0.1.5-rc.1",
131
+ "@deepseek-ai/dsh-storage": "0.1.5-rc.1",
132
+ "@deepseek-ai/dsh-storage-domain": "0.1.5-rc.1",
133
+ "@deepseek-ai/dsh-storage-json": "0.1.5-rc.1",
134
+ "@deepseek-ai/dsh-typert-protocol": "0.1.5-rc.1",
134
135
  "@deepseek-ai/schemastery": "^3.18.2",
135
136
  "@types/node": "^22.19.0",
136
137
  "@vitest/coverage-v8": "^3.2.0",
package/src/collector.ts CHANGED
@@ -7,7 +7,8 @@
7
7
  * with an error status at the latest observed event time. Everything
8
8
  * exported is reconstructable from the session log alone — the collector
9
9
  * invents no model-visible content, and prompt/completion bodies come from
10
- * the logged header and the session surface.
10
+ * the session surface and the logged header (call config and tools). The
11
+ * system prompt is surface node 0, a `system/message` event (host 0.1.5).
11
12
  * @module dsh-observe/collector
12
13
  */
13
14
 
@@ -88,13 +89,11 @@ function normalizeUsage(usage: TokenUsage | undefined): TokenCounts | undefined
88
89
 
89
90
  /**
90
91
  * Whether a stream chunk carries visible model output (the first-token
91
- * boundary). Local replication of the rc.2 `@deepseek-ai/dsh-llm/message`
92
- * `isTokenDelta` helper, which host 0.1.2-alpha.1 removed from that module:
93
- * the host's whole-log sessionStats projection now inlines the same switch
94
- * (`packages/session/session-stats/src/projection.ts`), and the chunk
95
- * grammar itself is unchanged, so this predicate stays identical on both
96
- * rulers. Empty deltas (heartbeats, empty tool-call frames) do not count as
97
- * a first token.
92
+ * boundary). Local copy of the predicate host 0.1.5 exports as
93
+ * `isTokenDelta` from `@deepseek-ai/dsh-llm/assistant-stream`; kept local
94
+ * because the 0.1.2-rc.1 line has no such export and the chunk grammar is
95
+ * unchanged, so the switch below stays identical on both rulers. Empty
96
+ * deltas (heartbeats, empty tool-call frames) do not count as a first token.
98
97
  * @param chunk - the stream chunk to test.
99
98
  * @returns true when the chunk contains a non-empty text/reasoning/tool delta.
100
99
  */
@@ -111,10 +110,10 @@ function isTokenDelta(chunk: StreamChunk): boolean {
111
110
  }
112
111
 
113
112
  /**
114
- * Local minimal structural type for one record of the v2
115
- * `assistant/message` embedded stream (`AssistantStreamRecord` on host
116
- * 0.1.3-alpha.1, which is not published to npm). The pinned 0.1.2-rc.1
117
- * types have no `stream` field, so the read is structural only.
113
+ * Local minimal structural type for one record of the embedded assistant
114
+ * stream (`AssistantStreamRecord` on host 0.1.5-alpha.1). Kept structural so
115
+ * one source serves both supported lines: the 0.1.2-rc.1 types have neither
116
+ * an `assistant/message.stream` field nor an `assistant/attempt` event.
118
117
  */
119
118
  interface EmbeddedStreamRecord {
120
119
  readonly type: 'text-chunks' | 'reasoning-chunks' | 'tool-call-chunks' | 'chunk'
@@ -127,15 +126,15 @@ interface EmbeddedStreamRecord {
127
126
  }
128
127
 
129
128
  /**
130
- * Recover finish reason and first-token timing from the v2 embedded stream
131
- * when an `assistant/message` event carries one. On the pinned rc.1 line the
132
- * field is absent and the legacy `assistant/chunk` branch keeps doing the
133
- * work; on 0.1.3-alpha.1 `assistant/chunk` no longer exists, so this path is
134
- * the only source for those two span fields. Compact runs carry member i at
135
- * `time0 + sum(dt[0..i-1])`; every member is a token-delta boundary, so the
136
- * run's first non-empty member is the first token.
129
+ * Recover finish reason and first-token timing from an embedded assistant
130
+ * stream. Host 0.1.5 carries the exact timed model stream on the required
131
+ * `assistant/message.stream` field and, for a failed/cancelled/stream-errored
132
+ * attempt that never commits a message, on `assistant/attempt.stream`; the
133
+ * removed `assistant/chunk` events were the rc.1-only equivalent. Compact runs
134
+ * carry member i at `time0 + sum(dt[0..i-1])`; every member is a token-delta
135
+ * boundary, so the run's first non-empty member is the first token.
137
136
  * @param state - the open step state to fill.
138
- * @param data - the `assistant/message` event data.
137
+ * @param data - the event data carrying the stream.
139
138
  */
140
139
  function consumeEmbeddedStream(state: SessionState, data: unknown): void {
141
140
  const stream = (data as { stream?: unknown } | undefined)?.stream
@@ -216,19 +215,16 @@ export class Collector {
216
215
  case 'request/context':
217
216
  state.context = event.data
218
217
  break
219
- case 'assistant/chunk':
220
- if (state.step !== undefined) {
221
- if (event.data.chunk.type === 'finish') {
222
- state.step.finishReason = event.data.chunk.reason.kind
223
- } else if (state.step.firstChunkUnixNano === undefined && isTokenDelta(event.data.chunk)) {
224
- state.step.firstChunkUnixNano = event.time * NANO
225
- }
226
- }
227
- break
228
218
  case 'assistant/message':
229
219
  consumeEmbeddedStream(state, event.data)
230
220
  this.assistantMessage(session, state, event)
231
221
  break
222
+ case 'assistant/attempt':
223
+ // 0.1.3+ logs a failed, cancelled, or stream-errored attempt as its own
224
+ // event with no assistant/message following, so its stream is the only
225
+ // source for the dangling LLM span's finish reason and first token.
226
+ consumeEmbeddedStream(state, event.data)
227
+ break
232
228
  case 'tool/call':
233
229
  this.toolCall(session, state, event)
234
230
  break
@@ -242,11 +238,35 @@ export class Collector {
242
238
  this.turnEnd(session, state, event)
243
239
  break
244
240
  default:
245
- // Unknown or plugin-owned session events: nothing to export.
241
+ // Unknown or plugin-owned session events. The published 0.1.2-rc.1
242
+ // line still streams `assistant/chunk`, which host commit f99b06eaed
243
+ // removed from SessionEventMap, so read it structurally when present.
244
+ this.legacyChunk(state, event)
246
245
  break
247
246
  }
248
247
  }
249
248
 
249
+ /**
250
+ * Fold one legacy `assistant/chunk` event. The type is absent from the
251
+ * 0.1.3+ SessionEventMap (streams are embedded in `assistant/message` and
252
+ * `assistant/attempt`), so the read is structural and only the 0.1.2-rc.1
253
+ * runtime line ever reaches it.
254
+ * @param state - the session state.
255
+ * @param event - the appended event.
256
+ */
257
+ private legacyChunk(state: SessionState, event: SessionEvent): void {
258
+ const legacy = event as unknown as { type: string; time: number; data?: { chunk?: StreamChunk } }
259
+ if (legacy.type !== 'assistant/chunk') return
260
+ const chunk = legacy.data?.chunk
261
+ const step = state.step
262
+ if (chunk === undefined || step === undefined) return
263
+ if (chunk.type === 'finish') {
264
+ step.finishReason = chunk.reason.kind
265
+ } else if (step.firstChunkUnixNano === undefined && isTokenDelta(chunk)) {
266
+ step.firstChunkUnixNano = legacy.time * NANO
267
+ }
268
+ }
269
+
250
270
  /**
251
271
  * Close every open span for a session leaving the store.
252
272
  * @param session - the disposed session.
@@ -600,10 +620,15 @@ export class Collector {
600
620
  }
601
621
  }
602
622
 
603
- /** The sanitized prompt snapshot: logged system prompt plus the current session surface. */
623
+ /**
624
+ * The sanitized prompt snapshot: the current session surface, whose node 0
625
+ * is the rendered system prompt (`system/message`, host 0.1.5), plus the
626
+ * legacy logged `header.system` when a 0.1.2-rc.1 runtime still stamps it.
627
+ */
604
628
  private capturePrompt(session: Session, header: EpochHeader | undefined): string {
605
629
  const parts: string[] = []
606
- if (header?.system !== undefined) parts.push(header.system)
630
+ const legacySystem = (header as unknown as { system?: string } | undefined)?.system
631
+ if (legacySystem !== undefined) parts.push(legacySystem)
607
632
  // alpha.5 renamed the Session.events getter to snapshotEvents(); older hosts
608
633
  // (the >=0.1.0-rc.8 peer floor) still expose .events, so detect at runtime.
609
634
  const events = typeof session.snapshotEvents === 'function'
package/src/version.ts CHANGED
@@ -7,4 +7,4 @@
7
7
  */
8
8
 
9
9
  /** The dsh-observe package version, kept in sync with package.json. */
10
- export const VERSION = '0.2.9'
10
+ export const VERSION = '0.2.11'