trinity-config 1.2.4 → 1.2.5

package/README.md

@@ -4,7 +4,7 @@
 
 协议按 `GET /v1/models/{code}` 的 `capabilities.text.interfaces` **自动择优**（Anthropic → Responses → Completions），再与工具能力求交。
 
-写入客户端的模型列表来自 `GET /v1/models?modality=text`（仅生文/多模态，不含生图/生视频）。
+写入客户端的模型列表来自该 API Key 的 `GET /v1/models?modality=text`（Call Allowlist 内生文/多模态；不含生图/生视频，也不含无权限模型）。
 
 ```bash
 npx -y trinity-config --type zcode -k xh-你的key --model gpt-5.4

package/dist/chunk-5WZW5Y4W.js

@@ -0,0 +1,45 @@
+// src/text-models.ts
+function isLikelyNonTextModel(id) {
+  const lower = id.toLowerCase();
+  return lower.includes("image") || lower.includes("video") || lower.includes("seedance") || lower.includes("wan-") || lower.includes("kling") || lower.includes("og-image") || lower.includes("midjourney") || lower.includes("flux");
+}
+function filterTextModelIds(primaryModel, modelIds, limit = 80) {
+  const ids = [];
+  const seen = /* @__PURE__ */ new Set();
+  const push = (raw, enforceTextHeuristic) => {
+    const trimmed = raw?.trim();
+    if (!trimmed || seen.has(trimmed)) return;
+    if (enforceTextHeuristic && isLikelyNonTextModel(trimmed)) return;
+    seen.add(trimmed);
+    ids.push(trimmed);
+  };
+  if (modelIds && modelIds.length > 0) {
+    const allow = new Set(
+      modelIds.map((id) => id?.trim()).filter((id) => Boolean(id))
+    );
+    if (allow.has(primaryModel.trim())) {
+      push(primaryModel, false);
+    }
+    for (const id of modelIds) {
+      if (ids.length >= limit) break;
+      push(id, true);
+    }
+    return ids;
+  }
+  push(primaryModel, true);
+  return ids;
+}
+function pickAllowedDefaultModel(preferred, allowlist, candidates) {
+  const allow = new Set(allowlist.map((id) => id.trim()).filter(Boolean));
+  if (allow.has(preferred.trim())) return preferred.trim();
+  for (const c of candidates) {
+    const t = c?.trim();
+    if (t && allow.has(t)) return t;
+  }
+  return allowlist.map((id) => id.trim()).find(Boolean);
+}
+
+export {
+  filterTextModelIds,
+  pickAllowedDefaultModel
+};

package/dist/index.js

@@ -1,11 +1,15 @@
 #!/usr/bin/env node
+import {
+  pickAllowedDefaultModel
+} from "./chunk-5WZW5Y4W.js";
+
 // src/index.ts
 import * as p from "@clack/prompts";
 import pc from "picocolors";
 
 // src/constants.ts
 var PACKAGE_NAME = "trinity-config";
-var PACKAGE_VERSION = "1.2.4";
+var PACKAGE_VERSION = "1.2.5";
 var TRINITY_BASE_URL = "https://api.trinitydesk.ai";
 var DEFAULT_CLAUDE_MODEL = "claude-sonnet-4-6";
 var DEFAULT_CLAUDE_FAST_MODEL = "claude-sonnet-4-6";
@@ -422,7 +426,7 @@ async function configureCodex(apiKey, codexBaseUrl, codexModel, _verbose) {
   return configureCodexDirect(apiKey, codexBaseUrl, codexModel);
 }
 async function configureOpenCode(apiKey, openCodeBaseUrl, model, modelIds, protocol) {
-  const { configureOpenCodeDirect } = await import("./merge-opencode-config-XGIZYPOW.js");
+  const { configureOpenCodeDirect } = await import("./merge-opencode-config-JTWAGCET.js");
   return configureOpenCodeDirect({
     apiKey,
     baseUrl: openCodeBaseUrl,
@@ -432,7 +436,7 @@ async function configureOpenCode(apiKey, openCodeBaseUrl, model, modelIds, proto
   });
 }
 async function configureOpenClaw(apiKey, openClawBaseUrl, model, modelIds, protocol) {
-  const { configureOpenClawDirect } = await import("./merge-openclaw-config-KMG3FYK6.js");
+  const { configureOpenClawDirect } = await import("./merge-openclaw-config-F77TZKPG.js");
   return configureOpenClawDirect({
     apiKey,
     baseUrl: openClawBaseUrl,
@@ -442,7 +446,7 @@ async function configureOpenClaw(apiKey, openClawBaseUrl, model, modelIds, proto
   });
 }
 async function configureZCode(apiKey, zcodeBaseUrl, model, modelIds, protocol) {
-  const { configureZCodeDirect } = await import("./merge-zcode-config-PTPY6RXN.js");
+  const { configureZCodeDirect } = await import("./merge-zcode-config-LGTBU4UC.js");
   return configureZCodeDirect({
     apiKey,
     baseUrl: zcodeBaseUrl,
@@ -532,7 +536,7 @@ async function verifyTrinityApi(apiKey, baseUrl = TRINITY_BASE_URL) {
     return {
       ok: true,
       statusCode,
-      message: `\u8FDE\u901A\u6210\u529F\uFF08${modelIds.length} \u4E2A\u751F\u6587\u6A21\u578B\uFF09`,
+      message: `\u8FDE\u901A\u6210\u529F\uFF08\u8BE5 Key \u53EF\u7528\u751F\u6587\u6A21\u578B ${modelIds.length} \u4E2A\uFF09`,
       modelIds
     };
   } catch (error) {
@@ -642,7 +646,7 @@ async function run() {
   p.intro(pc.bgCyan(pc.black(` ${PACKAGE_NAME} v${PACKAGE_VERSION} `)));
   const toolType = await promptToolType(opts.type);
   const apiKey = await promptApiKey(opts.apiKey);
-  const model = opts.model?.trim() ? opts.model.trim() : opts.apiKey ? resolveModel(toolType) : await promptModel(toolType);
+  let model = opts.model?.trim() ? opts.model.trim() : opts.apiKey ? resolveModel(toolType) : await promptModel(toolType);
   const apiRoot = rootBaseUrl(opts.baseUrl);
   p.log.info(`\u5DE5\u5177: ${toolLabel(toolType)} \xB7 \u6A21\u578B: ${model}`);
   const spinner2 = p.spinner();
@@ -653,20 +657,48 @@ async function run() {
     const result = await verifyTrinityApi(apiKey, apiRoot);
     if (result.ok) {
       spinner2.stop(pc.green(result.message));
-      verifiedModelIds = result.modelIds;
-      const recommended = pickRecommendedModels(result.modelIds ?? []);
+      verifiedModelIds = result.modelIds ?? [];
+      if (verifiedModelIds.length === 0) {
+        p.outro(pc.red("\u8BE5 API Key \u6CA1\u6709\u53EF\u7528\u7684\u751F\u6587\u6A21\u578B\uFF08Call Allowlist \u4E3A\u7A7A\uFF09"));
+        return 1;
+      }
+      const recommended = pickRecommendedModels(verifiedModelIds);
       const hint = recommendedHint(toolType, recommended);
-      if (hint && hint !== model) {
+      const allowed = pickAllowedDefaultModel(model, verifiedModelIds, [
+        hint,
+        recommended.claude,
+        recommended.codex,
+        recommended.opencode,
+        recommended.openclaw,
+        recommended.zcode,
+        defaultModelForType(toolType)
+      ]);
+      if (!allowed) {
+        p.outro(pc.red("\u65E0\u6CD5\u5728\u8BE5 API Key \u7684\u53EF\u7528\u751F\u6587\u6A21\u578B\u4E2D\u9009\u51FA\u9ED8\u8BA4\u6A21\u578B"));
+        return 1;
+      }
+      if (allowed !== model) {
+        p.note(
+          `\u6A21\u578B ${model} \u4E0D\u5728\u8BE5 Key \u53EF\u7528\u5217\u8868\u4E2D\uFF0C\u5DF2\u6539\u4E3A ${allowed}\uFF08\u5171 ${verifiedModelIds.length} \u4E2A\u53EF\u7528\u751F\u6587\u6A21\u578B\uFF09`,
+          "\u6743\u9650"
+        );
+        model = allowed;
+      } else if (hint && hint !== model) {
         p.note(`\u540C\u7C7B\u578B\u63A8\u8350\u6A21\u578B: ${hint}`, "\u6A21\u578B");
       }
     } else {
       verifyFailed = true;
       spinner2.stop(pc.yellow(result.message));
       p.note(
-        "\u8FDE\u901A\u6027\u68C0\u67E5\u672A\u901A\u8FC7\uFF1B\u4ECD\u5C06\u5C1D\u8BD5\u5199\u5165\u672C\u5730\u914D\u7F6E\u3002\u8BF7\u68C0\u67E5 API Key\u3001\u7F51\u7EDC\uFF0C\u6216\u5728\u63A7\u5236\u53F0\u786E\u8BA4 Key \u6709\u6548\u3002",
+        "\u8FDE\u901A\u6027\u68C0\u67E5\u672A\u901A\u8FC7\uFF1B\u4ECD\u5C06\u5C1D\u8BD5\u5199\u5165\u672C\u5730\u914D\u7F6E\uFF08\u4E0D\u4F1A\u540C\u6B65\u6A21\u578B\u5217\u8868\uFF09\u3002\u8BF7\u68C0\u67E5 API Key\u3001\u7F51\u7EDC\uFF0C\u6216\u5728\u63A7\u5236\u53F0\u786E\u8BA4 Key \u6709\u6548\u3002",
         "\u63D0\u793A"
       );
     }
+  } else {
+    p.note(
+      "--skip-verify \u5DF2\u8DF3\u8FC7\uFF1A\u65E0\u6CD5\u6309 Key \u6743\u76CA\u62C9\u53D6\u53EF\u7528\u6A21\u578B\u5217\u8868\uFF0C\u4EC5\u5199\u5165\u6307\u5B9A\u9ED8\u8BA4\u6A21\u578B\u3002",
+      "\u63D0\u793A"
+    );
   }
   spinner2.start("\u89E3\u6790\u6A21\u578B\u534F\u8BAE\u2026");
   let protocolRes;

package/dist/{merge-openclaw-config-KMG3FYK6.js → merge-openclaw-config-F77TZKPG.js}

@@ -1,6 +1,6 @@
 import {
   filterTextModelIds
-} from "./chunk-QS4QYSMM.js";
+} from "./chunk-5WZW5Y4W.js";
 
 // src/merge-openclaw-config.ts
 import fs from "fs";
@@ -71,22 +71,13 @@ function mergeOpenClawConfig(options) {
   modelsBlock.mode = modelsBlock.mode ?? "merge";
   const providers = modelsBlock.providers && typeof modelsBlock.providers === "object" ? { ...modelsBlock.providers } : {};
   const existing = providers[TRINITY_OPENCLAW_PROVIDER] ?? {};
-  const existingModels = Array.isArray(existing.models) ? existing.models : [];
-  const byId = /* @__PURE__ */ new Map();
-  for (const m of existingModels) {
-    if (m && typeof m === "object" && typeof m.id === "string") {
-      byId.set(m.id, m);
-    }
-  }
-  for (const m of buildModelEntries(options.model, options.modelIds)) {
-    byId.set(m.id, { ...byId.get(m.id), ...m });
-  }
+  const nextModels = buildModelEntries(options.model, options.modelIds);
   providers[TRINITY_OPENCLAW_PROVIDER] = {
     ...existing,
     baseUrl: options.baseUrl.replace(/\/+$/, ""),
     apiKey: options.apiKey,
     api,
-    models: [...byId.values()]
+    models: nextModels
   };
   modelsBlock.providers = providers;
   doc.models = modelsBlock;

package/dist/{merge-opencode-config-XGIZYPOW.js → merge-opencode-config-JTWAGCET.js}

@@ -1,6 +1,6 @@
 import {
   filterTextModelIds
-} from "./chunk-QS4QYSMM.js";
+} from "./chunk-5WZW5Y4W.js";
 
 // src/merge-opencode-config.ts
 import fs from "fs";
@@ -65,7 +65,7 @@ function mergeOpenCodeConfig(options) {
   doc.model = `${TRINITY_OPENCODE_PROVIDER}/${options.model}`;
   const providers = doc.provider && typeof doc.provider === "object" ? { ...doc.provider } : {};
   const existing = providers[TRINITY_OPENCODE_PROVIDER] ?? {};
-  const existingModels = existing.models && typeof existing.models === "object" ? existing.models : {};
+  const nextModels = buildModelMap(options.model, options.modelIds);
   providers[TRINITY_OPENCODE_PROVIDER] = {
     ...existing,
     npm,
@@ -75,10 +75,7 @@ function mergeOpenCodeConfig(options) {
       baseURL: options.baseUrl.replace(/\/+$/, ""),
       apiKey: options.apiKey
     },
-    models: {
-      ...existingModels,
-      ...buildModelMap(options.model, options.modelIds)
-    }
+    models: nextModels
   };
   doc.provider = providers;
   fs.mkdirSync(path.dirname(configPath), { recursive: true });

package/dist/{merge-zcode-config-PTPY6RXN.js → merge-zcode-config-LGTBU4UC.js}

@@ -1,6 +1,6 @@
 import {
   filterTextModelIds
-} from "./chunk-QS4QYSMM.js";
+} from "./chunk-5WZW5Y4W.js";
 
 // src/merge-zcode-config.ts
 import fs from "fs";
@@ -108,17 +108,13 @@ function mergeZCodeConfig(options) {
     }
   }
   const existing = providers[TRINITY_ZCODE_PROVIDER] ?? {};
-  const existingModels = existing.models && typeof existing.models === "object" ? existing.models : {};
   const root = options.baseUrl.replace(/\/v1\/?$/, "").replace(/\/+$/, "");
   const withV1 = `${root}/v1`;
   const withoutV1 = root;
   const binding = zcodeProtocolBinding(options.protocol);
   const primaryBase = options.protocol === "anthropic_messages" ? withoutV1 : withV1;
   const now = Date.now();
-  const models = {
-    ...existingModels,
-    ...buildModels(options.model, options.modelIds, binding)
-  };
+  const models = buildModels(options.model, options.modelIds, binding);
   providers[TRINITY_ZCODE_PROVIDER] = {
     ...existing,
     enabled: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trinity-config",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "一键把 Trinity API 接入 Claude Code、Codex、OpenCode、OpenClaw、ZCode",
   "license": "MIT",
   "type": "module",

package/dist/chunk-QS4QYSMM.js

@@ -1,26 +0,0 @@
-// src/text-models.ts
-function isLikelyNonTextModel(id) {
-  const lower = id.toLowerCase();
-  return lower.includes("image") || lower.includes("video") || lower.includes("seedance") || lower.includes("wan-") || lower.includes("kling") || lower.includes("og-image") || lower.includes("midjourney") || lower.includes("flux");
-}
-function filterTextModelIds(primaryModel, modelIds, limit = 80) {
-  const ids = [];
-  const seen = /* @__PURE__ */ new Set();
-  const push = (raw) => {
-    const trimmed = raw?.trim();
-    if (!trimmed || seen.has(trimmed)) return;
-    if (ids.length > 0 && isLikelyNonTextModel(trimmed)) return;
-    seen.add(trimmed);
-    ids.push(trimmed);
-  };
-  push(primaryModel);
-  for (const id of modelIds ?? []) {
-    if (ids.length >= limit) break;
-    push(id);
-  }
-  return ids;
-}
-
-export {
-  filterTextModelIds
-};