From 31337b92693fb087c851ab4a8deba79651d02c75 Mon Sep 17 00:00:00 2001 From: Adib234 <30782825+Adib234@users.noreply.github.com> Date: Mon, 27 Apr 2026 16:00:01 -0400 Subject: [PATCH] fix(cli): correct alternate buffer warning logic for JetBrains (#26067) --- packages/cli/src/gemini.tsx | 3 +-- .../cli/src/utils/userStartupWarnings.test.ts | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/packages/cli/src/gemini.tsx b/packages/cli/src/gemini.tsx index d33df0f267..cb1c987584 100644 --- a/packages/cli/src/gemini.tsx +++ b/packages/cli/src/gemini.tsx @@ -85,7 +85,6 @@ import { relaunchOnExitCode } from './utils/relaunch.js'; import { loadSandboxConfig } from './config/sandboxConfig.js'; import { deleteSession, listSessions } from './utils/sessions.js'; import { createPolicyUpdater } from './config/policy.js'; -import { isAlternateBufferEnabled } from './ui/hooks/useAlternateBuffer.js'; import { setupTerminalAndTheme } from './utils/terminalTheme.js'; import { runDeferredCommand } from './deferred.js'; @@ -644,7 +643,7 @@ export async function main() { let input = config.getQuestion(); const useAlternateBuffer = shouldEnterAlternateScreen( - isAlternateBufferEnabled(config), + config.getUseAlternateBuffer(), config.getScreenReader(), ); const rawStartupWarnings = await rawStartupWarningsPromise; diff --git a/packages/cli/src/utils/userStartupWarnings.test.ts b/packages/cli/src/utils/userStartupWarnings.test.ts index 120ac36c3b..d255dc1d3a 100644 --- a/packages/cli/src/utils/userStartupWarnings.test.ts +++ b/packages/cli/src/utils/userStartupWarnings.test.ts @@ -220,5 +220,22 @@ describe('getUserStartupWarnings', () => { ); expect(warnings).not.toContainEqual(compWarning); }); + + it('should correctly pass isAlternateBuffer option to getCompatibilityWarnings', async () => { + const projectDir = path.join(testRootDir, 'project-alt'); + await fs.mkdir(projectDir); + + await getUserStartupWarnings({}, projectDir, { isAlternateBuffer: true }); + expect(getCompatibilityWarnings).toHaveBeenCalledWith({ + isAlternateBuffer: true, + }); + + await getUserStartupWarnings({}, projectDir, { + isAlternateBuffer: false, + }); + expect(getCompatibilityWarnings).toHaveBeenCalledWith({ + isAlternateBuffer: false, + }); + }); }); });