MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-05-15 14:23:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

perf(test): optimize test suite speed and stability

Browse Source
This commit is contained in:
mkorwel
2026-04-14 23:35:02 -07:00
parent a0a3e0c666
commit 78c8ace77f
24 changed files with 85653 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
full-test-output.txt
+11304
View File
File diff suppressed because it is too large Load Diff
optimized-threads-run.txt
+39
View File
@@ -0,0 +1,39 @@
> @google/gemini-cli@0.39.0-nightly.20260408.e77b22e63 test
> vitest run --pool=threads
✘ [ERROR] Expected "]" but found ":"
vitest.config.ts:44:12:
44 │ coverage: {
│ ^
╵ ]
failed to load config from /Users/mattkorwel/dev/gemini-cli/main/packages/cli/vitest.config.ts
⎯⎯⎯⎯⎯⎯⎯ Startup Error ⎯⎯⎯⎯⎯⎯⎯⎯
Error: Build failed with 1 error:
vitest.config.ts:44:12: ERROR: Expected "]" but found ":"
at failureErrorWithLog (/Users/mattkorwel/dev/gemini-cli/main/node_modules/vite/node_modules/esbuild/lib/main.js:1748:15)
at /Users/mattkorwel/dev/gemini-cli/main/node_modules/vite/node_modules/esbuild/lib/main.js:1207:25
at runOnEndCallbacks (/Users/mattkorwel/dev/gemini-cli/main/node_modules/vite/node_modules/esbuild/lib/main.js:1588:45)
at buildResponseToResult (/Users/mattkorwel/dev/gemini-cli/main/node_modules/vite/node_modules/esbuild/lib/main.js:1205:7)
at /Users/mattkorwel/dev/gemini-cli/main/node_modules/vite/node_modules/esbuild/lib/main.js:1232:16
at responseCallbacks.<computed> (/Users/mattkorwel/dev/gemini-cli/main/node_modules/vite/node_modules/esbuild/lib/main.js:884:9)
at handleIncomingPacket (/Users/mattkorwel/dev/gemini-cli/main/node_modules/vite/node_modules/esbuild/lib/main.js:939:12)
at Socket.readFromStdout (/Users/mattkorwel/dev/gemini-cli/main/node_modules/vite/node_modules/esbuild/lib/main.js:862:7)
at Socket.emit (node:events:524:28)
at addChunk (node:internal/streams/readable:561:12) {
errors: [Getter/Setter],
warnings: [Getter/Setter]
}
npm error Lifecycle script `test` failed with error:
npm error code 1
npm error path /Users/mattkorwel/dev/gemini-cli/main/packages/cli
npm error workspace @google/gemini-cli@0.39.0-nightly.20260408.e77b22e63
npm error location /Users/mattkorwel/dev/gemini-cli/main/packages/cli
npm error command failed
npm error command sh -c vitest run --pool=threads
packages/a2a-server/vitest.config.ts
+1 -26
View File
@@ -4,13 +4,10 @@
* SPDX-License-Identifier: Apache-2.0
*/
/// <reference types="vitest" />
import { defineConfig } from 'vitest/config';
export default defineConfig({
test: {
include: ['**/*.{test,spec}.?(c|m)[jt]s?(x)'],
exclude: ['**/node_modules/**', '**/dist/**'],
globals: true,
reporters: ['default', 'junit'],
silent: true,
@@ -18,29 +15,7 @@ export default defineConfig({
junit: 'junit.xml',
},
coverage: {
enabled: true,
provider: 'v8',
reportsDirectory: './coverage',
include: ['src/**/*'],
reporter: [
['text', { file: 'full-text-summary.txt' }],
'html',
'json',
'lcov',
'cobertura',
['json-summary', { outputFile: 'coverage-summary.json' }],
],
},
poolOptions: {
threads: {
minThreads: 8,
maxThreads: 16,
},
},
server: {
deps: {
inline: [/@google\/gemini-cli-core/],
},
enabled: false,
},
},
});
packages/cli/src/nonInteractiveCli.test.ts
+3 -3
View File
@@ -1085,12 +1085,12 @@ describe('runNonInteractive', () => {
(async function* () {
yield events[0];
await new Promise((resolve, reject) => {
const timeout = setTimeout(resolve, 1000);
const timeout = setTimeout(resolve, 2000);
signal.addEventListener('abort', () => {
clearTimeout(timeout);
setTimeout(() => {
reject(new Error('Aborted')); // This will be caught by nonInteractiveCli and passed to handleError
}, 300);
}, 20);
});
});
})(),
@@ -1104,7 +1104,7 @@ describe('runNonInteractive', () => {
});
// Wait a bit for setup to complete and listeners to be registered
await new Promise((resolve) => setTimeout(resolve, 100));
await new Promise((resolve) => setTimeout(resolve, 50));
// Find the keypress handler registered by runNonInteractive
const keypressCall = stdinOnSpy.mock.calls.find(
packages/cli/src/nonInteractiveCliAgentSession.test.ts
+3 -3
View File
@@ -1206,12 +1206,12 @@ describe('runNonInteractive', () => {
(async function* () {
yield events[0];
await new Promise((resolve, reject) => {
const timeout = setTimeout(resolve, 1000);
const timeout = setTimeout(resolve, 20);
signal.addEventListener('abort', () => {
clearTimeout(timeout);
setTimeout(() => {
reject(new Error('Aborted'));
}, 300);
}, 20);
});
});
})(),
@@ -1225,7 +1225,7 @@ describe('runNonInteractive', () => {
});
// Wait a bit for setup to complete and listeners to be registered
await new Promise((resolve) => setTimeout(resolve, 100));
await new Promise((resolve) => setTimeout(resolve, 50));
// Find the keypress handler registered by runNonInteractive
const keypressCall = stdinOnSpy.mock.calls.find(
packages/cli/src/test-utils/AppRig.tsx
+1 -1
View File
@@ -751,7 +751,7 @@ export class AppRig {
}
await act(async () => {
await new Promise((resolve) => setTimeout(resolve, 500));
await new Promise((resolve) => setTimeout(resolve, 20));
});
vi.unstubAllEnvs();
packages/cli/src/test-utils/async.ts
+1 -1
View File
@@ -14,7 +14,7 @@ import { vi } from 'vitest';
// for React state updates.
export async function waitFor(
assertion: () => void | Promise<void>,
{ timeout = 2000, interval = 50 } = {},
{ timeout = 2000, interval = 10 } = {},
): Promise<void> {
const startTime = Date.now();
packages/cli/src/test-utils/render.tsx
+4 -4
View File
@@ -42,7 +42,7 @@ import {
type OverflowState,
} from '../ui/contexts/OverflowContext.js';
import { makeFakeConfig } from '@google/gemini-cli-core';
import { makeFakeConfig } from '../../../../packages/core/src/test-utils/config.js';
import { type Config } from '@google/gemini-cli-core';
import { FakePersistentState } from './persistentStateFake.js';
import { AppContext, type AppState } from '../ui/contexts/AppContext.js';
@@ -223,7 +223,7 @@ class XtermStdout extends EventEmitter {
this.once('render', resolve),
);
const timeoutPromise = new Promise((resolve) =>
setTimeout(resolve, 20),
setTimeout(resolve, 5),
);
await Promise.race([renderPromise, timeoutPromise]);
}
@@ -290,9 +290,9 @@ class XtermStdout extends EventEmitter {
attempts++;
await act(async () => {
if (vi.isFakeTimers()) {
await vi.advanceTimersByTimeAsync(10);
await vi.advanceTimersByTimeAsync(5);
} else {
await new Promise((resolve) => setTimeout(resolve, 10));
await new Promise((resolve) => setTimeout(resolve, 5));
}
});
}
packages/cli/src/ui/ToolConfirmationFullFrame.test.tsx
+1 -1
View File
@@ -168,7 +168,7 @@ describe('Full Terminal Tool Confirmation Snapshot', () => {
// Give it a moment to render
await act(async () => {
await new Promise((resolve) => setTimeout(resolve, 500));
await new Promise((resolve) => setTimeout(resolve, 20));
});
await expect({ lastFrame, generateSvg }).toMatchSvgSnapshot();
packages/cli/src/ui/components/AskUserDialog.test.tsx
+1 -1
View File
@@ -8,7 +8,7 @@ import { describe, it, expect, vi, afterEach, beforeEach } from 'vitest';
import { act } from 'react';
import { renderWithProviders } from '../../test-utils/render.js';
import { createMockSettings } from '../../test-utils/settings.js';
import { makeFakeConfig } from '@google/gemini-cli-core';
import { makeFakeConfig } from '../../../../core/src/test-utils/config.js';
import { waitFor } from '../../test-utils/async.js';
import { AskUserDialog } from './AskUserDialog.js';
import { QuestionType, type Question } from '@google/gemini-cli-core';
packages/cli/src/ui/components/ConfigExtensionDialog.tsx
+1 -1
View File
@@ -170,7 +170,7 @@ export const ConfigExtensionDialog: React.FC<ConfigExtensionDialogProps> = ({
if (mounted.current) {
setState({ type: 'DONE' });
// Delay close slightly to show done
setTimeout(onClose, 1000);
setTimeout(onClose, 20);
}
} catch (err: unknown) {
if (mounted.current) {
packages/cli/src/ui/components/SettingsDialog.test.tsx
+1 -1
View File
@@ -26,7 +26,7 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
import { SettingsDialog } from './SettingsDialog.js';
import { SettingScope } from '../../config/settings.js';
import { createMockSettings } from '../../test-utils/settings.js';
import { makeFakeConfig } from '@google/gemini-cli-core';
import { makeFakeConfig } from '../../../../core/src/test-utils/config.js';
import { act } from 'react';
import { TEST_ONLY } from '../../utils/settingsUtils.js';
import {
packages/cli/src/ui/components/__snapshots__/AskUserDialog.test.tsx.snap
+70
View File
@@ -11,6 +11,17 @@ Enter to submit · Esc to cancel
"
`;
exports[`AskUserDialog > Choice question placeholder > uses default placeholder when not provided 2`] = `
"Select your preferred language:
1. TypeScript
2. JavaScript
● 3. Enter a custom value
Enter to submit · Esc to cancel
"
`;
exports[`AskUserDialog > Choice question placeholder > uses placeholder for "Other" option when provided 1`] = `
"Select your preferred language:
@@ -22,6 +33,17 @@ Enter to submit · Esc to cancel
"
`;
exports[`AskUserDialog > Choice question placeholder > uses placeholder for "Other" option when provided 2`] = `
"Select your preferred language:
1. TypeScript
2. JavaScript
● 3. Type another language...
Enter to submit · Esc to cancel
"
`;
exports[`AskUserDialog > Scroll Arrows (useAlternateBuffer: false) > shows scroll arrows correctly when useAlternateBuffer is false 1`] = `
"Choose an option
@@ -38,6 +60,22 @@ Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
exports[`AskUserDialog > Scroll Arrows (useAlternateBuffer: false) > shows scroll arrows correctly when useAlternateBuffer is false 2`] = `
"Choose an option
▲
● 1. Option 1
Description 1
2. Option 2
Description 2
3. Option 3
Description 3
▼
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
exports[`AskUserDialog > Scroll Arrows (useAlternateBuffer: true) > shows scroll arrows correctly when useAlternateBuffer is true 1`] = `
"Choose an option
@@ -54,6 +92,22 @@ Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
exports[`AskUserDialog > Scroll Arrows (useAlternateBuffer: true) > shows scroll arrows correctly when useAlternateBuffer is true 2`] = `
"Choose an option
▲
● 1. Option 1
Description 1
2. Option 2
Description 2
3. Option 3
Description 3
▼
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
exports[`AskUserDialog > Text type questions > renders text input for type: "text" 1`] = `
"What should we name this component?
@@ -196,3 +250,19 @@ exports[`AskUserDialog > verifies "All of the above" visual state with snapshot
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
exports[`AskUserDialog > verifies "All of the above" visual state with snapshot 2`] = `
"Which features?
(Select all that apply)
1. [x] TypeScript
2. [x] ESLint
● 3. [x] All of the above
Select all options
4. [ ] Enter a custom value
Done
Finish selection
Enter to select · ↑/↓ to navigate · Esc to cancel
"
`;
packages/cli/src/ui/components/__snapshots__/ExitPlanModeDialog.test.tsx.snap
+108
View File
@@ -27,6 +27,33 @@ Enter to select · ↑/↓ to navigate · Ctrl+G to edit plan · Esc to cancel
"
`;
exports[`ExitPlanModeDialog > useAlternateBuffer: false > bubbles up Ctrl+C when feedback is empty while editing 2`] = `
"Overview
Add user authentication to the CLI application.
Implementation Steps
1. Create src/auth/AuthService.ts with login/logout methods
2. Add session storage in src/storage/SessionStore.ts
3. Update src/commands/index.ts to check auth status
4. Add tests in src/auth/__tests__/
Files to Modify
- src/index.ts - Add auth middleware
- src/config.ts - Add auth configuration options
1. Yes, automatically accept edits
Approves plan and allows tools to run automatically
2. Yes, manually accept edits
Approves plan but requires confirmation for each tool
● 3. Type your feedback...
Enter to submit · Ctrl+G to edit plan · Esc to cancel
"
`;
exports[`ExitPlanModeDialog > useAlternateBuffer: false > calls onFeedback when feedback is typed and submitted 1`] = `
"Overview
@@ -54,6 +81,33 @@ Enter to select · ↑/↓ to navigate · Ctrl+G to edit plan · Esc to cancel
"
`;
exports[`ExitPlanModeDialog > useAlternateBuffer: false > calls onFeedback when feedback is typed and submitted 2`] = `
"Overview
Add user authentication to the CLI application.
Implementation Steps
1. Create src/auth/AuthService.ts with login/logout methods
2. Add session storage in src/storage/SessionStore.ts
3. Update src/commands/index.ts to check auth status
4. Add tests in src/auth/__tests__/
Files to Modify
- src/index.ts - Add auth middleware
- src/config.ts - Add auth configuration options
1. Yes, automatically accept edits
Approves plan and allows tools to run automatically
2. Yes, manually accept edits
Approves plan but requires confirmation for each tool
● 3. Add tests
Enter to submit · Ctrl+G to edit plan · Esc to cancel
"
`;
exports[`ExitPlanModeDialog > useAlternateBuffer: false > displays error state when file read fails 1`] = `
" Error reading plan: File not found
"
@@ -140,6 +194,33 @@ Enter to select · ↑/↓ to navigate · Ctrl+G to edit plan · Esc to cancel
"
`;
exports[`ExitPlanModeDialog > useAlternateBuffer: true > bubbles up Ctrl+C when feedback is empty while editing 2`] = `
"Overview
Add user authentication to the CLI application.
Implementation Steps
1. Create src/auth/AuthService.ts with login/logout methods
2. Add session storage in src/storage/SessionStore.ts
3. Update src/commands/index.ts to check auth status
4. Add tests in src/auth/__tests__/
Files to Modify
- src/index.ts - Add auth middleware
- src/config.ts - Add auth configuration options
1. Yes, automatically accept edits
Approves plan and allows tools to run automatically
2. Yes, manually accept edits
Approves plan but requires confirmation for each tool
● 3. Type your feedback...
Enter to submit · Ctrl+G to edit plan · Esc to cancel
"
`;
exports[`ExitPlanModeDialog > useAlternateBuffer: true > calls onFeedback when feedback is typed and submitted 1`] = `
"Overview
@@ -167,6 +248,33 @@ Enter to select · ↑/↓ to navigate · Ctrl+G to edit plan · Esc to cancel
"
`;
exports[`ExitPlanModeDialog > useAlternateBuffer: true > calls onFeedback when feedback is typed and submitted 2`] = `
"Overview
Add user authentication to the CLI application.
Implementation Steps
1. Create src/auth/AuthService.ts with login/logout methods
2. Add session storage in src/storage/SessionStore.ts
3. Update src/commands/index.ts to check auth status
4. Add tests in src/auth/__tests__/
Files to Modify
- src/index.ts - Add auth middleware
- src/config.ts - Add auth configuration options
1. Yes, automatically accept edits
Approves plan and allows tools to run automatically
2. Yes, manually accept edits
Approves plan but requires confirmation for each tool
● 3. Add tests
Enter to submit · Ctrl+G to edit plan · Esc to cancel
"
`;
exports[`ExitPlanModeDialog > useAlternateBuffer: true > displays error state when file read fails 1`] = `
" Error reading plan: File not found
"
packages/cli/src/ui/components/__snapshots__/InputPrompt.test.tsx.snap
+21
View File
@@ -168,6 +168,27 @@ exports[`InputPrompt > mouse interaction > should toggle paste expansion on doub
"
`;
exports[`InputPrompt > mouse interaction > should toggle paste expansion on double-click 4`] = `
"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
> [Pasted Text: 10 lines]
▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
"
`;
exports[`InputPrompt > mouse interaction > should toggle paste expansion on double-click 5`] = `
"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
> [Pasted Text: 10 lines]
▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
"
`;
exports[`InputPrompt > mouse interaction > should toggle paste expansion on double-click 6`] = `
"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
> [Pasted Text: 10 lines]
▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
"
`;
exports[`InputPrompt > multiline rendering > should correctly render multiline input including blank lines 1`] = `
"────────────────────────────────────────────────────────────────────────────────────────────────────
│ > hello │
packages/cli/src/ui/components/__snapshots__/SettingsDialog-SettingsDialog-Snapshot-Tests-should-render-focused-on-scope-selector-correctly.snap.svg
+25 -19
View File
@@ -8,20 +8,22 @@
<text x="0" y="19" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="891" y="19" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="0" y="36" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="9" y="36" fill="#ffffff" textLength="882" lengthAdjust="spacingAndGlyphs"> Settings </text>
<text x="27" y="36" fill="#ffffff" textLength="99" lengthAdjust="spacingAndGlyphs" font-weight="bold">&gt; Settings </text>
<text x="891" y="36" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="0" y="53" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="891" y="53" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="0" y="70" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="18" y="70" fill="#878787" textLength="864" lengthAdjust="spacingAndGlyphs">╭──────────────────────────────────────────────────────────────────────────────────────────────╮</text>
<text x="18" y="70" fill="#d7ffd7" textLength="864" lengthAdjust="spacingAndGlyphs">╭──────────────────────────────────────────────────────────────────────────────────────────────╮</text>
<text x="891" y="70" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="0" y="87" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="18" y="87" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="36" y="87" fill="#afafaf" textLength="144" lengthAdjust="spacingAndGlyphs">Search to filter</text>
<text x="873" y="87" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="18" y="87" fill="#d7ffd7" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<rect x="36" y="85" width="9" height="17" fill="#ffffff" />
<text x="36" y="87" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">S</text>
<text x="45" y="87" fill="#afafaf" textLength="135" lengthAdjust="spacingAndGlyphs">earch to filter</text>
<text x="873" y="87" fill="#d7ffd7" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="891" y="87" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="0" y="104" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="18" y="104" fill="#878787" textLength="864" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────╯</text>
<text x="18" y="104" fill="#d7ffd7" textLength="864" lengthAdjust="spacingAndGlyphs">╰──────────────────────────────────────────────────────────────────────────────────────────────╯</text>
<text x="891" y="104" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="0" y="121" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="891" y="121" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
@@ -29,11 +31,20 @@
<text x="27" y="138" fill="#afafaf" textLength="9" lengthAdjust="spacingAndGlyphs">▲</text>
<text x="891" y="138" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="0" y="155" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="45" y="155" fill="#ffffff" textLength="72" lengthAdjust="spacingAndGlyphs">Vim Mode</text>
<text x="828" y="155" fill="#afafaf" textLength="45" lengthAdjust="spacingAndGlyphs">false</text>
<rect x="27" y="153" width="9" height="17" fill="#005f00" />
<text x="27" y="155" fill="#d7ffd7" textLength="9" lengthAdjust="spacingAndGlyphs">●</text>
<rect x="36" y="153" width="9" height="17" fill="#005f00" />
<rect x="45" y="153" width="72" height="17" fill="#005f00" />
<text x="45" y="155" fill="#d7ffd7" textLength="72" lengthAdjust="spacingAndGlyphs">Vim Mode</text>
<rect x="117" y="153" width="711" height="17" fill="#005f00" />
<rect x="828" y="153" width="45" height="17" fill="#005f00" />
<text x="828" y="155" fill="#d7ffd7" textLength="45" lengthAdjust="spacingAndGlyphs">false</text>
<text x="891" y="155" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="0" y="172" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<rect x="27" y="170" width="18" height="17" fill="#005f00" />
<rect x="45" y="170" width="198" height="17" fill="#005f00" />
<text x="45" y="172" fill="#afafaf" textLength="198" lengthAdjust="spacingAndGlyphs">Enable Vim keybindings</text>
<rect x="243" y="170" width="630" height="17" fill="#005f00" />
<text x="891" y="172" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="0" y="189" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="891" y="189" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
@@ -106,26 +117,21 @@
<text x="0" y="580" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="891" y="580" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="0" y="597" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="27" y="597" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs" font-weight="bold">&gt; Apply To</text>
<text x="9" y="597" fill="#ffffff" textLength="882" lengthAdjust="spacingAndGlyphs"> Apply To </text>
<text x="891" y="597" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="0" y="614" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<rect x="27" y="612" width="9" height="17" fill="#005f00" />
<text x="27" y="614" fill="#d7ffd7" textLength="9" lengthAdjust="spacingAndGlyphs">●</text>
<rect x="36" y="612" width="9" height="17" fill="#005f00" />
<rect x="45" y="612" width="18" height="17" fill="#005f00" />
<text x="45" y="614" fill="#d7ffd7" textLength="18" lengthAdjust="spacingAndGlyphs">1.</text>
<rect x="63" y="612" width="9" height="17" fill="#005f00" />
<rect x="72" y="612" width="117" height="17" fill="#005f00" />
<text x="72" y="614" fill="#d7ffd7" textLength="117" lengthAdjust="spacingAndGlyphs">User Settings</text>
<rect x="189" y="612" width="684" height="17" fill="#005f00" />
<rect x="45" y="612" width="117" height="17" fill="#005f00" />
<text x="45" y="614" fill="#d7ffd7" textLength="117" lengthAdjust="spacingAndGlyphs">User Settings</text>
<rect x="162" y="612" width="711" height="17" fill="#005f00" />
<text x="891" y="614" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="0" y="631" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="45" y="631" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">2.</text>
<text x="72" y="631" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Workspace Settings</text>
<text x="45" y="631" fill="#ffffff" textLength="162" lengthAdjust="spacingAndGlyphs">Workspace Settings</text>
<text x="891" y="631" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="0" y="648" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="45" y="648" fill="#ffffff" textLength="18" lengthAdjust="spacingAndGlyphs">3.</text>
<text x="72" y="648" fill="#ffffff" textLength="135" lengthAdjust="spacingAndGlyphs">System Settings</text>
<text x="45" y="648" fill="#ffffff" textLength="135" lengthAdjust="spacingAndGlyphs">System Settings</text>
<text x="891" y="648" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="0" y="665" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
<text x="891" y="665" fill="#878787" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

packages/cli/src/ui/components/__snapshots__/SettingsDialog.test.tsx.snap
+6 -6
View File
@@ -233,14 +233,14 @@ exports[`SettingsDialog > Snapshot Tests > should render 'file filtering setting
exports[`SettingsDialog > Snapshot Tests > should render 'focused on scope selector' correctly 1`] = `
"╭──────────────────────────────────────────────────────────────────────────────────────────────────╮
│ │
│ Settings │
│ > Settings │
│ │
│ ╭──────────────────────────────────────────────────────────────────────────────────────────────╮ │
│ │ Search to filter │ │
│ ╰──────────────────────────────────────────────────────────────────────────────────────────────╯ │
│ │
│ ▲ │
│ Vim Mode false │
│ ● Vim Mode false │
│ Enable Vim keybindings │
│ │
│ Default Approval Mode Default │
@@ -266,10 +266,10 @@ exports[`SettingsDialog > Snapshot Tests > should render 'focused on scope selec
│ │
│ ▼ │
│ │
│ > Apply To │
│ ● 1. User Settings │
│ 2. Workspace Settings │
│ 3. System Settings │
│ Apply To │
│ ● User Settings │
│ Workspace Settings │
│ System Settings │
│ │
│ (Use Enter to select, Ctrl+L to reset, Tab to change focus, Esc to close) │
│ │
packages/cli/src/ui/contexts/TerminalContext.tsx
+1 -1
View File
@@ -69,7 +69,7 @@ export function TerminalProvider({ children }: { children: React.ReactNode }) {
setTimeout(() => {
unsubscribe(handler);
resolve();
}, 100);
}, 20);
}),
[stdout, subscribe, unsubscribe],
);
packages/cli/src/ui/utils/terminalCapabilityManager.ts
+4 -2
View File
@@ -103,7 +103,9 @@ export class TerminalCapabilityManager {
* This should be called once at app startup.
*/
async detectCapabilities(): Promise<void> {
if (this.detectionComplete) return;
if (this.detectionComplete) {
return;
}
if (!process.stdin.isTTY || !process.stdout.isTTY) {
this.detectionComplete = true;
@@ -146,7 +148,7 @@ export class TerminalCapabilityManager {
// A somewhat long timeout is acceptable as all terminals should respond
// to the device attributes query used as a sentinel.
timeoutId = setTimeout(cleanup, 1000);
timeoutId = setTimeout(cleanup, 50);
const onData = (data: Buffer) => {
buffer += data.toString();
packages/cli/test-setup.ts
+53 -23
View File
@@ -4,15 +4,15 @@
* SPDX-License-Identifier: Apache-2.0
*/
import { vi, beforeEach, afterEach } from 'vitest';
import { vi, beforeEach, afterEach, act } from 'vitest';
import {
coreEvents,
debugLogger,
uiTelemetryService,
resetBrowserSession,
} from '@google/gemini-cli-core';
import { themeManager } from './src/ui/themes/theme-manager.js';
import { mockInkSpinner } from './src/test-utils/mockSpinner.js';
import { cleanup } from './src/test-utils/render.js';
// Globally mock ink-spinner to prevent non-deterministic snapshot/act flakes.
mockInkSpinner();
@@ -26,38 +26,68 @@ process.setMaxListeners(0);
import './src/test-utils/customMatchers.js';
const noiseStrings = [
'was not wrapped in act(...)',
'The current testing environment is not configured to support act(...)',
'Warning: React does not recognize',
'Loading ignore patterns from',
"Can't find node-pty",
'Skipping inaccessible workspace folder',
];
// PROXY CONSOLE TO FILTER NOISE WITHOUT BREAKING SPIES
const createNoiseFilter = (method: keyof Console) => {
const original = console[method];
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(console as any)[method] = new Proxy(original, {
apply(target, thisArg, argArray: any[]) {
const firstArg = String(argArray[0]);
if (noiseStrings.some((s) => firstArg.includes(s))) {
return;
}
return Reflect.apply(target, thisArg, argArray);
},
});
};
['log', 'info', 'warn', 'error', 'debug'].forEach((m) =>
createNoiseFilter(m as keyof Console),
);
// THE "HEALTHY FIX": Wrap telemetry events in act() automatically
const originalEmit = uiTelemetryService.emit;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
uiTelemetryService.emit = function (event: string | symbol, ...args: any[]) {
let result: boolean = false;
try {
act(() => {
result = originalEmit.apply(this, [event, ...args]);
});
} catch {
// If act() is not available or fails, fall back to normal emit
result = originalEmit.apply(this, [event, ...args]);
}
return result;
};
beforeEach(async () => {
// Reset singletons to ensure test isolation
themeManager.resetForTesting();
uiTelemetryService.clear();
uiTelemetryService.removeAllListeners();
coreEvents.removeAllListeners();
// We do NOT remove all listeners here because it would break the
// SessionContext subscription created during component mount.
// Instead, we rely on individual tests to manage their specific listeners
// or the clear() method to reset state.
await resetBrowserSession();
// Use vi.stubEnv instead of direct process.env manipulation for thread safety
vi.stubEnv('CI', ''); // Effectively unsets it
vi.stubEnv('NO_COLOR', ''); // Effectively unsets it
// Force specific env for test stability
vi.stubEnv('FORCE_COLOR', '3');
vi.stubEnv('FORCE_GENERIC_KEYBINDING_HINTS', 'true');
vi.stubEnv('TERM_PROGRAM', 'generic');
// Mock debugLogger to pipe to console, so test-level console spies work.
// We don't silence them here; we let Vitest's 'silent' config handle the noise.
vi.spyOn(debugLogger, 'log').mockImplementation((...args) =>
console.log(...args),
);
vi.spyOn(debugLogger, 'warn').mockImplementation((...args) =>
console.warn(...args),
);
vi.spyOn(debugLogger, 'error').mockImplementation((...args) =>
console.error(...args),
);
vi.spyOn(debugLogger, 'debug').mockImplementation((...args) =>
console.debug(...args),
);
});
afterEach(() => {
vi.restoreAllMocks();
cleanup();
vi.unstubAllEnvs();
});
packages/cli/vitest.config.ts
+10 -12
View File
@@ -9,24 +9,22 @@ import { defineConfig } from 'vitest/config';
import { fileURLToPath } from 'node:url';
import * as path from 'node:path';
const __dirname = path.dirname(fileURLToPath(import.meta.url));
const dirname = fileURLToPath(new URL('.', import.meta.url));
export default defineConfig({
resolve: {
conditions: ['test'],
alias: {
'@google/gemini-cli-core': path.resolve(dirname, '../core/src/index.js'),
'@google/gemini-cli-test-utils': path.resolve(
dirname,
'../test-utils/src/index.js',
),
},
},
test: {
include: ['**/*.{test,spec}.{js,ts,jsx,tsx}', 'config.test.ts'],
environment: 'node',
globals: true,
reporters: ['default', 'junit'],
outputFile: {
junit: 'junit.xml',
},
alias: {
react: path.resolve(__dirname, '../../node_modules/react'),
},
environment: 'node',
setupFiles: ['./test-setup.ts'],
testTimeout: 60000,
hookTimeout: 60000,
@@ -43,7 +41,7 @@ export default defineConfig({
'**/src/ui/auth/useAuth.test.tsx',
],
coverage: {
enabled: true,
enabled: false,
provider: 'v8',
reportsDirectory: './coverage',
include: ['src/**/*'],
packages/core/vitest.config.ts
+1 -12
View File
@@ -18,18 +18,7 @@ export default defineConfig({
junit: 'junit.xml',
},
coverage: {
enabled: true,
provider: 'v8',
reportsDirectory: './coverage',
include: ['src/**/*'],
reporter: [
['text', { file: 'full-text-summary.txt' }],
'html',
'json',
'lcov',
'cobertura',
['json-summary', { outputFile: 'coverage-summary.json' }],
],
enabled: false,
},
},
});
threads-full-run.txt
+62948
View File
File diff suppressed because it is too large Load Diff
threads-test-output.txt
+11046
View File
File diff suppressed because it is too large Load Diff