@qwen-code/qwen-code 0.2.0 → 0.2.1-nightly.20251112.22edef0c

package/cli.js

@@ -182650,7 +182650,7 @@ function createContentGeneratorConfig(config, authType, generationConfig) {
   };
 }
 async function createContentGenerator(config, gcConfig, sessionId2) {
-  const version2 = "0.2.0";
+  const version2 = "0.2.1-nightly.20251112.22edef0c";
   const userAgent2 = `QwenCode/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -252075,6 +252075,8 @@ var init_src = __esm({
     init_read_many_files();
     init_mcp_client();
     init_mcp_tool();
+    init_task();
+    init_todoWrite();
     init_oauth_provider();
     init_oauth_token_storage();
     init_oauth_utils();
@@ -338601,7 +338603,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.2.0";
+  return "0.2.1-nightly.20251112.22edef0c";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -340212,7 +340214,7 @@ import { execSync as execSync4 } from "node:child_process";
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO2 = "7a472e4f";
+var GIT_COMMIT_INFO2 = "e142fb67";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -353781,7 +353783,6 @@ init_esbuild_shims();
 // packages/cli/src/zed-integration/acp.ts
 init_esbuild_shims();
 init_zod();
-import { EOL as EOL4 } from "node:os";
 
 // packages/cli/src/zed-integration/schema.ts
 init_esbuild_shims();
@@ -354187,7 +354188,7 @@ var Connection = class {
     const decoder = new TextDecoder();
     for await (const chunk of output) {
       content += decoder.decode(chunk, { stream: true });
-      const lines = content.split(EOL4);
+      const lines = content.split("\n");
       content = lines.pop() || "";
       for (const line of lines) {
         const trimmedLine = line.trim();
@@ -354640,13 +354641,23 @@ var Session2 = class {
         new Error(`Tool "${fc.name}" not found in registry.`)
       );
     }
+    const isTodoWriteTool = fc.name === TodoWriteTool.Name || tool.name === TodoWriteTool.Name;
+    let subAgentToolEventListeners = [];
     try {
       const invocation = tool.build(args);
+      const isTaskTool = tool.name === TaskTool.Name;
+      if (isTaskTool && "eventEmitter" in invocation) {
+        const taskEventEmitter = invocation.eventEmitter;
+        subAgentToolEventListeners = this.setupSubAgentToolTracking(
+          taskEventEmitter,
+          abortSignal
+        );
+      }
       const confirmationDetails = await invocation.shouldConfirmExecute(abortSignal);
       if (confirmationDetails) {
-        const content2 = [];
+        const content = [];
         if (confirmationDetails.type === "edit") {
-          content2.push({
+          content.push({
             type: "diff",
             path: confirmationDetails.fileName,
             oldText: confirmationDetails.originalContent,
@@ -354660,7 +354671,7 @@ var Session2 = class {
             toolCallId: callId,
             status: "pending",
             title: invocation.getDescription(),
-            content: content2,
+            content,
             locations: invocation.toolLocations(),
             kind: tool.kind
           }
@@ -354684,7 +354695,7 @@ var Session2 = class {
             throw new Error(`Unexpected: ${resultOutcome}`);
           }
         }
-      } else {
+      } else if (!isTodoWriteTool) {
         await this.sendUpdate({
           sessionUpdate: "tool_call",
           toolCallId: callId,
@@ -354696,13 +354707,31 @@ var Session2 = class {
         });
       }
       const toolResult = await invocation.execute(abortSignal);
-      const content = toToolCallContent(toolResult);
-      await this.sendUpdate({
-        sessionUpdate: "tool_call_update",
-        toolCallId: callId,
-        status: "completed",
-        content: content ? [content] : []
-      });
+      subAgentToolEventListeners.forEach((cleanup) => cleanup());
+      if (isTodoWriteTool) {
+        let todos = [];
+        if (Array.isArray(args["todos"])) {
+          todos = args["todos"];
+        }
+        if (toolResult.returnDisplay && typeof toolResult.returnDisplay === "object" && "type" in toolResult.returnDisplay && toolResult.returnDisplay.type === "todo_list" && "todos" in toolResult.returnDisplay && Array.isArray(toolResult.returnDisplay.todos)) {
+          todos = toolResult.returnDisplay.todos;
+        }
+        if (todos.length > 0 || Array.isArray(args["todos"])) {
+          const planEntries = convertTodosToPlanEntries(todos);
+          await this.sendUpdate({
+            sessionUpdate: "plan",
+            entries: planEntries
+          });
+        }
+      } else {
+        const content = toToolCallContent(toolResult);
+        await this.sendUpdate({
+          sessionUpdate: "tool_call_update",
+          toolCallId: callId,
+          status: "completed",
+          content: content ? [content] : []
+        });
+      }
       const durationMs = Date.now() - startTime;
       logToolCall(this.config, {
         "event.name": "tool_call",
@@ -354717,6 +354746,7 @@ var Session2 = class {
       });
       return convertToFunctionResponse(fc.name, callId, toolResult.llmContent);
     } catch (e2) {
+      subAgentToolEventListeners.forEach((cleanup) => cleanup());
       const error = e2 instanceof Error ? e2 : new Error(String(e2));
       await this.sendUpdate({
         sessionUpdate: "tool_call_update",
@@ -354729,6 +354759,196 @@ var Session2 = class {
       return errorResponse(error);
     }
   }
+  /**
+   * Sets up event listeners to track sub-agent tool calls within a TaskTool execution.
+   * Converts subagent tool call events into zedIntegration session updates.
+   *
+   * @param eventEmitter - The SubAgentEventEmitter from TaskTool
+   * @param abortSignal - Signal to abort tracking if parent is cancelled
+   * @returns Array of cleanup functions to remove event listeners
+   */
+  setupSubAgentToolTracking(eventEmitter, abortSignal) {
+    const cleanupFunctions2 = [];
+    const toolRegistry = this.config.getToolRegistry();
+    const subAgentToolStates = /* @__PURE__ */ new Map();
+    const onToolCall = /* @__PURE__ */ __name((...args) => {
+      const event = args[0];
+      if (abortSignal.aborted) return;
+      const subAgentTool = toolRegistry.getTool(event.name);
+      let subAgentInvocation;
+      let toolKind = "other";
+      let locations = [];
+      if (subAgentTool) {
+        try {
+          subAgentInvocation = subAgentTool.build(event.args);
+          toolKind = this.mapToolKind(subAgentTool.kind);
+          locations = subAgentInvocation.toolLocations().map((loc) => ({
+            path: loc.path,
+            line: loc.line ?? null
+          }));
+        } catch (e2) {
+          console.warn(`Failed to build subagent tool ${event.name}:`, e2);
+        }
+      }
+      subAgentToolStates.set(event.callId, {
+        tool: subAgentTool,
+        invocation: subAgentInvocation,
+        args: event.args
+      });
+      if (event.name === TodoWriteTool.Name) {
+        return;
+      }
+      void this.sendUpdate({
+        sessionUpdate: "tool_call",
+        toolCallId: event.callId,
+        status: "in_progress",
+        title: event.description || event.name,
+        content: [],
+        locations,
+        kind: toolKind,
+        rawInput: event.args
+      });
+    }, "onToolCall");
+    const onToolResult = /* @__PURE__ */ __name((...args) => {
+      const event = args[0];
+      if (abortSignal.aborted) return;
+      const state = subAgentToolStates.get(event.callId);
+      if (event.name === TodoWriteTool.Name) {
+        let todos;
+        if (event.resultDisplay) {
+          try {
+            const parsed = typeof event.resultDisplay === "string" ? JSON.parse(event.resultDisplay) : event.resultDisplay;
+            if (typeof parsed === "object" && parsed !== null && "type" in parsed && parsed.type === "todo_list" && "todos" in parsed && Array.isArray(parsed.todos)) {
+              todos = parsed.todos;
+            }
+          } catch {
+          }
+        }
+        if (!todos && state?.args && Array.isArray(state.args["todos"])) {
+          todos = state.args["todos"];
+        }
+        if (todos) {
+          const planEntries = convertTodosToPlanEntries(todos);
+          void this.sendUpdate({
+            sessionUpdate: "plan",
+            entries: planEntries
+          });
+        }
+        subAgentToolStates.delete(event.callId);
+        return;
+      }
+      let content = [];
+      if (event.resultDisplay && state?.invocation) {
+        if (typeof event.resultDisplay === "string") {
+          content = [
+            {
+              type: "content",
+              content: {
+                type: "text",
+                text: event.resultDisplay
+              }
+            }
+          ];
+        }
+      }
+      void this.sendUpdate({
+        sessionUpdate: "tool_call_update",
+        toolCallId: event.callId,
+        status: event.success ? "completed" : "failed",
+        content: content.length > 0 ? content : [],
+        title: state?.invocation?.getDescription() ?? event.name,
+        kind: state?.tool ? this.mapToolKind(state.tool.kind) : null,
+        locations: state?.invocation?.toolLocations().map((loc) => ({
+          path: loc.path,
+          line: loc.line ?? null
+        })) ?? null,
+        rawInput: state?.args
+      });
+      subAgentToolStates.delete(event.callId);
+    }, "onToolResult");
+    const onToolWaitingApproval = /* @__PURE__ */ __name(async (...args) => {
+      const event = args[0];
+      if (abortSignal.aborted) return;
+      const state = subAgentToolStates.get(event.callId);
+      const content = [];
+      if (event.confirmationDetails.type === "edit") {
+        const editDetails = event.confirmationDetails;
+        content.push({
+          type: "diff",
+          path: editDetails.fileName,
+          oldText: editDetails.originalContent ?? "",
+          newText: editDetails.newContent
+        });
+      }
+      const fullConfirmationDetails = {
+        ...event.confirmationDetails,
+        onConfirm: /* @__PURE__ */ __name(async () => {
+        }, "onConfirm")
+      };
+      const params = {
+        sessionId: this.id,
+        options: toPermissionOptions(fullConfirmationDetails),
+        toolCall: {
+          toolCallId: event.callId,
+          status: "pending",
+          title: event.description || event.name,
+          content,
+          locations: state?.invocation?.toolLocations().map((loc) => ({
+            path: loc.path,
+            line: loc.line ?? null
+          })) ?? [],
+          kind: state?.tool ? this.mapToolKind(state.tool.kind) : "other",
+          rawInput: state?.args
+        }
+      };
+      try {
+        const output = await this.client.requestPermission(params);
+        const outcome = output.outcome.outcome === "cancelled" ? ToolConfirmationOutcome.Cancel : external_exports.nativeEnum(ToolConfirmationOutcome).parse(output.outcome.optionId);
+        await event.respond(outcome);
+      } catch (error) {
+        console.error(
+          `Permission request failed for subagent tool ${event.name}:`,
+          error
+        );
+        await event.respond(ToolConfirmationOutcome.Cancel);
+      }
+    }, "onToolWaitingApproval");
+    eventEmitter.on(SubAgentEventType.TOOL_CALL, onToolCall);
+    eventEmitter.on(SubAgentEventType.TOOL_RESULT, onToolResult);
+    eventEmitter.on(
+      SubAgentEventType.TOOL_WAITING_APPROVAL,
+      onToolWaitingApproval
+    );
+    cleanupFunctions2.push(() => {
+      eventEmitter.off(SubAgentEventType.TOOL_CALL, onToolCall);
+      eventEmitter.off(SubAgentEventType.TOOL_RESULT, onToolResult);
+      eventEmitter.off(
+        SubAgentEventType.TOOL_WAITING_APPROVAL,
+        onToolWaitingApproval
+      );
+    });
+    return cleanupFunctions2;
+  }
+  /**
+   * Maps core Tool Kind enum to ACP ToolKind string literals.
+   *
+   * @param kind - The core Kind enum value
+   * @returns The corresponding ACP ToolKind string literal
+   */
+  mapToolKind(kind) {
+    const kindMap = {
+      [Kind.Read]: "read",
+      [Kind.Edit]: "edit",
+      [Kind.Delete]: "delete",
+      [Kind.Move]: "move",
+      [Kind.Search]: "search",
+      [Kind.Execute]: "execute",
+      [Kind.Think]: "think",
+      [Kind.Fetch]: "fetch",
+      [Kind.Other]: "other"
+    };
+    return kindMap[kind] ?? "other";
+  }
   async #resolvePrompt(message, abortSignal) {
     const FILE_URI_SCHEME = "file://";
     const embeddedContext = [];
@@ -355017,6 +355237,15 @@ Content from @${contextPart.uri}:
     }
   }
 };
+function convertTodosToPlanEntries(todos) {
+  return todos.map((todo) => ({
+    content: todo.content,
+    priority: "medium",
+    // Default priority since todos don't have priority
+    status: todo.status
+  }));
+}
+__name(convertTodosToPlanEntries, "convertTodosToPlanEntries");
 function toToolCallContent(toolResult) {
   if (toolResult.error?.message) {
     throw new Error(toolResult.error.message);
@@ -355027,19 +355256,6 @@ function toToolCallContent(toolResult) {
         type: "content",
         content: { type: "text", text: toolResult.returnDisplay }
       };
-    } else if ("type" in toolResult.returnDisplay && toolResult.returnDisplay.type === "todo_list") {
-      const todoText = toolResult.returnDisplay.todos.map((todo) => {
-        const statusIcon = {
-          pending: "\u25CB",
-          in_progress: "\u25D0",
-          completed: "\u25CF"
-        }[todo.status];
-        return `${statusIcon} ${todo.content}`;
-      }).join("\n");
-      return {
-        type: "content",
-        content: { type: "text", text: todoText }
-      };
     } else if ("type" in toolResult.returnDisplay && toolResult.returnDisplay.type === "plan_summary") {
       const planDisplay = toolResult.returnDisplay;
       const planText = `${planDisplay.message}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.2.0",
+  "version": "0.2.1-nightly.20251112.22edef0c",
   "description": "Qwen Code - AI-powered coding assistant",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
     "LICENSE"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.2.0"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.2.1-nightly.20251112.22edef0c"
   },
   "dependencies": {
     "tiktoken": "^1.0.21"