@machina.ai/cell-cli 1.64.0-rc2 → 1.66.0-rc1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.js +14 -9
- package/dist/index.js.map +1 -1
- package/dist/package.json +4 -4
- package/dist/src/acp/acpSession.js +9 -13
- package/dist/src/acp/acpSession.js.map +1 -1
- package/dist/src/acp/acpSession.test.js +88 -0
- package/dist/src/acp/acpSession.test.js.map +1 -1
- package/dist/src/commands/mcp/add.js +14 -6
- package/dist/src/commands/mcp/add.js.map +1 -1
- package/dist/src/commands/mcp/add.test.js +61 -0
- package/dist/src/commands/mcp/add.test.js.map +1 -1
- package/dist/src/commands/mcp/remove.js +14 -1
- package/dist/src/commands/mcp/remove.js.map +1 -1
- package/dist/src/commands/mcp/remove.test.js +63 -0
- package/dist/src/commands/mcp/remove.test.js.map +1 -1
- package/dist/src/config/config.js +12 -0
- package/dist/src/config/config.js.map +1 -1
- package/dist/src/config/config.test.js +17 -0
- package/dist/src/config/config.test.js.map +1 -1
- package/dist/src/config/envDefaults.d.ts +20 -0
- package/dist/src/config/envDefaults.js +29 -0
- package/dist/src/config/envDefaults.js.map +1 -0
- package/dist/src/config/envDefaults.test.d.ts +6 -0
- package/dist/src/config/envDefaults.test.js +23 -0
- package/dist/src/config/envDefaults.test.js.map +1 -0
- package/dist/src/config/extension-manager.js +13 -4
- package/dist/src/config/extension-manager.js.map +1 -1
- package/dist/src/config/extension.test.js +117 -0
- package/dist/src/config/extension.test.js.map +1 -1
- package/dist/src/config/extensions/github.test.js +34 -0
- package/dist/src/config/extensions/github.test.js.map +1 -1
- package/dist/src/config/extensions/github_fetch.js +110 -18
- package/dist/src/config/extensions/github_fetch.js.map +1 -1
- package/dist/src/config/extensions/github_fetch.test.js +251 -36
- package/dist/src/config/extensions/github_fetch.test.js.map +1 -1
- package/dist/src/config/settings.d.ts +1 -0
- package/dist/src/config/settings.js +148 -58
- package/dist/src/config/settings.js.map +1 -1
- package/dist/src/config/settings.test.js +300 -0
- package/dist/src/config/settings.test.js.map +1 -1
- package/dist/src/config/settingsSchema.d.ts +1 -1
- package/dist/src/config/settingsSchema.js +6 -1
- package/dist/src/config/settingsSchema.js.map +1 -1
- package/dist/src/gemini.test.js +69 -0
- package/dist/src/gemini.test.js.map +1 -1
- package/dist/src/generated/git-commit.d.ts +2 -2
- package/dist/src/generated/git-commit.js +2 -2
- package/dist/src/interactiveCli.js +8 -3
- package/dist/src/interactiveCli.js.map +1 -1
- package/dist/src/services/CommandService.js +1 -1
- package/dist/src/services/CommandService.js.map +1 -1
- package/dist/src/services/CommandService.test.js +18 -1
- package/dist/src/services/CommandService.test.js.map +1 -1
- package/dist/src/services/SlashCommandConflictHandler.d.ts +1 -0
- package/dist/src/services/SlashCommandConflictHandler.js +18 -2
- package/dist/src/services/SlashCommandConflictHandler.js.map +1 -1
- package/dist/src/services/SlashCommandConflictHandler.test.js +85 -8
- package/dist/src/services/SlashCommandConflictHandler.test.js.map +1 -1
- package/dist/src/ui/AppContainer.js +254 -12
- package/dist/src/ui/AppContainer.js.map +1 -1
- package/dist/src/ui/AppContainer.test.js +362 -6
- package/dist/src/ui/AppContainer.test.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.js +21 -5
- package/dist/src/ui/auth/AuthDialog.js.map +1 -1
- package/dist/src/ui/auth/AuthDialog.test.js +83 -0
- package/dist/src/ui/auth/AuthDialog.test.js.map +1 -1
- package/dist/src/ui/auth/useAuth.js +7 -1
- package/dist/src/ui/auth/useAuth.js.map +1 -1
- package/dist/src/ui/auth/useAuth.test.js +9 -0
- package/dist/src/ui/auth/useAuth.test.js.map +1 -1
- package/dist/src/ui/commands/marketplaceCommand.js +92 -4
- package/dist/src/ui/commands/marketplaceCommand.js.map +1 -1
- package/dist/src/ui/commands/marketplaceCommand.test.js +98 -1
- package/dist/src/ui/commands/marketplaceCommand.test.js.map +1 -1
- package/dist/src/ui/components/AsciiArt.d.ts +6 -6
- package/dist/src/ui/components/AsciiArt.js +6 -6
- package/dist/src/ui/components/CliSpinner.d.ts +3 -2
- package/dist/src/ui/components/CliSpinner.js +27 -3
- package/dist/src/ui/components/CliSpinner.js.map +1 -1
- package/dist/src/ui/components/CliSpinner.test.js +42 -3
- package/dist/src/ui/components/CliSpinner.test.js.map +1 -1
- package/dist/src/ui/components/Composer.js +3 -3
- package/dist/src/ui/components/Composer.js.map +1 -1
- package/dist/src/ui/components/Composer.test.js +39 -1
- package/dist/src/ui/components/Composer.test.js.map +1 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.js +5 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.js.map +1 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.test.js +19 -1
- package/dist/src/ui/components/DetailedMessagesDisplay.test.js.map +1 -1
- package/dist/src/ui/components/Footer.js +1 -1
- package/dist/src/ui/components/Footer.js.map +1 -1
- package/dist/src/ui/components/GeminiRespondingSpinner.d.ts +1 -1
- package/dist/src/ui/components/GeminiRespondingSpinner.js +9 -2
- package/dist/src/ui/components/GeminiRespondingSpinner.js.map +1 -1
- package/dist/src/ui/components/GeminiSpinner.d.ts +1 -1
- package/dist/src/ui/components/GeminiSpinner.js +18 -7
- package/dist/src/ui/components/GeminiSpinner.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.js +5 -2
- package/dist/src/ui/components/HistoryItemDisplay.js.map +1 -1
- package/dist/src/ui/components/HistoryItemDisplay.test.js +21 -0
- package/dist/src/ui/components/HistoryItemDisplay.test.js.map +1 -1
- package/dist/src/ui/components/LoadingIndicator.d.ts +1 -1
- package/dist/src/ui/components/LoadingIndicator.js +4 -2
- package/dist/src/ui/components/LoadingIndicator.js.map +1 -1
- package/dist/src/ui/components/MainContent.js +47 -9
- package/dist/src/ui/components/MainContent.js.map +1 -1
- package/dist/src/ui/components/MainContent.test.js +87 -1
- package/dist/src/ui/components/MainContent.test.js.map +1 -1
- package/dist/src/ui/components/MemoryUsageDisplay.js +8 -4
- package/dist/src/ui/components/MemoryUsageDisplay.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.js +30 -16
- package/dist/src/ui/components/ModelDialog.js.map +1 -1
- package/dist/src/ui/components/ModelDialog.test.js +32 -24
- package/dist/src/ui/components/ModelDialog.test.js.map +1 -1
- package/dist/src/ui/components/StatusRow.d.ts +7 -6
- package/dist/src/ui/components/StatusRow.js +24 -10
- package/dist/src/ui/components/StatusRow.js.map +1 -1
- package/dist/src/ui/components/ValidationDialog.js +13 -6
- package/dist/src/ui/components/ValidationDialog.js.map +1 -1
- package/dist/src/ui/components/ValidationDialog.test.js +40 -0
- package/dist/src/ui/components/ValidationDialog.test.js.map +1 -1
- package/dist/src/ui/components/messages/DenseToolMessage.js +17 -12
- package/dist/src/ui/components/messages/DenseToolMessage.js.map +1 -1
- package/dist/src/ui/components/messages/DenseToolMessage.test.js +71 -0
- package/dist/src/ui/components/messages/DenseToolMessage.test.js.map +1 -1
- package/dist/src/ui/components/messages/ToolResultDisplay.js +14 -11
- package/dist/src/ui/components/messages/ToolResultDisplay.js.map +1 -1
- package/dist/src/ui/components/messages/ToolResultDisplay.test.js +32 -0
- package/dist/src/ui/components/messages/ToolResultDisplay.test.js.map +1 -1
- package/dist/src/ui/components/shared/MaxSizedBox.js +8 -2
- package/dist/src/ui/components/shared/MaxSizedBox.js.map +1 -1
- package/dist/src/ui/components/shared/MaxSizedBox.test.js +23 -1
- package/dist/src/ui/components/shared/MaxSizedBox.test.js.map +1 -1
- package/dist/src/ui/contexts/ToolActionsContext.js +7 -1
- package/dist/src/ui/contexts/ToolActionsContext.js.map +1 -1
- package/dist/src/ui/contexts/ToolActionsContext.test.js +54 -1
- package/dist/src/ui/contexts/ToolActionsContext.test.js.map +1 -1
- package/dist/src/ui/hooks/atCommandProcessor.d.ts +2 -1
- package/dist/src/ui/hooks/atCommandProcessor.js +15 -15
- package/dist/src/ui/hooks/atCommandProcessor.js.map +1 -1
- package/dist/src/ui/hooks/useAgentStream.d.ts +9 -2
- package/dist/src/ui/hooks/useAgentStream.js +173 -8
- package/dist/src/ui/hooks/useAgentStream.js.map +1 -1
- package/dist/src/ui/hooks/useAgentStream.test.js +104 -1
- package/dist/src/ui/hooks/useAgentStream.test.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.d.ts +1 -1
- package/dist/src/ui/hooks/useGeminiStream.js +174 -59
- package/dist/src/ui/hooks/useGeminiStream.js.map +1 -1
- package/dist/src/ui/hooks/useGeminiStream.test.js +230 -3
- package/dist/src/ui/hooks/useGeminiStream.test.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.d.ts +2 -1
- package/dist/src/ui/hooks/useLoadingIndicator.js +3 -3
- package/dist/src/ui/hooks/useLoadingIndicator.js.map +1 -1
- package/dist/src/ui/hooks/useLoadingIndicator.test.js +23 -4
- package/dist/src/ui/hooks/useLoadingIndicator.test.js.map +1 -1
- package/dist/src/ui/hooks/useReverseSearchCompletion.js +10 -6
- package/dist/src/ui/hooks/useReverseSearchCompletion.js.map +1 -1
- package/dist/src/ui/hooks/useReverseSearchCompletion.test.js +49 -0
- package/dist/src/ui/hooks/useReverseSearchCompletion.test.js.map +1 -1
- package/dist/src/ui/key/keyBindings.js +19 -6
- package/dist/src/ui/key/keyBindings.js.map +1 -1
- package/dist/src/ui/key/keyBindings.test.js +106 -0
- package/dist/src/ui/key/keyBindings.test.js.map +1 -1
- package/dist/src/ui/utils/formatters.d.ts +2 -0
- package/dist/src/ui/utils/formatters.js +13 -5
- package/dist/src/ui/utils/formatters.js.map +1 -1
- package/dist/src/ui/utils/formatters.test.js +18 -0
- package/dist/src/ui/utils/formatters.test.js.map +1 -1
- package/dist/src/utils/activityLogger.js +109 -33
- package/dist/src/utils/activityLogger.js.map +1 -1
- package/dist/src/utils/activityLogger.test.js +441 -0
- package/dist/src/utils/activityLogger.test.js.map +1 -1
- package/dist/src/utils/handleAutoUpdate.d.ts +4 -1
- package/dist/src/utils/handleAutoUpdate.js +45 -3
- package/dist/src/utils/handleAutoUpdate.js.map +1 -1
- package/dist/src/utils/handleAutoUpdate.test.js +280 -2
- package/dist/src/utils/handleAutoUpdate.test.js.map +1 -1
- package/dist/src/utils/nodeVersion.d.ts +11 -0
- package/dist/src/utils/nodeVersion.js +42 -0
- package/dist/src/utils/nodeVersion.js.map +1 -0
- package/dist/src/utils/nodeVersion.test.d.ts +6 -0
- package/dist/src/utils/nodeVersion.test.js +35 -0
- package/dist/src/utils/nodeVersion.test.js.map +1 -0
- package/dist/src/utils/processUtils.d.ts +23 -0
- package/dist/src/utils/processUtils.js +72 -0
- package/dist/src/utils/processUtils.js.map +1 -1
- package/dist/src/utils/processUtils.test.js +95 -1
- package/dist/src/utils/processUtils.test.js.map +1 -1
- package/dist/src/utils/relaunch.js +8 -6
- package/dist/src/utils/relaunch.js.map +1 -1
- package/dist/src/utils/relaunch.test.js +107 -1
- package/dist/src/utils/relaunch.test.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
* SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
*/
|
|
6
6
|
import { useState, useRef, useCallback, useEffect, useMemo } from 'react';
|
|
7
|
-
import { getErrorMessage, MessageSenderType, debugLogger, geminiPartsToContentParts, displayContentToString, parseThought, CoreToolCallStatus, Kind, } from '@google/gemini-cli-core';
|
|
7
|
+
import { getErrorMessage, MessageSenderType, debugLogger, geminiPartsToContentParts, displayContentToString, parseThought, CoreToolCallStatus, ToolErrorType, Kind, } from '@google/gemini-cli-core';
|
|
8
8
|
import { StreamingState, MessageType } from '../types.js';
|
|
9
9
|
import { findLastSafeSplitPoint } from '../utils/markdownUtilities.js';
|
|
10
10
|
import { getToolGroupBorderAppearance } from '../utils/borderStyles.js';
|
|
@@ -13,11 +13,54 @@ import { useSessionStats } from '../contexts/SessionContext.js';
|
|
|
13
13
|
import { useStateAndRef } from './useStateAndRef.js';
|
|
14
14
|
import {} from './useTurnActivityMonitor.js';
|
|
15
15
|
import { useKeypress } from './useKeypress.js';
|
|
16
|
+
export const CANCELLED_TOOL_ERROR_MESSAGE = '[Operation Cancelled] Reason: User cancelled operation';
|
|
17
|
+
/**
|
|
18
|
+
* Synthesizes a cancelled CompletedToolCall with a filler functionResponse part
|
|
19
|
+
* so that aborted tool calls can be recorded cleanly in the session history.
|
|
20
|
+
*/
|
|
21
|
+
export function createCancelledToolCall(request, tool, invocation) {
|
|
22
|
+
const fallbackToolName = request.name.trim() || 'generic_tool';
|
|
23
|
+
return {
|
|
24
|
+
status: CoreToolCallStatus.Cancelled,
|
|
25
|
+
request,
|
|
26
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
|
|
27
|
+
tool: (tool ?? {
|
|
28
|
+
name: fallbackToolName,
|
|
29
|
+
displayName: fallbackToolName,
|
|
30
|
+
}),
|
|
31
|
+
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
|
|
32
|
+
invocation: (invocation ?? {
|
|
33
|
+
getDescription: () => fallbackToolName,
|
|
34
|
+
}),
|
|
35
|
+
response: {
|
|
36
|
+
callId: request.callId,
|
|
37
|
+
responseParts: [
|
|
38
|
+
{
|
|
39
|
+
functionResponse: {
|
|
40
|
+
id: request.callId,
|
|
41
|
+
name: request.name,
|
|
42
|
+
response: {
|
|
43
|
+
error: CANCELLED_TOOL_ERROR_MESSAGE,
|
|
44
|
+
},
|
|
45
|
+
},
|
|
46
|
+
},
|
|
47
|
+
],
|
|
48
|
+
resultDisplay: undefined,
|
|
49
|
+
error: new Error(CANCELLED_TOOL_ERROR_MESSAGE),
|
|
50
|
+
errorType: ToolErrorType.UNHANDLED_EXCEPTION,
|
|
51
|
+
},
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
var CancellationState;
|
|
55
|
+
(function (CancellationState) {
|
|
56
|
+
CancellationState["Idle"] = "idle";
|
|
57
|
+
CancellationState["Cancelling"] = "cancelling";
|
|
58
|
+
})(CancellationState || (CancellationState = {}));
|
|
16
59
|
/**
|
|
17
60
|
* useAgentStream implements the interactive agent loop using an AgentProtocol.
|
|
18
61
|
* It is completely agnostic to the specific agent implementation.
|
|
19
62
|
*/
|
|
20
|
-
export const useAgentStream = ({ agent, addItem, onCancelSubmit, isShellFocused, logger, }) => {
|
|
63
|
+
export const useAgentStream = ({ agent, config, addItem, onCancelSubmit, isShellFocused, logger, }) => {
|
|
21
64
|
const [initError] = useState(null);
|
|
22
65
|
const [retryStatus] = useState(null);
|
|
23
66
|
const [streamingState, setStreamingState] = useState(StreamingState.Idle);
|
|
@@ -27,7 +70,10 @@ export const useAgentStream = ({ agent, addItem, onCancelSubmit, isShellFocused,
|
|
|
27
70
|
const userMessageTimestampRef = useRef(0);
|
|
28
71
|
const geminiMessageBufferRef = useRef('');
|
|
29
72
|
const [pendingHistoryItem, pendingHistoryItemRef, setPendingHistoryItem] = useStateAndRef(null);
|
|
30
|
-
const [trackedTools, , setTrackedTools] = useStateAndRef([]);
|
|
73
|
+
const [trackedTools, trackedToolsRef, setTrackedTools] = useStateAndRef([]);
|
|
74
|
+
const toolRequestArgsRef = useRef(new Map());
|
|
75
|
+
const cancellationStateRef = useRef(CancellationState.Idle);
|
|
76
|
+
const cancelPromiseRef = useRef(Promise.resolve());
|
|
31
77
|
const [pushedToolCallIds, pushedToolCallIdsRef, setPushedToolCallIds] = useStateAndRef(new Set());
|
|
32
78
|
const [_isFirstToolInGroup, isFirstToolInGroupRef, setIsFirstToolInGroup] = useStateAndRef(true);
|
|
33
79
|
const [_hasEmittedBoxInTurn, hasEmittedBoxInTurnRef, setHasEmittedBoxInTurn] = useStateAndRef(false);
|
|
@@ -64,12 +110,129 @@ export const useAgentStream = ({ agent, addItem, onCancelSubmit, isShellFocused,
|
|
|
64
110
|
}
|
|
65
111
|
}, [addItem, pendingHistoryItemRef, setPendingHistoryItem]);
|
|
66
112
|
const cancelOngoingRequest = useCallback(async (clearBuffer = true) => {
|
|
67
|
-
if (agent) {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
113
|
+
if (!agent) {
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
if (cancellationStateRef.current === CancellationState.Cancelling) {
|
|
117
|
+
if (clearBuffer) {
|
|
118
|
+
onCancelSubmit(false, true);
|
|
119
|
+
}
|
|
120
|
+
try {
|
|
121
|
+
await cancelPromiseRef.current;
|
|
122
|
+
}
|
|
123
|
+
catch (error) {
|
|
124
|
+
debugLogger.warn(`Error awaiting cancelTask: ${error}`);
|
|
125
|
+
}
|
|
126
|
+
return;
|
|
127
|
+
}
|
|
128
|
+
cancellationStateRef.current = CancellationState.Cancelling;
|
|
129
|
+
const cancelTask = (async () => {
|
|
130
|
+
try {
|
|
131
|
+
let timeoutId;
|
|
132
|
+
try {
|
|
133
|
+
await Promise.race([
|
|
134
|
+
agent.abort(),
|
|
135
|
+
new Promise((resolve) => {
|
|
136
|
+
timeoutId = setTimeout(resolve, 1000);
|
|
137
|
+
}),
|
|
138
|
+
]);
|
|
139
|
+
}
|
|
140
|
+
finally {
|
|
141
|
+
if (timeoutId !== undefined) {
|
|
142
|
+
clearTimeout(timeoutId);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
const unpushedTools = trackedToolsRef.current.filter((tc) => !pushedToolCallIdsRef.current.has(tc.callId));
|
|
146
|
+
if (unpushedTools.length > 0) {
|
|
147
|
+
setTrackedTools((prev) => prev.map((tc) => {
|
|
148
|
+
if (!pushedToolCallIdsRef.current.has(tc.callId) &&
|
|
149
|
+
tc.status !== CoreToolCallStatus.Success &&
|
|
150
|
+
tc.status !== CoreToolCallStatus.Error &&
|
|
151
|
+
tc.status !== CoreToolCallStatus.Cancelled) {
|
|
152
|
+
return {
|
|
153
|
+
...tc,
|
|
154
|
+
status: CoreToolCallStatus.Cancelled,
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
return tc;
|
|
158
|
+
}));
|
|
159
|
+
}
|
|
160
|
+
try {
|
|
161
|
+
const client = config?.getGeminiClient?.();
|
|
162
|
+
const chat = client?.getChat?.();
|
|
163
|
+
if (chat) {
|
|
164
|
+
const seenCallIds = new Set();
|
|
165
|
+
const synthesizedCalls = [];
|
|
166
|
+
for (const tc of unpushedTools) {
|
|
167
|
+
if (tc.isClientInitiated) {
|
|
168
|
+
continue;
|
|
169
|
+
}
|
|
170
|
+
seenCallIds.add(tc.callId);
|
|
171
|
+
const name = tc.originalRequestName || tc.name;
|
|
172
|
+
const args = toolRequestArgsRef.current.get(tc.callId) ?? {};
|
|
173
|
+
synthesizedCalls.push(createCancelledToolCall({
|
|
174
|
+
callId: tc.callId,
|
|
175
|
+
name,
|
|
176
|
+
args,
|
|
177
|
+
isClientInitiated: false,
|
|
178
|
+
prompt_id: '',
|
|
179
|
+
}));
|
|
180
|
+
}
|
|
181
|
+
const clientHistory = client?.getHistory?.() ?? [];
|
|
182
|
+
const lastTurn = clientHistory.at(-1);
|
|
183
|
+
if (lastTurn?.role === 'model' && Array.isArray(lastTurn.parts)) {
|
|
184
|
+
let index = 0;
|
|
185
|
+
for (const part of lastTurn.parts) {
|
|
186
|
+
const fc = part.functionCall;
|
|
187
|
+
if (fc?.name) {
|
|
188
|
+
const callId = fc.id ?? `${fc.name}-${Date.now()}-${index++}`;
|
|
189
|
+
if (!seenCallIds.has(callId)) {
|
|
190
|
+
seenCallIds.add(callId);
|
|
191
|
+
synthesizedCalls.push(createCancelledToolCall({
|
|
192
|
+
callId,
|
|
193
|
+
name: fc.name,
|
|
194
|
+
args: fc.args ?? {},
|
|
195
|
+
isClientInitiated: false,
|
|
196
|
+
prompt_id: '',
|
|
197
|
+
}));
|
|
198
|
+
}
|
|
199
|
+
}
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
if (synthesizedCalls.length > 0) {
|
|
203
|
+
const currentModel = client?.getCurrentSequenceModel?.() ??
|
|
204
|
+
config?.getModel?.() ??
|
|
205
|
+
'';
|
|
206
|
+
chat.recordCompletedToolCalls(currentModel, synthesizedCalls);
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
}
|
|
210
|
+
catch (error) {
|
|
211
|
+
debugLogger.warn(`Error recording cancelled tool calls in agent stream: ${error}`);
|
|
212
|
+
}
|
|
213
|
+
setStreamingState(StreamingState.Idle);
|
|
214
|
+
onCancelSubmit(false, clearBuffer);
|
|
215
|
+
}
|
|
216
|
+
finally {
|
|
217
|
+
cancellationStateRef.current = CancellationState.Idle;
|
|
218
|
+
}
|
|
219
|
+
})();
|
|
220
|
+
cancelPromiseRef.current = cancelTask;
|
|
221
|
+
try {
|
|
222
|
+
await cancelTask;
|
|
71
223
|
}
|
|
72
|
-
|
|
224
|
+
catch (error) {
|
|
225
|
+
debugLogger.warn(`Error awaiting cancelTask: ${error}`);
|
|
226
|
+
}
|
|
227
|
+
}, [
|
|
228
|
+
agent,
|
|
229
|
+
config,
|
|
230
|
+
onCancelSubmit,
|
|
231
|
+
pushedToolCallIdsRef,
|
|
232
|
+
setStreamingState,
|
|
233
|
+
setTrackedTools,
|
|
234
|
+
trackedToolsRef,
|
|
235
|
+
]);
|
|
73
236
|
// TODO: Support native handleApprovalModeChange for Plan Mode
|
|
74
237
|
const handleApprovalModeChange = useCallback(async (newApprovalMode) => {
|
|
75
238
|
debugLogger.debug(`Approval mode changed to ${newApprovalMode} (stub)`);
|
|
@@ -116,6 +279,7 @@ export const useAgentStream = ({ agent, addItem, onCancelSubmit, isShellFocused,
|
|
|
116
279
|
break;
|
|
117
280
|
case 'tool_request': {
|
|
118
281
|
flushPendingText();
|
|
282
|
+
toolRequestArgsRef.current.set(event.requestId, event.args);
|
|
119
283
|
const legacyState = event._meta?.legacyState;
|
|
120
284
|
const displayName = legacyState?.displayName ?? event.name;
|
|
121
285
|
const isOutputMarkdown = legacyState?.isOutputMarkdown ?? false;
|
|
@@ -246,6 +410,7 @@ export const useAgentStream = ({ agent, addItem, onCancelSubmit, isShellFocused,
|
|
|
246
410
|
userMessageTimestampRef.current = timestamp;
|
|
247
411
|
geminiMessageBufferRef.current = '';
|
|
248
412
|
if (!options?.isContinuation) {
|
|
413
|
+
toolRequestArgsRef.current.clear();
|
|
249
414
|
if (typeof query === 'string') {
|
|
250
415
|
addItem({ type: MessageType.USER, text: query }, timestamp);
|
|
251
416
|
void logger?.logMessage(MessageSenderType.USER, query);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAgentStream.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useAgentStream.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC1E,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,WAAW,EACX,yBAAyB,EACzB,sBAAsB,EACtB,YAAY,EACZ,kBAAkB,EAElB,IAAI,GAOL,MAAM,yBAAyB,CAAC;AAOjC,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,4BAA4B,EAAE,MAAM,0BAA0B,CAAC;AACxE,OAAO,EAAuB,MAAM,4BAA4B,CAAC;AAEjE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAA+B,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAa/C;;;GAGG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAC7B,KAAK,EACL,OAAO,EACP,cAAc,EACd,cAAc,EACd,MAAM,GACgB,EAAE,EAAE;IAC1B,MAAM,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAgB,IAAI,CAAC,CAAC;IAClD,MAAM,CAAC,WAAW,CAAC,GAAG,QAAQ,CAA6B,IAAI,CAAC,CAAC;IACjE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAClD,cAAc,CAAC,IAAI,CACpB,CAAC;IACF,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAwB,IAAI,CAAC,CAAC;IACpE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAS,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;IAEzE,MAAM,kBAAkB,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAC;IACvD,MAAM,uBAAuB,GAAG,MAAM,CAAS,CAAC,CAAC,CAAC;IAClD,MAAM,sBAAsB,GAAG,MAAM,CAAS,EAAE,CAAC,CAAC;IAClD,MAAM,CAAC,kBAAkB,EAAE,qBAAqB,EAAE,qBAAqB,CAAC,GACtE,cAAc,CAA8B,IAAI,CAAC,CAAC;IAEpD,MAAM,CAAC,YAAY,EAAE,AAAD,EAAG,eAAe,CAAC,GAAG,cAAc,CAEtD,EAAE,CAAC,CAAC;IACN,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,EAAE,oBAAoB,CAAC,GACnE,cAAc,CAAc,IAAI,GAAG,EAAE,CAAC,CAAC;IACzC,MAAM,CAAC,mBAAmB,EAAE,qBAAqB,EAAE,qBAAqB,CAAC,GACvE,cAAc,CAAU,IAAI,CAAC,CAAC;IAChC,MAAM,CAAC,oBAAoB,EAAE,sBAAsB,EAAE,sBAAsB,CAAC,GAC1E,cAAc,CAAU,KAAK,CAAC,CAAC;IAEjC,MAAM,EAAE,cAAc,EAAE,GAAG,eAAe,EAAE,CAAC;IAE7C,8FAA8F;IAC9F,uFAAuF;IACvF,4EAA4E;IAC5E,gGAAgG;IAChG,MAAM,WAAW,GAAG,SAAS,CAAC;IAC9B,MAAM,mBAAmB,GAAG,CAAC,CAAC;IAC9B,MAAM,uBAAuB,GAAG,KAAK,CAAC;IACtC,MAAM,qBAAqB,GAAG,WAAW,CAAC,GAAG,EAAE,GAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACxD,MAAM,0BAA0B,GAAG,SAAS,CAAC;IAC7C,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,GAAG,EAA0B,EAAE,EAAE,CAAC,CAAC;IAC7E,MAAM,qBAAqB,GAAG,WAAW,CAAC,KAAK,EAAE,IAAY,EAAE,EAAE,GAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAE1E,wEAAwE;IACxE,MAAM,gBAAgB,GAAG,OAAO,CAC9B,GAA6B,EAAE,CAC7B,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACvB,OAAO,EAAE;YACP,IAAI,EAAE,CAAC,CAAC,mBAAmB,IAAI,CAAC,CAAC,IAAI;YACrC,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC,WAAW,EAAE;YAChC,MAAM,EAAE,CAAC,CAAC,MAAM;YAChB,iBAAiB,EAAE,CAAC,CAAC,iBAAiB,IAAI,KAAK;YAC/C,SAAS,EAAE,EAAE;SACd;QACD,MAAM,EAAE,CAAC,CAAC,MAAM;KACjB,CAAC,CAAC,EACL,CAAC,YAAY,CAAC,CACf,CAAC;IAEF,oDAAoD;IACpD,MAAM,CAAC,gCAAgC,CAAC,GACtC,QAAQ,CAA0C,IAAI,CAAC,CAAC;IAE1D,MAAM,gBAAgB,GAAG,WAAW,CAAC,GAAG,EAAE;QACxC,IAAI,qBAAqB,CAAC,OAAO,EAAE,CAAC;YAClC,OAAO,CAAC,qBAAqB,CAAC,OAAO,EAAE,uBAAuB,CAAC,OAAO,CAAC,CAAC;YACxE,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAC5B,sBAAsB,CAAC,OAAO,GAAG,EAAE,CAAC;QACtC,CAAC;IACH,CAAC,EAAE,CAAC,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,CAAC,CAAC,CAAC;IAE5D,MAAM,oBAAoB,GAAG,WAAW,CACtC,KAAK,EAAE,cAAuB,IAAI,EAAE,EAAE;QACpC,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,KAAK,CAAC,KAAK,EAAE,CAAC;YACpB,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YACvC,cAAc,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACrC,CAAC;IACH,CAAC,EACD,CAAC,KAAK,EAAE,cAAc,CAAC,CACxB,CAAC;IAEF,8DAA8D;IAC9D,MAAM,wBAAwB,GAAG,WAAW,CAC1C,KAAK,EAAE,eAA6B,EAAE,EAAE;QACtC,WAAW,CAAC,KAAK,CAAC,4BAA4B,eAAe,SAAS,CAAC,CAAC;IAC1E,CAAC,EACD,EAAE,CACH,CAAC;IAEF,MAAM,WAAW,GAAG,WAAW,CAC7B,CAAC,KAAiB,EAAE,EAAE;QACpB,iBAAiB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAC9B,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;YACnB,KAAK,aAAa;gBAChB,iBAAiB,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;gBAC7C,MAAM;YACR,KAAK,WAAW;gBACd,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;gBACvC,gBAAgB,EAAE,CAAC;gBACnB,MAAM;YACR,KAAK,SAAS;gBACZ,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;oBAC3B,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;wBACjC,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;4BACzB,sBAAsB,CAAC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC;4BAC5C,oDAAoD;4BACpD,MAAM,UAAU,GAAG,sBAAsB,CACvC,sBAAsB,CAAC,OAAO,CAC/B,CAAC;4BACF,IAAI,UAAU,KAAK,sBAAsB,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gCACzD,qBAAqB,CAAC;oCACpB,IAAI,EAAE,QAAQ;oCACd,IAAI,EAAE,sBAAsB,CAAC,OAAO;iCACrC,CAAC,CAAC;4BACL,CAAC;iCAAM,CAAC;gCACN,MAAM,MAAM,GAAG,sBAAsB,CAAC,OAAO,CAAC,SAAS,CACrD,CAAC,EACD,UAAU,CACX,CAAC;gCACF,MAAM,KAAK,GACT,sBAAsB,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;gCACvD,OAAO,CACL,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,EAChC,uBAAuB,CAAC,OAAO,CAChC,CAAC;gCACF,sBAAsB,CAAC,OAAO,GAAG,KAAK,CAAC;gCACvC,qBAAqB,CAAC;oCACpB,IAAI,EAAE,gBAAgB;oCACtB,IAAI,EAAE,KAAK;iCACZ,CAAC,CAAC;4BACL,CAAC;wBACH,CAAC;6BAAM,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;4BACnC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;wBACzC,CAAC;oBACH,CAAC;gBACH,CAAC;gBACD,MAAM;YACR,KAAK,cAAc,CAAC,CAAC,CAAC;gBACpB,gBAAgB,EAAE,CAAC;gBACnB,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC;gBAC7C,MAAM,WAAW,GAAG,WAAW,EAAE,WAAW,IAAI,KAAK,CAAC,IAAI,CAAC;gBAC3D,MAAM,gBAAgB,GAAG,WAAW,EAAE,gBAAgB,IAAI,KAAK,CAAC;gBAChE,MAAM,IAAI,GAAG,WAAW,EAAE,WAAW,IAAI,EAAE,CAAC;gBAE5C,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC;gBAEhC,MAAM,OAAO,GAA8B;oBACzC,MAAM,EAAE,KAAK,CAAC,SAAS;oBACvB,IAAI,EAAE,WAAW;oBACjB,mBAAmB,EAAE,KAAK,CAAC,IAAI;oBAC/B,WAAW,EAAE,IAAI;oBACjB,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,MAAM,EAAE,kBAAkB,CAAC,SAAS;oBACpC,iBAAiB,EAAE,KAAK;oBACxB,sBAAsB,EAAE,gBAAgB;oBACxC,IAAI,EAAE,WAAW,EAAE,IAAI,IAAI,YAAY;oBACvC,mBAAmB,EAAE,SAAS;oBAC9B,aAAa,EAAE,SAAS;iBACzB,CAAC;gBACF,eAAe,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;gBAC9C,MAAM;YACR,CAAC;YACD,KAAK,aAAa,CAAC,CAAC,CAAC;gBACnB,eAAe,CAAC,CAAC,IAAI,EAAE,EAAE,CACvB,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAA6B,EAAE;oBACzC,IAAI,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,SAAS;wBAAE,OAAO,EAAE,CAAC;oBAE7C,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC;oBAC7C,MAAM,SAAS,GAAG,WAAW,EAAE,MAAM,CAAC;oBAEtC,IAAI,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC;oBACvB,IAAI,SAAS,KAAK,WAAW;wBAC3B,MAAM,GAAG,kBAAkB,CAAC,SAAS,CAAC;yBACnC,IAAI,SAAS,KAAK,OAAO;wBAAE,MAAM,GAAG,kBAAkB,CAAC,KAAK,CAAC;yBAC7D,IAAI,SAAS,KAAK,SAAS;wBAC9B,MAAM,GAAG,kBAAkB,CAAC,OAAO,CAAC;oBAEtC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC;oBACtC,MAAM,UAAU,GACd,sBAAsB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,aAAa,CAAC;oBACtD,MAAM,eAAe,GACnB,WAAW,EAAE,eAAe,IAAI,EAAE,CAAC,eAAe,CAAC;oBACrD,MAAM,QAAQ,GAAG,WAAW,EAAE,QAAQ,IAAI,EAAE,CAAC,QAAQ,CAAC;oBACtD,MAAM,aAAa,GACjB,WAAW,EAAE,aAAa,IAAI,EAAE,CAAC,aAAa,CAAC;oBACjD,MAAM,KAAK,GAAG,WAAW,EAAE,GAAG,IAAI,EAAE,CAAC,KAAK,CAAC;oBAC3C,MAAM,WAAW,GAAG,WAAW,EAAE,WAAW,IAAI,EAAE,CAAC,WAAW,CAAC;oBAE/D,OAAO;wBACL,GAAG,EAAE;wBACL,MAAM;wBACN,OAAO,EAAE,KAAK,CAAC,OAAO;4BACpB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE;4BACrC,CAAC,CAAC,EAAE,CAAC,OAAO;wBACd,aAAa,EAAE,UAAU;wBACzB,eAAe;wBACf,QAAQ;wBACR,aAAa;wBACb,KAAK;wBACL,WAAW;qBACZ,CAAC;gBACJ,CAAC,CAAC,CACH,CAAC;gBACF,MAAM;YACR,CAAC;YACD,KAAK,eAAe,CAAC,CAAC,CAAC;gBACrB,eAAe,CAAC,CAAC,IAAI,EAAE,EAAE,CACvB,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAA6B,EAAE;oBACzC,IAAI,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,SAAS;wBAAE,OAAO,EAAE,CAAC;oBAE7C,MAAM,WAAW,GAAG,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC;oBAC7C,MAAM,UAAU,GAAG,WAAW,EAAE,UAAU,CAAC;oBAC3C,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC;oBACtC,MAAM,aAAa,GACjB,sBAAsB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,aAAa,CAAC;oBAEtD,OAAO;wBACL,GAAG,EAAE;wBACL,MAAM,EAAE,KAAK,CAAC,OAAO;4BACnB,CAAC,CAAC,kBAAkB,CAAC,KAAK;4BAC1B,CAAC,CAAC,kBAAkB,CAAC,OAAO;wBAC9B,OAAO,EAAE,KAAK,CAAC,OAAO;4BACpB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE;4BACrC,CAAC,CAAC,EAAE,CAAC,OAAO;wBACd,aAAa;wBACb,UAAU;qBACX,CAAC;gBACJ,CAAC,CAAC,CACH,CAAC;gBACF,MAAM;YACR,CAAC;YAED,KAAK,OAAO,CAAC,CAAC,CAAC;gBACb,MAAM,OAAO,GACX,KAAK,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,KAAK,yBAAyB;oBACjD,CAAC,CAAC,4BAA4B,KAAK,CAAC,OAAO,EAAE;oBAC7C,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;gBACpB,OAAO,CACL,EAAE,IAAI,EAAE,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAC1C,uBAAuB,CAAC,OAAO,CAChC,CAAC;gBACF,MAAM;YACR,CAAC;YAED,KAAK,YAAY,CAAC;YAClB,KAAK,gBAAgB,CAAC;YACtB,KAAK,qBAAqB,CAAC;YAC3B,KAAK,sBAAsB,CAAC;YAC5B,KAAK,OAAO,CAAC;YACb,KAAK,QAAQ;gBACX,mDAAmD;gBACnD,MAAM;YAER;gBACE,WAAW,CAAC,KAAK,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;gBACtD,KAAqB,CAAC;gBACtB,MAAM;QACV,CAAC;IACH,CAAC,EACD;QACE,OAAO;QACP,gBAAgB;QAChB,qBAAqB;QACrB,eAAe;QACf,iBAAiB;QACjB,UAAU;QACV,iBAAiB;KAClB,CACF,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,WAAW,GAAG,KAAK,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QAClD,OAAO,GAAG,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;IAC/B,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC;IAEzB,WAAW,CACT,CAAC,GAAG,EAAE,EAAE;QACN,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,cAAc,EAAE,CAAC;YAC7C,KAAK,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACjC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,EACD;QACE,QAAQ,EACN,cAAc,KAAK,cAAc,CAAC,UAAU;YAC5C,cAAc,KAAK,cAAc,CAAC,sBAAsB;KAC3D,CACF,CAAC;IAEF,MAAM,WAAW,GAAG,WAAW,CAC7B,KAAK,EACH,KAAsB,EACtB,OAAqC,EACrC,UAAmB,EACnB,EAAE;QACF,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC7B,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAC7B,uBAAuB,CAAC,OAAO,GAAG,SAAS,CAAC;QAE5C,sBAAsB,CAAC,OAAO,GAAG,EAAE,CAAC;QAEpC,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC;YAC7B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC9B,OAAO,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,SAAS,CAAC,CAAC;gBAC5D,KAAK,MAAM,EAAE,UAAU,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACzD,CAAC;YACD,cAAc,EAAE,CAAC;QACnB,CAAC;QAED,MAAM,KAAK,GAAG,yBAAyB,CACrC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CACtD,CAAC;QAEF,IAAI,CAAC;YACH,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC;gBACpC,OAAO,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;aAC5B,CAAC,CAAC;YACH,kBAAkB,CAAC,OAAO,GAAG,QAAQ,CAAC;QACxC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CACL,EAAE,IAAI,EAAE,WAAW,CAAC,KAAK,EAAE,IAAI,EAAE,eAAe,CAAC,GAAG,CAAC,EAAE,EACvD,SAAS,CACV,CAAC;QACJ,CAAC;IACH,CAAC,EACD,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,cAAc,CAAC,CACzC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAC3C,oBAAoB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CAC5C,CAAC;YACF,IAAI,UAAU,EAAE,CAAC;gBACf,oBAAoB,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;gBAChC,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;aAAM,IAAI,cAAc,KAAK,cAAc,CAAC,IAAI,EAAE,CAAC;YAClD,oBAAoB,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC;YAChC,qBAAqB,CAAC,IAAI,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,EAAE;QACD,YAAY;QACZ,oBAAoB;QACpB,oBAAoB;QACpB,qBAAqB;QACrB,cAAc;KACf,CAAC,CAAC;IAEH,kCAAkC;IAClC,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEtC,mFAAmF;QACnF,qFAAqF;QACrF,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CACpC,CAAC,EAAE,EAAE,EAAE,CACL,EAAE,CAAC,MAAM,KAAK,SAAS;YACvB,EAAE,CAAC,MAAM,KAAK,OAAO;YACrB,EAAE,CAAC,MAAM,KAAK,WAAW,CAC5B,CAAC;QAEF,MAAM,WAAW,GAAG,YAAY,CAAC,MAAM,CACrC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CACrD,CAAC;QAEF,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;YACxD,KAAK,MAAM,EAAE,IAAI,WAAW,EAAE,CAAC;gBAC7B,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;YAC3B,CAAC;YAED,MAAM,UAAU,GAAG,4BAA4B,CAC7C,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,EAC3C,WAAW,EACX,CAAC,CAAC,cAAc,EAChB,EAAE,EACF,eAAe,CAChB,CAAC;YAEF,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CACpC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,QAAQ,CACxC,CAAC;YACF,MAAM,mBAAmB,GACvB,qBAAqB,CAAC,OAAO;gBAC7B,CAAC,CAAC,sBAAsB,CAAC,OAAO,IAAI,aAAa,CAAC,CAAC;YAErD,MAAM,WAAW,GAAgC;gBAC/C,IAAI,EAAE,oBAAoB;gBAC1B,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;oBAC9B,IAAI,EAAE,EAAE,CAAC,IAAI;oBACb,WAAW,EAAE,EAAE,CAAC,WAAW;oBAC3B,GAAG,EAAE,CAAC,OAAO;oBACb,MAAM,EAAE,EAAE,CAAC,MAAM;oBACjB,mBAAmB,EAAE,EAAE,CAAC,mBAAmB;iBAC5C,CAAC,CAAC;gBACH,SAAS,EAAE,mBAAmB;gBAC9B,YAAY,EAAE,IAAI;gBAClB,GAAG,UAAU;aACd,CAAC;YAEF,OAAO,CAAC,WAAW,CAAC,CAAC;YACrB,oBAAoB,CAAC,SAAS,CAAC,CAAC;YAEhC,IAAI,aAAa,EAAE,CAAC;gBAClB,sBAAsB,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;YACD,qBAAqB,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,EAAE;QACD,YAAY;QACZ,oBAAoB;QACpB,qBAAqB;QACrB,sBAAsB;QACtB,oBAAoB;QACpB,qBAAqB;QACrB,sBAAsB;QACtB,OAAO;QACP,WAAW;QACX,cAAc;QACd,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,qBAAqB,GAAG,OAAO,CAAC,GAA2B,EAAE;QACjE,MAAM,cAAc,GAAG,YAAY,CAAC,MAAM,CACxC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CACrD,CAAC;QAEF,MAAM,KAAK,GAA2B,EAAE,CAAC;QAEzC,MAAM,UAAU,GAAG,4BAA4B,CAC7C,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,EAC3C,WAAW,EACX,CAAC,CAAC,cAAc,EAChB,EAAE,EACF,eAAe,CAChB,CAAC;QAEF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9B,MAAM,eAAe,GAAG,cAAc,CAAC,IAAI,CACzC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,QAAQ,CACxC,CAAC;YACF,MAAM,mBAAmB,GACvB,iBAAiB,CAAC,IAAI,KAAK,CAAC;gBAC5B,CAAC,CAAC,sBAAsB,CAAC,OAAO,IAAI,eAAe,CAAC,CAAC;YAEvD,KAAK,CAAC,IAAI,CAAC;gBACT,IAAI,EAAE,oBAAoB;gBAC1B,KAAK,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;oBACjC,IAAI,EAAE,EAAE,CAAC,IAAI;oBACb,WAAW,EAAE,EAAE,CAAC,WAAW;oBAC3B,GAAG,EAAE,CAAC,OAAO;oBACb,MAAM,EAAE,EAAE,CAAC,MAAM;oBACjB,mBAAmB,EAAE,EAAE,CAAC,mBAAmB;iBAC5C,CAAC,CAAC;gBACH,SAAS,EAAE,mBAAmB;gBAC9B,YAAY,EAAE,KAAK;gBACnB,GAAG,UAAU;aACd,CAAC,CAAC;QACL,CAAC;QAED,MAAM,WAAW,GACf,YAAY,CAAC,MAAM,GAAG,CAAC;YACvB,YAAY,CAAC,KAAK,CAChB,CAAC,EAAE,EAAE,EAAE,CACL,EAAE,CAAC,MAAM,KAAK,SAAS;gBACvB,EAAE,CAAC,MAAM,KAAK,OAAO;gBACrB,EAAE,CAAC,MAAM,KAAK,WAAW,CAC5B,CAAC;QAEJ,MAAM,SAAS,GACb,YAAY,CAAC,MAAM,GAAG,CAAC;YACvB,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QAE/D,MAAM,mBAAmB,GAAG,iBAAiB,CAAC,IAAI,GAAG,CAAC,CAAC;QACvD,MAAM,mBAAmB,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC;QAEtD,IACE,YAAY,CAAC,MAAM,GAAG,CAAC;YACvB,CAAC,CAAC,WAAW,IAAI,SAAS,CAAC;YAC3B,CAAC,mBAAmB,IAAI,mBAAmB,CAAC,EAC5C,CAAC;YACD,KAAK,CAAC,IAAI,CAAC;gBACT,IAAI,EAAE,oBAAoB;gBAC1B,KAAK,EAAE,EAAE;gBACT,SAAS,EAAE,KAAK;gBAChB,YAAY,EAAE,IAAI;gBAClB,GAAG,UAAU;aACd,CAAC,CAAC;QACL,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC,EAAE;QACD,YAAY;QACZ,iBAAiB;QACjB,oBAAoB;QACpB,sBAAsB;QACtB,WAAW;QACX,cAAc;QACd,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,mBAAmB,GAAG,OAAO,CACjC,GAAG,EAAE,CACH,CAAC,kBAAkB,EAAE,GAAG,qBAAqB,CAAC,CAAC,MAAM,CACnD,CAAC,CAAC,EAA6B,EAAE,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,CAChE,EACH,CAAC,kBAAkB,EAAE,qBAAqB,CAAC,CAC5C,CAAC;IAEF,OAAO;QACL,cAAc;QACd,WAAW;QACX,SAAS;QACT,mBAAmB;QACnB,OAAO;QACP,oBAAoB;QACpB,gBAAgB;QAChB,wBAAwB;QACxB,WAAW;QACX,gCAAgC;QAChC,cAAc;QACd,mBAAmB;QACnB,uBAAuB;QACvB,qBAAqB;QACrB,0BAA0B;QAC1B,eAAe;QACf,WAAW;QACX,qBAAqB;KACtB,CAAC;AACJ,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"useAgentStream.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useAgentStream.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,7 @@ vi.mock('../contexts/SessionContext.js', async (importOriginal) => {
|
|
|
22
22
|
};
|
|
23
23
|
});
|
|
24
24
|
// --- END MOCKS ---
|
|
25
|
-
import { useAgentStream } from './useAgentStream.js';
|
|
25
|
+
import { createCancelledToolCall, useAgentStream } from './useAgentStream.js';
|
|
26
26
|
import { MessageType, StreamingState } from '../types.js';
|
|
27
27
|
describe('useAgentStream', () => {
|
|
28
28
|
const mockAddItem = vi.fn();
|
|
@@ -157,5 +157,108 @@ describe('useAgentStream', () => {
|
|
|
157
157
|
expect(mockLegacyAgentProtocol.abort).toHaveBeenCalled();
|
|
158
158
|
expect(mockOnCancelSubmit).toHaveBeenCalledWith(false, true);
|
|
159
159
|
});
|
|
160
|
+
it('should synthesize and record filler functionResponse via recordCompletedToolCalls on cancelOngoingRequest', async () => {
|
|
161
|
+
const mockRecordCompletedToolCalls = vi.fn();
|
|
162
|
+
const mockConfig = {
|
|
163
|
+
getModel: vi.fn(() => 'gemini-2.5-pro'),
|
|
164
|
+
getGeminiClient: vi.fn(() => ({
|
|
165
|
+
getCurrentSequenceModel: vi.fn(() => 'gemini-2.5-pro'),
|
|
166
|
+
getHistory: vi.fn(() => []),
|
|
167
|
+
getChat: vi.fn(() => ({
|
|
168
|
+
recordCompletedToolCalls: mockRecordCompletedToolCalls,
|
|
169
|
+
})),
|
|
170
|
+
})),
|
|
171
|
+
};
|
|
172
|
+
const { result } = await renderHookWithProviders(() => useAgentStream({
|
|
173
|
+
agent: mockLegacyAgentProtocol,
|
|
174
|
+
config: mockConfig,
|
|
175
|
+
addItem: mockAddItem,
|
|
176
|
+
onCancelSubmit: mockOnCancelSubmit,
|
|
177
|
+
isShellFocused: false,
|
|
178
|
+
}));
|
|
179
|
+
const eventHandler = vi.mocked(mockLegacyAgentProtocol.subscribe).mock
|
|
180
|
+
.calls[0][0];
|
|
181
|
+
act(() => {
|
|
182
|
+
eventHandler({
|
|
183
|
+
type: 'tool_request',
|
|
184
|
+
requestId: 'call-123',
|
|
185
|
+
name: 'run_shell_command',
|
|
186
|
+
args: { command: 'sleep 10' },
|
|
187
|
+
id: '1',
|
|
188
|
+
timestamp: '',
|
|
189
|
+
streamId: '',
|
|
190
|
+
});
|
|
191
|
+
});
|
|
192
|
+
await act(async () => {
|
|
193
|
+
await result.current.cancelOngoingRequest();
|
|
194
|
+
});
|
|
195
|
+
expect(mockRecordCompletedToolCalls).toHaveBeenCalledTimes(1);
|
|
196
|
+
expect(mockRecordCompletedToolCalls).toHaveBeenCalledWith('gemini-2.5-pro', [
|
|
197
|
+
expect.objectContaining({
|
|
198
|
+
status: 'cancelled',
|
|
199
|
+
request: expect.objectContaining({
|
|
200
|
+
callId: 'call-123',
|
|
201
|
+
name: 'run_shell_command',
|
|
202
|
+
args: { command: 'sleep 10' },
|
|
203
|
+
}),
|
|
204
|
+
response: expect.objectContaining({
|
|
205
|
+
callId: 'call-123',
|
|
206
|
+
responseParts: [
|
|
207
|
+
{
|
|
208
|
+
functionResponse: {
|
|
209
|
+
id: 'call-123',
|
|
210
|
+
name: 'run_shell_command',
|
|
211
|
+
response: {
|
|
212
|
+
error: '[Operation Cancelled] Reason: User cancelled operation',
|
|
213
|
+
},
|
|
214
|
+
},
|
|
215
|
+
},
|
|
216
|
+
],
|
|
217
|
+
}),
|
|
218
|
+
}),
|
|
219
|
+
]);
|
|
220
|
+
});
|
|
221
|
+
it('should bound hanging agent.abort() with a 1s timeout in cancelOngoingRequest', async () => {
|
|
222
|
+
vi.useFakeTimers();
|
|
223
|
+
try {
|
|
224
|
+
mockLegacyAgentProtocol.abort.mockImplementationOnce(() => new Promise(() => { }));
|
|
225
|
+
const { result } = await renderHookWithProviders(() => useAgentStream({
|
|
226
|
+
agent: mockLegacyAgentProtocol,
|
|
227
|
+
addItem: mockAddItem,
|
|
228
|
+
onCancelSubmit: mockOnCancelSubmit,
|
|
229
|
+
isShellFocused: false,
|
|
230
|
+
}));
|
|
231
|
+
let resolved = false;
|
|
232
|
+
let cancelPromise;
|
|
233
|
+
act(() => {
|
|
234
|
+
cancelPromise = result.current.cancelOngoingRequest().then(() => {
|
|
235
|
+
resolved = true;
|
|
236
|
+
});
|
|
237
|
+
});
|
|
238
|
+
expect(resolved).toBe(false);
|
|
239
|
+
await act(async () => {
|
|
240
|
+
await vi.advanceTimersByTimeAsync(1000);
|
|
241
|
+
await cancelPromise;
|
|
242
|
+
});
|
|
243
|
+
expect(resolved).toBe(true);
|
|
244
|
+
expect(mockOnCancelSubmit).toHaveBeenCalledWith(false, true);
|
|
245
|
+
}
|
|
246
|
+
finally {
|
|
247
|
+
vi.useRealTimers();
|
|
248
|
+
}
|
|
249
|
+
});
|
|
250
|
+
it('should provide safe fallback tool and invocation objects in createCancelledToolCall', () => {
|
|
251
|
+
const cancelledWithEmptyName = createCancelledToolCall({
|
|
252
|
+
callId: 'call-empty',
|
|
253
|
+
name: ' ',
|
|
254
|
+
args: {},
|
|
255
|
+
isClientInitiated: false,
|
|
256
|
+
prompt_id: '',
|
|
257
|
+
});
|
|
258
|
+
expect(cancelledWithEmptyName.tool?.name).toBe('generic_tool');
|
|
259
|
+
expect(cancelledWithEmptyName.tool?.displayName).toBe('generic_tool');
|
|
260
|
+
expect('invocation' in cancelledWithEmptyName &&
|
|
261
|
+
cancelledWithEmptyName.invocation.getDescription()).toBe('generic_tool');
|
|
262
|
+
});
|
|
160
263
|
});
|
|
161
264
|
//# sourceMappingURL=useAgentStream.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAgentStream.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useAgentStream.test.tsx"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAE5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAErE,gBAAgB;AAEhB,MAAM,uBAAuB,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAChD,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;IAC/D,SAAS,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC;IAC5C,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;CAC5C,CAAC,CAAC,CAAC;AAEJ,EAAE,CAAC,IAAI,CAAC,+BAA+B,EAAE,KAAK,EAAE,cAAc,EAAE,EAAE;IAChE,MAAM,MAAM,GAAG,MAAM,cAAc,EAA2B,CAAC;IAC/D,OAAO;QACL,GAAG,MAAM;QACT,eAAe,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;YAC5B,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE;SACxB,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,oBAAoB;AAEpB,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"useAgentStream.test.js","sourceRoot":"","sources":["../../../../src/ui/hooks/useAgentStream.test.tsx"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@ export declare const useGeminiStream: (geminiClient: GeminiClient, history: Hist
|
|
|
23
23
|
initError: string | null;
|
|
24
24
|
pendingHistoryItems: HistoryItemWithoutId[];
|
|
25
25
|
thought: ThoughtSummary | null;
|
|
26
|
-
cancelOngoingRequest: (clearBuffer?: boolean) => void
|
|
26
|
+
cancelOngoingRequest: (clearBuffer?: boolean) => Promise<void>;
|
|
27
27
|
pendingToolCalls: TrackedToolCall[];
|
|
28
28
|
handleApprovalModeChange: (newApprovalMode: ApprovalMode) => Promise<void>;
|
|
29
29
|
activePtyId: number | undefined;
|