@google/gemini-cli-a2a-server 0.45.0 → 0.45.2

package/dist/a2a-server.mjs

@@ -130327,18 +130327,23 @@ var init_types8 = __esm({
 });
 
 // packages/core/dist/src/config/models.js
-function getAutoModelDescription(hasAccessToPreview, useGemini3_1 = false) {
+function setFlashModels(preview, defaultFlash) {
+  PREVIEW_GEMINI_FLASH_MODEL = preview;
+  DEFAULT_GEMINI_FLASH_MODEL = defaultFlash;
+}
+function getAutoModelDescription(hasAccessToPreview, useGemini3_1 = false, useGemini3_5Flash = false) {
   const proModel = hasAccessToPreview ? useGemini3_1 ? PREVIEW_GEMINI_3_1_MODEL : PREVIEW_GEMINI_MODEL : DEFAULT_GEMINI_MODEL;
-  const flashModel = hasAccessToPreview ? PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
-  return `Let Gemini CLI decide the best model for the task: ${proModel}, ${flashModel}`;
+  const flashModel = hasAccessToPreview ? useGemini3_5Flash ? DEFAULT_GEMINI_3_5_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, config3) {
+function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel = false, hasAccessToPreview = true, config3, useGemini3_5Flash = false) {
   const normalizedModel = Array.isArray(requestedModel) ? String(requestedModel.at(-1) ?? "").trim() || "" : typeof requestedModel !== "string" ? String(requestedModel ?? "").trim() || "" : requestedModel.trim() || "";
   if (config3?.getExperimentalDynamicModelConfiguration?.() === true) {
     const resolved2 = config3.modelConfigService.resolveModelId(normalizedModel, {
       useGemini3_1,
       useCustomTools: useCustomToolModel,
-      hasAccessToPreview
+      hasAccessToPreview,
+      useGemini3_5Flash
     });
     if (!hasAccessToPreview && isPreviewModel(resolved2, config3)) {
       if (resolved2.includes("flash-lite")) {
@@ -130374,7 +130379,7 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
       break;
     }
     case GEMINI_MODEL_ALIAS_FLASH: {
-      resolved = PREVIEW_GEMINI_FLASH_MODEL;
+      resolved = useGemini3_5Flash ? DEFAULT_GEMINI_FLASH_MODEL : PREVIEW_GEMINI_FLASH_MODEL;
       break;
     }
     case GEMINI_MODEL_ALIAS_FLASH_LITE: {
@@ -130389,6 +130394,9 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
   if (resolved === "none") {
     return DEFAULT_GEMINI_FLASH_LITE_MODEL;
   }
+  if (useGemini3_5Flash && isFlashModel(resolved) && normalizedModel !== PREVIEW_GEMINI_FLASH_MODEL) {
+    return DEFAULT_GEMINI_FLASH_MODEL;
+  }
   if (!hasAccessToPreview && isPreviewModel(resolved)) {
     switch (resolved) {
       case PREVIEW_GEMINI_FLASH_MODEL:
@@ -130409,12 +130417,16 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
   }
   return resolved;
 }
-function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false, useCustomToolModel = false, hasAccessToPreview = true, config3) {
+function isFlashModel(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 === "flash" || model.endsWith("flash");
+}
+function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false, useCustomToolModel = false, hasAccessToPreview = true, config3, useGemini3_5Flash = false) {
   if (config3?.getExperimentalDynamicModelConfiguration?.() === true) {
     return config3.modelConfigService.resolveClassifierModelId(modelAlias, requestedModel, {
       useGemini3_1,
       useCustomTools: useCustomToolModel,
-      hasAccessToPreview
+      hasAccessToPreview,
+      useGemini3_5Flash
     });
   }
   if (modelAlias === GEMINI_MODEL_ALIAS_FLASH) {
@@ -130422,11 +130434,14 @@ function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false
       return DEFAULT_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;
+      }
       return hasAccessToPreview ? PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
     }
-    return resolveModel(GEMINI_MODEL_ALIAS_FLASH, false, false, hasAccessToPreview);
+    return resolveModel(GEMINI_MODEL_ALIAS_FLASH, false, false, hasAccessToPreview, config3, useGemini3_5Flash);
   }
-  return resolveModel(requestedModel, useGemini3_1, useCustomToolModel, hasAccessToPreview, config3);
+  return resolveModel(requestedModel, useGemini3_1, useCustomToolModel, hasAccessToPreview, config3, useGemini3_5Flash);
 }
 function getDisplayString(model, config3) {
   if (config3?.getExperimentalDynamicModelConfiguration?.() === true) {
@@ -130436,6 +130451,8 @@ function getDisplayString(model, config3) {
     }
   }
   switch (model) {
+    case "gemini-3-flash":
+      return DEFAULT_GEMINI_3_5_FLASH_MODEL;
     case GEMINI_MODEL_ALIAS_AUTO:
       return "Auto";
     case PREVIEW_GEMINI_MODEL_AUTO:
@@ -130509,7 +130526,7 @@ function supportsMultimodalFunctionResponse(model, config3) {
   }
   return model.startsWith("gemini-3-");
 }
-var PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_3_1_MODEL, PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL, PREVIEW_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, PREVIEW_GEMINI_FLASH_LITE_MODEL, GEMMA_4_31B_IT_MODEL, GEMMA_4_26B_A4B_IT_MODEL, PREVIEW_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_MODEL_AUTO, GEMINI_MODEL_ALIAS_AUTO, GEMINI_MODEL_ALIAS_PRO, GEMINI_MODEL_ALIAS_FLASH, GEMINI_MODEL_ALIAS_FLASH_LITE, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_THINKING_MODE;
+var PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_3_1_MODEL, PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL, PREVIEW_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_3_5_FLASH_MODEL, SECONDARY_GEMINI_3_5_FLASH_MODEL, DEFAULT_GEMINI_FLASH_LITE_MODEL, PREVIEW_GEMINI_FLASH_LITE_MODEL, GEMMA_4_31B_IT_MODEL, GEMMA_4_26B_A4B_IT_MODEL, PREVIEW_GEMINI_MODEL_AUTO, DEFAULT_GEMINI_MODEL_AUTO, GEMINI_MODEL_ALIAS_AUTO, GEMINI_MODEL_ALIAS_PRO, GEMINI_MODEL_ALIAS_FLASH, GEMINI_MODEL_ALIAS_FLASH_LITE, DEFAULT_GEMINI_EMBEDDING_MODEL, DEFAULT_THINKING_MODE;
 var init_models = __esm({
   "packages/core/dist/src/config/models.js"() {
     "use strict";
@@ -130519,6 +130536,8 @@ var init_models = __esm({
     PREVIEW_GEMINI_FLASH_MODEL = "gemini-3-flash-preview";
     DEFAULT_GEMINI_MODEL = "gemini-2.5-pro";
     DEFAULT_GEMINI_FLASH_MODEL = "gemini-2.5-flash";
+    DEFAULT_GEMINI_3_5_FLASH_MODEL = "gemini-3.5-flash";
+    SECONDARY_GEMINI_3_5_FLASH_MODEL = "gemini-3-flash";
     DEFAULT_GEMINI_FLASH_LITE_MODEL = "gemini-3.1-flash-lite";
     PREVIEW_GEMINI_FLASH_LITE_MODEL = "none";
     GEMMA_4_31B_IT_MODEL = "gemma-4-31b-it";
@@ -211638,8 +211657,8 @@ var GIT_COMMIT_INFO, CLI_VERSION;
 var init_git_commit = __esm({
   "packages/core/dist/src/generated/git-commit.js"() {
     "use strict";
-    GIT_COMMIT_INFO = "8acfe0c4a";
-    CLI_VERSION = "0.45.0";
+    GIT_COMMIT_INFO = "7059517a0";
+    CLI_VERSION = "0.45.2";
   }
 });
 
@@ -332664,7 +332683,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.45.0";
+    return "0.45.2";
   })();
   return versionPromise;
 }
@@ -333503,7 +333522,7 @@ var init_errorClassification = __esm({
 function getModelPolicyChain(options) {
   const isAuto = options.isAutoSelection ?? false;
   if (options.previewEnabled) {
-    const proModel = resolveModel(PREVIEW_GEMINI_MODEL, options.useGemini31, options.useCustomToolModel);
+    const proModel = resolveModel(PREVIEW_GEMINI_MODEL, options.useGemini31, options.useCustomToolModel, true, void 0, options.useGemini3_5Flash);
     return [
       definePolicy({
         model: proModel,
@@ -333631,15 +333650,17 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
   const useGemini31 = config3.getGemini31LaunchedSync?.() ?? false;
   const useCustomToolModel = config3.getUseCustomToolModelSync?.() ?? false;
   const hasAccessToPreview = config3.getHasAccessToPreviewModel?.() ?? false;
+  const useGemini3_5Flash = config3.hasGemini35FlashGAAccess?.() ?? false;
   const isOriginallyGemini3 = isGemini3Model(modelFromConfig, config3);
-  const resolvedModel = normalizeModelId(resolveModel(modelFromConfig, useGemini31, useCustomToolModel, hasAccessToPreview, config3));
+  const resolvedModel = normalizeModelId(resolveModel(modelFromConfig, useGemini31, useCustomToolModel, hasAccessToPreview, config3, useGemini3_5Flash));
   const isAutoPreferred = normalizedPreferredModel ? isAutoModel(normalizedPreferredModel, config3) : false;
   const isAutoConfigured = isAutoModel(configuredModel, config3);
   const effectiveWrapsAround = wrapsAround || isAutoPreferred || isAutoConfigured || isOriginallyGemini3;
   if (config3.getExperimentalDynamicModelConfiguration?.() === true) {
     const context2 = {
       useGemini3_1: useGemini31,
-      useCustomTools: useCustomToolModel
+      useCustomTools: useCustomToolModel,
+      useGemini3_5Flash
     };
     if (resolvedModel === DEFAULT_GEMINI_FLASH_LITE_MODEL) {
       chain2 = config3.modelConfigService.resolveChain("lite", context2);
@@ -333671,7 +333692,8 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
           isAutoSelection,
           userTier: config3.getUserTier(),
           useGemini31,
-          useCustomToolModel
+          useCustomToolModel,
+          useGemini3_5Flash
         });
       } else {
         chain2 = getModelPolicyChain({
@@ -333679,7 +333701,8 @@ function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
           isAutoSelection,
           userTier: config3.getUserTier(),
           useGemini31,
-          useCustomToolModel
+          useCustomToolModel,
+          useGemini3_5Flash
         });
       }
     } else {
@@ -337747,7 +337770,7 @@ async function createContentGenerator(config3, gcConfig, sessionId) {
       return new LoggingContentGenerator(fakeGenerator, gcConfig);
     }
     const version4 = await getVersion();
-    const model = resolveModel(gcConfig.getModel(), config3.authType === AuthType2.USE_GEMINI || config3.authType === AuthType2.USE_VERTEX_AI || (await gcConfig.getGemini31Launched?.() ?? false), false, gcConfig.getHasAccessToPreviewModel?.() ?? true, gcConfig);
+    const model = resolveModel(gcConfig.getModel(), config3.authType === AuthType2.USE_GEMINI || config3.authType === AuthType2.USE_VERTEX_AI || (await gcConfig.getGemini31Launched?.() ?? false), false, gcConfig.getHasAccessToPreviewModel?.() ?? true, gcConfig, gcConfig.hasGemini35FlashGAAccess?.() ?? false);
     const customHeadersEnv = process.env["GEMINI_CLI_CUSTOM_HEADERS"] || void 0;
     const clientName = gcConfig.getClientName();
     const surface = determineSurface2();
@@ -354920,16 +354943,18 @@ ${result2.output}`;
           }
           signal.removeEventListener("abort", onAbort);
           timeoutController.signal.removeEventListener("abort", onAbort);
-          if (tempFilePath) {
-            try {
-              await fsPromises9.unlink(tempFilePath);
-            } catch {
+          if (!this.params.is_background) {
+            if (tempFilePath) {
+              try {
+                await fsPromises9.unlink(tempFilePath);
+              } catch {
+              }
             }
-          }
-          if (tempDir) {
-            try {
-              await fsPromises9.rm(tempDir, { recursive: true, force: true });
-            } catch {
+            if (tempDir) {
+              try {
+                await fsPromises9.rm(tempDir, { recursive: true, force: true });
+              } catch {
+              }
             }
           }
         }
@@ -362255,9 +362280,9 @@ var init_geminiChat = __esm({
         const apiCall = async () => {
           const useGemini3_1 = await this.context.config.getGemini31Launched?.() ?? false;
           const hasAccessToPreview = this.context.config.getHasAccessToPreviewModel?.() ?? true;
-          let modelToUse = resolveModel(lastModelToUse, useGemini3_1, false, hasAccessToPreview, this.context.config);
+          let modelToUse = resolveModel(lastModelToUse, useGemini3_1, false, hasAccessToPreview, this.context.config, this.context.config.hasGemini35FlashGAAccess?.() ?? false);
           if (this.context.config.getActiveModel() !== initialActiveModel) {
-            modelToUse = resolveModel(this.context.config.getActiveModel(), useGemini3_1, false, hasAccessToPreview, this.context.config);
+            modelToUse = resolveModel(this.context.config.getActiveModel(), useGemini3_1, false, hasAccessToPreview, this.context.config, this.context.config.hasGemini35FlashGAAccess?.() ?? false);
           }
           if (modelToUse !== lastModelToUse) {
             const { generateContentConfig: newConfig } = this.context.config.modelConfigService.getResolvedConfig({
@@ -362296,7 +362321,7 @@ var init_geminiChat = __esm({
               throw new AgentExecutionBlockedError(beforeModelResult.reason || "Model call blocked by hook", syntheticResponse);
             }
             if (beforeModelResult.modifiedModel) {
-              modelToUse = resolveModel(beforeModelResult.modifiedModel, useGemini3_1, false, hasAccessToPreview, this.context.config);
+              modelToUse = resolveModel(beforeModelResult.modifiedModel, useGemini3_1, false, hasAccessToPreview, this.context.config, this.context.config.hasGemini35FlashGAAccess?.() ?? false);
               lastModelToUse = modelToUse;
               contentsToUse = supportsModernFeatures(modelToUse) ? [...contentsForPreviewModel] : [...requestContents];
             }
@@ -364694,7 +364719,7 @@ var init_promptProvider = __esm({
         const isTopicUpdateNarrationEnabled = topicUpdateNarrationOverride ?? context2.config.isTopicUpdateNarrationEnabled();
         const enabledToolNames = new Set(toolNames);
         const approvedPlanPath = context2.config.getApprovedPlanPath();
-        const desiredModel = resolveModel(context2.config.getActiveModel(), context2.config.getGemini31LaunchedSync?.() ?? false, false, context2.config.getHasAccessToPreviewModel?.() ?? true, context2.config);
+        const desiredModel = resolveModel(context2.config.getActiveModel(), context2.config.getGemini31LaunchedSync?.() ?? false, false, context2.config.getHasAccessToPreviewModel?.() ?? true, context2.config, context2.config.hasGemini35FlashGAAccess?.() ?? false);
         const isModernModel = supportsModernFeatures(desiredModel);
         const activeSnippets = isModernModel ? snippets_exports : snippets_legacy_exports;
         const contextFilenames = getAllGeminiMdFilenames();
@@ -364812,7 +364837,7 @@ var init_promptProvider = __esm({
         return sanitizedPrompt;
       }
       getCompressionPrompt(context2) {
-        const desiredModel = resolveModel(context2.config.getActiveModel(), context2.config.getGemini31LaunchedSync?.() ?? false, false, context2.config.getHasAccessToPreviewModel?.() ?? true, context2.config);
+        const desiredModel = resolveModel(context2.config.getActiveModel(), context2.config.getGemini31LaunchedSync?.() ?? false, false, context2.config.getHasAccessToPreviewModel?.() ?? true, context2.config, context2.config.hasGemini35FlashGAAccess?.() ?? false);
         const isModernModel = supportsModernFeatures(desiredModel);
         const activeSnippets = isModernModel ? snippets_exports : snippets_legacy_exports;
         return activeSnippets.getCompressionPrompt(context2.config.getApprovedPlanPath());
@@ -374163,6 +374188,7 @@ var init_modelConfigService = __esm({
         const definitions = this.config.modelDefinitions ?? {};
         const shouldShowPreviewModels = context2.hasAccessToPreview ?? false;
         const useGemini31 = context2.useGemini3_1 ?? false;
+        const useGemini3_5Flash = context2.useGemini3_5Flash ?? false;
         const mainOptions = Object.entries(definitions).filter(([_3, m3]) => {
           if (m3.isVisible !== true)
             return false;
@@ -374174,7 +374200,7 @@ var init_modelConfigService = __esm({
         }).map(([id, m3]) => {
           let description = m3.dialogDescription ?? "";
           if (id === "auto") {
-            description = getAutoModelDescription(shouldShowPreviewModels, useGemini31);
+            description = getAutoModelDescription(shouldShowPreviewModels, useGemini31, useGemini3_5Flash);
           } else if (id === "auto-gemini-3" && useGemini31) {
             description = description.replace("gemini-3-pro", "gemini-3.1-pro");
           }
@@ -374244,6 +374270,8 @@ var init_modelConfigService = __esm({
               return value === context2.useGemini3_1;
             case "useGemini3_1FlashLite":
               return value === context2.useGemini3_1FlashLite;
+            case "useGemini3_5Flash":
+              return value === context2.useGemini3_5Flash;
             case "useCustomTools":
               return value === context2.useCustomTools;
             case "hasAccessToPreview":
@@ -380801,7 +380829,7 @@ var init_client4 = __esm({
         if (this.currentSequenceModel) {
           return this.currentSequenceModel;
         }
-        return resolveModel(this.config.getActiveModel(), this.config.getGemini31LaunchedSync?.() ?? false, false, this.config.getHasAccessToPreviewModel?.() ?? true, this.config);
+        return resolveModel(this.config.getActiveModel(), this.config.getGemini31LaunchedSync?.() ?? false, false, this.config.getHasAccessToPreviewModel?.() ?? true, this.config, this.config.hasGemini35FlashGAAccess?.() ?? false);
       }
       async *processTurn(request, signal, prompt_id, boundedTurns, displayContent) {
         let turn = new Turn(this.getChat(), prompt_id);
@@ -394703,7 +394731,8 @@ ${formattedHistory}
             config3.getUseCustomToolModel(),
             config3.getHasAccessToPreviewModel()
           ]);
-          const selectedModel = resolveClassifierModel(context2.requestedModel ?? config3.getModel(), routerResponse.model_choice, useGemini3_1, useCustomToolModel, hasAccessToPreview, config3);
+          const useGemini3_5Flash = config3.hasGemini35FlashGAAccess?.() ?? false;
+          const selectedModel = resolveClassifierModel(context2.requestedModel ?? config3.getModel(), routerResponse.model_choice, useGemini3_1, useCustomToolModel, hasAccessToPreview, config3, useGemini3_5Flash);
           return {
             model: selectedModel,
             metadata: {
@@ -394730,7 +394759,7 @@ var init_defaultStrategy = __esm({
     DefaultStrategy = class {
       name = "default";
       async route(_context, config3, _baseLlmClient, _localLiteRtLmClient) {
-        const defaultModel = resolveModel(config3.getModel(), config3.getGemini31LaunchedSync?.() ?? false, false, config3.getHasAccessToPreviewModel?.() ?? true, config3);
+        const defaultModel = resolveModel(config3.getModel(), config3.getGemini31LaunchedSync?.() ?? false, false, config3.getHasAccessToPreviewModel?.() ?? true, config3, config3.hasGemini35FlashGAAccess?.() ?? false);
         return {
           model: defaultModel,
           metadata: {
@@ -394885,7 +394914,8 @@ Respond *only* in JSON format according to the following schema. Do not include
             config3.getGemini31Launched(),
             config3.getUseCustomToolModel()
           ]);
-          const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), routerResponse.model_choice, useGemini3_1, useCustomToolModel, config3.getHasAccessToPreviewModel?.() ?? true, config3));
+          const useGemini3_5Flash = config3.hasGemini35FlashGAAccess?.() ?? false;
+          const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), routerResponse.model_choice, useGemini3_1, useCustomToolModel, config3.getHasAccessToPreviewModel?.() ?? true, config3, useGemini3_5Flash));
           const service = config3.getModelAvailabilityService();
           const snapshot = service.snapshot(selectedModel);
           if (!snapshot.available) {
@@ -395042,7 +395072,8 @@ Model: {"complexity_reasoning": "High-level architecture and strategic planning.
             config3.getGemini31Launched(),
             config3.getUseCustomToolModel()
           ]);
-          const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), modelAlias, useGemini3_1, useCustomToolModel, config3.getHasAccessToPreviewModel?.() ?? true, config3));
+          const useGemini3_5Flash = config3.hasGemini35FlashGAAccess?.() ?? false;
+          const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), modelAlias, useGemini3_1, useCustomToolModel, config3.getHasAccessToPreviewModel?.() ?? true, config3, useGemini3_5Flash));
           const service = config3.getModelAvailabilityService();
           const snapshot = service.snapshot(selectedModel);
           if (!snapshot.available) {
@@ -395152,7 +395183,7 @@ var init_fallbackStrategy = __esm({
       name = "fallback";
       async route(context2, config3, _baseLlmClient, _localLiteRtLmClient) {
         const requestedModel = context2.requestedModel ?? config3.getModel();
-        const resolvedModel = resolveModel(requestedModel, config3.getGemini31LaunchedSync?.() ?? false, false, config3.getHasAccessToPreviewModel?.() ?? true, config3);
+        const resolvedModel = resolveModel(requestedModel, config3.getGemini31LaunchedSync?.() ?? false, false, config3.getHasAccessToPreviewModel?.() ?? true, config3, config3.hasGemini35FlashGAAccess?.() ?? false);
         const service = config3.getModelAvailabilityService();
         const snapshot = service.snapshot(resolvedModel);
         if (snapshot.available) {
@@ -395189,7 +395220,7 @@ var init_overrideStrategy = __esm({
           return null;
         }
         return {
-          model: resolveModel(overrideModel, config3.getGemini31LaunchedSync?.() ?? false, false, config3.getHasAccessToPreviewModel?.() ?? true, config3),
+          model: resolveModel(overrideModel, config3.getGemini31LaunchedSync?.() ?? false, false, config3.getHasAccessToPreviewModel?.() ?? true, config3, config3.hasGemini35FlashGAAccess?.() ?? false),
           metadata: {
             source: this.name,
             latencyMs: 0,
@@ -395226,8 +395257,9 @@ var init_approvalModeStrategy = __esm({
           config3.getUseCustomToolModel(),
           config3.getHasAccessToPreviewModel()
         ]);
+        const useGemini3_5Flash = config3.hasGemini35FlashGAAccess?.() ?? false;
         if (approvalMode === ApprovalMode.PLAN) {
-          const proModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_PRO, useGemini3_1, useCustomToolModel, hasAccessToPreview, config3);
+          const proModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_PRO, useGemini3_1, useCustomToolModel, hasAccessToPreview, config3, useGemini3_5Flash);
           return {
             model: proModel,
             metadata: {
@@ -395237,7 +395269,7 @@ var init_approvalModeStrategy = __esm({
             }
           };
         } else if (approvedPlanPath) {
-          const flashModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_FLASH, useGemini3_1, useCustomToolModel, hasAccessToPreview, config3);
+          const flashModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_FLASH, useGemini3_1, useCustomToolModel, hasAccessToPreview, config3, useGemini3_5Flash);
           return {
             model: flashModel,
             metadata: {
@@ -395463,6 +395495,12 @@ var init_defaultModelConfigs = __esm({
             model: "gemini-3.1-flash-lite"
           }
         },
+        "gemini-3.5-flash": {
+          extends: "chat-base-3",
+          modelConfig: {
+            model: "gemini-3.5-flash"
+          }
+        },
         "gemma-4-31b-it": {
           extends: "chat-base-3",
           modelConfig: {
@@ -395488,6 +395526,12 @@ var init_defaultModelConfigs = __esm({
             model: "gemini-3-flash-preview"
           }
         },
+        "gemini-3.5-flash-base": {
+          extends: "base",
+          modelConfig: {
+            model: "gemini-3.5-flash"
+          }
+        },
         classifier: {
           extends: "base",
           modelConfig: {
@@ -395695,6 +395739,13 @@ var init_defaultModelConfigs = __esm({
           isVisible: true,
           features: { thinking: false, multimodalToolUse: true }
         },
+        "gemini-3.5-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",
@@ -395798,11 +395849,34 @@ var init_defaultModelConfigs = __esm({
           default: "gemini-3-flash-preview",
           contexts: [
             {
-              condition: { hasAccessToPreview: false },
+              condition: { hasAccessToPreview: false, useGemini3_5Flash: true },
+              target: "gemini-3.5-flash"
+            },
+            {
+              condition: { hasAccessToPreview: false, useGemini3_5Flash: false },
               target: "gemini-2.5-flash"
             }
           ]
         },
+        "gemini-3.5-flash": {
+          default: "gemini-3.5-flash",
+          contexts: [
+            {
+              condition: { useGemini3_5Flash: false, hasAccessToPreview: false },
+              target: "gemini-2.5-flash"
+            },
+            {
+              condition: { useGemini3_5Flash: false },
+              target: "gemini-3-flash-preview"
+            }
+          ]
+        },
+        "gemini-2.5-flash": {
+          default: "gemini-2.5-flash",
+          contexts: [
+            { condition: { useGemini3_5Flash: true }, target: "gemini-3.5-flash" }
+          ]
+        },
         "gemini-3-pro-preview": {
           default: "gemini-3-pro-preview",
           contexts: [
@@ -395851,6 +395925,7 @@ var init_defaultModelConfigs = __esm({
         flash: {
           default: "gemini-3-flash-preview",
           contexts: [
+            { condition: { useGemini3_5Flash: true }, target: "gemini-3.5-flash" },
             {
               condition: { hasAccessToPreview: false },
               target: "gemini-2.5-flash"
@@ -395882,6 +395957,7 @@ var init_defaultModelConfigs = __esm({
         flash: {
           default: "gemini-3-flash-preview",
           contexts: [
+            { condition: { useGemini3_5Flash: true }, target: "gemini-3.5-flash" },
             {
               condition: { hasAccessToPreview: false },
               target: "gemini-2.5-flash"
@@ -399350,7 +399426,8 @@ var init_flagNames = __esm({
       MASKING_PROTECT_LATEST_TURN: 45758819,
       GEMINI_3_1_PRO_LAUNCHED: 45760185,
       PRO_MODEL_NO_ACCESS: 45768879,
-      DEFAULT_REQUEST_TIMEOUT: 45773134
+      DEFAULT_REQUEST_TIMEOUT: 45773134,
+      GEMINI_3_5_FLASH_GA_LAUNCHED: 45780819
     };
   }
 });
@@ -410418,7 +410495,7 @@ var init_config4 = __esm({
         if (!isAutoModel(model, this)) {
           return {};
         }
-        const primaryModel = resolveModel(model, this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this);
+        const primaryModel = resolveModel(model, this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasGemini35FlashGAAccess());
         const isPreview = isPreviewModel(primaryModel, this);
         const proModel = primaryModel;
         const flashModel = isPreview ? PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
@@ -410439,7 +410516,7 @@ var init_config4 = __esm({
         if (pooled.remaining !== void 0) {
           return pooled.remaining;
         }
-        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this);
+        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasGemini35FlashGAAccess());
         return this.modelQuotas.get(primaryModel)?.remaining;
       }
       getQuotaLimit() {
@@ -410447,7 +410524,7 @@ var init_config4 = __esm({
         if (pooled.limit !== void 0) {
           return pooled.limit;
         }
-        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this);
+        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasGemini35FlashGAAccess());
         return this.modelQuotas.get(primaryModel)?.limit;
       }
       getQuotaResetTime() {
@@ -410455,7 +410532,7 @@ var init_config4 = __esm({
         if (pooled.resetTime !== void 0) {
           return pooled.resetTime;
         }
-        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this);
+        const primaryModel = resolveModel(this.getModel(), this.getGemini31LaunchedSync(), this.getUseCustomToolModelSync(), this.getHasAccessToPreviewModel(), this, this.hasGemini35FlashGAAccess());
         return this.modelQuotas.get(primaryModel)?.resetTime;
       }
       getEmbeddingModel() {
@@ -411439,6 +411516,30 @@ ${sections.join("\n")}
       isGemini31LaunchedForAuthType(authType) {
         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.
+       */
+      hasGemini35FlashGAAccess() {
+        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;
+        })();
+        if (hasAccess) {
+          if (authType === AuthType2.USE_GEMINI) {
+            setFlashModels("gemini-3-flash-preview", "gemini-3.5-flash");
+          } else {
+            setFlashModels("gemini-3-flash", "gemini-3-flash");
+          }
+        } else {
+          setFlashModels("gemini-3-flash-preview", "gemini-2.5-flash");
+        }
+        return hasAccess;
+      }
       /**
        * Returns whether Gemini 3.1 has been launched.
        *