@pikecode/api-key-manager 1.2.0 → 1.3.0
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/bin/akm.js +0 -0
- package/package.json +1 -1
- package/src/commands/BaseCommand.js +1 -1
- package/src/commands/add/prompts.js +2 -13
- package/src/commands/add.js +1 -33
- package/src/commands/backup.js +0 -1
- package/src/commands/batch.js +65 -66
- package/src/commands/benchmark.js +0 -21
- package/src/commands/current.js +1 -1
- package/src/commands/edit.js +0 -1
- package/src/commands/health.js +0 -2
- package/src/commands/list.js +1 -1
- package/src/commands/remove.js +0 -1
- package/src/commands/stats.js +1 -2
- package/src/commands/switch/claude-settings-compatibility.js +113 -0
- package/src/commands/switch/provider-choices-helper.js +71 -0
- package/src/commands/switch/provider-details-helper.js +46 -0
- package/src/commands/switch/provider-edit-questions-helper.js +102 -0
- package/src/commands/switch/provider-launcher.js +20 -0
- package/src/commands/switch.js +85 -435
- package/src/commands/validate.js +17 -17
- package/src/config.js +28 -0
- package/src/navigation/EscNavigationManager.js +5 -5
- package/src/utils/codex-launcher.js +3 -0
- package/src/utils/env-utils.js +2 -2
- package/src/utils/error-handler.js +0 -1
- package/src/utils/health-checker.js +34 -34
- package/src/utils/logger.js +0 -1
- package/src/utils/provider-status-checker.js +10 -41
- package/src/utils/update-checker.js +6 -1
- package/src/utils/validator.js +1 -1
- package/src/commands/add/codexImporter.js +0 -48
package/src/commands/switch.js
CHANGED
|
@@ -4,22 +4,23 @@
|
|
|
4
4
|
* @module commands/switch
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
const path = require('path');
|
|
8
7
|
const inquirer = require('inquirer');
|
|
9
8
|
const chalk = require('chalk');
|
|
10
9
|
const Choices = require('inquirer/lib/objects/choices');
|
|
11
10
|
const { configManager } = require('../config');
|
|
12
|
-
const { executeWithEnv } = require('../utils/env-launcher');
|
|
13
|
-
const { executeCodexWithEnv } = require('../utils/codex-launcher');
|
|
14
11
|
const { Logger } = require('../utils/logger');
|
|
15
12
|
const { UIHelper } = require('../utils/ui-helper');
|
|
16
|
-
const { findSettingsConflict, backupSettingsFile, clearConflictKeys, saveSettingsFile } = require('../utils/claude-settings');
|
|
17
13
|
const { BaseCommand } = require('./BaseCommand');
|
|
18
14
|
const { validator } = require('../utils/validator');
|
|
19
15
|
const { ProviderStatusChecker } = require('../utils/provider-status-checker');
|
|
20
16
|
const { AUTH_MODE_DISPLAY, BASE_URL } = require('../constants');
|
|
21
|
-
const { LaunchArgsHelper } = require('./switch/launch-args-helper');
|
|
22
17
|
const { StatusHelper } = require('./switch/status-helper');
|
|
18
|
+
const { LaunchArgsHelper } = require('./switch/launch-args-helper');
|
|
19
|
+
const { ProviderChoicesHelper } = require('./switch/provider-choices-helper');
|
|
20
|
+
const { ProviderDetailsHelper } = require('./switch/provider-details-helper');
|
|
21
|
+
const { ProviderEditQuestionsHelper } = require('./switch/provider-edit-questions-helper');
|
|
22
|
+
const { ensureClaudeSettingsCompatibility } = require('./switch/claude-settings-compatibility');
|
|
23
|
+
const { launchProviderProcess, markProviderAsCurrent } = require('./switch/provider-launcher');
|
|
23
24
|
|
|
24
25
|
/**
|
|
25
26
|
* 环境切换器类
|
|
@@ -40,17 +41,17 @@ class EnvSwitcher extends BaseCommand {
|
|
|
40
41
|
|
|
41
42
|
async validateProvider(providerName) {
|
|
42
43
|
await this.configManager.load();
|
|
43
|
-
|
|
44
|
+
|
|
44
45
|
// 先尝试按名称查找,再尝试按别名查找
|
|
45
46
|
let provider = this.configManager.getProvider(providerName);
|
|
46
47
|
if (!provider) {
|
|
47
48
|
provider = this.configManager.getProviderByNameOrAlias(providerName);
|
|
48
49
|
}
|
|
49
|
-
|
|
50
|
+
|
|
50
51
|
if (!provider) {
|
|
51
52
|
throw new Error(`供应商 '${providerName}' 不存在\n使用 'akm list' 查看所有已配置的供应商`);
|
|
52
53
|
}
|
|
53
|
-
|
|
54
|
+
|
|
54
55
|
return provider;
|
|
55
56
|
}
|
|
56
57
|
|
|
@@ -59,36 +60,15 @@ class EnvSwitcher extends BaseCommand {
|
|
|
59
60
|
this.clearScreen();
|
|
60
61
|
const provider = await this.validateProvider(providerName);
|
|
61
62
|
const isCodex = provider.ideName === 'codex';
|
|
62
|
-
const availableArgs =
|
|
63
|
+
const availableArgs = LaunchArgsHelper.getAvailableLaunchArgs(isCodex);
|
|
63
64
|
|
|
64
65
|
// 优先使用上次使用的参数,如果没有则使用默认的 launchArgs
|
|
65
66
|
const defaultLaunchArgs = Array.isArray(provider.lastUsedArgs) && provider.lastUsedArgs.length > 0
|
|
66
67
|
? provider.lastUsedArgs
|
|
67
68
|
: (Array.isArray(provider.launchArgs) ? provider.launchArgs : []);
|
|
68
69
|
|
|
69
|
-
const
|
|
70
|
-
const
|
|
71
|
-
.filter(arg => typeof arg === 'string' && !knownArgNames.has(arg));
|
|
72
|
-
const mergedArgs = [
|
|
73
|
-
...availableArgs.map(arg => ({
|
|
74
|
-
...arg,
|
|
75
|
-
checked: defaultLaunchArgs.includes(arg.name) || Boolean(arg.checked)
|
|
76
|
-
})),
|
|
77
|
-
...customLaunchArgs.map(name => ({
|
|
78
|
-
name,
|
|
79
|
-
label: name,
|
|
80
|
-
description: '自定义启动参数',
|
|
81
|
-
checked: true
|
|
82
|
-
}))
|
|
83
|
-
];
|
|
84
|
-
const ideDisplayName = isCodex ? 'Codex CLI' : 'Claude Code';
|
|
85
|
-
|
|
86
|
-
// 显示提示:是否使用上次的参数
|
|
87
|
-
const isUsingLastUsed = Array.isArray(provider.lastUsedArgs) && provider.lastUsedArgs.length > 0;
|
|
88
|
-
if (isUsingLastUsed) {
|
|
89
|
-
console.log(UIHelper.colors.muted('💡 正在使用上次的启动参数'));
|
|
90
|
-
console.log();
|
|
91
|
-
}
|
|
70
|
+
const mergedArgs = LaunchArgsHelper.mergeArgsWithDefaults(availableArgs, defaultLaunchArgs);
|
|
71
|
+
const ideDisplayName = LaunchArgsHelper.getIDEDisplayName(isCodex);
|
|
92
72
|
|
|
93
73
|
console.log(UIHelper.createTitle('启动配置', UIHelper.icons.launch));
|
|
94
74
|
console.log();
|
|
@@ -115,18 +95,7 @@ class EnvSwitcher extends BaseCommand {
|
|
|
115
95
|
type: 'checkbox',
|
|
116
96
|
name: 'selectedArgs',
|
|
117
97
|
message: '选择启动参数:',
|
|
118
|
-
choices:
|
|
119
|
-
const commandText = UIHelper.colors.muted(`(${arg.name})`);
|
|
120
|
-
const descriptionText = arg.description
|
|
121
|
-
? ` ${UIHelper.colors.muted(arg.description)}`
|
|
122
|
-
: '';
|
|
123
|
-
|
|
124
|
-
return {
|
|
125
|
-
name: `${UIHelper.colors.accent(arg.label || arg.name)} ${commandText}${descriptionText}`,
|
|
126
|
-
value: arg.name,
|
|
127
|
-
checked: Boolean(arg.checked)
|
|
128
|
-
};
|
|
129
|
-
})
|
|
98
|
+
choices: LaunchArgsHelper.formatArgsForDisplay(mergedArgs, UIHelper)
|
|
130
99
|
}
|
|
131
100
|
];
|
|
132
101
|
|
|
@@ -144,16 +113,12 @@ class EnvSwitcher extends BaseCommand {
|
|
|
144
113
|
this.removeESCListener(escListener);
|
|
145
114
|
|
|
146
115
|
// 检查互斥参数
|
|
147
|
-
const conflictError =
|
|
116
|
+
const conflictError = LaunchArgsHelper.validateArgsConflict(answers.selectedArgs, availableArgs);
|
|
148
117
|
if (conflictError) {
|
|
149
118
|
Logger.warning(conflictError);
|
|
150
119
|
return await this.showLaunchArgsSelection(providerName);
|
|
151
120
|
}
|
|
152
121
|
|
|
153
|
-
// 保存上次使用的启动参数
|
|
154
|
-
await this.configManager.updateLastUsedArgs(providerName, answers.selectedArgs);
|
|
155
|
-
|
|
156
|
-
// 选择参数后直接启动
|
|
157
122
|
await this.launchProvider(provider, answers.selectedArgs);
|
|
158
123
|
|
|
159
124
|
} catch (error) {
|
|
@@ -161,112 +126,13 @@ class EnvSwitcher extends BaseCommand {
|
|
|
161
126
|
}
|
|
162
127
|
}
|
|
163
128
|
|
|
164
|
-
async ensureClaudeSettingsCompatibility(provider) {
|
|
165
|
-
try {
|
|
166
|
-
const conflict = await findSettingsConflict();
|
|
167
|
-
if (!conflict) {
|
|
168
|
-
return true;
|
|
169
|
-
}
|
|
170
|
-
|
|
171
|
-
const keyList = conflict.keys.map((key) => `• ${key}`).join('\n');
|
|
172
|
-
|
|
173
|
-
const backupDir = path.dirname(conflict.filePath);
|
|
174
|
-
|
|
175
|
-
this.clearScreen();
|
|
176
|
-
console.log(UIHelper.createTitle('检测到环境变量冲突', UIHelper.icons.warning));
|
|
177
|
-
console.log();
|
|
178
|
-
console.log(UIHelper.createCard('冲突文件', conflict.filePath, UIHelper.icons.info));
|
|
179
|
-
console.log();
|
|
180
|
-
console.log(UIHelper.createCard('备份目录', `${backupDir}\n备份文件将命名为 settings.backup-YYYYMMDD_HHmmss.json`, UIHelper.icons.info));
|
|
181
|
-
console.log();
|
|
182
|
-
console.log(UIHelper.createCard('可能覆盖的变量', keyList, UIHelper.icons.warning));
|
|
183
|
-
console.log();
|
|
184
|
-
console.log(UIHelper.createTooltip('Claude 会优先读取该设置文件中的 env 配置,可能覆盖本次为供应商设置的变量。'));
|
|
185
|
-
console.log();
|
|
186
|
-
|
|
187
|
-
let answer;
|
|
188
|
-
try {
|
|
189
|
-
answer = await this.prompt([
|
|
190
|
-
{
|
|
191
|
-
type: 'list',
|
|
192
|
-
name: 'action',
|
|
193
|
-
message: `在 ${conflict.filePath} 中发现 env 配置会覆盖供应商 '${provider.displayName || provider.name}' 的变量,选择处理方式:`,
|
|
194
|
-
choices: [
|
|
195
|
-
{ name: '🔧 备份并清空这些变量', value: 'fix' },
|
|
196
|
-
{ name: '⚠️ 忽略并继续(可能导致切换失败)', value: 'ignore' },
|
|
197
|
-
{ name: '❌ 取消启动', value: 'cancel' }
|
|
198
|
-
],
|
|
199
|
-
default: 'fix'
|
|
200
|
-
}
|
|
201
|
-
]);
|
|
202
|
-
} catch (error) {
|
|
203
|
-
if (this.isEscCancelled(error)) {
|
|
204
|
-
Logger.info('已取消启动');
|
|
205
|
-
return false;
|
|
206
|
-
}
|
|
207
|
-
throw error;
|
|
208
|
-
}
|
|
209
|
-
|
|
210
|
-
if (answer.action === 'fix') {
|
|
211
|
-
let confirmBackup;
|
|
212
|
-
try {
|
|
213
|
-
confirmBackup = await this.prompt([
|
|
214
|
-
{
|
|
215
|
-
type: 'confirm',
|
|
216
|
-
name: 'confirmed',
|
|
217
|
-
message: `将在 ${backupDir} 中创建备份文件 (settings.backup-YYYYMMDD_HHmmss.json),并清空冲突变量。是否继续?`,
|
|
218
|
-
default: true
|
|
219
|
-
}
|
|
220
|
-
]);
|
|
221
|
-
} catch (error) {
|
|
222
|
-
if (this.isEscCancelled(error)) {
|
|
223
|
-
Logger.info('已取消启动');
|
|
224
|
-
return false;
|
|
225
|
-
}
|
|
226
|
-
throw error;
|
|
227
|
-
}
|
|
228
|
-
|
|
229
|
-
if (!confirmBackup.confirmed) {
|
|
230
|
-
Logger.info('已取消启动');
|
|
231
|
-
return false;
|
|
232
|
-
}
|
|
233
|
-
|
|
234
|
-
try {
|
|
235
|
-
const backupPath = await backupSettingsFile(conflict.filePath);
|
|
236
|
-
const updatedSettings = clearConflictKeys(
|
|
237
|
-
{
|
|
238
|
-
...conflict.settings,
|
|
239
|
-
env: conflict.settings.env ? { ...conflict.settings.env } : undefined
|
|
240
|
-
},
|
|
241
|
-
conflict.keys
|
|
242
|
-
);
|
|
243
|
-
await saveSettingsFile(conflict.filePath, updatedSettings);
|
|
244
|
-
Logger.success(`已将 ${conflict.filePath} 备份至 '${backupPath}' 并清空冲突变量。`);
|
|
245
|
-
} catch (error) {
|
|
246
|
-
throw new Error(`清理 Claude 设置文件失败: ${error.message}`);
|
|
247
|
-
}
|
|
248
|
-
return true;
|
|
249
|
-
}
|
|
250
|
-
|
|
251
|
-
if (answer.action === 'ignore') {
|
|
252
|
-
Logger.warning(`已忽略 ${conflict.filePath} 中的冲突,Claude 可能仍会使用该文件里的旧变量。`);
|
|
253
|
-
return true;
|
|
254
|
-
}
|
|
255
|
-
|
|
256
|
-
Logger.info('已取消启动');
|
|
257
|
-
return false;
|
|
258
|
-
} catch (error) {
|
|
259
|
-
throw error;
|
|
260
|
-
}
|
|
261
|
-
}
|
|
262
|
-
|
|
263
129
|
async launchProvider(provider, selectedLaunchArgs) {
|
|
264
130
|
try {
|
|
265
131
|
const isCodex = provider.ideName === 'codex';
|
|
266
132
|
|
|
267
133
|
// Claude Code 才需要检测设置冲突
|
|
268
134
|
if (!isCodex) {
|
|
269
|
-
const shouldContinue = await
|
|
135
|
+
const shouldContinue = await ensureClaudeSettingsCompatibility(this, provider);
|
|
270
136
|
if (!shouldContinue) {
|
|
271
137
|
return;
|
|
272
138
|
}
|
|
@@ -287,25 +153,12 @@ class EnvSwitcher extends BaseCommand {
|
|
|
287
153
|
const loadingInterval = UIHelper.createLoadingAnimation('正在设置环境...');
|
|
288
154
|
|
|
289
155
|
try {
|
|
290
|
-
|
|
291
|
-
await this.configManager.setCurrentProvider(provider.name);
|
|
292
|
-
|
|
293
|
-
// 更新使用统计
|
|
294
|
-
provider.usageCount = (provider.usageCount || 0) + 1;
|
|
295
|
-
provider.lastUsed = new Date().toISOString();
|
|
296
|
-
await this.configManager.save();
|
|
297
|
-
|
|
156
|
+
await markProviderAsCurrent(this.configManager, provider, selectedLaunchArgs);
|
|
298
157
|
UIHelper.clearLoadingAnimation(loadingInterval);
|
|
299
158
|
|
|
300
159
|
console.log(UIHelper.createCard('准备就绪', `环境配置完成,正在启动 🚀 ${ideDisplayName}...`, UIHelper.icons.success));
|
|
301
160
|
console.log();
|
|
302
|
-
|
|
303
|
-
if (isCodex) {
|
|
304
|
-
await executeCodexWithEnv(provider, selectedLaunchArgs);
|
|
305
|
-
} else {
|
|
306
|
-
// 设置环境变量并启动 Claude Code
|
|
307
|
-
await executeWithEnv(provider, selectedLaunchArgs);
|
|
308
|
-
}
|
|
161
|
+
await launchProviderProcess(provider, selectedLaunchArgs);
|
|
309
162
|
|
|
310
163
|
} catch (error) {
|
|
311
164
|
UIHelper.clearLoadingAnimation(loadingInterval);
|
|
@@ -334,7 +187,7 @@ class EnvSwitcher extends BaseCommand {
|
|
|
334
187
|
async quickLaunchProvider(providerName, options) {
|
|
335
188
|
try {
|
|
336
189
|
await this.configManager.ensureLoaded();
|
|
337
|
-
|
|
190
|
+
|
|
338
191
|
// 支持别名查找
|
|
339
192
|
let provider = this.configManager.getProvider(providerName);
|
|
340
193
|
if (!provider) {
|
|
@@ -356,7 +209,7 @@ class EnvSwitcher extends BaseCommand {
|
|
|
356
209
|
selectedArgs = Array.isArray(provider.lastUsedArgs) && provider.lastUsedArgs.length > 0
|
|
357
210
|
? provider.lastUsedArgs
|
|
358
211
|
: (Array.isArray(provider.launchArgs) ? provider.launchArgs : []);
|
|
359
|
-
|
|
212
|
+
|
|
360
213
|
if (Array.isArray(provider.lastUsedArgs) && provider.lastUsedArgs.length > 0) {
|
|
361
214
|
console.log(UIHelper.colors.muted('💡 使用上次的启动参数: ' + selectedArgs.join(' ')));
|
|
362
215
|
} else {
|
|
@@ -364,9 +217,6 @@ class EnvSwitcher extends BaseCommand {
|
|
|
364
217
|
}
|
|
365
218
|
}
|
|
366
219
|
|
|
367
|
-
// 更新上次使用的参数(使用真实的 provider.name 而不是别名)
|
|
368
|
-
await this.configManager.updateLastUsedArgs(provider.name, selectedArgs);
|
|
369
|
-
|
|
370
220
|
// 直接启动供应商
|
|
371
221
|
await this.launchProvider(provider, selectedArgs);
|
|
372
222
|
|
|
@@ -375,21 +225,6 @@ class EnvSwitcher extends BaseCommand {
|
|
|
375
225
|
}
|
|
376
226
|
}
|
|
377
227
|
|
|
378
|
-
getAvailableLaunchArgs() {
|
|
379
|
-
const { getClaudeLaunchArgs } = require('../utils/launch-args');
|
|
380
|
-
return getClaudeLaunchArgs();
|
|
381
|
-
}
|
|
382
|
-
|
|
383
|
-
checkExclusiveArgs(selectedArgs, availableArgs) {
|
|
384
|
-
const { checkExclusiveArgs } = require('../utils/launch-args');
|
|
385
|
-
return checkExclusiveArgs(selectedArgs, availableArgs);
|
|
386
|
-
}
|
|
387
|
-
|
|
388
|
-
getCodexLaunchArgs() {
|
|
389
|
-
const { getCodexLaunchArgs } = require('../utils/launch-args');
|
|
390
|
-
return getCodexLaunchArgs();
|
|
391
|
-
}
|
|
392
|
-
|
|
393
228
|
async showProviderSelection() {
|
|
394
229
|
try {
|
|
395
230
|
// 并行加载配置和准备界面
|
|
@@ -499,7 +334,7 @@ class EnvSwitcher extends BaseCommand {
|
|
|
499
334
|
}
|
|
500
335
|
}
|
|
501
336
|
|
|
502
|
-
showWelcomeScreen(providers,
|
|
337
|
+
showWelcomeScreen(providers, _statusMap = {}, statusError = null) {
|
|
503
338
|
this.clearScreen();
|
|
504
339
|
|
|
505
340
|
if (providers.length > 0) {
|
|
@@ -549,8 +384,6 @@ class EnvSwitcher extends BaseCommand {
|
|
|
549
384
|
console.log();
|
|
550
385
|
const choices = [
|
|
551
386
|
{ name: `${UIHelper.icons.search} 搜索供应商`, value: 'search' },
|
|
552
|
-
{ name: `${UIHelper.icons.edit} 批量编辑`, value: 'batch' },
|
|
553
|
-
{ name: `${UIHelper.icons.settings} 全局设置`, value: 'global' },
|
|
554
387
|
{ name: `${UIHelper.icons.info} 查看统计`, value: 'stats' },
|
|
555
388
|
{ name: `${UIHelper.icons.back} 返回主菜单`, value: 'back' }
|
|
556
389
|
];
|
|
@@ -716,14 +549,17 @@ class EnvSwitcher extends BaseCommand {
|
|
|
716
549
|
);
|
|
717
550
|
|
|
718
551
|
if (searchResults.length === 0) {
|
|
719
|
-
Logger.warning(
|
|
720
|
-
return await this.
|
|
552
|
+
Logger.warning(`未找到匹配"${answer.search}"的供应商,请重新搜索`);
|
|
553
|
+
return await this.showSearchProvider();
|
|
721
554
|
}
|
|
722
555
|
|
|
723
|
-
const choices =
|
|
724
|
-
|
|
725
|
-
|
|
726
|
-
|
|
556
|
+
const choices = ProviderChoicesHelper.buildProviderChoices(searchResults, {
|
|
557
|
+
statusMap: this._buildInitialStatusMap(searchResults),
|
|
558
|
+
UIHelper,
|
|
559
|
+
StatusHelper,
|
|
560
|
+
chalk,
|
|
561
|
+
Separator: inquirer.Separator
|
|
562
|
+
});
|
|
727
563
|
|
|
728
564
|
choices.push(
|
|
729
565
|
new inquirer.Separator(),
|
|
@@ -799,12 +635,6 @@ class EnvSwitcher extends BaseCommand {
|
|
|
799
635
|
|
|
800
636
|
console.log(UIHelper.createTable(['项目', '数据'], stats));
|
|
801
637
|
console.log();
|
|
802
|
-
console.log(UIHelper.createHintLine([
|
|
803
|
-
['Enter', '返回快速设置'],
|
|
804
|
-
['ESC', '返回快速设置']
|
|
805
|
-
]));
|
|
806
|
-
console.log();
|
|
807
|
-
|
|
808
638
|
// 设置 ESC 键监听
|
|
809
639
|
const escListener = this.createESCListener(() => {
|
|
810
640
|
Logger.info('返回快速设置');
|
|
@@ -814,9 +644,10 @@ class EnvSwitcher extends BaseCommand {
|
|
|
814
644
|
try {
|
|
815
645
|
await this.prompt([
|
|
816
646
|
{
|
|
817
|
-
type: '
|
|
818
|
-
name: '
|
|
819
|
-
message: '
|
|
647
|
+
type: 'list',
|
|
648
|
+
name: 'action',
|
|
649
|
+
message: '操作:',
|
|
650
|
+
choices: [{ name: `${UIHelper.icons.back} 返回`, value: 'back' }]
|
|
820
651
|
}
|
|
821
652
|
]);
|
|
822
653
|
} catch (error) {
|
|
@@ -828,7 +659,6 @@ class EnvSwitcher extends BaseCommand {
|
|
|
828
659
|
}
|
|
829
660
|
|
|
830
661
|
this.removeESCListener(escListener);
|
|
831
|
-
|
|
832
662
|
return await this.showQuickSettings();
|
|
833
663
|
}
|
|
834
664
|
|
|
@@ -891,9 +721,10 @@ class EnvSwitcher extends BaseCommand {
|
|
|
891
721
|
try {
|
|
892
722
|
await this.prompt([
|
|
893
723
|
{
|
|
894
|
-
type: '
|
|
895
|
-
name: '
|
|
896
|
-
message: '
|
|
724
|
+
type: 'list',
|
|
725
|
+
name: 'action',
|
|
726
|
+
message: '操作:',
|
|
727
|
+
choices: [{ name: `${UIHelper.icons.back} 返回主菜单`, value: 'back' }]
|
|
897
728
|
}
|
|
898
729
|
]);
|
|
899
730
|
} catch (error) {
|
|
@@ -984,44 +815,14 @@ class EnvSwitcher extends BaseCommand {
|
|
|
984
815
|
}
|
|
985
816
|
|
|
986
817
|
createProviderChoices(providers, includeActions = false, statusMap = {}) {
|
|
987
|
-
|
|
988
|
-
|
|
989
|
-
|
|
990
|
-
|
|
991
|
-
|
|
992
|
-
|
|
993
|
-
|
|
994
|
-
return new Date(current.lastUsed) > new Date(latest.lastUsed) ? current : latest;
|
|
995
|
-
}, null);
|
|
996
|
-
|
|
997
|
-
const choices = providers.map(provider => {
|
|
998
|
-
const isLastUsed = lastUsedProvider && lastUsedProvider.name === provider.name;
|
|
999
|
-
const availability = statusMap[provider.name];
|
|
1000
|
-
const icon = this._iconForState(availability?.state);
|
|
1001
|
-
const statusText = this._formatAvailability(availability);
|
|
1002
|
-
const statusLabel = chalk.gray('-') + ' ' + statusText;
|
|
1003
|
-
// IDE 类型标签
|
|
1004
|
-
const ideTag = provider.ideName === 'codex'
|
|
1005
|
-
? chalk.cyan('[Codex]')
|
|
1006
|
-
: chalk.magenta('[Claude]');
|
|
1007
|
-
const label = `${icon} ${ideTag} ${UIHelper.formatProvider(provider)}${isLastUsed ? UIHelper.colors.muted(' --- 上次使用') : ''} ${statusLabel}`;
|
|
1008
|
-
|
|
1009
|
-
return {
|
|
1010
|
-
name: label,
|
|
1011
|
-
value: provider.name,
|
|
1012
|
-
short: provider.name
|
|
1013
|
-
};
|
|
818
|
+
return ProviderChoicesHelper.buildProviderChoices(providers, {
|
|
819
|
+
includeActions,
|
|
820
|
+
statusMap,
|
|
821
|
+
UIHelper,
|
|
822
|
+
StatusHelper,
|
|
823
|
+
chalk,
|
|
824
|
+
Separator: inquirer.Separator
|
|
1014
825
|
});
|
|
1015
|
-
|
|
1016
|
-
if (includeActions) {
|
|
1017
|
-
choices.push(
|
|
1018
|
-
new inquirer.Separator(),
|
|
1019
|
-
{ name: `${UIHelper.icons.back} 返回供应商选择`, value: 'back' },
|
|
1020
|
-
{ name: `${UIHelper.icons.error} 退出`, value: 'exit' }
|
|
1021
|
-
);
|
|
1022
|
-
}
|
|
1023
|
-
|
|
1024
|
-
return choices;
|
|
1025
826
|
}
|
|
1026
827
|
|
|
1027
828
|
_iconForState(state) {
|
|
@@ -1091,56 +892,7 @@ class EnvSwitcher extends BaseCommand {
|
|
|
1091
892
|
return;
|
|
1092
893
|
}
|
|
1093
894
|
|
|
1094
|
-
|
|
1095
|
-
const updatedChoicesBase = this.createProviderChoices(providers, includeActions, statusMap);
|
|
1096
|
-
const updatedChoices = [...updatedChoicesBase];
|
|
1097
|
-
|
|
1098
|
-
if (!includeActions) {
|
|
1099
|
-
updatedChoices.push(
|
|
1100
|
-
new inquirer.Separator(),
|
|
1101
|
-
{ name: `${UIHelper.icons.add} 添加新供应商`, value: '__ADD__' },
|
|
1102
|
-
{ name: `${UIHelper.icons.list} 供应商管理 (编辑/删除)`, value: '__MANAGE__' },
|
|
1103
|
-
{ name: `${UIHelper.icons.config} 打开配置文件`, value: '__OPEN_CONFIG__' },
|
|
1104
|
-
{ name: `${UIHelper.icons.error} 退出`, value: '__EXIT__' }
|
|
1105
|
-
);
|
|
1106
|
-
}
|
|
1107
|
-
|
|
1108
|
-
const previousValue = (() => {
|
|
1109
|
-
try {
|
|
1110
|
-
return activePrompt.opt.choices?.getChoice(activePrompt.selected)?.value ?? null;
|
|
1111
|
-
} catch (err) {
|
|
1112
|
-
return null;
|
|
1113
|
-
}
|
|
1114
|
-
})();
|
|
1115
|
-
|
|
1116
|
-
activePrompt.opt.choices = new Choices(updatedChoices, activePrompt.answers);
|
|
1117
|
-
|
|
1118
|
-
if (previousValue != null) {
|
|
1119
|
-
const newIndex = activePrompt.opt.choices.realChoices.findIndex(choice => choice.value === previousValue);
|
|
1120
|
-
if (newIndex >= 0) {
|
|
1121
|
-
activePrompt.selected = newIndex;
|
|
1122
|
-
} else if (activePrompt.selected >= activePrompt.opt.choices.realLength) {
|
|
1123
|
-
activePrompt.selected = Math.max(activePrompt.opt.choices.realLength - 1, 0);
|
|
1124
|
-
}
|
|
1125
|
-
} else if (activePrompt.selected >= activePrompt.opt.choices.realLength) {
|
|
1126
|
-
activePrompt.selected = Math.max(activePrompt.opt.choices.realLength - 1, 0);
|
|
1127
|
-
}
|
|
1128
|
-
|
|
1129
|
-
if (error) {
|
|
1130
|
-
if (this.currentPromptContext === 'selection') {
|
|
1131
|
-
activePrompt.opt.message = `请选择要切换的供应商 (总计 ${providers.length} 个,状态检测失败,使用默认配置):`;
|
|
1132
|
-
} else if (this.currentPromptContext === 'manage') {
|
|
1133
|
-
activePrompt.opt.message = `选择供应商或操作 (总计 ${providers.length} 个,状态检测失败,使用默认配置):`;
|
|
1134
|
-
}
|
|
1135
|
-
} else {
|
|
1136
|
-
if (this.currentPromptContext === 'selection') {
|
|
1137
|
-
activePrompt.opt.message = `请选择要切换的供应商 (总计 ${providers.length} 个):`;
|
|
1138
|
-
} else if (this.currentPromptContext === 'manage') {
|
|
1139
|
-
activePrompt.opt.message = `选择供应商或操作 (总计 ${providers.length} 个):`;
|
|
1140
|
-
}
|
|
1141
|
-
}
|
|
1142
|
-
|
|
1143
|
-
activePrompt.render();
|
|
895
|
+
this._refreshPromptChoices(activePrompt, providers, statusMap, { hasError: Boolean(error) });
|
|
1144
896
|
}
|
|
1145
897
|
|
|
1146
898
|
_applyIncrementalStatus(providerName, status, refreshToken) {
|
|
@@ -1156,10 +908,14 @@ class EnvSwitcher extends BaseCommand {
|
|
|
1156
908
|
return;
|
|
1157
909
|
}
|
|
1158
910
|
|
|
1159
|
-
const includeActions = this.currentPromptContext === 'manage';
|
|
1160
911
|
// 使用保存的过滤后供应商列表,而不是重新获取全部
|
|
1161
912
|
const providers = this.filteredProviders || this.configManager.listProviders();
|
|
1162
913
|
const statusMap = this.latestStatusMap || {};
|
|
914
|
+
this._refreshPromptChoices(activePrompt, providers, statusMap);
|
|
915
|
+
}
|
|
916
|
+
|
|
917
|
+
_refreshPromptChoices(activePrompt, providers, statusMap, options = {}) {
|
|
918
|
+
const includeActions = this.currentPromptContext === 'manage';
|
|
1163
919
|
const updatedChoicesBase = this.createProviderChoices(providers, includeActions, statusMap);
|
|
1164
920
|
const updatedChoices = [...updatedChoicesBase];
|
|
1165
921
|
|
|
@@ -1173,16 +929,25 @@ class EnvSwitcher extends BaseCommand {
|
|
|
1173
929
|
);
|
|
1174
930
|
}
|
|
1175
931
|
|
|
1176
|
-
const previousValue = (
|
|
1177
|
-
try {
|
|
1178
|
-
return activePrompt.opt.choices?.getChoice(activePrompt.selected)?.value ?? null;
|
|
1179
|
-
} catch (err) {
|
|
1180
|
-
return null;
|
|
1181
|
-
}
|
|
1182
|
-
})();
|
|
932
|
+
const previousValue = this._getActivePromptPreviousValue(activePrompt);
|
|
1183
933
|
|
|
1184
934
|
activePrompt.opt.choices = new Choices(updatedChoices, activePrompt.answers);
|
|
1185
935
|
|
|
936
|
+
this._restorePromptSelection(activePrompt, previousValue);
|
|
937
|
+
activePrompt.opt.message = this._buildStatusPromptMessage(providers.length, options.hasError);
|
|
938
|
+
|
|
939
|
+
activePrompt.render();
|
|
940
|
+
}
|
|
941
|
+
|
|
942
|
+
_getActivePromptPreviousValue(activePrompt) {
|
|
943
|
+
try {
|
|
944
|
+
return activePrompt.opt.choices?.getChoice(activePrompt.selected)?.value ?? null;
|
|
945
|
+
} catch {
|
|
946
|
+
return null;
|
|
947
|
+
}
|
|
948
|
+
}
|
|
949
|
+
|
|
950
|
+
_restorePromptSelection(activePrompt, previousValue) {
|
|
1186
951
|
if (previousValue != null) {
|
|
1187
952
|
const newIndex = activePrompt.opt.choices.realChoices.findIndex(choice => choice.value === previousValue);
|
|
1188
953
|
if (newIndex >= 0) {
|
|
@@ -1193,14 +958,17 @@ class EnvSwitcher extends BaseCommand {
|
|
|
1193
958
|
} else if (activePrompt.selected >= activePrompt.opt.choices.realLength) {
|
|
1194
959
|
activePrompt.selected = Math.max(activePrompt.opt.choices.realLength - 1, 0);
|
|
1195
960
|
}
|
|
961
|
+
}
|
|
1196
962
|
|
|
963
|
+
_buildStatusPromptMessage(providerCount, hasError = false) {
|
|
964
|
+
const errorSuffix = hasError ? ',状态检测失败,使用默认配置' : '';
|
|
1197
965
|
if (this.currentPromptContext === 'selection') {
|
|
1198
|
-
|
|
1199
|
-
} else if (this.currentPromptContext === 'manage') {
|
|
1200
|
-
activePrompt.opt.message = `选择供应商或操作 (总计 ${providers.length} 个):`;
|
|
966
|
+
return `请选择要切换的供应商 (总计 ${providerCount} 个${errorSuffix}):`;
|
|
1201
967
|
}
|
|
1202
|
-
|
|
1203
|
-
|
|
968
|
+
if (this.currentPromptContext === 'manage') {
|
|
969
|
+
return `选择供应商或操作 (总计 ${providerCount} 个${errorSuffix}):`;
|
|
970
|
+
}
|
|
971
|
+
return '';
|
|
1204
972
|
}
|
|
1205
973
|
|
|
1206
974
|
async handleManageAction(action) {
|
|
@@ -1232,33 +1000,18 @@ class EnvSwitcher extends BaseCommand {
|
|
|
1232
1000
|
]));
|
|
1233
1001
|
console.log();
|
|
1234
1002
|
|
|
1235
|
-
const details =
|
|
1236
|
-
|
|
1237
|
-
|
|
1238
|
-
|
|
1239
|
-
|
|
1240
|
-
|
|
1241
|
-
// 继续添加其他信息
|
|
1242
|
-
const baseUrlDisplay = provider.baseUrl
|
|
1243
|
-
|| (provider.authMode === 'auth_token'
|
|
1244
|
-
? BASE_URL.OFFICIAL_DEFAULT
|
|
1245
|
-
: '⚠️ 未设置');
|
|
1246
|
-
details.push(
|
|
1247
|
-
['基础URL', baseUrlDisplay],
|
|
1248
|
-
['认证令牌', provider.authToken || '未设置'],
|
|
1249
|
-
['主模型', provider.models?.primary || '未设置'],
|
|
1250
|
-
['快速模型', provider.models?.smallFast || '未设置'],
|
|
1251
|
-
['创建时间', UIHelper.formatTime(provider.createdAt)],
|
|
1252
|
-
['最后使用', UIHelper.formatTime(provider.lastUsed)],
|
|
1253
|
-
['当前状态', provider.current ? '✅ 使用中' : '⚫ 未使用'],
|
|
1254
|
-
['使用次数', provider.usageCount || 0]
|
|
1255
|
-
);
|
|
1003
|
+
const details = ProviderDetailsHelper.buildDetailsRows(provider, {
|
|
1004
|
+
authModeDisplay: AUTH_MODE_DISPLAY,
|
|
1005
|
+
baseUrl: BASE_URL,
|
|
1006
|
+
formatTime: UIHelper.formatTime
|
|
1007
|
+
});
|
|
1256
1008
|
|
|
1257
1009
|
console.log(UIHelper.createTable(['项目', '信息'], details));
|
|
1258
1010
|
console.log();
|
|
1259
1011
|
|
|
1260
|
-
|
|
1261
|
-
|
|
1012
|
+
const launchArgsText = ProviderDetailsHelper.formatLaunchArgs(provider);
|
|
1013
|
+
if (launchArgsText) {
|
|
1014
|
+
console.log(UIHelper.createCard('默认启动参数', launchArgsText, UIHelper.icons.settings));
|
|
1262
1015
|
console.log();
|
|
1263
1016
|
}
|
|
1264
1017
|
|
|
@@ -1275,12 +1028,7 @@ class EnvSwitcher extends BaseCommand {
|
|
|
1275
1028
|
type: 'list',
|
|
1276
1029
|
name: 'action',
|
|
1277
1030
|
message: '选择操作:',
|
|
1278
|
-
choices:
|
|
1279
|
-
{ name: `${UIHelper.icons.launch} 立即启动`, value: 'launch' },
|
|
1280
|
-
{ name: `${UIHelper.icons.edit} 编辑供应商`, value: 'edit' },
|
|
1281
|
-
{ name: `${UIHelper.icons.delete} 删除供应商`, value: 'remove' },
|
|
1282
|
-
{ name: `${UIHelper.icons.back} 返回管理列表`, value: 'back' }
|
|
1283
|
-
]
|
|
1031
|
+
choices: ProviderDetailsHelper.buildActionChoices(UIHelper.icons)
|
|
1284
1032
|
}
|
|
1285
1033
|
]);
|
|
1286
1034
|
} catch (error) {
|
|
@@ -1337,104 +1085,7 @@ class EnvSwitcher extends BaseCommand {
|
|
|
1337
1085
|
|
|
1338
1086
|
// 根据 IDE 类型构建不同的问卷
|
|
1339
1087
|
const isCodex = provider.ideName === 'codex';
|
|
1340
|
-
const questions =
|
|
1341
|
-
{
|
|
1342
|
-
type: 'input',
|
|
1343
|
-
name: 'name',
|
|
1344
|
-
message: '请输入供应商名称 (用于命令行):',
|
|
1345
|
-
default: provider.name,
|
|
1346
|
-
validate: (input) => {
|
|
1347
|
-
const error = validator.validateName(input);
|
|
1348
|
-
if (error) return error;
|
|
1349
|
-
return true;
|
|
1350
|
-
}
|
|
1351
|
-
},
|
|
1352
|
-
{
|
|
1353
|
-
type: 'input',
|
|
1354
|
-
name: 'displayName',
|
|
1355
|
-
message: '显示名称:',
|
|
1356
|
-
default: provider.displayName,
|
|
1357
|
-
prefillDefault: true
|
|
1358
|
-
},
|
|
1359
|
-
{
|
|
1360
|
-
type: 'input',
|
|
1361
|
-
name: 'alias',
|
|
1362
|
-
message: '别名 (用于快速切换):',
|
|
1363
|
-
default: provider.alias,
|
|
1364
|
-
prefillDefault: true,
|
|
1365
|
-
validate: (input) => {
|
|
1366
|
-
if (!input) return true; // 别名是可选的
|
|
1367
|
-
const error = validator.validateName(input);
|
|
1368
|
-
if (error) return error;
|
|
1369
|
-
return true;
|
|
1370
|
-
}
|
|
1371
|
-
}
|
|
1372
|
-
];
|
|
1373
|
-
|
|
1374
|
-
// Claude Code 特定的字段
|
|
1375
|
-
if (!isCodex) {
|
|
1376
|
-
questions.push(
|
|
1377
|
-
{
|
|
1378
|
-
type: 'list',
|
|
1379
|
-
name: 'authMode',
|
|
1380
|
-
message: '认证模式:',
|
|
1381
|
-
choices: [
|
|
1382
|
-
{ name: '🔑 ANTHROPIC_API_KEY - 大多数第三方代理使用', value: 'api_key' },
|
|
1383
|
-
{ name: '🔐 ANTHROPIC_AUTH_TOKEN - 部分服务商使用', value: 'auth_token' }
|
|
1384
|
-
],
|
|
1385
|
-
default: provider.authMode || 'api_key'
|
|
1386
|
-
},
|
|
1387
|
-
{
|
|
1388
|
-
type: 'input',
|
|
1389
|
-
name: 'primaryModel',
|
|
1390
|
-
message: '主模型 (ANTHROPIC_MODEL):',
|
|
1391
|
-
default: provider.models?.primary || '',
|
|
1392
|
-
prefillDefault: true,
|
|
1393
|
-
allowEmpty: true,
|
|
1394
|
-
validate: (input) => {
|
|
1395
|
-
const error = validator.validateModel(input);
|
|
1396
|
-
if (error) return error;
|
|
1397
|
-
return true;
|
|
1398
|
-
}
|
|
1399
|
-
},
|
|
1400
|
-
{
|
|
1401
|
-
type: 'input',
|
|
1402
|
-
name: 'smallFastModel',
|
|
1403
|
-
message: '快速模型 (ANTHROPIC_SMALL_FAST_MODEL):',
|
|
1404
|
-
default: provider.models?.smallFast || '',
|
|
1405
|
-
prefillDefault: true,
|
|
1406
|
-
allowEmpty: true,
|
|
1407
|
-
validate: (input) => {
|
|
1408
|
-
const error = validator.validateModel(input);
|
|
1409
|
-
if (error) return error;
|
|
1410
|
-
return true;
|
|
1411
|
-
}
|
|
1412
|
-
}
|
|
1413
|
-
);
|
|
1414
|
-
}
|
|
1415
|
-
|
|
1416
|
-
// 通用字段(Claude 和 Codex 都需要)
|
|
1417
|
-
questions.push({
|
|
1418
|
-
type: 'input',
|
|
1419
|
-
name: 'baseUrl',
|
|
1420
|
-
message: isCodex ? '基础URL (OPENAI_BASE_URL):' : '基础URL:',
|
|
1421
|
-
default: provider.baseUrl,
|
|
1422
|
-
prefillDefault: true
|
|
1423
|
-
});
|
|
1424
|
-
|
|
1425
|
-
questions.push({
|
|
1426
|
-
type: 'input',
|
|
1427
|
-
name: 'authToken',
|
|
1428
|
-
message: (answers) => {
|
|
1429
|
-
if (isCodex) {
|
|
1430
|
-
return 'API Key (OPENAI_API_KEY):';
|
|
1431
|
-
}
|
|
1432
|
-
const envVar = answers.authMode === 'auth_token' ? 'ANTHROPIC_AUTH_TOKEN' : 'ANTHROPIC_API_KEY';
|
|
1433
|
-
return `Token (${envVar}):`;
|
|
1434
|
-
},
|
|
1435
|
-
default: provider.authToken,
|
|
1436
|
-
prefillDefault: true
|
|
1437
|
-
});
|
|
1088
|
+
const questions = ProviderEditQuestionsHelper.buildQuestions(provider, validator);
|
|
1438
1089
|
|
|
1439
1090
|
let answers;
|
|
1440
1091
|
try {
|
|
@@ -1477,8 +1128,7 @@ class EnvSwitcher extends BaseCommand {
|
|
|
1477
1128
|
}
|
|
1478
1129
|
|
|
1479
1130
|
// 更新供应商配置
|
|
1480
|
-
provider.displayName =
|
|
1481
|
-
provider.alias = answers.alias || null;
|
|
1131
|
+
provider.displayName = newName;
|
|
1482
1132
|
provider.baseUrl = answers.baseUrl;
|
|
1483
1133
|
provider.authToken = answers.authToken;
|
|
1484
1134
|
|