@google/gemini-cli 0.30.1 → 0.31.0-preview.1

package/dist/src/ui/components/SettingsDialog.test.js

@@ -182,58 +182,67 @@ describe('SettingsDialog', () => {
         vi.resetAllMocks();
     });
     describe('Initial Rendering', () => {
-        it('should render the settings dialog with default state', () => {
+        it('should render the settings dialog with default state', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { lastFrame } = renderDialog(settings, onSelect);
+            const { lastFrame, waitUntilReady, unmount } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             const output = lastFrame();
             expect(output).toContain('Settings');
             expect(output).toContain('Apply To');
             // Use regex for more flexible help text matching
             expect(output).toMatch(/Enter.*select.*Esc.*close/);
+            unmount();
         });
-        it('should accept availableTerminalHeight prop without errors', () => {
+        it('should accept availableTerminalHeight prop without errors', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { lastFrame } = renderDialog(settings, onSelect, {
+            const { lastFrame, waitUntilReady, unmount } = renderDialog(settings, onSelect, {
                 availableTerminalHeight: 20,
             });
+            await waitUntilReady();
             const output = lastFrame();
             // Should still render properly with the height prop
             expect(output).toContain('Settings');
             // Use regex for more flexible help text matching
             expect(output).toMatch(/Enter.*select.*Esc.*close/);
+            unmount();
         });
-        it('should render settings list with visual indicators', () => {
+        it('should render settings list with visual indicators', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { lastFrame } = renderDialog(settings, onSelect);
+            const { lastFrame, waitUntilReady, unmount } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             const output = lastFrame();
             // Use snapshot to capture visual layout including indicators
             expect(output).toMatchSnapshot();
+            unmount();
         });
         it('should use almost full height of the window but no more when the window height is 25 rows', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
             // Render with a fixed height of 25 rows
-            const { lastFrame } = renderDialog(settings, onSelect, {
+            const { lastFrame, waitUntilReady, unmount } = renderDialog(settings, onSelect, {
                 availableTerminalHeight: 25,
             });
+            await waitUntilReady();
             // Wait for the dialog to render
             await waitFor(() => {
                 const output = lastFrame();
                 expect(output).toBeDefined();
-                const lines = output.split('\n');
+                const lines = output.trim().split('\n');
                 expect(lines.length).toBeGreaterThanOrEqual(24);
                 expect(lines.length).toBeLessThanOrEqual(25);
             });
+            unmount();
         });
     });
     describe('Setting Descriptions', () => {
-        it('should render descriptions for settings that have them', () => {
+        it('should render descriptions for settings that have them', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { lastFrame } = renderDialog(settings, onSelect);
+            const { lastFrame, waitUntilReady, unmount } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             const output = lastFrame();
             // 'general.vimMode' has description 'Enable Vim keybindings' in settingsSchema.ts
             expect(output).toContain('Vim Mode');
@@ -241,6 +250,7 @@ describe('SettingsDialog', () => {
             // 'general.enableAutoUpdate' has description 'Enable automatic updates.'
             expect(output).toContain('Enable Auto Update');
             expect(output).toContain('Enable automatic updates.');
+            unmount();
         });
     });
     describe('Settings Navigation', () => {
@@ -258,20 +268,23 @@ describe('SettingsDialog', () => {
         ])('should navigate with $name', async ({ down, up }) => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { stdin, unmount, lastFrame } = renderDialog(settings, onSelect);
+            const { stdin, unmount, lastFrame, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             const initialFrame = lastFrame();
             expect(initialFrame).toContain('Vim Mode');
             // Navigate down
-            act(() => {
+            await act(async () => {
                 stdin.write(down);
             });
+            await waitUntilReady();
             await waitFor(() => {
                 expect(lastFrame()).toContain('Enable Auto Update');
             });
             // Navigate up
-            act(() => {
+            await act(async () => {
                 stdin.write(up);
             });
+            await waitUntilReady();
             await waitFor(() => {
                 expect(lastFrame()).toContain('Vim Mode');
             });
@@ -280,11 +293,13 @@ describe('SettingsDialog', () => {
         it('wraps around when at the top of the list', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { stdin, unmount, lastFrame } = renderDialog(settings, onSelect);
+            const { stdin, unmount, lastFrame, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Try to go up from first item
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.UP_ARROW);
             });
+            await waitUntilReady();
             await waitFor(() => {
                 // Should wrap to last setting (without relying on exact bullet character)
                 expect(lastFrame()).toContain('Hook Notifications');
@@ -297,15 +312,17 @@ describe('SettingsDialog', () => {
             vi.mocked(saveModifiedSettings).mockClear();
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { stdin, unmount, lastFrame } = renderDialog(settings, onSelect);
+            const { stdin, unmount, lastFrame, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Wait for initial render and verify we're on Vim Mode (first setting)
             await waitFor(() => {
                 expect(lastFrame()).toContain('Vim Mode');
             });
             // Toggle the setting (Vim Mode is the first setting now)
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.ENTER);
             });
+            await waitUntilReady();
             // Wait for the setting change to be processed
             await waitFor(() => {
                 expect(vi.mocked(saveModifiedSettings).mock.calls.length).toBeGreaterThan(0);
@@ -341,11 +358,16 @@ describe('SettingsDialog', () => {
                     settings.setValue(SettingScope.User, 'ui.theme', initialValue);
                 }
                 const onSelect = vi.fn();
-                const { stdin, unmount } = renderDialog(settings, onSelect);
-                act(() => {
+                const { stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+                await waitUntilReady();
+                await act(async () => {
                     stdin.write(TerminalKeys.DOWN_ARROW);
+                });
+                await waitUntilReady();
+                await act(async () => {
                     stdin.write(TerminalKeys.ENTER);
                 });
+                await waitUntilReady();
                 await waitFor(() => {
                     expect(vi.mocked(saveModifiedSettings)).toHaveBeenCalled();
                 });
@@ -360,12 +382,14 @@ describe('SettingsDialog', () => {
         it('should handle vim mode setting specially', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { stdin, unmount } = renderDialog(settings, onSelect);
+            const { stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Navigate to vim mode setting and toggle it
             // This would require knowing the exact position, so we'll just test that the mock is called
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.ENTER); // Enter key
             });
+            await waitUntilReady();
             // The mock should potentially be called if vim mode was toggled
             unmount();
         });
@@ -374,19 +398,22 @@ describe('SettingsDialog', () => {
         it('should switch between scopes', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { stdin, unmount } = renderDialog(settings, onSelect);
+            const { stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Switch to scope focus
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.TAB); // Tab key
                 // Select different scope (numbers 1-3 typically available)
                 stdin.write('2'); // Select second scope option
             });
+            await waitUntilReady();
             unmount();
         });
         it('should reset to settings focus when scope is selected', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { lastFrame, unmount } = renderDialog(settings, onSelect);
+            const { lastFrame, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Wait for initial render
             await waitFor(() => {
                 expect(lastFrame()).toContain('Vim Mode');
@@ -403,9 +430,10 @@ describe('SettingsDialog', () => {
         it('should show restart prompt for restart-required settings', async () => {
             const settings = createMockSettings();
             const onRestartRequest = vi.fn();
-            const { unmount } = renderDialog(settings, vi.fn(), {
+            const { unmount, waitUntilReady } = renderDialog(settings, vi.fn(), {
                 onRestartRequest,
             });
+            await waitUntilReady();
             // This test would need to trigger a restart-required setting change
             // The exact steps depend on which settings require restart
             unmount();
@@ -413,13 +441,15 @@ describe('SettingsDialog', () => {
         it('should handle restart request when r is pressed', async () => {
             const settings = createMockSettings();
             const onRestartRequest = vi.fn();
-            const { stdin, unmount } = renderDialog(settings, vi.fn(), {
+            const { stdin, unmount, waitUntilReady } = renderDialog(settings, vi.fn(), {
                 onRestartRequest,
             });
+            await waitUntilReady();
             // Press 'r' key (this would only work if restart prompt is showing)
-            act(() => {
+            await act(async () => {
                 stdin.write('r');
             });
+            await waitUntilReady();
             // If restart prompt was showing, onRestartRequest should be called
             unmount();
         });
@@ -428,7 +458,8 @@ describe('SettingsDialog', () => {
         it('should call onSelect with undefined when Escape is pressed', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { lastFrame, unmount } = renderDialog(settings, onSelect);
+            const { lastFrame, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Wait for initial render
             await waitFor(() => {
                 expect(lastFrame()).toContain('Vim Mode');
@@ -445,16 +476,18 @@ describe('SettingsDialog', () => {
         it('should persist settings across scope changes', async () => {
             const settings = createMockSettings({ vimMode: true });
             const onSelect = vi.fn();
-            const { stdin, unmount } = renderDialog(settings, onSelect);
+            const { stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Switch to scope selector and change scope
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.TAB); // Tab
                 stdin.write('2'); // Select workspace scope
             });
+            await waitUntilReady();
             // Settings should be reloaded for new scope
             unmount();
         });
-        it('should show different values for different scopes', () => {
+        it('should show different values for different scopes', async () => {
             const settings = createMockSettings({
                 user: {
                     settings: { vimMode: true },
@@ -473,10 +506,12 @@ describe('SettingsDialog', () => {
                 },
             });
             const onSelect = vi.fn();
-            const { lastFrame } = renderDialog(settings, onSelect);
+            const { lastFrame, waitUntilReady, unmount } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Should show user scope values initially
             const output = lastFrame();
             expect(output).toContain('Settings');
+            unmount();
         });
     });
     describe('Error Handling', () => {
@@ -484,11 +519,13 @@ describe('SettingsDialog', () => {
             mockToggleVimEnabled.mockRejectedValue(new Error('Toggle failed'));
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { stdin, unmount } = renderDialog(settings, onSelect);
+            const { stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Try to toggle a setting (this might trigger vim mode toggle)
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.ENTER); // Enter
             });
+            await waitUntilReady();
             // Should not crash
             unmount();
         });
@@ -497,26 +534,36 @@ describe('SettingsDialog', () => {
         it('should track modified settings correctly', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { stdin, unmount } = renderDialog(settings, onSelect);
+            const { stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Toggle a setting, then toggle another setting
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.ENTER); // Enter
+            });
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write(TerminalKeys.DOWN_ARROW); // Down
+            });
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write(TerminalKeys.ENTER); // Enter
             });
+            await waitUntilReady();
             // Should track multiple modified settings
             unmount();
         });
         it('should handle scrolling when there are many settings', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { stdin, unmount } = renderDialog(settings, onSelect);
+            const { stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Navigate down many times to test scrolling
-            act(() => {
+            await act(async () => {
                 for (let i = 0; i < 10; i++) {
                     stdin.write(TerminalKeys.DOWN_ARROW); // Down arrow
                 }
             });
+            await waitUntilReady();
             unmount();
         });
     });
@@ -524,17 +571,19 @@ describe('SettingsDialog', () => {
         it('should sync with VimModeContext when vim mode is toggled', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { stdin, unmount } = render(_jsx(VimModeProvider, { settings: settings, children: _jsx(KeypressProvider, { children: _jsx(SettingsDialog, { settings: settings, onSelect: onSelect }) }) }));
+            const { stdin, unmount, waitUntilReady } = render(_jsx(VimModeProvider, { settings: settings, children: _jsx(KeypressProvider, { children: _jsx(SettingsDialog, { settings: settings, onSelect: onSelect }) }) }));
+            await waitUntilReady();
             // Navigate to and toggle vim mode setting
             // This would require knowing the exact position of vim mode setting
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.ENTER); // Enter
             });
+            await waitUntilReady();
             unmount();
         });
     });
     describe('Specific Settings Behavior', () => {
-        it('should show correct display values for settings with different states', () => {
+        it('should show correct display values for settings with different states', async () => {
             const settings = createMockSettings({
                 user: {
                     settings: { vimMode: true, hideTips: false },
@@ -553,26 +602,31 @@ describe('SettingsDialog', () => {
                 },
             });
             const onSelect = vi.fn();
-            const { lastFrame } = renderDialog(settings, onSelect);
+            const { lastFrame, waitUntilReady, unmount } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             const output = lastFrame();
             // Should contain settings labels
             expect(output).toContain('Settings');
+            unmount();
         });
         it('should handle immediate settings save for non-restart-required settings', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { stdin, unmount } = renderDialog(settings, onSelect);
+            const { stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Toggle a non-restart-required setting (like hideTips)
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.ENTER); // Enter - toggle current setting
             });
+            await waitUntilReady();
             // Should save immediately without showing restart prompt
             unmount();
         });
         it('should show restart prompt for restart-required settings', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { lastFrame, unmount } = renderDialog(settings, onSelect);
+            const { lastFrame, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // This test would need to navigate to a specific restart-required setting
             // Since we can't easily target specific settings, we test the general behavior
             // Should not show restart prompt initially
@@ -584,13 +638,14 @@ describe('SettingsDialog', () => {
         it('should clear restart prompt when switching scopes', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { unmount } = renderDialog(settings, onSelect);
+            const { unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Restart prompt should be cleared when switching scopes
             unmount();
         });
     });
     describe('Settings Display Values', () => {
-        it('should show correct values for inherited settings', () => {
+        it('should show correct values for inherited settings', async () => {
             const settings = createMockSettings({
                 system: {
                     settings: { vimMode: true, hideWindowTitle: false },
@@ -599,12 +654,14 @@ describe('SettingsDialog', () => {
                 },
             });
             const onSelect = vi.fn();
-            const { lastFrame } = renderDialog(settings, onSelect);
+            const { lastFrame, waitUntilReady, unmount } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             const output = lastFrame();
             // Settings should show inherited values
             expect(output).toContain('Settings');
+            unmount();
         });
-        it('should show override indicator for overridden settings', () => {
+        it('should show override indicator for overridden settings', async () => {
             const settings = createMockSettings({
                 user: {
                     settings: { vimMode: false },
@@ -618,10 +675,12 @@ describe('SettingsDialog', () => {
                 },
             });
             const onSelect = vi.fn();
-            const { lastFrame } = renderDialog(settings, onSelect);
+            const { lastFrame, waitUntilReady, unmount } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             const output = lastFrame();
             // Should show settings with override indicators
             expect(output).toContain('Settings');
+            unmount();
         });
     });
     describe('Race Condition Regression Tests', () => {
@@ -659,11 +718,13 @@ describe('SettingsDialog', () => {
                 },
             });
             const onSelect = vi.fn();
-            const { stdin, unmount } = renderDialog(settings, onSelect);
+            const { stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             for (let i = 0; i < toggleCount; i++) {
-                act(() => {
+                await act(async () => {
                     stdin.write(TerminalKeys.ENTER);
                 });
+                await waitUntilReady();
             }
             await waitFor(() => {
                 expect(vi.mocked(saveModifiedSettings).mock.calls.length).toBeGreaterThan(0);
@@ -688,14 +749,16 @@ describe('SettingsDialog', () => {
         it('should handle rapid key presses gracefully', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { stdin, unmount } = renderDialog(settings, onSelect);
+            const { stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Rapid navigation
-            act(() => {
+            await act(async () => {
                 for (let i = 0; i < 5; i++) {
                     stdin.write(TerminalKeys.DOWN_ARROW);
                     stdin.write(TerminalKeys.UP_ARROW);
                 }
             });
+            await waitUntilReady();
             // Should not crash
             unmount();
         });
@@ -705,28 +768,36 @@ describe('SettingsDialog', () => {
         ])('should handle $key to reset current setting to default', async ({ code }) => {
             const settings = createMockSettings({ vimMode: true });
             const onSelect = vi.fn();
-            const { stdin, unmount } = renderDialog(settings, onSelect);
-            act(() => {
+            const { stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write(code);
             });
+            await waitUntilReady();
             // Should reset the current setting to its default value
             unmount();
         });
         it('should handle navigation when only one setting exists', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { stdin, unmount } = renderDialog(settings, onSelect);
+            const { stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Try to navigate when potentially at bounds
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.DOWN_ARROW);
+            });
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write(TerminalKeys.UP_ARROW);
             });
+            await waitUntilReady();
             unmount();
         });
         it('should properly handle Tab navigation between sections', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { lastFrame, unmount } = renderDialog(settings, onSelect);
+            const { lastFrame, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Wait for initial render
             await waitFor(() => {
                 expect(lastFrame()).toContain('Vim Mode');
@@ -740,7 +811,7 @@ describe('SettingsDialog', () => {
         });
     });
     describe('Error Recovery', () => {
-        it('should handle malformed settings gracefully', () => {
+        it('should handle malformed settings gracefully', async () => {
             // Create settings with potentially problematic values
             const settings = createMockSettings({
                 user: {
@@ -750,23 +821,28 @@ describe('SettingsDialog', () => {
                 },
             });
             const onSelect = vi.fn();
-            const { lastFrame } = renderDialog(settings, onSelect);
+            const { lastFrame, waitUntilReady, unmount } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Should still render without crashing
             expect(lastFrame()).toContain('Settings');
+            unmount();
         });
-        it('should handle missing setting definitions gracefully', () => {
+        it('should handle missing setting definitions gracefully', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
             // Should not crash even if some settings are missing definitions
-            const { lastFrame } = renderDialog(settings, onSelect);
+            const { lastFrame, waitUntilReady, unmount } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             expect(lastFrame()).toContain('Settings');
+            unmount();
         });
     });
     describe('Complex User Interactions', () => {
         it('should handle complete user workflow: navigate, toggle, change scope, exit', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { lastFrame, unmount } = renderDialog(settings, onSelect);
+            const { lastFrame, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Wait for initial render
             await waitFor(() => {
                 expect(lastFrame()).toContain('Vim Mode');
@@ -785,15 +861,29 @@ describe('SettingsDialog', () => {
         it('should allow changing multiple settings without losing pending changes', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { stdin, unmount } = renderDialog(settings, onSelect);
+            const { stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Toggle multiple settings
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.ENTER); // Enter
+            });
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write(TerminalKeys.DOWN_ARROW); // Down
+            });
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write(TerminalKeys.ENTER); // Enter
+            });
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write(TerminalKeys.DOWN_ARROW); // Down
+            });
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write(TerminalKeys.ENTER); // Enter
             });
+            await waitUntilReady();
             // The test verifies that all changes are preserved and the dialog still works
             // This tests the fix for the bug where changing one setting would reset all pending changes
             unmount();
@@ -801,28 +891,44 @@ describe('SettingsDialog', () => {
         it('should maintain state consistency during complex interactions', async () => {
             const settings = createMockSettings({ vimMode: true });
             const onSelect = vi.fn();
-            const { stdin, unmount } = renderDialog(settings, onSelect);
+            const { stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Multiple scope changes
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.TAB); // Tab to scope
+            });
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write('2'); // Workspace
+            });
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write(TerminalKeys.TAB); // Tab to settings
+            });
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write(TerminalKeys.TAB); // Tab to scope
+            });
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write('1'); // User
             });
+            await waitUntilReady();
             // Should maintain consistent state
             unmount();
         });
         it('should handle restart workflow correctly', async () => {
             const settings = createMockSettings();
             const onRestartRequest = vi.fn();
-            const { stdin, unmount } = renderDialog(settings, vi.fn(), {
+            const { stdin, unmount, waitUntilReady } = renderDialog(settings, vi.fn(), {
                 onRestartRequest,
             });
+            await waitUntilReady();
             // This would test the restart workflow if we could trigger it
-            act(() => {
+            await act(async () => {
                 stdin.write('r'); // Try restart key
             });
+            await waitUntilReady();
             // Without restart prompt showing, this should have no effect
             expect(onRestartRequest).not.toHaveBeenCalled();
             unmount();
@@ -833,28 +939,32 @@ describe('SettingsDialog', () => {
             vi.mocked(getSettingsSchema).mockReturnValue(TOOLS_SHELL_FAKE_SCHEMA);
             const settings = createMockSettings();
             const onRestartRequest = vi.fn();
-            const { stdin, lastFrame, unmount } = renderDialog(settings, vi.fn(), {
+            const { stdin, lastFrame, unmount, waitUntilReady } = renderDialog(settings, vi.fn(), {
                 onRestartRequest,
             });
+            await waitUntilReady();
             // Wait for initial render
             await waitFor(() => expect(lastFrame()).toContain('Show Color'));
             // Navigate to "Enable Interactive Shell" (second item in TOOLS_SHELL_FAKE_SCHEMA)
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.DOWN_ARROW);
             });
+            await waitUntilReady();
             // Wait for navigation to complete
             await waitFor(() => expect(lastFrame()).toContain('● Enable Interactive Shell'));
             // Toggle it to trigger restart required
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.ENTER);
             });
+            await waitUntilReady();
             await waitFor(() => {
                 expect(lastFrame()).toContain('To see changes, Gemini CLI must be restarted');
             });
             // Press 'r' - it should call onRestartRequest, NOT be handled by search
-            act(() => {
+            await act(async () => {
                 stdin.write('r');
             });
+            await waitUntilReady();
             await waitFor(() => {
                 expect(onRestartRequest).toHaveBeenCalled();
             });
@@ -863,17 +973,20 @@ describe('SettingsDialog', () => {
         it('should hide search box when showRestartPrompt is true', async () => {
             vi.mocked(getSettingsSchema).mockReturnValue(TOOLS_SHELL_FAKE_SCHEMA);
             const settings = createMockSettings();
-            const { stdin, lastFrame, unmount } = renderDialog(settings, vi.fn());
+            const { stdin, lastFrame, unmount, waitUntilReady } = renderDialog(settings, vi.fn());
+            await waitUntilReady();
             // Search box should be visible initially (searchPlaceholder)
             expect(lastFrame()).toContain('Search to filter');
             // Navigate to "Enable Interactive Shell" and toggle it
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.DOWN_ARROW);
             });
+            await waitUntilReady();
             await waitFor(() => expect(lastFrame()).toContain('● Enable Interactive Shell'));
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.ENTER);
             });
+            await waitUntilReady();
             await waitFor(() => {
                 expect(lastFrame()).toContain('To see changes, Gemini CLI must be restarted');
             });
@@ -884,33 +997,51 @@ describe('SettingsDialog', () => {
     });
     describe('String Settings Editing', () => {
         it('should allow editing and committing a string setting', async () => {
-            let settings = createMockSettings({ 'a.string.setting': 'initial' });
+            let settings = createMockSettings({
+                'general.sessionCleanup.maxAge': 'initial',
+            });
             const onSelect = vi.fn();
-            const { stdin, unmount, rerender } = render(_jsx(KeypressProvider, { children: _jsx(SettingsDialog, { settings: settings, onSelect: onSelect }) }));
-            // Navigate to the last setting
-            act(() => {
-                for (let i = 0; i < 20; i++) {
-                    stdin.write('j'); // Down
-                }
+            const { stdin, unmount, rerender, waitUntilReady } = render(_jsx(KeypressProvider, { children: _jsx(SettingsDialog, { settings: settings, onSelect: onSelect }) }));
+            await waitUntilReady();
+            // Search for 'chat history' to filter the list
+            await act(async () => {
+                stdin.write('chat history');
+            });
+            await waitUntilReady();
+            // Press Down Arrow to focus the list
+            await act(async () => {
+                stdin.write(TerminalKeys.DOWN_ARROW);
             });
+            await waitUntilReady();
             // Press Enter to start editing, type new value, and commit
-            act(() => {
+            await act(async () => {
                 stdin.write('\r'); // Start editing
+            });
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write('new value');
+            });
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write('\r'); // Commit
             });
+            await waitUntilReady();
             settings = createMockSettings({
                 user: {
-                    settings: { 'a.string.setting': 'new value' },
-                    originalSettings: { 'a.string.setting': 'new value' },
+                    settings: { 'general.sessionCleanup.maxAge': 'new value' },
+                    originalSettings: { 'general.sessionCleanup.maxAge': 'new value' },
                     path: '',
                 },
             });
-            rerender(_jsx(KeypressProvider, { children: _jsx(SettingsDialog, { settings: settings, onSelect: onSelect }) }));
+            await act(async () => {
+                rerender(_jsx(KeypressProvider, { children: _jsx(SettingsDialog, { settings: settings, onSelect: onSelect }) }));
+            });
+            await waitUntilReady();
             // Press Escape to exit
-            act(() => {
+            await act(async () => {
                 stdin.write('\u001B');
             });
+            await waitUntilReady();
             await waitFor(() => {
                 expect(onSelect).toHaveBeenCalledWith(undefined, 'User');
             });
@@ -921,16 +1052,18 @@ describe('SettingsDialog', () => {
         it('should display text entered in search', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { lastFrame, stdin, unmount } = renderDialog(settings, onSelect);
+            const { lastFrame, stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Wait for initial render and verify that search is not active
             await waitFor(() => {
                 expect(lastFrame()).not.toContain('> Search:');
             });
             expect(lastFrame()).toContain('Search to filter');
             // Press '/' to enter search mode
-            act(() => {
+            await act(async () => {
                 stdin.write('/');
             });
+            await waitUntilReady();
             await waitFor(() => {
                 expect(lastFrame()).toContain('/');
                 expect(lastFrame()).not.toContain('Search to filter');
@@ -940,10 +1073,12 @@ describe('SettingsDialog', () => {
         it('should show search query and filter settings as user types', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { lastFrame, stdin, unmount } = renderDialog(settings, onSelect);
-            act(() => {
+            const { lastFrame, stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write('yolo');
             });
+            await waitUntilReady();
             await waitFor(() => {
                 expect(lastFrame()).toContain('yolo');
                 expect(lastFrame()).toContain('Disable YOLO Mode');
@@ -953,17 +1088,20 @@ describe('SettingsDialog', () => {
         it('should exit search settings when Escape is pressed', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { lastFrame, stdin, unmount } = renderDialog(settings, onSelect);
-            act(() => {
+            const { lastFrame, stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write('vim');
             });
+            await waitUntilReady();
             await waitFor(() => {
                 expect(lastFrame()).toContain('vim');
             });
             // Press Escape
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.ESCAPE);
             });
+            await waitUntilReady();
             await waitFor(() => {
                 // onSelect is called with (settingName, scope).
                 // undefined settingName means "close dialog"
@@ -974,17 +1112,20 @@ describe('SettingsDialog', () => {
         it('should handle backspace to modify search query', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { lastFrame, stdin, unmount } = renderDialog(settings, onSelect);
-            act(() => {
+            const { lastFrame, stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
+            await act(async () => {
                 stdin.write('vimm');
             });
+            await waitUntilReady();
             await waitFor(() => {
                 expect(lastFrame()).toContain('vimm');
             });
             // Press backspace
-            act(() => {
+            await act(async () => {
                 stdin.write(TerminalKeys.BACKSPACE);
             });
+            await waitUntilReady();
             await waitFor(() => {
                 expect(lastFrame()).toContain('vim');
                 expect(lastFrame()).toContain('Vim Mode');
@@ -995,14 +1136,15 @@ describe('SettingsDialog', () => {
         it('should display nothing when search yields no results', async () => {
             const settings = createMockSettings();
             const onSelect = vi.fn();
-            const { lastFrame, stdin, unmount } = renderDialog(settings, onSelect);
+            const { lastFrame, stdin, unmount, waitUntilReady } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             // Type a search query that won't match any settings
-            act(() => {
+            await act(async () => {
                 stdin.write('nonexistentsetting');
             });
+            await waitUntilReady();
             await waitFor(() => {
                 expect(lastFrame()).toContain('nonexistentsetting');
-                expect(lastFrame()).toContain('');
                 expect(lastFrame()).not.toContain('Vim Mode'); // Should not contain any settings
                 expect(lastFrame()).not.toContain('Enable Auto Update'); // Should not contain any settings
             });
@@ -1030,7 +1172,6 @@ describe('SettingsDialog', () => {
                         vimMode: true,
                         enableAutoUpdate: false,
                         debugKeystrokeLogging: true,
-                        enablePromptCompletion: true,
                     },
                     ui: {
                         hideWindowTitle: true,
@@ -1100,10 +1241,11 @@ describe('SettingsDialog', () => {
                 userSettings: {},
                 systemSettings: {},
                 workspaceSettings: {},
-                stdinActions: (stdin) => {
-                    act(() => {
+                stdinActions: async (stdin, waitUntilReady) => {
+                    await act(async () => {
                         stdin.write('\t');
                     });
+                    await waitUntilReady();
                 },
             },
             {
@@ -1172,7 +1314,6 @@ describe('SettingsDialog', () => {
                         vimMode: false,
                         enableAutoUpdate: true,
                         debugKeystrokeLogging: false,
-                        enablePromptCompletion: false,
                     },
                     ui: {
                         hideWindowTitle: false,
@@ -1211,7 +1352,7 @@ describe('SettingsDialog', () => {
                 workspaceSettings: {},
                 stdinActions: undefined,
             },
-        ])('should render $name correctly', ({ userSettings, systemSettings, workspaceSettings, stdinActions }) => {
+        ])('should render $name correctly', async ({ userSettings, systemSettings, workspaceSettings, stdinActions, }) => {
             const settings = createMockSettings({
                 user: {
                     settings: userSettings,
@@ -1230,11 +1371,13 @@ describe('SettingsDialog', () => {
                 },
             });
             const onSelect = vi.fn();
-            const { lastFrame, stdin } = renderDialog(settings, onSelect);
+            const { lastFrame, stdin, waitUntilReady, unmount } = renderDialog(settings, onSelect);
+            await waitUntilReady();
             if (stdinActions) {
-                stdinActions(stdin);
+                await stdinActions(stdin, waitUntilReady);
             }
             expect(lastFrame()).toMatchSnapshot();
+            unmount();
         });
     });
 });