summaryrefslogtreecommitdiff
path: root/packages/cli/src/config
diff options
context:
space:
mode:
Diffstat (limited to 'packages/cli/src/config')
-rw-r--r--packages/cli/src/config/auth.ts44
-rw-r--r--packages/cli/src/config/config.test.ts42
-rw-r--r--packages/cli/src/config/config.ts60
-rw-r--r--packages/cli/src/config/settings.ts2
4 files changed, 48 insertions, 100 deletions
diff --git a/packages/cli/src/config/auth.ts b/packages/cli/src/config/auth.ts
new file mode 100644
index 00000000..6153044e
--- /dev/null
+++ b/packages/cli/src/config/auth.ts
@@ -0,0 +1,44 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { AuthType } from '@gemini-cli/core';
+import { loadEnvironment } from './config.js';
+
+export const validateAuthMethod = (authMethod: string): string | null => {
+ loadEnvironment();
+ if (authMethod === AuthType.LOGIN_WITH_GOOGLE_PERSONAL) {
+ return null;
+ }
+
+ if (authMethod === AuthType.LOGIN_WITH_GOOGLE_ENTERPRISE) {
+ if (!process.env.GOOGLE_CLOUD_PROJECT) {
+ return 'GOOGLE_CLOUD_PROJECT environment variable not found. Add that to your .env and try again, no reload needed!';
+ }
+ return null;
+ }
+
+ if (authMethod === AuthType.USE_GEMINI) {
+ if (!process.env.GEMINI_API_KEY) {
+ return 'GEMINI_API_KEY environment variable not found. Add that to your .env and try again, no reload needed!';
+ }
+ return null;
+ }
+
+ if (authMethod === AuthType.USE_VERTEX_AI) {
+ if (!process.env.GOOGLE_API_KEY) {
+ return 'GOOGLE_API_KEY environment variable not found. Add that to your .env and try again, no reload needed!';
+ }
+ if (!process.env.GOOGLE_CLOUD_PROJECT) {
+ return 'GOOGLE_CLOUD_PROJECT environment variable not found. Add that to your .env and try again, no reload needed!';
+ }
+ if (!process.env.GOOGLE_CLOUD_LOCATION) {
+ return 'GOOGLE_CLOUD_LOCATION environment variable not found. Add that to your .env and try again, no reload needed!';
+ }
+ return null;
+ }
+
+ return 'Invalid auth method selected.';
+};
diff --git a/packages/cli/src/config/config.test.ts b/packages/cli/src/config/config.test.ts
index 9ff75b15..5b24f434 100644
--- a/packages/cli/src/config/config.test.ts
+++ b/packages/cli/src/config/config.test.ts
@@ -247,48 +247,6 @@ describe('loadCliConfig telemetry', () => {
});
});
-describe('API Key Handling', () => {
- const originalEnv = { ...process.env };
- const originalArgv = process.argv;
-
- beforeEach(() => {
- vi.resetAllMocks();
- process.argv = ['node', 'script.js'];
- });
-
- afterEach(() => {
- process.env = originalEnv;
- process.argv = originalArgv;
- });
-
- it('should use GEMINI_API_KEY from env', async () => {
- process.env.GEMINI_API_KEY = 'gemini-key';
- delete process.env.GOOGLE_API_KEY;
-
- const settings: Settings = {};
- const result = await loadCliConfig(settings, [], 'test-session');
- expect(result.getContentGeneratorConfig().apiKey).toBe('gemini-key');
- });
-
- it('should use GOOGLE_API_KEY and warn when both GOOGLE_API_KEY and GEMINI_API_KEY are set', async () => {
- const consoleWarnSpy = vi
- .spyOn(console, 'warn')
- .mockImplementation(() => {});
-
- process.env.GEMINI_API_KEY = 'gemini-key';
- process.env.GOOGLE_API_KEY = 'google-key';
-
- const settings: Settings = {};
- const result = await loadCliConfig(settings, [], 'test-session');
-
- expect(consoleWarnSpy).toHaveBeenCalledWith(
- '[WARN]',
- 'Both GEMINI_API_KEY and GOOGLE_API_KEY are set. Using GOOGLE_API_KEY.',
- );
- expect(result.getContentGeneratorConfig().apiKey).toBe('google-key');
- });
-});
-
describe('Hierarchical Memory Loading (config.ts) - Placeholder Suite', () => {
beforeEach(() => {
vi.resetAllMocks();
diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts
index 26878646..6e52c6e2 100644
--- a/packages/cli/src/config/config.ts
+++ b/packages/cli/src/config/config.ts
@@ -13,7 +13,6 @@ import {
setGeminiMdFilename as setServerGeminiMdFilename,
getCurrentGeminiMdFilename,
ApprovalMode,
- ContentGeneratorConfig,
GEMINI_CONFIG_DIR as GEMINI_DIR,
DEFAULT_GEMINI_MODEL,
DEFAULT_GEMINI_EMBEDDING_MODEL,
@@ -21,7 +20,7 @@ import {
TelemetryTarget,
} from '@gemini-cli/core';
import { Settings } from './settings.js';
-import { getEffectiveModel } from '../utils/modelCheck.js';
+
import { Extension } from './extension.js';
import { getCliVersion } from '../utils/version.js';
import * as dotenv from 'dotenv';
@@ -194,15 +193,12 @@ export async function loadCliConfig(
extensionContextFilePaths,
);
- const contentGeneratorConfig = await createContentGeneratorConfig(argv);
-
const mcpServers = mergeMcpServers(settings, extensions);
const sandboxConfig = await loadSandboxConfig(settings, argv);
return new Config({
sessionId,
- contentGeneratorConfig,
embeddingModel: DEFAULT_GEMINI_EMBEDDING_MODEL,
sandbox: sandboxConfig,
targetDir: process.cwd(),
@@ -242,6 +238,7 @@ export async function loadCliConfig(
cwd: process.cwd(),
fileDiscoveryService: fileService,
bugCommand: settings.bugCommand,
+ model: argv.model!,
});
}
@@ -262,59 +259,6 @@ function mergeMcpServers(settings: Settings, extensions: Extension[]) {
}
return mcpServers;
}
-
-async function createContentGeneratorConfig(
- argv: CliArgs,
-): Promise<ContentGeneratorConfig> {
- const geminiApiKey = process.env.GEMINI_API_KEY;
- const googleApiKey = process.env.GOOGLE_API_KEY;
- const googleCloudProject = process.env.GOOGLE_CLOUD_PROJECT;
- const googleCloudLocation = process.env.GOOGLE_CLOUD_LOCATION;
-
- const hasCodeAssist = process.env.GEMINI_CODE_ASSIST === 'true';
- const hasGeminiApiKey = !!geminiApiKey;
- const hasGoogleApiKey = !!googleApiKey;
- const hasVertexProjectLocationConfig =
- !!googleCloudProject && !!googleCloudLocation;
-
- if (hasGeminiApiKey && hasGoogleApiKey) {
- logger.warn(
- 'Both GEMINI_API_KEY and GOOGLE_API_KEY are set. Using GOOGLE_API_KEY.',
- );
- }
- if (
- !hasCodeAssist &&
- !hasGeminiApiKey &&
- !hasGoogleApiKey &&
- !hasVertexProjectLocationConfig
- ) {
- logger.error(
- 'No valid API authentication configuration found. Please set ONE of the following combinations in your environment variables or .env file:\n' +
- '1. GEMINI_CODE_ASSIST=true (for Code Assist access).\n' +
- '2. GEMINI_API_KEY (for Gemini API access).\n' +
- '3. GOOGLE_API_KEY (for Gemini API or Vertex AI Express Mode access).\n' +
- '4. GOOGLE_CLOUD_PROJECT and GOOGLE_CLOUD_LOCATION (for Vertex AI access).\n\n' +
- 'For Gemini API keys, visit: https://ai.google.dev/gemini-api/docs/api-key\n' +
- 'For Vertex AI authentication, visit: https://cloud.google.com/vertex-ai/docs/authentication\n' +
- 'The GOOGLE_GENAI_USE_VERTEXAI environment variable can also be set to true/false to influence service selection when ambiguity exists.',
- );
- process.exit(1);
- }
-
- const config: ContentGeneratorConfig = {
- model: argv.model || DEFAULT_GEMINI_MODEL,
- apiKey: googleApiKey || geminiApiKey || '',
- vertexai: hasGeminiApiKey ? false : undefined,
- codeAssist: hasCodeAssist,
- };
-
- if (config.apiKey) {
- config.model = await getEffectiveModel(config.apiKey, config.model);
- }
-
- return config;
-}
-
function findEnvFile(startDir: string): string | null {
let currentDir = path.resolve(startDir);
while (true) {
diff --git a/packages/cli/src/config/settings.ts b/packages/cli/src/config/settings.ts
index b17b4c9d..a90ed2d8 100644
--- a/packages/cli/src/config/settings.ts
+++ b/packages/cli/src/config/settings.ts
@@ -12,6 +12,7 @@ import {
getErrorMessage,
BugCommandSettings,
TelemetrySettings,
+ AuthType,
} from '@gemini-cli/core';
import stripJsonComments from 'strip-json-comments';
import { DefaultLight } from '../ui/themes/default-light.js';
@@ -32,6 +33,7 @@ export interface AccessibilitySettings {
export interface Settings {
theme?: string;
+ selectedAuthType?: AuthType;
sandbox?: boolean | string;
coreTools?: string[];
excludeTools?: string[];
generated by cgit v1.2.3 (git 2.51.0) at 2025-11-28 04:04:23 +0000