Skip to content

fix(core): ensure stable fallback for restricted preview models #26999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
galdawave merged 6 commits into from
May 13, 2026
Merged

fix(core): ensure stable fallback for restricted preview models #26999

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a2f4f7f
fix(core): ensure stable fallback for restricted preview models
galdawave May 13, 2026
837e3f0
chore: fix lint and build errors
galdawave May 13, 2026
9df28ab
Merge branch 'main' into galzahavi/fix/utility-calls
galdawave May 13, 2026
1c3d46d
Merge branch 'main' into galzahavi/fix/utility-calls
galdawave May 13, 2026
b72ce1b
chore: resolve duplicate
galdawave May 13, 2026
05d1b7a
Merge branch 'main' into galzahavi/fix/utility-calls
galdawave May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions packages/core/src/availability/policyHelpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,9 @@ export function resolvePolicyChain(
const useCustomToolModel = config.getUseCustomToolModelSync?.() ?? false;
const hasAccessToPreview = config.getHasAccessToPreviewModel?.() ?? true;

// Capture the original family intent before any normalization or early downgrade.
const isOriginallyGemini3 = isGemini3Model(modelFromConfig, config);

const resolvedModel = normalizeModelId(
resolveModel(
modelFromConfig,
Expand All @@ -78,7 +81,7 @@ export function resolvePolicyChain(
wrapsAround ||
isAutoPreferred ||
isAutoConfigured ||
isGemini3Model(resolvedModel, config);
isOriginallyGemini3;

// --- DYNAMIC PATH ---
if (config.getExperimentalDynamicModelConfiguration?.() === true) {
Expand All @@ -91,7 +94,7 @@ export function resolvePolicyChain(
if (resolvedModel === DEFAULT_GEMINI_FLASH_LITE_MODEL) {
chain = config.modelConfigService.resolveChain('lite', context);
} else if (
isGemini3Model(normalizeModelId(resolvedModel), config) ||
isOriginallyGemini3 ||
isAutoPreferred ||
isAutoConfigured
) {
Expand Down Expand Up @@ -132,14 +135,14 @@ export function resolvePolicyChain(
if (resolvedModel === DEFAULT_GEMINI_FLASH_LITE_MODEL) {
chain = getFlashLitePolicyChain();
} else if (
isGemini3Model(resolvedModel, config) ||
isOriginallyGemini3 ||
isAutoPreferred ||
isAutoConfigured
) {
const isAutoSelection = isAutoPreferred || isAutoConfigured;
if (hasAccessToPreview) {
const previewEnabled =
isGemini3Model(resolvedModel, config) ||
isOriginallyGemini3 ||
normalizedPreferredModel === PREVIEW_GEMINI_MODEL_AUTO ||
configuredModel === PREVIEW_GEMINI_MODEL_AUTO;
chain = getModelPolicyChain({
Expand Down
5 changes: 1 addition & 4 deletions packages/core/src/config/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1630,10 +1630,7 @@ export class Config implements McpContext, AgentLoopContext {
this.baseLlmClient = new BaseLlmClient(this.contentGenerator, this);

const authType = this.contentGeneratorConfig.authType;
if (
authType === AuthType.USE_GEMINI ||
authType === AuthType.USE_VERTEX_AI
) {
if (authType === AuthType.USE_GEMINI) {
this.setHasAccessToPreviewModel(true);
}

Expand Down
Loading