@google/gemini-cli 0.61.0-preview.0 → 0.61.0

package/bundle/{chunk-ACTC6X24.js → chunk-JDPZ4CE3.js}

@@ -279752,14 +279752,27 @@ var PREVIEW_GEMINI_3_1_MODEL = "gemini-3.1-pro-preview";
 var PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL = "gemini-3.1-pro-preview-customtools";
 var PREVIEW_GEMINI_FLASH_MODEL = "gemini-3-flash-preview";
 var DEFAULT_GEMINI_MODEL = "gemini-2.5-pro";
-var DEFAULT_GEMINI_FLASH_MODEL = "gemini-2.5-flash";
-var DEFAULT_GEMINI_3_5_FLASH_MODEL = "gemini-3.5-flash";
-var SECONDARY_GEMINI_3_5_FLASH_MODEL = "gemini-3-flash";
+var BASE_GEMINI_FLASH_MODEL = "gemini-3.5-flash";
+var LATEST_GEMINI_FLASH_MODEL = "gemini-3.8-flash";
+var LEGACY_CCPA_FLASH_MODEL = "gemini-3-flash";
+var DEFAULT_GEMINI_3_5_FLASH_MODEL = BASE_GEMINI_FLASH_MODEL;
+var SECONDARY_GEMINI_3_5_FLASH_MODEL = LEGACY_CCPA_FLASH_MODEL;
+var BASE_GEMINI_FLASH_LITE_MODEL = "gemini-3.1-flash-lite";
+var LATEST_GEMINI_FLASH_LITE_MODEL = "gemini-3.5-flash-lite";
+var DEFAULT_GEMINI_FLASH_MODEL = BASE_GEMINI_FLASH_MODEL;
+var DEFAULT_GEMINI_FLASH_LITE_MODEL = BASE_GEMINI_FLASH_LITE_MODEL;
 function setFlashModels(preview, defaultFlash) {
   PREVIEW_GEMINI_FLASH_MODEL = preview;
   DEFAULT_GEMINI_FLASH_MODEL = defaultFlash;
 }
-var DEFAULT_GEMINI_FLASH_LITE_MODEL = "gemini-3.1-flash-lite";
+function setFlashLiteModel(defaultFlashLite) {
+  DEFAULT_GEMINI_FLASH_LITE_MODEL = defaultFlashLite;
+}
+function resetModelsForTesting() {
+  PREVIEW_GEMINI_FLASH_MODEL = "gemini-3-flash-preview";
+  DEFAULT_GEMINI_FLASH_MODEL = BASE_GEMINI_FLASH_MODEL;
+  DEFAULT_GEMINI_FLASH_LITE_MODEL = BASE_GEMINI_FLASH_LITE_MODEL;
+}
 var PREVIEW_GEMINI_FLASH_LITE_MODEL = "none";
 var GEMMA_4_31B_IT_MODEL = "gemma-4-31b-it";
 var GEMMA_4_26B_A4B_IT_MODEL = "gemma-4-26b-a4b-it";
@@ -279774,9 +279787,29 @@ var VALID_GEMINI_MODELS = /* @__PURE__ */ new Set([
   DEFAULT_GEMINI_3_5_FLASH_MODEL,
   SECONDARY_GEMINI_3_5_FLASH_MODEL,
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
+  BASE_GEMINI_FLASH_MODEL,
+  LATEST_GEMINI_FLASH_MODEL,
+  LEGACY_CCPA_FLASH_MODEL,
+  BASE_GEMINI_FLASH_LITE_MODEL,
+  LATEST_GEMINI_FLASH_LITE_MODEL,
   GEMMA_4_31B_IT_MODEL,
   GEMMA_4_26B_A4B_IT_MODEL
 ]);
+function getBackendModelMappings(context2, isCodeAssistBackend = true) {
+  const mappings = {};
+  const useLatestFlash = context2?.hasLatestFlashGAAccess?.() ?? false;
+  const useLatestFlashLite = context2?.hasLatestFlashLiteGAAccess?.() ?? false;
+  if (useLatestFlash) {
+    mappings[BASE_GEMINI_FLASH_MODEL] = LATEST_GEMINI_FLASH_MODEL;
+    mappings[LEGACY_CCPA_FLASH_MODEL] = LATEST_GEMINI_FLASH_MODEL;
+  } else if (isCodeAssistBackend) {
+    mappings[BASE_GEMINI_FLASH_MODEL] = LEGACY_CCPA_FLASH_MODEL;
+  }
+  if (useLatestFlashLite) {
+    mappings[BASE_GEMINI_FLASH_LITE_MODEL] = LATEST_GEMINI_FLASH_LITE_MODEL;
+  }
+  return mappings;
+}
 var PREVIEW_GEMINI_MODEL_AUTO = "auto-gemini-3";
 var DEFAULT_GEMINI_MODEL_AUTO = "auto-gemini-2.5";
 var GEMINI_MODEL_ALIAS_AUTO = "auto";
@@ -279785,26 +279818,29 @@ var GEMINI_MODEL_ALIAS_FLASH = "flash";
 var GEMINI_MODEL_ALIAS_FLASH_LITE = "flash-lite";
 var DEFAULT_GEMINI_EMBEDDING_MODEL = "gemini-embedding-001";
 var DEFAULT_THINKING_MODE = 8192;
-function getAutoModelDescription(hasAccessToPreview, useGemini3_1 = false, useGemini3_5Flash = false) {
+function getAutoModelDescription(hasAccessToPreview, useGemini3_1 = false, useLatestFlash = false) {
   const proModel = hasAccessToPreview ? useGemini3_1 ? PREVIEW_GEMINI_3_1_MODEL : PREVIEW_GEMINI_MODEL : DEFAULT_GEMINI_MODEL;
-  const flashModel = hasAccessToPreview ? useGemini3_5Flash ? DEFAULT_GEMINI_3_5_FLASH_MODEL : PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
+  const flashModel = hasAccessToPreview ? useLatestFlash ? LATEST_GEMINI_FLASH_MODEL : PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
   return `Let Gemini CLI decide the best model for the task: ${getDisplayString(proModel)}, ${getDisplayString(flashModel)}`;
 }
-function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel = false, hasAccessToPreview = true, config2, useGemini3_5Flash = false) {
+function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel = false, hasAccessToPreview = true, config2, useLatestFlash = false, useLatestFlashLite = false) {
   const normalizedModel = Array.isArray(requestedModel) ? String(requestedModel.at(-1) ?? "").trim() || "" : typeof requestedModel !== "string" ? String(requestedModel ?? "").trim() || "" : requestedModel.trim() || "";
+  const effectiveUseLatestFlash = useLatestFlash || (config2?.hasLatestFlashGAAccess?.() ?? false);
+  const effectiveUseLatestFlashLite = useLatestFlashLite || (config2?.hasLatestFlashLiteGAAccess?.() ?? false);
   if (config2?.getExperimentalDynamicModelConfiguration?.() === true) {
     const resolved2 = config2.modelConfigService.resolveModelId(normalizedModel, {
       useGemini3_1,
       useCustomTools: useCustomToolModel,
       hasAccessToPreview,
-      useGemini3_5Flash
+      useLatestFlash: effectiveUseLatestFlash,
+      useLatestFlashLite: effectiveUseLatestFlashLite
     });
     if (!hasAccessToPreview && isPreviewModel(resolved2, config2)) {
       if (resolved2.includes("flash-lite")) {
-        return DEFAULT_GEMINI_FLASH_LITE_MODEL;
+        return effectiveUseLatestFlashLite ? LATEST_GEMINI_FLASH_LITE_MODEL : BASE_GEMINI_FLASH_LITE_MODEL;
       }
       if (resolved2.includes("flash")) {
-        return DEFAULT_GEMINI_FLASH_MODEL;
+        return effectiveUseLatestFlash ? LATEST_GEMINI_FLASH_MODEL : BASE_GEMINI_FLASH_MODEL;
       }
       return DEFAULT_GEMINI_MODEL;
     }
@@ -279833,11 +279869,11 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
       break;
     }
     case GEMINI_MODEL_ALIAS_FLASH: {
-      resolved = useGemini3_5Flash ? DEFAULT_GEMINI_FLASH_MODEL : PREVIEW_GEMINI_FLASH_MODEL;
+      resolved = effectiveUseLatestFlash ? LATEST_GEMINI_FLASH_MODEL : PREVIEW_GEMINI_FLASH_MODEL;
       break;
     }
     case GEMINI_MODEL_ALIAS_FLASH_LITE: {
-      resolved = DEFAULT_GEMINI_FLASH_LITE_MODEL;
+      resolved = effectiveUseLatestFlashLite ? LATEST_GEMINI_FLASH_LITE_MODEL : BASE_GEMINI_FLASH_LITE_MODEL;
       break;
     }
     default: {
@@ -279846,25 +279882,28 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
     }
   }
   if (resolved === "none") {
-    return DEFAULT_GEMINI_FLASH_LITE_MODEL;
+    return effectiveUseLatestFlashLite ? LATEST_GEMINI_FLASH_LITE_MODEL : BASE_GEMINI_FLASH_LITE_MODEL;
+  }
+  if (effectiveUseLatestFlash && isPromotableFlashModel(resolved) && normalizedModel !== PREVIEW_GEMINI_FLASH_MODEL) {
+    return LATEST_GEMINI_FLASH_MODEL;
   }
-  if (useGemini3_5Flash && isPromotableFlashModel(resolved) && normalizedModel !== PREVIEW_GEMINI_FLASH_MODEL) {
-    return DEFAULT_GEMINI_FLASH_MODEL;
+  if (effectiveUseLatestFlashLite && isPromotableFlashLiteModel(resolved)) {
+    return LATEST_GEMINI_FLASH_LITE_MODEL;
   }
   if (!hasAccessToPreview && isPreviewModel(resolved)) {
     switch (resolved) {
       case PREVIEW_GEMINI_FLASH_MODEL:
-        return DEFAULT_GEMINI_FLASH_MODEL;
+        return effectiveUseLatestFlash ? LATEST_GEMINI_FLASH_MODEL : BASE_GEMINI_FLASH_MODEL;
       case PREVIEW_GEMINI_MODEL:
       case PREVIEW_GEMINI_3_1_MODEL:
       case PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL:
         return DEFAULT_GEMINI_MODEL;
       default:
         if (resolved.includes("flash-lite")) {
-          return DEFAULT_GEMINI_FLASH_LITE_MODEL;
+          return effectiveUseLatestFlashLite ? LATEST_GEMINI_FLASH_LITE_MODEL : BASE_GEMINI_FLASH_LITE_MODEL;
         }
         if (resolved.includes("flash")) {
-          return DEFAULT_GEMINI_FLASH_MODEL;
+          return effectiveUseLatestFlash ? LATEST_GEMINI_FLASH_MODEL : BASE_GEMINI_FLASH_MODEL;
         }
         return DEFAULT_GEMINI_MODEL;
     }
@@ -279872,30 +279911,40 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
   return resolved;
 }
 function isPromotableFlashModel(model) {
-  return model === DEFAULT_GEMINI_FLASH_MODEL || model === PREVIEW_GEMINI_FLASH_MODEL || model === DEFAULT_GEMINI_3_5_FLASH_MODEL || model === SECONDARY_GEMINI_3_5_FLASH_MODEL || model === GEMINI_MODEL_ALIAS_FLASH;
+  return model === DEFAULT_GEMINI_FLASH_MODEL || model === PREVIEW_GEMINI_FLASH_MODEL || model === DEFAULT_GEMINI_3_5_FLASH_MODEL || model === SECONDARY_GEMINI_3_5_FLASH_MODEL || model === GEMINI_MODEL_ALIAS_FLASH || model === BASE_GEMINI_FLASH_MODEL || model === LEGACY_CCPA_FLASH_MODEL;
+}
+function isPromotableFlashLiteModel(model) {
+  return model === DEFAULT_GEMINI_FLASH_LITE_MODEL || model === BASE_GEMINI_FLASH_LITE_MODEL || model === GEMINI_MODEL_ALIAS_FLASH_LITE;
 }
-function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false, useCustomToolModel = false, hasAccessToPreview = true, config2, useGemini3_5Flash = false) {
+function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false, useCustomToolModel = false, hasAccessToPreview = true, config2, useLatestFlash = false, useLatestFlashLite = false) {
+  const effectiveUseLatestFlash = useLatestFlash || (config2?.hasLatestFlashGAAccess?.() ?? false);
+  const effectiveUseLatestFlashLite = useLatestFlashLite || (config2?.hasLatestFlashLiteGAAccess?.() ?? false);
+  const effectiveHasAccessToPreview = hasAccessToPreview || (config2?.getHasAccessToPreviewModel?.() ?? false);
   if (config2?.getExperimentalDynamicModelConfiguration?.() === true) {
     return config2.modelConfigService.resolveClassifierModelId(modelAlias, requestedModel, {
       useGemini3_1,
       useCustomTools: useCustomToolModel,
-      hasAccessToPreview,
-      useGemini3_5Flash
+      hasAccessToPreview: effectiveHasAccessToPreview,
+      useLatestFlash: effectiveUseLatestFlash,
+      useLatestFlashLite: effectiveUseLatestFlashLite
     });
   }
   if (modelAlias === GEMINI_MODEL_ALIAS_FLASH) {
     if (requestedModel === DEFAULT_GEMINI_MODEL_AUTO || requestedModel === DEFAULT_GEMINI_MODEL) {
-      return DEFAULT_GEMINI_FLASH_MODEL;
+      return effectiveUseLatestFlash ? LATEST_GEMINI_FLASH_MODEL : BASE_GEMINI_FLASH_MODEL;
     }
     if (requestedModel === PREVIEW_GEMINI_MODEL_AUTO || requestedModel === PREVIEW_GEMINI_MODEL || requestedModel === GEMINI_MODEL_ALIAS_AUTO) {
-      if (useGemini3_5Flash) {
-        return DEFAULT_GEMINI_FLASH_MODEL;
+      if (effectiveUseLatestFlash) {
+        return LATEST_GEMINI_FLASH_MODEL;
       }
-      return hasAccessToPreview ? PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
+      return effectiveHasAccessToPreview ? PREVIEW_GEMINI_FLASH_MODEL : BASE_GEMINI_FLASH_MODEL;
     }
-    return resolveModel(GEMINI_MODEL_ALIAS_FLASH, false, false, hasAccessToPreview, config2, useGemini3_5Flash);
+    return resolveModel(GEMINI_MODEL_ALIAS_FLASH, false, false, effectiveHasAccessToPreview, config2, effectiveUseLatestFlash, effectiveUseLatestFlashLite);
+  }
+  if (modelAlias === GEMINI_MODEL_ALIAS_FLASH_LITE) {
+    return resolveModel(GEMINI_MODEL_ALIAS_FLASH_LITE, false, false, effectiveHasAccessToPreview, config2, effectiveUseLatestFlash, effectiveUseLatestFlashLite);
   }
-  return resolveModel(requestedModel, useGemini3_1, useCustomToolModel, hasAccessToPreview, config2, useGemini3_5Flash);
+  return resolveModel(requestedModel, useGemini3_1, useCustomToolModel, effectiveHasAccessToPreview, config2, effectiveUseLatestFlash, effectiveUseLatestFlashLite);
 }
 function getDisplayString(model, config2) {
   if (config2?.getExperimentalDynamicModelConfiguration?.() === true) {
@@ -279904,9 +279953,14 @@ function getDisplayString(model, config2) {
       return definition.displayName;
     }
   }
+  const useLatestFlash = config2?.hasLatestFlashGAAccess?.() ?? false;
+  const useLatestFlashLite = config2?.hasLatestFlashLiteGAAccess?.() ?? false;
   switch (model) {
-    case "gemini-3-flash":
-      return DEFAULT_GEMINI_3_5_FLASH_MODEL;
+    case LEGACY_CCPA_FLASH_MODEL:
+    case BASE_GEMINI_FLASH_MODEL:
+      return useLatestFlash ? LATEST_GEMINI_FLASH_MODEL : BASE_GEMINI_FLASH_MODEL;
+    case BASE_GEMINI_FLASH_LITE_MODEL:
+      return useLatestFlashLite ? LATEST_GEMINI_FLASH_LITE_MODEL : BASE_GEMINI_FLASH_LITE_MODEL;
     case GEMINI_MODEL_ALIAS_AUTO:
       return "Auto";
     case PREVIEW_GEMINI_MODEL_AUTO:
@@ -283246,8 +283300,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "ae28844fb";
-var CLI_VERSION = "0.61.0-preview.0";
+var GIT_COMMIT_INFO = "cc0107ed2";
+var CLI_VERSION = "0.61.0";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -306541,7 +306595,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.61.0-preview.0";
+    return "0.61.0";
   })();
   return versionPromise;
 }
@@ -307406,25 +307460,10 @@ var AUTO_ROUTING_OVERRIDES = {
     transient: "sticky_retry"
   }
 };
-var FLASH_LITE_CHAIN = [
-  definePolicy({
-    model: DEFAULT_GEMINI_FLASH_LITE_MODEL,
-    actions: SILENT_ACTIONS
-  }),
-  definePolicy({
-    model: DEFAULT_GEMINI_FLASH_MODEL,
-    actions: SILENT_ACTIONS
-  }),
-  definePolicy({
-    model: DEFAULT_GEMINI_MODEL,
-    isLastResort: true,
-    actions: SILENT_ACTIONS
-  })
-];
 function getModelPolicyChain(options) {
   const isAuto = options.isAutoSelection ?? false;
   if (options.previewEnabled) {
-    const proModel = resolveModel(PREVIEW_GEMINI_MODEL, options.useGemini31, options.useCustomToolModel, true, void 0, options.useGemini3_5Flash);
+    const proModel = resolveModel(PREVIEW_GEMINI_MODEL, options.useGemini31, options.useCustomToolModel, true, void 0, options.useLatestFlash, options.useLatestFlashLite);
     return [
       definePolicy({
         model: proModel,
@@ -307457,7 +307496,21 @@ function createSingleModelChain(model) {
   return [definePolicy({ model, isLastResort: true })];
 }
 function getFlashLitePolicyChain() {
-  return cloneChain(FLASH_LITE_CHAIN);
+  return [
+    definePolicy({
+      model: DEFAULT_GEMINI_FLASH_LITE_MODEL,
+      actions: SILENT_ACTIONS
+    }),
+    definePolicy({
+      model: DEFAULT_GEMINI_FLASH_MODEL,
+      actions: SILENT_ACTIONS
+    }),
+    definePolicy({
+      model: DEFAULT_GEMINI_MODEL,
+      isLastResort: true,
+      actions: SILENT_ACTIONS
+    })
+  ];
 }
 function createDefaultPolicy(model, options) {
   return definePolicy({ model, isLastResort: options?.isLastResort });
@@ -307474,16 +307527,6 @@ function definePolicy(config2) {
     }
   };
 }
-function clonePolicy(policy) {
-  return {
-    ...policy,
-    actions: { ...policy.actions },
-    stateTransitions: { ...policy.stateTransitions }
-  };
-}
-function cloneChain(chain2) {
-  return chain2.map(clonePolicy);
-}
 
 // packages/core/dist/src/utils/modelUtils.js
 function normalizeModelId(modelId) {
@@ -307499,9 +307542,10 @@ function resolvePolicyChain(config2, preferredModel, wrapsAround = false) {
   const useGemini31 = config2.getGemini31LaunchedSync?.() ?? false;
   const useCustomToolModel = config2.getUseCustomToolModelSync?.() ?? false;
   const hasAccessToPreview = config2.getHasAccessToPreviewModel?.() ?? false;
-  const useGemini3_5Flash = config2.hasGemini35FlashGAAccess?.() ?? false;
+  const useLatestFlash = config2.hasLatestFlashGAAccess?.() ?? false;
+  const useLatestFlashLite = config2.hasLatestFlashLiteGAAccess?.() ?? false;
   const isOriginallyGemini3 = isGemini3Model(modelFromConfig, config2);
-  const resolvedModel = normalizeModelId(resolveModel(modelFromConfig, useGemini31, useCustomToolModel, hasAccessToPreview, config2, useGemini3_5Flash));
+  const resolvedModel = normalizeModelId(resolveModel(modelFromConfig, useGemini31, useCustomToolModel, hasAccessToPreview, config2, useLatestFlash, useLatestFlashLite));
   const isAutoPreferred = normalizedPreferredModel ? isAutoModel(normalizedPreferredModel, config2) : false;
   const isAutoConfigured = isAutoModel(configuredModel, config2);
   const effectiveWrapsAround = wrapsAround || isAutoPreferred || isAutoConfigured || isOriginallyGemini3;
@@ -307509,7 +307553,8 @@ function resolvePolicyChain(config2, preferredModel, wrapsAround = false) {
     const context2 = {
       useGemini3_1: useGemini31,
       useCustomTools: useCustomToolModel,
-      useGemini3_5Flash
+      useLatestFlash,
+      useLatestFlashLite
     };
     if (resolvedModel === DEFAULT_GEMINI_FLASH_LITE_MODEL) {
       chain2 = config2.modelConfigService.resolveChain("lite", context2);
@@ -307519,7 +307564,7 @@ function resolvePolicyChain(config2, preferredModel, wrapsAround = false) {
       }
       if (!chain2) {
         const isAutoSelection = isAutoPreferred || isAutoConfigured;
-        const previewEnabled = hasAccessToPreview && (isGemini3Model(resolvedModel, config2) || normalizedPreferredModel === PREVIEW_GEMINI_MODEL_AUTO || configuredModel === PREVIEW_GEMINI_MODEL_AUTO);
+        const previewEnabled = hasAccessToPreview && configuredModel !== DEFAULT_GEMINI_MODEL_AUTO && (isGemini3Model(resolvedModel, config2) || normalizedPreferredModel === PREVIEW_GEMINI_MODEL_AUTO || configuredModel === PREVIEW_GEMINI_MODEL_AUTO);
         const autoPrefix = isAutoSelection ? "auto-" : "";
         const chainKey = previewEnabled ? "preview" : "default";
         chain2 = config2.modelConfigService.resolveChain(`${autoPrefix}${chainKey}`, context2);
@@ -307535,14 +307580,15 @@ function resolvePolicyChain(config2, preferredModel, wrapsAround = false) {
     } else if (isOriginallyGemini3 || isAutoPreferred || isAutoConfigured) {
       const isAutoSelection = isAutoPreferred || isAutoConfigured;
       if (hasAccessToPreview) {
-        const previewEnabled = isOriginallyGemini3 || normalizedPreferredModel === PREVIEW_GEMINI_MODEL_AUTO || configuredModel === PREVIEW_GEMINI_MODEL_AUTO;
+        const previewEnabled = configuredModel !== DEFAULT_GEMINI_MODEL_AUTO && (isOriginallyGemini3 || normalizedPreferredModel === PREVIEW_GEMINI_MODEL_AUTO || configuredModel === PREVIEW_GEMINI_MODEL_AUTO);
         chain2 = getModelPolicyChain({
           previewEnabled,
           isAutoSelection,
           userTier: config2.getUserTier(),
           useGemini31,
           useCustomToolModel,
-          useGemini3_5Flash
+          useLatestFlash,
+          useLatestFlashLite
         });
       } else {
         chain2 = getModelPolicyChain({
@@ -307551,7 +307597,8 @@ function resolvePolicyChain(config2, preferredModel, wrapsAround = false) {
           userTier: config2.getUserTier(),
           useGemini31,
           useCustomToolModel,
-          useGemini3_5Flash
+          useLatestFlash,
+          useLatestFlashLite
         });
       }
     } else {
@@ -307601,8 +307648,8 @@ function createAvailabilityContextProvider(config2, modelGetter) {
 }
 function selectModelForAvailability(config2, requestedModel) {
   const chain2 = resolvePolicyChain(config2, requestedModel);
-  const selection = config2.getModelAvailabilityService().selectFirstAvailable(chain2.map((p) => p.model));
-  if (selection.selectedModel)
+  const selection = config2.getModelAvailabilityService?.()?.selectFirstAvailable(chain2.map((p) => p.model));
+  if (selection?.selectedModel)
     return selection;
   const backupModel = chain2.find((p) => p.isLastResort)?.model ?? DEFAULT_GEMINI_MODEL;
   return { selectedModel: backupModel, skipped: [] };
@@ -311494,11 +311541,12 @@ var ModelMappingContentGenerator = class {
   }
   mapModel(req) {
     if (req.model) {
+      const activeMappings = typeof this.mappings === "function" ? this.mappings() : this.mappings;
       const normalizedModel = normalizeModelId(req.model);
-      if (this.mappings[normalizedModel]) {
+      if (activeMappings[normalizedModel]) {
         return {
           ...req,
-          model: req.model.startsWith("models/") ? `models/${this.mappings[normalizedModel]}` : this.mappings[normalizedModel]
+          model: req.model.startsWith("models/") ? `models/${activeMappings[normalizedModel]}` : activeMappings[normalizedModel]
         };
       }
     }
@@ -311913,7 +311961,7 @@ async function createContentGenerator(config2, gcConfig, sessionId) {
     }
     if (config2.authType === AuthType2.LOGIN_WITH_GOOGLE || config2.authType === AuthType2.COMPUTE_ADC) {
       const httpOptions = { headers: baseHeaders };
-      return new LoggingContentGenerator(new ModelMappingContentGenerator(await createCodeAssistContentGenerator(httpOptions, config2.authType, gcConfig, sessionId), CCPA_AI_MODEL_MAPPINGS), gcConfig);
+      return new LoggingContentGenerator(new ModelMappingContentGenerator(await createCodeAssistContentGenerator(httpOptions, config2.authType, gcConfig, sessionId), () => getBackendModelMappings(gcConfig, true)), gcConfig);
     }
     if (config2.authType === AuthType2.USE_GEMINI || config2.authType === AuthType2.USE_VERTEX_AI || config2.authType === AuthType2.GATEWAY) {
       let headers = { ...baseHeaders };
@@ -311982,7 +312030,7 @@ async function createContentGenerator(config2, gcConfig, sessionId) {
           }
         }
       });
-      return new LoggingContentGenerator(googleGenAI.models, gcConfig);
+      return new LoggingContentGenerator(new ModelMappingContentGenerator(googleGenAI.models, () => getBackendModelMappings(gcConfig, false)), gcConfig);
     }
     throw new Error(`Error creating contentGenerator: Unsupported authType: ${config2.authType}`);
   })();
@@ -335476,16 +335524,21 @@ function modelStringToModelConfigAlias(model) {
     case PREVIEW_GEMINI_3_1_MODEL:
       return "chat-compression-3-pro";
     case PREVIEW_GEMINI_FLASH_MODEL:
+    case BASE_GEMINI_FLASH_MODEL:
+    case LATEST_GEMINI_FLASH_MODEL:
+    case LEGACY_CCPA_FLASH_MODEL:
       return "chat-compression-3-flash";
     case PREVIEW_GEMINI_FLASH_LITE_MODEL:
     // fallthrough
+    case BASE_GEMINI_FLASH_LITE_MODEL:
     case DEFAULT_GEMINI_FLASH_LITE_MODEL:
+    case LATEST_GEMINI_FLASH_LITE_MODEL:
       return "chat-compression-3.1-flash-lite";
     case "gemini-2.5-flash-lite":
       return "chat-compression-2.5-flash-lite";
     case DEFAULT_GEMINI_MODEL:
       return "chat-compression-2.5-pro";
-    case DEFAULT_GEMINI_FLASH_MODEL:
+    case "gemini-2.5-flash":
       return "chat-compression-2.5-flash";
     default:
       return "chat-compression-default";
@@ -340084,7 +340137,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-SADAKLZ2.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-UXWR2XFY.js");
         const provider = new OAuth2AuthProvider(authConfig, options.agentName ?? "unknown", agentCard, options.agentCardUrl);
         await provider.initialize();
         return provider;
@@ -340228,7 +340281,7 @@ var ModelConfigService = class _ModelConfigService {
     const definitions = this.config.modelDefinitions ?? {};
     const shouldShowPreviewModels = context2.hasAccessToPreview ?? false;
     const useGemini31 = context2.useGemini3_1 ?? false;
-    const useGemini3_5Flash = context2.useGemini3_5Flash ?? false;
+    const useLatestFlash = context2.useLatestFlash ?? false;
     const mainOptions = Object.entries(definitions).filter(([_, m]) => {
       if (m.isVisible !== true)
         return false;
@@ -340240,7 +340293,7 @@ var ModelConfigService = class _ModelConfigService {
     }).map(([id, m]) => {
       let description = m.dialogDescription ?? "";
       if (id === "auto") {
-        description = getAutoModelDescription(shouldShowPreviewModels, useGemini31, useGemini3_5Flash);
+        description = getAutoModelDescription(shouldShowPreviewModels, useGemini31, useLatestFlash);
       } else if (id === "auto-gemini-3" && useGemini31) {
         description = description.replace("gemini-3-pro", "gemini-3.1-pro");
       }
@@ -340308,14 +340361,22 @@ var ModelConfigService = class _ModelConfigService {
       switch (key) {
         case "useGemini3_1":
           return value === context2.useGemini3_1;
-        case "useGemini3_1FlashLite":
-          return value === context2.useGemini3_1FlashLite;
-        case "useGemini3_5Flash":
-          return value === context2.useGemini3_5Flash;
+        case "useLatestFlashLite":
+        case "useGemini3_1FlashLite": {
+          const actualValue = key === "useLatestFlashLite" ? context2.useLatestFlashLite ?? context2.useGemini3_1FlashLite : context2.useGemini3_1FlashLite ?? context2.useLatestFlashLite;
+          return value === actualValue;
+        }
+        case "useLatestFlash":
+        case "useGemini3_5Flash": {
+          const actualValue = key === "useLatestFlash" ? context2.useLatestFlash ?? context2.useGemini3_5Flash : context2.useGemini3_5Flash ?? context2.useLatestFlash;
+          return value === actualValue;
+        }
         case "useCustomTools":
           return value === context2.useCustomTools;
         case "hasAccessToPreview":
           return value === context2.hasAccessToPreview;
+        case "hasAccessToProModel":
+          return value === context2.hasAccessToProModel;
         case "requestedModels":
           return Array.isArray(value) && !!context2.requestedModel && value.includes(context2.requestedModel);
         default:
@@ -359814,8 +359875,9 @@ ${formattedHistory}
         config2.getUseCustomToolModel(),
         config2.getHasAccessToPreviewModel()
       ]);
-      const useGemini3_5Flash = config2.hasGemini35FlashGAAccess?.() ?? false;
-      const selectedModel = resolveClassifierModel(context2.requestedModel ?? config2.getModel(), routerResponse.model_choice, useGemini3_1, useCustomToolModel, hasAccessToPreview, config2, useGemini3_5Flash);
+      const useLatestFlash = config2.hasLatestFlashGAAccess?.() ?? false;
+      const useLatestFlashLite = config2.hasLatestFlashLiteGAAccess?.() ?? false;
+      const selectedModel = resolveClassifierModel(context2.requestedModel ?? config2.getModel(), routerResponse.model_choice, useGemini3_1, useCustomToolModel, hasAccessToPreview, config2, useLatestFlash, useLatestFlashLite);
       return {
         model: selectedModel,
         metadata: {
@@ -359835,7 +359897,7 @@ ${formattedHistory}
 var DefaultStrategy = class {
   name = "default";
   async route(_context, config2, _baseLlmClient, _localLiteRtLmClient) {
-    const defaultModel = resolveModel(config2.getModel(), config2.getGemini31LaunchedSync?.() ?? false, false, config2.getHasAccessToPreviewModel?.() ?? true, config2, config2.hasGemini35FlashGAAccess?.() ?? false);
+    const defaultModel = resolveModel(config2.getModel(), config2.getGemini31LaunchedSync?.() ?? false, false, config2.getHasAccessToPreviewModel?.() ?? true, config2, config2.hasLatestFlashGAAccess?.() ?? false, config2.hasLatestFlashLiteGAAccess?.() ?? false);
     return {
       model: defaultModel,
       metadata: {
@@ -359976,8 +360038,9 @@ var ClassifierStrategy = class {
         config2.getGemini31Launched(),
         config2.getUseCustomToolModel()
       ]);
-      const useGemini3_5Flash = config2.hasGemini35FlashGAAccess?.() ?? false;
-      const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), routerResponse.model_choice, useGemini3_1, useCustomToolModel, config2.getHasAccessToPreviewModel?.() ?? true, config2, useGemini3_5Flash));
+      const useLatestFlash = config2.hasLatestFlashGAAccess?.() ?? false;
+      const useLatestFlashLite = config2.hasLatestFlashLiteGAAccess?.() ?? false;
+      const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), routerResponse.model_choice, useGemini3_1, useCustomToolModel, config2.getHasAccessToPreviewModel?.() ?? true, config2, useLatestFlash, useLatestFlashLite));
       const service = config2.getModelAvailabilityService();
       const snapshot = service.snapshot(selectedModel);
       if (!snapshot.available) {
@@ -360120,8 +360183,9 @@ var NumericalClassifierStrategy = class {
         config2.getGemini31Launched(),
         config2.getUseCustomToolModel()
       ]);
-      const useGemini3_5Flash = config2.hasGemini35FlashGAAccess?.() ?? false;
-      const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), modelAlias, useGemini3_1, useCustomToolModel, config2.getHasAccessToPreviewModel?.() ?? true, config2, useGemini3_5Flash));
+      const useLatestFlash = config2.hasLatestFlashGAAccess?.() ?? false;
+      const useLatestFlashLite = config2.hasLatestFlashLiteGAAccess?.() ?? false;
+      const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), modelAlias, useGemini3_1, useCustomToolModel, config2.getHasAccessToPreviewModel?.() ?? true, config2, useLatestFlash, useLatestFlashLite));
       const service = config2.getModelAvailabilityService();
       const snapshot = service.snapshot(selectedModel);
       if (!snapshot.available) {
@@ -360215,7 +360279,7 @@ var FallbackStrategy = class {
   name = "fallback";
   async route(context2, config2, _baseLlmClient, _localLiteRtLmClient) {
     const requestedModel = context2.requestedModel ?? config2.getModel();
-    const resolvedModel = resolveModel(requestedModel, config2.getGemini31LaunchedSync?.() ?? false, false, config2.getHasAccessToPreviewModel?.() ?? true, config2, config2.hasGemini35FlashGAAccess?.() ?? false);
+    const resolvedModel = resolveModel(requestedModel, config2.getGemini31LaunchedSync?.() ?? false, false, config2.getHasAccessToPreviewModel?.() ?? true, config2, config2.hasLatestFlashGAAccess?.() ?? false, config2.hasLatestFlashLiteGAAccess?.() ?? false);
     const service = config2.getModelAvailabilityService();
     const snapshot = service.snapshot(resolvedModel);
     if (snapshot.available) {
@@ -360245,7 +360309,7 @@ var OverrideStrategy = class {
       return null;
     }
     return {
-      model: resolveModel(overrideModel, config2.getGemini31LaunchedSync?.() ?? false, false, config2.getHasAccessToPreviewModel?.() ?? true, config2, config2.hasGemini35FlashGAAccess?.() ?? false),
+      model: resolveModel(overrideModel, config2.getGemini31LaunchedSync?.() ?? false, false, config2.getHasAccessToPreviewModel?.() ?? true, config2, config2.hasLatestFlashGAAccess?.() ?? false, config2.hasLatestFlashLiteGAAccess?.() ?? false),
       metadata: {
         source: this.name,
         latencyMs: 0,
@@ -360274,9 +360338,10 @@ var ApprovalModeStrategy = class {
       config2.getUseCustomToolModel(),
       config2.getHasAccessToPreviewModel()
     ]);
-    const useGemini3_5Flash = config2.hasGemini35FlashGAAccess?.() ?? false;
+    const useLatestFlash = config2.hasLatestFlashGAAccess?.() ?? false;
+    const useLatestFlashLite = config2.hasLatestFlashLiteGAAccess?.() ?? false;
     if (approvalMode === ApprovalMode.PLAN) {
-      const proModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_PRO, useGemini3_1, useCustomToolModel, hasAccessToPreview, config2, useGemini3_5Flash);
+      const proModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_PRO, useGemini3_1, useCustomToolModel, hasAccessToPreview, config2, useLatestFlash, useLatestFlashLite);
       return {
         model: proModel,
         metadata: {
@@ -360286,7 +360351,7 @@ var ApprovalModeStrategy = class {
         }
       };
     } else if (approvedPlanPath) {
-      const flashModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_FLASH, useGemini3_1, useCustomToolModel, hasAccessToPreview, config2, useGemini3_5Flash);
+      const flashModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_FLASH, useGemini3_1, useCustomToolModel, hasAccessToPreview, config2, useLatestFlash, useLatestFlashLite);
       return {
         model: flashModel,
         metadata: {
@@ -360483,12 +360548,24 @@ var DEFAULT_MODEL_CONFIGS = {
         model: "gemini-3.1-flash-lite"
       }
     },
+    "gemini-3.5-flash-lite": {
+      extends: "chat-base-3",
+      modelConfig: {
+        model: "gemini-3.5-flash-lite"
+      }
+    },
     "gemini-3.5-flash": {
       extends: "chat-base-3",
       modelConfig: {
         model: "gemini-3.5-flash"
       }
     },
+    "gemini-3.8-flash": {
+      extends: "chat-base-3",
+      modelConfig: {
+        model: "gemini-3.8-flash"
+      }
+    },
     "gemma-4-31b-it": {
       extends: "chat-base-3",
       modelConfig: {
@@ -360699,6 +360776,13 @@ var DEFAULT_MODEL_CONFIGS = {
       isVisible: true,
       features: { thinking: false, multimodalToolUse: true }
     },
+    "gemini-3.5-flash-lite": {
+      tier: "flash-lite",
+      family: "gemini-3",
+      isPreview: false,
+      isVisible: true,
+      features: { thinking: false, multimodalToolUse: true }
+    },
     "gemini-3.1-pro-preview": {
       tier: "pro",
       family: "gemini-3",
@@ -360734,6 +360818,13 @@ var DEFAULT_MODEL_CONFIGS = {
       isVisible: true,
       features: { thinking: false, multimodalToolUse: true }
     },
+    "gemini-3.8-flash": {
+      tier: "flash",
+      family: "gemini-3",
+      isPreview: false,
+      isVisible: true,
+      features: { thinking: false, multimodalToolUse: true }
+    },
     "gemini-2.5-pro": {
       tier: "pro",
       family: "gemini-2.5",
@@ -360837,32 +360928,40 @@ var DEFAULT_MODEL_CONFIGS = {
       default: "gemini-3-flash-preview",
       contexts: [
         {
-          condition: { hasAccessToPreview: false, useGemini3_5Flash: true },
-          target: "gemini-3.5-flash"
+          condition: { hasAccessToPreview: false, useLatestFlash: true },
+          target: LATEST_GEMINI_FLASH_MODEL
         },
         {
-          condition: { hasAccessToPreview: false, useGemini3_5Flash: false },
-          target: "gemini-2.5-flash"
+          condition: { hasAccessToPreview: false, useLatestFlash: false },
+          target: BASE_GEMINI_FLASH_MODEL
         }
       ]
     },
-    "gemini-3.5-flash": {
-      default: "gemini-3.5-flash",
+    [BASE_GEMINI_FLASH_MODEL]: {
+      default: BASE_GEMINI_FLASH_MODEL,
       contexts: [
         {
-          condition: { useGemini3_5Flash: false, hasAccessToPreview: false },
-          target: "gemini-2.5-flash"
-        },
+          condition: { useLatestFlash: true },
+          target: LATEST_GEMINI_FLASH_MODEL
+        }
+      ]
+    },
+    [LATEST_GEMINI_FLASH_MODEL]: {
+      default: LATEST_GEMINI_FLASH_MODEL,
+      contexts: [
         {
-          condition: { useGemini3_5Flash: false },
-          target: "gemini-3-flash-preview"
+          condition: { useLatestFlash: false },
+          target: BASE_GEMINI_FLASH_MODEL
         }
       ]
     },
     "gemini-2.5-flash": {
       default: "gemini-2.5-flash",
       contexts: [
-        { condition: { useGemini3_5Flash: true }, target: "gemini-3.5-flash" }
+        {
+          condition: { useLatestFlash: true },
+          target: LATEST_GEMINI_FLASH_MODEL
+        }
       ]
     },
     "gemini-3-pro-preview": {
@@ -360907,21 +361006,45 @@ var DEFAULT_MODEL_CONFIGS = {
         }
       ]
     },
-    "gemini-3.1-flash-lite": {
-      default: "gemini-3.1-flash-lite"
+    [BASE_GEMINI_FLASH_LITE_MODEL]: {
+      default: BASE_GEMINI_FLASH_LITE_MODEL,
+      contexts: [
+        {
+          condition: { useLatestFlashLite: true },
+          target: LATEST_GEMINI_FLASH_LITE_MODEL
+        }
+      ]
+    },
+    [LATEST_GEMINI_FLASH_LITE_MODEL]: {
+      default: LATEST_GEMINI_FLASH_LITE_MODEL,
+      contexts: [
+        {
+          condition: { useLatestFlashLite: false },
+          target: BASE_GEMINI_FLASH_LITE_MODEL
+        }
+      ]
     },
     flash: {
       default: "gemini-3-flash-preview",
       contexts: [
-        { condition: { useGemini3_5Flash: true }, target: "gemini-3.5-flash" },
+        {
+          condition: { useLatestFlash: true },
+          target: LATEST_GEMINI_FLASH_MODEL
+        },
         {
           condition: { hasAccessToPreview: false },
-          target: "gemini-2.5-flash"
+          target: BASE_GEMINI_FLASH_MODEL
         }
       ]
     },
     "flash-lite": {
-      default: "gemini-3.1-flash-lite"
+      default: BASE_GEMINI_FLASH_LITE_MODEL,
+      contexts: [
+        {
+          condition: { useLatestFlashLite: true },
+          target: LATEST_GEMINI_FLASH_LITE_MODEL
+        }
+      ]
     },
     "auto-gemini-3": {
       default: "gemini-3-pro-preview",
@@ -360945,14 +361068,17 @@ var DEFAULT_MODEL_CONFIGS = {
     flash: {
       default: "gemini-3-flash-preview",
       contexts: [
-        { condition: { useGemini3_5Flash: true }, target: "gemini-3.5-flash" },
+        {
+          condition: { useLatestFlash: true },
+          target: LATEST_GEMINI_FLASH_MODEL
+        },
         {
           condition: { hasAccessToPreview: false },
-          target: "gemini-2.5-flash"
+          target: BASE_GEMINI_FLASH_MODEL
         },
         {
           condition: { requestedModels: ["gemini-2.5-pro", "auto-gemini-2.5"] },
-          target: "gemini-2.5-flash"
+          target: BASE_GEMINI_FLASH_MODEL
         }
       ]
     },
@@ -361050,7 +361176,7 @@ var DEFAULT_MODEL_CONFIGS = {
     ],
     default: [
       {
-        model: "gemini-2.5-pro",
+        model: DEFAULT_GEMINI_MODEL,
         actions: {
           terminal: "prompt",
           transient: "prompt",
@@ -361065,7 +361191,7 @@ var DEFAULT_MODEL_CONFIGS = {
         }
       },
       {
-        model: "gemini-2.5-flash",
+        model: BASE_GEMINI_FLASH_MODEL,
         isLastResort: true,
         maxAttempts: 10,
         actions: {
@@ -361084,7 +361210,7 @@ var DEFAULT_MODEL_CONFIGS = {
     ],
     "auto-default": [
       {
-        model: "gemini-2.5-pro",
+        model: DEFAULT_GEMINI_MODEL,
         maxAttempts: 3,
         actions: {
           terminal: "prompt",
@@ -361100,7 +361226,7 @@ var DEFAULT_MODEL_CONFIGS = {
         }
       },
       {
-        model: "gemini-2.5-flash",
+        model: BASE_GEMINI_FLASH_MODEL,
         isLastResort: true,
         maxAttempts: 10,
         actions: {
@@ -361119,7 +361245,7 @@ var DEFAULT_MODEL_CONFIGS = {
     ],
     lite: [
       {
-        model: "flash-lite",
+        model: BASE_GEMINI_FLASH_LITE_MODEL,
         actions: {
           terminal: "silent",
           transient: "silent",
@@ -361134,7 +361260,7 @@ var DEFAULT_MODEL_CONFIGS = {
         }
       },
       {
-        model: "gemini-2.5-flash",
+        model: BASE_GEMINI_FLASH_MODEL,
         actions: {
           terminal: "silent",
           transient: "silent",
@@ -361149,7 +361275,7 @@ var DEFAULT_MODEL_CONFIGS = {
         }
       },
       {
-        model: "gemini-2.5-pro",
+        model: DEFAULT_GEMINI_MODEL,
         isLastResort: true,
         actions: {
           terminal: "silent",
@@ -364369,6 +364495,9 @@ var ExperimentFlags = {
   GEMINI_3_1_PRO_LAUNCHED: 45760185,
   PRO_MODEL_NO_ACCESS: 45768879,
   DEFAULT_REQUEST_TIMEOUT: 45773134,
+  LATEST_FLASH_GA_LAUNCHED: 45842815,
+  LATEST_FLASH_LITE_GA_LAUNCHED: 45827489,
+  /** @deprecated Use LATEST_FLASH_GA_LAUNCHED */
   GEMINI_3_5_FLASH_GA_LAUNCHED: 45780819
 };
 
@@ -379470,7 +379599,7 @@ var Config = class {
     if (!isAutoModel(model, this)) {
       return {};
     }
-    const primaryModel = resolveModel(model, this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasGemini35FlashGAAccess());
+    const primaryModel = resolveModel(model, this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasLatestFlashGAAccess(), this.hasLatestFlashLiteGAAccess());
     const isPreview2 = isPreviewModel(primaryModel, this);
     const proModel = primaryModel;
     const flashModel = isPreview2 ? PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
@@ -379491,7 +379620,7 @@ var Config = class {
     if (pooled.remaining !== void 0) {
       return pooled.remaining;
     }
-    const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasGemini35FlashGAAccess());
+    const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasLatestFlashGAAccess(), this.hasLatestFlashLiteGAAccess());
     return this.modelQuotas.get(primaryModel)?.remaining;
   }
   getQuotaLimit() {
@@ -379499,7 +379628,7 @@ var Config = class {
     if (pooled.limit !== void 0) {
       return pooled.limit;
     }
-    const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasGemini35FlashGAAccess());
+    const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasLatestFlashGAAccess(), this.hasLatestFlashLiteGAAccess());
     return this.modelQuotas.get(primaryModel)?.limit;
   }
   getQuotaResetTime() {
@@ -379507,7 +379636,7 @@ var Config = class {
     if (pooled.resetTime !== void 0) {
       return pooled.resetTime;
     }
-    const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasGemini35FlashGAAccess());
+    const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasLatestFlashGAAccess(), this.hasLatestFlashLiteGAAccess());
     return this.modelQuotas.get(primaryModel)?.resetTime;
   }
   getEmbeddingModel() {
@@ -379644,8 +379773,10 @@ var Config = class {
             continue;
           }
           let modelId = bucket.modelId;
-          if (modelId === SECONDARY_GEMINI_3_5_FLASH_MODEL) {
-            modelId = DEFAULT_GEMINI_3_5_FLASH_MODEL;
+          if (modelId === LEGACY_CCPA_FLASH_MODEL || modelId === BASE_GEMINI_FLASH_MODEL || modelId === LATEST_GEMINI_FLASH_MODEL) {
+            modelId = this.hasLatestFlashGAAccess() ? LATEST_GEMINI_FLASH_MODEL : BASE_GEMINI_FLASH_MODEL;
+          } else if (modelId === BASE_GEMINI_FLASH_LITE_MODEL || modelId === LATEST_GEMINI_FLASH_LITE_MODEL) {
+            modelId = this.hasLatestFlashLiteGAAccess() ? LATEST_GEMINI_FLASH_LITE_MODEL : BASE_GEMINI_FLASH_LITE_MODEL;
           }
           let remaining;
           let limit;
@@ -380505,29 +380636,45 @@ ${sections.join("\n")}
     return authType === AuthType2.USE_GEMINI || authType === AuthType2.USE_VERTEX_AI || authType === AuthType2.GATEWAY;
   }
   /**
-   * Returns whether Gemini 3.5 Flash GA has been launched.
-   *
-   * Note: This method should only be called after startup, once experiments have been loaded.
+   * Returns whether the latest Flash GA model (currently Gemini 3.8 Flash) has been launched.
    */
-  hasGemini35FlashGAAccess() {
+  hasLatestFlashGAAccess() {
     const authType = this.contentGeneratorConfig?.authType;
     const hasAccess = (() => {
       if (this.isGemini31LaunchedForAuthType(authType)) {
         return true;
       }
-      return this.experiments?.flags[ExperimentFlags.GEMINI_3_5_FLASH_GA_LAUNCHED]?.boolValue ?? false;
+      return this.experiments?.flags[ExperimentFlags.LATEST_FLASH_GA_LAUNCHED]?.boolValue ?? false;
     })();
     if (hasAccess) {
       if (authType === AuthType2.USE_GEMINI) {
-        setFlashModels("gemini-3-flash-preview", "gemini-3.5-flash");
+        setFlashModels("gemini-3-flash-preview", LATEST_GEMINI_FLASH_MODEL);
       } else {
-        setFlashModels("gemini-3.5-flash", "gemini-3.5-flash");
+        setFlashModels(LATEST_GEMINI_FLASH_MODEL, LATEST_GEMINI_FLASH_MODEL);
       }
     } else {
-      setFlashModels("gemini-3-flash-preview", "gemini-2.5-flash");
+      setFlashModels("gemini-3-flash-preview", BASE_GEMINI_FLASH_MODEL);
     }
     return hasAccess;
   }
+  /** @deprecated Use hasLatestFlashGAAccess() */
+  hasGemini35FlashGAAccess() {
+    return this.hasLatestFlashGAAccess();
+  }
+  /**
+   * Returns whether the latest Flash Lite GA model (currently Gemini 3.5 Flash Lite) has been launched.
+   */
+  hasLatestFlashLiteGAAccess() {
+    const authType = this.contentGeneratorConfig?.authType;
+    const hasAccess = (() => {
+      if (this.isGemini31LaunchedForAuthType(authType)) {
+        return true;
+      }
+      return this.experiments?.flags[ExperimentFlags.LATEST_FLASH_LITE_GA_LAUNCHED]?.boolValue ?? false;
+    })();
+    setFlashLiteModel(hasAccess ? LATEST_GEMINI_FLASH_LITE_MODEL : BASE_GEMINI_FLASH_LITE_MODEL);
+    return hasAccess;
+  }
   /**
    * Returns whether Gemini 3.1 has been launched.
    *
@@ -380920,6 +381067,8 @@ ${sections.join("\n")}
       compact: false
     });
     debugLogger.debug("Experiments loaded", summaryString);
+    this.hasLatestFlashGAAccess();
+    this.hasLatestFlashLiteGAAccess();
   }
   onAgentsRefreshed = async () => {
     const client = this.geminiClient;
@@ -398037,15 +398186,23 @@ export {
   PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL,
   PREVIEW_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_MODEL,
-  DEFAULT_GEMINI_FLASH_MODEL,
+  BASE_GEMINI_FLASH_MODEL,
+  LATEST_GEMINI_FLASH_MODEL,
+  LEGACY_CCPA_FLASH_MODEL,
   DEFAULT_GEMINI_3_5_FLASH_MODEL,
   SECONDARY_GEMINI_3_5_FLASH_MODEL,
-  setFlashModels,
+  BASE_GEMINI_FLASH_LITE_MODEL,
+  LATEST_GEMINI_FLASH_LITE_MODEL,
+  DEFAULT_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
+  setFlashModels,
+  setFlashLiteModel,
+  resetModelsForTesting,
   PREVIEW_GEMINI_FLASH_LITE_MODEL,
   GEMMA_4_31B_IT_MODEL,
   GEMMA_4_26B_A4B_IT_MODEL,
   VALID_GEMINI_MODELS,
+  getBackendModelMappings,
   PREVIEW_GEMINI_MODEL_AUTO,
   DEFAULT_GEMINI_MODEL_AUTO,
   GEMINI_MODEL_ALIAS_AUTO,