@qwen-code/qwen-code 0.22.2 → 0.22.3

package/chunks/{loadedSettingsAdapter-7Y7IEI6T.js → loadedSettingsAdapter-KJCLZ3C4.js}

@@ -2,95 +2,93 @@
 "use strict";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-CPGJJJLU.js";
-import "./chunk-F7TNAPZ4.js";
+} from "./chunk-7T52W4SW.js";
+import "./chunk-AIAOIFY4.js";
 import "./chunk-RKUWKYED.js";
-import "./chunk-JSC3H3TD.js";
+import "./chunk-ZEYFMJQA.js";
 import "./chunk-GOXKNSDZ.js";
 import "./chunk-IDS7MSUP.js";
-import "./chunk-LDP5OD6N.js";
+import "./chunk-CLWO3B77.js";
 import "./chunk-5EJZE3FP.js";
-import "./chunk-IK5BW3CS.js";
-import "./chunk-5PA6UEYA.js";
-import "./chunk-V4QXXQJ2.js";
+import "./chunk-XHF7WQ6B.js";
+import "./chunk-MZCJWS5Y.js";
+import "./chunk-MF7HCQWZ.js";
 import "./chunk-NPQ5ZKRP.js";
 import "./chunk-MR3PXB6E.js";
-import "./chunk-KUX5D6DK.js";
-import "./chunk-3DXFGHAJ.js";
+import "./chunk-NV55WWD6.js";
+import "./chunk-2OUD5T67.js";
 import "./chunk-CQH5KTKC.js";
 import "./chunk-LJZSMWOH.js";
-import "./chunk-6LFTG244.js";
-import "./chunk-PKAYJDB3.js";
-import "./chunk-6IUNAPLR.js";
-import "./chunk-OIVXBW3W.js";
-import "./chunk-4CDSK5AZ.js";
+import "./chunk-NMOD2FXQ.js";
+import "./chunk-WNPDGUJO.js";
+import "./chunk-K5KXUXWC.js";
+import "./chunk-62GQFYID.js";
+import "./chunk-AYFA7MZV.js";
 import "./chunk-XQFT3QUF.js";
 import "./chunk-VTHREBQM.js";
 import "./chunk-ZPJWUGCS.js";
-import "./chunk-H2WDGQ6D.js";
-import "./chunk-MIIVI25Q.js";
-import "./chunk-TGWAQ5RB.js";
+import "./chunk-3JXM2CVW.js";
+import "./chunk-ST5V3ZOC.js";
+import "./chunk-PZ66FRIC.js";
 import "./chunk-GOFAQQZA.js";
 import "./chunk-5M6IDOMF.js";
 import "./chunk-TWPJO254.js";
 import "./chunk-CQ35AJ4Z.js";
 import "./chunk-EKSCLBBF.js";
-import "./chunk-P2SU6ZTI.js";
-import "./chunk-IZIVM7LZ.js";
-import "./chunk-SFPGAQUL.js";
+import "./chunk-LUEHOUHM.js";
+import "./chunk-WXEA74YB.js";
+import "./chunk-42IDLQWS.js";
 import "./chunk-6PVPNMXU.js";
 import "./chunk-JB4JIVTJ.js";
+import "./chunk-DJBQCO2E.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
 import "./chunk-D5LUXLUH.js";
 import "./chunk-O6GEWCJA.js";
 import "./chunk-T26EAKDL.js";
-import "./chunk-EOGELB3H.js";
+import "./chunk-2SXSLSQE.js";
 import "./chunk-CPBF7KYF.js";
-import "./chunk-EFUM7RVY.js";
+import "./chunk-KJO2LBUK.js";
 import "./chunk-TTX2JUE6.js";
-import "./chunk-43GGFFLY.js";
+import "./chunk-4K7KNVWH.js";
 import "./chunk-SMPR7SPO.js";
 import "./chunk-JWALNCLT.js";
 import "./chunk-NIFYWDYN.js";
-import "./chunk-3AFMQUTI.js";
-import "./chunk-WKK5BQNP.js";
+import "./chunk-C2X7KY45.js";
+import "./chunk-JHYH6PYQ.js";
+import "./chunk-7J6OTNGO.js";
 import "./chunk-V5J4J5TP.js";
 import "./chunk-MLXTMF7H.js";
 import "./chunk-NAVJD2PQ.js";
-import "./chunk-3JGZSIDA.js";
-import "./chunk-VVW4ZNFY.js";
+import "./chunk-B466ZSHZ.js";
+import "./chunk-4QHPPXK2.js";
 import "./chunk-QHMLYMMS.js";
-import "./chunk-7DJCPZE3.js";
-import "./chunk-P3QQPMQA.js";
-import "./chunk-HVEYF6VT.js";
+import "./chunk-3WK3QDNV.js";
 import "./chunk-VNOVK4I7.js";
-import "./chunk-SAH4BD2J.js";
-import "./chunk-PDMJ3KGS.js";
+import "./chunk-PQEISIKS.js";
+import "./chunk-EB6QRGHM.js";
 import "./chunk-CMHFCLBU.js";
 import "./chunk-S6LOFUVP.js";
+import "./chunk-CFKIH3D3.js";
 import "./chunk-2LD5U7Q3.js";
 import "./chunk-DJ2GSRLV.js";
-import "./chunk-J2OSJFP3.js";
-import "./chunk-K2OJUPOE.js";
-import "./chunk-CFKIH3D3.js";
-import "./chunk-4FTKQNWJ.js";
-import "./chunk-Y3QL45LS.js";
-import "./chunk-L2M46FP5.js";
-import "./chunk-YRLW2MSX.js";
+import "./chunk-DYXFD5RO.js";
+import "./chunk-V4264FEG.js";
+import "./chunk-QYMAKPY5.js";
+import "./chunk-XBVNNDPK.js";
 import "./chunk-VGC4I5JJ.js";
-import "./chunk-3I6UTTDX.js";
+import "./chunk-BKWNKLZB.js";
 import "./chunk-6PJOTWAN.js";
 import "./chunk-BWORX6FA.js";
 import "./chunk-WZAD4ZNJ.js";
 import "./chunk-FPGTNKCP.js";
 import "./chunk-6DIGWMGT.js";
-import "./chunk-Z7FLBQPR.js";
+import "./chunk-W3JH33JE.js";
 import "./chunk-XZA32HII.js";
 import "./chunk-23RFD54N.js";
 import "./chunk-PPKZ7JOE.js";
 import "./chunk-HHJLM3WQ.js";
-import "./chunk-L6BZRIUL.js";
+import "./chunk-B5PHIJGI.js";
 import "./chunk-74TONY4F.js";
 import "./chunk-XF63PKEN.js";
 import "./chunk-CAJTKR6W.js";
@@ -99,7 +97,7 @@ import "./chunk-AQ37AY7B.js";
 import "./chunk-PDQGMSZK.js";
 import "./chunk-UTLCH2FK.js";
 import "./chunk-UHQFIS7N.js";
-import "./chunk-KGJGEEVR.js";
+import "./chunk-7FA2II6K.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";

package/chunks/{loggingContentGenerator-2GGZNGLG.js → loggingContentGenerator-DSFQHXIF.js}

@@ -2,18 +2,55 @@
 "use strict";
 import {
   OpenAILogger
-} from "./chunk-MIIVI25Q.js";
+} from "./chunk-ST5V3ZOC.js";
+import {
+  computeThresholds,
+  estimateContentTokens,
+  estimateContextTextTokens,
+  getCustomSystemPrompt
+} from "./chunk-PZ66FRIC.js";
+import "./chunk-GOFAQQZA.js";
+import "./chunk-5M6IDOMF.js";
+import "./chunk-TWPJO254.js";
+import "./chunk-CQ35AJ4Z.js";
+import "./chunk-EKSCLBBF.js";
+import "./chunk-LUEHOUHM.js";
+import "./chunk-WXEA74YB.js";
+import "./chunk-42IDLQWS.js";
+import "./chunk-6PVPNMXU.js";
+import "./chunk-JB4JIVTJ.js";
+import "./chunk-DJBQCO2E.js";
+import "./chunk-IRH27ZC2.js";
+import "./chunk-QHWCP53L.js";
+import "./chunk-D5LUXLUH.js";
+import "./chunk-O6GEWCJA.js";
+import "./chunk-T26EAKDL.js";
+import "./chunk-2SXSLSQE.js";
+import "./chunk-CPBF7KYF.js";
 import {
   areSensitiveSpanAttributesEnabled
-} from "./chunk-7DJCPZE3.js";
+} from "./chunk-KJO2LBUK.js";
+import "./chunk-TTX2JUE6.js";
+import "./chunk-4K7KNVWH.js";
+import "./chunk-SMPR7SPO.js";
+import "./chunk-JWALNCLT.js";
+import "./chunk-NIFYWDYN.js";
+import "./chunk-C2X7KY45.js";
+import "./chunk-JHYH6PYQ.js";
+import "./chunk-7J6OTNGO.js";
+import "./chunk-V5J4J5TP.js";
+import "./chunk-MLXTMF7H.js";
+import "./chunk-NAVJD2PQ.js";
+import "./chunk-B466ZSHZ.js";
 import {
   retryContext
-} from "./chunk-P3QQPMQA.js";
-import "./chunk-HVEYF6VT.js";
+} from "./chunk-4QHPPXK2.js";
+import "./chunk-QHMLYMMS.js";
+import "./chunk-3WK3QDNV.js";
 import {
   OpenAIContentConverter,
   openaiRequestCaptureContext
-} from "./chunk-4J657AJR.js";
+} from "./chunk-DJECZIJX.js";
 import {
   getGenAiUsageProvenance
 } from "./chunk-ABS25QER.js";
@@ -22,31 +59,39 @@ import {
 } from "./chunk-VNOVK4I7.js";
 import {
   createGenAiExchange
-} from "./chunk-B7CDU2SL.js";
-import "./chunk-K2OJUPOE.js";
+} from "./chunk-KYWTPLBJ.js";
+import "./chunk-PQEISIKS.js";
+import "./chunk-EB6QRGHM.js";
+import "./chunk-CMHFCLBU.js";
+import "./chunk-S6LOFUVP.js";
 import "./chunk-CFKIH3D3.js";
-import "./chunk-4FTKQNWJ.js";
-import "./chunk-Y3QL45LS.js";
+import "./chunk-2LD5U7Q3.js";
+import "./chunk-DJ2GSRLV.js";
+import "./chunk-DYXFD5RO.js";
+import "./chunk-V4264FEG.js";
 import {
   ApiErrorEvent,
   ApiRequestEvent,
   ApiResponseEvent,
+  DiscoveredMCPTool,
   isInternalPromptId,
   logApiError,
   logApiRequest,
   logApiResponse,
   subagentIdentityContext,
   subagentNameContext
-} from "./chunk-L2M46FP5.js";
-import "./chunk-YRLW2MSX.js";
+} from "./chunk-QYMAKPY5.js";
+import "./chunk-XBVNNDPK.js";
 import "./chunk-VGC4I5JJ.js";
-import "./chunk-3I6UTTDX.js";
+import "./chunk-BKWNKLZB.js";
 import "./chunk-6PJOTWAN.js";
 import "./chunk-BWORX6FA.js";
 import "./chunk-WZAD4ZNJ.js";
-import "./chunk-FPGTNKCP.js";
+import {
+  DEFAULT_TOKEN_LIMIT
+} from "./chunk-FPGTNKCP.js";
 import "./chunk-6DIGWMGT.js";
-import "./chunk-Z7FLBQPR.js";
+import "./chunk-W3JH33JE.js";
 import "./chunk-XZA32HII.js";
 import "./chunk-23RFD54N.js";
 import "./chunk-PPKZ7JOE.js";
@@ -55,11 +100,21 @@ import {
   API_CALL_ABORTED_SPAN_STATUS_MESSAGE,
   API_CALL_FAILED_SPAN_STATUS_MESSAGE,
   endLLMRequestSpan,
+  isTelemetrySdkInitialized,
+  isValidContextUsage,
   startLLMRequestSpanWithContext
-} from "./chunk-L6BZRIUL.js";
+} from "./chunk-B5PHIJGI.js";
 import "./chunk-74TONY4F.js";
 import "./chunk-XF63PKEN.js";
-import "./chunk-UTLCH2FK.js";
+import "./chunk-CAJTKR6W.js";
+import {
+  buildSkillLlmContent
+} from "./chunk-ZU4UDIWX.js";
+import "./chunk-AQ37AY7B.js";
+import "./chunk-PDQGMSZK.js";
+import {
+  ToolNames
+} from "./chunk-UTLCH2FK.js";
 import {
   createDebugLogger,
   getErrorMessage,
@@ -95,6 +150,209 @@ init_esbuild_shims();
 init_esbuild_shims();
 init_esm();
 
+// packages/core/src/core/loggingContentGenerator/context-usage-snapshot.ts
+init_esbuild_shims();
+import * as path from "node:path";
+function toPart(part) {
+  return typeof part === "string" ? { text: part } : part;
+}
+__name(toPart, "toPart");
+function toContent(content) {
+  if (Array.isArray(content)) {
+    return { role: "user", parts: content.map(toPart) };
+  }
+  if (typeof content === "string") {
+    return { role: "user", parts: [{ text: content }] };
+  }
+  if ("parts" in content) {
+    return {
+      ...content,
+      parts: content.parts?.filter((part) => part != null).map(toPart) ?? []
+    };
+  }
+  return { role: "user", parts: [toPart(content)] };
+}
+__name(toContent, "toContent");
+function toContents(contents) {
+  return Array.isArray(contents) ? contents.map((content) => toContent(content)) : [toContent(contents)];
+}
+__name(toContents, "toContents");
+function requestFunctionDeclarations(request) {
+  const declarations = [];
+  for (const tool of request.config?.tools ?? []) {
+    if (typeof tool === "object" && tool !== null && "tool" in tool) {
+      return void 0;
+    }
+    if (typeof tool === "object" && tool !== null && "functionDeclarations" in tool && Array.isArray(tool.functionDeclarations)) {
+      declarations.push(...tool.functionDeclarations);
+    }
+  }
+  return declarations;
+}
+__name(requestFunctionDeclarations, "requestFunctionDeclarations");
+function estimateToolCategories(request, config) {
+  let builtinTools = 0;
+  let mcpTools = 0;
+  let skillTool = 0;
+  const registry = config.getToolRegistry();
+  const declarations = requestFunctionDeclarations(request);
+  if (!declarations) return void 0;
+  for (const declaration of declarations) {
+    const tokens = estimateContextTextTokens(JSON.stringify(declaration));
+    if (declaration.name === ToolNames.SKILL) {
+      skillTool += tokens;
+    } else if (declaration.name && registry.getTool(declaration.name) instanceof DiscoveredMCPTool) {
+      mcpTools += tokens;
+    } else {
+      builtinTools += tokens;
+    }
+  }
+  return { builtinTools, mcpTools, skillTool };
+}
+__name(estimateToolCategories, "estimateToolCategories");
+function extractMemoryTokens(systemInstruction, config) {
+  let remaining = systemInstruction;
+  let memoryTokens = 0;
+  for (const configured of [
+    config.getUserMemory(),
+    config.getAutoMemoryPrompt()
+  ]) {
+    const segment = configured.trim();
+    if (!segment) continue;
+    const index = remaining.indexOf(segment);
+    if (index < 0) continue;
+    remaining = remaining.slice(0, index) + remaining.slice(index + segment.length);
+    memoryTokens += estimateContextTextTokens(segment);
+  }
+  return { systemInstruction: remaining, memoryTokens };
+}
+__name(extractMemoryTokens, "extractMemoryTokens");
+function indexLoadedSkillBodies(outputs) {
+  const tokensByOutput = /* @__PURE__ */ new Map();
+  const outputByHeader = /* @__PURE__ */ new Map();
+  for (const output of outputs) {
+    if (tokensByOutput.has(output)) continue;
+    tokensByOutput.set(output, estimateContextTextTokens(output));
+    const lineEnd = output.indexOf("\n");
+    const header = lineEnd < 0 ? output : output.slice(0, lineEnd);
+    if (!outputByHeader.has(header)) {
+      outputByHeader.set(header, output);
+    } else if (outputByHeader.get(header) !== output) {
+      outputByHeader.set(header, void 0);
+    }
+  }
+  return { tokensByOutput, outputByHeader };
+}
+__name(indexLoadedSkillBodies, "indexLoadedSkillBodies");
+function loadedSkillBodies(config) {
+  const skillTool = config.getToolRegistry().getTool(ToolNames.SKILL);
+  if (!skillTool || !("getLoadedSkillNames" in skillTool) || typeof skillTool.getLoadedSkillNames !== "function") {
+    return indexLoadedSkillBodies([]);
+  }
+  if ("getLoadedSkillContents" in skillTool && typeof skillTool.getLoadedSkillContents === "function") {
+    return indexLoadedSkillBodies(
+      skillTool.getLoadedSkillContents()
+    );
+  }
+  const cachedSkills = config.getSkillManager()?.getCachedSkills();
+  if (!cachedSkills) return indexLoadedSkillBodies([]);
+  const loadedNames = skillTool.getLoadedSkillNames();
+  const outputs = [];
+  for (const skill of cachedSkills) {
+    if (!loadedNames.has(skill.name)) continue;
+    outputs.push(
+      buildSkillLlmContent(path.dirname(skill.filePath), skill.body)
+    );
+  }
+  return indexLoadedSkillBodies(outputs);
+}
+__name(loadedSkillBodies, "loadedSkillBodies");
+function attributeLoadedSkillBodies(contents, indexedBodies) {
+  if (indexedBodies.tokensByOutput.size === 0) {
+    return { contents, skillBodyTokens: 0 };
+  }
+  let skillBodyTokens = 0;
+  let contentsChanged = false;
+  const attributedContents = contents.map((content) => {
+    let partsChanged = false;
+    const parts = content.parts?.map((part) => {
+      const response = part.functionResponse;
+      const output = response?.response?.["output"];
+      if (response?.name !== ToolNames.SKILL || typeof output !== "string") {
+        return part;
+      }
+      let matchedOutput = output;
+      let tokens = indexedBodies.tokensByOutput.get(output);
+      if (tokens === void 0) {
+        const lineEnd = output.indexOf("\n");
+        const header = lineEnd < 0 ? output : output.slice(0, lineEnd);
+        const candidate = indexedBodies.outputByHeader.get(header);
+        if (candidate && output.startsWith(`${candidate}
+`)) {
+          matchedOutput = candidate;
+          tokens = indexedBodies.tokensByOutput.get(candidate);
+        }
+      }
+      if (tokens === void 0) return part;
+      indexedBodies.tokensByOutput.delete(matchedOutput);
+      skillBodyTokens += tokens;
+      partsChanged = true;
+      return {
+        ...part,
+        functionResponse: {
+          ...response,
+          response: {
+            ...response.response,
+            output: output.slice(matchedOutput.length)
+          }
+        }
+      };
+    });
+    if (!partsChanged) return content;
+    contentsChanged = true;
+    return { ...content, parts };
+  });
+  return {
+    contents: contentsChanged ? attributedContents : contents,
+    skillBodyTokens
+  };
+}
+__name(attributeLoadedSkillBodies, "attributeLoadedSkillBodies");
+function createContextUsageSnapshot(request, config, contextWindowSize) {
+  if (!Number.isSafeInteger(contextWindowSize) || contextWindowSize <= 0) {
+    return void 0;
+  }
+  const systemText = getCustomSystemPrompt(request.config?.systemInstruction);
+  const memory = extractMemoryTokens(systemText, config);
+  const tools = estimateToolCategories(request, config);
+  if (!tools) return void 0;
+  const contents = toContents(request.contents);
+  const attributedSkills = attributeLoadedSkillBodies(
+    contents,
+    loadedSkillBodies(config)
+  );
+  const thresholds = computeThresholds(
+    contextWindowSize,
+    config.getAutoCompactThreshold()
+  );
+  const snapshot = {
+    version: 1,
+    window_size_tokens: contextWindowSize,
+    breakdown: {
+      system_prompt_tokens: estimateContextTextTokens(memory.systemInstruction),
+      builtin_tools_tokens: tools.builtinTools,
+      mcp_tools_tokens: tools.mcpTools,
+      memory_files_tokens: memory.memoryTokens,
+      skills_tokens: tools.skillTool + attributedSkills.skillBodyTokens,
+      messages_tokens: estimateContentTokens(attributedSkills.contents)
+    },
+    compaction_reserve_tokens: contextWindowSize - thresholds.auto,
+    estimated: true
+  };
+  return isValidContextUsage(snapshot) ? snapshot : void 0;
+}
+__name(createContextUsageSnapshot, "createContextUsageSnapshot");
+
 // packages/core/src/core/loggingContentGenerator/streamContentDetection.ts
 init_esbuild_shims();
 function hasUserVisibleContent(chunk) {
@@ -287,6 +545,7 @@ var LoggingContentGenerator = class {
   constructor(wrapped, config, generatorConfig) {
     this.wrapped = wrapped;
     this.config = config;
+    this.generatorConfig = generatorConfig;
     this.modalities = generatorConfig.modalities;
     this.splitToolMedia = generatorConfig.splitToolMedia;
     this.toolResultContentFormat = generatorConfig.toolResultContentFormat;
@@ -320,6 +579,21 @@ var LoggingContentGenerator = class {
   getWrapped() {
     return this.wrapped;
   }
+  snapshotContextUsage(request, isInternal) {
+    if (isInternal || !isTelemetrySdkInitialized()) return void 0;
+    try {
+      return createContextUsageSnapshot(
+        request,
+        this.config,
+        this.generatorConfig.contextWindowSize ?? DEFAULT_TOKEN_LIMIT
+      );
+    } catch (error) {
+      debugLogger.warn(
+        `Failed to snapshot context usage: ${error instanceof Error ? error.message : String(error)}`
+      );
+      return void 0;
+    }
+  }
   logApiRequest(contents, model, promptId, sessionId) {
     const requestText = JSON.stringify(contents);
     logApiRequest(
@@ -418,6 +692,8 @@ var LoggingContentGenerator = class {
   }
   async generateContent(req, userPromptId) {
     const retrySnapshot = snapshotRetryMetadata();
+    const isInternal = isInternalPromptId(userPromptId);
+    const contextUsage = this.snapshotContextUsage(req, isInternal);
     const ownerSessionId = this.config.getSessionId();
     const ownerUserId = this.config.getTelemetryUserId();
     const { span: llmSpan, context: llmContext } = startLLMRequestSpanWithContext(req.model, userPromptId, {
@@ -425,10 +701,10 @@ var LoggingContentGenerator = class {
       providerName: this.genAiProviderName,
       outputType: resolveGenAiOutputType(this.generatorAuthType, req.config),
       sessionId: ownerSessionId,
-      userId: ownerUserId
+      userId: ownerUserId,
+      contextUsage
     });
     const requestSessionId = getSessionIdFromContext(llmContext) ?? ownerSessionId;
-    const isInternal = isInternalPromptId(userPromptId);
     const exchange = createGenAiExchange(llmContext, llmSpan, {
       captureContent: !isInternal && this.shouldCollectSensitiveSpanAttributes(),
       sensitiveAttributeMaxLength: this.config.getTelemetrySensitiveSpanAttributeMaxLength()
@@ -551,6 +827,8 @@ var LoggingContentGenerator = class {
   }
   async generateContentStream(req, userPromptId) {
     const retrySnapshot = snapshotRetryMetadata();
+    const isInternal = isInternalPromptId(userPromptId);
+    const contextUsage = this.snapshotContextUsage(req, isInternal);
     const ownerSessionId = this.config.getSessionId();
     const ownerUserId = this.config.getTelemetryUserId();
     const { span: llmSpan, context: llmContext } = startLLMRequestSpanWithContext(req.model, userPromptId, {
@@ -558,14 +836,14 @@ var LoggingContentGenerator = class {
       providerName: this.genAiProviderName,
       outputType: resolveGenAiOutputType(this.generatorAuthType, req.config),
       sessionId: ownerSessionId,
-      userId: ownerUserId
+      userId: ownerUserId,
+      contextUsage
     });
     const requestSessionId = getSessionIdFromContext(llmContext) ?? ownerSessionId;
     try {
       llmSpan.setAttribute("gen_ai.request.stream", true);
     } catch {
     }
-    const isInternal = isInternalPromptId(userPromptId);
     const exchange = createGenAiExchange(llmContext, llmSpan, {
       captureContent: !isInternal && this.shouldCollectSensitiveSpanAttributes(),
       sensitiveAttributeMaxLength: this.config.getTelemetrySensitiveSpanAttributeMaxLength()
@@ -786,7 +1064,7 @@ var LoggingContentGenerator = class {
       if (lastResponseForLogging && responses.at(-1) !== lastResponseForLogging) {
         responses.push(lastResponseForLogging);
       }
-      const consolidatedResponse = shouldCollectResponses ? this.consolidateGeminiResponsesForLogging(responses) : void 0;
+      const consolidatedResponse = shouldCollectResponses ? this.consolidateLlmResponsesForLogging(responses) : void 0;
       if (consolidatedResponse) {
         consolidatedResponse.usageMetadata = lastUsageMetadata;
       }
@@ -872,7 +1150,7 @@ var LoggingContentGenerator = class {
       return void 0;
     }
     const requestContext = this.createLoggingRequestContext(request.model);
-    const messages = OpenAIContentConverter.convertGeminiRequestToOpenAI(
+    const messages = OpenAIContentConverter.convertLlmRequestToOpenAI(
       request,
       requestContext,
       {
@@ -884,7 +1162,7 @@ var LoggingContentGenerator = class {
       messages
     };
     if (request.config?.tools) {
-      openaiRequest.tools = await OpenAIContentConverter.convertGeminiToolsToOpenAI(
+      openaiRequest.tools = await OpenAIContentConverter.convertLlmToolsToOpenAI(
         request.config.tools,
         this.schemaCompliance ?? "auto"
       );
@@ -922,7 +1200,7 @@ var LoggingContentGenerator = class {
     if (!this.openaiLogger || !openaiRequest) {
       return;
     }
-    const openaiResponse = response ? this.convertGeminiResponseToOpenAIForLogging(response, openaiRequest) : void 0;
+    const openaiResponse = response ? this.convertLlmResponseToOpenAIForLogging(response, openaiRequest) : void 0;
     await this.openaiLogger.logInteraction(
       openaiRequest,
       openaiResponse,
@@ -937,13 +1215,13 @@ var LoggingContentGenerator = class {
       debugLogger.warn("Failed to log OpenAI interaction:", loggingError);
     }
   }
-  convertGeminiResponseToOpenAIForLogging(response, openaiRequest) {
-    return OpenAIContentConverter.convertGeminiResponseToOpenAI(
+  convertLlmResponseToOpenAIForLogging(response, openaiRequest) {
+    return OpenAIContentConverter.convertLlmResponseToOpenAI(
       response,
       this.createLoggingRequestContext(openaiRequest.model)
     );
   }
-  consolidateGeminiResponsesForLogging(responses) {
+  consolidateLlmResponsesForLogging(responses) {
     if (responses.length === 0) {
       return void 0;
     }