yingclaw 2.5.13 → 2.5.17

package/README.md

@@ -103,13 +103,15 @@ claw setup           # 兼容旧命令：config + code
 
 ```
 ANTHROPIC_BASE_URL
-ANTHROPIC_AUTH_TOKEN / ANTHROPIC_API_KEY
+ANTHROPIC_AUTH_TOKEN
 ANTHROPIC_MODEL
 ANTHROPIC_DEFAULT_OPUS_MODEL / SONNET_MODEL / HAIKU_MODEL
 CLAUDE_CODE_SUBAGENT_MODEL
 CLAUDE_CODE_EFFORT_LEVEL
 ```
 
+新版只写入 `ANTHROPIC_AUTH_TOKEN`，并会清除旧版遗留的 `ANTHROPIC_API_KEY`，避免 Claude Code 同时检测到 token 和 API key 后报 `Auth conflict`。
+
 **桌面接入**（`claw desktop`）默认写入本机 Gateway：
 
 - macOS / Windows：写入 `Claude-3p/configLibrary/` 中的 yingclaw entry

package/bin/cli.js

@@ -17,6 +17,7 @@ const {
   buildClaudeEnv,
   PROVIDERS,
   CLAUDE_ENV_KEYS,
+  CLEAR_CLAUDE_ENV_KEYS,
 } = require('../lib/config');
 const { execSync, spawn, spawnSync } = require('child_process');
 const pkg = require('../package.json');
@@ -567,7 +568,7 @@ program
       const resetNote = isWin
         ? '注：当前终端的环境变量还在内存中，重新打开 PowerShell / CMD 后才彻底清除'
         : '注：当前终端的环境变量还在内存中，重开终端后生效，或在当前终端执行：';
-      const unsetCmd = isWin ? null : `unset ${CLAUDE_ENV_KEYS.join(' ')}`;
+      const unsetCmd = isWin ? null : `unset ${CLEAR_CLAUDE_ENV_KEYS.join(' ')}`;
       console.log(boxen(
         chalk.bold('已清除以下位置中的 Claude Code 终端环境变量：\n\n') +
         cleared.map(f => chalk.cyan('  • ' + f)).join('\n') +

package/lib/config.js

@@ -8,7 +8,6 @@ const WINDOWS_ENV_LABEL = 'Windows 用户环境变量';
 const CLAUDE_ENV_KEYS = [
   'ANTHROPIC_BASE_URL',
   'ANTHROPIC_AUTH_TOKEN',
-  'ANTHROPIC_API_KEY',
   'ANTHROPIC_MODEL',
   'ANTHROPIC_DEFAULT_OPUS_MODEL',
   'ANTHROPIC_DEFAULT_SONNET_MODEL',
@@ -16,6 +15,10 @@ const CLAUDE_ENV_KEYS = [
   'CLAUDE_CODE_SUBAGENT_MODEL',
   'CLAUDE_CODE_EFFORT_LEVEL',
 ];
+const LEGACY_CLAUDE_ENV_KEYS = [
+  'ANTHROPIC_API_KEY',
+];
+const CLEAR_CLAUDE_ENV_KEYS = [...new Set([...CLAUDE_ENV_KEYS, ...LEGACY_CLAUDE_ENV_KEYS])];
 
 const PROVIDERS = {
   deepseek: {
@@ -266,7 +269,6 @@ function buildClaudeEnv({ provider, baseUrl, apiKey, model, fastModel }) {
   return {
     ANTHROPIC_BASE_URL: baseUrl,
     ANTHROPIC_AUTH_TOKEN: apiKey,
-    ANTHROPIC_API_KEY: apiKey,
     ANTHROPIC_MODEL: model,
     ANTHROPIC_DEFAULT_OPUS_MODEL: model,
     ANTHROPIC_DEFAULT_SONNET_MODEL: model,
@@ -284,7 +286,7 @@ function buildWindowsSetEnvCommands(env) {
 }
 
 function buildWindowsClearEnvCommands() {
-  return CLAUDE_ENV_KEYS.map((key) => ({
+  return CLEAR_CLAUDE_ENV_KEYS.map((key) => ({
     command: 'reg',
     args: ['delete', 'HKCU\\Environment', '/V', key, '/F'],
   }));
@@ -325,6 +327,7 @@ async function validateKey(config, options = {}) {
         'content-type': 'application/json',
         authorization: `Bearer ${config.apiKey}`,
         'x-api-key': config.apiKey,
+        'api-key': config.apiKey,
         'anthropic-version': '2023-06-01',
       },
       body: JSON.stringify({
@@ -354,7 +357,6 @@ function buildEnvBlock(baseUrl, apiKey, model, fastModel) {
     '# clawai-start',
     `export ANTHROPIC_BASE_URL=${shellQuote(env.ANTHROPIC_BASE_URL)}`,
     `export ANTHROPIC_AUTH_TOKEN=${shellQuote(env.ANTHROPIC_AUTH_TOKEN)}`,
-    `export ANTHROPIC_API_KEY=${shellQuote(env.ANTHROPIC_API_KEY)}`,
     `export ANTHROPIC_MODEL=${shellQuote(env.ANTHROPIC_MODEL)}`,
     `export ANTHROPIC_DEFAULT_OPUS_MODEL=${shellQuote(env.ANTHROPIC_DEFAULT_OPUS_MODEL)}`,
     `export ANTHROPIC_DEFAULT_SONNET_MODEL=${shellQuote(env.ANTHROPIC_DEFAULT_SONNET_MODEL)}`,
@@ -372,6 +374,7 @@ function writeEnvToZshrc(baseUrl, apiKey, model, fastModel, options = {}) {
   if (platform === 'win32') {
     const provider = providerKeyFromBaseUrl(baseUrl);
     const env = buildClaudeEnv({ provider, baseUrl, apiKey, model, fastModel });
+    runWindowsEnvCommands(buildWindowsClearEnvCommands(), options.runner || spawnSync, { ignoreErrors: true });
     runWindowsEnvCommands(buildWindowsSetEnvCommands(env), options.runner || spawnSync);
     return { result: 'updated', file: WINDOWS_ENV_LABEL };
   }
@@ -467,4 +470,5 @@ module.exports = {
   PROVIDERS,
   CONFIG_FILE,
   CLAUDE_ENV_KEYS,
+  CLEAR_CLAUDE_ENV_KEYS,
 };

package/lib/gateway.js

@@ -209,6 +209,7 @@ async function proxyMessages(req, res, config) {
       accept: body.stream ? 'text/event-stream' : 'application/json',
       authorization: `Bearer ${config.apiKey}`,
       'x-api-key': config.apiKey,
+      'api-key': config.apiKey,
       'anthropic-version': '2023-06-01',
     },
     body: JSON.stringify(body),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yingclaw",
-  "version": "2.5.13",
+  "version": "2.5.17",
   "description": "Claude Code × 国产大模型一键接入：DeepSeek、Kimi、Qwen、MiniMax、GLM、MiMo",
   "main": "index.js",
   "bin": {