zcf 3.2.2 → 3.3.0

package/dist/chunks/codex-config-switch.mjs

@@ -1,6 +1,6 @@
 import ansis from 'ansis';
 import inquirer from 'inquirer';
-import { a4 as ensureI18nInitialized, af as detectConfigManagementMode, a5 as i18n, a6 as addNumbersToChoices } from './simple-config.mjs';
+import { a5 as ensureI18nInitialized, ag as detectConfigManagementMode, a6 as i18n, a7 as addNumbersToChoices } from './simple-config.mjs';
 import { deleteProviders, editExistingProvider, addProviderToExisting } from './codex-provider-manager.mjs';
 import 'node:fs';
 import 'node:process';
@@ -59,16 +59,41 @@ async function configureIncrementalManagement() {
   }
 }
 async function handleAddProvider() {
+  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 } = await inquirer.prompt([{
+    type: "list",
+    name: "selectedProvider",
+    message: i18n.t("api:selectApiProvider"),
+    choices: addNumbersToChoices(providerChoices)
+  }]);
+  let prefilledBaseUrl;
+  let prefilledWireApi;
+  let prefilledModel;
+  if (selectedProvider !== "custom") {
+    const provider2 = apiProviders.find((p) => p.id === selectedProvider);
+    if (provider2?.codex) {
+      prefilledBaseUrl = provider2.codex.baseUrl;
+      prefilledWireApi = provider2.codex.wireApi;
+      prefilledModel = provider2.codex.defaultModel;
+      console.log(ansis.gray(i18n.t("api:providerSelected", { name: provider2.name })));
+    }
+  }
   const answers = await inquirer.prompt([
     {
       type: "input",
       name: "providerName",
       message: i18n.t("codex:providerNamePrompt"),
+      default: selectedProvider !== "custom" ? apiProviders.find((p) => p.id === selectedProvider)?.name : void 0,
       validate: (input) => {
         const trimmed = input.trim();
         if (!trimmed)
           return i18n.t("codex:providerNameRequired");
-        if (!/^[\w\-\s]+$/.test(trimmed))
+        if (!/^[\w\-\s.]+$/.test(trimmed))
           return i18n.t("codex:providerNameInvalid");
         return true;
       }
@@ -77,7 +102,8 @@ async function handleAddProvider() {
       type: "input",
       name: "baseUrl",
       message: i18n.t("codex:providerBaseUrlPrompt"),
-      default: "https://api.openai.com/v1",
+      default: prefilledBaseUrl || "https://api.openai.com/v1",
+      when: () => selectedProvider === "custom",
       validate: (input) => !!input.trim() || i18n.t("codex:providerBaseUrlRequired")
     },
     {
@@ -88,30 +114,63 @@ async function handleAddProvider() {
         { name: i18n.t("codex:protocolResponses"), value: "responses" },
         { name: i18n.t("codex:protocolChat"), value: "chat" }
       ],
-      default: "responses"
+      default: prefilledWireApi || "responses",
+      when: () => selectedProvider === "custom"
     },
     {
-      type: "password",
+      type: "input",
       name: "apiKey",
-      message: i18n.t("codex:providerApiKeyPrompt") + i18n.t("common:inputHidden"),
+      message: selectedProvider !== "custom" ? i18n.t("api:enterProviderApiKey", { provider: apiProviders.find((p) => p.id === selectedProvider)?.name || selectedProvider }) : i18n.t("codex:providerApiKeyPrompt"),
       validate: (input) => !!input.trim() || i18n.t("codex:providerApiKeyRequired")
     }
   ]);
-  const providerId = answers.providerName.trim().toLowerCase().replace(/\s+/g, "-").replace(/[^a-z0-9\-]/g, "");
+  const providerId = answers.providerName.trim().toLowerCase().replace(/\s+/g, "-").replace(/\./g, "-").replace(/[^a-z0-9\-]/g, "");
+  const managementMode = detectConfigManagementMode();
+  const existingProvider = managementMode.providers?.find((p) => p.id === providerId);
+  if (existingProvider) {
+    const { shouldOverwrite } = await inquirer.prompt([{
+      type: "confirm",
+      name: "shouldOverwrite",
+      message: i18n.t("codex:providerDuplicatePrompt", {
+        name: existingProvider.name,
+        source: i18n.t("codex:existingConfig")
+      }),
+      default: false
+    }]);
+    if (!shouldOverwrite) {
+      console.log(ansis.yellow(i18n.t("codex:providerDuplicateSkipped")));
+      return;
+    }
+  }
   const provider = {
     id: providerId,
     name: answers.providerName.trim(),
-    baseUrl: answers.baseUrl.trim(),
-    wireApi: answers.wireApi,
+    baseUrl: selectedProvider === "custom" ? answers.baseUrl.trim() : prefilledBaseUrl,
+    wireApi: selectedProvider === "custom" ? answers.wireApi : prefilledWireApi,
     envKey: `${providerId.toUpperCase().replace(/-/g, "_")}_API_KEY`,
-    requiresOpenaiAuth: true
+    requiresOpenaiAuth: true,
+    model: prefilledModel || "gpt-5-codex"
+    // Use provider's default model or fallback
   };
-  const result = await addProviderToExisting(provider, answers.apiKey.trim());
+  const result = await addProviderToExisting(provider, answers.apiKey.trim(), true);
   if (result.success) {
     console.log(ansis.green(i18n.t("codex:providerAdded", { name: result.addedProvider?.name })));
     if (result.backupPath) {
       console.log(ansis.gray(i18n.t("common:backupCreated", { path: result.backupPath })));
     }
+    const { setAsDefault } = await inquirer.prompt([{
+      type: "confirm",
+      name: "setAsDefault",
+      message: i18n.t("multi-config:setAsDefaultPrompt"),
+      default: true
+    }]);
+    if (setAsDefault) {
+      const { switchToProvider } = await import('./simple-config.mjs').then(function (n) { return n.b6; });
+      const switched = await switchToProvider(provider.id);
+      if (switched) {
+        console.log(ansis.green(i18n.t("multi-config:profileSetAsDefault", { name: provider.name })));
+      }
+    }
   } else {
     console.log(ansis.red(i18n.t("codex:providerAddFailed", { error: result.error })));
   }
@@ -169,9 +228,9 @@ async function handleEditProvider(providers) {
       default: provider.wireApi
     },
     {
-      type: "password",
+      type: "input",
       name: "apiKey",
-      message: i18n.t("codex:providerApiKeyPrompt") + i18n.t("common:inputHidden"),
+      message: i18n.t("codex:providerApiKeyPrompt"),
       validate: (input) => !!input.trim() || i18n.t("codex:providerApiKeyRequired")
     }
   ]);

package/dist/chunks/codex-provider-manager.mjs

@@ -1,4 +1,4 @@
-import { ag as readCodexConfig, ah as backupCodexComplete, ai as writeCodexConfig, aj as writeAuthFile } from './simple-config.mjs';
+import { ah as readCodexConfig, ai as backupCodexComplete, aj as writeCodexConfig, ak as writeAuthFile } from './simple-config.mjs';
 import 'node:fs';
 import 'node:process';
 import 'ansis';
@@ -26,7 +26,7 @@ const ERROR_MESSAGES = {
   PROVIDERS_NOT_FOUND: (providers) => `Some providers not found: ${providers.join(", ")}`,
   CANNOT_DELETE_ALL: "Cannot delete all providers. At least one provider must remain."
 };
-async function addProviderToExisting(provider, apiKey) {
+async function addProviderToExisting(provider, apiKey, allowOverwrite = false) {
   try {
     const existingConfig = readCodexConfig();
     if (!existingConfig) {
@@ -35,8 +35,8 @@ async function addProviderToExisting(provider, apiKey) {
         error: ERROR_MESSAGES.NO_CONFIG
       };
     }
-    const existingProvider = existingConfig.providers.find((p) => p.id === provider.id);
-    if (existingProvider) {
+    const existingProviderIndex = existingConfig.providers.findIndex((p) => p.id === provider.id);
+    if (existingProviderIndex !== -1 && !allowOverwrite) {
       return {
         success: false,
         error: ERROR_MESSAGES.PROVIDER_EXISTS(provider.id)
@@ -49,10 +49,20 @@ async function addProviderToExisting(provider, apiKey) {
         error: ERROR_MESSAGES.BACKUP_FAILED
       };
     }
-    const updatedConfig = {
-      ...existingConfig,
-      providers: [...existingConfig.providers, provider]
-    };
+    let updatedConfig;
+    if (existingProviderIndex !== -1) {
+      const updatedProviders = [...existingConfig.providers];
+      updatedProviders[existingProviderIndex] = provider;
+      updatedConfig = {
+        ...existingConfig,
+        providers: updatedProviders
+      };
+    } else {
+      updatedConfig = {
+        ...existingConfig,
+        providers: [...existingConfig.providers, provider]
+      };
+    }
     writeCodexConfig(updatedConfig);
     const authEntries = {};
     authEntries[provider.envKey] = apiKey;

package/dist/chunks/codex-uninstaller.mjs

@@ -2,7 +2,7 @@ import { homedir } from 'node:os';
 import { pathExists } from 'fs-extra';
 import { join } from 'pathe';
 import { exec } from 'tinyexec';
-import { a5 as i18n } from './simple-config.mjs';
+import { a6 as i18n } from './simple-config.mjs';
 import { m as moveToTrash } from '../shared/zcf.DGjQxTq_.mjs';
 import 'node:fs';
 import 'node:process';

package/dist/chunks/commands.mjs

@@ -1,7 +1,7 @@
 import { exec } from 'node:child_process';
 import { promisify } from 'node:util';
 import ansis from 'ansis';
-import { a4 as ensureI18nInitialized, a5 as i18n } from './simple-config.mjs';
+import { a5 as ensureI18nInitialized, a6 as i18n } from './simple-config.mjs';
 import 'node:fs';
 import 'node:process';
 import 'inquirer';