fix(cli): refine 'Action Required' indicator and focus hints (#16497)

packages/cli/src/ui/hooks/useGeminiStream.test.tsx

@@ -100,6 +100,8 @@ vi.mock('./useKeypress.js', () => ({
 vi.mock('./shellCommandProcessor.js', () => ({
   useShellCommandProcessor: vi.fn().mockReturnValue({
     handleShellCommand: vi.fn(),
+    activeShellPtyId: null,
+    lastShellOutputTime: 0,
   }),
 }));
 
@@ -238,6 +240,7 @@ describe('useGeminiStream', () => {
       mockMarkToolsAsSubmitted,
       vi.fn(), // setToolCallsForDisplay
       mockCancelAllToolCalls,
+      0, // lastToolOutputTime
     ]);
 
     // Reset mocks for GeminiClient instance methods (startChat and sendMessageStream)
@@ -2485,6 +2488,61 @@ describe('useGeminiStream', () => {
         'gemini-2.5-flash',
       );
     });
+
+    it('should update lastOutputTime on Gemini thought and content events', async () => {
+      vi.useFakeTimers();
+      const startTime = 1000000;
+      vi.setSystemTime(startTime);
+
+      // Mock a stream that yields a thought then content
+      mockSendMessageStream.mockReturnValue(
+        (async function* () {
+          yield {
+            type: ServerGeminiEventType.Thought,
+            value: { subject: 'Thinking...', description: '' },
+          };
+          // Advance time for the next event
+          vi.advanceTimersByTime(1000);
+          yield {
+            type: ServerGeminiEventType.Content,
+            value: 'Hello',
+          };
+        })(),
+      );
+
+      const { result } = renderHook(() =>
+        useGeminiStream(
+          new MockedGeminiClientClass(mockConfig),
+          [],
+          mockAddItem,
+          mockConfig,
+          mockLoadedSettings,
+          mockOnDebugMessage,
+          mockHandleSlashCommand,
+          false,
+          () => 'vscode' as EditorType,
+          () => {},
+          () => Promise.resolve(),
+          false,
+          () => {},
+          () => {},
+          () => {},
+          80,
+          24,
+        ),
+      );
+
+      // Submit query
+      await act(async () => {
+        await result.current.submitQuery('Test query');
+      });
+
+      // Verify lastOutputTime was updated
+      // It should be the time of the last event (startTime + 1000)
+      expect(result.current.lastOutputTime).toBe(startTime + 1000);
+
+      vi.useRealTimers();
+    });
   });
 
   describe('Loop Detection Confirmation', () => {

packages/cli/src/ui/hooks/useGeminiStream.ts

@@ -120,6 +120,8 @@ export const useGeminiStream = (
   const [thought, setThought] = useState<ThoughtSummary | null>(null);
   const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] =
     useStateAndRef<HistoryItemWithoutId | null>(null);
+  const [lastGeminiActivityTime, setLastGeminiActivityTime] =
+    useState<number>(0);
   const processedMemoryToolsRef = useRef<Set<string>>(new Set());
   const { startNewPrompt, getPromptCount } = useSessionStats();
   const storage = config.storage;
@@ -839,9 +841,11 @@ export const useGeminiStream = (
       for await (const event of stream) {
         switch (event.type) {
           case ServerGeminiEventType.Thought:
+            setLastGeminiActivityTime(Date.now());
             setThought(event.value);
             break;
           case ServerGeminiEventType.Content:
+            setLastGeminiActivityTime(Date.now());
             geminiMessageBuffer = handleContentEvent(
               event.value,
               geminiMessageBuffer,
@@ -1371,7 +1375,11 @@ export const useGeminiStream = (
     storage,
   ]);
 
-  const lastOutputTime = Math.max(lastToolOutputTime, lastShellOutputTime);
+  const lastOutputTime = Math.max(
+    lastToolOutputTime,
+    lastShellOutputTime,
+    lastGeminiActivityTime,
+  );
 
   return {
     streamingState,

packages/cli/src/ui/hooks/usePhraseCycler.ts

@@ -38,7 +38,7 @@ export const usePhraseCycler = (
     loadingPhrases[0],
   );
   const showShellFocusHint = useInactivityTimer(
-    isInteractiveShellWaiting && lastOutputTime > 0,
+    isInteractiveShellWaiting,
     lastOutputTime,
     SHELL_FOCUS_HINT_DELAY_MS,
   );