@google/gemini-cli 0.46.0-preview.0 → 0.46.0-preview.2

package/bundle/{chunk-HHFFICNK.js → chunk-E5QEVDYZ.js}

@@ -276237,6 +276237,7 @@ 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;
@@ -276254,6 +276255,7 @@ var VALID_GEMINI_MODELS = /* @__PURE__ */ new Set([
   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
@@ -276266,10 +276268,10 @@ 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, useGemini3_5Flash = false) {
   const normalizedModel = Array.isArray(requestedModel) ? String(requestedModel.at(-1) ?? "").trim() || "" : typeof requestedModel !== "string" ? String(requestedModel ?? "").trim() || "" : requestedModel.trim() || "";
@@ -276285,7 +276287,7 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
         return DEFAULT_GEMINI_FLASH_LITE_MODEL;
       }
       if (resolved2.includes("flash")) {
-        return useGemini3_5Flash ? DEFAULT_GEMINI_3_5_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
+        return DEFAULT_GEMINI_FLASH_MODEL;
       }
       return DEFAULT_GEMINI_MODEL;
     }
@@ -276314,7 +276316,7 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
       break;
     }
     case GEMINI_MODEL_ALIAS_FLASH: {
-      resolved = useGemini3_5Flash ? DEFAULT_GEMINI_3_5_FLASH_MODEL : PREVIEW_GEMINI_FLASH_MODEL;
+      resolved = useGemini3_5Flash ? DEFAULT_GEMINI_FLASH_MODEL : PREVIEW_GEMINI_FLASH_MODEL;
       break;
     }
     case GEMINI_MODEL_ALIAS_FLASH_LITE: {
@@ -276329,13 +276331,13 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
   if (resolved === "none") {
     return DEFAULT_GEMINI_FLASH_LITE_MODEL;
   }
-  if (useGemini3_5Flash && isFlashModel(resolved)) {
-    return DEFAULT_GEMINI_3_5_FLASH_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:
-        return useGemini3_5Flash ? DEFAULT_GEMINI_3_5_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
+        return DEFAULT_GEMINI_FLASH_MODEL;
       case PREVIEW_GEMINI_MODEL:
       case PREVIEW_GEMINI_3_1_MODEL:
       case PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL:
@@ -276345,7 +276347,7 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
           return DEFAULT_GEMINI_FLASH_LITE_MODEL;
         }
         if (resolved.includes("flash")) {
-          return useGemini3_5Flash ? DEFAULT_GEMINI_3_5_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
+          return DEFAULT_GEMINI_FLASH_MODEL;
         }
         return DEFAULT_GEMINI_MODEL;
     }
@@ -276353,7 +276355,7 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
   return resolved;
 }
 function isFlashModel(model) {
-  return model === DEFAULT_GEMINI_FLASH_MODEL || model === PREVIEW_GEMINI_FLASH_MODEL || model === DEFAULT_GEMINI_3_5_FLASH_MODEL || model === "flash" || model.endsWith("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 === "flash" || model.endsWith("flash");
 }
 function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false, useCustomToolModel = false, hasAccessToPreview = true, config2, useGemini3_5Flash = false) {
   if (config2?.getExperimentalDynamicModelConfiguration?.() === true) {
@@ -276370,11 +276372,11 @@ function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false
   }
   if (modelAlias === GEMINI_MODEL_ALIAS_FLASH) {
     if (requestedModel === DEFAULT_GEMINI_MODEL_AUTO || requestedModel === DEFAULT_GEMINI_MODEL) {
-      return useGemini3_5Flash ? DEFAULT_GEMINI_3_5_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
+      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_3_5_FLASH_MODEL;
+        return DEFAULT_GEMINI_FLASH_MODEL;
       }
       return hasAccessToPreview ? PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
     }
@@ -276404,6 +276406,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:
@@ -279555,8 +279559,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "cfcecebe8";
-var CLI_VERSION = "0.46.0-preview.0";
+var GIT_COMMIT_INFO = "310cae233";
+var CLI_VERSION = "0.46.0-preview.1";
 
 // packages/core/src/ide/detect-ide.ts
 var IDE_DEFINITIONS = {
@@ -304025,7 +304029,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.46.0-preview.0";
+    return "0.46.0-preview.1";
   })();
   return versionPromise;
 }
@@ -338369,7 +338373,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-KL44D6HV.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-WD62E6UF.js");
         const provider = new OAuth2AuthProvider(
           authConfig,
           options.agentName ?? "unknown",
@@ -338540,6 +338544,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;
       if (m.isPreview && !shouldShowPreviewModels) return false;
@@ -338550,7 +338555,8 @@ var ModelConfigService = class _ModelConfigService {
       if (id === "auto") {
         description = getAutoModelDescription(
           shouldShowPreviewModels,
-          useGemini31
+          useGemini31,
+          useGemini3_5Flash
         );
       } else if (id === "auto-gemini-3" && useGemini31) {
         description = description.replace("gemini-3-pro", "gemini-3.1-pro");
@@ -360043,13 +360049,15 @@ ${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
+        config2,
+        useGemini3_5Flash
       );
       return {
         model: selectedModel,
@@ -360222,6 +360230,7 @@ var ClassifierStrategy = class {
         config2.getGemini31Launched(),
         config2.getUseCustomToolModel()
       ]);
+      const useGemini3_5Flash = config2.hasGemini35FlashGAAccess?.() ?? false;
       const selectedModel = normalizeModelId(
         resolveClassifierModel(
           normalizeModelId(model),
@@ -360229,7 +360238,8 @@ var ClassifierStrategy = class {
           useGemini3_1,
           useCustomToolModel,
           config2.getHasAccessToPreviewModel?.() ?? true,
-          config2
+          config2,
+          useGemini3_5Flash
         )
       );
       const service = config2.getModelAvailabilityService();
@@ -360378,6 +360388,7 @@ var NumericalClassifierStrategy = class {
         config2.getGemini31Launched(),
         config2.getUseCustomToolModel()
       ]);
+      const useGemini3_5Flash = config2.hasGemini35FlashGAAccess?.() ?? false;
       const selectedModel = normalizeModelId(
         resolveClassifierModel(
           normalizeModelId(model),
@@ -360385,7 +360396,8 @@ var NumericalClassifierStrategy = class {
           useGemini3_1,
           useCustomToolModel,
           config2.getHasAccessToPreviewModel?.() ?? true,
-          config2
+          config2,
+          useGemini3_5Flash
         )
       );
       const service = config2.getModelAvailabilityService();
@@ -360576,6 +360588,7 @@ var ApprovalModeStrategy = class {
       config2.getUseCustomToolModel(),
       config2.getHasAccessToPreviewModel()
     ]);
+    const useGemini3_5Flash = config2.hasGemini35FlashGAAccess?.() ?? false;
     if (approvalMode === "plan" /* PLAN */) {
       const proModel = resolveClassifierModel(
         model,
@@ -360583,7 +360596,8 @@ var ApprovalModeStrategy = class {
         useGemini3_1,
         useCustomToolModel,
         hasAccessToPreview,
-        config2
+        config2,
+        useGemini3_5Flash
       );
       return {
         model: proModel,
@@ -360600,7 +360614,8 @@ var ApprovalModeStrategy = class {
         useGemini3_1,
         useCustomToolModel,
         hasAccessToPreview,
-        config2
+        config2,
+        useGemini3_5Flash
       );
       return {
         model: flashModel,
@@ -361173,9 +361188,12 @@ var DEFAULT_MODEL_CONFIGS = {
     "gemini-3-flash-preview": {
       default: "gemini-3-flash-preview",
       contexts: [
-        { condition: { useGemini3_5Flash: true }, target: "gemini-3.5-flash" },
         {
-          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"
         }
       ]
@@ -381434,7 +381452,11 @@ ${sections.join("\n")}
       return this.experiments?.flags[ExperimentFlags.GEMINI_3_5_FLASH_GA_LAUNCHED]?.boolValue ?? false;
     })();
     if (hasAccess) {
-      setFlashModels("gemini-3.5-flash", "gemini-3.5-flash");
+      if (authType === "gemini-api-key" /* 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");
     }
@@ -399870,6 +399892,7 @@ export {
   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,

package/bundle/{chunk-FIM2LOYZ.js → chunk-EI75YPWJ.js}

@@ -275811,6 +275811,7 @@ 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;
@@ -275828,6 +275829,7 @@ var VALID_GEMINI_MODELS = /* @__PURE__ */ new Set([
   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
@@ -275840,10 +275842,10 @@ 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, useGemini3_5Flash = false) {
   const normalizedModel = Array.isArray(requestedModel) ? String(requestedModel.at(-1) ?? "").trim() || "" : typeof requestedModel !== "string" ? String(requestedModel ?? "").trim() || "" : requestedModel.trim() || "";
@@ -275859,7 +275861,7 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
         return DEFAULT_GEMINI_FLASH_LITE_MODEL;
       }
       if (resolved2.includes("flash")) {
-        return useGemini3_5Flash ? DEFAULT_GEMINI_3_5_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
+        return DEFAULT_GEMINI_FLASH_MODEL;
       }
       return DEFAULT_GEMINI_MODEL;
     }
@@ -275888,7 +275890,7 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
       break;
     }
     case GEMINI_MODEL_ALIAS_FLASH: {
-      resolved = useGemini3_5Flash ? DEFAULT_GEMINI_3_5_FLASH_MODEL : PREVIEW_GEMINI_FLASH_MODEL;
+      resolved = useGemini3_5Flash ? DEFAULT_GEMINI_FLASH_MODEL : PREVIEW_GEMINI_FLASH_MODEL;
       break;
     }
     case GEMINI_MODEL_ALIAS_FLASH_LITE: {
@@ -275903,13 +275905,13 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
   if (resolved === "none") {
     return DEFAULT_GEMINI_FLASH_LITE_MODEL;
   }
-  if (useGemini3_5Flash && isFlashModel(resolved)) {
-    return DEFAULT_GEMINI_3_5_FLASH_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:
-        return useGemini3_5Flash ? DEFAULT_GEMINI_3_5_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
+        return DEFAULT_GEMINI_FLASH_MODEL;
       case PREVIEW_GEMINI_MODEL:
       case PREVIEW_GEMINI_3_1_MODEL:
       case PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL:
@@ -275919,7 +275921,7 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
           return DEFAULT_GEMINI_FLASH_LITE_MODEL;
         }
         if (resolved.includes("flash")) {
-          return useGemini3_5Flash ? DEFAULT_GEMINI_3_5_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
+          return DEFAULT_GEMINI_FLASH_MODEL;
         }
         return DEFAULT_GEMINI_MODEL;
     }
@@ -275927,7 +275929,7 @@ function resolveModel(requestedModel, useGemini3_1 = false, useCustomToolModel =
   return resolved;
 }
 function isFlashModel(model) {
-  return model === DEFAULT_GEMINI_FLASH_MODEL || model === PREVIEW_GEMINI_FLASH_MODEL || model === DEFAULT_GEMINI_3_5_FLASH_MODEL || model === "flash" || model.endsWith("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 === "flash" || model.endsWith("flash");
 }
 function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false, useCustomToolModel = false, hasAccessToPreview = true, config2, useGemini3_5Flash = false) {
   if (config2?.getExperimentalDynamicModelConfiguration?.() === true) {
@@ -275940,11 +275942,11 @@ function resolveClassifierModel(requestedModel, modelAlias, useGemini3_1 = false
   }
   if (modelAlias === GEMINI_MODEL_ALIAS_FLASH) {
     if (requestedModel === DEFAULT_GEMINI_MODEL_AUTO || requestedModel === DEFAULT_GEMINI_MODEL) {
-      return useGemini3_5Flash ? DEFAULT_GEMINI_3_5_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
+      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_3_5_FLASH_MODEL;
+        return DEFAULT_GEMINI_FLASH_MODEL;
       }
       return hasAccessToPreview ? PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
     }
@@ -275960,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:
@@ -279296,8 +279300,8 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "cfcecebe8";
-var CLI_VERSION = "0.46.0-preview.0";
+var GIT_COMMIT_INFO = "310cae233";
+var CLI_VERSION = "0.46.0-preview.1";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -303462,7 +303466,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.46.0-preview.0";
+    return "0.46.0-preview.2";
   })();
   return versionPromise;
 }
@@ -335800,7 +335804,7 @@ var A2AAuthProviderFactory = class _A2AAuthProviderFactory {
         return provider;
       }
       case "oauth2": {
-        const { OAuth2AuthProvider } = await import("./oauth2-provider-VVNBQH45.js");
+        const { OAuth2AuthProvider } = await import("./oauth2-provider-NQK2KDLL.js");
         const provider = new OAuth2AuthProvider(authConfig, options.agentName ?? "unknown", agentCard, options.agentCardUrl);
         await provider.initialize();
         return provider;
@@ -335944,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;
@@ -335955,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");
       }
@@ -355694,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: {
@@ -355855,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) {
@@ -355998,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) {
@@ -356151,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: {
@@ -356162,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: {
@@ -356712,9 +356721,12 @@ var DEFAULT_MODEL_CONFIGS = {
     "gemini-3-flash-preview": {
       default: "gemini-3-flash-preview",
       contexts: [
-        { condition: { useGemini3_5Flash: true }, target: "gemini-3.5-flash" },
         {
-          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"
         }
       ]
@@ -375627,7 +375639,11 @@ ${sections.join("\n")}
       return this.experiments?.flags[ExperimentFlags.GEMINI_3_5_FLASH_GA_LAUNCHED]?.boolValue ?? false;
     })();
     if (hasAccess) {
-      setFlashModels("gemini-3.5-flash", "gemini-3.5-flash");
+      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");
     }
@@ -393341,6 +393357,7 @@ export {
   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,