Skip to content

Fix for incorrect tmux detection logic. #24795

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.

Sign up for GitHub

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

Closed
jacob314 wants to merge 1 commit into from
+77 −24
Closed

Fix for incorrect tmux detection logic. #24795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 74 additions & 20 deletions packages/cli/src/gemini.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ import {
import { act } from 'react';
import { type InitializationResult } from './core/initializer.js';
import { runNonInteractive } from './nonInteractiveCli.js';
import * as userStartupWarningsModule from './utils/userStartupWarnings.js';

// Hoisted constants and mocks
const performance = vi.hoisted(() => ({
now: vi.fn(),
Expand Down Expand Up @@ -645,13 +647,11 @@ describe('gemini.tsx main function kitty protocol', () => {
.spyOn(debugLogger, 'log')
.mockImplementation(() => {});

process.env['GEMINI_API_KEY'] = 'test-key';
vi.stubEnv('GEMINI_API_KEY', 'test-key');
Copy link
Copy Markdown
Contributor Author

@jacob314 jacob314 Apr 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix bug where we were stubbing env vars the wrong way across these tests.

try {
await main();
} catch (e) {
if (!(e instanceof MockProcessExitError)) throw e;
} finally {
delete process.env['GEMINI_API_KEY'];
}

if (flag === 'listExtensions') {
Expand Down Expand Up @@ -710,13 +710,11 @@ describe('gemini.tsx main function kitty protocol', () => {
}),
);

process.env['GEMINI_API_KEY'] = 'test-key';
vi.stubEnv('GEMINI_API_KEY', 'test-key');
try {
await main();
} catch (e) {
if (!(e instanceof MockProcessExitError)) throw e;
} finally {
delete process.env['GEMINI_API_KEY'];
}

expect(start_sandbox).toHaveBeenCalled();
Expand Down Expand Up @@ -764,13 +762,11 @@ describe('gemini.tsx main function kitty protocol', () => {

vi.spyOn(themeManager, 'setActiveTheme').mockReturnValue(false);

process.env['GEMINI_API_KEY'] = 'test-key';
vi.stubEnv('GEMINI_API_KEY', 'test-key');
try {
await main();
} catch (e) {
if (!(e instanceof MockProcessExitError)) throw e;
} finally {
delete process.env['GEMINI_API_KEY'];
}

expect(debugLoggerWarnSpy).toHaveBeenCalledWith(
Expand Down Expand Up @@ -989,13 +985,11 @@ describe('gemini.tsx main function kitty protocol', () => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(process.stdin as any).isTTY = false;

process.env['GEMINI_API_KEY'] = 'test-key';
vi.stubEnv('GEMINI_API_KEY', 'test-key');
try {
await main();
} catch (e) {
if (!(e instanceof MockProcessExitError)) throw e;
} finally {
delete process.env['GEMINI_API_KEY'];
}

expect(readStdinSpy).toHaveBeenCalled();
Expand All @@ -1012,6 +1006,71 @@ describe('gemini.tsx main function kitty protocol', () => {
expect(processExitSpy).toHaveBeenCalledWith(0);
processExitSpy.mockRestore();
});

it.each([
{
useAlternateBuffer: false,
description:
'false when useAlternateBuffer is false (even if terminal buffer is true)',
},
{
useAlternateBuffer: true,
description: 'true when useAlternateBuffer is true',
},
])(
'should use getUseAlternateBuffer to evaluate isAlternateBuffer for startup warnings: $description',
async ({ useAlternateBuffer }) => {
const getUserStartupWarningsSpy = vi
.spyOn(userStartupWarningsModule, 'getUserStartupWarnings')
.mockResolvedValue([]);

vi.mocked(parseArguments).mockResolvedValue({
enabled: true,
allowedPaths: [],
networkAccess: false,
promptInteractive: false,
} as unknown as CliArgs);

vi.mocked(loadSettings).mockReturnValue(
createMockSettings({
merged: {
advanced: {},
security: { auth: {} },
ui: {},
},
workspace: { settings: {} },
setValue: vi.fn(),
forScope: () => ({ settings: {}, originalSettings: {}, path: '' }),
}),
);

const mockConfig = createMockConfig({
isInteractive: () => true,
getQuestion: () => '',
getSandbox: () => undefined,
getUseAlternateBuffer: () => useAlternateBuffer,
getUseTerminalBuffer: () => true, // Ensure we differentiate from isAlternateBufferEnabled
getScreenReader: () => false,
});

vi.mocked(loadCliConfig).mockResolvedValue(mockConfig);

vi.stubEnv('GEMINI_API_KEY', 'test-key');
try {
await main();
} catch (e) {
if (!(e instanceof MockProcessExitError)) throw e;
}

expect(getUserStartupWarningsSpy).toHaveBeenCalledWith(
expect.anything(),
undefined,
expect.objectContaining({ isAlternateBuffer: useAlternateBuffer }),
);

getUserStartupWarningsSpy.mockRestore();
},
);
});

describe('gemini.tsx main function exit codes', () => {
Expand Down Expand Up @@ -1132,15 +1191,13 @@ describe('gemini.tsx main function exit codes', () => {
};
});

process.env['GEMINI_API_KEY'] = 'test-key';
vi.stubEnv('GEMINI_API_KEY', 'test-key');
try {
await main();
expect.fail('Should have thrown MockProcessExitError');
} catch (e) {
expect(e).toBeInstanceOf(MockProcessExitError);
expect((e as MockProcessExitError).code).toBe(42);
} finally {
delete process.env['GEMINI_API_KEY'];
}
});

Expand All @@ -1165,15 +1222,13 @@ describe('gemini.tsx main function exit codes', () => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(process.stdin as any).isTTY = true;

process.env['GEMINI_API_KEY'] = 'test-key';
vi.stubEnv('GEMINI_API_KEY', 'test-key');
try {
await main();
expect.fail('Should have thrown MockProcessExitError');
} catch (e) {
expect(e).toBeInstanceOf(MockProcessExitError);
expect((e as MockProcessExitError).code).toBe(42);
} finally {
delete process.env['GEMINI_API_KEY'];
}
});

Expand Down Expand Up @@ -1210,13 +1265,12 @@ describe('gemini.tsx main function exit codes', () => {
throw new MockProcessExitError(code);
});

process.env['GEMINI_API_KEY'] = 'test-key';
vi.stubEnv('GEMINI_API_KEY', 'test-key');
try {
await main();
} catch (e) {
if (!(e instanceof MockProcessExitError)) throw e;
} finally {
delete process.env['GEMINI_API_KEY'];
processExitSpy.mockRestore();
}

Expand Down
7 changes: 3 additions & 4 deletions packages/cli/src/gemini.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ import {
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';
Expand Down Expand Up @@ -562,8 +561,8 @@ export async function main() {
}

let input = config.getQuestion();
const useAlternateBuffer = shouldEnterAlternateScreen(
isAlternateBufferEnabled(config),
const isRealAlternateBuffer = shouldEnterAlternateScreen(
config.getUseAlternateBuffer(),
config.getScreenReader(),
);
const rawStartupWarnings = await rawStartupWarningsPromise;
Expand All @@ -574,7 +573,7 @@ export async function main() {
priority: WarningPriority.High,
})),
...(await getUserStartupWarnings(settings.merged, undefined, {
isAlternateBuffer: useAlternateBuffer,
isAlternateBuffer: isRealAlternateBuffer,
})),
];

Expand Down
Loading