zcf 3.0.2 → 3.1.0

package/README.md

@@ -30,7 +30,7 @@ Menu options include:
 - `2` Import workflows (equivalent to `zcf u`)
 - `3` Configure API or CCR - API configuration or CCR proxy setup
 - `4` Configure MCP - MCP service configuration and management
-- `5` Configure default model - Set default model (opus/sonnet/opusplan/custom)
+- `5` Configure default model - Set default model (opus/sonnet/sonnet 1m/custom)
 - `6` Configure AI memory - Configure AI output language and global output style
 - `7` Configure environment permissions - Import environment variables and permissions
 - `R` Claude Code Router management (enhanced in v2.8.1)
@@ -44,7 +44,7 @@ Menu options include:
 **Model Configuration (Option 5)**: Configure your default Claude model with flexible options:
 - **Default**: Let Claude Code automatically choose the best model for each task
 - **Opus**: Use Claude-3.5-Opus exclusively (high token consumption, use with caution)
-- **OpusPlan**: Use Opus for planning, Sonnet for implementation (recommended balance)
+- **Sonnet 1M**: Use Sonnet with 1M context window for larger context tasks
 - **Custom**: Specify your own model names for both primary and fast tasks (supports any custom model)
 
 **AI Memory Configuration (Option 6)**: Personalize your AI assistant:
@@ -124,7 +124,7 @@ When using `--skip-prompt`, the following parameters are available:
 | `--api-url, -u`              | Custom API URL                                           | URL string                                                                                         | No                                     | official API                                                                                                                     |
 | `--mcp-services, -m`         | MCP services to install (multi-select, comma-separated)  | `context7`, `open-websearch`, `spec-workflow`, `mcp-deepwiki`, `Playwright`, `exa`, or `skip` for none | No                                     | `all`                                                                                                                            |
 | `--workflows, -w`            | Workflows to install (multi-select, comma-separated)     | `commonTools`, `sixStepsWorkflow`, `featPlanUx`, `gitWorkflow`, `bmadWorkflow`, or `skip` for none | No                                     | `all`                                                                                                                            |
-| `--output-styles, -o`        | Output styles to install (multi-select, comma-separated) | `engineer-professional`, `nekomata-engineer`, `laowang-engineer`, or `skip` for none               | No                                     | `all`                                                                                                                            |
+| `--output-styles, -o`        | Output styles to install (multi-select, comma-separated) | `engineer-professional`, `nekomata-engineer`, `laowang-engineer`, `ojousama-engineer`, or `skip` for none               | No                                     | `all`                                                                                                                            |
 | `--default-output-style, -d` | Default output style                                     | Same as output styles plus built-in: `default`, `explanatory`, `learning`                          | No                                     | `engineer-professional`                                                                                                          |
 | `--install-cometix-line, -x` | Install CCometixLine statusline tool                     | `true`, `false`                                                                                    | No                                     | `true`                                                                                                                           |
 
@@ -214,6 +214,7 @@ ZCF now supports customizable AI output styles to personalize your Claude Code e
 - `engineer-professional`: Professional software engineer following SOLID, KISS, DRY, YAGNI principles
 - `nekomata-engineer`: Professional catgirl engineer UFO Nya, combining rigorous engineering with cute catgirl traits
 - `laowang-engineer`: Laowang grumpy tech style, never tolerates code errors and non-standard code
+- `ojousama-engineer`: Tsundere blonde ojou-sama programmer Halley-chan, combining rigorous engineering excellence with tsundere ojou-sama traits
 - Built-in styles: `default`, `explanatory`, `learning` (always available)
 
 **Features:**
@@ -364,7 +365,7 @@ After configuration:
 - Script interaction language: Controls installation prompts language
 - Configuration file language: Determines which configuration set to install (zh-CN/en)
 - AI output language: Choose the language for AI responses (supports Chinese, English, and custom languages)
-- AI output styles: Support multiple preset styles (Professional Engineer, Nekomata Engineer, Laowang Engineer) for customized experience
+- AI output styles: Support multiple preset styles (Professional Engineer, Nekomata Engineer, Laowang Engineer, Ojou-sama Engineer) for customized experience
 
 ### 🔧 Smart Installation
 
@@ -421,7 +422,7 @@ Select function:
   2. Import workflow - Import/update workflow-related files only
   3. Configure API - Configure API URL and authentication (supports CCR proxy)
   4. Configure MCP - Configure MCP services (includes Windows fix)
-  5. Configure default model - Set default model (opus/sonnet/opusplan/custom)
+  5. Configure default model - Set default model (opus/sonnet/sonnet 1m/custom)
   6. Configure Claude global memory - Configure AI output language and output styles
   7. Import recommended environment variables and permissions - Import privacy protection environment variables and system permissions
 
@@ -443,15 +444,17 @@ Enter your choice: _
 
 ```bash
 ? Select Claude Code configuration language:
-  ❯ 简体中文 (zh-CN) - Chinese (easier for Chinese users to customize)
-    English (en) - English (recommended, lower token consumption)
+  ❯ English (en) - English (recommended, lower token consumption)
+    简体中文 (zh-CN) - Chinese (easier for Chinese users to customize)
+    日本語 (ja) - Japanese (日本のユーザー向け)
 
 ? Select AI output language:
   AI will respond to you in this language
-  ❯ 简体中文
-    English
+  ❯ English
+    简体中文
+    日本語
     Custom
-    (Supports Japanese, French, German, and more)
+    (Supports French, German, and more)
 
 ? Claude Code not found. Install automatically? (Y/n)
 
@@ -464,12 +467,14 @@ Enter your choice: _
     Skip - Skip configuration update
 
 ? Select API authentication method
-  ❯ Use Auth Token (OAuth authentication)
+  ❯ Use Official Login
+    Use official authentication system without API configuration
+    Use Auth Token (OAuth authentication)
     For tokens obtained via OAuth or browser login
     Use API Key (Key authentication)
     For API keys from Anthropic Console
     Configure CCR Proxy (Claude Code Router)
-    Use free models and custom routing to reduce costs and explore the possibilities of Claude Code
+    Use multiple AI models via proxy routing to reduce costs and explore possibilities
     Skip (configure manually later)
 
 ? Enter API URL: https://api.anthropic.com
@@ -479,34 +484,12 @@ Enter your choice: _
   ❯ Engineer Professional - Professional software engineer following SOLID, KISS, DRY, YAGNI principles
     Nekomata Engineer - Professional catgirl engineer UFO Nya, combining rigorous engineering with cute catgirl traits
     Laowang Grumpy Tech - Laowang grumpy tech style, never tolerates code errors and non-standard code
+    Ojou-sama Engineer - Tsundere blonde ojou-sama programmer Halley-chan, combining rigorous engineering excellence with tsundere ojou-sama traits
 
 ? Select global default output style:
   ❯ Engineer Professional
 
-? Configure MCP services? (Y/n)
-
-? Select MCP services to install:
-  ❯ context7 - Get latest library and framework documentation
-    mcp-deepwiki - Access deepwiki.com knowledge base
-    Playwright - Browser automation and web testing
-    exa - Advanced search and enterprise research tools
-
-? Select workflows to install:
-  ❯ Common Tools Workflow - init-project and related agents
-    Six Steps Workflow - Complete six-stage development process
-    Feature Planning UX - Complete feature development lifecycle
-    Git Workflow - Git operations and branch management
-    BMad Workflow - AI-driven agile development methodology
-
-? Install CCometixLine statusline tool? (Y/n)
-
-✔ Setup complete! Claude Code environment is ready
-```
-
-✔ All config files backed up to ~/.claude/backup/xxx
-✔ Config files copied to ~/.claude
-
-? Select workflows to install (space to select, enter to confirm)
+? Select workflows to install (space to select, enter to confirm):
 ❯ ◉ Common Tools (init-project + init-architect + get-current-datetime) - Essential project initialization and utility commands
 ◉ Six Steps Workflow (workflow) - Complete 6-phase development process
 ◉ Feature Planning and UX Design (feat + planner + ui-ux-designer) - Structured feature development
@@ -525,24 +508,24 @@ Enter your choice: _
 ✔ Installed command: zcf/bmad-init.md
 ✔ Workflow installation successful
 
-✔ API configured
-
 ? Configure MCP services? (Y/n)
 
-? Select MCP services to install (space to select, enter to confirm)
-❯ ◯ Install all
-◯ Context7 Documentation Query - Query latest library docs and code examples
-◯ DeepWiki - Query GitHub repository docs and examples
-◯ Playwright Browser Control - Direct browser automation control
-◯ Exa AI Search - Web search using Exa AI
-
-? Enter Exa API Key (get from https://dashboard.exa.ai/api-keys)
+? Select MCP services to install (space to select, enter to confirm):
+❯ ◉ Context7 Documentation Query - Query latest library docs and code examples
+◉ DeepWiki - Query GitHub repository docs and examples
+◉ Playwright Browser Control - Direct browser automation control
+◉ Exa AI Search - Web search using Exa AI
+◯ Install all services
 
 ✔ MCP services configured
 
+? Install CCometixLine statusline tool? (Y/n)
+
+✔ Setup complete! Claude Code environment is ready
+
 🎉 Setup complete! Use 'claude' command to start.
 
-````
+```
 
 ### Command Line Options
 
@@ -581,7 +564,7 @@ npx zcf -h
 # Show version
 npx zcf --version
 npx zcf -v
-````
+```
 
 #### Usage Examples
 

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

@@ -1,6 +1,6 @@
 import ansis from 'ansis';
 import inquirer from 'inquirer';
-import { Y as readCodexConfig, _ as backupCodexComplete, $ as writeCodexConfig, a0 as writeAuthFile, a1 as ensureI18nInitialized, a2 as detectConfigManagementMode, X as i18n, a3 as addNumbersToChoices } from './simple-config.mjs';
+import { a1 as readCodexConfig, a2 as backupCodexComplete, a3 as writeCodexConfig, a4 as writeAuthFile, a5 as ensureI18nInitialized, a6 as detectConfigManagementMode, a0 as i18n, a7 as addNumbersToChoices } from './simple-config.mjs';
 import 'node:fs';
 import 'node:process';
 import 'node:child_process';

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 { X as i18n } from './simple-config.mjs';
+import { a0 as i18n } from './simple-config.mjs';
 import { m as moveToTrash } from '../shared/zcf.DGjQxTq_.mjs';
 import 'node:fs';
 import 'node:process';

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.0.2";
+const version = "3.1.0";
 const homepage = "https://github.com/UfoMiao/zcf";
 
 const i18n = i18next.createInstance();
@@ -123,6 +123,15 @@ async function changeLanguage(lng) {
   await i18n.changeLanguage(lng);
 }
 
+const index = {
+  __proto__: null,
+  changeLanguage: changeLanguage,
+  ensureI18nInitialized: ensureI18nInitialized,
+  format: format,
+  i18n: i18n,
+  initI18n: initI18n
+};
+
 const MCP_SERVICE_CONFIGS = [
   {
     id: "context7",
@@ -355,6 +364,7 @@ const CLAUDE_DIR = join(homedir(), ".claude");
 const SETTINGS_FILE = join(CLAUDE_DIR, "settings.json");
 const CLAUDE_MD_FILE = join(CLAUDE_DIR, "CLAUDE.md");
 const ClAUDE_CONFIG_FILE = join(homedir(), ".claude.json");
+const CLAUDE_VSC_CONFIG_FILE = join(CLAUDE_DIR, "config.json");
 const ZCF_CONFIG_DIR = join(homedir(), ".ufomiao", "zcf");
 const ZCF_CONFIG_FILE = join(ZCF_CONFIG_DIR, "config.toml");
 const LEGACY_ZCF_CONFIG_FILES = [
@@ -398,6 +408,7 @@ const constants = {
   AI_OUTPUT_LANGUAGES: AI_OUTPUT_LANGUAGES,
   CLAUDE_DIR: CLAUDE_DIR,
   CLAUDE_MD_FILE: CLAUDE_MD_FILE,
+  CLAUDE_VSC_CONFIG_FILE: CLAUDE_VSC_CONFIG_FILE,
   CODE_TOOL_BANNERS: CODE_TOOL_BANNERS,
   CODE_TOOL_TYPES: CODE_TOOL_TYPES,
   ClAUDE_CONFIG_FILE: ClAUDE_CONFIG_FILE,
@@ -992,6 +1003,19 @@ function manageApiKeyApproval(apiKey) {
     console.error(i18n.t("mcp:apiKeyApprovalFailed"), error);
   }
 }
+function setPrimaryApiKey() {
+  try {
+    let config = readJsonConfig(CLAUDE_VSC_CONFIG_FILE);
+    if (!config) {
+      config = {};
+    }
+    config.primaryApiKey = "zcf";
+    writeJsonConfig(CLAUDE_VSC_CONFIG_FILE, config);
+  } catch (error) {
+    ensureI18nInitialized();
+    console.error(i18n.t("mcp:primaryApiKeySetFailed"), error);
+  }
+}
 
 const claudeConfig = {
   __proto__: null,
@@ -1005,6 +1029,7 @@ const claudeConfig = {
   mergeMcpServers: mergeMcpServers,
   readMcpConfig: readMcpConfig,
   removeApiKeyFromRejected: removeApiKeyFromRejected,
+  setPrimaryApiKey: setPrimaryApiKey,
   writeMcpConfig: writeMcpConfig
 };
 
@@ -1102,6 +1127,14 @@ function configureApi(apiConfig) {
     settings.env.ANTHROPIC_BASE_URL = apiConfig.url;
   }
   writeJsonConfig(SETTINGS_FILE, settings);
+  if (apiConfig.authType) {
+    try {
+      setPrimaryApiKey();
+    } catch (error) {
+      ensureI18nInitialized();
+      console.error(i18n.t("mcp:primaryApiKeySetFailed"), error);
+    }
+  }
   try {
     addCompletedOnboarding();
   } catch (error) {
@@ -1246,6 +1279,67 @@ function applyAiLanguageDirective(aiOutputLang) {
   }
   writeFile(claudeFile, directive);
 }
+function switchToOfficialLogin$1() {
+  try {
+    ensureI18nInitialized();
+    const settings = readJsonConfig(SETTINGS_FILE) || {};
+    if (settings.env) {
+      delete settings.env.ANTHROPIC_BASE_URL;
+      delete settings.env.ANTHROPIC_AUTH_TOKEN;
+      delete settings.env.ANTHROPIC_API_KEY;
+    }
+    writeJsonConfig(SETTINGS_FILE, settings);
+    const vscConfig = readJsonConfig(CLAUDE_VSC_CONFIG_FILE);
+    if (vscConfig) {
+      delete vscConfig.primaryApiKey;
+      writeJsonConfig(CLAUDE_VSC_CONFIG_FILE, vscConfig);
+    }
+    const mcpConfig = readMcpConfig();
+    if (mcpConfig) {
+      delete mcpConfig.hasCompletedOnboarding;
+      writeMcpConfig(mcpConfig);
+    }
+    console.log(i18n.t("api:officialLoginConfigured"));
+    return true;
+  } catch (error) {
+    ensureI18nInitialized();
+    console.error(i18n.t("api:officialLoginFailed"), error);
+    return false;
+  }
+}
+async function promptApiConfigurationAction() {
+  ensureI18nInitialized();
+  const existingConfig = getExistingApiConfig();
+  if (!existingConfig) {
+    return null;
+  }
+  console.log(`
+${ansis.blue(`\u2139 ${i18n.t("api:existingApiConfig")}`)}`);
+  console.log(ansis.gray(`  ${i18n.t("api:apiConfigUrl")}: ${existingConfig.url || "N/A"}`));
+  console.log(ansis.gray(`  ${i18n.t("api:apiConfigKey")}: ${existingConfig.key ? `***${existingConfig.key.slice(-4)}` : "N/A"}`));
+  console.log(ansis.gray(`  ${i18n.t("api:apiConfigAuthType")}: ${existingConfig.authType || "N/A"}
+`));
+  const { choice } = await inquirer.prompt({
+    type: "list",
+    name: "choice",
+    message: i18n.t("api:selectCustomConfigAction"),
+    choices: [
+      {
+        name: i18n.t("api:modifyPartialConfig"),
+        value: "modify-partial"
+      },
+      {
+        name: i18n.t("api:modifyAllConfig"),
+        value: "modify-all"
+      },
+      {
+        name: i18n.t("api:keepExistingConfig"),
+        value: "keep-existing"
+      }
+    ]
+  });
+  return choice || null;
+}
 
 const PROVIDER_PRESETS_URL = "https://pub-0dc3e1677e894f07bbea11b17a29e032.r2.dev/providers.json";
 async function fetchProviderPresets() {
@@ -1443,6 +1537,12 @@ async function configureCcrProxy(ccrConfig) {
   settings.env.ANTHROPIC_BASE_URL = `http://${host}:${port}`;
   settings.env.ANTHROPIC_API_KEY = apiKey;
   writeJsonConfig(SETTINGS_FILE, settings);
+  try {
+    setPrimaryApiKey();
+  } catch (error) {
+    ensureI18nInitialized();
+    console.error(i18n.t("mcp:primaryApiKeySetFailed"), error);
+  }
 }
 async function selectCcrPreset() {
   ensureI18nInitialized();
@@ -3021,6 +3121,11 @@ async function runCodexSystemPromptSelection() {
       id: "nekomata-engineer",
       name: i18n.t("configuration:outputStyles.nekomata-engineer.name"),
       description: i18n.t("configuration:outputStyles.nekomata-engineer.description")
+    },
+    {
+      id: "ojousama-engineer",
+      name: i18n.t("configuration:outputStyles.ojousama-engineer.name"),
+      description: i18n.t("configuration:outputStyles.ojousama-engineer.description")
     }
   ].filter((style) => exists(join(systemPromptSrc, `${style.id}.md`)));
   if (availablePrompts.length === 0)
@@ -3811,6 +3916,11 @@ const OUTPUT_STYLES = [
     isCustom: true,
     filePath: "laowang-engineer.md"
   },
+  {
+    id: "ojousama-engineer",
+    isCustom: true,
+    filePath: "ojousama-engineer.md"
+  },
   // Built-in styles (no template files)
   {
     id: "default",
@@ -3899,6 +4009,11 @@ async function configureOutputStyle(preselectedStyles, preselectedDefault) {
       id: "nekomata-engineer",
       name: i18n.t("configuration:outputStyles.nekomata-engineer.name"),
       description: i18n.t("configuration:outputStyles.nekomata-engineer.description")
+    },
+    {
+      id: "ojousama-engineer",
+      name: i18n.t("configuration:outputStyles.ojousama-engineer.name"),
+      description: i18n.t("configuration:outputStyles.ojousama-engineer.description")
     }
   ];
   const availableStyles = getAvailableOutputStyles();
@@ -4014,6 +4129,11 @@ async function configureApiCompletely(preselectedAuthType) {
       name: "authType",
       message: i18n.t("api:configureApi"),
       choices: addNumbersToChoices([
+        {
+          name: i18n.t("api:useOfficialLogin"),
+          value: "official",
+          short: i18n.t("api:useOfficialLogin")
+        },
         {
           name: `${i18n.t("api:useAuthToken")} - ${ansis.gray(i18n.t("api:authTokenDesc"))}`,
           value: "auth_token",
@@ -4032,6 +4152,15 @@ async function configureApiCompletely(preselectedAuthType) {
     }
     authType = selectedAuthType;
   }
+  if (authType === "official") {
+    const success = switchToOfficialLogin$1();
+    if (success) {
+      return null;
+    } else {
+      console.log(ansis.red(i18n.t("api:officialLoginFailed")));
+      return null;
+    }
+  }
   const { url } = await inquirer.prompt({
     type: "input",
     name: "url",
@@ -4688,6 +4817,80 @@ async function init(options = {}) {
     const zcfConfig = readZcfConfig();
     const codeToolType = resolveCodeToolType(options.codeType, zcfConfig?.codeToolType);
     options.codeType = codeToolType;
+    async function selectApiConfigurationMode() {
+      const { apiMode } = await inquirer.prompt({
+        type: "list",
+        name: "apiMode",
+        message: i18n.t("api:selectApiMode"),
+        choices: [
+          {
+            name: i18n.t("api:useOfficialLogin"),
+            value: "official"
+          },
+          {
+            name: i18n.t("api:customApiConfig"),
+            value: "custom"
+          },
+          {
+            name: i18n.t("api:useCcrProxy"),
+            value: "ccr"
+          },
+          {
+            name: i18n.t("api:skipApi"),
+            value: "skip"
+          }
+        ]
+      });
+      return apiMode;
+    }
+    async function handleCustomApiConfiguration(existingConfig) {
+      if (existingConfig) {
+        const customConfigAction = await promptApiConfigurationAction();
+        if (customConfigAction === "modify-partial") {
+          await modifyApiConfigPartially(existingConfig);
+          return null;
+        } else if (customConfigAction === "modify-all") {
+          return await configureApiCompletely();
+        } else if (customConfigAction === "keep-existing") {
+          try {
+            addCompletedOnboarding();
+          } catch (error) {
+            console.error(ansis.red(i18n.t("errors:failedToSetOnboarding")), error);
+          }
+          try {
+            setPrimaryApiKey();
+          } catch (error) {
+            const { ensureI18nInitialized, i18n: i18nModule } = await Promise.resolve().then(function () { return index; });
+            ensureI18nInitialized();
+            console.error(i18nModule.t("mcp:primaryApiKeySetFailed"), error);
+          }
+          return null;
+        }
+      } else {
+        const { apiChoice } = await inquirer.prompt({
+          type: "list",
+          name: "apiChoice",
+          message: i18n.t("api:configureApi"),
+          choices: [
+            {
+              name: `${i18n.t("api:useAuthToken")} - ${ansis.gray(i18n.t("api:authTokenDesc"))}`,
+              value: "auth_token",
+              short: i18n.t("api:useAuthToken")
+            },
+            {
+              name: `${i18n.t("api:useApiKey")} - ${ansis.gray(i18n.t("api:apiKeyDesc"))}`,
+              value: "api_key",
+              short: i18n.t("api:useApiKey")
+            }
+          ]
+        });
+        if (!apiChoice) {
+          console.log(ansis.yellow(i18n.t("common:cancelled")));
+          process.exit(0);
+        }
+        return await configureApiCompletely(apiChoice);
+      }
+    }
     if (!options.skipBanner) {
       displayBannerWithInfo(CODE_TOOL_BANNERS[codeToolType] || "ZCF");
     }
@@ -4859,94 +5062,22 @@ async function init(options = {}) {
         }
       } else {
         const existingApiConfig = getExistingApiConfig();
-        if (existingApiConfig) {
-          console.log(`
-${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.t("api:apiConfigKey")}: ${existingApiConfig.key ? formatApiKeyDisplay(existingApiConfig.key) : i18n.t("common:notConfigured")}`
-            )
-          );
-          console.log(
-            ansis.gray(`  ${i18n.t("api:apiConfigAuthType")}: ${existingApiConfig.authType || i18n.t("common:notConfigured")}
-`)
-          );
-          const { action: apiAction } = await inquirer.prompt({
-            type: "list",
-            name: "action",
-            message: i18n.t("api:selectApiAction"),
-            choices: addNumbersToChoices([
-              { 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" },
-              { name: i18n.t("api:skipApi"), value: "skip" }
-            ])
-          });
-          if (!apiAction) {
-            console.log(ansis.yellow(i18n.t("common:cancelled")));
-            process.exit(0);
-          }
-          if (apiAction === "keep" || apiAction === "skip") {
-            apiConfig = null;
-            if (apiAction === "keep") {
-              try {
-                addCompletedOnboarding();
-              } catch (error) {
-                console.error(ansis.red(i18n.t("errors:failedToSetOnboarding")), error);
-              }
-            }
-          } else if (apiAction === "modify-partial") {
-            await modifyApiConfigPartially(existingApiConfig);
-            apiConfig = null;
-          } else if (apiAction === "modify-all") {
-            apiConfig = await configureApiCompletely();
-          } else if (apiAction === "use-ccr") {
-            const ccrStatus = await isCcrInstalled();
-            if (!ccrStatus.hasCorrectPackage) {
-              await installCcr();
-            } else {
-              console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrAlreadyInstalled")}`));
-            }
-            const ccrConfigured = await setupCcrConfiguration();
-            if (ccrConfigured) {
-              console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrSetupComplete")}`));
+        const apiMode = await selectApiConfigurationMode();
+        switch (apiMode) {
+          case "official": {
+            const success = switchToOfficialLogin$1();
+            if (success) {
+              console.log(ansis.green(`\u2714 ${i18n.t("api:officialLoginConfigured")}`));
               apiConfig = null;
+            } else {
+              console.log(ansis.red(i18n.t("api:officialLoginFailed")));
             }
+            break;
           }
-        } else {
-          const { apiChoice } = await inquirer.prompt({
-            type: "list",
-            name: "apiChoice",
-            message: i18n.t("api:configureApi"),
-            choices: [
-              {
-                name: `${i18n.t("api:useAuthToken")} - ${ansis.gray(i18n.t("api:authTokenDesc"))}`,
-                value: "auth_token",
-                short: i18n.t("api:useAuthToken")
-              },
-              {
-                name: `${i18n.t("api:useApiKey")} - ${ansis.gray(i18n.t("api:apiKeyDesc"))}`,
-                value: "api_key",
-                short: i18n.t("api:useApiKey")
-              },
-              {
-                name: `${i18n.t("api:useCcrProxy")} - ${ansis.gray(i18n.t("api:ccrProxyDesc"))}`,
-                value: "ccr_proxy",
-                short: i18n.t("api:useCcrProxy")
-              },
-              {
-                name: i18n.t("api:skipApi"),
-                value: "skip"
-              }
-            ]
-          });
-          if (!apiChoice) {
-            console.log(ansis.yellow(i18n.t("common:cancelled")));
-            process.exit(0);
-          }
-          if (apiChoice === "ccr_proxy") {
+          case "custom":
+            apiConfig = await handleCustomApiConfiguration(existingApiConfig);
+            break;
+          case "ccr": {
             const ccrStatus = await isCcrInstalled();
             if (!ccrStatus.hasCorrectPackage) {
               await installCcr();
@@ -4958,9 +5089,14 @@ ${ansis.blue(`\u2139 ${i18n.t("api:existingApiConfig")}`)}`);
               console.log(ansis.green(`\u2714 ${i18n.t("ccr:ccrSetupComplete")}`));
               apiConfig = null;
             }
-          } else if (apiChoice !== "skip") {
-            apiConfig = await configureApiCompletely(apiChoice);
+            break;
           }
+          case "skip":
+            apiConfig = null;
+            break;
+          default:
+            console.log(ansis.yellow(i18n.t("common:cancelled")));
+            process.exit(0);
         }
       }
     }
@@ -5205,4 +5341,4 @@ async function openSettingsJson() {
   }
 }
 
-export { writeCodexConfig as $, AI_OUTPUT_LANGUAGES as A, removeApiKeyFromRejected as B, CLAUDE_DIR as C, DEFAULT_CODE_TOOL_TYPE as D, manageApiKeyApproval as E, ensureClaudeDir as F, backupExistingConfig as G, copyConfigFiles as H, configureApi as I, mergeConfigs as J, updateCustomModel as K, LEGACY_ZCF_CONFIG_FILES as L, updateDefaultModel as M, mergeSettingsFile as N, getExistingModelConfig as O, getExistingApiConfig as P, applyAiLanguageDirective as Q, isClaudeCodeInstalled as R, SETTINGS_FILE as S, installClaudeCode as T, isLocalClaudeCodeInstalled as U, getInstallationStatus as V, removeLocalClaudeCode as W, i18n as X, readCodexConfig as Y, ZCF_CONFIG_DIR as Z, backupCodexComplete as _, commandExists as a, writeAuthFile as a0, ensureI18nInitialized as a1, detectConfigManagementMode as a2, addNumbersToChoices as a3, readCcrConfig as a4, isCcrInstalled as a5, installCcr as a6, configureCcrFeature as a7, handleExitPromptError as a8, handleGeneralError as a9, configureCodexMcp as aA, configureCodexApi as aB, runCodexWorkflowImport as aC, runCodexFullInit as aD, listCodexProviders as aE, getCurrentCodexProvider as aF, switchCodexProvider as aG, switchToOfficialLogin as aH, switchToProvider as aI, readZcfConfigAsync as aJ, initI18n as aK, selectScriptLanguage as aL, fsOperations as aM, prompts as aN, codex as aO, updateZcfConfig as aa, changeLanguage as ab, readZcfConfig as ac, configureOutputStyle as ad, isWindows as ae, selectMcpServices as af, getMcpServices as ag, formatApiKeyDisplay as ah, modifyApiConfigPartially as ai, setupCcrConfiguration as aj, validateApiKey as ak, COMETIX_COMMAND_NAME as al, COMETIX_COMMANDS as am, installCometixLine as an, checkAndUpdateTools as ao, readJsonConfig as ap, writeJsonConfig as aq, displayBanner as ar, runCodexUpdate as as, version as at, resolveAiOutputLanguage as au, updatePromptOnly as av, selectAndInstallWorkflows as aw, checkClaudeCodeVersionAndPrompt as ax, displayBannerWithInfo as ay, runCodexUninstall as az, importRecommendedEnv as b, cleanupPermissions as c, importRecommendedPermissions as d, CLAUDE_MD_FILE as e, ClAUDE_CONFIG_FILE as f, getPlatform as g, ZCF_CONFIG_FILE as h, init as i, CODE_TOOL_TYPES as j, CODE_TOOL_BANNERS as k, isCodeToolType as l, mergeAndCleanPermissions as m, SUPPORTED_LANGS as n, openSettingsJson as o, LANG_LABELS as p, getAiOutputLanguageLabel as q, getMcpConfigPath as r, readMcpConfig as s, backupMcpConfig as t, mergeMcpServers as u, buildMcpServerConfig as v, writeMcpConfig as w, fixWindowsMcpConfig as x, addCompletedOnboarding as y, ensureApiKeyApproved 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, 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 };