From 268627469b384ba3fa8dfe2e05b5186248013070 Mon Sep 17 00:00:00 2001 From: Shreya Keshive Date: Tue, 5 Aug 2025 18:52:58 -0400 Subject: Refactor IDE client state management, improve user-facing error messages, and add logging of connection events (#5591) Co-authored-by: matt korwel --- packages/cli/src/config/config.test.ts | 10 ---------- packages/cli/src/config/config.ts | 9 ++------- 2 files changed, 2 insertions(+), 17 deletions(-) (limited to 'packages/cli/src/config') diff --git a/packages/cli/src/config/config.test.ts b/packages/cli/src/config/config.test.ts index f5d0ddf8..64ecdbb8 100644 --- a/packages/cli/src/config/config.test.ts +++ b/packages/cli/src/config/config.test.ts @@ -1007,16 +1007,6 @@ describe('loadCliConfig ideModeFeature', () => { const config = await loadCliConfig(settings, [], 'test-session', argv); expect(config.getIdeModeFeature()).toBe(false); }); - - it('should be false when settings.ideModeFeature is true, but SANDBOX is set', async () => { - process.argv = ['node', 'script.js']; - const argv = await parseArguments(); - process.env.TERM_PROGRAM = 'vscode'; - process.env.SANDBOX = 'true'; - const settings: Settings = { ideModeFeature: true }; - const config = await loadCliConfig(settings, [], 'test-session', argv); - expect(config.getIdeModeFeature()).toBe(false); - }); }); vi.mock('fs', async () => { diff --git a/packages/cli/src/config/config.ts b/packages/cli/src/config/config.ts index d3d37c6a..beba9602 100644 --- a/packages/cli/src/config/config.ts +++ b/packages/cli/src/config/config.ts @@ -22,7 +22,6 @@ import { FileDiscoveryService, TelemetryTarget, FileFilteringOptions, - IdeClient, } from '@google/gemini-cli-core'; import { Settings } from './settings.js'; @@ -296,13 +295,10 @@ export async function loadCliConfig( ) || false; const memoryImportFormat = settings.memoryImportFormat || 'tree'; - const ideMode = settings.ideMode ?? false; + const ideMode = settings.ideMode ?? false; const ideModeFeature = - (argv.ideModeFeature ?? settings.ideModeFeature ?? false) && - !process.env.SANDBOX; - - const ideClient = IdeClient.getInstance(ideMode && ideModeFeature); + argv.ideModeFeature ?? settings.ideModeFeature ?? false; const allExtensions = annotateActiveExtensions( extensions, @@ -471,7 +467,6 @@ export async function loadCliConfig( summarizeToolOutput: settings.summarizeToolOutput, ideMode, ideModeFeature, - ideClient, }); } -- cgit v1.2.3