@terminai/cli 0.23.0 → 0.25.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/package.json +4 -4
- package/dist/src/config/auth.js +21 -0
- package/dist/src/config/auth.js.map +1 -1
- package/dist/src/config/effectiveAuthType.d.ts +9 -0
- package/dist/src/config/effectiveAuthType.js +48 -0
- package/dist/src/config/effectiveAuthType.js.map +1 -0
- package/dist/src/config/settingsToProviderConfig.js +28 -0
- package/dist/src/config/settingsToProviderConfig.js.map +1 -1
- package/dist/src/core/initializer.js +4 -2
- package/dist/src/core/initializer.js.map +1 -1
- package/dist/src/core/initializer.test.js +16 -3
- package/dist/src/core/initializer.test.js.map +1 -1
- package/dist/src/gemini.js +6 -5
- package/dist/src/gemini.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/ui/AppContainer.js +21 -6
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/auth/AuthProviderWizardFlow.js +11 -1
- package/dist/src/ui/auth/AuthProviderWizardFlow.js.map +1 -1
- package/dist/src/ui/auth/AuthProviderWizardFlow.test.js +26 -0
- package/dist/src/ui/auth/AuthProviderWizardFlow.test.js.map +1 -1
- package/dist/src/ui/auth/OpenAIChatGptOAuthSetupDialog.d.ts +16 -0
- package/dist/src/ui/auth/OpenAIChatGptOAuthSetupDialog.js +344 -0
- package/dist/src/ui/auth/OpenAIChatGptOAuthSetupDialog.js.map +1 -0
- package/dist/src/ui/auth/OpenAICompatibleSetupDialog.js +3 -1
- package/dist/src/ui/auth/OpenAICompatibleSetupDialog.js.map +1 -1
- package/dist/src/ui/auth/ProviderWizard.d.ts +2 -1
- package/dist/src/ui/auth/ProviderWizard.js +27 -3
- package/dist/src/ui/auth/ProviderWizard.js.map +1 -1
- package/dist/src/ui/auth/ProviderWizard.test.js +39 -3
- package/dist/src/ui/auth/ProviderWizard.test.js.map +1 -1
- package/dist/src/ui/auth/useAuth.js +7 -6
- package/dist/src/ui/auth/useAuth.js.map +1 -1
- package/dist/src/ui/commands/authCommand.js +78 -2
- package/dist/src/ui/commands/authCommand.js.map +1 -1
- package/dist/src/ui/commands/authCommand.test.js +3 -1
- package/dist/src/ui/commands/authCommand.test.js.map +1 -1
- package/dist/src/ui/components/DialogManager.js +22 -0
- package/dist/src/ui/components/DialogManager.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.js +2 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.js.map +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js +1 -1
- package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map +1 -1
- package/dist/src/ui/types.d.ts +2 -1
- package/dist/src/ui/types.js +1 -0
- package/dist/src/ui/types.js.map +1 -1
- package/dist/src/validateNonInterActiveAuth.js +4 -1
- package/dist/src/validateNonInterActiveAuth.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@terminai/cli",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.25.0",
|
|
4
4
|
"description": "TerminaI CLI",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"repository": {
|
|
@@ -27,12 +27,12 @@
|
|
|
27
27
|
"dist"
|
|
28
28
|
],
|
|
29
29
|
"config": {
|
|
30
|
-
"sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.
|
|
30
|
+
"sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.25.0"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@agentclientprotocol/sdk": "^0.11.0",
|
|
34
|
-
"@terminai/a2a-server": "0.
|
|
35
|
-
"@terminai/core": "0.
|
|
34
|
+
"@terminai/a2a-server": "0.25.0",
|
|
35
|
+
"@terminai/core": "0.25.0",
|
|
36
36
|
"@google/genai": "1.30.0",
|
|
37
37
|
"@iarna/toml": "^2.2.5",
|
|
38
38
|
"@modelcontextprotocol/sdk": "^1.23.0",
|
package/dist/src/config/auth.js
CHANGED
|
@@ -52,6 +52,27 @@ export function validateAuthMethod(authMethod) {
|
|
|
52
52
|
}
|
|
53
53
|
return null;
|
|
54
54
|
}
|
|
55
|
+
if (authMethod === AuthType.USE_OPENAI_CHATGPT_OAUTH) {
|
|
56
|
+
if (mergedSettings.llm?.provider !== 'openai_chatgpt_oauth') {
|
|
57
|
+
return ('ChatGPT OAuth auth is selected, but llm.provider is not set to "openai_chatgpt_oauth".\n' +
|
|
58
|
+
'Run /auth wizard to configure your provider and try again.');
|
|
59
|
+
}
|
|
60
|
+
const openai = mergedSettings.llm?.openaiChatgptOauth;
|
|
61
|
+
const baseUrl = openai?.baseUrl?.trim() ?? '';
|
|
62
|
+
const model = openai?.model?.trim() ?? '';
|
|
63
|
+
if (model.length === 0) {
|
|
64
|
+
return ('ChatGPT OAuth provider is selected, but configuration is incomplete.\n' +
|
|
65
|
+
'Required settings:\n' +
|
|
66
|
+
'• llm.openaiChatgptOauth.model\n' +
|
|
67
|
+
'Run /auth wizard to configure these values.');
|
|
68
|
+
}
|
|
69
|
+
if (baseUrl.length > 0 && !/^https?:\/\//i.test(baseUrl)) {
|
|
70
|
+
return ('ChatGPT OAuth base URL must start with http:// or https://.\n' +
|
|
71
|
+
`Current value: "${openai?.baseUrl ?? ''}"\n` +
|
|
72
|
+
'Run /auth wizard to fix it.');
|
|
73
|
+
}
|
|
74
|
+
return null;
|
|
75
|
+
}
|
|
55
76
|
if (authMethod === AuthType.USE_GEMINI) {
|
|
56
77
|
if (!process.env['GEMINI_API_KEY']) {
|
|
57
78
|
return ('When using Gemini API, you must specify the GEMINI_API_KEY environment variable.\n' +
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/config/auth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/config/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* Portions Copyright 2025 TerminaI Authors
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
7
|
+
import { AuthType } from '@terminai/core';
|
|
8
|
+
import type { Settings } from './settings.js';
|
|
9
|
+
export declare function resolveEffectiveAuthType(settings: Settings): AuthType | undefined;
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2025 Google LLC
|
|
4
|
+
* Portions Copyright 2025 TerminaI Authors
|
|
5
|
+
* SPDX-License-Identifier: Apache-2.0
|
|
6
|
+
*/
|
|
7
|
+
import { AuthType } from '@terminai/core';
|
|
8
|
+
const GEMINI_AUTH_TYPES = new Set([
|
|
9
|
+
AuthType.LOGIN_WITH_GOOGLE,
|
|
10
|
+
AuthType.USE_GEMINI,
|
|
11
|
+
AuthType.USE_VERTEX_AI,
|
|
12
|
+
AuthType.COMPUTE_ADC,
|
|
13
|
+
AuthType.LEGACY_CLOUD_SHELL,
|
|
14
|
+
]);
|
|
15
|
+
function normalizeAuthType(value) {
|
|
16
|
+
if (typeof value !== 'string')
|
|
17
|
+
return undefined;
|
|
18
|
+
// Legacy: some older settings stored this as "google"
|
|
19
|
+
if (value === 'google') {
|
|
20
|
+
return AuthType.LOGIN_WITH_GOOGLE;
|
|
21
|
+
}
|
|
22
|
+
switch (value) {
|
|
23
|
+
case AuthType.LOGIN_WITH_GOOGLE:
|
|
24
|
+
case AuthType.USE_GEMINI:
|
|
25
|
+
case AuthType.USE_VERTEX_AI:
|
|
26
|
+
case AuthType.LEGACY_CLOUD_SHELL:
|
|
27
|
+
case AuthType.COMPUTE_ADC:
|
|
28
|
+
case AuthType.USE_OPENAI_COMPATIBLE:
|
|
29
|
+
case AuthType.USE_OPENAI_CHATGPT_OAUTH:
|
|
30
|
+
return value;
|
|
31
|
+
default:
|
|
32
|
+
return undefined;
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
export function resolveEffectiveAuthType(settings) {
|
|
36
|
+
const provider = settings.llm?.provider;
|
|
37
|
+
if (provider === 'openai_compatible') {
|
|
38
|
+
return AuthType.USE_OPENAI_COMPATIBLE;
|
|
39
|
+
}
|
|
40
|
+
if (provider === 'openai_chatgpt_oauth') {
|
|
41
|
+
return AuthType.USE_OPENAI_CHATGPT_OAUTH;
|
|
42
|
+
}
|
|
43
|
+
const selectedType = normalizeAuthType(settings.security?.auth?.selectedType);
|
|
44
|
+
if (!selectedType)
|
|
45
|
+
return undefined;
|
|
46
|
+
return GEMINI_AUTH_TYPES.has(selectedType) ? selectedType : undefined;
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=effectiveAuthType.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"effectiveAuthType.js","sourceRoot":"","sources":["../../../src/config/effectiveAuthType.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAW;IAC1C,QAAQ,CAAC,iBAAiB;IAC1B,QAAQ,CAAC,UAAU;IACnB,QAAQ,CAAC,aAAa;IACtB,QAAQ,CAAC,WAAW;IACpB,QAAQ,CAAC,kBAAkB;CAC5B,CAAC,CAAC;AAEH,SAAS,iBAAiB,CAAC,KAAc;IACvC,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IAEhD,sDAAsD;IACtD,IAAI,KAAK,KAAK,QAAQ,EAAE,CAAC;QACvB,OAAO,QAAQ,CAAC,iBAAiB,CAAC;IACpC,CAAC;IAED,QAAQ,KAAK,EAAE,CAAC;QACd,KAAK,QAAQ,CAAC,iBAAiB,CAAC;QAChC,KAAK,QAAQ,CAAC,UAAU,CAAC;QACzB,KAAK,QAAQ,CAAC,aAAa,CAAC;QAC5B,KAAK,QAAQ,CAAC,kBAAkB,CAAC;QACjC,KAAK,QAAQ,CAAC,WAAW,CAAC;QAC1B,KAAK,QAAQ,CAAC,qBAAqB,CAAC;QACpC,KAAK,QAAQ,CAAC,wBAAwB;YACpC,OAAO,KAAK,CAAC;QACf;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,wBAAwB,CACtC,QAAkB;IAElB,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC;IACxC,IAAI,QAAQ,KAAK,mBAAmB,EAAE,CAAC;QACrC,OAAO,QAAQ,CAAC,qBAAqB,CAAC;IACxC,CAAC;IACD,IAAI,QAAQ,KAAK,sBAAsB,EAAE,CAAC;QACxC,OAAO,QAAQ,CAAC,wBAAwB,CAAC;IAC3C,CAAC;IAED,MAAM,YAAY,GAAG,iBAAiB,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;IAC9E,IAAI,CAAC,YAAY;QAAE,OAAO,SAAS,CAAC;IACpC,OAAO,iBAAiB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;AACxE,CAAC"}
|
|
@@ -65,6 +65,34 @@ export function settingsToProviderConfig(settings, options = {}) {
|
|
|
65
65
|
throw new FatalConfigError('llm.provider is set to openai_compatible, but llm.openaiCompatible.baseUrl and a model (llm.openaiCompatible.model or --model) are required.');
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
|
+
else if (settings.llm?.provider === 'openai_chatgpt_oauth') {
|
|
69
|
+
const s = settings.llm.openaiChatgptOauth;
|
|
70
|
+
if (!s) {
|
|
71
|
+
throw new FatalConfigError('llm.provider is set to openai_chatgpt_oauth, but llm.openaiChatgptOauth is missing.');
|
|
72
|
+
}
|
|
73
|
+
const baseUrl = normalizeOpenAIBaseUrl(s?.baseUrl) ??
|
|
74
|
+
'https://chatgpt.com/backend-api/codex';
|
|
75
|
+
const model = (options.modelOverride ?? s?.model ?? '').trim();
|
|
76
|
+
if (model.length === 0) {
|
|
77
|
+
throw new FatalConfigError('llm.provider is set to openai_chatgpt_oauth, but llm.openaiChatgptOauth.model (or --model) is required.');
|
|
78
|
+
}
|
|
79
|
+
const headers = {};
|
|
80
|
+
if (settings.llm.headers) {
|
|
81
|
+
for (const [k, v] of Object.entries(settings.llm.headers)) {
|
|
82
|
+
if (typeof v === 'string')
|
|
83
|
+
headers[k] = v;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
const internalModel = (s?.internalModel ?? '').trim();
|
|
87
|
+
providerConfig = {
|
|
88
|
+
provider: LlmProviderId.OPENAI_CHATGPT_OAUTH,
|
|
89
|
+
baseUrl,
|
|
90
|
+
model,
|
|
91
|
+
internalModel: internalModel.length > 0 ? internalModel : undefined,
|
|
92
|
+
headers,
|
|
93
|
+
};
|
|
94
|
+
resolvedModel = model;
|
|
95
|
+
}
|
|
68
96
|
else if (settings.llm?.provider === 'anthropic') {
|
|
69
97
|
providerConfig = { provider: LlmProviderId.ANTHROPIC };
|
|
70
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settingsToProviderConfig.js","sourceRoot":"","sources":["../../../src/config/settingsToProviderConfig.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"settingsToProviderConfig.js","sourceRoot":"","sources":["../../../src/config/settingsToProviderConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import { IdeClient, IdeConnectionEvent, IdeConnectionType, logIdeConnection, Sta
|
|
|
8
8
|
import {} from '../config/settings.js';
|
|
9
9
|
import { performInitialAuth } from './auth.js';
|
|
10
10
|
import { validateTheme } from './theme.js';
|
|
11
|
+
import { resolveEffectiveAuthType } from '../config/effectiveAuthType.js';
|
|
11
12
|
/**
|
|
12
13
|
* Orchestrates the application's startup initialization.
|
|
13
14
|
* This runs BEFORE the React UI is rendered.
|
|
@@ -16,11 +17,12 @@ import { validateTheme } from './theme.js';
|
|
|
16
17
|
* @returns The results of the initialization.
|
|
17
18
|
*/
|
|
18
19
|
export async function initializeApp(config, settings) {
|
|
20
|
+
const effectiveAuthType = resolveEffectiveAuthType(settings.merged);
|
|
19
21
|
const authHandle = startupProfiler.start('authenticate');
|
|
20
|
-
const authError = await performInitialAuth(config,
|
|
22
|
+
const authError = await performInitialAuth(config, effectiveAuthType);
|
|
21
23
|
authHandle?.end();
|
|
22
24
|
const themeError = validateTheme(settings);
|
|
23
|
-
const shouldOpenAuthDialog =
|
|
25
|
+
const shouldOpenAuthDialog = effectiveAuthType === undefined || !!authError;
|
|
24
26
|
logCliConfiguration(config, new StartSessionEvent(config, config.getToolRegistry()));
|
|
25
27
|
if (config.getIdeMode()) {
|
|
26
28
|
const ideClient = await IdeClient.getInstance();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initializer.js","sourceRoot":"","sources":["../../../src/core/initializer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACd,cAAc,EACd,WAAW,GACZ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAuB,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"initializer.js","sourceRoot":"","sources":["../../../src/core/initializer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,SAAS,EACT,kBAAkB,EAClB,iBAAiB,EACjB,gBAAgB,EAEhB,iBAAiB,EACjB,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACd,cAAc,EACd,WAAW,GACZ,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAuB,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAS1E;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,QAAwB;IAExB,MAAM,iBAAiB,GAAG,wBAAwB,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACpE,MAAM,UAAU,GAAG,eAAe,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IACzD,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACtE,UAAU,EAAE,GAAG,EAAE,CAAC;IAClB,MAAM,UAAU,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IAE3C,MAAM,oBAAoB,GAAG,iBAAiB,KAAK,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC;IAE5E,mBAAmB,CACjB,MAAM,EACN,IAAI,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,eAAe,EAAE,CAAC,CACxD,CAAC;IAEF,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;QACxB,MAAM,SAAS,GAAG,MAAM,SAAS,CAAC,WAAW,EAAE,CAAC;QAChD,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;QAC1B,gBAAgB,CAAC,MAAM,EAAE,IAAI,kBAAkB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5E,CAAC;IAED,+CAA+C;IAC/C,MAAM,UAAU,GAAG,eAAe,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACxD,IAAI,IAAI,GAAG,cAAc,EAAE,CAAC;IAC5B,IAAI,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,IAAI,GAAG,cAAc,EAAE,CAAC;QACxB,cAAc,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IACD,UAAU,EAAE,GAAG,EAAE,CAAC;IAElB,OAAO;QACL,SAAS;QACT,UAAU;QACV,oBAAoB;QACpB,iBAAiB,EAAE,MAAM,CAAC,oBAAoB,EAAE;KACjD,CAAC;AACJ,CAAC"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
8
8
|
import { initializeApp } from './initializer.js';
|
|
9
|
-
import { IdeClient, logIdeConnection, logCliConfiguration, } from '@terminai/core';
|
|
9
|
+
import { AuthType, IdeClient, logIdeConnection, logCliConfiguration, } from '@terminai/core';
|
|
10
10
|
import { performInitialAuth } from './auth.js';
|
|
11
11
|
import { validateTheme } from './theme.js';
|
|
12
12
|
import {} from '../config/settings.js';
|
|
@@ -42,9 +42,12 @@ describe('initializer', () => {
|
|
|
42
42
|
};
|
|
43
43
|
mockSettings = {
|
|
44
44
|
merged: {
|
|
45
|
+
llm: {
|
|
46
|
+
provider: 'gemini',
|
|
47
|
+
},
|
|
45
48
|
security: {
|
|
46
49
|
auth: {
|
|
47
|
-
selectedType:
|
|
50
|
+
selectedType: AuthType.LOGIN_WITH_GOOGLE,
|
|
48
51
|
},
|
|
49
52
|
},
|
|
50
53
|
},
|
|
@@ -64,7 +67,7 @@ describe('initializer', () => {
|
|
|
64
67
|
shouldOpenAuthDialog: false,
|
|
65
68
|
geminiMdFileCount: 5,
|
|
66
69
|
});
|
|
67
|
-
expect(performInitialAuth).toHaveBeenCalledWith(mockConfig,
|
|
70
|
+
expect(performInitialAuth).toHaveBeenCalledWith(mockConfig, AuthType.LOGIN_WITH_GOOGLE);
|
|
68
71
|
expect(validateTheme).toHaveBeenCalledWith(mockSettings);
|
|
69
72
|
expect(logCliConfiguration).toHaveBeenCalled();
|
|
70
73
|
expect(IdeClient.getInstance).not.toHaveBeenCalled();
|
|
@@ -98,5 +101,15 @@ describe('initializer', () => {
|
|
|
98
101
|
const result = await initializeApp(mockConfig, mockSettings);
|
|
99
102
|
expect(result.themeError).toBe('Theme not found');
|
|
100
103
|
});
|
|
104
|
+
it('uses OpenAI ChatGPT OAuth auth type when provider is openai_chatgpt_oauth', async () => {
|
|
105
|
+
mockSettings.merged.llm = {
|
|
106
|
+
provider: 'openai_chatgpt_oauth',
|
|
107
|
+
openaiChatgptOauth: { model: 'gpt-5.2-codex' },
|
|
108
|
+
};
|
|
109
|
+
mockSettings.merged.security.auth.selectedType =
|
|
110
|
+
AuthType.LOGIN_WITH_GOOGLE;
|
|
111
|
+
await initializeApp(mockConfig, mockSettings);
|
|
112
|
+
expect(performInitialAuth).toHaveBeenCalledWith(mockConfig, AuthType.USE_OPENAI_CHATGPT_OAUTH);
|
|
113
|
+
});
|
|
101
114
|
});
|
|
102
115
|
//# sourceMappingURL=initializer.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initializer.test.js","sourceRoot":"","sources":["../../../src/core/initializer.test.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EACL,SAAS,EACT,gBAAgB,EAChB,mBAAmB,GAEpB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAuB,MAAM,uBAAuB,CAAC;AAE5D,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IACjD,MAAM,MAAM,GAAG,MAAM,cAAc,EAAmC,CAAC;IACvE,OAAO;QACL,GAAG,MAAM;QACT,SAAS,EAAE;YACT,WAAW,EAAE,EAAE,CAAC,EAAE,EAAE;SACrB;QACD,gBAAgB,EAAE,EAAE,CAAC,EAAE,EAAE;QACzB,mBAAmB,EAAE,EAAE,CAAC,EAAE,EAAE;QAC5B,iBAAiB,EAAE,EAAE,CAAC,EAAE,EAAE;QAC1B,kBAAkB,EAAE,EAAE,CAAC,EAAE,EAAE;KAC5B,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC;IAC1B,kBAAkB,EAAE,EAAE,CAAC,EAAE,EAAE;CAC5B,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC;IAC3B,aAAa,EAAE,EAAE,CAAC,EAAE,EAAE;CACvB,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;IAC3B,IAAI,UAIH,CAAC;IACF,IAAI,YAA4B,CAAC;IACjC,IAAI,aAEH,CAAC;IAEF,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,UAAU,GAAG;YACX,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;YACxB,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;YAC1C,oBAAoB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;SACjD,CAAC;QACF,YAAY,GAAG;YACb,MAAM,EAAE;gBACN,QAAQ,EAAE;oBACR,IAAI,EAAE;wBACJ,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"initializer.test.js","sourceRoot":"","sources":["../../../src/core/initializer.test.ts"],"names":[],"mappings":"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"}
|
package/dist/src/gemini.js
CHANGED
|
@@ -30,6 +30,7 @@ import { sessionId, logUserPrompt, AuthType, getOauthClient, UserPromptEvent, de
|
|
|
30
30
|
writeToStdout, writeToStderr, disableMouseEvents, enableMouseEvents, enterAlternateScreen, disableLineWrapping, shouldEnterAlternateScreen, startupProfiler, ExitCodes, SessionStartSource, SessionEndReason, fireSessionStartHook, fireSessionEndHook, getVersion, ApprovalMode, DesktopAutomationService, } from '@terminai/core';
|
|
31
31
|
import { initializeApp, } from './core/initializer.js';
|
|
32
32
|
import { validateAuthMethod } from './config/auth.js';
|
|
33
|
+
import { resolveEffectiveAuthType } from './config/effectiveAuthType.js';
|
|
33
34
|
import { setMaxSizedBoxDebugging } from './ui/components/shared/MaxSizedBox.js';
|
|
34
35
|
import { runZedIntegration } from './zed-integration/zedIntegration.js';
|
|
35
36
|
import { cleanupExpiredSessions } from './utils/sessionCleanup.js';
|
|
@@ -239,15 +240,15 @@ export async function main() {
|
|
|
239
240
|
// another way to decouple refreshAuth from requiring a config.
|
|
240
241
|
if (sandboxConfig) {
|
|
241
242
|
const partialConfig = await loadCliConfig(settings.merged, sessionId, argv);
|
|
242
|
-
|
|
243
|
-
|
|
243
|
+
const effectiveAuthType = resolveEffectiveAuthType(settings.merged);
|
|
244
|
+
if (effectiveAuthType && !settings.merged.security?.auth?.useExternal) {
|
|
244
245
|
// Validate authentication here because the sandbox will interfere with the Oauth2 web redirect.
|
|
245
246
|
try {
|
|
246
|
-
const err = validateAuthMethod(
|
|
247
|
+
const err = validateAuthMethod(effectiveAuthType);
|
|
247
248
|
if (err) {
|
|
248
249
|
throw new Error(err);
|
|
249
250
|
}
|
|
250
|
-
await partialConfig.refreshAuth(
|
|
251
|
+
await partialConfig.refreshAuth(effectiveAuthType);
|
|
251
252
|
}
|
|
252
253
|
catch (err) {
|
|
253
254
|
debugLogger.error('Error authenticating:', err);
|
|
@@ -484,7 +485,7 @@ export async function main() {
|
|
|
484
485
|
// Handle --list-sessions flag
|
|
485
486
|
if (config.getListSessions()) {
|
|
486
487
|
// Attempt auth for summary generation (gracefully skips if not configured)
|
|
487
|
-
const authType = settings.merged
|
|
488
|
+
const authType = resolveEffectiveAuthType(settings.merged);
|
|
488
489
|
if (authType) {
|
|
489
490
|
try {
|
|
490
491
|
await config.refreshAuth(authType);
|
package/dist/src/gemini.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../src/gemini.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"gemini.js","sourceRoot":"","sources":["../../src/gemini.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,5 +4,5 @@
|
|
|
4
4
|
* Portions Copyright 2025 TerminaI Authors
|
|
5
5
|
* SPDX-License-Identifier: Apache-2.0
|
|
6
6
|
*/
|
|
7
|
-
export declare const GIT_COMMIT_INFO = "
|
|
8
|
-
export declare const CLI_VERSION = "0.
|
|
7
|
+
export declare const GIT_COMMIT_INFO = "68eeb09";
|
|
8
|
+
export declare const CLI_VERSION = "0.25.0";
|
|
@@ -6,6 +6,6 @@
|
|
|
6
6
|
*/
|
|
7
7
|
// This file is auto-generated by the build script (scripts/generate-git-commit-info.js)
|
|
8
8
|
// Do not edit this file manually.
|
|
9
|
-
export const GIT_COMMIT_INFO = '
|
|
10
|
-
export const CLI_VERSION = '0.
|
|
9
|
+
export const GIT_COMMIT_INFO = '68eeb09';
|
|
10
|
+
export const CLI_VERSION = '0.25.0';
|
|
11
11
|
//# sourceMappingURL=git-commit.js.map
|
|
@@ -15,6 +15,7 @@ import { ConfigContext } from './contexts/ConfigContext.js';
|
|
|
15
15
|
import { ToolCallStatus, AuthState, AuthWizardDialogState, MessageType, StreamingState, } from './types.js';
|
|
16
16
|
import { IdeClient, ideContextStore, getErrorMessage, getAllGeminiMdFilenames, AuthType, clearCachedCredentialFile, recordExitFail, ShellExecutionService, saveApiKey, debugLogger, coreEvents, CoreEvent, refreshServerHierarchicalMemory, writeToStdout, disableMouseEvents, enterAlternateScreen, enableMouseEvents, disableLineWrapping, shouldEnterAlternateScreen, startupProfiler, SessionStartSource, SessionEndReason, fireSessionStartHook, fireSessionEndHook, generateSummary, sessionNotifier, } from '@terminai/core';
|
|
17
17
|
import { validateAuthMethod } from '../config/auth.js';
|
|
18
|
+
import { resolveEffectiveAuthType } from '../config/effectiveAuthType.js';
|
|
18
19
|
import process from 'node:process';
|
|
19
20
|
import { useHistory } from './hooks/useHistoryManager.js';
|
|
20
21
|
import { useMemoryMonitor } from './hooks/useMemoryMonitor.js';
|
|
@@ -585,27 +586,32 @@ Logging in with Google... Restarting terminaI to continue.
|
|
|
585
586
|
}, [config, authState]);
|
|
586
587
|
// Check for enforced auth type mismatch
|
|
587
588
|
useEffect(() => {
|
|
589
|
+
const effectiveAuthType = resolveEffectiveAuthType(settings.merged);
|
|
588
590
|
if (settings.merged.security?.auth?.enforcedType &&
|
|
589
591
|
settings.merged.security?.auth.selectedType &&
|
|
590
592
|
settings.merged.security?.auth.enforcedType !==
|
|
591
593
|
settings.merged.security?.auth.selectedType) {
|
|
592
594
|
onAuthError(`Authentication is enforced to be ${settings.merged.security?.auth.enforcedType}, but you are currently using ${settings.merged.security?.auth.selectedType}.`);
|
|
593
595
|
}
|
|
594
|
-
else if (
|
|
596
|
+
else if (effectiveAuthType &&
|
|
595
597
|
!settings.merged.security?.auth?.useExternal) {
|
|
596
598
|
// We skip validation for Gemini API key here because it might be stored
|
|
597
599
|
// in the keychain, which we can't check synchronously.
|
|
598
600
|
// The useAuth hook handles validation for this case.
|
|
599
|
-
if (
|
|
601
|
+
if (effectiveAuthType === AuthType.USE_GEMINI) {
|
|
600
602
|
return;
|
|
601
603
|
}
|
|
602
|
-
const error = validateAuthMethod(
|
|
604
|
+
const error = validateAuthMethod(effectiveAuthType);
|
|
603
605
|
if (error) {
|
|
604
606
|
onAuthError(error);
|
|
605
607
|
}
|
|
606
608
|
}
|
|
607
609
|
}, [
|
|
610
|
+
settings.merged,
|
|
608
611
|
settings.merged.security?.auth?.selectedType,
|
|
612
|
+
settings.merged.llm?.provider,
|
|
613
|
+
settings.merged.llm?.openaiCompatible,
|
|
614
|
+
settings.merged.llm?.openaiChatgptOauth,
|
|
609
615
|
settings.merged.security?.auth?.enforcedType,
|
|
610
616
|
settings.merged.security?.auth?.useExternal,
|
|
611
617
|
onAuthError,
|
|
@@ -616,8 +622,16 @@ Logging in with Google... Restarting terminaI to continue.
|
|
|
616
622
|
const { isModelDialogOpen, openModelDialog, closeModelDialog } = useModelCommand();
|
|
617
623
|
const { toggleVimEnabled } = useVimMode();
|
|
618
624
|
const slashCommandActions = useMemo(() => ({
|
|
619
|
-
openAuthDialog: () =>
|
|
620
|
-
|
|
625
|
+
openAuthDialog: () => {
|
|
626
|
+
setCustomDialog(null);
|
|
627
|
+
setAuthState(AuthState.Updating);
|
|
628
|
+
},
|
|
629
|
+
openAuthWizardDialog: () => {
|
|
630
|
+
// Clear any blocking custom dialog (e.g., LogoutConfirmationDialog)
|
|
631
|
+
// before opening the wizard to ensure it renders
|
|
632
|
+
setCustomDialog(null);
|
|
633
|
+
setAuthWizardDialog(AuthWizardDialogState.Provider);
|
|
634
|
+
},
|
|
621
635
|
openThemeDialog,
|
|
622
636
|
openEditorDialog,
|
|
623
637
|
openPrivacyNotice: () => setShowPrivacyNotice(true),
|
|
@@ -1415,7 +1429,8 @@ Logging in with Google... Restarting terminaI to continue.
|
|
|
1415
1429
|
!!proQuotaRequest ||
|
|
1416
1430
|
isSessionBrowserOpen ||
|
|
1417
1431
|
isAuthDialogOpen ||
|
|
1418
|
-
authState === AuthState.AwaitingApiKeyInput
|
|
1432
|
+
authState === AuthState.AwaitingApiKeyInput ||
|
|
1433
|
+
authWizardDialog !== null; // Auth wizard dialog should show DialogManager
|
|
1419
1434
|
const pendingHistoryItems = useMemo(() => [...pendingSlashCommandHistoryItems, ...pendingGeminiHistoryItems], [pendingSlashCommandHistoryItems, pendingGeminiHistoryItems]);
|
|
1420
1435
|
const [isSpotlightOpen, setSpotlightOpen] = useState(false);
|
|
1421
1436
|
useInput((input, key) => {
|