Adding TurnId to Tool call and API responses and error logs. (#3039)

Co-authored-by: Scott Densmore <[email protected]>

1 files changed, 13 insertions, 8 deletions

diff --git a/packages/cli/src/nonInteractiveCli.ts b/packages/cli/src/nonInteractiveCli.ts
index 92fce058..b8b8ac3f 100644
--- a/packages/cli/src/nonInteractiveCli.ts
+++ b/packages/cli/src/nonInteractiveCli.ts
@@ -46,6 +46,7 @@ function getResponseText(response: GenerateContentResponse): string | null {
 export async function runNonInteractive(
   config: Config,
   input: string,
+  prompt_id: string,
 ): Promise<void> {
   await config.initialize();
   // Handle EPIPE errors when the output is piped to a command that closes early.
@@ -67,15 +68,18 @@ export async function runNonInteractive(
     while (true) {
       const functionCalls: FunctionCall[] = [];
 
-      const responseStream = await chat.sendMessageStream({
-        message: currentMessages[0]?.parts || [], // Ensure parts are always provided
-        config: {
-          abortSignal: abortController.signal,
-          tools: [
-            { functionDeclarations: toolRegistry.getFunctionDeclarations() },
-          ],
+      const responseStream = await chat.sendMessageStream(
+        {
+          message: currentMessages[0]?.parts || [], // Ensure parts are always provided
+          config: {
+            abortSignal: abortController.signal,
+            tools: [
+              { functionDeclarations: toolRegistry.getFunctionDeclarations() },
+            ],
+          },
         },
-      });
+        prompt_id,
+      );
 
       for await (const resp of responseStream) {
         if (abortController.signal.aborted) {
@@ -101,6 +105,7 @@ export async function runNonInteractive(
             name: fc.name as string,
             args: (fc.args ?? {}) as Record<string, unknown>,
             isClientInitiated: false,
+            prompt_id,
           };
 
           const toolResponse = await executeToolCall(