zcf 3.0.2 → 3.0.3

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:
@@ -421,7 +421,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 +443,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 +466,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
@@ -483,30 +487,7 @@ Enter your choice: _
 ? 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 +506,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 +562,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.0.3";
 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();
@@ -4014,6 +4114,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 +4137,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 +4802,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 +5047,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 +5074,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 +5326,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 };

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import cac from 'cac';
 import ansis from 'ansis';
-import { a1 as ensureI18nInitialized, X as i18n, a4 as readCcrConfig, a5 as isCcrInstalled, a6 as installCcr, a7 as configureCcrFeature, a8 as handleExitPromptError, a9 as handleGeneralError, n as SUPPORTED_LANGS, a3 as addNumbersToChoices, p as LANG_LABELS, aa as updateZcfConfig, ab as changeLanguage, ac as readZcfConfig, o as openSettingsJson, d as importRecommendedPermissions, b as importRecommendedEnv, Q as applyAiLanguageDirective, ad as configureOutputStyle, O as getExistingModelConfig, K as updateCustomModel, M as updateDefaultModel, ae as isWindows, s as readMcpConfig, x as fixWindowsMcpConfig, w as writeMcpConfig, af as selectMcpServices, t as backupMcpConfig, ag as getMcpServices, v as buildMcpServerConfig, u as mergeMcpServers, P as getExistingApiConfig, ah as formatApiKeyDisplay, y as addCompletedOnboarding, ai as modifyApiConfigPartially, aj as setupCcrConfiguration, ak as validateApiKey, I as configureApi, al as COMETIX_COMMAND_NAME, am as COMETIX_COMMANDS, an as installCometixLine, ao as checkAndUpdateTools, ap as readJsonConfig, aq as writeJsonConfig, h as ZCF_CONFIG_FILE, ar as displayBanner, as as runCodexUpdate, at as version, au as resolveAiOutputLanguage, av as updatePromptOnly, aw as selectAndInstallWorkflows, ax as checkClaudeCodeVersionAndPrompt, l as isCodeToolType, D as DEFAULT_CODE_TOOL_TYPE, ay as displayBannerWithInfo, k as CODE_TOOL_BANNERS, az as runCodexUninstall, aA as configureCodexMcp, aB as configureCodexApi, aC as runCodexWorkflowImport, aD as runCodexFullInit, i as init, aE as listCodexProviders, aF as getCurrentCodexProvider, aG as switchCodexProvider, Y as readCodexConfig, aH as switchToOfficialLogin, aI as switchToProvider, aJ as readZcfConfigAsync, aK as initI18n, aL as selectScriptLanguage } from './chunks/simple-config.mjs';
+import { a5 as ensureI18nInitialized, a0 as i18n, a8 as readCcrConfig, a9 as isCcrInstalled, aa as installCcr, ab as configureCcrFeature, ac as handleExitPromptError, ad as handleGeneralError, p as SUPPORTED_LANGS, a7 as addNumbersToChoices, q as LANG_LABELS, ae as updateZcfConfig, af as changeLanguage, ag as readZcfConfig, o as openSettingsJson, d as importRecommendedPermissions, b as importRecommendedEnv, T as applyAiLanguageDirective, ah as configureOutputStyle, Q as getExistingModelConfig, N as updateCustomModel, O as updateDefaultModel, ai as isWindows, t as readMcpConfig, y as fixWindowsMcpConfig, w as writeMcpConfig, aj as selectMcpServices, u as backupMcpConfig, ak as getMcpServices, x as buildMcpServerConfig, v as mergeMcpServers, al as setupCcrConfiguration, R as getExistingApiConfig, V as promptApiConfigurationAction, am as modifyApiConfigPartially, an as validateApiKey, K as configureApi, ao as formatApiKeyDisplay, U as switchToOfficialLogin, ap as COMETIX_COMMAND_NAME, aq as COMETIX_COMMANDS, ar as installCometixLine, as as checkAndUpdateTools, at as readJsonConfig, au as writeJsonConfig, j as ZCF_CONFIG_FILE, av as displayBanner, aw as runCodexUpdate, ax as version, ay as resolveAiOutputLanguage, az as updatePromptOnly, aA as selectAndInstallWorkflows, aB as checkClaudeCodeVersionAndPrompt, n as isCodeToolType, D as DEFAULT_CODE_TOOL_TYPE, aC as displayBannerWithInfo, l as CODE_TOOL_BANNERS, aD as runCodexUninstall, aE as configureCodexMcp, aF as configureCodexApi, aG as runCodexWorkflowImport, aH as runCodexFullInit, i as init, aI as listCodexProviders, aJ as getCurrentCodexProvider, aK as switchCodexProvider, a1 as readCodexConfig, aL as switchToOfficialLogin$1, aM as switchToProvider, aN as readZcfConfigAsync, aO as initI18n, aP as selectScriptLanguage } from './chunks/simple-config.mjs';
 import { existsSync } from 'node:fs';
 import { homedir } from 'node:os';
 import inquirer from 'inquirer';
@@ -246,59 +246,25 @@ async function handleCancellation() {
   ensureI18nInitialized();
   console.log(ansis.yellow(i18n.t("common:cancelled")));
 }
-async function configureApiFeature() {
+async function handleOfficialLoginMode() {
   ensureI18nInitialized();
-  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 } = 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" }
-      ])
-    });
-    if (!action) {
-      await handleCancellation();
-      return;
-    }
-    if (action === "keep") {
+  const success = switchToOfficialLogin();
+  if (success) {
+    console.log(ansis.green(`\u2714 ${i18n.t("api:officialLoginConfigured")}`));
+  } else {
+    console.log(ansis.red(i18n.t("api:officialLoginFailed")));
+  }
+}
+async function handleCustomApiMode() {
+  ensureI18nInitialized();
+  const existingConfig = getExistingApiConfig();
+  if (existingConfig) {
+    const configAction = await promptApiConfigurationAction();
+    if (configAction === "keep-existing") {
       console.log(ansis.green(`\u2714 ${i18n.t("api:keepExistingConfig")}`));
-      try {
-        addCompletedOnboarding();
-      } catch (error) {
-        console.error(ansis.red(i18n.t("errors:failedToSetOnboarding")), error);
-      }
-      return;
-    } else if (action === "modify-partial") {
-      await modifyApiConfigPartially(existingApiConfig);
       return;
-    } else if (action === "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")}`));
-      }
+    } else if (configAction === "modify-partial") {
+      await modifyApiConfigPartially(existingConfig);
       return;
     }
   }
@@ -317,28 +283,11 @@ ${ansis.blue(`\u2139 ${i18n.t("api:existingApiConfig")}`)}`);
         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 || apiChoice === "skip") {
-    return;
-  }
-  if (apiChoice === "ccr_proxy") {
-    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")}`));
-    }
+    await handleCancellation();
     return;
   }
   const { url } = await inquirer.prompt({
@@ -389,6 +338,51 @@ ${ansis.blue(`\u2139 ${i18n.t("api:existingApiConfig")}`)}`);
     console.log(ansis.gray(`  Key: ${formatApiKeyDisplay(configuredApi.key)}`));
   }
 }
+async function handleCcrProxyMode() {
+  ensureI18nInitialized();
+  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")}`));
+  }
+}
+async function configureApiFeature() {
+  ensureI18nInitialized();
+  const { mode } = await inquirer.prompt({
+    type: "list",
+    name: "mode",
+    message: i18n.t("api:apiModePrompt"),
+    choices: addNumbersToChoices([
+      { name: i18n.t("api:apiModeOfficial"), value: "official" },
+      { name: i18n.t("api:apiModeCustom"), value: "custom" },
+      { name: i18n.t("api:apiModeCcr"), value: "ccr" },
+      { name: i18n.t("api:apiModeSkip"), value: "skip" }
+    ])
+  });
+  if (!mode || mode === "skip") {
+    await handleCancellation();
+    return;
+  }
+  switch (mode) {
+    case "official":
+      await handleOfficialLoginMode();
+      break;
+    case "custom":
+      await handleCustomApiMode();
+      break;
+    case "ccr":
+      await handleCcrProxyMode();
+      break;
+    default:
+      await handleCancellation();
+      break;
+  }
+}
 async function configureMcpFeature() {
   ensureI18nInitialized();
   if (isWindows()) {
@@ -476,15 +470,15 @@ ${ansis.blue(`\u2139 ${i18n.t("configuration:existingModelConfig") || "Existing
         value: "opus"
       },
       {
-        name: i18n.t("configuration:opusPlanModelOption") || "OpusPlan - Use Opus for planning, write code with sonnet, recommended",
-        value: "opusplan"
+        name: i18n.t("configuration:sonnet1mModelOption") || "Sonnet 1M - 1M context version",
+        value: "sonnet[1m]"
       },
       {
         name: i18n.t("configuration:customModelOption") || "Custom - Specify custom model names",
         value: "custom"
       }
     ]),
-    default: existingModel ? ["default", "opus", "opusplan", "custom"].indexOf(existingModel) : 0
+    default: existingModel ? ["default", "opus", "sonnet[1m]", "custom"].indexOf(existingModel) : 0
   });
   if (!model) {
     await handleCancellation();
@@ -559,7 +553,7 @@ ${ansis.blue(`\u2139 ${i18n.t("configuration:existingLanguageConfig") || "Existi
         return;
       }
     }
-    const { selectAiOutputLanguage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aN; });
+    const { selectAiOutputLanguage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aR; });
     const aiOutputLang = await selectAiOutputLanguage();
     applyAiLanguageDirective(aiOutputLang);
     updateZcfConfig({ aiOutputLang });
@@ -592,7 +586,7 @@ async function changeScriptLanguageFeature(currentLang) {
 }
 async function configureCodexDefaultModelFeature() {
   ensureI18nInitialized();
-  const { readCodexConfig } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aO; });
+  const { readCodexConfig } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aS; });
   const existingConfig = readCodexConfig();
   const currentModel = existingConfig?.model;
   if (currentModel) {
@@ -697,7 +691,7 @@ ${ansis.blue(`\u2139 ${i18n.t("configuration:existingLanguageConfig") || "Existi
         return;
       }
     }
-    const { selectAiOutputLanguage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aN; });
+    const { selectAiOutputLanguage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aR; });
     const aiOutputLang = await selectAiOutputLanguage();
     await updateCodexLanguageDirective(aiOutputLang);
     updateZcfConfig({ aiOutputLang });
@@ -705,14 +699,14 @@ ${ansis.blue(`\u2139 ${i18n.t("configuration:existingLanguageConfig") || "Existi
   } else if (option === "systemPrompt") {
     const zcfConfig = readZcfConfig();
     const currentLang = zcfConfig?.aiOutputLang || "English";
-    const { runCodexSystemPromptSelection } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aO; });
+    const { runCodexSystemPromptSelection } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aS; });
     await runCodexSystemPromptSelection();
     await ensureLanguageDirectiveInAgents(currentLang);
     console.log(ansis.green(`\u2714 ${i18n.t("configuration:systemPromptConfigured")}`));
   }
 }
 async function updateCodexModelProvider(modelProvider) {
-  const { readCodexConfig, writeCodexConfig, backupCodexConfig, getBackupMessage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aO; });
+  const { readCodexConfig, writeCodexConfig, backupCodexConfig, getBackupMessage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aS; });
   const backupPath = backupCodexConfig();
   if (backupPath) {
     console.log(ansis.gray(getBackupMessage(backupPath)));
@@ -733,7 +727,7 @@ async function updateCodexModelProvider(modelProvider) {
   writeCodexConfig(updatedConfig);
 }
 async function ensureLanguageDirectiveInAgents(aiOutputLang) {
-  const { readFile, writeFile, exists } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aM; });
+  const { readFile, writeFile, exists } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aQ; });
   const { homedir } = await import('node:os');
   const { join } = await import('pathe');
   const CODEX_AGENTS_FILE = join(homedir(), ".codex", "AGENTS.md");
@@ -751,7 +745,7 @@ async function ensureLanguageDirectiveInAgents(aiOutputLang) {
   const langLabel = languageLabels[aiOutputLang] || aiOutputLang;
   const hasLanguageDirective = /\*\*Most Important:\s*Always respond in [^*]+\*\*/i.test(content);
   if (!hasLanguageDirective) {
-    const { backupCodexAgents, getBackupMessage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aO; });
+    const { backupCodexAgents, getBackupMessage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aS; });
     const backupPath = backupCodexAgents();
     if (backupPath) {
       console.log(ansis.gray(getBackupMessage(backupPath)));
@@ -768,8 +762,8 @@ async function ensureLanguageDirectiveInAgents(aiOutputLang) {
   }
 }
 async function updateCodexLanguageDirective(aiOutputLang) {
-  const { readFile, writeFile, exists } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aM; });
-  const { backupCodexAgents, getBackupMessage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aO; });
+  const { readFile, writeFile, exists } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aQ; });
+  const { backupCodexAgents, getBackupMessage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aS; });
   const { homedir } = await import('node:os');
   const { join } = await import('pathe');
   const CODEX_AGENTS_FILE = join(homedir(), ".codex", "AGENTS.md");
@@ -1830,7 +1824,7 @@ async function update(options = {}) {
       }
       return;
     }
-    const { resolveTemplateLanguage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aN; });
+    const { resolveTemplateLanguage } = await import('./chunks/simple-config.mjs').then(function (n) { return n.aR; });
     const configLang = await resolveTemplateLanguage(
       options.configLang,
       // Command line option
@@ -2273,7 +2267,7 @@ async function handleInteractiveSwitch() {
     }
     let success = false;
     if (selectedConfig === "official") {
-      success = await switchToOfficialLogin();
+      success = await switchToOfficialLogin$1();
     } else {
       success = await switchToProvider(selectedConfig);
     }

package/dist/i18n/locales/en/api.json

@@ -25,11 +25,22 @@
   "modifyAuthType": "Modify auth type",
   "modifyPartialConfig": "Modify partial configuration",
   "selectApiAction": "Select API processing operation",
+  "selectApiMode": "Select API configuration mode",
+  "selectCustomConfigAction": "Select custom configuration action",
   "selectModifyItems": "Select items to modify",
   "selectNewAuthType": "Select new auth type (current: {type})",
   "skipApi": "Skip (configure manually later)",
+  "customApiConfig": "Custom API configuration",
   "urlRequired": "URL is required",
   "useApiKey": "Use API Key (Key authentication)",
   "useAuthToken": "Use Auth Token (OAuth authentication)",
-  "useCcrProxy": "Use CCR Proxy"
+  "useCcrProxy": "Use CCR Proxy",
+  "useOfficialLogin": "Use Official Login",
+  "officialLoginConfigured": "Switched to official login mode",
+  "officialLoginFailed": "Failed to switch to official login mode",
+  "apiModeOfficial": "Use Official Login (No API Configuration)",
+  "apiModeCustom": "Custom API Configuration",
+  "apiModeCcr": "Use CCR Proxy",
+  "apiModeSkip": "Skip",
+  "apiModePrompt": "Select API configuration mode"
 }

package/dist/i18n/locales/en/configuration.json

@@ -38,7 +38,7 @@
   "openSettingsJsonDesc": "Advanced user customization",
   "openingSettingsJson": "Opening settings.json...",
   "opusModelOption": "Opus - Only use opus, high token consumption, use with caution",
-  "opusPlanModelOption": "OpusPlan - Use Opus for planning, write code with sonnet, recommended",
+  "sonnet1mModelOption": "Sonnet 1M - 1M context version",
   "outputStyleInstalled": "Output styles installed successfully",
   "outputStyles.default.description": "Claude completes coding tasks efficiently and provides concise responses (Claude Code built-in)",
   "outputStyles.default.name": "Default",

package/dist/i18n/locales/en/errors.json

@@ -10,7 +10,7 @@
   "invalidOutputStyle": "Invalid output style: {style}. Available styles: {validStyles}",
   "invalidDefaultOutputStyle": "Invalid default output style: {style}. Available styles: {validStyles}",
   "invalidWorkflow": "Invalid workflow: {workflow}. Available workflows: {validWorkflows}",
-  "invalidModel": "Invalid model: {model}. Expected 'opus', 'sonnet', or 'opusplan'",
+  "invalidModel": "Invalid model: {model}. Expected 'opus', 'sonnet', or 'sonnet[1m]'",
   "invalidEnvConfig": "Invalid env configuration: expected object",
   "invalidBaseUrl": "Invalid ANTHROPIC_BASE_URL: expected string",
   "invalidApiKeyConfig": "Invalid ANTHROPIC_API_KEY: expected string",

package/dist/i18n/locales/en/mcp.json

@@ -17,5 +17,6 @@
   "services.spec-workflow.description": "Structured feature development workflow, systematic approach from requirements to implementation",
   "services.spec-workflow.name": "Spec Workflow",
   "apiKeyApprovalFailed": "Failed to manage API key approval status",
-  "apiKeyPrompt": "Enter API Key"
+  "apiKeyPrompt": "Enter API Key",
+  "primaryApiKeySetFailed": "Failed to set primaryApiKey"
 }

package/dist/i18n/locales/en/menu.json

@@ -9,7 +9,7 @@
   "menuDescriptions.configureApiOrCcr": "Configure API URL, authentication or CCR proxy",
   "menuDescriptions.configureEnvPermission": "Import privacy protection environment variables and system permissions",
   "menuDescriptions.configureMcp": "Configure MCP services (includes Windows fix)",
-  "menuDescriptions.configureModel": "Set default model (opus/sonnet/opusplan/custom)",
+  "menuDescriptions.configureModel": "Set default model (opus/sonnet/sonnet 1m/custom)",
   "menuDescriptions.fullInit": "Install Claude Code + Import workflow + Configure API or CCR proxy + Configure MCP services",
   "menuDescriptions.importWorkflow": "Import/update workflow-related files only",
   "menuOptions.ccrManagement": "CCR",

package/dist/i18n/locales/zh-CN/api.json

@@ -25,11 +25,22 @@
   "modifyAuthType": "修改认证类型",
   "modifyPartialConfig": "修改部分配置",
   "selectApiAction": "请选择API处理操作",
+  "selectApiMode": "请选择 API 配置模式",
+  "selectCustomConfigAction": "请选择自定义配置操作",
   "selectModifyItems": "请选择要修改的项",
   "selectNewAuthType": "选择新的认证类型（当前：{type}）",
   "skipApi": "跳过（稍后手动配置）",
+  "customApiConfig": "自定义 API 配置",
   "urlRequired": "URL 为必填项",
   "useApiKey": "使用 API Key (密钥认证)",
   "useAuthToken": "使用 Auth Token (OAuth 认证)",
-  "useCcrProxy": "使用 CCR 代理"
+  "useCcrProxy": "使用 CCR 代理",
+  "useOfficialLogin": "使用官方登录",
+  "officialLoginConfigured": "已切换到官方登录模式",
+  "officialLoginFailed": "切换到官方登录模式失败",
+  "apiModeOfficial": "使用官方登录（不配置 API）",
+  "apiModeCustom": "自定义 API 配置",
+  "apiModeCcr": "使用CCR代理",
+  "apiModeSkip": "跳过",
+  "apiModePrompt": "请选择 API 配置模式"
 }

package/dist/i18n/locales/zh-CN/configuration.json

@@ -38,7 +38,7 @@
   "openSettingsJsonDesc": "高级用户自定义",
   "openingSettingsJson": "正在打开 settings.json...",
   "opusModelOption": "Opus - 只用opus，token消耗高，慎用",
-  "opusPlanModelOption": "OpusPlan - Opus做计划，sonnet编写代码，推荐",
+  "sonnet1mModelOption": "Sonnet 1M - 1M上下文版本",
   "outputStyleInstalled": "输出风格安装成功",
   "outputStyles.default.description": "完成编码任务时高效且提供简洁响应 (Claude Code自带)",
   "outputStyles.default.name": "默认风格",

package/dist/i18n/locales/zh-CN/errors.json

@@ -10,7 +10,7 @@
   "invalidOutputStyle": "无效的输出样式：{style}。可用的样式：{validStyles}",
   "invalidDefaultOutputStyle": "无效的默认输出样式：{style}。可用的样式：{validStyles}",
   "invalidWorkflow": "无效的工作流：{workflow}。可用的工作流：{validWorkflows}",
-  "invalidModel": "无效的模型：{model}。期望的值：'opus', 'sonnet', 或 'opusplan'",
+  "invalidModel": "无效的模型：{model}。期望的值：'opus', 'sonnet', 或 'sonnet[1m]'",
   "invalidEnvConfig": "无效的环境配置：期望对象类型",
   "invalidBaseUrl": "无效的 ANTHROPIC_BASE_URL：期望字符串类型",
   "invalidApiKeyConfig": "无效的 ANTHROPIC_API_KEY：期望字符串类型",

package/dist/i18n/locales/zh-CN/mcp.json

@@ -17,5 +17,6 @@
   "services.spec-workflow.description": "规范化特性开发工作流程，从需求到实现的系统化方法",
   "services.spec-workflow.name": "Spec 工作流",
   "apiKeyApprovalFailed": "API密钥批准状态管理失败",
-  "apiKeyPrompt": "请输入 API Key"
+  "apiKeyPrompt": "请输入 API Key",
+  "primaryApiKeySetFailed": "设置 primaryApiKey 失败"
 }

package/dist/i18n/locales/zh-CN/menu.json

@@ -9,7 +9,7 @@
   "menuDescriptions.configureApiOrCcr": "配置 API URL、认证信息或 CCR 代理",
   "menuDescriptions.configureEnvPermission": "导入隐私保护环境变量和系统权限配置",
   "menuDescriptions.configureMcp": "配置 MCP 服务（含 Windows 修复）",
-  "menuDescriptions.configureModel": "设置默认模型（opus/sonnet/opusplan/自定义）",
+  "menuDescriptions.configureModel": "设置默认模型（opus/sonnet/sonnet 1m/自定义）",
   "menuDescriptions.fullInit": "安装 Claude Code + 导入工作流 + 配置 API 或 CCR 代理 + 配置 MCP 服务",
   "menuDescriptions.importWorkflow": "仅导入/更新工作流相关文件",
   "menuOptions.ccrManagement": "CCR",

package/dist/index.d.mts

@@ -2,6 +2,7 @@ declare const CLAUDE_DIR: string;
 declare const SETTINGS_FILE: string;
 declare const CLAUDE_MD_FILE: string;
 declare const ClAUDE_CONFIG_FILE: string;
+declare const CLAUDE_VSC_CONFIG_FILE: string;
 declare const ZCF_CONFIG_DIR: string;
 declare const ZCF_CONFIG_FILE: string;
 declare const LEGACY_ZCF_CONFIG_FILES: string[];
@@ -76,6 +77,7 @@ interface ClaudeConfiguration {
         rejected: string[];
     };
     env?: Record<string, string>;
+    primaryApiKey?: string;
 }
 
 declare function getMcpConfigPath(): string;
@@ -105,6 +107,12 @@ declare function removeApiKeyFromRejected(config: ClaudeConfiguration, apiKey: s
  * @param apiKey - The API key to ensure is approved (e.g., 'sk-zcf-x-ccr')
  */
 declare function manageApiKeyApproval(apiKey: string): void;
+/**
+ * Sets the primaryApiKey field in ~/.claude/config.json (VSCode extension config)
+ * This is required for Claude Code 2.0 to properly recognize third-party API configurations
+ * and prevent redirecting to official login page
+ */
+declare function setPrimaryApiKey(): void;
 
 /**
  * API configuration for Claude Code
@@ -128,10 +136,10 @@ declare function mergeConfigs(sourceFile: string, targetFile: string): void;
 declare function updateCustomModel(primaryModel?: string, fastModel?: string): void;
 /**
  * Update the default model configuration in settings.json
- * @param model - The model type to set: opus, sonnet, opusplan, default, or custom
+ * @param model - The model type to set: opus, sonnet, sonnet[1m], default, or custom
  * Note: 'custom' model type is handled differently - it should use environment variables instead
  */
-declare function updateDefaultModel(model: 'opus' | 'sonnet' | 'opusplan' | 'default' | 'custom'): void;
+declare function updateDefaultModel(model: 'opus' | 'sonnet' | 'sonnet[1m]' | 'default' | 'custom'): void;
 /**
  * Merge settings.json intelligently
  * Preserves user's environment variables and custom configurations
@@ -140,12 +148,24 @@ declare function mergeSettingsFile(templatePath: string, targetPath: string): vo
 /**
  * Get existing model configuration from settings.json
  */
-declare function getExistingModelConfig(): 'opus' | 'sonnet' | 'opusplan' | 'default' | 'custom' | null;
+declare function getExistingModelConfig(): 'opus' | 'sonnet' | 'sonnet[1m]' | 'default' | 'custom' | null;
 /**
  * Get existing API configuration from settings.json
  */
 declare function getExistingApiConfig(): ApiConfig | null;
 declare function applyAiLanguageDirective(aiOutputLang: AiOutputLanguage | string): void;
+/**
+ * Switch to official login mode - remove all third-party API configurations
+ * Removes: ANTHROPIC_BASE_URL, ANTHROPIC_AUTH_TOKEN, ANTHROPIC_API_KEY from settings.json
+ * Removes: primaryApiKey from ~/.claude/config.json
+ * Removes: hasCompletedOnboarding from ~/.claude.json
+ */
+declare function switchToOfficialLogin(): boolean;
+/**
+ * Prompt user for API configuration action when existing config is found
+ * Returns the user's choice for how to handle existing configuration
+ */
+declare function promptApiConfigurationAction(): Promise<'modify-partial' | 'modify-all' | 'keep-existing' | null>;
 
 declare function isClaudeCodeInstalled(): Promise<boolean>;
 declare function installClaudeCode(): Promise<void>;
@@ -194,5 +214,5 @@ declare function importRecommendedEnv(): Promise<void>;
 declare function importRecommendedPermissions(): Promise<void>;
 declare function openSettingsJson(): Promise<void>;
 
-export { AI_OUTPUT_LANGUAGES, CLAUDE_DIR, CLAUDE_MD_FILE, CODE_TOOL_BANNERS, CODE_TOOL_TYPES, ClAUDE_CONFIG_FILE, DEFAULT_CODE_TOOL_TYPE, LANG_LABELS, LEGACY_ZCF_CONFIG_FILES, SETTINGS_FILE, SUPPORTED_LANGS, ZCF_CONFIG_DIR, ZCF_CONFIG_FILE, addCompletedOnboarding, applyAiLanguageDirective, backupExistingConfig, backupMcpConfig, buildMcpServerConfig, cleanupPermissions, commandExists, configureApi, copyConfigFiles, ensureApiKeyApproved, ensureClaudeDir, fixWindowsMcpConfig, getAiOutputLanguageLabel, getExistingApiConfig, getExistingModelConfig, getInstallationStatus, getMcpConfigPath, getPlatform, importRecommendedEnv, importRecommendedPermissions, init, installClaudeCode, isClaudeCodeInstalled, isCodeToolType, isLocalClaudeCodeInstalled, manageApiKeyApproval, mergeAndCleanPermissions, mergeConfigs, mergeMcpServers, mergeSettingsFile, openSettingsJson, readMcpConfig, removeApiKeyFromRejected, removeLocalClaudeCode, updateCustomModel, updateDefaultModel, writeMcpConfig };
+export { AI_OUTPUT_LANGUAGES, CLAUDE_DIR, CLAUDE_MD_FILE, CLAUDE_VSC_CONFIG_FILE, CODE_TOOL_BANNERS, CODE_TOOL_TYPES, ClAUDE_CONFIG_FILE, DEFAULT_CODE_TOOL_TYPE, LANG_LABELS, LEGACY_ZCF_CONFIG_FILES, SETTINGS_FILE, SUPPORTED_LANGS, ZCF_CONFIG_DIR, ZCF_CONFIG_FILE, addCompletedOnboarding, applyAiLanguageDirective, backupExistingConfig, backupMcpConfig, buildMcpServerConfig, cleanupPermissions, commandExists, configureApi, copyConfigFiles, ensureApiKeyApproved, ensureClaudeDir, fixWindowsMcpConfig, getAiOutputLanguageLabel, getExistingApiConfig, getExistingModelConfig, getInstallationStatus, getMcpConfigPath, getPlatform, importRecommendedEnv, importRecommendedPermissions, init, installClaudeCode, isClaudeCodeInstalled, isCodeToolType, isLocalClaudeCodeInstalled, manageApiKeyApproval, mergeAndCleanPermissions, mergeConfigs, mergeMcpServers, mergeSettingsFile, openSettingsJson, promptApiConfigurationAction, readMcpConfig, removeApiKeyFromRejected, removeLocalClaudeCode, setPrimaryApiKey, switchToOfficialLogin, updateCustomModel, updateDefaultModel, writeMcpConfig };
 export type { AiOutputLanguage, ApiConfig, ClaudeConfiguration, CodeToolType, InstallationStatus, McpServerConfig, McpService, SupportedLang };

package/dist/index.d.ts

@@ -2,6 +2,7 @@ declare const CLAUDE_DIR: string;
 declare const SETTINGS_FILE: string;
 declare const CLAUDE_MD_FILE: string;
 declare const ClAUDE_CONFIG_FILE: string;
+declare const CLAUDE_VSC_CONFIG_FILE: string;
 declare const ZCF_CONFIG_DIR: string;
 declare const ZCF_CONFIG_FILE: string;
 declare const LEGACY_ZCF_CONFIG_FILES: string[];
@@ -76,6 +77,7 @@ interface ClaudeConfiguration {
         rejected: string[];
     };
     env?: Record<string, string>;
+    primaryApiKey?: string;
 }
 
 declare function getMcpConfigPath(): string;
@@ -105,6 +107,12 @@ declare function removeApiKeyFromRejected(config: ClaudeConfiguration, apiKey: s
  * @param apiKey - The API key to ensure is approved (e.g., 'sk-zcf-x-ccr')
  */
 declare function manageApiKeyApproval(apiKey: string): void;
+/**
+ * Sets the primaryApiKey field in ~/.claude/config.json (VSCode extension config)
+ * This is required for Claude Code 2.0 to properly recognize third-party API configurations
+ * and prevent redirecting to official login page
+ */
+declare function setPrimaryApiKey(): void;
 
 /**
  * API configuration for Claude Code
@@ -128,10 +136,10 @@ declare function mergeConfigs(sourceFile: string, targetFile: string): void;
 declare function updateCustomModel(primaryModel?: string, fastModel?: string): void;
 /**
  * Update the default model configuration in settings.json
- * @param model - The model type to set: opus, sonnet, opusplan, default, or custom
+ * @param model - The model type to set: opus, sonnet, sonnet[1m], default, or custom
  * Note: 'custom' model type is handled differently - it should use environment variables instead
  */
-declare function updateDefaultModel(model: 'opus' | 'sonnet' | 'opusplan' | 'default' | 'custom'): void;
+declare function updateDefaultModel(model: 'opus' | 'sonnet' | 'sonnet[1m]' | 'default' | 'custom'): void;
 /**
  * Merge settings.json intelligently
  * Preserves user's environment variables and custom configurations
@@ -140,12 +148,24 @@ declare function mergeSettingsFile(templatePath: string, targetPath: string): vo
 /**
  * Get existing model configuration from settings.json
  */
-declare function getExistingModelConfig(): 'opus' | 'sonnet' | 'opusplan' | 'default' | 'custom' | null;
+declare function getExistingModelConfig(): 'opus' | 'sonnet' | 'sonnet[1m]' | 'default' | 'custom' | null;
 /**
  * Get existing API configuration from settings.json
  */
 declare function getExistingApiConfig(): ApiConfig | null;
 declare function applyAiLanguageDirective(aiOutputLang: AiOutputLanguage | string): void;
+/**
+ * Switch to official login mode - remove all third-party API configurations
+ * Removes: ANTHROPIC_BASE_URL, ANTHROPIC_AUTH_TOKEN, ANTHROPIC_API_KEY from settings.json
+ * Removes: primaryApiKey from ~/.claude/config.json
+ * Removes: hasCompletedOnboarding from ~/.claude.json
+ */
+declare function switchToOfficialLogin(): boolean;
+/**
+ * Prompt user for API configuration action when existing config is found
+ * Returns the user's choice for how to handle existing configuration
+ */
+declare function promptApiConfigurationAction(): Promise<'modify-partial' | 'modify-all' | 'keep-existing' | null>;
 
 declare function isClaudeCodeInstalled(): Promise<boolean>;
 declare function installClaudeCode(): Promise<void>;
@@ -194,5 +214,5 @@ declare function importRecommendedEnv(): Promise<void>;
 declare function importRecommendedPermissions(): Promise<void>;
 declare function openSettingsJson(): Promise<void>;
 
-export { AI_OUTPUT_LANGUAGES, CLAUDE_DIR, CLAUDE_MD_FILE, CODE_TOOL_BANNERS, CODE_TOOL_TYPES, ClAUDE_CONFIG_FILE, DEFAULT_CODE_TOOL_TYPE, LANG_LABELS, LEGACY_ZCF_CONFIG_FILES, SETTINGS_FILE, SUPPORTED_LANGS, ZCF_CONFIG_DIR, ZCF_CONFIG_FILE, addCompletedOnboarding, applyAiLanguageDirective, backupExistingConfig, backupMcpConfig, buildMcpServerConfig, cleanupPermissions, commandExists, configureApi, copyConfigFiles, ensureApiKeyApproved, ensureClaudeDir, fixWindowsMcpConfig, getAiOutputLanguageLabel, getExistingApiConfig, getExistingModelConfig, getInstallationStatus, getMcpConfigPath, getPlatform, importRecommendedEnv, importRecommendedPermissions, init, installClaudeCode, isClaudeCodeInstalled, isCodeToolType, isLocalClaudeCodeInstalled, manageApiKeyApproval, mergeAndCleanPermissions, mergeConfigs, mergeMcpServers, mergeSettingsFile, openSettingsJson, readMcpConfig, removeApiKeyFromRejected, removeLocalClaudeCode, updateCustomModel, updateDefaultModel, writeMcpConfig };
+export { AI_OUTPUT_LANGUAGES, CLAUDE_DIR, CLAUDE_MD_FILE, CLAUDE_VSC_CONFIG_FILE, CODE_TOOL_BANNERS, CODE_TOOL_TYPES, ClAUDE_CONFIG_FILE, DEFAULT_CODE_TOOL_TYPE, LANG_LABELS, LEGACY_ZCF_CONFIG_FILES, SETTINGS_FILE, SUPPORTED_LANGS, ZCF_CONFIG_DIR, ZCF_CONFIG_FILE, addCompletedOnboarding, applyAiLanguageDirective, backupExistingConfig, backupMcpConfig, buildMcpServerConfig, cleanupPermissions, commandExists, configureApi, copyConfigFiles, ensureApiKeyApproved, ensureClaudeDir, fixWindowsMcpConfig, getAiOutputLanguageLabel, getExistingApiConfig, getExistingModelConfig, getInstallationStatus, getMcpConfigPath, getPlatform, importRecommendedEnv, importRecommendedPermissions, init, installClaudeCode, isClaudeCodeInstalled, isCodeToolType, isLocalClaudeCodeInstalled, manageApiKeyApproval, mergeAndCleanPermissions, mergeConfigs, mergeMcpServers, mergeSettingsFile, openSettingsJson, promptApiConfigurationAction, readMcpConfig, removeApiKeyFromRejected, removeLocalClaudeCode, setPrimaryApiKey, switchToOfficialLogin, updateCustomModel, updateDefaultModel, writeMcpConfig };
 export type { AiOutputLanguage, ApiConfig, ClaudeConfiguration, CodeToolType, InstallationStatus, McpServerConfig, McpService, SupportedLang };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { A as AI_OUTPUT_LANGUAGES, C as CLAUDE_DIR, e as CLAUDE_MD_FILE, k as CODE_TOOL_BANNERS, j as CODE_TOOL_TYPES, f as ClAUDE_CONFIG_FILE, D as DEFAULT_CODE_TOOL_TYPE, p as LANG_LABELS, L as LEGACY_ZCF_CONFIG_FILES, S as SETTINGS_FILE, n as SUPPORTED_LANGS, Z as ZCF_CONFIG_DIR, h as ZCF_CONFIG_FILE, y as addCompletedOnboarding, Q as applyAiLanguageDirective, G as backupExistingConfig, t as backupMcpConfig, v as buildMcpServerConfig, c as cleanupPermissions, a as commandExists, I as configureApi, H as copyConfigFiles, z as ensureApiKeyApproved, F as ensureClaudeDir, x as fixWindowsMcpConfig, q as getAiOutputLanguageLabel, P as getExistingApiConfig, O as getExistingModelConfig, V as getInstallationStatus, r as getMcpConfigPath, g as getPlatform, b as importRecommendedEnv, d as importRecommendedPermissions, i as init, T as installClaudeCode, R as isClaudeCodeInstalled, l as isCodeToolType, U as isLocalClaudeCodeInstalled, E as manageApiKeyApproval, m as mergeAndCleanPermissions, J as mergeConfigs, u as mergeMcpServers, N as mergeSettingsFile, o as openSettingsJson, s as readMcpConfig, B as removeApiKeyFromRejected, W as removeLocalClaudeCode, K as updateCustomModel, M as updateDefaultModel, w as writeMcpConfig } from './chunks/simple-config.mjs';
+export { A as AI_OUTPUT_LANGUAGES, C as CLAUDE_DIR, e as CLAUDE_MD_FILE, h as CLAUDE_VSC_CONFIG_FILE, l as CODE_TOOL_BANNERS, k as CODE_TOOL_TYPES, f as ClAUDE_CONFIG_FILE, D as DEFAULT_CODE_TOOL_TYPE, q as LANG_LABELS, L as LEGACY_ZCF_CONFIG_FILES, S as SETTINGS_FILE, p as SUPPORTED_LANGS, Z as ZCF_CONFIG_DIR, j as ZCF_CONFIG_FILE, z as addCompletedOnboarding, T as applyAiLanguageDirective, I as backupExistingConfig, u as backupMcpConfig, x as buildMcpServerConfig, c as cleanupPermissions, a as commandExists, K as configureApi, J as copyConfigFiles, B as ensureApiKeyApproved, H as ensureClaudeDir, y as fixWindowsMcpConfig, r as getAiOutputLanguageLabel, R as getExistingApiConfig, Q as getExistingModelConfig, _ as getInstallationStatus, s as getMcpConfigPath, g as getPlatform, b as importRecommendedEnv, d as importRecommendedPermissions, i as init, X as installClaudeCode, W as isClaudeCodeInstalled, n as isCodeToolType, Y as isLocalClaudeCodeInstalled, F as manageApiKeyApproval, m as mergeAndCleanPermissions, M as mergeConfigs, v as mergeMcpServers, P as mergeSettingsFile, o as openSettingsJson, V as promptApiConfigurationAction, t as readMcpConfig, E as removeApiKeyFromRejected, $ as removeLocalClaudeCode, G as setPrimaryApiKey, U as switchToOfficialLogin, N as updateCustomModel, O as updateDefaultModel, w as writeMcpConfig } from './chunks/simple-config.mjs';
 import 'node:fs';
 import 'node:process';
 import 'ansis';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zcf",
   "type": "module",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "description": "Zero-Config Code Flow - One-click configuration tool for Claude Code",
   "author": {
     "name": "Miao Da",

package/templates/claude-code/common/settings.json

@@ -10,9 +10,7 @@
   "permissions": {
     "allow": [
       "Bash",
-      "LS",
       "Read",
-      "Agent",
       "Write",
       "Edit",
       "MultiEdit",