fix(cli): fix history navigation regression after prompt autocomplete

[sehoon38]

Summary

Fixes a regression in history navigation where the Up Arrow key would skip the most recently submitted command. This was introduced by the autocomplete polish (#18181).

Details

The autocomplete PR refactored InputPrompt.tsx to call a local handleSubmitAndClear directly on submission. This bypassed the useInputHistory hook's handleSubmit method, which is responsible for resetting the internal historyIndex. As a result, if a user submitted a command while at a specific history index, that index persisted, causing the next Up Arrow press to navigate from the wrong starting point.

This fix refactors InputPrompt.tsx to:

1. Reorder the handleSubmit definition to appear after the inputHistory hook initialization.
2. Update handleSubmit to call inputHistory.handleSubmit(trimmedMessage).
3. Update the SUBMIT_REVERSE_SEARCH handler to call inputHistory.handleSubmit(textToSubmit).
4. Update the useInputHistory mock in tests to ensure it correctly invokes the onSubmit callback.

Related Issues

Fixes #18754.
Related to #18181.

How to Validate

1. Open Gemini CLI.
2. Enter a command and submit it.
3. Press Up Arrow. The command just entered should appear.
4. Enter another command, cancel it (Ctrl+C), then re-submit it.
5. Press Up Arrow. The re-submitted command should appear.

Pre-Merge Checklist

• Updated relevant documentation and README (if needed)
• Added/updated tests (if needed)
• Noted breaking changes (if any)
• Validated on required platforms/methods:
  • MacOS
    • npm run
    • npx
    • Docker
    • Podman
    • Seatbelt

[gemini-code-assist]

Summary of Changes

Hello @sehoon38, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a critical regression in the CLI's history navigation, specifically preventing the Up Arrow key from skipping the last submitted command. The changes refactor the input submission flow to correctly interact with the history management hook, ensuring a consistent and expected user experience when recalling previous commands.

Highlights

• History Navigation Fix: Resolved a regression where the Up Arrow key would skip the most recently submitted command, which was introduced by a previous autocomplete polish.
• InputPrompt Refactoring: Reordered the handleSubmit definition in InputPrompt.tsx to appear after the useInputHistory hook initialization, ensuring proper history index management.
• Updated Submission Logic: Modified the handleSubmit method and the SUBMIT_REVERSE_SEARCH handler to correctly call inputHistory.handleSubmit(trimmedMessage).
• Test Suite Enhancement: Updated the useInputHistory mock in InputPrompt.test.tsx to ensure it accurately invokes the onSubmit callback during testing.

Changelog

• packages/cli/src/ui/components/InputPrompt.test.tsx
  • Updated the mock implementation of useInputHistory to correctly invoke the onSubmit callback when handleSubmit is called.
  • Modified an existing useInputHistory mock to include onSubmit and ensure handleSubmit properly calls it.
• packages/cli/src/ui/components/InputPrompt.tsx
  • Reordered the handleSubmit definition to appear after the useInputHistory hook initialization.
  • Updated the handleSubmit logic to call inputHistory.handleSubmit instead of handleSubmitAndClear.
  • Modified the SUBMIT_REVERSE_SEARCH handler to use inputHistory.handleSubmit for command submission.
  • Removed handleSubmitAndClear from the component's dependency list.

Activity

• The regression was identified as being introduced by the autocomplete polish (ux(polish) autocomplete in the input prompt #18181).
• Tests were added/updated to cover the fix.
• Validation was performed on MacOS using npm run.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	/gemini review	Performs a code review for the current pull request in its current state.
Pull Request Summary	/gemini summary	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	/gemini help	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

[gemini-cli]

Hi @sehoon38, thank you so much for your contribution to Gemini CLI! We really appreciate the time and effort you've put into this.

We're making some updates to our contribution process to improve how we track and review changes. Please take a moment to review our recent discussion post: Improving Our Contribution Process & Introducing New Guidelines.

Key Update: Starting January 26, 2026, the Gemini CLI project will require all pull requests to be associated with an existing issue. Any pull requests not linked to an issue by that date will be automatically closed.

Thank you for your understanding and for being a part of our community!

[gemini-code-assist]

Code Review

This pull request effectively addresses the history navigation regression by correctly integrating the useInputHistory hook's handleSubmit method into the InputPrompt component's submission flow. The refactoring ensures that the internal historyIndex is properly reset, resolving the issue where the Up Arrow key would skip the most recently submitted command. The accompanying test updates accurately reflect the intended behavior of the useInputHistory mock, significantly improving the reliability and correctness of the test suite.

[github-actions]

Size Change: -71 B (0%)

Total Size: 23.9 MB

ℹ️ View Unchanged

Filename	Size	Change
./bundle/gemini.js	23.9 MB	-71 B (0%)
./bundle/sandbox-macos-permissive-closed.sb	1.03 kB	0 B
./bundle/sandbox-macos-permissive-open.sb	890 B	0 B
./bundle/sandbox-macos-permissive-proxied.sb	1.31 kB	0 B
./bundle/sandbox-macos-restrictive-closed.sb	3.29 kB	0 B
./bundle/sandbox-macos-restrictive-open.sb	3.36 kB	0 B
./bundle/sandbox-macos-restrictive-proxied.sb	3.56 kB	0 B

_{compressed-size-action}