@terminai/a2a-server 0.21.0 → 0.23.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/dist/a2a-server.mjs +191970 -171538
- package/dist/src/auth/llmAuthManager.d.ts +21 -1
- package/dist/src/auth/llmAuthManager.js +97 -9
- package/dist/src/auth/llmAuthManager.js.map +1 -1
- package/dist/src/auth/llmAuthManager.test.js +93 -1
- package/dist/src/auth/llmAuthManager.test.js.map +1 -1
- package/dist/src/config/config.js +48 -4
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/settings.d.ts +3 -3
- package/dist/src/config/settings.js +2 -2
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/http/app.js +2 -0
- package/dist/src/http/app.js.map +1 -1
- package/dist/src/http/authRoutes.test.js +48 -0
- package/dist/src/http/authRoutes.test.js.map +1 -1
- package/dist/src/http/deferredAuth.test.js +0 -1
- package/dist/src/http/deferredAuth.test.js.map +1 -1
- package/dist/src/http/llmAuthMiddleware.d.ts +1 -1
- package/dist/src/http/llmAuthMiddleware.js +0 -1
- package/dist/src/http/llmAuthMiddleware.js.map +1 -1
- package/dist/src/http/routes/auth.d.ts +1 -1
- package/dist/src/http/routes/auth.js +40 -1
- package/dist/src/http/routes/auth.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/web-client/package.json +1 -1
- package/package.json +3 -3
|
@@ -4,12 +4,15 @@
|
|
|
4
4
|
* Portions Copyright 2025 TerminaI Authors
|
|
5
5
|
* SPDX-License-Identifier: Apache-2.0
|
|
6
6
|
*/
|
|
7
|
-
import {
|
|
7
|
+
import { AuthType } from '@terminai/core';
|
|
8
|
+
import type { Config } from '@terminai/core';
|
|
8
9
|
export type LlmAuthStatus = 'ok' | 'required' | 'in_progress' | 'error';
|
|
9
10
|
export type OAuthErrorCode = 'timeout' | 'denied' | 'state_mismatch' | 'server_bind_failed' | 'token_exchange_failed' | 'network_error';
|
|
10
11
|
export interface LlmAuthStatusResult {
|
|
11
12
|
readonly status: LlmAuthStatus;
|
|
12
13
|
readonly authType: AuthType | undefined;
|
|
14
|
+
/** 3.5: Provider ID for Desktop to determine correct auth UI */
|
|
15
|
+
readonly provider?: 'gemini' | 'openai_compatible' | 'anthropic';
|
|
13
16
|
readonly message?: string;
|
|
14
17
|
readonly errorCode?: OAuthErrorCode;
|
|
15
18
|
}
|
|
@@ -23,9 +26,11 @@ export declare class LlmAuthManager {
|
|
|
23
26
|
private oauthFlow;
|
|
24
27
|
private lastErrorMessage;
|
|
25
28
|
private lastErrorCode;
|
|
29
|
+
private readonly getLoadedSettings;
|
|
26
30
|
constructor(input: {
|
|
27
31
|
config: Config;
|
|
28
32
|
getSelectedAuthType: () => AuthType | undefined;
|
|
33
|
+
getLoadedSettings?: () => import('../config/settings.js').LoadedSettings;
|
|
29
34
|
});
|
|
30
35
|
getStatus(): Promise<LlmAuthStatusResult>;
|
|
31
36
|
submitGeminiApiKey(apiKey: string): Promise<LlmAuthStatusResult>;
|
|
@@ -36,4 +41,19 @@ export declare class LlmAuthManager {
|
|
|
36
41
|
useGeminiVertex(): Promise<LlmAuthStatusResult>;
|
|
37
42
|
clearGeminiAuth(): Promise<LlmAuthStatusResult>;
|
|
38
43
|
private mapOAuthError;
|
|
44
|
+
/**
|
|
45
|
+
* T3.2: Apply provider switch from Desktop.
|
|
46
|
+
* Validates enforcedType, applies patches, reconfigures the provider.
|
|
47
|
+
*/
|
|
48
|
+
applyProviderSwitch(params: {
|
|
49
|
+
provider: 'gemini' | 'openai_compatible';
|
|
50
|
+
openaiCompatible?: {
|
|
51
|
+
baseUrl: string;
|
|
52
|
+
model: string;
|
|
53
|
+
envVarName?: string;
|
|
54
|
+
};
|
|
55
|
+
}): Promise<LlmAuthStatusResult | {
|
|
56
|
+
error: string;
|
|
57
|
+
statusCode: number;
|
|
58
|
+
}>;
|
|
39
59
|
}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* Portions Copyright 2025 TerminaI Authors
|
|
5
5
|
* SPDX-License-Identifier: Apache-2.0
|
|
6
6
|
*/
|
|
7
|
-
import {
|
|
7
|
+
import { checkGeminiAuthStatusNonInteractive, beginGeminiOAuthLoopbackFlow, AuthType, saveApiKey, clearCachedCredentialFile, LlmProviderId, } from '@terminai/core';
|
|
8
8
|
import { logger } from '../utils/logger.js';
|
|
9
9
|
export class AuthConflictError extends Error {
|
|
10
10
|
statusCode = 409;
|
|
@@ -16,9 +16,11 @@ export class LlmAuthManager {
|
|
|
16
16
|
oauthFlow = null;
|
|
17
17
|
lastErrorMessage = null;
|
|
18
18
|
lastErrorCode;
|
|
19
|
+
getLoadedSettings;
|
|
19
20
|
constructor(input) {
|
|
20
21
|
this.config = input.config;
|
|
21
22
|
this.getSelectedAuthType = input.getSelectedAuthType;
|
|
23
|
+
this.getLoadedSettings = input.getLoadedSettings;
|
|
22
24
|
this.effectiveAuthType = this.getSelectedAuthType();
|
|
23
25
|
}
|
|
24
26
|
async getStatus() {
|
|
@@ -27,17 +29,42 @@ export class LlmAuthManager {
|
|
|
27
29
|
return {
|
|
28
30
|
status: 'in_progress',
|
|
29
31
|
authType,
|
|
32
|
+
provider: 'gemini', // OAuth is Gemini-only
|
|
30
33
|
message: 'OAuth sign-in in progress',
|
|
31
34
|
};
|
|
32
35
|
}
|
|
36
|
+
// T3.1: Branch on provider
|
|
37
|
+
const providerConfig = this.config.getProviderConfig();
|
|
38
|
+
if (providerConfig.provider === LlmProviderId.OPENAI_COMPATIBLE) {
|
|
39
|
+
// For OpenAI-compatible, check if the required env var is present
|
|
40
|
+
const envVarName = providerConfig.auth?.envVarName || 'OPENAI_API_KEY';
|
|
41
|
+
const hasApiKey = Boolean(process.env[envVarName]);
|
|
42
|
+
if (hasApiKey) {
|
|
43
|
+
return {
|
|
44
|
+
status: 'ok',
|
|
45
|
+
authType: AuthType.USE_OPENAI_COMPATIBLE,
|
|
46
|
+
provider: 'openai_compatible',
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
else {
|
|
50
|
+
return {
|
|
51
|
+
status: 'required',
|
|
52
|
+
authType: AuthType.USE_OPENAI_COMPATIBLE,
|
|
53
|
+
provider: 'openai_compatible',
|
|
54
|
+
message: `OpenAI-compatible provider requires the ${envVarName} environment variable to be set.`,
|
|
55
|
+
};
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
// Gemini provider: use existing checkGeminiAuthStatusNonInteractive
|
|
33
59
|
const check = await checkGeminiAuthStatusNonInteractive(authType, process.env);
|
|
34
60
|
if (check.status === 'ok') {
|
|
35
|
-
return { status: 'ok', authType };
|
|
61
|
+
return { status: 'ok', authType, provider: 'gemini' };
|
|
36
62
|
}
|
|
37
63
|
if (check.status === 'required') {
|
|
38
64
|
return {
|
|
39
65
|
status: 'required',
|
|
40
66
|
authType,
|
|
67
|
+
provider: 'gemini',
|
|
41
68
|
message: check.message ?? this.lastErrorMessage ?? undefined,
|
|
42
69
|
errorCode: this.lastErrorCode,
|
|
43
70
|
};
|
|
@@ -45,6 +72,7 @@ export class LlmAuthManager {
|
|
|
45
72
|
return {
|
|
46
73
|
status: 'error',
|
|
47
74
|
authType,
|
|
75
|
+
provider: 'gemini',
|
|
48
76
|
message: check.message ?? this.lastErrorMessage ?? undefined,
|
|
49
77
|
errorCode: this.lastErrorCode,
|
|
50
78
|
};
|
|
@@ -147,13 +175,6 @@ export class LlmAuthManager {
|
|
|
147
175
|
this.effectiveAuthType = undefined;
|
|
148
176
|
this.lastErrorMessage = null;
|
|
149
177
|
this.lastErrorCode = undefined;
|
|
150
|
-
// Try to refresh with undefined auth type, which should fail gracefully
|
|
151
|
-
try {
|
|
152
|
-
await this.config.refreshAuth(undefined);
|
|
153
|
-
}
|
|
154
|
-
catch (err) {
|
|
155
|
-
// Expected to fail when no auth is configured
|
|
156
|
-
}
|
|
157
178
|
return this.getStatus();
|
|
158
179
|
}
|
|
159
180
|
mapOAuthError(error) {
|
|
@@ -205,5 +226,72 @@ export class LlmAuthManager {
|
|
|
205
226
|
code: 'network_error',
|
|
206
227
|
};
|
|
207
228
|
}
|
|
229
|
+
/**
|
|
230
|
+
* T3.2: Apply provider switch from Desktop.
|
|
231
|
+
* Validates enforcedType, applies patches, reconfigures the provider.
|
|
232
|
+
*/
|
|
233
|
+
async applyProviderSwitch(params) {
|
|
234
|
+
const { buildWizardSettingsPatch, LlmProviderId } = await import('@terminai/core');
|
|
235
|
+
const { SettingScope } = await import('../config/settings.js');
|
|
236
|
+
if (!this.getLoadedSettings) {
|
|
237
|
+
return {
|
|
238
|
+
error: 'Provider switching requires a settings loader',
|
|
239
|
+
statusCode: 500,
|
|
240
|
+
};
|
|
241
|
+
}
|
|
242
|
+
const loadedSettings = this.getLoadedSettings();
|
|
243
|
+
// 1. Validate enforcedType
|
|
244
|
+
const enforcedType = loadedSettings.merged.security?.auth?.enforcedType;
|
|
245
|
+
if (enforcedType) {
|
|
246
|
+
return {
|
|
247
|
+
error: `Provider switching is blocked by enforcedType setting (${enforcedType}).`,
|
|
248
|
+
statusCode: 403,
|
|
249
|
+
};
|
|
250
|
+
}
|
|
251
|
+
// 2. Apply patches via buildWizardSettingsPatch
|
|
252
|
+
const patches = buildWizardSettingsPatch({
|
|
253
|
+
provider: params.provider,
|
|
254
|
+
openaiCompatible: params.openaiCompatible,
|
|
255
|
+
});
|
|
256
|
+
for (const patch of patches) {
|
|
257
|
+
loadedSettings.setValue(SettingScope.User, patch.path, patch.value);
|
|
258
|
+
}
|
|
259
|
+
// 3. Auth type consistency rules
|
|
260
|
+
const selectedAuthType = params.provider === 'openai_compatible'
|
|
261
|
+
? AuthType.USE_OPENAI_COMPATIBLE
|
|
262
|
+
: undefined;
|
|
263
|
+
// Switching to Gemini: clear selectedType if it was OpenAI-compatible
|
|
264
|
+
if (params.provider === 'gemini') {
|
|
265
|
+
const currentSelectedType = loadedSettings.merged.security?.auth?.selectedType;
|
|
266
|
+
if (currentSelectedType === AuthType.USE_OPENAI_COMPATIBLE) {
|
|
267
|
+
loadedSettings.setValue(SettingScope.User, 'security.auth.selectedType', undefined);
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
// 4. Compute ProviderConfig
|
|
271
|
+
let providerConfig;
|
|
272
|
+
if (params.provider === 'openai_compatible' && params.openaiCompatible) {
|
|
273
|
+
const envVarName = (params.openaiCompatible.envVarName || 'OPENAI_API_KEY')
|
|
274
|
+
.trim()
|
|
275
|
+
.replace(/\s+/g, '');
|
|
276
|
+
providerConfig = {
|
|
277
|
+
provider: LlmProviderId.OPENAI_COMPATIBLE,
|
|
278
|
+
baseUrl: params.openaiCompatible.baseUrl.trim().replace(/\/+$/, ''),
|
|
279
|
+
model: params.openaiCompatible.model.trim(),
|
|
280
|
+
auth: {
|
|
281
|
+
type: 'bearer',
|
|
282
|
+
envVarName,
|
|
283
|
+
apiKey: process.env[envVarName],
|
|
284
|
+
},
|
|
285
|
+
};
|
|
286
|
+
}
|
|
287
|
+
else {
|
|
288
|
+
providerConfig = { provider: LlmProviderId.GEMINI };
|
|
289
|
+
}
|
|
290
|
+
// 5. Call reconfigureProvider
|
|
291
|
+
await this.config.reconfigureProvider(providerConfig, selectedAuthType);
|
|
292
|
+
this.effectiveAuthType = selectedAuthType;
|
|
293
|
+
// 6. Return updated status
|
|
294
|
+
return this.getStatus();
|
|
295
|
+
}
|
|
208
296
|
}
|
|
209
297
|
//# sourceMappingURL=llmAuthManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llmAuthManager.js","sourceRoot":"","sources":["../../../src/auth/llmAuthManager.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"llmAuthManager.js","sourceRoot":"","sources":["../../../src/auth/llmAuthManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* SPDX-License-Identifier: Apache-2.0
|
|
6
6
|
*/
|
|
7
7
|
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
|
|
8
|
-
import { AuthType } from '@terminai/core';
|
|
8
|
+
import { AuthType, LlmProviderId, } from '@terminai/core';
|
|
9
9
|
import { AuthConflictError, LlmAuthManager } from './llmAuthManager.js';
|
|
10
10
|
const mockCheck = vi.hoisted(() => vi.fn());
|
|
11
11
|
const mockBeginFlow = vi.hoisted(() => vi.fn());
|
|
@@ -17,8 +17,13 @@ vi.mock('@terminai/core', async (importOriginal) => {
|
|
|
17
17
|
checkGeminiAuthStatusNonInteractive: mockCheck,
|
|
18
18
|
beginGeminiOAuthLoopbackFlow: mockBeginFlow,
|
|
19
19
|
saveApiKey: mockSaveApiKey,
|
|
20
|
+
buildWizardSettingsPatch: vi.fn(),
|
|
21
|
+
LlmProviderId: { OPENAI_COMPATIBLE: 'openai_compatible', GEMINI: 'gemini' },
|
|
20
22
|
};
|
|
21
23
|
});
|
|
24
|
+
vi.mock('../config/settings.js', () => ({
|
|
25
|
+
SettingScope: { User: 1 },
|
|
26
|
+
}));
|
|
22
27
|
describe('LlmAuthManager', () => {
|
|
23
28
|
let mockConfig;
|
|
24
29
|
beforeEach(() => {
|
|
@@ -26,6 +31,8 @@ describe('LlmAuthManager', () => {
|
|
|
26
31
|
// Config is heavyweight; we only need refreshAuth for these unit tests.
|
|
27
32
|
refreshAuth: vi.fn().mockResolvedValue(undefined),
|
|
28
33
|
getProxy: vi.fn().mockReturnValue(undefined),
|
|
34
|
+
getProviderConfig: vi.fn().mockReturnValue({ provider: 'gemini' }),
|
|
35
|
+
reconfigureProvider: vi.fn().mockResolvedValue(undefined),
|
|
29
36
|
};
|
|
30
37
|
mockCheck.mockResolvedValue({ status: 'required' });
|
|
31
38
|
mockSaveApiKey.mockResolvedValue(undefined);
|
|
@@ -88,5 +95,90 @@ describe('LlmAuthManager', () => {
|
|
|
88
95
|
expect(status.status).toBe('required');
|
|
89
96
|
expect(status.authType).toBe(AuthType.USE_VERTEX_AI);
|
|
90
97
|
});
|
|
98
|
+
it('getStatus checks env var for OpenAI-compatible provider', async () => {
|
|
99
|
+
vi.mocked(mockConfig.getProviderConfig).mockReturnValue({
|
|
100
|
+
provider: LlmProviderId.OPENAI_COMPATIBLE,
|
|
101
|
+
baseUrl: 'http://localhost:1234',
|
|
102
|
+
model: 'gpt-4o',
|
|
103
|
+
auth: { type: 'api-key', envVarName: 'MY_OPENAI_KEY' },
|
|
104
|
+
});
|
|
105
|
+
const manager = new LlmAuthManager({
|
|
106
|
+
config: mockConfig,
|
|
107
|
+
getSelectedAuthType: () => AuthType.USE_OPENAI_COMPATIBLE,
|
|
108
|
+
});
|
|
109
|
+
// Env var missing
|
|
110
|
+
delete process.env['MY_OPENAI_KEY'];
|
|
111
|
+
let status = await manager.getStatus();
|
|
112
|
+
expect(status.status).toBe('required');
|
|
113
|
+
expect(status.message).toContain('MY_OPENAI_KEY');
|
|
114
|
+
// Env var present
|
|
115
|
+
process.env['MY_OPENAI_KEY'] = 'sk-test';
|
|
116
|
+
status = await manager.getStatus();
|
|
117
|
+
expect(status.status).toBe('ok');
|
|
118
|
+
expect(status.authType).toBe(AuthType.USE_OPENAI_COMPATIBLE);
|
|
119
|
+
// 3.5 Test: Verify provider field is returned
|
|
120
|
+
expect(status.provider).toBe('openai_compatible');
|
|
121
|
+
});
|
|
122
|
+
it('getStatus includes provider field for Gemini (3.5 fix)', async () => {
|
|
123
|
+
mockCheck.mockResolvedValue({ status: 'ok' });
|
|
124
|
+
const manager = new LlmAuthManager({
|
|
125
|
+
config: mockConfig,
|
|
126
|
+
getSelectedAuthType: () => AuthType.USE_GEMINI,
|
|
127
|
+
});
|
|
128
|
+
const status = await manager.getStatus();
|
|
129
|
+
expect(status.status).toBe('ok');
|
|
130
|
+
expect(status.provider).toBe('gemini');
|
|
131
|
+
});
|
|
132
|
+
describe('applyProviderSwitch', () => {
|
|
133
|
+
let mockLoadedSettings;
|
|
134
|
+
beforeEach(() => {
|
|
135
|
+
mockLoadedSettings = {
|
|
136
|
+
merged: { security: { auth: {} } },
|
|
137
|
+
setValue: vi.fn(),
|
|
138
|
+
};
|
|
139
|
+
});
|
|
140
|
+
it('blocks if enforcedType is set', async () => {
|
|
141
|
+
mockLoadedSettings.merged.security.auth['enforcedType'] = 'USE_API_KEY';
|
|
142
|
+
const manager = new LlmAuthManager({
|
|
143
|
+
config: mockConfig,
|
|
144
|
+
getSelectedAuthType: () => undefined,
|
|
145
|
+
getLoadedSettings: () => mockLoadedSettings,
|
|
146
|
+
});
|
|
147
|
+
const result = await manager.applyProviderSwitch({ provider: 'gemini' });
|
|
148
|
+
expect(result).toHaveProperty('statusCode', 403);
|
|
149
|
+
expect(result).toHaveProperty('error', expect.stringContaining('enforcedType'));
|
|
150
|
+
});
|
|
151
|
+
it('applies patches and reconfigures provider', async () => {
|
|
152
|
+
const { buildWizardSettingsPatch } = await import('@terminai/core');
|
|
153
|
+
vi.mocked(buildWizardSettingsPatch).mockReturnValue([
|
|
154
|
+
{ path: 'test.path', value: 'test-value' },
|
|
155
|
+
{
|
|
156
|
+
path: 'security.auth.selectedType',
|
|
157
|
+
value: AuthType.USE_OPENAI_COMPATIBLE,
|
|
158
|
+
},
|
|
159
|
+
]);
|
|
160
|
+
const manager = new LlmAuthManager({
|
|
161
|
+
config: mockConfig,
|
|
162
|
+
getSelectedAuthType: () => undefined,
|
|
163
|
+
getLoadedSettings: () => mockLoadedSettings,
|
|
164
|
+
});
|
|
165
|
+
// Mock getStatus to return OK so we can verify the full flow
|
|
166
|
+
manager.getStatus = vi.fn().mockResolvedValue({ status: 'ok' });
|
|
167
|
+
await manager.applyProviderSwitch({
|
|
168
|
+
provider: 'openai_compatible',
|
|
169
|
+
openaiCompatible: {
|
|
170
|
+
baseUrl: 'http://test',
|
|
171
|
+
model: 'gpt-4',
|
|
172
|
+
envVarName: 'TEST_KEY',
|
|
173
|
+
},
|
|
174
|
+
});
|
|
175
|
+
// Check patches applied
|
|
176
|
+
expect(mockLoadedSettings.setValue).toHaveBeenCalledWith(expect.anything(), 'test.path', 'test-value');
|
|
177
|
+
// Check consistency (selectedType set for OpenAI)
|
|
178
|
+
expect(mockLoadedSettings.setValue).toHaveBeenCalledWith(expect.anything(), 'security.auth.selectedType', AuthType.USE_OPENAI_COMPATIBLE);
|
|
179
|
+
// Check reconfigure called
|
|
180
|
+
expect(mockConfig.reconfigureProvider).toHaveBeenCalledWith(expect.objectContaining({ provider: 'openai_compatible' }), AuthType.USE_OPENAI_COMPATIBLE);
|
|
181
|
+
});
|
|
182
|
+
});
|
|
91
183
|
});
|
|
92
184
|
//# sourceMappingURL=llmAuthManager.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"llmAuthManager.test.js","sourceRoot":"","sources":["../../../src/auth/llmAuthManager.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,
|
|
1
|
+
{"version":3,"file":"llmAuthManager.test.js","sourceRoot":"","sources":["../../../src/auth/llmAuthManager.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,22 +6,66 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import * as path from 'node:path';
|
|
8
8
|
import * as dotenv from 'dotenv';
|
|
9
|
-
import { AuthType, Config, FileDiscoveryService, ApprovalMode, loadServerHierarchicalMemory, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_MODEL, startupProfiler, PREVIEW_GEMINI_MODEL, findEnvFile, } from '@terminai/core';
|
|
9
|
+
import { AuthType, Config, FileDiscoveryService, ApprovalMode, loadServerHierarchicalMemory, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_GEMINI_MODEL, startupProfiler, PREVIEW_GEMINI_MODEL, findEnvFile, LlmProviderId, } from '@terminai/core';
|
|
10
10
|
import { logger } from '../utils/logger.js';
|
|
11
11
|
import { CoderAgentEvent } from '../types.js';
|
|
12
|
+
/**
|
|
13
|
+
* 3.3 Fix: Compute ProviderConfig from settings to persist provider across restarts.
|
|
14
|
+
* Mirrors CLI's settingsToProviderConfig behavior.
|
|
15
|
+
*/
|
|
16
|
+
function settingsToProviderConfig(settings) {
|
|
17
|
+
let providerConfig = { provider: LlmProviderId.GEMINI };
|
|
18
|
+
let resolvedModel;
|
|
19
|
+
if (settings.llm?.provider === 'openai_compatible') {
|
|
20
|
+
const s = settings.llm.openaiCompatible;
|
|
21
|
+
const openaiModel = s?.model;
|
|
22
|
+
if (s?.baseUrl && openaiModel) {
|
|
23
|
+
let authType = 'none';
|
|
24
|
+
const auth = s.auth;
|
|
25
|
+
if (auth?.type === 'api-key')
|
|
26
|
+
authType = 'api-key';
|
|
27
|
+
else if (auth?.type === 'bearer')
|
|
28
|
+
authType = 'bearer';
|
|
29
|
+
providerConfig = {
|
|
30
|
+
provider: LlmProviderId.OPENAI_COMPATIBLE,
|
|
31
|
+
baseUrl: s.baseUrl,
|
|
32
|
+
model: openaiModel,
|
|
33
|
+
auth: {
|
|
34
|
+
type: authType,
|
|
35
|
+
apiKey: auth?.envVarName ? process.env[auth.envVarName] : undefined,
|
|
36
|
+
envVarName: auth?.envVarName,
|
|
37
|
+
},
|
|
38
|
+
};
|
|
39
|
+
resolvedModel = openaiModel;
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
logger.warn('[Config] llm.provider is openai_compatible but baseUrl/model missing, falling back to Gemini');
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
else if (settings.llm?.provider === 'anthropic') {
|
|
46
|
+
providerConfig = { provider: LlmProviderId.ANTHROPIC };
|
|
47
|
+
}
|
|
48
|
+
return { providerConfig, resolvedModel };
|
|
49
|
+
}
|
|
12
50
|
export async function loadConfig(loadedSettings, extensionLoader, taskId, targetDirOverride, options) {
|
|
13
51
|
const settings = loadedSettings.merged;
|
|
14
52
|
const workspaceDir = targetDirOverride || process.cwd();
|
|
15
53
|
const adcFilePath = process.env['GOOGLE_APPLICATION_CREDENTIALS'];
|
|
54
|
+
// 3.3 Fix: Compute providerConfig from persisted settings
|
|
55
|
+
const { providerConfig, resolvedModel } = settingsToProviderConfig(settings);
|
|
16
56
|
const configParams = {
|
|
17
57
|
sessionId: taskId,
|
|
18
|
-
model
|
|
19
|
-
|
|
20
|
-
|
|
58
|
+
// Use OpenAI model if set, otherwise Gemini model
|
|
59
|
+
model: resolvedModel ||
|
|
60
|
+
(settings.general?.previewFeatures
|
|
61
|
+
? PREVIEW_GEMINI_MODEL
|
|
62
|
+
: DEFAULT_GEMINI_MODEL),
|
|
21
63
|
embeddingModel: DEFAULT_GEMINI_EMBEDDING_MODEL,
|
|
22
64
|
sandbox: undefined,
|
|
23
65
|
targetDir: workspaceDir,
|
|
24
66
|
debugMode: process.env['DEBUG'] === 'true' || false,
|
|
67
|
+
// 3.3 Fix: Pass provider config from settings
|
|
68
|
+
providerConfig,
|
|
25
69
|
question: '',
|
|
26
70
|
// CRITICAL FIX: V2 nested paths (not V1 flat paths)
|
|
27
71
|
coreTools: settings.tools?.core || undefined,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,OAAO,EACL,QAAQ,EACR,MAAM,EAEN,oBAAoB,EACpB,YAAY,EACZ,4BAA4B,EAC5B,8BAA8B,EAC9B,oBAAoB,EAEpB,eAAe,EACf,oBAAoB,EACpB,WAAW,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/config/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,9 +4,9 @@
|
|
|
4
4
|
* Portions Copyright 2025 TerminaI Authors
|
|
5
5
|
* SPDX-License-Identifier: Apache-2.0
|
|
6
6
|
*/
|
|
7
|
-
import { type
|
|
8
|
-
export type { Settings, SettingsError,
|
|
9
|
-
export { isLoadableSettingScope };
|
|
7
|
+
import { type LoadedSettings, type Settings, type SettingsError, SettingScope, isLoadableSettingScope } from '@terminai/core';
|
|
8
|
+
export type { Settings, SettingsError, LoadedSettings };
|
|
9
|
+
export { SettingScope, isLoadableSettingScope };
|
|
10
10
|
export declare const USER_SETTINGS_PATH: string;
|
|
11
11
|
/**
|
|
12
12
|
* Loads settings from user and workspace directories using Core's SettingsLoader.
|
|
@@ -4,8 +4,8 @@
|
|
|
4
4
|
* Portions Copyright 2025 TerminaI Authors
|
|
5
5
|
* SPDX-License-Identifier: Apache-2.0
|
|
6
6
|
*/
|
|
7
|
-
import { SettingsLoader, Storage, isLoadableSettingScope, } from '@terminai/core';
|
|
8
|
-
export { isLoadableSettingScope };
|
|
7
|
+
import { SettingsLoader, Storage, SettingScope, isLoadableSettingScope, } from '@terminai/core';
|
|
8
|
+
export { SettingScope, isLoadableSettingScope };
|
|
9
9
|
export const USER_SETTINGS_PATH = Storage.getGlobalSettingsPath();
|
|
10
10
|
/**
|
|
11
11
|
* Loads settings from user and workspace directories using Core's SettingsLoader.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../src/config/settings.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,cAAc,EACd,OAAO,
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../src/config/settings.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,cAAc,EACd,OAAO,EAIP,YAAY,EACZ,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AAGxB,OAAO,EAAE,YAAY,EAAE,sBAAsB,EAAE,CAAC;AAEhD,MAAM,CAAC,MAAM,kBAAkB,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;AAElE;;;GAGG;AACH,MAAM,UAAU,YAAY,CAC1B,eAAuB,OAAO,CAAC,GAAG,EAAE;IAEpC,MAAM,MAAM,GAAG,IAAI,cAAc,CAAC;QAChC,YAAY;KACb,CAAC,CAAC;IACH,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;AACvB,CAAC"}
|
package/dist/src/http/app.js
CHANGED
|
@@ -220,6 +220,8 @@ export async function createApp(options) {
|
|
|
220
220
|
const authManager = new LlmAuthManager({
|
|
221
221
|
config,
|
|
222
222
|
getSelectedAuthType: () => loadedSettings.merged.security?.auth?.selectedType,
|
|
223
|
+
// 3.2 Fix: Pass settings loader so /auth/provider can work
|
|
224
|
+
getLoadedSettings: () => loadedSettings,
|
|
223
225
|
});
|
|
224
226
|
// Task 17: Gate all non-GET requests that may execute LLM work.
|
|
225
227
|
const llmAuthGate = createLlmAuthMiddleware(authManager);
|
package/dist/src/http/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../src/http/app.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../src/http/app.ts"],"names":[],"mappings":"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"}
|