@machina.ai/cell-cli 1.64.0-rc3 → 1.66.0-rc1

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

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

@@ -23,7 +23,7 @@ export declare const useGeminiStream: (geminiClient: GeminiClient, history: Hist
     initError: string | null;
     pendingHistoryItems: HistoryItemWithoutId[];
     thought: ThoughtSummary | null;
-    cancelOngoingRequest: (clearBuffer?: boolean) => void;
+    cancelOngoingRequest: (clearBuffer?: boolean) => Promise<void>;
     pendingToolCalls: TrackedToolCall[];
     handleApprovalModeChange: (newApprovalMode: ApprovalMode) => Promise<void>;
     activePtyId: number | undefined;

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

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { useState, useRef, useCallback, useEffect, useMemo } from 'react';
-import { GeminiEventType as ServerGeminiEventType, getErrorMessage, isNodeError, isAuthenticationError, MessageSenderType, logUserPrompt, GitService, UserPromptEvent, uiTelemetryService, DEFAULT_GEMINI_FLASH_MODEL, logConversationFinishedEvent, ConversationFinishedEvent, ApprovalMode, parseAndFormatApiError, ToolConfirmationOutcome, MessageBusType, promptIdContext, tokenLimit, debugLogger, runInDevTraceSpan, EDIT_TOOL_NAMES, SHELL_TOOL_NAME, hasRedirection, processRestorableToolCalls, recordToolCallInteractions, ToolErrorType, ValidationRequiredError, coreEvents, CoreEvent, CoreToolCallStatus, buildUserSteeringHintPrompt, GeminiCliOperation, getPlanModeExitMessage, isBackgroundExecutionData, Kind, ACTIVATE_SKILL_TOOL_NAME, isRenderedInHistory, buildToolVisibilityContext, UPDATE_TOPIC_TOOL_NAME, UPDATE_TOPIC_DISPLAY_NAME, THINKING_ONLY_COMPRESS_SUGGESTION, MAX_TOKENS_EXCEEDED_SUGGESTION, SAFETY_BLOCKED_MESSAGE, RECITATION_BLOCKED_MESSAGE, OTHER_BLOCKED_MESSAGE, TRUE_EMPTY_RESPONSE_MESSAGE, } from '@google/gemini-cli-core';
+import { GeminiEventType as ServerGeminiEventType, getErrorMessage, isNodeError, isAuthenticationError, MessageSenderType, logUserPrompt, GitService, UserPromptEvent, uiTelemetryService, DEFAULT_GEMINI_FLASH_MODEL, logConversationFinishedEvent, ConversationFinishedEvent, ApprovalMode, parseAndFormatApiError, ToolConfirmationOutcome, MessageBusType, promptIdContext, tokenLimit, debugLogger, runInDevTraceSpan, EDIT_TOOL_NAMES, SHELL_TOOL_NAME, hasRedirection, processRestorableToolCalls, recordToolCallInteractions, ToolErrorType, ValidationRequiredError, coreEvents, CoreEvent, CoreToolCallStatus, buildUserSteeringHintPrompt, GeminiCliOperation, getPlanModeExitMessage, isBackgroundExecutionData, ACTIVATE_SKILL_TOOL_NAME, isRenderedInHistory, buildToolVisibilityContext, UPDATE_TOPIC_TOOL_NAME, UPDATE_TOPIC_DISPLAY_NAME, THINKING_ONLY_COMPRESS_SUGGESTION, MAX_TOKENS_EXCEEDED_SUGGESTION, SAFETY_BLOCKED_MESSAGE, RECITATION_BLOCKED_MESSAGE, OTHER_BLOCKED_MESSAGE, TRUE_EMPTY_RESPONSE_MESSAGE, } from '@google/gemini-cli-core';
 import { FinishReason } from '@google/genai';
 import { StreamingState, MessageType, mapCoreStatusToDisplayStatus, ToolCallStatus, } from '../types.js';
 import { isAtCommand, isSlashCommand } from '../utils/commandUtils.js';
@@ -24,6 +24,7 @@ import { promises as fs } from 'node:fs';
 import path from 'node:path';
 import { useSessionStats } from '../contexts/SessionContext.js';
 import { useKeypress } from './useKeypress.js';
+import { createCancelledToolCall } from './useAgentStream.js';
 const isTopicTool = (name) => name === UPDATE_TOPIC_TOOL_NAME || name === UPDATE_TOPIC_DISPLAY_NAME;
 var StreamProcessingStatus;
 (function (StreamProcessingStatus) {
@@ -31,6 +32,11 @@ var StreamProcessingStatus;
     StreamProcessingStatus[StreamProcessingStatus["UserCancelled"] = 1] = "UserCancelled";
     StreamProcessingStatus[StreamProcessingStatus["Error"] = 2] = "Error";
 })(StreamProcessingStatus || (StreamProcessingStatus = {}));
+var CancellationState;
+(function (CancellationState) {
+    CancellationState["Idle"] = "idle";
+    CancellationState["Cancelling"] = "cancelling";
+})(CancellationState || (CancellationState = {}));
 const SUPPRESSED_TOOL_ERRORS_NOTE = 'Some internal tool attempts failed before this final error. Press F12 for diagnostics, or run /settings and change "Error Verbosity" to full for details.';
 const LOW_VERBOSITY_FAILURE_NOTE = 'This request failed. Press F12 for diagnostics, or run /settings and change "Error Verbosity" to full for full details.';
 function getBackgroundedToolInfo(toolCall) {
@@ -101,6 +107,10 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
     const lowVerbosityFailureNoteShownRef = useRef(false);
     const abortControllerRef = useRef(null);
     const turnCancelledRef = useRef(false);
+    const pendingToolCallRequestsRef = useRef([]);
+    const activeSchedulePromiseRef = useRef(null);
+    const cancellationStateRef = useRef(CancellationState.Idle);
+    const cancelPromiseRef = useRef(Promise.resolve());
     const activeQueryIdRef = useRef(null);
     const previousApprovalModeRef = useRef(config.getApprovalMode());
     const [isResponding, isRespondingRef, setIsResponding] = useStateAndRef(false);
@@ -131,6 +141,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
     }, [isRespondingRef]);
     const [toolCalls, scheduleToolCalls, markToolsAsSubmitted, setToolCallsForDisplay, cancelAllToolCalls, lastToolOutputTime,] = useToolScheduler(async (completedToolCallsFromScheduler) => {
         // This onComplete is called when ALL scheduled tools for a given batch are done.
+        pendingToolCallRequestsRef.current = [];
         if (completedToolCallsFromScheduler.length > 0) {
             // Add only the tools that haven't been pushed to history yet.
             const toolsToPush = completedToolCallsFromScheduler.filter((tc) => !pushedToolCallIdsRef.current.has(tc.request.callId));
@@ -160,13 +171,23 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
             setToolCallsForDisplay([]);
             // Record tool calls with full metadata before sending responses.
             try {
-                const currentModel = config.getGeminiClient().getCurrentSequenceModel() ??
-                    config.getModel();
-                config
-                    .getGeminiClient()
-                    .getChat()
-                    .recordCompletedToolCalls(currentModel, completedToolCallsFromScheduler);
-                await recordToolCallInteractions(config, completedToolCallsFromScheduler);
+                const client = geminiClient ?? config.getGeminiClient();
+                const currentModel = client?.getCurrentSequenceModel?.() ?? config.getModel();
+                const normalizedCompletedCalls = completedToolCallsFromScheduler.map((tc) => {
+                    if (tc.status === CoreToolCallStatus.Cancelled &&
+                        (!tc.response?.responseParts ||
+                            tc.response.responseParts.length === 0)) {
+                        return {
+                            ...tc,
+                            response: createCancelledToolCall(tc.request, tc.tool, tc.invocation).response,
+                        };
+                    }
+                    return tc;
+                });
+                client
+                    ?.getChat?.()
+                    ?.recordCompletedToolCalls(currentModel, normalizedCompletedCalls);
+                await recordToolCallInteractions(config, normalizedCompletedCalls);
             }
             catch (error) {
                 debugLogger.warn(`Error recording completed tool call information: ${error}`);
@@ -209,44 +230,20 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
     ]);
     // Push completed tools to history as they finish
     useEffect(() => {
+        const isFinished = (tc) => tc.status === 'success' ||
+            tc.status === 'error' ||
+            tc.status === 'cancelled';
         const toolsToPush = [];
-        for (let i = 0; i < toolCalls.length; i++) {
-            const tc = toolCalls[i];
+        for (const tc of toolCalls) {
             if (pushedToolCallIdsRef.current.has(tc.request.callId))
                 continue;
-            if (tc.status === 'success' ||
-                tc.status === 'error' ||
-                tc.status === 'cancelled') {
-                // TODO(#22883): This lookahead logic is a tactical UI fix to prevent parallel agents
-                // from tearing visually when they finish at slightly different times.
-                // Architecturally, `useGeminiStream` should not be responsible for stitching
-                // together semantic batches using timing/refs. `packages/core` should be
-                // refactored to emit structured `ToolBatch` or `Turn` objects, and this layer
-                // should simply render those semantic boundaries.
-                // If this is an agent tool, look ahead to ensure all subsequent
-                // contiguous agents in the same batch are also finished before pushing.
-                const isAgent = tc.tool?.kind === Kind.Agent;
-                if (isAgent) {
-                    let contigAgentsComplete = true;
-                    for (let j = i + 1; j < toolCalls.length; j++) {
-                        const nextTc = toolCalls[j];
-                        if (nextTc.tool?.kind === Kind.Agent) {
-                            if (nextTc.status !== 'success' &&
-                                nextTc.status !== 'error' &&
-                                nextTc.status !== 'cancelled') {
-                                contigAgentsComplete = false;
-                                break;
-                            }
-                        }
-                        else {
-                            // End of the contiguous agent block
-                            break;
-                        }
-                    }
-                    if (!contigAgentsComplete) {
-                        // Wait for the entire contiguous block of agents to finish
-                        break;
-                    }
+            if (isFinished(tc)) {
+                // Calls that share a group ID are presented together, so wait until
+                // every call in the group has finished before pushing any of them.
+                const { groupId } = tc.request;
+                if (groupId !== undefined &&
+                    toolCalls.some((other) => other.request.groupId === groupId && !isFinished(other))) {
+                    break;
                 }
                 toolsToPush.push(tc);
             }
@@ -260,22 +257,18 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
             const isFirstInThisPush = isFirstToolInGroupRef.current;
             const isCompactModeEnabled = settings.merged.ui?.compactToolOutput === true;
             const groups = [];
-            let currentGroup = [];
+            let currentGroupId;
             for (const tc of toolsToPush) {
                 newPushed.add(tc.request.callId);
-                if (tc.tool?.kind === Kind.Agent) {
-                    currentGroup.push(tc);
+                // Calls that share a group ID are adjacent and go into one history item.
+                const { groupId } = tc.request;
+                if (groupId !== undefined && groupId === currentGroupId) {
+                    groups[groups.length - 1].push(tc);
                 }
                 else {
-                    if (currentGroup.length > 0) {
-                        groups.push(currentGroup);
-                        currentGroup = [];
-                    }
                     groups.push([tc]);
                 }
-            }
-            if (currentGroup.length > 0) {
-                groups.push(currentGroup);
+                currentGroupId = groupId;
             }
             for (let i = 0; i < groups.length; i++) {
                 const group = groups[i];
@@ -480,17 +473,27 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         }, userMessageTimestamp);
         lowVerbosityFailureNoteShownRef.current = true;
     }, [addItem, config, isLowErrorVerbosity]);
-    const cancelOngoingRequest = useCallback((clearBuffer = true) => {
+    const cancelOngoingRequest = useCallback(async (clearBuffer = true) => {
         // If we are already cancelled, do nothing
         if (turnCancelledRef.current) {
             if (clearBuffer) {
                 onCancelSubmit(false, true);
             }
+            if (cancellationStateRef.current === CancellationState.Cancelling) {
+                try {
+                    await cancelPromiseRef.current;
+                }
+                catch (error) {
+                    debugLogger.warn(`Error awaiting schedulePromise on cancel: ${error}`);
+                }
+            }
             return;
         }
-        const hasActiveTools = toolCalls.some((tc) => tc.status === CoreToolCallStatus.Executing ||
-            tc.status === CoreToolCallStatus.Scheduled ||
-            tc.status === CoreToolCallStatus.Validating);
+        const hasActiveTools = pendingToolCallRequestsRef.current.length > 0 ||
+            toolCalls.some((tc) => tc.status === CoreToolCallStatus.Executing ||
+                tc.status === CoreToolCallStatus.Scheduled ||
+                tc.status === CoreToolCallStatus.Validating ||
+                tc.status === CoreToolCallStatus.AwaitingApproval);
         // If we are not responding, not waiting for confirmation, and have no active tools,
         // there is nothing to abort.
         if (streamingState === StreamingState.Idle &&
@@ -517,6 +520,76 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         abortControllerRef.current.abort();
         // 2. Call the imperative cancel to clear the queue of pending tools.
         cancelAllToolCalls(abortControllerRef.current.signal);
+        // 3. Immediately synthesize and record filler/cancelled functionResponses in
+        // session history so that even if the process exits or a tool hangs, the
+        // session log does not end with an unanswered model functionCall turn.
+        try {
+            const client = geminiClient ?? config.getGeminiClient?.();
+            const chat = client?.getChat?.();
+            if (chat) {
+                const seenCallIds = new Set();
+                const synthesizedCalls = [];
+                for (const tc of toolCalls) {
+                    if (tc.request.isClientInitiated) {
+                        continue;
+                    }
+                    const isAlreadySubmitted = (tc.status === CoreToolCallStatus.Success ||
+                        tc.status === CoreToolCallStatus.Error ||
+                        tc.status === CoreToolCallStatus.Cancelled) &&
+                        tc
+                            .responseSubmittedToGemini;
+                    if (isAlreadySubmitted) {
+                        seenCallIds.add(tc.request.callId);
+                        continue;
+                    }
+                    seenCallIds.add(tc.request.callId);
+                    if ((tc.status === CoreToolCallStatus.Success ||
+                        tc.status === CoreToolCallStatus.Error ||
+                        tc.status === CoreToolCallStatus.Cancelled) &&
+                        (tc.response?.responseParts?.length ?? 0) > 0) {
+                        synthesizedCalls.push(tc);
+                    }
+                    else {
+                        synthesizedCalls.push(createCancelledToolCall(tc.request, tc.tool, 'invocation' in tc ? tc.invocation : undefined));
+                    }
+                }
+                for (const req of pendingToolCallRequestsRef.current) {
+                    if (req.isClientInitiated || seenCallIds.has(req.callId)) {
+                        continue;
+                    }
+                    seenCallIds.add(req.callId);
+                    synthesizedCalls.push(createCancelledToolCall(req));
+                }
+                const clientHistory = client?.getHistory?.() ?? [];
+                const lastTurn = clientHistory.at(-1);
+                if (lastTurn?.role === 'model' && Array.isArray(lastTurn.parts)) {
+                    let index = 0;
+                    for (const part of lastTurn.parts) {
+                        const fc = part.functionCall;
+                        if (fc?.name) {
+                            const callId = fc.id ?? `${fc.name}-${Date.now()}-${index++}`;
+                            if (!seenCallIds.has(callId)) {
+                                seenCallIds.add(callId);
+                                synthesizedCalls.push(createCancelledToolCall({
+                                    callId,
+                                    name: fc.name,
+                                    args: fc.args ?? {},
+                                    isClientInitiated: false,
+                                    prompt_id: lastPromptIdRef.current ?? '',
+                                }));
+                            }
+                        }
+                    }
+                }
+                if (synthesizedCalls.length > 0) {
+                    const currentModel = client?.getCurrentSequenceModel?.() ?? config.getModel?.() ?? '';
+                    chat.recordCompletedToolCalls(currentModel, synthesizedCalls);
+                }
+            }
+        }
+        catch (error) {
+            debugLogger.warn(`Error recording cancelled tool calls on abort: ${error}`);
+        }
         if (pendingHistoryItemRef.current) {
             // If it is a shell command, we update the status to Canceled and clear the output
             // to avoid artifacts, then add it to history immediately.
@@ -560,6 +633,34 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         }
         onCancelSubmit(false, clearBuffer);
         setShellInputFocused(false);
+        const schedulePromise = activeSchedulePromiseRef.current;
+        if (schedulePromise) {
+            cancellationStateRef.current = CancellationState.Cancelling;
+            const cancelTask = (async () => {
+                let timeoutId;
+                try {
+                    await Promise.race([
+                        Promise.resolve(schedulePromise).catch(() => { }),
+                        new Promise((resolve) => {
+                            timeoutId = setTimeout(resolve, 1000);
+                        }),
+                    ]);
+                }
+                finally {
+                    if (timeoutId !== undefined) {
+                        clearTimeout(timeoutId);
+                    }
+                    cancellationStateRef.current = CancellationState.Idle;
+                }
+            })();
+            cancelPromiseRef.current = cancelTask;
+            try {
+                await cancelTask;
+            }
+            catch (error) {
+                debugLogger.warn(`Error awaiting schedulePromise on cancel: ${error}`);
+            }
+        }
     }, [
         streamingState,
         addItem,
@@ -572,10 +673,12 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         toolCalls,
         activeShellPtyId,
         setIsResponding,
+        geminiClient,
+        config,
     ]);
     useKeypress((key) => {
         if (key.name === 'escape' && !isShellFocused) {
-            cancelOngoingRequest(false);
+            void cancelOngoingRequest(false);
             return true;
         }
         return false;
@@ -1009,6 +1112,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
                     break;
                 case ServerGeminiEventType.ToolCallRequest:
                     toolCallRequests.push(event.value);
+                    pendingToolCallRequestsRef.current.push(event.value);
                     break;
                 case ServerGeminiEventType.UserCancelled:
                     handleUserCancelledEvent(userMessageTimestamp);
@@ -1067,7 +1171,17 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
                 addItem(pendingHistoryItemRef.current, userMessageTimestamp);
                 setPendingHistoryItem(null);
             }
-            await scheduleToolCalls(toolCallRequests, signal);
+            const schedulePromise = Promise.resolve(scheduleToolCalls(toolCallRequests, signal));
+            activeSchedulePromiseRef.current = schedulePromise;
+            try {
+                await schedulePromise;
+            }
+            finally {
+                if (activeSchedulePromiseRef.current === schedulePromise) {
+                    activeSchedulePromiseRef.current = null;
+                }
+                pendingToolCallRequestsRef.current = [];
+            }
         }
         else {
             const hasVisibleText = geminiMessageBuffer.trim().length > 0;
@@ -1120,6 +1234,7 @@ export const useGeminiStream = (geminiClient, history, addItem, config, settings
         const userMessageTimestamp = Date.now();
         // Reset quota error flag when starting a new query (not a continuation)
         if (!options?.isContinuation) {
+            pendingToolCallRequestsRef.current = [];
             autoNudgeAttemptCountRef.current = 0;
             setModelSwitchedFromQuotaError(false);
             config.setQuotaErrorOccurred(false);