@ultrathink-solutions/openclaw-logfire 0.1.2 → 0.3.0

package/CHANGELOG.md

@@ -5,6 +5,51 @@ All notable changes to `@ultrathink-solutions/openclaw-logfire` will be document
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.0] - 2026-02-16
+
+### Added
+
+- `llm_input` and `llm_output` hook handlers for per-LLM-call observability
+- Individual `gen_ai.chat` child spans for each LLM invocation, correlated by `runId`
+- Token usage metrics now populated with real data from `llm_output` hook (`recordTokenUsage()` was previously stubbed but never called)
+- Model name tracking (`gen_ai.request.model`, `gen_ai.response.model`) on LLM and agent spans
+- Cache token tracking (`openclaw.usage.cache_read_tokens`, `openclaw.usage.cache_write_tokens`) on LLM spans
+- Cumulative token counts set on root `invoke_agent` span at session end
+- Inference detail events (`gen_ai.client.inference.operation.details`) now emitted when `captureInferenceEvents` is enabled
+
+### Changed
+
+- **OpenTelemetry SDK upgraded from 1.x to 2.x** — stable SDK 1.30→2.5, experimental 0.57→0.212. Only breaking change: `Resource` class constructor replaced with `resourceFromAttributes()`. Dependency ranges updated; consumers using OTEL 2.x will no longer see peer dep warnings.
+- Token usage metrics include actual model names instead of empty strings
+- Operation duration metrics include model name and provider from LLM hooks
+- Provider name on agent span is updated from `llm_input` when config `providerName` is unset
+- Zero-value token counts (e.g. 0 output tokens) are now correctly accumulated — fixed truthy checks that silently dropped zeros
+- LLM span closure wrapped in `try/finally` to prevent span leaks on exceptions
+- Prompt content capture now applies `prepareForCapture()` redaction and truncation (consistent with tool args)
+- `isRecord` runtime guard added to `llm_input`/`llm_output` hook registrations (consistent with all other hooks)
+- Orphaned span cleanup uses LIFO order (children before parent) for valid trace trees
+
+### Testing
+
+- Hook handler unit tests added — 113 tests across 11 files, coverage boosted from 28% to 67%
+
+### Known Limitations
+
+- `after_tool_call` hook not yet implemented — OpenClaw SDK passes `sessionKey: undefined` at all call sites, making span store lookup impossible. Per-tool error status is not available on tool spans. Tool errors are still captured at the agent level via the `agent_end` hook. Pending upstream fix.
+
+## [0.2.0] - 2026-02-16
+
+### Fixed
+
+- **Breaking:** Align all hook handlers with the OpenClaw plugin SDK `(event, ctx)` two-argument contract. Previous version only captured the first argument and expected context data nested inside the event, which caused `TypeError: Cannot read properties of undefined` on every hook invocation.
+- Correct event property names: `event.toolName` (was `event.tool?.name`), `event.params` (was `event.tool?.args`), `event.message` (was `event.result`)
+
+### Removed
+
+- Token usage recording in `agent_end` — token data is not available in the `agent_end` event payload (restored in 0.3.0 via `llm_output` hook)
+- W3C trace context extraction from webhook headers in `message_received` — raw HTTP headers are not exposed in the `message_received` event metadata
+- Per-tool error recording in `tool_result_persist` — error details are not available in that hook's event payload
+
 ## [0.1.2] - 2026-02-16
 
 ### Fixed
@@ -46,6 +91,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Batch and simple span processor modes
 - Zero-config quickstart (just set `LOGFIRE_TOKEN`)
 
+[0.3.0]: https://github.com/Ultrathink-Solutions/openclaw-logfire/compare/v0.2.0...v0.3.0
+[0.2.0]: https://github.com/Ultrathink-Solutions/openclaw-logfire/compare/v0.1.2...v0.2.0
 [0.1.2]: https://github.com/Ultrathink-Solutions/openclaw-logfire/compare/v0.1.1...v0.1.2
 [0.1.1]: https://github.com/Ultrathink-Solutions/openclaw-logfire/compare/v0.1.0...v0.1.1
 [0.1.0]: https://github.com/Ultrathink-Solutions/openclaw-logfire/releases/tag/v0.1.0

package/README.md

@@ -45,28 +45,35 @@ Restart OpenClaw. That's it — traces appear in your Logfire dashboard.
 Every agent invocation produces a trace tree:
 
 ```
-invoke_agent chief-of-staff          (root span)
+invoke_agent my-agent                (root span, cumulative tokens)
+  |-- gen_ai.chat anthropic          (LLM call: model, input/output tokens)
   |-- execute_tool Read              (file read)
   |-- execute_tool exec              (shell command)
+  |-- gen_ai.chat anthropic          (LLM call: model, input/output tokens)
   |-- execute_tool Write             (file write)
-  |-- execute_tool web_search        (web search)
+  |-- gen_ai.chat anthropic          (LLM call: model, input/output tokens)
 ```
 
 ### Attributes (OTEL GenAI Semantic Conventions)
 
-| Attribute | Example | Description |
-|-----------|---------|-------------|
-| `gen_ai.operation.name` | `invoke_agent` | Operation type |
-| `gen_ai.agent.name` | `chief-of-staff` | Agent identifier |
-| `gen_ai.conversation.id` | `session_abc123` | Session key |
-| `gen_ai.tool.name` | `Read` | Tool being called |
-| `gen_ai.tool.call.arguments` | `{"path": "/..."}` | Tool input (opt-in) |
-| `gen_ai.usage.input_tokens` | `1024` | Prompt tokens |
-| `gen_ai.usage.output_tokens` | `512` | Completion tokens |
-| `error.type` | `ToolExecutionError` | Error classification |
-| `exception.stacktrace` | `Error: ...` | Full stack trace |
-| `openclaw.workspace` | `chief-of-staff` | Workspace name |
-| `openclaw.channel` | `slack` | Message source |
+| Attribute | Span | Example | Description |
+|-----------|------|---------|-------------|
+| `gen_ai.operation.name` | All | `invoke_agent` | Operation type |
+| `gen_ai.agent.name` | Agent | `my-agent` | Agent identifier |
+| `gen_ai.conversation.id` | Agent | `session_abc123` | Session key |
+| `gen_ai.request.model` | Agent, LLM | `claude-sonnet-4-5-20250929` | Model name |
+| `gen_ai.response.model` | Agent, LLM | `claude-sonnet-4-5-20250929` | Response model |
+| `gen_ai.provider.name` | Agent, LLM | `anthropic` | LLM provider |
+| `gen_ai.usage.input_tokens` | Agent, LLM | `1024` | Input tokens (cumulative on agent) |
+| `gen_ai.usage.output_tokens` | Agent, LLM | `512` | Output tokens (cumulative on agent) |
+| `openclaw.usage.cache_read_tokens` | Agent, LLM | `8192` | Cached prompt tokens read |
+| `openclaw.usage.cache_write_tokens` | Agent, LLM | `4096` | Cached prompt tokens written |
+| `gen_ai.tool.name` | Tool | `Read` | Tool being called |
+| `gen_ai.tool.call.id` | Tool | `call_abc123` | Unique tool call identifier |
+| `gen_ai.tool.call.arguments` | Tool | `{"path": "/..."}` | Tool input (opt-in) |
+| `error.type` | Agent | `AgentError` | Error classification |
+| `openclaw.workspace` | Agent | `my-agent` | Workspace name |
+| `openclaw.channel` | Agent | `slack` | Message source |
 
 ### Metrics
 
@@ -77,13 +84,7 @@ invoke_agent chief-of-staff          (root span)
 
 ### Error Tracing
 
-Tool failures include full OTEL exception events:
-
-- `exception.type` — Error class name
-- `exception.message` — Error description
-- `exception.stacktrace` — Full stack trace
-
-Errors propagate up the span tree so the root `invoke_agent` span is marked as errored.
+Agent-level errors are captured on the root `invoke_agent` span with `error.type` and error status. Errors from tool failures propagate up so the agent span is marked as errored.
 
 ## Configuration
 
@@ -170,11 +171,11 @@ Connect OpenClaw traces to your backend services. When enabled, the plugin injec
 This produces connected traces across services:
 
 ```
-OpenClaw: invoke_agent chief-of-staff
-  |-- execute_tool exec (curl POST /v1/api)
-       |-- [Backend] FastAPI: POST /v1/api
+OpenClaw: invoke_agent my-agent
+  |-- execute_tool exec (curl POST /api/data)
+       |-- [Your Backend] POST /api/data
             |-- database query
-            |-- LLM call
+            |-- downstream service call
 ```
 
 Your backend must support W3C trace context extraction (most frameworks do: FastAPI with Logfire, Express with OTEL, etc.).
@@ -188,12 +189,14 @@ openclaw-logfire/src/
   otel.ts               OTEL SDK initialization (Logfire OTLP)
   hooks/
     before-agent-start  invoke_agent span creation
+    llm-input           gen_ai.chat span creation (per LLM call)
+    llm-output          LLM span close + token metrics + accumulation
     before-tool-call    execute_tool span + context propagation
-    tool-result-persist Tool span close + errors + stack traces
-    agent-end           Span close + metrics + trace link
+    tool-result-persist Tool span close + result capture
+    agent-end           Span close + cumulative tokens + metrics
     message-received    Channel attribution + inbound context
   context/
-    span-store          Session -> active spans (LIFO tool stack)
+    span-store          Session -> active spans (LIFO tool stack, LLM spans)
     propagation         W3C traceparent inject/extract
   metrics/
     genai-metrics       Token usage + operation duration histograms
@@ -206,12 +209,14 @@ openclaw-logfire/src/
 | Hook | Purpose |
 |------|---------|
 | `before_agent_start` | Create root `invoke_agent` span |
+| `llm_input` | Create `gen_ai.chat` child span per LLM call |
+| `llm_output` | Close LLM span, record token usage metrics |
 | `before_tool_call` | Create `execute_tool` child span |
-| `tool_result_persist` | Close tool span, record errors |
-| `agent_end` | Close spans, emit metrics |
+| `tool_result_persist` | Close tool span, record result size |
+| `agent_end` | Close spans, set cumulative tokens, emit metrics |
 | `message_received` | Enrich with channel info |
 
-Requires OpenClaw >= 2026.2.1 (`before_tool_call` was wired in that version).
+Requires OpenClaw >= 2026.2.1 (`before_tool_call` and `llm_input`/`llm_output` hooks).
 
 ## Development
 

package/dist/context/propagation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"propagation.d.ts","sourceRoot":"","sources":["../../src/context/propagation.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AAEH,OAAO,EAIL,KAAK,IAAI,EACT,KAAK,WAAW,EACjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAExE;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,mBAAmB,EAC1B,UAAU,EAAE,IAAI,EAChB,WAAW,EAAE,MAAM,EAAE,GACpB,IAAI,CAwCN;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,WAAW,GAAG,IAAI,CAapB"}
+{"version":3,"file":"propagation.d.ts","sourceRoot":"","sources":["../../src/context/propagation.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AAEH,OAAO,EAIL,KAAK,IAAI,EACT,KAAK,WAAW,EACjB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAExE;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,mBAAmB,EAC1B,UAAU,EAAE,IAAI,EAChB,WAAW,EAAE,MAAM,EAAE,GACpB,IAAI,CAuCN;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC9B,WAAW,GAAG,IAAI,CAapB"}

package/dist/context/propagation.js

@@ -15,15 +15,16 @@ import picomatch from 'picomatch';
  * Only injects if the target URL matches one of the configured patterns.
  */
 export function injectTraceContext(event, parentSpan, urlPatterns) {
-    const args = event.tool?.args;
-    if (!args)
+    const params = event.params;
+    if (!params)
         return;
-    const command = typeof args === 'string'
-        ? args
-        : args.command ??
-            args.cmd ??
-            '';
-    if (typeof command !== 'string')
+    // Extract command string from params (exec tool uses command/cmd keys)
+    const command = typeof params.command === 'string'
+        ? params.command
+        : typeof params.cmd === 'string'
+            ? params.cmd
+            : '';
+    if (!command)
         return;
     // Only inject into HTTP client commands
     if (!isHttpCommand(command))
@@ -43,15 +44,12 @@ export function injectTraceContext(event, parentSpan, urlPatterns) {
     if (carrier.tracestate) {
         headerFlags += ` -H "tracestate: ${carrier.tracestate}"`;
     }
-    // Mutate the event's tool args to include trace headers
-    if (typeof args === 'string') {
-        event.tool.args = args + headerFlags;
+    // Mutate the event's params to include trace headers
+    if (typeof params.command === 'string') {
+        params.command = params.command + headerFlags;
     }
-    else if (typeof args.command === 'string') {
-        args.command += headerFlags;
-    }
-    else if (typeof args.cmd === 'string') {
-        args.cmd += headerFlags;
+    else if (typeof params.cmd === 'string') {
+        params.cmd = params.cmd + headerFlags;
     }
 }
 /**

package/dist/context/propagation.js.map

@@ -1 +1 @@
-{"version":3,"file":"propagation.js","sourceRoot":"","sources":["../../src/context/propagation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"propagation.js","sourceRoot":"","sources":["../../src/context/propagation.ts"],"names":[],"mappings":"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"}

package/dist/context/span-store.d.ts

@@ -13,12 +13,34 @@ export interface ToolSpanEntry {
     callId: string;
     startTime: number;
 }
+export interface LlmSpanEntry {
+    span: Span;
+    ctx: Context;
+    runId: string;
+    provider: string;
+    model: string;
+    startTime: number;
+}
+export interface TokenAccumulator {
+    input: number;
+    output: number;
+    cacheRead: number;
+    cacheWrite: number;
+}
 export interface SessionSpanContext {
     /** Root span: invoke_agent */
     agentSpan: Span;
     agentCtx: Context;
     /** Tool call stack (LIFO for correct nesting) */
     toolStack: ToolSpanEntry[];
+    /** Pending LLM call spans indexed by runId */
+    llmSpans: Map<string, LlmSpanEntry>;
+    /** Accumulated token usage across all LLM calls */
+    tokens: TokenAccumulator;
+    /** Last known model (set by llm_input/llm_output hooks) */
+    model?: string;
+    /** Last known provider (set by llm_input/llm_output hooks) */
+    provider?: string;
     /** Monotonic tool call counter for sequencing */
     toolSequence: number;
     /** Whether any tool errored (propagated to agent span) */
@@ -37,6 +59,12 @@ declare class SpanStore {
     popTool(sessionKey: string): ToolSpanEntry | undefined;
     /** Peek at the top of the tool stack without removing. */
     peekTool(sessionKey: string): ToolSpanEntry | undefined;
+    /** Store a pending LLM call span. */
+    setLlmSpan(sessionKey: string, runId: string, entry: LlmSpanEntry): void;
+    /** Retrieve a pending LLM call span by runId. */
+    getLlmSpan(sessionKey: string, runId: string): LlmSpanEntry | undefined;
+    /** Remove and return an LLM call span. */
+    deleteLlmSpan(sessionKey: string, runId: string): LlmSpanEntry | undefined;
     get size(): number;
     /** End orphaned spans and remove stale sessions. */
     private cleanup;

package/dist/context/span-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"span-store.d.ts","sourceRoot":"","sources":["../../src/context/span-store.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAExD,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,IAAI,CAAC;IACX,GAAG,EAAE,OAAO,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAkB;IACjC,8BAA8B;IAC9B,SAAS,EAAE,IAAI,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAElB,iDAAiD;IACjD,SAAS,EAAE,aAAa,EAAE,CAAC;IAE3B,iDAAiD;IACjD,YAAY,EAAE,MAAM,CAAC;IAErB,0DAA0D;IAC1D,QAAQ,EAAE,OAAO,CAAC;IAElB,8BAA8B;IAC9B,SAAS,EAAE,MAAM,CAAC;CACnB;AAKD,cAAM,SAAS;IACb,OAAO,CAAC,QAAQ,CAAyC;IAEzD,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,kBAAkB,GAAG,IAAI;IAKtD,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAIvD,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIhC,iDAAiD;IACjD,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI;IAMxD,4CAA4C;IAC5C,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAMtD,0DAA0D;IAC1D,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAMvD,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,oDAAoD;IACpD,OAAO,CAAC,OAAO;CAahB;AAED,eAAO,MAAM,SAAS,WAAkB,CAAC"}
+{"version":3,"file":"span-store.d.ts","sourceRoot":"","sources":["../../src/context/span-store.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAExD,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,IAAI,CAAC;IACX,GAAG,EAAE,OAAO,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,IAAI,CAAC;IACX,GAAG,EAAE,OAAO,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,8BAA8B;IAC9B,SAAS,EAAE,IAAI,CAAC;IAChB,QAAQ,EAAE,OAAO,CAAC;IAElB,iDAAiD;IACjD,SAAS,EAAE,aAAa,EAAE,CAAC;IAE3B,8CAA8C;IAC9C,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IAEpC,mDAAmD;IACnD,MAAM,EAAE,gBAAgB,CAAC;IAEzB,2DAA2D;IAC3D,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf,8DAA8D;IAC9D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,iDAAiD;IACjD,YAAY,EAAE,MAAM,CAAC;IAErB,0DAA0D;IAC1D,QAAQ,EAAE,OAAO,CAAC;IAElB,8BAA8B;IAC9B,SAAS,EAAE,MAAM,CAAC;CACnB;AAKD,cAAM,SAAS;IACb,OAAO,CAAC,QAAQ,CAAyC;IAEzD,GAAG,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,kBAAkB,GAAG,IAAI;IAKtD,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAIvD,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI;IAIhC,iDAAiD;IACjD,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,GAAG,IAAI;IAMxD,4CAA4C;IAC5C,OAAO,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAMtD,0DAA0D;IAC1D,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAMvD,qCAAqC;IACrC,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,YAAY,GAAG,IAAI;IAMxE,iDAAiD;IACjD,UAAU,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIvE,0CAA0C;IAC1C,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAQ1E,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,oDAAoD;IACpD,OAAO,CAAC,OAAO;CAgBhB;AAED,eAAO,MAAM,SAAS,WAAkB,CAAC"}

package/dist/context/span-store.js

@@ -41,6 +41,27 @@ class SpanStore {
             return undefined;
         return session.toolStack[session.toolStack.length - 1];
     }
+    /** Store a pending LLM call span. */
+    setLlmSpan(sessionKey, runId, entry) {
+        const session = this.sessions.get(sessionKey);
+        if (!session)
+            return;
+        session.llmSpans.set(runId, entry);
+    }
+    /** Retrieve a pending LLM call span by runId. */
+    getLlmSpan(sessionKey, runId) {
+        return this.sessions.get(sessionKey)?.llmSpans.get(runId);
+    }
+    /** Remove and return an LLM call span. */
+    deleteLlmSpan(sessionKey, runId) {
+        const session = this.sessions.get(sessionKey);
+        if (!session)
+            return undefined;
+        const entry = session.llmSpans.get(runId);
+        if (entry)
+            session.llmSpans.delete(runId);
+        return entry;
+    }
     get size() {
         return this.sessions.size;
     }
@@ -49,9 +70,12 @@ class SpanStore {
         const now = Date.now();
         for (const [key, session] of this.sessions) {
             if (now - session.startTime > MAX_AGE_MS) {
-                // End any orphaned tool spans
-                for (const tool of session.toolStack) {
-                    tool.span.end();
+                // Close children before parent — reverse order (LIFO)
+                for (let i = session.toolStack.length - 1; i >= 0; i--) {
+                    session.toolStack[i].span.end();
+                }
+                for (const llm of [...session.llmSpans.values()].reverse()) {
+                    llm.span.end();
                 }
                 session.agentSpan.end();
                 this.sessions.delete(key);

package/dist/context/span-store.js.map

@@ -1 +1 @@
-{"version":3,"file":"span-store.js","sourceRoot":"","sources":["../../src/context/span-store.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B;;;;;;GAMG;AA8BH,sEAAsE;AACtE,MAAM,UAAU,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,aAAa;AAEhD,MAAM,SAAS;IACL,QAAQ,GAAG,IAAI,GAAG,EAA8B,CAAC;IAEzD,GAAG,CAAC,UAAkB,EAAE,GAAuB;QAC7C,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QACnC,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IAED,GAAG,CAAC,UAAkB;QACpB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,CAAC,UAAkB;QACvB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACnC,CAAC;IAED,iDAAiD;IACjD,QAAQ,CAAC,UAAkB,EAAE,KAAoB;QAC/C,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,4CAA4C;IAC5C,OAAO,CAAC,UAAkB;QACxB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAC/B,OAAO,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;IACjC,CAAC;IAED,0DAA0D;IAC1D,QAAQ,CAAC,UAAkB;QACzB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,SAAS,CAAC;QACjE,OAAO,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACzD,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC5B,CAAC;IAED,oDAAoD;IAC5C,OAAO;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,SAAS,GAAG,UAAU,EAAE,CAAC;gBACzC,8BAA8B;gBAC9B,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;oBACrC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBAClB,CAAC;gBACD,OAAO,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;gBACxB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC"}
+{"version":3,"file":"span-store.js","sourceRoot":"","sources":["../../src/context/span-store.ts"],"names":[],"mappings":"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"}

package/dist/hooks/agent-end.d.ts

@@ -5,22 +5,13 @@
  * emits metrics, and logs the Logfire trace link.
  */
 import type { LogfirePluginConfig } from '../config.js';
+import type { AgentContext } from './before-agent-start.js';
+/** OpenClaw agent_end event payload. */
 export interface AgentEndEvent {
-    context: {
-        sessionKey: string;
-        agentId?: string;
-        workspaceDir?: string;
-        model?: string;
-    };
-    /** Token usage reported by OpenClaw (structure may vary). */
-    usage?: {
-        inputTokens?: number;
-        outputTokens?: number;
-        totalTokens?: number;
-        model?: string;
-        cost?: number;
-    };
-    error?: unknown;
+    messages: unknown[];
+    success: boolean;
+    error?: string;
+    durationMs?: number;
 }
 /** Logger interface — matches OpenClaw plugin api.logger shape. */
 export interface Logger {
@@ -29,5 +20,5 @@ export interface Logger {
     warn(msg: string): void;
     error(msg: string): void;
 }
-export declare function handleAgentEnd(event: AgentEndEvent, config: LogfirePluginConfig, logger: Logger): void;
+export declare function handleAgentEnd(event: AgentEndEvent, ctx: AgentContext, config: LogfirePluginConfig, logger: Logger): void;
 //# sourceMappingURL=agent-end.d.ts.map

package/dist/hooks/agent-end.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-end.d.ts","sourceRoot":"","sources":["../../src/hooks/agent-end.ts"],"names":[],"mappings":"AACA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAExD,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE;QACP,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,6DAA6D;IAC7D,KAAK,CAAC,EAAE;QACN,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,IAAI,CAAC,EAAE,MAAM,CAAC;KACf,CAAC;IACF,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED,mEAAmE;AACnE,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,GACb,IAAI,CAgGN"}
+{"version":3,"file":"agent-end.d.ts","sourceRoot":"","sources":["../../src/hooks/agent-end.ts"],"names":[],"mappings":"AACA;;;;;GAKG;AAOH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAE5D,wCAAwC;AACxC,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,mEAAmE;AACnE,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC1B;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,aAAa,EACpB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,mBAAmB,EAC3B,MAAM,EAAE,MAAM,GACb,IAAI,CAwHN"}

package/dist/hooks/agent-end.js

@@ -8,48 +8,80 @@
 import { SpanStatusCode } from '@opentelemetry/api';
 import { spanStore } from '../context/span-store.js';
 import { buildLogfireTraceUrl } from '../trace-link.js';
-import { recordTokenUsage, recordOperationDuration } from '../metrics/genai-metrics.js';
-import { extractWorkspaceName } from '../util.js';
-export function handleAgentEnd(event, config, logger) {
-    const session = spanStore.get(event.context.sessionKey);
+import { recordOperationDuration } from '../metrics/genai-metrics.js';
+import { extractWorkspaceName, extractErrorDetails } from '../util.js';
+export function handleAgentEnd(event, ctx, config, logger) {
+    const sessionKey = typeof ctx.sessionKey === 'string' && ctx.sessionKey.length > 0
+        ? ctx.sessionKey
+        : typeof ctx.sessionId === 'string' && ctx.sessionId.length > 0
+            ? ctx.sessionId
+            : undefined;
+    if (!sessionKey)
+        return;
+    const session = spanStore.get(sessionKey);
     if (!session)
         return;
-    const durationMs = Date.now() - session.startTime;
+    const durationMs = typeof event.durationMs === 'number' && Number.isFinite(event.durationMs)
+        ? event.durationMs
+        : Date.now() - session.startTime;
     const durationS = durationMs / 1000;
-    const agentName = event.context.agentId || 'agent';
-    const workspace = extractWorkspaceName(event.context.workspaceDir);
+    const agentName = typeof ctx.agentId === 'string' && ctx.agentId.length > 0
+        ? ctx.agentId
+        : 'agent';
+    const workspace = extractWorkspaceName(typeof ctx.workspaceDir === 'string' ? ctx.workspaceDir : undefined);
     // Close any remaining tool spans (shouldn't happen but safety net)
-    for (const tool of session.toolStack) {
-        tool.span.end();
+    // Reverse order: close children before parent (LIFO)
+    for (let i = session.toolStack.length - 1; i >= 0; i--) {
+        session.toolStack[i].span.end();
     }
-    // Token usage attributes
-    const usage = event.usage;
-    if (usage) {
-        if (usage.inputTokens !== undefined) {
-            session.agentSpan.setAttribute('gen_ai.usage.input_tokens', usage.inputTokens);
-        }
-        if (usage.outputTokens !== undefined) {
-            session.agentSpan.setAttribute('gen_ai.usage.output_tokens', usage.outputTokens);
-        }
-        if (usage.model) {
-            session.agentSpan.setAttribute('gen_ai.response.model', usage.model);
-        }
+    // Close any pending LLM spans (aborted mid-call)
+    for (const llm of [...session.llmSpans.values()].reverse()) {
+        llm.span.end();
     }
     // Duration and tool count
     session.agentSpan.setAttribute('openclaw.request.duration_ms', durationMs);
     session.agentSpan.setAttribute('openclaw.request.tool_count', session.toolSequence);
+    // Cumulative token usage from llm_output hooks
+    const { tokens } = session;
+    if (tokens.input > 0 || tokens.output > 0) {
+        session.agentSpan.setAttribute('gen_ai.usage.input_tokens', tokens.input);
+        session.agentSpan.setAttribute('gen_ai.usage.output_tokens', tokens.output);
+        if (tokens.cacheRead > 0) {
+            session.agentSpan.setAttribute('openclaw.usage.cache_read_tokens', tokens.cacheRead);
+        }
+        if (tokens.cacheWrite > 0) {
+            session.agentSpan.setAttribute('openclaw.usage.cache_write_tokens', tokens.cacheWrite);
+        }
+    }
+    // Model/provider from LLM hooks (last seen values)
+    if (session.model) {
+        session.agentSpan.setAttribute('gen_ai.request.model', session.model);
+        session.agentSpan.setAttribute('gen_ai.response.model', session.model);
+    }
+    if (session.provider) {
+        session.agentSpan.setAttribute('gen_ai.provider.name', session.provider);
+    }
     // Error status
-    if (event.error || session.hasError) {
-        const errorType = event.error instanceof Error
-            ? event.error.constructor.name
+    if (event.error || !event.success || session.hasError) {
+        const errorType = event.error
+            ? 'AgentError'
             : session.hasError
                 ? 'ToolError'
                 : 'Error';
+        const errorMsg = event.error || 'Agent invocation failed';
         session.agentSpan.setAttribute('error.type', errorType);
         session.agentSpan.setStatus({
             code: SpanStatusCode.ERROR,
-            message: event.error ? String(event.error) : 'Tool error occurred',
+            message: errorMsg,
         });
+        // Record structured exception per OTEL semantic conventions.
+        // recordException() expects Error | string — construct a real Error instance.
+        const errDetails = extractErrorDetails(event.error ?? errorMsg);
+        const exception = new Error(errDetails.message);
+        exception.name = errDetails.type;
+        if (errDetails.stacktrace)
+            exception.stack = errDetails.stacktrace;
+        session.agentSpan.recordException(exception);
     }
     else {
         session.agentSpan.setStatus({ code: SpanStatusCode.OK });
@@ -61,23 +93,15 @@ export function handleAgentEnd(event, config, logger) {
         const metricAttrs = {
             agentName,
             workspace,
-            providerName: config.providerName || 'unknown',
-            requestModel: event.context.model || usage?.model || '',
-            responseModel: usage?.model || '',
-            hasError: !!(event.error || session.hasError),
+            providerName: session.provider || config.providerName || 'unknown',
+            requestModel: session.model || '',
+            responseModel: session.model || '',
+            hasError: !!(event.error || !event.success || session.hasError),
             errorType: event.error
-                ? event.error instanceof Error
-                    ? event.error.constructor.name
-                    : 'Error'
+                ? 'AgentError'
                 : undefined,
         };
         recordOperationDuration(durationS, metricAttrs);
-        if (usage?.inputTokens !== undefined) {
-            recordTokenUsage(usage.inputTokens, 'input', metricAttrs);
-        }
-        if (usage?.outputTokens !== undefined) {
-            recordTokenUsage(usage.outputTokens, 'output', metricAttrs);
-        }
     }
     // Log trace link
     if (config.enableTraceLinks && config.projectUrl) {
@@ -86,6 +110,6 @@ export function handleAgentEnd(event, config, logger) {
         logger.info(`Logfire trace: ${url}`);
     }
     // Cleanup
-    spanStore.delete(event.context.sessionKey);
+    spanStore.delete(sessionKey);
 }
 //# sourceMappingURL=agent-end.js.map

package/dist/hooks/agent-end.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-end.js","sourceRoot":"","sources":["../../src/hooks/agent-end.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-end.js","sourceRoot":"","sources":["../../src/hooks/agent-end.ts"],"names":[],"mappings":"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"}

package/dist/hooks/before-agent-start.d.ts

@@ -6,17 +6,18 @@
  * in agent-end.ts.
  */
 import type { LogfirePluginConfig } from '../config.js';
-/** Minimal contract for the hook event — we only access what we need. */
+/** OpenClaw before_agent_start event payload. */
 export interface BeforeAgentStartEvent {
-    context: {
-        sessionKey: string;
-        agentId?: string;
-        workspaceDir?: string;
-        commandSource?: string;
-        senderId?: string;
-        model?: string;
-        messages?: unknown[];
-    };
+    prompt: string;
+    messages?: unknown[];
 }
-export declare function handleBeforeAgentStart(event: BeforeAgentStartEvent, config: LogfirePluginConfig): void;
+/** OpenClaw agent lifecycle hook context (2nd argument). */
+export interface AgentContext {
+    agentId?: string;
+    sessionKey?: string;
+    sessionId?: string;
+    workspaceDir?: string;
+    messageProvider?: string;
+}
+export declare function handleBeforeAgentStart(_event: BeforeAgentStartEvent, ctx: AgentContext, config: LogfirePluginConfig): void;
 //# sourceMappingURL=before-agent-start.d.ts.map

package/dist/hooks/before-agent-start.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"before-agent-start.d.ts","sourceRoot":"","sources":["../../src/hooks/before-agent-start.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAExD,yEAAyE;AACzE,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE;QACP,UAAU,EAAE,MAAM,CAAC;QACnB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;KACtB,CAAC;CACH;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,qBAAqB,EAC5B,MAAM,EAAE,mBAAmB,GAC1B,IAAI,CAiDN"}
+{"version":3,"file":"before-agent-start.d.ts","sourceRoot":"","sources":["../../src/hooks/before-agent-start.ts"],"names":[],"mappings":"AACA;;;;;;GAMG;AAKH,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAExD,iDAAiD;AACjD,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB;AAED,4DAA4D;AAC5D,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,qBAAqB,EAC7B,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,mBAAmB,GAC1B,IAAI,CAgDN"}