zcf 1.1.3 → 1.1.5

package/README.md

@@ -75,9 +75,11 @@ npx zcf u        # 仅导入工作流：快速添加 AI 工作流和命令系统
 
 ### 🔐 API 配置
 
-- 自定义 API 支持
-- API Key 自动配置
-- 支持稍后在 claude 命令中配置（如 OAuth）
+- 支持两种认证方式：
+  - **Auth Token**：适用于通过 OAuth 或浏览器登录获取的令牌
+  - **API Key**：适用于从 Anthropic Console 获取的 API 密钥
+- 自定义 API URL 支持
+- 支持稍后在 claude 命令中配置
 
 ### 💾 配置管理
 
@@ -112,12 +114,15 @@ $ npx zcf
 
 ✔ Claude Code 安装成功
 
-? 是否配置 API？
-  ❯ 配置 API
-    跳过（稍后在 claude 命令中自行配置，如 OAuth）
+? 选择 API 认证方式
+  ❯ 使用 Auth Token (OAuth 认证)
+    适用于通过 OAuth 或浏览器登录获取的令牌
+    使用 API Key (密钥认证)
+    适用于从 Anthropic Console 获取的 API 密钥
+    跳过（稍后手动配置）
 
 ? 请输入 API URL: https://api.anthropic.com
-? 请输入 API Key: sk-xxx
+? 请输入 Auth Token 或 API Key: xxx
 
 ? 检测到已有配置文件，如何处理？
   ❯ 备份并覆盖全部

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import cac from 'cac';
 import ansis from 'ansis';
-import { t as displayBanner, u as selectScriptLanguage, v as readZcfConfig, I as I18N, S as SETTINGS_FILE, b as SUPPORTED_LANGS, L as LANG_LABELS, x as resolveAiOutputLanguage, y as updatePromptOnly, z as updateZcfConfig, B as version, i as init } from './shared/zcf.EL2e1-Wq.mjs';
+import { t as displayBanner, u as selectScriptLanguage, v as readZcfConfig, I as I18N, S as SETTINGS_FILE, b as SUPPORTED_LANGS, L as LANG_LABELS, x as resolveAiOutputLanguage, y as updatePromptOnly, z as updateZcfConfig, B as version, i as init } from './shared/zcf.CeJug3gT.mjs';
 import prompts from '@posva/prompts';
 import { existsSync } from 'node:fs';
 import 'node:os';

package/dist/index.d.mts

@@ -70,9 +70,13 @@ declare const I18N: {
         installFailed: string;
         npmNotFound: string;
         configureApi: string;
-        customApi: string;
+        useAuthToken: string;
+        authTokenDesc: string;
+        useApiKey: string;
+        apiKeyDesc: string;
         skipApi: string;
         enterApiUrl: string;
+        enterAuthToken: string;
         enterApiKey: string;
         existingConfig: string;
         backupAndOverwrite: string;
@@ -96,6 +100,13 @@ declare const I18N: {
         yes: string;
         no: string;
         cancelled: string;
+        apiKeyValidation: {
+            empty: string;
+            invalid: string;
+            tooShort: string;
+            tooLong: string;
+            example: string;
+        };
         noExistingConfig: string;
         updatingPrompts: string;
         updateConfigLangPrompt: string;
@@ -120,9 +131,13 @@ declare const I18N: {
         installFailed: string;
         npmNotFound: string;
         configureApi: string;
-        customApi: string;
+        useAuthToken: string;
+        authTokenDesc: string;
+        useApiKey: string;
+        apiKeyDesc: string;
         skipApi: string;
         enterApiUrl: string;
+        enterAuthToken: string;
         enterApiKey: string;
         existingConfig: string;
         backupAndOverwrite: string;
@@ -146,6 +161,13 @@ declare const I18N: {
         yes: string;
         no: string;
         cancelled: string;
+        apiKeyValidation: {
+            empty: string;
+            invalid: string;
+            tooShort: string;
+            tooLong: string;
+            example: string;
+        };
         noExistingConfig: string;
         updatingPrompts: string;
         updateConfigLangPrompt: string;
@@ -177,8 +199,9 @@ declare function copyConfigFiles(lang: SupportedLang, onlyMd?: boolean): void;
 interface ApiConfig {
     url: string;
     key: string;
+    authType?: 'auth_token' | 'api_key';
 }
-declare function configureApi(apiConfig: ApiConfig | null): void;
+declare function configureApi(apiConfig: ApiConfig | null): ApiConfig | null;
 declare function mergeConfigs(sourceFile: string, targetFile: string): void;
 declare function applyAiLanguageDirective(aiOutputLang: AiOutputLanguage | string): void;
 

package/dist/index.d.ts

@@ -70,9 +70,13 @@ declare const I18N: {
         installFailed: string;
         npmNotFound: string;
         configureApi: string;
-        customApi: string;
+        useAuthToken: string;
+        authTokenDesc: string;
+        useApiKey: string;
+        apiKeyDesc: string;
         skipApi: string;
         enterApiUrl: string;
+        enterAuthToken: string;
         enterApiKey: string;
         existingConfig: string;
         backupAndOverwrite: string;
@@ -96,6 +100,13 @@ declare const I18N: {
         yes: string;
         no: string;
         cancelled: string;
+        apiKeyValidation: {
+            empty: string;
+            invalid: string;
+            tooShort: string;
+            tooLong: string;
+            example: string;
+        };
         noExistingConfig: string;
         updatingPrompts: string;
         updateConfigLangPrompt: string;
@@ -120,9 +131,13 @@ declare const I18N: {
         installFailed: string;
         npmNotFound: string;
         configureApi: string;
-        customApi: string;
+        useAuthToken: string;
+        authTokenDesc: string;
+        useApiKey: string;
+        apiKeyDesc: string;
         skipApi: string;
         enterApiUrl: string;
+        enterAuthToken: string;
         enterApiKey: string;
         existingConfig: string;
         backupAndOverwrite: string;
@@ -146,6 +161,13 @@ declare const I18N: {
         yes: string;
         no: string;
         cancelled: string;
+        apiKeyValidation: {
+            empty: string;
+            invalid: string;
+            tooShort: string;
+            tooLong: string;
+            example: string;
+        };
         noExistingConfig: string;
         updatingPrompts: string;
         updateConfigLangPrompt: string;
@@ -177,8 +199,9 @@ declare function copyConfigFiles(lang: SupportedLang, onlyMd?: boolean): void;
 interface ApiConfig {
     url: string;
     key: string;
+    authType?: 'auth_token' | 'api_key';
 }
-declare function configureApi(apiConfig: ApiConfig | null): void;
+declare function configureApi(apiConfig: ApiConfig | null): ApiConfig | null;
 declare function mergeConfigs(sourceFile: string, targetFile: string): void;
 declare function applyAiLanguageDirective(aiOutputLang: AiOutputLanguage | string): void;
 

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { A as AI_OUTPUT_LANGUAGES, C as CLAUDE_DIR, a as CLAUDE_MD_FILE, I as I18N, L as LANG_LABELS, M as MCP_CONFIG_FILE, d as MCP_SERVICES, S as SETTINGS_FILE, b as SUPPORTED_LANGS, Z as ZCF_CONFIG_FILE, n as applyAiLanguageDirective, j as backupExistingConfig, p as backupMcpConfig, s as buildMcpServerConfig, c as commandExists, l as configureApi, k as copyConfigFiles, h as ensureClaudeDir, o as getMcpConfigPath, g as getPlatform, i as init, f as installClaudeCode, e as isClaudeCodeInstalled, m as mergeConfigs, q as mergeMcpServers, r as readMcpConfig, w as writeMcpConfig } from './shared/zcf.EL2e1-Wq.mjs';
+export { A as AI_OUTPUT_LANGUAGES, C as CLAUDE_DIR, a as CLAUDE_MD_FILE, I as I18N, L as LANG_LABELS, M as MCP_CONFIG_FILE, d as MCP_SERVICES, S as SETTINGS_FILE, b as SUPPORTED_LANGS, Z as ZCF_CONFIG_FILE, n as applyAiLanguageDirective, j as backupExistingConfig, p as backupMcpConfig, s as buildMcpServerConfig, c as commandExists, l as configureApi, k as copyConfigFiles, h as ensureClaudeDir, o as getMcpConfigPath, g as getPlatform, i as init, f as installClaudeCode, e as isClaudeCodeInstalled, m as mergeConfigs, q as mergeMcpServers, r as readMcpConfig, w as writeMcpConfig } from './shared/zcf.CeJug3gT.mjs';
 import '@posva/prompts';
 import 'ansis';
 import 'node:fs';

package/dist/shared/{zcf.EL2e1-Wq.mjs → zcf.CeJug3gT.mjs}

@@ -6,7 +6,7 @@ import { join, dirname } from 'pathe';
 import dayjs from 'dayjs';
 import { exec } from 'tinyexec';
 
-const version = "1.1.3";
+const version = "1.1.5";
 
 const CLAUDE_DIR = join(homedir(), ".claude");
 const SETTINGS_FILE = join(CLAUDE_DIR, "settings.json");
@@ -39,10 +39,14 @@ const I18N = {
     installSuccess: "Claude Code \u5B89\u88C5\u6210\u529F",
     installFailed: "Claude Code \u5B89\u88C5\u5931\u8D25",
     npmNotFound: "npm \u672A\u5B89\u88C5\u3002\u8BF7\u5148\u5B89\u88C5 Node.js \u548C npm\u3002",
-    configureApi: "\u662F\u5426\u914D\u7F6E API\uFF1F",
-    customApi: "\u914D\u7F6E API",
-    skipApi: "\u8DF3\u8FC7\uFF08\u7A0D\u540E\u5728 claude \u547D\u4EE4\u4E2D\u81EA\u884C\u914D\u7F6E\uFF0C\u5982 OAuth\uFF09",
+    configureApi: "\u9009\u62E9 API \u8BA4\u8BC1\u65B9\u5F0F",
+    useAuthToken: "\u4F7F\u7528 Auth Token (OAuth \u8BA4\u8BC1)",
+    authTokenDesc: "\u9002\u7528\u4E8E\u901A\u8FC7 OAuth \u6216\u6D4F\u89C8\u5668\u767B\u5F55\u83B7\u53D6\u7684\u4EE4\u724C",
+    useApiKey: "\u4F7F\u7528 API Key (\u5BC6\u94A5\u8BA4\u8BC1)",
+    apiKeyDesc: "\u9002\u7528\u4E8E\u4ECE Anthropic Console \u83B7\u53D6\u7684 API \u5BC6\u94A5",
+    skipApi: "\u8DF3\u8FC7\uFF08\u7A0D\u540E\u624B\u52A8\u914D\u7F6E\uFF09",
     enterApiUrl: "\u8BF7\u8F93\u5165 API URL",
+    enterAuthToken: "\u8BF7\u8F93\u5165 Auth Token",
     enterApiKey: "\u8BF7\u8F93\u5165 API Key",
     existingConfig: "\u68C0\u6D4B\u5230\u5DF2\u6709\u914D\u7F6E\u6587\u4EF6\uFF0C\u5982\u4F55\u5904\u7406\uFF1F",
     backupAndOverwrite: "\u5907\u4EFD\u5E76\u8986\u76D6\u5168\u90E8",
@@ -66,6 +70,13 @@ const I18N = {
     yes: "\u662F",
     no: "\u5426",
     cancelled: "\u64CD\u4F5C\u5DF2\u53D6\u6D88",
+    apiKeyValidation: {
+      empty: "API Key \u4E0D\u80FD\u4E3A\u7A7A",
+      invalid: "API Key \u683C\u5F0F\u65E0\u6548\u3002\u53EA\u80FD\u5305\u542B\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u4E0B\u5212\u7EBF\uFF08_\uFF09\u548C\u8FDE\u5B57\u7B26\uFF08-\uFF09",
+      tooShort: "API Key \u957F\u5EA6\u592A\u77ED\uFF08\u81F3\u5C11\u9700\u8981 1 \u4E2A\u5B57\u7B26\uFF09",
+      tooLong: "API Key \u957F\u5EA6\u592A\u957F\uFF08\u6700\u591A 256 \u4E2A\u5B57\u7B26\uFF09",
+      example: "\u793A\u4F8B\u683C\u5F0F: sk-abcdef123456_789xyz"
+    },
     noExistingConfig: "\u672A\u627E\u5230\u73B0\u6709\u914D\u7F6E\u3002\u8BF7\u5148\u8FD0\u884C `zcf`\u3002",
     updatingPrompts: "\u6B63\u5728\u66F4\u65B0 Claude Code Prompt \u6587\u6863...",
     updateConfigLangPrompt: "\u9009\u62E9\u914D\u7F6E\u8BED\u8A00",
@@ -89,10 +100,14 @@ const I18N = {
     installSuccess: "Claude Code installed successfully",
     installFailed: "Failed to install Claude Code",
     npmNotFound: "npm is not installed. Please install Node.js and npm first.",
-    configureApi: "Configure API?",
-    customApi: "Configure API",
-    skipApi: "Skip (configure later in claude command, e.g., OAuth)",
+    configureApi: "Select API authentication method",
+    useAuthToken: "Use Auth Token (OAuth authentication)",
+    authTokenDesc: "For tokens obtained via OAuth or browser login",
+    useApiKey: "Use API Key (Key authentication)",
+    apiKeyDesc: "For API keys from Anthropic Console",
+    skipApi: "Skip (configure manually later)",
     enterApiUrl: "Enter API URL",
+    enterAuthToken: "Enter Auth Token",
     enterApiKey: "Enter API Key",
     existingConfig: "Existing config detected. How to proceed?",
     backupAndOverwrite: "Backup and overwrite all",
@@ -116,6 +131,13 @@ const I18N = {
     yes: "Yes",
     no: "No",
     cancelled: "Operation cancelled",
+    apiKeyValidation: {
+      empty: "API Key cannot be empty",
+      invalid: "Invalid API Key format. Only letters, numbers, underscores (_) and hyphens (-) are allowed",
+      tooShort: "API Key is too short (minimum 1 characters required)",
+      tooLong: "API Key is too long (maximum 256 characters allowed)",
+      example: "Example format: sk-abcdef123456_789xyz"
+    },
     noExistingConfig: "No existing configuration found. Please run `zcf` first.",
     updatingPrompts: "Updating Claude Code prompt documents...",
     updateConfigLangPrompt: "Select configuration language",
@@ -299,48 +321,42 @@ function copyDirectory(src, dest) {
     }
   }
 }
+function getDefaultSettings() {
+  try {
+    const currentFileUrl = new URL(import.meta.url);
+    const currentFilePath = currentFileUrl.pathname;
+    const distDir = dirname(dirname(currentFilePath));
+    const rootDir = dirname(distDir);
+    const templateSettingsPath = join(rootDir, "templates", "settings.json");
+    if (existsSync(templateSettingsPath)) {
+      const content = readFileSync(templateSettingsPath, "utf-8");
+      return JSON.parse(content);
+    }
+  } catch (error) {
+    console.error("Failed to read template settings.json:", error);
+    return {};
+  }
+}
 function configureApi(apiConfig) {
-  if (!apiConfig) return;
-  let settings = {
-    $schema: "https://json.schemastore.org/claude-code-settings.json",
-    env: {},
-    includeCoAuthoredBy: false,
-    permissions: {
-      allow: [
-        "Bash(*)",
-        "LS(*)",
-        "Read(*)",
-        "Write(*)",
-        "Edit(*)",
-        "MultiEdit(*)",
-        "Glob(*)",
-        "Grep(*)",
-        "WebFetch(*)",
-        "WebSearch(*)",
-        "TodoWrite(*)",
-        "NotebookRead(*)",
-        "NotebookEdit(*)"
-      ],
-      deny: []
-    },
-    hooks: {},
-    model: "opus"
-  };
+  if (!apiConfig) return null;
+  let settings = getDefaultSettings();
   if (existsSync(SETTINGS_FILE)) {
     const content = readFileSync(SETTINGS_FILE, "utf-8");
     try {
       const existingSettings = JSON.parse(content);
-      settings = { ...settings, ...existingSettings };
-      if (existingSettings.env) {
-        settings.env = { ...settings.env, ...existingSettings.env };
-      }
+      settings = deepMerge(settings, existingSettings);
     } catch (error) {
       console.error("Failed to parse existing settings.json, using defaults:", error);
     }
   }
-  settings.env.ANTHROPIC_AUTH_TOKEN = apiConfig.key;
+  if (apiConfig.authType === "api_key") {
+    settings.env.ANTHROPIC_API_KEY = apiConfig.key;
+  } else {
+    settings.env.ANTHROPIC_AUTH_TOKEN = apiConfig.key;
+  }
   settings.env.ANTHROPIC_BASE_URL = apiConfig.url;
   writeFileSync(SETTINGS_FILE, JSON.stringify(settings, null, 2));
+  return apiConfig;
 }
 function mergeConfigs(sourceFile, targetFile) {
   if (!existsSync(sourceFile)) return;
@@ -597,6 +613,42 @@ async function resolveAiOutputLanguage(scriptLang, commandLineOption, savedConfi
   return await selectAiOutputLanguage(scriptLang, scriptLang);
 }
 
+function validateApiKey(apiKey, lang = "zh-CN") {
+  const i18n = I18N[lang];
+  if (!apiKey || apiKey.trim() === "") {
+    return {
+      isValid: false,
+      error: i18n.apiKeyValidation.empty
+    };
+  }
+  const apiKeyPattern = /^[A-Za-z0-9_-]+$/;
+  if (!apiKeyPattern.test(apiKey)) {
+    return {
+      isValid: false,
+      error: i18n.apiKeyValidation.invalid
+    };
+  }
+  if (apiKey.length < 1) {
+    return {
+      isValid: false,
+      error: i18n.apiKeyValidation.tooShort
+    };
+  }
+  if (apiKey.length > 256) {
+    return {
+      isValid: false,
+      error: i18n.apiKeyValidation.tooLong
+    };
+  }
+  return { isValid: true };
+}
+function formatApiKeyDisplay(apiKey) {
+  if (!apiKey || apiKey.length < 12) {
+    return apiKey;
+  }
+  return `${apiKey.substring(0, 8)}...${apiKey.substring(apiKey.length - 4)}`;
+}
+
 async function updatePromptOnly(configLang, scriptLang, aiOutputLang) {
   const i18n = I18N[scriptLang];
   const backupDir = backupExistingConfig();
@@ -692,8 +744,20 @@ async function init(options = {}) {
         name: "apiChoice",
         message: i18n.configureApi,
         choices: [
-          { title: i18n.customApi, value: "custom" },
-          { title: i18n.skipApi, value: "skip" }
+          {
+            title: i18n.useAuthToken,
+            value: "auth_token",
+            description: ansis.gray(i18n.authTokenDesc)
+          },
+          {
+            title: i18n.useApiKey,
+            value: "api_key",
+            description: ansis.gray(i18n.apiKeyDesc)
+          },
+          {
+            title: i18n.skipApi,
+            value: "skip"
+          }
         ]
       });
       if (!apiResponse.apiChoice) {
@@ -701,7 +765,7 @@ async function init(options = {}) {
         process.exit(0);
       }
       const apiChoice = apiResponse.apiChoice;
-      if (apiChoice === "custom") {
+      if (apiChoice === "auth_token" || apiChoice === "api_key") {
         const urlResponse = await prompts({
           type: "text",
           name: "url",
@@ -721,18 +785,29 @@ async function init(options = {}) {
           process.exit(0);
         }
         const url = urlResponse.url;
+        const keyMessage = apiChoice === "auth_token" ? i18n.enterAuthToken : i18n.enterApiKey;
         const keyResponse = await prompts({
           type: "text",
           name: "key",
-          message: i18n.enterApiKey,
-          validate: (value) => !!value || "API Key is required"
+          message: keyMessage,
+          validate: (value) => {
+            if (!value) {
+              return `${apiChoice === "auth_token" ? "Auth Token" : "API Key"} is required`;
+            }
+            const validation = validateApiKey(value, scriptLang);
+            if (!validation.isValid) {
+              return validation.error || "Invalid API Key format";
+            }
+            return true;
+          }
         });
         if (keyResponse.key === void 0) {
           console.log(ansis.yellow(i18n.cancelled));
           process.exit(0);
         }
         const key = keyResponse.key;
-        apiConfig = { url, key };
+        console.log(ansis.gray(`  API Key: ${formatApiKeyDisplay(key)}`));
+        apiConfig = { url, key, authType: apiChoice };
       }
     }
     if (action === "backup") {
@@ -758,8 +833,12 @@ async function init(options = {}) {
     }
     applyAiLanguageDirective(aiOutputLang);
     if (apiConfig && !onlyUpdateDocs) {
-      configureApi(apiConfig);
-      console.log(ansis.green(`\u2714 ${i18n.apiConfigSuccess}`));
+      const configuredApi = configureApi(apiConfig);
+      if (configuredApi) {
+        console.log(ansis.green(`\u2714 ${i18n.apiConfigSuccess}`));
+        console.log(ansis.gray(`  URL: ${configuredApi.url}`));
+        console.log(ansis.gray(`  Key: ${formatApiKeyDisplay(configuredApi.key)}`));
+      }
     }
     if (!onlyUpdateDocs) {
       const mcpResponse = await prompts({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zcf",
   "type": "module",
-  "version": "1.1.3",
+  "version": "1.1.5",
   "description": "Zero-Config Claude-Code Flow - One-click configuration tool for Claude Code",
   "license": "MIT",
   "homepage": "https://github.com/UfoMiao/zcf#readme",

package/templates/settings.json

@@ -24,6 +24,5 @@
     ],
     "deny": []
   },
-  "hooks": {},
-  "model": "opus"
-}
+  "hooks": {}
+}