easyrouter-config 1.0.7 → 1.0.9

package/dist/index.js

@@ -4,14 +4,14 @@
 import {
   intro,
   outro,
-  text,
   multiselect,
   confirm,
   spinner,
   isCancel as isCancel2,
   cancel,
   log as log3,
-  note
+  note,
+  password
 } from "@clack/prompts";
 import pc6 from "picocolors";
 
@@ -20,7 +20,7 @@ import { parseArgs } from "util";
 import pc from "picocolors";
 
 // src/config/constants.ts
-var VERSION = true ? "1.0.7" : "0.0.0-dev";
+var VERSION = true ? "1.0.9" : "0.0.0-dev";
 var PRIMARY_HOST = "https://easyrouter.io";
 var FALLBACK_HOSTS = ["https://ezr.sh"];
 var HOST_PROBE_TIMEOUT_MS = 5e3;
@@ -250,21 +250,21 @@ async function runZcf(opts) {
     windowsHide: true
   });
   const handleChunk = (chunk, target) => {
-    const text2 = typeof chunk === "string" ? chunk : chunk.toString("utf8");
-    if (target === "out") capturedOut += text2;
-    else capturedErr += text2;
+    const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
+    if (target === "out") capturedOut += text;
+    else capturedErr += text;
     lastDataAt = Date.now();
     if (opts.onProgress) {
       const now = Date.now();
       if (now - lastProgressAt >= PROGRESS_THROTTLE_MS) {
         lastProgressAt = now;
-        const lines = text2.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "").split(/\r?\n/).map((l) => l.trim()).filter(Boolean);
+        const lines = text.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "").split(/\r?\n/).map((l) => l.trim()).filter(Boolean);
         const last = lines[lines.length - 1];
         if (last) opts.onProgress(last.slice(0, 60));
       }
     }
     if (opts.verbose) {
-      process.stderr.write(text2);
+      process.stderr.write(text);
     }
   };
   child.stdout?.on("data", (c) => handleChunk(c, "out"));
@@ -362,7 +362,46 @@ var claudeClient = {
 // src/config/models.ts
 import { log as log2, select, isCancel } from "@clack/prompts";
 import pc4 from "picocolors";
-function toOpenClawCost(m) {
+async function fetchOpenRouterContextMap(verbose) {
+  const map = /* @__PURE__ */ new Map();
+  try {
+    const ctrl = new AbortController();
+    const timer = setTimeout(() => ctrl.abort(), FETCH_MODELS_TIMEOUT_MS);
+    const res = await fetch("https://openrouter.ai/api/v1/models", {
+      signal: ctrl.signal,
+      headers: { "User-Agent": "easyrouter-config/1.0" }
+    });
+    clearTimeout(timer);
+    if (!res.ok) return map;
+    const json = await res.json();
+    const models = Array.isArray(json?.data) ? json.data : [];
+    for (const m of models) {
+      const short = m.id.split("/").pop() ?? m.id;
+      const ctx = m.context_length ?? 0;
+      const maxOut = m.max_completion_tokens ?? Math.min(32768, Math.max(4096, Math.floor(ctx / 4)));
+      const entry = { contextLength: ctx, maxTokens: maxOut };
+      map.set(short.toLowerCase(), entry);
+      map.set(normalizeModelId(short), entry);
+    }
+    if (verbose) log2.info(`\u2713 OpenRouter: \u62C9\u53D6\u5230 ${models.length} \u4E2A\u6A21\u578B\u4E0A\u4E0B\u6587\u4FE1\u606F`);
+  } catch (err) {
+    if (verbose) log2.warn(`OpenRouter \u62C9\u53D6\u5931\u8D25\uFF1A${err?.message}\uFF08\u5C06\u7528\u515C\u5E95 contextWindow\uFF09`);
+  }
+  return map;
+}
+function normalizeModelId(s) {
+  s = s.replace(/-\d{6}$/, "");
+  s = s.replace(/(?<=[a-zA-Z])-(\d+)-(\d+)(?=-|$)/g, "-$1.$2");
+  return s.toLowerCase();
+}
+var _orContextMapPromise = null;
+function getOpenRouterContextMap(verbose) {
+  if (!_orContextMapPromise) {
+    _orContextMapPromise = fetchOpenRouterContextMap(verbose);
+  }
+  return _orContextMapPromise;
+}
+function toOpenClawCost(m, orContextMap) {
   const ratio = m.model_ratio ?? 0;
   const compRatio = m.completion_ratio ?? 1;
   const cacheRatio = m.cache_ratio ?? 0;
@@ -370,9 +409,16 @@ function toOpenClawCost(m) {
   const output = round6(ratio * compRatio * 2e-3);
   const cacheRead = round6(ratio * cacheRatio * 2e-3);
   const cacheWrite = round6(input * 1.25);
-  const tiered = m.tiered_pricing;
-  const contextWindow = tiered?.input?.threshold ?? tiered?.output?.threshold ?? tiered?.cache_read?.threshold ?? 131072;
-  const maxTokens = Math.min(32768, Math.max(4096, Math.floor(contextWindow / 4)));
+  let contextWindow = 131072;
+  let maxTokens = 32768;
+  if (orContextMap) {
+    const name = m.model_name;
+    const hit = orContextMap.get(name.toLowerCase()) ?? orContextMap.get(normalizeModelId(name));
+    if (hit && hit.contextLength > 0) {
+      contextWindow = hit.contextLength;
+      maxTokens = hit.maxTokens;
+    }
+  }
   return {
     cost: { input, output, cacheRead, cacheWrite },
     contextWindow,
@@ -577,7 +623,8 @@ var openClawClient = {
     await runOpenClawSubprocess(args, ctx);
     let registered = 0;
     if (llms.length > 1) {
-      registered = await patchOpenClawJson(llms, defaultModel, ctx);
+      const orContextMap = await getOpenRouterContextMap(ctx.verbose);
+      registered = await patchOpenClawJson(llms, defaultModel, ctx, orContextMap);
     }
     return {
       configPaths: ["~/.openclaw/openclaw.json"],
@@ -585,7 +632,7 @@ var openClawClient = {
     };
   }
 };
-async function patchOpenClawJson(llms, defaultModel, ctx) {
+async function patchOpenClawJson(llms, defaultModel, ctx, orContextMap) {
   const configPath = join(homedir(), ".openclaw", "openclaw.json");
   let json;
   try {
@@ -623,11 +670,13 @@ async function patchOpenClawJson(llms, defaultModel, ctx) {
   let updated = 0;
   const agentsModels = json?.agents?.defaults?.models ?? null;
   for (const m of llms) {
-    const { cost, contextWindow, maxTokens } = toOpenClawCost(m);
+    const { cost, contextWindow, maxTokens } = toOpenClawCost(m, orContextMap);
     const idx = existingById.get(m.model_name);
     if (idx !== void 0) {
       const existing = provider.models[idx];
-      if (existing.cost?.input === 0 && existing.cost?.output === 0) {
+      const costChanged = existing.cost?.input !== cost.input || existing.cost?.output !== cost.output;
+      const ctxChanged = existing.contextWindow !== contextWindow;
+      if (costChanged || ctxChanged) {
         existing.cost = cost;
         existing.contextWindow = contextWindow;
         existing.maxTokens = maxTokens;
@@ -692,20 +741,20 @@ async function runOpenClawSubprocess(args, ctx) {
     windowsHide: true
   });
   const handleChunk = (chunk, target) => {
-    const text2 = typeof chunk === "string" ? chunk : chunk.toString("utf8");
-    if (target === "out") capturedOut += text2;
-    else capturedErr += text2;
+    const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
+    if (target === "out") capturedOut += text;
+    else capturedErr += text;
     lastDataAt = Date.now();
     if (ctx.onProgress) {
       const now = Date.now();
       if (now - lastProgressAt >= PROGRESS_THROTTLE_MS) {
         lastProgressAt = now;
-        const lines = text2.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "").split(/\r?\n/).map((l) => l.trim()).filter(Boolean);
+        const lines = text.replace(/\x1b\[[0-9;]*[a-zA-Z]/g, "").split(/\r?\n/).map((l) => l.trim()).filter(Boolean);
         const last = lines[lines.length - 1];
         if (last) ctx.onProgress(last.slice(0, 60));
       }
     }
-    if (ctx.verbose) process.stderr.write(text2);
+    if (ctx.verbose) process.stderr.write(text);
   };
   child.stdout?.on("data", (c) => handleChunk(c, "out"));
   child.stderr?.on("data", (c) => handleChunk(c, "err"));
@@ -892,9 +941,8 @@ async function main() {
     apiKey = normalizeApiKey(args.apiKey);
     log3.info(`API Key: ${pc6.dim(maskKey(apiKey))}\uFF08\u6765\u81EA\u547D\u4EE4\u884C\u53C2\u6570\uFF09`);
   } else {
-    const input = await text({
+    const input = await password({
       message: "\u8BF7\u8F93\u5165\u4F60\u7684 EasyRouter API Key",
-      placeholder: "sk-xxxxxxxxxxxxxxxx",
       validate(value) {
         if (!value) return "\u4E0D\u80FD\u4E3A\u7A7A";
         if (value.trim().length < 8) return "Key \u957F\u5EA6\u770B\u8D77\u6765\u4E0D\u5BF9";

package/package.json

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