trinity-config 1.1.0 → 1.1.1

package/README.md

@@ -50,7 +50,8 @@ npx -y trinity-config --type codex -k xh-你的key --model gpt-5.4
 
 - 配置后**所有模型调用走 Trinity 计费**。
 - 非交互模式必须同时提供 `--type` 与 `-k`。
-- Codex 侧 zcf 写入仍可能有已知限制，见设计文档。
+- **Claude Code**：经 zcf 写入 `~/.claude/settings.json`
+- **Codex CLI**：**直接** merge `~/.codex/config.toml` + `auth.json`（不调用 zcf；zcf cx 会重置为 ChatGPT 官方登录）
 
 ## License
 

package/dist/index.js

@@ -5,7 +5,7 @@ import pc from "picocolors";
 
 // src/constants.ts
 var PACKAGE_NAME = "trinity-config";
-var PACKAGE_VERSION = "1.1.0";
+var PACKAGE_VERSION = "1.1.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";
@@ -218,14 +218,9 @@ async function configureClaude(apiKey, baseUrl, claudeModel, verbose) {
     verbose
   });
 }
-async function configureCodex(apiKey, codexBaseUrl, codexModel, verbose) {
-  await runZcfInit({
-    codeType: "cx",
-    apiKey,
-    baseUrl: codexBaseUrl,
-    primaryModel: codexModel,
-    verbose
-  });
+async function configureCodex(apiKey, codexBaseUrl, codexModel, _verbose) {
+  const { configureCodexDirect } = await import("./merge-codex-config-GC7ZDP7R.js");
+  return configureCodexDirect(apiKey, codexBaseUrl, codexModel);
 }
 function resolveBaseUrls(baseUrl) {
   const root = (baseUrl ?? TRINITY_BASE_URL).replace(/\/+$/, "");
@@ -427,8 +422,10 @@ async function run() {
   } else {
     spinner2.start("\u914D\u7F6E Codex CLI\u2026");
     try {
-      await configureCodex(apiKey, apiBaseUrl, model, opts.verbose);
-      spinner2.stop("Codex \u914D\u7F6E\u5DF2\u5199\u5165 ~/.codex/");
+      const backupDir = await configureCodex(apiKey, apiBaseUrl, model, opts.verbose);
+      const backupHint = backupDir ? `
+\u5907\u4EFD: ${backupDir}` : "";
+      spinner2.stop(`Codex \u914D\u7F6E\u5DF2\u5199\u5165 ~/.codex/config.toml \u4E0E auth.json${backupHint}`);
     } catch (error) {
       spinner2.stop(pc.red("Codex \u914D\u7F6E\u5931\u8D25"));
       console.error(formatZcfError(error));

package/dist/merge-codex-config-GC7ZDP7R.js

@@ -0,0 +1,107 @@
+// src/merge-codex-config.ts
+import fs from "fs";
+import os from "os";
+import path from "path";
+import { parse, stringify } from "smol-toml";
+var TRINITY_CODEX_PROVIDER = "trinity";
+var TRINITY_CODEX_TEMP_ENV_KEY = "TRINITY_API_KEY";
+function codexHome() {
+  return process.env.CODEX_HOME?.trim() || path.join(os.homedir(), ".codex");
+}
+function codexConfigPath() {
+  return path.join(codexHome(), "config.toml");
+}
+function codexAuthPath() {
+  return path.join(codexHome(), "auth.json");
+}
+function timestampLabel() {
+  const now = /* @__PURE__ */ new Date();
+  const pad = (n) => String(n).padStart(2, "0");
+  return `${now.getFullYear()}-${pad(now.getMonth() + 1)}-${pad(now.getDate())}_${pad(now.getHours())}-${pad(now.getMinutes())}-${pad(now.getSeconds())}`;
+}
+function backupCodexFiles() {
+  const home = codexHome();
+  const configPath = codexConfigPath();
+  const authPath = codexAuthPath();
+  if (!fs.existsSync(configPath) && !fs.existsSync(authPath)) {
+    return null;
+  }
+  const backupDir = path.join(home, "backup", `trinity-config-${timestampLabel()}`);
+  fs.mkdirSync(backupDir, { recursive: true });
+  for (const src of [configPath, authPath]) {
+    if (fs.existsSync(src)) {
+      fs.copyFileSync(src, path.join(backupDir, path.basename(src)));
+    }
+  }
+  return backupDir;
+}
+function readCodexConfigDoc() {
+  const configPath = codexConfigPath();
+  if (!fs.existsSync(configPath)) {
+    return {};
+  }
+  const raw = fs.readFileSync(configPath, "utf8");
+  if (!raw.trim()) {
+    return {};
+  }
+  try {
+    return parse(raw);
+  } catch {
+    throw new Error(`\u65E0\u6CD5\u89E3\u6790 ${configPath}\uFF0C\u8BF7\u68C0\u67E5 TOML \u8BED\u6CD5\u540E\u91CD\u8BD5\u3002`);
+  }
+}
+function buildTrinityProvider(baseUrl) {
+  return {
+    name: "Trinity API",
+    base_url: baseUrl.replace(/\/+$/, ""),
+    wire_api: "responses",
+    temp_env_key: TRINITY_CODEX_TEMP_ENV_KEY,
+    requires_openai_auth: false
+  };
+}
+function mergeCodexConfig(model, baseUrl) {
+  const configPath = codexConfigPath();
+  const doc = readCodexConfigDoc();
+  doc.model = model;
+  doc.model_provider = TRINITY_CODEX_PROVIDER;
+  doc.disable_response_storage = true;
+  const providers = doc.model_providers && typeof doc.model_providers === "object" ? { ...doc.model_providers } : {};
+  providers[TRINITY_CODEX_PROVIDER] = buildTrinityProvider(baseUrl);
+  doc.model_providers = providers;
+  fs.mkdirSync(path.dirname(configPath), { recursive: true });
+  fs.writeFileSync(configPath, `${stringify(doc)}
+`, "utf8");
+}
+function mergeCodexAuth(apiKey) {
+  const authPath = codexAuthPath();
+  let auth = {};
+  if (fs.existsSync(authPath)) {
+    try {
+      auth = JSON.parse(fs.readFileSync(authPath, "utf8"));
+    } catch {
+      auth = {};
+    }
+  }
+  auth[TRINITY_CODEX_TEMP_ENV_KEY] = apiKey;
+  auth.OPENAI_API_KEY = apiKey;
+  fs.mkdirSync(path.dirname(authPath), { recursive: true });
+  fs.writeFileSync(authPath, `${JSON.stringify(auth, null, 2)}
+`, "utf8");
+}
+function configureCodexDirect(apiKey, codexBaseUrl, model) {
+  const backupDir = backupCodexFiles();
+  mergeCodexConfig(model, codexBaseUrl);
+  mergeCodexAuth(apiKey);
+  return backupDir;
+}
+export {
+  TRINITY_CODEX_PROVIDER,
+  TRINITY_CODEX_TEMP_ENV_KEY,
+  backupCodexFiles,
+  codexAuthPath,
+  codexConfigPath,
+  codexHome,
+  configureCodexDirect,
+  mergeCodexAuth,
+  mergeCodexConfig
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trinity-config",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "一键把 Trinity API 接入 Claude Code 与 Codex CLI",
   "license": "MIT",
   "type": "module",
@@ -42,7 +42,8 @@
   "dependencies": {
     "@clack/prompts": "^0.11.0",
     "execa": "^9.5.2",
-    "picocolors": "^1.1.1"
+    "picocolors": "^1.1.1",
+    "smol-toml": "^1.3.1"
   },
   "devDependencies": {
     "@types/node": "^22.10.0",