@qwen-code/qwen-code 0.19.11 → 0.19.12-preview.0

package/chunks/{chunk-5Z452MMD.js → chunk-LODZMRXC.js}

@@ -11,9 +11,10 @@ import {
   getCommandSourceBadge,
   getCommandSourceGroup,
   getCommandSubcommandNames,
+  parseCodeFenceInfo,
   splitMarkdownTableRow,
   useSessionStats
-} from "./chunk-BYB3GF2T.js";
+} from "./chunk-JCYMQU5F.js";
 import {
   Colors,
   RowMouseController,
@@ -23,7 +24,7 @@ import {
   useMouseEvents,
   useSettings,
   useTerminalSize
-} from "./chunk-FYQ22K62.js";
+} from "./chunk-CHVH4DVN.js";
 import {
   CompactToolGroupDisplay,
   SCREEN_READER_MODEL_PREFIX,
@@ -48,11 +49,11 @@ import {
   useKeypress,
   wrapAnsi,
   wrapForMultiplexer
-} from "./chunk-NVTQZXR7.js";
+} from "./chunk-6QGZVKOO.js";
 import {
   MINIMUM_MAX_HEIGHT,
   MaxSizedBox
-} from "./chunk-DOPUYNXO.js";
+} from "./chunk-NUHSLBJZ.js";
 import {
   Box_default,
   Static,
@@ -62,33 +63,35 @@ import {
   theme,
   use_is_screen_reader_enabled_default,
   use_stdin_default
-} from "./chunk-OWT2CAEQ.js";
-import {
-  relaunchApp
-} from "./chunk-LS56TX3M.js";
-import {
-  isTerminalGoalStatusKind
-} from "./chunk-7X7TEQNX.js";
-import {
-  require_react
-} from "./chunk-HTHUX2T5.js";
+} from "./chunk-GEHSF7MS.js";
 import {
   resolveColor,
   themeManager
-} from "./chunk-Q6TUALBE.js";
+} from "./chunk-XAAEDML2.js";
+import {
+  relaunchApp
+} from "./chunk-CMHJEUVB.js";
 import {
   cpLen,
   cpSlice,
   escapeAnsiCtrlCodes,
   getCachedStringWidth,
+  sanitizeFilenameForDisplay,
   sanitizeMultilineForDisplay,
   sanitizeSensitiveText,
   sanitizeTerminalText,
   stringWidth,
   stripUnsafeCharacters,
   toCodePoints,
+  truncateToWidth,
   wrapToVisualLines
-} from "./chunk-SUARMD4Q.js";
+} from "./chunk-J6NT5YTN.js";
+import {
+  isTerminalGoalStatusKind
+} from "./chunk-76BFY7AF.js";
+import {
+  require_react
+} from "./chunk-HTHUX2T5.js";
 import {
   formatDuration,
   formatMemoryUsage,
@@ -101,18 +104,18 @@ import {
 } from "./chunk-57OAHC2Y.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-SQ5BK3GO.js";
+} from "./chunk-DYUPBU7H.js";
 import {
   getPersistScopeForModelSelection
-} from "./chunk-GNBBAQ6J.js";
+} from "./chunk-ILQ42UG6.js";
 import {
   getCurrentLanguage,
   localizeToolDisplayName,
   t
-} from "./chunk-4AGTGMCQ.js";
+} from "./chunk-3PE7OY2G.js";
 import {
   isWorkspaceTrusted
-} from "./chunk-2OG646IN.js";
+} from "./chunk-XFJU7SVP.js";
 import {
   ALL_PROVIDERS,
   IdeClient,
@@ -132,7 +135,7 @@ import {
   resolveBaseUrl,
   resolveMetadataKey,
   resolveOwnsModel
-} from "./chunk-NJOFRXTM.js";
+} from "./chunk-6TDA4EVC.js";
 import {
   stripAnsi
 } from "./chunk-T4TZQJ7W.js";
@@ -141,17 +144,17 @@ import {
   formatVisionBridgeNoticeDisplay,
   getMCPServerStatus,
   isVisionBridgeNoticeDisplay
-} from "./chunk-MQOVXZAF.js";
+} from "./chunk-YN2I5I42.js";
 import {
   ToolDisplayNames,
   ToolNames,
   ToolNamesMigration
-} from "./chunk-JGUT3LWZ.js";
+} from "./chunk-ANRANWVE.js";
 import {
   createDebugLogger,
   escapePath,
   unescapePath
-} from "./chunk-7NFB7LBQ.js";
+} from "./chunk-UE5TZ55T.js";
 import {
   init_esbuild_shims
 } from "./chunk-5O2XNYP6.js";
@@ -2471,14 +2474,16 @@ function colorizeLine(line, language, theme2) {
   );
 }
 __name(colorizeLine, "colorizeLine");
-function colorizeCode(code, language, availableHeight, maxWidth, theme2, settings, tabWidth = 4) {
+function colorizeCode(code, language, availableHeight, maxWidth, options = {}) {
+  const { theme: theme2, settings, tabWidth = 4, startLineNumber = 1 } = options;
+  const firstLineNumber = Math.max(1, Math.trunc(startLineNumber));
   const codeToHighlight = code.replace(/\n$/, "").replace(/\t/g, " ".repeat(tabWidth));
   const activeTheme = theme2 || themeManager.getActiveTheme();
   const showLineNumbers = settings?.merged.ui?.showLineNumbers ?? true;
   const lowlight = ensureLowlightLoading();
   try {
     let lines = codeToHighlight.split("\n");
-    const padWidth = String(lines.length).length;
+    const padWidth = String(lines.length + firstLineNumber - 1).length;
     let hiddenLinesCount = 0;
     if (availableHeight !== void 0) {
       availableHeight = Math.max(availableHeight, MINIMUM_MAX_HEIGHT);
@@ -2503,10 +2508,9 @@ function colorizeCode(code, language, availableHeight, maxWidth, theme2, setting
             lowlight
           );
           return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { children: [
-            showLineNumbers && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: activeTheme.colors.Gray, children: `${String(index + 1 + hiddenLinesCount).padStart(
-              padWidth,
-              " "
-            )} ` }),
+            showLineNumbers && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: activeTheme.colors.Gray, children: `${String(
+              index + firstLineNumber + hiddenLinesCount
+            ).padStart(padWidth, " ")} ` }),
             /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: activeTheme.defaultColor, wrap: "wrap", children: contentToRender })
           ] }, index);
         })
@@ -2518,7 +2522,7 @@ function colorizeCode(code, language, availableHeight, maxWidth, theme2, setting
       error
     );
     const lines = codeToHighlight.split("\n");
-    const padWidth = String(lines.length).length;
+    const padWidth = String(lines.length + firstLineNumber - 1).length;
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
       MaxSizedBox,
       {
@@ -2526,7 +2530,7 @@ function colorizeCode(code, language, availableHeight, maxWidth, theme2, setting
         maxWidth,
         overflowDirection: "top",
         children: lines.map((line, index) => /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Box_default, { children: [
-          showLineNumbers && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: activeTheme.defaultColor, children: `${String(index + 1).padStart(padWidth, " ")} ` }),
+          showLineNumbers && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: activeTheme.defaultColor, children: `${String(index + firstLineNumber).padStart(padWidth, " ")} ` }),
           /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Text, { color: activeTheme.colors.Gray, children: line })
         ] }, index))
       }
@@ -3588,7 +3592,7 @@ function escapeRegExp(text) {
   return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 __name(escapeRegExp, "escapeRegExp");
-function truncateToWidth(text, width) {
+function truncateToWidth2(text, width) {
   if (width <= 0 || stringWidth(text) <= width) return text;
   let result = "";
   for (const char of text) {
@@ -3597,7 +3601,7 @@ function truncateToWidth(text, width) {
   }
   return result + "\u2026";
 }
-__name(truncateToWidth, "truncateToWidth");
+__name(truncateToWidth2, "truncateToWidth");
 function center(text, width) {
   const padding = Math.max(0, width - stringWidth(text));
   const left = Math.floor(padding / 2);
@@ -3647,7 +3651,7 @@ function previewSourceFallback(source, contentWidth, type, warning) {
   const sourceLines = allSourceLines.slice(0, MAX_SOURCE_FALLBACK_LINES);
   const truncated = allSourceLines.length > sourceLines.length;
   const lines = ["```mermaid", ...sourceLines, "```"].map(
-    (line) => truncateToWidth(line, contentWidth)
+    (line) => truncateToWidth2(line, contentWidth)
   );
   return {
     title: `Mermaid source (${type})`,
@@ -3790,7 +3794,7 @@ function normalizeFlowNodeLabels(edges) {
 __name(normalizeFlowNodeLabels, "normalizeFlowNodeLabels");
 function boxNode(node, width) {
   const labels = nodeLabelLines(node.label).map(
-    (line) => truncateToWidth(line, Math.max(3, width - 4))
+    (line) => truncateToWidth2(line, Math.max(3, width - 4))
   );
   const innerWidth = Math.max(4, ...labels.map((label) => stringWidth(label)));
   if (node.shape === "diamond") {
@@ -4066,7 +4070,7 @@ function drawForwardVerticalEdge(canvas, from, to, label) {
         canvas,
         Math.min(canvas[midY].length - 1, from.centerX + 2),
         midY,
-        truncateToWidth(label, 14)
+        truncateToWidth2(label, 14)
       );
     }
     return;
@@ -4082,7 +4086,7 @@ function drawForwardVerticalEdge(canvas, from, to, label) {
   putChar(canvas, to.centerX, bendY, targetIsRight ? "\u2510" : "\u250C", true);
   putChar(canvas, to.centerX, endY, "\u25BC");
   if (label) {
-    const text = truncateToWidth(label, 14);
+    const text = truncateToWidth2(label, 14);
     const labelX = Math.abs(to.centerX - from.centerX) > stringWidth(text) + 2 ? Math.min(from.centerX, to.centerX) + Math.floor(
       (Math.abs(to.centerX - from.centerX) - stringWidth(text)) / 2
     ) : Math.min(canvas[bendY].length - stringWidth(text), from.centerX + 2);
@@ -4121,7 +4125,7 @@ function drawVerticalFork(canvas, from, targets) {
     putChar(canvas, target.to.centerX, forkY, targetJunction, true);
     putChar(canvas, target.to.centerX, endY, "\u25BC");
     if (target.edge.label) {
-      const label = `[${truncateToWidth(target.edge.label, 10)}]`;
+      const label = `[${truncateToWidth2(target.edge.label, 10)}]`;
       const x = Math.max(
         0,
         Math.min(
@@ -4156,7 +4160,7 @@ function drawHorizontalEdge(canvas, from, to, label) {
     drawHorizontal(canvas, from.centerY, fromX, toX);
     putChar(canvas, toX, to.centerY, forward ? "\u25B6" : "\u25C0");
     if (label) {
-      const text = truncateToWidth(label, 12);
+      const text = truncateToWidth2(label, 12);
       putText(
         canvas,
         Math.max(0, midX - Math.floor(stringWidth(text) / 2)),
@@ -4171,7 +4175,7 @@ function drawHorizontalEdge(canvas, from, to, label) {
   drawHorizontal(canvas, to.centerY, midX, toX);
   putChar(canvas, toX, to.centerY, forward ? "\u25B6" : "\u25C0");
   if (label) {
-    const text = truncateToWidth(label, 12);
+    const text = truncateToWidth2(label, 12);
     putText(
       canvas,
       Math.max(0, midX - Math.floor(stringWidth(text) / 2)),
@@ -4182,7 +4186,7 @@ function drawHorizontalEdge(canvas, from, to, label) {
 }
 __name(drawHorizontalEdge, "drawHorizontalEdge");
 function canvasToLines(canvas, contentWidth) {
-  return canvas.map((row) => truncateToWidth(row.join("").trimEnd(), contentWidth)).filter(
+  return canvas.map((row) => truncateToWidth2(row.join("").trimEnd(), contentWidth)).filter(
     (line, index, lines) => line.length > 0 || index < lines.length - 1
   );
 }
@@ -4236,7 +4240,7 @@ function renderLayeredFlowchart(edges, contentWidth, horizontal) {
     lines.push("");
     lines.push("Cycles:");
     for (const note of loopNotes) {
-      lines.push(truncateToWidth(`  ${note}`, contentWidth));
+      lines.push(truncateToWidth2(`  ${note}`, contentWidth));
     }
   }
   return lines;
@@ -4328,7 +4332,7 @@ function renderSequence(source, contentWidth) {
       continue;
     }
     messages.push(
-      truncateToWidth(
+      truncateToWidth2(
         `${participants.get(from) ?? from} ${arrow} ${participants.get(to) ?? to}: ${message}`,
         contentWidth
       )
@@ -4343,7 +4347,7 @@ function renderSequence(source, contentWidth) {
       "Sequence preview supports A->>B: message style arrows; showing source instead."
     );
   }
-  const lines = [truncateToWidth(header, contentWidth), ""];
+  const lines = [truncateToWidth2(header, contentWidth), ""];
   lines.push(...messages);
   return {
     title: "Mermaid sequence diagram",
@@ -4383,7 +4387,7 @@ function renderClassDiagram(source, contentWidth) {
       classes.add(from);
       classes.add(to);
       relationships.push(
-        truncateToWidth(
+        truncateToWidth2(
           `${from} ${relation} ${to}${label ? `: ${label}` : ""}`,
           contentWidth
         )
@@ -4394,7 +4398,7 @@ function renderClassDiagram(source, contentWidth) {
     if (inlineMemberMatch) {
       classes.add(inlineMemberMatch[1]);
       members.push(
-        truncateToWidth(
+        truncateToWidth2(
           `${inlineMemberMatch[1]}: ${stripMermaidPunctuation(inlineMemberMatch[2])}`,
           contentWidth
         )
@@ -4403,7 +4407,7 @@ function renderClassDiagram(source, contentWidth) {
     }
     if (currentClass) {
       members.push(
-        truncateToWidth(
+        truncateToWidth2(
           `${currentClass}: ${stripMermaidPunctuation(line)}`,
           contentWidth
         )
@@ -4419,7 +4423,7 @@ function renderClassDiagram(source, contentWidth) {
     );
   }
   const output = [
-    truncateToWidth(
+    truncateToWidth2(
       `Classes: ${Array.from(classes).join(" | ") || "not declared"}`,
       contentWidth
     ),
@@ -4445,7 +4449,7 @@ function renderStateDiagram(source, contentWidth) {
       const to = stripMermaidPunctuation(transitionMatch[2]);
       const label = stripMermaidPunctuation(transitionMatch[3] ?? "");
       transitions.push(
-        truncateToWidth(
+        truncateToWidth2(
           `${from} \u2192 ${to}${label ? `: ${label}` : ""}`,
           contentWidth
         )
@@ -4455,7 +4459,7 @@ function renderStateDiagram(source, contentWidth) {
     const stateMatch = /^state\s+(.+?)(?:\s+as\s+(.+))?$/i.exec(line);
     if (stateMatch) {
       declarations.push(
-        truncateToWidth(
+        truncateToWidth2(
           stripMermaidPunctuation(stateMatch[2] ?? stateMatch[1]),
           contentWidth
         )
@@ -4505,7 +4509,7 @@ function renderErDiagram(source, contentWidth) {
       entities.add(relationMatch[1]);
       entities.add(relationMatch[3]);
       relationships.push(
-        truncateToWidth(
+        truncateToWidth2(
           `${relationMatch[1]} ${relationMatch[2]} ${relationMatch[3]}${relationMatch[4] ? `: ${stripMermaidPunctuation(relationMatch[4])}` : ""}`,
           contentWidth
         )
@@ -4514,7 +4518,7 @@ function renderErDiagram(source, contentWidth) {
     }
     if (currentEntity) {
       attributes.push(
-        truncateToWidth(
+        truncateToWidth2(
           `${currentEntity}: ${stripMermaidPunctuation(line)}`,
           contentWidth
         )
@@ -4532,7 +4536,7 @@ function renderErDiagram(source, contentWidth) {
   return {
     title: "Mermaid ER diagram",
     lines: [
-      truncateToWidth(
+      truncateToWidth2(
         `Entities: ${Array.from(entities).join(" | ") || "not declared"}`,
         contentWidth
       ),
@@ -4548,7 +4552,7 @@ function renderPieDiagram(source, contentWidth) {
   const { lines: rawLines, truncated } = diagramLines(source, PIE_START_RE);
   const titleLine = rawLines.find((line) => /^title\b/i.test(line));
   const slices = rawLines.map((line) => /^["']?(.+?)["']?\s*:\s*([0-9.]+)\s*$/.exec(line)).filter((match) => match !== null).map(
-    (match) => truncateToWidth(
+    (match) => truncateToWidth2(
       `${stripMermaidPunctuation(match[1])}: ${match[2]}`,
       contentWidth
     )
@@ -4565,7 +4569,7 @@ function renderPieDiagram(source, contentWidth) {
     title: "Mermaid pie chart",
     lines: [
       ...titleLine ? [
-        truncateToWidth(stripMermaidPunctuation(titleLine), contentWidth),
+        truncateToWidth2(stripMermaidPunctuation(titleLine), contentWidth),
         ""
       ] : [],
       ...slices
@@ -4587,7 +4591,7 @@ function renderGanttDiagram(source, contentWidth) {
     if (section) {
       output.push("");
       output.push(
-        truncateToWidth(
+        truncateToWidth2(
           `Section: ${stripMermaidPunctuation(section[1])}`,
           contentWidth
         )
@@ -4597,7 +4601,7 @@ function renderGanttDiagram(source, contentWidth) {
     const title = /^title\s+(.+)$/i.exec(line);
     if (title) {
       output.push(
-        truncateToWidth(
+        truncateToWidth2(
           `Title: ${stripMermaidPunctuation(title[1])}`,
           contentWidth
         )
@@ -4605,7 +4609,7 @@ function renderGanttDiagram(source, contentWidth) {
       continue;
     }
     output.push(
-      truncateToWidth(`\u2022 ${stripMermaidPunctuation(line)}`, contentWidth)
+      truncateToWidth2(`\u2022 ${stripMermaidPunctuation(line)}`, contentWidth)
     );
   }
   if (output.length === 0) {
@@ -4630,7 +4634,7 @@ function renderJourneyDiagram(source, contentWidth) {
     const title = /^title\s+(.+)$/i.exec(line);
     if (title) {
       output.push(
-        truncateToWidth(
+        truncateToWidth2(
           `Title: ${stripMermaidPunctuation(title[1])}`,
           contentWidth
         )
@@ -4641,7 +4645,7 @@ function renderJourneyDiagram(source, contentWidth) {
     if (section) {
       output.push("");
       output.push(
-        truncateToWidth(
+        truncateToWidth2(
           `Section: ${stripMermaidPunctuation(section[1])}`,
           contentWidth
         )
@@ -4649,7 +4653,7 @@ function renderJourneyDiagram(source, contentWidth) {
       continue;
     }
     output.push(
-      truncateToWidth(`\u2022 ${stripMermaidPunctuation(line)}`, contentWidth)
+      truncateToWidth2(`\u2022 ${stripMermaidPunctuation(line)}`, contentWidth)
     );
   }
   if (output.length === 0) {
@@ -4677,7 +4681,7 @@ function renderIndentedTreeDiagram(source, contentWidth, startRe, title, sourceT
     const safeLine = sanitizeTerminalText2(line);
     const indentation = /^\s*/.exec(safeLine)?.[0].length ?? 0;
     const depth = Math.floor(indentation / 2);
-    return truncateToWidth(
+    return truncateToWidth2(
       `${"  ".repeat(depth)}\u2022 ${safeLine.trim()}`,
       contentWidth
     );
@@ -5782,7 +5786,7 @@ function countMarkdownSourceBlocks(text) {
     }
     if (codeFenceMatch) {
       activeCodeFence = codeFenceMatch[1];
-      const lang = codeFenceMatch[2]?.trim().split(/\s+/)[0]?.toLowerCase() || null;
+      const lang = parseCodeFenceInfo(codeFenceMatch[2]).lang?.toLowerCase();
       if (lang) {
         codeBlockLanguageCounts.set(
           lang,
@@ -5917,6 +5921,7 @@ var MarkdownDisplayInternal = /* @__PURE__ */ __name(({
   let codeBlockIndex = 0;
   let currentCodeBlockIndex = 0;
   let currentCodeBlockLangIndex = 0;
+  let currentCodeBlockStartLine = 1;
   const codeBlockLanguageCounts = new Map(
     sourceCopyIndexOffsets?.codeBlockLanguageCounts
   );
@@ -5954,7 +5959,8 @@ var MarkdownDisplayInternal = /* @__PURE__ */ __name(({
               codeBlockLangIndex: currentCodeBlockLangIndex,
               isPending,
               availableTerminalHeight,
-              contentWidth
+              contentWidth,
+              startLineNumber: currentCodeBlockStartLine
             },
             key
           )
@@ -6007,7 +6013,9 @@ var MarkdownDisplayInternal = /* @__PURE__ */ __name(({
       codeBlockIndex += 1;
       currentCodeBlockIndex = codeBlockIndex;
       codeBlockFence = codeFenceMatch[1];
-      codeBlockLang = codeFenceMatch[2]?.trim().split(/\s+/)[0] || null;
+      const fenceInfo = parseCodeFenceInfo(codeFenceMatch[2]);
+      codeBlockLang = fenceInfo.lang;
+      currentCodeBlockStartLine = fenceInfo.startLine;
       if (codeBlockLang) {
         const normalizedLang = codeBlockLang.toLowerCase();
         const nextLangIndex = (codeBlockLanguageCounts.get(normalizedLang) ?? 0) + 1;
@@ -6231,7 +6239,8 @@ var MarkdownDisplayInternal = /* @__PURE__ */ __name(({
           codeBlockLangIndex: currentCodeBlockLangIndex,
           isPending,
           availableTerminalHeight,
-          contentWidth
+          contentWidth,
+          startLineNumber: currentCodeBlockStartLine
         },
         "line-eof"
       )
@@ -6292,7 +6301,8 @@ var RenderCodeBlockInternal = /* @__PURE__ */ __name(({
   codeBlockLangIndex,
   isPending,
   availableTerminalHeight,
-  contentWidth
+  contentWidth,
+  startLineNumber = 1
 }) => {
   const settings = useSettings();
   const { renderMode } = useRenderMode();
@@ -6336,8 +6346,7 @@ var RenderCodeBlockInternal = /* @__PURE__ */ __name(({
         lang,
         availableTerminalHeight,
         contentWidth - CODE_BLOCK_PREFIX_PADDING,
-        void 0,
-        settings
+        { settings, startLineNumber }
       );
       return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(Box_default, { paddingLeft: CODE_BLOCK_PREFIX_PADDING, flexDirection: "column", children: colorizedTruncatedCode });
     }
@@ -6347,8 +6356,7 @@ var RenderCodeBlockInternal = /* @__PURE__ */ __name(({
     lang,
     availableTerminalHeight,
     contentWidth - CODE_BLOCK_PREFIX_PADDING,
-    void 0,
-    settings
+    { settings, startLineNumber }
   );
   return /* @__PURE__ */ (0, import_jsx_runtime6.jsx)(
     Box_default,
@@ -6914,9 +6922,7 @@ var DiffRenderer = /* @__PURE__ */ __name(({
       language,
       availableTerminalHeight,
       contentWidth,
-      theme2,
-      settings,
-      tabWidth
+      { theme: theme2, settings, tabWidth }
     );
   } else {
     renderedOutput = renderDiffContent(
@@ -7187,6 +7193,7 @@ var Command = /* @__PURE__ */ ((Command2) => {
   Command2["COMPLETION_UP"] = "completionUp";
   Command2["COMPLETION_DOWN"] = "completionDown";
   Command2["SUBMIT"] = "submit";
+  Command2["QUEUE_MESSAGE"] = "queueMessage";
   Command2["NEWLINE"] = "newline";
   Command2["VOICE_PUSH_TO_TALK"] = "voicePushToTalk";
   Command2["OPEN_EXTERNAL_EDITOR"] = "openExternalEditor";
@@ -7259,7 +7266,10 @@ var defaultKeyBindings = {
     { key: "n", ctrl: true }
   ],
   // Auto-completion
-  ["acceptSuggestion" /* ACCEPT_SUGGESTION */]: [{ key: "tab" }, { key: "return", ctrl: false }],
+  ["acceptSuggestion" /* ACCEPT_SUGGESTION */]: [
+    { key: "tab" },
+    { key: "return", ctrl: false, shift: false }
+  ],
   // Completion navigation: arrows + readline/Vim-style Ctrl+P/Ctrl+N
   ["completionUp" /* COMPLETION_UP */]: [
     { key: "up", shift: false },
@@ -7280,6 +7290,9 @@ var defaultKeyBindings = {
       shift: false
     }
   ],
+  ["queueMessage" /* QUEUE_MESSAGE */]: [
+    { key: "q", ctrl: true, command: false, shift: false, paste: false }
+  ],
   // Split into multiple data-driven bindings
   // Now also includes shift+enter for multi-line input
   ["newline" /* NEWLINE */]: [
@@ -10771,9 +10784,23 @@ __name(TextInput, "TextInput");
 
 // packages/cli/src/ui/components/messages/AskUserQuestionDialog.tsx
 var import_jsx_runtime14 = __toESM(require_jsx_runtime(), 1);
+function computeHeaderCap(headerWidths, available) {
+  const ascending = [...headerWidths].sort((a, b) => a - b);
+  let remaining = available;
+  for (let i = 0; i < ascending.length; i++) {
+    const cap = Math.floor(remaining / (ascending.length - i));
+    if (ascending[i] > cap) {
+      return Math.max(0, cap);
+    }
+    remaining -= ascending[i];
+  }
+  return Number.MAX_SAFE_INTEGER;
+}
+__name(computeHeaderCap, "computeHeaderCap");
 var AskUserQuestionDialog = /* @__PURE__ */ __name(({
   confirmationDetails,
   isFocused = true,
+  availableWidth,
   onConfirm
 }) => {
   const [currentQuestionIndex, setCurrentQuestionIndex] = (0, import_react15.useState)(0);
@@ -10807,6 +10834,20 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
     }
     return selectedOptions[idx];
   }, "getAnswerForQuestion");
+  const numHeaders = confirmationDetails.questions.length;
+  const answeredHeaders = confirmationDetails.questions.filter(
+    (_, idx) => getAnswerForQuestion(idx) !== void 0
+  ).length;
+  const dialogPadding = 2;
+  const submitChipWidth = (isSubmitTab ? 2 : 1) + getCachedStringWidth(t("Submit"));
+  const chipGaps = numHeaders;
+  const headerPrefixes = 2 * numHeaders;
+  const answeredMarks = 2 * answeredHeaders;
+  const rowOverhead = dialogPadding + submitChipWidth + chipGaps + headerPrefixes + answeredMarks;
+  const headerCap = computeHeaderCap(
+    confirmationDetails.questions.map((q) => getCachedStringWidth(q.header)),
+    availableWidth - rowOverhead
+  );
   const handleSubmit = /* @__PURE__ */ __name(async () => {
     const answers = {};
     confirmationDetails.questions.forEach((_, idx) => {
@@ -10969,8 +11010,8 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
         confirmationDetails.questions.map((q, idx) => {
           const isAnswered = getAnswerForQuestion(idx) !== void 0;
           return /* @__PURE__ */ (0, import_jsx_runtime14.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime14.jsxs)(Text, { dimColor: true, children: [
-            isAnswered ? "  " : "  ",
-            q.header,
+            "  ",
+            truncateToWidth(q.header, headerCap),
             isAnswered ? " \u2713" : ""
           ] }) }, idx);
         }),
@@ -11033,7 +11074,7 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
             dimColor: idx !== currentQuestionIndex,
             children: [
               idx === currentQuestionIndex ? "\u25B8 " : "  ",
-              q.header,
+              truncateToWidth(q.header, headerCap),
               isAnswered ? " \u2713" : ""
             ]
           }
@@ -11433,6 +11474,7 @@ var ToolConfirmationMessage = /* @__PURE__ */ __name(({
       {
         confirmationDetails,
         isFocused,
+        availableWidth: contentWidth,
         onConfirm
       }
     );
@@ -13850,6 +13892,7 @@ var GeneralHelp = /* @__PURE__ */ __name(({ width }) => {
     ["Tab", t("Accept ghost text or completion")],
     ["Esc Esc", t("Clear input or cancel operation")],
     ["Ctrl+L", t("Clear the screen")],
+    ["Ctrl+Q", t("Queue message for the next turn")],
     [
       process.platform === "win32" ? "Ctrl+Enter" : "Ctrl+J",
       t("Insert a newline")
@@ -16175,6 +16218,8 @@ var DiffRow = /* @__PURE__ */ __name(({
   remWidth,
   statColumnWidth
 }) => {
+  const safeName = sanitizeFilenameForDisplay(row.filename);
+  const safeOldPath = row.oldPath ? sanitizeFilenameForDisplay(row.oldPath) : null;
   if (row.isBinary) {
     const marker = padRight("~", statColumnWidth);
     const suffix2 = row.isUntracked ? t("(binary, new)") : row.isDeleted ? t("(binary, deleted)") : t("(binary)");
@@ -16182,7 +16227,11 @@ var DiffRow = /* @__PURE__ */ __name(({
       /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.primary, children: "  " }),
       /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.secondary, children: marker }),
       /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.primary, children: "  " }),
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.primary, children: row.filename }),
+      safeOldPath ? /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.secondary, children: [
+        safeOldPath,
+        " \u2192 "
+      ] }) : null,
+      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.primary, children: safeName }),
       /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.secondary, children: [
         " ",
         suffix2
@@ -16209,7 +16258,11 @@ var DiffRow = /* @__PURE__ */ __name(({
       removed
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.primary, children: "  " }),
-    /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.primary, children: row.filename }),
+    safeOldPath ? /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.secondary, children: [
+      safeOldPath,
+      " \u2192 "
+    ] }) : null,
+    /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.primary, children: safeName }),
     suffix && /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.secondary, children: [
       " ",
       suffix
@@ -16351,6 +16404,7 @@ var ClickableThinkMessage = /* @__PURE__ */ __name(({
   onToggle
 }) => {
   const ref = (0, import_react34.useRef)(null);
+  const pressRef = (0, import_react34.useRef)(null);
   const { rows: terminalHeight } = useTerminalSize();
   const settings = useSettings();
   const clickable = !!settings.merged.ui?.useTerminalBuffer;
@@ -16358,11 +16412,28 @@ var ClickableThinkMessage = /* @__PURE__ */ __name(({
   useMouseEvents(
     (0, import_react34.useCallback)(
       (event) => {
-        if (event.name !== "left-press" || !ref.current) return;
+        if (!ref.current) return;
+        if (event.name === "move") {
+          if (pressRef.current && (event.col !== pressRef.current.col || event.row !== pressRef.current.row)) {
+            pressRef.current = null;
+          }
+          return;
+        }
+        if (event.name !== "left-press" && event.name !== "left-release") {
+          pressRef.current = null;
+          return;
+        }
         const metrics = measureElementPosition(ref.current);
         const col = event.col - 1;
         const row = layoutRowForEvent(ref.current, event.row, terminalHeight);
-        if (col >= metrics.x && col < metrics.x + metrics.width && row >= metrics.y && row < metrics.y + metrics.height) {
+        const isInside = col >= metrics.x && col < metrics.x + metrics.width && row >= metrics.y && row < metrics.y + metrics.height;
+        if (event.name === "left-press") {
+          pressRef.current = isInside ? { col: event.col, row: event.row } : null;
+          return;
+        }
+        const press = pressRef.current;
+        pressRef.current = null;
+        if (isInside && press?.col === event.col && press.row === event.row) {
           onToggle();
         }
       },