zcf 3.1.3 → 3.2.0

package/dist/cli.mjs

@@ -1,17 +1,19 @@
 #!/usr/bin/env node
 import cac from 'cac';
 import ansis from 'ansis';
-import { a5 as ensureI18nInitialized, a0 as i18n, a8 as readCcrConfig, a9 as isCcrInstalled, aa as installCcr, ab as configureCcrFeature, ac as handleExitPromptError, ad as handleGeneralError, p as SUPPORTED_LANGS, a7 as addNumbersToChoices, q as LANG_LABELS, ae as updateZcfConfig, af as changeLanguage, ag as readZcfConfig, o as openSettingsJson, d as importRecommendedPermissions, b as importRecommendedEnv, T as applyAiLanguageDirective, ah as configureOutputStyle, Q as getExistingModelConfig, N as updateCustomModel, O as updateDefaultModel, ai as isWindows, t as readMcpConfig, y as fixWindowsMcpConfig, w as writeMcpConfig, aj as selectMcpServices, u as backupMcpConfig, ak as getMcpServices, x as buildMcpServerConfig, v as mergeMcpServers, al as setupCcrConfiguration, R as getExistingApiConfig, V as promptApiConfigurationAction, am as modifyApiConfigPartially, an as validateApiKey, K as configureApi, ao as formatApiKeyDisplay, U as switchToOfficialLogin, ap as COMETIX_COMMAND_NAME, aq as COMETIX_COMMANDS, ar as installCometixLine, as as checkAndUpdateTools, at as readJsonConfig, au as writeJsonConfig, j as ZCF_CONFIG_FILE, av as displayBanner, aw as runCodexUpdate, ax as version, ay as resolveAiOutputLanguage, az as updatePromptOnly, aA as selectAndInstallWorkflows, aB as checkClaudeCodeVersionAndPrompt, n as isCodeToolType, D as DEFAULT_CODE_TOOL_TYPE, aC as displayBannerWithInfo, l as CODE_TOOL_BANNERS, aD as runCodexUninstall, aE as configureCodexMcp, aF as configureCodexApi, aG as runCodexWorkflowImport, aH as runCodexFullInit, i as init, aI as listCodexProviders, aJ as getCurrentCodexProvider, aK as switchCodexProvider, a1 as readCodexConfig, aL as switchToOfficialLogin$1, aM as switchToProvider, aN as readZcfConfigAsync, aO as initI18n, aP as selectScriptLanguage } from './chunks/simple-config.mjs';
+import { a2 as ensureI18nInitialized, a3 as i18n, ai as readCcrConfig, aj as isCcrInstalled, ak as installCcr, al as configureCcrFeature, am as handleExitPromptError, an as handleGeneralError, q as SUPPORTED_LANGS, a4 as addNumbersToChoices, s as LANG_LABELS, ao as updateZcfConfig, ap as changeLanguage, aq as readZcfConfig, o as openSettingsJson, d as importRecommendedPermissions, b as importRecommendedEnv, V as applyAiLanguageDirective, ar as configureOutputStyle, T as getExistingModelConfig, P as updateCustomModel, Q as updateDefaultModel, as as isWindows, v as readMcpConfig, B as fixWindowsMcpConfig, w as writeMcpConfig, at as selectMcpServices, x as backupMcpConfig, au as getMcpServices, z as buildMcpServerConfig, y as mergeMcpServers, av as setupCcrConfiguration, U as getExistingApiConfig, X as promptApiConfigurationAction, aw as modifyApiConfigPartially, a5 as validateApiKey, N as configureApi, ax as formatApiKeyDisplay, W as switchToOfficialLogin, ay as COMETIX_COMMAND_NAME, az as COMETIX_COMMANDS, aA as installCometixLine, aB as checkAndUpdateTools, aC as runCodexUpdate, aD as resolveCodeType$1, aa as readJsonConfig, aE as writeJsonConfig, j as ZCF_CONFIG_FILE, aF as displayBanner, aG as version, aH as resolveAiOutputLanguage, aI as updatePromptOnly, aJ as selectAndInstallWorkflows, aK as checkClaudeCodeVersionAndPrompt, r as resolveCodeToolType$1, D as DEFAULT_CODE_TOOL_TYPE, p as isCodeToolType, aL as displayBannerWithInfo, l as CODE_TOOL_BANNERS, aM as runCodexUninstall, aN as configureCodexMcp, aO as configureCodexApi, aP as runCodexWorkflowImportWithLanguageSelection, aQ as runCodexFullInit, i as init, aR as switchCodexProvider, aS as listCodexProviders, ae as readCodexConfig, aT as switchToOfficialLogin$1, aU as switchToProvider, aV as readZcfConfigAsync, aW as initI18n, aX as selectScriptLanguage } from './chunks/simple-config.mjs';
 import { existsSync } from 'node:fs';
 import { homedir } from 'node:os';
 import inquirer from 'inquirer';
 import { join } from 'pathe';
-import { exec, spawn } from 'node:child_process';
-import { promisify } from 'node:util';
+import { runCcrStop, runCcrStart, runCcrRestart, runCcrStatus, runCcrUi } from './chunks/commands.mjs';
 import process from 'node:process';
 import { x, exec as exec$1 } from 'tinyexec';
+import { exec, spawn } from 'node:child_process';
+import { promisify } from 'node:util';
 import { pathExists } from 'fs-extra';
 import { m as moveToTrash } from './shared/zcf.DGjQxTq_.mjs';
+import { ClaudeCodeConfigManager } from './chunks/claude-code-config-manager.mjs';
 import 'dayjs';
 import 'node:url';
 import 'ora';
@@ -22,103 +24,6 @@ import 'i18next';
 import 'i18next-fs-backend';
 import 'trash';
 
-const execAsync$1 = promisify(exec);
-async function runCcrUi(apiKey) {
-  ensureI18nInitialized();
-  console.log(ansis.cyan(`
-\u{1F5A5}\uFE0F  ${i18n.t("ccr:startingCcrUi")}`));
-  if (apiKey) {
-    console.log(ansis.bold.green(`
-\u{1F511} ${i18n.t("ccr:ccrUiApiKey") || "CCR UI API Key"}: ${apiKey}`));
-    console.log(ansis.gray(`   ${i18n.t("ccr:ccrUiApiKeyHint") || "Use this API key to login to CCR UI"}
-`));
-  }
-  try {
-    const { stdout, stderr } = await execAsync$1("ccr ui");
-    if (stdout)
-      console.log(stdout);
-    if (stderr)
-      console.error(ansis.yellow(stderr));
-    console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrUiStarted")}`));
-  } catch (error) {
-    console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrCommandFailed")}: ${error instanceof Error ? error.message : String(error)}`));
-    throw error;
-  }
-}
-async function runCcrStatus() {
-  ensureI18nInitialized();
-  console.log(ansis.cyan(`
-\u{1F4CA} ${i18n.t("ccr:checkingCcrStatus")}`));
-  try {
-    const { stdout, stderr } = await execAsync$1("ccr status");
-    if (stdout) {
-      console.log(`
-${ansis.bold(i18n.t("ccr:ccrStatusTitle"))}`);
-      console.log(stdout);
-    }
-    if (stderr)
-      console.error(ansis.yellow(stderr));
-  } catch (error) {
-    console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrCommandFailed")}: ${error instanceof Error ? error.message : String(error)}`));
-    throw error;
-  }
-}
-async function runCcrRestart() {
-  ensureI18nInitialized();
-  console.log(ansis.cyan(`
-\u{1F504} ${i18n.t("ccr:restartingCcr")}`));
-  try {
-    const { stdout, stderr } = await execAsync$1("ccr restart");
-    if (stdout)
-      console.log(stdout);
-    if (stderr)
-      console.error(ansis.yellow(stderr));
-    console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrRestarted")}`));
-  } catch (error) {
-    console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrCommandFailed")}: ${error instanceof Error ? error.message : String(error)}`));
-    throw error;
-  }
-}
-async function runCcrStart() {
-  ensureI18nInitialized();
-  console.log(ansis.cyan(`
-\u25B6\uFE0F  ${i18n.t("ccr:startingCcr")}`));
-  try {
-    const { stdout, stderr } = await execAsync$1("ccr start");
-    if (stdout)
-      console.log(stdout);
-    if (stderr)
-      console.error(ansis.yellow(stderr));
-    console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrStarted")}`));
-  } catch (error) {
-    if (error.stdout && error.stdout.includes("Loaded JSON config from:")) {
-      console.log(error.stdout);
-      if (error.stderr)
-        console.error(ansis.yellow(error.stderr));
-      console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrStarted")}`));
-    } else {
-      console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrCommandFailed")}: ${error instanceof Error ? error.message : String(error)}`));
-      throw error;
-    }
-  }
-}
-async function runCcrStop() {
-  ensureI18nInitialized();
-  console.log(ansis.cyan(`
-\u23F9\uFE0F  ${i18n.t("ccr:stoppingCcr")}`));
-  try {
-    const { stdout, stderr } = await execAsync$1("ccr stop");
-    if (stdout)
-      console.log(stdout);
-    if (stderr)
-      console.error(ansis.yellow(stderr));
-    console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrStopped")}`));
-  } catch (error) {
-    console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrCommandFailed")}: ${error instanceof Error ? error.message : String(error)}`));
-    throw error;
-  }
-}
-
 function isCcrConfigured() {
   const CCR_CONFIG_FILE = join(homedir(), ".claude-code-router", "config.json");
   if (!existsSync(CCR_CONFIG_FILE)) {
@@ -257,6 +162,13 @@ async function handleOfficialLoginMode() {
 }
 async function handleCustomApiMode() {
   ensureI18nInitialized();
+  const zcfConfig = readZcfConfig();
+  const codeToolType = zcfConfig?.codeToolType || "claude-code";
+  if (codeToolType === "claude-code") {
+    const { configureIncrementalManagement } = await import('./chunks/claude-code-incremental-manager.mjs');
+    await configureIncrementalManagement();
+    return;
+  }
   const existingConfig = getExistingApiConfig();
   if (existingConfig) {
     const configAction = await promptApiConfigurationAction();
@@ -553,7 +465,7 @@ ${ansis.blue(`\u2139 ${i18n.t("configuration:existingLanguageConfig") || "Existi
         return;
       }
     }
-    const { selectAiOutputLanguage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aR; });
+    const { selectAiOutputLanguage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.b2; });
     const aiOutputLang = await selectAiOutputLanguage();
     applyAiLanguageDirective(aiOutputLang);
     updateZcfConfig({ aiOutputLang });
@@ -586,7 +498,7 @@ async function changeScriptLanguageFeature(currentLang) {
 }
 async function configureCodexDefaultModelFeature() {
   ensureI18nInitialized();
-  const { readCodexConfig } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aS; });
+  const { readCodexConfig } = await import('./chunks/simple-config.mjs').then(function (n) { return n.b3; });
   const existingConfig = readCodexConfig();
   const currentModel = existingConfig?.model;
   if (currentModel) {
@@ -691,7 +603,7 @@ ${ansis.blue(`\u2139 ${i18n.t("configuration:existingLanguageConfig") || "Existi
         return;
       }
     }
-    const { selectAiOutputLanguage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aR; });
+    const { selectAiOutputLanguage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.b2; });
     const aiOutputLang = await selectAiOutputLanguage();
     await updateCodexLanguageDirective(aiOutputLang);
     updateZcfConfig({ aiOutputLang });
@@ -699,14 +611,14 @@ ${ansis.blue(`\u2139 ${i18n.t("configuration:existingLanguageConfig") || "Existi
   } else if (option === "systemPrompt") {
     const zcfConfig = readZcfConfig();
     const currentLang = zcfConfig?.aiOutputLang || "English";
-    const { runCodexSystemPromptSelection } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aS; });
+    const { runCodexSystemPromptSelection } = await import('./chunks/simple-config.mjs').then(function (n) { return n.b3; });
     await runCodexSystemPromptSelection();
     await ensureLanguageDirectiveInAgents(currentLang);
     console.log(ansis.green(`\u2714 ${i18n.t("configuration:systemPromptConfigured")}`));
   }
 }
 async function updateCodexModelProvider(modelProvider) {
-  const { readCodexConfig, writeCodexConfig, backupCodexConfig, getBackupMessage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aS; });
+  const { readCodexConfig, writeCodexConfig, backupCodexConfig, getBackupMessage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.b3; });
   const backupPath = backupCodexConfig();
   if (backupPath) {
     console.log(ansis.gray(getBackupMessage(backupPath)));
@@ -727,7 +639,7 @@ async function updateCodexModelProvider(modelProvider) {
   writeCodexConfig(updatedConfig);
 }
 async function ensureLanguageDirectiveInAgents(aiOutputLang) {
-  const { readFile, writeFile, exists } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aQ; });
+  const { readFile, writeFile, exists } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aZ; });
   const { homedir } = await import('node:os');
   const { join } = await import('pathe');
   const CODEX_AGENTS_FILE = join(homedir(), ".codex", "AGENTS.md");
@@ -745,7 +657,7 @@ async function ensureLanguageDirectiveInAgents(aiOutputLang) {
   const langLabel = languageLabels[aiOutputLang] || aiOutputLang;
   const hasLanguageDirective = /\*\*Most Important:\s*Always respond in [^*]+\*\*/i.test(content);
   if (!hasLanguageDirective) {
-    const { backupCodexAgents, getBackupMessage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aS; });
+    const { backupCodexAgents, getBackupMessage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.b3; });
     const backupPath = backupCodexAgents();
     if (backupPath) {
       console.log(ansis.gray(getBackupMessage(backupPath)));
@@ -762,8 +674,8 @@ async function ensureLanguageDirectiveInAgents(aiOutputLang) {
   }
 }
 async function updateCodexLanguageDirective(aiOutputLang) {
-  const { readFile, writeFile, exists } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aQ; });
-  const { backupCodexAgents, getBackupMessage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aS; });
+  const { readFile, writeFile, exists } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aZ; });
+  const { backupCodexAgents, getBackupMessage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.b3; });
   const { homedir } = await import('node:os');
   const { join } = await import('pathe');
   const CODEX_AGENTS_FILE = join(homedir(), ".codex", "AGENTS.md");
@@ -1042,10 +954,55 @@ async function runCometixMenuFeature() {
   await showCometixMenu();
 }
 
+class ToolUpdateScheduler {
+  /**
+   * Update tools based on code type
+   * @param codeType - The code tool type to update
+   * @param skipPrompt - Whether to skip interactive prompts
+   */
+  async updateByCodeType(codeType, skipPrompt = false) {
+    await ensureI18nInitialized();
+    switch (codeType) {
+      case "claude-code":
+        await this.updateClaudeCodeTools(skipPrompt);
+        break;
+      case "codex":
+        await this.updateCodexTools(skipPrompt);
+        break;
+      default:
+        throw new Error(`Unsupported code type: ${codeType}`);
+    }
+  }
+  /**
+   * Update Claude Code related tools
+   * @param skipPrompt - Whether to skip interactive prompts
+   */
+  async updateClaudeCodeTools(skipPrompt) {
+    await checkAndUpdateTools(skipPrompt);
+  }
+  /**
+   * Update Codex tools
+   * @param skipPrompt - Whether to skip interactive prompts
+   */
+  async updateCodexTools(skipPrompt) {
+    await runCodexUpdate(false, skipPrompt);
+  }
+}
+
 async function checkUpdates(options = {}) {
   try {
     const skipPrompt = options.skipPrompt || false;
-    await checkAndUpdateTools(skipPrompt);
+    let codeType;
+    try {
+      codeType = await resolveCodeType$1(options.codeType);
+    } catch (err) {
+      const errorMessage = err instanceof Error ? err.message : String(err);
+      console.error(ansis.red(`${errorMessage}
+Defaulting to "claude-code".`));
+      codeType = "claude-code";
+    }
+    const scheduler = new ToolUpdateScheduler();
+    await scheduler.updateByCodeType(codeType, skipPrompt);
   } catch (error) {
     const errorMessage = error instanceof Error ? error.message : String(error);
     console.error(ansis.red(`${i18n.t("updater:errorCheckingUpdates")} ${errorMessage}`));
@@ -1791,8 +1748,11 @@ function displayUninstallResult(mode, results) {
 }
 
 function resolveCodeToolType(optionValue, savedValue) {
-  if (isCodeToolType(optionValue)) {
-    return optionValue;
+  if (optionValue !== void 0) {
+    const resolved = resolveCodeToolType$1(optionValue);
+    if (resolved !== DEFAULT_CODE_TOOL_TYPE || optionValue === DEFAULT_CODE_TOOL_TYPE) {
+      return resolved;
+    }
   }
   if (savedValue && isCodeToolType(savedValue)) {
     return savedValue;
@@ -1824,13 +1784,15 @@ async function update(options = {}) {
       }
       return;
     }
-    const { resolveTemplateLanguage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aR; });
+    const { resolveTemplateLanguage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.b2; });
     const configLang = await resolveTemplateLanguage(
       options.configLang,
       // Command line option
-      zcfConfig
+      zcfConfig,
+      options.skipPrompt
+      // Non-interactive mode flag
     );
-    const aiOutputLang = await resolveAiOutputLanguage(i18n.language, options.aiOutputLang, zcfConfig);
+    const aiOutputLang = await resolveAiOutputLanguage(i18n.language, options.aiOutputLang, zcfConfig, options.skipPrompt);
     console.log(ansis.cyan(`
 ${i18n.t("configuration:updatingPrompts")}
 `));
@@ -2096,7 +2058,7 @@ async function showCodexMenu() {
       await runCodexFullInit();
       break;
     case "2":
-      await runCodexWorkflowImport();
+      await runCodexWorkflowImportWithLanguageSelection();
       break;
     case "3":
       await configureCodexApi();
@@ -2191,14 +2153,15 @@ async function configSwitchCommand(options) {
   try {
     ensureI18nInitialized();
     if (options.list) {
-      await handleListProviders();
+      await handleList(options.codeType);
       return;
     }
-    if (options.provider) {
-      await handleDirectSwitch(options.provider);
+    if (options.target) {
+      const resolvedCodeType = resolveCodeType(options.codeType);
+      await handleDirectSwitch(resolvedCodeType, options.target);
       return;
     }
-    await handleInteractiveSwitch();
+    await handleInteractiveSwitch(options.codeType);
   } catch (error) {
     if (process.env.NODE_ENV === "test" || process.env.VITEST) {
       throw error;
@@ -2206,29 +2169,199 @@ async function configSwitchCommand(options) {
     handleGeneralError(error);
   }
 }
-async function handleListProviders() {
+function resolveCodeType(codeType) {
+  if (codeType !== void 0) {
+    const resolved = resolveCodeToolType$1(codeType);
+    return resolved;
+  }
+  const zcfConfig = readZcfConfig();
+  if (zcfConfig?.codeToolType && isCodeToolType(zcfConfig.codeToolType)) {
+    return zcfConfig.codeToolType;
+  }
+  return DEFAULT_CODE_TOOL_TYPE;
+}
+async function handleList(codeType) {
+  const targetCodeType = resolveCodeType(codeType);
+  if (targetCodeType === "claude-code") {
+    await listClaudeCodeProfiles();
+  } else if (targetCodeType === "codex") {
+    await listCodexProvidersWithDisplay();
+  }
+}
+async function listCodexProvidersWithDisplay() {
   const providers = await listCodexProviders();
-  const currentProvider = await getCurrentCodexProvider();
-  console.log(ansis.cyan(i18n.t("codex:listProvidersTitle")));
-  console.log("");
-  if (providers.length === 0) {
+  const existingConfig = readCodexConfig();
+  const currentProvider = existingConfig?.modelProvider;
+  const isCommented = existingConfig?.modelProviderCommented;
+  if (!providers || providers.length === 0) {
     console.log(ansis.yellow(i18n.t("codex:noProvidersAvailable")));
     return;
   }
-  if (currentProvider) {
-    console.log(ansis.green(`${i18n.t("codex:currentProvider", { provider: currentProvider })}`));
-    console.log("");
+  console.log(ansis.bold(i18n.t("codex:listProvidersTitle")));
+  console.log();
+  if (currentProvider && !isCommented) {
+    console.log(ansis.cyan(i18n.t("codex:currentProvider", { provider: currentProvider })));
+    console.log();
+  }
+  providers.forEach((provider) => {
+    const isCurrent = currentProvider === provider.id && !isCommented;
+    const status = isCurrent ? ansis.green("\u25CF ") : "  ";
+    const current = isCurrent ? ansis.yellow(` (${i18n.t("common:current")})`) : "";
+    console.log(`${status}${ansis.white(provider.name)}${current}`);
+    console.log(`    ${ansis.cyan(`ID: ${provider.id}`)} ${ansis.gray(`(${provider.baseUrl})`)}`);
+    if (provider.envKey) {
+      console.log(`    ${ansis.gray(`Env: ${provider.envKey}`)}`);
+    }
+    console.log();
+  });
+}
+async function listClaudeCodeProfiles() {
+  const config = ClaudeCodeConfigManager.readConfig();
+  if (!config || !config.profiles || Object.keys(config.profiles).length === 0) {
+    console.log(ansis.yellow(i18n.t("multi-config:noClaudeCodeProfilesAvailable")));
+    return;
   }
-  for (const provider of providers) {
-    const marker = currentProvider === provider.id ? ansis.green("\u25CF ") : "  ";
-    console.log(`${marker}${ansis.cyan(provider.id)} - ${provider.name}`);
-    console.log(`    ${ansis.gray(provider.baseUrl)}`);
+  console.log(ansis.bold(i18n.t("multi-config:availableClaudeCodeProfiles")));
+  console.log();
+  const currentProfileId = config.currentProfileId;
+  Object.values(config.profiles).forEach((profile) => {
+    const isCurrent = profile.id === currentProfileId;
+    const status = isCurrent ? ansis.green("\u25CF ") : "  ";
+    const current = isCurrent ? ansis.yellow(i18n.t("common:current")) : "";
+    console.log(`${status}${ansis.white(profile.name)}${current}`);
+    console.log(`    ${ansis.cyan(`ID: ${profile.id}`)} ${ansis.gray(`(${profile.authType})`)}`);
+    console.log();
+  });
+}
+async function handleDirectSwitch(codeType, target) {
+  const resolvedCodeType = resolveCodeType(codeType);
+  if (resolvedCodeType === "claude-code") {
+    await handleClaudeCodeDirectSwitch(target);
+  } else if (resolvedCodeType === "codex") {
+    await switchCodexProvider(target);
   }
 }
-async function handleDirectSwitch(providerId) {
-  await switchCodexProvider(providerId);
+async function handleClaudeCodeDirectSwitch(target) {
+  if (target === "official") {
+    const result = await ClaudeCodeConfigManager.switchToOfficial();
+    if (result.success) {
+      try {
+        await ClaudeCodeConfigManager.applyProfileSettings(null);
+        console.log(ansis.green(i18n.t("multi-config:successfullySwitchedToOfficial")));
+      } catch (error) {
+        const reason = error instanceof Error ? error.message : String(error);
+        console.log(ansis.red(reason));
+      }
+    } else {
+      console.log(ansis.red(i18n.t("multi-config:failedToSwitchToOfficial", { error: result.error })));
+    }
+  } else if (target === "ccr") {
+    const result = await ClaudeCodeConfigManager.switchToCcr();
+    if (result.success) {
+      try {
+        const profile = ClaudeCodeConfigManager.getProfileById("ccr-proxy");
+        await ClaudeCodeConfigManager.applyProfileSettings(profile);
+        console.log(ansis.green(i18n.t("multi-config:successfullySwitchedToCcr")));
+      } catch (error) {
+        const reason = error instanceof Error ? error.message : String(error);
+        console.log(ansis.red(reason));
+      }
+    } else {
+      console.log(ansis.red(i18n.t("multi-config:failedToSwitchToCcr", { error: result.error })));
+    }
+  } else {
+    const config = ClaudeCodeConfigManager.readConfig();
+    if (!config || !config.profiles || Object.keys(config.profiles).length === 0) {
+      console.log(ansis.yellow(i18n.t("multi-config:noClaudeCodeProfilesAvailable")));
+      return;
+    }
+    const normalizedTarget = target.trim();
+    let resolvedId = normalizedTarget;
+    let resolvedProfile = config.profiles[normalizedTarget];
+    if (!resolvedProfile) {
+      const match = Object.entries(config.profiles).find(([, profile]) => profile.name === normalizedTarget);
+      if (match) {
+        resolvedId = match[0];
+        resolvedProfile = match[1];
+      }
+    }
+    if (!resolvedProfile) {
+      console.log(ansis.red(i18n.t("multi-config:profileNameNotFound", { name: target })));
+      return;
+    }
+    const result = await ClaudeCodeConfigManager.switchProfile(resolvedId);
+    if (result.success) {
+      try {
+        await ClaudeCodeConfigManager.applyProfileSettings({ ...resolvedProfile, id: resolvedId });
+        console.log(ansis.green(i18n.t("multi-config:successfullySwitchedToProfile", { name: resolvedProfile.name })));
+      } catch (error) {
+        const reason = error instanceof Error ? error.message : String(error);
+        console.log(ansis.red(reason));
+      }
+    } else {
+      console.log(ansis.red(i18n.t("multi-config:failedToSwitchToProfile", { error: result.error })));
+    }
+  }
 }
-async function handleInteractiveSwitch() {
+async function handleInteractiveSwitch(codeType) {
+  const resolvedCodeType = resolveCodeType(codeType);
+  if (resolvedCodeType === "claude-code") {
+    await handleClaudeCodeInteractiveSwitch();
+  } else if (resolvedCodeType === "codex") {
+    await handleCodexInteractiveSwitch();
+  }
+}
+async function handleClaudeCodeInteractiveSwitch() {
+  const config = ClaudeCodeConfigManager.readConfig();
+  if (!config || !config.profiles || Object.keys(config.profiles).length === 0) {
+    console.log(ansis.yellow(i18n.t("multi-config:noClaudeCodeProfilesAvailable")));
+    return;
+  }
+  const currentProfileId = config.currentProfileId;
+  const createClaudeCodeChoices = (profiles, currentProfileId2) => {
+    const choices2 = [];
+    const isOfficialMode = !currentProfileId2 || currentProfileId2 === "official";
+    choices2.push({
+      name: isOfficialMode ? `${ansis.green("\u25CF ")}${i18n.t("codex:useOfficialLogin")} ${ansis.yellow(`(${i18n.t("common:current")})`)}` : `  ${i18n.t("codex:useOfficialLogin")}`,
+      value: "official"
+    });
+    const isCcrMode = currentProfileId2 === "ccr-proxy";
+    choices2.push({
+      name: isCcrMode ? `${ansis.green("\u25CF ")}CCR Proxy ${ansis.yellow("(current)")}` : `  CCR Proxy`,
+      value: "ccr"
+    });
+    Object.values(profiles).filter((profile) => profile.id !== "ccr-proxy").forEach((profile) => {
+      const isCurrent = profile.id === currentProfileId2;
+      choices2.push({
+        name: isCurrent ? `${ansis.green("\u25CF ")}${profile.name} ${ansis.yellow("(current)")}` : `  ${profile.name}`,
+        value: profile.id
+      });
+    });
+    return choices2;
+  };
+  const choices = createClaudeCodeChoices(config.profiles, currentProfileId);
+  try {
+    const { selectedConfig } = await inquirer.prompt([{
+      type: "list",
+      name: "selectedConfig",
+      message: i18n.t("multi-config:selectClaudeCodeConfiguration"),
+      choices: addNumbersToChoices(choices)
+    }]);
+    if (!selectedConfig) {
+      console.log(ansis.yellow(i18n.t("multi-config:cancelled")));
+      return;
+    }
+    await handleClaudeCodeDirectSwitch(selectedConfig);
+  } catch (error) {
+    if (error.name === "ExitPromptError") {
+      console.log(ansis.cyan(`
+${i18n.t("common:goodbye")}`));
+      return;
+    }
+    throw error;
+  }
+}
+async function handleCodexInteractiveSwitch() {
   const providers = await listCodexProviders();
   if (!providers || providers.length === 0) {
     console.log(ansis.yellow(i18n.t("codex:noProvidersAvailable")));
@@ -2356,7 +2489,7 @@ function customizeHelp(sections) {
       `  ${ansis.green("--workflows, -w")} <list>    ${i18n.t("cli:help.optionDescriptions.workflows")} (${i18n.t("cli:help.defaults.prefix")} all workflows)`,
       `  ${ansis.green("--output-styles, -o")} <styles> ${i18n.t("cli:help.optionDescriptions.outputStyles")} (${i18n.t("cli:help.defaults.prefix")} all custom styles)`,
       `  ${ansis.green("--default-output-style, -d")} <style> ${i18n.t("cli:help.optionDescriptions.defaultOutputStyle")} (${i18n.t("cli:help.defaults.prefix")} engineer-professional)`,
-      `  ${ansis.green("--code-type, -T")} <type>   ${i18n.t("cli:help.optionDescriptions.codeToolType")} (claude-code, codex)`,
+      `  ${ansis.green("--code-type, -T")} <type>   ${i18n.t("cli:help.optionDescriptions.codeToolType")} (claude-code, codex, cc=claude-code, cx=codex)`,
       `  ${ansis.green("--install-cometix-line, -x")} <value> ${i18n.t("cli:help.optionDescriptions.installStatuslineTool")} (${i18n.t("cli:help.defaults.prefix")} true)`
     ].join("\n")
   });
@@ -2387,6 +2520,14 @@ function customizeHelp(sections) {
       `  ${ansis.cyan("npx zcf check-updates")}     ${ansis.gray(`# ${i18n.t("cli:help.defaults.updateTools")}`)}`,
       `  ${ansis.cyan("npx zcf check")}`,
       "",
+      ansis.gray(`  # ${i18n.t("cli:help.exampleDescriptions.checkClaudeCode")}`),
+      `  ${ansis.cyan("npx zcf check --code-type claude-code")}`,
+      `  ${ansis.cyan("npx zcf check -T cc")}`,
+      "",
+      ansis.gray(`  # ${i18n.t("cli:help.exampleDescriptions.checkCodex")}`),
+      `  ${ansis.cyan("npx zcf check --code-type codex")}`,
+      `  ${ansis.cyan("npx zcf check -T cx")}`,
+      "",
       ansis.gray(`  # ${i18n.t("cli:help.exampleDescriptions.nonInteractiveModeCicd")}`),
       `  ${ansis.cyan('npx zcf i --skip-prompt --api-type api_key --api-key "sk-ant-..."')}`,
       `  ${ansis.cyan('npx zcf i --skip-prompt --all-lang zh-CN --api-type api_key --api-key "key"')}`,
@@ -2403,10 +2544,10 @@ async function setupCommands(cli) {
     await initI18n(defaultLang);
   } catch {
   }
-  cli.command("", "Show interactive menu (default)").option("--lang, -l <lang>", "ZCF display language (zh-CN, en)").option("--all-lang, -g <lang>", "Set all language parameters to this value").option("--config-lang, -c <lang>", "Configuration language (zh-CN, en)").option("--force, -f", "Force overwrite existing configuration").option("--code-type, -T <codeType>", "Select code tool type (claude-code, codex)").action(await withLanguageResolution(async () => {
+  cli.command("", "Show interactive menu (default)").option("--lang, -l <lang>", "ZCF display language (zh-CN, en)").option("--all-lang, -g <lang>", "Set all language parameters to this value").option("--config-lang, -c <lang>", "Configuration language (zh-CN, en)").option("--force, -f", "Force overwrite existing configuration").option("--code-type, -T <codeType>", "Select code tool type (claude-code, codex, cc, cx)").action(await withLanguageResolution(async () => {
     await showMainMenu();
   }));
-  cli.command("init", "Initialize Claude Code configuration").alias("i").option("--lang, -l <lang>", "ZCF display language (zh-CN, en)").option("--config-lang, -c <lang>", "Configuration language (zh-CN, en)").option("--ai-output-lang, -a <lang>", "AI output language").option("--force, -f", "Force overwrite existing configuration").option("--skip-prompt, -s", "Skip all interactive prompts (non-interactive mode)").option("--config-action, -r <action>", `Config handling (new/backup/merge/docs-only/skip), ${i18n.t("cli:help.defaults.prefix")} backup`).option("--api-type, -t <type>", "API type (auth_token/api_key/ccr_proxy/skip)").option("--api-key, -k <key>", "API key (used for both API key and auth token types)").option("--api-url, -u <url>", "Custom API URL").option("--mcp-services, -m <services>", `Comma-separated MCP services to install (context7,mcp-deepwiki,Playwright,exa), "skip" to skip all, "all" for all non-key services, ${i18n.t("cli:help.defaults.prefix")} all`).option("--workflows, -w <workflows>", `Comma-separated workflows to install (sixStepsWorkflow,featPlanUx,gitWorkflow,bmadWorkflow), "skip" to skip all, "all" for all workflows, ${i18n.t("cli:help.defaults.prefix")} all`).option("--output-styles, -o <styles>", `Comma-separated output styles (engineer-professional,nekomata-engineer,laowang-engineer,default,explanatory,learning), "skip" to skip all, "all" for all custom styles, ${i18n.t("cli:help.defaults.prefix")} all`).option("--default-output-style, -d <style>", `Default output style, ${i18n.t("cli:help.defaults.prefix")} engineer-professional`).option("--all-lang, -g <lang>", "Set all language parameters to this value").option("--code-type, -T <codeType>", "Select code tool type (claude-code, codex)").option("--install-cometix-line, -x <value>", `Install CCometixLine statusline tool (true/false), ${i18n.t("cli:help.defaults.prefix")} true`).action(await withLanguageResolution(async (options) => {
+  cli.command("init", "Initialize Claude Code configuration").alias("i").option("--lang, -l <lang>", "ZCF display language (zh-CN, en)").option("--config-lang, -c <lang>", "Configuration language (zh-CN, en)").option("--ai-output-lang, -a <lang>", "AI output language").option("--force, -f", "Force overwrite existing configuration").option("--skip-prompt, -s", "Skip all interactive prompts (non-interactive mode)").option("--config-action, -r <action>", `Config handling (new/backup/merge/docs-only/skip), ${i18n.t("cli:help.defaults.prefix")} backup`).option("--api-type, -t <type>", "API type (auth_token/api_key/ccr_proxy/skip)").option("--api-key, -k <key>", "API key (used for both API key and auth token types)").option("--api-url, -u <url>", "Custom API URL").option("--mcp-services, -m <services>", `Comma-separated MCP services to install (context7,mcp-deepwiki,Playwright,exa), "skip" to skip all, "all" for all non-key services, ${i18n.t("cli:help.defaults.prefix")} all`).option("--workflows, -w <workflows>", `Comma-separated workflows to install (sixStepsWorkflow,featPlanUx,gitWorkflow,bmadWorkflow), "skip" to skip all, "all" for all workflows, ${i18n.t("cli:help.defaults.prefix")} all`).option("--output-styles, -o <styles>", `Comma-separated output styles (engineer-professional,nekomata-engineer,laowang-engineer,default,explanatory,learning), "skip" to skip all, "all" for all custom styles, ${i18n.t("cli:help.defaults.prefix")} all`).option("--default-output-style, -d <style>", `Default output style, ${i18n.t("cli:help.defaults.prefix")} engineer-professional`).option("--all-lang, -g <lang>", "Set all language parameters to this value").option("--code-type, -T <codeType>", "Select code tool type (claude-code, codex, cc, cx)").option("--install-cometix-line, -x <value>", `Install CCometixLine statusline tool (true/false), ${i18n.t("cli:help.defaults.prefix")} true`).option("--api-configs <configs>", "API configurations as JSON string for multiple profiles").option("--api-configs-file <file>", "Path to JSON file containing API configurations").action(await withLanguageResolution(async (options) => {
     await init(options);
   }));
   cli.command("update", "Update Claude Code prompts only").alias("u").option("--lang, -l <lang>", "ZCF display language (zh-CN, en)").option("--all-lang, -g <lang>", "Set all language parameters to this value").option("--config-lang, -c <lang>", "Configuration language (zh-CN, en)").action(await withLanguageResolution(async (options) => {
@@ -2418,17 +2559,18 @@ async function setupCommands(cli) {
   cli.command("ccu [...args]", "Run Claude Code usage analysis tool").option("--lang, -l <lang>", "ZCF display language (zh-CN, en)").option("--all-lang, -g <lang>", "Set all language parameters to this value").allowUnknownOptions().action(await withLanguageResolution(async (args) => {
     await executeCcusage(args);
   }));
-  cli.command("config-switch [provider]", "Switch Codex provider or list available providers").alias("cs").option("--lang, -l <lang>", "ZCF display language (zh-CN, en)").option("--all-lang, -g <lang>", "Set all language parameters to this value").option("--list", "List available providers").action(await withLanguageResolution(async (provider, options) => {
+  cli.command("config-switch [target]", "Switch Codex provider or Claude Code configuration, or list available configurations").alias("cs").option("--code-type, -T <type>", "Code tool type (claude-code, codex, cc, cx)").option("--lang <lang>", "ZCF display language (zh-CN, en)").option("--all-lang, -g <lang>", "Set all language parameters to this value").option("--list, -l", "List available configurations").action(await withLanguageResolution(async (target, options) => {
     await configSwitchCommand({
-      provider,
+      target,
+      codeType: options.codeType,
       list: options.list
     });
   }));
   cli.command("uninstall", "Remove ZCF configurations and tools").option("--lang, -l <lang>", "ZCF display language (zh-CN, en)").option("--all-lang, -g <lang>", "Set all language parameters to this value").option("--mode, -m <mode>", "Uninstall mode (complete/custom/interactive), default: interactive").option("--items, -i <items>", "Comma-separated items for custom uninstall mode").action(await withLanguageResolution(async (options) => {
     await uninstall(options);
   }));
-  cli.command("check-updates", "Check and update Claude Code and CCR to latest versions").alias("check").option("--lang, -l <lang>", "ZCF display language (zh-CN, en)").option("--all-lang, -g <lang>", "Set all language parameters to this value").action(await withLanguageResolution(async () => {
-    await checkUpdates();
+  cli.command("check-updates", "Check and update Claude Code and CCR to latest versions").alias("check").option("--lang, -l <lang>", "ZCF display language (zh-CN, en)").option("--all-lang, -g <lang>", "Set all language parameters to this value").option("--code-type, -T <codeType>", "Select code tool type (claude-code, codex, cc, cx)").action(await withLanguageResolution(async (options) => {
+    await checkUpdates(options);
   }));
   cli.help((sections) => customizeHelp(sections));
   cli.version(version);

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

@@ -6,7 +6,6 @@
   "apiKeyDesc": "For API keys from Anthropic Console",
   "apiKeyValidation.example": "Example format: sk-abcdef123456_789xyz",
   "authTokenDesc": "For tokens obtained via OAuth or browser login",
-  "ccrProxyDesc": "Use multiple AI models via Claude Code Router",
   "configureApi": "Select API authentication method",
   "enterApiKey": "Enter API Key",
   "enterApiUrl": "Enter API URL",
@@ -24,7 +23,7 @@
   "modifyApiUrl": "Modify API URL",
   "modifyAuthType": "Modify auth type",
   "modifyPartialConfig": "Modify partial configuration",
-  "selectApiAction": "Select API processing operation",
+
   "selectApiMode": "Select API configuration mode",
   "selectCustomConfigAction": "Select custom configuration action",
   "selectModifyItems": "Select items to modify",

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

@@ -39,6 +39,8 @@
   "help.exampleDescriptions.runClaudeCodeUsageAnalysis": "Run Claude Code usage analysis",
   "help.exampleDescriptions.uninstallConfigurations": "Uninstall configurations and tools",
   "help.exampleDescriptions.checkAndUpdateTools": "Check and update tools",
+  "help.exampleDescriptions.checkClaudeCode": "Check and update Claude Code tools",
+  "help.exampleDescriptions.checkCodex": "Check and update Codex tools",
   "help.exampleDescriptions.nonInteractiveModeCicd": "Non-interactive mode (CI/CD)",
   "banner.subtitle": "One-click configuration tool for Claude Code",
   "banner.updateSubtitle": "Update configuration for Claude Code",

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

@@ -87,7 +87,6 @@
   "useOfficialLogin": "Use Official Login",
   "apiConfigSwitchPrompt": "Select API configuration to switch to",
   "agentsFileNotFound": "AGENTS.md file not found, please configure system prompt first",
-  "checkingVersion": "Checking version...",
   "currentVersion": "Current version: v{version}",
   "latestVersion": "Latest version: v{version}",
   "confirmUpdate": "Update Codex to the latest version?",