trinity-config 1.3.0 → 1.3.1

package/dist/index.js

@@ -9,7 +9,7 @@ import pc from "picocolors";
 
 // src/constants.ts
 var PACKAGE_NAME = "trinity-config";
-var PACKAGE_VERSION = "1.3.0";
+var PACKAGE_VERSION = "1.3.1";
 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";
@@ -283,129 +283,86 @@ import os from "os";
 import path from "path";
 import { execa } from "execa";
 var TRINITY_CCSWITCH_PROVIDER_NAME = "Trinity";
+var CCSWITCH_URL_SAFE_MAX = 2e3;
 function encodeConfigBase64(raw) {
   return Buffer.from(raw, "utf8").toString("base64");
 }
 function buildClaudeConfigJson(apiKey, endpoint, model) {
-  return `${JSON.stringify(
-    {
-      env: {
-        ANTHROPIC_AUTH_TOKEN: apiKey,
-        ANTHROPIC_API_KEY: apiKey,
-        ANTHROPIC_BASE_URL: endpoint.replace(/\/v1\/?$/, "").replace(/\/+$/, ""),
-        ANTHROPIC_MODEL: model,
-        ANTHROPIC_DEFAULT_SONNET_MODEL: model,
-        ANTHROPIC_DEFAULT_HAIKU_MODEL: model
-      }
-    },
-    null,
-    2
-  )}
-`;
+  return JSON.stringify({
+    env: {
+      ANTHROPIC_AUTH_TOKEN: apiKey,
+      ANTHROPIC_API_KEY: apiKey,
+      ANTHROPIC_BASE_URL: endpoint.replace(/\/v1\/?$/, "").replace(/\/+$/, ""),
+      ANTHROPIC_MODEL: model,
+      ANTHROPIC_DEFAULT_SONNET_MODEL: model,
+      ANTHROPIC_DEFAULT_HAIKU_MODEL: model
+    }
+  });
 }
-function buildCodexConfigToml(apiKey, endpointWithV1, model) {
+function buildCodexConfigToml(_apiKey, endpointWithV1, model) {
   const base = endpointWithV1.replace(/\/+$/, "");
-  return `model_provider = "trinity"
-model = ${JSON.stringify(model)}
-disable_response_storage = true
-
-[model_providers.trinity]
-name = "Trinity"
-base_url = ${JSON.stringify(base)}
-wire_api = "responses"
-requires_openai_auth = true
-temp_env_key = "TRINITY_API_KEY"
-`;
+  return [
+    'model_provider = "trinity"',
+    `model = ${JSON.stringify(model)}`,
+    "disable_response_storage = true",
+    "",
+    "[model_providers.trinity]",
+    'name = "Trinity"',
+    `base_url = ${JSON.stringify(base)}`,
+    'wire_api = "responses"',
+    "requires_openai_auth = true"
+  ].join("\n");
 }
 function buildOpenCodeConfigJson(apiKey, endpoint, model, protocol) {
   const npm = protocol === "anthropic_messages" ? "@ai-sdk/anthropic" : protocol === "responses" ? "@ai-sdk/openai" : "@ai-sdk/openai-compatible";
-  return `${JSON.stringify(
-    {
-      $schema: "https://opencode.ai/config.json",
-      model: `trinity/${model}`,
-      provider: {
-        trinity: {
-          npm,
-          name: "Trinity",
-          options: {
-            baseURL: endpoint.replace(/\/+$/, ""),
-            apiKey
-          },
-          models: {
-            [model]: { name: model }
-          }
+  return JSON.stringify({
+    $schema: "https://opencode.ai/config.json",
+    model: `trinity/${model}`,
+    provider: {
+      trinity: {
+        npm,
+        name: "Trinity",
+        options: {
+          baseURL: endpoint.replace(/\/+$/, ""),
+          apiKey
+        },
+        models: {
+          [model]: { name: model }
         }
       }
-    },
-    null,
-    2
-  )}
-`;
+    }
+  });
 }
 function buildOpenClawConfigJson(apiKey, endpoint, model, protocol) {
   const api = protocol === "anthropic_messages" ? "anthropic-messages" : protocol === "responses" ? "openai-responses" : "openai-completions";
-  return `${JSON.stringify(
-    {
-      models: {
-        mode: "merge",
-        providers: {
-          trinity: {
-            baseUrl: endpoint.replace(/\/+$/, ""),
-            apiKey,
-            api,
-            models: [
-              {
-                id: model,
-                name: model,
-                reasoning: false,
-                input: ["text"],
-                contextWindow: 128e3,
-                maxTokens: 8192
-              }
-            ]
-          }
-        }
-      },
-      agents: {
-        defaults: {
-          model: { primary: `trinity/${model}` },
-          models: { "trinity/*": {} }
+  return JSON.stringify({
+    models: {
+      mode: "merge",
+      providers: {
+        trinity: {
+          baseUrl: endpoint.replace(/\/+$/, ""),
+          apiKey,
+          api,
+          models: [
+            {
+              id: model,
+              name: model,
+              reasoning: false,
+              input: ["text"],
+              contextWindow: 128e3,
+              maxTokens: 8192
+            }
+          ]
         }
       }
     },
-    null,
-    2
-  )}
-`;
-}
-function notesForCcSwitchApp(app, protocol) {
-  const common = [
-    "App-specific Provider\uFF08\u975E Universal\uFF09",
-    "\u5BFC\u5165\u540E\u8BF7\u5728 CC Switch \u4E2D Activate Trinity",
-    "\u52FF\u518D\u5BF9\u540C\u4E00\u5DE5\u5177\u8DD1 trinity-config --type \u76F4\u8FDE\uFF0C\u4EE5\u514D\u4E92\u76F8\u8986\u76D6",
-    "\u6A21\u578B\u5217\u8868\u4EE5\u8BE5 API Key Call Allowlist \u4E3A\u51C6"
-  ];
-  switch (app) {
-    case "claude":
-      return [
-        ...common,
-        "API Format = Anthropic Messages\uFF08\u9ED8\u8BA4\uFF09",
-        "Endpoint \u4E0D\u5E26 /v1",
-        protocol !== "anthropic_messages" ? `\u8B66\u544A: \u5F53\u524D\u62E9\u4F18\u534F\u8BAE\u4E3A ${protocol}\uFF0CClaude \u69FD\u4ECD\u6309 Messages \u5199\u5165\uFF1B\u82E5\u6A21\u578B\u65E0 Messages \u8BF7\u6362\u6A21\u578B` : ""
-      ].filter(Boolean).join("\uFF1B");
-    case "codex":
-      return [
-        ...common,
-        "wire_api=responses\uFF1B\u8BF7\u5173\u95ED Needs Local Routing\uFF08\u76F4\u8FDE Trinity Responses\uFF09",
-        "Endpoint \u586B\u5E26 /v1 \u7684\u524D\u7F00\uFF0C\u907F\u514D\u5199\u6210 \u2026/v1/v1"
-      ].join("\uFF1B");
-    case "opencode":
-      return [...common, `\u534F\u8BAE: ${protocol}`].join("\uFF1B");
-    case "openclaw":
-      return [...common, `\u534F\u8BAE: ${protocol}`, "\u6539\u5B8C\u8BF7\u91CD\u542F OpenClaw Gateway"].join("\uFF1B");
-    case "gemini":
-      return "\u4E0D\u652F\u6301";
-  }
+    agents: {
+      defaults: {
+        model: { primary: `trinity/${model}` },
+        models: { "trinity/*": {} }
+      }
+    }
+  });
 }
 function buildCcSwitchDeepLink(options) {
   const root = (options.rootBaseUrl ?? TRINITY_BASE_URL).replace(/\/+$/, "");
@@ -452,7 +409,6 @@ function buildCcSwitchDeepLink(options) {
     case "gemini":
       throw new Error("gemini \u4E0D\u53D7\u652F\u6301");
   }
-  const notes = notesForCcSwitchApp(options.app, options.protocol);
   const params = new URLSearchParams();
   params.set("resource", "provider");
   params.set("app", options.app);
@@ -465,7 +421,6 @@ function buildCcSwitchDeepLink(options) {
     params.set("sonnetModel", options.model);
     params.set("haikuModel", options.model);
   }
-  params.set("notes", notes);
   params.set("config", encodeConfigBase64(config));
   params.set("configFormat", configFormat);
   if (options.enabled !== false) {
@@ -474,7 +429,6 @@ function buildCcSwitchDeepLink(options) {
   return {
     url: `ccswitch://v1/import?${params.toString()}`,
     endpoint,
-    notes,
     configFormat
   };
 }
@@ -499,20 +453,26 @@ URL=${url}\r
 `, "utf8");
   return { urlFile, txtFile };
 }
-async function openCcSwitchDeepLink(url) {
+async function openCcSwitchDeepLink(url, urlFile) {
+  if (url.length > CCSWITCH_URL_SAFE_MAX) {
+    return "too_long";
+  }
   const platform = process.platform;
   if (platform === "win32") {
-    await execa("cmd", ["/c", "start", "", url], {
-      windowsHide: true,
-      reject: false
-    });
-    return;
+    const command = urlFile && fs.existsSync(urlFile) ? `Start-Process -LiteralPath ${JSON.stringify(urlFile)}` : `Start-Process ${JSON.stringify(url)}`;
+    await execa(
+      "powershell.exe",
+      ["-NoProfile", "-NonInteractive", "-Command", command],
+      { reject: false, windowsHide: true }
+    );
+    return "opened";
   }
   if (platform === "darwin") {
     await execa("open", [url], { reject: false });
-    return;
+    return "opened";
   }
   await execa("xdg-open", [url], { reject: false });
+  return "opened";
 }
 
 // src/merge-claude-env.ts
@@ -1157,19 +1117,17 @@ async function run() {
         spinner2.stop(
           `\u5DF2\u751F\u6210 ${app}\uFF1A${protocolLabel(protocol2)} \u2192 ${link.endpoint}`
         );
-        p.note(link.notes, `${app} \u6CE8\u610F`);
-        p.log.info(`Deep Link \u5DF2\u4FDD\u5B58: ${files.txtFile}`);
-        if (link.url.length > 2e3) {
-          p.note(
-            "Deep Link \u8F83\u957F\uFF0C\u82E5\u7CFB\u7EDF\u65E0\u6CD5\u5524\u8D77\uFF0C\u8BF7\u53CC\u51FB\u843D\u76D8\u7684 .url \u6587\u4EF6\u5BFC\u5165",
-            "\u63D0\u793A"
-          );
+        p.log.info(`\u5BFC\u5165\u6587\u4EF6: ${files.urlFile}`);
+        if (opts.printOnly) {
+          continue;
         }
-        if (!opts.printOnly) {
-          await openCcSwitchDeepLink(link.url);
-          p.log.info("\u5DF2\u5C1D\u8BD5\u5524\u8D77 CC Switch \u5BFC\u5165\u5BF9\u8BDD\u6846\uFF08\u82E5\u672A\u5F39\u51FA\u8BF7\u53CC\u51FB .url \u6587\u4EF6\uFF09");
+        const openResult = await openCcSwitchDeepLink(link.url, files.urlFile);
+        if (openResult === "too_long") {
+          p.log.warn(
+            `\u94FE\u63A5\u8FC7\u957F\uFF08${link.url.length}\uFF09\uFF0C\u672A\u81EA\u52A8\u5524\u8D77\uFF1B\u8BF7\u53CC\u51FB\u5BFC\u5165\u6587\u4EF6`
+          );
         } else {
-          p.log.info(link.url);
+          p.log.info("\u5DF2\u5524\u8D77 CC Switch\uFF0C\u8BF7\u5728\u5BFC\u5165\u6846\u4E2D\u786E\u8BA4");
         }
       } catch (error) {
         spinner2.stop(pc.red(`${app} Deep Link \u5931\u8D25`));
@@ -1178,16 +1136,13 @@ async function run() {
       }
     }
     if (verifyFailed) {
-      p.outro(pc.yellow("\u914D\u7F6E\u5B8C\u6210\uFF08\u9A8C\u8BC1\u672A\u901A\u8FC7\uFF09"));
+      p.outro(pc.yellow("\u5B8C\u6210\uFF08\u9A8C\u8BC1\u672A\u901A\u8FC7\uFF09"));
       return 1;
     }
     p.note(
-      [
-        "\u5728 CC Switch \u5BFC\u5165\u786E\u8BA4\u6846\u4E2D\u6838\u5BF9\u540E Confirm",
-        "\u5207\u6362\u5230\u5BF9\u5E94 App \u9875\u7B7E\uFF0CActivate\u300CTrinity\u300D",
-        `\u843D\u76D8\u6587\u4EF6: ${saved.join(" | ")}`,
-        opts.printOnly ? "\u5DF2 --print-only\uFF0C\u672A\u81EA\u52A8\u6253\u5F00\u5E94\u7528" : "\u82E5\u672A\u5F39\u7A97\uFF1A\u53CC\u51FB\u4E0A\u8FF0 .url\uFF0C\u6216\u68C0\u67E5 ccswitch:// \u534F\u8BAE\u6CE8\u518C"
-      ].join("\n"),
+      opts.printOnly ? `\u5DF2\u751F\u6210\u5BFC\u5165\u6587\u4EF6\uFF08\u672A\u5524\u8D77\uFF09:
+${saved.join("\n")}` : `\u8BF7\u5728 CC Switch \u5BFC\u5165\u6846\u70B9\u786E\u8BA4\uFF1B\u672A\u5F39\u7A97\u5219\u53CC\u51FB:
+${saved.join("\n")}`,
       "\u4E0B\u4E00\u6B65"
     );
     p.outro(pc.green("\u5B8C\u6210"));

package/package.json

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