yingclaw 1.1.0 → 1.4.0

package/bin/cli.js

@@ -2,7 +2,7 @@
 
 const { Command } = require('commander');
 const { select, input, confirm } = require('@inquirer/prompts');
-const { loadConfig, saveConfig, writeEnvToZshrc, PROVIDERS } = require('../lib/config');
+const { loadConfig, saveConfig, writeEnvToZshrc, fetchModels, PROVIDERS } = require('../lib/config');
 const { execSync, spawn, spawnSync } = require('child_process');
 const https = require('https');
 const pkg = require('../package.json');
@@ -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,30 +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 model = await select({
-      message: chalk.cyan('选择模型'),
-      choices: provider.models,
-    });
-
-    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 不能为空',
-    });
+    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 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}`));
@@ -217,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 } }
     ));
@@ -228,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'));
     });
@@ -251,16 +284,15 @@ 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];
 
-    const model = await select({
-      message: chalk.cyan('选择模型'),
-      choices: provider.models,
-    });
-
     // 切换厂商时询问是否更换 Key
     let apiKey = config.apiKey;
     if (providerKey !== config.provider) {
@@ -275,6 +307,27 @@ program
       }
     }
 
+    // 联网拉模型
+    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 model = await select({
+      message: chalk.cyan('选择模型'),
+      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 };
     saveConfig(newConfig);
@@ -289,34 +342,44 @@ program
   .description('查看当前配置和 Key 有效性')
   .action(showStatus);
 
-// 无参数时显示交互式菜单
-if (process.argv.length === 2) {
-  (async () => {
-    const chalk = (await import('chalk')).default;
+async function renderStatusBar() {
+  const chalk = (await import('chalk')).default;
+  const config = loadConfig();
+  const claudeInstalled = (() => {
+    try { execSync('claude --version', { stdio: 'pipe' }); return true; } catch { return false; }
+  })();
+
+  const claudeIcon = claudeInstalled ? chalk.green('●') : chalk.red('●');
+  const claudeText = chalk.dim('Claude');
+
+  let cfgPart;
+  if (config) {
+    const provName = PROVIDERS[config.provider]?.name || config.provider;
+    cfgPart = chalk.green('●') + ' ' + chalk.white(provName) + chalk.dim(' · ') + chalk.yellow(config.model);
+  } else {
+    cfgPart = chalk.red('●') + ' ' + chalk.dim('未配置');
+  }
+
+  return `  ${claudeIcon} ${claudeText}    ${cfgPart}`;
+}
 
+async function runMenu() {
+  const chalk = (await import('chalk')).default;
+
+  while (true) {
+    console.clear();
     console.log(await getBanner());
+    console.log(await renderStatusBar());
+    console.log();
 
     const config = loadConfig();
-    const claudeInstalled = (() => {
-      try { execSync('claude --version', { stdio: 'pipe' }); return true; } catch { return false; }
-    })();
-
-    // 根据当前状态生成提示
-    if (config) {
-      console.log(chalk.green(`  当前：${PROVIDERS[config.provider]?.name || config.provider} · ${config.model}\n`));
-    } else if (claudeInstalled) {
-      console.log(chalk.yellow('  Claude Code 已安装，还未配置 API\n'));
-    } else {
-      console.log(chalk.dim('  首次使用，请先安装 Claude Code\n'));
-    }
-
     const action = await select({
       message: chalk.cyan('选择操作'),
       choices: [
         { name: '🤖 启动 Claude Code', value: 'launch', disabled: !config && '需先完成配置' },
         { name: '📦 安装 Claude Code', value: 'install' },
-        { name: '⚙️  配置 API Key 和模型', value: 'setup' },
-        { name: '🔄 切换模型', value: 'switch', disabled: !config && '需先完成配置' },
+        { name: config ? '⚙️  重新配置（输入新的 API Key）' : '⚙️  首次配置 API Key 和模型', value: 'setup' },
+        { name: '🔄 切换厂商/模型（保留当前 Key）', value: 'switch', disabled: !config && '需先完成配置' },
         { name: '📊 查看当前配置', value: 'status', disabled: !config && '需先完成配置' },
         { name: '退出', value: 'exit' },
       ],
@@ -324,24 +387,56 @@ if (process.argv.length === 2) {
 
     if (action === 'exit') return;
 
-    // 把选中的命令转发给 commander
-    const cmdMap = {
-      launch: () => {
-        if (!config) return;
-        spawn('claude', [], {
+    if (action === 'launch') {
+      const cfg = loadConfig();
+      if (!cfg) continue;
+      // 启动 claude 后等它退出，然后回菜单
+      await new Promise((resolve) => {
+        const child = spawn('claude', [], {
           stdio: 'inherit',
-          env: { ...process.env, ANTHROPIC_BASE_URL: config.baseUrl, ANTHROPIC_API_KEY: config.apiKey },
-        }).on('error', () => {
+          env: { ...process.env, ANTHROPIC_BASE_URL: cfg.baseUrl, ANTHROPIC_API_KEY: cfg.apiKey },
+        });
+        child.on('error', () => {
           console.log(chalk.yellow('\nClaude Code 未找到，请先选择"安装 Claude Code"'));
+          resolve();
         });
-      },
-      install: () => program.parseAsync(['node', 'claw', 'install-claude']),
-      setup: () => program.parseAsync(['node', 'claw', 'setup']),
-      switch: () => program.parseAsync(['node', 'claw', 'switch']),
-      status: () => program.parseAsync(['node', 'claw', 'status']),
+        child.on('exit', resolve);
+      });
+      continue;
+    }
+
+    const cmdMap = {
+      install: 'install-claude',
+      setup: 'setup',
+      switch: 'switch',
+      status: 'status',
     };
-    await cmdMap[action]();
-  })();
+
+    // 执行子命令
+    await new Promise((resolve) => {
+      const child = spawn(process.execPath, [__filename, cmdMap[action]], { stdio: 'inherit' });
+      child.on('exit', resolve);
+      child.on('error', resolve);
+    });
+
+    // 操作结束，提示返回菜单
+    console.log();
+    const next = await select({
+      message: chalk.cyan('下一步'),
+      choices: [
+        { name: '↩  返回主菜单', value: 'menu' },
+        { name: '退出', value: 'exit' },
+      ],
+    });
+    if (next === 'exit') return;
+  }
+}
+
+if (process.argv.length === 2) {
+  runMenu().catch((e) => {
+    if (e?.name === 'ExitPromptError') return; // Ctrl+C
+    console.error(e);
+  });
 } else {
   program.parse(process.argv);
 }

package/lib/config.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const os = require('os');
+const https = require('https');
 
 const CONFIG_FILE = path.join(os.homedir(), '.clawai.json');
 
@@ -8,6 +9,7 @@ const PROVIDERS = {
   deepseek: {
     name: 'DeepSeek',
     baseUrl: 'https://api.deepseek.com/anthropic',
+    modelsUrl: 'https://api.deepseek.com/v1/models',
     models: [
       { name: 'DeepSeek V4 Flash（快速）', value: 'deepseek-v4-flash' },
       { name: 'DeepSeek V4 Pro（强力）',   value: 'deepseek-v4-pro' },
@@ -16,6 +18,7 @@ const PROVIDERS = {
   qwen: {
     name: '阿里云百炼 (Qwen)',
     baseUrl: 'https://dashscope.aliyuncs.com/apps/anthropic',
+    modelsUrl: 'https://dashscope.aliyuncs.com/compatible-mode/v1/models',
     models: [
       { name: 'Qwen3 Max（强力）',   value: 'qwen3-max' },
       { name: 'Qwen3 Plus（均衡）',  value: 'qwen3-plus' },
@@ -25,6 +28,7 @@ const PROVIDERS = {
   minimax: {
     name: 'MiniMax',
     baseUrl: 'https://api.minimaxi.com/anthropic',
+    modelsUrl: 'https://api.minimaxi.com/v1/models',
     models: [
       { name: 'MiniMax M2.7（旗舰）',       value: 'MiniMax-M2.7' },
       { name: 'MiniMax M2.7 Turbo（快速）', value: 'MiniMax-M2.7-Turbo' },
@@ -34,6 +38,7 @@ const PROVIDERS = {
   glm: {
     name: '智谱 GLM',
     baseUrl: 'https://open.bigmodel.cn/api/anthropic',
+    modelsUrl: 'https://open.bigmodel.cn/api/paas/v4/models',
     models: [
       { name: 'GLM-4.7（旗舰）',     value: 'GLM-4.7' },
       { name: 'GLM-5.1（强力）',     value: 'GLM-5.1' },
@@ -44,12 +49,54 @@ const PROVIDERS = {
   mimo: {
     name: '小米 MiMo',
     baseUrl: 'https://api.xiaomimimo.com/anthropic',
+    modelsUrl: 'https://api.xiaomimimo.com/v1/models',
     models: [
       { name: 'MiMo V2.5 Pro（旗舰）', value: 'mimo-v2.5-pro' },
     ],
   },
 };
 
+// 联网拉取厂商支持的模型列表，失败返回 null
+function fetchModels(providerKey, apiKey) {
+  return new Promise((resolve) => {
+    const provider = PROVIDERS[providerKey];
+    if (!provider?.modelsUrl) return resolve(null);
+
+    let url;
+    try { url = new URL(provider.modelsUrl); } catch { return resolve(null); }
+
+    const req = https.request({
+      hostname: url.hostname,
+      path: url.pathname,
+      method: 'GET',
+      timeout: 6000,
+      headers: {
+        'authorization': `Bearer ${apiKey}`,
+        'api-key': apiKey, // MiMo 用这个 header
+      },
+    }, (res) => {
+      let data = '';
+      res.on('data', (c) => data += c);
+      res.on('end', () => {
+        try {
+          const parsed = JSON.parse(data);
+          // OpenAI 格式: { data: [{ id, ... }] }
+          // GLM 格式: { data: [{ id, ... }] } 类似
+          const list = parsed.data || parsed.models || [];
+          const ids = list.map(m => m.id || m.model || m.name).filter(Boolean);
+          if (ids.length === 0) return resolve(null);
+          resolve(ids);
+        } catch {
+          resolve(null);
+        }
+      });
+    });
+    req.on('error', () => resolve(null));
+    req.on('timeout', () => { req.destroy(); resolve(null); });
+    req.end();
+  });
+}
+
 function loadConfig() {
   try {
     return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'));
@@ -94,4 +141,4 @@ function writeEnvToZshrc(baseUrl, apiKey) {
   }
 }
 
-module.exports = { loadConfig, saveConfig, writeEnvToZshrc, PROVIDERS, CONFIG_FILE };
+module.exports = { loadConfig, saveConfig, writeEnvToZshrc, fetchModels, PROVIDERS, CONFIG_FILE };

package/package.json

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