npm - @pydantic/genai-prices - Versions diffs - 0.0.21 → 0.0.22 - Mend

@pydantic/genai-prices 0.0.21 → 0.0.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/cli.js CHANGED Viewed

@@ -1,66 +1,66 @@
 #!/usr/bin/env node
 import de from "yargs";
 import { format as he } from "util";
-import { resolve as ie, normalize as Ie } from "path";
+import { resolve as ae, normalize as Ie } from "path";
 import { readFileSync as ke, writeFile as Le, statSync as Pe } from "fs";
 import "assert";
-import { fileURLToPath as Ge } from "url";
+import { fileURLToPath as Te } from "url";
 function Ae() {
-  return Te() ? 0 : 1;
-}
-function Te() {
-  return Se() && !process.defaultApp;
+  return Se() ? 0 : 1;
 }
 function Se() {
+  return Ge() && !process.defaultApp;
+}
+function Ge() {
   return !!process.versions.electron;
 }
-function Ce(a) {
-  return a.slice(Ae() + 1);
+function Ce(i) {
+  return i.slice(Ae() + 1);
 }
 /**
  * @license
  * Copyright (c) 2016, Contributors
  * SPDX-License-Identifier: ISC
  */
-function W(a) {
-  if (a !== a.toLowerCase() && a !== a.toUpperCase() || (a = a.toLowerCase()), a.indexOf("-") === -1 && a.indexOf("_") === -1)
-    return a;
+function W(i) {
+  if (i !== i.toLowerCase() && i !== i.toUpperCase() || (i = i.toLowerCase()), i.indexOf("-") === -1 && i.indexOf("_") === -1)
+    return i;
   {
     let m = "", s = !1;
-    const u = a.match(/^-+/);
-    for (let _ = u ? u[0].length : 0; _ < a.length; _++) {
-      let k = a.charAt(_);
+    const u = i.match(/^-+/);
+    for (let _ = u ? u[0].length : 0; _ < i.length; _++) {
+      let k = i.charAt(_);
       s && (s = !1, k = k.toUpperCase()), _ !== 0 && (k === "-" || k === "_") ? s = !0 : k !== "-" && k !== "_" && (m += k);
     }
     return m;
   }
 }
-function Oe(a, n) {
-  const m = a.toLowerCase();
+function Oe(i, n) {
+  const m = i.toLowerCase();
   n = n || "-";
   let s = "";
-  for (let u = 0; u < a.length; u++) {
-    const _ = m.charAt(u), k = a.charAt(u);
+  for (let u = 0; u < i.length; u++) {
+    const _ = m.charAt(u), k = i.charAt(u);
     _ !== k && u > 0 ? s += `${n}${m.charAt(u)}` : s += k;
   }
   return s;
 }
-function Re(a) {
-  return a == null ? !1 : typeof a == "number" || /^0x[0-9a-f]+$/i.test(a) ? !0 : /^0[^.]/.test(a) ? !1 : /^[-]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(a);
+function Re(i) {
+  return i == null ? !1 : typeof i == "number" || /^0x[0-9a-f]+$/i.test(i) ? !0 : /^0[^.]/.test(i) ? !1 : /^[-]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(i);
 }
 /**
  * @license
  * Copyright (c) 2016, Contributors
  * SPDX-License-Identifier: ISC
  */
-function Ne(a) {
-  if (Array.isArray(a))
-    return a.map((k) => typeof k != "string" ? k + "" : k);
-  a = a.trim();
+function Ne(i) {
+  if (Array.isArray(i))
+    return i.map((k) => typeof k != "string" ? k + "" : k);
+  i = i.trim();
   let n = 0, m = null, s = null, u = null;
   const _ = [];
-  for (let k = 0; k < a.length; k++) {
-    if (m = s, s = a.charAt(k), s === " " && !u) {
+  for (let k = 0; k < i.length; k++) {
+    if (m = s, s = i.charAt(k), s === " " && !u) {
       m !== " " && n++;
       continue;
     }
@@ -74,8 +74,8 @@ function Ne(a) {
  * SPDX-License-Identifier: ISC
  */
 var M;
-(function(a) {
-  a.BOOLEAN = "boolean", a.STRING = "string", a.NUMBER = "number", a.ARRAY = "array";
+(function(i) {
+  i.BOOLEAN = "boolean", i.STRING = "string", i.NUMBER = "number", i.ARRAY = "array";
 })(M || (M = {}));
 /**
  * @license
@@ -124,7 +124,7 @@ class Ee {
       "strip-aliased": !1,
       "strip-dashed": !1,
       "unknown-options-as-args": !1
-    }, s.configuration), f = Object.assign(/* @__PURE__ */ Object.create(null), s.default), G = s.configObjects || [], C = s.envPrefix, j = h["populate--"], O = j ? "--" : "_", Q = /* @__PURE__ */ Object.create(null), oe = /* @__PURE__ */ Object.create(null), A = s.__ || P.format, r = {
+    }, s.configuration), f = Object.assign(/* @__PURE__ */ Object.create(null), s.default), T = s.configObjects || [], C = s.envPrefix, j = h["populate--"], O = j ? "--" : "_", Q = /* @__PURE__ */ Object.create(null), oe = /* @__PURE__ */ Object.create(null), A = s.__ || P.format, r = {
       aliases: /* @__PURE__ */ Object.create(null),
       arrays: /* @__PURE__ */ Object.create(null),
       bools: /* @__PURE__ */ Object.create(null),
@@ -138,14 +138,14 @@ class Ee {
       keys: []
     }, I = /^-([0-9]+(\.[0-9]+)?|\.[0-9]+)$/, U = new RegExp("^--" + h["negation-prefix"] + "(.+)");
     [].concat(s.array || []).filter(Boolean).forEach(function(e) {
-      const i = typeof e == "object" ? e.key : e, l = Object.keys(e).map(function(o) {
+      const a = typeof e == "object" ? e.key : e, l = Object.keys(e).map(function(o) {
         return {
           boolean: "bools",
           string: "strings",
           number: "numbers"
         }[o];
       }).filter(Boolean).pop();
-      l && (r[l][i] = !0), r.arrays[i] = !0, r.keys.push(i);
+      l && (r[l][a] = !0), r.arrays[a] = !0, r.keys.push(a);
     }), [].concat(s.boolean || []).filter(Boolean).forEach(function(e) {
       r.bools[e] = !0, r.keys.push(e);
     }), [].concat(s.string || []).filter(Boolean).forEach(function(e) {
@@ -156,17 +156,17 @@ class Ee {
       r.counts[e] = !0, r.keys.push(e);
     }), [].concat(s.normalize || []).filter(Boolean).forEach(function(e) {
       r.normalize[e] = !0, r.keys.push(e);
-    }), typeof s.narg == "object" && Object.entries(s.narg).forEach(([e, i]) => {
-      typeof i == "number" && (r.nargs[e] = i, r.keys.push(e));
-    }), typeof s.coerce == "object" && Object.entries(s.coerce).forEach(([e, i]) => {
-      typeof i == "function" && (r.coercions[e] = i, r.keys.push(e));
+    }), typeof s.narg == "object" && Object.entries(s.narg).forEach(([e, a]) => {
+      typeof a == "number" && (r.nargs[e] = a, r.keys.push(e));
+    }), typeof s.coerce == "object" && Object.entries(s.coerce).forEach(([e, a]) => {
+      typeof a == "function" && (r.coercions[e] = a, r.keys.push(e));
     }), typeof s.config < "u" && (Array.isArray(s.config) || typeof s.config == "string" ? [].concat(s.config).filter(Boolean).forEach(function(e) {
       r.configs[e] = !0;
-    }) : typeof s.config == "object" && Object.entries(s.config).forEach(([e, i]) => {
-      (typeof i == "boolean" || typeof i == "function") && (r.configs[e] = i);
+    }) : typeof s.config == "object" && Object.entries(s.config).forEach(([e, a]) => {
+      (typeof a == "boolean" || typeof a == "function") && (r.configs[e] = a);
     })), qe(s.key, k, s.default, r.arrays), Object.keys(f).forEach(function(e) {
-      (r.aliases[e] || []).forEach(function(i) {
-        f[i] = f[e];
+      (r.aliases[e] || []).forEach(function(a) {
+        f[a] = f[e];
       });
     });
     let y = null;
@@ -174,28 +174,28 @@ class Ee {
     let F = [];
     const w = Object.assign(/* @__PURE__ */ Object.create(null), { _: [] }), ne = {};
     for (let e = 0; e < u.length; e++) {
-      const i = u[e], l = i.replace(/^-{3,}/, "---");
+      const a = u[e], l = a.replace(/^-{3,}/, "---");
       let o, t, p, c, d, v;
-      if (i !== "--" && /^-/.test(i) && H(i))
-        K(i);
+      if (a !== "--" && /^-/.test(a) && H(a))
+        K(a);
       else if (l.match(/^---+(=|$)/)) {
-        K(i);
+        K(a);
         continue;
-      } else if (i.match(/^--.+=/) || !h["short-option-groups"] && i.match(/^-.+=/))
-        c = i.match(/^--?([^=]+)=([\s\S]*)$/), c !== null && Array.isArray(c) && c.length >= 3 && (g(c[1], r.arrays) ? e = V(e, c[1], u, c[2]) : g(c[1], r.nargs) !== !1 ? e = D(e, c[1], u, c[2]) : q(c[1], c[2], !0));
-      else if (i.match(U) && h["boolean-negation"])
-        c = i.match(U), c !== null && Array.isArray(c) && c.length >= 2 && (t = c[1], q(t, g(t, r.arrays) ? [!1] : !1));
-      else if (i.match(/^--.+/) || !h["short-option-groups"] && i.match(/^-[^-]+/))
-        c = i.match(/^--?(.+)/), c !== null && Array.isArray(c) && c.length >= 2 && (t = c[1], g(t, r.arrays) ? e = V(e, t, u) : g(t, r.nargs) !== !1 ? e = D(e, t, u) : (d = u[e + 1], d !== void 0 && (!d.match(/^-/) || d.match(I)) && !g(t, r.bools) && !g(t, r.counts) || /^(true|false)$/.test(d) ? (q(t, d), e++) : q(t, S(t))));
-      else if (i.match(/^-.\..+=/))
-        c = i.match(/^-([^=]+)=([\s\S]*)$/), c !== null && Array.isArray(c) && c.length >= 3 && q(c[1], c[2]);
-      else if (i.match(/^-.\..+/) && !i.match(I))
-        d = u[e + 1], c = i.match(/^-(.\..+)/), c !== null && Array.isArray(c) && c.length >= 2 && (t = c[1], d !== void 0 && !d.match(/^-/) && !g(t, r.bools) && !g(t, r.counts) ? (q(t, d), e++) : q(t, S(t)));
-      else if (i.match(/^-[^-]+/) && !i.match(I)) {
-        p = i.slice(1, -1).split(""), o = !1;
+      } else if (a.match(/^--.+=/) || !h["short-option-groups"] && a.match(/^-.+=/))
+        c = a.match(/^--?([^=]+)=([\s\S]*)$/), c !== null && Array.isArray(c) && c.length >= 3 && (g(c[1], r.arrays) ? e = V(e, c[1], u, c[2]) : g(c[1], r.nargs) !== !1 ? e = D(e, c[1], u, c[2]) : q(c[1], c[2], !0));
+      else if (a.match(U) && h["boolean-negation"])
+        c = a.match(U), c !== null && Array.isArray(c) && c.length >= 2 && (t = c[1], q(t, g(t, r.arrays) ? [!1] : !1));
+      else if (a.match(/^--.+/) || !h["short-option-groups"] && a.match(/^-[^-]+/))
+        c = a.match(/^--?(.+)/), c !== null && Array.isArray(c) && c.length >= 2 && (t = c[1], g(t, r.arrays) ? e = V(e, t, u) : g(t, r.nargs) !== !1 ? e = D(e, t, u) : (d = u[e + 1], d !== void 0 && (!d.match(/^-/) || d.match(I)) && !g(t, r.bools) && !g(t, r.counts) || /^(true|false)$/.test(d) ? (q(t, d), e++) : q(t, G(t))));
+      else if (a.match(/^-.\..+=/))
+        c = a.match(/^-([^=]+)=([\s\S]*)$/), c !== null && Array.isArray(c) && c.length >= 3 && q(c[1], c[2]);
+      else if (a.match(/^-.\..+/) && !a.match(I))
+        d = u[e + 1], c = a.match(/^-(.\..+)/), c !== null && Array.isArray(c) && c.length >= 2 && (t = c[1], d !== void 0 && !d.match(/^-/) && !g(t, r.bools) && !g(t, r.counts) ? (q(t, d), e++) : q(t, G(t)));
+      else if (a.match(/^-[^-]+/) && !a.match(I)) {
+        p = a.slice(1, -1).split(""), o = !1;
         for (let x = 0; x < p.length; x++) {
-          if (d = i.slice(x + 2), p[x + 1] && p[x + 1] === "=") {
-            v = i.slice(x + 3), t = p[x], g(t, r.arrays) ? e = V(e, t, u, v) : g(t, r.nargs) !== !1 ? e = D(e, t, u, v) : q(t, v), o = !0;
+          if (d = a.slice(x + 2), p[x + 1] && p[x + 1] === "=") {
+            v = a.slice(x + 3), t = p[x], g(t, r.arrays) ? e = V(e, t, u, v) : g(t, r.nargs) !== !1 ? e = D(e, t, u, v) : q(t, v), o = !0;
             break;
           }
           if (d === "-") {
@@ -210,19 +210,19 @@ class Ee {
             q(p[x], d), o = !0;
             break;
           } else
-            q(p[x], S(p[x]));
+            q(p[x], G(p[x]));
         }
-        t = i.slice(-1)[0], !o && t !== "-" && (g(t, r.arrays) ? e = V(e, t, u) : g(t, r.nargs) !== !1 ? e = D(e, t, u) : (d = u[e + 1], d !== void 0 && (!/^(-|--)[^-]/.test(d) || d.match(I)) && !g(t, r.bools) && !g(t, r.counts) || /^(true|false)$/.test(d) ? (q(t, d), e++) : q(t, S(t))));
-      } else if (i.match(/^-[0-9]$/) && i.match(I) && g(i.slice(1), r.bools))
-        t = i.slice(1), q(t, S(t));
-      else if (i === "--") {
+        t = a.slice(-1)[0], !o && t !== "-" && (g(t, r.arrays) ? e = V(e, t, u) : g(t, r.nargs) !== !1 ? e = D(e, t, u) : (d = u[e + 1], d !== void 0 && (!/^(-|--)[^-]/.test(d) || d.match(I)) && !g(t, r.bools) && !g(t, r.counts) || /^(true|false)$/.test(d) ? (q(t, d), e++) : q(t, G(t))));
+      } else if (a.match(/^-[0-9]$/) && a.match(I) && g(a.slice(1), r.bools))
+        t = a.slice(1), q(t, G(t));
+      else if (a === "--") {
         F = u.slice(e + 1);
         break;
       } else if (h["halt-at-non-option"]) {
         F = u.slice(e);
         break;
       } else
-        K(i);
+        K(a);
     }
     re(w, !0), re(w, !1), _e(w), ge(), me(w, r.aliases, f, !0), fe(w), h["set-placeholder-key"] && be(w), Object.keys(r.counts).forEach(function(e) {
       R(w, e.split(".")) || q(e, 0);
@@ -231,54 +231,54 @@ class Ee {
     }), h["camel-case-expansion"] && h["strip-dashed"] && Object.keys(w).filter((e) => e !== "--" && e.includes("-")).forEach((e) => {
       delete w[e];
     }), h["strip-aliased"] && [].concat(...Object.keys(k).map((e) => k[e])).forEach((e) => {
-      h["camel-case-expansion"] && e.includes("-") && delete w[e.split(".").map((i) => W(i)).join(".")], delete w[e];
+      h["camel-case-expansion"] && e.includes("-") && delete w[e.split(".").map((a) => W(a)).join(".")], delete w[e];
     });
     function K(e) {
-      const i = $("_", e);
-      (typeof i == "string" || typeof i == "number") && w._.push(i);
+      const a = $("_", e);
+      (typeof a == "string" || typeof a == "number") && w._.push(a);
     }
-    function D(e, i, l, o) {
-      let t, p = g(i, r.nargs);
+    function D(e, a, l, o) {
+      let t, p = g(a, r.nargs);
       if (p = typeof p != "number" || isNaN(p) ? 1 : p, p === 0)
-        return L(o) || (y = Error(A("Argument unexpected for: %s", i))), q(i, S(i)), e;
+        return L(o) || (y = Error(A("Argument unexpected for: %s", a))), q(a, G(a)), e;
       let c = L(o) ? 0 : 1;
       if (h["nargs-eats-options"])
-        l.length - (e + 1) + c < p && (y = Error(A("Not enough arguments following: %s", i))), c = p;
+        l.length - (e + 1) + c < p && (y = Error(A("Not enough arguments following: %s", a))), c = p;
       else {
         for (t = e + 1; t < l.length && (!l[t].match(/^-[^0-9]/) || l[t].match(I) || H(l[t])); t++)
           c++;
-        c < p && (y = Error(A("Not enough arguments following: %s", i)));
+        c < p && (y = Error(A("Not enough arguments following: %s", a)));
       }
       let d = Math.min(c, p);
-      for (!L(o) && d > 0 && (q(i, o), d--), t = e + 1; t < d + e + 1; t++)
-        q(i, l[t]);
+      for (!L(o) && d > 0 && (q(a, o), d--), t = e + 1; t < d + e + 1; t++)
+        q(a, l[t]);
       return e + d;
     }
-    function V(e, i, l, o) {
+    function V(e, a, l, o) {
       let t = [], p = o || l[e + 1];
-      const c = g(i, r.nargs);
-      if (g(i, r.bools) && !/^(true|false)$/.test(p))
+      const c = g(a, r.nargs);
+      if (g(a, r.bools) && !/^(true|false)$/.test(p))
         t.push(!0);
       else if (L(p) || L(o) && /^-/.test(p) && !I.test(p) && !H(p)) {
-        if (f[i] !== void 0) {
-          const d = f[i];
+        if (f[a] !== void 0) {
+          const d = f[a];
           t = Array.isArray(d) ? d : [d];
         }
       } else {
-        L(o) || t.push(Y(i, o, !0));
+        L(o) || t.push(Y(a, o, !0));
         for (let d = e + 1; d < l.length && !(!h["greedy-arrays"] && t.length > 0 || c && typeof c == "number" && t.length >= c || (p = l[d], /^-/.test(p) && !I.test(p) && !H(p))); d++)
-          e = d, t.push(Y(i, p, _));
+          e = d, t.push(Y(a, p, _));
       }
-      return typeof c == "number" && (c && t.length < c || isNaN(c) && t.length === 0) && (y = Error(A("Not enough arguments following: %s", i))), q(i, t), e;
+      return typeof c == "number" && (c && t.length < c || isNaN(c) && t.length === 0) && (y = Error(A("Not enough arguments following: %s", a))), q(a, t), e;
     }
-    function q(e, i, l = _) {
+    function q(e, a, l = _) {
       if (/-/.test(e) && h["camel-case-expansion"]) {
         const p = e.split(".").map(function(c) {
           return W(c);
         }).join(".");
         se(e, p);
       }
-      const o = Y(e, i, l), t = e.split(".");
+      const o = Y(e, a, l), t = e.split(".");
       N(w, t, o), r.aliases[e] && r.aliases[e].forEach(function(p) {
         const c = p.split(".");
         N(w, c, o);
@@ -290,31 +290,31 @@ class Ee {
         Object.defineProperty(ne, c, {
           enumerable: !0,
           get() {
-            return i;
+            return a;
           },
           set(d) {
-            i = typeof d == "string" ? P.normalize(d) : d;
+            a = typeof d == "string" ? P.normalize(d) : d;
           }
         });
       });
     }
-    function se(e, i) {
-      r.aliases[e] && r.aliases[e].length || (r.aliases[e] = [i], Q[i] = !0), r.aliases[i] && r.aliases[i].length || se(i, e);
+    function se(e, a) {
+      r.aliases[e] && r.aliases[e].length || (r.aliases[e] = [a], Q[a] = !0), r.aliases[a] && r.aliases[a].length || se(a, e);
     }
-    function Y(e, i, l) {
-      l && (i = je(i)), (g(e, r.bools) || g(e, r.counts)) && typeof i == "string" && (i = i === "true");
-      let o = Array.isArray(i) ? i.map(function(t) {
+    function Y(e, a, l) {
+      l && (a = je(a)), (g(e, r.bools) || g(e, r.counts)) && typeof a == "string" && (a = a === "true");
+      let o = Array.isArray(a) ? a.map(function(t) {
         return $(e, t);
-      }) : $(e, i);
-      return g(e, r.counts) && (L(o) || typeof o == "boolean") && (o = Z()), g(e, r.normalize) && g(e, r.arrays) && (Array.isArray(i) ? o = i.map((t) => P.normalize(t)) : o = P.normalize(i)), o;
+      }) : $(e, a);
+      return g(e, r.counts) && (L(o) || typeof o == "boolean") && (o = Z()), g(e, r.normalize) && g(e, r.arrays) && (Array.isArray(a) ? o = a.map((t) => P.normalize(t)) : o = P.normalize(a)), o;
     }
-    function $(e, i) {
-      return !h["parse-positional-numbers"] && e === "_" || !g(e, r.strings) && !g(e, r.bools) && !Array.isArray(i) && (Re(i) && h["parse-numbers"] && Number.isSafeInteger(Math.floor(parseFloat(`${i}`))) || !L(i) && g(e, r.numbers)) && (i = Number(i)), i;
+    function $(e, a) {
+      return !h["parse-positional-numbers"] && e === "_" || !g(e, r.strings) && !g(e, r.bools) && !Array.isArray(a) && (Re(a) && h["parse-numbers"] && Number.isSafeInteger(Math.floor(parseFloat(`${a}`))) || !L(a) && g(e, r.numbers)) && (a = Number(a)), a;
     }
     function _e(e) {
-      const i = /* @__PURE__ */ Object.create(null);
-      me(i, r.aliases, f), Object.keys(r.configs).forEach(function(l) {
-        const o = e[l] || i[l];
+      const a = /* @__PURE__ */ Object.create(null);
+      me(a, r.aliases, f), Object.keys(r.configs).forEach(function(l) {
+        const o = e[l] || a[l];
         if (o)
           try {
             let t = null;
@@ -337,18 +337,18 @@ class Ee {
           }
       });
     }
-    function J(e, i) {
+    function J(e, a) {
       Object.keys(e).forEach(function(l) {
-        const o = e[l], t = i ? i + "." + l : l;
+        const o = e[l], t = a ? a + "." + l : l;
         typeof o == "object" && o !== null && !Array.isArray(o) && h["dot-notation"] ? J(o, t) : (!R(w, t.split(".")) || g(t, r.arrays) && h["combine-arrays"]) && q(t, o);
       });
     }
     function ge() {
-      typeof G < "u" && G.forEach(function(e) {
+      typeof T < "u" && T.forEach(function(e) {
         J(e);
       });
     }
-    function re(e, i) {
+    function re(e, a) {
       if (typeof C > "u")
         return;
       const l = typeof C == "string" ? C : "", o = P.env();
@@ -357,17 +357,17 @@ class Ee {
           const p = t.split("__").map(function(c, d) {
             return d === 0 && (c = c.substring(l.length)), W(c);
           });
-          (i && r.configs[p.join(".")] || !i) && !R(e, p) && q(p.join("."), o[t]);
+          (a && r.configs[p.join(".")] || !a) && !R(e, p) && q(p.join("."), o[t]);
         }
       });
     }
     function fe(e) {
-      let i;
+      let a;
       const l = /* @__PURE__ */ new Set();
       Object.keys(e).forEach(function(o) {
-        if (!l.has(o) && (i = g(o, r.coercions), typeof i == "function"))
+        if (!l.has(o) && (a = g(o, r.coercions), typeof a == "function"))
           try {
-            const t = $(o, i(e[o]));
+            const t = $(o, a(e[o]));
             [].concat(r.aliases[o] || [], o).forEach((p) => {
               l.add(p), e[p] = t;
             });
@@ -377,37 +377,37 @@ class Ee {
       });
     }
     function be(e) {
-      return r.keys.forEach((i) => {
-        ~i.indexOf(".") || typeof e[i] > "u" && (e[i] = void 0);
+      return r.keys.forEach((a) => {
+        ~a.indexOf(".") || typeof e[a] > "u" && (e[a] = void 0);
       }), e;
     }
-    function me(e, i, l, o = !1) {
+    function me(e, a, l, o = !1) {
       Object.keys(l).forEach(function(t) {
-        R(e, t.split(".")) || (N(e, t.split("."), l[t]), o && (oe[t] = !0), (i[t] || []).forEach(function(p) {
+        R(e, t.split(".")) || (N(e, t.split("."), l[t]), o && (oe[t] = !0), (a[t] || []).forEach(function(p) {
           R(e, p.split(".")) || N(e, p.split("."), l[t]);
         }));
       });
     }
-    function R(e, i) {
+    function R(e, a) {
       let l = e;
-      h["dot-notation"] || (i = [i.join(".")]), i.slice(0, -1).forEach(function(t) {
+      h["dot-notation"] || (a = [a.join(".")]), a.slice(0, -1).forEach(function(t) {
         l = l[t] || {};
       });
-      const o = i[i.length - 1];
+      const o = a[a.length - 1];
       return typeof l != "object" ? !1 : o in l;
     }
-    function N(e, i, l) {
+    function N(e, a, l) {
       let o = e;
-      h["dot-notation"] || (i = [i.join(".")]), i.slice(0, -1).forEach(function(v) {
+      h["dot-notation"] || (a = [a.join(".")]), a.slice(0, -1).forEach(function(v) {
         v = le(v), typeof o == "object" && o[v] === void 0 && (o[v] = {}), typeof o[v] != "object" || Array.isArray(o[v]) ? (Array.isArray(o[v]) ? o[v].push({}) : o[v] = [o[v], {}], o = o[v][o[v].length - 1]) : o = o[v];
       });
-      const t = le(i[i.length - 1]), p = g(i.join("."), r.arrays), c = Array.isArray(l);
+      const t = le(a[a.length - 1]), p = g(a.join("."), r.arrays), c = Array.isArray(l);
       let d = h["duplicate-arguments-array"];
       !d && g(t, r.nargs) && (d = !0, (!L(o[t]) && r.nargs[t] === 1 || Array.isArray(o[t]) && o[t].length === r.nargs[t]) && (o[t] = void 0)), l === Z() ? o[t] = Z(o[t]) : Array.isArray(o[t]) ? d && p && c ? o[t] = h["flatten-duplicate-arrays"] ? o[t].concat(l) : (Array.isArray(o[t][0]) ? o[t] : [o[t]]).concat([l]) : !d && !!p == !!c ? o[t] = l : o[t] = o[t].concat([l]) : o[t] === void 0 && p ? o[t] = c ? l : [l] : d && !(o[t] === void 0 || g(t, r.counts) || g(t, r.bools)) ? o[t] = [o[t], l] : o[t] = l;
     }
     function qe(...e) {
-      e.forEach(function(i) {
-        Object.keys(i || {}).forEach(function(l) {
+      e.forEach(function(a) {
+        Object.keys(a || {}).forEach(function(l) {
           r.aliases[l] || (r.aliases[l] = [].concat(k[l] || []), r.aliases[l].concat(l).forEach(function(o) {
             if (/-/.test(o) && h["camel-case-expansion"]) {
               const t = W(o);
@@ -426,18 +426,18 @@ class Ee {
         });
       });
     }
-    function g(e, i) {
-      const l = [].concat(r.aliases[e] || [], e), o = Object.keys(i), t = l.find((p) => o.includes(p));
-      return t ? i[t] : !1;
+    function g(e, a) {
+      const l = [].concat(r.aliases[e] || [], e), o = Object.keys(a), t = l.find((p) => o.includes(p));
+      return t ? a[t] : !1;
     }
     function ue(e) {
-      const i = Object.keys(r);
-      return [].concat(i.map((o) => r[o])).some(function(o) {
+      const a = Object.keys(r);
+      return [].concat(a.map((o) => r[o])).some(function(o) {
         return Array.isArray(o) ? o.includes(e) : o[e];
       });
     }
-    function we(e, ...i) {
-      return [].concat(...i).some(function(o) {
+    function we(e, ...a) {
+      return [].concat(...a).some(function(o) {
         const t = e.match(o);
         return t && ue(t[1]);
       });
@@ -445,17 +445,17 @@ class Ee {
     function ve(e) {
       if (e.match(I) || !e.match(/^-[^-]+/))
         return !1;
-      let i = !0, l;
+      let a = !0, l;
       const o = e.slice(1).split("");
       for (let t = 0; t < o.length; t++) {
         if (l = e.slice(t + 2), !ue(o[t])) {
-          i = !1;
+          a = !1;
           break;
         }
         if (o[t + 1] && o[t + 1] === "=" || l === "-" || /[A-Za-z]/.test(o[t]) && /^-?\d+(\.\d*)?(e-?\d+)?$/.test(l) || o[t + 1] && o[t + 1].match(/\W/))
           break;
       }
-      return i;
+      return a;
     }
     function H(e) {
       return h["unknown-options-as-args"] && xe(e);
@@ -463,7 +463,7 @@ class Ee {
     function xe(e) {
       return e = e.replace(/^-{3,}/, "--"), e.match(I) || ve(e) ? !1 : !we(e, /^-+([^=]+?)=[\s\S]*$/, U, /^-+([^=]+?)$/, /^-+([^=]+?)-$/, /^-+([^=]+?\d+)$/, /^-+([^=]+?)\W+.*$/);
     }
-    function S(e) {
+    function G(e) {
       return !g(e, r.bools) && !g(e, r.counts) && `${e}` in f ? f[e] : ye(Be(e));
     }
     function ye(e) {
@@ -475,8 +475,8 @@ class Ee {
       }[e];
     }
     function Be(e) {
-      let i = M.BOOLEAN;
-      return g(e, r.strings) ? i = M.STRING : g(e, r.numbers) ? i = M.NUMBER : g(e, r.bools) ? i = M.BOOLEAN : g(e, r.arrays) && (i = M.ARRAY), i;
+      let a = M.BOOLEAN;
+      return g(e, r.strings) ? a = M.STRING : g(e, r.numbers) ? a = M.NUMBER : g(e, r.bools) ? a = M.BOOLEAN : g(e, r.arrays) && (a = M.ARRAY), a;
     }
     function L(e) {
       return e === void 0;
@@ -494,11 +494,11 @@ class Ee {
     };
   }
 }
-function ze(a) {
+function ze(i) {
   const n = [], m = /* @__PURE__ */ Object.create(null);
   let s = !0;
-  for (Object.keys(a).forEach(function(u) {
-    n.push([].concat(a[u], u));
+  for (Object.keys(i).forEach(function(u) {
+    n.push([].concat(i[u], u));
   }); s; ) {
     s = !1;
     for (let u = 0; u < n.length; u++)
@@ -518,14 +518,14 @@ function ze(a) {
     _ !== void 0 && typeof _ == "string" && (m[_] = u);
   }), m;
 }
-function Z(a) {
-  return a !== void 0 ? a + 1 : 1;
+function Z(i) {
+  return i !== void 0 ? i + 1 : 1;
 }
-function le(a) {
-  return a === "__proto__" ? "___proto___" : a;
+function le(i) {
+  return i === "__proto__" ? "___proto___" : i;
 }
-function je(a) {
-  return typeof a == "string" && (a[0] === "'" || a[0] === '"') && a[a.length - 1] === a[0] ? a.substring(1, a.length - 1) : a;
+function je(i) {
+  return typeof i == "string" && (i[0] === "'" || i[0] === '"') && i[i.length - 1] === i[0] ? i.substring(1, i.length - 1) : i;
 }
 /**
  * @fileoverview Main entrypoint for libraries using yargs-parser in Node.js
@@ -545,14 +545,14 @@ new Ee({
   env: () => Qe,
   format: he,
   normalize: Ie,
-  resolve: ie,
+  resolve: ae,
   // TODO: figure  out a  way to combine ESM and CJS coverage, such  that
   // we can exercise all the lines below:
-  require: (a) => {
+  require: (i) => {
     if (typeof require < "u")
-      return require(a);
-    if (a.match(/\.json$/))
-      return JSON.parse(ke(a, "utf8"));
+      return require(i);
+    if (i.match(/\.json$/))
+      return JSON.parse(ke(i, "utf8"));
     throw Error("only .json config files are supported in ESM");
   }
 });
@@ -562,10 +562,10 @@ const Fe = {
     writeFile: Le
   },
   format: he,
-  resolve: ie,
-  exists: (a) => {
+  resolve: ae,
+  exists: (i) => {
     try {
-      return Pe(a).isFile();
+      return Pe(i).isFile();
     } catch {
       return !1;
     }
@@ -658,9 +658,9 @@ class De {
     return B.exists(n);
   }
 }
-function Ve(a, n) {
+function Ve(i, n) {
   B = n;
-  const m = new De(a);
+  const m = new De(i);
   return {
     __: m.__.bind(m),
     __n: m.__n.bind(m),
@@ -670,19 +670,19 @@ function Ve(a, n) {
     locale: m.locale
   };
 }
-const $e = (a) => Ve(a, Fe);
+const $e = (i) => Ve(i, Fe);
 let E;
 try {
-  E = Ge(import.meta.url);
+  E = Te(import.meta.url);
 } catch {
   E = process.cwd();
 }
 const He = E.substring(0, E.lastIndexOf("node_modules"));
 He || process.cwd(), process.cwd, process.exit, process.nextTick, typeof process.stdout.columns < "u" && process.stdout.columns, $e({
-  directory: ie(E, "../../../locales"),
+  directory: ae(E, "../../../locales"),
   updateFiles: !1
 });
-const ae = [
+const ie = [
   {
     id: "anthropic",
     name: "Anthropic",
@@ -691,6 +691,9 @@ const ae = [
     model_match: {
       contains: "claude"
     },
+    provider_match: {
+      contains: "anthropic"
+    },
     extractors: [
       {
         api_flavor: "default",
@@ -797,6 +800,12 @@ const ae = [
             },
             {
               starts_with: "claude-3.7-sonnet"
+            },
+            {
+              starts_with: "claude-sonnet-3.7"
+            },
+            {
+              starts_with: "claude-sonnet-3-7"
             }
           ]
         },
@@ -860,10 +869,13 @@ const ae = [
         match: {
           or: [
             {
-              starts_with: "claude-opus-4"
+              starts_with: "claude-opus-4-0"
+            },
+            {
+              starts_with: "claude-4-opus"
             },
             {
-              starts_with: "claude-4-opus-20250522"
+              equals: "claude-opus-4-20250514"
             }
           ]
         },
@@ -880,14 +892,7 @@ const ae = [
         name: "Claude Opus 4.1",
         description: "Most intelligent model for complex tasks",
         match: {
-          or: [
-            {
-              starts_with: "claude-opus-4"
-            },
-            {
-              starts_with: "claude-4-opus-20250522"
-            }
-          ]
+          starts_with: "claude-opus-4-1"
         },
         context_window: 2e5,
         prices: {
@@ -907,7 +912,7 @@ const ae = [
               starts_with: "claude-sonnet-4"
             },
             {
-              starts_with: "claude-4-sonnet-20250522"
+              starts_with: "claude-4-sonnet"
             }
           ]
         },
@@ -974,6 +979,9 @@ const ae = [
     name: "AWS Bedrock",
     pricing_urls: ["https://aws.amazon.com/bedrock/pricing/"],
     api_pattern: "https://bedrock-runtime\\.[a-z0-9-]+\\.amazonaws\\.com/",
+    provider_match: {
+      contains: "bedrock"
+    },
     models: [
       {
         id: "meta.llama3-8b-instruct-v1%3A0",
@@ -1802,6 +1810,9 @@ const ae = [
     model_match: {
       starts_with: "command-"
     },
+    provider_match: {
+      contains: "cohere"
+    },
     extractors: [
       {
         api_flavor: "default",
@@ -1840,7 +1851,7 @@ const ae = [
         description: `Command A is an open-weights 111B parameter model with a 256k context window focused on delivering great performance across agentic, multilingual, and coding use cases.
 Compared to other leading proprietary and open-weights models Command A delivers maximum performance with minimum hardware costs, excelling on business-critical agentic and multilingual tasks.`,
         match: {
-          equals: "command-a"
+          starts_with: "command-a"
         },
         prices: {
           input_mtok: 2.5,
@@ -2172,7 +2183,10 @@ Compared to other leading proprietary and open-weights models Command A delivers
           contains: "google"
         },
         {
-          equals: "gemini"
+          contains: "vertex"
+        },
+        {
+          contains: "gemini"
         }
       ]
     },
@@ -2440,7 +2454,14 @@ Compared to other leading proprietary and open-weights models Command A delivers
         name: "Gemini 2.5 Flash",
         description: `Gemini 2.5 Flash is Google's state-of-the-art workhorse model, specifically designed for advanced reasoning, coding, mathematics, and scientific tasks. It includes built-in "thinking" capabilities, enabling it to provide responses with greater accuracy and nuanced context handling.`,
         match: {
-          equals: "gemini-2.5-flash"
+          or: [
+            {
+              equals: "gemini-2.5-flash"
+            },
+            {
+              equals: "gemini-2.5-flash-latest"
+            }
+          ]
         },
         prices: {
           input_mtok: 0.3,
@@ -2678,108 +2699,31 @@ Compared to other leading proprietary and open-weights models Command A delivers
         }
       },
       {
-        id: "gemma-2-27b-it",
-        name: "Gemma 2 27B",
-        description: "Gemma 2 27B by Google is an open model built from the same research and technology used to create the Gemini models.",
-        match: {
-          equals: "gemma-2-27b-it"
-        },
-        prices: {
-          input_mtok: 0.8,
-          output_mtok: 0.8
-        }
-      },
-      {
-        id: "gemma-2-9b-it",
-        name: "Gemma 2 9B",
-        description: "Gemma 2 9B by Google is an advanced, open-source language model that sets a new standard for efficiency and performance in its size class.",
+        id: "gemma-3",
+        name: "Gemma 3 (free)",
+        description: "Lightweight, state-of the art, open model built from the same technology that powers our Gemini models.",
         match: {
-          equals: "gemma-2-9b-it"
-        },
-        prices: {
-          input_mtok: 0.2,
-          output_mtok: 0.2
-        }
-      },
-      {
-        id: "gemma-2-9b-it:free",
-        name: "Gemma 2 9B (free)",
-        description: "Gemma 2 9B by Google is an advanced, open-source language model that sets a new standard for efficiency and performance in its size class.",
-        match: {
-          equals: "gemma-2-9b-it:free"
-        },
-        prices: {}
-      },
-      {
-        id: "gemma-3-12b-it",
-        name: "Gemma 3 12B",
-        description: "Gemma 3 introduces multimodality, supporting vision-language input and text outputs. It handles context windows up to 128k tokens, understands over 140 languages, and offers improved math, reasoning, and chat capabilities, including structured outputs and function calling. Gemma 3 12B is the second largest in the family of Gemma 3 models after Gemma 3 27B",
-        match: {
-          equals: "gemma-3-12b-it"
-        },
-        prices: {
-          input_mtok: 0.05,
-          output_mtok: 0.1
-        }
-      },
-      {
-        id: "gemma-3-12b-it:free",
-        name: "Gemma 3 12B (free)",
-        description: "Gemma 3 introduces multimodality, supporting vision-language input and text outputs. It handles context windows up to 128k tokens, understands over 140 languages, and offers improved math, reasoning, and chat capabilities, including structured outputs and function calling. Gemma 3 12B is the second largest in the family of Gemma 3 models after Gemma 3 27B",
-        match: {
-          equals: "gemma-3-12b-it:free"
-        },
-        prices: {}
-      },
-      {
-        id: "gemma-3-27b-it",
-        name: "Gemma 3 27B",
-        description: "Gemma 3 introduces multimodality, supporting vision-language input and text outputs. It handles context windows up to 128k tokens, understands over 140 languages, and offers improved math, reasoning, and chat capabilities, including structured outputs and function calling. Gemma 3 27B is Google's latest open source model, successor to Gemma 2",
-        match: {
-          equals: "gemma-3-27b-it"
-        },
-        price_comments: "I can't find anything so trusting these prices, not sure the model still exists on Vertex or GCP",
-        prices: {
-          input_mtok: 0.1,
-          output_mtok: 0.2
-        }
-      },
-      {
-        id: "gemma-3-27b-it:free",
-        name: "Gemma 3 27B (free)",
-        description: "Gemma 3 introduces multimodality, supporting vision-language input and text outputs. It handles context windows up to 128k tokens, understands over 140 languages, and offers improved math, reasoning, and chat capabilities, including structured outputs and function calling. Gemma 3 27B is Google's latest open source model, successor to Gemma 2",
-        match: {
-          equals: "gemma-3-27b-it:free"
-        },
-        prices: {}
-      },
-      {
-        id: "gemma-3-4b-it",
-        name: "Gemma 3 4B",
-        description: "Gemma 3 introduces multimodality, supporting vision-language input and text outputs. It handles context windows up to 128k tokens, understands over 140 languages, and offers improved math, reasoning, and chat capabilities, including structured outputs and function calling.",
-        match: {
-          equals: "gemma-3-4b-it"
-        },
-        prices: {
-          input_mtok: 0.02,
-          output_mtok: 0.04
-        }
-      },
-      {
-        id: "gemma-3-4b-it:free",
-        name: "Gemma 3 4B (free)",
-        description: "Gemma 3 introduces multimodality, supporting vision-language input and text outputs. It handles context windows up to 128k tokens, understands over 140 languages, and offers improved math, reasoning, and chat capabilities, including structured outputs and function calling.",
-        match: {
-          equals: "gemma-3-4b-it:free"
+          or: [
+            {
+              starts_with: "gemma-3-"
+            },
+            {
+              equals: "gemma-3"
+            }
+          ]
         },
         prices: {}
       },
       {
-        id: "gemma-3n-e4b-it:free",
-        name: "Gemma 3n 4B (free)",
-        description: "Gemma 3n E4B-it is optimized for efficient execution on mobile and low-resource devices, such as phones, laptops, and tablets. It supports multimodal inputs—including text, visual data, and audio—enabling diverse tasks such as text generation, speech recognition, translation, and image analysis. Leveraging innovations like Per-Layer Embedding (PLE) caching and the MatFormer architecture, Gemma 3n dynamically manages memory usage and computational load by selectively activating model parameters, significantly reducing runtime resource requirements.",
+        id: "gemma-3n",
+        name: "Gemma 3n (free)",
+        description: "Our open model built for efficient performance on everyday devices like mobile phones, laptops, and tablets.",
         match: {
-          equals: "gemma-3n-e4b-it:free"
+          or: [
+            {
+              starts_with: "gemma-3n"
+            }
+          ]
         },
         prices: {}
       }
@@ -2811,25 +2755,57 @@ Compared to other leading proprietary and open-weights models Command A delivers
     ],
     models: [
       {
-        id: "gemma-7b-it",
+        id: "deepseek-r1-distill-llama-70b",
+        name: "DeepSeek R1 Distill Llama 70B",
         match: {
-          equals: "gemma-7b-it"
+          equals: "deepseek-r1-distill-llama-70b"
         },
+        context_window: 131072,
         prices: {
-          input_mtok: 0.07,
-          output_mtok: 0.07
+          input_mtok: 0.75,
+          output_mtok: 0.99
         }
       },
       {
         id: "gemma2-9b-it",
+        name: "Gemma 2 9B 8k",
         match: {
-          equals: "gemma2-9b-it"
+          or: [
+            {
+              equals: "gemma2-9b-it"
+            },
+            {
+              equals: "gemma2-9b"
+            }
+          ]
         },
         prices: {
           input_mtok: 0.2,
           output_mtok: 0.2
         }
       },
+      {
+        id: "llama-3.1-8b-instant",
+        name: "Llama 3.1 8B Instant 128k",
+        match: {
+          equals: "llama-3.1-8b-instant"
+        },
+        prices: {
+          input_mtok: 0.05,
+          output_mtok: 0.08
+        }
+      },
+      {
+        id: "llama-3.3-70b-versatile",
+        name: "Llama 3.3 70B Versatile 128k",
+        match: {
+          equals: "llama-3.3-70b-versatile"
+        },
+        prices: {
+          input_mtok: 0.59,
+          output_mtok: 0.79
+        }
+      },
       {
         id: "llama2-70b-4096",
         match: {
@@ -2881,13 +2857,50 @@ Compared to other leading proprietary and open-weights models Command A delivers
         }
       },
       {
-        id: "mixtral-8x7b-32768",
+        id: "meta-llama/llama-4-maverick-17b-128e-instruct",
+        name: "Llama 4 Maverick 17B 128E",
         match: {
-          equals: "mixtral-8x7b-32768"
+          equals: "meta-llama/llama-4-maverick-17b-128e-instruct"
         },
+        context_window: 131072,
         prices: {
-          input_mtok: 0.24,
-          output_mtok: 0.24
+          input_mtok: 0.2,
+          output_mtok: 0.6
+        }
+      },
+      {
+        id: "meta-llama/llama-4-scout-17b-16e-instruct",
+        name: "Llama 4 Scout (17Bx16E) 128k",
+        match: {
+          equals: "meta-llama/llama-4-scout-17b-16e-instruct"
+        },
+        prices: {
+          input_mtok: 0.11,
+          output_mtok: 0.34
+        }
+      },
+      {
+        id: "meta-llama/llama-guard-4-12b",
+        name: "Llama Guard 4 12B",
+        match: {
+          equals: "meta-llama/llama-guard-4-12b"
+        },
+        context_window: 131072,
+        prices: {
+          input_mtok: 0.2,
+          output_mtok: 0.2
+        }
+      },
+      {
+        id: "moonshotai/kimi-k2-instruct",
+        name: "Kimi K2 1T 128k",
+        match: {
+          equals: "moonshotai/kimi-k2-instruct"
+        },
+        context_window: 131072,
+        prices: {
+          input_mtok: 1,
+          output_mtok: 3
         }
       },
       {
@@ -2917,6 +2930,17 @@ Compared to other leading proprietary and open-weights models Command A delivers
           input_mtok: 0.1,
           output_mtok: 0.5
         }
+      },
+      {
+        id: "qwen/qwen3-32b",
+        name: "Qwen3 32B 131k",
+        match: {
+          equals: "qwen/qwen3-32b"
+        },
+        prices: {
+          input_mtok: 0.29,
+          output_mtok: 0.59
+        }
       }
     ]
   },
@@ -2992,16 +3016,13 @@ Compared to other leading proprietary and open-weights models Command A delivers
         prices: {}
       },
       {
-        id: "magistral-medium-2506",
-        name: "Magistral Medium 2506",
+        id: "magistral-medium",
+        name: "Magistral Medium",
         description: "Magistral is Mistral's first reasoning model. It is ideal for general purpose use requiring longer thought processing and better accuracy than with non-reasoning LLMs. From legal research and financial forecasting to software development and creative storytelling — this model solves multi-step challenges where transparency and precision are critical.",
         match: {
           or: [
             {
-              equals: "magistral-medium-2506"
-            },
-            {
-              equals: "magistral-medium-2506:thinking"
+              starts_with: "magistral-medium"
             }
           ]
         },
@@ -3011,11 +3032,11 @@ Compared to other leading proprietary and open-weights models Command A delivers
         }
       },
       {
-        id: "magistral-small-2506",
-        name: "Magistral Small 2506",
+        id: "magistral-small",
+        name: "Magistral Small",
         description: "Magistral Small is a 24B parameter instruction-tuned model based on Mistral-Small-3.1 (2503), enhanced through supervised fine-tuning on traces from Magistral Medium and further refined via reinforcement learning. It is optimized for reasoning and supports a wide multilingual range, including over 20 languages.",
         match: {
-          equals: "magistral-small-2506"
+          starts_with: "magistral-small-"
         },
         prices: {
           input_mtok: 0.5,
@@ -3036,68 +3057,34 @@ Compared to other leading proprietary and open-weights models Command A delivers
       },
       {
         id: "ministral-8b",
-        name: "Ministral 8B",
+        name: "Ministral 8B 24.10",
         description: "Ministral 8B is an 8B parameter model featuring a unique interleaved sliding-window attention pattern for faster, memory-efficient inference. Designed for edge use cases, it supports up to 128k context length and excels in knowledge and reasoning tasks. It outperforms peers in the sub-10B category, making it perfect for low-latency, privacy-first applications.",
         match: {
-          equals: "ministral-8b"
+          starts_with: "ministral-8b"
         },
         prices: {
           input_mtok: 0.1,
-          output_mtok: 0.1
+          output_mtok: 1
         }
       },
       {
-        id: "mistral-7b-instruct",
-        name: "Mistral 7B Instruct",
-        description: "A high-performing, industry-standard 7.3B parameter model, with optimizations for speed and context length.",
+        id: "mistral-7b",
+        name: "Mistral 7B",
         match: {
           or: [
             {
-              equals: "mistral-7b-instruct"
+              equals: "mistral-7b"
             },
             {
-              equals: "mistral-7b-instruct-v0.3"
+              equals: "open-mistral-7b"
             }
           ]
         },
         prices: {
-          input_mtok: 0.028,
-          output_mtok: 0.054
-        }
-      },
-      {
-        id: "mistral-7b-instruct-v0.1",
-        name: "Mistral 7B Instruct v0.1",
-        description: "A 7.3B parameter model that outperforms Llama 2 13B on all benchmarks, with optimizations for speed and context length.",
-        match: {
-          equals: "mistral-7b-instruct-v0.1"
-        },
-        prices: {
-          input_mtok: 0.11,
-          output_mtok: 0.19
-        }
-      },
-      {
-        id: "mistral-7b-instruct-v0.2",
-        name: "Mistral 7B Instruct v0.2",
-        description: "A high-performing, industry-standard 7.3B parameter model, with optimizations for speed and context length.",
-        match: {
-          equals: "mistral-7b-instruct-v0.2"
-        },
-        prices: {
-          input_mtok: 0.2,
-          output_mtok: 0.2
+          input_mtok: 0.25,
+          output_mtok: 0.25
         }
       },
-      {
-        id: "mistral-7b-instruct:free",
-        name: "Mistral 7B Instruct (free)",
-        description: "A high-performing, industry-standard 7.3B parameter model, with optimizations for speed and context length.",
-        match: {
-          equals: "mistral-7b-instruct:free"
-        },
-        prices: {}
-      },
       {
         id: "mistral-embed",
         match: {
@@ -3138,14 +3125,7 @@ Compared to other leading proprietary and open-weights models Command A delivers
         name: "Mistral Medium 3",
         description: "Mistral Medium 3 is a high-performance enterprise-grade language model designed to deliver frontier-level capabilities at significantly reduced operational cost. It balances state-of-the-art reasoning and multimodal performance with 8× lower cost compared to traditional large models, making it suitable for scalable deployments across professional and industrial use cases.",
         match: {
-          or: [
-            {
-              equals: "mistral-medium-3"
-            },
-            {
-              equals: "mistral-medium-latest"
-            }
-          ]
+          starts_with: "mistral-medium"
         },
         prices: {
           input_mtok: 0.4,
@@ -3157,7 +3137,14 @@ Compared to other leading proprietary and open-weights models Command A delivers
         name: "Mistral NeMo",
         description: "A 12B parameter model with a 128k token context length built by Mistral in collaboration with NVIDIA.",
         match: {
-          equals: "mistral-nemo"
+          or: [
+            {
+              equals: "mistral-nemo"
+            },
+            {
+              equals: "open-mistral-nemo"
+            }
+          ]
         },
         prices: {
           input_mtok: 0.15,
@@ -3197,7 +3184,7 @@ Compared to other leading proprietary and open-weights models Command A delivers
         name: "Mistral Small",
         description: "With 22 billion parameters, Mistral Small v24.09 offers a convenient mid-point between (Mistral NeMo 12B)[/mistralai/mistral-nemo] and (Mistral Large 2)[/mistralai/mistral-large], providing a cost-effective solution that can be deployed across various platforms and environments. It has better reasoning, exhibits more capabilities, can produce and reason about code, and is multiligual, supporting English, French, German, Italian, and Spanish.",
         match: {
-          equals: "mistral-small"
+          starts_with: "mistral-small"
         },
         prices: {
           input_mtok: 0.2,
@@ -3266,31 +3253,17 @@ Compared to other leading proprietary and open-weights models Command A delivers
         }
       },
       {
-        id: "mixtral-8x7b-instruct",
-        name: "Mixtral 8x7B Instruct",
-        description: "Mixtral 8x7B Instruct is a pretrained generative Sparse Mixture of Experts, by Mistral AI, for chat and instruction use. Incorporates 8 experts (feed-forward networks) for a total of 47 billion parameters.",
-        match: {
-          equals: "mixtral-8x7b-instruct"
-        },
-        prices: {
-          input_mtok: 0.08,
-          output_mtok: 0.24
-        }
-      },
-      {
-        id: "open-mistral-7b",
-        match: {
-          equals: "open-mistral-7b"
-        },
-        prices: {
-          input_mtok: 0.25,
-          output_mtok: 0.25
-        }
-      },
-      {
-        id: "open-mixtral-8x7b",
+        id: "mixtral-8x7b",
+        name: "Mixtral 8x7B",
         match: {
-          equals: "open-mixtral-8x7b"
+          or: [
+            {
+              starts_with: "mixtral-8x7b"
+            },
+            {
+              equals: "open-mixtral-8x7b"
+            }
+          ]
         },
         prices: {
           input_mtok: 0.7,
@@ -3712,6 +3685,9 @@ Compared to other leading proprietary and open-weights models Command A delivers
         }
       ]
     },
+    provider_match: {
+      contains: "openai"
+    },
     extractors: [
       {
         api_flavor: "chat",
@@ -10552,6 +10528,16 @@ Compared to other leading proprietary and open-weights models Command A delivers
     name: "Together AI",
     pricing_urls: ["https://www.together.ai/pricing"],
     api_pattern: "https://api\\.together\\.xyz",
+    provider_match: {
+      or: [
+        {
+          equals: "together-ai"
+        },
+        {
+          equals: "together_ai"
+        }
+      ]
+    },
     models: [
       {
         id: "Austism/chronos-hermes-13b",
@@ -11342,6 +11328,9 @@ Compared to other leading proprietary and open-weights models Command A delivers
     model_match: {
       contains: "grok"
     },
+    provider_match: {
+      equals: "xai"
+    },
     extractors: [
       {
         api_flavor: "chat",
@@ -11541,23 +11530,23 @@ Compared to other leading proprietary and open-weights models Command A delivers
     ]
   }
 ];
-function We(a, n) {
+function We(i, n) {
   if (n <= 0) return 0;
   let m = 0;
-  const s = [...a.tiers].sort((k, h) => k.start - h.start), u = s[0]?.start ?? n, _ = Math.min(n, u);
-  m += _ * a.base / 1e6;
+  const s = [...i.tiers].sort((k, h) => k.start - h.start), u = s[0]?.start ?? n, _ = Math.min(n, u);
+  m += _ * i.base / 1e6;
   for (let k = 0; k < s.length; k++) {
-    const h = s[k], f = s[k + 1]?.start ?? 1 / 0, G = Math.max(0, Math.min(n, f) - h.start);
-    G > 0 && (m += G * h.price / 1e6);
+    const h = s[k], f = s[k + 1]?.start ?? 1 / 0, T = Math.max(0, Math.min(n, f) - h.start);
+    T > 0 && (m += T * h.price / 1e6);
   }
   return m;
 }
-function T(a, n, m) {
-  return a === void 0 || n === void 0 ? 0 : typeof a == "number" ? a * n / 1e6 : We(a, n);
+function S(i, n, m) {
+  return i === void 0 || n === void 0 ? 0 : typeof i == "number" ? i * n / 1e6 : We(i, n);
 }
-function Ue(a, n) {
+function Ue(i, n) {
   let m = 0, s = 0;
-  m += T(n.input_mtok, a.input_tokens), m += T(n.cache_write_mtok, a.cache_write_tokens), m += T(n.cache_read_mtok, a.cache_read_tokens), m += T(n.input_audio_mtok, a.input_audio_tokens), m += T(n.cache_audio_read_mtok, a.cache_audio_read_tokens), s += T(n.output_mtok, a.output_tokens), s += T(n.output_audio_mtok, a.output_audio_tokens), n.requests_kcount !== void 0 && (m += n.requests_kcount / 1e3);
+  m += S(n.input_mtok, i.input_tokens), m += S(n.cache_write_mtok, i.cache_write_tokens), m += S(n.cache_read_mtok, i.cache_read_tokens), m += S(n.input_audio_mtok, i.input_audio_tokens), m += S(n.cache_audio_read_mtok, i.cache_audio_read_tokens), s += S(n.output_mtok, i.output_tokens), s += S(n.output_audio_mtok, i.output_audio_tokens), n.requests_kcount !== void 0 && (m += n.requests_kcount / 1e3);
   const u = m + s;
   return {
     input_price: m,
@@ -11565,11 +11554,11 @@ function Ue(a, n) {
     total_price: u
   };
 }
-function Ke(a, n) {
-  if (!Array.isArray(a.prices))
-    return a.prices;
-  for (let m = a.prices.length - 1; m >= 0; m--) {
-    const s = a.prices[m], u = s.constraint;
+function Ke(i, n) {
+  if (!Array.isArray(i.prices))
+    return i.prices;
+  for (let m = i.prices.length - 1; m >= 0; m--) {
+    const s = i.prices[m], u = s.constraint;
     if (u === void 0)
       return s.prices;
     if (u.type === "start_date") {
@@ -11584,49 +11573,54 @@ function Ke(a, n) {
         return s.prices;
     }
   }
-  return a.prices[0].prices;
+  return i.prices[0].prices;
 }
-function z(a, n) {
-  return "or" in a ? a.or.some((m) => z(m, n)) : "and" in a ? a.and.every((m) => z(m, n)) : "equals" in a ? n === a.equals : "starts_with" in a ? n.startsWith(a.starts_with) : "ends_with" in a ? n.endsWith(a.ends_with) : "contains" in a ? n.includes(a.contains) : "regex" in a ? new RegExp(a.regex).test(n) : !1;
+function z(i, n) {
+  return "or" in i ? i.or.some((m) => z(m, n)) : "and" in i ? i.and.every((m) => z(m, n)) : "equals" in i ? n === i.equals : "starts_with" in i ? n.startsWith(i.starts_with) : "ends_with" in i ? n.endsWith(i.ends_with) : "contains" in i ? n.includes(i.contains) : "regex" in i ? new RegExp(i.regex).test(n) : !1;
 }
-function Ye(a, n) {
-  const m = n.toLowerCase().trim(), s = a.find((u) => u.id === m);
-  return s || a.find((u) => u.provider_match && z(u.provider_match, m));
+function Ye(i, n) {
+  const m = n.toLowerCase().trim(), s = i.find((u) => u.id === m);
+  return s || i.find((u) => u.provider_match && z(u.provider_match, m));
 }
-function Je(a, n, m, s) {
-  return m ? Ye(a, m) : s ? a.find((u) => new RegExp(u.api_pattern).test(s)) : a.find((u) => u.model_match && z(u.model_match, n));
+function Je(i, { modelId: n, providerApiUrl: m, providerId: s }) {
+  if (s)
+    return Ye(i, s);
+  if (m)
+    return i.find((u) => new RegExp(u.api_pattern).test(m));
+  if (n)
+    return i.find((u) => u.model_match && z(u.model_match, n));
 }
-function Ze(a, n) {
-  return a.find((m) => z(m.match, n));
+function Ze(i, n) {
+  return i.find((m) => z(m.match, n));
 }
-let Xe = ae;
-Promise.resolve(ae);
-function et(a, n, m) {
-  const s = Je(Xe, n, m?.providerId, m?.providerApiUrl);
-  if (!s) return null;
-  const u = Ze(s.models, n);
+let Xe = ie;
+Promise.resolve(ie);
+function et(i, n, m) {
+  const s = n.toLowerCase().trim(), u = m?.provider ?? Je(Xe, { modelId: s, providerApiUrl: m?.providerApiUrl, providerId: m?.providerId });
   if (!u) return null;
-  const _ = m?.timestamp ?? /* @__PURE__ */ new Date(), k = Ke(u, _), h = Ue(a, k);
+  const _ = Ze(u.models, s);
+  if (!_) return null;
+  const k = m?.timestamp ?? /* @__PURE__ */ new Date(), h = Ke(_, k), f = Ue(i, h);
   return {
     auto_update_timestamp: void 0,
-    model: u,
-    model_price: k,
-    provider: s,
-    ...h
+    model: _,
+    model_price: h,
+    provider: u,
+    ...f
   };
 }
 const b = de(Ce(process.argv)).scriptName("genai-prices").command(
   "list [provider]",
   "List providers and models",
-  (a) => a.positional("provider", { describe: "Provider ID to filter", type: "string" })
+  (i) => i.positional("provider", { describe: "Provider ID to filter", type: "string" })
 ).command(
   "calc <model...>",
   "Calculate price",
-  (a) => a.positional("model", { array: !0, describe: "Model(s) (optionally provider:model)", type: "string" }).option("input-tokens", { type: "number" }).option("cache-write-tokens", { type: "number" }).option("cache-read-tokens", { type: "number" }).option("output-tokens", { type: "number" }).option("input-audio-tokens", { type: "number" }).option("cache-audio-read-tokens", { type: "number" }).option("output-audio-tokens", { type: "number" }).option("requests", { type: "number" }).option("provider", { type: "string" }).option("auto-update", { default: !1, type: "boolean" }).option("timestamp", { describe: "RFC3339 timestamp", type: "string" })
+  (i) => i.positional("model", { array: !0, describe: "Model(s) (optionally provider:model)", type: "string" }).option("input-tokens", { type: "number" }).option("cache-write-tokens", { type: "number" }).option("cache-read-tokens", { type: "number" }).option("output-tokens", { type: "number" }).option("input-audio-tokens", { type: "number" }).option("cache-audio-read-tokens", { type: "number" }).option("output-audio-tokens", { type: "number" }).option("requests", { type: "number" }).option("provider", { type: "string" }).option("auto-update", { default: !1, type: "boolean" }).option("timestamp", { describe: "RFC3339 timestamp", type: "string" })
 ).option("auto-update", { describe: "Enable auto-update from GitHub", type: "boolean" }).option("input-tokens", { type: "number" }).option("cache-write-tokens", { type: "number" }).option("cache-read-tokens", { type: "number" }).option("output-tokens", { type: "number" }).option("input-audio-tokens", { type: "number" }).option("cache-audio-read-tokens", { type: "number" }).option("output-audio-tokens", { type: "number" }).option("requests", { type: "number" }).option("provider", { type: "string" }).option("timestamp", { describe: "RFC3339 timestamp", type: "string" }).version("0.1.0").help().parseSync();
 function tt() {
   if (b._[0] === "list") {
-    const m = ae;
+    const m = ie;
     if (b.provider) {
       const s = m.find((u) => u.id === b.provider);
       s || (console.error(`Provider ${b.provider} not found.`), process.exit(1)), console.log(`${s.name}: (${s.models.length} models)`);
@@ -11662,11 +11656,11 @@ function tt() {
           u = !0, console.error(`No price found for model ${_}`);
           continue;
         }
-        const G = f.model.context_window, C = [
+        const T = f.model.context_window, C = [
           ["Provider", f.provider.name],
           ["Model", f.model.name ?? f.model.id],
           ["Model Prices", JSON.stringify(f.model_price)],
-          ["Context Window", G !== void 0 ? G.toLocaleString() : void 0],
+          ["Context Window", T !== void 0 ? T.toLocaleString() : void 0],
           ["Total Price", `$${f.total_price}`],
           ["Input Price", `$${f.input_price}`],
           ["Output Price", `$${f.output_price}`]