fix(cli): resolve hang on Enter keypress in interactive mode (#23297) by elberthc-byte · Pull Request #29476 · google-gemini/gemini-cli

elberthc-byte · 2026-09-24T06:13:19Z

Summary

Fixes an issue where pressing Enter on tool confirmation prompts (such as file edit approvals) appears unresponsive when running Gemini CLI in an integrated terminal with IDE companion integration enabled (#23297).

This pull request decouples user confirmation event publication from IDE diff closing side-effects so that slow, delayed, or interrupted IDE companion connections cannot block MessageBus event dispatch or freeze interactive terminal input.

Details

Problem

When an edit tool requests user confirmation, ToolActionsContext.tsx was sequentially awaiting ideClient.resolveDiffFromCli(details.filePath, cliOutcome) before publishing TOOL_CONFIRMATION_RESPONSE to the MessageBus.

If the IDE companion connection experienced latency, socket disconnects, or header timeouts (UND_ERR_HEADERS_TIMEOUT), the 10-minute timeout on closeDiff or an unhandled rejection permanently blocked the confirmation dispatch. Because the scheduler never received the user's confirmation response, the CLI remained waiting on the approval prompt. Keyboard navigation (Up/Down arrow keys) still updated local UI state, but pressing Enter had no effect.

Implementation Logic (Surgical Fix)

Decoupled Confirmation Dispatch (packages/cli/src/ui/contexts/ToolActionsContext.tsx):
- Dispatches resolveDiffFromCli() asynchronously in the background using optional chaining and .catch(...) logging.
- Publishes TOOL_CONFIRMATION_RESPONSE to MessageBus immediately upon pressing Enter, allowing the scheduler to advance and dismiss the prompt instantly.
Fast Timeout for Closing Diffs (packages/core/src/ide/constants.ts & ide-client.ts):
- Configured IDE_CLOSE_DIFF_TIMEOUT_MS = 5000 (5 seconds) specifically for closeDiff operations, preserving the 10-minute IDE_REQUEST_TIMEOUT_MS for human review during openDiff.
- Safely claims and deletes the resolver in resolveDiffFromCli() before executing closeDiff to prevent tab-close notifications from racing with CLI approvals.
- Wrapped closeDiff in a try/catch block to guarantee resolver cleanup even if the IDE companion connection aborts or times out.

Related Issues

Fixes #23297
Related to #24830

How to Validate

1. Automated Tests

Run the updated unit test suites in both packages/cli and packages/core:

# Verify non-blocking confirmation and rejection resilience in CLI
npm test -w @google/gemini-cli -- src/ui/contexts/ToolActionsContext.test.tsx

# Verify fast closeDiff timeout and error cleanup in core
npm test -w @google/gemini-cli-core -- src/ide/ide-client.test.ts

Expected output: All 37 tests pass (10 in CLI, 27 in core).

2. Full Workspace Build Verification

Clean and rebuild workspace packages:

npm run clean && npm run build

Expected output: Clean build completion across all packages and devtools client bundling without errors.

3. Manual Interactive Verification

Launch Gemini CLI in an IDE integrated terminal with IDE mode active (/ide enable).
Trigger an edit tool confirmation prompt (e.g. prompt Gemini to edit a file).
With the diff open in the editor, press Enter on "Allow once".
Expected: The prompt confirms immediately, dismisses from the terminal UI, and tool execution proceeds without delay.

Pre-Merge Checklist

…gemini#23297)

gemini-code-assist · 2026-09-24T06:13:30Z

Summary of Changes

Hello, 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 UI hang in the Gemini CLI where pressing 'Enter' on confirmation prompts would become unresponsive due to synchronous waiting on IDE companion operations. By decoupling the confirmation event dispatch from the IDE diff closing process and implementing stricter, more resilient timeout handling, the CLI now remains responsive even when the IDE connection experiences latency or timeouts.

Highlights

Decoupled Confirmation Logic: The CLI now dispatches confirmation responses to the MessageBus immediately, preventing IDE companion latency from freezing the interactive terminal input.
Optimized Timeout Configuration: Introduced a dedicated 5-second timeout for closing diffs to ensure responsive UI behavior while maintaining longer timeouts for human-in-the-loop operations.
Improved Error Resilience: Added robust error handling and cleanup logic in the IDE client to ensure diff resolvers are properly cleared even if connection issues occur.

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 the 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 counterproductive. 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.

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. ↩

github-actions · 2026-09-24T06:13:33Z

📊 PR Size: size/M

Lines changed: 149
Additions: +139
Deletions: -10
Files changed: 5

elberthc-byte · 2026-09-24T06:14:35Z

/gemini review

gemini-code-assist

Code Review

This pull request improves the robustness of the resolveDiffFromCli method by introducing a dedicated timeout (IDE_CLOSE_DIFF_TIMEOUT_MS) and adding error handling to prevent closeDiff failures from blocking the UI or message bus. Corresponding unit tests were added to verify that hanging or failing closeDiff calls are handled gracefully. I have no feedback to provide.

gemini-code-assist

Code Review

This pull request improves the robustness of the IDE diff resolution process by preventing hanging or failing resolveDiffFromCli calls from blocking the CLI's message bus or tool confirmation flow. Specifically, resolveDiffFromCli is now called asynchronously and safely caught in ToolActionsProvider, the timeout for closing a diff has been reduced from 10 minutes to 5 seconds, and errors during closeDiff are caught and logged rather than throwing. Corresponding unit tests have been added to verify these non-blocking behaviors. I have no feedback to provide as there are no review comments to evaluate.

github-actions · 2026-09-24T18:45:24Z

🛑 Action Required: Evaluation Approval

Steering changes have been detected in this PR. To prevent regressions, a maintainer must approve the evaluation run before this PR can be merged.

Maintainers:

Go to the Workflow Run Summary.
Click the yellow 'Review deployments' button.
Select the 'eval-gate' environment and click 'Approve'.

Once approved, the evaluation results will be posted here automatically.

elberthc-byte · 2026-09-24T18:51:24Z

/gemini review

gemini-code-assist

Code Review

This pull request improves the robustness of IDE diffing interactions by preventing hangs and unblocking the message bus when IDE client operations delay or fail. Key changes include wrapping IDE confirmation promises in races with timeouts, dynamically fetching the IdeClient instance, and handling errors gracefully during diff closure. Feedback on these changes highlights two critical issues: a potential resource leak where a setTimeout is not cleared after a Promise.race settles, and a concurrency bug in ide-client.ts where registering resolvers before acquiring the mutex can overwrite queued diffs on the same file path.

elberthc-byte · 2026-09-24T18:58:48Z

/gemini review

gemini-code-assist

Code Review

This pull request ensures that diff resolution in the IDE client does not block or fail the main application flow. In ToolActionsProvider, resolveDiffFromCli is now called asynchronously without being awaited, with errors caught and logged. In IdeClient, the timeout for closing a diff is reduced to 5 seconds, and resolveDiffFromCli wraps closeDiff in a try-catch block to guarantee that the resolver is cleaned up and resolved even on failure. Comprehensive unit tests have been added to verify these robustness improvements. I have no feedback to provide as there are no review comments to evaluate.

gemini-cli · 2026-10-02T01:55:01Z

Hi there! Thank you for your interest in contributing to Gemini CLI.

To ensure we maintain high code quality and focus on our prioritized roadmap, we only guarantee review and consideration of pull requests for issues that are explicitly labeled as 'help wanted'.

This PR will be closed in 7 days if it remains without that designation. We encourage you to find and contribute to existing 'help wanted' issues in our backlog! Thank you for your understanding.

fix(cli): resolve hang on Enter keypress in interactive mode (google-…

5029d88

…gemini#23297)

elberthc-byte requested a review from a team as a code owner September 24, 2026 06:13

github-actions Bot added the size/m A medium sized PR label Sep 24, 2026

gemini-code-assist Bot reviewed Sep 24, 2026

View reviewed changes

gemini-cli Bot added priority/p1 Important and should be addressed in the near term. area/core Issues related to User Interface, OS Support, Core Functionality labels Sep 24, 2026

elberthc-byte force-pushed the issue-23297-fix branch from 5029d88 to 7fe54ed Compare September 24, 2026 18:44

elberthc-byte requested a review from a team as a code owner September 24, 2026 18:44

github-actions Bot added the size/l A large sized PR label Sep 24, 2026

elberthc-byte had a problem deploying to eval-gate September 24, 2026 18:45 — with GitHub Actions Error

gemini-code-assist Bot reviewed Sep 24, 2026

View reviewed changes

Comment thread packages/cli/src/ui/contexts/ToolActionsContext.tsx Outdated

Comment thread packages/core/src/ide/ide-client.ts Outdated

elberthc-byte requested a deployment to eval-gate September 24, 2026 18:55 — with GitHub Actions Waiting

elberthc-byte force-pushed the issue-23297-fix branch from 106124f to 5029d88 Compare September 24, 2026 18:55

gemini-code-assist Bot reviewed Sep 24, 2026

View reviewed changes

Merge branch 'main' into issue-23297-fix

0e94aa9

github-actions Bot mentioned this pull request Sep 24, 2026

📊 AI CLI 工具社区动态日报 2026-09-25 litang9/big_model_radar#448

Open

elberthc-byte added 2 commits September 25, 2026 08:37

Merge branch 'main' into issue-23297-fix

273952f

Merge branch 'main' into issue-23297-fix

44bb292

DavidAPierce approved these changes Sep 25, 2026

View reviewed changes

elberthc-byte added 2 commits September 25, 2026 19:11

Fix lint issues

93c760d

Merge branch 'main' into issue-23297-fix

72a2ebc

github-actions Bot mentioned this pull request Sep 25, 2026

📊 AI CLI 工具社区动态日报 2026-09-26 litang9/big_model_radar#453

Open

Merge branch 'main' into issue-23297-fix

6c73af7

github-actions Bot mentioned this pull request Sep 29, 2026

📊 AI CLI 工具社区动态日报 2026-09-29 litang9/big_model_radar#468

Open

gemini-cli Bot added the status/pr-nudge-sent label Oct 2, 2026

Navigation Menu

Repository navigation

fix(cli): resolve hang on Enter keypress in interactive mode (#23297) - #29476

fix(cli): resolve hang on Enter keypress in interactive mode (#23297)#29476
elberthc-byte wants to merge 7 commits into
google-gemini:mainfrom
elberthc-byte:issue-23297-fix

elberthc-byte commented Sep 24, 2026 •

edited

Loading

Uh oh!

gemini-code-assist Bot commented Sep 24, 2026

Uh oh!

github-actions Bot commented Sep 24, 2026 •

edited

Loading

Uh oh!

elberthc-byte commented Sep 24, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

github-actions Bot commented Sep 24, 2026 •

edited

Loading

Uh oh!

elberthc-byte commented Sep 24, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

Uh oh!

Uh oh!

elberthc-byte commented Sep 24, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

gemini-cli Bot commented Oct 2, 2026

Uh oh!

This branch is waiting to be deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

elberthc-byte commented Sep 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Details

Problem

Implementation Logic (Surgical Fix)

Related Issues

How to Validate

1. Automated Tests

2. Full Workspace Build Verification

3. Manual Interactive Verification

Pre-Merge Checklist

Uh oh!

gemini-code-assist Bot commented Sep 24, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

github-actions Bot commented Sep 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

elberthc-byte commented Sep 24, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

github-actions Bot commented Sep 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🛑 Action Required: Evaluation Approval

Uh oh!

elberthc-byte commented Sep 24, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

elberthc-byte commented Sep 24, 2026

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-cli Bot commented Oct 2, 2026

Uh oh!

This branch is waiting to be deployed

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

elberthc-byte commented Sep 24, 2026 •

edited

Loading

github-actions Bot commented Sep 24, 2026 •

edited

Loading

github-actions Bot commented Sep 24, 2026 •

edited

Loading