@qwen-code/qwen-code 0.19.6 → 0.19.7

package/chunks/{chunk-UNXGEDX2.js → chunk-PUQLHSQ2.js}

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

package/chunks/{chunk-5WQF27GW.js → chunk-Q6OEPOOC.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   BaseJsonOutputAdapter
-} from "./chunk-WXUDZHOJ.js";
+} from "./chunk-YDSYD7UI.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";

package/chunks/{chunk-6QVRLKTZ.js → chunk-QAKFYMJI.js}

@@ -5,10 +5,10 @@ import {
 } from "./chunk-Y6Z2O3WR.js";
 import {
   resolveBundleDir
-} from "./chunk-AGZF43UV.js";
+} from "./chunk-YEGT55NW.js";
 import {
   Storage
-} from "./chunk-AVQDCKNF.js";
+} from "./chunk-22MNNNXE.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";
@@ -160,13 +160,13 @@ init_esbuild_shims();
 var globImport_locales_js = __glob({
   "./locales/ca.js": () => import("./ca-HCMB2I54.js"),
   "./locales/de.js": () => import("./de-PLLFDERI.js"),
-  "./locales/en.js": () => import("./en-XR3S5VWY.js"),
-  "./locales/fr.js": () => import("./fr-MBMNQSQ6.js"),
-  "./locales/ja.js": () => import("./ja-HFV5QCHR.js"),
+  "./locales/en.js": () => import("./en-GA2RMXY5.js"),
+  "./locales/fr.js": () => import("./fr-GWNQG4XH.js"),
+  "./locales/ja.js": () => import("./ja-2HOTA47X.js"),
   "./locales/pt.js": () => import("./pt-2THT3YHA.js"),
   "./locales/ru.js": () => import("./ru-Z67YJHBG.js"),
-  "./locales/zh-TW.js": () => import("./zh-TW-66MG4LWL.js"),
-  "./locales/zh.js": () => import("./zh-FSVJTXA4.js")
+  "./locales/zh-TW.js": () => import("./zh-TW-DPH554OG.js"),
+  "./locales/zh.js": () => import("./zh-7XVVRTDH.js")
 });
 
 // packages/cli/src/i18n/index.ts

package/chunks/{chunk-NPQWQYU6.js → chunk-QYNNN7BK.js}

@@ -2,7 +2,7 @@
 "use strict";
 import {
   createDebugLogger
-} from "./chunk-AVQDCKNF.js";
+} from "./chunk-22MNNNXE.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";

package/chunks/{chunk-2INJBYLJ.js → chunk-QZF5U5KA.js}

@@ -2,13 +2,13 @@
 "use strict";
 import {
   loadSettings
-} from "./chunk-CEYA7K7C.js";
+} from "./chunk-STAZRKOT.js";
 import {
   getCurrentLanguage
-} from "./chunk-6QVRLKTZ.js";
+} from "./chunk-QAKFYMJI.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-V6NH3CUC.js";
+} from "./chunk-MIG5SQNL.js";
 import {
   writeStderrLine,
   writeStdoutLine
@@ -26,14 +26,14 @@ import {
   hashMcpServerConfig,
   isGatedMcpScope,
   normalizeClaudeMcpServer
-} from "./chunk-AGZF43UV.js";
+} from "./chunk-YEGT55NW.js";
 import {
   atomicWriteFile
-} from "./chunk-T42ACHFI.js";
+} from "./chunk-7LTB54MK.js";
 import {
   Storage,
   getErrorMessage
-} from "./chunk-AVQDCKNF.js";
+} from "./chunk-22MNNNXE.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";

package/chunks/{chunk-N4YJQTRL.js → chunk-RFIL6REB.js}

@@ -11,10 +11,10 @@ import {
 } from "./chunk-7RYW5LQV.js";
 import {
   CLIENT_MCP_OVER_WS_CONFIG_FLAG
-} from "./chunk-EWALXUAD.js";
+} from "./chunk-AGHU5VRK.js";
 import {
   MAX_WORKSPACE_PATH_LENGTH
-} from "./chunk-SEZC2725.js";
+} from "./chunk-ER3BKOLB.js";
 import {
   writeStderrLine
 } from "./chunk-Y6Z2O3WR.js";
@@ -16111,6 +16111,31 @@ function createBridgeFileSystemAdapter(factory) {
 }
 __name(createBridgeFileSystemAdapter, "createBridgeFileSystemAdapter");
 
+// packages/cli/src/serve/fs/path-mutex-registry.ts
+init_esbuild_shims();
+var PathMutexRegistry = class {
+  static {
+    __name(this, "PathMutexRegistry");
+  }
+  tails = /* @__PURE__ */ new Map();
+  async runExclusive(key, fn) {
+    const previous = this.tails.get(key) ?? Promise.resolve();
+    let release;
+    const current = new Promise((resolve) => {
+      release = resolve;
+    });
+    const tail = previous.catch(() => void 0).then(() => current);
+    this.tails.set(key, tail);
+    await previous.catch(() => void 0);
+    try {
+      return await fn();
+    } finally {
+      release();
+      if (this.tails.get(key) === tail) this.tails.delete(key);
+    }
+  }
+};
+
 // packages/cli/src/serve/web-shell-resolver.ts
 init_esbuild_shims();
 import { existsSync } from "node:fs";
@@ -16478,6 +16503,8 @@ var SERVE_CAPABILITY_REGISTRY = {
   session_close: { since: "v1" },
   session_archive: { since: "v1" },
   session_metadata: { since: "v1" },
+  session_organization: { since: "v1" },
+  session_export: { since: "v1" },
   // Daemon supports the MCP client guardrail surface: an in-process
   // counter exposed on `GET /workspace/mcp`, a `--mcp-client-budget=N`
   // flag with `--mcp-budget-mode={enforce, warn, off}`, and a
@@ -17203,8 +17230,19 @@ function parseDaemonStatusDetail(raw) {
 __name(parseDaemonStatusDetail, "parseDaemonStatusDetail");
 async function buildDaemonStatusResponse(detail, input) {
   const bridgeSnapshot = input.bridge.getDaemonStatusSnapshot();
+  const lastActivity = input.bridge.lastActivityAt ?? null;
   const acpSnapshot = input.acpHandle?.registry.getSnapshot();
   const rateLimitHits = input.rateLimiter?.getHitCounts() ?? zeroRateHits();
+  let pendingPrompts = 0;
+  let derivedQueuedPrompts = 0;
+  for (const session of bridgeSnapshot.sessions) {
+    pendingPrompts += session.pendingPromptCount;
+    derivedQueuedPrompts += Math.max(
+      0,
+      session.pendingPromptCount - (session.hasActivePrompt ? 1 : 0)
+    );
+  }
+  const queuedPrompts = input.bridge.pendingPromptTotal ?? derivedQueuedPrompts;
   const channelWorker = input.getChannelWorkerSnapshot?.() ?? {
     enabled: false,
     state: "disabled",
@@ -17288,6 +17326,14 @@ async function buildDaemonStatusResponse(detail, input) {
         rejectedSinceStart: rateLimitHits
       },
       ...input.getPerfSnapshot ? { perf: input.getPerfSnapshot() } : {},
+      ...input.getMetricsSeries ? { metrics: { series: input.getMetricsSeries() } } : {},
+      activity: {
+        activePrompts: input.bridge.activePromptCount ?? 0,
+        pendingPrompts,
+        queuedPrompts,
+        lastActivityAt: lastActivity !== null ? new Date(lastActivity).toISOString() : null,
+        idleSinceMs: lastActivity !== null ? Date.now() - lastActivity : null
+      },
       process: process.memoryUsage()
     },
     ...full ? { full } : {}
@@ -17551,9 +17597,31 @@ function summarizeStatusData(data) {
       summary[`${key}Count`] = value.length;
     }
   }
+  summarizeMcpServers(data, summary);
   return summary;
 }
 __name(summarizeStatusData, "summarizeStatusData");
+function summarizeMcpServers(data, summary) {
+  const servers = data["servers"];
+  if (!Array.isArray(servers)) return;
+  let connected = 0;
+  let errored = 0;
+  let disabled = 0;
+  for (const server of servers) {
+    if (!isRecord(server)) continue;
+    if (server["disabled"] === true) {
+      disabled++;
+    } else if (server["status"] === "error") {
+      errored++;
+    } else if (server["mcpStatus"] === "connected") {
+      connected++;
+    }
+  }
+  summary["serversConnected"] = connected;
+  summary["serversErrored"] = errored;
+  summary["serversDisabled"] = disabled;
+}
+__name(summarizeMcpServers, "summarizeMcpServers");
 function collectStatuses(data) {
   const statuses = [];
   visitStatusContainers(data, (record) => {
@@ -17687,6 +17755,7 @@ export {
   getDeviceFlowRegistry,
   DeviceFlowRegistry,
   createBridgeFileSystemAdapter,
+  PathMutexRegistry,
   resolveWebShellDir,
   denyBrowserOriginCors,
   parseAllowOriginPatterns,

package/chunks/{chunk-FZ5NVRVK.js → chunk-RYFZCUJO.js}

@@ -5,14 +5,14 @@ import {
   isTranscribableVoiceModel,
   readVoiceLanguage,
   resolveVoiceTransport
-} from "./chunk-HCFSKO6K.js";
+} from "./chunk-ADZG46HR.js";
 import {
   resolvePath
-} from "./chunk-NIOPRZNN.js";
+} from "./chunk-E7KNELIZ.js";
 import {
   createDebugLogger,
   isSubpath
-} from "./chunk-AVQDCKNF.js";
+} from "./chunk-22MNNNXE.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";

package/chunks/{chunk-KSPVDFE4.js → chunk-SAIILPQ3.js}

@@ -26,9 +26,6 @@ function isTerminalGoalStatusKind(kind) {
 }
 __name(isTerminalGoalStatusKind, "isTerminalGoalStatusKind");
 
-// packages/cli/src/ui/commands/types.ts
-init_esbuild_shims();
-
 export {
   isTerminalGoalStatusKind
 };