yingclaw 2.0.8 → 2.1.0

package/bin/cli.js

@@ -16,6 +16,7 @@ const {
   buildClaudeEnv,
   classifyValidationStatus,
   PROVIDERS,
+  CLAUDE_ENV_KEYS,
 } = require('../lib/config');
 const { execSync, spawn, spawnSync } = require('child_process');
 const pkg = require('../package.json');
@@ -29,7 +30,7 @@ async function getBanner() {
   const chalk = (await import('chalk')).default;
   const figlet = require('figlet');
   const boxen = (await import('boxen')).default;
-  const title = figlet.textSync('claw', { font: 'Standard', horizontalLayout: 'fitted' });
+  const title = figlet.textSync('yingclaw', { font: 'Small', horizontalLayout: 'fitted' });
   const subtitle = chalk.dim('Claude Code × 国产大模型 一键接入') + '   ' + chalk.cyan(`v${pkg.version}`);
   return boxen(
     chalk.cyan.bold(title) + '\n' + subtitle,
@@ -544,13 +545,16 @@ program
       spinner.warn(chalk.yellow('没有找到 Claude Code 终端环境变量，无需恢复'));
     } else {
       spinner.succeed(chalk.green('Claude Code 终端已恢复默认'));
-      const resetNote = cleared.includes('Windows 用户环境变量')
+      const isWin = cleared.includes('Windows 用户环境变量');
+      const resetNote = isWin
         ? '注：当前终端的环境变量还在内存中，重新打开 PowerShell / CMD 后才彻底清除'
-        : '注：当前终端的环境变量还在内存中，重开终端或 unset 才彻底清除';
+        : '注：当前终端的环境变量还在内存中，重开终端后生效，或在当前终端执行：';
+      const unsetCmd = isWin ? null : `unset ${CLAUDE_ENV_KEYS.join(' ')}`;
       console.log(boxen(
         chalk.bold('已清除以下位置中的 Claude Code 终端环境变量：\n\n') +
         cleared.map(f => chalk.cyan('  • ' + f)).join('\n') +
-        '\n\n' + chalk.dim(resetNote),
+        '\n\n' + chalk.dim(resetNote) +
+        (unsetCmd ? '\n' + chalk.cyan(unsetCmd) : ''),
         { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
       ));
     }
@@ -754,10 +758,25 @@ program
       ].filter(Boolean);
       console.log(boxen(
         chalk.bold('已清除 Claude 桌面应用第三方推理配置：\n\n') +
-        cleared.map(f => chalk.cyan('  • ' + f)).join('\n') +
-        '\n\n' + chalk.dim('如 Claude Desktop 已打开，请完全退出后重新打开。'),
+        cleared.map(f => chalk.cyan('  • ' + f)).join('\n'),
         { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
       ));
+
+      if (process.platform === 'darwin') {
+        const shouldReopen = await confirm({ message: '是否现在重启 Claude 桌面应用使默认配置生效？', default: true });
+        if (shouldReopen) {
+          const openSpinner = ora('正在重启 Claude 桌面应用...').start();
+          try {
+            await openClaudeDesktop();
+            openSpinner.succeed(chalk.green('Claude 桌面应用已重启（已恢复 1P 模式）'));
+          } catch (e) {
+            openSpinner.fail(chalk.red(`打开失败: ${e.message}`));
+            console.log(chalk.dim('请手动完全退出 Claude 后重新打开。'));
+          }
+        }
+      } else {
+        console.log(chalk.dim('请手动完全退出 Claude 后重新打开。'));
+      }
     } else {
       spinner.warn(chalk.yellow('没有找到 Claude 桌面应用第三方推理配置，无需恢复'));
     }

package/lib/desktop.js

@@ -22,25 +22,29 @@ function getClaudeDesktopDataDir(options = {}) {
   const homeDir = options.homeDir || os.homedir();
 
   if (platform === 'darwin') {
-    return path.join(homeDir, 'Library', 'Application Support', 'Claude-3p');
+    return [homeDir, 'Library', 'Application Support', 'Claude-3p'].join('/');
   }
 
   if (platform === 'win32') {
-    const appData = options.appData || process.env.APPDATA || options.localAppData || path.join(homeDir, 'AppData', 'Roaming');
-    return path.join(appData, 'Claude-3p');
+    const appData = options.appData || process.env.APPDATA || options.localAppData || [homeDir, 'AppData', 'Roaming'].join('\\');
+    return appData + '\\Claude-3p';
   }
 
   return null;
 }
 
 function getClaudeDesktopConfigPath(options = {}) {
+  const platform = options.platform || process.platform;
   const dataDir = options.dataDir || getClaudeDesktopDataDir(options);
-  return dataDir ? path.join(dataDir, 'claude_desktop_config.json') : null;
+  if (!dataDir) return null;
+  return dataDir + (platform === 'win32' ? '\\' : '/') + 'claude_desktop_config.json';
 }
 
 function getClaudeDesktopConfigLibraryDir(options = {}) {
+  const platform = options.platform || process.platform;
   const dataDir = options.dataDir || getClaudeDesktopDataDir(options);
-  return dataDir ? path.join(dataDir, 'configLibrary') : null;
+  if (!dataDir) return null;
+  return dataDir + (platform === 'win32' ? '\\' : '/') + 'configLibrary';
 }
 
 function readJsonFile(file) {
@@ -115,6 +119,11 @@ function clearClaudeDesktopConfigLibrary(options = {}) {
 
 // 写入 Claude-3p/configLibrary/ 下的 enterprise config 条目（主进程从此处读取）
 function writeClaudeDesktopConfig(config, options = {}) {
+  const baseUrl = normalizeAnthropicBaseUrl(config.baseUrl);
+  if (!baseUrl.startsWith('https://')) {
+    throw new Error('Claude 桌面应用要求 Gateway Base URL 使用 HTTPS');
+  }
+
   const dataDir = options.dataDir || getClaudeDesktopDataDir(options);
   if (!dataDir) {
     return { result: 'unsupported', file: null };
@@ -126,10 +135,6 @@ function writeClaudeDesktopConfig(config, options = {}) {
   const uuid = existingMeta.appliedId || options.uuid || crypto.randomUUID();
 
   const models = collectModels(config);
-  const baseUrl = normalizeAnthropicBaseUrl(config.baseUrl);
-  if (!baseUrl.startsWith('https://')) {
-    throw new Error('Claude 桌面应用要求 Gateway Base URL 使用 HTTPS');
-  }
 
   const entry = {
     inferenceProvider: 'gateway',

package/package.json

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