fix(patch): cherry-pick 9a74271 to release/v0.33.0-preview.8-pr-21236 [CONFLICTS]#21788
Conversation
…#21236) # Conflicts: # packages/core/src/code_assist/server.ts
Summary of ChangesHello, 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 aimed at integrating critical fixes related to the billing overage strategy and AI credit management into a preview release. The changes focus on refining how billing settings are applied and reset per user interaction, improving the user experience around credit notifications, and updating model eligibility for overage. Due to merge conflicts, manual resolution is required to complete the integration of these important billing lifecycle adjustments. Highlights
Changelog
Activity
Using Gemini Code AssistThe 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
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 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
|
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request cherry-picks a fix for the billing overage strategy lifecycle and enables overage for the gemini-3-flash-preview model, refactoring billing notifications and introducing new state management in the Config class. However, a critical issue was identified: an unresolved merge conflict in packages/core/src/code_assist/server.ts will break the build and must be resolved before merging.
| <<<<<<< HEAD | ||
| import { logBillingEvent } from '../telemetry/loggers.js'; | ||
| ======= | ||
| import { logBillingEvent, logInvalidChunk } from '../telemetry/loggers.js'; | ||
| import { coreEvents } from '../utils/events.js'; | ||
| >>>>>>> 9a7427197 (fix(billing): fix overage strategy lifecycle and settings integration (#21236)) |
There was a problem hiding this comment.
This file contains unresolved merge conflict markers (<<<<<<< HEAD, =======, >>>>>>>) from an incomplete cherry-pick, which will cause syntax errors and prevent the application from building. Manual resolution is required to select the correct imports. Additionally, while coreEvents is necessary, logInvalidChunk appears to be unused and should be removed if not needed.
import { logBillingEvent, logInvalidChunk } from '../telemetry/loggers.js';
import { coreEvents } from '../utils/events.js';
|
Size Change: +640 B (0%) Total Size: 25.9 MB ℹ️ View Unchanged
|
galz10
deleted the
hotfix/v0.33.0-preview.8/0.33.0-preview.9/preview/cherry-pick-9a74271/pr-21236
branch
3 participants
This PR automatically cherry-picks commit 9a74271 to patch version v0.33.0-preview.8 in the preview release to create version 0.33.0-preview.9.
This cherry-pick resulted in merge conflicts that need manual resolution.
🔧 Next Steps:
📋 Files with conflicts:
The commit has been created with conflict markers for easier manual resolution.
🚨 Important: