yingclaw 2.5.12 → 2.5.14

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/autostart.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
-const { spawnSync } = require('child_process');
+const { spawn, spawnSync } = require('child_process');
 
 const GATEWAY_LAUNCH_AGENT_LABEL = 'com.yingclaw.gateway';
 const WINDOWS_GATEWAY_STARTUP_SCRIPT = 'yingclaw-gateway.cmd';
@@ -74,6 +74,21 @@ function buildWindowsGatewayStartupScript(options = {}) {
   ].join('\r\n');
 }
 
+function startWindowsGateway(options = {}) {
+  const starter = options.starter || spawn;
+  const nodePath = options.nodePath || process.execPath;
+  const cliPath = options.cliPath || path.join(__dirname, '..', 'bin', 'cli.js');
+  const workingDirectory = options.workingDirectory || path.join(__dirname, '..');
+  const child = starter(nodePath, [cliPath, 'gateway'], {
+    cwd: workingDirectory,
+    detached: true,
+    stdio: 'ignore',
+    windowsHide: true,
+  });
+  if (child && typeof child.unref === 'function') child.unref();
+  return true;
+}
+
 function runLaunchctl(runner, args, options = {}) {
   const result = runner('launchctl', args, { encoding: 'utf8', stdio: 'pipe' });
   if (result.status !== 0 && !options.optional) {
@@ -125,9 +140,15 @@ function installGatewayAutostart(options = {}) {
   const platform = options.platform || process.platform;
   if (platform === 'win32') {
     const file = options.file || getWindowsStartupScriptPath(options);
+    const runner = options.runner || spawnSync;
+    const port = options.port || 18080;
+    const wasRunning = isWindowsPortListening(runner, port);
     fs.mkdirSync(path.dirname(file), { recursive: true });
     fs.writeFileSync(file, buildWindowsGatewayStartupScript(options), 'utf8');
-    return { result: 'installed', file };
+    const started = !wasRunning && options.startNow !== false
+      ? startWindowsGateway(options)
+      : false;
+    return { result: 'installed', file, started };
   }
 
   if (platform !== 'darwin') {
@@ -211,6 +232,7 @@ module.exports = {
   GATEWAY_LAUNCH_AGENT_LABEL,
   buildMacLaunchAgentPlist,
   buildWindowsGatewayStartupScript,
+  startWindowsGateway,
   getGatewayAutostartStatus,
   getMacLaunchAgentPath,
   getWindowsStartupScriptPath,

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'],
   }));
@@ -354,7 +356,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 +373,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 +469,5 @@ module.exports = {
   PROVIDERS,
   CONFIG_FILE,
   CLAUDE_ENV_KEYS,
+  CLEAR_CLAUDE_ENV_KEYS,
 };

package/lib/desktop.js

@@ -363,11 +363,27 @@ function buildClaudeDesktopOpenCommands(platform = process.platform, options = {
     const localAppData = options.localAppData
       || process.env.LOCALAPPDATA
       || `${options.homeDir || os.homedir()}\\AppData\\Local`;
-    const claudeDir = `${localAppData}\\AnthropicClaude`;
-    // taskkill /T 连带杀子进程；start "" /D 切到 Claude 目录后启动 Claude.exe（Squirrel 标准安装位置）
+    const fileExists = options.fileExists || fs.existsSync;
+    const exeCandidates = [
+      `${localAppData}\\Programs\\Claude\\Claude.exe`,
+      `${localAppData}\\AnthropicClaude\\Claude.exe`,
+    ];
+    const updateCandidates = [
+      `${localAppData}\\AnthropicClaude\\Update.exe`,
+      `${localAppData}\\Programs\\Claude\\Update.exe`,
+    ];
+    const foundExe = exeCandidates.find((file) => fileExists(file));
+    const foundUpdate = foundExe ? null : updateCandidates.find((file) => fileExists(file));
+    const fallbackDir = `${localAppData}\\AnthropicClaude`;
+    const launchCommand = foundExe
+      ? { command: 'cmd', args: ['/c', 'start', '', '/D', path.win32.dirname(foundExe), 'Claude.exe'], optional: true, waitAfter: 800 }
+      : foundUpdate
+        ? { command: foundUpdate, args: ['--processStart', 'Claude.exe'], optional: true, waitAfter: 800 }
+        : { command: 'cmd', args: ['/c', 'start', '', '/D', fallbackDir, 'Claude.exe'], optional: true, waitAfter: 800 };
+    // taskkill /T 连带杀子进程；启动路径按实际安装位置选择，找不到时保留旧的 Squirrel 目录兜底
     return [
       { command: 'taskkill', args: ['/IM', 'Claude.exe', '/F', '/T'], optional: true, waitAfter: 1500 },
-      { command: 'cmd', args: ['/c', 'start', '', '/D', claudeDir, 'Claude.exe'], optional: true, waitAfter: 800 },
+      launchCommand,
     ];
   }
 

package/package.json

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