Skip to content

fix(patch): cherry-pick 59e0b10 to release/v0.12.0-preview.9-pr-12416 [CONFLICTS]#12492

Merged
abhipatel12 merged 2 commits into
release/v0.12.0-preview.9-pr-12416from
hotfix/v0.12.0-preview.9/0.12.0-preview.10/preview/cherry-pick-59e0b10/pr-12416
Nov 3, 2025
Merged

fix(patch): cherry-pick 59e0b10 to release/v0.12.0-preview.9-pr-12416 [CONFLICTS]#12492
abhipatel12 merged 2 commits into
release/v0.12.0-preview.9-pr-12416from
hotfix/v0.12.0-preview.9/0.12.0-preview.10/preview/cherry-pick-59e0b10/pr-12416

Conversation

@gemini-cli-robot

Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit 59e0b10 to patch version v0.12.0-preview.9 in the preview release to create version 0.12.0-preview.10.

⚠️ 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:
#	docs/get-started/configuration.md
#	schemas/settings.schema.json
@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 represents an automated attempt to backport a critical fix related to the Codebase Investigator's thinking budget to a preview release branch. While the intent is to prevent runaway processes by capping the thinking budget, the automated cherry-pick encountered merge conflicts. Manual intervention is now required to resolve these conflicts and ensure the successful integration of the change, which also includes updated documentation and a new JSON schema for settings.

Highlights

  • Automated Cherry-Pick with Conflicts: This PR is an automated cherry-pick of commit 59e0b10 to the release/v0.12.0-preview.9-pr-12416 branch, but it has resulted in merge conflicts that require manual resolution.
  • Codebase Investigator Thinking Budget: The underlying change from the cherry-picked commit caps the 'thinking budget' for the Codebase Investigator agent to 8192 tokens, preventing potential runaway thought loops.
  • Updated Configuration Documentation: New experimental settings for the Codebase Investigator (max turns, max time, thinking budget, model) and general hook configurations have been added to the docs/get-started/configuration.md file.
  • New Settings JSON Schema: A new schemas/settings.schema.json file has been introduced to provide a structured JSON schema for Gemini CLI settings, enabling better IDE completion and validation.
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 commit to cap the thinking budget, which is reflected in the changes to settingsSchema.ts and models.ts. However, a critical issue exists in docs/get-started/configuration.md where unresolved merge conflicts are present. These must be resolved before merging.

Comment thread docs/get-started/configuration.md Outdated
@github-actions

github-actions Bot commented Nov 3, 2025

Copy link
Copy Markdown

Size Change: +2 B (0%)

Total Size: 20.2 MB

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

@abhipatel12 abhipatel12 merged commit 1584600 into release/v0.12.0-preview.9-pr-12416 Nov 3, 2025
21 checks passed
@abhipatel12 abhipatel12 deleted the hotfix/v0.12.0-preview.9/0.12.0-preview.10/preview/cherry-pick-59e0b10/pr-12416 branch November 3, 2025 20:13
@sripasg sripasg added the size/xs An extra small 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/xs An extra small PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants