@raindrop-ai/pi-agent 0.0.9 → 0.1.0

package/dist/{chunk-TEXLELWC.js → chunk-XQJ6G4YA.js}

@@ -1,4 +1,4 @@
-// ../core/dist/chunk-WKRW55KX.js
+// ../core/dist/chunk-QTUH3BHZ.js
 function getCrypto() {
   const c = globalThis.crypto;
   return c;
@@ -54,7 +54,7 @@ function base64Encode(bytes) {
   return out;
 }
 function generateId() {
-  return base64Encode(randomBytes(12)).replace(/[+/=]/g, "").slice(0, 16);
+  return randomUUID();
 }
 function runWithTracingSuppressed(fn) {
   const hook = globalThis.RAINDROP_SUPPRESS_TRACING;
@@ -391,16 +391,52 @@ function projectIdHeaders(projectId) {
 var SHUTDOWN_DEADLINE_MS = 1e4;
 var POST_SHUTDOWN_TIMEOUT_MS = 5e3;
 function mergePatches(target, source) {
-  var _a, _b, _c, _d;
+  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 = { ...(_f = target.featureFlags) != null ? _f : {}, ...(_g = source.featureFlags) != null ? _g : {} };
+  }
   if (target.attachments || source.attachments) {
-    out.attachments = [...(_c = target.attachments) != null ? _c : [], ...(_d = source.attachments) != null ? _d : []];
+    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();
@@ -649,6 +685,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 = {
@@ -658,15 +699,17 @@ 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
       },
+      ...accumulated.featureFlags && Object.keys(accumulated.featureFlags).length > 0 ? { feature_flags: accumulated.featureFlags } : {},
       attachments: accumulated.attachments,
       is_pending: isPending
     };
@@ -820,6 +863,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 {
@@ -944,6 +994,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);
@@ -999,7 +1050,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({
@@ -1167,7 +1219,7 @@ installTracingSuppressionHook();
 // package.json
 var package_default = {
   name: "@raindrop-ai/pi-agent",
-  version: "0.0.9",
+  version: "0.1.0",
   description: "Raindrop observability for Pi Agent \u2014 automatic tracing via subscriber or pi-coding-agent extension",
   type: "module",
   license: "MIT",

package/dist/extension.cjs

@@ -25,7 +25,7 @@ __export(extension_exports, {
 });
 module.exports = __toCommonJS(extension_exports);
 
-// ../core/dist/chunk-WKRW55KX.js
+// ../core/dist/chunk-QTUH3BHZ.js
 function getCrypto() {
   const c = globalThis.crypto;
   return c;
@@ -40,6 +40,17 @@ function randomBytes(length) {
   for (let i = 0; i < out.length; i++) out[i] = Math.floor(Math.random() * 256);
   return out;
 }
+function randomUUID() {
+  const cryptoObj = getCrypto();
+  if (cryptoObj && typeof cryptoObj.randomUUID === "function") {
+    return cryptoObj.randomUUID();
+  }
+  const b = randomBytes(16);
+  b[6] = b[6] & 15 | 64;
+  b[8] = b[8] & 63 | 128;
+  const hex = [...b].map((x) => x.toString(16).padStart(2, "0")).join("");
+  return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
+}
 function base64Encode(bytes) {
   const maybeBuffer = globalThis.Buffer;
   if (maybeBuffer) {
@@ -70,7 +81,7 @@ function base64Encode(bytes) {
   return out;
 }
 function generateId() {
-  return base64Encode(randomBytes(12)).replace(/[+/=]/g, "").slice(0, 16);
+  return randomUUID();
 }
 function runWithTracingSuppressed(fn) {
   const hook = globalThis.RAINDROP_SUPPRESS_TRACING;
@@ -407,16 +418,52 @@ function projectIdHeaders(projectId) {
 var SHUTDOWN_DEADLINE_MS = 1e4;
 var POST_SHUTDOWN_TIMEOUT_MS = 5e3;
 function mergePatches(target, source) {
-  var _a, _b, _c, _d;
+  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 = { ...(_f = target.featureFlags) != null ? _f : {}, ...(_g = source.featureFlags) != null ? _g : {} };
+  }
   if (target.attachments || source.attachments) {
-    out.attachments = [...(_c = target.attachments) != null ? _c : [], ...(_d = source.attachments) != null ? _d : []];
+    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();
@@ -665,6 +712,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 = {
@@ -674,15 +726,17 @@ 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
       },
+      ...accumulated.featureFlags && Object.keys(accumulated.featureFlags).length > 0 ? { feature_flags: accumulated.featureFlags } : {},
       attachments: accumulated.attachments,
       is_pending: isPending
     };
@@ -836,6 +890,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 {
@@ -960,6 +1021,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);
@@ -1015,7 +1077,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({
@@ -1238,7 +1301,7 @@ function resolveLocalWorkshopUrl(fileValue) {
 // package.json
 var package_default = {
   name: "@raindrop-ai/pi-agent",
-  version: "0.0.9",
+  version: "0.1.0",
   description: "Raindrop observability for Pi Agent \u2014 automatic tracing via subscriber or pi-coding-agent extension",
   type: "module",
   license: "MIT",
@@ -1563,7 +1626,9 @@ function getAssistantError(message) {
   var _a;
   if (message.role !== "assistant") return void 0;
   if (message.stopReason !== "error" && message.stopReason !== "aborted") return void 0;
-  return (_a = message.errorMessage) != null ? _a : `Assistant ${message.stopReason}`;
+  const error = new Error((_a = message.errorMessage) != null ? _a : `Assistant ${message.stopReason}`);
+  error.name = message.stopReason === "aborted" ? "AbortError" : "PiAgentError";
+  return error;
 }
 function getState(stateRef, ctx) {
   const sessionId = ctx.sessionManager.getSessionId();
@@ -1756,13 +1821,17 @@ function registerTracing(pi, config, eventShipper, traceShipper) {
       state.currentRootSpan = void 0;
       await eventShipper.finish((_h = state.currentEventRequestId) != null ? _h : state.currentEventId, {
         userId: getUserId(state, config.eventMetadata),
-        model: modelName,
-        ...outputText.trim() ? { output: outputText } : {},
+        ...modelId ? { model: modelId } : {},
+        ...!errorForSpan && outputText.trim() ? { output: outputText } : {},
+        usage: {
+          promptTokens: state.totalInputTokens > 0 ? state.totalInputTokens : void 0,
+          completionTokens: state.totalOutputTokens > 0 ? state.totalOutputTokens : void 0
+        },
+        error: errorForSpan,
         properties: {
           sdk_version: libraryVersion,
           stop_reason: message.stopReason,
-          ...state.totalInputTokens > 0 ? { "ai.usage.prompt_tokens": state.totalInputTokens } : {},
-          ...state.totalOutputTokens > 0 ? { "ai.usage.completion_tokens": state.totalOutputTokens } : {},
+          ...provider ? { "ai.provider": provider } : {},
           ...state.totalCacheReadTokens > 0 ? { "ai.usage.cache_read_tokens": state.totalCacheReadTokens } : {}
         }
       });

package/dist/extension.d.cts

@@ -1,5 +1,5 @@
 import { ExtensionAPI } from '@earendil-works/pi-coding-agent';
-import { E as EventShipper$1, T as TraceShipper$1, O as OtlpSpan } from './index.d-CSO1bDLs.cjs';
+import { E as EventShipper$1, T as TraceShipper$1, O as OtlpSpan } from './index.d-DPYV95P7.cjs';
 
 interface EventMetadata {
     userId?: string;

package/dist/extension.d.ts

@@ -1,5 +1,5 @@
 import { ExtensionAPI } from '@earendil-works/pi-coding-agent';
-import { E as EventShipper$1, T as TraceShipper$1, O as OtlpSpan } from './index.d-CSO1bDLs.js';
+import { E as EventShipper$1, T as TraceShipper$1, O as OtlpSpan } from './index.d-DPYV95P7.js';
 
 interface EventMetadata {
     userId?: string;

package/dist/extension.js

@@ -14,7 +14,7 @@ import {
   resolveLocalDebuggerBaseUrl,
   safeStringify,
   truncate
-} from "./chunk-TEXLELWC.js";
+} from "./chunk-XQJ6G4YA.js";
 
 // src/internal/config.ts
 import { existsSync, readFileSync } from "fs";
@@ -141,7 +141,9 @@ function getAssistantError(message) {
   var _a;
   if (message.role !== "assistant") return void 0;
   if (message.stopReason !== "error" && message.stopReason !== "aborted") return void 0;
-  return (_a = message.errorMessage) != null ? _a : `Assistant ${message.stopReason}`;
+  const error = new Error((_a = message.errorMessage) != null ? _a : `Assistant ${message.stopReason}`);
+  error.name = message.stopReason === "aborted" ? "AbortError" : "PiAgentError";
+  return error;
 }
 function getState(stateRef, ctx) {
   const sessionId = ctx.sessionManager.getSessionId();
@@ -334,13 +336,17 @@ function registerTracing(pi, config, eventShipper, traceShipper) {
       state.currentRootSpan = void 0;
       await eventShipper.finish((_h = state.currentEventRequestId) != null ? _h : state.currentEventId, {
         userId: getUserId(state, config.eventMetadata),
-        model: modelName,
-        ...outputText.trim() ? { output: outputText } : {},
+        ...modelId ? { model: modelId } : {},
+        ...!errorForSpan && outputText.trim() ? { output: outputText } : {},
+        usage: {
+          promptTokens: state.totalInputTokens > 0 ? state.totalInputTokens : void 0,
+          completionTokens: state.totalOutputTokens > 0 ? state.totalOutputTokens : void 0
+        },
+        error: errorForSpan,
         properties: {
           sdk_version: libraryVersion,
           stop_reason: message.stopReason,
-          ...state.totalInputTokens > 0 ? { "ai.usage.prompt_tokens": state.totalInputTokens } : {},
-          ...state.totalOutputTokens > 0 ? { "ai.usage.completion_tokens": state.totalOutputTokens } : {},
+          ...provider ? { "ai.provider": provider } : {},
           ...state.totalCacheReadTokens > 0 ? { "ai.usage.cache_read_tokens": state.totalCacheReadTokens } : {}
         }
       });

package/dist/index.cjs

@@ -24,7 +24,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// ../core/dist/chunk-WKRW55KX.js
+// ../core/dist/chunk-QTUH3BHZ.js
 function getCrypto() {
   const c = globalThis.crypto;
   return c;
@@ -414,16 +414,52 @@ function projectIdHeaders(projectId) {
 var SHUTDOWN_DEADLINE_MS = 1e4;
 var POST_SHUTDOWN_TIMEOUT_MS = 5e3;
 function mergePatches(target, source) {
-  var _a, _b, _c, _d;
+  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 = { ...(_f = target.featureFlags) != null ? _f : {}, ...(_g = source.featureFlags) != null ? _g : {} };
+  }
   if (target.attachments || source.attachments) {
-    out.attachments = [...(_c = target.attachments) != null ? _c : [], ...(_d = source.attachments) != null ? _d : []];
+    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();
@@ -672,6 +708,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 = {
@@ -681,15 +722,17 @@ 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
       },
+      ...accumulated.featureFlags && Object.keys(accumulated.featureFlags).length > 0 ? { feature_flags: accumulated.featureFlags } : {},
       attachments: accumulated.attachments,
       is_pending: isPending
     };
@@ -843,6 +886,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 {
@@ -967,6 +1017,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);
@@ -1022,7 +1073,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({
@@ -1190,7 +1242,7 @@ installTracingSuppressionHook();
 // package.json
 var package_default = {
   name: "@raindrop-ai/pi-agent",
-  version: "0.0.9",
+  version: "0.1.0",
   description: "Raindrop observability for Pi Agent \u2014 automatic tracing via subscriber or pi-coding-agent extension",
   type: "module",
   license: "MIT",
@@ -1489,14 +1541,24 @@ function getUsername() {
 }
 
 // src/internal/subscriber.ts
+function resolveEventId(source) {
+  if (typeof source !== "function") return randomUUID();
+  try {
+    const id = source();
+    return typeof id === "string" && id.trim() !== "" ? id : randomUUID();
+  } catch (e) {
+    return randomUUID();
+  }
+}
 function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, options, debug) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const userId = (_a = options.userId) != null ? _a : defaultOptions.userId;
   const convoId = (_b = options.convoId) != null ? _b : defaultOptions.convoId;
   const eventName = (_c = options.eventName) != null ? _c : defaultOptions.eventName;
+  const eventIdSource = (_d = options.eventId) != null ? _d : defaultOptions.eventId;
   const properties = {
-    ...(_d = defaultOptions.properties) != null ? _d : {},
-    ...(_e = options.properties) != null ? _e : {}
+    ...(_e = defaultOptions.properties) != null ? _e : {},
+    ...(_f = options.properties) != null ? _f : {}
   };
   let currentRun;
   function log(msg) {
@@ -1527,7 +1589,7 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
         }
         currentRun = void 0;
       }
-      const eventId = randomUUID();
+      const eventId = resolveEventId(eventIdSource);
       const rootSpan = traceShipper ? traceShipper.startSpan({
         name: "ai.event",
         eventId,
@@ -1585,17 +1647,22 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
       }
       if (!("role" in message) || message.role !== "assistant") return;
       const model = extractModelName(message);
+      const provider = "provider" in message && typeof message.provider === "string" ? message.provider : void 0;
+      const bareModel = typeof message.model === "string" ? message.model : void 0;
       const usage = extractTokenUsage(message);
       const assistantText = extractAssistantText(message);
-      if (model) currentRun.lastModel = model;
+      if (bareModel) {
+        currentRun.lastModel = bareModel;
+        currentRun.lastProvider = provider;
+      }
       if (usage) {
         currentRun.totalInputTokens += usage.input;
         currentRun.totalOutputTokens += usage.output;
         if (usage.cacheRead) currentRun.totalCacheReadTokens += usage.cacheRead;
       }
       if (!traceShipper || !currentRun.currentTurnSpan) return;
-      const rawProvider = "provider" in message && typeof message.provider === "string" ? message.provider : void 0;
-      const rawModelId = typeof message.model === "string" ? message.model : void 0;
+      const rawProvider = provider;
+      const rawModelId = bareModel;
       const stopReason = "stopReason" in message && typeof message.stopReason === "string" ? message.stopReason : void 0;
       const llmAttrs = [
         attrString("ai.operationId", "generateText")
@@ -1634,6 +1701,13 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
         attributes: llmAttrs
       });
       const errorForSpan = stopReason === "error" || stopReason === "aborted" ? "errorMessage" in message && typeof message.errorMessage === "string" ? message.errorMessage : `Assistant ${stopReason}` : void 0;
+      if (errorForSpan) {
+        const assistantError = new Error(errorForSpan);
+        assistantError.name = stopReason === "aborted" ? "AbortError" : "PiAgentError";
+        currentRun.error = assistantError;
+      } else {
+        currentRun.error = void 0;
+      }
       traceShipper.endSpan(llmSpan, errorForSpan ? { error: errorForSpan } : void 0);
       const toolCallIds = extractToolCallIds(message);
       for (const tcId of toolCallIds) {
@@ -1753,7 +1827,7 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
           attrString("ai.operationId", "generateText")
         ];
         if (run.lastModel) {
-          run.rootSpan.name = run.lastModel;
+          run.rootSpan.name = run.lastProvider ? `${run.lastProvider}/${run.lastModel}` : run.lastModel;
           rootAttrs.push(attrString("gen_ai.response.model", run.lastModel));
         }
         if (run.currentInput) {
@@ -1778,12 +1852,16 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
         eventShipper.finish(run.eventId, {
           userId: userId != null ? userId : "anonymous",
           model: run.lastModel || void 0,
-          output: outputText || void 0,
+          output: run.error ? void 0 : outputText || void 0,
+          usage: {
+            promptTokens: run.totalInputTokens > 0 ? run.totalInputTokens : void 0,
+            completionTokens: run.totalOutputTokens > 0 ? run.totalOutputTokens : void 0
+          },
+          error: run.error,
           properties: {
             ...properties,
             sdk_version: libraryVersion,
-            ...run.totalInputTokens > 0 ? { "ai.usage.prompt_tokens": run.totalInputTokens } : {},
-            ...run.totalOutputTokens > 0 ? { "ai.usage.completion_tokens": run.totalOutputTokens } : {},
+            ...run.lastProvider ? { "ai.provider": run.lastProvider } : {},
             ...run.totalCacheReadTokens > 0 ? { "ai.usage.cache_read_tokens": run.totalCacheReadTokens } : {}
           }
         }).catch(() => {
@@ -1884,6 +1962,7 @@ function createRaindropPiAgent(opts) {
     userId: opts.userId,
     convoId: opts.convoId,
     eventName: opts.eventName,
+    eventId: opts.eventId,
     properties: opts.properties
   };
   return {

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

@@ -45,6 +45,10 @@ type IdentifyInput = {
     userId: string;
     traits?: Record<string, unknown>;
 };
+type EventUsage = {
+    promptTokens?: number;
+    completionTokens?: number;
+};
 type Patch = {
     eventName?: string;
     userId?: string;
@@ -52,7 +56,10 @@ type Patch = {
     input?: string;
     output?: string;
     model?: string;
+    usage?: EventUsage;
+    error?: unknown;
     properties?: Record<string, unknown>;
+    featureFlags?: Record<string, string>;
     attachments?: Attachment[];
     isPending?: boolean;
     timestamp?: string;
@@ -149,12 +156,7 @@ declare class EventShipper {
      */
     private requestOpts;
     patch(eventId: string, patch: Patch): Promise<void>;
-    finish(eventId: string, patch: {
-        output?: string;
-        model?: string;
-        properties?: Record<string, unknown>;
-        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>;
@@ -327,6 +329,9 @@ declare class TraceShipper {
             spanIdB64: string;
         };
         eventId: string;
+        userId?: string;
+        convoId?: string;
+        eventName?: string;
         operationId?: string;
         attributes?: Array<OtlpKeyValue | undefined>;
         startTimeUnixNano?: string;
@@ -345,6 +350,9 @@ declare class TraceShipper {
             spanIdB64: string;
         };
         eventId: string;
+        userId?: string;
+        convoId?: string;
+        eventName?: string;
         startTimeUnixNano: string;
         endTimeUnixNano: string;
         attributes?: Array<OtlpKeyValue | undefined>;

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

@@ -45,6 +45,10 @@ type IdentifyInput = {
     userId: string;
     traits?: Record<string, unknown>;
 };
+type EventUsage = {
+    promptTokens?: number;
+    completionTokens?: number;
+};
 type Patch = {
     eventName?: string;
     userId?: string;
@@ -52,7 +56,10 @@ type Patch = {
     input?: string;
     output?: string;
     model?: string;
+    usage?: EventUsage;
+    error?: unknown;
     properties?: Record<string, unknown>;
+    featureFlags?: Record<string, string>;
     attachments?: Attachment[];
     isPending?: boolean;
     timestamp?: string;
@@ -149,12 +156,7 @@ declare class EventShipper {
      */
     private requestOpts;
     patch(eventId: string, patch: Patch): Promise<void>;
-    finish(eventId: string, patch: {
-        output?: string;
-        model?: string;
-        properties?: Record<string, unknown>;
-        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>;
@@ -327,6 +329,9 @@ declare class TraceShipper {
             spanIdB64: string;
         };
         eventId: string;
+        userId?: string;
+        convoId?: string;
+        eventName?: string;
         operationId?: string;
         attributes?: Array<OtlpKeyValue | undefined>;
         startTimeUnixNano?: string;
@@ -345,6 +350,9 @@ declare class TraceShipper {
             spanIdB64: string;
         };
         eventId: string;
+        userId?: string;
+        convoId?: string;
+        eventName?: string;
         startTimeUnixNano: string;
         endTimeUnixNano: string;
         attributes?: Array<OtlpKeyValue | undefined>;

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { Agent } from '@earendil-works/pi-agent-core';
-import { A as Attachment } from './index.d-CSO1bDLs.cjs';
+import { A as Attachment } from './index.d-DPYV95P7.cjs';
 
 /**
  * Options for the Raindrop Pi Agent client.
@@ -24,6 +24,15 @@ interface RaindropPiAgentOptions {
     convoId?: string;
     /** Default event name (default: "pi_agent_prompt") */
     eventName?: string;
+    /**
+     * Per-run event id source. Invoked once per agent run to mint that run's
+     * event id (reused for the run's Raindrop event and every linked span). A
+     * static string is intentionally not accepted: a long-lived client runs many
+     * agent runs, and a fixed id would collide across them. Absent / throwing /
+     * non-string / empty results fall back to a random UUID, so a caller's id
+     * source never crashes telemetry.
+     */
+    eventId?: () => string;
     /** Default properties attached to every event */
     properties?: Record<string, unknown>;
     /**
@@ -69,6 +78,8 @@ interface PiAgentSubscribeOptions {
     convoId?: string;
     /** Event name override */
     eventName?: string;
+    /** Per-run event id source override (see RaindropPiAgentOptions.eventId) */
+    eventId?: () => string;
     /** Additional properties */
     properties?: Record<string, unknown>;
 }

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Agent } from '@earendil-works/pi-agent-core';
-import { A as Attachment } from './index.d-CSO1bDLs.js';
+import { A as Attachment } from './index.d-DPYV95P7.js';
 
 /**
  * Options for the Raindrop Pi Agent client.
@@ -24,6 +24,15 @@ interface RaindropPiAgentOptions {
     convoId?: string;
     /** Default event name (default: "pi_agent_prompt") */
     eventName?: string;
+    /**
+     * Per-run event id source. Invoked once per agent run to mint that run's
+     * event id (reused for the run's Raindrop event and every linked span). A
+     * static string is intentionally not accepted: a long-lived client runs many
+     * agent runs, and a fixed id would collide across them. Absent / throwing /
+     * non-string / empty results fall back to a random UUID, so a caller's id
+     * source never crashes telemetry.
+     */
+    eventId?: () => string;
     /** Default properties attached to every event */
     properties?: Record<string, unknown>;
     /**
@@ -69,6 +78,8 @@ interface PiAgentSubscribeOptions {
     convoId?: string;
     /** Event name override */
     eventName?: string;
+    /** Per-run event id source override (see RaindropPiAgentOptions.eventId) */
+    eventId?: () => string;
     /** Additional properties */
     properties?: Record<string, unknown>;
 }

package/dist/index.js

@@ -17,17 +17,27 @@ import {
   resolveLocalDebuggerBaseUrl,
   safeStringify,
   truncate
-} from "./chunk-TEXLELWC.js";
+} from "./chunk-XQJ6G4YA.js";
 
 // src/internal/subscriber.ts
+function resolveEventId(source) {
+  if (typeof source !== "function") return randomUUID();
+  try {
+    const id = source();
+    return typeof id === "string" && id.trim() !== "" ? id : randomUUID();
+  } catch (e) {
+    return randomUUID();
+  }
+}
 function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, options, debug) {
-  var _a, _b, _c, _d, _e;
+  var _a, _b, _c, _d, _e, _f;
   const userId = (_a = options.userId) != null ? _a : defaultOptions.userId;
   const convoId = (_b = options.convoId) != null ? _b : defaultOptions.convoId;
   const eventName = (_c = options.eventName) != null ? _c : defaultOptions.eventName;
+  const eventIdSource = (_d = options.eventId) != null ? _d : defaultOptions.eventId;
   const properties = {
-    ...(_d = defaultOptions.properties) != null ? _d : {},
-    ...(_e = options.properties) != null ? _e : {}
+    ...(_e = defaultOptions.properties) != null ? _e : {},
+    ...(_f = options.properties) != null ? _f : {}
   };
   let currentRun;
   function log(msg) {
@@ -58,7 +68,7 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
         }
         currentRun = void 0;
       }
-      const eventId = randomUUID();
+      const eventId = resolveEventId(eventIdSource);
       const rootSpan = traceShipper ? traceShipper.startSpan({
         name: "ai.event",
         eventId,
@@ -116,17 +126,22 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
       }
       if (!("role" in message) || message.role !== "assistant") return;
       const model = extractModelName(message);
+      const provider = "provider" in message && typeof message.provider === "string" ? message.provider : void 0;
+      const bareModel = typeof message.model === "string" ? message.model : void 0;
       const usage = extractTokenUsage(message);
       const assistantText = extractAssistantText(message);
-      if (model) currentRun.lastModel = model;
+      if (bareModel) {
+        currentRun.lastModel = bareModel;
+        currentRun.lastProvider = provider;
+      }
       if (usage) {
         currentRun.totalInputTokens += usage.input;
         currentRun.totalOutputTokens += usage.output;
         if (usage.cacheRead) currentRun.totalCacheReadTokens += usage.cacheRead;
       }
       if (!traceShipper || !currentRun.currentTurnSpan) return;
-      const rawProvider = "provider" in message && typeof message.provider === "string" ? message.provider : void 0;
-      const rawModelId = typeof message.model === "string" ? message.model : void 0;
+      const rawProvider = provider;
+      const rawModelId = bareModel;
       const stopReason = "stopReason" in message && typeof message.stopReason === "string" ? message.stopReason : void 0;
       const llmAttrs = [
         attrString("ai.operationId", "generateText")
@@ -165,6 +180,13 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
         attributes: llmAttrs
       });
       const errorForSpan = stopReason === "error" || stopReason === "aborted" ? "errorMessage" in message && typeof message.errorMessage === "string" ? message.errorMessage : `Assistant ${stopReason}` : void 0;
+      if (errorForSpan) {
+        const assistantError = new Error(errorForSpan);
+        assistantError.name = stopReason === "aborted" ? "AbortError" : "PiAgentError";
+        currentRun.error = assistantError;
+      } else {
+        currentRun.error = void 0;
+      }
       traceShipper.endSpan(llmSpan, errorForSpan ? { error: errorForSpan } : void 0);
       const toolCallIds = extractToolCallIds(message);
       for (const tcId of toolCallIds) {
@@ -284,7 +306,7 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
           attrString("ai.operationId", "generateText")
         ];
         if (run.lastModel) {
-          run.rootSpan.name = run.lastModel;
+          run.rootSpan.name = run.lastProvider ? `${run.lastProvider}/${run.lastModel}` : run.lastModel;
           rootAttrs.push(attrString("gen_ai.response.model", run.lastModel));
         }
         if (run.currentInput) {
@@ -309,12 +331,16 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
         eventShipper.finish(run.eventId, {
           userId: userId != null ? userId : "anonymous",
           model: run.lastModel || void 0,
-          output: outputText || void 0,
+          output: run.error ? void 0 : outputText || void 0,
+          usage: {
+            promptTokens: run.totalInputTokens > 0 ? run.totalInputTokens : void 0,
+            completionTokens: run.totalOutputTokens > 0 ? run.totalOutputTokens : void 0
+          },
+          error: run.error,
           properties: {
             ...properties,
             sdk_version: libraryVersion,
-            ...run.totalInputTokens > 0 ? { "ai.usage.prompt_tokens": run.totalInputTokens } : {},
-            ...run.totalOutputTokens > 0 ? { "ai.usage.completion_tokens": run.totalOutputTokens } : {},
+            ...run.lastProvider ? { "ai.provider": run.lastProvider } : {},
             ...run.totalCacheReadTokens > 0 ? { "ai.usage.cache_read_tokens": run.totalCacheReadTokens } : {}
           }
         }).catch(() => {
@@ -415,6 +441,7 @@ function createRaindropPiAgent(opts) {
     userId: opts.userId,
     convoId: opts.convoId,
     eventName: opts.eventName,
+    eventId: opts.eventId,
     properties: opts.properties
   };
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raindrop-ai/pi-agent",
-  "version": "0.0.9",
+  "version": "0.1.0",
   "description": "Raindrop observability for Pi Agent — automatic tracing via subscriber or pi-coding-agent extension",
   "type": "module",
   "license": "MIT",
@@ -54,7 +54,7 @@
     "tsup": "^8.5.1",
     "typescript": "^5.7.3",
     "vitest": "^2.1.9",
-    "@raindrop-ai/core": "0.0.5"
+    "@raindrop-ai/core": "0.1.3"
   },
   "tsup": {
     "entry": [