mirror of
https://github.com/google-gemini/gemini-cli.git
synced 2026-05-19 08:14:35 -07:00
pull and merge latest changes
This commit is contained in:
@@ -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];
|
||||
|
||||
@@ -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(),
|
||||
|
||||
Reference in New Issue
Block a user