trinity-config 1.0.0 → 1.1.0

package/README.md

@@ -1,73 +1,56 @@
 # trinity-config
 
-> 一键把 [Trinity API](https://trinitydesk.ai) 接入 **Claude Code** 与 **Codex CLI** —— 粘贴 `xh-` Key 即用
+> 一键把 [Trinity API](https://trinitydesk.ai) 接入 **Claude Code** 或 **Codex CLI** —— 指定工具类型 + 粘贴 `xh-` Key 即用
 
 ## 快速开始
 
-### 交互式（推荐）
+### 交互式
 
 ```bash
 npx -y trinity-config
 ```
 
-### 一行命令
+按提示选择 **工具类型**、粘贴 Key、确认 **model_code**。
 
-```bash
-npx -y trinity-config -k xh-你的key
-```
-
-### 只配其中一个
+### 一行命令（推荐）
 
 ```bash
-npx -y trinity-config -k xh-你的key --only claude
-npx -y trinity-config -k xh-你的key --only codex
-```
-
-完成后：
+# Claude Code
+npx -y trinity-config --type claude -k xh-你的key
 
-```bash
-claude   # Claude Code
-codex    # Codex CLI
+# Codex CLI
+npx -y trinity-config --type codex -k xh-你的key --model gpt-5.4
 ```
 
-## 工作原理
-
-1. 收集 Trinity API Key（`xh-` 前缀）
-2. 调用 [zcf](https://github.com/UfoMiao/zcf) 写入本地配置：
-   - Claude Code → `~/.claude/settings.json`（`ANTHROPIC_BASE_URL` = `https://api.trinitydesk.ai`）
-   - Codex → `~/.codex/config.toml`（Base = `https://api.trinitydesk.ai/v1`）
-3. `GET https://api.trinitydesk.ai/v1/models` 探测连通性
+每次只配置 **一个** 工具；两个都要用时各执行一次。
 
 ## 命令行参数
 
 | 参数 | 简写 | 说明 |
 | --- | --- | --- |
+| `--type` | `-t` | **必填（非交互）**：`claude` \| `codex` |
 | `--api-key` | `-k` | Trinity API Key |
-| `--only` | | `claude` \| `codex` |
+| `--model` | `-M` | 默认 model_code（省略则按 type 内置推荐） |
 | `--base-url` | | 默认 `https://api.trinitydesk.ai` |
-| `--claude-model` | | Claude 默认模型（默认 `claude-sonnet-4-6`） |
-| `--codex-model` | | Codex 默认模型（默认 `gpt-5.4`） |
 | `--skip-verify` | | 跳过连通性验证 |
 | `--verbose` | `-v` | 显示 zcf 详细输出 |
-| `--help` | `-h` | 帮助 |
-| `--version` | `-V` | 版本 |
 
-## 注意
+### 按 type 的默认模型
 
-- 配置后**所有模型调用走 Trinity 计费**，不再使用 Anthropic/OpenAI 官方账号额度。
-- 工具内选择的模型名须为 Trinity 已上架的 `model_code`（可用 `GET /v1/models` 查看）。
-- Windows 下建议用 WSL2 运行 `claude` / `codex`；`npx trinity-config` 可在 PowerShell 执行。
+| `--type` | 默认 `--model` |
+| --- | --- |
+| `claude` | `claude-sonnet-4-6` |
+| `codex` | `gpt-5.4` |
 
-## 开发
+## 扩展新工具
 
-```bash
-cd tools/trinity-config
-npm install
-npm run build
-node dist/index.js --help
-```
+后续增加 Cursor、OpenCode 等时，只需新增 `type` 枚举与对应写入逻辑，**不再**为每个工具增加 `--xxx-model` 参数。
+
+## 注意
 
-发版见仓库 `部署相关/trinity-config-npm发版说明.md`。
+- 配置后**所有模型调用走 Trinity 计费**。
+- 非交互模式必须同时提供 `--type` 与 `-k`。
+- Codex 侧 zcf 写入仍可能有已知限制，见设计文档。
 
 ## License
 

package/dist/index.js

@@ -3,29 +3,55 @@
 import * as p from "@clack/prompts";
 import pc from "picocolors";
 
+// src/constants.ts
+var PACKAGE_NAME = "trinity-config";
+var PACKAGE_VERSION = "1.1.0";
+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";
+var DEFAULT_CODEX_MODEL = "gpt-5.4";
+var VERIFY_TIMEOUT_MS = 15e3;
+
+// src/model.ts
+function defaultModelForType(type) {
+  return type === "claude" ? DEFAULT_CLAUDE_MODEL : DEFAULT_CODEX_MODEL;
+}
+function resolveModel(type, model) {
+  return model?.trim() || defaultModelForType(type);
+}
+function parseToolType(raw) {
+  const value = raw.trim().toLowerCase();
+  if (value === "claude" || value === "codex") {
+    return value;
+  }
+  throw new Error("--type \u987B\u4E3A claude \u6216 codex");
+}
+function toolLabel(type) {
+  return type === "claude" ? "Claude Code" : "Codex CLI";
+}
+
 // src/args.ts
 function printHelp() {
   console.log(`
-trinity-config \u2014 \u4E00\u952E\u628A Trinity API \u63A5\u5165 Claude Code \u4E0E Codex CLI
+trinity-config \u2014 \u4E00\u952E\u628A Trinity API \u63A5\u5165\u7EC8\u7AEF\u7F16\u7A0B\u52A9\u624B
 
 \u7528\u6CD5:
-  npx -y trinity-config [\u9009\u9879]
+  npx -y trinity-config --type <claude|codex> [\u9009\u9879]
 
 \u9009\u9879:
-  -k, --api-key <key>       Trinity API Key\uFF08xh- \u524D\u7F00\uFF09
-  --only <tool>             \u53EA\u914D\u7F6E claude \u6216 codex
-  --base-url <url>          API \u6839\u5730\u5740\uFF08\u9ED8\u8BA4 ${"https://api.trinitydesk.ai"})
-  --claude-model <model>    Claude Code \u9ED8\u8BA4\u6A21\u578B
-  --codex-model <model>     Codex \u9ED8\u8BA4\u6A21\u578B
-  --skip-verify             \u8DF3\u8FC7 GET /v1/models \u8FDE\u901A\u6027\u68C0\u67E5
-  -v, --verbose             \u663E\u793A zcf \u8BE6\u7EC6\u8F93\u51FA
-  -h, --help                \u663E\u793A\u5E2E\u52A9
-  -V, --version             \u663E\u793A\u7248\u672C
+  -t, --type <claude|codex>  \u8981\u914D\u7F6E\u7684\u5DE5\u5177\uFF08\u975E\u4EA4\u4E92\u987B\u6307\u5B9A\uFF1B\u4EA4\u4E92\u5F0F\u53EF\u7701\u7565\uFF09
+  -k, --api-key <key>        Trinity API Key\uFF08xh- \u524D\u7F00\uFF09
+  -M, --model <model_code>   \u9ED8\u8BA4\u6A21\u578B\uFF08\u7701\u7565\u5219\u6309 type \u4F7F\u7528\u5185\u7F6E\u63A8\u8350\uFF09
+  --base-url <url>           API \u6839\u5730\u5740\uFF08\u9ED8\u8BA4 https://api.trinitydesk.ai\uFF09
+  --skip-verify              \u8DF3\u8FC7 GET /v1/models \u8FDE\u901A\u6027\u68C0\u67E5
+  -v, --verbose              \u663E\u793A zcf \u8BE6\u7EC6\u8F93\u51FA
+  -h, --help                 \u663E\u793A\u5E2E\u52A9
+  -V, --version              \u663E\u793A\u7248\u672C
 
 \u793A\u4F8B:
+  npx -y trinity-config --type claude -k xh-your-key
+  npx -y trinity-config --type codex -k xh-your-key --model gpt-5.4
   npx -y trinity-config
-  npx -y trinity-config -k xh-your-key
-  npx -y trinity-config -k xh-your-key --only claude
 `);
 }
 function parseArgs(argv) {
@@ -59,22 +85,27 @@ function parseArgs(argv) {
       case "--api-key":
         opts.apiKey = args.shift();
         break;
-      case "--only": {
-        const only = args.shift();
-        if (only !== "claude" && only !== "codex") {
-          throw new Error("--only \u987B\u4E3A claude \u6216 codex");
-        }
-        opts.only = only;
+      case "-t":
+      case "--type":
+        opts.type = parseToolType(String(args.shift() ?? ""));
+        break;
+      case "-M":
+      case "--model":
+        opts.model = args.shift();
         break;
-      }
       case "--base-url":
         opts.baseUrl = args.shift();
         break;
-      case "--claude-model":
-        opts.claudeModel = args.shift();
+      case "--only": {
+        const legacy = args.shift();
+        console.warn("\u8B66\u544A: --only \u5DF2\u5E9F\u5F03\uFF0C\u8BF7\u6539\u7528 --type claude \u6216 --type codex");
+        opts.type = parseToolType(String(legacy ?? ""));
         break;
+      }
+      case "--claude-model":
       case "--codex-model":
-        opts.codexModel = args.shift();
+        console.warn("\u8B66\u544A: --claude-model / --codex-model \u5DF2\u5E9F\u5F03\uFF0C\u8BF7\u6539\u7528 --type + --model");
+        opts.model = args.shift();
         break;
       default:
         if (arg.startsWith("-")) {
@@ -95,15 +126,11 @@ function normalizeApiKey(raw) {
   }
   return key.startsWith("xh-") ? key : `xh-${key}`;
 }
-
-// src/constants.ts
-var PACKAGE_NAME = "trinity-config";
-var PACKAGE_VERSION = "1.0.0";
-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";
-var DEFAULT_CODEX_MODEL = "gpt-5.4";
-var VERIFY_TIMEOUT_MS = 15e3;
+function requireType(type, hasApiKeyFlag) {
+  if (type) return type;
+  if (!hasApiKeyFlag) return void 0;
+  throw new Error("\u975E\u4EA4\u4E92\u6A21\u5F0F\u987B\u6307\u5B9A --type claude \u6216 --type codex");
+}
 
 // src/merge-claude-env.ts
 import fs from "fs";
@@ -206,11 +233,9 @@ function resolveBaseUrls(baseUrl) {
   const claudeBaseUrl = root.endsWith("/v1") ? root.slice(0, -3) : root;
   return { claudeBaseUrl, codexBaseUrl };
 }
-function defaultModels(claudeModel, codexModel) {
-  return {
-    claudeModel: claudeModel ?? DEFAULT_CLAUDE_MODEL,
-    codexModel: codexModel ?? DEFAULT_CODEX_MODEL
-  };
+function baseUrlForType(type, baseUrl) {
+  const { claudeBaseUrl, codexBaseUrl } = resolveBaseUrls(baseUrl);
+  return type === "claude" ? claudeBaseUrl : codexBaseUrl;
 }
 
 // src/verify.ts
@@ -328,10 +353,47 @@ async function promptApiKey(initial) {
   }
   return normalizeApiKey(String(value));
 }
+async function promptToolType(initial) {
+  if (initial) {
+    return initial;
+  }
+  const value = await p.select({
+    message: "\u8981\u914D\u7F6E\u54EA\u4E2A\u5DE5\u5177\uFF1F",
+    options: [
+      { value: "claude", label: "Claude Code\uFF08/v1/messages\uFF09" },
+      { value: "codex", label: "Codex CLI\uFF08/v1/responses\uFF09" }
+    ]
+  });
+  if (p.isCancel(value)) {
+    p.cancel("\u5DF2\u53D6\u6D88");
+    process.exit(0);
+  }
+  return value;
+}
+async function promptModel(type, initial) {
+  if (initial?.trim()) {
+    return initial.trim();
+  }
+  const fallback = defaultModelForType(type);
+  const value = await p.text({
+    message: `${toolLabel(type)} \u9ED8\u8BA4 model_code`,
+    placeholder: fallback,
+    initialValue: fallback,
+    validate: (input) => {
+      if (!input?.trim()) return "\u8BF7\u8F93\u5165 model_code";
+    }
+  });
+  if (p.isCancel(value)) {
+    p.cancel("\u5DF2\u53D6\u6D88");
+    process.exit(0);
+  }
+  return String(value).trim();
+}
 async function run() {
   let opts;
   try {
     opts = parseArgs(process.argv.slice(2));
+    requireType(opts.type, Boolean(opts.apiKey));
   } catch (error) {
     console.error(pc.red(error instanceof Error ? error.message : String(error)));
     return 1;
@@ -344,34 +406,32 @@ async function run() {
     return 0;
   }
   p.intro(pc.bgCyan(pc.black(` ${PACKAGE_NAME} v${PACKAGE_VERSION} `)));
+  const toolType = await promptToolType(opts.type);
   const apiKey = await promptApiKey(opts.apiKey);
-  const { claudeBaseUrl, codexBaseUrl } = resolveBaseUrls(opts.baseUrl);
-  const models = defaultModels(opts.claudeModel, opts.codexModel);
-  const configureClaudeTool = !opts.only || opts.only === "claude";
-  const configureCodexTool = !opts.only || opts.only === "codex";
+  const model = opts.model?.trim() ? opts.model.trim() : opts.apiKey ? resolveModel(toolType) : await promptModel(toolType);
+  const apiBaseUrl = baseUrlForType(toolType, opts.baseUrl);
+  const { claudeBaseUrl } = resolveBaseUrls(opts.baseUrl);
+  p.log.info(`\u5DE5\u5177: ${toolLabel(toolType)} \xB7 \u6A21\u578B: ${model}`);
   const spinner2 = p.spinner();
-  if (configureClaudeTool) {
+  if (toolType === "claude") {
     spinner2.start("\u914D\u7F6E Claude Code\u2026");
     try {
-      await configureClaude(apiKey, claudeBaseUrl, models.claudeModel, opts.verbose);
-      mergeClaudeEnv(models.claudeModel, models.claudeModel, claudeBaseUrl);
+      await configureClaude(apiKey, apiBaseUrl, model, opts.verbose);
+      mergeClaudeEnv(model, model, apiBaseUrl);
       spinner2.stop("Claude Code \u914D\u7F6E\u5DF2\u5199\u5165 ~/.claude/settings.json");
     } catch (error) {
       spinner2.stop(pc.red("Claude Code \u914D\u7F6E\u5931\u8D25"));
-      const message = error instanceof Error && "timed out" in error ? "zcf \u6267\u884C\u8D85\u65F6\uFF08>3 \u5206\u949F\uFF09\u3002\u8BF7\u68C0\u67E5\u7F51\u7EDC\u6216\u7A0D\u540E\u91CD\u8BD5\uFF1Anpx -y zcf init --help" : error instanceof Error ? error.message : String(error);
-      console.error(message);
+      console.error(formatZcfError(error));
       return 1;
     }
-  }
-  if (configureCodexTool) {
+  } else {
     spinner2.start("\u914D\u7F6E Codex CLI\u2026");
     try {
-      await configureCodex(apiKey, codexBaseUrl, models.codexModel, opts.verbose);
+      await configureCodex(apiKey, apiBaseUrl, model, opts.verbose);
       spinner2.stop("Codex \u914D\u7F6E\u5DF2\u5199\u5165 ~/.codex/");
     } catch (error) {
       spinner2.stop(pc.red("Codex \u914D\u7F6E\u5931\u8D25"));
-      const message = error instanceof Error && "timed out" in error ? "zcf \u6267\u884C\u8D85\u65F6\uFF08>3 \u5206\u949F\uFF09\u3002\u8BF7\u68C0\u67E5\u7F51\u7EDC\u6216\u7A0D\u540E\u91CD\u8BD5\u3002" : error instanceof Error ? error.message : String(error);
-      console.error(message);
+      console.error(formatZcfError(error));
       return 1;
     }
   }
@@ -381,14 +441,9 @@ async function run() {
     if (result.ok) {
       spinner2.stop(pc.green(result.message));
       const recommended = pickRecommendedModels(result.modelIds ?? []);
-      if (recommended.claude || recommended.codex) {
-        p.note(
-          [
-            recommended.claude ? `Claude \u63A8\u8350\u6A21\u578B: ${recommended.claude}` : null,
-            recommended.codex ? `Codex \u63A8\u8350\u6A21\u578B: ${recommended.codex}` : null
-          ].filter(Boolean).join("\n"),
-          "\u6A21\u578B"
-        );
+      const hint = toolType === "claude" ? recommended.claude : recommended.codex;
+      if (hint && hint !== model) {
+        p.note(`\u540C\u7C7B\u578B\u63A8\u8350\u6A21\u578B: ${hint}`, "\u6A21\u578B");
       }
     } else {
       spinner2.stop(pc.yellow(result.message));
@@ -400,16 +455,24 @@ async function run() {
       return 1;
     }
   }
-  const nextSteps = [
-    configureClaudeTool ? "\u8FD0\u884C claude \u542F\u52A8 Claude Code" : null,
-    configureCodexTool ? "\u8FD0\u884C codex \u542F\u52A8 Codex CLI" : null,
-    "\u5728\u5DE5\u5177\u5185\u7528 /model \u5207\u6362\u4E3A Trinity \u5DF2\u4E0A\u67B6\u7684 model_code",
-    "\u914D\u7F6E\u540E\u8BF7\u6C42\u8D70 Trinity \u8BA1\u8D39\uFF0C\u4E0D\u518D\u4F7F\u7528 Anthropic/OpenAI \u5B98\u65B9\u989D\u5EA6"
-  ].filter(Boolean).join("\n");
-  p.note(nextSteps, "\u4E0B\u4E00\u6B65");
+  const launchCmd = toolType === "claude" ? "claude" : "codex";
+  p.note(
+    [
+      `\u8FD0\u884C ${launchCmd} \u542F\u52A8 ${toolLabel(toolType)}`,
+      "\u5728\u5DE5\u5177\u5185\u7528 /model \u5207\u6362\u4E3A Trinity \u5DF2\u4E0A\u67B6\u7684 model_code",
+      "\u914D\u7F6E\u540E\u8BF7\u6C42\u8D70 Trinity \u8BA1\u8D39\uFF0C\u4E0D\u518D\u4F7F\u7528 Anthropic/OpenAI \u5B98\u65B9\u989D\u5EA6"
+    ].join("\n"),
+    "\u4E0B\u4E00\u6B65"
+  );
   p.outro(pc.green("\u5B8C\u6210"));
   return 0;
 }
+function formatZcfError(error) {
+  if (error instanceof Error && "timed out" in error) {
+    return "zcf \u6267\u884C\u8D85\u65F6\uFF08>3 \u5206\u949F\uFF09\u3002\u8BF7\u68C0\u67E5\u7F51\u7EDC\u6216\u7A0D\u540E\u91CD\u8BD5\u3002";
+  }
+  return error instanceof Error ? error.message : String(error);
+}
 run().then((code) => process.exit(code)).catch((error) => {
   console.error(pc.red(error instanceof Error ? error.stack ?? error.message : String(error)));
   process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trinity-config",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "一键把 Trinity API 接入 Claude Code 与 Codex CLI",
   "license": "MIT",
   "type": "module",