@vybestack/llxprt-code 0.1.23 → 0.2.2-nightly.250908.7b895396
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 +21 -17
- package/dist/package.json +4 -3
- package/dist/src/auth/anthropic-oauth-provider.d.ts +50 -3
- package/dist/src/auth/anthropic-oauth-provider.js +287 -63
- package/dist/src/auth/anthropic-oauth-provider.js.map +1 -1
- package/dist/src/auth/gemini-oauth-provider.d.ts +34 -3
- package/dist/src/auth/gemini-oauth-provider.js +308 -14
- package/dist/src/auth/gemini-oauth-provider.js.map +1 -1
- package/dist/src/auth/migration.d.ts +26 -0
- package/dist/src/auth/migration.js +54 -0
- package/dist/src/auth/migration.js.map +1 -0
- package/dist/src/auth/oauth-manager.d.ts +24 -0
- package/dist/src/auth/oauth-manager.js +179 -14
- package/dist/src/auth/oauth-manager.js.map +1 -1
- package/dist/src/auth/oauth-manager.spec.js +10 -8
- package/dist/src/auth/oauth-manager.spec.js.map +1 -1
- package/dist/src/auth/qwen-oauth-provider.d.ts +59 -3
- package/dist/src/auth/qwen-oauth-provider.js +263 -41
- package/dist/src/auth/qwen-oauth-provider.js.map +1 -1
- package/dist/src/config/config.js +11 -10
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/extension.d.ts +1 -1
- package/dist/src/config/extension.js +1 -1
- package/dist/src/gemini.js +33 -11
- 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/integration-tests/base-url-behavior.integration.test.js +4 -1
- package/dist/src/integration-tests/base-url-behavior.integration.test.js.map +1 -1
- package/dist/src/integration-tests/compression-settings-apply.integration.test.js +85 -332
- package/dist/src/integration-tests/compression-settings-apply.integration.test.js.map +1 -1
- package/dist/src/integration-tests/ephemeral-settings.integration.test.js +5 -16
- package/dist/src/integration-tests/ephemeral-settings.integration.test.js.map +1 -1
- package/dist/src/integration-tests/model-params-isolation.integration.test.js +8 -2
- package/dist/src/integration-tests/model-params-isolation.integration.test.js.map +1 -1
- package/dist/src/integration-tests/modelParams.integration.test.js +4 -1
- package/dist/src/integration-tests/modelParams.integration.test.js.map +1 -1
- package/dist/src/integration-tests/provider-switching.integration.test.js +4 -1
- package/dist/src/integration-tests/provider-switching.integration.test.js.map +1 -1
- package/dist/src/integration-tests/retry-settings.integration.test.d.ts +6 -0
- package/dist/src/integration-tests/retry-settings.integration.test.js +56 -0
- package/dist/src/integration-tests/retry-settings.integration.test.js.map +1 -0
- package/dist/src/providers/index.d.ts +1 -1
- package/dist/src/providers/logging/LoggingProviderWrapper.test.js +58 -47
- package/dist/src/providers/logging/LoggingProviderWrapper.test.js.map +1 -1
- package/dist/src/providers/logging/multi-provider-logging.integration.test.js +130 -68
- package/dist/src/providers/logging/multi-provider-logging.integration.test.js.map +1 -1
- package/dist/src/providers/logging/performance.test.js +39 -16
- package/dist/src/providers/logging/performance.test.js.map +1 -1
- package/dist/src/providers/provider-gemini-switching.test.js +4 -1
- package/dist/src/providers/provider-gemini-switching.test.js.map +1 -1
- package/dist/src/providers/provider-switching.integration.test.js +12 -3
- package/dist/src/providers/provider-switching.integration.test.js.map +1 -1
- package/dist/src/providers/providerConfigUtils.js +2 -4
- package/dist/src/providers/providerConfigUtils.js.map +1 -1
- package/dist/src/providers/providerManagerInstance.js +24 -49
- package/dist/src/providers/providerManagerInstance.js.map +1 -1
- package/dist/src/services/BuiltinCommandLoader.js +4 -0
- package/dist/src/services/BuiltinCommandLoader.js.map +1 -1
- package/dist/src/storage/ConversationStorage.test.js +10 -7
- package/dist/src/storage/ConversationStorage.test.js.map +1 -1
- package/dist/src/test-utils/mockCommandContext.js +2 -0
- package/dist/src/test-utils/mockCommandContext.js.map +1 -1
- package/dist/src/ui/App.e2e.test.d.ts +6 -0
- package/dist/src/ui/App.e2e.test.js +37 -0
- package/dist/src/ui/App.e2e.test.js.map +1 -0
- package/dist/src/ui/App.js +51 -4
- package/dist/src/ui/App.js.map +1 -1
- package/dist/src/ui/commands/authCommand.d.ts +9 -1
- package/dist/src/ui/commands/authCommand.js +109 -31
- package/dist/src/ui/commands/authCommand.js.map +1 -1
- package/dist/src/ui/commands/clearCommand.js +2 -0
- package/dist/src/ui/commands/clearCommand.js.map +1 -1
- package/dist/src/ui/commands/ideCommand.js +26 -0
- package/dist/src/ui/commands/ideCommand.js.map +1 -1
- package/dist/src/ui/commands/keyCommand.js +16 -54
- package/dist/src/ui/commands/keyCommand.js.map +1 -1
- package/dist/src/ui/commands/keyCommand.test.js +3 -3
- package/dist/src/ui/commands/keyCommand.test.js.map +1 -1
- package/dist/src/ui/commands/keyfileCommand.js +42 -32
- package/dist/src/ui/commands/keyfileCommand.js.map +1 -1
- package/dist/src/ui/commands/logoutCommand.d.ts +7 -0
- package/dist/src/ui/commands/logoutCommand.js +70 -0
- package/dist/src/ui/commands/logoutCommand.js.map +1 -0
- package/dist/src/ui/commands/modelCommand.js +16 -0
- package/dist/src/ui/commands/modelCommand.js.map +1 -1
- package/dist/src/ui/commands/profileCommand.js +31 -25
- package/dist/src/ui/commands/profileCommand.js.map +1 -1
- package/dist/src/ui/commands/profileCommand.test.js +15 -16
- package/dist/src/ui/commands/profileCommand.test.js.map +1 -1
- package/dist/src/ui/commands/providerCommand.js +10 -7
- package/dist/src/ui/commands/providerCommand.js.map +1 -1
- package/dist/src/ui/commands/setCommand.js +43 -19
- package/dist/src/ui/commands/setCommand.js.map +1 -1
- package/dist/src/ui/commands/setCommand.test.js +5 -7
- package/dist/src/ui/commands/setCommand.test.js.map +1 -1
- package/dist/src/ui/commands/setupGithubCommand.d.ts +2 -0
- package/dist/src/ui/commands/setupGithubCommand.js +123 -23
- package/dist/src/ui/commands/setupGithubCommand.js.map +1 -1
- package/dist/src/ui/commands/setupGithubCommand.test.js +94 -1
- package/dist/src/ui/commands/setupGithubCommand.test.js.map +1 -1
- package/dist/src/ui/commands/statusCommand.d.ts +7 -0
- package/dist/src/ui/commands/statusCommand.js +71 -0
- package/dist/src/ui/commands/statusCommand.js.map +1 -0
- package/dist/src/ui/commands/types.d.ts +1 -0
- package/dist/src/ui/commands/types.js.map +1 -1
- package/dist/src/ui/components/ContextIndicator.ui.test.js +19 -46
- package/dist/src/ui/components/ContextIndicator.ui.test.js.map +1 -1
- package/dist/src/ui/components/Footer.d.ts +1 -1
- package/dist/src/ui/components/Footer.js +7 -7
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/Footer.responsive.test.js +28 -25
- package/dist/src/ui/components/Footer.responsive.test.js.map +1 -1
- package/dist/src/ui/components/OAuthCodeDialog.d.ts +5 -0
- package/dist/src/ui/components/OAuthCodeDialog.js +31 -1
- package/dist/src/ui/components/OAuthCodeDialog.js.map +1 -1
- package/dist/src/ui/components/OAuthCodeDialog.test.d.ts +6 -0
- package/dist/src/ui/components/OAuthCodeDialog.test.js +60 -0
- package/dist/src/ui/components/OAuthCodeDialog.test.js.map +1 -0
- package/dist/src/ui/contexts/KeypressContext.js +23 -1
- package/dist/src/ui/contexts/KeypressContext.js.map +1 -1
- package/dist/src/ui/contexts/KeypressContext.test.js +58 -2
- package/dist/src/ui/contexts/KeypressContext.test.js.map +1 -1
- package/dist/src/ui/contexts/SessionContext.d.ts +2 -0
- package/dist/src/ui/contexts/SessionContext.js +9 -1
- package/dist/src/ui/contexts/SessionContext.js.map +1 -1
- package/dist/src/ui/contexts/TodoContext.js +2 -2
- package/dist/src/ui/contexts/TodoContext.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.js +0 -2
- package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.test.js +21 -6
- package/dist/src/ui/hooks/atCommandProcessor.test.js.map +1 -1
- package/dist/src/ui/hooks/slashCommandProcessor.js +2 -0
- package/dist/src/ui/hooks/slashCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/useAuthCommand.js +6 -5
- package/dist/src/ui/hooks/useAuthCommand.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +47 -63
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useProviderDialog.js +2 -5
- package/dist/src/ui/hooks/useProviderDialog.js.map +1 -1
- package/dist/src/ui/hooks/useToolScheduler.test.js +60 -24
- package/dist/src/ui/hooks/useToolScheduler.test.js.map +1 -1
- package/dist/src/ui/utils/platformConstants.d.ts +2 -0
- package/dist/src/ui/utils/platformConstants.js +2 -0
- package/dist/src/ui/utils/platformConstants.js.map +1 -1
- package/dist/src/ui/utils/secureInputHandler.js +18 -7
- package/dist/src/ui/utils/secureInputHandler.js.map +1 -1
- package/dist/src/ui/utils/secureInputHandler.test.js +20 -0
- package/dist/src/ui/utils/secureInputHandler.test.js.map +1 -1
- package/dist/src/utils/privacy/ConversationDataRedactor.d.ts +3 -3
- package/dist/src/utils/privacy/ConversationDataRedactor.js +16 -12
- package/dist/src/utils/privacy/ConversationDataRedactor.js.map +1 -1
- package/dist/src/utils/privacy/ConversationDataRedactor.test.js +115 -72
- package/dist/src/utils/privacy/ConversationDataRedactor.test.js.map +1 -1
- package/dist/src/validateNonInterActiveAuth.js +8 -17
- package/dist/src/validateNonInterActiveAuth.js.map +1 -1
- package/dist/src/zed-integration/schema.d.ts +194 -91
- package/dist/src/zed-integration/schema.js +7 -1
- package/dist/src/zed-integration/schema.js.map +1 -1
- package/dist/src/zed-integration/zedIntegration.d.ts +1 -3
- package/dist/src/zed-integration/zedIntegration.js +454 -198
- package/dist/src/zed-integration/zedIntegration.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -3
@@ -1,75 +1,297 @@
|
|
1
1
|
/**
|
2
|
+
* @plan PLAN-20250823-AUTHFIXES.P05
|
2
3
|
* Qwen OAuth Provider Implementation
|
3
4
|
*/
|
4
|
-
import { QwenDeviceFlow, openBrowserSecurely, shouldLaunchBrowser, } from '@vybestack/llxprt-code-core';
|
5
|
+
import { QwenDeviceFlow, openBrowserSecurely, shouldLaunchBrowser, OAuthError, OAuthErrorFactory, GracefulErrorHandler, RetryHandler, } from '@vybestack/llxprt-code-core';
|
6
|
+
var InitializationState;
|
7
|
+
(function (InitializationState) {
|
8
|
+
InitializationState["NotStarted"] = "not-started";
|
9
|
+
InitializationState["InProgress"] = "in-progress";
|
10
|
+
InitializationState["Completed"] = "completed";
|
11
|
+
InitializationState["Failed"] = "failed";
|
12
|
+
})(InitializationState || (InitializationState = {}));
|
5
13
|
export class QwenOAuthProvider {
|
14
|
+
tokenStore;
|
15
|
+
/**
|
16
|
+
* @plan PLAN-20250823-AUTHFIXES.P05
|
17
|
+
* @requirement REQ-001.1
|
18
|
+
* @pseudocode line 5
|
19
|
+
*/
|
6
20
|
name = 'qwen';
|
7
21
|
deviceFlow;
|
8
|
-
|
9
|
-
|
22
|
+
initializationState = InitializationState.NotStarted;
|
23
|
+
initializationPromise;
|
24
|
+
initializationError;
|
25
|
+
errorHandler;
|
26
|
+
retryHandler;
|
27
|
+
/**
|
28
|
+
* @plan PLAN-20250823-AUTHFIXES.P05
|
29
|
+
* @requirement REQ-001.1
|
30
|
+
* @pseudocode lines 6-15
|
31
|
+
*
|
32
|
+
* Constructor completes synchronously - no async calls
|
33
|
+
*/
|
34
|
+
constructor(tokenStore) {
|
35
|
+
this.tokenStore = tokenStore;
|
36
|
+
// Line 7: SET this.tokenStore = tokenStore
|
37
|
+
this.tokenStore = tokenStore;
|
38
|
+
this.retryHandler = new RetryHandler();
|
39
|
+
this.errorHandler = new GracefulErrorHandler(this.retryHandler);
|
40
|
+
/**
|
41
|
+
* @plan PLAN-20250823-AUTHFIXES.P16
|
42
|
+
* @requirement REQ-004.2
|
43
|
+
* Deprecation warning for missing TokenStore
|
44
|
+
*/
|
45
|
+
if (!tokenStore) {
|
46
|
+
console.warn(`DEPRECATION: ${this.name} OAuth provider created without TokenStore. ` +
|
47
|
+
`Token persistence will not work. Please update your code.`);
|
48
|
+
}
|
49
|
+
// Lines 8-13: SET config
|
10
50
|
const config = {
|
11
51
|
clientId: 'f0304373b74a44d2b584a3fb70ca9e56',
|
12
52
|
authorizationEndpoint: 'https://chat.qwen.ai/api/v1/oauth2/device/code',
|
13
53
|
tokenEndpoint: 'https://chat.qwen.ai/api/v1/oauth2/token',
|
14
54
|
scopes: ['openid', 'profile', 'email', 'model.completion'],
|
15
55
|
};
|
56
|
+
// Line 14: SET this.deviceFlow = new QwenDeviceFlow(config)
|
16
57
|
this.deviceFlow = new QwenDeviceFlow(config);
|
58
|
+
// DO NOT call initializeToken() - lazy initialization pattern
|
17
59
|
}
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
//
|
28
|
-
if (
|
29
|
-
|
30
|
-
|
31
|
-
|
60
|
+
/**
|
61
|
+
* Lazy initialization with proper state management
|
62
|
+
* Ensures initialization only happens once and handles concurrent calls
|
63
|
+
*/
|
64
|
+
async ensureInitialized() {
|
65
|
+
// If already completed, return immediately
|
66
|
+
if (this.initializationState === InitializationState.Completed) {
|
67
|
+
return;
|
68
|
+
}
|
69
|
+
// If failed, allow retry by resetting to NotStarted
|
70
|
+
if (this.initializationState === InitializationState.Failed) {
|
71
|
+
this.initializationState = InitializationState.NotStarted;
|
72
|
+
this.initializationPromise = undefined;
|
73
|
+
this.initializationError = undefined;
|
74
|
+
}
|
75
|
+
// If not started, start initialization
|
76
|
+
if (this.initializationState === InitializationState.NotStarted) {
|
77
|
+
this.initializationState = InitializationState.InProgress;
|
78
|
+
this.initializationPromise = this.initializeToken();
|
79
|
+
}
|
80
|
+
// Wait for initialization to complete (handles concurrent calls)
|
81
|
+
if (this.initializationPromise) {
|
32
82
|
try {
|
33
|
-
await
|
83
|
+
await this.initializationPromise;
|
84
|
+
this.initializationState = InitializationState.Completed;
|
34
85
|
}
|
35
|
-
catch (
|
36
|
-
|
37
|
-
|
86
|
+
catch (error) {
|
87
|
+
this.initializationState = InitializationState.Failed;
|
88
|
+
this.initializationError =
|
89
|
+
error instanceof OAuthError
|
90
|
+
? error
|
91
|
+
: OAuthErrorFactory.fromUnknown(this.name, error, 'ensureInitialized');
|
92
|
+
throw this.initializationError;
|
38
93
|
}
|
39
94
|
}
|
40
|
-
else {
|
41
|
-
// In non-interactive environments, just show the URL
|
42
|
-
console.log('Visit this URL to authorize:');
|
43
|
-
console.log(authUrl);
|
44
|
-
}
|
45
|
-
console.log('─'.repeat(40));
|
46
|
-
console.log('Waiting for authorization...\n');
|
47
|
-
// Poll for token
|
48
|
-
this.currentToken = await this.deviceFlow.pollForToken(deviceCodeResponse.device_code);
|
49
95
|
}
|
96
|
+
/**
|
97
|
+
* @plan PLAN-20250823-AUTHFIXES.P05
|
98
|
+
* @requirement REQ-001.1
|
99
|
+
* @pseudocode lines 17-26
|
100
|
+
*/
|
101
|
+
async initializeToken() {
|
102
|
+
return this.errorHandler.handleGracefully(async () => {
|
103
|
+
// Line 19: SET savedToken = AWAIT this.tokenStore.getToken('qwen')
|
104
|
+
const savedToken = await this.tokenStore?.getToken('qwen');
|
105
|
+
// Line 20: IF savedToken AND NOT this.isTokenExpired(savedToken)
|
106
|
+
if (savedToken && !this.isTokenExpired(savedToken)) {
|
107
|
+
// Line 21: RETURN
|
108
|
+
return;
|
109
|
+
}
|
110
|
+
}, undefined, // No fallback needed - graceful failure is acceptable
|
111
|
+
this.name, 'initializeToken');
|
112
|
+
}
|
113
|
+
/**
|
114
|
+
* @plan PLAN-20250823-AUTHFIXES.P05
|
115
|
+
* @requirement REQ-001.1
|
116
|
+
* @pseudocode lines 32-57
|
117
|
+
*/
|
118
|
+
async initiateAuth() {
|
119
|
+
await this.ensureInitialized();
|
120
|
+
return this.errorHandler.wrapMethod(async () => {
|
121
|
+
// Line 33: SET deviceCodeResponse = AWAIT this.deviceFlow.initiateDeviceFlow()
|
122
|
+
const deviceCodeResponse = await this.deviceFlow.initiateDeviceFlow();
|
123
|
+
// Lines 34-35: SET authUrl
|
124
|
+
const authUrl = deviceCodeResponse.verification_uri_complete ||
|
125
|
+
`${deviceCodeResponse.verification_uri}?user_code=${deviceCodeResponse.user_code}`;
|
126
|
+
// Lines 37-38: PRINT
|
127
|
+
console.log('\nQwen OAuth Authentication');
|
128
|
+
console.log('─'.repeat(40));
|
129
|
+
// Line 40: IF shouldLaunchBrowser()
|
130
|
+
if (shouldLaunchBrowser()) {
|
131
|
+
// Line 41: PRINT
|
132
|
+
console.log('Opening browser for authentication...');
|
133
|
+
console.log('If the browser does not open, please visit:');
|
134
|
+
console.log(authUrl);
|
135
|
+
// Lines 42-46: TRY
|
136
|
+
try {
|
137
|
+
await openBrowserSecurely(authUrl);
|
138
|
+
}
|
139
|
+
catch (error) {
|
140
|
+
// Line 45: PRINT - browser failure is not critical
|
141
|
+
console.log('Failed to open browser automatically.');
|
142
|
+
console.debug('Browser launch error:', error);
|
143
|
+
}
|
144
|
+
}
|
145
|
+
else {
|
146
|
+
// Lines 48-49: PRINT
|
147
|
+
console.log('Visit this URL to authorize:');
|
148
|
+
console.log(authUrl);
|
149
|
+
}
|
150
|
+
console.log('─'.repeat(40));
|
151
|
+
// Line 52: PRINT
|
152
|
+
console.log('Waiting for authorization...\n');
|
153
|
+
// Line 54: SET token = AWAIT this.deviceFlow.pollForToken
|
154
|
+
const token = await this.deviceFlow.pollForToken(deviceCodeResponse.device_code);
|
155
|
+
// Line 55: AWAIT this.tokenStore.saveToken('qwen', token)
|
156
|
+
if (this.tokenStore) {
|
157
|
+
try {
|
158
|
+
await this.tokenStore.saveToken('qwen', token);
|
159
|
+
}
|
160
|
+
catch (saveError) {
|
161
|
+
throw OAuthErrorFactory.storageError(this.name, saveError instanceof Error ? saveError : undefined, {
|
162
|
+
operation: 'saveToken',
|
163
|
+
});
|
164
|
+
}
|
165
|
+
}
|
166
|
+
// Line 56: PRINT
|
167
|
+
console.log('Authentication successful!');
|
168
|
+
}, this.name, 'initiateAuth')();
|
169
|
+
}
|
170
|
+
/**
|
171
|
+
* @plan PLAN-20250823-AUTHFIXES.P05
|
172
|
+
* @requirement REQ-001.1
|
173
|
+
* @pseudocode lines 27-31
|
174
|
+
*/
|
175
|
+
isTokenExpired(token) {
|
176
|
+
// Line 28: SET now = Date.now() / 1000
|
177
|
+
const now = Date.now() / 1000;
|
178
|
+
// Line 29: SET buffer = 30
|
179
|
+
const buffer = 30;
|
180
|
+
// Line 30: RETURN token.expiry <= (now + buffer)
|
181
|
+
return token.expiry <= now + buffer;
|
182
|
+
}
|
183
|
+
/**
|
184
|
+
* @plan PLAN-20250823-AUTHFIXES.P05
|
185
|
+
* @requirement REQ-001.1
|
186
|
+
* @pseudocode lines 58-59
|
187
|
+
*/
|
50
188
|
async getToken() {
|
51
|
-
|
189
|
+
await this.ensureInitialized();
|
190
|
+
return this.errorHandler.handleGracefully(async () => {
|
191
|
+
// Line 59: RETURN AWAIT this.tokenStore.getToken('qwen')
|
192
|
+
const token = (await this.tokenStore?.getToken('qwen')) || null;
|
193
|
+
// If token exists and is expired/near expiry, try to refresh it
|
194
|
+
if (token && this.isTokenExpired(token)) {
|
195
|
+
return await this.refreshIfNeeded();
|
196
|
+
}
|
197
|
+
return token;
|
198
|
+
}, null, // Return null on error
|
199
|
+
this.name, 'getToken');
|
52
200
|
}
|
201
|
+
/**
|
202
|
+
* @plan PLAN-20250823-AUTHFIXES.P05
|
203
|
+
* @requirement REQ-001.1
|
204
|
+
* @pseudocode lines 61-85
|
205
|
+
*/
|
53
206
|
async refreshIfNeeded() {
|
54
|
-
|
207
|
+
await this.ensureInitialized();
|
208
|
+
// Line 62: SET currentToken = AWAIT this.tokenStore.getToken('qwen')
|
209
|
+
const currentToken = await this.tokenStore?.getToken('qwen');
|
210
|
+
// Lines 64-66: IF NOT currentToken
|
211
|
+
if (!currentToken) {
|
212
|
+
// Line 65: RETURN null
|
55
213
|
return null;
|
56
214
|
}
|
57
|
-
//
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
if (this.currentToken.refresh_token) {
|
215
|
+
// Line 68: IF this.isTokenExpired(currentToken)
|
216
|
+
if (this.isTokenExpired(currentToken)) {
|
217
|
+
// Line 69: IF currentToken.refresh_token
|
218
|
+
if (currentToken.refresh_token) {
|
219
|
+
// Line 70: TRY
|
63
220
|
try {
|
64
|
-
|
221
|
+
// Skip actual refresh in test environment to avoid network calls
|
222
|
+
if (process.env.NODE_ENV === 'test') {
|
223
|
+
// In test environment, simulate refresh failure
|
224
|
+
throw new Error('Simulated refresh failure in test environment');
|
225
|
+
}
|
226
|
+
// Line 71: SET refreshedToken = AWAIT this.deviceFlow.refreshToken
|
227
|
+
const refreshedToken = await this.deviceFlow.refreshToken(currentToken.refresh_token);
|
228
|
+
// Line 72: AWAIT this.tokenStore.saveToken('qwen', refreshedToken)
|
229
|
+
if (this.tokenStore) {
|
230
|
+
try {
|
231
|
+
await this.tokenStore.saveToken('qwen', refreshedToken);
|
232
|
+
}
|
233
|
+
catch (saveError) {
|
234
|
+
throw OAuthErrorFactory.storageError(this.name, saveError instanceof Error ? saveError : undefined, {
|
235
|
+
operation: 'saveRefreshedToken',
|
236
|
+
});
|
237
|
+
}
|
238
|
+
}
|
239
|
+
// Line 73: RETURN refreshedToken
|
240
|
+
return refreshedToken;
|
65
241
|
}
|
66
242
|
catch (error) {
|
67
|
-
|
243
|
+
// Line 75: LOG "Failed to refresh Qwen token: " + error
|
244
|
+
const refreshError = error instanceof OAuthError
|
245
|
+
? error
|
246
|
+
: OAuthErrorFactory.authorizationExpired(this.name, {
|
247
|
+
originalError: error instanceof Error ? error.message : String(error),
|
248
|
+
operation: 'refreshToken',
|
249
|
+
});
|
250
|
+
console.debug('Token refresh failed:', refreshError.toLogEntry());
|
251
|
+
// Line 76: AWAIT this.tokenStore.removeToken('qwen')
|
252
|
+
try {
|
253
|
+
await this.tokenStore?.removeToken('qwen');
|
254
|
+
}
|
255
|
+
catch (removeError) {
|
256
|
+
console.debug('Failed to remove invalid token:', removeError);
|
257
|
+
}
|
258
|
+
// Line 77: RETURN null
|
68
259
|
return null;
|
69
260
|
}
|
70
261
|
}
|
262
|
+
else {
|
263
|
+
// Line 80: AWAIT this.tokenStore.removeToken('qwen')
|
264
|
+
await this.tokenStore?.removeToken('qwen');
|
265
|
+
// Line 81: RETURN null
|
266
|
+
return null;
|
267
|
+
}
|
71
268
|
}
|
72
|
-
|
269
|
+
// Line 85: RETURN currentToken
|
270
|
+
return currentToken;
|
271
|
+
}
|
272
|
+
/**
|
273
|
+
* @plan PLAN-20250823-AUTHFIXES.P05
|
274
|
+
* @requirement REQ-001.1
|
275
|
+
* @pseudocode lines 87-89
|
276
|
+
*/
|
277
|
+
async logout() {
|
278
|
+
await this.ensureInitialized();
|
279
|
+
return this.errorHandler.handleGracefully(async () => {
|
280
|
+
// Line 88: AWAIT this.tokenStore.removeToken('qwen')
|
281
|
+
if (this.tokenStore) {
|
282
|
+
try {
|
283
|
+
await this.tokenStore.removeToken('qwen');
|
284
|
+
}
|
285
|
+
catch (error) {
|
286
|
+
throw OAuthErrorFactory.storageError(this.name, error instanceof Error ? error : undefined, {
|
287
|
+
operation: 'removeToken',
|
288
|
+
});
|
289
|
+
}
|
290
|
+
}
|
291
|
+
// Line 89: PRINT "Successfully logged out from Qwen"
|
292
|
+
console.log('Successfully logged out from Qwen');
|
293
|
+
}, undefined, // Always complete logout even if some steps fail
|
294
|
+
this.name, 'logout');
|
73
295
|
}
|
74
296
|
}
|
75
297
|
//# sourceMappingURL=qwen-oauth-provider.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"qwen-oauth-provider.js","sourceRoot":"","sources":["../../../src/auth/qwen-oauth-provider.ts"],"names":[],"mappings":"AAAA
|
1
|
+
{"version":3,"file":"qwen-oauth-provider.js","sourceRoot":"","sources":["../../../src/auth/qwen-oauth-provider.ts"],"names":[],"mappings":"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"}
|
@@ -10,7 +10,7 @@ import yargs from 'yargs/yargs';
|
|
10
10
|
import { hideBin } from 'yargs/helpers';
|
11
11
|
import process from 'node:process';
|
12
12
|
import { mcpCommand } from '../commands/mcp.js';
|
13
|
-
import { Config, loadServerHierarchicalMemory, setLlxprtMdFilename as setServerGeminiMdFilename, getCurrentLlxprtMdFilename, ApprovalMode, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, FileDiscoveryService, IdeClient, ProfileManager, ShellTool, EditTool, WriteFileTool, getSettingsService, } from '@vybestack/llxprt-code-core';
|
13
|
+
import { Config, loadServerHierarchicalMemory, setLlxprtMdFilename as setServerGeminiMdFilename, getCurrentLlxprtMdFilename, ApprovalMode, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_MEMORY_FILE_FILTERING_OPTIONS, FileDiscoveryService, IdeClient, ProfileManager, ShellTool, EditTool, WriteFileTool, getSettingsService, DebugLogger, } from '@vybestack/llxprt-code-core';
|
14
14
|
import { annotateActiveExtensions } from './extension.js';
|
15
15
|
import { getCliVersion } from '../utils/version.js';
|
16
16
|
import { loadSandboxConfig } from './sandboxConfig.js';
|
@@ -19,12 +19,7 @@ import * as os from 'node:os';
|
|
19
19
|
import { resolvePath } from '../utils/resolvePath.js';
|
20
20
|
import { isWorkspaceTrusted } from './trustedFolders.js';
|
21
21
|
const LLXPRT_DIR = '.llxprt';
|
22
|
-
|
23
|
-
const logger = {
|
24
|
-
debug: (...args) => console.debug('[DEBUG]', ...args),
|
25
|
-
warn: (...args) => console.warn('[WARN]', ...args),
|
26
|
-
error: (...args) => console.error('[ERROR]', ...args),
|
27
|
-
};
|
22
|
+
const logger = new DebugLogger('llxprt:config');
|
28
23
|
export async function parseArguments() {
|
29
24
|
const yargsInstance = yargs(hideBin(process.argv))
|
30
25
|
.scriptName('llxprt')
|
@@ -329,9 +324,10 @@ export async function loadCliConfig(settings, extensions, sessionId, argv, cwd =
|
|
329
324
|
let profileModel;
|
330
325
|
let profileProvider;
|
331
326
|
let profileModelParams;
|
332
|
-
// Check for profile to load - either from CLI arg or default profile setting
|
327
|
+
// Check for profile to load - either from CLI arg, env var, or default profile setting
|
333
328
|
// BUT skip default profile if --provider is explicitly specified
|
334
329
|
const profileToLoad = argv.profileLoad ||
|
330
|
+
process.env.LLXPRT_PROFILE ||
|
335
331
|
(argv.provider === undefined ? settings.defaultProfile : undefined);
|
336
332
|
if (profileToLoad) {
|
337
333
|
try {
|
@@ -344,6 +340,7 @@ export async function loadCliConfig(settings, extensions, sessionId, argv, cwd =
|
|
344
340
|
argv.provider !== undefined ? undefined : profile.provider;
|
345
341
|
profileModel = argv.provider !== undefined ? undefined : profile.model;
|
346
342
|
profileModelParams = profile.modelParams;
|
343
|
+
logger.debug(() => `Loaded profile ${profileToLoad}: provider=${profile.provider}, model=${profile.model}, hasEphemeralSettings=${!!profile.ephemeralSettings}`);
|
347
344
|
// Check debug mode for logging
|
348
345
|
const tempDebugMode = argv.debug ||
|
349
346
|
[process.env.DEBUG, process.env.DEBUG_MODE].some((v) => v === 'true' || v === '1') ||
|
@@ -510,13 +507,17 @@ export async function loadCliConfig(settings, extensions, sessionId, argv, cwd =
|
|
510
507
|
else {
|
511
508
|
finalProvider = 'gemini';
|
512
509
|
}
|
510
|
+
logger.debug(() => `Provider selection: argv=${argv.provider}, profile=${profileProvider}, env=${process.env.LLXPRT_DEFAULT_PROVIDER}, final=${finalProvider}`);
|
513
511
|
// Handle model selection with proper precedence
|
512
|
+
// Only use DEFAULT_GEMINI_MODEL as fallback when provider is 'gemini'
|
514
513
|
const finalModel = argv.model ||
|
515
514
|
profileModel ||
|
516
515
|
effectiveSettings.model ||
|
517
516
|
process.env.LLXPRT_DEFAULT_MODEL ||
|
518
517
|
process.env.GEMINI_MODEL ||
|
519
|
-
|
518
|
+
// If no model specified and provider is gemini, use the Gemini default
|
519
|
+
// For other providers, let them use their own default models (empty string means use provider default)
|
520
|
+
(finalProvider === 'gemini' ? DEFAULT_GEMINI_MODEL : '');
|
520
521
|
const config = new Config({
|
521
522
|
sessionId,
|
522
523
|
embeddingModel: DEFAULT_GEMINI_EMBEDDING_MODEL,
|
@@ -665,7 +666,7 @@ function mergeMcpServers(settings, extensions) {
|
|
665
666
|
for (const extension of extensions) {
|
666
667
|
Object.entries(extension.config.mcpServers || {}).forEach(([key, server]) => {
|
667
668
|
if (mcpServers[key]) {
|
668
|
-
logger.
|
669
|
+
logger.debug(() => `WARNING: Skipping extension MCP config for server with key "${key}" as it already exists.`);
|
669
670
|
return;
|
670
671
|
}
|
671
672
|
mcpServers[key] = {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"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"}
|
@@ -5,7 +5,7 @@
|
|
5
5
|
*/
|
6
6
|
import { MCPServerConfig, GeminiCLIExtension } from '@vybestack/llxprt-code-core';
|
7
7
|
export declare const EXTENSIONS_DIRECTORY_NAME: string;
|
8
|
-
export declare const EXTENSIONS_CONFIG_FILENAME = "
|
8
|
+
export declare const EXTENSIONS_CONFIG_FILENAME = "llxprt-extension.json";
|
9
9
|
export interface Extension {
|
10
10
|
path: string;
|
11
11
|
config: ExtensionConfig;
|
@@ -7,7 +7,7 @@ import * as fs from 'fs';
|
|
7
7
|
import * as path from 'path';
|
8
8
|
import * as os from 'os';
|
9
9
|
export const EXTENSIONS_DIRECTORY_NAME = path.join('.llxprt', 'extensions');
|
10
|
-
export const EXTENSIONS_CONFIG_FILENAME = '
|
10
|
+
export const EXTENSIONS_CONFIG_FILENAME = 'llxprt-extension.json';
|
11
11
|
export function loadExtensions(workspaceDir) {
|
12
12
|
const allExtensions = [
|
13
13
|
...loadExtensionsFromDir(workspaceDir),
|
package/dist/src/gemini.js
CHANGED
@@ -125,6 +125,13 @@ export async function main() {
|
|
125
125
|
}
|
126
126
|
process.exit(1);
|
127
127
|
}
|
128
|
+
// If we're in ACP mode, redirect console output IMMEDIATELY
|
129
|
+
// before any config loading that might write to stdout
|
130
|
+
if (argv.experimentalAcp) {
|
131
|
+
console.log = console.error;
|
132
|
+
console.info = console.error;
|
133
|
+
console.debug = console.error;
|
134
|
+
}
|
128
135
|
const extensions = loadExtensions(workspaceRoot);
|
129
136
|
const config = await loadCliConfig(settings.merged, extensions, sessionId, argv);
|
130
137
|
const consolePatcher = new ConsolePatcher({
|
@@ -321,6 +328,12 @@ export async function main() {
|
|
321
328
|
console.error(chalk.red(result.message));
|
322
329
|
process.exit(1);
|
323
330
|
}
|
331
|
+
// Store the keyfile path in ephemeral settings for reference
|
332
|
+
// This helps track that we're using a keyfile vs direct key
|
333
|
+
config.setEphemeralSetting('auth-keyfile', resolvedPath);
|
334
|
+
// Don't clear auth-key - setProviderApiKey already sets it in settings
|
335
|
+
// The auth-key will be used immediately, and auth-keyfile is stored
|
336
|
+
// for future reference (e.g., when reloading profiles)
|
324
337
|
const message = `API key loaded from ${resolvedPath} for provider '${providerManager.getActiveProviderName()}'`;
|
325
338
|
if (config.getDebugMode()) {
|
326
339
|
console.debug(message);
|
@@ -377,16 +390,8 @@ export async function main() {
|
|
377
390
|
throw new Error(err);
|
378
391
|
}
|
379
392
|
await config.refreshAuth(settings.merged.selectedAuthType);
|
380
|
-
//
|
381
|
-
|
382
|
-
const contextLimit = merged['context-limit'];
|
383
|
-
const compressionThreshold = merged['compression-threshold'];
|
384
|
-
if (contextLimit || compressionThreshold) {
|
385
|
-
const geminiClient = config.getGeminiClient();
|
386
|
-
if (geminiClient) {
|
387
|
-
geminiClient.setCompressionSettings(compressionThreshold, contextLimit);
|
388
|
-
}
|
389
|
-
}
|
393
|
+
// Compression settings are already applied via ephemeral settings in Config
|
394
|
+
// and will be read directly by geminiChat.ts during compression
|
390
395
|
}
|
391
396
|
catch (err) {
|
392
397
|
console.error('Error authenticating:', err);
|
@@ -411,7 +416,24 @@ export async function main() {
|
|
411
416
|
await getOauthClient(settings.merged.selectedAuthType, config);
|
412
417
|
}
|
413
418
|
if (config.getExperimentalZedIntegration()) {
|
414
|
-
|
419
|
+
// In ACP mode, authentication happens through the protocol
|
420
|
+
// Just ensure the provider manager is set up if configured
|
421
|
+
const providerManager = config.getProviderManager();
|
422
|
+
const configProvider = config.getProvider();
|
423
|
+
if (configProvider && providerManager) {
|
424
|
+
try {
|
425
|
+
// Set the active provider if not already set
|
426
|
+
if (!providerManager.hasActiveProvider()) {
|
427
|
+
await providerManager.setActiveProvider(configProvider);
|
428
|
+
}
|
429
|
+
}
|
430
|
+
catch (_e) {
|
431
|
+
// Non-fatal - continue without provider
|
432
|
+
// Authentication can still happen via the ACP protocol
|
433
|
+
}
|
434
|
+
}
|
435
|
+
await runZedIntegration(config, settings);
|
436
|
+
return;
|
415
437
|
}
|
416
438
|
let input = config.getQuestion();
|
417
439
|
const startupWarnings = [
|