raindrop-ai 0.0.91 → 0.0.92-otelv2

package/dist/{chunk-4KBZONJV.mjs → chunk-PURTSYKG.mjs}

@@ -1,4 +1,4 @@
-// ../core/dist/chunk-5KTDM7WD.js
+// ../core/dist/chunk-Y7SM66SW.js
 function wait(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -97,21 +97,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);
@@ -143,7 +128,7 @@ function sendLocalDebuggerLiveEvent(event, options = {}) {
     `${baseUrl}live`,
     {
       ...event,
-      type: normalizeLocalDebuggerLiveEventType(event.type),
+      type: event.type,
       timestamp: (_a = event.timestamp) != null ? _a : Date.now()
     },
     {},
@@ -163,7 +148,7 @@ globalThis.RAINDROP_ASYNC_LOCAL_STORAGE = AsyncLocalStorage;
 // package.json
 var package_default = {
   name: "raindrop-ai",
-  version: "0.0.91",
+  version: "0.0.92",
   main: "dist/index.js",
   module: "dist/index.mjs",
   types: "dist/index.d.ts",
@@ -682,7 +667,13 @@ var DirectTraceShipper = class {
 };
 
 // src/tracing/liveInteraction.ts
-import { context as context2, SpanStatusCode as SpanStatusCode2, TraceFlags, trace as trace2 } from "@opentelemetry/api";
+import {
+  context as context2,
+  isValidSpanId,
+  SpanStatusCode as SpanStatusCode2,
+  TraceFlags,
+  trace as trace2
+} from "@opentelemetry/api";
 import * as traceloop from "@traceloop/node-server-sdk";
 function getPropertiesFromContext(context5) {
   const properties = {
@@ -732,6 +723,10 @@ var LiveToolSpan = class {
     this.name = params.name;
     this.emitLiveEvent = params.emitLiveEvent;
   }
+  spanIdHex() {
+    const ctx = this.span.spanContext();
+    return isValidSpanId(ctx.spanId) ? ctx.spanId : void 0;
+  }
   setInput(input) {
     this.span.setAttribute("traceloop.entity.input", serializeSpanValue(input));
   }
@@ -754,6 +749,7 @@ var LiveToolSpan = class {
     (_a = this.emitLiveEvent) == null ? void 0 : _a.call(this, {
       type: "tool_result",
       content: this.name,
+      spanId: this.spanIdHex(),
       metadata: {
         ...this.output !== void 0 ? { result: this.output } : {},
         ...this.errorMessage ? { error: this.errorMessage } : {}
@@ -768,6 +764,7 @@ var DirectToolSpan = class {
     this.properties = params.properties;
     this.directShipper = params.directShipper;
     this.traceId = params.traceId;
+    this.spanId = params.spanId;
     this.parentSpanId = params.parentSpanId;
     this.startTimeMs = Date.now();
     this.input = params.input !== void 0 ? serializeSpanValue(params.input) : void 0;
@@ -792,6 +789,7 @@ var DirectToolSpan = class {
     const endTimeMs = Date.now();
     this.directShipper.sendToolSpan({
       name: this.name,
+      spanId: this.spanId,
       input: this.input,
       output: this.output,
       durationMs: endTimeMs - this.startTimeMs,
@@ -804,6 +802,7 @@ var DirectToolSpan = class {
     });
     (_a = this.emitLiveEvent) == null ? void 0 : _a.call(this, {
       traceId: this.traceId,
+      spanId: this.spanId,
       type: "tool_result",
       content: this.name,
       timestamp: endTimeMs,
@@ -957,17 +956,18 @@ var LiveInteraction = class {
     }
     if (this.directShipper) {
       const activeContext = getActiveTraceContext();
+      const traceIdB64 = this.ensureTraceId(activeContext.traceIdB64);
+      const { parentSpanIdB64 } = activeContext;
+      const spanIdB64 = base64Encode2(randomBytes2(8));
+      const startTimeMs = Date.now();
       this.emitLiveEvent({
-        traceId: activeContext.traceIdB64,
+        traceId: traceIdB64,
+        spanId: spanIdB64,
         type: "tool_start",
         content: toolName,
-        timestamp: Date.now(),
+        timestamp: startTimeMs,
         metadata: params.inputParameters ? { args: params.inputParameters } : void 0
       });
-      const traceIdB64 = this.ensureTraceId(activeContext.traceIdB64);
-      const { parentSpanIdB64 } = activeContext;
-      const spanIdB64 = base64Encode2(randomBytes2(8));
-      const startTimeMs = Date.now();
       const spanContext = {
         traceId: base64ToHex(traceIdB64),
         spanId: base64ToHex(spanIdB64),
@@ -1001,6 +1001,7 @@ var LiveInteraction = class {
         });
         this.emitLiveEvent({
           traceId: traceIdB64,
+          spanId: spanIdB64,
           type: "tool_result",
           content: toolName,
           timestamp: endTimeMs2,
@@ -1030,6 +1031,7 @@ var LiveInteraction = class {
       });
       this.emitLiveEvent({
         traceId: traceIdB64,
+        spanId: spanIdB64,
         type: "tool_result",
         content: toolName,
         timestamp: endTimeMs,
@@ -1040,49 +1042,59 @@ var LiveInteraction = class {
       });
       return result;
     }
-    this.emitLiveEvent({
-      type: "tool_start",
-      content: toolName,
-      timestamp: Date.now(),
-      metadata: params.inputParameters ? { args: params.inputParameters } : void 0
-    });
     const inputParams = params.inputParameters ? [params.inputParameters] : void 0;
-    try {
-      const result = await traceloop.withTool(
-        {
-          name: toolName,
-          associationProperties: serializeAssociationProperties(properties),
-          inputParameters: inputParams,
-          version: params.version,
-          traceContent: params.traceContent,
-          suppressTracing: params.suppressTracing
-        },
-        fn,
-        thisArg,
-        ...args
-      );
-      this.emitLiveEvent({
-        type: "tool_result",
-        content: toolName,
-        timestamp: Date.now(),
-        metadata: {
-          ...params.inputParameters ? { args: params.inputParameters } : {},
-          ...result !== void 0 ? { result } : {}
-        }
-      });
-      return result;
-    } catch (error) {
-      this.emitLiveEvent({
-        type: "tool_result",
+    const emitLive = (event) => this.emitLiveEvent(event);
+    const wrapped = async (...wrappedArgs) => {
+      const activeSpan = trace2.getSpan(context2.active());
+      const ctx = activeSpan == null ? void 0 : activeSpan.spanContext();
+      const liveSpanId = ctx && isValidSpanId(ctx.spanId) ? ctx.spanId : void 0;
+      emitLive({
+        type: "tool_start",
+        spanId: liveSpanId,
         content: toolName,
         timestamp: Date.now(),
-        metadata: {
-          ...params.inputParameters ? { args: params.inputParameters } : {},
-          error: error instanceof Error ? error.message : String(error)
-        }
+        metadata: params.inputParameters ? { args: params.inputParameters } : void 0
       });
-      throw error;
-    }
+      try {
+        const r = await fn.apply(thisArg, wrappedArgs);
+        emitLive({
+          type: "tool_result",
+          spanId: liveSpanId,
+          content: toolName,
+          timestamp: Date.now(),
+          metadata: {
+            ...params.inputParameters ? { args: params.inputParameters } : {},
+            ...r !== void 0 ? { result: r } : {}
+          }
+        });
+        return r;
+      } catch (error) {
+        emitLive({
+          type: "tool_result",
+          spanId: liveSpanId,
+          content: toolName,
+          timestamp: Date.now(),
+          metadata: {
+            ...params.inputParameters ? { args: params.inputParameters } : {},
+            error: error instanceof Error ? error.message : String(error)
+          }
+        });
+        throw error;
+      }
+    };
+    return traceloop.withTool(
+      {
+        name: toolName,
+        associationProperties: serializeAssociationProperties(properties),
+        inputParameters: inputParams,
+        version: params.version,
+        traceContent: params.traceContent,
+        suppressTracing: params.suppressTracing
+      },
+      wrapped,
+      void 0,
+      ...args
+    );
   }
   startSpan(params) {
     const { name, properties = {} } = params;
@@ -1105,11 +1117,13 @@ var LiveInteraction = class {
       const activeTraceContext = getActiveTraceContext();
       const traceIdB64 = this.ensureTraceId(activeTraceContext.traceIdB64);
       const { parentSpanIdB64 } = activeTraceContext;
+      const spanIdB64 = base64Encode2(randomBytes2(8));
       if ((_a = this.analytics) == null ? void 0 : _a.debugLogs) {
         console.log(`[raindrop] startToolSpan (direct): started tool span "${name}"`);
       }
       this.emitLiveEvent({
         traceId: traceIdB64,
+        spanId: spanIdB64,
         type: "tool_start",
         content: name,
         timestamp: Date.now(),
@@ -1120,6 +1134,7 @@ var LiveInteraction = class {
         properties: mergedProperties,
         directShipper: this.directShipper,
         traceId: traceIdB64,
+        spanId: spanIdB64,
         parentSpanId: parentSpanIdB64,
         input: inputParameters,
         emitLiveEvent: (event) => this.emitLiveEvent(event)
@@ -1135,8 +1150,11 @@ var LiveInteraction = class {
     if ((_b = this.analytics) == null ? void 0 : _b.debugLogs) {
       console.log(`[raindrop] startToolSpan: started tool span "${name}"`);
     }
+    const startSpanCtx = span.spanContext();
+    const startSpanIdHex = isValidSpanId(startSpanCtx.spanId) ? startSpanCtx.spanId : void 0;
     this.emitLiveEvent({
       type: "tool_start",
+      spanId: startSpanIdHex,
       content: name,
       timestamp: Date.now(),
       metadata: inputParameters !== void 0 ? { args: inputParameters } : void 0
@@ -1226,10 +1244,12 @@ var LiveInteraction = class {
       const activeContext = getActiveTraceContext();
       const traceIdB64 = this.ensureTraceId(activeContext.traceIdB64);
       const { parentSpanIdB64 } = activeContext;
+      const spanIdB64 = base64Encode2(randomBytes2(8));
       const inputStr = input !== void 0 ? typeof input === "string" ? input : JSON.stringify(input) : void 0;
       const outputStr = output !== void 0 ? typeof output === "string" ? output : JSON.stringify(output) : void 0;
       this.directShipper.sendToolSpan({
         name,
+        spanId: spanIdB64,
         input: inputStr,
         output: outputStr,
         durationMs,
@@ -1253,6 +1273,7 @@ var LiveInteraction = class {
       }
       this.emitLiveEvent({
         traceId: traceIdB64,
+        spanId: spanIdB64,
         type: "tool_result",
         content: name,
         timestamp: endTimeMs,
@@ -1298,8 +1319,11 @@ var LiveInteraction = class {
         error: error ? String(error) : void 0
       });
     }
+    const trackToolCtx = span.spanContext();
+    const trackToolSpanIdHex = isValidSpanId(trackToolCtx.spanId) ? trackToolCtx.spanId : void 0;
     this.emitLiveEvent({
       type: "tool_result",
+      spanId: trackToolSpanIdHex,
       content: name,
       timestamp: endTimeMs,
       metadata: {
@@ -1312,7 +1336,7 @@ var LiveInteraction = class {
 };
 
 // src/tracing/liveTracer.ts
-import { context as context3, SpanStatusCode as SpanStatusCode3, trace as trace3 } from "@opentelemetry/api";
+import { context as context3, isValidSpanId as isValidSpanId2, SpanStatusCode as SpanStatusCode3, trace as trace3 } from "@opentelemetry/api";
 import * as traceloop2 from "@traceloop/node-server-sdk";
 var LiveTracer = class {
   constructor(globalProperties, directShipper) {
@@ -1361,10 +1385,12 @@ var LiveTracer = class {
     const endTimeMs = startTimeMs + (durationMs != null ? durationMs : 0);
     if (this.directShipper) {
       const { traceIdB64, parentSpanIdB64 } = getActiveTraceContext();
+      const spanIdB64 = base64Encode2(randomBytes2(8));
       const inputStr = input !== void 0 ? typeof input === "string" ? input : JSON.stringify(input) : void 0;
       const outputStr = output !== void 0 ? typeof output === "string" ? output : JSON.stringify(output) : void 0;
       this.directShipper.sendToolSpan({
         name,
+        spanId: spanIdB64,
         input: inputStr,
         output: outputStr,
         durationMs,
@@ -1381,6 +1407,7 @@ var LiveTracer = class {
       if (traceIdB64) {
         this.emitLiveEvent({
           traceId: traceIdB64,
+          spanId: spanIdB64,
           type: "tool_result",
           content: name,
           timestamp: endTimeMs,
@@ -1422,10 +1449,13 @@ var LiveTracer = class {
       span.setStatus({ code: SpanStatusCode3.OK });
     }
     span.end(endTimeMs);
-    const traceId = span.spanContext().traceId || ((_a = trace3.getSpan(context3.active())) == null ? void 0 : _a.spanContext().traceId);
+    const ctx = span.spanContext();
+    const traceId = ctx.traceId || ((_a = trace3.getSpan(context3.active())) == null ? void 0 : _a.spanContext().traceId);
+    const spanIdHex = isValidSpanId2(ctx.spanId) ? ctx.spanId : void 0;
     if (traceId) {
       this.emitLiveEvent({
         traceId,
+        spanId: spanIdHex,
         type: "tool_result",
         content: name,
         timestamp: endTimeMs,

package/dist/index.js

@@ -5771,7 +5771,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// ../core/dist/chunk-5KTDM7WD.js
+// ../core/dist/chunk-Y7SM66SW.js
 function wait(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -5870,21 +5870,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);
@@ -5916,7 +5901,7 @@ function sendLocalDebuggerLiveEvent(event, options = {}) {
     `${baseUrl}live`,
     {
       ...event,
-      type: normalizeLocalDebuggerLiveEventType(event.type),
+      type: event.type,
       timestamp: (_a = event.timestamp) != null ? _a : Date.now()
     },
     {},
@@ -10041,7 +10026,7 @@ var SignalEventSchema = external_exports.object({
 // package.json
 var package_default = {
   name: "raindrop-ai",
-  version: "0.0.91",
+  version: "0.0.92",
   main: "dist/index.js",
   module: "dist/index.mjs",
   types: "dist/index.d.ts",
@@ -10696,6 +10681,10 @@ var LiveToolSpan = class {
     this.name = params.name;
     this.emitLiveEvent = params.emitLiveEvent;
   }
+  spanIdHex() {
+    const ctx = this.span.spanContext();
+    return (0, import_api2.isValidSpanId)(ctx.spanId) ? ctx.spanId : void 0;
+  }
   setInput(input) {
     this.span.setAttribute("traceloop.entity.input", serializeSpanValue(input));
   }
@@ -10718,6 +10707,7 @@ var LiveToolSpan = class {
     (_a = this.emitLiveEvent) == null ? void 0 : _a.call(this, {
       type: "tool_result",
       content: this.name,
+      spanId: this.spanIdHex(),
       metadata: {
         ...this.output !== void 0 ? { result: this.output } : {},
         ...this.errorMessage ? { error: this.errorMessage } : {}
@@ -10732,6 +10722,7 @@ var DirectToolSpan = class {
     this.properties = params.properties;
     this.directShipper = params.directShipper;
     this.traceId = params.traceId;
+    this.spanId = params.spanId;
     this.parentSpanId = params.parentSpanId;
     this.startTimeMs = Date.now();
     this.input = params.input !== void 0 ? serializeSpanValue(params.input) : void 0;
@@ -10756,6 +10747,7 @@ var DirectToolSpan = class {
     const endTimeMs = Date.now();
     this.directShipper.sendToolSpan({
       name: this.name,
+      spanId: this.spanId,
       input: this.input,
       output: this.output,
       durationMs: endTimeMs - this.startTimeMs,
@@ -10768,6 +10760,7 @@ var DirectToolSpan = class {
     });
     (_a = this.emitLiveEvent) == null ? void 0 : _a.call(this, {
       traceId: this.traceId,
+      spanId: this.spanId,
       type: "tool_result",
       content: this.name,
       timestamp: endTimeMs,
@@ -10921,17 +10914,18 @@ var LiveInteraction = class {
     }
     if (this.directShipper) {
       const activeContext = getActiveTraceContext();
+      const traceIdB64 = this.ensureTraceId(activeContext.traceIdB64);
+      const { parentSpanIdB64 } = activeContext;
+      const spanIdB64 = base64Encode2(randomBytes2(8));
+      const startTimeMs = Date.now();
       this.emitLiveEvent({
-        traceId: activeContext.traceIdB64,
+        traceId: traceIdB64,
+        spanId: spanIdB64,
         type: "tool_start",
         content: toolName,
-        timestamp: Date.now(),
+        timestamp: startTimeMs,
         metadata: params.inputParameters ? { args: params.inputParameters } : void 0
       });
-      const traceIdB64 = this.ensureTraceId(activeContext.traceIdB64);
-      const { parentSpanIdB64 } = activeContext;
-      const spanIdB64 = base64Encode2(randomBytes2(8));
-      const startTimeMs = Date.now();
       const spanContext = {
         traceId: base64ToHex(traceIdB64),
         spanId: base64ToHex(spanIdB64),
@@ -10965,6 +10959,7 @@ var LiveInteraction = class {
         });
         this.emitLiveEvent({
           traceId: traceIdB64,
+          spanId: spanIdB64,
           type: "tool_result",
           content: toolName,
           timestamp: endTimeMs2,
@@ -10994,6 +10989,7 @@ var LiveInteraction = class {
       });
       this.emitLiveEvent({
         traceId: traceIdB64,
+        spanId: spanIdB64,
         type: "tool_result",
         content: toolName,
         timestamp: endTimeMs,
@@ -11004,49 +11000,59 @@ var LiveInteraction = class {
       });
       return result;
     }
-    this.emitLiveEvent({
-      type: "tool_start",
-      content: toolName,
-      timestamp: Date.now(),
-      metadata: params.inputParameters ? { args: params.inputParameters } : void 0
-    });
     const inputParams = params.inputParameters ? [params.inputParameters] : void 0;
-    try {
-      const result = await traceloop.withTool(
-        {
-          name: toolName,
-          associationProperties: serializeAssociationProperties(properties),
-          inputParameters: inputParams,
-          version: params.version,
-          traceContent: params.traceContent,
-          suppressTracing: params.suppressTracing
-        },
-        fn,
-        thisArg,
-        ...args
-      );
-      this.emitLiveEvent({
-        type: "tool_result",
-        content: toolName,
-        timestamp: Date.now(),
-        metadata: {
-          ...params.inputParameters ? { args: params.inputParameters } : {},
-          ...result !== void 0 ? { result } : {}
-        }
-      });
-      return result;
-    } catch (error) {
-      this.emitLiveEvent({
-        type: "tool_result",
+    const emitLive = (event) => this.emitLiveEvent(event);
+    const wrapped = async (...wrappedArgs) => {
+      const activeSpan = import_api2.trace.getSpan(import_api2.context.active());
+      const ctx = activeSpan == null ? void 0 : activeSpan.spanContext();
+      const liveSpanId = ctx && (0, import_api2.isValidSpanId)(ctx.spanId) ? ctx.spanId : void 0;
+      emitLive({
+        type: "tool_start",
+        spanId: liveSpanId,
         content: toolName,
         timestamp: Date.now(),
-        metadata: {
-          ...params.inputParameters ? { args: params.inputParameters } : {},
-          error: error instanceof Error ? error.message : String(error)
-        }
+        metadata: params.inputParameters ? { args: params.inputParameters } : void 0
       });
-      throw error;
-    }
+      try {
+        const r = await fn.apply(thisArg, wrappedArgs);
+        emitLive({
+          type: "tool_result",
+          spanId: liveSpanId,
+          content: toolName,
+          timestamp: Date.now(),
+          metadata: {
+            ...params.inputParameters ? { args: params.inputParameters } : {},
+            ...r !== void 0 ? { result: r } : {}
+          }
+        });
+        return r;
+      } catch (error) {
+        emitLive({
+          type: "tool_result",
+          spanId: liveSpanId,
+          content: toolName,
+          timestamp: Date.now(),
+          metadata: {
+            ...params.inputParameters ? { args: params.inputParameters } : {},
+            error: error instanceof Error ? error.message : String(error)
+          }
+        });
+        throw error;
+      }
+    };
+    return traceloop.withTool(
+      {
+        name: toolName,
+        associationProperties: serializeAssociationProperties(properties),
+        inputParameters: inputParams,
+        version: params.version,
+        traceContent: params.traceContent,
+        suppressTracing: params.suppressTracing
+      },
+      wrapped,
+      void 0,
+      ...args
+    );
   }
   startSpan(params) {
     const { name, properties = {} } = params;
@@ -11069,11 +11075,13 @@ var LiveInteraction = class {
       const activeTraceContext = getActiveTraceContext();
       const traceIdB64 = this.ensureTraceId(activeTraceContext.traceIdB64);
       const { parentSpanIdB64 } = activeTraceContext;
+      const spanIdB64 = base64Encode2(randomBytes2(8));
       if ((_a = this.analytics) == null ? void 0 : _a.debugLogs) {
         console.log(`[raindrop] startToolSpan (direct): started tool span "${name}"`);
       }
       this.emitLiveEvent({
         traceId: traceIdB64,
+        spanId: spanIdB64,
         type: "tool_start",
         content: name,
         timestamp: Date.now(),
@@ -11084,6 +11092,7 @@ var LiveInteraction = class {
         properties: mergedProperties,
         directShipper: this.directShipper,
         traceId: traceIdB64,
+        spanId: spanIdB64,
         parentSpanId: parentSpanIdB64,
         input: inputParameters,
         emitLiveEvent: (event) => this.emitLiveEvent(event)
@@ -11099,8 +11108,11 @@ var LiveInteraction = class {
     if ((_b = this.analytics) == null ? void 0 : _b.debugLogs) {
       console.log(`[raindrop] startToolSpan: started tool span "${name}"`);
     }
+    const startSpanCtx = span.spanContext();
+    const startSpanIdHex = (0, import_api2.isValidSpanId)(startSpanCtx.spanId) ? startSpanCtx.spanId : void 0;
     this.emitLiveEvent({
       type: "tool_start",
+      spanId: startSpanIdHex,
       content: name,
       timestamp: Date.now(),
       metadata: inputParameters !== void 0 ? { args: inputParameters } : void 0
@@ -11190,10 +11202,12 @@ var LiveInteraction = class {
       const activeContext = getActiveTraceContext();
       const traceIdB64 = this.ensureTraceId(activeContext.traceIdB64);
       const { parentSpanIdB64 } = activeContext;
+      const spanIdB64 = base64Encode2(randomBytes2(8));
       const inputStr = input !== void 0 ? typeof input === "string" ? input : JSON.stringify(input) : void 0;
       const outputStr = output !== void 0 ? typeof output === "string" ? output : JSON.stringify(output) : void 0;
       this.directShipper.sendToolSpan({
         name,
+        spanId: spanIdB64,
         input: inputStr,
         output: outputStr,
         durationMs,
@@ -11217,6 +11231,7 @@ var LiveInteraction = class {
       }
       this.emitLiveEvent({
         traceId: traceIdB64,
+        spanId: spanIdB64,
         type: "tool_result",
         content: name,
         timestamp: endTimeMs,
@@ -11262,8 +11277,11 @@ var LiveInteraction = class {
         error: error ? String(error) : void 0
       });
     }
+    const trackToolCtx = span.spanContext();
+    const trackToolSpanIdHex = (0, import_api2.isValidSpanId)(trackToolCtx.spanId) ? trackToolCtx.spanId : void 0;
     this.emitLiveEvent({
       type: "tool_result",
+      spanId: trackToolSpanIdHex,
       content: name,
       timestamp: endTimeMs,
       metadata: {
@@ -11325,10 +11343,12 @@ var LiveTracer = class {
     const endTimeMs = startTimeMs + (durationMs != null ? durationMs : 0);
     if (this.directShipper) {
       const { traceIdB64, parentSpanIdB64 } = getActiveTraceContext();
+      const spanIdB64 = base64Encode2(randomBytes2(8));
       const inputStr = input !== void 0 ? typeof input === "string" ? input : JSON.stringify(input) : void 0;
       const outputStr = output !== void 0 ? typeof output === "string" ? output : JSON.stringify(output) : void 0;
       this.directShipper.sendToolSpan({
         name,
+        spanId: spanIdB64,
         input: inputStr,
         output: outputStr,
         durationMs,
@@ -11345,6 +11365,7 @@ var LiveTracer = class {
       if (traceIdB64) {
         this.emitLiveEvent({
           traceId: traceIdB64,
+          spanId: spanIdB64,
           type: "tool_result",
           content: name,
           timestamp: endTimeMs,
@@ -11386,10 +11407,13 @@ var LiveTracer = class {
       span.setStatus({ code: import_api3.SpanStatusCode.OK });
     }
     span.end(endTimeMs);
-    const traceId = span.spanContext().traceId || ((_a = import_api3.trace.getSpan(import_api3.context.active())) == null ? void 0 : _a.spanContext().traceId);
+    const ctx = span.spanContext();
+    const traceId = ctx.traceId || ((_a = import_api3.trace.getSpan(import_api3.context.active())) == null ? void 0 : _a.spanContext().traceId);
+    const spanIdHex = (0, import_api3.isValidSpanId)(ctx.spanId) ? ctx.spanId : void 0;
     if (traceId) {
       this.emitLiveEvent({
         traceId,
+        spanId: spanIdHex,
         type: "tool_result",
         content: name,
         timestamp: endTimeMs,

package/dist/index.mjs

@@ -2,7 +2,7 @@ import {
   mirrorPartialEventToLocalDebugger,
   package_default,
   tracing
-} from "./chunk-4KBZONJV.mjs";
+} from "./chunk-PURTSYKG.mjs";
 import {
   __commonJS,
   __toESM

package/dist/tracing/index.js

@@ -50,7 +50,7 @@ var import_instrumentation_vertexai = require("@traceloop/instrumentation-vertex
 var traceloop3 = __toESM(require("@traceloop/node-server-sdk"));
 var import_weakref = require("weakref");
 
-// ../core/dist/chunk-5KTDM7WD.js
+// ../core/dist/chunk-Y7SM66SW.js
 function wait(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -149,21 +149,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);
@@ -183,7 +168,7 @@ function sendLocalDebuggerLiveEvent(event, options = {}) {
     `${baseUrl}live`,
     {
       ...event,
-      type: normalizeLocalDebuggerLiveEventType(event.type),
+      type: event.type,
       timestamp: (_a = event.timestamp) != null ? _a : Date.now()
     },
     {},
@@ -351,7 +336,7 @@ function base64ToHex(base64) {
 // package.json
 var package_default = {
   name: "raindrop-ai",
-  version: "0.0.91",
+  version: "0.0.92",
   main: "dist/index.js",
   module: "dist/index.mjs",
   types: "dist/index.d.ts",
@@ -754,6 +739,10 @@ var LiveToolSpan = class {
     this.name = params.name;
     this.emitLiveEvent = params.emitLiveEvent;
   }
+  spanIdHex() {
+    const ctx = this.span.spanContext();
+    return (0, import_api2.isValidSpanId)(ctx.spanId) ? ctx.spanId : void 0;
+  }
   setInput(input) {
     this.span.setAttribute("traceloop.entity.input", serializeSpanValue(input));
   }
@@ -776,6 +765,7 @@ var LiveToolSpan = class {
     (_a = this.emitLiveEvent) == null ? void 0 : _a.call(this, {
       type: "tool_result",
       content: this.name,
+      spanId: this.spanIdHex(),
       metadata: {
         ...this.output !== void 0 ? { result: this.output } : {},
         ...this.errorMessage ? { error: this.errorMessage } : {}
@@ -790,6 +780,7 @@ var DirectToolSpan = class {
     this.properties = params.properties;
     this.directShipper = params.directShipper;
     this.traceId = params.traceId;
+    this.spanId = params.spanId;
     this.parentSpanId = params.parentSpanId;
     this.startTimeMs = Date.now();
     this.input = params.input !== void 0 ? serializeSpanValue(params.input) : void 0;
@@ -814,6 +805,7 @@ var DirectToolSpan = class {
     const endTimeMs = Date.now();
     this.directShipper.sendToolSpan({
       name: this.name,
+      spanId: this.spanId,
       input: this.input,
       output: this.output,
       durationMs: endTimeMs - this.startTimeMs,
@@ -826,6 +818,7 @@ var DirectToolSpan = class {
     });
     (_a = this.emitLiveEvent) == null ? void 0 : _a.call(this, {
       traceId: this.traceId,
+      spanId: this.spanId,
       type: "tool_result",
       content: this.name,
       timestamp: endTimeMs,
@@ -979,17 +972,18 @@ var LiveInteraction = class {
     }
     if (this.directShipper) {
       const activeContext = getActiveTraceContext();
+      const traceIdB64 = this.ensureTraceId(activeContext.traceIdB64);
+      const { parentSpanIdB64 } = activeContext;
+      const spanIdB64 = base64Encode2(randomBytes2(8));
+      const startTimeMs = Date.now();
       this.emitLiveEvent({
-        traceId: activeContext.traceIdB64,
+        traceId: traceIdB64,
+        spanId: spanIdB64,
         type: "tool_start",
         content: toolName,
-        timestamp: Date.now(),
+        timestamp: startTimeMs,
         metadata: params.inputParameters ? { args: params.inputParameters } : void 0
       });
-      const traceIdB64 = this.ensureTraceId(activeContext.traceIdB64);
-      const { parentSpanIdB64 } = activeContext;
-      const spanIdB64 = base64Encode2(randomBytes2(8));
-      const startTimeMs = Date.now();
       const spanContext = {
         traceId: base64ToHex(traceIdB64),
         spanId: base64ToHex(spanIdB64),
@@ -1023,6 +1017,7 @@ var LiveInteraction = class {
         });
         this.emitLiveEvent({
           traceId: traceIdB64,
+          spanId: spanIdB64,
           type: "tool_result",
           content: toolName,
           timestamp: endTimeMs2,
@@ -1052,6 +1047,7 @@ var LiveInteraction = class {
       });
       this.emitLiveEvent({
         traceId: traceIdB64,
+        spanId: spanIdB64,
         type: "tool_result",
         content: toolName,
         timestamp: endTimeMs,
@@ -1062,49 +1058,59 @@ var LiveInteraction = class {
       });
       return result;
     }
-    this.emitLiveEvent({
-      type: "tool_start",
-      content: toolName,
-      timestamp: Date.now(),
-      metadata: params.inputParameters ? { args: params.inputParameters } : void 0
-    });
     const inputParams = params.inputParameters ? [params.inputParameters] : void 0;
-    try {
-      const result = await traceloop.withTool(
-        {
-          name: toolName,
-          associationProperties: serializeAssociationProperties(properties),
-          inputParameters: inputParams,
-          version: params.version,
-          traceContent: params.traceContent,
-          suppressTracing: params.suppressTracing
-        },
-        fn,
-        thisArg,
-        ...args
-      );
-      this.emitLiveEvent({
-        type: "tool_result",
-        content: toolName,
-        timestamp: Date.now(),
-        metadata: {
-          ...params.inputParameters ? { args: params.inputParameters } : {},
-          ...result !== void 0 ? { result } : {}
-        }
-      });
-      return result;
-    } catch (error) {
-      this.emitLiveEvent({
-        type: "tool_result",
+    const emitLive = (event) => this.emitLiveEvent(event);
+    const wrapped = async (...wrappedArgs) => {
+      const activeSpan = import_api2.trace.getSpan(import_api2.context.active());
+      const ctx = activeSpan == null ? void 0 : activeSpan.spanContext();
+      const liveSpanId = ctx && (0, import_api2.isValidSpanId)(ctx.spanId) ? ctx.spanId : void 0;
+      emitLive({
+        type: "tool_start",
+        spanId: liveSpanId,
         content: toolName,
         timestamp: Date.now(),
-        metadata: {
-          ...params.inputParameters ? { args: params.inputParameters } : {},
-          error: error instanceof Error ? error.message : String(error)
-        }
+        metadata: params.inputParameters ? { args: params.inputParameters } : void 0
       });
-      throw error;
-    }
+      try {
+        const r = await fn.apply(thisArg, wrappedArgs);
+        emitLive({
+          type: "tool_result",
+          spanId: liveSpanId,
+          content: toolName,
+          timestamp: Date.now(),
+          metadata: {
+            ...params.inputParameters ? { args: params.inputParameters } : {},
+            ...r !== void 0 ? { result: r } : {}
+          }
+        });
+        return r;
+      } catch (error) {
+        emitLive({
+          type: "tool_result",
+          spanId: liveSpanId,
+          content: toolName,
+          timestamp: Date.now(),
+          metadata: {
+            ...params.inputParameters ? { args: params.inputParameters } : {},
+            error: error instanceof Error ? error.message : String(error)
+          }
+        });
+        throw error;
+      }
+    };
+    return traceloop.withTool(
+      {
+        name: toolName,
+        associationProperties: serializeAssociationProperties(properties),
+        inputParameters: inputParams,
+        version: params.version,
+        traceContent: params.traceContent,
+        suppressTracing: params.suppressTracing
+      },
+      wrapped,
+      void 0,
+      ...args
+    );
   }
   startSpan(params) {
     const { name, properties = {} } = params;
@@ -1127,11 +1133,13 @@ var LiveInteraction = class {
       const activeTraceContext = getActiveTraceContext();
       const traceIdB64 = this.ensureTraceId(activeTraceContext.traceIdB64);
       const { parentSpanIdB64 } = activeTraceContext;
+      const spanIdB64 = base64Encode2(randomBytes2(8));
       if ((_a = this.analytics) == null ? void 0 : _a.debugLogs) {
         console.log(`[raindrop] startToolSpan (direct): started tool span "${name}"`);
       }
       this.emitLiveEvent({
         traceId: traceIdB64,
+        spanId: spanIdB64,
         type: "tool_start",
         content: name,
         timestamp: Date.now(),
@@ -1142,6 +1150,7 @@ var LiveInteraction = class {
         properties: mergedProperties,
         directShipper: this.directShipper,
         traceId: traceIdB64,
+        spanId: spanIdB64,
         parentSpanId: parentSpanIdB64,
         input: inputParameters,
         emitLiveEvent: (event) => this.emitLiveEvent(event)
@@ -1157,8 +1166,11 @@ var LiveInteraction = class {
     if ((_b = this.analytics) == null ? void 0 : _b.debugLogs) {
       console.log(`[raindrop] startToolSpan: started tool span "${name}"`);
     }
+    const startSpanCtx = span.spanContext();
+    const startSpanIdHex = (0, import_api2.isValidSpanId)(startSpanCtx.spanId) ? startSpanCtx.spanId : void 0;
     this.emitLiveEvent({
       type: "tool_start",
+      spanId: startSpanIdHex,
       content: name,
       timestamp: Date.now(),
       metadata: inputParameters !== void 0 ? { args: inputParameters } : void 0
@@ -1248,10 +1260,12 @@ var LiveInteraction = class {
       const activeContext = getActiveTraceContext();
       const traceIdB64 = this.ensureTraceId(activeContext.traceIdB64);
       const { parentSpanIdB64 } = activeContext;
+      const spanIdB64 = base64Encode2(randomBytes2(8));
       const inputStr = input !== void 0 ? typeof input === "string" ? input : JSON.stringify(input) : void 0;
       const outputStr = output !== void 0 ? typeof output === "string" ? output : JSON.stringify(output) : void 0;
       this.directShipper.sendToolSpan({
         name,
+        spanId: spanIdB64,
         input: inputStr,
         output: outputStr,
         durationMs,
@@ -1275,6 +1289,7 @@ var LiveInteraction = class {
       }
       this.emitLiveEvent({
         traceId: traceIdB64,
+        spanId: spanIdB64,
         type: "tool_result",
         content: name,
         timestamp: endTimeMs,
@@ -1320,8 +1335,11 @@ var LiveInteraction = class {
         error: error ? String(error) : void 0
       });
     }
+    const trackToolCtx = span.spanContext();
+    const trackToolSpanIdHex = (0, import_api2.isValidSpanId)(trackToolCtx.spanId) ? trackToolCtx.spanId : void 0;
     this.emitLiveEvent({
       type: "tool_result",
+      spanId: trackToolSpanIdHex,
       content: name,
       timestamp: endTimeMs,
       metadata: {
@@ -1383,10 +1401,12 @@ var LiveTracer = class {
     const endTimeMs = startTimeMs + (durationMs != null ? durationMs : 0);
     if (this.directShipper) {
       const { traceIdB64, parentSpanIdB64 } = getActiveTraceContext();
+      const spanIdB64 = base64Encode2(randomBytes2(8));
       const inputStr = input !== void 0 ? typeof input === "string" ? input : JSON.stringify(input) : void 0;
       const outputStr = output !== void 0 ? typeof output === "string" ? output : JSON.stringify(output) : void 0;
       this.directShipper.sendToolSpan({
         name,
+        spanId: spanIdB64,
         input: inputStr,
         output: outputStr,
         durationMs,
@@ -1403,6 +1423,7 @@ var LiveTracer = class {
       if (traceIdB64) {
         this.emitLiveEvent({
           traceId: traceIdB64,
+          spanId: spanIdB64,
           type: "tool_result",
           content: name,
           timestamp: endTimeMs,
@@ -1444,10 +1465,13 @@ var LiveTracer = class {
       span.setStatus({ code: import_api3.SpanStatusCode.OK });
     }
     span.end(endTimeMs);
-    const traceId = span.spanContext().traceId || ((_a = import_api3.trace.getSpan(import_api3.context.active())) == null ? void 0 : _a.spanContext().traceId);
+    const ctx = span.spanContext();
+    const traceId = ctx.traceId || ((_a = import_api3.trace.getSpan(import_api3.context.active())) == null ? void 0 : _a.spanContext().traceId);
+    const spanIdHex = (0, import_api3.isValidSpanId)(ctx.spanId) ? ctx.spanId : void 0;
     if (traceId) {
       this.emitLiveEvent({
         traceId,
+        spanId: spanIdHex,
         type: "tool_result",
         content: name,
         timestamp: endTimeMs,

package/dist/tracing/index.mjs

@@ -1,6 +1,6 @@
 import {
   tracing
-} from "../chunk-4KBZONJV.mjs";
+} from "../chunk-PURTSYKG.mjs";
 import "../chunk-UJCSKKID.mjs";
 
 // src/tracing/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "raindrop-ai",
-  "version": "0.0.91",
+  "version": "0.0.92-otelv2",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -37,23 +37,22 @@
     "dist/**"
   ],
   "devDependencies": {
-    "ai": "^6.0.0",
     "@opentelemetry/resources": "^2.0.1",
     "@types/node": "^20.11.17",
+    "ai": "^6.0.0",
     "msw": "^2.12.8",
     "tsup": "^8.4.0",
     "tsx": "^4.20.3",
     "typescript": "^5.3.3",
     "vite": "^7.3.2",
     "vitest": "^4.0.10",
-    "@raindrop-ai/core": "0.0.1",
     "@raindrop-ai/redact-pii": "0.1.2",
+    "@raindrop-ai/core": "0.0.1",
     "@raindrop-ai/schemas": "0.0.1"
   },
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.57.2",
-    "@traceloop/node-server-sdk": "0.19.0-otel-v1",
+    "@opentelemetry/exporter-trace-otlp-http": "^0.203.0",
     "weakref": "^0.2.1",
     "zod": "^3.23.8"
   },
@@ -96,6 +95,9 @@
     },
     "clean": true
   },
+  "optionalDependencies": {
+    "@traceloop/node-server-sdk": "0.22.2"
+  },
   "scripts": {
     "build": "tsup",
     "dev": "tsup --watch",