easyrouter-config 1.0.4 → 1.0.5

package/dist/index.js

@@ -16,11 +16,11 @@ import {
 import { execa } from "execa";
 import pc from "picocolors";
 import { parseArgs } from "util";
-var VERSION = true ? "1.0.4" : "0.0.0-dev";
+var VERSION = true ? "1.0.5" : "0.0.0-dev";
 var PRIMARY_HOST = "https://easyrouter.io";
 var FALLBACK_HOSTS = ["https://ezr.sh"];
 var PROBE_TIMEOUT_MS = 5e3;
-var CODEX_DEFAULT_MODEL = "gpt-5-codex";
+var CODEX_FALLBACK_MODEL = "gpt-5.5";
 function parseCliArgs() {
   try {
     const { values } = parseArgs({
@@ -104,6 +104,61 @@ async function probeHost(host) {
     return false;
   }
 }
+var FETCH_MODELS_TIMEOUT_MS = 8e3;
+async function fetchEasyRouterModels(host, verbose) {
+  const url = host.replace(/\/+$/, "") + "/api/pricing";
+  try {
+    const ctrl = new AbortController();
+    const timer = setTimeout(() => ctrl.abort(), FETCH_MODELS_TIMEOUT_MS);
+    const res = await fetch(url, { signal: ctrl.signal });
+    clearTimeout(timer);
+    if (!res.ok) {
+      if (verbose) log.warn(`\u62C9\u53D6\u6A21\u578B\u5217\u8868\u5931\u8D25\uFF1AHTTP ${res.status}\uFF08\u5C06\u4F7F\u7528\u515C\u5E95\u6A21\u578B\uFF09`);
+      return [];
+    }
+    const json = await res.json();
+    const models = Array.isArray(json?.data) ? json.data : [];
+    if (verbose) log.info(`\u2713 \u62C9\u53D6\u5230 ${models.length} \u4E2A EasyRouter \u6A21\u578B`);
+    return models;
+  } catch (err) {
+    if (verbose) log.warn(`\u62C9\u53D6\u6A21\u578B\u5217\u8868\u5F02\u5E38\uFF1A${err?.message || err}\uFF08\u5C06\u4F7F\u7528\u515C\u5E95\u6A21\u578B\uFF09`);
+    return [];
+  }
+}
+function pickBestCodexModel(models) {
+  const isLlm = (m) => (m.tags || "").toUpperCase().includes("LLM");
+  const supportsOpenAI = (m) => !m.supported_endpoint_types || m.supported_endpoint_types.includes("openai");
+  const isGpt5 = (m) => /^gpt-5(\b|[.\-])/i.test(m.model_name);
+  const isSmallTier = (m) => /(^|[\-_.])(mini|nano|small|lite|tiny)([\-_.]|$)/i.test(m.model_name);
+  const byNameDesc = (a, b) => b.model_name.localeCompare(a.model_name, "en");
+  const gpt5Big = models.filter((m) => isGpt5(m) && isLlm(m) && supportsOpenAI(m) && !isSmallTier(m)).sort(byNameDesc);
+  if (gpt5Big.length) return gpt5Big[0].model_name;
+  const gpt5Any = models.filter((m) => isGpt5(m) && isLlm(m) && supportsOpenAI(m)).sort(byNameDesc);
+  if (gpt5Any.length) return gpt5Any[0].model_name;
+  const anyBig = models.filter((m) => isLlm(m) && supportsOpenAI(m) && !isSmallTier(m)).sort(byNameDesc);
+  if (anyBig.length) return anyBig[0].model_name;
+  return null;
+}
+async function resolveCodexModel(host, interactive, verbose) {
+  const models = await fetchEasyRouterModels(host, verbose);
+  const auto = pickBestCodexModel(models);
+  if (auto) {
+    if (verbose) log.info(`\u81EA\u52A8\u9009\u62E9 Codex \u6A21\u578B\uFF1A${pc.cyan(auto)}`);
+    return auto;
+  }
+  if (interactive && models.length) {
+    const candidates = models.filter((m) => /^gpt-5|codex/i.test(m.model_name)).sort((a, b) => b.model_name.localeCompare(a.model_name, "en")).slice(0, 8);
+    if (candidates.length) {
+      const picked = await select({
+        message: "\u672A\u81EA\u52A8\u8BC6\u522B Codex \u63A8\u8350\u6A21\u578B\uFF0C\u8BF7\u624B\u52A8\u9009\u62E9",
+        options: candidates.map((m) => ({ value: m.model_name, label: m.model_name }))
+      });
+      if (!isCancel(picked)) return picked;
+    }
+  }
+  if (verbose) log.warn(`\u65E0\u6CD5\u81EA\u52A8\u9009\u62E9 Codex \u6A21\u578B\uFF0C\u4F7F\u7528\u515C\u5E95\uFF1A${CODEX_FALLBACK_MODEL}`);
+  return CODEX_FALLBACK_MODEL;
+}
 var IDLE_TIMEOUT_MS = 6e4;
 var HARD_TIMEOUT_MS = 3e5;
 async function configureViaZcf(opts) {
@@ -137,7 +192,7 @@ async function configureViaZcf(opts) {
     "false"
   ];
   if (opts.target === "codex") {
-    args.push("--api-model", CODEX_DEFAULT_MODEL);
+    args.push("--api-model", opts.apiModel || CODEX_FALLBACK_MODEL);
   }
   const isWin = process.platform === "win32";
   const cmd = isWin ? "npx.cmd" : "npx";
@@ -368,6 +423,12 @@ async function main() {
     }
   }
   if (configCodex) {
+    const codexModel = await resolveCodexModel(
+      selectedHost,
+      /* interactive */
+      !args.apiKey,
+      verbose
+    );
     const useSpinner = !verbose && process.stdout.isTTY;
     const s = useSpinner ? spinner() : null;
     s?.start("\u914D\u7F6E Codex");
@@ -377,11 +438,12 @@ async function main() {
         target: "codex",
         baseUrl: codexBaseUrl,
         apiKey,
+        apiModel: codexModel,
         verbose,
         onProgress: (line) => s?.message(`\u914D\u7F6E Codex \xB7 ${pc.dim(line)}`)
       });
-      s?.stop(pc.green("\u2713 Codex \u914D\u7F6E\u5B8C\u6210 ") + pc.dim("\u2192 ~/.codex/config.toml + auth.json"));
-      if (!s) log.success(pc.green("\u2713 Codex \u914D\u7F6E\u5B8C\u6210 \u2192 ~/.codex/config.toml + auth.json"));
+      s?.stop(pc.green("\u2713 Codex \u914D\u7F6E\u5B8C\u6210 ") + pc.dim(`\u2192 model=${codexModel}`));
+      if (!s) log.success(pc.green(`\u2713 Codex \u914D\u7F6E\u5B8C\u6210 \u2192 model=${codexModel}`));
     } catch (err) {
       s?.stop(pc.red("\u2717 Codex \u914D\u7F6E\u5931\u8D25"));
       console.error(err.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easyrouter-config",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "🚀 一键把 EasyRouter 接入 Claude Code & Codex —— 粘贴 Key 即用",
   "type": "module",
   "bin": {