@machina.ai/cell-cli-core 1.41.1-rc2 → 1.45.1-rc1

package/dist/src/availability/autoRoutingFallback.integration.test.js

@@ -0,0 +1,288 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
+import { BaseLlmClient } from '../core/baseLlmClient.js';
+import { FakeContentGenerator } from '../core/fakeContentGenerator.js';
+import { Config } from '../config/config.js';
+import { RetryableQuotaError } from '../utils/googleQuotaErrors.js';
+import { PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_FLASH_MODEL, PREVIEW_GEMINI_MODEL_AUTO, } from '../config/models.js';
+import fs from 'node:fs';
+import { AuthType } from '../core/contentGenerator.js';
+import { LlmRole } from '../telemetry/types.js';
+vi.mock('node:fs');
+describe('Auto Routing Fallback Integration', () => {
+    let config;
+    let fakeGenerator;
+    let client;
+    beforeEach(() => {
+        vi.useFakeTimers();
+        vi.spyOn(Config.prototype, 'getHasAccessToPreviewModel').mockReturnValue(true);
+        // Mock fs to avoid real file system access
+        vi.mocked(fs.existsSync).mockReturnValue(true);
+        vi.mocked(fs.statSync).mockReturnValue({
+            isDirectory: () => true,
+        });
+        // Provide a valid dummy sandbox policy for any readFileSync calls for TOML files
+        vi.mocked(fs.readFileSync).mockImplementation((path) => {
+            if (typeof path === 'string' && path.endsWith('.toml')) {
+                return `
+          [modes.plan]
+          network = false
+          readonly = true
+          approvedTools = []
+
+          [modes.default]
+          network = false
+          readonly = false
+          approvedTools = []
+
+          [modes.accepting_edits]
+          network = false
+          readonly = false
+          approvedTools = []
+        `;
+            }
+            return ''; // Fallback for other files
+        });
+        fakeGenerator = new FakeContentGenerator([]);
+    });
+    afterEach(() => {
+        vi.useRealTimers();
+        vi.restoreAllMocks();
+    });
+    it('should fallback to Flash after 3 tries and try 10 times for Flash in auto mode', async () => {
+        // Instantiate real Config in auto mode
+        config = new Config({
+            sessionId: 'test-session',
+            targetDir: '/test',
+            debugMode: false,
+            cwd: '/test',
+            model: PREVIEW_GEMINI_MODEL_AUTO, // Trigger auto mode
+        });
+        // Force interactive mode to enable fallback handler in BaseLlmClient
+        vi.spyOn(config, 'isInteractive').mockReturnValue(true);
+        client = new BaseLlmClient(fakeGenerator, config, AuthType.LOGIN_WITH_GOOGLE);
+        let attemptsPro = 0;
+        let attemptsFlash = 0;
+        const mockGoogleApiError = {
+            code: 429,
+            message: 'Quota exceeded',
+            details: [],
+        };
+        // Spy on generateContent to simulate failures
+        vi.spyOn(fakeGenerator, 'generateContent').mockImplementation(async (params) => {
+            if (params.model === PREVIEW_GEMINI_MODEL) {
+                attemptsPro++;
+                throw new RetryableQuotaError('Quota exceeded for Pro', mockGoogleApiError, 0);
+            }
+            else if (params.model === PREVIEW_GEMINI_FLASH_MODEL) {
+                attemptsFlash++;
+                throw new RetryableQuotaError('Quota exceeded for Flash', mockGoogleApiError, 0);
+            }
+            throw new Error(`Unexpected model: ${params.model}`);
+        });
+        // Set a fallback handler that approves the switch (simulating user or auto approval)
+        config.setFallbackModelHandler(async (failed, _fallback, _error) => {
+            if (failed === PREVIEW_GEMINI_FLASH_MODEL) {
+                return 'stop'; // Stop retrying after Flash fails
+            }
+            return 'retry_always'; // Trigger fallback to Flash
+        });
+        // Call generateContent
+        const promise = client.generateContent({
+            modelConfigKey: { model: PREVIEW_GEMINI_MODEL, isChatModel: true },
+            contents: [{ role: 'user', parts: [{ text: 'hi' }] }],
+            abortSignal: new AbortController().signal,
+            promptId: 'test-prompt',
+            role: LlmRole.UTILITY_TOOL,
+        });
+        await Promise.all([
+            expect(promise).rejects.toThrow('Quota exceeded for Flash'),
+            vi.runAllTimersAsync(),
+        ]);
+        // Verify attempts
+        expect(attemptsPro).toBe(3);
+        expect(attemptsFlash).toBe(10);
+    });
+    it('should try 10 times and prompt user in non-auto mode', async () => {
+        // Instantiate real Config in non-auto mode
+        const configNonAuto = new Config({
+            sessionId: 'test-session',
+            targetDir: '/test',
+            debugMode: false,
+            cwd: '/test',
+            model: PREVIEW_GEMINI_MODEL, // Non-auto mode
+        });
+        // Force interactive mode to enable fallback handler in BaseLlmClient
+        vi.spyOn(configNonAuto, 'isInteractive').mockReturnValue(true);
+        const clientNonAuto = new BaseLlmClient(fakeGenerator, configNonAuto, AuthType.LOGIN_WITH_GOOGLE);
+        let attemptsPro = 0;
+        const mockGoogleApiError = {
+            code: 429,
+            message: 'Quota exceeded',
+            details: [],
+        };
+        // Spy on generateContent to simulate failures
+        vi.spyOn(fakeGenerator, 'generateContent').mockImplementation(async (params) => {
+            if (params.model === PREVIEW_GEMINI_MODEL) {
+                attemptsPro++;
+                throw new RetryableQuotaError('Quota exceeded for Pro', mockGoogleApiError, 0);
+            }
+            throw new Error(`Unexpected model: ${params.model}`);
+        });
+        // Set a fallback handler that returns 'stop' (simulating user stopping or failing to handle)
+        const handler = vi.fn(async (_failed, _fallback, _error) => 'stop');
+        configNonAuto.setFallbackModelHandler(handler);
+        const promise = clientNonAuto.generateContent({
+            modelConfigKey: { model: PREVIEW_GEMINI_MODEL, isChatModel: true },
+            contents: [{ role: 'user', parts: [{ text: 'hi' }] }],
+            abortSignal: new AbortController().signal,
+            promptId: 'test-prompt',
+            role: LlmRole.UTILITY_TOOL,
+            maxAttempts: 10,
+        });
+        await Promise.all([
+            expect(promise).rejects.toThrow('Quota exceeded for Pro'),
+            vi.runAllTimersAsync(),
+        ]);
+        // Verify attempts (should default to 10)
+        expect(attemptsPro).toBe(10);
+        // Verify handler was called once after 10 attempts to prompt user
+        expect(handler).toHaveBeenCalledTimes(1);
+        expect(handler).toHaveBeenCalledWith(PREVIEW_GEMINI_MODEL, PREVIEW_GEMINI_FLASH_MODEL, expect.any(RetryableQuotaError));
+    });
+    it('should fallback to Flash after 3 tries in experimental dynamic mode', async () => {
+        // Instantiate real Config in auto mode
+        const configDynamic = new Config({
+            sessionId: 'test-session',
+            targetDir: '/test',
+            debugMode: false,
+            cwd: '/test',
+            model: PREVIEW_GEMINI_MODEL_AUTO, // Trigger auto mode
+        });
+        // Force interactive mode to enable fallback handler in BaseLlmClient
+        vi.spyOn(configDynamic, 'isInteractive').mockReturnValue(true);
+        // Enable experimental dynamic model configuration
+        vi.spyOn(configDynamic, 'getExperimentalDynamicModelConfiguration').mockReturnValue(true);
+        const clientDynamic = new BaseLlmClient(fakeGenerator, configDynamic, AuthType.LOGIN_WITH_GOOGLE);
+        let attemptsPro = 0;
+        let attemptsFlash = 0;
+        const mockGoogleApiError = {
+            code: 429,
+            message: 'Quota exceeded',
+            details: [],
+        };
+        // Spy on generateContent to simulate failures
+        vi.spyOn(fakeGenerator, 'generateContent').mockImplementation(async (params) => {
+            if (params.model === PREVIEW_GEMINI_MODEL) {
+                attemptsPro++;
+                throw new RetryableQuotaError('Quota exceeded for Pro', mockGoogleApiError, 0);
+            }
+            else if (params.model === PREVIEW_GEMINI_FLASH_MODEL) {
+                attemptsFlash++;
+                throw new RetryableQuotaError('Quota exceeded for Flash', mockGoogleApiError, 0);
+            }
+            throw new Error(`Unexpected model: ${params.model}`);
+        });
+        // Set a fallback handler that approves the switch
+        configDynamic.setFallbackModelHandler(async (failed, _fallback, _error) => {
+            if (failed === PREVIEW_GEMINI_FLASH_MODEL) {
+                return 'stop';
+            }
+            return 'retry_always';
+        });
+        const promise = clientDynamic.generateContent({
+            modelConfigKey: { model: PREVIEW_GEMINI_MODEL, isChatModel: true },
+            contents: [{ role: 'user', parts: [{ text: 'hi' }] }],
+            abortSignal: new AbortController().signal,
+            promptId: 'test-prompt',
+            role: LlmRole.UTILITY_TOOL,
+        });
+        await Promise.all([
+            expect(promise).rejects.toThrow('Quota exceeded for Flash'),
+            vi.runAllTimersAsync(),
+        ]);
+        // Verify attempts
+        expect(attemptsPro).toBe(3);
+        expect(attemptsFlash).toBe(10);
+    });
+    it('should retry Pro on next turn after successful fallback to Flash', async () => {
+        // Instantiate real Config in auto mode
+        config = new Config({
+            sessionId: 'test-session',
+            targetDir: '/test',
+            debugMode: false,
+            cwd: '/test',
+            model: PREVIEW_GEMINI_MODEL_AUTO, // Trigger auto mode
+        });
+        // Force interactive mode to enable fallback handler in BaseLlmClient
+        vi.spyOn(config, 'isInteractive').mockReturnValue(true);
+        client = new BaseLlmClient(fakeGenerator, config, AuthType.LOGIN_WITH_GOOGLE);
+        let attemptsPro = 0;
+        let attemptsFlash = 0;
+        const mockGoogleApiError = {
+            code: 429,
+            message: 'Quota exceeded',
+            details: [],
+        };
+        // Turn 1: Pro fails, Flash succeeds
+        vi.spyOn(fakeGenerator, 'generateContent').mockImplementation(async (params) => {
+            if (params.model === PREVIEW_GEMINI_MODEL) {
+                attemptsPro++;
+                throw new RetryableQuotaError('Quota exceeded for Pro', mockGoogleApiError, 0);
+            }
+            else if (params.model === PREVIEW_GEMINI_FLASH_MODEL) {
+                attemptsFlash++;
+                return {
+                    candidates: [
+                        {
+                            content: { role: 'model', parts: [{ text: 'Flash success' }] },
+                        },
+                    ],
+                };
+            }
+            throw new Error(`Unexpected model: ${params.model}`);
+        });
+        config.setFallbackModelHandler(async (_failed, _fallback, _error) => 'retry_always');
+        // Call generateContent for Turn 1
+        const promise1 = client.generateContent({
+            modelConfigKey: { model: PREVIEW_GEMINI_MODEL, isChatModel: true },
+            contents: [{ role: 'user', parts: [{ text: 'hi' }] }],
+            abortSignal: new AbortController().signal,
+            promptId: 'test-prompt-1',
+            role: LlmRole.UTILITY_TOOL,
+        });
+        await vi.runAllTimersAsync();
+        const result1 = await promise1;
+        expect(result1.candidates?.[0]?.content?.parts?.[0]?.text).toBe('Flash success');
+        expect(attemptsPro).toBe(3);
+        expect(attemptsFlash).toBe(1);
+        // Simulate start of next turn
+        config.getModelAvailabilityService().resetTurn();
+        // Turn 2: Pro should be attempted again!
+        // Let's make it succeed this time to verify it works!
+        vi.spyOn(fakeGenerator, 'generateContent').mockImplementation(async (params) => {
+            if (params.model === PREVIEW_GEMINI_MODEL) {
+                return {
+                    candidates: [
+                        { content: { role: 'model', parts: [{ text: 'Pro success' }] } },
+                    ],
+                };
+            }
+            throw new Error(`Unexpected model: ${params.model}`);
+        });
+        const promise2 = client.generateContent({
+            modelConfigKey: { model: PREVIEW_GEMINI_MODEL, isChatModel: true }, // Request Pro again
+            contents: [{ role: 'user', parts: [{ text: 'hello again' }] }],
+            abortSignal: new AbortController().signal,
+            promptId: 'test-prompt-2',
+            role: LlmRole.UTILITY_TOOL,
+        });
+        const result2 = await promise2;
+        expect(result2.candidates?.[0]?.content?.parts?.[0]?.text).toBe('Pro success');
+    });
+});
+//# sourceMappingURL=autoRoutingFallback.integration.test.js.map

package/dist/src/availability/autoRoutingFallback.integration.test.js.map

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

package/dist/src/availability/fallbackIntegration.test.js

@@ -20,6 +20,7 @@ describe('Fallback Integration', () => {
             getActiveModel: () => PREVIEW_GEMINI_MODEL_AUTO,
             setActiveModel: vi.fn(),
             getUserTier: () => undefined,
+            getHasAccessToPreviewModel: () => true,
             getModelAvailabilityService: () => availabilityService,
             modelConfigService: undefined,
         };
@@ -56,5 +57,33 @@ describe('Fallback Integration', () => {
         // 5. Expect it to fallback to Flash (because Gemini 3 uses PREVIEW_CHAIN)
         expect(result.model).toBe(PREVIEW_GEMINI_FLASH_MODEL);
     });
+    it('should fallback to Flash after failures and restore Pro on next turn', () => {
+        const requestedModel = PREVIEW_GEMINI_MODEL;
+        // 1. Initial call should return Pro with 3 attempts
+        const result1 = applyModelSelection(config, {
+            model: requestedModel,
+            isChatModel: true,
+        });
+        expect(result1.model).toBe(PREVIEW_GEMINI_MODEL);
+        expect(result1.maxAttempts).toBe(3);
+        // 2. Simulate failure and transition to sticky_retry with consumed=true
+        availabilityService.markRetryOncePerTurn(PREVIEW_GEMINI_MODEL, 3);
+        availabilityService.consumeStickyAttempt(PREVIEW_GEMINI_MODEL);
+        // 3. Next call in same turn should fallback to Flash
+        const result2 = applyModelSelection(config, {
+            model: requestedModel,
+            isChatModel: true,
+        });
+        expect(result2.model).toBe(PREVIEW_GEMINI_FLASH_MODEL);
+        // 4. Reset turn (start of new interaction)
+        availabilityService.resetTurn();
+        // 5. Next call should restore Pro with 3 attempts
+        const result3 = applyModelSelection(config, {
+            model: requestedModel,
+            isChatModel: true,
+        });
+        expect(result3.model).toBe(PREVIEW_GEMINI_MODEL);
+        expect(result3.maxAttempts).toBe(3);
+    });
 });
 //# sourceMappingURL=fallbackIntegration.test.js.map

package/dist/src/availability/fallbackIntegration.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"fallbackIntegration.test.js","sourceRoot":"","sources":["../../../src/availability/fallbackIntegration.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,yBAAyB,GAC1B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AAEzE,QAAQ,CAAC,sBAAsB,EAAE,GAAG,EAAE;IACpC,IAAI,MAAc,CAAC;IACnB,IAAI,mBAA6C,CAAC;IAClD,IAAI,kBAAsC,CAAC;IAE3C,UAAU,CAAC,GAAG,EAAE;QACd,kDAAkD;QAClD,MAAM,GAAG;YACP,QAAQ,EAAE,GAAG,EAAE,CAAC,yBAAyB;YACzC,cAAc,EAAE,GAAG,EAAE,CAAC,yBAAyB;YAC/C,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE;YACvB,WAAW,EAAE,GAAG,EAAE,CAAC,SAAS;YAC5B,2BAA2B,EAAE,GAAG,EAAE,CAAC,mBAAmB;YACtD,kBAAkB,EAAE,SAA0C;SAC1C,CAAC;QAEvB,mBAAmB,GAAG,IAAI,wBAAwB,EAAE,CAAC;QACrD,kBAAkB,GAAG,IAAI,kBAAkB,CAAC,qBAAqB,CAAC,CAAC;QACnE,8DAA8D;QAC7D,MAAc,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wFAAwF,EAAE,GAAG,EAAE;QAChG,wDAAwD;QACxD,uGAAuG;QACvG,mBAAmB,CAAC,YAAY,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;QAEhE,+CAA+C;QAC/C,MAAM,cAAc,GAAG,oBAAoB,CAAC;QAE5C,2BAA2B;QAC3B,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,EAAE;YACzC,KAAK,EAAE,cAAc;YACrB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QAEH,8BAA8B;QAC9B,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;QAEtD,uCAAuC;QACvC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,oBAAoB,CAChD,0BAA0B,CAC3B,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE;QAChF,+CAA+C;QAC/C,EAAE,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC;QAEnE,4BAA4B;QAC5B,mBAAmB,CAAC,YAAY,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;QAEhE,mBAAmB;QACnB,MAAM,cAAc,GAAG,oBAAoB,CAAC;QAE5C,2BAA2B;QAC3B,MAAM,MAAM,GAAG,mBAAmB,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;QAEtE,0EAA0E;QAC1E,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"fallbackIntegration.test.js","sourceRoot":"","sources":["../../../src/availability/fallbackIntegration.test.ts"],"names":[],"mappings":"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"}

package/dist/src/availability/modelAvailabilityService.d.ts

@@ -22,12 +22,12 @@ export interface ModelSelectionResult {
 }
 export declare class ModelAvailabilityService {
     private readonly health;
-    markTerminal(model: ModelId, reason: TerminalUnavailabilityReason): void;
-    markHealthy(model: ModelId): void;
-    markRetryOncePerTurn(model: ModelId): void;
-    consumeStickyAttempt(model: ModelId): void;
-    snapshot(model: ModelId): ModelAvailabilitySnapshot;
-    selectFirstAvailable(models: ModelId[]): ModelSelectionResult;
+    markTerminal(modelId: ModelId, reason: TerminalUnavailabilityReason): void;
+    markHealthy(modelId: ModelId): void;
+    markRetryOncePerTurn(modelId: ModelId, attempts?: number): void;
+    consumeStickyAttempt(modelId: ModelId): void;
+    snapshot(modelId: ModelId): ModelAvailabilitySnapshot;
+    selectFirstAvailable(modelIds: ModelId[]): ModelSelectionResult;
     resetTurn(): void;
     reset(): void;
     private setState;

package/dist/src/availability/modelAvailabilityService.js

@@ -3,18 +3,22 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import { normalizeModelId } from '../utils/modelUtils.js';
 export class ModelAvailabilityService {
     health = new Map();
-    markTerminal(model, reason) {
+    markTerminal(modelId, reason) {
+        const model = normalizeModelId(modelId);
         this.setState(model, {
             status: 'terminal',
             reason,
         });
     }
-    markHealthy(model) {
+    markHealthy(modelId) {
+        const model = normalizeModelId(modelId);
         this.clearState(model);
     }
-    markRetryOncePerTurn(model) {
+    markRetryOncePerTurn(modelId, attempts = 1) {
+        const model = normalizeModelId(modelId);
         const currentState = this.health.get(model);
         // Do not override a terminal failure with a transient one.
         if (currentState?.status === 'terminal') {
@@ -30,15 +34,18 @@ export class ModelAvailabilityService {
             status: 'sticky_retry',
             reason: 'retry_once_per_turn',
             consumed,
+            attempts,
         });
     }
-    consumeStickyAttempt(model) {
+    consumeStickyAttempt(modelId) {
+        const model = normalizeModelId(modelId);
         const state = this.health.get(model);
         if (state?.status === 'sticky_retry') {
             this.setState(model, { ...state, consumed: true });
         }
     }
-    snapshot(model) {
+    snapshot(modelId) {
+        const model = normalizeModelId(modelId);
         const state = this.health.get(model);
         if (!state) {
             return { available: true };
@@ -51,14 +58,15 @@ export class ModelAvailabilityService {
         }
         return { available: true };
     }
-    selectFirstAvailable(models) {
+    selectFirstAvailable(modelIds) {
         const skipped = [];
-        for (const model of models) {
+        for (const modelId of modelIds) {
+            const model = normalizeModelId(modelId);
             const snapshot = this.snapshot(model);
             if (snapshot.available) {
                 const state = this.health.get(model);
                 // A sticky model is being attempted, so note that.
-                const attempts = state?.status === 'sticky_retry' ? 1 : undefined;
+                const attempts = state?.status === 'sticky_retry' ? state.attempts : undefined;
                 return { selectedModel: model, skipped, attempts };
             }
             else {

package/dist/src/availability/modelAvailabilityService.js.map

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

package/dist/src/availability/modelAvailabilityService.test.js

@@ -26,6 +26,11 @@ describe('ModelAvailabilityService', () => {
         service.resetTurn();
         expect(service.snapshot(model)).toEqual({ available: true });
     });
+    it('tracks retry with custom attempts', () => {
+        service.markRetryOncePerTurn(model, 3);
+        const selection = service.selectFirstAvailable([model]);
+        expect(selection.attempts).toBe(3);
+    });
     it('tracks terminal failures', () => {
         service.markTerminal(model, 'quota');
         expect(service.snapshot(model)).toEqual({
@@ -136,5 +141,39 @@ describe('ModelAvailabilityService', () => {
             reason: 'quota',
         });
     });
+    describe('prefix normalization', () => {
+        it('treats prefixed and non-prefixed models as identical when marking terminal', () => {
+            service.markTerminal('models/gemini-3.1-pro-preview', 'quota');
+            // Checking the non-prefixed version should show it as unavailable
+            expect(service.snapshot('gemini-3.1-pro-preview')).toEqual({
+                available: false,
+                reason: 'quota',
+            });
+            // Checking the prefixed version should also show it as unavailable
+            expect(service.snapshot('models/gemini-3.1-pro-preview')).toEqual({
+                available: false,
+                reason: 'quota',
+            });
+        });
+        it('treats prefixed and non-prefixed models as identical when selecting', () => {
+            service.markTerminal('gemini-3-flash-preview', 'quota');
+            // Attempting to select the prefixed version should skip it because the base is exhausted
+            const result = service.selectFirstAvailable([
+                'models/gemini-3-flash-preview',
+                'gemini-3.1-pro-preview',
+            ]);
+            expect(result.selectedModel).toBe('gemini-3.1-pro-preview');
+            expect(result.skipped).toEqual([
+                { model: 'gemini-3-flash-preview', reason: 'quota' },
+            ]);
+        });
+        it('treats prefixed and non-prefixed models as identical when marking healthy', () => {
+            service.markTerminal('gemini-3-flash-preview', 'quota');
+            service.markHealthy('models/gemini-3-flash-preview');
+            expect(service.snapshot('gemini-3-flash-preview')).toEqual({
+                available: true,
+            });
+        });
+    });
 });
 //# sourceMappingURL=modelAvailabilityService.test.js.map

package/dist/src/availability/modelAvailabilityService.test.js.map

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

package/dist/src/availability/modelPolicy.d.ts

@@ -34,6 +34,7 @@ export interface ModelPolicy {
     actions: ModelPolicyActionMap;
     stateTransitions: ModelPolicyStateMap;
     isLastResort?: boolean;
+    maxAttempts?: number;
 }
 /**
  * A chain of model policies defining the priority and fallback behavior.

package/dist/src/availability/policyCatalog.d.ts

@@ -7,10 +7,12 @@ import type { ModelPolicy, ModelPolicyActionMap, ModelPolicyChain } from './mode
 import type { UserTierId } from '../code_assist/types.js';
 export interface ModelPolicyOptions {
     previewEnabled: boolean;
+    isAutoSelection?: boolean;
     userTier?: UserTierId;
     useGemini31?: boolean;
     useGemini31FlashLite?: boolean;
     useCustomToolModel?: boolean;
+    useGemini3_5Flash?: boolean;
 }
 export declare const SILENT_ACTIONS: ModelPolicyActionMap;
 /**

package/dist/src/availability/policyCatalog.js

@@ -18,14 +18,18 @@ export const SILENT_ACTIONS = {
 };
 const DEFAULT_STATE = {
     terminal: 'terminal',
-    transient: 'sticky_retry',
+    transient: 'terminal',
     not_found: 'terminal',
     unknown: 'terminal',
 };
-const DEFAULT_CHAIN = [
-    definePolicy({ model: DEFAULT_GEMINI_MODEL }),
-    definePolicy({ model: DEFAULT_GEMINI_FLASH_MODEL, isLastResort: true }),
-];
+const AUTO_ROUTING_OVERRIDES = {
+    maxAttempts: 3,
+    actions: { ...DEFAULT_ACTIONS, transient: 'silent' },
+    stateTransitions: {
+        ...DEFAULT_STATE,
+        transient: 'sticky_retry',
+    },
+};
 const FLASH_LITE_CHAIN = [
     definePolicy({
         model: DEFAULT_GEMINI_FLASH_LITE_MODEL,
@@ -45,14 +49,38 @@ const FLASH_LITE_CHAIN = [
  * Returns the default ordered model policy chain for the user.
  */
 export function getModelPolicyChain(options) {
+    const isAuto = options.isAutoSelection ?? false;
     if (options.previewEnabled) {
-        const previewModel = resolveModel(PREVIEW_GEMINI_MODEL, options.useGemini31, options.useGemini31FlashLite, options.useCustomToolModel);
+        const proModel = resolveModel(PREVIEW_GEMINI_MODEL, options.useGemini31, options.useCustomToolModel, true, undefined, options.useGemini3_5Flash);
         return [
-            definePolicy({ model: previewModel }),
-            definePolicy({ model: PREVIEW_GEMINI_FLASH_MODEL, isLastResort: true }),
+            definePolicy({
+                model: proModel,
+                ...(isAuto
+                    ? {
+                        maxAttempts: 3,
+                        actions: { ...DEFAULT_ACTIONS, transient: 'silent' },
+                        stateTransitions: { ...DEFAULT_STATE, transient: 'sticky_retry' },
+                    }
+                    : {}),
+            }),
+            definePolicy({
+                model: PREVIEW_GEMINI_FLASH_MODEL,
+                isLastResort: true,
+                maxAttempts: 10,
+            }),
         ];
     }
-    return cloneChain(DEFAULT_CHAIN);
+    return [
+        definePolicy({
+            model: DEFAULT_GEMINI_MODEL,
+            ...(isAuto ? AUTO_ROUTING_OVERRIDES : {}),
+        }),
+        definePolicy({
+            model: DEFAULT_GEMINI_FLASH_MODEL,
+            isLastResort: true,
+            maxAttempts: 10,
+        }),
+    ];
 }
 export function createSingleModelChain(model) {
     return [definePolicy({ model, isLastResort: true })];
@@ -86,6 +114,7 @@ function definePolicy(config) {
     return {
         model: config.model,
         isLastResort: config.isLastResort,
+        maxAttempts: config.maxAttempts,
         actions: { ...DEFAULT_ACTIONS, ...(config.actions ?? {}) },
         stateTransitions: {
             ...DEFAULT_STATE,