From 4be32d1f73bc2d9e4d22a71eee7b142e9b0aa577 Mon Sep 17 00:00:00 2001
From: "N. Taylor Mullen" <ntaylormullen@google.com>
Date: Sat, 5 Jul 2025 13:56:39 -0700
Subject: fix(cli): Group cancelled tool call responses to prevent API errors
 (#3333)

---
 packages/cli/src/ui/hooks/useGeminiStream.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'packages/cli/src/ui/hooks/useGeminiStream.ts')

diff --git a/packages/cli/src/ui/hooks/useGeminiStream.ts b/packages/cli/src/ui/hooks/useGeminiStream.ts
index e2226761..bba01bc9 100644
--- a/packages/cli/src/ui/hooks/useGeminiStream.ts
+++ b/packages/cli/src/ui/hooks/useGeminiStream.ts
@@ -636,20 +636,20 @@ export const useGeminiStream = (
           const responsesToAdd = geminiTools.flatMap(
             (toolCall) => toolCall.response.responseParts,
           );
+          const combinedParts: Part[] = [];
           for (const response of responsesToAdd) {
-            let parts: Part[];
             if (Array.isArray(response)) {
-              parts = response;
+              combinedParts.push(...response);
             } else if (typeof response === 'string') {
-              parts = [{ text: response }];
+              combinedParts.push({ text: response });
             } else {
-              parts = [response];
+              combinedParts.push(response);
             }
-            geminiClient.addHistory({
-              role: 'user',
-              parts,
-            });
           }
+          geminiClient.addHistory({
+            role: 'user',
+            parts: combinedParts,
+          });
         }
 
         const callIdsToMarkAsSubmitted = geminiTools.map(
-- 
cgit v1.2.3