@qwen-code/qwen-code 0.21.0 → 0.21.1

package/chunks/{chunk-CIKQ7KKO.js → chunk-PT722TDT.js}

@@ -5,28 +5,34 @@ import {
 } from "./chunk-VGC4I5JJ.js";
 import {
   isAnyAutoMemPath
-} from "./chunk-MUP3T3AD.js";
+} from "./chunk-SGFT55XI.js";
+import {
+  STRUCTURED_OUTPUT_REDACTED_ARGS
+} from "./chunk-Y4IHBGBP.js";
+import {
+  BaseDeclarativeTool,
+  BaseToolInvocation,
+  SchemaValidator,
+  ToolDisplayNames,
+  ToolNames
+} from "./chunk-Y6AXW2OG.js";
 import {
   DEFAULT_QWEN_MODEL
-} from "./chunk-IKCX4CCL.js";
+} from "./chunk-VCPIZRYH.js";
 import {
   estimateTextTokens,
   generateLegacyMcpToolName,
   normalizeToolNameForProvider
 } from "./chunk-46UV252V.js";
-import {
-  require_lib
-} from "./chunk-A4UCTEB5.js";
 import {
   normalize
-} from "./chunk-UW5EOVUN.js";
+} from "./chunk-ZBVS26BY.js";
 import {
   InstallationManager
-} from "./chunk-5I2IWRSH.js";
+} from "./chunk-A3NDJ5SB.js";
 import {
-  atomicWriteFile,
-  atomicWriteFileSync
-} from "./chunk-A5L3JMUA.js";
+  atomicWriteFile
+} from "./chunk-7XATOOE7.js";
 import {
   isTelemetrySdkInitialized,
   recordApiErrorMetrics,
@@ -47,10 +53,11 @@ import {
   recordSubagentExecutionMetrics,
   recordTokenUsageMetrics,
   recordToolCallMetrics
-} from "./chunk-MB4MZHMJ.js";
+} from "./chunk-BGTQCTQW.js";
 import {
-  require_src
-} from "./chunk-HTR4WV6U.js";
+  require_src,
+  safeJsonStringify
+} from "./chunk-W4RQUHY3.js";
 import {
   EVENT_API_CANCEL,
   EVENT_API_ERROR,
@@ -72,7 +79,6 @@ import {
   EVENT_EXTENSION_UNINSTALL,
   EVENT_EXTENSION_UPDATE,
   EVENT_FILE_OPERATION,
-  EVENT_FLASH_FALLBACK,
   EVENT_IDE_CONNECTION,
   EVENT_MEMORY_DREAM,
   EVENT_MEMORY_EXTRACT,
@@ -94,23 +100,8 @@ import {
   EVENT_USER_RETRY,
   EVENT_WORKFLOW_KEYWORD,
   EVENT_WORKFLOW_RUN,
-  SERVICE_NAME,
-  safeJsonStringify
-} from "./chunk-BULDBTYC.js";
-import {
-  SemanticAttributes,
-  init_esm
-} from "./chunk-U7ZFW55U.js";
-import {
-  STRUCTURED_OUTPUT_REDACTED_ARGS
-} from "./chunk-UUUTRMI2.js";
-import {
-  BaseDeclarativeTool,
-  BaseToolInvocation,
-  SchemaValidator,
-  ToolDisplayNames,
-  ToolNames
-} from "./chunk-PR75REBZ.js";
+  SERVICE_NAME
+} from "./chunk-S7W2GKIO.js";
 import {
   Storage,
   createDebugLogger,
@@ -121,7 +112,11 @@ import {
   makeRelative,
   shortenPath,
   unescapePath
-} from "./chunk-NL7LTRLR.js";
+} from "./chunk-UHUSJ6X7.js";
+import {
+  SemanticAttributes,
+  init_esm
+} from "./chunk-VOQXFAY5.js";
 import {
   require_dist
 } from "./chunk-75DOP5OR.js";
@@ -5697,7 +5692,7 @@ var require_utils = __commonJS({
 });
 
 // node_modules/chardet/lib/index.js
-var require_lib2 = __commonJS({
+var require_lib = __commonJS({
   "node_modules/chardet/lib/index.js"(exports) {
     "use strict";
     init_esbuild_shims();
@@ -7399,7 +7394,7 @@ var require_lru_cache = __commonJS({
 
 // packages/core/src/tools/read-file.ts
 init_esbuild_shims();
-import path8 from "node:path";
+import path9 from "node:path";
 import fs6 from "node:fs/promises";
 
 // packages/core/src/utils/fileUtils.ts
@@ -7830,12 +7825,12 @@ var Mime = class {
     }
     return this;
   }
-  getType(path9) {
-    if (typeof path9 !== "string")
+  getType(path10) {
+    if (typeof path10 !== "string")
       return null;
-    const last = path9.replace(/^.*[/\\]/s, "").toLowerCase();
+    const last = path10.replace(/^.*[/\\]/s, "").toLowerCase();
     const ext = last.replace(/^.*\./s, "").toLowerCase();
-    const hasPath = last.length < path9.length;
+    const hasPath = last.length < path10.length;
     const hasDot = ext.length < last.length - 1;
     if (!hasDot && hasPath)
       return null;
@@ -7875,28 +7870,34 @@ var Mime_default = Mime;
 // packages/core/node_modules/mime/dist/src/index_lite.js
 var index_lite_default = new Mime_default(standard_default)._freeze();
 
-// packages/core/src/utils/iconvHelper.ts
+// packages/core/src/utils/encoding.ts
 init_esbuild_shims();
-var import_iconv_lite = __toESM(require_lib(), 1);
-var iconvLite = import_iconv_lite.default;
-function iconvDecode(buffer, encoding) {
-  return iconvLite.decode(buffer, encoding);
-}
-__name(iconvDecode, "iconvDecode");
-function iconvEncode(content, encoding) {
-  return iconvLite.encode(content, encoding);
-}
-__name(iconvEncode, "iconvEncode");
-function iconvEncodingExists(encoding) {
-  return iconvLite.encodingExists(encoding);
-}
-__name(iconvEncodingExists, "iconvEncodingExists");
 function isUtf8CompatibleEncoding(encoding) {
   const lower = encoding.toLowerCase().replace(/[^a-z0-9]/g, "");
   return lower === "utf8" || lower === "ascii" || lower === "usascii";
 }
 __name(isUtf8CompatibleEncoding, "isUtf8CompatibleEncoding");
 
+// packages/core/src/utils/load-iconv-lite.ts
+init_esbuild_shims();
+var iconvLiteModulePromise;
+function isIconvLite(candidate) {
+  return "decode" in candidate && typeof candidate.decode === "function" && "encode" in candidate && typeof candidate.encode === "function" && "encodingExists" in candidate && typeof candidate.encodingExists === "function";
+}
+__name(isIconvLite, "isIconvLite");
+function loadIconvLite() {
+  iconvLiteModulePromise ??= import("./lib-RUF3WZA6.js").then((module) => {
+    const imported = module;
+    const candidate = "default" in imported && imported.default ? imported.default : imported;
+    if (!isIconvLite(candidate)) {
+      throw new Error("iconv-lite module does not match the expected API");
+    }
+    return candidate;
+  });
+  return iconvLiteModulePromise;
+}
+__name(loadIconvLite, "loadIconvLite");
+
 // packages/core/src/utils/ignorePatterns.ts
 init_esbuild_shims();
 import path from "node:path";
@@ -8106,16 +8107,12 @@ var BINARY_EXTENSIONS = [
 
 // packages/core/src/utils/systemEncoding.ts
 init_esbuild_shims();
-var import_chardet = __toESM(require_lib2(), 1);
+var import_chardet = __toESM(require_lib(), 1);
 import { isUtf8 } from "node:buffer";
 import { execSync } from "node:child_process";
 import os from "node:os";
 var debugLogger = createDebugLogger("ENCODING");
 var cachedSystemEncoding = void 0;
-function resetEncodingCache() {
-  cachedSystemEncoding = void 0;
-}
-__name(resetEncodingCache, "resetEncodingCache");
 function getCachedEncodingForBuffer(buffer) {
   if (isUtf8(buffer)) {
     return "utf-8";
@@ -9068,7 +9065,6 @@ __name(detectLineEndingFromContent, "detectLineEndingFromContent");
 
 // packages/core/src/utils/fileUtils.ts
 var debugLogger2 = createDebugLogger("FILE_UTILS");
-var DEFAULT_ENCODING = "utf-8";
 var PDF_FULL_TEXT_EXTRACTION_MAX_MB = 100;
 var PDF_PAGED_TEXT_EXTRACTION_MAX_MB = 512;
 function detectBOM(buf) {
@@ -9127,7 +9123,7 @@ function isValidUtf8(buffer) {
   }
 }
 __name(isValidUtf8, "isValidUtf8");
-function decodeBufferWithEncodingInfo(full) {
+async function decodeBufferWithEncodingInfoAsync(full) {
   if (full.length === 0) {
     return { content: "", encoding: "utf-8", bom: false };
   }
@@ -9147,9 +9143,10 @@ function decodeBufferWithEncodingInfo(full) {
   const detected = detectEncodingFromBuffer(full);
   if (detected && !isUtf8CompatibleEncoding(detected)) {
     try {
-      if (iconvEncodingExists(detected)) {
+      const iconvLite = await loadIconvLite();
+      if (iconvLite.encodingExists(detected)) {
         return {
-          content: iconvDecode(full, detected),
+          content: iconvLite.decode(full, detected),
           encoding: detected,
           bom: false
         };
@@ -9162,7 +9159,7 @@ function decodeBufferWithEncodingInfo(full) {
   }
   return { content: full.toString("utf8"), encoding: "utf-8", bom: false };
 }
-__name(decodeBufferWithEncodingInfo, "decodeBufferWithEncodingInfo");
+__name(decodeBufferWithEncodingInfoAsync, "decodeBufferWithEncodingInfoAsync");
 function decodeBOMBuffer(buf, bomInfo) {
   const content = buf.subarray(bomInfo.bomLength);
   switch (bomInfo.encoding) {
@@ -9203,7 +9200,7 @@ async function readFileWithEncodingInfo(filePath, signal) {
     filePath,
     signal === void 0 ? void 0 : { signal }
   );
-  return decodeBufferWithEncodingInfo(full);
+  return await decodeBufferWithEncodingInfoAsync(full);
 }
 __name(readFileWithEncodingInfo, "readFileWithEncodingInfo");
 async function readFileWithEncoding(filePath) {
@@ -11232,6 +11229,12 @@ var createInitialSkillMetrics = /* @__PURE__ */ __name(() => ({
   totalFail: 0,
   byName: {}
 }), "createInitialSkillMetrics");
+var createInitialGenerationMetrics = /* @__PURE__ */ __name(() => ({
+  timedRequests: 0,
+  totalTtftMs: 0,
+  totalGenerationDurationMs: 0,
+  totalThroughputOutputTokens: 0
+}), "createInitialGenerationMetrics");
 var createInitialMetrics = /* @__PURE__ */ __name(() => ({
   models: {},
   tools: {
@@ -11376,6 +11379,23 @@ var UiTelemetryService = class _UiTelemetryService extends EventEmitter {
       bucket.tokens.cached += event.cached_content_token_count;
       bucket.tokens.thoughts += event.thoughts_token_count;
     }
+    if (event.ttft_ms === void 0 || !Number.isFinite(event.ttft_ms) || event.ttft_ms < 0 || isInternalPromptId(event.prompt_id)) {
+      return;
+    }
+    const generation = metrics.generation ?? (metrics.generation = createInitialGenerationMetrics());
+    const generationDurationMs = Math.max(0, event.duration_ms - event.ttft_ms);
+    generation.timedRequests++;
+    generation.totalTtftMs += event.ttft_ms;
+    if (generationDurationMs > 0) {
+      generation.totalGenerationDurationMs += generationDurationMs;
+      generation.totalThroughputOutputTokens += event.output_token_count;
+    }
+    generation.last = {
+      model: event.model,
+      ttftMs: event.ttft_ms,
+      generationDurationMs,
+      outputTokens: event.output_token_count
+    };
   }
   #accumulateApiError(metrics, event) {
     const modelMetrics = this.#getOrCreateModelMetrics(metrics, event.model);
@@ -11678,10 +11698,6 @@ async function read(filePath, options = {}) {
 }
 __name(read, "read");
 var ensuredDirs = /* @__PURE__ */ new Set();
-function _resetEnsuredDirsCacheForTest() {
-  ensuredDirs.clear();
-}
-__name(_resetEnsuredDirsCacheForTest, "_resetEnsuredDirsCacheForTest");
 async function writeLine(filePath, data) {
   const lock = getFileLock(filePath);
   await lock.runExclusive(async () => {
@@ -11708,42 +11724,6 @@ function writeLineSync(filePath, data) {
   fs4.appendFileSync(filePath, Buffer.from(line, "utf8"), { flush: true });
 }
 __name(writeLineSync, "writeLineSync");
-function write(filePath, data) {
-  const lines = data.map((item) => `${JSON.stringify(item)}
-`).join("");
-  const dir = path5.dirname(filePath);
-  if (!fs4.existsSync(dir)) {
-    fs4.mkdirSync(dir, { recursive: true });
-  }
-  atomicWriteFileSync(filePath, lines, { encoding: "utf8" });
-}
-__name(write, "write");
-async function countLines(filePath) {
-  let fileStream;
-  let rl;
-  try {
-    fileStream = fs4.createReadStream(filePath);
-    rl = readline.createInterface({
-      input: fileStream,
-      crlfDelay: Infinity
-    });
-    let count = 0;
-    for await (const line of rl) {
-      if (line.trim().length > 0) {
-        count++;
-      }
-    }
-    return count;
-  } catch (error) {
-    if (error.code !== "ENOENT") {
-      debugLogger3.error(`Error counting lines in ${filePath}:`, error);
-    }
-    return 0;
-  } finally {
-    await closeLineReader(rl, fileStream);
-  }
-}
-__name(countLines, "countLines");
 function exists(filePath) {
   try {
     const stats = fs4.statSync(filePath);
@@ -11997,11 +11977,6 @@ function summarizeRecords(period, value, records) {
   };
 }
 __name(summarizeRecords, "summarizeRecords");
-async function recordTokenUsageFromApiResponse(config, event) {
-  const record = apiResponseEventToTokenUsageRecord(config, event);
-  await writeLine(getTokenUsageFilePath(record.localMonth), record);
-}
-__name(recordTokenUsageFromApiResponse, "recordTokenUsageFromApiResponse");
 var lastLoggedTimeByCode = /* @__PURE__ */ new Map();
 var suppressedCountByCode = /* @__PURE__ */ new Map();
 var TOKEN_USAGE_FAILURE_LOG_COOLDOWN_MS = 6e4;
@@ -12137,12 +12112,6 @@ function formatTokenUsageSummaryAsJson(summary) {
 `;
 }
 __name(formatTokenUsageSummaryAsJson, "formatTokenUsageSummaryAsJson");
-async function exportTokenUsageSummary(options) {
-  const summary = await queryTokenUsage(options);
-  return options.format === "json" ? formatTokenUsageSummaryAsJson(summary) : `${formatTokenUsageSummaryAsCsv(summary)}
-`;
-}
-__name(exportTokenUsageSummary, "exportTokenUsageSummary");
 
 // packages/core/src/utils/chat-recording-suppression-context.ts
 init_esbuild_shims();
@@ -12359,23 +12328,6 @@ function logApiRequest(config, event) {
   logger.emit(logRecord);
 }
 __name(logApiRequest, "logApiRequest");
-function logFlashFallback(config, event) {
-  QwenLogger.getInstance(config)?.logFlashFallbackEvent(event);
-  if (!isTelemetrySdkInitialized()) return;
-  const attributes = {
-    ...getCommonAttributes(config),
-    ...event,
-    "event.name": EVENT_FLASH_FALLBACK,
-    "event.timestamp": (/* @__PURE__ */ new Date()).toISOString()
-  };
-  const logger = import_api_logs.logs.getLogger(SERVICE_NAME);
-  const logRecord = {
-    body: `Switching to flash as Fallback.`,
-    attributes
-  };
-  logger.emit(logRecord);
-}
-__name(logFlashFallback, "logFlashFallback");
 function logRipgrepFallback(config, event) {
   QwenLogger.getInstance(config)?.logRipgrepFallbackEvent(event);
   if (!isTelemetrySdkInitialized()) return;
@@ -13217,22 +13169,26 @@ async function truncateAndSaveToFile(content, fileName, projectTempDir, threshol
   const separator = "\n\n---\n... [CONTENT TRUNCATED] ...\n---\n\n";
   const ellipsis = "...";
   const previewBudget = Math.max(0, previewChars);
-  const headBudget = keep === "head" ? previewBudget : keep === "tail" ? 0 : Math.floor(previewBudget / 5);
+  const sep = previewBudget > separator.length ? separator : "";
+  const contentBudget = previewBudget - sep.length;
+  const headBudget = keep === "head" ? contentBudget : keep === "tail" ? 0 : Math.floor(contentBudget / 5);
   const beginning = [];
   let headChars = 0;
   for (let i = 0; i < Math.min(headCount, lines.length); i++) {
     const remaining = headBudget - headChars;
     if (remaining <= 0) break;
     if (lines[i].length + 1 > remaining) {
-      const sliceLen = Math.max(remaining - ellipsis.length, 0);
-      beginning.push(lines[i].slice(0, sliceLen) + ellipsis);
+      if (remaining >= ellipsis.length) {
+        const sliceLen = remaining - ellipsis.length;
+        beginning.push(lines[i].slice(0, sliceLen) + ellipsis);
+      }
       headChars = headBudget;
       break;
     }
     beginning.push(lines[i]);
     headChars += lines[i].length + 1;
   }
-  const tailBudget = keep === "head" ? 0 : Math.max(previewBudget - headChars - separator.length, 0);
+  const tailBudget = keep === "head" ? 0 : Math.max(contentBudget - headChars, 0);
   const end = [];
   let tailChars = 0;
   const tailStart = Math.max(lines.length - tailCount, beginning.length);
@@ -13240,15 +13196,17 @@ async function truncateAndSaveToFile(content, fileName, projectTempDir, threshol
     const remaining = tailBudget - tailChars;
     if (remaining <= 0) break;
     if (lines[i].length + 1 > remaining) {
-      const sliceLen = Math.max(remaining - ellipsis.length, 0);
-      end.unshift(ellipsis + (sliceLen > 0 ? lines[i].slice(-sliceLen) : ""));
+      if (remaining >= ellipsis.length) {
+        const sliceLen = remaining - ellipsis.length;
+        end.unshift(ellipsis + (sliceLen > 0 ? lines[i].slice(-sliceLen) : ""));
+      }
       tailChars = tailBudget;
       break;
     }
     end.unshift(lines[i]);
     tailChars += lines[i].length + 1;
   }
-  const truncatedContent = keep === "head" ? beginning.join("\n") + separator : keep === "tail" ? separator + end.join("\n") : beginning.join("\n") + separator + end.join("\n");
+  const truncatedContent = keep === "head" ? beginning.join("\n") + sep : keep === "tail" ? sep + end.join("\n") : beginning.join("\n") + sep + end.join("\n");
   const safeFileName = `${path7.basename(fileName)}.output`;
   const outputFile = path7.join(projectTempDir, safeFileName);
   const wrappedMessage = `${TOOL_OUTPUT_TRUNCATED_PREFIX}.
@@ -13478,12 +13436,6 @@ __name(buildStub, "buildStub");
 
 // packages/core/src/tools/mcp-status.ts
 init_esbuild_shims();
-var MCPServerStatus = /* @__PURE__ */ ((MCPServerStatus2) => {
-  MCPServerStatus2["DISCONNECTED"] = "disconnected";
-  MCPServerStatus2["CONNECTING"] = "connecting";
-  MCPServerStatus2["CONNECTED"] = "connected";
-  return MCPServerStatus2;
-})(MCPServerStatus || {});
 var serverStatuses = /* @__PURE__ */ new Map();
 var statusChangeListeners = [];
 function addMCPStatusChangeListener(listener) {
@@ -13575,6 +13527,75 @@ function getInvocationContext() {
 }
 __name(getInvocationContext, "getInvocationContext");
 
+// packages/core/src/services/visionBridge/image-part-utils.ts
+init_esbuild_shims();
+function normalizeParts(input) {
+  if (typeof input === "string") {
+    return [{ text: input }];
+  }
+  if (Array.isArray(input)) {
+    return input.map(
+      (part) => typeof part === "string" ? { text: part } : part
+    );
+  }
+  return [input];
+}
+__name(normalizeParts, "normalizeParts");
+function isImagePart(part) {
+  const mimeType = part.inlineData?.mimeType;
+  const data = part.inlineData?.data;
+  return typeof mimeType === "string" && mimeType.startsWith("image/") && typeof data === "string" && data.length > 0;
+}
+__name(isImagePart, "isImagePart");
+function hasImageParts(input) {
+  return normalizeParts(input).some(isImagePart);
+}
+__name(hasImageParts, "hasImageParts");
+function splitImageParts(input) {
+  const imageParts = [];
+  const nonImageParts = [];
+  for (const part of normalizeParts(input)) {
+    if (isImagePart(part)) {
+      imageParts.push(part);
+    } else {
+      nonImageParts.push(part);
+    }
+  }
+  return { imageParts, nonImageParts };
+}
+__name(splitImageParts, "splitImageParts");
+function replaceImagesWithText(input, text) {
+  const result = [];
+  let replaced = false;
+  for (const part of normalizeParts(input)) {
+    if (isImagePart(part)) {
+      if (!replaced) {
+        result.push({ text });
+        replaced = true;
+      }
+      continue;
+    }
+    result.push(part);
+  }
+  if (!replaced) {
+    result.push({ text });
+  }
+  return result;
+}
+__name(replaceImagesWithText, "replaceImagesWithText");
+function isUsableImagePart(part) {
+  const data = part.inlineData?.data;
+  if (typeof data !== "string" || data.length === 0) {
+    return false;
+  }
+  return data.length <= VISION_BRIDGE_MAX_IMAGE_BASE64_BYTES;
+}
+__name(isUsableImagePart, "isUsableImagePart");
+function collectText(parts) {
+  return parts.map((part) => typeof part.text === "string" ? part.text : "").filter((text) => text.length > 0).join("\n").trim();
+}
+__name(collectText, "collectText");
+
 // packages/core/src/tools/mcp-tool.ts
 var debugLogger6 = createDebugLogger("MCP_TOOL");
 var MCP_CONNECTION_ERROR_PATTERNS = [
@@ -13796,18 +13817,10 @@ var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends Bas
         callToolResult
       );
       if (this.isMCPToolError(rawResponseParts)) {
-        const errorMessage = `MCP tool '${this.serverToolName}' reported tool error for function call: ${safeJsonStringify({
+        return await this.buildMcpToolError(rawResponseParts, {
           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: "mcp_tool_error" /* MCP_TOOL_ERROR */
-          }
-        };
+        });
       }
       const transformedParts = transformMcpContentToParts(rawResponseParts);
       const truncated = await this.truncateTextParts(transformedParts);
@@ -13865,17 +13878,7 @@ var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends Bas
         });
       });
       if (this.isMCPToolError(rawResponseParts)) {
-        const errorMessage = `MCP tool '${this.serverToolName}' reported tool error for function call: ${safeJsonStringify(
-          functionCalls[0]
-        )} with response: ${safeJsonStringify(rawResponseParts)}`;
-        return {
-          llmContent: errorMessage,
-          returnDisplay: `Error: MCP tool '${this.serverToolName}' reported an error.`,
-          error: {
-            message: errorMessage,
-            type: "mcp_tool_error" /* MCP_TOOL_ERROR */
-          }
-        };
+        return await this.buildMcpToolError(rawResponseParts, functionCalls[0]);
       }
       const transformedParts = transformMcpContentToParts(rawResponseParts);
       const truncated = await this.truncateTextParts(transformedParts);
@@ -13891,6 +13894,34 @@ var DiscoveredMCPToolInvocation = class _DiscoveredMCPToolInvocation extends Bas
       return this.handleReconnectOnError(error, signal);
     }
   }
+  async buildMcpToolError(rawResponseParts, functionCall) {
+    const imageContent = getMcpErrorImageContent(rawResponseParts);
+    let llmContent;
+    let errorMessage;
+    let persistedOutputFiles;
+    if (imageContent) {
+      const truncatedContent = await this.truncateTextParts(imageContent);
+      llmContent = truncatedContent.parts;
+      persistedOutputFiles = truncatedContent.persistedOutputFiles;
+      errorMessage = `MCP tool '${this.serverToolName}' reported tool error for function call: ${safeJsonStringify(
+        functionCall
+      )} with response: ${getDisplayFromParts(truncatedContent.parts)}`;
+    } else {
+      errorMessage = `MCP tool '${this.serverToolName}' reported tool error for function call: ${safeJsonStringify(
+        functionCall
+      )} with response: ${safeJsonStringify(rawResponseParts)}`;
+      llmContent = errorMessage;
+    }
+    return {
+      llmContent,
+      returnDisplay: `Error: MCP tool '${this.serverToolName}' reported an error.`,
+      error: {
+        message: errorMessage,
+        type: "mcp_tool_error" /* MCP_TOOL_ERROR */
+      },
+      ...persistedOutputFiles !== void 0 ? { persistedOutputFiles } : {}
+    };
+  }
   /**
    * Truncates text parts in the transformed result if they exceed the
    * configured threshold. Non-text parts (images, audio, etc.) are preserved.
@@ -14145,6 +14176,11 @@ function transformMcpContentToParts(sdkResponse) {
   return transformed.filter((part) => part !== null);
 }
 __name(transformMcpContentToParts, "transformMcpContentToParts");
+function getMcpErrorImageContent(rawResponseParts) {
+  const transformedParts = transformMcpContentToParts(rawResponseParts);
+  return transformedParts.some(isImagePart) ? transformedParts : void 0;
+}
+__name(getMcpErrorImageContent, "getMcpErrorImageContent");
 function getDisplayFromParts(parts) {
   if (parts.length === 0) {
     return "";
@@ -14245,19 +14281,6 @@ var StartSessionEvent = class {
     }
   }
 };
-var EndSessionEvent = class {
-  static {
-    __name(this, "EndSessionEvent");
-  }
-  "event.name";
-  "event.timestamp";
-  session_id;
-  constructor(config) {
-    this["event.name"] = "end_session";
-    this["event.timestamp"] = (/* @__PURE__ */ new Date()).toISOString();
-    this.session_id = config?.getSessionId();
-  }
-};
 var UserPromptEvent = class {
   static {
     __name(this, "UserPromptEvent");
@@ -14454,12 +14477,14 @@ var ApiResponseEvent = class {
   response_text;
   prompt_id;
   auth_type;
+  /** Time from stream dispatch to first user-visible content. */
+  ttft_ms;
   /**
    * Name of the subagent that issued this request, or undefined when the
    * request originates from the main conversation.
    */
   subagent_name;
-  constructor(response_id, model, duration_ms, prompt_id, auth_type, usage_data, response_text, subagent_name) {
+  constructor(response_id, model, duration_ms, prompt_id, auth_type, usage_data, response_text, subagent_name, ttft_ms) {
     this["event.name"] = "api_response";
     this["event.timestamp"] = (/* @__PURE__ */ new Date()).toISOString();
     this.response_id = response_id;
@@ -14475,19 +14500,7 @@ var ApiResponseEvent = class {
     this.prompt_id = prompt_id;
     this.auth_type = auth_type;
     this.subagent_name = subagent_name;
-  }
-};
-var FlashFallbackEvent = class {
-  static {
-    __name(this, "FlashFallbackEvent");
-  }
-  "event.name";
-  "event.timestamp";
-  auth_type;
-  constructor(auth_type) {
-    this["event.name"] = "flash_fallback";
-    this["event.timestamp"] = (/* @__PURE__ */ new Date()).toISOString();
-    this.auth_type = auth_type;
+    this.ttft_ms = ttft_ms;
   }
 };
 var RipgrepFallbackEvent = class {
@@ -14507,19 +14520,6 @@ var RipgrepFallbackEvent = class {
     this.error = error;
   }
 };
-var LoopType = /* @__PURE__ */ ((LoopType2) => {
-  LoopType2["CONSECUTIVE_IDENTICAL_TOOL_CALLS"] = "consecutive_identical_tool_calls";
-  LoopType2["CHANTING_IDENTICAL_SENTENCES"] = "chanting_identical_sentences";
-  LoopType2["REPETITIVE_THOUGHTS"] = "repetitive_thoughts";
-  LoopType2["READ_FILE_LOOP"] = "read_file_loop";
-  LoopType2["ACTION_STAGNATION"] = "action_stagnation";
-  LoopType2["SHELL_COMMAND_STAGNATION"] = "shell_command_stagnation";
-  LoopType2["GLOBAL_TOOL_CALL_DUPLICATE"] = "global_tool_call_duplicate";
-  LoopType2["ALTERNATING_TOOL_CALL_PATTERN"] = "alternating_tool_call_pattern";
-  LoopType2["TURN_TOOL_CALL_CAP"] = "turn_tool_call_cap";
-  LoopType2["INVALID_TOOL_PARAMS_STAGNATION"] = "invalid_tool_params_stagnation";
-  return LoopType2;
-})(LoopType || {});
 var LoopDetectedEvent = class {
   static {
     __name(this, "LoopDetectedEvent");
@@ -14579,11 +14579,6 @@ function makeSlashCommandEvent({
   };
 }
 __name(makeSlashCommandEvent, "makeSlashCommandEvent");
-var SlashCommandStatus = /* @__PURE__ */ ((SlashCommandStatus2) => {
-  SlashCommandStatus2["SUCCESS"] = "success";
-  SlashCommandStatus2["ERROR"] = "error";
-  return SlashCommandStatus2;
-})(SlashCommandStatus || {});
 function makeChatCompressionEvent({
   tokens_before,
   tokens_after,
@@ -14600,11 +14595,6 @@ function makeChatCompressionEvent({
   };
 }
 __name(makeChatCompressionEvent, "makeChatCompressionEvent");
-var IdeConnectionType = /* @__PURE__ */ ((IdeConnectionType2) => {
-  IdeConnectionType2["START"] = "start";
-  IdeConnectionType2["SESSION"] = "session";
-  return IdeConnectionType2;
-})(IdeConnectionType || {});
 var IdeConnectionEvent = class {
   static {
     __name(this, "IdeConnectionEvent");
@@ -14976,12 +14966,6 @@ var SkillLaunchEvent = class {
     this.prompt_id = prompt_id;
   }
 };
-var UserFeedbackRating = /* @__PURE__ */ ((UserFeedbackRating2) => {
-  UserFeedbackRating2[UserFeedbackRating2["BAD"] = 1] = "BAD";
-  UserFeedbackRating2[UserFeedbackRating2["FINE"] = 2] = "FINE";
-  UserFeedbackRating2[UserFeedbackRating2["GOOD"] = 3] = "GOOD";
-  return UserFeedbackRating2;
-})(UserFeedbackRating || {});
 var UserFeedbackEvent = class {
   static {
     __name(this, "UserFeedbackEvent");
@@ -15302,6 +15286,38 @@ function memoryFreshnessNote(mtimeMs) {
 }
 __name(memoryFreshnessNote, "memoryFreshnessNote");
 
+// packages/core/src/tools/file-read-permission.ts
+init_esbuild_shims();
+import path8 from "node:path";
+function getFileReadDefaultPermission(config, requestedPath) {
+  const filePath = path8.resolve(requestedPath);
+  const workspaceContext = config.getWorkspaceContext();
+  const allowedRoots = [
+    config.storage.getProjectTempDir(),
+    // Background subagent transcripts live under <projectDir>/subagents/ and
+    // are advertised to the model as polling targets via read_file.
+    path8.join(config.storage.getProjectDir(), "subagents"),
+    Storage.getGlobalTempDir(),
+    ...config.storage.getUserSkillsDirs(),
+    Storage.getUserExtensionsDir(),
+    // Approved plans are persisted here (default ~/.qwen/plans, outside
+    // the workspace) and after approval nothing re-injects the plan text,
+    // so the saved file is the model's only recovery route — reading it
+    // back must not stall on a confirmation prompt. The dir holds only
+    // session plan files, never credentials or settings.
+    config.getPlansDir()
+  ];
+  if (workspaceContext.isPathWithinWorkspace(filePath) || isSubpaths(allowedRoots, filePath) || // isAnyAutoMemPath narrows to the managed auto-memory roots
+  // (per-project + user-level under ~/.qwen/memories/) — never the
+  // broad getMemoryBaseDir() — to avoid exposing sensitive ~/.qwen
+  // files such as settings.json or OAuth credentials.
+  isAnyAutoMemPath(filePath, config.getTargetDir())) {
+    return "allow";
+  }
+  return "ask";
+}
+__name(getFileReadDefaultPermission, "getFileReadDefaultPermission");
+
 // packages/core/src/services/visionBridge/vision-bridge-service.ts
 init_esbuild_shims();
 
@@ -15503,77 +15519,9 @@ async function runSideQuery(config, options) {
 }
 __name(runSideQuery, "runSideQuery");
 
-// packages/core/src/services/visionBridge/image-part-utils.ts
-init_esbuild_shims();
-function normalizeParts(input) {
-  if (typeof input === "string") {
-    return [{ text: input }];
-  }
-  if (Array.isArray(input)) {
-    return input.map(
-      (part) => typeof part === "string" ? { text: part } : part
-    );
-  }
-  return [input];
-}
-__name(normalizeParts, "normalizeParts");
-function isImagePart(part) {
-  const mimeType = part.inlineData?.mimeType;
-  const data = part.inlineData?.data;
-  return typeof mimeType === "string" && mimeType.startsWith("image/") && typeof data === "string" && data.length > 0;
-}
-__name(isImagePart, "isImagePart");
-function hasImageParts(input) {
-  return normalizeParts(input).some(isImagePart);
-}
-__name(hasImageParts, "hasImageParts");
-function splitImageParts(input) {
-  const imageParts = [];
-  const nonImageParts = [];
-  for (const part of normalizeParts(input)) {
-    if (isImagePart(part)) {
-      imageParts.push(part);
-    } else {
-      nonImageParts.push(part);
-    }
-  }
-  return { imageParts, nonImageParts };
-}
-__name(splitImageParts, "splitImageParts");
-function replaceImagesWithText(input, text) {
-  const result = [];
-  let replaced = false;
-  for (const part of normalizeParts(input)) {
-    if (isImagePart(part)) {
-      if (!replaced) {
-        result.push({ text });
-        replaced = true;
-      }
-      continue;
-    }
-    result.push(part);
-  }
-  if (!replaced) {
-    result.push({ text });
-  }
-  return result;
-}
-__name(replaceImagesWithText, "replaceImagesWithText");
-function isUsableImagePart(part) {
-  const data = part.inlineData?.data;
-  if (typeof data !== "string" || data.length === 0) {
-    return false;
-  }
-  return data.length <= VISION_BRIDGE_MAX_IMAGE_BASE64_BYTES;
-}
-__name(isUsableImagePart, "isUsableImagePart");
-function collectText(parts) {
-  return parts.map((part) => typeof part.text === "string" ? part.text : "").filter((text) => text.length > 0).join("\n").trim();
-}
-__name(collectText, "collectText");
-
 // packages/core/src/services/visionBridge/vision-bridge-service.ts
 var debugLogger7 = createDebugLogger("VISION_BRIDGE");
+var turnImageCounts = /* @__PURE__ */ new WeakMap();
 var BRIDGE_MAX_OUTPUT_TOKENS = 2048;
 var VISION_BRIDGE_TIMEOUT_MS = 3e4;
 var VISION_BRIDGE_MAX_ATTEMPTS = 2;
@@ -15730,8 +15678,10 @@ function formatFullTurnVisionNotice(selection) {
   return `Routing this image turn to ${target}; retries and tool continuations will stay on that model until the turn ends.`;
 }
 __name(formatFullTurnVisionNotice, "formatFullTurnVisionNotice");
-function buildIntentPart(intentText, sourceContext) {
-  const sourceHint = sourceContext ? `The images are consecutive pages ${sourceContext.renderedRange.firstPage}-${sourceContext.renderedRange.lastPage} from PDF ${JSON.stringify(sourceContext.displayName)}. Transcribe each page separately and label each section with its original PDF page number.` : "";
+function buildIntentPart(intentText, sourceContext, imageParts = []) {
+  const sourceHint = sourceContext ? `The images are consecutive pages ${sourceContext.renderedRange.firstPage}-${sourceContext.renderedRange.lastPage} from PDF ${JSON.stringify(sourceContext.displayName)}. Transcribe each page separately and label each section with its original PDF page number.` : imageParts.length > 0 ? `Describe each image separately under these ordered labels: ${imageParts.map(
+    (part, index) => `${index + 1}. ${JSON.stringify(part.inlineData?.displayName?.trim() || `image ${index + 1}`)}`
+  ).join("; ")}.` : "";
   const focusHint = intentText.length > 0 ? `Focus hint \u2014 do NOT answer this, use it only to decide which details to transcribe thoroughly: ${intentText}` : "Describe the image(s) and transcribe any visible text, code, and errors.";
   return sourceHint ? `${sourceHint}
 ${focusHint}` : focusHint;
@@ -15779,7 +15729,7 @@ function failure(reason, parts, omittedCount, extra = {}) {
 }
 __name(failure, "failure");
 async function runVisionBridge(params) {
-  const { config, parts, signal, sourceContext } = params;
+  const { config, parts, signal, sourceContext, intentText } = params;
   const { imageParts, nonImageParts } = splitImageParts(parts);
   if (imageParts.length === 0) {
     return {
@@ -15790,9 +15740,14 @@ async function runVisionBridge(params) {
     };
   }
   const validImages = imageParts.filter(isUsableImagePart);
-  const toConvert = validImages.slice(0, VISION_BRIDGE_MAX_IMAGES);
+  const usedImages = turnImageCounts.get(signal) ?? 0;
+  const remainingImages = Math.max(0, VISION_BRIDGE_MAX_IMAGES - usedImages);
+  const toConvert = validImages.slice(0, remainingImages);
   const omittedCount = imageParts.length - toConvert.length;
-  const intent = collectText(nonImageParts).slice(0, BRIDGE_INTENT_MAX_CHARS);
+  const intent = (intentText ?? collectText(nonImageParts)).slice(
+    0,
+    BRIDGE_INTENT_MAX_CHARS
+  );
   const resolvedSourceContext = sourceContext ?? inferPdfSourceContext(toConvert);
   const selection = config.getDefaultVisionBridgeModel?.();
   const modelId = selection?.id;
@@ -15814,13 +15769,14 @@ async function runVisionBridge(params) {
       { modelId, ...modelEndpoint && { modelEndpoint } }
     );
   }
+  turnImageCounts.set(signal, usedImages + toConvert.length);
   const timeoutMs = config.getVisionBridgeTimeoutMs?.() ?? VISION_BRIDGE_TIMEOUT_MS;
   const requestContents = [
     {
       role: "user",
       parts: [
         ...toConvert,
-        { text: buildIntentPart(intent, resolvedSourceContext) }
+        { text: buildIntentPart(intent, resolvedSourceContext, toConvert) }
       ]
     }
   ];
@@ -15955,29 +15911,13 @@ var ReadFileToolInvocation = class extends BaseToolInvocation {
    * Returns 'ask' for paths outside the workspace/temp/userSkills directories,
    * so that external file reads require user confirmation.
    */
-  async getDefaultPermission() {
-    const filePath = path8.resolve(this.params.file_path);
-    const workspaceContext = this.config.getWorkspaceContext();
-    const allowedRoots = [
-      this.config.storage.getProjectTempDir(),
-      // Background subagent transcripts live under <projectDir>/subagents/ and
-      // are advertised to the model as polling targets via read_file.
-      path8.join(this.config.storage.getProjectDir(), "subagents"),
-      Storage.getGlobalTempDir(),
-      ...this.config.storage.getUserSkillsDirs(),
-      Storage.getUserExtensionsDir()
-    ];
-    if (workspaceContext.isPathWithinWorkspace(filePath) || isSubpaths(allowedRoots, filePath) || // isAnyAutoMemPath narrows to the managed auto-memory roots
-    // (per-project + user-level under ~/.qwen/memories/) — never the
-    // broad getMemoryBaseDir() — to avoid exposing sensitive ~/.qwen
-    // files such as settings.json or OAuth credentials.
-    isAnyAutoMemPath(filePath, this.config.getTargetDir())) {
-      return "allow";
-    }
-    return "ask";
+  getDefaultPermission() {
+    return Promise.resolve(
+      getFileReadDefaultPermission(this.config, this.params.file_path)
+    );
   }
   async execute(signal) {
-    const absPath = path8.resolve(this.params.file_path);
+    const absPath = path9.resolve(this.params.file_path);
     const projectRoot = this.config.getTargetDir();
     const isAutoMem = isAnyAutoMemPath(absPath, projectRoot);
     const cacheEnabled = !this.config.getFileReadCacheDisabled();
@@ -16003,7 +15943,7 @@ var ReadFileToolInvocation = class extends BaseToolInvocation {
       }
       debugLogger8.debug("miss", { path: absPath, state: status.state });
     }
-    const preparePdfForVisionBridge = shouldRunVisionBridge(this.config);
+    const prepareForVisionBridge = shouldRunVisionBridge(this.config);
     let result = await processSingleFileContent(
       this.params.file_path,
       this.config,
@@ -16011,7 +15951,8 @@ var ReadFileToolInvocation = class extends BaseToolInvocation {
         offset: this.params.offset,
         limit: this.params.limit,
         pages: this.params.pages,
-        preparePdfForVisionBridge,
+        preserveUnsupportedImage: prepareForVisionBridge,
+        preparePdfForVisionBridge: prepareForVisionBridge,
         signal
       }
     );
@@ -16071,7 +16012,7 @@ ${result.llmContent}`;
         "read" /* READ */,
         lines,
         mimetype,
-        path8.extname(this.params.file_path),
+        path9.extname(this.params.file_path),
         programming_language
       )
     );
@@ -16274,7 +16215,7 @@ var ReadFileTool = class _ReadFileTool extends BaseDeclarativeTool {
     if (!filePath) {
       return "The 'file_path' parameter must be non-empty.";
     }
-    if (!path8.isAbsolute(filePath)) {
+    if (!path9.isAbsolute(filePath)) {
       return `File path must be absolute, but was relative: ${filePath}. You must provide an absolute path.`;
     }
     if (params.offset !== void 0 && (!Number.isInteger(params.offset) || params.offset < 0)) {
@@ -16287,7 +16228,7 @@ var ReadFileTool = class _ReadFileTool extends BaseDeclarativeTool {
       const pages = params.pages.trim();
       params.pages = pages.length > 0 ? pages : void 0;
     }
-    const ext = path8.extname(filePath).toLowerCase();
+    const ext = path9.extname(filePath).toLowerCase();
     if ((params.offset !== void 0 || params.limit !== void 0) && ext === ".ipynb") {
       return "offset and limit are not supported for Jupyter notebook (.ipynb) files. Notebooks are always read in full with structured cell output.";
     }
@@ -16327,13 +16268,10 @@ export {
   isImagePart,
   hasImageParts,
   splitImageParts,
-  replaceImagesWithText,
-  isUsableImagePart,
   collectText,
   isImageCapable,
   isFullTurnVisionCapable,
   getQualifiedVisionModelId,
-  getVisionModelSelector,
   getFullTurnVisionModelSelector,
   selectVisionBridgeModel,
   shouldRunVisionBridge,
@@ -16344,40 +16282,28 @@ export {
   runVisionBridge,
   MAIN_SOURCE,
   subagentNameContext,
+  isInternalPromptId,
   UiTelemetryService,
   uiTelemetryService,
-  isInternalPromptId,
-  sanitizeHookName,
   import_lru_cache,
-  QwenLogger,
   apiActivityTracker,
   _recoverObjectsFromLine,
   parseLineTolerant,
   readLines,
   read,
-  _resetEnsuredDirsCacheForTest,
   writeLine,
   writeLineSync,
-  write,
-  countLines,
   exists,
-  getTokenUsageFilePath,
-  apiResponseEventToTokenUsageRecord,
-  recordTokenUsageFromApiResponse,
-  recordTokenUsageFromApiResponseBestEffort,
   queryTokenUsage,
   formatTokenUsageSummaryAsCsv,
   formatTokenUsageSummaryAsJson,
-  exportTokenUsageSummary,
   runWithChatRecordingSuppressed,
   logStartSession,
   logUserPrompt,
   logUserRetry,
   logToolCall,
-  logToolOutputTruncated,
   logFileOperation,
   logApiRequest,
-  logFlashFallback,
   logRipgrepFallback,
   logApiError,
   logApiCancel,
@@ -16417,31 +16343,16 @@ export {
   logMemoryDream,
   logMemoryRecall,
   logMemoryRecallDelivery,
-  iconvEncode,
-  iconvEncodingExists,
   isUtf8CompatibleEncoding,
-  DEFAULT_CONTEXT_FILENAME,
-  AGENT_CONTEXT_FILENAME,
+  loadIconvLite,
   LOCAL_CONTEXT_FILENAME,
   MEMORY_SECTION_HEADER,
   setGeminiMdFilename,
   getCurrentGeminiMdFilename,
   getAllGeminiMdFilenames,
-  COMMON_IGNORE_PATTERNS,
-  BINARY_FILE_PATTERNS,
-  MEDIA_FILE_PATTERNS,
-  COMMON_DIRECTORY_EXCLUDES,
-  PYTHON_EXCLUDES,
-  SYSTEM_FILE_EXCLUDES,
-  DEFAULT_FILE_EXCLUDES,
   FileExclusions,
-  extractExtensionsFromPatterns,
-  BINARY_EXTENSIONS,
-  resetEncodingCache,
   getCachedEncodingForBuffer,
   getSystemEncoding,
-  windowsCodePageToEncoding,
-  detectEncodingFromBuffer,
   extractPDFText,
   normalizeSource,
   parseNotebook,
@@ -16456,24 +16367,17 @@ export {
   inferInsertedCellSourceArrayStyle,
   toNotebookSource,
   normalizeEditedCell,
-  DEFAULT_ENCODING,
-  detectBOM,
-  decodeBufferWithEncodingInfo,
-  readFileWithEncodingInfo,
-  readFileWithEncoding,
-  countFileLines,
+  decodeBufferWithEncodingInfoAsync,
   readFileWithLineAndLimit,
-  detectFileEncoding,
   getSpecificMimeType,
   isWithinRoot,
-  isBinaryFile,
-  detectFileType,
   isCacheableReadResult,
   processSingleFileContent,
   fileExists,
   getLanguageFromFilePath,
   memoryAge,
   memoryFreshnessText,
+  getFileReadDefaultPermission,
   ReadFileTool,
   MAX_SESSION_BYTES,
   TOOL_OUTPUT_TRUNCATED_PREFIX,
@@ -16482,7 +16386,6 @@ export {
   isAlreadyTruncated,
   normalizeToolResultCallId,
   persistAndTruncateToolResult,
-  MCPServerStatus,
   addMCPStatusChangeListener,
   removeMCPStatusChangeListener,
   updateMCPServerStatus,
@@ -16496,9 +16399,7 @@ export {
   runWithInvocationContext,
   getInvocationContext,
   DiscoveredMCPTool,
-  generateValidName,
   StartSessionEvent,
-  EndSessionEvent,
   UserPromptEvent,
   UserRetryEvent,
   ToolCallEvent,
@@ -16506,16 +16407,12 @@ export {
   ApiErrorEvent,
   ApiCancelEvent,
   ApiResponseEvent,
-  FlashFallbackEvent,
   RipgrepFallbackEvent,
-  LoopType,
   LoopDetectedEvent,
   LoopDetectionDisabledEvent,
   NextSpeakerCheckEvent,
   makeSlashCommandEvent,
-  SlashCommandStatus,
   makeChatCompressionEvent,
-  IdeConnectionType,
   IdeConnectionEvent,
   ConversationFinishedEvent,
   KittySequenceOverflowEvent,
@@ -16525,7 +16422,6 @@ export {
   ApiRetryEvent,
   ContentRetryFailureEvent,
   ExtensionInstallEvent,
-  ToolOutputTruncatedEvent,
   ExtensionUninstallEvent,
   ExtensionUpdateEvent,
   ExtensionEnableEvent,
@@ -16534,7 +16430,6 @@ export {
   AuthEvent,
   HookCallEvent,
   SkillLaunchEvent,
-  UserFeedbackRating,
   UserFeedbackEvent,
   makeArenaSessionStartedEvent,
   makeArenaAgentCompletedEvent,
@@ -16551,17 +16446,17 @@ export {
 };
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2026 Qwen Team
  * SPDX-License-Identifier: Apache-2.0
  */
 /**
  * @license
- * Copyright 2025 Qwen Team
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 /**
  * @license
- * Copyright 2026 Qwen Team
+ * Copyright 2025 Qwen Team
  * SPDX-License-Identifier: Apache-2.0
  */
 /**