@ljoukov/llm 4.0.5 → 4.0.7

package/dist/index.js

@@ -2682,6 +2682,7 @@ import { AsyncLocalStorage } from "async_hooks";
 import { Buffer as Buffer3 } from "buffer";
 import { appendFile, mkdir, writeFile } from "fs/promises";
 import path3 from "path";
+var DEFAULT_THOUGHT_DELTA_LOG_THROTTLE_MS = 4e3;
 function toIsoNow() {
   return (/* @__PURE__ */ new Date()).toISOString();
 }
@@ -2705,6 +2706,9 @@ function ensureTrailingNewline(value) {
   return value.endsWith("\n") ? value : `${value}
 `;
 }
+function hasNonEmptyText(value) {
+  return typeof value === "string" && value.length > 0;
+}
 function redactDataUrlPayload(value) {
   if (!value.toLowerCase().startsWith("data:")) {
     return value;
@@ -2845,6 +2849,63 @@ function appendAgentStreamEventLog(options) {
     }
   }
 }
+function createAgentStreamEventLogger(options) {
+  const thoughtDeltaThrottleMs = Math.max(
+    0,
+    options.thoughtDeltaThrottleMs ?? DEFAULT_THOUGHT_DELTA_LOG_THROTTLE_MS
+  );
+  let pendingThoughtDelta = "";
+  let thoughtFlushTimer = null;
+  const cancelThoughtFlushTimer = () => {
+    if (thoughtFlushTimer === null) {
+      return;
+    }
+    clearTimeout(thoughtFlushTimer);
+    thoughtFlushTimer = null;
+  };
+  const flushThoughtDelta = () => {
+    cancelThoughtFlushTimer();
+    if (pendingThoughtDelta.length === 0) {
+      return;
+    }
+    options.append(`thought_delta: ${pendingThoughtDelta}`);
+    pendingThoughtDelta = "";
+  };
+  const scheduleThoughtFlush = () => {
+    if (thoughtFlushTimer !== null || thoughtDeltaThrottleMs === 0) {
+      return;
+    }
+    thoughtFlushTimer = setTimeout(() => {
+      thoughtFlushTimer = null;
+      flushThoughtDelta();
+    }, thoughtDeltaThrottleMs);
+    thoughtFlushTimer.unref?.();
+  };
+  return {
+    appendEvent: (event) => {
+      if (event.type === "delta" && event.channel === "thought") {
+        if (event.text.length === 0) {
+          return;
+        }
+        pendingThoughtDelta += event.text;
+        if (thoughtDeltaThrottleMs === 0) {
+          flushThoughtDelta();
+          return;
+        }
+        scheduleThoughtFlush();
+        return;
+      }
+      flushThoughtDelta();
+      appendAgentStreamEventLog({
+        event,
+        append: options.append
+      });
+    },
+    flush: () => {
+      flushThoughtDelta();
+    }
+  };
+}
 var AgentLoggingSessionImpl = class {
   workspaceDir;
   logsRootDir;
@@ -2896,6 +2957,25 @@ var AgentLoggingSessionImpl = class {
     }
     this.enqueueLineWrite(timestamped);
   }
+  async writeAttachments(baseDir, attachments) {
+    const usedNames = /* @__PURE__ */ new Set();
+    for (const attachment of attachments ?? []) {
+      let filename = normalisePathSegment(attachment.filename);
+      if (!filename.includes(".")) {
+        filename = `${filename}.bin`;
+      }
+      const ext = path3.extname(filename);
+      const base = ext.length > 0 ? filename.slice(0, -ext.length) : filename;
+      let candidate = filename;
+      let duplicateIndex = 2;
+      while (usedNames.has(candidate)) {
+        candidate = `${base}-${duplicateIndex.toString()}${ext}`;
+        duplicateIndex += 1;
+      }
+      usedNames.add(candidate);
+      await writeFile(path3.join(baseDir, candidate), attachment.bytes);
+    }
+  }
   startLlmCall(input) {
     const callNumber = this.callCounter + 1;
     this.callCounter = callNumber;
@@ -2908,6 +2988,9 @@ var AgentLoggingSessionImpl = class {
     );
     const responsePath = path3.join(baseDir, "response.txt");
     const thoughtsPath = path3.join(baseDir, "thoughts.txt");
+    const toolCallPath = path3.join(baseDir, "tool_call.txt");
+    const toolCallResponsePath = path3.join(baseDir, "tool_call_response.txt");
+    const errorPath = path3.join(baseDir, "error.txt");
     const responseMetadataPath = path3.join(baseDir, "response.metadata.json");
     let chain = this.ensureReady.then(async () => {
       await mkdir(baseDir, { recursive: true });
@@ -2929,22 +3012,13 @@ var AgentLoggingSessionImpl = class {
 `,
         "utf8"
       );
-      const usedNames = /* @__PURE__ */ new Set();
-      for (const attachment of input.attachments ?? []) {
-        let filename = normalisePathSegment(attachment.filename);
-        if (!filename.includes(".")) {
-          filename = `${filename}.bin`;
-        }
-        const ext = path3.extname(filename);
-        const base = ext.length > 0 ? filename.slice(0, -ext.length) : filename;
-        let candidate = filename;
-        let duplicateIndex = 2;
-        while (usedNames.has(candidate)) {
-          candidate = `${base}-${duplicateIndex.toString()}${ext}`;
-          duplicateIndex += 1;
-        }
-        usedNames.add(candidate);
-        await writeFile(path3.join(baseDir, candidate), attachment.bytes);
+      await this.writeAttachments(baseDir, input.attachments);
+      if (hasNonEmptyText(input.toolCallResponseText)) {
+        await writeFile(
+          toolCallResponsePath,
+          ensureTrailingNewline(input.toolCallResponseText),
+          "utf8"
+        );
       }
     }).catch(() => void 0);
     this.track(chain);
@@ -2972,18 +3046,25 @@ var AgentLoggingSessionImpl = class {
           await appendFile(responsePath, text, "utf8");
         });
       },
-      complete: (metadata) => {
+      complete: (options) => {
         if (closed) {
           return;
         }
         closed = true;
         enqueue(async () => {
+          if (hasNonEmptyText(options?.responseText)) {
+            await writeFile(responsePath, options.responseText, "utf8");
+          }
+          if (hasNonEmptyText(options?.toolCallText)) {
+            await writeFile(toolCallPath, ensureTrailingNewline(options.toolCallText), "utf8");
+          }
+          await this.writeAttachments(baseDir, options?.attachments);
           const payload = {
             capturedAt: toIsoNow(),
             status: "completed"
           };
-          if (metadata) {
-            const sanitised = sanitiseLogValue(metadata);
+          if (options?.metadata) {
+            const sanitised = sanitiseLogValue(options.metadata);
             if (sanitised && typeof sanitised === "object" && !Array.isArray(sanitised)) {
               Object.assign(payload, sanitised);
             } else if (sanitised !== void 0) {
@@ -2994,19 +3075,27 @@ var AgentLoggingSessionImpl = class {
 `, "utf8");
         });
       },
-      fail: (error, metadata) => {
+      fail: (error, options) => {
         if (closed) {
           return;
         }
         closed = true;
         enqueue(async () => {
+          if (hasNonEmptyText(options?.responseText)) {
+            await writeFile(responsePath, options.responseText, "utf8");
+          }
+          if (hasNonEmptyText(options?.toolCallText)) {
+            await writeFile(toolCallPath, ensureTrailingNewline(options.toolCallText), "utf8");
+          }
+          await this.writeAttachments(baseDir, options?.attachments);
+          await writeFile(errorPath, ensureTrailingNewline(toErrorMessage(error)), "utf8");
           const payload = {
             capturedAt: toIsoNow(),
             status: "failed",
             error: toErrorMessage(error)
           };
-          if (metadata) {
-            const sanitised = sanitiseLogValue(metadata);
+          if (options?.metadata) {
+            const sanitised = sanitiseLogValue(options.metadata);
             if (sanitised && typeof sanitised === "object" && !Array.isArray(sanitised)) {
               Object.assign(payload, sanitised);
             } else if (sanitised !== void 0) {
@@ -4849,7 +4938,10 @@ function resolveAttachmentExtension(mimeType) {
     }
   }
 }
-function decodeDataUrlAttachment(value, basename) {
+function buildLoggedAttachmentFilename(prefix, index, mimeType) {
+  return `${prefix}-${index.toString()}.${resolveAttachmentExtension(mimeType)}`;
+}
+function decodeDataUrlAttachment(value, options) {
   const trimmed = value.trim();
   if (!trimmed.toLowerCase().startsWith("data:")) {
     return null;
@@ -4865,7 +4957,7 @@ function decodeDataUrlAttachment(value, basename) {
   try {
     const bytes = isBase64 ? Buffer4.from(payload, "base64") : Buffer4.from(decodeURIComponent(payload), "utf8");
     return {
-      filename: `${basename}.${resolveAttachmentExtension(mimeType)}`,
+      filename: buildLoggedAttachmentFilename(options.prefix, options.index, mimeType),
       bytes
     };
   } catch {
@@ -4874,10 +4966,10 @@ function decodeDataUrlAttachment(value, basename) {
 }
 function collectPayloadAttachments(value, options) {
   if (typeof value === "string") {
-    const attachment = decodeDataUrlAttachment(
-      value,
-      `${options.prefix}-${options.counter.toString()}`
-    );
+    const attachment = decodeDataUrlAttachment(value, {
+      prefix: options.prefix,
+      index: options.counter
+    });
     if (attachment) {
       options.attachments.push(attachment);
       options.counter += 1;
@@ -4902,7 +4994,7 @@ function collectPayloadAttachments(value, options) {
   if (typeof record.data === "string" && mimeType) {
     try {
       options.attachments.push({
-        filename: `${options.prefix}-${options.counter.toString()}.${resolveAttachmentExtension(mimeType)}`,
+        filename: buildLoggedAttachmentFilename(options.prefix, options.counter, mimeType),
         bytes: decodeInlineDataBuffer(record.data)
       });
       options.counter += 1;
@@ -4922,27 +5014,166 @@ function serialiseRequestPayloadForLogging(value) {
 `;
   }
 }
+function serialiseLogArtifactText(value) {
+  if (value === null || value === void 0) {
+    return void 0;
+  }
+  if (typeof value === "string") {
+    if (value.length === 0) {
+      return void 0;
+    }
+    return value.endsWith("\n") ? value : `${value}
+`;
+  }
+  if (Array.isArray(value) && value.length === 0) {
+    return void 0;
+  }
+  if (isPlainRecord(value) && Object.keys(value).length === 0) {
+    return void 0;
+  }
+  try {
+    return `${JSON.stringify(sanitiseLogValue(value), null, 2)}
+`;
+  } catch {
+    return `${String(value)}
+`;
+  }
+}
+function collectLoggedAttachmentsFromLlmParts(parts, prefix) {
+  const attachments = [];
+  let index = 1;
+  for (const part of parts) {
+    if (part.type !== "inlineData") {
+      continue;
+    }
+    attachments.push({
+      filename: buildLoggedAttachmentFilename(prefix, index, part.mimeType),
+      bytes: decodeInlineDataBuffer(part.data)
+    });
+    index += 1;
+  }
+  return attachments;
+}
+function collectLoggedAttachmentsFromGeminiParts(parts, prefix) {
+  return collectLoggedAttachmentsFromLlmParts(convertGooglePartsToLlmParts(parts), prefix);
+}
+function extractToolCallResponseTextFromOpenAiInput(input) {
+  if (!Array.isArray(input)) {
+    return void 0;
+  }
+  const responses = input.filter((item) => isPlainRecord(item)).flatMap((item) => {
+    const type = typeof item.type === "string" ? item.type : "";
+    if (type !== "function_call_output" && type !== "custom_tool_call_output") {
+      return [];
+    }
+    return [
+      {
+        type,
+        callId: typeof item.call_id === "string" ? item.call_id : void 0,
+        output: "output" in item ? sanitiseLogValue(item.output) : void 0
+      }
+    ];
+  });
+  return serialiseLogArtifactText(responses);
+}
+function extractToolCallResponseTextFromFireworksMessages(messages) {
+  if (!Array.isArray(messages)) {
+    return void 0;
+  }
+  const responses = messages.filter((message) => isPlainRecord(message)).flatMap((message) => {
+    if (message.role !== "tool") {
+      return [];
+    }
+    return [
+      {
+        toolCallId: typeof message.tool_call_id === "string" ? message.tool_call_id : void 0,
+        content: sanitiseLogValue(message.content)
+      }
+    ];
+  });
+  return serialiseLogArtifactText(responses);
+}
+function extractToolCallResponseTextFromGeminiContents(contents) {
+  if (!Array.isArray(contents)) {
+    return void 0;
+  }
+  const responses = [];
+  for (const content of contents) {
+    if (!content || typeof content !== "object") {
+      continue;
+    }
+    const parts = content.parts;
+    if (!Array.isArray(parts)) {
+      continue;
+    }
+    for (const part of parts) {
+      if (!part || typeof part !== "object") {
+        continue;
+      }
+      const functionResponse = part.functionResponse;
+      if (functionResponse) {
+        responses.push(sanitiseLogValue(functionResponse));
+      }
+    }
+  }
+  return serialiseLogArtifactText(responses);
+}
+function serialiseOpenAiStyleToolCallsForLogging(calls) {
+  return serialiseLogArtifactText(
+    calls.map((call) => {
+      if (call.kind === "custom") {
+        return {
+          kind: call.kind,
+          name: call.name,
+          callId: call.callId,
+          itemId: call.itemId,
+          input: call.input
+        };
+      }
+      const { value, error } = parseOpenAiToolArguments(call.arguments);
+      return {
+        kind: call.kind,
+        name: call.name,
+        callId: call.callId,
+        itemId: call.itemId,
+        arguments: value,
+        ...error ? { parseError: error, rawArguments: call.arguments } : {}
+      };
+    })
+  );
+}
+function serialiseGeminiToolCallsForLogging(calls) {
+  return serialiseLogArtifactText(
+    calls.map((call) => ({
+      name: call.name ?? "unknown",
+      callId: typeof call.id === "string" ? call.id : void 0,
+      arguments: sanitiseLogValue(call.args ?? {})
+    }))
+  );
+}
 function startLlmCallLoggerFromContents(options) {
   const session = getCurrentAgentLoggingSession();
   if (!session) {
     return void 0;
   }
   const attachments = [];
+  let attachmentIndex = 1;
   const sections = [];
   for (const [messageIndex, message] of options.contents.entries()) {
     sections.push(`### message_${(messageIndex + 1).toString()} role=${message.role}`);
-    for (const [partIndex, part] of message.parts.entries()) {
+    for (const part of message.parts) {
       if (part.type === "text") {
         const channel = part.thought === true ? "thought" : "response";
         sections.push(`[text:${channel}]`);
         sections.push(part.text);
         continue;
       }
-      const filename = `message-${(messageIndex + 1).toString()}-part-${(partIndex + 1).toString()}.${resolveAttachmentExtension(part.mimeType)}`;
+      const filename = buildLoggedAttachmentFilename("input", attachmentIndex, part.mimeType);
       attachments.push({
         filename,
         bytes: decodeInlineDataBuffer(part.data)
       });
+      attachmentIndex += 1;
       sections.push(
         `[inlineData] file=${filename} mime=${part.mimeType ?? "application/octet-stream"} bytes=${attachments[attachments.length - 1]?.bytes.byteLength ?? 0}`
       );
@@ -4986,11 +5217,18 @@ function startLlmCallLoggerFromPayload(options) {
   }
   const attachments = [];
   collectPayloadAttachments(options.requestPayload, {
-    prefix: `step-${options.step.toString()}`,
+    prefix: "input",
     attachments,
     seen: /* @__PURE__ */ new WeakSet(),
     counter: 1
   });
+  const toolCallResponseText = options.provider === "openai" || options.provider === "chatgpt" ? extractToolCallResponseTextFromOpenAiInput(
+    options.requestPayload.input
+  ) : options.provider === "fireworks" ? extractToolCallResponseTextFromFireworksMessages(
+    options.requestPayload.messages
+  ) : extractToolCallResponseTextFromGeminiContents(
+    options.requestPayload.contents
+  );
   return session.startLlmCall({
     provider: options.provider,
     modelId: options.modelId,
@@ -4999,7 +5237,8 @@ function startLlmCallLoggerFromPayload(options) {
       step: options.step,
       ...getCurrentToolCallContext() ? { toolContext: getCurrentToolCallContext() } : {}
     },
-    attachments
+    attachments,
+    toolCallResponseText
   });
 }
 async function runTextCall(params) {
@@ -5304,6 +5543,7 @@ async function runTextCall(params) {
     const mergedParts = mergeConsecutiveTextParts(responseParts);
     const content = mergedParts.length > 0 ? { role: responseRole ?? "assistant", parts: mergedParts } : void 0;
     const { text, thoughts } = extractTextByChannel(content);
+    const outputAttachments = collectLoggedAttachmentsFromLlmParts(mergedParts, "output");
     const costUsd = estimateCallCostUsd({
       modelId: modelVersion,
       tokens: latestUsage,
@@ -5314,16 +5554,20 @@ async function runTextCall(params) {
       queue.push({ type: "usage", usage: latestUsage, costUsd, modelVersion });
     }
     callLogger?.complete({
-      provider,
-      model: request.model,
-      modelVersion,
-      blocked,
-      costUsd,
-      usage: latestUsage,
-      grounding: grounding ? sanitiseLogValue(grounding) : void 0,
-      responseChars: text.length,
-      thoughtChars: thoughts.length,
-      responseImages
+      responseText: text,
+      attachments: outputAttachments,
+      metadata: {
+        provider,
+        model: request.model,
+        modelVersion,
+        blocked,
+        costUsd,
+        usage: latestUsage,
+        grounding: grounding ? sanitiseLogValue(grounding) : void 0,
+        responseChars: text.length,
+        thoughtChars: thoughts.length,
+        responseImages
+      }
     });
     return {
       provider,
@@ -5338,14 +5582,21 @@ async function runTextCall(params) {
       grounding
     };
   } catch (error) {
+    const partialParts = mergeConsecutiveTextParts(responseParts);
+    const partialContent = partialParts.length > 0 ? { role: responseRole ?? "assistant", parts: partialParts } : void 0;
+    const { text: partialText } = extractTextByChannel(partialContent);
     callLogger?.fail(error, {
-      provider,
-      model: request.model,
-      modelVersion,
-      blocked,
-      usage: latestUsage,
-      partialResponseParts: responseParts.length,
-      responseImages
+      responseText: partialText,
+      attachments: collectLoggedAttachmentsFromLlmParts(partialParts, "output"),
+      metadata: {
+        provider,
+        model: request.model,
+        modelVersion,
+        blocked,
+        usage: latestUsage,
+        partialResponseParts: responseParts.length,
+        responseImages
+      }
     });
     throw error;
   }
@@ -5812,6 +6063,9 @@ async function runToolLoop(request) {
         let usageTokens;
         let thoughtDeltaEmitted = false;
         let blocked = false;
+        let responseText = "";
+        let reasoningSummary = "";
+        let stepToolCallText;
         const stepRequestPayload = {
           model: providerInfo.model,
           input,
@@ -5904,8 +6158,8 @@ async function runToolLoop(request) {
             throw new Error(message);
           }
           usageTokens = extractOpenAiUsageTokens(finalResponse.usage);
-          const responseText = extractOpenAiResponseParts(finalResponse).parts.filter((p) => p.type === "text" && p.thought !== true).map((p) => p.text).join("").trim();
-          const reasoningSummary = extractOpenAiReasoningSummary(finalResponse).trim();
+          responseText = extractOpenAiResponseParts(finalResponse).parts.filter((p) => p.type === "text" && p.thought !== true).map((p) => p.text).join("").trim();
+          reasoningSummary = extractOpenAiReasoningSummary(finalResponse).trim();
           if (!thoughtDeltaEmitted && reasoningSummary.length > 0) {
             stepCallLogger?.appendThoughtDelta(reasoningSummary);
             emitEvent({ type: "delta", channel: "thought", text: reasoningSummary });
@@ -5921,6 +6175,23 @@ async function runToolLoop(request) {
             emitEvent({ type: "usage", usage: usageTokens, costUsd: stepCostUsd, modelVersion });
           }
           const responseToolCalls = extractOpenAiToolCalls(finalResponse.output);
+          stepToolCallText = serialiseOpenAiStyleToolCallsForLogging(
+            responseToolCalls.map(
+              (call) => call.kind === "custom" ? {
+                kind: call.kind,
+                name: call.name,
+                input: call.input,
+                callId: call.call_id,
+                itemId: call.id
+              } : {
+                kind: call.kind,
+                name: call.name,
+                arguments: call.arguments,
+                callId: call.call_id,
+                itemId: call.id
+              }
+            )
+          );
           const stepToolCalls = [];
           if (responseToolCalls.length === 0) {
             const steeringInput2 = steeringInternal?.drainPendingContents() ?? [];
@@ -5948,17 +6219,20 @@ async function runToolLoop(request) {
               timing: timing2
             });
             stepCallLogger?.complete({
-              provider: "openai",
-              model: request.model,
-              modelVersion,
-              step: turn,
-              usage: usageTokens,
-              costUsd: stepCostUsd,
-              blocked,
-              responseChars: responseText.length,
-              thoughtChars: reasoningSummary.length,
-              toolCalls: 0,
-              finalStep: steeringItems2.length === 0
+              responseText,
+              metadata: {
+                provider: "openai",
+                model: request.model,
+                modelVersion,
+                step: turn,
+                usage: usageTokens,
+                costUsd: stepCostUsd,
+                blocked,
+                responseChars: responseText.length,
+                thoughtChars: reasoningSummary.length,
+                toolCalls: 0,
+                finalStep: steeringItems2.length === 0
+              }
             });
             if (steeringItems2.length === 0) {
               return { text: finalText, thoughts: finalThoughts, steps, totalCostUsd };
@@ -6081,28 +6355,36 @@ async function runToolLoop(request) {
           const steeringInput = steeringInternal?.drainPendingContents() ?? [];
           const steeringItems = steeringInput.length > 0 ? toOpenAiInput(steeringInput) : [];
           stepCallLogger?.complete({
-            provider: "openai",
-            model: request.model,
-            modelVersion,
-            step: turn,
-            usage: usageTokens,
-            costUsd: stepCostUsd,
-            blocked,
-            responseChars: responseText.length,
-            thoughtChars: reasoningSummary.length,
-            toolCalls: stepToolCalls.length,
-            finalStep: false
+            responseText,
+            toolCallText: stepToolCallText,
+            metadata: {
+              provider: "openai",
+              model: request.model,
+              modelVersion,
+              step: turn,
+              usage: usageTokens,
+              costUsd: stepCostUsd,
+              blocked,
+              responseChars: responseText.length,
+              thoughtChars: reasoningSummary.length,
+              toolCalls: stepToolCalls.length,
+              finalStep: false
+            }
           });
           previousResponseId = finalResponse.id;
           input = steeringItems.length > 0 ? toolOutputs.concat(steeringItems) : toolOutputs;
         } catch (error) {
           stepCallLogger?.fail(error, {
-            provider: "openai",
-            model: request.model,
-            modelVersion,
-            step: turn,
-            usage: usageTokens,
-            blocked
+            responseText,
+            toolCallText: stepToolCallText,
+            metadata: {
+              provider: "openai",
+              model: request.model,
+              modelVersion,
+              step: turn,
+              usage: usageTokens,
+              blocked
+            }
           });
           throw error;
         }
@@ -6128,6 +6410,7 @@ async function runToolLoop(request) {
         let usageTokens;
         let responseText = "";
         let reasoningSummaryText = "";
+        let stepToolCallText;
         const markFirstModelEvent = () => {
           if (firstModelEventAtMs === void 0) {
             firstModelEventAtMs = Date.now();
@@ -6196,6 +6479,23 @@ async function runToolLoop(request) {
             stepCallLogger?.appendResponseDelta(responseText);
           }
           const responseToolCalls = response.toolCalls ?? [];
+          stepToolCallText = serialiseOpenAiStyleToolCallsForLogging(
+            responseToolCalls.map(
+              (call) => call.kind === "custom" ? {
+                kind: call.kind,
+                name: call.name,
+                input: call.input,
+                callId: call.callId,
+                itemId: call.id
+              } : {
+                kind: call.kind,
+                name: call.name,
+                arguments: call.arguments,
+                callId: call.callId,
+                itemId: call.id
+              }
+            )
+          );
           if (responseToolCalls.length === 0) {
             const steeringInput2 = steeringInternal?.drainPendingContents() ?? [];
             const steeringItems2 = steeringInput2.length > 0 ? toChatGptInput(steeringInput2).input : [];
@@ -6221,16 +6521,19 @@ async function runToolLoop(request) {
               timing: timing2
             });
             stepCallLogger?.complete({
-              provider: "chatgpt",
-              model: request.model,
-              modelVersion,
-              step: turn,
-              usage: usageTokens,
-              costUsd: stepCostUsd,
-              responseChars: responseText.length,
-              thoughtChars: reasoningSummaryText.length,
-              toolCalls: 0,
-              finalStep: steeringItems2.length === 0
+              responseText,
+              metadata: {
+                provider: "chatgpt",
+                model: request.model,
+                modelVersion,
+                step: turn,
+                usage: usageTokens,
+                costUsd: stepCostUsd,
+                responseChars: responseText.length,
+                thoughtChars: reasoningSummaryText.length,
+                toolCalls: 0,
+                finalStep: steeringItems2.length === 0
+              }
             });
             if (steeringItems2.length === 0) {
               return { text: finalText, thoughts: finalThoughts, steps, totalCostUsd };
@@ -6363,25 +6666,33 @@ async function runToolLoop(request) {
           const steeringInput = steeringInternal?.drainPendingContents() ?? [];
           const steeringItems = steeringInput.length > 0 ? toChatGptInput(steeringInput).input : [];
           stepCallLogger?.complete({
-            provider: "chatgpt",
-            model: request.model,
-            modelVersion,
-            step: turn,
-            usage: usageTokens,
-            costUsd: stepCostUsd,
-            responseChars: responseText.length,
-            thoughtChars: reasoningSummaryText.length,
-            toolCalls: toolCalls.length,
-            finalStep: false
+            responseText,
+            toolCallText: stepToolCallText,
+            metadata: {
+              provider: "chatgpt",
+              model: request.model,
+              modelVersion,
+              step: turn,
+              usage: usageTokens,
+              costUsd: stepCostUsd,
+              responseChars: responseText.length,
+              thoughtChars: reasoningSummaryText.length,
+              toolCalls: toolCalls.length,
+              finalStep: false
+            }
           });
           input = steeringItems.length > 0 ? input.concat(toolOutputs, steeringItems) : input.concat(toolOutputs);
         } catch (error) {
           stepCallLogger?.fail(error, {
-            provider: "chatgpt",
-            model: request.model,
-            modelVersion,
-            step: turn,
-            usage: usageTokens
+            responseText,
+            toolCallText: stepToolCallText,
+            metadata: {
+              provider: "chatgpt",
+              model: request.model,
+              modelVersion,
+              step: turn,
+              usage: usageTokens
+            }
           });
           throw error;
         }
@@ -6404,6 +6715,7 @@ async function runToolLoop(request) {
         let usageTokens;
         let responseText = "";
         let blocked = false;
+        let stepToolCallText;
         const stepRequestPayload = {
           model: providerInfo.model,
           messages,
@@ -6468,6 +6780,14 @@ async function runToolLoop(request) {
             });
           }
           const responseToolCalls = extractFireworksToolCalls(message);
+          stepToolCallText = serialiseOpenAiStyleToolCallsForLogging(
+            responseToolCalls.map((call) => ({
+              kind: "function",
+              name: call.name,
+              arguments: call.arguments,
+              callId: call.id
+            }))
+          );
           if (responseToolCalls.length === 0) {
             const steeringInput2 = steeringInternal?.drainPendingContents() ?? [];
             const steeringMessages = steeringInput2.length > 0 ? toFireworksMessages(steeringInput2) : [];
@@ -6493,17 +6813,20 @@ async function runToolLoop(request) {
               timing: timing2
             });
             stepCallLogger?.complete({
-              provider: "fireworks",
-              model: request.model,
-              modelVersion,
-              step: turn,
-              usage: usageTokens,
-              costUsd: stepCostUsd,
-              blocked,
-              responseChars: responseText.length,
-              thoughtChars: 0,
-              toolCalls: 0,
-              finalStep: steeringMessages.length === 0
+              responseText,
+              metadata: {
+                provider: "fireworks",
+                model: request.model,
+                modelVersion,
+                step: turn,
+                usage: usageTokens,
+                costUsd: stepCostUsd,
+                blocked,
+                responseChars: responseText.length,
+                thoughtChars: 0,
+                toolCalls: 0,
+                finalStep: steeringMessages.length === 0
+              }
             });
             if (steeringMessages.length === 0) {
               return { text: finalText, thoughts: finalThoughts, steps, totalCostUsd };
@@ -6615,17 +6938,21 @@ async function runToolLoop(request) {
             timing
           });
           stepCallLogger?.complete({
-            provider: "fireworks",
-            model: request.model,
-            modelVersion,
-            step: turn,
-            usage: usageTokens,
-            costUsd: stepCostUsd,
-            blocked,
-            responseChars: responseText.length,
-            thoughtChars: 0,
-            toolCalls: stepToolCalls.length,
-            finalStep: false
+            responseText,
+            toolCallText: stepToolCallText,
+            metadata: {
+              provider: "fireworks",
+              model: request.model,
+              modelVersion,
+              step: turn,
+              usage: usageTokens,
+              costUsd: stepCostUsd,
+              blocked,
+              responseChars: responseText.length,
+              thoughtChars: 0,
+              toolCalls: stepToolCalls.length,
+              finalStep: false
+            }
           });
           messages.push({
             role: "assistant",
@@ -6639,12 +6966,16 @@ async function runToolLoop(request) {
           }
         } catch (error) {
           stepCallLogger?.fail(error, {
-            provider: "fireworks",
-            model: request.model,
-            modelVersion,
-            step: turn,
-            usage: usageTokens,
-            blocked
+            responseText,
+            toolCallText: stepToolCallText,
+            metadata: {
+              provider: "fireworks",
+              model: request.model,
+              modelVersion,
+              step: turn,
+              usage: usageTokens,
+              blocked
+            }
           });
           throw error;
         }
@@ -6664,6 +6995,7 @@ async function runToolLoop(request) {
       let usageTokens;
       let responseText = "";
       let thoughtsText = "";
+      let stepToolCallText;
       const markFirstModelEvent = () => {
         if (firstModelEventAtMs === void 0) {
           firstModelEventAtMs = Date.now();
@@ -6784,12 +7116,17 @@ async function runToolLoop(request) {
         modelVersion = response.modelVersion ?? request.model;
         responseText = response.responseText.trim();
         thoughtsText = response.thoughtsText.trim();
+        const responseOutputAttachments = collectLoggedAttachmentsFromGeminiParts(
+          response.modelParts,
+          "output"
+        );
         const stepCostUsd = estimateCallCostUsd({
           modelId: modelVersion,
           tokens: usageTokens,
           responseImages: 0
         });
         totalCostUsd += stepCostUsd;
+        stepToolCallText = serialiseGeminiToolCallsForLogging(response.functionCalls);
         if (response.functionCalls.length === 0) {
           const steeringInput2 = steeringInternal?.drainPendingContents() ?? [];
           finalText = responseText;
@@ -6815,16 +7152,20 @@ async function runToolLoop(request) {
             timing: timing2
           });
           stepCallLogger?.complete({
-            provider: "gemini",
-            model: request.model,
-            modelVersion,
-            step: turn,
-            usage: usageTokens,
-            costUsd: stepCostUsd,
-            responseChars: responseText.length,
-            thoughtChars: thoughtsText.length,
-            toolCalls: 0,
-            finalStep: steeringInput2.length === 0
+            responseText,
+            attachments: responseOutputAttachments,
+            metadata: {
+              provider: "gemini",
+              model: request.model,
+              modelVersion,
+              step: turn,
+              usage: usageTokens,
+              costUsd: stepCostUsd,
+              responseChars: responseText.length,
+              thoughtChars: thoughtsText.length,
+              toolCalls: 0,
+              finalStep: steeringInput2.length === 0
+            }
           });
           if (steeringInput2.length === 0) {
             return { text: finalText, thoughts: finalThoughts, steps, totalCostUsd };
@@ -6951,16 +7292,21 @@ async function runToolLoop(request) {
           timing
         });
         stepCallLogger?.complete({
-          provider: "gemini",
-          model: request.model,
-          modelVersion,
-          step: turn,
-          usage: usageTokens,
-          costUsd: stepCostUsd,
-          responseChars: responseText.length,
-          thoughtChars: thoughtsText.length,
-          toolCalls: toolCalls.length,
-          finalStep: false
+          responseText,
+          attachments: responseOutputAttachments,
+          toolCallText: stepToolCallText,
+          metadata: {
+            provider: "gemini",
+            model: request.model,
+            modelVersion,
+            step: turn,
+            usage: usageTokens,
+            costUsd: stepCostUsd,
+            responseChars: responseText.length,
+            thoughtChars: thoughtsText.length,
+            toolCalls: toolCalls.length,
+            finalStep: false
+          }
         });
         geminiContents.push({ role: "user", parts: responseParts });
         const steeringInput = steeringInternal?.drainPendingContents() ?? [];
@@ -6969,13 +7315,17 @@ async function runToolLoop(request) {
         }
       } catch (error) {
         stepCallLogger?.fail(error, {
-          provider: "gemini",
-          model: request.model,
-          modelVersion,
-          step: turn,
-          usage: usageTokens,
-          responseChars: responseText.length,
-          thoughtChars: thoughtsText.length
+          responseText,
+          toolCallText: stepToolCallText,
+          metadata: {
+            provider: "gemini",
+            model: request.model,
+            modelVersion,
+            step: turn,
+            usage: usageTokens,
+            responseChars: responseText.length,
+            thoughtChars: thoughtsText.length
+          }
         });
         throw error;
       }
@@ -10024,19 +10374,17 @@ async function runAgentLoopInternal(request, context) {
   );
   const sourceOnEvent = toolLoopRequestWithSteering.onEvent;
   const includeLlmStreamEvents = telemetrySession?.includeLlmStreamEvents === true;
+  const streamEventLogger = loggingSession ? createAgentStreamEventLogger({
+    append: (line) => {
+      loggingSession.logLine(`[agent:${runId}] ${line}`);
+    }
+  }) : void 0;
   const wrappedOnEvent = sourceOnEvent || includeLlmStreamEvents ? (event) => {
     sourceOnEvent?.(event);
     if (includeLlmStreamEvents) {
       emitTelemetry({ type: "agent.run.stream", event });
     }
-    if (loggingSession) {
-      appendAgentStreamEventLog({
-        event,
-        append: (line) => {
-          loggingSession.logLine(`[agent:${runId}] ${line}`);
-        }
-      });
-    }
+    streamEventLogger?.appendEvent(event);
   } : void 0;
   try {
     const result = await runToolLoop({
@@ -10045,6 +10393,7 @@ async function runAgentLoopInternal(request, context) {
       ...wrappedOnEvent ? { onEvent: wrappedOnEvent } : {},
       tools: mergedTools
     });
+    streamEventLogger?.flush();
     emitTelemetry({
       type: "agent.run.completed",
       success: true,
@@ -10077,6 +10426,7 @@ async function runAgentLoopInternal(request, context) {
     }
     return result;
   } catch (error) {
+    streamEventLogger?.flush();
     emitTelemetry({
       type: "agent.run.completed",
       success: false,
@@ -10093,6 +10443,7 @@ async function runAgentLoopInternal(request, context) {
     );
     throw error;
   } finally {
+    streamEventLogger?.flush();
     await subagentController?.closeAll();
   }
 }