pull and merge latest changes

This commit is contained in:
Kevin Wang
2026-03-13 09:28:28 +00:00
parent d179e3673b
commit 1693afe027
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -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];
+2 -2
View File
@@ -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(),