fix(patch): cherry-pick 62364cb to release/v0.60.0-pr-29443 [CONFLICTS] by gemini-cli-robot · Pull Request #29456 · google-gemini/gemini-cli

gemini-cli-robot · 2026-09-23T02:15:05Z

This PR automatically cherry-picks commit 62364cb to patch version v0.60.0 in the stable release to create version 0.60.1.

⚠️ Merge Conflicts Detected

This cherry-pick resulted in merge conflicts that need manual resolution.

🔧 Next Steps:

Review the conflicts: Check out this branch and review the conflict markers
Resolve conflicts: Edit the affected files to resolve the conflicts
Test the changes: Ensure the patch works correctly after resolution
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/core/src/config/models.test.ts # packages/core/src/config/models.ts # packages/core/src/core/geminiChat.test.ts

github-actions · 2026-09-23T02:15:16Z

📊 PR Size: size/XL

Lines changed: 1750
Additions: +1407
Deletions: -343
Files changed: 40

gemini-code-assist · 2026-09-23T02:18:35Z

Summary of Changes

Hello, 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 PR cherry-picks commit 62364cb to the v0.60.0 release branch to facilitate the release of version 0.60.1. The changes introduce new Gemini Flash models and update the underlying model routing and configuration infrastructure to support these additions. Note that this PR contains merge conflicts that require manual resolution before merging.

Highlights

Model Additions: Added support for gemini-3.5-flash-lite and gemini-3.8-flash models across configuration and routing logic.
Configuration Updates: Updated settingsSchema.ts and defaultModelConfigs.ts to include new models and deprecated old aliases.
Routing Logic: Refactored routing and fallback logic to use hasLatestFlashGAAccess and hasLatestFlashLiteGAAccess flags.
Testing: Updated various integration and unit tests to accommodate the new model defaults and routing changes.

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 the 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 counterproductive. 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.

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 introduces support for the latest Gemini models, specifically gemini-3.8-flash and gemini-3.5-flash-lite, by updating configuration files, routing strategies, model mappings, and tests to dynamically check for the latest GA models. However, several critical unresolved merge conflict markers were found in models.test.ts, models.ts, and geminiChat.test.ts that will cause syntax and compilation errors and must be resolved.

_{Note: Security Review did not run due to the size of the PR.}

gemini-code-assist · 2026-09-23T02:22:27Z

+<<<<<<< HEAD
  it('should resolve all but preview flash models to DEFAULT_GEMINI_FLASH_MODEL when useGemini3_5Flash is true (legacy)', () => {
+=======
+  it('should resolve known non-preview flash models to LATEST_GEMINI_FLASH_MODEL when useGemini3_5Flash is true (legacy)', () => {
+>>>>>>> 62364cb20 (Feat/gemini 3.8 flash 3.5 flash lite (#29443))


Unresolved merge conflict marker detected. This will cause syntax and compilation errors. Please resolve the conflict by keeping the updated test case for LATEST_GEMINI_FLASH_MODEL.

it('should resolve known non-preview flash models to LATEST_GEMINI_FLASH_MODEL when useGemini3_5Flash is true (legacy)', () => {

gemini-code-assist · 2026-09-23T02:22:27Z

+<<<<<<< HEAD
  it('should resolve all but preview flash models to gemini-3.5-flash when useGemini3_5Flash is true (dynamic)', () => {
+=======
+  it.each([
+    'gemini-3.6-flash',
+    'gemini-3.7-flash',
+    'gemini-3.9-flash',
+    'gemini-9.9-flash',
+  ])(
+    'should preserve the explicit versioned model %s when useGemini3_5Flash is true (legacy)',
+    (model) => {
+      expect(resolveModel(model, false, false, true, undefined, true)).toBe(
+        model,
+      );
+    },
+  );
+
+  it('should resolve known non-preview flash models to LATEST_GEMINI_FLASH_MODEL when useGemini3_5Flash is true (dynamic)', () => {
+>>>>>>> 62364cb20 (Feat/gemini 3.8 flash 3.5 flash lite (#29443))


Unresolved merge conflict marker detected. This will cause syntax and compilation errors. Please resolve the conflict by keeping the incoming test cases.

it.each([ 'gemini-3.6-flash', 'gemini-3.7-flash', 'gemini-3.9-flash', 'gemini-9.9-flash', ])( 'should preserve the explicit versioned model %s when useGemini3_5Flash is true (legacy)', (model) => { expect(resolveModel(model, false, false, true, undefined, true)).toBe( model, ); }, ); it('should resolve known non-preview flash models to LATEST_GEMINI_FLASH_MODEL when useGemini3_5Flash is true (dynamic)', () => {

gemini-code-assist · 2026-09-23T02:22:28Z

+<<<<<<< HEAD
    useGemini3_5Flash &&
    isFlashModel(resolved) &&
+=======
+    effectiveUseLatestFlash &&
+    isPromotableFlashModel(resolved) &&
+>>>>>>> 62364cb20 (Feat/gemini 3.8 flash 3.5 flash lite (#29443))


Unresolved merge conflict marker detected. This will cause syntax and compilation errors. Please resolve the conflict by using effectiveUseLatestFlash and isPromotableFlashModel.

effectiveUseLatestFlash && isPromotableFlashModel(resolved) &&

gemini-code-assist · 2026-09-23T02:22:28Z

+<<<<<<< HEAD
    model === 'flash' ||
    model.endsWith('flash')
+=======
+    model === GEMINI_MODEL_ALIAS_FLASH ||
+    model === BASE_GEMINI_FLASH_MODEL ||
+    model === LEGACY_CCPA_FLASH_MODEL
+  );
+}
+
+function isPromotableFlashLiteModel(model: string): boolean {
+  return (
+    model === DEFAULT_GEMINI_FLASH_LITE_MODEL ||
+    model === BASE_GEMINI_FLASH_LITE_MODEL ||
+    model === GEMINI_MODEL_ALIAS_FLASH_LITE
+>>>>>>> 62364cb20 (Feat/gemini 3.8 flash 3.5 flash lite (#29443))


Unresolved merge conflict marker detected. This will cause syntax and compilation errors. Please resolve the conflict by keeping the updated mappings and adding isPromotableFlashLiteModel.

Note: You must also rename the function header on line 359 from isFlashModel to isPromotableFlashModel to match the call on line 316 and prevent compilation errors.

model === GEMINI_MODEL_ALIAS_FLASH || model === BASE_GEMINI_FLASH_MODEL || model === LEGACY_CCPA_FLASH_MODEL ); } function isPromotableFlashLiteModel(model: string): boolean { return ( model === DEFAULT_GEMINI_FLASH_LITE_MODEL || model === BASE_GEMINI_FLASH_LITE_MODEL || model === GEMINI_MODEL_ALIAS_FLASH_LITE

gemini-code-assist · 2026-09-23T02:22:28Z

+<<<<<<< HEAD
+=======
+    it('should send an explicit versioned Flash model unchanged when Gemini 3.5 Flash GA is enabled', async () => {
+      vi.mocked(mockConfig.hasLatestFlashGAAccess).mockReturnValue(true);
+      vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue(
+        (async function* () {
+          yield {
+            candidates: [
+              {
+                content: { parts: [{ text: 'response' }], role: 'model' },
+                finishReason: 'STOP',
+              },
+            ],
+          } as unknown as GenerateContentResponse;
+        })(),
+      );
+
+      const stream = await chat.sendMessageStream(
+        { model: 'gemini-3.8-flash' },
+        'hello',
+        'prompt-id-explicit-flash',
+        new AbortController().signal,
+        LlmRole.MAIN,
+      );
+      for await (const _ of stream) {
+        // consume stream
+      }
+
+      expect(mockContentGenerator.generateContentStream).toHaveBeenCalledWith(
+        expect.objectContaining({ model: 'gemini-3.8-flash' }),
+        'prompt-id-explicit-flash',
+        LlmRole.MAIN,
+      );
+    });
+
+>>>>>>> 62364cb20 (Feat/gemini 3.8 flash 3.5 flash lite (#29443))


Unresolved merge conflict marker detected. This will cause syntax and compilation errors. Please resolve the conflict by keeping the new test case. Additionally, prefer using hardcoded literal values instead of importing constants in tests to ensure they are self-contained.

it('should send an explicit versioned Flash model unchanged when Gemini 3.5 Flash GA is enabled', async () => { vi.mocked(mockConfig.hasLatestFlashGAAccess).mockReturnValue(true); vi.mocked(mockContentGenerator.generateContentStream).mockResolvedValue( (async function* () { yield { candidates: [ { content: { parts: [{ text: 'response' }], role: 'model' }, finishReason: 'STOP', }, ], } as unknown as GenerateContentResponse; })(), ); const stream = await chat.sendMessageStream( { model: 'gemini-3.8-flash' }, 'hello', 'prompt-id-explicit-flash', new AbortController().signal, 'main', ); for await (const _ of stream) { // consume stream } expect(mockContentGenerator.generateContentStream).toHaveBeenCalledWith( expect.objectContaining({ model: 'gemini-3.8-flash' }), 'prompt-id-explicit-flash', 'main', ); });

References

In tests, prefer using hardcoded literal values instead of importing constants to ensure tests are self-contained and less brittle.

Feat/gemini 3.8 flash 3.5 flash lite (#29443)

c16b64a

# Conflicts: # packages/core/src/config/models.test.ts # packages/core/src/config/models.ts # packages/core/src/core/geminiChat.test.ts

gemini-cli-robot requested review from a team as code owners September 23, 2026 02:15

github-actions Bot mentioned this pull request Sep 23, 2026

Feat/gemini 3.8 flash 3.5 flash lite #29443

Merged

4 of 18 tasks

github-actions Bot added the size/xl An extra large PR label Sep 23, 2026

DavidAPierce closed this Sep 23, 2026

DavidAPierce deleted the hotfix/v0.60.0/0.60.1/stable/cherry-pick-62364cb/pr-29443 branch September 23, 2026 02:20

gemini-code-assist Bot reviewed Sep 23, 2026

View reviewed changes

github-actions Bot mentioned this pull request Sep 23, 2026

📊 AI CLI 工具社区动态日报 2026-09-23 96loveslife/big_model_radar#533

Open

Navigation Menu

Repository navigation

fix(patch): cherry-pick 62364cb to release/v0.60.0-pr-29443 [CONFLICTS] - #29456

fix(patch): cherry-pick 62364cb to release/v0.60.0-pr-29443 [CONFLICTS]#29456
gemini-cli-robot wants to merge 1 commit into
release/v0.60.0-pr-29443from
hotfix/v0.60.0/0.60.1/stable/cherry-pick-62364cb/pr-29443

gemini-cli-robot commented Sep 23, 2026

Uh oh!

github-actions Bot commented Sep 23, 2026

Uh oh!

gemini-code-assist Bot commented Sep 23, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

gemini-code-assist Bot Sep 23, 2026

Uh oh!

gemini-code-assist Bot Sep 23, 2026

Uh oh!

gemini-code-assist Bot Sep 23, 2026

Uh oh!

gemini-code-assist Bot Sep 23, 2026

Uh oh!

gemini-code-assist Bot Sep 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

gemini-cli-robot commented Sep 23, 2026

⚠️ Merge Conflicts Detected

🔧 Next Steps:

📋 Files with conflicts:

🚨 Important:

Uh oh!

github-actions Bot commented Sep 23, 2026

Uh oh!

gemini-code-assist Bot commented Sep 23, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist Bot Sep 23, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Sep 23, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Sep 23, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Sep 23, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist Bot Sep 23, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants