fix(patch): cherry-pick addb57c to release/v0.26.0-preview.2-pr-17331 [CONFLICTS]

[gemini-cli-robot]

This PR automatically cherry-picks commit addb57c to patch version v0.26.0-preview.2 in the preview release to create version 0.26.0-preview.3.

⚠️ Merge Conflicts Detected

This cherry-pick resulted in merge conflicts that need manual resolution.

🔧 Next Steps:

1. Review the conflicts: Check out this branch and review the conflict markers
2. Resolve conflicts: Edit the affected files to resolve the conflicts
3. Test the changes: Ensure the patch works correctly after resolution
4. Update this PR: Push your conflict resolution

📋 Files with conflicts:

The commit has been created with conflict markers for easier manual resolution.

🚨 Important:

• Do not merge this PR until conflicts are resolved
• The automated patch release will trigger once this PR is merged

[gemini-code-assist]

Summary of Changes

Hello @gemini-cli-robot, 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 attempts to backport a critical fix related to keypress handling in the CLI, specifically ensuring that a 'return' keypress is correctly interpreted as a newline rather than a submission. Due to merge conflicts encountered during the automated cherry-pick process, manual intervention is required to resolve these conflicts before the fix can be integrated into the v0.26.0-preview.2 release, which will then create v0.26.0-preview.3.

Highlights

• Automated Cherry-Pick: This pull request is an automated cherry-pick of commit addb57c31f4ce92d959522a81208bed164e8ddfc to backport a fix to the v0.26.0-preview.2 release branch.
• Merge Conflicts Detected: The automated cherry-pick process resulted in merge conflicts, requiring manual resolution before this PR can be merged.
• Keypress Handling Fix: The original commit addb57c aimed to correctly emit the newline type for 'return' keypresses by explicitly setting modifier keys (shift, alt, ctrl, cmd) to ensure it's treated as a newline rather than a submission.

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 appears to be an attempt to resolve merge conflicts from a cherry-pick, but it contains unresolved merge conflict markers in packages/cli/src/ui/contexts/KeypressContext.test.tsx. These markers will break the build and must be removed. Additionally, both the implementation in KeypressContext.tsx and the corresponding test are attempting to use alt and cmd properties on the Key type, which are not defined. The alt modifier should be handled via the meta property, and cmd is not a supported modifier. I've provided critical feedback with suggestions to fix these issues.

[gemini-code-assist]

This file contains unresolved merge conflict markers which will cause syntax errors. Additionally, the properties alt and cmd are not part of the Key type and will cause the test to fail. The alt modifier should be checked via the meta property, and cmd is not a valid property on the Key type.

          shift: true,
          ctrl: false,
          meta: false,

[gemini-code-assist]

The Key type does not have alt or cmd properties. The alt modifier is represented by the meta property, and the cmd property is not supported on the Key type. Using these properties will cause a TypeScript compilation error.

Suggested change

	alt: false,
	ctrl: false,
	cmd: false,
	meta: false,
	ctrl: false,

[github-actions]

Size Change: +111 B (0%)

Total Size: 23.2 MB

ℹ️ View Unchanged

Filename	Size	Change
./bundle/gemini.js	23.2 MB	+111 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}