@machina.ai/cell-cli 1.38.1-rc2 → 1.40.1-rc2

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

@@ -0,0 +1,377 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { useState, useRef, useCallback, useEffect, useMemo } from 'react';
+import { getErrorMessage, MessageSenderType, debugLogger, geminiPartsToContentParts, displayContentToString, parseThought, CoreToolCallStatus, Kind, } from '@google/gemini-cli-core';
+import { StreamingState, MessageType } from '../types.js';
+import { findLastSafeSplitPoint } from '../utils/markdownUtilities.js';
+import { getToolGroupBorderAppearance } from '../utils/borderStyles.js';
+import {} from './useExecutionLifecycle.js';
+import { useSessionStats } from '../contexts/SessionContext.js';
+import { useStateAndRef } from './useStateAndRef.js';
+import {} from './useTurnActivityMonitor.js';
+/**
+ * useAgentStream implements the interactive agent loop using an AgentProtocol.
+ * It is completely agnostic to the specific agent implementation.
+ */
+export const useAgentStream = ({ agent, addItem, onCancelSubmit, isShellFocused, logger, }) => {
+    const [initError] = useState(null);
+    const [retryStatus] = useState(null);
+    const [streamingState, setStreamingState] = useState(StreamingState.Idle);
+    const [thought, setThought] = useState(null);
+    const [lastOutputTime, setLastOutputTime] = useState(Date.now());
+    const currentStreamIdRef = useRef(null);
+    const userMessageTimestampRef = useRef(0);
+    const geminiMessageBufferRef = useRef('');
+    const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
+    const [trackedTools, , setTrackedTools] = useStateAndRef([]);
+    const [pushedToolCallIds, pushedToolCallIdsRef, setPushedToolCallIds] = useStateAndRef(new Set());
+    const [_isFirstToolInGroup, isFirstToolInGroupRef, setIsFirstToolInGroup] = useStateAndRef(true);
+    const { startNewPrompt } = useSessionStats();
+    // TODO: Implement dynamic shell-related state derivation from trackedTools or dedicated refs.
+    // This includes activePtyId, backgroundTasks, and related visibility states to restore
+    // parity with legacy terminal focus detection and background task tracking.
+    // Note: Avoid checking ITERM_SESSION_ID for terminal detection and ensure context is sanitized.
+    const activePtyId = undefined;
+    const backgroundTaskCount = 0;
+    const isBackgroundTaskVisible = false;
+    const toggleBackgroundTasks = useCallback(() => { }, []);
+    const backgroundCurrentExecution = undefined;
+    const backgroundTasks = useMemo(() => new Map(), []);
+    const dismissBackgroundTask = useCallback(async (_pid) => { }, []);
+    // Use the trackedTools to mock pendingToolCalls for inactivity monitors
+    const pendingToolCalls = useMemo(() => trackedTools.map((t) => ({
+        request: {
+            name: t.originalRequestName || t.name,
+            args: { command: t.description },
+            callId: t.callId,
+            isClientInitiated: t.isClientInitiated ?? false,
+            prompt_id: '',
+        },
+        status: t.status,
+    })), [trackedTools]);
+    // TODO: Support LoopDetection confirmation requests
+    const [loopDetectionConfirmationRequest] = useState(null);
+    const flushPendingText = useCallback(() => {
+        if (pendingHistoryItemRef.current) {
+            addItem(pendingHistoryItemRef.current, userMessageTimestampRef.current);
+            setPendingHistoryItem(null);
+            geminiMessageBufferRef.current = '';
+        }
+    }, [addItem, pendingHistoryItemRef, setPendingHistoryItem]);
+    const cancelOngoingRequest = useCallback(async () => {
+        if (agent) {
+            await agent.abort();
+            setStreamingState(StreamingState.Idle);
+            onCancelSubmit(false);
+        }
+    }, [agent, onCancelSubmit]);
+    // TODO: Support native handleApprovalModeChange for Plan Mode
+    const handleApprovalModeChange = useCallback(async (newApprovalMode) => {
+        debugLogger.debug(`Approval mode changed to ${newApprovalMode} (stub)`);
+    }, []);
+    const handleEvent = useCallback((event) => {
+        setLastOutputTime(Date.now());
+        switch (event.type) {
+            case 'agent_start':
+                setStreamingState(StreamingState.Responding);
+                break;
+            case 'agent_end':
+                setStreamingState(StreamingState.Idle);
+                flushPendingText();
+                break;
+            case 'message':
+                if (event.role === 'agent') {
+                    for (const part of event.content) {
+                        if (part.type === 'text') {
+                            geminiMessageBufferRef.current += part.text;
+                            // Update pending history item with incremental text
+                            const splitPoint = findLastSafeSplitPoint(geminiMessageBufferRef.current);
+                            if (splitPoint === geminiMessageBufferRef.current.length) {
+                                setPendingHistoryItem({
+                                    type: 'gemini',
+                                    text: geminiMessageBufferRef.current,
+                                });
+                            }
+                            else {
+                                const before = geminiMessageBufferRef.current.substring(0, splitPoint);
+                                const after = geminiMessageBufferRef.current.substring(splitPoint);
+                                addItem({ type: 'gemini', text: before }, userMessageTimestampRef.current);
+                                geminiMessageBufferRef.current = after;
+                                setPendingHistoryItem({
+                                    type: 'gemini_content',
+                                    text: after,
+                                });
+                            }
+                        }
+                        else if (part.type === 'thought') {
+                            setThought(parseThought(part.thought));
+                        }
+                    }
+                }
+                break;
+            case 'tool_request': {
+                flushPendingText();
+                const legacyState = event._meta?.legacyState;
+                const displayName = legacyState?.displayName ?? event.name;
+                const isOutputMarkdown = legacyState?.isOutputMarkdown ?? false;
+                const desc = legacyState?.description ?? '';
+                const fallbackKind = Kind.Other;
+                const newCall = {
+                    callId: event.requestId,
+                    name: displayName,
+                    originalRequestName: event.name,
+                    description: desc,
+                    display: event.display,
+                    status: CoreToolCallStatus.Scheduled,
+                    isClientInitiated: false,
+                    renderOutputAsMarkdown: isOutputMarkdown,
+                    kind: legacyState?.kind ?? fallbackKind,
+                    confirmationDetails: undefined,
+                    resultDisplay: undefined,
+                };
+                setTrackedTools((prev) => [...prev, newCall]);
+                break;
+            }
+            case 'tool_update': {
+                setTrackedTools((prev) => prev.map((tc) => {
+                    if (tc.callId !== event.requestId)
+                        return tc;
+                    const legacyState = event._meta?.legacyState;
+                    const evtStatus = legacyState?.status;
+                    let status = tc.status;
+                    if (evtStatus === 'executing')
+                        status = CoreToolCallStatus.Executing;
+                    else if (evtStatus === 'error')
+                        status = CoreToolCallStatus.Error;
+                    else if (evtStatus === 'success')
+                        status = CoreToolCallStatus.Success;
+                    const display = event.display?.result;
+                    const liveOutput = displayContentToString(display) ?? tc.resultDisplay;
+                    const progressMessage = legacyState?.progressMessage ?? tc.progressMessage;
+                    const progress = legacyState?.progress ?? tc.progress;
+                    const progressTotal = legacyState?.progressTotal ?? tc.progressTotal;
+                    const ptyId = legacyState?.pid ?? tc.ptyId;
+                    const description = legacyState?.description ?? tc.description;
+                    return {
+                        ...tc,
+                        status,
+                        display: event.display
+                            ? { ...tc.display, ...event.display }
+                            : tc.display,
+                        resultDisplay: liveOutput,
+                        progressMessage,
+                        progress,
+                        progressTotal,
+                        ptyId,
+                        description,
+                    };
+                }));
+                break;
+            }
+            case 'tool_response': {
+                setTrackedTools((prev) => prev.map((tc) => {
+                    if (tc.callId !== event.requestId)
+                        return tc;
+                    const legacyState = event._meta?.legacyState;
+                    const outputFile = legacyState?.outputFile;
+                    const display = event.display?.result;
+                    const resultDisplay = displayContentToString(display) ?? tc.resultDisplay;
+                    return {
+                        ...tc,
+                        status: event.isError
+                            ? CoreToolCallStatus.Error
+                            : CoreToolCallStatus.Success,
+                        display: event.display
+                            ? { ...tc.display, ...event.display }
+                            : tc.display,
+                        resultDisplay,
+                        outputFile,
+                    };
+                }));
+                break;
+            }
+            case 'error':
+                addItem({ type: MessageType.ERROR, text: event.message }, userMessageTimestampRef.current);
+                break;
+            case 'initialize':
+            case 'session_update':
+            case 'elicitation_request':
+            case 'elicitation_response':
+            case 'usage':
+            case 'custom':
+                // These events are currently not handled in the UI
+                break;
+            default:
+                debugLogger.error('Unknown agent event type:', event);
+                event;
+                break;
+        }
+    }, [
+        addItem,
+        flushPendingText,
+        setPendingHistoryItem,
+        setTrackedTools,
+        setStreamingState,
+        setThought,
+        setLastOutputTime,
+    ]);
+    useEffect(() => {
+        const unsubscribe = agent?.subscribe(handleEvent);
+        return () => unsubscribe?.();
+    }, [agent, handleEvent]);
+    const submitQuery = useCallback(async (query, options, _prompt_id) => {
+        if (!agent)
+            return;
+        const timestamp = Date.now();
+        setLastOutputTime(timestamp);
+        userMessageTimestampRef.current = timestamp;
+        geminiMessageBufferRef.current = '';
+        if (!options?.isContinuation) {
+            if (typeof query === 'string') {
+                addItem({ type: MessageType.USER, text: query }, timestamp);
+                void logger?.logMessage(MessageSenderType.USER, query);
+            }
+            startNewPrompt();
+        }
+        const parts = geminiPartsToContentParts(typeof query === 'string' ? [{ text: query }] : query);
+        try {
+            const { streamId } = await agent.send({
+                message: { content: parts },
+            });
+            currentStreamIdRef.current = streamId;
+        }
+        catch (err) {
+            addItem({ type: MessageType.ERROR, text: getErrorMessage(err) }, timestamp);
+        }
+    }, [agent, addItem, logger, startNewPrompt]);
+    useEffect(() => {
+        if (trackedTools.length > 0) {
+            const isNewBatch = !trackedTools.some((tc) => pushedToolCallIdsRef.current.has(tc.callId));
+            if (isNewBatch) {
+                setPushedToolCallIds(new Set());
+                setIsFirstToolInGroup(true);
+            }
+        }
+        else if (streamingState === StreamingState.Idle) {
+            setPushedToolCallIds(new Set());
+            setIsFirstToolInGroup(true);
+        }
+    }, [
+        trackedTools,
+        pushedToolCallIdsRef,
+        setPushedToolCallIds,
+        setIsFirstToolInGroup,
+        streamingState,
+    ]);
+    // Push completed tools to history
+    useEffect(() => {
+        const toolsToPush = [];
+        for (let i = 0; i < trackedTools.length; i++) {
+            const tc = trackedTools[i];
+            if (pushedToolCallIdsRef.current.has(tc.callId))
+                continue;
+            if (tc.status === 'success' ||
+                tc.status === 'error' ||
+                tc.status === 'cancelled') {
+                toolsToPush.push(tc);
+            }
+            else {
+                break;
+            }
+        }
+        if (toolsToPush.length > 0) {
+            const newPushed = new Set(pushedToolCallIdsRef.current);
+            for (const tc of toolsToPush) {
+                newPushed.add(tc.callId);
+            }
+            const isLastInBatch = toolsToPush[toolsToPush.length - 1] ===
+                trackedTools[trackedTools.length - 1];
+            const appearance = getToolGroupBorderAppearance({ type: 'tool_group', tools: trackedTools }, activePtyId, !!isShellFocused, [], backgroundTasks);
+            const historyItem = {
+                type: 'tool_group',
+                tools: toolsToPush,
+                borderTop: isFirstToolInGroupRef.current,
+                borderBottom: isLastInBatch,
+                ...appearance,
+            };
+            addItem(historyItem);
+            setPushedToolCallIds(newPushed);
+            setIsFirstToolInGroup(false);
+        }
+    }, [
+        trackedTools,
+        pushedToolCallIdsRef,
+        isFirstToolInGroupRef,
+        setPushedToolCallIds,
+        setIsFirstToolInGroup,
+        addItem,
+        activePtyId,
+        isShellFocused,
+        backgroundTasks,
+    ]);
+    const pendingToolGroupItems = useMemo(() => {
+        const remainingTools = trackedTools.filter((tc) => !pushedToolCallIds.has(tc.callId));
+        const items = [];
+        const appearance = getToolGroupBorderAppearance({ type: 'tool_group', tools: trackedTools }, activePtyId, !!isShellFocused, [], backgroundTasks);
+        if (remainingTools.length > 0) {
+            items.push({
+                type: 'tool_group',
+                tools: remainingTools,
+                borderTop: pushedToolCallIds.size === 0,
+                borderBottom: false,
+                ...appearance,
+            });
+        }
+        const allTerminal = trackedTools.length > 0 &&
+            trackedTools.every((tc) => tc.status === 'success' ||
+                tc.status === 'error' ||
+                tc.status === 'cancelled');
+        const allPushed = trackedTools.length > 0 &&
+            trackedTools.every((tc) => pushedToolCallIds.has(tc.callId));
+        const anyVisibleInHistory = pushedToolCallIds.size > 0;
+        const anyVisibleInPending = remainingTools.length > 0;
+        if (trackedTools.length > 0 &&
+            !(allTerminal && allPushed) &&
+            (anyVisibleInHistory || anyVisibleInPending)) {
+            items.push({
+                type: 'tool_group',
+                tools: [],
+                borderTop: false,
+                borderBottom: true,
+                ...appearance,
+            });
+        }
+        return items;
+    }, [
+        trackedTools,
+        pushedToolCallIds,
+        activePtyId,
+        isShellFocused,
+        backgroundTasks,
+    ]);
+    const pendingHistoryItems = useMemo(() => [pendingHistoryItem, ...pendingToolGroupItems].filter((i) => i !== undefined && i !== null), [pendingHistoryItem, pendingToolGroupItems]);
+    return {
+        streamingState,
+        submitQuery,
+        initError,
+        pendingHistoryItems,
+        thought,
+        cancelOngoingRequest,
+        pendingToolCalls,
+        handleApprovalModeChange,
+        activePtyId,
+        loopDetectionConfirmationRequest,
+        lastOutputTime,
+        backgroundTaskCount,
+        isBackgroundTaskVisible,
+        toggleBackgroundTasks,
+        backgroundCurrentExecution,
+        backgroundTasks,
+        retryStatus,
+        dismissBackgroundTask,
+    };
+};
+//# sourceMappingURL=useAgentStream.js.map

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

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

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

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

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

@@ -0,0 +1,161 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { act } from 'react';
+import { renderHookWithProviders } from '../../test-utils/render.js';
+// --- MOCKS ---
+const mockLegacyAgentProtocol = vi.hoisted(() => ({
+    send: vi.fn().mockResolvedValue({ streamId: 'test-stream-id' }),
+    subscribe: vi.fn().mockReturnValue(() => { }),
+    abort: vi.fn().mockResolvedValue(undefined),
+}));
+vi.mock('../contexts/SessionContext.js', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        useSessionStats: vi.fn(() => ({
+            startNewPrompt: vi.fn(),
+        })),
+    };
+});
+// --- END MOCKS ---
+import { useAgentStream } from './useAgentStream.js';
+import { MessageType, StreamingState } from '../types.js';
+describe('useAgentStream', () => {
+    const mockAddItem = vi.fn();
+    const mockOnCancelSubmit = vi.fn();
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    it('should initialize on mount', async () => {
+        await renderHookWithProviders(() => useAgentStream({
+            agent: mockLegacyAgentProtocol,
+            addItem: mockAddItem,
+            onCancelSubmit: mockOnCancelSubmit,
+            isShellFocused: false,
+        }));
+        expect(mockLegacyAgentProtocol.subscribe).toHaveBeenCalled();
+    });
+    it('should call agent.send when submitQuery is called', async () => {
+        const { result } = await renderHookWithProviders(() => useAgentStream({
+            agent: mockLegacyAgentProtocol,
+            addItem: mockAddItem,
+            onCancelSubmit: mockOnCancelSubmit,
+            isShellFocused: false,
+        }));
+        await act(async () => {
+            await result.current.submitQuery('hello');
+        });
+        expect(mockLegacyAgentProtocol.send).toHaveBeenCalledWith({
+            message: { content: [{ type: 'text', text: 'hello' }] },
+        });
+        expect(mockAddItem).toHaveBeenCalledWith(expect.objectContaining({ type: MessageType.USER, text: 'hello' }), expect.any(Number));
+    });
+    it('should update streamingState based on agent_start and agent_end events', async () => {
+        const { result } = await renderHookWithProviders(() => useAgentStream({
+            agent: mockLegacyAgentProtocol,
+            addItem: mockAddItem,
+            onCancelSubmit: mockOnCancelSubmit,
+            isShellFocused: false,
+        }));
+        const eventHandler = vi.mocked(mockLegacyAgentProtocol.subscribe).mock
+            .calls[0][0];
+        expect(result.current.streamingState).toBe(StreamingState.Idle);
+        act(() => {
+            eventHandler({
+                type: 'agent_start',
+                id: '1',
+                timestamp: '',
+                streamId: '',
+            });
+        });
+        expect(result.current.streamingState).toBe(StreamingState.Responding);
+        act(() => {
+            eventHandler({
+                type: 'agent_end',
+                reason: 'completed',
+                id: '2',
+                timestamp: '',
+                streamId: '',
+            });
+        });
+        expect(result.current.streamingState).toBe(StreamingState.Idle);
+    });
+    it('should accumulate text content and update pendingHistoryItems', async () => {
+        const { result } = await renderHookWithProviders(() => useAgentStream({
+            agent: mockLegacyAgentProtocol,
+            addItem: mockAddItem,
+            onCancelSubmit: mockOnCancelSubmit,
+            isShellFocused: false,
+        }));
+        const eventHandler = vi.mocked(mockLegacyAgentProtocol.subscribe).mock
+            .calls[0][0];
+        act(() => {
+            eventHandler({
+                type: 'message',
+                role: 'agent',
+                content: [{ type: 'text', text: 'Hello' }],
+                id: '1',
+                timestamp: '',
+                streamId: '',
+            });
+        });
+        expect(result.current.pendingHistoryItems).toHaveLength(1);
+        expect(result.current.pendingHistoryItems[0]).toMatchObject({
+            type: 'gemini',
+            text: 'Hello',
+        });
+        act(() => {
+            eventHandler({
+                type: 'message',
+                role: 'agent',
+                content: [{ type: 'text', text: ' world' }],
+                id: '2',
+                timestamp: '',
+                streamId: '',
+            });
+        });
+        expect(result.current.pendingHistoryItems[0].text).toBe('Hello world');
+    });
+    it('should process thought events and update thought state', async () => {
+        const { result } = await renderHookWithProviders(() => useAgentStream({
+            agent: mockLegacyAgentProtocol,
+            addItem: mockAddItem,
+            onCancelSubmit: mockOnCancelSubmit,
+            isShellFocused: false,
+        }));
+        const eventHandler = vi.mocked(mockLegacyAgentProtocol.subscribe).mock
+            .calls[0][0];
+        act(() => {
+            eventHandler({
+                type: 'message',
+                role: 'agent',
+                content: [{ type: 'thought', thought: '**Thinking** about tests' }],
+                id: '1',
+                timestamp: '',
+                streamId: '',
+            });
+        });
+        expect(result.current.thought).toEqual({
+            subject: 'Thinking',
+            description: 'about tests',
+        });
+    });
+    it('should call agent.abort when cancelOngoingRequest is called', async () => {
+        const { result } = await renderHookWithProviders(() => useAgentStream({
+            agent: mockLegacyAgentProtocol,
+            addItem: mockAddItem,
+            onCancelSubmit: mockOnCancelSubmit,
+            isShellFocused: false,
+        }));
+        await act(async () => {
+            await result.current.cancelOngoingRequest();
+        });
+        expect(mockLegacyAgentProtocol.abort).toHaveBeenCalled();
+        expect(mockOnCancelSubmit).toHaveBeenCalledWith(false);
+    });
+});
+//# sourceMappingURL=useAgentStream.test.js.map

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

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

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

@@ -3,7 +3,7 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-import { useEffect, useReducer, useRef } from 'react';
+import { useCallback, useEffect, useReducer, useRef } from 'react';
 import { setTimeout as setTimeoutPromise } from 'node:timers/promises';
 import * as path from 'node:path';
 import { FileSearchFactory, escapePath, FileDiscoveryService, } from '@google/gemini-cli-core';
@@ -149,21 +149,39 @@ export function useAtCompletion(props) {
     useEffect(() => {
         setIsLoadingSuggestions(state.isLoading);
     }, [state.isLoading, setIsLoadingSuggestions]);
-    const resetFileSearchState = () => {
+    const disposeFileSearchers = useCallback(async () => {
+        const searchers = [...fileSearchMap.current.values()];
         fileSearchMap.current.clear();
         initEpoch.current += 1;
+        const closePromises = [];
+        for (const searcher of searchers) {
+            if (searcher.close) {
+                closePromises.push(searcher.close());
+            }
+        }
+        await Promise.all(closePromises);
+    }, []);
+    const resetFileSearchState = useCallback(() => {
+        void disposeFileSearchers();
         dispatch({ type: 'RESET' });
-    };
+    }, [disposeFileSearchers]);
     useEffect(() => {
         resetFileSearchState();
-    }, [cwd, config]);
+    }, [cwd, config, resetFileSearchState]);
     useEffect(() => {
         const workspaceContext = config?.getWorkspaceContext?.();
         if (!workspaceContext)
             return;
         const unsubscribe = workspaceContext.onDirectoriesChanged(resetFileSearchState);
         return unsubscribe;
-    }, [config]);
+    }, [config, resetFileSearchState]);
+    useEffect(() => () => {
+        void disposeFileSearchers();
+        searchAbortController.current?.abort();
+        if (slowSearchTimer.current) {
+            clearTimeout(slowSearchTimer.current);
+        }
+    }, [disposeFileSearchers]);
     // Reacts to user input (`pattern`) ONLY.
     useEffect(() => {
         if (!enabled) {
@@ -206,6 +224,7 @@ export function useAtCompletion(props) {
                         fileDiscoveryService: new FileDiscoveryService(dir, config?.getFileFilteringOptions()),
                         cache: true,
                         cacheTtl: 30,
+                        enableFileWatcher: config?.getFileFilteringOptions()?.enableFileWatcher ?? false,
                         enableRecursiveFileSearch: config?.getEnableRecursiveFileSearch() ?? true,
                         enableFuzzySearch: config?.getFileFilteringEnableFuzzySearch() ?? true,
                         maxFiles: config?.getFileFilteringOptions()?.maxFileCount,