feat(cli): update undo/redo keybindings to Cmd+Z/Alt+Z and Shift+Cmd+Z/Shift+Alt+Z by scidomino · Pull Request #17800 · google-gemini/gemini-cli

scidomino · 2026-01-28T19:03:30Z

Summary

This PR updates the keyboard shortcuts for Undo and Redo in the Gemini CLI. The new shortcuts are:

Undo: Cmd + Z or Alt/Opt + Z
Redo: Shift + Cmd + Z or Shift + Alt/Opt + Z

Details

We need to free up Ctrl+z for suspending.

Also: Increase warning toast from 1s to 3s.

Related Issues

References #5018

How to Validate

Run the CLI: npm start
Type some text in the prompt.
Press Cmd + Z or Alt + Z to undo.
Press Shift + Cmd + Z or Alt + Shift + Z to redo.
Verify that the actions are performed correctly and the UI remains responsive.
Run unit tests: npm test -w @google/gemini-cli -- src/ui/keyMatchers.test.ts

Pre-Merge Checklist

gemini-code-assist · 2026-01-28T19:03:49Z

Summary of Changes

Hello @scidomino, 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 introduces a significant update to the Gemini CLI's Undo and Redo keyboard shortcuts. By transitioning from Ctrl+Z to Cmd+Z/Alt+Z for Undo and Shift+Cmd+Z/Shift+Alt+Z for Redo, the CLI now offers a more intuitive and consistent editing experience, particularly for macOS users, while also resolving conflicts with standard terminal job control commands.

Highlights

Keybinding Update: Changed Undo/Redo shortcuts to Cmd+Z/Alt+Z and Shift+Cmd+Z/Shift+Alt+Z respectively.
macOS Standard Alignment: Aligns CLI editing with standard macOS keyboard conventions.
Conflict Resolution: Addresses issues where the previous Ctrl+Z binding conflicted with terminal job control.
Alt Key Handling: Enhanced MAC_ALT_KEY_CHARACTER_MAP to correctly interpret macOS-specific character sequences for Alt+Z and Shift+Alt+Z.
Documentation & Tests: Updated user documentation and unit tests to reflect the new keybindings.

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.

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-01-28T19:05:54Z

Size Change: +433 B (0%)

Total Size: 23.5 MB

ℹ️ View Unchanged

Filename	Size	Change
`./bundle/gemini.js`	23.5 MB	+433 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}

gemini-code-assist

Code Review

This pull request successfully updates the undo/redo keybindings to be more idiomatic for macOS users (Cmd+Z/Alt+Z), while also resolving the common terminal conflict with Ctrl+Z. The changes are comprehensive, covering not only the keybinding configuration but also the necessary low-level keypress handling for special Alt key characters on macOS. The documentation, user-facing tips, and tests have all been updated consistently. The refactoring in KeypressContext.tsx to handle complex key combinations with modifiers is a solid improvement. Overall, this is a well-executed enhancement.

jacob314

Can we add showing a Toast when users press ctrl-Z or ctrl-shift-z as part of this PR?
That way existing users won't be confused. Make the toasts like the one shown for ctrl-C but probably tweak the timing so it shows for a couple seconds. All the toasts currently show for a bit too short a time.

jacob314 · 2026-01-28T22:05:57Z

docs/cli/commands.md

 - **Undo:**
-  - **Keyboard shortcut:** Press **Ctrl+z** to undo the last action in the input
-    prompt.
+  - **Keyboard shortcut:** Press **Cmd+z** or **Alt+z** to undo the last action


Nit: mention that Alt-Z is not supported on mac.

Eh. I figured, on mac they call it the "opt" key instead of "alt".

jacob314 · 2026-01-28T22:08:23Z

packages/cli/src/ui/AppContainer.tsx

        setShowErrorDetails((prev) => !prev);
        return true;
+      } else if (keyMatchers[Command.SUSPEND_APP](key)) {
+        handleWarning('Undo has been moved to Cmd + Z or Alt/Opt + Z');


Nit: show a consistent message for redo.

Actually, instead I will just contrinue to support ctrl+shift+Z

jacob314

…Z/Shift+Alt+Z

…Z/Shift+Alt+Z (google-gemini#17800)

gemini-code-assist bot reviewed Jan 28, 2026

View reviewed changes

scidomino marked this pull request as ready for review January 28, 2026 19:07

scidomino requested review from a team as code owners January 28, 2026 19:07

gemini-cli bot added priority/p2 Important but can be addressed in a future release. 🔒 maintainer only ⛔ Do not contribute. Internal roadmap item. help wanted We will accept PRs from all issues marked as "help wanted". Thanks for your support! labels Jan 28, 2026

scidomino mentioned this pull request Jan 28, 2026

feat(cli): support Ctrl-Z suspension #17630

Closed

18 tasks

jacob314 self-requested a review January 28, 2026 19:54

jacob314 reviewed Jan 28, 2026

View reviewed changes

sehoon38 approved these changes Jan 28, 2026

View reviewed changes

scidomino force-pushed the tomm_undoredo branch 3 times, most recently from 0255db3 to 80fd057 Compare January 28, 2026 22:02

jacob314 reviewed Jan 28, 2026

View reviewed changes

jacob314 approved these changes Jan 28, 2026

View reviewed changes

scidomino force-pushed the tomm_undoredo branch from 80fd057 to fadb5ef Compare January 28, 2026 22:12

scidomino enabled auto-merge January 28, 2026 22:12

feat(cli): update undo/redo keybindings to Cmd+Z/Alt+Z and Shift+Cmd+…

9749494

…Z/Shift+Alt+Z

scidomino force-pushed the tomm_undoredo branch from fadb5ef to 9749494 Compare January 28, 2026 22:28

scidomino added this pull request to the merge queue Jan 28, 2026

Merged via the queue into main with commit 553ae3a Jan 28, 2026
25 checks passed

scidomino deleted the tomm_undoredo branch January 28, 2026 23:06

sidwan02 pushed a commit to sidwan02/gemini-cli-gemma that referenced this pull request Feb 6, 2026

feat(cli): update undo/redo keybindings to Cmd+Z/Alt+Z and Shift+Cmd+…

6d6ee7e

…Z/Shift+Alt+Z (google-gemini#17800)

kuishou68 pushed a commit to iOfficeAI/aioncli that referenced this pull request Feb 27, 2026

feat(cli): update undo/redo keybindings to Cmd+Z/Alt+Z and Shift+Cmd+…

a25b328

…Z/Shift+Alt+Z (google-gemini#17800)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(cli): update undo/redo keybindings to Cmd+Z/Alt+Z and Shift+Cmd+Z/Shift+Alt+Z#17800

feat(cli): update undo/redo keybindings to Cmd+Z/Alt+Z and Shift+Cmd+Z/Shift+Alt+Z#17800
scidomino merged 1 commit intomainfrom
tomm_undoredo

scidomino commented Jan 28, 2026 •

edited

Loading

Uh oh!

gemini-code-assist bot commented Jan 28, 2026

Uh oh!

github-actions bot commented Jan 28, 2026 •

edited

Loading

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

jacob314 left a comment

Uh oh!

jacob314 Jan 28, 2026

Uh oh!

scidomino Jan 28, 2026

Uh oh!

jacob314 Jan 28, 2026

Uh oh!

scidomino Jan 28, 2026

Uh oh!

jacob314 left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

scidomino commented Jan 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Details

Related Issues

How to Validate

Pre-Merge Checklist

Uh oh!

gemini-code-assist bot commented Jan 28, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

github-actions bot commented Jan 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

jacob314 left a comment

Choose a reason for hiding this comment

Uh oh!

jacob314 Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

scidomino Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

jacob314 Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

scidomino Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

jacob314 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

scidomino commented Jan 28, 2026 •

edited

Loading

github-actions bot commented Jan 28, 2026 •

edited

Loading