fix(patch): cherry-pick e9a9474 to release/v0.28.1-pr-18840 [CONFLICTS]

[gemini-cli-robot]

This PR automatically cherry-picks commit e9a9474 to patch version v0.28.1 in the stable release to create version 0.28.2.

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

[gemini-code-assist]

Summary of Changes

Hello @gemini-cli-robot, I'm Gemini Code Assist¹! 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 aimed at reverting a previous change that inadvertently exposed credentials by modifying environment variable sanitization logic for MCP servers. The core purpose is to restore a more secure handling of environment variables. Due to merge conflicts, manual resolution is required to complete the integration of these security-focused reversions.

Highlights

• Environment Variable Sanitization Reversion: Reverted changes that previously redacted specific sensitive environment variables (like GEMINI_API_KEY, GOOGLE_API_KEY) when spawning MCP servers. These variables are no longer explicitly removed from the environment.
• Removed Security Warnings and Documentation: Eliminated a security warning log displayed when adding MCP servers using stdio transport and updated documentation to remove sections related to environment variable redaction and warnings about untrusted MCP servers.
• MCP Client Test and Code Refactoring: Refactored MCP client tests by updating environment variable names and removing tests for sensitive variable redaction and extension environment settings. The getExtensionEnvironment helper function and GeminiCLIExtension import were also removed.

Changelog

• docs/tools/mcp-server.md
  • Removed documentation sections related to environment variable redaction and untrusted MCP servers.
• packages/cli/src/commands/mcp/add.ts
  • Removed a security warning log for stdio transport MCP servers.
• packages/core/src/services/environmentSanitization.test.ts
  • Removed specific Google-related API keys from environment sanitization test cases.
• packages/core/src/services/environmentSanitization.ts
  • Removed specific Google-related API keys from the NEVER_ALLOWED_ENVIRONMENT_VARIABLES set.
• packages/core/src/tools/mcp-client.test.ts
  • Updated environment variable name in a test case.
  • Removed tests for sensitive environment variable redaction.
  • Removed tests for including extension settings in the environment.
• packages/core/src/tools/mcp-client.ts
  • Removed GeminiCLIExtension type import.
  • Adjusted environment variable handling during StdioClientTransport creation.
  • Removed the getExtensionEnvironment helper function.

Activity

• Automated cherry-pick of commit e9a94748107ac24a05f51b4c5b0c0a8952374285 to patch version v0.28.1 to create version 0.28.2.
• Merge conflicts detected during the cherry-pick process, requiring manual resolution.
• Instructions provided for reviewing, resolving, testing, and updating the PR to address conflicts.

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. ↩

[github-actions]

Size Change: -990 B (0%)

Total Size: 23.7 MB

ℹ️ View Unchanged

Filename	Size	Change
./bundle/gemini.js	23.7 MB	-990 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}

[gemini-code-assist]

Code Review

This pull request aims to cherry-pick a fix to revert unintended credentials exposure. However, security analysis could not be performed as the provided files were empty, meaning no vulnerabilities were found in the current state. A critical issue was identified: the file packages/core/src/tools/mcp-client.ts contains unresolved merge conflict markers, which will cause the build to fail and must be resolved before merging.