@pikecode/api-key-manager 2.0.0 → 2.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (60) hide show
  1. package/README.md +444 -151
  2. package/bin/akm.js +340 -11
  3. package/package.json +29 -12
  4. package/src/CommandRegistry.js +58 -3
  5. package/src/commands/BaseCommand.js +68 -1
  6. package/src/commands/add/prompts.js +280 -0
  7. package/src/commands/add/providerSaver.js +74 -0
  8. package/src/commands/add/summaryPrinter.js +29 -0
  9. package/src/commands/add.js +54 -439
  10. package/src/commands/backup.js +396 -0
  11. package/src/commands/batch.js +313 -0
  12. package/src/commands/benchmark.js +323 -0
  13. package/src/commands/claude-clean.js +253 -0
  14. package/src/commands/clone.js +265 -0
  15. package/src/commands/current.js +89 -41
  16. package/src/commands/edit.js +3 -207
  17. package/src/commands/health.js +264 -0
  18. package/src/commands/list.js +120 -35
  19. package/src/commands/mcp.js +467 -0
  20. package/src/commands/remove.js +89 -26
  21. package/src/commands/stats.js +281 -0
  22. package/src/commands/switch/claude-settings-compatibility.js +113 -0
  23. package/src/commands/switch/launch-args-helper.js +84 -0
  24. package/src/commands/switch/provider-choices-helper.js +72 -0
  25. package/src/commands/switch/provider-details-helper.js +46 -0
  26. package/src/commands/switch/provider-edit-questions-helper.js +124 -0
  27. package/src/commands/switch/provider-launcher.js +20 -0
  28. package/src/commands/switch/provider-manager.js +214 -0
  29. package/src/commands/switch/status-helper.js +124 -0
  30. package/src/commands/switch/ui-screen-renderer.js +77 -0
  31. package/src/commands/switch.js +471 -958
  32. package/src/commands/validate.js +310 -0
  33. package/src/config.js +558 -55
  34. package/src/constants/index.js +234 -0
  35. package/src/constants/ui.js +108 -0
  36. package/src/index.js +11 -4
  37. package/src/navigation/EscNavigationManager.js +5 -5
  38. package/src/utils/atomic-file.js +47 -0
  39. package/src/utils/claude-settings.js +4 -4
  40. package/src/utils/codex-files.js +418 -0
  41. package/src/utils/codex-launcher.js +104 -0
  42. package/src/utils/concurrency.js +30 -0
  43. package/src/utils/config-opener.js +22 -2
  44. package/src/utils/env-launcher.js +50 -44
  45. package/src/utils/env-utils.js +52 -0
  46. package/src/utils/error-handler.js +27 -28
  47. package/src/utils/health-checker.js +350 -0
  48. package/src/utils/import-validator.js +212 -0
  49. package/src/utils/inquirer-setup.js +11 -0
  50. package/src/utils/launch-args.js +155 -0
  51. package/src/utils/logger.js +0 -1
  52. package/src/utils/provider-status-checker.js +211 -64
  53. package/src/utils/secrets.js +22 -0
  54. package/src/utils/shell-snippets.js +32 -0
  55. package/src/utils/terminal-format.js +22 -4
  56. package/src/utils/ui-helper.js +96 -86
  57. package/src/utils/update-checker.js +41 -12
  58. package/src/utils/validator.js +136 -89
  59. package/bin/cc.js +0 -101
  60. package/src/utils/storage.js +0 -55
@@ -1,32 +1,87 @@
1
- const path = require('path');
1
+ /**
2
+ * Environment Switcher Command
3
+ * 供应商切换和管理的主命令
4
+ * @module commands/switch
5
+ */
6
+
2
7
  const inquirer = require('inquirer');
3
8
  const chalk = require('chalk');
4
9
  const Choices = require('inquirer/lib/objects/choices');
5
- const { ConfigManager } = require('../config');
6
- const { executeWithEnv } = require('../utils/env-launcher');
10
+ const { configManager } = require('../config');
7
11
  const { Logger } = require('../utils/logger');
8
12
  const { UIHelper } = require('../utils/ui-helper');
9
- const { findSettingsConflict, backupSettingsFile, clearConflictKeys, saveSettingsFile } = require('../utils/claude-settings');
10
13
  const { BaseCommand } = require('./BaseCommand');
11
- const { validator } = require('../utils/validator');
12
14
  const { ProviderStatusChecker } = require('../utils/provider-status-checker');
13
-
15
+ const { StatusHelper } = require('./switch/status-helper');
16
+ const { LaunchArgsHelper } = require('./switch/launch-args-helper');
17
+ const { ProviderChoicesHelper } = require('./switch/provider-choices-helper');
18
+ const { ensureClaudeSettingsCompatibility } = require('./switch/claude-settings-compatibility');
19
+ const { launchProviderProcess, markProviderAsCurrent } = require('./switch/provider-launcher');
20
+ const { ProviderManager } = require('./switch/provider-manager');
21
+
22
+ /**
23
+ * 环境切换器类
24
+ * 提供交互式界面用于选择、切换、管理和启动 API 供应商
25
+ * @extends BaseCommand
26
+ */
14
27
  class EnvSwitcher extends BaseCommand {
15
28
  constructor() {
16
29
  super();
17
- this.configManager = new ConfigManager();
30
+ this.configManager = configManager;
18
31
  this.statusChecker = new ProviderStatusChecker();
19
32
  this.latestStatusMap = {};
20
33
  this.currentPromptContext = null;
21
34
  this.activeStatusRefresh = null;
35
+ this.filter = null;
36
+ this.filteredProviders = null;
37
+ this._refreshTimer = null;
38
+ this.providerManager = new ProviderManager(this);
39
+ }
40
+
41
+ _renderPage(options) {
42
+ const { title, icon, hints, content } = options;
43
+
44
+ this.clearScreen();
45
+
46
+ if (title) {
47
+ console.log(UIHelper.createTitle(title, icon || UIHelper.icons.info));
48
+ console.log();
49
+ }
50
+
51
+ if (hints) {
52
+ console.log(UIHelper.createHintLine(hints));
53
+ console.log();
54
+ }
55
+
56
+ if (content) {
57
+ if (typeof content === 'function') {
58
+ content();
59
+ } else {
60
+ console.log(content);
61
+ }
62
+ console.log();
63
+ }
64
+ }
65
+
66
+ _getPageSize(itemCount) {
67
+ const rows = process.stdout.rows || 24;
68
+ const reserved = 8;
69
+ return Math.min(itemCount, Math.max(5, rows - reserved));
22
70
  }
23
71
 
24
72
  async validateProvider(providerName) {
25
73
  await this.configManager.load();
26
- const provider = this.configManager.getProvider(providerName);
74
+
75
+ // 先尝试按名称查找,再尝试按别名查找
76
+ let provider = this.configManager.getProvider(providerName);
77
+ if (!provider) {
78
+ provider = this.configManager.getProviderByNameOrAlias(providerName);
79
+ }
80
+
27
81
  if (!provider) {
28
- throw new Error(`供应商 '${providerName}' 不存在`);
82
+ throw new Error(`供应商 '${providerName}' 不存在\n使用 'akm list' 查看所有已配置的供应商`);
29
83
  }
84
+
30
85
  return provider;
31
86
  }
32
87
 
@@ -34,245 +89,181 @@ class EnvSwitcher extends BaseCommand {
34
89
  try {
35
90
  this.clearScreen();
36
91
  const provider = await this.validateProvider(providerName);
37
- const availableArgs = this.getAvailableLaunchArgs();
38
-
39
- console.log(UIHelper.createTitle('启动配置', UIHelper.icons.launch));
40
- console.log();
41
- console.log(UIHelper.createCard('供应商', UIHelper.formatProvider(provider), UIHelper.icons.info));
42
- console.log();
43
- console.log(UIHelper.createHintLine([
44
- ['空格', '切换选中'],
45
- ['A', '全选'],
46
- ['I', '反选'],
47
- ['Enter', '启动 Claude Code'],
48
- ['ESC', '返回供应商选择']
49
- ]));
50
- console.log();
51
-
52
- // 设置 ESC 键监听
53
- const escListener = this.createESCListener(() => {
54
- Logger.info('返回供应商选择');
55
- this.showProviderSelection();
56
- }, '返回供应商选择');
57
-
92
+ const isCodex = provider.ideName === 'codex';
93
+ const availableArgs = LaunchArgsHelper.getAvailableLaunchArgs(isCodex);
94
+
95
+ const defaultLaunchArgs = Array.isArray(provider.lastUsedArgs) && provider.lastUsedArgs.length > 0
96
+ ? provider.lastUsedArgs
97
+ : (Array.isArray(provider.launchArgs) ? provider.launchArgs : []);
98
+
99
+ const mergedArgs = LaunchArgsHelper.mergeArgsWithDefaults(availableArgs, defaultLaunchArgs);
100
+ const ideDisplayName = LaunchArgsHelper.getIDEDisplayName(isCodex);
101
+
102
+ this._renderPage({
103
+ title: '启动配置',
104
+ icon: UIHelper.icons.launch,
105
+ hints: [
106
+ ['空格', '切换选中'],
107
+ ['A', '全选'],
108
+ ['I', '反选'],
109
+ ['Enter', `启动 ${ideDisplayName}`],
110
+ ['ESC', '返回供应商选择']
111
+ ],
112
+ content: () => console.log(UIHelper.createCard('供应商', UIHelper.formatProvider(provider), UIHelper.icons.info))
113
+ });
114
+
58
115
  // 显示启动参数选择界面
59
116
  const choices = [
60
117
  {
61
118
  type: 'checkbox',
62
119
  name: 'selectedArgs',
63
120
  message: '选择启动参数:',
64
- choices: availableArgs.map(arg => {
65
- const commandText = UIHelper.colors.muted(`(${arg.name})`);
66
- const descriptionText = arg.description
67
- ? ` ${UIHelper.colors.muted(arg.description)}`
68
- : '';
69
-
70
- return {
71
- name: `${UIHelper.colors.accent(arg.label || arg.name)} ${commandText}${descriptionText}`,
72
- value: arg.name,
73
- checked: arg.checked || false
74
- };
75
- })
121
+ choices: LaunchArgsHelper.formatArgsForDisplay(mergedArgs, UIHelper)
76
122
  }
77
123
  ];
78
124
 
79
125
  let answers;
80
126
  try {
81
- answers = await this.prompt(choices);
82
- } catch (error) {
83
- this.removeESCListener(escListener);
84
- if (this.isEscCancelled(error)) {
85
- return;
86
- }
87
- throw error;
88
- }
89
-
90
- this.removeESCListener(escListener);
91
-
92
- // 选择参数后直接启动
93
- await this.launchProvider(provider, answers.selectedArgs);
94
-
95
- } catch (error) {
96
- await this.handleError(error, '选择启动参数');
97
- }
98
- }
99
-
100
- async ensureClaudeSettingsCompatibility(provider) {
101
- try {
102
- const conflict = await findSettingsConflict();
103
- if (!conflict) {
104
- return true;
105
- }
106
-
107
- const keyList = conflict.keys.map((key) => `• ${key}`).join('\n');
108
-
109
- const backupDir = path.dirname(conflict.filePath);
110
-
111
- this.clearScreen();
112
- console.log(UIHelper.createTitle('检测到环境变量冲突', UIHelper.icons.warning));
113
- console.log();
114
- console.log(UIHelper.createCard('冲突文件', conflict.filePath, UIHelper.icons.info));
115
- console.log();
116
- console.log(UIHelper.createCard('备份目录', `${backupDir}\n备份文件将命名为 settings.backup-YYYYMMDD_HHmmss.json`, UIHelper.icons.info));
117
- console.log();
118
- console.log(UIHelper.createCard('可能覆盖的变量', keyList, UIHelper.icons.warning));
119
- console.log();
120
- console.log(UIHelper.createTooltip('Claude 会优先读取该设置文件中的 env 配置,可能覆盖本次为供应商设置的变量。'));
121
- console.log();
122
-
123
- let answer;
124
- try {
125
- answer = await this.prompt([
126
- {
127
- type: 'list',
128
- name: 'action',
129
- message: `在 ${conflict.filePath} 中发现 env 配置会覆盖供应商 '${provider.displayName || provider.name}' 的变量,选择处理方式:`,
130
- choices: [
131
- { name: '🔧 备份并清空这些变量', value: 'fix' },
132
- { name: '⚠️ 忽略并继续(可能导致切换失败)', value: 'ignore' },
133
- { name: '❌ 取消启动', value: 'cancel' }
134
- ],
135
- default: 'fix'
136
- }
137
- ]);
127
+ answers = await this.promptWithESC(choices, '返回供应商选择', () => {
128
+ Logger.info('返回供应商选择');
129
+ });
138
130
  } catch (error) {
139
131
  if (this.isEscCancelled(error)) {
140
- Logger.info('已取消启动');
141
- return false;
132
+ return await this.showProviderSelection();
142
133
  }
143
134
  throw error;
144
135
  }
145
136
 
146
- if (answer.action === 'fix') {
147
- let confirmBackup;
148
- try {
149
- confirmBackup = await this.prompt([
150
- {
151
- type: 'confirm',
152
- name: 'confirmed',
153
- message: `将在 ${backupDir} 中创建备份文件 (settings.backup-YYYYMMDD_HHmmss.json),并清空冲突变量。是否继续?`,
154
- default: true
155
- }
156
- ]);
157
- } catch (error) {
158
- if (this.isEscCancelled(error)) {
159
- Logger.info('已取消启动');
160
- return false;
161
- }
162
- throw error;
163
- }
164
-
165
- if (!confirmBackup.confirmed) {
166
- Logger.info('已取消启动');
167
- return false;
168
- }
169
-
170
- try {
171
- const backupPath = await backupSettingsFile(conflict.filePath);
172
- const updatedSettings = clearConflictKeys(
173
- {
174
- ...conflict.settings,
175
- env: conflict.settings.env ? { ...conflict.settings.env } : undefined
176
- },
177
- conflict.keys
178
- );
179
- await saveSettingsFile(conflict.filePath, updatedSettings);
180
- Logger.success(`已将 ${conflict.filePath} 备份至 '${backupPath}' 并清空冲突变量。`);
181
- } catch (error) {
182
- throw new Error(`清理 Claude 设置文件失败: ${error.message}`);
183
- }
184
- return true;
137
+ // 检查互斥参数
138
+ const conflictError = LaunchArgsHelper.validateArgsConflict(answers.selectedArgs, availableArgs);
139
+ if (conflictError) {
140
+ Logger.warning(conflictError);
141
+ return await this.showLaunchArgsSelection(providerName);
185
142
  }
186
143
 
187
- if (answer.action === 'ignore') {
188
- Logger.warning(`已忽略 ${conflict.filePath} 中的冲突,Claude 可能仍会使用该文件里的旧变量。`);
189
- return true;
190
- }
144
+ await this.launchProvider(provider, answers.selectedArgs);
191
145
 
192
- Logger.info('已取消启动');
193
- return false;
194
146
  } catch (error) {
195
- throw error;
147
+ await this.handleError(error, '选择启动参数');
196
148
  }
197
149
  }
198
150
 
199
151
  async launchProvider(provider, selectedLaunchArgs) {
200
152
  try {
201
- const shouldContinue = await this.ensureClaudeSettingsCompatibility(provider);
202
- if (!shouldContinue) {
203
- return;
153
+ const isCodex = provider.ideName === 'codex';
154
+
155
+ // Claude Code 才需要检测设置冲突
156
+ if (!isCodex) {
157
+ const shouldContinue = await ensureClaudeSettingsCompatibility(this, provider);
158
+ if (!shouldContinue) {
159
+ return;
160
+ }
204
161
  }
205
162
 
206
163
  this.clearScreen();
207
164
  console.log(UIHelper.createTitle('正在启动', UIHelper.icons.loading));
208
165
  console.log();
166
+ const ideDisplayName = isCodex ? 'Codex CLI' : 'Claude Code';
209
167
  console.log(UIHelper.createCard('目标供应商', UIHelper.formatProvider(provider), UIHelper.icons.launch));
210
168
 
211
169
  if (selectedLaunchArgs.length > 0) {
212
170
  console.log(UIHelper.createCard('启动参数', selectedLaunchArgs.join(', '), UIHelper.icons.settings));
213
171
  }
214
172
  console.log();
215
-
173
+
216
174
  // 显示进度
217
175
  const loadingInterval = UIHelper.createLoadingAnimation('正在设置环境...');
218
-
176
+
219
177
  try {
220
- // 设置为当前供应商
221
- await this.configManager.setCurrentProvider(provider.name);
222
-
223
- // 更新使用统计
224
- provider.usageCount = (provider.usageCount || 0) + 1;
225
- provider.lastUsed = new Date().toISOString();
226
- await this.configManager.save();
227
-
178
+ await markProviderAsCurrent(this.configManager, provider, selectedLaunchArgs);
228
179
  UIHelper.clearLoadingAnimation(loadingInterval);
229
-
230
- console.log(UIHelper.createCard('准备就绪', '环境配置完成,正在启动 Claude Code...', UIHelper.icons.success));
180
+
181
+ console.log(UIHelper.createCard('准备就绪', `环境配置完成,正在启动 🚀 ${ideDisplayName}...`, UIHelper.icons.success));
231
182
  console.log();
232
-
233
- // 设置环境变量并启动Claude Code
234
- await executeWithEnv(provider, selectedLaunchArgs);
235
-
183
+ await launchProviderProcess(provider, selectedLaunchArgs);
184
+
236
185
  } catch (error) {
237
186
  UIHelper.clearLoadingAnimation(loadingInterval);
238
187
  throw error;
239
188
  }
240
-
189
+
241
190
  } catch (error) {
242
191
  await this.handleError(error, '启动供应商');
243
192
  }
244
193
  }
245
194
 
246
- getAvailableLaunchArgs() {
247
- return [
248
- {
249
- name: '--continue',
250
- label: '继续上次对话',
251
- description: '恢复上次的对话记录',
252
- checked: false
253
- },
254
- {
255
- name: '--dangerously-skip-permissions',
256
- label: '最高权限',
257
- description: '仅在沙盒环境中使用',
258
- checked: false
195
+ /**
196
+ * 快速启动供应商(跳过参数选择)
197
+ * @param {string} providerName - 供应商名称或别名
198
+ * @param {Object} options - 启动选项
199
+ * @param {boolean} options.quick - 使用上次的启动参数
200
+ * @param {boolean} options.noArgs - 不使用任何启动参数
201
+ */
202
+ async quickLaunchProvider(providerName, options) {
203
+ try {
204
+ await this.configManager.ensureLoaded();
205
+
206
+ // 支持别名查找
207
+ let provider = this.configManager.getProvider(providerName);
208
+ if (!provider) {
209
+ provider = this.configManager.getProviderByNameOrAlias(providerName);
259
210
  }
260
- ];
261
- }
262
211
 
263
- // getArgDescription 方法已被移除,直接使用 arg.description
212
+ if (!provider) {
213
+ throw new Error(`供应商 '${providerName}' 不存在\n使用 'akm list' 查看所有已配置的供应商`);
214
+ }
215
+
216
+ // 确定使用的启动参数
217
+ let selectedArgs;
218
+ if (options.noArgs) {
219
+ selectedArgs = [];
220
+ Logger.info('使用空参数启动');
221
+ } else if (options.quick) {
222
+ selectedArgs = Array.isArray(provider.lastUsedArgs) && provider.lastUsedArgs.length > 0
223
+ ? provider.lastUsedArgs
224
+ : (Array.isArray(provider.launchArgs) ? provider.launchArgs : []);
225
+
226
+ if (Array.isArray(provider.lastUsedArgs) && provider.lastUsedArgs.length > 0) {
227
+ Logger.info('使用上次的启动参数: ' + selectedArgs.join(' '));
228
+ } else {
229
+ Logger.info('使用默认启动参数: ' + (selectedArgs.length > 0 ? selectedArgs.join(' ') : '(无)'));
230
+ }
231
+ }
232
+
233
+ // 直接启动供应商
234
+ await this.launchProvider(provider, selectedArgs);
235
+
236
+ } catch (error) {
237
+ await this.handleError(error, '快速启动供应商');
238
+ }
239
+ }
264
240
 
265
241
  async showProviderSelection() {
266
242
  try {
267
243
  // 并行加载配置和准备界面
268
- const providers = await this.configManager.ensureLoaded().then(() => this.configManager.listProviders());
269
-
244
+ let providers = await this.configManager.ensureLoaded().then(() => this.configManager.listProviders());
245
+
246
+ // 应用过滤器
247
+ if (this.filter === 'codex') {
248
+ providers = providers.filter(p => p.ideName === 'codex');
249
+ } else if (this.filter === 'claude') {
250
+ providers = providers.filter(p => p.ideName !== 'codex');
251
+ }
252
+
253
+ // 保存过滤后的供应商列表用于状态更新
254
+ this.filteredProviders = providers;
255
+
270
256
  const initialStatusMap = this._buildInitialStatusMap(providers);
271
257
  // 显示欢迎界面(立即渲染)
272
258
  this.showWelcomeScreen(providers, initialStatusMap, null);
273
-
259
+
274
260
  if (providers.length === 0) {
275
- Logger.warning('暂无配置的供应商');
261
+ if (this.filter) {
262
+ const filterName = this.filter === 'codex' ? 'Codex CLI' : 'Claude Code';
263
+ Logger.warning(`暂无 ${filterName} 供应商配置`);
264
+ } else {
265
+ Logger.warning('暂无配置的供应商');
266
+ }
276
267
  Logger.info('请先运行 "akm add" 添加供应商配置');
277
268
  return;
278
269
  }
@@ -285,13 +276,15 @@ class EnvSwitcher extends BaseCommand {
285
276
  if (providers.length > 0) {
286
277
  this._startStatusRefresh(providers);
287
278
  }
288
-
279
+
289
280
  // 添加特殊选项
290
281
  choices.push(
291
282
  new inquirer.Separator(),
292
283
  { name: `${UIHelper.icons.add} 添加新供应商`, value: '__ADD__' },
293
284
  { name: `${UIHelper.icons.list} 供应商管理 (编辑/删除)`, value: '__MANAGE__' },
294
285
  { name: `${UIHelper.icons.config} 打开配置文件`, value: '__OPEN_CONFIG__' },
286
+ { name: `${UIHelper.icons.settings} 快速设置`, value: '__QUICK_SETTINGS__' },
287
+ { name: `${UIHelper.icons.info} 帮助`, value: '__HELP__' },
295
288
  { name: `${UIHelper.icons.error} 退出`, value: '__EXIT__' }
296
289
  );
297
290
 
@@ -299,38 +292,38 @@ class EnvSwitcher extends BaseCommand {
299
292
  const currentProvider = providers.find(p => p.current);
300
293
  const defaultChoice = currentProvider ? currentProvider.name : providers[0]?.name;
301
294
 
302
- // 设置 ESC 键监听
303
- const escListener = this.createESCListener(() => {
304
- Logger.info('退出程序');
305
- this.showExitScreen();
306
- process.exit(0);
307
- }, '退出程序');
295
+ // 构建提示信息
296
+ const filterSuffix = this.filter === 'codex' ? ' (Codex CLI)' : (this.filter === 'claude' ? ' (Claude Code)' : '');
297
+ const promptMessage = `请选择要切换的供应商${filterSuffix} (总计 ${providers.length} 个):`;
308
298
 
309
- const answer = await this.prompt([
299
+ const answer = await this.promptWithESC([
310
300
  {
311
301
  type: 'list',
312
302
  name: 'provider',
313
- message: `请选择要切换的供应商 (总计 ${providers.length} 个):`,
303
+ message: promptMessage,
314
304
  choices,
315
305
  default: defaultChoice,
316
- pageSize: 12
306
+ pageSize: this._getPageSize(choices.length)
317
307
  }
318
- ]);
319
-
320
- // 移除 ESC 键监听
321
- this.removeESCListener(escListener);
322
-
323
- this._cancelStatusRefresh();
308
+ ], '退出程序', () => {
309
+ Logger.info('退出程序');
310
+ this.showExitScreen();
311
+ this.destroy();
312
+ process.exit(0);
313
+ });
324
314
 
325
315
  if (answer.provider === '__OPEN_CONFIG__') {
326
316
  await this.openConfigFile();
327
317
  return await this.showProviderSelection();
328
318
  }
329
319
 
330
- const result = await this.handleSelection(answer.provider);
331
320
  this.currentPromptContext = null;
321
+ this._cancelStatusRefresh();
322
+ this.filteredProviders = null;
323
+
324
+ const result = await this.handleSelection(answer.provider);
332
325
  return result;
333
-
326
+
334
327
  } catch (error) {
335
328
  await this.handleError(error, '显示供应商选择');
336
329
  } finally {
@@ -338,6 +331,7 @@ class EnvSwitcher extends BaseCommand {
338
331
  this.currentPromptContext = null;
339
332
  }
340
333
  this._cancelStatusRefresh();
334
+ this.filteredProviders = null; // 清除保存的供应商列表
341
335
  }
342
336
  }
343
337
 
@@ -350,13 +344,13 @@ class EnvSwitcher extends BaseCommand {
350
344
  }
351
345
  }
352
346
 
353
- showWelcomeScreen(providers, statusMap = {}, statusError = null) {
347
+ showWelcomeScreen(providers, _statusMap = {}, statusError = null) {
354
348
  this.clearScreen();
355
-
349
+
356
350
  if (providers.length > 0) {
357
351
  console.log(UIHelper.colors.info(`总共 ${providers.length} 个供应商配置`));
358
352
  }
359
-
353
+
360
354
  if (statusError) {
361
355
  console.log();
362
356
  console.log(UIHelper.createCard('状态检测', `检测失败: ${statusError.message}`, UIHelper.icons.warning));
@@ -375,45 +369,45 @@ class EnvSwitcher extends BaseCommand {
375
369
 
376
370
  async handleSelection(selection) {
377
371
  switch (selection) {
378
- case '__ADD__':
379
- // 使用CommandRegistry避免循环引用
380
- const { registry } = require('../CommandRegistry');
381
- return await registry.executeCommand('add');
382
- case '__MANAGE__':
383
- return await this.showManageMenu();
384
- case '__EXIT__':
385
- this.showExitScreen();
386
- process.exit(0);
387
- default:
388
- return await this.showLaunchArgsSelection(selection);
372
+ case '__ADD__': {
373
+ const { registry } = require('../CommandRegistry');
374
+ await registry.executeCommand('add', { returnToParent: true });
375
+ return await this.showProviderSelection();
376
+ }
377
+ case '__MANAGE__':
378
+ return await this.showManageMenu();
379
+ case '__QUICK_SETTINGS__':
380
+ return await this.showQuickSettings();
381
+ case '__HELP__':
382
+ return await this.showHelp();
383
+ case '__EXIT__':
384
+ this.showExitScreen();
385
+ this.destroy();
386
+ process.exit(0);
387
+ default:
388
+ return await this.showLaunchArgsSelection(selection);
389
389
  }
390
390
  }
391
391
 
392
392
  async showQuickSettings() {
393
- this.clearScreen();
394
- console.log(UIHelper.createHintLine([
395
- ['↑ / ↓', '选择项目'],
396
- ['Enter', '确认'],
397
- ['ESC', '返回主菜单']
398
- ]));
399
- console.log();
393
+ this._renderPage({
394
+ title: '快速设置',
395
+ icon: UIHelper.icons.settings,
396
+ hints: [
397
+ ['↑ / ↓', '选择项目'],
398
+ ['Enter', '确认'],
399
+ ['ESC', '返回主菜单']
400
+ ]
401
+ });
400
402
  const choices = [
401
403
  { name: `${UIHelper.icons.search} 搜索供应商`, value: 'search' },
402
- { name: `${UIHelper.icons.edit} 批量编辑`, value: 'batch' },
403
- { name: `${UIHelper.icons.settings} 全局设置`, value: 'global' },
404
404
  { name: `${UIHelper.icons.info} 查看统计`, value: 'stats' },
405
405
  { name: `${UIHelper.icons.back} 返回主菜单`, value: 'back' }
406
406
  ];
407
407
 
408
- // 设置 ESC 键监听
409
- const escListener = this.createESCListener(() => {
410
- Logger.info('返回供应商选择');
411
- this.showProviderSelection();
412
- }, '返回供应商选择');
413
-
414
408
  let answer;
415
409
  try {
416
- answer = await this.prompt([
410
+ answer = await this.promptWithESC([
417
411
  {
418
412
  type: 'list',
419
413
  name: 'setting',
@@ -421,109 +415,24 @@ class EnvSwitcher extends BaseCommand {
421
415
  choices,
422
416
  pageSize: 8
423
417
  }
424
- ]);
418
+ ], '返回主菜单', () => {});
425
419
  } catch (error) {
426
- this.removeESCListener(escListener);
427
420
  if (this.isEscCancelled(error)) {
428
- return;
421
+ return await this.showProviderSelection();
429
422
  }
430
423
  throw error;
431
424
  }
432
-
433
- this.removeESCListener(escListener);
434
425
 
435
426
  switch (answer.setting) {
436
- case 'search':
437
- return await this.showSearchProvider();
438
- case 'batch':
439
- return await this.showBatchEdit();
440
- case 'global':
441
- return await this.showGlobalSettings();
442
- case 'stats':
443
- return await this.showStatistics();
444
- case 'back':
445
- return await this.showProviderSelection();
427
+ case 'search':
428
+ return await this.showSearchProvider();
429
+ case 'stats':
430
+ return await this.showStatistics();
431
+ case 'back':
432
+ return await this.showProviderSelection();
446
433
  }
447
434
  }
448
435
 
449
- async showBatchEdit() {
450
- this.clearScreen();
451
- console.log(UIHelper.createTitle('批量编辑', UIHelper.icons.edit));
452
- console.log();
453
- console.log(UIHelper.createTooltip('此功能正在开发中...'));
454
- console.log();
455
- console.log(UIHelper.createHintLine([
456
- ['Enter', '返回上一页'],
457
- ['ESC', '返回快速设置']
458
- ]));
459
- console.log();
460
-
461
- // 设置 ESC 键监听
462
- const escListener = this.createESCListener(() => {
463
- Logger.info('返回快速设置');
464
- this.showQuickSettings();
465
- }, '返回快速设置');
466
-
467
- try {
468
- await this.prompt([
469
- {
470
- type: 'input',
471
- name: 'continue',
472
- message: '按回车键返回...'
473
- }
474
- ]);
475
- } catch (error) {
476
- this.removeESCListener(escListener);
477
- if (this.isEscCancelled(error)) {
478
- return;
479
- }
480
- throw error;
481
- }
482
-
483
- this.removeESCListener(escListener);
484
-
485
- return await this.showQuickSettings();
486
- }
487
-
488
- async showGlobalSettings() {
489
- this.clearScreen();
490
- console.log(UIHelper.createTitle('全局设置', UIHelper.icons.settings));
491
- console.log();
492
- console.log(UIHelper.createTooltip('此功能正在开发中...'));
493
- console.log();
494
- console.log(UIHelper.createHintLine([
495
- ['Enter', '返回上一页'],
496
- ['ESC', '返回快速设置']
497
- ]));
498
- console.log();
499
-
500
- // 设置 ESC 键监听
501
- const escListener = this.createESCListener(() => {
502
- Logger.info('返回快速设置');
503
- this.showQuickSettings();
504
- }, '返回快速设置');
505
-
506
- try {
507
- await this.prompt([
508
- {
509
- type: 'input',
510
- name: 'continue',
511
- message: '按回车键返回...'
512
- }
513
- ]);
514
- } catch (error) {
515
- this.removeESCListener(escListener);
516
- if (this.isEscCancelled(error)) {
517
- return;
518
- }
519
- throw error;
520
- }
521
-
522
- this.removeESCListener(escListener);
523
-
524
- return await this.showQuickSettings();
525
- }
526
-
527
436
  async showSearchProvider() {
528
437
  this.clearScreen();
529
438
  console.log(UIHelper.createHintLine([
@@ -532,48 +441,68 @@ class EnvSwitcher extends BaseCommand {
532
441
  ]));
533
442
  console.log(UIHelper.createTooltip('示例: claude、demo 或供应商别名'));
534
443
  console.log();
535
- // 设置 ESC 键监听
536
- const escListener = this.createESCListener(() => {
537
- Logger.info('返回快速设置');
538
- this.showQuickSettings();
539
- }, '返回快速设置');
540
-
541
444
  let answer;
542
445
  try {
543
- answer = await this.prompt([
446
+ answer = await this.promptWithESC([
544
447
  {
545
448
  type: 'input',
546
449
  name: 'search',
547
450
  message: '输入供应商名称搜索:',
548
451
  validate: input => input.trim() !== '' || '请输入搜索内容'
549
452
  }
550
- ]);
453
+ ], '返回快速设置', () => {
454
+ Logger.info('返回快速设置');
455
+ });
551
456
  } catch (error) {
552
- this.removeESCListener(escListener);
553
457
  if (this.isEscCancelled(error)) {
554
- return;
458
+ return await this.showQuickSettings();
555
459
  }
556
460
  throw error;
557
461
  }
558
-
559
- this.removeESCListener(escListener);
560
462
 
561
463
  await this.configManager.load();
562
464
  const providers = this.configManager.listProviders();
563
- const searchResults = providers.filter(p =>
564
- p.name.toLowerCase().includes(answer.search.toLowerCase()) ||
565
- p.displayName.toLowerCase().includes(answer.search.toLowerCase())
566
- );
465
+ const searchResults = providers.filter(p => {
466
+ const q = answer.search.toLowerCase();
467
+ return p.name.toLowerCase().includes(q) ||
468
+ (p.displayName || '').toLowerCase().includes(q) ||
469
+ (p.alias || '').toLowerCase().includes(q);
470
+ });
567
471
 
568
472
  if (searchResults.length === 0) {
569
- Logger.warning('未找到匹配的供应商');
570
- return await this.showQuickSettings();
473
+ Logger.warning(`未找到匹配"${answer.search}"的供应商`);
474
+ let retry;
475
+ try {
476
+ retry = await this.promptWithESC([
477
+ {
478
+ type: 'list',
479
+ name: 'action',
480
+ message: '未找到匹配结果,请选择操作:',
481
+ choices: [
482
+ { name: `${UIHelper.icons.search} 重新搜索`, value: 'retry' },
483
+ { name: `${UIHelper.icons.back} 返回快速设置`, value: 'back' }
484
+ ]
485
+ }
486
+ ], '返回快速设置', () => {});
487
+ } catch (error) {
488
+ if (this.isEscCancelled(error)) {
489
+ return await this.showQuickSettings();
490
+ }
491
+ throw error;
492
+ }
493
+ if (retry.action === 'back') {
494
+ return await this.showQuickSettings();
495
+ }
496
+ return await this.showSearchProvider();
571
497
  }
572
498
 
573
- const choices = searchResults.map(p => ({
574
- name: UIHelper.formatProvider(p),
575
- value: p.name
576
- }));
499
+ const choices = ProviderChoicesHelper.buildProviderChoices(searchResults, {
500
+ statusMap: this._buildInitialStatusMap(searchResults),
501
+ UIHelper,
502
+ StatusHelper,
503
+ chalk,
504
+ Separator: inquirer.Separator
505
+ });
577
506
 
578
507
  choices.push(
579
508
  new inquirer.Separator(),
@@ -584,22 +513,9 @@ class EnvSwitcher extends BaseCommand {
584
513
  const currentProvider = searchResults.find(p => p.current);
585
514
  const defaultChoice = currentProvider ? currentProvider.name : searchResults[0]?.name;
586
515
 
587
- // 设置 ESC 键监听
588
- const escListener2 = this.createESCListener(() => {
589
- Logger.info('返回快速设置');
590
- this.showQuickSettings();
591
- }, '返回快速设置');
592
-
593
- console.log();
594
- console.log(UIHelper.createHintLine([
595
- ['↑ / ↓', '选择结果'],
596
- ['Enter', '查看详情'],
597
- ['ESC', '返回快速设置']
598
- ]));
599
-
600
516
  let result;
601
517
  try {
602
- result = await this.prompt([
518
+ result = await this.promptWithESC([
603
519
  {
604
520
  type: 'list',
605
521
  name: 'provider',
@@ -608,16 +524,15 @@ class EnvSwitcher extends BaseCommand {
608
524
  default: defaultChoice,
609
525
  pageSize: 10
610
526
  }
611
- ]);
527
+ ], '返回快速设置', () => {
528
+ Logger.info('返回快速设置');
529
+ });
612
530
  } catch (error) {
613
- this.removeESCListener(escListener2);
614
531
  if (this.isEscCancelled(error)) {
615
- return;
532
+ return await this.showQuickSettings();
616
533
  }
617
534
  throw error;
618
535
  }
619
-
620
- this.removeESCListener(escListener2);
621
536
 
622
537
  if (result.provider === 'back') {
623
538
  return await this.showQuickSettings();
@@ -630,15 +545,17 @@ class EnvSwitcher extends BaseCommand {
630
545
  await this.configManager.load();
631
546
  const providers = this.configManager.listProviders();
632
547
  this.clearScreen();
633
-
548
+
634
549
  const totalProviders = providers.length;
635
550
  const currentProvider = providers.find(p => p.current);
636
551
  const totalUsage = providers.reduce((sum, p) => sum + (p.usageCount || 0), 0);
637
- const mostUsed = providers.reduce((max, p) => (p.usageCount || 0) > (max.usageCount || 0) ? p : max, providers[0]);
552
+ const mostUsed = providers.length > 0
553
+ ? providers.reduce((max, p) => (p.usageCount || 0) > (max.usageCount || 0) ? p : max, providers[0])
554
+ : null;
638
555
 
639
556
  console.log(UIHelper.createTitle('使用统计', UIHelper.icons.info));
640
557
  console.log();
641
-
558
+
642
559
  const stats = [
643
560
  ['总供应商数', totalProviders],
644
561
  ['当前供应商', currentProvider ? currentProvider.displayName : '无'],
@@ -646,54 +563,43 @@ class EnvSwitcher extends BaseCommand {
646
563
  ['最常用供应商', mostUsed ? mostUsed.displayName : '无'],
647
564
  ['创建时间', providers.length > 0 ? UIHelper.formatTime(providers[0].createdAt) : '无']
648
565
  ];
649
-
566
+
650
567
  console.log(UIHelper.createTable(['项目', '数据'], stats));
651
568
  console.log();
652
- console.log(UIHelper.createHintLine([
653
- ['Enter', '返回快速设置'],
654
- ['ESC', '返回快速设置']
655
- ]));
656
- console.log();
657
-
658
- // 设置 ESC 键监听
659
- const escListener = this.createESCListener(() => {
660
- Logger.info('返回快速设置');
661
- this.showQuickSettings();
662
- }, '返回快速设置');
663
-
664
569
  try {
665
- await this.prompt([
570
+ await this.promptWithESC([
666
571
  {
667
- type: 'input',
668
- name: 'continue',
669
- message: '按回车键继续...'
572
+ type: 'list',
573
+ name: 'action',
574
+ message: '操作:',
575
+ choices: [{ name: `${UIHelper.icons.back} 返回`, value: 'back' }]
670
576
  }
671
- ]);
577
+ ], '返回快速设置', () => {
578
+ Logger.info('返回快速设置');
579
+ });
672
580
  } catch (error) {
673
- this.removeESCListener(escListener);
674
581
  if (this.isEscCancelled(error)) {
675
- return;
582
+ return await this.showQuickSettings();
676
583
  }
677
584
  throw error;
678
585
  }
679
-
680
- this.removeESCListener(escListener);
681
586
 
682
587
  return await this.showQuickSettings();
683
588
  }
684
589
 
685
590
  showExitScreen() {
686
- this.clearScreen();
687
- console.log(UIHelper.createTitle('感谢使用', UIHelper.icons.home));
688
- console.log();
689
- console.log(UIHelper.colors.info('再见!期待下次使用 🎉'));
690
- console.log();
591
+ this._renderPage({
592
+ title: '感谢使用',
593
+ icon: UIHelper.icons.home,
594
+ content: UIHelper.colors.info('再见!期待下次使用 🎉')
595
+ });
691
596
  }
692
597
 
693
598
  async showHelp() {
694
- this.clearScreen();
695
- console.log(UIHelper.createTitle('快捷键帮助', UIHelper.icons.info));
696
- console.log();
599
+ this._renderPage({
600
+ title: '快捷键帮助',
601
+ icon: UIHelper.icons.info
602
+ });
697
603
 
698
604
  const sections = [
699
605
  {
@@ -727,101 +633,90 @@ class EnvSwitcher extends BaseCommand {
727
633
  console.log();
728
634
  });
729
635
 
730
- const escListener = this.createESCListener(() => {
731
- Logger.info('返回主菜单');
732
- this.showProviderSelection();
733
- }, '返回主菜单');
734
-
735
- console.log(UIHelper.createHintLine([
736
- ['Enter', '返回主菜单'],
737
- ['ESC', '返回主菜单']
738
- ]));
739
- console.log();
740
-
741
636
  try {
742
- await this.prompt([
637
+ await this.promptWithESC([
743
638
  {
744
- type: 'input',
745
- name: 'continue',
746
- message: '按回车键返回主菜单'
639
+ type: 'list',
640
+ name: 'action',
641
+ message: '操作:',
642
+ choices: [{ name: `${UIHelper.icons.back} 返回主菜单`, value: 'back' }]
747
643
  }
748
- ]);
644
+ ], '返回主菜单', () => {
645
+ Logger.info('返回主菜单');
646
+ });
749
647
  } catch (error) {
750
- this.removeESCListener(escListener);
751
648
  if (this.isEscCancelled(error)) {
752
- return;
649
+ return await this.showProviderSelection();
753
650
  }
754
651
  throw error;
755
652
  }
756
653
 
757
- this.removeESCListener(escListener);
758
654
  return await this.showProviderSelection();
759
655
  }
760
656
 
761
657
  async showManageMenu() {
762
- let escListener;
763
658
  try {
764
659
  await this.configManager.load();
765
- const providers = this.configManager.listProviders();
766
- this.clearScreen();
767
- console.log(UIHelper.createHintLine([
768
- ['↑ / ↓', '选择供应商或操作'],
769
- ['Enter', '确认'],
770
- ['ESC', '返回主菜单']
771
- ]));
772
- console.log();
773
-
774
- console.log(UIHelper.createTitle('供应商管理', UIHelper.icons.list));
775
- console.log();
776
-
660
+ let providers = this.configManager.listProviders();
661
+
777
662
  if (providers.length === 0) {
778
- console.log(UIHelper.createCard('提示', '暂无配置的供应商\n请先运行 "akm add" 添加供应商配置', UIHelper.icons.warning));
663
+ Logger.warning('暂无配置的供应商');
664
+ Logger.info('请先运行 "akm add" 添加供应商配置');
779
665
  return await this.showProviderSelection();
780
666
  }
781
667
 
782
668
  const statusMap = this._buildInitialStatusMap(providers);
669
+
670
+ // 按状态排序:在线 > 有限可用 > 测试中 > 不可用
671
+ const stateOrder = { online: 0, degraded: 1, pending: 2, offline: 3 };
672
+ providers = [...providers].sort((a, b) => {
673
+ const stateA = statusMap[a.name]?.state || 'pending';
674
+ const stateB = statusMap[b.name]?.state || 'pending';
675
+ return (stateOrder[stateA] || 2) - (stateOrder[stateB] || 2);
676
+ });
677
+
678
+ this._renderPage({
679
+ title: '供应商管理',
680
+ icon: UIHelper.icons.list,
681
+ hints: [
682
+ ['↑ / ↓', '选择供应商'],
683
+ ['Enter', '查看详情'],
684
+ ['ESC', '返回主菜单']
685
+ ]
686
+ });
687
+
783
688
  const choices = this.createProviderChoices(providers, true, statusMap);
784
689
 
785
690
  this.currentPromptContext = 'manage';
691
+ this.filteredProviders = providers;
786
692
 
787
693
  if (providers.length > 0) {
788
694
  this._startStatusRefresh(providers);
789
695
  }
790
696
 
791
- // 设置 ESC 键监听
792
- escListener = this.createESCListener(() => {
793
- Logger.info('返回供应商选择');
794
- this.showProviderSelection();
795
- }, '返回供应商选择');
796
-
797
- let answer;
798
- try {
799
- answer = await this.prompt([
800
- {
801
- type: 'list',
802
- name: 'action',
803
- message: `选择供应商或操作 (总计 ${providers.length} 个):`,
804
- choices,
805
- pageSize: 12
806
- }
807
- ]);
808
- } catch (error) {
809
- this.removeESCListener(escListener);
810
- if (this.isEscCancelled(error)) {
811
- return;
697
+ const answer = await this.promptWithESC([
698
+ {
699
+ type: 'list',
700
+ name: 'action',
701
+ message: `选择供应商或操作 (总计 ${providers.length} 个):`,
702
+ choices,
703
+ pageSize: this._getPageSize(choices.length)
812
704
  }
813
- throw error;
814
- }
815
-
816
- this.removeESCListener(escListener);
705
+ ], '返回供应商选择', () => {
706
+ Logger.info('返回供应商选择');
707
+ });
817
708
 
818
709
  this._cancelStatusRefresh();
710
+ this.currentPromptContext = null;
711
+ this.filteredProviders = null;
819
712
 
820
713
  const result = await this.handleManageAction(answer.action);
821
- this.currentPromptContext = null;
822
714
  return result;
823
-
715
+
824
716
  } catch (error) {
717
+ if (this.isEscCancelled(error)) {
718
+ return await this.showProviderSelection();
719
+ }
825
720
  await this.handleError(error, '显示供应商管理');
826
721
  } finally {
827
722
  if (this.currentPromptContext === 'manage') {
@@ -832,101 +727,30 @@ class EnvSwitcher extends BaseCommand {
832
727
  }
833
728
 
834
729
  createProviderChoices(providers, includeActions = false, statusMap = {}) {
835
- const lastUsedProvider = providers.reduce((latest, current) => {
836
- if (!current || !current.lastUsed) {
837
- return latest;
838
- }
839
- if (!latest || !latest.lastUsed) {
840
- return current;
841
- }
842
- return new Date(current.lastUsed) > new Date(latest.lastUsed) ? current : latest;
843
- }, null);
844
-
845
- const choices = providers.map(provider => {
846
- const isLastUsed = lastUsedProvider && lastUsedProvider.name === provider.name;
847
- const availability = statusMap[provider.name];
848
- const icon = this._iconForState(availability?.state);
849
- const statusText = this._formatAvailability(availability);
850
- const statusLabel = chalk.gray('-') + ' ' + statusText;
851
- const label = `${icon} ${UIHelper.formatProvider(provider)}${isLastUsed ? UIHelper.colors.muted(' --- 上次使用') : ''} ${statusLabel}`;
852
-
853
- return {
854
- name: label,
855
- value: provider.name,
856
- short: provider.name
857
- };
730
+ return ProviderChoicesHelper.buildProviderChoices(providers, {
731
+ includeActions,
732
+ statusMap,
733
+ UIHelper,
734
+ StatusHelper,
735
+ chalk,
736
+ Separator: inquirer.Separator
858
737
  });
859
-
860
- if (includeActions) {
861
- choices.push(
862
- new inquirer.Separator(),
863
- { name: `${UIHelper.icons.back} 返回供应商选择`, value: 'back' },
864
- { name: `${UIHelper.icons.error} 退出`, value: 'exit' }
865
- );
866
- }
867
-
868
- return choices;
869
738
  }
870
739
 
871
740
  _iconForState(state) {
872
- if (state === 'online') {
873
- return '🟢';
874
- }
875
- if (state === 'degraded') {
876
- return '🟡';
877
- }
878
- if (state === 'offline') {
879
- return '🔴';
880
- }
881
- if (state === 'pending') {
882
- return '⏳';
883
- }
884
- return '⚪';
741
+ return StatusHelper.getIconForState(state);
885
742
  }
886
743
 
887
744
  _formatAvailability(availability) {
888
- if (!availability) {
889
- return chalk.gray('测试中...');
890
- }
891
- if (availability.state === 'online') {
892
- return chalk.green(availability.label || '可用');
893
- }
894
- if (availability.state === 'degraded') {
895
- return chalk.yellow(availability.label || '有限可用');
896
- }
897
- if (availability.state === 'offline') {
898
- return chalk.red(availability.label || '不可用');
899
- }
900
- if (availability.state === 'pending') {
901
- return chalk.gray(availability.label || '测试中...');
902
- }
903
- return chalk.gray(availability.label || '未知');
745
+ return StatusHelper.formatAvailability(availability);
904
746
  }
905
747
 
906
748
  _buildInitialStatusMap(providers) {
907
- const cached = this.latestStatusMap || {};
908
- const map = {};
909
- providers.forEach(provider => {
910
- map[provider.name] = cached[provider.name] || {
911
- state: 'pending',
912
- label: '测试中...',
913
- latency: null
914
- };
915
- });
916
- return map;
749
+ return StatusHelper.buildInitialStatusMap(providers, this.latestStatusMap || {});
917
750
  }
918
751
 
919
752
  _buildErrorStatusMap(providers, error) {
920
- const message = error ? `检测失败: ${error.message}` : '检测失败';
921
- const map = {};
922
- providers.forEach(provider => {
923
- map[provider.name] = {
924
- state: 'offline',
925
- label: message,
926
- latency: null
927
- };
928
- });
929
- return map;
753
+ return StatusHelper.buildErrorStatusMap(providers, error);
930
754
  }
931
755
 
932
756
  _startStatusRefresh(providers) {
@@ -965,6 +789,10 @@ class EnvSwitcher extends BaseCommand {
965
789
 
966
790
  _cancelStatusRefresh() {
967
791
  this.activeStatusRefresh = null;
792
+ if (this._refreshTimer) {
793
+ clearTimeout(this._refreshTimer);
794
+ this._refreshTimer = null;
795
+ }
968
796
  }
969
797
 
970
798
  _applyStatusUpdate(providers, statusMap, error, refreshToken = null) {
@@ -980,56 +808,7 @@ class EnvSwitcher extends BaseCommand {
980
808
  return;
981
809
  }
982
810
 
983
- const includeActions = this.currentPromptContext === 'manage';
984
- const updatedChoicesBase = this.createProviderChoices(providers, includeActions, statusMap);
985
- const updatedChoices = [...updatedChoicesBase];
986
-
987
- if (!includeActions) {
988
- updatedChoices.push(
989
- new inquirer.Separator(),
990
- { name: `${UIHelper.icons.add} 添加新供应商`, value: '__ADD__' },
991
- { name: `${UIHelper.icons.list} 供应商管理 (编辑/删除)`, value: '__MANAGE__' },
992
- { name: `${UIHelper.icons.config} 打开配置文件`, value: '__OPEN_CONFIG__' },
993
- { name: `${UIHelper.icons.error} 退出`, value: '__EXIT__' }
994
- );
995
- }
996
-
997
- const previousValue = (() => {
998
- try {
999
- return activePrompt.opt.choices?.getChoice(activePrompt.selected)?.value ?? null;
1000
- } catch (err) {
1001
- return null;
1002
- }
1003
- })();
1004
-
1005
- activePrompt.opt.choices = new Choices(updatedChoices, activePrompt.answers);
1006
-
1007
- if (previousValue != null) {
1008
- const newIndex = activePrompt.opt.choices.realChoices.findIndex(choice => choice.value === previousValue);
1009
- if (newIndex >= 0) {
1010
- activePrompt.selected = newIndex;
1011
- } else if (activePrompt.selected >= activePrompt.opt.choices.realLength) {
1012
- activePrompt.selected = Math.max(activePrompt.opt.choices.realLength - 1, 0);
1013
- }
1014
- } else if (activePrompt.selected >= activePrompt.opt.choices.realLength) {
1015
- activePrompt.selected = Math.max(activePrompt.opt.choices.realLength - 1, 0);
1016
- }
1017
-
1018
- if (error) {
1019
- if (this.currentPromptContext === 'selection') {
1020
- activePrompt.opt.message = `请选择要切换的供应商 (总计 ${providers.length} 个,状态检测失败,使用默认配置):`;
1021
- } else if (this.currentPromptContext === 'manage') {
1022
- activePrompt.opt.message = `选择供应商或操作 (总计 ${providers.length} 个,状态检测失败,使用默认配置):`;
1023
- }
1024
- } else {
1025
- if (this.currentPromptContext === 'selection') {
1026
- activePrompt.opt.message = `请选择要切换的供应商 (总计 ${providers.length} 个):`;
1027
- } else if (this.currentPromptContext === 'manage') {
1028
- activePrompt.opt.message = `选择供应商或操作 (总计 ${providers.length} 个):`;
1029
- }
1030
- }
1031
-
1032
- activePrompt.render();
811
+ this._refreshPromptChoices(activePrompt, providers, statusMap, { hasError: Boolean(error) });
1033
812
  }
1034
813
 
1035
814
  _applyIncrementalStatus(providerName, status, refreshToken) {
@@ -1045,10 +824,36 @@ class EnvSwitcher extends BaseCommand {
1045
824
  return;
1046
825
  }
1047
826
 
827
+ // 节流:80ms 内的多次回调合并为一次 render,避免高频刷新导致 ANSI 光标错位
828
+ if (this._refreshTimer) {
829
+ clearTimeout(this._refreshTimer);
830
+ }
831
+ this._refreshTimer = setTimeout(() => {
832
+ this._refreshTimer = null;
833
+ if (this.activeStatusRefresh !== refreshToken) return;
834
+ const activeP = this.activePrompt?.promise?.ui?.activePrompt;
835
+ if (!activeP || activeP.status === 'answered') return;
836
+ const providers = this.filteredProviders || this.configManager.listProviders();
837
+ const statusMap = this.latestStatusMap || {};
838
+ this._refreshPromptChoices(activeP, providers, statusMap);
839
+ }, 80);
840
+ }
841
+
842
+ _refreshPromptChoices(activePrompt, providers, statusMap, options = {}) {
1048
843
  const includeActions = this.currentPromptContext === 'manage';
1049
- const providers = this.configManager.listProviders();
1050
- const statusMap = this.latestStatusMap || {};
1051
- const updatedChoicesBase = this.createProviderChoices(providers, includeActions, statusMap);
844
+
845
+ let sortedProviders = providers;
846
+ if (includeActions) {
847
+ const stateOrder = { online: 0, degraded: 1, pending: 2, offline: 3 };
848
+ sortedProviders = [...providers].sort((a, b) => {
849
+ const stateA = statusMap[a.name]?.state || 'pending';
850
+ const stateB = statusMap[b.name]?.state || 'pending';
851
+ return (stateOrder[stateA] ?? 2) - (stateOrder[stateB] ?? 2);
852
+ });
853
+ this.filteredProviders = sortedProviders;
854
+ }
855
+
856
+ const updatedChoicesBase = this.createProviderChoices(sortedProviders, includeActions, statusMap);
1052
857
  const updatedChoices = [...updatedChoicesBase];
1053
858
 
1054
859
  if (!includeActions) {
@@ -1057,20 +862,31 @@ class EnvSwitcher extends BaseCommand {
1057
862
  { name: `${UIHelper.icons.add} 添加新供应商`, value: '__ADD__' },
1058
863
  { name: `${UIHelper.icons.list} 供应商管理 (编辑/删除)`, value: '__MANAGE__' },
1059
864
  { name: `${UIHelper.icons.config} 打开配置文件`, value: '__OPEN_CONFIG__' },
865
+ { name: `${UIHelper.icons.settings} 快速设置`, value: '__QUICK_SETTINGS__' },
866
+ { name: `${UIHelper.icons.info} 帮助`, value: '__HELP__' },
1060
867
  { name: `${UIHelper.icons.error} 退出`, value: '__EXIT__' }
1061
868
  );
1062
869
  }
1063
870
 
1064
- const previousValue = (() => {
1065
- try {
1066
- return activePrompt.opt.choices?.getChoice(activePrompt.selected)?.value ?? null;
1067
- } catch (err) {
1068
- return null;
1069
- }
1070
- })();
871
+ const previousValue = this._getActivePromptPreviousValue(activePrompt);
1071
872
 
1072
873
  activePrompt.opt.choices = new Choices(updatedChoices, activePrompt.answers);
1073
874
 
875
+ this._restorePromptSelection(activePrompt, previousValue);
876
+ activePrompt.opt.message = this._buildStatusPromptMessage(providers.length, options.hasError);
877
+
878
+ activePrompt.render();
879
+ }
880
+
881
+ _getActivePromptPreviousValue(activePrompt) {
882
+ try {
883
+ return activePrompt.opt.choices?.getChoice(activePrompt.selected)?.value ?? null;
884
+ } catch {
885
+ return null;
886
+ }
887
+ }
888
+
889
+ _restorePromptSelection(activePrompt, previousValue) {
1074
890
  if (previousValue != null) {
1075
891
  const newIndex = activePrompt.opt.choices.realChoices.findIndex(choice => choice.value === previousValue);
1076
892
  if (newIndex >= 0) {
@@ -1081,381 +897,74 @@ class EnvSwitcher extends BaseCommand {
1081
897
  } else if (activePrompt.selected >= activePrompt.opt.choices.realLength) {
1082
898
  activePrompt.selected = Math.max(activePrompt.opt.choices.realLength - 1, 0);
1083
899
  }
900
+ }
1084
901
 
902
+ _buildStatusPromptMessage(providerCount, hasError = false) {
903
+ const errorSuffix = hasError ? ',状态检测失败,使用默认配置' : '';
1085
904
  if (this.currentPromptContext === 'selection') {
1086
- activePrompt.opt.message = `请选择要切换的供应商 (总计 ${providers.length} 个):`;
1087
- } else if (this.currentPromptContext === 'manage') {
1088
- activePrompt.opt.message = `选择供应商或操作 (总计 ${providers.length} 个):`;
905
+ const filterSuffix = this.filter === 'codex' ? ' (Codex CLI)' : (this.filter === 'claude' ? ' (Claude Code)' : '');
906
+ return `请选择要切换的供应商${filterSuffix} (总计 ${providerCount} 个${errorSuffix}):`;
1089
907
  }
1090
-
1091
- activePrompt.render();
908
+ if (this.currentPromptContext === 'manage') {
909
+ return `选择供应商或操作 (总计 ${providerCount} 个${errorSuffix}):`;
910
+ }
911
+ return '';
1092
912
  }
1093
913
 
1094
914
  async handleManageAction(action) {
1095
915
  switch (action) {
1096
- case 'back':
1097
- return await this.showProviderSelection();
1098
- case 'exit':
1099
- Logger.info('👋 再见!');
1100
- process.exit(0);
1101
- default:
1102
- // 如果选择的是供应商名称,显示该供应商的详细信息
1103
- return await this.showProviderDetails(action);
916
+ case 'back':
917
+ return await this.showProviderSelection();
918
+ case 'exit':
919
+ this.showExitScreen();
920
+ this.destroy();
921
+ process.exit(0);
922
+ case 'batch-delete': {
923
+ const { ProviderRemover } = require('./remove');
924
+ const remover = new ProviderRemover();
925
+ try {
926
+ await remover.remove();
927
+ } finally {
928
+ remover.destroy();
929
+ }
930
+ return await this.showManageMenu();
931
+ }
932
+ default:
933
+ return await this.showProviderDetails(action);
1104
934
  }
1105
935
  }
1106
936
 
1107
937
  async showProviderDetails(providerName) {
1108
- let escListener;
1109
- try {
1110
- const provider = await this.validateProvider(providerName);
1111
- this.clearScreen();
1112
-
1113
- console.log(UIHelper.createTitle('供应商详情', UIHelper.icons.info));
1114
- console.log();
1115
- console.log(UIHelper.createHintLine([
1116
- ['↑ / ↓', '选择操作'],
1117
- ['Enter', '确认'],
1118
- ['ESC', '返回管理列表']
1119
- ]));
1120
- console.log();
1121
-
1122
- const authModeDisplay = {
1123
- api_key: '通用API密钥模式',
1124
- auth_token: '认证令牌模式',
1125
- oauth_token: 'OAuth令牌模式'
1126
- };
1127
-
1128
- const details = [
1129
- ['供应商名称', provider.name],
1130
- ['显示名称', provider.displayName],
1131
- ['认证模式', authModeDisplay[provider.authMode] || provider.authMode],
1132
- ];
1133
-
1134
- // 如果是 api_key 模式,添加 tokenType 信息
1135
- if (provider.authMode === 'api_key' && provider.tokenType) {
1136
- const tokenTypeDisplay = provider.tokenType === 'auth_token' ? 'ANTHROPIC_AUTH_TOKEN' : 'ANTHROPIC_API_KEY';
1137
- details.push(['Token类型', tokenTypeDisplay]);
1138
- }
1139
-
1140
- // 继续添加其他信息
1141
- details.push(
1142
- ['基础URL', provider.baseUrl || (provider.authMode === 'oauth_token' ? '✨ 官方默认服务器' : '⚠️ 未设置')],
1143
- ['认证令牌', provider.authToken || '未设置'],
1144
- ['主模型', provider.models?.primary || '未设置'],
1145
- ['快速模型', provider.models?.smallFast || '未设置'],
1146
- ['创建时间', UIHelper.formatTime(provider.createdAt)],
1147
- ['最后使用', UIHelper.formatTime(provider.lastUsed)],
1148
- ['当前状态', provider.current ? '✅ 使用中' : '⚫ 未使用'],
1149
- ['使用次数', provider.usageCount || 0]
1150
- );
1151
-
1152
- console.log(UIHelper.createTable(['项目', '信息'], details));
1153
- console.log();
1154
-
1155
- if (provider.launchArgs && provider.launchArgs.length > 0) {
1156
- console.log(UIHelper.createCard('默认启动参数', provider.launchArgs.join(', '), UIHelper.icons.settings));
1157
- console.log();
1158
- }
1159
-
1160
- // 设置 ESC 键监听
1161
- escListener = this.createESCListener(() => {
1162
- Logger.info('返回管理列表');
1163
- this.showManageMenu();
1164
- }, '返回管理列表');
1165
-
1166
- let answer;
1167
- try {
1168
- answer = await this.prompt([
1169
- {
1170
- type: 'list',
1171
- name: 'action',
1172
- message: '选择操作:',
1173
- choices: [
1174
- { name: `${UIHelper.icons.launch} 立即启动`, value: 'launch' },
1175
- { name: `${UIHelper.icons.edit} 编辑供应商`, value: 'edit' },
1176
- { name: `${UIHelper.icons.delete} 删除供应商`, value: 'remove' },
1177
- { name: `${UIHelper.icons.back} 返回管理列表`, value: 'back' }
1178
- ]
1179
- }
1180
- ]);
1181
- } catch (error) {
1182
- this.removeESCListener(escListener);
1183
- if (this.isEscCancelled(error)) {
1184
- return;
1185
- }
1186
- throw error;
1187
- }
1188
-
1189
- switch (answer.action) {
1190
- case 'back':
1191
- // 移除 ESC 键监听
1192
- this.removeESCListener(escListener);
1193
- return await this.showManageMenu();
1194
- case 'edit':
1195
- // 移除 ESC 键监听
1196
- this.removeESCListener(escListener);
1197
- return await this.editProvider(providerName);
1198
- case 'remove':
1199
- // 移除 ESC 键监听
1200
- this.removeESCListener(escListener);
1201
- return await this.removeProvider(providerName);
1202
- case 'launch':
1203
- // 移除 ESC 键监听
1204
- this.removeESCListener(escListener);
1205
- return await this.showLaunchArgsSelection(providerName);
1206
- }
1207
-
1208
- } catch (error) {
1209
- // 移除 ESC 键监听
1210
- this.removeESCListener(escListener);
1211
- await this.handleError(error, '显示供应商详情');
1212
- }
938
+ return this.providerManager.showProviderDetails(
939
+ providerName,
940
+ () => this.showManageMenu(),
941
+ (name) => this.editProvider(name),
942
+ (name) => this.removeProvider(name),
943
+ (name) => this.showLaunchArgsSelection(name)
944
+ );
1213
945
  }
1214
946
 
1215
947
  async editProvider(providerName) {
1216
- let escListener;
1217
- try {
1218
- await this.configManager.load();
1219
- const provider = this.configManager.getProvider(providerName);
1220
- this.clearScreen();
1221
-
1222
- if (!provider) {
1223
- Logger.error(`供应商 '${providerName}' 不存在`);
1224
- return await this.showManageMenu();
1225
- }
1226
-
1227
- // 设置 ESC 键监听
1228
- escListener = this.createESCListener(() => {
1229
- Logger.info('取消编辑供应商');
1230
- this.showManageMenu();
1231
- }, '取消编辑');
1232
-
1233
- let answers;
1234
- try {
1235
- answers = await this.prompt([
1236
- {
1237
- type: 'input',
1238
- name: 'name',
1239
- message: '请输入供应商名称 (用于命令行):',
1240
- default: provider.name,
1241
- validate: (input) => {
1242
- const error = validator.validateName(input);
1243
- if (error) return error;
1244
- return true;
1245
- }
1246
- },
1247
- {
1248
- type: 'input',
1249
- name: 'displayName',
1250
- message: '显示名称:',
1251
- default: provider.displayName,
1252
- prefillDefault: true
1253
- },
1254
- {
1255
- type: 'list',
1256
- name: 'authMode',
1257
- message: '认证模式:',
1258
- choices: [
1259
- { name: '🔑 通用API密钥模式 - 支持 ANTHROPIC_API_KEY 和 ANTHROPIC_AUTH_TOKEN', value: 'api_key' },
1260
- { name: '🔐 认证令牌模式 (仅 ANTHROPIC_AUTH_TOKEN) - 适用于某些服务商', value: 'auth_token' },
1261
- { name: '🌐 OAuth令牌模式 (CLAUDE_CODE_OAUTH_TOKEN) - 适用于官方Claude Code', value: 'oauth_token' }
1262
- ],
1263
- default: provider.authMode || 'api_key'
1264
- },
1265
- {
1266
- type: 'list',
1267
- name: 'tokenType',
1268
- message: 'Token类型:',
1269
- choices: [
1270
- { name: '🔑 ANTHROPIC_API_KEY - 通用API密钥', value: 'api_key' },
1271
- { name: '🔐 ANTHROPIC_AUTH_TOKEN - 认证令牌', value: 'auth_token' }
1272
- ],
1273
- default: provider.tokenType || 'api_key',
1274
- when: (answers) => answers.authMode === 'api_key'
1275
- },
1276
- {
1277
- type: 'input',
1278
- name: 'baseUrl',
1279
- message: '基础URL:',
1280
- default: provider.baseUrl,
1281
- prefillDefault: true,
1282
- when: (answers) => answers.authMode === 'api_key' || answers.authMode === 'auth_token'
1283
- },
1284
- {
1285
- type: 'input',
1286
- name: 'authToken',
1287
- message: (answers) => {
1288
- switch (answers.authMode) {
1289
- case 'api_key':
1290
- const tokenTypeLabel = answers.tokenType === 'auth_token' ? 'ANTHROPIC_AUTH_TOKEN' : 'ANTHROPIC_API_KEY';
1291
- return `Token (${tokenTypeLabel}):`;
1292
- case 'auth_token':
1293
- return '认证令牌 (ANTHROPIC_AUTH_TOKEN):';
1294
- case 'oauth_token':
1295
- return 'OAuth令牌 (CLAUDE_CODE_OAUTH_TOKEN):';
1296
- default:
1297
- return '认证令牌:';
1298
- }
1299
- },
1300
- default: provider.authToken,
1301
- prefillDefault: true
1302
- },
1303
- {
1304
- type: 'input',
1305
- name: 'primaryModel',
1306
- message: '主模型 (ANTHROPIC_MODEL):',
1307
- default: provider.models?.primary || '',
1308
- prefillDefault: true,
1309
- allowEmpty: true,
1310
- validate: (input) => {
1311
- const error = validator.validateModel(input);
1312
- if (error) return error;
1313
- return true;
1314
- }
1315
- },
1316
- {
1317
- type: 'input',
1318
- name: 'smallFastModel',
1319
- message: '快速模型 (ANTHROPIC_SMALL_FAST_MODEL):',
1320
- default: provider.models?.smallFast || '',
1321
- prefillDefault: true,
1322
- allowEmpty: true,
1323
- validate: (input) => {
1324
- const error = validator.validateModel(input);
1325
- if (error) return error;
1326
- return true;
1327
- }
1328
- }
1329
- ]);
1330
- } catch (error) {
1331
- this.removeESCListener(escListener);
1332
- if (this.isEscCancelled(error)) {
1333
- return;
1334
- }
1335
- throw error;
1336
- }
1337
-
1338
- const originalName = provider.name;
1339
- const newName = answers.name;
1340
-
1341
- // 处理重命名逻辑
1342
- if (newName !== originalName) {
1343
- await this.configManager.ensureLoaded();
1344
- const providersMap = this.configManager.config.providers;
1345
-
1346
- if (providersMap[newName] && providersMap[newName] !== provider) {
1347
- Logger.error(`供应商名称 '${newName}' 已存在,请使用其他名称`);
1348
- return await this.showManageMenu();
1349
- }
1350
-
1351
- providersMap[newName] = {
1352
- ...provider,
1353
- name: newName
1354
- };
1355
-
1356
- delete providersMap[originalName];
1357
-
1358
- if (this.configManager.config.currentProvider === originalName) {
1359
- this.configManager.config.currentProvider = newName;
1360
- providersMap[newName].current = true;
1361
- }
1362
-
1363
- provider = providersMap[newName];
1364
- }
1365
-
1366
- // 更新供应商配置
1367
- provider.displayName = answers.displayName || newName;
1368
- provider.baseUrl = answers.baseUrl;
1369
- provider.authToken = answers.authToken;
1370
- provider.authMode = answers.authMode;
1371
- if (answers.tokenType) {
1372
- provider.tokenType = answers.tokenType; // 仅在 authMode 为 'api_key' 时使用
1373
- }
1374
-
1375
- // 更新模型配置
1376
- if (!provider.models) {
1377
- provider.models = {};
1378
- }
1379
- provider.models.primary = answers.primaryModel || null;
1380
- provider.models.smallFast = answers.smallFastModel || null;
1381
-
1382
- await this.configManager.save();
1383
- Logger.success(`供应商 '${newName}' 已更新`);
1384
-
1385
- // 移除 ESC 键监听
1386
- this.removeESCListener(escListener);
1387
- return await this.showManageMenu();
1388
-
1389
- } catch (error) {
1390
- // 移除 ESC 键监听
1391
- this.removeESCListener(escListener);
1392
- Logger.error(`编辑供应商失败: ${error.message}`);
1393
- throw error;
1394
- }
948
+ return this.providerManager.editProvider(providerName, () => this.showManageMenu());
1395
949
  }
1396
950
 
1397
951
  async removeProvider(providerName) {
1398
- let escListener;
1399
- try {
1400
- await this.configManager.load();
1401
- const provider = this.configManager.getProvider(providerName);
1402
- this.clearScreen();
1403
-
1404
- if (!provider) {
1405
- Logger.error(`供应商 '${providerName}' 不存在`);
1406
- return await this.showManageMenu();
1407
- }
1408
-
1409
- // 设置 ESC 键监听
1410
- escListener = this.createESCListener(() => {
1411
- Logger.info('取消删除供应商');
1412
- this.showManageMenu();
1413
- }, '取消删除');
1414
-
1415
- let confirm;
1416
- try {
1417
- confirm = await this.prompt([
1418
- {
1419
- type: 'confirm',
1420
- name: 'confirmed',
1421
- message: `确定要删除供应商 '${providerName}' 吗?`,
1422
- default: false
1423
- }
1424
- ]);
1425
- } catch (error) {
1426
- this.removeESCListener(escListener);
1427
- if (this.isEscCancelled(error)) {
1428
- return;
1429
- }
1430
- throw error;
1431
- }
1432
-
1433
- if (confirm.confirmed) {
1434
- await this.configManager.removeProvider(providerName);
1435
- Logger.success(`供应商 '${providerName}' 已删除`);
1436
- } else {
1437
- Logger.info('删除操作已取消');
1438
- }
1439
-
1440
- // 移除 ESC 键监听
1441
- this.removeESCListener(escListener);
1442
- return await this.showManageMenu();
1443
-
1444
- } catch (error) {
1445
- // 移除 ESC 键监听
1446
- this.removeESCListener(escListener);
1447
- Logger.error(`删除供应商失败: ${error.message}`);
1448
- throw error;
1449
- }
952
+ return this.providerManager.removeProvider(providerName, () => this.showManageMenu());
1450
953
  }
1451
954
  }
1452
955
 
1453
- async function switchCommand(providerName) {
956
+ async function switchCommand(providerName, options = {}) {
1454
957
  const switcher = new EnvSwitcher();
1455
-
958
+ switcher.filter = options.filter || null;
959
+
1456
960
  try {
1457
961
  if (providerName) {
1458
- await switcher.showLaunchArgsSelection(providerName);
962
+ // 如果指定了 quick 或 noArgs 选项,直接启动
963
+ if (options.quick || options.noArgs) {
964
+ await switcher.quickLaunchProvider(providerName, options);
965
+ } else {
966
+ await switcher.showLaunchArgsSelection(providerName);
967
+ }
1459
968
  } else {
1460
969
  await switcher.showProviderSelection();
1461
970
  }
@@ -1467,9 +976,13 @@ async function switchCommand(providerName) {
1467
976
 
1468
977
  async function editCommand(providerName) {
1469
978
  const switcher = new EnvSwitcher();
1470
-
979
+
1471
980
  try {
1472
- await switcher.editProvider(providerName);
981
+ if (providerName) {
982
+ await switcher.editProvider(providerName);
983
+ } else {
984
+ await switcher.showManageMenu();
985
+ }
1473
986
  } finally {
1474
987
  // 确保资源清理
1475
988
  switcher.destroy();