@qwen-code/qwen-code 0.19.6 → 0.19.7-nightly.20260708.394c1a289

package/chunks/{chunk-BOAWGUY6.js → chunk-4AFOWB47.js}

@@ -3,27 +3,28 @@
 import {
   OpenAIContentConverter,
   TaggedThinkingParser,
+  getRateLimitErrorDetails,
   openaiRequestCaptureContext
-} from "./chunk-JN2VJ33O.js";
+} from "./chunk-7I4MGFBN.js";
 import {
   RequestTokenizer
-} from "./chunk-JA5KWZTJ.js";
+} from "./chunk-44NROQYV.js";
 import {
   DASHSCOPE_PROXY_BASE_URL,
   DEFAULT_DASHSCOPE_BASE_URL,
   DEFAULT_MAX_RETRIES,
   DEFAULT_STREAM_IDLE_TIMEOUT_MS,
-  DEFAULT_TIMEOUT,
   MAX_STREAM_IDLE_TIMEOUT_MS,
   QWEN_STREAM_IDLE_TIMEOUT_MS_ENV,
   hasExplicitOutputLimit,
   parsePositiveIntegerEnvValue,
+  resolveRequestTimeout,
   tokenLimit
-} from "./chunk-KYTQOCDE.js";
+} from "./chunk-HW4N45EE.js";
 import {
   runtimeDiagnostics,
   safeJsonParse
-} from "./chunk-YPCPZSZB.js";
+} from "./chunk-CCGOFQV3.js";
 import {
   GenerateContentResponse
 } from "./chunk-55ZMG67I.js";
@@ -33,11 +34,13 @@ import {
 import {
   buildRuntimeFetchOptions,
   redactProxyError
-} from "./chunk-D5KISTLW.js";
+} from "./chunk-H6EMK6QK.js";
 import {
   createDebugLogger,
+  getErrorStatus,
+  getErrorType,
   isAbortError
-} from "./chunk-AVQDCKNF.js";
+} from "./chunk-22MNNNXE.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";
@@ -6952,9 +6955,9 @@ var DefaultOpenAICompatibleProvider = class {
     const {
       apiKey,
       baseUrl,
-      timeout = DEFAULT_TIMEOUT,
       maxRetries = DEFAULT_MAX_RETRIES
     } = this.contentGeneratorConfig;
+    const timeout = resolveRequestTimeout(this.contentGeneratorConfig.timeout);
     const defaultHeaders = this.buildHeaders();
     const runtimeOptions = buildRuntimeFetchOptions(
       "openai",
@@ -7143,9 +7146,9 @@ var DashScopeOpenAICompatibleProvider = class _DashScopeOpenAICompatibleProvider
     const {
       apiKey,
       baseUrl = DEFAULT_DASHSCOPE_BASE_URL,
-      timeout = DEFAULT_TIMEOUT,
       maxRetries = DEFAULT_MAX_RETRIES
     } = this.contentGeneratorConfig;
+    const timeout = resolveRequestTimeout(this.contentGeneratorConfig.timeout);
     const defaultHeaders = this.buildHeaders();
     const runtimeOptions = buildRuntimeFetchOptions(
       "openai",
@@ -7813,11 +7816,17 @@ var StreamingToolCallParser = class {
           const existingBuffer = this.buffers.get(index);
           const existingDepth = this.depths.get(index);
           const existingMeta = this.toolCallMeta.get(index);
-          if (existingBuffer.trim() && existingDepth === 0 && existingMeta?.id && existingMeta.id !== id) {
-            try {
-              JSON.parse(existingBuffer);
+          if (existingMeta?.name && existingDepth === 0 && existingMeta?.id && existingMeta.id !== id) {
+            let existingComplete = true;
+            if (existingBuffer.trim()) {
+              try {
+                JSON.parse(existingBuffer);
+              } catch {
+                existingComplete = false;
+              }
+            }
+            if (existingComplete) {
               actualIndex = this.findNextAvailableIndex();
-            } catch {
             }
           }
         }
@@ -7848,14 +7857,21 @@ var StreamingToolCallParser = class {
     }
     const currentBuffer = this.buffers.get(actualIndex);
     const currentDepth = this.depths.get(actualIndex);
-    if (isKnownId && currentBuffer.trim() && currentDepth === 0) {
-      try {
-        JSON.parse(currentBuffer);
+    if (isKnownId && currentDepth === 0) {
+      if (currentBuffer.trim()) {
+        try {
+          JSON.parse(currentBuffer);
+          debugLogger3.debug(
+            `Ignoring replay chunk for completed toolCall id=${id}`
+          );
+          return { complete: false };
+        } catch {
+        }
+      } else if (this.toolCallMeta.get(actualIndex)?.name && name && !chunk.trim()) {
         debugLogger3.debug(
-          `Ignoring replay chunk for completed toolCall id=${id}`
+          `Ignoring replayed opener for no-argument toolCall id=${id}`
         );
         return { complete: false };
-      } catch {
       }
     }
     const meta = this.toolCallMeta.get(actualIndex);
@@ -7922,8 +7938,10 @@ var StreamingToolCallParser = class {
    * 2. Auto-close unclosed strings and retry
    * 3. Fallback to safeJsonParse for malformed data
    *
-   * Only returns tool calls with both name metadata and non-empty buffers.
-   * Should be called when streaming is complete (finish_reason is present).
+   * Only returns tool calls with name metadata. An empty buffer yields
+   * empty arguments ({}), matching the non-streaming path for no-argument
+   * tools. Should be called when streaming is complete (finish_reason is
+   * present).
    *
    * @returns Array of completed tool calls with their metadata and parsed arguments
    */
@@ -7932,7 +7950,7 @@ var StreamingToolCallParser = class {
     const emittedIds = /* @__PURE__ */ new Set();
     for (const [index, buffer] of this.buffers.entries()) {
       const meta = this.toolCallMeta.get(index);
-      if (meta?.name && buffer.trim()) {
+      if (meta?.name) {
         if (meta.id) {
           if (emittedIds.has(meta.id)) {
             continue;
@@ -7940,19 +7958,31 @@ var StreamingToolCallParser = class {
           emittedIds.add(meta.id);
         }
         let args = {};
-        try {
-          args = JSON.parse(buffer);
-        } catch {
-          const inString = this.inStrings.get(index);
-          if (inString) {
-            try {
-              args = JSON.parse(buffer + '"');
-            } catch {
+        if (buffer.trim()) {
+          try {
+            args = JSON.parse(buffer);
+          } catch {
+            const inString = this.inStrings.get(index);
+            if (inString) {
+              try {
+                args = JSON.parse(buffer + '"');
+              } catch {
+                args = safeJsonParse(buffer, {});
+              }
+            } else {
               args = safeJsonParse(buffer, {});
             }
-          } else {
-            args = safeJsonParse(buffer, {});
           }
+          if (typeof args !== "object" || args === null || Array.isArray(args)) {
+            debugLogger3.debug(
+              `Collapsing non-object arguments for tool call ${meta.name} (id=${meta.id}) at index ${index}; buffer likely polluted by a misrouted fragment`
+            );
+            args = {};
+          }
+        } else {
+          debugLogger3.debug(
+            `Emitting no-argument tool call ${meta.name} (id=${meta.id}) at index ${index} with empty buffer`
+          );
         }
         completed.push({
           id: meta.id,
@@ -7968,8 +7998,9 @@ var StreamingToolCallParser = class {
    * Finds the next available index for a new tool call
    *
    * Scans indices starting from nextAvailableIndex to find one that's safe to use.
-   * Reuses indices with empty buffers or incomplete parsing states.
-   * Skips indices with complete, parseable tool call data to prevent overwriting.
+   * Reuses indices never claimed by a named tool call or with incomplete
+   * parsing states. Skips indices with complete tool call data — including
+   * no-argument calls with empty buffers — to prevent overwriting.
    *
    * @returns The next available index safe for storing a new tool call
    */
@@ -7978,17 +8009,15 @@ var StreamingToolCallParser = class {
       const buffer = this.buffers.get(this.nextAvailableIndex);
       const depth = this.depths.get(this.nextAvailableIndex);
       const meta = this.toolCallMeta.get(this.nextAvailableIndex);
-      if (!buffer.trim() || depth > 0 || !meta?.id) {
+      if (!meta?.name || depth > 0 || !meta?.id) {
         return this.nextAvailableIndex;
       }
-      try {
-        JSON.parse(buffer);
-        if (depth === 0) {
-          this.nextAvailableIndex++;
-          continue;
+      if (buffer.trim()) {
+        try {
+          JSON.parse(buffer);
+        } catch {
+          return this.nextAvailableIndex;
         }
-      } catch {
-        return this.nextAvailableIndex;
       }
       this.nextAvailableIndex++;
     }
@@ -7998,8 +8027,9 @@ var StreamingToolCallParser = class {
    * Finds the most recent incomplete tool call index
    *
    * Used when continuation chunks arrive without IDs. Scans existing tool calls
-   * to find the highest index with incomplete parsing state (depth > 0, empty buffer,
-   * or unparseable JSON). Falls back to creating a new index if none found.
+   * to find the highest index with incomplete parsing state (depth > 0, empty
+   * buffer with no name metadata yet, or unparseable JSON). Falls back to
+   * creating a new index if none found.
    *
    * @returns The index of the most recent incomplete tool call, or a new available index
    */
@@ -8008,7 +8038,7 @@ var StreamingToolCallParser = class {
     for (const [index, buffer] of this.buffers.entries()) {
       const depth = this.depths.get(index);
       const meta = this.toolCallMeta.get(index);
-      if (meta?.id && (depth > 0 || !buffer.trim())) {
+      if (meta?.id && (depth > 0 || !buffer.trim() && !meta?.name)) {
         maxIndex = Math.max(maxIndex, index);
       } else if (buffer.trim()) {
         try {
@@ -8431,10 +8461,19 @@ var ContentGenerationPipeline = class {
     if (reasoningDisabled) {
       const typed = providerRequest;
       const model = (context.model ?? "").toLowerCase();
-      if (DashScopeOpenAICompatibleProvider.isDashScopeProvider(
-        this.contentGeneratorConfig
-      ) && (model.startsWith("qwen") || model === "coder-model")) {
-        typed["enable_thinking"] = false;
+      if (model.startsWith("qwen") || model === "coder-model") {
+        if (DashScopeOpenAICompatibleProvider.isDashScopeProvider(
+          this.contentGeneratorConfig
+        )) {
+          typed["enable_thinking"] = false;
+        } else {
+          delete typed["enable_thinking"];
+          const existing = typed["chat_template_kwargs"] ?? {};
+          typed["chat_template_kwargs"] = {
+            ...existing,
+            enable_thinking: false
+          };
+        }
       }
       if ("reasoning" in typed) {
         delete typed["reasoning"];
@@ -8574,7 +8613,11 @@ var EnhancedErrorHandler = class {
       isTimeoutError
     );
     if (!this.shouldSuppressErrorLogging(redactedError, request)) {
-      debugLogger5.error("OpenAI API Error:", errorMessage);
+      debugLogger5.error(
+        "OpenAI API Error:",
+        errorMessage,
+        this.buildDiagnostics(redactedError, context)
+      );
     }
     if (isTimeoutError) {
       throw new Error(
@@ -8602,6 +8645,35 @@ ${this.getTimeoutTroubleshootingTips()}`
     }
     return error instanceof Error ? error.message : String(error);
   }
+  buildDiagnostics(error, context) {
+    const details = getRateLimitErrorDetails(error);
+    const requestId = this.getRequestId(error) ?? details.requestId;
+    const statusCode = getErrorStatus(error);
+    return {
+      model: context.model,
+      durationMs: Date.now() - context.startTime,
+      errorType: getErrorType(error),
+      ...statusCode !== void 0 ? { statusCode } : {},
+      ...details.providerCode !== void 0 ? { providerCode: details.providerCode } : {},
+      ...details.providerMessage !== void 0 ? { providerMessage: details.providerMessage } : {},
+      ...requestId !== void 0 ? { requestId } : {},
+      ...details.transport !== "unknown" ? { transport: details.transport } : {}
+    };
+  }
+  getRequestId(error) {
+    if (!error || typeof error !== "object") return void 0;
+    const source = error;
+    for (const value of [
+      source.requestID,
+      source.request_id,
+      source.response_id
+    ]) {
+      if (typeof value === "string" && value) {
+        return value;
+      }
+    }
+    return void 0;
+  }
   getTimeoutTroubleshootingTips() {
     const tips = [
       "- Reduce input length or complexity",

package/chunks/{chunk-MOUXUCXQ.js → chunk-4KJ2BPIT.js}

@@ -5,7 +5,7 @@ import {
   Storage,
   resolvePath,
   sanitizeCwd
-} from "./chunk-AVQDCKNF.js";
+} from "./chunk-22MNNNXE.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";

package/chunks/{chunk-YTWX5TT2.js → chunk-5FL2K3ZB.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   parseRule
-} from "./chunk-AGZF43UV.js";
+} from "./chunk-E7HM76PR.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";

package/chunks/{chunk-UNXGEDX2.js → chunk-5OSSOBZC.js}

@@ -3,26 +3,26 @@
 import {
   Colors,
   RowMouseController
-} from "./chunk-FPHA7WIZ.js";
+} from "./chunk-MYZWWRVW.js";
 import {
   theme
-} from "./chunk-VXGPYF7U.js";
+} from "./chunk-IFEWJXFS.js";
 import {
   Box_default,
   Text,
   require_jsx_runtime
-} from "./chunk-YSU33ACT.js";
+} from "./chunk-ELMPRVCB.js";
 import {
   require_react
 } from "./chunk-KYMBIKIW.js";
 import {
   t
-} from "./chunk-6QVRLKTZ.js";
+} from "./chunk-TBLJNMI7.js";
 import {
   readManyFiles,
   shouldRunVisionBridge,
   stripTerminalControlSequences
-} from "./chunk-AGZF43UV.js";
+} from "./chunk-E7HM76PR.js";
 import {
   emptyMcpResourceText,
   formatMcpResourceContents,
@@ -34,7 +34,7 @@ import {
   isNodeError,
   isSubpath,
   unescapePath
-} from "./chunk-AVQDCKNF.js";
+} from "./chunk-22MNNNXE.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";
@@ -435,6 +435,52 @@ function getExtensionSuggestions(config, pattern) {
 }
 __name(getExtensionSuggestions, "getExtensionSuggestions");
 
+// packages/cli/src/utils/mcp-server-mention.ts
+init_esbuild_shims();
+var MCP_SERVER_REF_PREFIX = "mcp:";
+function parseMcpServerRef(pathName) {
+  if (!pathName.startsWith(MCP_SERVER_REF_PREFIX)) return null;
+  const name = pathName.slice(MCP_SERVER_REF_PREFIX.length);
+  if (!name) return null;
+  return { name };
+}
+__name(parseMcpServerRef, "parseMcpServerRef");
+function buildMcpServerRef(serverName) {
+  return `${MCP_SERVER_REF_PREFIX}${serverName}`;
+}
+__name(buildMcpServerRef, "buildMcpServerRef");
+function matchMcpServerByRef(name, servers) {
+  const lower = name.toLowerCase();
+  const matchedName = Object.keys(servers).find(
+    (serverName) => serverName.toLowerCase() === lower
+  );
+  if (!matchedName) return void 0;
+  return { serverName: matchedName, server: servers[matchedName] };
+}
+__name(matchMcpServerByRef, "matchMcpServerByRef");
+function buildMcpServerContextText(config, serverName) {
+  const lines = [
+    `--- MCP Server: ${serverName} ---`,
+    `The user explicitly mentioned this MCP server. Prefer using tools and resources from this server when relevant for this turn. This is advisory context, not a hard restriction.`
+  ];
+  const prompts = config.getPromptRegistry?.()?.getPromptsByServer(serverName) ?? [];
+  const resources = config.getResourceRegistry?.()?.getResourcesByServer(serverName) ?? [];
+  const details = [];
+  if (resources.length > 0) {
+    details.push(`- Resources: ${resources.length}`);
+  }
+  if (prompts.length > 0) {
+    details.push(`- Prompts: ${prompts.length}`);
+  }
+  if (details.length > 0) {
+    lines.push("Available capabilities from this MCP server:");
+    lines.push(...details);
+  }
+  lines.push(`--- End MCP Server: ${serverName} ---`);
+  return lines.join("\n");
+}
+__name(buildMcpServerContextText, "buildMcpServerContextText");
+
 // packages/cli/src/ui/hooks/atCommandProcessor.ts
 function parseAllAtCommands(query) {
   const parts = [];
@@ -521,6 +567,7 @@ async function resolveAtCommandQuery({
   };
   const mcpServerNames = new Set(Object.keys(config.getMcpServers() || {}));
   const mcpResourceRefs = [];
+  const mcpServerMentions = [];
   const activeExtensions = config.getActiveExtensions?.() ?? [];
   const extensionMentions = [];
   for (const atPathPart of atPathCommandParts) {
@@ -553,6 +600,30 @@ async function resolveAtCommandQuery({
       atPathToResolvedSpecMap.set(originalAtPath, pathName);
       continue;
     }
+    const mcpServerRef = parseMcpServerRef(pathName);
+    if (mcpServerRef) {
+      const matched = matchMcpServerByRef(
+        mcpServerRef.name,
+        config.getMcpServers() || {}
+      );
+      if (matched) {
+        if (!mcpServerMentions.some((m) => m.serverName === matched.serverName)) {
+          mcpServerMentions.push({
+            originalAtPath,
+            serverName: matched.serverName
+          });
+        }
+        atPathToResolvedSpecMap.set(
+          originalAtPath,
+          buildMcpServerRef(matched.serverName)
+        );
+        continue;
+      }
+      onDebugMessage(
+        `MCP server "${mcpServerRef.name}" not found among configured MCP servers. Available: ${Object.keys(config.getMcpServers() || {}).join(", ") || "(none)"}`
+      );
+      continue;
+    }
     const workspaceContext = config.getWorkspaceContext();
     const projectTempDir = Storage.getGlobalTempDir();
     const absolutePathName = path.isAbsolute(pathName) ? pathName : path.resolve(workspaceContext.getDirectories()[0] || "", pathName);
@@ -697,7 +768,7 @@ ${messages.join("\n")}`;
       confirmationDetails: void 0
     });
   }
-  if (pathSpecsToRead.length === 0 && mcpResourceRefs.length === 0 && extensionMentions.length === 0) {
+  if (pathSpecsToRead.length === 0 && mcpResourceRefs.length === 0 && mcpServerMentions.length === 0 && extensionMentions.length === 0) {
     onDebugMessage("No valid file paths found in @ commands to read.");
     if (initialQueryText === "@" && query.trim() === "@") {
       return { processedQuery: [{ text: query }], shouldProceed: true };
@@ -710,11 +781,9 @@ ${messages.join("\n")}`;
     };
   }
   let extensionContextBudgetRemaining = EXTENSION_CONTEXT_BUDGET;
-  const extensionParts = [];
-  const extensionDisplays = [];
-  const extensionLabels = [];
+  const scopedMentionEntries = [];
   for (let i = 0; i < extensionMentions.length; i++) {
-    const { extension } = extensionMentions[i];
+    const { originalAtPath, extension } = extensionMentions[i];
     const displayName = getExtensionDisplayName(extension);
     const callId = `client-extension-${userMessageTimestamp}-${i}`;
     const context = await buildExtensionMentionContext(extension, {
@@ -723,17 +792,47 @@ ${messages.join("\n")}`;
       onDebugMessage
     });
     extensionContextBudgetRemaining = context.remainingBudget;
-    extensionParts.push({ text: context.text });
-    extensionLabels.push(buildExtensionRef(extension.name));
-    extensionDisplays.push({
-      callId,
-      name: "Activate Extension",
-      description: `Activated extension ${displayName}`,
-      status: "Success" /* Success */,
-      resultDisplay: void 0,
-      confirmationDetails: void 0
+    scopedMentionEntries.push({
+      originalAtPath,
+      part: { text: context.text },
+      label: buildExtensionRef(extension.name),
+      display: {
+        callId,
+        name: "Activate Extension",
+        description: `Activated extension ${displayName}`,
+        status: "Success" /* Success */,
+        resultDisplay: void 0,
+        confirmationDetails: void 0
+      }
     });
   }
+  for (let i = 0; i < mcpServerMentions.length; i++) {
+    const { originalAtPath, serverName } = mcpServerMentions[i];
+    scopedMentionEntries.push({
+      originalAtPath,
+      part: { text: buildMcpServerContextText(config, serverName) },
+      label: buildMcpServerRef(serverName),
+      display: {
+        callId: `client-mcp-server-${userMessageTimestamp}-${i}`,
+        name: "Activate MCP Server",
+        description: `Activated MCP server ${serverName}`,
+        status: "Success" /* Success */,
+        resultDisplay: void 0,
+        confirmationDetails: void 0
+      }
+    });
+  }
+  const scopedMentionOrder = new Map(
+    atPathCommandParts.map((part, index) => [part.content, index])
+  );
+  scopedMentionEntries.sort(
+    (a, b) => (scopedMentionOrder.get(a.originalAtPath) ?? Number.MAX_SAFE_INTEGER) - (scopedMentionOrder.get(b.originalAtPath) ?? Number.MAX_SAFE_INTEGER)
+  );
+  const scopedMentionParts = scopedMentionEntries.map((entry) => entry.part);
+  const scopedMentionLabels = scopedMentionEntries.map((entry) => entry.label);
+  const scopedMentionDisplays = scopedMentionEntries.map(
+    (entry) => entry.display
+  );
   const fileParts = [];
   let fileDisplays = [];
   if (pathSpecsToRead.length > 0) {
@@ -770,7 +869,7 @@ ${messages.join("\n")}`;
       };
       const errorMessage = typeof errorToolCallDisplay.resultDisplay === "string" ? errorToolCallDisplay.resultDisplay : void 0;
       const labelsOnError = [
-        ...extensionLabels,
+        ...scopedMentionLabels,
         ...contentLabelsForDisplay,
         ...resourceLabels
       ];
@@ -778,7 +877,7 @@ ${messages.join("\n")}`;
         processedQuery: null,
         shouldProceed: false,
         toolDisplays: [
-          ...extensionDisplays,
+          ...scopedMentionDisplays,
           ...resourceDisplays,
           errorToolCallDisplay
         ],
@@ -793,19 +892,23 @@ ${messages.join("\n")}`;
   }
   const processedQueryParts = [
     { text: initialQueryText },
-    ...extensionParts,
+    ...scopedMentionParts,
     ...fileParts,
     ...resourceParts
   ];
   const allLabels = [
-    ...extensionLabels,
+    ...scopedMentionLabels,
     ...contentLabelsForDisplay,
     ...resourceLabels
   ];
   return {
     processedQuery: processedQueryParts,
     shouldProceed: true,
-    toolDisplays: [...extensionDisplays, ...fileDisplays, ...resourceDisplays],
+    toolDisplays: [
+      ...scopedMentionDisplays,
+      ...fileDisplays,
+      ...resourceDisplays
+    ],
     filesRead: allLabels,
     recording: {
       filesRead: allLabels,
@@ -850,8 +953,13 @@ export {
   EXTENSION_CONTEXT_BUDGET,
   parseExtensionRef,
   matchExtensionByRef,
+  sanitizeDisplayText,
   buildExtensionMentionContext,
   getExtensionSuggestions,
+  parseMcpServerRef,
+  buildMcpServerRef,
+  matchMcpServerByRef,
+  buildMcpServerContextText,
   resolveAtCommandQuery,
   handleAtCommand
 };