zcf 3.2.3 → 3.3.1

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

@@ -1,7 +1,7 @@
 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 { deleteProviders, editExistingProvider, addProviderToExisting } from './codex-provider-manager.mjs';
+import { aa as ensureI18nInitialized, al as detectConfigManagementMode, ab as i18n, ac as addNumbersToChoices, ai as readJsonConfig, l as CODEX_AUTH_FILE } from './simple-config.mjs';
+import { deleteProviders, addProviderToExisting, editExistingProvider } from './codex-provider-manager.mjs';
 import 'node:fs';
 import 'node:process';
 import 'node:child_process';
@@ -33,6 +33,7 @@ async function configureIncrementalManagement() {
   const choices = [
     { name: i18n.t("codex:addProvider"), value: "add" },
     { name: i18n.t("codex:editProvider"), value: "edit" },
+    { name: i18n.t("codex:copyProvider"), value: "copy" },
     { name: i18n.t("codex:deleteProvider"), value: "delete" },
     { name: i18n.t("common:skip"), value: "skip" }
   ];
@@ -53,22 +54,50 @@ async function configureIncrementalManagement() {
     case "edit":
       await handleEditProvider(managementMode.providers);
       break;
+    case "copy":
+      await handleCopyProvider(managementMode.providers);
+      break;
     case "delete":
       await handleDeleteProvider(managementMode.providers);
       break;
   }
 }
 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 +106,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 +118,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: "input",
       name: "apiKey",
-      message: i18n.t("codex:providerApiKeyPrompt"),
+      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.bb; });
+      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 })));
   }
@@ -136,6 +199,8 @@ async function handleEditProvider(providers) {
     console.log(ansis.red(i18n.t("codex:providerNotFound")));
     return;
   }
+  const existingAuth = readJsonConfig(CODEX_AUTH_FILE, { defaultValue: {} }) || {};
+  const existingApiKey = existingAuth[provider.envKey] || "";
   const answers = await inquirer.prompt([
     {
       type: "input",
@@ -172,14 +237,26 @@ async function handleEditProvider(providers) {
       type: "input",
       name: "apiKey",
       message: i18n.t("codex:providerApiKeyPrompt"),
+      default: existingApiKey,
+      // Show old API key from auth.json
       validate: (input) => !!input.trim() || i18n.t("codex:providerApiKeyRequired")
     }
   ]);
+  const { model } = await inquirer.prompt([
+    {
+      type: "input",
+      name: "model",
+      message: i18n.t("codex:providerModelPrompt"),
+      default: provider.model || "gpt-5-codex",
+      validate: (input) => !!input.trim() || i18n.t("codex:providerModelRequired")
+    }
+  ]);
   const updates = {
     name: answers.providerName.trim(),
     baseUrl: answers.baseUrl.trim(),
     wireApi: answers.wireApi,
-    apiKey: answers.apiKey.trim()
+    apiKey: answers.apiKey.trim(),
+    model: model.trim()
   };
   const result = await editExistingProvider(selectedProviderId, updates);
   if (result.success) {
@@ -191,6 +268,114 @@ async function handleEditProvider(providers) {
     console.log(ansis.red(i18n.t("codex:providerUpdateFailed", { error: result.error })));
   }
 }
+async function handleCopyProvider(providers) {
+  const choices = providers.map((provider2) => ({
+    name: `${provider2.name} (${provider2.baseUrl})`,
+    value: provider2.id
+  }));
+  const { selectedProviderId } = await inquirer.prompt([{
+    type: "list",
+    name: "selectedProviderId",
+    message: i18n.t("codex:selectProviderToCopy"),
+    choices: addNumbersToChoices(choices)
+  }]);
+  if (!selectedProviderId) {
+    console.log(ansis.yellow(i18n.t("common:cancelled")));
+    return;
+  }
+  const provider = providers.find((p) => p.id === selectedProviderId);
+  if (!provider) {
+    console.log(ansis.red(i18n.t("codex:providerNotFound")));
+    return;
+  }
+  console.log(ansis.cyan(`
+${i18n.t("codex:copyingProvider", { name: provider.name })}`));
+  const existingAuth = readJsonConfig(CODEX_AUTH_FILE, { defaultValue: {} }) || {};
+  const existingApiKey = existingAuth[provider.envKey] || "";
+  const copiedName = `${provider.name}-copy`;
+  const answers = await inquirer.prompt([
+    {
+      type: "input",
+      name: "providerName",
+      message: i18n.t("codex:providerNamePrompt"),
+      default: copiedName,
+      validate: (input) => {
+        const trimmed = input.trim();
+        if (!trimmed)
+          return i18n.t("codex:providerNameRequired");
+        if (!/^[\w\-\s.]+$/.test(trimmed))
+          return i18n.t("codex:providerNameInvalid");
+        return true;
+      }
+    },
+    {
+      type: "input",
+      name: "baseUrl",
+      message: i18n.t("codex:providerBaseUrlPrompt"),
+      default: provider.baseUrl,
+      validate: (input) => !!input.trim() || i18n.t("codex:providerBaseUrlRequired")
+    },
+    {
+      type: "list",
+      name: "wireApi",
+      message: i18n.t("codex:providerProtocolPrompt"),
+      choices: [
+        { name: i18n.t("codex:protocolResponses"), value: "responses" },
+        { name: i18n.t("codex:protocolChat"), value: "chat" }
+      ],
+      default: provider.wireApi
+    },
+    {
+      type: "input",
+      name: "apiKey",
+      message: i18n.t("codex:providerApiKeyPrompt"),
+      default: existingApiKey,
+      // Show old API key from auth.json
+      validate: (input) => !!input.trim() || i18n.t("codex:providerApiKeyRequired")
+    }
+  ]);
+  const { model } = await inquirer.prompt([
+    {
+      type: "input",
+      name: "model",
+      message: i18n.t("codex:providerModelPrompt"),
+      default: provider.model || "gpt-5-codex",
+      validate: (input) => !!input.trim() || i18n.t("codex:providerModelRequired")
+    }
+  ]);
+  const providerId = answers.providerName.trim().toLowerCase().replace(/\s+/g, "-").replace(/\./g, "-").replace(/[^a-z0-9\-]/g, "");
+  const copiedProvider = {
+    id: providerId,
+    name: answers.providerName.trim(),
+    baseUrl: answers.baseUrl.trim(),
+    wireApi: answers.wireApi,
+    envKey: `${providerId.toUpperCase().replace(/-/g, "_")}_API_KEY`,
+    requiresOpenaiAuth: provider.requiresOpenaiAuth ?? true,
+    model: model.trim()
+  };
+  const result = await addProviderToExisting(copiedProvider, answers.apiKey.trim(), false);
+  if (result.success) {
+    console.log(ansis.green(i18n.t("codex:providerCopied", { 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: false
+    }]);
+    if (setAsDefault) {
+      const { switchToProvider } = await import('./simple-config.mjs').then(function (n) { return n.bb; });
+      const switched = await switchToProvider(copiedProvider.id);
+      if (switched) {
+        console.log(ansis.green(i18n.t("multi-config:profileSetAsDefault", { name: copiedProvider.name })));
+      }
+    }
+  } else {
+    console.log(ansis.red(i18n.t("codex:providerCopyFailed", { error: result.error })));
+  }
+}
 async function handleDeleteProvider(providers) {
   const choices = providers.map((provider) => ({
     name: `${provider.name} (${provider.baseUrl})`,

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 { am as readCodexConfig, an as backupCodexComplete, ao as writeCodexConfig, ap 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;
@@ -96,7 +106,8 @@ async function editExistingProvider(providerId, updates) {
       ...existingConfig.providers[providerIndex],
       ...updates.name && { name: updates.name },
       ...updates.baseUrl && { baseUrl: updates.baseUrl },
-      ...updates.wireApi && { wireApi: updates.wireApi }
+      ...updates.wireApi && { wireApi: updates.wireApi },
+      ...updates.model && { model: updates.model }
     };
     const updatedProviders = [...existingConfig.providers];
     updatedProviders[providerIndex] = updatedProvider;

package/dist/chunks/codex-uninstaller.mjs

@@ -1,14 +1,14 @@
-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 { j as CODEX_DIR, k as CODEX_CONFIG_FILE, ab as i18n, l as CODEX_AUTH_FILE, n as CODEX_AGENTS_FILE, p as CODEX_PROMPTS_DIR } from './simple-config.mjs';
 import { m as moveToTrash } from '../shared/zcf.DGjQxTq_.mjs';
 import 'node:fs';
 import 'node:process';
 import 'ansis';
 import 'inquirer';
 import 'node:child_process';
+import 'node:os';
 import 'node:util';
 import 'dayjs';
 import 'node:url';
@@ -23,12 +23,7 @@ import 'trash';
 class CodexUninstaller {
   _lang;
   conflictResolution = /* @__PURE__ */ new Map();
-  CODEX_DIR = join(homedir(), ".codex");
-  CODEX_CONFIG_FILE = join(this.CODEX_DIR, "config.toml");
-  CODEX_AUTH_FILE = join(this.CODEX_DIR, "auth.json");
-  CODEX_AGENTS_FILE = join(this.CODEX_DIR, "AGENTS.md");
-  CODEX_PROMPTS_DIR = join(this.CODEX_DIR, "prompts");
-  CODEX_BACKUP_DIR = join(this.CODEX_DIR, "backup");
+  CODEX_BACKUP_DIR = join(CODEX_DIR, "backup");
   constructor(lang = "en") {
     this._lang = lang;
     this.conflictResolution.set("cli-package", ["config", "auth"]);
@@ -47,8 +42,8 @@ class CodexUninstaller {
       warnings: []
     };
     try {
-      if (await pathExists(this.CODEX_CONFIG_FILE)) {
-        const trashResult = await moveToTrash(this.CODEX_CONFIG_FILE);
+      if (await pathExists(CODEX_CONFIG_FILE)) {
+        const trashResult = await moveToTrash(CODEX_CONFIG_FILE);
         if (!trashResult[0]?.success) {
           result.warnings.push(trashResult[0]?.error || "Failed to move to trash");
         }
@@ -75,8 +70,8 @@ class CodexUninstaller {
       warnings: []
     };
     try {
-      if (await pathExists(this.CODEX_AUTH_FILE)) {
-        const trashResult = await moveToTrash(this.CODEX_AUTH_FILE);
+      if (await pathExists(CODEX_AUTH_FILE)) {
+        const trashResult = await moveToTrash(CODEX_AUTH_FILE);
         if (!trashResult[0]?.success) {
           result.warnings.push(trashResult[0]?.error || "Failed to move to trash");
         }
@@ -103,8 +98,8 @@ class CodexUninstaller {
       warnings: []
     };
     try {
-      if (await pathExists(this.CODEX_AGENTS_FILE)) {
-        const trashResult = await moveToTrash(this.CODEX_AGENTS_FILE);
+      if (await pathExists(CODEX_AGENTS_FILE)) {
+        const trashResult = await moveToTrash(CODEX_AGENTS_FILE);
         if (!trashResult[0]?.success) {
           result.warnings.push(trashResult[0]?.error || "Failed to move to trash");
         }
@@ -131,8 +126,8 @@ class CodexUninstaller {
       warnings: []
     };
     try {
-      if (await pathExists(this.CODEX_PROMPTS_DIR)) {
-        const trashResult = await moveToTrash(this.CODEX_PROMPTS_DIR);
+      if (await pathExists(CODEX_PROMPTS_DIR)) {
+        const trashResult = await moveToTrash(CODEX_PROMPTS_DIR);
         if (!trashResult[0]?.success) {
           result.warnings.push(trashResult[0]?.error || "Failed to move to trash");
         }
@@ -184,9 +179,9 @@ class CodexUninstaller {
       warnings: []
     };
     try {
-      if (await pathExists(this.CODEX_CONFIG_FILE)) {
+      if (await pathExists(CODEX_CONFIG_FILE)) {
         const { readFileSync, writeFileSync } = await import('node:fs');
-        const content = readFileSync(this.CODEX_CONFIG_FILE, "utf-8");
+        const content = readFileSync(CODEX_CONFIG_FILE, "utf-8");
         const lines = content.split("\n");
         const newLines = [];
         let inProviderSection = false;
@@ -210,7 +205,7 @@ class CodexUninstaller {
           newLines.push(line);
         }
         if (configModified) {
-          writeFileSync(this.CODEX_CONFIG_FILE, newLines.join("\n"));
+          writeFileSync(CODEX_CONFIG_FILE, newLines.join("\n"));
           result.removedConfigs.push(i18n.t("codex:apiConfigRemoved"));
         }
         result.success = true;
@@ -263,9 +258,9 @@ class CodexUninstaller {
       warnings: []
     };
     try {
-      if (await pathExists(this.CODEX_CONFIG_FILE)) {
+      if (await pathExists(CODEX_CONFIG_FILE)) {
         const { readFileSync, writeFileSync } = await import('node:fs');
-        const content = readFileSync(this.CODEX_CONFIG_FILE, "utf-8");
+        const content = readFileSync(CODEX_CONFIG_FILE, "utf-8");
         const lines = content.split("\n");
         const newLines = [];
         let inMcpSection = false;
@@ -285,7 +280,7 @@ class CodexUninstaller {
           newLines.push(line);
         }
         if (configModified) {
-          writeFileSync(this.CODEX_CONFIG_FILE, newLines.join("\n"));
+          writeFileSync(CODEX_CONFIG_FILE, newLines.join("\n"));
           result.removedConfigs.push(i18n.t("codex:mcpConfigRemoved"));
         }
         result.success = true;
@@ -310,8 +305,8 @@ class CodexUninstaller {
       warnings: []
     };
     try {
-      if (await pathExists(this.CODEX_DIR)) {
-        const trashResult = await moveToTrash(this.CODEX_DIR);
+      if (await pathExists(CODEX_DIR)) {
+        const trashResult = await moveToTrash(CODEX_DIR);
         if (!trashResult[0]?.success) {
           result.warnings.push(`Failed to move ~/.codex/ to trash: ${trashResult[0]?.error || "Unknown error"}`);
         }

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 { aa as ensureI18nInitialized, ab as i18n } from './simple-config.mjs';
 import 'node:fs';
 import 'node:process';
 import 'inquirer';