From 1693afe02736322987bb8fc78dc6b8a21f455ba8 Mon Sep 17 00:00:00 2001
From: Kevin Wang <kevinjwang@google.com>
Date: Fri, 13 Mar 2026 09:28:28 +0000
Subject: [PATCH] pull and merge latest changes

---
 packages/core/src/core/geminiChat.ts        | 4 ++--
 packages/core/src/prompts/promptProvider.ts | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/core/geminiChat.ts b/packages/core/src/core/geminiChat.ts
index 6328f2c059..9d94321df3 100644
--- a/packages/core/src/core/geminiChat.ts
+++ b/packages/core/src/core/geminiChat.ts
@@ -421,7 +421,7 @@ export class GeminiChat {
               : getRetryErrorType(error);
 
             if (
-              (isContentError && isGemini2Model(model, this.config)) ||
+              (isContentError && isGemini2Model(model, this.context.config)) ||
               (isRetryable && !signal.aborted)
             ) {
               // The issue requests exactly 3 retries (4 attempts) for API errors during stream iteration.
@@ -553,7 +553,7 @@ export class GeminiChat {
 
       let contentsToUse: Content[] = supportsModernFeatures(
         modelToUse,
-        this.config,
+        this.context.config,
       )
         ? [...contentsForPreviewModel]
         : [...requestContents];
diff --git a/packages/core/src/prompts/promptProvider.ts b/packages/core/src/prompts/promptProvider.ts
index 01324faf67..6f3b550452 100644
--- a/packages/core/src/prompts/promptProvider.ts
+++ b/packages/core/src/prompts/promptProvider.ts
@@ -63,7 +63,7 @@ export class PromptProvider {
       context.config.getActiveModel(),
       context.config.getGemini31LaunchedSync?.() ?? false,
     );
-    const isModernModel = supportsModernFeatures(desiredModel, config);
+    const isModernModel = supportsModernFeatures(desiredModel, context.config);
     const activeSnippets = isModernModel ? snippets : legacySnippets;
     const contextFilenames = getAllGeminiMdFilenames();
 
@@ -235,7 +235,7 @@ export class PromptProvider {
       context.config.getActiveModel(),
       context.config.getGemini31LaunchedSync?.() ?? false,
     );
-    const isModernModel = supportsModernFeatures(desiredModel, config);
+    const isModernModel = supportsModernFeatures(desiredModel, context.config);
     const activeSnippets = isModernModel ? snippets : legacySnippets;
     return activeSnippets.getCompressionPrompt(
       context.config.getApprovedPlanPath(),