@qwen-code/qwen-code 0.10.0-preview.2 → 0.10.0-preview.3

package/cli.js

@@ -71639,6 +71639,17 @@ var init_tools = __esm({
 });
 
 // packages/core/dist/src/tools/mcp-tool.js
+function wrapMcpCallToolResultAsParts(toolName, result) {
+  const response = result.isError ? { error: result, content: result.content } : result;
+  return [
+    {
+      functionResponse: {
+        name: toolName,
+        response
+      }
+    }
+  ];
+}
 function transformTextBlock(block2) {
   return { text: block2.text };
 }
@@ -71756,8 +71767,10 @@ var init_mcp_tool = __esm({
       displayName;
       trust;
       cliConfig;
+      mcpClient;
+      mcpTimeout;
       static allowlist = /* @__PURE__ */ new Set();
-      constructor(mcpTool, serverName, serverToolName, displayName, trust, params = {}, cliConfig) {
+      constructor(mcpTool, serverName, serverToolName, displayName, trust, params = {}, cliConfig, mcpClient, mcpTimeout) {
         super(params);
         this.mcpTool = mcpTool;
         this.serverName = serverName;
@@ -71765,6 +71778,8 @@ var init_mcp_tool = __esm({
         this.displayName = displayName;
         this.trust = trust;
         this.cliConfig = cliConfig;
+        this.mcpClient = mcpClient;
+        this.mcpTimeout = mcpTimeout;
       }
       async shouldConfirmExecute(_abortSignal) {
         const serverAllowListKey = this.serverName;
@@ -71808,7 +71823,63 @@ var init_mcp_tool = __esm({
         }
         return false;
       }
-      async execute(signal) {
+      async execute(signal, updateOutput2) {
+        if (this.mcpClient) {
+          return this.executeWithDirectClient(signal, updateOutput2);
+        }
+        return this.executeWithCallableTool(signal);
+      }
+      /**
+       * Execute using the raw MCP SDK Client, which supports progress
+       * notifications via the onprogress callback. This enables real-time
+       * streaming of progress updates to the user during long-running
+       * MCP tool calls (e.g., browser automation).
+       */
+      async executeWithDirectClient(signal, updateOutput2) {
+        const callToolResult = await this.mcpClient.callTool({
+          name: this.serverToolName,
+          arguments: this.params
+        }, void 0, {
+          onprogress: /* @__PURE__ */ __name((progress) => {
+            if (updateOutput2) {
+              const progressData = {
+                type: "mcp_tool_progress",
+                progress: progress.progress,
+                ...progress.total != null && { total: progress.total },
+                ...progress.message != null && { message: progress.message }
+              };
+              updateOutput2(progressData);
+            }
+          }, "onprogress"),
+          timeout: this.mcpTimeout,
+          signal
+        });
+        const rawResponseParts = wrapMcpCallToolResultAsParts(this.serverToolName, callToolResult);
+        if (this.isMCPToolError(rawResponseParts)) {
+          const errorMessage = `MCP tool '${this.serverToolName}' reported tool error for function call: ${safeJsonStringify({
+            name: this.serverToolName,
+            args: this.params
+          })} with response: ${safeJsonStringify(rawResponseParts)}`;
+          return {
+            llmContent: errorMessage,
+            returnDisplay: `Error: MCP tool '${this.serverToolName}' reported an error.`,
+            error: {
+              message: errorMessage,
+              type: ToolErrorType.MCP_TOOL_ERROR
+            }
+          };
+        }
+        const transformedParts = transformMcpContentToParts(rawResponseParts);
+        return {
+          llmContent: transformedParts,
+          returnDisplay: getStringifiedResultForDisplay(rawResponseParts)
+        };
+      }
+      /**
+       * Fallback: execute using the @google/genai CallableTool wrapper.
+       * This path does NOT support progress notifications.
+       */
+      async executeWithCallableTool(signal) {
         const functionCalls = [
           {
             name: this.serverToolName,
@@ -71871,7 +71942,9 @@ var init_mcp_tool = __esm({
       parameterSchema;
       trust;
       cliConfig;
-      constructor(mcpTool, serverName, serverToolName, description, parameterSchema, trust, nameOverride, cliConfig) {
+      mcpClient;
+      mcpTimeout;
+      constructor(mcpTool, serverName, serverToolName, description, parameterSchema, trust, nameOverride, cliConfig, mcpClient, mcpTimeout) {
         super(
           nameOverride ?? generateValidName(`mcp__${serverName}__${serverToolName}`),
           `${serverToolName} (${serverName} MCP Server)`,
@@ -71880,7 +71953,7 @@ var init_mcp_tool = __esm({
           parameterSchema,
           true,
           // isOutputMarkdown
-          false
+          true
         );
         this.mcpTool = mcpTool;
         this.serverName = serverName;
@@ -71888,14 +71961,17 @@ var init_mcp_tool = __esm({
         this.parameterSchema = parameterSchema;
         this.trust = trust;
         this.cliConfig = cliConfig;
+        this.mcpClient = mcpClient;
+        this.mcpTimeout = mcpTimeout;
       }
       asFullyQualifiedTool() {
-        return new _DiscoveredMCPTool(this.mcpTool, this.serverName, this.serverToolName, this.description, this.parameterSchema, this.trust, generateValidName(`mcp__${this.serverName}__${this.serverToolName}`), this.cliConfig);
+        return new _DiscoveredMCPTool(this.mcpTool, this.serverName, this.serverToolName, this.description, this.parameterSchema, this.trust, generateValidName(`mcp__${this.serverName}__${this.serverToolName}`), this.cliConfig, this.mcpClient, this.mcpTimeout);
       }
       createInvocation(params) {
-        return new DiscoveredMCPToolInvocation(this.mcpTool, this.serverName, this.serverToolName, this.displayName, this.trust, params, this.cliConfig);
+        return new DiscoveredMCPToolInvocation(this.mcpTool, this.serverName, this.serverToolName, this.displayName, this.trust, params, this.cliConfig, this.mcpClient, this.mcpTimeout);
       }
     };
+    __name(wrapMcpCallToolResultAsParts, "wrapMcpCallToolResultAsParts");
     __name(transformTextBlock, "transformTextBlock");
     __name(transformImageAudioBlock, "transformImageAudioBlock");
     __name(transformResourceBlock, "transformResourceBlock");
@@ -156312,7 +156388,7 @@ __export(geminiContentGenerator_exports, {
   createGeminiContentGenerator: () => createGeminiContentGenerator
 });
 function createGeminiContentGenerator(config2, gcConfig) {
-  const version2 = "0.10.0-preview.2";
+  const version2 = "0.10.0-preview.3";
   const userAgent2 = config2.userAgent || `QwenCode/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -210519,13 +210595,26 @@ async function discoverTools(mcpServerName, mcpServerConfig, mcpClient, cliConfi
     if (!Array.isArray(tool.functionDeclarations)) {
       return [];
     }
+    const mcpTimeout = mcpServerConfig.timeout ?? MCP_DEFAULT_TIMEOUT_MSEC;
     const discoveredTools = [];
     for (const funcDecl of tool.functionDeclarations) {
       try {
         if (!isEnabled(funcDecl, mcpServerName, mcpServerConfig)) {
           continue;
         }
-        discoveredTools.push(new DiscoveredMCPTool(mcpCallableTool, mcpServerName, funcDecl.name, funcDecl.description ?? "", funcDecl.parametersJsonSchema ?? { type: "object", properties: {} }, mcpServerConfig.trust, void 0, cliConfig));
+        discoveredTools.push(new DiscoveredMCPTool(
+          mcpCallableTool,
+          mcpServerName,
+          funcDecl.name,
+          funcDecl.description ?? "",
+          funcDecl.parametersJsonSchema ?? { type: "object", properties: {} },
+          mcpServerConfig.trust,
+          void 0,
+          cliConfig,
+          mcpClient,
+          // raw MCP Client for direct callTool with progress
+          mcpTimeout
+        ));
       } catch (error2) {
         debugLogger49.error(`Error discovering tool: '${funcDecl.name}' from MCP server '${mcpServerName}': ${error2.message}`);
       }
@@ -373022,7 +373111,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.10.0-preview.2";
+  return "0.10.0-preview.3";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -380545,7 +380634,7 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds) => {
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO = "18a7235d";
+var GIT_COMMIT_INFO = "4ee4bd08";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -387262,6 +387351,19 @@ async function buildSystemMessage(config2, sessionId, permissionMode, allowedBui
   return systemMessage;
 }
 __name(buildSystemMessage, "buildSystemMessage");
+function isMcpToolProgressData(output) {
+  return typeof output === "object" && output !== null && "type" in output && output.type === "mcp_tool_progress";
+}
+__name(isMcpToolProgressData, "isMcpToolProgressData");
+function createToolProgressHandler(request4, adapter) {
+  const handler = /* @__PURE__ */ __name((_callId, output) => {
+    if (isMcpToolProgressData(output)) {
+      adapter.emitToolProgress(request4, output);
+    }
+  }, "handler");
+  return { handler };
+}
+__name(createToolProgressHandler, "createToolProgressHandler");
 function createTaskToolProgressHandler(config2, taskToolCallId, adapter) {
   const previousTaskStates = /* @__PURE__ */ new Map();
   const emittedToolUseIds = /* @__PURE__ */ new Set();
@@ -388094,6 +388196,16 @@ ${event.value}`, null);
     };
     this.emitMessageImpl(systemMessage);
   }
+  /**
+   * Emits a tool progress stream event.
+   * Default implementation is a no-op. StreamJsonOutputAdapter overrides this
+   * to emit stream events when includePartialMessages is enabled.
+   *
+   * @param _request - Tool call request info
+   * @param _progress - Structured MCP progress data
+   */
+  emitToolProgress(_request, _progress) {
+  }
   /**
    * Builds a result message from options.
    * Helper method used by both emitResult implementations.
@@ -388473,6 +388585,27 @@ var StreamJsonOutputAdapter = class extends BaseJsonOutputAdapter {
       );
     }
   }
+  /**
+   * Emits a tool progress stream event when partial messages are enabled.
+   * This overrides the no-op in BaseJsonOutputAdapter.
+   */
+  emitToolProgress(request4, progress) {
+    if (!this.includePartialMessages) {
+      return;
+    }
+    const partial2 = {
+      type: "stream_event",
+      uuid: randomUUID8(),
+      session_id: this.getSessionId(),
+      parent_tool_use_id: null,
+      event: {
+        type: "tool_progress",
+        tool_use_id: request4.callId,
+        content: progress
+      }
+    };
+    this.emitMessageImpl(partial2);
+  }
   /**
    * Emits stream events when partial messages are enabled.
    * This is a private method specific to StreamJsonOutputAdapter.
@@ -388962,24 +389095,21 @@ async function runNonInteractive(config2, settings, input, prompt_id, options2 =
             const inputFormat = typeof config2.getInputFormat === "function" ? config2.getInputFormat() : InputFormat.TEXT;
             const toolCallUpdateCallback = inputFormat === InputFormat.STREAM_JSON && options2.controlService ? options2.controlService.permission.getToolCallUpdateCallback() : void 0;
             const isTaskTool = finalRequestInfo.name === "task";
-            const taskToolProgress = isTaskTool ? createTaskToolProgressHandler(
+            const { handler: outputUpdateHandler } = isTaskTool ? createTaskToolProgressHandler(
               config2,
               finalRequestInfo.callId,
               adapter
-            ) : void 0;
-            const taskToolProgressHandler = taskToolProgress?.handler;
+            ) : createToolProgressHandler(finalRequestInfo, adapter);
             const toolResponse = await executeToolCall(
               config2,
               finalRequestInfo,
               abortController.signal,
-              taskToolProgressHandler || toolCallUpdateCallback ? {
-                ...taskToolProgressHandler && {
-                  outputUpdateHandler: taskToolProgressHandler
-                },
+              {
+                outputUpdateHandler,
                 ...toolCallUpdateCallback && {
                   onToolCallsUpdate: toolCallUpdateCallback
                 }
-              } : void 0
+              }
             );
             if (toolResponse.error) {
               handleToolError(
@@ -412799,6 +412929,15 @@ var useResultDisplayRenderer = /* @__PURE__ */ __name((resultDisplay) => import_
       data: resultDisplay
     };
   }
+  if (typeof resultDisplay === "object" && resultDisplay !== null && "type" in resultDisplay && resultDisplay.type === "mcp_tool_progress") {
+    const progress = resultDisplay;
+    const msg = progress.message ?? `Progress: ${progress.progress}`;
+    const totalStr = progress.total != null ? `/${progress.total}` : "";
+    return {
+      type: "string",
+      data: `\u23F3 [${progress.progress}${totalStr}] ${msg}`
+    };
+  }
   if (typeof resultDisplay === "object" && resultDisplay !== null && "ansiOutput" in resultDisplay) {
     return { type: "ansi", data: resultDisplay.ansiOutput };
   }
@@ -434813,7 +434952,7 @@ var GeminiAgent = class {
       name: APPROVAL_MODE_INFO[mode].name,
       description: APPROVAL_MODE_INFO[mode].description
     }));
-    const version2 = "0.10.0-preview.2";
+    const version2 = "0.10.0-preview.3";
     return {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.10.0-preview.2",
+  "version": "0.10.0-preview.3",
   "description": "Qwen Code - AI-powered coding assistant",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
     "locales"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.10.0-preview.2"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.10.0-preview.3"
   },
   "dependencies": {},
   "optionalDependencies": {