Force restart on trust level change to reload settings#6713
Conversation
There was a problem hiding this comment.
Summary of Changes
Hello @shrutip90, 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 enhances the Gemini CLI's security and user experience by implementing a robust mechanism for handling workspace trust. It ensures that workspace-specific settings are only applied when the environment is explicitly trusted, preventing potential security risks from untrusted configurations. Furthermore, it introduces a critical feature that prompts the user to restart the application when the trust level of a workspace changes, guaranteeing that all settings are reloaded and applied correctly, thus maintaining application integrity and user safety.
Highlights
- Implemented conditional loading of workspace settings: Workspace-specific configurations are now only merged and applied if the current workspace is explicitly marked as trusted.
- Introduced a forced restart mechanism: The application now detects changes in workspace trust status and prompts the user to restart, ensuring that all settings, especially those related to trust, are reloaded and take effect immediately.
- Enhanced FolderTrustDialog UI/UX: The trust dialog now provides clear guidance and interaction options, including a prompt to restart the CLI when a trust level change necessitates it, improving user awareness and control.
- Expanded test coverage for settings and trust: New unit tests have been added to validate the correct behavior of settings merging based on trust status and the restart prompt logic.
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 in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.
| 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 issue 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
-
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. ↩
There was a problem hiding this comment.
Code Review
This pull request correctly implements the logic to ignore workspace settings in untrusted environments and forces a restart when the trust level changes. The changes across the settings, UI components, and hooks are well-integrated to support this new security feature. I've identified one area in the settings merging logic where a refactoring could improve code clarity and maintainability.
Code Coverage Summary
CLI Package - Full Text ReportCore Package - Full Text ReportFor detailed HTML reports, please see the 'coverage-reports-22.x-ubuntu-latest' artifact from the main CI run. |
jacob314
left a comment
There was a problem hiding this comment.
Thanks for the careful testing!
TLDR
Updated settings to ignore workspace settings in untrusted environments and added logic to force restart when trust level changes. Since trust is expected to be the default, we initialize with trusted settings when the trust level is undefined and only force restart for untrusted case. If it's already defined, we force restart when the trusted status flips.
Dive Deeper
Reviewer Test Plan
Testing Matrix
Linked issues / bugs
Related to https://github.com/google-gemini/maintainers-gemini-cli/issues/642