zcf 3.2.3 → 3.3.0

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.2.3";
+const version = "3.3.0";
 const homepage = "https://github.com/UfoMiao/zcf";
 
 const i18n = i18next.createInstance();
@@ -3032,7 +3032,7 @@ function sanitizeProviderName(input) {
   const cleaned = input.trim();
   if (!cleaned)
     return "";
-  return cleaned.replace(/[^\w.-]/g, "");
+  return cleaned.toLowerCase().replace(/\./g, "-").replace(/\s+/g, "-").replace(/[^a-z0-9\-]/g, "");
 }
 function parseCodexConfig(content) {
   if (!content.trim()) {
@@ -3061,7 +3061,9 @@ function parseCodexConfig(content) {
           baseUrl: provider.base_url || "",
           wireApi: provider.wire_api || "responses",
           envKey: provider.env_key || "OPENAI_API_KEY",
-          requiresOpenaiAuth: provider.requires_openai_auth !== false
+          requiresOpenaiAuth: provider.requires_openai_auth !== false,
+          model: provider.model || void 0
+          // Parse model field from provider
         });
       }
     }
@@ -3211,7 +3213,7 @@ function renderCodexConfig(data) {
         return false;
       if (/^#?\s*model_provider\s*=/.test(l))
         return false;
-      if (/^\s*model\s*=/.test(l))
+      if (/^\s*model\s*=/.test(l) && !l.includes("["))
         return false;
       return true;
     });
@@ -3231,6 +3233,9 @@ function renderCodexConfig(data) {
       lines.push(`wire_api = "${provider.wireApi}"`);
       lines.push(`env_key = "${provider.envKey}"`);
       lines.push(`requires_openai_auth = ${provider.requiresOpenaiAuth}`);
+      if (provider.model) {
+        lines.push(`model = "${provider.model}"`);
+      }
     }
   }
   if (data.mcpServices.length > 0) {
@@ -3710,12 +3715,36 @@ async function configureCodexApi(options) {
   const existingValues = existingMap.size ? Array.from(existingMap.values()) : [];
   const firstExisting = existingValues.length === 1 ? existingValues[0] : void 0;
   while (addMore) {
+    const { getApiProviders } = await import('./api-providers.mjs');
+    const apiProviders = getApiProviders("codex");
+    const providerChoices = [
+      { name: i18n.t("api:customProvider"), value: "custom" },
+      ...apiProviders.map((p) => ({ name: p.name, value: p.id }))
+    ];
+    const { selectedProvider: selectedProvider2 } = await inquirer.prompt([{
+      type: "list",
+      name: "selectedProvider",
+      message: i18n.t("api:selectApiProvider"),
+      choices: addNumbersToChoices(providerChoices)
+    }]);
+    let prefilledBaseUrl;
+    let prefilledWireApi;
+    let prefilledModel;
+    if (selectedProvider2 !== "custom") {
+      const provider = apiProviders.find((p) => p.id === selectedProvider2);
+      if (provider?.codex) {
+        prefilledBaseUrl = provider.codex.baseUrl;
+        prefilledWireApi = provider.codex.wireApi;
+        prefilledModel = provider.codex.defaultModel;
+        console.log(ansis.gray(i18n.t("api:providerSelected", { name: provider.name })));
+      }
+    }
     const answers = await inquirer.prompt([
       {
         type: "input",
         name: "providerName",
         message: i18n.t("codex:providerNamePrompt"),
-        default: firstExisting?.name,
+        default: selectedProvider2 !== "custom" ? apiProviders.find((p) => p.id === selectedProvider2)?.name : firstExisting?.name,
         validate: (input) => {
           const sanitized = sanitizeProviderName(input);
           if (!sanitized)
@@ -3729,7 +3758,8 @@ async function configureCodexApi(options) {
         type: "input",
         name: "baseUrl",
         message: i18n.t("codex:providerBaseUrlPrompt"),
-        default: (answers2) => existingMap.get(answers2.providerId)?.baseUrl || "https://api.openai.com/v1",
+        default: prefilledBaseUrl || ((answers2) => existingMap.get(answers2.providerId)?.baseUrl || "https://api.openai.com/v1"),
+        when: () => selectedProvider2 === "custom",
         validate: (input) => !!input || i18n.t("codex:providerBaseUrlRequired")
       },
       {
@@ -3740,15 +3770,29 @@ async function configureCodexApi(options) {
           { name: i18n.t("codex:protocolResponses"), value: "responses" },
           { name: i18n.t("codex:protocolChat"), value: "chat" }
         ],
-        default: (answers2) => existingMap.get(sanitizeProviderName(answers2.providerName))?.wireApi || "responses"
+        default: prefilledWireApi || ((answers2) => existingMap.get(sanitizeProviderName(answers2.providerName))?.wireApi || "responses"),
+        when: () => selectedProvider2 === "custom"
+        // Only ask if custom
       },
       {
         type: "input",
         name: "apiKey",
-        message: i18n.t("codex:providerApiKeyPrompt"),
+        message: selectedProvider2 !== "custom" ? i18n.t("api:enterProviderApiKey", { provider: apiProviders.find((p) => p.id === selectedProvider2)?.name || selectedProvider2 }) : i18n.t("codex:providerApiKeyPrompt"),
         validate: (input) => !!input || i18n.t("codex:providerApiKeyRequired")
       }
     ]);
+    let customModel;
+    if (selectedProvider2 === "custom") {
+      const { model } = await inquirer.prompt([{
+        type: "input",
+        name: "model",
+        message: `${i18n.t("configuration:enterCustomModel")}${i18n.t("common:emptyToSkip")}`,
+        default: "gpt-5-codex"
+      }]);
+      if (model.trim()) {
+        customModel = model.trim();
+      }
+    }
     const providerId = sanitizeProviderName(answers.providerName);
     const envKey = `${providerId.toUpperCase().replace(/-/g, "_")}_API_KEY`;
     const existingProvider = existingMap.get(providerId);
@@ -3780,10 +3824,12 @@ async function configureCodexApi(options) {
     const newProvider = {
       id: providerId,
       name: answers.providerName,
-      baseUrl: answers.baseUrl,
-      wireApi: answers.wireApi || "responses",
+      baseUrl: selectedProvider2 === "custom" ? answers.baseUrl : prefilledBaseUrl,
+      wireApi: selectedProvider2 === "custom" ? answers.wireApi || "responses" : prefilledWireApi,
       envKey,
-      requiresOpenaiAuth: true
+      requiresOpenaiAuth: true,
+      model: customModel || prefilledModel || "gpt-5-codex"
+      // Use custom model, provider's default model, or fallback
     };
     providers.push(newProvider);
     currentSessionProviders.set(providerId, newProvider);
@@ -4078,8 +4124,18 @@ async function switchToProvider(providerId) {
     console.log(ansis.gray(getBackupMessage(backupPath)));
   }
   try {
+    let targetModel = existingConfig.model;
+    if (provider.model) {
+      targetModel = provider.model;
+    } else {
+      const currentModel = existingConfig.model;
+      if (currentModel !== "gpt-5" && currentModel !== "gpt-5-codex") {
+        targetModel = "gpt-5-codex";
+      }
+    }
     const updatedConfig = {
       ...existingConfig,
+      model: targetModel,
       modelProvider: providerId,
       modelProviderCommented: false
       // Ensure it's not commented
@@ -4712,6 +4768,7 @@ async function installClaudeCode() {
   if (installed) {
     console.log(ansis.green(`\u2714 ${i18n.t("installation:alreadyInstalled")}`));
     await updateClaudeCode();
+    await setInstallMethod("npm");
     return;
   }
   if (isTermux()) {
@@ -4734,6 +4791,7 @@ async function installClaudeCode() {
   try {
     await exec("npm", ["install", "-g", "@anthropic-ai/claude-code"]);
     console.log(`\u2714 ${i18n.t("installation:installSuccess")}`);
+    await setInstallMethod("npm");
     if (isTermux()) {
       console.log(ansis.gray(`
 Claude Code installed to: ${getTermuxPrefix()}/bin/claude`));
@@ -4783,6 +4841,19 @@ async function removeLocalClaudeCode() {
     throw new Error(`${i18n.t("installation:failedToRemoveLocalInstallation")}: ${error}`);
   }
 }
+async function setInstallMethod(method = "npm") {
+  try {
+    const { readMcpConfig, writeMcpConfig } = await Promise.resolve().then(function () { return claudeConfig; });
+    let config = readMcpConfig();
+    if (!config) {
+      config = { mcpServers: {} };
+    }
+    config.installMethod = method;
+    writeMcpConfig(config);
+  } catch (error) {
+    console.error("Failed to set installMethod in ~/.claude.json:", error);
+  }
+}
 
 const installer = {
   __proto__: null,
@@ -4790,7 +4861,8 @@ const installer = {
   installClaudeCode: installClaudeCode,
   isClaudeCodeInstalled: isClaudeCodeInstalled,
   isLocalClaudeCodeInstalled: isLocalClaudeCodeInstalled,
-  removeLocalClaudeCode: removeLocalClaudeCode
+  removeLocalClaudeCode: removeLocalClaudeCode,
+  setInstallMethod: setInstallMethod
 };
 
 async function chooseInstallationMethod() {
@@ -5055,7 +5127,7 @@ async function cleanupOldVersionFiles() {
   }
 }
 
-function validateSkipPromptOptions(options) {
+async function validateSkipPromptOptions(options) {
   if (options.allLang) {
     if (options.allLang === "zh-CN" || options.allLang === "en") {
       options.configLang = options.allLang;
@@ -5065,6 +5137,22 @@ function validateSkipPromptOptions(options) {
       options.aiOutputLang = options.allLang;
     }
   }
+  if (options.provider) {
+    const { getValidProviderIds, getProviderPreset } = await import('./api-providers.mjs');
+    const validProviders = [...getValidProviderIds(), "custom"];
+    if (!validProviders.includes(options.provider)) {
+      throw new Error(
+        i18n.t("errors:invalidProvider", {
+          provider: options.provider,
+          validProviders: validProviders.join(", ")
+        })
+      );
+    }
+    if (!options.apiType) {
+      const preset = options.provider !== "custom" ? getProviderPreset(options.provider) : null;
+      options.apiType = preset?.claudeCode?.authType || "api_key";
+    }
+  }
   if (!options.configAction) {
     options.configAction = "backup";
   }
@@ -5177,7 +5265,7 @@ function validateSkipPromptOptions(options) {
 }
 async function init(options = {}) {
   if (options.skipPrompt) {
-    validateSkipPromptOptions(options);
+    await validateSkipPromptOptions(options);
   }
   try {
     const zcfConfig = readZcfConfig();
@@ -5421,6 +5509,18 @@ async function init(options = {}) {
         if (options.apiConfigs || options.apiConfigsFile) {
           await handleMultiConfigurations(options, codeToolType);
           apiConfig = null;
+        } else if (options.provider && options.apiKey) {
+          const { getProviderPreset } = await import('./api-providers.mjs');
+          const preset = options.provider !== "custom" ? getProviderPreset(options.provider) : null;
+          apiConfig = {
+            authType: preset?.claudeCode?.authType || "api_key",
+            key: options.apiKey,
+            url: preset?.claudeCode?.baseUrl || options.apiUrl || API_DEFAULT_URL
+          };
+          if (preset?.claudeCode?.defaultModels && preset.claudeCode.defaultModels.length >= 2) {
+            options.apiModel = options.apiModel || preset.claudeCode.defaultModels[0];
+            options.apiFastModel = options.apiFastModel || preset.claudeCode.defaultModels[1];
+          }
         } else if (options.apiType === "auth_token" && options.apiKey) {
           apiConfig = {
             authType: "auth_token",
@@ -5708,7 +5808,7 @@ async function handleMultiConfigurations(options, codeToolType) {
         throw new Error(i18n.t("multi-config:fileReadFailed", { error: error instanceof Error ? error.message : String(error) }));
       }
     }
-    validateApiConfigs(configs);
+    await validateApiConfigs(configs);
     if (codeToolType === "claude-code") {
       await handleClaudeCodeConfigs(configs);
     } else if (codeToolType === "codex") {
@@ -5720,12 +5820,29 @@ async function handleMultiConfigurations(options, codeToolType) {
     throw error;
   }
 }
-function validateApiConfigs(configs) {
+async function validateApiConfigs(configs) {
   if (!Array.isArray(configs)) {
     throw new TypeError(i18n.t("multi-config:mustBeArray"));
   }
+  const { getValidProviderIds } = await import('./api-providers.mjs');
+  const validProviders = [...getValidProviderIds(), "custom"];
   const names = /* @__PURE__ */ new Set();
   for (const config of configs) {
+    if (config.provider && !config.type) {
+      config.type = "api_key";
+    }
+    if (config.provider && !config.name) {
+      config.name = config.provider.toUpperCase();
+    }
+    if (!config.provider && !config.type) {
+      throw new Error(i18n.t("multi-config:providerOrTypeRequired"));
+    }
+    if (config.provider && !validProviders.includes(config.provider)) {
+      throw new Error(i18n.t("errors:invalidProvider", {
+        provider: config.provider,
+        validProviders: validProviders.join(", ")
+      }));
+    }
     if (!config.name || typeof config.name !== "string" || config.name.trim() === "") {
       throw new Error(i18n.t("multi-config:mustHaveValidName"));
     }
@@ -5776,7 +5893,7 @@ async function handleCodexConfigs(configs) {
   const { addProviderToExisting } = await import('./codex-provider-manager.mjs');
   for (const config of configs) {
     try {
-      const provider = convertToCodexProvider(config);
+      const provider = await convertToCodexProvider(config);
       const result = await addProviderToExisting(provider, config.key || "");
       if (!result.success) {
         throw new Error(i18n.t("multi-config:providerAddFailed", { name: config.name, error: result.error }));
@@ -5799,23 +5916,54 @@ async function handleCodexConfigs(configs) {
 }
 async function convertToClaudeCodeProfile(config) {
   const { ClaudeCodeConfigManager } = await import('./claude-code-config-manager.mjs');
+  let baseUrl = config.url;
+  let primaryModel = config.primaryModel;
+  let fastModel = config.fastModel;
+  let authType = config.type || "api_key";
+  if (config.provider && config.provider !== "custom") {
+    const { getProviderPreset } = await import('./api-providers.mjs');
+    const preset = getProviderPreset(config.provider);
+    if (preset?.claudeCode) {
+      baseUrl = baseUrl || preset.claudeCode.baseUrl;
+      authType = preset.claudeCode.authType;
+      if (preset.claudeCode.defaultModels && preset.claudeCode.defaultModels.length >= 2) {
+        primaryModel = primaryModel || preset.claudeCode.defaultModels[0];
+        fastModel = fastModel || preset.claudeCode.defaultModels[1];
+      }
+    }
+  }
   const profile = {
     name: config.name,
-    authType: config.type,
+    authType,
     apiKey: config.key,
-    baseUrl: config.url,
+    baseUrl,
+    primaryModel,
+    fastModel,
     id: ClaudeCodeConfigManager.generateProfileId(config.name)
   };
   return profile;
 }
-function convertToCodexProvider(config) {
+async function convertToCodexProvider(config) {
+  let baseUrl = config.url || API_DEFAULT_URL;
+  let model = config.primaryModel || "gpt-5-codex";
+  let wireApi = "chat";
+  if (config.provider && config.provider !== "custom") {
+    const { getProviderPreset } = await import('./api-providers.mjs');
+    const preset = getProviderPreset(config.provider);
+    if (preset?.codex) {
+      baseUrl = config.url || preset.codex.baseUrl;
+      model = config.primaryModel || preset.codex.defaultModel || model;
+      wireApi = preset.codex.wireApi;
+    }
+  }
   return {
     id: config.name.toLowerCase().replace(/[^a-z0-9]/g, "-"),
     name: config.name,
-    baseUrl: config.url || API_DEFAULT_URL,
-    wireApi: "chat",
+    baseUrl,
+    wireApi,
     envKey: API_ENV_KEY,
-    requiresOpenaiAuth: false
+    requiresOpenaiAuth: false,
+    model
   };
 }
 
@@ -5897,4 +6045,4 @@ async function openSettingsJson() {
   }
 }
 
-export { isClaudeCodeInstalled as $, API_DEFAULT_URL as A, mergeMcpServers as B, CLAUDE_DIR as C, DEFAULT_CODE_TOOL_TYPE as D, buildMcpServerConfig as E, fixWindowsMcpConfig as F, addCompletedOnboarding as G, ensureApiKeyApproved as H, removeApiKeyFromRejected as I, manageApiKeyApproval as J, setPrimaryApiKey as K, LEGACY_ZCF_CONFIG_FILES as L, ensureClaudeDir as M, backupExistingConfig as N, copyConfigFiles as O, configureApi as P, mergeConfigs as Q, updateCustomModel as R, SETTINGS_FILE as S, updateDefaultModel as T, mergeSettingsFile as U, getExistingModelConfig as V, getExistingApiConfig as W, applyAiLanguageDirective as X, switchToOfficialLogin$1 as Y, ZCF_CONFIG_DIR as Z, promptApiConfigurationAction as _, commandExists as a, fsOperations as a$, installClaudeCode as a0, isLocalClaudeCodeInstalled as a1, getInstallationStatus as a2, removeLocalClaudeCode as a3, ensureI18nInitialized as a4, i18n as a5, addNumbersToChoices as a6, validateApiKey as a7, ensureDir as a8, readDefaultTomlConfig as a9, COMETIX_COMMAND_NAME as aA, COMETIX_COMMANDS as aB, installCometixLine as aC, checkAndUpdateTools as aD, runCodexUpdate as aE, resolveCodeType as aF, writeJsonConfig as aG, displayBanner as aH, version as aI, resolveAiOutputLanguage as aJ, updatePromptOnly as aK, selectAndInstallWorkflows as aL, checkClaudeCodeVersionAndPrompt as aM, displayBannerWithInfo as aN, runCodexUninstall as aO, configureCodexMcp as aP, configureCodexApi as aQ, runCodexWorkflowImportWithLanguageSelection as aR, runCodexFullInit as aS, switchCodexProvider as aT, listCodexProviders as aU, switchToOfficialLogin as aV, switchToProvider as aW, readZcfConfigAsync as aX, initI18n as aY, selectScriptLanguage as aZ, index as a_, createDefaultTomlConfig as aa, exists as ab, readJsonConfig as ac, writeTomlConfig as ad, copyFile as ae, detectConfigManagementMode as af, readCodexConfig as ag, backupCodexComplete as ah, writeCodexConfig as ai, writeAuthFile as aj, readCcrConfig as ak, isCcrInstalled as al, installCcr as am, configureCcrFeature as an, handleExitPromptError as ao, handleGeneralError as ap, updateZcfConfig as aq, changeLanguage as ar, readZcfConfig as as, configureOutputStyle as at, isWindows as au, selectMcpServices as av, getMcpServices as aw, setupCcrConfiguration as ax, modifyApiConfigPartially as ay, formatApiKeyDisplay as az, importRecommendedEnv as b, jsonConfig as b0, claudeConfig as b1, config$1 as b2, config as b3, prompts as b4, codex as b5, 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, CODE_TOOL_ALIASES as n, openSettingsJson as o, isCodeToolType as p, API_ENV_KEY as q, resolveCodeToolType as r, SUPPORTED_LANGS as s, LANG_LABELS as t, AI_OUTPUT_LANGUAGES as u, getAiOutputLanguageLabel as v, getMcpConfigPath as w, readMcpConfig as x, writeMcpConfig as y, backupMcpConfig as z };
+export { isClaudeCodeInstalled as $, API_DEFAULT_URL as A, mergeMcpServers as B, CLAUDE_DIR as C, DEFAULT_CODE_TOOL_TYPE as D, buildMcpServerConfig as E, fixWindowsMcpConfig as F, addCompletedOnboarding as G, ensureApiKeyApproved as H, removeApiKeyFromRejected as I, manageApiKeyApproval as J, setPrimaryApiKey as K, LEGACY_ZCF_CONFIG_FILES as L, ensureClaudeDir as M, backupExistingConfig as N, copyConfigFiles as O, configureApi as P, mergeConfigs as Q, updateCustomModel as R, SETTINGS_FILE as S, updateDefaultModel as T, mergeSettingsFile as U, getExistingModelConfig as V, getExistingApiConfig as W, applyAiLanguageDirective as X, switchToOfficialLogin$1 as Y, ZCF_CONFIG_DIR as Z, promptApiConfigurationAction as _, commandExists as a, index as a$, installClaudeCode as a0, isLocalClaudeCodeInstalled as a1, getInstallationStatus as a2, removeLocalClaudeCode as a3, setInstallMethod as a4, ensureI18nInitialized as a5, i18n as a6, addNumbersToChoices as a7, validateApiKey as a8, ensureDir as a9, handleGeneralError as aA, COMETIX_COMMAND_NAME as aB, COMETIX_COMMANDS as aC, installCometixLine as aD, checkAndUpdateTools as aE, runCodexUpdate as aF, resolveCodeType as aG, writeJsonConfig as aH, displayBanner as aI, version as aJ, resolveAiOutputLanguage as aK, updatePromptOnly as aL, selectAndInstallWorkflows as aM, checkClaudeCodeVersionAndPrompt as aN, displayBannerWithInfo as aO, runCodexUninstall as aP, configureCodexMcp as aQ, configureCodexApi as aR, runCodexWorkflowImportWithLanguageSelection as aS, runCodexFullInit as aT, switchCodexProvider as aU, listCodexProviders as aV, switchToOfficialLogin as aW, switchToProvider as aX, readZcfConfigAsync as aY, initI18n as aZ, selectScriptLanguage as a_, readDefaultTomlConfig as aa, createDefaultTomlConfig as ab, exists as ac, readJsonConfig as ad, writeTomlConfig as ae, copyFile as af, detectConfigManagementMode as ag, readCodexConfig as ah, backupCodexComplete as ai, writeCodexConfig as aj, writeAuthFile as ak, updateZcfConfig as al, changeLanguage as am, readZcfConfig as an, configureOutputStyle as ao, isWindows as ap, selectMcpServices as aq, getMcpServices as ar, isCcrInstalled as as, installCcr as at, setupCcrConfiguration as au, modifyApiConfigPartially as av, formatApiKeyDisplay as aw, readCcrConfig as ax, configureCcrFeature as ay, handleExitPromptError as az, importRecommendedEnv as b, fsOperations as b0, jsonConfig as b1, claudeConfig as b2, config$1 as b3, config as b4, prompts as b5, codex as b6, 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, CODE_TOOL_ALIASES as n, openSettingsJson as o, isCodeToolType as p, API_ENV_KEY as q, resolveCodeToolType as r, SUPPORTED_LANGS as s, LANG_LABELS as t, AI_OUTPUT_LANGUAGES as u, getAiOutputLanguageLabel as v, getMcpConfigPath as w, readMcpConfig as x, writeMcpConfig as y, backupMcpConfig as z };