@google/gemini-cli 0.46.0-preview.0 → 0.47.0-nightly.20260604.g4196596f7

package/bundle/{chunk-773AJHDP.js → chunk-3W7O744A.js}

@@ -6,7 +6,7 @@ import {
 import {
   exitCli,
   require_source
-} from "./chunk-BOJOJVNV.js";
+} from "./chunk-K2SOQJMX.js";
 import {
   DEFAULT_BACKGROUND_OPACITY,
   DEFAULT_BORDER_OPACITY,
@@ -58,14 +58,14 @@ import {
   stripUnsafeCharacters,
   toCodePoints,
   validateCustomTheme
-} from "./chunk-4K3E3G6Z.js";
+} from "./chunk-H3N5WAYS.js";
 import {
   isDevelopment
-} from "./chunk-SHFHGDWR.js";
+} from "./chunk-FKA6UHBW.js";
 import {
   emptyIcon,
   require_react
-} from "./chunk-TDYUKPZH.js";
+} from "./chunk-KAOVKGFU.js";
 import {
   ALL_EDITORS,
   ApprovalMode,
@@ -230,7 +230,7 @@ import {
   tokenLimit,
   uiTelemetryService,
   unescapePath
-} from "./chunk-HHFFICNK.js";
+} from "./chunk-OQQDPZ7U.js";
 import {
   require_src
 } from "./chunk-TUDYL3X4.js";
@@ -56501,7 +56501,7 @@ var authCommand = {
 import process28 from "node:process";
 
 // packages/cli/src/generated/git-commit.ts
-var GIT_COMMIT_INFO = "cfcecebe8";
+var GIT_COMMIT_INFO = "4196596f7";
 
 // packages/cli/src/ui/utils/historyExportUtils.ts
 import * as fsPromises from "node:fs/promises";
@@ -62262,7 +62262,7 @@ Use /mcp auth <server-name> to authenticate.`
         type: "info",
         text: `Starting OAuth authentication for MCP server '${serverName}'...`
       });
-      const { MCPOAuthProvider } = await import("./core-VVRQ2GQD.js");
+      const { MCPOAuthProvider } = await import("./core-63AY4S7W.js");
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
         oauthConfig = { enabled: false };

package/bundle/{chunk-S2ICEQVC.js → chunk-6NI3XGUW.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   exitCli,
   require_source
-} from "./chunk-BOJOJVNV.js";
+} from "./chunk-CHV5VX6V.js";
 import {
   DEFAULT_PORT,
   SERVER_START_WAIT_MS,
@@ -14,10 +14,10 @@ import {
   isServerRunning,
   resolveGemmaConfig,
   writeServerProcessInfo
-} from "./chunk-4K3E3G6Z.js";
+} from "./chunk-C2QIEMR3.js";
 import {
   debugLogger
-} from "./chunk-HHFFICNK.js";
+} from "./chunk-CVUIGVVW.js";
 import {
   __toESM
 } from "./chunk-34MYV7JD.js";

package/bundle/{chunk-J444UQD3.js → chunk-A3QBI6HT.js}

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

package/bundle/{chunk-2GMVQS2Q.js → chunk-AW75DLSA.js}

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

package/bundle/{chunk-GTRQQGSJ.js → chunk-BB7JWK6H.js}

@@ -2,7 +2,7 @@ const require = (await import('node:module')).createRequire(import.meta.url); co
 import {
   CoreToolCallStatus,
   checkExhaustive
-} from "./chunk-FIM2LOYZ.js";
+} from "./chunk-UGUHWSGX.js";
 import {
   __commonJS,
   __toESM

package/bundle/{chunk-4K3E3G6Z.js → chunk-C2QIEMR3.js}

@@ -1,6 +1,9 @@
 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 {
   AuthProviderType,
+  AuthType,
+  CoreEvent,
+  CoreToolCallStatus,
   DEFAULT_MODEL_CONFIGS,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
   EDITOR_OPTIONS,
@@ -29,7 +32,7 @@ import {
   require_strip_json_comments,
   sanitizeFilenamePart,
   stripAnsi
-} from "./chunk-HHFFICNK.js";
+} from "./chunk-CVUIGVVW.js";
 import {
   __commonJS,
   __require,
@@ -10217,7 +10220,7 @@ function convertSessionToHistoryFormats(messages) {
           args: tool.args,
           description: tool.description || "",
           renderOutputAsMarkdown: tool.renderOutputAsMarkdown ?? true,
-          status: tool.status === "success" ? "success" /* Success */ : "error" /* Error */,
+          status: tool.status === "success" ? CoreToolCallStatus.Success : CoreToolCallStatus.Error,
           resultDisplay: tool.resultDisplay,
           confirmationDetails: void 0
         }))
@@ -16278,8 +16281,8 @@ var LoadedSettings = class {
   // React will pass a listener fn into this subscribe fn
   // that listener fn will perform an object identity check on the snapshot and trigger a React re render if the snapshot has changed
   subscribe(listener) {
-    coreEvents.on("settings-changed" /* SettingsChanged */, listener);
-    return () => coreEvents.off("settings-changed" /* SettingsChanged */, listener);
+    coreEvents.on(CoreEvent.SettingsChanged, listener);
+    return () => coreEvents.off(CoreEvent.SettingsChanged, listener);
   }
   getSnapshot() {
     return this._snapshot;
@@ -16423,7 +16426,7 @@ function setUpCloudShellEnvironment(envFilePath, isTrusted, isSandboxed, selecte
     }
   }
   let value = "cloudshell-gca";
-  if (selectedAuthType === "vertex-ai" /* USE_VERTEX_AI */) {
+  if (selectedAuthType === AuthType.USE_VERTEX_AI) {
     value = process2.env[USER_GCP_PROJECT];
   }
   if (envFilePath && fs4.existsSync(envFilePath)) {

package/bundle/{chunk-BOJOJVNV.js → chunk-CHV5VX6V.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-IIRRE2XB.js";
 import {
   __commonJS,
   __require

package/bundle/{chunk-4AGOZ7LL.js → chunk-CRXOPS47.js}

@@ -6,7 +6,7 @@ import {
 import {
   exitCli,
   require_source
-} from "./chunk-5LUCCXOB.js";
+} from "./chunk-CHV5VX6V.js";
 import {
   DEFAULT_BACKGROUND_OPACITY,
   DEFAULT_BORDER_OPACITY,
@@ -58,14 +58,14 @@ import {
   stripUnsafeCharacters,
   toCodePoints,
   validateCustomTheme
-} from "./chunk-J444UQD3.js";
+} from "./chunk-C2QIEMR3.js";
 import {
   isDevelopment
-} from "./chunk-HMR43ZX2.js";
+} from "./chunk-D6S4W2BY.js";
 import {
   emptyIcon,
   require_react
-} from "./chunk-GTRQQGSJ.js";
+} from "./chunk-DJ4OX7HV.js";
 import {
   ALL_EDITORS,
   ApprovalMode,
@@ -243,7 +243,7 @@ import {
   tokenLimit,
   uiTelemetryService,
   unescapePath
-} from "./chunk-FIM2LOYZ.js";
+} from "./chunk-CVUIGVVW.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 = "480e2e7cd";
+var GIT_COMMIT_INFO = "bd0bc9a74";
 
 // 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-GPCRVPKS.js");
+      const { MCPOAuthProvider } = await import("./dist-N2CG2AMX.js");
       let oauthConfig = server.oauth;
       if (!oauthConfig) {
         oauthConfig = { enabled: false };

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

@@ -3017,8 +3017,8 @@ var require_graceful_fs = __commonJS({
       }
       var fs$copyFile = fs95.copyFile;
       if (fs$copyFile)
-        fs95.copyFile = copyFile;
-      function copyFile(src, dest, flags2, cb) {
+        fs95.copyFile = copyFile2;
+      function copyFile2(src, dest, flags2, cb) {
         if (typeof flags2 === "function") {
           cb = flags2;
           flags2 = 0;
@@ -14069,7 +14069,7 @@ var require_filesubjecttokensupplier = __commonJS({
     }));
     var realpath5 = (0, util_1.promisify)(fs94.realpath ?? (() => {
     }));
-    var lstat5 = (0, util_1.promisify)(fs94.lstat ?? (() => {
+    var lstat6 = (0, util_1.promisify)(fs94.lstat ?? (() => {
     }));
     var FileSubjectTokenSupplier = class {
       filePath;
@@ -14095,7 +14095,7 @@ var require_filesubjecttokensupplier = __commonJS({
         let parsedFilePath = this.filePath;
         try {
           parsedFilePath = await realpath5(parsedFilePath);
-          if (!(await lstat5(parsedFilePath)).isFile()) {
+          if (!(await lstat6(parsedFilePath)).isFile()) {
             throw new Error();
           }
         } catch (err2) {
@@ -25004,7 +25004,7 @@ var require_filesubjecttokensupplier2 = __commonJS({
     });
     var realpath5 = (0, util_1.promisify)((_b = fs94.realpath) !== null && _b !== void 0 ? _b : () => {
     });
-    var lstat5 = (0, util_1.promisify)((_c = fs94.lstat) !== null && _c !== void 0 ? _c : () => {
+    var lstat6 = (0, util_1.promisify)((_c = fs94.lstat) !== null && _c !== void 0 ? _c : () => {
     });
     var FileSubjectTokenSupplier = class {
       /**
@@ -25027,7 +25027,7 @@ var require_filesubjecttokensupplier2 = __commonJS({
         let parsedFilePath = this.filePath;
         try {
           parsedFilePath = await realpath5(parsedFilePath);
-          if (!(await lstat5(parsedFilePath)).isFile()) {
+          if (!(await lstat6(parsedFilePath)).isFile()) {
             throw new Error();
           }
         } catch (err2) {
@@ -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 = "4196596f7";
+var CLI_VERSION = "0.47.0-nightly.20260604.g4196596f7";
 
 // 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.47.0-nightly.20260604.g4196596f7";
   })();
   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-JSOMG32Z.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"
         }
       ]
@@ -361477,6 +361489,7 @@ function createPolicyUpdater(policyEngine, messageBus, storage2) {
     }
     if (message.persist) {
       persistenceQueue = persistenceQueue.then(async () => {
+        let tmpFile;
         try {
           const policyFile = message.persistScope === "workspace" ? storage2.getWorkspaceAutoSavedPolicyPath() : storage2.getAutoSavedPolicyPath();
           await fs73.mkdir(path83.dirname(policyFile), { recursive: true });
@@ -361488,8 +361501,16 @@ function createPolicyUpdater(policyEngine, messageBus, storage2) {
               existingData = parsed;
             }
           } catch (error40) {
-            if (!isNodeError(error40) || error40.code !== "ENOENT") {
-              debugLogger.warn(`Failed to parse ${policyFile}, overwriting with new policy.`, error40);
+            if (isNodeError(error40) && error40.code === "ENOENT") {
+            } else if (!isNodeError(error40)) {
+              coreEvents.emitFeedback("warning", `Syntax error found in policy file. Backing up corrupted file to ${policyFile}.bak and starting fresh.`);
+              if (!(await fs73.lstat(policyFile).catch(() => null))?.isSymbolicLink()) {
+                await fs73.copyFile(policyFile, `${policyFile}.bak`).catch(() => {
+                });
+              }
+              existingData = {};
+            } else {
+              throw error40;
             }
           }
           if (!existingData.rule) {
@@ -361520,7 +361541,7 @@ function createPolicyUpdater(policyEngine, messageBus, storage2) {
           }
           const newContent = import_toml3.default.stringify(existingData);
           const tmpSuffix = crypto18.randomBytes(8).toString("hex");
-          const tmpFile = `${policyFile}.${tmpSuffix}.tmp`;
+          tmpFile = `${policyFile}.${tmpSuffix}.tmp`;
           let handle2;
           try {
             handle2 = await fs73.open(tmpFile, "wx");
@@ -361528,9 +361549,26 @@ function createPolicyUpdater(policyEngine, messageBus, storage2) {
           } finally {
             await handle2?.close();
           }
-          await fs73.rename(tmpFile, policyFile);
+          try {
+            await fs73.rename(tmpFile, policyFile);
+          } catch (renameError) {
+            if (isNodeError(renameError) && (renameError.code === "EXDEV" || renameError.code === "EBUSY")) {
+              if ((await fs73.lstat(policyFile).catch(() => null))?.isSymbolicLink())
+                throw renameError;
+              await fs73.copyFile(tmpFile, policyFile);
+              await fs73.unlink(tmpFile).catch(() => {
+              });
+            } else {
+              throw renameError;
+            }
+          }
         } catch (error40) {
-          coreEvents.emitFeedback("error", `Failed to persist policy for ${toolName}`, error40);
+          if (tmpFile) {
+            await fs73.unlink(tmpFile).catch(() => {
+            });
+          }
+          const reason = error40 instanceof Error ? error40.message : String(error40);
+          coreEvents.emitFeedback("error", `Failed to persist policy for ${toolName}: ${reason}`, error40);
         }
       });
     }
@@ -375627,7 +375665,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");
     }
@@ -381137,7 +381179,7 @@ import { readdir as readdir11, stat as stat11 } from "node:fs/promises";
 import * as sp2 from "node:path";
 
 // packages/core/node_modules/readdirp/index.js
-import { lstat as lstat3, readdir as readdir10, realpath as realpath4, stat as stat9 } from "node:fs/promises";
+import { lstat as lstat4, readdir as readdir10, realpath as realpath4, stat as stat9 } from "node:fs/promises";
 import { join as pjoin, relative as prelative, resolve as presolve, sep as psep } from "node:path";
 import { Readable as Readable4 } from "node:stream";
 var EntryTypes = {
@@ -381218,7 +381260,7 @@ var ReaddirpStream = class extends Readable4 {
     const { root, type: type2 } = opts;
     this._fileFilter = normalizeFilter(opts.fileFilter);
     this._directoryFilter = normalizeFilter(opts.directoryFilter);
-    const statMethod = opts.lstat ? lstat3 : stat9;
+    const statMethod = opts.lstat ? lstat4 : stat9;
     if (wantBigintFsStats) {
       this._stat = (path113) => statMethod(path113, { bigint: true });
     } else {
@@ -381328,7 +381370,7 @@ var ReaddirpStream = class extends Readable4 {
       const full = entry.fullPath;
       try {
         const entryRealPath = await realpath4(full);
-        const entryRealPathStats = await lstat3(entryRealPath);
+        const entryRealPathStats = await lstat4(entryRealPath);
         if (entryRealPathStats.isFile()) {
           return "file";
         }
@@ -381371,7 +381413,7 @@ function readdirp(root, options = {}) {
 
 // packages/core/node_modules/chokidar/handler.js
 import { watch as fs_watch, unwatchFile, watchFile } from "node:fs";
-import { realpath as fsrealpath, lstat as lstat4, open as open7, stat as stat10 } from "node:fs/promises";
+import { realpath as fsrealpath, lstat as lstat5, open as open7, stat as stat10 } from "node:fs/promises";
 import { type as osType } from "node:os";
 import * as sp from "node:path";
 var STR_DATA = "data";
@@ -381398,7 +381440,7 @@ var EVENTS = {
 };
 var EV = EVENTS;
 var THROTTLE_MODE_WATCH = "watch";
-var statMethods = { lstat: lstat4, stat: stat10 };
+var statMethods = { lstat: lstat5, stat: stat10 };
 var KEY_LISTENERS = "listeners";
 var KEY_ERR = "errHandlers";
 var KEY_RAW = "rawEmitters";
@@ -393341,6 +393383,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-F2LLVPPS.js → chunk-D6S4W2BY.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-QFEJQS5X.js";
+} from "./chunk-IIRRE2XB.js";
 import {
   RELEASE_CHANNEL_STABILITY,
   debugLogger,
   getChannelFromVersion,
   isGitRepository
-} from "./chunk-XRDSBRG4.js";
+} from "./chunk-CVUIGVVW.js";
 
 // packages/cli/src/utils/installationInfo.ts
 import * as fs from "node:fs";

package/bundle/{chunk-YMNECODB.js → chunk-DJ4OX7HV.js}

@@ -1,7 +1,8 @@
 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 {
+  CoreToolCallStatus,
   checkExhaustive
-} from "./chunk-XRDSBRG4.js";
+} from "./chunk-CVUIGVVW.js";
 import {
   __commonJS,
   __toESM
@@ -464,19 +465,19 @@ var require_react = __commonJS({
 var import_react = __toESM(require_react(), 1);
 function mapCoreStatusToDisplayStatus(coreStatus) {
   switch (coreStatus) {
-    case "validating" /* Validating */:
+    case CoreToolCallStatus.Validating:
       return "Pending" /* Pending */;
-    case "awaiting_approval" /* AwaitingApproval */:
+    case CoreToolCallStatus.AwaitingApproval:
       return "Confirming" /* Confirming */;
-    case "executing" /* Executing */:
+    case CoreToolCallStatus.Executing:
       return "Executing" /* Executing */;
-    case "success" /* Success */:
+    case CoreToolCallStatus.Success:
       return "Success" /* Success */;
-    case "cancelled" /* Cancelled */:
+    case CoreToolCallStatus.Cancelled:
       return "Canceled" /* Canceled */;
-    case "error" /* Error */:
+    case CoreToolCallStatus.Error:
       return "Error" /* Error */;
-    case "scheduled" /* Scheduled */:
+    case CoreToolCallStatus.Scheduled:
       return "Pending" /* Pending */;
     default:
       return checkExhaustive(coreStatus);