zcf 2.12.4 → 2.12.5

package/dist/cli.mjs

@@ -1,31 +1,32 @@
 #!/usr/bin/env node
 import cac from 'cac';
 import ansis from 'ansis';
-import { I as I18N, J as readCcrConfig, K as isCcrInstalled, M as installCcr, N as configureCcrFeature, O as handleExitPromptError, P as handleGeneralError, Q as getTranslation, Z as ZCF_CONFIG_FILE, h as SUPPORTED_LANGS, R as addNumbersToChoices, j as LANG_LABELS, T as updateZcfConfig, o as openSettingsJson, d as importRecommendedPermissions, b as importRecommendedEnv, U as readZcfConfig, v as applyAiLanguageDirective, V as configureOutputStyle, s as getExistingModelConfig, u as updateDefaultModel, W as isWindows, z as readMcpConfig, G as fixWindowsMcpConfig, B as writeMcpConfig, X as selectMcpServices, D as backupMcpConfig, Y as getMcpServices, F as buildMcpServerConfig, E as mergeMcpServers, t as getExistingApiConfig, _ as formatApiKeyDisplay, H as addCompletedOnboarding, $ as modifyApiConfigPartially, a0 as setupCcrConfiguration, a1 as validateApiKey, p as configureApi, a2 as readZcfConfigAsync, a3 as COMETIX_COMMAND_NAME, a4 as COMETIX_COMMANDS, a5 as installCometixLine, a6 as selectScriptLanguage, a7 as checkAndUpdateTools, a8 as displayBanner, a9 as resolveAiOutputLanguage, aa as updatePromptOnly, ab as selectAndInstallWorkflows, ac as checkClaudeCodeVersionAndPrompt, ad as version, ae as displayBannerWithInfo, i as init } from './chunks/simple-config.mjs';
+import { J as ensureI18nInitialized, K as i18n, M as readCcrConfig, N as isCcrInstalled, O as installCcr, P as configureCcrFeature, Q as handleExitPromptError, R as handleGeneralError, Z as ZCF_CONFIG_FILE, h as SUPPORTED_LANGS, T as addNumbersToChoices, j as LANG_LABELS, U as updateZcfConfig, V as changeLanguage, o as openSettingsJson, d as importRecommendedPermissions, b as importRecommendedEnv, W as readZcfConfig, w as applyAiLanguageDirective, X as configureOutputStyle, t as getExistingModelConfig, u as updateDefaultModel, Y as isWindows, B as readMcpConfig, H as fixWindowsMcpConfig, D as writeMcpConfig, _ as selectMcpServices, E as backupMcpConfig, $ as getMcpServices, G as buildMcpServerConfig, F as mergeMcpServers, v as getExistingApiConfig, a0 as formatApiKeyDisplay, I as addCompletedOnboarding, a1 as modifyApiConfigPartially, a2 as setupCcrConfiguration, a3 as validateApiKey, q as configureApi, a4 as COMETIX_COMMAND_NAME, a5 as COMETIX_COMMANDS, a6 as installCometixLine, a7 as checkAndUpdateTools, a8 as displayBanner, a9 as resolveAiOutputLanguage, aa as updatePromptOnly, ab as selectAndInstallWorkflows, ac as checkClaudeCodeVersionAndPrompt, ad as version, ae as displayBannerWithInfo, i as init, af as readZcfConfigAsync, ag as initI18n, ah as selectScriptLanguage } from './chunks/simple-config.mjs';
 import { existsSync, unlinkSync } from 'node:fs';
 import { homedir } from 'node:os';
-import { join } from 'node:path';
 import inquirer from 'inquirer';
+import { join } from 'pathe';
 import { exec, spawn } from 'node:child_process';
 import { promisify } from 'node:util';
 import process from 'node:process';
 import { x } from 'tinyexec';
-import 'dayjs';
 import 'node:url';
-import 'pathe';
+import 'i18next';
+import 'i18next-fs-backend';
+import 'dayjs';
 import 'ora';
 import 'semver';
 import 'node:fs/promises';
 
 const execAsync$1 = promisify(exec);
-async function runCcrUi(scriptLang, apiKey) {
-  const i18n = I18N[scriptLang];
+async function runCcrUi(apiKey) {
+  ensureI18nInitialized();
   console.log(ansis.cyan(`
-\u{1F5A5}\uFE0F  ${i18n.ccr.startingCcrUi}`));
+\u{1F5A5}\uFE0F  ${i18n.t("ccr:startingCcrUi")}`));
   if (apiKey) {
     console.log(ansis.bold.green(`
-\u{1F511} ${i18n.ccr.ccrUiApiKey || "CCR UI API Key"}: ${apiKey}`));
-    console.log(ansis.gray(`   ${i18n.ccr.ccrUiApiKeyHint || "Use this API key to login to CCR UI"}
+\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 {
@@ -34,82 +35,82 @@ async function runCcrUi(scriptLang, apiKey) {
       console.log(stdout);
     if (stderr)
       console.error(ansis.yellow(stderr));
-    console.log(ansis.green(`\u2714 ${i18n.ccr.ccrUiStarted}`));
+    console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrUiStarted")}`));
   } catch (error) {
-    console.error(ansis.red(`\u2716 ${i18n.ccr.ccrCommandFailed}: ${error instanceof Error ? error.message : String(error)}`));
+    console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrCommandFailed")}: ${error instanceof Error ? error.message : String(error)}`));
     throw error;
   }
 }
-async function runCcrStatus(scriptLang) {
-  const i18n = I18N[scriptLang];
+async function runCcrStatus() {
+  ensureI18nInitialized();
   console.log(ansis.cyan(`
-\u{1F4CA} ${i18n.ccr.checkingCcrStatus}`));
+\u{1F4CA} ${i18n.t("ccr:checkingCcrStatus")}`));
   try {
     const { stdout, stderr } = await execAsync$1("ccr status");
     if (stdout) {
       console.log(`
-${ansis.bold(i18n.ccr.ccrStatusTitle)}`);
+${ansis.bold(i18n.t("ccr:ccrStatusTitle"))}`);
       console.log(stdout);
     }
     if (stderr)
       console.error(ansis.yellow(stderr));
   } catch (error) {
-    console.error(ansis.red(`\u2716 ${i18n.ccr.ccrCommandFailed}: ${error instanceof Error ? error.message : String(error)}`));
+    console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrCommandFailed")}: ${error instanceof Error ? error.message : String(error)}`));
     throw error;
   }
 }
-async function runCcrRestart(scriptLang) {
-  const i18n = I18N[scriptLang];
+async function runCcrRestart() {
+  ensureI18nInitialized();
   console.log(ansis.cyan(`
-\u{1F504} ${i18n.ccr.restartingCcr}`));
+\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.ccr.ccrRestarted}`));
+    console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrRestarted")}`));
   } catch (error) {
-    console.error(ansis.red(`\u2716 ${i18n.ccr.ccrCommandFailed}: ${error instanceof Error ? error.message : String(error)}`));
+    console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrCommandFailed")}: ${error instanceof Error ? error.message : String(error)}`));
     throw error;
   }
 }
-async function runCcrStart(scriptLang) {
-  const i18n = I18N[scriptLang];
+async function runCcrStart() {
+  ensureI18nInitialized();
   console.log(ansis.cyan(`
-\u25B6\uFE0F  ${i18n.ccr.startingCcr}`));
+\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.ccr.ccrStarted}`));
+    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.ccr.ccrStarted}`));
+      console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrStarted")}`));
     } else {
-      console.error(ansis.red(`\u2716 ${i18n.ccr.ccrCommandFailed}: ${error instanceof Error ? error.message : String(error)}`));
+      console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrCommandFailed")}: ${error instanceof Error ? error.message : String(error)}`));
       throw error;
     }
   }
 }
-async function runCcrStop(scriptLang) {
-  const i18n = I18N[scriptLang];
+async function runCcrStop() {
+  ensureI18nInitialized();
   console.log(ansis.cyan(`
-\u23F9\uFE0F  ${i18n.ccr.stoppingCcr}`));
+\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.ccr.ccrStopped}`));
+    console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrStopped")}`));
   } catch (error) {
-    console.error(ansis.red(`\u2716 ${i18n.ccr.ccrCommandFailed}: ${error instanceof Error ? error.message : String(error)}`));
+    console.error(ansis.red(`\u2716 ${i18n.t("ccr:ccrCommandFailed")}: ${error instanceof Error ? error.message : String(error)}`));
     throw error;
   }
 }
@@ -120,95 +121,95 @@ function isCcrConfigured() {
     return false;
   }
   const config = readCcrConfig();
-  return config !== null && config.Providers && config.Providers.length > 0;
+  return config !== null;
 }
-async function showCcrMenu(scriptLang) {
+async function showCcrMenu() {
   try {
-    const i18n = I18N[scriptLang];
+    ensureI18nInitialized();
     console.log(`
 ${ansis.cyan("\u2550".repeat(50))}`);
-    console.log(ansis.bold.cyan(`  ${i18n.ccr.ccrMenuTitle}`));
+    console.log(ansis.bold.cyan(`  ${i18n.t("ccr:ccrMenuTitle")}`));
     console.log(`${ansis.cyan("\u2550".repeat(50))}
 `);
-    console.log(`  ${ansis.cyan("1.")} ${i18n.ccr.ccrMenuOptions.initCcr} ${ansis.gray(`- ${i18n.ccr.ccrMenuDescriptions.initCcr}`)}`);
-    console.log(`  ${ansis.cyan("2.")} ${i18n.ccr.ccrMenuOptions.startUi} ${ansis.gray(`- ${i18n.ccr.ccrMenuDescriptions.startUi}`)}`);
-    console.log(`  ${ansis.cyan("3.")} ${i18n.ccr.ccrMenuOptions.checkStatus} ${ansis.gray(`- ${i18n.ccr.ccrMenuDescriptions.checkStatus}`)}`);
-    console.log(`  ${ansis.cyan("4.")} ${i18n.ccr.ccrMenuOptions.restart} ${ansis.gray(`- ${i18n.ccr.ccrMenuDescriptions.restart}`)}`);
-    console.log(`  ${ansis.cyan("5.")} ${i18n.ccr.ccrMenuOptions.start} ${ansis.gray(`- ${i18n.ccr.ccrMenuDescriptions.start}`)}`);
-    console.log(`  ${ansis.cyan("6.")} ${i18n.ccr.ccrMenuOptions.stop} ${ansis.gray(`- ${i18n.ccr.ccrMenuDescriptions.stop}`)}`);
-    console.log(`  ${ansis.yellow("0.")} ${i18n.ccr.ccrMenuOptions.back}`);
+    console.log(`  ${ansis.cyan("1.")} ${i18n.t("ccr:ccrMenuOptions.initCcr")} ${ansis.gray(`- ${i18n.t("ccr:ccrMenuDescriptions.initCcr")}`)}`);
+    console.log(`  ${ansis.cyan("2.")} ${i18n.t("ccr:ccrMenuOptions.startUi")} ${ansis.gray(`- ${i18n.t("ccr:ccrMenuDescriptions.startUi")}`)}`);
+    console.log(`  ${ansis.cyan("3.")} ${i18n.t("ccr:ccrMenuOptions.checkStatus")} ${ansis.gray(`- ${i18n.t("ccr:ccrMenuDescriptions.checkStatus")}`)}`);
+    console.log(`  ${ansis.cyan("4.")} ${i18n.t("ccr:ccrMenuOptions.restart")} ${ansis.gray(`- ${i18n.t("ccr:ccrMenuDescriptions.restart")}`)}`);
+    console.log(`  ${ansis.cyan("5.")} ${i18n.t("ccr:ccrMenuOptions.start")} ${ansis.gray(`- ${i18n.t("ccr:ccrMenuDescriptions.start")}`)}`);
+    console.log(`  ${ansis.cyan("6.")} ${i18n.t("ccr:ccrMenuOptions.stop")} ${ansis.gray(`- ${i18n.t("ccr:ccrMenuDescriptions.stop")}`)}`);
+    console.log(`  ${ansis.yellow("0.")} ${i18n.t("ccr:ccrMenuOptions.back")}`);
     console.log("");
     const { choice } = await inquirer.prompt({
       type: "input",
       name: "choice",
-      message: i18n.common.enterChoice,
+      message: i18n.t("common:enterChoice"),
       validate: (value) => {
         const valid = ["1", "2", "3", "4", "5", "6", "0"];
-        return valid.includes(value) || i18n.common.invalidChoice;
+        return valid.includes(value) || i18n.t("common:invalidChoice");
       }
     });
     switch (choice) {
       case "1": {
         const ccrStatus = await isCcrInstalled();
         if (!ccrStatus.hasCorrectPackage) {
-          await installCcr(scriptLang);
+          await installCcr();
         } else {
-          console.log(ansis.green(`\u2714 ${i18n.ccr.ccrAlreadyInstalled}`));
+          console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrAlreadyInstalled")}`));
         }
-        await configureCcrFeature(scriptLang);
+        await configureCcrFeature();
         console.log(ansis.green(`
-\u2714 ${i18n.ccr.ccrSetupComplete}`));
+\u2714 ${i18n.t("ccr:ccrSetupComplete")}`));
         break;
       }
       case "2":
         if (!isCcrConfigured()) {
           console.log(ansis.yellow(`
-\u26A0\uFE0F  ${i18n.ccr.ccrNotConfigured || "CCR is not configured yet. Please initialize CCR first."}`));
-          console.log(ansis.cyan(`   ${i18n.ccr.pleaseInitFirst || "Please select option 1 to initialize CCR."}
+\u26A0\uFE0F  ${i18n.t("ccr:ccrNotConfigured")}`));
+          console.log(ansis.cyan(`   ${i18n.t("ccr:pleaseInitFirst")}
 `));
         } else {
           const config = readCcrConfig();
-          await runCcrUi(scriptLang, config?.APIKEY);
+          await runCcrUi(config?.APIKEY);
         }
         break;
       case "3":
         if (!isCcrConfigured()) {
           console.log(ansis.yellow(`
-\u26A0\uFE0F  ${i18n.ccr.ccrNotConfigured || "CCR is not configured yet. Please initialize CCR first."}`));
-          console.log(ansis.cyan(`   ${i18n.ccr.pleaseInitFirst || "Please select option 1 to initialize CCR."}
+\u26A0\uFE0F  ${i18n.t("ccr:ccrNotConfigured")}`));
+          console.log(ansis.cyan(`   ${i18n.t("ccr:pleaseInitFirst")}
 `));
         } else {
-          await runCcrStatus(scriptLang);
+          await runCcrStatus();
         }
         break;
       case "4":
         if (!isCcrConfigured()) {
           console.log(ansis.yellow(`
-\u26A0\uFE0F  ${i18n.ccr.ccrNotConfigured || "CCR is not configured yet. Please initialize CCR first."}`));
-          console.log(ansis.cyan(`   ${i18n.ccr.pleaseInitFirst || "Please select option 1 to initialize CCR."}
+\u26A0\uFE0F  ${i18n.t("ccr:ccrNotConfigured")}`));
+          console.log(ansis.cyan(`   ${i18n.t("ccr:pleaseInitFirst")}
 `));
         } else {
-          await runCcrRestart(scriptLang);
+          await runCcrRestart();
         }
         break;
       case "5":
         if (!isCcrConfigured()) {
           console.log(ansis.yellow(`
-\u26A0\uFE0F  ${i18n.ccr.ccrNotConfigured || "CCR is not configured yet. Please initialize CCR first."}`));
-          console.log(ansis.cyan(`   ${i18n.ccr.pleaseInitFirst || "Please select option 1 to initialize CCR."}
+\u26A0\uFE0F  ${i18n.t("ccr:ccrNotConfigured")}`));
+          console.log(ansis.cyan(`   ${i18n.t("ccr:pleaseInitFirst")}
 `));
         } else {
-          await runCcrStart(scriptLang);
+          await runCcrStart();
         }
         break;
       case "6":
         if (!isCcrConfigured()) {
           console.log(ansis.yellow(`
-\u26A0\uFE0F  ${i18n.ccr.ccrNotConfigured || "CCR is not configured yet. Please initialize CCR first."}`));
-          console.log(ansis.cyan(`   ${i18n.ccr.pleaseInitFirst || "Please select option 1 to initialize CCR."}
+\u26A0\uFE0F  ${i18n.t("ccr:ccrNotConfigured")}`));
+          console.log(ansis.cyan(`   ${i18n.t("ccr:pleaseInitFirst")}
 `));
         } else {
-          await runCcrStop(scriptLang);
+          await runCcrStop();
         }
         break;
       case "0":
@@ -221,78 +222,78 @@ ${ansis.dim("\u2500".repeat(50))}
       const { continueInCcr } = await inquirer.prompt({
         type: "confirm",
         name: "continueInCcr",
-        message: i18n.common.returnToMenu || "Return to CCR menu?",
+        message: i18n.t("common:returnToMenu"),
         default: true
       });
       if (continueInCcr) {
-        return await showCcrMenu(scriptLang);
+        return await showCcrMenu();
       }
     }
     return false;
   } catch (error) {
     if (!handleExitPromptError(error)) {
-      handleGeneralError(error, scriptLang);
+      handleGeneralError(error);
     }
     return false;
   }
 }
 
-function handleCancellation(scriptLang) {
-  const i18n = getTranslation(scriptLang);
-  console.log(ansis.yellow(i18n.common.cancelled));
+async function handleCancellation() {
+  ensureI18nInitialized();
+  console.log(ansis.yellow(i18n.t("common:cancelled")));
 }
-async function configureApiFeature(scriptLang) {
-  const i18n = getTranslation(scriptLang);
+async function configureApiFeature() {
+  ensureI18nInitialized();
   const existingApiConfig = getExistingApiConfig();
   if (existingApiConfig) {
     console.log(`
-${ansis.blue(`\u2139 ${i18n.api.existingApiConfig}`)}`);
-    console.log(ansis.gray(`  ${i18n.api.apiConfigUrl}: ${existingApiConfig.url || i18n.common.notConfigured}`));
+${ansis.blue(`\u2139 ${i18n.t("api:existingApiConfig")}`)}`);
+    console.log(ansis.gray(`  ${i18n.t("api:apiConfigUrl")}: ${existingApiConfig.url || i18n.t("common:notConfigured")}`));
     console.log(
       ansis.gray(
-        `  ${i18n.api.apiConfigKey}: ${existingApiConfig.key ? formatApiKeyDisplay(existingApiConfig.key) : i18n.common.notConfigured}`
+        `  ${i18n.t("api:apiConfigKey")}: ${existingApiConfig.key ? formatApiKeyDisplay(existingApiConfig.key) : i18n.t("common:notConfigured")}`
       )
     );
     console.log(
-      ansis.gray(`  ${i18n.api.apiConfigAuthType}: ${existingApiConfig.authType || i18n.common.notConfigured}
+      ansis.gray(`  ${i18n.t("api:apiConfigAuthType")}: ${existingApiConfig.authType || i18n.t("common:notConfigured")}
 `)
     );
     const { action } = await inquirer.prompt({
       type: "list",
       name: "action",
-      message: i18n.api.selectApiAction,
+      message: i18n.t("api:selectApiAction"),
       choices: addNumbersToChoices([
-        { name: i18n.api.keepExistingConfig, value: "keep" },
-        { name: i18n.api.modifyAllConfig, value: "modify-all" },
-        { name: i18n.api.modifyPartialConfig, value: "modify-partial" },
-        { name: i18n.api.useCcrProxy, value: "use-ccr" }
+        { name: i18n.t("api:keepExistingConfig"), value: "keep" },
+        { name: i18n.t("api:modifyAllConfig"), value: "modify-all" },
+        { name: i18n.t("api:modifyPartialConfig"), value: "modify-partial" },
+        { name: i18n.t("api:useCcrProxy"), value: "use-ccr" }
       ])
     });
     if (!action) {
-      handleCancellation(scriptLang);
+      await handleCancellation();
       return;
     }
     if (action === "keep") {
-      console.log(ansis.green(`\u2714 ${i18n.api.keepExistingConfig}`));
+      console.log(ansis.green(`\u2714 ${i18n.t("api:keepExistingConfig")}`));
       try {
         addCompletedOnboarding();
       } catch (error) {
-        console.error(ansis.red(i18n.configuration.failedToSetOnboarding), error);
+        console.error(ansis.red(i18n.t("errors:failedToSetOnboarding")), error);
       }
       return;
     } else if (action === "modify-partial") {
-      await modifyApiConfigPartially(existingApiConfig, i18n, scriptLang);
+      await modifyApiConfigPartially(existingApiConfig);
       return;
     } else if (action === "use-ccr") {
       const ccrStatus = await isCcrInstalled();
       if (!ccrStatus.hasCorrectPackage) {
-        await installCcr(scriptLang);
+        await installCcr();
       } else {
-        console.log(ansis.green(`\u2714 ${i18n.ccr.ccrAlreadyInstalled}`));
+        console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrAlreadyInstalled")}`));
       }
-      const ccrConfigured = await setupCcrConfiguration(scriptLang);
+      const ccrConfigured = await setupCcrConfiguration();
       if (ccrConfigured) {
-        console.log(ansis.green(`\u2714 ${i18n.ccr.ccrSetupComplete}`));
+        console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrSetupComplete")}`));
       }
       return;
     }
@@ -300,24 +301,24 @@ ${ansis.blue(`\u2139 ${i18n.api.existingApiConfig}`)}`);
   const { apiChoice } = await inquirer.prompt({
     type: "list",
     name: "apiChoice",
-    message: i18n.api.configureApi,
+    message: i18n.t("api:configureApi"),
     choices: addNumbersToChoices([
       {
-        name: `${i18n.api.useAuthToken} - ${ansis.gray(i18n.api.authTokenDesc)}`,
+        name: `${i18n.t("api:useAuthToken")} - ${ansis.gray(i18n.t("api:authTokenDesc"))}`,
         value: "auth_token",
-        short: i18n.api.useAuthToken
+        short: i18n.t("api:useAuthToken")
       },
       {
-        name: `${i18n.api.useApiKey} - ${ansis.gray(i18n.api.apiKeyDesc)}`,
+        name: `${i18n.t("api:useApiKey")} - ${ansis.gray(i18n.t("api:apiKeyDesc"))}`,
         value: "api_key",
-        short: i18n.api.useApiKey
+        short: i18n.t("api:useApiKey")
       },
       {
-        name: `${i18n.api.useCcrProxy} - ${ansis.gray(i18n.api.ccrProxyDesc)}`,
+        name: `${i18n.t("api:useCcrProxy")} - ${ansis.gray(i18n.t("api:ccrProxyDesc"))}`,
         value: "ccr_proxy",
-        short: i18n.api.useCcrProxy
+        short: i18n.t("api:useCcrProxy")
       },
-      { name: i18n.api.skipApi, value: "skip" }
+      { name: i18n.t("api:skipApi"), value: "skip" }
     ])
   });
   if (!apiChoice || apiChoice === "skip") {
@@ -326,70 +327,70 @@ ${ansis.blue(`\u2139 ${i18n.api.existingApiConfig}`)}`);
   if (apiChoice === "ccr_proxy") {
     const ccrStatus = await isCcrInstalled();
     if (!ccrStatus.hasCorrectPackage) {
-      await installCcr(scriptLang);
+      await installCcr();
     } else {
-      console.log(ansis.green(`\u2714 ${i18n.ccr.ccrAlreadyInstalled}`));
+      console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrAlreadyInstalled")}`));
     }
-    const ccrConfigured = await setupCcrConfiguration(scriptLang);
+    const ccrConfigured = await setupCcrConfiguration();
     if (ccrConfigured) {
-      console.log(ansis.green(`\u2714 ${i18n.ccr.ccrSetupComplete}`));
+      console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrSetupComplete")}`));
     }
     return;
   }
   const { url } = await inquirer.prompt({
     type: "input",
     name: "url",
-    message: i18n.api.enterApiUrl,
-    validate: (value) => {
+    message: i18n.t("api:enterApiUrl"),
+    validate: async (value) => {
       if (!value)
-        return i18n.api.urlRequired;
+        return i18n.t("api:urlRequired");
       try {
         void new URL(value);
         return true;
       } catch {
-        return i18n.api.invalidUrl;
+        return i18n.t("api:invalidUrl");
       }
     }
   });
   if (!url) {
-    handleCancellation(scriptLang);
+    await handleCancellation();
     return;
   }
-  const keyMessage = apiChoice === "auth_token" ? i18n.api.enterAuthToken : i18n.api.enterApiKey;
+  const keyMessage = apiChoice === "auth_token" ? i18n.t("api:enterAuthToken") : i18n.t("api:enterApiKey");
   const { key } = await inquirer.prompt({
     type: "input",
     name: "key",
     message: keyMessage,
-    validate: (value) => {
+    validate: async (value) => {
       if (!value) {
-        return i18n.api.keyRequired;
+        return i18n.t("api:keyRequired");
       }
-      const validation = validateApiKey(value, scriptLang);
+      const validation = await validateApiKey(value);
       if (!validation.isValid) {
-        return validation.error || i18n.api.invalidKeyFormat;
+        return validation.error || i18n.t("api:invalidKeyFormat");
       }
       return true;
     }
   });
   if (!key) {
-    handleCancellation(scriptLang);
+    await handleCancellation();
     return;
   }
   const apiConfig = { url, key, authType: apiChoice };
   const configuredApi = configureApi(apiConfig);
   if (configuredApi) {
-    console.log(ansis.green(`\u2714 ${i18n.api.apiConfigSuccess}`));
+    console.log(ansis.green(`\u2714 ${i18n.t("api:apiConfigSuccess")}`));
     console.log(ansis.gray(`  URL: ${configuredApi.url}`));
     console.log(ansis.gray(`  Key: ${formatApiKeyDisplay(configuredApi.key)}`));
   }
 }
-async function configureMcpFeature(scriptLang) {
-  const i18n = getTranslation(scriptLang);
+async function configureMcpFeature() {
+  ensureI18nInitialized();
   if (isWindows()) {
     const { fixWindows } = await inquirer.prompt({
       type: "confirm",
       name: "fixWindows",
-      message: i18n.configuration.fixWindowsMcp || "Fix Windows MCP configuration?",
+      message: i18n.t("configuration:fixWindowsMcp") || "Fix Windows MCP configuration?",
       default: true
     });
     if (fixWindows) {
@@ -399,18 +400,18 @@ async function configureMcpFeature(scriptLang) {
       console.log(ansis.green(`\u2714 Windows MCP configuration fixed`));
     }
   }
-  const selectedServices = await selectMcpServices(scriptLang);
+  const selectedServices = await selectMcpServices();
   if (!selectedServices) {
     return;
   }
   if (selectedServices.length > 0) {
     const mcpBackupPath = backupMcpConfig();
     if (mcpBackupPath) {
-      console.log(ansis.gray(`\u2714 ${i18n.mcp.mcpBackupSuccess}: ${mcpBackupPath}`));
+      console.log(ansis.gray(`\u2714 ${i18n.t("mcp:mcpBackupSuccess")}: ${mcpBackupPath}`));
     }
     const newServers = {};
     for (const serviceId of selectedServices) {
-      const service = getMcpServices(scriptLang).find((s) => s.id === serviceId);
+      const service = (await getMcpServices()).find((s) => s.id === serviceId);
       if (!service)
         continue;
       let config = service.config;
@@ -419,7 +420,7 @@ async function configureMcpFeature(scriptLang) {
           type: "input",
           name: "apiKey",
           message: service.apiKeyPrompt,
-          validate: (value) => !!value || i18n.api.keyRequired
+          validate: async (value) => !!value || i18n.t("api:keyRequired")
         });
         if (apiKey) {
           config = buildMcpServerConfig(service.config, apiKey, service.apiKeyPlaceholder, service.apiKeyEnvVar);
@@ -433,69 +434,69 @@ async function configureMcpFeature(scriptLang) {
     let mergedConfig = mergeMcpServers(existingConfig, newServers);
     mergedConfig = fixWindowsMcpConfig(mergedConfig);
     writeMcpConfig(mergedConfig);
-    console.log(ansis.green(`\u2714 ${i18n.mcp.mcpConfigSuccess}`));
+    console.log(ansis.green(`\u2714 ${i18n.t("mcp:mcpConfigSuccess")}`));
   }
 }
-async function configureDefaultModelFeature(scriptLang) {
-  const i18n = getTranslation(scriptLang);
+async function configureDefaultModelFeature() {
+  ensureI18nInitialized();
   const existingModel = getExistingModelConfig();
   if (existingModel) {
     console.log(`
-${ansis.blue(`\u2139 ${i18n.configuration.existingModelConfig || "Existing model configuration"}`)}`);
-    const modelDisplay = existingModel === "default" ? i18n.configuration.defaultModelOption || "Default (Let Claude Code choose)" : existingModel.charAt(0).toUpperCase() + existingModel.slice(1);
-    console.log(ansis.gray(`  ${i18n.configuration.currentModel || "Current model"}: ${modelDisplay}
+${ansis.blue(`\u2139 ${i18n.t("configuration:existingModelConfig") || "Existing model configuration"}`)}`);
+    const modelDisplay = existingModel === "default" ? i18n.t("configuration:defaultModelOption") || "Default (Let Claude Code choose)" : existingModel.charAt(0).toUpperCase() + existingModel.slice(1);
+    console.log(ansis.gray(`  ${i18n.t("configuration:currentModel") || "Current model"}: ${modelDisplay}
 `));
     const { modify } = await inquirer.prompt({
       type: "confirm",
       name: "modify",
-      message: i18n.configuration.modifyModel || "Modify model configuration?",
+      message: i18n.t("configuration:modifyModel") || "Modify model configuration?",
       default: false
     });
     if (!modify) {
-      console.log(ansis.green(`\u2714 ${i18n.configuration.keepModel || "Keeping existing model configuration"}`));
+      console.log(ansis.green(`\u2714 ${i18n.t("configuration:keepModel") || "Keeping existing model configuration"}`));
       return;
     }
   }
   const { model } = await inquirer.prompt({
     type: "list",
     name: "model",
-    message: i18n.configuration.selectDefaultModel || "Select default model",
+    message: i18n.t("configuration:selectDefaultModel") || "Select default model",
     choices: addNumbersToChoices([
       {
-        name: i18n.configuration.defaultModelOption || "Default - Let Claude Code choose",
+        name: i18n.t("configuration:defaultModelOption") || "Default - Let Claude Code choose",
         value: "default"
       },
       {
-        name: i18n.configuration.opusModelOption || "Opus - Only use opus, high token consumption, use with caution",
+        name: i18n.t("configuration:opusModelOption") || "Opus - Only use opus, high token consumption, use with caution",
         value: "opus"
       },
       {
-        name: i18n.configuration.opusPlanModelOption || "OpusPlan - Use Opus for planning, write code with sonnet, recommended",
+        name: i18n.t("configuration:opusPlanModelOption") || "OpusPlan - Use Opus for planning, write code with sonnet, recommended",
         value: "opusplan"
       }
     ]),
     default: existingModel ? ["default", "opus", "opusplan"].indexOf(existingModel) : 0
   });
   if (!model) {
-    handleCancellation(scriptLang);
+    await handleCancellation();
     return;
   }
   updateDefaultModel(model);
-  console.log(ansis.green(`\u2714 ${i18n.configuration.modelConfigured || "Default model configured"}`));
+  console.log(ansis.green(`\u2714 ${i18n.t("configuration:modelConfigured") || "Default model configured"}`));
 }
-async function configureAiMemoryFeature(scriptLang) {
-  const i18n = getTranslation(scriptLang);
+async function configureAiMemoryFeature() {
+  ensureI18nInitialized();
   const { option } = await inquirer.prompt({
     type: "list",
     name: "option",
-    message: i18n.configuration.selectMemoryOption || "Select configuration option",
+    message: i18n.t("configuration:selectMemoryOption") || "Select configuration option",
     choices: addNumbersToChoices([
       {
-        name: i18n.configuration.configureAiLanguage || "Configure AI output language",
+        name: i18n.t("configuration:configureAiLanguage") || "Configure AI output language",
         value: "language"
       },
       {
-        name: i18n.configuration.configureOutputStyle || "Configure global AI output style",
+        name: i18n.t("configuration:configureOutputStyle") || "Configure global AI output style",
         value: "outputStyle"
       }
     ])
@@ -509,55 +510,55 @@ async function configureAiMemoryFeature(scriptLang) {
     if (existingLang) {
       console.log(
         `
-${ansis.blue(`\u2139 ${i18n.configuration.existingLanguageConfig || "Existing AI output language configuration"}`)}`
+${ansis.blue(`\u2139 ${i18n.t("configuration:existingLanguageConfig") || "Existing AI output language configuration"}`)}`
       );
-      console.log(ansis.gray(`  ${i18n.configuration.currentLanguage || "Current language"}: ${existingLang}
+      console.log(ansis.gray(`  ${i18n.t("configuration:currentLanguage") || "Current language"}: ${existingLang}
 `));
       const { modify } = await inquirer.prompt({
         type: "confirm",
         name: "modify",
-        message: i18n.configuration.modifyLanguage || "Modify AI output language?",
+        message: i18n.t("configuration:modifyLanguage") || "Modify AI output language?",
         default: false
       });
       if (!modify) {
-        console.log(ansis.green(`\u2714 ${i18n.configuration.keepLanguage || "Keeping existing language configuration"}`));
+        console.log(ansis.green(`\u2714 ${i18n.t("configuration:keepLanguage") || "Keeping existing language configuration"}`));
         return;
       }
     }
-    const { selectAiOutputLanguage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.af; });
-    const aiOutputLang = await selectAiOutputLanguage(scriptLang, scriptLang);
+    const { selectAiOutputLanguage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.ai; });
+    const aiOutputLang = await selectAiOutputLanguage();
     applyAiLanguageDirective(aiOutputLang);
     updateZcfConfig({ aiOutputLang });
-    console.log(ansis.green(`\u2714 ${i18n.configuration.aiLanguageConfigured || "AI output language configured"}`));
+    console.log(ansis.green(`\u2714 ${i18n.t("configuration:aiLanguageConfigured") || "AI output language configured"}`));
   } else if (option === "outputStyle") {
-    await configureOutputStyle(scriptLang, scriptLang);
+    await configureOutputStyle();
   }
 }
-async function clearZcfCacheFeature(scriptLang) {
-  const i18n = getTranslation(scriptLang);
+async function clearZcfCacheFeature() {
+  ensureI18nInitialized();
   const { confirm } = await inquirer.prompt({
     type: "confirm",
     name: "confirm",
-    message: i18n.configuration.confirmClearCache || "Clear all ZCF preferences cache?",
+    message: i18n.t("configuration:confirmClearCache") || "Clear all ZCF preferences cache?",
     default: false
   });
   if (!confirm) {
-    handleCancellation(scriptLang);
+    await handleCancellation();
     return;
   }
   if (existsSync(ZCF_CONFIG_FILE)) {
     unlinkSync(ZCF_CONFIG_FILE);
-    console.log(ansis.green(`\u2714 ${i18n.configuration.cacheCleared || "ZCF cache cleared"}`));
+    console.log(ansis.green(`\u2714 ${i18n.t("configuration:cacheCleared") || "ZCF cache cleared"}`));
   } else {
     console.log(ansis.yellow("No cache found"));
   }
 }
 async function changeScriptLanguageFeature(currentLang) {
-  const i18n = getTranslation(currentLang);
+  ensureI18nInitialized();
   const { lang } = await inquirer.prompt({
     type: "list",
     name: "lang",
-    message: i18n.language.selectScriptLang,
+    message: i18n.t("language:selectScriptLang"),
     choices: addNumbersToChoices(
       SUPPORTED_LANGS.map((l) => ({
         name: LANG_LABELS[l],
@@ -570,75 +571,66 @@ async function changeScriptLanguageFeature(currentLang) {
     return currentLang;
   }
   updateZcfConfig({ preferredLang: lang });
-  const newI18n = getTranslation(lang);
-  console.log(ansis.green(`\u2714 ${newI18n.language.languageChanged || "Language changed"}`));
+  await changeLanguage(lang);
+  console.log(ansis.green(`\u2714 ${i18n.t("language:languageChanged") || "Language changed"}`));
   return lang;
 }
-async function configureEnvPermissionFeature(scriptLang) {
-  const i18n = getTranslation(scriptLang);
+async function configureEnvPermissionFeature() {
+  ensureI18nInitialized();
   const { choice } = await inquirer.prompt({
     type: "list",
     name: "choice",
-    message: i18n.configuration?.selectEnvPermissionOption || "Select option",
+    message: i18n.t("configuration:selectEnvPermissionOption") || "Select option",
     choices: addNumbersToChoices([
       {
-        name: `${i18n.configuration?.importRecommendedEnv || "Import environment"} ${ansis.gray(
-          `- ${i18n.configuration?.importRecommendedEnvDesc || "Import env settings"}`
+        name: `${i18n.t("configuration:importRecommendedEnv") || "Import environment"} ${ansis.gray(
+          `- ${i18n.t("configuration:importRecommendedEnvDesc") || "Import env settings"}`
         )}`,
         value: "env"
       },
       {
-        name: `${i18n.configuration?.importRecommendedPermissions || "Import permissions"} ${ansis.gray(
-          `- ${i18n.configuration?.importRecommendedPermissionsDesc || "Import permission settings"}`
+        name: `${i18n.t("configuration:importRecommendedPermissions") || "Import permissions"} ${ansis.gray(
+          `- ${i18n.t("configuration:importRecommendedPermissionsDesc") || "Import permission settings"}`
         )}`,
         value: "permissions"
       },
       {
-        name: `${i18n.configuration?.openSettingsJson || "Open settings"} ${ansis.gray(
-          `- ${i18n.configuration?.openSettingsJsonDesc || "View settings file"}`
+        name: `${i18n.t("configuration:openSettingsJson") || "Open settings"} ${ansis.gray(
+          `- ${i18n.t("configuration:openSettingsJsonDesc") || "View settings file"}`
         )}`,
         value: "open"
       }
     ])
   });
   if (!choice) {
-    handleCancellation(scriptLang);
+    await handleCancellation();
     return;
   }
   try {
     switch (choice) {
       case "env":
         await importRecommendedEnv();
-        console.log(ansis.green(`\u2705 ${i18n.configuration.envImportSuccess}`));
+        console.log(ansis.green(`\u2705 ${i18n.t("configuration:envImportSuccess")}`));
         break;
       case "permissions":
         await importRecommendedPermissions();
-        console.log(ansis.green(`\u2705 ${i18n.configuration?.permissionsImportSuccess || "Permissions imported"}`));
+        console.log(ansis.green(`\u2705 ${i18n.t("configuration:permissionsImportSuccess") || "Permissions imported"}`));
         break;
       case "open":
-        console.log(ansis.cyan(i18n.configuration?.openingSettingsJson || "Opening settings.json..."));
+        console.log(ansis.cyan(i18n.t("configuration:openingSettingsJson") || "Opening settings.json..."));
         await openSettingsJson();
         break;
     }
   } catch (error) {
-    console.error(ansis.red(`${i18n.common.error}: ${error.message}`));
+    console.error(ansis.red(`${i18n.t("common:error")}: ${error.message}`));
   }
 }
 
 async function executeCcusage(args = []) {
   try {
-    let lang = "en";
-    try {
-      const zcfConfig = await readZcfConfigAsync();
-      const rawLang = zcfConfig?.preferredLang || "en";
-      lang = getValidLanguage(rawLang);
-    } catch {
-      lang = "en";
-    }
-    const i18n = I18N[lang];
     const command = "npx";
     const commandArgs = ["ccusage@latest", ...args || []];
-    console.log(ansis.cyan(i18n.tools.runningCcusage));
+    console.log(ansis.cyan(i18n.t("tools:runningCcusage")));
     console.log(ansis.gray(`$ npx ccusage@latest ${(args || []).join(" ")}`));
     console.log("");
     await x(command, commandArgs, {
@@ -647,19 +639,10 @@ async function executeCcusage(args = []) {
       }
     });
   } catch (error) {
-    let lang = "en";
-    try {
-      const zcfConfig = await readZcfConfigAsync();
-      const rawLang = zcfConfig?.preferredLang || "en";
-      lang = getValidLanguage(rawLang);
-    } catch {
-      lang = "en";
-    }
-    const i18n = I18N[lang];
-    console.error(ansis.red(i18n.tools.ccusageFailed));
-    console.error(ansis.yellow(i18n.tools.checkNetworkConnection));
+    console.error(ansis.red(i18n.t("tools:ccusageFailed")));
+    console.error(ansis.yellow(i18n.t("tools:checkNetworkConnection")));
     if (process.env.DEBUG) {
-      console.error(ansis.gray(i18n.tools.errorDetails), error);
+      console.error(ansis.gray(i18n.t("tools:errorDetails")), error);
     }
     if (process.env.NODE_ENV !== "test") {
       process.exit(1);
@@ -669,25 +652,25 @@ async function executeCcusage(args = []) {
 }
 
 const execAsync = promisify(exec);
-async function runCometixPrintConfig(scriptLang) {
-  const i18n = getTranslation(scriptLang);
+async function runCometixPrintConfig() {
+  ensureI18nInitialized();
   try {
-    console.log(ansis.blue(`${i18n.cometix.printingConfig}`));
+    console.log(ansis.blue(`${i18n.t("cometix:printingConfig")}`));
     const { stdout } = await execAsync(COMETIX_COMMANDS.PRINT_CONFIG);
     console.log(stdout);
   } catch (error) {
     if (error.message.includes(`command not found: ${COMETIX_COMMAND_NAME}`)) {
-      console.error(ansis.red(`\u2717 ${i18n.cometix.commandNotFound}`));
+      console.error(ansis.red(`\u2717 ${i18n.t("cometix:commandNotFound")}`));
     } else {
-      console.error(ansis.red(`\u2717 ${i18n.cometix.printConfigFailed}: ${error}`));
+      console.error(ansis.red(`\u2717 ${i18n.t("cometix:printConfigFailed")}: ${error}`));
     }
     throw error;
   }
 }
-async function runCometixTuiConfig(scriptLang) {
-  const i18n = getTranslation(scriptLang);
+async function runCometixTuiConfig() {
+  ensureI18nInitialized();
   return new Promise((resolve, reject) => {
-    console.log(ansis.blue(`${i18n.cometix.enteringTuiConfig}`));
+    console.log(ansis.blue(`${i18n.t("cometix:enteringTuiConfig")}`));
     const child = spawn(COMETIX_COMMAND_NAME, ["-c"], {
       stdio: "inherit",
       // This allows the TUI to interact directly with the terminal
@@ -695,56 +678,56 @@ async function runCometixTuiConfig(scriptLang) {
     });
     child.on("close", (code) => {
       if (code === 0) {
-        console.log(ansis.green(`\u2713 ${i18n.cometix.tuiConfigSuccess}`));
+        console.log(ansis.green(`\u2713 ${i18n.t("cometix:tuiConfigSuccess")}`));
         resolve();
       } else {
         const error = new Error(`${COMETIX_COMMAND_NAME} -c exited with code ${code}`);
-        console.error(ansis.red(`\u2717 ${i18n.cometix.tuiConfigFailed}: ${error.message}`));
+        console.error(ansis.red(`\u2717 ${i18n.t("cometix:tuiConfigFailed")}: ${error.message}`));
         reject(error);
       }
     });
     child.on("error", (error) => {
       if (error.message.includes(`command not found`) || error.message.includes("ENOENT")) {
-        console.error(ansis.red(`\u2717 ${i18n.cometix.commandNotFound}`));
+        console.error(ansis.red(`\u2717 ${i18n.t("cometix:commandNotFound")}`));
       } else {
-        console.error(ansis.red(`\u2717 ${i18n.cometix.tuiConfigFailed}: ${error.message}`));
+        console.error(ansis.red(`\u2717 ${i18n.t("cometix:tuiConfigFailed")}: ${error.message}`));
       }
       reject(error);
     });
   });
 }
 
-async function showCometixMenu(scriptLang) {
+async function showCometixMenu() {
   try {
-    const i18n = getTranslation(scriptLang);
+    ensureI18nInitialized();
     console.log(`
 ${ansis.cyan("\u2550".repeat(50))}`);
-    console.log(ansis.bold.cyan(`  ${i18n.cometix.cometixMenuTitle}`));
+    console.log(ansis.bold.cyan(`  ${i18n.t("cometix:cometixMenuTitle")}`));
     console.log(`${ansis.cyan("\u2550".repeat(50))}
 `);
-    console.log(`  ${ansis.cyan("1.")} ${i18n.cometix.cometixMenuOptions.installOrUpdate} ${ansis.gray(`- ${i18n.cometix.cometixMenuDescriptions.installOrUpdate}`)}`);
-    console.log(`  ${ansis.cyan("2.")} ${i18n.cometix.cometixMenuOptions.printConfig} ${ansis.gray(`- ${i18n.cometix.cometixMenuDescriptions.printConfig}`)}`);
-    console.log(`  ${ansis.cyan("3.")} ${i18n.cometix.cometixMenuOptions.customConfig} ${ansis.gray(`- ${i18n.cometix.cometixMenuDescriptions.customConfig}`)}`);
-    console.log(`  ${ansis.yellow("0.")} ${i18n.cometix.cometixMenuOptions.back}`);
+    console.log(`  ${ansis.cyan("1.")} ${i18n.t("cometix:cometixMenuOptions.installOrUpdate")} ${ansis.gray(`- ${i18n.t("cometix:cometixMenuDescriptions.installOrUpdate")}`)}`);
+    console.log(`  ${ansis.cyan("2.")} ${i18n.t("cometix:cometixMenuOptions.printConfig")} ${ansis.gray(`- ${i18n.t("cometix:cometixMenuDescriptions.printConfig")}`)}`);
+    console.log(`  ${ansis.cyan("3.")} ${i18n.t("cometix:cometixMenuOptions.customConfig")} ${ansis.gray(`- ${i18n.t("cometix:cometixMenuDescriptions.customConfig")}`)}`);
+    console.log(`  ${ansis.yellow("0.")} ${i18n.t("cometix:cometixMenuOptions.back")}`);
     console.log("");
     const { choice } = await inquirer.prompt({
       type: "input",
       name: "choice",
-      message: i18n.common.enterChoice,
-      validate: (value) => {
+      message: i18n.t("common:enterChoice"),
+      validate: async (value) => {
         const valid = ["1", "2", "3", "0"];
-        return valid.includes(value) || i18n.common.invalidChoice;
+        return valid.includes(value) || i18n.t("common:invalidChoice");
       }
     });
     switch (choice) {
       case "1":
-        await installCometixLine(scriptLang);
+        await installCometixLine();
         break;
       case "2":
-        await runCometixPrintConfig(scriptLang);
+        await runCometixPrintConfig();
         break;
       case "3":
-        await runCometixTuiConfig(scriptLang);
+        await runCometixTuiConfig();
         break;
       case "0":
         return false;
@@ -756,44 +739,40 @@ ${ansis.dim("\u2500".repeat(50))}
       const { continueInCometix } = await inquirer.prompt({
         type: "confirm",
         name: "continueInCometix",
-        message: i18n.common.returnToMenu,
+        message: i18n.t("common:returnToMenu"),
         default: true
       });
       if (continueInCometix) {
-        return await showCometixMenu(scriptLang);
+        return await showCometixMenu();
       }
     }
     return false;
   } catch (error) {
     if (!handleExitPromptError(error)) {
-      handleGeneralError(error, scriptLang);
+      handleGeneralError(error);
     }
     return false;
   }
 }
 
-function getValidLanguage(lang) {
-  return lang && lang in I18N ? lang : "en";
-}
-async function runCcusageFeature(scriptLang) {
-  const validLang = getValidLanguage(scriptLang);
-  const i18n = getTranslation(validLang);
+async function runCcusageFeature() {
+  ensureI18nInitialized();
   console.log("");
-  console.log(ansis.cyan(i18n.menu.menuOptions.ccusage));
-  console.log(ansis.gray(`${i18n.tools.ccusageDescription}`));
+  console.log(ansis.cyan(i18n.t("menu:menuOptions.ccusage")));
+  console.log(ansis.gray(`${i18n.t("tools:ccusageDescription")}`));
   console.log("");
   const choices = [
-    { name: i18n.tools.ccusageModes.daily, value: "daily" },
-    { name: i18n.tools.ccusageModes.monthly, value: "monthly" },
-    { name: i18n.tools.ccusageModes.session, value: "session" },
-    { name: i18n.tools.ccusageModes.blocks, value: "blocks" },
-    { name: i18n.tools.ccusageModes.custom, value: "custom" },
-    { name: i18n.common.back, value: "back" }
+    { name: i18n.t("tools:ccusageModes.daily"), value: "daily" },
+    { name: i18n.t("tools:ccusageModes.monthly"), value: "monthly" },
+    { name: i18n.t("tools:ccusageModes.session"), value: "session" },
+    { name: i18n.t("tools:ccusageModes.blocks"), value: "blocks" },
+    { name: i18n.t("tools:ccusageModes.custom"), value: "custom" },
+    { name: i18n.t("common:back"), value: "back" }
   ];
   const { mode } = await inquirer.prompt({
     type: "list",
     name: "mode",
-    message: i18n.tools.selectAnalysisMode,
+    message: i18n.t("tools:selectAnalysisMode"),
     choices: addNumbersToChoices(choices)
   });
   if (mode === "back") {
@@ -804,7 +783,7 @@ async function runCcusageFeature(scriptLang) {
     const { customArgs } = await inquirer.prompt({
       type: "input",
       name: "customArgs",
-      message: i18n.tools.enterCustomArgs,
+      message: i18n.t("tools:enterCustomArgs"),
       default: ""
     });
     if (customArgs === null || customArgs === void 0 || customArgs === "") {
@@ -836,24 +815,21 @@ async function runCcusageFeature(scriptLang) {
   await inquirer.prompt({
     type: "input",
     name: "continue",
-    message: ansis.gray(i18n.tools.pressEnterToContinue)
+    message: ansis.gray(i18n.t("tools:pressEnterToContinue"))
   });
 }
-async function runCcrMenuFeature(scriptLang) {
-  const validLang = getValidLanguage(scriptLang);
-  await showCcrMenu(validLang);
+async function runCcrMenuFeature() {
+  await showCcrMenu();
 }
-async function runCometixMenuFeature(scriptLang) {
-  const validLang = getValidLanguage(scriptLang);
-  await showCometixMenu(validLang);
+async function runCometixMenuFeature() {
+  await showCometixMenu();
 }
 
-async function checkUpdates(options = {}) {
-  const scriptLang = options.lang || await selectScriptLanguage();
+async function checkUpdates() {
   try {
-    await checkAndUpdateTools(scriptLang);
+    await checkAndUpdateTools();
   } catch (error) {
-    console.error(ansis.red("Error checking updates:"), error);
+    console.error(ansis.red(i18n.t("updater:errorCheckingUpdates")), error);
     process.exit(1);
   }
 }
@@ -861,38 +837,39 @@ async function checkUpdates(options = {}) {
 async function update(options = {}) {
   try {
     if (!options.skipBanner) {
-      displayBanner("Update configuration for Claude Code");
+      displayBanner(i18n.t("cli:banner.updateSubtitle"));
     }
-    const scriptLang = await selectScriptLanguage();
     const zcfConfig = readZcfConfig();
-    const i18n = I18N[scriptLang];
     let configLang = options.configLang;
     if (!configLang) {
+      const LANG_HINT_KEYS = {
+        "zh-CN": i18n.t("language:configLangHint.zh-CN"),
+        "en": i18n.t("language:configLangHint.en")
+      };
       const { lang } = await inquirer.prompt({
         type: "list",
         name: "lang",
-        message: i18n.language.updateConfigLangPrompt,
+        message: i18n.t("language:updateConfigLangPrompt"),
         choices: addNumbersToChoices(SUPPORTED_LANGS.map((l) => ({
-          name: `${LANG_LABELS[l]} - ${i18n.language.configLangHint[l]}`,
+          name: `${LANG_LABELS[l]} - ${LANG_HINT_KEYS[l]}`,
           value: l
         })))
       });
       if (!lang) {
-        console.log(ansis.yellow(i18n.common.cancelled));
+        console.log(ansis.yellow(i18n.t("common:cancelled")));
         process.exit(0);
       }
       configLang = lang;
     }
-    const aiOutputLang = await resolveAiOutputLanguage(scriptLang, options.aiOutputLang, zcfConfig);
+    const aiOutputLang = await resolveAiOutputLanguage(i18n.language, options.aiOutputLang, zcfConfig);
     console.log(ansis.cyan(`
-${i18n.configuration.updatingPrompts}
+${i18n.t("configuration:updatingPrompts")}
 `));
-    await updatePromptOnly(configLang, scriptLang, aiOutputLang);
-    await selectAndInstallWorkflows(configLang, scriptLang);
-    await checkClaudeCodeVersionAndPrompt(scriptLang, false);
+    await updatePromptOnly(aiOutputLang);
+    await selectAndInstallWorkflows(configLang);
+    await checkClaudeCodeVersionAndPrompt(false);
     updateZcfConfig({
       version,
-      preferredLang: scriptLang,
       aiOutputLang
     });
   } catch (error) {
@@ -905,136 +882,131 @@ ${i18n.configuration.updatingPrompts}
 async function showMainMenu() {
   try {
     displayBannerWithInfo();
-    const zcfConfig = await readZcfConfigAsync();
-    let scriptLang = zcfConfig?.preferredLang || await selectScriptLanguage();
     let exitMenu = false;
     while (!exitMenu) {
-      const i18n = I18N[scriptLang];
-      console.log(ansis.cyan(i18n.menu.selectFunction));
+      console.log(ansis.cyan(i18n.t("menu:selectFunction")));
       console.log("  -------- Claude Code --------");
       console.log(
-        `  ${ansis.cyan("1.")} ${i18n.menu.menuOptions.fullInit} ${ansis.gray(`- ${i18n.menu.menuDescriptions.fullInit}`)}`
+        `  ${ansis.cyan("1.")} ${i18n.t("menu:menuOptions.fullInit")} ${ansis.gray(`- ${i18n.t("menu:menuDescriptions.fullInit")}`)}`
       );
       console.log(
-        `  ${ansis.cyan("2.")} ${i18n.menu.menuOptions.importWorkflow} ${ansis.gray(
-          `- ${i18n.menu.menuDescriptions.importWorkflow}`
+        `  ${ansis.cyan("2.")} ${i18n.t("menu:menuOptions.importWorkflow")} ${ansis.gray(
+          `- ${i18n.t("menu:menuDescriptions.importWorkflow")}`
         )}`
       );
       console.log(
-        `  ${ansis.cyan("3.")} ${i18n.menu.menuOptions.configureApiOrCcr} ${ansis.gray(
-          `- ${i18n.menu.menuDescriptions.configureApiOrCcr}`
+        `  ${ansis.cyan("3.")} ${i18n.t("menu:menuOptions.configureApiOrCcr")} ${ansis.gray(
+          `- ${i18n.t("menu:menuDescriptions.configureApiOrCcr")}`
         )}`
       );
       console.log(
-        `  ${ansis.cyan("4.")} ${i18n.menu.menuOptions.configureMcp} ${ansis.gray(
-          `- ${i18n.menu.menuDescriptions.configureMcp}`
+        `  ${ansis.cyan("4.")} ${i18n.t("menu:menuOptions.configureMcp")} ${ansis.gray(
+          `- ${i18n.t("menu:menuDescriptions.configureMcp")}`
         )}`
       );
       console.log(
-        `  ${ansis.cyan("5.")} ${i18n.menu.menuOptions.configureModel} ${ansis.gray(
-          `- ${i18n.menu.menuDescriptions.configureModel}`
+        `  ${ansis.cyan("5.")} ${i18n.t("menu:menuOptions.configureModel")} ${ansis.gray(
+          `- ${i18n.t("menu:menuDescriptions.configureModel")}`
         )}`
       );
       console.log(
-        `  ${ansis.cyan("6.")} ${i18n.menu.menuOptions.configureAiMemory} ${ansis.gray(
-          `- ${i18n.menu.menuDescriptions.configureAiMemory}`
+        `  ${ansis.cyan("6.")} ${i18n.t("menu:menuOptions.configureAiMemory")} ${ansis.gray(
+          `- ${i18n.t("menu:menuDescriptions.configureAiMemory")}`
         )}`
       );
       console.log(
-        `  ${ansis.cyan("7.")} ${i18n.menu.menuOptions.configureEnvPermission} ${ansis.gray(
-          `- ${i18n.menu.menuDescriptions.configureEnvPermission}`
+        `  ${ansis.cyan("7.")} ${i18n.t("menu:menuOptions.configureEnvPermission")} ${ansis.gray(
+          `- ${i18n.t("menu:menuDescriptions.configureEnvPermission")}`
         )}`
       );
       console.log("");
-      console.log(`  --------- ${i18n.menu.menuSections.otherTools} ----------`);
+      console.log(`  --------- ${i18n.t("menu:menuSections.otherTools")} ----------`);
       console.log(
-        `  ${ansis.cyan("R.")} ${i18n.menu.menuOptions.ccrManagement} ${ansis.gray(`- ${i18n.menu.menuDescriptions.ccrManagement}`)}`
+        `  ${ansis.cyan("R.")} ${i18n.t("menu:menuOptions.ccrManagement")} ${ansis.gray(`- ${i18n.t("menu:menuDescriptions.ccrManagement")}`)}`
       );
       console.log(
-        `  ${ansis.cyan("U.")} ${i18n.menu.menuOptions.ccusage} ${ansis.gray(`- ${i18n.menu.menuDescriptions.ccusage}`)}`
+        `  ${ansis.cyan("U.")} ${i18n.t("menu:menuOptions.ccusage")} ${ansis.gray(`- ${i18n.t("menu:menuDescriptions.ccusage")}`)}`
       );
       console.log(
-        `  ${ansis.cyan("L.")} ${i18n.menu.menuOptions.cometixLine} ${ansis.gray(`- ${i18n.menu.menuDescriptions.cometixLine}`)}`
+        `  ${ansis.cyan("L.")} ${i18n.t("menu:menuOptions.cometixLine")} ${ansis.gray(`- ${i18n.t("menu:menuDescriptions.cometixLine")}`)}`
       );
       console.log("");
       console.log("  ------------ ZCF ------------");
       console.log(
-        `  ${ansis.cyan("0.")} ${i18n.menu.menuOptions.changeLanguage} ${ansis.gray(
-          `- ${i18n.menu.menuDescriptions.changeLanguage}`
+        `  ${ansis.cyan("0.")} ${i18n.t("menu:menuOptions.changeLanguage")} ${ansis.gray(
+          `- ${i18n.t("menu:menuDescriptions.changeLanguage")}`
         )}`
       );
       console.log(
-        `  ${ansis.cyan("-.")} ${i18n.menu.menuOptions.clearCache} ${ansis.gray(`- ${i18n.menu.menuDescriptions.clearCache}`)}`
+        `  ${ansis.cyan("-.")} ${i18n.t("menu:menuOptions.clearCache")} ${ansis.gray(`- ${i18n.t("menu:menuDescriptions.clearCache")}`)}`
       );
       console.log(
-        `  ${ansis.cyan("+.")} ${i18n.menu.menuOptions.checkUpdates} ${ansis.gray(`- ${i18n.menu.menuDescriptions.checkUpdates}`)}`
+        `  ${ansis.cyan("+.")} ${i18n.t("menu:menuOptions.checkUpdates")} ${ansis.gray(`- ${i18n.t("menu:menuDescriptions.checkUpdates")}`)}`
       );
-      console.log(`  ${ansis.red("Q.")} ${ansis.red(i18n.menu.menuOptions.exit)}`);
+      console.log(`  ${ansis.red("Q.")} ${ansis.red(i18n.t("menu:menuOptions.exit"))}`);
       console.log("");
       const { choice } = await inquirer.prompt({
         type: "input",
         name: "choice",
-        message: i18n.common.enterChoice,
+        message: i18n.t("common:enterChoice"),
         validate: (value) => {
           const valid = ["1", "2", "3", "4", "5", "6", "7", "r", "R", "u", "U", "l", "L", "0", "-", "+", "q", "Q"];
-          return valid.includes(value) || i18n.common.invalidChoice;
+          return valid.includes(value) || i18n.t("common:invalidChoice");
         }
       });
       if (!choice) {
-        console.log(ansis.yellow(i18n.common.cancelled));
+        console.log(ansis.yellow(i18n.t("common:cancelled")));
         exitMenu = true;
         break;
       }
       switch (choice.toLowerCase()) {
         case "1":
-          await init({ lang: scriptLang, skipBanner: true });
+          await init({ skipBanner: true });
           break;
         case "2":
           await update({ skipBanner: true });
           break;
         case "3":
-          await configureApiFeature(scriptLang);
+          await configureApiFeature();
           break;
         case "4":
-          await configureMcpFeature(scriptLang);
+          await configureMcpFeature();
           break;
         case "5":
-          await configureDefaultModelFeature(scriptLang);
+          await configureDefaultModelFeature();
           break;
         case "6":
-          await configureAiMemoryFeature(scriptLang);
+          await configureAiMemoryFeature();
           break;
         case "7":
-          await configureEnvPermissionFeature(scriptLang);
+          await configureEnvPermissionFeature();
           break;
         case "r":
         case "R":
-          await runCcrMenuFeature(scriptLang);
+          await runCcrMenuFeature();
           break;
         case "u":
         case "U":
-          await runCcusageFeature(scriptLang);
+          await runCcusageFeature();
           break;
         case "l":
         case "L":
-          await runCometixMenuFeature(scriptLang);
+          await runCometixMenuFeature();
           break;
         case "0": {
-          const newLang = await changeScriptLanguageFeature(scriptLang);
-          if (newLang !== scriptLang) {
-            scriptLang = newLang;
-          }
+          const currentLang = i18n.language;
+          await changeScriptLanguageFeature(currentLang);
           break;
         }
         case "-":
-          await clearZcfCacheFeature(scriptLang);
+          await clearZcfCacheFeature();
           break;
         case "+":
-          await checkUpdates({ lang: scriptLang });
+          await checkUpdates();
           break;
         case "q":
           exitMenu = true;
-          console.log(ansis.cyan(i18n.common.goodbye));
+          console.log(ansis.cyan(i18n.t("common:goodbye")));
           break;
       }
       if (!exitMenu && choice.toLowerCase() !== "q") {
@@ -1050,12 +1022,12 @@ ${ansis.dim("\u2500".repeat(50))}
         const { continue: shouldContinue } = await inquirer.prompt({
           type: "confirm",
           name: "continue",
-          message: i18n.common.returnToMenu,
+          message: i18n.t("common:returnToMenu"),
           default: true
         });
         if (!shouldContinue) {
           exitMenu = true;
-          console.log(ansis.cyan(i18n.common.goodbye));
+          console.log(ansis.cyan(i18n.t("common:goodbye")));
         }
       }
     }
@@ -1071,73 +1043,43 @@ async function ccr(options = {}) {
     if (!options.skipBanner) {
       displayBannerWithInfo();
     }
-    const zcfConfig = await readZcfConfigAsync();
-    const scriptLang = options.lang || zcfConfig?.preferredLang || await selectScriptLanguage();
-    const continueInCcr = await showCcrMenu(scriptLang);
+    const continueInCcr = await showCcrMenu();
     if (!continueInCcr && !options.skipBanner) {
       await showMainMenu();
     }
   } catch (error) {
     if (!handleExitPromptError(error)) {
-      handleGeneralError(error, options.lang);
+      handleGeneralError(error);
     }
   }
 }
 
-function setupCommands(cli) {
-  cli.command("[lang]", "Show interactive menu (default)").option("--init", "Run full initialization directly").option("--config-lang, -c <lang>", "Configuration language (zh-CN, en)").option("--force, -f", "Force overwrite existing configuration").action(async (lang, options) => {
-    await handleDefaultCommand(lang, 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), default: 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, default: all').option("--workflows, -w <workflows>", 'Comma-separated workflows to install (sixStepsWorkflow,featPlanUx,gitWorkflow,bmadWorkflow), "skip" to skip all, "all" for all workflows, default: 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, default: all').option("--default-output-style, -d <style>", "Default output style, default: engineer-professional").option("--all-lang, -g <lang>", "Set all language parameters to this value").option("--install-cometix-line, -x <value>", "Install CCometixLine statusline tool (true/false), default: true").action(async (options) => {
-    await handleInitCommand(options);
-  });
-  cli.command("update", "Update Claude Code prompts only").alias("u").option("--config-lang, -c <lang>", "Configuration language (zh-CN, en)").action(async (options) => {
-    await handleUpdateCommand(options);
-  });
-  cli.command("ccr", "Configure Claude Code Router for model proxy").option("--lang, -l <lang>", "Display language (zh-CN, en)").action(async (options) => {
-    await ccr({ lang: options.lang });
-  });
-  cli.command("ccu [...args]", "Run Claude Code usage analysis tool").allowUnknownOptions().action(async (args) => {
-    await executeCcusage(args);
-  });
-  cli.command("check-updates", "Check and update Claude Code and CCR to latest versions").alias("check").option("--lang, -l <lang>", "Display language (zh-CN, en)").action(async (options) => {
-    await checkUpdates({ lang: options.lang });
-  });
-  cli.help((sections) => customizeHelp(sections));
-  cli.version(version);
-}
-async function handleDefaultCommand(lang, options) {
-  if (options.init) {
-    await init({
-      lang: lang || options.lang,
-      configLang: options.configLang,
-      force: options.force
-    });
-  } else {
-    await showMainMenu();
+async function resolveAndSwitchLanguage(lang, options, skipPrompt = false) {
+  const zcfConfig = await readZcfConfigAsync();
+  const targetLang = options?.allLang || lang || options?.lang || zcfConfig?.preferredLang || (skipPrompt ? "en" : await selectScriptLanguage());
+  if (i18n.isInitialized && i18n.language !== targetLang) {
+    await changeLanguage(targetLang);
   }
+  return targetLang;
 }
-async function handleInitCommand(options) {
-  await init({
-    lang: options.lang,
-    configLang: options.configLang,
-    aiOutputLang: options.aiOutputLang,
-    force: options.force,
-    skipPrompt: options.skipPrompt,
-    configAction: options.configAction,
-    apiType: options.apiType,
-    apiKey: options.apiKey,
-    apiUrl: options.apiUrl,
-    mcpServices: options.mcpServices,
-    workflows: options.workflows,
-    outputStyles: options.outputStyles,
-    defaultOutputStyle: options.defaultOutputStyle,
-    allLang: options.allLang,
-    installCometixLine: options.installCometixLine
-  });
+async function withLanguageResolution(action, skipPrompt = false) {
+  return async (...args) => {
+    const options = args[0];
+    const languageOptions = extractLanguageOptions(options);
+    await resolveAndSwitchLanguage(void 0, languageOptions, skipPrompt || languageOptions.skipPrompt);
+    return await action(...args);
+  };
 }
-async function handleUpdateCommand(options) {
-  await update({ configLang: options.configLang });
+function extractLanguageOptions(options) {
+  if (!options || typeof options !== "object" || options === null) {
+    return {};
+  }
+  const obj = options;
+  return {
+    lang: typeof obj.lang === "string" ? obj.lang : void 0,
+    allLang: typeof obj.allLang === "string" ? obj.allLang : void 0,
+    skipPrompt: typeof obj.skipPrompt === "boolean" ? obj.skipPrompt : void 0
+  };
 }
 function customizeHelp(sections) {
   sections.unshift({
@@ -1145,89 +1087,112 @@ function customizeHelp(sections) {
     body: ansis.cyan.bold(`ZCF - Zero-Config Claude-Code Flow v${version}`)
   });
   sections.push({
-    title: ansis.yellow("Commands / \u547D\u4EE4:"),
+    title: ansis.yellow(i18n.t("cli:help.commands")),
     body: [
-      `  ${ansis.cyan("zcf")}              Show interactive menu (default) / \u663E\u793A\u4EA4\u4E92\u5F0F\u83DC\u5355\uFF08\u9ED8\u8BA4\uFF09`,
+      `  ${ansis.cyan("zcf")}              ${i18n.t("cli:help.commandDescriptions.showInteractiveMenuDefault")}`,
       `  ${ansis.cyan("zcf init")} | ${ansis.cyan(
         "i"
-      )}     Initialize Claude Code configuration / \u521D\u59CB\u5316 Claude Code \u914D\u7F6E`,
-      `  ${ansis.cyan("zcf update")} | ${ansis.cyan("u")}   Update workflow-related md files / \u4EC5\u66F4\u65B0\u5DE5\u4F5C\u6D41\u76F8\u5173md`,
-      `  ${ansis.cyan("zcf ccr")}          Configure Claude Code Router for model proxy / \u914D\u7F6E\u6A21\u578B\u8DEF\u7531\u4EE3\u7406`,
-      `  ${ansis.cyan("zcf ccu")} [args]   Claude Code usage statistics analysis / Claude Code \u7528\u91CF\u7EDF\u8BA1\u5206\u6790`,
-      `  ${ansis.cyan("zcf check-updates")} Check and update to latest versions / \u68C0\u67E5\u5E76\u66F4\u65B0\u5230\u6700\u65B0\u7248\u672C`,
+      )}     ${i18n.t("cli:help.commandDescriptions.initClaudeCodeConfig")}`,
+      `  ${ansis.cyan("zcf update")} | ${ansis.cyan("u")}   ${i18n.t("cli:help.commandDescriptions.updateWorkflowFiles")}`,
+      `  ${ansis.cyan("zcf ccr")}          ${i18n.t("cli:help.commandDescriptions.configureCcrProxy")}`,
+      `  ${ansis.cyan("zcf ccu")} [args]   ${i18n.t("cli:help.commandDescriptions.claudeCodeUsageAnalysis")}`,
+      `  ${ansis.cyan("zcf check-updates")} ${i18n.t("cli:help.commandDescriptions.checkUpdateVersions")}`,
       "",
-      ansis.gray("  Shortcuts / \u5FEB\u6377\u65B9\u5F0F:"),
-      `  ${ansis.cyan("zcf i")}            Quick init / \u5FEB\u901F\u521D\u59CB\u5316`,
-      `  ${ansis.cyan("zcf u")}            Quick update / \u5FEB\u901F\u66F4\u65B0`,
-      `  ${ansis.cyan("zcf check")}        Quick check updates / \u5FEB\u901F\u68C0\u67E5\u66F4\u65B0`
+      ansis.gray(`  ${i18n.t("cli:help.shortcuts")}`),
+      `  ${ansis.cyan("zcf i")}            ${i18n.t("cli:help.shortcutDescriptions.quickInit")}`,
+      `  ${ansis.cyan("zcf u")}            ${i18n.t("cli:help.shortcutDescriptions.quickUpdate")}`,
+      `  ${ansis.cyan("zcf check")}        ${i18n.t("cli:help.shortcutDescriptions.quickCheckUpdates")}`
     ].join("\n")
   });
   sections.push({
-    title: ansis.yellow("Options / \u9009\u9879:"),
+    title: ansis.yellow(i18n.t("cli:help.options")),
     body: [
-      `  ${ansis.green("--init")}                    Run full initialization directly / \u76F4\u63A5\u8FD0\u884C\u5B8C\u6574\u521D\u59CB\u5316`,
-      `  ${ansis.green("--lang, -l")} <lang>         Display language / \u663E\u793A\u8BED\u8A00 (zh-CN, en)`,
-      `  ${ansis.green("--config-lang, -c")} <lang>  Configuration language / \u914D\u7F6E\u8BED\u8A00 (zh-CN, en)`,
-      `  ${ansis.green("--force, -f")}               Force overwrite / \u5F3A\u5236\u8986\u76D6\u73B0\u6709\u914D\u7F6E`,
-      `  ${ansis.green("--help, -h")}                Display help / \u663E\u793A\u5E2E\u52A9`,
-      `  ${ansis.green("--version, -v")}             Display version / \u663E\u793A\u7248\u672C`,
+      `  ${ansis.green("--lang, -l")} <lang>         ${i18n.t("cli:help.optionDescriptions.displayLanguage")} (zh-CN, en)`,
+      `  ${ansis.green("--config-lang, -c")} <lang>  ${i18n.t("cli:help.optionDescriptions.configurationLanguage")} (zh-CN, en)`,
+      `  ${ansis.green("--force, -f")}               ${i18n.t("cli:help.optionDescriptions.forceOverwrite")}`,
+      `  ${ansis.green("--help, -h")}                ${i18n.t("cli:help.optionDescriptions.displayHelp")}`,
+      `  ${ansis.green("--version, -v")}             ${i18n.t("cli:help.optionDescriptions.displayVersion")}`,
       "",
-      ansis.gray("  Non-interactive mode (for CI/CD) / \u975E\u4EA4\u4E92\u6A21\u5F0F\uFF08\u9002\u7528\u4E8ECI/CD\uFF09:"),
-      `  ${ansis.green("--skip-prompt, -s")}         Skip all prompts / \u8DF3\u8FC7\u6240\u6709\u4EA4\u4E92\u63D0\u793A`,
-      `  ${ansis.green("--api-type, -t")} <type>      API type / API\u7C7B\u578B (auth_token, api_key, ccr_proxy, skip)`,
-      `  ${ansis.green("--api-key, -k")} <key>       API key (for both types) / API\u5BC6\u94A5\uFF08\u9002\u7528\u4E8E\u6240\u6709\u7C7B\u578B\uFF09`,
-      `  ${ansis.green("--api-url, -u")} <url>       Custom API URL / \u81EA\u5B9A\u4E49API\u5730\u5740`,
-      `  ${ansis.green("--ai-output-lang, -a")} <lang> AI output language / AI\u8F93\u51FA\u8BED\u8A00`,
-      `  ${ansis.green("--all-lang, -g")} <lang>     Set all language params / \u7EDF\u4E00\u8BBE\u7F6E\u6240\u6709\u8BED\u8A00\u53C2\u6570`,
-      `  ${ansis.green("--config-action, -r")} <action> Config handling / \u914D\u7F6E\u5904\u7406 (default: backup)`,
-      `  ${ansis.green("--mcp-services, -m")} <list>  MCP services / MCP\u670D\u52A1 (default: all non-key services)`,
-      `  ${ansis.green("--workflows, -w")} <list>    Workflows / \u5DE5\u4F5C\u6D41 (default: all workflows)`,
-      `  ${ansis.green("--output-styles, -o")} <styles> Output styles / \u8F93\u51FA\u6837\u5F0F (default: all custom styles)`,
-      `  ${ansis.green("--default-output-style, -d")} <style> Default output style / \u9ED8\u8BA4\u8F93\u51FA\u6837\u5F0F (default: engineer-professional)`,
-      `  ${ansis.green("--install-cometix-line, -x")} <value> Install statusline tool / \u5B89\u88C5\u72B6\u6001\u680F\u5DE5\u5177 (default: true)`
+      ansis.gray(`  ${i18n.t("cli:help.nonInteractiveMode")}`),
+      `  ${ansis.green("--skip-prompt, -s")}         ${i18n.t("cli:help.optionDescriptions.skipAllPrompts")}`,
+      `  ${ansis.green("--api-type, -t")} <type>      ${i18n.t("cli:help.optionDescriptions.apiType")} (auth_token, api_key, ccr_proxy, skip)`,
+      `  ${ansis.green("--api-key, -k")} <key>       ${i18n.t("cli:help.optionDescriptions.apiKey")}`,
+      `  ${ansis.green("--api-url, -u")} <url>       ${i18n.t("cli:help.optionDescriptions.customApiUrl")}`,
+      `  ${ansis.green("--ai-output-lang, -a")} <lang> ${i18n.t("cli:help.optionDescriptions.aiOutputLanguage")}`,
+      `  ${ansis.green("--all-lang, -g")} <lang>     ${i18n.t("cli:help.optionDescriptions.setAllLanguageParams")}`,
+      `  ${ansis.green("--config-action, -r")} <action> ${i18n.t("cli:help.optionDescriptions.configHandling")} (default: backup)`,
+      `  ${ansis.green("--mcp-services, -m")} <list>  ${i18n.t("cli:help.optionDescriptions.mcpServices")} (default: all non-key services)`,
+      `  ${ansis.green("--workflows, -w")} <list>    ${i18n.t("cli:help.optionDescriptions.workflows")} (default: all workflows)`,
+      `  ${ansis.green("--output-styles, -o")} <styles> ${i18n.t("cli:help.optionDescriptions.outputStyles")} (default: all custom styles)`,
+      `  ${ansis.green("--default-output-style, -d")} <style> ${i18n.t("cli:help.optionDescriptions.defaultOutputStyle")} (default: engineer-professional)`,
+      `  ${ansis.green("--install-cometix-line, -x")} <value> ${i18n.t("cli:help.optionDescriptions.installStatuslineTool")} (default: true)`
     ].join("\n")
   });
   sections.push({
-    title: ansis.yellow("Examples / \u793A\u4F8B:"),
+    title: ansis.yellow(i18n.t("cli:help.examples")),
     body: [
-      ansis.gray("  # Show interactive menu / \u663E\u793A\u4EA4\u4E92\u5F0F\u83DC\u5355"),
+      ansis.gray(`  # ${i18n.t("cli:help.exampleDescriptions.showInteractiveMenu")}`),
       `  ${ansis.cyan("npx zcf")}`,
       "",
-      ansis.gray("  # Run full initialization / \u8FD0\u884C\u5B8C\u6574\u521D\u59CB\u5316"),
+      ansis.gray(`  # ${i18n.t("cli:help.exampleDescriptions.runFullInitialization")}`),
       `  ${ansis.cyan("npx zcf init")}`,
       `  ${ansis.cyan("npx zcf i")}`,
-      `  ${ansis.cyan("npx zcf --init")}`,
       "",
-      ansis.gray("  # Update workflow-related md files only / \u4EC5\u66F4\u65B0\u5DE5\u4F5C\u6D41\u76F8\u5173md\u6587\u4EF6"),
+      ansis.gray(`  # ${i18n.t("cli:help.exampleDescriptions.updateWorkflowFilesOnly")}`),
       `  ${ansis.cyan("npx zcf u")}`,
       "",
-      ansis.gray("  # Configure Claude Code Router / \u914D\u7F6E Claude Code Router"),
+      ansis.gray(`  # ${i18n.t("cli:help.exampleDescriptions.configureClaudeCodeRouter")}`),
       `  ${ansis.cyan("npx zcf ccr")}`,
       "",
-      ansis.gray("  # Run Claude Code usage analysis / \u8FD0\u884C Claude Code \u7528\u91CF\u5206\u6790"),
+      ansis.gray(`  # ${i18n.t("cli:help.exampleDescriptions.runClaudeCodeUsageAnalysis")}`),
       `  ${ansis.cyan("npx zcf ccu")}               ${ansis.gray("# Daily usage (default)")}`,
       `  ${ansis.cyan("npx zcf ccu monthly --json")}`,
       "",
-      ansis.gray("  # Check and update tools / \u68C0\u67E5\u5E76\u66F4\u65B0\u5DE5\u5177"),
+      ansis.gray(`  # ${i18n.t("cli:help.exampleDescriptions.checkAndUpdateTools")}`),
       `  ${ansis.cyan("npx zcf check-updates")}     ${ansis.gray("# Update Claude Code, CCR and CCometixLine")}`,
       `  ${ansis.cyan("npx zcf check")}`,
       "",
-      ansis.gray("  # Non-interactive mode (CI/CD) / \u975E\u4EA4\u4E92\u6A21\u5F0F\uFF08CI/CD\uFF09"),
+      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"')}`,
       `  ${ansis.cyan("npx zcf i --skip-prompt --api-type ccr_proxy")}`,
-      "",
-      ansis.gray("  # Force overwrite with Chinese config / \u5F3A\u5236\u4F7F\u7528\u4E2D\u6587\u914D\u7F6E\u8986\u76D6"),
-      `  ${ansis.cyan("npx zcf --init -c zh-CN -f")}`,
-      `  ${ansis.cyan("npx zcf --init --config-lang zh-CN --force")}`
+      ""
     ].join("\n")
   });
   return sections;
 }
+async function setupCommands(cli) {
+  try {
+    const zcfConfig = await readZcfConfigAsync();
+    const defaultLang = zcfConfig?.preferredLang || "en";
+    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").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), default: 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, default: all').option("--workflows, -w <workflows>", 'Comma-separated workflows to install (sixStepsWorkflow,featPlanUx,gitWorkflow,bmadWorkflow), "skip" to skip all, "all" for all workflows, default: 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, default: all').option("--default-output-style, -d <style>", "Default output style, default: engineer-professional").option("--all-lang, -g <lang>", "Set all language parameters to this value").option("--install-cometix-line, -x <value>", "Install CCometixLine statusline tool (true/false), default: true").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) => {
+    await update(options);
+  }));
+  cli.command("ccr", "Configure Claude Code Router for model proxy").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 ccr();
+  }));
+  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("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.help((sections) => customizeHelp(sections));
+  cli.version(version);
+}
 
 async function main() {
   const cli = cac("zcf");
-  setupCommands(cli);
+  await setupCommands(cli);
   cli.parse();
 }
 main().catch(console.error);