mixdog 0.9.21 → 0.9.23

package/src/tui/dist/index.mjs

@@ -156,10 +156,11 @@ var require_mixdog_debug = __commonJS({
 // src/tui/index.jsx
 import React21 from "react";
 import { render } from "../../../vendor/ink/build/index.js";
-import { closeSync as closeSync2, constants as fsConstants, createWriteStream, mkdirSync as mkdirSync7, openSync as openSync2, readSync } from "node:fs";
-import { tmpdir as tmpdir3 } from "node:os";
-import { dirname as dirname9, join as join11 } from "node:path";
+import { closeSync as closeSync2, constants as fsConstants, createWriteStream, mkdirSync as mkdirSync6, openSync as openSync2, readSync } from "node:fs";
+import { tmpdir as tmpdir2 } from "node:os";
+import { dirname as dirname9, join as join10 } from "node:path";
 import { performance as performance3 } from "node:perf_hooks";
+import { format } from "node:util";
 
 // src/tui/App.jsx
 import React20, { useState as useState8, useCallback as useCallback6, useEffect as useEffect10, useLayoutEffect as useLayoutEffect4, useMemo as useMemo2, useRef as useRef9 } from "react";
@@ -1788,8 +1789,21 @@ function parseMcpToolName(name) {
 function isMcpToolName(name) {
   return Boolean(parseMcpToolName(name));
 }
+var SELF_MCP_SERVER = "plugin_mixdog_mixdog";
+function isSelfMcpToolName(name) {
+  const mcp = parseMcpToolName(name);
+  return Boolean(mcp && mcp.server === SELF_MCP_SERVER);
+}
+function isExternalMcpToolName(name) {
+  return isMcpToolName(name) && !isSelfMcpToolName(name);
+}
+function titleCaseMcpServer(server) {
+  return String(server || "").split(/[_\s-]+/).filter(Boolean).map((part) => `${part.slice(0, 1).toUpperCase()}${part.slice(1).toLowerCase()}`).join(" ");
+}
+var TOOL_NAME_ALIASES = { tool_search: "load_tool" };
 function normalizeToolName(name) {
-  return stripToolPrefix(name).replace(/-/g, "_").toLowerCase();
+  const base = stripToolPrefix(name).replace(/-/g, "_").toLowerCase();
+  return TOOL_NAME_ALIASES[base] || base;
 }
 function truncateToolText(value, max = DEFAULT_SUMMARY_MAX) {
   const text = String(value ?? "").trim();
@@ -1829,16 +1843,6 @@ function displayToolPath(path2) {
 function compactParts(parts) {
   return parts.filter((part) => part != null && String(part).trim()).map((part) => String(part).trim()).join(STATUS_SEPARATOR);
 }
-function compactSlash(left, right) {
-  const a = String(left ?? "").trim();
-  const b = String(right ?? "").trim();
-  return a && b ? `${a}/${b}` : a || b;
-}
-function mcpToolTarget(name, max = DEFAULT_SUMMARY_MAX) {
-  const mcp = parseMcpToolName(name);
-  if (!mcp) return "";
-  return truncateToolText(compactSlash(mcp.server, mcp.tool), max);
-}
 function quoted(value, max) {
   const text = truncateToolText(value || "", max);
   return text ? `"${text}"` : "";
@@ -2435,7 +2439,10 @@ function summarizeAgentSurfaceBrief(name, args, resultText, { isError = false, i
 
 // src/runtime/shared/tool-surface.mjs
 function displayToolName(name, args = {}) {
-  if (isMcpToolName(name)) return "MCP";
+  if (isExternalMcpToolName(name)) {
+    const mcp = parseMcpToolName(name);
+    return `MCP ${titleCaseMcpServer(mcp.server)}`;
+  }
   const normalized = normalizeToolName(name);
   switch (normalized) {
     case "read":
@@ -2461,7 +2468,7 @@ function displayToolName(name, args = {}) {
     case "list":
     case "ls":
       return "Search";
-    case "tool_search":
+    case "load_tool":
       return toolSearchDisplayLabel(parseToolArgs(args));
     case "search":
     case "search_query":
@@ -2511,10 +2518,10 @@ function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}) {
   const a = parseToolArgs(args);
   if (!a || typeof a !== "object") return "";
   const normalized = normalizeToolName(name);
-  const mcpTarget = mcpToolTarget(name, max);
-  if (mcpTarget) {
+  if (isExternalMcpToolName(name)) {
+    const mcp = parseMcpToolName(name);
     return compactParts([
-      mcpTarget,
+      truncateToolText(mcp.tool, max),
       truncateToolText(firstText(a.query, a.q, a.text, a.prompt, a.path, a.uri, a.name, a.id, a.action), Math.min(max, 80))
     ]);
   }
@@ -2591,8 +2598,8 @@ function summarizeToolArgs(name, args, { max = DEFAULT_SUMMARY_MAX } = {}) {
         return formatCountedUnit(collectionCount(a.query, a.prompt, a.task, a.goal), "query", "queries");
       }
       return truncateSingleLine(firstText(a.query, a.prompt, a.task, a.goal, a.path), Math.min(max, 80));
-    case "tool_search": {
-      const selected = splitToolSearchSelection(a.select);
+    case "load_tool": {
+      const selected = [...splitToolSearchSelection(a.names), ...splitToolSearchSelection(a.select)];
       if (selected.length) return truncateToolText(selected.map(displayToolSearchTarget).join(", "), max);
       return quoted(firstText(a.query, a.q, a.text), max);
     }
@@ -2695,7 +2702,7 @@ var TOOL_CATEGORY = /* @__PURE__ */ new Map([
   ["glob", "Search"],
   ["list", "Search"],
   ["ls", "Search"],
-  ["tool_search", "Load"],
+  ["load_tool", "Load"],
   ["search", "Web Research"],
   ["web_search", "Web Research"],
   ["search_query", "Web Research"],
@@ -2732,7 +2739,7 @@ var TOOL_CATEGORY = /* @__PURE__ */ new Map([
   ["use_skill", "Skill"]
 ]);
 function classifyToolCategory(name, args = {}) {
-  if (isMcpToolName(name)) return "MCP";
+  if (isExternalMcpToolName(name)) return "MCP";
   const normalized = normalizeToolName(name);
   if (normalized === "code_graph") {
     const mode = String(args.mode || args.action || "").toLowerCase();
@@ -2780,8 +2787,12 @@ function toolWorkUnit(name, args = {}, category = "") {
   const a = parseToolArgs(args);
   const normalized = normalizeToolName(name);
   const cat = category || classifyToolCategory(name, a);
-  if (isMcpToolName(name)) {
-    return unitDescriptor("MCP", { count: queryCount(a, "query", "q", "text", "prompt", "path", "uri", "name", "id", "action") || 1 });
+  if (isExternalMcpToolName(name)) {
+    const mcp = parseMcpToolName(name);
+    return unitDescriptor("MCP", {
+      count: queryCount(a, "query", "q", "text", "prompt", "path", "uri", "name", "id", "action") || 1,
+      noun: `${titleCaseMcpServer(mcp.server)} tool`
+    });
   }
   switch (normalized) {
     case "read":
@@ -2816,8 +2827,8 @@ function toolWorkUnit(name, args = {}, category = "") {
     case "list":
     case "ls":
       return unitDescriptor("Search", { count: queryCount(a, "path", "paths", "dir", "dirs", "cwd") || 1, active: "Listing", done: "Listed", noun: "directory", pluralNoun: "directories" });
-    case "tool_search": {
-      const selected = splitToolSearchSelection(a.select);
+    case "load_tool": {
+      const selected = [...splitToolSearchSelection(a.names), ...splitToolSearchSelection(a.select)];
       if (selected.length) return unitDescriptor("Load", { count: selected.length, noun: "tool" });
       return unitDescriptor("Load", { count: queryCount(a, "query", "q", "text") || 1, noun: "query", pluralNoun: "queries" });
     }
@@ -4943,7 +4954,7 @@ function PromptInput({
       return;
     }
     if (!commandPaletteActive && (key.ctrl && inputKey === "v" || key.meta && inputKey === "v")) {
-      handleExternalPaste("", { source: "clipboard-image-shortcut" });
+      handleExternalPaste("", { source: "clipboard-shortcut" });
       return;
     }
     if (key.return) {
@@ -5220,13 +5231,17 @@ ${d.value.slice(d.cursor)}`,
 import React4 from "react";
 import { Box as Box4, Text as Text4 } from "../../../vendor/ink/build/index.js";
 import { jsx as jsx4 } from "react/jsx-runtime";
-function QueuedCommands({ queued, columns }) {
+function QueuedCommands({ queued, columns, compact = false }) {
   if (!queued || queued.length === 0) return null;
   const bandColumns = Math.max(1, columns - 1);
+  const contentWidth = Math.max(1, columns - 4);
   return /* @__PURE__ */ jsx4(Box4, { flexDirection: "column", children: queued.map((item) => {
-    const contentWidth = Math.max(1, columns - 4);
     const sourceText = String(item.displayText || item.text || "");
-    const displayText = sourceText.length > contentWidth ? contentWidth <= 1 ? "\u2026".repeat(contentWidth) : sourceText.slice(0, Math.max(1, contentWidth - 1)) + "\u2026" : sourceText;
+    let displayText = sourceText;
+    if (compact) {
+      const oneLine2 = sourceText.replace(/\r?\n/g, " ");
+      displayText = oneLine2.length > contentWidth ? contentWidth <= 1 ? "\u2026".repeat(contentWidth) : oneLine2.slice(0, Math.max(1, contentWidth - 1)) + "\u2026" : oneLine2;
+    }
     return /* @__PURE__ */ jsx4(Box4, { width: bandColumns, backgroundColor: theme.userMessageBackground, paddingLeft: 2, paddingRight: 1, children: /* @__PURE__ */ jsx4(Text4, { wrap: "wrap", children: /* @__PURE__ */ jsx4(Text4, { color: theme.mixdogIvory, children: displayText }) }) }, item.id);
   }) });
 }
@@ -6346,6 +6361,12 @@ function wrappedDetailRows(text, width) {
   const w = Math.max(1, Math.floor(Number(width) || 1));
   return wrapAnsi(value, w, { trim: false, hard: true }).split("\n").length;
 }
+function queuedBandRows(text, width) {
+  const value = String(text ?? "");
+  if (!value) return 1;
+  const w = Math.max(1, Math.floor(Number(width) || 1));
+  return Math.max(1, wrapAnsi(value, w, { trim: false, hard: true }).split("\n").length);
+}
 function visualRowStartOffsets(text, width) {
   const value = String(text ?? "");
   const w = Math.max(1, Math.floor(Number(width) || 1));
@@ -6830,6 +6851,7 @@ function TextEntryPanel({
 
 // src/tui/paste-attachments.mjs
 import { execFile } from "node:child_process";
+import { Buffer as Buffer2 } from "node:buffer";
 import { randomBytes } from "node:crypto";
 import { existsSync, unlinkSync } from "node:fs";
 import { readFile as readFileAsync, stat as statAsync } from "node:fs/promises";
@@ -6983,7 +7005,7 @@ function mimeForPath(path2) {
   return IMAGE_MIME[extname(String(path2 || "")).toLowerCase()] || null;
 }
 function execFileBuffer(cmd, args, options = {}) {
-  return new Promise((resolve6) => {
+  return new Promise((resolve5) => {
     execFile(cmd, args, {
       windowsHide: true,
       encoding: "buffer",
@@ -6991,7 +7013,7 @@ function execFileBuffer(cmd, args, options = {}) {
       timeout: 5e3,
       ...options
     }, (error, stdout, stderr) => {
-      resolve6({ ok: !error, code: error?.code ?? 0, stdout, stderr, error });
+      resolve5({ ok: !error, code: error?.code ?? 0, stdout, stderr, error });
     });
   });
 }
@@ -7066,7 +7088,7 @@ function splitPastedImagePathCandidates(text) {
   return out;
 }
 async function imageAttachmentFromBuffer(buffer, mimeType, { filename = "Pasted image", sourcePath = "" } = {}) {
-  if (!Buffer.isBuffer(buffer) || buffer.length === 0) throw new Error("image is empty");
+  if (!Buffer2.isBuffer(buffer) || buffer.length === 0) throw new Error("image is empty");
   const ext = (mimeType || "image/png").split("/")[1] || "png";
   const resized = await resizeImageBuffer(buffer, ext);
   if (resized) {
@@ -7145,6 +7167,30 @@ async function readClipboardImageAttachment() {
     }
   }
 }
+async function readClipboardText() {
+  if (process.platform === "win32") {
+    const ps = "$t=Get-Clipboard -Raw; if ($null -eq $t) { exit 2 }; [Console]::Out.Write([Convert]::ToBase64String([Text.Encoding]::UTF8.GetBytes($t)))";
+    const r = await execFileBuffer("powershell.exe", ["-NoLogo", "-NoProfile", "-NonInteractive", "-Command", ps], { timeout: 3e3 });
+    if (!r.ok || !r.stdout?.length) return "";
+    try {
+      return Buffer2.from(r.stdout.toString("ascii").trim(), "base64").toString("utf8");
+    } catch {
+      return "";
+    }
+  }
+  if (process.platform === "darwin") {
+    const r = await execFileBuffer("pbpaste", [], { timeout: 3e3 });
+    return r.ok && r.stdout?.length ? r.stdout.toString("utf8") : "";
+  }
+  if (process.platform === "linux") {
+    const wl = await execFileBuffer("wl-paste", ["--no-newline"], { timeout: 3e3 });
+    if (wl.ok && wl.stdout?.length) return wl.stdout.toString("utf8");
+    const xc = await execFileBuffer("xclip", ["-selection", "clipboard", "-o"], { timeout: 3e3 });
+    if (xc.ok && xc.stdout?.length) return xc.stdout.toString("utf8");
+    return "";
+  }
+  return "";
+}
 
 // src/standalone/projects.mjs
 import { homedir } from "node:os";
@@ -7302,12 +7348,12 @@ import { spawn } from "node:child_process";
 import path from "node:path";
 var DIALOG_TIMEOUT_MS = 5 * 60 * 1e3;
 function runCapture(cmd, args, { timeoutMs = DIALOG_TIMEOUT_MS } = {}) {
-  return new Promise((resolve6) => {
+  return new Promise((resolve5) => {
     let child;
     try {
       child = spawn(cmd, args, { stdio: ["ignore", "pipe", "ignore"], windowsHide: true });
     } catch (error) {
-      resolve6({ ok: false, code: -1, stdout: "", error });
+      resolve5({ ok: false, code: -1, stdout: "", error });
       return;
     }
     let stdout = "";
@@ -7319,7 +7365,7 @@ function runCapture(cmd, args, { timeoutMs = DIALOG_TIMEOUT_MS } = {}) {
         child.kill();
       } catch {
       }
-      resolve6({ ok: false, code: -1, stdout: "", error: new Error("dialog timed out") });
+      resolve5({ ok: false, code: -1, stdout: "", error: new Error("dialog timed out") });
     }, timeoutMs);
     timer.unref?.();
     child.stdout.on("data", (chunk) => {
@@ -7329,13 +7375,13 @@ function runCapture(cmd, args, { timeoutMs = DIALOG_TIMEOUT_MS } = {}) {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve6({ ok: false, code: -1, stdout: "", error });
+      resolve5({ ok: false, code: -1, stdout: "", error });
     });
     child.on("close", (code) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve6({ ok: code === 0, code, stdout });
+      resolve5({ ok: code === 0, code, stdout });
     });
   });
 }
@@ -7343,10 +7389,10 @@ function spawnFailed(result) {
   return !!result && result.code === -1;
 }
 function commandExists(cmd) {
-  return new Promise((resolve6) => {
+  return new Promise((resolve5) => {
     const probe = process.platform === "win32" ? spawn("where", [cmd], { stdio: "ignore", windowsHide: true }) : spawn("which", [cmd], { stdio: "ignore" });
-    probe.on("error", () => resolve6(false));
-    probe.on("close", (code) => resolve6(code === 0));
+    probe.on("error", () => resolve5(false));
+    probe.on("close", (code) => resolve5(code === 0));
   });
 }
 function psSingleQuoted(value) {
@@ -7845,64 +7891,67 @@ function memoryCoreResultErrorText(text) {
 }
 
 // src/tui/app/clipboard.mjs
-import { Buffer as Buffer2 } from "node:buffer";
+import { Buffer as Buffer3 } from "node:buffer";
 import { spawn as spawn2 } from "node:child_process";
 function osc52ClipboardSequence(text) {
-  const b64 = Buffer2.from(String(text ?? ""), "utf8").toString("base64");
+  const b64 = Buffer3.from(String(text ?? ""), "utf8").toString("base64");
   const raw = `\x1B]52;c;${b64}\x07`;
   if (!process.env.TMUX) return raw;
   return `\x1BPtmux;${raw.replaceAll("\x1B", "\x1B\x1B")}\x1B\\`;
 }
+var OSC52_MAX_BYTES = 256 * 1024;
 function writeOsc52Clipboard(text) {
+  const value = String(text ?? "");
+  if (Buffer3.byteLength(value, "utf8") > OSC52_MAX_BYTES) return false;
   try {
-    process.stdout.write(osc52ClipboardSequence(text));
+    process.stdout.write(osc52ClipboardSequence(value));
     return true;
   } catch {
     return false;
   }
 }
 function nativeClipboardCommand(text) {
+  const value = String(text ?? "");
   if (process.platform === "win32") {
     return {
-      cmd: "powershell.exe",
-      args: [
-        "-NoLogo",
-        "-NoProfile",
-        "-NonInteractive",
-        "-Command",
-        "$b=[Console]::In.ReadToEnd();$t=[Text.Encoding]::UTF8.GetString([Convert]::FromBase64String($b));Set-Clipboard -Value $t"
-      ],
-      input: Buffer2.from(String(text ?? ""), "utf8").toString("base64")
+      cmd: "clip.exe",
+      args: [],
+      input: Buffer3.from(value, "utf16le")
     };
   }
-  if (process.platform === "darwin") return { cmd: "pbcopy", args: [], input: text };
-  if (process.env.WAYLAND_DISPLAY) return { cmd: "wl-copy", args: [], input: text };
-  return { cmd: "xclip", args: ["-selection", "clipboard"], input: text };
+  if (process.platform === "darwin") return { cmd: "pbcopy", args: [], input: value };
+  if (process.env.WAYLAND_DISPLAY) return { cmd: "wl-copy", args: [], input: value };
+  return { cmd: "xclip", args: ["-selection", "clipboard"], input: value };
 }
 function copyToClipboard(text) {
   const value = String(text ?? "");
   const wroteOsc52 = writeOsc52Clipboard(value);
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve5, reject) => {
     const { cmd, args, input } = nativeClipboardCommand(value);
     let child;
     try {
       child = spawn2(cmd, args, { stdio: ["pipe", "ignore", "ignore"], windowsHide: true });
     } catch (e) {
-      if (wroteOsc52) resolve6();
+      if (wroteOsc52) resolve5();
       else reject(e);
       return;
     }
     child.on("error", (e) => {
-      if (wroteOsc52) resolve6();
-      else reject(e);
-    });
-    child.on("close", (code) => {
-      if (code === 0 || wroteOsc52) resolve6();
-      else reject(new Error(`${cmd} exited with code ${code}`));
+      if (!wroteOsc52) reject(e);
     });
+    if (!wroteOsc52) {
+      child.on("close", (code) => {
+        if (code === 0) resolve5();
+        else reject(new Error(`${cmd} exited with code ${code}`));
+      });
+    }
     child.stdin.on("error", () => {
     });
     child.stdin.end(input);
+    if (wroteOsc52) {
+      child.unref?.();
+      resolve5();
+    }
   });
 }
 
@@ -10382,6 +10431,7 @@ var ALT_SCROLL_ON = "\x1B[?1007h";
 var MOUSE_MODIFIER_MASK = 4 | 8 | 16;
 var MOUSE_CTRL_MASK = 16;
 var MOUSE_SHIFT_MASK = 4;
+var IS_WINDOWS_TERMINAL = Boolean(process.env.WT_SESSION);
 function useMouseInput({
   inkInput,
   isRawModeSupported,
@@ -10409,7 +10459,8 @@ function useMouseInput({
   setMeasuredRowsVersion,
   clearStitchBuffer
 }) {
-  const mouseZoomPassthroughTimerRef = useRef6(null);
+  const zoomTimerRef = useRef6(null);
+  const edgeAutoscrollRef = useRef6({ dir: 0, timer: null, noMove: 0 });
   const passthroughCtrlWheelZoom = useCallback2(() => {
     if (!stdout?.write) return;
     try {
@@ -10417,19 +10468,19 @@ function useMouseInput({
     } catch {
       return;
     }
-    if (mouseZoomPassthroughTimerRef.current) clearTimeout(mouseZoomPassthroughTimerRef.current);
-    mouseZoomPassthroughTimerRef.current = setTimeout(() => {
-      mouseZoomPassthroughTimerRef.current = null;
+    if (zoomTimerRef.current) clearTimeout(zoomTimerRef.current);
+    zoomTimerRef.current = setTimeout(() => {
+      zoomTimerRef.current = null;
       try {
         stdout.write(ALT_SCROLL_ON + MOUSE_TRACKING_ON);
       } catch {
       }
     }, 700);
-    mouseZoomPassthroughTimerRef.current.unref?.();
-  }, [stdout]);
+    zoomTimerRef.current.unref?.();
+  }, [stdout, zoomTimerRef]);
   useEffect6(() => () => {
-    if (mouseZoomPassthroughTimerRef.current) clearTimeout(mouseZoomPassthroughTimerRef.current);
-  }, []);
+    if (zoomTimerRef.current) clearTimeout(zoomTimerRef.current);
+  }, [zoomTimerRef]);
   useEffect6(() => {
     if (!inkInput || !isRawModeSupported) return void 0;
     const WHEEL_SGR = /\x1b\[<(\d+);/;
@@ -10494,6 +10545,65 @@ function useMouseInput({
       promptMouseSelectionRef.current?.clear?.();
       applySelectionRect(null);
     };
+    const EDGE_AUTOSCROLL_INTERVAL_MS = 50;
+    const stopEdgeAutoscroll = () => {
+      const st = edgeAutoscrollRef.current;
+      if (st.timer) {
+        clearInterval(st.timer);
+        st.timer = null;
+      }
+      st.dir = 0;
+      st.noMove = 0;
+    };
+    const startEdgeAutoscroll = (dir) => {
+      const st = edgeAutoscrollRef.current;
+      if (st.dir === dir && st.timer) return;
+      stopEdgeAutoscroll();
+      st.dir = dir;
+      st.noMove = 0;
+      st.timer = setInterval(() => {
+        const drag = dragRef.current;
+        const st2 = edgeAutoscrollRef.current;
+        if (!drag.active || drag.region !== "transcript" || st2.dir === 0) {
+          stopEdgeAutoscroll();
+          return;
+        }
+        const before = Number(scrollTargetRef.current) || 0;
+        queueScrollCoalesced(st2.dir * 3);
+        if ((Number(scrollTargetRef.current) || 0) !== before) {
+          st2.noMove = 0;
+        } else if (++st2.noMove >= 3) {
+          stopEdgeAutoscroll();
+        }
+      }, EDGE_AUTOSCROLL_INTERVAL_MS);
+      st.timer.unref?.();
+    };
+    const finalizeActiveDrag = (fx, fy) => {
+      const drag = dragRef.current;
+      if (!drag.active) return;
+      stopEdgeAutoscroll();
+      const region = drag.region;
+      if (region === "prompt") {
+        const offset = promptOffsetAt(fx, fy);
+        drag.active = false;
+        promptMouseSelectionRef.current?.extendTo?.(offset, true);
+        return;
+      }
+      const span = drag.anchorSpan;
+      const finalY = region === "status" ? clampToStatusBand(fy) : clampToTranscriptViewport(fy);
+      drag.active = false;
+      if (span) {
+        const rect = buildSpanRect(span, fx, finalY, region, drag.anchorScroll);
+        applySelectionRect(rect);
+      } else {
+        const anchor = region === "status" ? drag.anchor : selectionPointAtCurrentScroll(drag.anchor, drag.anchorScroll);
+        const rect = linearSelection(anchor, { x: fx, y: finalY });
+        const empty = rect.x1 === rect.x2 && rect.y1 === rect.y2;
+        if (empty) applySelectionRect(null);
+        else applySelectionRect(rect);
+      }
+      if (TRANSCRIPT_MEASURED_ROWS) setMeasuredRowsVersion((v) => (v + 1) % 1e6);
+    };
     const onMouse = (event) => {
       if (!event || typeof event !== "object") return;
       let up = 0;
@@ -10505,15 +10615,20 @@ function useMouseInput({
         const wm = WHEEL_SGR.exec(seq);
         const ctrl = wm ? (Number(wm[1]) & MOUSE_CTRL_MASK) !== 0 : false;
         if (ctrl) {
+          if (dragRef.current.active) {
+            const last = dragRef.current.last || {};
+            finalizeActiveDrag(Number(last.x) || 0, Number(last.y) || 0);
+          } else {
+            stopEdgeAutoscroll();
+          }
           passthroughCtrlWheelZoom();
           return;
         }
         if (name === "wheelup") up += 1;
         else down += 1;
         if (up !== 0 || down !== 0) {
-          if (dragRef.current.active) return;
           const palette = slashPaletteRef.current;
-          if (palette.open && palette.count > 0) {
+          if (!dragRef.current.active && palette.open && palette.count > 0) {
             const step = down - up;
             if (step !== 0) {
               setSlashIndex((index) => Math.max(0, Math.min(palette.count - 1, index + step)));
@@ -10535,14 +10650,64 @@ function useMouseInput({
         const baseButton = button & 3;
         const isMotion = (button & 32) !== 0;
         const shiftHeld = (button & MOUSE_SHIFT_MASK) !== 0;
+        const ctrlHeld = (button & MOUSE_CTRL_MASK) !== 0;
+        if (IS_WINDOWS_TERMINAL && shiftHeld) return;
+        if (IS_WINDOWS_TERMINAL && press && !isMotion) {
+          store.forceRenderRepaint?.();
+        }
+        const extendHeld = shiftHeld || ctrlHeld;
+        const isRightPress = baseButton === 2 && press && !isMotion;
+        if (isRightPress) {
+          if (isInPromptBox(x, y)) {
+            const ctl = promptMouseSelectionRef.current;
+            if (ctl?.hasSelection?.()) {
+              applySelectionRect(null);
+              const offset = promptOffsetAt(x, y);
+              stopSmoothScroll();
+              dragRef.current = { anchor: { x, y }, anchorScroll: 0, last: { x, y }, active: false, rect: null, region: "prompt", anchorSpan: null };
+              if (offset != null) ctl.extendTo?.(offset, true);
+              lastClickRef.current = { x: -1, y: -1, t: 0 };
+            }
+            return;
+          }
+          const inTranscriptR = isInTranscriptViewport(y);
+          const inStatusR = !inTranscriptR && isInStatusBand(y);
+          if (!inTranscriptR && !inStatusR) return;
+          const regionR = inTranscriptR ? "transcript" : "status";
+          const nowR = Date.now();
+          if (dragRef.current.region === regionR && dragRef.current.anchorSpan) {
+            promptMouseSelectionRef.current?.clear?.();
+            const selectionY = regionR === "status" ? clampToStatusBand(y) : clampToTranscriptViewport(y);
+            const span = dragRef.current.anchorSpan;
+            const rect = buildSpanRect(span, x, selectionY, regionR, dragRef.current.anchorScroll);
+            stopSmoothScroll();
+            dragRef.current = { ...dragRef.current, last: { x, y: selectionY }, active: false, region: regionR };
+            applySelectionRect(rect);
+            lastClickRef.current = { x, y, t: nowR, count: 1 };
+            return;
+          }
+          if (dragRef.current.region === regionR && !dragRef.current.anchorSpan && dragRef.current.anchor && dragRef.current.rect && !(dragRef.current.rect.x1 === dragRef.current.rect.x2 && dragRef.current.rect.y1 === dragRef.current.rect.y2)) {
+            promptMouseSelectionRef.current?.clear?.();
+            const selectionY = regionR === "status" ? clampToStatusBand(y) : clampToTranscriptViewport(y);
+            const anchor = regionR === "status" ? dragRef.current.anchor : selectionPointAtCurrentScroll(dragRef.current.anchor, dragRef.current.anchorScroll);
+            const rect = linearSelection(anchor, { x, y: selectionY });
+            stopSmoothScroll();
+            dragRef.current = { ...dragRef.current, last: { x, y: selectionY }, active: false, region: regionR };
+            applySelectionRect(rect);
+            lastClickRef.current = { x, y, t: nowR, count: 1 };
+            return;
+          }
+          return;
+        }
         if (baseButton === 0 && press && !isMotion) {
+          stopEdgeAutoscroll();
           if (isInPromptBox(x, y)) {
             applySelectionRect(null);
             const offset = promptOffsetAt(x, y);
             stopSmoothScroll();
             dragRef.current = { anchor: { x, y }, anchorScroll: 0, last: { x, y }, active: true, rect: null, region: "prompt", anchorSpan: null };
             const ctl = promptMouseSelectionRef.current;
-            if (shiftHeld && ctl?.hasSelection?.()) {
+            if (extendHeld && ctl?.hasSelection?.()) {
               if (offset != null) ctl.extendTo?.(offset, true);
               lastClickRef.current = { x: -1, y: -1, t: 0 };
               return;
@@ -10577,7 +10742,22 @@ function useMouseInput({
           const region = inTranscript ? "transcript" : "status";
           promptMouseSelectionRef.current?.clear?.();
           const now = Date.now();
-          if (shiftHeld && dragRef.current.region === region && !dragRef.current.anchorSpan && dragRef.current.anchor && dragRef.current.rect && !(dragRef.current.rect.x1 === dragRef.current.rect.x2 && dragRef.current.rect.y1 === dragRef.current.rect.y2)) {
+          if (extendHeld && dragRef.current.region === region && dragRef.current.anchorSpan) {
+            const selectionY = region === "status" ? clampToStatusBand(y) : clampToTranscriptViewport(y);
+            const span = dragRef.current.anchorSpan;
+            const rect = buildSpanRect(span, x, selectionY, region, dragRef.current.anchorScroll);
+            stopSmoothScroll();
+            dragRef.current = {
+              ...dragRef.current,
+              last: { x, y: selectionY },
+              active: true,
+              region
+            };
+            applySelectionRect(rect);
+            lastClickRef.current = { x, y, t: now, count: 1 };
+            return;
+          }
+          if (extendHeld && dragRef.current.region === region && !dragRef.current.anchorSpan && dragRef.current.anchor && dragRef.current.rect && !(dragRef.current.rect.x1 === dragRef.current.rect.x2 && dragRef.current.rect.y1 === dragRef.current.rect.y2)) {
             const selectionY = region === "status" ? clampToStatusBand(y) : clampToTranscriptViewport(y);
             const anchor = region === "status" ? dragRef.current.anchor : selectionPointAtCurrentScroll(dragRef.current.anchor, dragRef.current.anchorScroll);
             const rect = linearSelection(anchor, { x, y: selectionY });
@@ -10656,41 +10836,23 @@ function useMouseInput({
             const { top, bottom } = transcriptViewport();
             if (y <= 1 && (y < prevDragY || y < top)) {
               queueScrollCoalesced(3);
+              startEdgeAutoscroll(1);
             } else if (y >= frameRows - 5 && (y > prevDragY || y > bottom)) {
               queueScrollCoalesced(-3);
-            }
-          }
-        } else if (!press && dragRef.current.active) {
-          const region = dragRef.current.region;
-          if (region === "prompt") {
-            const offset = promptOffsetAt(x, y);
-            dragRef.current.active = false;
-            promptMouseSelectionRef.current?.extendTo?.(offset, true);
-            return;
-          }
-          const span = dragRef.current.anchorSpan;
-          const releaseY = region === "status" ? clampToStatusBand(y) : clampToTranscriptViewport(y);
-          dragRef.current.active = false;
-          if (span) {
-            const rect = buildSpanRect(span, x, releaseY, region, dragRef.current.anchorScroll);
-            applySelectionRect(rect);
-          } else {
-            const anchor = region === "status" ? dragRef.current.anchor : selectionPointAtCurrentScroll(dragRef.current.anchor, dragRef.current.anchorScroll);
-            const rect = linearSelection(anchor, { x, y: releaseY });
-            const empty = rect.x1 === rect.x2 && rect.y1 === rect.y2;
-            if (empty) {
-              applySelectionRect(null);
+              startEdgeAutoscroll(-1);
             } else {
-              applySelectionRect(rect);
+              stopEdgeAutoscroll();
             }
           }
-          if (TRANSCRIPT_MEASURED_ROWS) setMeasuredRowsVersion((v) => (v + 1) % 1e6);
+        } else if (!press && baseButton === 0 && dragRef.current.active) {
+          finalizeActiveDrag(x, y);
         }
       }
     };
     inkInput.on("mouse", onMouse);
     return () => {
       inkInput.off("mouse", onMouse);
+      stopEdgeAutoscroll();
     };
   }, [inkInput, isRawModeSupported, store, passthroughCtrlWheelZoom, rows, scrollTranscriptRows, queueScrollCoalesced, applySelectionRect, applySelectionRectThrottled, selectionPointAtCurrentScroll, buildSpanRect]);
 }
@@ -10742,26 +10904,53 @@ function useTranscriptScroll({
       const scroll = stitchHarvestScrollRef.current;
       for (const row of rows) {
         if (!row || typeof row.y !== "number") continue;
-        stitchBufferRef.current.set(row.y - scroll, typeof row.text === "string" ? row.text : "");
+        stitchBufferRef.current.set(row.y - scroll, {
+          text: typeof row.text === "string" ? row.text : "",
+          sw: row.sw === true
+        });
       }
     }, 0);
   }, [store]);
+  const harvestStitchRowsNow = useCallback3((scroll) => {
+    if (dragRef.current.region !== "transcript") return;
+    const rows = store.getRenderSelectionRows?.();
+    if (!Array.isArray(rows)) return;
+    const s = Number(scroll) || 0;
+    for (const row of rows) {
+      if (!row || typeof row.y !== "number") continue;
+      stitchBufferRef.current.set(row.y - s, {
+        text: typeof row.text === "string" ? row.text : "",
+        sw: row.sw === true
+      });
+    }
+  }, [store]);
   const getStitchedSelectionText = useCallback3(() => {
+    const empty = { text: "", complete: false };
     const buf = stitchBufferRef.current;
-    if (!buf.size) return "";
-    if (dragRef.current.region !== "transcript") return "";
+    if (!buf.size) return empty;
+    if (dragRef.current.region !== "transcript") return empty;
     const rect = dragRef.current.rect;
-    if (!rect) return "";
+    if (!rect) return empty;
     const y1 = Number(rect.y1);
     const y2 = Number(rect.y2);
-    if (!Number.isFinite(y1) || !Number.isFinite(y2)) return "";
+    if (!Number.isFinite(y1) || !Number.isFinite(y2)) return empty;
     const scroll = Number(scrollTargetRef.current) || 0;
     const lo = Math.min(y1, y2) - scroll;
     const hi = Math.max(y1, y2) - scroll;
     const keys = [...buf.keys()].filter((k) => k >= lo && k <= hi).sort((a, b) => a - b);
-    if (!keys.length) return "";
-    const text = keys.map((k) => buf.get(k)).filter((t) => t != null).join("\n");
-    return text.trim() ? text : "";
+    if (!keys.length) return empty;
+    const complete = keys.length === hi - lo + 1;
+    const logical = [];
+    for (const k of keys) {
+      const entry = buf.get(k);
+      if (entry == null) continue;
+      const t = typeof entry === "string" ? entry : entry.text ?? "";
+      const sw = typeof entry === "string" ? false : entry.sw === true;
+      if (sw && logical.length > 0) logical[logical.length - 1] += t;
+      else logical.push(t);
+    }
+    const text = logical.map((l) => l.replace(/\s+$/u, "")).join("\n");
+    return text.trim() ? { text, complete } : empty;
   }, []);
   const stopSmoothScroll = useCallback3(() => {
     if (!scrollAnimationRef.current) return;
@@ -10856,6 +11045,25 @@ function useTranscriptScroll({
     if (nextRect) harvestStitchRowsSoon();
     return true;
   }, [store, rememberSelectionTextSoon, harvestStitchRowsSoon]);
+  const cancelPendingSelectionPaint = useCallback3(() => {
+    const state = selectionPaintRef.current;
+    if (state.timer) {
+      clearTimeout(state.timer);
+      state.timer = null;
+    }
+    state.pending = null;
+  }, []);
+  const flushPendingSelectionPaint = useCallback3(() => {
+    const state = selectionPaintRef.current;
+    if (!state.timer && !state.pending) return;
+    const pending = state.pending;
+    if (state.timer) {
+      clearTimeout(state.timer);
+      state.timer = null;
+    }
+    state.pending = null;
+    if (pending) paintSelectionRect(pending, { rememberText: false, immediate: true });
+  }, [paintSelectionRect]);
   const applySelectionRect = useCallback3((rect) => {
     const clippedRect = withSelectionClip(rect);
     dragRef.current.rect = clippedRect || null;
@@ -10863,14 +11071,9 @@ function useTranscriptScroll({
       selectionTextRef.current = "";
       clearStitchBuffer();
     }
-    const state = selectionPaintRef.current;
-    if (state.timer) {
-      clearTimeout(state.timer);
-      state.timer = null;
-      state.pending = null;
-    }
+    cancelPendingSelectionPaint();
     paintSelectionRect(clippedRect, { rememberText: true, immediate: true });
-  }, [paintSelectionRect, withSelectionClip, clearStitchBuffer]);
+  }, [paintSelectionRect, withSelectionClip, clearStitchBuffer, cancelPendingSelectionPaint]);
   const applySelectionRectThrottled = useCallback3((rect) => {
     const clippedRect = withSelectionClip(rect, { captureText: false });
     if (selectionRectsEqual(dragRef.current.rect, clippedRect)) return;
@@ -10880,11 +11083,7 @@ function useTranscriptScroll({
     const now = Date.now();
     const elapsed = now - state.t;
     if (elapsed >= SELECTION_PAINT_INTERVAL_MS) {
-      if (state.timer) {
-        clearTimeout(state.timer);
-        state.timer = null;
-        state.pending = null;
-      }
+      cancelPendingSelectionPaint();
       paintSelectionRect(clippedRect, { rememberText: false });
       return;
     }
@@ -10899,7 +11098,7 @@ function useTranscriptScroll({
       }, Math.max(1, SELECTION_PAINT_INTERVAL_MS - elapsed));
       state.timer.unref?.();
     }
-  }, [paintSelectionRect, withSelectionClip]);
+  }, [paintSelectionRect, withSelectionClip, cancelPendingSelectionPaint]);
   const selectionPointAtCurrentScroll = useCallback3((point, pointScroll = 0) => {
     if (!point) return null;
     return {
@@ -10929,14 +11128,14 @@ function useTranscriptScroll({
         mHi = { x: lr.x2, y: lr.y2 };
       } else {
         mLo = { x: 0, y };
-        mHi = { x, y };
+        mHi = { x: Math.max(0, frameColumns - 1), y };
       }
     }
     const rect = (a, b) => ({ mode: "linear", x1: a.x, y1: a.y, x2: b.x, y2: b.y });
     if (comparePoints(mHi, spanLo) < 0) return rect(spanHi, mLo);
     if (comparePoints(mLo, spanHi) > 0) return rect(spanLo, mHi);
     return rect(spanLo, spanHi);
-  }, [store, selectionPointAtCurrentScroll]);
+  }, [store, frameColumns, selectionPointAtCurrentScroll]);
   const transcriptViewportRows = useCallback3(() => {
     const top = Math.max(0, Number(transcriptViewportRef.current?.top) || 0);
     const bottom = Math.max(top, Number(transcriptViewportRef.current?.bottom) || top);
@@ -10977,6 +11176,10 @@ function useTranscriptScroll({
     const maxTarget = Math.max(0, Number(maxScrollRowsRef.current) || 0);
     const target = Math.max(0, Math.min(maxTarget, scrollTargetRef.current + deltaRows));
     const appliedDelta = target - scrollTargetRef.current;
+    if (appliedDelta !== 0 && dragRef.current.region === "transcript" && dragRef.current.rect) {
+      flushPendingSelectionPaint();
+      harvestStitchRowsNow(Number(scrollTargetRef.current) || 0);
+    }
     if (appliedDelta !== 0) cancelTranscriptFollow();
     scrollTargetRef.current = target;
     if (appliedDelta !== 0) {
@@ -11022,8 +11225,9 @@ function useTranscriptScroll({
       } else {
         rect = shiftSelectionRectY(dragRef.current.rect, appliedDelta);
       }
-      const clippedRect = withSelectionClip(rect);
+      const clippedRect = dragRef.current.active ? withSelectionClip(rect, { captureText: false }) : withSelectionClip(rect);
       dragRef.current = { ...dragRef.current, rect: clippedRect };
+      cancelPendingSelectionPaint();
       paintSelectionRect(clippedRect, { rememberText: false });
     }
     if (options.smooth) {
@@ -11033,7 +11237,7 @@ function useTranscriptScroll({
     stopSmoothScroll();
     scrollPositionRef.current = target;
     setScrollOffset(Math.round(target));
-  }, [startSmoothScroll, stopSmoothScroll, paintSelectionRect, selectionPointAtCurrentScroll, withSelectionClip, cancelTranscriptFollow, buildSpanRect]);
+  }, [startSmoothScroll, stopSmoothScroll, paintSelectionRect, selectionPointAtCurrentScroll, withSelectionClip, cancelTranscriptFollow, buildSpanRect, harvestStitchRowsNow, cancelPendingSelectionPaint, flushPendingSelectionPaint]);
   const queueScrollCoalesced = useCallback3((deltaRows) => {
     const state = scrollCoalesceRef.current;
     state.pendingRows += deltaRows;
@@ -11189,6 +11393,7 @@ function useTranscriptWindow({
 }) {
   const transcriptTotalRowsRef = useRef8(0);
   const preservedScrollDeltaRef = useRef8(0);
+  const committedMaxScrollRowsRef = useRef8(0);
   const incrementalRowIndexCacheRef = useRef8(null);
   const prevViewportGeomRef = useRef8({ contentHeight: 0, floatingPanelRows: 0 });
   const transcriptItemElsRef = useRef8(/* @__PURE__ */ new Map());
@@ -11358,7 +11563,31 @@ function useTranscriptWindow({
     rowIndex: transcriptRowIndex
     // eslint-disable-next-line react-hooks/exhaustive-deps -- intentional: sig+scroll/viewport capture the relevant changes
   }), [transcriptStructureSig, renderScrollOffset, transcriptContentHeight, transcriptRowIndex]);
-  maxScrollRowsRef.current = transcriptWindow.maxScrollRows;
+  const estimateMaxScrollRows = Math.max(0, Number(transcriptWindow.maxScrollRows) || 0);
+  let holdCommittedMax = false;
+  if (TRANSCRIPT_MEASURED_ROWS && estimateMaxScrollRows > committedMaxScrollRowsRef.current) {
+    const toolExpandedFlag = toolOutputExpanded ? 1 : 0;
+    const mountedSlice = transcriptWindow.items || [];
+    for (let i = 0; i < mountedSlice.length; i++) {
+      const it = mountedSlice[i];
+      if (!it || shouldSuppressFullyFailedToolItem(it)) continue;
+      if (it.kind === "assistant" && it.streaming) {
+        const idPrev = streamingMeasuredRowsById.get(it.id);
+        if (!idPrev || idPrev.columns !== frameColumns || idPrev.toolExpanded !== toolExpandedFlag) {
+          holdCommittedMax = true;
+          break;
+        }
+      } else {
+        const prev = transcriptMeasuredRowsCache.get(it);
+        if (!prev || prev.columns !== frameColumns || prev.toolExpanded !== toolExpandedFlag || prev.variantKey !== transcriptItemVariantKey(it)) {
+          holdCommittedMax = true;
+          break;
+        }
+      }
+    }
+  }
+  if (!holdCommittedMax) committedMaxScrollRowsRef.current = estimateMaxScrollRows;
+  maxScrollRowsRef.current = committedMaxScrollRowsRef.current;
   transcriptGeomRef.current = {
     prefixRows: transcriptRowIndex?.prefixRows || null,
     totalRows: Math.max(0, Number(transcriptWindow.totalRows) || 0),
@@ -12576,6 +12805,7 @@ function createExtensionPickers({
   clean: clean3,
   copyToClipboard: copyToClipboard2,
   setPicker,
+  getPicker,
   setProviderPrompt,
   setChannelPrompt,
   setHookPrompt,
@@ -12583,6 +12813,8 @@ function createExtensionPickers({
   getDisabledSkills,
   setDisabledSkills
 }) {
+  let mcpEpoch = 0;
+  let mcpActive = false;
   const mcpStatus = () => {
     let status;
     try {
@@ -12597,6 +12829,7 @@ function createExtensionPickers({
     const status = mcpStatus();
     if (!status) return;
     const servers = status.servers || [];
+    const optimistic = options?.optimistic || null;
     const items = [];
     if (servers.length === 0) {
       items.push({
@@ -12607,13 +12840,14 @@ function createExtensionPickers({
       });
     }
     for (const server of servers) {
-      const enabled = server.enabled !== false;
+      const pending = optimistic && optimistic.name === server.name;
+      const enabled = pending ? optimistic.enabled : server.enabled !== false;
       items.push({
         value: `server:${server.name}`,
         label: server.name,
         marker: enabled ? "\u25CF" : "\u25CB",
         markerColor: enabled ? theme2.success : theme2.inactive,
-        description: `${server.status || "unknown"} \xB7 ${server.transport || "unknown"} \xB7 ${server.toolCount || 0} tools${server.error ? ` \xB7 ${server.error}` : ""}`,
+        description: pending ? `${optimistic.enabled ? "enabling" : "disabling"}\u2026 \xB7 ${server.transport || "unknown"}` : `${server.status || "unknown"} \xB7 ${server.transport || "unknown"} \xB7 ${server.toolCount || 0} tools${server.error ? ` \xB7 ${server.error}` : ""}`,
         _action: "server",
         _server: server,
         _enabled: enabled
@@ -12625,9 +12859,24 @@ function createExtensionPickers({
     setSettingsPrompt(null);
     const toggleServer = (item) => {
       if (item._action !== "server" || !item._server?.name) return;
-      void store.setMcpServerEnabled?.(item._server.name, !item._enabled).then(() => openMcpServersPicker({ highlightValue: `server:${item._server.name}` })).catch((e) => store.pushNotice(`mcp toggle failed: ${e?.message || e}`, "error"));
+      const name = item._server.name;
+      const target = !item._enabled;
+      const highlightValue = `server:${name}`;
+      const token = ++mcpEpoch;
+      const settle = (fn) => {
+        if (token !== mcpEpoch || !mcpActive || getPicker?.()?._kind !== "mcp-servers") return;
+        fn();
+      };
+      openMcpServersPicker({ highlightValue, optimistic: { name, enabled: target } });
+      Promise.resolve(store.setMcpServerEnabled?.(name, target)).then(() => {
+        settle(() => openMcpServersPicker({ highlightValue }));
+      }).catch((e) => {
+        store.pushNotice(`mcp toggle failed: ${e?.message || e}`, "error");
+        settle(() => openMcpServersPicker({ highlightValue }));
+      });
     };
     setPicker({
+      _kind: "mcp-servers",
       title: "MCP servers",
       description: "Enable or disable configured MCP servers.",
       initialIndex: Math.max(0, items.findIndex((entry) => entry.value === options?.highlightValue)),
@@ -12636,9 +12885,12 @@ function createExtensionPickers({
       onLeft: (item) => toggleServer(item),
       onRight: (item) => toggleServer(item),
       onCancel: () => {
+        mcpActive = false;
+        mcpEpoch++;
         setPicker(null);
       }
     });
+    mcpActive = true;
   };
   const openMcpPicker = () => {
     openMcpServersPicker();
@@ -12695,9 +12947,14 @@ function createExtensionPickers({
     });
   };
   const openSkillsPicker = (options = {}) => {
-    const status = skillsStatus();
-    if (!status) return;
-    const skills = status.skills || [];
+    let skills;
+    if (Array.isArray(options.skills)) {
+      skills = options.skills;
+    } else {
+      const status = skillsStatus();
+      if (!status) return;
+      skills = status.skills || [];
+    }
     const disabledSet = options.disabledOverride instanceof Set ? options.disabledOverride : getDisabledSkills();
     const items = [];
     if (skills.length === 0) {
@@ -12736,9 +12993,10 @@ function createExtensionPickers({
         `skill ${item._enabled ? "disabled" : "enabled"}: ${name} (prompt updates next session /clear)`,
         "info"
       );
-      openSkillsPicker({ highlightValue: name, disabledOverride: next });
+      openSkillsPicker({ highlightValue: name, disabledOverride: next, skills });
     };
     setPicker({
+      _kind: "skills",
       title: "Skills",
       description: "Enable or disable project skills.",
       initialIndex: Math.max(0, items.findIndex((entry) => entry.value === options.highlightValue)),
@@ -13021,6 +13279,7 @@ ${p.description}` : ""
       }
     };
     setPicker({
+      _kind: "hooks",
       title: "Hooks",
       description: "Before-tool hook rules; Enter toggles a rule.",
       items,
@@ -13249,8 +13508,6 @@ function createMaintenancePickers({
       const current = readCurrent();
       const enabled = current?.enabled !== false;
       const idleMs = Number(current?.idleMs || HOUR_MS);
-      const custom = current?.custom === true;
-      const providerDefault = Number(current?.providerDefault || HOUR_MS);
       const cacheTtlLabel = !enabled || idleMs >= HOUR_MS ? "1h" : "5m";
       const items = [
         {
@@ -13263,9 +13520,6 @@ function createMaintenancePickers({
         {
           value: "advanced",
           label: "Advanced",
-          marker: !custom ? "\u2713" : "",
-          markerColor: theme2.success,
-          meta: `${current?.provider || "current"} \xB7 ${formatDuration2(providerDefault)}`,
           description: "Edit provider-paired default idle windows as text.",
           _action: "advanced"
         }
@@ -13748,6 +14002,18 @@ function sleepSync(ms) {
     }
   }
 }
+function _describeLockHolder(lockPath) {
+  try {
+    const st = statSync2(lockPath);
+    const owner = _readLockOwner(lockPath);
+    const ageMs = Math.max(0, Math.round(Date.now() - st.mtimeMs));
+    const live = owner.pid === null ? "unknown" : _ownerIsLive(owner) ? "live" : "dead";
+    const token = owner.token === null ? "?" : String(owner.token).slice(0, 8);
+    return `holder pid=${owner.pid ?? "?"} token=${token} age=${ageMs}ms ${live}`;
+  } catch {
+    return "holder unknown (lock file unreadable/absent)";
+  }
+}
 function renameWithRetrySync(src, dst, opts = {}) {
   const backoffs = Array.isArray(opts.backoffs) && opts.backoffs.length > 0 ? opts.backoffs : DEFAULT_BACKOFFS_MS;
   let lastErr = null;
@@ -13779,7 +14045,7 @@ function withFileLockSync(lockPath, fn, opts = {}) {
       lastErr = err;
       if (!LOCK_WAIT_CODES.has(err?.code)) throw err;
       if (timeoutMs <= 0) {
-        const contErr = new Error(`atomic lock contended (try-once): ${lockPath}`);
+        const contErr = new Error(`atomic lock contended (try-once): ${lockPath} [${_describeLockHolder(lockPath)}]`);
         contErr.code = "ELOCKCONTENDED";
         contErr.cause = err;
         throw contErr;
@@ -13814,7 +14080,7 @@ function withFileLockSync(lockPath, fn, opts = {}) {
       }
     }
   }
-  const timeoutErr = new Error(`atomic lock timeout after ${timeoutMs}ms: ${lockPath}`);
+  const timeoutErr = new Error(`atomic lock timeout after ${timeoutMs}ms: ${lockPath} [${_describeLockHolder(lockPath)}]`);
   timeoutErr.code = "ELOCKTIMEOUT";
   timeoutErr.cause = lastErr;
   throw timeoutErr;
@@ -13927,8 +14193,21 @@ function _reclaimGuardMatchesToken(guardPath, token) {
     return false;
   }
 }
-function _unlinkReclaimGuardIfPidMatches(guardPath, pid) {
-  if (_readLockOwnerPid(guardPath) !== pid) return false;
+function _readGuardContent(guardPath) {
+  try {
+    return readFileSync2(guardPath, "utf8");
+  } catch {
+    return null;
+  }
+}
+function _parseStampPid(raw) {
+  if (raw === null) return null;
+  const tok = String(raw).trim().split(/\s+/)[0];
+  const pid = Number.parseInt(tok, 10);
+  return Number.isFinite(pid) && pid > 0 ? pid : null;
+}
+function _unlinkReclaimGuardIfContentMatches(guardPath, content) {
+  if (_readGuardContent(guardPath) !== content) return false;
   try {
     unlinkSync2(guardPath);
     return true;
@@ -13946,7 +14225,8 @@ function _unlinkUnreadableStaleReclaimGuard(guardPath, staleMs) {
   }
 }
 function _tryClearStaleReclaimGuard(guardPath, staleMs) {
-  const guardPid = _readLockOwnerPid(guardPath);
+  const guardContent = _readGuardContent(guardPath);
+  const guardPid = _parseStampPid(guardContent);
   if (guardPid !== null) {
     let guardStale = false;
     try {
@@ -13954,7 +14234,7 @@ function _tryClearStaleReclaimGuard(guardPath, staleMs) {
     } catch {
     }
     if (_pidIsDead(guardPid) || guardStale) {
-      _unlinkReclaimGuardIfPidMatches(guardPath, guardPid);
+      _unlinkReclaimGuardIfContentMatches(guardPath, guardContent);
     }
     return;
   }
@@ -13992,8 +14272,8 @@ function _releaseReclaimGuard(reclaim) {
   }
 }
 function _asyncSleep(ms) {
-  return new Promise((resolve6) => {
-    setTimeout(resolve6, Math.max(1, Number(ms) || 1));
+  return new Promise((resolve5) => {
+    setTimeout(resolve5, Math.max(1, Number(ms) || 1));
   });
 }
 async function withFileLock(lockPath, fn, opts = {}) {
@@ -14011,7 +14291,7 @@ async function withFileLock(lockPath, fn, opts = {}) {
       lastErr = err;
       if (!LOCK_WAIT_CODES.has(err?.code)) throw err;
       if (timeoutMs <= 0) {
-        const contErr = new Error(`atomic lock contended (try-once): ${lockPath}`);
+        const contErr = new Error(`atomic lock contended (try-once): ${lockPath} [${_describeLockHolder(lockPath)}]`);
         contErr.code = "ELOCKCONTENDED";
         contErr.cause = err;
         throw contErr;
@@ -14046,7 +14326,7 @@ async function withFileLock(lockPath, fn, opts = {}) {
       }
     }
   }
-  const timeoutErr = new Error(`atomic lock timeout after ${timeoutMs}ms: ${lockPath}`);
+  const timeoutErr = new Error(`atomic lock timeout after ${timeoutMs}ms: ${lockPath} [${_describeLockHolder(lockPath)}]`);
   timeoutErr.code = "ELOCKTIMEOUT";
   timeoutErr.cause = lastErr;
   throw timeoutErr;
@@ -14196,21 +14476,6 @@ function writeFileAtomicSync(filePath, data, opts = {}) {
 function writeJsonAtomicSync(filePath, value, opts = {}) {
   return writeFileAtomicSync(filePath, JSON.stringify(value, null, opts.compact ? 0 : 2) + "\n", opts);
 }
-function updateJsonAtomicSync(filePath, mutator, opts = {}) {
-  const { lock: _lock, ...writeOpts } = opts;
-  return withFileLockSync(`${filePath}.lock`, () => {
-    let cur = null;
-    try {
-      cur = JSON.parse(readFileSync2(filePath, "utf8"));
-    } catch {
-      cur = null;
-    }
-    const next = mutator(cur);
-    if (next === void 0) return cur;
-    writeJsonAtomicSync(filePath, next, { ...writeOpts, lock: false });
-    return next;
-  }, opts);
-}
 async function updateJsonAtomic(filePath, mutator, opts = {}) {
   const { lock: _lock, ...writeOpts } = opts;
   return withFileLock(`${filePath}.lock`, () => {
@@ -15160,7 +15425,7 @@ function createModelPicker({
         items: [],
         onCancel: cancelModelPicker
       });
-      await new Promise((resolve6) => setTimeout(resolve6, 0));
+      await new Promise((resolve5) => setTimeout(resolve5, 0));
       try {
         if (options.refreshModels !== true && options.cacheRef !== "search") {
           refreshModelsPromise = Promise.resolve(loadModels({ force: false }));
@@ -15486,7 +15751,7 @@ function createProviderSetupPicker({
         }
       });
       try {
-        await new Promise((resolve6) => setTimeout(resolve6, 0));
+        await new Promise((resolve5) => setTimeout(resolve5, 0));
         setup = await store.getProviderSetup();
       } catch (e) {
         store.pushNotice(`providers failed: ${e?.message || e}`, "error");
@@ -16872,10 +17137,6 @@ function createSlashDispatch({
         return true;
       }
       case "search":
-        if (state.busy) {
-          store.pushNotice("wait for the current turn to finish before /search", "warn");
-          return false;
-        }
         if (arg) store.pushNotice("/search sets the search provider/model; the search tool uses that model when called.", "warn");
         openSearchPicker();
         return true;
@@ -17276,57 +17537,64 @@ function usePromptHandlers({
   const handlePromptPaste = useCallback5((text, meta = {}) => {
     const source = String(meta?.source || "paste");
     const value = String(text ?? "");
-    if (source === "clipboard-image-shortcut" && !value) {
-      return readClipboardImageAttachment().then((image) => {
-        if (!image) {
-          showPromptHint("no image found on clipboard", "plain");
-          return false;
+    const processText = (raw, returnRaw = false) => {
+      const chunks = splitPastedImagePathCandidates(raw);
+      const hasImagePath = chunks.some((chunk) => chunk.imagePath);
+      if (!hasImagePath) {
+        if (shouldFoldPastedText(raw)) return registerPastedText(raw);
+        return returnRaw ? raw : void 0;
+      }
+      return Promise.all(chunks.map(async (chunk) => {
+        if (!chunk.imagePath) return chunk.text;
+        try {
+          const image = await readImageAttachmentFromPath(chunk.text, state.cwd || process.cwd());
+          if (!image) return chunk.text;
+          const ref = registerPastedImage(image);
+          showPromptHint(`attached ${image.filename || "image"}`, "plain");
+          return ref;
+        } catch (e) {
+          showPromptHint(`image attach failed: ${e?.message || e}`, "warn");
+          return chunk.text;
         }
-        const ref = registerPastedImage(image);
-        showPromptHint(`attached ${image.filename || "clipboard image"}`, "plain");
-        return ref;
+      })).then((parts) => {
+        let out = "";
+        let run = "";
+        const flushRun = () => {
+          if (!run) return;
+          out += shouldFoldPastedText(run) ? registerPastedText(run) : run;
+          run = "";
+        };
+        for (let i = 0; i < chunks.length; i += 1) {
+          if (chunks[i].imagePath) {
+            flushRun();
+            out += parts[i];
+          } else {
+            run += parts[i];
+          }
+        }
+        flushRun();
+        return out;
+      });
+    };
+    if (source === "clipboard-shortcut" && !value) {
+      return readClipboardText().then((clip) => {
+        const normalized = String(clip ?? "").replace(/\r\n?/g, "\n");
+        if (normalized) return processText(normalized, true);
+        return readClipboardImageAttachment().then((image) => {
+          if (!image) {
+            showPromptHint("no text or image found on clipboard", "plain");
+            return false;
+          }
+          const ref = registerPastedImage(image);
+          showPromptHint(`attached ${image.filename || "clipboard image"}`, "plain");
+          return ref;
+        });
       }).catch((e) => {
-        showPromptHint(`image paste failed: ${e?.message || e}`, "warn");
+        showPromptHint(`paste failed: ${e?.message || e}`, "warn");
         return false;
       });
     }
-    const chunks = splitPastedImagePathCandidates(value);
-    const hasImagePath = chunks.some((chunk) => chunk.imagePath);
-    if (!hasImagePath) {
-      if (shouldFoldPastedText(value)) return registerPastedText(value);
-      return void 0;
-    }
-    return Promise.all(chunks.map(async (chunk) => {
-      if (!chunk.imagePath) return chunk.text;
-      try {
-        const image = await readImageAttachmentFromPath(chunk.text, state.cwd || process.cwd());
-        if (!image) return chunk.text;
-        const ref = registerPastedImage(image);
-        showPromptHint(`attached ${image.filename || "image"}`, "plain");
-        return ref;
-      } catch (e) {
-        showPromptHint(`image attach failed: ${e?.message || e}`, "warn");
-        return chunk.text;
-      }
-    })).then((parts) => {
-      let out = "";
-      let run = "";
-      const flushRun = () => {
-        if (!run) return;
-        out += shouldFoldPastedText(run) ? registerPastedText(run) : run;
-        run = "";
-      };
-      for (let i = 0; i < chunks.length; i += 1) {
-        if (chunks[i].imagePath) {
-          flushRun();
-          out += parts[i];
-        } else {
-          run += parts[i];
-        }
-      }
-      flushRun();
-      return out;
-    });
+    return processText(value);
   }, [registerPastedImage, registerPastedText, showPromptHint, state.cwd]);
   const handlePromptHistoryNavigate = useCallback5((direction, currentText = "", meta = {}) => {
     const currentValue = String(currentText || "");
@@ -17675,7 +17943,7 @@ var AssistantMessage = React14.memo(function AssistantMessage2({
 });
 var UserMessage = React14.memo(function UserMessage2({ text, attached = false, columns, themeEpoch = 0 }) {
   const bandColumns = Math.max(1, columns - 1);
-  return /* @__PURE__ */ jsx14(Box12, { flexDirection: "column", width: bandColumns, marginTop: attached ? 0 : 1, backgroundColor: theme.userMessageBackground, paddingLeft: 2, paddingRight: 1, children: /* @__PURE__ */ jsx14(Text14, { color: theme.text, wrap: "wrap", children: text }) });
+  return /* @__PURE__ */ jsx14(Box12, { flexDirection: "column", width: bandColumns, marginTop: attached ? 0 : 1, backgroundColor: theme.userMessageBackground, paddingLeft: 2, paddingRight: 1, children: /* @__PURE__ */ jsx14(Text14, { color: theme.mixdogIvory, wrap: "wrap", children: text }) });
 });
 function NoticeMessage({ text, tone, columns = 80 }) {
   const accentColor = tone === "error" ? theme.error : tone === "warn" ? theme.warning : theme.inactive;
@@ -18364,13 +18632,13 @@ function ToolExecution({ name, args, result, rawResult, isError, errorCount, exp
   else if (isShellSurface) labelText = shellHeader(shellStatus, displayGroupCount);
   else labelText = (isAgentTool(normalizedName) ? agentActionTitle(parsedArgs) : "") || statusCopy(name, label, displayGroupCount, doneCount, headerPending, isError, parsedArgs);
   labelText = safeInlineText(labelText);
-  const toolSearchSummary = !pending && normalizedName === "tool_search" && hasResult ? toolSearchLoadedSummary(displayedResultText) : "";
+  const toolSearchSummary = !pending && normalizedName === "load_tool" && hasResult ? toolSearchLoadedSummary(displayedResultText) : "";
   const rawSummaryText = safeInlineText(isAgentResponse || isBackgroundResponse ? "" : toolSearchSummary || (isAgentTool(normalizedName) ? agentActionSummary(parsedArgs, summary) : summary));
   const summaryIsHeaderCount = rawSummaryText && /^\d+\s+\S+$/.test(rawSummaryText) && labelText.endsWith(rawSummaryText);
   const summaryText = summaryIsHeaderCount ? "" : rawSummaryText;
   const agentHasExpandableBody = isAgentSurfaceCard && !pending && hasResult && (isAgentResponse || totalLines > 1 || firstResultLineClipped);
   const shellHasExpandableBody = isShellSurface && !pending && hasDisplayResult && hasDisplayBody && (totalLines > 1 || firstResultLineClipped || Boolean(shellCollapsedSummary && shellCollapsedSummary !== firstResultLine));
-  const showHeaderExpandHint = (isShellSurface ? shellHasExpandableBody : isAgentSurfaceCard ? agentHasExpandableBody : hasHiddenDetail || backgroundMetadataExpandable) && normalizedName !== "tool_search";
+  const showHeaderExpandHint = (isShellSurface ? shellHasExpandableBody : isAgentSurfaceCard ? agentHasExpandableBody : hasHiddenDetail || backgroundMetadataExpandable) && normalizedName !== "load_tool";
   const expandHintColor = theme.subtle;
   const gutter = 2;
   const hintLabel = showHeaderExpandHint ? `ctrl+o ${expanded ? "collapse" : "expand"}` : "";
@@ -18602,7 +18870,9 @@ var PANEL_LAYOUT_SIG = {
   TEXT: 5,
   // Prompt-wrap/meta row counts (trailing churn tokens, see token order note
   // below). PROMPT_META is the 2-row live-spinner band slot.
-  PROMPT_META: 9
+  PROMPT_META: 9,
+  // Queued steering band rows (full wrapped height, see queuedBandRows).
+  QUEUED: 10
 };
 var PROJECT_TEXT_ENTRY_KINDS = /* @__PURE__ */ new Set(["project-new", "project-create-confirm", "project-rename"]);
 var CORE_MULTILINE_TEXT_ENTRY_KINDS = /* @__PURE__ */ new Set(["core-add", "core-edit"]);
@@ -18664,7 +18934,9 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
   const projectPickerRef = useRef9(null);
   const buildProjectPickerState = (opts) => projectPickerRef.current.buildProjectPickerState(opts);
   const [picker, setPickerState] = useState8(null);
+  const livePickerRef = useRef9(null);
   const setPicker = useCallback6((next) => {
+    livePickerRef.current = typeof next === "function" ? next(livePickerRef.current) : next;
     setPickerState((prev) => {
       const resolved = typeof next === "function" ? next(prev) : next;
       if (resolved && typeof resolved === "object" && pickerOpenedFromEnterRef.current) {
@@ -18675,9 +18947,13 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
         }
         return resolved.indexMode ? resolved : { ...resolved, indexMode: "always" };
       }
+      if (resolved && typeof resolved === "object" && !resolved.indexMode && prev && typeof prev === "object" && prev.indexMode && prev._kind && prev._kind === resolved._kind) {
+        return { ...resolved, indexMode: prev.indexMode };
+      }
       return resolved;
     });
   }, []);
+  livePickerRef.current = picker;
   const [contextPanel, setContextPanel] = useState8(null);
   const [usagePanel, setUsagePanel] = useState8(null);
   const usageRequestRef = useRef9(0);
@@ -18719,7 +18995,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
     } catch {
     }
     if (!onboardingOwnsScreen && state.items.length === 0) {
-      setPickerState(projectPicker.buildProjectPickerState({ initialEntry: true }));
+      setPicker(projectPicker.buildProjectPickerState({ initialEntry: true }));
     }
   }
   const {
@@ -18790,6 +19066,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
     clean,
     copyToClipboard,
     setPicker,
+    getPicker: () => livePickerRef.current,
     setProviderPrompt,
     setChannelPrompt,
     setHookPrompt,
@@ -19292,13 +19569,16 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
     const renderText = store.getRenderSelectionText?.();
     const remembered = selectionTextRef.current || "";
     let text = renderText == null ? remembered : remembered.length > renderText.length ? remembered : renderText;
-    const stitched = getStitchedSelectionText?.() || "";
-    if (stitched.length > text.length) text = stitched;
+    const stitched = getStitchedSelectionText?.() || { text: "", complete: false };
+    if (stitched.complete && stitched.text.length > text.length) text = stitched.text;
     if ((!text || !text.trim()) && attempt < 4) {
       setTimeout(() => copySelection(attempt + 1), attempt === 0 ? 0 : 24);
       return;
     }
-    if (!text || !text.trim()) return;
+    if (!text || !text.trim()) {
+      showSelectionCopyHint("nothing to copy \xB7 select text first", "error");
+      return;
+    }
     selectionTextRef.current = text;
     copyToClipboard(text).then(() => {
       const lines = text.split("\n").length;
@@ -19374,8 +19654,8 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
       let timer = null;
       Promise.race([
         Promise.resolve(store.dispose?.("cli-react-exit", { detach: true })),
-        new Promise((resolve6) => {
-          timer = setTimeout(resolve6, 350);
+        new Promise((resolve5) => {
+          timer = setTimeout(resolve5, 350);
         })
       ]).finally(() => {
         if (timer) clearTimeout(timer);
@@ -20481,7 +20761,13 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
   const promptMetaRows = promptMetaVisible ? 2 : 0;
   const overlayHintRequested = !inputBoxHidden && !hasFloatingPanel && !liveSpinner && !!inputHint && !queuedVisible;
   const overlayHintRows = 0;
-  const queuedRows = queuedVisible ? state.queued.length : 0;
+  const queuedFullRows = queuedVisible ? state.queued.reduce(
+    (sum, item) => sum + queuedBandRows(String(item.displayText || item.text || ""), Math.max(1, frameColumns - 4)),
+    0
+  ) : 0;
+  const queuedRowBudget = Math.max(3, Math.floor(resizeState.rows / 3));
+  const queuedCompact = queuedFullRows > queuedRowBudget;
+  const queuedRows = queuedVisible ? queuedCompact ? state.queued.length : queuedFullRows : 0;
   const INPUT_BOX_ROWS = promptBoxRows + promptMetaRows + overlayHintRows;
   const baseReserve = WELCOME_ROWS + SCROLL_HINT_ROWS + LIVE_STATUS_ROWS + INPUT_BOX_ROWS + STATUSLINE_ROWS + queuedRows;
   const maxFloatingPanelRows = Math.max(0, resizeState.rows - baseReserve - 1);
@@ -20516,10 +20802,14 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
     const nextMetaRows = Number(String(panelLayoutSignature).split("|")[PANEL_LAYOUT_SIG.PROMPT_META]) || 0;
     const doneTailAppendedThisCommit = latestDoneAtTail && (latestTranscriptItem?.id ?? null) !== panelTransition.tailId;
     const spinnerMetaCollapseRows = doneTailAppendedThisCommit ? Math.max(0, prevMetaRows - nextMetaRows) : 0;
+    const prevQueuedSigRows = Number(String(panelTransition.signature).split("|")[PANEL_LAYOUT_SIG.QUEUED]) || 0;
+    const nextQueuedSigRows = Number(String(panelLayoutSignature).split("|")[PANEL_LAYOUT_SIG.QUEUED]) || 0;
+    const userTailAppendedThisCommit = latestTranscriptItem?.kind === "user" && (latestTranscriptItem?.id ?? null) !== panelTransition.tailId;
+    const queuedPromoteCollapseRows = userTailAppendedThisCommit ? Math.max(0, prevQueuedSigRows - nextQueuedSigRows) : 0;
     const instantPanelClose = panelShrinkRows > 0 && (promptRowsOnlyChange || isInstantPanelCloseTransition(panelTransition.signature, panelLayoutSignature, initialProjectEntryClose));
     const slashOpenOnEmptyTranscript = initialProjectEntryClose && !panelSignatureFlags(panelTransition.signature).slash && panelSignatureFlags(panelLayoutSignature).slash;
     if (instantPanelClose) {
-      panelCloseInkMaskRowsRef.current = Math.max(0, panelShrinkRows - spinnerMetaCollapseRows);
+      panelCloseInkMaskRowsRef.current = Math.max(0, panelShrinkRows - spinnerMetaCollapseRows - queuedPromoteCollapseRows);
       panelTransition.clearRows = 0;
       panelTransition.guardRows = 0;
       panelTransition.epoch = panelTransitionEpoch;
@@ -20548,8 +20838,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
   const viewportHeight = Math.max(1, resizeState.rows - bottomReserve);
   const guardCapacityRows = Math.max(0, viewportHeight - 1);
   const baseGuardRows = guardCapacityRows > 0 ? 1 : 0;
-  const scrollGuardNearBottom = followingRef.current || scrollTargetRef.current <= baseGuardRows;
-  const scrollGuardRows = !scrollGuardNearBottom && scrollOffset > 0 && guardCapacityRows > baseGuardRows ? 1 : 0;
+  const scrollGuardRows = 0;
   const transcriptGuardRows = Math.min(guardCapacityRows, baseGuardRows + panelTransitionGuardRows + scrollGuardRows);
   const welcomePromptHintText = conditionalWelcomePromptHint || welcomePromptHintRef.current || "";
   const welcomePromptHintVisible = Boolean(
@@ -20557,13 +20846,14 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
   );
   const welcomePromptHintRows = welcomePromptHintVisible && viewportHeight - transcriptGuardRows >= 2 ? 1 : 0;
   welcomePromptHintVisibleRef.current = welcomePromptHintRows > 0;
+  const overlayHintBandRows = overlayHintRequested && state.items.length === 0 && viewportHeight - transcriptGuardRows - welcomePromptHintRows >= 2 ? 1 : 0;
   const panelCloseMaskRows = Math.min(
     panelCloseInkMaskRows,
-    Math.max(0, viewportHeight - transcriptGuardRows - welcomePromptHintRows - 1)
+    Math.max(0, viewportHeight - transcriptGuardRows - welcomePromptHintRows - overlayHintBandRows - 1)
   );
   const transcriptContentHeight = Math.max(
     1,
-    viewportHeight - transcriptGuardRows - panelCloseMaskRows - welcomePromptHintRows
+    viewportHeight - transcriptGuardRows - panelCloseMaskRows - welcomePromptHintRows - overlayHintBandRows
   );
   const transcriptBottomSlackRows = Math.max(0, baseGuardRows);
   transcriptBottomSlackRowsRef.current = transcriptBottomSlackRows;
@@ -20785,9 +21075,13 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
                 backgroundColor: surfaceBackground()
               }
             ) : null,
+            overlayHintBandRows > 0 ? /* @__PURE__ */ jsxs16(Box18, { height: 1, flexShrink: 0, backgroundColor: surfaceBackground(), flexDirection: "row", width: "100%", overflow: "hidden", children: [
+              /* @__PURE__ */ jsx20(Box18, { flexGrow: 1, flexShrink: 1, overflow: "hidden" }),
+              /* @__PURE__ */ jsx20(Box18, { flexShrink: 0, width: guardHintWidth || 1, marginLeft: 1, marginRight: 1, justifyContent: "flex-end", overflow: "hidden", children: /* @__PURE__ */ jsx20(Text20, { color: promptStatusColor(inputHintTone), wrap: "truncate", children: inputHint }) })
+            ] }) : null,
             transcriptGuardRows > 0 ? /* @__PURE__ */ jsxs16(Box18, { height: transcriptGuardRows, flexShrink: 0, backgroundColor: surfaceBackground(), flexDirection: "row", width: "100%", overflow: "hidden", children: [
               /* @__PURE__ */ jsx20(Box18, { flexGrow: 1, flexShrink: 1, overflow: "hidden" }),
-              overlayHintFallbackRow ? /* @__PURE__ */ jsx20(Box18, { flexShrink: 0, width: guardHintWidth || 1, marginLeft: 1, marginRight: 1, justifyContent: "flex-end", overflow: "hidden", children: /* @__PURE__ */ jsx20(Text20, { color: promptStatusColor(inputHintTone), wrap: "truncate", children: inputHint }) }) : null
+              overlayHintFallbackRow && overlayHintBandRows === 0 ? /* @__PURE__ */ jsx20(Box18, { flexShrink: 0, width: guardHintWidth || 1, marginLeft: 1, marginRight: 1, justifyContent: "flex-end", overflow: "hidden", children: /* @__PURE__ */ jsx20(Text20, { color: promptStatusColor(inputHintTone), wrap: "truncate", children: inputHint }) }) : null
             ] }) : null
           ]
         }
@@ -20986,7 +21280,7 @@ function App({ store, initialStatusLine = "", forceOnboarding = false }) {
             ),
             /* @__PURE__ */ jsx20(Box18, { height: 1, width: "100%", backgroundColor: surfaceBackground() })
           ] }) : null,
-          queuedVisible ? /* @__PURE__ */ jsx20(QueuedCommands, { queued: state.queued, columns: frameColumns }) : null,
+          queuedVisible ? /* @__PURE__ */ jsx20(QueuedCommands, { queued: state.queued, columns: frameColumns, compact: queuedCompact }) : null,
           /* @__PURE__ */ jsx20(
             Box18,
             {
@@ -21174,6 +21468,33 @@ function modelVisibleToolCompletionMessage(text, meta = {}) {
   ].join("\n");
 }
 
+// src/session-runtime/session-text.mjs
+var LATE_TOOL_ANNOUNCEMENT_SENTINEL = "connected after this session started";
+function isLateToolAnnouncement(text) {
+  const value = String(text || "");
+  return value.includes(LATE_TOOL_ANNOUNCEMENT_SENTINEL) && /<available-deferred-tools>/i.test(value);
+}
+function summarizeLateToolAnnouncement(text) {
+  const value = String(text || "");
+  if (!isLateToolAnnouncement(value)) return "";
+  const block = value.match(/<available-deferred-tools>([\s\S]*?)<\/available-deferred-tools>/i);
+  const body = block ? block[1] : value;
+  const names = [];
+  const lineRe = /^\s*-\s+([A-Za-z0-9_.:-]+)/gm;
+  let m;
+  while (m = lineRe.exec(body)) names.push(m[1]);
+  const servers = /* @__PURE__ */ new Set();
+  for (const name of names) {
+    const seg = name.startsWith("mcp__") ? name.slice(5) : name;
+    const server = seg.split("__")[0];
+    if (server) servers.add(server);
+  }
+  const count = names.length;
+  const label = servers.size === 1 ? [...servers][0] : servers.size ? `${servers.size} MCP servers` : "MCP";
+  if (!count) return `MCP tools available: ${label}`;
+  return `MCP tools available: ${label} (${count} ${count === 1 ? "tool" : "tools"})`;
+}
+
 // src/tui/engine/boot-profile.mjs
 import { performance } from "node:perf_hooks";
 var BOOT_PROFILE_ENABLED = /^(1|true|yes|on)$/i.test(String(process.env.MIXDOG_BOOT_PROFILE || ""));
@@ -21959,8 +22280,8 @@ function resolveTuiRuntimeNotificationDelivery(event, text) {
 
 // src/tui/engine/render-timing.mjs
 var RENDER_THROTTLE_FLUSH_MS = 12;
-var yieldToRenderer = () => new Promise((resolve6) => {
-  setTimeout(resolve6, RENDER_THROTTLE_FLUSH_MS);
+var yieldToRenderer = () => new Promise((resolve5) => {
+  setTimeout(resolve5, RENDER_THROTTLE_FLUSH_MS);
 });
 
 // src/tui/engine/tool-result-status.mjs
@@ -22138,9 +22459,9 @@ function createToolApproval({ getState, set, nextId: nextId2, getDisposed, timeo
   }
   function requestToolApproval(input = {}) {
     if (getDisposed()) return Promise.resolve({ approved: false, reason: "runtime disposed" });
-    return new Promise((resolve6) => {
+    return new Promise((resolve5) => {
       const id = nextId2();
-      toolApprovalQueue.push({ id, request: normalizeToolApprovalRequest(input, id), resolve: resolve6, timer: null });
+      toolApprovalQueue.push({ id, request: normalizeToolApprovalRequest(input, id), resolve: resolve5, timer: null });
       presentNextToolApproval();
     });
   }
@@ -23002,7 +23323,7 @@ function createSessionFlow(bag) {
     const startedAt = Date.now();
     set({ commandBusy: true, commandStatus: { active: true, verb, startedAt, mode: "auto-clear" } });
     try {
-      await new Promise((resolve6) => setTimeout(resolve6, 0));
+      await new Promise((resolve5) => setTimeout(resolve5, 0));
       let compactType = null;
       if (useCompaction) {
         const compaction = runtime.getCompactionSettings();
@@ -24515,6 +24836,26 @@ import { readFileSync as readFileSync6 } from "node:fs";
 import { dirname as dirname8, join as join9 } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
 var GLYPH = { ok: "\u2713", warn: "\u26A0", fail: "\u2717" };
+var CKPT_WRITE_WARN_S = 10;
+var CKPT_WRITE_MEDIAN_S = 5;
+function parseCheckpointWriteSeconds(logText) {
+  const lines = String(logText).split(/\r?\n/).slice(-200);
+  const out = [];
+  for (const line of lines) {
+    const m = /checkpoint complete:.*?\bwrite=([\d.]+)\s*s/i.exec(line);
+    if (m) {
+      const v = Number(m[1]);
+      if (Number.isFinite(v)) out.push(v);
+    }
+  }
+  return out;
+}
+function median(nums) {
+  if (!nums.length) return 0;
+  const s = [...nums].sort((a, b) => a - b);
+  const mid = s.length >> 1;
+  return s.length % 2 ? s[mid] : (s[mid - 1] + s[mid]) / 2;
+}
 function readPackageJson() {
   try {
     const dir = dirname8(fileURLToPath3(import.meta.url));
@@ -24648,6 +24989,31 @@ async function buildDoctorReport(runtime = {}, getState = () => ({})) {
     const enabled = h.enabled === true;
     row("ok", `${enabled ? "enabled" : "disabled"} \xB7 ${events.length} event${events.length === 1 ? "" : "s"}`);
   });
+  if (process.platform === "win32") {
+    await check("defender", async (row) => {
+      const dataDir = resolvePluginData();
+      const pgdata = join9(dataDir, "pgdata");
+      let writes;
+      try {
+        writes = parseCheckpointWriteSeconds(readFileSync6(join9(dataDir, "pg.log"), "utf8"));
+      } catch {
+        row("ok", "pg.log unavailable \xB7 check skipped");
+        return;
+      }
+      if (!writes.length) {
+        row("ok", "no checkpoint timings yet");
+        return;
+      }
+      const max = Math.max(...writes);
+      const med = median(writes);
+      if (max <= CKPT_WRITE_WARN_S && med <= CKPT_WRITE_MEDIAN_S) {
+        row("ok", `checkpoint write median ${med.toFixed(1)}s \xB7 max ${max.toFixed(1)}s`);
+        return;
+      }
+      const fix = `Start-Process powershell -Verb RunAs -ArgumentList '-NoProfile','-Command',"Add-MpPreference -ExclusionPath '${pgdata}'"`;
+      row("warn", `slow checkpoints (median ${med.toFixed(1)}s \xB7 max ${max.toFixed(1)}s) suggest Defender real-time scan of ${pgdata}. Fix (run in PowerShell): ${fix}`);
+    });
+  }
   return ["mixdog doctor \u2014 installation health", ...rows].join("\n");
 }
 
@@ -24934,17 +25300,18 @@ function createEngineApiA(bag) {
       }
     },
     setMcpServerEnabled: async (name, enabled) => {
-      if (getState().commandBusy) return null;
-      set({ commandBusy: true });
-      try {
-        const status = await runtime.setMcpServerEnabled?.(name, enabled);
+      const status = await runtime.setMcpServerEnabled?.(name, enabled);
+      setImmediate(() => {
         resetStatsAndSyncContext();
         set({ ...routeState(), stats: { ...getState().stats } });
+      });
+      const row = status?.servers?.find((s) => s.name === name);
+      if (enabled && row && (row.status === "failed" || row.error)) {
+        pushNotice(`mcp enable failed: ${name}${row.error ? ` \u2014 ${row.error}` : ""}`, "error");
+      } else {
         pushNotice(`mcp ${enabled ? "enabled" : "disabled"}: ${name}`, "info");
-        return status;
-      } finally {
-        set({ commandBusy: false });
       }
+      return status;
     },
     getDisabledSkills: () => runtime.getDisabledSkills?.() || { disabled: [] },
     setDisabledSkills: (disabled) => runtime.setDisabledSkills?.(disabled) || { disabled: [] },
@@ -25098,7 +25465,7 @@ function createEngineApiA(bag) {
       const startedAt = Date.now();
       set({ commandBusy: true, commandStatus: { active: true, verb: "Running diagnostics", startedAt, mode: "doctor" } });
       try {
-        await new Promise((resolve6) => setTimeout(resolve6, 0));
+        await new Promise((resolve5) => setTimeout(resolve5, 0));
         const report = await buildDoctorReport(runtime, getState);
         pushNotice(report, "info");
         return report;
@@ -25118,7 +25485,7 @@ function createEngineApiA(bag) {
       const startedAt = Date.now();
       set({ commandBusy: true, commandStatus: { active: true, verb: "Compacting conversation", startedAt, mode: "compacting" } });
       try {
-        await new Promise((resolve6) => setTimeout(resolve6, 0));
+        await new Promise((resolve5) => setTimeout(resolve5, 0));
         const result = await runtime.compact({ recoverAgent: true });
         syncContextStats({ allowEstimated: true });
         set({ ...routeState(), stats: { ...getState().stats } });
@@ -25412,6 +25779,10 @@ async function createEngineSession({
   const pushUserOrSyntheticItem = (text, id = nextId(), origin = "user") => {
     if (origin === "injected" && isLikelyToolCompletionWrapper(text)) return;
     if (isModelVisibleToolCompletionWrapper(text)) return;
+    if (isLateToolAnnouncement(text)) {
+      pushItem({ kind: "notice", id, text: summarizeLateToolAnnouncement(text), tone: "info" });
+      return;
+    }
     if (upsertSyntheticToolItem(text, id)) return;
     pushItem({ kind: "user", id, text });
   };
@@ -25610,7 +25981,7 @@ function signalExitCode(signal, fallback = 1) {
 }
 function waitWithTimeout(promise, timeoutMs, label = "cleanup") {
   const ms = Math.max(1, Math.floor(Number(timeoutMs) || 1));
-  return new Promise((resolve6, reject) => {
+  return new Promise((resolve5, reject) => {
     let settled = false;
     const timer = setTimeout(() => {
       if (settled) return;
@@ -25622,7 +25993,7 @@ function waitWithTimeout(promise, timeoutMs, label = "cleanup") {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve6(value);
+      resolve5(value);
     }).catch((error) => {
       if (settled) return;
       settled = true;
@@ -25736,54 +26107,14 @@ function installProcessSignalCleanup({
   };
 }
 
-// src/runtime/channels/lib/runtime-paths.mjs
-import { tmpdir as tmpdir2 } from "os";
-import { basename as basename4, join as join10, resolve as resolve5 } from "path";
-
-// src/runtime/channels/lib/state-file.mjs
-import { mkdirSync as mkdirSync6, readFileSync as readFileSync7, unlinkSync as unlinkSync3, writeFileSync as writeFileSync5 } from "fs";
-function ensureDir2(dirPath) {
-  mkdirSync6(dirPath, { recursive: true });
-}
-
-// src/runtime/channels/lib/runtime-paths.mjs
-var RUNTIME_ROOT = process.env.MIXDOG_RUNTIME_ROOT ? resolve5(process.env.MIXDOG_RUNTIME_ROOT) : join10(tmpdir2(), "mixdog");
-var OWNER_DIR = join10(RUNTIME_ROOT, "owners");
-var ACTIVE_INSTANCE_FILE = join10(RUNTIME_ROOT, "active-instance.json");
-var RUNTIME_STALE_TTL = 24 * 60 * 60 * 1e3;
-var STATUS_FILE_TTL = 6 * 60 * 60 * 1e3;
-var TMP_FILE_TTL = 60 * 60 * 1e3;
-function sanitize(value) {
-  return value.replace(/[^a-zA-Z0-9._-]/g, "_");
-}
-function ensureRuntimeDirs() {
-  ensureDir2(RUNTIME_ROOT);
-  ensureDir2(OWNER_DIR);
-}
-var UI_HEARTBEAT_STALE_MS = 5 * 60 * 1e3;
-function touchUiHeartbeat(instanceId) {
-  ensureRuntimeDirs();
-  try {
-    updateJsonAtomicSync(ACTIVE_INSTANCE_FILE, (curRaw) => {
-      if (!curRaw) return void 0;
-      if (instanceId && curRaw.instanceId !== instanceId) return void 0;
-      return { ...curRaw, ui_heartbeat_at: Date.now(), updatedAt: Date.now() };
-    }, { compact: true, fsync: false, fsyncDir: false, renameFallback: "truncate", timeoutMs: 0 });
-  } catch {
-  }
-}
-var SERVER_PID_FILE = join10(
-  RUNTIME_ROOT,
-  `server-${sanitize(resolvePluginData() ?? "default")}.pid`
-);
-
 // src/tui/index.jsx
 var import_mixdog_debug = __toESM(require_mixdog_debug(), 1);
 import { jsx as jsx21 } from "react/jsx-runtime";
-var TERMINAL_MODE_RESET = "\x1B[?1006l\x1B[?1005l\x1B[?1015l\x1B[?1003l\x1B[?1002l\x1B[?1000l\x1B[?2004l\x1B[?25h";
+var TERMINAL_MODE_RESET = "\x1B[?1006l\x1B[?1005l\x1B[?1015l\x1B[?1003l\x1B[?1002l\x1B[?1000l\x1B[?2004l\x1B[>0s\x1B[?25h";
 var TERMINAL_OSC_RESET_BG = "\x1B]111\x07";
 var TERMINAL_MODE_RESET_HIDDEN_CURSOR = TERMINAL_MODE_RESET.replace("\x1B[?25h", "\x1B[?25l");
-var MOUSE_TRACKING_ON2 = "\x1B[?1000h\x1B[?1002h\x1B[?1006h";
+var XTSHIFTESCAPE_ON = process.env.WT_SESSION ? "" : "\x1B[>1s";
+var MOUSE_TRACKING_ON2 = `\x1B[?1000h\x1B[?1002h\x1B[?1006h${XTSHIFTESCAPE_ON}`;
 var BOOT_PROFILE_ENABLED2 = /^(1|true|yes|on)$/i.test(String(process.env.MIXDOG_BOOT_PROFILE || ""));
 var BOOT_PROFILE_START2 = globalThis.__mixdogBootProfileStart || (globalThis.__mixdogBootProfileStart = performance3.now());
 var EXIT_WAIT_TIMEOUT_MS = positiveIntEnv2("MIXDOG_TUI_EXIT_WAIT_MS", 2500);
@@ -25972,8 +26303,8 @@ function waitWithTimeout2(promise, ms) {
   let timer = null;
   return Promise.race([
     Promise.resolve(promise).then(() => true),
-    new Promise((resolve6) => {
-      timer = setTimeout(() => resolve6(false), ms);
+    new Promise((resolve5) => {
+      timer = setTimeout(() => resolve5(false), ms);
     })
   ]).finally(() => {
     if (timer) clearTimeout(timer);
@@ -25992,7 +26323,7 @@ function scheduleHardExit(code = 0) {
   timer.unref?.();
 }
 function resolveTuiStderrLogPath() {
-  return process.env.MIXDOG_TUI_STDERR_LOG || join11(process.env.MIXDOG_RUNTIME_ROOT || join11(tmpdir3(), "mixdog"), "mixdog-tui.stderr.log");
+  return process.env.MIXDOG_TUI_STDERR_LOG || join10(process.env.MIXDOG_RUNTIME_ROOT || join10(tmpdir2(), "mixdog"), "mixdog-tui.stderr.log");
 }
 function ansiFg(rgb) {
   const m = /rgb\((\d+),\s*(\d+),\s*(\d+)\)/.exec(String(rgb || ""));
@@ -26074,7 +26405,7 @@ function installTuiStderrGuard() {
   const originalWrite = process.stderr.write.bind(process.stderr);
   const logPath = resolveTuiStderrLogPath();
   try {
-    mkdirSync7(dirname9(logPath), { recursive: true });
+    mkdirSync6(dirname9(logPath), { recursive: true });
   } catch {
   }
   (0, import_mixdog_debug.rotateBoundedLog)(logPath, import_mixdog_debug.PLUGIN_LOG_MAX_BYTES, import_mixdog_debug.PLUGIN_LOG_KEEP_BYTES);
@@ -26119,6 +26450,23 @@ function installTuiStderrGuard() {
     }
   };
 }
+function installTuiConsoleGuard() {
+  const methods = ["log", "info", "warn", "error", "debug", "trace"];
+  const original = /* @__PURE__ */ new Map();
+  for (const m of methods) {
+    original.set(m, console[m]);
+    console[m] = (...args) => {
+      try {
+        process.stderr.write(`[console.${m}] ${format(...args)}
+`);
+      } catch {
+      }
+    };
+  }
+  return () => {
+    for (const [m, fn] of original) console[m] = fn;
+  };
+}
 async function runTui({ provider, model, toolMode, remote, forceOnboarding } = {}) {
   const startedAt = performance3.now();
   bootProfile2("run:start", { provider, model, toolMode, remote });
@@ -26129,6 +26477,7 @@ async function runTui({ provider, model, toolMode, remote, forceOnboarding } = {
     return 1;
   }
   const restoreStderr = installTuiStderrGuard();
+  const restoreConsole = installTuiConsoleGuard();
   const stopPerfProbe = installTuiPerfProbe();
   const stopLoopProbe = installTuiLoopProbe();
   const restorePrimedInput = () => drainStdin(process.stdin);
@@ -26169,6 +26518,7 @@ async function runTui({ provider, model, toolMode, remote, forceOnboarding } = {
       process.off("exit", restoreTerminal);
     } catch {
     }
+    restoreConsole();
     restoreStderr();
     process.stderr.write(`mixdog: ${error?.message || error}
 `);
@@ -26194,20 +26544,10 @@ async function runTui({ provider, model, toolMode, remote, forceOnboarding } = {
     afterCleanup: (reason) => {
       restoreTerminal();
       dumpActiveHandles(`after-${reason}`);
+      restoreConsole();
       restoreStderr();
     }
   });
-  const uiHeartbeatTimer = setInterval(() => {
-    try {
-      touchUiHeartbeat();
-    } catch {
-    }
-  }, 3e4);
-  if (typeof uiHeartbeatTimer.unref === "function") uiHeartbeatTimer.unref();
-  try {
-    touchUiHeartbeat();
-  } catch {
-  }
   const STDIO_DEATH_FATAL_CODES = /* @__PURE__ */ new Set(["EPIPE", "ERR_STREAM_DESTROYED", "EIO"]);
   const stdioDeathListeners = [];
   const registerStdioDeath = (stream, event, { requireCode = false } = {}) => {
@@ -26231,7 +26571,7 @@ async function runTui({ provider, model, toolMode, remote, forceOnboarding } = {
   registerStdioDeath(process.stderr, "error", { requireCode: true });
   registerStdioDeath(process.stderr, "close");
   try {
-    const instance = render(/* @__PURE__ */ jsx21(App, { store, forceOnboarding: forceOnboarding === true }), { exitOnCtrlC: false, maxFps: 60, incrementalRendering: true, onRender: makeRenderProfiler() });
+    const instance = render(/* @__PURE__ */ jsx21(App, { store, forceOnboarding: forceOnboarding === true }), { exitOnCtrlC: false, maxFps: 60, incrementalRendering: true, patchConsole: false, onRender: makeRenderProfiler() });
     bootProfile2("render:mounted", { ms: (performance3.now() - startedAt).toFixed(1) });
     const { waitUntilExit } = instance;
     if (mouseTracking && typeof instance.setSelection === "function") {
@@ -26249,11 +26589,13 @@ async function runTui({ provider, model, toolMode, remote, forceOnboarding } = {
     if (mouseTracking && typeof instance.getSelectionRows === "function") {
       store.getRenderSelectionRows = instance.getSelectionRows;
     }
+    if (mouseTracking && typeof instance.forceFullRepaint === "function") {
+      store.forceRenderRepaint = instance.forceFullRepaint;
+    }
     await waitUntilExit();
   } finally {
     stopPerfProbe();
     stopLoopProbe();
-    clearInterval(uiHeartbeatTimer);
     for (const [stream, event, handler] of stdioDeathListeners.splice(0)) {
       try {
         stream.off(event, handler);
@@ -26268,6 +26610,7 @@ async function runTui({ provider, model, toolMode, remote, forceOnboarding } = {
     }
     restoreTerminal();
     dumpActiveHandles("after-restore");
+    restoreConsole();
     restoreStderr();
   }
   scheduleHardExit(0);