@tokenaut/opentoken 1.4.10 → 1.4.12

package/README.md

@@ -151,7 +151,8 @@ opentoken cx -k <api_key> -u https://gw.opentoken.io/v1 -m <model_id>
 验证各工具的 API Key、Base URL、模型是否配置正确，发送最小请求检测连通性：
 
 ```bash
-opentoken cc test
+opentoken cc test                      
+opentoken cc test -m <model_id>        
 opentoken cdt test
 opentoken ac test
 opentoken hm test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tokenaut/opentoken",
-  "version": "1.4.10",
+  "version": "1.4.12",
   "description": "OpenToken 一键接入 AI 模型 · https://docs.opentoken.io/",
   "main": "src/cli.js",
   "bin": {

package/src/cli.js

@@ -102,7 +102,8 @@ function printHelp() {
   console.log('  opentoken cdt -k <k> -u <u>            一键设置 Key 与 URL');
   console.log('');
   console.log(chalk.bold('连接测试：'));
-  console.log('  opentoken cc test                      测试 Claude Code 连接');
+  console.log('  opentoken cc test                      测试 Claude Code 所有模型连接');
+  console.log('  opentoken cc test -m <model>           测试 Claude Code 指定模型连接');
   console.log('  opentoken cdt test                     测试 Claude Desktop 连接');
   console.log('  opentoken ac test                      测试 Atomcode 连接');
   console.log('  opentoken hm test                      测试 Hermes 连接');
@@ -277,7 +278,7 @@ async function run() {
   if (args.subcommand === 'test') {
     clearScreen();
     printLogo();
-    if (isCcCommand(args.tool)) { await claude.test(); return; }
+    if (isCcCommand(args.tool)) { await claude.test({ model: args.model }); return; }
     if (isClaudeDesktopCommand(args.tool)) { await claudeDesktop.test(); return; }
     if (isAtomcodeCommand(args.tool)) { await atomcode.test(); return; }
     if (isHermesCommand(args.tool)) { await hermes.test(); return; }

package/src/codex-config.js

@@ -93,11 +93,13 @@ function getCurrentCodexConfig() {
     data.model_providers && typeof data.model_providers === 'object' && !Array.isArray(data.model_providers)
       ? data.model_providers
       : {};
+
+  const activeKey = data.model_provider != null ? String(data.model_provider) : CODEX_PROVIDER_KEY;
   const provider =
-    providers[CODEX_PROVIDER_KEY] &&
-    typeof providers[CODEX_PROVIDER_KEY] === 'object' &&
-    !Array.isArray(providers[CODEX_PROVIDER_KEY])
-      ? providers[CODEX_PROVIDER_KEY]
+    providers[activeKey] &&
+    typeof providers[activeKey] === 'object' &&
+    !Array.isArray(providers[activeKey])
+      ? providers[activeKey]
       : {};
 
   return {

package/src/config.js

@@ -91,6 +91,7 @@ function applyConfig({ apiKey, baseUrl, model }) {
 
 module.exports = {
   SETTINGS_PATH,
+  readClaudeSettings,
   getCurrentConfig,
   applyConfig,
 };

package/src/test-connection.js

@@ -143,4 +143,22 @@ async function testOpenAIResponses({ baseUrl, apiKey, model }) {
   }
 }
 
-module.exports = { testAnthropic, testOpenAI, testOpenAIResponses };
+const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+
+async function testWithSpinner({ label, testFn, args }) {
+  let frameIdx = 0;
+  const spinnerTimer = setInterval(() => {
+    const frame = SPINNER_FRAMES[frameIdx % SPINNER_FRAMES.length];
+    process.stdout.write('\x1b[1A\x1b[K');
+    process.stdout.write('\x1b[36m  ' + frame + ' ' + label + '  测试中...\x1b[0m\n');
+    frameIdx++;
+  }, 80);
+
+  const result = await testFn(args);
+  clearInterval(spinnerTimer);
+
+  process.stdout.write('\x1b[1A\x1b[K');
+  return result;
+}
+
+module.exports = { testAnthropic, testOpenAI, testOpenAIResponses, testWithSpinner };

package/src/tools/atomcode.js

@@ -11,7 +11,7 @@ const {
 } = require('../atomcode-config');
 const { printLogo } = require('../logo');
 const { clearScreen } = require('../screen');
-const { testOpenAI } = require('../test-connection');
+const { testOpenAI, testWithSpinner } = require('../test-connection');
 
 let pendingConfig = { apiKey: null, model: null };
 
@@ -271,17 +271,18 @@ async function test() {
   console.log(chalk.gray('  模型     : ') + config.model);
   console.log(chalk.gray('  API Key  : ') + maskApiKey(config.apiKey));
   console.log('');
+  console.log(chalk.gray('  ' + config.model + '  等待测试'));
 
-  const result = await testOpenAI({
-    baseUrl: ATOMCODE_OPENTOKEN_BASE_URL,
-    apiKey: config.apiKey,
-    model: config.model,
+  const result = await testWithSpinner({
+    label: config.model,
+    testFn: testOpenAI,
+    args: { baseUrl: ATOMCODE_OPENTOKEN_BASE_URL, apiKey: config.apiKey, model: config.model },
   });
 
   if (result.ok) {
-    console.log(chalk.green('  ✓ 连接成功！延迟 ' + result.latency_ms + 'ms'));
+    console.log(chalk.green('  ✓ ' + config.model + '  连接成功  ' + result.latency_ms + 'ms'));
   } else {
-    console.log(chalk.red('  ✗ 连接失败：' + result.error));
+    console.log(chalk.red('  ✗ ' + config.model + '  ' + result.error));
   }
   console.log('');
 }

package/src/tools/claude.js

@@ -4,10 +4,10 @@ const chalk = require('chalk');
 const inquirer = require('inquirer');
 const { API_NODES, DEFAULT_BASE_URL, CLAUDE_DEFAULT_MODEL } = require('../models');
 const { fetchModelsForBaseUrl } = require('../fetch-models');
-const { getCurrentConfig, applyConfig } = require('../config');
+const { getCurrentConfig, applyConfig, readClaudeSettings } = require('../config');
 const { printLogo } = require('../logo');
 const { clearScreen } = require('../screen');
-const { testAnthropic } = require('../test-connection');
+const { testAnthropic, testWithSpinner } = require('../test-connection');
 
 let pendingConfig = { apiKey: null, baseUrl: null, model: null };
 
@@ -303,7 +303,7 @@ function quickSet({ key, url, model }) {
   return true;
 }
 
-async function test() {
+async function test({ model } = {}) {
   const config = getCurrentConfig();
 
   if (!config.apiKey) {
@@ -314,29 +314,109 @@ async function test() {
     console.log(chalk.red('  ✗ 请先配置 Base URL'));
     return;
   }
-  if (!config.model) {
-    console.log(chalk.red('  ✗ 请先配置模型'));
+
+  if (model) {
+    console.log('');
+    console.log(chalk.bold(chalk.cyan('正在测试 Claude Code 连接...')));
+    console.log(chalk.gray('  Base URL : ') + config.baseUrl);
+    console.log(chalk.gray('  API Key  : ') + maskApiKey(config.apiKey));
+    console.log('');
+    console.log(chalk.gray('  ' + model + '  等待测试'));
+
+    const result = await testWithSpinner({
+      label: model,
+      testFn: testAnthropic,
+      args: { baseUrl: config.baseUrl, apiKey: config.apiKey, model },
+    });
+
+    if (result.ok) {
+      console.log(chalk.green('  ✓ ' + model + '  连接成功  ' + result.latency_ms + 'ms'));
+    } else {
+      console.log(chalk.red('  ✗ ' + model + '  ' + result.error));
+    }
+    console.log('');
     return;
   }
 
+  const settings = readClaudeSettings();
+  const env = settings.env || {};
+
+  const modelEntries = [
+    { label: 'Haiku',  id: env.ANTHROPIC_DEFAULT_HAIKU_MODEL  || 'claude-haiku-4-5' },
+    { label: 'Sonnet', id: env.ANTHROPIC_DEFAULT_SONNET_MODEL || 'claude-sonnet-4-6' },
+    { label: 'Opus',   id: env.ANTHROPIC_DEFAULT_OPUS_MODEL   || 'claude-opus-4-7' },
+    { label: 'Fable',  id: env.ANTHROPIC_DEFAULT_FABLE_MODEL  || 'claude-fable-5' },
+  ];
+
+  if (config.model && !modelEntries.some((e) => e.id === config.model)) {
+    modelEntries.push({ label: '主模型', id: config.model });
+  }
+
+  const seen = new Set();
+  const unique = [];
+  for (const e of modelEntries) {
+    if (!seen.has(e.id)) {
+      seen.add(e.id);
+      unique.push(e);
+    }
+  }
+
+  const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+  const results = new Array(unique.length).fill(null);
+  let testingIdx = -1;
+  let frameIdx = 0;
+
+  function renderLines() {
+    const lines = unique.map((entry, i) => {
+      if (results[i]) {
+        return results[i].ok
+          ? chalk.green('  ✓ ' + entry.label + ' (' + entry.id + ')  连接成功  ' + results[i].latency_ms + 'ms')
+          : chalk.red('  ✗ ' + entry.label + ' (' + entry.id + ')  ' + results[i].error);
+      }
+      if (i === testingIdx) {
+        const frame = SPINNER_FRAMES[frameIdx % SPINNER_FRAMES.length];
+        return chalk.cyan('  ' + frame + ' ' + entry.label + ' (' + entry.id + ')  测试中...');
+      }
+      return chalk.gray('  ' + entry.label + ' (' + entry.id + ')  等待测试');
+    });
+    process.stdout.write('\x1b[' + unique.length + 'A\x1b[J');
+    process.stdout.write(lines.join('\n') + '\n');
+  }
+
   console.log('');
   console.log(chalk.bold(chalk.cyan('正在测试 Claude Code 连接...')));
   console.log(chalk.gray('  Base URL : ') + config.baseUrl);
-  console.log(chalk.gray('  模型     : ') + config.model);
   console.log(chalk.gray('  API Key  : ') + maskApiKey(config.apiKey));
   console.log('');
 
-  const result = await testAnthropic({
-    baseUrl: config.baseUrl,
-    apiKey: config.apiKey,
-    model: config.model,
-  });
+  for (const entry of unique) {
+    console.log(chalk.gray('  ' + entry.label + ' (' + entry.id + ')  等待测试'));
+  }
 
-  if (result.ok) {
-    console.log(chalk.green('  ✓ 连接成功！延迟 ' + result.latency_ms + 'ms'));
-  } else {
-    console.log(chalk.red('  ✗ 连接失败：' + result.error));
+  for (let i = 0; i < unique.length; i++) {
+    testingIdx = i;
+    frameIdx = 0;
+
+    const spinnerTimer = setInterval(() => {
+      frameIdx++;
+      renderLines();
+    }, 80);
+
+    const result = await testAnthropic({
+      baseUrl: config.baseUrl,
+      apiKey: config.apiKey,
+      model: unique[i].id,
+    });
+
+    clearInterval(spinnerTimer);
+    results[i] = result;
+    testingIdx = -1;
+    renderLines();
   }
+
+  const okCount = results.filter((r) => r && r.ok).length;
+  console.log('');
+  console.log(chalk.gray('  ' + okCount + '/' + unique.length + ' 连接成功'));
   console.log('');
 }
 

package/src/tools/claude_desktop.js

@@ -6,7 +6,7 @@ const { API_NODES, DEFAULT_BASE_URL } = require('../models');
 const { getCurrentConfig, applyConfig } = require('../claude-desktop-config');
 const { printLogo } = require('../logo');
 const { clearScreen } = require('../screen');
-const { testAnthropic } = require('../test-connection');
+const { testAnthropic, testWithSpinner } = require('../test-connection');
 
 let pendingConfig = { apiKey: null, baseUrl: null };
 
@@ -197,22 +197,25 @@ async function test() {
     return;
   }
 
+  const model = 'claude-sonnet-4-6';
+
   console.log('');
   console.log(chalk.bold(chalk.cyan('正在测试 Claude Desktop 连接...')));
   console.log(chalk.gray('  Base URL : ') + config.baseUrl);
   console.log(chalk.gray('  API Key  : ') + maskApiKey(config.apiKey));
   console.log('');
+  console.log(chalk.gray('  ' + model + '  等待测试'));
 
-  const result = await testAnthropic({
-    baseUrl: config.baseUrl,
-    apiKey: config.apiKey,
-    model: 'claude-sonnet-4-6',
+  const result = await testWithSpinner({
+    label: model,
+    testFn: testAnthropic,
+    args: { baseUrl: config.baseUrl, apiKey: config.apiKey, model },
   });
 
   if (result.ok) {
-    console.log(chalk.green('  ✓ 连接成功！延迟 ' + result.latency_ms + 'ms'));
+    console.log(chalk.green('  ✓ ' + model + '  连接成功  ' + result.latency_ms + 'ms'));
   } else {
-    console.log(chalk.red('  ✗ 连接失败：' + result.error));
+    console.log(chalk.red('  ✗ ' + model + '  ' + result.error));
   }
   console.log('');
 }

package/src/tools/codex.js

@@ -12,7 +12,7 @@ const {
 } = require('../codex-config');
 const { printLogo } = require('../logo');
 const { clearScreen } = require('../screen');
-const { testOpenAIResponses } = require('../test-connection');
+const { testOpenAIResponses, testWithSpinner } = require('../test-connection');
 
 let pendingConfig = { apiKey: null, baseUrl: null, model: null, models: null };
 
@@ -349,17 +349,18 @@ async function test() {
   console.log(chalk.gray('  模型     : ') + config.model);
   console.log(chalk.gray('  API Key  : ') + maskApiKey(config.apiKey));
   console.log('');
+  console.log(chalk.gray('  ' + config.model + '  等待测试'));
 
-  const result = await testOpenAIResponses({
-    baseUrl: config.baseUrl,
-    apiKey: config.apiKey,
-    model: config.model,
+  const result = await testWithSpinner({
+    label: config.model,
+    testFn: testOpenAIResponses,
+    args: { baseUrl: config.baseUrl, apiKey: config.apiKey, model: config.model },
   });
 
   if (result.ok) {
-    console.log(chalk.green('  ✓ 连接成功！延迟 ' + result.latency_ms + 'ms'));
+    console.log(chalk.green('  ✓ ' + config.model + '  连接成功  ' + result.latency_ms + 'ms'));
   } else {
-    console.log(chalk.red('  ✗ 连接失败：' + result.error));
+    console.log(chalk.red('  ✗ ' + config.model + '  ' + result.error));
   }
   console.log('');
 }

package/src/tools/hermes.js

@@ -12,7 +12,7 @@ const {
 } = require('../hermes-config');
 const { printLogo } = require('../logo');
 const { clearScreen } = require('../screen');
-const { testOpenAI } = require('../test-connection');
+const { testOpenAI, testWithSpinner } = require('../test-connection');
 
 let pendingConfig = { apiKey: null, model: null };
 
@@ -292,17 +292,18 @@ async function test() {
   console.log(chalk.gray('  模型     : ') + config.model);
   console.log(chalk.gray('  API Key  : ') + maskApiKey(config.apiKey));
   console.log('');
+  console.log(chalk.gray('  ' + config.model + '  等待测试'));
 
-  const result = await testOpenAI({
-    baseUrl: HERMES_OPENTOKEN_BASE_URL,
-    apiKey: config.apiKey,
-    model: config.model,
+  const result = await testWithSpinner({
+    label: config.model,
+    testFn: testOpenAI,
+    args: { baseUrl: HERMES_OPENTOKEN_BASE_URL, apiKey: config.apiKey, model: config.model },
   });
 
   if (result.ok) {
-    console.log(chalk.green('  ✓ 连接成功！延迟 ' + result.latency_ms + 'ms'));
+    console.log(chalk.green('  ✓ ' + config.model + '  连接成功  ' + result.latency_ms + 'ms'));
   } else {
-    console.log(chalk.red('  ✗ 连接失败：' + result.error));
+    console.log(chalk.red('  ✗ ' + config.model + '  ' + result.error));
   }
   console.log('');
 }

package/src/tools/openclaw.js

@@ -11,7 +11,7 @@ const {
 } = require('../openclaw-config');
 const { printLogo } = require('../logo');
 const { clearScreen } = require('../screen');
-const { testOpenAI } = require('../test-connection');
+const { testOpenAI, testWithSpinner } = require('../test-connection');
 
 let pendingConfig = { apiKey: null, model: null };
 
@@ -254,23 +254,26 @@ async function test() {
     return;
   }
 
+  const modelLabel = OPENCLAW_PROVIDER_KEY + '/' + config.model;
+
   console.log('');
   console.log(chalk.bold(chalk.cyan('正在测试 OpenClaw 连接...')));
   console.log(chalk.gray('  Base URL : ') + OPENCLAW_OPENTOKEN_BASE_URL);
-  console.log(chalk.gray('  模型     : ') + OPENCLAW_PROVIDER_KEY + '/' + config.model);
+  console.log(chalk.gray('  模型     : ') + modelLabel);
   console.log(chalk.gray('  API Key  : ') + maskApiKey(config.apiKey));
   console.log('');
+  console.log(chalk.gray('  ' + modelLabel + '  等待测试'));
 
-  const result = await testOpenAI({
-    baseUrl: OPENCLAW_OPENTOKEN_BASE_URL,
-    apiKey: config.apiKey,
-    model: config.model,
+  const result = await testWithSpinner({
+    label: modelLabel,
+    testFn: testOpenAI,
+    args: { baseUrl: OPENCLAW_OPENTOKEN_BASE_URL, apiKey: config.apiKey, model: config.model },
   });
 
   if (result.ok) {
-    console.log(chalk.green('  ✓ 连接成功！延迟 ' + result.latency_ms + 'ms'));
+    console.log(chalk.green('  ✓ ' + modelLabel + '  连接成功  ' + result.latency_ms + 'ms'));
   } else {
-    console.log(chalk.red('  ✗ 连接失败：' + result.error));
+    console.log(chalk.red('  ✗ ' + modelLabel + '  ' + result.error));
   }
   console.log('');
 }

package/src/tools/opencode.js

@@ -11,7 +11,7 @@ const {
 } = require('../opencode-config');
 const { printLogo } = require('../logo');
 const { clearScreen } = require('../screen');
-const { testOpenAI } = require('../test-connection');
+const { testOpenAI, testWithSpinner } = require('../test-connection');
 
 let pendingConfig = { apiKey: null, model: null };
 
@@ -274,17 +274,18 @@ async function test() {
   console.log(chalk.gray('  模型     : ') + config.model);
   console.log(chalk.gray('  API Key  : ') + maskApiKey(config.apiKey));
   console.log('');
+  console.log(chalk.gray('  ' + config.model + '  等待测试'));
 
-  const result = await testOpenAI({
-    baseUrl: OPENCODE_OPENTOKEN_BASE_URL,
-    apiKey: config.apiKey,
-    model: config.model,
+  const result = await testWithSpinner({
+    label: config.model,
+    testFn: testOpenAI,
+    args: { baseUrl: OPENCODE_OPENTOKEN_BASE_URL, apiKey: config.apiKey, model: config.model },
   });
 
   if (result.ok) {
-    console.log(chalk.green('  ✓ 连接成功！延迟 ' + result.latency_ms + 'ms'));
+    console.log(chalk.green('  ✓ ' + config.model + '  连接成功  ' + result.latency_ms + 'ms'));
   } else {
-    console.log(chalk.red('  ✗ 连接失败：' + result.error));
+    console.log(chalk.red('  ✗ ' + config.model + '  ' + result.error));
   }
   console.log('');
 }