@qwen-code/qwen-code 0.22.0 → 0.22.2-nightly.20260828.7357136dd1

package/chunks/{loggingContentGenerator-RNE66CKK.js → loggingContentGenerator-3ONLU3BS.js}

@@ -2,64 +2,119 @@
 "use strict";
 import {
   OpenAILogger
-} from "./chunk-EFB657PR.js";
+} from "./chunk-TW3E6YNO.js";
+import {
+  computeThresholds,
+  estimateContentTokens,
+  estimateContextTextTokens,
+  getCustomSystemPrompt
+} from "./chunk-EWIQ3NAE.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-SJ4HB27T.js";
+} from "./chunk-6W2IK5KC.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-XLLQJRAH.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-2UZJWSVD.js";
+} from "./chunk-4QHPPXK2.js";
+import "./chunk-QHMLYMMS.js";
+import "./chunk-3WK3QDNV.js";
 import {
   OpenAIContentConverter,
   openaiRequestCaptureContext
-} from "./chunk-B6UBOIFE.js";
+} from "./chunk-H33EQVMG.js";
 import {
   getGenAiUsageProvenance
-} from "./chunk-36OF5PRW.js";
+} from "./chunk-ABS25QER.js";
 import {
   runtimeDiagnostics
 } from "./chunk-VNOVK4I7.js";
 import {
   createGenAiExchange
-} from "./chunk-IBJ5S45N.js";
-import "./chunk-2J3OJGTL.js";
-import "./chunk-LI4YHTQK.js";
-import "./chunk-QKBYFU2Q.js";
-import "./chunk-C72BXMJ5.js";
+} from "./chunk-B7CDU2SL.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-DYXFD5RO.js";
+import "./chunk-Y3QL45LS.js";
 import {
   ApiErrorEvent,
   ApiRequestEvent,
   ApiResponseEvent,
+  DiscoveredMCPTool,
   isInternalPromptId,
   logApiError,
   logApiRequest,
   logApiResponse,
+  subagentIdentityContext,
   subagentNameContext
-} from "./chunk-FDD2IUEL.js";
-import "./chunk-YRLW2MSX.js";
+} from "./chunk-SZLBBZH4.js";
+import "./chunk-XBVNNDPK.js";
 import "./chunk-VGC4I5JJ.js";
-import "./chunk-IWOWEENB.js";
-import "./chunk-HIK2OF33.js";
-import "./chunk-ZRYQMWEP.js";
-import "./chunk-2E3V7G6Y.js";
-import "./chunk-F6WFNA7U.js";
+import "./chunk-BKWNKLZB.js";
+import "./chunk-6PJOTWAN.js";
+import "./chunk-BWORX6FA.js";
 import "./chunk-WZAD4ZNJ.js";
-import "./chunk-FPGTNKCP.js";
-import "./chunk-YHC2EYYG.js";
-import "./chunk-PZRUV52H.js";
-import "./chunk-JGUBDRBC.js";
-import "./chunk-HDKCKCYO.js";
+import {
+  DEFAULT_TOKEN_LIMIT
+} from "./chunk-FPGTNKCP.js";
+import "./chunk-6DIGWMGT.js";
+import "./chunk-3K6TUZHS.js";
+import "./chunk-XZA32HII.js";
+import "./chunk-23RFD54N.js";
+import "./chunk-PPKZ7JOE.js";
 import "./chunk-HHJLM3WQ.js";
 import {
   API_CALL_ABORTED_SPAN_STATUS_MESSAGE,
   API_CALL_FAILED_SPAN_STATUS_MESSAGE,
   endLLMRequestSpan,
+  isTelemetrySdkInitialized,
+  isValidContextUsage,
   startLLMRequestSpanWithContext
-} from "./chunk-GAHYKJPV.js";
+} from "./chunk-B5PHIJGI.js";
 import "./chunk-74TONY4F.js";
-import "./chunk-XL5K4SVK.js";
-import "./chunk-6NFAEG54.js";
+import "./chunk-XF63PKEN.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,
@@ -67,7 +122,7 @@ import {
   getErrorType,
   getSessionIdFromContext,
   isAbortError
-} from "./chunk-A5F2YNO6.js";
+} from "./chunk-UHQFIS7N.js";
 import "./chunk-75DOP5OR.js";
 import "./chunk-DMTGGOSA.js";
 import "./chunk-YQ3U5MUC.js";
@@ -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) {
@@ -128,6 +386,7 @@ var PROVIDER_BY_ENV_KEY = {
   MIMO_API_KEY: "mimo",
   MISTRAL_API_KEY: "mistral_ai",
   MODELSCOPE_API_KEY: "modelscope",
+  MOONSHOT_API_KEY: "moonshot",
   OPENAI_API_KEY: "openai",
   OPENROUTER_API_KEY: "openrouter",
   REQUESTY_API_KEY: "requesty",
@@ -149,6 +408,9 @@ function providerFromHostname(hostname) {
   if (isHostOrSubdomain(hostname, "deepseek.com")) return "deepseek";
   if (isHostOrSubdomain(hostname, "x.ai")) return "x_ai";
   if (isHostOrSubdomain(hostname, "mistral.ai")) return "mistral_ai";
+  if (isHostOrSubdomain(hostname, "moonshot.ai") || isHostOrSubdomain(hostname, "moonshot.cn")) {
+    return "moonshot";
+  }
   if (isHostOrSubdomain(hostname, "minimax.io") || isHostOrSubdomain(hostname, "minimaxi.com")) {
     return "minimax";
   }
@@ -283,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;
@@ -316,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(
@@ -330,6 +608,7 @@ var LoggingContentGenerator = class {
     );
   }
   _logApiResponse(responseId, durationMs, model, prompt_id, sessionId, usageMetadata, responseText, ttftMs) {
+    const identity = subagentIdentityContext.getStore();
     logApiResponse(
       this.config,
       new ApiResponseEvent(
@@ -343,7 +622,12 @@ var LoggingContentGenerator = class {
         subagentNameContext.getStore(),
         ttftMs
       ),
-      sessionId
+      sessionId,
+      identity ? {
+        id: identity.id,
+        type: identity.type,
+        taskName: identity.taskName
+      } : void 0
     );
   }
   _logApiError(responseId, durationMs, error, model, prompt_id, sessionId) {
@@ -351,6 +635,7 @@ var LoggingContentGenerator = class {
     const errorType = getErrorType(error);
     const errorResponseId = error?.requestID || error?.request_id || responseId;
     const errorStatus = getErrorStatus(error);
+    const identity = subagentIdentityContext.getStore();
     logApiError(
       this.config,
       new ApiErrorEvent({
@@ -364,7 +649,12 @@ var LoggingContentGenerator = class {
         statusCode: errorStatus,
         subagentName: subagentNameContext.getStore()
       }),
-      sessionId
+      sessionId,
+      identity ? {
+        id: identity.id,
+        type: identity.type,
+        taskName: identity.taskName
+      } : void 0
     );
   }
   safelyLogApiError(responseId, durationMs, error, model, prompt_id, sessionId, abortSignal) {
@@ -402,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, {
@@ -409,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()
@@ -535,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, {
@@ -542,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()
@@ -1051,15 +1345,9 @@ var LoggingContentGenerator = class {
   shouldCollectSensitiveSpanAttributes() {
     return areSensitiveSpanAttributesEnabled(this.config);
   }
-  async countTokens(req) {
-    return this.wrapped.countTokens(req);
-  }
   async embedContent(req) {
     return this.wrapped.embedContent(req);
   }
-  useSummarizedThinking() {
-    return this.wrapped.useSummarizedThinking();
-  }
   toContents(contents) {
     if (Array.isArray(contents)) {
       return contents.map((c) => this.toContent(c));

package/chunks/{loop-wakeup-E54KDUXC.js → loop-wakeup-XJFONSQ7.js}

@@ -4,24 +4,24 @@ import {
   WAKEUP_MAX_SECONDS,
   WAKEUP_MIN_SECONDS,
   clampWakeupSeconds
-} from "./chunk-DJEHYM4H.js";
+} from "./chunk-EKSCLBBF.js";
 import "./chunk-IRH27ZC2.js";
 import "./chunk-QHWCP53L.js";
-import "./chunk-AZF6SME3.js";
+import "./chunk-D5LUXLUH.js";
 import {
   todoWorkChainContext
 } from "./chunk-O6GEWCJA.js";
 import "./chunk-VGC4I5JJ.js";
-import "./chunk-HDKCKCYO.js";
+import "./chunk-23RFD54N.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-6NFAEG54.js";
+} from "./chunk-UTLCH2FK.js";
 import {
   getErrorMessage
-} from "./chunk-A5F2YNO6.js";
+} from "./chunk-UHQFIS7N.js";
 import "./chunk-TBWQLLFO.js";
 import {
   init_esbuild_shims

package/chunks/{ls-CGL2UC3H.js → ls-3VAT2J7A.js}

@@ -2,16 +2,16 @@
 "use strict";
 import {
   getMemoryBaseDir
-} from "./chunk-HIK2OF33.js";
+} from "./chunk-6PJOTWAN.js";
 import {
   DEFAULT_FILE_FILTERING_OPTIONS
-} from "./chunk-K52PZNU4.js";
+} from "./chunk-PDQGMSZK.js";
 import {
   BaseDeclarativeTool,
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-6NFAEG54.js";
+} from "./chunk-UTLCH2FK.js";
 import {
   Storage,
   createDebugLogger,
@@ -20,7 +20,7 @@ import {
   makeRelative,
   shortenPath,
   unescapePath
-} from "./chunk-A5F2YNO6.js";
+} from "./chunk-UHQFIS7N.js";
 import "./chunk-TBWQLLFO.js";
 import {
   init_esbuild_shims

package/chunks/{lsp-5IKUO5DX.js → lsp-5W7IRUBH.js}

@@ -5,10 +5,10 @@ import {
   BaseToolInvocation,
   ToolDisplayNames,
   ToolNames
-} from "./chunk-6NFAEG54.js";
+} from "./chunk-UTLCH2FK.js";
 import {
   unescapePath
-} from "./chunk-A5F2YNO6.js";
+} from "./chunk-UHQFIS7N.js";
 import "./chunk-TBWQLLFO.js";
 import {
   init_esbuild_shims