@raindrop-ai/pi-agent 0.1.0 → 0.1.1

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

@@ -1,4 +1,4 @@
-// ../core/dist/chunk-QTUH3BHZ.js
+// ../core/dist/chunk-YUIXRQWN.js
 function getCrypto() {
   const c = globalThis.crypto;
   return c;
@@ -56,6 +56,20 @@ function base64Encode(bytes) {
 function generateId() {
   return randomUUID();
 }
+var HANDOFF_ATTRIBUTE_SUFFIXES = {
+  mode: "raindrop.handoff.mode",
+  childEventId: "raindrop.handoff.childEventId",
+  parentEventId: "raindrop.handoff.parentEventId",
+  parentSpanId: "raindrop.handoff.parentSpanId",
+  name: "raindrop.handoff.name",
+  terminal: "raindrop.handoff.terminal",
+  agentRole: "raindrop.agent.role"
+};
+var HANDOFF_TERMINAL_PROPERTY_KEY = HANDOFF_ATTRIBUTE_SUFFIXES.terminal;
+var TRACEPARENT_HEADER = "traceparent";
+var BAGGAGE_HEADER = "baggage";
+var HANDOFF_HEADER = "x-raindrop-handoff";
+var UNRESOLVED_CARRIER_WARNING = `[raindrop] resume: headers were supplied but no hand-off carrier was found on them (searched ${HANDOFF_HEADER}, ${TRACEPARENT_HEADER}, ${BAGGAGE_HEADER}). This run reports as an UNLINKED event, and the launcher that dispatched it will stay on "queued" forever because nothing ever references its child. Passing headers means a parent handed off, so no carrier on them is almost certainly a defect: a gateway or proxy stripping ${HANDOFF_HEADER}, a middleware overwriting ${BAGGAGE_HEADER}, a request forwarded without its headers, or a hand-built carrier whose field names do not match. Send every header the launcher's dispatch returned. Logged once per process; pass no headers for a directly-invoked sub-agent to silence it.`;
 function runWithTracingSuppressed(fn) {
   const hook = globalThis.RAINDROP_SUPPRESS_TRACING;
   if (typeof hook !== "function") return fn();
@@ -774,6 +788,194 @@ var EventShipper = class {
     }
   }
 };
+var MODEL_USAGE_ATTRIBUTES = {
+  providerName: "gen_ai.provider.name",
+  requestModel: "gen_ai.request.model",
+  responseModel: "gen_ai.response.model",
+  inputTokens: "gen_ai.usage.input_tokens",
+  outputTokens: "gen_ai.usage.output_tokens",
+  reasoningTokens: "gen_ai.usage.reasoning_tokens",
+  cacheReadInputTokens: "gen_ai.usage.cache_read_input_tokens",
+  cacheWriteInputTokens: "gen_ai.usage.cache_write_input_tokens",
+  nonCachedInputTokens: "raindrop.usage.input_tokens.non_cached",
+  nonReasoningOutputTokens: "raindrop.usage.output_tokens.non_reasoning",
+  totalOutputTokens: "raindrop.usage.output_tokens.total",
+  reasoningOutputTokens: "raindrop.usage.output_tokens.reasoning",
+  cacheReadTokens: "raindrop.usage.input_tokens.cache_read",
+  cacheWriteTokens: "raindrop.usage.input_tokens.cache_write"
+};
+var MODEL_PROVIDER_NAMES = [
+  ["google.vertex", "google-vertex"],
+  ["vertex.anthropic", "google-vertex"],
+  ["amazon-bedrock", "amazon-bedrock"],
+  ["bedrock", "amazon-bedrock"],
+  ["anthropic", "anthropic"],
+  ["openai", "openai"],
+  ["google", "google"],
+  ["azure", "azure"],
+  ["openrouter", "openrouter"]
+];
+function canonicalModelProvider(provider) {
+  var _a;
+  const normalizedProvider = provider.trim().toLowerCase();
+  if (normalizedProvider === "gateway") return "vercel";
+  const match = MODEL_PROVIDER_NAMES.find(
+    ([family]) => normalizedProvider === family || normalizedProvider.startsWith(`${family}.`)
+  );
+  return (_a = match == null ? void 0 : match[1]) != null ? _a : provider;
+}
+function tokenCount(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+}
+function exclusiveTokens({
+  explicit,
+  total,
+  parts,
+  semantics
+}) {
+  if (explicit !== void 0) return explicit;
+  if (total === void 0) return void 0;
+  if (semantics === "exclusive") return total;
+  const observedParts = parts.filter((part) => part !== void 0 && part > 0);
+  if (semantics === void 0 && observedParts.length > 0) return void 0;
+  const exclusive = total - observedParts.reduce((sum, part) => sum + part, 0);
+  return exclusive >= 0 ? exclusive : void 0;
+}
+function buildModelUsageAttributes(usage) {
+  const inputTokens = tokenCount(usage.inputTokens);
+  const outputTokens = tokenCount(usage.outputTokens);
+  const explicitNonCachedInputTokens = tokenCount(usage.nonCachedInputTokens);
+  const explicitNonReasoningOutputTokens = tokenCount(usage.nonReasoningOutputTokens);
+  const reasoningTokens = tokenCount(usage.reasoningTokens);
+  const cacheReadInputTokens = tokenCount(usage.cacheReadInputTokens);
+  const cacheWriteInputTokens = tokenCount(usage.cacheWriteInputTokens);
+  const nonCachedInputTokens = exclusiveTokens({
+    explicit: explicitNonCachedInputTokens,
+    total: inputTokens,
+    parts: [cacheReadInputTokens, cacheWriteInputTokens],
+    semantics: usage.inputTokenSemantics
+  });
+  const nonReasoningOutputTokens = exclusiveTokens({
+    explicit: explicitNonReasoningOutputTokens,
+    total: outputTokens,
+    parts: [reasoningTokens],
+    semantics: usage.outputTokenSemantics
+  });
+  const exclusivePoolAttributes = nonCachedInputTokens !== void 0 && nonReasoningOutputTokens !== void 0 ? [
+    // backend consumes this complete raindrop.* set as one atomic billing-pool contract.
+    attrInt(MODEL_USAGE_ATTRIBUTES.nonCachedInputTokens, nonCachedInputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.nonReasoningOutputTokens, nonReasoningOutputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.reasoningOutputTokens, reasoningTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheReadTokens, cacheReadInputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheWriteTokens, cacheWriteInputTokens)
+  ] : [];
+  return [
+    attrInt(MODEL_USAGE_ATTRIBUTES.inputTokens, inputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.outputTokens, outputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.reasoningTokens, reasoningTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheReadInputTokens, cacheReadInputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheWriteInputTokens, cacheWriteInputTokens),
+    ...exclusivePoolAttributes
+  ].filter((attribute) => attribute !== void 0);
+}
+var STRING_ALIASES = {
+  [MODEL_USAGE_ATTRIBUTES.requestModel]: ["ai.model.id", "ai.model"]
+};
+var NUMBER_ALIASES = {
+  [MODEL_USAGE_ATTRIBUTES.inputTokens]: [
+    "gen_ai.usage.prompt_tokens",
+    "ai.usage.prompt_tokens",
+    "ai.usage.promptTokens",
+    "ai.usage.input_tokens",
+    "ai.usage.inputTokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.outputTokens]: [
+    "gen_ai.usage.completion_tokens",
+    "ai.usage.completion_tokens",
+    "ai.usage.completionTokens",
+    "ai.usage.output_tokens",
+    "ai.usage.outputTokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.reasoningTokens]: [
+    "gen_ai.usage.reasoning.output_tokens",
+    "ai.usage.reasoningTokens",
+    "ai.usage.thoughts_tokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.cacheReadInputTokens]: [
+    "gen_ai.usage.cache_read_tokens",
+    "gen_ai.usage.cache_read.input_tokens",
+    "ai.usage.cachedInputTokens",
+    "ai.usage.cached_tokens",
+    "ai.usage.cache_read_tokens",
+    "ai.usage.cache_read_input_tokens",
+    "ai.usage.cacheReadInputTokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.cacheWriteInputTokens]: [
+    "gen_ai.usage.cache_creation_input_tokens",
+    "gen_ai.usage.cache_creation.input_tokens",
+    "ai.usage.cacheWriteInputTokens",
+    "ai.usage.cache_creation_input_tokens",
+    "ai.usage.cacheCreationInputTokens"
+  ]
+};
+function hasAttribute(attributes, key) {
+  return attributes.some((attribute) => attribute.key === key);
+}
+function findStringAttribute(attributes, keys) {
+  return attributes.find(
+    (attribute) => keys.includes(attribute.key) && typeof attribute.value.stringValue === "string" && attribute.value.stringValue.length > 0
+  );
+}
+function findNumberAttribute(attributes, keys) {
+  return attributes.find((attribute) => {
+    if (!keys.includes(attribute.key)) return false;
+    if (typeof attribute.value.doubleValue === "number" && Number.isSafeInteger(attribute.value.doubleValue) && attribute.value.doubleValue >= 0) {
+      return true;
+    }
+    const intValue = attribute.value.intValue;
+    return integerValue(intValue) !== void 0;
+  });
+}
+function integerValue(value) {
+  if (typeof value === "number") {
+    return Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+  }
+  if (typeof value !== "string") return void 0;
+  const parsed = Number(value);
+  return Number.isSafeInteger(parsed) && parsed >= 0 ? parsed : void 0;
+}
+function appendAlias(attributes, target, source) {
+  if (!source || hasAttribute(attributes, target)) return attributes;
+  return [...attributes, { key: target, value: { ...source.value } }];
+}
+function appendProviderAlias(attributes) {
+  if (hasAttribute(attributes, MODEL_USAGE_ATTRIBUTES.providerName)) return attributes;
+  const source = findStringAttribute(attributes, ["gen_ai.system", "ai.model.provider"]);
+  if (!(source == null ? void 0 : source.value.stringValue)) return attributes;
+  const attribute = attrString(
+    MODEL_USAGE_ATTRIBUTES.providerName,
+    canonicalModelProvider(source.value.stringValue)
+  );
+  return attribute ? [...attributes, attribute] : attributes;
+}
+function normalizeModelUsageSpan(span) {
+  const original = span.attributes;
+  if (!original || original.length === 0) return span;
+  const responseModel = findStringAttribute(original, [
+    MODEL_USAGE_ATTRIBUTES.responseModel,
+    "ai.response.model"
+  ]);
+  if (!responseModel) return span;
+  let attributes = appendAlias(original, MODEL_USAGE_ATTRIBUTES.responseModel, responseModel);
+  attributes = appendProviderAlias(attributes);
+  for (const [target, aliases] of Object.entries(STRING_ALIASES)) {
+    attributes = appendAlias(attributes, target, findStringAttribute(attributes, aliases));
+  }
+  for (const [target, aliases] of Object.entries(NUMBER_ALIASES)) {
+    attributes = appendAlias(attributes, target, findNumberAttribute(attributes, aliases));
+  }
+  return attributes === original ? span : { ...span, attributes };
+}
 var DEFAULT_SECRET_KEY_NAMES = [
   "apikey",
   "apisecret",
@@ -974,6 +1176,10 @@ var TraceShipper = class {
         return null;
       }
     }
+    try {
+      current = normalizeModelUsageSpan(current);
+    } catch (e) {
+    }
     if (!this.disableDefaultRedaction) {
       current = defaultTransformSpan(current);
     }
@@ -1219,7 +1425,7 @@ installTracingSuppressionHook();
 // package.json
 var package_default = {
   name: "@raindrop-ai/pi-agent",
-  version: "0.1.0",
+  version: "0.1.1",
   description: "Raindrop observability for Pi Agent \u2014 automatic tracing via subscriber or pi-coding-agent extension",
   type: "module",
   license: "MIT",
@@ -1374,9 +1580,22 @@ function extractTokenUsage(message) {
   return {
     input: usage.input,
     output: usage.output,
-    ...typeof usage.cacheRead === "number" && usage.cacheRead > 0 ? { cacheRead: usage.cacheRead } : {}
+    cacheRead: typeof usage.cacheRead === "number" ? usage.cacheRead : 0,
+    cacheWrite: typeof usage.cacheWrite === "number" ? usage.cacheWrite : 0
   };
 }
+function modelSpendSpanAttributes(input) {
+  const providerAttr = input.provider ? attrString("gen_ai.provider.name", canonicalModelProvider(input.provider)) : void 0;
+  const usageAttrs = input.usage ? buildModelUsageAttributes({
+    inputTokens: input.usage.input,
+    outputTokens: input.usage.output,
+    cacheReadInputTokens: input.usage.cacheRead,
+    cacheWriteInputTokens: input.usage.cacheWrite,
+    reasoningTokens: 0,
+    inputTokenSemantics: "exclusive"
+  }) : [];
+  return providerAttr ? [providerAttr, ...usageAttrs] : usageAttrs;
+}
 function extractAssistantText(message) {
   if (!("role" in message) || message.role !== "assistant") return void 0;
   if (!Array.isArray(message.content)) return void 0;
@@ -1530,6 +1749,7 @@ export {
   extractUserText,
   extractModelName,
   extractTokenUsage,
+  modelSpendSpanAttributes,
   extractAssistantText,
   extractToolCallIds,
   formatToolSpanName,

package/dist/extension.cjs

@@ -25,7 +25,7 @@ __export(extension_exports, {
 });
 module.exports = __toCommonJS(extension_exports);
 
-// ../core/dist/chunk-QTUH3BHZ.js
+// ../core/dist/chunk-YUIXRQWN.js
 function getCrypto() {
   const c = globalThis.crypto;
   return c;
@@ -83,6 +83,20 @@ function base64Encode(bytes) {
 function generateId() {
   return randomUUID();
 }
+var HANDOFF_ATTRIBUTE_SUFFIXES = {
+  mode: "raindrop.handoff.mode",
+  childEventId: "raindrop.handoff.childEventId",
+  parentEventId: "raindrop.handoff.parentEventId",
+  parentSpanId: "raindrop.handoff.parentSpanId",
+  name: "raindrop.handoff.name",
+  terminal: "raindrop.handoff.terminal",
+  agentRole: "raindrop.agent.role"
+};
+var HANDOFF_TERMINAL_PROPERTY_KEY = HANDOFF_ATTRIBUTE_SUFFIXES.terminal;
+var TRACEPARENT_HEADER = "traceparent";
+var BAGGAGE_HEADER = "baggage";
+var HANDOFF_HEADER = "x-raindrop-handoff";
+var UNRESOLVED_CARRIER_WARNING = `[raindrop] resume: headers were supplied but no hand-off carrier was found on them (searched ${HANDOFF_HEADER}, ${TRACEPARENT_HEADER}, ${BAGGAGE_HEADER}). This run reports as an UNLINKED event, and the launcher that dispatched it will stay on "queued" forever because nothing ever references its child. Passing headers means a parent handed off, so no carrier on them is almost certainly a defect: a gateway or proxy stripping ${HANDOFF_HEADER}, a middleware overwriting ${BAGGAGE_HEADER}, a request forwarded without its headers, or a hand-built carrier whose field names do not match. Send every header the launcher's dispatch returned. Logged once per process; pass no headers for a directly-invoked sub-agent to silence it.`;
 function runWithTracingSuppressed(fn) {
   const hook = globalThis.RAINDROP_SUPPRESS_TRACING;
   if (typeof hook !== "function") return fn();
@@ -801,6 +815,194 @@ var EventShipper = class {
     }
   }
 };
+var MODEL_USAGE_ATTRIBUTES = {
+  providerName: "gen_ai.provider.name",
+  requestModel: "gen_ai.request.model",
+  responseModel: "gen_ai.response.model",
+  inputTokens: "gen_ai.usage.input_tokens",
+  outputTokens: "gen_ai.usage.output_tokens",
+  reasoningTokens: "gen_ai.usage.reasoning_tokens",
+  cacheReadInputTokens: "gen_ai.usage.cache_read_input_tokens",
+  cacheWriteInputTokens: "gen_ai.usage.cache_write_input_tokens",
+  nonCachedInputTokens: "raindrop.usage.input_tokens.non_cached",
+  nonReasoningOutputTokens: "raindrop.usage.output_tokens.non_reasoning",
+  totalOutputTokens: "raindrop.usage.output_tokens.total",
+  reasoningOutputTokens: "raindrop.usage.output_tokens.reasoning",
+  cacheReadTokens: "raindrop.usage.input_tokens.cache_read",
+  cacheWriteTokens: "raindrop.usage.input_tokens.cache_write"
+};
+var MODEL_PROVIDER_NAMES = [
+  ["google.vertex", "google-vertex"],
+  ["vertex.anthropic", "google-vertex"],
+  ["amazon-bedrock", "amazon-bedrock"],
+  ["bedrock", "amazon-bedrock"],
+  ["anthropic", "anthropic"],
+  ["openai", "openai"],
+  ["google", "google"],
+  ["azure", "azure"],
+  ["openrouter", "openrouter"]
+];
+function canonicalModelProvider(provider) {
+  var _a;
+  const normalizedProvider = provider.trim().toLowerCase();
+  if (normalizedProvider === "gateway") return "vercel";
+  const match = MODEL_PROVIDER_NAMES.find(
+    ([family]) => normalizedProvider === family || normalizedProvider.startsWith(`${family}.`)
+  );
+  return (_a = match == null ? void 0 : match[1]) != null ? _a : provider;
+}
+function tokenCount(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+}
+function exclusiveTokens({
+  explicit,
+  total,
+  parts,
+  semantics
+}) {
+  if (explicit !== void 0) return explicit;
+  if (total === void 0) return void 0;
+  if (semantics === "exclusive") return total;
+  const observedParts = parts.filter((part) => part !== void 0 && part > 0);
+  if (semantics === void 0 && observedParts.length > 0) return void 0;
+  const exclusive = total - observedParts.reduce((sum, part) => sum + part, 0);
+  return exclusive >= 0 ? exclusive : void 0;
+}
+function buildModelUsageAttributes(usage) {
+  const inputTokens = tokenCount(usage.inputTokens);
+  const outputTokens = tokenCount(usage.outputTokens);
+  const explicitNonCachedInputTokens = tokenCount(usage.nonCachedInputTokens);
+  const explicitNonReasoningOutputTokens = tokenCount(usage.nonReasoningOutputTokens);
+  const reasoningTokens = tokenCount(usage.reasoningTokens);
+  const cacheReadInputTokens = tokenCount(usage.cacheReadInputTokens);
+  const cacheWriteInputTokens = tokenCount(usage.cacheWriteInputTokens);
+  const nonCachedInputTokens = exclusiveTokens({
+    explicit: explicitNonCachedInputTokens,
+    total: inputTokens,
+    parts: [cacheReadInputTokens, cacheWriteInputTokens],
+    semantics: usage.inputTokenSemantics
+  });
+  const nonReasoningOutputTokens = exclusiveTokens({
+    explicit: explicitNonReasoningOutputTokens,
+    total: outputTokens,
+    parts: [reasoningTokens],
+    semantics: usage.outputTokenSemantics
+  });
+  const exclusivePoolAttributes = nonCachedInputTokens !== void 0 && nonReasoningOutputTokens !== void 0 ? [
+    // backend consumes this complete raindrop.* set as one atomic billing-pool contract.
+    attrInt(MODEL_USAGE_ATTRIBUTES.nonCachedInputTokens, nonCachedInputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.nonReasoningOutputTokens, nonReasoningOutputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.reasoningOutputTokens, reasoningTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheReadTokens, cacheReadInputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheWriteTokens, cacheWriteInputTokens)
+  ] : [];
+  return [
+    attrInt(MODEL_USAGE_ATTRIBUTES.inputTokens, inputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.outputTokens, outputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.reasoningTokens, reasoningTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheReadInputTokens, cacheReadInputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheWriteInputTokens, cacheWriteInputTokens),
+    ...exclusivePoolAttributes
+  ].filter((attribute) => attribute !== void 0);
+}
+var STRING_ALIASES = {
+  [MODEL_USAGE_ATTRIBUTES.requestModel]: ["ai.model.id", "ai.model"]
+};
+var NUMBER_ALIASES = {
+  [MODEL_USAGE_ATTRIBUTES.inputTokens]: [
+    "gen_ai.usage.prompt_tokens",
+    "ai.usage.prompt_tokens",
+    "ai.usage.promptTokens",
+    "ai.usage.input_tokens",
+    "ai.usage.inputTokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.outputTokens]: [
+    "gen_ai.usage.completion_tokens",
+    "ai.usage.completion_tokens",
+    "ai.usage.completionTokens",
+    "ai.usage.output_tokens",
+    "ai.usage.outputTokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.reasoningTokens]: [
+    "gen_ai.usage.reasoning.output_tokens",
+    "ai.usage.reasoningTokens",
+    "ai.usage.thoughts_tokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.cacheReadInputTokens]: [
+    "gen_ai.usage.cache_read_tokens",
+    "gen_ai.usage.cache_read.input_tokens",
+    "ai.usage.cachedInputTokens",
+    "ai.usage.cached_tokens",
+    "ai.usage.cache_read_tokens",
+    "ai.usage.cache_read_input_tokens",
+    "ai.usage.cacheReadInputTokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.cacheWriteInputTokens]: [
+    "gen_ai.usage.cache_creation_input_tokens",
+    "gen_ai.usage.cache_creation.input_tokens",
+    "ai.usage.cacheWriteInputTokens",
+    "ai.usage.cache_creation_input_tokens",
+    "ai.usage.cacheCreationInputTokens"
+  ]
+};
+function hasAttribute(attributes, key) {
+  return attributes.some((attribute) => attribute.key === key);
+}
+function findStringAttribute(attributes, keys) {
+  return attributes.find(
+    (attribute) => keys.includes(attribute.key) && typeof attribute.value.stringValue === "string" && attribute.value.stringValue.length > 0
+  );
+}
+function findNumberAttribute(attributes, keys) {
+  return attributes.find((attribute) => {
+    if (!keys.includes(attribute.key)) return false;
+    if (typeof attribute.value.doubleValue === "number" && Number.isSafeInteger(attribute.value.doubleValue) && attribute.value.doubleValue >= 0) {
+      return true;
+    }
+    const intValue = attribute.value.intValue;
+    return integerValue(intValue) !== void 0;
+  });
+}
+function integerValue(value) {
+  if (typeof value === "number") {
+    return Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+  }
+  if (typeof value !== "string") return void 0;
+  const parsed = Number(value);
+  return Number.isSafeInteger(parsed) && parsed >= 0 ? parsed : void 0;
+}
+function appendAlias(attributes, target, source) {
+  if (!source || hasAttribute(attributes, target)) return attributes;
+  return [...attributes, { key: target, value: { ...source.value } }];
+}
+function appendProviderAlias(attributes) {
+  if (hasAttribute(attributes, MODEL_USAGE_ATTRIBUTES.providerName)) return attributes;
+  const source = findStringAttribute(attributes, ["gen_ai.system", "ai.model.provider"]);
+  if (!(source == null ? void 0 : source.value.stringValue)) return attributes;
+  const attribute = attrString(
+    MODEL_USAGE_ATTRIBUTES.providerName,
+    canonicalModelProvider(source.value.stringValue)
+  );
+  return attribute ? [...attributes, attribute] : attributes;
+}
+function normalizeModelUsageSpan(span) {
+  const original = span.attributes;
+  if (!original || original.length === 0) return span;
+  const responseModel = findStringAttribute(original, [
+    MODEL_USAGE_ATTRIBUTES.responseModel,
+    "ai.response.model"
+  ]);
+  if (!responseModel) return span;
+  let attributes = appendAlias(original, MODEL_USAGE_ATTRIBUTES.responseModel, responseModel);
+  attributes = appendProviderAlias(attributes);
+  for (const [target, aliases] of Object.entries(STRING_ALIASES)) {
+    attributes = appendAlias(attributes, target, findStringAttribute(attributes, aliases));
+  }
+  for (const [target, aliases] of Object.entries(NUMBER_ALIASES)) {
+    attributes = appendAlias(attributes, target, findNumberAttribute(attributes, aliases));
+  }
+  return attributes === original ? span : { ...span, attributes };
+}
 var DEFAULT_SECRET_KEY_NAMES = [
   "apikey",
   "apisecret",
@@ -1001,6 +1203,10 @@ var TraceShipper = class {
         return null;
       }
     }
+    try {
+      current = normalizeModelUsageSpan(current);
+    } catch (e) {
+    }
     if (!this.disableDefaultRedaction) {
       current = defaultTransformSpan(current);
     }
@@ -1301,7 +1507,7 @@ function resolveLocalWorkshopUrl(fileValue) {
 // package.json
 var package_default = {
   name: "@raindrop-ai/pi-agent",
-  version: "0.1.0",
+  version: "0.1.1",
   description: "Raindrop observability for Pi Agent \u2014 automatic tracing via subscriber or pi-coding-agent extension",
   type: "module",
   license: "MIT",
@@ -1427,6 +1633,18 @@ var TraceShipper2 = class extends TraceShipper {
 
 // src/internal/helpers.ts
 var import_node_os2 = require("os");
+function modelSpendSpanAttributes(input) {
+  const providerAttr = input.provider ? attrString("gen_ai.provider.name", canonicalModelProvider(input.provider)) : void 0;
+  const usageAttrs = input.usage ? buildModelUsageAttributes({
+    inputTokens: input.usage.input,
+    outputTokens: input.usage.output,
+    cacheReadInputTokens: input.usage.cacheRead,
+    cacheWriteInputTokens: input.usage.cacheWrite,
+    reasoningTokens: 0,
+    inputTokenSemantics: "exclusive"
+  }) : [];
+  return providerAttr ? [providerAttr, ...usageAttrs] : usageAttrs;
+}
 function extractAssistantText(message) {
   if (!("role" in message) || message.role !== "assistant") return void 0;
   if (!Array.isArray(message.content)) return void 0;
@@ -1755,7 +1973,7 @@ function registerTracing(pi, config, eventShipper, traceShipper) {
     }
   });
   pi.on("message_end", async (event, ctx) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     try {
       if (((_a = event.message) == null ? void 0 : _a.role) !== "assistant") return;
       const state = getState(stateRef, ctx);
@@ -1769,19 +1987,26 @@ function registerTracing(pi, config, eventShipper, traceShipper) {
       const outputText = capText2(getAssistantText(message));
       const inputTokens = (_d = message.usage) == null ? void 0 : _d.input;
       const outputTokens = (_e = message.usage) == null ? void 0 : _e.output;
-      const cacheReadTokens = (_f = message.usage) == null ? void 0 : _f.cacheRead;
+      const cacheReadTokens = typeof ((_f = message.usage) == null ? void 0 : _f.cacheRead) === "number" ? message.usage.cacheRead : 0;
+      const cacheWriteTokens = typeof ((_g = message.usage) == null ? void 0 : _g.cacheWrite) === "number" ? message.usage.cacheWrite : 0;
       if (typeof inputTokens === "number") state.totalInputTokens += inputTokens;
       if (typeof outputTokens === "number") state.totalOutputTokens += outputTokens;
-      if (typeof cacheReadTokens === "number" && cacheReadTokens > 0) state.totalCacheReadTokens += cacheReadTokens;
-      const turnParent = (_g = state.currentTurnSpan) != null ? _g : state.currentRootSpan;
+      if (cacheReadTokens > 0) state.totalCacheReadTokens += cacheReadTokens;
+      const turnParent = (_h = state.currentTurnSpan) != null ? _h : state.currentRootSpan;
       const llmAttrs = [
         attrString("ai.operationId", "generateText"),
         provider ? attrString("gen_ai.system", provider) : void 0,
         modelId ? attrString("gen_ai.request.model", modelId) : void 0,
         modelId ? attrString("gen_ai.response.model", modelId) : void 0,
-        typeof inputTokens === "number" ? attrInt("gen_ai.usage.input_tokens", inputTokens) : void 0,
-        typeof outputTokens === "number" ? attrInt("gen_ai.usage.output_tokens", outputTokens) : void 0,
-        typeof cacheReadTokens === "number" && cacheReadTokens > 0 ? attrInt("gen_ai.usage.cache_read_tokens", cacheReadTokens) : void 0,
+        ...modelSpendSpanAttributes({
+          provider: provider || void 0,
+          usage: typeof inputTokens === "number" && typeof outputTokens === "number" ? {
+            input: inputTokens,
+            output: outputTokens,
+            cacheRead: cacheReadTokens,
+            cacheWrite: cacheWriteTokens
+          } : void 0
+        }),
         outputText ? attrString("ai.response.text", truncate(outputText)) : void 0,
         state.currentInput ? attrString("ai.prompt", truncate(state.currentInput)) : void 0,
         message.stopReason ? attrString("ai.stop_reason", message.stopReason) : void 0,
@@ -1819,7 +2044,7 @@ function registerTracing(pi, config, eventShipper, traceShipper) {
         ...errorForSpan ? { error: errorForSpan } : {}
       });
       state.currentRootSpan = void 0;
-      await eventShipper.finish((_h = state.currentEventRequestId) != null ? _h : state.currentEventId, {
+      await eventShipper.finish((_i = state.currentEventRequestId) != null ? _i : state.currentEventId, {
         userId: getUserId(state, config.eventMetadata),
         ...modelId ? { model: modelId } : {},
         ...!errorForSpan && outputText.trim() ? { output: outputText } : {},

package/dist/extension.js

@@ -10,11 +10,12 @@ import {
   getHostname,
   getUsername,
   libraryVersion,
+  modelSpendSpanAttributes,
   nowUnixNanoString,
   resolveLocalDebuggerBaseUrl,
   safeStringify,
   truncate
-} from "./chunk-XQJ6G4YA.js";
+} from "./chunk-GTKXT2J5.js";
 
 // src/internal/config.ts
 import { existsSync, readFileSync } from "fs";
@@ -270,7 +271,7 @@ function registerTracing(pi, config, eventShipper, traceShipper) {
     }
   });
   pi.on("message_end", async (event, ctx) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     try {
       if (((_a = event.message) == null ? void 0 : _a.role) !== "assistant") return;
       const state = getState(stateRef, ctx);
@@ -284,19 +285,26 @@ function registerTracing(pi, config, eventShipper, traceShipper) {
       const outputText = capText(getAssistantText(message));
       const inputTokens = (_d = message.usage) == null ? void 0 : _d.input;
       const outputTokens = (_e = message.usage) == null ? void 0 : _e.output;
-      const cacheReadTokens = (_f = message.usage) == null ? void 0 : _f.cacheRead;
+      const cacheReadTokens = typeof ((_f = message.usage) == null ? void 0 : _f.cacheRead) === "number" ? message.usage.cacheRead : 0;
+      const cacheWriteTokens = typeof ((_g = message.usage) == null ? void 0 : _g.cacheWrite) === "number" ? message.usage.cacheWrite : 0;
       if (typeof inputTokens === "number") state.totalInputTokens += inputTokens;
       if (typeof outputTokens === "number") state.totalOutputTokens += outputTokens;
-      if (typeof cacheReadTokens === "number" && cacheReadTokens > 0) state.totalCacheReadTokens += cacheReadTokens;
-      const turnParent = (_g = state.currentTurnSpan) != null ? _g : state.currentRootSpan;
+      if (cacheReadTokens > 0) state.totalCacheReadTokens += cacheReadTokens;
+      const turnParent = (_h = state.currentTurnSpan) != null ? _h : state.currentRootSpan;
       const llmAttrs = [
         attrString("ai.operationId", "generateText"),
         provider ? attrString("gen_ai.system", provider) : void 0,
         modelId ? attrString("gen_ai.request.model", modelId) : void 0,
         modelId ? attrString("gen_ai.response.model", modelId) : void 0,
-        typeof inputTokens === "number" ? attrInt("gen_ai.usage.input_tokens", inputTokens) : void 0,
-        typeof outputTokens === "number" ? attrInt("gen_ai.usage.output_tokens", outputTokens) : void 0,
-        typeof cacheReadTokens === "number" && cacheReadTokens > 0 ? attrInt("gen_ai.usage.cache_read_tokens", cacheReadTokens) : void 0,
+        ...modelSpendSpanAttributes({
+          provider: provider || void 0,
+          usage: typeof inputTokens === "number" && typeof outputTokens === "number" ? {
+            input: inputTokens,
+            output: outputTokens,
+            cacheRead: cacheReadTokens,
+            cacheWrite: cacheWriteTokens
+          } : void 0
+        }),
         outputText ? attrString("ai.response.text", truncate(outputText)) : void 0,
         state.currentInput ? attrString("ai.prompt", truncate(state.currentInput)) : void 0,
         message.stopReason ? attrString("ai.stop_reason", message.stopReason) : void 0,
@@ -334,7 +342,7 @@ function registerTracing(pi, config, eventShipper, traceShipper) {
         ...errorForSpan ? { error: errorForSpan } : {}
       });
       state.currentRootSpan = void 0;
-      await eventShipper.finish((_h = state.currentEventRequestId) != null ? _h : state.currentEventId, {
+      await eventShipper.finish((_i = state.currentEventRequestId) != null ? _i : state.currentEventId, {
         userId: getUserId(state, config.eventMetadata),
         ...modelId ? { model: modelId } : {},
         ...!errorForSpan && outputText.trim() ? { output: outputText } : {},

package/dist/index.cjs

@@ -24,7 +24,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// ../core/dist/chunk-QTUH3BHZ.js
+// ../core/dist/chunk-YUIXRQWN.js
 function getCrypto() {
   const c = globalThis.crypto;
   return c;
@@ -79,6 +79,20 @@ function base64Encode(bytes) {
   }
   return out;
 }
+var HANDOFF_ATTRIBUTE_SUFFIXES = {
+  mode: "raindrop.handoff.mode",
+  childEventId: "raindrop.handoff.childEventId",
+  parentEventId: "raindrop.handoff.parentEventId",
+  parentSpanId: "raindrop.handoff.parentSpanId",
+  name: "raindrop.handoff.name",
+  terminal: "raindrop.handoff.terminal",
+  agentRole: "raindrop.agent.role"
+};
+var HANDOFF_TERMINAL_PROPERTY_KEY = HANDOFF_ATTRIBUTE_SUFFIXES.terminal;
+var TRACEPARENT_HEADER = "traceparent";
+var BAGGAGE_HEADER = "baggage";
+var HANDOFF_HEADER = "x-raindrop-handoff";
+var UNRESOLVED_CARRIER_WARNING = `[raindrop] resume: headers were supplied but no hand-off carrier was found on them (searched ${HANDOFF_HEADER}, ${TRACEPARENT_HEADER}, ${BAGGAGE_HEADER}). This run reports as an UNLINKED event, and the launcher that dispatched it will stay on "queued" forever because nothing ever references its child. Passing headers means a parent handed off, so no carrier on them is almost certainly a defect: a gateway or proxy stripping ${HANDOFF_HEADER}, a middleware overwriting ${BAGGAGE_HEADER}, a request forwarded without its headers, or a hand-built carrier whose field names do not match. Send every header the launcher's dispatch returned. Logged once per process; pass no headers for a directly-invoked sub-agent to silence it.`;
 function runWithTracingSuppressed(fn) {
   const hook = globalThis.RAINDROP_SUPPRESS_TRACING;
   if (typeof hook !== "function") return fn();
@@ -797,6 +811,194 @@ var EventShipper = class {
     }
   }
 };
+var MODEL_USAGE_ATTRIBUTES = {
+  providerName: "gen_ai.provider.name",
+  requestModel: "gen_ai.request.model",
+  responseModel: "gen_ai.response.model",
+  inputTokens: "gen_ai.usage.input_tokens",
+  outputTokens: "gen_ai.usage.output_tokens",
+  reasoningTokens: "gen_ai.usage.reasoning_tokens",
+  cacheReadInputTokens: "gen_ai.usage.cache_read_input_tokens",
+  cacheWriteInputTokens: "gen_ai.usage.cache_write_input_tokens",
+  nonCachedInputTokens: "raindrop.usage.input_tokens.non_cached",
+  nonReasoningOutputTokens: "raindrop.usage.output_tokens.non_reasoning",
+  totalOutputTokens: "raindrop.usage.output_tokens.total",
+  reasoningOutputTokens: "raindrop.usage.output_tokens.reasoning",
+  cacheReadTokens: "raindrop.usage.input_tokens.cache_read",
+  cacheWriteTokens: "raindrop.usage.input_tokens.cache_write"
+};
+var MODEL_PROVIDER_NAMES = [
+  ["google.vertex", "google-vertex"],
+  ["vertex.anthropic", "google-vertex"],
+  ["amazon-bedrock", "amazon-bedrock"],
+  ["bedrock", "amazon-bedrock"],
+  ["anthropic", "anthropic"],
+  ["openai", "openai"],
+  ["google", "google"],
+  ["azure", "azure"],
+  ["openrouter", "openrouter"]
+];
+function canonicalModelProvider(provider) {
+  var _a;
+  const normalizedProvider = provider.trim().toLowerCase();
+  if (normalizedProvider === "gateway") return "vercel";
+  const match = MODEL_PROVIDER_NAMES.find(
+    ([family]) => normalizedProvider === family || normalizedProvider.startsWith(`${family}.`)
+  );
+  return (_a = match == null ? void 0 : match[1]) != null ? _a : provider;
+}
+function tokenCount(value) {
+  return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+}
+function exclusiveTokens({
+  explicit,
+  total,
+  parts,
+  semantics
+}) {
+  if (explicit !== void 0) return explicit;
+  if (total === void 0) return void 0;
+  if (semantics === "exclusive") return total;
+  const observedParts = parts.filter((part) => part !== void 0 && part > 0);
+  if (semantics === void 0 && observedParts.length > 0) return void 0;
+  const exclusive = total - observedParts.reduce((sum, part) => sum + part, 0);
+  return exclusive >= 0 ? exclusive : void 0;
+}
+function buildModelUsageAttributes(usage) {
+  const inputTokens = tokenCount(usage.inputTokens);
+  const outputTokens = tokenCount(usage.outputTokens);
+  const explicitNonCachedInputTokens = tokenCount(usage.nonCachedInputTokens);
+  const explicitNonReasoningOutputTokens = tokenCount(usage.nonReasoningOutputTokens);
+  const reasoningTokens = tokenCount(usage.reasoningTokens);
+  const cacheReadInputTokens = tokenCount(usage.cacheReadInputTokens);
+  const cacheWriteInputTokens = tokenCount(usage.cacheWriteInputTokens);
+  const nonCachedInputTokens = exclusiveTokens({
+    explicit: explicitNonCachedInputTokens,
+    total: inputTokens,
+    parts: [cacheReadInputTokens, cacheWriteInputTokens],
+    semantics: usage.inputTokenSemantics
+  });
+  const nonReasoningOutputTokens = exclusiveTokens({
+    explicit: explicitNonReasoningOutputTokens,
+    total: outputTokens,
+    parts: [reasoningTokens],
+    semantics: usage.outputTokenSemantics
+  });
+  const exclusivePoolAttributes = nonCachedInputTokens !== void 0 && nonReasoningOutputTokens !== void 0 ? [
+    // backend consumes this complete raindrop.* set as one atomic billing-pool contract.
+    attrInt(MODEL_USAGE_ATTRIBUTES.nonCachedInputTokens, nonCachedInputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.nonReasoningOutputTokens, nonReasoningOutputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.reasoningOutputTokens, reasoningTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheReadTokens, cacheReadInputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheWriteTokens, cacheWriteInputTokens)
+  ] : [];
+  return [
+    attrInt(MODEL_USAGE_ATTRIBUTES.inputTokens, inputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.outputTokens, outputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.reasoningTokens, reasoningTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheReadInputTokens, cacheReadInputTokens),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheWriteInputTokens, cacheWriteInputTokens),
+    ...exclusivePoolAttributes
+  ].filter((attribute) => attribute !== void 0);
+}
+var STRING_ALIASES = {
+  [MODEL_USAGE_ATTRIBUTES.requestModel]: ["ai.model.id", "ai.model"]
+};
+var NUMBER_ALIASES = {
+  [MODEL_USAGE_ATTRIBUTES.inputTokens]: [
+    "gen_ai.usage.prompt_tokens",
+    "ai.usage.prompt_tokens",
+    "ai.usage.promptTokens",
+    "ai.usage.input_tokens",
+    "ai.usage.inputTokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.outputTokens]: [
+    "gen_ai.usage.completion_tokens",
+    "ai.usage.completion_tokens",
+    "ai.usage.completionTokens",
+    "ai.usage.output_tokens",
+    "ai.usage.outputTokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.reasoningTokens]: [
+    "gen_ai.usage.reasoning.output_tokens",
+    "ai.usage.reasoningTokens",
+    "ai.usage.thoughts_tokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.cacheReadInputTokens]: [
+    "gen_ai.usage.cache_read_tokens",
+    "gen_ai.usage.cache_read.input_tokens",
+    "ai.usage.cachedInputTokens",
+    "ai.usage.cached_tokens",
+    "ai.usage.cache_read_tokens",
+    "ai.usage.cache_read_input_tokens",
+    "ai.usage.cacheReadInputTokens"
+  ],
+  [MODEL_USAGE_ATTRIBUTES.cacheWriteInputTokens]: [
+    "gen_ai.usage.cache_creation_input_tokens",
+    "gen_ai.usage.cache_creation.input_tokens",
+    "ai.usage.cacheWriteInputTokens",
+    "ai.usage.cache_creation_input_tokens",
+    "ai.usage.cacheCreationInputTokens"
+  ]
+};
+function hasAttribute(attributes, key) {
+  return attributes.some((attribute) => attribute.key === key);
+}
+function findStringAttribute(attributes, keys) {
+  return attributes.find(
+    (attribute) => keys.includes(attribute.key) && typeof attribute.value.stringValue === "string" && attribute.value.stringValue.length > 0
+  );
+}
+function findNumberAttribute(attributes, keys) {
+  return attributes.find((attribute) => {
+    if (!keys.includes(attribute.key)) return false;
+    if (typeof attribute.value.doubleValue === "number" && Number.isSafeInteger(attribute.value.doubleValue) && attribute.value.doubleValue >= 0) {
+      return true;
+    }
+    const intValue = attribute.value.intValue;
+    return integerValue(intValue) !== void 0;
+  });
+}
+function integerValue(value) {
+  if (typeof value === "number") {
+    return Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+  }
+  if (typeof value !== "string") return void 0;
+  const parsed = Number(value);
+  return Number.isSafeInteger(parsed) && parsed >= 0 ? parsed : void 0;
+}
+function appendAlias(attributes, target, source) {
+  if (!source || hasAttribute(attributes, target)) return attributes;
+  return [...attributes, { key: target, value: { ...source.value } }];
+}
+function appendProviderAlias(attributes) {
+  if (hasAttribute(attributes, MODEL_USAGE_ATTRIBUTES.providerName)) return attributes;
+  const source = findStringAttribute(attributes, ["gen_ai.system", "ai.model.provider"]);
+  if (!(source == null ? void 0 : source.value.stringValue)) return attributes;
+  const attribute = attrString(
+    MODEL_USAGE_ATTRIBUTES.providerName,
+    canonicalModelProvider(source.value.stringValue)
+  );
+  return attribute ? [...attributes, attribute] : attributes;
+}
+function normalizeModelUsageSpan(span) {
+  const original = span.attributes;
+  if (!original || original.length === 0) return span;
+  const responseModel = findStringAttribute(original, [
+    MODEL_USAGE_ATTRIBUTES.responseModel,
+    "ai.response.model"
+  ]);
+  if (!responseModel) return span;
+  let attributes = appendAlias(original, MODEL_USAGE_ATTRIBUTES.responseModel, responseModel);
+  attributes = appendProviderAlias(attributes);
+  for (const [target, aliases] of Object.entries(STRING_ALIASES)) {
+    attributes = appendAlias(attributes, target, findStringAttribute(attributes, aliases));
+  }
+  for (const [target, aliases] of Object.entries(NUMBER_ALIASES)) {
+    attributes = appendAlias(attributes, target, findNumberAttribute(attributes, aliases));
+  }
+  return attributes === original ? span : { ...span, attributes };
+}
 var DEFAULT_SECRET_KEY_NAMES = [
   "apikey",
   "apisecret",
@@ -997,6 +1199,10 @@ var TraceShipper = class {
         return null;
       }
     }
+    try {
+      current = normalizeModelUsageSpan(current);
+    } catch (e) {
+    }
     if (!this.disableDefaultRedaction) {
       current = defaultTransformSpan(current);
     }
@@ -1242,7 +1448,7 @@ installTracingSuppressionHook();
 // package.json
 var package_default = {
   name: "@raindrop-ai/pi-agent",
-  version: "0.1.0",
+  version: "0.1.1",
   description: "Raindrop observability for Pi Agent \u2014 automatic tracing via subscriber or pi-coding-agent extension",
   type: "module",
   license: "MIT",
@@ -1397,9 +1603,22 @@ function extractTokenUsage(message) {
   return {
     input: usage.input,
     output: usage.output,
-    ...typeof usage.cacheRead === "number" && usage.cacheRead > 0 ? { cacheRead: usage.cacheRead } : {}
+    cacheRead: typeof usage.cacheRead === "number" ? usage.cacheRead : 0,
+    cacheWrite: typeof usage.cacheWrite === "number" ? usage.cacheWrite : 0
   };
 }
+function modelSpendSpanAttributes(input) {
+  const providerAttr = input.provider ? attrString("gen_ai.provider.name", canonicalModelProvider(input.provider)) : void 0;
+  const usageAttrs = input.usage ? buildModelUsageAttributes({
+    inputTokens: input.usage.input,
+    outputTokens: input.usage.output,
+    cacheReadInputTokens: input.usage.cacheRead,
+    cacheWriteInputTokens: input.usage.cacheWrite,
+    reasoningTokens: 0,
+    inputTokenSemantics: "exclusive"
+  }) : [];
+  return providerAttr ? [providerAttr, ...usageAttrs] : usageAttrs;
+}
 function extractAssistantText(message) {
   if (!("role" in message) || message.role !== "assistant") return void 0;
   if (!Array.isArray(message.content)) return void 0;
@@ -1541,6 +1760,9 @@ function getUsername() {
 }
 
 // src/internal/subscriber.ts
+function pushAttr(attrs, attr) {
+  if (attr) attrs.push(attr);
+}
 function resolveEventId(source) {
   if (typeof source !== "function") return randomUUID();
   try {
@@ -1658,41 +1880,30 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
       if (usage) {
         currentRun.totalInputTokens += usage.input;
         currentRun.totalOutputTokens += usage.output;
-        if (usage.cacheRead) currentRun.totalCacheReadTokens += usage.cacheRead;
+        if (usage.cacheRead > 0) currentRun.totalCacheReadTokens += usage.cacheRead;
       }
       if (!traceShipper || !currentRun.currentTurnSpan) return;
       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")
-      ];
+      const llmAttrs = [];
+      pushAttr(llmAttrs, attrString("ai.operationId", "generateText"));
       if (rawProvider) {
-        llmAttrs.push(attrString("gen_ai.system", rawProvider));
+        pushAttr(llmAttrs, attrString("gen_ai.system", rawProvider));
       }
       if (rawModelId) {
-        llmAttrs.push(
-          attrString("gen_ai.response.model", rawModelId),
-          attrString("gen_ai.request.model", rawModelId)
-        );
-      }
-      if (usage) {
-        llmAttrs.push(
-          attrInt("gen_ai.usage.input_tokens", usage.input),
-          attrInt("gen_ai.usage.output_tokens", usage.output)
-        );
-        if (usage.cacheRead) {
-          llmAttrs.push(attrInt("gen_ai.usage.cache_read_tokens", usage.cacheRead));
-        }
+        pushAttr(llmAttrs, attrString("gen_ai.response.model", rawModelId));
+        pushAttr(llmAttrs, attrString("gen_ai.request.model", rawModelId));
       }
+      llmAttrs.push(...modelSpendSpanAttributes({ provider: rawProvider, usage }));
       if (assistantText) {
-        llmAttrs.push(attrString("ai.response.text", truncate(assistantText)));
+        pushAttr(llmAttrs, attrString("ai.response.text", truncate(assistantText)));
       }
       if (currentRun.currentInput) {
-        llmAttrs.push(attrString("ai.prompt", truncate(currentRun.currentInput)));
+        pushAttr(llmAttrs, attrString("ai.prompt", truncate(currentRun.currentInput)));
       }
       if (stopReason) {
-        llmAttrs.push(attrString("ai.stop_reason", stopReason));
+        pushAttr(llmAttrs, attrString("ai.stop_reason", stopReason));
       }
       const llmSpan = traceShipper.startSpan({
         name: model != null ? model : "llm",
@@ -1794,9 +2005,9 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
       if (!traceShipper || !toolSpan) return;
       const endAttrs = [];
       const argsStr = truncate(safeStringify(args));
-      if (argsStr) endAttrs.push(attrString("ai.toolCall.args", argsStr));
+      if (argsStr) pushAttr(endAttrs, attrString("ai.toolCall.args", argsStr));
       const resultStr = truncate(safeStringify(result));
-      if (resultStr) endAttrs.push(attrString("ai.toolCall.result", resultStr));
+      if (resultStr) pushAttr(endAttrs, attrString("ai.toolCall.result", resultStr));
       traceShipper.endSpan(toolSpan, {
         attributes: endAttrs,
         ...isError ? { error: `Tool "${toolName}" failed` } : {}
@@ -1823,29 +2034,28 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
       }
       const outputText = capText2(run.outputParts.join(""));
       if (traceShipper && run.rootSpan) {
-        const rootAttrs = [
-          attrString("ai.operationId", "generateText")
-        ];
+        const rootAttrs = [];
+        pushAttr(rootAttrs, attrString("ai.operationId", "generateText"));
         if (run.lastModel) {
           run.rootSpan.name = run.lastProvider ? `${run.lastProvider}/${run.lastModel}` : run.lastModel;
-          rootAttrs.push(attrString("gen_ai.response.model", run.lastModel));
+          pushAttr(rootAttrs, attrString("gen_ai.response.model", run.lastModel));
         }
         if (run.currentInput) {
-          rootAttrs.push(attrString("ai.prompt", truncate(run.currentInput)));
+          pushAttr(rootAttrs, attrString("ai.prompt", truncate(run.currentInput)));
         }
         if (outputText) {
-          rootAttrs.push(attrString("ai.response.text", truncate(outputText)));
+          pushAttr(rootAttrs, attrString("ai.response.text", truncate(outputText)));
         }
         if (run.totalInputTokens > 0) {
-          rootAttrs.push(attrInt("gen_ai.usage.input_tokens", run.totalInputTokens));
+          pushAttr(rootAttrs, attrInt("gen_ai.usage.input_tokens", run.totalInputTokens));
         }
         if (run.totalOutputTokens > 0) {
-          rootAttrs.push(attrInt("gen_ai.usage.output_tokens", run.totalOutputTokens));
+          pushAttr(rootAttrs, attrInt("gen_ai.usage.output_tokens", run.totalOutputTokens));
         }
         if (run.totalCacheReadTokens > 0) {
-          rootAttrs.push(attrInt("gen_ai.usage.cache_read_tokens", run.totalCacheReadTokens));
+          pushAttr(rootAttrs, attrInt("gen_ai.usage.cache_read_tokens", run.totalCacheReadTokens));
         }
-        rootAttrs.push(attrInt("ai.total_turns", run.turnNumber));
+        pushAttr(rootAttrs, attrInt("ai.total_turns", run.turnNumber));
         traceShipper.endSpan(run.rootSpan, { attributes: rootAttrs });
       }
       if (eventShipper) {

package/dist/index.js

@@ -13,13 +13,17 @@ import {
   getHostname,
   getUsername,
   libraryVersion,
+  modelSpendSpanAttributes,
   randomUUID,
   resolveLocalDebuggerBaseUrl,
   safeStringify,
   truncate
-} from "./chunk-XQJ6G4YA.js";
+} from "./chunk-GTKXT2J5.js";
 
 // src/internal/subscriber.ts
+function pushAttr(attrs, attr) {
+  if (attr) attrs.push(attr);
+}
 function resolveEventId(source) {
   if (typeof source !== "function") return randomUUID();
   try {
@@ -137,41 +141,30 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
       if (usage) {
         currentRun.totalInputTokens += usage.input;
         currentRun.totalOutputTokens += usage.output;
-        if (usage.cacheRead) currentRun.totalCacheReadTokens += usage.cacheRead;
+        if (usage.cacheRead > 0) currentRun.totalCacheReadTokens += usage.cacheRead;
       }
       if (!traceShipper || !currentRun.currentTurnSpan) return;
       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")
-      ];
+      const llmAttrs = [];
+      pushAttr(llmAttrs, attrString("ai.operationId", "generateText"));
       if (rawProvider) {
-        llmAttrs.push(attrString("gen_ai.system", rawProvider));
+        pushAttr(llmAttrs, attrString("gen_ai.system", rawProvider));
       }
       if (rawModelId) {
-        llmAttrs.push(
-          attrString("gen_ai.response.model", rawModelId),
-          attrString("gen_ai.request.model", rawModelId)
-        );
-      }
-      if (usage) {
-        llmAttrs.push(
-          attrInt("gen_ai.usage.input_tokens", usage.input),
-          attrInt("gen_ai.usage.output_tokens", usage.output)
-        );
-        if (usage.cacheRead) {
-          llmAttrs.push(attrInt("gen_ai.usage.cache_read_tokens", usage.cacheRead));
-        }
+        pushAttr(llmAttrs, attrString("gen_ai.response.model", rawModelId));
+        pushAttr(llmAttrs, attrString("gen_ai.request.model", rawModelId));
       }
+      llmAttrs.push(...modelSpendSpanAttributes({ provider: rawProvider, usage }));
       if (assistantText) {
-        llmAttrs.push(attrString("ai.response.text", truncate(assistantText)));
+        pushAttr(llmAttrs, attrString("ai.response.text", truncate(assistantText)));
       }
       if (currentRun.currentInput) {
-        llmAttrs.push(attrString("ai.prompt", truncate(currentRun.currentInput)));
+        pushAttr(llmAttrs, attrString("ai.prompt", truncate(currentRun.currentInput)));
       }
       if (stopReason) {
-        llmAttrs.push(attrString("ai.stop_reason", stopReason));
+        pushAttr(llmAttrs, attrString("ai.stop_reason", stopReason));
       }
       const llmSpan = traceShipper.startSpan({
         name: model != null ? model : "llm",
@@ -273,9 +266,9 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
       if (!traceShipper || !toolSpan) return;
       const endAttrs = [];
       const argsStr = truncate(safeStringify(args));
-      if (argsStr) endAttrs.push(attrString("ai.toolCall.args", argsStr));
+      if (argsStr) pushAttr(endAttrs, attrString("ai.toolCall.args", argsStr));
       const resultStr = truncate(safeStringify(result));
-      if (resultStr) endAttrs.push(attrString("ai.toolCall.result", resultStr));
+      if (resultStr) pushAttr(endAttrs, attrString("ai.toolCall.result", resultStr));
       traceShipper.endSpan(toolSpan, {
         attributes: endAttrs,
         ...isError ? { error: `Tool "${toolName}" failed` } : {}
@@ -302,29 +295,28 @@ function createSubscriber(agent, eventShipper, traceShipper, defaultOptions, opt
       }
       const outputText = capText(run.outputParts.join(""));
       if (traceShipper && run.rootSpan) {
-        const rootAttrs = [
-          attrString("ai.operationId", "generateText")
-        ];
+        const rootAttrs = [];
+        pushAttr(rootAttrs, attrString("ai.operationId", "generateText"));
         if (run.lastModel) {
           run.rootSpan.name = run.lastProvider ? `${run.lastProvider}/${run.lastModel}` : run.lastModel;
-          rootAttrs.push(attrString("gen_ai.response.model", run.lastModel));
+          pushAttr(rootAttrs, attrString("gen_ai.response.model", run.lastModel));
         }
         if (run.currentInput) {
-          rootAttrs.push(attrString("ai.prompt", truncate(run.currentInput)));
+          pushAttr(rootAttrs, attrString("ai.prompt", truncate(run.currentInput)));
         }
         if (outputText) {
-          rootAttrs.push(attrString("ai.response.text", truncate(outputText)));
+          pushAttr(rootAttrs, attrString("ai.response.text", truncate(outputText)));
         }
         if (run.totalInputTokens > 0) {
-          rootAttrs.push(attrInt("gen_ai.usage.input_tokens", run.totalInputTokens));
+          pushAttr(rootAttrs, attrInt("gen_ai.usage.input_tokens", run.totalInputTokens));
         }
         if (run.totalOutputTokens > 0) {
-          rootAttrs.push(attrInt("gen_ai.usage.output_tokens", run.totalOutputTokens));
+          pushAttr(rootAttrs, attrInt("gen_ai.usage.output_tokens", run.totalOutputTokens));
         }
         if (run.totalCacheReadTokens > 0) {
-          rootAttrs.push(attrInt("gen_ai.usage.cache_read_tokens", run.totalCacheReadTokens));
+          pushAttr(rootAttrs, attrInt("gen_ai.usage.cache_read_tokens", run.totalCacheReadTokens));
         }
-        rootAttrs.push(attrInt("ai.total_turns", run.turnNumber));
+        pushAttr(rootAttrs, attrInt("ai.total_turns", run.turnNumber));
         traceShipper.endSpan(run.rootSpan, { attributes: rootAttrs });
       }
       if (eventShipper) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raindrop-ai/pi-agent",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "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.1.3"
+    "@raindrop-ai/core": "0.2.0"
   },
   "tsup": {
     "entry": [