@animalabs/membrane 0.5.42 → 0.5.44

package/src/providers/anthropic.ts

@@ -178,7 +178,19 @@ export class AnthropicAdapter implements ProviderAdapter {
           const delta = event.delta as { stop_reason?: string; stop_sequence?: string };
           stopReason = delta.stop_reason ?? 'end_turn';
           stopSequence = delta.stop_sequence ?? undefined;
-          outputTokens = (event.usage as { output_tokens: number }).output_tokens ?? 0;
+          const deltaUsage = event.usage as unknown as {
+            output_tokens: number;
+            cache_creation_input_tokens?: number | null;
+            cache_read_input_tokens?: number | null;
+          };
+          outputTokens = deltaUsage.output_tokens ?? 0;
+          // message_delta carries cumulative cache metrics — use as authoritative
+          if (deltaUsage.cache_creation_input_tokens != null) {
+            cacheCreationTokens = deltaUsage.cache_creation_input_tokens;
+          }
+          if (deltaUsage.cache_read_input_tokens != null) {
+            cacheReadTokens = deltaUsage.cache_read_input_tokens;
+          }
           break;
         }
       }

package/src/registry/default-pricing.ts

@@ -0,0 +1,77 @@
+import type { ModelPricing } from '../types/provider.js';
+
+/**
+ * Built-in pricing table for known models.
+ * Prices in USD per million tokens. Last updated: 2025-07.
+ *
+ * Used as fallback when no ModelRegistry is configured.
+ * Registry pricing (if available) takes precedence.
+ */
+const PRICING_TABLE: Array<{ prefix: string; pricing: ModelPricing }> = [
+  // Anthropic — Claude 4.6
+  {
+    prefix: 'claude-opus-4-6',
+    pricing: { inputPerMillion: 15, outputPerMillion: 75, cacheWritePerMillion: 18.75, cacheReadPerMillion: 1.50, currency: 'USD' },
+  },
+  {
+    prefix: 'claude-sonnet-4-6',
+    pricing: { inputPerMillion: 3, outputPerMillion: 15, cacheWritePerMillion: 3.75, cacheReadPerMillion: 0.30, currency: 'USD' },
+  },
+  // Anthropic — Claude 4.5
+  {
+    prefix: 'claude-haiku-4-5',
+    pricing: { inputPerMillion: 0.80, outputPerMillion: 4, cacheWritePerMillion: 1.00, cacheReadPerMillion: 0.08, currency: 'USD' },
+  },
+  // Anthropic — Claude 4
+  {
+    prefix: 'claude-opus-4',
+    pricing: { inputPerMillion: 15, outputPerMillion: 75, cacheWritePerMillion: 18.75, cacheReadPerMillion: 1.50, currency: 'USD' },
+  },
+  {
+    prefix: 'claude-sonnet-4',
+    pricing: { inputPerMillion: 3, outputPerMillion: 15, cacheWritePerMillion: 3.75, cacheReadPerMillion: 0.30, currency: 'USD' },
+  },
+  // Anthropic — Claude 3.5
+  {
+    prefix: 'claude-3-5-sonnet',
+    pricing: { inputPerMillion: 3, outputPerMillion: 15, cacheWritePerMillion: 3.75, cacheReadPerMillion: 0.30, currency: 'USD' },
+  },
+  {
+    prefix: 'claude-3-5-haiku',
+    pricing: { inputPerMillion: 0.80, outputPerMillion: 4, cacheWritePerMillion: 1.00, cacheReadPerMillion: 0.08, currency: 'USD' },
+  },
+  // OpenAI — GPT-4o
+  {
+    prefix: 'gpt-4o-2024',
+    pricing: { inputPerMillion: 2.50, outputPerMillion: 10, cacheReadPerMillion: 1.25, currency: 'USD' },
+  },
+  {
+    prefix: 'gpt-4o',
+    pricing: { inputPerMillion: 2.50, outputPerMillion: 10, cacheReadPerMillion: 1.25, currency: 'USD' },
+  },
+  {
+    prefix: 'gpt-4o-mini',
+    pricing: { inputPerMillion: 0.15, outputPerMillion: 0.60, cacheReadPerMillion: 0.075, currency: 'USD' },
+  },
+  // Google — Gemini 2.5
+  {
+    prefix: 'gemini-2.5-pro',
+    pricing: { inputPerMillion: 1.25, outputPerMillion: 10, currency: 'USD' },
+  },
+  {
+    prefix: 'gemini-2.5-flash',
+    pricing: { inputPerMillion: 0.15, outputPerMillion: 0.60, currency: 'USD' },
+  },
+];
+
+export function getDefaultPricing(modelId: string): ModelPricing | undefined {
+  let best: ModelPricing | undefined;
+  let bestLen = 0;
+  for (const entry of PRICING_TABLE) {
+    if (modelId.startsWith(entry.prefix) && entry.prefix.length > bestLen) {
+      best = entry.pricing;
+      bestLen = entry.prefix.length;
+    }
+  }
+  return best;
+}

package/src/types/yielding-stream.ts

@@ -10,7 +10,7 @@
 
 import type { ContentBlock } from './content.js';
 import type { ToolCall, ToolResult, ToolContext } from './tools.js';
-import type { BasicUsage, NormalizedResponse, StopReason } from './response.js';
+import type { DetailedUsage, NormalizedResponse, StopReason } from './response.js';
 import type { ChunkMeta, BlockEvent } from './streaming.js';
 
 // ============================================================================
@@ -49,7 +49,7 @@ export interface ToolCallsEvent {
  */
 export interface UsageEvent {
   type: 'usage';
-  usage: BasicUsage;
+  usage: DetailedUsage;
 }
 
 /**

package/src/utils/cost.ts

@@ -0,0 +1,29 @@
+import type { CostBreakdown } from '../types/response.js';
+import type { ModelPricing } from '../types/provider.js';
+
+export interface CostableUsage {
+  inputTokens: number;
+  outputTokens: number;
+  cacheCreationTokens?: number;
+  cacheReadTokens?: number;
+}
+
+export function calculateCost(usage: CostableUsage, pricing: ModelPricing): CostBreakdown {
+  const input = usage.inputTokens * pricing.inputPerMillion / 1_000_000;
+  const output = usage.outputTokens * pricing.outputPerMillion / 1_000_000;
+  const cacheWrite = pricing.cacheWritePerMillion != null
+    ? (usage.cacheCreationTokens ?? 0) * pricing.cacheWritePerMillion / 1_000_000
+    : undefined;
+  const cacheRead = pricing.cacheReadPerMillion != null
+    ? (usage.cacheReadTokens ?? 0) * pricing.cacheReadPerMillion / 1_000_000
+    : undefined;
+
+  return {
+    input,
+    output,
+    cacheWrite,
+    cacheRead,
+    total: input + output + (cacheWrite ?? 0) + (cacheRead ?? 0),
+    currency: pricing.currency,
+  };
+}

package/src/utils/index.ts

@@ -13,3 +13,6 @@ export {
   unescapeXml,
   type ToolDefinitionForPrompt,
 } from './tool-parser.js';
+
+export { calculateCost } from './cost.js';
+export type { CostableUsage } from './cost.js';