abbyswag/qwen-code
1
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2025-12-20 16:57:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: synchronization between executed tools and turn loops (#488)

Browse Source
This commit is contained in:
Brandon Keiji
2025-05-22 09:51:07 +00:00
committed by GitHub
parent 174fdce7d8
commit a8bfdf2d56
4 changed files with 53 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/cli/src/ui/hooks/useGeminiStream.ts
View File

@@ -383,6 +383,7 @@ export const useGeminiStream = (
toolCallRequests.push(event.value);
} else if (event.type === ServerGeminiEventType.UserCancelled) {
handleUserCancelledEvent(userMessageTimestamp);
cancel();
return StreamProcessingStatus.UserCancelled;
} else if (event.type === ServerGeminiEventType.Error) {
handleErrorEvent(event.value, userMessageTimestamp);
@@ -393,12 +394,9 @@ export const useGeminiStream = (
return StreamProcessingStatus.Completed;
};
const streamingState: StreamingState = isResponding
? StreamingState.Responding
: pendingToolCalls?.tools.some(
(t) => t.status === ToolCallStatus.Confirming,
)
? StreamingState.WaitingForConfirmation
const streamingState: StreamingState =
isResponding || toolCalls.some((t) => t.status === 'awaiting_approval')
? StreamingState.Responding
: StreamingState.Idle;
const submitQuery = useCallback(

70
packages/cli/src/ui/hooks/useToolScheduler.ts
View File

@@ -184,61 +184,55 @@ export function useToolScheduler(
useEffect(() => {
// effect for executing scheduled tool calls
const scheduledCalls = toolCalls.filter((t) => t.status === 'scheduled');
const awaitingConfirmation = toolCalls.some(
(t) => t.status === 'awaiting_approval',
);
if (!awaitingConfirmation && scheduledCalls.length) {
scheduledCalls.forEach(async (c) => {
if (toolCalls.every((t) => t.status === 'scheduled')) {
toolCalls.forEach((c) => {
const callId = c.request.callId;
try {
setToolCalls(setStatus(c.request.callId, 'executing'));
const result = await c.tool.execute(
c.request.args,
abortController.signal,
);
const functionResponse: Part = {
functionResponse: {
name: c.request.name,
id: callId,
response: { output: result.llmContent },
},
};
const response: ToolCallResponseInfo = {
callId,
responsePart: functionResponse,
resultDisplay: result.returnDisplay,
error: undefined,
};
setToolCalls(setStatus(callId, 'success', response));
} catch (e: unknown) {
setToolCalls(
setStatus(
setToolCalls(setStatus(c.request.callId, 'executing'));
c.tool
.execute(c.request.args, abortController.signal)
.then((result) => {
const functionResponse: Part = {
functionResponse: {
name: c.request.name,
id: callId,
response: { output: result.llmContent },
},
};
const response: ToolCallResponseInfo = {
callId,
'error',
toolErrorResponse(
c.request,
e instanceof Error ? e : new Error(String(e)),
responsePart: functionResponse,
resultDisplay: result.returnDisplay,
error: undefined,
};
setToolCalls(setStatus(callId, 'success', response));
})
.catch((e) =>
setToolCalls(
setStatus(
callId,
'error',
toolErrorResponse(
c.request,
e instanceof Error ? e : new Error(String(e)),
),
),
),
);
}
});
}
}, [toolCalls, toolRegistry, abortController.signal]);
useEffect(() => {
const completedTools = toolCalls.filter(
const allDone = toolCalls.every(
(t) =>
t.status === 'success' ||
t.status === 'error' ||
t.status === 'cancelled',
);
const allDone = completedTools.length === toolCalls.length;
if (toolCalls.length && allDone) {
onComplete(completedTools);
setToolCalls([]);
setAbortController(new AbortController());
onComplete(toolCalls);
setAbortController(() => new AbortController());
}
}, [toolCalls, onComplete]);