@google/gemini-cli 0.30.0-preview.5 → 0.31.0-preview.0

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

@@ -22,24 +22,25 @@ describe('useLoadingIndicator', () => {
         act(() => vi.runOnlyPendingTimers);
         vi.restoreAllMocks();
     });
-    const renderLoadingIndicatorHook = (initialStreamingState, initialShouldShowFocusHint = false, initialRetryStatus = null) => {
+    const renderLoadingIndicatorHook = (initialStreamingState, initialShouldShowFocusHint = false, initialRetryStatus = null, loadingPhrasesMode = 'all') => {
         let hookResult;
-        function TestComponent({ streamingState, shouldShowFocusHint, retryStatus, }) {
+        function TestComponent({ streamingState, shouldShowFocusHint, retryStatus, mode, }) {
             hookResult = useLoadingIndicator({
                 streamingState,
                 shouldShowFocusHint: !!shouldShowFocusHint,
                 retryStatus: retryStatus || null,
+                loadingPhrasesMode: mode,
             });
             return null;
         }
-        const { rerender } = render(_jsx(TestComponent, { streamingState: initialStreamingState, shouldShowFocusHint: initialShouldShowFocusHint, retryStatus: initialRetryStatus }));
+        const { rerender } = render(_jsx(TestComponent, { streamingState: initialStreamingState, shouldShowFocusHint: initialShouldShowFocusHint, retryStatus: initialRetryStatus, mode: loadingPhrasesMode }));
         return {
             result: {
                 get current() {
                     return hookResult;
                 },
             },
-            rerender: (newProps) => rerender(_jsx(TestComponent, { ...newProps })),
+            rerender: (newProps) => rerender(_jsx(TestComponent, { mode: loadingPhrasesMode, ...newProps })),
         };
     };
     it('should initialize with default values when Idle', () => {
@@ -141,5 +142,9 @@ describe('useLoadingIndicator', () => {
         expect(result.current.currentLoadingPhrase).toContain('Trying to reach');
         expect(result.current.currentLoadingPhrase).toContain('Attempt 3/3');
     });
+    it('should show no phrases when loadingPhrasesMode is "off"', () => {
+        const { result } = renderLoadingIndicatorHook(StreamingState.Responding, false, null, 'off');
+        expect(result.current.currentLoadingPhrase).toBeUndefined();
+    });
 });
 //# sourceMappingURL=useLoadingIndicator.test.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"useLoadingIndicator.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useLoadingIndicator.test.tsx"],"names":[],"mappings":";AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EACL,yBAAyB,EACzB,gCAAgC,GACjC,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAGxD,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;IACrB,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC,sCAAsC;QAC1D,mEAAmE;QACnE,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC;QACnC,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,MAAM,0BAA0B,GAAG,CACjC,qBAAqC,EACrC,6BAAsC,KAAK,EAC3C,qBAAiD,IAAI,EACrD,EAAE;QACF,IAAI,UAAkD,CAAC;QACvD,SAAS,aAAa,CAAC,EACrB,cAAc,EACd,mBAAmB,EACnB,WAAW,GAKZ;YACC,UAAU,GAAG,mBAAmB,CAAC;gBAC/B,cAAc;gBACd,mBAAmB,EAAE,CAAC,CAAC,mBAAmB;gBAC1C,WAAW,EAAE,WAAW,IAAI,IAAI;aACjC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,CACzB,KAAC,aAAa,IACZ,cAAc,EAAE,qBAAqB,EACrC,mBAAmB,EAAE,0BAA0B,EAC/C,WAAW,EAAE,kBAAkB,GAC/B,CACH,CAAC;QACF,OAAO;YACL,MAAM,EAAE;gBACN,IAAI,OAAO;oBACT,OAAO,UAAU,CAAC;gBACpB,CAAC;aACF;YACD,QAAQ,EAAE,CAAC,QAIV,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAC,aAAa,OAAK,QAAQ,GAAI,CAAC;SAChD,CAAC;IACJ,CAAC,CAAC;IAEF,EAAE,CAAC,iDAAiD,EAAE,GAAG,EAAE;QACzD,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe;QACvE,MAAM,EAAE,MAAM,EAAE,GAAG,0BAA0B,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACnE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,aAAa,EAAE,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+EAA+E,EAAE,KAAK,IAAI,EAAE;QAC7F,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe;QACvE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,0BAA0B,CACrD,cAAc,CAAC,UAAU,EACzB,KAAK,CACN,CAAC;QAEF,0CAA0C;QAC1C,MAAM,CAAC,CAAC,GAAG,qBAAqB,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC,SAAS,CAC/D,MAAM,CAAC,OAAO,CAAC,oBAAoB,CACpC,CAAC;QAEF,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,QAAQ,CAAC;gBACP,cAAc,EAAE,cAAc,CAAC,UAAU;gBACzC,mBAAmB,EAAE,IAAI;aAC1B,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAC9C,gCAAgC,CACjC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,sCAAsC;QAC9F,MAAM,EAAE,MAAM,EAAE,GAAG,0BAA0B,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAEzE,uFAAuF;QACvF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3C,8FAA8F;QAE9F,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,MAAM,EAAE,CAAC,wBAAwB,CAAC,yBAAyB,GAAG,CAAC,CAAC,CAAC;QACnE,CAAC,CAAC,CAAC;QAEH,8HAA8H;QAC9H,MAAM,CAAC,qBAAqB,CAAC,CAAC,SAAS,CACrC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CACpC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+EAA+E,EAAE,KAAK,IAAI,EAAE;QAC7F,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,0BAA0B,CACrD,cAAc,CAAC,UAAU,CAC1B,CAAC;QAEF,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,MAAM,EAAE,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE5C,GAAG,CAAC,GAAG,EAAE;YACP,QAAQ,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,sBAAsB,EAAE,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAC9C,kCAAkC,CACnC,CAAC;QACF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,kCAAkC;QAE/E,mCAAmC;QACnC,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,MAAM,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8GAA8G,EAAE,KAAK,IAAI,EAAE;QAC5H,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe;QACvE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,0BAA0B,CACrD,cAAc,CAAC,UAAU,CAC1B,CAAC;QAEF,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,MAAM,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;QAChD,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAE3C,GAAG,CAAC,GAAG,EAAE;YACP,QAAQ,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,sBAAsB,EAAE,CAAC,CAAC;QACtE,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAC9C,kCAAkC,CACnC,CAAC;QAEF,GAAG,CAAC,GAAG,EAAE;YACP,QAAQ,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,UAAU,EAAE,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,eAAe;QAC3D,MAAM,CAAC,qBAAqB,CAAC,CAAC,SAAS,CACrC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CACpC,CAAC;QAEF,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,MAAM,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mFAAmF,EAAE,KAAK,IAAI,EAAE;QACjG,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,eAAe;QACvE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,0BAA0B,CACrD,cAAc,CAAC,UAAU,CAC1B,CAAC;QAEF,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,MAAM,EAAE,CAAC,wBAAwB,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;QAClD,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE5C,GAAG,CAAC,GAAG,EAAE;YACP,QAAQ,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;QACpD,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,aAAa,EAAE,CAAC;QAE5D,2BAA2B;QAC3B,MAAM,GAAG,CAAC,KAAK,IAAI,EAAE;YACnB,MAAM,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;QAC3E,MAAM,WAAW,GAAG;YAClB,KAAK,EAAE,YAAY;YACnB,OAAO,EAAE,CAAC;YACV,WAAW,EAAE,CAAC;YACd,OAAO,EAAE,IAAI;SACd,CAAC;QACF,MAAM,EAAE,MAAM,EAAE,GAAG,0BAA0B,CAC3C,cAAc,CAAC,UAAU,EACzB,KAAK,EACL,WAAW,CACZ,CAAC;QAEF,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;QACzE,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"useLoadingIndicator.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useLoadingIndicator.test.tsx"],"names":[],"mappings":"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"}

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

@@ -8,9 +8,13 @@ import { renderHook } from '../../test-utils/render.js';
 import { useMouseClick } from './useMouseClick.js';
 import { getBoundingBox } from 'ink';
 // Mock ink
-vi.mock('ink', async () => ({
-    getBoundingBox: vi.fn(),
-}));
+vi.mock('ink', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        getBoundingBox: vi.fn(),
+    };
+});
 // Mock MouseContext
 const mockUseMouse = vi.fn();
 vi.mock('../contexts/MouseContext.js', async () => ({
@@ -24,14 +28,15 @@ describe('useMouseClick', () => {
         handler = vi.fn();
         containerRef = { current: {} };
     });
-    it('should call handler with relative coordinates when click is inside bounds', () => {
+    it('should call handler with relative coordinates when click is inside bounds', async () => {
         vi.mocked(getBoundingBox).mockReturnValue({
             x: 10,
             y: 5,
             width: 20,
             height: 10,
         });
-        renderHook(() => useMouseClick(containerRef, handler));
+        const { unmount, waitUntilReady } = renderHook(() => useMouseClick(containerRef, handler));
+        await waitUntilReady();
         // Get the callback registered with useMouse
         expect(mockUseMouse).toHaveBeenCalled();
         const callback = mockUseMouse.mock.calls[0][0];
@@ -41,19 +46,22 @@ describe('useMouseClick', () => {
         // relativeY = 7 - 5 = 2
         callback({ name: 'left-press', col: 16, row: 8 });
         expect(handler).toHaveBeenCalledWith(expect.objectContaining({ name: 'left-press' }), 5, 2);
+        unmount();
     });
-    it('should not call handler when click is outside bounds', () => {
+    it('should not call handler when click is outside bounds', async () => {
         vi.mocked(getBoundingBox).mockReturnValue({
             x: 10,
             y: 5,
             width: 20,
             height: 10,
         });
-        renderHook(() => useMouseClick(containerRef, handler));
+        const { unmount, waitUntilReady } = renderHook(() => useMouseClick(containerRef, handler));
+        await waitUntilReady();
         const callback = mockUseMouse.mock.calls[0][0];
         // Click outside: x=5 (col 6), y=7 (row 8) -> left of box
         callback({ name: 'left-press', col: 6, row: 8 });
         expect(handler).not.toHaveBeenCalled();
+        unmount();
     });
 });
 //# sourceMappingURL=useMouseClick.test.js.map

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

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

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

@@ -3,6 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+import type { LoadingPhrasesMode } from '../../config/settings.js';
 export declare const PHRASE_CHANGE_INTERVAL_MS = 15000;
 export declare const INTERACTIVE_SHELL_WAITING_PHRASE = "Interactive shell awaiting input... press tab to focus shell";
 /**
@@ -10,7 +11,8 @@ export declare const INTERACTIVE_SHELL_WAITING_PHRASE = "Interactive shell await
  * @param isActive Whether the phrase cycling should be active.
  * @param isWaiting Whether to show a specific waiting phrase.
  * @param shouldShowFocusHint Whether to show the shell focus hint.
- * @param customPhrases Optional list of custom phrases to use.
+ * @param loadingPhrasesMode Which phrases to show: tips, witty, all, or off.
+ * @param customPhrases Optional list of custom phrases to use instead of built-in witty phrases.
  * @returns The current loading phrase.
  */
-export declare const usePhraseCycler: (isActive: boolean, isWaiting: boolean, shouldShowFocusHint: boolean, customPhrases?: string[]) => string | undefined;
+export declare const usePhraseCycler: (isActive: boolean, isWaiting: boolean, shouldShowFocusHint: boolean, loadingPhrasesMode?: LoadingPhrasesMode, customPhrases?: string[]) => string | undefined;

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

@@ -13,14 +13,12 @@ export const INTERACTIVE_SHELL_WAITING_PHRASE = 'Interactive shell awaiting inpu
  * @param isActive Whether the phrase cycling should be active.
  * @param isWaiting Whether to show a specific waiting phrase.
  * @param shouldShowFocusHint Whether to show the shell focus hint.
- * @param customPhrases Optional list of custom phrases to use.
+ * @param loadingPhrasesMode Which phrases to show: tips, witty, all, or off.
+ * @param customPhrases Optional list of custom phrases to use instead of built-in witty phrases.
  * @returns The current loading phrase.
  */
-export const usePhraseCycler = (isActive, isWaiting, shouldShowFocusHint, customPhrases) => {
-    const loadingPhrases = customPhrases && customPhrases.length > 0
-        ? customPhrases
-        : WITTY_LOADING_PHRASES;
-    const [currentLoadingPhrase, setCurrentLoadingPhrase] = useState(isActive ? loadingPhrases[0] : undefined);
+export const usePhraseCycler = (isActive, isWaiting, shouldShowFocusHint, loadingPhrasesMode = 'tips', customPhrases) => {
+    const [currentLoadingPhrase, setCurrentLoadingPhrase] = useState(undefined);
     const phraseIntervalRef = useRef(null);
     const hasShownFirstRequestTipRef = useRef(false);
     useEffect(() => {
@@ -37,31 +35,39 @@ export const usePhraseCycler = (isActive, isWaiting, shouldShowFocusHint, custom
             setCurrentLoadingPhrase('Waiting for user confirmation...');
             return;
         }
-        if (!isActive) {
+        if (!isActive || loadingPhrasesMode === 'off') {
             setCurrentLoadingPhrase(undefined);
             return;
         }
+        const wittyPhrases = customPhrases && customPhrases.length > 0
+            ? customPhrases
+            : WITTY_LOADING_PHRASES;
         const setRandomPhrase = () => {
-            if (customPhrases && customPhrases.length > 0) {
-                const randomIndex = Math.floor(Math.random() * customPhrases.length);
-                setCurrentLoadingPhrase(customPhrases[randomIndex]);
-            }
-            else {
-                let phraseList;
-                // Show a tip on the first request after startup, then continue with 1/6 chance
-                if (!hasShownFirstRequestTipRef.current) {
-                    // Show a tip during the first request
+            let phraseList;
+            switch (loadingPhrasesMode) {
+                case 'tips':
+                    phraseList = INFORMATIVE_TIPS;
+                    break;
+                case 'witty':
+                    phraseList = wittyPhrases;
+                    break;
+                case 'all':
+                    // Show a tip on the first request after startup, then continue with 1/6 chance
+                    if (!hasShownFirstRequestTipRef.current) {
+                        phraseList = INFORMATIVE_TIPS;
+                        hasShownFirstRequestTipRef.current = true;
+                    }
+                    else {
+                        const showTip = Math.random() < 1 / 6;
+                        phraseList = showTip ? INFORMATIVE_TIPS : wittyPhrases;
+                    }
+                    break;
+                default:
                     phraseList = INFORMATIVE_TIPS;
-                    hasShownFirstRequestTipRef.current = true;
-                }
-                else {
-                    // Roughly 1 in 6 chance to show a tip after the first request
-                    const showTip = Math.random() < 1 / 6;
-                    phraseList = showTip ? INFORMATIVE_TIPS : WITTY_LOADING_PHRASES;
-                }
-                const randomIndex = Math.floor(Math.random() * phraseList.length);
-                setCurrentLoadingPhrase(phraseList[randomIndex]);
+                    break;
             }
+            const randomIndex = Math.floor(Math.random() * phraseList.length);
+            setCurrentLoadingPhrase(phraseList[randomIndex]);
         };
         // Select an initial random phrase
         setRandomPhrase();
@@ -75,7 +81,13 @@ export const usePhraseCycler = (isActive, isWaiting, shouldShowFocusHint, custom
                 phraseIntervalRef.current = null;
             }
         };
-    }, [isActive, isWaiting, shouldShowFocusHint, customPhrases, loadingPhrases]);
+    }, [
+        isActive,
+        isWaiting,
+        shouldShowFocusHint,
+        loadingPhrasesMode,
+        customPhrases,
+    ]);
     return currentLoadingPhrase;
 };
 //# sourceMappingURL=usePhraseCycler.js.map

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

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

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

@@ -5,15 +5,15 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * SPDX-License-Identifier: Apache-2.0
  */
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { act } from 'react';
+import React, { act } from 'react';
 import { render } from '../../test-utils/render.js';
 import { Text } from 'ink';
 import { usePhraseCycler, PHRASE_CHANGE_INTERVAL_MS, } from './usePhraseCycler.js';
 import { INFORMATIVE_TIPS } from '../constants/tips.js';
 import { WITTY_LOADING_PHRASES } from '../constants/wittyPhrases.js';
 // Test component to consume the hook
-const TestComponent = ({ isActive, isWaiting, isInteractiveShellWaiting = false, customPhrases, }) => {
-    const phrase = usePhraseCycler(isActive, isWaiting, isInteractiveShellWaiting, customPhrases);
+const TestComponent = ({ isActive, isWaiting, isInteractiveShellWaiting = false, loadingPhrasesMode = 'all', customPhrases, }) => {
+    const phrase = usePhraseCycler(isActive, isWaiting, isInteractiveShellWaiting, loadingPhrasesMode, customPhrases);
     return _jsx(Text, { children: phrase });
 };
 describe('usePhraseCycler', () => {
@@ -21,80 +21,89 @@ describe('usePhraseCycler', () => {
         vi.useFakeTimers();
     });
     afterEach(() => {
+        vi.useRealTimers();
         vi.restoreAllMocks();
     });
-    it('should initialize with an empty string when not active and not waiting', () => {
+    it('should initialize with an empty string when not active and not waiting', async () => {
         vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty
-        const { lastFrame } = render(_jsx(TestComponent, { isActive: false, isWaiting: false }));
-        expect(lastFrame()).toBe('');
+        const { lastFrame, waitUntilReady, unmount } = render(_jsx(TestComponent, { isActive: false, isWaiting: false }));
+        await waitUntilReady();
+        expect(lastFrame({ allowEmpty: true }).trim()).toBe('');
+        unmount();
     });
     it('should show "Waiting for user confirmation..." when isWaiting is true', async () => {
-        const { lastFrame, rerender } = render(_jsx(TestComponent, { isActive: true, isWaiting: false }));
-        rerender(_jsx(TestComponent, { isActive: true, isWaiting: true }));
+        const { lastFrame, rerender, waitUntilReady, unmount } = render(_jsx(TestComponent, { isActive: true, isWaiting: false }));
+        await waitUntilReady();
         await act(async () => {
-            await vi.advanceTimersByTimeAsync(0);
+            rerender(_jsx(TestComponent, { isActive: true, isWaiting: true }));
         });
-        expect(lastFrame()).toMatchSnapshot();
+        await waitUntilReady();
+        expect(lastFrame().trim()).toMatchSnapshot();
+        unmount();
     });
     it('should show interactive shell waiting message immediately when isInteractiveShellWaiting is true', async () => {
-        const { lastFrame, rerender } = render(_jsx(TestComponent, { isActive: true, isWaiting: false }));
-        rerender(_jsx(TestComponent, { isActive: true, isWaiting: false, isInteractiveShellWaiting: true }));
+        const { lastFrame, rerender, waitUntilReady, unmount } = render(_jsx(TestComponent, { isActive: true, isWaiting: false }));
+        await waitUntilReady();
         await act(async () => {
-            await vi.advanceTimersByTimeAsync(0);
+            rerender(_jsx(TestComponent, { isActive: true, isWaiting: false, isInteractiveShellWaiting: true }));
         });
-        expect(lastFrame()).toMatchSnapshot();
+        await waitUntilReady();
+        expect(lastFrame().trim()).toMatchSnapshot();
+        unmount();
     });
     it('should prioritize interactive shell waiting over normal waiting immediately', async () => {
-        const { lastFrame, rerender } = render(_jsx(TestComponent, { isActive: true, isWaiting: true }));
-        await act(async () => {
-            await vi.advanceTimersByTimeAsync(0);
-        });
-        expect(lastFrame()).toMatchSnapshot();
-        rerender(_jsx(TestComponent, { isActive: true, isWaiting: true, isInteractiveShellWaiting: true }));
+        const { lastFrame, rerender, waitUntilReady, unmount } = render(_jsx(TestComponent, { isActive: true, isWaiting: true }));
+        await waitUntilReady();
+        expect(lastFrame().trim()).toMatchSnapshot();
         await act(async () => {
-            await vi.advanceTimersByTimeAsync(0);
+            rerender(_jsx(TestComponent, { isActive: true, isWaiting: true, isInteractiveShellWaiting: true }));
         });
-        expect(lastFrame()).toMatchSnapshot();
+        await waitUntilReady();
+        expect(lastFrame().trim()).toMatchSnapshot();
+        unmount();
     });
     it('should not cycle phrases if isActive is false and not waiting', async () => {
-        const { lastFrame } = render(_jsx(TestComponent, { isActive: false, isWaiting: false }));
-        const initialPhrase = lastFrame();
+        const { lastFrame, waitUntilReady, unmount } = render(_jsx(TestComponent, { isActive: false, isWaiting: false }));
+        await waitUntilReady();
+        const initialPhrase = lastFrame({ allowEmpty: true }).trim();
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS * 2);
         });
-        expect(lastFrame()).toBe(initialPhrase);
+        await waitUntilReady();
+        expect(lastFrame({ allowEmpty: true }).trim()).toBe(initialPhrase);
+        unmount();
     });
     it('should show a tip on first activation, then a witty phrase', async () => {
         vi.spyOn(Math, 'random').mockImplementation(() => 0.99); // Subsequent phrases are witty
-        const { lastFrame } = render(_jsx(TestComponent, { isActive: true, isWaiting: false }));
+        const { lastFrame, waitUntilReady, unmount } = render(_jsx(TestComponent, { isActive: true, isWaiting: false }));
+        await waitUntilReady();
         // Initial phrase on first activation should be a tip
-        await act(async () => {
-            await vi.advanceTimersByTimeAsync(0);
-        });
-        expect(INFORMATIVE_TIPS).toContain(lastFrame());
+        expect(INFORMATIVE_TIPS).toContain(lastFrame().trim());
         // After the first interval, it should be a witty phrase
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS + 100);
         });
-        expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
+        await waitUntilReady();
+        expect(WITTY_LOADING_PHRASES).toContain(lastFrame().trim());
+        unmount();
     });
     it('should cycle through phrases when isActive is true and not waiting', async () => {
         vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty for subsequent phrases
-        const { lastFrame } = render(_jsx(TestComponent, { isActive: true, isWaiting: false }));
-        // Initial phrase on first activation will be a tip, not necessarily from witty phrases
-        await act(async () => {
-            await vi.advanceTimersByTimeAsync(0);
-        });
-        // First activation shows a tip, so we can't guarantee it's in WITTY_LOADING_PHRASES
+        const { lastFrame, waitUntilReady, unmount } = render(_jsx(TestComponent, { isActive: true, isWaiting: false }));
+        await waitUntilReady();
+        // Initial phrase on first activation will be a tip
         // After the first interval, it should follow the random pattern (witty phrases due to mock)
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS + 100);
         });
-        expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
+        await waitUntilReady();
+        expect(WITTY_LOADING_PHRASES).toContain(lastFrame().trim());
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS);
         });
-        expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
+        await waitUntilReady();
+        expect(WITTY_LOADING_PHRASES).toContain(lastFrame().trim());
+        unmount();
     });
     it('should reset to a phrase when isActive becomes true after being false', async () => {
         const customPhrases = ['Phrase A', 'Phrase B'];
@@ -107,34 +116,46 @@ describe('usePhraseCycler', () => {
             callCount++;
             return val;
         });
-        const { lastFrame, rerender } = render(_jsx(TestComponent, { isActive: false, isWaiting: false, customPhrases: customPhrases }));
+        const { lastFrame, rerender, waitUntilReady, unmount } = render(_jsx(TestComponent, { isActive: false, isWaiting: false, customPhrases: customPhrases }));
+        await waitUntilReady();
         // Activate -> On first activation will show tip on initial call, then first interval will use first mock value for 'Phrase A'
-        rerender(_jsx(TestComponent, { isActive: true, isWaiting: false, customPhrases: customPhrases }));
+        await act(async () => {
+            rerender(_jsx(TestComponent, { isActive: true, isWaiting: false, customPhrases: customPhrases }));
+        });
+        await waitUntilReady();
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS); // First interval after initial state -> callCount 0 -> 'Phrase A'
         });
-        expect(customPhrases).toContain(lastFrame()); // Should be one of the custom phrases
+        await waitUntilReady();
+        expect(customPhrases).toContain(lastFrame().trim()); // Should be one of the custom phrases
         // Second interval -> callCount 1 -> returns 0.99 -> 'Phrase B'
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS);
         });
-        expect(customPhrases).toContain(lastFrame()); // Should be one of the custom phrases
+        await waitUntilReady();
+        expect(customPhrases).toContain(lastFrame().trim()); // Should be one of the custom phrases
         // Deactivate -> resets to undefined (empty string in output)
-        rerender(_jsx(TestComponent, { isActive: false, isWaiting: false, customPhrases: customPhrases }));
         await act(async () => {
-            await vi.advanceTimersByTimeAsync(0);
+            rerender(_jsx(TestComponent, { isActive: false, isWaiting: false, customPhrases: customPhrases }));
         });
+        await waitUntilReady();
         // The phrase should be empty after reset
-        expect(lastFrame()).toBe('');
+        expect(lastFrame({ allowEmpty: true }).trim()).toBe('');
         // Activate again -> this will show a tip on first activation, then cycle from where mock is
-        rerender(_jsx(TestComponent, { isActive: true, isWaiting: false, customPhrases: customPhrases }));
+        await act(async () => {
+            rerender(_jsx(TestComponent, { isActive: true, isWaiting: false, customPhrases: customPhrases }));
+        });
+        await waitUntilReady();
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS); // First interval after re-activation -> should contain phrase
         });
-        expect(customPhrases).toContain(lastFrame()); // Should be one of the custom phrases
+        await waitUntilReady();
+        expect(customPhrases).toContain(lastFrame().trim()); // Should be one of the custom phrases
+        unmount();
     });
-    it('should clear phrase interval on unmount when active', () => {
-        const { unmount } = render(_jsx(TestComponent, { isActive: true, isWaiting: false }));
+    it('should clear phrase interval on unmount when active', async () => {
+        const { unmount, waitUntilReady } = render(_jsx(TestComponent, { isActive: true, isWaiting: false }));
+        await waitUntilReady();
         const clearIntervalSpy = vi.spyOn(global, 'clearInterval');
         unmount();
         expect(clearIntervalSpy).toHaveBeenCalledOnce();
@@ -142,67 +163,96 @@ describe('usePhraseCycler', () => {
     it('should use custom phrases when provided', async () => {
         const customPhrases = ['Custom Phrase 1', 'Custom Phrase 2'];
         const randomMock = vi.spyOn(Math, 'random');
-        const { lastFrame, rerender } = render(_jsx(TestComponent, { isActive: true, isWaiting: false, customPhrases: customPhrases }));
+        let setStateExternally;
+        const StatefulWrapper = () => {
+            const [config, setConfig] = React.useState({
+                isActive: true,
+                customPhrases,
+            });
+            setStateExternally = setConfig;
+            return (_jsx(TestComponent, { isActive: config.isActive, isWaiting: false, loadingPhrasesMode: "witty", customPhrases: config.customPhrases }));
+        };
+        const { lastFrame, waitUntilReady, unmount } = render(_jsx(StatefulWrapper, {}));
+        await waitUntilReady();
         // After first interval, it should use custom phrases
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS + 100);
         });
+        await waitUntilReady();
         randomMock.mockReturnValue(0);
-        rerender(_jsx(TestComponent, { isActive: true, isWaiting: false, customPhrases: customPhrases }));
+        await act(async () => {
+            setStateExternally?.({
+                isActive: true,
+                customPhrases,
+            });
+        });
+        await waitUntilReady();
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS + 100);
         });
-        expect(customPhrases).toContain(lastFrame());
+        await waitUntilReady();
+        expect(customPhrases).toContain(lastFrame({ allowEmpty: true }).trim());
         randomMock.mockReturnValue(0.99);
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS);
         });
-        expect(customPhrases).toContain(lastFrame());
+        await waitUntilReady();
+        expect(customPhrases).toContain(lastFrame({ allowEmpty: true }).trim());
         // Test fallback to default phrases.
         randomMock.mockRestore();
         vi.spyOn(Math, 'random').mockReturnValue(0.5); // Always witty
-        rerender(_jsx(TestComponent, { isActive: true, isWaiting: false, customPhrases: [] }));
+        await act(async () => {
+            setStateExternally?.({
+                isActive: true,
+                customPhrases: [],
+            });
+        });
+        await waitUntilReady();
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS); // Wait for first cycle
         });
-        expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
+        await waitUntilReady();
+        expect(WITTY_LOADING_PHRASES).toContain(lastFrame().trim());
+        unmount();
     });
     it('should fall back to witty phrases if custom phrases are an empty array', async () => {
         vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty for subsequent phrases
-        const { lastFrame } = render(_jsx(TestComponent, { isActive: true, isWaiting: false, customPhrases: [] }));
-        await act(async () => {
-            await vi.advanceTimersByTimeAsync(0); // First activation will be a tip
-        });
-        // First activation shows a tip, so we can't guarantee it's in WITTY_LOADING_PHRASES
+        const { lastFrame, waitUntilReady, unmount } = render(_jsx(TestComponent, { isActive: true, isWaiting: false, customPhrases: [] }));
+        await waitUntilReady();
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS); // Next phrase after tip
         });
-        expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
+        await waitUntilReady();
+        expect(WITTY_LOADING_PHRASES).toContain(lastFrame().trim());
+        unmount();
     });
     it('should reset phrase when transitioning from waiting to active', async () => {
         vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty for subsequent phrases
-        const { lastFrame, rerender } = render(_jsx(TestComponent, { isActive: true, isWaiting: false }));
-        await act(async () => {
-            await vi.advanceTimersByTimeAsync(0); // First activation will be a tip
-        });
-        // First activation shows a tip, so we can't guarantee it's in WITTY_LOADING_PHRASES
+        const { lastFrame, rerender, waitUntilReady, unmount } = render(_jsx(TestComponent, { isActive: true, isWaiting: false }));
+        await waitUntilReady();
         // Cycle to a different phrase (should be witty due to mock)
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS);
         });
-        expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
+        await waitUntilReady();
+        expect(WITTY_LOADING_PHRASES).toContain(lastFrame().trim());
         // Go to waiting state
-        rerender(_jsx(TestComponent, { isActive: false, isWaiting: true }));
         await act(async () => {
-            await vi.advanceTimersByTimeAsync(0);
+            rerender(_jsx(TestComponent, { isActive: false, isWaiting: true }));
         });
-        expect(lastFrame()).toMatchSnapshot();
+        await waitUntilReady();
+        expect(lastFrame().trim()).toMatchSnapshot();
         // Go back to active cycling - should pick a phrase based on the logic (witty due to mock)
-        rerender(_jsx(TestComponent, { isActive: true, isWaiting: false }));
+        await act(async () => {
+            rerender(_jsx(TestComponent, { isActive: true, isWaiting: false }));
+        });
+        await waitUntilReady();
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS); // Skip the tip and get next phrase
         });
-        expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
+        await waitUntilReady();
+        expect(WITTY_LOADING_PHRASES).toContain(lastFrame().trim());
+        unmount();
     });
 });
 //# sourceMappingURL=usePhraseCycler.test.js.map