Skip to content

fix(patch): cherry-pick b2d6dc4 to release/v0.35.0-preview.4-pr-23546 [CONFLICTS]#23585

Merged
abhipatel12 merged 4 commits intorelease/v0.35.0-preview.4-pr-23546from
hotfix/v0.35.0-preview.4/0.35.0-preview.5/preview/cherry-pick-b2d6dc4/pr-23546
Mar 23, 2026
Merged

fix(patch): cherry-pick b2d6dc4 to release/v0.35.0-preview.4-pr-23546 [CONFLICTS]#23585
abhipatel12 merged 4 commits intorelease/v0.35.0-preview.4-pr-23546from
hotfix/v0.35.0-preview.4/0.35.0-preview.5/preview/cherry-pick-b2d6dc4/pr-23546

Conversation

@gemini-cli-robot
Copy link
Collaborator

This PR automatically cherry-picks commit b2d6dc4 to patch version v0.35.0-preview.4 in the preview release to create version 0.35.0-preview.5.

⚠️ 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:
#	integration-tests/browser-policy.test.ts
#	packages/a2a-server/src/config/config.test.ts
#	packages/a2a-server/src/config/config.ts
@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello, 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 primarily updates the default setting for experimental agents to be disabled. This change is propagated across documentation, configuration schemas, and core logic. Additionally, new integration tests have been introduced to ensure the correct functioning of browser agent policies. The PR currently requires manual conflict resolution to proceed.

Highlights

  • Default Agent Behavior Changed: The default value for the experimental.enableAgents setting has been changed from true to false, meaning agents will now be disabled by default.
  • New Browser Agent Policy Tests: New integration tests have been added to verify the behavior of browser agent policies, specifically around skipping user confirmation and displaying warnings for existing session modes.
  • Merge Conflicts Detected: This pull request contains merge conflicts that require manual resolution before it can be merged.
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.

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
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 aims to disable agents by default by changing the experimental.enableAgents setting to false. The changes are applied consistently across documentation, schemas, tests, and configuration logic. However, the cherry-pick process has introduced merge conflicts in two files, which are critical issues that must be resolved. My review focuses on these conflicts.

Note: Security Review did not run due to the size of the PR.

@gemini-cli gemini-cli bot added the status/need-issue Pull requests that need to have an associated issue. label Mar 23, 2026
@github-actions
Copy link

github-actions bot commented Mar 23, 2026

Size Change: +575 B (0%)

Total Size: 26.2 MB

Filename Size Change
./bundle/chunk-GYCWVBZC.js 0 B -13.5 MB (removed) 🏆
./bundle/chunk-NNCLIBM5.js 0 B -3.62 MB (removed) 🏆
./bundle/core-5BE7IVJR.js 0 B -41.3 kB (removed) 🏆
./bundle/devtoolsService-XOK3RVFE.js 0 B -27.7 kB (removed) 🏆
./bundle/interactiveCli-E2WMUZJO.js 0 B -1.6 MB (removed) 🏆
./bundle/oauth2-provider-UQZRACUK.js 0 B -9.19 kB (removed) 🏆
./bundle/chunk-GTLO6LUX.js 3.62 MB +3.62 MB (new file) 🆕
./bundle/chunk-P5ZPQ5DB.js 13.5 MB +13.5 MB (new file) 🆕
./bundle/core-6GXGY6ES.js 41.3 kB +41.3 kB (new file) 🆕
./bundle/devtoolsService-CCEMAOAL.js 27.7 kB +27.7 kB (new file) 🆕
./bundle/interactiveCli-NRQZKHUJ.js 1.6 MB +1.6 MB (new file) 🆕
./bundle/oauth2-provider-SVS7QK6X.js 9.19 kB +9.19 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size
./bundle/chunk-34MYV7JD.js 2.45 kB
./bundle/chunk-37ZTTFQF.js 966 kB
./bundle/chunk-5AUYMPVF.js 858 B
./bundle/chunk-664ZODQF.js 124 kB
./bundle/chunk-DAHVX5MI.js 206 kB
./bundle/chunk-IUUIT4SU.js 56.5 kB
./bundle/chunk-QO53VEHI.js 1.95 MB
./bundle/chunk-RJTRUG2J.js 39.8 kB
./bundle/devtools-36NN55EP.js 696 kB
./bundle/dist-T73EYRDX.js 356 B
./bundle/gemini.js 695 kB
./bundle/getMachineId-bsd-TXG52NKR.js 1.55 kB
./bundle/getMachineId-darwin-7OE4DDZ6.js 1.55 kB
./bundle/getMachineId-linux-SHIFKOOX.js 1.34 kB
./bundle/getMachineId-unsupported-5U5DOEYY.js 1.06 kB
./bundle/getMachineId-win-6KLLGOI4.js 1.72 kB
./bundle/memoryDiscovery-RRX6QF4Y.js 922 B
./bundle/multipart-parser-KPBZEGQU.js 11.7 kB
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js 221 kB
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js 227 kB
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js 11.5 kB
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js 132 B
./bundle/sandbox-macos-permissive-open.sb 890 B
./bundle/sandbox-macos-permissive-proxied.sb 1.31 kB
./bundle/sandbox-macos-restrictive-open.sb 3.36 kB
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB
./bundle/sandbox-macos-strict-open.sb 4.82 kB
./bundle/sandbox-macos-strict-proxied.sb 5.02 kB
./bundle/src-QVCVGIUX.js 47 kB
./bundle/tree-sitter-7U6MW5PS.js 274 kB
./bundle/tree-sitter-bash-34ZGLXVX.js 1.84 MB
./bundle/undici-4X2YZID5.js 360 B

compressed-size-action

@abhipatel12 abhipatel12 enabled auto-merge (squash) March 23, 2026 22:30
@abhipatel12 abhipatel12 merged commit e88b56b into release/v0.35.0-preview.4-pr-23546 Mar 23, 2026
25 checks passed
@abhipatel12 abhipatel12 deleted the hotfix/v0.35.0-preview.4/0.35.0-preview.5/preview/cherry-pick-b2d6dc4/pr-23546 branch March 23, 2026 22:40
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.

2 participants