@raindrop-ai/ai-sdk 0.0.24 → 0.0.26

package/dist/index.workers.js

@@ -4,7 +4,7 @@ var async_hooks = require('async_hooks');
 
 // src/index.workers.ts
 
-// ../core/dist/chunk-4UCYIEH4.js
+// ../core/dist/chunk-Y7SM66SW.js
 function getCrypto() {
   const c = globalThis.crypto;
   return c;
@@ -482,21 +482,6 @@ function resolveLocalDebuggerBaseUrl(baseUrl) {
 function localDebuggerEnabled(baseUrl) {
   return resolveLocalDebuggerBaseUrl(baseUrl) !== null;
 }
-function normalizeLocalDebuggerLiveEventType(type) {
-  switch (type) {
-    case "text-delta":
-      return "text_delta";
-    case "reasoning":
-    case "reasoning-delta":
-      return "reasoning_delta";
-    case "tool-call":
-      return "tool_start";
-    case "tool-result":
-      return "tool_result";
-    default:
-      return type;
-  }
-}
 function mirrorTraceExportToLocalDebugger(body, options = {}) {
   var _a;
   const baseUrl = resolveLocalDebuggerBaseUrl(options.baseUrl);
@@ -516,7 +501,7 @@ function sendLocalDebuggerLiveEvent(event, options = {}) {
     `${baseUrl}live`,
     {
       ...event,
-      type: normalizeLocalDebuggerLiveEventType(event.type),
+      type: event.type,
       timestamp: (_a = event.timestamp) != null ? _a : Date.now()
     },
     {},
@@ -837,7 +822,7 @@ globalThis.RAINDROP_ASYNC_LOCAL_STORAGE = async_hooks.AsyncLocalStorage;
 // package.json
 var package_default = {
   name: "@raindrop-ai/ai-sdk",
-  version: "0.0.24"};
+  version: "0.0.26"};
 
 // src/internal/version.ts
 var libraryName = package_default.name;
@@ -1477,6 +1462,77 @@ function attrsFromGenAiRequest(options) {
   ];
 }
 
+// src/internal/call-metadata.ts
+var SyncFallbackStorage = class {
+  constructor() {
+    this._stack = [];
+  }
+  getStore() {
+    return this._stack[this._stack.length - 1];
+  }
+  run(store, callback) {
+    this._stack.push(store);
+    try {
+      return callback();
+    } finally {
+      this._stack.pop();
+    }
+  }
+};
+var _storage = null;
+function getStorage() {
+  if (_storage) return _storage;
+  const Ctor = globalThis.RAINDROP_ASYNC_LOCAL_STORAGE;
+  _storage = Ctor ? new Ctor() : new SyncFallbackStorage();
+  return _storage;
+}
+function _resetRaindropCallMetadataStorage() {
+  _storage = null;
+}
+function getCurrentRaindropCallMetadata() {
+  return getStorage().getStore();
+}
+function runWithRaindropCallMetadata(metadata, fn) {
+  return getStorage().run(metadata, fn);
+}
+function readRaindropCallMetadataFromArgs(args) {
+  var _a;
+  if (args.length === 0) return void 0;
+  const first = args[0];
+  if (!isRecord(first)) return void 0;
+  const topLevel = isRecord(first["metadata"]) ? first["metadata"] : void 0;
+  const stable = isRecord(first["telemetry"]) ? first["telemetry"]["metadata"] : void 0;
+  const stableMetadata = isRecord(stable) ? stable : void 0;
+  const exp = extractExperimentalTelemetry(first);
+  const expMetadata = (exp == null ? void 0 : exp.metadata) && typeof exp.metadata === "object" ? exp.metadata : void 0;
+  const raw = (_a = topLevel != null ? topLevel : stableMetadata) != null ? _a : expMetadata;
+  if (!raw) return void 0;
+  const meta = { rawMetadata: raw };
+  const userId = raw["raindrop.userId"];
+  if (typeof userId === "string" && userId) meta.userId = userId;
+  const eventId = raw["raindrop.eventId"];
+  if (typeof eventId === "string" && eventId) meta.eventId = eventId;
+  const eventIdGenerated = raw["raindrop.internal.eventIdGenerated"];
+  if (eventIdGenerated === true || eventIdGenerated === "true" || eventIdGenerated === "1") {
+    meta.eventIdGenerated = true;
+  }
+  const convoId = raw["raindrop.convoId"];
+  if (typeof convoId === "string" && convoId) meta.convoId = convoId;
+  const eventName = raw["raindrop.eventName"];
+  if (typeof eventName === "string" && eventName) meta.eventName = eventName;
+  const properties = raw["raindrop.properties"];
+  if (typeof properties === "string") {
+    try {
+      const parsed = JSON.parse(properties);
+      if (parsed && typeof parsed === "object") meta.properties = parsed;
+    } catch (e) {
+    }
+  } else if (properties && typeof properties === "object") {
+    meta.properties = properties;
+  }
+  return meta;
+}
+
 // src/internal/raindrop-telemetry-integration.ts
 var RaindropTelemetryIntegration = class {
   constructor(opts) {
@@ -1484,15 +1540,17 @@ var RaindropTelemetryIntegration = class {
     // ── onStart ─────────────────────────────────────────────────────────────
     this.onStart = (event) => {
       var _a, _b, _c, _d;
-      if (event.isEnabled !== true) return;
+      if (event.isEnabled === false) return;
       const isEmbed = event.operationId === "ai.embed" || event.operationId === "ai.embedMany";
       const recordInputs = event.recordInputs !== false;
       const recordOutputs = event.recordOutputs !== false;
       const functionId = event.functionId;
-      const metadata = event.metadata;
+      const eventMetadata2 = event.metadata;
+      const callContextMetadata = getCurrentRaindropCallMetadata();
+      const metadata = eventMetadata2 != null ? eventMetadata2 : callContextMetadata == null ? void 0 : callContextMetadata.rawMetadata;
       const callMeta = this.extractRaindropMetadata(metadata);
       const inherited = getContextManager().getParentSpanIds();
-      const eventIdGenerated = (metadata == null ? void 0 : metadata["raindrop.internal.eventIdGenerated"]) === "true" || (metadata == null ? void 0 : metadata["raindrop.internal.eventIdGenerated"]) === true;
+      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 inheritedParent = inherited && inherited.eventId === eventId ? { traceIdB64: inherited.traceIdB64, spanIdB64: inherited.spanIdB64 } : void 0;
@@ -1618,48 +1676,25 @@ var RaindropTelemetryIntegration = class {
       state.stepSpan = stepSpan;
       state.stepParent = this.spanParentRef(stepSpan);
     };
-    // ── onToolCallStart ─────────────────────────────────────────────────────
-    this.onToolCallStart = (event) => {
-      const state = this.getState(event.callId);
-      if (!(state == null ? void 0 : state.stepParent)) return;
-      const { toolCall } = event;
-      const { operationName, resourceName } = opName(
-        "ai.toolCall",
-        state.functionId
-      );
-      const inputAttrs = state.recordInputs ? [attrString("ai.toolCall.args", safeJsonWithUint8(toolCall.input))] : [];
-      const toolSpan = this.traceShipper.startSpan({
-        name: "ai.toolCall",
-        parent: state.stepParent,
-        eventId: state.eventId,
-        operationId: "ai.toolCall",
-        attributes: [
-          attrString("operation.name", operationName),
-          attrString("resource.name", resourceName),
-          attrString("ai.telemetry.functionId", state.functionId),
-          attrString("ai.toolCall.name", toolCall.toolName),
-          attrString("ai.toolCall.id", toolCall.toolCallId),
-          ...inputAttrs
-        ]
-      });
-      state.toolSpans.set(toolCall.toolCallId, toolSpan);
-      this.emitLive(state, "tool_start", toolCall.toolName, { args: toolCall.input });
+    this.onToolExecutionStart = (event) => this.toolExecutionStart(event);
+    this.onToolExecutionEnd = (event) => this.toolExecutionEnd(event);
+    // Older v7 betas (< beta.111) emit these names. Kept as thin aliases so
+    // applications pinned to those betas continue to work.
+    this.onToolCallStart = (event) => this.toolExecutionStart(event);
+    this.onToolCallFinish = (event) => this.toolExecutionEnd(event);
+    // ── language-model call (v7 beta.111+) ─────────────────────────────────
+    //
+    // `onLanguageModelCallStart` / `onLanguageModelCallEnd` are scoped to the
+    // model invocation only and exclude later client-side tool execution.
+    // Raindrop already spans at the operation + step level, so these are
+    // intentional no-ops — declared so the dispatcher's `mergeCallbacks` sees
+    // them and so we don't accidentally rely on them later.
+    //
+    // Defined as no-ops rather than omitted so adding logic here later is a
+    // strictly additive change.
+    this.onLanguageModelCallStart = (_event) => {
     };
-    // ── onToolCallFinish ────────────────────────────────────────────────────
-    this.onToolCallFinish = (event) => {
-      const state = this.getState(event.callId);
-      if (!state) return;
-      const toolSpan = state.toolSpans.get(event.toolCall.toolCallId);
-      if (!toolSpan) return;
-      state.toolCallCount += 1;
-      if (event.success) {
-        const outputAttrs = state.recordOutputs ? [attrString("ai.toolCall.result", safeJsonWithUint8(event.output))] : [];
-        this.traceShipper.endSpan(toolSpan, { attributes: outputAttrs });
-      } else {
-        this.traceShipper.endSpan(toolSpan, { error: event.error });
-      }
-      this.emitLive(state, "tool_result", event.toolCall.toolName);
-      state.toolSpans.delete(event.toolCall.toolCallId);
+    this.onLanguageModelCallEnd = (_event) => {
     };
     // ── onChunk (streaming) ─────────────────────────────────────────────────
     this.onChunk = (event) => {
@@ -1928,6 +1963,53 @@ var RaindropTelemetryIntegration = class {
     }
     return void 0;
   }
+  // ── tool execution start / end ──────────────────────────────────────────
+  //
+  // v7 < beta.111 dispatched `onToolCallStart` / `onToolCallFinish`.
+  // v7 >= beta.111 renamed them to `onToolExecutionStart` / `onToolExecutionEnd`
+  // (see https://github.com/vercel/ai/pull/14589). Event shape is identical.
+  // Both names are exposed and forward to a single implementation.
+  toolExecutionStart(event) {
+    const state = this.getState(event.callId);
+    if (!(state == null ? void 0 : state.stepParent)) return;
+    const { toolCall } = event;
+    const { operationName, resourceName } = opName(
+      "ai.toolCall",
+      state.functionId
+    );
+    const inputAttrs = state.recordInputs ? [attrString("ai.toolCall.args", safeJsonWithUint8(toolCall.input))] : [];
+    const toolSpan = this.traceShipper.startSpan({
+      name: "ai.toolCall",
+      parent: state.stepParent,
+      eventId: state.eventId,
+      operationId: "ai.toolCall",
+      attributes: [
+        attrString("operation.name", operationName),
+        attrString("resource.name", resourceName),
+        attrString("ai.telemetry.functionId", state.functionId),
+        attrString("ai.toolCall.name", toolCall.toolName),
+        attrString("ai.toolCall.id", toolCall.toolCallId),
+        ...inputAttrs
+      ]
+    });
+    state.toolSpans.set(toolCall.toolCallId, toolSpan);
+    this.emitLive(state, "tool_start", toolCall.toolName, { args: toolCall.input });
+  }
+  toolExecutionEnd(event) {
+    const state = this.getState(event.callId);
+    if (!state) return;
+    const toolSpan = state.toolSpans.get(event.toolCall.toolCallId);
+    if (!toolSpan) return;
+    state.toolCallCount += 1;
+    if (event.success) {
+      const outputAttrs = state.recordOutputs ? [attrString("ai.toolCall.result", safeJsonWithUint8(event.output))] : [];
+      this.traceShipper.endSpan(toolSpan, { attributes: outputAttrs });
+    } else {
+      this.traceShipper.endSpan(toolSpan, { error: event.error });
+    }
+    this.emitLive(state, "tool_result", event.toolCall.toolName);
+    state.toolSpans.delete(event.toolCall.toolCallId);
+  }
   finishGenerate(event, state) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
     if (state.rootSpan) {
@@ -2255,7 +2337,16 @@ function detectAISDKVersion(aiSDK) {
   return "4";
 }
 function hasStructuredTelemetryEvents(aiSDK) {
-  return isRecord(aiSDK) && isFunction(aiSDK["registerTelemetryIntegration"]) && isFunction(aiSDK["experimental_streamModelCall"]);
+  if (!isRecord(aiSDK)) return false;
+  const hasRegister = isFunction(aiSDK["registerTelemetry"]) || isFunction(aiSDK["registerTelemetryIntegration"]);
+  const hasV7Marker = isFunction(aiSDK["experimental_streamLanguageModelCall"]) || isFunction(aiSDK["experimental_streamModelCall"]);
+  return hasRegister && hasV7Marker;
+}
+function resolveRegisterTelemetry(aiSDK) {
+  var _a;
+  if (!isRecord(aiSDK)) return void 0;
+  const fn = (_a = aiSDK["registerTelemetry"]) != null ? _a : aiSDK["registerTelemetryIntegration"];
+  return isFunction(fn) ? fn : void 0;
 }
 function asVercelSchema(jsonSchemaObj) {
   const validatorSymbol = /* @__PURE__ */ Symbol.for("vercel.ai.validator");
@@ -2533,7 +2624,7 @@ function setupOperation(params) {
       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.userId", mergedCtx.userId),
+      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),
@@ -2896,31 +2987,44 @@ function wrapAISDK(aiSDK, deps) {
         properties: wrapTimeCtx.properties
       }
     });
-    const registerFn = aiSDK["registerTelemetryIntegration"];
-    if (isFunction(registerFn)) {
+    const registerFn = resolveRegisterTelemetry(aiSDK);
+    if (registerFn) {
       registerFn(integration);
     }
     if (debug) {
-      console.log("[raindrop-ai/ai-sdk] nativeTelemetry: registered RaindropTelemetryIntegration (no Proxy)");
+      console.log(
+        "[raindrop-ai/ai-sdk] nativeTelemetry: registered RaindropTelemetryIntegration (Proxy installed for per-call metadata propagation)"
+      );
     }
     const selfDiagnostics2 = normalizeSelfDiagnosticsConfig(deps.options.selfDiagnostics);
-    if (selfDiagnostics2) {
-      const textOps = /* @__PURE__ */ new Set(["generateText", "streamText"]);
-      const jsonSchemaFactory = resolveJsonSchemaFactory(aiSDK);
-      const proxyTarget2 = isModuleNamespace(aiSDK) ? Object.setPrototypeOf({}, aiSDK) : aiSDK;
-      return new Proxy(proxyTarget2, {
-        get(target, prop, receiver) {
-          const original = Reflect.get(target, prop, receiver);
-          if (typeof prop !== "string" || !textOps.has(prop) || !isFunction(original)) {
-            return original;
-          }
-          return (...callArgs) => {
-            var _a2;
-            const arg = callArgs[0];
-            if (!isRecord(arg)) return original.call(aiSDK, ...callArgs);
+    const jsonSchemaFactory = selfDiagnostics2 ? resolveJsonSchemaFactory(aiSDK) : void 0;
+    const metadataAwareOps = /* @__PURE__ */ new Set([
+      "generateText",
+      "streamText",
+      "generateObject",
+      "streamObject",
+      "embed",
+      "embedMany",
+      "rerank"
+    ]);
+    const selfDiagnosticsOps = /* @__PURE__ */ new Set(["generateText", "streamText"]);
+    const proxyTarget2 = isModuleNamespace(aiSDK) ? Object.setPrototypeOf({}, aiSDK) : aiSDK;
+    return new Proxy(proxyTarget2, {
+      get(target, prop, receiver) {
+        const original = Reflect.get(target, prop, receiver);
+        if (typeof prop !== "string" || !metadataAwareOps.has(prop) || !isFunction(original)) {
+          return original;
+        }
+        const propName = prop;
+        return (...callArgs) => {
+          var _a2, _b2, _c2;
+          const arg = callArgs[0];
+          const callMetadata = readRaindropCallMetadataFromArgs(callArgs);
+          const callOriginal = () => original.call(aiSDK, ...callArgs);
+          if (selfDiagnostics2 && selfDiagnosticsOps.has(propName) && isRecord(arg)) {
             const telemetry = extractExperimentalTelemetry(arg);
             const callMeta = (telemetry == null ? void 0 : telemetry.metadata) ? extractRaindropMetadata(telemetry.metadata) : {};
-            const perCallEventIdExplicit = (_a2 = callMeta.eventId) != null ? _a2 : wrapTimeCtx.eventId;
+            const perCallEventIdExplicit = (_b2 = (_a2 = callMetadata == null ? void 0 : callMetadata.eventId) != null ? _a2 : callMeta.eventId) != null ? _b2 : wrapTimeCtx.eventId;
             const perCallEventId = perCallEventIdExplicit != null ? perCallEventIdExplicit : randomUUID();
             const perCallEventIdGenerated = !perCallEventIdExplicit;
             const perCallCtx = {
@@ -2957,12 +3061,25 @@ function wrapAISDK(aiSDK, deps) {
                 metadata: mergedMetadata
               }
             };
-            return original.call(aiSDK, ...callArgs);
-          };
-        }
-      });
-    }
-    return aiSDK;
+            const mergedAlsMetadata = {
+              ...callMetadata != null ? callMetadata : {},
+              eventId: perCallEventId,
+              eventIdGenerated: perCallEventIdGenerated || (callMetadata == null ? void 0 : callMetadata.eventIdGenerated),
+              rawMetadata: {
+                ...(_c2 = callMetadata == null ? void 0 : callMetadata.rawMetadata) != null ? _c2 : {},
+                "raindrop.eventId": perCallEventId,
+                ...perCallEventIdGenerated ? { "raindrop.internal.eventIdGenerated": "true" } : {}
+              }
+            };
+            return runWithRaindropCallMetadata(mergedAlsMetadata, callOriginal);
+          }
+          if (callMetadata) {
+            return runWithRaindropCallMetadata(callMetadata, callOriginal);
+          }
+          return callOriginal();
+        };
+      }
+    });
   }
   const instrumentedOps = /* @__PURE__ */ new Set([
     "generateText",
@@ -3098,7 +3215,7 @@ function wrapAgentGenerate(generate, instance, agentSettings, className, aiSDK,
         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.userId", ctx.userId),
+        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"]),
@@ -3306,7 +3423,7 @@ function wrapAgentStream(stream, instance, agentSettings, className, aiSDK, deps
         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.userId", ctx.userId),
+        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"]),
@@ -4254,10 +4371,14 @@ if (!globalThis.RAINDROP_ASYNC_LOCAL_STORAGE) {
 }
 
 exports.RaindropTelemetryIntegration = RaindropTelemetryIntegration;
+exports._resetRaindropCallMetadataStorage = _resetRaindropCallMetadataStorage;
 exports._resetWarnedMissingUserId = _resetWarnedMissingUserId;
 exports.createRaindropAISDK = createRaindropAISDK;
 exports.currentSpan = currentSpan;
 exports.eventMetadata = eventMetadata;
 exports.eventMetadataFromChatRequest = eventMetadataFromChatRequest;
 exports.getContextManager = getContextManager;
+exports.getCurrentRaindropCallMetadata = getCurrentRaindropCallMetadata;
+exports.readRaindropCallMetadataFromArgs = readRaindropCallMetadataFromArgs;
+exports.runWithRaindropCallMetadata = runWithRaindropCallMetadata;
 exports.withCurrent = withCurrent;

package/dist/index.workers.mjs

@@ -1,4 +1,4 @@
-export { RaindropTelemetryIntegration, _resetWarnedMissingUserId, createRaindropAISDK, currentSpan, eventMetadata, eventMetadataFromChatRequest, getContextManager, withCurrent } from './chunk-WHP2SVAR.mjs';
+export { RaindropTelemetryIntegration, _resetRaindropCallMetadataStorage, _resetWarnedMissingUserId, createRaindropAISDK, currentSpan, eventMetadata, eventMetadataFromChatRequest, getContextManager, getCurrentRaindropCallMetadata, readRaindropCallMetadataFromArgs, runWithRaindropCallMetadata, withCurrent } from './chunk-76JSTQY3.mjs';
 import { AsyncLocalStorage } from 'async_hooks';
 
 if (!globalThis.RAINDROP_ASYNC_LOCAL_STORAGE) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raindrop-ai/ai-sdk",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "Standalone Vercel AI SDK integration for Raindrop (events + OTLP/HTTP JSON traces, no OTEL runtime)",
   "main": "dist/index.node.js",
   "module": "dist/index.node.mjs",