zcf 3.4.2 → 3.4.3

package/dist/chunks/simple-config.mjs

@@ -11,14 +11,14 @@ import { dirname, join } from 'pathe';
 import { fileURLToPath } from 'node:url';
 import toggleModule from 'inquirer-toggle';
 import ora from 'ora';
+import { exec, x } from 'tinyexec';
 import semver from 'semver';
 import { stringify, parse } from 'smol-toml';
-import { exec, x } from 'tinyexec';
 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.2";
+const version = "3.4.3";
 const homepage = "https://github.com/UfoMiao/zcf";
 
 const i18n = i18next.createInstance();
@@ -1309,6 +1309,20 @@ const claudeConfig = {
   writeMcpConfig: writeMcpConfig
 };
 
+const MODEL_ENV_KEYS = [
+  "ANTHROPIC_MODEL",
+  "ANTHROPIC_DEFAULT_HAIKU_MODEL",
+  "ANTHROPIC_DEFAULT_SONNET_MODEL",
+  "ANTHROPIC_DEFAULT_OPUS_MODEL",
+  // Deprecated but still cleaned to avoid stale values
+  "ANTHROPIC_SMALL_FAST_MODEL"
+];
+function clearModelEnv(env) {
+  for (const key of MODEL_ENV_KEYS) {
+    delete env[key];
+  }
+}
+
 function cleanupPermissions(templatePermissions, userPermissions) {
   const templateSet = new Set(templatePermissions);
   const cleanedPermissions = userPermissions.filter((permission) => {
@@ -1426,8 +1440,8 @@ function mergeConfigs(sourceFile, targetFile) {
   const merged = deepMerge(target, source);
   writeJsonConfig(targetFile, merged);
 }
-function updateCustomModel(primaryModel, fastModel) {
-  if (!primaryModel?.trim() && !fastModel?.trim()) {
+function updateCustomModel(primaryModel, haikuModel, sonnetModel, opusModel) {
+  if (!primaryModel?.trim() && !haikuModel?.trim() && !sonnetModel?.trim() && !opusModel?.trim()) {
     return;
   }
   let settings = getDefaultSettings();
@@ -1437,12 +1451,16 @@ function updateCustomModel(primaryModel, fastModel) {
   }
   delete settings.model;
   settings.env = settings.env || {};
+  clearModelEnv(settings.env);
   if (primaryModel?.trim()) {
     settings.env.ANTHROPIC_MODEL = primaryModel.trim();
   }
-  if (fastModel?.trim()) {
-    settings.env.ANTHROPIC_SMALL_FAST_MODEL = fastModel.trim();
-  }
+  if (haikuModel?.trim())
+    settings.env.ANTHROPIC_DEFAULT_HAIKU_MODEL = haikuModel.trim();
+  if (sonnetModel?.trim())
+    settings.env.ANTHROPIC_DEFAULT_SONNET_MODEL = sonnetModel.trim();
+  if (opusModel?.trim())
+    settings.env.ANTHROPIC_DEFAULT_OPUS_MODEL = opusModel.trim();
   writeJsonConfig(SETTINGS_FILE, settings);
 }
 function updateDefaultModel(model) {
@@ -1454,13 +1472,10 @@ function updateDefaultModel(model) {
   if (!settings.env) {
     settings.env = {};
   }
-  if (model !== "custom" && settings.env) {
-    delete settings.env.ANTHROPIC_MODEL;
-    delete settings.env.ANTHROPIC_SMALL_FAST_MODEL;
+  if (model !== "custom") {
+    clearModelEnv(settings.env);
   }
-  if (model === "default") {
-    delete settings.model;
-  } else if (model === "custom") {
+  if (model === "default" || model === "custom") {
     delete settings.model;
   } else {
     settings.model = model;
@@ -1511,13 +1526,18 @@ function getExistingModelConfig() {
   if (!settings) {
     return null;
   }
-  if (settings.env && (settings.env.ANTHROPIC_MODEL || settings.env.ANTHROPIC_SMALL_FAST_MODEL)) {
+  const hasModelEnv = MODEL_ENV_KEYS.some((key) => settings.env?.[key]);
+  if (hasModelEnv) {
     return "custom";
   }
   if (!settings.model) {
     return "default";
   }
-  return settings.model;
+  const validModels = ["opus", "sonnet", "sonnet[1m]"];
+  if (validModels.includes(settings.model)) {
+    return settings.model;
+  }
+  return "default";
 }
 function getExistingApiConfig() {
   const settings = readJsonConfig(SETTINGS_FILE);
@@ -1787,7 +1807,7 @@ function getFallbackPresets() {
   ];
 }
 
-const execAsync$4 = promisify(exec$1);
+const execAsync$3 = promisify(exec$1);
 const CCR_CONFIG_DIR = join(homedir(), ".claude-code-router");
 const CCR_CONFIG_FILE = join(CCR_CONFIG_DIR, "config.json");
 const CCR_BACKUP_DIR = CCR_CONFIG_DIR;
@@ -1953,10 +1973,10 @@ async function restartAndCheckCcrStatus() {
   ensureI18nInitialized();
   try {
     console.log(ansis.cyan(`${i18n.t("ccr:restartingCcr")}`));
-    await execAsync$4("ccr restart");
+    await execAsync$3("ccr restart");
     console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrRestartSuccess")}`));
     console.log(ansis.cyan(`${i18n.t("ccr:checkingCcrStatus")}`));
-    const { stdout } = await execAsync$4("ccr status");
+    const { stdout } = await execAsync$3("ccr status");
     console.log(ansis.gray(stdout));
   } catch (error) {
     console.error(ansis.red(`${i18n.t("ccr:ccrRestartFailed")}:`), error.message || error);
@@ -2093,16 +2113,16 @@ const config = {
   writeCcrConfig: writeCcrConfig
 };
 
-const execAsync$3 = promisify(exec$1);
+const execAsync$2 = promisify(exec$1);
 async function getInstalledVersion(command, maxRetries = 3) {
   for (let attempt = 1; attempt <= maxRetries; attempt++) {
     try {
       let stdout;
       try {
-        const result = await execAsync$3(`${command} -v`);
+        const result = await execAsync$2(`${command} -v`);
         stdout = result.stdout;
       } catch {
-        const result = await execAsync$3(`${command} --version`);
+        const result = await execAsync$2(`${command} --version`);
         stdout = result.stdout;
       }
       const versionMatch = stdout.match(/(\d+\.\d+\.\d+(?:-[\w.]+)?)/);
@@ -2119,7 +2139,7 @@ async function getInstalledVersion(command, maxRetries = 3) {
 async function getLatestVersion(packageName, maxRetries = 3) {
   for (let attempt = 1; attempt <= maxRetries; attempt++) {
     try {
-      const { stdout } = await execAsync$3(`npm view ${packageName} version`);
+      const { stdout } = await execAsync$2(`npm view ${packageName} version`);
       return stdout.trim();
     } catch {
       if (attempt === maxRetries) {
@@ -2148,7 +2168,7 @@ async function getClaudeCodeInstallationSource() {
     return { isHomebrew: true, commandPath, source: "homebrew-cask" };
   }
   try {
-    const { stdout: realPath } = await execAsync$3(`readlink -f "${commandPath}" 2>/dev/null || realpath "${commandPath}" 2>/dev/null || echo "${commandPath}"`);
+    const { stdout: realPath } = await execAsync$2(`readlink -f "${commandPath}" 2>/dev/null || realpath "${commandPath}" 2>/dev/null || echo "${commandPath}"`);
     const resolvedPath = realPath.trim();
     if (resolvedPath.includes("/Caskroom/claude-code/")) {
       return { isHomebrew: true, commandPath, source: "homebrew-cask" };
@@ -2167,7 +2187,7 @@ async function detectAllClaudeCodeInstallations() {
   let activeResolvedPath = null;
   if (activeCommandPath) {
     try {
-      const { stdout } = await execAsync$3(`readlink -f "${activeCommandPath}" 2>/dev/null || realpath "${activeCommandPath}" 2>/dev/null || echo "${activeCommandPath}"`);
+      const { stdout } = await execAsync$2(`readlink -f "${activeCommandPath}" 2>/dev/null || realpath "${activeCommandPath}" 2>/dev/null || echo "${activeCommandPath}"`);
       activeResolvedPath = stdout.trim();
     } catch {
       activeResolvedPath = activeCommandPath;
@@ -2175,7 +2195,7 @@ async function detectAllClaudeCodeInstallations() {
   }
   async function getVersionFromPath(path) {
     try {
-      const { stdout } = await execAsync$3(`"${path}" -v 2>/dev/null || "${path}" --version 2>/dev/null`);
+      const { stdout } = await execAsync$2(`"${path}" -v 2>/dev/null || "${path}" --version 2>/dev/null`);
       const versionMatch = stdout.match(/(\d+\.\d+\.\d+(?:-[\w.]+)?)/);
       return versionMatch ? versionMatch[1] : null;
     } catch {
@@ -2190,7 +2210,7 @@ async function detectAllClaudeCodeInstallations() {
   async function addInstallation(path, source) {
     let resolvedPath = path;
     try {
-      const { stdout } = await execAsync$3(`readlink -f "${path}" 2>/dev/null || realpath "${path}" 2>/dev/null || echo "${path}"`);
+      const { stdout } = await execAsync$2(`readlink -f "${path}" 2>/dev/null || realpath "${path}" 2>/dev/null || echo "${path}"`);
       resolvedPath = stdout.trim();
     } catch {
     }
@@ -2226,7 +2246,7 @@ async function detectAllClaudeCodeInstallations() {
       }
     }
     try {
-      await execAsync$3("brew list --cask claude-code");
+      await execAsync$2("brew list --cask claude-code");
       const homebrewPrefixes = ["/opt/homebrew", "/usr/local"];
       for (const prefix of homebrewPrefixes) {
         const caskroomPath = `${prefix}/Caskroom/claude-code`;
@@ -2251,7 +2271,7 @@ async function detectAllClaudeCodeInstallations() {
     if (nodeFs.existsSync(path)) {
       let resolvedPath = path;
       try {
-        const { stdout } = await execAsync$3(`readlink -f "${path}" 2>/dev/null || realpath "${path}" 2>/dev/null || echo "${path}"`);
+        const { stdout } = await execAsync$2(`readlink -f "${path}" 2>/dev/null || realpath "${path}" 2>/dev/null || echo "${path}"`);
         resolvedPath = stdout.trim();
       } catch {
       }
@@ -2441,7 +2461,7 @@ async function handleDuplicateInstallations(skipPrompt = false) {
 }
 async function getHomebrewClaudeCodeVersion() {
   try {
-    const { stdout } = await execAsync$3("brew info --cask claude-code --json=v2");
+    const { stdout } = await execAsync$2("brew info --cask claude-code --json=v2");
     const info = JSON.parse(stdout);
     if (info.casks && info.casks.length > 0) {
       return info.casks[0].version;
@@ -2514,7 +2534,24 @@ async function checkClaudeCodeVersionAndPrompt(skipPrompt = false) {
   }
 }
 
-const execAsync$2 = promisify(exec$1);
+async function execWithSudoIfNeeded(command, args) {
+  const needsSudo = shouldUseSudoForGlobalInstall();
+  if (needsSudo) {
+    console.log(ansis.yellow(`
+${i18n.t("updater:usingSudo")}`));
+    const result = await exec("sudo", [command, ...args]);
+    if (result.exitCode !== 0) {
+      throw new Error(result.stderr || `Command failed with exit code ${result.exitCode}`);
+    }
+    return { usedSudo: true };
+  } else {
+    const result = await exec(command, args);
+    if (result.exitCode !== 0) {
+      throw new Error(result.stderr || `Command failed with exit code ${result.exitCode}`);
+    }
+    return { usedSudo: false };
+  }
+}
 async function updateCcr(force = false, skipPrompt = false) {
   ensureI18nInitialized();
   const spinner = ora(i18n.t("updater:checkingVersion")).start();
@@ -2549,7 +2586,7 @@ async function updateCcr(force = false, skipPrompt = false) {
     }
     const updateSpinner = ora(format(i18n.t("updater:updating"), { tool: "CCR" })).start();
     try {
-      await execAsync$2("npm update -g @musistudio/claude-code-router");
+      await execWithSudoIfNeeded("npm", ["update", "-g", "@musistudio/claude-code-router"]);
       updateSpinner.succeed(format(i18n.t("updater:updateSuccess"), { tool: "CCR" }));
       return true;
     } catch (error) {
@@ -2599,9 +2636,12 @@ async function updateClaudeCode(force = false, skipPrompt = false) {
     const updateSpinner = ora(format(i18n.t("updater:updating"), { tool: toolName })).start();
     try {
       if (isHomebrew) {
-        await execAsync$2("brew upgrade --cask claude-code");
+        const result = await exec("brew", ["upgrade", "--cask", "claude-code"]);
+        if (result.exitCode !== 0) {
+          throw new Error(result.stderr || `Command failed with exit code ${result.exitCode}`);
+        }
       } else {
-        await execAsync$2("claude update");
+        await execWithSudoIfNeeded("claude", ["update"]);
       }
       updateSpinner.succeed(format(i18n.t("updater:updateSuccess"), { tool: "Claude Code" }));
       return true;
@@ -2650,7 +2690,7 @@ async function updateCometixLine(force = false, skipPrompt = false) {
     }
     const updateSpinner = ora(format(i18n.t("updater:updating"), { tool: "CCometixLine" })).start();
     try {
-      await execAsync$2("npm update -g @cometix/ccline");
+      await execWithSudoIfNeeded("npm", ["update", "-g", "@cometix/ccline"]);
       updateSpinner.succeed(format(i18n.t("updater:updateSuccess"), { tool: "CCometixLine" }));
       return true;
     } catch (error) {
@@ -2721,6 +2761,7 @@ async function checkAndUpdateTools(skipPrompt = false) {
 const autoUpdater = {
   __proto__: null,
   checkAndUpdateTools: checkAndUpdateTools,
+  execWithSudoIfNeeded: execWithSudoIfNeeded,
   updateCcr: updateCcr,
   updateClaudeCode: updateClaudeCode,
   updateCometixLine: updateCometixLine
@@ -3342,11 +3383,83 @@ async function configureCodexMcp(options) {
   ensureI18nInitialized();
   const { skipPrompt = false } = options ?? {};
   const existingConfig = readCodexConfig();
-  if (skipPrompt)
-    return;
   const backupPath = backupCodexComplete();
   if (backupPath)
     console.log(ansis.gray(getBackupMessage(backupPath)));
+  if (skipPrompt) {
+    const { runCodexWorkflowSelection } = await Promise.resolve().then(function () { return codex; });
+    await runCodexWorkflowSelection({ skipPrompt: true, workflows: options?.workflows ?? [] });
+    if (options?.mcpServices === false) {
+      updateZcfConfig({ codeToolType: "codex" });
+      console.log(ansis.green(i18n.t("codex:mcpConfigured")));
+      return;
+    }
+    const defaultServiceIds = Array.isArray(options?.mcpServices) ? options.mcpServices : MCP_SERVICE_CONFIGS.filter((service) => !service.requiresApiKey).map((service) => service.id);
+    const baseProviders2 = existingConfig?.providers || [];
+    const existingServices2 = existingConfig?.mcpServices || [];
+    const selection2 = [];
+    for (const id of defaultServiceIds) {
+      const configInfo = MCP_SERVICE_CONFIGS.find((service) => service.id === id);
+      if (!configInfo)
+        continue;
+      let command = configInfo.config.command || id;
+      let args = (configInfo.config.args || []).map((arg) => String(arg));
+      if (id === "serena") {
+        const idx = args.indexOf("--context");
+        if (idx >= 0 && idx + 1 < args.length)
+          args[idx + 1] = "codex";
+        else
+          args.push("--context", "codex");
+      }
+      const serviceConfig = { id: id.toLowerCase(), command, args };
+      applyCodexPlatformCommand(serviceConfig);
+      command = serviceConfig.command;
+      args = serviceConfig.args || [];
+      const env = { ...configInfo.config.env || {} };
+      if (isWindows()) {
+        const systemRoot = getSystemRoot();
+        if (systemRoot)
+          env.SYSTEMROOT = systemRoot;
+      }
+      selection2.push({
+        id: id.toLowerCase(),
+        command,
+        args,
+        env: Object.keys(env).length > 0 ? env : void 0,
+        startup_timeout_sec: 30
+      });
+    }
+    const mergedMap2 = /* @__PURE__ */ new Map();
+    for (const svc of existingServices2)
+      mergedMap2.set(svc.id.toLowerCase(), { ...svc });
+    for (const svc of selection2)
+      mergedMap2.set(svc.id.toLowerCase(), { ...svc });
+    const finalServices2 = Array.from(mergedMap2.values()).map((svc) => {
+      if (isWindows()) {
+        const systemRoot = getSystemRoot();
+        if (systemRoot) {
+          return {
+            ...svc,
+            env: {
+              ...svc.env || {},
+              SYSTEMROOT: systemRoot
+            }
+          };
+        }
+      }
+      return svc;
+    });
+    writeCodexConfig({
+      model: existingConfig?.model || null,
+      modelProvider: existingConfig?.modelProvider || null,
+      providers: baseProviders2,
+      mcpServices: finalServices2,
+      otherConfig: existingConfig?.otherConfig || []
+    });
+    updateZcfConfig({ codeToolType: "codex" });
+    console.log(ansis.green(i18n.t("codex:mcpConfigured")));
+    return;
+  }
   const selectedIds = await selectMcpServices();
   if (!selectedIds)
     return;
@@ -3457,6 +3570,7 @@ async function configureCodexMcp(options) {
   console.log(ansis.green(i18n.t("codex:mcpConfigured")));
 }
 
+let cachedSkipPromptBackup = null;
 function getRootDir$1() {
   const currentFilePath = fileURLToPath(import.meta.url);
   let dir = dirname(currentFilePath);
@@ -3545,12 +3659,16 @@ function createBackupDirectory(timestamp) {
 function backupCodexFiles() {
   if (!exists(CODEX_DIR))
     return null;
+  if (process.env.ZCF_CODEX_SKIP_PROMPT_SINGLE_BACKUP === "true" && cachedSkipPromptBackup)
+    return cachedSkipPromptBackup;
   const timestamp = dayjs().format("YYYY-MM-DD_HH-mm-ss");
   const backupDir = createBackupDirectory(timestamp);
   const filter = (path) => {
     return !path.includes("/backup");
   };
   copyDir(CODEX_DIR, backupDir, { filter });
+  if (process.env.ZCF_CODEX_SKIP_PROMPT_SINGLE_BACKUP === "true")
+    cachedSkipPromptBackup = backupDir;
   return backupDir;
 }
 function backupCodexComplete() {
@@ -3570,6 +3688,8 @@ function backupCodexConfig() {
   }
 }
 function backupCodexAgents() {
+  if (process.env.ZCF_CODEX_SKIP_PROMPT_SINGLE_BACKUP === "true" && cachedSkipPromptBackup)
+    return cachedSkipPromptBackup;
   if (!exists(CODEX_AGENTS_FILE))
     return null;
   try {
@@ -3583,6 +3703,8 @@ function backupCodexAgents() {
   }
 }
 function backupCodexPrompts() {
+  if (process.env.ZCF_CODEX_SKIP_PROMPT_SINGLE_BACKUP === "true" && cachedSkipPromptBackup)
+    return cachedSkipPromptBackup;
   if (!exists(CODEX_PROMPTS_DIR))
     return null;
   try {
@@ -4353,29 +4475,39 @@ async function applyCustomApiConfig(customApiConfig) {
   if (backupPath) {
     console.log(ansis.gray(getBackupMessage(backupPath)));
   }
+  const existingConfig = readCodexConfig();
+  const existingAuth = readJsonConfig(CODEX_AUTH_FILE, { defaultValue: {} }) || {};
   const providers = [];
-  const authEntries = {};
+  const authEntries = { ...existingAuth };
   const providerId = type === "auth_token" ? "official-auth-token" : "custom-api-key";
   const providerName = type === "auth_token" ? "Official Auth Token" : "Custom API Key";
+  const existingProvider = existingConfig?.providers.find((p) => p.id === providerId);
   providers.push({
     id: providerId,
     name: providerName,
-    baseUrl: baseUrl || "https://api.anthropic.com",
-    wireApi: "claude",
-    tempEnvKey: `${providerId.toUpperCase()}_API_KEY`,
-    requiresOpenaiAuth: false
+    baseUrl: baseUrl || existingProvider?.baseUrl || "https://api.anthropic.com",
+    wireApi: existingProvider?.wireApi || "responses",
+    tempEnvKey: existingProvider?.tempEnvKey || `${providerId.toUpperCase()}_API_KEY`,
+    requiresOpenaiAuth: existingProvider?.requiresOpenaiAuth ?? false,
+    model: model || existingProvider?.model
   });
+  if (existingConfig?.providers) {
+    providers.push(...existingConfig.providers.filter((p) => p.id !== providerId));
+  }
   if (token) {
     authEntries[providerId] = token;
+    authEntries.OPENAI_API_KEY = token;
   }
   const configData = {
-    model: model || "claude-3-5-sonnet-20241022",
-    // Use provided model or default
+    model: model || existingConfig?.model || "claude-3-5-sonnet-20241022",
+    // Prefer provided model, then existing, fallback default
     modelProvider: providerId,
     modelProviderCommented: false,
     providers,
-    mcpServices: []};
-  writeFile(CODEX_CONFIG_FILE, renderCodexConfig(configData));
+    mcpServices: existingConfig?.mcpServices || [],
+    otherConfig: existingConfig?.otherConfig || []
+  };
+  writeCodexConfig(configData);
   writeJsonConfig(CODEX_AUTH_FILE, authEntries);
   updateZcfConfig({ codeToolType: "codex" });
   console.log(ansis.green(`\u2714 ${i18n.t("codex:apiConfigured")}`));
@@ -6508,15 +6640,18 @@ async function validateSkipPromptOptions(options) {
   if (options.apiConfigs && options.apiConfigsFile) {
     throw new Error(i18n.t("multi-config:conflictingParams"));
   }
-  if (options.apiModel && typeof options.apiModel !== "string") {
-    throw new Error(
-      i18n.t("errors:invalidApiModel", { value: options.apiModel })
-    );
-  }
-  if (options.apiFastModel && typeof options.apiFastModel !== "string") {
-    throw new Error(
-      i18n.t("errors:invalidApiFastModel", { value: options.apiFastModel })
-    );
+  const modelParams = [
+    ["apiModel", options.apiModel],
+    ["apiHaikuModel", options.apiHaikuModel],
+    ["apiSonnetModel", options.apiSonnetModel],
+    ["apiOpusModel", options.apiOpusModel]
+  ];
+  for (const [key, value] of modelParams) {
+    if (value !== void 0 && typeof value !== "string") {
+      if (key === "apiModel")
+        throw new Error(i18n.t("errors:invalidApiModel", { value }));
+      throw new Error(i18n.t("errors:invalidModelParam", { key, value }));
+    }
   }
   if (options.apiType === "api_key" && !options.apiKey) {
     throw new Error(i18n.t("errors:apiKeyRequiredForApiKey"));
@@ -6706,8 +6841,11 @@ async function init(options = {}) {
       configLang = "en";
     }
     if (codeToolType === "codex") {
-      const apiMode = options.apiType === "auth_token" ? "official" : options.apiType === "api_key" ? "custom" : options.apiType === "skip" ? "skip" : options.skipPrompt ? "skip" : void 0;
-      const customApiConfig = options.apiType === "api_key" && options.apiKey ? {
+      if (options.skipPrompt)
+        process.env.ZCF_CODEX_SKIP_PROMPT_SINGLE_BACKUP = "true";
+      const hasApiConfigs = Boolean(options.apiConfigs || options.apiConfigsFile);
+      const apiMode = hasApiConfigs ? "skip" : options.apiType === "auth_token" ? "official" : options.apiType === "api_key" ? "custom" : options.apiType === "skip" ? "skip" : options.skipPrompt ? "skip" : void 0;
+      const customApiConfig = !hasApiConfigs && options.apiType === "api_key" && options.apiKey ? {
         type: "api_key",
         token: options.apiKey,
         baseUrl: options.apiUrl,
@@ -6722,6 +6860,9 @@ async function init(options = {}) {
       } else if (options.workflows === true) {
         selectedWorkflows = [];
       }
+      if (hasApiConfigs) {
+        await handleMultiConfigurations(options, "codex");
+      }
       const resolvedAiOutputLang = await runCodexFullInit({
         aiOutputLang: options.aiOutputLang,
         skipPrompt: options.skipPrompt,
@@ -6840,9 +6981,12 @@ async function init(options = {}) {
             key: options.apiKey,
             url: preset?.claudeCode?.baseUrl || options.apiUrl || API_DEFAULT_URL
           };
-          if (preset?.claudeCode?.defaultModels && preset.claudeCode.defaultModels.length >= 2) {
-            options.apiModel = options.apiModel || preset.claudeCode.defaultModels[0];
-            options.apiFastModel = options.apiFastModel || preset.claudeCode.defaultModels[1];
+          if (preset?.claudeCode?.defaultModels && preset.claudeCode.defaultModels.length > 0) {
+            const [primary, haiku, sonnet, opus] = preset.claudeCode.defaultModels;
+            options.apiModel = options.apiModel || primary;
+            options.apiHaikuModel = options.apiHaikuModel || haiku;
+            options.apiSonnetModel = options.apiSonnetModel || sonnet;
+            options.apiOpusModel = options.apiOpusModel || opus;
           }
           await saveSingleConfigToToml(apiConfig, options.provider, options);
         } else if (options.apiType === "auth_token" && options.apiKey) {
@@ -6969,20 +7113,26 @@ async function init(options = {}) {
         console.log(ansis.gray(`  Key: ${formatApiKeyDisplay(configuredApi.key)}`));
       }
     }
-    if ((options.apiModel || options.apiFastModel) && action !== "docs-only" && codeToolType === "claude-code") {
+    const hasModelParams = options.apiModel || options.apiHaikuModel || options.apiSonnetModel || options.apiOpusModel;
+    if (hasModelParams && action !== "docs-only" && codeToolType === "claude-code") {
       if (options.skipPrompt) {
         const { updateCustomModel } = await Promise.resolve().then(function () { return config$1; });
         updateCustomModel(
           options.apiModel || void 0,
-          options.apiFastModel || void 0
+          options.apiHaikuModel || void 0,
+          options.apiSonnetModel || void 0,
+          options.apiOpusModel || void 0
         );
         console.log(ansis.green(`\u2714 ${i18n.t("api:modelConfigSuccess")}`));
         if (options.apiModel) {
           console.log(ansis.gray(`  ${i18n.t("api:primaryModel")}: ${options.apiModel}`));
         }
-        if (options.apiFastModel) {
-          console.log(ansis.gray(`  ${i18n.t("api:fastModel")}: ${options.apiFastModel}`));
-        }
+        if (options.apiHaikuModel)
+          console.log(ansis.gray(`  Haiku: ${options.apiHaikuModel}`));
+        if (options.apiSonnetModel)
+          console.log(ansis.gray(`  Sonnet: ${options.apiSonnetModel}`));
+        if (options.apiOpusModel)
+          console.log(ansis.gray(`  Opus: ${options.apiOpusModel}`));
       }
     }
     if (action !== "docs-only") {
@@ -7205,6 +7355,7 @@ async function handleClaudeCodeConfigs(configs) {
 }
 async function handleCodexConfigs(configs) {
   const { addProviderToExisting } = await import('./codex-provider-manager.mjs');
+  const addedProviderIds = [];
   for (const config of configs) {
     try {
       const provider = await convertToCodexProvider(config);
@@ -7212,6 +7363,7 @@ async function handleCodexConfigs(configs) {
       if (!result.success) {
         throw new Error(i18n.t("multi-config:providerAddFailed", { name: config.name, error: result.error }));
       }
+      addedProviderIds.push(provider.id);
       console.log(ansis.green(`\u2714 ${i18n.t("multi-config:providerAdded", { name: config.name })}`));
     } catch (error) {
       console.error(ansis.red(i18n.t("multi-config:providerAddFailed", {
@@ -7224,8 +7376,14 @@ async function handleCodexConfigs(configs) {
   const defaultConfig = configs.find((c) => c.default);
   if (defaultConfig) {
     const { switchCodexProvider } = await Promise.resolve().then(function () { return codex; });
-    await switchCodexProvider(defaultConfig.name);
-    console.log(ansis.green(`\u2714 ${i18n.t("multi-config:defaultProviderSet", { name: defaultConfig.name })}`));
+    const displayName = defaultConfig.name || defaultConfig.provider || "custom";
+    const providerId = displayName.toLowerCase().replace(/[^a-z0-9]/g, "-");
+    if (addedProviderIds.includes(providerId)) {
+      await switchCodexProvider(providerId);
+      console.log(ansis.green(`\u2714 ${i18n.t("multi-config:defaultProviderSet", { name: displayName })}`));
+    } else {
+      console.log(ansis.red(i18n.t("multi-config:providerAddFailed", { name: displayName, error: "provider not added" })));
+    }
   }
 }
 async function saveSingleConfigToToml(apiConfig, provider, options) {
@@ -7252,7 +7410,9 @@ async function convertSingleConfigToProfile(apiConfig, provider, options) {
   const configName = provider && provider !== "custom" ? provider : "custom-config";
   let baseUrl = apiConfig.url || API_DEFAULT_URL;
   let primaryModel = options?.apiModel;
-  let fastModel = options?.apiFastModel;
+  let defaultHaikuModel = options?.apiHaikuModel;
+  let defaultSonnetModel = options?.apiSonnetModel;
+  let defaultOpusModel = options?.apiOpusModel;
   let authType = apiConfig.authType;
   if (provider && provider !== "custom") {
     const { getProviderPreset } = await import('./api-providers.mjs');
@@ -7260,9 +7420,12 @@ async function convertSingleConfigToProfile(apiConfig, provider, options) {
     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];
+      if (preset.claudeCode.defaultModels && preset.claudeCode.defaultModels.length > 0) {
+        const [p, h, s, o] = preset.claudeCode.defaultModels;
+        primaryModel = primaryModel || p;
+        defaultHaikuModel = defaultHaikuModel || h;
+        defaultSonnetModel = defaultSonnetModel || s;
+        defaultOpusModel = defaultOpusModel || o;
       }
     }
   }
@@ -7272,7 +7435,9 @@ async function convertSingleConfigToProfile(apiConfig, provider, options) {
     apiKey: apiConfig.key,
     baseUrl,
     primaryModel,
-    fastModel,
+    defaultHaikuModel,
+    defaultSonnetModel,
+    defaultOpusModel,
     id: ClaudeCodeConfigManager.generateProfileId(configName)
   };
   return profile;
@@ -7281,7 +7446,9 @@ async function convertToClaudeCodeProfile(config) {
   const { ClaudeCodeConfigManager } = await import('./claude-code-config-manager.mjs');
   let baseUrl = config.url;
   let primaryModel = config.primaryModel;
-  let fastModel = config.fastModel;
+  let defaultHaikuModel = config.defaultHaikuModel;
+  let defaultSonnetModel = config.defaultSonnetModel;
+  let defaultOpusModel = config.defaultOpusModel;
   let authType = config.type || "api_key";
   if (config.provider && config.provider !== "custom") {
     const { getProviderPreset } = await import('./api-providers.mjs');
@@ -7289,9 +7456,12 @@ async function convertToClaudeCodeProfile(config) {
     if (preset?.claudeCode) {
       baseUrl = baseUrl || 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];
+      if (preset.claudeCode.defaultModels && preset.claudeCode.defaultModels.length > 0) {
+        const [p, h, s, o] = preset.claudeCode.defaultModels;
+        primaryModel = primaryModel || p;
+        defaultHaikuModel = defaultHaikuModel || h;
+        defaultSonnetModel = defaultSonnetModel || s;
+        defaultOpusModel = defaultOpusModel || o;
       }
     }
   }
@@ -7301,15 +7471,19 @@ async function convertToClaudeCodeProfile(config) {
     apiKey: config.key,
     baseUrl,
     primaryModel,
-    fastModel,
+    defaultHaikuModel,
+    defaultSonnetModel,
+    defaultOpusModel,
     id: ClaudeCodeConfigManager.generateProfileId(config.name)
   };
   return profile;
 }
 async function convertToCodexProvider(config) {
+  const displayName = config.name || config.provider || "custom";
+  const providerId = displayName.toLowerCase().replace(/[^a-z0-9]/g, "-");
   let baseUrl = config.url || API_DEFAULT_URL;
   let model = config.primaryModel || "gpt-5-codex";
-  let wireApi = "chat";
+  let wireApi = "responses";
   if (config.provider && config.provider !== "custom") {
     const { getProviderPreset } = await import('./api-providers.mjs');
     const preset = getProviderPreset(config.provider);
@@ -7320,11 +7494,11 @@ async function convertToCodexProvider(config) {
     }
   }
   return {
-    id: config.name.toLowerCase().replace(/[^a-z0-9]/g, "-"),
-    name: config.name,
+    id: providerId,
+    name: displayName,
     baseUrl,
     wireApi,
-    tempEnvKey: API_ENV_KEY,
+    tempEnvKey: `${displayName}_API_KEY`.replace(/\W/g, "_").toUpperCase(),
     requiresOpenaiAuth: false,
     model
   };
@@ -7408,4 +7582,4 @@ async function openSettingsJson() {
   }
 }
 
-export { getExistingModelConfig as $, API_DEFAULT_URL as A, getAiOutputLanguageLabel as B, CLAUDE_DIR as C, DEFAULT_CODE_TOOL_TYPE as D, getMcpConfigPath as E, readMcpConfig as F, writeMcpConfig as G, backupMcpConfig as H, mergeMcpServers as I, buildMcpServerConfig as J, fixWindowsMcpConfig as K, LEGACY_ZCF_CONFIG_FILES as L, addCompletedOnboarding as M, ensureApiKeyApproved as N, removeApiKeyFromRejected as O, manageApiKeyApproval as P, setPrimaryApiKey as Q, ensureClaudeDir as R, SETTINGS_FILE as S, backupExistingConfig as T, copyConfigFiles as U, configureApi as V, mergeConfigs as W, updateCustomModel as X, updateDefaultModel as Y, ZCF_CONFIG_DIR as Z, mergeSettingsFile as _, commandExists as a, updatePromptOnly as a$, getExistingApiConfig as a0, applyAiLanguageDirective as a1, switchToOfficialLogin$1 as a2, promptApiConfigurationAction as a3, isClaudeCodeInstalled as a4, installClaudeCode as a5, isCodexInstalled as a6, installCodex as a7, isLocalClaudeCodeInstalled as a8, getInstallationStatus as a9, writeAuthFile as aA, updateZcfConfig as aB, changeLanguage as aC, readZcfConfig as aD, configureOutputStyle as aE, isWindows as aF, selectMcpServices as aG, getMcpServices as aH, isCcrInstalled as aI, installCcr as aJ, setupCcrConfiguration as aK, modifyApiConfigPartially as aL, formatApiKeyDisplay as aM, readCcrConfig as aN, configureCcrFeature as aO, handleExitPromptError as aP, handleGeneralError as aQ, COMETIX_COMMAND_NAME as aR, COMETIX_COMMANDS as aS, installCometixLine as aT, checkAndUpdateTools as aU, runCodexUpdate as aV, resolveCodeType as aW, writeJsonConfig as aX, displayBanner as aY, version as aZ, resolveAiOutputLanguage as a_, removeLocalClaudeCode as aa, uninstallCodeTool as ab, setInstallMethod as ac, detectInstalledVersion as ad, selectInstallMethod as ae, executeInstallMethod as af, handleInstallFailure as ag, verifyInstallation as ah, createHomebrewSymlink as ai, displayVerificationResult as aj, ensureI18nInitialized as ak, i18n as al, addNumbersToChoices as am, validateApiKey as an, promptBoolean as ao, ensureDir as ap, readDefaultTomlConfig as aq, createDefaultTomlConfig as ar, exists as as, readJsonConfig as at, writeTomlConfig as au, copyFile as av, detectConfigManagementMode as aw, readCodexConfig as ax, backupCodexComplete as ay, writeCodexConfig as az, importRecommendedEnv as b, selectAndInstallWorkflows as b0, checkClaudeCodeVersionAndPrompt as b1, displayBannerWithInfo as b2, runCodexUninstall as b3, configureCodexMcp as b4, configureCodexApi as b5, runCodexWorkflowImportWithLanguageSelection as b6, runCodexFullInit as b7, switchCodexProvider as b8, listCodexProviders as b9, switchToOfficialLogin as ba, switchToProvider as bb, readZcfConfigAsync as bc, initI18n as bd, selectScriptLanguage as be, index as bf, fsOperations as bg, jsonConfig as bh, claudeConfig as bi, config$1 as bj, config as bk, prompts as bl, codex as bm, installer as bn, cleanupPermissions as c, importRecommendedPermissions as d, CLAUDE_MD_FILE as e, ClAUDE_CONFIG_FILE as f, getPlatform as g, CLAUDE_VSC_CONFIG_FILE as h, init as i, CODEX_DIR as j, CODEX_CONFIG_FILE as k, CODEX_AUTH_FILE as l, mergeAndCleanPermissions as m, CODEX_AGENTS_FILE as n, openSettingsJson as o, CODEX_PROMPTS_DIR as p, ZCF_CONFIG_FILE as q, CODE_TOOL_TYPES as r, CODE_TOOL_BANNERS as s, CODE_TOOL_ALIASES as t, isCodeToolType as u, API_ENV_KEY as v, resolveCodeToolType as w, SUPPORTED_LANGS as x, LANG_LABELS as y, AI_OUTPUT_LANGUAGES as z };
+export { getExistingModelConfig as $, API_DEFAULT_URL as A, getAiOutputLanguageLabel as B, CLAUDE_DIR as C, DEFAULT_CODE_TOOL_TYPE as D, getMcpConfigPath as E, readMcpConfig as F, writeMcpConfig as G, backupMcpConfig as H, mergeMcpServers as I, buildMcpServerConfig as J, fixWindowsMcpConfig as K, LEGACY_ZCF_CONFIG_FILES as L, addCompletedOnboarding as M, ensureApiKeyApproved as N, removeApiKeyFromRejected as O, manageApiKeyApproval as P, setPrimaryApiKey as Q, ensureClaudeDir as R, SETTINGS_FILE as S, backupExistingConfig as T, copyConfigFiles as U, configureApi as V, mergeConfigs as W, updateCustomModel as X, updateDefaultModel as Y, ZCF_CONFIG_DIR as Z, mergeSettingsFile as _, commandExists as a, resolveAiOutputLanguage as a$, getExistingApiConfig as a0, applyAiLanguageDirective as a1, switchToOfficialLogin$1 as a2, promptApiConfigurationAction as a3, isClaudeCodeInstalled as a4, installClaudeCode as a5, isCodexInstalled as a6, installCodex as a7, isLocalClaudeCodeInstalled as a8, getInstallationStatus as a9, writeCodexConfig as aA, writeAuthFile as aB, updateZcfConfig as aC, changeLanguage as aD, readZcfConfig as aE, configureOutputStyle as aF, isWindows as aG, selectMcpServices as aH, getMcpServices as aI, isCcrInstalled as aJ, installCcr as aK, setupCcrConfiguration as aL, modifyApiConfigPartially as aM, formatApiKeyDisplay as aN, readCcrConfig as aO, configureCcrFeature as aP, handleExitPromptError as aQ, handleGeneralError as aR, COMETIX_COMMAND_NAME as aS, COMETIX_COMMANDS as aT, installCometixLine as aU, checkAndUpdateTools as aV, runCodexUpdate as aW, resolveCodeType as aX, writeJsonConfig as aY, displayBanner as aZ, version as a_, removeLocalClaudeCode as aa, uninstallCodeTool as ab, setInstallMethod as ac, detectInstalledVersion as ad, selectInstallMethod as ae, executeInstallMethod as af, handleInstallFailure as ag, verifyInstallation as ah, createHomebrewSymlink as ai, displayVerificationResult as aj, ensureI18nInitialized as ak, i18n as al, addNumbersToChoices as am, validateApiKey as an, promptBoolean as ao, ensureDir as ap, readDefaultTomlConfig as aq, createDefaultTomlConfig as ar, exists as as, readJsonConfig as at, writeTomlConfig as au, clearModelEnv as av, copyFile as aw, detectConfigManagementMode as ax, readCodexConfig as ay, backupCodexComplete as az, importRecommendedEnv as b, updatePromptOnly as b0, selectAndInstallWorkflows as b1, checkClaudeCodeVersionAndPrompt as b2, displayBannerWithInfo as b3, runCodexUninstall as b4, configureCodexMcp as b5, configureCodexApi as b6, runCodexWorkflowImportWithLanguageSelection as b7, runCodexFullInit as b8, switchCodexProvider as b9, listCodexProviders as ba, switchToOfficialLogin as bb, switchToProvider as bc, readZcfConfigAsync as bd, initI18n as be, selectScriptLanguage as bf, index as bg, fsOperations as bh, jsonConfig as bi, claudeConfig as bj, config$1 as bk, config as bl, prompts as bm, codex as bn, installer as bo, cleanupPermissions as c, importRecommendedPermissions as d, CLAUDE_MD_FILE as e, ClAUDE_CONFIG_FILE as f, getPlatform as g, CLAUDE_VSC_CONFIG_FILE as h, init as i, CODEX_DIR as j, CODEX_CONFIG_FILE as k, CODEX_AUTH_FILE as l, mergeAndCleanPermissions as m, CODEX_AGENTS_FILE as n, openSettingsJson as o, CODEX_PROMPTS_DIR as p, ZCF_CONFIG_FILE as q, CODE_TOOL_TYPES as r, CODE_TOOL_BANNERS as s, CODE_TOOL_ALIASES as t, isCodeToolType as u, API_ENV_KEY as v, resolveCodeToolType as w, SUPPORTED_LANGS as x, LANG_LABELS as y, AI_OUTPUT_LANGUAGES as z };