@qwen-code/qwen-code 0.18.0 → 0.18.1

package/chunks/{chunk-6YIUGZTC.js → chunk-RON7LFNH.js}

@@ -20,19 +20,22 @@ import {
 } from "./chunk-OFEVLU4C.js";
 import {
   isAnyAutoMemPath
-} from "./chunk-3HTIVKZE.js";
+} from "./chunk-IQHSD7K5.js";
 import {
   InstallationManager
-} from "./chunk-IDX6COTE.js";
+} from "./chunk-LYRSMKLS.js";
 import {
   STRUCTURED_OUTPUT_REDACTED_ARGS
-} from "./chunk-BIVG75CP.js";
+} from "./chunk-QILTEBWS.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-XV4HCEVI.js";
+} from "./chunk-A2ZIEEGJ.js";
+import {
+  atomicWriteFile
+} from "./chunk-LXYWINWF.js";
 import {
   DEFAULT_OPENAI_BASE_URL,
   convertSchema,
@@ -40,7 +43,7 @@ import {
   runtimeDiagnostics,
   safeJsonParse,
   tokenLimit
-} from "./chunk-M6VTDSVR.js";
+} from "./chunk-LYSND7KR.js";
 import {
   FinishReason,
   GenerateContentResponse
@@ -49,6 +52,8 @@ import {
   FatalConfigError,
   Storage,
   createDebugLogger,
+  formatTraceparent,
+  getActiveSpanTraceContext,
   getCurrentSessionId,
   getErrorMessage,
   getErrorStatus,
@@ -60,7 +65,7 @@ import {
   setShellTracePropagation,
   shortenPath,
   unescapePath
-} from "./chunk-HR7SV7AY.js";
+} from "./chunk-HA2UEYZP.js";
 import {
   require_dist
 } from "./chunk-ZERZSAZL.js";
@@ -20117,13 +20122,13 @@ var require_path = __commonJS({
     "use strict";
     init_esbuild_shims();
     var path8 = exports;
-    var isAbsolute2 = (
+    var isAbsolute3 = (
       /**
        * Tests if the specified path is absolute.
        * @param {string} path Path to test
        * @returns {boolean} `true` if path is absolute
        */
-      path8.isAbsolute = /* @__PURE__ */ __name(function isAbsolute3(path9) {
+      path8.isAbsolute = /* @__PURE__ */ __name(function isAbsolute4(path9) {
         return /^(?:\/|\w+:)/.test(path9);
       }, "isAbsolute")
     );
@@ -20135,7 +20140,7 @@ var require_path = __commonJS({
        */
       path8.normalize = /* @__PURE__ */ __name(function normalize4(path9) {
         path9 = path9.replace(/\\/g, "/").replace(/\/{2,}/g, "/");
-        var parts = path9.split("/"), absolute = isAbsolute2(path9), prefix = "";
+        var parts = path9.split("/"), absolute = isAbsolute3(path9), prefix = "";
         if (absolute)
           prefix = parts.shift() + "/";
         for (var i = 0; i < parts.length; ) {
@@ -20157,7 +20162,7 @@ var require_path = __commonJS({
     path8.resolve = /* @__PURE__ */ __name(function resolve2(originPath, includePath, alreadyNormalized) {
       if (!alreadyNormalized)
         includePath = normalize3(includePath);
-      if (isAbsolute2(includePath))
+      if (isAbsolute3(includePath))
         return includePath;
       if (!alreadyNormalized)
         originPath = normalize3(originPath);
@@ -63710,6 +63715,10 @@ init_esbuild_shims();
 import * as fs3 from "node:fs/promises";
 import * as path4 from "node:path";
 import * as crypto2 from "node:crypto";
+var debugLogger3 = createDebugLogger("TRUNCATION");
+var PREVIEW_SIZE_CHARS = 2e3;
+var MAX_FILE_SIZE_BYTES = 50 * 1024 * 1024;
+var MAX_SESSION_BYTES = 500 * 1024 * 1024;
 var TOOL_OUTPUT_TRUNCATED_PREFIX = "Tool output was too large and has been truncated";
 async function truncateAndSaveToFile(content, fileName, projectTempDir, threshold, truncateLines, keep = "both") {
   if (content.length <= threshold && !Number.isFinite(truncateLines)) {
@@ -63785,7 +63794,11 @@ ${truncatedContent}`;
       content: wrappedMessage,
       outputFile
     };
-  } catch (_error) {
+  } catch (error) {
+    debugLogger3.warn(
+      `Failed to save truncated output to ${outputFile}:`,
+      error
+    );
     return {
       content: truncatedContent + `
 [Note: Could not save full output to file]`
@@ -63869,9 +63882,118 @@ async function truncateLlmContent(config, toolName, content, limits, promptId) {
   };
 }
 __name(truncateLlmContent, "truncateLlmContent");
+function isAlreadyTruncated(content) {
+  return content.includes("... [CONTENT TRUNCATED] ...") || content.startsWith("<persisted-output>");
+}
+__name(isAlreadyTruncated, "isAlreadyTruncated");
+function generatePreview(content) {
+  let text = content.length <= PREVIEW_SIZE_CHARS ? content : (() => {
+    const slice = content.slice(0, PREVIEW_SIZE_CHARS);
+    const lastNewline = slice.lastIndexOf("\n");
+    return (lastNewline > 0 ? slice.slice(0, lastNewline) : slice) + "\n...";
+  })();
+  text = text.replace(/<\/?persisted-output>/g, (m) => `&lt;${m.slice(1, -1)}&gt;`).replace(/<\/?system-reminder>/g, (m) => `&lt;${m.slice(1, -1)}&gt;`);
+  return text;
+}
+__name(generatePreview, "generatePreview");
+async function persistAndTruncateToolResult(callId, toolName, content, config) {
+  const byteSize = Buffer.byteLength(content, "utf-8");
+  if (byteSize > MAX_FILE_SIZE_BYTES) {
+    debugLogger3.warn(
+      `Tool result for ${toolName} exceeds ${MAX_FILE_SIZE_BYTES} bytes (${byteSize}), skipping disk persistence`
+    );
+    return {
+      content: buildStub(content, byteSize, "(file too large to persist)"),
+      bytesWritten: 0
+    };
+  }
+  const budgetUsed = config.getToolResultBytesWritten();
+  if (budgetUsed + byteSize > MAX_SESSION_BYTES) {
+    debugLogger3.warn(
+      `Session tool result budget exhausted (${budgetUsed} + ${byteSize} > ${MAX_SESSION_BYTES}), skipping disk persistence`
+    );
+    return {
+      content: buildStub(
+        content,
+        byteSize,
+        "(session disk budget exhausted)"
+      ),
+      bytesWritten: 0
+    };
+  }
+  config.trackToolResultBytes(byteSize);
+  const safeCallId = path4.basename(callId).replace(/\x00/g, "_");
+  if (!safeCallId || safeCallId === "." || safeCallId === "..") {
+    debugLogger3.warn(`Invalid callId for disk persistence: ${JSON.stringify(callId)}`);
+    config.trackToolResultBytes(-byteSize);
+    return {
+      content: buildStub(content, byteSize, "(invalid callId)"),
+      bytesWritten: 0
+    };
+  }
+  const toolResultsDir = config.storage.getToolResultsDir();
+  const outputFile = path4.join(toolResultsDir, `${safeCallId}.txt`);
+  try {
+    await fs3.mkdir(toolResultsDir, { recursive: true });
+    await atomicWriteFile(outputFile, content, {
+      mode: 384,
+      forceMode: true,
+      noFollow: true,
+      flush: false
+    });
+    return {
+      content: buildStub(content, byteSize, outputFile),
+      outputFile,
+      bytesWritten: byteSize
+    };
+  } catch (error) {
+    config.trackToolResultBytes(-byteSize);
+    debugLogger3.warn(
+      `Failed to persist tool result to ${outputFile}:`,
+      error
+    );
+    try {
+      const fallback = await truncateAndSaveToFile(
+        content,
+        `${toolName}_${crypto2.randomBytes(6).toString("hex")}`,
+        config.storage.getProjectTempDir(),
+        config.getTruncateToolOutputThreshold(),
+        config.getTruncateToolOutputLines()
+      );
+      return { content: fallback.content, bytesWritten: 0 };
+    } catch (fallbackError) {
+      debugLogger3.warn("Fallback truncation also failed:", fallbackError);
+      return {
+        content: buildStub(content, byteSize, "(disk persistence unavailable)"),
+        bytesWritten: 0
+      };
+    }
+  }
+}
+__name(persistAndTruncateToolResult, "persistAndTruncateToolResult");
+function buildStub(content, byteSize, filePathOrNote) {
+  const preview = generatePreview(content);
+  const sizeKb = Math.round(byteSize / 1024);
+  const isFilePath = path4.isAbsolute(filePathOrNote);
+  if (isFilePath) {
+    return `<persisted-output>
+Output too large (${sizeKb} KB). Full output saved to: ${filePathOrNote}
+Note: this file may be cleaned up after 24 hours.
+To read the complete output, use the ${ReadFileTool.Name} tool with the absolute file path above.
+
+Preview (up to ${PREVIEW_SIZE_CHARS} chars):
+${preview}
+</persisted-output>`;
+  }
+  return `Output too large (${sizeKb} KB). ${filePathOrNote}
+
+Preview (up to ${PREVIEW_SIZE_CHARS} chars):
+${preview}`;
+}
+__name(buildStub, "buildStub");
 
 // packages/core/src/tools/mcp-tool.ts
-var debugLogger3 = createDebugLogger("MCP_TOOL");
+var debugLogger4 = createDebugLogger("MCP_TOOL");
 var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends BaseToolInvocation {
   constructor(mcpTool, serverName, serverToolName, displayName, trust, params = {}, cliConfig, mcpClient, mcpTimeout, annotations, retryCount = 0) {
     super(params);
@@ -63941,7 +64063,7 @@ var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends Bas
       return null;
     }
     try {
-      debugLogger3.info(
+      debugLogger4.info(
         `Attempting to reconnect MCP server '${this.serverName}'...`
       );
       const toolRegistry = this.cliConfig.getToolRegistry();
@@ -63950,23 +64072,23 @@ var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends Bas
         `mcp__${this.serverName}__${this.serverToolName}`
       );
       if (newTool instanceof DiscoveredMCPTool) {
-        debugLogger3.info(
+        debugLogger4.info(
           `Successfully reconnected to MCP server '${this.serverName}'`
         );
         return newTool;
       }
       return null;
     } catch (error) {
-      debugLogger3.error(
+      debugLogger4.error(
         `Failed to reconnect MCP server '${this.serverName}': ${error}`
       );
       return null;
     }
   }
   async handleReconnectOnError(error, signal, updateOutput) {
-    debugLogger3.error(`MCP server error '${this.serverName}': ${error}`);
+    debugLogger4.error(`MCP server error '${this.serverName}': ${error}`);
     if (this.retryCount < _DiscoveredMCPToolInvocation.MAX_RECONNECT_RETRIES) {
-      debugLogger3.info(
+      debugLogger4.info(
         `Reconnection attempt ${this.retryCount + 1}/${_DiscoveredMCPToolInvocation.MAX_RECONNECT_RETRIES} for MCP server '${this.serverName}'`
       );
       const newTool = await this.attemptReconnect();
@@ -63987,7 +64109,7 @@ var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends Bas
         return newInvocation.execute(signal, updateOutput);
       }
     } else if (this.retryCount >= _DiscoveredMCPToolInvocation.MAX_RECONNECT_RETRIES) {
-      debugLogger3.error(
+      debugLogger4.error(
         `Max reconnection attempts (${_DiscoveredMCPToolInvocation.MAX_RECONNECT_RETRIES}) reached for MCP server '${this.serverName}'`
       );
     }
@@ -65404,7 +65526,7 @@ init_esbuild_shims();
 
 // packages/core/src/core/openaiContentGenerator/taggedThinkingParser.ts
 init_esbuild_shims();
-var debugLogger4 = createDebugLogger("TAGGED_THINKING_PARSER");
+var debugLogger5 = createDebugLogger("TAGGED_THINKING_PARSER");
 var OPEN_TAGS = ["<think>", "<thinking>"];
 var CLOSE_TAGS = ["</think>", "</thinking>"];
 var MAX_TAG_LENGTH = Math.max(
@@ -65445,7 +65567,7 @@ var TaggedThinkingParser = class {
       const activeTags = this.mode === "text" ? OPEN_TAGS : CLOSE_TAGS;
       const matchedTag = findMatchingTag(lower, index, activeTags);
       if (matchedTag) {
-        debugLogger4.debug(
+        debugLogger5.debug(
           `taggedThinking: detected tag "${matchedTag}" at offset ${index}`
         );
         appendPart(parts, segment, this.mode);
@@ -65463,19 +65585,19 @@ var TaggedThinkingParser = class {
     if (index < this.buffer.length) {
       appendPart(parts, segment, this.mode);
       this.buffer = this.buffer.slice(index);
-      debugLogger4.debug(
+      debugLogger5.debug(
         `taggedThinking: emitted ${parts.length} part(s), buffered ${this.buffer.length} char(s)`
       );
       return parts;
     }
     this.buffer = "";
     if (this.mode === "thought" && segment) {
-      debugLogger4.warn(
+      debugLogger5.warn(
         `taggedThinking: flushing ${segment.length} chars of unclosed thought on stream end`
       );
     }
     appendPart(parts, segment, this.mode);
-    debugLogger4.debug(
+    debugLogger5.debug(
       `taggedThinking: emitted ${parts.length} part(s), flush complete`
     );
     return parts;
@@ -65487,7 +65609,7 @@ function parseTaggedThinkingText(text) {
 __name(parseTaggedThinkingText, "parseTaggedThinkingText");
 
 // packages/core/src/core/openaiContentGenerator/converter.ts
-var debugLogger5 = createDebugLogger("CONVERTER");
+var debugLogger6 = createDebugLogger("CONVERTER");
 var SPLIT_TOOL_MEDIA_TEXT = "(attached media from previous tool call)";
 var CUMULATIVE_DELTA_EXACT_REPEAT_MIN_LENGTH = 64;
 var CUMULATIVE_DETECTION_WINDOW_BYTES = 1024;
@@ -65508,12 +65630,12 @@ function normalizeStreamingTextDelta(rawDelta, state) {
       return suffix;
     }
     if (state.emittedText.startsWith(rawDelta)) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `normalizeStreamingTextDelta: cumulative rewind suppression (emitted=${state.emittedText.length}b, chunk=${rawDelta.length}b)`
       );
       return "";
     }
-    debugLogger5.debug(
+    debugLogger6.debug(
       "normalizeStreamingTextDelta: exiting cumulative mode (chunk does not match prior accumulated text)"
     );
     state.cumulativeMode = false;
@@ -65530,7 +65652,7 @@ function normalizeStreamingTextDelta(rawDelta, state) {
       state.emittedText = rawDelta;
       state.emittedLength = rawDelta.length;
       state.cumulativeMode = true;
-      debugLogger5.debug(
+      debugLogger6.debug(
         `normalizeStreamingTextDelta: entered cumulative mode (prefix overlap, baseline=${baselineLen}b sliceFrom=${sliceFrom}b -> curr=${rawDelta.length}b)`
       );
       return suffix;
@@ -65539,7 +65661,7 @@ function normalizeStreamingTextDelta(rawDelta, state) {
   if (rawDelta === state.emittedText) {
     if (rawDelta.length >= CUMULATIVE_DELTA_EXACT_REPEAT_MIN_LENGTH) {
       state.cumulativeMode = true;
-      debugLogger5.debug(
+      debugLogger6.debug(
         `normalizeStreamingTextDelta: entered cumulative mode (exact repeat, ${rawDelta.length}b)`
       );
       return "";
@@ -65759,6 +65881,8 @@ function processContent(content, messages, requestContext) {
   const reasoningParts = [];
   const toolCalls = [];
   let toolCallIndex = 0;
+  const emittedFunctionCallIds = /* @__PURE__ */ new Set();
+  const emittedFunctionResponseIds = /* @__PURE__ */ new Set();
   const accumulatedSplitMedia = [];
   for (const part of parts) {
     if (typeof part === "string") {
@@ -65778,8 +65902,18 @@ function processContent(content, messages, requestContext) {
       contentParts.push(mediaPart);
     }
     if ("functionCall" in part && part.functionCall && role === "assistant") {
+      const callId = part.functionCall.id;
+      if (callId) {
+        if (emittedFunctionCallIds.has(callId)) {
+          debugLogger6.debug(
+            `Dropping duplicate functionCall id=${callId} while converting content`
+          );
+          continue;
+        }
+        emittedFunctionCallIds.add(callId);
+      }
       toolCalls.push({
-        id: part.functionCall.id || `call_${toolCallIndex}`,
+        id: callId || `call_${toolCallIndex}`,
         type: "function",
         function: {
           name: part.functionCall.name || "",
@@ -65789,6 +65923,13 @@ function processContent(content, messages, requestContext) {
       toolCallIndex += 1;
     }
     if (part.functionResponse && role === "user") {
+      const responseId = part.functionResponse.id;
+      if (responseId) {
+        if (emittedFunctionResponseIds.has(responseId)) {
+          continue;
+        }
+        emittedFunctionResponseIds.add(responseId);
+      }
       const toolMessage = createToolMessage(
         part.functionResponse,
         requestContext
@@ -66048,7 +66189,7 @@ function createMediaContentPart(part, requestContext) {
 }
 __name(createMediaContentPart, "createMediaContentPart");
 function unsupportedModalityPlaceholder(modality, displayName, requestContext) {
-  debugLogger5.warn(
+  debugLogger6.warn(
     `Model '${requestContext.model}' does not support ${modality} input. Replacing with text placeholder: ${displayName}`
   );
   let hint;
@@ -66372,16 +66513,27 @@ function isSplitToolMediaMessage(message) {
 __name(isSplitToolMediaMessage, "isSplitToolMediaMessage");
 function cleanOrphanedToolCalls(messages) {
   const cleaned = [];
-  const adjacentToolResponseIdsByAssistant = /* @__PURE__ */ new Map();
+  const validToolCallsByAssistant = /* @__PURE__ */ new Map();
   const validToolResponseIndexesByAssistant = /* @__PURE__ */ new Map();
   const splitMediaIndexesByAssistant = /* @__PURE__ */ new Map();
   const emittedWithAssistant = /* @__PURE__ */ new Set();
+  const survivingToolCallIds = /* @__PURE__ */ new Set();
   for (let index = 0; index < messages.length; index += 1) {
     const message = messages[index];
     if (hasToolCalls(message)) {
-      const toolCallIds = new Set(
-        message.tool_calls.map((toolCall) => toolCall.id).filter((id) => Boolean(id))
-      );
+      const candidateToolCalls = [];
+      const candidateToolCallIds = /* @__PURE__ */ new Set();
+      for (const toolCall of message.tool_calls) {
+        const id = toolCall.id;
+        if (!id || survivingToolCallIds.has(id)) {
+          continue;
+        }
+        if (candidateToolCallIds.has(id)) {
+          continue;
+        }
+        candidateToolCallIds.add(id);
+        candidateToolCalls.push(toolCall);
+      }
       const adjacentToolResponseIds = /* @__PURE__ */ new Set();
       const toolResponseIndexes = [];
       const splitMediaIndexes = [];
@@ -66393,7 +66545,7 @@ function cleanOrphanedToolCalls(messages) {
             lastToolResponseMatchesAssistant = false;
             continue;
           }
-          if (toolCallIds.has(nextMessage.tool_call_id)) {
+          if (candidateToolCallIds.has(nextMessage.tool_call_id) && !adjacentToolResponseIds.has(nextMessage.tool_call_id)) {
             adjacentToolResponseIds.add(nextMessage.tool_call_id);
             toolResponseIndexes.push(nextIndex);
             lastToolResponseMatchesAssistant = true;
@@ -66413,7 +66565,13 @@ function cleanOrphanedToolCalls(messages) {
         }
         break;
       }
-      adjacentToolResponseIdsByAssistant.set(index, adjacentToolResponseIds);
+      const validToolCalls = candidateToolCalls.filter(
+        (toolCall) => adjacentToolResponseIds.has(toolCall.id)
+      );
+      for (const toolCall of validToolCalls) {
+        survivingToolCallIds.add(toolCall.id);
+      }
+      validToolCallsByAssistant.set(index, validToolCalls);
       validToolResponseIndexesByAssistant.set(index, toolResponseIndexes);
       splitMediaIndexesByAssistant.set(index, splitMediaIndexes);
     }
@@ -66425,10 +66583,7 @@ function cleanOrphanedToolCalls(messages) {
     const message = messages[index];
     if (hasToolCalls(message)) {
       const reasoningContent = message.reasoning_content;
-      const adjacentToolResponseIds = adjacentToolResponseIdsByAssistant.get(index) ?? /* @__PURE__ */ new Set();
-      const validToolCalls = message.tool_calls.filter(
-        (toolCall) => toolCall.id && adjacentToolResponseIds.has(toolCall.id)
-      );
+      const validToolCalls = validToolCallsByAssistant.get(index) ?? [];
       if (validToolCalls.length > 0) {
         const cleanedMessage = { ...message };
         cleanedMessage.tool_calls = validToolCalls;
@@ -66454,16 +66609,16 @@ function cleanOrphanedToolCalls(messages) {
         delete cleanedMessage.tool_calls;
         cleaned.push(cleanedMessage);
       } else {
-        debugLogger5.debug(
+        debugLogger6.debug(
           `cleanOrphanedToolCalls: dropping assistant with ${message.tool_calls.length} orphaned tool call(s) and no text/reasoning content`
         );
       }
     } else if (message.role === "tool" && "tool_call_id" in message) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         `cleanOrphanedToolCalls: dropping orphaned tool response ${message.tool_call_id || "<empty>"}`
       );
     } else if (isSplitToolMediaMessage(message)) {
-      debugLogger5.debug(
+      debugLogger6.debug(
         "cleanOrphanedToolCalls: dropping orphaned split tool media message"
       );
     } else {
@@ -66591,7 +66746,7 @@ var v4_default = v4;
 
 // packages/core/src/utils/openaiLogger.ts
 import * as os2 from "os";
-var debugLogger6 = createDebugLogger("OPENAI_LOGGER");
+var debugLogger7 = createDebugLogger("OPENAI_LOGGER");
 var MAIN_SESSION_PROMPT_ID_DELIMITER = "########";
 var UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 function resolveOpenAILogDir(customLogDir, cwd) {
@@ -66687,7 +66842,7 @@ var OpenAILogger = class {
       await fs4.mkdir(this.logDir, { recursive: true });
       this.initialized = true;
     } catch (error) {
-      debugLogger6.error("Failed to initialize OpenAI logger:", error);
+      debugLogger7.error("Failed to initialize OpenAI logger:", error);
       throw new Error(`Failed to initialize OpenAI logger: ${error}`);
     }
   }
@@ -66729,7 +66884,7 @@ var OpenAILogger = class {
       await fs4.writeFile(filePath, JSON.stringify(logData, null, 2), "utf-8");
       return filePath;
     } catch (writeError) {
-      debugLogger6.error("Failed to write OpenAI log file:", writeError);
+      debugLogger7.error("Failed to write OpenAI log file:", writeError);
       throw new Error(`Failed to write OpenAI log file: ${writeError}`);
     }
   }
@@ -66750,7 +66905,7 @@ var OpenAILogger = class {
       if (error.code === "ENOENT") {
         return [];
       }
-      debugLogger6.error("Failed to read OpenAI log directory:", error);
+      debugLogger7.error("Failed to read OpenAI log directory:", error);
       return [];
     }
   }
@@ -66764,7 +66919,7 @@ var OpenAILogger = class {
       const content = await fs4.readFile(filePath, "utf-8");
       return JSON.parse(content);
     } catch (error) {
-      debugLogger6.error(`Failed to read log file ${filePath}:`, error);
+      debugLogger7.error(`Failed to read log file ${filePath}:`, error);
       throw new Error(`Failed to read log file: ${error}`);
     }
   }
@@ -67036,7 +67191,7 @@ function clearDetailedSpanState() {
 __name(clearDetailedSpanState, "clearDetailedSpanState");
 
 // packages/core/src/telemetry/session-tracing.ts
-var debugLogger7 = createDebugLogger("SESSION_TRACING");
+var debugLogger8 = createDebugLogger("SESSION_TRACING");
 function resolveParentContext(parent) {
   if (parent) {
     return trace.setSpan(context.active(), parent.span);
@@ -67117,18 +67272,18 @@ function sweepStaleSpans(now) {
           } : {}
         });
       } catch (error) {
-        debugLogger7.warn(
+        debugLogger8.warn(
           `Failed to stamp TTL attrs on stale span ${spanId}: ${error instanceof Error ? error.message : String(error)}`
         );
       }
       const ctxLabel = toolName && callId ? `${ctx.type} (tool.name=${toolName}, tool.call_id=${callId})` : ctx.type;
-      debugLogger7.warn(
+      debugLogger8.warn(
         `Stale ${ctxLabel} span ended by TTL safety net (age=${ageMs}ms, spanId=${spanId})`
       );
       try {
         ctx.span.end();
       } catch (error) {
-        debugLogger7.warn(
+        debugLogger8.warn(
           `Failed to end stale span ${spanId}: ${error instanceof Error ? error.message : String(error)}`
         );
       }
@@ -67198,7 +67353,7 @@ function endInteractionSpan(status, metadata) {
   const spanCtx = interactionContext.getStore() ?? lastInteractionCtx;
   if (!spanCtx) return;
   if (spanCtx.ended) {
-    debugLogger7.debug(
+    debugLogger8.debug(
       `endInteractionSpan: span ${getSpanId(spanCtx.span)} already ended (possible TTL sweep race)`
     );
     return;
@@ -67339,7 +67494,7 @@ function endLLMRequestSpan(span, metadata) {
   const spanCtx = activeSpans.get(spanId)?.deref();
   if (!spanCtx) return;
   if (spanCtx.ended) {
-    debugLogger7.debug(
+    debugLogger8.debug(
       `endLLMRequestSpan: span ${spanId} already ended (possible TTL sweep race)`
     );
     return;
@@ -67419,14 +67574,14 @@ function endLLMRequestSpan(span, metadata) {
       });
     }
   } catch (error) {
-    debugLogger7.warn(
+    debugLogger8.warn(
       `Failed to update LLM request span attributes/status: ${error instanceof Error ? error.message : String(error)}`
     );
   }
   try {
     spanCtx.span.end();
   } catch (error) {
-    debugLogger7.warn(
+    debugLogger8.warn(
       `Failed to end LLM request span: ${error instanceof Error ? error.message : String(error)}`
     );
   }
@@ -67476,7 +67631,7 @@ function endToolSpan(span, metadata) {
   const spanCtx = activeSpans.get(spanId)?.deref();
   if (!spanCtx) return;
   if (spanCtx.ended) {
-    debugLogger7.debug(
+    debugLogger8.debug(
       `endToolSpan: span ${spanId} already ended (possible TTL sweep race)`
     );
     return;
@@ -67503,14 +67658,14 @@ function endToolSpan(span, metadata) {
       }
     }
   } catch (error) {
-    debugLogger7.warn(
+    debugLogger8.warn(
       `Failed to update tool span attributes/status: ${error instanceof Error ? error.message : String(error)}`
     );
   }
   try {
     spanCtx.span.end();
   } catch (error) {
-    debugLogger7.warn(
+    debugLogger8.warn(
       `Failed to end tool span: ${error instanceof Error ? error.message : String(error)}`
     );
   }
@@ -67524,7 +67679,7 @@ function startToolExecutionSpan() {
   }
   const parentCtx = toolContext.getStore();
   if (!parentCtx) {
-    debugLogger7.warn(
+    debugLogger8.warn(
       "startToolExecutionSpan called outside runInToolSpanContext \u2014 span will not be parented to tool span"
     );
   }
@@ -67557,7 +67712,7 @@ function endToolExecutionSpan(span, metadata) {
   const spanCtx = activeSpans.get(spanId)?.deref();
   if (!spanCtx) return;
   if (spanCtx.ended) {
-    debugLogger7.debug(
+    debugLogger8.debug(
       `endToolExecutionSpan: span ${spanId} already ended (possible TTL sweep race)`
     );
     return;
@@ -67584,14 +67739,14 @@ function endToolExecutionSpan(span, metadata) {
       }
     }
   } catch (error) {
-    debugLogger7.warn(
+    debugLogger8.warn(
       `Failed to update tool execution span attributes/status: ${error instanceof Error ? error.message : String(error)}`
     );
   }
   try {
     spanCtx.span.end();
   } catch (error) {
-    debugLogger7.warn(
+    debugLogger8.warn(
       `Failed to end tool execution span: ${error instanceof Error ? error.message : String(error)}`
     );
   }
@@ -67607,12 +67762,16 @@ function startToolBlockedOnUserSpan(toolSpan, attrs) {
   const parentSpanId = getSpanId(toolSpan);
   const parentSpanCtx = activeSpans.get(parentSpanId)?.deref();
   if (!parentSpanCtx) {
-    debugLogger7.debug(
+    debugLogger8.debug(
       "startToolBlockedOnUserSpan: tool span not in activeSpans (already ended?) \u2014 using resolveParentContext fallback"
     );
   }
   const ctx = parentSpanCtx ? trace.setSpan(context.active(), parentSpanCtx.span) : resolveParentContext(void 0);
-  const attributes = {};
+  const sessionParentCtx = parentSpanCtx ?? subagentContext.getStore() ?? interactionContext.getStore() ?? void 0;
+  const sessionId = resolveSessionId(sessionParentCtx);
+  const attributes = {
+    ...sessionId ? { "session.id": sessionId } : {}
+  };
   if (attrs?.tool_name !== void 0) attributes["tool.name"] = attrs.tool_name;
   if (attrs?.call_id !== void 0) attributes["tool.call_id"] = attrs.call_id;
   const span = getTracer().startSpan(
@@ -67637,7 +67796,7 @@ function endToolBlockedOnUserSpan(span, metadata) {
   const spanCtx = activeSpans.get(spanId)?.deref();
   if (!spanCtx) return;
   if (spanCtx.ended) {
-    debugLogger7.debug(
+    debugLogger8.debug(
       `endToolBlockedOnUserSpan: span ${spanId} already ended (possible TTL sweep race)`
     );
     return;
@@ -67652,14 +67811,14 @@ function endToolBlockedOnUserSpan(span, metadata) {
       endAttributes["source"] = metadata.source;
     spanCtx.span.setAttributes(endAttributes);
   } catch (error) {
-    debugLogger7.warn(
+    debugLogger8.warn(
       `Failed to update blocked_on_user span attributes: ${error instanceof Error ? error.message : String(error)}`
     );
   }
   try {
     spanCtx.span.end();
   } catch (error) {
-    debugLogger7.warn(
+    debugLogger8.warn(
       `Failed to end blocked_on_user span: ${error instanceof Error ? error.message : String(error)}`
     );
   }
@@ -67674,7 +67833,9 @@ function startHookSpan(opts) {
   ensureCleanupInterval();
   const parentCtx = toolContext.getStore() ?? subagentContext.getStore() ?? interactionContext.getStore() ?? void 0;
   const ctx = resolveParentContext(parentCtx);
+  const sessionId = resolveSessionId(parentCtx);
   const attributes = {
+    ...sessionId ? { "session.id": sessionId } : {},
     hook_event: opts.hookEvent,
     "tool.name": opts.toolName
   };
@@ -67703,7 +67864,7 @@ function endHookSpan(span, metadata) {
   const spanCtx = activeSpans.get(spanId)?.deref();
   if (!spanCtx) return;
   if (spanCtx.ended) {
-    debugLogger7.debug(
+    debugLogger8.debug(
       `endHookSpan: span ${spanId} already ended (possible TTL sweep race)`
     );
     return;
@@ -67740,14 +67901,14 @@ function endHookSpan(span, metadata) {
       });
     }
   } catch (error) {
-    debugLogger7.warn(
+    debugLogger8.warn(
       `Failed to update hook span attributes/status: ${error instanceof Error ? error.message : String(error)}`
     );
   }
   try {
     spanCtx.span.end();
   } catch (error) {
-    debugLogger7.warn(
+    debugLogger8.warn(
       `Failed to end hook span: ${error instanceof Error ? error.message : String(error)}`
     );
   }
@@ -67830,14 +67991,14 @@ function endSubagentSpan(span, metadata) {
   const spanCtx = activeSpans.get(spanId)?.deref();
   if (!spanCtx) {
     if (isTelemetrySdkInitialized()) {
-      debugLogger7.warn(
+      debugLogger8.warn(
         `endSubagentSpan: span ${spanId} not found in activeSpans (already swept?) \u2014 intended status=${metadata.status}, reason=${metadata.terminateReason ?? "none"}`
       );
     }
     return;
   }
   if (spanCtx.ended) {
-    debugLogger7.warn(
+    debugLogger8.warn(
       `endSubagentSpan: span ${spanId} already ended \u2014 intended status=${metadata.status}, reason=${metadata.terminateReason ?? "none"} (possible TTL sweep race)`
     );
     return;
@@ -67873,14 +68034,14 @@ function endSubagentSpan(span, metadata) {
       });
     }
   } catch (error) {
-    debugLogger7.warn(
+    debugLogger8.warn(
       `Failed to update subagent span attributes/status: ${error instanceof Error ? error.message : String(error)}`
     );
   }
   try {
     spanCtx.span.end();
   } catch (error) {
-    debugLogger7.warn(
+    debugLogger8.warn(
       `Failed to end subagent span: ${error instanceof Error ? error.message : String(error)}`
     );
   }
@@ -68208,7 +68369,7 @@ __name(hrTimeDiff, "hrTimeDiff");
 init_esbuild_shims();
 init_esm();
 var tracer = trace.getTracer(SERVICE_NAME);
-var debugLogger8 = createDebugLogger("OTEL_TRACER");
+var debugLogger9 = createDebugLogger("OTEL_TRACER");
 var TELEMETRY_WARNING_INTERVAL_MS = 3e4;
 var API_CALL_FAILED_SPAN_STATUS_MESSAGE = "API call failed";
 var API_CALL_ABORTED_SPAN_STATUS_MESSAGE = "API call aborted";
@@ -68224,7 +68385,7 @@ function warnTelemetryOperationFailed(operation, error) {
   suppressedTelemetryWarnings = 0;
   lastTelemetryWarningMs = now;
   try {
-    debugLogger8.warn(
+    debugLogger9.warn(
       `OTel span ${operation} failed: ${error instanceof Error ? error.message : String(error)}${suppressedSuffix}`
     );
   } catch {
@@ -68263,13 +68424,13 @@ __name(createSessionRootContext, "createSessionRootContext");
 
 // packages/core/src/telemetry/sdk.ts
 function createTelemetryDiagLogger() {
-  const debugLogger12 = createDebugLogger("OTEL");
+  const debugLogger13 = createDebugLogger("OTEL");
   return {
-    error: /* @__PURE__ */ __name((message, ...args) => debugLogger12.error(message, ...args), "error"),
-    warn: /* @__PURE__ */ __name((message, ...args) => debugLogger12.warn(message, ...args), "warn"),
-    info: /* @__PURE__ */ __name((message, ...args) => debugLogger12.info(message, ...args), "info"),
-    debug: /* @__PURE__ */ __name((message, ...args) => debugLogger12.debug(message, ...args), "debug"),
-    verbose: /* @__PURE__ */ __name((message, ...args) => debugLogger12.debug(message, ...args), "verbose")
+    error: /* @__PURE__ */ __name((message, ...args) => debugLogger13.error(message, ...args), "error"),
+    warn: /* @__PURE__ */ __name((message, ...args) => debugLogger13.warn(message, ...args), "warn"),
+    info: /* @__PURE__ */ __name((message, ...args) => debugLogger13.info(message, ...args), "info"),
+    debug: /* @__PURE__ */ __name((message, ...args) => debugLogger13.debug(message, ...args), "debug"),
+    verbose: /* @__PURE__ */ __name((message, ...args) => debugLogger13.debug(message, ...args), "verbose")
   };
 }
 __name(createTelemetryDiagLogger, "createTelemetryDiagLogger");
@@ -68372,7 +68533,7 @@ function initializeTelemetry(config) {
   if (telemetryInitialized || !config.getTelemetryEnabled()) {
     return;
   }
-  const debugLogger12 = createDebugLogger("OTEL");
+  const debugLogger13 = createDebugLogger("OTEL");
   const userAttrs = config.getTelemetryResourceAttributes() ?? {};
   const userServiceName = userAttrs["service.name"];
   const {
@@ -68421,7 +68582,7 @@ function initializeTelemetry(config) {
       const metricsUrl = validateUrl(
         config.getTelemetryOtlpMetricsEndpoint() ?? (parsedEndpoint ? resolveHttpOtlpUrl(parsedEndpoint, "metrics") : void 0)
       );
-      debugLogger12.debug(
+      debugLogger13.debug(
         `OTLP HTTP endpoints: traces=${tracesUrl ?? "none"}, logs=${logsUrl ?? "none"}, metrics=${metricsUrl ?? "none"}`
       );
       if (tracesUrl) {
@@ -68446,7 +68607,7 @@ function initializeTelemetry(config) {
             // trade-off, since falling back to stderr would re-introduce the
             // TUI pollution this injection was added to prevent.
             ...config.isInteractive() && {
-              diagnosticsSink: /* @__PURE__ */ __name((message) => debugLogger12.warn(message), "diagnosticsSink")
+              diagnosticsSink: /* @__PURE__ */ __name((message) => debugLogger13.warn(message), "diagnosticsSink")
             }
           }
         );
@@ -68461,7 +68622,7 @@ function initializeTelemetry(config) {
       if (!parsedEndpoint) {
         const warning = 'Per-signal OTLP endpoints are only supported with HTTP protocol. Set otlpProtocol to "http" or provide a base otlpEndpoint for gRPC. Telemetry SDK startup was skipped because no supported gRPC endpoint was configured.';
         diag.warn(warning);
-        debugLogger12.warn(warning);
+        debugLogger13.warn(warning);
         return;
       } else {
         spanExporter = new import_exporter_trace_otlp_grpc.OTLPTraceExporter({
@@ -68583,7 +68744,7 @@ function initializeTelemetry(config) {
   });
   try {
     sdk.start();
-    debugLogger12.debug("OpenTelemetry SDK started successfully.");
+    debugLogger13.debug("OpenTelemetry SDK started successfully.");
     telemetryInitialized = true;
     activeMetricReader = metricReader;
     const sessionId = config.getSessionId();
@@ -68593,7 +68754,7 @@ function initializeTelemetry(config) {
     );
     initializeMetrics(config);
   } catch (error) {
-    debugLogger12.error("Error starting OpenTelemetry SDK:", error);
+    debugLogger13.error("Error starting OpenTelemetry SDK:", error);
   }
 }
 __name(initializeTelemetry, "initializeTelemetry");
@@ -68615,7 +68776,7 @@ async function shutdownTelemetry() {
   }
   endInteractionSpan("cancelled");
   const currentSdk = sdk;
-  const debugLogger12 = createDebugLogger("OTEL");
+  const debugLogger13 = createDebugLogger("OTEL");
   telemetryShutdownPromise = (async () => {
     let timer;
     let timedOut = false;
@@ -68623,7 +68784,7 @@ async function shutdownTelemetry() {
       const sdkShutdown = Promise.resolve(currentSdk.shutdown());
       sdkShutdown.catch((err) => {
         if (timedOut) {
-          debugLogger12.warn(
+          debugLogger13.warn(
             "SDK shutdown rejected after timeout:",
             err instanceof Error ? err.message : err
           );
@@ -68641,14 +68802,14 @@ async function shutdownTelemetry() {
       if (result === "timeout") {
         const msg = `Telemetry shutdown timed out after ${SHUTDOWN_TIMEOUT_MS}ms.`;
         diag.warn(msg);
-        debugLogger12.warn(msg);
+        debugLogger13.warn(msg);
       } else {
-        debugLogger12.debug("OpenTelemetry SDK shut down successfully.");
+        debugLogger13.debug("OpenTelemetry SDK shut down successfully.");
       }
     } catch (error) {
       clearTimeout(timer);
       diag.error("Error shutting down SDK:", error);
-      debugLogger12.error("Error shutting down SDK:", error);
+      debugLogger13.error("Error shutting down SDK:", error);
     } finally {
       telemetryInitialized = false;
       sdk = void 0;
@@ -69127,13 +69288,6 @@ function errorType(error) {
 __name(errorType, "errorType");
 var INVALID_TRACE_ID = "0".repeat(32);
 var INVALID_SPAN_ID = "0".repeat(16);
-function activeSpanContextIsValid() {
-  const span = trace.getSpan(context.active());
-  if (!span) return false;
-  const ctx = span.spanContext();
-  return ctx.traceId !== INVALID_TRACE_ID && ctx.spanId !== INVALID_SPAN_ID;
-}
-__name(activeSpanContextIsValid, "activeSpanContextIsValid");
 function stripReservedTraceMeta(meta) {
   if (!meta || typeof meta !== "object" || Array.isArray(meta)) return {};
   const record = meta;
@@ -69264,18 +69418,11 @@ async function runWithDaemonTelemetryContext(captured, fn) {
 __name(runWithDaemonTelemetryContext, "runWithDaemonTelemetryContext");
 function injectDaemonTraceContext(request4) {
   const currentMeta = request4._meta;
-  if (!activeSpanContextIsValid()) {
-    return currentMeta ? { ...request4, _meta: stripReservedTraceMeta(currentMeta) } : request4;
-  }
   const nextMeta = stripReservedTraceMeta(currentMeta);
   try {
-    const carrier = {};
-    propagation.inject(context.active(), carrier);
-    if (carrier["traceparent"]) {
-      nextMeta[DAEMON_TRACEPARENT_META_KEY] = carrier["traceparent"];
-    }
-    if (carrier["tracestate"]) {
-      nextMeta[DAEMON_TRACESTATE_META_KEY] = carrier["tracestate"];
+    const ctx = getActiveSpanTraceContext();
+    if (ctx) {
+      nextMeta[DAEMON_TRACEPARENT_META_KEY] = formatTraceparent(ctx);
     }
   } catch {
   }
@@ -69618,7 +69765,7 @@ function snapshotRetryMetadata() {
   };
 }
 __name(snapshotRetryMetadata, "snapshotRetryMetadata");
-var debugLogger9 = createDebugLogger("LOGGING_CONTENT_GENERATOR");
+var debugLogger10 = createDebugLogger("LOGGING_CONTENT_GENERATOR");
 var MAX_RESPONSE_TEXT_LENGTH = 4096;
 var RESPONSE_TEXT_TRUNCATION_SUFFIX = "...[truncated]";
 var MAX_RESPONSE_TEXT_PREFIX_LENGTH = MAX_RESPONSE_TEXT_LENGTH - RESPONSE_TEXT_TRUNCATION_SUFFIX.length;
@@ -69699,7 +69846,7 @@ var LoggingContentGenerator = class {
     try {
       this._logApiError(responseId, durationMs, error, model, prompt_id);
     } catch (loggingError) {
-      debugLogger9.warn("Failed to log API error:", loggingError);
+      debugLogger10.warn("Failed to log API error:", loggingError);
     }
   }
   safelyLogApiResponse(responseId, durationMs, model, prompt_id, usageMetadata, responseText) {
@@ -69713,7 +69860,7 @@ var LoggingContentGenerator = class {
         responseText
       );
     } catch (loggingError) {
-      debugLogger9.warn("Failed to log API response:", loggingError);
+      debugLogger10.warn("Failed to log API response:", loggingError);
     }
   }
   async generateContent(req, userPromptId) {
@@ -69776,7 +69923,7 @@ var LoggingContentGenerator = class {
             userPromptId
           );
         } catch (loggingError) {
-          debugLogger9.warn("Failed to log OpenAI interaction:", loggingError);
+          debugLogger10.warn("Failed to log OpenAI interaction:", loggingError);
         }
         return result;
       });
@@ -69815,7 +69962,7 @@ var LoggingContentGenerator = class {
             userPromptId
           );
         } catch (loggingError) {
-          debugLogger9.warn("Failed to log OpenAI interaction:", loggingError);
+          debugLogger10.warn("Failed to log OpenAI interaction:", loggingError);
         }
       });
       throw error;
@@ -69886,7 +70033,7 @@ var LoggingContentGenerator = class {
           userPromptId
         );
       } catch (loggingError) {
-        debugLogger9.warn("Failed to log OpenAI interaction:", loggingError);
+        debugLogger10.warn("Failed to log OpenAI interaction:", loggingError);
       }
       throw error;
     }
@@ -69895,7 +70042,7 @@ var LoggingContentGenerator = class {
       try {
         resolvedRequest = await session.resolve(req);
       } catch (loggingError) {
-        debugLogger9.warn("Failed to resolve OpenAI request:", loggingError);
+        debugLogger10.warn("Failed to resolve OpenAI request:", loggingError);
       }
     }
     return context.with(
@@ -70129,7 +70276,7 @@ var LoggingContentGenerator = class {
     try {
       await this.logOpenAIInteraction(openaiRequest, response, error, promptId);
     } catch (loggingError) {
-      debugLogger9.warn("Failed to log OpenAI interaction:", loggingError);
+      debugLogger10.warn("Failed to log OpenAI interaction:", loggingError);
     }
   }
   convertGeminiResponseToOpenAIForLogging(response, openaiRequest) {
@@ -70598,7 +70745,7 @@ var QWEN_OAUTH_ALLOWED_MODELS = QWEN_OAUTH_MODELS.map(
 );
 
 // packages/core/src/models/modelRegistry.ts
-var debugLogger10 = createDebugLogger("MODEL_REGISTRY");
+var debugLogger11 = createDebugLogger("MODEL_REGISTRY");
 function validateAuthTypeKey(key) {
   if (Object.values(AuthType).includes(key)) {
     return key;
@@ -70636,7 +70783,7 @@ var ModelRegistry = class {
       for (const [rawKey, models] of Object.entries(modelProvidersConfig)) {
         const authType = validateAuthTypeKey(rawKey);
         if (!authType) {
-          debugLogger10.warn(
+          debugLogger11.warn(
             `Invalid authType key "${rawKey}" in modelProviders config. Expected one of: ${Object.values(AuthType).join(", ")}. Skipping.`
           );
           continue;
@@ -70659,7 +70806,7 @@ var ModelRegistry = class {
     for (const config of models) {
       const key = modelRegistryKey(config.id, config.baseUrl);
       if (modelMap.has(key)) {
-        debugLogger10.warn(
+        debugLogger11.warn(
           `Duplicate model id "${config.id}"${config.baseUrl ? ` with baseUrl "${config.baseUrl}"` : ""} for authType "${authType}". Using the first registered config.`
         );
         continue;
@@ -70774,7 +70921,7 @@ var ModelRegistry = class {
       for (const [rawKey, models] of Object.entries(modelProvidersConfig)) {
         const authType = validateAuthTypeKey(rawKey);
         if (!authType) {
-          debugLogger10.warn(
+          debugLogger11.warn(
             `Invalid authType key "${rawKey}" in modelProviders config. Expected one of: ${Object.values(AuthType).join(", ")}. Skipping.`
           );
           continue;
@@ -71857,11 +72004,11 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
   let baseGenerator;
   try {
     if (authType === "openai" /* USE_OPENAI */) {
-      const { createOpenAIContentGenerator } = await import("./openaiContentGenerator-L5KSWQY7.js");
+      const { createOpenAIContentGenerator } = await import("./openaiContentGenerator-5PLHYJQL.js");
       baseGenerator = createOpenAIContentGenerator(generatorConfig, config);
     } else if (authType === "qwen-oauth" /* QWEN_OAUTH */) {
-      const { getQwenOAuthClient: getQwenOauthClient } = await import("./qwenOAuth2-2KCKWDCF.js");
-      const { QwenContentGenerator } = await import("./qwenContentGenerator-PYOXLMBW.js");
+      const { getQwenOAuthClient: getQwenOauthClient } = await import("./qwenOAuth2-KK433U33.js");
+      const { QwenContentGenerator } = await import("./qwenContentGenerator-TSKW73KY.js");
       try {
         const qwenClient = await getQwenOauthClient(
           config,
@@ -71879,10 +72026,10 @@ async function createContentGenerator(generatorConfig, config, isInitialAuth) {
         throw new Error(error instanceof Error ? error.message : String(error));
       }
     } else if (authType === "anthropic" /* USE_ANTHROPIC */) {
-      const { createAnthropicContentGenerator } = await import("./anthropicContentGenerator-2HBRNQ3B.js");
+      const { createAnthropicContentGenerator } = await import("./anthropicContentGenerator-DCI26OQF.js");
       baseGenerator = createAnthropicContentGenerator(generatorConfig, config);
     } else if (authType === "gemini" /* USE_GEMINI */ || authType === "vertex-ai" /* USE_VERTEX_AI */) {
-      const { createGeminiContentGenerator } = await import("./geminiContentGenerator-7A6I2RWB.js");
+      const { createGeminiContentGenerator } = await import("./geminiContentGenerator-HFJIGO77.js");
       baseGenerator = createGeminiContentGenerator(generatorConfig, config);
     } else {
       throw new Error(
@@ -73675,7 +73822,7 @@ function memoryFreshnessNote(mtimeMs) {
 __name(memoryFreshnessNote, "memoryFreshnessNote");
 
 // packages/core/src/tools/read-file.ts
-var debugLogger11 = createDebugLogger("READ_FILE_CACHE");
+var debugLogger12 = createDebugLogger("READ_FILE_CACHE");
 var ReadFileToolInvocation = class extends BaseToolInvocation {
   constructor(config, params) {
     super(params);
@@ -73744,7 +73891,7 @@ var ReadFileToolInvocation = class extends BaseToolInvocation {
     try {
       stats = await fs7.stat(absPath);
     } catch (err) {
-      debugLogger11.debug("stat-failed", {
+      debugLogger12.debug("stat-failed", {
         path: absPath,
         code: err.code
       });
@@ -73754,10 +73901,10 @@ var ReadFileToolInvocation = class extends BaseToolInvocation {
       if (status.state === "fresh" && status.entry.lastReadAt !== void 0 && status.entry.lastReadWasFull && status.entry.lastReadCacheable && // Only quote-back if that read is still in history (issue
       // #4239: idle microcompaction flips this off when it blanks it).
       status.entry.readResidentInHistory && (status.entry.lastWriteAt === void 0 || status.entry.lastReadAt > status.entry.lastWriteAt)) {
-        debugLogger11.debug("hit", { path: absPath });
+        debugLogger12.debug("hit", { path: absPath });
         return this.unchangedResult(absPath);
       }
-      debugLogger11.debug("miss", { path: absPath, state: status.state });
+      debugLogger12.debug("miss", { path: absPath, state: status.state });
     }
     const result = await processSingleFileContent(
       this.params.file_path,
@@ -74131,6 +74278,8 @@ export {
   TOOL_OUTPUT_TRUNCATED_PREFIX,
   truncateToolOutput,
   truncateLlmContent,
+  isAlreadyTruncated,
+  persistAndTruncateToolResult,
   DiscoveredMCPTool,
   generateValidName,
   StartSessionEvent,