@raindrop-ai/opencode-plugin 0.1.0 → 0.1.2

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;
@@ -82,6 +82,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();
@@ -800,6 +814,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",
@@ -1000,6 +1202,10 @@ var TraceShipper = class {
         return null;
       }
     }
+    try {
+      current = normalizeModelUsageSpan(current);
+    } catch (e) {
+    }
     if (!this.disableDefaultRedaction) {
       current = defaultTransformSpan(current);
     }
@@ -1296,7 +1502,7 @@ function resolveLocalWorkshopUrl(fileValue) {
 // package.json
 var package_default = {
   name: "@raindrop-ai/opencode-plugin",
-  version: "0.1.0",
+  version: "0.1.2",
   description: "Raindrop observability plugin for OpenCode \u2014 automatic session/event/span tracing",
   type: "module",
   main: "dist/index.js",
@@ -1401,6 +1607,9 @@ var TraceShipper2 = class extends TraceShipper {
   }
 };
 
+// src/tracing.ts
+var import_node_os2 = require("os");
+
 // src/bounded.ts
 var TRUNCATION_MARKER2 = "...[truncated by raindrop]";
 var MAX_TEXT_FIELD_CHARS = 1e6;
@@ -1481,6 +1690,49 @@ function boundedStringify(value, limit = MAX_TEXT_FIELD_CHARS) {
   }
 }
 
+// src/model-spend.ts
+function parseOpenCodeAssistantTokens(tokens) {
+  const input = tokens["input"];
+  const output = tokens["output"];
+  if (typeof input !== "number" || typeof output !== "number") return void 0;
+  const reasoning = tokens["reasoning"];
+  const cache = tokens["cache"];
+  const cacheObj = cache && typeof cache === "object" && cache !== null ? cache : void 0;
+  return {
+    input,
+    output,
+    reasoning: typeof reasoning === "number" ? reasoning : 0,
+    cacheRead: typeof (cacheObj == null ? void 0 : cacheObj["read"]) === "number" ? cacheObj["read"] : 0,
+    cacheWrite: typeof (cacheObj == null ? void 0 : cacheObj["write"]) === "number" ? cacheObj["write"] : 0
+  };
+}
+function modelSpendSpanAttributes(input) {
+  const providerAttr = attrString(
+    "gen_ai.provider.name",
+    canonicalModelProvider(input.providerID)
+  );
+  const usageAttrs = buildModelUsageAttributes({
+    inputTokens: input.tokens.input,
+    outputTokens: input.tokens.output,
+    reasoningTokens: input.tokens.reasoning,
+    cacheReadInputTokens: input.tokens.cacheRead,
+    cacheWriteInputTokens: input.tokens.cacheWrite,
+    inputTokenSemantics: "exclusive",
+    outputTokenSemantics: "exclusive"
+  });
+  return providerAttr ? [providerAttr, ...usageAttrs] : usageAttrs;
+}
+function buildLlmGenAiAttributes(input) {
+  const parsed = parseOpenCodeAssistantTokens(input.tokens);
+  if (!parsed) return [];
+  return [
+    attrString("gen_ai.system", input.providerID),
+    attrString("gen_ai.request.model", input.modelID),
+    attrString("gen_ai.response.model", input.modelID),
+    ...modelSpendSpanAttributes({ providerID: input.providerID, tokens: parsed })
+  ].filter((attribute) => attribute !== void 0);
+}
+
 // src/tracing-linkage-helpers.ts
 function createSessionParentMapHelpers({
   sessions: sessions2,
@@ -1576,6 +1828,8 @@ function createSessionState(sessionId) {
   return {
     sessionId,
     currentInput: "",
+    turnOutputParts: [],
+    turnOutputTokens: 0,
     outputParts: /* @__PURE__ */ new Map(),
     reasoningParts: /* @__PURE__ */ new Map(),
     toolSpanStarts: /* @__PURE__ */ new Map(),
@@ -1643,7 +1897,7 @@ function getHostname() {
   try {
     const bunGlobal = globalThis;
     if ((_a = bunGlobal.Bun) == null ? void 0 : _a.hostname) return bunGlobal.Bun.hostname;
-    return require("os").hostname();
+    return (0, import_node_os2.hostname)();
   } catch (e) {
     const h = process.env["HOSTNAME"];
     if (h === void 0 || h === "") throw new Error("HOSTNAME env is not set");
@@ -1792,7 +2046,6 @@ function createHooks(config, worktree, directory, eventShipper, traceShipper) {
           const tokensObj = tokens;
           const inputTokens = tokensObj["input"];
           const outputTokens = tokensObj["output"];
-          const reasoningTokens = tokensObj["reasoning"];
           if (typeof inputTokens !== "number" || typeof outputTokens !== "number")
             throw new Error("message.updated: tokens.input and tokens.output must be numbers");
           const providerID = info2["providerID"];
@@ -1806,13 +2059,11 @@ function createHooks(config, worktree, directory, eventShipper, traceShipper) {
           const outputText = state.outputParts.get(messageId);
           const reasoningText = state.reasoningParts.get(messageId);
           const isToolCallsCompletion = finishReason === "tool-calls";
-          const hasIntermediateReasoning = reasoningText !== void 0 && reasoningText.trim().length > 0;
-          if (outputText === void 0 && !(isToolCallsCompletion && hasIntermediateReasoning))
-            return;
-          if (isToolCallsCompletion && !hasIntermediateReasoning) {
-            await traceShipper.flush();
-            return;
+          if (outputText !== void 0 && outputText.trim().length > 0) {
+            state.turnOutputParts.push(outputText);
           }
+          state.turnOutputTokens += outputTokens;
+          if (outputText === void 0 && !isToolCallsCompletion) return;
           const msgError = info2["error"];
           const errorForSpan = msgError ? (() => {
             var _a2, _b2;
@@ -1825,20 +2076,12 @@ function createHooks(config, worktree, directory, eventShipper, traceShipper) {
 type: ${name != null ? name : "UnknownError"}`;
           })() : void 0;
           if (isToolCallsCompletion) {
-            if (reasoningText === void 0)
-              throw new Error("message.updated: reasoningParts missing for tool-call continuation");
+            const responseText = reasoningText !== void 0 && reasoningText.trim().length > 0 ? reasoningText.trim() : outputText !== void 0 && outputText.trim().length > 0 ? outputText.trim() : "";
             const llmAttrs = [
               attrString("ai.operationId", "generateText"),
-              attrString("ai.response.text", reasoningText),
-              attrString("gen_ai.system", providerID),
-              attrString("gen_ai.request.model", modelID),
-              attrString("gen_ai.response.model", modelID),
-              attrInt("gen_ai.usage.input_tokens", inputTokens),
-              attrInt("gen_ai.usage.output_tokens", outputTokens)
+              attrString("ai.response.text", responseText),
+              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj })
             ];
-            if (reasoningTokens != null && typeof reasoningTokens === "number" && reasoningTokens > 0) {
-              llmAttrs.push(attrInt("gen_ai.usage.reasoning_tokens", reasoningTokens));
-            }
             if (state.currentSystemPrompt) {
               llmAttrs.push(
                 attrString("gen_ai.prompt.0.role", "system"),
@@ -1860,6 +2103,7 @@ type: ${name != null ? name : "UnknownError"}`;
             return;
           }
           if (outputText === void 0) return;
+          const turnOutputText = capText2(state.turnOutputParts.join("\n\n"));
           const rootSpan = state.currentRootSpan;
           const isCompaction = state.isCompacting === true;
           if (state.parentId) {
@@ -1871,16 +2115,9 @@ type: ${name != null ? name : "UnknownError"}`;
                 "ai.prompt.messages",
                 buildPromptMessages(state.currentSystemPrompt, state.currentInput)
               ),
-              attrString("ai.response.text", outputText),
-              attrString("gen_ai.system", providerID),
-              attrString("gen_ai.request.model", modelID),
-              attrString("gen_ai.response.model", modelID),
-              attrInt("gen_ai.usage.input_tokens", inputTokens),
-              attrInt("gen_ai.usage.output_tokens", outputTokens)
+              attrString("ai.response.text", turnOutputText),
+              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj })
             ];
-            if (reasoningTokens != null && typeof reasoningTokens === "number" && reasoningTokens > 0) {
-              llmAttrs.push(attrInt("gen_ai.usage.reasoning_tokens", reasoningTokens));
-            }
             if (state.currentSystemPrompt) {
               llmAttrs.push(
                 attrString("gen_ai.prompt.0.role", "system"),
@@ -1923,20 +2160,13 @@ type: ${name != null ? name : "UnknownError"}`;
                 "ai.prompt.messages",
                 buildPromptMessages(state.currentSystemPrompt, state.currentInput)
               ),
-              attrString("ai.response.text", outputText),
-              attrString("gen_ai.system", providerID),
-              attrString("gen_ai.request.model", modelID),
-              attrString("gen_ai.response.model", modelID),
-              attrInt("gen_ai.usage.input_tokens", inputTokens),
-              attrInt("gen_ai.usage.output_tokens", outputTokens)
+              attrString("ai.response.text", turnOutputText),
+              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj })
             ];
             if (isCompaction) {
               rootAttrs.push(attrString("is_compaction", "true"));
             }
             rootAttrs.push(attrString("message_id", messageId));
-            if (reasoningTokens != null && typeof reasoningTokens === "number" && reasoningTokens > 0) {
-              rootAttrs.push(attrInt("gen_ai.usage.reasoning_tokens", reasoningTokens));
-            }
             if (state.currentSystemPrompt) {
               rootAttrs.push(
                 attrString("gen_ai.prompt.0.role", "system"),
@@ -1952,7 +2182,7 @@ type: ${name != null ? name : "UnknownError"}`;
             }
           }
           state.currentRootSpan = void 0;
-          const hasAssistantResponse = outputText.trim().length > 0;
+          const hasAssistantResponse = turnOutputText.trim().length > 0;
           if (!hasAssistantResponse && !msgError) {
             await traceShipper.flush();
             state.currentEventId = void 0;
@@ -1962,10 +2192,10 @@ type: ${name != null ? name : "UnknownError"}`;
             await eventShipper.finish(state.currentEventId, {
               userId: (_d = (_c = state.eventMetadata) == null ? void 0 : _c.userId) != null ? _d : state.sessionId,
               model: modelID,
-              output: msgError ? void 0 : outputText,
+              output: msgError ? void 0 : turnOutputText,
               usage: {
                 promptTokens: inputTokens,
-                completionTokens: outputTokens
+                completionTokens: state.turnOutputTokens
               },
               error: msgError ? {
                 name: msgError.name,
@@ -2099,6 +2329,8 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
         };
         const userText = capText2(textParts.join("\n"));
         state.currentInput = userText;
+        state.turnOutputParts = [];
+        state.turnOutputTokens = 0;
         if (state.parentId) {
           if (!state.parentTaskSpanIds || !state.parentEventContext) {
             return;

package/dist/index.js

@@ -1,11 +1,4 @@
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
-
-// ../core/dist/chunk-QTUH3BHZ.js
+// ../core/dist/chunk-YUIXRQWN.js
 function getCrypto() {
   const c = globalThis.crypto;
   return c;
@@ -63,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();
@@ -781,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",
@@ -981,6 +1176,10 @@ var TraceShipper = class {
         return null;
       }
     }
+    try {
+      current = normalizeModelUsageSpan(current);
+    } catch (e) {
+    }
     if (!this.disableDefaultRedaction) {
       current = defaultTransformSpan(current);
     }
@@ -1277,7 +1476,7 @@ function resolveLocalWorkshopUrl(fileValue) {
 // package.json
 var package_default = {
   name: "@raindrop-ai/opencode-plugin",
-  version: "0.1.0",
+  version: "0.1.2",
   description: "Raindrop observability plugin for OpenCode \u2014 automatic session/event/span tracing",
   type: "module",
   main: "dist/index.js",
@@ -1382,6 +1581,9 @@ var TraceShipper2 = class extends TraceShipper {
   }
 };
 
+// src/tracing.ts
+import { hostname as osHostname } from "os";
+
 // src/bounded.ts
 var TRUNCATION_MARKER2 = "...[truncated by raindrop]";
 var MAX_TEXT_FIELD_CHARS = 1e6;
@@ -1462,6 +1664,49 @@ function boundedStringify(value, limit = MAX_TEXT_FIELD_CHARS) {
   }
 }
 
+// src/model-spend.ts
+function parseOpenCodeAssistantTokens(tokens) {
+  const input = tokens["input"];
+  const output = tokens["output"];
+  if (typeof input !== "number" || typeof output !== "number") return void 0;
+  const reasoning = tokens["reasoning"];
+  const cache = tokens["cache"];
+  const cacheObj = cache && typeof cache === "object" && cache !== null ? cache : void 0;
+  return {
+    input,
+    output,
+    reasoning: typeof reasoning === "number" ? reasoning : 0,
+    cacheRead: typeof (cacheObj == null ? void 0 : cacheObj["read"]) === "number" ? cacheObj["read"] : 0,
+    cacheWrite: typeof (cacheObj == null ? void 0 : cacheObj["write"]) === "number" ? cacheObj["write"] : 0
+  };
+}
+function modelSpendSpanAttributes(input) {
+  const providerAttr = attrString(
+    "gen_ai.provider.name",
+    canonicalModelProvider(input.providerID)
+  );
+  const usageAttrs = buildModelUsageAttributes({
+    inputTokens: input.tokens.input,
+    outputTokens: input.tokens.output,
+    reasoningTokens: input.tokens.reasoning,
+    cacheReadInputTokens: input.tokens.cacheRead,
+    cacheWriteInputTokens: input.tokens.cacheWrite,
+    inputTokenSemantics: "exclusive",
+    outputTokenSemantics: "exclusive"
+  });
+  return providerAttr ? [providerAttr, ...usageAttrs] : usageAttrs;
+}
+function buildLlmGenAiAttributes(input) {
+  const parsed = parseOpenCodeAssistantTokens(input.tokens);
+  if (!parsed) return [];
+  return [
+    attrString("gen_ai.system", input.providerID),
+    attrString("gen_ai.request.model", input.modelID),
+    attrString("gen_ai.response.model", input.modelID),
+    ...modelSpendSpanAttributes({ providerID: input.providerID, tokens: parsed })
+  ].filter((attribute) => attribute !== void 0);
+}
+
 // src/tracing-linkage-helpers.ts
 function createSessionParentMapHelpers({
   sessions: sessions2,
@@ -1557,6 +1802,8 @@ function createSessionState(sessionId) {
   return {
     sessionId,
     currentInput: "",
+    turnOutputParts: [],
+    turnOutputTokens: 0,
     outputParts: /* @__PURE__ */ new Map(),
     reasoningParts: /* @__PURE__ */ new Map(),
     toolSpanStarts: /* @__PURE__ */ new Map(),
@@ -1624,7 +1871,7 @@ function getHostname() {
   try {
     const bunGlobal = globalThis;
     if ((_a = bunGlobal.Bun) == null ? void 0 : _a.hostname) return bunGlobal.Bun.hostname;
-    return __require("os").hostname();
+    return osHostname();
   } catch (e) {
     const h = process.env["HOSTNAME"];
     if (h === void 0 || h === "") throw new Error("HOSTNAME env is not set");
@@ -1773,7 +2020,6 @@ function createHooks(config, worktree, directory, eventShipper, traceShipper) {
           const tokensObj = tokens;
           const inputTokens = tokensObj["input"];
           const outputTokens = tokensObj["output"];
-          const reasoningTokens = tokensObj["reasoning"];
           if (typeof inputTokens !== "number" || typeof outputTokens !== "number")
             throw new Error("message.updated: tokens.input and tokens.output must be numbers");
           const providerID = info2["providerID"];
@@ -1787,13 +2033,11 @@ function createHooks(config, worktree, directory, eventShipper, traceShipper) {
           const outputText = state.outputParts.get(messageId);
           const reasoningText = state.reasoningParts.get(messageId);
           const isToolCallsCompletion = finishReason === "tool-calls";
-          const hasIntermediateReasoning = reasoningText !== void 0 && reasoningText.trim().length > 0;
-          if (outputText === void 0 && !(isToolCallsCompletion && hasIntermediateReasoning))
-            return;
-          if (isToolCallsCompletion && !hasIntermediateReasoning) {
-            await traceShipper.flush();
-            return;
+          if (outputText !== void 0 && outputText.trim().length > 0) {
+            state.turnOutputParts.push(outputText);
           }
+          state.turnOutputTokens += outputTokens;
+          if (outputText === void 0 && !isToolCallsCompletion) return;
           const msgError = info2["error"];
           const errorForSpan = msgError ? (() => {
             var _a2, _b2;
@@ -1806,20 +2050,12 @@ function createHooks(config, worktree, directory, eventShipper, traceShipper) {
 type: ${name != null ? name : "UnknownError"}`;
           })() : void 0;
           if (isToolCallsCompletion) {
-            if (reasoningText === void 0)
-              throw new Error("message.updated: reasoningParts missing for tool-call continuation");
+            const responseText = reasoningText !== void 0 && reasoningText.trim().length > 0 ? reasoningText.trim() : outputText !== void 0 && outputText.trim().length > 0 ? outputText.trim() : "";
             const llmAttrs = [
               attrString("ai.operationId", "generateText"),
-              attrString("ai.response.text", reasoningText),
-              attrString("gen_ai.system", providerID),
-              attrString("gen_ai.request.model", modelID),
-              attrString("gen_ai.response.model", modelID),
-              attrInt("gen_ai.usage.input_tokens", inputTokens),
-              attrInt("gen_ai.usage.output_tokens", outputTokens)
+              attrString("ai.response.text", responseText),
+              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj })
             ];
-            if (reasoningTokens != null && typeof reasoningTokens === "number" && reasoningTokens > 0) {
-              llmAttrs.push(attrInt("gen_ai.usage.reasoning_tokens", reasoningTokens));
-            }
             if (state.currentSystemPrompt) {
               llmAttrs.push(
                 attrString("gen_ai.prompt.0.role", "system"),
@@ -1841,6 +2077,7 @@ type: ${name != null ? name : "UnknownError"}`;
             return;
           }
           if (outputText === void 0) return;
+          const turnOutputText = capText2(state.turnOutputParts.join("\n\n"));
           const rootSpan = state.currentRootSpan;
           const isCompaction = state.isCompacting === true;
           if (state.parentId) {
@@ -1852,16 +2089,9 @@ type: ${name != null ? name : "UnknownError"}`;
                 "ai.prompt.messages",
                 buildPromptMessages(state.currentSystemPrompt, state.currentInput)
               ),
-              attrString("ai.response.text", outputText),
-              attrString("gen_ai.system", providerID),
-              attrString("gen_ai.request.model", modelID),
-              attrString("gen_ai.response.model", modelID),
-              attrInt("gen_ai.usage.input_tokens", inputTokens),
-              attrInt("gen_ai.usage.output_tokens", outputTokens)
+              attrString("ai.response.text", turnOutputText),
+              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj })
             ];
-            if (reasoningTokens != null && typeof reasoningTokens === "number" && reasoningTokens > 0) {
-              llmAttrs.push(attrInt("gen_ai.usage.reasoning_tokens", reasoningTokens));
-            }
             if (state.currentSystemPrompt) {
               llmAttrs.push(
                 attrString("gen_ai.prompt.0.role", "system"),
@@ -1904,20 +2134,13 @@ type: ${name != null ? name : "UnknownError"}`;
                 "ai.prompt.messages",
                 buildPromptMessages(state.currentSystemPrompt, state.currentInput)
               ),
-              attrString("ai.response.text", outputText),
-              attrString("gen_ai.system", providerID),
-              attrString("gen_ai.request.model", modelID),
-              attrString("gen_ai.response.model", modelID),
-              attrInt("gen_ai.usage.input_tokens", inputTokens),
-              attrInt("gen_ai.usage.output_tokens", outputTokens)
+              attrString("ai.response.text", turnOutputText),
+              ...buildLlmGenAiAttributes({ providerID, modelID, tokens: tokensObj })
             ];
             if (isCompaction) {
               rootAttrs.push(attrString("is_compaction", "true"));
             }
             rootAttrs.push(attrString("message_id", messageId));
-            if (reasoningTokens != null && typeof reasoningTokens === "number" && reasoningTokens > 0) {
-              rootAttrs.push(attrInt("gen_ai.usage.reasoning_tokens", reasoningTokens));
-            }
             if (state.currentSystemPrompt) {
               rootAttrs.push(
                 attrString("gen_ai.prompt.0.role", "system"),
@@ -1933,7 +2156,7 @@ type: ${name != null ? name : "UnknownError"}`;
             }
           }
           state.currentRootSpan = void 0;
-          const hasAssistantResponse = outputText.trim().length > 0;
+          const hasAssistantResponse = turnOutputText.trim().length > 0;
           if (!hasAssistantResponse && !msgError) {
             await traceShipper.flush();
             state.currentEventId = void 0;
@@ -1943,10 +2166,10 @@ type: ${name != null ? name : "UnknownError"}`;
             await eventShipper.finish(state.currentEventId, {
               userId: (_d = (_c = state.eventMetadata) == null ? void 0 : _c.userId) != null ? _d : state.sessionId,
               model: modelID,
-              output: msgError ? void 0 : outputText,
+              output: msgError ? void 0 : turnOutputText,
               usage: {
                 promptTokens: inputTokens,
-                completionTokens: outputTokens
+                completionTokens: state.turnOutputTokens
               },
               error: msgError ? {
                 name: msgError.name,
@@ -2080,6 +2303,8 @@ type: ${errorName != null ? errorName : "UnknownError"}`;
         };
         const userText = capText2(textParts.join("\n"));
         state.currentInput = userText;
+        state.turnOutputParts = [];
+        state.turnOutputTokens = 0;
         if (state.parentId) {
           if (!state.parentTaskSpanIds || !state.parentEventContext) {
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raindrop-ai/opencode-plugin",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Raindrop observability plugin for OpenCode — automatic session/event/span tracing",
   "type": "module",
   "main": "dist/index.js",
@@ -37,7 +37,7 @@
     "@types/node": "^20.11.17",
     "tsup": "^8.4.0",
     "typescript": "^5.3.3",
-    "@raindrop-ai/core": "0.1.3"
+    "@raindrop-ai/core": "0.2.0"
   },
   "tsup": {
     "entry": [