yingclaw 1.5.1 → 1.6.0

package/README.md

@@ -50,7 +50,19 @@ claw status   # 查看当前配置，验证 Key 是否有效
 
 ## 原理
 
-各厂商均原生支持 Anthropic API 格式，只需设置 `ANTHROPIC_BASE_URL` 和 `ANTHROPIC_API_KEY` 两个环境变量即可。本工具自动完成配置，无需手动修改任何文件。
+各厂商均原生支持 Anthropic API 格式。本工具会自动写入 Claude Code 所需的环境变量，包括：
+
+- `ANTHROPIC_BASE_URL`
+- `ANTHROPIC_AUTH_TOKEN`
+- `ANTHROPIC_API_KEY`
+- `ANTHROPIC_MODEL`
+- `ANTHROPIC_DEFAULT_OPUS_MODEL`
+- `ANTHROPIC_DEFAULT_SONNET_MODEL`
+- `ANTHROPIC_DEFAULT_HAIKU_MODEL`
+- `CLAUDE_CODE_SUBAGENT_MODEL`
+- `CLAUDE_CODE_EFFORT_LEVEL`
+
+以 DeepSeek 为例，主模型默认使用 `deepseek-v4-pro[1m]`，Haiku/Subagent 快速模型使用 `deepseek-v4-flash`。如果在线模型列表获取失败，会回退到内置默认列表。
 
 ## License
 

package/bin/cli.js

@@ -2,10 +2,21 @@
 
 const { Command } = require('commander');
 const { select, input, confirm } = require('@inquirer/prompts');
-const { loadConfig, saveConfig, writeEnvToZshrc, fetchModels, PROVIDERS } = require('../lib/config');
+const {
+  loadConfig,
+  saveConfig,
+  writeEnvToZshrc,
+  fetchModels,
+  resetConfig,
+  resolveFastModel,
+  buildClaudeEnv,
+  classifyValidationStatus,
+  PROVIDERS,
+} = require('../lib/config');
 const { execSync, spawn, spawnSync } = require('child_process');
 const https = require('https');
 const pkg = require('../package.json');
+const { buildStatusView } = require('../lib/panel');
 
 const program = new Command();
 
@@ -14,8 +25,9 @@ async function getBanner() {
   const figlet = require('figlet');
   const boxen = (await import('boxen')).default;
   const title = figlet.textSync('claw', { font: 'Standard', horizontalLayout: 'fitted' });
+  const subtitle = chalk.dim('Claude Code × 国产大模型 一键接入') + '   ' + chalk.cyan(`v${pkg.version}`);
   return boxen(
-    chalk.cyan.bold(title) + '\n' + chalk.dim('Claude Code × 国产大模型 一键接入'),
+    chalk.cyan.bold(title) + '\n' + subtitle,
     { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'cyan', margin: { top: 1, bottom: 0 } }
   );
 }
@@ -45,9 +57,7 @@ async function validateKey(config) {
         'content-length': body.length,
       },
     }, (res) => {
-      // 401/403 = Key 无效；2xx/400/500 都说明 Key 被识别了
-      if (res.statusCode === 401 || res.statusCode === 403) resolve(false);
-      else resolve(true);
+      resolve(classifyValidationStatus(res.statusCode));
     });
     req.on('error', () => resolve(null));
     req.on('timeout', () => { req.destroy(); resolve(null); });
@@ -56,6 +66,15 @@ async function validateKey(config) {
   });
 }
 
+function isClaudeInstalled() {
+  try {
+    execSync('claude --version', { stdio: 'pipe' });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
 async function showStatus() {
   const chalk = (await import('chalk')).default;
   const boxen = (await import('boxen')).default;
@@ -67,7 +86,6 @@ async function showStatus() {
     return;
   }
 
-  const provider = PROVIDERS[config.provider];
   const spinner = ora('验证 API Key...').start();
   const valid = await validateKey(config);
 
@@ -75,12 +93,34 @@ async function showStatus() {
   else if (valid === false) spinner.fail('API Key 无效或已过期');
   else spinner.warn('网络异常，无法验证');
 
-  const lines = [
-    `${chalk.dim('厂商    ')}  ${chalk.white.bold(provider?.name || config.provider)}`,
-    `${chalk.dim('模型    ')}  ${chalk.yellow(config.model)}`,
-    `${chalk.dim('API Key ')}  ${chalk.dim(config.apiKey.slice(0, 10) + '...')} ${valid === true ? chalk.green('✔') : valid === false ? chalk.red('✘') : chalk.yellow('?')}`,
-    `${chalk.dim('Base URL')}  ${chalk.cyan(config.baseUrl)}`,
-  ];
+  const view = buildStatusView(config, {
+    apiStatus: valid,
+    claudeInstalled: isClaudeInstalled(),
+    env: process.env,
+  });
+
+  const lines = view.lines.map(({ label, value }) => {
+    const coloredValue = label === '厂商'
+      ? chalk.white.bold(value)
+      : label.includes('模型')
+        ? chalk.yellow(value)
+        : label === 'Base URL'
+          ? chalk.cyan(value)
+          : label === '当前终端' && value === '未生效'
+            ? chalk.yellow(value)
+            : value;
+    return `${chalk.dim(label + ':')} ${coloredValue}`;
+  });
+
+  for (const warning of view.warnings) {
+    if (warning.includes('建议运行')) {
+      const [summary, action] = warning.split('，建议运行 ');
+      lines.push(`${chalk.yellow('提示:')} ${chalk.yellow(summary)}`);
+      lines.push(`${chalk.yellow('建议:')} ${chalk.yellow(`运行 ${action}`)}`);
+    } else {
+      lines.push(`${chalk.yellow('提示:')} ${chalk.yellow(warning)}`);
+    }
+  }
 
   console.log(boxen(lines.join('\n'), {
     title: chalk.bold('当前配置'),
@@ -237,9 +277,10 @@ program
     const spinner = ora('写入配置...').start();
     let result, file;
     try {
-      const cfg = { provider: providerKey, model, apiKey, baseUrl: provider.baseUrl };
+      const fastModel = resolveFastModel(provider, model);
+      const cfg = { provider: providerKey, model, fastModel, apiKey, baseUrl: provider.baseUrl };
       saveConfig(cfg);
-      ({ result, file } = writeEnvToZshrc(provider.baseUrl, apiKey));
+      ({ result, file } = writeEnvToZshrc(provider.baseUrl, apiKey, model, fastModel));
       spinner.succeed(chalk.green(result === 'updated' ? `环境变量已更新 → ${file}` : `环境变量已写入 → ${file}`));
     } catch (e) {
       spinner.fail(chalk.red(`写入失败: ${e.message}`));
@@ -261,7 +302,7 @@ program
 
     spawn('claude', [], {
       stdio: 'inherit',
-      env: { ...process.env, ANTHROPIC_BASE_URL: provider.baseUrl, ANTHROPIC_API_KEY: apiKey },
+      env: { ...process.env, ...buildClaudeEnv({ provider: providerKey, baseUrl: provider.baseUrl, apiKey, model, fastModel: resolveFastModel(provider, model) }) },
     }).on('error', () => {
       console.log(chalk.yellow('\nClaude Code 未找到，请先运行: claw install-claude'));
     });
@@ -329,9 +370,10 @@ program
     if (model === '__BACK__') return;
 
     const spinner = ora('切换中...').start();
-    const newConfig = { ...config, provider: providerKey, model, baseUrl: provider.baseUrl, apiKey };
+    const fastModel = resolveFastModel(provider, model);
+    const newConfig = { ...config, provider: providerKey, model, fastModel, baseUrl: provider.baseUrl, apiKey };
     saveConfig(newConfig);
-    const { file } = writeEnvToZshrc(provider.baseUrl, apiKey);
+    const { file } = writeEnvToZshrc(provider.baseUrl, apiKey, model, fastModel);
     await new Promise(r => setTimeout(r, 300));
     spinner.succeed(chalk.green(`已切换至 ${provider.name} · ${model}`));
     console.log(chalk.dim(`运行 source ${file} 生效，或重新开一个终端`));
@@ -342,19 +384,57 @@ program
   .description('查看当前配置和 Key 有效性')
   .action(showStatus);
 
+program
+  .command('reset')
+  .description('恢复默认（清除所有 clawai 配置）')
+  .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 yes = await confirm({
+      message: chalk.red('确定要清除所有 clawai 配置吗？此操作不可撤销'),
+      default: false,
+    });
+    if (!yes) {
+      console.log(chalk.dim('已取消'));
+      return;
+    }
+
+    const spinner = ora('清除中...').start();
+    const cleared = resetConfig();
+    await new Promise(r => setTimeout(r, 300));
+
+    if (cleared.length === 0) {
+      spinner.warn(chalk.yellow('没有找到任何配置，无需清除'));
+    } else {
+      spinner.succeed(chalk.green('已恢复默认'));
+      console.log(boxen(
+        chalk.bold('已清除以下文件中的 clawai 配置：\n\n') +
+        cleared.map(f => chalk.cyan('  • ' + f)).join('\n') +
+        '\n\n' + chalk.dim('注：当前终端的环境变量还在内存中，重开终端或 unset 才彻底清除'),
+        { padding: { top: 0, bottom: 0, left: 2, right: 2 }, borderStyle: 'round', borderColor: 'green', margin: { top: 1, bottom: 1 } }
+      ));
+    }
+  });
+
 async function renderStatusBar(apiStatus) {
   const chalk = (await import('chalk')).default;
   const config = loadConfig();
-  const claudeInstalled = (() => {
-    try { execSync('claude --version', { stdio: 'pipe' }); return true; } catch { return false; }
-  })();
+  const claudeInstalled = isClaudeInstalled();
 
   const claudeIcon = claudeInstalled ? chalk.green('●') : chalk.red('●');
   const claudeText = chalk.dim('Claude');
 
   let cfgPart;
   if (config) {
-    const provName = PROVIDERS[config.provider]?.name || config.provider;
+    const view = buildStatusView(config, {
+      apiStatus,
+      claudeInstalled,
+      env: process.env,
+    });
     let dot;
     if (apiStatus === true) dot = chalk.green('●');
     else if (apiStatus === false) dot = chalk.red('●');
@@ -364,7 +444,9 @@ async function renderStatusBar(apiStatus) {
                  : apiStatus === false ? chalk.red(' API ✘')
                  : apiStatus === null ? chalk.yellow(' 网络异常')
                  : '';
-    cfgPart = `${dot} ${chalk.white(provName)}${chalk.dim(' · ')}${chalk.yellow(config.model)}${apiTag}`;
+    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)}`;
   } else {
     cfgPart = chalk.red('●') + ' ' + chalk.dim('未配置');
   }
@@ -399,9 +481,10 @@ async function runMenu() {
         { name: '🤖 启动 Claude Code', value: 'launch', disabled: !config && '需先完成配置' },
         { name: '📦 安装 Claude Code', value: 'install' },
         { name: config ? '⚙️  重新配置（输入新的 API Key）' : '⚙️  首次配置 API Key 和模型', value: 'setup' },
-        { name: '🔄 切换厂商/模型（保留当前 Key）', value: 'switch', disabled: !config && '需先完成配置' },
+        { name: '🔄 切换厂商或模型', value: 'switch', disabled: !config && '需先完成配置' },
         { name: '📊 查看当前配置', value: 'status', disabled: !config && '需先完成配置' },
         { name: '🔁 重新检测 API', value: 'recheck', disabled: !config && '需先完成配置' },
+        { name: '🗑  恢复默认（清除所有配置）', value: 'reset', disabled: !config && '没有可清除的配置' },
         { name: '退出', value: 'exit' },
       ],
     });
@@ -420,7 +503,7 @@ async function runMenu() {
       await new Promise((resolve) => {
         const child = spawn('claude', [], {
           stdio: 'inherit',
-          env: { ...process.env, ANTHROPIC_BASE_URL: cfg.baseUrl, ANTHROPIC_API_KEY: cfg.apiKey },
+          env: { ...process.env, ...buildClaudeEnv(cfg) },
         });
         child.on('error', () => {
           console.log(chalk.yellow('\nClaude Code 未找到，请先选择"安装 Claude Code"'));
@@ -436,6 +519,7 @@ async function runMenu() {
       setup: 'setup',
       switch: 'switch',
       status: 'status',
+      reset: 'reset',
     };
 
     // 执行子命令

package/lib/config.js

@@ -10,9 +10,10 @@ const PROVIDERS = {
     name: 'DeepSeek',
     baseUrl: 'https://api.deepseek.com/anthropic',
     modelsUrl: 'https://api.deepseek.com/v1/models',
+    fastModel: 'deepseek-v4-flash',
     models: [
       { name: 'DeepSeek V4 Flash（快速）', value: 'deepseek-v4-flash' },
-      { name: 'DeepSeek V4 Pro（强力）',   value: 'deepseek-v4-pro' },
+      { name: 'DeepSeek V4 Pro（强力）',   value: 'deepseek-v4-pro[1m]' },
     ],
   },
   qwen: {
@@ -107,12 +108,63 @@ function loadConfig() {
 
 function saveConfig(config) {
   fs.writeFileSync(CONFIG_FILE, JSON.stringify(config, null, 2));
+  try {
+    fs.chmodSync(CONFIG_FILE, 0o600);
+  } catch {}
+}
+
+function resolveFastModel(provider, model) {
+  if (/flash|turbo|haiku|air|lite/i.test(model)) return model;
+  return provider?.fastModel || model;
+}
+
+function buildClaudeEnv({ provider, baseUrl, apiKey, model, fastModel }) {
+  const resolvedFastModel = fastModel || resolveFastModel(PROVIDERS[provider], model);
+  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,
+    ANTHROPIC_DEFAULT_HAIKU_MODEL: resolvedFastModel,
+    CLAUDE_CODE_SUBAGENT_MODEL: resolvedFastModel,
+    CLAUDE_CODE_EFFORT_LEVEL: 'max',
+  };
+}
+
+function classifyValidationStatus(statusCode) {
+  if (statusCode >= 200 && statusCode < 300) return true;
+  if (statusCode === 401 || statusCode === 403) return false;
+  return null;
+}
+
+function shellQuote(value) {
+  return `'${String(value).replace(/'/g, `'\\''`)}'`;
+}
+
+// 构造完整的 clawai 环境变量块
+function buildEnvBlock(baseUrl, apiKey, model, fastModel) {
+  const env = buildClaudeEnv({ baseUrl, apiKey, model, fastModel });
+  return [
+    '',
+    '# 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)}`,
+    `export ANTHROPIC_DEFAULT_HAIKU_MODEL=${shellQuote(env.ANTHROPIC_DEFAULT_HAIKU_MODEL)}`,
+    `export CLAUDE_CODE_SUBAGENT_MODEL=${shellQuote(env.CLAUDE_CODE_SUBAGENT_MODEL)}`,
+    `export CLAUDE_CODE_EFFORT_LEVEL=${shellQuote(env.CLAUDE_CODE_EFFORT_LEVEL)}`,
+    '# clawai-end',
+    '',
+  ].join('\n');
 }
 
 // 写入或更新 shell 配置文件中的环境变量块
-function writeEnvToZshrc(baseUrl, apiKey) {
-  // 检测用户 shell，自动选配置文件
-  // macOS bash 默认读 ~/.bash_profile（登录 shell），Linux 读 ~/.bashrc
+function writeEnvToZshrc(baseUrl, apiKey, model, fastModel) {
   const shell = process.env.SHELL || '';
   let rcFile;
   if (shell.includes('bash')) {
@@ -123,22 +175,59 @@ function writeEnvToZshrc(baseUrl, apiKey) {
     rcFile = path.join(os.homedir(), '.zshrc');
   }
 
-  // Key 加引号，避免特殊字符（& = 空格）破坏 shell 语法
-  const safeKey = `"${apiKey.replace(/"/g, '\\"')}"`;
-  const block = `\n# clawai\nexport ANTHROPIC_BASE_URL=${baseUrl}\nexport ANTHROPIC_API_KEY=${safeKey}\n`;
+  const block = buildEnvBlock(baseUrl, apiKey, model, fastModel);
   const current = fs.existsSync(rcFile) ? fs.readFileSync(rcFile, 'utf8') : '';
 
-  if (current.includes('# clawai')) {
-    const updated = current.replace(
-      /# clawai\nexport ANTHROPIC_BASE_URL=[^\n]*\nexport ANTHROPIC_API_KEY=[^\n]*/,
-      `# clawai\nexport ANTHROPIC_BASE_URL=${baseUrl}\nexport ANTHROPIC_API_KEY=${safeKey}`
-    );
-    fs.writeFileSync(rcFile, updated);
-    return { result: 'updated', file: rcFile };
-  } else {
-    fs.appendFileSync(rcFile, block);
-    return { result: 'added', file: rcFile };
+  // 兼容旧版（# clawai 单行块）和新版（# clawai-start...# clawai-end 多行块）
+  const cleaned = current
+    .replace(/\n?# clawai-start[\s\S]*?# clawai-end\n?/g, '')
+    .replace(/\n?# clawai\nexport ANTHROPIC_BASE_URL=[^\n]*\nexport ANTHROPIC_API_KEY=[^\n]*\n?/g, '');
+
+  fs.writeFileSync(rcFile, cleaned + block);
+  return { result: cleaned !== current ? 'updated' : 'added', file: rcFile };
+}
+
+// 清除所有 clawai 配置（配置文件 + shell 环境变量块）
+function resetConfig() {
+  const cleared = [];
+
+  // 删配置文件
+  if (fs.existsSync(CONFIG_FILE)) {
+    fs.unlinkSync(CONFIG_FILE);
+    cleared.push(CONFIG_FILE);
+  }
+
+  // 清理所有可能的 rc 文件中的 clawai 块
+  const rcFiles = [
+    path.join(os.homedir(), '.zshrc'),
+    path.join(os.homedir(), '.bashrc'),
+    path.join(os.homedir(), '.bash_profile'),
+  ];
+  for (const f of rcFiles) {
+    if (!fs.existsSync(f)) continue;
+    const content = fs.readFileSync(f, 'utf8');
+    if (!content.includes('# clawai')) continue;
+    const cleaned = content
+      .replace(/\n?# clawai-start[\s\S]*?# clawai-end\n?/g, '')
+      .replace(/\n?# clawai\nexport ANTHROPIC_BASE_URL=[^\n]*\nexport ANTHROPIC_API_KEY=[^\n]*\n?/g, '');
+    if (cleaned === content) continue;
+    fs.writeFileSync(f, cleaned);
+    cleared.push(f);
   }
+
+  return cleared;
 }
 
-module.exports = { loadConfig, saveConfig, writeEnvToZshrc, fetchModels, PROVIDERS, CONFIG_FILE };
+module.exports = {
+  loadConfig,
+  saveConfig,
+  writeEnvToZshrc,
+  fetchModels,
+  resetConfig,
+  resolveFastModel,
+  buildClaudeEnv,
+  buildEnvBlock,
+  classifyValidationStatus,
+  PROVIDERS,
+  CONFIG_FILE,
+};

package/lib/panel.js

@@ -0,0 +1,49 @@
+const { buildClaudeEnv, PROVIDERS } = require('./config');
+
+function apiStatusText(apiStatus) {
+  if (apiStatus === true) return 'API 正常';
+  if (apiStatus === false) return 'API Key 无效';
+  if (apiStatus === null) return '网络/服务异常';
+  return '未检测';
+}
+
+function isEnvActive(config, env) {
+  const expected = buildClaudeEnv(config);
+  return Object.entries(expected).every(([key, value]) => env[key] === value);
+}
+
+function buildStatusView(config, options = {}) {
+  const provider = PROVIDERS[config.provider];
+  const providerName = provider?.name || config.provider;
+  const claudeInstalled = options.claudeInstalled === true;
+  const env = options.env || {};
+  const expectedEnv = buildClaudeEnv(config);
+  const mainModel = expectedEnv.ANTHROPIC_MODEL;
+  const fastModel = expectedEnv.CLAUDE_CODE_SUBAGENT_MODEL;
+  const envActive = isEnvActive(config, env);
+  const warnings = [];
+
+  if (config.provider === 'deepseek' && config.model === 'deepseek-v4-pro') {
+    warnings.push('检测到旧 DeepSeek 模型名，建议运行 claw switch 更新到 deepseek-v4-pro[1m]');
+  }
+
+  return {
+    providerName,
+    mainModel,
+    fastModel,
+    envActive,
+    warnings,
+    lines: [
+      { label: '厂商', value: providerName },
+      { label: '主模型', value: mainModel },
+      { label: '快速模型', value: fastModel },
+      { label: 'API Key', value: '已保存' },
+      { label: 'API 状态', value: apiStatusText(options.apiStatus) },
+      { label: 'Claude Code', value: claudeInstalled ? '已安装' : '未检测到' },
+      { label: '当前终端', value: envActive ? '已生效' : '未生效' },
+      { label: 'Base URL', value: config.baseUrl },
+    ],
+  };
+}
+
+module.exports = { buildStatusView, apiStatusText, isEnvActive };

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "yingclaw",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "description": "Claude Code × 国产大模型一键接入：DeepSeek、Qwen、MiniMax、GLM、MiMo",
   "main": "index.js",
   "bin": {
     "claw": "bin/cli.js"
   },
   "scripts": {
-    "start": "node bin/cli.js"
+    "start": "node bin/cli.js",
+    "test": "node --test"
   },
   "keywords": [
     "claude",