@codemieai/code 0.15.2 → 0.15.4

package/dist/utils/model-normalizer.js

@@ -2,12 +2,23 @@
  * Model name normalization utilities
  * Handles various provider formats (AWS Bedrock, standard names, etc.)
  */
+/**
+ * Vendor path prefixes some proxies/wire logs prepend ahead of the bare model id — `openai.`
+ * (dot form) or `openai/` (slash form), the slash-only `azure/`, `vertex_ai/` and `anthropic/`,
+ * and the dot-only `moonshotai.` (e.g. `moonshotai.kimi-k2.5`) and `qwen.` (e.g.
+ * `qwen.qwen3-coder-480b-a35b-v1`). Matched case-insensitively and stripped in
+ * {@link normalizeModelName}, before {@link canonicalizeModelId}'s later dots-to-dashes pass runs
+ * — stripping here first is what keeps `moonshotai.kimi-k2.5` resolving to `kimi-k2-5` rather than
+ * `moonshotai-kimi-k2-5`.
+ */
+const VENDOR_PREFIX_PATTERN = /^(?:openai[./]|azure\/|vertex_ai\/|anthropic\/|moonshotai\.|qwen\.)/i;
 /**
  * Normalize LLM model names from different provider formats
  *
  * Handles various model name formats:
  * - AWS Bedrock Converse: converse/region.provider.model-v1:0 -> model
  * - AWS Bedrock Direct: region.provider.model-v1:0 -> model
+ * - Switchyard Bedrock alias: bedrock/region.provider.model -> model (no version suffix)
  * - Kimi Code: kimi-code/kimi-for-coding -> kimi-for-coding
  * - Standard Claude: claude-sonnet-4-5-20250929 (unchanged)
  * - OpenAI: gpt-4-turbo (unchanged)
@@ -16,29 +27,29 @@
  * Examples:
  *   converse/global.anthropic.claude-haiku-4-5-20251001-v1:0 -> claude-haiku-4-5-20251001
  *   eu.anthropic.claude-haiku-4-5-20251001-v1:0 -> claude-haiku-4-5-20251001
+ *   bedrock/us.anthropic.claude-sonnet-5 -> claude-sonnet-5
+ *   bedrock/converse/us.anthropic.claude-haiku-4-5-20251001-v1:0 -> claude-haiku-4-5-20251001
  *   kimi-code/kimi-for-coding -> kimi-for-coding
+ *   openai.gpt-4o -> gpt-4o
+ *   azure/gpt-4o -> gpt-4o
+ *   vertex_ai/gemini-3-pro -> gemini-3-pro
  *   claude-sonnet-4-5-20250929 -> claude-sonnet-4-5-20250929
  */
 export function normalizeModelName(modelName) {
-    // Extract model from AWS Bedrock converse format
-    // Format: converse/region.provider.model-v1:0
-    // Example: converse/global.anthropic.claude-haiku-4-5-20251001-v1:0
-    if (modelName.startsWith('converse/')) {
-        const match = modelName.match(/anthropic\.(claude-[a-z0-9-]+)-v\d+:/);
-        if (match) {
-            return match[1]; // Returns: claude-haiku-4-5-20251001
-        }
-    }
-    // Extract model from AWS Bedrock direct format (without converse/ prefix)
-    // Format: region.provider.model-v1:0
-    // Examples:
-    // - eu.anthropic.claude-haiku-4-5-20251001-v1:0
-    // - us-east-1.anthropic.claude-opus-4-20250514-v1:0
-    if (modelName.includes('.anthropic.')) {
-        const match = modelName.match(/anthropic\.(claude-[a-z0-9-]+)-v\d+:/);
-        if (match) {
-            return match[1];
-        }
+    // Extract model from an AWS Bedrock id, with or without a `converse/`/`bedrock/` path
+    // prefix — including both stacked together as `bedrock/converse/` (observed on real usage
+    // data) — and with or without AWS's own `-v1:0` inference-profile version suffix. The
+    // suffix is optional because Switchyard's own Bedrock aliases (e.g.
+    // `bedrock/us.anthropic.claude-sonnet-5`, seen on a "capable"-tier routed turn) carry no
+    // version at all, unlike a native AWS SDK Bedrock id.
+    // Formats:
+    // - converse/region.provider.model-v1:0
+    // - region.provider.model-v1:0
+    // - bedrock/region.provider.model
+    // - bedrock/converse/region.provider.model-v1:0
+    const bedrockMatch = modelName.match(/^(?:bedrock\/)?(?:converse\/)?[a-z0-9-]+\.anthropic\.(claude-[a-z0-9-]+?)(?:-v\d+:\d+)?$/);
+    if (bedrockMatch) {
+        return bedrockMatch[1]; // Returns: claude-haiku-4-5-20251001
     }
     // Strip Kimi Code vendor prefix so wire-log model aliases resolve to the pricing table.
     // Kimi emits aliases like "kimi-code/kimi-for-coding"; the canonical pricing key is
@@ -46,6 +57,13 @@ export function normalizeModelName(modelName) {
     if (modelName.startsWith('kimi-code/')) {
         return modelName.slice('kimi-code/'.length);
     }
+    // Strip vendor path/proxy prefixes some gateways prepend ahead of the bare model id, so
+    // e.g. "openai.gpt-4o" and "azure/gpt-4o" both resolve to the same pricing-table key as a
+    // direct "gpt-4o" id.
+    const vendorPrefixMatch = modelName.match(VENDOR_PREFIX_PATTERN);
+    if (vendorPrefixMatch) {
+        return modelName.slice(vendorPrefixMatch[0].length);
+    }
     // Return unchanged for standard formats
     return modelName;
 }

package/dist/utils/model-normalizer.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-normalizer.js","sourceRoot":"","sources":["../../src/utils/model-normalizer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,kBAAkB,CAAC,SAAiB;IAClD,iDAAiD;IACjD,8CAA8C;IAC9C,oEAAoE;IACpE,IAAI,SAAS,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QACtC,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACtE,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,qCAAqC;QACxD,CAAC;IACH,CAAC;IAED,0EAA0E;IAC1E,qCAAqC;IACrC,YAAY;IACZ,gDAAgD;IAChD,oDAAoD;IACpD,IAAI,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACtC,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACtE,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;IAED,wFAAwF;IACxF,oFAAoF;IACpF,qBAAqB;IACrB,IAAI,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACvC,OAAO,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,wCAAwC;IACxC,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"model-normalizer.js","sourceRoot":"","sources":["../../src/utils/model-normalizer.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;;;;;;GAQG;AACH,MAAM,qBAAqB,GAAG,sEAAsE,CAAC;AAErG;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,kBAAkB,CAAC,SAAiB;IAClD,sFAAsF;IACtF,0FAA0F;IAC1F,sFAAsF;IACtF,oEAAoE;IACpE,yFAAyF;IACzF,sDAAsD;IACtD,WAAW;IACX,wCAAwC;IACxC,+BAA+B;IAC/B,kCAAkC;IAClC,gDAAgD;IAChD,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,0FAA0F,CAAC,CAAC;IACjI,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,qCAAqC;IAC/D,CAAC;IAED,wFAAwF;IACxF,oFAAoF;IACpF,qBAAqB;IACrB,IAAI,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;QACvC,OAAO,SAAS,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED,wFAAwF;IACxF,0FAA0F;IAC1F,sBAAsB;IACtB,MAAM,iBAAiB,GAAG,SAAS,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;IACjE,IAAI,iBAAiB,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;IACtD,CAAC;IAED,wCAAwC;IACxC,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/utils/paths.d.ts

@@ -248,7 +248,7 @@ export declare function getCodemieHome(): string;
 export declare function getCodemiePath(...paths: string[]): string;
 /**
  * Extract parent/repo format from a working directory path.
- * Returns 'Claude Desktop' for sandbox paths used by Claude Desktop sessions.
+ * Returns 'Cowork' for sandbox paths used by Claude Desktop sessions (Cowork tab / new task without a folder).
  *
  * @example
  * extractRepository('/Users/john/projects/codemie-code')
@@ -256,7 +256,7 @@ export declare function getCodemiePath(...paths: string[]): string;
  *
  * @example
  * extractRepository('/Users/john/Library/Application Support/Claude-3p/local-agent-mode-sessions/<s>/<u>/local_2d5f3a0f-6a50-4778-ac55-9ffbca0446da/outputs')
- * // Returns: 'Claude Desktop'
+ * // Returns: 'Cowork'
  */
 export declare function extractRepository(workingDirectory: string): string;
 /**

package/dist/utils/paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/utils/paths.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAWH;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEhE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAGpD;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGpD;AAcD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,GAAE,MAAmB,GAAG,MAAM,CAGjF;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EAAE,GAC1B,OAAO,CAiBT;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,GACpB,OAAO,CAUT;AAMD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAIvF;AAaD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAMhF;AAMD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAE3D;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAMvC;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAEzD;AASD;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAalE;AAMD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAExD"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/utils/paths.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAWH;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEhE;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAGpD;AAED;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGpD;AAcD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,sBAAsB,CAAC,aAAa,GAAE,MAAmB,GAAG,MAAM,CAGjF;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,MAAM,EAAE,GAC1B,OAAO,CAiBT;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,GACpB,OAAO,CAUT;AAMD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAIvF;AAaD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEhD;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAMhF;AAMD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAE3D;AAMD;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAMvC;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAEzD;AAYD;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,gBAAgB,EAAE,MAAM,GAAG,MAAM,CAalE;AAMD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAExD"}

package/dist/utils/paths.js

@@ -339,15 +339,17 @@ export function getCodemieHome() {
 export function getCodemiePath(...paths) {
     return path.join(getCodemieHome(), ...paths);
 }
-// Matches Claude Desktop sandbox session directories.
-// Real path format observed in logs:
-//   .../local-agent-mode-sessions/<session-uuid>/<uuid>/local_<full-uuid>/outputs
-// The local_ segment always contains a full UUID (8-4-4-4-12 hex groups with dashes).
-// Matching the full UUID format avoids false positives on user directories named local_<8hex>.
-const CLAUDE_DESKTOP_SANDBOX_RE = /\/local_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}(?:\/|$)/i;
+// Matches Claude Desktop sandbox session directories, which carry no user project.
+// Two shapes are recognised:
+//   1. Anything under the sandbox root `local-agent-mode-sessions/`. Desktop has renamed the
+//      per-session directory inside it (`local_<full-uuid>/` -> `<short-id>/`), so anchoring on
+//      the root keeps this stable across further renames.
+//   2. A legacy `local_<full-uuid>` directory anywhere, for paths recorded without that root.
+//      The full UUID shape avoids false positives on user directories named `local_<8hex>`.
+const CLAUDE_DESKTOP_SANDBOX_RE = /\/local-agent-mode-sessions\/|\/local_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}(?:\/|$)/i;
 /**
  * Extract parent/repo format from a working directory path.
- * Returns 'Claude Desktop' for sandbox paths used by Claude Desktop sessions.
+ * Returns 'Cowork' for sandbox paths used by Claude Desktop sessions (Cowork tab / new task without a folder).
  *
  * @example
  * extractRepository('/Users/john/projects/codemie-code')
@@ -355,11 +357,11 @@ const CLAUDE_DESKTOP_SANDBOX_RE = /\/local_[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[
  *
  * @example
  * extractRepository('/Users/john/Library/Application Support/Claude-3p/local-agent-mode-sessions/<s>/<u>/local_2d5f3a0f-6a50-4778-ac55-9ffbca0446da/outputs')
- * // Returns: 'Claude Desktop'
+ * // Returns: 'Cowork'
  */
 export function extractRepository(workingDirectory) {
     if (CLAUDE_DESKTOP_SANDBOX_RE.test(normalizePathSeparators(workingDirectory))) {
-        return 'Claude Desktop';
+        return 'Cowork';
     }
     const parts = splitPath(workingDirectory);
     const filtered = parts.filter(p => p.length > 0);

package/dist/utils/paths.js.map

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

package/dist/utils/price-resolution.d.ts

@@ -0,0 +1,42 @@
+/**
+ * Model-id → pricing-table-key resolution, shared by every consumer that prices a model id:
+ * src/utils/pricing.ts (the analytics report's resolvePrice()) and the standalone Claude
+ * statusline (src/agents/plugins/claude/plugin/statusline.ts, bundled into one self-contained file
+ * by scripts/bundle-statusline.mjs). Keeping one copy is what stops the live statusline cost and
+ * the analytics report from disagreeing on the same transcript.
+ *
+ * Deliberately free of I/O and of any import beyond model-normalizer.ts (itself dependency-free),
+ * so the statusline bundle stays small and never drags in fs/config/keytar-bearing modules. It
+ * knows nothing about the shape of a price row — callers pass a key lookup over their own table.
+ */
+/** How an observed model id was matched to a table key. */
+export type PriceMatch = 'exact' | 'snapshot' | 'reordered';
+/** A table key an observed id resolved to, the value found under it, and how it matched. */
+export interface PriceKeyHit<T> {
+    key: string;
+    match: PriceMatch;
+    value: T;
+}
+/**
+ * The table-key form of a raw pricing-data key: lowercased, dots turned to dashes, so `GLM-4.7`
+ * and `glm-4-7` land on the same entry. Both sides of a lookup must be folded the same way —
+ * observed ids go through {@link canonicalizeModelId}, which ends in this same folding.
+ */
+export declare function priceTableKey(rawKey: string): string;
+/**
+ * Canonicalizes an observed model id into the form used as a pricing-table key. Extends
+ * {@link normalizeModelName} (which strips Bedrock/Kimi/vendor-path prefixes) with:
+ *   1. Lowercasing, dots turned to dashes, and `@` turned to `-` (so Vertex's `claude-x@20260205`
+ *      folds to the same shape as a dated id).
+ *   2. Stripping a trailing `-vertex` suffix.
+ * Used by the pricing resolver, the statusline and cost reconciliation, so every consumer treats
+ * the same observed id the same way.
+ */
+export declare function canonicalizeModelId(model: string): string;
+/**
+ * Resolves an observed model id against a pricing table through `lookup`, trying the keys of
+ * {@link priceKeyCandidates} in order and returning the first hit. Returns null when nothing
+ * matches — the model is unpriced, never a guessed price.
+ */
+export declare function resolvePriceKey<T>(model: string, lookup: (key: string) => T | undefined): PriceKeyHit<T> | null;
+//# sourceMappingURL=price-resolution.d.ts.map

package/dist/utils/price-resolution.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"price-resolution.d.ts","sourceRoot":"","sources":["../../src/utils/price-resolution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAsBH,2DAA2D;AAC3D,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,UAAU,GAAG,WAAW,CAAC;AAE5D,4FAA4F;AAC5F,MAAM,WAAW,WAAW,CAAC,CAAC;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,UAAU,CAAC;IAClB,KAAK,EAAE,CAAC,CAAC;CACV;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED;;;;;;;;GAQG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIzD;AAoDD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,CAAC,GAAG,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,IAAI,CAQ/G"}

package/dist/utils/price-resolution.js

@@ -0,0 +1,112 @@
+/**
+ * Model-id → pricing-table-key resolution, shared by every consumer that prices a model id:
+ * src/utils/pricing.ts (the analytics report's resolvePrice()) and the standalone Claude
+ * statusline (src/agents/plugins/claude/plugin/statusline.ts, bundled into one self-contained file
+ * by scripts/bundle-statusline.mjs). Keeping one copy is what stops the live statusline cost and
+ * the analytics report from disagreeing on the same transcript.
+ *
+ * Deliberately free of I/O and of any import beyond model-normalizer.ts (itself dependency-free),
+ * so the statusline bundle stays small and never drags in fs/config/keytar-bearing modules. It
+ * knows nothing about the shape of a price row — callers pass a key lookup over their own table.
+ */
+import { normalizeModelName } from './model-normalizer.js';
+/**
+ * A trailing snapshot/version suffix stripped once during lookup (never during canonicalization):
+ * an 8-digit date (`-20260205`), a dashed date (`-2026-02-05`), or the `-latest`/`-preview` tags.
+ * Applied at most once, so a key that is itself dated (`gpt-4o-2024-05-13`) is tried as an exact
+ * match first and never has a second suffix stripped from it.
+ */
+const SNAPSHOT_SUFFIX_PATTERN = /-(?:\d{8}|\d{4}-\d{2}-\d{2}|latest|preview)$/;
+/**
+ * Matches a Claude id given in version-first order — `claude-<ver>-<family>[<rest>]`, where `ver`
+ * is one or more dash-separated numeric segments and `family` is `opus`/`sonnet`/`haiku` — so it
+ * can be reordered to the family-first form (`claude-<family>-<ver>[<rest>]`) the pricing table
+ * keys newer Claude generations under (e.g. `claude-sonnet-4-5`, `claude-opus-4-8`; see
+ * pricing.json's own rows). Never applied to a key that is already family-first, since that
+ * doesn't match this pattern in the first place.
+ */
+const CLAUDE_VERSION_FIRST_PATTERN = /^claude-(\d+(?:-\d+)*)-(opus|sonnet|haiku)(-.+)?$/;
+/**
+ * The table-key form of a raw pricing-data key: lowercased, dots turned to dashes, so `GLM-4.7`
+ * and `glm-4-7` land on the same entry. Both sides of a lookup must be folded the same way —
+ * observed ids go through {@link canonicalizeModelId}, which ends in this same folding.
+ */
+export function priceTableKey(rawKey) {
+    return rawKey.toLowerCase().replace(/\./g, '-');
+}
+/**
+ * Canonicalizes an observed model id into the form used as a pricing-table key. Extends
+ * {@link normalizeModelName} (which strips Bedrock/Kimi/vendor-path prefixes) with:
+ *   1. Lowercasing, dots turned to dashes, and `@` turned to `-` (so Vertex's `claude-x@20260205`
+ *      folds to the same shape as a dated id).
+ *   2. Stripping a trailing `-vertex` suffix.
+ * Used by the pricing resolver, the statusline and cost reconciliation, so every consumer treats
+ * the same observed id the same way.
+ */
+export function canonicalizeModelId(model) {
+    return priceTableKey(normalizeModelName(model))
+        .replace(/@/g, '-')
+        .replace(/-vertex$/, '');
+}
+/**
+ * Reorders a version-first Claude id (`claude-4-5-sonnet`) to the family-first form
+ * (`claude-sonnet-4-5`) the table keys such rows under, preserving any trailing suffix (a
+ * snapshot date, `-latest`, ...). Returns null when `id` isn't in that shape.
+ */
+function reorderClaudeVersionFamily(id) {
+    const match = id.match(CLAUDE_VERSION_FIRST_PATTERN);
+    if (!match) {
+        return null;
+    }
+    const [, version, family, rest = ''] = match;
+    return `claude-${family}-${version}${rest}`;
+}
+/** `key` with one trailing snapshot suffix stripped, or null when it carries none. */
+function withoutSnapshot(key) {
+    const stripped = key.replace(SNAPSHOT_SUFFIX_PATTERN, '');
+    return stripped === key ? null : stripped;
+}
+/**
+ * The ordered table keys tried for an observed id, against its {@link canonicalizeModelId} form:
+ *   1. Exact match — keeps distinct dated rows (e.g. `gpt-4o-2024-05-13`) authoritative.
+ *   2. Exact match after stripping one trailing snapshot suffix — e.g. `claude-opus-4-6-20260205`
+ *      resolves to the `claude-opus-4-6` row.
+ *   3. A version-first Claude id (`claude-4-5-sonnet`) reordered to the table's family-first form
+ *      (`claude-sonnet-4-5`), tried exact and then with a trailing snapshot suffix stripped — only
+ *      once steps 1-2 have already failed on the as-is id. That ordering is what keeps every
+ *      pre-existing version-first key (`claude-3-5-sonnet`, `claude-3-7-sonnet-20250219`, ...)
+ *      resolving unchanged: those rows match as-is at step 1 and this fallback is never reached.
+ * There is no segment/family match and no same-tier fallback.
+ */
+function priceKeyCandidates(model) {
+    const canonical = canonicalizeModelId(model);
+    const candidates = [{ key: canonical, match: 'exact' }];
+    const snapshot = withoutSnapshot(canonical);
+    if (snapshot) {
+        candidates.push({ key: snapshot, match: 'snapshot' });
+    }
+    const reordered = reorderClaudeVersionFamily(canonical);
+    if (reordered) {
+        candidates.push({ key: reordered, match: 'reordered' });
+        const reorderedSnapshot = withoutSnapshot(reordered);
+        if (reorderedSnapshot) {
+            candidates.push({ key: reorderedSnapshot, match: 'reordered' });
+        }
+    }
+    return candidates;
+}
+/**
+ * Resolves an observed model id against a pricing table through `lookup`, trying the keys of
+ * {@link priceKeyCandidates} in order and returning the first hit. Returns null when nothing
+ * matches — the model is unpriced, never a guessed price.
+ */
+export function resolvePriceKey(model, lookup) {
+    for (const { key, match } of priceKeyCandidates(model)) {
+        const value = key ? lookup(key) : undefined;
+        if (value !== undefined) {
+            return { key, match, value };
+        }
+    }
+    return null;
+}
+//# sourceMappingURL=price-resolution.js.map

package/dist/utils/price-resolution.js.map

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

package/dist/utils/pricing.d.ts

@@ -5,6 +5,8 @@
  * re-copy that file. Prices are USD per 1,000,000 tokens. The source uses
  * `cacheWrite`; we expose it as `cacheCreation` to match Claude's terminology.
  */
+import { type PriceMatch } from './price-resolution.js';
+export { canonicalizeModelId } from './price-resolution.js';
 /** USD per 1,000,000 tokens. */
 export interface ModelPrice {
     input: number;
@@ -12,14 +14,71 @@ export interface ModelPrice {
     cacheRead: number;
     cacheCreation: number;
     cacheWrite1h?: number;
+    /**
+     * Amazon Bedrock's premium for a regional/multi-region endpoint over this model's global one
+     * — present only on rows where Anthropic documents the two-endpoint-type Bedrock pricing
+     * structure (Sonnet 4.5+, Haiku 4.5+, Opus 4.5+ and their dated snapshots). Absent (no premium)
+     * on every older row, since Anthropic does not document this structure applying there. See
+     * isBedrockRegionalPremium()'s own doc comment (bedrock-pricing.mjs) for the source.
+     */
+    bedrockRegionalMultiplier?: number;
+    /**
+     * True when this row is not a directly published rate but an estimate (e.g. a tier-price
+     * carried forward for a model generation with no confirmed pricing yet). Every row's
+     * provenance should be cited in `pricing.json`'s `_meta.sources`/`note`; this flag is what
+     * callers use to surface "estimated" alongside the resolved price rather than presenting it
+     * as authoritative.
+     */
+    estimated?: boolean;
 }
+export interface RawPrice {
+    input?: number;
+    output?: number;
+    cacheRead?: number;
+    cacheWrite?: number;
+    cacheWrite1h?: number;
+    bedrockRegionalMultiplier?: number;
+    estimated?: boolean;
+}
+/**
+ * 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.
+ */
+export declare function buildPriceTable(rows: Record<string, RawPrice>): Record<string, ModelPrice>;
+/**
+ * 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 declare function priceTable(): Record<string, ModelPrice>;
+/** How {@link resolvePrice} matched an observed model id to a table row. */
+export interface PriceResolution {
+    price: ModelPrice;
+    key: string;
+    match: PriceMatch;
+    estimated: boolean;
+}
+/**
+ * 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.
+ */
+export declare function resolvePrice(model: string): PriceResolution | null;
 /**
- * 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 declare function lookupPrice(model: string): ModelPrice | null;
 //# sourceMappingURL=pricing.d.ts.map

package/dist/utils/pricing.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pricing.d.ts","sourceRoot":"","sources":["../../src/utils/pricing.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAQH,gCAAgC;AAChC,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AA0HD;;;;;;;GAOG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CA2B5D"}
+{"version":3,"file":"pricing.d.ts","sourceRoot":"","sources":["../../src/utils/pricing.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAExF,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,gCAAgC;AAChC,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;;;;;OAMG;IACH,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,QAAQ;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AA4CD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAiB1F;AAWD;;;;;GAKG;AACH,wBAAgB,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAEvD;AAED,4EAA4E;AAC5E,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,UAAU,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,UAAU,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAYlE;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAE5D"}