@pikecode/api-key-manager 1.3.4 → 1.3.7

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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pikecode/api-key-manager",
3
- "version": "1.3.4",
3
+ "version": "1.3.7",
4
4
  "description": "A CLI tool for managing and switching multiple API provider configurations",
5
5
  "main": "src/index.js",
6
6
  "bin": {
@@ -0,0 +1,215 @@
1
+ /**
2
+ * Provider Manager
3
+ * 供应商管理功能(详情、编辑、删除)
4
+ */
5
+
6
+ const { configManager } = require('../../config');
7
+ const { Logger } = require('../../utils/logger');
8
+ const { UIHelper } = require('../../utils/ui-helper');
9
+ const { AUTH_MODE_DISPLAY, BASE_URL } = require('../../constants');
10
+ const { ProviderDetailsHelper } = require('./provider-details-helper');
11
+ const { ProviderEditQuestionsHelper } = require('./provider-edit-questions-helper');
12
+ const { validator } = require('../../utils/validator');
13
+
14
+ class ProviderManager {
15
+ constructor(baseCommand) {
16
+ this.baseCommand = baseCommand;
17
+ this.configManager = configManager;
18
+ }
19
+
20
+ async showProviderDetails(providerName, onBack, onEdit, onRemove, onLaunch) {
21
+ try {
22
+ await this.configManager.load();
23
+ const provider = this.configManager.getProvider(providerName);
24
+
25
+ if (!provider) {
26
+ Logger.error(`供应商 '${providerName}' 不存在`);
27
+ return await onBack();
28
+ }
29
+
30
+ this.baseCommand.clearScreen();
31
+ console.log(UIHelper.createTitle('供应商详情', UIHelper.icons.info));
32
+ console.log();
33
+ console.log(UIHelper.createHintLine([
34
+ ['↑ / ↓', '选择操作'],
35
+ ['Enter', '确认'],
36
+ ['ESC', '返回管理列表']
37
+ ]));
38
+ console.log();
39
+
40
+ const details = ProviderDetailsHelper.buildDetailsRows(provider, {
41
+ authModeDisplay: AUTH_MODE_DISPLAY,
42
+ baseUrl: BASE_URL,
43
+ formatTime: UIHelper.formatTime
44
+ });
45
+
46
+ console.log(UIHelper.createTable(['项目', '信息'], details));
47
+ console.log();
48
+
49
+ const launchArgsText = ProviderDetailsHelper.formatLaunchArgs(provider);
50
+ if (launchArgsText) {
51
+ console.log(UIHelper.createCard('默认启动参数', launchArgsText, UIHelper.icons.settings));
52
+ console.log();
53
+ }
54
+
55
+ const answer = await this.baseCommand.promptWithESC([
56
+ {
57
+ type: 'list',
58
+ name: 'action',
59
+ message: '选择操作:',
60
+ choices: ProviderDetailsHelper.buildActionChoices(UIHelper.icons)
61
+ }
62
+ ], '返回管理列表', () => {
63
+ Logger.info('返回管理列表');
64
+ });
65
+
66
+ switch (answer.action) {
67
+ case 'back':
68
+ return await onBack();
69
+ case 'edit':
70
+ return await onEdit(providerName);
71
+ case 'remove':
72
+ return await onRemove(providerName);
73
+ case 'launch':
74
+ return await onLaunch(providerName);
75
+ }
76
+ } catch (error) {
77
+ if (this.baseCommand.isEscCancelled(error)) {
78
+ return await onBack();
79
+ }
80
+ throw error;
81
+ }
82
+ }
83
+
84
+ async editProvider(providerName, onComplete) {
85
+ try {
86
+ await this.configManager.load();
87
+ let provider = this.configManager.getProvider(providerName);
88
+
89
+ if (!provider) {
90
+ Logger.error(`供应商 '${providerName}' 不存在`);
91
+ return await onComplete();
92
+ }
93
+
94
+ this.baseCommand.clearScreen();
95
+ console.log(UIHelper.createTitle(`编辑供应商: ${provider.displayName || provider.name}`, UIHelper.icons.edit));
96
+ console.log();
97
+
98
+ const isCodex = provider.ideName === 'codex';
99
+ const questions = ProviderEditQuestionsHelper.buildQuestions(provider, validator);
100
+
101
+ let answers;
102
+ try {
103
+ answers = await this.baseCommand.promptWithESC(questions, '取消编辑', () => {
104
+ Logger.info('取消编辑供应商');
105
+ });
106
+ } catch (error) {
107
+ if (this.baseCommand.isEscCancelled(error)) {
108
+ return await onComplete();
109
+ }
110
+ throw error;
111
+ }
112
+
113
+ const originalName = provider.name;
114
+ const newName = answers.name;
115
+
116
+ // 处理重命名逻辑
117
+ if (newName !== originalName) {
118
+ await this.configManager.ensureLoaded();
119
+ const providersMap = this.configManager.config.providers;
120
+
121
+ if (providersMap[newName]) {
122
+ Logger.error(`供应商名称 '${newName}' 已存在,请使用其他名称`);
123
+ return await onComplete();
124
+ }
125
+
126
+ providersMap[newName] = {
127
+ ...provider,
128
+ name: newName
129
+ };
130
+
131
+ delete providersMap[originalName];
132
+
133
+ if (this.configManager.config.currentProvider === originalName) {
134
+ this.configManager.config.currentProvider = newName;
135
+ providersMap[newName].current = true;
136
+ }
137
+
138
+ provider = providersMap[newName];
139
+ }
140
+
141
+ // 更新供应商配置
142
+ provider.displayName = newName;
143
+ provider.baseUrl = answers.baseUrl;
144
+ provider.authToken = answers.authToken;
145
+
146
+ if (!isCodex) {
147
+ provider.authMode = answers.authMode;
148
+
149
+ if (!provider.models) {
150
+ provider.models = {};
151
+ }
152
+ provider.models.primary = answers.primaryModel || null;
153
+ provider.models.smallFast = answers.smallFastModel || null;
154
+ } else {
155
+ provider.authMode = null;
156
+ provider.models = null;
157
+ }
158
+
159
+ provider.ideName = isCodex ? 'codex' : 'claude';
160
+
161
+ await this.configManager.save();
162
+ Logger.success(`供应商 '${newName}' 已更新`);
163
+
164
+ return await onComplete();
165
+ } catch (error) {
166
+ Logger.error(`编辑供应商失败: ${error.message}`);
167
+ throw error;
168
+ }
169
+ }
170
+
171
+ async removeProvider(providerName, onComplete) {
172
+ try {
173
+ await this.configManager.load();
174
+ const provider = this.configManager.getProvider(providerName);
175
+
176
+ if (!provider) {
177
+ Logger.error(`供应商 '${providerName}' 不存在`);
178
+ return await onComplete();
179
+ }
180
+
181
+ let confirm;
182
+ try {
183
+ confirm = await this.baseCommand.promptWithESC([
184
+ {
185
+ type: 'confirm',
186
+ name: 'confirmed',
187
+ message: `确定要删除供应商 '${provider.displayName || providerName}' 吗?`,
188
+ default: false
189
+ }
190
+ ], '取消删除', () => {
191
+ Logger.info('取消删除供应商');
192
+ });
193
+ } catch (error) {
194
+ if (this.baseCommand.isEscCancelled(error)) {
195
+ return await onComplete();
196
+ }
197
+ throw error;
198
+ }
199
+
200
+ if (confirm.confirmed) {
201
+ await this.configManager.removeProvider(providerName);
202
+ Logger.success(`供应商 '${providerName}' 已删除`);
203
+ } else {
204
+ Logger.info('删除操作已取消');
205
+ }
206
+
207
+ return await onComplete();
208
+ } catch (error) {
209
+ Logger.error(`删除供应商失败: ${error.message}`);
210
+ throw error;
211
+ }
212
+ }
213
+ }
214
+
215
+ module.exports = { ProviderManager };
@@ -0,0 +1,77 @@
1
+ /**
2
+ * UI Screen Renderer
3
+ * 通用界面渲染工具,减少重复代码
4
+ */
5
+
6
+ const { UIHelper } = require('../utils/ui-helper');
7
+
8
+ class UIScreenRenderer {
9
+ constructor(baseCommand) {
10
+ this.baseCommand = baseCommand;
11
+ }
12
+
13
+ /**
14
+ * 渲染标准页面(标题+内容+操作提示)
15
+ */
16
+ renderPage(options) {
17
+ const { title, icon, hints, content } = options;
18
+
19
+ this.baseCommand.clearScreen();
20
+
21
+ if (title) {
22
+ console.log(UIHelper.createTitle(title, icon || UIHelper.icons.info));
23
+ console.log();
24
+ }
25
+
26
+ if (hints) {
27
+ console.log(UIHelper.createHintLine(hints));
28
+ console.log();
29
+ }
30
+
31
+ if (content) {
32
+ if (typeof content === 'function') {
33
+ content();
34
+ } else {
35
+ console.log(content);
36
+ }
37
+ console.log();
38
+ }
39
+ }
40
+
41
+ /**
42
+ * 渲染带卡片的页面
43
+ */
44
+ renderCardPage(options) {
45
+ const { title, icon, cardTitle, cardContent, cardIcon, hints } = options;
46
+
47
+ this.baseCommand.clearScreen();
48
+
49
+ if (title) {
50
+ console.log(UIHelper.createTitle(title, icon || UIHelper.icons.info));
51
+ console.log();
52
+ }
53
+
54
+ if (cardTitle) {
55
+ console.log(UIHelper.createCard(cardTitle, cardContent, cardIcon));
56
+ console.log();
57
+ }
58
+
59
+ if (hints) {
60
+ console.log(UIHelper.createHintLine(hints));
61
+ console.log();
62
+ }
63
+ }
64
+
65
+ /**
66
+ * 渲染简单的确认页面
67
+ */
68
+ renderConfirmPage(title, message, icon) {
69
+ this.renderPage({
70
+ title,
71
+ icon: icon || UIHelper.icons.warning,
72
+ content: message
73
+ });
74
+ }
75
+ }
76
+
77
+ module.exports = { UIScreenRenderer };
@@ -21,6 +21,7 @@ const { ProviderDetailsHelper } = require('./switch/provider-details-helper');
21
21
  const { ProviderEditQuestionsHelper } = require('./switch/provider-edit-questions-helper');
22
22
  const { ensureClaudeSettingsCompatibility } = require('./switch/claude-settings-compatibility');
23
23
  const { launchProviderProcess, markProviderAsCurrent } = require('./switch/provider-launcher');
24
+ const { ProviderManager } = require('./switch/provider-manager');
24
25
 
25
26
  /**
26
27
  * 环境切换器类
@@ -38,6 +39,32 @@ class EnvSwitcher extends BaseCommand {
38
39
  this.filter = null;
39
40
  this.filteredProviders = null;
40
41
  this._refreshTimer = null;
42
+ this.providerManager = new ProviderManager(this);
43
+ }
44
+
45
+ _renderPage(options) {
46
+ const { title, icon, hints, content } = options;
47
+
48
+ this.clearScreen();
49
+
50
+ if (title) {
51
+ console.log(UIHelper.createTitle(title, icon || UIHelper.icons.info));
52
+ console.log();
53
+ }
54
+
55
+ if (hints) {
56
+ console.log(UIHelper.createHintLine(hints));
57
+ console.log();
58
+ }
59
+
60
+ if (content) {
61
+ if (typeof content === 'function') {
62
+ content();
63
+ } else {
64
+ console.log(content);
65
+ }
66
+ console.log();
67
+ }
41
68
  }
42
69
 
43
70
  _getPageSize(itemCount) {
@@ -69,7 +96,6 @@ class EnvSwitcher extends BaseCommand {
69
96
  const isCodex = provider.ideName === 'codex';
70
97
  const availableArgs = LaunchArgsHelper.getAvailableLaunchArgs(isCodex);
71
98
 
72
- // 优先使用上次使用的参数,如果没有则使用默认的 launchArgs
73
99
  const defaultLaunchArgs = Array.isArray(provider.lastUsedArgs) && provider.lastUsedArgs.length > 0
74
100
  ? provider.lastUsedArgs
75
101
  : (Array.isArray(provider.launchArgs) ? provider.launchArgs : []);
@@ -77,18 +103,18 @@ class EnvSwitcher extends BaseCommand {
77
103
  const mergedArgs = LaunchArgsHelper.mergeArgsWithDefaults(availableArgs, defaultLaunchArgs);
78
104
  const ideDisplayName = LaunchArgsHelper.getIDEDisplayName(isCodex);
79
105
 
80
- console.log(UIHelper.createTitle('启动配置', UIHelper.icons.launch));
81
- console.log();
82
- console.log(UIHelper.createCard('供应商', UIHelper.formatProvider(provider), UIHelper.icons.info));
83
- console.log();
84
- console.log(UIHelper.createHintLine([
85
- ['空格', '切换选中'],
86
- ['A', '全选'],
87
- ['I', '反选'],
88
- ['Enter', `启动 ${ideDisplayName}`],
89
- ['ESC', '返回供应商选择']
90
- ]));
91
- console.log();
106
+ this._renderPage({
107
+ title: '启动配置',
108
+ icon: UIHelper.icons.launch,
109
+ hints: [
110
+ ['空格', '切换选中'],
111
+ ['A', '全选'],
112
+ ['I', '反选'],
113
+ ['Enter', `启动 ${ideDisplayName}`],
114
+ ['ESC', '返回供应商选择']
115
+ ],
116
+ content: () => console.log(UIHelper.createCard('供应商', UIHelper.formatProvider(provider), UIHelper.icons.info))
117
+ });
92
118
 
93
119
  // 显示启动参数选择界面
94
120
  const choices = [
@@ -104,11 +130,10 @@ class EnvSwitcher extends BaseCommand {
104
130
  try {
105
131
  answers = await this.promptWithESC(choices, '返回供应商选择', () => {
106
132
  Logger.info('返回供应商选择');
107
- this.showProviderSelection();
108
133
  });
109
134
  } catch (error) {
110
135
  if (this.isEscCancelled(error)) {
111
- return;
136
+ return await this.showProviderSelection();
112
137
  }
113
138
  throw error;
114
139
  }
@@ -171,13 +196,6 @@ class EnvSwitcher extends BaseCommand {
171
196
  }
172
197
  }
173
198
 
174
- /**
175
- * 快速启动供应商(跳过参数选择)
176
- * @param {string} providerName - 供应商名称
177
- * @param {Object} options - 启动选项
178
- * @param {boolean} options.quick - 使用上次的启动参数
179
- * @param {boolean} options.noArgs - 不使用任何启动参数
180
- */
181
199
  /**
182
200
  * 快速启动供应商(跳过参数选择)
183
201
  * @param {string} providerName - 供应商名称或别名
@@ -202,19 +220,17 @@ class EnvSwitcher extends BaseCommand {
202
220
  // 确定使用的启动参数
203
221
  let selectedArgs;
204
222
  if (options.noArgs) {
205
- // 使用空参数
206
223
  selectedArgs = [];
207
- console.log(UIHelper.colors.muted('💡 使用空参数启动'));
224
+ Logger.info('使用空参数启动');
208
225
  } else if (options.quick) {
209
- // 使用上次的启动参数或默认参数
210
226
  selectedArgs = Array.isArray(provider.lastUsedArgs) && provider.lastUsedArgs.length > 0
211
227
  ? provider.lastUsedArgs
212
228
  : (Array.isArray(provider.launchArgs) ? provider.launchArgs : []);
213
229
 
214
230
  if (Array.isArray(provider.lastUsedArgs) && provider.lastUsedArgs.length > 0) {
215
- console.log(UIHelper.colors.muted('💡 使用上次的启动参数: ' + selectedArgs.join(' ')));
231
+ Logger.info('使用上次的启动参数: ' + selectedArgs.join(' '));
216
232
  } else {
217
- console.log(UIHelper.colors.muted('💡 使用默认启动参数: ' + (selectedArgs.length > 0 ? selectedArgs.join(' ') : '(无)')));
233
+ Logger.info('使用默认启动参数: ' + (selectedArgs.length > 0 ? selectedArgs.join(' ') : '(无)'));
218
234
  }
219
235
  }
220
236
 
@@ -271,6 +287,8 @@ class EnvSwitcher extends BaseCommand {
271
287
  { name: `${UIHelper.icons.add} 添加新供应商`, value: '__ADD__' },
272
288
  { name: `${UIHelper.icons.list} 供应商管理 (编辑/删除)`, value: '__MANAGE__' },
273
289
  { name: `${UIHelper.icons.config} 打开配置文件`, value: '__OPEN_CONFIG__' },
290
+ { name: `${UIHelper.icons.settings} 快速设置`, value: '__QUICK_SETTINGS__' },
291
+ { name: `${UIHelper.icons.info} 帮助`, value: '__HELP__' },
274
292
  { name: `${UIHelper.icons.error} 退出`, value: '__EXIT__' }
275
293
  );
276
294
 
@@ -352,12 +370,16 @@ class EnvSwitcher extends BaseCommand {
352
370
 
353
371
  async handleSelection(selection) {
354
372
  switch (selection) {
355
- case '__ADD__':
356
- // 使用CommandRegistry避免循环引用
373
+ case '__ADD__': {
357
374
  const { registry } = require('../CommandRegistry');
358
375
  return await registry.executeCommand('add');
376
+ }
359
377
  case '__MANAGE__':
360
378
  return await this.showManageMenu();
379
+ case '__QUICK_SETTINGS__':
380
+ return await this.showQuickSettings();
381
+ case '__HELP__':
382
+ return await this.showHelp();
361
383
  case '__EXIT__':
362
384
  this.showExitScreen();
363
385
  this.destroy();
@@ -368,13 +390,15 @@ class EnvSwitcher extends BaseCommand {
368
390
  }
369
391
 
370
392
  async showQuickSettings() {
371
- this.clearScreen();
372
- console.log(UIHelper.createHintLine([
373
- ['↑ / ↓', '选择项目'],
374
- ['Enter', '确认'],
375
- ['ESC', '返回主菜单']
376
- ]));
377
- console.log();
393
+ this._renderPage({
394
+ title: '快速设置',
395
+ icon: UIHelper.icons.settings,
396
+ hints: [
397
+ ['↑ / ↓', '选择项目'],
398
+ ['Enter', '确认'],
399
+ ['ESC', '返回主菜单']
400
+ ]
401
+ });
378
402
  const choices = [
379
403
  { name: `${UIHelper.icons.search} 搜索供应商`, value: 'search' },
380
404
  { name: `${UIHelper.icons.info} 查看统计`, value: 'stats' },
@@ -391,13 +415,10 @@ class EnvSwitcher extends BaseCommand {
391
415
  choices,
392
416
  pageSize: 8
393
417
  }
394
- ], '返回供应商选择', () => {
395
- Logger.info('返回供应商选择');
396
- this.showProviderSelection();
397
- });
418
+ ], '返回主菜单', () => {});
398
419
  } catch (error) {
399
420
  if (this.isEscCancelled(error)) {
400
- return;
421
+ return await this.showProviderSelection();
401
422
  }
402
423
  throw error;
403
424
  }
@@ -431,24 +452,47 @@ class EnvSwitcher extends BaseCommand {
431
452
  }
432
453
  ], '返回快速设置', () => {
433
454
  Logger.info('返回快速设置');
434
- this.showQuickSettings();
435
455
  });
436
456
  } catch (error) {
437
457
  if (this.isEscCancelled(error)) {
438
- return;
458
+ return await this.showQuickSettings();
439
459
  }
440
460
  throw error;
441
461
  }
442
462
 
443
463
  await this.configManager.load();
444
464
  const providers = this.configManager.listProviders();
445
- const searchResults = providers.filter(p =>
446
- p.name.toLowerCase().includes(answer.search.toLowerCase()) ||
447
- p.displayName.toLowerCase().includes(answer.search.toLowerCase())
448
- );
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 && p.alias.toLowerCase().includes(q));
470
+ });
449
471
 
450
472
  if (searchResults.length === 0) {
451
- Logger.warning(`未找到匹配"${answer.search}"的供应商,请重新搜索`);
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
+ }
452
496
  return await this.showSearchProvider();
453
497
  }
454
498
 
@@ -482,11 +526,10 @@ class EnvSwitcher extends BaseCommand {
482
526
  }
483
527
  ], '返回快速设置', () => {
484
528
  Logger.info('返回快速设置');
485
- this.showQuickSettings();
486
529
  });
487
530
  } catch (error) {
488
531
  if (this.isEscCancelled(error)) {
489
- return;
532
+ return await this.showQuickSettings();
490
533
  }
491
534
  throw error;
492
535
  }
@@ -506,7 +549,9 @@ class EnvSwitcher extends BaseCommand {
506
549
  const totalProviders = providers.length;
507
550
  const currentProvider = providers.find(p => p.current);
508
551
  const totalUsage = providers.reduce((sum, p) => sum + (p.usageCount || 0), 0);
509
- 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;
510
555
 
511
556
  console.log(UIHelper.createTitle('使用统计', UIHelper.icons.info));
512
557
  console.log();
@@ -531,11 +576,10 @@ class EnvSwitcher extends BaseCommand {
531
576
  }
532
577
  ], '返回快速设置', () => {
533
578
  Logger.info('返回快速设置');
534
- this.showQuickSettings();
535
579
  });
536
580
  } catch (error) {
537
581
  if (this.isEscCancelled(error)) {
538
- return;
582
+ return await this.showQuickSettings();
539
583
  }
540
584
  throw error;
541
585
  }
@@ -544,17 +588,18 @@ class EnvSwitcher extends BaseCommand {
544
588
  }
545
589
 
546
590
  showExitScreen() {
547
- this.clearScreen();
548
- console.log(UIHelper.createTitle('感谢使用', UIHelper.icons.home));
549
- console.log();
550
- console.log(UIHelper.colors.info('再见!期待下次使用 🎉'));
551
- console.log();
591
+ this._renderPage({
592
+ title: '感谢使用',
593
+ icon: UIHelper.icons.home,
594
+ content: UIHelper.colors.info('再见!期待下次使用 🎉')
595
+ });
552
596
  }
553
597
 
554
598
  async showHelp() {
555
- this.clearScreen();
556
- console.log(UIHelper.createTitle('快捷键帮助', UIHelper.icons.info));
557
- console.log();
599
+ this._renderPage({
600
+ title: '快捷键帮助',
601
+ icon: UIHelper.icons.info
602
+ });
558
603
 
559
604
  const sections = [
560
605
  {
@@ -598,11 +643,10 @@ class EnvSwitcher extends BaseCommand {
598
643
  }
599
644
  ], '返回主菜单', () => {
600
645
  Logger.info('返回主菜单');
601
- this.showProviderSelection();
602
646
  });
603
647
  } catch (error) {
604
648
  if (this.isEscCancelled(error)) {
605
- return;
649
+ return await this.showProviderSelection();
606
650
  }
607
651
  throw error;
608
652
  }
@@ -611,58 +655,56 @@ class EnvSwitcher extends BaseCommand {
611
655
  }
612
656
 
613
657
  async showManageMenu() {
614
- let escListener;
615
658
  try {
616
659
  await this.configManager.load();
617
- const providers = this.configManager.listProviders();
618
- this.clearScreen();
619
- console.log(UIHelper.createHintLine([
620
- ['↑ / ↓', '选择供应商或操作'],
621
- ['Enter', '确认'],
622
- ['ESC', '返回主菜单']
623
- ]));
624
- console.log();
625
-
626
- console.log(UIHelper.createTitle('供应商管理', UIHelper.icons.list));
627
- console.log();
660
+ let providers = this.configManager.listProviders();
628
661
 
629
662
  if (providers.length === 0) {
630
- console.log(UIHelper.createCard('提示', '暂无配置的供应商\n请先运行 "akm add" 添加供应商配置', UIHelper.icons.warning));
663
+ Logger.warning('暂无配置的供应商');
664
+ Logger.info('请先运行 "akm add" 添加供应商配置');
631
665
  return await this.showProviderSelection();
632
666
  }
633
667
 
634
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
+
635
688
  const choices = this.createProviderChoices(providers, true, statusMap);
636
689
 
637
690
  this.currentPromptContext = 'manage';
638
- // 管理界面显示所有供应商,更新 filteredProviders 以保持一致
639
691
  this.filteredProviders = providers;
640
692
 
641
693
  if (providers.length > 0) {
642
694
  this._startStatusRefresh(providers);
643
695
  }
644
696
 
645
- // 设置 ESC 键监听
646
- let answer;
647
- try {
648
- answer = await this.promptWithESC([
649
- {
650
- type: 'list',
651
- name: 'action',
652
- message: `选择供应商或操作 (总计 ${providers.length} 个):`,
653
- choices,
654
- pageSize: this._getPageSize(choices.length)
655
- }
656
- ], '返回供应商选择', () => {
657
- Logger.info('返回供应商选择');
658
- this.showProviderSelection();
659
- });
660
- } catch (error) {
661
- if (this.isEscCancelled(error)) {
662
- 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)
663
704
  }
664
- throw error;
665
- }
705
+ ], '返回供应商选择', () => {
706
+ Logger.info('返回供应商选择');
707
+ });
666
708
 
667
709
  this._cancelStatusRefresh();
668
710
 
@@ -671,6 +713,9 @@ class EnvSwitcher extends BaseCommand {
671
713
  return result;
672
714
 
673
715
  } catch (error) {
716
+ if (this.isEscCancelled(error)) {
717
+ return await this.showProviderSelection();
718
+ }
674
719
  await this.handleError(error, '显示供应商管理');
675
720
  } finally {
676
721
  if (this.currentPromptContext === 'manage') {
@@ -795,7 +840,19 @@ class EnvSwitcher extends BaseCommand {
795
840
 
796
841
  _refreshPromptChoices(activePrompt, providers, statusMap, options = {}) {
797
842
  const includeActions = this.currentPromptContext === 'manage';
798
- const updatedChoicesBase = this.createProviderChoices(providers, includeActions, statusMap);
843
+
844
+ let sortedProviders = providers;
845
+ if (includeActions) {
846
+ const stateOrder = { online: 0, degraded: 1, pending: 2, offline: 3 };
847
+ sortedProviders = [...providers].sort((a, b) => {
848
+ const stateA = statusMap[a.name]?.state || 'pending';
849
+ const stateB = statusMap[b.name]?.state || 'pending';
850
+ return (stateOrder[stateA] ?? 2) - (stateOrder[stateB] ?? 2);
851
+ });
852
+ this.filteredProviders = sortedProviders;
853
+ }
854
+
855
+ const updatedChoicesBase = this.createProviderChoices(sortedProviders, includeActions, statusMap);
799
856
  const updatedChoices = [...updatedChoicesBase];
800
857
 
801
858
  if (!includeActions) {
@@ -804,6 +861,8 @@ class EnvSwitcher extends BaseCommand {
804
861
  { name: `${UIHelper.icons.add} 添加新供应商`, value: '__ADD__' },
805
862
  { name: `${UIHelper.icons.list} 供应商管理 (编辑/删除)`, value: '__MANAGE__' },
806
863
  { name: `${UIHelper.icons.config} 打开配置文件`, value: '__OPEN_CONFIG__' },
864
+ { name: `${UIHelper.icons.settings} 快速设置`, value: '__QUICK_SETTINGS__' },
865
+ { name: `${UIHelper.icons.info} 帮助`, value: '__HELP__' },
807
866
  { name: `${UIHelper.icons.error} 退出`, value: '__EXIT__' }
808
867
  );
809
868
  }
@@ -842,7 +901,8 @@ class EnvSwitcher extends BaseCommand {
842
901
  _buildStatusPromptMessage(providerCount, hasError = false) {
843
902
  const errorSuffix = hasError ? ',状态检测失败,使用默认配置' : '';
844
903
  if (this.currentPromptContext === 'selection') {
845
- return `请选择要切换的供应商 (总计 ${providerCount} 个${errorSuffix}):`;
904
+ const filterSuffix = this.filter === 'codex' ? ' (Codex CLI)' : (this.filter === 'claude' ? ' (Claude Code)' : '');
905
+ return `请选择要切换的供应商${filterSuffix} (总计 ${providerCount} 个${errorSuffix}):`;
846
906
  }
847
907
  if (this.currentPromptContext === 'manage') {
848
908
  return `选择供应商或操作 (总计 ${providerCount} 个${errorSuffix}):`;
@@ -855,7 +915,7 @@ class EnvSwitcher extends BaseCommand {
855
915
  case 'back':
856
916
  return await this.showProviderSelection();
857
917
  case 'exit':
858
- Logger.info('👋 再见!');
918
+ this.showExitScreen();
859
919
  this.destroy();
860
920
  process.exit(0);
861
921
  default:
@@ -865,207 +925,21 @@ class EnvSwitcher extends BaseCommand {
865
925
  }
866
926
 
867
927
  async showProviderDetails(providerName) {
868
- let escListener;
869
- try {
870
- const provider = await this.validateProvider(providerName);
871
- this.clearScreen();
872
-
873
- console.log(UIHelper.createTitle('供应商详情', UIHelper.icons.info));
874
- console.log();
875
- console.log(UIHelper.createHintLine([
876
- ['↑ / ↓', '选择操作'],
877
- ['Enter', '确认'],
878
- ['ESC', '返回管理列表']
879
- ]));
880
- console.log();
881
-
882
- const details = ProviderDetailsHelper.buildDetailsRows(provider, {
883
- authModeDisplay: AUTH_MODE_DISPLAY,
884
- baseUrl: BASE_URL,
885
- formatTime: UIHelper.formatTime
886
- });
887
-
888
- console.log(UIHelper.createTable(['项目', '信息'], details));
889
- console.log();
890
-
891
- const launchArgsText = ProviderDetailsHelper.formatLaunchArgs(provider);
892
- if (launchArgsText) {
893
- console.log(UIHelper.createCard('默认启动参数', launchArgsText, UIHelper.icons.settings));
894
- console.log();
895
- }
896
-
897
- let answer;
898
- try {
899
- answer = await this.promptWithESC([
900
- {
901
- type: 'list',
902
- name: 'action',
903
- message: '选择操作:',
904
- choices: ProviderDetailsHelper.buildActionChoices(UIHelper.icons)
905
- }
906
- ], '返回管理列表', () => {
907
- Logger.info('返回管理列表');
908
- this.showManageMenu();
909
- });
910
- } catch (error) {
911
- if (this.isEscCancelled(error)) {
912
- return;
913
- }
914
- throw error;
915
- }
916
-
917
- switch (answer.action) {
918
- case 'back':
919
- return await this.showManageMenu();
920
- case 'edit':
921
- return await this.editProvider(providerName);
922
- case 'remove':
923
- return await this.removeProvider(providerName);
924
- case 'launch':
925
- return await this.showLaunchArgsSelection(providerName);
926
- }
927
-
928
- } catch (error) {
929
- await this.handleError(error, '显示供应商详情');
930
- }
928
+ return this.providerManager.showProviderDetails(
929
+ providerName,
930
+ () => this.showManageMenu(),
931
+ (name) => this.editProvider(name),
932
+ (name) => this.removeProvider(name),
933
+ (name) => this.showLaunchArgsSelection(name)
934
+ );
931
935
  }
932
936
 
933
937
  async editProvider(providerName) {
934
- try {
935
- await this.configManager.load();
936
- let provider = this.configManager.getProvider(providerName);
937
- this.clearScreen();
938
-
939
- if (!provider) {
940
- Logger.error(`供应商 '${providerName}' 不存在`);
941
- return await this.showManageMenu();
942
- }
943
-
944
- // 根据 IDE 类型构建不同的问卷
945
- const isCodex = provider.ideName === 'codex';
946
- const questions = ProviderEditQuestionsHelper.buildQuestions(provider, validator);
947
-
948
- let answers;
949
- try {
950
- answers = await this.promptWithESC(questions, '取消编辑', () => {
951
- Logger.info('取消编辑供应商');
952
- this.showManageMenu();
953
- });
954
- } catch (error) {
955
- if (this.isEscCancelled(error)) {
956
- return;
957
- }
958
- throw error;
959
- }
960
-
961
- const originalName = provider.name;
962
- const newName = answers.name;
963
-
964
- // 处理重命名逻辑
965
- if (newName !== originalName) {
966
- await this.configManager.ensureLoaded();
967
- const providersMap = this.configManager.config.providers;
968
-
969
- // 如果新名称已存在且不是当前供应商,则报错
970
- if (providersMap[newName]) {
971
- Logger.error(`供应商名称 '${newName}' 已存在,请使用其他名称`);
972
- return await this.showManageMenu();
973
- }
974
-
975
- providersMap[newName] = {
976
- ...provider,
977
- name: newName
978
- };
979
-
980
- delete providersMap[originalName];
981
-
982
- if (this.configManager.config.currentProvider === originalName) {
983
- this.configManager.config.currentProvider = newName;
984
- providersMap[newName].current = true;
985
- }
986
-
987
- provider = providersMap[newName];
988
- }
989
-
990
- // 更新供应商配置
991
- provider.displayName = newName;
992
- provider.baseUrl = answers.baseUrl;
993
- provider.authToken = answers.authToken;
994
-
995
- // Claude Code 特定的更新
996
- if (!isCodex) {
997
- provider.authMode = answers.authMode;
998
-
999
- // 更新模型配置
1000
- if (!provider.models) {
1001
- provider.models = {};
1002
- }
1003
- provider.models.primary = answers.primaryModel || null;
1004
- provider.models.smallFast = answers.smallFastModel || null;
1005
- } else {
1006
- // 确保 Codex 配置不包含 Claude 特定字段
1007
- provider.authMode = null;
1008
- provider.models = null;
1009
- }
1010
-
1011
- // 确保 ideName 不被改变
1012
- provider.ideName = isCodex ? 'codex' : 'claude';
1013
-
1014
- await this.configManager.save();
1015
- Logger.success(`供应商 '${newName}' 已更新`);
1016
-
1017
- return await this.showManageMenu();
1018
-
1019
- } catch (error) {
1020
- Logger.error(`编辑供应商失败: ${error.message}`);
1021
- throw error;
1022
- }
938
+ return this.providerManager.editProvider(providerName, () => this.showManageMenu());
1023
939
  }
1024
940
 
1025
941
  async removeProvider(providerName) {
1026
- try {
1027
- await this.configManager.load();
1028
- const provider = this.configManager.getProvider(providerName);
1029
- this.clearScreen();
1030
-
1031
- if (!provider) {
1032
- Logger.error(`供应商 '${providerName}' 不存在`);
1033
- return await this.showManageMenu();
1034
- }
1035
-
1036
- let confirm;
1037
- try {
1038
- confirm = await this.promptWithESC([
1039
- {
1040
- type: 'confirm',
1041
- name: 'confirmed',
1042
- message: `确定要删除供应商 '${providerName}' 吗?`,
1043
- default: false
1044
- }
1045
- ], '取消删除', () => {
1046
- Logger.info('取消删除供应商');
1047
- this.showManageMenu();
1048
- });
1049
- } catch (error) {
1050
- if (this.isEscCancelled(error)) {
1051
- return;
1052
- }
1053
- throw error;
1054
- }
1055
-
1056
- if (confirm.confirmed) {
1057
- await this.configManager.removeProvider(providerName);
1058
- Logger.success(`供应商 '${providerName}' 已删除`);
1059
- } else {
1060
- Logger.info('删除操作已取消');
1061
- }
1062
-
1063
- return await this.showManageMenu();
1064
-
1065
- } catch (error) {
1066
- Logger.error(`删除供应商失败: ${error.message}`);
1067
- throw error;
1068
- }
942
+ return this.providerManager.removeProvider(providerName, () => this.showManageMenu());
1069
943
  }
1070
944
  }
1071
945
 
@@ -84,18 +84,26 @@ class UIHelper {
84
84
  return result;
85
85
  }
86
86
 
87
+ // 剥离 ANSI 转义码后的可见字符长度
88
+ static _visibleLength(str) {
89
+ // eslint-disable-next-line no-control-regex
90
+ return str.replace(/\x1b\[[0-9;]*m/g, '').length;
91
+ }
92
+
87
93
  // 创建卡片式布局
88
94
  static createCard(title, content, icon = '') {
89
95
  const lines = content.split('\n');
90
- const maxLineLength = Math.max(...lines.map(line => line.length));
96
+ const maxLineLength = Math.max(...lines.map(line => UIHelper._visibleLength(line)));
97
+ const iconPrefix = icon ? `${icon} ` : '';
98
+ const titleVisible = UIHelper._visibleLength(title);
91
99
  const horizontalBorder = '─'.repeat(maxLineLength + 4);
92
100
 
93
101
  let result = `${UIHelper.colors.primary(`┌─${horizontalBorder}─┐`)}\n`;
94
- result += `${UIHelper.colors.primary('│')} ${chalk.bold.white(icon ? `${icon} ` : '')}${chalk.bold.white(title)}${' '.repeat(maxLineLength - title.length - (icon ? 2 : 0))} ${UIHelper.colors.primary('│')}\n`;
102
+ result += `${UIHelper.colors.primary('│')} ${chalk.bold.white(iconPrefix)}${chalk.bold.white(title)}${' '.repeat(Math.max(0, maxLineLength - titleVisible - iconPrefix.length))} ${UIHelper.colors.primary('│')}\n`;
95
103
  result += `${UIHelper.colors.primary('├─')}${UIHelper.colors.muted(horizontalBorder)}${UIHelper.colors.primary('─┤')}\n`;
96
104
 
97
105
  lines.forEach(line => {
98
- result += `${UIHelper.colors.primary('│')} ${UIHelper.colors.info(line)}${' '.repeat(maxLineLength - line.length)} ${UIHelper.colors.primary('│')}\n`;
106
+ result += `${UIHelper.colors.primary('│')} ${UIHelper.colors.info(line)}${' '.repeat(Math.max(0, maxLineLength - UIHelper._visibleLength(line)))} ${UIHelper.colors.primary('│')}\n`;
99
107
  });
100
108
 
101
109
  result += `${UIHelper.colors.primary('└─')}${UIHelper.colors.muted(horizontalBorder)}${UIHelper.colors.primary('─┘')}`;