zcf 3.1.2 → 3.1.4

package/dist/chunks/simple-config.mjs

@@ -16,7 +16,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.1.2";
+const version = "3.1.4";
 const homepage = "https://github.com/UfoMiao/zcf";
 
 const i18n = i18next.createInstance();
@@ -543,11 +543,15 @@ function getMcpCommand() {
   return ["npx"];
 }
 function getSystemRoot() {
-  if (isWindows()) {
-    const systemRoot = process.env.SYSTEMROOT || process.env.SystemRoot || "C:Windows";
-    return systemRoot.replace(/\\/g, "\\\\");
-  }
-  return null;
+  if (!isWindows())
+    return null;
+  const env = process.env;
+  let systemRoot = "C:\\Windows";
+  if (Object.prototype.hasOwnProperty.call(env, "SYSTEMROOT") && env.SYSTEMROOT)
+    systemRoot = env.SYSTEMROOT;
+  else if (Object.prototype.hasOwnProperty.call(env, "SystemRoot") && env.SystemRoot)
+    systemRoot = env.SystemRoot;
+  return systemRoot.replace(/\\+/g, "/").replace(/\/+/g, "/");
 }
 async function commandExists(command) {
   try {
@@ -2494,12 +2498,15 @@ async function selectScriptLanguage(currentLang) {
   });
   return scriptLang;
 }
-async function resolveAiOutputLanguage(scriptLang, commandLineOption, savedConfig) {
+async function resolveAiOutputLanguage(scriptLang, commandLineOption, savedConfig, skipPrompt) {
   ensureI18nInitialized();
   if (commandLineOption) {
     return commandLineOption;
   }
   if (savedConfig?.aiOutputLang) {
+    if (skipPrompt) {
+      return savedConfig.aiOutputLang;
+    }
     const currentLanguageLabel = getAiOutputLanguageLabel(savedConfig.aiOutputLang) || savedConfig.aiOutputLang;
     console.log(ansis.blue(`${i18n.t("language:currentConfigFound")}: ${currentLanguageLabel}`));
     const { shouldModify } = await inquirer.prompt({
@@ -2518,6 +2525,9 @@ async function resolveAiOutputLanguage(scriptLang, commandLineOption, savedConfi
     }
     return await selectAiOutputLanguage(scriptLang);
   }
+  if (skipPrompt) {
+    return scriptLang;
+  }
   return await selectAiOutputLanguage(scriptLang);
 }
 async function selectTemplateLanguage() {
@@ -2543,12 +2553,15 @@ async function selectTemplateLanguage() {
   }
   return lang;
 }
-async function resolveTemplateLanguage(commandLineOption, savedConfig) {
+async function resolveTemplateLanguage(commandLineOption, savedConfig, skipPrompt) {
   ensureI18nInitialized();
   if (commandLineOption) {
     return commandLineOption;
   }
   if (savedConfig?.templateLang) {
+    if (skipPrompt) {
+      return savedConfig.templateLang;
+    }
     const currentLanguageLabel = LANG_LABELS[savedConfig.templateLang];
     console.log(ansis.blue(`${i18n.t("language:currentTemplateLanguageFound")}: ${currentLanguageLabel}`));
     const { shouldModify } = await inquirer.prompt({
@@ -2568,6 +2581,9 @@ async function resolveTemplateLanguage(commandLineOption, savedConfig) {
     return await selectTemplateLanguage();
   }
   if (savedConfig?.preferredLang && !savedConfig?.templateLang) {
+    if (skipPrompt) {
+      return savedConfig.preferredLang;
+    }
     console.log(ansis.yellow(`${i18n.t("language:usingFallbackTemplate")}: ${LANG_LABELS[savedConfig.preferredLang]}`));
     const { shouldModify } = await inquirer.prompt({
       type: "confirm",
@@ -2584,9 +2600,12 @@ async function resolveTemplateLanguage(commandLineOption, savedConfig) {
     }
     return await selectTemplateLanguage();
   }
+  if (skipPrompt) {
+    return "en";
+  }
   return await selectTemplateLanguage();
 }
-async function resolveSystemPromptStyle(availablePrompts, commandLineOption, savedConfig) {
+async function resolveSystemPromptStyle(availablePrompts, commandLineOption, savedConfig, skipPrompt) {
   ensureI18nInitialized();
   if (commandLineOption && availablePrompts.some((p) => p.id === commandLineOption)) {
     return commandLineOption;
@@ -2595,6 +2614,9 @@ async function resolveSystemPromptStyle(availablePrompts, commandLineOption, sav
     const currentStyleId = savedConfig.codex.systemPromptStyle;
     const currentStyle = availablePrompts.find((p) => p.id === currentStyleId);
     if (currentStyle) {
+      if (skipPrompt) {
+        return currentStyleId;
+      }
       console.log(ansis.blue(`${i18n.t("language:currentSystemPromptFound")}: ${currentStyle.name}`));
       const { shouldModify } = await inquirer.prompt({
         type: "confirm",
@@ -2612,6 +2634,9 @@ async function resolveSystemPromptStyle(availablePrompts, commandLineOption, sav
       }
     }
   }
+  if (skipPrompt) {
+    return "engineer-professional";
+  }
   const { systemPrompt } = await inquirer.prompt([{
     type: "list",
     name: "systemPrompt",
@@ -2807,7 +2832,10 @@ function parseCodexConfig(content) {
     };
   }
   try {
-    const tomlData = parse(content);
+    const normalizedContent = content.replace(/(SYSTEMROOT\s*=\s*")[^"\n]+("?)/g, (match) => {
+      return match.replace(/\\\\/g, "/").replace(/\\/g, "/").replace('C:/Windows"?', 'C:/Windows"');
+    });
+    const tomlData = parse(normalizedContent);
     const providers = [];
     if (tomlData.model_providers) {
       for (const [id, providerData] of Object.entries(tomlData.model_providers)) {
@@ -2876,21 +2904,30 @@ function parseCodexConfig(content) {
     const otherConfig = [];
     const lines = content.split("\n");
     let skipCurrentSection = false;
-    let currentSection = "";
     for (const line of lines) {
-      const trimmedLine = line.trim();
-      if (trimmedLine.includes("--- model provider added by ZCF ---") || trimmedLine.includes("--- MCP servers added by ZCF ---") || trimmedLine.includes("Managed by ZCF")) {
+      const trimmed = line.trim();
+      if (!trimmed)
         continue;
-      }
-      const sectionMatch = trimmedLine.match(/^\[([^\]]+)\]/);
-      if (sectionMatch) {
-        currentSection = sectionMatch[1];
-        skipCurrentSection = currentSection.startsWith("model_providers.") || currentSection.startsWith("mcp_servers.");
-      }
-      if (!skipCurrentSection && (trimmedLine.startsWith("model_provider") || trimmedLine.startsWith("# model_provider") || /^model\s*=/.test(trimmedLine))) {
+      if (/^#\s*---\s*model provider added by ZCF\s*---\s*$/i.test(trimmed))
+        continue;
+      if (/^#\s*---\s*MCP servers added by ZCF\s*---\s*$/i.test(trimmed))
+        continue;
+      if (/Managed by ZCF/i.test(trimmed))
+        continue;
+      const sec = trimmed.match(/^\[([^\]]+)\]/);
+      if (sec) {
+        const name = sec[1];
+        skipCurrentSection = name.startsWith("model_providers.") || name.startsWith("mcp_servers.");
+        if (skipCurrentSection)
+          continue;
+        otherConfig.push(line);
         continue;
       }
-      if (!skipCurrentSection && trimmedLine) {
+      if (/^#?\s*model_provider\s*=/.test(trimmed))
+        continue;
+      if (/^model\s*=/.test(trimmed))
+        continue;
+      if (!skipCurrentSection) {
         otherConfig.push(line);
       }
     }
@@ -2906,13 +2943,15 @@ function parseCodexConfig(content) {
     };
   } catch (error) {
     console.warn("TOML parsing failed, falling back to basic parsing:", error);
+    const cleaned = content.replace(/^\s*#\s*---\s*model provider added by ZCF\s*---\s*$/gim, "").replace(/^\s*#\s*---\s*MCP servers added by ZCF\s*---\s*$/gim, "").replace(/^\[model_providers\.[^\]]+\][\s\S]*?(?=^\[|$)/gim, "").replace(/^\[mcp_servers\.[^\]]+\][\s\S]*?(?=^\[|$)/gim, "").replace(/^\s*(?:#\s*)?model_provider\s*=.*$/gim, "").replace(/^\s*model\s*=.*$/gim, "").replace(/\n{3,}/g, "\n\n");
+    const otherConfig = cleaned.split("\n").map((l) => l.replace(/\s+$/g, "")).filter((l) => l.trim().length > 0);
     return {
       model: null,
       modelProvider: null,
       providers: [],
       mcpServices: [],
       managed: false,
-      otherConfig: content.split("\n"),
+      otherConfig,
       modelProviderCommented: void 0
     };
   }
@@ -2941,9 +2980,29 @@ function renderCodexConfig(data) {
     lines.push("");
   }
   if (data.otherConfig && data.otherConfig.length > 0) {
-    lines.push(...data.otherConfig);
-    if (data.providers.length > 0 || data.mcpServices.length > 0) {
-      lines.push("");
+    const preserved = data.otherConfig.filter((raw) => {
+      const l = String(raw).trim();
+      if (!l)
+        return false;
+      if (/^#\s*---\s*model provider added by ZCF\s*---\s*$/i.test(l))
+        return false;
+      if (/^#\s*---\s*MCP servers added by ZCF\s*---\s*$/i.test(l))
+        return false;
+      if (/^\[\s*mcp_servers\./i.test(l))
+        return false;
+      if (/^\[\s*model_providers\./i.test(l))
+        return false;
+      if (/^#?\s*model_provider\s*=/.test(l))
+        return false;
+      if (/^\s*model\s*=/.test(l))
+        return false;
+      return true;
+    });
+    if (preserved.length > 0) {
+      lines.push(...preserved);
+      if (data.providers.length > 0 || data.mcpServices.length > 0) {
+        lines.push("");
+      }
     }
   }
   if (data.providers.length > 0) {
@@ -3086,21 +3145,22 @@ async function runCodexWorkflowImport() {
 async function runCodexWorkflowImportWithLanguageSelection(options) {
   ensureI18nInitialized();
   const zcfConfig = readZcfConfig();
-  const { aiOutputLang: commandLineOption, skipPrompt } = options ?? {};
-  const aiOutputLang = skipPrompt ? commandLineOption || zcfConfig?.aiOutputLang || "en" : await resolveAiOutputLanguage(
+  const { aiOutputLang: commandLineOption, skipPrompt = false } = options ?? {};
+  const aiOutputLang = await resolveAiOutputLanguage(
     i18n.language,
     commandLineOption,
-    zcfConfig
+    zcfConfig,
+    skipPrompt
   );
   updateZcfConfig({ aiOutputLang });
   applyAiLanguageDirective(aiOutputLang);
-  await runCodexSystemPromptSelection();
+  await runCodexSystemPromptSelection(skipPrompt);
   ensureCodexAgentsLanguageDirective(aiOutputLang);
-  await runCodexWorkflowSelection();
+  await runCodexWorkflowSelection(options);
   console.log(ansis.green(i18n.t("codex:workflowInstall")));
   return aiOutputLang;
 }
-async function runCodexSystemPromptSelection() {
+async function runCodexSystemPromptSelection(skipPrompt = false) {
   ensureI18nInitialized();
   const rootDir = getRootDir$1();
   const templateRoot = join(rootDir, "templates", "codex");
@@ -3111,7 +3171,9 @@ async function runCodexSystemPromptSelection() {
   const preferredLang = await resolveTemplateLanguage(
     void 0,
     // No command line option for this function
-    zcfConfig$1
+    zcfConfig$1,
+    skipPrompt
+    // Pass skipPrompt flag
   );
   updateZcfConfig({ templateLang: preferredLang });
   let langDir = join(templateRoot, preferredLang);
@@ -3149,7 +3211,9 @@ async function runCodexSystemPromptSelection() {
     availablePrompts,
     void 0,
     // No command line option for this function
-    tomlConfig
+    tomlConfig,
+    skipPrompt
+    // Pass skipPrompt flag
   );
   if (!systemPrompt)
     return;
@@ -3173,8 +3237,9 @@ async function runCodexSystemPromptSelection() {
     console.error("Failed to update ZCF config:", error);
   }
 }
-async function runCodexWorkflowSelection() {
+async function runCodexWorkflowSelection(options) {
   ensureI18nInitialized();
+  const { skipPrompt = false, workflows: presetWorkflows = [] } = options ?? {};
   const rootDir = getRootDir$1();
   const templateRoot = join(rootDir, "templates", "codex");
   const zcfConfig = readZcfConfig();
@@ -3189,6 +3254,29 @@ async function runCodexWorkflowSelection() {
   const allWorkflows = getAllWorkflowFiles(workflowSrc);
   if (allWorkflows.length === 0)
     return;
+  if (skipPrompt) {
+    ensureDir(CODEX_PROMPTS_DIR);
+    const backupPath2 = backupCodexPrompts();
+    if (backupPath2) {
+      console.log(ansis.gray(getBackupMessage(backupPath2)));
+    }
+    let workflowsToInstall;
+    if (presetWorkflows.length > 0) {
+      const selectedWorkflows = allWorkflows.filter(
+        (workflow) => presetWorkflows.includes(workflow.name)
+      );
+      workflowsToInstall = expandSelectedWorkflowPaths(selectedWorkflows.map((w) => w.path), workflowSrc);
+    } else {
+      workflowsToInstall = expandSelectedWorkflowPaths(allWorkflows.map((w) => w.path), workflowSrc);
+    }
+    for (const workflowPath of workflowsToInstall) {
+      const content = readFile(workflowPath);
+      const filename = workflowPath.split("/").pop() || "workflow.md";
+      const targetPath = join(CODEX_PROMPTS_DIR, filename);
+      writeFile(targetPath, content);
+    }
+    return;
+  }
   const { workflows } = await inquirer.prompt([{
     type: "checkbox",
     name: "workflows",
@@ -3207,13 +3295,15 @@ async function runCodexWorkflowSelection() {
   if (backupPath) {
     console.log(ansis.gray(getBackupMessage(backupPath)));
   }
-  for (const workflowPath of workflows) {
+  const finalWorkflowPaths = expandSelectedWorkflowPaths(workflows, workflowSrc);
+  for (const workflowPath of finalWorkflowPaths) {
     const content = readFile(workflowPath);
     const filename = workflowPath.split("/").pop() || "workflow.md";
     const targetPath = join(CODEX_PROMPTS_DIR, filename);
     writeFile(targetPath, content);
   }
 }
+const GIT_GROUP_SENTINEL = "::gitGroup";
 function getAllWorkflowFiles(dirPath) {
   const workflows = [];
   const sixStepDir = join(dirPath, "sixStep", "prompts");
@@ -3226,8 +3316,43 @@ function getAllWorkflowFiles(dirPath) {
       });
     }
   }
+  const gitPromptsDir = join(dirPath, "git", "prompts");
+  if (exists(gitPromptsDir)) {
+    workflows.push({
+      name: i18n.t("workflow:workflowOption.gitWorkflow"),
+      // Use sentinel path for grouped selection; expanded later
+      path: GIT_GROUP_SENTINEL
+    });
+  }
   return workflows;
 }
+function expandSelectedWorkflowPaths(paths, workflowSrc) {
+  const expanded = [];
+  for (const p of paths) {
+    if (p === GIT_GROUP_SENTINEL) {
+      expanded.push(...getGitPromptFiles(workflowSrc));
+    } else {
+      expanded.push(p);
+    }
+  }
+  return expanded;
+}
+function getGitPromptFiles(workflowSrc) {
+  const gitDir = join(workflowSrc, "git", "prompts");
+  const files = [
+    "git-commit.md",
+    "git-rollback.md",
+    "git-cleanBranches.md",
+    "git-worktree.md"
+  ];
+  const resolved = [];
+  for (const f of files) {
+    const full = join(gitDir, f);
+    if (exists(full))
+      resolved.push(full);
+  }
+  return resolved;
+}
 function toProvidersList(providers) {
   return providers.map((provider) => ({ name: provider.name || provider.id, value: provider.id }));
 }
@@ -3247,10 +3372,59 @@ function createApiConfigChoices(providers, currentProvider, isCommented) {
   });
   return choices;
 }
-async function configureCodexApi() {
+async function applyCustomApiConfig(customApiConfig) {
+  const { type, token, baseUrl } = customApiConfig;
+  const backupPath = backupCodexComplete();
+  if (backupPath) {
+    console.log(ansis.gray(getBackupMessage(backupPath)));
+  }
+  const providers = [];
+  const authEntries = {};
+  const providerId = type === "auth_token" ? "official-auth-token" : "custom-api-key";
+  const providerName = type === "auth_token" ? "Official Auth Token" : "Custom API Key";
+  providers.push({
+    id: providerId,
+    name: providerName,
+    baseUrl: baseUrl || "https://api.anthropic.com",
+    wireApi: "claude",
+    envKey: `${providerId.toUpperCase()}_API_KEY`,
+    requiresOpenaiAuth: false
+  });
+  if (token) {
+    authEntries[providerId] = token;
+  }
+  const configData = {
+    model: "claude-3-5-sonnet-20241022",
+    modelProvider: providerId,
+    modelProviderCommented: false,
+    providers,
+    mcpServices: []};
+  writeFile(CODEX_CONFIG_FILE, renderCodexConfig(configData));
+  writeJsonConfig(CODEX_AUTH_FILE, authEntries);
+  updateZcfConfig({ codeToolType: "codex" });
+  console.log(ansis.green(`\u2714 ${i18n.t("codex:apiConfigured")}`));
+}
+async function configureCodexApi(options) {
   ensureI18nInitialized();
+  const { skipPrompt = false, apiMode, customApiConfig } = options ?? {};
   const existingConfig = readCodexConfig();
   const existingAuth = readJsonConfig(CODEX_AUTH_FILE, { defaultValue: {} }) || {};
+  if (skipPrompt) {
+    if (apiMode === "skip") {
+      return;
+    }
+    if (apiMode === "custom" && customApiConfig) {
+      await applyCustomApiConfig(customApiConfig);
+      return;
+    }
+    if (apiMode === "official") {
+      const success = await switchToOfficialLogin();
+      if (success) {
+        updateZcfConfig({ codeToolType: "codex" });
+      }
+      return;
+    }
+  }
   const hasProviders = existingConfig?.providers && existingConfig.providers.length > 0;
   const modeChoices = [
     { name: i18n.t("codex:apiModeOfficial"), value: "official" },
@@ -3439,9 +3613,13 @@ async function configureCodexApi() {
   updateZcfConfig({ codeToolType: "codex" });
   console.log(ansis.green(i18n.t("codex:apiConfigured")));
 }
-async function configureCodexMcp() {
+async function configureCodexMcp(options) {
   ensureI18nInitialized();
+  const { skipPrompt = false } = options ?? {};
   const existingConfig = readCodexConfig();
+  if (skipPrompt) {
+    return;
+  }
   const backupPath = backupCodexComplete();
   if (backupPath) {
     console.log(ansis.gray(getBackupMessage(backupPath)));
@@ -3452,14 +3630,29 @@ async function configureCodexMcp() {
   const servicesMeta = await getMcpServices();
   const baseProviders = existingConfig?.providers || [];
   const selection = [];
-  const existingMap = new Map((existingConfig?.mcpServices || []).map((service) => [service.id, service]));
+  const existingServices = existingConfig?.mcpServices || [];
   if (selectedIds.length === 0) {
     console.log(ansis.yellow(i18n.t("codex:noMcpConfigured")));
+    const preserved = (existingServices || []).map((svc) => {
+      if (isWindows()) {
+        const systemRoot = getSystemRoot();
+        if (systemRoot) {
+          return {
+            ...svc,
+            env: {
+              ...svc.env || {},
+              SYSTEMROOT: systemRoot
+            }
+          };
+        }
+      }
+      return svc;
+    });
     writeCodexConfig({
       model: existingConfig?.model || null,
       modelProvider: existingConfig?.modelProvider || null,
       providers: baseProviders,
-      mcpServices: Array.from(existingMap.values()),
+      mcpServices: preserved,
       otherConfig: existingConfig?.otherConfig || []
     });
     updateZcfConfig({ codeToolType: "codex" });
@@ -3504,15 +3697,33 @@ async function configureCodexMcp() {
       startup_timeout_ms: configInfo.config.startup_timeout_ms
     });
   }
-  const selectionMap = new Map(selection.map((service) => [service.id, service]));
-  const mergedMap = new Map(existingMap);
-  for (const service of selectionMap.values())
-    mergedMap.set(service.id, service);
+  const mergedMap = /* @__PURE__ */ new Map();
+  for (const svc of existingServices) {
+    mergedMap.set(svc.id.toLowerCase(), { ...svc });
+  }
+  for (const svc of selection) {
+    mergedMap.set(svc.id.toLowerCase(), { ...svc });
+  }
+  const finalServices = Array.from(mergedMap.values()).map((svc) => {
+    if (isWindows()) {
+      const systemRoot = getSystemRoot();
+      if (systemRoot) {
+        return {
+          ...svc,
+          env: {
+            ...svc.env || {},
+            SYSTEMROOT: systemRoot
+          }
+        };
+      }
+    }
+    return svc;
+  });
   writeCodexConfig({
     model: existingConfig?.model || null,
     modelProvider: existingConfig?.modelProvider || null,
     providers: baseProviders,
-    mcpServices: Array.from(mergedMap.values()),
+    mcpServices: finalServices,
     otherConfig: existingConfig?.otherConfig || []
   });
   updateZcfConfig({ codeToolType: "codex" });
@@ -3522,8 +3733,8 @@ async function runCodexFullInit(options) {
   ensureI18nInitialized();
   await installCodexCli();
   const aiOutputLang = await runCodexWorkflowImportWithLanguageSelection(options);
-  await configureCodexApi();
-  await configureCodexMcp();
+  await configureCodexApi(options);
+  await configureCodexMcp(options);
   return aiOutputLang;
 }
 function ensureCodexAgentsLanguageDirective(aiOutputLang) {
@@ -3563,7 +3774,10 @@ function normalizeLanguageLabel(label) {
 }
 async function runCodexUpdate(force = false, skipPrompt = false) {
   ensureI18nInitialized();
-  const spinner = ora(i18n.t("codex:checkingVersion")).start();
+  console.log(ansis.bold.cyan(`
+\u{1F50D} ${i18n.t("updater:checkingTools")}
+`));
+  const spinner = ora(i18n.t("updater:checkingVersion")).start();
   try {
     const { installed, currentVersion, latestVersion, needsUpdate } = await checkCodexUpdate();
     spinner.stop();
@@ -3826,6 +4040,43 @@ const codex = {
   writeCodexConfig: writeCodexConfig
 };
 
+const CODE_TYPE_ABBREVIATIONS = {
+  cc: "claude-code",
+  cx: "codex"
+};
+async function resolveCodeType(codeTypeParam) {
+  if (codeTypeParam) {
+    const normalizedParam = codeTypeParam.toLowerCase().trim();
+    if (normalizedParam in CODE_TYPE_ABBREVIATIONS) {
+      return CODE_TYPE_ABBREVIATIONS[normalizedParam];
+    }
+    if (isValidCodeType(normalizedParam)) {
+      return normalizedParam;
+    }
+    const validAbbreviations = Object.keys(CODE_TYPE_ABBREVIATIONS);
+    const validFullTypes = Object.values(CODE_TYPE_ABBREVIATIONS);
+    const validOptions = [...validAbbreviations, ...validFullTypes].join(", ");
+    throw new Error(
+      i18n.t(
+        "errors:invalidCodeType",
+        `Invalid code type: "${codeTypeParam}". Valid options are: ${validOptions}.`,
+        { value: codeTypeParam, validOptions }
+      )
+    );
+  }
+  try {
+    const config = await readZcfConfigAsync();
+    if (config?.codeToolType && isValidCodeType(config.codeToolType)) {
+      return config.codeToolType;
+    }
+  } catch {
+  }
+  return DEFAULT_CODE_TOOL_TYPE;
+}
+function isValidCodeType(value) {
+  return ["claude-code", "codex"].includes(value);
+}
+
 function getPlatformStatusLineConfig() {
   return {
     type: "command",
@@ -4722,12 +4973,6 @@ function validateSkipPromptOptions(options) {
   if (!options.configAction) {
     options.configAction = "backup";
   }
-  if (!options.configLang) {
-    options.configLang = "en";
-  }
-  if (!options.aiOutputLang) {
-    options.aiOutputLang = "en";
-  }
   if (typeof options.outputStyles === "string") {
     if (options.outputStyles === "skip") {
       options.outputStyles = false;
@@ -4822,22 +5067,20 @@ function validateSkipPromptOptions(options) {
     options.workflows = WORKFLOW_CONFIG_BASE.map((w) => w.id);
   }
 }
-function resolveCodeToolType(optionValue, savedValue) {
-  if (isCodeToolType(optionValue)) {
-    return optionValue;
-  }
-  if (savedValue && isCodeToolType(savedValue)) {
-    return savedValue;
-  }
-  return DEFAULT_CODE_TOOL_TYPE;
-}
 async function init(options = {}) {
   if (options.skipPrompt) {
     validateSkipPromptOptions(options);
   }
   try {
     const zcfConfig = readZcfConfig();
-    const codeToolType = resolveCodeToolType(options.codeType, zcfConfig?.codeToolType);
+    let codeToolType;
+    try {
+      codeToolType = await resolveCodeType(options.codeType);
+    } catch (error) {
+      const errorMessage = error instanceof Error ? error.message : String(error);
+      console.error(ansis.red(`${i18n.t("errors:generalError")} ${errorMessage}`));
+      codeToolType = DEFAULT_CODE_TOOL_TYPE;
+    }
     options.codeType = codeToolType;
     async function selectApiConfigurationMode() {
       const { apiMode } = await inquirer.prompt({
@@ -4931,23 +5174,39 @@ async function init(options = {}) {
         }
       }
     } else {
-      if (!configLang && !options.skipPrompt) {
+      if (!configLang) {
         const { resolveTemplateLanguage } = await Promise.resolve().then(function () { return prompts; });
         configLang = await resolveTemplateLanguage(
           options.configLang,
-          zcfConfig
+          zcfConfig,
+          options.skipPrompt
         );
-      } else if (!configLang && options.skipPrompt) {
-        configLang = "en";
       }
     }
     if (!configLang) {
       configLang = "en";
     }
     if (codeToolType === "codex") {
+      const apiMode = options.apiType === "auth_token" ? "official" : options.apiType === "api_key" ? "custom" : options.apiType === "skip" ? "skip" : options.skipPrompt ? "skip" : void 0;
+      const customApiConfig = options.apiType === "api_key" && options.apiKey ? {
+        type: "api_key",
+        token: options.apiKey,
+        baseUrl: options.apiUrl
+      } : void 0;
+      let selectedWorkflows;
+      if (Array.isArray(options.workflows)) {
+        selectedWorkflows = options.workflows;
+      } else if (typeof options.workflows === "string") {
+        selectedWorkflows = [options.workflows];
+      } else if (options.workflows === true) {
+        selectedWorkflows = [];
+      }
       const resolvedAiOutputLang = await runCodexFullInit({
         aiOutputLang: options.aiOutputLang,
-        skipPrompt: options.skipPrompt
+        skipPrompt: options.skipPrompt,
+        apiMode,
+        customApiConfig,
+        workflows: selectedWorkflows
       });
       updateZcfConfig({
         version,
@@ -4961,7 +5220,7 @@ async function init(options = {}) {
       console.log(ansis.green(i18n.t("codex:setupComplete")));
       return;
     }
-    const aiOutputLang = options.skipPrompt ? options.aiOutputLang || "en" : await resolveAiOutputLanguage(i18n.language, options.aiOutputLang, zcfConfig);
+    const aiOutputLang = await resolveAiOutputLanguage(i18n.language, options.aiOutputLang, zcfConfig, options.skipPrompt);
     const installationStatus = await getInstallationStatus();
     if (installationStatus.hasGlobal || installationStatus.hasLocal) {
       if (!options.skipPrompt) {
@@ -5363,4 +5622,4 @@ async function openSettingsJson() {
   }
 }
 
-export { removeLocalClaudeCode as $, AI_OUTPUT_LANGUAGES as A, ensureApiKeyApproved as B, CLAUDE_DIR as C, DEFAULT_CODE_TOOL_TYPE as D, removeApiKeyFromRejected as E, manageApiKeyApproval as F, setPrimaryApiKey as G, ensureClaudeDir as H, backupExistingConfig as I, copyConfigFiles as J, configureApi as K, LEGACY_ZCF_CONFIG_FILES as L, mergeConfigs as M, updateCustomModel as N, updateDefaultModel as O, mergeSettingsFile as P, getExistingModelConfig as Q, getExistingApiConfig as R, SETTINGS_FILE as S, applyAiLanguageDirective as T, switchToOfficialLogin$1 as U, promptApiConfigurationAction as V, isClaudeCodeInstalled as W, installClaudeCode as X, isLocalClaudeCodeInstalled as Y, ZCF_CONFIG_DIR as Z, getInstallationStatus as _, commandExists as a, i18n as a0, readCodexConfig as a1, backupCodexComplete as a2, writeCodexConfig as a3, writeAuthFile as a4, ensureI18nInitialized as a5, detectConfigManagementMode as a6, addNumbersToChoices as a7, readCcrConfig as a8, isCcrInstalled as a9, selectAndInstallWorkflows as aA, checkClaudeCodeVersionAndPrompt as aB, displayBannerWithInfo as aC, runCodexUninstall as aD, configureCodexMcp as aE, configureCodexApi as aF, runCodexWorkflowImport as aG, runCodexFullInit as aH, listCodexProviders as aI, getCurrentCodexProvider as aJ, switchCodexProvider as aK, switchToOfficialLogin as aL, switchToProvider as aM, readZcfConfigAsync as aN, initI18n as aO, selectScriptLanguage as aP, fsOperations as aQ, prompts as aR, codex as aS, installCcr as aa, configureCcrFeature as ab, handleExitPromptError as ac, handleGeneralError as ad, updateZcfConfig as ae, changeLanguage as af, readZcfConfig as ag, configureOutputStyle as ah, isWindows as ai, selectMcpServices as aj, getMcpServices as ak, setupCcrConfiguration as al, modifyApiConfigPartially as am, validateApiKey as an, formatApiKeyDisplay as ao, COMETIX_COMMAND_NAME as ap, COMETIX_COMMANDS as aq, installCometixLine as ar, checkAndUpdateTools as as, readJsonConfig as at, writeJsonConfig as au, displayBanner as av, runCodexUpdate as aw, version as ax, resolveAiOutputLanguage as ay, updatePromptOnly as az, importRecommendedEnv as b, 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, ZCF_CONFIG_FILE as j, CODE_TOOL_TYPES as k, CODE_TOOL_BANNERS as l, mergeAndCleanPermissions as m, isCodeToolType as n, openSettingsJson as o, SUPPORTED_LANGS as p, LANG_LABELS as q, getAiOutputLanguageLabel as r, getMcpConfigPath as s, readMcpConfig as t, backupMcpConfig as u, mergeMcpServers as v, writeMcpConfig as w, buildMcpServerConfig as x, fixWindowsMcpConfig as y, addCompletedOnboarding as z };
+export { removeLocalClaudeCode as $, AI_OUTPUT_LANGUAGES as A, ensureApiKeyApproved as B, CLAUDE_DIR as C, DEFAULT_CODE_TOOL_TYPE as D, removeApiKeyFromRejected as E, manageApiKeyApproval as F, setPrimaryApiKey as G, ensureClaudeDir as H, backupExistingConfig as I, copyConfigFiles as J, configureApi as K, LEGACY_ZCF_CONFIG_FILES as L, mergeConfigs as M, updateCustomModel as N, updateDefaultModel as O, mergeSettingsFile as P, getExistingModelConfig as Q, getExistingApiConfig as R, SETTINGS_FILE as S, applyAiLanguageDirective as T, switchToOfficialLogin$1 as U, promptApiConfigurationAction as V, isClaudeCodeInstalled as W, installClaudeCode as X, isLocalClaudeCodeInstalled as Y, ZCF_CONFIG_DIR as Z, getInstallationStatus as _, commandExists as a, i18n as a0, readCodexConfig as a1, backupCodexComplete as a2, writeCodexConfig as a3, writeAuthFile as a4, ensureI18nInitialized as a5, detectConfigManagementMode as a6, addNumbersToChoices as a7, readCcrConfig as a8, isCcrInstalled as a9, updatePromptOnly as aA, selectAndInstallWorkflows as aB, checkClaudeCodeVersionAndPrompt as aC, displayBannerWithInfo as aD, runCodexUninstall as aE, configureCodexMcp as aF, configureCodexApi as aG, runCodexWorkflowImport as aH, runCodexFullInit as aI, listCodexProviders as aJ, getCurrentCodexProvider as aK, switchCodexProvider as aL, switchToOfficialLogin as aM, switchToProvider as aN, readZcfConfigAsync as aO, initI18n as aP, selectScriptLanguage as aQ, fsOperations as aR, prompts as aS, codex as aT, installCcr as aa, configureCcrFeature as ab, handleExitPromptError as ac, handleGeneralError as ad, updateZcfConfig as ae, changeLanguage as af, readZcfConfig as ag, configureOutputStyle as ah, isWindows as ai, selectMcpServices as aj, getMcpServices as ak, setupCcrConfiguration as al, modifyApiConfigPartially as am, validateApiKey as an, formatApiKeyDisplay as ao, COMETIX_COMMAND_NAME as ap, COMETIX_COMMANDS as aq, installCometixLine as ar, checkAndUpdateTools as as, runCodexUpdate as at, resolveCodeType as au, readJsonConfig as av, writeJsonConfig as aw, displayBanner as ax, version as ay, resolveAiOutputLanguage as az, importRecommendedEnv as b, 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, ZCF_CONFIG_FILE as j, CODE_TOOL_TYPES as k, CODE_TOOL_BANNERS as l, mergeAndCleanPermissions as m, isCodeToolType as n, openSettingsJson as o, SUPPORTED_LANGS as p, LANG_LABELS as q, getAiOutputLanguageLabel as r, getMcpConfigPath as s, readMcpConfig as t, backupMcpConfig as u, mergeMcpServers as v, writeMcpConfig as w, buildMcpServerConfig as x, fixWindowsMcpConfig as y, addCompletedOnboarding as z };