@vybestack/llxprt-code 0.1.19-beta → 0.1.19
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/README.md +49 -2
- package/dist/package.json +3 -3
- package/dist/src/auth/anthropic-oauth-provider.d.ts +33 -0
- package/dist/src/auth/anthropic-oauth-provider.js +129 -0
- package/dist/src/auth/anthropic-oauth-provider.js.map +1 -0
- package/dist/src/auth/gemini-oauth-provider.d.ts +15 -0
- package/dist/src/auth/gemini-oauth-provider.js +33 -0
- package/dist/src/auth/gemini-oauth-provider.js.map +1 -0
- package/dist/src/auth/oauth-manager.d.ts +110 -0
- package/dist/src/auth/oauth-manager.js +345 -0
- package/dist/src/auth/oauth-manager.js.map +1 -0
- package/dist/src/auth/oauth-manager.spec.d.ts +6 -0
- package/dist/src/auth/oauth-manager.spec.js +523 -0
- package/dist/src/auth/oauth-manager.spec.js.map +1 -0
- package/dist/src/auth/qwen-oauth-provider.d.ts +14 -0
- package/dist/src/auth/qwen-oauth-provider.js +75 -0
- package/dist/src/auth/qwen-oauth-provider.js.map +1 -0
- package/dist/src/auth/types.d.ts +7 -0
- package/dist/src/auth/types.js +7 -0
- package/dist/src/auth/types.js.map +1 -0
- package/dist/src/config/auth.js +6 -0
- package/dist/src/config/auth.js.map +1 -1
- package/dist/src/config/config.js +32 -15
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/keyBindings.d.ts +2 -0
- package/dist/src/config/keyBindings.js +7 -8
- package/dist/src/config/keyBindings.js.map +1 -1
- package/dist/src/config/settings.d.ts +3 -62
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +587 -0
- package/dist/src/config/settingsSchema.js +565 -0
- package/dist/src/config/settingsSchema.js.map +1 -0
- package/dist/src/gemini.js +23 -5
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +1 -1
- package/dist/src/generated/git-commit.js +1 -1
- package/dist/src/providers/providerManagerInstance.d.ts +2 -0
- package/dist/src/providers/providerManagerInstance.js +45 -5
- package/dist/src/providers/providerManagerInstance.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.js +2 -0
- package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
- package/dist/src/ui/App.js +108 -17
- package/dist/src/ui/App.js.map +1 -1
- package/dist/src/ui/IdeIntegrationNudge.d.ts +7 -4
- package/dist/src/ui/IdeIntegrationNudge.js +26 -6
- package/dist/src/ui/IdeIntegrationNudge.js.map +1 -1
- package/dist/src/ui/commands/authCommand.d.ts +11 -1
- package/dist/src/ui/commands/authCommand.js +153 -48
- package/dist/src/ui/commands/authCommand.js.map +1 -1
- package/dist/src/ui/commands/diagnosticsCommand.js +94 -10
- package/dist/src/ui/commands/diagnosticsCommand.js.map +1 -1
- package/dist/src/ui/commands/ideCommand.js +7 -4
- package/dist/src/ui/commands/ideCommand.js.map +1 -1
- package/dist/src/ui/commands/keyCommand.js +32 -2
- package/dist/src/ui/commands/keyCommand.js.map +1 -1
- package/dist/src/ui/commands/keyfileCommand.js +15 -12
- package/dist/src/ui/commands/keyfileCommand.js.map +1 -1
- package/dist/src/ui/commands/modelCommand.js +21 -3
- package/dist/src/ui/commands/modelCommand.js.map +1 -1
- package/dist/src/ui/commands/providerCommand.js +52 -14
- package/dist/src/ui/commands/providerCommand.js.map +1 -1
- package/dist/src/ui/commands/setCommand.js +17 -1
- package/dist/src/ui/commands/setCommand.js.map +1 -1
- package/dist/src/ui/commands/settingsCommand.d.ts +7 -0
- package/dist/src/ui/commands/settingsCommand.js +16 -0
- package/dist/src/ui/commands/settingsCommand.js.map +1 -0
- package/dist/src/ui/commands/toolformatCommand.js +79 -23
- package/dist/src/ui/commands/toolformatCommand.js.map +1 -1
- package/dist/src/ui/commands/types.d.ts +1 -1
- package/dist/src/ui/commands/types.js.map +1 -1
- package/dist/src/ui/components/AuthDialog.js +55 -62
- package/dist/src/ui/components/AuthDialog.js.map +1 -1
- package/dist/src/ui/components/Footer.d.ts +1 -0
- package/dist/src/ui/components/Footer.js +2 -2
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/InputPrompt.d.ts +1 -0
- package/dist/src/ui/components/InputPrompt.js +59 -7
- package/dist/src/ui/components/InputPrompt.js.map +1 -1
- package/dist/src/ui/components/OAuthCodeDialog.d.ts +13 -0
- package/dist/src/ui/components/OAuthCodeDialog.js +52 -0
- package/dist/src/ui/components/OAuthCodeDialog.js.map +1 -0
- package/dist/src/ui/components/SettingsDialog.d.ts +14 -0
- package/dist/src/ui/components/SettingsDialog.js +247 -0
- package/dist/src/ui/components/SettingsDialog.js.map +1 -0
- package/dist/src/ui/components/ThemeDialog.js +4 -15
- package/dist/src/ui/components/ThemeDialog.js.map +1 -1
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js +2 -2
- package/dist/src/ui/components/messages/ToolConfirmationMessage.js.map +1 -1
- package/dist/src/ui/components/shared/text-buffer.d.ts +17 -4
- package/dist/src/ui/components/shared/text-buffer.js +224 -70
- package/dist/src/ui/components/shared/text-buffer.js.map +1 -1
- package/dist/src/ui/components/shared/vim-buffer-actions.js +137 -151
- package/dist/src/ui/components/shared/vim-buffer-actions.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.d.ts +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js +5 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/useAuthCommand.js +14 -20
- package/dist/src/ui/hooks/useAuthCommand.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.d.ts +2 -1
- package/dist/src/ui/hooks/useGeminiStream.js +67 -25
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useSettingsCommand.d.ts +10 -0
- package/dist/src/ui/hooks/useSettingsCommand.js +21 -0
- package/dist/src/ui/hooks/useSettingsCommand.js.map +1 -0
- package/dist/src/ui/reducers/appReducer.d.ts +3 -2
- package/dist/src/ui/reducers/appReducer.js +1 -0
- package/dist/src/ui/reducers/appReducer.js.map +1 -1
- package/dist/src/utils/dialogScopeUtils.d.ts +31 -0
- package/dist/src/utils/dialogScopeUtils.js +48 -0
- package/dist/src/utils/dialogScopeUtils.js.map +1 -0
- package/dist/src/utils/settingsUtils.d.ts +126 -0
- package/dist/src/utils/settingsUtils.js +327 -0
- package/dist/src/utils/settingsUtils.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
@@ -4,6 +4,21 @@
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
5
5
|
*/
|
6
6
|
import { CommandKind, } from './types.js';
|
7
|
+
/**
|
8
|
+
* Get SettingsService instance for diagnostics
|
9
|
+
*/
|
10
|
+
async function getSettingsServiceForDiagnostics() {
|
11
|
+
try {
|
12
|
+
const { getSettingsService } = await import('@vybestack/llxprt-code-core/src/settings/settingsServiceInstance.js');
|
13
|
+
return getSettingsService();
|
14
|
+
}
|
15
|
+
catch (error) {
|
16
|
+
if (process.env.DEBUG) {
|
17
|
+
console.warn('Failed to get SettingsService for diagnostics:', error);
|
18
|
+
}
|
19
|
+
return null;
|
20
|
+
}
|
21
|
+
}
|
7
22
|
/**
|
8
23
|
* Masks sensitive information like API keys
|
9
24
|
*/
|
@@ -34,13 +49,65 @@ export const diagnosticsCommand = {
|
|
34
49
|
};
|
35
50
|
}
|
36
51
|
const diagnostics = ['# LLxprt Diagnostics\n'];
|
52
|
+
// Use SettingsService for more accurate data
|
53
|
+
let settingsService;
|
54
|
+
try {
|
55
|
+
settingsService = await getSettingsServiceForDiagnostics();
|
56
|
+
}
|
57
|
+
catch (error) {
|
58
|
+
if (process.env.DEBUG) {
|
59
|
+
console.warn('Failed to get SettingsService, using legacy data:', error);
|
60
|
+
}
|
61
|
+
settingsService = null;
|
62
|
+
}
|
63
|
+
let diagnosticsData = null;
|
64
|
+
if (settingsService &&
|
65
|
+
'getDiagnosticsData' in settingsService &&
|
66
|
+
typeof settingsService.getDiagnosticsData === 'function') {
|
67
|
+
try {
|
68
|
+
// Wait for initialization if needed using the on method
|
69
|
+
if ('on' in settingsService &&
|
70
|
+
typeof settingsService.on === 'function') {
|
71
|
+
await new Promise((resolve) => {
|
72
|
+
settingsService.on('initialized', () => resolve());
|
73
|
+
// Fallback timeout
|
74
|
+
setTimeout(resolve, 100);
|
75
|
+
});
|
76
|
+
}
|
77
|
+
const data = await settingsService.getDiagnosticsData();
|
78
|
+
if (data &&
|
79
|
+
typeof data === 'object' &&
|
80
|
+
'provider' in data &&
|
81
|
+
'model' in data &&
|
82
|
+
'profile' in data &&
|
83
|
+
'modelParams' in data) {
|
84
|
+
diagnosticsData = data;
|
85
|
+
}
|
86
|
+
}
|
87
|
+
catch (error) {
|
88
|
+
if (process.env.DEBUG) {
|
89
|
+
console.warn('Failed to get diagnostics from SettingsService:', error);
|
90
|
+
}
|
91
|
+
}
|
92
|
+
}
|
37
93
|
// Provider information
|
94
|
+
diagnostics.push('## Provider Information');
|
95
|
+
if (diagnosticsData) {
|
96
|
+
// Use SettingsService data (more accurate after profile operations)
|
97
|
+
diagnostics.push(`- Active Provider: ${diagnosticsData.provider}`);
|
98
|
+
diagnostics.push(`- Current Model: ${diagnosticsData.model}`);
|
99
|
+
diagnostics.push(`- Current Profile: ${diagnosticsData.profile || 'none'}`);
|
100
|
+
}
|
101
|
+
else {
|
102
|
+
// Fallback to legacy scattered sources
|
103
|
+
const providerManager = config.getProviderManager();
|
104
|
+
const activeProvider = providerManager?.getActiveProvider();
|
105
|
+
diagnostics.push(`- Active Provider: ${activeProvider?.name || 'none'}`);
|
106
|
+
diagnostics.push(`- Current Model: ${config.getModel()}`);
|
107
|
+
}
|
108
|
+
// Check for API key (still from provider for now)
|
38
109
|
const providerManager = config.getProviderManager();
|
39
110
|
const activeProvider = providerManager?.getActiveProvider();
|
40
|
-
diagnostics.push('## Provider Information');
|
41
|
-
diagnostics.push(`- Active Provider: ${activeProvider?.name || 'none'}`);
|
42
|
-
diagnostics.push(`- Current Model: ${config.getModel()}`);
|
43
|
-
// Check for API key
|
44
111
|
if (activeProvider &&
|
45
112
|
'hasApiKey' in activeProvider &&
|
46
113
|
typeof activeProvider.hasApiKey === 'function') {
|
@@ -118,13 +185,14 @@ export const diagnosticsCommand = {
|
|
118
185
|
}
|
119
186
|
// Model parameters
|
120
187
|
diagnostics.push('\n## Model Parameters');
|
121
|
-
if (
|
122
|
-
|
123
|
-
|
124
|
-
const modelParams = activeProvider.getModelParams();
|
188
|
+
if (diagnosticsData) {
|
189
|
+
// Use SettingsService data (more accurate)
|
190
|
+
const modelParams = diagnosticsData.modelParams;
|
125
191
|
if (modelParams && Object.keys(modelParams).length > 0) {
|
126
192
|
for (const [key, value] of Object.entries(modelParams)) {
|
127
|
-
|
193
|
+
if (value !== undefined) {
|
194
|
+
diagnostics.push(`- ${key}: ${JSON.stringify(value)}`);
|
195
|
+
}
|
128
196
|
}
|
129
197
|
}
|
130
198
|
else {
|
@@ -132,7 +200,23 @@ export const diagnosticsCommand = {
|
|
132
200
|
}
|
133
201
|
}
|
134
202
|
else {
|
135
|
-
|
203
|
+
// Fallback to legacy provider method
|
204
|
+
if (activeProvider &&
|
205
|
+
'getModelParams' in activeProvider &&
|
206
|
+
typeof activeProvider.getModelParams === 'function') {
|
207
|
+
const modelParams = activeProvider.getModelParams();
|
208
|
+
if (modelParams && Object.keys(modelParams).length > 0) {
|
209
|
+
for (const [key, value] of Object.entries(modelParams)) {
|
210
|
+
diagnostics.push(`- ${key}: ${JSON.stringify(value)}`);
|
211
|
+
}
|
212
|
+
}
|
213
|
+
else {
|
214
|
+
diagnostics.push('- No model parameters configured');
|
215
|
+
}
|
216
|
+
}
|
217
|
+
else {
|
218
|
+
diagnostics.push('- Model parameters not available for this provider');
|
219
|
+
}
|
136
220
|
}
|
137
221
|
// Add important defaults if not explicitly set
|
138
222
|
diagnostics.push('\n## Important Defaults');
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"diagnosticsCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/diagnosticsCommand.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"diagnosticsCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/diagnosticsCommand.ts"],"names":[],"mappings":"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"}
|
@@ -4,7 +4,7 @@
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
5
5
|
*/
|
6
6
|
import * as path from 'node:path';
|
7
|
-
import { DetectedIde, IDEConnectionStatus,
|
7
|
+
import { DetectedIde, IDEConnectionStatus, getIdeInfo, getIdeInstaller, ideContext, } from '@vybestack/llxprt-code-core';
|
8
8
|
import { CommandKind, } from './types.js';
|
9
9
|
import { SettingScope } from '../../config/settings.js';
|
10
10
|
function formatFileList(openFiles) {
|
@@ -24,7 +24,9 @@ function formatFileList(openFiles) {
|
|
24
24
|
return ` - ${displayName}${file.isActive ? ' (active)' : ''}`;
|
25
25
|
})
|
26
26
|
.join('\n');
|
27
|
-
|
27
|
+
const infoMessage = `
|
28
|
+
(Note: The file list is limited to a number of recently accessed files within your workspace and only includes local files on disk)`;
|
29
|
+
return `\n\nOpen files:\n${fileList}\n${infoMessage}`;
|
28
30
|
}
|
29
31
|
async function getIdeStatusMessageWithFiles(ideClient) {
|
30
32
|
const connection = ideClient.getConnectionStatus();
|
@@ -80,8 +82,9 @@ export const ideCommand = (config) => {
|
|
80
82
|
action: () => ({
|
81
83
|
type: 'message',
|
82
84
|
messageType: 'error',
|
83
|
-
content: `IDE integration is not supported in your current environment. To use this feature, run LLxprt Code in one of these supported IDEs: ${Object.values(DetectedIde)
|
84
|
-
|
85
|
+
content: `IDE integration is not supported in your current environment. To use this feature, run LLxprt Code in one of these supported IDEs: ${Object.values(DetectedIde)
|
86
|
+
.map((ide) => getIdeInfo(ide).displayName)
|
87
|
+
.join(', ')}`,
|
85
88
|
}),
|
86
89
|
};
|
87
90
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"ideCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/ideCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAEL,WAAW,EACX,mBAAmB,EACnB,
|
1
|
+
{"version":3,"file":"ideCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/ideCommand.ts"],"names":[],"mappings":"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"}
|
@@ -18,6 +18,8 @@ export const keyCommand = {
|
|
18
18
|
content: 'No configuration available',
|
19
19
|
};
|
20
20
|
}
|
21
|
+
const settingsService = config.getSettingsService();
|
22
|
+
const useSettingsService = settingsService !== null;
|
21
23
|
const providerManager = config.getProviderManager();
|
22
24
|
if (!providerManager) {
|
23
25
|
return {
|
@@ -34,7 +36,22 @@ export const keyCommand = {
|
|
34
36
|
// Clear the API key
|
35
37
|
if (activeProvider.setApiKey) {
|
36
38
|
activeProvider.setApiKey('');
|
37
|
-
|
39
|
+
if (useSettingsService && settingsService) {
|
40
|
+
// Use SettingsService to update provider settings
|
41
|
+
try {
|
42
|
+
await settingsService.updateSettings(providerName, {
|
43
|
+
apiKey: undefined,
|
44
|
+
});
|
45
|
+
}
|
46
|
+
catch (error) {
|
47
|
+
console.error('SettingsService error, using fallback:', error);
|
48
|
+
config.setEphemeralSetting('auth-key', undefined);
|
49
|
+
}
|
50
|
+
}
|
51
|
+
else {
|
52
|
+
// Fallback to direct ephemeral setting
|
53
|
+
config.setEphemeralSetting('auth-key', undefined);
|
54
|
+
}
|
38
55
|
// If this is the Gemini provider, we might need to switch auth mode
|
39
56
|
const requiresAuthRefresh = providerName === 'gemini';
|
40
57
|
if (requiresAuthRefresh) {
|
@@ -61,7 +78,20 @@ export const keyCommand = {
|
|
61
78
|
// Set the API key
|
62
79
|
if (activeProvider.setApiKey) {
|
63
80
|
activeProvider.setApiKey(apiKey);
|
64
|
-
|
81
|
+
if (useSettingsService && settingsService) {
|
82
|
+
// Use SettingsService to update provider settings
|
83
|
+
try {
|
84
|
+
await settingsService.updateSettings(providerName, { apiKey });
|
85
|
+
}
|
86
|
+
catch (error) {
|
87
|
+
console.error('SettingsService error, using fallback:', error);
|
88
|
+
config.setEphemeralSetting('auth-key', apiKey);
|
89
|
+
}
|
90
|
+
}
|
91
|
+
else {
|
92
|
+
// Fallback to direct ephemeral setting
|
93
|
+
config.setEphemeralSetting('auth-key', apiKey);
|
94
|
+
}
|
65
95
|
// If this is the Gemini provider, we need to refresh auth to use API key mode
|
66
96
|
const requiresAuthRefresh = providerName === 'gemini';
|
67
97
|
if (requiresAuthRefresh) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"keyCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/keyCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAIL,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAEvD,MAAM,CAAC,MAAM,UAAU,GAAiB;IACtC,IAAI,EAAE,KAAK;IACX,WAAW,EAAE,gDAAgD;IAC7D,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,MAAM,EAAE,KAAK,EACX,OAAuB,EACvB,IAAY,EACkB,EAAE;QAChC,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;QACvC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,OAAO;gBACpB,OAAO,EAAE,4BAA4B;aACtC,CAAC;QACJ,CAAC;QAED,MAAM,eAAe,GAAG,MAAM,CAAC,kBAAkB,EAAE,CAAC;QACpD,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,OAAO;gBACpB,OAAO,EAAE,+BAA+B;aACzC,CAAC;QACJ,CAAC;QAED,MAAM,cAAc,GAAG,eAAe,CAAC,iBAAiB,EAAE,CAAC;QAC3D,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC;QACzC,MAAM,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC;QAE5B,+CAA+C;QAC/C,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE,CAAC;YAC/C,oBAAoB;YACpB,IAAI,cAAc,CAAC,SAAS,EAAE,CAAC;gBAC7B,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;
|
1
|
+
{"version":3,"file":"keyCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/keyCommand.ts"],"names":[],"mappings":"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"}
|
@@ -62,21 +62,24 @@ export const keyfileCommand = {
|
|
62
62
|
// Handle removal
|
63
63
|
if (filePath === 'none') {
|
64
64
|
const removedPath = context.services.settings.getProviderKeyfile(providerName);
|
65
|
+
// Clear the API key from the provider
|
66
|
+
if (activeProvider.setApiKey) {
|
67
|
+
activeProvider.setApiKey('');
|
68
|
+
}
|
69
|
+
// Clear from ephemeral settings
|
70
|
+
if (context.services.config) {
|
71
|
+
context.services.config.setEphemeralSetting('auth-keyfile', undefined);
|
72
|
+
context.services.config.setEphemeralSetting('auth-key', undefined);
|
73
|
+
}
|
74
|
+
// Remove from saved settings
|
65
75
|
if (removedPath) {
|
66
76
|
context.services.settings.removeProviderKeyfile(providerName);
|
67
|
-
return {
|
68
|
-
type: 'message',
|
69
|
-
messageType: 'info',
|
70
|
-
content: `Removed keyfile path for provider '${providerName}'`,
|
71
|
-
};
|
72
|
-
}
|
73
|
-
else {
|
74
|
-
return {
|
75
|
-
type: 'message',
|
76
|
-
messageType: 'info',
|
77
|
-
content: `No keyfile path was set for provider '${providerName}'`,
|
78
|
-
};
|
79
77
|
}
|
78
|
+
return {
|
79
|
+
type: 'message',
|
80
|
+
messageType: 'info',
|
81
|
+
content: `Cleared keyfile and API key for provider '${providerName}'`,
|
82
|
+
};
|
80
83
|
}
|
81
84
|
// Verify keyfile exists and read the key
|
82
85
|
try {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"keyfileCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/keyfileCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAIL,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,IAAI,CAAC;AACpC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,MAAM,CAAC,MAAM,cAAc,GAAiB;IAC1C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,8CAA8C;IAC3D,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,MAAM,EAAE,KAAK,EACX,OAAuB,EACvB,IAAY,EACkB,EAAE;QAChC,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC;QAE9B,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,eAAe,CAAC,iBAAiB,EAAE,CAAC;YAC3D,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC;YAEzC,kDAAkD;YAClD,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,EAAE,EAAE,CAAC;gBACjC,iCAAiC;gBACjC,MAAM,YAAY,GAAG;oBACnB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,YAAY,MAAM,CAAC;oBAC5C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,YAAY,MAAM,CAAC;oBAC5C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,YAAY,UAAU,CAAC;iBACjD,CAAC;gBAEF,8DAA8D;gBAC9D,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;oBAC9B,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC;gBAC5D,CAAC;qBAAM,IAAI,YAAY,KAAK,WAAW,EAAE,CAAC;oBACxC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,gBAAgB,CAAC,CAAC,CAAC;gBAC/D,CAAC;gBAED,IAAI,YAAY,GAAkB,IAAI,CAAC;gBACvC,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;oBACvC,IAAI,CAAC;wBACH,MAAM,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;wBAC7B,YAAY,GAAG,WAAW,CAAC;wBAC3B,MAAM;oBACR,CAAC;oBAAC,MAAM,CAAC;wBACP,wCAAwC;oBAC1C,CAAC;gBACH,CAAC;gBAED,IAAI,YAAY,EAAE,CAAC;oBACjB,OAAO;wBACL,IAAI,EAAE,SAAS;wBACf,WAAW,EAAE,MAAM;wBACnB,OAAO,EAAE,iCAAiC,YAAY,MAAM,YAAY,4DAA4D;qBACrI,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,OAAO;wBACL,IAAI,EAAE,SAAS;wBACf,WAAW,EAAE,MAAM;wBACnB,OAAO,EAAE,kCAAkC,YAAY,4BAA4B;qBACpF,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,iBAAiB;YACjB,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;gBACxB,MAAM,WAAW,GACf,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;
|
1
|
+
{"version":3,"file":"keyfileCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/keyfileCommand.ts"],"names":[],"mappings":"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"}
|
@@ -26,10 +26,28 @@ export const modelCommand = {
|
|
26
26
|
? activeProvider.getCurrentModel()
|
27
27
|
: 'unknown';
|
28
28
|
if (activeProvider.setModel) {
|
29
|
+
const config = context.services.config;
|
30
|
+
const settingsService = config?.getSettingsService();
|
31
|
+
const useSettingsService = settingsService !== null;
|
29
32
|
activeProvider.setModel(modelName);
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
+
if (useSettingsService && settingsService && config) {
|
34
|
+
// Use SettingsService to update provider settings
|
35
|
+
try {
|
36
|
+
// Ensure activeProvider is set in SettingsService
|
37
|
+
settingsService.set('activeProvider', activeProvider.name);
|
38
|
+
await settingsService.updateSettings(activeProvider.name, {
|
39
|
+
model: modelName,
|
40
|
+
});
|
41
|
+
}
|
42
|
+
catch (error) {
|
43
|
+
console.error('SettingsService error, using fallback:', error);
|
44
|
+
// Keep config model in sync so /about shows correct model
|
45
|
+
config.setModel(modelName);
|
46
|
+
}
|
47
|
+
}
|
48
|
+
else if (config) {
|
49
|
+
// Fallback to direct config update
|
50
|
+
config.setModel(modelName);
|
33
51
|
}
|
34
52
|
return {
|
35
53
|
type: 'message',
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"modelCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/modelCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAKL,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAEhF,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,wBAAwB;IACrC,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,MAAM,EAAE,KAAK,EACX,OAAuB,EACvB,IAAY,EACkD,EAAE;QAChE,MAAM,SAAS,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC;QAC/B,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAC;QAE7C,yDAAyD;QACzD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,eAAe;aACxB,CAAC;QACJ,CAAC;QAED,2BAA2B;QAC3B,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,eAAe,CAAC,iBAAiB,EAAE,CAAC;YAC3D,MAAM,YAAY,GAAG,cAAc,CAAC,eAAe;gBACjD,CAAC,CAAC,cAAc,CAAC,eAAe,EAAE;gBAClC,CAAC,CAAC,SAAS,CAAC;YAEd,IAAI,cAAc,CAAC,QAAQ,EAAE,CAAC;gBAC5B,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;
|
1
|
+
{"version":3,"file":"modelCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/modelCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAKL,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAEhF,MAAM,CAAC,MAAM,YAAY,GAAiB;IACxC,IAAI,EAAE,OAAO;IACb,WAAW,EAAE,wBAAwB;IACrC,IAAI,EAAE,WAAW,CAAC,QAAQ;IAC1B,MAAM,EAAE,KAAK,EACX,OAAuB,EACvB,IAAY,EACkD,EAAE;QAChE,MAAM,SAAS,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC;QAC/B,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAC;QAE7C,yDAAyD;QACzD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO;gBACL,IAAI,EAAE,QAAQ;gBACd,MAAM,EAAE,eAAe;aACxB,CAAC;QACJ,CAAC;QAED,2BAA2B;QAC3B,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,eAAe,CAAC,iBAAiB,EAAE,CAAC;YAC3D,MAAM,YAAY,GAAG,cAAc,CAAC,eAAe;gBACjD,CAAC,CAAC,cAAc,CAAC,eAAe,EAAE;gBAClC,CAAC,CAAC,SAAS,CAAC;YAEd,IAAI,cAAc,CAAC,QAAQ,EAAE,CAAC;gBAC5B,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;gBACvC,MAAM,eAAe,GAAG,MAAM,EAAE,kBAAkB,EAAE,CAAC;gBACrD,MAAM,kBAAkB,GAAG,eAAe,KAAK,IAAI,CAAC;gBAEpD,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAEnC,IAAI,kBAAkB,IAAI,eAAe,IAAI,MAAM,EAAE,CAAC;oBACpD,kDAAkD;oBAClD,IAAI,CAAC;wBACH,kDAAkD;wBAClD,eAAe,CAAC,GAAG,CAAC,gBAAgB,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC;wBAC3D,MAAM,eAAe,CAAC,cAAc,CAAC,cAAc,CAAC,IAAI,EAAE;4BACxD,KAAK,EAAE,SAAS;yBACjB,CAAC,CAAC;oBACL,CAAC;oBAAC,OAAO,KAAK,EAAE,CAAC;wBACf,OAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAC;wBAC/D,0DAA0D;wBAC1D,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;oBAC7B,CAAC;gBACH,CAAC;qBAAM,IAAI,MAAM,EAAE,CAAC;oBAClB,mCAAmC;oBACnC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;gBAC7B,CAAC;gBAED,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,MAAM;oBACnB,OAAO,EAAE,iBAAiB,YAAY,OAAO,SAAS,iBAAiB,cAAc,CAAC,IAAI,GAAG;iBAC9F,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,OAAO;oBACL,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,OAAO;oBACpB,OAAO,EAAE,aAAa,cAAc,CAAC,IAAI,oCAAoC;iBAC9E,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,IAAI,EAAE,SAAS;gBACf,WAAW,EAAE,OAAO;gBACpB,OAAO,EAAE,2BAA2B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;aAC7F,CAAC;QACJ,CAAC;IACH,CAAC;CACF,CAAC"}
|
@@ -7,6 +7,21 @@ import { CommandKind, } from './types.js';
|
|
7
7
|
import { getProviderManager } from '../../providers/providerManagerInstance.js';
|
8
8
|
import { MessageType } from '../types.js';
|
9
9
|
import { AuthType } from '@vybestack/llxprt-code-core';
|
10
|
+
/**
|
11
|
+
* Get SettingsService instance for provider switching
|
12
|
+
*/
|
13
|
+
async function getSettingsServiceForProvider() {
|
14
|
+
try {
|
15
|
+
const { getSettingsService } = await import('@vybestack/llxprt-code-core/src/settings/settingsServiceInstance.js');
|
16
|
+
return getSettingsService();
|
17
|
+
}
|
18
|
+
catch (error) {
|
19
|
+
if (process.env.DEBUG) {
|
20
|
+
console.warn('Failed to get SettingsService for provider switching:', error);
|
21
|
+
}
|
22
|
+
throw error;
|
23
|
+
}
|
24
|
+
}
|
10
25
|
export const providerCommand = {
|
11
26
|
name: 'provider',
|
12
27
|
description: 'switch between different AI providers (openai, anthropic, etc.)',
|
@@ -38,6 +53,27 @@ export const providerCommand = {
|
|
38
53
|
// };
|
39
54
|
// Switch provider first (this will clear state from ALL providers)
|
40
55
|
providerManager.setActiveProvider(providerName);
|
56
|
+
// Clear base-url ephemeral setting when switching providers
|
57
|
+
// This prevents the old provider's base-url from affecting the new provider
|
58
|
+
const config = context.services.config;
|
59
|
+
if (config) {
|
60
|
+
config.setEphemeralSetting('base-url', undefined);
|
61
|
+
}
|
62
|
+
// Use SettingsService for provider switching
|
63
|
+
try {
|
64
|
+
const settingsService = await getSettingsServiceForProvider();
|
65
|
+
await settingsService.switchProvider(providerName);
|
66
|
+
// Also set the default model for this provider
|
67
|
+
const activeProvider = providerManager.getActiveProvider();
|
68
|
+
const defaultModel = activeProvider.getDefaultModel();
|
69
|
+
settingsService.setProviderSetting(providerName, 'model', defaultModel);
|
70
|
+
// Don't return early - continue with the rest of the setup
|
71
|
+
}
|
72
|
+
catch (error) {
|
73
|
+
if (process.env.DEBUG) {
|
74
|
+
console.warn('SettingsService provider switch failed, falling back to legacy method:', error);
|
75
|
+
}
|
76
|
+
}
|
41
77
|
// Update config if available
|
42
78
|
if (context.services.config) {
|
43
79
|
// Clear ephemeral settings when switching providers
|
@@ -66,20 +102,22 @@ export const providerCommand = {
|
|
66
102
|
context.services.config.setProvider(providerName);
|
67
103
|
// Get the active provider and ensure it uses a valid default model
|
68
104
|
const activeProvider = providerManager.getActiveProvider();
|
69
|
-
//
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
105
|
+
// Get the default model from the provider
|
106
|
+
const defaultModel = activeProvider.getDefaultModel();
|
107
|
+
let baseUrl;
|
108
|
+
// Set base URL for specific providers
|
109
|
+
if (providerName === 'qwen') {
|
110
|
+
baseUrl = 'https://portal.qwen.ai/v1';
|
111
|
+
}
|
112
|
+
// Set the base URL if needed (for qwen)
|
113
|
+
if (baseUrl) {
|
114
|
+
context.services.config.setEphemeralSetting('base-url', baseUrl);
|
115
|
+
// Also set it directly on the provider if it has the method
|
116
|
+
if ('setBaseUrl' in activeProvider &&
|
117
|
+
typeof activeProvider.setBaseUrl === 'function') {
|
118
|
+
const providerWithSetBaseUrl = activeProvider;
|
119
|
+
providerWithSetBaseUrl.setBaseUrl(baseUrl);
|
120
|
+
}
|
83
121
|
}
|
84
122
|
// Set the model on both the provider and config
|
85
123
|
if (defaultModel) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"providerCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/providerCommand.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAKL,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;
|
1
|
+
{"version":3,"file":"providerCommand.js","sourceRoot":"","sources":["../../../../src/ui/commands/providerCommand.ts"],"names":[],"mappings":"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"}
|
@@ -81,6 +81,8 @@ const unsetCommand = {
|
|
81
81
|
delete updatedHeaders[subkey];
|
82
82
|
// If no headers left, remove the entire setting
|
83
83
|
if (Object.keys(updatedHeaders).length === 0) {
|
84
|
+
// Note: SettingsService doesn't currently support ephemeral settings,
|
85
|
+
// so we continue to use the config directly for these session-only settings
|
84
86
|
config.setEphemeralSetting('custom-headers', undefined);
|
85
87
|
return {
|
86
88
|
type: 'message',
|
@@ -115,6 +117,8 @@ const unsetCommand = {
|
|
115
117
|
};
|
116
118
|
}
|
117
119
|
// Clear the ephemeral setting
|
120
|
+
// Note: SettingsService doesn't currently support ephemeral settings,
|
121
|
+
// so we continue to use the config directly for these session-only settings
|
118
122
|
config.setEphemeralSetting(key, undefined);
|
119
123
|
// Special handling for context-limit and compression-threshold
|
120
124
|
if (key === 'context-limit' || key === 'compression-threshold') {
|
@@ -404,6 +408,8 @@ export const setCommand = {
|
|
404
408
|
content: 'No configuration available',
|
405
409
|
};
|
406
410
|
}
|
411
|
+
const settingsService = config.getSettingsService();
|
412
|
+
const useSettingsService = settingsService !== null;
|
407
413
|
// Apply settings to GeminiClient for context-limit and compression-threshold
|
408
414
|
if (key === 'context-limit' || key === 'compression-threshold') {
|
409
415
|
const geminiClient = config.getGeminiClient();
|
@@ -415,7 +421,17 @@ export const setCommand = {
|
|
415
421
|
}
|
416
422
|
// Store ephemeral settings in memory only
|
417
423
|
// They will be saved only when user explicitly saves a profile
|
418
|
-
|
424
|
+
// Note: SettingsService doesn't currently support ephemeral settings,
|
425
|
+
// so we continue to use the config directly for these session-only settings
|
426
|
+
if (useSettingsService) {
|
427
|
+
// When SettingsService is available, we still use config for ephemeral settings
|
428
|
+
// as they are session-only and not persisted to the settings file
|
429
|
+
config.setEphemeralSetting(key, parsedValue);
|
430
|
+
}
|
431
|
+
else {
|
432
|
+
// Fallback to direct config usage
|
433
|
+
config.setEphemeralSetting(key, parsedValue);
|
434
|
+
}
|
419
435
|
return {
|
420
436
|
type: 'message',
|
421
437
|
messageType: 'info',
|