@raindrop-ai/pi-agent 0.0.10 → 0.1.1

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { Agent } from '@earendil-works/pi-agent-core';
-import { A as Attachment } from './index.d-DBLTz2Nz.cjs';
+import { A as Attachment } from './index.d-DPYV95P7.cjs';
 
 /**
  * Options for the Raindrop Pi Agent client.
@@ -24,6 +24,15 @@ interface RaindropPiAgentOptions {
     convoId?: string;
     /** Default event name (default: "pi_agent_prompt") */
     eventName?: string;
+    /**
+     * Per-run event id source. Invoked once per agent run to mint that run's
+     * event id (reused for the run's Raindrop event and every linked span). A
+     * static string is intentionally not accepted: a long-lived client runs many
+     * agent runs, and a fixed id would collide across them. Absent / throwing /
+     * non-string / empty results fall back to a random UUID, so a caller's id
+     * source never crashes telemetry.
+     */
+    eventId?: () => string;
     /** Default properties attached to every event */
     properties?: Record<string, unknown>;
     /**
@@ -69,6 +78,8 @@ interface PiAgentSubscribeOptions {
     convoId?: string;
     /** Event name override */
     eventName?: string;
+    /** Per-run event id source override (see RaindropPiAgentOptions.eventId) */
+    eventId?: () => string;
     /** Additional properties */
     properties?: Record<string, unknown>;
 }

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Agent } from '@earendil-works/pi-agent-core';
-import { A as Attachment } from './index.d-DBLTz2Nz.js';
+import { A as Attachment } from './index.d-DPYV95P7.js';
 
 /**
  * Options for the Raindrop Pi Agent client.
@@ -24,6 +24,15 @@ interface RaindropPiAgentOptions {
     convoId?: string;
     /** Default event name (default: "pi_agent_prompt") */
     eventName?: string;
+    /**
+     * Per-run event id source. Invoked once per agent run to mint that run's
+     * event id (reused for the run's Raindrop event and every linked span). A
+     * static string is intentionally not accepted: a long-lived client runs many
+     * agent runs, and a fixed id would collide across them. Absent / throwing /
+     * non-string / empty results fall back to a random UUID, so a caller's id
+     * source never crashes telemetry.
+     */
+    eventId?: () => string;
     /** Default properties attached to every event */
     properties?: Record<string, unknown>;
     /**
@@ -69,6 +78,8 @@ interface PiAgentSubscribeOptions {
     convoId?: string;
     /** Event name override */
     eventName?: string;
+    /** Per-run event id source override (see RaindropPiAgentOptions.eventId) */
+    eventId?: () => string;
     /** Additional properties */
     properties?: Record<string, unknown>;
 }

package/dist/index.js

@@ -13,21 +13,35 @@ import {
   getHostname,
   getUsername,
   libraryVersion,
+  modelSpendSpanAttributes,
   randomUUID,
   resolveLocalDebuggerBaseUrl,
   safeStringify,
   truncate
-} from "./chunk-GXL5WZE5.js";
+} from "./chunk-GTKXT2J5.js";
 
 // src/internal/subscriber.ts
+function pushAttr(attrs, attr) {
+  if (attr) attrs.push(attr);
+}
+function resolveEventId(source) {
+  if (typeof source !== "function") return randomUUID();
+  try {
+    const id = source();
+    return typeof id === "string" && id.trim() !== "" ? id : randomUUID();
+  } catch (e) {
+    return randomUUID();
+  }
+}
 function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, options, debug) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const userId = (_a = options.userId) != null ? _a : defaultOptions.userId;
   const convoId = (_b = options.convoId) != null ? _b : defaultOptions.convoId;
   const eventName = (_c = options.eventName) != null ? _c : defaultOptions.eventName;
+  const eventIdSource = (_d = options.eventId) != null ? _d : defaultOptions.eventId;
   const properties = {
-    ...(_d = defaultOptions.properties) != null ? _d : {},
-    ...(_e = options.properties) != null ? _e : {}
+    ...(_e = defaultOptions.properties) != null ? _e : {},
+    ...(_f = options.properties) != null ? _f : {}
   };
   let currentRun;
   function log(msg) {
@@ -58,7 +72,7 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
         }
         currentRun = void 0;
       }
-      const eventId = randomUUID();
+      const eventId = resolveEventId(eventIdSource);
       const rootSpan = traceShipper ? traceShipper.startSpan({
         name: "ai.event",
         eventId,
@@ -127,41 +141,30 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
       if (usage) {
         currentRun.totalInputTokens += usage.input;
         currentRun.totalOutputTokens += usage.output;
-        if (usage.cacheRead) currentRun.totalCacheReadTokens += usage.cacheRead;
+        if (usage.cacheRead > 0) currentRun.totalCacheReadTokens += usage.cacheRead;
       }
       if (!traceShipper || !currentRun.currentTurnSpan) return;
       const rawProvider = provider;
       const rawModelId = bareModel;
       const stopReason = "stopReason" in message && typeof message.stopReason === "string" ? message.stopReason : void 0;
-      const llmAttrs = [
-        attrString("ai.operationId", "generateText")
-      ];
+      const llmAttrs = [];
+      pushAttr(llmAttrs, attrString("ai.operationId", "generateText"));
       if (rawProvider) {
-        llmAttrs.push(attrString("gen_ai.system", rawProvider));
+        pushAttr(llmAttrs, attrString("gen_ai.system", rawProvider));
       }
       if (rawModelId) {
-        llmAttrs.push(
-          attrString("gen_ai.response.model", rawModelId),
-          attrString("gen_ai.request.model", rawModelId)
-        );
-      }
-      if (usage) {
-        llmAttrs.push(
-          attrInt("gen_ai.usage.input_tokens", usage.input),
-          attrInt("gen_ai.usage.output_tokens", usage.output)
-        );
-        if (usage.cacheRead) {
-          llmAttrs.push(attrInt("gen_ai.usage.cache_read_tokens", usage.cacheRead));
-        }
+        pushAttr(llmAttrs, attrString("gen_ai.response.model", rawModelId));
+        pushAttr(llmAttrs, attrString("gen_ai.request.model", rawModelId));
       }
+      llmAttrs.push(...modelSpendSpanAttributes({ provider: rawProvider, usage }));
       if (assistantText) {
-        llmAttrs.push(attrString("ai.response.text", truncate(assistantText)));
+        pushAttr(llmAttrs, attrString("ai.response.text", truncate(assistantText)));
       }
       if (currentRun.currentInput) {
-        llmAttrs.push(attrString("ai.prompt", truncate(currentRun.currentInput)));
+        pushAttr(llmAttrs, attrString("ai.prompt", truncate(currentRun.currentInput)));
       }
       if (stopReason) {
-        llmAttrs.push(attrString("ai.stop_reason", stopReason));
+        pushAttr(llmAttrs, attrString("ai.stop_reason", stopReason));
       }
       const llmSpan = traceShipper.startSpan({
         name: model != null ? model : "llm",
@@ -170,6 +173,13 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
         attributes: llmAttrs
       });
       const errorForSpan = stopReason === "error" || stopReason === "aborted" ? "errorMessage" in message && typeof message.errorMessage === "string" ? message.errorMessage : `Assistant ${stopReason}` : void 0;
+      if (errorForSpan) {
+        const assistantError = new Error(errorForSpan);
+        assistantError.name = stopReason === "aborted" ? "AbortError" : "PiAgentError";
+        currentRun.error = assistantError;
+      } else {
+        currentRun.error = void 0;
+      }
       traceShipper.endSpan(llmSpan, errorForSpan ? { error: errorForSpan } : void 0);
       const toolCallIds = extractToolCallIds(message);
       for (const tcId of toolCallIds) {
@@ -256,9 +266,9 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
       if (!traceShipper || !toolSpan) return;
       const endAttrs = [];
       const argsStr = truncate(safeStringify(args));
-      if (argsStr) endAttrs.push(attrString("ai.toolCall.args", argsStr));
+      if (argsStr) pushAttr(endAttrs, attrString("ai.toolCall.args", argsStr));
       const resultStr = truncate(safeStringify(result));
-      if (resultStr) endAttrs.push(attrString("ai.toolCall.result", resultStr));
+      if (resultStr) pushAttr(endAttrs, attrString("ai.toolCall.result", resultStr));
       traceShipper.endSpan(toolSpan, {
         attributes: endAttrs,
         ...isError ? { error: `Tool "${toolName}" failed` } : {}
@@ -285,42 +295,44 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
       }
       const outputText = capText(run.outputParts.join(""));
       if (traceShipper && run.rootSpan) {
-        const rootAttrs = [
-          attrString("ai.operationId", "generateText")
-        ];
+        const rootAttrs = [];
+        pushAttr(rootAttrs, attrString("ai.operationId", "generateText"));
         if (run.lastModel) {
           run.rootSpan.name = run.lastProvider ? `${run.lastProvider}/${run.lastModel}` : run.lastModel;
-          rootAttrs.push(attrString("gen_ai.response.model", run.lastModel));
+          pushAttr(rootAttrs, attrString("gen_ai.response.model", run.lastModel));
         }
         if (run.currentInput) {
-          rootAttrs.push(attrString("ai.prompt", truncate(run.currentInput)));
+          pushAttr(rootAttrs, attrString("ai.prompt", truncate(run.currentInput)));
         }
         if (outputText) {
-          rootAttrs.push(attrString("ai.response.text", truncate(outputText)));
+          pushAttr(rootAttrs, attrString("ai.response.text", truncate(outputText)));
         }
         if (run.totalInputTokens > 0) {
-          rootAttrs.push(attrInt("gen_ai.usage.input_tokens", run.totalInputTokens));
+          pushAttr(rootAttrs, attrInt("gen_ai.usage.input_tokens", run.totalInputTokens));
         }
         if (run.totalOutputTokens > 0) {
-          rootAttrs.push(attrInt("gen_ai.usage.output_tokens", run.totalOutputTokens));
+          pushAttr(rootAttrs, attrInt("gen_ai.usage.output_tokens", run.totalOutputTokens));
         }
         if (run.totalCacheReadTokens > 0) {
-          rootAttrs.push(attrInt("gen_ai.usage.cache_read_tokens", run.totalCacheReadTokens));
+          pushAttr(rootAttrs, attrInt("gen_ai.usage.cache_read_tokens", run.totalCacheReadTokens));
         }
-        rootAttrs.push(attrInt("ai.total_turns", run.turnNumber));
+        pushAttr(rootAttrs, attrInt("ai.total_turns", run.turnNumber));
         traceShipper.endSpan(run.rootSpan, { attributes: rootAttrs });
       }
       if (eventShipper) {
         eventShipper.finish(run.eventId, {
           userId: userId != null ? userId : "anonymous",
           model: run.lastModel || void 0,
-          output: outputText || void 0,
+          output: run.error ? void 0 : outputText || void 0,
+          usage: {
+            promptTokens: run.totalInputTokens > 0 ? run.totalInputTokens : void 0,
+            completionTokens: run.totalOutputTokens > 0 ? run.totalOutputTokens : void 0
+          },
+          error: run.error,
           properties: {
             ...properties,
             sdk_version: libraryVersion,
             ...run.lastProvider ? { "ai.provider": run.lastProvider } : {},
-            ...run.totalInputTokens > 0 ? { "ai.usage.prompt_tokens": run.totalInputTokens } : {},
-            ...run.totalOutputTokens > 0 ? { "ai.usage.completion_tokens": run.totalOutputTokens } : {},
             ...run.totalCacheReadTokens > 0 ? { "ai.usage.cache_read_tokens": run.totalCacheReadTokens } : {}
           }
         }).catch(() => {
@@ -421,6 +433,7 @@ function createRaindropPiAgent(opts) {
     userId: opts.userId,
     convoId: opts.convoId,
     eventName: opts.eventName,
+    eventId: opts.eventId,
     properties: opts.properties
   };
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raindrop-ai/pi-agent",
-  "version": "0.0.10",
+  "version": "0.1.1",
   "description": "Raindrop observability for Pi Agent — automatic tracing via subscriber or pi-coding-agent extension",
   "type": "module",
   "license": "MIT",
@@ -54,7 +54,7 @@
     "tsup": "^8.5.1",
     "typescript": "^5.7.3",
     "vitest": "^2.1.9",
-    "@raindrop-ai/core": "0.1.2"
+    "@raindrop-ai/core": "0.2.0"
   },
   "tsup": {
     "entry": [