@quandev104/pi-style 0.2.3 → 0.2.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.2.5] - 2026-08-25
+
+### Bug Fixes
+
+- *(messages)* Preserve text in tool-calling messages
+
 ## [0.2.3] - 2026-08-22
 
 ### Documentation

package/README.md

@@ -17,7 +17,6 @@
 - **Editor** — compact/boxed/dock `CustomEditor` treatments with prompt glyph, metadata rows, and thinking-level border, preserving Pi keybindings and autocomplete.
 - **Startup** — compact gradient logo header and optional overlay with System & Context / Available Tools panels, rendered from snapshot data collected before mount.
 - **Messages** — assistant prefix and boxed compaction/skill/branch/MCP special blocks, and certified tool call/result selectors with pending/running/error markers.
-- **Interim narration hiding** — the text of assistant messages that also carry tool calls is hidden (`messages.hideInterimText`): the feed shows only the tool blocks, the run summary, and the final answer.
 - **Turn summaries** — when a turn completes, its finalized tool blocks collapse into one summary line (`➔ Read 2 files, ran 4 shell commands · 3.1s`); errors and interrupted turns stay visible, and Pi's global Ctrl+O toggle expands everything again (`tools.collapseAfterTurn`).
 - **User-prompt image previews** — images attached to your prompt render inline **below your message** as display-only session entries (never sent to the LLM) with `#N · WxH` labels tying each image to its marker; multiple images lay out side-by-side on kitty-capable terminals (up to 3 columns, stacked fallback elsewhere), sized by `messages.previewMaxWidth` (default 30) with Pi's global Ctrl+O expanding to 60 (`messages.showImagePreviews`).
 - **Clipboard image input** — the built-in `Ctrl+V` becomes a full image-paste flow with no other extension required: a sync native probe checks the clipboard at keystroke time, an `[Image #N] ` marker appears instantly in the editor (bytes attach asynchronously — no temp-file flash), backspacing right after a marker deletes it as one unit (discarding the image, image-paste semantics), and submit attaches real image attachments; raw pasted paths that bypass the editor still upgrade to `[image]` + attachment (`messages.clipboardImages`).
@@ -194,7 +193,7 @@ npm run check
 
 `npm run check` runs all required automated gates in order.
 
-Current test suite: 817 tests across 41 files.
+Current test suite: 819 tests across 41 files.
 
 ---
 

package/dist/extensions/pi-style.js

@@ -343,6 +343,7 @@ function rewriteTokens(text, rewritten, tmpRoot) {
 // extension-src/pi-style/features/messages/image-preview.ts
 import {
   getCapabilities,
+  getCellDimensions,
   getImageDimensions,
   Image
 } from "@earendil-works/pi-tui";
@@ -569,6 +570,8 @@ var IMAGE_PREVIEW_EXPANDED_MAX_WIDTH_CELLS = 60;
 var IMAGE_PREVIEW_MAX_WIDTH_CELLS = 60;
 var GRID_GAP = 2;
 var GRID_MIN_COLUMN = 14;
+var GRID_MAX_HEIGHT_RATIO = 1.5;
+var FALLBACK_IMAGE_DIMENSIONS = { widthPx: 800, heightPx: 600 };
 function isPreviewableImage(value) {
   if (!value || typeof value !== "object") return false;
   const data = value.data;
@@ -624,10 +627,10 @@ function renderImagePreviewEntry(entry, options, theme) {
         )
       );
       const labels2 = images.map((_image, index) => imageLabel(themed, index + 1, dims[index]));
-      cached = { images, components: components2, labels: labels2 };
+      cached = { images, dimensions: dims, components: components2, labels: labels2 };
       previewCache.set(entry, cached);
     }
-    const { components, labels } = cached;
+    const { components, dimensions, labels } = cached;
     let memo;
     return {
       invalidate() {
@@ -643,7 +646,7 @@ function renderImagePreviewEntry(entry, options, theme) {
         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);
+        else lines = renderGrid(width, maxWidth, labels, components, dimensions);
         memo = { key, lines };
         return lines;
       }
@@ -667,7 +670,7 @@ function stripTrailingSpaces(line) {
   while (end > 0 && line.charCodeAt(end - 1) === 32) end--;
   return line.slice(0, end);
 }
-function renderGrid(width, maxWidth, labels, components) {
+function renderGrid(width, maxWidth, labels, components, dimensions) {
   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));
@@ -675,31 +678,56 @@ function renderGrid(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 = [];
+  const cellDimensions = getCellDimensions();
   for (let start = 0; start < components.length; start += columns) {
     const group = components.slice(start, start + columns);
     const groupLabels = labels.slice(start, start + columns);
+    const groupDimensions = dimensions.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)));
+    const sizes = groupDimensions.map((imageDimensions) => imageCellSize(imageDimensions, columnWidth, cellDimensions));
+    const rowCounts = rendered.map((column) => column.length).filter((count) => count > 0);
+    const minRows = Math.min(...rowCounts);
+    const maxRows = Math.max(...rowCounts);
+    if (rowCounts.length > 1 && minRows > 0 && maxRows >= minRows * GRID_MAX_HEIGHT_RATIO) {
+      return renderStacked(width, maxWidth, labels, components);
+    }
+    const slotWidths = groupLabels.map(
+      (label, index) => Math.max(sizes[index]?.columns ?? 1, visibleWidth(stripAnsi(label)))
+    );
+    const labelRow = groupLabels.map((label, index) => {
+      const pad = Math.max(0, (slotWidths[index] ?? 0) - 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 = "";
+      let startCol = 0;
       for (let column = 0; column < rendered.length; column++) {
-        if (column > 0) {
-          const startCol = column * (columnWidth + GRID_GAP);
-          line += `\x1B[${startCol + 1}G`;
-        }
+        if (column > 0) line += `\x1B[${startCol + 1}G`;
         line += rendered[column]?.[row] ?? "";
+        startCol += (slotWidths[column] ?? 0) + GRID_GAP;
       }
       lines.push(stripTrailingSpaces(line));
     }
   }
   return lines;
 }
+function imageCellSize(dimensions, requestedWidth, cellDimensions) {
+  const imageDimensions = dimensions ?? FALLBACK_IMAGE_DIMENSIONS;
+  const maxWidth = Math.max(1, Math.min(requestedWidth - 2, 60));
+  const maxHeight = Math.max(1, Math.ceil(maxWidth * cellDimensions.widthPx / cellDimensions.heightPx));
+  const imageWidth = Math.max(1, imageDimensions.widthPx);
+  const imageHeight = Math.max(1, imageDimensions.heightPx);
+  const widthScale = maxWidth * cellDimensions.widthPx / imageWidth;
+  const heightScale = maxHeight * cellDimensions.heightPx / imageHeight;
+  const scale = Math.min(widthScale, heightScale);
+  return {
+    columns: Math.max(1, Math.min(maxWidth, Math.ceil(imageWidth * scale / cellDimensions.widthPx))),
+    rows: Math.max(1, Math.min(maxHeight, Math.ceil(imageHeight * scale / cellDimensions.heightPx)))
+  };
+}
 function registerImagePreviewSurface(pi) {
   pi.registerEntryRenderer(IMAGE_PREVIEW_ENTRY_TYPE, renderImagePreviewEntry);
 }
@@ -7602,7 +7630,6 @@ var DEFAULT_CONFIG = Object.freeze({
     assistantPrefix: true,
     specialBlocks: true,
     hideThinkingLabel: true,
-    hideInterimText: true,
     showImagePreviews: true,
     clipboardImages: true,
     previewMaxWidth: 30
@@ -7722,7 +7749,6 @@ 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),
       showImagePreviews: bool(messages.showImagePreviews, defaults.messages.showImagePreviews),
       clipboardImages: bool(messages.clipboardImages, defaults.messages.clipboardImages),
       previewMaxWidth: boundedInt(messages.previewMaxWidth, defaults.messages.previewMaxWidth, 8, 60)
@@ -7778,7 +7804,6 @@ var BOOL_PATHS = /* @__PURE__ */ new Set([
   "messages.assistantPrefix",
   "messages.specialBlocks",
   "messages.hideThinkingLabel",
-  "messages.hideInterimText",
   "messages.showImagePreviews",
   "messages.clipboardImages",
   "tools.enabled",
@@ -8250,7 +8275,6 @@ var allowedPaths = /* @__PURE__ */ new Set([
   "messages.assistantPrefix",
   "messages.specialBlocks",
   "messages.hideThinkingLabel",
-  "messages.hideInterimText",
   "messages.showImagePreviews",
   "messages.clipboardImages",
   "messages.previewMaxWidth",
@@ -8285,7 +8309,6 @@ function validatePathValue(path, value) {
     "messages.assistantPrefix",
     "messages.specialBlocks",
     "messages.hideThinkingLabel",
-    "messages.hideInterimText",
     "messages.showImagePreviews",
     "messages.clipboardImages",
     "messages.previewMaxWidth",
@@ -11839,8 +11862,7 @@ function prefixNative(lines, width, prefix) {
 function decorateMessageRender(original, instance, args, snapshot = {
   assistantPrefix: "\u2502 ",
   assistantEnabled: true,
-  collapseHiddenThinking: false,
-  hideInterimText: false
+  collapseHiddenThinking: false
 }) {
   if (typeof original !== "function") return void 0;
   const width = typeof args[0] === "number" ? args[0] : 0;
@@ -11864,17 +11886,6 @@ function decorateMessageRender(original, instance, args, snapshot = {
 function isSpacerChild(child) {
   return typeof child?.setLines === "function";
 }
-function isInterimTextChild(child) {
-  const candidate = child;
-  return typeof candidate?.setText === "function" && candidate.options !== void 0 && typeof candidate.options === "object" && candidate.defaultTextStyle === void 0;
-}
-function hasToolCallItems(message) {
-  if (!message || typeof message !== "object") return false;
-  const content = message.content;
-  return Array.isArray(content) && content.some(
-    (item) => item !== null && typeof item === "object" && item.type === "toolCall"
-  );
-}
 function isBlankTextChild(child) {
   const candidate = child;
   if (typeof candidate?.setCustomBgFn !== "function" || typeof candidate.render !== "function") return false;
@@ -11891,8 +11902,7 @@ function markChildrenScanned(instance, children) {
 function decorateMessageUpdate(original, instance, args, snapshot = {
   assistantPrefix: "\u2502 ",
   assistantEnabled: true,
-  collapseHiddenThinking: false,
-  hideInterimText: false
+  collapseHiddenThinking: false
 }) {
   if (typeof original !== "function") return void 0;
   const result = Reflect.apply(original, instance, args);
@@ -11906,12 +11916,6 @@ function decorateMessageUpdate(original, instance, args, snapshot = {
         if (isSpacerChild(children[index])) children.splice(index, 1);
       }
     }
-    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;
@@ -12375,7 +12379,7 @@ function surfaceDisabled(spec, config) {
   if (!config.messages.enabled) return true;
   if (spec.subtype === "native-assistant-message" && spec.method === "render") return !config.messages.assistantPrefix;
   if (spec.subtype === "native-assistant-message" && spec.method === "updateContent")
-    return !config.messages.hideThinkingLabel && !config.messages.hideInterimText;
+    return !config.messages.hideThinkingLabel;
   if (isSpecialBlock(spec)) return !config.messages.specialBlocks;
   return true;
 }
@@ -12749,8 +12753,7 @@ function createCompatibilityCoordinator(dispose = disposePiCompatibilityProbe) {
         messageSnapshot: {
           assistantPrefix: authorization.ascii ? "[assistant] " : "\u2502 ",
           assistantEnabled,
-          collapseHiddenThinking: thinkingCollapseEnabled,
-          hideInterimText: config.messages.hideInterimText && messagesEnabled
+          collapseHiddenThinking: thinkingCollapseEnabled
         },
         toolSnapshot: {
           callMarker: authorization.ascii ? "[tool] " : "[tool] ",
@@ -13285,9 +13288,9 @@ function piStyleExtension(pi) {
   registerPiStyleCommand(pi, coordinator.app);
   registerImagePreviewSurface(pi);
   let stagedImagePreview;
+  let previewFlushTimer;
   pi.on("before_agent_start", (event) => {
-    const staged = stageImagePreviewData(event.images ?? []);
-    if (staged) stagedImagePreview = staged;
+    stagedImagePreview = stageImagePreviewData(event.images ?? []);
   });
   pi.on("session_start", async (event, ctx) => {
     resetUsageFromSessionCache(ctx.sessionManager);
@@ -13339,7 +13342,20 @@ function piStyleExtension(pi) {
   );
   pi.on("message_start", (event) => {
     closeActiveBatch();
+    if (event.message?.role === "user" && stagedImagePreview && !previewFlushTimer) {
+      const pending = stagedImagePreview;
+      previewFlushTimer = setTimeout(() => {
+        previewFlushTimer = void 0;
+        if (stagedImagePreview !== pending) return;
+        flushImagePreviewEntry(pi, pending);
+        stagedImagePreview = void 0;
+      }, 0);
+    }
     if (stagedImagePreview && event.message?.role === "assistant") {
+      if (previewFlushTimer) {
+        clearTimeout(previewFlushTimer);
+        previewFlushTimer = void 0;
+      }
       flushImagePreviewEntry(pi, stagedImagePreview);
       stagedImagePreview = void 0;
     }