From 0613062fc83c593813e8a4391257364d5202bfdd Mon Sep 17 00:00:00 2001
From: Tommaso Sciortino <sciortino@gmail.com>
Date: Mon, 9 Jun 2025 09:31:27 -0700
Subject: [PATCH] Simplify user agent handling. (#828)

---
 packages/cli/src/config/config.ts             | 2 --
 packages/cli/src/ui/App.test.tsx              | 1 -
 packages/core/src/config/config.test.ts       | 2 --
 packages/core/src/core/contentGenerator.ts    | 4 ++--
 packages/core/src/telemetry/sdk.ts            | 3 +--
 packages/core/src/tools/tool-registry.test.ts | 1 -
 6 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts
index 009da59f..1cff28f8 100644
--- a/packages/cli/src/config/config.ts
+++ b/packages/cli/src/config/config.ts
@@ -18,7 +18,6 @@ import {
 } from '@gemini-cli/core';
 import { Settings } from './settings.js';
 import { getEffectiveModel } from '../utils/modelCheck.js';
-import { getCliVersion } from '../utils/version.js';
 
 // Simple console logger for now - replace with actual logger if available
 const logger = {
@@ -206,7 +205,6 @@ async function createContentGeneratorConfig(
     model: argv.model || DEFAULT_GEMINI_MODEL,
     apiKey: geminiApiKey || googleApiKey || '',
     vertexai: hasGeminiApiKey ? false : undefined,
-    userAgent: `GeminiCLI/${getCliVersion()}/(${process.platform}; ${process.arch})`,
   };
 
   if (config.apiKey) {
diff --git a/packages/cli/src/ui/App.test.tsx b/packages/cli/src/ui/App.test.tsx
index e3cff7a4..0fcb0e61 100644
--- a/packages/cli/src/ui/App.test.tsx
+++ b/packages/cli/src/ui/App.test.tsx
@@ -182,7 +182,6 @@ describe('App UI', () => {
       contentGeneratorConfig: {
         apiKey: 'test-key',
         model: 'test-model',
-        userAgent: 'test-agent',
       },
       embeddingModel: 'test-embedding-model',
       sandbox: false,
diff --git a/packages/core/src/config/config.test.ts b/packages/core/src/config/config.test.ts
index 52b86da8..df3b3de3 100644
--- a/packages/core/src/config/config.test.ts
+++ b/packages/core/src/config/config.test.ts
@@ -46,7 +46,6 @@ describe('Server Config (config.ts)', () => {
   const DEBUG_MODE = false;
   const QUESTION = 'test question';
   const FULL_CONTEXT = false;
-  const USER_AGENT = 'ServerTestAgent/1.0';
   const USER_MEMORY = 'Test User Memory';
   const TELEMETRY = false;
   const EMBEDDING_MODEL = 'gemini-embedding';
@@ -54,7 +53,6 @@ describe('Server Config (config.ts)', () => {
     contentGeneratorConfig: {
       apiKey: API_KEY,
       model: MODEL,
-      userAgent: USER_AGENT,
     },
     embeddingModel: EMBEDDING_MODEL,
     sandbox: SANDBOX,
diff --git a/packages/core/src/core/contentGenerator.ts b/packages/core/src/core/contentGenerator.ts
index f9db121b..736ab7e1 100644
--- a/packages/core/src/core/contentGenerator.ts
+++ b/packages/core/src/core/contentGenerator.ts
@@ -35,18 +35,18 @@ export type ContentGeneratorConfig = {
   model: string;
   apiKey?: string;
   vertexai?: boolean;
-  userAgent: string;
 };
 
 export function createContentGenerator(
   config: ContentGeneratorConfig,
 ): ContentGenerator {
+  const version = process.env.CLI_VERSION || process.version;
   const googleGenAI = new GoogleGenAI({
     apiKey: config.apiKey === '' ? undefined : config.apiKey,
     vertexai: config.vertexai,
     httpOptions: {
       headers: {
-        'User-Agent': config.userAgent,
+        'User-Agent': `GeminiCLI/${version}/(${process.platform}; ${process.arch})`,
       },
     },
   });
diff --git a/packages/core/src/telemetry/sdk.ts b/packages/core/src/telemetry/sdk.ts
index ad5a9c44..65d4ae68 100644
--- a/packages/core/src/telemetry/sdk.ts
+++ b/packages/core/src/telemetry/sdk.ts
@@ -64,10 +64,9 @@ export function initializeTelemetry(config: Config): void {
     return;
   }
 
-  const geminiCliVersion = config.getContentGeneratorConfig().userAgent;
   const resource = new Resource({
     [SemanticResourceAttributes.SERVICE_NAME]: SERVICE_NAME,
-    [SemanticResourceAttributes.SERVICE_VERSION]: geminiCliVersion,
+    [SemanticResourceAttributes.SERVICE_VERSION]: process.version,
     'session.id': sessionId,
   });
 
diff --git a/packages/core/src/tools/tool-registry.test.ts b/packages/core/src/tools/tool-registry.test.ts
index 44e04a9d..4ff8b897 100644
--- a/packages/core/src/tools/tool-registry.test.ts
+++ b/packages/core/src/tools/tool-registry.test.ts
@@ -128,7 +128,6 @@ const baseConfigParams: ConfigParameters = {
     model: 'test-model',
     apiKey: 'test-api-key',
     vertexai: false,
-    userAgent: 'TestAgent/1.0',
   },
   embeddingModel: 'test-embedding-model',
   sandbox: false,