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

package/dist/a2a-server.mjs

@@ -130331,10 +130331,10 @@ function setFlashModels(preview, defaultFlash) {
   PREVIEW_GEMINI_FLASH_MODEL = preview;
   DEFAULT_GEMINI_FLASH_MODEL = defaultFlash;
 }
-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, config3, useGemini3_5Flash = false) {
   const normalizedModel = Array.isArray(requestedModel) ? String(requestedModel.at(-1) ?? "").trim() || "" : typeof requestedModel !== "string" ? String(requestedModel ?? "").trim() || "" : requestedModel.trim() || "";
@@ -130350,7 +130350,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;
     }
@@ -130379,7 +130379,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: {
@@ -130394,13 +130394,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:
@@ -130410,7 +130410,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;
     }
@@ -130418,7 +130418,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, config3, useGemini3_5Flash = false) {
   if (config3?.getExperimentalDynamicModelConfiguration?.() === true) {
@@ -130431,11 +130431,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;
     }
@@ -130451,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:
@@ -130524,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_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 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";
@@ -130535,6 +130537,7 @@ var init_models = __esm({
     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";
@@ -211654,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 = "cfcecebe8";
-    CLI_VERSION = "0.46.0-preview.0";
+    GIT_COMMIT_INFO = "310cae233";
+    CLI_VERSION = "0.46.0-preview.2";
   }
 });
 
@@ -332680,7 +332683,7 @@ function getVersion() {
   }
   versionPromise = (async () => {
     const pkgJson = await getPackageJson(__dirname4);
-    return "0.46.0-preview.0";
+    return "0.46.0-preview.2";
   })();
   return versionPromise;
 }
@@ -374185,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;
@@ -374196,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");
           }
@@ -394727,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: {
@@ -394909,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) {
@@ -395066,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) {
@@ -395250,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: {
@@ -395261,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: {
@@ -395840,9 +395848,12 @@ var init_defaultModelConfigs = __esm({
         "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"
             }
           ]
@@ -411519,7 +411530,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");
         }