fix(cli): correct 'esc to cancel' position and restore duration display

[NTaylorMullen]

Summary

Corrected the position of the "esc to cancel" hint and restored the duration display in the CLI UI. This fixes a regression where the cancel hint appeared above the thinking subject and the elapsed time was hidden.

Details

• Regression introduced in PR Add shortcuts hint and panel for discoverability #18035.
• Refactored Composer.tsx to remove manual rendering of "esc to cancel" which was causing alignment issues.
• Re-enabled showCancelAndTimer in LoadingIndicator to use its native, correctly aligned display for cancel hints and elapsed time.
• Cleaned up unused Text and theme imports in Composer.tsx.

Related Issues

N/A (User reported)

How to Validate

1. Run npm run start.
2. Enter a prompt that takes time to respond.
3. Observe that "esc to cancel" and the duration (e.g., "5s") appear on the same line as the loading phrase/thought subject.

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

[gemini-code-assist]

Summary of Changes

Hello @NTaylorMullen, 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 resolves a user experience issue in the CLI where the 'esc to cancel' prompt was displayed incorrectly and the duration of an operation was not visible. The changes involve refactoring the Composer component to integrate these UI elements directly into the LoadingIndicator, ensuring they are rendered consistently and correctly.

Highlights

• UX Regression Fix: Addresses a user experience regression where the 'esc to cancel' hint was incorrectly positioned and the duration display was missing.
• Refactored Composer Component: The Composer component has been refactored to delegate the rendering of the 'esc to cancel' hint and duration display to the native LoadingIndicator component.
• Dependency Cleanup: Removed unused Text component import from ink and the theme import, indicating a cleaner component structure.

Changelog

• packages/cli/src/ui/components/Composer.tsx
  • Removed the Text import from the ink library as it is no longer directly used in this component.
  • Eliminated the theme import, suggesting that styling for the removed elements is now handled internally by LoadingIndicator or is no longer needed.
  • Removed the explicit showEscToCancelHint logic and its associated Box and Text rendering, transferring this responsibility to the LoadingIndicator.
  • Removed the showCancelAndTimer={false} prop from the LoadingIndicator component, allowing it to manage the display of the cancel hint and timer internally.

Activity

• NTaylorMullen created this pull request with the title "fix(cli): correct 'esc to cancel' position and restore duration display".
• The pull request description indicates its purpose is to fix a UX regression regarding the 'esc to cancel' hint position and missing duration, by refactoring the Composer to use LoadingIndicator for these elements.

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-code-assist]

Code Review

This pull request addresses a UX regression by refactoring how the "esc to cancel" hint and duration are displayed during loading states. The changes correctly move this display logic from the Composer component into the LoadingIndicator component, which is a more appropriate location. This is achieved by removing the explicit showCancelAndTimer={false} prop from the LoadingIndicator instance in Composer, allowing it to use its default behavior. The related state and rendering logic for the hint in Composer have been cleanly removed, along with unused imports. The changes are well-contained and effectively fix the described issue while improving code organization.

[github-actions]

Size Change: -428 B (0%)

Total Size: 23.8 MB

ℹ️ View Unchanged

Filename	Size	Change
./bundle/gemini.js	23.8 MB	-428 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}

[LyalinDotCom]

This was on my list to fix this weekend thanks for getting it done @NTaylorMullen

[LyalinDotCom]

(not a code review) but tested via

npx github:google-gemini/gemini-cli#ntm/fix-esc-cancel-ux

Looks good! I will be adding a feature to hide the string "? for shortcuts" when agent is running so combined it will give even more space for the progress indicator to run