fix(patch): cherry-pick 788bb04 to release/v0.23.0-preview.5-pr-15817 [CONFLICTS]

[gemini-cli-robot]

This PR automatically cherry-picks commit 788bb04 to patch version v0.23.0-preview.5 in the preview release to create version 0.23.0-preview.6.

⚠️ 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 attempt to integrate a specific commit into a preview release branch, focusing on enhancing the application's model fallback mechanism. It introduces a dedicated function to activate fallback models and logs these events for telemetry, improving the tracking of model usage. However, the automated cherry-pick encountered merge conflicts, necessitating manual intervention to resolve them before the changes can be fully integrated and the next preview release triggered.

Highlights

• Cherry-pick with Conflicts: This PR is an automated cherry-pick of commit "788bb04f5c5eec3c8bc4b3ed0dad276355cc2c2b" into the "release/v0.23.0-preview.5-pr-15817" branch, but it has resulted in merge conflicts that require manual resolution.
• Fallback Mode Activation: A new "activateFallbackMode" function has been introduced in the "Config" class to explicitly handle the activation of a fallback model, ensuring it's set and its usage is logged.
• Telemetry for Fallback: The system now logs a "FlashFallbackEvent" whenever the "activateFallbackMode" is triggered, providing better insights into fallback model usage.
• UI Integration: The "useQuotaAndFallback" hook in the CLI UI has been updated to utilize the new "activateFallbackMode" when a user chooses to always retry with a fallback model.
• Testing: New tests have been added to "flashFallback.test.ts" to verify the correct behavior of the "activateFallbackMode" function, including model setting and telemetry logging.

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]

Code Review

This pull request is a cherry-pick that introduces a new fallback mode. However, the manual merge conflict resolution has left conflict markers in one of the files, which is a critical issue that will break the build. Additionally, a function call was introduced that does not match the existing function signature, which will also cause a compilation error. It appears that some changes from the original pull request were missed during the cherry-pick. Both of these critical issues need to be addressed.

[gemini-code-assist]

Unresolved merge conflict markers are present in the code. This will cause a build failure and must be resolved. It appears the intention was to use config.activateFallbackMode.

        // The change is not persisted, so the original model is restored on restart.
        config.activateFallbackMode(proQuotaRequest.fallbackModel);

[gemini-code-assist]

The setModel method is called with two arguments, but its definition only accepts one. This will cause a compilation error. It seems a change to setModel from the original pull request was missed during this cherry-pick. To make the code compile, the second argument can be removed, but the intended logic for temporary model switching will be lost and needs to be properly restored.

Suggested change

	this.setModel(model, true);
	this.setModel(model);

[github-actions]

Size Change: +255 B (0%)

Total Size: 22 MB

ℹ️ View Unchanged

Filename	Size	Change
./bundle/gemini.js	22 MB	+255 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}