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

package/dist/a2a-server.mjs

@@ -311099,28 +311099,6 @@ var ApiResponseEvent = class {
     return logRecord;
   }
 };
-var EVENT_FLASH_FALLBACK = "gemini_cli.flash_fallback";
-var FlashFallbackEvent = class {
-  "event.name";
-  "event.timestamp";
-  auth_type;
-  constructor(auth_type) {
-    this["event.name"] = "flash_fallback";
-    this["event.timestamp"] = (/* @__PURE__ */ new Date()).toISOString();
-    this.auth_type = auth_type;
-  }
-  toOpenTelemetryAttributes(config3) {
-    return {
-      ...getCommonAttributes(config3),
-      "event.name": EVENT_FLASH_FALLBACK,
-      "event.timestamp": this["event.timestamp"],
-      auth_type: this.auth_type
-    };
-  }
-  toLogBody() {
-    return `Switching to flash as Fallback.`;
-  }
-};
 var EVENT_RIPGREP_FALLBACK = "gemini_cli.ripgrep_fallback";
 var RipgrepFallbackEvent = class {
   error;
@@ -311926,8 +311904,8 @@ var Float64Vector = import_vector.default.Float64Vector;
 var PointerVector = import_vector.default.PointerVector;
 
 // packages/core/dist/src/generated/git-commit.js
-var GIT_COMMIT_INFO = "5ea5107d0";
-var CLI_VERSION = "0.22.0-preview.0";
+var GIT_COMMIT_INFO = "a585bfa99";
+var CLI_VERSION = "0.22.0-preview.2";
 
 // packages/core/dist/src/ide/detect-ide.js
 var IDE_DEFINITIONS = {
@@ -314465,17 +314443,6 @@ function logApiRequest(config3, event) {
     logger6.emit(event.toSemanticLogRecord(config3));
   });
 }
-function logFlashFallback(config3, event) {
-  ClearcutLogger.getInstance(config3)?.logFlashFallbackEvent();
-  bufferTelemetryEvent(() => {
-    const logger6 = import_api_logs.logs.getLogger(SERVICE_NAME);
-    const logRecord = {
-      body: event.toLogBody(),
-      attributes: event.toOpenTelemetryAttributes(config3)
-    };
-    logger6.emit(logRecord);
-  });
-}
 function logRipgrepFallback(config3, event) {
   ClearcutLogger.getInstance(config3)?.logRipgrepFallbackEvent();
   bufferTelemetryEvent(() => {
@@ -315115,7 +315082,7 @@ async function createContentGenerator(config3, gcConfig, sessionId2) {
       return FakeContentGenerator.fromFile(gcConfig.fakeResponses);
     }
     const version4 = await getVersion();
-    const model = getEffectiveModel(gcConfig.isInFallbackMode(), gcConfig.getModel(), gcConfig.getPreviewFeatures());
+    const model = getEffectiveModel(gcConfig.getModel(), gcConfig.getPreviewFeatures());
     const customHeadersEnv = process.env["GEMINI_CLI_CUSTOM_HEADERS"] || void 0;
     const userAgent = `GeminiCLI/${version4}/${model} (${process.platform}; ${process.arch})`;
     const customHeadersMap = parseCustomHeaders(customHeadersEnv);
@@ -352629,114 +352596,88 @@ async function modifyWithEditor(originalParams, modifyContext, editorType, _abor
 // packages/core/dist/src/utils/llm-edit-fixer.js
 import { createHash as createHash8 } from "node:crypto";
 
-// packages/core/dist/src/utils/partUtils.js
-function partToString(value, options2) {
-  if (!value) {
-    return "";
-  }
-  if (typeof value === "string") {
-    return value;
-  }
-  if (Array.isArray(value)) {
-    return value.map((part2) => partToString(part2, options2)).join("");
+// packages/core/dist/src/utils/secure-browser-launcher.js
+import { execFile as execFile6 } from "node:child_process";
+import { promisify as promisify13 } from "node:util";
+import { platform as platform10 } from "node:os";
+import { URL as URL6 } from "node:url";
+var execFileAsync5 = promisify13(execFile6);
+function validateUrl(url5) {
+  let parsedUrl;
+  try {
+    parsedUrl = new URL6(url5);
+  } catch (_error) {
+    throw new Error(`Invalid URL: ${url5}`);
   }
-  const part = value;
-  if (options2?.verbose) {
-    if (part.videoMetadata !== void 0) {
-      return `[Video Metadata]`;
-    }
-    if (part.thought !== void 0) {
-      return `[Thought: ${part.thought}]`;
-    }
-    if (part.codeExecutionResult !== void 0) {
-      return `[Code Execution Result]`;
-    }
-    if (part.executableCode !== void 0) {
-      return `[Executable Code]`;
-    }
-    if (part.fileData !== void 0) {
-      return `[File Data]`;
-    }
-    if (part.functionCall !== void 0) {
-      return `[Function Call: ${part.functionCall.name}]`;
-    }
-    if (part.functionResponse !== void 0) {
-      return `[Function Response: ${part.functionResponse.name}]`;
-    }
-    if (part.inlineData !== void 0) {
-      return `<${part.inlineData.mimeType}>`;
-    }
+  if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") {
+    throw new Error(`Unsafe protocol: ${parsedUrl.protocol}. Only HTTP and HTTPS are allowed.`);
   }
-  return part.text ?? "";
-}
-function getResponseText(response) {
-  if (response.candidates && response.candidates.length > 0) {
-    const candidate = response.candidates[0];
-    if (candidate.content && candidate.content.parts && candidate.content.parts.length > 0) {
-      return candidate.content.parts.filter((part) => part.text).map((part) => part.text).join("");
-    }
+  if (/[\r\n\x00-\x1f]/.test(url5)) {
+    throw new Error("URL contains invalid characters");
   }
-  return null;
 }
-
-// packages/core/dist/src/utils/errorReporting.js
-import fs40 from "node:fs/promises";
-import os13 from "node:os";
-import path40 from "node:path";
-async function reportError(error2, baseMessage, context2, type = "general", reportingDir = os13.tmpdir()) {
-  const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
-  const reportFileName = `gemini-client-error-${type}-${timestamp}.json`;
-  const reportPath = path40.join(reportingDir, reportFileName);
-  let errorToReport;
-  if (error2 instanceof Error) {
-    errorToReport = { message: error2.message, stack: error2.stack };
-  } else if (typeof error2 === "object" && error2 !== null && "message" in error2) {
-    errorToReport = {
-      message: String(error2.message)
-    };
-  } else {
-    errorToReport = { message: String(error2) };
-  }
-  const reportContent = { error: errorToReport };
-  if (context2) {
-    reportContent.context = context2;
-  }
-  let stringifiedReportContent;
-  try {
-    stringifiedReportContent = JSON.stringify(reportContent, null, 2);
-  } catch (stringifyError) {
-    console.error(`${baseMessage} Could not stringify report content (likely due to context):`, stringifyError);
-    console.error("Original error that triggered report generation:", error2);
-    if (context2) {
-      console.error("Original context could not be stringified or included in report.");
-    }
-    try {
-      const minimalReportContent = { error: errorToReport };
-      stringifiedReportContent = JSON.stringify(minimalReportContent, null, 2);
-      await fs40.writeFile(reportPath, stringifiedReportContent);
-      console.error(`${baseMessage} Partial report (excluding context) available at: ${reportPath}`);
-    } catch (minimalWriteError) {
-      console.error(`${baseMessage} Failed to write even a minimal error report:`, minimalWriteError);
-    }
-    return;
+async function openBrowserSecurely(url5) {
+  validateUrl(url5);
+  const platformName = platform10();
+  let command;
+  let args2;
+  switch (platformName) {
+    case "darwin":
+      command = "open";
+      args2 = [url5];
+      break;
+    case "win32":
+      command = "powershell.exe";
+      args2 = [
+        "-NoProfile",
+        "-NonInteractive",
+        "-WindowStyle",
+        "Hidden",
+        "-Command",
+        `Start-Process '${url5.replace(/'/g, "''")}'`
+      ];
+      break;
+    case "linux":
+    case "freebsd":
+    case "openbsd":
+      command = "xdg-open";
+      args2 = [url5];
+      break;
+    default:
+      throw new Error(`Unsupported platform: ${platformName}`);
   }
+  const options2 = {
+    // Don't inherit parent's environment to avoid potential issues
+    env: {
+      ...process.env,
+      // Ensure we're not in a shell that might interpret special characters
+      SHELL: void 0
+    },
+    // Detach the browser process so it doesn't block
+    detached: true,
+    stdio: "ignore"
+  };
   try {
-    await fs40.writeFile(reportPath, stringifiedReportContent);
-    console.error(`${baseMessage} Full report available at: ${reportPath}`);
-  } catch (writeError) {
-    console.error(`${baseMessage} Additionally, failed to write detailed error report:`, writeError);
-    console.error("Original error that triggered report generation:", error2);
-    if (context2) {
-      try {
-        console.error("Original context:", context2);
-      } catch {
+    await execFileAsync5(command, args2, options2);
+  } catch (error2) {
+    if ((platformName === "linux" || platformName === "freebsd" || platformName === "openbsd") && command === "xdg-open") {
+      const fallbackCommands = [
+        "gnome-open",
+        "kde-open",
+        "firefox",
+        "chromium",
+        "google-chrome"
+      ];
+      for (const fallbackCommand of fallbackCommands) {
         try {
-          console.error("Original context (stringified, truncated):", JSON.stringify(context2).substring(0, 1e3));
+          await execFileAsync5(fallbackCommand, [url5], options2);
+          return;
         } catch {
-          console.error("Original context could not be logged or stringified.");
+          continue;
         }
       }
     }
+    throw new Error(`Failed to open browser: ${error2 instanceof Error ? error2.message : "Unknown error"}`);
   }
 }
 
@@ -353014,33 +352955,6 @@ Suggested retry after 60s.`, googleApiError, 60);
   return error2;
 }
 
-// packages/core/dist/src/utils/delay.js
-function createAbortError() {
-  const abortError = new Error("Aborted");
-  abortError.name = "AbortError";
-  return abortError;
-}
-function delay2(ms, signal) {
-  if (!signal) {
-    return new Promise((resolve14) => setTimeout(resolve14, ms));
-  }
-  if (signal.aborted) {
-    return Promise.reject(createAbortError());
-  }
-  return new Promise((resolve14, reject) => {
-    const onAbort = () => {
-      clearTimeout(timeoutId);
-      signal.removeEventListener("abort", onAbort);
-      reject(createAbortError());
-    };
-    const timeoutId = setTimeout(() => {
-      signal.removeEventListener("abort", onAbort);
-      resolve14();
-    }, ms);
-    signal.addEventListener("abort", onAbort, { once: true });
-  });
-}
-
 // packages/core/dist/src/availability/errorClassification.js
 function classifyFailureKind(error2) {
   if (error2 instanceof TerminalQuotaError) {
@@ -353057,23 +352971,31 @@ function classifyFailureKind(error2) {
 
 // packages/core/dist/src/config/models.js
 var PREVIEW_GEMINI_MODEL = "gemini-3-pro-preview";
+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_FLASH_LITE_MODEL = "gemini-2.5-flash-lite";
-var DEFAULT_GEMINI_MODEL_AUTO = "auto";
+var PREVIEW_GEMINI_MODEL_AUTO = "auto-gemini-3";
+var DEFAULT_GEMINI_MODEL_AUTO = "auto-gemini-2.5";
+var GEMINI_MODEL_ALIAS_AUTO = "auto";
 var GEMINI_MODEL_ALIAS_PRO = "pro";
 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 resolveModel(requestedModel, previewFeaturesEnabled) {
+function resolveModel(requestedModel, previewFeaturesEnabled = false) {
   switch (requestedModel) {
-    case DEFAULT_GEMINI_MODEL_AUTO:
+    case PREVIEW_GEMINI_MODEL_AUTO: {
+      return PREVIEW_GEMINI_MODEL;
+    }
+    case DEFAULT_GEMINI_MODEL_AUTO: {
+      return DEFAULT_GEMINI_MODEL;
+    }
     case GEMINI_MODEL_ALIAS_PRO: {
       return previewFeaturesEnabled ? PREVIEW_GEMINI_MODEL : DEFAULT_GEMINI_MODEL;
     }
     case GEMINI_MODEL_ALIAS_FLASH: {
-      return DEFAULT_GEMINI_FLASH_MODEL;
+      return previewFeaturesEnabled ? PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
     }
     case GEMINI_MODEL_ALIAS_FLASH_LITE: {
       return DEFAULT_GEMINI_FLASH_LITE_MODEL;
@@ -353083,15 +353005,23 @@ function resolveModel(requestedModel, previewFeaturesEnabled) {
     }
   }
 }
-function getEffectiveModel(isInFallbackMode, requestedModel, previewFeaturesEnabled) {
-  const resolvedModel = resolveModel(requestedModel, previewFeaturesEnabled);
-  if (!isInFallbackMode) {
-    return resolvedModel;
-  }
-  if (resolvedModel.includes("lite")) {
-    return resolvedModel;
+function resolveClassifierModel(requestedModel, modelAlias, previewFeaturesEnabled = false) {
+  if (modelAlias === GEMINI_MODEL_ALIAS_FLASH) {
+    if (requestedModel === DEFAULT_GEMINI_MODEL_AUTO || requestedModel === DEFAULT_GEMINI_MODEL) {
+      return DEFAULT_GEMINI_FLASH_MODEL;
+    }
+    if (requestedModel === PREVIEW_GEMINI_MODEL_AUTO || requestedModel === PREVIEW_GEMINI_MODEL) {
+      return PREVIEW_GEMINI_FLASH_MODEL;
+    }
+    return resolveModel(GEMINI_MODEL_ALIAS_FLASH, previewFeaturesEnabled);
   }
-  return DEFAULT_GEMINI_FLASH_MODEL;
+  return resolveModel(requestedModel, previewFeaturesEnabled);
+}
+function getEffectiveModel(requestedModel, previewFeaturesEnabled) {
+  return resolveModel(requestedModel, previewFeaturesEnabled);
+}
+function isPreviewModel(model) {
+  return model === PREVIEW_GEMINI_MODEL || model === PREVIEW_GEMINI_FLASH_MODEL || model === PREVIEW_GEMINI_MODEL_AUTO;
 }
 function isGemini2Model(model) {
   return /^gemini-2(\.|$)/.test(model);
@@ -353118,13 +353048,8 @@ var DEFAULT_CHAIN = [
   definePolicy({ model: DEFAULT_GEMINI_FLASH_MODEL, isLastResort: true })
 ];
 var PREVIEW_CHAIN = [
-  definePolicy({
-    model: PREVIEW_GEMINI_MODEL,
-    stateTransitions: { transient: "sticky_retry" },
-    actions: { transient: "silent" }
-  }),
-  definePolicy({ model: DEFAULT_GEMINI_MODEL }),
-  definePolicy({ model: DEFAULT_GEMINI_FLASH_MODEL, isLastResort: true })
+  definePolicy({ model: PREVIEW_GEMINI_MODEL }),
+  definePolicy({ model: PREVIEW_GEMINI_FLASH_MODEL, isLastResort: true })
 ];
 function getModelPolicyChain(options2) {
   if (options2.previewEnabled) {
@@ -353132,6 +353057,9 @@ function getModelPolicyChain(options2) {
   }
   return cloneChain(DEFAULT_CHAIN);
 }
+function createSingleModelChain(model) {
+  return [definePolicy({ model, isLastResort: true })];
+}
 function createDefaultPolicy(model, options2) {
   return definePolicy({ model, isLastResort: options2?.isLastResort });
 }
@@ -353158,28 +353086,33 @@ function cloneChain(chain2) {
 }
 
 // packages/core/dist/src/availability/policyHelpers.js
-function resolvePolicyChain(config3, preferredModel) {
-  const chain2 = getModelPolicyChain({
-    previewEnabled: !!config3.getPreviewFeatures(),
-    userTier: config3.getUserTier()
-  });
-  const activeModel = preferredModel ?? getEffectiveModel(config3.isInFallbackMode(), config3.getModel(), config3.getPreviewFeatures());
-  if (activeModel === "auto") {
-    return [...chain2];
+function resolvePolicyChain(config3, preferredModel, wrapsAround = false) {
+  const modelFromConfig = preferredModel ?? config3.getActiveModel?.() ?? config3.getModel();
+  let chain2;
+  if (config3.getModel() === PREVIEW_GEMINI_MODEL_AUTO || config3.getModel() === DEFAULT_GEMINI_MODEL_AUTO) {
+    chain2 = getModelPolicyChain({
+      previewEnabled: config3.getModel() === PREVIEW_GEMINI_MODEL_AUTO,
+      userTier: config3.getUserTier()
+    });
+  } else {
+    chain2 = createSingleModelChain(modelFromConfig);
   }
-  if (chain2.some((policy) => policy.model === activeModel)) {
-    return [...chain2];
+  const activeModel = resolveModel(modelFromConfig);
+  const activeIndex = chain2.findIndex((policy) => policy.model === activeModel);
+  if (activeIndex !== -1) {
+    return wrapsAround ? [...chain2.slice(activeIndex), ...chain2.slice(0, activeIndex)] : [...chain2.slice(activeIndex)];
   }
   return [createDefaultPolicy(activeModel, { isLastResort: true })];
 }
-function buildFallbackPolicyContext(chain2, failedModel) {
+function buildFallbackPolicyContext(chain2, failedModel, wrapsAround = false) {
   const index = chain2.findIndex((policy) => policy.model === failedModel);
   if (index === -1) {
     return { failedPolicy: void 0, candidates: chain2 };
   }
+  const candidates = wrapsAround ? [...chain2.slice(index + 1), ...chain2.slice(0, index)] : [...chain2.slice(index + 1)];
   return {
     failedPolicy: chain2[index],
-    candidates: [...chain2.slice(index + 1), ...chain2.slice(0, index)]
+    candidates
   };
 }
 function resolvePolicyAction(failureKind, policy) {
@@ -353246,6 +353179,230 @@ function applyAvailabilityTransition(getContext, failureKind) {
   }
 }
 
+// packages/core/dist/src/fallback/handler.js
+var UPGRADE_URL_PAGE = "https://goo.gle/set-up-gemini-code-assist";
+async function handleFallback(config3, failedModel, authType, error2) {
+  return handlePolicyDrivenFallback(config3, failedModel, authType, error2);
+}
+async function handlePolicyDrivenFallback(config3, failedModel, authType, error2) {
+  if (authType !== AuthType2.LOGIN_WITH_GOOGLE) {
+    return null;
+  }
+  const chain2 = resolvePolicyChain(config3);
+  const { failedPolicy, candidates } = buildFallbackPolicyContext(chain2, failedModel);
+  const failureKind = classifyFailureKind(error2);
+  const availability = config3.getModelAvailabilityService();
+  const getAvailabilityContext = () => {
+    if (!failedPolicy)
+      return void 0;
+    return { service: availability, policy: failedPolicy };
+  };
+  let fallbackModel;
+  if (!candidates.length) {
+    fallbackModel = failedModel;
+  } else {
+    const selection = availability.selectFirstAvailable(candidates.map((policy) => policy.model));
+    const lastResortPolicy = candidates.find((policy) => policy.isLastResort);
+    const selectedFallbackModel = selection.selectedModel ?? lastResortPolicy?.model;
+    const selectedPolicy = candidates.find((policy) => policy.model === selectedFallbackModel);
+    if (!selectedFallbackModel || selectedFallbackModel === failedModel || !selectedPolicy) {
+      return null;
+    }
+    fallbackModel = selectedFallbackModel;
+    const action = resolvePolicyAction(failureKind, selectedPolicy);
+    if (action === "silent") {
+      applyAvailabilityTransition(getAvailabilityContext, failureKind);
+      return processIntent(config3, "retry_always", fallbackModel);
+    }
+    const recommendation = {
+      ...selection,
+      selectedModel: fallbackModel,
+      action,
+      failureKind,
+      failedPolicy,
+      selectedPolicy
+    };
+    void recommendation;
+  }
+  const handler = config3.getFallbackModelHandler();
+  if (typeof handler !== "function") {
+    return null;
+  }
+  try {
+    const intent = await handler(failedModel, fallbackModel, error2);
+    if (intent === "retry_always" || intent === "retry_once") {
+      applyAvailabilityTransition(getAvailabilityContext, failureKind);
+    }
+    return await processIntent(config3, intent, fallbackModel);
+  } catch (handlerError) {
+    debugLogger.error("Fallback handler failed:", handlerError);
+    return null;
+  }
+}
+async function handleUpgrade() {
+  try {
+    await openBrowserSecurely(UPGRADE_URL_PAGE);
+  } catch (error2) {
+    debugLogger.warn("Failed to open browser automatically:", getErrorMessage(error2));
+  }
+}
+async function processIntent(config3, intent, fallbackModel) {
+  switch (intent) {
+    case "retry_always":
+      config3.setActiveModel(fallbackModel);
+      return true;
+    case "retry_once":
+      return true;
+    case "stop":
+      return false;
+    case "retry_later":
+      return false;
+    case "upgrade":
+      await handleUpgrade();
+      return false;
+    default:
+      throw new Error(`Unexpected fallback intent received from fallbackModelHandler: "${intent}"`);
+  }
+}
+
+// packages/core/dist/src/utils/partUtils.js
+function partToString(value, options2) {
+  if (!value) {
+    return "";
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  if (Array.isArray(value)) {
+    return value.map((part2) => partToString(part2, options2)).join("");
+  }
+  const part = value;
+  if (options2?.verbose) {
+    if (part.videoMetadata !== void 0) {
+      return `[Video Metadata]`;
+    }
+    if (part.thought !== void 0) {
+      return `[Thought: ${part.thought}]`;
+    }
+    if (part.codeExecutionResult !== void 0) {
+      return `[Code Execution Result]`;
+    }
+    if (part.executableCode !== void 0) {
+      return `[Executable Code]`;
+    }
+    if (part.fileData !== void 0) {
+      return `[File Data]`;
+    }
+    if (part.functionCall !== void 0) {
+      return `[Function Call: ${part.functionCall.name}]`;
+    }
+    if (part.functionResponse !== void 0) {
+      return `[Function Response: ${part.functionResponse.name}]`;
+    }
+    if (part.inlineData !== void 0) {
+      return `<${part.inlineData.mimeType}>`;
+    }
+  }
+  return part.text ?? "";
+}
+function getResponseText(response) {
+  if (response.candidates && response.candidates.length > 0) {
+    const candidate = response.candidates[0];
+    if (candidate.content && candidate.content.parts && candidate.content.parts.length > 0) {
+      return candidate.content.parts.filter((part) => part.text).map((part) => part.text).join("");
+    }
+  }
+  return null;
+}
+
+// packages/core/dist/src/utils/errorReporting.js
+import fs40 from "node:fs/promises";
+import os13 from "node:os";
+import path40 from "node:path";
+async function reportError(error2, baseMessage, context2, type = "general", reportingDir = os13.tmpdir()) {
+  const timestamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+  const reportFileName = `gemini-client-error-${type}-${timestamp}.json`;
+  const reportPath = path40.join(reportingDir, reportFileName);
+  let errorToReport;
+  if (error2 instanceof Error) {
+    errorToReport = { message: error2.message, stack: error2.stack };
+  } else if (typeof error2 === "object" && error2 !== null && "message" in error2) {
+    errorToReport = {
+      message: String(error2.message)
+    };
+  } else {
+    errorToReport = { message: String(error2) };
+  }
+  const reportContent = { error: errorToReport };
+  if (context2) {
+    reportContent.context = context2;
+  }
+  let stringifiedReportContent;
+  try {
+    stringifiedReportContent = JSON.stringify(reportContent, null, 2);
+  } catch (stringifyError) {
+    console.error(`${baseMessage} Could not stringify report content (likely due to context):`, stringifyError);
+    console.error("Original error that triggered report generation:", error2);
+    if (context2) {
+      console.error("Original context could not be stringified or included in report.");
+    }
+    try {
+      const minimalReportContent = { error: errorToReport };
+      stringifiedReportContent = JSON.stringify(minimalReportContent, null, 2);
+      await fs40.writeFile(reportPath, stringifiedReportContent);
+      console.error(`${baseMessage} Partial report (excluding context) available at: ${reportPath}`);
+    } catch (minimalWriteError) {
+      console.error(`${baseMessage} Failed to write even a minimal error report:`, minimalWriteError);
+    }
+    return;
+  }
+  try {
+    await fs40.writeFile(reportPath, stringifiedReportContent);
+    console.error(`${baseMessage} Full report available at: ${reportPath}`);
+  } catch (writeError) {
+    console.error(`${baseMessage} Additionally, failed to write detailed error report:`, writeError);
+    console.error("Original error that triggered report generation:", error2);
+    if (context2) {
+      try {
+        console.error("Original context:", context2);
+      } catch {
+        try {
+          console.error("Original context (stringified, truncated):", JSON.stringify(context2).substring(0, 1e3));
+        } catch {
+          console.error("Original context could not be logged or stringified.");
+        }
+      }
+    }
+  }
+}
+
+// packages/core/dist/src/utils/delay.js
+function createAbortError() {
+  const abortError = new Error("Aborted");
+  abortError.name = "AbortError";
+  return abortError;
+}
+function delay2(ms, signal) {
+  if (!signal) {
+    return new Promise((resolve14) => setTimeout(resolve14, ms));
+  }
+  if (signal.aborted) {
+    return Promise.reject(createAbortError());
+  }
+  return new Promise((resolve14, reject) => {
+    const onAbort = () => {
+      clearTimeout(timeoutId);
+      signal.removeEventListener("abort", onAbort);
+      reject(createAbortError());
+    };
+    const timeoutId = setTimeout(() => {
+      signal.removeEventListener("abort", onAbort);
+      resolve14();
+    }, ms);
+    signal.addEventListener("abort", onAbort, { once: true });
+  });
+}
+
 // packages/core/dist/src/utils/retry.js
 var DEFAULT_RETRY_OPTIONS = {
   maxAttempts: 3,
@@ -353342,14 +353499,9 @@ async function retryWithBackoff(fn, options2) {
         throw error2;
       }
       const classifiedError = classifyGoogleError(error2);
-      const failureKind = classifyFailureKind(classifiedError);
-      const appliedImmediate = failureKind === "terminal" || failureKind === "not_found";
-      if (appliedImmediate) {
-        applyAvailabilityTransition(getAvailabilityContext, failureKind);
-      }
       const errorCode = getErrorStatus(error2);
       if (classifiedError instanceof TerminalQuotaError || classifiedError instanceof ModelNotFoundError) {
-        if (onPersistent429 && authType === AuthType2.LOGIN_WITH_GOOGLE) {
+        if (onPersistent429) {
           try {
             const fallbackModel = await onPersistent429(authType, classifiedError);
             if (fallbackModel) {
@@ -353366,7 +353518,7 @@ async function retryWithBackoff(fn, options2) {
       const is500 = errorCode !== void 0 && errorCode >= 500 && errorCode < 600;
       if (classifiedError instanceof RetryableQuotaError || is500) {
         if (attempt >= maxAttempts) {
-          if (onPersistent429 && authType === AuthType2.LOGIN_WITH_GOOGLE) {
+          if (onPersistent429) {
             try {
               const fallbackModel = await onPersistent429(authType, classifiedError);
               if (fallbackModel) {
@@ -353378,9 +353530,6 @@ async function retryWithBackoff(fn, options2) {
               console.warn("Model fallback failed:", fallbackError);
             }
           }
-          if (!appliedImmediate) {
-            applyAvailabilityTransition(getAvailabilityContext, failureKind);
-          }
           throw classifiedError instanceof RetryableQuotaError ? classifiedError : error2;
         }
         if (classifiedError instanceof RetryableQuotaError) {
@@ -353398,9 +353547,6 @@ async function retryWithBackoff(fn, options2) {
         }
       }
       if (attempt >= maxAttempts || !shouldRetryOnError(error2, retryFetchErrors)) {
-        if (!appliedImmediate) {
-          applyAvailabilityTransition(getAvailabilityContext, failureKind);
-        }
         throw error2;
       }
       const errorStatus = getErrorStatus(error2);
@@ -353440,9 +353586,11 @@ var DEFAULT_MAX_ATTEMPTS = 5;
 var BaseLlmClient = class {
   contentGenerator;
   config;
-  constructor(contentGenerator, config3) {
+  authType;
+  constructor(contentGenerator, config3, authType) {
     this.contentGenerator = contentGenerator;
     this.config = config3;
+    this.authType = authType;
   }
   async generateJson(options2) {
     const { schema, modelConfigKey, contents, systemInstruction, abortSignal, promptId, maxAttempts } = options2;
@@ -353552,7 +353700,9 @@ var BaseLlmClient = class {
       return await retryWithBackoff(apiCall, {
         shouldRetryOnContent,
         maxAttempts: availabilityMaxAttempts ?? maxAttempts ?? DEFAULT_MAX_ATTEMPTS,
-        getAvailabilityContext
+        getAvailabilityContext,
+        onPersistent429: this.config.isInteractive() ? (authType, error2) => handleFallback(this.config, requestParams.model, authType, error2) : void 0,
+        authType: this.authType ?? this.config.getContentGeneratorConfig()?.authType
       });
     } catch (error2) {
       if (abortSignal?.aborted) {
@@ -360740,7 +360890,7 @@ var WriteFileTool = class _WriteFileTool extends BaseDeclarativeTool {
 
 // packages/core/dist/src/utils/fetch.js
 var import_undici2 = __toESM(require_undici(), 1);
-import { URL as URL6 } from "node:url";
+import { URL as URL7 } from "node:url";
 var PRIVATE_IP_RANGES = [
   /^10\./,
   /^127\./,
@@ -360760,7 +360910,7 @@ var FetchError2 = class extends Error {
 };
 function isPrivateIp(url5) {
   try {
-    const hostname3 = new URL6(url5).hostname;
+    const hostname3 = new URL7(url5).hostname;
     return PRIVATE_IP_RANGES.some((range2) => range2.test(hostname3));
   } catch (_e) {
     return false;
@@ -368025,225 +368175,6 @@ var ChatRecordingService = class {
   }
 };
 
-// packages/core/dist/src/utils/secure-browser-launcher.js
-import { execFile as execFile6 } from "node:child_process";
-import { promisify as promisify13 } from "node:util";
-import { platform as platform10 } from "node:os";
-import { URL as URL7 } from "node:url";
-var execFileAsync5 = promisify13(execFile6);
-function validateUrl(url5) {
-  let parsedUrl;
-  try {
-    parsedUrl = new URL7(url5);
-  } catch (_error) {
-    throw new Error(`Invalid URL: ${url5}`);
-  }
-  if (parsedUrl.protocol !== "http:" && parsedUrl.protocol !== "https:") {
-    throw new Error(`Unsafe protocol: ${parsedUrl.protocol}. Only HTTP and HTTPS are allowed.`);
-  }
-  if (/[\r\n\x00-\x1f]/.test(url5)) {
-    throw new Error("URL contains invalid characters");
-  }
-}
-async function openBrowserSecurely(url5) {
-  validateUrl(url5);
-  const platformName = platform10();
-  let command;
-  let args2;
-  switch (platformName) {
-    case "darwin":
-      command = "open";
-      args2 = [url5];
-      break;
-    case "win32":
-      command = "powershell.exe";
-      args2 = [
-        "-NoProfile",
-        "-NonInteractive",
-        "-WindowStyle",
-        "Hidden",
-        "-Command",
-        `Start-Process '${url5.replace(/'/g, "''")}'`
-      ];
-      break;
-    case "linux":
-    case "freebsd":
-    case "openbsd":
-      command = "xdg-open";
-      args2 = [url5];
-      break;
-    default:
-      throw new Error(`Unsupported platform: ${platformName}`);
-  }
-  const options2 = {
-    // Don't inherit parent's environment to avoid potential issues
-    env: {
-      ...process.env,
-      // Ensure we're not in a shell that might interpret special characters
-      SHELL: void 0
-    },
-    // Detach the browser process so it doesn't block
-    detached: true,
-    stdio: "ignore"
-  };
-  try {
-    await execFileAsync5(command, args2, options2);
-  } catch (error2) {
-    if ((platformName === "linux" || platformName === "freebsd" || platformName === "openbsd") && command === "xdg-open") {
-      const fallbackCommands = [
-        "gnome-open",
-        "kde-open",
-        "firefox",
-        "chromium",
-        "google-chrome"
-      ];
-      for (const fallbackCommand of fallbackCommands) {
-        try {
-          await execFileAsync5(fallbackCommand, [url5], options2);
-          return;
-        } catch {
-          continue;
-        }
-      }
-    }
-    throw new Error(`Failed to open browser: ${error2 instanceof Error ? error2.message : "Unknown error"}`);
-  }
-}
-
-// packages/core/dist/src/fallback/handler.js
-init_events();
-var UPGRADE_URL_PAGE = "https://goo.gle/set-up-gemini-code-assist";
-async function handleFallback(config3, failedModel, authType, error2) {
-  if (config3.isModelAvailabilityServiceEnabled()) {
-    return handlePolicyDrivenFallback(config3, failedModel, authType, error2);
-  }
-  return legacyHandleFallback(config3, failedModel, authType, error2);
-}
-async function legacyHandleFallback(config3, failedModel, authType, error2) {
-  if (authType !== AuthType2.LOGIN_WITH_GOOGLE)
-    return null;
-  if (error2 instanceof ModelNotFoundError && failedModel !== PREVIEW_GEMINI_MODEL) {
-    return null;
-  }
-  const shouldActivatePreviewFallback = failedModel === PREVIEW_GEMINI_MODEL && !(error2 instanceof TerminalQuotaError);
-  if (shouldActivatePreviewFallback) {
-    config3.setPreviewModelBypassMode(true);
-    if (config3.isPreviewModelFallbackMode()) {
-      return true;
-    }
-  }
-  const fallbackModel = shouldActivatePreviewFallback ? DEFAULT_GEMINI_MODEL : DEFAULT_GEMINI_FLASH_MODEL;
-  const fallbackModelHandler = config3.fallbackModelHandler;
-  if (typeof fallbackModelHandler !== "function")
-    return null;
-  try {
-    const intent = await fallbackModelHandler(failedModel, fallbackModel, error2);
-    return await processIntent(config3, intent, failedModel, fallbackModel, authType, error2);
-  } catch (handlerError) {
-    console.error("Fallback UI handler failed:", handlerError);
-    return null;
-  }
-}
-async function handlePolicyDrivenFallback(config3, failedModel, authType, error2) {
-  if (authType !== AuthType2.LOGIN_WITH_GOOGLE) {
-    return null;
-  }
-  const chain2 = resolvePolicyChain(config3);
-  const { failedPolicy, candidates } = buildFallbackPolicyContext(chain2, failedModel);
-  const failureKind = classifyFailureKind(error2);
-  if (!candidates.length) {
-    return null;
-  }
-  const availability = config3.getModelAvailabilityService();
-  const selection = availability.selectFirstAvailable(candidates.map((policy) => policy.model));
-  const lastResortPolicy = candidates.find((policy) => policy.isLastResort);
-  const fallbackModel = selection.selectedModel ?? lastResortPolicy?.model;
-  const selectedPolicy = candidates.find((policy) => policy.model === fallbackModel);
-  if (!fallbackModel || fallbackModel === failedModel || !selectedPolicy) {
-    return null;
-  }
-  const action = resolvePolicyAction(failureKind, selectedPolicy);
-  if (action === "silent") {
-    return processIntent(config3, "retry_always", failedModel, fallbackModel, authType, error2);
-  }
-  const recommendation = {
-    ...selection,
-    selectedModel: fallbackModel,
-    action,
-    failureKind,
-    failedPolicy,
-    selectedPolicy
-  };
-  void recommendation;
-  const handler = config3.getFallbackModelHandler();
-  if (typeof handler !== "function") {
-    return null;
-  }
-  try {
-    const intent = await handler(failedModel, fallbackModel, error2);
-    return await processIntent(config3, intent, failedModel, fallbackModel, authType, error2);
-  } catch (handlerError) {
-    debugLogger.error("Fallback handler failed:", handlerError);
-    return null;
-  }
-}
-async function handleUpgrade() {
-  try {
-    await openBrowserSecurely(UPGRADE_URL_PAGE);
-  } catch (error2) {
-    debugLogger.warn("Failed to open browser automatically:", getErrorMessage(error2));
-  }
-}
-async function processIntent(config3, intent, failedModel, fallbackModel, authType, error2) {
-  const isAvailabilityEnabled = config3.isModelAvailabilityServiceEnabled();
-  switch (intent) {
-    case "retry_always":
-      if (isAvailabilityEnabled) {
-        config3.setActiveModel(fallbackModel);
-      } else {
-        if (failedModel === PREVIEW_GEMINI_MODEL && !(error2 instanceof TerminalQuotaError)) {
-          activatePreviewModelFallbackMode(config3);
-        } else {
-          activateFallbackMode(config3, authType);
-        }
-      }
-      return true;
-    case "retry_once":
-      if (isAvailabilityEnabled) {
-        config3.setActiveModel(fallbackModel);
-      }
-      return true;
-    case "stop":
-      if (isAvailabilityEnabled) {
-        config3.setActiveModel(fallbackModel);
-      } else {
-        activateFallbackMode(config3, authType);
-      }
-      return false;
-    case "retry_later":
-      return false;
-    case "upgrade":
-      await handleUpgrade();
-      return false;
-    default:
-      throw new Error(`Unexpected fallback intent received from fallbackModelHandler: "${intent}"`);
-  }
-}
-function activateFallbackMode(config3, authType) {
-  if (!config3.isInFallbackMode()) {
-    config3.setFallbackMode(true);
-    coreEvents.emitFallbackModeChanged(true);
-    if (authType) {
-      logFlashFallback(config3, new FlashFallbackEvent(authType));
-    }
-  }
-}
-function activatePreviewModelFallbackMode(config3) {
-  if (!config3.isPreviewModelFallbackMode()) {
-    config3.setPreviewModelFallbackMode(true);
-  }
-}
-
 // packages/core/dist/src/core/geminiRequest.js
 function partListUnionToString(value) {
   return partToString(value, { verbose: true });
@@ -368537,7 +368468,7 @@ var GeminiChat = class {
       try {
         let lastError = new Error("Request failed after all retries.");
         let maxAttempts = INVALID_CONTENT_RETRY_OPTIONS.maxAttempts;
-        if (this.config.isPreviewModelFallbackMode() && model === PREVIEW_GEMINI_MODEL) {
+        if (this.config.isPreviewModelFallbackMode() && isPreviewModel(model)) {
           maxAttempts = 1;
         }
         for (let attempt = 0; attempt < maxAttempts; attempt++) {
@@ -368582,7 +368513,7 @@ var GeminiChat = class {
           }
           throw lastError;
         } else {
-          if (model === PREVIEW_GEMINI_MODEL && !this.config.isPreviewModelBypassMode()) {
+          if (isPreviewModel(model) && !this.config.isPreviewModelBypassMode()) {
             this.config.setPreviewModelFallbackMode(false);
           }
         }
@@ -368607,10 +368538,11 @@ var GeminiChat = class {
     let lastConfig = currentGenerateContentConfig;
     let lastContentsToUse = requestContents;
     const getAvailabilityContext = createAvailabilityContextProvider(this.config, () => lastModelToUse);
+    const initialActiveModel = this.config.getActiveModel();
     const apiCall = async () => {
-      let modelToUse;
-      if (this.config.isModelAvailabilityServiceEnabled()) {
-        modelToUse = this.config.getActiveModel();
+      let modelToUse = resolveModel(lastModelToUse, this.config.getPreviewFeatures());
+      if (this.config.getActiveModel() !== initialActiveModel) {
+        modelToUse = resolveModel(this.config.getActiveModel(), this.config.getPreviewFeatures());
         if (modelToUse !== lastModelToUse) {
           const { generateContentConfig: newConfig } = this.config.modelConfigService.getResolvedConfig({
             model: modelToUse
@@ -368623,11 +368555,6 @@ var GeminiChat = class {
             currentGenerateContentConfig.abortSignal = abortSignal;
           }
         }
-      } else {
-        modelToUse = getEffectiveModel(this.config.isInFallbackMode(), model, this.config.getPreviewFeatures());
-        if (this.config.isPreviewModelBypassMode() && modelToUse === PREVIEW_GEMINI_MODEL) {
-          modelToUse = DEFAULT_GEMINI_MODEL;
-        }
       }
       lastModelToUse = modelToUse;
       const config3 = {
@@ -368650,7 +368577,7 @@ var GeminiChat = class {
         };
         delete config3.thinkingConfig?.thinkingLevel;
       }
-      let contentsToUse = modelToUse === PREVIEW_GEMINI_MODEL ? contentsForPreviewModel : requestContents;
+      let contentsToUse = isPreviewModel(modelToUse) ? contentsForPreviewModel : requestContents;
       const hooksEnabled = this.config.getEnableHooks();
       const messageBus = this.config.getMessageBus();
       if (hooksEnabled && messageBus) {
@@ -368702,7 +368629,7 @@ var GeminiChat = class {
       authType: this.config.getContentGeneratorConfig()?.authType,
       retryFetchErrors: this.config.getRetryFetchErrors(),
       signal: generateContentConfig.abortSignal,
-      maxAttempts: availabilityMaxAttempts ?? (this.config.isPreviewModelFallbackMode() && model === PREVIEW_GEMINI_MODEL ? 1 : void 0),
+      maxAttempts: availabilityMaxAttempts ?? (this.config.isPreviewModelFallbackMode() && isPreviewModel(model) ? 1 : void 0),
       getAvailabilityContext
     });
     const originalRequest = {
@@ -369161,7 +369088,7 @@ var CodebaseInvestigatorAgent = {
   // The 'output' parameter is now strongly typed as CodebaseInvestigationReportSchema
   processOutput: (output) => JSON.stringify(output, null, 2),
   modelConfig: {
-    model: GEMINI_MODEL_ALIAS_PRO,
+    model: DEFAULT_GEMINI_MODEL,
     temp: 0.1,
     top_p: 0.95,
     thinkingBudget: -1
@@ -369468,8 +369395,8 @@ function getCoreSystemPrompt(config3, userMemory) {
       throw new Error(`missing system prompt file '${systemMdPath}'`);
     }
   }
-  const desiredModel = getEffectiveModel(config3.isInFallbackMode(), config3.getModel(), config3.getPreviewFeatures());
-  const isGemini3 = desiredModel === PREVIEW_GEMINI_MODEL;
+  const desiredModel = resolveModel(config3.getActiveModel(), config3.getPreviewFeatures());
+  const isGemini3 = isPreviewModel(desiredModel);
   const mandatesVariant = isGemini3 ? `
 - **Do not call tools in silence:** You must provide to the user very short and concise natural explanation (one sentence) before calling tools.` : ``;
   const enableCodebaseInvestigator = config3.getToolRegistry().getAllToolNames().includes(CodebaseInvestigatorAgent.name);
@@ -369501,7 +369428,7 @@ ${config3.getAgentRegistry().getDirectoryContext()}`,
 
 ## Software Engineering Tasks
 When requested to perform tasks like fixing bugs, adding features, refactoring, or explaining code, follow this sequence:
-1. **Understand:** Think about the user's request and the relevant codebase context. Use '${GREP_TOOL_NAME}' and '${GLOB_TOOL_NAME}' search tools extensively (in parallel if independent) to understand file structures, existing code patterns, and conventions. 
+1. **Understand:** Think about the user's request and the relevant codebase context. Use '${GREP_TOOL_NAME}' and '${GLOB_TOOL_NAME}' search tools extensively (in parallel if independent) to understand file structures, existing code patterns, and conventions.
 Use '${READ_FILE_TOOL_NAME}' to understand context and validate any assumptions you may have. If you need to read multiple files, you should make multiple parallel calls to '${READ_FILE_TOOL_NAME}'.
 2. **Plan:** Build a coherent and grounded (based on the understanding in step 1) plan for how you intend to resolve the user's task. Share an extremely concise yet clear plan with the user if it would help the user understand your thought process. As part of the plan, you should use an iterative development process that includes writing unit tests to verify your changes. Use output logs or debug statements as part of this process to arrive at a solution.`,
       primaryWorkflows_prefix_ci: `
@@ -369525,8 +369452,7 @@ When requested to perform tasks like fixing bugs, adding features, refactoring,
 When requested to perform tasks like fixing bugs, adding features, refactoring, or explaining code, follow this sequence:
 1. **Understand:** Think about the user's request and the relevant codebase context. Use '${GREP_TOOL_NAME}' and '${GLOB_TOOL_NAME}' search tools extensively (in parallel if independent) to understand file structures, existing code patterns, and conventions. Use '${READ_FILE_TOOL_NAME}' to understand context and validate any assumptions you may have. If you need to read multiple files, you should make multiple parallel calls to '${READ_FILE_TOOL_NAME}'.
 2. **Plan:** Build a coherent and grounded (based on the understanding in step 1) plan for how you intend to resolve the user's task. For complex tasks, break them down into smaller, manageable subtasks and use the \`${WRITE_TODOS_TOOL_NAME}\` tool to track your progress. Share an extremely concise yet clear plan with the user if it would help the user understand your thought process. As part of the plan, you should use an iterative development process that includes writing unit tests to verify your changes. Use output logs or debug statements as part of this process to arrive at a solution.`,
-      primaryWorkflows_suffix: `3. **Implement:** Use the available tools (e.g., '${EDIT_TOOL_NAME}', '${WRITE_FILE_TOOL_NAME}' '${SHELL_TOOL_NAME}' ...) to act on the plan, strictly adhering to the project's established conventions (detailed under 'Core 
-Mandates').
+      primaryWorkflows_suffix: `3. **Implement:** Use the available tools (e.g., '${EDIT_TOOL_NAME}', '${WRITE_FILE_TOOL_NAME}' '${SHELL_TOOL_NAME}' ...) to act on the plan, strictly adhering to the project's established conventions (detailed under 'Core Mandates').
 4. **Verify (Tests):** If applicable and feasible, verify the changes using the project's testing procedures. Identify the correct test commands and frameworks by examining 'README' files, build/package configuration (e.g., 'package.json'), or existing test execution patterns. NEVER assume standard test commands.
 5. **Verify (Standards):** VERY IMPORTANT: After making code changes, execute the project-specific build, linting and type-checking commands (e.g., 'tsc', 'npm run lint', 'ruff check .') that you have identified for this project (or obtained from the user). This ensures code quality and adherence to standards.${interactiveMode ? " If unsure about these commands, you can ask the user if they'd like you to run them and if so how to." : ""}
 6. **Finalize:** After all verification passes, consider the task complete. Do not remove or revert any changes or created files (like tests). Await the user's next instruction.
@@ -369718,7 +369644,7 @@ The structure MUST be as follows:
          - Build Command: \`npm run build\`
          - Testing: Tests are run with \`npm test\`. Test files must end in \`.test.ts\`.
          - API Endpoint: The primary API endpoint is \`https://api.example.com/v2\`.
-         
+
         -->
     </key_knowledge>
 
@@ -370250,6 +370176,8 @@ function modelStringToModelConfigAlias(model) {
   switch (model) {
     case PREVIEW_GEMINI_MODEL:
       return "chat-compression-3-pro";
+    case PREVIEW_GEMINI_FLASH_MODEL:
+      return "chat-compression-3-flash";
     case DEFAULT_GEMINI_MODEL:
       return "chat-compression-2.5-pro";
     case DEFAULT_GEMINI_FLASH_MODEL:
@@ -370644,8 +370572,7 @@ var GeminiClient = class {
     if (this.currentSequenceModel) {
       return this.currentSequenceModel;
     }
-    const configModel = this.config.getModel();
-    return getEffectiveModel(this.config.isInFallbackMode(), configModel, this.config.getPreviewFeatures());
+    return this.config.getActiveModel();
   }
   async *sendMessageStream(request3, signal, prompt_id, turns = MAX_TURNS, isInvalidStreamRetry = false) {
     if (!isInvalidStreamRetry) {
@@ -375985,25 +375912,15 @@ var ClassifierStrategy = class {
       const routerResponse = ClassifierResponseSchema.parse(jsonResponse);
       const reasoning = routerResponse.reasoning;
       const latencyMs = Date.now() - startTime;
-      if (routerResponse.model_choice === FLASH_MODEL) {
-        return {
-          model: resolveModel(GEMINI_MODEL_ALIAS_FLASH, config3.getPreviewFeatures()),
-          metadata: {
-            source: "Classifier",
-            latencyMs,
-            reasoning
-          }
-        };
-      } else {
-        return {
-          model: resolveModel(GEMINI_MODEL_ALIAS_PRO, config3.getPreviewFeatures()),
-          metadata: {
-            source: "Classifier",
-            reasoning,
-            latencyMs
-          }
-        };
-      }
+      const selectedModel = resolveClassifierModel(config3.getModel(), routerResponse.model_choice, config3.getPreviewFeatures());
+      return {
+        model: selectedModel,
+        metadata: {
+          source: "Classifier",
+          latencyMs,
+          reasoning
+        }
+      };
     } catch (error2) {
       debugLogger.warn(`[Routing] ClassifierStrategy failed:`, error2);
       return null;
@@ -376069,19 +375986,28 @@ var CompositeStrategy = class {
 var FallbackStrategy = class {
   name = "fallback";
   async route(_context, config3, _baseLlmClient) {
-    const isInFallbackMode = config3.isInFallbackMode();
-    if (!isInFallbackMode) {
+    if (!config3.isModelAvailabilityServiceEnabled()) {
       return null;
     }
-    const effectiveModel = getEffectiveModel(isInFallbackMode, config3.getModel(), config3.getPreviewFeatures());
-    return {
-      model: effectiveModel,
-      metadata: {
-        source: this.name,
-        latencyMs: 0,
-        reasoning: `In fallback mode. Using: ${effectiveModel}`
-      }
-    };
+    const requestedModel = config3.getModel();
+    const resolvedModel = resolveModel(requestedModel, config3.getPreviewFeatures());
+    const service = config3.getModelAvailabilityService();
+    const snapshot = service.snapshot(resolvedModel);
+    if (snapshot.available) {
+      return null;
+    }
+    const selection = selectModelForAvailability(config3, requestedModel);
+    if (selection?.selectedModel && selection.selectedModel !== requestedModel) {
+      return {
+        model: selection.selectedModel,
+        metadata: {
+          source: this.name,
+          latencyMs: 0,
+          reasoning: `Model ${requestedModel} is unavailable (${snapshot.reason}). Using fallback: ${selection.selectedModel}`
+        }
+      };
+    }
+    return null;
   }
 };
 
@@ -376090,10 +376016,10 @@ var OverrideStrategy = class {
   name = "override";
   async route(_context, config3, _baseLlmClient) {
     const overrideModel = config3.getModel();
-    if (overrideModel === DEFAULT_GEMINI_MODEL_AUTO)
+    if (overrideModel === DEFAULT_GEMINI_MODEL_AUTO || overrideModel === PREVIEW_GEMINI_MODEL_AUTO)
       return null;
     return {
-      model: resolveModel(overrideModel, config3.getPreviewFeatures()),
+      model: getEffectiveModel(overrideModel, config3.getPreviewFeatures()),
       metadata: {
         source: this.name,
         latencyMs: 0,
@@ -376130,11 +376056,6 @@ var ModelRouterService = class {
     let decision;
     try {
       decision = await this.strategy.route(context2, this.config, this.config.getBaseLlmClient());
-      if (decision.model === DEFAULT_GEMINI_MODEL && this.config.getPreviewFeatures() && !decision.metadata.source.includes("override")) {
-        decision.model = PREVIEW_GEMINI_MODEL;
-        decision.metadata.source += " (Preview Model)";
-        decision.metadata.reasoning += " (Upgraded to Preview Model)";
-      }
       const event = new ModelRoutingEvent(
         decision.model,
         decision.metadata.source,
@@ -376366,6 +376287,12 @@ var DEFAULT_MODEL_CONFIGS = {
         model: "gemini-3-pro-preview"
       }
     },
+    "gemini-3-flash-preview": {
+      extends: "chat-base-3",
+      modelConfig: {
+        model: "gemini-3-flash-preview"
+      }
+    },
     "gemini-2.5-pro": {
       extends: "chat-base-2.5",
       modelConfig: {
@@ -376489,6 +376416,11 @@ var DEFAULT_MODEL_CONFIGS = {
         model: "gemini-3-pro-preview"
       }
     },
+    "chat-compression-3-flash": {
+      modelConfig: {
+        model: "gemini-3-flash-preview"
+      }
+    },
     "chat-compression-2.5-pro": {
       modelConfig: {
         model: "gemini-2.5-pro"
@@ -381062,6 +380994,7 @@ var HookSystem = class {
 };
 
 // packages/core/dist/src/agents/registry.js
+init_events();
 function getModelConfigAlias(definition) {
   return `${definition.name}-config`;
 }
@@ -381077,6 +381010,9 @@ var AgentRegistry = class {
    */
   async initialize() {
     this.loadBuiltInAgents();
+    coreEvents.on(CoreEvent.ModelChanged, () => {
+      this.loadBuiltInAgents();
+    });
     if (this.config.getDebugMode()) {
       debugLogger.log(`[AgentRegistry] Initialized with ${this.agents.size} agents.`);
     }
@@ -381084,11 +381020,12 @@ var AgentRegistry = class {
   loadBuiltInAgents() {
     const investigatorSettings = this.config.getCodebaseInvestigatorSettings();
     if (investigatorSettings?.enabled) {
-      let model = investigatorSettings.model ?? CodebaseInvestigatorAgent.modelConfig.model;
-      if (this.config.getModel() === PREVIEW_GEMINI_MODEL) {
-        if (model === GEMINI_MODEL_ALIAS_PRO || model === DEFAULT_GEMINI_MODEL_AUTO) {
-          model = PREVIEW_GEMINI_MODEL;
-        }
+      let model;
+      const settingsModel = investigatorSettings.model;
+      if (settingsModel && settingsModel !== GEMINI_MODEL_ALIAS_AUTO) {
+        model = settingsModel;
+      } else {
+        model = isPreviewModel(this.config.getModel()) ? PREVIEW_GEMINI_FLASH_MODEL : DEFAULT_GEMINI_MODEL;
       }
       const agentDef = {
         ...CodebaseInvestigatorAgent,
@@ -382303,7 +382240,7 @@ var __filename = fileURLToPath10(import.meta.url);
 var __dirname5 = path60.dirname(__filename);
 async function getVersion() {
   const pkgJson = await getPackageJson(__dirname5);
-  return "0.22.0-preview.0";
+  return "0.22.0-preview.2";
 }
 
 // packages/core/dist/src/code_assist/experiments/client_metadata.js
@@ -385404,6 +385341,7 @@ var Config = class {
   bugCommand;
   model;
   previewFeatures;
+  hasAccessToPreviewModel = false;
   noBrowser;
   folderTrust;
   ideMode;
@@ -385517,7 +385455,7 @@ var Config = class {
     this.bugCommand = params.bugCommand;
     this.model = params.model;
     this._activeModel = params.model;
-    this.enableModelAvailabilityService = params.enableModelAvailabilityService ?? false;
+    this.enableModelAvailabilityService = true;
     this.enableAgents = params.enableAgents ?? false;
     this.experimentalJitContext = params.experimentalJitContext ?? false;
     this.modelAvailabilityService = new ModelAvailabilityService();
@@ -385553,7 +385491,7 @@ var Config = class {
     this.truncateToolOutputLines = params.truncateToolOutputLines ?? DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES;
     this.enableToolOutputTruncation = params.enableToolOutputTruncation ?? true;
     this.useSmartEdit = params.useSmartEdit ?? true;
-    this.useWriteTodos = params.useWriteTodos ?? true;
+    this.useWriteTodos = isPreviewModel(this.model) ? false : params.useWriteTodos ?? true;
     this.enableHooks = params.enableHooks ?? false;
     this.disabledHooks = (params.hooks && "disabled" in params.hooks ? params.hooks.disabled : void 0) ?? [];
     const hasHooks = params.hooks && Object.keys(params.hooks).length > 0;
@@ -385662,16 +385600,19 @@ var Config = class {
     if (this.contentGeneratorConfig?.authType === AuthType2.USE_GEMINI && authMethod !== AuthType2.USE_GEMINI) {
       this.geminiClient.stripThoughtsFromHistory();
     }
+    this.modelAvailabilityService.reset();
     const newContentGeneratorConfig = await createContentGeneratorConfig(this, authMethod);
     this.contentGenerator = await createContentGenerator(newContentGeneratorConfig, this, this.getSessionId());
     this.contentGeneratorConfig = newContentGeneratorConfig;
     this.baseLlmClient = new BaseLlmClient(this.contentGenerator, this);
-    const previewFeatures = this.getPreviewFeatures();
     const codeAssistServer = getCodeAssistServer(this);
     if (codeAssistServer) {
+      if (codeAssistServer.projectId) {
+        await this.refreshUserQuota();
+      }
       this.experimentsPromise = getExperiments(codeAssistServer).then((experiments) => {
         this.setExperiments(experiments);
-        if (previewFeatures === void 0) {
+        if (this.getPreviewFeatures() === void 0) {
           const remotePreviewFeatures = experiments.flags[ExperimentFlags.ENABLE_PREVIEW]?.boolValue;
           if (remotePreviewFeatures === true) {
             this.setPreviewFeatures(remotePreviewFeatures);
@@ -385684,7 +385625,14 @@ var Config = class {
       this.experiments = void 0;
       this.experimentsPromise = void 0;
     }
+    const authType = this.contentGeneratorConfig.authType;
+    if (authType === AuthType2.USE_GEMINI || authType === AuthType2.USE_VERTEX_AI) {
+      this.setHasAccessToPreviewModel(true);
+    }
     this.inFallbackMode = false;
+    if (!this.hasAccessToPreviewModel && isPreviewModel(this.model)) {
+      this.setModel(DEFAULT_GEMINI_MODEL_AUTO);
+    }
   }
   async getExperimentsAsync() {
     if (this.experiments) {
@@ -385748,7 +385696,6 @@ var Config = class {
   setActiveModel(model) {
     if (this._activeModel !== model) {
       this._activeModel = model;
-      coreEvents.emitModelChanged(model);
     }
   }
   resetTurn() {
@@ -385829,7 +385776,39 @@ var Config = class {
     return this.previewFeatures;
   }
   setPreviewFeatures(previewFeatures) {
+    if (this.previewFeatures === previewFeatures) {
+      return;
+    }
     this.previewFeatures = previewFeatures;
+    const currentModel = this.getModel();
+    if (!previewFeatures && isPreviewModel(currentModel)) {
+      this.setModel(DEFAULT_GEMINI_MODEL_AUTO);
+    } else if (previewFeatures && currentModel === DEFAULT_GEMINI_MODEL_AUTO) {
+      this.setModel(PREVIEW_GEMINI_MODEL_AUTO);
+    }
+  }
+  getHasAccessToPreviewModel() {
+    return this.hasAccessToPreviewModel;
+  }
+  setHasAccessToPreviewModel(hasAccess) {
+    this.hasAccessToPreviewModel = hasAccess;
+  }
+  async refreshUserQuota() {
+    const codeAssistServer = getCodeAssistServer(this);
+    if (!codeAssistServer || !codeAssistServer.projectId) {
+      return void 0;
+    }
+    try {
+      const quota = await codeAssistServer.retrieveUserQuota({
+        project: codeAssistServer.projectId
+      });
+      const hasAccess = quota.buckets?.some((b) => b.modelId === PREVIEW_GEMINI_MODEL) ?? false;
+      this.setHasAccessToPreviewModel(hasAccess);
+      return quota;
+    } catch (e3) {
+      debugLogger.debug("Failed to retrieve user quota", e3);
+      return void 0;
+    }
   }
   getCoreTools() {
     return this.coreTools;