@raindrop-ai/pi-agent 0.0.10 → 0.1.1

package/dist/index.cjs

@@ -24,7 +24,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// ../core/dist/chunk-267IXHO5.js
+// ../core/dist/chunk-YUIXRQWN.js
 function getCrypto() {
   const c = globalThis.crypto;
   return c;
@@ -79,6 +79,20 @@ function base64Encode(bytes) {
   }
   return out;
 }
+var HANDOFF_ATTRIBUTE_SUFFIXES = {
+  mode: "raindrop.handoff.mode",
+  childEventId: "raindrop.handoff.childEventId",
+  parentEventId: "raindrop.handoff.parentEventId",
+  parentSpanId: "raindrop.handoff.parentSpanId",
+  name: "raindrop.handoff.name",
+  terminal: "raindrop.handoff.terminal",
+  agentRole: "raindrop.agent.role"
+};
+var HANDOFF_TERMINAL_PROPERTY_KEY = HANDOFF_ATTRIBUTE_SUFFIXES.terminal;
+var TRACEPARENT_HEADER = "traceparent";
+var BAGGAGE_HEADER = "baggage";
+var HANDOFF_HEADER = "x-raindrop-handoff";
+var UNRESOLVED_CARRIER_WARNING = `[raindrop] resume: headers were supplied but no hand-off carrier was found on them (searched ${HANDOFF_HEADER}, ${TRACEPARENT_HEADER}, ${BAGGAGE_HEADER}). This run reports as an UNLINKED event, and the launcher that dispatched it will stay on "queued" forever because nothing ever references its child. Passing headers means a parent handed off, so no carrier on them is almost certainly a defect: a gateway or proxy stripping ${HANDOFF_HEADER}, a middleware overwriting ${BAGGAGE_HEADER}, a request forwarded without its headers, or a hand-built carrier whose field names do not match. Send every header the launcher's dispatch returned. Logged once per process; pass no headers for a directly-invoked sub-agent to silence it.`;
 function runWithTracingSuppressed(fn) {
   const hook = globalThis.RAINDROP_SUPPRESS_TRACING;
   if (typeof hook !== "function") return fn();
@@ -414,19 +428,52 @@ function projectIdHeaders(projectId) {
 var SHUTDOWN_DEADLINE_MS = 1e4;
 var POST_SHUTDOWN_TIMEOUT_MS = 5e3;
 function mergePatches(target, source) {
-  var _a, _b, _c, _d, _e, _f;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const out = { ...target, ...source };
   if (target.properties || source.properties) {
     out.properties = { ...(_a = target.properties) != null ? _a : {}, ...(_b = source.properties) != null ? _b : {} };
   }
+  if (target.usage || source.usage) {
+    out.usage = { ...(_c = target.usage) != null ? _c : {} };
+    if (((_d = source.usage) == null ? void 0 : _d.promptTokens) !== void 0) {
+      out.usage.promptTokens = source.usage.promptTokens;
+    }
+    if (((_e = source.usage) == null ? void 0 : _e.completionTokens) !== void 0) {
+      out.usage.completionTokens = source.usage.completionTokens;
+    }
+  }
+  if (source.error === void 0) {
+    out.error = target.error;
+  }
   if (target.featureFlags || source.featureFlags) {
-    out.featureFlags = { ...(_c = target.featureFlags) != null ? _c : {}, ...(_d = source.featureFlags) != null ? _d : {} };
+    out.featureFlags = { ...(_f = target.featureFlags) != null ? _f : {}, ...(_g = source.featureFlags) != null ? _g : {} };
   }
   if (target.attachments || source.attachments) {
-    out.attachments = [...(_e = target.attachments) != null ? _e : [], ...(_f = source.attachments) != null ? _f : []];
+    out.attachments = [...(_h = target.attachments) != null ? _h : [], ...(_i = source.attachments) != null ? _i : []];
   }
   return out;
 }
+function isErrorLike(value) {
+  return value !== null && typeof value === "object";
+}
+function eventTelemetryProperties(patch) {
+  var _a, _b;
+  const properties = {};
+  if (((_a = patch.usage) == null ? void 0 : _a.promptTokens) !== void 0 && Number.isFinite(patch.usage.promptTokens)) {
+    properties["ai.usage.prompt_tokens"] = patch.usage.promptTokens;
+  }
+  if (((_b = patch.usage) == null ? void 0 : _b.completionTokens) !== void 0 && Number.isFinite(patch.usage.completionTokens)) {
+    properties["ai.usage.completion_tokens"] = patch.usage.completionTokens;
+  }
+  if (patch.error !== void 0 && patch.error !== null) {
+    const constructorName = patch.error instanceof Error && patch.error.constructor !== Error ? patch.error.constructor.name : void 0;
+    const errorType = patch.error instanceof Error ? patch.error.name && patch.error.name !== "Error" ? patch.error.name : constructorName || patch.error.name || "Error" : isErrorLike(patch.error) && typeof patch.error.name === "string" && patch.error.name.length > 0 ? patch.error.name : "Error";
+    const errorMessage = patch.error instanceof Error ? patch.error.message : isErrorLike(patch.error) && typeof patch.error.message === "string" ? patch.error.message : String(patch.error);
+    properties["error.type"] = errorType;
+    properties["error.message"] = errorMessage;
+  }
+  return properties;
+}
 var EventShipper = class {
   constructor(opts) {
     this.buffers = /* @__PURE__ */ new Map();
@@ -675,6 +722,11 @@ var EventShipper = class {
       return;
     }
     const { wizardSession, ...restProperties } = (_e = accumulated.properties) != null ? _e : {};
+    let telemetryProperties = {};
+    try {
+      telemetryProperties = eventTelemetryProperties(accumulated);
+    } catch (e) {
+    }
     const convoId = (_f = accumulated.convoId) != null ? _f : sticky.convoId;
     const isPending = (_h = (_g = accumulated.isPending) != null ? _g : sticky.isPending) != null ? _h : true;
     const payload = {
@@ -684,12 +736,13 @@ var EventShipper = class {
       timestamp: (_i = accumulated.timestamp) != null ? _i : (/* @__PURE__ */ new Date()).toISOString(),
       ai_data: {
         input: accumulated.input,
-        output: accumulated.output,
+        output: accumulated.error !== void 0 && accumulated.error !== null ? void 0 : accumulated.output,
         model: accumulated.model,
         convo_id: convoId
       },
       properties: {
         ...restProperties,
+        ...telemetryProperties,
         ...wizardSession ? { "raindrop.wizardSession": wizardSession } : {},
         $context: this.context
       },
@@ -758,6 +811,194 @@ var EventShipper = class {
     }
   }
 };
+var MODEL_USAGE_ATTRIBUTES = {
+  providerName: "gen_ai.provider.name",
+  requestModel: "gen_ai.request.model",
+  responseModel: "gen_ai.response.model",
+  inputTokens: "gen_ai.usage.input_tokens",
+  outputTokens: "gen_ai.usage.output_tokens",
+  reasoningTokens: "gen_ai.usage.reasoning_tokens",
+  cacheReadInputTokens: "gen_ai.usage.cache_read_input_tokens",
+  cacheWriteInputTokens: "gen_ai.usage.cache_write_input_tokens",
+  nonCachedInputTokens: "raindrop.usage.input_tokens.non_cached",
+  nonReasoningOutputTokens: "raindrop.usage.output_tokens.non_reasoning",
+  totalOutputTokens: "raindrop.usage.output_tokens.total",
+  reasoningOutputTokens: "raindrop.usage.output_tokens.reasoning",
+  cacheReadTokens: "raindrop.usage.input_tokens.cache_read",
+  cacheWriteTokens: "raindrop.usage.input_tokens.cache_write"
+};
+var MODEL_PROVIDER_NAMES = [
+  ["google.vertex", "google-vertex"],
+  ["vertex.anthropic", "google-vertex"],
+  ["amazon-bedrock", "amazon-bedrock"],
+  ["bedrock", "amazon-bedrock"],
+  ["anthropic", "anthropic"],
+  ["openai", "openai"],
+  ["google", "google"],
+  ["azure", "azure"],
+  ["openrouter", "openrouter"]
+];
+function canonicalModelProvider(provider) {
+  var _a;
+  const normalizedProvider = provider.trim().toLowerCase();
+  if (normalizedProvider === "gateway") return "vercel";
+  const match = MODEL_PROVIDER_NAMES.find(
+    ([family]) => normalizedProvider === family || normalizedProvider.startsWith(`${family}.`)
+  );
+  return (_a = match == null ? void 0 : match[1]) != null ? _a : provider;
+}
+function tokenCount(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+}
+function exclusiveTokens({
+  explicit,
+  total,
+  parts,
+  semantics
+}) {
+  if (explicit !== void 0) return explicit;
+  if (total === void 0) return void 0;
+  if (semantics === "exclusive") return total;
+  const observedParts = parts.filter((part) => part !== void 0 && part > 0);
+  if (semantics === void 0 && observedParts.length > 0) return void 0;
+  const exclusive = total - observedParts.reduce((sum, part) => sum + part, 0);
+  return exclusive >= 0 ? exclusive : void 0;
+}
+function buildModelUsageAttributes(usage) {
+  const inputTokens = tokenCount(usage.inputTokens);
+  const outputTokens = tokenCount(usage.outputTokens);
+  const explicitNonCachedInputTokens = tokenCount(usage.nonCachedInputTokens);
+  const explicitNonReasoningOutputTokens = tokenCount(usage.nonReasoningOutputTokens);
+  const reasoningTokens = tokenCount(usage.reasoningTokens);
+  const cacheReadInputTokens = tokenCount(usage.cacheReadInputTokens);
+  const cacheWriteInputTokens = tokenCount(usage.cacheWriteInputTokens);
+  const nonCachedInputTokens = exclusiveTokens({
+    explicit: explicitNonCachedInputTokens,
+    total: inputTokens,
+    parts: [cacheReadInputTokens, cacheWriteInputTokens],
+    semantics: usage.inputTokenSemantics
+  });
+  const nonReasoningOutputTokens = exclusiveTokens({
+    explicit: explicitNonReasoningOutputTokens,
+    total: outputTokens,
+    parts: [reasoningTokens],
+    semantics: usage.outputTokenSemantics
+  });
+  const exclusivePoolAttributes = nonCachedInputTokens !== void 0 && nonReasoningOutputTokens !== void 0 ? [
+    // backend consumes this complete raindrop.* set as one atomic billing-pool contract.
+    attrInt(MODEL_USAGE_ATTRIBUTES.nonCachedInputTokens, nonCachedInputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.nonReasoningOutputTokens, nonReasoningOutputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.reasoningOutputTokens, reasoningTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheReadTokens, cacheReadInputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheWriteTokens, cacheWriteInputTokens)
+  ] : [];
+  return [
+    attrInt(MODEL_USAGE_ATTRIBUTES.inputTokens, inputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.outputTokens, outputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.reasoningTokens, reasoningTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheReadInputTokens, cacheReadInputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheWriteInputTokens, cacheWriteInputTokens),
+    ...exclusivePoolAttributes
+  ].filter((attribute) => attribute !== void 0);
+}
+var STRING_ALIASES = {
+  [MODEL_USAGE_ATTRIBUTES.requestModel]: ["ai.model.id", "ai.model"]
+};
+var NUMBER_ALIASES = {
+  [MODEL_USAGE_ATTRIBUTES.inputTokens]: [
+    "gen_ai.usage.prompt_tokens",
+    "ai.usage.prompt_tokens",
+    "ai.usage.promptTokens",
+    "ai.usage.input_tokens",
+    "ai.usage.inputTokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.outputTokens]: [
+    "gen_ai.usage.completion_tokens",
+    "ai.usage.completion_tokens",
+    "ai.usage.completionTokens",
+    "ai.usage.output_tokens",
+    "ai.usage.outputTokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.reasoningTokens]: [
+    "gen_ai.usage.reasoning.output_tokens",
+    "ai.usage.reasoningTokens",
+    "ai.usage.thoughts_tokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.cacheReadInputTokens]: [
+    "gen_ai.usage.cache_read_tokens",
+    "gen_ai.usage.cache_read.input_tokens",
+    "ai.usage.cachedInputTokens",
+    "ai.usage.cached_tokens",
+    "ai.usage.cache_read_tokens",
+    "ai.usage.cache_read_input_tokens",
+    "ai.usage.cacheReadInputTokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.cacheWriteInputTokens]: [
+    "gen_ai.usage.cache_creation_input_tokens",
+    "gen_ai.usage.cache_creation.input_tokens",
+    "ai.usage.cacheWriteInputTokens",
+    "ai.usage.cache_creation_input_tokens",
+    "ai.usage.cacheCreationInputTokens"
+  ]
+};
+function hasAttribute(attributes, key) {
+  return attributes.some((attribute) => attribute.key === key);
+}
+function findStringAttribute(attributes, keys) {
+  return attributes.find(
+    (attribute) => keys.includes(attribute.key) && typeof attribute.value.stringValue === "string" && attribute.value.stringValue.length > 0
+  );
+}
+function findNumberAttribute(attributes, keys) {
+  return attributes.find((attribute) => {
+    if (!keys.includes(attribute.key)) return false;
+    if (typeof attribute.value.doubleValue === "number" && Number.isSafeInteger(attribute.value.doubleValue) && attribute.value.doubleValue >= 0) {
+      return true;
+    }
+    const intValue = attribute.value.intValue;
+    return integerValue(intValue) !== void 0;
+  });
+}
+function integerValue(value) {
+  if (typeof value === "number") {
+    return Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+  }
+  if (typeof value !== "string") return void 0;
+  const parsed = Number(value);
+  return Number.isSafeInteger(parsed) && parsed >= 0 ? parsed : void 0;
+}
+function appendAlias(attributes, target, source) {
+  if (!source || hasAttribute(attributes, target)) return attributes;
+  return [...attributes, { key: target, value: { ...source.value } }];
+}
+function appendProviderAlias(attributes) {
+  if (hasAttribute(attributes, MODEL_USAGE_ATTRIBUTES.providerName)) return attributes;
+  const source = findStringAttribute(attributes, ["gen_ai.system", "ai.model.provider"]);
+  if (!(source == null ? void 0 : source.value.stringValue)) return attributes;
+  const attribute = attrString(
+    MODEL_USAGE_ATTRIBUTES.providerName,
+    canonicalModelProvider(source.value.stringValue)
+  );
+  return attribute ? [...attributes, attribute] : attributes;
+}
+function normalizeModelUsageSpan(span) {
+  const original = span.attributes;
+  if (!original || original.length === 0) return span;
+  const responseModel = findStringAttribute(original, [
+    MODEL_USAGE_ATTRIBUTES.responseModel,
+    "ai.response.model"
+  ]);
+  if (!responseModel) return span;
+  let attributes = appendAlias(original, MODEL_USAGE_ATTRIBUTES.responseModel, responseModel);
+  attributes = appendProviderAlias(attributes);
+  for (const [target, aliases] of Object.entries(STRING_ALIASES)) {
+    attributes = appendAlias(attributes, target, findStringAttribute(attributes, aliases));
+  }
+  for (const [target, aliases] of Object.entries(NUMBER_ALIASES)) {
+    attributes = appendAlias(attributes, target, findNumberAttribute(attributes, aliases));
+  }
+  return attributes === original ? span : { ...span, attributes };
+}
 var DEFAULT_SECRET_KEY_NAMES = [
   "apikey",
   "apisecret",
@@ -847,6 +1088,13 @@ function redactJsonAttributeValue(key, value) {
   if (scrubbedJson === json) return void 0;
   return { stringValue: scrubbedJson };
 }
+function identityAttrs(args) {
+  return [
+    attrString("ai.telemetry.metadata.raindrop.ai.userId", args.userId),
+    attrString("ai.telemetry.metadata.raindrop.convoId", args.convoId),
+    attrString("ai.telemetry.metadata.raindrop.eventName", args.eventName)
+  ];
+}
 function applyOtelSpanAttributeLimit(limit) {
   var _a, _b;
   try {
@@ -951,6 +1199,10 @@ var TraceShipper = class {
         return null;
       }
     }
+    try {
+      current = normalizeModelUsageSpan(current);
+    } catch (e) {
+    }
     if (!this.disableDefaultRedaction) {
       current = defaultTransformSpan(current);
     }
@@ -971,6 +1223,7 @@ var TraceShipper = class {
     const started = (_a = args.startTimeUnixNano) != null ? _a : nowUnixNanoString();
     const attrs = [
       attrString("ai.telemetry.metadata.raindrop.eventId", args.eventId),
+      ...identityAttrs(args),
       attrString("ai.operationId", args.operationId)
     ];
     if ((_b = args.attributes) == null ? void 0 : _b.length) attrs.push(...args.attributes);
@@ -1026,7 +1279,8 @@ var TraceShipper = class {
     var _a;
     const ids = createSpanIds(args.parent);
     const attrs = [
-      attrString("ai.telemetry.metadata.raindrop.eventId", args.eventId)
+      attrString("ai.telemetry.metadata.raindrop.eventId", args.eventId),
+      ...identityAttrs(args)
     ];
     if ((_a = args.attributes) == null ? void 0 : _a.length) attrs.push(...args.attributes);
     const otlp = buildOtlpSpan({
@@ -1194,7 +1448,7 @@ installTracingSuppressionHook();
 // package.json
 var package_default = {
   name: "@raindrop-ai/pi-agent",
-  version: "0.0.10",
+  version: "0.1.1",
   description: "Raindrop observability for Pi Agent \u2014 automatic tracing via subscriber or pi-coding-agent extension",
   type: "module",
   license: "MIT",
@@ -1349,9 +1603,22 @@ function extractTokenUsage(message) {
   return {
     input: usage.input,
     output: usage.output,
-    ...typeof usage.cacheRead === "number" && usage.cacheRead > 0 ? { cacheRead: usage.cacheRead } : {}
+    cacheRead: typeof usage.cacheRead === "number" ? usage.cacheRead : 0,
+    cacheWrite: typeof usage.cacheWrite === "number" ? usage.cacheWrite : 0
   };
 }
+function modelSpendSpanAttributes(input) {
+  const providerAttr = input.provider ? attrString("gen_ai.provider.name", canonicalModelProvider(input.provider)) : void 0;
+  const usageAttrs = input.usage ? buildModelUsageAttributes({
+    inputTokens: input.usage.input,
+    outputTokens: input.usage.output,
+    cacheReadInputTokens: input.usage.cacheRead,
+    cacheWriteInputTokens: input.usage.cacheWrite,
+    reasoningTokens: 0,
+    inputTokenSemantics: "exclusive"
+  }) : [];
+  return providerAttr ? [providerAttr, ...usageAttrs] : usageAttrs;
+}
 function extractAssistantText(message) {
   if (!("role" in message) || message.role !== "assistant") return void 0;
   if (!Array.isArray(message.content)) return void 0;
@@ -1493,14 +1760,27 @@ function getUsername() {
 }
 
 // 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) {
@@ -1531,7 +1811,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,
@@ -1600,41 +1880,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",
@@ -1643,6 +1912,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) {
@@ -1729,9 +2005,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` } : {}
@@ -1758,42 +2034,44 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
       }
       const outputText = capText2(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(() => {
@@ -1894,6 +2172,7 @@ function createRaindropPiAgent(opts) {
     userId: opts.userId,
     convoId: opts.convoId,
     eventName: opts.eventName,
+    eventId: opts.eventId,
     properties: opts.properties
   };
   return {

package/dist/{index.d-DBLTz2Nz.d.cts → index.d-DPYV95P7.d.cts}

@@ -45,6 +45,10 @@ type IdentifyInput = {
     userId: string;
     traits?: Record<string, unknown>;
 };
+type EventUsage = {
+    promptTokens?: number;
+    completionTokens?: number;
+};
 type Patch = {
     eventName?: string;
     userId?: string;
@@ -52,6 +56,8 @@ type Patch = {
     input?: string;
     output?: string;
     model?: string;
+    usage?: EventUsage;
+    error?: unknown;
     properties?: Record<string, unknown>;
     featureFlags?: Record<string, string>;
     attachments?: Attachment[];
@@ -150,13 +156,7 @@ declare class EventShipper {
      */
     private requestOpts;
     patch(eventId: string, patch: Patch): Promise<void>;
-    finish(eventId: string, patch: {
-        output?: string;
-        model?: string;
-        properties?: Record<string, unknown>;
-        featureFlags?: Record<string, string>;
-        userId?: string;
-    }): Promise<void>;
+    finish(eventId: string, patch: Pick<Patch, "output" | "model" | "usage" | "error" | "properties" | "featureFlags" | "userId">): Promise<void>;
     flush(): Promise<void>;
     shutdown(): Promise<void>;
     trackSignal(signal: SignalInput): Promise<void>;
@@ -329,6 +329,9 @@ declare class TraceShipper {
             spanIdB64: string;
         };
         eventId: string;
+        userId?: string;
+        convoId?: string;
+        eventName?: string;
         operationId?: string;
         attributes?: Array<OtlpKeyValue | undefined>;
         startTimeUnixNano?: string;
@@ -347,6 +350,9 @@ declare class TraceShipper {
             spanIdB64: string;
         };
         eventId: string;
+        userId?: string;
+        convoId?: string;
+        eventName?: string;
         startTimeUnixNano: string;
         endTimeUnixNano: string;
         attributes?: Array<OtlpKeyValue | undefined>;

package/dist/{index.d-DBLTz2Nz.d.ts → index.d-DPYV95P7.d.ts}

@@ -45,6 +45,10 @@ type IdentifyInput = {
     userId: string;
     traits?: Record<string, unknown>;
 };
+type EventUsage = {
+    promptTokens?: number;
+    completionTokens?: number;
+};
 type Patch = {
     eventName?: string;
     userId?: string;
@@ -52,6 +56,8 @@ type Patch = {
     input?: string;
     output?: string;
     model?: string;
+    usage?: EventUsage;
+    error?: unknown;
     properties?: Record<string, unknown>;
     featureFlags?: Record<string, string>;
     attachments?: Attachment[];
@@ -150,13 +156,7 @@ declare class EventShipper {
      */
     private requestOpts;
     patch(eventId: string, patch: Patch): Promise<void>;
-    finish(eventId: string, patch: {
-        output?: string;
-        model?: string;
-        properties?: Record<string, unknown>;
-        featureFlags?: Record<string, string>;
-        userId?: string;
-    }): Promise<void>;
+    finish(eventId: string, patch: Pick<Patch, "output" | "model" | "usage" | "error" | "properties" | "featureFlags" | "userId">): Promise<void>;
     flush(): Promise<void>;
     shutdown(): Promise<void>;
     trackSignal(signal: SignalInput): Promise<void>;
@@ -329,6 +329,9 @@ declare class TraceShipper {
             spanIdB64: string;
         };
         eventId: string;
+        userId?: string;
+        convoId?: string;
+        eventName?: string;
         operationId?: string;
         attributes?: Array<OtlpKeyValue | undefined>;
         startTimeUnixNano?: string;
@@ -347,6 +350,9 @@ declare class TraceShipper {
             spanIdB64: string;
         };
         eventId: string;
+        userId?: string;
+        convoId?: string;
+        eventName?: string;
         startTimeUnixNano: string;
         endTimeUnixNano: string;
         attributes?: Array<OtlpKeyValue | undefined>;