@qwen-code/qwen-code 0.19.3 → 0.19.4

package/chunks/{chunk-NDOC6M5S.js → chunk-L7QPM2YD.js}

@@ -2,13 +2,13 @@
 "use strict";
 import {
   require_undici
-} from "./chunk-M2U5NM24.js";
+} from "./chunk-54YZOP7P.js";
 import {
   writeStderrLine
 } from "./chunk-Y6Z2O3WR.js";
 import {
   createDebugLogger
-} from "./chunk-UX4SGCGN.js";
+} from "./chunk-AVQDCKNF.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";

package/chunks/{chunk-SLNKLLEO.js → chunk-L7VH7HQA.js}

@@ -6,20 +6,20 @@ import {
   parseAcpBaseModelId,
   resolveCliGenerationConfig,
   sanitizeProviderBaseUrl
-} from "./chunk-UYT3MWEB.js";
-import {
-  loadSettings
-} from "./chunk-FKAVULLM.js";
+} from "./chunk-BQNJBEUA.js";
 import {
   STATUS_SCHEMA_VERSION
-} from "./chunk-L7OKCI7T.js";
+} from "./chunk-GICCHL2Q.js";
+import {
+  loadSettings
+} from "./chunk-MKHC4BYZ.js";
 import {
   ModelsConfig,
   resolveProviderProtocol
-} from "./chunk-YAINVQ3Q.js";
+} from "./chunk-BFG6OZN7.js";
 import {
   tokenLimit
-} from "./chunk-U3KSMM7G.js";
+} from "./chunk-YTFBURQD.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";
@@ -70,7 +70,7 @@ function buildWorkspaceProvidersStatus(workspaceCwd, acpChannelLive, options) {
       settings.modelProviders,
       settings.providerProtocol
     );
-    for (const model of modelsConfig.getAllConfiguredModels()) {
+    for (const model of modelsConfig.getAllConfiguredModels().filter(isMainSelectableModel)) {
       if (model.isRuntimeModel) continue;
       const authType = String(model.authType);
       let provider = providers.get(authType);
@@ -149,6 +149,10 @@ function buildWorkspaceProvidersStatus(workspaceCwd, acpChannelLive, options) {
   }
 }
 __name(buildWorkspaceProvidersStatus, "buildWorkspaceProvidersStatus");
+function isMainSelectableModel(model) {
+  return model.fastOnly !== true && model.voiceOnly !== true;
+}
+__name(isMainSelectableModel, "isMainSelectableModel");
 function matchesCurrentModel(currentModelId, baseModelId, acpModelId) {
   return currentModelId === baseModelId || currentModelId === acpModelId;
 }

package/chunks/{chunk-BVSVIN45.js → chunk-LKWAVAB5.js}

@@ -7,14 +7,14 @@ import {
   TEAMMATE_COLORS,
   TEAMS_DIR,
   TEAM_CONFIG_FILENAME
-} from "./chunk-LD2XBG6Z.js";
+} from "./chunk-E5A7LHNN.js";
 import {
   atomicWriteJSON
-} from "./chunk-3227DZO4.js";
+} from "./chunk-T42ACHFI.js";
 import {
   Storage,
   isNodeError
-} from "./chunk-UX4SGCGN.js";
+} from "./chunk-AVQDCKNF.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";

package/chunks/{chunk-ZP6UKOPB.js → chunk-LWGLBVWA.js}

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

package/chunks/{chunk-SBBN4BWR.js → chunk-MEQWZGK5.js}

@@ -5,7 +5,7 @@ import {
 } from "./chunk-OFEVLU4C.js";
 import {
   SchemaValidator
-} from "./chunk-BX5YO7UW.js";
+} from "./chunk-4VZH35PN.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";

package/chunks/{chunk-FKAVULLM.js → chunk-MKHC4BYZ.js}

@@ -6,7 +6,7 @@ import {
   getLanguageNameFromLocale,
   getLanguageSettingsOptions,
   t
-} from "./chunk-R5OP2ATH.js";
+} from "./chunk-UQYOMM6J.js";
 import {
   DEFAULT_DARK_THEME_NAME,
   DEFAULT_LIGHT_THEME_NAME
@@ -25,11 +25,11 @@ import {
   getSystemDefaultsPath,
   getSystemSettingsPath,
   resolveEnvVarsInObject
-} from "./chunk-CF6BB3LT.js";
+} from "./chunk-PPFWEV7G.js";
 import {
   isWorkspaceTrusted,
   updateSettingsFilePreservingFormat
-} from "./chunk-F3ZYSEY6.js";
+} from "./chunk-ZJP5T7IA.js";
 import {
   require_strip_json_comments
 } from "./chunk-QYUE6W3T.js";
@@ -40,24 +40,24 @@ import {
   DEFAULT_TRUNCATE_TOOL_OUTPUT_LINES,
   DEFAULT_TRUNCATE_TOOL_OUTPUT_THRESHOLD,
   stripRuntimeSnapshotPrefix
-} from "./chunk-YAINVQ3Q.js";
+} from "./chunk-BFG6OZN7.js";
 import {
   require_main
 } from "./chunk-SKAZWEV5.js";
 import {
   DEFAULT_QWEN_CUSTOM_IGNORE_FILE_NAMES
-} from "./chunk-JOLIREYR.js";
+} from "./chunk-TOAUDIS7.js";
 import {
   DEFAULT_SENSITIVE_SPAN_ATTRIBUTE_MAX_LENGTH,
   SENSITIVE_SPAN_ATTRIBUTE_MAX_LENGTH_LIMIT
-} from "./chunk-QNKBEJO2.js";
+} from "./chunk-HJDF3ZVU.js";
 import {
   FatalConfigError,
   QWEN_DIR,
   Storage,
   createDebugLogger,
   getErrorMessage
-} from "./chunk-UX4SGCGN.js";
+} from "./chunk-AVQDCKNF.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";
@@ -689,6 +689,15 @@ var SETTINGS_SCHEMA = {
             default: false,
             description: "Whether to collapse history by default when resuming a session.",
             showInDialog: false
+          },
+          collapsePreviewCount: {
+            type: "number",
+            label: "Collapse Preview Count",
+            category: "UI",
+            requiresRestart: false,
+            default: 0,
+            description: "Number of most recent user turns to keep visible when collapsing history on resume. 0 collapses all restored history by default; -1 shows all restored history.",
+            showInDialog: false
           }
         }
       },
@@ -848,7 +857,7 @@ var SETTINGS_SCHEMA = {
         category: "UI",
         requiresRestart: false,
         default: false,
-        description: "Render conversation history in an in-app scrollable viewport instead of the terminal scrollback buffer. Recommended if you see flicker, scroll-storm, or interface freeze on long sessions, after Ctrl+O, after Ctrl+E / Ctrl+F (expand), after window resize, or when alt-tabbing back. Scroll with Shift+\u2191/\u2193 (line), PgUp/PgDn (page), Ctrl+Home/End (top/bottom), or the mouse wheel. Does NOT use the host terminal scrollback while enabled; for native text selection, hold Shift (or Option on macOS) while dragging.",
+        description: "Render conversation history in an in-app scrollable viewport instead of the terminal scrollback buffer. Recommended if you see flicker, scroll-storm, or interface freeze on long sessions, after Ctrl+O, after Ctrl+E / Ctrl+F (expand), after window resize, or when alt-tabbing back. Scroll with Shift+\u2191/\u2193 (line), PgUp/PgDn (page), Ctrl+Home/End (top/bottom), or the mouse wheel. Also enables mouse interactions: click an option in a menu/dialog to select it, hover to highlight it, and click in the prompt to position the cursor. Does NOT use the host terminal scrollback while enabled; for native text selection, hold Shift (or Option on macOS) while dragging.",
         showInDialog: true
       },
       shellOutputMaxLines: {
@@ -1472,6 +1481,20 @@ var SETTINGS_SCHEMA = {
             showInDialog: true
           }
         }
+      },
+      autoCompactThreshold: {
+        type: "number",
+        label: "Auto-Compact Threshold",
+        category: "Context",
+        requiresRestart: false,
+        default: void 0,
+        description: "Fraction of context window at which auto-compaction triggers (greater than 0, up to 1). Default is 0.7 (70%).",
+        showInDialog: false,
+        jsonSchemaOverride: {
+          type: "number",
+          minimum: 0.01,
+          maximum: 1
+        }
       }
     }
   },
@@ -1750,6 +1773,15 @@ var SETTINGS_SCHEMA = {
             description: "Environment / context lines injected into the classifier system prompt.",
             showInDialog: false,
             mergeStrategy: "union" /* UNION */
+          },
+          classifyAllShell: {
+            type: "boolean",
+            label: "Classify All Shell Commands",
+            category: "Tools",
+            requiresRestart: true,
+            default: false,
+            description: "Route ALL shell commands through the auto-mode classifier, including read-only commands that would otherwise be auto-approved. Provides defense-in-depth for production environments.",
+            showInDialog: false
           }
         }
       }
@@ -2085,7 +2117,7 @@ var SETTINGS_SCHEMA = {
         // restart-required.
         requiresRestart: false,
         default: void 0,
-        description: "A list of MCP servers to allow.",
+        description: 'A list of MCP servers to allow. Supports glob patterns (e.g. "*puppeteer*").',
         showInDialog: false,
         mergeStrategy: "concat" /* CONCAT */
       },
@@ -2098,9 +2130,20 @@ var SETTINGS_SCHEMA = {
         // restart-required.
         requiresRestart: false,
         default: void 0,
-        description: "A list of MCP servers to exclude.",
+        description: 'A list of MCP servers to exclude. Supports glob patterns (e.g. "*puppeteer*"). Takes precedence over mcp.allowed.',
         showInDialog: false,
         mergeStrategy: "concat" /* CONCAT */
+      },
+      toolIdleTimeoutMs: {
+        type: "number",
+        label: "MCP Tool Idle Timeout (ms)",
+        category: "MCP",
+        requiresRestart: false,
+        default: 3e5,
+        minimum: 1e4,
+        maximum: 36e5,
+        description: "Idle timeout in milliseconds for MCP tool calls. If the MCP server does not produce any response or progress update within this time, the call is aborted. Default: 300000 (5 minutes). Can be overridden via QWEN_CODE_MCP_TOOL_IDLE_TIMEOUT_MS environment variable.",
+        showInDialog: false
       }
     }
   },
@@ -2955,6 +2998,10 @@ function getEffectiveValue(key, settings, mergedSettings) {
   return definition.default;
 }
 __name(getEffectiveValue, "getEffectiveValue");
+function getAllSettingKeys() {
+  return Object.keys(getFlattenedSchema());
+}
+__name(getAllSettingKeys, "getAllSettingKeys");
 var SETTINGS_DIALOG_ORDER = [
   // Workflow Control - most impactful setting
   "tools.approvalMode",
@@ -4859,6 +4906,7 @@ export {
   getNestedValue,
   getNestedProperty,
   getEffectiveValue,
+  getAllSettingKeys,
   validateSettingValue,
   getDialogSettingKeys,
   settingExistsInScope,

package/chunks/{chunk-UFLGERMB.js → chunk-MNDTD5E5.js}

@@ -1,27 +1,28 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
-  Colors
-} from "./chunk-5GOVVXEV.js";
+  Colors,
+  RowMouseController
+} from "./chunk-CG7SVARK.js";
 import {
   theme
-} from "./chunk-SMXULRAN.js";
+} from "./chunk-VXGPYF7U.js";
 import {
   Box_default,
   Text,
   require_jsx_runtime
-} from "./chunk-T4T2FNV4.js";
+} from "./chunk-2X2JUE47.js";
 import {
   require_react
 } from "./chunk-KYMBIKIW.js";
 import {
   t
-} from "./chunk-R5OP2ATH.js";
+} from "./chunk-UQYOMM6J.js";
 import {
   readManyFiles,
   shouldRunVisionBridge,
   stripTerminalControlSequences
-} from "./chunk-YAINVQ3Q.js";
+} from "./chunk-BFG6OZN7.js";
 import {
   emptyMcpResourceText,
   formatMcpResourceContents,
@@ -33,7 +34,7 @@ import {
   isNodeError,
   isSubpath,
   unescapePath
-} from "./chunk-UX4SGCGN.js";
+} from "./chunk-AVQDCKNF.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";
@@ -44,7 +45,7 @@ import {
 
 // packages/cli/src/ui/hooks/atCommandProcessor.ts
 init_esbuild_shims();
-import * as fs from "node:fs/promises";
+import * as fs2 from "node:fs/promises";
 import * as path from "node:path";
 
 // packages/cli/src/ui/hooks/mcpResourceRef.ts
@@ -70,6 +71,7 @@ init_esbuild_shims();
 
 // packages/cli/src/ui/components/SuggestionsDisplay.tsx
 init_esbuild_shims();
+var import_react2 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/PrepareLabel.tsx
 init_esbuild_shims();
@@ -158,8 +160,13 @@ function SuggestionsDisplay({
   scrollOffset,
   userInput,
   mode,
-  expandedIndex
+  expandedIndex,
+  onHoverIndex,
+  onSelectIndex,
+  mouseEnabled
 }) {
+  const containerRef = (0, import_react2.useRef)(null);
+  const itemRefs = (0, import_react2.useRef)([]);
   if (isLoading) {
     return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Box_default, { width, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: "gray", children: t("Loading suggestions...") }) });
   }
@@ -182,7 +189,17 @@ function SuggestionsDisplay({
     Math.max(...describedLabelLengths),
     Math.max(contentWidth - MIN_DESCRIPTION_WIDTH - 2, 1)
   ) : 0;
-  return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Box_default, { flexDirection: "column", width, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Box_default, { flexDirection: "column", width, ref: containerRef, children: [
+    mouseEnabled && onHoverIndex && onSelectIndex && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+      RowMouseController,
+      {
+        containerRef,
+        itemRefs,
+        scrollOffset: startIndex,
+        onHoverIndex,
+        onSelectIndex
+      }
+    ),
     scrollOffset > 0 && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: theme.text.primary, children: "\u25B2" }),
     visibleSuggestions.map((suggestion, index) => {
       const originalIndex = startIndex + index;
@@ -206,37 +223,47 @@ function SuggestionsDisplay({
           isExpanded
         }
       );
-      return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Box_default, { flexDirection: "row", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Box_default, { width: ACTIVE_MARKER_WIDTH, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: textColor, children: isActive ? "> " : "  " }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-          Box_default,
-          {
-            ...mode === "slash" || suggestion.description ? { width: labelColumnWidth, flexShrink: 0 } : { flexShrink: 1 },
-            children: /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Box_default, { children: [
-              labelElement,
-              suggestion.argumentHint && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Text, { color: theme.text.secondary, children: [
-                " ",
-                suggestion.argumentHint
-              ] }),
-              suggestion.sourceBadge && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Text, { color: textColor, children: [
-                " ",
-                suggestion.sourceBadge
-              ] })
-            ] })
-          }
-        ),
-        suggestion.description && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
-          Box_default,
-          {
-            width: descriptionColumnWidth,
-            flexGrow: 1,
-            flexShrink: 1,
-            paddingLeft: 2,
-            children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: textColor, wrap: "truncate-end", children: normalizeDescription(suggestion.description) })
-          }
-        ),
-        isActive && isLong && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: Colors.Gray, children: isExpanded ? " \u2190 " : " \u2192 " }) })
-      ] }, `${suggestion.value}-${originalIndex}`);
+      return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
+        Box_default,
+        {
+          flexDirection: "row",
+          ref: (node) => {
+            itemRefs.current[index] = node;
+          },
+          children: [
+            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Box_default, { width: ACTIVE_MARKER_WIDTH, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: textColor, children: isActive ? "> " : "  " }) }),
+            /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+              Box_default,
+              {
+                ...mode === "slash" || suggestion.description ? { width: labelColumnWidth, flexShrink: 0 } : { flexShrink: 1 },
+                children: /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Box_default, { children: [
+                  labelElement,
+                  suggestion.argumentHint && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Text, { color: theme.text.secondary, children: [
+                    " ",
+                    suggestion.argumentHint
+                  ] }),
+                  suggestion.sourceBadge && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Text, { color: textColor, children: [
+                    " ",
+                    suggestion.sourceBadge
+                  ] })
+                ] })
+              }
+            ),
+            suggestion.description && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+              Box_default,
+              {
+                width: descriptionColumnWidth,
+                flexGrow: 1,
+                flexShrink: 1,
+                paddingLeft: 2,
+                children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: textColor, wrap: "truncate-end", children: normalizeDescription(suggestion.description) })
+              }
+            ),
+            isActive && isLong && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: Colors.Gray, children: isExpanded ? " \u2190 " : " \u2192 " }) })
+          ]
+        },
+        `${suggestion.value}-${originalIndex}`
+      );
     }),
     endIndex < suggestions.length && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Text, { color: "gray", children: "\u25BC" }),
     suggestions.length > MAX_SUGGESTIONS_TO_SHOW && /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(Text, { color: "gray", children: [
@@ -250,8 +277,12 @@ function SuggestionsDisplay({
 }
 __name(SuggestionsDisplay, "SuggestionsDisplay");
 
-// packages/cli/src/ui/hooks/extension-mention-ref.ts
+// packages/cli/src/utils/extension-mention.ts
+init_esbuild_shims();
+import * as fs from "node:fs/promises";
 var EXTENSION_REF_PREFIX = "ext:";
+var EXTENSION_CONTEXT_BUDGET = 2e5;
+var EXTENSION_CONTEXT_FILE_CAP = 5e4;
 function parseExtensionRef(pathName) {
   if (!pathName.startsWith(EXTENSION_REF_PREFIX)) return null;
   const name = pathName.slice(EXTENSION_REF_PREFIX.length);
@@ -276,37 +307,12 @@ function sanitizeDisplayText(raw) {
   return stripped.length > 0 ? stripped : null;
 }
 __name(sanitizeDisplayText, "sanitizeDisplayText");
-function getExtensionSuggestions(config, pattern) {
-  if (!config) return [];
-  if (config.isTrustedFolder?.() === false) return [];
-  const extensions = config.getActiveExtensions?.() ?? [];
-  if (extensions.length === 0) return [];
-  const query = pattern.toLowerCase();
-  return extensions.map((ext) => ({
-    ext,
-    safeLabel: sanitizeDisplayText(ext.displayName || ext.name) || ext.name
-  })).filter(({ safeLabel, ext }) => {
-    const label = safeLabel.toLowerCase();
-    const name = ext.name.toLowerCase();
-    return label.includes(query) || name.includes(query);
-  }).sort((a, b) => {
-    const aName = a.safeLabel.toLowerCase();
-    const bName = b.safeLabel.toLowerCase();
-    const aPrefix = aName.startsWith(query) ? 0 : 1;
-    const bPrefix = bName.startsWith(query) ? 0 : 1;
-    if (aPrefix !== bPrefix) return aPrefix - bPrefix;
-    return aName.localeCompare(bName);
-  }).slice(0, MAX_SUGGESTIONS_TO_SHOW).map(({ ext, safeLabel }) => ({
-    label: safeLabel,
-    value: buildExtensionRef(ext.name),
-    description: ext.config.description ? sanitizeDisplayText(ext.config.description) ?? void 0 : void 0,
-    sourceBadge: t("Extension"),
-    isDirectory: false
-  }));
+function getExtensionDisplayName(extension) {
+  return sanitizeDisplayText(extension.displayName || extension.name) || extension.name;
 }
-__name(getExtensionSuggestions, "getExtensionSuggestions");
+__name(getExtensionDisplayName, "getExtensionDisplayName");
 function buildExtensionContextText(extension) {
-  const displayName = sanitizeDisplayText(extension.displayName || extension.name) || extension.name;
+  const displayName = getExtensionDisplayName(extension);
   const lines = [];
   lines.push(
     `--- Extension: ${displayName} (untrusted third-party content) ---`
@@ -340,6 +346,94 @@ function buildExtensionContextText(extension) {
   return lines.join("\n");
 }
 __name(buildExtensionContextText, "buildExtensionContextText");
+async function buildExtensionMentionContext(extension, options) {
+  let contextText = buildExtensionContextText(extension);
+  let remainingBudget = options.remainingBudget;
+  if (extension.contextFiles.length === 0) {
+    return { text: contextText, remainingBudget };
+  }
+  const fileReads = await Promise.allSettled(
+    extension.contextFiles.map(async (contextFilePath) => {
+      let realPath;
+      let realExtPath;
+      try {
+        realPath = await fs.realpath(contextFilePath);
+        realExtPath = await fs.realpath(extension.path);
+      } catch {
+        options.onDebugMessage?.(
+          `Skipping unreadable context file: ${contextFilePath}`
+        );
+        return null;
+      }
+      if (!isSubpath(realExtPath, realPath)) {
+        options.onDebugMessage?.(
+          `Skipping context file outside extension directory: ${contextFilePath}`
+        );
+        return null;
+      }
+      return fs.readFile(realPath, {
+        encoding: "utf-8",
+        signal: options.signal
+      });
+    })
+  );
+  for (let i = 0; i < fileReads.length; i++) {
+    const outcome = fileReads[i];
+    if (outcome.status === "rejected") {
+      options.onDebugMessage?.(
+        `Failed to read extension context file ${extension.contextFiles[i]}: ${getErrorMessage(outcome.reason)}`
+      );
+      continue;
+    }
+    const content = outcome.value;
+    if (!content || !content.trim()) continue;
+    if (remainingBudget <= 0) {
+      options.onDebugMessage?.(
+        "Extension context budget exhausted, skipping remaining files."
+      );
+      break;
+    }
+    const cap = Math.min(EXTENSION_CONTEXT_FILE_CAP, remainingBudget);
+    const cappedContent = content.length > cap ? content.slice(0, cap) + "\n... (truncated)" : content;
+    contextText += `
+
+${cappedContent}`;
+    remainingBudget -= cappedContent.length;
+  }
+  return { text: contextText, remainingBudget };
+}
+__name(buildExtensionMentionContext, "buildExtensionMentionContext");
+
+// packages/cli/src/ui/hooks/extension-mention-ref.ts
+function getExtensionSuggestions(config, pattern) {
+  if (!config) return [];
+  if (config.isTrustedFolder?.() === false) return [];
+  const extensions = config.getActiveExtensions?.() ?? [];
+  if (extensions.length === 0) return [];
+  const query = pattern.toLowerCase();
+  return extensions.map((ext) => ({
+    ext,
+    safeLabel: sanitizeDisplayText(ext.displayName || ext.name) || ext.name
+  })).filter(({ safeLabel, ext }) => {
+    const label = safeLabel.toLowerCase();
+    const name = ext.name.toLowerCase();
+    return label.includes(query) || name.includes(query);
+  }).sort((a, b) => {
+    const aName = a.safeLabel.toLowerCase();
+    const bName = b.safeLabel.toLowerCase();
+    const aPrefix = aName.startsWith(query) ? 0 : 1;
+    const bPrefix = bName.startsWith(query) ? 0 : 1;
+    if (aPrefix !== bPrefix) return aPrefix - bPrefix;
+    return aName.localeCompare(bName);
+  }).slice(0, MAX_SUGGESTIONS_TO_SHOW).map(({ ext, safeLabel }) => ({
+    label: safeLabel,
+    value: buildExtensionRef(ext.name),
+    description: ext.config.description ? sanitizeDisplayText(ext.config.description) ?? void 0 : void 0,
+    sourceBadge: t("Extension"),
+    isDirectory: false
+  }));
+}
+__name(getExtensionSuggestions, "getExtensionSuggestions");
 
 // packages/cli/src/ui/hooks/atCommandProcessor.ts
 function parseAllAtCommands(query) {
@@ -489,7 +583,7 @@ async function resolveAtCommandQuery({
       let currentPathSpec = pathName;
       try {
         const absolutePath = path.resolve(dir, pathName);
-        const stats = await fs.stat(absolutePath);
+        const stats = await fs2.stat(absolutePath);
         if (stats.isDirectory()) {
           currentPathSpec = pathName;
           onDebugMessage(`Path ${pathName} resolved to directory.`);
@@ -615,65 +709,21 @@ ${messages.join("\n")}`;
       shouldProceed: true
     };
   }
-  const EXTENSION_CONTEXT_BUDGET = 2e5;
-  const PER_FILE_CAP = 5e4;
   let extensionContextBudgetRemaining = EXTENSION_CONTEXT_BUDGET;
   const extensionParts = [];
   const extensionDisplays = [];
   const extensionLabels = [];
   for (let i = 0; i < extensionMentions.length; i++) {
     const { extension } = extensionMentions[i];
-    const displayName = sanitizeDisplayText(extension.displayName || extension.name) || extension.name;
+    const displayName = getExtensionDisplayName(extension);
     const callId = `client-extension-${userMessageTimestamp}-${i}`;
-    let contextText = buildExtensionContextText(extension);
-    if (extension.contextFiles && extension.contextFiles.length > 0) {
-      const fileReads = await Promise.allSettled(
-        extension.contextFiles.map(async (contextFilePath) => {
-          let realPath;
-          let realExtPath;
-          try {
-            realPath = await fs.realpath(contextFilePath);
-            realExtPath = await fs.realpath(extension.path);
-          } catch {
-            onDebugMessage(
-              `Skipping unreadable context file: ${contextFilePath}`
-            );
-            return null;
-          }
-          if (!isSubpath(realExtPath, realPath)) {
-            onDebugMessage(
-              `Skipping context file outside extension directory: ${contextFilePath}`
-            );
-            return null;
-          }
-          return fs.readFile(realPath, { encoding: "utf-8", signal });
-        })
-      );
-      for (let j = 0; j < fileReads.length; j++) {
-        const outcome = fileReads[j];
-        if (outcome.status === "rejected") {
-          onDebugMessage(
-            `Failed to read extension context file ${extension.contextFiles[j]}: ${getErrorMessage(outcome.reason)}`
-          );
-          continue;
-        }
-        const content = outcome.value;
-        if (!content || !content.trim()) continue;
-        if (extensionContextBudgetRemaining <= 0) {
-          onDebugMessage(
-            `Extension context budget exhausted, skipping remaining files.`
-          );
-          break;
-        }
-        const cap = Math.min(PER_FILE_CAP, extensionContextBudgetRemaining);
-        const cappedContent = content.length > cap ? content.slice(0, cap) + "\n... (truncated)" : content;
-        contextText += `
-
-${cappedContent}`;
-        extensionContextBudgetRemaining -= cappedContent.length;
-      }
-    }
-    extensionParts.push({ text: contextText });
+    const context = await buildExtensionMentionContext(extension, {
+      remainingBudget: extensionContextBudgetRemaining,
+      signal,
+      onDebugMessage
+    });
+    extensionContextBudgetRemaining = context.remainingBudget;
+    extensionParts.push({ text: context.text });
     extensionLabels.push(buildExtensionRef(extension.name));
     extensionDisplays.push({
       callId,
@@ -797,6 +847,10 @@ export {
   MAX_WIDTH,
   MAX_SUGGESTIONS_TO_SHOW,
   SuggestionsDisplay,
+  EXTENSION_CONTEXT_BUDGET,
+  parseExtensionRef,
+  matchExtensionByRef,
+  buildExtensionMentionContext,
   getExtensionSuggestions,
   resolveAtCommandQuery,
   handleAtCommand