Skip to content

fix(patch): cherry-pick 765fb67 to release/v0.35.2-pr-24055 [CONFLICTS]#24063

Merged
galz10 merged 2 commits intorelease/v0.35.2-pr-24055from
hotfix/v0.35.2/0.35.3/stable/cherry-pick-765fb67/pr-24055
Mar 27, 2026
Merged

fix(patch): cherry-pick 765fb67 to release/v0.35.2-pr-24055 [CONFLICTS]#24063
galz10 merged 2 commits intorelease/v0.35.2-pr-24055from
hotfix/v0.35.2/0.35.3/stable/cherry-pick-765fb67/pr-24055

Conversation

@gemini-cli-robot
Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit 765fb67 to patch version v0.35.2 in the stable release to create version 0.35.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/sandboxConfig.test.ts
@gemini-cli-robot gemini-cli-robot requested a review from a team as a code owner March 27, 2026 21:52
@gemini-code-assist
Copy link
Copy Markdown
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 aims to enable network access by default within the sandbox configuration. It updates the core configuration logic and ensures that all relevant test cases reflect this change in default behavior. Please note that this PR includes unresolved merge conflicts that require manual intervention before it can be safely merged.

Highlights

  • Default Network Access: Updated the default value for sandbox network access from false to true in both the configuration logic and the corresponding test suite.
  • Configuration Handling: Modified the sandbox configuration loading to default network access to true when not explicitly provided.
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
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 changes the default networkAccess setting in the sandbox configuration from false to true and updates the test suite accordingly. However, several unresolved merge conflicts were found in packages/cli/src/config/sandboxConfig.test.ts, which will cause build and test failures. Additionally, some properties in the test configurations are now redundant and should be removed to simplify the code.

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 27, 2026
Resolves the merge conflicts introduced in sandboxConfig.test.ts when cherry-picking #24055 (Enable network access in sandbox configuration).
@github-actions
Copy link
Copy Markdown

Size Change: -6 B (0%)

Total Size: 26.2 MB

Filename Size Change
./bundle/chunk-ES2VXHBV.js 0 B -3.62 MB (removed) 🏆
./bundle/chunk-KA4WG6WX.js 0 B -13.5 MB (removed) 🏆
./bundle/core-MZ3B5WPD.js 0 B -41.3 kB (removed) 🏆
./bundle/devtoolsService-QDZDZPQ3.js 0 B -27.7 kB (removed) 🏆
./bundle/interactiveCli-ZX4TDM4R.js 0 B -1.6 MB (removed) 🏆
./bundle/oauth2-provider-OPKIAQP6.js 0 B -9.19 kB (removed) 🏆
./bundle/chunk-NGBYSHKP.js 13.5 MB +13.5 MB (new file) 🆕
./bundle/chunk-WUDY7WYY.js 3.62 MB +3.62 MB (new file) 🆕
./bundle/core-U7MXA7O5.js 41.3 kB +41.3 kB (new file) 🆕
./bundle/devtoolsService-UIT2PAFN.js 27.7 kB +27.7 kB (new file) 🆕
./bundle/interactiveCli-EEL6Y6UC.js 1.6 MB +1.6 MB (new file) 🆕
./bundle/oauth2-provider-ASY4WNDF.js 9.19 kB +9.19 kB (new file) 🆕
ℹ️ View Unchanged
Filename Size Change
./bundle/chunk-34MYV7JD.js 2.45 kB 0 B
./bundle/chunk-37ZTTFQF.js 966 kB 0 B
./bundle/chunk-5AUYMPVF.js 858 B 0 B
./bundle/chunk-664ZODQF.js 124 kB 0 B
./bundle/chunk-A5BGMAYX.js 1.95 MB 0 B
./bundle/chunk-DAHVX5MI.js 206 kB 0 B
./bundle/chunk-IUUIT4SU.js 56.5 kB 0 B
./bundle/chunk-RJTRUG2J.js 39.8 kB 0 B
./bundle/devtools-36NN55EP.js 696 kB 0 B
./bundle/dist-T73EYRDX.js 356 B 0 B
./bundle/gemini.js 695 kB -2 B (0%)
./bundle/getMachineId-bsd-TXG52NKR.js 1.55 kB 0 B
./bundle/getMachineId-darwin-7OE4DDZ6.js 1.55 kB 0 B
./bundle/getMachineId-linux-SHIFKOOX.js 1.34 kB 0 B
./bundle/getMachineId-unsupported-5U5DOEYY.js 1.06 kB 0 B
./bundle/getMachineId-win-6KLLGOI4.js 1.72 kB 0 B
./bundle/memoryDiscovery-4V4LDNEP.js 922 B 0 B
./bundle/multipart-parser-KPBZEGQU.js 11.7 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js 221 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js 227 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js 11.5 kB 0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js 132 B 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-open.sb 3.36 kB 0 B
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB 0 B
./bundle/sandbox-macos-strict-open.sb 4.82 kB 0 B
./bundle/sandbox-macos-strict-proxied.sb 5.02 kB 0 B
./bundle/src-QVCVGIUX.js 47 kB 0 B
./bundle/tree-sitter-7U6MW5PS.js 274 kB 0 B
./bundle/tree-sitter-bash-34ZGLXVX.js 1.84 MB 0 B
./bundle/undici-4X2YZID5.js 360 B 0 B

compressed-size-action

@galz10 galz10 enabled auto-merge (squash) March 27, 2026 22:43
@galz10 galz10 merged commit 52d1034 into release/v0.35.2-pr-24055 Mar 27, 2026
25 checks passed
@galz10 galz10 deleted the hotfix/v0.35.2/0.35.3/stable/cherry-pick-765fb67/pr-24055 branch March 27, 2026 22:46
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