yingclaw 1.6.2 → 1.7.0

package/README.md

@@ -2,7 +2,7 @@
 
 Claude Code × 国产大模型，一键接入。
 
-支持 DeepSeek、阿里云百炼（Qwen）、MiniMax、智谱 GLM、小米 MiMo，无需梯子即可使用 Claude Code。
+支持 DeepSeek、阿里云百炼（Qwen）、MiniMax、智谱 GLM、小米 MiMo，也支持自定义 Anthropic 兼容接口，无需梯子即可使用 Claude Code。
 
 ## 安装
 
@@ -14,6 +14,8 @@ npm install -g yingclaw
 
 ## 使用步骤
 
+> 当前自动写入环境变量支持 macOS / Linux 的 zsh、bash。Windows 用户可参考“原理”中的环境变量手动配置，PowerShell 自动写入后续版本支持。
+
 **第一步：安装 Claude Code**
 ```bash
 claw install-claude
@@ -24,7 +26,15 @@ claw install-claude
 ```bash
 claw setup
 ```
-选择厂商 → 选择模型 → 输入 API Key，自动写入环境变量，配置完成后自动启动 Claude。
+选择厂商 → 输入 API Key → 选择模型，自动写入环境变量，配置完成后自动启动 Claude。
+
+选择“自定义 Anthropic 兼容接口”时，需要输入：
+
+- `ANTHROPIC_BASE_URL`
+- API Key
+- Models URL（可选）
+
+如果填写了 Models URL，会自动获取模型列表；如果留空或获取失败，则手动输入主模型和快速模型。
 
 **第三步：以后直接用**
 ```bash
@@ -40,6 +50,7 @@ claude
 | MiniMax | M2.7、M2.7 Turbo、M2.5 |
 | 智谱 GLM | GLM-4.7、GLM-5.1、GLM-5 Turbo、GLM-4.5 Air |
 | 小米 MiMo | MiMo V2.5 Pro |
+| 自定义接口 | 自动获取或手动输入 |
 
 ## 其他命令
 

package/bin/cli.js

@@ -18,6 +18,7 @@ const { execSync, spawn, spawnSync } = require('child_process');
 const https = require('https');
 const pkg = require('../package.json');
 const { buildMenuStatusLines, buildStatusView } = require('../lib/panel');
+const { buildClaudeInstallCommand } = require('../lib/install');
 
 const program = new Command();
 
@@ -81,6 +82,102 @@ function isClaudeInstalled() {
   }
 }
 
+function isValidUrl(value) {
+  try {
+    new URL(value);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+async function promptModelFromChoices({ chalk, choices, message, backLabel = '↩  返回上一步', allowManual = true }) {
+  const selected = await select({ loop: false,
+    message: chalk.cyan(message),
+    choices: [
+      ...choices,
+      ...(allowManual ? [{ name: '手动输入模型名', value: '__MANUAL__' }] : []),
+      { name: chalk.dim(backLabel), value: '__BACK__' },
+    ],
+  });
+  if (selected === '__BACK__') return '__BACK__';
+  if (selected !== '__MANUAL__') return selected;
+
+  return input({
+    message: chalk.cyan('输入模型名'),
+    validate: (v) => v.trim().length > 0 ? true : '模型名不能为空',
+  }).then(v => v.trim());
+}
+
+async function promptManualModel(chalk, message, defaultValue) {
+  return input({
+    message: chalk.cyan(message),
+    default: defaultValue,
+    validate: (v) => v.trim().length > 0 ? true : '模型名不能为空',
+  }).then(v => v.trim());
+}
+
+async function configureCustomProvider({ chalk, ora, existingConfig }) {
+  const baseUrl = await input({
+    message: chalk.cyan('Anthropic Base URL'),
+    default: existingConfig?.provider === 'custom' ? existingConfig.baseUrl : undefined,
+    validate: (v) => v.trim().length > 0 && isValidUrl(v.trim()) ? true : '请输入有效 URL',
+  }).then(v => v.trim().replace(/\/+$/, ''));
+
+  let apiKey = existingConfig?.provider === 'custom' ? existingConfig.apiKey : '';
+  if (apiKey) {
+    const keepKey = await confirm({ message: '沿用当前 API Key？', default: true });
+    if (!keepKey) apiKey = '';
+  }
+  if (!apiKey) {
+    apiKey = await input({
+      message: chalk.cyan('API Key'),
+      transformer: (v) => v ? chalk.dim('•'.repeat(v.length)) : '',
+      validate: (v) => v.trim().length > 0 ? true : 'API Key 不能为空',
+    }).then(v => v.trim());
+  }
+
+  const modelsUrl = await input({
+    message: chalk.cyan('Models URL（可选，留空则手动输入模型）'),
+    default: existingConfig?.provider === 'custom' ? existingConfig.modelsUrl : undefined,
+    validate: (v) => !v.trim() || isValidUrl(v.trim()) ? true : '请输入有效 URL，或留空',
+  }).then(v => v.trim());
+
+  let modelChoices = [];
+  if (modelsUrl) {
+    const fetchSpinner = ora('正在获取可用模型...').start();
+    const onlineModels = await fetchModels('custom', apiKey, modelsUrl);
+    if (onlineModels && onlineModels.length > 0) {
+      fetchSpinner.succeed(chalk.green(`已获取 ${onlineModels.length} 个可用模型`));
+      modelChoices = onlineModels.map(id => ({ name: id, value: id }));
+    } else {
+      fetchSpinner.warn(chalk.yellow('无法获取在线列表，改为手动输入模型'));
+    }
+  }
+
+  let model;
+  let fastModel;
+  if (modelChoices.length > 0) {
+    model = await promptModelFromChoices({ chalk, choices: modelChoices, message: '选择主模型' });
+    if (model === '__BACK__') return null;
+    fastModel = await promptModelFromChoices({ chalk, choices: modelChoices, message: '选择快速模型 / Subagent 模型' });
+    if (fastModel === '__BACK__') return null;
+  } else {
+    model = await promptManualModel(chalk, '输入主模型名');
+    fastModel = await promptManualModel(chalk, '输入快速模型 / Subagent 模型名', model);
+  }
+
+  return {
+    provider: 'custom',
+    providerName: '自定义接口',
+    baseUrl,
+    modelsUrl: modelsUrl || undefined,
+    apiKey,
+    model,
+    fastModel,
+  };
+}
+
 async function showStatus() {
   const chalk = (await import('chalk')).default;
   const boxen = (await import('boxen')).default;
@@ -176,14 +273,12 @@ program
     });
     if (network === '__BACK__') return;
 
-    const cmd = network === 'vpn'
-      ? 'npm install -g @anthropic-ai/claude-code'
-      : 'npm install -g @anthropic-ai/claude-code --registry=https://registry.npmmirror.com';
+    const installCommand = buildClaudeInstallCommand(network);
 
     console.log(chalk.dim('\n安装中，实时输出：\n'));
 
     // 实时输出安装日志
-    const result = spawnSync(cmd, { shell: true, stdio: 'inherit' });
+    const result = spawnSync(installCommand.command, installCommand.args, { stdio: 'inherit' });
 
     if (result.status === 0) {
       console.log(chalk.green('\n✔ Claude Code 安装成功！'));
@@ -237,7 +332,7 @@ program
       if (!overwrite) return;
     }
 
-    let providerKey, provider, apiKey, model;
+    let providerKey, provider, apiKey, model, customConfig;
     let step = 'provider';
 
     while (true) {
@@ -251,6 +346,11 @@ program
         });
         if (providerKey === '__BACK__') return;
         provider = PROVIDERS[providerKey];
+        if (provider.custom) {
+          customConfig = await configureCustomProvider({ chalk, ora });
+          if (!customConfig) { step = 'provider'; continue; }
+          break;
+        }
         step = 'apikey';
       } else if (step === 'apikey') {
         const k = await input({
@@ -289,10 +389,10 @@ program
     const spinner = ora('写入配置...').start();
     let result, file;
     try {
-      const fastModel = resolveFastModel(provider, model);
-      const cfg = { provider: providerKey, model, fastModel, apiKey, baseUrl: provider.baseUrl };
+      const fastModel = customConfig?.fastModel || resolveFastModel(provider, model);
+      const cfg = customConfig || { provider: providerKey, model, fastModel, apiKey, baseUrl: provider.baseUrl };
       saveConfig(cfg);
-      ({ result, file } = writeEnvToZshrc(provider.baseUrl, apiKey, model, fastModel));
+      ({ result, file } = writeEnvToZshrc(cfg.baseUrl, cfg.apiKey, cfg.model, cfg.fastModel));
       spinner.succeed(chalk.green(result === 'updated' ? `环境变量已更新 → ${file}` : `环境变量已写入 → ${file}`));
     } catch (e) {
       spinner.fail(chalk.red(`写入失败: ${e.message}`));
@@ -302,7 +402,7 @@ program
 
     console.log(boxen(
       chalk.bold('配置完成！\n\n') +
-      chalk.dim('ANTHROPIC_BASE_URL  ') + chalk.cyan(provider.baseUrl) + '\n' +
+      chalk.dim('ANTHROPIC_BASE_URL  ') + chalk.cyan((customConfig || { baseUrl: provider.baseUrl }).baseUrl) + '\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 } }
@@ -314,7 +414,7 @@ program
 
     spawn('claude', [], {
       stdio: 'inherit',
-      env: { ...process.env, ...buildClaudeEnv({ provider: providerKey, baseUrl: provider.baseUrl, apiKey, model, fastModel: resolveFastModel(provider, model) }) },
+      env: { ...process.env, ...buildClaudeEnv(customConfig || { provider: providerKey, baseUrl: provider.baseUrl, apiKey, model, fastModel: resolveFastModel(provider, model) }) },
     }).on('error', () => {
       console.log(chalk.yellow('\nClaude Code 未找到，请先运行: claw install-claude'));
     });
@@ -351,6 +451,18 @@ program
     if (providerKey === '__BACK__') return;
 
     const provider = PROVIDERS[providerKey];
+    if (provider.custom) {
+      const customConfig = await configureCustomProvider({ chalk, ora, existingConfig: config });
+      if (!customConfig) return;
+
+      const spinner = ora('切换中...').start();
+      saveConfig(customConfig);
+      const { file } = writeEnvToZshrc(customConfig.baseUrl, customConfig.apiKey, customConfig.model, customConfig.fastModel);
+      await new Promise(r => setTimeout(r, 300));
+      spinner.succeed(chalk.green(`已切换至 ${customConfig.providerName} · ${customConfig.model}`));
+      console.log(chalk.dim(`运行 source ${file} 生效，或重新开一个终端`));
+      return;
+    }
 
     // 切换厂商时询问是否更换 Key
     let apiKey = config.apiKey;
@@ -562,11 +674,14 @@ async function runMenu() {
   }
 }
 
+function handleCliError(e) {
+  if (e?.name === 'ExitPromptError') return; // Ctrl+C
+  console.error(e);
+  process.exitCode = 1;
+}
+
 if (process.argv.length === 2) {
-  runMenu().catch((e) => {
-    if (e?.name === 'ExitPromptError') return; // Ctrl+C
-    console.error(e);
-  });
+  runMenu().catch(handleCliError);
 } else {
-  program.parse(process.argv);
+  program.parseAsync(process.argv).catch(handleCliError);
 }

package/index.js

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

package/lib/config.js

@@ -12,8 +12,8 @@ const PROVIDERS = {
     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[1m]' },
+      { name: 'DeepSeek V4 Flash（快速）', value: 'deepseek-v4-flash' },
     ],
   },
   qwen: {
@@ -55,20 +55,44 @@ const PROVIDERS = {
       { name: 'MiMo V2.5 Pro（旗舰）', value: 'mimo-v2.5-pro' },
     ],
   },
+  custom: {
+    name: '自定义 Anthropic 兼容接口',
+    custom: true,
+    models: [],
+  },
 };
 
+function normalizeModelIds(providerKey, ids) {
+  if (providerKey !== 'deepseek') return ids;
+
+  const mapped = ids.map((id) => id === 'deepseek-v4-pro' ? 'deepseek-v4-pro[1m]' : id);
+  const preferred = ['deepseek-v4-pro[1m]', 'deepseek-v4-flash'];
+  return [
+    ...preferred.filter((id) => mapped.includes(id)),
+    ...mapped.filter((id) => !preferred.includes(id)),
+  ];
+}
+
+function parseModelIdsResponse(providerKey, data) {
+  const parsed = typeof data === 'string' ? JSON.parse(data) : data;
+  const list = parsed.data || parsed.models || [];
+  const ids = list.map(m => m.id || m.model || m.name).filter(Boolean);
+  return normalizeModelIds(providerKey, ids);
+}
+
 // 联网拉取厂商支持的模型列表，失败返回 null
-function fetchModels(providerKey, apiKey) {
+function fetchModels(providerKey, apiKey, modelsUrlOverride) {
   return new Promise((resolve) => {
     const provider = PROVIDERS[providerKey];
-    if (!provider?.modelsUrl) return resolve(null);
+    const modelsUrl = modelsUrlOverride || provider?.modelsUrl;
+    if (!modelsUrl) return resolve(null);
 
     let url;
-    try { url = new URL(provider.modelsUrl); } catch { return resolve(null); }
+    try { url = new URL(modelsUrl); } catch { return resolve(null); }
 
     const req = https.request({
       hostname: url.hostname,
-      path: url.pathname,
+      path: url.pathname + url.search,
       method: 'GET',
       timeout: 6000,
       headers: {
@@ -80,11 +104,7 @@ function fetchModels(providerKey, apiKey) {
       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);
+          const ids = parseModelIdsResponse(providerKey, data);
           if (ids.length === 0) return resolve(null);
           resolve(ids);
         } catch {
@@ -245,6 +265,8 @@ module.exports = {
   fetchModels,
   resetConfig,
   validateConfig,
+  normalizeModelIds,
+  parseModelIdsResponse,
   resolveFastModel,
   providerKeyFromBaseUrl,
   buildClaudeEnv,

package/lib/install.js

@@ -0,0 +1,9 @@
+function buildClaudeInstallCommand(network) {
+  const args = ['install', '-g', '@anthropic-ai/claude-code'];
+  if (network === 'cn') {
+    args.push('--registry=https://registry.npmmirror.com');
+  }
+  return { command: 'npm', args };
+}
+
+module.exports = { buildClaudeInstallCommand };

package/lib/panel.js

@@ -14,7 +14,7 @@ function isEnvActive(config, env) {
 
 function buildStatusView(config, options = {}) {
   const provider = PROVIDERS[config.provider];
-  const providerName = provider?.name || config.provider;
+  const providerName = config.providerName || provider?.name || config.provider;
   const claudeInstalled = options.claudeInstalled === true;
   const env = options.env || {};
   const expectedEnv = buildClaudeEnv(config);

package/package.json

@@ -1,11 +1,17 @@
 {
   "name": "yingclaw",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "description": "Claude Code × 国产大模型一键接入：DeepSeek、Qwen、MiniMax、GLM、MiMo",
   "main": "index.js",
   "bin": {
     "claw": "bin/cli.js"
   },
+  "files": [
+    "bin",
+    "lib",
+    "index.js",
+    "README.md"
+  ],
   "scripts": {
     "start": "node bin/cli.js",
     "test": "node --test"