@pikecode/api-key-manager 1.3.3 → 1.3.6

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.3",
3
+ "version": "1.3.6",
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('./switch/provider-details-helper');
11
+ const { ProviderEditQuestionsHelper } = require('./switch/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,24 +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();
92
-
93
- // 设置 ESC 键监听
94
- const escListener = this.createESCListener(() => {
95
- Logger.info('返回供应商选择');
96
- this.showProviderSelection();
97
- }, '返回供应商选择');
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
+ });
98
118
 
99
119
  // 显示启动参数选择界面
100
120
  const choices = [
@@ -108,17 +128,16 @@ class EnvSwitcher extends BaseCommand {
108
128
 
109
129
  let answers;
110
130
  try {
111
- answers = await this.prompt(choices);
131
+ answers = await this.promptWithESC(choices, '返回供应商选择', () => {
132
+ Logger.info('返回供应商选择');
133
+ });
112
134
  } catch (error) {
113
- this.removeESCListener(escListener);
114
135
  if (this.isEscCancelled(error)) {
115
- return;
136
+ return await this.showProviderSelection();
116
137
  }
117
138
  throw error;
118
139
  }
119
140
 
120
- this.removeESCListener(escListener);
121
-
122
141
  // 检查互斥参数
123
142
  const conflictError = LaunchArgsHelper.validateArgsConflict(answers.selectedArgs, availableArgs);
124
143
  if (conflictError) {
@@ -177,13 +196,6 @@ class EnvSwitcher extends BaseCommand {
177
196
  }
178
197
  }
179
198
 
180
- /**
181
- * 快速启动供应商(跳过参数选择)
182
- * @param {string} providerName - 供应商名称
183
- * @param {Object} options - 启动选项
184
- * @param {boolean} options.quick - 使用上次的启动参数
185
- * @param {boolean} options.noArgs - 不使用任何启动参数
186
- */
187
199
  /**
188
200
  * 快速启动供应商(跳过参数选择)
189
201
  * @param {string} providerName - 供应商名称或别名
@@ -208,19 +220,17 @@ class EnvSwitcher extends BaseCommand {
208
220
  // 确定使用的启动参数
209
221
  let selectedArgs;
210
222
  if (options.noArgs) {
211
- // 使用空参数
212
223
  selectedArgs = [];
213
- console.log(UIHelper.colors.muted('💡 使用空参数启动'));
224
+ Logger.info('使用空参数启动');
214
225
  } else if (options.quick) {
215
- // 使用上次的启动参数或默认参数
216
226
  selectedArgs = Array.isArray(provider.lastUsedArgs) && provider.lastUsedArgs.length > 0
217
227
  ? provider.lastUsedArgs
218
228
  : (Array.isArray(provider.launchArgs) ? provider.launchArgs : []);
219
229
 
220
230
  if (Array.isArray(provider.lastUsedArgs) && provider.lastUsedArgs.length > 0) {
221
- console.log(UIHelper.colors.muted('💡 使用上次的启动参数: ' + selectedArgs.join(' ')));
231
+ Logger.info('使用上次的启动参数: ' + selectedArgs.join(' '));
222
232
  } else {
223
- console.log(UIHelper.colors.muted('💡 使用默认启动参数: ' + (selectedArgs.length > 0 ? selectedArgs.join(' ') : '(无)')));
233
+ Logger.info('使用默认启动参数: ' + (selectedArgs.length > 0 ? selectedArgs.join(' ') : '(无)'));
224
234
  }
225
235
  }
226
236
 
@@ -277,6 +287,8 @@ class EnvSwitcher extends BaseCommand {
277
287
  { name: `${UIHelper.icons.add} 添加新供应商`, value: '__ADD__' },
278
288
  { name: `${UIHelper.icons.list} 供应商管理 (编辑/删除)`, value: '__MANAGE__' },
279
289
  { name: `${UIHelper.icons.config} 打开配置文件`, value: '__OPEN_CONFIG__' },
290
+ { name: `${UIHelper.icons.settings} 快速设置`, value: '__QUICK_SETTINGS__' },
291
+ { name: `${UIHelper.icons.info} 帮助`, value: '__HELP__' },
280
292
  { name: `${UIHelper.icons.error} 退出`, value: '__EXIT__' }
281
293
  );
282
294
 
@@ -288,15 +300,7 @@ class EnvSwitcher extends BaseCommand {
288
300
  const filterSuffix = this.filter === 'codex' ? ' (Codex CLI)' : (this.filter === 'claude' ? ' (Claude Code)' : '');
289
301
  const promptMessage = `请选择要切换的供应商${filterSuffix} (总计 ${providers.length} 个):`;
290
302
 
291
- // 设置 ESC 键监听
292
- const escListener = this.createESCListener(() => {
293
- Logger.info('退出程序');
294
- this.showExitScreen();
295
- this.destroy();
296
- process.exit(0);
297
- }, '退出程序');
298
-
299
- const answer = await this.prompt([
303
+ const answer = await this.promptWithESC([
300
304
  {
301
305
  type: 'list',
302
306
  name: 'provider',
@@ -305,7 +309,12 @@ class EnvSwitcher extends BaseCommand {
305
309
  default: defaultChoice,
306
310
  pageSize: this._getPageSize(choices.length)
307
311
  }
308
- ]);
312
+ ], '退出程序', () => {
313
+ Logger.info('退出程序');
314
+ this.showExitScreen();
315
+ this.destroy();
316
+ process.exit(0);
317
+ });
309
318
 
310
319
  if (answer.provider === '__OPEN_CONFIG__') {
311
320
  await this.openConfigFile();
@@ -361,12 +370,16 @@ class EnvSwitcher extends BaseCommand {
361
370
 
362
371
  async handleSelection(selection) {
363
372
  switch (selection) {
364
- case '__ADD__':
365
- // 使用CommandRegistry避免循环引用
373
+ case '__ADD__': {
366
374
  const { registry } = require('../CommandRegistry');
367
375
  return await registry.executeCommand('add');
376
+ }
368
377
  case '__MANAGE__':
369
378
  return await this.showManageMenu();
379
+ case '__QUICK_SETTINGS__':
380
+ return await this.showQuickSettings();
381
+ case '__HELP__':
382
+ return await this.showHelp();
370
383
  case '__EXIT__':
371
384
  this.showExitScreen();
372
385
  this.destroy();
@@ -377,28 +390,24 @@ class EnvSwitcher extends BaseCommand {
377
390
  }
378
391
 
379
392
  async showQuickSettings() {
380
- this.clearScreen();
381
- console.log(UIHelper.createHintLine([
382
- ['↑ / ↓', '选择项目'],
383
- ['Enter', '确认'],
384
- ['ESC', '返回主菜单']
385
- ]));
386
- console.log();
393
+ this._renderPage({
394
+ title: '快速设置',
395
+ icon: UIHelper.icons.settings,
396
+ hints: [
397
+ ['↑ / ↓', '选择项目'],
398
+ ['Enter', '确认'],
399
+ ['ESC', '返回主菜单']
400
+ ]
401
+ });
387
402
  const choices = [
388
403
  { name: `${UIHelper.icons.search} 搜索供应商`, value: 'search' },
389
404
  { name: `${UIHelper.icons.info} 查看统计`, value: 'stats' },
390
405
  { name: `${UIHelper.icons.back} 返回主菜单`, value: 'back' }
391
406
  ];
392
407
 
393
- // 设置 ESC 键监听
394
- const escListener = this.createESCListener(() => {
395
- Logger.info('返回供应商选择');
396
- this.showProviderSelection();
397
- }, '返回供应商选择');
398
-
399
408
  let answer;
400
409
  try {
401
- answer = await this.prompt([
410
+ answer = await this.promptWithESC([
402
411
  {
403
412
  type: 'list',
404
413
  name: 'setting',
@@ -406,24 +415,17 @@ class EnvSwitcher extends BaseCommand {
406
415
  choices,
407
416
  pageSize: 8
408
417
  }
409
- ]);
418
+ ], '返回主菜单', () => {});
410
419
  } catch (error) {
411
- this.removeESCListener(escListener);
412
420
  if (this.isEscCancelled(error)) {
413
- return;
421
+ return await this.showProviderSelection();
414
422
  }
415
423
  throw error;
416
424
  }
417
425
 
418
- this.removeESCListener(escListener);
419
-
420
426
  switch (answer.setting) {
421
427
  case 'search':
422
428
  return await this.showSearchProvider();
423
- case 'batch':
424
- return await this.showBatchEdit();
425
- case 'global':
426
- return await this.showGlobalSettings();
427
429
  case 'stats':
428
430
  return await this.showStatistics();
429
431
  case 'back':
@@ -431,84 +433,6 @@ class EnvSwitcher extends BaseCommand {
431
433
  }
432
434
  }
433
435
 
434
- async showBatchEdit() {
435
- this.clearScreen();
436
- console.log(UIHelper.createTitle('批量编辑', UIHelper.icons.edit));
437
- console.log();
438
- console.log(UIHelper.createTooltip('此功能正在开发中...'));
439
- console.log();
440
- console.log(UIHelper.createHintLine([
441
- ['Enter', '返回上一页'],
442
- ['ESC', '返回快速设置']
443
- ]));
444
- console.log();
445
-
446
- // 设置 ESC 键监听
447
- const escListener = this.createESCListener(() => {
448
- Logger.info('返回快速设置');
449
- this.showQuickSettings();
450
- }, '返回快速设置');
451
-
452
- try {
453
- await this.prompt([
454
- {
455
- type: 'input',
456
- name: 'continue',
457
- message: '按回车键返回...'
458
- }
459
- ]);
460
- } catch (error) {
461
- this.removeESCListener(escListener);
462
- if (this.isEscCancelled(error)) {
463
- return;
464
- }
465
- throw error;
466
- }
467
-
468
- this.removeESCListener(escListener);
469
-
470
- return await this.showQuickSettings();
471
- }
472
-
473
- async showGlobalSettings() {
474
- this.clearScreen();
475
- console.log(UIHelper.createTitle('全局设置', UIHelper.icons.settings));
476
- console.log();
477
- console.log(UIHelper.createTooltip('此功能正在开发中...'));
478
- console.log();
479
- console.log(UIHelper.createHintLine([
480
- ['Enter', '返回上一页'],
481
- ['ESC', '返回快速设置']
482
- ]));
483
- console.log();
484
-
485
- // 设置 ESC 键监听
486
- const escListener = this.createESCListener(() => {
487
- Logger.info('返回快速设置');
488
- this.showQuickSettings();
489
- }, '返回快速设置');
490
-
491
- try {
492
- await this.prompt([
493
- {
494
- type: 'input',
495
- name: 'continue',
496
- message: '按回车键返回...'
497
- }
498
- ]);
499
- } catch (error) {
500
- this.removeESCListener(escListener);
501
- if (this.isEscCancelled(error)) {
502
- return;
503
- }
504
- throw error;
505
- }
506
-
507
- this.removeESCListener(escListener);
508
-
509
- return await this.showQuickSettings();
510
- }
511
-
512
436
  async showSearchProvider() {
513
437
  this.clearScreen();
514
438
  console.log(UIHelper.createHintLine([
@@ -517,41 +441,58 @@ class EnvSwitcher extends BaseCommand {
517
441
  ]));
518
442
  console.log(UIHelper.createTooltip('示例: claude、demo 或供应商别名'));
519
443
  console.log();
520
- // 设置 ESC 键监听
521
- const escListener = this.createESCListener(() => {
522
- Logger.info('返回快速设置');
523
- this.showQuickSettings();
524
- }, '返回快速设置');
525
-
526
444
  let answer;
527
445
  try {
528
- answer = await this.prompt([
446
+ answer = await this.promptWithESC([
529
447
  {
530
448
  type: 'input',
531
449
  name: 'search',
532
450
  message: '输入供应商名称搜索:',
533
451
  validate: input => input.trim() !== '' || '请输入搜索内容'
534
452
  }
535
- ]);
453
+ ], '返回快速设置', () => {
454
+ Logger.info('返回快速设置');
455
+ });
536
456
  } catch (error) {
537
- this.removeESCListener(escListener);
538
457
  if (this.isEscCancelled(error)) {
539
- return;
458
+ return await this.showQuickSettings();
540
459
  }
541
460
  throw error;
542
461
  }
543
462
 
544
- this.removeESCListener(escListener);
545
-
546
463
  await this.configManager.load();
547
464
  const providers = this.configManager.listProviders();
548
- const searchResults = providers.filter(p =>
549
- p.name.toLowerCase().includes(answer.search.toLowerCase()) ||
550
- p.displayName.toLowerCase().includes(answer.search.toLowerCase())
551
- );
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
+ });
552
471
 
553
472
  if (searchResults.length === 0) {
554
- 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
+ }
555
496
  return await this.showSearchProvider();
556
497
  }
557
498
 
@@ -572,22 +513,9 @@ class EnvSwitcher extends BaseCommand {
572
513
  const currentProvider = searchResults.find(p => p.current);
573
514
  const defaultChoice = currentProvider ? currentProvider.name : searchResults[0]?.name;
574
515
 
575
- // 设置 ESC 键监听
576
- const escListener2 = this.createESCListener(() => {
577
- Logger.info('返回快速设置');
578
- this.showQuickSettings();
579
- }, '返回快速设置');
580
-
581
- console.log();
582
- console.log(UIHelper.createHintLine([
583
- ['↑ / ↓', '选择结果'],
584
- ['Enter', '查看详情'],
585
- ['ESC', '返回快速设置']
586
- ]));
587
-
588
516
  let result;
589
517
  try {
590
- result = await this.prompt([
518
+ result = await this.promptWithESC([
591
519
  {
592
520
  type: 'list',
593
521
  name: 'provider',
@@ -596,17 +524,16 @@ class EnvSwitcher extends BaseCommand {
596
524
  default: defaultChoice,
597
525
  pageSize: 10
598
526
  }
599
- ]);
527
+ ], '返回快速设置', () => {
528
+ Logger.info('返回快速设置');
529
+ });
600
530
  } catch (error) {
601
- this.removeESCListener(escListener2);
602
531
  if (this.isEscCancelled(error)) {
603
- return;
532
+ return await this.showQuickSettings();
604
533
  }
605
534
  throw error;
606
535
  }
607
536
 
608
- this.removeESCListener(escListener2);
609
-
610
537
  if (result.provider === 'back') {
611
538
  return await this.showQuickSettings();
612
539
  }
@@ -622,7 +549,9 @@ class EnvSwitcher extends BaseCommand {
622
549
  const totalProviders = providers.length;
623
550
  const currentProvider = providers.find(p => p.current);
624
551
  const totalUsage = providers.reduce((sum, p) => sum + (p.usageCount || 0), 0);
625
- 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;
626
555
 
627
556
  console.log(UIHelper.createTitle('使用统计', UIHelper.icons.info));
628
557
  console.log();
@@ -637,45 +566,40 @@ class EnvSwitcher extends BaseCommand {
637
566
 
638
567
  console.log(UIHelper.createTable(['项目', '数据'], stats));
639
568
  console.log();
640
- // 设置 ESC 键监听
641
- const escListener = this.createESCListener(() => {
642
- Logger.info('返回快速设置');
643
- this.showQuickSettings();
644
- }, '返回快速设置');
645
-
646
569
  try {
647
- await this.prompt([
570
+ await this.promptWithESC([
648
571
  {
649
572
  type: 'list',
650
573
  name: 'action',
651
574
  message: '操作:',
652
575
  choices: [{ name: `${UIHelper.icons.back} 返回`, value: 'back' }]
653
576
  }
654
- ]);
577
+ ], '返回快速设置', () => {
578
+ Logger.info('返回快速设置');
579
+ });
655
580
  } catch (error) {
656
- this.removeESCListener(escListener);
657
581
  if (this.isEscCancelled(error)) {
658
- return;
582
+ return await this.showQuickSettings();
659
583
  }
660
584
  throw error;
661
585
  }
662
586
 
663
- this.removeESCListener(escListener);
664
587
  return await this.showQuickSettings();
665
588
  }
666
589
 
667
590
  showExitScreen() {
668
- this.clearScreen();
669
- console.log(UIHelper.createTitle('感谢使用', UIHelper.icons.home));
670
- console.log();
671
- console.log(UIHelper.colors.info('再见!期待下次使用 🎉'));
672
- console.log();
591
+ this._renderPage({
592
+ title: '感谢使用',
593
+ icon: UIHelper.icons.home,
594
+ content: UIHelper.colors.info('再见!期待下次使用 🎉')
595
+ });
673
596
  }
674
597
 
675
598
  async showHelp() {
676
- this.clearScreen();
677
- console.log(UIHelper.createTitle('快捷键帮助', UIHelper.icons.info));
678
- console.log();
599
+ this._renderPage({
600
+ title: '快捷键帮助',
601
+ icon: UIHelper.icons.info
602
+ });
679
603
 
680
604
  const sections = [
681
605
  {
@@ -709,95 +633,78 @@ class EnvSwitcher extends BaseCommand {
709
633
  console.log();
710
634
  });
711
635
 
712
- const escListener = this.createESCListener(() => {
713
- Logger.info('返回主菜单');
714
- this.showProviderSelection();
715
- }, '返回主菜单');
716
-
717
- console.log(UIHelper.createHintLine([
718
- ['Enter', '返回主菜单'],
719
- ['ESC', '返回主菜单']
720
- ]));
721
- console.log();
722
-
723
636
  try {
724
- await this.prompt([
637
+ await this.promptWithESC([
725
638
  {
726
639
  type: 'list',
727
640
  name: 'action',
728
641
  message: '操作:',
729
642
  choices: [{ name: `${UIHelper.icons.back} 返回主菜单`, value: 'back' }]
730
643
  }
731
- ]);
644
+ ], '返回主菜单', () => {
645
+ Logger.info('返回主菜单');
646
+ });
732
647
  } catch (error) {
733
- this.removeESCListener(escListener);
734
648
  if (this.isEscCancelled(error)) {
735
- return;
649
+ return await this.showProviderSelection();
736
650
  }
737
651
  throw error;
738
652
  }
739
653
 
740
- this.removeESCListener(escListener);
741
654
  return await this.showProviderSelection();
742
655
  }
743
656
 
744
657
  async showManageMenu() {
745
- let escListener;
746
658
  try {
747
659
  await this.configManager.load();
748
- const providers = this.configManager.listProviders();
749
- this.clearScreen();
750
- console.log(UIHelper.createHintLine([
751
- ['↑ / ↓', '选择供应商或操作'],
752
- ['Enter', '确认'],
753
- ['ESC', '返回主菜单']
754
- ]));
755
- console.log();
756
-
757
- console.log(UIHelper.createTitle('供应商管理', UIHelper.icons.list));
758
- console.log();
660
+ let providers = this.configManager.listProviders();
759
661
 
760
662
  if (providers.length === 0) {
761
- console.log(UIHelper.createCard('提示', '暂无配置的供应商\n请先运行 "akm add" 添加供应商配置', UIHelper.icons.warning));
663
+ Logger.warning('暂无配置的供应商');
664
+ Logger.info('请先运行 "akm add" 添加供应商配置');
762
665
  return await this.showProviderSelection();
763
666
  }
764
667
 
765
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
+
766
688
  const choices = this.createProviderChoices(providers, true, statusMap);
767
689
 
768
690
  this.currentPromptContext = 'manage';
769
- // 管理界面显示所有供应商,更新 filteredProviders 以保持一致
770
691
  this.filteredProviders = providers;
771
692
 
772
693
  if (providers.length > 0) {
773
694
  this._startStatusRefresh(providers);
774
695
  }
775
696
 
776
- // 设置 ESC 键监听
777
- escListener = this.createESCListener(() => {
778
- Logger.info('返回供应商选择');
779
- this.showProviderSelection();
780
- }, '返回供应商选择');
781
-
782
- let answer;
783
- try {
784
- answer = await this.prompt([
785
- {
786
- type: 'list',
787
- name: 'action',
788
- message: `选择供应商或操作 (总计 ${providers.length} 个):`,
789
- choices,
790
- pageSize: this._getPageSize(choices.length)
791
- }
792
- ]);
793
- } catch (error) {
794
- if (this.isEscCancelled(error)) {
795
- 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)
796
704
  }
797
- throw error;
798
- }
799
-
800
- this.removeESCListener(escListener);
705
+ ], '返回供应商选择', () => {
706
+ Logger.info('返回供应商选择');
707
+ });
801
708
 
802
709
  this._cancelStatusRefresh();
803
710
 
@@ -806,6 +713,9 @@ class EnvSwitcher extends BaseCommand {
806
713
  return result;
807
714
 
808
715
  } catch (error) {
716
+ if (this.isEscCancelled(error)) {
717
+ return await this.showProviderSelection();
718
+ }
809
719
  await this.handleError(error, '显示供应商管理');
810
720
  } finally {
811
721
  if (this.currentPromptContext === 'manage') {
@@ -930,7 +840,19 @@ class EnvSwitcher extends BaseCommand {
930
840
 
931
841
  _refreshPromptChoices(activePrompt, providers, statusMap, options = {}) {
932
842
  const includeActions = this.currentPromptContext === 'manage';
933
- 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);
934
856
  const updatedChoices = [...updatedChoicesBase];
935
857
 
936
858
  if (!includeActions) {
@@ -939,6 +861,8 @@ class EnvSwitcher extends BaseCommand {
939
861
  { name: `${UIHelper.icons.add} 添加新供应商`, value: '__ADD__' },
940
862
  { name: `${UIHelper.icons.list} 供应商管理 (编辑/删除)`, value: '__MANAGE__' },
941
863
  { name: `${UIHelper.icons.config} 打开配置文件`, value: '__OPEN_CONFIG__' },
864
+ { name: `${UIHelper.icons.settings} 快速设置`, value: '__QUICK_SETTINGS__' },
865
+ { name: `${UIHelper.icons.info} 帮助`, value: '__HELP__' },
942
866
  { name: `${UIHelper.icons.error} 退出`, value: '__EXIT__' }
943
867
  );
944
868
  }
@@ -977,7 +901,8 @@ class EnvSwitcher extends BaseCommand {
977
901
  _buildStatusPromptMessage(providerCount, hasError = false) {
978
902
  const errorSuffix = hasError ? ',状态检测失败,使用默认配置' : '';
979
903
  if (this.currentPromptContext === 'selection') {
980
- return `请选择要切换的供应商 (总计 ${providerCount} 个${errorSuffix}):`;
904
+ const filterSuffix = this.filter === 'codex' ? ' (Codex CLI)' : (this.filter === 'claude' ? ' (Claude Code)' : '');
905
+ return `请选择要切换的供应商${filterSuffix} (总计 ${providerCount} 个${errorSuffix}):`;
981
906
  }
982
907
  if (this.currentPromptContext === 'manage') {
983
908
  return `选择供应商或操作 (总计 ${providerCount} 个${errorSuffix}):`;
@@ -990,7 +915,7 @@ class EnvSwitcher extends BaseCommand {
990
915
  case 'back':
991
916
  return await this.showProviderSelection();
992
917
  case 'exit':
993
- Logger.info('👋 再见!');
918
+ this.showExitScreen();
994
919
  this.destroy();
995
920
  process.exit(0);
996
921
  default:
@@ -1000,239 +925,21 @@ class EnvSwitcher extends BaseCommand {
1000
925
  }
1001
926
 
1002
927
  async showProviderDetails(providerName) {
1003
- let escListener;
1004
- try {
1005
- const provider = await this.validateProvider(providerName);
1006
- this.clearScreen();
1007
-
1008
- console.log(UIHelper.createTitle('供应商详情', UIHelper.icons.info));
1009
- console.log();
1010
- console.log(UIHelper.createHintLine([
1011
- ['↑ / ↓', '选择操作'],
1012
- ['Enter', '确认'],
1013
- ['ESC', '返回管理列表']
1014
- ]));
1015
- console.log();
1016
-
1017
- const details = ProviderDetailsHelper.buildDetailsRows(provider, {
1018
- authModeDisplay: AUTH_MODE_DISPLAY,
1019
- baseUrl: BASE_URL,
1020
- formatTime: UIHelper.formatTime
1021
- });
1022
-
1023
- console.log(UIHelper.createTable(['项目', '信息'], details));
1024
- console.log();
1025
-
1026
- const launchArgsText = ProviderDetailsHelper.formatLaunchArgs(provider);
1027
- if (launchArgsText) {
1028
- console.log(UIHelper.createCard('默认启动参数', launchArgsText, UIHelper.icons.settings));
1029
- console.log();
1030
- }
1031
-
1032
- // 设置 ESC 键监听
1033
- escListener = this.createESCListener(() => {
1034
- Logger.info('返回管理列表');
1035
- this.showManageMenu();
1036
- }, '返回管理列表');
1037
-
1038
- let answer;
1039
- try {
1040
- answer = await this.prompt([
1041
- {
1042
- type: 'list',
1043
- name: 'action',
1044
- message: '选择操作:',
1045
- choices: ProviderDetailsHelper.buildActionChoices(UIHelper.icons)
1046
- }
1047
- ]);
1048
- } catch (error) {
1049
- this.removeESCListener(escListener);
1050
- if (this.isEscCancelled(error)) {
1051
- return;
1052
- }
1053
- throw error;
1054
- }
1055
-
1056
- switch (answer.action) {
1057
- case 'back':
1058
- // 移除 ESC 键监听
1059
- this.removeESCListener(escListener);
1060
- return await this.showManageMenu();
1061
- case 'edit':
1062
- // 移除 ESC 键监听
1063
- this.removeESCListener(escListener);
1064
- return await this.editProvider(providerName);
1065
- case 'remove':
1066
- // 移除 ESC 键监听
1067
- this.removeESCListener(escListener);
1068
- return await this.removeProvider(providerName);
1069
- case 'launch':
1070
- // 移除 ESC 键监听
1071
- this.removeESCListener(escListener);
1072
- return await this.showLaunchArgsSelection(providerName);
1073
- }
1074
-
1075
- } catch (error) {
1076
- // 移除 ESC 键监听
1077
- this.removeESCListener(escListener);
1078
- await this.handleError(error, '显示供应商详情');
1079
- }
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
+ );
1080
935
  }
1081
936
 
1082
937
  async editProvider(providerName) {
1083
- let escListener;
1084
- try {
1085
- await this.configManager.load();
1086
- let provider = this.configManager.getProvider(providerName);
1087
- this.clearScreen();
1088
-
1089
- if (!provider) {
1090
- Logger.error(`供应商 '${providerName}' 不存在`);
1091
- return await this.showManageMenu();
1092
- }
1093
-
1094
- // 设置 ESC 键监听
1095
- escListener = this.createESCListener(() => {
1096
- Logger.info('取消编辑供应商');
1097
- this.showManageMenu();
1098
- }, '取消编辑');
1099
-
1100
- // 根据 IDE 类型构建不同的问卷
1101
- const isCodex = provider.ideName === 'codex';
1102
- const questions = ProviderEditQuestionsHelper.buildQuestions(provider, validator);
1103
-
1104
- let answers;
1105
- try {
1106
- answers = await this.prompt(questions);
1107
- } catch (error) {
1108
- this.removeESCListener(escListener);
1109
- if (this.isEscCancelled(error)) {
1110
- return;
1111
- }
1112
- throw error;
1113
- }
1114
-
1115
- const originalName = provider.name;
1116
- const newName = answers.name;
1117
-
1118
- // 处理重命名逻辑
1119
- if (newName !== originalName) {
1120
- await this.configManager.ensureLoaded();
1121
- const providersMap = this.configManager.config.providers;
1122
-
1123
- // 如果新名称已存在且不是当前供应商,则报错
1124
- if (providersMap[newName]) {
1125
- Logger.error(`供应商名称 '${newName}' 已存在,请使用其他名称`);
1126
- return await this.showManageMenu();
1127
- }
1128
-
1129
- providersMap[newName] = {
1130
- ...provider,
1131
- name: newName
1132
- };
1133
-
1134
- delete providersMap[originalName];
1135
-
1136
- if (this.configManager.config.currentProvider === originalName) {
1137
- this.configManager.config.currentProvider = newName;
1138
- providersMap[newName].current = true;
1139
- }
1140
-
1141
- provider = providersMap[newName];
1142
- }
1143
-
1144
- // 更新供应商配置
1145
- provider.displayName = newName;
1146
- provider.baseUrl = answers.baseUrl;
1147
- provider.authToken = answers.authToken;
1148
-
1149
- // Claude Code 特定的更新
1150
- if (!isCodex) {
1151
- provider.authMode = answers.authMode;
1152
-
1153
- // 更新模型配置
1154
- if (!provider.models) {
1155
- provider.models = {};
1156
- }
1157
- provider.models.primary = answers.primaryModel || null;
1158
- provider.models.smallFast = answers.smallFastModel || null;
1159
- } else {
1160
- // 确保 Codex 配置不包含 Claude 特定字段
1161
- provider.authMode = null;
1162
- provider.models = null;
1163
- }
1164
-
1165
- // 确保 ideName 不被改变
1166
- provider.ideName = isCodex ? 'codex' : 'claude';
1167
-
1168
- await this.configManager.save();
1169
- Logger.success(`供应商 '${newName}' 已更新`);
1170
-
1171
- // 移除 ESC 键监听
1172
- this.removeESCListener(escListener);
1173
- return await this.showManageMenu();
1174
-
1175
- } catch (error) {
1176
- // 移除 ESC 键监听
1177
- this.removeESCListener(escListener);
1178
- Logger.error(`编辑供应商失败: ${error.message}`);
1179
- throw error;
1180
- }
938
+ return this.providerManager.editProvider(providerName, () => this.showManageMenu());
1181
939
  }
1182
940
 
1183
941
  async removeProvider(providerName) {
1184
- let escListener;
1185
- try {
1186
- await this.configManager.load();
1187
- const provider = this.configManager.getProvider(providerName);
1188
- this.clearScreen();
1189
-
1190
- if (!provider) {
1191
- Logger.error(`供应商 '${providerName}' 不存在`);
1192
- return await this.showManageMenu();
1193
- }
1194
-
1195
- // 设置 ESC 键监听
1196
- escListener = this.createESCListener(() => {
1197
- Logger.info('取消删除供应商');
1198
- this.showManageMenu();
1199
- }, '取消删除');
1200
-
1201
- let confirm;
1202
- try {
1203
- confirm = await this.prompt([
1204
- {
1205
- type: 'confirm',
1206
- name: 'confirmed',
1207
- message: `确定要删除供应商 '${providerName}' 吗?`,
1208
- default: false
1209
- }
1210
- ]);
1211
- } catch (error) {
1212
- this.removeESCListener(escListener);
1213
- if (this.isEscCancelled(error)) {
1214
- return;
1215
- }
1216
- throw error;
1217
- }
1218
-
1219
- if (confirm.confirmed) {
1220
- await this.configManager.removeProvider(providerName);
1221
- Logger.success(`供应商 '${providerName}' 已删除`);
1222
- } else {
1223
- Logger.info('删除操作已取消');
1224
- }
1225
-
1226
- // 移除 ESC 键监听
1227
- this.removeESCListener(escListener);
1228
- return await this.showManageMenu();
1229
-
1230
- } catch (error) {
1231
- // 移除 ESC 键监听
1232
- this.removeESCListener(escListener);
1233
- Logger.error(`删除供应商失败: ${error.message}`);
1234
- throw error;
1235
- }
942
+ return this.providerManager.removeProvider(providerName, () => this.showManageMenu());
1236
943
  }
1237
944
  }
1238
945
 
@@ -204,36 +204,22 @@ class ProviderStatusChecker {
204
204
  }
205
205
 
206
206
  if (Array.isArray(response.content)) {
207
+ const textFields = ['text', 'thinking', 'output_text', 'argument', 'result'];
207
208
  const textParts = [];
209
+
208
210
  for (const block of response.content) {
209
- if (!block) {
210
- continue;
211
- }
211
+ if (!block) continue;
212
212
  if (typeof block === 'string') {
213
213
  textParts.push(block);
214
214
  continue;
215
215
  }
216
- if (typeof block.text === 'string' && block.text.trim()) {
217
- textParts.push(block.text);
218
- continue;
219
- }
220
- if (typeof block.thinking === 'string' && block.thinking.trim()) {
221
- textParts.push(block.thinking);
222
- continue;
223
- }
224
- if (typeof block.output_text === 'string' && block.output_text.trim()) {
225
- textParts.push(block.output_text);
226
- continue;
227
- }
228
- if (typeof block.argument === 'string' && block.argument.trim()) {
229
- textParts.push(block.argument);
230
- continue;
231
- }
232
- if (typeof block.result === 'string' && block.result.trim()) {
233
- textParts.push(block.result);
234
- continue;
216
+ for (const field of textFields) {
217
+ if (typeof block[field] === 'string' && block[field].trim()) {
218
+ textParts.push(block[field]);
219
+ }
235
220
  }
236
221
  }
222
+
237
223
  const combined = textParts
238
224
  .map(part => part.replace(/\s+/g, ' ').trim())
239
225
  .filter(Boolean)
@@ -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('─┘')}`;