@vybestack/llxprt-code 0.8.0 → 0.8.1-nightly.260121.3ad94b490
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/dist/index.js +0 -0
- package/dist/package.json +4 -4
- package/dist/src/auth/anthropic-oauth-provider.js +21 -4
- package/dist/src/auth/anthropic-oauth-provider.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/ui/components/WelcomeOnboarding/AuthMethodStep.js +7 -1
- package/dist/src/ui/components/WelcomeOnboarding/AuthMethodStep.js.map +1 -1
- package/dist/src/ui/components/WelcomeOnboarding/AuthenticationStep.js +7 -6
- package/dist/src/ui/components/WelcomeOnboarding/AuthenticationStep.js.map +1 -1
- package/dist/src/ui/components/WelcomeOnboarding/ProviderSelectStep.js +29 -4
- package/dist/src/ui/components/WelcomeOnboarding/ProviderSelectStep.js.map +1 -1
- package/dist/src/ui/hooks/useWelcomeOnboarding.js +65 -30
- package/dist/src/ui/hooks/useWelcomeOnboarding.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +4 -4
package/dist/index.js
CHANGED
|
File without changes
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vybestack/llxprt-code",
|
|
3
|
-
"version": "0.8.
|
|
3
|
+
"version": "0.8.1-nightly.260121.3ad94b490",
|
|
4
4
|
"description": "LLxprt Code",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"llxprt": "dist/index.js"
|
|
14
14
|
},
|
|
15
15
|
"scripts": {
|
|
16
|
-
"build": "node ../../scripts/build_package.js",
|
|
16
|
+
"build": "node ../../scripts/build_package.js && chmod 755 dist/index.js",
|
|
17
17
|
"start": "node dist/index.js",
|
|
18
18
|
"debug": "node --inspect-brk dist/index.js",
|
|
19
19
|
"lint": "eslint . --ext .ts,.tsx",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"dist"
|
|
34
34
|
],
|
|
35
35
|
"config": {
|
|
36
|
-
"sandboxImageUri": "ghcr.io/vybestack/llxprt-code/sandbox:0.8.
|
|
36
|
+
"sandboxImageUri": "ghcr.io/vybestack/llxprt-code/sandbox:0.8.1-nightly.260121.3ad94b490"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
39
|
"@anthropic-ai/sdk": "^0.55.1",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"@iarna/toml": "^2.2.5",
|
|
43
43
|
"@modelcontextprotocol/sdk": "^1.25.2",
|
|
44
44
|
"@types/update-notifier": "^6.0.8",
|
|
45
|
-
"@vybestack/llxprt-code-core": "0.8.
|
|
45
|
+
"@vybestack/llxprt-code-core": "0.8.1-nightly.260121.3ad94b490",
|
|
46
46
|
"ansi-regex": "^6.2.2",
|
|
47
47
|
"chalk": "^5.3.0",
|
|
48
48
|
"cli-spinners": "2.9.2",
|
|
@@ -146,12 +146,20 @@ export class AnthropicOAuthProvider {
|
|
|
146
146
|
this.logger.debug(() => `Local OAuth callback unavailable: ${error instanceof Error ? error.message : String(error)}`);
|
|
147
147
|
}
|
|
148
148
|
}
|
|
149
|
-
|
|
150
|
-
|
|
149
|
+
// In interactive mode with local callback, use the redirect-based URL
|
|
150
|
+
// In non-interactive or fallback mode, use the device code URL
|
|
151
|
+
let authUrl;
|
|
151
152
|
if (localCallback) {
|
|
153
|
+
// Browser-based OAuth with local callback server
|
|
152
154
|
authUrl = this.deviceFlow.buildAuthorizationUrl(localCallback.redirectUri);
|
|
153
155
|
}
|
|
154
|
-
|
|
156
|
+
else {
|
|
157
|
+
// Device flow URL (for non-interactive or when callback server fails)
|
|
158
|
+
authUrl =
|
|
159
|
+
deviceCodeResponse.verification_uri_complete ||
|
|
160
|
+
`${deviceCodeResponse.verification_uri}?user_code=${deviceCodeResponse.user_code}`;
|
|
161
|
+
}
|
|
162
|
+
// Show the auth URL in the TUI
|
|
155
163
|
const message = `Please visit the following URL to authorize with Anthropic Claude:\\n${authUrl}`;
|
|
156
164
|
const historyItem = {
|
|
157
165
|
type: 'oauth_url',
|
|
@@ -182,18 +190,27 @@ export class AnthropicOAuthProvider {
|
|
|
182
190
|
this.logger.debug(() => `Browser launch error: ${error}`);
|
|
183
191
|
}
|
|
184
192
|
}
|
|
193
|
+
// If we have a local callback server, wait for it - this is the primary flow
|
|
194
|
+
// for interactive mode. Only fall back to paste box if callback fails.
|
|
185
195
|
if (localCallback) {
|
|
186
196
|
try {
|
|
187
197
|
const { code, state } = await localCallback.waitForCallback();
|
|
188
198
|
await localCallback.shutdown();
|
|
189
199
|
await this.completeAuth(`${code}#${state}`);
|
|
190
|
-
return;
|
|
200
|
+
return; // Success! Don't fall through to paste box.
|
|
191
201
|
}
|
|
192
202
|
catch (error) {
|
|
193
203
|
await localCallback.shutdown().catch(() => undefined);
|
|
194
204
|
this.logger.debug(() => `Local OAuth callback failed: ${error instanceof Error ? error.message : String(error)}`);
|
|
205
|
+
// Local callback failed - throw the error rather than falling back to paste box
|
|
206
|
+
// in interactive mode. The user should retry.
|
|
207
|
+
throw OAuthErrorFactory.fromUnknown(this.name, error instanceof Error
|
|
208
|
+
? error
|
|
209
|
+
: new Error('OAuth callback failed'), 'local callback');
|
|
195
210
|
}
|
|
196
211
|
}
|
|
212
|
+
// Only reach here in non-interactive mode (no browser, no local callback)
|
|
213
|
+
// This is the device code / paste box flow for headless environments
|
|
197
214
|
global.__oauth_provider =
|
|
198
215
|
'anthropic';
|
|
199
216
|
this.pendingAuthPromise = new Promise((resolve, reject) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic-oauth-provider.js","sourceRoot":"","sources":["../../../src/auth/anthropic-oauth-provider.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"anthropic-oauth-provider.js","sourceRoot":"","sources":["../../../src/auth/anthropic-oauth-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,13 @@ import { Box, Text } from 'ink';
|
|
|
9
9
|
import { Colors } from '../../colors.js';
|
|
10
10
|
import { RadioButtonSelect, } from '../shared/RadioButtonSelect.js';
|
|
11
11
|
// Providers that support OAuth
|
|
12
|
-
const OAUTH_PROVIDERS = new Set([
|
|
12
|
+
const OAUTH_PROVIDERS = new Set([
|
|
13
|
+
'anthropic',
|
|
14
|
+
'openai',
|
|
15
|
+
'gemini',
|
|
16
|
+
'qwen',
|
|
17
|
+
'codex',
|
|
18
|
+
]);
|
|
13
19
|
const API_KEY_URLS = {
|
|
14
20
|
anthropic: 'console.anthropic.com/settings/keys',
|
|
15
21
|
openai: 'platform.openai.com/api-keys',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthMethodStep.js","sourceRoot":"","sources":["../../../../../src/ui/components/WelcomeOnboarding/AuthMethodStep.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAc,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EACL,iBAAiB,GAElB,MAAM,gCAAgC,CAAC;AAExC,+BAA+B;AAC/B,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"AuthMethodStep.js","sourceRoot":"","sources":["../../../../../src/ui/components/WelcomeOnboarding/AuthMethodStep.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import { jsxs as _jsxs, jsx as _jsx, Fragment as _Fragment } from "react/jsx-run
|
|
|
4
4
|
* Copyright 2025 Vybestack LLC
|
|
5
5
|
* SPDX-License-Identifier: Apache-2.0
|
|
6
6
|
*/
|
|
7
|
-
import { useState, useEffect, useCallback } from 'react';
|
|
7
|
+
import React, { useState, useEffect, useCallback } from 'react';
|
|
8
8
|
import { Box, Text } from 'ink';
|
|
9
9
|
import Spinner from 'ink-spinner';
|
|
10
10
|
import { Colors } from '../../colors.js';
|
|
@@ -12,7 +12,6 @@ import { useKeypress } from '../../hooks/useKeypress.js';
|
|
|
12
12
|
export const AuthenticationStep = ({ provider, method, onComplete, onError, onBack, triggerAuth, isFocused = true, }) => {
|
|
13
13
|
const [apiKey, setApiKey] = useState('');
|
|
14
14
|
const [isAuthenticating, setIsAuthenticating] = useState(false);
|
|
15
|
-
const [authStarted, setAuthStarted] = useState(false);
|
|
16
15
|
const providerDisplay = provider.charAt(0).toUpperCase() + provider.slice(1);
|
|
17
16
|
const handleApiKeySubmit = useCallback(async () => {
|
|
18
17
|
if (!apiKey.trim()) {
|
|
@@ -55,10 +54,12 @@ export const AuthenticationStep = ({ provider, method, onComplete, onError, onBa
|
|
|
55
54
|
}
|
|
56
55
|
}
|
|
57
56
|
}, { isActive: isFocused });
|
|
58
|
-
// Start OAuth flow automatically
|
|
57
|
+
// Start OAuth flow automatically - use ref to prevent double-execution
|
|
58
|
+
// React Strict Mode or dependency changes can cause this effect to re-run
|
|
59
|
+
const authStartedRef = React.useRef(false);
|
|
59
60
|
useEffect(() => {
|
|
60
|
-
if (method === 'oauth' && !
|
|
61
|
-
|
|
61
|
+
if (method === 'oauth' && !authStartedRef.current) {
|
|
62
|
+
authStartedRef.current = true;
|
|
62
63
|
setIsAuthenticating(true);
|
|
63
64
|
triggerAuth(provider, 'oauth')
|
|
64
65
|
.then(() => {
|
|
@@ -69,7 +70,7 @@ export const AuthenticationStep = ({ provider, method, onComplete, onError, onBa
|
|
|
69
70
|
onError(error instanceof Error ? error.message : String(error));
|
|
70
71
|
});
|
|
71
72
|
}
|
|
72
|
-
}, [method, provider, triggerAuth, onComplete, onError
|
|
73
|
+
}, [method, provider, triggerAuth, onComplete, onError]);
|
|
73
74
|
if (method === 'oauth') {
|
|
74
75
|
return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { flexDirection: "column", marginBottom: 1, children: _jsxs(Text, { bold: true, color: Colors.AccentCyan, children: ["Step 4 of 5: Authenticating with ", providerDisplay] }) }), _jsx(Box, { marginBottom: 1, children: _jsxs(Text, { color: Colors.Foreground, children: [_jsx(Text, { color: Colors.AccentYellow, children: _jsx(Spinner, { type: "dots" }) }), ' ', "Opening browser for OAuth authentication..."] }) }), _jsx(Text, { color: Colors.Foreground, children: "Please complete the authentication in your browser." }), _jsx(Text, { color: Colors.Foreground, children: "This window will update when done." }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { color: Colors.Gray, children: "Press Esc to cancel and go back" }) })] }));
|
|
75
76
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthenticationStep.js","sourceRoot":"","sources":["../../../../../src/ui/components/WelcomeOnboarding/AuthenticationStep.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,
|
|
1
|
+
{"version":3,"file":"AuthenticationStep.js","sourceRoot":"","sources":["../../../../../src/ui/components/WelcomeOnboarding/AuthenticationStep.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,17 +9,42 @@ import { Box, Text } from 'ink';
|
|
|
9
9
|
import { Colors } from '../../colors.js';
|
|
10
10
|
import { RadioButtonSelect, } from '../shared/RadioButtonSelect.js';
|
|
11
11
|
const PROVIDER_DISPLAY_NAMES = {
|
|
12
|
-
anthropic: 'Anthropic (Claude)',
|
|
13
|
-
openai: 'OpenAI (GPT-4, etc.)',
|
|
14
12
|
gemini: 'Google Gemini',
|
|
15
|
-
|
|
13
|
+
codex: 'OpenAI Codex (ChatGPT Backend)',
|
|
14
|
+
anthropic: 'Anthropic (Claude)',
|
|
16
15
|
qwen: 'Qwen',
|
|
16
|
+
synthetic: 'Synthetic (Testing)',
|
|
17
|
+
zai: 'Zai',
|
|
18
|
+
openai: 'OpenAI (GPT-4, etc.)',
|
|
17
19
|
'openai-responses': 'OpenAI Responses API',
|
|
18
20
|
openaivercel: 'OpenAI (Vercel AI SDK)',
|
|
21
|
+
deepseek: 'DeepSeek',
|
|
19
22
|
};
|
|
23
|
+
// Preferred order for provider display
|
|
24
|
+
const PROVIDER_ORDER = [
|
|
25
|
+
'gemini',
|
|
26
|
+
'codex',
|
|
27
|
+
'anthropic',
|
|
28
|
+
'qwen',
|
|
29
|
+
'synthetic',
|
|
30
|
+
'zai',
|
|
31
|
+
'openai',
|
|
32
|
+
'openai-responses',
|
|
33
|
+
'openaivercel',
|
|
34
|
+
'deepseek',
|
|
35
|
+
];
|
|
20
36
|
export const ProviderSelectStep = ({ providers, onSelect, onSkip, isFocused = true, }) => {
|
|
21
37
|
const options = useMemo(() => {
|
|
22
|
-
|
|
38
|
+
// Sort providers by preferred order
|
|
39
|
+
const sortedProviders = [...providers].sort((a, b) => {
|
|
40
|
+
const aIndex = PROVIDER_ORDER.indexOf(a);
|
|
41
|
+
const bIndex = PROVIDER_ORDER.indexOf(b);
|
|
42
|
+
// Providers not in the list go to the end
|
|
43
|
+
const aOrder = aIndex === -1 ? PROVIDER_ORDER.length : aIndex;
|
|
44
|
+
const bOrder = bIndex === -1 ? PROVIDER_ORDER.length : bIndex;
|
|
45
|
+
return aOrder - bOrder;
|
|
46
|
+
});
|
|
47
|
+
const providerOptions = sortedProviders.map((provider) => ({
|
|
23
48
|
label: PROVIDER_DISPLAY_NAMES[provider] || provider,
|
|
24
49
|
value: provider,
|
|
25
50
|
key: provider,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProviderSelectStep.js","sourceRoot":"","sources":["../../../../../src/ui/components/WelcomeOnboarding/ProviderSelectStep.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAc,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EACL,iBAAiB,GAElB,MAAM,gCAAgC,CAAC;AAExC,MAAM,sBAAsB,GAA2B;IACrD,SAAS,EAAE,oBAAoB;IAC/B,
|
|
1
|
+
{"version":3,"file":"ProviderSelectStep.js","sourceRoot":"","sources":["../../../../../src/ui/components/WelcomeOnboarding/ProviderSelectStep.tsx"],"names":[],"mappings":"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"}
|
|
@@ -42,7 +42,7 @@ export const useWelcomeOnboarding = (options) => {
|
|
|
42
42
|
try {
|
|
43
43
|
const models = await runtime.listAvailableModels(state.selectedProvider);
|
|
44
44
|
const modelInfos = models.map((m) => ({
|
|
45
|
-
id: m.
|
|
45
|
+
id: m.id,
|
|
46
46
|
name: m.name,
|
|
47
47
|
}));
|
|
48
48
|
setAvailableModels(modelInfos);
|
|
@@ -64,16 +64,30 @@ export const useWelcomeOnboarding = (options) => {
|
|
|
64
64
|
setState((prev) => ({
|
|
65
65
|
...prev,
|
|
66
66
|
selectedProvider: providerId,
|
|
67
|
-
step: '
|
|
67
|
+
step: 'auth_method', // Auth before model selection to ensure models load properly
|
|
68
68
|
}));
|
|
69
69
|
}, []);
|
|
70
|
-
const selectModel = useCallback((modelId) => {
|
|
70
|
+
const selectModel = useCallback(async (modelId) => {
|
|
71
|
+
// Actually set the model on the runtime so it's captured in the profile
|
|
72
|
+
debug.log(`[selectModel] Setting model: ${modelId}`);
|
|
73
|
+
try {
|
|
74
|
+
await runtime.setActiveModel(modelId);
|
|
75
|
+
debug.log(`[selectModel] Model set successfully: ${modelId}`);
|
|
76
|
+
}
|
|
77
|
+
catch (error) {
|
|
78
|
+
debug.log(`[selectModel] Failed to set model: ${error}`);
|
|
79
|
+
setState((prev) => ({
|
|
80
|
+
...prev,
|
|
81
|
+
error: `Failed to set model: ${error instanceof Error ? error.message : String(error)}`,
|
|
82
|
+
}));
|
|
83
|
+
return;
|
|
84
|
+
}
|
|
71
85
|
setState((prev) => ({
|
|
72
86
|
...prev,
|
|
73
87
|
selectedModel: modelId,
|
|
74
|
-
step: '
|
|
88
|
+
step: 'completion', // After model selection, go to completion (auth already done)
|
|
75
89
|
}));
|
|
76
|
-
}, []);
|
|
90
|
+
}, [runtime]);
|
|
77
91
|
const selectAuthMethod = useCallback((method) => {
|
|
78
92
|
setState((prev) => ({
|
|
79
93
|
...prev,
|
|
@@ -82,16 +96,36 @@ export const useWelcomeOnboarding = (options) => {
|
|
|
82
96
|
authInProgress: true,
|
|
83
97
|
}));
|
|
84
98
|
}, []);
|
|
85
|
-
const onAuthComplete = useCallback(() => {
|
|
86
|
-
// Provider switch already happened in triggerAuth
|
|
99
|
+
const onAuthComplete = useCallback(async () => {
|
|
100
|
+
// Provider switch already happened in triggerAuth
|
|
87
101
|
debug.log(`[onAuthComplete] Auth complete for provider: ${state.selectedProvider}`);
|
|
102
|
+
// Refresh models now that auth is established
|
|
103
|
+
try {
|
|
104
|
+
if (state.selectedProvider) {
|
|
105
|
+
setState((prev) => ({ ...prev, modelsLoadStatus: 'loading' }));
|
|
106
|
+
const models = await runtime.listAvailableModels(state.selectedProvider);
|
|
107
|
+
const modelInfos = models.map((m) => ({
|
|
108
|
+
id: m.id,
|
|
109
|
+
name: m.name,
|
|
110
|
+
}));
|
|
111
|
+
setAvailableModels(modelInfos);
|
|
112
|
+
setState((prev) => ({ ...prev, modelsLoadStatus: 'success' }));
|
|
113
|
+
debug.log(`[onAuthComplete] Loaded ${modelInfos.length} models for ${state.selectedProvider}`);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
catch (error) {
|
|
117
|
+
debug.log(`[onAuthComplete] Failed to reload models: ${error}`);
|
|
118
|
+
setAvailableModels([]);
|
|
119
|
+
setState((prev) => ({ ...prev, modelsLoadStatus: 'error' }));
|
|
120
|
+
}
|
|
121
|
+
// Go to model selection step (since we reordered: provider → auth → model)
|
|
88
122
|
setState((prev) => ({
|
|
89
123
|
...prev,
|
|
90
|
-
step: '
|
|
124
|
+
step: 'model',
|
|
91
125
|
authInProgress: false,
|
|
92
126
|
error: undefined,
|
|
93
127
|
}));
|
|
94
|
-
}, [state.selectedProvider]);
|
|
128
|
+
}, [runtime, state.selectedProvider]);
|
|
95
129
|
const onAuthError = useCallback((error) => {
|
|
96
130
|
setState((prev) => ({
|
|
97
131
|
...prev,
|
|
@@ -106,10 +140,9 @@ export const useWelcomeOnboarding = (options) => {
|
|
|
106
140
|
const goBack = useCallback(() => {
|
|
107
141
|
setState((prev) => {
|
|
108
142
|
switch (prev.step) {
|
|
109
|
-
case 'model':
|
|
110
|
-
return { ...prev, step: 'provider', selectedProvider: undefined };
|
|
111
143
|
case 'auth_method':
|
|
112
|
-
|
|
144
|
+
// Going back from auth method goes to provider selection
|
|
145
|
+
return { ...prev, step: 'provider', selectedProvider: undefined };
|
|
113
146
|
case 'authenticating':
|
|
114
147
|
return {
|
|
115
148
|
...prev,
|
|
@@ -117,6 +150,9 @@ export const useWelcomeOnboarding = (options) => {
|
|
|
117
150
|
selectedAuthMethod: undefined,
|
|
118
151
|
authInProgress: false,
|
|
119
152
|
};
|
|
153
|
+
case 'model':
|
|
154
|
+
// Going back from model selection goes to auth method
|
|
155
|
+
return { ...prev, step: 'auth_method', selectedModel: undefined };
|
|
120
156
|
case 'provider':
|
|
121
157
|
return { ...prev, step: 'welcome' };
|
|
122
158
|
default:
|
|
@@ -160,40 +196,39 @@ export const useWelcomeOnboarding = (options) => {
|
|
|
160
196
|
debug.log(`Welcome flow completed (skipped: ${skipped})`);
|
|
161
197
|
}, [state.step]);
|
|
162
198
|
// Trigger authentication for the selected provider
|
|
199
|
+
// Flow is now: provider → auth → model, so we authenticate FIRST before setting provider/model
|
|
163
200
|
const triggerAuth = useCallback(async (provider, method, apiKey) => {
|
|
164
201
|
debug.log(`[triggerAuth] START provider=${provider} method=${method}`);
|
|
165
202
|
const oauthManager = runtime.getCliOAuthManager();
|
|
166
203
|
const providerManager = runtime.getCliProviderManager();
|
|
167
|
-
debug.log(`[triggerAuth] Before
|
|
168
|
-
//
|
|
169
|
-
// including config updates, ephemeral settings, and settingsService updates
|
|
170
|
-
const switchResult = await runtime.switchActiveProvider(provider);
|
|
171
|
-
debug.log(`[triggerAuth] After switchActiveProvider - changed: ${switchResult.changed}, now active: ${providerManager?.getActiveProviderName()}`);
|
|
172
|
-
// Set the selected model
|
|
173
|
-
if (state.selectedModel) {
|
|
174
|
-
debug.log(`[triggerAuth] Setting model to: ${state.selectedModel}`);
|
|
175
|
-
await runtime.setActiveModel(state.selectedModel);
|
|
176
|
-
debug.log(`[triggerAuth] Model set to: ${state.selectedModel}`);
|
|
177
|
-
}
|
|
204
|
+
debug.log(`[triggerAuth] Before auth - current active: ${providerManager?.getActiveProviderName()}`);
|
|
205
|
+
// Authenticate FIRST before switching provider (prevents double OAuth)
|
|
178
206
|
if (method === 'oauth') {
|
|
179
|
-
// Trigger OAuth flow
|
|
180
207
|
if (!oauthManager) {
|
|
181
208
|
throw new Error('OAuth manager not available');
|
|
182
209
|
}
|
|
210
|
+
debug.log(`[triggerAuth] Starting OAuth for ${provider}`);
|
|
183
211
|
await oauthManager.authenticate(provider);
|
|
184
212
|
debug.log(`[triggerAuth] OAuth complete for ${provider}`);
|
|
185
213
|
}
|
|
186
|
-
|
|
187
|
-
|
|
214
|
+
// Now switch to the provider AFTER auth is complete
|
|
215
|
+
// IMPORTANT: Pass autoOAuth: false to prevent switchActiveProvider from triggering
|
|
216
|
+
// a second OAuth flow - we already authenticated above
|
|
217
|
+
const switchResult = await runtime.switchActiveProvider(provider, {
|
|
218
|
+
autoOAuth: false,
|
|
219
|
+
});
|
|
220
|
+
debug.log(`[triggerAuth] After switchActiveProvider - changed: ${switchResult.changed}, now active: ${providerManager?.getActiveProviderName()}`);
|
|
221
|
+
// For API key method, set the key after switching provider
|
|
222
|
+
if (method === 'api_key') {
|
|
223
|
+
if (!apiKey) {
|
|
224
|
+
throw new Error('API key is required for API key authentication');
|
|
225
|
+
}
|
|
188
226
|
debug.log(`[triggerAuth] Calling updateActiveProviderApiKey for ${provider}`);
|
|
189
227
|
const result = await runtime.updateActiveProviderApiKey(apiKey);
|
|
190
228
|
debug.log(`[triggerAuth] API key result: ${result.message}, providerName=${result.providerName}`);
|
|
191
229
|
}
|
|
192
|
-
else {
|
|
193
|
-
throw new Error('API key is required for API key authentication');
|
|
194
|
-
}
|
|
195
230
|
debug.log(`[triggerAuth] END - active provider: ${providerManager?.getActiveProviderName()}`);
|
|
196
|
-
}, [runtime
|
|
231
|
+
}, [runtime]);
|
|
197
232
|
return {
|
|
198
233
|
showWelcome,
|
|
199
234
|
state,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useWelcomeOnboarding.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useWelcomeOnboarding.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAE1D,OAAO,EACL,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAE9D,MAAM,KAAK,GAAG,IAAI,WAAW,CAAC,gCAAgC,CAAC,CAAC;AA2DhE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,OAAoC,EACR,EAAE;IAC9B,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,qBAAqB,EAAE,GAAG,OAAO,CAAC;IAC/D,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;IAChC,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,CAAC,GAAG,EAAE,CAC5D,kBAAkB,EAAE,CACrB,CAAC;IAEF,mDAAmD;IACnD,MAAM,WAAW,GAAG,CAAC,gBAAgB,IAAI,qBAAqB,CAAC;IAE/D,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAe;QAC/C,IAAI,EAAE,SAAS;QACf,cAAc,EAAE,KAAK;QACrB,gBAAgB,EAAE,MAAM;KACzB,CAAC,CAAC;IAEH,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,GAAG,QAAQ,CAAW,EAAE,CAAC,CAAC;IAC3E,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,QAAQ,CAAc,EAAE,CAAC,CAAC;IAExE,oCAAoC;IACpC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,eAAe,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;QACxD,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM,SAAS,GAAG,eAAe,CAAC,aAAa,EAAE,CAAC;YAClD,qBAAqB,CAAC,SAAS,CAAC,CAAC;YACjC,KAAK,CAAC,GAAG,CACP,UAAU,SAAS,CAAC,MAAM,eAAe,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAChE,CAAC;QACJ,CAAC;IACH,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,kDAAkD;IAClD,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;YAC5B,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;gBAC5B,kBAAkB,CAAC,EAAE,CAAC,CAAC;gBACvB,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC5D,OAAO;YACT,CAAC;YAED,QAAQ,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,gBAAgB,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;YAE/D,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,mBAAmB,CAC9C,KAAK,CAAC,gBAAgB,CACvB,CAAC;gBACF,MAAM,UAAU,GAAgB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACjD,EAAE,EAAE,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"useWelcomeOnboarding.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useWelcomeOnboarding.ts"],"names":[],"mappings":"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"}
|