mixdog 0.9.0 → 0.9.1

package/src/tui/dist/index.mjs

@@ -99,6 +99,8 @@ var mixdogPalette = {
   // ``` fence + lang label rule
   mdCodeBlockBg: "rgb(34,35,40)",
   // code-block background band (distinct from bg)
+  mdCodeSpanBg: "rgb(42,43,48)",
+  // inline codespan background (subtle lift from block bg)
   mdLink: "rgb(47,127,255)",
   // link URL (suggestion blue)
   mdLinkText: "rgb(138,190,183)",
@@ -175,6 +177,7 @@ var piDarkPalette = {
   codeBlock: "rgb(181,189,104)",
   mdCodeBlockBorder: "rgb(96,104,116)",
   mdCodeBlockBg: "rgb(32,36,44)",
+  mdCodeSpanBg: "rgb(40,44,52)",
   mdLink: "rgb(95,135,255)",
   mdLinkText: "rgb(138,190,183)",
   mdStrong: "rgb(181,189,104)",
@@ -242,6 +245,7 @@ var claudeDarkPalette = {
   mdListBullet: "rgb(177,185,249)",
   mdCodeBlockBorder: "rgb(120,120,120)",
   mdCodeBlockBg: "rgb(34,35,40)",
+  mdCodeSpanBg: "rgb(42,43,48)",
   mdLink: "rgb(177,185,249)",
   mdLinkText: "rgb(150,200,210)",
   mdStrong: "rgb(235,159,127)",
@@ -308,6 +312,7 @@ var draculaPalette = {
   mdListBullet: "rgb(189,147,249)",
   mdCodeBlockBorder: "rgb(68,71,90)",
   mdCodeBlockBg: "rgb(60,63,79)",
+  mdCodeSpanBg: "rgb(68,71,87)",
   mdLink: "rgb(139,233,253)",
   mdLinkText: "rgb(255,121,198)",
   // pink
@@ -373,6 +378,7 @@ var tokyonightPalette = {
   mdListBullet: "rgb(130,170,255)",
   mdCodeBlockBorder: "rgb(84,92,126)",
   mdCodeBlockBg: "rgb(45,47,64)",
+  mdCodeSpanBg: "rgb(53,55,72)",
   mdLink: "rgb(130,170,255)",
   mdLinkText: "rgb(134,225,252)",
   // cyan
@@ -437,6 +443,7 @@ var nordPalette = {
   mdListBullet: "rgb(136,192,208)",
   mdCodeBlockBorder: "rgb(67,76,94)",
   mdCodeBlockBg: "rgb(64,71,87)",
+  mdCodeSpanBg: "rgb(72,79,95)",
   mdLink: "rgb(129,161,193)",
   mdLinkText: "rgb(143,188,187)",
   mdStrong: "rgb(235,203,139)",
@@ -498,6 +505,7 @@ var gruvboxPalette = {
   mdListBullet: "rgb(131,165,152)",
   mdCodeBlockBorder: "rgb(80,73,69)",
   mdCodeBlockBg: "rgb(60,58,52)",
+  mdCodeSpanBg: "rgb(68,66,60)",
   mdLink: "rgb(142,192,124)",
   mdLinkText: "rgb(184,187,38)",
   mdStrong: "rgb(254,128,25)",
@@ -560,6 +568,7 @@ var catppuccinPalette = {
   mdListBullet: "rgb(137,180,250)",
   mdCodeBlockBorder: "rgb(49,50,68)",
   mdCodeBlockBg: "rgb(49,50,68)",
+  mdCodeSpanBg: "rgb(57,58,76)",
   mdLink: "rgb(137,180,250)",
   mdLinkText: "rgb(137,220,235)",
   // sky
@@ -624,6 +633,7 @@ var everforestPalette = {
   mdListBullet: "rgb(167,192,128)",
   mdCodeBlockBorder: "rgb(52,63,68)",
   mdCodeBlockBg: "rgb(62,71,78)",
+  mdCodeSpanBg: "rgb(70,79,86)",
   mdLink: "rgb(167,192,128)",
   mdLinkText: "rgb(131,192,146)",
   // cyan
@@ -692,6 +702,7 @@ var whitePalette = {
   mdListBullet: "rgb(9,105,218)",
   mdCodeBlockBorder: "rgb(200,206,212)",
   mdCodeBlockBg: "rgb(232,232,236)",
+  mdCodeSpanBg: "rgb(240,240,244)",
   mdLink: "rgb(9,105,218)",
   mdLinkText: "rgb(0,92,197)",
   mdStrong: "rgb(130,80,8)",
@@ -820,6 +831,7 @@ import { marked } from "marked";
 
 // src/tui/markdown/format-token.mjs
 import { Chalk } from "chalk";
+import { highlight, supportsLanguage } from "cli-highlight";
 import stripAnsi from "strip-ansi";
 import stringWidth from "string-width";
 import wrapAnsi from "wrap-ansi";
@@ -886,7 +898,8 @@ function extraColorizers() {
     synPunct: rgbColor(theme.syntaxPunctuation ?? theme.mdCodeBlock),
     body: fallbackBody,
     // Truecolor background band for fenced code blocks (per-line wrap).
-    codeBg: rgbBg(theme.mdCodeBlockBg ?? theme.background)
+    codeBg: rgbBg(theme.mdCodeBlockBg ?? theme.background),
+    codeSpanBg: rgbBg(theme.mdCodeSpanBg ?? theme.mdCodeBlockBg ?? theme.background)
   };
   return _extra;
 }
@@ -894,7 +907,6 @@ function decodeEntities(s) {
   if (typeof s !== "string" || s.indexOf("&") === -1) return s;
   return s.replace(/&quot;/g, '"').replace(/&#0*39;/g, "'").replace(/&apos;/g, "'").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&#(\d+);/g, (_, n) => String.fromCodePoint(Number(n))).replace(/&#[xX]([0-9a-fA-F]+);/g, (_, h) => String.fromCodePoint(parseInt(h, 16))).replace(/&amp;/g, "&");
 }
-var CODE_BLOCK_INDENT = "  ";
 var DIFF_LANGS = /* @__PURE__ */ new Set(["diff", "patch", "udiff", "git-diff", "gitdiff"]);
 function wrapTextToWidth(text, width, options) {
   if (width <= 0) return [text];
@@ -927,14 +939,28 @@ function hardWrapAnsiLines(text, width) {
   }
   return out.length > 0 ? out : [""];
 }
-function wrapIndentedCodeLine(ansiContent, maxLineWidth) {
-  const indentW = stringWidth(CODE_BLOCK_INDENT);
-  const contentMax = Math.max(1, maxLineWidth - indentW);
-  const segments = hardWrapAnsiLines(ansiContent, contentMax);
-  return segments.map((seg) => `${CODE_BLOCK_INDENT}${seg}`);
+function wrapCodeLine(ansiContent, maxLineWidth) {
+  const contentMax = Math.max(1, maxLineWidth);
+  return hardWrapAnsiLines(ansiContent, contentMax);
 }
-function tintCodeLines(lines, codeBg) {
-  return lines.map((line) => codeBg(line)).join(EOL);
+function visibleLineWidth(line) {
+  return stringWidth(stripAnsi(String(line ?? "")));
+}
+function codeBlockContentWidth(langLine, bodyLines) {
+  const all = [...langLine ? [langLine] : [], ...bodyLines];
+  if (all.length === 0) return 0;
+  return Math.max(1, ...all.map(visibleLineWidth));
+}
+function tintCodeLineToBlockWidth(line, codeBg, blockWidth) {
+  const w = visibleLineWidth(line);
+  const pad = Math.max(0, blockWidth - w);
+  return codeBg(`${line ?? ""}${" ".repeat(pad)}`);
+}
+function tintCodeBlockBody(langLine, bodyLines, codeBg) {
+  const blockWidth = codeBlockContentWidth(langLine, bodyLines);
+  const langOut = langLine ? tintCodeLineToBlockWidth(langLine, codeBg, blockWidth) : "";
+  const bodyOut = bodyLines.map((line) => tintCodeLineToBlockWidth(line, codeBg, blockWidth)).join(EOL);
+  return { langOut, bodyOut };
 }
 function contentWidthAfterPrefix(width, prefix) {
   const base = Number(width) || 0;
@@ -994,37 +1020,62 @@ function colorizeDiffLine(line, c) {
 function colorizeDiffStatTrailer(line, c) {
   return line.replace(/(\d+)(\s+insertions?\(\+\))/g, (_, n, rest) => `${c.diffAdded(n)}${c.diffContext(rest)}`).replace(/(\d+)(\s+deletions?\(-\))/g, (_, n, rest) => `${c.diffRemoved(n)}${c.diffContext(rest)}`);
 }
-function renderDiffBody(text, c, bandWidth) {
+function collectDiffBodyLines(text, c, bandWidth) {
   const lines = [];
   for (const line of String(text ?? "").split(EOL)) {
     const colored = colorizeDiffLine(line, c);
-    lines.push(...wrapIndentedCodeLine(colored, bandWidth));
-  }
-  return tintCodeLines(lines, c.codeBg);
-}
-var KEYWORDS = {
-  js: ["const", "let", "var", "function", "return", "if", "else", "for", "while", "do", "switch", "case", "break", "continue", "new", "class", "extends", "super", "this", "import", "export", "from", "default", "async", "await", "yield", "try", "catch", "finally", "throw", "typeof", "instanceof", "in", "of", "void", "delete", "null", "undefined", "true", "false"],
-  py: ["def", "class", "return", "if", "elif", "else", "for", "while", "import", "from", "as", "with", "try", "except", "finally", "raise", "pass", "break", "continue", "lambda", "yield", "global", "nonlocal", "async", "await", "and", "or", "not", "in", "is", "None", "True", "False", "self"],
-  sh: ["if", "then", "else", "elif", "fi", "for", "while", "do", "done", "case", "esac", "function", "return", "in", "export", "local", "echo", "cd", "set", "unset", "read", "source"],
-  css: [],
-  go: ["package", "import", "func", "return", "if", "else", "for", "range", "switch", "case", "default", "break", "continue", "fallthrough", "goto", "defer", "go", "select", "chan", "map", "struct", "interface", "type", "var", "const", "nil", "true", "false", "iota", "string", "int", "int64", "float64", "bool", "byte", "rune", "error"],
-  rust: ["fn", "let", "mut", "const", "static", "return", "if", "else", "match", "for", "while", "loop", "break", "continue", "struct", "enum", "trait", "impl", "mod", "use", "pub", "crate", "self", "super", "where", "as", "dyn", "move", "ref", "unsafe", "async", "await", "type", "true", "false", "Some", "None", "Ok", "Err", "Box", "Vec", "String", "usize", "isize", "i32", "u32", "i64", "u64", "f64", "bool"],
-  java: ["public", "private", "protected", "class", "interface", "enum", "extends", "implements", "abstract", "final", "static", "void", "new", "return", "if", "else", "for", "while", "do", "switch", "case", "default", "break", "continue", "try", "catch", "finally", "throw", "throws", "import", "package", "this", "super", "instanceof", "synchronized", "volatile", "transient", "native", "int", "long", "short", "byte", "char", "float", "double", "boolean", "true", "false", "null"],
-  c: ["auto", "break", "case", "char", "const", "continue", "default", "do", "double", "else", "enum", "extern", "float", "for", "goto", "if", "inline", "int", "long", "register", "return", "short", "signed", "sizeof", "static", "struct", "switch", "typedef", "union", "unsigned", "void", "volatile", "while", "class", "namespace", "template", "public", "private", "protected", "virtual", "new", "delete", "using", "nullptr", "true", "false", "bool"],
-  ruby: ["def", "end", "class", "module", "if", "elsif", "else", "unless", "case", "when", "then", "while", "until", "for", "in", "do", "begin", "rescue", "ensure", "raise", "return", "yield", "break", "next", "redo", "retry", "self", "nil", "true", "false", "and", "or", "not", "require", "require_relative", "attr_accessor", "attr_reader", "attr_writer", "puts", "lambda", "proc"],
-  sql: ["select", "from", "where", "insert", "into", "values", "update", "set", "delete", "create", "alter", "drop", "table", "view", "index", "join", "inner", "left", "right", "outer", "full", "on", "group", "by", "order", "having", "limit", "offset", "distinct", "as", "and", "or", "not", "null", "is", "in", "between", "like", "union", "all", "primary", "key", "foreign", "references", "default", "constraint", "unique", "count", "sum", "avg", "min", "max"],
-  yaml: [],
-  toml: []
+    lines.push(...wrapCodeLine(colored, bandWidth));
+  }
+  return lines;
+}
+var FAMILY_TO_HLJS = {
+  js: "javascript",
+  ts: "typescript",
+  tsx: "tsx",
+  jsx: "jsx",
+  json: "json",
+  sh: "bash",
+  py: "python",
+  css: "css",
+  html: "xml",
+  go: "go",
+  rust: "rust",
+  java: "java",
+  c: "cpp",
+  ruby: "ruby",
+  sql: "sql",
+  yaml: "yaml",
+  toml: "ini",
+  kotlin: "kotlin",
+  swift: "swift",
+  php: "php",
+  csharp: "csharp",
+  dockerfile: "dockerfile",
+  protobuf: "protobuf",
+  scala: "scala",
+  dart: "dart",
+  lua: "lua",
+  perl: "perl",
+  r: "r",
+  objc: "objectivec",
+  powershell: "powershell",
+  makefile: "makefile",
+  nginx: "nginx",
+  ini: "ini",
+  vim: "vim",
+  haskell: "haskell",
+  elixir: "elixir",
+  clojure: "clojure"
 };
 var LANG_FAMILY = {
   js: "js",
   javascript: "js",
   mjs: "js",
   cjs: "js",
-  ts: "js",
-  typescript: "js",
-  jsx: "js",
-  tsx: "js",
+  ts: "ts",
+  typescript: "ts",
+  jsx: "jsx",
+  tsx: "tsx",
   json: "json",
   json5: "json",
   bash: "sh",
@@ -1056,51 +1107,173 @@ var LANG_FAMILY = {
   sql: "sql",
   yaml: "yaml",
   yml: "yaml",
-  toml: "toml"
+  toml: "toml",
+  kotlin: "kotlin",
+  kt: "kotlin",
+  kts: "kotlin",
+  swift: "swift",
+  php: "php",
+  csharp: "csharp",
+  cs: "csharp",
+  "c#": "csharp",
+  dockerfile: "dockerfile",
+  docker: "dockerfile",
+  graphql: "graphql",
+  gql: "graphql",
+  protobuf: "protobuf",
+  proto: "protobuf",
+  scala: "scala",
+  dart: "dart",
+  lua: "lua",
+  perl: "perl",
+  pl: "perl",
+  r: "r",
+  rl: "r",
+  objc: "objc",
+  "objective-c": "objc",
+  "obj-c": "objc",
+  powershell: "powershell",
+  ps1: "powershell",
+  ps: "powershell",
+  pwsh: "powershell",
+  makefile: "makefile",
+  make: "makefile",
+  nginx: "nginx",
+  ini: "ini",
+  vim: "vim",
+  haskell: "haskell",
+  hs: "haskell",
+  elixir: "elixir",
+  ex: "elixir",
+  exs: "elixir",
+  clojure: "clojure",
+  clj: "clojure"
 };
-var HASH_COMMENT_FAMILIES = /* @__PURE__ */ new Set(["sh", "py", "yaml", "toml"]);
-function highlightCodeLine(line, family, c) {
-  const kw = new Set(KEYWORDS[family === "json" ? "js" : family] ?? []);
-  if (family === "js" && /^\s*\/\//.test(line)) return c.synComment(line);
-  if (HASH_COMMENT_FAMILIES.has(family) && /^\s*#/.test(line)) return c.synComment(line);
-  if (family === "html" && /^\s*<!--/.test(line)) return c.synComment(line);
-  const TOKEN_RE = /(`(?:\\.|[^`\\])*`|"(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*')|(\/\/[^\n]*|#[^\n]*)|(\b\d+(?:\.\d+)?\b)|([A-Za-z_$][A-Za-z0-9_$]*)|([{}()[\].,;:=+\-*/%<>!&|^~?]+)/g;
-  let out = "";
-  let last = 0;
-  let m;
-  TOKEN_RE.lastIndex = 0;
-  while ((m = TOKEN_RE.exec(line)) !== null) {
-    if (m.index > last) out += c.body(line.slice(last, m.index));
-    const [, str, comment, num2, ident, punct] = m;
-    if (str !== void 0) {
-      out += c.synString(str);
-    } else if (comment !== void 0) {
-      if (comment.startsWith("//") ? family === "js" : HASH_COMMENT_FAMILIES.has(family)) {
-        out += c.synComment(comment);
-      } else {
-        out += c.body(comment);
-      }
-    } else if (num2 !== void 0) {
-      out += c.synNumber(num2);
-    } else if (ident !== void 0) {
-      if (kw.has(ident)) out += c.synKeyword(ident);
-      else if (line[TOKEN_RE.lastIndex] === "(") out += c.synFunction(ident);
-      else out += c.body(ident);
-    } else if (punct !== void 0) {
-      out += c.synOperator(punct);
+var HIGHLIGHT_CACHE_MAX = 300;
+var highlightCache = /* @__PURE__ */ new Map();
+var _hljsThemeVersion = -1;
+var _hljsTheme = null;
+function buildCliHighlightTheme(c) {
+  const plain = (s) => c.body(s);
+  return {
+    default: plain,
+    keyword: c.synKeyword,
+    built_in: c.synType,
+    type: c.synType,
+    literal: c.synKeyword,
+    number: c.synNumber,
+    regexp: c.synString,
+    string: c.synString,
+    subst: plain,
+    symbol: plain,
+    class: c.synType,
+    function: c.synFunction,
+    title: c.synFunction,
+    params: c.synVariable,
+    comment: c.synComment,
+    doctag: c.synComment,
+    meta: c.synComment,
+    section: c.synType,
+    tag: c.synPunct,
+    name: c.synFunction,
+    builtin: c.synType,
+    attr: c.synType,
+    attribute: c.synType,
+    variable: c.synVariable,
+    selector: c.synKeyword,
+    template: c.synVariable,
+    bullet: plain,
+    code: plain,
+    emphasis: plain,
+    strong: plain,
+    formula: plain,
+    link: plain,
+    quote: plain,
+    addition: c.synString,
+    deletion: c.synString
+  };
+}
+function getCliHighlightTheme() {
+  const version = getThemeVersion();
+  if (_hljsTheme && _hljsThemeVersion === version) return _hljsTheme;
+  _hljsThemeVersion = version;
+  _hljsTheme = buildCliHighlightTheme(extraColorizers());
+  return _hljsTheme;
+}
+function hljsLanguageFromFamily(family) {
+  if (!family || family === "md") return null;
+  const mapped = FAMILY_TO_HLJS[family];
+  if (mapped && supportsLanguage(mapped)) return mapped;
+  if (supportsLanguage(family)) return family;
+  return null;
+}
+function resolveHljsLanguage(lang) {
+  const normalized = normalizeLang(lang);
+  if (!normalized) return null;
+  const viaFamily = hljsLanguageFromFamily(LANG_FAMILY[normalized]);
+  if (viaFamily) return viaFamily;
+  return supportsLanguage(normalized) ? normalized : null;
+}
+function highlightCodeText(text, hljsLang) {
+  if (!hljsLang || !supportsLanguage(hljsLang)) return null;
+  const src = String(text ?? "");
+  if (!src.trim()) return null;
+  if (!/[A-Za-z0-9]/.test(src)) return null;
+  const cacheKey = `${hljsLang}|${getThemeVersion()}|${src}`;
+  const cached = highlightCache.get(cacheKey);
+  if (cached !== void 0) {
+    highlightCache.delete(cacheKey);
+    highlightCache.set(cacheKey, cached);
+    return cached;
+  }
+  try {
+    const out = highlight(src, {
+      language: hljsLang,
+      theme: getCliHighlightTheme(),
+      ignoreIllegals: true
+    });
+    if (highlightCache.size >= HIGHLIGHT_CACHE_MAX) {
+      const first = highlightCache.keys().next().value;
+      if (first !== void 0) highlightCache.delete(first);
     }
-    last = TOKEN_RE.lastIndex;
+    highlightCache.set(cacheKey, out);
+    return out;
+  } catch {
+    return null;
   }
-  if (last < line.length) out += c.body(line.slice(last));
-  return out;
 }
-function renderHighlightedBody(text, family, c, bandWidth) {
+function highlightCodeLine(line, family, c) {
+  const hljsLang = hljsLanguageFromFamily(family);
+  const highlighted = highlightCodeText(line, hljsLang);
+  if (highlighted != null) return highlighted;
+  return line ? c.body(line) : "";
+}
+function highlightCodeBlockToLines(text, family, c) {
+  const hljsLang = hljsLanguageFromFamily(family);
+  const raw = String(text ?? "");
+  const highlighted = hljsLang ? highlightCodeText(raw, hljsLang) : null;
+  if (highlighted != null) {
+    return highlighted.split(EOL);
+  }
+  return raw.split(EOL).map((line) => line ? c.body(line) : "");
+}
+function collectFlatBodyLines(text, codeBlock, bandWidth) {
   const lines = [];
   for (const line of String(text ?? "").split(EOL)) {
-    const colored = line ? highlightCodeLine(line, family, c) : "";
-    lines.push(...wrapIndentedCodeLine(colored, bandWidth));
+    const colored = codeBlock(line);
+    lines.push(...wrapCodeLine(colored, bandWidth));
+  }
+  return lines;
+}
+function collectHighlightedBodyLines(text, hljsLang, bandWidth) {
+  const highlighted = highlightCodeText(text, hljsLang);
+  const { codeBlock } = colorizers();
+  const source = highlighted != null ? highlighted : String(text ?? "").split(EOL).map(codeBlock).join(EOL);
+  const lines = [];
+  for (const line of source.split(EOL)) {
+    lines.push(...wrapCodeLine(line, bandWidth));
   }
-  return tintCodeLines(lines, c.codeBg);
+  return lines;
 }
 function renderCodeBlock(token, width = 0) {
   const { codeBlock } = colorizers();
@@ -1108,24 +1281,20 @@ function renderCodeBlock(token, width = 0) {
   const lang = normalizeLang(token.lang);
   const text = decodeEntities(token.text ?? "");
   const bandWidth = Math.max(8, Number(width) || 80);
-  let body;
+  let bodyLines;
   if (DIFF_LANGS.has(lang) || !lang && looksLikeUnifiedDiff(text)) {
-    body = renderDiffBody(text, c, bandWidth);
+    bodyLines = collectDiffBodyLines(text, c, bandWidth);
   } else {
+    const hljsLang = resolveHljsLanguage(lang);
     const family = LANG_FAMILY[lang];
-    if (family && family !== "md") {
-      body = renderHighlightedBody(text, family, c, bandWidth);
+    if (hljsLang && family !== "md") {
+      bodyLines = collectHighlightedBodyLines(text, hljsLang, bandWidth);
     } else {
-      const lines = [];
-      for (const line of text.split(EOL)) {
-        const colored = codeBlock(line);
-        lines.push(...wrapIndentedCodeLine(colored, bandWidth));
-      }
-      body = tintCodeLines(lines, c.codeBg);
+      bodyLines = collectFlatBodyLines(text, codeBlock, bandWidth);
     }
   }
-  const langLine = lang ? `${c.codeBg(c.fenceBorder(lang))}${EOL}` : "";
-  return `${langLine}${body}${body ? EOL : ""}`;
+  const { bodyOut } = tintCodeBlockBody(null, bodyLines, c.codeBg);
+  return `${bodyOut}${bodyOut ? EOL : ""}`;
 }
 function numberToLetter(n) {
   let result = "";
@@ -1183,14 +1352,15 @@ function formatToken(token, listBaseIndent = 0, orderedListNumber = null, parent
       const quotePrefix = `${BLOCKQUOTE_BAR} `;
       const innerWidth = contentWidthAfterPrefix(width, quotePrefix);
       const inner = (token.tokens ?? []).map((t) => formatToken(t, 0, null, null, innerWidth)).join("");
-      return inner.split(EOL).map(
-        (line) => stripAnsi(line).trim() ? `${bar} ${quoteText(chalk.italic(line))}` : line
-      ).join(EOL);
+      return inner.split(EOL).map((line) => {
+        if (stringWidth(stripAnsi(line)) === 0) return line;
+        return `${bar} ${quoteText(chalk.italic(line))}`;
+      }).join(EOL);
     }
     case "code":
       return renderCodeBlock(token, width);
     case "codespan":
-      return accent(decodeEntities(token.text));
+      return ex.codeSpanBg(accent(decodeEntities(token.text)));
     case "em":
       return ex.emph(chalk.italic((token.tokens ?? []).map((t) => formatToken(t, 0, null, parent)).join("")));
     case "strong":
@@ -1296,7 +1466,7 @@ function formatListItem(token, listBaseIndent, orderedListNumber, parent, depth
         out += `${markerPrefix.trimEnd()}${EOL}`;
         firstBlock = false;
       }
-      out += formatToken(child, nestedListIndent, null, token, childWidth, depth + 1);
+      out += formatToken(child, nestedListIndent, null, token, width, depth + 1);
       continue;
     }
     const rendered = formatToken(child, listBaseIndent, orderedListNumber, token, childWidth, depth);
@@ -3579,10 +3749,51 @@ import stringWidth3 from "string-width";
 import stripAnsi3 from "strip-ansi";
 var DEFAULT_MARKDOWN_WIDTH = 80;
 var MAX_EXPANDED_CHARS = 256 * 1024;
-var MAX_EXPANDED_LINES = 80;
+var MAX_EXPANDED_LINES = 4e3;
 var MAX_JSON_FORMAT_LENGTH = 1e4;
 var MAX_HIGHLIGHT_LINE_CHARS = 2e3;
 var MIN_EXPANDED_BODY_COLS = 24;
+function resolveToolOutputMaxRenderLines() {
+  const raw = process.env.MIXDOG_TUI_TOOL_OUTPUT_MAX_RENDER_LINES;
+  if (raw !== void 0 && String(raw).trim() !== "") {
+    const v = Number(raw);
+    if (Number.isFinite(v) && v <= 0) return 0;
+    if (Number.isFinite(v) && v > 0) return Math.floor(v);
+  }
+  const legacy = process.env.MIXDOG_TUI_EXPANDED_MAX_ROWS;
+  if (legacy !== void 0 && String(legacy).trim() !== "") {
+    const v = Number(legacy);
+    if (Number.isFinite(v) && v > 0) return Math.floor(v);
+  }
+  return 600;
+}
+function omittedPhysicalRowsMarker(omitted, isShell) {
+  if (isShell) {
+    const n = Math.max(1, Math.floor(Number(omitted) || 0));
+    return `\u2026 [${n} line${n === 1 ? "" : "s"} omitted above \u2014 showing newest output below]`;
+  }
+  return "\u2026 [output truncated for display \u2014 collapse (ctrl+o) or re-read a narrower range]";
+}
+function shellLogicalOmittedMarker({ omittedLines = 0, omittedChars = false }, c) {
+  if (omittedLines > 0) {
+    return c.synComment(omittedPhysicalRowsMarker(omittedLines, true));
+  }
+  if (omittedChars) {
+    return c.synComment("\u2026 [earlier output omitted above \u2014 showing newest output below]");
+  }
+  return null;
+}
+function finalizeShellPhysicalCap(buffer, omitted, maxRows) {
+  const bodySlots = Math.max(0, maxRows - 1);
+  if (omitted <= 0) {
+    return buffer.length > 0 ? buffer : [" "];
+  }
+  const tail = bodySlots > 0 ? buffer.slice(-bodySlots) : [];
+  const extraHidden = Math.max(0, buffer.length - bodySlots);
+  const totalOmitted = omitted + extraHidden;
+  const out = [omittedPhysicalRowsMarker(totalOmitted, true), ...tail];
+  return out.length > 0 ? out.slice(0, maxRows) : [" "];
+}
 var READ_LINE_RE = /^(\s*)(\d+)(\u2192)(.*)$/;
 var GREP_LINE_RE = /^(\s*)((?:[A-Za-z]:[\\/](?:[^\n:])*|[^\n:]*):\d+:|\d+:)(\s?)(.*)$/;
 var URL_RE = /https?:\/\/[^\s"'<>\x1b\\)\]]+/g;
@@ -3688,17 +3899,21 @@ function formatExpandedResult(text, { pathArg = "", isShell = false } = {}) {
   let src = String(text ?? "");
   if (!src) return [];
   let truncatedChars = false;
+  let shellOmittedLines = 0;
+  let shellOmittedChars = false;
   if (src.length > MAX_EXPANDED_CHARS) {
-    src = src.slice(0, MAX_EXPANDED_CHARS);
-    truncatedChars = true;
+    src = isShell ? src.slice(-MAX_EXPANDED_CHARS) : src.slice(0, MAX_EXPANDED_CHARS);
+    if (isShell) shellOmittedChars = true;
+    else truncatedChars = true;
   }
   const carriesAnsi = hasAnsi(src);
   if (!carriesAnsi) src = tryFormatJson(src);
   let lines = src.split("\n");
   let truncatedLines = false;
   if (lines.length > MAX_EXPANDED_LINES) {
-    lines = lines.slice(0, MAX_EXPANDED_LINES);
-    truncatedLines = true;
+    if (isShell) shellOmittedLines = lines.length - MAX_EXPANDED_LINES;
+    lines = isShell ? lines.slice(-MAX_EXPANDED_LINES) : lines.slice(0, MAX_EXPANDED_LINES);
+    if (!isShell) truncatedLines = true;
   }
   const c = extraColorizers();
   const diffMode = !carriesAnsi && !isShell && looksLikeUnifiedDiff(src);
@@ -3707,21 +3922,28 @@ function formatExpandedResult(text, { pathArg = "", isShell = false } = {}) {
   if (shouldRenderExpandedMarkdown({ src, lines, carriesAnsi, isShell, diffMode, family })) {
     out = formatExpandedMarkdownLines(src);
     if (out.length > MAX_EXPANDED_LINES) {
-      out = out.slice(0, MAX_EXPANDED_LINES);
-      truncatedLines = true;
+      if (isShell) shellOmittedLines += out.length - MAX_EXPANDED_LINES;
+      out = isShell ? out.slice(-MAX_EXPANDED_LINES) : out.slice(0, MAX_EXPANDED_LINES);
+      if (!isShell) truncatedLines = true;
     }
   } else {
-    out = lines.map((line) => formatLine(line, { c, family, diffMode, carriesAnsi, isShell }));
+    if (family && family !== "md" && !diffMode && !carriesAnsi && !isShell) {
+      out = formatSyntaxBlock(lines, { c, family });
+    } else {
+      out = lines.map((line) => formatLine(line, { c, family, diffMode, carriesAnsi, isShell }));
+    }
+  }
+  if (isShell) {
+    const marker = shellLogicalOmittedMarker({ omittedLines: shellOmittedLines, omittedChars: shellOmittedChars }, c);
+    if (marker) return [marker, ...out];
+    return out;
   }
   if (truncatedChars || truncatedLines) {
     out.push(c.synComment("\u2026 [output truncated for display \u2014 re-read a narrower range]"));
   }
   return out;
 }
-function formatLine(line, { c, family, diffMode, carriesAnsi, isShell }) {
-  if (carriesAnsi || isShell) {
-    return linkifyUrls(stripUnderlineAnsi(line));
-  }
+function splitGutter(line) {
   let indent = "";
   let gutter = "";
   let body = line;
@@ -3738,6 +3960,26 @@ function formatLine(line, { c, family, diffMode, carriesAnsi, isShell }) {
       body = gm[4];
     }
   }
+  return { indent, gutter, body };
+}
+function formatSyntaxBlock(lines, { c, family }) {
+  const parts = lines.map(splitGutter);
+  const bodies = parts.map(
+    (p) => p.body.length > MAX_HIGHLIGHT_LINE_CHARS ? "" : p.body
+  );
+  const highlighted = highlightCodeBlockToLines(bodies.join("\n"), family, c);
+  return parts.map((p, i) => {
+    const rawBody = p.body;
+    const bodyOut = rawBody.length > MAX_HIGHLIGHT_LINE_CHARS ? c.body(rawBody) : highlighted[i] ?? "";
+    const linked = linkifyUrls(bodyOut);
+    return p.gutter ? `${p.indent}${c.synComment(p.gutter)}${linked}` : linked;
+  });
+}
+function formatLine(line, { c, family, diffMode, carriesAnsi, isShell }) {
+  if (carriesAnsi || isShell) {
+    return linkifyUrls(stripUnderlineAnsi(line));
+  }
+  const { indent, gutter, body } = splitGutter(line);
   const coloredBody = highlightBody(body, { c, family, diffMode });
   const linked = linkifyUrls(coloredBody);
   return gutter ? `${indent}${c.synComment(gutter)}${linked}` : linked;
@@ -3811,12 +4053,47 @@ function wrapOneExpandedLogicalLine(line, maxWidth) {
   }
   return out;
 }
-function wrapExpandedResultLines(logicalLines, columns = 80) {
+function wrapExpandedResultLines(logicalLines, columns = 80, { isShell = false } = {}) {
+  const maxRows = resolveToolOutputMaxRenderLines();
+  const capOn = maxRows > 0;
   const maxWidth = expandedResultBodyWidth(columns);
   const lines = Array.isArray(logicalLines) ? logicalLines : [];
   const out = [];
-  for (const line of lines) {
-    out.push(...wrapOneExpandedLogicalLine(line, maxWidth));
+  if (!capOn) {
+    for (const line of lines) {
+      for (const row of wrapOneExpandedLogicalLine(line, maxWidth)) out.push(row);
+    }
+    return out.length > 0 ? out : [" "];
+  }
+  if (isShell) {
+    let omitted = 0;
+    for (const line of lines) {
+      for (const row of wrapOneExpandedLogicalLine(line, maxWidth)) {
+        out.push(row);
+        if (out.length > maxRows) {
+          out.shift();
+          omitted += 1;
+        }
+      }
+    }
+    return finalizeShellPhysicalCap(out, omitted, maxRows);
+  }
+  let truncated = false;
+  outer: for (const line of lines) {
+    for (const row of wrapOneExpandedLogicalLine(line, maxWidth)) {
+      if (out.length < maxRows) {
+        out.push(row);
+      } else {
+        truncated = true;
+        break outer;
+      }
+    }
+  }
+  if (truncated) {
+    const bodySlots = Math.max(0, maxRows - 1);
+    if (out.length > bodySlots) out.length = bodySlots;
+    if (maxRows > 0) out.push(omittedPhysicalRowsMarker(1, false));
+    return out.length > 0 ? out.slice(0, maxRows) : [" "];
   }
   return out.length > 0 ? out : [" "];
 }
@@ -3869,7 +4146,11 @@ function renderDeltaText(text) {
   return deltaTextParts(text).map((part, index) => part.color ? /* @__PURE__ */ jsx5(Text5, { color: part.color, children: part.text }, index) : part.text);
 }
 function ResultBody({ lines, rawText, pathArg = "", isShell = false, columns, color, raw }) {
-  const renderLines = raw ? wrapExpandedResultLines(formatExpandedResult(rawText, { pathArg, isShell }), columns) : lines || [];
+  const renderLines = raw ? wrapExpandedResultLines(
+    formatExpandedResult(rawText, { pathArg, isShell }),
+    columns,
+    { isShell }
+  ) : lines || [];
   if (!renderLines || renderLines.length === 0) return null;
   return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "row", children: [
     /* @__PURE__ */ jsx5(Box3, { flexShrink: 0, flexDirection: "column", children: renderLines.map((_, i) => /* @__PURE__ */ jsx5(Text5, { color: theme.subtle, children: i === 0 ? RESULT_GUTTER : RESULT_GUTTER_CONT }, i)) }),
@@ -5826,6 +6107,7 @@ function hintStyle(tone) {
   return { textColor: theme.inactive };
 }
 var IME_LEFT_GUARD_COLUMNS = 0;
+var MOUSE_EXTEND_COALESCE_MS = 24;
 function insertText(draft, input) {
   if (!input) return draft;
   return replaceSelection(draft, input);
@@ -5901,6 +6183,7 @@ function PromptInput({
   const cursorEnabledRef = useRef4(false);
   const contentWidthRef = useRef4(80);
   const preferredColumnRef = useRef4(null);
+  const mouseExtendCoalesceRef = useRef4({ pendingNext: null, timer: null, t: 0 });
   const { value, cursor } = draft;
   draftRef.current = draft;
   if (selectionRef) {
@@ -5969,25 +6252,79 @@ function PromptInput({
   const updateDraft = (fn, options = {}) => {
     commitDraft(fn(draftRef.current), options);
   };
+  const cancelMouseExtendCoalesce = () => {
+    const state = mouseExtendCoalesceRef.current;
+    if (state.timer) {
+      clearTimeout(state.timer);
+      state.timer = null;
+    }
+    state.pendingNext = null;
+  };
+  const queueMouseExtendCommit = (next, immediate = false) => {
+    if (immediate) {
+      cancelMouseExtendCoalesce();
+      commitDraft(next);
+      mouseExtendCoalesceRef.current.t = Date.now();
+      return;
+    }
+    if (draftStateEqual(draftRef.current, next)) {
+      cancelMouseExtendCoalesce();
+      commitDraft(next);
+      return;
+    }
+    const state = mouseExtendCoalesceRef.current;
+    state.pendingNext = next;
+    const now = Date.now();
+    const elapsed = now - state.t;
+    if (elapsed >= MOUSE_EXTEND_COALESCE_MS) {
+      cancelMouseExtendCoalesce();
+      state.t = now;
+      commitDraft(next);
+      return;
+    }
+    if (state.timer) return;
+    state.timer = setTimeout(() => {
+      const current = mouseExtendCoalesceRef.current;
+      const pending = current.pendingNext;
+      current.timer = null;
+      current.pendingNext = null;
+      current.t = Date.now();
+      if (pending) commitDraft(pending);
+    }, Math.max(1, MOUSE_EXTEND_COALESCE_MS - elapsed));
+    state.timer.unref?.();
+  };
   if (mouseSelectionRef) {
     mouseSelectionRef.current = {
       offsetAtCell: (row, col) => offsetAtCell(draftRef.current.value, row, col, contentWidthRef.current),
       anchorAt: (offset) => {
+        cancelMouseExtendCoalesce();
         const value2 = draftRef.current.value;
         const off = Math.max(0, Math.min(value2.length, Math.floor(Number(offset) || 0)));
         commitDraft({ ...draftRef.current, cursor: off, selectionAnchor: off });
+        mouseExtendCoalesceRef.current.t = Date.now();
       },
-      extendTo: (offset) => {
+      extendTo: (offset, immediate = false) => {
+        if (offset == null) {
+          if (immediate) cancelMouseExtendCoalesce();
+          return;
+        }
         const d = draftRef.current;
         const off = Math.max(0, Math.min(d.value.length, Math.floor(Number(offset) || 0)));
         const anchor = Number.isFinite(d.selectionAnchor) ? d.selectionAnchor : d.cursor;
-        commitDraft({ ...d, cursor: off, selectionAnchor: anchor });
+        queueMouseExtendCommit({ ...d, cursor: off, selectionAnchor: anchor }, immediate);
       },
       clear: () => {
+        cancelMouseExtendCoalesce();
         if (selectionRange(draftRef.current)) commitDraft(clearSelection(draftRef.current));
       }
     };
   }
+  useEffect3(() => () => {
+    const state = mouseExtendCoalesceRef.current;
+    if (state.timer) clearTimeout(state.timer);
+    state.timer = null;
+    state.pendingNext = null;
+  }, []);
   const moveDraftVertically = (direction, { extend = false } = {}) => {
     const current = draftRef.current;
     const moved = verticalOffset(
@@ -8949,6 +9286,12 @@ function toolHasDisplayResultForRows(item) {
   }
   return true;
 }
+function toolExpandedRawTextForRows(item, rawRt) {
+  if (item?.aggregate) return rawRt;
+  const hasDisplayResult = toolHasDisplayResultForRows(item);
+  if (hasDisplayResult) return toolDisplayedResultTextForRows(item);
+  return rawRt;
+}
 function toolHeaderFailureOnlyForRows(item, normalizedName, hasDisplayResult) {
   if (hasDisplayResult) return false;
   const bgArgs = backgroundArgsForRows(item.args);
@@ -8979,16 +9322,21 @@ function toolArgPathForRows(item) {
   const a = backgroundArgsForRows(item?.args);
   return a?.path ?? a?.file_path ?? a?.file ?? "";
 }
-function isShellSurfaceForRows(normalizedName) {
+function isShellSurfaceForRows(normalizedName, label = "") {
   const n = String(normalizedName || "").toLowerCase();
-  return n === "shell" || n === "bash" || n === "bash_session" || n === "shell_command" || n === "job_wait";
+  const l = String(label || "").toLowerCase();
+  return n === "shell" || n === "bash" || n === "bash_session" || n === "shell_command" || n === "job_wait" || l === "run";
+}
+function isShellSurfaceForToolItem(item, normalizedName) {
+  const label = formatToolSurface(item?.name, item?.args)?.label || "";
+  return isShellSurfaceForRows(normalizedName, label);
 }
 function estimateToolRenderedResultRows(value, { pathArg = "", isShell = false, columns = 80 } = {}) {
   const text = String(value ?? "").replace(/\s+$/, "");
   if (!text) return 1;
   try {
     const logical = formatExpandedResult(text, { pathArg, isShell });
-    const rows = wrapExpandedResultLines(logical, columns).length;
+    const rows = wrapExpandedResultLines(logical, columns, { isShell }).length;
     return Math.max(1, rows);
   } catch {
     return Math.max(1, text.split("\n").length);
@@ -9028,8 +9376,9 @@ function estimateTranscriptItemRows(item, columns, toolOutputExpanded) {
         return TOOL_MARGIN_TOP + 1 + 1;
       }
       if (hasRawResult) {
-        const rawOpts = item.aggregate ? {} : { pathArg: toolArgPathForRows(item), isShell: isShellSurfaceForRows(normalizedName) };
-        return TOOL_MARGIN_TOP + 1 + estimateToolRenderedResultRows(rawRt, { ...rawOpts, columns });
+        const estimateText = toolExpandedRawTextForRows(item, rawRt);
+        const rawOpts = item.aggregate ? {} : { pathArg: toolArgPathForRows(item), isShell: isShellSurfaceForToolItem(item, normalizedName) };
+        return TOOL_MARGIN_TOP + 1 + estimateToolRenderedResultRows(estimateText, { ...rawOpts, columns });
       }
       if (isAgentSurface && !hasResult) return TOOL_MARGIN_TOP + 1 + 1;
       if (isSkillSurface && !hasResult) return TOOL_MARGIN_TOP + 1;
@@ -9054,7 +9403,7 @@ function estimateTranscriptItemRows(item, columns, toolOutputExpanded) {
         const resultText = backgroundMeta?.hasResponse ? backgroundMeta.body : rt;
         const resultRows = estimateToolRenderedResultRows(resultText, {
           pathArg: toolArgPathForRows(item),
-          isShell: isShellSurfaceForRows(normalizedName),
+          isShell: isShellSurfaceForToolItem(item, normalizedName),
           columns
         });
         return TOOL_MARGIN_TOP + 1 + resultRows;
@@ -9710,13 +10059,21 @@ function App({ store, initialStatusLine = "" }) {
     if (options.captureText === false) clipped.captureText = false;
     return clipped;
   }, [selectionClip]);
-  const paintSelectionRect = useCallback2((clippedRect, { rememberText = true } = {}) => {
+  const paintSelectionRect = useCallback2((clippedRect, { rememberText = true, immediate = false } = {}) => {
     const nextRect = clippedRect || null;
     const state2 = selectionPaintRef.current;
-    if (selectionRectsEqual(state2.rect, nextRect)) return false;
+    if (selectionRectsEqual(state2.rect, nextRect)) {
+      const needsCapture = nextRect && rememberText && nextRect.captureText !== false;
+      if (!immediate && !needsCapture) return false;
+      if (immediate || needsCapture) {
+        store.setRenderSelection?.(nextRect, { immediate: true });
+      }
+      if (needsCapture) rememberSelectionTextSoon();
+      return true;
+    }
     state2.rect = nextRect;
     state2.t = Date.now();
-    store.setRenderSelection?.(nextRect);
+    store.setRenderSelection?.(nextRect, immediate ? { immediate: true } : void 0);
     if (nextRect && rememberText && nextRect.captureText !== false) rememberSelectionTextSoon();
     return true;
   }, [store, rememberSelectionTextSoon]);
@@ -9730,7 +10087,7 @@ function App({ store, initialStatusLine = "" }) {
       state2.timer = null;
       state2.pending = null;
     }
-    paintSelectionRect(clippedRect, { rememberText: true });
+    paintSelectionRect(clippedRect, { rememberText: true, immediate: true });
   }, [paintSelectionRect, withSelectionClip]);
   const applySelectionRectThrottled = useCallback2((rect) => {
     const clippedRect = withSelectionClip(rect, { captureText: false });
@@ -10014,7 +10371,7 @@ function App({ store, initialStatusLine = "" }) {
           if (region === "prompt") {
             const offset = promptOffsetAt(x, y);
             dragRef.current.active = false;
-            if (offset != null) promptMouseSelectionRef.current?.extendTo?.(offset);
+            promptMouseSelectionRef.current?.extendTo?.(offset, true);
             continue;
           }
           const anchor = region === "status" ? dragRef.current.anchor : selectionPointAtCurrentScroll(dragRef.current.anchor, dragRef.current.anchorScroll);
@@ -14722,7 +15079,7 @@ ${p.description}` : ""
     if (deltaY === 0) return;
     const clippedRect = withSelectionClip(shiftSelectionRectY(dragRef.current.rect, deltaY));
     dragRef.current = { ...dragRef.current, rect: clippedRect };
-    paintSelectionRect(clippedRect, { rememberText: true });
+    paintSelectionRect(clippedRect, { rememberText: true, immediate: true });
   }, [viewportHeight, transcriptWindow.totalRows, transcriptWindow.effectiveScrollOffset, withSelectionClip, paintSelectionRect]);
   useEffect7(() => {
     const maxRows = Math.max(0, Number(transcriptWindow.maxScrollRows) || 0);