yingclaw 1.3.0 → 1.5.0

package/bin/cli.js

@@ -119,8 +119,10 @@ program
       choices: [
         { name: '有梯子 / 海外网络（走官方）', value: 'vpn' },
         { name: '国内网络 / 没有梯子（走镜像）', value: 'cn' },
+        { name: chalk.dim('↩  返回主菜单'), value: '__BACK__' },
       ],
     });
+    if (network === '__BACK__') return;
 
     const cmd = network === 'vpn'
       ? 'npm install -g @anthropic-ai/claude-code'
@@ -183,42 +185,61 @@ program
       if (!overwrite) return;
     }
 
-    const providerKey = await select({
-      message: chalk.cyan('选择 AI 厂商'),
-      choices: Object.entries(PROVIDERS).map(([value, p]) => ({ name: p.name, value })),
-    });
-
-    const provider = PROVIDERS[providerKey];
-
-    const apiKey = await input({
-      message: chalk.cyan(`${provider.name} API Key`),
-      transformer: (v) => v ? chalk.dim('•'.repeat(v.length)) : '',
-      validate: (v) => v.trim().length > 0 ? true : 'API Key 不能为空',
-    });
-
-    // 联网拉取支持的模型列表
-    const fetchSpinner = ora('正在获取可用模型...').start();
-    const onlineModels = await fetchModels(providerKey, apiKey.trim());
-    let modelChoices;
-    if (onlineModels && onlineModels.length > 0) {
-      fetchSpinner.succeed(chalk.green(`已获取 ${onlineModels.length} 个可用模型`));
-      modelChoices = onlineModels.map(id => ({ name: id, value: id }));
-    } else {
-      fetchSpinner.warn(chalk.yellow('无法获取在线列表，使用内置默认列表'));
-      modelChoices = provider.models;
+    let providerKey, provider, apiKey, model;
+    let step = 'provider';
+
+    while (true) {
+      if (step === 'provider') {
+        providerKey = await select({
+          message: chalk.cyan('选择 AI 厂商'),
+          choices: [
+            ...Object.entries(PROVIDERS).map(([value, p]) => ({ name: p.name, value })),
+            { name: chalk.dim('↩  返回主菜单'), value: '__BACK__' },
+          ],
+        });
+        if (providerKey === '__BACK__') return;
+        provider = PROVIDERS[providerKey];
+        step = 'apikey';
+      } else if (step === 'apikey') {
+        const k = await input({
+          message: chalk.cyan(`${provider.name} API Key（输入 b 返回上一步）`),
+          transformer: (v) => v && v !== 'b' ? chalk.dim('•'.repeat(v.length)) : v,
+          validate: (v) => v.trim().length > 0 ? true : 'API Key 不能为空',
+        });
+        if (k.trim() === 'b') { step = 'provider'; continue; }
+        apiKey = k.trim();
+        step = 'model';
+      } else if (step === 'model') {
+        const fetchSpinner = ora('正在获取可用模型...').start();
+        const onlineModels = await fetchModels(providerKey, apiKey);
+        let modelChoices;
+        if (onlineModels && onlineModels.length > 0) {
+          fetchSpinner.succeed(chalk.green(`已获取 ${onlineModels.length} 个可用模型`));
+          modelChoices = onlineModels.map(id => ({ name: id, value: id }));
+        } else {
+          fetchSpinner.warn(chalk.yellow('无法获取在线列表，使用内置默认列表'));
+          modelChoices = provider.models;
+        }
+
+        const m = await select({
+          message: chalk.cyan('选择模型'),
+          choices: [
+            ...modelChoices,
+            { name: chalk.dim('↩  返回上一步（重新输入 Key）'), value: '__BACK__' },
+          ],
+        });
+        if (m === '__BACK__') { step = 'apikey'; continue; }
+        model = m;
+        break;
+      }
     }
 
-    const model = await select({
-      message: chalk.cyan('选择模型'),
-      choices: modelChoices,
-    });
-
     const spinner = ora('写入配置...').start();
     let result, file;
     try {
-      const config = { provider: providerKey, model, apiKey: apiKey.trim(), baseUrl: provider.baseUrl };
-      saveConfig(config);
-      ({ result, file } = writeEnvToZshrc(provider.baseUrl, apiKey.trim()));
+      const cfg = { provider: providerKey, model, apiKey, baseUrl: provider.baseUrl };
+      saveConfig(cfg);
+      ({ result, file } = writeEnvToZshrc(provider.baseUrl, apiKey));
       spinner.succeed(chalk.green(result === 'updated' ? `环境变量已更新 → ${file}` : `环境变量已写入 → ${file}`));
     } catch (e) {
       spinner.fail(chalk.red(`写入失败: ${e.message}`));
@@ -229,7 +250,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.trim().slice(0, 10) + '...') + '\n\n' +
+      chalk.dim('ANTHROPIC_API_KEY   ') + chalk.cyan(apiKey.slice(0, 10) + '...') + '\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 } }
     ));
@@ -240,7 +261,7 @@ program
 
     spawn('claude', [], {
       stdio: 'inherit',
-      env: { ...process.env, ANTHROPIC_BASE_URL: provider.baseUrl, ANTHROPIC_API_KEY: apiKey.trim() },
+      env: { ...process.env, ANTHROPIC_BASE_URL: provider.baseUrl, ANTHROPIC_API_KEY: apiKey },
     }).on('error', () => {
       console.log(chalk.yellow('\nClaude Code 未找到，请先运行: claw install-claude'));
     });
@@ -263,8 +284,12 @@ program
 
     const providerKey = await select({
       message: chalk.cyan('选择 AI 厂商'),
-      choices: Object.entries(PROVIDERS).map(([value, p]) => ({ name: p.name, value })),
+      choices: [
+        ...Object.entries(PROVIDERS).map(([value, p]) => ({ name: p.name, value })),
+        { name: chalk.dim('↩  返回主菜单'), value: '__BACK__' },
+      ],
     });
+    if (providerKey === '__BACK__') return;
 
     const provider = PROVIDERS[providerKey];
 
@@ -296,8 +321,12 @@ program
 
     const model = await select({
       message: chalk.cyan('选择模型'),
-      choices: modelChoices,
+      choices: [
+        ...modelChoices,
+        { name: chalk.dim('↩  返回主菜单'), value: '__BACK__' },
+      ],
     });
+    if (model === '__BACK__') return;
 
     const spinner = ora('切换中...').start();
     const newConfig = { ...config, provider: providerKey, model, baseUrl: provider.baseUrl, apiKey };
@@ -313,7 +342,7 @@ program
   .description('查看当前配置和 Key 有效性')
   .action(showStatus);
 
-async function renderStatusBar() {
+async function renderStatusBar(apiStatus) {
   const chalk = (await import('chalk')).default;
   const config = loadConfig();
   const claudeInstalled = (() => {
@@ -326,7 +355,16 @@ async function renderStatusBar() {
   let cfgPart;
   if (config) {
     const provName = PROVIDERS[config.provider]?.name || config.provider;
-    cfgPart = chalk.green('●') + ' ' + chalk.white(provName) + chalk.dim(' · ') + chalk.yellow(config.model);
+    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(' 网络异常')
+                 : '';
+    cfgPart = `${dot} ${chalk.white(provName)}${chalk.dim(' · ')}${chalk.yellow(config.model)}${apiTag}`;
   } else {
     cfgPart = chalk.red('●') + ' ' + chalk.dim('未配置');
   }
@@ -336,14 +374,25 @@ async function renderStatusBar() {
 
 async function runMenu() {
   const chalk = (await import('chalk')).default;
+  const ora = (await import('ora')).default;
 
   while (true) {
     console.clear();
     console.log(await getBanner());
-    console.log(await renderStatusBar());
-    console.log();
 
     const config = loadConfig();
+    let apiStatus; // undefined = skipped, true/false/null = checked
+    if (config) {
+      const spinner = ora('正在检测 API 是否通畅...').start();
+      apiStatus = await validateKey(config);
+      if (apiStatus === true) spinner.succeed('API 连接正常');
+      else if (apiStatus === false) spinner.fail('API Key 无效或已过期');
+      else spinner.warn('网络异常，无法连接 API');
+    }
+
+    console.log(await renderStatusBar(apiStatus));
+    console.log();
+
     const action = await select({
       message: chalk.cyan('选择操作'),
       choices: [
@@ -352,12 +401,18 @@ async function runMenu() {
         { name: config ? '⚙️  重新配置（输入新的 API Key）' : '⚙️  首次配置 API Key 和模型', value: 'setup' },
         { name: '🔄 切换厂商/模型（保留当前 Key）', value: 'switch', disabled: !config && '需先完成配置' },
         { name: '📊 查看当前配置', value: 'status', disabled: !config && '需先完成配置' },
+        { name: '🔁 重新检测 API', value: 'recheck', disabled: !config && '需先完成配置' },
         { name: '退出', value: 'exit' },
       ],
     });
 
     if (action === 'exit') return;
 
+    if (action === 'recheck') {
+      // 仅刷新菜单，下次循环会重新检测
+      continue;
+    }
+
     if (action === 'launch') {
       const cfg = loadConfig();
       if (!cfg) continue;

package/package.json

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