@raindrop-ai/ai-sdk 0.0.29 → 0.0.31

package/dist/index.workers.js

@@ -1024,7 +1024,7 @@ globalThis.RAINDROP_ASYNC_LOCAL_STORAGE = async_hooks.AsyncLocalStorage;
 // package.json
 var package_default = {
   name: "@raindrop-ai/ai-sdk",
-  version: "0.0.29"};
+  version: "0.0.31"};
 
 // src/internal/version.ts
 var libraryName = package_default.name;
@@ -1740,13 +1740,76 @@ function readRaindropCallMetadataFromArgs(args) {
   return meta;
 }
 
+// src/internal/parent-tool-context.ts
+var SyncFallbackStorage2 = 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();
+    }
+  }
+  // `enterWith` is intentionally absent on the sync fallback — the
+  // event-driven enter/clear pattern only makes sense when the runtime
+  // can propagate state across awaits, which the sync stack cannot.
+};
+var _storage2 = null;
+function getStorage2() {
+  if (_storage2) return _storage2;
+  const Ctor = globalThis.RAINDROP_ASYNC_LOCAL_STORAGE;
+  _storage2 = Ctor ? new Ctor() : new SyncFallbackStorage2();
+  return _storage2;
+}
+function _resetParentToolContextStorage() {
+  _storage2 = null;
+}
+function getCurrentParentToolContext() {
+  return getStorage2().getStore();
+}
+function enterParentToolContext(ctx) {
+  var _a;
+  const storage = getStorage2();
+  (_a = storage.enterWith) == null ? void 0 : _a.call(storage, ctx);
+}
+function clearParentToolContext() {
+  var _a;
+  const storage = getStorage2();
+  (_a = storage.enterWith) == null ? void 0 : _a.call(storage, void 0);
+}
+function runWithParentToolContext(ctx, fn) {
+  return getStorage2().run(ctx, fn);
+}
+
 // src/internal/raindrop-telemetry-integration.ts
 var RaindropTelemetryIntegration = class {
   constructor(opts) {
     this.callStates = /* @__PURE__ */ new Map();
+    /**
+     * Per-tool-call snapshot of the parent-tool ALS context taken right
+     * before `enterParentToolContext` overwrites it in `toolExecutionStart`.
+     * Kept at the integration level (rather than on `CallState`) so the
+     * snapshot survives even when the parent generation has no tracked
+     * `CallState` — e.g. the AI SDK dispatches a tool callback for a
+     * `callId` we never registered via `onStart`. Without this, the
+     * unconditional ALS enter in `toolExecutionStart` would leave
+     * `toolExecutionEnd` no way to restore the prior context, so it would
+     * clear and wipe whatever the outer scope had set.
+     *
+     * Keyed by `toolCallId` because that's the only identifier guaranteed
+     * to round-trip between `toolExecutionStart` and `toolExecutionEnd`
+     * (the `event.callId` can be the same for parallel sibling tools).
+     */
+    this.priorParentContexts = /* @__PURE__ */ new Map();
     // ── onStart ─────────────────────────────────────────────────────────────
     this.onStart = (event) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e;
       if (event.isEnabled === false) return;
       const isEmbed = event.operationId === "ai.embed" || event.operationId === "ai.embedMany";
       const recordInputs = event.recordInputs !== false;
@@ -1765,6 +1828,47 @@ var RaindropTelemetryIntegration = class {
         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["ash.subagent.name"]) === "string" ? metadata["ash.subagent.name"] : void 0 : void 0;
+      const subagentName = (_e = parentToolContext == null ? void 0 : parentToolContext.toolName) != null ? _e : metadataSubagentName;
+      let subagentToolCallSpan;
+      let rootParentOverride;
+      if (subagentName && this.sendTraces) {
+        const parentAttrs = parentToolContext ? [
+          attrString("raindrop.parent.callId", parentToolContext.parentCallId),
+          attrString("raindrop.parent.toolCallId", parentToolContext.toolCallId),
+          attrString("raindrop.parent.toolName", parentToolContext.toolName)
+        ] : [];
+        subagentToolCallSpan = this.traceShipper.startSpan({
+          name: subagentName,
+          parent: inheritedParent,
+          eventId,
+          operationId: "ai.toolCall",
+          attributes: [
+            attrString("operation.name", "ai.toolCall"),
+            attrString("resource.name", subagentName),
+            attrString("raindrop.span.kind", "tool_call"),
+            attrString("ai.toolCall.name", subagentName),
+            attrString("raindrop.subagent.name", subagentName),
+            attrString("raindrop.agent.role", "subagent"),
+            ...parentAttrs
+          ]
+        });
+        const subagentParentRef = this.spanParentRef(subagentToolCallSpan);
+        const markerSpan = this.traceShipper.startSpan({
+          name: "agent.subagent",
+          parent: subagentParentRef,
+          eventId,
+          operationId: "agent.subagent",
+          attributes: [
+            attrString("operation.name", "agent.subagent"),
+            attrString("raindrop.span.kind", "llm_call"),
+            attrString("raindrop.subagent.name", subagentName)
+          ]
+        });
+        this.traceShipper.endSpan(markerSpan);
+        rootParentOverride = subagentParentRef;
+      }
       let rootSpan;
       if (this.sendTraces) {
         const promptAttrs = !isEmbed && recordInputs ? [
@@ -1785,7 +1889,7 @@ var RaindropTelemetryIntegration = class {
         ] : [attrString("ai.value", safeJsonWithUint8(event.value))] : [];
         rootSpan = this.traceShipper.startSpan({
           name: event.operationId,
-          parent: inheritedParent,
+          parent: rootParentOverride != null ? rootParentOverride : inheritedParent,
           eventId,
           operationId: event.operationId,
           attributes: [
@@ -1813,18 +1917,21 @@ var RaindropTelemetryIntegration = class {
         operationId: event.operationId,
         eventId,
         rootSpan,
-        rootParent: rootSpan ? this.spanParentRef(rootSpan) : inheritedParent,
+        rootParent: rootSpan ? this.spanParentRef(rootSpan) : rootParentOverride != null ? rootParentOverride : inheritedParent,
         stepSpan: void 0,
         stepParent: void 0,
         toolSpans: /* @__PURE__ */ new Map(),
         embedSpans: /* @__PURE__ */ new Map(),
+        parentContextToolCallIds: /* @__PURE__ */ new Set(),
         recordInputs,
         recordOutputs,
         functionId,
         metadata,
         accumulatedText: "",
         inputText: isEmbed ? void 0 : this.extractInputText(event),
-        toolCallCount: 0
+        toolCallCount: 0,
+        subagentName,
+        subagentToolCallSpan
       });
     };
     // ── onStepStart ─────────────────────────────────────────────────────────
@@ -2038,6 +2145,10 @@ var RaindropTelemetryIntegration = class {
       this.traceShipper.endSpan(embedSpan, { attributes: outputAttrs });
       state.embedSpans.delete(event.embedCallId);
     };
+    // v7 canary.159 renamed `onEmbedFinish` -> `onEmbedEnd`. Both names forward
+    // to the same implementation; the installed SDK only wires up whichever it
+    // knows about, so there is no double dispatch.
+    this.onEmbedEnd = (event) => this.onEmbedFinish(event);
     // ── onFinish ────────────────────────────────────────────────────────────
     this.onFinish = (event) => {
       const state = this.getState(event.callId);
@@ -2048,8 +2159,17 @@ var RaindropTelemetryIntegration = class {
       } else {
         this.finishGenerate(event, state);
       }
+      if (state.subagentToolCallSpan) {
+        this.traceShipper.endSpan(state.subagentToolCallSpan);
+      }
       this.cleanup(event.callId);
     };
+    // v7 < canary.159 dispatched `onFinish` as the operation finalizer; canary.159
+    // renamed it to `onEnd` (the same change renamed onEmbedFinish -> onEmbedEnd
+    // and onRerankFinish -> onRerankEnd). The event shape is unchanged, so this
+    // is a thin alias to one implementation. The installed SDK wires up whichever
+    // name it knows about, so old and new names never double dispatch.
+    this.onEnd = (event) => this.onFinish(event);
     // ── onError ─────────────────────────────────────────────────────────────
     this.onError = (error) => {
       var _a;
@@ -2065,6 +2185,10 @@ var RaindropTelemetryIntegration = class {
         this.traceShipper.endSpan(embedSpan, { error: actualError });
       }
       state.embedSpans.clear();
+      for (const toolCallId of state.parentContextToolCallIds) {
+        this.priorParentContexts.delete(toolCallId);
+      }
+      state.parentContextToolCallIds.clear();
       for (const toolSpan of state.toolSpans.values()) {
         this.traceShipper.endSpan(toolSpan, { error: actualError });
       }
@@ -2072,6 +2196,9 @@ var RaindropTelemetryIntegration = class {
       if (state.rootSpan) {
         this.traceShipper.endSpan(state.rootSpan, { error: actualError });
       }
+      if (state.subagentToolCallSpan) {
+        this.traceShipper.endSpan(state.subagentToolCallSpan, { error: actualError });
+      }
       this.cleanup(event.callId);
     };
     // ── executeTool ─────────────────────────────────────────────────────────
@@ -2096,6 +2223,7 @@ var RaindropTelemetryIntegration = class {
     this.eventShipper = opts.eventShipper;
     this.sendTraces = opts.sendTraces !== false;
     this.sendEvents = opts.sendEvents !== false;
+    this.subagentWrapping = opts.subagentWrapping !== false;
     this.debug = opts.debug === true;
     this.defaultContext = opts.context;
   }
@@ -2177,9 +2305,20 @@ var RaindropTelemetryIntegration = class {
   // (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 { toolCall } = event;
+    const priorParent = getCurrentParentToolContext();
+    this.priorParentContexts.set(
+      toolCall.toolCallId,
+      priorParent != null ? priorParent : null
+    );
+    enterParentToolContext({
+      parentCallId: event.callId,
+      toolCallId: toolCall.toolCallId,
+      toolName: toolCall.toolName
+    });
     const state = this.getState(event.callId);
+    state == null ? void 0 : state.parentContextToolCallIds.add(toolCall.toolCallId);
     if (!(state == null ? void 0 : state.stepParent)) return;
-    const { toolCall } = event;
     const { operationName, resourceName } = opName(
       "ai.toolCall",
       state.functionId
@@ -2203,6 +2342,17 @@ var RaindropTelemetryIntegration = class {
     this.emitLive(state, "tool_start", toolCall.toolName, { args: toolCall.input });
   }
   toolExecutionEnd(event) {
+    var _a;
+    const toolCallId = (_a = event.toolCall) == null ? void 0 : _a.toolCallId;
+    if (toolCallId && this.priorParentContexts.has(toolCallId)) {
+      const prior = this.priorParentContexts.get(toolCallId);
+      this.priorParentContexts.delete(toolCallId);
+      if (prior) {
+        enterParentToolContext(prior);
+      } else {
+        clearParentToolContext();
+      }
+    }
     const state = this.getState(event.callId);
     if (!state) return;
     const toolSpan = state.toolSpans.get(event.toolCall.toolCallId);
@@ -2266,7 +2416,8 @@ var RaindropTelemetryIntegration = class {
       );
       this.traceShipper.endSpan(state.rootSpan, { attributes: outputAttrs });
     }
-    if (this.sendEvents) {
+    const suppressSubagentEvent = state.subagentName !== void 0 && state.subagentToolCallSpan !== void 0;
+    if (this.sendEvents && !suppressSubagentEvent) {
       const callMeta = this.extractRaindropMetadata(state.metadata);
       const userId = (_f = callMeta.userId) != null ? _f : (_e = this.defaultContext) == null ? void 0 : _e.userId;
       if (userId) {
@@ -4428,12 +4579,16 @@ function createRaindropAISDK(opts) {
   const writeKey = opts.writeKey;
   const eventsRequested = ((_a = opts.events) == null ? void 0 : _a.enabled) !== false;
   const tracesRequested = ((_b = opts.traces) == null ? void 0 : _b.enabled) !== false;
-  const eventsEnabled = eventsRequested && !!writeKey;
-  const tracesEnabled = tracesRequested && !!writeKey;
   const envDebug = envDebugEnabled();
-  if (!writeKey && (eventsRequested || tracesRequested)) {
+  const localWorkshopInput = opts.localWorkshopUrl === false ? null : opts.localWorkshopUrl;
+  const resolvedLocalDebuggerUrl = resolveLocalDebuggerBaseUrl(localWorkshopInput);
+  const localDebuggerUrl = localWorkshopInput === null ? null : resolvedLocalDebuggerUrl != null ? resolvedLocalDebuggerUrl : void 0;
+  const hasDestination = !!writeKey || !!resolvedLocalDebuggerUrl;
+  const eventsEnabled = eventsRequested && hasDestination;
+  const tracesEnabled = tracesRequested && hasDestination;
+  if (!hasDestination && (eventsRequested || tracesRequested)) {
     console.warn(
-      "[raindrop-ai/ai-sdk] writeKey not provided; telemetry shipping is disabled"
+      "[raindrop-ai/ai-sdk] writeKey not provided and no local Workshop reachable; telemetry shipping is disabled"
     );
   }
   const eventShipper = new EventShipper2({
@@ -4441,9 +4596,9 @@ function createRaindropAISDK(opts) {
     endpoint: opts.endpoint,
     enabled: eventsEnabled,
     debug: ((_c = opts.events) == null ? void 0 : _c.debug) === true || envDebug,
-    partialFlushMs: (_d = opts.events) == null ? void 0 : _d.partialFlushMs
+    partialFlushMs: (_d = opts.events) == null ? void 0 : _d.partialFlushMs,
+    localDebuggerUrl
   });
-  const localDebuggerUrl = opts.localWorkshopUrl === false ? null : opts.localWorkshopUrl;
   const traceShipper = new TraceShipper2({
     writeKey,
     endpoint: opts.endpoint,
@@ -4465,12 +4620,30 @@ function createRaindropAISDK(opts) {
         traceShipper
       });
     },
-    createTelemetryIntegration(context) {
+    createTelemetryIntegration(contextOrOptions) {
+      const FLAT_CONTEXT_KEYS = [
+        "userId",
+        "eventId",
+        "eventName",
+        "convoId",
+        "properties"
+      ];
+      let context;
+      let subagentWrapping;
+      if (contextOrOptions === void 0) ; else if ("context" in contextOrOptions) {
+        context = contextOrOptions.context;
+        subagentWrapping = contextOrOptions.subagentWrapping;
+      } else if ("subagentWrapping" in contextOrOptions && !FLAT_CONTEXT_KEYS.some((k) => k in contextOrOptions)) {
+        subagentWrapping = contextOrOptions.subagentWrapping;
+      } else {
+        context = contextOrOptions;
+      }
       return new RaindropTelemetryIntegration({
         traceShipper,
         eventShipper,
         sendTraces: tracesEnabled,
         sendEvents: eventsEnabled,
+        subagentWrapping,
         debug: envDebug,
         context
       });
@@ -4587,17 +4760,22 @@ exports.DEFAULT_REDACT_ATTRIBUTE_KEYS = DEFAULT_REDACT_ATTRIBUTE_KEYS;
 exports.DEFAULT_SECRET_KEY_NAMES = DEFAULT_SECRET_KEY_NAMES;
 exports.REDACTED_PLACEHOLDER = REDACTED_PLACEHOLDER;
 exports.RaindropTelemetryIntegration = RaindropTelemetryIntegration;
+exports._resetParentToolContextStorage = _resetParentToolContextStorage;
 exports._resetRaindropCallMetadataStorage = _resetRaindropCallMetadataStorage;
 exports._resetWarnedMissingUserId = _resetWarnedMissingUserId;
+exports.clearParentToolContext = clearParentToolContext;
 exports.createRaindropAISDK = createRaindropAISDK;
 exports.currentSpan = currentSpan;
 exports.defaultTransformSpan = defaultTransformSpan;
+exports.enterParentToolContext = enterParentToolContext;
 exports.eventMetadata = eventMetadata;
 exports.eventMetadataFromChatRequest = eventMetadataFromChatRequest;
 exports.getContextManager = getContextManager;
+exports.getCurrentParentToolContext = getCurrentParentToolContext;
 exports.getCurrentRaindropCallMetadata = getCurrentRaindropCallMetadata;
 exports.readRaindropCallMetadataFromArgs = readRaindropCallMetadataFromArgs;
 exports.redactJsonAttributeValue = redactJsonAttributeValue;
 exports.redactSecretsInObject = redactSecretsInObject;
+exports.runWithParentToolContext = runWithParentToolContext;
 exports.runWithRaindropCallMetadata = runWithRaindropCallMetadata;
 exports.withCurrent = withCurrent;

package/dist/index.workers.mjs

@@ -1,4 +1,4 @@
-export { DEFAULT_REDACT_ATTRIBUTE_KEYS, DEFAULT_SECRET_KEY_NAMES, REDACTED_PLACEHOLDER, RaindropTelemetryIntegration, _resetRaindropCallMetadataStorage, _resetWarnedMissingUserId, createRaindropAISDK, currentSpan, defaultTransformSpan, eventMetadata, eventMetadataFromChatRequest, getContextManager, getCurrentRaindropCallMetadata, readRaindropCallMetadataFromArgs, redactJsonAttributeValue, redactSecretsInObject, runWithRaindropCallMetadata, withCurrent } from './chunk-QGI4SABN.mjs';
+export { DEFAULT_REDACT_ATTRIBUTE_KEYS, DEFAULT_SECRET_KEY_NAMES, REDACTED_PLACEHOLDER, RaindropTelemetryIntegration, _resetParentToolContextStorage, _resetRaindropCallMetadataStorage, _resetWarnedMissingUserId, clearParentToolContext, createRaindropAISDK, currentSpan, defaultTransformSpan, enterParentToolContext, eventMetadata, eventMetadataFromChatRequest, getContextManager, getCurrentParentToolContext, getCurrentRaindropCallMetadata, readRaindropCallMetadataFromArgs, redactJsonAttributeValue, redactSecretsInObject, runWithParentToolContext, runWithRaindropCallMetadata, withCurrent } from './chunk-7VSCLQIX.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.29",
+  "version": "0.0.31",
   "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",
@@ -42,7 +42,7 @@
     "tsup": "^8.4.0",
     "tsx": "^4.20.3",
     "typescript": "^5.3.3",
-    "@raindrop-ai/core": "0.0.1"
+    "@raindrop-ai/core": "0.0.2"
   },
   "peerDependencies": {
     "ai": ">=4 <8"