@quandev104/pi-style 0.1.1 → 0.1.2

package/dist/extensions/pi-style.js

@@ -1491,6 +1491,7 @@ function stripAnsi(value) {
           break;
         }
       }
+      if (i + 1 < value.length && value.charCodeAt(i + 1) === 7) i++;
     }
   }
   return output;
@@ -2059,7 +2060,7 @@ function renderSystemContextPanel(resolved, items, minTotalWidth) {
     "\u2500".repeat(pathWidth)
   )}${divider}${resolved.apply("dim", "\u2500".repeat(metricWidth))}`;
   const lines = [
-    renderPanelBorder(resolved, "\u250C", "\u2510", panelWidth),
+    renderPanelBorder(resolved, "\u256D", "\u256E", panelWidth),
     renderPanelLine(resolved, titleLine, panelWidth),
     renderPanelLine(resolved, header, panelWidth),
     renderPanelLine(resolved, separator, panelWidth)
@@ -2081,7 +2082,7 @@ function renderSystemContextPanel(resolved, items, minTotalWidth) {
       )
     );
   }
-  lines.push(renderPanelBorder(resolved, "\u2514", "\u2518", panelWidth));
+  lines.push(renderPanelBorder(resolved, "\u2570", "\u256F", panelWidth));
   return lines;
 }
 function groupToolDetails(tools) {
@@ -2130,7 +2131,7 @@ function renderToolsPanel(resolved, tools, minTotalWidth) {
     "\u2500".repeat(countWidth)
   )}${divider}${resolved.apply("dim", "\u2500".repeat(toolsWidth))}`;
   const lines = [
-    renderPanelBorder(resolved, "\u250C", "\u2510", panelWidth),
+    renderPanelBorder(resolved, "\u256D", "\u256E", panelWidth),
     renderPanelLine(resolved, titleLine, panelWidth),
     renderPanelLine(resolved, header, panelWidth),
     renderPanelLine(resolved, separator, panelWidth)
@@ -2152,7 +2153,7 @@ function renderToolsPanel(resolved, tools, minTotalWidth) {
       )
     );
   }
-  lines.push(renderPanelBorder(resolved, "\u2514", "\u2518", panelWidth));
+  lines.push(renderPanelBorder(resolved, "\u2570", "\u256F", panelWidth));
   return lines;
 }
 var STARTUP_INDENT = "    ";
@@ -3754,6 +3755,12 @@ import { relative, resolve as resolve2 } from "path";
 
 // extension-src/pi-style/shared/elapsed.ts
 var ELAPSED_KEY = "__elapsedMs";
+function formatElapsedMs(ms) {
+  if (typeof ms !== "number" || !Number.isFinite(ms)) return "";
+  if (ms < 1e3) return `${Math.round(ms)}ms`;
+  const s = ms / 1e3;
+  return s < 10 ? `${s.toFixed(1)}s` : `${Math.round(s)}s`;
+}
 function getElapsedMs(result) {
   if (!result || typeof result.details !== "object" || result.details === null) return void 0;
   const elapsed = result.details[ELAPSED_KEY];
@@ -4114,16 +4121,19 @@ function formatCompactCount(value) {
   return `${Math.round(value / 1e6)}M`;
 }
 function formatBoxedWords(text) {
-  return `\u270E ~${formatCompactCount(countWords2(text))} words`;
+  return `~${formatCompactCount(countWords2(text))} words`;
 }
 var BOX_HORIZONTAL = "\u2500";
 var BOX_VERTICAL = "\u2502";
 var BOX_SIDE_PADDING = 2;
 var BOX_MIN_WIDTH = 12;
-var COMPACT_TOOL_NAME_WIDTH = safeVisibleWidth("Search");
-var COMPACT_FOOTER_ELAPSED_WIDTH = 8;
-var COMPACT_FOOTER_EXTRA_WIDTH = 8;
-var COMPACT_FOOTER_WORDS_WIDTH = safeVisibleWidth("\u270E ~1.2k words");
+var BOX_ROUND_TOP_LEFT = "\u256D";
+var BOX_ROUND_TOP_RIGHT = "\u256E";
+var BOX_ROUND_BOTTOM_LEFT = "\u2570";
+var BOX_ROUND_BOTTOM_RIGHT = "\u256F";
+var BOX_DIVIDER_LEFT = "\u251C";
+var BOX_DIVIDER_RIGHT = "\u2524";
+var BOX_LABELED_RIGHT_DASH_MIN = 3;
 function boxWidth(width) {
   return Math.max(BOX_MIN_WIDTH, width);
 }
@@ -4216,19 +4226,8 @@ function formatBoxedStatusIcon(theme, isError) {
 }
 function formatBoxedToolTitle(theme, name, isError) {
   const rawTitle = `\u2794 ${name}`;
-  const coloredTitle = `${colorFromExtra(theme, "bashPromptColor", "bashMode", rawTitle)} ${formatBoxedStatusIcon(theme, isError)}`;
-  const title = typeof theme?.bold === "function" ? theme.bold(coloredTitle) : coloredTitle;
-  return `${title} ${boxText(theme, "|")}`;
-}
-function formatCompactBoxedToolTitle(theme, name, isError) {
-  const paddedName = padVisibleRight(name, COMPACT_TOOL_NAME_WIDTH);
-  const rawTitle = `\u2794 ${paddedName}`;
-  const coloredTitle = `${colorFromExtra(theme, "bashPromptColor", "bashMode", rawTitle)} ${formatBoxedStatusIcon(theme, isError)}`;
-  const title = typeof theme?.bold === "function" ? theme.bold(coloredTitle) : coloredTitle;
-  return `${title} ${boxText(theme, "|")}`;
-}
-function boxText(theme, text) {
-  return `${RESET_INTENSITY}${theme.fg("borderMuted", text)}`;
+  const coloredTitle = isError ? theme.fg("error", `${rawTitle} \u2717`) : `${colorFromExtra(theme, "bashPromptColor", "bashMode", rawTitle)} ${formatBoxedStatusIcon(theme, false)}`;
+  return typeof theme?.bold === "function" ? theme.bold(coloredTitle) : coloredTitle;
 }
 function boxFrameText(theme, text) {
   return `${RESET_INTENSITY}${theme.fg("border", text)}`;
@@ -4238,23 +4237,41 @@ function boxBorder(theme, left, right, width) {
   const innerWidth = renderedWidth - 2;
   return boxFrameText(theme, `${left}${BOX_HORIZONTAL.repeat(innerWidth)}${right}`);
 }
-function padVisibleRight(text, width) {
-  return `${text}${" ".repeat(Math.max(0, width - safeVisibleWidth(text)))}`;
-}
-function boxLineWithRight(theme, left, right, width) {
+function boxLabeledBorder(theme, start, end, leftLabel, rightLabel, width) {
   const renderedWidth = boxWidth(width);
-  const contentWidth = boxInnerWidth(renderedWidth);
-  const divider = ` ${boxText(theme, "|")} `;
-  const dividerWidth = safeVisibleWidth(divider);
+  let left = leftLabel ?? "";
+  const right = rightLabel ?? "";
+  let leftWidth = safeVisibleWidth(left);
   const rightWidth = safeVisibleWidth(right);
+  const leftOverhead = left ? 3 : 0;
+  const rightOverhead = right ? 2 : 0;
+  let rightFill = right ? BOX_LABELED_RIGHT_DASH_MIN : 0;
+  let fill = renderedWidth - start.length - end.length - leftOverhead - leftWidth - rightOverhead - rightWidth - rightFill;
+  if (right && fill < 0) {
+    rightFill = 1;
+    fill = renderedWidth - start.length - end.length - leftOverhead - leftWidth - rightOverhead - rightWidth - rightFill;
+  }
+  if (fill < 0) {
+    const reserved = start.length + end.length + leftOverhead + (right ? rightOverhead + rightWidth + rightFill : 0) + 1;
+    const maxLeft = renderedWidth - reserved;
+    left = maxLeft > 0 ? safeTruncateToWidth(left, maxLeft, "\u2026") : "";
+    leftWidth = safeVisibleWidth(left);
+    fill = renderedWidth - start.length - end.length - (left ? leftWidth + leftOverhead : 0) - (right ? rightOverhead + rightWidth + rightFill : 0);
+  }
+  const parts = [boxFrameText(theme, `${start}${left ? "\u2500 " : ""}`)];
+  if (left) parts.push(left);
+  parts.push(boxFrameText(theme, `${left ? " " : ""}${BOX_HORIZONTAL.repeat(Math.max(0, fill))}`));
+  if (right) {
+    parts.push(boxFrameText(theme, " "), right, boxFrameText(theme, ` ${BOX_HORIZONTAL.repeat(rightFill)}`));
+  }
+  parts.push(boxFrameText(theme, end));
+  return parts.join("");
+}
+function boxBlankLine(theme, width) {
+  const renderedWidth = boxWidth(width);
+  const contentWidth = boxInnerWidth(renderedWidth);
   const sidePad = " ".repeat(BOX_SIDE_PADDING);
-  if (!right || rightWidth + dividerWidth >= contentWidth) {
-    return boxLine(theme, right || left, renderedWidth);
-  }
-  const maxLeftWidth = Math.max(1, contentWidth - dividerWidth - rightWidth - 1);
-  const truncatedLeft = safeTruncateToWidth(left, maxLeftWidth, "\u2026");
-  const gap = " ".repeat(Math.max(1, contentWidth - safeVisibleWidth(truncatedLeft) - dividerWidth - rightWidth));
-  return `${boxFrameText(theme, BOX_VERTICAL)}${sidePad}${truncatedLeft}${gap}${divider}${right}${sidePad}${boxFrameText(theme, BOX_VERTICAL)}`;
+  return `${boxFrameText(theme, BOX_VERTICAL)}${sidePad}${" ".repeat(contentWidth)}${sidePad}${boxFrameText(theme, BOX_VERTICAL)}`;
 }
 function boxLine(theme, content, width) {
   const renderedWidth = boxWidth(width);
@@ -4269,12 +4286,6 @@ function boxLine(theme, content, width) {
   const fill = " ".repeat(Math.max(0, contentWidth - safeVisibleWidth(truncated)));
   return `${boxFrameText(theme, BOX_VERTICAL)}${sidePad}${truncated}${fill}${sidePad}${boxFrameText(theme, BOX_VERTICAL)}`;
 }
-function boxInsetDivider(theme, width) {
-  const renderedWidth = boxWidth(width);
-  const lineWidth = boxInnerWidth(renderedWidth);
-  const sidePad = " ".repeat(BOX_SIDE_PADDING);
-  return `${boxFrameText(theme, BOX_VERTICAL)}${sidePad}${boxText(theme, BOX_HORIZONTAL.repeat(lineWidth))}${sidePad}${boxFrameText(theme, BOX_VERTICAL)}`;
-}
 function boxedWrappedLines(theme, content, width) {
   return safeWrapTextWithAnsi(content, boxInnerWidth(width)).map((line) => boxLine(theme, line, width));
 }
@@ -4327,20 +4338,28 @@ function renderBoxedToolCall(theme, toolName, detailLines, options = {}) {
     render(width) {
       if (cache?.width === width) return cache.lines;
       const title = formatBoxedToolTitle(theme, toolName, options.isError);
+      const headerLabel = options.headerDetail ? `${title} \xB7 ${options.headerDetail}` : title;
       const renderedWidth = boxWidth(width);
       const lines = [
-        boxBorder(theme, "\u250C", "\u2510", renderedWidth),
-        boxLine(theme, title, renderedWidth),
-        boxInsetDivider(theme, renderedWidth),
+        boxLabeledBorder(theme, BOX_ROUND_TOP_LEFT, BOX_ROUND_TOP_RIGHT, headerLabel, void 0, renderedWidth),
+        boxBlankLine(theme, renderedWidth),
         ...detailLines.flatMap((line) => boxedWrappedLines(theme, line, renderedWidth))
       ];
       if (options.isPending) {
         const pendingText = options.pendingText ?? "Waiting for output\u2026";
         lines.push(
-          boxInsetDivider(theme, renderedWidth),
-          ...boxedWrappedLines(theme, `${theme.fg("muted", "\u2026")} ${theme.fg("dim", pendingText)}`, renderedWidth),
-          boxBorder(theme, "\u2514", "\u2518", renderedWidth)
+          boxBlankLine(theme, renderedWidth),
+          boxLabeledBorder(
+            theme,
+            BOX_ROUND_BOTTOM_LEFT,
+            BOX_ROUND_BOTTOM_RIGHT,
+            theme.fg("dim", `\u2026 ${pendingText}`),
+            void 0,
+            renderedWidth
+          )
         );
+      } else {
+        lines.push(boxBlankLine(theme, renderedWidth));
       }
       cache = { width, lines };
       return lines;
@@ -4362,25 +4381,39 @@ function renderCompactBoxedToolCall(theme, toolName, detailLine, options = {}) {
     },
     render(width) {
       const renderedWidth = boxWidth(width);
-      const title = `${formatCompactBoxedToolTitle(theme, toolName, options.isError)} ${detailLine}`;
+      const title = formatBoxedToolTitle(theme, toolName, options.isError);
+      const headerLabel = detailLine ? `${title} \xB7 ${detailLine}` : title;
       const compactFooter = typeof options.state?.[COMPACT_FOOTER_KEY] === "string" ? options.state[COMPACT_FOOTER_KEY] : "";
       const _footerIsError = Boolean(options.state?.[COMPACT_FOOTER_ERROR_KEY]);
       const _footerIsPartial = Boolean(options.state?.[COMPACT_FOOTER_PARTIAL_KEY]);
+      const lines = [
+        boxLabeledBorder(theme, BOX_ROUND_TOP_LEFT, BOX_ROUND_TOP_RIGHT, headerLabel, void 0, renderedWidth),
+        boxBlankLine(theme, renderedWidth)
+      ];
       if (compactFooter) {
-        return [
-          boxBorder(theme, "\u250C", "\u2510", renderedWidth),
-          boxLineWithRight(theme, title, compactFooter, renderedWidth),
-          boxBorder(theme, "\u2514", "\u2518", renderedWidth)
-        ];
-      }
-      const lines = [boxBorder(theme, "\u250C", "\u2510", renderedWidth), boxLine(theme, title, renderedWidth)];
-      if (options.isPending) {
+        lines.push(
+          boxLabeledBorder(
+            theme,
+            BOX_ROUND_BOTTOM_LEFT,
+            BOX_ROUND_BOTTOM_RIGHT,
+            compactFooter,
+            void 0,
+            renderedWidth
+          )
+        );
+      } else if (options.isPending) {
         const pendingText = options.pendingText ?? "Waiting for output\u2026";
         lines.push(
-          boxInsetDivider(theme, renderedWidth),
-          ...boxedWrappedLines(theme, `${theme.fg("muted", "\u2026")} ${theme.fg("dim", pendingText)}`, renderedWidth),
-          boxBorder(theme, "\u2514", "\u2518", renderedWidth)
+          boxLabeledBorder(
+            theme,
+            BOX_ROUND_BOTTOM_LEFT,
+            BOX_ROUND_BOTTOM_RIGHT,
+            theme.fg("dim", `\u2026 ${pendingText}`),
+            void 0,
+            renderedWidth
+          )
         );
+      } else {
       }
       return lines;
     }
@@ -4400,46 +4433,50 @@ function renderBoxedToolResult(theme, body, options = {}) {
       const bodyLines = typeof body === "function" ? body(maxContentWidth) : body.render(maxContentWidth);
       const errorPrefix = options.isError ? [theme.fg("error", "\u2717 Error")] : [];
       const outputLines = bodyLines.length > 0 ? [...errorPrefix, ...bodyLines] : [theme.fg("muted", `\u2205 ${options.emptyText ?? "(no output)"}`)];
-      const footerLines = options.footerLines ?? [];
-      const renderedFooterLines = footerLines.length > 0 ? [boxInsetDivider(theme, renderedWidth), ...footerLines.map((line) => boxLine(theme, line, renderedWidth))] : [];
+      const footerText = (options.footerLines ?? []).join(" \xB7 ");
+      const dividerText = typeof options.dividerLabel === "function" ? options.dividerLabel(renderedWidth) : options.dividerLabel ?? "Response";
       const rendered = [
-        boxInsetDivider(theme, renderedWidth),
+        boxLabeledBorder(
+          theme,
+          BOX_DIVIDER_LEFT,
+          BOX_DIVIDER_RIGHT,
+          theme.fg("dim", dividerText),
+          options.dividerRightLabel ? theme.fg("dim", options.dividerRightLabel) : void 0,
+          renderedWidth
+        ),
+        boxBlankLine(theme, renderedWidth),
         ...renderBoxedOutputLines(theme, outputLines, renderedWidth, options.renderLineBudget ?? outputLines.length),
-        ...renderedFooterLines,
-        boxBorder(theme, "\u2514", "\u2518", renderedWidth)
+        boxBlankLine(theme, renderedWidth),
+        boxLabeledBorder(
+          theme,
+          BOX_ROUND_BOTTOM_LEFT,
+          BOX_ROUND_BOTTOM_RIGHT,
+          footerText,
+          options.expandHint ? theme.fg("dim", options.expandHint) : void 0,
+          renderedWidth
+        )
       ];
       cache = { width, lines: rendered };
       return rendered;
     }
   };
 }
-function formatBoxedFooterFromValues(theme, elapsedMs, output, extraParts = [], fixedColumns = false) {
+function formatBoxedFooterFromValues(theme, elapsedMs, output, extraParts = []) {
   const wall = elapsedMs === void 0 ? "--" : `${(elapsedMs / 1e3).toFixed(2)}s`;
-  const elapsedPart = `${theme.fg("text", "\u25F7")} ${theme.fg("dim", wall)}`;
+  const elapsedPart = theme.fg("text", wall);
   const extraPartList = extraParts.filter(Boolean).map((part) => theme.fg("dim", part));
   const wordsPart = theme.fg("dim", formatBoxedWords(output));
-  const parts = fixedColumns ? [
-    padVisibleRight(elapsedPart, COMPACT_FOOTER_ELAPSED_WIDTH),
-    ...extraPartList.map((part) => padVisibleRight(part, COMPACT_FOOTER_EXTRA_WIDTH)),
-    padVisibleRight(wordsPart, COMPACT_FOOTER_WORDS_WIDTH)
-  ] : [elapsedPart, ...extraPartList, wordsPart];
-  return parts.join(theme.fg("dim", " \xB7 "));
+  return [elapsedPart, ...extraPartList, wordsPart].join(theme.fg("dim", " \xB7 "));
 }
-function formatBoxedFooterParts(theme, result, extraParts = [], fixedColumns = false, elapsedMs) {
-  return formatBoxedFooterFromValues(
-    theme,
-    elapsedMs ?? getElapsedMs(result),
-    getTextOutput(result),
-    extraParts,
-    fixedColumns
-  );
+function formatBoxedFooterParts(theme, result, extraParts = [], elapsedMs) {
+  return formatBoxedFooterFromValues(theme, elapsedMs ?? getElapsedMs(result), getTextOutput(result), extraParts);
 }
 function formatBoxedFooter(theme, result, extraParts = [], elapsedMs) {
-  return formatBoxedFooterParts(theme, result, extraParts, false, elapsedMs);
+  return formatBoxedFooterParts(theme, result, extraParts, elapsedMs);
 }
 function renderCompactBoxedFooter(theme, result, options = {}) {
   if (options.state && typeof options.state === "object") {
-    options.state[COMPACT_FOOTER_KEY] = formatBoxedFooterParts(theme, result, [], true, options.elapsedMs);
+    options.state[COMPACT_FOOTER_KEY] = formatBoxedFooterParts(theme, result, [], options.elapsedMs);
     options.state[COMPACT_FOOTER_ERROR_KEY] = Boolean(options.isError);
     options.state[COMPACT_FOOTER_PARTIAL_KEY] = Boolean(options.isPartial);
     return { invalidate() {
@@ -4451,8 +4488,14 @@ function renderCompactBoxedFooter(theme, result, options = {}) {
     render(width) {
       const renderedWidth = boxWidth(width);
       return [
-        boxLine(theme, formatBoxedFooterParts(theme, result, [], false, options.elapsedMs), renderedWidth),
-        boxBorder(theme, "\u2514", "\u2518", renderedWidth)
+        boxLabeledBorder(
+          theme,
+          BOX_ROUND_BOTTOM_LEFT,
+          BOX_ROUND_BOTTOM_RIGHT,
+          formatBoxedFooterParts(theme, result, [], options.elapsedMs),
+          void 0,
+          renderedWidth
+        )
       ];
     }
   };
@@ -4516,12 +4559,12 @@ ${hint}`);
 
 // extension-src/pi-style/features/messages/boxed-block.ts
 function formatMessageBlockTitle(theme, kind, title, icon = "\u2794") {
-  const rawTitle = title ? `${icon} ${kind} | ${title}` : `${icon} ${kind}`;
+  const rawTitle = title ? `${icon} ${kind} \xB7 ${title}` : `${icon} ${kind}`;
   const coloredTitle = theme.fg("accent", rawTitle);
   return typeof theme?.bold === "function" ? theme.bold(coloredTitle) : coloredTitle;
 }
 function renderBoxedMessageBlock(theme, options) {
-  const { kind, title, right, body, icon = "\u2794", hasDivider = true, cache: shouldCache = true } = options;
+  const { kind, title, right, body, icon = "\u2794", cache: shouldCache = true } = options;
   let cache = null;
   return {
     invalidate() {
@@ -4532,23 +4575,18 @@ function renderBoxedMessageBlock(theme, options) {
       const renderedWidth = boxWidth(width);
       const contentWidth = boxInnerWidth(renderedWidth);
       const titleLine = formatMessageBlockTitle(theme, kind, title, icon);
-      const lines = [];
-      lines.push(boxBorder(theme, "\u250C", "\u2510", renderedWidth));
+      const bodyLines = body(contentWidth);
+      const lines = [
+        boxLabeledBorder(theme, "\u256D", "\u256E", titleLine, void 0, renderedWidth),
+        boxBlankLine(theme, renderedWidth),
+        ...bodyLines.map((line) => boxLine(theme, line, renderedWidth))
+      ];
+      if (bodyLines.length > 0) lines.push(boxBlankLine(theme, renderedWidth));
       if (right) {
-        const rightStyled = theme.fg("dim", right);
-        lines.push(boxLineWithRight(theme, titleLine, rightStyled, renderedWidth));
+        lines.push(boxLabeledBorder(theme, "\u2570", "\u256F", "", theme.fg("dim", right), renderedWidth));
       } else {
-        lines.push(boxLine(theme, titleLine, renderedWidth));
-      }
-      const bodyLines = body(contentWidth);
-      const showDivider = hasDivider === "auto" ? bodyLines.length > 0 : hasDivider;
-      if (showDivider) {
-        lines.push(boxInsetDivider(theme, renderedWidth));
+        lines.push(boxBorder(theme, "\u2570", "\u256F", renderedWidth));
       }
-      for (const line of bodyLines) {
-        lines.push(boxLine(theme, line, renderedWidth));
-      }
-      lines.push(boxBorder(theme, "\u2514", "\u2518", renderedWidth));
       if (shouldCache) cache = { width, lines };
       return lines;
     }
@@ -4594,7 +4632,7 @@ function patchCompaction(instance, _original, theme) {
   const block = renderBoxedMessageBlock(theme, {
     kind: "Compaction",
     title: `${tokenStr} tokens`,
-    ...expanded ? {} : { right: `(${expandHint()})` },
+    ...expanded ? {} : { right: expandHint() },
     body,
     icon: "\u229F",
     hasDivider: expanded
@@ -4614,7 +4652,7 @@ function patchSkill(instance, _original, theme) {
   const block = renderBoxedMessageBlock(theme, {
     kind: "Skill",
     title: skillName,
-    ...expanded ? {} : { right: `(${expandHint()})` },
+    ...expanded ? {} : { right: expandHint() },
     body,
     icon: "\u229F",
     hasDivider: expanded
@@ -4632,7 +4670,7 @@ function patchBranch(instance, _original, theme) {
   const body = expanded && summary && markdownTheme ? createMarkdownBody(summary, markdownTheme, theme) : () => [];
   const block = renderBoxedMessageBlock(theme, {
     kind: "Branch",
-    ...expanded ? {} : { right: `(${expandHint()})` },
+    ...expanded ? {} : { right: expandHint() },
     body,
     icon: "\u229F",
     hasDivider: expanded
@@ -4788,34 +4826,70 @@ function extractOscEnvelope(line) {
   if (bodyEnd < 0 || !line.endsWith(OSC133_ZONE_FINAL)) return void 0;
   return { start: OSC133_ZONE_START, body: line.slice(OSC133_ZONE_START.length, bodyEnd), end: line.slice(bodyEnd) };
 }
-function prefixAtFirstContent(line, prefix) {
+var BG_RESET = "\x1B[49m";
+function splitLeadingMarkers(line) {
   let index = 0;
+  while (line.startsWith("\x1B]", index)) {
+    const bel = line.indexOf("\x07", index + 2);
+    const st = line.indexOf("\x1B\\", index + 2);
+    const end = bel === -1 ? st : st === -1 ? bel : Math.min(bel, st);
+    if (end === -1) break;
+    index = end + 1;
+  }
+  return { head: line.slice(0, index), rest: line.slice(index) };
+}
+function leadingSgr(line) {
+  if (!line.startsWith("\x1B[")) return "";
+  let index = 2;
   while (index < line.length) {
-    if (line[index] === "\x1B" && line[index + 1] === "[") {
-      index += 2;
-      while (index < line.length && (line.charCodeAt(index) < 64 || line.charCodeAt(index) > 126)) index++;
-      if (index < line.length) index++;
-      continue;
-    }
-    if (/\s/u.test(line[index] ?? "")) {
-      index++;
-      continue;
-    }
-    break;
+    const code = line.charCodeAt(index);
+    if (code >= 64 && code <= 126) return line.slice(0, index + 1);
+    index++;
   }
-  return `${line.slice(0, index)}${prefix}${line.slice(index)}`;
+  return "";
 }
-function decorateMessageLine(line, index, lastIndex, contentIndex, options) {
+function isBackgroundSgr(sequence) {
+  if (!sequence.startsWith("\x1B[") || !sequence.endsWith("m")) return false;
+  for (const code of sequence.slice(2, -1).split(";")) {
+    const value = Number(code);
+    if (value === 48 || value === 49) return true;
+    if (value >= 40 && value <= 47) return true;
+    if (value >= 100 && value <= 107) return true;
+  }
+  return false;
+}
+function rebuildAtWidth(line, width, lead) {
+  const { head, rest } = splitLeadingMarkers(line);
+  const bgAnsi = leadingSgr(rest);
+  if (bgAnsi && isBackgroundSgr(bgAnsi) && rest.endsWith(BG_RESET)) {
+    const body = rest.slice(bgAnsi.length, rest.length - BG_RESET.length);
+    const pad = " ".repeat(Math.max(0, width - visibleWidth3(lead) - visibleWidth3(body)));
+    return `${head}${bgAnsi}${lead}${body}${pad}${BG_RESET}`;
+  }
+  const padded = `${lead}${line}`;
+  return `${padded}${" ".repeat(Math.max(0, width - visibleWidth3(padded)))}`;
+}
+function decorateMessageLine(line, index, lastIndex, contentIndex, width, options) {
   const { firstEnvelope, firstHasStart, multilineEnvelope, prefix } = options;
   const prefixWidth = visibleWidth3(prefix);
+  const lead = index === contentIndex ? prefix : index > contentIndex ? " ".repeat(prefixWidth) : "";
   if (index === contentIndex && firstEnvelope)
-    return `${firstEnvelope.start}${prefixAtFirstContent(firstEnvelope.body, prefix)}${firstEnvelope.end}`;
+    return `${firstEnvelope.start}${rebuildAtWidth(firstEnvelope.body, width, prefix)}${firstEnvelope.end}`;
   if (index === contentIndex && firstHasStart)
-    return `${OSC133_ZONE_START}${prefix}${line.slice(OSC133_ZONE_START.length)}`;
+    return `${OSC133_ZONE_START}${rebuildAtWidth(line.slice(OSC133_ZONE_START.length), width, prefix)}`;
   if (index === lastIndex && multilineEnvelope && index !== contentIndex)
-    return `${OSC133_ZONE_END}${OSC133_ZONE_FINAL}${line.slice((OSC133_ZONE_END + OSC133_ZONE_FINAL).length)}`;
-  if (index === contentIndex) return `${prefix}${line}`;
-  return index > contentIndex ? `${" ".repeat(prefixWidth)}${line}` : line;
+    return `${OSC133_ZONE_END}${OSC133_ZONE_FINAL}${rebuildAtWidth(
+      line.slice((OSC133_ZONE_END + OSC133_ZONE_FINAL).length),
+      width,
+      lead
+    )}`;
+  if (index === contentIndex && index === lastIndex && multilineEnvelope && line.startsWith(OSC133_ZONE_END + OSC133_ZONE_FINAL))
+    return `${OSC133_ZONE_END}${OSC133_ZONE_FINAL}${rebuildAtWidth(
+      line.slice((OSC133_ZONE_END + OSC133_ZONE_FINAL).length),
+      width,
+      prefix
+    )}`;
+  return rebuildAtWidth(line, width, lead);
 }
 function contentText(line) {
   let output = "";
@@ -4849,23 +4923,21 @@ function prefixNative(lines, width, prefix) {
   const first = nativeLines[0] ?? "";
   const last = nativeLines.at(-1) ?? "";
   const multilineEnvelope = nativeLines.length > 1 && last.startsWith(OSC133_ZONE_END + OSC133_ZONE_FINAL);
-  const firstContentIndex = nativeLines.findIndex(
-    (line, index) => index !== nativeLines.length - 1 || !multilineEnvelope ? hasContent(line) : false
-  );
+  const firstContentIndex = nativeLines.findIndex((line, index) => {
+    if (index !== nativeLines.length - 1 || !multilineEnvelope) return hasContent(line);
+    return !nativeLines.slice(0, index).some((earlier) => hasContent(earlier)) && hasContent(line);
+  });
   if (firstContentIndex < 0) return nativeLines;
   const firstEnvelope = firstContentIndex === 0 ? extractOscEnvelope(first) : void 0;
   const firstHasStart = firstContentIndex === 0 && first.startsWith(OSC133_ZONE_START);
-  const decorated = nativeLines.map((line, index) => {
-    if (index === firstContentIndex)
-      return decorateMessageLine(line, index, nativeLines.length - 1, firstContentIndex, {
-        firstEnvelope,
-        firstHasStart,
-        multilineEnvelope,
-        prefix
-      });
-    if (index > firstContentIndex && hasContent(line)) return `${" ".repeat(prefixWidth)}${line}`;
-    return line;
-  });
+  const decorated = nativeLines.map(
+    (line, index) => decorateMessageLine(line, index, nativeLines.length - 1, firstContentIndex, width, {
+      firstEnvelope,
+      firstHasStart,
+      multilineEnvelope,
+      prefix
+    })
+  );
   if (!decorated.every((line) => visibleWidth3(line) <= width)) return void 0;
   if (!nativeLines.every((line) => visibleWidth3(line) <= bodyWidth)) return void 0;
   return decorated;
@@ -4956,7 +5028,6 @@ function matchLimitReached(result) {
 }
 
 // extension-src/pi-style/features/tools/boxed/bash.ts
-var MAX_BASH_PREVIEW_LINES = 5;
 var MAX_LINE_CHARS = 2e3;
 var ESC2 = "\x1B";
 var BASH_TOOL_NOTICE_PATTERN = /^\[Showing (?:last|lines)\b.*\. Full output: .+\]$/;
@@ -5085,13 +5156,16 @@ function formatTimeout(context) {
   const timeout = context?.args?.timeout ?? 300;
   return `${timeout}s`;
 }
-function renderBoxedBashResult(theme, inner, result, context) {
+function renderBoxedBashResult(theme, inner, result, context, expandHint2) {
   const rawCommand = String(context?.args?.command ?? "...");
   const referenceLines = rawCommand.split("\n").map((line, index) => `${index === 0 ? "$ " : "> "}${line}`);
   return renderBoxedToolResult(theme, inner, {
     widthKey: bashWidthKey(rawCommand, context?.args?.timeout),
     referenceLines,
-    footerLines: [formatBoxedFooter(theme, result, [`\u23F9 ${formatTimeout(context)}`], getElapsed(context))],
+    footerLines: [
+      formatBoxedFooter(theme, result, [`timeout ${formatTimeout(context)}`], getElapsed(context))
+    ],
+    ...expandHint2 ? { expandHint: expandHint2 } : {},
     isError: context.isError,
     isPartial: Boolean(context.isPartial)
   });
@@ -5099,7 +5173,7 @@ function renderBoxedBashResult(theme, inner, result, context) {
 function getElapsed(context) {
   return getStateElapsedMs(context.state);
 }
-function createBashResultPreview(theme, text, options, color, extraLinesBefore = 0) {
+function createBashResultPreview(theme, text, options, color) {
   let cacheKey = "";
   let cacheLines = null;
   return {
@@ -5114,7 +5188,7 @@ function createBashResultPreview(theme, text, options, color, extraLinesBefore =
       const cacheId = `${bodyWidth}|${expanded ? 1 : 0}|${cfg.maxExpandedLines}|${cfg.dimOutput ? 1 : 0}`;
       if (cacheLines && cacheKey === cacheId) return cacheLines;
       if (!expanded) {
-        const needed = MAX_BASH_PREVIEW_LINES;
+        const needed = cfg.maxCollapsedLines;
         let totalNewlines = 0;
         let scanFrom = 0;
         for (let i = text.length - 1; i >= 0; i--) {
@@ -5143,15 +5217,8 @@ function createBashResultPreview(theme, text, options, color, extraLinesBefore =
           if (color === "error") return formatToolOutputLine(theme, truncated, "error");
           return cfg.dimOutput ? formatToolOutputLine(theme, truncated) : formatToolOutputLine(theme, truncated, "text");
         });
-        const remaining = extraLinesBefore + (scanFrom > 0 ? countNewlines(text, 0, scanFrom) : 0);
-        if (remaining <= 0) {
-          cacheKey = cacheId;
-          cacheLines = truncatedShown;
-          return cacheLines;
-        }
-        const hint = safeTruncateToWidth(`... ${remaining} more lines, press Ctrl+o to expand`, bodyWidth, "\u2026");
         cacheKey = cacheId;
-        cacheLines = [...truncatedShown, "", theme.fg("muted", hint)];
+        cacheLines = truncatedShown;
         return cacheLines;
       }
       const normalized = replaceTabs(text);
@@ -5189,7 +5256,7 @@ var bashTool = {
     const raw = getTextOutput(result);
     const outputColor = context.isError ? "error" : "toolOutput";
     if (!options.expanded) {
-      const scanLines = MAX_BASH_PREVIEW_LINES + 10;
+      const scanLines = getToolsRenderConfig().maxCollapsedLines + 10;
       let nlCount = 0;
       let tailStart = 0;
       for (let i = raw.length - 1; i >= 0; i--) {
@@ -5203,18 +5270,17 @@ var bashTool = {
       }
       const tail = stripBashToolNoticeLines(stripAnsi(raw.slice(tailStart)));
       const totalLinesBefore = tailStart > 0 ? countNewlines(raw, 0, tailStart) : 0;
-      const inner2 = createBashResultPreview(theme, tail, options, outputColor, totalLinesBefore);
-      return renderBoxedBashResult(theme, inner2, result, context);
+      const inner2 = createBashResultPreview(theme, tail, options, outputColor);
+      return renderBoxedBashResult(theme, inner2, result, context, totalLinesBefore > 0 ? "Ctrl+O for more" : void 0);
     }
     const output = stripBashToolNoticeLines(stripAnsi(raw));
-    const inner = createBashResultPreview(theme, output, options, outputColor, 0);
+    const inner = createBashResultPreview(theme, output, options, outputColor);
     return renderBoxedBashResult(theme, inner, result, context);
   }
 };
 
 // extension-src/pi-style/features/tools/boxed/edit.ts
 import { getLanguageFromPath } from "@earendil-works/pi-coding-agent";
-import { Text } from "@earendil-works/pi-tui";
 
 // extension-src/pi-style/shared/split-diff.ts
 import { highlightCode as highlightCode2 } from "@earendil-works/pi-coding-agent";
@@ -5225,6 +5291,9 @@ var ADD_ROW_BACKGROUND_MIX_RATIO = 0.24;
 var REMOVE_ROW_BACKGROUND_MIX_RATIO = 0.12;
 var ADD_INLINE_EMPHASIS_MIX_RATIO = 0.44;
 var REMOVE_INLINE_EMPHASIS_MIX_RATIO = 0.26;
+var CONTEXT_KEEP_DEFAULT = 2;
+var CONTEXT_RUN_SHOW_MAX = 4;
+var SPLIT_DIFF_MIN_WIDTH = 114;
 function ansi256ToRgb(code) {
   if (code <= 15) {
     const base16 = [
@@ -5490,15 +5559,6 @@ function countDiffStats(diff) {
   }
   return { additions, removals };
 }
-function renderDiffMeter(theme, additions, removals, width = 20) {
-  const total = additions + removals;
-  if (total <= 0) return "";
-  const addBlocks = Math.round(additions / total * width);
-  const removeBlocks = Math.max(0, width - addBlocks);
-  const addBar = addBlocks > 0 ? theme.fg("toolDiffAdded", "\u2501".repeat(addBlocks)) : "";
-  const removeBar = removeBlocks > 0 ? theme.fg("toolDiffRemoved", "\u2501".repeat(removeBlocks)) : "";
-  return `${theme.fg("dim", "[")}${addBar}${removeBar}${theme.fg("dim", "]")}`;
-}
 function extractEditedPath(message) {
   const m = message.match(/Successfully replaced (?:text|\d+ block\(s\)|lines L\d+-\d+) in (.+)\.$/);
   return m?.[1];
@@ -5511,11 +5571,85 @@ function firstText(content) {
   }
   return "";
 }
-var SplitDiffComponent = class {
-  constructor(theme, rows, maxRows, language) {
+function longestChangedLineWidth(rows) {
+  let longest = 0;
+  for (const row of rows) {
+    const candidates = [];
+    if (row.kind === "changed") {
+      if (row.left) candidates.push(row.left.line);
+      if (row.right) candidates.push(row.right.line);
+    } else if (row.kind === "added" && row.right) {
+      candidates.push(row.right.line);
+    } else if (row.kind === "removed" && row.left) {
+      candidates.push(row.left.line);
+    }
+    for (const candidate of candidates) {
+      longest = Math.max(longest, safeVisibleWidth(candidate));
+    }
+  }
+  return longest;
+}
+function pickDiffMode(stats, rows, width) {
+  if (stats.additions <= 0 || stats.removals <= 0) return "unified";
+  if (width < SPLIT_DIFF_MIN_WIDTH) return "unified";
+  if (longestChangedLineWidth(rows) > width / 2) return "unified";
+  return "split";
+}
+function collapseContextRows(rows, options) {
+  const keep = options.keep;
+  const runShowMax = options.runShowMax ?? CONTEXT_RUN_SHOW_MAX;
+  const out = [];
+  let i = 0;
+  while (i < rows.length) {
+    const row = rows[i];
+    if (row?.kind !== "context") {
+      if (row) out.push({ kind: "row", row });
+      i++;
+      continue;
+    }
+    let j = i;
+    while (j < rows.length && rows[j]?.kind === "context") j++;
+    const run = j - i;
+    if (run <= runShowMax) {
+      for (let k = i; k < j; k++) out.push({ kind: "row", row: rows[k] });
+    } else {
+      const leading = i === 0;
+      const trailing = j >= rows.length;
+      const keepHead = leading ? 0 : Math.min(keep, run);
+      const keepTail = trailing ? 0 : Math.min(keep, Math.max(0, run - keepHead));
+      const hidden = Math.max(0, run - keepHead - keepTail);
+      if (keepHead > 0) {
+        for (let k = i; k < i + keepHead; k++) out.push({ kind: "row", row: rows[k] });
+      }
+      if (hidden > 0) out.push({ kind: "gap", hidden });
+      if (keepTail > 0) {
+        for (let k = j - keepTail; k < j; k++) out.push({ kind: "row", row: rows[k] });
+      }
+    }
+    i = j;
+  }
+  return out;
+}
+function planEntries(rows, maxRows) {
+  const budget = Math.max(1, maxRows);
+  let entries = collapseContextRows(rows, { keep: CONTEXT_KEEP_DEFAULT });
+  if (entries.length <= budget) return entries;
+  entries = collapseContextRows(rows, { keep: 0, runShowMax: 0 });
+  if (entries.length <= budget) return entries;
+  const kept = entries.slice(0, Math.max(1, budget - 1));
+  const omitted = Math.max(0, entries.length - kept.length);
+  if (omitted <= 0) return kept;
+  return [...kept, { kind: "omitted", count: omitted }];
+}
+function formatGapLabel(hidden) {
+  return `\u22EF ${hidden} unchanged ${hidden === 1 ? "line" : "lines"} hidden`;
+}
+function formatOmittedLabel(count) {
+  return `\u22EF ${count} ${count === 1 ? "line" : "lines"} omitted \xB7 Ctrl+O to show full diff`;
+}
+var DiffRenderContext = class {
+  constructor(theme, rows, language) {
     this.theme = theme;
-    this.rows = rows;
-    this.maxRows = maxRows;
     this.language = language;
     let maxDigits = 3;
     for (const row of rows) {
@@ -5533,16 +5667,129 @@ var SplitDiffComponent = class {
     this.containerBgAnsi = theme.getBgAnsi?.("toolSuccessBg") ?? "";
   }
   theme;
-  rows;
-  maxRows;
   language;
-  cacheWidth;
-  cacheLines;
   lineNumberWidth;
-  highlightCache = /* @__PURE__ */ new Map();
-  inlineHighlights = /* @__PURE__ */ new WeakMap();
   palette;
   containerBgAnsi;
+  highlightCache = /* @__PURE__ */ new Map();
+  inlineHighlights = /* @__PURE__ */ new WeakMap();
+  fg(color, text) {
+    return this.theme.fg(color, text);
+  }
+  inlineSpans(line) {
+    return this.inlineHighlights.get(line) ?? [];
+  }
+  syntaxHighlight(line) {
+    if (!this.language) return stripInlineBreaksPreserveAnsi(line);
+    const safeLine = sanitizeSingleLineText(line);
+    const key = `${this.language}
+${safeLine}`;
+    const cached = this.highlightCache.get(key);
+    if (cached) return cached;
+    let highlighted = safeLine;
+    try {
+      highlighted = highlightCode2(safeLine, this.language)[0] ?? safeLine;
+      highlighted = stripInlineBreaksPreserveAnsi(highlighted).replace(BG_ANSI_PATTERN2, "");
+    } catch {
+      highlighted = safeLine;
+    }
+    this.highlightCache.set(key, highlighted);
+    return highlighted;
+  }
+};
+var UnifiedDiffRenderer = class {
+  constructor(ctx, entries) {
+    this.ctx = ctx;
+    this.entries = entries;
+  }
+  ctx;
+  entries;
+  gapLine(entry, width) {
+    return padRenderedLineWidth(this.ctx.fg("muted", formatGapLabel(entry.hidden)), width);
+  }
+  omittedLine(entry, width) {
+    return padRenderedLineWidth(this.ctx.fg("muted", formatOmittedLabel(entry.count)), width);
+  }
+  render(width) {
+    const safeWidth = Math.max(20, width);
+    const prefixWidth = 1 + 1 + this.ctx.lineNumberWidth + 2;
+    const codeWidth = Math.max(1, safeWidth - prefixWidth);
+    const lines = [];
+    for (const entry of this.entries) {
+      if (entry.kind === "gap") {
+        lines.push(this.gapLine(entry, safeWidth));
+        continue;
+      }
+      if (entry.kind === "omitted") {
+        lines.push(this.omittedLine(entry, safeWidth));
+        continue;
+      }
+      lines.push(...this.rowLines(entry.row, codeWidth, safeWidth));
+    }
+    return lines;
+  }
+  rowLines(row, codeWidth, width) {
+    const segments = [];
+    if (row.kind === "changed") {
+      if (row.left) segments.push({ kind: "remove", line: row.left });
+      if (row.right) segments.push({ kind: "add", line: row.right });
+    } else if (row.kind === "added" && row.right) {
+      segments.push({ kind: "add", line: row.right });
+    } else if (row.kind === "removed" && row.left) {
+      segments.push({ kind: "remove", line: row.left });
+    } else {
+      const line = row.left ?? row.right;
+      if (line) segments.push({ kind: "context", line });
+    }
+    const out = [];
+    for (const segment2 of segments) {
+      out.push(...this.segmentLines(segment2.kind, segment2.line, codeWidth, width));
+    }
+    return out;
+  }
+  segmentLines(kind, line, codeWidth, width) {
+    const isAdd = kind === "add";
+    const isRemove = kind === "remove";
+    const blank = line.line === "";
+    const visualKind = kind === "context" || blank ? "context" : kind;
+    const markerChar = kind === "context" ? " " : isAdd ? "+" : "-";
+    const markerColor = isAdd ? "toolDiffAdded" : isRemove ? "toolDiffRemoved" : "dim";
+    const gutterColor = visualKind === "context" ? "dim" : isAdd ? "toolDiffAdded" : "toolDiffRemoved";
+    const gutter = line.lineNumber.trim().padStart(this.ctx.lineNumberWidth, " ");
+    const firstPrefixAnsi = `${this.ctx.fg(markerColor, markerChar)} ${this.ctx.fg(gutterColor, gutter)}  `;
+    const firstPrefixPlain = `${markerChar} ${gutter}  `;
+    const contPrefixAnsi = `${this.ctx.fg("dim", " ")} ${this.ctx.fg("dim", " ".repeat(this.ctx.lineNumberWidth))}  `;
+    const contPrefixPlain = ` ${" ".repeat(1 + this.ctx.lineNumberWidth)}  `;
+    const rowBg = visualKind === "add" ? this.ctx.palette.addRowBgAnsi : visualKind === "remove" ? this.ctx.palette.removeRowBgAnsi : void 0;
+    const plainSegments = wrapPlainText(line.line, codeWidth);
+    const out = [];
+    for (let i = 0; i < plainSegments.length; i++) {
+      const prefixAnsi = i === 0 ? firstPrefixAnsi : contPrefixAnsi;
+      const prefixPlain = i === 0 ? firstPrefixPlain : contPrefixPlain;
+      const plainSegment = plainSegments[i] ?? "";
+      let segment2 = this.ctx.syntaxHighlight(plainSegment);
+      segment2 = fitToWidth(segment2, codeWidth);
+      let rendered = prefixAnsi + segment2;
+      const expectedWidth = safeVisibleWidth(prefixPlain) + codeWidth;
+      const currentWidth = safeVisibleWidth(stripAnsi(rendered));
+      if (currentWidth < expectedWidth) {
+        rendered += " ".repeat(expectedWidth - currentWidth);
+      }
+      if (rowBg) {
+        rendered = `${rowBg}${keepBackgroundAcrossResets(rendered, rowBg)}${this.ctx.containerBgAnsi}`;
+      }
+      out.push(padRenderedLineWidth(rendered, width));
+    }
+    return out;
+  }
+};
+var SplitDiffRenderer = class {
+  constructor(ctx, entries) {
+    this.ctx = ctx;
+    this.entries = entries;
+  }
+  ctx;
+  entries;
   getCellLineKind(kind, side) {
     if (kind === "changed") return side === "left" ? "remove" : "add";
     if (kind === "removed" && side === "left") return "remove";
@@ -5562,23 +5809,23 @@ var SplitDiffComponent = class {
     return "dim";
   }
   getRowBackground(lineKind) {
-    if (lineKind === "add") return this.palette.addRowBgAnsi;
-    if (lineKind === "remove") return this.palette.removeRowBgAnsi;
+    if (lineKind === "add") return this.ctx.palette.addRowBgAnsi;
+    if (lineKind === "remove") return this.ctx.palette.removeRowBgAnsi;
     return void 0;
   }
   getEmphasisBackground(lineKind) {
-    if (lineKind === "add") return this.palette.addEmphasisBgAnsi;
-    if (lineKind === "remove") return this.palette.removeEmphasisBgAnsi;
+    if (lineKind === "add") return this.ctx.palette.addEmphasisBgAnsi;
+    if (lineKind === "remove") return this.ctx.palette.removeEmphasisBgAnsi;
     return void 0;
   }
   getCellFillBackground(kind, side) {
     switch (kind) {
       case "changed":
-        return side === "left" ? this.palette.removeRowBgAnsi : this.palette.addRowBgAnsi;
+        return side === "left" ? this.ctx.palette.removeRowBgAnsi : this.ctx.palette.addRowBgAnsi;
       case "removed":
-        return side === "left" ? this.palette.removeRowBgAnsi : void 0;
+        return side === "left" ? this.ctx.palette.removeRowBgAnsi : void 0;
       case "added":
-        return side === "right" ? this.palette.addRowBgAnsi : void 0;
+        return side === "right" ? this.ctx.palette.addRowBgAnsi : void 0;
       default:
         return void 0;
     }
@@ -5587,57 +5834,40 @@ var SplitDiffComponent = class {
     const lineKind = this.getCellLineKind(kind, side);
     const markerChar = lineKind === "add" || lineKind === "remove" ? "\u258C" : " ";
     const markerColor = lineKind === "add" ? "toolDiffAdded" : lineKind === "remove" ? "toolDiffRemoved" : "borderMuted";
-    const marker2 = this.theme.fg(markerColor, markerChar);
-    const lineNumber = this.theme.fg("dim", " ".repeat(this.lineNumberWidth));
-    const divider = this.theme.fg("borderMuted", " \u2502 ");
+    const marker2 = this.ctx.fg(markerColor, markerChar);
+    const lineNumber = this.ctx.fg("dim", " ".repeat(this.ctx.lineNumberWidth));
+    const divider = this.ctx.fg("borderMuted", " \u2502 ");
     const prefix = `${marker2} ${lineNumber}${divider}`;
-    const prefixPlain = `${markerChar} ${" ".repeat(this.lineNumberWidth)} \u2502 `;
+    const prefixPlain = `${markerChar} ${" ".repeat(this.ctx.lineNumberWidth)} \u2502 `;
     const tailWidth = Math.max(0, columnWidth - safeVisibleWidth(prefixPlain));
     let rendered = prefix + " ".repeat(tailWidth);
     const bg = this.getCellFillBackground(kind, side);
     if (!bg) return padRenderedLineWidth(rendered, columnWidth);
-    rendered = `${bg}${keepBackgroundAcrossResets(rendered, bg)}${this.containerBgAnsi}`;
+    rendered = `${bg}${keepBackgroundAcrossResets(rendered, bg)}${this.ctx.containerBgAnsi}`;
     return padRenderedLineWidth(rendered, columnWidth);
   }
-  syntaxHighlight(line) {
-    if (!this.language) return stripInlineBreaksPreserveAnsi(line);
-    const safeLine = sanitizeSingleLineText(line);
-    const key = `${this.language}
-${safeLine}`;
-    const cached = this.highlightCache.get(key);
-    if (cached) return cached;
-    let highlighted = safeLine;
-    try {
-      highlighted = highlightCode2(safeLine, this.language)[0] ?? safeLine;
-      highlighted = stripInlineBreaksPreserveAnsi(highlighted).replace(BG_ANSI_PATTERN2, "");
-    } catch {
-      highlighted = safeLine;
-    }
-    this.highlightCache.set(key, highlighted);
-    return highlighted;
-  }
   formatCellLines(kind, side, line, columnWidth) {
     if (!line) return [this.blankCell(kind, side, columnWidth)];
     const lineKind = this.getVisualLineKind(kind, side, line);
     const markerChar = lineKind === "add" || lineKind === "remove" ? "\u258C" : " ";
     const markerColor = lineKind === "add" ? "toolDiffAdded" : lineKind === "remove" ? "toolDiffRemoved" : "borderMuted";
-    const lineNumber = line.lineNumber.trim().padStart(this.lineNumberWidth, " ");
-    const firstPrefixAnsi = this.theme.fg(markerColor, markerChar) + " " + this.theme.fg(this.getNumberColor(lineKind), lineNumber) + this.theme.fg("borderMuted", " \u2502 ");
+    const lineNumber = line.lineNumber.trim().padStart(this.ctx.lineNumberWidth, " ");
+    const firstPrefixAnsi = this.ctx.fg(markerColor, markerChar) + " " + this.ctx.fg(this.getNumberColor(lineKind), lineNumber) + this.ctx.fg("borderMuted", " \u2502 ");
     const firstPrefixPlain = `${markerChar} ${lineNumber} \u2502 `;
-    const contPrefixAnsi = this.theme.fg(markerColor, markerChar) + " " + this.theme.fg("dim", " ".repeat(this.lineNumberWidth)) + this.theme.fg("borderMuted", " \u2502 ");
-    const contPrefixPlain = `${markerChar} ${" ".repeat(this.lineNumberWidth)} \u2502 `;
+    const contPrefixAnsi = this.ctx.fg(markerColor, markerChar) + " " + this.ctx.fg("dim", " ".repeat(this.ctx.lineNumberWidth)) + this.ctx.fg("borderMuted", " \u2502 ");
+    const contPrefixPlain = `${markerChar} ${" ".repeat(this.ctx.lineNumberWidth)} \u2502 `;
     const codeWidth = Math.max(1, columnWidth - safeVisibleWidth(firstPrefixPlain));
     const rowBg = this.getRowBackground(lineKind);
     const emphasisBg = this.getEmphasisBackground(lineKind);
     const plainSegments = wrapPlainText(line.line, codeWidth);
     const lines = [];
-    const spans = this.inlineHighlights.get(line) ?? [];
+    const spans = this.ctx.inlineSpans(line);
     let consumed = 0;
     for (let i = 0; i < plainSegments.length; i++) {
       const prefixAnsi = i === 0 ? firstPrefixAnsi : contPrefixAnsi;
       const prefixPlain = i === 0 ? firstPrefixPlain : contPrefixPlain;
       const plainSegment = plainSegments[i] ?? "";
-      let segment2 = this.syntaxHighlight(plainSegment);
+      let segment2 = this.ctx.syntaxHighlight(plainSegment);
       if (spans.length > 0 && emphasisBg) {
         const segmentStart = consumed;
         for (let si = spans.length - 1; si >= 0; si--) {
@@ -5651,7 +5881,7 @@ ${safeLine}`;
               localStart,
               localEnd,
               emphasisBg,
-              rowBg ?? this.containerBgAnsi
+              rowBg ?? this.ctx.containerBgAnsi
             );
           }
         }
@@ -5664,33 +5894,38 @@ ${safeLine}`;
         rendered += " ".repeat(expectedWidth - currentWidth);
       }
       if (rowBg) {
-        rendered = `${rowBg}${keepBackgroundAcrossResets(rendered, rowBg)}${this.containerBgAnsi}`;
+        rendered = `${rowBg}${keepBackgroundAcrossResets(rendered, rowBg)}${this.ctx.containerBgAnsi}`;
       }
       lines.push(padRenderedLineWidth(rendered, columnWidth));
       consumed += plainSegment.length;
     }
     return lines;
   }
+  gapLine(entry, width) {
+    return padRenderedLineWidth(this.ctx.fg("muted", formatGapLabel(entry.hidden)), width);
+  }
+  omittedLine(entry, width) {
+    return padRenderedLineWidth(this.ctx.fg("muted", formatOmittedLabel(entry.count)), width);
+  }
   render(width) {
-    if (this.cacheWidth === width && this.cacheLines) return this.cacheLines;
     const safeWidth = Math.max(20, width);
-    const columnSeparator = this.theme.fg("borderMuted", " \u2502 ");
+    const columnSeparator = this.ctx.fg("borderMuted", " \u2502 ");
     const separatorWidth = safeVisibleWidth(stripAnsi(columnSeparator));
     const leftWidth = Math.max(20, Math.floor((safeWidth - separatorWidth) / 2));
     const rightWidth = Math.max(20, safeWidth - separatorWidth - leftWidth);
     const formatBorderCell = (columnWidth, junction) => {
       const safeColumnWidth = Math.max(1, columnWidth);
       const chars = "\u2500".repeat(safeColumnWidth).split("");
-      const dividerIndex = this.lineNumberWidth + 3;
+      const dividerIndex = this.ctx.lineNumberWidth + 3;
       if (dividerIndex >= 0 && dividerIndex < chars.length) {
         chars[dividerIndex] = junction;
       }
-      return this.theme.fg("borderMuted", chars.join(""));
+      return this.ctx.fg("borderMuted", chars.join(""));
     };
     const formatHeaderCell = (label, columnWidth) => {
       const markerPad = "  ";
-      const lineNumberLabel = fitToWidth(label, this.lineNumberWidth);
-      const prefixAnsi = this.theme.fg("borderMuted", markerPad) + this.theme.fg("dim", lineNumberLabel) + this.theme.fg("borderMuted", " \u2502 ");
+      const lineNumberLabel = fitToWidth(label, this.ctx.lineNumberWidth);
+      const prefixAnsi = this.ctx.fg("borderMuted", markerPad) + this.ctx.fg("dim", lineNumberLabel) + this.ctx.fg("borderMuted", " \u2502 ");
       const prefixPlain = `${markerPad}${stripAnsi(lineNumberLabel)} \u2502 `;
       const codeWidth = Math.max(0, columnWidth - safeVisibleWidth(prefixPlain));
       return padRenderedLineWidth(prefixAnsi + " ".repeat(codeWidth), columnWidth);
@@ -5698,7 +5933,7 @@ ${safeLine}`;
     const lines = [];
     lines.push(
       padRenderedLineWidth(
-        formatBorderCell(leftWidth, "\u252C") + this.theme.fg("borderMuted", "\u2500\u252C\u2500") + formatBorderCell(rightWidth, "\u252C"),
+        formatBorderCell(leftWidth, "\u252C") + this.ctx.fg("borderMuted", "\u2500\u252C\u2500") + formatBorderCell(rightWidth, "\u252C"),
         safeWidth
       )
     );
@@ -5708,28 +5943,70 @@ ${safeLine}`;
         safeWidth
       )
     );
-    for (const row of this.rows.slice(0, this.maxRows)) {
+    for (const entry of this.entries) {
+      if (entry.kind === "gap") {
+        lines.push(this.gapLine(entry, safeWidth));
+        continue;
+      }
+      if (entry.kind === "omitted") {
+        lines.push(this.omittedLine(entry, safeWidth));
+        continue;
+      }
+      const row = entry.row;
       const leftCellLines = this.formatCellLines(row.kind, "left", row.left, leftWidth);
       const rightCellLines = this.formatCellLines(row.kind, "right", row.right, rightWidth);
       const rowHeight = Math.max(leftCellLines.length, rightCellLines.length);
       for (let i = 0; i < rowHeight; i++) {
-        const leftFallbackKind = row.kind === "changed" ? "context" : row.kind;
-        const rightFallbackKind = row.kind === "changed" ? "context" : row.kind;
-        const leftCell = leftCellLines[i] ?? this.blankCell(leftFallbackKind, "left", leftWidth);
-        const rightCell = rightCellLines[i] ?? this.blankCell(rightFallbackKind, "right", rightWidth);
+        const fallbackKind = row.kind === "changed" ? "context" : row.kind;
+        const leftCell = leftCellLines[i] ?? this.blankCell(fallbackKind, "left", leftWidth);
+        const rightCell = rightCellLines[i] ?? this.blankCell(fallbackKind, "right", rightWidth);
         const joined = padRenderedLineWidth(leftCell + columnSeparator + rightCell, safeWidth);
         lines.push(joined);
       }
     }
-    if (this.rows.length > this.maxRows) {
-      lines.push(this.theme.fg("muted", `... ${this.rows.length - this.maxRows} more rows`));
-    }
     lines.push(
       padRenderedLineWidth(
-        formatBorderCell(leftWidth, "\u2534") + this.theme.fg("borderMuted", "\u2500\u2534\u2500") + formatBorderCell(rightWidth, "\u2534"),
+        formatBorderCell(leftWidth, "\u2534") + this.ctx.fg("borderMuted", "\u2500\u2534\u2500") + formatBorderCell(rightWidth, "\u2534"),
         safeWidth
       )
     );
+    return lines;
+  }
+};
+var AdaptiveDiffComponent = class {
+  constructor(theme, rows, maxRows, language) {
+    this.rows = rows;
+    this.ctx = new DiffRenderContext(theme, rows, language);
+    this.stats = { additions: 0, removals: 0 };
+    for (const row of rows) {
+      if (row.kind === "added" || row.kind === "changed") this.stats.additions++;
+      if (row.kind === "removed" || row.kind === "changed") this.stats.removals++;
+    }
+    const entries = planEntries(rows, maxRows);
+    this.collapsed = entries.some((entry) => entry.kind !== "row");
+    this.unified = new UnifiedDiffRenderer(this.ctx, entries);
+    this.split = new SplitDiffRenderer(this.ctx, entries);
+  }
+  rows;
+  cacheWidth;
+  cacheLines;
+  ctx;
+  stats;
+  unified;
+  split;
+  collapsed;
+  /** True when any unchanged context was collapsed or rows were omitted. */
+  hasCollapsed() {
+    return this.collapsed;
+  }
+  modeForWidth(width) {
+    return pickDiffMode(this.stats, this.rows, Math.max(20, width));
+  }
+  render(width) {
+    if (this.cacheWidth === width && this.cacheLines) return this.cacheLines;
+    const safeWidth = Math.max(20, width);
+    const mode = this.modeForWidth(safeWidth);
+    const lines = mode === "split" ? this.split.render(safeWidth) : this.unified.render(safeWidth);
     this.cacheWidth = width;
     this.cacheLines = lines;
     return lines;
@@ -5737,18 +6014,32 @@ ${safeLine}`;
   invalidate() {
     this.cacheWidth = void 0;
     this.cacheLines = void 0;
-    this.highlightCache.clear();
   }
 };
 
 // extension-src/pi-style/features/tools/boxed/edit.ts
 var MAX_HIGHLIGHT_DIFF_CHARS = 12e3;
 var MAX_HIGHLIGHT_DIFF_ROWS = 120;
+function diffDividerLabel(theme, stats) {
+  const plus = stats.additions > 0 ? theme.fg("toolDiffAdded", `+${stats.additions}`) : theme.fg("dim", "+0");
+  const minus = stats.removals > 0 ? theme.fg("toolDiffRemoved", `-${stats.removals}`) : theme.fg("dim", "-0");
+  return `Diff \xB7 ${plus} ${minus}`;
+}
+function editDiffFooter(theme, result, context, stats) {
+  const elapsedMs = getElapsedMs(result) ?? stateElapsedMs(context);
+  const parts = [];
+  if (elapsedMs !== void 0) parts.push(theme.fg("text", formatElapsedMs(elapsedMs)));
+  const plus = stats.additions > 0 ? theme.fg("toolDiffAdded", `+${stats.additions}`) : theme.fg("dim", "+0");
+  const minus = stats.removals > 0 ? theme.fg("toolDiffRemoved", `-${stats.removals}`) : theme.fg("dim", "-0");
+  parts.push(theme.fg("dim", "1 file"), `${plus} ${minus}`);
+  return parts.join(theme.fg("dim", " \xB7 "));
+}
 var editTool = {
   call(args, theme, context) {
     noteExecutionStart(context);
     const detail = displayPath(String(args?.path ?? args?.file_path ?? ""), context);
-    return renderBoxedToolCall(theme, "Edit", [`${theme.fg("dim", "Path: ")}${detail}`], {
+    return renderBoxedToolCall(theme, "Edit", [], {
+      headerDetail: detail,
       isError: Boolean(context.isError),
       isPartial: Boolean(context.isPartial),
       isPending: Boolean(context.isPartial)
@@ -5783,25 +6074,24 @@ var editTool = {
     const rows = buildSplitRows(diff);
     const expanded = options.expanded;
     const shouldHighlight = Boolean(language) && diff.length <= MAX_HIGHLIGHT_DIFF_CHARS && rows.length <= MAX_HIGHLIGHT_DIFF_ROWS;
-    const { additions, removals } = countDiffStats(diff);
-    const meter = renderDiffMeter(theme, additions, removals);
-    const summary = `${theme.fg("dim", "\u21B3")} ${theme.fg("muted", "diff")} ${theme.fg("toolDiffAdded", `+${additions}`)} ${theme.fg("toolDiffRemoved", `-${removals}`)} ${theme.fg("muted", "split")}` + (meter ? ` ${meter}` : "");
+    const stats = countDiffStats(diff);
     const maxRows = expanded ? 160 : 36;
-    const split = new SplitDiffComponent(theme, rows, maxRows, shouldHighlight ? language : void 0);
+    const diffView = new AdaptiveDiffComponent(theme, rows, maxRows, shouldHighlight ? language : void 0);
+    const expandHint2 = !expanded && diffView.hasCollapsed() ? "Ctrl+O more" : void 0;
     return renderBoxedToolResult(
       theme,
       {
         render(width) {
-          const safeWidth = Math.max(20, width);
-          const headerLines = new Text(summary, 0, 0).render(safeWidth);
-          return [...headerLines, ...split.render(safeWidth)];
+          return diffView.render(width);
         },
         invalidate() {
-          split.invalidate();
+          diffView.invalidate();
         }
       },
       {
-        footerLines: resultFooterLines(theme, result, context)
+        dividerLabel: diffDividerLabel(theme, stats),
+        ...expandHint2 ? { dividerRightLabel: expandHint2 } : {},
+        footerLines: [editDiffFooter(theme, result, context, stats)]
       }
     );
   }
@@ -5823,19 +6113,20 @@ function renderFallbackResult(_toolName, result, options, theme, context) {
   const maxLines = expanded ? getToolsRenderConfig().maxExpandedLines : MAX_FALLBACK_PREVIEW_LINES;
   const output = getTextOutput(result);
   const elapsedMs = getStateElapsedMs(context.state);
+  const { lines, omitted } = selectRenderLines(output, maxLines);
   return renderBoxedToolResult(
     theme,
-    (contentWidth) => {
-      const body = renderLines(theme, output, options, {
-        maxLines,
-        color: isError ? "error" : "toolOutput",
-        width: contentWidth
-      });
-      return body ? body.split("\n") : [];
+    () => {
+      const body = lines.map((line) => formatToolOutputLine(theme, line, isError ? "error" : "toolOutput"));
+      if (expanded && omitted > 0) {
+        body.push(theme.fg("muted", `\u2026 ${omitted} more lines omitted by render budget`));
+      }
+      return body;
     },
     {
       footerLines: [formatBoxedFooter(theme, result, [], elapsedMs)],
       renderLineBudget: maxLines,
+      ...expanded || omitted <= 0 ? {} : { expandHint: "Ctrl+O for more" },
       isError,
       isPartial: Boolean(options.isPartial)
     }
@@ -6004,7 +6295,6 @@ var lsTool = {
 
 // extension-src/pi-style/features/tools/boxed/quick-edit.ts
 import { getLanguageFromPath as getLanguageFromPath2 } from "@earendil-works/pi-coding-agent";
-import { Text as Text2 } from "@earendil-works/pi-tui";
 var MAX_HIGHLIGHT_DIFF_CHARS2 = 12e3;
 var MAX_HIGHLIGHT_DIFF_ROWS2 = 120;
 var QUICK_EDIT_TOOLS = {
@@ -6073,8 +6363,19 @@ function extractQuickEditDiff(text) {
   }
   return diffLines.length > 0 ? diffLines.join("\n") : void 0;
 }
-function quickEditFooter(theme, context, output = "") {
-  return formatBoxedFooterFromValues(theme, getStateElapsedMs(context.state), output);
+function quickEditDividerLabel(theme, stats) {
+  const plus = stats.additions > 0 ? theme.fg("toolDiffAdded", `+${stats.additions}`) : theme.fg("dim", "+0");
+  const minus = stats.removals > 0 ? theme.fg("toolDiffRemoved", `-${stats.removals}`) : theme.fg("dim", "-0");
+  return `Diff \xB7 ${plus} ${minus}`;
+}
+function quickEditDiffFooter(theme, result, context, stats) {
+  const elapsedMs = getElapsedMs(result) ?? getStateElapsedMs(context.state);
+  const parts = [];
+  if (elapsedMs !== void 0) parts.push(theme.fg("text", formatElapsedMs(elapsedMs)));
+  const plus = stats.additions > 0 ? theme.fg("toolDiffAdded", `+${stats.additions}`) : theme.fg("dim", "+0");
+  const minus = stats.removals > 0 ? theme.fg("toolDiffRemoved", `-${stats.removals}`) : theme.fg("dim", "-0");
+  parts.push(theme.fg("dim", "1 file"), `${plus} ${minus}`);
+  return parts.join(theme.fg("dim", " \xB7 "));
 }
 function renderQuickEditResult(_toolName, result, options, theme, context, config) {
   if (options.isPartial) {
@@ -6087,7 +6388,7 @@ function renderQuickEditResult(_toolName, result, options, theme, context, confi
   const output = getTextOutput(result);
   if (context.isError) {
     return renderBoxedToolResult(theme, () => [theme.fg("error", stripAnsi(output).trim() || "Error")], {
-      footerLines: [quickEditFooter(theme, context, output)],
+      footerLines: [quickEditFooter(theme, context)],
       isError: true
     });
   }
@@ -6095,7 +6396,7 @@ function renderQuickEditResult(_toolName, result, options, theme, context, confi
   if (!diff) {
     const fallback = stripAnsi(output).trim() || config.fallbackLabel;
     return renderBoxedToolResult(theme, () => [`${theme.fg("dim", "\u21B3")} ${theme.fg("muted", fallback)}`], {
-      footerLines: [quickEditFooter(theme, context, output)]
+      footerLines: [quickEditFooter(theme, context)]
     });
   }
   const rows = buildSplitRows(diff);
@@ -6103,34 +6404,41 @@ function renderQuickEditResult(_toolName, result, options, theme, context, confi
   const argPath = String(context?.args?.path ?? "");
   const language = argPath ? getLanguageFromPath2(argPath) : void 0;
   const shouldHighlight = Boolean(language) && diff.length <= MAX_HIGHLIGHT_DIFF_CHARS2 && rows.length <= MAX_HIGHLIGHT_DIFF_ROWS2;
-  const { additions, removals } = countDiffStats(diff);
-  const meter = renderDiffMeter(theme, additions, removals);
-  const summary = `${theme.fg("dim", "\u21B3")} ${theme.fg("muted", "diff")} ${theme.fg("toolDiffAdded", `+${additions}`)} ${theme.fg("toolDiffRemoved", `-${removals}`)} ${theme.fg("muted", "split")}` + (meter ? ` ${meter}` : "");
+  const stats = countDiffStats(diff);
   const maxRows = expanded ? 160 : 36;
-  const split = new SplitDiffComponent(theme, rows, maxRows, shouldHighlight ? language : void 0);
+  const diffView = new AdaptiveDiffComponent(theme, rows, maxRows, shouldHighlight ? language : void 0);
+  const expandHint2 = !expanded && diffView.hasCollapsed() ? "Ctrl+O more" : void 0;
   return renderBoxedToolResult(
     theme,
     {
       render(width) {
-        const safeWidth = Math.max(20, width);
-        const headerLines = new Text2(summary, 0, 0).render(safeWidth);
-        return [...headerLines, ...split.render(safeWidth)];
+        return diffView.render(width);
       },
       invalidate() {
-        split.invalidate();
+        diffView.invalidate();
       }
     },
     {
-      footerLines: [quickEditFooter(theme, context, output)]
+      dividerLabel: quickEditDividerLabel(theme, stats),
+      ...expandHint2 ? { dividerRightLabel: expandHint2 } : {},
+      footerLines: [quickEditDiffFooter(theme, result, context, stats)]
     }
   );
 }
+function quickEditFooter(theme, context) {
+  const elapsedMs = getStateElapsedMs(context.state);
+  const parts = [];
+  if (elapsedMs !== void 0) parts.push(theme.fg("text", formatElapsedMs(elapsedMs)));
+  parts.push(theme.fg("dim", "1 file"));
+  return parts.join(theme.fg("dim", " \xB7 "));
+}
 function quickEditTool(config) {
   return {
     call(args, theme, context) {
       noteExecutionStart(context);
       const detail = displayPath(String(args?.path ?? ""), context);
-      return renderBoxedToolCall(theme, config.toolLabel, [`${theme.fg("dim", "Path: ")}${detail}`], {
+      return renderBoxedToolCall(theme, config.toolLabel, [], {
+        headerDetail: detail,
         isError: Boolean(context.isError),
         isPartial: Boolean(context.isPartial),
         isPending: Boolean(context.isPartial)
@@ -7788,7 +8096,6 @@ function createPiStyleSessionCoordinator(pi, hooks = {}) {
       terminalInputUnsubscribe?.();
       terminalInputUnsubscribe = void 0;
       app.sessionShutdown();
-      compatibility.dispose();
     }
   };
 }