@google/gemini-cli 0.12.0-preview.4 → 0.13.0-nightly.20251031.c89bc30d

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

@@ -5,6 +5,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * SPDX-License-Identifier: Apache-2.0
  */
 import { renderWithProviders } from '../../test-utils/render.js';
+import { waitFor } from '../../test-utils/async.js';
 import { act } from 'react';
 import { InputPrompt } from './InputPrompt.js';
 import { ApprovalMode } from '@google/gemini-cli-core';
@@ -213,7 +214,7 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\u001B[A');
         });
-        await vi.waitFor(() => expect(mockShellHistory.getPreviousCommand).toHaveBeenCalled());
+        await waitFor(() => expect(mockShellHistory.getPreviousCommand).toHaveBeenCalled());
         unmount();
     });
     it('should call shellHistory.getNextCommand on down arrow in shell mode', async () => {
@@ -221,8 +222,8 @@ describe('InputPrompt', () => {
         const { stdin, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }));
         await act(async () => {
             stdin.write('\u001B[B');
+            await waitFor(() => expect(mockShellHistory.getNextCommand).toHaveBeenCalled());
         });
-        await vi.waitFor(() => expect(mockShellHistory.getNextCommand).toHaveBeenCalled());
         unmount();
     });
     it('should set the buffer text when a shell history command is retrieved', async () => {
@@ -232,7 +233,7 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\u001B[A');
         });
-        await vi.waitFor(() => {
+        await waitFor(() => {
             expect(mockShellHistory.getPreviousCommand).toHaveBeenCalled();
             expect(props.buffer.setText).toHaveBeenCalledWith('previous command');
         });
@@ -245,7 +246,7 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\r');
         });
-        await vi.waitFor(() => {
+        await waitFor(() => {
             expect(mockShellHistory.addCommandToHistory).toHaveBeenCalledWith('ls -l');
             expect(props.onSubmit).toHaveBeenCalledWith('ls -l');
         });
@@ -257,15 +258,15 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\u001B[A'); // Up arrow
         });
-        await vi.waitFor(() => expect(mockInputHistory.navigateUp).toHaveBeenCalled());
+        await waitFor(() => expect(mockInputHistory.navigateUp).toHaveBeenCalled());
         await act(async () => {
             stdin.write('\u001B[B'); // Down arrow
         });
-        await vi.waitFor(() => expect(mockInputHistory.navigateDown).toHaveBeenCalled());
+        await waitFor(() => expect(mockInputHistory.navigateDown).toHaveBeenCalled());
         await act(async () => {
             stdin.write('\r'); // Enter
         });
-        await vi.waitFor(() => expect(props.onSubmit).toHaveBeenCalledWith('some text'));
+        await waitFor(() => expect(props.onSubmit).toHaveBeenCalledWith('some text'));
         expect(mockShellHistory.getPreviousCommand).not.toHaveBeenCalled();
         expect(mockShellHistory.getNextCommand).not.toHaveBeenCalled();
         expect(mockShellHistory.addCommandToHistory).not.toHaveBeenCalled();
@@ -286,11 +287,11 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\u001B[A'); // Up arrow
         });
-        await vi.waitFor(() => expect(mockCommandCompletion.navigateUp).toHaveBeenCalledTimes(1));
+        await waitFor(() => expect(mockCommandCompletion.navigateUp).toHaveBeenCalledTimes(1));
         await act(async () => {
             stdin.write('\u0010'); // Ctrl+P
         });
-        await vi.waitFor(() => expect(mockCommandCompletion.navigateUp).toHaveBeenCalledTimes(2));
+        await waitFor(() => expect(mockCommandCompletion.navigateUp).toHaveBeenCalledTimes(2));
         expect(mockCommandCompletion.navigateDown).not.toHaveBeenCalled();
         unmount();
     });
@@ -309,11 +310,11 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\u001B[B'); // Down arrow
         });
-        await vi.waitFor(() => expect(mockCommandCompletion.navigateDown).toHaveBeenCalledTimes(1));
+        await waitFor(() => expect(mockCommandCompletion.navigateDown).toHaveBeenCalledTimes(1));
         await act(async () => {
             stdin.write('\u000E'); // Ctrl+N
         });
-        await vi.waitFor(() => expect(mockCommandCompletion.navigateDown).toHaveBeenCalledTimes(2));
+        await waitFor(() => expect(mockCommandCompletion.navigateDown).toHaveBeenCalledTimes(2));
         expect(mockCommandCompletion.navigateUp).not.toHaveBeenCalled();
         unmount();
     });
@@ -327,21 +328,21 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\u001B[A'); // Up arrow
         });
-        await vi.waitFor(() => expect(mockInputHistory.navigateUp).toHaveBeenCalled());
+        await waitFor(() => expect(mockInputHistory.navigateUp).toHaveBeenCalled());
         await act(async () => {
             stdin.write('\u001B[B'); // Down arrow
         });
-        await vi.waitFor(() => expect(mockInputHistory.navigateDown).toHaveBeenCalled());
+        await waitFor(() => expect(mockInputHistory.navigateDown).toHaveBeenCalled());
         await act(async () => {
             stdin.write('\u0010'); // Ctrl+P
         });
-        await vi.waitFor(() => { });
         await act(async () => {
             stdin.write('\u000E'); // Ctrl+N
         });
-        await vi.waitFor(() => { });
-        expect(mockCommandCompletion.navigateUp).not.toHaveBeenCalled();
-        expect(mockCommandCompletion.navigateDown).not.toHaveBeenCalled();
+        await waitFor(() => {
+            expect(mockCommandCompletion.navigateUp).not.toHaveBeenCalled();
+            expect(mockCommandCompletion.navigateDown).not.toHaveBeenCalled();
+        });
         unmount();
     });
     describe('clipboard image paste', () => {
@@ -358,7 +359,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x16'); // Ctrl+V
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(clipboardUtils.clipboardHasImage).toHaveBeenCalled();
                 expect(clipboardUtils.saveClipboardImage).toHaveBeenCalledWith(props.config.getTargetDir());
                 expect(clipboardUtils.cleanupOldClipboardImages).toHaveBeenCalledWith(props.config.getTargetDir());
@@ -372,7 +373,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x16'); // Ctrl+V
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(clipboardUtils.clipboardHasImage).toHaveBeenCalled();
             });
             expect(clipboardUtils.saveClipboardImage).not.toHaveBeenCalled();
@@ -386,7 +387,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x16'); // Ctrl+V
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(clipboardUtils.saveClipboardImage).toHaveBeenCalled();
             });
             expect(mockBuffer.setText).not.toHaveBeenCalled();
@@ -405,7 +406,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x16'); // Ctrl+V
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 // Should insert at cursor position with spaces
                 expect(mockBuffer.replaceRangeByOffset).toHaveBeenCalled();
             });
@@ -426,7 +427,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x16'); // Ctrl+V
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(consoleErrorSpy).toHaveBeenCalledWith('Error handling clipboard image:', expect.any(Error));
             });
             expect(mockBuffer.setText).not.toHaveBeenCalled();
@@ -447,7 +448,7 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\t'); // Press Tab
         });
-        await vi.waitFor(() => expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(0));
+        await waitFor(() => expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(0));
         unmount();
     });
     it('should append a sub-command when the parent command is already complete', async () => {
@@ -466,7 +467,7 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\t'); // Press Tab
         });
-        await vi.waitFor(() => expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(1));
+        await waitFor(() => expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(1));
         unmount();
     });
     it('should handle the "backspace" edge case correctly', async () => {
@@ -486,7 +487,7 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\t'); // Press Tab
         });
-        await vi.waitFor(() => 
+        await waitFor(() => 
         // It should NOT become '/show'. It should correctly become '/memory show'.
         expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(0));
         unmount();
@@ -504,7 +505,7 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\t'); // Press Tab
         });
-        await vi.waitFor(() => expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(0));
+        await waitFor(() => expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(0));
         unmount();
     });
     it('should autocomplete on Enter when suggestions are active, without submitting', async () => {
@@ -519,7 +520,7 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\r');
         });
-        await vi.waitFor(() => {
+        await waitFor(() => {
             // The app should autocomplete the text, NOT submit.
             expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(0);
         });
@@ -546,7 +547,7 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\t'); // Press Tab for autocomplete
         });
-        await vi.waitFor(() => expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(0));
+        await waitFor(() => expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(0));
         unmount();
     });
     it('should not submit on Enter when the buffer is empty or only contains whitespace', async () => {
@@ -555,8 +556,9 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\r'); // Press Enter
         });
-        await vi.waitFor(() => { });
-        expect(props.onSubmit).not.toHaveBeenCalled();
+        await waitFor(() => {
+            expect(props.onSubmit).not.toHaveBeenCalled();
+        });
         unmount();
     });
     it('should submit directly on Enter when isPerfectMatch is true', async () => {
@@ -570,7 +572,7 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\r');
         });
-        await vi.waitFor(() => expect(props.onSubmit).toHaveBeenCalledWith('/clear'));
+        await waitFor(() => expect(props.onSubmit).toHaveBeenCalledWith('/clear'));
         unmount();
     });
     it('should submit directly on Enter when a complete leaf command is typed', async () => {
@@ -584,7 +586,7 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\r');
         });
-        await vi.waitFor(() => expect(props.onSubmit).toHaveBeenCalledWith('/clear'));
+        await waitFor(() => expect(props.onSubmit).toHaveBeenCalledWith('/clear'));
         unmount();
     });
     it('should autocomplete an @-path on Enter without submitting', async () => {
@@ -599,7 +601,7 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\r');
         });
-        await vi.waitFor(() => expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(0));
+        await waitFor(() => expect(mockCommandCompletion.handleAutocomplete).toHaveBeenCalledWith(0));
         expect(props.onSubmit).not.toHaveBeenCalled();
         unmount();
     });
@@ -612,7 +614,7 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\r');
         });
-        await vi.waitFor(() => {
+        await waitFor(() => {
             expect(props.buffer.backspace).toHaveBeenCalled();
             expect(props.buffer.newline).toHaveBeenCalled();
         });
@@ -620,12 +622,14 @@ describe('InputPrompt', () => {
         unmount();
     });
     it('should clear the buffer on Ctrl+C if it has text', async () => {
-        props.buffer.setText('some text to clear');
+        await act(async () => {
+            props.buffer.setText('some text to clear');
+        });
         const { stdin, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }));
         await act(async () => {
             stdin.write('\x03'); // Ctrl+C character
         });
-        await vi.waitFor(() => {
+        await waitFor(() => {
             expect(props.buffer.setText).toHaveBeenCalledWith('');
             expect(mockCommandCompletion.resetCompletionState).toHaveBeenCalled();
         });
@@ -638,8 +642,9 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('\x03'); // Ctrl+C character
         });
-        await vi.waitFor(() => { });
-        expect(props.buffer.setText).not.toHaveBeenCalled();
+        await waitFor(() => {
+            expect(props.buffer.setText).not.toHaveBeenCalled();
+        });
         unmount();
     });
     describe('cursor-based completion trigger', () => {
@@ -734,7 +739,7 @@ describe('InputPrompt', () => {
                     : [],
             });
             const { unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }));
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(mockedUseCommandCompletion).toHaveBeenCalledWith(mockBuffer, ['/test/project/src'], path.join('test', 'project', 'src'), mockSlashCommands, mockCommandContext, false, false, expect.any(Object));
             });
             unmount();
@@ -747,7 +752,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('i');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(props.vimHandleInput).toHaveBeenCalled();
             });
             expect(mockBuffer.handleInput).not.toHaveBeenCalled();
@@ -759,7 +764,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('i');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(props.vimHandleInput).toHaveBeenCalled();
                 expect(mockBuffer.handleInput).toHaveBeenCalled();
             });
@@ -772,7 +777,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('i');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(props.vimHandleInput).toHaveBeenCalled();
                 expect(mockBuffer.handleInput).toHaveBeenCalled();
             });
@@ -786,7 +791,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x1B[200~pasted text\x1B[201~');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(mockBuffer.handleInput).toHaveBeenCalledWith(expect.objectContaining({
                     paste: true,
                     sequence: 'pasted text',
@@ -800,7 +805,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('a');
             });
-            await vi.waitFor(() => { });
+            await waitFor(() => { });
             expect(mockBuffer.handleInput).not.toHaveBeenCalled();
             unmount();
         });
@@ -862,7 +867,7 @@ describe('InputPrompt', () => {
                 mockBuffer.viewportVisualLines = [text];
                 mockBuffer.visualCursor = visualCursor;
                 const { stdout, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }));
-                await vi.waitFor(() => {
+                await waitFor(() => {
                     const frame = stdout.lastFrame();
                     expect(frame).toContain(expected);
                 });
@@ -909,7 +914,7 @@ describe('InputPrompt', () => {
                 mockBuffer.visualCursor = visualCursor;
                 mockBuffer.visualToLogicalMap = visualToLogicalMap;
                 const { stdout, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }));
-                await vi.waitFor(() => {
+                await waitFor(() => {
                     const frame = stdout.lastFrame();
                     expect(frame).toContain(expected);
                 });
@@ -927,7 +932,7 @@ describe('InputPrompt', () => {
                     [2, 0],
                 ];
                 const { stdout, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }));
-                await vi.waitFor(() => {
+                await waitFor(() => {
                     const frame = stdout.lastFrame();
                     const lines = frame.split('\n');
                     // The line with the cursor should just be an inverted space inside the box border
@@ -952,7 +957,7 @@ describe('InputPrompt', () => {
                 [2, 0], // 'world' is logical line 2, col 0
             ];
             const { stdout, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }));
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 const frame = stdout.lastFrame();
                 // Check that all lines, including the empty one, are rendered.
                 // This implicitly tests that the Box wrapper provides height for the empty line.
@@ -985,7 +990,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write(`\x1b[200~${pastedText}\x1b[201~`);
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 // Verify that the buffer's handleInput was called once with the full text
                 expect(props.buffer.handleInput).toHaveBeenCalledTimes(1);
                 expect(props.buffer.handleInput).toHaveBeenCalledWith(expect.objectContaining({
@@ -1012,7 +1017,9 @@ describe('InputPrompt', () => {
             // isTerminalPasteTrusted will be false due to beforeEach setup.
             props.buffer.text = 'some command';
             const { stdin, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }));
-            await vi.runAllTimersAsync();
+            await act(async () => {
+                await vi.runAllTimersAsync();
+            });
             // Simulate a paste operation (this should set the paste protection)
             await act(async () => {
                 stdin.write(`\x1b[200~pasted content\x1b[201~`);
@@ -1021,7 +1028,9 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\r');
             });
-            await vi.runAllTimersAsync();
+            await act(async () => {
+                await vi.runAllTimersAsync();
+            });
             // Verify that onSubmit was NOT called due to recent paste protection
             expect(props.onSubmit).not.toHaveBeenCalled();
             // It should call newline() instead
@@ -1032,12 +1041,16 @@ describe('InputPrompt', () => {
             // isTerminalPasteTrusted will be false due to beforeEach setup.
             props.buffer.text = 'pasted text';
             const { stdin, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }));
-            await vi.runAllTimersAsync();
+            await act(async () => {
+                await vi.runAllTimersAsync();
+            });
             // Simulate a paste operation (this sets the protection)
             await act(async () => {
                 stdin.write('\x1b[200~pasted text\x1b[201~');
             });
-            await vi.runAllTimersAsync();
+            await act(async () => {
+                await vi.runAllTimersAsync();
+            });
             // Advance timers past the protection timeout
             await act(async () => {
                 await vi.advanceTimersByTimeAsync(50);
@@ -1046,7 +1059,9 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\r');
             });
-            await vi.runAllTimersAsync();
+            await act(async () => {
+                await vi.runAllTimersAsync();
+            });
             expect(props.onSubmit).toHaveBeenCalledWith('pasted text');
             expect(props.buffer.newline).not.toHaveBeenCalled();
             unmount();
@@ -1064,17 +1079,23 @@ describe('InputPrompt', () => {
             setup();
             props.buffer.text = 'pasted command';
             const { stdin, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }), { kittyProtocolEnabled: true });
-            await vi.runAllTimersAsync();
+            await act(async () => {
+                await vi.runAllTimersAsync();
+            });
             // Simulate a paste operation
             await act(async () => {
                 stdin.write('\x1b[200~some pasted stuff\x1b[201~');
             });
-            await vi.runAllTimersAsync();
+            await act(async () => {
+                await vi.runAllTimersAsync();
+            });
             // Simulate an Enter key press immediately after paste
             await act(async () => {
                 stdin.write('\r');
             });
-            await vi.runAllTimersAsync();
+            await act(async () => {
+                await vi.runAllTimersAsync();
+            });
             // Verify that onSubmit was called
             expect(props.onSubmit).toHaveBeenCalledWith('pasted command');
             unmount();
@@ -1083,12 +1104,16 @@ describe('InputPrompt', () => {
             // Set up buffer with text before rendering to ensure submission works
             props.buffer.text = 'normal command';
             const { stdin, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }));
-            await vi.runAllTimersAsync();
+            await act(async () => {
+                await vi.runAllTimersAsync();
+            });
             // Press Enter without any recent paste
             await act(async () => {
                 stdin.write('\r');
             });
-            await vi.runAllTimersAsync();
+            await act(async () => {
+                await vi.runAllTimersAsync();
+            });
             // Verify that onSubmit was called normally
             expect(props.onSubmit).toHaveBeenCalledWith('normal command');
             unmount();
@@ -1102,16 +1127,16 @@ describe('InputPrompt', () => {
             const { stdin, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }), { kittyProtocolEnabled: false });
             await act(async () => {
                 stdin.write('\x1B');
-            });
-            await vi.waitFor(() => {
-                expect(onEscapePromptChange).toHaveBeenCalledWith(true);
+                await waitFor(() => {
+                    expect(onEscapePromptChange).toHaveBeenCalledWith(false);
+                });
             });
             await act(async () => {
                 stdin.write('\x1B');
-            });
-            await vi.waitFor(() => {
-                expect(props.buffer.setText).toHaveBeenCalledWith('');
-                expect(mockCommandCompletion.resetCompletionState).toHaveBeenCalled();
+                await waitFor(() => {
+                    expect(props.buffer.setText).toHaveBeenCalledWith('');
+                    expect(mockCommandCompletion.resetCompletionState).toHaveBeenCalled();
+                });
             });
             unmount();
         });
@@ -1122,15 +1147,15 @@ describe('InputPrompt', () => {
             const { stdin, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }), { kittyProtocolEnabled: false });
             await act(async () => {
                 stdin.write('\x1B');
-            });
-            await vi.waitFor(() => {
-                expect(onEscapePromptChange).toHaveBeenCalledWith(true);
+                await waitFor(() => {
+                    expect(onEscapePromptChange).toHaveBeenCalledWith(false);
+                });
             });
             await act(async () => {
                 stdin.write('a');
-            });
-            await vi.waitFor(() => {
-                expect(onEscapePromptChange).toHaveBeenCalledWith(false);
+                await waitFor(() => {
+                    expect(onEscapePromptChange).toHaveBeenCalledWith(false);
+                });
             });
             unmount();
         });
@@ -1139,8 +1164,8 @@ describe('InputPrompt', () => {
             const { stdin, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }), { kittyProtocolEnabled: false });
             await act(async () => {
                 stdin.write('\x1B');
+                await waitFor(() => expect(props.setShellModeActive).toHaveBeenCalledWith(false));
             });
-            await vi.waitFor(() => expect(props.setShellModeActive).toHaveBeenCalledWith(false));
             unmount();
         });
         it('should handle ESC when completion suggestions are showing', async () => {
@@ -1153,7 +1178,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x1B');
             });
-            await vi.waitFor(() => expect(mockCommandCompletion.resetCompletionState).toHaveBeenCalled());
+            await waitFor(() => expect(mockCommandCompletion.resetCompletionState).toHaveBeenCalled());
             unmount();
         });
         it('should not call onEscapePromptChange when not provided', async () => {
@@ -1161,11 +1186,15 @@ describe('InputPrompt', () => {
             props.onEscapePromptChange = undefined;
             props.buffer.setText('some text');
             const { stdin, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }), { kittyProtocolEnabled: false });
-            await vi.runAllTimersAsync();
+            await act(async () => {
+                await vi.runAllTimersAsync();
+            });
             await act(async () => {
                 stdin.write('\x1B');
             });
-            await vi.runAllTimersAsync();
+            await act(async () => {
+                await vi.runAllTimersAsync();
+            });
             vi.useRealTimers();
             unmount();
         });
@@ -1174,11 +1203,11 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x0C');
             });
-            await vi.waitFor(() => expect(props.onClearScreen).toHaveBeenCalled());
+            await waitFor(() => expect(props.onClearScreen).toHaveBeenCalled());
             await act(async () => {
                 stdin.write('\x01');
             });
-            await vi.waitFor(() => expect(props.buffer.move).toHaveBeenCalledWith('home'));
+            await waitFor(() => expect(props.buffer.move).toHaveBeenCalledWith('home'));
             unmount();
         });
     });
@@ -1210,7 +1239,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x12');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 const frame = stdout.lastFrame();
                 expect(frame).toContain('(r:)');
                 expect(frame).toContain('echo hello');
@@ -1224,17 +1253,16 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x12');
             });
-            await vi.waitFor(() => { });
             await act(async () => {
                 stdin.write('\x1B');
             });
             await act(async () => {
                 stdin.write('\u001b[27u'); // Press kitty escape key
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(stdout.lastFrame()).not.toContain('(r:)');
+                expect(stdout.lastFrame()).not.toContain('echo hello');
             });
-            expect(stdout.lastFrame()).not.toContain('echo hello');
             unmount();
         });
         it('completes the highlighted entry on Tab and exits reverse-search', async () => {
@@ -1261,14 +1289,14 @@ describe('InputPrompt', () => {
                 stdin.write('\x12');
             });
             // Verify reverse search is active
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(stdout.lastFrame()).toContain('(r:)');
             });
             // Press Tab to complete the highlighted entry
             await act(async () => {
                 stdin.write('\t');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(mockHandleAutocomplete).toHaveBeenCalledWith(0);
                 expect(props.buffer.setText).toHaveBeenCalledWith('echo hello');
             });
@@ -1290,13 +1318,13 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x12');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(stdout.lastFrame()).toContain('(r:)');
             });
             await act(async () => {
                 stdin.write('\r');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(stdout.lastFrame()).not.toContain('(r:)');
             });
             expect(props.onSubmit).toHaveBeenCalledWith('echo hello');
@@ -1320,14 +1348,14 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x12');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(stdout.lastFrame()).toContain('(r:)');
             });
             // Press kitty escape key
             await act(async () => {
                 stdin.write('\u001b[27u');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(stdout.lastFrame()).not.toContain('(r:)');
                 expect(props.buffer.text).toBe(initialText);
                 expect(props.buffer.cursor).toEqual(initialCursor);
@@ -1344,7 +1372,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x05'); // Ctrl+E
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(props.buffer.move).toHaveBeenCalledWith('end');
             });
             expect(props.buffer.moveToOffset).not.toHaveBeenCalled();
@@ -1358,7 +1386,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x05'); // Ctrl+E
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(props.buffer.move).toHaveBeenCalledWith('end');
             });
             expect(props.buffer.moveToOffset).not.toHaveBeenCalled();
@@ -1383,7 +1411,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x12'); // Ctrl+R
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 const frame = stdout.lastFrame() ?? '';
                 expect(frame).toContain('(r:)');
                 expect(frame).toContain('git commit');
@@ -1406,20 +1434,20 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x12');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(clean(stdout.lastFrame())).toContain('→');
             });
             await act(async () => {
                 stdin.write('\u001B[C');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(clean(stdout.lastFrame())).toContain('←');
             });
             expect(stdout.lastFrame()).toMatchSnapshot('command-search-render-expanded-match');
             await act(async () => {
                 stdin.write('\u001B[D');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(clean(stdout.lastFrame())).toContain('→');
             });
             expect(stdout.lastFrame()).toMatchSnapshot('command-search-render-collapsed-match');
@@ -1442,13 +1470,13 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x12');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(stdout.lastFrame()).toMatchSnapshot('command-search-render-collapsed-match');
             });
             await act(async () => {
                 stdin.write('\u001B[C');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(stdout.lastFrame()).toMatchSnapshot('command-search-render-expanded-match');
             });
             unmount();
@@ -1468,7 +1496,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\x12');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 const frame = clean(stdout.lastFrame());
                 // Ensure it rendered the search mode
                 expect(frame).toContain('(r:)');
@@ -1487,7 +1515,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\u001B[A');
             });
-            await vi.waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
+            await waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
             const callback = mockPopAllMessages.mock.calls[0][0];
             await act(async () => {
                 callback('Message 1\n\nMessage 2\n\nMessage 3');
@@ -1503,7 +1531,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\u001B[A');
             });
-            await vi.waitFor(() => expect(mockInputHistory.navigateUp).toHaveBeenCalled());
+            await waitFor(() => expect(mockInputHistory.navigateUp).toHaveBeenCalled());
             expect(mockPopAllMessages).not.toHaveBeenCalled();
             unmount();
         });
@@ -1515,7 +1543,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\u001B[A');
             });
-            await vi.waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
+            await waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
             const callback = mockPopAllMessages.mock.calls[0][0];
             await act(async () => {
                 callback(undefined);
@@ -1535,7 +1563,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\u001B[A');
             });
-            await vi.waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
+            await waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
             unmount();
         });
         it('should handle single queued message', async () => {
@@ -1546,7 +1574,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\u001B[A');
             });
-            await vi.waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
+            await waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
             const callback = mockPopAllMessages.mock.calls[0][0];
             await act(async () => {
                 callback('Single message');
@@ -1562,7 +1590,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\u001B[A');
             });
-            await vi.waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
+            await waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
             unmount();
         });
         it('should not call popAllMessages if it is not provided', async () => {
@@ -1572,7 +1600,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\u001B[A');
             });
-            await vi.waitFor(() => expect(mockInputHistory.navigateUp).toHaveBeenCalled());
+            await waitFor(() => expect(mockInputHistory.navigateUp).toHaveBeenCalled());
             unmount();
         });
         it('should navigate input history on fresh start when no queued messages exist', async () => {
@@ -1583,7 +1611,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\u001B[A');
             });
-            await vi.waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
+            await waitFor(() => expect(mockPopAllMessages).toHaveBeenCalled());
             const callback = mockPopAllMessages.mock.calls[0][0];
             await act(async () => {
                 callback(undefined);
@@ -1597,26 +1625,26 @@ describe('InputPrompt', () => {
         it('should render correctly in shell mode', async () => {
             props.shellModeActive = true;
             const { stdout, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }));
-            await vi.waitFor(() => expect(stdout.lastFrame()).toMatchSnapshot());
+            await waitFor(() => expect(stdout.lastFrame()).toMatchSnapshot());
             unmount();
         });
         it('should render correctly when accepting edits', async () => {
             props.approvalMode = ApprovalMode.AUTO_EDIT;
             const { stdout, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }));
-            await vi.waitFor(() => expect(stdout.lastFrame()).toMatchSnapshot());
+            await waitFor(() => expect(stdout.lastFrame()).toMatchSnapshot());
             unmount();
         });
         it('should render correctly in yolo mode', async () => {
             props.approvalMode = ApprovalMode.YOLO;
             const { stdout, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }));
-            await vi.waitFor(() => expect(stdout.lastFrame()).toMatchSnapshot());
+            await waitFor(() => expect(stdout.lastFrame()).toMatchSnapshot());
             unmount();
         });
         it('should not show inverted cursor when shell is focused', async () => {
             props.isEmbeddedShellFocused = true;
             props.focus = false;
             const { stdout, unmount } = renderWithProviders(_jsx(InputPrompt, { ...props }));
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 expect(stdout.lastFrame()).not.toContain(`{chalk.inverse(' ')}`);
                 // This snapshot is good to make sure there was an input prompt but does
                 // not show the inverted cursor because snapshots do not show colors.
@@ -1632,7 +1660,7 @@ describe('InputPrompt', () => {
         await act(async () => {
             stdin.write('a');
         });
-        await vi.waitFor(() => expect(mockBuffer.handleInput).toHaveBeenCalled());
+        await waitFor(() => expect(mockBuffer.handleInput).toHaveBeenCalled());
         unmount();
     });
     describe('command queuing while streaming', () => {
@@ -1670,7 +1698,7 @@ describe('InputPrompt', () => {
             await act(async () => {
                 stdin.write('\r');
             });
-            await vi.waitFor(() => {
+            await waitFor(() => {
                 if (shouldSubmit) {
                     expect(props.onSubmit).toHaveBeenCalledWith(bufferText);
                     expect(props.setQueueErrorMessage).not.toHaveBeenCalled();