@machina.ai/cell-cli 1.22.5-rc1 → 1.25.0-rc3

package/dist/src/ui/AppContainer.test.js

@@ -105,6 +105,7 @@ vi.mock('./contexts/SessionContext.js');
 vi.mock('./components/shared/text-buffer.js');
 vi.mock('./hooks/useLogger.js');
 vi.mock('./hooks/useInputHistoryStore.js');
+vi.mock('./hooks/useHookDisplayState.js');
 // Mock external utilities
 vi.mock('../utils/events.js');
 vi.mock('../utils/handleAutoUpdate.js');
@@ -131,6 +132,7 @@ import { useTextBuffer } from './components/shared/text-buffer.js';
 import { useLogger } from './hooks/useLogger.js';
 import { useLoadingIndicator } from './hooks/useLoadingIndicator.js';
 import { useInputHistoryStore } from './hooks/useInputHistoryStore.js';
+import { useHookDisplayState } from './hooks/useHookDisplayState.js';
 import { useKeypress } from './hooks/useKeypress.js';
 import { measureElement } from 'ink';
 import { useTerminalSize } from './hooks/useTerminalSize.js';
@@ -169,18 +171,13 @@ describe('AppContainer State Management', () => {
     const mockedUseLoadingIndicator = useLoadingIndicator;
     const mockedUseKeypress = useKeypress;
     const mockedUseInputHistoryStore = useInputHistoryStore;
+    const mockedUseHookDisplayState = useHookDisplayState;
     beforeEach(() => {
         vi.clearAllMocks();
+        mockIdeClient.getInstance.mockReturnValue(new Promise(() => { }));
         // Initialize mock stdout for terminal title tests
         mocks.mockStdout.write.mockClear();
-        // Mock computeWindowTitle function to centralize title logic testing
-        vi.mock('../utils/windowTitle.js', async () => ({
-            computeWindowTitle: vi.fn((folderName) => 
-            // Default behavior: return "Gemini - {folderName}" unless CLI_TITLE is set
-            process.env['CLI_TITLE'] || `Gemini - ${folderName}`),
-        }));
         capturedUIState = null;
-        capturedUIActions = null;
         // **Provide a default return value for EVERY mocked hook.**
         mockedUseQuotaAndFallback.mockReturnValue({
             proQuotaRequest: null,
@@ -290,6 +287,7 @@ describe('AppContainer State Management', () => {
             elapsedTime: '0.0s',
             currentLoadingPhrase: '',
         });
+        mockedUseHookDisplayState.mockReturnValue([]);
         // Mock Config
         mockConfig = makeFakeConfig();
         // Mock config's getTargetDir to return consistent workspace directory
@@ -328,6 +326,7 @@ describe('AppContainer State Management', () => {
     });
     afterEach(() => {
         cleanup();
+        vi.restoreAllMocks();
     });
     describe('Basic Rendering', () => {
         it('renders without crashing with minimal props', async () => {
@@ -843,7 +842,7 @@ describe('AppContainer State Management', () => {
             const { stdout } = useStdout();
             expect(stdout).toBe(mocks.mockStdout);
         });
-        it('should not update terminal title when showStatusInTitle is false', () => {
+        it('should update terminal title with Working… when showStatusInTitle is false', () => {
             // Arrange: Set up mock settings with showStatusInTitle disabled
             const mockSettingsWithShowStatusFalse = {
                 ...mockSettings,
@@ -856,13 +855,55 @@ describe('AppContainer State Management', () => {
                     },
                 },
             };
+            // Mock the streaming state as Active
+            mockedUseGeminiStream.mockReturnValue({
+                streamingState: 'responding',
+                submitQuery: vi.fn(),
+                initError: null,
+                pendingHistoryItems: [],
+                thought: { subject: 'Some thought' },
+                cancelOngoingRequest: vi.fn(),
+            });
             // Act: Render the container
             const { unmount } = renderAppContainer({
                 settings: mockSettingsWithShowStatusFalse,
             });
-            // Assert: Check that no title-related writes occurred
-            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]2;'));
-            expect(titleWrites).toHaveLength(0);
+            // Assert: Check that title was updated with "Working…"
+            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]0;'));
+            expect(titleWrites).toHaveLength(1);
+            expect(titleWrites[0][0]).toBe(`\x1b]0;${'✦  Working… (workspace)'.padEnd(80, ' ')}\x07`);
+            unmount();
+        });
+        it('should use legacy terminal title when dynamicWindowTitle is false', () => {
+            // Arrange: Set up mock settings with dynamicWindowTitle disabled
+            const mockSettingsWithDynamicTitleFalse = {
+                ...mockSettings,
+                merged: {
+                    ...mockSettings.merged,
+                    ui: {
+                        ...mockSettings.merged.ui,
+                        dynamicWindowTitle: false,
+                        hideWindowTitle: false,
+                    },
+                },
+            };
+            // Mock the streaming state
+            mockedUseGeminiStream.mockReturnValue({
+                streamingState: 'responding',
+                submitQuery: vi.fn(),
+                initError: null,
+                pendingHistoryItems: [],
+                thought: { subject: 'Some thought' },
+                cancelOngoingRequest: vi.fn(),
+            });
+            // Act: Render the container
+            const { unmount } = renderAppContainer({
+                settings: mockSettingsWithDynamicTitleFalse,
+            });
+            // Assert: Check that legacy title was used
+            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]0;'));
+            expect(titleWrites).toHaveLength(1);
+            expect(titleWrites[0][0]).toBe(`\x1b]0;${'Cell CLI (workspace)'.padEnd(80, ' ')}\x07`);
             unmount();
         });
         it('should not update terminal title when hideWindowTitle is true', () => {
@@ -883,7 +924,7 @@ describe('AppContainer State Management', () => {
                 settings: mockSettingsWithHideTitleTrue,
             });
             // Assert: Check that no title-related writes occurred
-            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]2;'));
+            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]0;'));
             expect(titleWrites).toHaveLength(0);
             unmount();
         });
@@ -914,10 +955,10 @@ describe('AppContainer State Management', () => {
             const { unmount } = renderAppContainer({
                 settings: mockSettingsWithTitleEnabled,
             });
-            // Assert: Check that title was updated with thought subject
-            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]2;'));
+            // Assert: Check that title was updated with thought subject and suffix
+            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]0;'));
             expect(titleWrites).toHaveLength(1);
-            expect(titleWrites[0][0]).toBe(`\x1b]2;${thoughtSubject.padEnd(80, ' ')}\x07`);
+            expect(titleWrites[0][0]).toBe(`\x1b]0;${`✦  ${thoughtSubject} (workspace)`.padEnd(80, ' ')}\x07`);
             unmount();
         });
         it('should update terminal title with default text when in Idle state and no thought subject', () => {
@@ -947,12 +988,12 @@ describe('AppContainer State Management', () => {
                 settings: mockSettingsWithTitleEnabled,
             });
             // Assert: Check that title was updated with default Idle text
-            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]2;'));
+            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]0;'));
             expect(titleWrites).toHaveLength(1);
-            expect(titleWrites[0][0]).toBe(`\x1b]2;${'Gemini - workspace'.padEnd(80, ' ')}\x07`);
+            expect(titleWrites[0][0]).toBe(`\x1b]0;${'◇  Ready (workspace)'.padEnd(80, ' ')}\x07`);
             unmount();
         });
-        it('should update terminal title when in WaitingForConfirmation state with thought subject', () => {
+        it('should update terminal title when in WaitingForConfirmation state with thought subject', async () => {
             // Arrange: Set up mock settings with showStatusInTitle enabled
             const mockSettingsWithTitleEnabled = {
                 ...mockSettings,
@@ -968,7 +1009,7 @@ describe('AppContainer State Management', () => {
             // Mock the streaming state and thought
             const thoughtSubject = 'Confirm tool execution';
             mockedUseGeminiStream.mockReturnValue({
-                streamingState: 'waitingForConfirmation',
+                streamingState: 'waiting_for_confirmation',
                 submitQuery: vi.fn(),
                 initError: null,
                 pendingHistoryItems: [],
@@ -976,15 +1017,146 @@ describe('AppContainer State Management', () => {
                 cancelOngoingRequest: vi.fn(),
             });
             // Act: Render the container
-            const { unmount } = renderAppContainer({
-                settings: mockSettingsWithTitleEnabled,
+            let unmount;
+            await act(async () => {
+                const result = renderAppContainer({
+                    settings: mockSettingsWithTitleEnabled,
+                });
+                unmount = result.unmount;
             });
             // Assert: Check that title was updated with confirmation text
-            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]2;'));
+            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]0;'));
             expect(titleWrites).toHaveLength(1);
-            expect(titleWrites[0][0]).toBe(`\x1b]2;${thoughtSubject.padEnd(80, ' ')}\x07`);
+            expect(titleWrites[0][0]).toBe(`\x1b]0;${'✋  Action Required (workspace)'.padEnd(80, ' ')}\x07`);
             unmount();
         });
+        describe('Shell Focus Action Required', () => {
+            beforeEach(() => {
+                vi.useFakeTimers();
+            });
+            afterEach(() => {
+                vi.useRealTimers();
+            });
+            it('should show Action Required in title after a delay when shell is awaiting focus', async () => {
+                const startTime = 1000000;
+                vi.setSystemTime(startTime);
+                // Arrange: Set up mock settings with showStatusInTitle enabled
+                const mockSettingsWithTitleEnabled = {
+                    ...mockSettings,
+                    merged: {
+                        ...mockSettings.merged,
+                        ui: {
+                            ...mockSettings.merged.ui,
+                            showStatusInTitle: true,
+                            hideWindowTitle: false,
+                        },
+                    },
+                };
+                // Mock an active shell pty but not focused
+                mockedUseGeminiStream.mockReturnValue({
+                    streamingState: 'responding',
+                    submitQuery: vi.fn(),
+                    initError: null,
+                    pendingHistoryItems: [],
+                    thought: { subject: 'Executing shell command' },
+                    cancelOngoingRequest: vi.fn(),
+                    activePtyId: 'pty-1',
+                    lastOutputTime: 0,
+                });
+                vi.spyOn(mockConfig, 'isInteractive').mockReturnValue(true);
+                vi.spyOn(mockConfig, 'isInteractiveShellEnabled').mockReturnValue(true);
+                // Act: Render the container (embeddedShellFocused is false by default in state)
+                const { unmount } = renderAppContainer({
+                    settings: mockSettingsWithTitleEnabled,
+                });
+                // Initially it should show the working status
+                const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]0;'));
+                expect(titleWrites[titleWrites.length - 1][0]).toContain('✦  Executing shell command');
+                // Fast-forward time by 40 seconds
+                await act(async () => {
+                    await vi.advanceTimersByTimeAsync(40000);
+                });
+                // Now it should show Action Required
+                const titleWritesDelayed = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]0;'));
+                const lastTitle = titleWritesDelayed[titleWritesDelayed.length - 1][0];
+                expect(lastTitle).toContain('✋  Action Required');
+                unmount();
+            });
+            it('should NOT show Action Required in title if shell is streaming output', async () => {
+                const startTime = 1000000;
+                vi.setSystemTime(startTime);
+                // Arrange: Set up mock settings with showStatusInTitle enabled
+                const mockSettingsWithTitleEnabled = {
+                    ...mockSettings,
+                    merged: {
+                        ...mockSettings.merged,
+                        ui: {
+                            ...mockSettings.merged.ui,
+                            showStatusInTitle: true,
+                            hideWindowTitle: false,
+                        },
+                    },
+                };
+                // Mock an active shell pty but not focused
+                let lastOutputTime = 1000;
+                mockedUseGeminiStream.mockImplementation(() => ({
+                    streamingState: 'responding',
+                    submitQuery: vi.fn(),
+                    initError: null,
+                    pendingHistoryItems: [],
+                    thought: { subject: 'Executing shell command' },
+                    cancelOngoingRequest: vi.fn(),
+                    activePtyId: 'pty-1',
+                    lastOutputTime,
+                }));
+                vi.spyOn(mockConfig, 'isInteractive').mockReturnValue(true);
+                vi.spyOn(mockConfig, 'isInteractiveShellEnabled').mockReturnValue(true);
+                // Act: Render the container
+                const { unmount, rerender } = renderAppContainer({
+                    settings: mockSettingsWithTitleEnabled,
+                });
+                // Fast-forward time by 20 seconds
+                await act(async () => {
+                    await vi.advanceTimersByTimeAsync(20000);
+                });
+                // Update lastOutputTime to simulate new output
+                lastOutputTime = 21000;
+                mockedUseGeminiStream.mockImplementation(() => ({
+                    streamingState: 'responding',
+                    submitQuery: vi.fn(),
+                    initError: null,
+                    pendingHistoryItems: [],
+                    thought: { subject: 'Executing shell command' },
+                    cancelOngoingRequest: vi.fn(),
+                    activePtyId: 'pty-1',
+                    lastOutputTime,
+                }));
+                // Rerender to propagate the new lastOutputTime
+                await act(async () => {
+                    rerender(getAppContainer({ settings: mockSettingsWithTitleEnabled }));
+                });
+                // Fast-forward time by another 20 seconds
+                // Total time elapsed: 40s.
+                // Time since last output: 20s.
+                // It should NOT show Action Required yet.
+                await act(async () => {
+                    await vi.advanceTimersByTimeAsync(20000);
+                });
+                const titleWritesAfterOutput = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]0;'));
+                const lastTitle = titleWritesAfterOutput[titleWritesAfterOutput.length - 1][0];
+                expect(lastTitle).not.toContain('✋  Action Required');
+                expect(lastTitle).toContain('✦  Executing shell command');
+                // Fast-forward another 40 seconds (Total 60s since last output)
+                await act(async () => {
+                    await vi.advanceTimersByTimeAsync(40000);
+                });
+                // Now it SHOULD show Action Required
+                const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]0;'));
+                const lastTitleFinal = titleWrites[titleWrites.length - 1][0];
+                expect(lastTitleFinal).toContain('✋  Action Required');
+                unmount();
+            });
+        });
         it('should pad title to exactly 80 characters', () => {
             // Arrange: Set up mock settings with showStatusInTitle enabled
             const mockSettingsWithTitleEnabled = {
@@ -1013,14 +1185,12 @@ describe('AppContainer State Management', () => {
                 settings: mockSettingsWithTitleEnabled,
             });
             // Assert: Check that title is padded to exactly 80 characters
-            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]2;'));
+            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]0;'));
             expect(titleWrites).toHaveLength(1);
             const calledWith = titleWrites[0][0];
-            const expectedTitle = shortTitle.padEnd(80, ' ');
-            expect(calledWith).toContain(shortTitle);
-            expect(calledWith).toContain('\x1b]2;');
-            expect(calledWith).toContain('\x07');
-            expect(calledWith).toBe('\x1b]2;' + expectedTitle + '\x07');
+            const expectedTitle = `✦  ${shortTitle} (workspace)`.padEnd(80, ' ');
+            const expectedEscapeSequence = `\x1b]0;${expectedTitle}\x07`;
+            expect(calledWith).toBe(expectedEscapeSequence);
             unmount();
         });
         it('should use correct ANSI escape code format', () => {
@@ -1051,30 +1221,30 @@ describe('AppContainer State Management', () => {
                 settings: mockSettingsWithTitleEnabled,
             });
             // Assert: Check that the correct ANSI escape sequence is used
-            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]2;'));
+            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]0;'));
             expect(titleWrites).toHaveLength(1);
-            const expectedEscapeSequence = `\x1b]2;${title.padEnd(80, ' ')}\x07`;
+            const expectedEscapeSequence = `\x1b]0;${`✦  ${title} (workspace)`.padEnd(80, ' ')}\x07`;
             expect(titleWrites[0][0]).toBe(expectedEscapeSequence);
             unmount();
         });
         it('should use CLI_TITLE environment variable when set', () => {
-            // Arrange: Set up mock settings with showStatusInTitle enabled
-            const mockSettingsWithTitleEnabled = {
+            // Arrange: Set up mock settings with showStatusInTitle disabled (so it shows suffix)
+            const mockSettingsWithTitleDisabled = {
                 ...mockSettings,
                 merged: {
                     ...mockSettings.merged,
                     ui: {
                         ...mockSettings.merged.ui,
-                        showStatusInTitle: true,
+                        showStatusInTitle: false,
                         hideWindowTitle: false,
                     },
                 },
             };
             // Mock CLI_TITLE environment variable
             vi.stubEnv('CLI_TITLE', 'Custom Gemini Title');
-            // Mock the streaming state as Idle with no thought
+            // Mock the streaming state
             mockedUseGeminiStream.mockReturnValue({
-                streamingState: 'idle',
+                streamingState: 'responding',
                 submitQuery: vi.fn(),
                 initError: null,
                 pendingHistoryItems: [],
@@ -1083,12 +1253,12 @@ describe('AppContainer State Management', () => {
             });
             // Act: Render the container
             const { unmount } = renderAppContainer({
-                settings: mockSettingsWithTitleEnabled,
+                settings: mockSettingsWithTitleDisabled,
             });
             // Assert: Check that title was updated with CLI_TITLE value
-            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]2;'));
+            const titleWrites = mocks.mockStdout.write.mock.calls.filter((call) => call[0].includes('\x1b]0;'));
             expect(titleWrites).toHaveLength(1);
-            expect(titleWrites[0][0]).toBe(`\x1b]2;${'Custom Gemini Title'.padEnd(80, ' ')}\x07`);
+            expect(titleWrites[0][0]).toBe(`\x1b]0;${'✦  Working… (Custom Gemini Title)'.padEnd(80, ' ')}\x07`);
             unmount();
         });
     });
@@ -1098,6 +1268,7 @@ describe('AppContainer State Management', () => {
         });
         afterEach(() => {
             vi.useRealTimers();
+            vi.restoreAllMocks();
         });
         it('should set and clear the queue error message after a timeout', async () => {
             const { rerender, unmount } = renderAppContainer();
@@ -1241,6 +1412,7 @@ describe('AppContainer State Management', () => {
         });
         afterEach(() => {
             vi.useRealTimers();
+            vi.restoreAllMocks();
         });
         describe('CTRL+C', () => {
             it('should cancel ongoing request on first press', async () => {
@@ -1341,6 +1513,7 @@ describe('AppContainer State Management', () => {
         });
         afterEach(() => {
             vi.useRealTimers();
+            vi.restoreAllMocks();
         });
         describe.each([
             {
@@ -1551,7 +1724,21 @@ describe('AppContainer State Management', () => {
                 handler({ model: 'new-model' });
             });
             // Assert: Verify model is updated
-            expect(capturedUIState.currentModel).toBe('new-model');
+            await waitFor(() => {
+                expect(capturedUIState.currentModel).toBe('new-model');
+            });
+            unmount();
+        });
+        it('provides activeHooks from useHookDisplayState', async () => {
+            const mockHooks = [{ name: 'hook1', eventName: 'event1' }];
+            mockedUseHookDisplayState.mockReturnValue(mockHooks);
+            let unmount;
+            await act(async () => {
+                const result = renderAppContainer();
+                unmount = result.unmount;
+            });
+            await waitFor(() => expect(capturedUIState).toBeTruthy());
+            expect(capturedUIState.activeHooks).toEqual(mockHooks);
             unmount();
         });
     });
@@ -1644,7 +1831,9 @@ describe('AppContainer State Management', () => {
             await act(async () => {
                 onCancelSubmit(true);
             });
-            expect(mockSetText).toHaveBeenCalledWith('previous message');
+            await waitFor(() => {
+                expect(mockSetText).toHaveBeenCalledWith('previous message');
+            });
             unmount();
         });
         it('input history is independent from conversation history (survives /clear)', async () => {