Skip to content

fix(cli): fix enabling kitty codes on Windows Terminal#21136

Merged
scidomino merged 1 commit intomainfrom
tomm_win
Mar 5, 2026
Merged

fix(cli): fix enabling kitty codes on Windows Terminal#21136
scidomino merged 1 commit intomainfrom
tomm_win

Conversation

@scidomino
Copy link
Copy Markdown
Collaborator

@scidomino scidomino commented Mar 4, 2026

Summary

fix enabling kitty codes on Windows Terminal

Details

We used to enable kitty mode before starting up ink but this leads to issues in Windows Terminal. This is because enabling alternate Buffer mode seems to reset the kitty code state on Windows Terminal.

Related Issues

Fixes #20882

How to Validate

Run Windows Terminal Canary (version 1.25+) and verify that shift+enter works.

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
    • Windows
      • npm run
      • npx
      • Docker
    • Linux
      • npm run
      • npx
      • Docker

@scidomino scidomino changed the title feat(cli): enable Kitty keyboard protocol and modifyOtherKeys fix(cli): fix enabling kitty codes on Windows Terminal Mar 4, 2026
@github-actions
Copy link
Copy Markdown

github-actions bot commented Mar 4, 2026

Size Change: +129 B (0%)

Total Size: 25.9 MB

ℹ️ View Unchanged
Filename Size Change
./bundle/gemini.js 25.5 MB +129 B (0%)
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js 221 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js 227 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js 11.5 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js 132 B 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-open.sb 3.36 kB 0 B
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB 0 B
./bundle/sandbox-macos-strict-open.sb 4.82 kB 0 B
./bundle/sandbox-macos-strict-proxied.sb 5.02 kB 0 B

compressed-size-action

@scidomino scidomino marked this pull request as ready for review March 4, 2026 19:00
@scidomino scidomino requested a review from a team as a code owner March 4, 2026 19:00
@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! 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 an issue where Kitty keyboard protocol codes were not consistently enabled in Windows Terminal, particularly after the terminal entered alternate buffer mode. The fix re-sequences the activation of terminal capabilities, moving the enableSupportedModes() call to a point where it can correctly re-assert these settings, thereby restoring functionality like shift+enter.

Highlights

  • Reordered Kitty Code Activation: The activation of Kitty keyboard protocol and other supported terminal modes was moved from the TerminalCapabilityManager's initial detection phase to the KeypressProvider's useEffect hook. This ensures these modes are re-enabled after the terminal's alternate buffer mode might reset them, specifically addressing issues in Windows Terminal.
  • Enhanced Debugging for Terminal Capabilities: Debug logging statements were added to terminalCapabilityManager.ts to provide clearer insights into when the Kitty keyboard protocol or modifyOtherKeys are being enabled, which will assist in diagnosing terminal-related issues.
  • Aligned Test Behavior: Existing unit tests for TerminalCapabilityManager were updated to reflect the new timing of enableSupportedModes() calls, ensuring tests accurately validate the corrected activation flow.
Changelog
  • packages/cli/src/ui/contexts/KeypressContext.tsx
    • Moved the call to terminalCapabilityManager.enableSupportedModes() into the useEffect hook.
  • packages/cli/src/ui/utils/terminalCapabilityManager.test.ts
    • Added manager.enableSupportedModes() calls in several test cases to align with the new activation timing.
  • packages/cli/src/ui/utils/terminalCapabilityManager.ts
    • Removed the this.enableSupportedModes() call from the detectCapabilities resolution.
    • Added debugLogger.log statements when enabling Kitty keyboard protocol or modifyOtherKeys.
Activity
  • No specific activity (comments, reviews, or progress updates) has been recorded for this pull request yet.
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.

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request addresses an issue with enabling Kitty protocol support on Windows Terminal by deferring the operation until after the Ink UI has initialized. The approach of decoupling capability detection from enabling the modes is sound. However, this change introduces a potential race condition where the modes could be enabled before terminal capability detection is complete. I have added a critical review comment detailing this issue and proposing a refactoring that aligns with repository guidelines for managing asynchronous state to ensure the operation is robust and executes in the correct order.

@gemini-cli gemini-cli bot added priority/p2 Important but can be addressed in a future release. 🔒 maintainer only ⛔ Do not contribute. Internal roadmap item. labels Mar 4, 2026
Copy link
Copy Markdown
Contributor

@jacob314 jacob314 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Works on my windows terminal

@scidomino scidomino added this pull request to the merge queue Mar 5, 2026
Merged via the queue into main with commit ddafd79 Mar 5, 2026
32 checks passed
@scidomino scidomino deleted the tomm_win branch March 5, 2026 15:55
struckoff pushed a commit to struckoff/gemini-cli that referenced this pull request Mar 6, 2026
kunal-10-cloud pushed a commit to kunal-10-cloud/gemini-cli that referenced this pull request Mar 12, 2026
liamhelmer pushed a commit to badal-io/gemini-cli that referenced this pull request Mar 12, 2026
yashodipmore pushed a commit to yashodipmore/geemi-cli that referenced this pull request Mar 21, 2026
SUNDRAM07 pushed a commit to SUNDRAM07/gemini-cli that referenced this pull request Mar 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🔒 maintainer only ⛔ Do not contribute. Internal roadmap item. priority/p2 Important but can be addressed in a future release.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Kitty support for Windows Terminal

2 participants