-
Notifications
You must be signed in to change notification settings - Fork 14k
fix(cli): handle tmux false positive background detection #27572
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
amelidev
wants to merge
6
commits into
google-gemini:main
Choose a base branch
from
amelidev:fix/b490058141
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+178
−4
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
fe98ca7
fix(cli): handle tmux false positive background detection
amelidev 7e9ba70
Merge branch 'main' into fix/b490058141
amelidev cd4675b
Update packages/cli/src/utils/terminalTheme.test.ts
amelidev 3f2b9e6
Update packages/cli/src/utils/terminalTheme.test.ts
amelidev 9055c4f
Update packages/cli/src/utils/terminalTheme.ts
amelidev 0c8d07f
test(cli): restore process.stdin.isTTY in afterEach
amelidev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,114 @@ | ||
| /** | ||
| * @license | ||
| * Copyright 2026 Google LLC | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'; | ||
| import { setupTerminalAndTheme } from './terminalTheme.js'; | ||
| import { terminalCapabilityManager } from '../ui/utils/terminalCapabilityManager.js'; | ||
| import { themeManager } from '../ui/themes/theme-manager.js'; | ||
| import { coreEvents, type Config } from '@google/gemini-cli-core'; | ||
| import type { LoadedSettings } from '../config/settings.js'; | ||
|
|
||
| vi.mock('../ui/utils/terminalCapabilityManager.js', () => ({ | ||
| terminalCapabilityManager: { | ||
| detectCapabilities: vi.fn(), | ||
| getTerminalBackgroundColor: vi.fn(), | ||
| }, | ||
| })); | ||
|
|
||
| vi.mock('../ui/themes/theme-manager.js', () => ({ | ||
| themeManager: { | ||
| loadCustomThemes: vi.fn(), | ||
| setActiveTheme: vi.fn(), | ||
| getActiveTheme: vi.fn(), | ||
| setTerminalBackground: vi.fn(), | ||
| isThemeCompatible: vi.fn(), | ||
| getAllThemes: vi.fn().mockReturnValue([]), | ||
| }, | ||
| DEFAULT_THEME: { name: 'Default Dark' }, | ||
| })); | ||
|
|
||
| vi.mock('@google/gemini-cli-core', () => ({ | ||
| coreEvents: { | ||
| emitFeedback: vi.fn(), | ||
| }, | ||
| debugLogger: { | ||
| warn: vi.fn(), | ||
| }, | ||
| })); | ||
|
|
||
| describe('setupTerminalAndTheme', () => { | ||
| let mockConfig: Config; | ||
| let mockSettings: LoadedSettings; | ||
| const originalIsTTY = process.stdin.isTTY; | ||
|
|
||
| beforeEach(() => { | ||
| vi.resetAllMocks(); | ||
| mockConfig = { | ||
| isInteractive: vi.fn().mockReturnValue(true), | ||
| setTerminalBackground: vi.fn(), | ||
| } as unknown as Config; | ||
| mockSettings = { | ||
| merged: { | ||
| ui: { | ||
| customThemes: {}, | ||
| theme: 'Dracula', | ||
| autoThemeSwitching: true, | ||
| }, | ||
| }, | ||
| } as unknown as LoadedSettings; | ||
|
|
||
| // Mock process.stdin.isTTY | ||
| Object.defineProperty(process.stdin, 'isTTY', { | ||
| value: true, | ||
| configurable: true, | ||
| }); | ||
| }); | ||
|
|
||
|
amelidev marked this conversation as resolved.
|
||
| afterEach(() => { | ||
| Object.defineProperty(process.stdin, 'isTTY', { | ||
| value: originalIsTTY, | ||
| configurable: true, | ||
| }); | ||
| }); | ||
|
|
||
| it('should emit warning when theme is incompatible and autoThemeSwitching is enabled', async () => { | ||
| vi.mocked( | ||
| terminalCapabilityManager.getTerminalBackgroundColor, | ||
| ).mockReturnValue('#ffffff'); // Light | ||
| vi.mocked(themeManager.setActiveTheme).mockReturnValue(true); | ||
| vi.mocked(themeManager.getActiveTheme).mockReturnValue({ | ||
| name: 'Dracula', | ||
| type: 'dark', | ||
| } as unknown as never); | ||
| vi.mocked(themeManager.isThemeCompatible).mockReturnValue(false); | ||
|
|
||
| await setupTerminalAndTheme(mockConfig, mockSettings); | ||
|
|
||
| expect(coreEvents.emitFeedback).toHaveBeenCalledWith( | ||
| 'warning', | ||
| expect.stringContaining( | ||
| "Theme 'Dracula' (dark) might look incorrect on your light terminal background", | ||
| ), | ||
| ); | ||
| }); | ||
|
|
||
| it('should NOT emit warning when theme is incompatible but autoThemeSwitching is DISABLED', async () => { | ||
| mockSettings.merged.ui.autoThemeSwitching = false; | ||
| vi.mocked( | ||
| terminalCapabilityManager.getTerminalBackgroundColor, | ||
| ).mockReturnValue('#ffffff'); // Light | ||
| vi.mocked(themeManager.setActiveTheme).mockReturnValue(true); | ||
| vi.mocked(themeManager.getActiveTheme).mockReturnValue({ | ||
| name: 'Dracula', | ||
| type: 'dark', | ||
| } as unknown as never); | ||
| vi.mocked(themeManager.isThemeCompatible).mockReturnValue(false); | ||
|
|
||
| await setupTerminalAndTheme(mockConfig, mockSettings); | ||
|
|
||
| expect(coreEvents.emitFeedback).not.toHaveBeenCalled(); | ||
| }); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.