@raindrop-ai/ai-sdk 0.1.0 → 0.2.0

package/dist/index.browser.d.mts

@@ -56,6 +56,10 @@ type IdentifyInput$1 = {
     userId: string;
     traits?: Record<string, unknown>;
 };
+type EventUsage = {
+    promptTokens?: number;
+    completionTokens?: number;
+};
 type Patch = {
     eventName?: string;
     userId?: string;
@@ -63,6 +67,8 @@ type Patch = {
     input?: string;
     output?: string;
     model?: string;
+    usage?: EventUsage;
+    error?: unknown;
     properties?: Record<string, unknown>;
     featureFlags?: Record<string, string>;
     attachments?: Attachment$1[];
@@ -161,13 +167,7 @@ declare class EventShipper$1 {
      */
     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>;
@@ -399,6 +399,9 @@ declare class TraceShipper$1 {
             spanIdB64: string;
         };
         eventId: string;
+        userId?: string;
+        convoId?: string;
+        eventName?: string;
         operationId?: string;
         attributes?: Array<OtlpKeyValue | undefined>;
         startTimeUnixNano?: string;
@@ -417,6 +420,9 @@ declare class TraceShipper$1 {
             spanIdB64: string;
         };
         eventId: string;
+        userId?: string;
+        convoId?: string;
+        eventName?: string;
         startTimeUnixNano: string;
         endTimeUnixNano: string;
         attributes?: Array<OtlpKeyValue | undefined>;
@@ -503,6 +509,37 @@ declare class TraceShipper extends TraceShipper$1 {
     constructor(opts: ConstructorParameters<typeof TraceShipper$1>[0]);
 }
 
+/**
+ * Raindrop telemetry integration for AI SDK v7+
+ *
+ * Implements the AI SDK's `Telemetry` interface (formerly `TelemetryIntegration`
+ * before v7 beta.111) to capture traces and events natively, replacing the
+ * Proxy-based wrapping used for v4-v6.
+ *
+ * Modeled after the upstream OpenTelemetry integration but uses Raindrop's
+ * TraceShipper (OTLP/HTTP) + EventShipper instead of the OTel Tracer API.
+ *
+ * Compatibility: this class targets the latest published v7 build but also
+ * exposes the older v7 callback names as aliases so it works on every v7
+ * beta/canary released to date:
+ *   - `onToolCallStart`/`onToolCallFinish` (< beta.111) alongside
+ *     `onToolExecutionStart`/`onToolExecutionEnd` (>= beta.111).
+ *   - Current `onToolExecutionEnd` events use the `toolOutput` discriminated
+ *     union; older builds used top-level `success`/`output`/`error` fields.
+ *   - `onFinish`/`onEmbedFinish` (< canary.159) alongside `onEnd`/`onEmbedEnd`
+ *     (>= canary.159, vercel/ai renamed the operation finalizers).
+ *   - `onAbort` (added as a telemetry-integration callback on the v7 canary
+ *     line, post-beta.116) finalizes open spans + the pending event when a
+ *     `streamText` call is cancelled via its `AbortSignal`. Builds that don't
+ *     dispatch it to integrations simply never call it, so it's a no-op there.
+ *
+ * Step-end note: we intentionally implement only `onStepFinish` (not the newer
+ * `onStepEnd`). The latest canary dispatcher fans every step-end event out to
+ * BOTH `onStepEnd` and the deprecated `onStepFinish` on each integration, so
+ * implementing both names would double-close the step span. `onStepFinish`
+ * alone is dispatched on every published v7 beta/canary to date.
+ */
+
 type Listener<T> = (event: T) => PromiseLike<void> | void;
 type ToolExecutionEndEvent = {
     callId: string;
@@ -576,7 +613,7 @@ type RaindropTelemetryIntegrationOptions = {
         eventName?: string;
         convoId?: string;
         properties?: Record<string, unknown>;
-        featureFlags?: Record<string, string>;
+        featureFlags?: FeatureFlags;
     };
 };
 declare class RaindropTelemetryIntegration implements TelemetryIntegration {
@@ -1194,6 +1231,12 @@ type StartSpanArgs = {
     parent?: TraceSpan;
     /** AI SDK operation ID (e.g. "ai.toolCall", "ai.generateText"). Helps classify the span. */
     operationId?: string;
+    /** Raindrop user ID this span belongs to. Stamped onto the span so it rides onto nested spans. */
+    userId?: string;
+    /** Raindrop conversation ID this span belongs to. */
+    convoId?: string;
+    /** Raindrop event name this span belongs to. */
+    eventName?: string;
     /** Arbitrary string attributes. */
     attributes?: Record<string, string>;
 };
@@ -1212,6 +1255,12 @@ type CreateSpanArgs = {
     parent?: TraceSpan;
     /** AI SDK operation ID (e.g. "ai.toolCall"). Helps classify the span. */
     operationId?: string;
+    /** Raindrop user ID this span belongs to. Stamped onto the span so it rides onto nested spans. */
+    userId?: string;
+    /** Raindrop conversation ID this span belongs to. */
+    convoId?: string;
+    /** Raindrop event name this span belongs to. */
+    eventName?: string;
     /** Input data (will be JSON stringified if object). */
     input?: unknown;
     /** Output data (will be JSON stringified if object). */

package/dist/index.browser.d.ts

@@ -56,6 +56,10 @@ type IdentifyInput$1 = {
     userId: string;
     traits?: Record<string, unknown>;
 };
+type EventUsage = {
+    promptTokens?: number;
+    completionTokens?: number;
+};
 type Patch = {
     eventName?: string;
     userId?: string;
@@ -63,6 +67,8 @@ type Patch = {
     input?: string;
     output?: string;
     model?: string;
+    usage?: EventUsage;
+    error?: unknown;
     properties?: Record<string, unknown>;
     featureFlags?: Record<string, string>;
     attachments?: Attachment$1[];
@@ -161,13 +167,7 @@ declare class EventShipper$1 {
      */
     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>;
@@ -399,6 +399,9 @@ declare class TraceShipper$1 {
             spanIdB64: string;
         };
         eventId: string;
+        userId?: string;
+        convoId?: string;
+        eventName?: string;
         operationId?: string;
         attributes?: Array<OtlpKeyValue | undefined>;
         startTimeUnixNano?: string;
@@ -417,6 +420,9 @@ declare class TraceShipper$1 {
             spanIdB64: string;
         };
         eventId: string;
+        userId?: string;
+        convoId?: string;
+        eventName?: string;
         startTimeUnixNano: string;
         endTimeUnixNano: string;
         attributes?: Array<OtlpKeyValue | undefined>;
@@ -503,6 +509,37 @@ declare class TraceShipper extends TraceShipper$1 {
     constructor(opts: ConstructorParameters<typeof TraceShipper$1>[0]);
 }
 
+/**
+ * Raindrop telemetry integration for AI SDK v7+
+ *
+ * Implements the AI SDK's `Telemetry` interface (formerly `TelemetryIntegration`
+ * before v7 beta.111) to capture traces and events natively, replacing the
+ * Proxy-based wrapping used for v4-v6.
+ *
+ * Modeled after the upstream OpenTelemetry integration but uses Raindrop's
+ * TraceShipper (OTLP/HTTP) + EventShipper instead of the OTel Tracer API.
+ *
+ * Compatibility: this class targets the latest published v7 build but also
+ * exposes the older v7 callback names as aliases so it works on every v7
+ * beta/canary released to date:
+ *   - `onToolCallStart`/`onToolCallFinish` (< beta.111) alongside
+ *     `onToolExecutionStart`/`onToolExecutionEnd` (>= beta.111).
+ *   - Current `onToolExecutionEnd` events use the `toolOutput` discriminated
+ *     union; older builds used top-level `success`/`output`/`error` fields.
+ *   - `onFinish`/`onEmbedFinish` (< canary.159) alongside `onEnd`/`onEmbedEnd`
+ *     (>= canary.159, vercel/ai renamed the operation finalizers).
+ *   - `onAbort` (added as a telemetry-integration callback on the v7 canary
+ *     line, post-beta.116) finalizes open spans + the pending event when a
+ *     `streamText` call is cancelled via its `AbortSignal`. Builds that don't
+ *     dispatch it to integrations simply never call it, so it's a no-op there.
+ *
+ * Step-end note: we intentionally implement only `onStepFinish` (not the newer
+ * `onStepEnd`). The latest canary dispatcher fans every step-end event out to
+ * BOTH `onStepEnd` and the deprecated `onStepFinish` on each integration, so
+ * implementing both names would double-close the step span. `onStepFinish`
+ * alone is dispatched on every published v7 beta/canary to date.
+ */
+
 type Listener<T> = (event: T) => PromiseLike<void> | void;
 type ToolExecutionEndEvent = {
     callId: string;
@@ -576,7 +613,7 @@ type RaindropTelemetryIntegrationOptions = {
         eventName?: string;
         convoId?: string;
         properties?: Record<string, unknown>;
-        featureFlags?: Record<string, string>;
+        featureFlags?: FeatureFlags;
     };
 };
 declare class RaindropTelemetryIntegration implements TelemetryIntegration {
@@ -1194,6 +1231,12 @@ type StartSpanArgs = {
     parent?: TraceSpan;
     /** AI SDK operation ID (e.g. "ai.toolCall", "ai.generateText"). Helps classify the span. */
     operationId?: string;
+    /** Raindrop user ID this span belongs to. Stamped onto the span so it rides onto nested spans. */
+    userId?: string;
+    /** Raindrop conversation ID this span belongs to. */
+    convoId?: string;
+    /** Raindrop event name this span belongs to. */
+    eventName?: string;
     /** Arbitrary string attributes. */
     attributes?: Record<string, string>;
 };
@@ -1212,6 +1255,12 @@ type CreateSpanArgs = {
     parent?: TraceSpan;
     /** AI SDK operation ID (e.g. "ai.toolCall"). Helps classify the span. */
     operationId?: string;
+    /** Raindrop user ID this span belongs to. Stamped onto the span so it rides onto nested spans. */
+    userId?: string;
+    /** Raindrop conversation ID this span belongs to. */
+    convoId?: string;
+    /** Raindrop event name this span belongs to. */
+    eventName?: string;
     /** Input data (will be JSON stringified if object). */
     input?: unknown;
     /** Output data (will be JSON stringified if object). */

package/dist/index.browser.js

@@ -1,6 +1,6 @@
 'use strict';
 
-// ../core/dist/chunk-Y5LUB7OE.js
+// ../core/dist/chunk-QTUH3BHZ.js
 function normalizeFeatureFlags(input) {
   if (Array.isArray(input)) {
     return Object.fromEntries(input.map((name) => [name, "true"]));
@@ -443,19 +443,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();
@@ -704,6 +737,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 = {
@@ -713,12 +751,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
       },
@@ -876,6 +915,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 {
@@ -1000,6 +1046,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);
@@ -1055,7 +1102,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({
@@ -1311,7 +1359,7 @@ async function* asyncGeneratorWithCurrent(span, gen) {
 // package.json
 var package_default = {
   name: "@raindrop-ai/ai-sdk",
-  version: "0.1.0"};
+  version: "0.2.0"};
 
 // src/internal/version.ts
 var libraryName = package_default.name;
@@ -2246,7 +2294,7 @@ var RaindropTelemetryIntegration = class {
     };
     // ── onStart ─────────────────────────────────────────────────────────────
     this.onStart = (event) => {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
       if (event.isEnabled === false) return;
       const isEmbed = event.operationId === "ai.embed" || event.operationId === "ai.embedMany";
       const recordInputs = event.recordInputs !== false;
@@ -2256,15 +2304,20 @@ var RaindropTelemetryIntegration = class {
       const callContextMetadata = getCurrentRaindropCallMetadata();
       const metadata = eventMetadata2 != null ? eventMetadata2 : callContextMetadata == null ? void 0 : callContextMetadata.rawMetadata;
       const callMeta = this.extractRaindropMetadata(metadata);
+      const identity = {
+        userId: (_b = callMeta.userId) != null ? _b : (_a = this.defaultContext) == null ? void 0 : _a.userId,
+        convoId: (_d = callMeta.convoId) != null ? _d : (_c = this.defaultContext) == null ? void 0 : _c.convoId,
+        eventName: (_f = callMeta.eventName) != null ? _f : (_e = this.defaultContext) == null ? void 0 : _e.eventName
+      };
       const inherited = getContextManager().getParentSpanIds();
       const eventIdGenerated = (metadata == null ? void 0 : metadata["raindrop.internal.eventIdGenerated"]) === "true" || (metadata == null ? void 0 : metadata["raindrop.internal.eventIdGenerated"]) === true || (callContextMetadata == null ? void 0 : callContextMetadata.eventIdGenerated) === true;
       const explicitEventId = callMeta.eventId && !eventIdGenerated ? callMeta.eventId : void 0;
-      const eventId = (_d = (_c = (_b = explicitEventId != null ? explicitEventId : (_a = this.defaultContext) == null ? void 0 : _a.eventId) != null ? _b : inherited == null ? void 0 : inherited.eventId) != null ? _c : callMeta.eventId) != null ? _d : randomUUID();
+      const eventId = (_j = (_i = (_h = explicitEventId != null ? explicitEventId : (_g = this.defaultContext) == null ? void 0 : _g.eventId) != null ? _h : inherited == null ? void 0 : inherited.eventId) != null ? _i : callMeta.eventId) != null ? _j : randomUUID();
       const inheritedParent = inherited && inherited.eventId === eventId ? { traceIdB64: inherited.traceIdB64, spanIdB64: inherited.spanIdB64 } : void 0;
       const { operationName, resourceName } = opName(event.operationId, functionId);
       const parentToolContext = !isEmbed && this.subagentWrapping ? getCurrentParentToolContext() : void 0;
       const metadataSubagentName = !isEmbed && this.subagentWrapping && parentToolContext === void 0 ? typeof (metadata == null ? void 0 : metadata["eve.subagent.name"]) === "string" ? metadata["eve.subagent.name"] : typeof (metadata == null ? void 0 : metadata["ash.subagent.name"]) === "string" ? metadata["ash.subagent.name"] : void 0 : void 0;
-      const subagentName = (_e = parentToolContext == null ? void 0 : parentToolContext.toolName) != null ? _e : metadataSubagentName;
+      const subagentName = (_k = parentToolContext == null ? void 0 : parentToolContext.toolName) != null ? _k : metadataSubagentName;
       let subagentToolCallSpan;
       let rootParentOverride;
       if (subagentName && this.sendTraces) {
@@ -2277,6 +2330,7 @@ var RaindropTelemetryIntegration = class {
           name: subagentName,
           parent: inheritedParent,
           eventId,
+          ...identity,
           operationId: "ai.toolCall",
           attributes: [
             attrString("operation.name", "ai.toolCall"),
@@ -2293,6 +2347,7 @@ var RaindropTelemetryIntegration = class {
           name: "agent.subagent",
           parent: subagentParentRef,
           eventId,
+          ...identity,
           operationId: "agent.subagent",
           attributes: [
             attrString("operation.name", "agent.subagent"),
@@ -2320,6 +2375,7 @@ var RaindropTelemetryIntegration = class {
           name: event.operationId,
           parent: rootParentOverride != null ? rootParentOverride : inheritedParent,
           eventId,
+          ...identity,
           operationId: event.operationId,
           attributes: [
             attrString("operation.name", operationName),
@@ -2327,13 +2383,14 @@ var RaindropTelemetryIntegration = class {
             attrString("ai.telemetry.functionId", functionId),
             attrString("ai.model.provider", event.provider),
             attrString("ai.model.id", event.modelId),
-            // Filter out raindrop.eventId from metadata attrs since TraceShipper
-            // already sets it via the eventId arg. Without this, eventMetadata()'s
-            // auto-generated ID would duplicate and override the resolved one.
+            // Filter out identity keys (eventId/userId/convoId/eventName) from
+            // metadata attrs since TraceShipper already stamps them via dedicated
+            // args. Without this, eventMetadata()'s auto-generated ID would
+            // duplicate and override the resolved one.
             ...attrsFromTelemetryMetadata(
               metadata ? Object.fromEntries(
                 Object.entries(metadata).filter(
-                  ([k]) => k !== "raindrop.eventId" && k !== "raindrop.internal.eventIdGenerated"
+                  ([k]) => k !== "raindrop.eventId" && k !== "raindrop.internal.eventIdGenerated" && k !== "raindrop.userId" && k !== "raindrop.convoId" && k !== "raindrop.eventName"
                 )
               ) : void 0
             ),
@@ -2345,6 +2402,7 @@ var RaindropTelemetryIntegration = class {
       this.callStates.set(event.callId, {
         operationId: event.operationId,
         eventId,
+        identity,
         rootSpan,
         rootParent: rootSpan ? this.spanParentRef(rootSpan) : rootParentOverride != null ? rootParentOverride : inheritedParent,
         stepSpan: void 0,
@@ -2396,6 +2454,7 @@ var RaindropTelemetryIntegration = class {
         name: stepOperationId,
         parent: state.rootParent,
         eventId: state.eventId,
+        ...state.identity,
         operationId: stepOperationId,
         attributes: [
           attrString("operation.name", operationName),
@@ -2529,6 +2588,7 @@ var RaindropTelemetryIntegration = class {
         name: event.operationId,
         parent: state.rootParent,
         eventId: state.eventId,
+        ...state.identity,
         operationId: event.operationId,
         attributes: [
           attrString("operation.name", operationName),
@@ -2795,6 +2855,7 @@ var RaindropTelemetryIntegration = class {
       name: "ai.toolCall",
       parent: state.stepParent,
       eventId: state.eventId,
+      ...state.identity,
       operationId: "ai.toolCall",
       attributes: [
         attrString("operation.name", operationName),
@@ -2872,6 +2933,7 @@ var RaindropTelemetryIntegration = class {
         name: "ai.toolCall",
         parent: state.stepParent,
         eventId: state.eventId,
+        ...state.identity,
         operationId: "ai.toolCall",
         attributes: [
           attrString("operation.name", operationName),
@@ -2975,7 +3037,7 @@ var RaindropTelemetryIntegration = class {
       ...callMeta.properties
     };
     const featureFlags = {
-      ...(_g = this.defaultContext) == null ? void 0 : _g.featureFlags,
+      ...((_g = this.defaultContext) == null ? void 0 : _g.featureFlags) ? normalizeFeatureFlags(this.defaultContext.featureFlags) : {},
       ...callMeta.featureFlags
     };
     const convoId = (_i = callMeta.convoId) != null ? _i : (_h = this.defaultContext) == null ? void 0 : _h.convoId;
@@ -3539,6 +3601,9 @@ function teeStreamObjectBaseStream(result) {
   } catch (e) {
   }
 }
+function identityFromContext(ctx) {
+  return { userId: ctx.userId, convoId: ctx.convoId, eventName: ctx.eventName };
+}
 function setupOperation(params) {
   var _a, _b, _c;
   const {
@@ -3570,6 +3635,7 @@ function setupOperation(params) {
     name: outerOperationId,
     parent: inheritedParent,
     eventId,
+    ...identityFromContext(mergedCtx),
     operationId: outerOperationId,
     attributes: [
       attrString("operation.name", operationName),
@@ -3578,9 +3644,6 @@ function setupOperation(params) {
       attrString("ai.model.provider", modelInfoFromArgs.provider),
       attrString("ai.model.id", modelInfoFromArgs.modelId),
       attrString("ai.telemetry.metadata.raindrop.eventId", eventId),
-      attrString("ai.telemetry.metadata.raindrop.eventName", mergedCtx.eventName),
-      attrString("ai.telemetry.metadata.raindrop.ai.userId", mergedCtx.userId),
-      attrString("ai.telemetry.metadata.raindrop.convoId", mergedCtx.convoId),
       ...attrsFromTelemetryMetadata(telemetry == null ? void 0 : telemetry.metadata),
       ...attrsFromHeaders(isRecord(arg) ? arg["headers"] : void 0),
       ...attrsFromSettings(arg),
@@ -3670,6 +3733,7 @@ function createFinalize(params) {
         responseMessages,
         rootSpan: setup.rootSpan,
         eventId: setup.eventId,
+        ...identityFromContext(setup.ctx),
         telemetry: setup.telemetry,
         toolCalls: setup.toolCalls,
         traceShipper,
@@ -3708,6 +3772,11 @@ function createFinalize(params) {
         input,
         output,
         model: finalModel,
+        usage: {
+          promptTokens: usage == null ? void 0 : usage.inputTokens,
+          completionTokens: usage == null ? void 0 : usage.outputTokens
+        },
+        error,
         properties: patch.properties,
         featureFlags: patch.featureFlags,
         attachments: patch.attachments,
@@ -3742,6 +3811,7 @@ function startToolSpan(toolCall, rootSpan, ctx, startTimeUnixNano) {
     name: "ai.toolCall",
     parent: { traceIdB64: rootSpan.ids.traceIdB64, spanIdB64: rootSpan.ids.spanIdB64 },
     eventId: ctx.eventId,
+    ...identityFromContext(ctx),
     operationId: "ai.toolCall",
     attributes: [
       attrString("operation.name", operationName),
@@ -3779,6 +3849,9 @@ function emitTranscriptToolCallSpans(params) {
   }
   const ctx = {
     eventId: params.eventId,
+    userId: params.userId,
+    convoId: params.convoId,
+    eventName: params.eventName,
     telemetry: params.telemetry,
     traceShipper: params.traceShipper
   };
@@ -4158,6 +4231,7 @@ function wrapAgentGenerate(generate, instance, agentSettings, className, aiSDK,
       name: outerOperationId,
       parent: inheritedParent,
       eventId,
+      ...identityFromContext(ctx),
       operationId: outerOperationId,
       attributes: [
         attrString("operation.name", operationName),
@@ -4166,9 +4240,6 @@ function wrapAgentGenerate(generate, instance, agentSettings, className, aiSDK,
         attrString("ai.model.provider", modelInfoFromArgs.provider),
         attrString("ai.model.id", modelInfoFromArgs.modelId),
         attrString("ai.telemetry.metadata.raindrop.eventId", eventId),
-        attrString("ai.telemetry.metadata.raindrop.eventName", ctx.eventName),
-        attrString("ai.telemetry.metadata.raindrop.ai.userId", ctx.userId),
-        attrString("ai.telemetry.metadata.raindrop.convoId", ctx.convoId),
         ...attrsFromTelemetryMetadata(telemetry == null ? void 0 : telemetry.metadata),
         ...attrsFromHeaders(mergedArgs["headers"]),
         ...attrsFromSettings(mergedArgs),
@@ -4233,6 +4304,7 @@ function wrapAgentGenerate(generate, instance, agentSettings, className, aiSDK,
           responseMessages,
           rootSpan,
           eventId,
+          ...identityFromContext(ctx),
           telemetry,
           toolCalls,
           traceShipper: deps.traceShipper,
@@ -4285,6 +4357,11 @@ function wrapAgentGenerate(generate, instance, agentSettings, className, aiSDK,
           input,
           output,
           model: finalModel,
+          usage: {
+            promptTokens: usage == null ? void 0 : usage.inputTokens,
+            completionTokens: usage == null ? void 0 : usage.outputTokens
+          },
+          error,
           properties: patch.properties,
           featureFlags: patch.featureFlags,
           attachments: patch.attachments,
@@ -4368,6 +4445,7 @@ function wrapAgentStream(stream, instance, agentSettings, className, aiSDK, deps
       name: outerOperationId,
       parent: inheritedParent,
       eventId,
+      ...identityFromContext(ctx),
       operationId: outerOperationId,
       attributes: [
         attrString("operation.name", operationName),
@@ -4376,9 +4454,6 @@ function wrapAgentStream(stream, instance, agentSettings, className, aiSDK, deps
         attrString("ai.model.provider", modelInfoFromArgs.provider),
         attrString("ai.model.id", modelInfoFromArgs.modelId),
         attrString("ai.telemetry.metadata.raindrop.eventId", eventId),
-        attrString("ai.telemetry.metadata.raindrop.eventName", ctx.eventName),
-        attrString("ai.telemetry.metadata.raindrop.ai.userId", ctx.userId),
-        attrString("ai.telemetry.metadata.raindrop.convoId", ctx.convoId),
         ...attrsFromTelemetryMetadata(telemetry == null ? void 0 : telemetry.metadata),
         ...attrsFromHeaders(mergedArgs["headers"]),
         ...attrsFromSettings(mergedArgs),
@@ -4443,6 +4518,7 @@ function wrapAgentStream(stream, instance, agentSettings, className, aiSDK, deps
           responseMessages,
           rootSpan,
           eventId,
+          ...identityFromContext(ctx),
           telemetry,
           toolCalls,
           traceShipper: deps.traceShipper,
@@ -4495,6 +4571,11 @@ function wrapAgentStream(stream, instance, agentSettings, className, aiSDK, deps
           input,
           output,
           model: finalModel,
+          usage: {
+            promptTokens: usage == null ? void 0 : usage.inputTokens,
+            completionTokens: usage == null ? void 0 : usage.outputTokens
+          },
+          error,
           properties: patch.properties,
           featureFlags: patch.featureFlags,
           attachments: patch.attachments,
@@ -4592,6 +4673,7 @@ function wrapToolExecute(name, tool, ctx, toolCalls) {
       name: "ai.toolCall",
       parent,
       eventId: ctx.eventId,
+      ...identityFromContext(ctx.context),
       operationId: "ai.toolCall",
       attributes: [
         attrString("operation.name", operationName),
@@ -4952,6 +5034,7 @@ function startDoGenerateSpan(operationId, options, modelInfo, parent, ctx) {
     name: operationId,
     parent,
     eventId: ctx.eventId,
+    ...identityFromContext(ctx.context),
     operationId,
     attributes: [
       attrString("operation.name", operationName),
@@ -5035,6 +5118,7 @@ function startDoStreamSpan(operationId, options, modelInfo, parent, ctx) {
     name: operationId,
     parent,
     eventId: ctx.eventId,
+    ...identityFromContext(ctx.context),
     operationId,
     attributes: [
       attrString("operation.name", operationName),
@@ -5295,6 +5379,9 @@ function createRaindropAISDK(opts) {
           const internal = traceShipper.startSpan({
             name: args.name,
             eventId: args.eventId,
+            userId: args.userId,
+            convoId: args.convoId,
+            eventName: args.eventName,
             parent,
             operationId: args.operationId,
             attributes: attrs
@@ -5329,6 +5416,9 @@ function createRaindropAISDK(opts) {
           const internal = traceShipper.startSpan({
             name: args.name,
             eventId: args.eventId,
+            userId: args.userId,
+            convoId: args.convoId,
+            eventName: args.eventName,
             parent,
             operationId: args.operationId,
             attributes: startAttrs,