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

package/bundle/{chunk-BOJOJVNV.js → chunk-JF6RJW53.js}

@@ -1,7 +1,7 @@
 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-2GMVQS2Q.js";
+} from "./chunk-GRD2P7HY.js";
 import {
   __commonJS,
   __require

package/bundle/chunk-JPYTHGMI.js

@@ -0,0 +1,398 @@
+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-7Y6NU65D.js";
+import {
+  RELEASE_CHANNEL_STABILITY,
+  debugLogger,
+  getChannelFromVersion,
+  isGitRepository
+} from "./chunk-ITC7TFJU.js";
+
+// packages/cli/src/utils/installationInfo.ts
+import * as fs from "node:fs";
+import * as path from "node:path";
+import * as childProcess from "node:child_process";
+import process2 from "node:process";
+var isDevelopment = process2.env["NODE_ENV"] === "development";
+function getInstallationInfo(projectRoot, isAutoUpdateEnabled) {
+  const cliPath = process2.argv[1];
+  if (!cliPath) {
+    return { packageManager: "unknown" /* UNKNOWN */, isGlobal: false };
+  }
+  try {
+    if (process2.env["IS_BINARY"] === "true") {
+      return {
+        packageManager: "binary" /* BINARY */,
+        isGlobal: true,
+        updateMessage: "Running as a standalone binary. Please update by downloading the latest version from GitHub."
+      };
+    }
+    const realPath = fs.realpathSync(cliPath).replace(/\\/g, "/");
+    const normalizedProjectRoot = projectRoot?.replace(/\\/g, "/");
+    const isGit = isGitRepository(process2.cwd());
+    if (isGit && normalizedProjectRoot && realPath.startsWith(normalizedProjectRoot) && !realPath.includes("/node_modules/")) {
+      return {
+        packageManager: "unknown" /* UNKNOWN */,
+        // Not managed by a package manager in this sense
+        isGlobal: false,
+        updateMessage: 'Running from a local git clone. Please update with "git pull".'
+      };
+    }
+    if (realPath.includes("/.npm/_npx") || realPath.includes("/npm/_npx")) {
+      return {
+        packageManager: "npx" /* NPX */,
+        isGlobal: false,
+        updateMessage: "Running via npx, update not applicable."
+      };
+    }
+    if (realPath.includes("/.pnpm/_pnpx") || realPath.includes("/.cache/pnpm/dlx")) {
+      return {
+        packageManager: "pnpx" /* PNPX */,
+        isGlobal: false,
+        updateMessage: "Running via pnpx, update not applicable."
+      };
+    }
+    if (process2.platform === "darwin") {
+      try {
+        const brewPrefix = childProcess.execSync("brew --prefix gemini-cli", {
+          encoding: "utf8",
+          stdio: ["ignore", "pipe", "ignore"]
+        }).trim();
+        const brewRealPath = fs.realpathSync(brewPrefix);
+        if (realPath.startsWith(brewRealPath)) {
+          return {
+            packageManager: "homebrew" /* HOMEBREW */,
+            isGlobal: true,
+            updateMessage: 'Installed via Homebrew. Please update with "brew upgrade gemini-cli".'
+          };
+        }
+      } catch {
+      }
+    }
+    if (realPath.includes("/.volta/") || realPath.includes("/Volta/")) {
+      const updateCommand2 = "volta install @google/gemini-cli@latest";
+      return {
+        packageManager: "volta" /* VOLTA */,
+        isGlobal: true,
+        updateCommand: updateCommand2,
+        updateMessage: isAutoUpdateEnabled ? "Installed with Volta. Attempting to automatically update now..." : `Please run ${updateCommand2} to update`
+      };
+    }
+    if (realPath.includes("/.pnpm/global") || realPath.includes("/.local/share/pnpm") || realPath.includes("/Library/pnpm/global/") || realPath.includes("/AppData/Local/pnpm/global/")) {
+      const updateCommand2 = "pnpm add -g @google/gemini-cli@latest";
+      return {
+        packageManager: "pnpm" /* PNPM */,
+        isGlobal: true,
+        updateCommand: updateCommand2,
+        updateMessage: isAutoUpdateEnabled ? "Installed with pnpm. Attempting to automatically update now..." : `Please run ${updateCommand2} to update`
+      };
+    }
+    if (realPath.includes("/.yarn/global")) {
+      const updateCommand2 = "yarn global add @google/gemini-cli@latest";
+      return {
+        packageManager: "yarn" /* YARN */,
+        isGlobal: true,
+        updateCommand: updateCommand2,
+        updateMessage: isAutoUpdateEnabled ? "Installed with yarn. Attempting to automatically update now..." : `Please run ${updateCommand2} to update`
+      };
+    }
+    if (realPath.includes("/.bun/install/cache")) {
+      return {
+        packageManager: "bunx" /* BUNX */,
+        isGlobal: false,
+        updateMessage: "Running via bunx, update not applicable."
+      };
+    }
+    if (realPath.includes("/.bun/install/global")) {
+      const updateCommand2 = "bun add -g @google/gemini-cli@latest";
+      return {
+        packageManager: "bun" /* BUN */,
+        isGlobal: true,
+        updateCommand: updateCommand2,
+        updateMessage: isAutoUpdateEnabled ? "Installed with bun. Attempting to automatically update now..." : `Please run ${updateCommand2} to update`
+      };
+    }
+    if (normalizedProjectRoot && realPath.startsWith(`${normalizedProjectRoot}/node_modules`)) {
+      let pm = "npm" /* NPM */;
+      if (fs.existsSync(path.join(projectRoot, "yarn.lock"))) {
+        pm = "yarn" /* YARN */;
+      } else if (fs.existsSync(path.join(projectRoot, "pnpm-lock.yaml"))) {
+        pm = "pnpm" /* PNPM */;
+      } else if (fs.existsSync(path.join(projectRoot, "bun.lockb"))) {
+        pm = "bun" /* BUN */;
+      }
+      return {
+        packageManager: pm,
+        isGlobal: false,
+        updateMessage: "Locally installed. Please update via your project's package.json."
+      };
+    }
+    const updateCommand = "npm install -g @google/gemini-cli@latest";
+    return {
+      packageManager: "npm" /* NPM */,
+      isGlobal: true,
+      updateCommand,
+      updateMessage: isAutoUpdateEnabled ? "Installed with npm. Attempting to automatically update now..." : `Please run ${updateCommand} to update`
+    };
+  } catch (error) {
+    debugLogger.log(error);
+    return { packageManager: "unknown" /* UNKNOWN */, isGlobal: false };
+  }
+}
+
+// packages/cli/src/utils/updateEventEmitter.ts
+import { EventEmitter } from "node:events";
+var updateEventEmitter = new EventEmitter();
+
+// packages/cli/src/utils/spawnWrapper.ts
+import { spawn } from "node:child_process";
+var spawnWrapper = spawn;
+
+// packages/cli/src/utils/handleAutoUpdate.ts
+var _updateInProgress = false;
+async function waitForUpdateCompletion(timeoutMs = 3e4) {
+  if (!_updateInProgress) {
+    return;
+  }
+  debugLogger.log(
+    "\nGemini CLI is waiting for a background update to complete before restarting..."
+  );
+  return new Promise((resolve) => {
+    if (!_updateInProgress) {
+      resolve();
+      return;
+    }
+    const timer = setTimeout(cleanup, timeoutMs);
+    function cleanup() {
+      clearTimeout(timer);
+      updateEventEmitter.off("update-success", cleanup);
+      updateEventEmitter.off("update-failed", cleanup);
+      resolve();
+    }
+    updateEventEmitter.once("update-success", cleanup);
+    updateEventEmitter.once("update-failed", cleanup);
+  });
+}
+function handleAutoUpdate(info, settings, projectRoot, isSandboxEnabled, spawnFn = spawnWrapper) {
+  if (!info) {
+    return;
+  }
+  if (isSandboxEnabled) {
+    updateEventEmitter.emit("update-info", {
+      message: `${info.message}
+Automatic update is not available in sandbox mode.`
+    });
+    return;
+  }
+  if (!settings.merged.general.enableAutoUpdateNotification) {
+    return;
+  }
+  const installationInfo = getInstallationInfo(
+    projectRoot,
+    settings.merged.general.enableAutoUpdate
+  );
+  if ([
+    "npx" /* NPX */,
+    "pnpx" /* PNPX */,
+    "bunx" /* BUNX */,
+    "binary" /* BINARY */
+  ].includes(installationInfo.packageManager)) {
+    return;
+  }
+  let combinedMessage = info.message;
+  if (installationInfo.updateMessage) {
+    combinedMessage += `
+${installationInfo.updateMessage}`;
+  }
+  if (!installationInfo.updateCommand || !settings.merged.general.enableAutoUpdate) {
+    updateEventEmitter.emit("update-received", {
+      ...info,
+      message: combinedMessage,
+      isUpdating: false
+    });
+    return;
+  }
+  updateEventEmitter.emit("update-received", {
+    ...info,
+    message: combinedMessage,
+    isUpdating: true
+  });
+  if (_updateInProgress) {
+    return;
+  }
+  const currentVersion = info.update.current;
+  if (!currentVersion) {
+    debugLogger.warn(
+      "Update check: current version is missing. Skipping automatic update for safety."
+    );
+    return;
+  }
+  const currentChannel = getChannelFromVersion(currentVersion);
+  const targetChannel = getChannelFromVersion(info.update.latest);
+  if (RELEASE_CHANNEL_STABILITY[targetChannel] < RELEASE_CHANNEL_STABILITY[currentChannel]) {
+    return;
+  }
+  const isNightly = info.update.latest.includes("nightly");
+  const updateCommand = installationInfo.updateCommand.replace(
+    "@latest",
+    isNightly ? "@nightly" : `@${info.update.latest}`
+  );
+  const updateProcess = spawnFn(updateCommand, {
+    stdio: "ignore",
+    shell: true,
+    detached: true
+  });
+  _updateInProgress = true;
+  updateProcess.unref();
+  updateProcess.on("close", (code) => {
+    _updateInProgress = false;
+    if (code === 0) {
+      updateEventEmitter.emit("update-success", {
+        message: "Update successful! The new version will be used on your next run."
+      });
+    } else {
+      updateEventEmitter.emit("update-failed", {
+        message: `Automatic update failed. Please try updating manually:
+
+${updateCommand}`
+      });
+    }
+  });
+  updateProcess.on("error", (err) => {
+    _updateInProgress = false;
+    updateEventEmitter.emit("update-failed", {
+      message: `Automatic update failed. Please try updating manually. (error: ${err.message})
+
+${updateCommand}`
+    });
+  });
+  return updateProcess;
+}
+function setUpdateHandler(addItem, setUpdateInfo) {
+  let successfullyInstalled = false;
+  const handleUpdateReceived = (info) => {
+    setUpdateInfo(info);
+    const savedMessage = info.message;
+    setTimeout(() => {
+      if (!successfullyInstalled) {
+        addItem(
+          {
+            type: "info" /* INFO */,
+            text: savedMessage
+          },
+          Date.now()
+        );
+      }
+      setUpdateInfo(null);
+    }, 6e4);
+  };
+  const handleUpdateFailed = (data) => {
+    setUpdateInfo(null);
+    addItem(
+      {
+        type: "error" /* ERROR */,
+        text: data?.message || `Automatic update failed. Please try updating manually`
+      },
+      Date.now()
+    );
+  };
+  const handleUpdateSuccess = () => {
+    successfullyInstalled = true;
+    setUpdateInfo(null);
+    addItem(
+      {
+        type: "info" /* INFO */,
+        text: `Update successful! The new version will be used on your next run.`
+      },
+      Date.now()
+    );
+  };
+  const handleUpdateInfo = (data) => {
+    addItem(
+      {
+        type: "info" /* INFO */,
+        text: data.message
+      },
+      Date.now()
+    );
+  };
+  updateEventEmitter.on("update-received", handleUpdateReceived);
+  updateEventEmitter.on("update-failed", handleUpdateFailed);
+  updateEventEmitter.on("update-success", handleUpdateSuccess);
+  updateEventEmitter.on("update-info", handleUpdateInfo);
+  return () => {
+    updateEventEmitter.off("update-received", handleUpdateReceived);
+    updateEventEmitter.off("update-failed", handleUpdateFailed);
+    updateEventEmitter.off("update-success", handleUpdateSuccess);
+    updateEventEmitter.off("update-info", handleUpdateInfo);
+  };
+}
+
+// packages/cli/src/utils/processUtils.ts
+var RELAUNCH_EXIT_CODE = 199;
+var isRelaunching = false;
+async function relaunchApp() {
+  if (isRelaunching) return;
+  isRelaunching = true;
+  await waitForUpdateCompletion();
+  await runExitCleanup();
+  process.exit(RELAUNCH_EXIT_CODE);
+}
+function isStandardSea() {
+  return process.argv[0] !== process.argv[1] && (process.env["IS_BINARY"] === "true" || process.isSea?.() === true);
+}
+function getScriptArgs() {
+  return process.argv.slice(isStandardSea() ? 1 : 2);
+}
+function isSeaEnvironment() {
+  return process.env["IS_BINARY"] === "true" || process.isSea?.() === true || process.argv[0] === process.argv[1];
+}
+function getSpawnConfig(nodeArgs, scriptArgs) {
+  const isBinary = isSeaEnvironment();
+  const newEnv = {
+    ...process.env,
+    GEMINI_CLI_NO_RELAUNCH: "true"
+  };
+  const finalSpawnArgs = [];
+  if (isBinary) {
+    if (nodeArgs.length > 0) {
+      for (const arg of nodeArgs) {
+        if (/[\s"'\\]/.test(arg)) {
+          throw new Error(
+            `Unsupported node argument for SEA relaunch: ${arg}. Complex escaping is not supported.`
+          );
+        }
+      }
+      const existingNodeOptions = process.env["NODE_OPTIONS"] || "";
+      newEnv["NODE_OPTIONS"] = `${existingNodeOptions} ${nodeArgs.join(" ")}`.trim();
+    }
+    finalSpawnArgs.push(process.execPath, ...scriptArgs);
+  } else {
+    finalSpawnArgs.push(
+      ...process.execArgv,
+      ...nodeArgs,
+      process.argv[1],
+      ...scriptArgs
+    );
+  }
+  return {
+    spawnArgs: finalSpawnArgs,
+    env: newEnv
+  };
+}
+
+export {
+  isDevelopment,
+  handleAutoUpdate,
+  setUpdateHandler,
+  RELAUNCH_EXIT_CODE,
+  relaunchApp,
+  getScriptArgs,
+  getSpawnConfig
+};
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */

package/bundle/{chunk-FIM2LOYZ.js → chunk-KOJR46UO.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,7 +279300,7 @@ function isValidToolName(name3, options = {}) {
 }
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "cfcecebe8";
+var GIT_COMMIT_INFO = "700c96118";
 var CLI_VERSION = "0.46.0-preview.0";
 
 // packages/core/dist/src/ide/detect-ide.js
@@ -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-3WXIASQA.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,