@hheei/pi-ext-ui 0.4.0 → 0.4.2

package/dist/diff-view.js

@@ -153,9 +153,12 @@ export class DiffView {
         if (!this.#parsed.ok)
             rows.push(this.#theme.fg("warning", `! ${this.#parsed.diagnostic}`));
         for (const raw of (this.#rawText ?? "").split(/\r?\n/)) {
-            rows.push(this.#theme.fg("dim", raw));
+            const wrapped = wrapTextWithAnsi(raw, width);
+            for (const line of wrapped.length > 0 ? wrapped : [""]) {
+                rows.push(this.#theme.fg("dim", line));
+            }
         }
-        return rows.map((row) => truncateToWidth(row, width, "…"));
+        return rows;
     }
     #renderDiff(width, hunks) {
         const numberCol = numberWidth(hunks);

package/dist/message-view.js

@@ -1,4 +1,4 @@
-import { truncateToWidth, } from "@earendil-works/pi-tui";
+import { truncateToWidth, wrapTextWithAnsi, } from "@earendil-works/pi-tui";
 import { toContentRows, toSingleRow } from "./tool-view.js";
 /**
  * A transcript notice, not a tool execution.
@@ -38,7 +38,14 @@ function layRows(source, width) {
     const raw = isComponent(source)
         ? source.render(inner).flatMap((line) => toContentRows(line))
         : (typeof source === "string" ? [source] : source).flatMap((line) => toContentRows(line));
-    return raw.map((line) => truncate(`  ${line}`, width));
+    const rows = [];
+    for (const line of raw) {
+        const wrapped = wrapTextWithAnsi(line, inner);
+        for (const chunk of wrapped.length > 0 ? wrapped : [""]) {
+            rows.push(truncate(`  ${chunk}`, width));
+        }
+    }
+    return rows;
 }
 function invalidateRows(source) {
     if (source !== undefined && isComponent(source))

package/dist/nested-calls-view.js

@@ -1,5 +1,5 @@
 import { copyToClipboard as copyToSystemClipboard, getLanguageFromPath, highlightCode, } from "@earendil-works/pi-coding-agent";
-import { stripTerminalSequences, truncateToWidth, visibleWidth, } from "@earendil-works/pi-tui";
+import { stripTerminalSequences, truncateToWidth, visibleWidth, wrapTextWithAnsi, } from "@earendil-works/pi-tui";
 import { inlinePresentation } from "./renderer.js";
 import { formatToolHeaderText, ToolView, toContentRows, transitionFoldLevel, } from "./tool-view.js";
 function truncate(text, width) {
@@ -167,6 +167,7 @@ export class NestedCallsView {
             : context.toolCallId;
         return {
             ...context,
+            lastComponent: undefined,
             args: "args" in call ? call.args : undefined,
             toolCallId,
             durationMs: call.durationMs,
@@ -268,15 +269,20 @@ export class NestedCallsView {
                 copyRegion: { startX: width - copySlotWidth - 1, endX: width },
             };
             if (isExpanded) {
-                const bodyLines = this.#renderChildBody(call, Math.max(1, width - 2), expansionLevel);
+                const childWidth = Math.max(1, width - 2);
+                const bodyLines = this.#renderChildBody(call, childWidth, expansionLevel);
                 for (const rawLine of bodyLines) {
                     for (const bodyLine of toContentRows(rawLine)) {
-                        const bodyLineIdx = lines.length;
-                        lines.push(truncate(`  ${bodyLine}`, width));
-                        this.#lineMapping[bodyLineIdx] = {
-                            callIndex: i,
-                            isHeader: false,
-                        };
+                        const wrapped = wrapTextWithAnsi(bodyLine, childWidth);
+                        const chunks = wrapped.length > 0 ? wrapped : [""];
+                        for (const chunk of chunks) {
+                            const bodyLineIdx = lines.length;
+                            lines.push(truncate(`  ${chunk}`, width));
+                            this.#lineMapping[bodyLineIdx] = {
+                                callIndex: i,
+                                isHeader: false,
+                            };
+                        }
                     }
                 }
             }

package/dist/renderer.js

@@ -53,7 +53,8 @@ function resolveToolCallSummary(params) {
     // Tier 1: Host Native RenderCall Delegation
     if (originalRenderCall !== undefined) {
         try {
-            const upstreamLines = originalRenderCall(args, theme, context).render(120);
+            const upstreamContext = { ...context, lastComponent: undefined };
+            const upstreamLines = originalRenderCall(args, theme, upstreamContext).render(120);
             const firstNonEmpty = upstreamLines
                 .map((line) => stripTerminalSequences(line).trim())
                 .find((line) => line !== "");
@@ -143,9 +144,6 @@ export function isMcpTool(toolName) {
         toolName === "list_mcp_resource_templates");
 }
 function shouldInterceptTool(toolName, options) {
-    if (options?.catchAll === true) {
-        return options.match !== undefined ? options.match(toolName) : true;
-    }
     if (options?.match?.(toolName)) {
         return true;
     }
@@ -153,7 +151,10 @@ function shouldInterceptTool(toolName, options) {
     if (toolList !== undefined) {
         return toolList.includes(toolName);
     }
-    return SPECIALIZED_TOOL_SET.has(toolName) || isMcpTool(toolName);
+    if (options?.catchAll === false) {
+        return SPECIALIZED_TOOL_SET.has(toolName) || isMcpTool(toolName);
+    }
+    return true;
 }
 function renderGenericResult(params) {
     const { toolName, theme, context, result, renderOptions, defaultLevel, originalRenderCall, originalRenderResult, resolvePresentation, resolveNativeRenderer, options, } = params;
@@ -305,9 +306,21 @@ function renderGenericResult(params) {
             ...renderOptions,
             expanded: effectiveExpanded,
         };
+        let lastUpstreamComponent;
         const lazyUpstreamComponent = {
             render(w) {
-                return originalRenderResult(result, effectiveOptions, theme, context).render(w);
+                try {
+                    const upstreamContext = {
+                        ...context,
+                        lastComponent: lastUpstreamComponent,
+                    };
+                    const comp = originalRenderResult(result, effectiveOptions, theme, upstreamContext);
+                    lastUpstreamComponent = comp;
+                    return comp.render(w);
+                }
+                catch {
+                    return rawOutput !== "" ? rawOutput.split("\n") : [];
+                }
             },
             invalidate() { },
         };

package/dist/tool-view.js

@@ -1,6 +1,6 @@
 import { Buffer } from "node:buffer";
 import { copyToClipboard as copyToSystemClipboard, } from "@earendil-works/pi-coding-agent";
-import { truncateToWidth, visibleWidth, } from "@earendil-works/pi-tui";
+import { truncateToWidth, visibleWidth, wrapTextWithAnsi, } from "@earendil-works/pi-tui";
 export function isCollapsible(value) {
     return (typeof value === "object" &&
         value !== null &&
@@ -384,10 +384,27 @@ export class ToolView {
             const rail = noRail ? "" : `${theme.fg(section.railToken, "▎")} `;
             const { rows: rawLines, isByteTruncated, totalBytes, } = resolveRows(section.content, innerWidth, toContentRows);
             const cap = level === 1 ? (section.maxLines ?? DEFAULT_MAX_SECTION_LINES) : MAX_LEVEL2_SECTION_LINES;
-            const visibleLines = Number.isFinite(cap) && rawLines.length > cap ? rawLines.slice(0, cap) : rawLines;
-            const omittedCount = rawLines.length - visibleLines.length;
-            for (const line of visibleLines) {
-                output.push(truncate(rail + line, safeWidth));
+            const sectionRows = [];
+            let logicalLinesCount = 0;
+            for (const line of rawLines) {
+                const wrapped = wrapTextWithAnsi(line, innerWidth);
+                const chunks = wrapped.length > 0 ? wrapped : [""];
+                if (Number.isFinite(cap) && sectionRows.length + chunks.length > cap) {
+                    const canTake = Math.max(0, cap - sectionRows.length);
+                    for (let i = 0; i < canTake; i++) {
+                        const chunk = chunks[i];
+                        if (chunk !== undefined) {
+                            sectionRows.push(chunk);
+                        }
+                    }
+                    break;
+                }
+                sectionRows.push(...chunks);
+                logicalLinesCount++;
+            }
+            const omittedCount = rawLines.length - logicalLinesCount;
+            for (const row of sectionRows) {
+                output.push(truncate(rail + row, safeWidth));
             }
             if (omittedCount > 0 || isByteTruncated) {
                 const hint = isByteTruncated

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hheei/pi-ext-ui",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Collapsible tool rendering frame and tool renderer pilot for Pi.",
   "type": "module",
   "main": "dist/index.js",