dsh-multi-router 0.6.0 → 0.6.1

package/lib/{chunk-OCMOMSB4.js → chunk-ZQZSXCVR.js}

@@ -6,44 +6,45 @@ import {
   refreshWorkBuddyCheckinCredential,
   supportsCheckin,
   workbuddyToken
-} from "./chunk-NSKCFVHP.js";
+} from "./chunk-2LH6TD2U.js";
 import {
   discoverLocalAccounts,
   importAccount,
   localAccountKey,
   normalizeLocalAccountKey,
   readPortableCredential
-} from "./chunk-JUOESKAK.js";
+} from "./chunk-VZPXRK7Q.js";
 import {
   modelWithCurrentPromotion
 } from "./chunk-TEZ2FMEO.js";
 import {
   ApiService
-} from "./chunk-SNEZMYNU.js";
+} from "./chunk-625KMEYS.js";
 import {
   hostIsLoopback
 } from "./chunk-DNQPZMPF.js";
 import {
   Telemetry,
-  matchModel
-} from "./chunk-ROZINFTV.js";
+  contextInfo,
+  matchModel,
+  resolveContext
+} from "./chunk-DZ4ZUAYH.js";
 import {
   PROVIDERS,
   PROVIDER_NAMES,
   ROUTE_PRESETS,
   beijingDay,
   isFreeModel,
-  reasoningModes,
   routeReasoning,
   validateConfig,
   writePrivateJson
-} from "./chunk-WVNY4LSL.js";
+} from "./chunk-NGVWVIBM.js";
 
 // src/manager.mjs
 import { createHash, randomBytes as randomBytes3, timingSafeEqual } from "node:crypto";
 
 // package.json
-var version = "0.6.0";
+var version = "0.6.1";
 
 // src/manager.mjs
 import { readFile as readFile4, mkdir as mkdir2, mkdtemp as mkdtemp2, rm as rm3 } from "node:fs/promises";
@@ -109,10 +110,10 @@ var options = ["cooldownMs", "requestTimeoutMs", "catalogTtlMs", "retryServerErr
 function settings(config) {
   return {
     ...pick(config, options),
-    models: Object.fromEntries(Object.entries(config.models ?? {}).map(([p, rows]) => [p, Object.fromEntries(Object.entries(rows).map(([id, pref]) => [id, pick(pref, ["name", "visible"])]))])),
+    models: Object.fromEntries(Object.entries(config.models ?? {}).map(([p, rows]) => [p, Object.fromEntries(Object.entries(rows).map(([id, pref]) => [id, pick(pref, ["name", "visible", "contextWindow", "supportsImages", "reasoningEffort"])]))])),
     accounts: config.accounts.map((a) => pick(a, ["id", "provider", "name", "enabled", "autoCheckin"])),
     routes: Object.fromEntries(Object.entries(config.routes).map(([id, r]) => [id, {
-      ...pick(r, ["name", "visible", "strategy", "contextWindow", "maxTokens", "preferExpiringCredits", "expiringWithinDays", "freeOnly", "freeModels"]),
+      ...pick(r, ["name", "visible", "strategy", "contextMode", "contextWindow", "maxTokens", "preferExpiringCredits", "expiringWithinDays", "freeOnly", "freeModels"]),
       targets: r.targets.map((t) => pick(t, ["provider", "account", "model", "models", "weight", "tokenBudget", "creditBudget"]))
     }]))
   };
@@ -1033,8 +1034,8 @@ function modelInfo(row) {
   return {
     id: row.id,
     name: row.name || row.id,
-    contextWindow: finite(row.contextWindow, 2e5),
-    maxTokens: Math.min(finite(row.maxTokens, 32e3), finite(row.contextWindow, 2e5)),
+    ...contextInfo(row),
+    maxTokens: Math.min(finite(row.maxTokens, 32e3), contextInfo(row).maxContextWindow),
     supportsImages: row.supportsImages === true || row.multimodal === true || row.input?.includes("image") === true,
     ...reasoning ? { reasoning } : {},
     ...billing ? { billing } : {},
@@ -1085,7 +1086,7 @@ var Manager = class {
       for (const account of this.config.accounts) {
         const item = saved[account.id];
         if (item?.credentialFile === account.credentialFile && Array.isArray(item.models)) {
-          this.catalogs.set(account.id, { ...item, models: item.models.filter((m) => typeof m.id === "string" && m.id.length > 0).map(modelInfo) });
+          this.catalogs.set(account.id, { ...item, ...item.contextVersion !== 1 ? { fetchedAt: 0 } : {}, models: item.models.filter((m) => typeof m.id === "string" && m.id.length > 0).map(modelInfo) });
         }
       }
     } catch {
@@ -1284,16 +1285,25 @@ var Manager = class {
         const id = `free_${createHash("sha256").update(JSON.stringify([parentId, account.provider, model.id])).digest("hex").slice(0, 24)}`;
         if (!groups.has(id)) groups.set(id, { id, models: [], targets: [], accountNames: [], modelName: model.name, provider: account.provider, modelId: model.id });
         const group = groups.get(id);
-        group.models.push({ model, provider: account.provider });
+        group.models.push({ model, provider: account.provider, accountId: account.id });
         group.targets.push({ provider: account.provider, account: account.id, model: model.id });
         group.accountNames.push(account.name ?? account.id);
       }
     }
     return [...groups.values()].map(({ models, ...group }) => {
-      const preference = row.freeModels?.[group.id] ?? {}, reasoning = routeReasoning(models);
+      const preference = row.freeModels?.[group.id] ?? {};
+      const context = resolveContext(models.map((s) => s.model), preference.contextWindow ?? (row.contextMode === "custom" ? row.contextWindow : null), row.contextWindow);
+      const eligible = models.filter((s) => contextInfo(s.model).maxContextWindow >= context.contextWindow);
+      const eligibleAccountIds = eligible.map((s) => s.accountId);
+      const reasoning = routeReasoning(eligible);
       const selected = preference.reasoningEffort;
       return {
         ...group,
+        ...context,
+        eligibleAccountIds,
+        targets: group.targets.filter((t) => eligibleAccountIds.includes(t.account)),
+        accountNames: group.accountNames.filter((_, i) => eligibleAccountIds.includes(models[i].accountId)),
+        enforceContext: true,
         parentId,
         dynamicFree: true,
         freeOnly: true,
@@ -1306,9 +1316,8 @@ var Manager = class {
         effortUnavailable: !!selected && !reasoning?.supportedEfforts.includes(selected),
         visible: row.visible !== false && preference.visible !== false,
         selected: preference.visible !== false,
-        supportsImages: models.every(({ model }) => model.supportsImages),
-        contextWindow: Math.min(row.contextWindow, ...models.map(({ model }) => model.contextWindow)),
-        maxTokens: Math.min(row.maxTokens, ...models.map(({ model }) => model.maxTokens), ...models.map(({ model }) => model.contextWindow))
+        supportsImages: eligible.every(({ model }) => model.supportsImages),
+        maxTokens: Math.min(row.maxTokens, context.contextWindow, ...eligible.map(({ model }) => model.maxTokens))
       };
     });
   }
@@ -1323,7 +1332,7 @@ var Manager = class {
   publish() {
     this.telemetry.configure(this.config.usageRetentionDays);
     this.revision = revisionOf(this.raw);
-    const routes = { ...this.config.routes };
+    const routes = Object.fromEntries(this.routeModels().map((row) => [row.id, row]));
     for (const model of this.adapterModels().filter((m) => m.dynamicFree)) routes[model.id] = model;
     for (const provider of PROVIDERS) for (const model of this.providerModels(provider)) {
       routes[`${provider}::${model.id}`] = { ...model, targets: [{ provider, model: model.id }] };
@@ -1335,23 +1344,30 @@ var Manager = class {
     const rows = /* @__PURE__ */ new Map();
     for (const account of this.config.accounts.filter((a) => a.provider === provider && a.enabled !== false)) {
       for (const model of this.catalogs.get(account.id)?.models ?? []) {
-        const old = rows.get(model.id);
-        rows.set(model.id, old ? {
-          ...old,
-          contextWindow: Math.min(old.contextWindow, model.contextWindow),
-          maxTokens: Math.min(old.maxTokens, model.maxTokens),
-          supportsImages: old.supportsImages && model.supportsImages,
-          reasoning: routeReasoning([{ model: old, provider }, { model, provider }])
-        } : {
-          ...model,
-          ...reasoningModes(model, provider).length ? { reasoning: routeReasoning([{ model, provider }]) } : {}
-        });
+        if (!rows.has(model.id)) rows.set(model.id, []);
+        rows.get(model.id).push(model);
       }
     }
-    return [...rows.values()].map((model) => ({
-      ...model,
-      name: this.config.models[provider]?.[model.id]?.name ?? model.name
-    }));
+    return [...rows.values()].map((models) => {
+      const model = models[0], preference = this.config.models[provider]?.[model.id] ?? {};
+      const context = resolveContext(models, preference.contextWindow);
+      const eligible = models.filter((m) => contextInfo(m).maxContextWindow >= context.contextWindow);
+      const reasoning = routeReasoning(eligible.map((model2) => ({ model: model2, provider })));
+      const selected = preference.reasoningEffort;
+      return {
+        ...model,
+        ...context,
+        enforceContext: true,
+        name: preference.name ?? model.name,
+        reasoning,
+        supportsImages: preference.supportsImages !== false && eligible.every((m) => m.supportsImages),
+        imageCapable: eligible.every((m) => m.supportsImages),
+        ...selected && reasoning?.supportedEfforts.includes(selected) ? { reasoningEffort: selected } : {},
+        configuredEffort: selected ?? null,
+        effortUnavailable: !!selected && !reasoning?.supportedEfforts.includes(selected),
+        maxTokens: Math.min(context.contextWindow, ...eligible.map((m) => m.maxTokens))
+      };
+    });
   }
   hiddenModels(provider) {
     return this.providerModels(provider).filter((m) => !this.modelVisible(provider, m.id)).map((m) => m.id);
@@ -1365,14 +1381,19 @@ var Manager = class {
       const sources = effectiveTargets.flatMap((target) => this.config.accounts.filter((a) => a.enabled !== false && a.provider === target.provider && (!target.account || target.account === a.id)).flatMap((a) => {
         const catalog = this.catalogs.get(a.id)?.models ?? [];
         const models2 = target.models ? target.models.map((model) => catalog.find((m) => m.id === model)).filter(Boolean) : [matchModel(id, target, catalog)].filter(Boolean);
-        return models2.map((model) => ({ model, provider: a.provider }));
+        return models2.map((model) => ({ model, provider: a.provider, accountId: a.id }));
       }));
-      const models = sources.map((s) => s.model), reasoning = routeReasoning(sources);
+      const context = resolveContext(sources.map((s) => s.model), row.contextMode === "custom" ? row.contextWindow : null, row.contextWindow);
+      const eligible = sources.filter((s) => contextInfo(s.model).maxContextWindow >= context.contextWindow);
+      const models = eligible.map((s) => s.model), reasoning = routeReasoning(eligible);
       return {
         ...row,
+        ...context,
+        enforceContext: true,
         supportsImages: models.length > 0 && models.every((m) => m.supportsImages),
         reasoning,
-        ...row.freeOnly && models.length ? { contextWindow: Math.min(row.contextWindow, ...models.map((m) => m.contextWindow)), maxTokens: Math.min(row.maxTokens, ...models.map((m) => m.maxTokens), ...models.map((m) => m.contextWindow)) } : {},
+        eligibleAccountIds: [...new Set(eligible.map((s) => s.accountId))],
+        maxTokens: Math.min(row.maxTokens, context.contextWindow, ...models.map((m) => m.maxTokens)),
         id,
         name: row.name ?? id,
         expiringStatus: { ...this.telemetry.data.expiringRounds[id] },
@@ -1394,7 +1415,7 @@ var Manager = class {
         const client = await this.router.client(account);
         const models = (await client.models(AbortSignal.timeout(6e4), !!force)).map(modelInfo);
         if (this.closed || !this.config.accounts.some((a) => a.id === account.id && a.credentialFile === account.credentialFile)) return;
-        this.catalogs.set(account.id, { credentialFile: account.credentialFile, fetchedAt: Date.now(), pricingVersion: 1, models });
+        this.catalogs.set(account.id, { credentialFile: account.credentialFile, fetchedAt: Date.now(), pricingVersion: 1, contextVersion: 1, models });
         this.catalogErrors.delete(account.id);
         await withFileLock3(this.catalogFile, () => writePrivateJson(this.catalogFile, Object.fromEntries(this.catalogs)));
       } catch (error) {
@@ -1451,6 +1472,7 @@ var Manager = class {
       presets: Object.entries(ROUTE_PRESETS).map(([id, route]) => ({
         id,
         ...structuredClone(route),
+        providerCount: route.targets.length,
         added: Object.hasOwn(this.config.routes, id),
         availableProviders: [...new Set(route.targets.filter((t) => route.freeOnly ? this.config.accounts.some((a) => a.enabled !== false && a.provider === t.provider && this.freeModels(a).length) : matchModel(id, t, this.providerModels(t.provider))).map((t) => t.provider))]
       })),
@@ -1466,6 +1488,63 @@ var Manager = class {
   }
   async action(input) {
     if (!input || typeof input !== "object" || Array.isArray(input)) bad("\u8BF7\u6C42\u683C\u5F0F\u65E0\u6548");
+    if (input.action === "model.test") {
+      const model = this.providerModels(input.provider).find((m) => m.id === input.id);
+      if (!model) bad("\u8BF7\u5148\u5237\u65B0\u5E76\u9009\u62E9\u5DF2\u53D1\u73B0\u7684\u6A21\u578B");
+      if (this.modelTestFlight || Date.now() - (this.modelTestAt ?? 0) < 1e4) bad("\u8BF7\u7B49\u5F85\u5F53\u524D\u6D4B\u8BD5\u5B8C\u6210\uFF0C\u6D4B\u8BD5\u95F4\u9694\u81F3\u5C11 10 \u79D2");
+      this.modelTestFlight = true;
+      this.modelTestAt = Date.now();
+      this.modelTestAbort = new AbortController();
+      const started = performance.now();
+      let modelTest;
+      try {
+        const { response } = await this.router.chat(
+          {
+            model: `${input.provider}::${input.id}`,
+            stream: true,
+            messages: [{ role: "system", content: "Answer briefly." }, { role: "user", content: "Reply with OK." }],
+            max_tokens: 16
+          },
+          AbortSignal.any([this.modelTestAbort.signal, AbortSignal.timeout(45e3)])
+        );
+        const reader = response.body.getReader();
+        let size = 0, text = "";
+        const decoder = new TextDecoder();
+        try {
+          for (; ; ) {
+            const chunk = await reader.read();
+            if (chunk.done) break;
+            size += chunk.value.byteLength;
+            if (size > 1024 * 1024) throw Error("probe_response_too_large");
+            text += decoder.decode(chunk.value, { stream: true });
+          }
+          text += decoder.decode();
+          let answered = false;
+          for (const line of text.split(/\r?\n/).filter((l) => l.startsWith("data:"))) {
+            if (line.slice(5).trim() === "[DONE]") continue;
+            const payload = JSON.parse(line.slice(5));
+            if (payload.error || payload.choices?.some((c) => c.finish_reason === "error")) throw Error("probe_stream_failed");
+            answered ||= payload.choices?.some((c) => c.delta?.content || c.delta?.reasoning_content || c.delta?.tool_calls?.length) ?? false;
+          }
+          if (!answered || !/^data:\s*\[DONE\]\s*$/m.test(text)) throw Error("probe_incomplete");
+        } finally {
+          await reader.cancel().catch(() => {
+          });
+          reader.releaseLock();
+        }
+        modelTest = { ok: true, elapsedMs: Math.round(performance.now() - started) };
+      } catch (error) {
+        modelTest = {
+          ok: false,
+          status: Number(error.status) || 502,
+          hint: error.hint || "\u6D4B\u8BD5\u672A\u901A\u8FC7\uFF0C\u8BF7\u67E5\u770B\u8D26\u53F7\u72B6\u6001\uFF1B\u4E0D\u4F1A\u81EA\u52A8\u91CD\u8BD5\u3002"
+        };
+      } finally {
+        this.modelTestFlight = false;
+        this.modelTestAbort = void 0;
+      }
+      return { ...this.state(), modelTest };
+    }
     if (input.action?.startsWith("api.")) {
       let result;
       try {
@@ -1769,22 +1848,27 @@ var Manager = class {
           }
         } else if (input.action === "model.update") {
           if (!PROVIDERS.includes(input.provider) || typeof input.id !== "string" || !input.id || input.id.length > 256) bad("\u6A21\u578B\u65E0\u6548");
+          const model = this.providerModels(input.provider).find((m) => m.id === input.id);
+          if (input.contextWindow != null && (!Number.isSafeInteger(input.contextWindow) || input.contextWindow <= 0 || !model || input.contextWindow > model.maxContextWindow)) bad("\u4E0A\u4E0B\u6587\u9884\u7B97\u4E0D\u80FD\u8D85\u8FC7\u8BE5\u6E20\u9053\u6A21\u578B\u7684\u6700\u5927\u5BB9\u91CF");
+          if (input.supportsImages === true && !model?.imageCapable) bad("\u8BE5\u6A21\u578B\u672A\u58F0\u660E\u56FE\u7247\u8F93\u5165\u80FD\u529B");
+          if (input.reasoningEffort != null && !model?.reasoning?.supportedEfforts.includes(input.reasoningEffort)) bad("\u6B64\u6A21\u578B\u4E0D\u652F\u6301\u6240\u9009\u63A8\u7406\u7B49\u7EA7");
           raw.models = { ...raw.models, [input.provider]: {
             ...raw.models?.[input.provider],
             [input.id]: {
               ...raw.models?.[input.provider]?.[input.id],
-              ...input.name !== void 0 ? { name: input.name } : {},
-              ...input.visible !== void 0 ? { visible: input.visible } : {}
+              ...Object.fromEntries(["name", "visible", "contextWindow", "supportsImages", "reasoningEffort"].filter((k) => input[k] !== void 0).map((k) => [k, input[k]]))
             }
           } };
         } else if (input.action === "free.model.update") {
           const parent = raw.routes[input.parentId];
           if (!parent?.freeOnly || !this.freeRoutes(input.parentId, this.config.routes[input.parentId]).some((m) => m.id === input.id)) bad("\u514D\u8D39\u6A21\u578B\u5DF2\u66F4\u65B0\uFF0C\u8BF7\u5237\u65B0\u9875\u9762");
           const model = this.freeRoutes(input.parentId, this.config.routes[input.parentId]).find((m) => m.id === input.id);
+          if (input.contextWindow != null && (!Number.isSafeInteger(input.contextWindow) || input.contextWindow <= 0 || input.contextWindow > model.maxContextWindow)) bad("\u4E0A\u4E0B\u6587\u9884\u7B97\u4E0D\u80FD\u8D85\u8FC7\u8BE5\u514D\u8D39\u6A21\u578B\u7684\u6700\u5927\u5BB9\u91CF");
           if (input.reasoningEffort !== void 0 && input.reasoningEffort !== null && !model.reasoning?.supportedEfforts.includes(input.reasoningEffort)) bad("\u6B64\u514D\u8D39\u6A21\u578B\u4E0D\u652F\u6301\u6240\u9009\u63A8\u7406\u7B49\u7EA7");
           parent.freeModels = { ...parent.freeModels, [input.id]: {
             ...parent.freeModels?.[input.id],
             ...input.visible !== void 0 ? { visible: input.visible } : {},
+            ...input.contextWindow !== void 0 ? { contextWindow: input.contextWindow } : {},
             ...input.reasoningEffort !== void 0 ? { reasoningEffort: input.reasoningEffort } : {}
           } };
         } else if (input.action === "route.save") {
@@ -1941,4 +2025,4 @@ export {
   Manager,
   managementHandler
 };
-//# sourceMappingURL=chunk-OCMOMSB4.js.map
+//# sourceMappingURL=chunk-ZQZSXCVR.js.map