@google/gemini-cli 0.45.0-preview.1 → 0.45.1

package/bundle/{chunk-565MWDPP.js → chunk-GIZG2CGQ.js}

@@ -275810,6 +275810,12 @@ 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";
+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";
 var PREVIEW_GEMINI_FLASH_LITE_MODEL = "none";
 var GEMMA_4_31B_IT_MODEL = "gemma-4-31b-it";
@@ -275822,6 +275828,8 @@ var VALID_GEMINI_MODELS = /* @__PURE__ */ new Set([
   PREVIEW_GEMINI_FLASH_LITE_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,
   GEMMA_4_31B_IT_MODEL,
   GEMMA_4_26B_A4B_IT_MODEL
@@ -275834,18 +275842,19 @@ 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) {
+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, config2) {
+function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel = false, hasAccessToPreview = true, config2, useGemini3_5Flash = false) {
   const normalizedModel = Array.isArray(requestedModel) ? String(requestedModel.at(-1) ?? "").trim() || "" : typeof requestedModel !== "string" ? String(requestedModel ?? "").trim() || "" : requestedModel.trim() || "";
   if (config2?.getExperimentalDynamicModelConfiguration?.() === true) {
     const resolved2 = config2.modelConfigService.resolveModelId(normalizedModel, {
       useGemini3_1,
       useCustomTools: useCustomToolModel,
-      hasAccessToPreview
+      hasAccessToPreview,
+      useGemini3_5Flash
     });
     if (!hasAccessToPreview && isPreviewModel(resolved2, config2)) {
       if (resolved2.includes("flash-lite")) {
@@ -275881,7 +275890,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: {
@@ -275896,6 +275905,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:
@@ -275916,12 +275928,16 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
   }
   return resolved;
 }
-function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false, useCustomToolModel = false, hasAccessToPreview = true, config2) {
+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, config2, useGemini3_5Flash = false) {
   if (config2?.getExperimentalDynamicModelConfiguration?.() === true) {
     return config2.modelConfigService.resolveClassifierModelId(modelAlias, requestedModel, {
       useGemini3_1,
       useCustomTools: useCustomToolModel,
-      hasAccessToPreview
+      hasAccessToPreview,
+      useGemini3_5Flash
     });
   }
   if (modelAlias === GEMINI_MODEL_ALIAS_FLASH) {
@@ -275929,11 +275945,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, config2, useGemini3_5Flash);
   }
-  return resolveModel(requestedModel, useGemini3_1, useCustomToolModel, hasAccessToPreview, config2);
+  return resolveModel(requestedModel, useGemini3_1, useCustomToolModel, hasAccessToPreview, config2, useGemini3_5Flash);
 }
 function getDisplayString(model, config2) {
   if (config2?.getExperimentalDynamicModelConfiguration?.() === true) {
@@ -275943,6 +275962,8 @@ function getDisplayString(model, config2) {
     }
   }
   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:
@@ -279279,8 +279300,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "5a0bee901";
-var CLI_VERSION = "0.45.0-preview.0";
+var GIT_COMMIT_INFO = "57f1c6912";
+var CLI_VERSION = "0.45.0";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -303445,7 +303466,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.45.0-preview.1";
+    return "0.45.0";
   })();
   return versionPromise;
 }
@@ -304279,7 +304300,7 @@ var FLASH_LITE_CHAIN = [
 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,
@@ -304354,15 +304375,17 @@ 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 isOriginallyGemini3 = isGemini3Model(modelFromConfig, config2);
-  const resolvedModel = normalizeModelId(resolveModel(modelFromConfig, useGemini31, useCustomToolModel, hasAccessToPreview, config2));
+  const resolvedModel = normalizeModelId(resolveModel(modelFromConfig, useGemini31, useCustomToolModel, hasAccessToPreview, config2, useGemini3_5Flash));
   const isAutoPreferred = normalizedPreferredModel ? isAutoModel(normalizedPreferredModel, config2) : false;
   const isAutoConfigured = isAutoModel(configuredModel, config2);
   const effectiveWrapsAround = wrapsAround || isAutoPreferred || isAutoConfigured || isOriginallyGemini3;
   if (config2.getExperimentalDynamicModelConfiguration?.() === true) {
     const context2 = {
       useGemini3_1: useGemini31,
-      useCustomTools: useCustomToolModel
+      useCustomTools: useCustomToolModel,
+      useGemini3_5Flash
     };
     if (resolvedModel === DEFAULT_GEMINI_FLASH_LITE_MODEL) {
       chain2 = config2.modelConfigService.resolveChain("lite", context2);
@@ -304394,7 +304417,8 @@ function resolvePolicyChain(config2, preferredModel, wrapsAround = false) {
           isAutoSelection,
           userTier: config2.getUserTier(),
           useGemini31,
-          useCustomToolModel
+          useCustomToolModel,
+          useGemini3_5Flash
         });
       } else {
         chain2 = getModelPolicyChain({
@@ -304402,7 +304426,8 @@ function resolvePolicyChain(config2, preferredModel, wrapsAround = false) {
           isAutoSelection,
           userTier: config2.getUserTier(),
           useGemini31,
-          useCustomToolModel
+          useCustomToolModel,
+          useGemini3_5Flash
         });
       }
     } else {
@@ -308219,7 +308244,7 @@ async function createContentGenerator(config2, gcConfig, sessionId) {
       return new LoggingContentGenerator(fakeGenerator, gcConfig);
     }
     const version4 = await getVersion();
-    const model = resolveModel(gcConfig.getModel(), config2.authType === AuthType2.USE_GEMINI || config2.authType === AuthType2.USE_VERTEX_AI || (await gcConfig.getGemini31Launched?.() ?? false), false, gcConfig.getHasAccessToPreviewModel?.() ?? true, gcConfig);
+    const model = resolveModel(gcConfig.getModel(), config2.authType === AuthType2.USE_GEMINI || config2.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();
@@ -321143,16 +321168,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 {
+          }
         }
       }
     }
@@ -328146,9 +328173,9 @@ var GeminiChat = class {
     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({
@@ -328187,7 +328214,7 @@ var GeminiChat = class {
           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];
         }
@@ -330545,7 +330572,7 @@ var PromptProvider = class {
     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();
@@ -330663,7 +330690,7 @@ var PromptProvider = class {
     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());
@@ -335777,7 +335804,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-N2ZY2DXQ.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-WLJL6V4W.js");
         const provider = new OAuth2AuthProvider(authConfig, options.agentName ?? "unknown", agentCard, options.agentCardUrl);
         await provider.initialize();
         return provider;
@@ -335921,6 +335948,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 mainOptions = Object.entries(definitions).filter(([_2, m]) => {
       if (m.isVisible !== true)
         return false;
@@ -335932,7 +335960,7 @@ var ModelConfigService = class _ModelConfigService {
     }).map(([id, m]) => {
       let description = m.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");
       }
@@ -336002,6 +336030,8 @@ var ModelConfigService = class _ModelConfigService {
           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":
@@ -342168,7 +342198,7 @@ var GeminiClient = class {
     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);
@@ -355669,7 +355699,8 @@ ${formattedHistory}
         config2.getUseCustomToolModel(),
         config2.getHasAccessToPreviewModel()
       ]);
-      const selectedModel = resolveClassifierModel(context2.requestedModel ?? config2.getModel(), routerResponse.model_choice, useGemini3_1, useCustomToolModel, hasAccessToPreview, config2);
+      const useGemini3_5Flash = config2.hasGemini35FlashGAAccess?.() ?? false;
+      const selectedModel = resolveClassifierModel(context2.requestedModel ?? config2.getModel(), routerResponse.model_choice, useGemini3_1, useCustomToolModel, hasAccessToPreview, config2, useGemini3_5Flash);
       return {
         model: selectedModel,
         metadata: {
@@ -355689,7 +355720,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);
+    const defaultModel = resolveModel(config2.getModel(), config2.getGemini31LaunchedSync?.() ?? false, false, config2.getHasAccessToPreviewModel?.() ?? true, config2, config2.hasGemini35FlashGAAccess?.() ?? false);
     return {
       model: defaultModel,
       metadata: {
@@ -355830,7 +355861,8 @@ var ClassifierStrategy = class {
         config2.getGemini31Launched(),
         config2.getUseCustomToolModel()
       ]);
-      const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), routerResponse.model_choice, useGemini3_1, useCustomToolModel, config2.getHasAccessToPreviewModel?.() ?? true, config2));
+      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 service = config2.getModelAvailabilityService();
       const snapshot = service.snapshot(selectedModel);
       if (!snapshot.available) {
@@ -355973,7 +356005,8 @@ var NumericalClassifierStrategy = class {
         config2.getGemini31Launched(),
         config2.getUseCustomToolModel()
       ]);
-      const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), modelAlias, useGemini3_1, useCustomToolModel, config2.getHasAccessToPreviewModel?.() ?? true, config2));
+      const useGemini3_5Flash = config2.hasGemini35FlashGAAccess?.() ?? false;
+      const selectedModel = normalizeModelId(resolveClassifierModel(normalizeModelId(model), modelAlias, useGemini3_1, useCustomToolModel, config2.getHasAccessToPreviewModel?.() ?? true, config2, useGemini3_5Flash));
       const service = config2.getModelAvailabilityService();
       const snapshot = service.snapshot(selectedModel);
       if (!snapshot.available) {
@@ -356067,7 +356100,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);
+    const resolvedModel = resolveModel(requestedModel, config2.getGemini31LaunchedSync?.() ?? false, false, config2.getHasAccessToPreviewModel?.() ?? true, config2, config2.hasGemini35FlashGAAccess?.() ?? false);
     const service = config2.getModelAvailabilityService();
     const snapshot = service.snapshot(resolvedModel);
     if (snapshot.available) {
@@ -356097,7 +356130,7 @@ var OverrideStrategy = class {
       return null;
     }
     return {
-      model: resolveModel(overrideModel, config2.getGemini31LaunchedSync?.() ?? false, false, config2.getHasAccessToPreviewModel?.() ?? true, config2),
+      model: resolveModel(overrideModel, config2.getGemini31LaunchedSync?.() ?? false, false, config2.getHasAccessToPreviewModel?.() ?? true, config2, config2.hasGemini35FlashGAAccess?.() ?? false),
       metadata: {
         source: this.name,
         latencyMs: 0,
@@ -356126,8 +356159,9 @@ var ApprovalModeStrategy = class {
       config2.getUseCustomToolModel(),
       config2.getHasAccessToPreviewModel()
     ]);
+    const useGemini3_5Flash = config2.hasGemini35FlashGAAccess?.() ?? false;
     if (approvalMode === ApprovalMode.PLAN) {
-      const proModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_PRO, useGemini3_1, useCustomToolModel, hasAccessToPreview, config2);
+      const proModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_PRO, useGemini3_1, useCustomToolModel, hasAccessToPreview, config2, useGemini3_5Flash);
       return {
         model: proModel,
         metadata: {
@@ -356137,7 +356171,7 @@ var ApprovalModeStrategy = class {
         }
       };
     } else if (approvedPlanPath) {
-      const flashModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_FLASH, useGemini3_1, useCustomToolModel, hasAccessToPreview, config2);
+      const flashModel = resolveClassifierModel(model, GEMINI_MODEL_ALIAS_FLASH, useGemini3_1, useCustomToolModel, hasAccessToPreview, config2, useGemini3_5Flash);
       return {
         model: flashModel,
         metadata: {
@@ -356334,6 +356368,12 @@ var DEFAULT_MODEL_CONFIGS = {
         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: {
@@ -356359,6 +356399,12 @@ var DEFAULT_MODEL_CONFIGS = {
         model: "gemini-3-flash-preview"
       }
     },
+    "gemini-3.5-flash-base": {
+      extends: "base",
+      modelConfig: {
+        model: "gemini-3.5-flash"
+      }
+    },
     classifier: {
       extends: "base",
       modelConfig: {
@@ -356566,6 +356612,13 @@ var DEFAULT_MODEL_CONFIGS = {
       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",
@@ -356669,11 +356722,34 @@ var DEFAULT_MODEL_CONFIGS = {
       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: [
@@ -356722,6 +356798,7 @@ var DEFAULT_MODEL_CONFIGS = {
     flash: {
       default: "gemini-3-flash-preview",
       contexts: [
+        { condition: { useGemini3_5Flash: true }, target: "gemini-3.5-flash" },
         {
           condition: { hasAccessToPreview: false },
           target: "gemini-2.5-flash"
@@ -356753,6 +356830,7 @@ var DEFAULT_MODEL_CONFIGS = {
     flash: {
       default: "gemini-3-flash-preview",
       contexts: [
+        { condition: { useGemini3_5Flash: true }, target: "gemini-3.5-flash" },
         {
           condition: { hasAccessToPreview: false },
           target: "gemini-2.5-flash"
@@ -360054,7 +360132,8 @@ var ExperimentFlags = {
   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
 };
 
 // packages/core/dist/src/skills/skillManager.js
@@ -374525,7 +374604,7 @@ var Config = class {
     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 isPreview2 = isPreviewModel(primaryModel, this);
     const proModel = primaryModel;
     const flashModel = isPreview2 ? PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
@@ -374546,7 +374625,7 @@ var Config = class {
     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() {
@@ -374554,7 +374633,7 @@ var Config = class {
     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() {
@@ -374562,7 +374641,7 @@ var Config = class {
     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() {
@@ -375546,6 +375625,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.
    *
@@ -393253,6 +393356,9 @@ export {
   PREVIEW_GEMINI_FLASH_MODEL,
   DEFAULT_GEMINI_MODEL,
   DEFAULT_GEMINI_FLASH_MODEL,
+  DEFAULT_GEMINI_3_5_FLASH_MODEL,
+  SECONDARY_GEMINI_3_5_FLASH_MODEL,
+  setFlashModels,
   DEFAULT_GEMINI_FLASH_LITE_MODEL,
   PREVIEW_GEMINI_FLASH_LITE_MODEL,
   GEMMA_4_31B_IT_MODEL,

package/bundle/{chunk-WTRP3GGZ.js → chunk-JKX72O3X.js}

@@ -5,7 +5,7 @@ import {
   isTelemetrySdkInitialized,
   resetBrowserSession,
   shutdownTelemetry
-} from "./chunk-565MWDPP.js";
+} from "./chunk-6HYYI5PZ.js";
 
 // packages/cli/src/utils/cleanup.ts
 import { promises as fs } from "node:fs";

package/bundle/{chunk-NB2NOE4L.js → chunk-JTXGVKX5.js}

@@ -1,13 +1,13 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   runExitCleanup
-} from "./chunk-HVWNKZSB.js";
+} from "./chunk-JKX72O3X.js";
 import {
   RELEASE_CHANNEL_STABILITY,
   debugLogger,
   getChannelFromVersion,
   isGitRepository
-} from "./chunk-R52453KY.js";
+} from "./chunk-6HYYI5PZ.js";
 
 // packages/cli/src/utils/installationInfo.ts
 import * as fs from "node:fs";

package/bundle/{chunk-JWWA32XO.js → chunk-NXVUP5BP.js}

@@ -6,7 +6,7 @@ import {
 import {
   exitCli,
   require_source
-} from "./chunk-NVJOR76X.js";
+} from "./chunk-4ISYEWVQ.js";
 import {
   DEFAULT_BACKGROUND_OPACITY,
   DEFAULT_BORDER_OPACITY,
@@ -58,14 +58,14 @@ import {
   stripUnsafeCharacters,
   toCodePoints,
   validateCustomTheme
-} from "./chunk-TCAVPMJX.js";
+} from "./chunk-OJ7TLNJC.js";
 import {
   isDevelopment
-} from "./chunk-JXVK53RJ.js";
+} from "./chunk-JTXGVKX5.js";
 import {
   emptyIcon,
   require_react
-} from "./chunk-CJHCK2YW.js";
+} from "./chunk-QDW2YJ2D.js";
 import {
   ALL_EDITORS,
   ApprovalMode,
@@ -243,7 +243,7 @@ import {
   tokenLimit,
   uiTelemetryService,
   unescapePath
-} from "./chunk-5YTIYFJO.js";
+} from "./chunk-6HYYI5PZ.js";
 import {
   require_src
 } from "./chunk-TUDYL3X4.js";
@@ -56514,7 +56514,7 @@ var authCommand = {
 import process28 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "5a0bee901";
+var GIT_COMMIT_INFO = "57f1c6912";
 
 // packages/cli/src/ui/utils/historyExportUtils.ts
 import * as fsPromises from "node:fs/promises";
@@ -62275,7 +62275,7 @@ Use /mcp auth <server-name> to authenticate.`
         type: "info",
         text: `Starting OAuth authentication for MCP server '${serverName}'...`
       });
-      const { MCPOAuthProvider } = await import("./dist-WLKMTHZQ.js");
+      const { MCPOAuthProvider } = await import("./dist-LKE6MKVW.js");
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
         oauthConfig = { enabled: false };

package/bundle/{chunk-HZCAEM2F.js → chunk-OFSAI2ND.js}

@@ -1,13 +1,13 @@
 const require = (await import('node:module')).createRequire(import.meta.url); const __chunk_filename = (await import('node:url')).fileURLToPath(import.meta.url); const __chunk_dirname = (await import('node:path')).dirname(__chunk_filename);
 import {
   runExitCleanup
-} from "./chunk-OWSYSTWM.js";
+} from "./chunk-W53HJSSZ.js";
 import {
   RELEASE_CHANNEL_STABILITY,
   debugLogger,
   getChannelFromVersion,
   isGitRepository
-} from "./chunk-DDJWQSDN.js";
+} from "./chunk-FFUBQCSE.js";
 
 // packages/cli/src/utils/installationInfo.ts
 import * as fs from "node:fs";

package/bundle/{chunk-IGJG7DNZ.js → chunk-OJ7TLNJC.js}

@@ -32,7 +32,7 @@ import {
   require_strip_json_comments,
   sanitizeFilenamePart,
   stripAnsi
-} from "./chunk-565MWDPP.js";
+} from "./chunk-6HYYI5PZ.js";
 import {
   __commonJS,
   __require,

package/bundle/{chunk-K43EAKOP.js → chunk-QCGIKZK5.js}

@@ -32,7 +32,7 @@ import {
   require_strip_json_comments,
   sanitizeFilenamePart,
   stripAnsi
-} from "./chunk-DDJWQSDN.js";
+} from "./chunk-FFUBQCSE.js";
 import {
   __commonJS,
   __require,