Skip to content

fix(patch): cherry-pick 3332703 to release/v0.11.2-pr-12317 [CONFLICTS]#12340

Closed
gemini-cli-robot wants to merge 1 commit intorelease/v0.11.2-pr-12317from
hotfix/v0.11.2/0.11.3/stable/cherry-pick-3332703/pr-12317
Closed

fix(patch): cherry-pick 3332703 to release/v0.11.2-pr-12317 [CONFLICTS]#12340
gemini-cli-robot wants to merge 1 commit intorelease/v0.11.2-pr-12317from
hotfix/v0.11.2/0.11.3/stable/cherry-pick-3332703/pr-12317

Conversation

@gemini-cli-robot
Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit 3332703 to patch version v0.11.2 in the stable release to create version 0.11.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

# Conflicts:
#	packages/cli/src/config/config.test.ts
#	packages/core/src/services/chatCompressionService.test.ts
#	packages/core/src/services/chatCompressionService.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 is an automated cherry-pick that streamlines the chat history compression functionality. It refactors the compression threshold setting for better usability and UI integration, updates its default value, and introduces a new service to encapsulate the compression logic. The changes aim to improve how chat history is managed to prevent exceeding token limits.

Highlights

  • Refactored Chat Compression Setting: The chatCompression setting, previously an object with contextPercentageThreshold, has been simplified to a direct numeric setting named compressionThreshold.
  • Updated Default Value and UI Editability: The default value for the compression threshold has been adjusted from 0.7 to 0.2, and the setting is now explicitly marked as editable in the user interface.
  • New Chat Compression Service: A dedicated ChatCompressionService has been introduced, along with utility functions like findCompressSplitPoint, to manage the logic for chat history compression.
  • Documentation and Test Updates: Configuration documentation has been updated to reflect the new setting name and structure, and comprehensive test coverage has been added and updated for the compression logic and settings.
  • Merge Conflicts Detected: This automated cherry-pick has resulted in merge conflicts, specifically in packages/cli/src/config/config.test.ts, which require manual resolution before merging.
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 is a cherry-pick to a release branch. The changes refactor the chat history compression setting from chatCompression to compressionThreshold, making it a numeric value instead of an object. This is reflected in documentation, configuration schemas, and tests. However, the cherry-pick has resulted in merge conflicts in packages/cli/src/config/config.test.ts which must be resolved before merging. My review focuses on this critical issue.

@gemini-cli gemini-cli Bot added the status/need-issue Pull requests that need to have an associated issue. label Jan 7, 2026
@bdmorgan
Copy link
Copy Markdown
Collaborator

Hi @gemini-cli-robot, thank you so much for your contribution to Gemini CLI! We really appreciate the time and effort you've put into this.

We're making some updates to our contribution process to improve how we track and review changes. Please take a moment to review our recent discussion post: Improving Our Contribution Process & Introducing New Guidelines.

Key Update: Starting January 26, 2026, the Gemini CLI project will require all pull requests to be associated with an existing issue. Any pull requests not linked to an issue by that date will be automatically closed.

Thank you for your understanding and for being a part of our community!

@bdmorgan
Copy link
Copy Markdown
Collaborator

Thank you for submission to the Gemini CLI project. At this time, we are closing this pull request in order to allow us to better triage and support more recent pull requests against the latest code changes. If you feel like this pull request is a critical contribution to the Gemini CLI project, please associate the pull request with an existing GitHub issue (instructions here: https://docs.github.com/en/issues/tracking-your-work-with-issues/using-issues/linking-a-pull-request-to-an-issue) before reopening. After Monday January 26 2026, any pull requests submitted by contributors without an associated issue will be automatically closed (more information here: #16706). If you do choose to reopen and submit this pull request, please ensure you rebase your changes onto the current main branch before resubmitting. This will help avoid merge conflicts and ensure your contribution is compatible with the latest codebase.

@bdmorgan bdmorgan closed this Jan 23, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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