@quandev104/pi-style 0.2.1 → 0.2.3

package/dist/extensions/pi-style.js

@@ -1,4 +1,354 @@
+// extension-src/pi-style/features/messages/image-input.ts
+import { readFile as readFile2, stat as stat2 } from "fs/promises";
+import { tmpdir as tmpdir2 } from "os";
+
+// extension-src/pi-style/shared/clipboard-path.ts
+import { tmpdir } from "os";
+var UUID_PATTERN = "[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}";
+var CLIPBOARD_IMAGE_EXTENSIONS = ["png", "jpg", "jpeg", "webp", "gif"];
+function clipboardImageMarker(index) {
+  return `[Image #${index}]`;
+}
+function escapeRegExp(text) {
+  return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+var clipboardPathRegexCache = /* @__PURE__ */ new Map();
+var CLIPBOARD_PATH_REGEX_CACHE_MAX = 16;
+function clipboardPathRegex(tmpRoot = tmpdir()) {
+  const cached = clipboardPathRegexCache.get(tmpRoot);
+  if (cached) return cached;
+  const exts = CLIPBOARD_IMAGE_EXTENSIONS.join("|");
+  const regex = new RegExp(
+    `(?<![a-zA-Z0-9])(${escapeRegExp(tmpRoot)}/pi-clipboard-${UUID_PATTERN}\\.(${exts}))(?![a-zA-Z0-9])`,
+    "g"
+  );
+  if (clipboardPathRegexCache.size >= CLIPBOARD_PATH_REGEX_CACHE_MAX) {
+    const oldest = clipboardPathRegexCache.keys().next().value;
+    if (oldest !== void 0) clipboardPathRegexCache.delete(oldest);
+  }
+  clipboardPathRegexCache.set(tmpRoot, regex);
+  return regex;
+}
+function isSingleClipboardImagePath(text, tmpRoot) {
+  if (!text || /\s/.test(text)) return false;
+  const match = text.match(clipboardPathRegex(tmpRoot ?? tmpdir()));
+  return match !== null && match.length === 1 && match[0] === text;
+}
+function extractClipboardImageTokens(text, tmpRoot) {
+  const tokens = /* @__PURE__ */ new Set();
+  for (const match of text.matchAll(clipboardPathRegex(tmpRoot ?? tmpdir()))) {
+    const token = match[1];
+    if (token) tokens.add(token);
+  }
+  return [...tokens];
+}
+var MARKER_AT_END_PATTERN = /\[Image #([0-9]+)\]( ?)$/;
+function clipboardMarkerAtEnd(text) {
+  const match = MARKER_AT_END_PATTERN.exec(text);
+  if (!match) return void 0;
+  return { index: Number(match[1]), length: match[0].length };
+}
+
+// extension-src/pi-style/shared/clipboard-presence.ts
+import { realpathSync } from "fs";
+import { createRequire } from "module";
+import { dirname } from "path";
+var cachedModule;
+function clipboardResolutionRoots() {
+  const roots = [];
+  const argvMain = process.argv[1];
+  if (typeof argvMain === "string" && argvMain.startsWith("/")) {
+    try {
+      roots.push(dirname(realpathSync(argvMain)));
+    } catch {
+      roots.push(dirname(argvMain));
+    }
+  }
+  roots.push(import.meta.url);
+  return roots;
+}
+function loadClipboardModule() {
+  if (cachedModule !== void 0) return cachedModule;
+  if (process.env.TERMUX_VERSION) {
+    cachedModule = null;
+    return cachedModule;
+  }
+  for (const root of clipboardResolutionRoots()) {
+    try {
+      const require2 = createRequire(root);
+      const resolved = require2("@mariozechner/clipboard");
+      if (resolved && typeof resolved.hasImage === "function") {
+        cachedModule = resolved;
+        return cachedModule;
+      }
+    } catch {
+    }
+  }
+  cachedModule = null;
+  return cachedModule;
+}
+function clipboardHasImageSync() {
+  const clipboard = loadClipboardModule();
+  if (!clipboard || typeof clipboard.hasImage !== "function") return null;
+  try {
+    return clipboard.hasImage() === true;
+  } catch {
+    return null;
+  }
+}
+async function readClipboardImageBinary(options = {}) {
+  const clipboard = loadClipboardModule();
+  if (!clipboard || typeof clipboard.hasImage !== "function" || typeof clipboard.getImageBinary !== "function") {
+    return null;
+  }
+  try {
+    if (!options.skipPresenceProbe && !clipboard.hasImage()) return null;
+    const imageData = await clipboard.getImageBinary();
+    if (!imageData || imageData.length === 0) return null;
+    const bytes = imageData instanceof Uint8Array ? imageData : Uint8Array.from(imageData);
+    return bytes.length > 0 ? { bytes } : null;
+  } catch {
+    return null;
+  }
+}
+
+// extension-src/pi-style/shared/pending-images.ts
+import { readFile, stat } from "fs/promises";
+var MAX_ATTACHABLE_BYTES = 20 * 1024 * 1024;
+var MIME_BY_EXTENSION = Object.freeze({
+  png: "image/png",
+  jpg: "image/jpeg",
+  jpeg: "image/jpeg",
+  webp: "image/webp",
+  gif: "image/gif"
+});
+var pendingImages = /* @__PURE__ */ new Map();
+var nextPendingIndex = 1;
+function resetPendingImageRegistry() {
+  pendingImages.clear();
+  nextPendingIndex = 1;
+}
+function allocatePendingImage() {
+  const index = nextPendingIndex++;
+  let resolveFill = () => {
+  };
+  const entry = {
+    fill: new Promise((resolve3) => {
+      resolveFill = resolve3;
+    }),
+    settled: false
+  };
+  pendingImages.set(index, entry);
+  entry.resolveFill = resolveFill;
+  return { index, marker: `${clipboardImageMarker(index)} ` };
+}
+async function fillPendingImageFromPath(index, path, deps = {}) {
+  const entry = pendingImages.get(index);
+  if (!entry || entry.settled) return;
+  const extension = path.split(".").pop() ?? "";
+  const mimeType = MIME_BY_EXTENSION[extension];
+  if (!mimeType) {
+    settle(entry);
+    return;
+  }
+  const readFileImpl = deps.readFile ?? ((p) => readFile(p));
+  const statSizeImpl = deps.statSize ?? (async (p) => {
+    try {
+      return (await stat(p)).size;
+    } catch {
+      return void 0;
+    }
+  });
+  try {
+    const size = await statSizeImpl(path);
+    if (size === void 0 || size <= 0 || size > MAX_ATTACHABLE_BYTES) {
+      settle(entry);
+      return;
+    }
+    const bytes = await readFileImpl(path);
+    if (bytes.length === 0 || bytes.length > MAX_ATTACHABLE_BYTES) {
+      settle(entry);
+      return;
+    }
+    entry.data = Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength).toString("base64");
+    entry.mimeType = mimeType;
+  } catch {
+  }
+  settle(entry);
+}
+function fillPendingImageBytes(index, data, mimeType) {
+  const entry = pendingImages.get(index);
+  if (!entry || entry.settled) return;
+  if (data.length > 0) {
+    entry.data = data;
+    entry.mimeType = mimeType;
+  }
+  settle(entry);
+}
+function discardPendingImage(index) {
+  const entry = pendingImages.get(index);
+  if (!entry) return;
+  settle(entry);
+  pendingImages.delete(index);
+}
+function isPendingMarkerIndex(index) {
+  return pendingImages.has(index);
+}
+function discardPendingMarkerIndex(index) {
+  discardPendingImage(index);
+}
+function isPendingImageFilled(index) {
+  const entry = pendingImages.get(index);
+  return entry !== void 0 && entry.data !== void 0 && entry.mimeType !== void 0;
+}
+function settle(entry) {
+  entry.settled = true;
+  entry.resolveFill?.();
+}
+async function resolvePendingImagesForSubmit(text) {
+  if (pendingImages.size === 0) return void 0;
+  const markerRe = /\[Image #([0-9]+)\]/g;
+  const found = [];
+  for (const match of text.matchAll(markerRe)) {
+    const index = Number(match[1]);
+    if (Number.isInteger(index) && pendingImages.has(index)) found.push(index);
+  }
+  const matched = new Set(found);
+  await Promise.all(
+    [...pendingImages.entries()].filter(([index]) => matched.has(index)).map(([, entry]) => entry.fill)
+  );
+  const images = [];
+  for (const index of [...matched].sort((a, b) => a - b)) {
+    const entry = pendingImages.get(index);
+    if (entry?.data && entry.mimeType) {
+      images.push({ type: "image", data: entry.data, mimeType: entry.mimeType });
+    }
+  }
+  for (const index of [...pendingImages.keys()]) discardPendingImage(index);
+  return images.length > 0 ? { images } : void 0;
+}
+
+// extension-src/pi-style/features/messages/render-config.ts
+var sessionMessagesConfig = {
+  showImagePreviews: true,
+  clipboardImages: true,
+  previewMaxWidth: 30
+};
+function setMessagesRenderConfig(config) {
+  sessionMessagesConfig = { ...sessionMessagesConfig, ...config };
+}
+function getMessagesRenderConfig() {
+  return sessionMessagesConfig;
+}
+
+// extension-src/pi-style/features/messages/image-input.ts
+var IMAGE_TOKEN = "[image]";
+var MAX_ATTACHABLE_BYTES2 = 20 * 1024 * 1024;
+var MIME_BY_EXTENSION2 = Object.freeze({
+  png: "image/png",
+  jpg: "image/jpeg",
+  jpeg: "image/jpeg",
+  webp: "image/webp",
+  gif: "image/gif"
+});
+function createClipboardImagePasteSurface(deps = {}) {
+  const hasImage = deps.hasImage ?? clipboardHasImageSync;
+  const readBinary = deps.readBinary ?? (() => readClipboardImageBinary({ skipPresenceProbe: true }));
+  return {
+    enabled: () => getMessagesRenderConfig().clipboardImages,
+    clipboardHasImage: () => {
+      try {
+        return hasImage();
+      } catch {
+        return null;
+      }
+    },
+    markerFromClipboard() {
+      const { index, marker: marker2 } = allocatePendingImage();
+      void (async () => {
+        try {
+          const image = await readBinary();
+          if (image) {
+            fillPendingImageBytes(
+              index,
+              Buffer.from(image.bytes.buffer, image.bytes.byteOffset, image.bytes.byteLength).toString("base64"),
+              "image/png"
+            );
+            return;
+          }
+        } catch {
+        }
+        discardPendingMarkerIndex(index);
+      })();
+      return marker2;
+    },
+    async markerFromArtifact(path) {
+      const { index, marker: marker2 } = allocatePendingImage();
+      await fillPendingImageFromPath(index, path);
+      return isPendingImageFilled(index) ? marker2 : path;
+    },
+    isMarkerIndexRegistered: (index) => isPendingMarkerIndex(index),
+    discardMarkerIndex: (index) => discardPendingMarkerIndex(index)
+  };
+}
+async function resolvePendingImageMarkers(text) {
+  if (!getMessagesRenderConfig().clipboardImages) return void 0;
+  return resolvePendingImagesForSubmit(text);
+}
+async function transformClipboardImages(text, deps = {}) {
+  if (!getMessagesRenderConfig().clipboardImages) return void 0;
+  const tokens = extractClipboardImageTokens(text, deps.tmpRoot);
+  if (tokens.length === 0) return void 0;
+  const attached = [];
+  const rewritten = /* @__PURE__ */ new Map();
+  for (const token of tokens) {
+    const image = await readAttachable(token, deps);
+    if (!image) continue;
+    attached.push({ type: "image", data: image.data, mimeType: image.mimeType });
+    rewritten.set(token, IMAGE_TOKEN);
+  }
+  if (attached.length === 0) return void 0;
+  return { text: rewriteTokens(text, rewritten, deps.tmpRoot), images: attached };
+}
+async function readAttachable(path, deps) {
+  const extension = path.split(".").pop() ?? "";
+  const mimeType = MIME_BY_EXTENSION2[extension];
+  if (!mimeType) return void 0;
+  const readFileImpl = deps?.readFile ?? ((p) => readFile2(p));
+  const statSizeImpl = deps?.statSize ?? (async (p) => {
+    try {
+      return (await stat2(p)).size;
+    } catch {
+      return void 0;
+    }
+  });
+  try {
+    const size = await statSizeImpl(path);
+    if (size === void 0 || size <= 0 || size > MAX_ATTACHABLE_BYTES2) return void 0;
+    const bytes = await readFileImpl(path);
+    if (bytes.length === 0 || bytes.length > MAX_ATTACHABLE_BYTES2) return void 0;
+    return { data: Buffer.from(bytes).toString("base64"), mimeType };
+  } catch {
+    return void 0;
+  }
+}
+function rewriteTokens(text, rewritten, tmpRoot) {
+  if (rewritten.size === 0) return text;
+  return text.replace(
+    clipboardPathRegex(tmpRoot ?? tmpdir2()),
+    (match, token) => rewritten.has(token) ? IMAGE_TOKEN : match
+  );
+}
+
+// extension-src/pi-style/features/messages/image-preview.ts
+import {
+  getCapabilities,
+  getImageDimensions,
+  Image
+} from "@earendil-works/pi-tui";
+
 // extension-src/pi-style/shared/ansi.ts
+import { visibleWidth as tuiVisibleWidth } from "@earendil-works/pi-tui";
 function isFinal(byte) {
   return byte >= "@" && byte <= "~";
 }
@@ -82,7 +432,7 @@ function stripAnsi(value) {
   return output;
 }
 function visibleWidth(value) {
-  return [...stripAnsi(value)].length;
+  return tuiVisibleWidth(value);
 }
 function resetAnsi(value) {
   return `${value}\x1B[0m`;
@@ -93,9 +443,10 @@ function fitAnsiWidth(value, width, ellipsis = "\u2026") {
 function truncateAnsi(value, width, ellipsis = "\u2026") {
   if (width <= 0) return "";
   if (visibleWidth(value) <= width) return resetAnsi(value);
+  const ellipsisWidth = visibleWidth(ellipsis);
   let output = "";
   let visible = 0;
-  for (let i = 0; i < value.length && visible < width - visibleWidth(ellipsis); i++) {
+  for (let i = 0; i < value.length && visible < width - ellipsisWidth; i++) {
     if (value.charCodeAt(i) === 27) {
       const start = i;
       i++;
@@ -212,6 +563,147 @@ function fgHex(theme, hex, text) {
   return `${escapes.prefix}${text}${escapes.suffix}`;
 }
 
+// extension-src/pi-style/features/messages/image-preview.ts
+var IMAGE_PREVIEW_ENTRY_TYPE = "pi-style-image-preview";
+var IMAGE_PREVIEW_EXPANDED_MAX_WIDTH_CELLS = 60;
+var IMAGE_PREVIEW_MAX_WIDTH_CELLS = 60;
+var GRID_GAP = 2;
+var GRID_MIN_COLUMN = 14;
+function isPreviewableImage(value) {
+  if (!value || typeof value !== "object") return false;
+  const data = value.data;
+  const mimeType = value.mimeType;
+  return typeof data === "string" && data.length > 0 && typeof mimeType === "string" && mimeType.length > 0;
+}
+function stageImagePreviewData(images) {
+  if (!getMessagesRenderConfig().showImagePreviews) return void 0;
+  const valid = images.filter(isPreviewableImage).map((image) => ({ data: image.data, mimeType: image.mimeType }));
+  return valid.length > 0 ? { images: valid } : void 0;
+}
+function flushImagePreviewEntry(pi, data) {
+  if (!getMessagesRenderConfig().showImagePreviews) return;
+  pi.appendEntry(IMAGE_PREVIEW_ENTRY_TYPE, data);
+}
+function previewImagesFromEntryData(data) {
+  if (!data || typeof data !== "object") return void 0;
+  const images = data.images;
+  if (!Array.isArray(images) || images.length === 0) return void 0;
+  if (!images.every(isPreviewableImage)) return void 0;
+  return images;
+}
+function imageLabel(theme, index, dims) {
+  const dimsPart = dims ? ` \xB7 ${dims.widthPx}\xD7${dims.heightPx}` : "";
+  return theme.fg("dim", `#${index}${dimsPart}`);
+}
+var __dimensionParsesForTest = { count: 0 };
+function parseImageDimensions(image) {
+  __dimensionParsesForTest.count++;
+  const fromPrefix = getImageDimensions(image.data.slice(0, 256), image.mimeType);
+  return fromPrefix ?? getImageDimensions(image.data, image.mimeType) ?? void 0;
+}
+var previewCache = /* @__PURE__ */ new WeakMap();
+function renderImagePreviewEntry(entry, options, theme) {
+  if (!getMessagesRenderConfig().showImagePreviews) return void 0;
+  const images = previewImagesFromEntryData(entry?.data);
+  if (!images) return void 0;
+  const fg = theme?.fg;
+  if (typeof fg !== "function") return void 0;
+  const expanded = options?.expanded === true;
+  try {
+    const themed = { fg: fg.bind(theme) };
+    let cached = previewCache.get(entry);
+    if (!cached) {
+      const dims = images.map(parseImageDimensions);
+      const components2 = images.map(
+        (image, index) => new Image(
+          image.data,
+          image.mimeType,
+          { fallbackColor: (text) => themed.fg("toolOutput", text) },
+          {},
+          dims[index]
+        )
+      );
+      const labels2 = images.map((_image, index) => imageLabel(themed, index + 1, dims[index]));
+      cached = { images, components: components2, labels: labels2 };
+      previewCache.set(entry, cached);
+    }
+    const { components, labels } = cached;
+    let memo;
+    return {
+      invalidate() {
+        memo = void 0;
+        for (const component of components) component.invalidate();
+      },
+      render(width) {
+        const config = getMessagesRenderConfig();
+        const kitty = getCapabilities().images === "kitty";
+        const key = `${width}|${expanded}|${config.previewMaxWidth}|${config.showImagePreviews}|${kitty}`;
+        if (memo && memo.key === key) return memo.lines;
+        const maxWidth = expanded ? IMAGE_PREVIEW_EXPANDED_MAX_WIDTH_CELLS : Math.min(config.previewMaxWidth, IMAGE_PREVIEW_MAX_WIDTH_CELLS);
+        let lines;
+        if (width <= 0) lines = [];
+        else if (images.length === 1 || !kitty) lines = renderStacked(width, maxWidth, labels, components);
+        else lines = renderGrid(width, maxWidth, labels, components);
+        memo = { key, lines };
+        return lines;
+      }
+    };
+  } catch {
+    return void 0;
+  }
+}
+function renderStacked(width, maxWidth, labels, components) {
+  const lines = [];
+  for (const [index, component] of components.entries()) {
+    if (index > 0) lines.push("");
+    lines.push(labels[index] ?? "");
+    lines.push(...component.render(Math.min(width, Math.max(1, maxWidth + 2))));
+  }
+  return lines;
+}
+function stripTrailingSpaces(line) {
+  if (!line.endsWith(" ")) return line;
+  let end = line.length;
+  while (end > 0 && line.charCodeAt(end - 1) === 32) end--;
+  return line.slice(0, end);
+}
+function renderGrid(width, maxWidth, labels, components) {
+  const usable = Math.max(1, width - 2);
+  const maxColumns = Math.floor((usable + GRID_GAP) / (GRID_MIN_COLUMN + GRID_GAP));
+  const columns = Math.max(1, Math.min(components.length, maxColumns, 3));
+  if (columns < 2) return renderStacked(width, maxWidth, labels, components);
+  const columnWidth = Math.min(maxWidth, Math.floor((usable - (columns - 1) * GRID_GAP) / columns));
+  if (columnWidth < GRID_MIN_COLUMN) return renderStacked(width, maxWidth, labels, components);
+  const lines = [];
+  for (let start = 0; start < components.length; start += columns) {
+    const group = components.slice(start, start + columns);
+    const groupLabels = labels.slice(start, start + columns);
+    if (start > 0) lines.push("");
+    const rendered = group.map((component) => component.render(columnWidth));
+    const labelRow = groupLabels.map((label, _index) => {
+      const pad = Math.max(0, columnWidth - visibleWidth(stripAnsi(label)));
+      return label + " ".repeat(pad);
+    }).join(" ".repeat(GRID_GAP)).trimEnd();
+    lines.push(labelRow);
+    const rows = Math.max(...rendered.map((column) => column.length));
+    for (let row = 0; row < rows; row++) {
+      let line = "";
+      for (let column = 0; column < rendered.length; column++) {
+        if (column > 0) {
+          const startCol = column * (columnWidth + GRID_GAP);
+          line += `\x1B[${startCol + 1}G`;
+        }
+        line += rendered[column]?.[row] ?? "";
+      }
+      lines.push(stripTrailingSpaces(line));
+    }
+  }
+  return lines;
+}
+function registerImagePreviewSurface(pi) {
+  pi.registerEntryRenderer(IMAGE_PREVIEW_ENTRY_TYPE, renderImagePreviewEntry);
+}
+
 // extension-src/pi-style/shared/box.ts
 import { homedir as homedir2 } from "os";
 import { relative, resolve as resolve2 } from "path";
@@ -233,7 +725,7 @@ function getElapsedMs(result) {
 // extension-src/pi-style/shared/render-budget.ts
 import {
   truncateToWidth as tuiTruncateToWidth,
-  visibleWidth as tuiVisibleWidth,
+  visibleWidth as tuiVisibleWidth2,
   wrapTextWithAnsi
 } from "@earendil-works/pi-tui";
 var MAX_RENDER_LINE_CHARS = 2e3;
@@ -455,7 +947,7 @@ function safeVisibleWidth(text) {
   const fastWidth = knownVisibleWidth(text);
   if (fastWidth) return fastWidth.visibleWidth;
   if (text === TRUNCATE_ELLIPSIS) return 1;
-  return tuiVisibleWidth(text);
+  return tuiVisibleWidth2(text);
 }
 function safeTruncateToWidth(text, maxWidth, ellipsis = "...", pad = false) {
   const width = Math.floor(maxWidth);
@@ -509,9 +1001,9 @@ function boxedResultRenderBudget(rawLineBudget = DEFAULT_COLLAPSED_RENDER_LINES)
 // extension-src/pi-style/shared/theme-extras.ts
 import { existsSync, readdirSync, readFileSync } from "fs";
 import { homedir } from "os";
-import { dirname, join, resolve } from "path";
+import { dirname as dirname2, join, resolve } from "path";
 import { fileURLToPath } from "url";
-var extensionDir = dirname(fileURLToPath(import.meta.url));
+var extensionDir = dirname2(fileURLToPath(import.meta.url));
 var THEME_EXTRA_DEFAULTS = Object.freeze({
   assistantPrefix: "\u2022",
   assistantPrefixColor: "",
@@ -743,12 +1235,48 @@ function getTextOutput(result) {
   });
   return textBlocks.map((contentBlock) => String(contentBlock.text ?? "")).join("\n").replace(/\r/g, "");
 }
+var WORD_CP_UNKNOWN = 255;
+var WORD_CP_SURROGATE = 254;
+var WORD_CP_CLASS = new Uint8Array(65536).fill(WORD_CP_UNKNOWN);
+for (let code = 48; code <= 57; code++) WORD_CP_CLASS[code] = 1;
+for (let code = 65; code <= 90; code++) WORD_CP_CLASS[code] = 1;
+for (let code = 97; code <= 122; code++) WORD_CP_CLASS[code] = 1;
+WORD_CP_CLASS[39] = 1;
+WORD_CP_CLASS[45] = 1;
+WORD_CP_CLASS[95] = 1;
+WORD_CP_CLASS.fill(WORD_CP_SURROGATE, 55296, 57344);
+var NON_ASCII_WORD_RE = /[\p{L}\p{N}]/u;
+var ASTRAL_WORD_CP = /* @__PURE__ */ new Map();
+function astralWordMembership(codePoint) {
+  const cached = ASTRAL_WORD_CP.get(codePoint);
+  if (cached !== void 0) return cached;
+  const membership = NON_ASCII_WORD_RE.test(String.fromCodePoint(codePoint)) ? 1 : 0;
+  ASTRAL_WORD_CP.set(codePoint, membership);
+  return membership;
+}
 function countWords(text) {
+  const len = text.length;
   let count = 0;
-  let inWord = false;
-  for (const char of text) {
-    const isWord = /[\p{L}\p{N}_'-]/u.test(char);
-    if (isWord && !inWord) count++;
+  let inWord = 0;
+  for (let i = 0; i < len; i++) {
+    const code = text.charCodeAt(i);
+    const membership = WORD_CP_CLASS[code] ?? 0;
+    let isWord;
+    if (membership <= 1) {
+      isWord = membership;
+    } else if (membership === WORD_CP_SURROGATE) {
+      const next = i + 1 < len ? text.charCodeAt(i + 1) : 0;
+      if (code <= 56319 && next >= 56320 && next <= 57343) {
+        isWord = astralWordMembership(65536 + (code - 55296 << 10) + (next - 56320));
+        i++;
+      } else {
+        isWord = 0;
+      }
+    } else {
+      isWord = NON_ASCII_WORD_RE.test(String.fromCharCode(code)) ? 1 : 0;
+      WORD_CP_CLASS[code] = isWord;
+    }
+    count += isWord & (inWord ^ 1);
     inWord = isWord;
   }
   return count;
@@ -1615,7 +2143,7 @@ function registerBatchResult(meta, data, context) {
   if (member) {
     const nextStatus = data.isPartial ? "running" : "done";
     const nextIsError = !data.isPartial && data.isError;
-    const changed = member.status !== nextStatus || member.isError !== nextIsError || member.errorText !== (nextIsError ? data.errorText : void 0) || member.outputEntries !== data.entries;
+    const changed = member.status !== nextStatus || member.isError !== nextIsError || member.errorText !== (nextIsError ? data.errorText : void 0) || data.entries !== void 0 && member.outputEntries !== data.entries;
     member.status = nextStatus;
     member.isError = nextIsError;
     if (member.isError && data.errorText !== void 0) member.errorText = data.errorText;
@@ -1629,6 +2157,12 @@ function registerBatchResult(meta, data, context) {
   }
   return { batch, isLeader: batch.leaderId === context.toolCallId };
 }
+function hasFinalBatchOutput(toolCallId) {
+  const batch = batchByCallId.get(toolCallId);
+  if (!batch) return false;
+  const member = batch.members.find((entry) => entry.toolCallId === toolCallId);
+  return member !== void 0 && member.outputEntries !== void 0 && member.status === "done" && !member.isError;
+}
 function batchStatus(batch) {
   let done = 0;
   let failed = 0;
@@ -1988,6 +2522,9 @@ function invalidateTurnMembers(turn) {
     }
   }
 }
+function releaseTurnInvalidators(turn) {
+  for (const member of turn.members) invalidateByCallId.delete(member.toolCallId);
+}
 function noteTurnMemberElapsed(toolCallId, elapsedMs) {
   if (elapsedMs === void 0) return;
   const entry = memberByCallId.get(toolCallId);
@@ -2879,7 +3416,9 @@ import { getLanguageFromPath } from "@earendil-works/pi-coding-agent";
 import { highlightCode } from "@earendil-works/pi-coding-agent";
 var ESC2 = "\x1B";
 var BG_ANSI_PATTERN = new RegExp(`${ESC2}\\[(?:4\\d|10\\d|48;5;\\d{1,3}|48;2;\\d{1,3};\\d{1,3};\\d{1,3}|49)m`, "g");
+var ANSI_SGR_PATTERN = new RegExp(`${ESC2}\\[([0-9;]*)m`, "g");
 var CONTROL_CHARS = "\0-\b\v\f-\x7F";
+var CONTROL_CHARS_PATTERN = new RegExp(`[${CONTROL_CHARS}]`, "g");
 var ADD_ROW_BACKGROUND_MIX_RATIO = 0.24;
 var REMOVE_ROW_BACKGROUND_MIX_RATIO = 0.12;
 var ADD_INLINE_EMPHASIS_MIX_RATIO = 0.44;
@@ -2971,7 +3510,7 @@ function resolveDiffPalette(theme) {
 }
 function keepBackgroundAcrossResets(text, rowBgAnsi) {
   if (!text) return text;
-  return text.replace(new RegExp(`${ESC2}\\[([0-9;]*)m`, "g"), (sequence, rawCodes) => {
+  return text.replace(ANSI_SGR_PATTERN, (sequence, rawCodes) => {
     const split = String(rawCodes ?? "").split(";").filter(Boolean);
     const codes = split.length > 0 ? split : ["0"];
     const hasGlobalReset = codes.includes("0");
@@ -3013,7 +3552,7 @@ function applyBackgroundToVisibleRange(ansiText, start, end, backgroundAnsi, res
   return output;
 }
 function sanitizeSingleLineText(value) {
-  return value.replace(/\r/g, "").replace(/\n/g, "").replace(new RegExp(`[${CONTROL_CHARS}]`, "g"), "");
+  return value.replace(/\r/g, "").replace(/\n/g, "").replace(CONTROL_CHARS_PATTERN, "");
 }
 function stripInlineBreaksPreserveAnsi(value) {
   return value.replace(/\r/g, "").replace(/\n/g, "");
@@ -3610,6 +4149,101 @@ var AdaptiveDiffComponent = class {
   }
 };
 
+// extension-src/pi-style/features/tools/boxed/shared.ts
+function pendingFlag(context) {
+  return Boolean(context.isPartial);
+}
+function displayPath(rawPath, context) {
+  const path = String(rawPath ?? "");
+  if (!path) return "(unknown)";
+  return shortenPath(resolveRelativePath(path, context.cwd));
+}
+function pathRangeDetail(rawPath, offset, limit, context) {
+  const path = displayPath(rawPath, context);
+  let range = "";
+  if (offset !== void 0 || limit !== void 0) {
+    const start = offset ?? 1;
+    const end = limit !== void 0 ? Number(start) + Number(limit) - 1 : "";
+    range = `:${start}${end ? `-${end}` : ""}`;
+  }
+  return path ? `${path}${range}` : "(unknown)";
+}
+function compactCall(theme, toolName, detailLine, options) {
+  return renderCompactBoxedToolCall(theme, toolName, detailLine, {
+    widthKey: boxedToolWidthKey(toolName, options.detailKey),
+    state: options.context.state,
+    isError: Boolean(options.context.isError),
+    isPartial: Boolean(options.context.isPartial),
+    isPending: pendingFlag(options.context),
+    running: Boolean(options.context.executionStarted)
+  });
+}
+function noteExecutionStart(context) {
+  recordExecutionStarted(context.state, context.executionStarted);
+}
+function noteBoxedCallState(context) {
+  if (!context.executionStarted) return;
+  if (context.isPartial) startElapsedTicker(context.state, context.invalidate);
+  else {
+    recordExecutionEnded(context.state);
+    stopElapsedTicker(context.state);
+  }
+}
+function noteBoxedResultPhase(context, isPartial) {
+  const firstResultPass = !isResultSeen(context.state);
+  markResultSeen(context.state);
+  if (isPartial) startElapsedTicker(context.state, context.invalidate);
+  else {
+    recordExecutionEnded(context.state);
+    stopElapsedTicker(context.state);
+  }
+  return firstResultPass;
+}
+function stateElapsedMs(context) {
+  return getStateElapsedMs(context.state);
+}
+function compactFooterWithState(theme, result, context, options = {}) {
+  const elapsedMs = stateElapsedMs(context);
+  return renderCompactBoxedFooter(theme, result, {
+    state: context.state,
+    isError: Boolean(options.isError ?? context.isError),
+    isPartial: Boolean(options.isPartial ?? context.isPartial),
+    ...elapsedMs === void 0 ? {} : { elapsedMs }
+  });
+}
+function resultFooterLines(theme, result, context, extraParts = []) {
+  return [formatBoxedFooter(theme, result, extraParts, stateElapsedMs(context))];
+}
+var CACHE_KEY_LONG_PART_THRESHOLD = 64;
+function fnv1aHex(text) {
+  let hash = 2166136261;
+  for (let i = 0; i < text.length; i++) {
+    hash ^= text.charCodeAt(i);
+    hash = Math.imul(hash, 16777619) >>> 0;
+  }
+  return hash.toString(16).padStart(8, "0");
+}
+function boundedCacheKeyPart(part) {
+  if (typeof part !== "string" || part.length <= CACHE_KEY_LONG_PART_THRESHOLD) return part;
+  return `${part.length}:${fnv1aHex(part)}`;
+}
+function getRenderCacheKey(prefix, theme, ...parts) {
+  const pieces = [prefix, themeCacheKey(theme), getToolsRenderCacheSignature()];
+  for (const part of parts) pieces.push(boundedCacheKeyPart(part));
+  return pieces.join("|");
+}
+function memoizedStateComponent(state, slot, key, build) {
+  if (!state || typeof state !== "object") return build();
+  const cached = state[slot];
+  if (cached && cached.key === key) return cached.component;
+  const component = build();
+  state[slot] = { key, component };
+  return component;
+}
+function clearFooterState(context) {
+  clearCompactBoxedFooter(context.state);
+}
+
 // extension-src/pi-style/features/tools/boxed/git.ts
 var GIT_SHORT_STATUS_FLAGS = /* @__PURE__ */ new Set(["-s", "--short", "--porcelain"]);
 var GIT_DIFF_FORMAT_REJECT = /* @__PURE__ */ new Set([
@@ -4068,16 +4702,16 @@ function parseGitShowStat(text) {
     }
     break;
   }
-  const stat = parseGitDiffStat(lines.slice(i).join("\n"));
-  if (!stat) return null;
+  const stat3 = parseGitDiffStat(lines.slice(i).join("\n"));
+  if (!stat3) return null;
   return {
     kind: "show-stat",
     hash,
     subject,
-    files: stat.files,
-    ...stat.filesChanged !== void 0 ? { filesChanged: stat.filesChanged } : {},
-    ...stat.insertions !== void 0 ? { insertions: stat.insertions } : {},
-    ...stat.deletions !== void 0 ? { deletions: stat.deletions } : {}
+    files: stat3.files,
+    ...stat3.filesChanged !== void 0 ? { filesChanged: stat3.filesChanged } : {},
+    ...stat3.insertions !== void 0 ? { insertions: stat3.insertions } : {},
+    ...stat3.deletions !== void 0 ? { deletions: stat3.deletions } : {}
   };
 }
 var DIFF_GIT_HEADER = /^diff --git a\/(.*) b\/(.*)$/;
@@ -4404,17 +5038,17 @@ function parseGitPull(text) {
     return null;
   }
   if (!range || ffIndex < 0) return null;
-  const stat = parseGitDiffStat(lines.slice(ffIndex + 1).join("\n"));
-  if (!stat) return null;
+  const stat3 = parseGitDiffStat(lines.slice(ffIndex + 1).join("\n"));
+  if (!stat3) return null;
   return {
     kind: "action",
     command: "pull",
-    files: stat.files,
+    files: stat3.files,
     status: "Fast-forward",
     range,
-    ...stat.filesChanged !== void 0 ? { filesChanged: stat.filesChanged } : {},
-    ...stat.insertions !== void 0 ? { insertions: stat.insertions } : {},
-    ...stat.deletions !== void 0 ? { deletions: stat.deletions } : {}
+    ...stat3.filesChanged !== void 0 ? { filesChanged: stat3.filesChanged } : {},
+    ...stat3.insertions !== void 0 ? { insertions: stat3.insertions } : {},
+    ...stat3.deletions !== void 0 ? { deletions: stat3.deletions } : {}
   };
 }
 function parseGitFetch(text) {
@@ -4556,30 +5190,30 @@ function parseGitMerge(text) {
   }
   const marker2 = body[idx] ?? "";
   if (range && marker2 === "Fast-forward") {
-    const stat = parseGitDiffStatTolerant(body.slice(idx + 1).join("\n"));
-    if (!stat) return null;
+    const stat3 = parseGitDiffStatTolerant(body.slice(idx + 1).join("\n"));
+    if (!stat3) return null;
     return {
       kind: "action",
       command: "merge",
-      files: stat.files,
+      files: stat3.files,
       status: "Fast-forward",
       range,
-      ...stat.filesChanged !== void 0 ? { filesChanged: stat.filesChanged } : {},
-      ...stat.insertions !== void 0 ? { insertions: stat.insertions } : {},
-      ...stat.deletions !== void 0 ? { deletions: stat.deletions } : {}
+      ...stat3.filesChanged !== void 0 ? { filesChanged: stat3.filesChanged } : {},
+      ...stat3.insertions !== void 0 ? { insertions: stat3.insertions } : {},
+      ...stat3.deletions !== void 0 ? { deletions: stat3.deletions } : {}
     };
   }
   if (MERGE_MADE.exec(marker2)) {
-    const stat = parseGitDiffStatTolerant(body.slice(idx + 1).join("\n"));
-    if (!stat) return null;
+    const stat3 = parseGitDiffStatTolerant(body.slice(idx + 1).join("\n"));
+    if (!stat3) return null;
     return {
       kind: "action",
       command: "merge",
-      files: stat.files,
+      files: stat3.files,
       status: marker2,
-      ...stat.filesChanged !== void 0 ? { filesChanged: stat.filesChanged } : {},
-      ...stat.insertions !== void 0 ? { insertions: stat.insertions } : {},
-      ...stat.deletions !== void 0 ? { deletions: stat.deletions } : {}
+      ...stat3.filesChanged !== void 0 ? { filesChanged: stat3.filesChanged } : {},
+      ...stat3.insertions !== void 0 ? { insertions: stat3.insertions } : {},
+      ...stat3.deletions !== void 0 ? { deletions: stat3.deletions } : {}
     };
   }
   return null;
@@ -4916,6 +5550,34 @@ function binaryBodyLine(theme, status) {
 }
 function renderGitDiffResult(theme, parsed, options, context) {
   const expanded = Boolean(options.expanded);
+  let totalAdditions = 0;
+  let totalRemovals = 0;
+  const sigParts = [];
+  for (const file of parsed.files) {
+    totalAdditions += file.additions;
+    totalRemovals += file.removals;
+    sigParts.push(
+      `${file.path}:${file.body.length}:${file.additions}:${file.removals}:${file.binary ? 1 : 0}:${file.status ?? ""}`
+    );
+  }
+  const sig = sigParts.join(";").slice(0, 2048);
+  return memoizedStateComponent(
+    context.state,
+    "__piStyleGitDiffResult",
+    getRenderCacheKey(
+      "git-diff-result",
+      theme,
+      String(parsed.show),
+      String(expanded),
+      parsed.files.length,
+      totalAdditions,
+      totalRemovals,
+      sig
+    ),
+    () => buildGitDiffResultComponent(theme, parsed, expanded, context)
+  );
+}
+function buildGitDiffResultComponent(theme, parsed, expanded, context) {
   const elapsedMs = getStateElapsedMs(context.state);
   const fileCount = parsed.files.length;
   const footerParts = [];
@@ -4963,108 +5625,28 @@ function renderGitDiffResult(theme, parsed, options, context) {
       });
     }
   }
-  let cacheWidth;
-  let cacheLines;
-  return {
-    invalidate() {
-      cacheWidth = void 0;
-      cacheLines = void 0;
-      for (const box of fileBoxes) box.resultComponent.invalidate();
-    },
-    render(width) {
-      if (cacheWidth === width && cacheLines) return cacheLines;
-      const renderedWidth = boxWidth(width);
-      const lines = [];
-      for (const box of fileBoxes) {
-        lines.push(boxLabeledBorder(theme, "\u256D", "\u256E", box.topLabel, void 0, renderedWidth));
-        lines.push(boxBlankLine(theme, renderedWidth));
-        lines.push(...box.resultComponent.render(width));
-      }
-      cacheWidth = width;
-      cacheLines = lines;
-      return lines;
-    }
-  };
-}
-
-// extension-src/pi-style/features/tools/boxed/shared.ts
-function pendingFlag(context) {
-  return Boolean(context.isPartial);
-}
-function displayPath(rawPath, context) {
-  const path = String(rawPath ?? "");
-  if (!path) return "(unknown)";
-  return shortenPath(resolveRelativePath(path, context.cwd));
-}
-function pathRangeDetail(rawPath, offset, limit, context) {
-  const path = displayPath(rawPath, context);
-  let range = "";
-  if (offset !== void 0 || limit !== void 0) {
-    const start = offset ?? 1;
-    const end = limit !== void 0 ? Number(start) + Number(limit) - 1 : "";
-    range = `:${start}${end ? `-${end}` : ""}`;
-  }
-  return path ? `${path}${range}` : "(unknown)";
-}
-function compactCall(theme, toolName, detailLine, options) {
-  return renderCompactBoxedToolCall(theme, toolName, detailLine, {
-    widthKey: boxedToolWidthKey(toolName, options.detailKey),
-    state: options.context.state,
-    isError: Boolean(options.context.isError),
-    isPartial: Boolean(options.context.isPartial),
-    isPending: pendingFlag(options.context),
-    running: Boolean(options.context.executionStarted)
-  });
-}
-function noteExecutionStart(context) {
-  recordExecutionStarted(context.state, context.executionStarted);
-}
-function noteBoxedCallState(context) {
-  if (!context.executionStarted) return;
-  if (context.isPartial) startElapsedTicker(context.state, context.invalidate);
-  else {
-    recordExecutionEnded(context.state);
-    stopElapsedTicker(context.state);
-  }
-}
-function noteBoxedResultPhase(context, isPartial) {
-  const firstResultPass = !isResultSeen(context.state);
-  markResultSeen(context.state);
-  if (isPartial) startElapsedTicker(context.state, context.invalidate);
-  else {
-    recordExecutionEnded(context.state);
-    stopElapsedTicker(context.state);
-  }
-  return firstResultPass;
-}
-function stateElapsedMs(context) {
-  return getStateElapsedMs(context.state);
-}
-function compactFooterWithState(theme, result, context, options = {}) {
-  const elapsedMs = stateElapsedMs(context);
-  return renderCompactBoxedFooter(theme, result, {
-    state: context.state,
-    isError: Boolean(options.isError ?? context.isError),
-    isPartial: Boolean(options.isPartial ?? context.isPartial),
-    ...elapsedMs === void 0 ? {} : { elapsedMs }
-  });
-}
-function resultFooterLines(theme, result, context, extraParts = []) {
-  return [formatBoxedFooter(theme, result, extraParts, stateElapsedMs(context))];
-}
-function getRenderCacheKey(prefix, theme, ...parts) {
-  return [prefix, themeCacheKey(theme), getToolsRenderCacheSignature(), ...parts].join("|");
-}
-function memoizedStateComponent(state, slot, key, build) {
-  if (!state || typeof state !== "object") return build();
-  const cached = state[slot];
-  if (cached && cached.key === key) return cached.component;
-  const component = build();
-  state[slot] = { key, component };
-  return component;
-}
-function clearFooterState(context) {
-  clearCompactBoxedFooter(context.state);
+  let cacheWidth;
+  let cacheLines;
+  return {
+    invalidate() {
+      cacheWidth = void 0;
+      cacheLines = void 0;
+      for (const box of fileBoxes) box.resultComponent.invalidate();
+    },
+    render(width) {
+      if (cacheWidth === width && cacheLines) return cacheLines;
+      const renderedWidth = boxWidth(width);
+      const lines = [];
+      for (const box of fileBoxes) {
+        lines.push(boxLabeledBorder(theme, "\u256D", "\u256E", box.topLabel, void 0, renderedWidth));
+        lines.push(boxBlankLine(theme, renderedWidth));
+        lines.push(...box.resultComponent.render(width));
+      }
+      cacheWidth = width;
+      cacheLines = lines;
+      return lines;
+    }
+  };
 }
 
 // extension-src/pi-style/features/tools/boxed/bash.ts
@@ -5167,6 +5749,25 @@ function countNewlines(text, from, to) {
   }
   return count;
 }
+function findBackwardLineStart(text, need, end = text.length) {
+  let found = 0;
+  for (let i = end - 1; i >= 0; i--) {
+    if (text.charCodeAt(i) === 10 && ++found >= need) return i + 1;
+  }
+  return 0;
+}
+function isOutputWhitespaceCode(code) {
+  if (code === 32 || code >= 9 && code <= 13) return true;
+  if (code === 133 || code === 160 || code === 5760) return true;
+  if (code >= 8192 && code <= 8202) return true;
+  return code === 8232 || code === 8233 || code === 8239 || code === 8287 || code === 12288 || code === 65279;
+}
+function lastVisibleEnd(text) {
+  for (let i = text.length - 1; i >= 0; i--) {
+    if (!isOutputWhitespaceCode(text.charCodeAt(i))) return i + 1;
+  }
+  return 0;
+}
 function stripBashToolNoticeLines(text) {
   const filteredLines = text.replace(/\r/g, "").split("\n").filter((line) => !BASH_TOOL_NOTICE_PATTERN.test(line.trim()));
   return filteredLines.join("\n").replace(/\n{3,}/g, "\n\n").trimEnd();
@@ -5297,8 +5898,10 @@ function bashBodyComponent(preview, emptyLines) {
   };
 }
 function renderBashStreamingResult(theme, raw, options, context) {
-  const body = stripBashToolNoticeLines(stripAnsi(raw));
-  const hasOutput = body.trim().length > 0;
+  const contentEnd = lastVisibleEnd(raw);
+  const hasOutput = contentEnd > 0;
+  const tailStart = hasOutput ? findBackwardLineStart(raw, getToolsRenderConfig().maxCollapsedLines + 10, contentEnd) : 0;
+  const body = stripBashToolNoticeLines(stripAnsi(raw.slice(tailStart, contentEnd)));
   const elapsed = getStateElapsedMs(context.state);
   const emptyLines = [theme.fg("dim", "No output received yet")];
   if (!hasOutput && isInteractiveCommand(context?.args?.command) && (elapsed ?? 0) >= 1e3) {
@@ -5329,17 +5932,7 @@ function renderBashFinalResult(theme, raw, options, context) {
   const referenceLines = rawCommand.split("\n").map((line, index) => `${index === 0 ? "$ " : "> "}${line}`);
   if (!options.expanded) {
     const scanLines = getToolsRenderConfig().maxCollapsedLines + 10;
-    let nlCount = 0;
-    let tailStart = 0;
-    for (let i = statusStripped.length - 1; i >= 0; i--) {
-      if (statusStripped.charCodeAt(i) === 10) {
-        nlCount++;
-        if (nlCount >= scanLines) {
-          tailStart = i + 1;
-          break;
-        }
-      }
-    }
+    const tailStart = findBackwardLineStart(statusStripped, scanLines);
     const tail = stripBashToolNoticeLines(stripAnsi(statusStripped.slice(tailStart)));
     const totalLinesBefore = tailStart > 0 ? countNewlines(statusStripped, 0, tailStart) : 0;
     const preview2 = createBashResultPreview(theme, tail, options, outputColor);
@@ -5397,17 +5990,7 @@ function createBashResultPreview(theme, text, options, color) {
       if (cacheLines && cacheKey2 === cacheId) return cacheLines;
       if (!expanded) {
         const needed = cfg.maxCollapsedLines;
-        let totalNewlines = 0;
-        let scanFrom = 0;
-        for (let i = text.length - 1; i >= 0; i--) {
-          if (text.charCodeAt(i) === 10) {
-            totalNewlines++;
-            if (totalNewlines === needed) {
-              scanFrom = i + 1;
-              break;
-            }
-          }
-        }
+        const scanFrom = findBackwardLineStart(text, needed);
         if (text.length === 0) {
           cacheKey2 = cacheId;
           cacheLines = [];
@@ -5430,26 +6013,26 @@ function createBashResultPreview(theme, text, options, color) {
         return cacheLines;
       }
       const normalized = replaceTabs(text);
-      const logicalLines = normalized.split("\n").map((l) => clampLineLength(l));
-      const hasOutput = !(logicalLines.length === 1 && logicalLines[0] === "");
+      const rawLines = normalized.split("\n");
+      const totalLines = rawLines.length;
+      const hasOutput = !(totalLines === 1 && rawLines[0] === "");
       if (!hasOutput) {
         cacheKey2 = cacheId;
         cacheLines = [];
         return cacheLines;
       }
-      const truncatedLines = logicalLines.map((line) => safeTruncateToWidth(line, bodyWidth, "\u2026"));
-      const expandedLines = truncatedLines.length === 1 && truncatedLines[0] === "" ? [] : truncatedLines;
       const applyColor = (l) => color === "error" ? formatToolOutputLine(theme, l, "error") : cfg.dimOutput ? formatToolOutputLine(theme, l) : formatToolOutputLine(theme, l, "text");
-      if (cfg.maxExpandedLines > 0 && expandedLines.length > cfg.maxExpandedLines) {
-        const truncated = expandedLines.slice(-cfg.maxExpandedLines).map(applyColor);
-        const remaining = expandedLines.length - cfg.maxExpandedLines;
+      const renderRawLine = (line) => safeTruncateToWidth(clampLineLength(line), bodyWidth, "\u2026");
+      if (cfg.maxExpandedLines > 0 && totalLines > cfg.maxExpandedLines) {
+        const truncated = rawLines.slice(-cfg.maxExpandedLines).map((line) => applyColor(renderRawLine(line)));
+        const remaining = totalLines - cfg.maxExpandedLines;
         truncated.unshift(theme.fg("dim", `\u2026 ${remaining} earlier lines`));
         cacheKey2 = cacheId;
         cacheLines = truncated;
         return cacheLines;
       }
       cacheKey2 = cacheId;
-      cacheLines = expandedLines.map(applyColor);
+      cacheLines = rawLines.map((line) => applyColor(renderRawLine(line)));
       return cacheLines;
     }
   };
@@ -5616,6 +6199,7 @@ function isGitDiffClass(cls) {
 function isGitActionClass(cls) {
   return !isBashTreeClass(cls) && cls.kind === "action";
 }
+var PARTIAL_REPARSE_THRESHOLD = 4096;
 function parseSemanticOutput(cls, output) {
   if (isBashTreeClass(cls)) return parseBashTreeOutput(cls, output);
   if (isGhClass(cls)) return parseGhOutput(cls, output);
@@ -5708,6 +6292,7 @@ var bashTool = {
           existing.finished = false;
           existing.revision++;
           delete existing.renderCache;
+          delete existing.lastParsedLength;
         }
         existing.command = command;
         existing.cls = cls;
@@ -5736,21 +6321,24 @@ var bashTool = {
       }
       if (!options.isPartial || isBashTreeClass(cls)) {
         const output = stripBashToolNoticeLines(stripAnsi(getTextOutput(result)));
-        const parsed = parseSemanticOutput(cls, output);
         const state = semanticStates.get(context.toolCallId);
+        const shouldParse = !options.isPartial || state === void 0 || state.lastParsedLength === void 0 || output.length - state.lastParsedLength >= PARTIAL_REPARSE_THRESHOLD;
+        const parsed = shouldParse ? parseSemanticOutput(cls, output) : void 0;
         if (parsed) {
           if (state) {
             state.parsed = parsed;
             state.finished = !options.isPartial;
             state.revision++;
             delete state.renderCache;
+            if (options.isPartial) state.lastParsedLength = output.length;
           } else
             semanticStates.set(context.toolCallId, {
               cls,
               command: String(context?.args?.command ?? ""),
               parsed,
               finished: !options.isPartial,
-              revision: 0
+              revision: 0,
+              ...options.isPartial ? { lastParsedLength: output.length } : {}
             });
           if (isGitDiffClass(cls)) {
             return renderGitDiffResult(theme, parsed, options, context);
@@ -5760,11 +6348,17 @@ var bashTool = {
           }
           return EMPTY_BASH_TREE_RESULT;
         }
-        if (state) {
-          state.fallback = true;
-          state.finished = !options.isPartial;
-          state.revision++;
-          delete state.renderCache;
+        if (!shouldParse) {
+          if (state?.parsed !== void 0) return EMPTY_BASH_TREE_RESULT;
+        }
+        if (shouldParse) {
+          if (state) {
+            state.fallback = true;
+            state.finished = !options.isPartial;
+            state.revision++;
+            delete state.renderCache;
+            if (options.isPartial) state.lastParsedLength = output.length;
+          }
         }
       }
     } else if (options.isPartial) {
@@ -5863,14 +6457,8 @@ var editTool = {
     const message = firstText(result.content);
     const argPath = String(context?.args?.path ?? context?.args?.file_path ?? "");
     const sourcePath = details?.path ?? (argPath || extractEditedPath(message));
-    const language = sourcePath ? getLanguageFromPath2(sourcePath) : void 0;
-    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 stats = countDiffStats(diff);
-    const maxRows = expanded ? 160 : 36;
-    const diffView = new AdaptiveDiffComponent(theme, rows, maxRows, shouldHighlight ? language : void 0);
-    const expandHint2 = !expanded && diffView.hasCollapsed() ? "Ctrl+O more" : void 0;
     return memoizedStateComponent(
       context.state,
       "__piStyleEditDiffResult",
@@ -5882,22 +6470,30 @@ var editTool = {
         sourcePath ?? "",
         editDiffFooter(theme, result, context, stats)
       ),
-      () => renderBoxedToolResult(
-        theme,
-        {
-          render(width) {
-            return diffView.render(width);
+      () => {
+        const language = sourcePath ? getLanguageFromPath2(sourcePath) : void 0;
+        const rows = buildSplitRows(diff);
+        const shouldHighlight = Boolean(language) && diff.length <= MAX_HIGHLIGHT_DIFF_CHARS && rows.length <= MAX_HIGHLIGHT_DIFF_ROWS;
+        const maxRows = expanded ? 160 : 36;
+        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) {
+              return diffView.render(width);
+            },
+            invalidate() {
+              diffView.invalidate();
+            }
           },
-          invalidate() {
-            diffView.invalidate();
+          {
+            dividerLabel: diffDividerLabel2(theme, stats),
+            ...expandHint2 ? { dividerRightLabel: expandHint2 } : {},
+            footerLines: [editDiffFooter(theme, result, context, stats)]
           }
-        },
-        {
-          dividerLabel: diffDividerLabel2(theme, stats),
-          ...expandHint2 ? { dividerRightLabel: expandHint2 } : {},
-          footerLines: [editDiffFooter(theme, result, context, stats)]
-        }
-      )
+        );
+      }
     );
   }
 };
@@ -6002,14 +6598,16 @@ var findTool = {
     return renderBatchAwareCall(theme, batch);
   },
   result(result, options, _theme, context) {
-    const output = stripAnsi(getTextOutput(result)).trimEnd();
-    const entries = context.isError ? void 0 : parseFindOutput(output);
+    const isError = Boolean(context.isError);
+    const settled = !options.isPartial && !isError && hasFinalBatchOutput(context.toolCallId);
+    const output = settled ? "" : stripAnsi(getTextOutput(result)).trimEnd();
+    const entries = settled || isError ? void 0 : parseFindOutput(output);
     registerBatchResult(
       FIND_META,
       {
         isPartial: Boolean(options.isPartial),
-        isError: Boolean(context.isError),
-        errorText: context.isError ? output || void 0 : void 0,
+        isError,
+        errorText: isError ? output || void 0 : void 0,
         ...entries !== void 0 ? { entries } : {}
       },
       context
@@ -6120,14 +6718,19 @@ var grepTool = {
     return renderGrepPanel(theme, context.toolCallId);
   },
   result(result, options, _theme, context) {
-    const output = stripAnsi(getTextOutput(result)).trimEnd();
     const isError = Boolean(context.isError);
+    const isPartial = Boolean(options.isPartial);
+    const state = grepPanels.get(context.toolCallId);
+    if (!isPartial && !isError && state !== void 0 && state.matches !== void 0 && !state.isPartial) {
+      return EMPTY_GREP_RESULT;
+    }
+    const output = stripAnsi(getTextOutput(result)).trimEnd();
     const matches = isError ? [] : parseGrepOutput(output);
     registerGrepResult(context.toolCallId, {
       matches,
       isError,
       errorText: isError ? output || void 0 : void 0,
-      isPartial: Boolean(options.isPartial)
+      isPartial
     });
     return EMPTY_GREP_RESULT;
   }
@@ -6154,14 +6757,16 @@ var lsTool = {
     return renderBatchAwareCall(theme, batch);
   },
   result(result, options, _theme, context) {
-    const output = stripAnsi(getTextOutput(result)).trimEnd();
-    const entries = context.isError ? void 0 : parseLsOutput(output);
+    const isError = Boolean(context.isError);
+    const settled = !options.isPartial && !isError && hasFinalBatchOutput(context.toolCallId);
+    const output = settled ? "" : stripAnsi(getTextOutput(result)).trimEnd();
+    const entries = settled || isError ? void 0 : parseLsOutput(output);
     registerBatchResult(
       LIST_META,
       {
         isPartial: Boolean(options.isPartial),
-        isError: Boolean(context.isError),
-        errorText: context.isError ? output || void 0 : void 0,
+        isError,
+        errorText: isError ? output || void 0 : void 0,
         ...entries !== void 0 ? { entries } : {}
       },
       context
@@ -6285,15 +6890,9 @@ function renderQuickEditResult(_toolName, result, options, theme, context, confi
       footerLines: [quickEditFooter(theme, context)]
     });
   }
-  const rows = buildSplitRows(diff);
   const expanded = options.expanded;
   const argPath = String(context?.args?.path ?? "");
-  const language = argPath ? getLanguageFromPath3(argPath) : void 0;
-  const shouldHighlight = Boolean(language) && diff.length <= MAX_HIGHLIGHT_DIFF_CHARS2 && rows.length <= MAX_HIGHLIGHT_DIFF_ROWS2;
   const stats = countDiffStats(diff);
-  const maxRows = expanded ? 160 : 36;
-  const diffView = new AdaptiveDiffComponent(theme, rows, maxRows, shouldHighlight ? language : void 0);
-  const expandHint2 = !expanded && diffView.hasCollapsed() ? "Ctrl+O more" : void 0;
   return memoizedStateComponent(
     context.state,
     "__piStyleQuickEditDiffResult",
@@ -6306,22 +6905,30 @@ function renderQuickEditResult(_toolName, result, options, theme, context, confi
       argPath,
       quickEditDiffFooter(theme, result, context, stats)
     ),
-    () => renderBoxedToolResult(
-      theme,
-      {
-        render(width) {
-          return diffView.render(width);
+    () => {
+      const rows = buildSplitRows(diff);
+      const language = argPath ? getLanguageFromPath3(argPath) : void 0;
+      const shouldHighlight = Boolean(language) && diff.length <= MAX_HIGHLIGHT_DIFF_CHARS2 && rows.length <= MAX_HIGHLIGHT_DIFF_ROWS2;
+      const maxRows = expanded ? 160 : 36;
+      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) {
+            return diffView.render(width);
+          },
+          invalidate() {
+            diffView.invalidate();
+          }
         },
-        invalidate() {
-          diffView.invalidate();
+        {
+          dividerLabel: quickEditDividerLabel(theme, stats),
+          ...expandHint2 ? { dividerRightLabel: expandHint2 } : {},
+          footerLines: [quickEditDiffFooter(theme, result, context, stats)]
         }
-      },
-      {
-        dividerLabel: quickEditDividerLabel(theme, stats),
-        ...expandHint2 ? { dividerRightLabel: expandHint2 } : {},
-        footerLines: [quickEditDiffFooter(theme, result, context, stats)]
-      }
-    )
+      );
+    }
   );
 }
 function quickEditFooter(theme, context) {
@@ -6367,13 +6974,13 @@ var readTool = {
     return renderBatchAwareCall(theme, batch);
   },
   result(result, options, _theme, context) {
-    const output = stripAnsi(getTextOutput(result)).trimEnd();
+    const errorText = context.isError ? stripAnsi(getTextOutput(result)).trimEnd() || void 0 : void 0;
     registerBatchResult(
       READ_META,
       {
         isPartial: Boolean(options.isPartial),
         isError: Boolean(context.isError),
-        errorText: context.isError ? output || void 0 : void 0
+        errorText
       },
       context
     );
@@ -6978,7 +7585,7 @@ var DEFAULT_CONFIG = Object.freeze({
   startup: Object.freeze({ mode: "compact", showResources: false, alwaysExpanded: false }),
   statusLine: Object.freeze({
     enabled: true,
-    separator: "powerline-thin",
+    separator: "|",
     layout: Object.freeze({
       left: ["path", "git", "context_bar", "cost"],
       right: ["model_effort"],
@@ -6995,7 +7602,10 @@ var DEFAULT_CONFIG = Object.freeze({
     assistantPrefix: true,
     specialBlocks: true,
     hideThinkingLabel: true,
-    hideInterimText: true
+    hideInterimText: true,
+    showImagePreviews: true,
+    clipboardImages: true,
+    previewMaxWidth: 30
   }),
   tools: Object.freeze({
     enabled: true,
@@ -7112,7 +7722,10 @@ function normalizeConfig(input, defaults = DEFAULT_CONFIG) {
       assistantPrefix: bool(messages.assistantPrefix, defaults.messages.assistantPrefix),
       specialBlocks: bool(messages.specialBlocks, defaults.messages.specialBlocks),
       hideThinkingLabel: bool(messages.hideThinkingLabel, defaults.messages.hideThinkingLabel),
-      hideInterimText: bool(messages.hideInterimText, defaults.messages.hideInterimText)
+      hideInterimText: bool(messages.hideInterimText, defaults.messages.hideInterimText),
+      showImagePreviews: bool(messages.showImagePreviews, defaults.messages.showImagePreviews),
+      clipboardImages: bool(messages.clipboardImages, defaults.messages.clipboardImages),
+      previewMaxWidth: boundedInt(messages.previewMaxWidth, defaults.messages.previewMaxWidth, 8, 60)
     }),
     tools: Object.freeze({
       enabled: bool(tools.enabled, defaults.tools.enabled),
@@ -7166,6 +7779,8 @@ var BOOL_PATHS = /* @__PURE__ */ new Set([
   "messages.specialBlocks",
   "messages.hideThinkingLabel",
   "messages.hideInterimText",
+  "messages.showImagePreviews",
+  "messages.clipboardImages",
   "tools.enabled",
   "tools.showElapsed",
   "tools.dimOutput",
@@ -7211,6 +7826,8 @@ function validLeaf(path, value) {
     return typeof value === "string";
   if (path === "tools.maxCollapsedLines" || path === "tools.maxExpandedLines")
     return typeof value === "number" && Number.isFinite(value) && value >= 0;
+  if (path === "messages.previewMaxWidth")
+    return typeof value === "number" && Number.isFinite(value) && value >= 8 && value <= 60;
   if (path === "statusLine.bottomMargin" || path === "statusLine.contextBarWidth")
     return typeof value === "number" && Number.isFinite(value) && value >= 0;
   if (STRING_ARRAY_PATHS.has(path)) return Array.isArray(value) && value.every((item) => typeof item === "string");
@@ -7634,6 +8251,9 @@ var allowedPaths = /* @__PURE__ */ new Set([
   "messages.specialBlocks",
   "messages.hideThinkingLabel",
   "messages.hideInterimText",
+  "messages.showImagePreviews",
+  "messages.clipboardImages",
+  "messages.previewMaxWidth",
   "tools.enabled",
   "tools.style",
   "tools.maxCollapsedLines",
@@ -7666,6 +8286,9 @@ function validatePathValue(path, value) {
     "messages.specialBlocks",
     "messages.hideThinkingLabel",
     "messages.hideInterimText",
+    "messages.showImagePreviews",
+    "messages.clipboardImages",
+    "messages.previewMaxWidth",
     "tools.enabled",
     "tools.showElapsed",
     "tools.dimOutput",
@@ -7688,6 +8311,8 @@ function validatePathValue(path, value) {
     return typeof value === "string";
   if (path === "tools.maxCollapsedLines" || path === "tools.maxExpandedLines")
     return typeof value === "number" && Number.isFinite(value) && value >= 0;
+  if (path === "messages.previewMaxWidth")
+    return typeof value === "number" && Number.isFinite(value) && value >= 8 && value <= 60;
   if (path === "statusLine.bottomMargin" || path === "statusLine.contextBarWidth")
     return typeof value === "number" && Number.isFinite(value) && value >= 0;
   if (path.endsWith(".colors") || path.endsWith(".glyphs"))
@@ -7820,8 +8445,8 @@ function runCommand(args, host, app, storage) {
 }
 
 // extension-src/pi-style/pi/config-host.ts
-import { mkdir, readFile, rename, unlink, writeFile } from "fs/promises";
-import { dirname as dirname2, join as join2 } from "path";
+import { mkdir, readFile as readFile3, rename, unlink, writeFile } from "fs/promises";
+import { dirname as dirname3, join as join2 } from "path";
 import { CONFIG_DIR_NAME, getAgentDir } from "@earendil-works/pi-coding-agent";
 var locks = /* @__PURE__ */ new Map();
 function serialize(path, operation) {
@@ -7834,14 +8459,14 @@ function serialize(path, operation) {
 }
 function createPiConfigFilePort(fs = {}) {
   const fsMkdir = fs.mkdir ?? mkdir;
-  const fsReadFile = fs.readFile ?? readFile;
+  const fsReadFile = fs.readFile ?? readFile3;
   const fsRename = fs.rename ?? rename;
   const fsUnlink = fs.unlink ?? unlink;
   const fsWriteFile = fs.writeFile ?? writeFile;
   return {
     read: (path) => fsReadFile(path, "utf8"),
     writeAtomic: async (path, content) => serialize(path, async () => {
-      await fsMkdir(dirname2(path), { recursive: true });
+      await fsMkdir(dirname3(path), { recursive: true });
       const temporary = `${path}.pi-style-${process.pid}-${Date.now()}.tmp`;
       try {
         await fsWriteFile(temporary, content, { mode: 384 });
@@ -8030,12 +8655,17 @@ function createBuiltinSegments() {
       const percent = contextPercent(snapshot.context ?? {});
       if (percent === void 0) return { visible: false, content: "" };
       const token = contextBarToken(percent);
-      const window = snapshot.context?.windowTokens;
-      const label = `ctx${window !== void 0 ? ` (${formatTokens(window)})` : ""}:`;
       const width = options.context_bar?.width ?? CONTEXT_BAR_WIDTH;
+      const pipe = theme.apply("separator", "|");
+      const bar = `${theme.apply("muted", "[")}${theme.apply(token, contextBar(percent, width))}${theme.apply("muted", "]")}`;
+      const parts = [bar, `${theme.apply(token, `${Math.round(percent)}%`)}${theme.apply("muted", " used")}`];
+      const current = snapshot.context?.currentTokens;
+      const window = snapshot.context?.windowTokens;
+      if (current !== void 0 && window !== void 0)
+        parts.push(theme.apply("muted", `${formatTokens(current)}/${formatTokens(window)}`));
       return {
         visible: true,
-        content: `${theme.apply("muted", label)} ${theme.apply(token, contextBar(percent, width))} ${theme.apply(token, `${Math.round(percent)}%`)}`,
+        content: parts.join(` ${pipe} `),
         compactContent: theme.apply(token, `${Math.round(percent)}%`)
       };
     }),
@@ -8077,11 +8707,10 @@ function createBuiltinSegments() {
       content: snapshot.sessionStartedAt === void 0 ? "" : theme.apply("time", formatElapsed2(Date.now() - snapshot.sessionStartedAt)),
       compactContent: snapshot.sessionStartedAt === void 0 ? "" : theme.apply("time", formatElapsed2(Date.now() - snapshot.sessionStartedAt))
     })),
-    segment("time", 20, ({ theme }) => ({
-      visible: true,
-      content: theme.apply("time", (/* @__PURE__ */ new Date()).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" })),
-      compactContent: theme.apply("time", (/* @__PURE__ */ new Date()).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }))
-    })),
+    segment("time", 20, ({ theme }) => {
+      const text = theme.apply("time", clockTime());
+      return { visible: true, content: text, compactContent: text };
+    }),
     segment("hostname", 20, ({ snapshot, theme }) => ({
       visible: Boolean(snapshot.hostname),
       content: theme.apply("muted", snapshot.hostname ?? "")
@@ -8099,6 +8728,15 @@ function createBuiltinSegments() {
   ];
   return new Map(segments.map((item) => [item.id, item]));
 }
+var clockCache;
+function clockTime() {
+  const now = /* @__PURE__ */ new Date();
+  const minuteKey = now.getHours() * 60 + now.getMinutes();
+  if (clockCache?.minuteKey !== minuteKey) {
+    clockCache = { minuteKey, value: now.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }) };
+  }
+  return clockCache.value;
+}
 var CONTEXT_BAR_WIDTH = 10;
 function contextBar(percent, width = CONTEXT_BAR_WIDTH) {
   const filled = Math.max(0, Math.min(width, Math.round(percent / 100 * width)));
@@ -8110,10 +8748,7 @@ function contextBarToken(percent) {
   return "success";
 }
 function formatTokens(value) {
-  if (value >= 1e6) {
-    const millions = value / 1e6;
-    return `${Number.isInteger(millions) ? millions : millions.toFixed(1)}M`;
-  }
+  if (value >= 1e6) return `${(value / 1e6).toFixed(1)}M`;
   if (value >= 1e3) {
     const thousands = value / 1e3;
     return `${Number.isInteger(thousands) ? thousands : thousands.toFixed(1)}K`;
@@ -8284,7 +8919,24 @@ function colorPrefixFor(active, config, noColor, token) {
   }
   return "";
 }
+function envKeyFor(env) {
+  return `${env.PI_STYLE_NERD_FONTS ?? ""}\0${env.GHOSTTY_RESOURCES_DIR ? "1" : "0"}\0${env.TERM_PROGRAM ?? ""}`;
+}
+var glyphModeCache = /* @__PURE__ */ new WeakMap();
 function detectGlyphMode(config, env = {}) {
+  let byEnv = glyphModeCache.get(config);
+  if (!byEnv) {
+    byEnv = /* @__PURE__ */ new Map();
+    glyphModeCache.set(config, byEnv);
+  }
+  const envKey = envKeyFor(env);
+  const cached = byEnv.get(envKey);
+  if (cached !== void 0) return cached;
+  const mode = computeGlyphMode(config, env);
+  byEnv.set(envKey, mode);
+  return mode;
+}
+function computeGlyphMode(config, env) {
   if (env.PI_STYLE_NERD_FONTS === "1") return "nerd";
   if (env.PI_STYLE_NERD_FONTS === "0") return "unicode";
   if (config.theme.nerdFonts === "on") return "nerd";
@@ -8299,7 +8951,14 @@ function detectGlyphMode(config, env = {}) {
 function resolveTheme(active, config, env = {}) {
   const noColor = Object.hasOwn(env, "NO_COLOR") && env.NO_COLOR !== "" && config.theme.colors.colorOverride !== "on";
   const mode = config.preset === "ascii" ? "ascii" : detectGlyphMode(config, env);
-  const color = (token) => colorPrefixFor(active, config, noColor, token);
+  const prefixes = /* @__PURE__ */ new Map();
+  const color = (token) => {
+    const cached = prefixes.get(token);
+    if (cached !== void 0) return cached;
+    const prefix = colorPrefixFor(active, config, noColor, token);
+    prefixes.set(token, prefix);
+    return prefix;
+  };
   return {
     mode,
     noColor,
@@ -8317,9 +8976,13 @@ function resolveTheme(active, config, env = {}) {
 var widthOf = visibleWidth3;
 function widthSafe(value, width) {
   if (width <= 0) return "";
-  const fitted = widthOf(value) > width ? truncateAnsi(value, width, "") : value;
-  const current = widthOf(fitted);
-  return current < width ? fitted + " ".repeat(width - current) : fitted;
+  const measured = widthOf(value);
+  if (measured > width) {
+    const fitted = truncateAnsi(value, width, "");
+    const current = widthOf(fitted);
+    return current < width ? fitted + " ".repeat(width - current) : fitted;
+  }
+  return measured < width ? value + " ".repeat(width - measured) : value;
 }
 function isNativeBorderLine(line) {
   const stripped = stripAnsi(line);
@@ -8389,8 +9052,14 @@ var StyledEditor = class extends CustomEditor {
   fullTheme;
   onSnapshot;
   semantic;
+  /** Set when config changes; invalidate() then rebuilds the (otherwise stable) semantic theme. */
+  semanticDirty = false;
   disposed = false;
   renderPlanCache;
+  clipboardImagePaste;
+  /** Keybinding matcher (the factory's KeybindingsManager) for keystroke-level
+   *  interception: the paste keybinding and backspace checks below. */
+  editorKeybindings;
   constructor(tui, theme, keybindings, options) {
     super(tui, theme, keybindings);
     this.config = options.config;
@@ -8398,6 +9067,8 @@ var StyledEditor = class extends CustomEditor {
     this.piTheme = theme;
     this.fullTheme = options.fullTheme;
     this.onSnapshot = options.onSnapshot;
+    this.clipboardImagePaste = options.clipboardImagePaste;
+    this.editorKeybindings = keybindings;
     this.semantic = semanticTheme(theme, options.config);
     this.setPaddingX(0);
   }
@@ -8409,17 +9080,99 @@ var StyledEditor = class extends CustomEditor {
   configure(config) {
     if (this.disposed) return;
     this.config = config;
-    this.semantic = semanticTheme(this.piTheme, config);
+    this.semanticDirty = true;
     this.invalidate();
   }
   handleInput(data) {
     if (this.disposed) return;
+    if (this.handleClipboardImagePasteKeystroke(data)) return;
+    if (this.handleAtomicMarkerBackspace(data)) return;
     super.handleInput(data);
     this.onSnapshot({ ...this.snapshot });
   }
+  /**
+   * Instant marker (ADR 0009): when the built-in paste keybinding fires, the
+   * clipboard holds an image (sync native probe), and the surface is enabled,
+   * the keystroke is owned here — an `[Image #N] ` marker is inserted
+   * immediately (zero-latency feedback) and the bytes fill the registry
+   * entry asynchronously. Pi's own paste handler never runs for this
+   * keystroke, so no temp artifact is written. Text pastes (no image) and
+   * probe-unavailable hosts fall through to the native path untouched.
+   */
+  handleClipboardImagePasteKeystroke(data) {
+    const surface = this.clipboardImagePaste;
+    if (!surface?.enabled()) return false;
+    if (!this.editorKeybindings.matches(data, "app.clipboard.pasteImage")) return false;
+    if (surface.clipboardHasImage() !== true) return false;
+    super.insertTextAtCursor(surface.markerFromClipboard());
+    this.onSnapshot({ ...this.snapshot });
+    return true;
+  }
+  /**
+   * Atomic marker backspace (ADR 0009): backspacing directly after a
+   * registered `[Image #N] ` marker deletes the whole marker as one unit —
+   * the image is discarded (image-paste semantics). Direct state surgery
+   * (O(1)) mirroring pi-tui's handleBackspace mutation protocol: no setText
+   * round-trip (it clears the pastes registry, and undo snapshots store that
+   * Map by reference — silently breaking `[paste #N]` atomicity on undo) and
+   * no per-column left-arrow inputs (O(K·L) through the keybinding chain and
+   * visual line maps). No undo snapshot is pushed: the discarded image
+   * cannot be restored, so the deletion is intentionally non-undoable.
+   */
+  handleAtomicMarkerBackspace(data) {
+    const surface = this.clipboardImagePaste;
+    if (!surface?.enabled()) return false;
+    const isBackspace = this.editorKeybindings.matches(data, "tui.editor.deleteCharBackward") || data === "\x7F";
+    if (!isBackspace) return false;
+    const lines = this.getLines();
+    const cursor = this.getCursor();
+    const current = lines[cursor.line];
+    if (current === void 0) return false;
+    const before = current.slice(0, cursor.col);
+    const hit = clipboardMarkerAtEnd(before);
+    if (!hit || !surface.isMarkerIndexRegistered(hit.index)) return false;
+    const editor = this;
+    const targetCol = cursor.col - hit.length;
+    editor.exitHistoryBrowsing();
+    editor.lastAction = null;
+    editor.cancelAutocomplete();
+    editor.state.lines[cursor.line] = current.slice(0, targetCol) + current.slice(cursor.col);
+    editor.setCursorCol(targetCol);
+    editor.onChange?.(this.getText());
+    surface.discardMarkerIndex(hit.index);
+    this.invalidate();
+    this.onSnapshot({ ...this.snapshot });
+    return true;
+  }
+  /**
+   * Artifact-path fallback (ADR 0009): when the keystroke was not owned
+   * (probe unavailable, native editor path, config toggled) Pi's built-in
+   * paste still inserts a `<tmpdir>/pi-clipboard-<uuid>.<ext>` path through
+   * this method. Convert it to a marker when the artifact reads successfully;
+   * every failure inserts the original text verbatim (exact native behavior).
+   */
+  insertTextAtCursor(text) {
+    const surface = this.clipboardImagePaste;
+    if (!surface?.enabled() || !isSingleClipboardImagePath(text)) {
+      super.insertTextAtCursor(text);
+      return;
+    }
+    void (async () => {
+      let replacement = text;
+      try {
+        replacement = await surface.markerFromArtifact(text);
+      } catch {
+      }
+      super.insertTextAtCursor(replacement);
+      this.tui.requestRender();
+    })();
+  }
   invalidate() {
     super.invalidate();
-    this.semantic = semanticTheme(this.piTheme, this.config);
+    if (this.semanticDirty) {
+      this.semantic = semanticTheme(this.piTheme, this.config);
+      this.semanticDirty = false;
+    }
     this.renderPlanCache = void 0;
     this.tui.requestRender();
   }
@@ -8629,6 +9382,7 @@ function installEditor(options) {
       snapshot,
       theme,
       ...options.host.theme ? { fullTheme: options.host.theme } : {},
+      ...options.clipboardImagePaste ? { clipboardImagePaste: options.clipboardImagePaste } : {},
       onSnapshot: (next) => {
         if (!disposed && options.isCurrent?.() !== false) snapshot = next;
       }
@@ -9203,12 +9957,9 @@ function uniqueLayout(layout) {
 function renderGroup(items, separator, padding) {
   return items.map((item) => item.content).filter(Boolean).join(`${padding}${separator}${padding}`);
 }
-function widthOf2(items, separator, padding) {
-  return visibleWidth(renderGroup(items, separator, padding));
-}
 function renderStatus(layout, snapshot, width, options) {
   if (width <= 0) return { primary: "", lines: [], visibleSegments: [] };
-  const separator = options.separator ?? "\u2502";
+  const separator = options.separator ?? "|";
   const padding = options.padding ?? " ";
   const normalized = uniqueLayout(layout);
   const context = { snapshot, theme: options.theme, options: options.options ?? {}, width };
@@ -9220,7 +9971,15 @@ function renderStatus(layout, snapshot, width, options) {
     try {
       const result = segment2.render(context);
       if (!result.visible || !result.content) continue;
-      candidates.set(id, { id, segment: segment2, result, content: result.content, compact: false, moved: false });
+      candidates.set(id, {
+        id,
+        segment: segment2,
+        result,
+        content: result.content,
+        contentWidth: visibleWidth(result.content),
+        compact: false,
+        moved: false
+      });
     } catch {
     }
   }
@@ -9230,13 +9989,28 @@ function renderStatus(layout, snapshot, width, options) {
   const secondary = normalized.secondary.map((id) => candidates.get(id)).filter((candidate) => candidate !== void 0);
   const visible = [];
   const overflow = [];
+  const gapWidth = visibleWidth(`${padding}${separator}${padding}`);
+  let groupWidth = 0;
+  let groupCount = 0;
+  const widthAfter = (baseWidth, count, candidate) => count === 0 ? candidate.contentWidth : baseWidth + gapWidth + candidate.contentWidth;
   for (const candidate of primary) {
     visible.push(candidate);
-    if (widthOf2(visible, separator, padding) <= width) continue;
+    const pushedWidth = widthAfter(groupWidth, groupCount, candidate);
+    if (pushedWidth <= width) {
+      groupWidth = pushedWidth;
+      groupCount++;
+      continue;
+    }
     if (candidate.result.compactContent && !candidate.compact) {
       candidate.content = candidate.result.compactContent;
       candidate.compact = true;
-      if (widthOf2(visible, separator, padding) <= width) continue;
+      candidate.contentWidth = visibleWidth(candidate.content);
+      const compactedWidth = widthAfter(groupWidth, groupCount, candidate);
+      if (compactedWidth <= width) {
+        groupWidth = compactedWidth;
+        groupCount++;
+        continue;
+      }
     }
     visible.pop();
     if (candidate.segment.overflow !== "drop" && candidate.segment.overflow !== "primary") {
@@ -9262,9 +10036,14 @@ function renderStatus(layout, snapshot, width, options) {
   }
   if (visibleWidth(primaryText) > width) primaryText = truncateAnsi(primaryText, width);
   const secondaryVisible = [];
+  let secondaryWidth = 0;
+  let secondaryCount = 0;
   for (const candidate of [...secondary].sort((a, b) => b.segment.defaultPriority - a.segment.defaultPriority)) {
+    const pushedWidth = widthAfter(secondaryWidth, secondaryCount, candidate);
+    if (pushedWidth > width) continue;
     secondaryVisible.push(candidate);
-    if (widthOf2(secondaryVisible, separator, padding) > width) secondaryVisible.pop();
+    secondaryWidth = pushedWidth;
+    secondaryCount++;
   }
   const secondaryText = renderGroup(secondaryVisible, separator, padding);
   const lines = secondaryText ? [primaryText, secondaryText] : primaryText ? [primaryText] : [];
@@ -9317,6 +10096,28 @@ function separatorsFor(config, theme) {
   if (style === "none") return " ";
   return theme.apply("separator", style);
 }
+var themeAssetsCache = /* @__PURE__ */ new WeakMap();
+function themeAssetsFor(activeTheme, config) {
+  let byConfig = themeAssetsCache.get(activeTheme);
+  if (!byConfig) {
+    byConfig = /* @__PURE__ */ new WeakMap();
+    themeAssetsCache.set(activeTheme, byConfig);
+  }
+  let assets = byConfig.get(config);
+  if (!assets) {
+    const resolved = resolveTheme(
+      activeTheme.colors || activeTheme.fg ? {
+        ...activeTheme.colors ? { colors: activeTheme.colors } : {},
+        // Call through the theme instance so `this` binds correctly inside Pi's fg().
+        ...activeTheme.fg ? { fg: (color, text) => activeTheme.fg?.(color, text) ?? text } : {}
+      } : void 0,
+      config
+    );
+    assets = { resolved, separator: separatorsFor(config, resolved) };
+    byConfig.set(config, assets);
+  }
+  return assets;
+}
 function installStatusLine(options) {
   const existing = installationMap(options.host).get(options.generation);
   if (existing) return existing;
@@ -9349,16 +10150,9 @@ function installStatusLine(options) {
   }
   const render = (activeTheme, width, secondary) => {
     if (width <= 0 || !config.enabled || !config.statusLine.enabled) return [];
-    const resolved = resolveTheme(
-      activeTheme.colors || activeTheme.fg ? {
-        ...activeTheme.colors ? { colors: activeTheme.colors } : {},
-        // Call through the theme instance so `this` binds correctly inside Pi's fg().
-        ...activeTheme.fg ? { fg: (color, text) => activeTheme.fg?.(color, text) ?? text } : {}
-      } : void 0,
-      config
-    );
+    const { resolved, separator } = themeAssetsFor(activeTheme, config);
     const result = renderStatus(config.statusLine.layout, effectiveSnapshot(snapshot), width, {
-      separator: separatorsFor(config, resolved),
+      separator,
       segments,
       theme: resolved,
       options: {
@@ -9439,12 +10233,16 @@ function installStatusLine(options) {
   };
   const factory = (secondary) => (tui, theme) => {
     const currentTheme = theme;
+    let renderCache;
     const component = {
       render(width) {
+        if (renderCache?.width === width) return renderCache.lines;
         const lines = render(currentTheme, width, secondary);
+        renderCache = { width, lines };
         return lines;
       },
       invalidate() {
+        renderCache = void 0;
         primaryComponent = secondary ? primaryComponent : component;
         secondaryComponent = secondary ? component : secondaryComponent;
         if (tui.requestRender) tui.requestRender();
@@ -9862,6 +10660,7 @@ function isPlainRecord(value) {
 }
 
 // extension-src/pi-style/app/runtime.ts
+var GIT_INVALIDATE_DEBOUNCE_MS = 250;
 function createPiStyleRuntime(host, generation2, requestRender = host.requestRender ?? (() => {
 })) {
   let disposed = false;
@@ -9887,6 +10686,7 @@ function createPiStyleRuntime(host, generation2, requestRender = host.requestRen
   const disposables = new DisposableStore();
   const scheduler = new RenderScheduler({ requestRender }, generation2, () => !disposed);
   const git = new CachedGitProvider(host.gitRunner);
+  let pendingGitRefresh;
   const contextProvider = new InMemoryContextProvider();
   const usageProvider = new InMemoryUsageProvider();
   const initialContext = contextSnapshot();
@@ -9976,7 +10776,10 @@ function createPiStyleRuntime(host, generation2, requestRender = host.requestRen
         config: currentConfig,
         generation: generation2,
         initialSnapshot: currentSnapshot,
-        isCurrent: () => !disposed
+        isCurrent: () => !disposed,
+        // Clipboard image paste surface (ADR 0009): instant `[Image #N] `
+        // markers at keystroke time, artifact fallback, atomic backspace.
+        clipboardImagePaste: createClipboardImagePasteSurface()
       });
       if (editor) {
         disposables.add(editor);
@@ -10119,11 +10922,18 @@ function createPiStyleRuntime(host, generation2, requestRender = host.requestRen
     },
     invalidateGit() {
       if (disposed || !host.cwd || !currentConfig.enabled || !currentConfig.statusLine.enabled) return;
-      git.invalidate(host.cwd);
-      void git.get(host.cwd).then((value) => {
+      const cwd = host.cwd;
+      git.invalidate(cwd);
+      if (pendingGitRefresh !== void 0) return;
+      pendingGitRefresh = setTimeout(() => {
+        pendingGitRefresh = void 0;
         if (disposed) return;
-        if (updateSnapshot(withSnapshotPatch({ git: value }))) requestRender();
-      });
+        void git.get(cwd).then((value) => {
+          if (disposed) return;
+          if (updateSnapshot(withSnapshotPatch({ git: value }))) requestRender();
+        });
+      }, GIT_INVALIDATE_DEBOUNCE_MS);
+      pendingGitRefresh.unref?.();
     },
     get disposed() {
       return disposed;
@@ -10131,6 +10941,10 @@ function createPiStyleRuntime(host, generation2, requestRender = host.requestRen
     dispose() {
       if (disposed) return;
       disposed = true;
+      if (pendingGitRefresh !== void 0) {
+        clearTimeout(pendingGitRefresh);
+        pendingGitRefresh = void 0;
+      }
       scheduler.cancel();
       disposeStatus();
       disposeEditor();
@@ -10663,7 +11477,7 @@ function isTierCAuthorized(input) {
 
 // extension-src/pi-style/pi/compatibility-probe.ts
 import { readFileSync as readFileSync2 } from "fs";
-import { dirname as dirname3, join as join3 } from "path";
+import { dirname as dirname4, join as join3 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import {
   AssistantMessageComponent,
@@ -10684,6 +11498,8 @@ var MAX_RENDER_CACHE_KEYS_PER_INSTANCE = 8;
 var MAX_LINE_ANALYSIS_ENTRIES = 4096;
 var renderCacheByInstance = /* @__PURE__ */ new WeakMap();
 var lineAnalysisCache = /* @__PURE__ */ new Map();
+var lineCacheEvictionCursor;
+var childrenScanByInstance = /* @__PURE__ */ new WeakMap();
 var messageDecorationTestState = {
   decoratePasses: 0,
   cacheHits: 0,
@@ -10706,7 +11522,7 @@ function splitLeadingMarkers(line) {
     if (end === -1) break;
     index = end + 1;
   }
-  return { head: line.slice(0, index), rest: line.slice(index) };
+  return index === 0 ? { head: "", rest: line } : { head: line.slice(0, index), rest: line.slice(index) };
 }
 function leadingSgr(line) {
   if (!line.startsWith("\x1B[")) return "";
@@ -10720,41 +11536,153 @@ function leadingSgr(line) {
 }
 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;
+  let value = 0;
+  let empty = true;
+  let valid = true;
+  for (let index = 2; index < sequence.length - 1; index++) {
+    const code = sequence.charCodeAt(index);
+    if (code === 59) {
+      if (valid && matchesBackgroundCode(empty ? 0 : value)) return true;
+      value = 0;
+      empty = true;
+      valid = true;
+      continue;
+    }
+    if (code < 48 || code > 57) {
+      valid = false;
+      continue;
+    }
+    value = value * 10 + (code - 48);
+    empty = false;
   }
-  return false;
+  return valid && matchesBackgroundCode(empty ? 0 : value);
+}
+function matchesBackgroundCode(value) {
+  return value === 48 || value === 49 || value >= 40 && value <= 47 || value >= 100 && value <= 107;
+}
+function certifiedAsciiWidth(value) {
+  let width = 0;
+  let index = 0;
+  const length = value.length;
+  while (index < length) {
+    const code = value.charCodeAt(index);
+    if (code === 27) {
+      const next = index + 1 < length ? value.charCodeAt(index + 1) : -1;
+      if (next === 91) {
+        let scan = index + 2;
+        while (scan < length) {
+          const terminator = value.charCodeAt(scan);
+          if (terminator === 109 || // m
+          terminator === 71 || // G
+          terminator === 75 || // K
+          terminator === 72 || // H
+          terminator === 74) {
+            index = scan + 1;
+            break;
+          }
+          scan++;
+        }
+        if (scan >= length) return void 0;
+        continue;
+      }
+      if (next === 93 || next === 95) {
+        let scan = index + 2;
+        let end = -1;
+        while (scan < length) {
+          const terminator = value.charCodeAt(scan);
+          if (terminator === 7) {
+            end = scan + 1;
+            break;
+          }
+          if (terminator === 27 && scan + 1 < length && value.charCodeAt(scan + 1) === 92) {
+            end = scan + 2;
+            break;
+          }
+          scan++;
+        }
+        if (end < 0) return void 0;
+        index = end;
+        continue;
+      }
+      return void 0;
+    }
+    if (code < 32 || code > 126) return void 0;
+    width++;
+    index++;
+  }
+  return width;
+}
+function certifiedVisibleWidth(value) {
+  return certifiedAsciiWidth(value) ?? visibleWidth(value);
+}
+var prefixWidthMemo;
+function prefixWidthOf(prefix) {
+  if (prefixWidthMemo?.prefix === prefix) return prefixWidthMemo.width;
+  const width = certifiedVisibleWidth(prefix);
+  prefixWidthMemo = { prefix, width };
+  return width;
 }
 function contentText(line) {
+  if (!line.includes("\x1B")) return line;
   let output = "";
+  let sliceStart = 0;
   for (let index = 0; index < line.length; index++) {
-    if (line.charCodeAt(index) !== 27) {
-      output += line[index];
-      continue;
-    }
+    if (line.charCodeAt(index) !== 27) continue;
+    output += line.slice(sliceStart, index);
     const next = line[index + 1];
     if (next === "]") {
       index += 2;
       while (index < line.length && line.charCodeAt(index) !== 7) index++;
-      continue;
-    }
-    if (next === "[") {
+    } else if (next === "[") {
       index += 2;
       while (index < line.length && (line.charCodeAt(index) < 64 || line.charCodeAt(index) > 126)) index++;
     }
+    sliceStart = index + 1;
+  }
+  output += line.slice(sliceStart);
+  if (output.includes("\x1B]133;")) {
+    return output.replaceAll(OSC133_ZONE_START, "").replaceAll(OSC133_ZONE_END, "").replaceAll(OSC133_ZONE_FINAL, "");
   }
-  return output.replaceAll(OSC133_ZONE_START, "").replaceAll(OSC133_ZONE_END, "").replaceAll(OSC133_ZONE_FINAL, "");
+  return output;
+}
+function isWhitespaceCode(code) {
+  if (code === 32 || code >= 9 && code <= 13) return true;
+  if (code < 128) return false;
+  return code === 160 || code === 5760 || code >= 8192 && code <= 8202 || code === 8232 || code === 8233 || code === 8239 || code === 8287 || code === 12288 || code === 65279;
 }
 function hasContent(line) {
-  return [...contentText(line)].some((character) => !/\s/u.test(character));
+  const length = line.length;
+  let index = 0;
+  while (index < length) {
+    const code = line.charCodeAt(index);
+    if (code === 27) {
+      const next = index + 1 < length ? line.charCodeAt(index + 1) : -1;
+      if (next === 93) {
+        index += 2;
+        while (index < length && line.charCodeAt(index) !== 7) index++;
+      } else if (next === 91) {
+        index += 2;
+        while (index < length) {
+          const inner = line.charCodeAt(index);
+          if (inner >= 64 && inner <= 126) break;
+          index++;
+        }
+      }
+      index++;
+      continue;
+    }
+    if (code >= 55296 && code <= 57343) return true;
+    if (!isWhitespaceCode(code)) return true;
+    index++;
+  }
+  return false;
 }
 function getLineAnalysis(line) {
   const cached = lineAnalysisCache.get(line);
   if (cached) {
     messageDecorationTestState.lineCacheHits++;
+    lineAnalysisCache.delete(line);
+    lineAnalysisCache.set(line, cached);
     return cached;
   }
   messageDecorationTestState.lineCacheMisses++;
@@ -10762,21 +11690,29 @@ function getLineAnalysis(line) {
   const backgroundAnsi = leadingSgr(leadingMarkers.rest);
   const isBackgroundWrapped = backgroundAnsi !== "" && isBackgroundSgr(backgroundAnsi) && leadingMarkers.rest.endsWith(BG_RESET);
   const backgroundBody = isBackgroundWrapped ? leadingMarkers.rest.slice(backgroundAnsi.length, leadingMarkers.rest.length - BG_RESET.length) : void 0;
+  const hasOscStart = line.startsWith(OSC133_ZONE_START);
   const analysis = {
-    visibleWidth: visibleWidth(line),
+    visibleWidth: certifiedVisibleWidth(line),
     hasContent: hasContent(line),
-    oscEnvelope: extractOscEnvelope(line),
-    hasOscStart: line.startsWith(OSC133_ZONE_START),
+    oscEnvelope: hasOscStart ? extractOscEnvelope(line) : void 0,
+    hasOscStart,
     leadingMarkers,
     isBackgroundWrapped,
     backgroundAnsi,
     backgroundBody,
-    backgroundBodyWidth: backgroundBody === void 0 ? void 0 : visibleWidth(backgroundBody)
+    backgroundBodyWidth: backgroundBody === void 0 ? void 0 : certifiedVisibleWidth(backgroundBody)
   };
   lineAnalysisCache.set(line, analysis);
   if (lineAnalysisCache.size > MAX_LINE_ANALYSIS_ENTRIES) {
-    const oldestKey = lineAnalysisCache.keys().next().value;
-    if (oldestKey !== void 0) lineAnalysisCache.delete(oldestKey);
+    let cursor = lineCacheEvictionCursor;
+    if (cursor === void 0) cursor = lineAnalysisCache.keys();
+    let oldest = cursor.next();
+    if (oldest.done) {
+      cursor = lineAnalysisCache.keys();
+      oldest = cursor.next();
+    }
+    lineCacheEvictionCursor = cursor;
+    if (!oldest.done && oldest.value !== void 0) lineAnalysisCache.delete(oldest.value);
   }
   return analysis;
 }
@@ -10789,8 +11725,8 @@ function rebuildAtWidth(line, width, lead, leadWidth, analysis = getLineAnalysis
   return `${lead}${line}${pad}`;
 }
 function decorateMessageLine(line, index, lastIndex, contentIndex, width, options, analysis = getLineAnalysis(line)) {
-  const { firstEnvelope, firstHasStart, multilineEnvelope, prefix, prefixWidth } = options;
-  const lead = index === contentIndex ? prefix : index > contentIndex ? " ".repeat(prefixWidth) : "";
+  const { firstEnvelope, firstHasStart, multilineEnvelope, prefix, prefixWidth, continuationLead } = options;
+  const lead = index === contentIndex ? prefix : index > contentIndex ? continuationLead : "";
   const leadWidth = index < contentIndex ? 0 : prefixWidth;
   if (index === contentIndex && firstEnvelope)
     return `${firstEnvelope.start}${rebuildAtWidth(firstEnvelope.body, width, prefix, prefixWidth)}${firstEnvelope.end}`;
@@ -10846,32 +11782,58 @@ function prefixNative(lines, width, prefix) {
   if (!Array.isArray(lines) || lines.length === 0 || !lines.every((line) => typeof line === "string")) return void 0;
   messageDecorationTestState.decoratePasses++;
   const nativeLines = lines;
-  const prefixWidth = visibleWidth(prefix);
+  const prefixWidth = prefixWidthOf(prefix);
   if (width <= prefixWidth) return void 0;
   const bodyWidth = width - prefixWidth;
-  const first = nativeLines[0] ?? "";
+  const analyses = nativeLines.map((line) => getLineAnalysis(line));
   const last = nativeLines.at(-1) ?? "";
-  const lastAnalysis = getLineAnalysis(last);
+  const lastAnalysis = analyses[analyses.length - 1] ?? getLineAnalysis(last);
   const multilineEnvelope = nativeLines.length > 1 && last.startsWith(OSC133_ZONE_END + OSC133_ZONE_FINAL);
-  const firstContentIndex = nativeLines.findIndex((line, index) => {
-    if (index !== nativeLines.length - 1 || !multilineEnvelope) return getLineAnalysis(line).hasContent;
-    return !nativeLines.slice(0, index).some((earlier) => getLineAnalysis(earlier).hasContent) && lastAnalysis.hasContent;
-  });
+  let firstContentIndex = -1;
+  for (let index = 0; index < nativeLines.length; index++) {
+    const analysis = analyses[index] ?? getLineAnalysis(nativeLines[index] ?? "");
+    if (index !== nativeLines.length - 1 || !multilineEnvelope) {
+      if (analysis.hasContent) {
+        firstContentIndex = index;
+        break;
+      }
+      continue;
+    }
+    let earlierHasContent = false;
+    for (let earlier = 0; earlier < index; earlier++) {
+      if ((analyses[earlier] ?? getLineAnalysis(nativeLines[earlier] ?? "")).hasContent) {
+        earlierHasContent = true;
+        break;
+      }
+    }
+    if (!earlierHasContent && lastAnalysis.hasContent) firstContentIndex = index;
+    break;
+  }
   if (firstContentIndex < 0) return nativeLines;
-  const firstAnalysis = getLineAnalysis(first);
+  const firstAnalysis = analyses[0] ?? getLineAnalysis(nativeLines[0] ?? "");
   const firstEnvelope = firstContentIndex === 0 ? firstAnalysis.oscEnvelope : void 0;
   const firstHasStart = firstContentIndex === 0 && firstAnalysis.hasOscStart;
+  const continuationLead = " ".repeat(prefixWidth);
   const decorated = nativeLines.map(
-    (line, index) => decorateMessageLine(line, index, nativeLines.length - 1, firstContentIndex, width, {
-      firstEnvelope,
-      firstHasStart,
-      multilineEnvelope,
-      prefix,
-      prefixWidth
-    })
+    (line, index) => decorateMessageLine(
+      line,
+      index,
+      nativeLines.length - 1,
+      firstContentIndex,
+      width,
+      {
+        firstEnvelope,
+        firstHasStart,
+        multilineEnvelope,
+        prefix,
+        prefixWidth,
+        continuationLead
+      },
+      analyses[index]
+    )
   );
-  if (!decorated.every((line) => visibleWidth(line) <= width)) return void 0;
-  if (!nativeLines.every((line) => getLineAnalysis(line).visibleWidth <= bodyWidth)) return void 0;
+  if (!decorated.every((line) => certifiedVisibleWidth(line) <= width)) return void 0;
+  if (!analyses.every((analysis) => analysis.visibleWidth <= bodyWidth)) return void 0;
   return decorated;
 }
 function decorateMessageRender(original, instance, args, snapshot = {
@@ -10884,7 +11846,7 @@ function decorateMessageRender(original, instance, args, snapshot = {
   const width = typeof args[0] === "number" ? args[0] : 0;
   const prefix = snapshot.assistantPrefix;
   if (!snapshot.assistantEnabled) return Reflect.apply(original, instance, args);
-  const prefixWidth = visibleWidth(prefix);
+  const prefixWidth = prefixWidthOf(prefix);
   if (width <= prefixWidth) return Reflect.apply(original, instance, args);
   const reducedWidth = width - prefixWidth;
   const native = Reflect.apply(original, instance, [reducedWidth, ...args.slice(1)]);
@@ -10916,8 +11878,16 @@ function hasToolCallItems(message) {
 function isBlankTextChild(child) {
   const candidate = child;
   if (typeof candidate?.setCustomBgFn !== "function" || typeof candidate.render !== "function") return false;
+  if (typeof candidate.text === "string") return contentText(candidate.text).trim() === "";
   return contentText(candidate.render(0).join("\n")).trim() === "";
 }
+function childrenUnchangedSinceScan(instance, children) {
+  const state = childrenScanByInstance.get(instance);
+  return state !== void 0 && state.childrenRef === children && state.length === children.length;
+}
+function markChildrenScanned(instance, children) {
+  childrenScanByInstance.set(instance, { childrenRef: children, length: children.length });
+}
 function decorateMessageUpdate(original, instance, args, snapshot = {
   assistantPrefix: "\u2502 ",
   assistantEnabled: true,
@@ -10927,24 +11897,22 @@ function decorateMessageUpdate(original, instance, args, snapshot = {
   if (typeof original !== "function") return void 0;
   const result = Reflect.apply(original, instance, args);
   const target = instance;
-  if (snapshot.collapseHiddenThinking && target.hideThinkingBlock === true && target.hiddenThinkingLabel === "") {
-    const children = target.contentContainer?.children;
-    if (children) {
+  const children = target.contentContainer?.children;
+  if (children && !childrenUnchangedSinceScan(instance, children)) {
+    if (snapshot.collapseHiddenThinking && target.hideThinkingBlock === true && target.hiddenThinkingLabel === "") {
       for (let index = children.length - 1; index >= 0; index--) {
         if (!isBlankTextChild(children[index])) continue;
         children.splice(index, 1);
         if (isSpacerChild(children[index])) children.splice(index, 1);
       }
     }
-  }
-  if (snapshot.hideInterimText && hasToolCallItems(args[0])) {
-    const children = target.contentContainer?.children;
-    if (children) {
+    if (snapshot.hideInterimText && hasToolCallItems(args[0])) {
       for (let index = children.length - 1; index >= 0; index--) {
         if (isInterimTextChild(children[index])) children.splice(index, 1);
       }
       if (children.every((child) => isSpacerChild(child))) children.length = 0;
     }
+    markChildrenScanned(instance, children);
   }
   return result;
 }
@@ -11306,19 +12274,19 @@ function detectPiVersion(resolution = {}) {
       );
     }
   });
-  const readFile2 = resolution.readFile ?? ((path) => readFileSync2(path, "utf8"));
+  const readFile4 = resolution.readFile ?? ((path) => readFileSync2(path, "utf8"));
   try {
     const entry = resolvePackageEntry("@earendil-works/pi-coding-agent");
-    let directory = dirname3(entry);
+    let directory = dirname4(entry);
     for (; ; ) {
       const packagePath = join3(directory, "package.json");
       try {
-        const packageJson = JSON.parse(readFile2(packagePath));
+        const packageJson = JSON.parse(readFile4(packagePath));
         if (packageJson.name === "@earendil-works/pi-coding-agent" && typeof packageJson.version === "string")
           return { version: packageJson.version };
       } catch {
       }
-      const parent = dirname3(directory);
+      const parent = dirname4(directory);
       if (parent === directory) break;
       directory = parent;
     }
@@ -11981,6 +12949,11 @@ function createPiStyleSessionCoordinator(pi, hooks = {}) {
   };
   const applyMessagesConfig = (config) => {
     sessionUi?.setHiddenThinkingLabel?.(config.messages.hideThinkingLabel ? "" : void 0);
+    setMessagesRenderConfig({
+      showImagePreviews: config.messages.showImagePreviews,
+      clipboardImages: config.messages.clipboardImages,
+      previewMaxWidth: config.messages.previewMaxWidth
+    });
   };
   const applyAutoTheme = (config, ctx) => {
     const target = config.theme.autoApply;
@@ -12040,6 +13013,7 @@ function createPiStyleSessionCoordinator(pi, hooks = {}) {
       resetBatchRegistry();
       resetGrepRegistry();
       resetBashTreeRegistry();
+      resetPendingImageRegistry();
       resetTurnRegistry();
       rebuildTurnRegistryFromEntries(ctx.sessionManager.getEntries());
       stopAllElapsedTickers();
@@ -12105,6 +13079,7 @@ function createPiStyleSessionCoordinator(pi, hooks = {}) {
       resetBatchRegistry();
       resetGrepRegistry();
       resetBashTreeRegistry();
+      resetPendingImageRegistry();
       resetTurnRegistry();
       stopAllElapsedTickers();
       app.sessionShutdown();
@@ -12308,6 +13283,12 @@ function piStyleExtension(pi) {
   pi.registerFlag("pi-style-ascii", { type: "boolean", description: "Use ASCII pi-style markers" });
   const coordinator = createPiStyleSessionCoordinator(pi, compatibilityTestHooks);
   registerPiStyleCommand(pi, coordinator.app);
+  registerImagePreviewSurface(pi);
+  let stagedImagePreview;
+  pi.on("before_agent_start", (event) => {
+    const staged = stageImagePreviewData(event.images ?? []);
+    if (staged) stagedImagePreview = staged;
+  });
   pi.on("session_start", async (event, ctx) => {
     resetUsageFromSessionCache(ctx.sessionManager);
     if (pi.getFlag("pi-style-readonly-tools") === true) {
@@ -12319,7 +13300,7 @@ function piStyleExtension(pi) {
     coordinator.app.runtime.current?.dismissStartup();
     beginAgentRun();
   });
-  pi.on("input", (event, _ctx) => {
+  pi.on("input", async (event, _ctx) => {
     coordinator.app.runtime.current?.dismissStartup();
     if (event.source === "interactive") {
       const trimmed = event.text.trimStart();
@@ -12328,6 +13309,15 @@ function piStyleExtension(pi) {
         if (trimmed.slice(bangLength).trim() === "") return { action: "handled" };
       }
     }
+    const markerResult = await resolvePendingImageMarkers(event.text);
+    const pathResult = event.source === "interactive" ? await transformClipboardImages(event.text) : void 0;
+    if (markerResult || pathResult) {
+      return {
+        action: "transform",
+        text: pathResult?.text ?? event.text,
+        images: [...markerResult?.images ?? [], ...pathResult?.images ?? []]
+      };
+    }
     return void 0;
   });
   pi.on("tool_execution_start", () => coordinator.app.runtime.current?.dismissStartup());
@@ -12347,8 +13337,12 @@ function piStyleExtension(pi) {
     "session_info_changed",
     (event) => coordinator.app.update({ sessionName: event.name }, "coalesced", { refreshExtensionStatuses: true })
   );
-  pi.on("message_start", () => {
+  pi.on("message_start", (event) => {
     closeActiveBatch();
+    if (stagedImagePreview && event.message?.role === "assistant") {
+      flushImagePreviewEntry(pi, stagedImagePreview);
+      stagedImagePreview = void 0;
+    }
   });
   pi.on("message_update", () => coordinator.app.update({}, "coalesced"));
   pi.on(
@@ -12363,6 +13357,7 @@ function piStyleExtension(pi) {
     const run = finishAgentRun();
     if (run) {
       invalidateTurnMembers(run);
+      releaseTurnInvalidators(run);
       requestToolPresentationRender();
     }
   });