Skip to content

fix(patch): cherry-pick 8cae90f to release/v0.27.0-preview.7-pr-18108 [CONFLICTS]#18230

Merged
skeshive merged 2 commits into
release/v0.27.0-preview.7-pr-18108from
hotfix/v0.27.0-preview.7/0.27.0-preview.8/preview/cherry-pick-8cae90f/pr-18108
Feb 3, 2026
Merged

fix(patch): cherry-pick 8cae90f to release/v0.27.0-preview.7-pr-18108 [CONFLICTS]#18230
skeshive merged 2 commits into
release/v0.27.0-preview.7-pr-18108from
hotfix/v0.27.0-preview.7/0.27.0-preview.8/preview/cherry-pick-8cae90f/pr-18108

Conversation

@gemini-cli-robot

Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit 8cae90f to patch version v0.27.0-preview.7 in the preview release to create version 0.27.0-preview.8.

⚠️ 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

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
# Conflicts:
#	packages/cli/src/ui/components/shared/text-buffer.ts
@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello @gemini-cli-robot, 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 aims to backport a critical fix for cursor navigation on wrapped lines into a preview release. The original change corrects a regression where up/down arrow keys did not function as expected when text spanned multiple visual lines. However, the automated cherry-pick process encountered merge conflicts, necessitating manual intervention to resolve these before the fix can be fully integrated and released.

Highlights

  • Cherry-pick Operation: This pull request is an automated cherry-pick of commit 8cae90f to integrate a specific fix into the release/v0.27.0-preview.7-pr-18108 branch, targeting the v0.27.0-preview.8 release.
  • Merge Conflicts: The cherry-pick operation resulted in merge conflicts that require manual resolution before the pull request can be merged.
  • Cursor Navigation Fix: The original commit 8cae90f addresses a regression in cursor navigation, specifically fixing the up/down arrow key behavior on wrapped lines within the useTextBuffer hook.
  • Test Coverage: A new regression test has been added to text-buffer.test.ts to ensure the correct functionality of up/down arrow movements on wrapped lines.
Changelog
  • packages/cli/src/ui/components/shared/text-buffer.test.ts
    • Added a new regression test case to validate the correct behavior of up/down arrow key movements on text that wraps across multiple visual lines.
  • packages/cli/src/ui/components/shared/text-buffer.ts
    • Modified the handleInput function for MOVE_UP and MOVE_DOWN commands to correctly use visualCursor[0] and visualLines.length - 1 instead of cursorRow and lines.length - 1. This change ensures accurate cursor movement when navigating wrapped text.
    • Resolved a merge conflict by including setText, text, visualCursor, and visualLines in the dependency array of a useCallback hook, which was part of the original commit's changes.
Activity
  • This pull request was automatically generated by gemini-cli-robot to cherry-pick commit 8cae90f404f999a50c7c653ce334cbf034bf95e7.
  • Merge conflicts were detected during the cherry-pick process, requiring manual resolution.
  • The PR description provides clear instructions for reviewing, resolving, and testing the conflicts, and emphasizes that the PR should not be merged until conflicts are resolved.
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 gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

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 cherry-picks a fix for a regression in up/down arrow key navigation on wrapped lines and adds a corresponding regression test. The fix itself is correct, but it has introduced merge conflict markers into the source code that were not resolved. This will cause the build to fail and must be corrected.

Comment on lines +2977 to +2983
<<<<<<< HEAD
=======
setText,
text,
visualCursor,
visualLines,
>>>>>>> 8cae90f40 (Fix up/down arrow regression and add test. (#18108))

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

critical

This file contains unresolved merge conflict markers. These markers must be removed to ensure the code is syntactically correct and can be compiled. Based on the changes in this PR, visualCursor and visualLines should be added to the dependency array for the handleInput useCallback hook, as they are now used within it. The other variables (setText, text) from the conflict are not used and can be omitted.

      visualCursor,
      visualLines,

@gemini-cli gemini-cli Bot added the status/need-issue Pull requests that need to have an associated issue. label Feb 3, 2026

@jacob314 jacob314 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

lgtm

@skeshive skeshive enabled auto-merge (squash) February 3, 2026 21:31
@github-actions

github-actions Bot commented Feb 3, 2026

Copy link
Copy Markdown

Size Change: +55 B (0%)

Total Size: 23.5 MB

ℹ️ View Unchanged
Filename Size Change
./bundle/gemini.js 23.5 MB +55 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

@skeshive skeshive merged commit 57c7f6f into release/v0.27.0-preview.7-pr-18108 Feb 3, 2026
24 checks passed
@skeshive skeshive deleted the hotfix/v0.27.0-preview.7/0.27.0-preview.8/preview/cherry-pick-8cae90f/pr-18108 branch February 3, 2026 21:41
@sripasg sripasg added the size/m A medium sized PR label Jun 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/m A medium sized PR status/need-issue Pull requests that need to have an associated issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants