zcf 3.3.3 → 3.4.0

package/dist/chunks/simple-config.mjs

@@ -9,6 +9,7 @@ import { promisify } from 'node:util';
 import dayjs from 'dayjs';
 import { dirname, join } from 'pathe';
 import { fileURLToPath } from 'node:url';
+import toggleModule from 'inquirer-toggle';
 import ora from 'ora';
 import semver from 'semver';
 import { stringify, parse } from 'smol-toml';
@@ -17,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.3.3";
+const version = "3.4.0";
 const homepage = "https://github.com/UfoMiao/zcf";
 
 const i18n = i18next.createInstance();
@@ -589,6 +590,9 @@ function getMcpCommand(command = "npx") {
   }
   return [command];
 }
+function normalizeTomlPath(str) {
+  return str.replace(/\\+/g, "/").replace(/\/+/g, "/");
+}
 function getSystemRoot() {
   if (!isWindows())
     return null;
@@ -598,7 +602,7 @@ function getSystemRoot() {
     systemRoot = env.SYSTEMROOT;
   else if (Object.prototype.hasOwnProperty.call(env, "SystemRoot") && env.SystemRoot)
     systemRoot = env.SystemRoot;
-  return systemRoot.replace(/\\+/g, "/").replace(/\/+/g, "/");
+  return normalizeTomlPath(systemRoot);
 }
 function shouldUseSudoForGlobalInstall() {
   if (isTermux())
@@ -635,7 +639,7 @@ function wrapCommandWithSudo(command, args) {
 }
 const WRITE_CHECK_FLAG = 2;
 function normalizePath(path) {
-  return path.replace(/\\/g, "/").replace(/\/+$/, "");
+  return normalizeTomlPath(path).replace(/\/+$/, "");
 }
 function isPathInsideHome(path) {
   const home = process.env.HOME;
@@ -702,6 +706,30 @@ async function commandExists(command) {
   }
   return false;
 }
+function getRecommendedInstallMethods(codeType) {
+  const platform2 = getPlatform();
+  const wsl = isWSL();
+  if (codeType === "claude-code") {
+    if (platform2 === "macos") {
+      return ["homebrew", "curl", "npm"];
+    }
+    if (platform2 === "linux" || wsl) {
+      return ["curl", "npm"];
+    }
+    if (platform2 === "windows") {
+      return ["powershell", "npm"];
+    }
+  }
+  if (codeType === "codex") {
+    if (platform2 === "macos") {
+      return ["homebrew", "npm"];
+    }
+    if (platform2 === "linux" || wsl || platform2 === "windows") {
+      return ["npm"];
+    }
+  }
+  return ["npm"];
+}
 
 class FileSystemError extends Error {
   constructor(message, path, cause) {
@@ -1485,6 +1513,16 @@ const config$1 = {
   updateDefaultModel: updateDefaultModel
 };
 
+const togglePrompt = toggleModule?.default?.default || toggleModule?.default || toggleModule;
+async function promptBoolean(options) {
+  const { message, defaultValue = false, theme } = options;
+  return await togglePrompt({
+    message,
+    default: defaultValue,
+    ...theme ? { theme } : {}
+  });
+}
+
 const PROVIDER_PRESETS_URL = "https://pub-0dc3e1677e894f07bbea11b17a29e032.r2.dev/providers.json";
 async function fetchProviderPresets() {
   try {
@@ -1848,13 +1886,10 @@ async function setupCcrConfiguration() {
       console.log(ansis.blue(`\u2139 ${i18n.t("ccr:existingCcrConfig")}`));
       let shouldBackupAndReconfigure = false;
       try {
-        const result = await inquirer.prompt({
-          type: "confirm",
-          name: "overwrite",
+        shouldBackupAndReconfigure = await promptBoolean({
           message: i18n.t("ccr:overwriteCcrConfig"),
-          default: false
+          defaultValue: false
         });
-        shouldBackupAndReconfigure = result.overwrite;
       } catch (error) {
         if (error.name === "ExitPromptError") {
           console.log(ansis.yellow(i18n.t("common:cancelled")));
@@ -2054,11 +2089,9 @@ async function updateCcr(force = false, skipPrompt = false) {
     console.log(ansis.cyan(format(i18n.t("updater:currentVersion"), { version: currentVersion || "" })));
     console.log(ansis.cyan(format(i18n.t("updater:latestVersion"), { version: latestVersion })));
     if (!skipPrompt) {
-      const { confirm } = await inquirer.prompt({
-        type: "confirm",
-        name: "confirm",
+      const confirm = await promptBoolean({
         message: format(i18n.t("updater:confirmUpdate"), { tool: "CCR" }),
-        default: true
+        defaultValue: true
       });
       if (!confirm) {
         console.log(ansis.gray(i18n.t("updater:updateSkipped")));
@@ -2104,11 +2137,9 @@ async function updateClaudeCode(force = false, skipPrompt = false) {
     console.log(ansis.cyan(format(i18n.t("updater:currentVersion"), { version: currentVersion || "" })));
     console.log(ansis.cyan(format(i18n.t("updater:latestVersion"), { version: latestVersion })));
     if (!skipPrompt) {
-      const { confirm } = await inquirer.prompt({
-        type: "confirm",
-        name: "confirm",
+      const confirm = await promptBoolean({
         message: format(i18n.t("updater:confirmUpdate"), { tool: "Claude Code" }),
-        default: true
+        defaultValue: true
       });
       if (!confirm) {
         console.log(ansis.gray(i18n.t("updater:updateSkipped")));
@@ -2154,11 +2185,9 @@ async function updateCometixLine(force = false, skipPrompt = false) {
     console.log(ansis.cyan(format(i18n.t("updater:currentVersion"), { version: currentVersion || "" })));
     console.log(ansis.cyan(format(i18n.t("updater:latestVersion"), { version: latestVersion })));
     if (!skipPrompt) {
-      const { confirm } = await inquirer.prompt({
-        type: "confirm",
-        name: "confirm",
+      const confirm = await promptBoolean({
         message: format(i18n.t("updater:confirmUpdate"), { tool: "CCometixLine" }),
-        default: true
+        defaultValue: true
       });
       if (!confirm) {
         console.log(ansis.gray(i18n.t("updater:updateSkipped")));
@@ -2657,16 +2686,10 @@ async function resolveAiOutputLanguage(scriptLang, commandLineOption, savedConfi
     }
     const currentLanguageLabel = getAiOutputLanguageLabel(savedConfig.aiOutputLang) || savedConfig.aiOutputLang;
     console.log(ansis.blue(`${i18n.t("language:currentConfigFound")}: ${currentLanguageLabel}`));
-    const { shouldModify } = await inquirer.prompt({
-      type: "confirm",
-      name: "shouldModify",
+    const shouldModify = await promptBoolean({
       message: i18n.t("language:modifyConfigPrompt"),
-      default: false
+      defaultValue: false
     });
-    if (shouldModify === void 0) {
-      console.log(ansis.yellow(i18n.t("common:cancelled")));
-      process.exit(0);
-    }
     if (!shouldModify) {
       console.log(ansis.gray(`\u2714 ${i18n.t("language:aiOutputLangHint")}: ${currentLanguageLabel}`));
       return savedConfig.aiOutputLang;
@@ -2712,16 +2735,10 @@ async function resolveTemplateLanguage(commandLineOption, savedConfig, skipPromp
     }
     const currentLanguageLabel = LANG_LABELS[savedConfig.templateLang];
     console.log(ansis.blue(`${i18n.t("language:currentTemplateLanguageFound")}: ${currentLanguageLabel}`));
-    const { shouldModify } = await inquirer.prompt({
-      type: "confirm",
-      name: "shouldModify",
+    const shouldModify = await promptBoolean({
       message: i18n.t("language:modifyTemplateLanguagePrompt"),
-      default: false
+      defaultValue: false
     });
-    if (shouldModify === void 0) {
-      console.log(ansis.yellow(i18n.t("common:cancelled")));
-      process.exit(0);
-    }
     if (!shouldModify) {
       console.log(ansis.gray(`\u2714 ${i18n.t("language:selectConfigLang")}: ${currentLanguageLabel}`));
       return savedConfig.templateLang;
@@ -2733,16 +2750,10 @@ async function resolveTemplateLanguage(commandLineOption, savedConfig, skipPromp
       return savedConfig.preferredLang;
     }
     console.log(ansis.yellow(`${i18n.t("language:usingFallbackTemplate")}: ${LANG_LABELS[savedConfig.preferredLang]}`));
-    const { shouldModify } = await inquirer.prompt({
-      type: "confirm",
-      name: "shouldModify",
+    const shouldModify = await promptBoolean({
       message: i18n.t("language:modifyTemplateLanguagePrompt"),
-      default: false
+      defaultValue: false
     });
-    if (shouldModify === void 0) {
-      console.log(ansis.yellow(i18n.t("common:cancelled")));
-      process.exit(0);
-    }
     if (!shouldModify) {
       return savedConfig.preferredLang;
     }
@@ -2766,16 +2777,10 @@ async function resolveSystemPromptStyle(availablePrompts, commandLineOption, sav
         return currentStyleId;
       }
       console.log(ansis.blue(`${i18n.t("language:currentSystemPromptFound")}: ${currentStyle.name}`));
-      const { shouldModify } = await inquirer.prompt({
-        type: "confirm",
-        name: "shouldModify",
+      const shouldModify = await promptBoolean({
         message: i18n.t("language:modifySystemPromptPrompt"),
-        default: false
+        defaultValue: false
       });
-      if (shouldModify === void 0) {
-        console.log(ansis.yellow(i18n.t("common:cancelled")));
-        process.exit(0);
-      }
       if (!shouldModify) {
         console.log(ansis.gray(`\u2714 ${i18n.t("language:currentSystemPromptFound")}: ${currentStyle.name}`));
         return currentStyleId;
@@ -3002,24 +3007,20 @@ function getRootDir$1() {
   }
   return dirname(currentFilePath);
 }
-async function executeCodexInstallation(isUpdate) {
-  const action = isUpdate ? "update" : "install";
+async function executeCodexInstallation(isUpdate, skipMethodSelection = false) {
   if (isUpdate) {
     console.log(ansis.cyan(i18n.t("codex:updatingCli")));
-  } else {
-    console.log(ansis.cyan(i18n.t("codex:installingCli")));
-  }
-  const { command, args, usedSudo } = wrapCommandWithSudo("npm", ["install", "-g", "@openai/codex"]);
-  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 ${action} codex CLI: exit code ${result.exitCode}`);
-  }
-  if (isUpdate) {
+    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 {
-    console.log(ansis.green(i18n.t("codex:installSuccess")));
+    const { installCodex } = await Promise.resolve().then(function () { return installer; });
+    await installCodex(skipMethodSelection);
   }
 }
 function getUninstallOptions() {
@@ -3317,11 +3318,12 @@ function renderCodexConfig(data) {
     lines.push("# --- MCP servers added by ZCF ---");
     for (const service of data.mcpServices) {
       lines.push(`[mcp_servers.${service.id}]`);
-      lines.push(`command = "${service.command}"`);
+      const normalizedCommand = normalizeTomlPath(service.command);
+      lines.push(`command = "${normalizedCommand}"`);
       const argsString = service.args.length > 0 ? service.args.map((arg) => `"${arg}"`).join(", ") : "";
       lines.push(`args = [${argsString}]`);
       if (service.env && Object.keys(service.env).length > 0) {
-        const envEntries = Object.entries(service.env).map(([key, value]) => `${key} = "${value}"`).join(", ");
+        const envEntries = Object.entries(service.env).map(([key, value]) => `${key} = '${value}'`).join(", ");
         lines.push(`env = {${envEntries}}`);
       }
       if (service.startup_timeout_ms) {
@@ -3349,7 +3351,7 @@ function writeAuthFile(newEntries) {
   const merged = { ...existing, ...newEntries };
   writeJsonConfig(CODEX_AUTH_FILE, merged, { pretty: true });
 }
-async function isCodexInstalled() {
+async function isCodexInstalled$1() {
   try {
     const result = await x("npm", ["list", "-g", "--depth=0"]);
     if (result.exitCode !== 0) {
@@ -3418,19 +3420,19 @@ async function checkCodexUpdate() {
     };
   }
 }
-async function installCodexCli() {
+async function installCodexCli(skipMethodSelection = false) {
   ensureI18nInitialized();
-  if (await isCodexInstalled()) {
+  if (await isCodexInstalled$1()) {
     const { needsUpdate } = await checkCodexUpdate();
     if (needsUpdate) {
-      await executeCodexInstallation(true);
+      await executeCodexInstallation(true, skipMethodSelection);
       return;
     } else {
       console.log(ansis.yellow(i18n.t("codex:alreadyInstalled")));
       return;
     }
   }
-  await executeCodexInstallation(false);
+  await executeCodexInstallation(false, skipMethodSelection);
 }
 async function runCodexWorkflowImportWithLanguageSelection(options) {
   ensureI18nInitialized();
@@ -3874,15 +3876,13 @@ async function configureCodexApi(options) {
     if (existingProvider || sessionProvider) {
       const sourceType = existingProvider ? "existing" : "session";
       const sourceProvider = existingProvider || sessionProvider;
-      const { shouldOverwrite } = await inquirer.prompt([{
-        type: "confirm",
-        name: "shouldOverwrite",
+      const shouldOverwrite = await promptBoolean({
         message: i18n.t("codex:providerDuplicatePrompt", {
           name: sourceProvider.name,
           source: sourceType === "existing" ? i18n.t("codex:existingConfig") : i18n.t("codex:currentSession")
         }),
-        default: false
-      }]);
+        defaultValue: false
+      });
       if (!shouldOverwrite) {
         console.log(ansis.yellow(i18n.t("codex:providerDuplicateSkipped")));
         continue;
@@ -3908,12 +3908,10 @@ async function configureCodexApi(options) {
     providers.push(newProvider);
     currentSessionProviders.set(providerId, newProvider);
     authEntries[envKey] = answers.apiKey;
-    const { addAnother } = await inquirer.prompt([{
-      type: "confirm",
-      name: "addAnother",
+    const addAnother = await promptBoolean({
       message: i18n.t("codex:addProviderPrompt"),
-      default: false
-    }]);
+      defaultValue: false
+    });
     addMore = addAnother;
   }
   if (providers.length === 0) {
@@ -3947,7 +3945,7 @@ async function configureCodexApi(options) {
 }
 async function runCodexFullInit(options) {
   ensureI18nInitialized();
-  await installCodexCli();
+  await installCodexCli(options?.skipPrompt || false);
   const aiOutputLang = await runCodexWorkflowImportWithLanguageSelection(options);
   await configureCodexApi(options);
   await configureCodexMcp(options);
@@ -4012,11 +4010,9 @@ async function runCodexUpdate(force = false, skipPrompt = false) {
     console.log(ansis.cyan(format(i18n.t("codex:currentVersion"), { version: currentVersion || "" })));
     console.log(ansis.cyan(format(i18n.t("codex:latestVersion"), { version: latestVersion })));
     if (!skipPrompt) {
-      const { confirm } = await inquirer.prompt({
-        type: "confirm",
-        name: "confirm",
+      const confirm = await promptBoolean({
         message: i18n.t("codex:confirmUpdate"),
-        default: true
+        defaultValue: true
       });
       if (!confirm) {
         console.log(ansis.gray(i18n.t("codex:updateSkipped")));
@@ -4064,12 +4060,10 @@ async function runCodexUninstall() {
   }
   try {
     if (mode === "complete") {
-      const { confirm } = await inquirer.prompt([{
-        type: "confirm",
-        name: "confirm",
+      const confirm = await promptBoolean({
         message: i18n.t("codex:uninstallPrompt"),
-        default: false
-      }]);
+        defaultValue: false
+      });
       if (!confirm) {
         handleUninstallCancellation();
         return;
@@ -4246,7 +4240,7 @@ const codex = {
   getBackupMessage: getBackupMessage,
   getCodexVersion: getCodexVersion,
   installCodexCli: installCodexCli,
-  isCodexInstalled: isCodexInstalled,
+  isCodexInstalled: isCodexInstalled$1,
   listCodexProviders: listCodexProviders,
   parseCodexConfig: parseCodexConfig,
   readCodexConfig: readCodexConfig,
@@ -4528,11 +4522,9 @@ async function configureOutputStyle(preselectedStyles, preselectedDefault) {
   const availableStyles = getAvailableOutputStyles();
   if (hasLegacyPersonalityFiles() && !preselectedStyles) {
     console.log(ansis.yellow(`\u26A0\uFE0F  ${i18n.t("configuration:legacyFilesDetected")}`));
-    const { cleanupLegacy } = await inquirer.prompt({
-      type: "confirm",
-      name: "cleanupLegacy",
+    const cleanupLegacy = await promptBoolean({
       message: i18n.t("configuration:cleanupLegacyFiles"),
-      default: true
+      defaultValue: true
     });
     if (cleanupLegacy) {
       cleanupLegacyPersonalityFiles();
@@ -4827,7 +4819,9 @@ ${ansis.cyan(i18n.t("common:complete"))}`);
 }
 
 function handleExitPromptError(error) {
-  if (error instanceof Error && error.name === "ExitPromptError") {
+  const isExitError = error instanceof Error && (error.name === "ExitPromptError" || error.message?.includes("ExitPromptError") || error.message?.includes("User force closed the prompt"));
+  if (isExitError) {
+    ensureI18nInitialized();
     console.log(ansis.cyan(`
 ${i18n.t("common:goodbye")}
 `));
@@ -4847,13 +4841,17 @@ function handleGeneralError(error) {
 async function isClaudeCodeInstalled() {
   return await commandExists("claude");
 }
-async function installClaudeCode() {
+async function installClaudeCode(skipMethodSelection = false) {
   ensureI18nInitialized();
+  const codeType = "claude-code";
   const installed = await isClaudeCodeInstalled();
   if (installed) {
     console.log(ansis.green(`\u2714 ${i18n.t("installation:alreadyInstalled")}`));
+    const version = await detectInstalledVersion(codeType);
+    if (version) {
+      console.log(ansis.gray(`  ${i18n.t("installation:detectedVersion", { version })}`));
+    }
     await updateClaudeCode();
-    await setInstallMethod("npm");
     return;
   }
   if (isTermux()) {
@@ -4872,31 +4870,100 @@ async function installClaudeCode() {
     }
     console.log(ansis.gray(i18n.t("installation:wslPathInfo", { path: `${homedir()}/.claude/` })));
   }
-  console.log(i18n.t("installation:installing"));
-  try {
-    const { command, args, usedSudo } = wrapCommandWithSudo("npm", ["install", "-g", "@anthropic-ai/claude-code"]);
-    if (usedSudo) {
-      console.log(ansis.yellow(`\u2139 ${i18n.t("installation:usingSudo")}`));
-    }
-    await exec(command, args);
-    console.log(`\u2714 ${i18n.t("installation:installSuccess")}`);
-    await setInstallMethod("npm");
-    if (isTermux()) {
-      console.log(ansis.gray(`
+  if (skipMethodSelection) {
+    console.log(i18n.t("installation:installing"));
+    try {
+      const { command, args, usedSudo } = wrapCommandWithSudo("npm", ["install", "-g", "@anthropic-ai/claude-code"]);
+      if (usedSudo) {
+        console.log(ansis.yellow(`\u2139 ${i18n.t("installation:usingSudo")}`));
+      }
+      await exec(command, args);
+      console.log(`\u2714 ${i18n.t("installation:installSuccess")}`);
+      await setInstallMethod("npm");
+      if (isTermux()) {
+        console.log(ansis.gray(`
 Claude Code installed to: ${getTermuxPrefix()}/bin/claude`));
-    }
-    if (isWSL()) {
-      console.log(ansis.gray(`
+      }
+      if (isWSL()) {
+        console.log(ansis.gray(`
 ${i18n.t("installation:wslInstallSuccess")}`));
-    }
-  } catch (error) {
-    console.error(`\u2716 ${i18n.t("installation:installFailed")}`);
-    if (isTermux()) {
-      console.error(ansis.yellow(`
+      }
+    } catch (error) {
+      console.error(`\u2716 ${i18n.t("installation:installFailed")}`);
+      if (isTermux()) {
+        console.error(ansis.yellow(`
 ${i18n.t("installation:termuxInstallHint")}
 `));
+      }
+      throw error;
+    }
+    return;
+  }
+  const method = await selectInstallMethod(codeType);
+  if (!method) {
+    console.log(ansis.yellow(i18n.t("common:cancelled")));
+    return;
+  }
+  const success = await executeInstallMethod(method, codeType);
+  if (!success) {
+    const retrySuccess = await handleInstallFailure(codeType, [method]);
+    if (!retrySuccess) {
+      console.error(ansis.red(`\u2716 ${i18n.t("installation:installFailed")}`));
+      throw new Error(i18n.t("installation:installFailed"));
+    }
+  }
+  if (isTermux()) {
+    console.log(ansis.gray(`
+Claude Code installed to: ${getTermuxPrefix()}/bin/claude`));
+  }
+  if (isWSL()) {
+    console.log(ansis.gray(`
+${i18n.t("installation:wslInstallSuccess")}`));
+  }
+}
+async function isCodexInstalled() {
+  return await commandExists("codex");
+}
+async function installCodex(skipMethodSelection = false) {
+  ensureI18nInitialized();
+  const codeType = "codex";
+  const codeTypeName = i18n.t("common:codex");
+  const installed = await isCodexInstalled();
+  if (installed) {
+    console.log(ansis.green(`\u2714 ${codeTypeName} ${i18n.t("installation:alreadyInstalled")}`));
+    const version = await detectInstalledVersion(codeType);
+    if (version) {
+      console.log(ansis.gray(`  ${i18n.t("installation:detectedVersion", { version })}`));
+    }
+    return;
+  }
+  if (skipMethodSelection) {
+    console.log(i18n.t("installation:installingWith", { method: "npm", codeType: codeTypeName }));
+    try {
+      const { command, args, usedSudo } = wrapCommandWithSudo("npm", ["install", "-g", "@openai/codex"]);
+      if (usedSudo) {
+        console.log(ansis.yellow(`\u2139 ${i18n.t("installation:usingSudo")}`));
+      }
+      await exec(command, args);
+      console.log(ansis.green(`\u2714 ${codeTypeName} ${i18n.t("installation:installSuccess")}`));
+    } catch (error) {
+      console.error(ansis.red(`\u2716 ${codeTypeName} ${i18n.t("installation:installFailed")}`));
+      throw error;
+    }
+    return;
+  }
+  const method = await selectInstallMethod(codeType);
+  if (!method) {
+    console.log(ansis.yellow(i18n.t("common:cancelled")));
+    return;
+  }
+  const success = await executeInstallMethod(method, codeType);
+  if (!success) {
+    const retrySuccess = await handleInstallFailure(codeType, [method]);
+    if (!retrySuccess) {
+      console.error(ansis.red(`\u2716 ${codeTypeName} ${i18n.t("installation:installFailed")}`));
+      throw new Error(i18n.t("installation:installFailed"));
     }
-    throw error;
   }
 }
 async function isLocalClaudeCodeInstalled() {
@@ -4930,28 +4997,297 @@ async function removeLocalClaudeCode() {
     throw new Error(`${i18n.t("installation:failedToRemoveLocalInstallation")}: ${error}`);
   }
 }
-async function setInstallMethod(method = "npm") {
+async function getInstallMethodFromConfig(codeType) {
   try {
-    const { readMcpConfig, writeMcpConfig } = await Promise.resolve().then(function () { return claudeConfig; });
-    let config = readMcpConfig();
-    if (!config) {
-      config = { mcpServers: {} };
+    if (codeType === "claude-code") {
+      const { readMcpConfig } = await Promise.resolve().then(function () { return claudeConfig; });
+      const config = readMcpConfig();
+      return config?.installMethod || null;
     }
-    config.installMethod = method;
-    writeMcpConfig(config);
+  } catch {
+  }
+  return null;
+}
+async function uninstallCodeTool(codeType) {
+  ensureI18nInitialized();
+  const codeTypeName = codeType === "claude-code" ? i18n.t("common:claudeCode") : i18n.t("common:codex");
+  let method = await getInstallMethodFromConfig(codeType);
+  if (!method) {
+    if (codeType === "claude-code") {
+      try {
+        const result = await exec("brew", ["list", "--cask", "claude-code"]);
+        if (result.exitCode === 0) {
+          method = "homebrew";
+        }
+      } catch {
+      }
+    } else if (codeType === "codex") {
+      try {
+        const result = await exec("brew", ["list", "codex"]);
+        if (result.exitCode === 0) {
+          method = "homebrew";
+        }
+      } catch {
+      }
+    }
+    if (!method) {
+      method = "npm";
+    }
+  }
+  if (method === "native") {
+    const platform = getPlatform();
+    if (platform === "macos" || platform === "linux") {
+      try {
+        const testResult = codeType === "claude-code" ? await exec("brew", ["list", "--cask", "claude-code"]) : await exec("brew", ["list", "codex"]);
+        if (testResult.exitCode === 0) {
+          method = "homebrew";
+        }
+      } catch {
+        method = "manual";
+      }
+    } else {
+      method = "manual";
+    }
+  }
+  const spinner = ora(i18n.t("installation:uninstallingWith", { method, codeType: codeTypeName })).start();
+  try {
+    switch (method) {
+      case "npm": {
+        const packageName = codeType === "claude-code" ? "@anthropic-ai/claude-code" : "@openai/codex";
+        const { command, args, usedSudo } = wrapCommandWithSudo("npm", ["uninstall", "-g", packageName]);
+        if (usedSudo) {
+          spinner.info(i18n.t("installation:usingSudo"));
+          spinner.start();
+        }
+        await exec(command, args);
+        break;
+      }
+      case "homebrew": {
+        if (codeType === "claude-code") {
+          await exec("brew", ["uninstall", "--cask", "claude-code"]);
+        } else {
+          await exec("brew", ["uninstall", "codex"]);
+        }
+        break;
+      }
+      case "manual":
+      default: {
+        spinner.warn(i18n.t("installation:manualUninstallRequired", { codeType: codeTypeName }));
+        const command = codeType === "claude-code" ? "claude" : "codex";
+        try {
+          const whichCmd = getPlatform() === "windows" ? "where" : "which";
+          const result = await exec(whichCmd, [command]);
+          if (result.stdout) {
+            const binaryPath = result.stdout.trim().split("\n")[0];
+            spinner.info(i18n.t("installation:binaryLocation", { path: binaryPath }));
+            const platform = getPlatform();
+            if (platform === "windows") {
+              const quotedBinaryPath = `"${binaryPath}"`;
+              await exec("cmd", ["/c", "del", "/f", "/q", quotedBinaryPath]);
+            } else {
+              const { command: rmCmd, args: rmArgs } = wrapCommandWithSudo("rm", ["-f", binaryPath]);
+              if (rmCmd === "sudo") {
+                spinner.info(i18n.t("installation:usingSudo"));
+                spinner.start();
+              }
+              await exec(rmCmd, rmArgs);
+            }
+          }
+        } catch {
+          spinner.fail(i18n.t("installation:failedToLocateBinary", { command }));
+          return false;
+        }
+        break;
+      }
+    }
+    spinner.succeed(i18n.t("installation:uninstallSuccess", { method, codeType: codeTypeName }));
+    return true;
+  } catch (error) {
+    spinner.fail(i18n.t("installation:uninstallFailed", { method, codeType: codeTypeName }));
+    if (error instanceof Error) {
+      console.error(ansis.gray(error.message));
+    }
+    return false;
+  }
+}
+async function setInstallMethod(method = "npm", codeType = "claude-code") {
+  try {
+    if (codeType === "claude-code") {
+      const { readMcpConfig, writeMcpConfig } = await Promise.resolve().then(function () { return claudeConfig; });
+      let config = readMcpConfig();
+      if (!config) {
+        config = { mcpServers: {} };
+      }
+      config.installMethod = method === "npm" ? "npm" : "native";
+      writeMcpConfig(config);
+    }
+  } catch (error) {
+    console.error("Failed to set installMethod:", error);
+  }
+}
+async function detectInstalledVersion(codeType) {
+  try {
+    const command = codeType === "claude-code" ? "claude" : "codex";
+    const result = await exec(command, ["--version"]);
+    if (result.exitCode === 0 && result.stdout) {
+      const versionMatch = result.stdout.match(/(\d+\.\d+\.\d+)/);
+      return versionMatch ? versionMatch[1] : result.stdout.trim();
+    }
+  } catch {
+  }
+  return null;
+}
+function getInstallMethodOptions(codeType, recommendedMethods) {
+  const allMethods = ["npm", "homebrew", "curl", "powershell", "cmd"];
+  const platform = getPlatform();
+  const availableMethods = allMethods.filter((method) => {
+    if (codeType === "codex" && !["npm", "homebrew"].includes(method)) {
+      return false;
+    }
+    if (method === "homebrew")
+      return platform === "macos" || platform === "linux";
+    if (method === "curl")
+      return platform !== "windows" || isWSL();
+    if (method === "powershell" || method === "cmd")
+      return platform === "windows";
+    return true;
+  });
+  const topRecommended = recommendedMethods.length > 0 ? recommendedMethods[0] : null;
+  return availableMethods.map((method) => {
+    const isTopRecommended = method === topRecommended;
+    const title = isTopRecommended ? `${i18n.t(`installation:installMethod${method.charAt(0).toUpperCase() + method.slice(1)}`)} ${ansis.green(`[${i18n.t("installation:recommendedMethod")}]`)}` : i18n.t(`installation:installMethod${method.charAt(0).toUpperCase() + method.slice(1)}`);
+    return {
+      title,
+      value: method
+    };
+  });
+}
+async function selectInstallMethod(codeType, excludeMethods = []) {
+  ensureI18nInitialized();
+  const codeTypeName = codeType === "claude-code" ? i18n.t("common:claudeCode") : i18n.t("common:codex");
+  const recommendedMethods = getRecommendedInstallMethods(codeType);
+  const methodOptions = getInstallMethodOptions(codeType, recommendedMethods).filter((option) => !excludeMethods.includes(option.value));
+  if (methodOptions.length === 0) {
+    console.log(ansis.yellow(i18n.t("installation:noMoreMethods")));
+    return null;
+  }
+  const response = await inquirer.prompt({
+    type: "list",
+    name: "method",
+    message: i18n.t("installation:selectInstallMethod", { codeType: codeTypeName }),
+    choices: methodOptions.map((opt) => ({
+      name: opt.title,
+      value: opt.value
+    }))
+  });
+  return response.method || null;
+}
+async function executeInstallMethod(method, codeType) {
+  ensureI18nInitialized();
+  const codeTypeName = codeType === "claude-code" ? i18n.t("common:claudeCode") : i18n.t("common:codex");
+  const spinner = ora(i18n.t("installation:installingWith", { method, codeType: codeTypeName })).start();
+  try {
+    switch (method) {
+      case "npm": {
+        const packageName = codeType === "claude-code" ? "@anthropic-ai/claude-code" : "@openai/codex";
+        const { command, args, usedSudo } = wrapCommandWithSudo("npm", ["install", "-g", packageName]);
+        if (usedSudo) {
+          spinner.info(i18n.t("installation:usingSudo"));
+          spinner.start();
+        }
+        await exec(command, args);
+        await setInstallMethod("npm", codeType);
+        break;
+      }
+      case "homebrew": {
+        if (codeType === "claude-code") {
+          await exec("brew", ["install", "--cask", "claude-code"]);
+        } else {
+          await exec("brew", ["install", "codex"]);
+        }
+        await setInstallMethod("homebrew", codeType);
+        break;
+      }
+      case "curl": {
+        if (codeType === "claude-code") {
+          await exec("bash", ["-c", "curl -fsSL https://claude.ai/install.sh | bash"]);
+        } else {
+          spinner.stop();
+          return await executeInstallMethod("npm", codeType);
+        }
+        await setInstallMethod("curl", codeType);
+        break;
+      }
+      case "powershell": {
+        if (codeType === "claude-code") {
+          await exec("powershell", ["-Command", "irm https://claude.ai/install.ps1 | iex"]);
+        } else {
+          spinner.stop();
+          return await executeInstallMethod("npm", codeType);
+        }
+        await setInstallMethod("powershell", codeType);
+        break;
+      }
+      case "cmd": {
+        if (codeType === "claude-code") {
+          await exec("cmd", ["/c", "curl -fsSL https://claude.ai/install.cmd -o install.cmd && install.cmd && del install.cmd"]);
+        } else {
+          spinner.stop();
+          return await executeInstallMethod("npm", codeType);
+        }
+        await setInstallMethod("cmd", codeType);
+        break;
+      }
+      default:
+        throw new Error(`Unsupported install method: ${method}`);
+    }
+    spinner.succeed(i18n.t("installation:installMethodSuccess", { method }));
+    return true;
   } catch (error) {
-    console.error("Failed to set installMethod in ~/.claude.json:", error);
+    spinner.fail(i18n.t("installation:installMethodFailed", { method }));
+    if (error instanceof Error) {
+      console.error(ansis.gray(error.message));
+    }
+    return false;
   }
 }
+async function handleInstallFailure(codeType, failedMethods) {
+  ensureI18nInitialized();
+  const response = await inquirer.prompt({
+    type: "confirm",
+    name: "retry",
+    message: i18n.t("installation:tryAnotherMethod"),
+    default: true
+  });
+  if (!response.retry) {
+    return false;
+  }
+  const newMethod = await selectInstallMethod(codeType, failedMethods);
+  if (!newMethod) {
+    return false;
+  }
+  const success = await executeInstallMethod(newMethod, codeType);
+  if (success) {
+    return true;
+  }
+  return await handleInstallFailure(codeType, [...failedMethods, newMethod]);
+}
 
 const installer = {
   __proto__: null,
+  detectInstalledVersion: detectInstalledVersion,
+  executeInstallMethod: executeInstallMethod,
   getInstallationStatus: getInstallationStatus,
+  handleInstallFailure: handleInstallFailure,
   installClaudeCode: installClaudeCode,
+  installCodex: installCodex,
   isClaudeCodeInstalled: isClaudeCodeInstalled,
+  isCodexInstalled: isCodexInstalled,
   isLocalClaudeCodeInstalled: isLocalClaudeCodeInstalled,
   removeLocalClaudeCode: removeLocalClaudeCode,
-  setInstallMethod: setInstallMethod
+  selectInstallMethod: selectInstallMethod,
+  setInstallMethod: setInstallMethod,
+  uninstallCodeTool: uninstallCodeTool
 };
 
 async function chooseInstallationMethod() {
@@ -5521,7 +5857,7 @@ async function init(options = {}) {
         if (installationStatus.hasLocal) {
           if (!installationStatus.hasGlobal) {
             console.log(ansis.blue(`${i18n.t("installation:installingGlobalClaudeCode")}...`));
-            await installClaudeCode();
+            await installClaudeCode(true);
             console.log(ansis.green(`\u2714 ${i18n.t("installation:globalInstallationCompleted")}`));
           }
           if (installationStatus.hasGlobal && installationStatus.hasLocal) {
@@ -5535,20 +5871,14 @@ async function init(options = {}) {
       }
     } else {
       if (options.skipPrompt) {
-        await installClaudeCode();
+        await installClaudeCode(true);
       } else {
-        const { shouldInstall } = await inquirer.prompt({
-          type: "confirm",
-          name: "shouldInstall",
+        const shouldInstall = await promptBoolean({
           message: i18n.t("installation:installPrompt"),
-          default: true
+          defaultValue: true
         });
-        if (shouldInstall === void 0) {
-          console.log(ansis.yellow(i18n.t("common:cancelled")));
-          process.exit(0);
-        }
         if (shouldInstall) {
-          await installClaudeCode();
+          await installClaudeCode(false);
         } else {
           console.log(ansis.yellow(i18n.t("common:skip")));
         }
@@ -5753,16 +6083,10 @@ async function init(options = {}) {
       if (options.skipPrompt) {
         shouldConfigureMcp = options.mcpServices !== false;
       } else {
-        const { shouldConfigureMcp: userChoice } = await inquirer.prompt({
-          type: "confirm",
-          name: "shouldConfigureMcp",
+        const userChoice = await promptBoolean({
           message: i18n.t("mcp:configureMcp"),
-          default: true
+          defaultValue: true
         });
-        if (userChoice === void 0) {
-          console.log(ansis.yellow(i18n.t("common:cancelled")));
-          process.exit(0);
-        }
         shouldConfigureMcp = userChoice;
       }
       if (shouldConfigureMcp) {
@@ -5838,16 +6162,10 @@ async function init(options = {}) {
       if (options.skipPrompt) {
         shouldInstallCometix = options.installCometixLine !== false;
       } else {
-        const { shouldInstallCometix: userChoice } = await inquirer.prompt({
-          type: "confirm",
-          name: "shouldInstallCometix",
+        const userChoice = await promptBoolean({
           message: i18n.t("cometix:installCometixPrompt"),
-          default: true
+          defaultValue: true
         });
-        if (userChoice === void 0) {
-          console.log(ansis.yellow(i18n.t("common:cancelled")));
-          process.exit(0);
-        }
         shouldInstallCometix = userChoice;
       }
       if (shouldInstallCometix) {
@@ -6134,4 +6452,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, switchToOfficialLogin as a$, getExistingApiConfig as a0, applyAiLanguageDirective as a1, switchToOfficialLogin$1 as a2, promptApiConfigurationAction as a3, isClaudeCodeInstalled as a4, installClaudeCode as a5, isLocalClaudeCodeInstalled as a6, getInstallationStatus as a7, removeLocalClaudeCode as a8, setInstallMethod as a9, modifyApiConfigPartially as aA, formatApiKeyDisplay as aB, readCcrConfig as aC, configureCcrFeature as aD, handleExitPromptError as aE, handleGeneralError as aF, COMETIX_COMMAND_NAME as aG, COMETIX_COMMANDS as aH, installCometixLine as aI, checkAndUpdateTools as aJ, runCodexUpdate as aK, resolveCodeType as aL, writeJsonConfig as aM, displayBanner as aN, version as aO, resolveAiOutputLanguage as aP, updatePromptOnly as aQ, selectAndInstallWorkflows as aR, checkClaudeCodeVersionAndPrompt as aS, displayBannerWithInfo as aT, runCodexUninstall as aU, configureCodexMcp as aV, configureCodexApi as aW, runCodexWorkflowImportWithLanguageSelection as aX, runCodexFullInit as aY, switchCodexProvider as aZ, listCodexProviders as a_, ensureI18nInitialized as aa, i18n as ab, addNumbersToChoices as ac, validateApiKey as ad, ensureDir as ae, readDefaultTomlConfig as af, createDefaultTomlConfig as ag, exists as ah, readJsonConfig as ai, writeTomlConfig as aj, copyFile as ak, detectConfigManagementMode as al, readCodexConfig as am, backupCodexComplete as an, writeCodexConfig as ao, writeAuthFile as ap, updateZcfConfig as aq, changeLanguage as ar, readZcfConfig as as, configureOutputStyle as at, isWindows as au, selectMcpServices as av, getMcpServices as aw, isCcrInstalled as ax, installCcr as ay, setupCcrConfiguration as az, importRecommendedEnv as b, switchToProvider as b0, readZcfConfigAsync as b1, initI18n as b2, selectScriptLanguage as b3, index as b4, fsOperations as b5, jsonConfig as b6, claudeConfig as b7, config$1 as b8, config as b9, prompts as ba, codex as bb, 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, displayBannerWithInfo 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, readZcfConfig as aA, configureOutputStyle as aB, isWindows as aC, selectMcpServices as aD, getMcpServices as aE, isCcrInstalled as aF, installCcr as aG, setupCcrConfiguration as aH, modifyApiConfigPartially as aI, formatApiKeyDisplay as aJ, readCcrConfig as aK, configureCcrFeature as aL, handleExitPromptError as aM, handleGeneralError as aN, COMETIX_COMMAND_NAME as aO, COMETIX_COMMANDS as aP, installCometixLine as aQ, checkAndUpdateTools as aR, runCodexUpdate as aS, resolveCodeType as aT, writeJsonConfig as aU, displayBanner as aV, version as aW, resolveAiOutputLanguage as aX, updatePromptOnly as aY, selectAndInstallWorkflows as aZ, checkClaudeCodeVersionAndPrompt as a_, removeLocalClaudeCode as aa, uninstallCodeTool as ab, setInstallMethod as ac, detectInstalledVersion as ad, selectInstallMethod as ae, executeInstallMethod as af, handleInstallFailure as ag, ensureI18nInitialized as ah, i18n as ai, addNumbersToChoices as aj, validateApiKey as ak, promptBoolean as al, ensureDir as am, readDefaultTomlConfig as an, createDefaultTomlConfig as ao, exists as ap, readJsonConfig as aq, writeTomlConfig as ar, copyFile as as, detectConfigManagementMode as at, readCodexConfig as au, backupCodexComplete as av, writeCodexConfig as aw, writeAuthFile as ax, updateZcfConfig as ay, changeLanguage as az, importRecommendedEnv as b, runCodexUninstall as b0, configureCodexMcp as b1, configureCodexApi as b2, runCodexWorkflowImportWithLanguageSelection as b3, runCodexFullInit as b4, switchCodexProvider as b5, listCodexProviders as b6, switchToOfficialLogin as b7, switchToProvider as b8, readZcfConfigAsync as b9, initI18n as ba, selectScriptLanguage as bb, index as bc, fsOperations as bd, jsonConfig as be, claudeConfig as bf, config$1 as bg, config as bh, prompts as bi, codex as bj, installer as bk, 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 };