@qwen-code/qwen-code 0.4.1-nightly.20251210.5fddcd50 → 0.4.1-nightly.20251212.58d3a9c2

package/README.md

@@ -88,6 +88,12 @@ npm install -g .
 brew install qwen-code
 ```
 
+## VS Code Extension
+
+In addition to the CLI tool, Qwen Code also provides a **VS Code extension** that brings AI-powered coding assistance directly into your editor with features like file system operations, native diffing, interactive chat, and more.
+
+> 📦 The extension is currently in development. For installation, features, and development guide, see the [VS Code Extension README](./packages/vscode-ide-companion/README.md).
+
 ## Quick Start
 
 ```bash

package/cli.js

@@ -33249,7 +33249,12 @@ var require_sign_stream = __commonJS({
     }
     __name(jwsSign, "jwsSign");
     function SignStream(opts) {
-      var secret = opts.secret || opts.privateKey || opts.key;
+      var secret = opts.secret;
+      secret = secret == null ? opts.privateKey : secret;
+      secret = secret == null ? opts.key : secret;
+      if (/^hs/i.test(opts.header.alg) === true && secret == null) {
+        throw new TypeError("secret must be a string or buffer or a KeyObject");
+      }
       var secretStream = new DataStream(secret);
       this.readable = true;
       this.header = opts.header;
@@ -33372,7 +33377,12 @@ var require_verify_stream = __commonJS({
     __name(jwsDecode, "jwsDecode");
     function VerifyStream(opts) {
       opts = opts || {};
-      var secretOrKey = opts.secret || opts.publicKey || opts.key;
+      var secretOrKey = opts.secret;
+      secretOrKey = secretOrKey == null ? opts.publicKey : secretOrKey;
+      secretOrKey = secretOrKey == null ? opts.key : secretOrKey;
+      if (/^hs/i.test(opts.algorithm) === true && secretOrKey == null) {
+        throw new TypeError("secret must be a string or buffer or a KeyObject");
+      }
       var secretStream = new DataStream(secretOrKey);
       this.readable = true;
       this.algorithm = opts.algorithm;
@@ -75550,6 +75560,8 @@ var init_subagent_statistics = __esm({
       failedToolCalls = 0;
       inputTokens = 0;
       outputTokens = 0;
+      thoughtTokens = 0;
+      cachedTokens = 0;
       toolUsage = /* @__PURE__ */ new Map();
       start(now = Date.now()) {
         this.startTimeMs = now;
@@ -75583,15 +75595,17 @@ var init_subagent_statistics = __esm({
         tu.averageDurationMs = tu.count > 0 ? tu.totalDurationMs / tu.count : 0;
         this.toolUsage.set(name3, tu);
       }
-      recordTokens(input, output) {
+      recordTokens(input, output, thought = 0, cached = 0) {
         this.inputTokens += Math.max(0, input || 0);
         this.outputTokens += Math.max(0, output || 0);
+        this.thoughtTokens += Math.max(0, thought || 0);
+        this.cachedTokens += Math.max(0, cached || 0);
       }
       getSummary(now = Date.now()) {
         const totalDurationMs = this.startTimeMs ? now - this.startTimeMs : 0;
         const totalToolCalls = this.totalToolCalls;
         const successRate = totalToolCalls > 0 ? this.successfulToolCalls / totalToolCalls * 100 : 0;
-        const totalTokens = this.inputTokens + this.outputTokens;
+        const totalTokens = this.inputTokens + this.outputTokens + this.thoughtTokens + this.cachedTokens;
         const estimatedCost = this.inputTokens * 3e-5 + this.outputTokens * 6e-5;
         return {
           rounds: this.rounds,
@@ -75602,6 +75616,8 @@ var init_subagent_statistics = __esm({
           successRate,
           inputTokens: this.inputTokens,
           outputTokens: this.outputTokens,
+          thoughtTokens: this.thoughtTokens,
+          cachedTokens: this.cachedTokens,
           totalTokens,
           estimatedCost,
           toolUsage: Array.from(this.toolUsage.values())
@@ -75616,7 +75632,11 @@ var init_subagent_statistics = __esm({
           `\u23F1\uFE0F Duration: ${this.fmtDuration(stats.totalDurationMs)} | \u{1F501} Rounds: ${stats.rounds}`
         ];
         if (typeof stats.totalTokens === "number") {
-          lines.push(`\u{1F522} Tokens: ${stats.totalTokens.toLocaleString()}${stats.inputTokens || stats.outputTokens ? ` (in ${stats.inputTokens ?? 0}, out ${stats.outputTokens ?? 0})` : ""}`);
+          const parts = [
+            `in ${stats.inputTokens ?? 0}`,
+            `out ${stats.outputTokens ?? 0}`
+          ];
+          lines.push(`\u{1F522} Tokens: ${stats.totalTokens.toLocaleString()}${parts.length ? ` (${parts.join(", ")})` : ""}`);
         }
         return lines.join("\n");
       }
@@ -75645,7 +75665,11 @@ var init_subagent_statistics = __esm({
         lines.push(`\u{1F680} Speed: ${speed}`);
         lines.push(`\u{1F527} Tools: ${stats.totalToolCalls} calls, ${sr.toFixed(1)}% success (${stats.successfulToolCalls} ok, ${stats.failedToolCalls} failed)`);
         if (typeof stats.totalTokens === "number") {
-          lines.push(`\u{1F522} Tokens: ${stats.totalTokens.toLocaleString()} (in ${stats.inputTokens ?? 0}, out ${stats.outputTokens ?? 0})`);
+          const parts = [
+            `in ${stats.inputTokens ?? 0}`,
+            `out ${stats.outputTokens ?? 0}`
+          ];
+          lines.push(`\u{1F522} Tokens: ${stats.totalTokens.toLocaleString()} (${parts.join(", ")})`);
         }
         if (stats.toolUsage && stats.toolUsage.length) {
           const sorted2 = [...stats.toolUsage].sort((a, b) => b.count - a.count).slice(0, 5);
@@ -133148,6 +133172,7 @@ var init_uiTelemetry = __esm({
     init_esbuild_shims();
     init_constants();
     init_tool_call_decision();
+    init_constants();
     createInitialModelMetrics = /* @__PURE__ */ __name(() => ({
       api: {
         totalRequests: 0,
@@ -145729,7 +145754,7 @@ function createContentGeneratorConfig(config, authType, generationConfig) {
   };
 }
 async function createContentGenerator(config, gcConfig, isInitialAuth) {
-  const version2 = "0.4.1-nightly.20251210.5fddcd50";
+  const version2 = "0.4.1-nightly.20251212.58d3a9c2";
   const userAgent2 = `QwenCode/${version2} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -163096,6 +163121,7 @@ var init_subagent_events = __esm({
       SubAgentEventType2["TOOL_CALL"] = "tool_call";
       SubAgentEventType2["TOOL_RESULT"] = "tool_result";
       SubAgentEventType2["TOOL_WAITING_APPROVAL"] = "tool_waiting_approval";
+      SubAgentEventType2["USAGE_METADATA"] = "usage_metadata";
       SubAgentEventType2["FINISH"] = "finish";
       SubAgentEventType2["ERROR"] = "error";
     })(SubAgentEventType || (SubAgentEventType = {}));
@@ -163318,6 +163344,7 @@ var init_subagent = __esm({
                 tools: [{ functionDeclarations: toolsList }]
               }
             };
+            const roundStreamStart = Date.now();
             const responseStream = await chat.sendMessageStream(this.modelConfig.model || this.runtimeContext.getModel() || DEFAULT_QWEN_MODEL, messageParams, promptId);
             this.eventEmitter?.emit(SubAgentEventType.ROUND_START, {
               subagentId: this.subagentId,
@@ -163372,13 +163399,22 @@ var init_subagent = __esm({
             if (lastUsage) {
               const inTok = Number(lastUsage.promptTokenCount || 0);
               const outTok = Number(lastUsage.candidatesTokenCount || 0);
-              if (isFinite(inTok) || isFinite(outTok)) {
-                this.stats.recordTokens(isFinite(inTok) ? inTok : 0, isFinite(outTok) ? outTok : 0);
+              const thoughtTok = Number(lastUsage.thoughtsTokenCount || 0);
+              const cachedTok = Number(lastUsage.cachedContentTokenCount || 0);
+              if (isFinite(inTok) || isFinite(outTok) || isFinite(thoughtTok) || isFinite(cachedTok)) {
+                this.stats.recordTokens(isFinite(inTok) ? inTok : 0, isFinite(outTok) ? outTok : 0, isFinite(thoughtTok) ? thoughtTok : 0, isFinite(cachedTok) ? cachedTok : 0);
                 this.executionStats.inputTokens = (this.executionStats.inputTokens || 0) + (isFinite(inTok) ? inTok : 0);
                 this.executionStats.outputTokens = (this.executionStats.outputTokens || 0) + (isFinite(outTok) ? outTok : 0);
-                this.executionStats.totalTokens = (this.executionStats.inputTokens || 0) + (this.executionStats.outputTokens || 0);
+                this.executionStats.totalTokens = (this.executionStats.inputTokens || 0) + (this.executionStats.outputTokens || 0) + (isFinite(thoughtTok) ? thoughtTok : 0) + (isFinite(cachedTok) ? cachedTok : 0);
                 this.executionStats.estimatedCost = (this.executionStats.inputTokens || 0) * 3e-5 + (this.executionStats.outputTokens || 0) * 6e-5;
               }
+              this.eventEmitter?.emit(SubAgentEventType.USAGE_METADATA, {
+                subagentId: this.subagentId,
+                round: turnCounter,
+                usage: lastUsage,
+                durationMs: Date.now() - roundStreamStart,
+                timestamp: Date.now()
+              });
             }
             if (functionCalls.length > 0) {
               currentMessages = await this.processFunctionCalls(functionCalls, abortController, promptId, turnCounter, currentResponseId);
@@ -287760,7 +287796,7 @@ var patchConsole = /* @__PURE__ */ __name((callback) => {
 var dist_default = patchConsole;
 
 // node_modules/ink/build/ink.js
-var import_constants19 = __toESM(require_constants11(), 1);
+var import_constants20 = __toESM(require_constants11(), 1);
 
 // node_modules/yoga-layout/dist/src/index.js
 init_esbuild_shims();
@@ -289823,7 +289859,7 @@ __name(wrapAnsi, "wrapAnsi");
 // node_modules/ink/build/reconciler.js
 init_esbuild_shims();
 var import_react_reconciler = __toESM(require_react_reconciler(), 1);
-var import_constants18 = __toESM(require_constants11(), 1);
+var import_constants19 = __toESM(require_constants11(), 1);
 import process15 from "node:process";
 var import_react = __toESM(require_react(), 1);
 
@@ -290794,7 +290830,7 @@ var cleanupYogaNode = /* @__PURE__ */ __name((node) => {
   node?.unsetMeasureFunc();
   node?.freeRecursive();
 }, "cleanupYogaNode");
-var currentUpdatePriority = import_constants18.NoEventPriority;
+var currentUpdatePriority = import_constants19.NoEventPriority;
 var currentRootNode;
 var reconciler_default = (0, import_react_reconciler.default)({
   getRootHostContext: /* @__PURE__ */ __name(() => ({
@@ -290951,10 +290987,10 @@ var reconciler_default = (0, import_react_reconciler.default)({
   },
   getCurrentUpdatePriority: /* @__PURE__ */ __name(() => currentUpdatePriority, "getCurrentUpdatePriority"),
   resolveUpdatePriority() {
-    if (currentUpdatePriority !== import_constants18.NoEventPriority) {
+    if (currentUpdatePriority !== import_constants19.NoEventPriority) {
       return currentUpdatePriority;
     }
-    return import_constants18.DefaultEventPriority;
+    return import_constants19.DefaultEventPriority;
   },
   maySuspendCommit() {
     return false;
@@ -293472,7 +293508,7 @@ var Ink = class {
     this.fullStaticOutput = "";
     this.container = reconciler_default.createContainer(
       this.rootNode,
-      import_constants19.LegacyRoot,
+      import_constants20.LegacyRoot,
       null,
       false,
       null,
@@ -297625,12 +297661,12 @@ var Header = class {
     if (!buf || !(buf.length >= off + 512)) {
       throw new Error("need 512 bytes for header");
     }
-    this.path = decString(buf, off, 100);
-    this.mode = decNumber(buf, off + 100, 8);
-    this.uid = decNumber(buf, off + 108, 8);
-    this.gid = decNumber(buf, off + 116, 8);
-    this.size = decNumber(buf, off + 124, 12);
-    this.mtime = decDate(buf, off + 136, 12);
+    this.path = ex?.path ?? decString(buf, off, 100);
+    this.mode = ex?.mode ?? gex?.mode ?? decNumber(buf, off + 100, 8);
+    this.uid = ex?.uid ?? gex?.uid ?? decNumber(buf, off + 108, 8);
+    this.gid = ex?.gid ?? gex?.gid ?? decNumber(buf, off + 116, 8);
+    this.size = ex?.size ?? gex?.size ?? decNumber(buf, off + 124, 12);
+    this.mtime = ex?.mtime ?? gex?.mtime ?? decDate(buf, off + 136, 12);
     this.cksum = decNumber(buf, off + 148, 12);
     if (gex)
       this.#slurp(gex, true);
@@ -297648,10 +297684,10 @@ var Header = class {
     }
     this.linkpath = decString(buf, off + 157, 100);
     if (buf.subarray(off + 257, off + 265).toString() === "ustar\x0000") {
-      this.uname = decString(buf, off + 265, 32);
-      this.gname = decString(buf, off + 297, 32);
-      this.devmaj = decNumber(buf, off + 329, 8) ?? 0;
-      this.devmin = decNumber(buf, off + 337, 8) ?? 0;
+      this.uname = ex?.uname ?? gex?.uname ?? decString(buf, off + 265, 32);
+      this.gname = ex?.gname ?? gex?.gname ?? decString(buf, off + 297, 32);
+      this.devmaj = ex?.devmaj ?? gex?.devmaj ?? decNumber(buf, off + 329, 8) ?? 0;
+      this.devmin = ex?.devmin ?? gex?.devmin ?? decNumber(buf, off + 337, 8) ?? 0;
       if (buf[off + 475] !== 0) {
         const prefix = decString(buf, off + 345, 155);
         this.path = prefix + "/" + this.path;
@@ -297660,8 +297696,8 @@ var Header = class {
         if (prefix) {
           this.path = prefix + "/" + this.path;
         }
-        this.atime = decDate(buf, off + 476, 12);
-        this.ctime = decDate(buf, off + 488, 12);
+        this.atime = ex?.atime ?? gex?.atime ?? decDate(buf, off + 476, 12);
+        this.ctime = ex?.ctime ?? gex?.ctime ?? decDate(buf, off + 488, 12);
       }
     }
     let sum = 8 * 32;
@@ -298607,13 +298643,15 @@ var listFileSync = /* @__PURE__ */ __name((opt) => {
     const readSize = opt.maxReadSize || 16 * 1024 * 1024;
     if (stat6.size < readSize) {
       const buf = Buffer.allocUnsafe(stat6.size);
-      fs57.readSync(fd, buf, 0, stat6.size, 0);
-      p.end(buf);
+      const read3 = fs57.readSync(fd, buf, 0, stat6.size, 0);
+      p.end(read3 === buf.byteLength ? buf : buf.subarray(0, read3));
     } else {
       let pos2 = 0;
       const buf = Buffer.allocUnsafe(readSize);
       while (pos2 < stat6.size) {
         const bytesRead = fs57.readSync(fd, buf, 0, readSize, pos2);
+        if (bytesRead === 0)
+          break;
         pos2 += bytesRead;
         p.write(buf.subarray(0, bytesRead));
       }
@@ -309147,7 +309185,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.4.1-nightly.20251210.5fddcd50";
+  return "0.4.1-nightly.20251212.58d3a9c2";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -313213,7 +313251,7 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds) => {
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO2 = "9d0d932d";
+var GIT_COMMIT_INFO2 = "ff26a54d";
 
 // packages/cli/src/utils/systemInfo.ts
 async function getNpmVersion() {
@@ -316380,7 +316418,7 @@ var getGitRepoRoot = /* @__PURE__ */ __name(() => {
 var getLatestGitHubRelease = /* @__PURE__ */ __name(async (proxy) => {
   try {
     const controller = new AbortController();
-    const endpoint = `https://api.github.com/repos/google-github-actions/run-gemini-cli/releases/latest`;
+    const endpoint = `https://api.github.com/repos/QwenLM/qwen-code-action/releases/latest`;
     const response = await fetch(endpoint, {
       method: "GET",
       headers: {
@@ -316402,9 +316440,12 @@ var getLatestGitHubRelease = /* @__PURE__ */ __name(async (proxy) => {
     }
     return releaseTag;
   } catch (_error) {
-    console.debug(`Failed to determine latest run-gemini-cli release:`, _error);
+    console.debug(
+      `Failed to determine latest qwen-code-action release:`,
+      _error
+    );
     throw new Error(
-      `Unable to determine the latest run-gemini-cli release on GitHub.`
+      `Unable to determine the latest qwen-code-action release on GitHub.`
     );
   }
 }, "getLatestGitHubRelease");
@@ -316426,11 +316467,11 @@ __name(getGitHubRepoInfo, "getGitHubRepoInfo");
 
 // packages/cli/src/ui/commands/setupGithubCommand.ts
 var GITHUB_WORKFLOW_PATHS = [
-  "gemini-dispatch/gemini-dispatch.yml",
-  "gemini-assistant/gemini-invoke.yml",
-  "issue-triage/gemini-triage.yml",
-  "issue-triage/gemini-scheduled-triage.yml",
-  "pr-review/gemini-review.yml"
+  "qwen-dispatch/qwen-dispatch.yml",
+  "qwen-assistant/qwen-invoke.yml",
+  "issue-triage/qwen-triage.yml",
+  "issue-triage/qwen-scheduled-triage.yml",
+  "pr-review/qwen-review.yml"
 ];
 function getOpenUrlsCommands(readmeUrl) {
   const openCmd = getUrlOpenCommand();
@@ -316446,7 +316487,7 @@ function getOpenUrlsCommands(readmeUrl) {
 }
 __name(getOpenUrlsCommands, "getOpenUrlsCommands");
 async function updateGitignore(gitRepoRoot) {
-  const gitignoreEntries = [".gemini/", "gha-creds-*.json"];
+  const gitignoreEntries = [".qwen/", "gha-creds-*.json"];
   const gitignorePath = path89.join(gitRepoRoot, ".gitignore");
   try {
     let existingContent = "";
@@ -316497,7 +316538,7 @@ var setupGithubCommand = {
     }
     const proxy = context2?.services?.config?.getProxy();
     const releaseTag = await getLatestGitHubRelease(proxy);
-    const readmeUrl = `https://github.com/google-github-actions/run-gemini-cli/blob/${releaseTag}/README.md#quick-start`;
+    const readmeUrl = `https://github.com/QwenLM/qwen-code-action/blob/${releaseTag}/README.md#quick-start`;
     const githubWorkflowsDir = path89.join(gitRepoRoot, ".github", "workflows");
     try {
       await fs79.promises.mkdir(githubWorkflowsDir, { recursive: true });
@@ -316514,7 +316555,7 @@ var setupGithubCommand = {
     for (const workflow of GITHUB_WORKFLOW_PATHS) {
       downloads.push(
         (async () => {
-          const endpoint = `https://raw.githubusercontent.com/google-github-actions/run-gemini-cli/refs/tags/${releaseTag}/examples/workflows/${workflow}`;
+          const endpoint = `https://raw.githubusercontent.com/QwenLM/qwen-code-action/refs/tags/${releaseTag}/examples/workflows/${workflow}`;
           const response = await fetch(endpoint, {
             method: "GET",
             dispatcher: proxy ? new import_undici5.ProxyAgent(proxy) : void 0,
@@ -316564,8 +316605,9 @@ var setupGithubCommand = {
       type: "tool",
       toolName: "run_shell_command",
       toolArgs: {
-        description: "Setting up GitHub Actions to triage issues and review PRs with Gemini.",
-        command: command2
+        description: "Setting up GitHub Actions to triage issues and review PRs with Qwen.",
+        command: command2,
+        is_background: false
       }
     };
   }, "action")
@@ -350705,12 +350747,17 @@ var InputPrompt = /* @__PURE__ */ __name(({
     statusColor = theme.status.warning;
     statusText = t2("Accepting edits");
   }
+  const borderColor = isShellFocused && !isEmbeddedShellFocused ? statusColor ?? theme.border.focused : theme.border.default;
   return /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(import_jsx_runtime94.Fragment, { children: [
     /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(
       Box_default,
       {
-        borderStyle: "round",
-        borderColor: isShellFocused && !isEmbeddedShellFocused ? statusColor ?? theme.border.focused : theme.border.default,
+        borderStyle: "single",
+        borderTop: true,
+        borderBottom: true,
+        borderLeft: false,
+        borderRight: false,
+        borderColor,
         paddingX: 1,
         children: [
           /* @__PURE__ */ (0, import_jsx_runtime94.jsxs)(
@@ -350789,7 +350836,7 @@ var InputPrompt = /* @__PURE__ */ __name(({
             });
             if (isOnCursorLine && cursorVisualColAbsolute === cpLen(lineText)) {
               renderedLine.push(
-                /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text3, { children: showCursor ? import_chalk7.default.inverse(" ") : " " }, `cursor-end-${cursorVisualColAbsolute}`)
+                /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text3, { children: showCursor ? import_chalk7.default.inverse(" ") + "\u200B" : " \u200B" }, `cursor-end-${cursorVisualColAbsolute}`)
               );
             }
             return /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Box_default, { height: 1, children: /* @__PURE__ */ (0, import_jsx_runtime94.jsx)(Text3, { children: renderedLine }) }, `line-${visualIdxInRenderedSet}`);
@@ -361671,6 +361718,17 @@ var annotationsSchema = external_exports.object({
   lastModified: external_exports.string().optional().nullable(),
   priority: external_exports.number().optional().nullable()
 });
+var usageSchema = external_exports.object({
+  promptTokens: external_exports.number().optional().nullable(),
+  completionTokens: external_exports.number().optional().nullable(),
+  thoughtsTokens: external_exports.number().optional().nullable(),
+  totalTokens: external_exports.number().optional().nullable(),
+  cachedTokens: external_exports.number().optional().nullable()
+});
+var sessionUpdateMetaSchema = external_exports.object({
+  usage: usageSchema.optional().nullable(),
+  durationMs: external_exports.number().optional().nullable()
+});
 var requestPermissionResponseSchema = external_exports.object({
   outcome: requestPermissionOutcomeSchema
 });
@@ -361826,11 +361884,13 @@ var sessionUpdateSchema = external_exports.union([
   }),
   external_exports.object({
     content: contentBlockSchema,
-    sessionUpdate: external_exports.literal("agent_message_chunk")
+    sessionUpdate: external_exports.literal("agent_message_chunk"),
+    _meta: sessionUpdateMetaSchema.optional().nullable()
   }),
   external_exports.object({
     content: contentBlockSchema,
-    sessionUpdate: external_exports.literal("agent_thought_chunk")
+    sessionUpdate: external_exports.literal("agent_thought_chunk"),
+    _meta: sessionUpdateMetaSchema.optional().nullable()
   }),
   external_exports.object({
     content: external_exports.array(toolCallContentSchema).optional(),
@@ -362160,6 +362220,15 @@ var AcpFileSystemService = class {
       line: null,
       limit: null
     });
+    if (response.content.startsWith("ERROR: ENOENT:")) {
+      const match2 = /^ERROR:\s*ENOENT:\s*(?<path>.*)$/i.exec(response.content);
+      const err = new Error(response.content);
+      err.code = "ENOENT";
+      err.errno = -2;
+      const rawPath = match2?.groups?.["path"]?.trim();
+      err["path"] = rawPath ? rawPath.replace(/^['"]|['"]$/g, "") || filePath : filePath;
+      throw err;
+    }
     return response.content;
   }
   async writeTextFile(filePath, content) {
@@ -362236,6 +362305,15 @@ var MessageEmitter = class extends BaseEmitter {
       content: { type: "text", text }
     });
   }
+  /**
+   * Emits an agent thought chunk.
+   */
+  async emitAgentThought(text) {
+    await this.sendUpdate({
+      sessionUpdate: "agent_thought_chunk",
+      content: { type: "text", text }
+    });
+  }
   /**
    * Emits an agent message chunk.
    */
@@ -362246,12 +362324,21 @@ var MessageEmitter = class extends BaseEmitter {
     });
   }
   /**
-   * Emits an agent thought chunk.
+   * Emits usage metadata.
    */
-  async emitAgentThought(text) {
+  async emitUsageMetadata(usageMetadata, text = "", durationMs) {
+    const usage2 = {
+      promptTokens: usageMetadata.promptTokenCount,
+      completionTokens: usageMetadata.candidatesTokenCount,
+      thoughtsTokens: usageMetadata.thoughtsTokenCount,
+      totalTokens: usageMetadata.totalTokenCount,
+      cachedTokens: usageMetadata.cachedContentTokenCount
+    };
+    const meta = typeof durationMs === "number" ? { usage: usage2, durationMs } : { usage: usage2 };
     await this.sendUpdate({
-      sessionUpdate: "agent_thought_chunk",
-      content: { type: "text", text }
+      sessionUpdate: "agent_message_chunk",
+      content: { type: "text", text },
+      _meta: meta
     });
   }
   /**
@@ -362367,7 +362454,7 @@ var ToolCallEmitter = class extends BaseEmitter {
     await this.sendUpdate({
       sessionUpdate: "tool_call",
       toolCallId: params.callId,
-      status: "in_progress",
+      status: params.status || "pending",
       title,
       content: [],
       locations,
@@ -362534,7 +362621,10 @@ var ToolCallEmitter = class extends BaseEmitter {
       }
       if ("functionResponse" in part && part.functionResponse) {
         try {
-          const responseText = JSON.stringify(part.functionResponse.response);
+          const resp = part.functionResponse.response;
+          const outputField = resp["output"];
+          const errorField = resp["error"];
+          const responseText = typeof outputField === "string" ? outputField : typeof errorField === "string" ? errorField : JSON.stringify(resp);
           result.push({
             type: "content",
             content: { type: "text", text: responseText }
@@ -362582,6 +362672,9 @@ var HistoryReplayer = class {
         if (record.message) {
           await this.replayContent(record.message, "assistant");
         }
+        if (record.usageMetadata) {
+          await this.replayUsageMetadata(record.usageMetadata);
+        }
         break;
       case "tool_result":
         await this.replayToolResult(record);
@@ -362606,11 +362699,19 @@ var HistoryReplayer = class {
         await this.toolCallEmitter.emitStart({
           toolName: functionName,
           callId,
-          args: part.functionCall.args
+          args: part.functionCall.args,
+          status: "in_progress"
         });
       }
     }
   }
+  /**
+   * Replays usage metadata.
+   * @param usageMetadata - The usage metadata to replay
+   */
+  async replayUsageMetadata(usageMetadata) {
+    await this.messageEmitter.emitUsageMetadata(usageMetadata);
+  }
   /**
    * Replays a tool result record.
    */
@@ -362631,6 +362732,40 @@ var HistoryReplayer = class {
       // Note: args aren't stored in tool_result records by default
       args: void 0
     });
+    const { resultDisplay } = result ?? {};
+    if (!!resultDisplay && typeof resultDisplay === "object" && "type" in resultDisplay && resultDisplay.type === "task_execution") {
+      await this.emitTaskUsageFromResultDisplay(
+        resultDisplay
+      );
+    }
+  }
+  /**
+   * Emits token usage from a TaskResultDisplay execution summary, if present.
+   */
+  async emitTaskUsageFromResultDisplay(resultDisplay) {
+    const summary = resultDisplay.executionSummary;
+    if (!summary) {
+      return;
+    }
+    const usageMetadata = {};
+    if (Number.isFinite(summary.inputTokens)) {
+      usageMetadata.promptTokenCount = summary.inputTokens;
+    }
+    if (Number.isFinite(summary.outputTokens)) {
+      usageMetadata.candidatesTokenCount = summary.outputTokens;
+    }
+    if (Number.isFinite(summary.thoughtTokens)) {
+      usageMetadata.thoughtsTokenCount = summary.thoughtTokens;
+    }
+    if (Number.isFinite(summary.cachedTokens)) {
+      usageMetadata.cachedContentTokenCount = summary.cachedTokens;
+    }
+    if (Number.isFinite(summary.totalTokens)) {
+      usageMetadata.totalTokenCount = summary.totalTokens;
+    }
+    if (Object.keys(usageMetadata).length > 0) {
+      await this.messageEmitter.emitUsageMetadata(usageMetadata);
+    }
   }
   /**
    * Extracts tool name from a chat record's function response.
@@ -362667,11 +362802,13 @@ var SubAgentTracker = class {
     this.ctx = ctx;
     this.client = client;
     this.toolCallEmitter = new ToolCallEmitter(ctx);
+    this.messageEmitter = new MessageEmitter(ctx);
   }
   static {
     __name(this, "SubAgentTracker");
   }
   toolCallEmitter;
+  messageEmitter;
   toolStates = /* @__PURE__ */ new Map();
   /**
    * Sets up event listeners for a sub-agent's tool events.
@@ -362684,14 +362821,17 @@ var SubAgentTracker = class {
     const onToolCall = this.createToolCallHandler(abortSignal);
     const onToolResult = this.createToolResultHandler(abortSignal);
     const onApproval = this.createApprovalHandler(abortSignal);
+    const onUsageMetadata = this.createUsageMetadataHandler(abortSignal);
     eventEmitter.on(SubAgentEventType.TOOL_CALL, onToolCall);
     eventEmitter.on(SubAgentEventType.TOOL_RESULT, onToolResult);
     eventEmitter.on(SubAgentEventType.TOOL_WAITING_APPROVAL, onApproval);
+    eventEmitter.on(SubAgentEventType.USAGE_METADATA, onUsageMetadata);
     return [
       () => {
         eventEmitter.off(SubAgentEventType.TOOL_CALL, onToolCall);
         eventEmitter.off(SubAgentEventType.TOOL_RESULT, onToolResult);
         eventEmitter.off(SubAgentEventType.TOOL_WAITING_APPROVAL, onApproval);
+        eventEmitter.off(SubAgentEventType.USAGE_METADATA, onUsageMetadata);
         this.toolStates.clear();
       }
     ];
@@ -362794,6 +362934,16 @@ var SubAgentTracker = class {
       }
     };
   }
+  /**
+   * Creates a handler for usage metadata events.
+   */
+  createUsageMetadataHandler(abortSignal) {
+    return (...args) => {
+      const event = args[0];
+      if (abortSignal.aborted) return;
+      this.messageEmitter.emitUsageMetadata(event.usage, "", event.durationMs);
+    };
+  }
   /**
    * Converts confirmation details to permission options for the client.
    */
@@ -362868,6 +363018,7 @@ var Session3 = class {
     this.toolCallEmitter = new ToolCallEmitter(this);
     this.planEmitter = new PlanEmitter(this);
     this.historyReplayer = new HistoryReplayer(this);
+    this.messageEmitter = new MessageEmitter(this);
   }
   static {
     __name(this, "Session");
@@ -362878,6 +363029,7 @@ var Session3 = class {
   historyReplayer;
   toolCallEmitter;
   planEmitter;
+  messageEmitter;
   // Implement SessionContext interface
   sessionId;
   getId() {
@@ -362944,6 +363096,8 @@ var Session3 = class {
         return { stopReason: "cancelled" };
       }
       const functionCalls = [];
+      let usageMetadata = null;
+      const streamStartTime = Date.now();
       try {
         const responseStream = await chat.sendMessageStream(
           this.config.getModel(),
@@ -362966,16 +363120,16 @@ var Session3 = class {
               if (!part.text) {
                 continue;
               }
-              const content = {
-                type: "text",
-                text: part.text
-              };
-              this.sendUpdate({
-                sessionUpdate: part.thought ? "agent_thought_chunk" : "agent_message_chunk",
-                content
-              });
+              this.messageEmitter.emitMessage(
+                part.text,
+                "assistant",
+                part.thought
+              );
             }
           }
+          if (resp.type === StreamEventType.CHUNK && resp.value.usageMetadata) {
+            usageMetadata = resp.value.usageMetadata;
+          }
           if (resp.type === StreamEventType.CHUNK && resp.value.functionCalls) {
             functionCalls.push(...resp.value.functionCalls);
           }
@@ -362989,6 +363143,14 @@ var Session3 = class {
         }
         throw error;
       }
+      if (usageMetadata) {
+        const durationMs = Date.now() - streamStartTime;
+        await this.messageEmitter.emitUsageMetadata(
+          usageMetadata,
+          "",
+          durationMs
+        );
+      }
       if (functionCalls.length > 0) {
         const toolResponseParts = [];
         for (const fc of functionCalls) {
@@ -363127,7 +363289,7 @@ var Session3 = class {
           abortSignal
         );
       }
-      const confirmationDetails = await invocation.shouldConfirmExecute(abortSignal);
+      const confirmationDetails = this.config.getApprovalMode() !== ApprovalMode.YOLO ? await invocation.shouldConfirmExecute(abortSignal) : false;
       if (confirmationDetails) {
         const content = [];
         if (confirmationDetails.type === "edit") {
@@ -363186,7 +363348,8 @@ var Session3 = class {
         const startParams = {
           callId,
           toolName: fc.name,
-          args
+          args,
+          status: "in_progress"
         };
         await this.toolCallEmitter.emitStart(startParams);
       }
@@ -363599,7 +363762,7 @@ var GeminiAgent = class {
       name: APPROVAL_MODE_INFO[mode].name,
       description: APPROVAL_MODE_INFO[mode].description
     }));
-    const version2 = "0.4.1-nightly.20251210.5fddcd50";
+    const version2 = "0.4.1-nightly.20251212.58d3a9c2";
     return {
       protocolVersion: PROTOCOL_VERSION,
       agentInfo: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qwen-code/qwen-code",
-  "version": "0.4.1-nightly.20251210.5fddcd50",
+  "version": "0.4.1-nightly.20251212.58d3a9c2",
   "description": "Qwen Code - AI-powered coding assistant",
   "repository": {
     "type": "git",
@@ -20,7 +20,7 @@
     "locales"
   ],
   "config": {
-    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.4.1-nightly.20251210.5fddcd50"
+    "sandboxImageUri": "ghcr.io/qwenlm/qwen-code:0.4.1-nightly.20251212.58d3a9c2"
   },
   "dependencies": {
     "tiktoken": "^1.0.21"