@codemieai/code 0.15.2 → 0.15.4

package/dist/utils/pricing.js

@@ -8,142 +8,116 @@
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { getDirname } from './paths.js';
-import { normalizeModelName } from './model-normalizer.js';
-import { logger } from './logger.js';
+import { applyBedrockRegionalPremium } from './bedrock-pricing.mjs';
+import { ConfigurationError } from './errors.js';
+import { priceTableKey, resolvePriceKey } from './price-resolution.js';
+export { canonicalizeModelId } from './price-resolution.js';
+/**
+ * CodeMie-specific ids the vendored table will never carry. Merged over the vendored rows
+ * in {@link table}, so re-copying `pricing.json` from agentlytics does not silently drop them.
+ *
+ * `claude-smart-router` is a Switchyard routing alias, not a generation model. The alias bills
+ * only the Haiku classifier hop that picks a target; the generation itself is billed against the
+ * model the router dispatched to, which arrives in the response body's own `model` field and is
+ * priced from its own row. Haiku rates therefore price what this id actually costs — without a
+ * row at all, `lookupPrice` returns null and the turn drops out of every cost total.
+ */
+const CODEMIE_PRICES = {
+    'claude-smart-router': { input: 1, output: 5, cacheRead: 0.1, cacheWrite: 1.25, cacheWrite1h: 2 },
+};
 const HERE = getDirname(import.meta.url);
 let TABLE = null;
-function table() {
-    if (TABLE) {
-        return TABLE;
-    }
-    const raw = JSON.parse(readFileSync(join(HERE, 'pricing.json'), 'utf-8'));
-    const built = {};
-    for (const [key, p] of Object.entries(raw)) {
-        if (key.startsWith('_')) {
-            continue; // skip _meta and similar
-        }
-        built[key.toLowerCase()] = {
-            input: p.input ?? 0,
-            output: p.output ?? 0,
-            cacheRead: p.cacheRead ?? 0,
-            cacheCreation: p.cacheWrite ?? 0,
-            cacheWrite1h: p.cacheWrite1h,
-        };
-    }
-    TABLE = built;
-    return TABLE;
+function toModelPrice(p) {
+    return {
+        input: p.input ?? 0,
+        output: p.output ?? 0,
+        cacheRead: p.cacheRead ?? 0,
+        cacheCreation: p.cacheWrite ?? 0,
+        cacheWrite1h: p.cacheWrite1h,
+        bedrockRegionalMultiplier: p.bedrockRegionalMultiplier,
+        estimated: p.estimated,
+    };
+}
+function pricesEqual(a, b) {
+    return (a.input === b.input
+        && a.output === b.output
+        && a.cacheRead === b.cacheRead
+        && a.cacheCreation === b.cacheCreation
+        && a.cacheWrite1h === b.cacheWrite1h
+        && a.bedrockRegionalMultiplier === b.bedrockRegionalMultiplier
+        && a.estimated === b.estimated);
 }
 /**
- * True when `key` aligns to a segment boundary within `name` (delimited by `-` or the
- * string edges), so a key is never matched mid-token — e.g. `gpt-4` does not match inside
- * `gpt-4o` (which resolves to its own `gpt-4o` entry), and `gpt-4` does not match `gpt-4.1`
- * (folded to `gpt-4-1`, which has its own entry).
+ * Builds the rate card from a bag of raw rows (a parsed `pricing.json`, an injected fixture for
+ * tests, or any merge of the two): every key is lowercased and dots are turned to dashes, so
+ * `GLM-4.7` and `glm-4-7` land on the same table entry. When two distinct raw keys normalize to
+ * the same table key, they must carry identical prices — that is the only way the pricing data
+ * itself can declare two spellings of the same model (e.g. `gemini-3.7-flash` / `gemini-3-7-flash`)
+ * — otherwise the table is ambiguous and this throws rather than silently picking one.
  */
-function isSegmentMatch(name, key) {
-    for (let from = 0;;) {
-        const idx = name.indexOf(key, from);
-        if (idx === -1) {
-            return false;
+export function buildPriceTable(rows) {
+    const built = {};
+    for (const [rawKey, raw] of Object.entries(rows)) {
+        if (rawKey.startsWith('_')) {
+            continue; // skip _meta and similar
         }
-        const before = idx === 0 ? '-' : name[idx - 1];
-        const afterIdx = idx + key.length;
-        const after = afterIdx === name.length ? '-' : name[afterIdx];
-        if (before === '-' && after === '-') {
-            return true;
+        const key = priceTableKey(rawKey);
+        const price = toModelPrice(raw);
+        const existing = built[key];
+        if (existing && !pricesEqual(existing, price)) {
+            throw new ConfigurationError(`[pricing] "${rawKey}" normalizes to key "${key}", which already holds a different price`);
         }
-        from = idx + 1;
+        built[key] = price;
     }
+    return built;
 }
-/** Claude pricing tiers whose per-tier rate has stayed flat across every `-4-*` version bump seen so far. */
-const CLAUDE_TIERS = ['claude-opus', 'claude-sonnet', 'claude-haiku'];
-/**
- * Parse the version segments trailing a tier prefix into a numeric tuple for comparison, e.g.
- * `claude-sonnet-4-8` under tier `claude-sonnet` -> `[4, 8]`. Returns null for keys that don't
- * fit the plain `<tier>(-<digits>)*` shape — non-numeric segments (`-latest`) or a long numeric
- * segment (a pinned date snapshot like `-20250514`, 8 digits) — since those aren't meaningful
- * "is this newer" signals and would otherwise outrank a real version bump by raw magnitude.
- */
-function tierVersionTuple(key, tier) {
-    const rest = key.slice(tier.length);
-    if (!rest) {
-        return [0];
-    }
-    const segments = rest.split('-').filter(Boolean);
-    const nums = [];
-    for (const segment of segments) {
-        if (!/^\d+$/.test(segment) || segment.length >= 8) {
-            return null;
-        }
-        nums.push(Number(segment));
+function table() {
+    if (TABLE) {
+        return TABLE;
     }
-    return nums;
+    const raw = JSON.parse(readFileSync(join(HERE, 'pricing.json'), 'utf-8'));
+    TABLE = buildPriceTable({ ...raw, ...CODEMIE_PRICES });
+    return TABLE;
 }
-function compareVersionTuples(a, b) {
-    for (let i = 0; i < Math.max(a.length, b.length); i++) {
-        const diff = (a[i] ?? 0) - (b[i] ?? 0);
-        if (diff !== 0) {
-            return diff;
-        }
-    }
-    return 0;
+/**
+ * The fully built rate card: the vendored table with {@link CODEMIE_PRICES} merged over it and every
+ * key lowercased. Exported so consumers that cannot import this module — the standalone Claude
+ * statusline, which runs as a detached `node <path>` process — can be handed the same rates rather
+ * than a copy of the raw `pricing.json`, which carries none of the CodeMie-only rows.
+ */
+export function priceTable() {
+    return table();
 }
 /**
- * Fall back to the latest known price within the same Claude tier (opus/sonnet/haiku) when a
- * model name matches no table entry at all — e.g. a new major-version model (`claude-sonnet-5`)
- * that shares no version segment with any `-4-*` key, so {@link isSegmentMatch} can't find it.
- * Every version bump observed within a tier so far has kept the same per-token rate, so the
- * latest known entry is the best available estimate; callers must still log this as inexact.
+ * Resolves pricing for a model, reporting how it was matched. Returns null when no entry
+ * matches (the caller marks the model `unpriced` — never a silent $0, and never a guessed
+ * family/tier price). The lookup order (exact, then one snapshot suffix stripped, then a
+ * version-first Claude id reordered to family-first) lives in {@link resolvePriceKey}, shared
+ * with the Claude statusline so the two can never price the same id differently.
+ *
+ * `model` is also checked, in its original unnormalized form, for a Bedrock region qualifier
+ * (see {@link applyBedrockRegionalPremium}) — pass the raw backend id straight through rather
+ * than pre-normalizing it, or the premium this exists to detect is invisible by the time it gets
+ * here.
  */
-function claudeTierFallback(normalized, prices) {
-    const tier = CLAUDE_TIERS.find((t) => normalized === t || normalized.startsWith(`${t}-`));
-    if (!tier) {
+export function resolvePrice(model) {
+    const prices = table();
+    const hit = resolvePriceKey(model, (key) => (Object.hasOwn(prices, key) ? prices[key] : undefined));
+    if (!hit) {
         return null;
     }
-    let best = null;
-    for (const [key, price] of Object.entries(prices)) {
-        if (key !== tier && !key.startsWith(`${tier}-`)) {
-            continue;
-        }
-        const version = tierVersionTuple(key, tier);
-        if (version === null) {
-            continue;
-        }
-        if (!best || compareVersionTuples(version, best.version) > 0) {
-            best = { key, version, price };
-        }
-    }
-    return best ? { key: best.key, price: best.price } : null;
+    return {
+        price: applyBedrockRegionalPremium(hit.value, model),
+        key: hit.key,
+        match: hit.match,
+        estimated: hit.value.estimated ?? false,
+    };
 }
 /**
- * Look up pricing for a model. Returns null when no entry matches (the caller marks the model
- * `unpriced` — never a silent $0). Resolution order:
- *   1. Exact (normalized) match — authoritative.
- *   2. Longest key aligned to a segment boundary — a deliberate family fallback, logged as inexact.
- *   3. Latest same-tier Claude price — for a model newer than every table entry, logged as inexact.
- * Dots are folded to dashes first because the table keys use dashes (e.g. `gpt-4-1`, not `gpt-4.1`).
+ * Look up pricing for a model. Returns null when no entry matches. Thin wrapper over
+ * {@link resolvePrice} for callers that only need the price, not its provenance.
  */
 export function lookupPrice(model) {
-    const normalized = normalizeModelName(model).toLowerCase().replace(/\./g, '-');
-    const prices = table();
-    const exact = prices[normalized];
-    if (exact) {
-        return exact;
-    }
-    let best = null;
-    for (const [key, price] of Object.entries(prices)) {
-        if (isSegmentMatch(normalized, key) && (!best || key.length > best.key.length)) {
-            best = { key, price };
-        }
-    }
-    if (best) {
-        logger.debug(`[pricing] no exact entry for "${normalized}"; using family price "${best.key}"`);
-        return best.price;
-    }
-    const tierFallback = claudeTierFallback(normalized, prices);
-    if (tierFallback) {
-        logger.debug(`[pricing] no entry for "${normalized}"; using latest same-tier price "${tierFallback.key}"`);
-        return tierFallback.price;
-    }
-    return null;
+    return resolvePrice(model)?.price ?? null;
 }
 //# sourceMappingURL=pricing.js.map

package/dist/utils/pricing.js.map

@@ -1 +1 @@
-{"version":3,"file":"pricing.js","sourceRoot":"","sources":["../../src/utils/pricing.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pricing.js","sourceRoot":"","sources":["../../src/utils/pricing.ts"],"names":[],"mappings":"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"}

package/dist/utils/pricing.json

@@ -16,58 +16,106 @@
       "keys": "All keys use dashes instead of dots (e.g. gpt-5-4 not gpt-5.4) so normalizeModelName dots→dashes works",
       "cacheRead": "cache hit price (Anthropic: 0.1x input, OpenAI: varies, Google: ~0.1x input)",
       "cacheWrite": "cache write price (Anthropic: 1.25x input, OpenAI: ~same as input)",
-      "claude5": "Sonnet 5 and Opus 5 standard API-equivalent token rates verified 2026-09-15 at https://platform.claude.com/docs/en/about-claude/pricing; excludes additional tool charges. Sonnet 5's planned September 1 price increase was cancelled."
+      "claude5": "Sonnet 5 and Opus 5 standard API-equivalent token rates verified 2026-09-15; Fable 5/5.1, Mythos 5/5.1 and Opus 4.7/4.8 verified 2026-09-27 at https://platform.claude.com/docs/en/about-claude/pricing; excludes additional tool charges. Sonnet 5's planned September 1 price increase was cancelled.",
+      "t10CatalogReconciliation": "Rows added 2026-09-26 to price catalog ids that resolvePrice() found unpriced (unify-analytics-cost-command T10), each verified against one official vendor page/API on that date. claude-opus-5-5: $4/$20 base, $5/$8 5m/1h cache write, $0.20 cache read (0.05x multiplier), bedrockRegionalMultiplier 1.1 (Opus 4.5+ scope) — https://platform.claude.com/docs/en/about-claude/pricing (Model pricing table row 'Claude Opus 5.5'). gpt-5-5: short-context Standard row '$5.00 | $0.50 | - | $30.00' — https://developers.openai.com/api/docs/pricing ('Standard Pricing Tables', row 'gpt-5.5 (<272K context length)'); cache-write column is '-' (not stated) so cacheWrite mirrors input, matching this table's existing gpt-5-4 handling. gpt-5-6-luna/-sol/-terra and gpt-6-luna/-sol: short-context Standard rows from the same OpenAI page/table, e.g. 'gpt-6-sol | $2.00 | $0.20 | $2.50 | $10.00'; these rows do state a real cache-write price (~1.25x input) so it is recorded as-is rather than mirrored. deepseek-v4-pro: peak (weekday 01:00-04:00/06:00-10:00 UTC) cache-miss input $1.32, cache-hit input $0.044, output $3.96 — https://api-docs.deepseek.com/quick_start/pricing/; off-peak (all other hours, including weekends) is exactly half: $0.66/$0.022/$1.98; peak chosen as the flat row like every other entry in this table, no time-of-day tiering supported by the schema; cacheWrite mirrors input per this table's deepseek-chat/deepseek-reasoner precedent. gemini-3-6-flash/gemini-3-8-flash: paid-tier Standard pricing 'through Dec 31, 2026' — $0.75 input/$3.75 output/$0.075 context-caching — https://ai.google.dev/gemini-api/docs/pricing; scheduled to double to $1.50/$7.50/$0.15 on 2027-01-01, not yet in effect as of verification; cacheWrite mirrors input per this table's gemini-3-5-flash/gemini-3-7-flash precedent. gemini-3-1-flash-image: Standard pricing 'Input: $0.50 (text/image); Output: $3 (text/thinking), $60.00 (images)' — https://ai.google.dev/gemini-api/docs/pricing; output field records the $60 image-generation rate (not the $3 text/thinking rate), matching this table's existing gemini-3-1-flash-image-preview/gemini-2-5-flash-image rows, which use the same convention (schema has no separate image-output field); cacheRead/cacheWrite 0 (no cache pricing published for this model). grok-4-6: base tier (<200k prompt tokens) row 'grok-4.6 (< 200k prompt tokens) | 500k | $2.00 | $0.50 | $6.00' — https://docs.x.ai/developers/models; xAI doubles every rate for prompts >=200k tokens, not represented here (schema is flat), so this is the base/short-context tier, consistent with this table's other short-context-only entries; cacheWrite mirrors input per this table's grok-4/grok-4-1-fast precedent. qwen3-coder-30b-a3b-v1 and qwen3-coder-480b-a35b-v1: AWS Bedrock on-demand Standard tier, US East (N. Virginia) — official AWS Price List API https://pricing.us-east-1.amazonaws.com/offers/v1.0/aws/AmazonBedrock/20260926004940/us-east-1/index.json (also rendered at https://aws.amazon.com/bedrock/pricing/), SKU usagetype 'qwen.qwen3-coder-30b-a3b-instruct-mantle-{input,output}-tokens-standard' = $0.00015/$0.0006 per 1K tokens ($0.15/$0.60 per 1M) and 'qwen.qwen3-coder-480b-a35b-instruct-mantle-{input,output}-tokens-standard' = $0.00045/$0.0018 per 1K tokens ($0.45/$1.80 per 1M); no cache pricing published for either. Checked but NOT added (no official page states a price for the exact catalog id): claude-4-5-sonnet / claude-4-5-sonnet-vertex now resolve via the T1 reorder fallback onto the existing claude-sonnet-4-5 row, so no new row was needed."
     },
-    "note": "codemie: added claude 4-7/4-8 tier estimates 2026-06-08; added kimi-for-coding alias and normalized kimi-k2-5 key 2026-06-15; added claude-sonnet-5 pinned entry 2026-07-01 (pricing table lookup also has a generic same-tier fallback now, see pricing.ts)"
+    "note": "codemie: added claude 4-7/4-8 tier estimates 2026-06-08; added kimi-for-coding alias and normalized kimi-k2-5 key 2026-06-15; added claude-sonnet-5 pinned entry 2026-07-01 (current resolution order: exact match, then one trailing snapshot suffix stripped, then a version-first Claude id reordered to its family-first table key, else unpriced — no family/tier fallback; see resolvePrice() in pricing.ts); corrected claude-sonnet-5 to its real $2/$10 rate 2026-09-15 (was pinned at the old Sonnet 4.x $3/$15 rate — Anthropic's introductory $2/$10 pricing for Sonnet 5 became standard instead of increasing to $3/$15 as originally scheduled); added per-row bedrockRegionalMultiplier 2026-09-15 to every Sonnet 4.5+/Haiku 4.5+/Opus 4.5+ row (including their dated snapshots) — Amazon Bedrock bills a regional/multi-region endpoint (a US/EU/JP/AU cross-region inference profile, or a single named AWS region) at this multiplier over its global endpoint, for exactly these generations and later; see https://platform.claude.com/docs/en/build-with-claude/claude-in-amazon-bedrock#regions. Applied by lookupPrice() (pricing.ts) and lookupRate() (statusline.mjs) when isBedrockRegionalPremium() (bedrock-pricing.mjs) detects a non-global Bedrock region qualifier on the raw model id — never a flat account-wide discount, and never on a pre-4.5 row that has no such field. Added 14 catalog-pricing-reconciliation rows 2026-09-26 (unify-analytics-cost-command T10): claude-opus-5-5, gpt-5-5, gpt-5-6-luna, gpt-5-6-sol, gpt-5-6-terra, gpt-6-luna, gpt-6-sol, deepseek-v4-pro, gemini-3-6-flash, gemini-3-8-flash, gemini-3-1-flash-image, grok-4-6, qwen3-coder-30b-a3b-v1, qwen3-coder-480b-a35b-v1 — each sourced from one official vendor pricing page/API, see notes.t10CatalogReconciliation for exact quotes and URLs. deepseek-v4-pro and qwen3-coder-30b-a3b-v1 (Bedrock) remain named 'unresolved' in the T3 report's prior draft; the AWS official Price List API resolved the qwen rows where the rendered pricing page alone was ambiguous. 2026-09-27: added claude-fable-5-1 / claude-mythos-5-1 ($10/$50, cache read $0.25 = 0.025x input) and claude-fable-5 / claude-mythos-5 ($10/$50, cache read $1), and removed the estimated flag from claude-opus-4-7 / claude-opus-4-8 (published at $5/$25, cache read $0.50) — all verified at https://platform.claude.com/docs/en/about-claude/pricing. claude-sonnet-4-7, claude-sonnet-4-8 and claude-haiku-4-6 are not on that page and stay estimated. 2026-09-27: added gpt-6-astra ($10/$1/$50 short-context tier; long tier $20/$2/$75), gpt-5-5-pro ($30/$180, no cached-input discount), gpt-5-4-mini ($0.75/$0.075/$4.50) and gpt-5-4-nano ($0.20/$0.02/$1.25), and corrected rounded cacheRead on gpt-5-1 (0.125), o4-mini (0.275) and gpt-4o-mini (0.075) — standard tier at https://developers.openai.com/api/docs/pricing. 2026-09-27: added kimi-k3 ($3/$15, cache read $0.30, cache write $3, 1h cache write $6) with an identical bare `k3` alias row (kimi-code logs the bare id `k3`, and resolvePrice() does not strip a provider-less prefix), and kimi-k2-6 ($0.95/$4, cache read $0.16, cache write $0.95) — https://platform.kimi.ai/docs/pricing/chat. k3 used through api.kimi.com/coding is billed as a flat Kimi Code subscription, so its report cost is an API-equivalent estimate, not an invoice. kimi-k2.5 is no longer listed on that page; its existing row is kept as last published."
   },
   "claude-sonnet-5": {
     "input": 2,
     "output": 10,
     "cacheRead": 0.2,
     "cacheWrite": 2.5,
-    "cacheWrite1h": 4.0
+    "cacheWrite1h": 4.0,
+    "bedrockRegionalMultiplier": 1.1
+  },
+  "claude-fable-5-1": {
+    "input": 10,
+    "output": 50,
+    "cacheRead": 0.25,
+    "cacheWrite": 12.5,
+    "cacheWrite1h": 20,
+    "bedrockRegionalMultiplier": 1.1
+  },
+  "claude-mythos-5-1": {
+    "input": 10,
+    "output": 50,
+    "cacheRead": 0.25,
+    "cacheWrite": 12.5,
+    "cacheWrite1h": 20,
+    "bedrockRegionalMultiplier": 1.1
+  },
+  "claude-fable-5": {
+    "input": 10,
+    "output": 50,
+    "cacheRead": 1,
+    "cacheWrite": 12.5,
+    "cacheWrite1h": 20,
+    "bedrockRegionalMultiplier": 1.1
+  },
+  "claude-mythos-5": {
+    "input": 10,
+    "output": 50,
+    "cacheRead": 1,
+    "cacheWrite": 12.5,
+    "cacheWrite1h": 20,
+    "bedrockRegionalMultiplier": 1.1
+  },
+  "claude-opus-5-5": {
+    "input": 4,
+    "output": 20,
+    "cacheRead": 0.2,
+    "cacheWrite": 5,
+    "cacheWrite1h": 8,
+    "bedrockRegionalMultiplier": 1.1
   },
   "claude-opus-5": {
     "input": 5,
     "output": 25,
     "cacheRead": 0.5,
     "cacheWrite": 6.25,
-    "cacheWrite1h": 10.0
+    "cacheWrite1h": 10.0,
+    "bedrockRegionalMultiplier": 1.1
   },
   "claude-opus-4-6": {
     "input": 5,
     "output": 25,
     "cacheRead": 0.5,
     "cacheWrite": 6.25,
-    "cacheWrite1h": 10.0
+    "cacheWrite1h": 10.0,
+    "bedrockRegionalMultiplier": 1.1
   },
   "claude-sonnet-4-6": {
     "input": 3,
     "output": 15,
     "cacheRead": 0.3,
     "cacheWrite": 3.75,
-    "cacheWrite1h": 6.0
+    "cacheWrite1h": 6.0,
+    "bedrockRegionalMultiplier": 1.1
   },
   "claude-opus-4-5": {
     "input": 5,
     "output": 25,
     "cacheRead": 0.5,
     "cacheWrite": 6.25,
-    "cacheWrite1h": 10.0
+    "cacheWrite1h": 10.0,
+    "bedrockRegionalMultiplier": 1.1
   },
   "claude-sonnet-4-5": {
     "input": 3,
     "output": 15,
     "cacheRead": 0.3,
     "cacheWrite": 3.75,
-    "cacheWrite1h": 6.0
+    "cacheWrite1h": 6.0,
+    "bedrockRegionalMultiplier": 1.1
   },
   "claude-haiku-4-5": {
     "input": 1,
     "output": 5,
     "cacheRead": 0.1,
     "cacheWrite": 1.25,
-    "cacheWrite1h": 2.0
+    "cacheWrite1h": 2.0,
+    "bedrockRegionalMultiplier": 1.1
   },
   "claude-opus-4-1": {
     "input": 15,
@@ -151,6 +199,66 @@
     "cacheRead": 30,
     "cacheWrite": 30
   },
+  "gpt-5-5": {
+    "input": 5,
+    "output": 30,
+    "cacheRead": 0.5,
+    "cacheWrite": 5
+  },
+  "gpt-5-6-luna": {
+    "input": 0.2,
+    "output": 1.2,
+    "cacheRead": 0.02,
+    "cacheWrite": 0.25
+  },
+  "gpt-5-6-sol": {
+    "input": 4,
+    "output": 20,
+    "cacheRead": 0.4,
+    "cacheWrite": 5
+  },
+  "gpt-5-6-terra": {
+    "input": 2,
+    "output": 12,
+    "cacheRead": 0.2,
+    "cacheWrite": 2.5
+  },
+  "gpt-6-luna": {
+    "input": 0.1,
+    "output": 0.5,
+    "cacheRead": 0.01,
+    "cacheWrite": 0.125
+  },
+  "gpt-6-astra": {
+    "input": 10,
+    "output": 50,
+    "cacheRead": 1,
+    "cacheWrite": 10
+  },
+  "gpt-5-5-pro": {
+    "input": 30,
+    "output": 180,
+    "cacheRead": 30,
+    "cacheWrite": 30
+  },
+  "gpt-5-4-mini": {
+    "input": 0.75,
+    "output": 4.5,
+    "cacheRead": 0.075,
+    "cacheWrite": 0.75
+  },
+  "gpt-5-4-nano": {
+    "input": 0.2,
+    "output": 1.25,
+    "cacheRead": 0.02,
+    "cacheWrite": 0.2
+  },
+  "gpt-6-sol": {
+    "input": 2,
+    "output": 10,
+    "cacheRead": 0.2,
+    "cacheWrite": 2.5
+  },
   "gpt-5-2": {
     "input": 1.75,
     "output": 14,
@@ -166,7 +274,7 @@
   "gpt-5-1": {
     "input": 1.25,
     "output": 10,
-    "cacheRead": 0.13,
+    "cacheRead": 0.125,
     "cacheWrite": 1.25
   },
   "gpt-5": {
@@ -256,7 +364,7 @@
   "gpt-4o-mini": {
     "input": 0.15,
     "output": 0.6,
-    "cacheRead": 0.08,
+    "cacheRead": 0.075,
     "cacheWrite": 0.15
   },
   "gpt-4-turbo": {
@@ -316,7 +424,7 @@
   "o4-mini": {
     "input": 1.1,
     "output": 4.4,
-    "cacheRead": 0.28,
+    "cacheRead": 0.275,
     "cacheWrite": 1.1
   },
   "gemini-3-1-pro": {
@@ -367,6 +475,18 @@
     "cacheRead": 0.025,
     "cacheWrite": 0.25
   },
+  "gemini-3-6-flash": {
+    "input": 0.75,
+    "output": 3.75,
+    "cacheRead": 0.075,
+    "cacheWrite": 0.75
+  },
+  "gemini-3-8-flash": {
+    "input": 0.75,
+    "output": 3.75,
+    "cacheRead": 0.075,
+    "cacheWrite": 0.75
+  },
   "gemini-2-5-pro": {
     "input": 1.25,
     "output": 10,
@@ -421,6 +541,12 @@
     "cacheRead": 0.05,
     "cacheWrite": 0.2
   },
+  "grok-4-6": {
+    "input": 2,
+    "output": 6,
+    "cacheRead": 0.5,
+    "cacheWrite": 2
+  },
   "grok-4-fast": {
     "input": 0.2,
     "output": 0.5,
@@ -457,12 +583,19 @@
     "cacheRead": 0.028,
     "cacheWrite": 0.28
   },
+  "deepseek-v4-pro": {
+    "input": 1.32,
+    "output": 3.96,
+    "cacheRead": 0.044,
+    "cacheWrite": 1.32
+  },
   "claude-opus-4-5-20251101": {
     "input": 5,
     "output": 25,
     "cacheRead": 0.5,
     "cacheWrite": 6.25,
-    "cacheWrite1h": 10.0
+    "cacheWrite1h": 10.0,
+    "bedrockRegionalMultiplier": 1.1
   },
   "claude-3-5-haiku-latest": {
     "input": 0.8,
@@ -497,7 +630,8 @@
     "output": 15,
     "cacheRead": 0.3,
     "cacheWrite": 3.75,
-    "cacheWrite1h": 6.0
+    "cacheWrite1h": 6.0,
+    "bedrockRegionalMultiplier": 1.1
   },
   "claude-3-5-haiku-20241022": {
     "input": 0.8,
@@ -539,7 +673,8 @@
     "output": 5,
     "cacheRead": 0.1,
     "cacheWrite": 1.25,
-    "cacheWrite1h": 2.0
+    "cacheWrite1h": 2.0,
+    "bedrockRegionalMultiplier": 1.1
   },
   "claude-3-opus-20240229": {
     "input": 15,
@@ -700,6 +835,12 @@
     "cacheRead": 0,
     "cacheWrite": 0
   },
+  "gemini-3-1-flash-image": {
+    "input": 0.5,
+    "output": 60,
+    "cacheRead": 0,
+    "cacheWrite": 0
+  },
   "gemini-3-1-flash-lite-preview": {
     "input": 0.5,
     "output": 3,
@@ -988,6 +1129,26 @@
     "cacheRead": 0.1,
     "cacheWrite": 0
   },
+  "kimi-k3": {
+    "input": 3,
+    "output": 15,
+    "cacheRead": 0.3,
+    "cacheWrite": 3,
+    "cacheWrite1h": 6
+  },
+  "k3": {
+    "input": 3,
+    "output": 15,
+    "cacheRead": 0.3,
+    "cacheWrite": 3,
+    "cacheWrite1h": 6
+  },
+  "kimi-k2-6": {
+    "input": 0.95,
+    "output": 4,
+    "cacheRead": 0.16,
+    "cacheWrite": 0.95
+  },
   "kimi-k2-5": {
     "input": 0.6,
     "output": 3,
@@ -1018,39 +1179,59 @@
     "cacheRead": 0,
     "cacheWrite": 0
   },
+  "qwen3-coder-480b-a35b-v1": {
+    "input": 0.45,
+    "output": 1.8,
+    "cacheRead": 0,
+    "cacheWrite": 0
+  },
+  "qwen3-coder-30b-a3b-v1": {
+    "input": 0.15,
+    "output": 0.6,
+    "cacheRead": 0,
+    "cacheWrite": 0
+  },
   "claude-opus-4-7": {
     "input": 5,
     "output": 25,
     "cacheRead": 0.5,
     "cacheWrite": 6.25,
-    "cacheWrite1h": 10.0
+    "cacheWrite1h": 10.0,
+    "bedrockRegionalMultiplier": 1.1
   },
   "claude-opus-4-8": {
     "input": 5,
     "output": 25,
     "cacheRead": 0.5,
     "cacheWrite": 6.25,
-    "cacheWrite1h": 10.0
+    "cacheWrite1h": 10.0,
+    "bedrockRegionalMultiplier": 1.1
   },
   "claude-sonnet-4-7": {
     "input": 3,
     "output": 15,
     "cacheRead": 0.3,
     "cacheWrite": 3.75,
-    "cacheWrite1h": 6.0
+    "cacheWrite1h": 6.0,
+    "bedrockRegionalMultiplier": 1.1,
+    "estimated": true
   },
   "claude-sonnet-4-8": {
     "input": 3,
     "output": 15,
     "cacheRead": 0.3,
     "cacheWrite": 3.75,
-    "cacheWrite1h": 6.0
+    "cacheWrite1h": 6.0,
+    "bedrockRegionalMultiplier": 1.1,
+    "estimated": true
   },
   "claude-haiku-4-6": {
     "input": 1,
     "output": 5,
     "cacheRead": 0.1,
     "cacheWrite": 1.25,
-    "cacheWrite1h": 2.0
+    "cacheWrite1h": 2.0,
+    "bedrockRegionalMultiplier": 1.1,
+    "estimated": true
   }
 }