pi-ui-extend 0.1.9 → 0.1.13

package/dist/app/rendering/message-content.js

@@ -1,4 +1,10 @@
 import { isRecord } from "../guards.js";
+const MAX_FORMAT_STRING_CHARS = 256 * 1024;
+const MAX_RENDERED_CONTENT_CHARS = 512 * 1024;
+const MAX_STRUCTURED_DEPTH = 8;
+const MAX_STRUCTURED_ARRAY_ITEMS = 200;
+const MAX_STRUCTURED_OBJECT_KEYS = 200;
+const TRUNCATED_MARKER = "\n[… truncated …]";
 export function stringifyUnknown(value) {
     if (typeof value === "string")
         return value;
@@ -13,7 +19,7 @@ export function stringifyUnknown(value) {
             return name;
     }
     try {
-        return JSON.stringify(value, null, 2);
+        return JSON.stringify(normalizeStructuredValue(value), null, 2);
     }
     catch {
         return String(value);
@@ -24,8 +30,10 @@ export function formatStructuredText(value) {
         const trimmed = value.trim();
         if (!trimmed)
             return "(empty)";
+        if (trimmed.length > MAX_FORMAT_STRING_CHARS)
+            return truncateText(value, MAX_FORMAT_STRING_CHARS);
         try {
-            return JSON.stringify(JSON.parse(trimmed), null, 2);
+            return JSON.stringify(normalizeStructuredValue(JSON.parse(trimmed)), null, 2);
         }
         catch {
             return value;
@@ -36,25 +44,40 @@ export function formatStructuredText(value) {
 export function renderContent(content) {
     const parts = [];
     let imageCount = 0;
+    let renderedChars = 0;
+    const pushPart = (part) => {
+        const remaining = MAX_RENDERED_CONTENT_CHARS - renderedChars;
+        if (remaining <= 0)
+            return false;
+        const next = part.length > remaining ? truncateText(part, remaining) : part;
+        parts.push(next);
+        renderedChars += next.length;
+        return part.length <= remaining;
+    };
     for (const item of content) {
         if (!isRecord(item)) {
-            parts.push(stringifyUnknown(item));
+            if (!pushPart(stringifyUnknown(item)))
+                break;
             continue;
         }
         if (isImageContent(item)) {
             imageCount += 1;
-            parts.push(imageContentLabel(item, imageCount));
+            if (!pushPart(imageContentLabel(item, imageCount)))
+                break;
             continue;
         }
         if (typeof item.text === "string") {
-            parts.push(item.text);
+            if (!pushPart(item.text))
+                break;
             continue;
         }
         if (typeof item.thinking === "string") {
-            parts.push(item.thinking);
+            if (!pushPart(item.thinking))
+                break;
             continue;
         }
-        parts.push(stringifyUnknown(item));
+        if (!pushPart(stringifyUnknown(item)))
+            break;
     }
     return parts.join("\n");
 }
@@ -113,3 +136,38 @@ export function submittedUserDisplayText(displayText, promptText, images) {
         return userImageLabels(images.length);
     return promptText.trimEnd();
 }
+function truncateText(text, maxChars) {
+    if (text.length <= maxChars)
+        return text;
+    return `${text.slice(0, Math.max(0, maxChars))}${TRUNCATED_MARKER}`;
+}
+function normalizeStructuredValue(value, depth = 0, seen = new WeakSet()) {
+    if (typeof value === "string")
+        return truncateText(value, MAX_FORMAT_STRING_CHARS);
+    if (!value || typeof value !== "object")
+        return value;
+    if (depth >= MAX_STRUCTURED_DEPTH)
+        return "[… truncated: depth limit …]";
+    if (seen.has(value))
+        return "[… circular …]";
+    seen.add(value);
+    if (Array.isArray(value)) {
+        const items = value.slice(0, MAX_STRUCTURED_ARRAY_ITEMS).map((item) => normalizeStructuredValue(item, depth + 1, seen));
+        if (value.length > MAX_STRUCTURED_ARRAY_ITEMS)
+            items.push(`[… ${value.length - MAX_STRUCTURED_ARRAY_ITEMS} more items …]`);
+        return items;
+    }
+    if (value instanceof Error)
+        return value.message || value.name;
+    const output = {};
+    let count = 0;
+    for (const [key, child] of Object.entries(value)) {
+        if (count >= MAX_STRUCTURED_OBJECT_KEYS) {
+            output["…"] = "truncated: object key limit";
+            break;
+        }
+        output[key] = normalizeStructuredValue(child, depth + 1, seen);
+        count += 1;
+    }
+    return output;
+}

package/dist/app/rendering/render-controller.js

@@ -68,8 +68,11 @@ export class AppRenderController {
         this.deps.mouseController.statusThinkingTarget = undefined;
         this.deps.mouseController.statusContextTarget = undefined;
         this.deps.mouseController.statusModelUsageTarget = undefined;
+        this.deps.mouseController.statusDraftQueueTarget = undefined;
+        this.deps.mouseController.statusUserJumpTarget = undefined;
         this.deps.mouseController.statusThinkingExpandTarget = undefined;
         this.deps.mouseController.statusCompactToolsTarget = undefined;
+        this.deps.mouseController.statusTerminalBellSoundTarget = undefined;
         this.deps.mouseController.statusSessionTarget = undefined;
         this.deps.mouseController.statusPromptEnhancerTarget = undefined;
         this.deps.mouseController.statusVoiceMicTarget = undefined;
@@ -165,10 +168,11 @@ export class AppRenderController {
         for (let index = 0; index < renderedInput.lines.length; index += 1) {
             const inputLine = renderedInput.lines[index] ?? "";
             const tagSpans = renderedInput.tagSpans[index];
+            const suggestionSpans = renderedInput.suggestionSpans?.[index] ?? [];
             const row = toScreenRow(inputStartRow + index);
             this.deps.mouseController.renderedRowTexts.set(row, inputLine);
             const tagColor = this.deps.theme.colors.accent;
-            const styledLine = this.deps.screenStyler.styleInputLine(row, inputLine, tagSpans, columns, tagColor, this.deps.theme.colors.inputBorder);
+            const styledLine = this.deps.screenStyler.styleInputLine(row, inputLine, tagSpans, suggestionSpans, columns, tagColor, this.deps.theme.colors.muted, this.deps.theme.colors.inputBorder);
             appendFrameOutput("inputStatus", row, this.renderFrameRow(row, styledLine));
         }
         if (renderedInput.scrollBar && columns > 0) {
@@ -291,6 +295,7 @@ export class AppRenderController {
         this.deps.mouseController.statusThinkingTarget = this.deps.statusLineRenderer.thinkingTarget(statusLayout.text, statusRow);
         this.deps.mouseController.statusContextTarget = this.deps.statusLineRenderer.contextTarget(statusLayout.text, statusRow, statusLayout);
         this.deps.mouseController.statusModelUsageTarget = this.deps.statusLineRenderer.modelUsageTarget(statusLayout.text, statusRow, statusLayout);
+        this.deps.mouseController.statusDraftQueueTarget = this.deps.statusLineRenderer.draftQueueTarget?.(statusLayout, statusRow);
         this.deps.mouseController.statusUserJumpTarget = this.deps.statusLineRenderer.userJumpTarget?.(statusLayout, statusRow);
         this.deps.mouseController.statusThinkingExpandTarget = this.deps.statusLineRenderer.thinkingExpandTarget?.(statusLayout, statusRow);
         this.deps.mouseController.statusCompactToolsTarget = this.deps.statusLineRenderer.compactToolsTarget?.(statusLayout, statusRow);

package/dist/app/rendering/render-text.d.ts

@@ -1,10 +1,13 @@
 import type { Theme } from "../../theme.js";
 import type { ToolStatusEntry } from "../types.js";
 export declare function sanitizeText(text: string): string;
+export declare function alertIconPrefixLength(text: string): number | undefined;
 export declare function normalizePastedTextForDuplicateKey(text: string): string;
 export declare function shortHash(text: string): string;
 export declare function hasLspDiagnosticsAfterMutation(output: string): boolean;
 export declare function hasToolLspDiagnosticsAfterMutation(entry: ToolStatusEntry): boolean;
+export declare function lspDiagnosticSeverityForLine(line: string): "error" | "warning" | "hint" | undefined;
+export declare function toolLspDiagnosticsAfterMutationSeverity(entry: ToolStatusEntry): "error" | "warning" | undefined;
 export declare function toolStatusIcon(entry: ToolStatusEntry): string;
 export declare function toolStatusIconColor(entry: ToolStatusEntry, colors: Theme["colors"]): string;
 export declare function wrapLine(text: string, width: number): string[];

package/dist/app/rendering/render-text.js

@@ -1,8 +1,16 @@
 import { createHash } from "node:crypto";
 import { expandTabs, padOrTrimDisplay, sliceByDisplayWidth, stringDisplayWidth, wrapDisplayLine } from "../../terminal-width.js";
 import { APP_ICONS } from "../icons.js";
+const LSP_DIAGNOSTIC_ICON = "\u{f0026}";
 export function sanitizeText(text) {
-    return expandTabs(text.replace(/⚠️?/gu, APP_ICONS.alert).replace(/\x1b/g, "␛").replace(/\r/g, ""));
+    return expandTabs(text.replace(/⚠️?|\u{f0026}/gu, APP_ICONS.alert).replace(/\x1b/g, "␛").replace(/\r/g, ""));
+}
+export function alertIconPrefixLength(text) {
+    if (text.startsWith(APP_ICONS.alert))
+        return APP_ICONS.alert.length;
+    if (text.startsWith(LSP_DIAGNOSTIC_ICON))
+        return LSP_DIAGNOSTIC_ICON.length;
+    return /^⚠️?/u.exec(text)?.[0].length;
 }
 export function normalizePastedTextForDuplicateKey(text) {
     return text.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
@@ -17,12 +25,49 @@ const LSP_DIAGNOSTIC_MUTATION_TOOLS = new Set(["apply_patch", "ast_apply"]);
 export function hasToolLspDiagnosticsAfterMutation(entry) {
     return LSP_DIAGNOSTIC_MUTATION_TOOLS.has(entry.toolName.toLowerCase()) && hasLspDiagnosticsAfterMutation(entry.output);
 }
+export function lspDiagnosticSeverityForLine(line) {
+    const counts = lspDiagnosticCounts(line);
+    const countSeverity = lspDiagnosticCountSeverity(counts);
+    if (countSeverity)
+        return countSeverity;
+    if (counts.length > 0)
+        return undefined;
+    const severityMatch = /(?:^|[^\p{L}\p{N}_])(?:diagnosticseverity\.)?(errors?|warnings?|warn|hints?)(?=$|[^\p{L}\p{N}_])/iu.exec(line);
+    const severity = severityMatch?.[1]?.toLowerCase();
+    if (!severity)
+        return undefined;
+    if (severity.startsWith("error"))
+        return "error";
+    if (severity.startsWith("warn"))
+        return "warning";
+    return "hint";
+}
+function lspDiagnosticCounts(line) {
+    return [...line.matchAll(/\b(\d+)\s+(errors?|warnings?|hints?)\b/giu)];
+}
+function lspDiagnosticCountSeverity(counts) {
+    for (const severity of ["error", "warning", "hint"]) {
+        if (counts.some((match) => Number(match[1]) > 0 && match[2]?.toLowerCase().startsWith(severity)))
+            return severity;
+    }
+    return undefined;
+}
+export function toolLspDiagnosticsAfterMutationSeverity(entry) {
+    if (!hasToolLspDiagnosticsAfterMutation(entry))
+        return undefined;
+    if (/\blsp\s+errors?\s+after\s+mutation\b/i.test(entry.output))
+        return "error";
+    const diagnosticLines = entry.output.split("\n").map((line) => line.trim());
+    if (diagnosticLines.some((line) => lspDiagnosticSeverityForLine(line) === "error"))
+        return "error";
+    return "warning";
+}
 export function toolStatusIcon(entry) {
     if (entry.status === "running")
         return APP_ICONS.timerSand;
     if (entry.isError)
         return APP_ICONS.closeCircle;
-    if (hasToolLspDiagnosticsAfterMutation(entry))
+    if (toolLspDiagnosticsAfterMutationSeverity(entry))
         return APP_ICONS.alert;
     return APP_ICONS.checkCircle;
 }
@@ -31,7 +76,10 @@ export function toolStatusIconColor(entry, colors) {
         return colors.muted;
     if (entry.isError)
         return colors.error;
-    if (hasToolLspDiagnosticsAfterMutation(entry))
+    const lspSeverity = toolLspDiagnosticsAfterMutationSeverity(entry);
+    if (lspSeverity === "error")
+        return colors.error;
+    if (lspSeverity === "warning")
         return colors.warning;
     return colors.success;
 }

package/dist/app/rendering/status-line-renderer.d.ts

@@ -1,6 +1,6 @@
 import type { AgentSession } from "@earendil-works/pi-coding-agent";
 import type { Theme } from "../../theme.js";
-import type { SessionActivity, StatusCompactToolsTarget, StatusContextTarget, StatusLineLayout, StatusModelTarget, StatusModelUsageTarget, StatusPromptEnhancerTarget, StatusSessionTarget, StatusTerminalBellSoundTarget, StatusThinkingExpandTarget, StatusThinkingTarget, StatusUserJumpTarget, StatusVoiceLanguageTarget, StatusVoiceMicTarget } from "../types.js";
+import type { SessionActivity, StatusCompactToolsTarget, StatusContextTarget, StatusDraftQueueTarget, StatusLineLayout, StatusModelTarget, StatusModelUsageTarget, StatusPromptEnhancerTarget, StatusSessionTarget, StatusTerminalBellSoundTarget, StatusThinkingExpandTarget, StatusThinkingTarget, StatusUserJumpTarget, StatusVoiceLanguageTarget, StatusVoiceMicTarget } from "../types.js";
 import type { ScreenStyler } from "../screen/screen-styler.js";
 import { type ModelColorsConfig } from "../../config.js";
 export type StatusLineRendererHost = {
@@ -26,6 +26,7 @@ export type StatusLineRendererHost = {
     terminalBellSoundStatusWidgetEnabled(): boolean;
     voiceStatusWidgetText(): string;
     voiceStatusWidgetActive(): boolean;
+    queueableInputActive?(): boolean;
     userMessageJumpMenuActive?(): boolean;
     allThinkingExpandedActive?(): boolean;
     superCompactToolsActive?(): boolean;
@@ -43,6 +44,7 @@ export declare class StatusLineRenderer {
     voiceMicTarget(layout: StatusLineLayout, row: number): StatusVoiceMicTarget | undefined;
     voiceLanguageTarget(layout: StatusLineLayout, row: number): StatusVoiceLanguageTarget | undefined;
     userJumpTarget(layout: StatusLineLayout, row: number): StatusUserJumpTarget | undefined;
+    draftQueueTarget(layout: StatusLineLayout, row: number): StatusDraftQueueTarget | undefined;
     thinkingExpandTarget(layout: StatusLineLayout, row: number): StatusThinkingExpandTarget | undefined;
     compactToolsTarget(layout: StatusLineLayout, row: number): StatusCompactToolsTarget | undefined;
     terminalBellSoundTarget(layout: StatusLineLayout, row: number): StatusTerminalBellSoundTarget | undefined;
@@ -50,6 +52,8 @@ export declare class StatusLineRenderer {
     private segments;
     private pushPromptEnhancerWidgetSegment;
     private pushUserJumpWidgetSegment;
+    private pushDraftQueueWidgetSegment;
+    private draftQueueWidgetText;
     private pushThinkingExpandWidgetSegment;
     private pushCompactToolsWidgetSegment;
     private pushTerminalBellSoundWidgetSegment;

package/dist/app/rendering/status-line-renderer.js

@@ -13,13 +13,15 @@ export class StatusLineRenderer {
         const contentWidth = Math.max(1, width);
         const left = 0;
         const statusDot = APP_ICONS.record;
+        const draftQueueButton = this.draftQueueWidgetText();
         const userJumpButton = APP_ICONS.user;
         const thinkingExpandButton = APP_ICONS.thinkingExpanded;
         const compactToolsButton = APP_ICONS.compactTools;
         const terminalBellSoundWidgetText = this.host.terminalBellSoundStatusWidgetText();
         const promptEnhancerWidgetText = this.host.promptEnhancerStatusWidgetText();
         const voiceWidgetText = this.host.voiceStatusWidgetText();
-        const rightWidgetText = [userJumpButton, terminalBellSoundWidgetText, thinkingExpandButton, compactToolsButton, promptEnhancerWidgetText, voiceWidgetText].filter((text) => text.length > 0).join(" ");
+        const rightWidgetParts = [draftQueueButton, promptEnhancerWidgetText, userJumpButton, terminalBellSoundWidgetText, thinkingExpandButton, compactToolsButton, voiceWidgetText];
+        const rightWidgetText = rightWidgetParts.filter((text) => text.length > 0).join(" ");
         const rightWidgetWidth = stringDisplayWidth(rightWidgetText);
         const leftWidth = rightWidgetWidth > 0 && contentWidth > rightWidgetWidth + 1 ? contentWidth - rightWidgetWidth - 1 : contentWidth;
         const baseStatus = this.host.currentStatus();
@@ -34,37 +36,54 @@ export class StatusLineRenderer {
         const innerText = leftWidth < contentWidth ? `${leftText} ${rightWidgetText}` : padOrTrimPlain(leftText, contentWidth);
         const text = padOrTrimPlain(innerText, width);
         let nextWidgetStartColumn = left + leftWidth + 2;
-        const userJumpWidget = leftWidth < contentWidth
-            ? this.widgetLayout(nextWidgetStartColumn, userJumpButton)
+        let draftQueueWidget = leftWidth < contentWidth && draftQueueButton.length > 0
+            ? this.widgetLayout(nextWidgetStartColumn, draftQueueButton)
             : undefined;
-        if (userJumpWidget)
-            nextWidgetStartColumn = userJumpWidget.endColumn + 1;
-        const terminalBellSoundWidget = leftWidth < contentWidth && terminalBellSoundWidgetText.length > 0
-            ? this.widgetLayout(nextWidgetStartColumn, terminalBellSoundWidgetText)
-            : undefined;
-        if (terminalBellSoundWidget)
-            nextWidgetStartColumn = terminalBellSoundWidget.endColumn + 1;
-        const thinkingExpandWidget = leftWidth < contentWidth
-            ? this.widgetLayout(nextWidgetStartColumn, thinkingExpandButton)
-            : undefined;
-        if (thinkingExpandWidget)
-            nextWidgetStartColumn = thinkingExpandWidget.endColumn + 1;
-        const compactToolsWidget = leftWidth < contentWidth
-            ? this.widgetLayout(nextWidgetStartColumn, compactToolsButton)
-            : undefined;
-        if (compactToolsWidget)
-            nextWidgetStartColumn = compactToolsWidget.endColumn + 1;
-        const promptEnhancerWidget = leftWidth < contentWidth && promptEnhancerWidgetText.length > 0
-            ? this.widgetLayout(nextWidgetStartColumn, promptEnhancerWidgetText)
-            : undefined;
-        if (promptEnhancerWidget)
-            nextWidgetStartColumn = promptEnhancerWidget.endColumn + 1;
+        if (draftQueueWidget)
+            nextWidgetStartColumn = draftQueueWidget.endColumn + 1;
+        let promptEnhancerWidget;
+        let userJumpWidget;
+        let terminalBellSoundWidget;
+        let thinkingExpandWidget;
+        let compactToolsWidget;
+        const appendPromptEnhancerWidget = () => {
+            promptEnhancerWidget = leftWidth < contentWidth && promptEnhancerWidgetText.length > 0
+                ? this.widgetLayout(nextWidgetStartColumn, promptEnhancerWidgetText)
+                : undefined;
+            if (promptEnhancerWidget)
+                nextWidgetStartColumn = promptEnhancerWidget.endColumn + 1;
+        };
+        const appendCoreStatusWidgets = () => {
+            userJumpWidget = leftWidth < contentWidth
+                ? this.widgetLayout(nextWidgetStartColumn, userJumpButton)
+                : undefined;
+            if (userJumpWidget)
+                nextWidgetStartColumn = userJumpWidget.endColumn + 1;
+            terminalBellSoundWidget = leftWidth < contentWidth && terminalBellSoundWidgetText.length > 0
+                ? this.widgetLayout(nextWidgetStartColumn, terminalBellSoundWidgetText)
+                : undefined;
+            if (terminalBellSoundWidget)
+                nextWidgetStartColumn = terminalBellSoundWidget.endColumn + 1;
+            thinkingExpandWidget = leftWidth < contentWidth
+                ? this.widgetLayout(nextWidgetStartColumn, thinkingExpandButton)
+                : undefined;
+            if (thinkingExpandWidget)
+                nextWidgetStartColumn = thinkingExpandWidget.endColumn + 1;
+            compactToolsWidget = leftWidth < contentWidth
+                ? this.widgetLayout(nextWidgetStartColumn, compactToolsButton)
+                : undefined;
+            if (compactToolsWidget)
+                nextWidgetStartColumn = compactToolsWidget.endColumn + 1;
+        };
+        appendPromptEnhancerWidget();
+        appendCoreStatusWidgets();
         const voiceWidget = leftWidth < contentWidth && voiceWidgetText.length > 0 ? this.voiceWidgetLayout(nextWidgetStartColumn, voiceWidgetText) : undefined;
         return {
             details,
             text,
             sessionLabel,
             workspaceLabel,
+            ...(draftQueueWidget ? { draftQueueWidget } : {}),
             ...(userJumpWidget ? { userJumpWidget } : {}),
             ...(thinkingExpandWidget ? { thinkingExpandWidget } : {}),
             ...(compactToolsWidget ? { compactToolsWidget } : {}),
@@ -157,6 +176,12 @@ export class StatusLineRenderer {
             return undefined;
         return { row, startColumn: widget.startColumn, endColumn: widget.endColumn };
     }
+    draftQueueTarget(layout, row) {
+        const widget = layout.draftQueueWidget;
+        if (!widget)
+            return undefined;
+        return { row, startColumn: widget.startColumn, endColumn: widget.endColumn };
+    }
     thinkingExpandTarget(layout, row) {
         const widget = layout.thinkingExpandWidget;
         if (!widget)
@@ -195,6 +220,7 @@ export class StatusLineRenderer {
                 end: statusDotStart + APP_ICONS.record.length,
                 foreground: this.statusDotColor(),
             }] : [];
+        this.pushDraftQueueWidgetSegment(segments, statusText);
         this.pushUserJumpWidgetSegment(segments, statusText);
         this.pushThinkingExpandWidgetSegment(segments, statusText);
         this.pushCompactToolsWidgetSegment(segments, statusText);
@@ -248,6 +274,16 @@ export class StatusLineRenderer {
             : this.host.theme.colors.muted;
         this.pushSegment(segments, start, buttonText.length, foreground);
     }
+    pushDraftQueueWidgetSegment(segments, statusText) {
+        const buttonText = this.draftQueueWidgetText();
+        const start = statusText.indexOf(buttonText);
+        if (start < 0 || buttonText.length <= 0)
+            return;
+        this.pushSegment(segments, start, buttonText.length, this.host.theme.colors.info);
+    }
+    draftQueueWidgetText() {
+        return this.host.queueableInputActive?.() ? APP_ICONS.timerSand : "";
+    }
     pushThinkingExpandWidgetSegment(segments, statusText) {
         const buttonText = APP_ICONS.thinkingExpanded;
         const start = statusText.indexOf(buttonText);

package/dist/app/rendering/toast-renderer.js

@@ -64,11 +64,9 @@ function renderDialogToastOverlay(state, width, maxRows, theme, rowOffset) {
     if (maxRows <= 0 || width <= 0)
         return [];
     const maxDialogWidth = Math.max(1, Math.min(width - 4, 72));
-    const icon = toastKindIcon(state.kind);
     const closeLabel = `[${APP_ICONS.close}]`;
     const wrappedLines = dialogMessageLines(state.message, Math.max(1, maxDialogWidth - 4));
-    const title = `${icon} Dialog`;
-    const requiredWidth = Math.max(16, stringDisplayWidth(` ${title} ${closeLabel} `) + 2, ...wrappedLines.map((line) => stringDisplayWidth(line) + 4));
+    const requiredWidth = Math.max(16, stringDisplayWidth(closeLabel) + 4, ...wrappedLines.map((line) => stringDisplayWidth(line) + 4));
     const dialogWidth = Math.min(maxDialogWidth, Math.max(16, requiredWidth));
     const bodyWidth = Math.max(1, dialogWidth - 4);
     const bodyLines = dialogMessageLines(state.message, bodyWidth);
@@ -76,14 +74,14 @@ function renderDialogToastOverlay(state, width, maxRows, theme, rowOffset) {
     const visibleBodyLines = bodyLines.slice(0, bodyRows);
     const includeBottom = maxRows > 1;
     const dialogRows = [
-        dialogTopLine(title, closeLabel, dialogWidth),
+        dialogTopLine(closeLabel, dialogWidth),
         ...visibleBodyLines.map((line) => `│ ${padOrTrimPlain(line, bodyWidth)} │`),
         ...(includeBottom ? [`╰${"─".repeat(Math.max(0, dialogWidth - 2))}╯`] : []),
     ].slice(0, maxRows);
     const leftWidth = Math.max(0, width - dialogWidth - 2);
     const column = leftWidth + 1;
     const style = toastKindStyle(state.kind, theme);
-    const closeStartColumn = column + 1 + dialogTopCloseOffset(title, closeLabel, dialogWidth);
+    const closeStartColumn = column + 1 + dialogTopCloseOffset(closeLabel, dialogWidth);
     const closeEndColumn = closeStartColumn + stringDisplayWidth(closeLabel);
     return dialogRows.map((text, index) => ({
         id: state.id,
@@ -101,18 +99,17 @@ function dialogMessageLines(message, maxWidth) {
     const lines = sanitizeText(message).split("\n").flatMap((line) => wrapDisplayLine(line, safeMaxWidth));
     return lines.length > 0 ? lines : [""];
 }
-function dialogTopLine(title, closeLabel, width) {
+function dialogTopLine(closeLabel, width) {
     const innerWidth = Math.max(0, width - 2);
-    const closeOffset = dialogTopCloseOffset(title, closeLabel, width);
-    const leftLabel = ` ${title} `;
-    const spacer = " ".repeat(Math.max(0, closeOffset - stringDisplayWidth(leftLabel)));
-    return `╭${padOrTrimPlain(`${leftLabel}${spacer}${closeLabel} `, innerWidth)}╮`;
+    const closeOffset = dialogTopCloseOffset(closeLabel, width);
+    const closeWidth = stringDisplayWidth(closeLabel);
+    const rightWidth = Math.max(0, innerWidth - closeOffset - closeWidth);
+    return `╭${"─".repeat(closeOffset)}${padOrTrimPlain(closeLabel, Math.min(closeWidth, innerWidth - closeOffset))}${"─".repeat(rightWidth)}╮`;
 }
-function dialogTopCloseOffset(title, closeLabel, width) {
+function dialogTopCloseOffset(closeLabel, width) {
     const innerWidth = Math.max(0, width - 2);
-    const leftLabel = ` ${title} `;
     const closeWidth = stringDisplayWidth(closeLabel);
-    return Math.max(stringDisplayWidth(leftLabel), innerWidth - closeWidth - 1);
+    return Math.max(0, innerWidth - closeWidth - 1);
 }
 function toastKindIcon(kind) {
     switch (kind) {

package/dist/app/rendering/tool-block-renderer.d.ts

@@ -6,6 +6,7 @@ import type { ToolBodyLineStyle, ToolHeaderSegment } from "../../tool-renderers/
 export type ToolBlockEntry = {
     id: string;
     toolName: string;
+    headerLabel?: string | undefined;
     headerArgs?: string | undefined;
     headerArgsSegments?: readonly ToolHeaderSegment[] | undefined;
     bodyLineStyles?: readonly ToolBodyLineStyle[] | undefined;

package/dist/app/rendering/tool-block-renderer.js

@@ -1,16 +1,17 @@
 import { resolveColor } from "../../config.js";
 import { expandTabs, sliceByDisplayWidth, stringDisplayWidth, wrapDisplayLineByWords } from "../../terminal-width.js";
-import { hasToolLspDiagnosticsAfterMutation, sanitizeText, toolStatusIcon, toolStatusIconColor, wrapLine } from "./render-text.js";
-const TRUNCATED_PREVIEW_MARKER = "… ";
+import { alertIconPrefixLength, hasToolLspDiagnosticsAfterMutation, lspDiagnosticSeverityForLine, sanitizeText, toolStatusIcon, toolStatusIconColor, wrapLine } from "./render-text.js";
+const TRUNCATED_PREVIEW_MARKER = "▶ ";
 export function renderToolBlock(entry, rule, width, colors, options = {}) {
     if (rule.hidden)
         return [];
     const hasLspDiagnostics = hasToolLspDiagnosticsAfterMutation(entry);
-    const expanded = entry.expanded && !options.superCompact;
+    const expanded = entry.expanded;
     const stateIcon = toolStatusIcon(entry);
     const toolColor = resolveColor(rule.color, colors);
     const toolOutputColor = colors.statusForeground;
-    const headerPrefix = `${stateIcon} ${entry.toolName}`;
+    const headerLabel = entry.headerLabel ?? entry.toolName;
+    const headerPrefix = headerLabel ? `${stateIcon} ${headerLabel}` : stateIcon;
     const headerArgs = formatToolHeaderArgs(entry.headerArgs);
     const headerArgsWidth = width - stringDisplayWidth(headerPrefix) - 1;
     const clippedHeaderArgs = headerArgsWidth > 0 ? sliceByDisplayWidth(headerArgs, headerArgsWidth) : "";
@@ -31,7 +32,7 @@ export function renderToolBlock(entry, rule, width, colors, options = {}) {
         headerLines.push(...renderToolBodyLines(entry.expandedText, width, target, toolOutputColor, entry.bodyStyle, colors, entry.syntaxHighlight, entry.bodyWrap, hasLspDiagnostics, entry.bodyLineStyles, entry.preserveAnsi));
         return headerLines;
     }
-    if (rule.compactHidden || rule.defaultExpanded === true)
+    if (rule.compactHidden || (rule.defaultExpanded === true && !options.superCompact))
         return headerLines;
     const body = entry.collapsedBody.trimEnd();
     if (!body || rule.previewLines === 0)
@@ -111,7 +112,10 @@ function renderToolBodyLines(text, width, target, color, style, colors, syntaxHi
                     segment.bold = diffStyle.bold;
                 line.segments = [segment];
             }
-            else if (lspDiagnosticStyle) {
+            else if (lspDiagnosticStyle?.kind === "alert" && wrapIndex === 0) {
+                line.segments = [{ start: 2, end: 2 + lspDiagnosticStyle.length, foreground: colors.warning, bold: true }];
+            }
+            else if (lspDiagnosticStyle?.kind === "severity") {
                 line.segments = [{ start: 2, end: line.text.length, foreground: lspDiagnosticStyle.foreground }];
             }
             else if (bodyLineStyle && line.text.length > 2) {
@@ -348,37 +352,16 @@ function bodyLineStyleForLine(styles, lineIndex, colors) {
     return resolvedForeground ? { ...segment, foreground: resolvedForeground } : segment;
 }
 function lspDiagnosticLineStyle(line, colors) {
+    const alertLength = alertIconPrefixLength(line);
+    if (alertLength != null)
+        return { kind: "alert", length: alertLength };
     const severity = lspDiagnosticSeverityForLine(line);
     if (severity === "error")
-        return { foreground: colors.error };
+        return { kind: "severity", foreground: colors.error };
     if (severity === "warning")
-        return { foreground: colors.warning };
+        return { kind: "severity", foreground: colors.warning };
     if (severity === "hint")
-        return { foreground: colors.muted };
-    return undefined;
-}
-function lspDiagnosticSeverityForLine(line) {
-    const countSeverity = lspDiagnosticCountSeverity(line);
-    if (countSeverity)
-        return countSeverity;
-    const severityMatch = /(?:^|[^\p{L}\p{N}_])(?:diagnosticseverity\.)?(errors?|warnings?|warn|hints?)(?=$|[^\p{L}\p{N}_])/iu.exec(line);
-    const severity = severityMatch?.[1]?.toLowerCase();
-    if (!severity)
-        return undefined;
-    if (severity.startsWith("error"))
-        return "error";
-    if (severity.startsWith("warn"))
-        return "warning";
-    return "hint";
-}
-function lspDiagnosticCountSeverity(line) {
-    const counts = [...line.matchAll(/\b(\d+)\s+(errors?|warnings?|hints?)\b/giu)];
-    if (counts.length === 0)
-        return undefined;
-    for (const severity of ["error", "warning", "hint"]) {
-        if (counts.some((match) => Number(match[1]) > 0 && match[2]?.toLowerCase().startsWith(severity)))
-            return severity;
-    }
+        return { kind: "severity", foreground: colors.muted };
     return undefined;
 }
 function syntaxHighlightForLine(highlights, lineIndex) {

package/dist/app/runtime.d.ts

@@ -1,4 +1,5 @@
-import { type EventBus, type AgentSessionRuntime, type LoadExtensionsResult } from "@earendil-works/pi-coding-agent";
+import { SessionManager, type EventBus, type AgentSessionRuntime, type LoadExtensionsResult, type SessionEntry } from "@earendil-works/pi-coding-agent";
+import { type PixConfig } from "../config.js";
 import type { AppOptions } from "./types.js";
 export type PiToolsSuiteInstallAction = "installed" | "already-installed" | "existing-kept" | "missing-source";
 export type PiToolsSuiteInstallResult = {
@@ -36,4 +37,8 @@ export declare function prioritizeBundledQuestionExtension(base: LoadExtensionsR
 export type CreatePixRuntimeOptions = {
     eventBus?: EventBus;
 };
+type RuntimeSessionManagerModelState = Pick<SessionManager, "getEntries" | "getBranch">;
+export declare function resolvePixRuntimeModelRef(options: Pick<AppOptions, "modelRef">, sessionManager: RuntimeSessionManagerModelState, config?: PixConfig): string | undefined;
+export declare function resolveSessionModelRefFromTail(entries: readonly SessionEntry[]): string | undefined;
 export declare function createPixRuntime(options: AppOptions, runtimeOptions?: CreatePixRuntimeOptions): Promise<AgentSessionRuntime>;
+export {};

package/dist/app/runtime.js

@@ -4,8 +4,9 @@ import { homedir } from "node:os";
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { createAgentSessionFromServices, createAgentSessionRuntime, createAgentSessionServices, getAgentDir, SessionManager, } from "@earendil-works/pi-coding-agent";
+import { loadPixConfig, resolveDefaultModelRef } from "../config.js";
 import { PI_FAVORITE_MODEL_REFS } from "./constants.js";
-import { parseModelRef, parseScopedModelRef } from "./model/model-ref.js";
+import { isThinkingLevel, parseModelRef, parseScopedModelRef } from "./model/model-ref.js";
 const BUNDLED_QUESTION_EXTENSION_NAME = "question";
 const PI_TOOLS_SUITE_EXTENSION_NAME = "pi-tools-suite";
 const BUNDLED_EXTENSIONS_DIR = resolve(dirname(fileURLToPath(import.meta.url)), "../..", "extensions");
@@ -131,10 +132,42 @@ function isBundledQuestionConflict(error, bundledExtensionPaths) {
     }
     return false;
 }
+export function resolvePixRuntimeModelRef(options, sessionManager, config = loadPixConfig()) {
+    if (options.modelRef)
+        return options.modelRef;
+    const existingEntryCount = sessionManager.getEntries().length;
+    if (existingEntryCount > 0)
+        return resolveSessionModelRefFromTail(sessionManager.getBranch());
+    return resolveDefaultModelRef(config);
+}
+export function resolveSessionModelRefFromTail(entries) {
+    let modelRef;
+    let thinkingLevel;
+    for (let index = entries.length - 1; index >= 0 && (modelRef === undefined || thinkingLevel === undefined); index--) {
+        const entry = entries[index];
+        if (!entry)
+            continue;
+        if (thinkingLevel === undefined && entry.type === "thinking_level_change" && isThinkingLevel(entry.thinkingLevel)) {
+            thinkingLevel = entry.thinkingLevel;
+        }
+        if (modelRef !== undefined)
+            continue;
+        if (entry.type === "model_change") {
+            modelRef = `${entry.provider}/${entry.modelId}`;
+        }
+        else if (entry.type === "message" && entry.message.role === "assistant") {
+            modelRef = `${entry.message.provider}/${entry.message.model}`;
+        }
+    }
+    if (!modelRef)
+        return undefined;
+    return thinkingLevel ? `${modelRef}:${thinkingLevel}` : modelRef;
+}
 export async function createPixRuntime(options, runtimeOptions = {}) {
-    const parsedModel = options.modelRef ? parseModelRef(options.modelRef) : undefined;
     const agentDir = getAgentDir();
     const createRuntime = async ({ cwd, sessionManager, sessionStartEvent }) => {
+        const effectiveModelRef = resolvePixRuntimeModelRef(options, sessionManager);
+        const parsedModel = effectiveModelRef ? parseModelRef(effectiveModelRef) : undefined;
         await ensureBundledSkillsInstalled();
         await ensurePiToolsSuiteExtensionInstalled({ agentDir });
         const bundledExtensionPaths = getBundledExtensionPaths();