@umsai/ums-code 0.0.14-v2 → 0.3.0-v1

package/dist/src/ui/hooks/useQuotaAndFallback.js

@@ -0,0 +1,122 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { AuthType, isGenericQuotaExceededError, isProQuotaExceededError, UserTierId, } from '@umsai/ums-code-core';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import {} from './useHistoryManager.js';
+import { AuthState, MessageType } from '../types.js';
+import {} from '../contexts/UIStateContext.js';
+export function useQuotaAndFallback({ config, historyManager, userTier, setAuthState, setModelSwitchedFromQuotaError, }) {
+    const [proQuotaRequest, setProQuotaRequest] = useState(null);
+    const isDialogPending = useRef(false);
+    // Set up Flash fallback handler
+    useEffect(() => {
+        const fallbackHandler = async (failedModel, fallbackModel, error) => {
+            if (config.isInFallbackMode()) {
+                return null;
+            }
+            // Fallbacks are currently only handled for OAuth users.
+            const contentGeneratorConfig = config.getContentGeneratorConfig();
+            if (!contentGeneratorConfig ||
+                contentGeneratorConfig.authType !== AuthType.LOGIN_WITH_GOOGLE) {
+                return null;
+            }
+            // Use actual user tier if available; otherwise, default to FREE tier behavior (safe default)
+            const isPaidTier = userTier === UserTierId.LEGACY || userTier === UserTierId.STANDARD;
+            let message;
+            if (error && isProQuotaExceededError(error)) {
+                // Pro Quota specific messages (Interactive)
+                if (isPaidTier) {
+                    message = `⚡ You have reached your daily ${failedModel} quota limit.
+⚡ You can choose to authenticate with a paid API key or continue with the fallback model.
+⚡ To continue accessing the ${failedModel} model today, consider using /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
+                }
+                else {
+                    message = `⚡ You have reached your daily ${failedModel} quota limit.
+⚡ You can choose to authenticate with a paid API key or continue with the fallback model.
+⚡ To increase your limits, upgrade to a Gemini Code Assist Standard or Enterprise plan with higher limits at https://goo.gle/set-up-gemini-code-assist
+⚡ Or you can utilize a Gemini API Key. See: https://goo.gle/gemini-cli-docs-auth#gemini-api-key
+⚡ You can switch authentication methods by typing /auth`;
+                }
+            }
+            else if (error && isGenericQuotaExceededError(error)) {
+                // Generic Quota (Automatic fallback)
+                const actionMessage = `⚡ You have reached your daily quota limit.\n⚡ Automatically switching from ${failedModel} to ${fallbackModel} for the remainder of this session.`;
+                if (isPaidTier) {
+                    message = `${actionMessage}
+⚡ To continue accessing the ${failedModel} model today, consider using /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
+                }
+                else {
+                    message = `${actionMessage}
+⚡ To increase your limits, upgrade to a Gemini Code Assist Standard or Enterprise plan with higher limits at https://goo.gle/set-up-gemini-code-assist
+⚡ Or you can utilize a Gemini API Key. See: https://goo.gle/gemini-cli-docs-auth#gemini-api-key
+⚡ You can switch authentication methods by typing /auth`;
+                }
+            }
+            else {
+                // Consecutive 429s or other errors (Automatic fallback)
+                const actionMessage = `⚡ Automatically switching from ${failedModel} to ${fallbackModel} for faster responses for the remainder of this session.`;
+                if (isPaidTier) {
+                    message = `${actionMessage}
+⚡ Possible reasons for this are that you have received multiple consecutive capacity errors or you have reached your daily ${failedModel} quota limit
+⚡ To continue accessing the ${failedModel} model today, consider using /auth to switch to using a paid API key from AI Studio at https://aistudio.google.com/apikey`;
+                }
+                else {
+                    message = `${actionMessage}
+⚡ Possible reasons for this are that you have received multiple consecutive capacity errors or you have reached your daily ${failedModel} quota limit
+⚡ To increase your limits, upgrade to a Gemini Code Assist Standard or Enterprise plan with higher limits at https://goo.gle/set-up-gemini-code-assist
+⚡ Or you can utilize a Gemini API Key. See: https://goo.gle/gemini-cli-docs-auth#gemini-api-key
+⚡ You can switch authentication methods by typing /auth`;
+                }
+            }
+            // Add message to UI history
+            historyManager.addItem({
+                type: MessageType.INFO,
+                text: message,
+            }, Date.now());
+            setModelSwitchedFromQuotaError(true);
+            config.setQuotaErrorOccurred(true);
+            // Interactive Fallback for Pro quota
+            if (error && isProQuotaExceededError(error)) {
+                if (isDialogPending.current) {
+                    return 'stop'; // A dialog is already active, so just stop this request.
+                }
+                isDialogPending.current = true;
+                const intent = await new Promise((resolve) => {
+                    setProQuotaRequest({
+                        failedModel,
+                        fallbackModel,
+                        resolve,
+                    });
+                });
+                return intent;
+            }
+            return 'stop';
+        };
+        config.setFallbackModelHandler(fallbackHandler);
+    }, [config, historyManager, userTier, setModelSwitchedFromQuotaError]);
+    const handleProQuotaChoice = useCallback((choice) => {
+        if (!proQuotaRequest)
+            return;
+        const intent = choice === 'auth' ? 'auth' : 'retry';
+        proQuotaRequest.resolve(intent);
+        setProQuotaRequest(null);
+        isDialogPending.current = false; // Reset the flag here
+        if (choice === 'auth') {
+            setAuthState(AuthState.Updating);
+        }
+        else {
+            historyManager.addItem({
+                type: MessageType.INFO,
+                text: 'Switched to fallback model. Tip: Press Ctrl+P (or Up Arrow) to recall your previous prompt and submit it again if you wish.',
+            }, Date.now());
+        }
+    }, [proQuotaRequest, setAuthState, historyManager]);
+    return {
+        proQuotaRequest,
+        handleProQuotaChoice,
+    };
+}
+//# sourceMappingURL=useQuotaAndFallback.js.map

package/dist/src/ui/hooks/useQuotaAndFallback.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useQuotaAndFallback.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useQuotaAndFallback.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,QAAQ,EAIR,2BAA2B,EAC3B,uBAAuB,EACvB,UAAU,GACX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EAAgC,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAA8B,MAAM,+BAA+B,CAAC;AAU3E,MAAM,UAAU,mBAAmB,CAAC,EAClC,MAAM,EACN,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,8BAA8B,GACN;IACxB,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GACzC,QAAQ,CAA+B,IAAI,CAAC,CAAC;IAC/C,MAAM,eAAe,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;IAEtC,gCAAgC;IAChC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,eAAe,GAAyB,KAAK,EACjD,WAAW,EACX,aAAa,EACb,KAAK,EAC2B,EAAE;YAClC,IAAI,MAAM,CAAC,gBAAgB,EAAE,EAAE,CAAC;gBAC9B,OAAO,IAAI,CAAC;YACd,CAAC;YAED,wDAAwD;YACxD,MAAM,sBAAsB,GAAG,MAAM,CAAC,yBAAyB,EAAE,CAAC;YAClE,IACE,CAAC,sBAAsB;gBACvB,sBAAsB,CAAC,QAAQ,KAAK,QAAQ,CAAC,iBAAiB,EAC9D,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,6FAA6F;YAC7F,MAAM,UAAU,GACd,QAAQ,KAAK,UAAU,CAAC,MAAM,IAAI,QAAQ,KAAK,UAAU,CAAC,QAAQ,CAAC;YAErE,IAAI,OAAe,CAAC;YAEpB,IAAI,KAAK,IAAI,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5C,4CAA4C;gBAC5C,IAAI,UAAU,EAAE,CAAC;oBACf,OAAO,GAAG,iCAAiC,WAAW;;8BAElC,WAAW,2HAA2H,CAAC;gBAC7J,CAAC;qBAAM,CAAC;oBACN,OAAO,GAAG,iCAAiC,WAAW;;;;wDAIR,CAAC;gBACjD,CAAC;YACH,CAAC;iBAAM,IAAI,KAAK,IAAI,2BAA2B,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvD,qCAAqC;gBACrC,MAAM,aAAa,GAAG,8EAA8E,WAAW,OAAO,aAAa,qCAAqC,CAAC;gBAEzK,IAAI,UAAU,EAAE,CAAC;oBACf,OAAO,GAAG,GAAG,aAAa;8BACN,WAAW,2HAA2H,CAAC;gBAC7J,CAAC;qBAAM,CAAC;oBACN,OAAO,GAAG,GAAG,aAAa;;;wDAGoB,CAAC;gBACjD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,wDAAwD;gBACxD,MAAM,aAAa,GAAG,kCAAkC,WAAW,OAAO,aAAa,0DAA0D,CAAC;gBAElJ,IAAI,UAAU,EAAE,CAAC;oBACf,OAAO,GAAG,GAAG,aAAa;6HACyF,WAAW;8BAC1G,WAAW,2HAA2H,CAAC;gBAC7J,CAAC;qBAAM,CAAC;oBACN,OAAO,GAAG,GAAG,aAAa;6HACyF,WAAW;;;wDAGhF,CAAC;gBACjD,CAAC;YACH,CAAC;YAED,4BAA4B;YAC5B,cAAc,CAAC,OAAO,CACpB;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,OAAO;aACd,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;YAEF,8BAA8B,CAAC,IAAI,CAAC,CAAC;YACrC,MAAM,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAEnC,qCAAqC;YACrC,IAAI,KAAK,IAAI,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC;gBAC5C,IAAI,eAAe,CAAC,OAAO,EAAE,CAAC;oBAC5B,OAAO,MAAM,CAAC,CAAC,yDAAyD;gBAC1E,CAAC;gBACD,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC;gBAE/B,MAAM,MAAM,GAAmB,MAAM,IAAI,OAAO,CAC9C,CAAC,OAAO,EAAE,EAAE;oBACV,kBAAkB,CAAC;wBACjB,WAAW;wBACX,aAAa;wBACb,OAAO;qBACR,CAAC,CAAC;gBACL,CAAC,CACF,CAAC;gBAEF,OAAO,MAAM,CAAC;YAChB,CAAC;YAED,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC;QAEF,MAAM,CAAC,uBAAuB,CAAC,eAAe,CAAC,CAAC;IAClD,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,8BAA8B,CAAC,CAAC,CAAC;IAEvE,MAAM,oBAAoB,GAAG,WAAW,CACtC,CAAC,MAA2B,EAAE,EAAE;QAC9B,IAAI,CAAC,eAAe;YAAE,OAAO;QAE7B,MAAM,MAAM,GAAmB,MAAM,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QACpE,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAChC,kBAAkB,CAAC,IAAI,CAAC,CAAC;QACzB,eAAe,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,sBAAsB;QAEvD,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;YACtB,YAAY,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,cAAc,CAAC,OAAO,CACpB;gBACE,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,IAAI,EAAE,6HAA6H;aACpI,EACD,IAAI,CAAC,GAAG,EAAE,CACX,CAAC;QACJ,CAAC;IACH,CAAC,EACD,CAAC,eAAe,EAAE,YAAY,EAAE,cAAc,CAAC,CAChD,CAAC;IAEF,OAAO;QACL,eAAe;QACf,oBAAoB;KACrB,CAAC;AACJ,CAAC"}

package/dist/src/ui/hooks/useQuotaAndFallback.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/ui/hooks/useQuotaAndFallback.test.js

@@ -0,0 +1,269 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { vi, describe, it, expect, beforeEach, afterEach, } from 'vitest';
+import { act, renderHook } from '@testing-library/react';
+import { UserTierId, AuthType, isGenericQuotaExceededError, isProQuotaExceededError, makeFakeConfig, } from '@umsai/ums-code-core';
+import { useQuotaAndFallback } from './useQuotaAndFallback.js';
+import { AuthState, MessageType } from '../types.js';
+// Mock the error checking functions from the core package to control test scenarios
+vi.mock('@umsai/ums-code-core', async (importOriginal) => {
+    const original = await importOriginal();
+    return {
+        ...original,
+        isGenericQuotaExceededError: vi.fn(),
+        isProQuotaExceededError: vi.fn(),
+    };
+});
+describe('useQuotaAndFallback', () => {
+    let mockConfig;
+    let mockHistoryManager;
+    let mockSetAuthState;
+    let mockSetModelSwitchedFromQuotaError;
+    let setFallbackHandlerSpy;
+    const mockedIsGenericQuotaExceededError = isGenericQuotaExceededError;
+    const mockedIsProQuotaExceededError = isProQuotaExceededError;
+    beforeEach(() => {
+        mockConfig = makeFakeConfig();
+        // Spy on the method that requires the private field and mock its return.
+        // This is cleaner than modifying the config class for tests.
+        vi.spyOn(mockConfig, 'getContentGeneratorConfig').mockReturnValue({
+            model: 'test-model',
+            authType: AuthType.LOGIN_WITH_GOOGLE,
+        });
+        mockHistoryManager = {
+            addItem: vi.fn(),
+            history: [],
+            updateItem: vi.fn(),
+            clearItems: vi.fn(),
+            loadHistory: vi.fn(),
+        };
+        mockSetAuthState = vi.fn();
+        mockSetModelSwitchedFromQuotaError = vi.fn();
+        setFallbackHandlerSpy = vi.spyOn(mockConfig, 'setFallbackModelHandler');
+        vi.spyOn(mockConfig, 'setQuotaErrorOccurred');
+        mockedIsGenericQuotaExceededError.mockReturnValue(false);
+        mockedIsProQuotaExceededError.mockReturnValue(false);
+    });
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+    it('should register a fallback handler on initialization', () => {
+        renderHook(() => useQuotaAndFallback({
+            config: mockConfig,
+            historyManager: mockHistoryManager,
+            userTier: UserTierId.FREE,
+            setAuthState: mockSetAuthState,
+            setModelSwitchedFromQuotaError: mockSetModelSwitchedFromQuotaError,
+        }));
+        expect(setFallbackHandlerSpy).toHaveBeenCalledTimes(1);
+        expect(setFallbackHandlerSpy.mock.calls[0][0]).toBeInstanceOf(Function);
+    });
+    describe('Fallback Handler Logic', () => {
+        // Helper function to render the hook and extract the registered handler
+        const getRegisteredHandler = (userTier = UserTierId.FREE) => {
+            renderHook((props) => useQuotaAndFallback({
+                config: mockConfig,
+                historyManager: mockHistoryManager,
+                userTier: props.userTier,
+                setAuthState: mockSetAuthState,
+                setModelSwitchedFromQuotaError: mockSetModelSwitchedFromQuotaError,
+            }), { initialProps: { userTier } });
+            return setFallbackHandlerSpy.mock.calls[0][0];
+        };
+        it('should return null and take no action if already in fallback mode', async () => {
+            vi.spyOn(mockConfig, 'isInFallbackMode').mockReturnValue(true);
+            const handler = getRegisteredHandler();
+            const result = await handler('gemini-pro', 'gemini-flash', new Error());
+            expect(result).toBeNull();
+            expect(mockHistoryManager.addItem).not.toHaveBeenCalled();
+        });
+        it('should return null and take no action if authType is not LOGIN_WITH_GOOGLE', async () => {
+            // Override the default mock from beforeEach for this specific test
+            vi.spyOn(mockConfig, 'getContentGeneratorConfig').mockReturnValue({
+                model: 'test-model',
+                authType: AuthType.USE_GEMINI,
+            });
+            const handler = getRegisteredHandler();
+            const result = await handler('gemini-pro', 'gemini-flash', new Error());
+            expect(result).toBeNull();
+            expect(mockHistoryManager.addItem).not.toHaveBeenCalled();
+        });
+        describe('Automatic Fallback Scenarios', () => {
+            const testCases = [
+                {
+                    errorType: 'generic',
+                    tier: UserTierId.FREE,
+                    expectedMessageSnippets: [
+                        'Automatically switching from model-A to model-B',
+                        'upgrade to a Gemini Code Assist Standard or Enterprise plan',
+                    ],
+                },
+                {
+                    errorType: 'generic',
+                    tier: UserTierId.STANDARD, // Paid tier
+                    expectedMessageSnippets: [
+                        'Automatically switching from model-A to model-B',
+                        'switch to using a paid API key from AI Studio',
+                    ],
+                },
+                {
+                    errorType: 'other',
+                    tier: UserTierId.FREE,
+                    expectedMessageSnippets: [
+                        'Automatically switching from model-A to model-B for faster responses',
+                        'upgrade to a Gemini Code Assist Standard or Enterprise plan',
+                    ],
+                },
+                {
+                    errorType: 'other',
+                    tier: UserTierId.LEGACY, // Paid tier
+                    expectedMessageSnippets: [
+                        'Automatically switching from model-A to model-B for faster responses',
+                        'switch to using a paid API key from AI Studio',
+                    ],
+                },
+            ];
+            for (const { errorType, tier, expectedMessageSnippets } of testCases) {
+                it(`should handle ${errorType} error for ${tier} tier correctly`, async () => {
+                    mockedIsGenericQuotaExceededError.mockReturnValue(errorType === 'generic');
+                    const handler = getRegisteredHandler(tier);
+                    const result = await handler('model-A', 'model-B', new Error('quota exceeded'));
+                    // Automatic fallbacks should return 'stop'
+                    expect(result).toBe('stop');
+                    expect(mockHistoryManager.addItem).toHaveBeenCalledWith(expect.objectContaining({ type: MessageType.INFO }), expect.any(Number));
+                    const message = mockHistoryManager.addItem.mock.calls[0][0]
+                        .text;
+                    for (const snippet of expectedMessageSnippets) {
+                        expect(message).toContain(snippet);
+                    }
+                    expect(mockSetModelSwitchedFromQuotaError).toHaveBeenCalledWith(true);
+                    expect(mockConfig.setQuotaErrorOccurred).toHaveBeenCalledWith(true);
+                });
+            }
+        });
+        describe('Interactive Fallback (Pro Quota Error)', () => {
+            beforeEach(() => {
+                mockedIsProQuotaExceededError.mockReturnValue(true);
+            });
+            it('should set an interactive request and wait for user choice', async () => {
+                const { result } = renderHook(() => useQuotaAndFallback({
+                    config: mockConfig,
+                    historyManager: mockHistoryManager,
+                    userTier: UserTierId.FREE,
+                    setAuthState: mockSetAuthState,
+                    setModelSwitchedFromQuotaError: mockSetModelSwitchedFromQuotaError,
+                }));
+                const handler = setFallbackHandlerSpy.mock
+                    .calls[0][0];
+                // Call the handler but do not await it, to check the intermediate state
+                const promise = handler('gemini-pro', 'gemini-flash', new Error('pro quota'));
+                await act(async () => { });
+                // The hook should now have a pending request for the UI to handle
+                expect(result.current.proQuotaRequest).not.toBeNull();
+                expect(result.current.proQuotaRequest?.failedModel).toBe('gemini-pro');
+                // Simulate the user choosing to continue with the fallback model
+                act(() => {
+                    result.current.handleProQuotaChoice('continue');
+                });
+                // The original promise from the handler should now resolve
+                const intent = await promise;
+                expect(intent).toBe('retry');
+                // The pending request should be cleared from the state
+                expect(result.current.proQuotaRequest).toBeNull();
+            });
+            it('should handle race conditions by stopping subsequent requests', async () => {
+                const { result } = renderHook(() => useQuotaAndFallback({
+                    config: mockConfig,
+                    historyManager: mockHistoryManager,
+                    userTier: UserTierId.FREE,
+                    setAuthState: mockSetAuthState,
+                    setModelSwitchedFromQuotaError: mockSetModelSwitchedFromQuotaError,
+                }));
+                const handler = setFallbackHandlerSpy.mock
+                    .calls[0][0];
+                const promise1 = handler('gemini-pro', 'gemini-flash', new Error('pro quota 1'));
+                await act(async () => { });
+                const firstRequest = result.current.proQuotaRequest;
+                expect(firstRequest).not.toBeNull();
+                const result2 = await handler('gemini-pro', 'gemini-flash', new Error('pro quota 2'));
+                // The lock should have stopped the second request
+                expect(result2).toBe('stop');
+                expect(result.current.proQuotaRequest).toBe(firstRequest);
+                act(() => {
+                    result.current.handleProQuotaChoice('continue');
+                });
+                const intent1 = await promise1;
+                expect(intent1).toBe('retry');
+                expect(result.current.proQuotaRequest).toBeNull();
+            });
+        });
+    });
+    describe('handleProQuotaChoice', () => {
+        beforeEach(() => {
+            mockedIsProQuotaExceededError.mockReturnValue(true);
+        });
+        it('should do nothing if there is no pending pro quota request', () => {
+            const { result } = renderHook(() => useQuotaAndFallback({
+                config: mockConfig,
+                historyManager: mockHistoryManager,
+                userTier: UserTierId.FREE,
+                setAuthState: mockSetAuthState,
+                setModelSwitchedFromQuotaError: mockSetModelSwitchedFromQuotaError,
+            }));
+            act(() => {
+                result.current.handleProQuotaChoice('auth');
+            });
+            expect(mockSetAuthState).not.toHaveBeenCalled();
+            expect(mockHistoryManager.addItem).not.toHaveBeenCalled();
+        });
+        it('should resolve intent to "auth" and trigger auth state update', async () => {
+            const { result } = renderHook(() => useQuotaAndFallback({
+                config: mockConfig,
+                historyManager: mockHistoryManager,
+                userTier: UserTierId.FREE,
+                setAuthState: mockSetAuthState,
+                setModelSwitchedFromQuotaError: mockSetModelSwitchedFromQuotaError,
+            }));
+            const handler = setFallbackHandlerSpy.mock
+                .calls[0][0];
+            const promise = handler('gemini-pro', 'gemini-flash', new Error('pro quota'));
+            await act(async () => { }); // Allow state to update
+            act(() => {
+                result.current.handleProQuotaChoice('auth');
+            });
+            const intent = await promise;
+            expect(intent).toBe('auth');
+            expect(mockSetAuthState).toHaveBeenCalledWith(AuthState.Updating);
+            expect(result.current.proQuotaRequest).toBeNull();
+        });
+        it('should resolve intent to "retry" and add info message on continue', async () => {
+            const { result } = renderHook(() => useQuotaAndFallback({
+                config: mockConfig,
+                historyManager: mockHistoryManager,
+                userTier: UserTierId.FREE,
+                setAuthState: mockSetAuthState,
+                setModelSwitchedFromQuotaError: mockSetModelSwitchedFromQuotaError,
+            }));
+            const handler = setFallbackHandlerSpy.mock
+                .calls[0][0];
+            // The first `addItem` call is for the initial quota error message
+            const promise = handler('gemini-pro', 'gemini-flash', new Error('pro quota'));
+            await act(async () => { }); // Allow state to update
+            act(() => {
+                result.current.handleProQuotaChoice('continue');
+            });
+            const intent = await promise;
+            expect(intent).toBe('retry');
+            expect(result.current.proQuotaRequest).toBeNull();
+            // Check for the second "Switched to fallback model" message
+            expect(mockHistoryManager.addItem).toHaveBeenCalledTimes(2);
+            const lastCall = mockHistoryManager.addItem.mock.calls[1][0];
+            expect(lastCall.type).toBe(MessageType.INFO);
+            expect(lastCall.text).toContain('Switched to fallback model.');
+        });
+    });
+});
+//# sourceMappingURL=useQuotaAndFallback.test.js.map

package/dist/src/ui/hooks/useQuotaAndFallback.test.js.map

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

package/dist/src/ui/hooks/useQwenAuth.d.ts

@@ -3,18 +3,13 @@
  * Copyright 2025 Qwen
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { LoadedSettings } from '../../config/settings.js';
-export interface DeviceAuthorizationInfo {
-    verification_uri: string;
-    verification_uri_complete: string;
-    user_code: string;
-    expires_in: number;
+import { AuthType, type DeviceAuthorizationData } from '@umsai/ums-code-core';
+export interface QwenAuthState {
+    deviceAuth: DeviceAuthorizationData | null;
+    authStatus: 'idle' | 'polling' | 'success' | 'error' | 'timeout' | 'rate_limit';
+    authMessage: string | null;
 }
-export declare const useQwenAuth: (settings: LoadedSettings, isAuthenticating: boolean) => {
-    isQwenAuth: boolean;
+export declare const useQwenAuth: (pendingAuthType: AuthType | undefined, isAuthenticating: boolean) => {
+    qwenAuthState: QwenAuthState;
     cancelQwenAuth: () => void;
-    isQwenAuthenticating: boolean;
-    deviceAuth: DeviceAuthorizationInfo | null;
-    authStatus: "idle" | "polling" | "success" | "error" | "timeout" | "rate_limit";
-    authMessage: string | null;
 };

package/dist/src/ui/hooks/useQwenAuth.js

@@ -5,20 +5,18 @@
  */
 import { useState, useCallback, useEffect } from 'react';
 import { AuthType, qwenOAuth2Events, QwenOAuth2Event, } from '@umsai/ums-code-core';
-export const useQwenAuth = (settings, isAuthenticating) => {
+export const useQwenAuth = (pendingAuthType, isAuthenticating) => {
     const [qwenAuthState, setQwenAuthState] = useState({
-        isQwenAuthenticating: false,
         deviceAuth: null,
         authStatus: 'idle',
         authMessage: null,
     });
-    const isQwenAuth = settings.merged.security?.auth?.selectedType === AuthType.QWEN_OAUTH;
+    const isQwenAuth = pendingAuthType === AuthType.QWEN_OAUTH;
     // Set up event listeners when authentication starts
     useEffect(() => {
         if (!isQwenAuth || !isAuthenticating) {
             // Reset state when not authenticating or not Qwen auth
             setQwenAuthState({
-                isQwenAuthenticating: false,
                 deviceAuth: null,
                 authStatus: 'idle',
                 authMessage: null,
@@ -27,7 +25,6 @@ export const useQwenAuth = (settings, isAuthenticating) => {
         }
         setQwenAuthState((prev) => ({
             ...prev,
-            isQwenAuthenticating: true,
             authStatus: 'idle',
         }));
         // Set up event listeners
@@ -39,6 +36,7 @@ export const useQwenAuth = (settings, isAuthenticating) => {
                     verification_uri_complete: deviceAuth.verification_uri_complete,
                     user_code: deviceAuth.user_code,
                     expires_in: deviceAuth.expires_in,
+                    device_code: deviceAuth.device_code,
                 },
                 authStatus: 'polling',
             }));
@@ -63,15 +61,13 @@ export const useQwenAuth = (settings, isAuthenticating) => {
         // Emit cancel event to stop polling
         qwenOAuth2Events.emit(QwenOAuth2Event.AuthCancel);
         setQwenAuthState({
-            isQwenAuthenticating: false,
             deviceAuth: null,
             authStatus: 'idle',
             authMessage: null,
         });
     }, []);
     return {
-        ...qwenAuthState,
-        isQwenAuth,
+        qwenAuthState,
         cancelQwenAuth,
     };
 };

package/dist/src/ui/hooks/useQwenAuth.js.map

@@ -1 +1 @@
-{"version":3,"file":"useQwenAuth.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useQwenAuth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEzD,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,eAAe,GAChB,MAAM,sBAAsB,CAAC;AAsB9B,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,QAAwB,EACxB,gBAAyB,EACzB,EAAE;IACF,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAgB;QAChE,oBAAoB,EAAE,KAAK;QAC3B,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,MAAM;QAClB,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC;IAEH,MAAM,UAAU,GACd,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,QAAQ,CAAC,UAAU,CAAC;IAEvE,oDAAoD;IACpD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,UAAU,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACrC,uDAAuD;YACvD,gBAAgB,CAAC;gBACf,oBAAoB,EAAE,KAAK;gBAC3B,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,MAAM;gBAClB,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,gBAAgB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC1B,GAAG,IAAI;YACP,oBAAoB,EAAE,IAAI;YAC1B,UAAU,EAAE,MAAM;SACnB,CAAC,CAAC,CAAC;QAEJ,yBAAyB;QACzB,MAAM,gBAAgB,GAAG,CAAC,UAAmC,EAAE,EAAE;YAC/D,gBAAgB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC1B,GAAG,IAAI;gBACP,UAAU,EAAE;oBACV,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;oBAC7C,yBAAyB,EAAE,UAAU,CAAC,yBAAyB;oBAC/D,SAAS,EAAE,UAAU,CAAC,SAAS;oBAC/B,UAAU,EAAE,UAAU,CAAC,UAAU;iBAClC;gBACD,UAAU,EAAE,SAAS;aACtB,CAAC,CAAC,CAAC;QACN,CAAC,CAAC;QAEF,MAAM,kBAAkB,GAAG,CACzB,MAAkE,EAClE,OAAgB,EAChB,EAAE;YACF,gBAAgB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC1B,GAAG,IAAI;gBACP,UAAU,EAAE,MAAM;gBAClB,WAAW,EAAE,OAAO,IAAI,IAAI;aAC7B,CAAC,CAAC,CAAC;QACN,CAAC,CAAC;QAEF,sBAAsB;QACtB,gBAAgB,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAC/D,gBAAgB,CAAC,EAAE,CAAC,eAAe,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;QAEtE,mEAAmE;QACnE,OAAO,GAAG,EAAE;YACV,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAChE,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;QACzE,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAEnC,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;QACtC,oCAAoC;QACpC,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAElD,gBAAgB,CAAC;YACf,oBAAoB,EAAE,KAAK;YAC3B,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,GAAG,aAAa;QAChB,UAAU;QACV,cAAc;KACf,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"useQwenAuth.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useQwenAuth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzD,OAAO,EACL,QAAQ,EACR,gBAAgB,EAChB,eAAe,GAEhB,MAAM,sBAAsB,CAAC;AAc9B,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,eAAqC,EACrC,gBAAyB,EACzB,EAAE;IACF,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,QAAQ,CAAgB;QAChE,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,MAAM;QAClB,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,eAAe,KAAK,QAAQ,CAAC,UAAU,CAAC;IAE3D,oDAAoD;IACpD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,UAAU,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACrC,uDAAuD;YACvD,gBAAgB,CAAC;gBACf,UAAU,EAAE,IAAI;gBAChB,UAAU,EAAE,MAAM;gBAClB,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,gBAAgB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC1B,GAAG,IAAI;YACP,UAAU,EAAE,MAAM;SACnB,CAAC,CAAC,CAAC;QAEJ,yBAAyB;QACzB,MAAM,gBAAgB,GAAG,CAAC,UAAmC,EAAE,EAAE;YAC/D,gBAAgB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC1B,GAAG,IAAI;gBACP,UAAU,EAAE;oBACV,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;oBAC7C,yBAAyB,EAAE,UAAU,CAAC,yBAAyB;oBAC/D,SAAS,EAAE,UAAU,CAAC,SAAS;oBAC/B,UAAU,EAAE,UAAU,CAAC,UAAU;oBACjC,WAAW,EAAE,UAAU,CAAC,WAAW;iBACpC;gBACD,UAAU,EAAE,SAAS;aACtB,CAAC,CAAC,CAAC;QACN,CAAC,CAAC;QAEF,MAAM,kBAAkB,GAAG,CACzB,MAAkE,EAClE,OAAgB,EAChB,EAAE;YACF,gBAAgB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC1B,GAAG,IAAI;gBACP,UAAU,EAAE,MAAM;gBAClB,WAAW,EAAE,OAAO,IAAI,IAAI;aAC7B,CAAC,CAAC,CAAC;QACN,CAAC,CAAC;QAEF,sBAAsB;QACtB,gBAAgB,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;QAC/D,gBAAgB,CAAC,EAAE,CAAC,eAAe,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;QAEtE,mEAAmE;QACnE,OAAO,GAAG,EAAE;YACV,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,EAAE,gBAAgB,CAAC,CAAC;YAChE,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC;QACzE,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC,CAAC;IAEnC,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;QACtC,oCAAoC;QACpC,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAElD,gBAAgB,CAAC;YACf,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,MAAM;YAClB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,aAAa;QACb,cAAc;KACf,CAAC;AACJ,CAAC,CAAC"}