@raindrop-ai/opencode-plugin 0.1.2 → 0.1.3

package/dist/index.cjs

@@ -24,7 +24,7 @@ __export(index_exports, {
 });
 module.exports = __toCommonJS(index_exports);
 
-// ../core/dist/chunk-YUIXRQWN.js
+// ../core/dist/chunk-3V4MIA75.js
 function getCrypto() {
   const c = globalThis.crypto;
   return c;
@@ -293,6 +293,11 @@ function attrInt(key, value) {
   if (!Number.isFinite(value)) return void 0;
   return { key, value: { intValue: String(Math.trunc(value)) } };
 }
+function attrDouble(key, value) {
+  if (value === void 0) return void 0;
+  if (!Number.isFinite(value)) return void 0;
+  return { key, value: { doubleValue: value } };
+}
 function buildOtlpSpan(args) {
   const attrs = args.attributes.filter((x) => x !== void 0);
   const span = {
@@ -815,6 +820,7 @@ var EventShipper = class {
   }
 };
 var MODEL_USAGE_ATTRIBUTES = {
+  usageSource: "raindrop.usage.source",
   providerName: "gen_ai.provider.name",
   requestModel: "gen_ai.request.model",
   responseModel: "gen_ai.response.model",
@@ -823,6 +829,7 @@ var MODEL_USAGE_ATTRIBUTES = {
   reasoningTokens: "gen_ai.usage.reasoning_tokens",
   cacheReadInputTokens: "gen_ai.usage.cache_read_input_tokens",
   cacheWriteInputTokens: "gen_ai.usage.cache_write_input_tokens",
+  providerReportedCost: "gen_ai.usage.provider_reported_cost",
   nonCachedInputTokens: "raindrop.usage.input_tokens.non_cached",
   nonReasoningOutputTokens: "raindrop.usage.output_tokens.non_reasoning",
   totalOutputTokens: "raindrop.usage.output_tokens.total",
@@ -831,13 +838,20 @@ var MODEL_USAGE_ATTRIBUTES = {
   cacheWriteTokens: "raindrop.usage.input_tokens.cache_write"
 };
 var MODEL_PROVIDER_NAMES = [
+  ["google.vertex.anthropic", "google-vertex"],
+  ["google.vertex_ai", "google-vertex"],
   ["google.vertex", "google-vertex"],
+  ["gcp.vertex_ai", "google-vertex"],
+  ["gcp.gemini", "google"],
+  ["google_vertexai", "google-vertex"],
   ["vertex.anthropic", "google-vertex"],
   ["amazon-bedrock", "amazon-bedrock"],
+  ["aws.bedrock", "amazon-bedrock"],
   ["bedrock", "amazon-bedrock"],
   ["anthropic", "anthropic"],
   ["openai", "openai"],
   ["google", "google"],
+  ["az.ai.openai", "azure"],
   ["azure", "azure"],
   ["openrouter", "openrouter"]
 ];
@@ -848,60 +862,20 @@ function canonicalModelProvider(provider) {
   const match = MODEL_PROVIDER_NAMES.find(
     ([family]) => normalizedProvider === family || normalizedProvider.startsWith(`${family}.`)
   );
-  return (_a = match == null ? void 0 : match[1]) != null ? _a : provider;
+  return (_a = match == null ? void 0 : match[1]) != null ? _a : normalizedProvider;
 }
 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)
-  ] : [];
+function buildRawModelUsageAttributes(usage) {
+  const providerReportedCost = typeof usage.providerReportedCost === "number" && Number.isFinite(usage.providerReportedCost) && usage.providerReportedCost >= 0 ? usage.providerReportedCost : void 0;
   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
+    attrInt(MODEL_USAGE_ATTRIBUTES.inputTokens, tokenCount(usage.inputTokens)),
+    attrInt(MODEL_USAGE_ATTRIBUTES.outputTokens, tokenCount(usage.outputTokens)),
+    attrInt(MODEL_USAGE_ATTRIBUTES.reasoningTokens, tokenCount(usage.reasoningTokens)),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheReadInputTokens, tokenCount(usage.cacheReadInputTokens)),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheWriteInputTokens, tokenCount(usage.cacheWriteInputTokens)),
+    attrDouble(MODEL_USAGE_ATTRIBUTES.providerReportedCost, providerReportedCost)
   ].filter((attribute) => attribute !== void 0);
 }
 var STRING_ALIASES = {
@@ -1502,7 +1476,7 @@ function resolveLocalWorkshopUrl(fileValue) {
 // package.json
 var package_default = {
   name: "@raindrop-ai/opencode-plugin",
-  version: "0.1.2",
+  version: "0.1.3",
   description: "Raindrop observability plugin for OpenCode \u2014 automatic session/event/span tracing",
   type: "module",
   main: "dist/index.js",
@@ -1707,18 +1681,13 @@ function parseOpenCodeAssistantTokens(tokens) {
   };
 }
 function modelSpendSpanAttributes(input) {
-  const providerAttr = attrString(
-    "gen_ai.provider.name",
-    canonicalModelProvider(input.providerID)
-  );
-  const usageAttrs = buildModelUsageAttributes({
+  const providerAttr = attrString("gen_ai.provider.name", canonicalModelProvider(input.providerID));
+  const usageAttrs = buildRawModelUsageAttributes({
     inputTokens: input.tokens.input,
     outputTokens: input.tokens.output,
     reasoningTokens: input.tokens.reasoning,
     cacheReadInputTokens: input.tokens.cacheRead,
-    cacheWriteInputTokens: input.tokens.cacheWrite,
-    inputTokenSemantics: "exclusive",
-    outputTokenSemantics: "exclusive"
+    cacheWriteInputTokens: input.tokens.cacheWrite
   });
   return providerAttr ? [providerAttr, ...usageAttrs] : usageAttrs;
 }
@@ -1726,6 +1695,9 @@ function buildLlmGenAiAttributes(input) {
   const parsed = parseOpenCodeAssistantTokens(input.tokens);
   if (!parsed) return [];
   return [
+    // OpenCode has already normalized both token axes. Provenance lets Dawn
+    // select that contract without the SDK or customer declaring semantics.
+    attrString(MODEL_USAGE_ATTRIBUTES.usageSource, "opencode"),
     attrString("gen_ai.system", input.providerID),
     attrString("gen_ai.request.model", input.modelID),
     attrString("gen_ai.response.model", input.modelID),

package/dist/index.js

@@ -1,4 +1,4 @@
-// ../core/dist/chunk-YUIXRQWN.js
+// ../core/dist/chunk-3V4MIA75.js
 function getCrypto() {
   const c = globalThis.crypto;
   return c;
@@ -267,6 +267,11 @@ function attrInt(key, value) {
   if (!Number.isFinite(value)) return void 0;
   return { key, value: { intValue: String(Math.trunc(value)) } };
 }
+function attrDouble(key, value) {
+  if (value === void 0) return void 0;
+  if (!Number.isFinite(value)) return void 0;
+  return { key, value: { doubleValue: value } };
+}
 function buildOtlpSpan(args) {
   const attrs = args.attributes.filter((x) => x !== void 0);
   const span = {
@@ -789,6 +794,7 @@ var EventShipper = class {
   }
 };
 var MODEL_USAGE_ATTRIBUTES = {
+  usageSource: "raindrop.usage.source",
   providerName: "gen_ai.provider.name",
   requestModel: "gen_ai.request.model",
   responseModel: "gen_ai.response.model",
@@ -797,6 +803,7 @@ var MODEL_USAGE_ATTRIBUTES = {
   reasoningTokens: "gen_ai.usage.reasoning_tokens",
   cacheReadInputTokens: "gen_ai.usage.cache_read_input_tokens",
   cacheWriteInputTokens: "gen_ai.usage.cache_write_input_tokens",
+  providerReportedCost: "gen_ai.usage.provider_reported_cost",
   nonCachedInputTokens: "raindrop.usage.input_tokens.non_cached",
   nonReasoningOutputTokens: "raindrop.usage.output_tokens.non_reasoning",
   totalOutputTokens: "raindrop.usage.output_tokens.total",
@@ -805,13 +812,20 @@ var MODEL_USAGE_ATTRIBUTES = {
   cacheWriteTokens: "raindrop.usage.input_tokens.cache_write"
 };
 var MODEL_PROVIDER_NAMES = [
+  ["google.vertex.anthropic", "google-vertex"],
+  ["google.vertex_ai", "google-vertex"],
   ["google.vertex", "google-vertex"],
+  ["gcp.vertex_ai", "google-vertex"],
+  ["gcp.gemini", "google"],
+  ["google_vertexai", "google-vertex"],
   ["vertex.anthropic", "google-vertex"],
   ["amazon-bedrock", "amazon-bedrock"],
+  ["aws.bedrock", "amazon-bedrock"],
   ["bedrock", "amazon-bedrock"],
   ["anthropic", "anthropic"],
   ["openai", "openai"],
   ["google", "google"],
+  ["az.ai.openai", "azure"],
   ["azure", "azure"],
   ["openrouter", "openrouter"]
 ];
@@ -822,60 +836,20 @@ function canonicalModelProvider(provider) {
   const match = MODEL_PROVIDER_NAMES.find(
     ([family]) => normalizedProvider === family || normalizedProvider.startsWith(`${family}.`)
   );
-  return (_a = match == null ? void 0 : match[1]) != null ? _a : provider;
+  return (_a = match == null ? void 0 : match[1]) != null ? _a : normalizedProvider;
 }
 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)
-  ] : [];
+function buildRawModelUsageAttributes(usage) {
+  const providerReportedCost = typeof usage.providerReportedCost === "number" && Number.isFinite(usage.providerReportedCost) && usage.providerReportedCost >= 0 ? usage.providerReportedCost : void 0;
   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
+    attrInt(MODEL_USAGE_ATTRIBUTES.inputTokens, tokenCount(usage.inputTokens)),
+    attrInt(MODEL_USAGE_ATTRIBUTES.outputTokens, tokenCount(usage.outputTokens)),
+    attrInt(MODEL_USAGE_ATTRIBUTES.reasoningTokens, tokenCount(usage.reasoningTokens)),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheReadInputTokens, tokenCount(usage.cacheReadInputTokens)),
+    attrInt(MODEL_USAGE_ATTRIBUTES.cacheWriteInputTokens, tokenCount(usage.cacheWriteInputTokens)),
+    attrDouble(MODEL_USAGE_ATTRIBUTES.providerReportedCost, providerReportedCost)
   ].filter((attribute) => attribute !== void 0);
 }
 var STRING_ALIASES = {
@@ -1476,7 +1450,7 @@ function resolveLocalWorkshopUrl(fileValue) {
 // package.json
 var package_default = {
   name: "@raindrop-ai/opencode-plugin",
-  version: "0.1.2",
+  version: "0.1.3",
   description: "Raindrop observability plugin for OpenCode \u2014 automatic session/event/span tracing",
   type: "module",
   main: "dist/index.js",
@@ -1681,18 +1655,13 @@ function parseOpenCodeAssistantTokens(tokens) {
   };
 }
 function modelSpendSpanAttributes(input) {
-  const providerAttr = attrString(
-    "gen_ai.provider.name",
-    canonicalModelProvider(input.providerID)
-  );
-  const usageAttrs = buildModelUsageAttributes({
+  const providerAttr = attrString("gen_ai.provider.name", canonicalModelProvider(input.providerID));
+  const usageAttrs = buildRawModelUsageAttributes({
     inputTokens: input.tokens.input,
     outputTokens: input.tokens.output,
     reasoningTokens: input.tokens.reasoning,
     cacheReadInputTokens: input.tokens.cacheRead,
-    cacheWriteInputTokens: input.tokens.cacheWrite,
-    inputTokenSemantics: "exclusive",
-    outputTokenSemantics: "exclusive"
+    cacheWriteInputTokens: input.tokens.cacheWrite
   });
   return providerAttr ? [providerAttr, ...usageAttrs] : usageAttrs;
 }
@@ -1700,6 +1669,9 @@ function buildLlmGenAiAttributes(input) {
   const parsed = parseOpenCodeAssistantTokens(input.tokens);
   if (!parsed) return [];
   return [
+    // OpenCode has already normalized both token axes. Provenance lets Dawn
+    // select that contract without the SDK or customer declaring semantics.
+    attrString(MODEL_USAGE_ATTRIBUTES.usageSource, "opencode"),
     attrString("gen_ai.system", input.providerID),
     attrString("gen_ai.request.model", input.modelID),
     attrString("gen_ai.response.model", input.modelID),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raindrop-ai/opencode-plugin",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "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.2.0"
+    "@raindrop-ai/core": "0.2.1"
   },
   "tsup": {
     "entry": [