yingclaw 1.6.0 → 1.6.2

package/README.md

@@ -48,6 +48,12 @@ claw switch   # 快速切换模型（无需重新输入 Key）
 claw status   # 查看当前配置，验证 Key 是否有效
 ```
 
+## 卸载
+
+```bash
+npm uninstall -g yingclaw
+```
+
 ## 原理
 
 各厂商均原生支持 Anthropic API 格式。本工具会自动写入 Claude Code 所需的环境变量，包括：

package/bin/cli.js

@@ -8,6 +8,7 @@ const {
   writeEnvToZshrc,
   fetchModels,
   resetConfig,
+  validateConfig,
   resolveFastModel,
   buildClaudeEnv,
   classifyValidationStatus,
@@ -16,7 +17,7 @@ const {
 const { execSync, spawn, spawnSync } = require('child_process');
 const https = require('https');
 const pkg = require('../package.json');
-const { buildStatusView } = require('../lib/panel');
+const { buildMenuStatusLines, buildStatusView } = require('../lib/panel');
 
 const program = new Command();
 
@@ -66,6 +67,11 @@ async function validateKey(config) {
   });
 }
 
+function getConfigValidationMessage(config) {
+  const validation = validateConfig(config);
+  return validation.valid ? null : validation.message;
+}
+
 function isClaudeInstalled() {
   try {
     execSync('claude --version', { stdio: 'pipe' });
@@ -85,6 +91,12 @@ async function showStatus() {
     console.log(chalk.red('\n未配置，请先运行: claw setup\n'));
     return;
   }
+  const configProblem = getConfigValidationMessage(config);
+  if (configProblem) {
+    console.log(chalk.red(`\n配置无效：${configProblem}`));
+    console.log(chalk.dim('请运行 claw setup 重新配置。\n'));
+    return;
+  }
 
   const spinner = ora('验证 API Key...').start();
   const valid = await validateKey(config);
@@ -218,7 +230,7 @@ program
         chalk.bold('当前配置\n\n') +
         chalk.dim('厂商  ') + chalk.white(existingProvider?.name || existing.provider) + '\n' +
         chalk.dim('模型  ') + chalk.yellow(existing.model) + '\n' +
-        chalk.dim('Key   ') + chalk.dim(existing.apiKey.slice(0, 10) + '...'),
+        chalk.dim('Key   ') + chalk.dim(existing.apiKey ? '已保存' : '缺失'),
         { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'yellow', margin: { top: 1, bottom: 1 } }
       ));
       const overwrite = await confirm({ message: '覆盖现有配置？', default: false });
@@ -291,7 +303,7 @@ program
     console.log(boxen(
       chalk.bold('配置完成！\n\n') +
       chalk.dim('ANTHROPIC_BASE_URL  ') + chalk.cyan(provider.baseUrl) + '\n' +
-      chalk.dim('ANTHROPIC_API_KEY   ') + chalk.cyan(apiKey.slice(0, 10) + '...') + '\n\n' +
+      chalk.dim('ANTHROPIC_API_KEY   ') + chalk.cyan('已保存') + '\n\n' +
       chalk.white('下次直接输入 ') + chalk.cyan.bold('claude') + chalk.white(' 即可使用'),
       { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
     ));
@@ -322,6 +334,12 @@ program
       console.log(chalk.red('\n未配置，请先运行: claw setup\n'));
       return;
     }
+    const configProblem = getConfigValidationMessage(config);
+    if (configProblem) {
+      console.log(chalk.red(`\n配置无效：${configProblem}`));
+      console.log(chalk.dim('请运行 claw setup 重新配置。\n'));
+      return;
+    }
 
     const providerKey = await select({ loop: false,
       message: chalk.cyan('选择 AI 厂商'),
@@ -435,23 +453,19 @@ async function renderStatusBar(apiStatus) {
       claudeInstalled,
       env: process.env,
     });
-    let dot;
-    if (apiStatus === true) dot = chalk.green('●');
-    else if (apiStatus === false) dot = chalk.red('●');
-    else if (apiStatus === null) dot = chalk.yellow('●');
-    else dot = chalk.dim('●'); // 未检测
-    const apiTag = apiStatus === true ? chalk.green(' API ✓')
-                 : apiStatus === false ? chalk.red(' API ✘')
-                 : apiStatus === null ? chalk.yellow(' 网络异常')
-                 : '';
-    const envTag = view.envActive ? chalk.green(' env ✓') : chalk.yellow(' env 未生效');
-    const legacyTag = view.warnings.length > 0 ? chalk.yellow(' 旧模型') : '';
-    cfgPart = `${dot} ${chalk.white(view.providerName)}${apiTag}${envTag}${legacyTag}\n  ${chalk.dim('主 ')}${chalk.yellow(view.mainModel)}${chalk.dim('    快 ')}${chalk.yellow(view.fastModel)}`;
+    const statusLines = buildMenuStatusLines(view, { apiStatus, claudeInstalled });
+    cfgPart = statusLines.map((line, index) => {
+      if (index === 0) return line.replace('API 正常', chalk.green('API 正常')).replace('API Key 无效', chalk.red('API Key 无效')).replace('网络/服务异常', chalk.yellow('网络/服务异常'));
+      if (line.startsWith('环境变量未生效')) return chalk.yellow(line);
+      if (line.startsWith('旧模型名')) return chalk.yellow(line);
+      if (line.startsWith('主模型')) return line.replace(view.mainModel, chalk.yellow(view.mainModel)).replace(view.fastModel, chalk.yellow(view.fastModel));
+      return line;
+    }).join('\n  ');
   } else {
     cfgPart = chalk.red('●') + ' ' + chalk.dim('未配置');
   }
 
-  return `  ${claudeIcon} ${claudeText}    ${cfgPart}`;
+  return config ? `  ${cfgPart}` : `  ${claudeIcon} ${claudeText}    ${cfgPart}`;
 }
 
 async function runMenu() {
@@ -464,7 +478,8 @@ async function runMenu() {
 
     const config = loadConfig();
     let apiStatus; // undefined = skipped, true/false/null = checked
-    if (config) {
+    const configProblem = config ? getConfigValidationMessage(config) : null;
+    if (config && !configProblem) {
       const spinner = ora('正在检测 API 是否通畅...').start();
       apiStatus = await validateKey(config);
       if (apiStatus === true) spinner.succeed('API 连接正常');
@@ -472,18 +487,23 @@ async function runMenu() {
       else spinner.warn('网络异常，无法连接 API');
     }
 
-    console.log(await renderStatusBar(apiStatus));
+    if (configProblem) {
+      console.log(chalk.red(`  ● 配置无效：${configProblem}`));
+      console.log(chalk.dim('  请先选择“首次配置 API Key 和模型”重新配置'));
+    } else {
+      console.log(await renderStatusBar(apiStatus));
+    }
     console.log();
 
     const action = await select({ loop: false,
       message: chalk.cyan('选择操作'),
       choices: [
-        { name: '🤖 启动 Claude Code', value: 'launch', disabled: !config && '需先完成配置' },
+        { name: '🤖 启动 Claude Code', value: 'launch', disabled: (!config || configProblem) && '需先完成配置' },
         { name: '📦 安装 Claude Code', value: 'install' },
         { name: config ? '⚙️  重新配置（输入新的 API Key）' : '⚙️  首次配置 API Key 和模型', value: 'setup' },
-        { name: '🔄 切换厂商或模型', value: 'switch', disabled: !config && '需先完成配置' },
+        { name: '🔄 切换厂商或模型', value: 'switch', disabled: (!config || configProblem) && '需先完成配置' },
         { name: '📊 查看当前配置', value: 'status', disabled: !config && '需先完成配置' },
-        { name: '🔁 重新检测 API', value: 'recheck', disabled: !config && '需先完成配置' },
+        { name: '🔁 重新检测 API', value: 'recheck', disabled: (!config || configProblem) && '需先完成配置' },
         { name: '🗑  恢复默认（清除所有配置）', value: 'reset', disabled: !config && '没有可清除的配置' },
         { name: '退出', value: 'exit' },
       ],
@@ -498,7 +518,7 @@ async function runMenu() {
 
     if (action === 'launch') {
       const cfg = loadConfig();
-      if (!cfg) continue;
+      if (!cfg || getConfigValidationMessage(cfg)) continue;
       // 启动 claude 后等它退出，然后回菜单
       await new Promise((resolve) => {
         const child = spawn('claude', [], {

package/index.js

@@ -0,0 +1,4 @@
+module.exports = {
+  ...require('./lib/config'),
+  ...require('./lib/panel'),
+};

package/lib/config.js

@@ -106,6 +106,21 @@ function loadConfig() {
   }
 }
 
+function validateConfig(config) {
+  if (!config || typeof config !== 'object') {
+    return { valid: false, message: '未找到配置' };
+  }
+  for (const key of ['provider', 'baseUrl', 'apiKey', 'model']) {
+    if (typeof config[key] !== 'string' || config[key].trim().length === 0) {
+      return { valid: false, message: `配置缺少 ${key}` };
+    }
+  }
+  if (!PROVIDERS[config.provider]) {
+    return { valid: false, message: `未知厂商 ${config.provider}` };
+  }
+  return { valid: true };
+}
+
 function saveConfig(config) {
   fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
   try {
@@ -113,6 +128,10 @@ function saveConfig(config) {
   } catch {}
 }
 
+function providerKeyFromBaseUrl(baseUrl) {
+  return Object.entries(PROVIDERS).find(([, provider]) => provider.baseUrl === baseUrl)?.[0];
+}
+
 function resolveFastModel(provider, model) {
   if (/flash|turbo|haiku|air|lite/i.test(model)) return model;
   return provider?.fastModel || model;
@@ -145,7 +164,8 @@ function shellQuote(value) {
 
 // 构造完整的 clawai 环境变量块
 function buildEnvBlock(baseUrl, apiKey, model, fastModel) {
-  const env = buildClaudeEnv({ baseUrl, apiKey, model, fastModel });
+  const provider = providerKeyFromBaseUrl(baseUrl);
+  const env = buildClaudeEnv({ provider, baseUrl, apiKey, model, fastModel });
   return [
     '',
     '# clawai-start',
@@ -224,7 +244,9 @@ module.exports = {
   writeEnvToZshrc,
   fetchModels,
   resetConfig,
+  validateConfig,
   resolveFastModel,
+  providerKeyFromBaseUrl,
   buildClaudeEnv,
   buildEnvBlock,
   classifyValidationStatus,

package/lib/panel.js

@@ -46,4 +46,25 @@ function buildStatusView(config, options = {}) {
   };
 }
 
-module.exports = { buildStatusView, apiStatusText, isEnvActive };
+function buildMenuStatusLines(view, options = {}) {
+  const claudeText = options.claudeInstalled ? 'Claude 已安装' : 'Claude 未安装';
+  const lines = [
+    `${claudeText} · ${view.providerName} · ${apiStatusText(options.apiStatus)}`,
+  ];
+
+  if (view.envActive) {
+    lines.push('环境变量已生效');
+  } else {
+    lines.push('环境变量未生效：运行 source ~/.zshrc 或重开终端');
+  }
+
+  lines.push(`主模型 ${view.mainModel} · 快速模型 ${view.fastModel}`);
+
+  if (view.warnings.some((warning) => warning.includes('旧 DeepSeek 模型名'))) {
+    lines.push('旧模型名：选择下方“切换厂商或模型”更新');
+  }
+
+  return lines;
+}
+
+module.exports = { buildMenuStatusLines, buildStatusView, apiStatusText, isEnvActive };

package/package.json

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