zcf 3.4.0 → 3.4.1

package/README.md

@@ -68,6 +68,12 @@ More usage, options, and workflows: see documentation.
 
 - https://zcf.ufomiao.com/
 
+## 💬 Community
+
+Join our Telegram group for support, discussions, and updates:
+
+[![Telegram](https://img.shields.io/badge/Telegram-Join%20Chat-blue?style=flat&logo=telegram)](https://t.me/ufomiao_zcf)
+
 ## 🙏 Acknowledgments
 
 This project is inspired by and incorporates work from:

package/dist/chunks/simple-config.mjs

@@ -18,7 +18,7 @@ import { rm, mkdir, copyFile as copyFile$1 } from 'node:fs/promises';
 import i18next from 'i18next';
 import Backend from 'i18next-fs-backend';
 
-const version = "3.4.0";
+const version = "3.4.1";
 const homepage = "https://github.com/UfoMiao/zcf";
 
 const i18n = i18next.createInstance();
@@ -2150,7 +2150,7 @@ async function updateClaudeCode(force = false, skipPrompt = false) {
     }
     const updateSpinner = ora(format(i18n.t("updater:updating"), { tool: "Claude Code" })).start();
     try {
-      await execAsync$2("npm update -g @anthropic-ai/claude-code");
+      await execAsync$2("claude update");
       updateSpinner.succeed(format(i18n.t("updater:updateSuccess"), { tool: "Claude Code" }));
       return true;
     } catch (error) {
@@ -3007,15 +3007,52 @@ function getRootDir$1() {
   }
   return dirname(currentFilePath);
 }
+async function detectCodexInstallMethod() {
+  try {
+    const brewResult = await x("brew", ["list", "--cask", "codex"], { throwOnError: false });
+    if (brewResult.exitCode === 0) {
+      return "homebrew";
+    }
+  } catch {
+  }
+  try {
+    const npmResult = await x("npm", ["list", "-g", "@openai/codex"], { throwOnError: false });
+    if (npmResult.exitCode === 0 && npmResult.stdout.includes("@openai/codex")) {
+      return "npm";
+    }
+  } catch {
+  }
+  return "unknown";
+}
 async function executeCodexInstallation(isUpdate, skipMethodSelection = false) {
   if (isUpdate) {
     console.log(ansis.cyan(i18n.t("codex:updatingCli")));
-    const { command, args, usedSudo } = wrapCommandWithSudo("npm", ["install", "-g", "@openai/codex@latest"]);
-    if (usedSudo)
-      console.log(ansis.yellow(i18n.t("codex:usingSudo")));
-    const result = await x(command, args);
-    if (result.exitCode !== 0) {
-      throw new Error(`Failed to update codex CLI: exit code ${result.exitCode}`);
+    const installMethod = await detectCodexInstallMethod();
+    if (installMethod === "homebrew") {
+      console.log(ansis.gray(i18n.t("codex:detectedHomebrew")));
+      const result = await x("brew", ["upgrade", "--cask", "codex"]);
+      if (result.exitCode !== 0) {
+        throw new Error(`Failed to update codex via Homebrew: exit code ${result.exitCode}`);
+      }
+    } else if (installMethod === "npm") {
+      console.log(ansis.gray(i18n.t("codex:detectedNpm")));
+      const { command, args, usedSudo } = wrapCommandWithSudo("npm", ["install", "-g", "@openai/codex@latest"]);
+      if (usedSudo)
+        console.log(ansis.yellow(i18n.t("codex:usingSudo")));
+      const result = await x(command, args);
+      if (result.exitCode !== 0) {
+        throw new Error(`Failed to update codex CLI: exit code ${result.exitCode}`);
+      }
+    } else {
+      console.log(ansis.yellow(i18n.t("codex:unknownInstallMethod")));
+      console.log(ansis.gray(i18n.t("codex:fallingBackToNpm")));
+      const { command, args, usedSudo } = wrapCommandWithSudo("npm", ["install", "-g", "@openai/codex@latest"]);
+      if (usedSudo)
+        console.log(ansis.yellow(i18n.t("codex:usingSudo")));
+      const result = await x(command, args);
+      if (result.exitCode !== 0) {
+        throw new Error(`Failed to update codex CLI: exit code ${result.exitCode}`);
+      }
     }
     console.log(ansis.green(i18n.t("codex:updateSuccess")));
   } else {
@@ -3144,14 +3181,23 @@ function parseCodexConfig(content) {
     }
     const mcpServices = [];
     if (tomlData.mcp_servers) {
+      const KNOWN_MCP_FIELDS = /* @__PURE__ */ new Set(["command", "args", "env", "startup_timeout_ms"]);
       for (const [id, mcpData] of Object.entries(tomlData.mcp_servers)) {
         const mcp = mcpData;
+        const extraFields = {};
+        for (const [key, value] of Object.entries(mcp)) {
+          if (!KNOWN_MCP_FIELDS.has(key)) {
+            extraFields[key] = value;
+          }
+        }
         mcpServices.push({
           id,
           command: mcp.command || id,
           args: mcp.args || [],
           env: Object.keys(mcp.env || {}).length > 0 ? mcp.env : void 0,
-          startup_timeout_ms: mcp.startup_timeout_ms
+          startup_timeout_ms: mcp.startup_timeout_ms,
+          // Only add extraFields if there are any extra fields
+          extraFields: Object.keys(extraFields).length > 0 ? extraFields : void 0
         });
       }
     }
@@ -3250,6 +3296,70 @@ function parseCodexConfig(content) {
     };
   }
 }
+function formatInlineTableValue(value) {
+  if (value === null || value === void 0) {
+    return "";
+  }
+  if (typeof value === "string") {
+    const normalized = normalizeTomlPath(value);
+    return `'${normalized}'`;
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return String(value);
+  }
+  if (Array.isArray(value)) {
+    const items = value.map((item) => {
+      if (typeof item === "string") {
+        const normalized = normalizeTomlPath(item);
+        return `'${normalized}'`;
+      }
+      if (typeof item === "object" && item !== null && !Array.isArray(item)) {
+        return formatInlineTable(item);
+      }
+      return String(item);
+    }).join(", ");
+    return `[${items}]`;
+  }
+  if (typeof value === "object") {
+    return formatInlineTable(value);
+  }
+  return String(value);
+}
+function formatInlineTable(obj) {
+  const entries = Object.entries(obj).filter(([_, v]) => v !== null && v !== void 0).map(([k, v]) => `${k} = ${formatInlineTableValue(v)}`).join(", ");
+  return `{${entries}}`;
+}
+function formatTomlField(key, value) {
+  if (value === null || value === void 0) {
+    return "";
+  }
+  if (typeof value === "string") {
+    const normalized = normalizeTomlPath(value);
+    const escaped = normalized.replace(/"/g, '\\"');
+    return `${key} = "${escaped}"`;
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return `${key} = ${value}`;
+  }
+  if (Array.isArray(value)) {
+    const items = value.map((item) => {
+      if (typeof item === "string") {
+        const normalized = normalizeTomlPath(item);
+        const escaped = normalized.replace(/"/g, '\\"');
+        return `"${escaped}"`;
+      }
+      if (typeof item === "object" && item !== null && !Array.isArray(item)) {
+        return formatInlineTable(item);
+      }
+      return String(item);
+    }).join(", ");
+    return `${key} = [${items}]`;
+  }
+  if (typeof value === "object") {
+    return `${key} = ${formatInlineTable(value)}`;
+  }
+  return "";
+}
 function readCodexConfig() {
   if (!exists(CODEX_CONFIG_FILE))
     return null;
@@ -3329,6 +3439,14 @@ function renderCodexConfig(data) {
       if (service.startup_timeout_ms) {
         lines.push(`startup_timeout_ms = ${service.startup_timeout_ms}`);
       }
+      if (service.extraFields) {
+        for (const [key, value] of Object.entries(service.extraFields)) {
+          const formatted = formatTomlField(key, value);
+          if (formatted) {
+            lines.push(formatted);
+          }
+        }
+      }
       lines.push("");
     }
     if (lines[lines.length - 1] === "") {
@@ -3353,26 +3471,46 @@ function writeAuthFile(newEntries) {
 }
 async function isCodexInstalled$1() {
   try {
-    const result = await x("npm", ["list", "-g", "--depth=0"]);
-    if (result.exitCode !== 0) {
-      return false;
+    const npmResult = await x("npm", ["list", "-g", "--depth=0"]);
+    if (npmResult.exitCode === 0 && npmResult.stdout.includes("@openai/codex@")) {
+      return true;
     }
-    return result.stdout.includes("@openai/codex@");
   } catch {
-    return false;
   }
+  try {
+    const brewResult = await x("brew", ["list", "--cask", "codex"], { throwOnError: false });
+    if (brewResult.exitCode === 0) {
+      return true;
+    }
+  } catch {
+  }
+  return false;
 }
 async function getCodexVersion() {
   try {
-    const result = await x("npm", ["list", "-g", "--depth=0"]);
-    if (result.exitCode !== 0) {
-      return null;
+    const npmResult = await x("npm", ["list", "-g", "--depth=0"]);
+    if (npmResult.exitCode === 0) {
+      const match = npmResult.stdout.match(/@openai\/codex@(\S+)/);
+      if (match) {
+        return match[1];
+      }
     }
-    const match = result.stdout.match(/@openai\/codex@(\S+)/);
-    return match ? match[1] : null;
   } catch {
-    return null;
   }
+  try {
+    const brewResult = await x("brew", ["info", "--cask", "codex", "--json=v2"], { throwOnError: false });
+    if (brewResult.exitCode === 0) {
+      const info = JSON.parse(brewResult.stdout);
+      if (info.casks && Array.isArray(info.casks) && info.casks.length > 0) {
+        const cask = info.casks[0];
+        if (cask.installed && typeof cask.installed === "string") {
+          return cask.installed;
+        }
+      }
+    }
+  } catch {
+  }
+  return null;
 }
 async function checkCodexUpdate() {
   try {
@@ -5052,7 +5190,8 @@ async function uninstallCodeTool(codeType) {
   const spinner = ora(i18n.t("installation:uninstallingWith", { method, codeType: codeTypeName })).start();
   try {
     switch (method) {
-      case "npm": {
+      case "npm":
+      case "npm-global": {
         const packageName = codeType === "claude-code" ? "@anthropic-ai/claude-code" : "@openai/codex";
         const { command, args, usedSudo } = wrapCommandWithSudo("npm", ["uninstall", "-g", packageName]);
         if (usedSudo) {
@@ -5110,7 +5249,7 @@ async function uninstallCodeTool(codeType) {
     return false;
   }
 }
-async function setInstallMethod(method = "npm", codeType = "claude-code") {
+async function setInstallMethod(method, codeType = "claude-code") {
   try {
     if (codeType === "claude-code") {
       const { readMcpConfig, writeMcpConfig } = await Promise.resolve().then(function () { return claudeConfig; });
@@ -5118,7 +5257,7 @@ async function setInstallMethod(method = "npm", codeType = "claude-code") {
       if (!config) {
         config = { mcpServers: {} };
       }
-      config.installMethod = method === "npm" ? "npm" : "native";
+      config.installMethod = method === "npm" ? "npm-global" : method;
       writeMcpConfig(config);
     }
   } catch (error) {
@@ -5940,18 +6079,21 @@ async function init(options = {}) {
             options.apiModel = options.apiModel || preset.claudeCode.defaultModels[0];
             options.apiFastModel = options.apiFastModel || preset.claudeCode.defaultModels[1];
           }
+          await saveSingleConfigToToml(apiConfig, options.provider, options);
         } else if (options.apiType === "auth_token" && options.apiKey) {
           apiConfig = {
             authType: "auth_token",
             key: options.apiKey,
             url: options.apiUrl || API_DEFAULT_URL
           };
+          await saveSingleConfigToToml(apiConfig, void 0, options);
         } else if (options.apiType === "api_key" && options.apiKey) {
           apiConfig = {
             authType: "api_key",
             key: options.apiKey,
             url: options.apiUrl || API_DEFAULT_URL
           };
+          await saveSingleConfigToToml(apiConfig, void 0, options);
         } else if (options.apiType === "ccr_proxy") {
           const ccrStatus = await isCcrInstalled();
           if (!ccrStatus.hasCorrectPackage) {
@@ -6321,6 +6463,55 @@ async function handleCodexConfigs(configs) {
     console.log(ansis.green(`\u2714 ${i18n.t("multi-config:defaultProviderSet", { name: defaultConfig.name })}`));
   }
 }
+async function saveSingleConfigToToml(apiConfig, provider, options) {
+  try {
+    const { ClaudeCodeConfigManager } = await import('./claude-code-config-manager.mjs');
+    const profile = await convertSingleConfigToProfile(apiConfig, provider, options);
+    const result = await ClaudeCodeConfigManager.addProfile(profile);
+    if (result.success) {
+      const savedProfile = result.addedProfile || ClaudeCodeConfigManager.getProfileByName(profile.name) || profile;
+      if (savedProfile.id) {
+        await ClaudeCodeConfigManager.switchProfile(savedProfile.id);
+        await ClaudeCodeConfigManager.applyProfileSettings(savedProfile);
+      }
+      console.log(ansis.green(`\u2714 ${i18n.t("configuration:singleConfigSaved", { name: profile.name })}`));
+    } else {
+      console.warn(ansis.yellow(`${i18n.t("configuration:singleConfigSaveFailed")}: ${result.error}`));
+    }
+  } catch (error) {
+    console.warn(ansis.yellow(`${i18n.t("configuration:singleConfigSaveFailed")}: ${error instanceof Error ? error.message : String(error)}`));
+  }
+}
+async function convertSingleConfigToProfile(apiConfig, provider, options) {
+  const { ClaudeCodeConfigManager } = await import('./claude-code-config-manager.mjs');
+  const configName = provider && provider !== "custom" ? provider : "custom-config";
+  let baseUrl = apiConfig.url || API_DEFAULT_URL;
+  let primaryModel = options?.apiModel;
+  let fastModel = options?.apiFastModel;
+  let authType = apiConfig.authType;
+  if (provider && provider !== "custom") {
+    const { getProviderPreset } = await import('./api-providers.mjs');
+    const preset = getProviderPreset(provider);
+    if (preset?.claudeCode) {
+      baseUrl = apiConfig.url || preset.claudeCode.baseUrl;
+      authType = preset.claudeCode.authType;
+      if (preset.claudeCode.defaultModels && preset.claudeCode.defaultModels.length >= 2) {
+        primaryModel = primaryModel || preset.claudeCode.defaultModels[0];
+        fastModel = fastModel || preset.claudeCode.defaultModels[1];
+      }
+    }
+  }
+  const profile = {
+    name: configName,
+    authType,
+    apiKey: apiConfig.key,
+    baseUrl,
+    primaryModel,
+    fastModel,
+    id: ClaudeCodeConfigManager.generateProfileId(configName)
+  };
+  return profile;
+}
 async function convertToClaudeCodeProfile(config) {
   const { ClaudeCodeConfigManager } = await import('./claude-code-config-manager.mjs');
   let baseUrl = config.url;

package/dist/i18n/locales/en/codex.json

@@ -3,6 +3,10 @@
   "alreadyInstalled": "⚠️ Codex CLI already installed, skipping installation",
   "updatingCli": "🔄 Updating Codex CLI...",
   "updateSuccess": "✔ Codex CLI updated",
+  "detectedHomebrew": "Detected Codex installed via Homebrew, will update using Homebrew",
+  "detectedNpm": "Detected Codex installed via npm, will update using npm",
+  "unknownInstallMethod": "⚠️ Unable to detect Codex installation method",
+  "fallingBackToNpm": "Falling back to npm update method",
   "workflowInstall": "✔ Codex workflow templates installed",
   "backupSuccess": "✔ Backup created at {{path}}",
   "apiModePrompt": "Select API configuration mode",

package/dist/i18n/locales/en/configuration.json

@@ -62,6 +62,8 @@
   "selectMemoryOption": "Select configuration option",
   "selectOutputStyles": "Select output styles to install",
   "selectedStyles": "Selected styles",
+  "singleConfigSaved": "Configuration {{name}} saved",
+  "singleConfigSaveFailed": "Failed to save configuration",
   "updateDocsOnly": "Update workflow-related md files only with backup",
   "updatingPrompts": "Updating Claude Code memory documents...",
   "enterCustomModel": "Enter custom model name",

package/dist/i18n/locales/zh-CN/codex.json

@@ -3,6 +3,10 @@
   "alreadyInstalled": "⚠️ Codex CLI 已安装，跳过安装步骤",
   "updatingCli": "🔄 正在更新 Codex CLI...",
   "updateSuccess": "✔ Codex CLI 更新完成",
+  "detectedHomebrew": "检测到 Codex 通过 Homebrew 安装，将使用 Homebrew 更新",
+  "detectedNpm": "检测到 Codex 通过 npm 安装，将使用 npm 更新",
+  "unknownInstallMethod": "⚠️ 无法检测 Codex 安装方式",
+  "fallingBackToNpm": "回退到 npm 更新方式",
   "workflowInstall": "✔ 已安装 Codex 工作流模板",
   "backupSuccess": "✔ 已创建备份 {{path}}",
   "apiModePrompt": "请选择 API 配置模式",

package/dist/i18n/locales/zh-CN/configuration.json

@@ -62,6 +62,8 @@
   "selectMemoryOption": "选择配置选项",
   "selectOutputStyles": "选择要安装的输出风格",
   "selectedStyles": "已选择风格",
+  "singleConfigSaved": "配置 {{name}} 已保存",
+  "singleConfigSaveFailed": "配置保存失败",
   "updateDocsOnly": "仅更新工作流相关md并备份旧配置",
   "updatingPrompts": "正在更新 Claude Code 记忆文档...",
   "enterCustomModel": "请输入自定义模型名称",

package/dist/index.d.mts

@@ -65,6 +65,15 @@ interface InitOptions {
 }
 declare function init(options?: InitOptions): Promise<void>;
 
+declare function getPlatform(): 'windows' | 'macos' | 'linux';
+declare function commandExists(command: string): Promise<boolean>;
+/**
+ * Get recommended install methods for a code tool based on current platform
+ * Returns methods in priority order (most recommended first)
+ */
+type CodeType = 'claude-code' | 'codex';
+type InstallMethod$1 = 'npm' | 'homebrew' | 'curl' | 'powershell' | 'cmd' | 'npm-global' | 'native';
+
 interface McpService {
     id: string;
     name: string;
@@ -92,7 +101,7 @@ interface ClaudeConfiguration {
     };
     env?: Record<string, string>;
     primaryApiKey?: string;
-    installMethod?: 'npm' | 'native';
+    installMethod?: InstallMethod$1;
 }
 
 declare function getMcpConfigPath(): string;
@@ -185,14 +194,6 @@ declare function switchToOfficialLogin(): boolean;
  */
 declare function promptApiConfigurationAction(): Promise<'modify-partial' | 'modify-all' | 'keep-existing' | null>;
 
-declare function getPlatform(): 'windows' | 'macos' | 'linux';
-declare function commandExists(command: string): Promise<boolean>;
-/**
- * Get recommended install methods for a code tool based on current platform
- * Returns methods in priority order (most recommended first)
- */
-type CodeType = 'claude-code' | 'codex';
-
 declare function isClaudeCodeInstalled(): Promise<boolean>;
 /**
  * Install Claude Code with method selection support
@@ -235,7 +236,7 @@ declare function uninstallCodeTool(codeType: CodeType): Promise<boolean>;
  * Set installMethod in both ~/.claude.json and zcf-config
  * This ensures Claude Code knows it was installed via npm for proper auto-updates
  */
-declare function setInstallMethod(method?: InstallMethod | 'native', codeType?: CodeType): Promise<void>;
+declare function setInstallMethod(method: InstallMethod, codeType?: CodeType): Promise<void>;
 /**
  * Detect installed version of a code tool
  * Returns version string or null if not installed

package/dist/index.d.ts

@@ -65,6 +65,15 @@ interface InitOptions {
 }
 declare function init(options?: InitOptions): Promise<void>;
 
+declare function getPlatform(): 'windows' | 'macos' | 'linux';
+declare function commandExists(command: string): Promise<boolean>;
+/**
+ * Get recommended install methods for a code tool based on current platform
+ * Returns methods in priority order (most recommended first)
+ */
+type CodeType = 'claude-code' | 'codex';
+type InstallMethod$1 = 'npm' | 'homebrew' | 'curl' | 'powershell' | 'cmd' | 'npm-global' | 'native';
+
 interface McpService {
     id: string;
     name: string;
@@ -92,7 +101,7 @@ interface ClaudeConfiguration {
     };
     env?: Record<string, string>;
     primaryApiKey?: string;
-    installMethod?: 'npm' | 'native';
+    installMethod?: InstallMethod$1;
 }
 
 declare function getMcpConfigPath(): string;
@@ -185,14 +194,6 @@ declare function switchToOfficialLogin(): boolean;
  */
 declare function promptApiConfigurationAction(): Promise<'modify-partial' | 'modify-all' | 'keep-existing' | null>;
 
-declare function getPlatform(): 'windows' | 'macos' | 'linux';
-declare function commandExists(command: string): Promise<boolean>;
-/**
- * Get recommended install methods for a code tool based on current platform
- * Returns methods in priority order (most recommended first)
- */
-type CodeType = 'claude-code' | 'codex';
-
 declare function isClaudeCodeInstalled(): Promise<boolean>;
 /**
  * Install Claude Code with method selection support
@@ -235,7 +236,7 @@ declare function uninstallCodeTool(codeType: CodeType): Promise<boolean>;
  * Set installMethod in both ~/.claude.json and zcf-config
  * This ensures Claude Code knows it was installed via npm for proper auto-updates
  */
-declare function setInstallMethod(method?: InstallMethod | 'native', codeType?: CodeType): Promise<void>;
+declare function setInstallMethod(method: InstallMethod, codeType?: CodeType): Promise<void>;
 /**
  * Detect installed version of a code tool
  * Returns version string or null if not installed

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zcf",
   "type": "module",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "Zero-Config Code Flow - One-click configuration tool for Code Cli",
   "author": {
     "name": "Miao Da",