@machina.ai/cell-cli 1.16.0-rc2 → 1.19.4-rc1

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

@@ -4,339 +4,88 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { useState, useEffect, useRef } from 'react';
-export const WITTY_LOADING_PHRASES = [
-    "I'm Feeling Lucky",
-    'Shipping awesomeness... ',
-    'Painting the serifs back on...',
-    'Navigating the slime mold...',
-    'Consulting the digital spirits...',
-    'Reticulating splines...',
-    'Warming up the AI hamsters...',
-    'Asking the magic conch shell...',
-    'Generating witty retort...',
-    'Polishing the algorithms...',
-    "Don't rush perfection (or my code)...",
-    'Brewing fresh bytes...',
-    'Counting electrons...',
-    'Engaging cognitive processors...',
-    'Checking for syntax errors in the universe...',
-    'One moment, optimizing humor...',
-    'Shuffling punchlines...',
-    'Untangling neural nets...',
-    'Compiling brilliance...',
-    'Loading wit.exe...',
-    'Summoning the cloud of wisdom...',
-    'Preparing a witty response...',
-    "Just a sec, I'm debugging reality...",
-    'Confuzzling the options...',
-    'Tuning the cosmic frequencies...',
-    'Crafting a response worthy of your patience...',
-    'Compiling the 1s and 0s...',
-    'Resolving dependencies... and existential crises...',
-    'Defragmenting memories... both RAM and personal...',
-    'Rebooting the humor module...',
-    'Caching the essentials (mostly cat memes)...',
-    'Optimizing for ludicrous speed',
-    "Swapping bits... don't tell the bytes...",
-    'Garbage collecting... be right back...',
-    'Assembling the interwebs...',
-    'Converting coffee into code...',
-    'Updating the syntax for reality...',
-    'Rewiring the synapses...',
-    'Looking for a misplaced semicolon...',
-    "Greasin' the cogs of the machine...",
-    'Pre-heating the servers...',
-    'Calibrating the flux capacitor...',
-    'Engaging the improbability drive...',
-    'Channeling the Force...',
-    'Aligning the stars for optimal response...',
-    'So say we all...',
-    'Loading the next great idea...',
-    "Just a moment, I'm in the zone...",
-    'Preparing to dazzle you with brilliance...',
-    "Just a tick, I'm polishing my wit...",
-    "Hold tight, I'm crafting a masterpiece...",
-    "Just a jiffy, I'm debugging the universe...",
-    "Just a moment, I'm aligning the pixels...",
-    "Just a sec, I'm optimizing the humor...",
-    "Just a moment, I'm tuning the algorithms...",
-    'Warp speed engaged...',
-    'Mining for more Dilithium crystals...',
-    "Don't panic...",
-    'Following the white rabbit...',
-    'The truth is in here... somewhere...',
-    'Blowing on the cartridge...',
-    'Loading... Do a barrel roll!',
-    'Waiting for the respawn...',
-    'Finishing the Kessel Run in less than 12 parsecs...',
-    "The cake is not a lie, it's just still loading...",
-    'Fiddling with the character creation screen...',
-    "Just a moment, I'm finding the right meme...",
-    "Pressing 'A' to continue...",
-    'Herding digital cats...',
-    'Polishing the pixels...',
-    'Finding a suitable loading screen pun...',
-    'Distracting you with this witty phrase...',
-    'Almost there... probably...',
-    'Our hamsters are working as fast as they can...',
-    'Giving Cloudy a pat on the head...',
-    'Petting the cat...',
-    'Rickrolling my boss...',
-    'Never gonna give you up, never gonna let you down...',
-    'Slapping the bass...',
-    'Tasting the snozberries...',
-    "I'm going the distance, I'm going for speed...",
-    'Is this the real life? Is this just fantasy?...',
-    "I've got a good feeling about this...",
-    'Poking the bear...',
-    'Doing research on the latest memes...',
-    'Figuring out how to make this more witty...',
-    'Hmmm... let me think...',
-    'What do you call a fish with no eyes? A fsh...',
-    'Why did the computer go to therapy? It had too many bytes...',
-    "Why don't programmers like nature? It has too many bugs...",
-    'Why do programmers prefer dark mode? Because light attracts bugs...',
-    'Why did the developer go broke? Because they used up all their cache...',
-    "What can you do with a broken pencil? Nothing, it's pointless...",
-    'Applying percussive maintenance...',
-    'Searching for the correct USB orientation...',
-    'Ensuring the magic smoke stays inside the wires...',
-    'Rewriting in Rust for no particular reason...',
-    'Trying to exit Vim...',
-    'Spinning up the hamster wheel...',
-    "That's not a bug, it's an undocumented feature...",
-    'Engage.',
-    "I'll be back... with an answer.",
-    'My other process is a TARDIS...',
-    'Communing with the machine spirit...',
-    'Letting the thoughts marinate...',
-    'Just remembered where I put my keys...',
-    'Pondering the orb...',
-    "I've seen things you people wouldn't believe... like a user who reads loading messages.",
-    'Initiating thoughtful gaze...',
-    "What's a computer's favorite snack? Microchips.",
-    "Why do Java developers wear glasses? Because they don't C#.",
-    'Charging the laser... pew pew!',
-    'Dividing by zero... just kidding!',
-    'Looking for an adult superviso... I mean, processing.',
-    'Making it go beep boop.',
-    'Buffering... because even AIs need a moment.',
-    'Entangling quantum particles for a faster response...',
-    'Polishing the chrome... on the algorithms.',
-    'Are you not entertained? (Working on it!)',
-    'Summoning the code gremlins... to help, of course.',
-    'Just waiting for the dial-up tone to finish...',
-    'Recalibrating the humor-o-meter.',
-    'My other loading screen is even funnier.',
-    "Pretty sure there's a cat walking on the keyboard somewhere...",
-    'Enhancing... Enhancing... Still loading.',
-    "It's not a bug, it's a feature... of this loading screen.",
-    'Have you tried turning it off and on again? (The loading screen, not me.)',
-    'Constructing additional pylons...',
-    'New line? That’s Ctrl+J.',
-    'Releasing the HypnoDrones...',
-];
-export const INFORMATIVE_TIPS = [
-    //Settings tips start here
-    'Set your preferred editor for opening files (/settings)...',
-    'Toggle Vim mode for a modal editing experience (/settings)...',
-    'Disable automatic updates if you prefer manual control (/settings)...',
-    'Turn off nagging update notifications (settings.json)...',
-    'Enable checkpointing to recover your session after a crash (settings.json)...',
-    'Change CLI output format to JSON for scripting (/settings)...',
-    'Personalize your CLI with a new color theme (/settings)...',
-    'Create and use your own custom themes (settings.json)...',
-    'Hide window title for a more minimal UI (/settings)...',
-    "Don't like these tips? You can hide them (/settings)...",
-    'Hide the startup banner for a cleaner launch (/settings)...',
-    'Reclaim vertical space by hiding the footer (/settings)...',
-    'Show memory usage for performance monitoring (/settings)...',
-    'Show citations to see where the model gets information (/settings)...',
-    'Disable loading phrases for a quieter experience (/settings)...',
-    'Add custom witty phrases to the loading screen (settings.json)...',
-    'Choose a specific Gemini model for conversations (/settings)...',
-    'Limit the number of turns in your session history (/settings)...',
-    'Automatically summarize large tool outputs to save tokens (settings.json)...',
-    'Control when chat history gets compressed based on token usage (settings.json)...',
-    'Define custom context file names, like CONTEXT.md (settings.json)...',
-    'Set max directories to scan for context files (/settings)...',
-    'Expand your workspace with additional directories (/directory)...',
-    'Control how /memory refresh loads context files (/settings)...',
-    'Toggle respect for .gitignore files in context (/settings)...',
-    'Toggle respect for .geminiignore files in context (/settings)...',
-    'Enable recursive file search for @-file completions (/settings)...',
-    'Run tools in a secure sandbox environment (settings.json)...',
-    'Use an interactive terminal for shell commands (/settings)...',
-    'Restrict available built-in tools (settings.json)...',
-    'Exclude specific tools from being used (settings.json)...',
-    'Bypass confirmation for trusted tools (settings.json)...',
-    'Use a custom command for tool discovery (settings.json)...',
-    'Define a custom command for calling discovered tools (settings.json)...',
-    'Define and manage connections to MCP servers (settings.json)...',
-    'Enable folder trust to enhance security (/settings)...',
-    'Change your authentication method (/settings)...',
-    'Enforce auth type for enterprise use (settings.json)...',
-    'Let Node.js auto-configure memory (settings.json)...',
-    'Customize the DNS resolution order (settings.json)...',
-    'Exclude env vars from the context (settings.json)...',
-    'Configure a custom command for filing bug reports (settings.json)...',
-    'Enable or disable telemetry collection (/settings)...',
-    'Send telemetry data to a local file or GCP (settings.json)...',
-    'Configure the OTLP endpoint for telemetry (settings.json)...',
-    'Choose whether to log prompt content (settings.json)...',
-    'Enable AI-powered prompt completion while typing (/settings)...',
-    'Enable debug logging of keystrokes to the console (/settings)...',
-    'Enable automatic session cleanup of old conversations (/settings)...',
-    'Show Cell CLI status in the terminal window title (/settings)...',
-    'Use the entire width of the terminal for output (/settings)...',
-    'Enable screen reader mode for better accessibility (/settings)...',
-    'Skip the next speaker check for faster responses (/settings)...',
-    'Use ripgrep for faster file content search (/settings)...',
-    'Enable truncation of large tool outputs to save tokens (/settings)...',
-    'Set the character threshold for truncating tool outputs (/settings)...',
-    'Set the number of lines to keep when truncating outputs (/settings)...',
-    'Enable policy-based tool confirmation via message bus (/settings)...',
-    'Enable smart-edit tool for more precise editing (/settings)...',
-    'Enable write_todos tool to generate task lists (/settings)...',
-    'Enable model routing based on complexity (/settings)...',
-    'Enable experimental subagents for task delegation (/settings)...',
-    //Settings tips end here
-    // Keyboard shortcut tips start here
-    'Close dialogs and suggestions with Esc...',
-    'Cancel a request with Ctrl+C, or press twice to exit...',
-    'Exit the app with Ctrl+D on an empty line...',
-    'Clear your screen at any time with Ctrl+L...',
-    'Toggle the debug console display with F12...',
-    'See full, untruncated responses with Ctrl+S...',
-    'Toggle auto-approval (YOLO mode) for all tools with Ctrl+Y...',
-    'Toggle shell mode by typing ! in an empty prompt...',
-    'Insert a newline with a backslash (\\) followed by Enter...',
-    'Navigate your prompt history with the Up and Down arrows...',
-    'You can also use Ctrl+P (up) and Ctrl+N (down) for history...',
-    'Submit your prompt to Gemini with Enter...',
-    'Accept an autocomplete suggestion with Tab or Enter...',
-    'Move to the start of the line with Ctrl+A or Home...',
-    'Move to the end of the line with Ctrl+E or End...',
-    'Move one character left or right with Ctrl+B/F or the arrow keys...',
-    'Move one word left or right with Ctrl+Left/Right Arrow...',
-    'Delete the character to the left with Ctrl+H or Backspace...',
-    'Delete the character to the right with Ctrl+D or Delete...',
-    'Delete the word to the left of the cursor with Ctrl+W...',
-    'Delete the word to the right of the cursor with Ctrl+Delete...',
-    'Delete from the cursor to the start of the line with Ctrl+U...',
-    'Delete from the cursor to the end of the line with Ctrl+K...',
-    'Clear the entire input prompt with a double-press of Esc...',
-    'Paste from your clipboard with Ctrl+V...',
-    'Open the current prompt in an external editor with Ctrl+X...',
-    'In menus, move up/down with k/j or the arrow keys...',
-    'In menus, select an item by typing its number...',
-    "If you're using an IDE, see the context with Ctrl+G...",
-    // Keyboard shortcut tips end here
-    // Command tips start here
-    'Show version info with /about...',
-    'Change your authentication method with /auth...',
-    'File a bug report directly with /bug...',
-    'List your saved chat checkpoints with /chat list...',
-    'Save your current conversation with /chat save <tag>...',
-    'Resume a saved conversation with /chat resume <tag>...',
-    'Delete a conversation checkpoint with /chat delete <tag>...',
-    'Share your conversation to a file with /chat share <file>...',
-    'Clear the screen and history with /clear...',
-    'Save tokens by summarizing the context with /compress...',
-    'Copy the last response to your clipboard with /copy...',
-    'Open the full documentation in your browser with /docs...',
-    'Add directories to your workspace with /directory add <path>...',
-    'Show all directories in your workspace with /directory show...',
-    'Set your preferred external editor with /editor...',
-    'List all active extensions with /extensions list...',
-    'Update all or specific extensions with /extensions update...',
-    'Get help on commands with /help...',
-    'Manage IDE integration with /ide...',
-    'Create a project-specific GEMINI.md file with /init...',
-    'List configured MCP servers and tools with /mcp list...',
-    'Authenticate with an OAuth-enabled MCP server with /mcp auth...',
-    'Restart MCP servers with /mcp refresh...',
-    'See the current instructional context with /memory show...',
-    'Add content to the instructional memory with /memory add...',
-    'Reload instructional context from GEMINI.md files with /memory refresh...',
-    'List the paths of the GEMINI.md files in use with /memory list...',
-    'Display the privacy notice with /privacy...',
-    'Exit the CLI with /quit or /exit...',
-    'Check model-specific usage stats with /stats model...',
-    'Check tool-specific usage stats with /stats tools...',
-    "Change the CLI's color theme with /theme...",
-    'List all available tools with /tools...',
-    'View and edit settings with the /settings editor...',
-    'Toggle Vim keybindings on and off with /vim...',
-    'Set up GitHub Actions with /setup-github...',
-    'Configure terminal keybindings for multiline input with /terminal-setup...',
-    'Find relevant documentation with /find-docs...',
-    'Review a pull request with /oncall:pr-review...',
-    'Go back to main and clean up the branch with /github:cleanup-back-to-main...',
-    'Execute any shell command with !<command>...',
-    // Command tips end here
-];
+import { SHELL_FOCUS_HINT_DELAY_MS } from '../constants.js';
+import { INFORMATIVE_TIPS } from '../constants/tips.js';
+import { WITTY_LOADING_PHRASES } from '../constants/wittyPhrases.js';
+import { useInactivityTimer } from './useInactivityTimer.js';
 export const PHRASE_CHANGE_INTERVAL_MS = 15000;
+export const INTERACTIVE_SHELL_WAITING_PHRASE = 'Interactive shell awaiting input... press Ctrl+f to focus shell';
 /**
  * Custom hook to manage cycling through loading phrases.
  * @param isActive Whether the phrase cycling should be active.
  * @param isWaiting Whether to show a specific waiting phrase.
+ * @param isInteractiveShellWaiting Whether an interactive shell is waiting for input but not focused.
+ * @param customPhrases Optional list of custom phrases to use.
  * @returns The current loading phrase.
  */
-export const usePhraseCycler = (isActive, isWaiting, customPhrases) => {
+export const usePhraseCycler = (isActive, isWaiting, isInteractiveShellWaiting, lastOutputTime = 0, customPhrases) => {
     const loadingPhrases = customPhrases && customPhrases.length > 0
         ? customPhrases
         : WITTY_LOADING_PHRASES;
     const [currentLoadingPhrase, setCurrentLoadingPhrase] = useState(loadingPhrases[0]);
+    const showShellFocusHint = useInactivityTimer(isInteractiveShellWaiting && lastOutputTime > 0, lastOutputTime, SHELL_FOCUS_HINT_DELAY_MS);
     const phraseIntervalRef = useRef(null);
+    const hasShownFirstRequestTipRef = useRef(false);
     useEffect(() => {
+        // Always clear on re-run
+        if (phraseIntervalRef.current) {
+            clearInterval(phraseIntervalRef.current);
+            phraseIntervalRef.current = null;
+        }
+        if (isInteractiveShellWaiting && showShellFocusHint) {
+            setCurrentLoadingPhrase(INTERACTIVE_SHELL_WAITING_PHRASE);
+            return;
+        }
         if (isWaiting) {
             setCurrentLoadingPhrase('Waiting for user confirmation...');
-            if (phraseIntervalRef.current) {
-                clearInterval(phraseIntervalRef.current);
-                phraseIntervalRef.current = null;
-            }
+            return;
         }
-        else if (isActive) {
-            if (phraseIntervalRef.current) {
-                clearInterval(phraseIntervalRef.current);
+        if (!isActive) {
+            setCurrentLoadingPhrase(loadingPhrases[0]);
+            return;
+        }
+        const setRandomPhrase = () => {
+            if (customPhrases && customPhrases.length > 0) {
+                const randomIndex = Math.floor(Math.random() * customPhrases.length);
+                setCurrentLoadingPhrase(customPhrases[randomIndex]);
             }
-            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
+                    phraseList = INFORMATIVE_TIPS;
+                    hasShownFirstRequestTipRef.current = true;
                 }
                 else {
-                    // Roughly 1 in 6 chance to show a tip.
+                    // Roughly 1 in 6 chance to show a tip after the first request
                     const showTip = Math.random() < 1 / 6;
-                    const phraseList = showTip ? INFORMATIVE_TIPS : WITTY_LOADING_PHRASES;
-                    const randomIndex = Math.floor(Math.random() * phraseList.length);
-                    setCurrentLoadingPhrase(phraseList[randomIndex]);
+                    phraseList = showTip ? INFORMATIVE_TIPS : WITTY_LOADING_PHRASES;
                 }
-            };
-            // Select an initial random phrase
-            setRandomPhrase();
-            phraseIntervalRef.current = setInterval(() => {
-                // Select a new random phrase
-                setRandomPhrase();
-            }, PHRASE_CHANGE_INTERVAL_MS);
-        }
-        else {
-            // Idle or other states, clear the phrase interval
-            // and reset to the first phrase for next active state.
-            if (phraseIntervalRef.current) {
-                clearInterval(phraseIntervalRef.current);
-                phraseIntervalRef.current = null;
+                const randomIndex = Math.floor(Math.random() * phraseList.length);
+                setCurrentLoadingPhrase(phraseList[randomIndex]);
             }
-            setCurrentLoadingPhrase(loadingPhrases[0]);
-        }
+        };
+        // Select an initial random phrase
+        setRandomPhrase();
+        phraseIntervalRef.current = setInterval(() => {
+            // Select a new random phrase
+            setRandomPhrase();
+        }, PHRASE_CHANGE_INTERVAL_MS);
         return () => {
             if (phraseIntervalRef.current) {
                 clearInterval(phraseIntervalRef.current);
                 phraseIntervalRef.current = null;
             }
         };
-    }, [isActive, isWaiting, customPhrases, loadingPhrases]);
+    }, [
+        isActive,
+        isWaiting,
+        isInteractiveShellWaiting,
+        customPhrases,
+        loadingPhrases,
+        showShellFocusHint,
+    ]);
     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

@@ -8,10 +8,12 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { act } from 'react';
 import { render } from '../../test-utils/render.js';
 import { Text } from 'ink';
-import { usePhraseCycler, WITTY_LOADING_PHRASES, PHRASE_CHANGE_INTERVAL_MS, } from './usePhraseCycler.js';
+import { usePhraseCycler, PHRASE_CHANGE_INTERVAL_MS, INTERACTIVE_SHELL_WAITING_PHRASE, } 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, customPhrases, }) => {
-    const phrase = usePhraseCycler(isActive, isWaiting, customPhrases);
+const TestComponent = ({ isActive, isWaiting, isInteractiveShellWaiting = false, lastOutputTime = 0, customPhrases, }) => {
+    const phrase = usePhraseCycler(isActive, isWaiting, isInteractiveShellWaiting, lastOutputTime, customPhrases);
     return _jsx(Text, { children: phrase });
 };
 describe('usePhraseCycler', () => {
@@ -34,6 +36,55 @@ describe('usePhraseCycler', () => {
         });
         expect(lastFrame()).toBe('Waiting for user confirmation...');
     });
+    it('should show interactive shell waiting message when isInteractiveShellWaiting is true after 5s', async () => {
+        vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty
+        const { lastFrame, rerender } = render(_jsx(TestComponent, { isActive: true, isWaiting: false }));
+        rerender(_jsx(TestComponent, { isActive: true, isWaiting: false, isInteractiveShellWaiting: true, lastOutputTime: 1 }));
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(0);
+        });
+        // Should still be showing a witty phrase or tip initially
+        expect([...WITTY_LOADING_PHRASES, ...INFORMATIVE_TIPS]).toContain(lastFrame());
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(5000);
+        });
+        expect(lastFrame()).toBe(INTERACTIVE_SHELL_WAITING_PHRASE);
+    });
+    it('should reset interactive shell waiting timer when lastOutputTime changes', async () => {
+        vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty
+        const { lastFrame, rerender } = render(_jsx(TestComponent, { isActive: true, isWaiting: false, isInteractiveShellWaiting: true, lastOutputTime: 1000 }));
+        // Advance 3 seconds
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(3000);
+        });
+        // Should still be witty phrase or tip
+        expect([...WITTY_LOADING_PHRASES, ...INFORMATIVE_TIPS]).toContain(lastFrame());
+        // Update lastOutputTime
+        rerender(_jsx(TestComponent, { isActive: true, isWaiting: false, isInteractiveShellWaiting: true, lastOutputTime: 4000 }));
+        // Advance another 3 seconds (total 6s from start, but only 3s from last output)
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(3000);
+        });
+        // Should STILL be witty phrase or tip because timer reset
+        expect([...WITTY_LOADING_PHRASES, ...INFORMATIVE_TIPS]).toContain(lastFrame());
+        // Advance another 2 seconds (total 5s from last output)
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(2000);
+        });
+        expect(lastFrame()).toBe(INTERACTIVE_SHELL_WAITING_PHRASE);
+    });
+    it('should prioritize interactive shell waiting over normal waiting after 5s', async () => {
+        const { lastFrame, rerender } = render(_jsx(TestComponent, { isActive: true, isWaiting: true }));
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(0);
+        });
+        expect(lastFrame()).toBe('Waiting for user confirmation...');
+        rerender(_jsx(TestComponent, { isActive: true, isWaiting: true, isInteractiveShellWaiting: true, lastOutputTime: 1 }));
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(5000);
+        });
+        expect(lastFrame()).toBe(INTERACTIVE_SHELL_WAITING_PHRASE);
+    });
     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();
@@ -42,14 +93,29 @@ describe('usePhraseCycler', () => {
         });
         expect(lastFrame()).toBe(initialPhrase);
     });
-    it('should cycle through witty phrases when isActive is true and not waiting', async () => {
-        vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty
+    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 }));
-        // Initial phrase should be one of the witty phrases
+        // Initial phrase on first activation should be a tip
         await act(async () => {
             await vi.advanceTimersByTimeAsync(0);
         });
+        expect(INFORMATIVE_TIPS).toContain(lastFrame());
+        // 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());
+    });
+    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
+        // 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);
         });
@@ -71,29 +137,30 @@ describe('usePhraseCycler', () => {
             return val;
         });
         const { lastFrame, rerender } = render(_jsx(TestComponent, { isActive: false, isWaiting: false, customPhrases: customPhrases }));
-        // Activate -> callCount 0 -> returns 0 -> 'Phrase A'
+        // 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 () => {
-            await vi.advanceTimersByTimeAsync(0);
+            await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS); // First interval after initial state -> callCount 0 -> 'Phrase A'
         });
-        expect(lastFrame()).toBe('Phrase A');
-        // Interval -> callCount 1 -> returns 0.99 -> 'Phrase B'
+        expect(customPhrases).toContain(lastFrame()); // 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(lastFrame()).toBe('Phrase B');
-        // Deactivate -> resets to customPhrases[0] -> 'Phrase A'
+        expect(customPhrases).toContain(lastFrame()); // Should be one of the custom phrases
+        // Deactivate -> resets to first phrase in sequence
         rerender(_jsx(TestComponent, { isActive: false, isWaiting: false, customPhrases: customPhrases }));
         await act(async () => {
             await vi.advanceTimersByTimeAsync(0);
         });
-        expect(lastFrame()).toBe('Phrase A');
-        // Activate again -> callCount 2 -> returns 0 -> 'Phrase A'
+        // The phrase should be the first phrase after reset
+        expect(customPhrases).toContain(lastFrame());
+        // 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 () => {
-            await vi.advanceTimersByTimeAsync(0);
+            await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS); // First interval after re-activation -> should contain phrase
         });
-        expect(lastFrame()).toBe('Phrase A');
+        expect(customPhrases).toContain(lastFrame()); // Should be one of the custom phrases
     });
     it('should clear phrase interval on unmount when active', () => {
         const { unmount } = render(_jsx(TestComponent, { isActive: true, isWaiting: false }));
@@ -104,39 +171,51 @@ describe('usePhraseCycler', () => {
     it('should use custom phrases when provided', async () => {
         const customPhrases = ['Custom Phrase 1', 'Custom Phrase 2'];
         const randomMock = vi.spyOn(Math, 'random');
-        randomMock.mockReturnValue(0);
         const { lastFrame, rerender } = render(_jsx(TestComponent, { isActive: true, isWaiting: false, customPhrases: customPhrases }));
-        expect(lastFrame()).toBe('Custom Phrase 1');
-        randomMock.mockReturnValue(0.99);
+        // After first interval, it should use custom phrases
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS + 100);
+        });
+        randomMock.mockReturnValue(0);
+        rerender(_jsx(TestComponent, { isActive: true, isWaiting: false, customPhrases: customPhrases }));
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS + 100);
         });
-        expect(lastFrame()).toBe('Custom Phrase 2');
+        expect(customPhrases).toContain(lastFrame());
+        randomMock.mockReturnValue(0.99);
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS);
+        });
+        expect(customPhrases).toContain(lastFrame());
         // 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 () => {
-            await vi.advanceTimersByTimeAsync(0);
+            await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS); // Wait for first cycle
         });
         expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
     });
     it('should fall back to witty phrases if custom phrases are an empty array', async () => {
-        vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty
+        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);
+            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
+        await act(async () => {
+            await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS); // Next phrase after tip
         });
         expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
     });
-    it('should reset to a witty phrase when transitioning from waiting to active', async () => {
-        vi.spyOn(Math, 'random').mockImplementation(() => 0.5); // Always witty
+    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);
+            await vi.advanceTimersByTimeAsync(0); // First activation will be a tip
         });
-        expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
-        // Cycle to a different phrase (potentially)
+        // First activation shows a tip, so we can't guarantee it's in WITTY_LOADING_PHRASES
+        // Cycle to a different phrase (should be witty due to mock)
         await act(async () => {
             await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS);
         });
@@ -147,10 +226,10 @@ describe('usePhraseCycler', () => {
             await vi.advanceTimersByTimeAsync(0);
         });
         expect(lastFrame()).toBe('Waiting for user confirmation...');
-        // Go back to active cycling - should pick a random witty phrase
+        // 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 () => {
-            await vi.advanceTimersByTimeAsync(0);
+            await vi.advanceTimersByTimeAsync(PHRASE_CHANGE_INTERVAL_MS); // Skip the tip and get next phrase
         });
         expect(WITTY_LOADING_PHRASES).toContain(lastFrame());
     });