@google/gemini-cli-core 0.19.0-nightly.20251126.03845198c → 0.20.0-nightly.20251127.5bed97064

package/dist/src/core/prompts.js

@@ -75,7 +75,11 @@ export function getCoreSystemPrompt(config, userMemory) {
     }
     // TODO(joshualitt): Replace with system instructions on model configs.
     const desiredModel = getEffectiveModel(config.isInFallbackMode(), config.getModel(), config.getPreviewFeatures());
-    const useChattySystemPrompt = desiredModel === PREVIEW_GEMINI_MODEL;
+    const isGemini3 = desiredModel === PREVIEW_GEMINI_MODEL;
+    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 = config
         .getToolRegistry()
         .getAllToolNames()
@@ -84,13 +88,14 @@ export function getCoreSystemPrompt(config, userMemory) {
         .getToolRegistry()
         .getAllToolNames()
         .includes(WriteTodosTool.Name);
+    const interactiveMode = config.isInteractiveShellEnabled();
     let basePrompt;
     if (systemMdEnabled) {
         basePrompt = fs.readFileSync(systemMdPath, 'utf8');
     }
     else {
         const promptConfig = {
-            preamble: `You are an interactive CLI agent specializing in software engineering tasks. Your primary goal is to help users safely and efficiently, adhering strictly to the following instructions and utilizing your available tools.`,
+            preamble: `You are ${interactiveMode ? 'an interactive ' : 'a non-interactive '}CLI agent specializing in software engineering tasks. Your primary goal is to help users safely and efficiently, adhering strictly to the following instructions and utilizing your available tools.`,
             coreMandates: `
 # Core Mandates
 
@@ -100,9 +105,12 @@ export function getCoreSystemPrompt(config, userMemory) {
 - **Idiomatic Changes:** When editing, understand the local context (imports, functions/classes) to ensure your changes integrate naturally and idiomatically.
 - **Comments:** Add code comments sparingly. Focus on *why* something is done, especially for complex logic, rather than *what* is done. Only add high-value comments if necessary for clarity or if requested by the user. Do not edit comments that are separate from the code you are changing. *NEVER* talk to the user or describe your changes through comments.
 - **Proactiveness:** Fulfill the user's request thoroughly. When adding features or fixing bugs, this includes adding tests to ensure quality. Consider all created files, especially tests, to be permanent artifacts unless the user says otherwise.
-- **Confirm Ambiguity/Expansion:** Do not take significant actions beyond the clear scope of the request without confirming with the user. If asked *how* to do something, explain first, don't just do it.
+- ${interactiveMode ? `**Confirm Ambiguity/Expansion:** Do not take significant actions beyond the clear scope of the request without confirming with the user. If asked *how* to do something, explain first, don't just do it.` : `**Handle Ambiguity/Expansion:** Do not take significant actions beyond the clear scope of the request.`}
 - **Explaining Changes:** After completing a code modification or file operation *do not* provide summaries unless asked.
-- **Do Not revert changes:** Do not revert changes to the codebase unless asked to do so by the user. Only revert changes made by you if they have resulted in an error or if the user has explicitly asked you to revert the changes.`,
+- **Do Not revert changes:** Do not revert changes to the codebase unless asked to do so by the user. Only revert changes made by you if they have resulted in an error or if the user has explicitly asked you to revert the changes.${mandatesVariant}${!interactiveMode
+                ? `
+  - **Continue the work** You are not to interact with the user. Do your best to complete the task at hand, using your best judgement and avoid asking user for any additional information.`
+                : ''}`,
             primaryWorkflows_prefix: `
 # Primary Workflows
 
@@ -135,14 +143,14 @@ When requested to perform tasks like fixing bugs, adding features, refactoring,
             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. If unsure about these commands, you can ask the user if they'd like you to run them and if so how to.
+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.
 
 ## New Applications
 
 **Goal:** Autonomously implement and deliver a visually appealing, substantially complete, and functional prototype. Utilize all tools at your disposal to implement the application. Some tools you may especially find useful are '${WRITE_FILE_TOOL_NAME}', '${EDIT_TOOL_NAME}' and '${SHELL_TOOL_NAME}'.
 
-1. **Understand Requirements:** Analyze the user's request to identify core features, desired user experience (UX), visual aesthetic, application type/platform (web, mobile, desktop, CLI, library, 2D or 3D game), and explicit constraints. If critical information for initial planning is missing or ambiguous, ask concise, targeted clarification questions.
+1. **Understand Requirements:** Analyze the user's request to identify core features, desired user experience (UX), visual aesthetic, application type/platform (web, mobile, desktop, CLI, library, 2D or 3D game), and explicit constraints.${interactiveMode ? ' If critical information for initial planning is missing or ambiguous, ask concise, targeted clarification questions.' : ''}
 2. **Propose Plan:** Formulate an internal development plan. Present a clear, concise, high-level summary to the user. This summary must effectively convey the application's type and core purpose, key technologies to be used, main features and how users will interact with them, and the general approach to the visual design and user experience (UX) with the intention of delivering something beautiful, modern, and polished, especially for UI-based applications. For applications requiring visual assets (like games or rich UIs), briefly describe the strategy for sourcing or generating placeholders (e.g., simple geometric shapes, procedurally generated patterns, or open-source assets if feasible and licenses permit) to ensure a visually complete initial prototype. Ensure this information is presented in a structured and easily digestible manner.
   - When key technologies aren't specified, prefer the following:
   - **Websites (Frontend):** React (JavaScript/TypeScript) or Angular with Bootstrap CSS, incorporating Material Design principles for UI/UX.
@@ -152,10 +160,18 @@ Mandates').
   - **Mobile App:** Compose Multiplatform (Kotlin Multiplatform) or Flutter (Dart) using Material Design libraries and principles, when sharing code between Android and iOS. Jetpack Compose (Kotlin JVM) with Material Design principles or SwiftUI (Swift) for native apps targeted at either Android or iOS, respectively.
   - **3d Games:** HTML/CSS/JavaScript with Three.js.
   - **2d Games:** HTML/CSS/JavaScript.
-3. **User Approval:** Obtain user approval for the proposed plan.
+${(function () {
+                if (interactiveMode) {
+                    return `3. **User Approval:** Obtain user approval for the proposed plan.
 4. **Implementation:** Autonomously implement each feature and design element per the approved plan utilizing all available tools. When starting ensure you scaffold the application using '${SHELL_TOOL_NAME}' for commands like 'npm init', 'npx create-react-app'. Aim for full scope completion. Proactively create or source necessary placeholder assets (e.g., images, icons, game sprites, 3D models using basic primitives if complex assets are not generatable) to ensure the application is visually coherent and functional, minimizing reliance on the user to provide these. If the model can generate simple assets (e.g., a uniformly colored square sprite, a simple 3D cube), it should do so. Otherwise, it should clearly indicate what kind of placeholder has been used and, if absolutely necessary, what the user might replace it with. Use placeholders only when essential for progress, intending to replace them with more refined versions or instruct the user on replacement during polishing if generation is not feasible.
 5. **Verify:** Review work against the original request, the approved plan. Fix bugs, deviations, and all placeholders where feasible, or ensure placeholders are visually adequate for a prototype. Ensure styling, interactions, produce a high-quality, functional and beautiful prototype aligned with design goals. Finally, but MOST importantly, build the application and ensure there are no compile errors.
-6. **Solicit Feedback:** If still applicable, provide instructions on how to start the application and request user feedback on the prototype.`,
+6. **Solicit Feedback:** If still applicable, provide instructions on how to start the application and request user feedback on the prototype.`;
+                }
+                else {
+                    return `3. **Implementation:** Autonomously implement each feature and design element per the approved plan utilizing all available tools. When starting ensure you scaffold the application using '${SHELL_TOOL_NAME}' for commands like 'npm init', 'npx create-react-app'. Aim for full scope completion. Proactively create or source necessary placeholder assets (e.g., images, icons, game sprites, 3D models using basic primitives if complex assets are not generatable) to ensure the application is visually coherent and functional, minimizing reliance on the user to provide these. If the model can generate simple assets (e.g., a uniformly colored square sprite, a simple 3D cube), it should do so. Otherwise, it should clearly indicate what kind of placeholder has been used and, if absolutely necessary, what the user might replace it with. Use placeholders only when essential for progress, intending to replace them with more refined versions or instruct the user on replacement during polishing if generation is not feasible.
+4. **Verify:** Review work against the original request, the approved plan. Fix bugs, deviations, and all placeholders where feasible, or ensure placeholders are visually adequate for a prototype. Ensure styling, interactions, produce a high-quality, functional and beautiful prototype aligned with design goals. Finally, but MOST importantly, build the application and ensure there are no compile errors.`;
+                }
+            })()}`,
             operationalGuidelines: `
 # Operational Guidelines
 ${(function () {
@@ -179,13 +195,13 @@ IT IS CRITICAL TO FOLLOW THESE GUIDELINES TO AVOID EXCESSIVE TOKEN CONSUMPTION.
 ## Tone and Style (CLI Interaction)
 - **Concise & Direct:** Adopt a professional, direct, and concise tone suitable for a CLI environment.
 - **Minimal Output:** Aim for fewer than 3 lines of text output (excluding tool use/code generation) per response whenever practical. Focus strictly on the user's query.
-- **Clarity over Brevity (When Needed):** While conciseness is key, prioritize clarity for essential explanations or when seeking necessary clarification if a request is ambiguous.
-${(function () {
-                if (useChattySystemPrompt) {
+- **Clarity over Brevity (When Needed):** While conciseness is key, prioritize clarity for essential explanations or when seeking necessary clarification if a request is ambiguous.${(function () {
+                if (isGemini3) {
                     return '';
                 }
                 else {
-                    return '- **No Chitchat:** Avoid conversational filler, preambles ("Okay, I will now..."), or postambles ("I have finished the changes..."). Get straight to the action or answer.';
+                    return `
+- **No Chitchat:** Avoid conversational filler, preambles ("Okay, I will now..."), or postambles ("I have finished the changes..."). Get straight to the action or answer.`;
                 }
             })()}
 - **Formatting:** Use GitHub-flavored Markdown. Responses will be rendered in monospace.
@@ -199,16 +215,17 @@ ${(function () {
 ## Tool Usage
 - **Parallelism:** Execute multiple independent tool calls in parallel when feasible (i.e. searching the codebase).
 - **Command Execution:** Use the '${SHELL_TOOL_NAME}' tool for running shell commands, remembering the safety rule to explain modifying commands first.
-- **Background Processes:** Use background processes (via \`&\`) for commands that are unlikely to stop on their own, e.g. \`node server.js &\`. If unsure, ask the user.
 ${(function () {
-                if (!config.isInteractiveShellEnabled()) {
-                    return `- **Interactive Commands:** Some commands are interactive, meaning they can accept user input during their execution (e.g. ssh, vim). Only execute non-interactive commands. Use non-interactive versions of commands (e.g. \`npm init -y\` instead of \`npm init\`) when available. Interactive shell commands are not supported and may cause hangs until canceled by the user.`;
+                if (interactiveMode) {
+                    return `- **Background Processes:** Use background processes (via \`&\`) for commands that are unlikely to stop on their own, e.g. \`node server.js &\`. If unsure, ask the user.
+- **Interactive Commands:** Prefer non-interactive commands when it makes sense; however, some commands are only interactive and expect user input during their execution (e.g. ssh, vim). If you choose to execute an interactive command consider letting the user know they can press \`ctrl + f\` to focus into the shell to provide input.`;
                 }
                 else {
-                    return `- **Interactive Commands:** Prefer non-interactive commands when it makes sense; however, some commands are only interactive and expect user input during their execution (e.g. ssh, vim). If you choose to execute an interactive command consider letting the user know they can press \`ctrl + f\` to focus into the shell to provide input.`;
+                    return `- **Background Processes:** Use background processes (via \`&\`) for commands that are unlikely to stop on their own, e.g. \`node server.js &\`.
+- **Interactive Commands:** Only execute non-interactive commands.`;
                 }
             })()}
-- **Remembering Facts:** Use the '${MEMORY_TOOL_NAME}' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information. If unsure whether to save something, you can ask the user, "Should I remember that for you?"
+- **Remembering Facts:** Use the '${MEMORY_TOOL_NAME}' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information.${interactiveMode ? ` If unsure whether to save something, you can ask the user, "Should I remember that for you?"` : ''}
 - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward.
 
 ## Interaction Details
@@ -251,8 +268,10 @@ ${(function () {
   - \`git log -n 3\` to review recent commit messages and match their style (verbosity, formatting, signature line, etc.)
 - Combine shell commands whenever possible to save time/steps, e.g. \`git status && git diff HEAD && git log -n 3\`.
 - Always propose a draft commit message. Never just ask the user to give you the full commit message.
-- Prefer commit messages that are clear, concise, and focused more on "why" and less on "what".
-- Keep the user informed and ask for clarification or confirmation where needed.
+- Prefer commit messages that are clear, concise, and focused more on "why" and less on "what".${interactiveMode
+                        ? `
+- Keep the user informed and ask for clarification or confirmation where needed.`
+                        : ''}
 - After each commit, confirm that it was successful by running \`git status\`.
 - If a commit fails, never attempt to work around the issues without being asked to do so.
 - Never push changes to a remote repository without being asked explicitly by the user.

package/dist/src/core/prompts.js.map

@@ -1 +1 @@
-{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/core/prompts.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EACL,cAAc,EACd,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,EACf,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAE/E,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,MAAM,UAAU,kBAAkB,CAAC,MAAe;IAKhD,wFAAwF;IACxF,MAAM,aAAa,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC;IACrC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAC7D,CAAC;IAED,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;IAChD,sDAAsD;IACtD,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACtD,yDAAyD;QACzD,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACxD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;IAC5D,CAAC;IAED,2DAA2D;IAC3D,IAAI,UAAU,GAAG,aAAa,CAAC;IAE/B,sEAAsE;IACtE,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;QACtD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,4CAA4C;YACvE,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;gBACvB,UAAU,GAAG,IAAI,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACN,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iEAAiE;YACjE,WAAW,CAAC,IAAI,CACd,8CAA8C,aAAa,EAAE,EAC7D,KAAK,CACN,CAAC;YACF,sDAAsD;YACtD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,mEAAmE;IACnE,OAAO;QACL,QAAQ,EAAE,KAAK;QACf,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;QAC/B,UAAU,EAAE,KAAK;KAClB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,MAAc,EACd,UAAmB;IAEnB,mEAAmE;IACnE,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,uEAAuE;IACvE,IAAI,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;IACpE,2EAA2E;IAC3E,MAAM,kBAAkB,GAAG,kBAAkB,CAC3C,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAChC,CAAC;IAEF,uEAAuE;IACvE,IAAI,kBAAkB,CAAC,KAAK,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,CAAC;QAC/D,eAAe,GAAG,IAAI,CAAC;QAEvB,kDAAkD;QAClD,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;YACjC,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC;QAC1C,CAAC;QAED,iDAAiD;QACjD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,+BAA+B,YAAY,GAAG,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IAED,uEAAuE;IACvE,MAAM,YAAY,GAAG,iBAAiB,CACpC,MAAM,CAAC,gBAAgB,EAAE,EACzB,MAAM,CAAC,QAAQ,EAAE,EACjB,MAAM,CAAC,kBAAkB,EAAE,CAC5B,CAAC;IACF,MAAM,qBAAqB,GAAG,YAAY,KAAK,oBAAoB,CAAC;IAEpE,MAAM,0BAA0B,GAAG,MAAM;SACtC,eAAe,EAAE;SACjB,eAAe,EAAE;SACjB,QAAQ,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAE5C,MAAM,oBAAoB,GAAG,MAAM;SAChC,eAAe,EAAE;SACjB,eAAe,EAAE;SACjB,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAEjC,IAAI,UAAkB,CAAC;IACvB,IAAI,eAAe,EAAE,CAAC;QACpB,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;SAAM,CAAC;QACN,MAAM,YAAY,GAAG;YACnB,QAAQ,EAAE,6NAA6N;YACvO,YAAY,EAAE;;;;;;;;;;;uOAWmN;YAEjO,uBAAuB,EAAE;;;;;4FAK6D,cAAc,UAAU,cAAc;OAC3H,mBAAmB,sJAAsJ,mBAAmB;4cACyQ;YAEtc,0BAA0B,EAAE;;;;;2OAKyM,yBAAyB,CAAC,IAAI,iOAAiO,cAAc,SAAS,cAAc;4IACnY,yBAAyB,CAAC,IAAI,4CAA4C,yBAAyB,CAAC,IAAI,0XAA0X;YAExmB,+BAA+B,EAAE;;;;;2OAKoM,yBAAyB,CAAC,IAAI,iOAAiO,cAAc,SAAS,cAAc;4IACnY,yBAAyB,CAAC,IAAI,4CAA4C,yBAAyB,CAAC,IAAI,yIAAyI,qBAAqB,uWAAuW;YAEnvB,qBAAqB,EAAE;;;;;4FAK+D,cAAc,UAAU,cAAc,wIAAwI,mBAAmB,sJAAsJ,mBAAmB;2NAC3O,qBAAqB,uWAAuW;YACjlB,uBAAuB,EAAE,qDAAqD,cAAc,OAAO,oBAAoB,MAAM,eAAe;;;;;;;;uOAQqF,oBAAoB,OAAO,cAAc,UAAU,eAAe;;;;;;;;;;;;;8LAa3G,eAAe;;+IAE9D;YAEzI,qBAAqB,EAAE;;EAE3B,CAAC;gBACD,IAAI,MAAM,CAAC,8BAA8B,EAAE,EAAE,CAAC;oBAC5C,OAAO;;;;;yEAK8D,eAAe;;;;;;CAMvF,CAAC;gBACA,CAAC;gBACD,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,EAAE;;;;;;EAMF,CAAC;gBACD,IAAI,qBAAqB,EAAE,CAAC;oBAC1B,OAAO,EAAE,CAAC;gBACZ,CAAC;qBAAM,CAAC;oBACN,OAAO,4KAA4K,CAAC;gBACtL,CAAC;YACH,CAAC,CAAC,EAAE;;;;;;mEAM+D,eAAe;;;;;oCAK9C,eAAe;;EAEjD,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,yBAAyB,EAAE,EAAE,CAAC;oBACxC,OAAO,mXAAmX,CAAC;gBAC7X,CAAC;qBAAM,CAAC;oBACN,OAAO,iVAAiV,CAAC;gBAC3V,CAAC;YACH,CAAC,CAAC,EAAE;oCACgC,gBAAgB;;;;;kFAK8B;YAC5E,OAAO,EAAE;EACb,CAAC;gBACD,0DAA0D;gBAC1D,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,CAAC;gBAChE,MAAM,gBAAgB,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,iDAAiD;gBAEpG,IAAI,aAAa,EAAE,CAAC;oBAClB,OAAO;;;CAGV,CAAC;gBACA,CAAC;qBAAM,IAAI,gBAAgB,EAAE,CAAC;oBAC5B,OAAO;;;CAGV,CAAC;gBACA,CAAC;qBAAM,CAAC;oBACN,OAAO;;;CAGV,CAAC;gBACA,CAAC;YACH,CAAC,CAAC,EAAE,EAAE;YACA,GAAG,EAAE;EACT,CAAC;gBACD,IAAI,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;oBACnC,OAAO;;;;;;;;;;;;;;;CAeV,CAAC;gBACA,CAAC;gBACD,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,EAAE,EAAE;YACA,aAAa,EAAE;;+SAE0R,mBAAmB,+IAA+I;SAC5c,CAAC;QAEF,MAAM,cAAc,GAAqC;YACvD,UAAU;YACV,cAAc;SACf,CAAC;QAEF,IAAI,0BAA0B,IAAI,oBAAoB,EAAE,CAAC;YACvD,cAAc,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QACzD,CAAC;aAAM,IAAI,0BAA0B,EAAE,CAAC;YACtC,cAAc,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QACpD,CAAC;aAAM,IAAI,oBAAoB,EAAE,CAAC;YAChC,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,cAAc,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACjD,CAAC;QACD,cAAc,CAAC,IAAI,CACjB,yBAAyB,EACzB,uBAAuB,EACvB,SAAS,EACT,KAAK,EACL,eAAe,CAChB,CAAC;QAEF,iFAAiF;QACjF,sEAAsE;QACtE,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;YACnD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YACjE,MAAM,WAAW,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACjD,OAAO,WAAW,KAAK,GAAG,IAAI,WAAW,KAAK,OAAO,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzE,CAAC;IAED,uFAAuF;IACvF,MAAM,uBAAuB,GAAG,kBAAkB,CAChD,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CACtC,CAAC;IAEF,yEAAyE;IACzE,wDAAwD;IACxD,IAAI,uBAAuB,CAAC,KAAK,IAAI,CAAC,uBAAuB,CAAC,UAAU,EAAE,CAAC;QACzE,MAAM,SAAS,GAAG,uBAAuB,CAAC,QAAQ;YAChD,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,uBAAuB,CAAC,KAAK,CAAC;QAElC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,EAAE,CAAC,aAAa,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,YAAY,GAChB,UAAU,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;QACxC,CAAC,CAAC,cAAc,UAAU,CAAC,IAAI,EAAE,EAAE;QACnC,CAAC,CAAC,EAAE,CAAC;IAET,OAAO,GAAG,UAAU,GAAG,YAAY,EAAE,CAAC;AACxC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oBAAoB;IAClC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwDR,CAAC,IAAI,EAAE,CAAC;AACT,CAAC"}
+{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/core/prompts.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,EACL,cAAc,EACd,cAAc,EACd,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,eAAe,EACf,oBAAoB,EACpB,qBAAqB,GACtB,MAAM,wBAAwB,CAAC;AAChC,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,yBAAyB,EAAE,MAAM,oCAAoC,CAAC;AAE/E,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE9E,MAAM,UAAU,kBAAkB,CAAC,MAAe;IAKhD,wFAAwF;IACxF,MAAM,aAAa,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC;IACrC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAC7D,CAAC;IAED,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;IAChD,sDAAsD;IACtD,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACtD,yDAAyD;QACzD,MAAM,UAAU,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACxD,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;IAC5D,CAAC;IAED,2DAA2D;IAC3D,IAAI,UAAU,GAAG,aAAa,CAAC;IAE/B,sEAAsE;IACtE,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;QACtD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,4CAA4C;YACvE,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;gBACvB,UAAU,GAAG,IAAI,CAAC;YACpB,CAAC;iBAAM,CAAC;gBACN,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,iEAAiE;YACjE,WAAW,CAAC,IAAI,CACd,8CAA8C,aAAa,EAAE,EAC7D,KAAK,CACN,CAAC;YACF,sDAAsD;YACtD,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;QAC7D,CAAC;IACH,CAAC;IAED,mEAAmE;IACnE,OAAO;QACL,QAAQ,EAAE,KAAK;QACf,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;QAC/B,UAAU,EAAE,KAAK;KAClB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CACjC,MAAc,EACd,UAAmB;IAEnB,mEAAmE;IACnE,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,uEAAuE;IACvE,IAAI,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;IACpE,2EAA2E;IAC3E,MAAM,kBAAkB,GAAG,kBAAkB,CAC3C,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAChC,CAAC;IAEF,uEAAuE;IACvE,IAAI,kBAAkB,CAAC,KAAK,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,CAAC;QAC/D,eAAe,GAAG,IAAI,CAAC;QAEvB,kDAAkD;QAClD,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,CAAC;YACjC,YAAY,GAAG,kBAAkB,CAAC,KAAK,CAAC;QAC1C,CAAC;QAED,iDAAiD;QACjD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CAAC,+BAA+B,YAAY,GAAG,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IAED,uEAAuE;IACvE,MAAM,YAAY,GAAG,iBAAiB,CACpC,MAAM,CAAC,gBAAgB,EAAE,EACzB,MAAM,CAAC,QAAQ,EAAE,EACjB,MAAM,CAAC,kBAAkB,EAAE,CAC5B,CAAC;IAEF,MAAM,SAAS,GAAG,YAAY,KAAK,oBAAoB,CAAC;IAExD,MAAM,eAAe,GAAG,SAAS;QAC/B,CAAC,CAAC;iJAC2I;QAC7I,CAAC,CAAC,EAAE,CAAC;IAEP,MAAM,0BAA0B,GAAG,MAAM;SACtC,eAAe,EAAE;SACjB,eAAe,EAAE;SACjB,QAAQ,CAAC,yBAAyB,CAAC,IAAI,CAAC,CAAC;IAE5C,MAAM,oBAAoB,GAAG,MAAM;SAChC,eAAe,EAAE;SACjB,eAAe,EAAE;SACjB,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAEjC,MAAM,eAAe,GAAG,MAAM,CAAC,yBAAyB,EAAE,CAAC;IAE3D,IAAI,UAAkB,CAAC;IACvB,IAAI,eAAe,EAAE,CAAC;QACpB,UAAU,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;SAAM,CAAC;QACN,MAAM,YAAY,GAAG;YACnB,QAAQ,EAAE,WAAW,eAAe,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,oBAAoB,sMAAsM;YACrR,YAAY,EAAE;;;;;;;;;IAShB,eAAe,CAAC,CAAC,CAAC,2MAA2M,CAAC,CAAC,CAAC,wGAAwG;;wOAEpG,eAAe,GAC/O,CAAC,eAAe;gBACd,CAAC,CAAC;4LACgL;gBAClL,CAAC,CAAC,EACN,EAAE;YACF,uBAAuB,EAAE;;;;;4FAK6D,cAAc,UAAU,cAAc;OAC3H,mBAAmB,sJAAsJ,mBAAmB;4cACyQ;YAEtc,0BAA0B,EAAE;;;;;2OAKyM,yBAAyB,CAAC,IAAI,iOAAiO,cAAc,SAAS,cAAc;4IACnY,yBAAyB,CAAC,IAAI,4CAA4C,yBAAyB,CAAC,IAAI,0XAA0X;YAExmB,+BAA+B,EAAE;;;;;2OAKoM,yBAAyB,CAAC,IAAI,iOAAiO,cAAc,SAAS,cAAc;4IACnY,yBAAyB,CAAC,IAAI,4CAA4C,yBAAyB,CAAC,IAAI,yIAAyI,qBAAqB,uWAAuW;YAEnvB,qBAAqB,EAAE;;;;;4FAK+D,cAAc,UAAU,cAAc,wIAAwI,mBAAmB,sJAAsJ,mBAAmB;2NAC3O,qBAAqB,uWAAuW;YACjlB,uBAAuB,EAAE,qDAAqD,cAAc,OAAO,oBAAoB,MAAM,eAAe;;;yTAGuK,eAAe,CAAC,CAAC,CAAC,wGAAwG,CAAC,CAAC,CAAC,EAAE;;;;;uOAKjN,oBAAoB,OAAO,cAAc,UAAU,eAAe;;gPAEzD,eAAe,CAAC,CAAC,CAAC,uHAAuH,CAAC,CAAC,CAAC,EAAE;;;;;;;;;;EAU5X,CAAC;gBACD,IAAI,eAAe,EAAE,CAAC;oBACpB,OAAO;8LACmL,eAAe;;+IAE9D,CAAC;gBAC9I,CAAC;qBAAM,CAAC;oBACN,OAAO,+LAA+L,eAAe;sZAC6L,CAAC;gBACrZ,CAAC;YACH,CAAC,CAAC,EAAE,EAAE;YACA,qBAAqB,EAAE;;EAE3B,CAAC;gBACD,IAAI,MAAM,CAAC,8BAA8B,EAAE,EAAE,CAAC;oBAC5C,OAAO;;;;;yEAK8D,eAAe;;;;;;CAMvF,CAAC;gBACA,CAAC;gBACD,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,EAAE;;;;;sLAKkL,CAAC;gBAC/K,IAAI,SAAS,EAAE,CAAC;oBACd,OAAO,EAAE,CAAC;gBACZ,CAAC;qBAAM,CAAC;oBACN,OAAO;2KAC0J,CAAC;gBACpK,CAAC;YACH,CAAC,CAAC,EAAE;;;;;;mEAMyD,eAAe;;;;;oCAK9C,eAAe;EACjD,CAAC;gBACD,IAAI,eAAe,EAAE,CAAC;oBACpB,OAAO;gVACqU,CAAC;gBAC/U,CAAC;qBAAM,CAAC;oBACN,OAAO;mEACwD,CAAC;gBAClE,CAAC;YACH,CAAC,CAAC,EAAE;oCACgC,gBAAgB,4cAA4c,eAAe,CAAC,CAAC,CAAC,+FAA+F,CAAC,CAAC,CAAC,EAAE;;;;;kFAKpiB;YAC5E,OAAO,EAAE;EACb,CAAC;gBACD,0DAA0D;gBAC1D,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,cAAc,CAAC;gBAChE,MAAM,gBAAgB,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,iDAAiD;gBAEpG,IAAI,aAAa,EAAE,CAAC;oBAClB,OAAO;;;CAGV,CAAC;gBACA,CAAC;qBAAM,IAAI,gBAAgB,EAAE,CAAC;oBAC5B,OAAO;;;CAGV,CAAC;gBACA,CAAC;qBAAM,CAAC;oBACN,OAAO;;;CAGV,CAAC;gBACA,CAAC;YACH,CAAC,CAAC,EAAE,EAAE;YACA,GAAG,EAAE;EACT,CAAC;gBACD,IAAI,eAAe,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;oBACnC,OAAO;;;;;;;;;;iGAWL,eAAe;wBACb,CAAC,CAAC;iFACuE;wBACzE,CAAC,CAAC,EACN;;;;CAIH,CAAC;gBACA,CAAC;gBACD,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,EAAE,EAAE;YACA,aAAa,EAAE;;+SAE0R,mBAAmB,+IAA+I;SAC5c,CAAC;QAEF,MAAM,cAAc,GAAqC;YACvD,UAAU;YACV,cAAc;SACf,CAAC;QAEF,IAAI,0BAA0B,IAAI,oBAAoB,EAAE,CAAC;YACvD,cAAc,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QACzD,CAAC;aAAM,IAAI,0BAA0B,EAAE,CAAC;YACtC,cAAc,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QACpD,CAAC;aAAM,IAAI,oBAAoB,EAAE,CAAC;YAChC,cAAc,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,cAAc,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QACjD,CAAC;QACD,cAAc,CAAC,IAAI,CACjB,yBAAyB,EACzB,uBAAuB,EACvB,SAAS,EACT,KAAK,EACL,eAAe,CAChB,CAAC;QAEF,iFAAiF;QACjF,sEAAsE;QACtE,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;YACnD,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;YACjE,MAAM,WAAW,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;YACjD,OAAO,WAAW,KAAK,GAAG,IAAI,WAAW,KAAK,OAAO,CAAC;QACxD,CAAC,CAAC,CAAC;QAEH,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzE,CAAC;IAED,uFAAuF;IACvF,MAAM,uBAAuB,GAAG,kBAAkB,CAChD,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC,CACtC,CAAC;IAEF,yEAAyE;IACzE,wDAAwD;IACxD,IAAI,uBAAuB,CAAC,KAAK,IAAI,CAAC,uBAAuB,CAAC,UAAU,EAAE,CAAC;QACzE,MAAM,SAAS,GAAG,uBAAuB,CAAC,QAAQ;YAChD,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,uBAAuB,CAAC,KAAK,CAAC;QAElC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3D,EAAE,CAAC,aAAa,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,YAAY,GAChB,UAAU,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC;QACxC,CAAC,CAAC,cAAc,UAAU,CAAC,IAAI,EAAE,EAAE;QACnC,CAAC,CAAC,EAAE,CAAC;IAET,OAAO,GAAG,UAAU,GAAG,YAAY,EAAE,CAAC;AACxC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,oBAAoB;IAClC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwDR,CAAC,IAAI,EAAE,CAAC;AACT,CAAC"}

package/dist/src/fallback/handler.js

@@ -11,10 +11,19 @@ import { openBrowserSecurely } from '../utils/secure-browser-launcher.js';
 import { debugLogger } from '../utils/debugLogger.js';
 import { getErrorMessage } from '../utils/errors.js';
 import { ModelNotFoundError } from '../utils/httpErrors.js';
-import { TerminalQuotaError } from '../utils/googleQuotaErrors.js';
+import { RetryableQuotaError, TerminalQuotaError, } from '../utils/googleQuotaErrors.js';
+import { buildFallbackPolicyContext, resolvePolicyChain, resolvePolicyAction, } from '../availability/policyHelpers.js';
 const UPGRADE_URL_PAGE = 'https://goo.gle/set-up-gemini-code-assist';
 export async function handleFallback(config, failedModel, authType, error) {
-    // Applicability Checks
+    if (config.isModelAvailabilityServiceEnabled()) {
+        return handlePolicyDrivenFallback(config, failedModel, authType, error);
+    }
+    return legacyHandleFallback(config, failedModel, authType, error);
+}
+/**
+ * Old fallback logic relying on hard coded strings
+ */
+async function legacyHandleFallback(config, failedModel, authType, error) {
     if (authType !== AuthType.LOGIN_WITH_GOOGLE)
         return null;
     // Guardrail: If it's a ModelNotFoundError but NOT the preview model, do not handle it.
@@ -46,34 +55,63 @@ export async function handleFallback(config, failedModel, authType, error) {
         // Pass the specific failed model to the UI handler.
         const intent = await fallbackModelHandler(failedModel, fallbackModel, error);
         // Process Intent and Update State
-        switch (intent) {
-            case 'retry_always':
-                // If the error is non-retryable, e.g. TerminalQuota Error, trigger a regular fallback to flash.
-                // For all other errors, activate previewModel fallback.
-                if (shouldActivatePreviewFallback) {
-                    activatePreviewModelFallbackMode(config);
-                }
-                else {
-                    activateFallbackMode(config, authType);
-                }
-                return true; // Signal retryWithBackoff to continue.
-            case 'retry_once':
-                // Just retry this time, do NOT set sticky fallback mode.
-                return true;
-            case 'stop':
-                activateFallbackMode(config, 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}"`);
-        }
+        return await processIntent(config, intent, failedModel, fallbackModel, authType, error);
     }
     catch (handlerError) {
-        debugLogger.error('Fallback UI handler failed:', handlerError);
+        console.error('Fallback UI handler failed:', handlerError);
+        return null;
+    }
+}
+/**
+ * New fallback logic using the ModelAvailabilityService
+ */
+async function handlePolicyDrivenFallback(config, failedModel, authType, error) {
+    if (authType !== AuthType.LOGIN_WITH_GOOGLE) {
+        return null;
+    }
+    const chain = resolvePolicyChain(config);
+    const { failedPolicy, candidates } = buildFallbackPolicyContext(chain, failedModel);
+    if (!candidates.length) {
+        return null;
+    }
+    const availability = config.getModelAvailabilityService();
+    const selection = availability.selectFirstAvailable(candidates.map((policy) => policy.model));
+    let lastResortPolicy = candidates.find((policy) => policy.isLastResort);
+    if (!lastResortPolicy) {
+        debugLogger.warn('No isLastResort policy found in candidates, using last candidate as fallback.');
+        lastResortPolicy = candidates[candidates.length - 1];
+    }
+    const fallbackModel = selection.selectedModel ?? lastResortPolicy.model;
+    const selectedPolicy = candidates.find((policy) => policy.model === fallbackModel) ??
+        lastResortPolicy;
+    if (!fallbackModel || fallbackModel === failedModel) {
+        return null;
+    }
+    const failureKind = classifyFailureKind(error);
+    const action = resolvePolicyAction(failureKind, selectedPolicy);
+    if (action === 'silent') {
+        return processIntent(config, 'retry_always', failedModel, fallbackModel, authType, error);
+    }
+    // This will be used in the future when FallbackRecommendation is passed through UI
+    const recommendation = {
+        ...selection,
+        selectedModel: fallbackModel,
+        action,
+        failureKind,
+        failedPolicy,
+        selectedPolicy,
+    };
+    void recommendation;
+    const handler = config.getFallbackModelHandler();
+    if (typeof handler !== 'function') {
+        return null;
+    }
+    try {
+        const intent = await handler(failedModel, fallbackModel, error);
+        return await processIntent(config, intent, failedModel, fallbackModel, authType);
+    }
+    catch (handlerError) {
+        debugLogger.error('Fallback handler failed:', handlerError);
         return null;
     }
 }
@@ -85,6 +123,33 @@ async function handleUpgrade() {
         debugLogger.warn('Failed to open browser automatically:', getErrorMessage(error));
     }
 }
+async function processIntent(config, intent, failedModel, fallbackModel, authType, error) {
+    switch (intent) {
+        case 'retry_always':
+            // If the error is non-retryable, e.g. TerminalQuota Error, trigger a regular fallback to flash.
+            // For all other errors, activate previewModel fallback.
+            if (failedModel === PREVIEW_GEMINI_MODEL &&
+                !(error instanceof TerminalQuotaError)) {
+                activatePreviewModelFallbackMode(config);
+            }
+            else {
+                activateFallbackMode(config, authType);
+            }
+            return true;
+        case 'retry_once':
+            return true;
+        case 'stop':
+            activateFallbackMode(config, 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(config, authType) {
     if (!config.isInFallbackMode()) {
         config.setFallbackMode(true);
@@ -100,4 +165,16 @@ function activatePreviewModelFallbackMode(config) {
         // We might want a specific event for Preview Model fallback, but for now we just set the mode.
     }
 }
+function classifyFailureKind(error) {
+    if (error instanceof TerminalQuotaError) {
+        return 'terminal';
+    }
+    if (error instanceof RetryableQuotaError) {
+        return 'transient';
+    }
+    if (error instanceof ModelNotFoundError) {
+        return 'not_found';
+    }
+    return 'unknown';
+}
 //# sourceMappingURL=handler.js.map

package/dist/src/fallback/handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/fallback/handler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../../src/fallback/handler.ts"],"names":[],"mappings":"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"}

package/dist/src/fallback/handler.test.js

@@ -9,6 +9,11 @@ import { AuthType } from '../core/contentGenerator.js';
 import { DEFAULT_GEMINI_FLASH_MODEL, DEFAULT_GEMINI_MODEL, PREVIEW_GEMINI_MODEL, } from '../config/models.js';
 import { logFlashFallback } from '../telemetry/index.js';
 import { ModelNotFoundError } from '../utils/httpErrors.js';
+import { openBrowserSecurely } from '../utils/secure-browser-launcher.js';
+import { coreEvents } from '../utils/events.js';
+import { debugLogger } from '../utils/debugLogger.js';
+import * as policyHelpers from '../availability/policyHelpers.js';
+import { createDefaultPolicy } from '../availability/policyCatalog.js';
 import { RetryableQuotaError, TerminalQuotaError, } from '../utils/googleQuotaErrors.js';
 // Mock the telemetry logger and event class
 vi.mock('../telemetry/index.js', () => ({
@@ -16,19 +21,38 @@ vi.mock('../telemetry/index.js', () => ({
     FlashFallbackEvent: class {
     },
 }));
+vi.mock('../utils/secure-browser-launcher.js', () => ({
+    openBrowserSecurely: vi.fn(),
+}));
 const MOCK_PRO_MODEL = DEFAULT_GEMINI_MODEL;
 const FALLBACK_MODEL = DEFAULT_GEMINI_FLASH_MODEL;
 const AUTH_OAUTH = AuthType.LOGIN_WITH_GOOGLE;
 const AUTH_API_KEY = AuthType.USE_GEMINI;
+function createAvailabilityMock(result) {
+    return {
+        markTerminal: vi.fn(),
+        markHealthy: vi.fn(),
+        markRetryOncePerTurn: vi.fn(),
+        consumeStickyAttempt: vi.fn(),
+        snapshot: vi.fn(),
+        selectFirstAvailable: vi.fn().mockReturnValue(result),
+        resetTurn: vi.fn(),
+    };
+}
 const createMockConfig = (overrides = {}) => ({
     isInFallbackMode: vi.fn(() => false),
     setFallbackMode: vi.fn(),
+    isModelAvailabilityServiceEnabled: vi.fn(() => false),
     isPreviewModelFallbackMode: vi.fn(() => false),
     setPreviewModelFallbackMode: vi.fn(),
     isPreviewModelBypassMode: vi.fn(() => false),
     setPreviewModelBypassMode: vi.fn(),
     fallbackHandler: undefined,
     getFallbackModelHandler: vi.fn(),
+    getModelAvailabilityService: vi.fn(() => createAvailabilityMock({ selectedModel: FALLBACK_MODEL, skipped: [] })),
+    getModel: vi.fn(() => MOCK_PRO_MODEL),
+    getPreviewFeatures: vi.fn(() => false),
+    getUserTier: vi.fn(() => undefined),
     isInteractive: vi.fn(() => false),
     ...overrides,
 });
@@ -36,6 +60,7 @@ describe('handleFallback', () => {
     let mockConfig;
     let mockHandler;
     let consoleErrorSpy;
+    let fallbackEventSpy;
     beforeEach(() => {
         vi.clearAllMocks();
         mockHandler = vi.fn();
@@ -44,9 +69,11 @@ describe('handleFallback', () => {
             fallbackModelHandler: mockHandler,
         });
         consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => { });
+        fallbackEventSpy = vi.spyOn(coreEvents, 'emitFallbackModeChanged');
     });
     afterEach(() => {
         consoleErrorSpy.mockRestore();
+        fallbackEventSpy.mockRestore();
     });
     it('should return null immediately if authType is not OAuth', async () => {
         const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_API_KEY);
@@ -86,6 +113,39 @@ describe('handleFallback', () => {
             expect(logFlashFallback).toHaveBeenCalled();
         });
     });
+    it('should return false without toggling fallback when handler returns "retry_later"', async () => {
+        mockHandler.mockResolvedValue('retry_later');
+        const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
+        expect(result).toBe(false);
+        expect(mockConfig.setFallbackMode).not.toHaveBeenCalled();
+        expect(logFlashFallback).not.toHaveBeenCalled();
+        expect(fallbackEventSpy).not.toHaveBeenCalled();
+    });
+    it('should launch upgrade flow and avoid fallback mode when handler returns "upgrade"', async () => {
+        mockHandler.mockResolvedValue('upgrade');
+        vi.mocked(openBrowserSecurely).mockResolvedValue(undefined);
+        const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
+        expect(result).toBe(false);
+        expect(openBrowserSecurely).toHaveBeenCalledWith('https://goo.gle/set-up-gemini-code-assist');
+        expect(mockConfig.setFallbackMode).not.toHaveBeenCalled();
+        expect(logFlashFallback).not.toHaveBeenCalled();
+        expect(fallbackEventSpy).not.toHaveBeenCalled();
+    });
+    it('should log a warning and continue when upgrade flow fails to open a browser', async () => {
+        mockHandler.mockResolvedValue('upgrade');
+        const debugWarnSpy = vi.spyOn(debugLogger, 'warn');
+        const consoleWarnSpy = vi
+            .spyOn(console, 'warn')
+            .mockImplementation(() => { });
+        vi.mocked(openBrowserSecurely).mockRejectedValue(new Error('blocked'));
+        const result = await handleFallback(mockConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
+        expect(result).toBe(false);
+        expect(debugWarnSpy).toHaveBeenCalledWith('Failed to open browser automatically:', 'blocked');
+        expect(mockConfig.setFallbackMode).not.toHaveBeenCalled();
+        expect(fallbackEventSpy).not.toHaveBeenCalled();
+        debugWarnSpy.mockRestore();
+        consoleWarnSpy.mockRestore();
+    });
     describe('when handler returns an unexpected value', () => {
         it('should log an error and return null', async () => {
             mockHandler.mockResolvedValue(null);
@@ -241,5 +301,90 @@ describe('handleFallback', () => {
         expect(result).toBe(true);
         expect(mockHandler).toHaveBeenCalled();
     });
+    describe('policy-driven flow', () => {
+        let policyConfig;
+        let availability;
+        let policyHandler;
+        beforeEach(() => {
+            vi.clearAllMocks();
+            availability = createAvailabilityMock({
+                selectedModel: 'gemini-1.5-flash',
+                skipped: [],
+            });
+            policyHandler = vi.fn().mockResolvedValue('retry_once');
+            policyConfig = createMockConfig();
+            vi.spyOn(policyConfig, 'isModelAvailabilityServiceEnabled').mockReturnValue(true);
+            vi.spyOn(policyConfig, 'getModelAvailabilityService').mockReturnValue(availability);
+            vi.spyOn(policyConfig, 'getFallbackModelHandler').mockReturnValue(policyHandler);
+        });
+        it('uses availability selection when enabled', async () => {
+            await handleFallback(policyConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
+            expect(availability.selectFirstAvailable).toHaveBeenCalled();
+        });
+        it('falls back to last resort when availability returns null', async () => {
+            availability.selectFirstAvailable = vi
+                .fn()
+                .mockReturnValue({ selectedModel: null, skipped: [] });
+            policyHandler.mockResolvedValue('retry_once');
+            await handleFallback(policyConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
+            expect(policyHandler).toHaveBeenCalledWith(MOCK_PRO_MODEL, DEFAULT_GEMINI_FLASH_MODEL, undefined);
+        });
+        it('executes silent policy action without invoking UI handler', async () => {
+            const proPolicy = createDefaultPolicy(MOCK_PRO_MODEL);
+            const flashPolicy = createDefaultPolicy(DEFAULT_GEMINI_FLASH_MODEL);
+            flashPolicy.actions = {
+                ...flashPolicy.actions,
+                terminal: 'silent',
+                unknown: 'silent',
+            };
+            flashPolicy.isLastResort = true;
+            const silentChain = [proPolicy, flashPolicy];
+            const chainSpy = vi
+                .spyOn(policyHelpers, 'resolvePolicyChain')
+                .mockReturnValue(silentChain);
+            try {
+                availability.selectFirstAvailable = vi.fn().mockReturnValue({
+                    selectedModel: DEFAULT_GEMINI_FLASH_MODEL,
+                    skipped: [],
+                });
+                const result = await handleFallback(policyConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
+                expect(result).toBe(true);
+                expect(policyConfig.getFallbackModelHandler).not.toHaveBeenCalled();
+                expect(policyConfig.setFallbackMode).toHaveBeenCalledWith(true);
+            }
+            finally {
+                chainSpy.mockRestore();
+            }
+        });
+        it('logs and returns null when handler resolves to null', async () => {
+            policyHandler.mockResolvedValue(null);
+            const debugLoggerErrorSpy = vi.spyOn(debugLogger, 'error');
+            const result = await handleFallback(policyConfig, MOCK_PRO_MODEL, AUTH_OAUTH);
+            expect(result).toBeNull();
+            expect(debugLoggerErrorSpy).toHaveBeenCalledWith('Fallback handler failed:', new Error('Unexpected fallback intent received from fallbackModelHandler: "null"'));
+            debugLoggerErrorSpy.mockRestore();
+        });
+        it('successfully follows expected availability response for Preview Chain', async () => {
+            availability.selectFirstAvailable = vi
+                .fn()
+                .mockReturnValue({ selectedModel: DEFAULT_GEMINI_MODEL, skipped: [] });
+            policyHandler.mockResolvedValue('retry_once');
+            vi.spyOn(policyConfig, 'getPreviewFeatures').mockReturnValue(true);
+            vi.spyOn(policyConfig, 'getModel').mockReturnValue(PREVIEW_GEMINI_MODEL);
+            const result = await handleFallback(policyConfig, PREVIEW_GEMINI_MODEL, AUTH_OAUTH);
+            expect(result).toBe(true);
+            expect(availability.selectFirstAvailable).toHaveBeenCalledWith([
+                DEFAULT_GEMINI_MODEL,
+                DEFAULT_GEMINI_FLASH_MODEL,
+            ]);
+            expect(policyHandler).toHaveBeenCalledWith(PREVIEW_GEMINI_MODEL, DEFAULT_GEMINI_MODEL, undefined);
+        });
+        it('short-circuits when the failed model is already the last-resort policy', async () => {
+            const result = await handleFallback(policyConfig, DEFAULT_GEMINI_FLASH_MODEL, AUTH_OAUTH);
+            expect(result).toBeNull();
+            expect(policyConfig.getModelAvailabilityService).not.toHaveBeenCalled();
+            expect(policyConfig.getFallbackModelHandler).not.toHaveBeenCalled();
+        });
+    });
 });
 //# sourceMappingURL=handler.test.js.map