Update chatStream.js

server/chatStream.js

@@ -364,7 +364,7 @@ export async function streamChat({
         {
           role: "assistant",
           content: assistantText || "",
-          tool_calls: toolCalls,
+          tool_calls: toolCalls.length > 0 ? toolCalls : undefined,
         },
         ...toolResults
       );
@@ -376,10 +376,32 @@ export async function streamChat({
         stream: true,
       };
 
-      const followUp =
-        await websocketChatStream(followUpBody, headers, onToken, abortSignal);
-
-      assistantText += followUp.assistantText;
+      let followUpAssistantText = "";
+      for (let attempt = 0; attempt < 2; attempt++) {
+        const followUp = await websocketChatStream(followUpBody, headers, onToken, abortSignal);
+        followUpAssistantText += followUp.assistantText;
+
+        // If the model returned new tool calls, process them and update the body
+        if (followUp.toolCalls.length > 0) {
+          const toolResults = await processToolCalls(
+            null,
+            followUp.toolCalls,
+            tools,
+            accessToken,
+            clientId,
+            abortSignal,
+            onToolCall,
+            onNewAsset
+          );
+          followUpMessages.push(...toolResults);
+
+          // Update body for another pass
+          followUpBody.messages = followUpMessages;
+        } else {
+          break; // no new tool calls, we’re done
+        }
+      }
+      assistantText += followUpAssistantText;
     }
 
     const sessionName = extractSessionName(assistantText);