yingclaw 2.2.2 → 2.3.0

package/README.md

@@ -4,6 +4,8 @@ Claude Code × 国产大模型，一键接入。
 
 支持 DeepSeek、Kimi、阿里云百炼（Qwen）、MiniMax、智谱 GLM、小米 MiMo，也支持自定义 Anthropic 兼容接口，无需梯子即可使用 Claude Code。
 
+![yingclaw 交互菜单](https://raw.githubusercontent.com/DengShiyingA/yingclaw/main/screenshot.png)
+
 ## 安装
 
 ```bash
@@ -112,7 +114,7 @@ CLAUDE_CODE_EFFORT_LEVEL
 **自定义接口**需支持 Anthropic `/v1/messages` 格式；工具会根据 Base URL 自动尝试获取模型列表，失败则手动输入。
 
 ## 卸载
-
+ 
 ```bash
 npm uninstall -g yingclaw
 claw reset           # 可选：清除已写入的环境变量和桌面配置

package/bin/cli.js

@@ -11,10 +11,10 @@ const {
   fetchModelsFromBaseUrl,
   resetConfig,
   validateConfig,
+  validateKey,
   normalizeAnthropicBaseUrl,
   resolveFastModel,
   buildClaudeEnv,
-  classifyValidationStatus,
   PROVIDERS,
   CLAUDE_ENV_KEYS,
 } = require('../lib/config');
@@ -23,6 +23,7 @@ const pkg = require('../package.json');
 const { buildMenuStatusLines, buildStatusView } = require('../lib/panel');
 const { buildClaudeInstallCommand } = require('../lib/install');
 const { clearClaudeDesktopConfig, isDesktopConfigured, openClaudeDesktop, writeClaudeDesktopConfig } = require('../lib/desktop');
+const { runDoctorChecks, summarize, STATUS_OK, STATUS_FAIL, STATUS_WARN, STATUS_INFO } = require('../lib/doctor');
 
 const program = new Command();
 
@@ -38,42 +39,6 @@ async function getBanner() {
   );
 }
 
-async function validateKey(config) {
-  let url;
-  try {
-    url = `${normalizeAnthropicBaseUrl(config.baseUrl)}/v1/messages`;
-    new URL(url);
-  } catch {
-    return null;
-  }
-
-  const controller = new AbortController();
-  const timeout = setTimeout(() => controller.abort(), 8000);
-
-  try {
-    const res = await fetch(url, {
-      method: 'POST',
-      signal: controller.signal,
-      headers: {
-        'content-type': 'application/json',
-        authorization: `Bearer ${config.apiKey}`,
-        'x-api-key': config.apiKey,
-        'anthropic-version': '2023-06-01',
-      },
-      body: JSON.stringify({
-      model: config.model,
-      max_tokens: 1,
-      messages: [{ role: 'user', content: 'hi' }],
-      }),
-    });
-    return classifyValidationStatus(res.status);
-  } catch {
-    return null;
-  } finally {
-    clearTimeout(timeout);
-  }
-}
-
 function getConfigValidationMessage(config) {
   const validation = validateConfig(config);
   return validation.valid ? null : validation.message;
@@ -787,7 +752,7 @@ program
         { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
       ));
 
-      if (process.platform === 'darwin') {
+      if (process.platform === 'darwin' || process.platform === 'win32') {
         const shouldReopen = await confirm({ message: '是否现在重启 Claude 桌面应用使默认配置生效？', default: true });
         if (shouldReopen) {
           const openSpinner = ora('正在重启 Claude 桌面应用...').start();
@@ -795,8 +760,15 @@ program
             await openClaudeDesktop();
             openSpinner.succeed(chalk.green('Claude 桌面应用已重启（已恢复 1P 模式）'));
           } catch (e) {
-            openSpinner.fail(chalk.red(`打开失败: ${e.message}`));
-            console.log(chalk.dim('请手动完全退出 Claude 后重新打开。'));
+            openSpinner.fail(chalk.red(`自动重启失败: ${e.message}`));
+            if (process.platform === 'win32') {
+              console.log(chalk.yellow('\n请手动操作（仅关闭窗口不够，进程还在系统托盘）：'));
+              console.log(chalk.dim('  1. 任务栏右下角找 Claude 图标 → 右键 → 退出'));
+              console.log(chalk.dim('  2. 或在任务管理器中结束所有 Claude.exe 进程'));
+              console.log(chalk.dim('  3. 然后重新打开 Claude'));
+            } else {
+              console.log(chalk.dim('请手动完全退出 Claude 后重新打开。'));
+            }
           }
         }
       } else {
@@ -850,6 +822,52 @@ program
     }
   });
 
+program
+  .command('doctor')
+  .description('诊断当前环境，列出所有问题和修复建议')
+  .action(async () => {
+    const chalk = (await import('chalk')).default;
+    const ora = (await import('ora')).default;
+    const boxen = (await import('boxen')).default;
+
+    console.log(await getBanner());
+
+    const spinner = ora('运行诊断检查...').start();
+    const checks = await runDoctorChecks();
+    spinner.stop();
+
+    const icons = {
+      [STATUS_OK]:   chalk.green('✓'),
+      [STATUS_FAIL]: chalk.red('✗'),
+      [STATUS_WARN]: chalk.yellow('⚠'),
+      [STATUS_INFO]: chalk.cyan('ℹ'),
+    };
+
+    console.log();
+    for (const c of checks) {
+      console.log(`  ${icons[c.status]} ${chalk.bold(c.name)}  ${chalk.dim(c.message)}`);
+      if (c.fix) console.log(`    ${chalk.dim('→')} ${chalk.cyan(c.fix)}`);
+    }
+
+    const counts = summarize(checks);
+    const summaryBits = [];
+    if (counts.fail) summaryBits.push(chalk.red(`${counts.fail} 个错误`));
+    if (counts.warn) summaryBits.push(chalk.yellow(`${counts.warn} 个警告`));
+    if (counts.ok)   summaryBits.push(chalk.green(`${counts.ok} 个通过`));
+
+    const allOk = counts.fail === 0 && counts.warn === 0;
+    console.log(boxen(
+      (allOk ? chalk.bold.green('✓ 一切正常') : chalk.bold('诊断完成')) +
+      (summaryBits.length ? '\n\n' + summaryBits.join(' · ') : ''),
+      {
+        padding: { top: 0, bottom: 0, left: 2, right: 2 },
+        borderStyle: 'round',
+        borderColor: counts.fail ? 'red' : counts.warn ? 'yellow' : 'green',
+        margin: { top: 1, bottom: 1 },
+      }
+    ));
+  });
+
 program
   .command('update')
   .description('检查并更新 yingclaw 到最新版本')
@@ -990,6 +1008,7 @@ async function runAdvancedMenu(chalk, hasConfig) {
   const action = await select({ loop: false,
     message: chalk.cyan('高级选项'),
     choices: [
+      { name: '🩺 诊断（一键自检并给出修复建议）', value: 'doctor' },
       { name: '🔁 重新检测 API', value: 'recheck', disabled: !hasConfig && ADVANCED_DISABLED_HINT },
       { name: '↩️  恢复 Claude Code 终端默认', value: 'code-reset' },
       { name: '↩️  恢复 Claude 桌面默认', value: 'desktop-reset' },
@@ -1098,6 +1117,7 @@ async function runMenu() {
       status: 'status',
       reset: 'reset',
       update: 'update',
+      doctor: 'doctor',
     };
 
     // 执行子命令（用 spawn 隔离，避免 commander 对 program 的副作用）

package/lib/config.js

@@ -283,6 +283,42 @@ function classifyValidationStatus(statusCode) {
   return null;
 }
 
+// 发一次最小的 /v1/messages 请求验证 Key（true=有效, false=无效, null=网络/服务异常）
+async function validateKey(config, options = {}) {
+  let url;
+  try {
+    url = `${normalizeAnthropicBaseUrl(config.baseUrl)}/v1/messages`;
+    new URL(url);
+  } catch {
+    return null;
+  }
+
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), options.timeoutMs || 8000);
+  try {
+    const res = await fetch(url, {
+      method: 'POST',
+      signal: controller.signal,
+      headers: {
+        'content-type': 'application/json',
+        authorization: `Bearer ${config.apiKey}`,
+        'x-api-key': config.apiKey,
+        'anthropic-version': '2023-06-01',
+      },
+      body: JSON.stringify({
+        model: config.model,
+        max_tokens: 1,
+        messages: [{ role: 'user', content: 'hi' }],
+      }),
+    });
+    return classifyValidationStatus(res.status);
+  } catch {
+    return null;
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+
 function shellQuote(value) {
   return `'${String(value).replace(/'/g, `'\\''`)}'`;
 }
@@ -405,6 +441,7 @@ module.exports = {
   buildClaudeEnv,
   buildEnvBlock,
   classifyValidationStatus,
+  validateKey,
   PROVIDERS,
   CONFIG_FILE,
   CLAUDE_ENV_KEYS,

package/lib/doctor.js

@@ -0,0 +1,192 @@
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+const { execSync, spawnSync } = require('child_process');
+const {
+  loadConfig,
+  validateConfig,
+  validateKey,
+  buildClaudeEnv,
+  normalizeAnthropicBaseUrl,
+  PROVIDERS,
+  CLAUDE_ENV_KEYS,
+} = require('./config');
+const { isDesktopConfigured } = require('./desktop');
+
+const STATUS_OK = 'ok';
+const STATUS_FAIL = 'fail';
+const STATUS_WARN = 'warn';
+const STATUS_INFO = 'info';
+
+async function runDoctorChecks(options = {}) {
+  const checks = [];
+  const platform = options.platform || process.platform;
+  const env = options.env || process.env;
+
+  // 1. Node 版本
+  const nodeVersion = process.versions.node;
+  const nodeMajor = parseInt(nodeVersion.split('.')[0], 10);
+  checks.push({
+    name: 'Node 版本',
+    status: nodeMajor >= 18 ? STATUS_OK : STATUS_FAIL,
+    message: `v${nodeVersion}${nodeMajor >= 18 ? '' : '（< 18）'}`,
+    fix: nodeMajor < 18 ? '从 https://nodejs.org 下载 LTS 版本（≥18）' : null,
+  });
+
+  // 2. Claude Code
+  let claudeVersion = null;
+  try {
+    claudeVersion = execSync('claude --version', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+  } catch {}
+  checks.push({
+    name: 'Claude Code',
+    status: claudeVersion ? STATUS_OK : STATUS_WARN,
+    message: claudeVersion || '未安装',
+    fix: claudeVersion ? null : '运行 claw install-claude',
+  });
+
+  // 3. 配置文件
+  const config = loadConfig();
+  if (!config) {
+    checks.push({
+      name: '配置文件',
+      status: STATUS_FAIL,
+      message: '~/.clawai.json 不存在',
+      fix: '运行 claw config',
+    });
+    return checks;
+  }
+  const validation = validateConfig(config);
+  if (!validation.valid) {
+    checks.push({
+      name: '配置文件',
+      status: STATUS_FAIL,
+      message: `~/.clawai.json 无效：${validation.message}`,
+      fix: '运行 claw config 重新配置',
+    });
+    return checks;
+  }
+  const provider = PROVIDERS[config.provider];
+  checks.push({
+    name: '配置文件',
+    status: STATUS_OK,
+    message: `${provider?.name || config.provider} · ${config.model}`,
+  });
+
+  // 4. shell rc / Windows 环境变量已写入
+  if (platform === 'win32') {
+    const result = checkWindowsEnvVars(options);
+    checks.push({
+      name: 'Windows 用户环境变量',
+      status: result.allWritten ? STATUS_OK : STATUS_WARN,
+      message: result.allWritten ? '已写入' : `${result.missing.length} 个变量未写入`,
+      fix: result.allWritten ? null : '运行 claw code',
+    });
+  } else {
+    const rcCheck = checkShellRcBlock(options);
+    checks.push({
+      name: 'shell 配置文件',
+      status: rcCheck.found ? STATUS_OK : STATUS_WARN,
+      message: rcCheck.found ? `${rcCheck.file} 已写入 yingclaw 块` : '未找到 yingclaw 配置块',
+      fix: rcCheck.found ? null : '运行 claw code',
+    });
+  }
+
+  // 5. 当前终端环境变量是否生效
+  const expected = buildClaudeEnv(config);
+  const inactive = Object.entries(expected).filter(([k, v]) => env[k] !== v);
+  checks.push({
+    name: '当前终端环境变量',
+    status: inactive.length === 0 ? STATUS_OK : STATUS_WARN,
+    message: inactive.length === 0 ? '已生效' : `${inactive.length}/${Object.keys(expected).length} 未生效`,
+    fix: inactive.length === 0
+      ? null
+      : (platform === 'win32' ? '重新打开 PowerShell / CMD' : '运行 source ~/.zshrc 或重开终端'),
+  });
+
+  // 6. API Key（顺便确认网络可达）
+  const valid = await validateKey(config, { timeoutMs: 6000 });
+  if (valid === true) {
+    checks.push({ name: 'API Key', status: STATUS_OK, message: '校验通过' });
+  } else if (valid === false) {
+    checks.push({
+      name: 'API Key',
+      status: STATUS_FAIL,
+      message: '无效或已过期（401/403）',
+      fix: '运行 claw config 重新输入 Key',
+    });
+  } else {
+    checks.push({
+      name: 'API Key',
+      status: STATUS_WARN,
+      message: '无法连接（网络 / 服务异常）',
+      fix: '检查网络 / VPN，或确认 Base URL 没拼错',
+    });
+  }
+
+  // 7. Claude 桌面应用接入状态
+  const desktopConfigured = isDesktopConfigured();
+  checks.push({
+    name: 'Claude 桌面应用',
+    status: STATUS_INFO,
+    message: desktopConfigured ? '已通过 yingclaw 接入' : '未接入（如需运行 claw desktop）',
+  });
+
+  // 8. DeepSeek 旧模型名提醒
+  if (config.provider === 'deepseek' && (
+    config.model === 'deepseek-v4-pro' ||
+    config.model === 'deepseek-v4-flash' ||
+    config.fastModel === 'deepseek-v4-flash'
+  )) {
+    checks.push({
+      name: '模型名',
+      status: STATUS_WARN,
+      message: '使用旧 DeepSeek 模型名',
+      fix: '运行 claw switch 升级到 [1m] 长上下文版本',
+    });
+  }
+
+  return checks;
+}
+
+function checkShellRcBlock(options = {}) {
+  const homeDir = options.homeDir || os.homedir();
+  const rcFiles = options.rcFiles || [
+    path.join(homeDir, '.zshrc'),
+    path.join(homeDir, '.bashrc'),
+    path.join(homeDir, '.bash_profile'),
+  ];
+  for (const file of rcFiles) {
+    if (!fs.existsSync(file)) continue;
+    const content = fs.readFileSync(file, 'utf8');
+    if (content.includes('# clawai-start')) return { found: true, file };
+  }
+  return { found: false };
+}
+
+function checkWindowsEnvVars(options = {}) {
+  const runner = options.runner || spawnSync;
+  const missing = [];
+  for (const key of CLAUDE_ENV_KEYS) {
+    const result = runner('reg', ['query', 'HKCU\\Environment', '/V', key], { stdio: 'pipe', encoding: 'utf8' });
+    if (result.status !== 0) missing.push(key);
+  }
+  return { allWritten: missing.length === 0, missing };
+}
+
+function summarize(checks) {
+  const counts = { ok: 0, fail: 0, warn: 0, info: 0 };
+  for (const c of checks) counts[c.status] = (counts[c.status] || 0) + 1;
+  return counts;
+}
+
+module.exports = {
+  runDoctorChecks,
+  checkShellRcBlock,
+  checkWindowsEnvVars,
+  summarize,
+  STATUS_OK,
+  STATUS_FAIL,
+  STATUS_WARN,
+  STATUS_INFO,
+};

package/package.json

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