pi-ui-extend 0.1.50 → 0.1.53

package/dist/app/icons.d.ts

@@ -12,6 +12,7 @@ declare const NERD_FONT_ICONS: {
     readonly deleted: "󰅙";
     readonly deferred: "󰍷";
     readonly info: "󰋼";
+    readonly fork: "└";
     readonly lightbulb: "󰌵";
     readonly microphone: "󰍬";
     readonly plus: "󰐕";

package/dist/app/icons.js

@@ -23,6 +23,7 @@ const NERD_FONT_ICONS = {
     deleted: "\u{f0159}",
     deferred: "\u{f0377}",
     info: "\u{f02fc}",
+    fork: "└",
     lightbulb: "\u{f0335}",
     microphone: "\u{f036c}",
     plus: "\u{f0415}",
@@ -54,6 +55,7 @@ const FALLBACK_ICONS = {
     deleted: "×",
     deferred: "↷",
     info: "i",
+    fork: "└",
     lightbulb: "💡",
     microphone: "m",
     plus: "+",

package/dist/app/input/autocomplete-controller.js

@@ -1,4 +1,4 @@
-import { streamSimple } from "@earendil-works/pi-ai";
+import { streamSimple } from "@earendil-works/pi-ai/compat";
 import { isRecord } from "../guards.js";
 import { parseModelRef } from "../model/model-ref.js";
 const AUTOCOMPLETE_DEBOUNCE_MS = 350;

package/dist/app/input/input-controller.d.ts

@@ -51,6 +51,7 @@ export declare class AppInputController {
     private consumeEscapeKeySequence;
     private consumeClipboardImagePasteSequence;
     private consumeShiftEnterSequence;
+    private consumeModifiedKeySequence;
     private consumeTerminalInterruptSequence;
     private handleArrowUp;
     private handleArrowDown;

package/dist/app/input/input-controller.js

@@ -341,42 +341,25 @@ export class AppInputController {
         return "consumed";
     }
     consumeEscapeKeySequence() {
-        const result = parseTerminalModifiedKeySequence(this.inputBuffer);
-        if (result.kind === "pending")
-            return "pending";
-        if (result.kind === "none")
-            return "none";
-        if (!terminalKeyIsEscape(result.key))
-            return "none";
-        this.inputBuffer = this.inputBuffer.slice(result.key.length);
-        if (!terminalKeyShouldIgnore(result.key))
-            void this.host.handleEscape();
-        return "consumed";
+        return this.consumeModifiedKeySequence(terminalKeyIsEscape, () => { void this.host.handleEscape(); });
     }
     consumeClipboardImagePasteSequence() {
-        const result = parseTerminalModifiedKeySequence(this.inputBuffer);
-        if (result.kind === "pending")
-            return "pending";
-        if (result.kind === "none")
-            return "none";
-        if (!terminalKeyIsClipboardImagePaste(result.key))
-            return "none";
-        this.inputBuffer = this.inputBuffer.slice(result.key.length);
-        if (!terminalKeyShouldIgnore(result.key))
-            void this.pasteHandler.handleClipboardImagePaste();
-        return "consumed";
+        return this.consumeModifiedKeySequence(terminalKeyIsClipboardImagePaste, () => { void this.pasteHandler.handleClipboardImagePaste(); });
     }
     consumeShiftEnterSequence() {
+        return this.consumeModifiedKeySequence(terminalKeyIsShiftEnter, () => this.insertInputNewline());
+    }
+    consumeModifiedKeySequence(matches, handle) {
         const result = parseTerminalModifiedKeySequence(this.inputBuffer);
         if (result.kind === "pending")
             return "pending";
         if (result.kind === "none")
             return "none";
-        if (!terminalKeyIsShiftEnter(result.key))
+        if (!matches(result.key))
             return "none";
         this.inputBuffer = this.inputBuffer.slice(result.key.length);
         if (!terminalKeyShouldIgnore(result.key))
-            this.insertInputNewline();
+            handle();
         return "consumed";
     }
     consumeTerminalInterruptSequence() {

package/dist/app/input/input-paste-handler.d.ts

@@ -20,6 +20,7 @@ export declare class InputPasteHandler {
     private plainPasteFilePath;
     private isDuplicatePaste;
     private handlePasteEnd;
+    private handlePastedFilePath;
     private schedulePastedText;
     private handleFilePaste;
     private filePathForInput;

package/dist/app/input/input-paste-handler.js

@@ -14,15 +14,8 @@ export class InputPasteHandler {
         this.host = host;
     }
     handlePlainData(data) {
-        const plainFilePath = !this.host.inputEditor.isInBracketedPaste && this.plainPasteFilePath(data);
-        if (plainFilePath) {
-            if (isImagePath(plainFilePath) && Date.now() < this.suppressImagePathPasteUntil) {
-                this.host.render();
-                return true;
-            }
-            void this.handleFilePaste(plainFilePath);
+        if (!this.host.inputEditor.isInBracketedPaste && this.handlePastedFilePath(data))
             return true;
-        }
         if (!this.host.inputEditor.isInBracketedPaste && this.isPlainMultilinePasteChunk(data)) {
             this.schedulePastedText(data);
             return true;
@@ -96,17 +89,21 @@ export class InputPasteHandler {
             void this.handleClipboardImagePaste();
             return;
         }
-        const filePath = this.plainPasteFilePath(text);
-        if (filePath) {
-            if (isImagePath(filePath) && Date.now() < this.suppressImagePathPasteUntil) {
-                this.host.render();
-                return;
-            }
-            void this.handleFilePaste(filePath);
+        if (this.handlePastedFilePath(text))
             return;
-        }
         this.schedulePastedText(text);
     }
+    handlePastedFilePath(text) {
+        const filePath = this.plainPasteFilePath(text);
+        if (!filePath)
+            return false;
+        if (isImagePath(filePath) && Date.now() < this.suppressImagePathPasteUntil) {
+            this.host.render();
+            return true;
+        }
+        void this.handleFilePaste(filePath);
+        return true;
+    }
     schedulePastedText(text) {
         const timer = setTimeout(() => {
             if (this.isDuplicatePaste("text", text)) {

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

@@ -31,6 +31,7 @@ export function renderConversationToolEntry(entry, width, options) {
         id: entry.id,
         toolName,
         headerArgs: display.headerArgs,
+        headerArgSegments: display.headerArgSegments,
         bodyLineStyles: display.bodyLineStyles,
         bodyStyle: display.bodyStyle,
         preserveAnsi: display.preserveAnsi,

package/dist/app/rendering/popup-menu-renderer.js

@@ -1,7 +1,7 @@
 import { colorLine } from "../../theme.js";
 import { stringDisplayWidth } from "../../terminal-width.js";
 import { resolveColor, resolveModelColor } from "../../config.js";
-import { SLASH_COMMAND_DESCRIPTION_COLUMN, } from "../constants.js";
+import { SLASH_COMMAND_DESCRIPTION_COLUMN, THINKING_LEVELS, } from "../constants.js";
 import { APP_ICONS } from "../icons.js";
 import { ellipsizeDisplay, padOrTrimPlain, sanitizeText } from "./render-text.js";
 import { modelProviderThemeColor, thinkingLevelThemeColor } from "./status-line-renderer.js";
@@ -287,7 +287,7 @@ export class PopupMenuRenderer {
     }
     availableThinkingLevels() {
         const levels = this.host.session?.getAvailableThinkingLevels();
-        return Array.isArray(levels) && levels.length > 0 ? levels.map(String) : ["off", "minimal", "low", "medium", "high", "xhigh"];
+        return Array.isArray(levels) && levels.length > 0 ? levels.map(String) : [...THINKING_LEVELS];
     }
     queueMessageItemVariant(value) {
         return value === "cancel" ? "error" : "normal";

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

@@ -263,27 +263,21 @@ export class AppRenderController {
         return `\x1b[${flash.y};${flash.startColumn}H\x1b[7m${text}${ANSI_RESET}`;
     }
     updateStatusMouseState(statusLayout, statusRow) {
-        const widgetLayout = statusLayout;
-        const widgetRow = statusRow;
         this.deps.mouseController.statusModelTarget = this.deps.statusLineRenderer.modelTarget(statusLayout.text, statusRow);
         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);
-        if (widgetLayout) {
-            this.deps.mouseController.statusDraftQueueTarget = this.deps.statusLineRenderer.draftQueueTarget?.(widgetLayout, widgetRow);
-            this.deps.mouseController.statusUserJumpTarget = this.deps.statusLineRenderer.userJumpTarget?.(widgetLayout, widgetRow);
-            this.deps.mouseController.statusThinkingExpandTarget = this.deps.statusLineRenderer.thinkingExpandTarget?.(widgetLayout, widgetRow);
-            this.deps.mouseController.statusCompactToolsTarget = this.deps.statusLineRenderer.compactToolsTarget?.(widgetLayout, widgetRow);
-            this.deps.mouseController.statusQuickScrollUpTarget = this.deps.statusLineRenderer.quickScrollUpTarget?.(widgetLayout, widgetRow);
-            this.deps.mouseController.statusQuickScrollDownTarget = this.deps.statusLineRenderer.quickScrollDownTarget?.(widgetLayout, widgetRow);
-            this.deps.mouseController.statusTerminalBellSoundTarget = this.deps.statusLineRenderer.terminalBellSoundTarget?.(widgetLayout, widgetRow);
-        }
+        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);
+        this.deps.mouseController.statusQuickScrollUpTarget = this.deps.statusLineRenderer.quickScrollUpTarget?.(statusLayout, statusRow);
+        this.deps.mouseController.statusQuickScrollDownTarget = this.deps.statusLineRenderer.quickScrollDownTarget?.(statusLayout, statusRow);
+        this.deps.mouseController.statusTerminalBellSoundTarget = this.deps.statusLineRenderer.terminalBellSoundTarget?.(statusLayout, statusRow);
         this.deps.mouseController.statusSessionTarget = this.deps.statusLineRenderer.sessionTarget(statusLayout.text, statusRow, statusLayout.sessionLabel, statusLayout.workspaceLabel);
-        if (widgetLayout) {
-            this.deps.mouseController.statusPromptEnhancerTarget = this.deps.statusLineRenderer.promptEnhancerTarget(widgetLayout, widgetRow);
-            this.deps.mouseController.statusVoiceMicTarget = this.deps.statusLineRenderer.voiceMicTarget(widgetLayout, widgetRow);
-            this.deps.mouseController.statusVoiceLanguageTarget = this.deps.statusLineRenderer.voiceLanguageTarget(widgetLayout, widgetRow);
-        }
+        this.deps.mouseController.statusPromptEnhancerTarget = this.deps.statusLineRenderer.promptEnhancerTarget(statusLayout, statusRow);
+        this.deps.mouseController.statusVoiceMicTarget = this.deps.statusLineRenderer.voiceMicTarget(statusLayout, statusRow);
+        this.deps.mouseController.statusVoiceLanguageTarget = this.deps.statusLineRenderer.voiceLanguageTarget(statusLayout, statusRow);
         this.deps.mouseController.renderedRowTexts.set(statusRow, statusLayout.text);
     }
     renderVoiceProgressOverlay(message, width, rows) {

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

@@ -61,14 +61,7 @@ export declare class StatusLineRenderer {
     private segments;
     private fitWorkspaceLabel;
     private pushStatusWidgetSegments;
-    private pushPromptEnhancerWidgetSegment;
-    private pushUserJumpWidgetSegment;
-    private pushDraftQueueWidgetSegment;
     private draftQueueWidgetText;
-    private pushThinkingExpandWidgetSegment;
-    private pushCompactToolsWidgetSegment;
-    private pushTerminalBellSoundWidgetSegment;
-    private pushVoiceWidgetSegment;
     private pushWorkspaceSegments;
     private pushModelUsageSegments;
     private pushResetDurationSegments;

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

@@ -1,10 +1,12 @@
 import { compactProgressBarSegments, formatCompactProgressBar } from "../../context-progress-bar.js";
 import { ellipsizeDisplay, padOrTrimPlain } from "./render-text.js";
 import { displayIndexForColumn, stringDisplayWidth } from "../../terminal-width.js";
+import { THINKING_LEVELS } from "../constants.js";
 import { APP_ICONS } from "../icons.js";
 import { resolveColor, resolveModelColor } from "../../config.js";
 const MODEL_USAGE_PROGRESS_BAR_WIDTH = stringDisplayWidth(formatCompactProgressBar(100));
 const STATUS_WIDGET_GAP = " ";
+const DEFAULT_THINKING_LEVEL_LABELS = THINKING_LEVELS;
 export class StatusLineRenderer {
     host;
     constructor(host) {
@@ -370,81 +372,9 @@ export class StatusLineRenderer {
             }
         }
     }
-    pushPromptEnhancerWidgetSegment(segments, statusText) {
-        const widgetText = this.host.promptEnhancerStatusWidgetText();
-        const start = statusText.lastIndexOf(widgetText);
-        if (start < 0 || widgetText.length <= 0)
-            return;
-        const foreground = this.host.promptEnhancerStatusWidgetActive()
-            ? this.host.theme.colors.warning
-            : this.host.promptEnhancerStatusWidgetEnabled()
-                ? this.host.theme.colors.info
-                : this.host.theme.colors.muted;
-        this.pushSegment(segments, start, widgetText.length, foreground);
-    }
-    pushUserJumpWidgetSegment(segments, statusText) {
-        const buttonText = APP_ICONS.user;
-        const start = statusText.indexOf(buttonText);
-        if (start < 0)
-            return;
-        const foreground = this.host.userMessageJumpMenuActive?.()
-            ? this.host.theme.colors.info
-            : 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, layout) {
-        if (!layout.thinkingExpandWidget)
-            return;
-        const buttonText = APP_ICONS.thinkingExpanded;
-        const buttonMarker = ` ${buttonText} `;
-        const markerStart = statusText.indexOf(buttonMarker);
-        const start = markerStart >= 0 ? markerStart + 1 : -1;
-        if (start < 0)
-            return;
-        this.pushSegment(segments, start, buttonText.length, this.host.allThinkingExpandedActive?.() ? this.host.theme.colors.info : this.host.theme.colors.muted);
-    }
-    pushCompactToolsWidgetSegment(segments, statusText) {
-        const buttonText = APP_ICONS.compactTools;
-        const start = statusText.indexOf(buttonText);
-        if (start < 0)
-            return;
-        this.pushSegment(segments, start, buttonText.length, this.host.superCompactToolsActive?.() ? this.host.theme.colors.info : this.host.theme.colors.muted);
-    }
-    pushTerminalBellSoundWidgetSegment(segments, statusText) {
-        const widgetText = this.host.terminalBellSoundStatusWidgetText();
-        const start = statusText.lastIndexOf(widgetText);
-        if (start < 0 || widgetText.length <= 0)
-            return;
-        this.pushSegment(segments, start, widgetText.length, this.host.terminalBellSoundStatusWidgetEnabled() ? this.host.theme.colors.info : this.host.theme.colors.muted);
-    }
-    pushVoiceWidgetSegment(segments, statusText) {
-        const widgetText = this.host.voiceStatusWidgetText();
-        if (widgetText.length <= 0)
-            return;
-        const start = statusText.lastIndexOf(widgetText);
-        const micStart = statusText.lastIndexOf(APP_ICONS.microphone);
-        if (start < 0 && micStart < 0)
-            return;
-        if (this.host.voiceStatusWidgetActive()) {
-            const separatorIndex = widgetText.indexOf(" ");
-            const micLength = separatorIndex >= 0 ? separatorIndex : widgetText.length;
-            this.pushSegment(segments, micStart >= 0 ? micStart : start, micLength, this.host.theme.colors.error);
-            return;
-        }
-        const separatorIndex = widgetText.indexOf(" ");
-        const micLength = separatorIndex >= 0 ? separatorIndex : widgetText.length;
-        this.pushSegment(segments, micStart >= 0 ? micStart : start, micLength, this.host.theme.colors.muted);
-    }
     pushWorkspaceSegments(segments, statusText, workspaceLabel) {
         const start = statusText.lastIndexOf(workspaceLabel);
         if (start < 0 || workspaceLabel.length <= 0)
@@ -566,7 +496,7 @@ export class StatusLineRenderer {
     }
     availableThinkingLevels() {
         const levels = this.host.session?.getAvailableThinkingLevels();
-        return Array.isArray(levels) && levels.length > 0 ? levels.map(String) : ["off", "minimal", "low", "medium", "high", "xhigh"];
+        return Array.isArray(levels) && levels.length > 0 ? levels.map(String) : [...DEFAULT_THINKING_LEVEL_LABELS];
     }
     contextBarLabel(status, width, workspaceLabel) {
         const session = this.host.session;
@@ -651,14 +581,13 @@ function overlayText(text, startColumn, overlay) {
     return `${padded.slice(0, startIndex)}${overlay}${padded.slice(endIndex)}`;
 }
 export function thinkingLevelThemeColor(label, colors, availableLevels) {
-    const levels = availableLevels && availableLevels.length > 0 ? availableLevels.map(String) : ["off", "minimal", "low", "medium", "high", "xhigh"];
+    const levels = availableLevels && availableLevels.length > 0 ? availableLevels.map(String) : DEFAULT_THINKING_LEVEL_LABELS;
     const rank = levels.indexOf(label);
     if (rank >= 0)
         return thinkingRankThemeColor(label, rank, levels.length, colors);
-    const fallbackLevels = ["off", "minimal", "low", "medium", "high", "xhigh"];
-    const fallbackRank = fallbackLevels.indexOf(label);
+    const fallbackRank = DEFAULT_THINKING_LEVEL_LABELS.indexOf(label);
     return fallbackRank >= 0
-        ? thinkingRankThemeColor(label, fallbackRank, fallbackLevels.length, colors)
+        ? thinkingRankThemeColor(label, fallbackRank, DEFAULT_THINKING_LEVEL_LABELS.length, colors)
         : colors.info;
 }
 function thinkingRankThemeColor(label, rank, count, colors) {
@@ -671,8 +600,7 @@ function thinkingRankThemeColor(label, rank, count, colors) {
         colors.thinkingXHigh,
     ];
     const palette = count > baseColors.length ? [colors.statusForeground, ...baseColors] : baseColors;
-    const fallbackLevels = ["off", "minimal", "low", "medium", "high", "xhigh"];
-    const fallbackRank = fallbackLevels.indexOf(label);
+    const fallbackRank = DEFAULT_THINKING_LEVEL_LABELS.indexOf(label);
     const colorIndex = count <= baseColors.length && fallbackRank >= 0 ? fallbackRank : rank;
     return palette[Math.max(0, Math.min(palette.length - 1, colorIndex))] ?? colors.info;
 }

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

@@ -157,7 +157,7 @@ export class TabLineRenderer {
         return this.buttonLayoutFromText(`${prefix}${ellipsizeDisplay(title, titleWidth)}${suffix}`, 0, statusText.length);
     }
     displayTitle(tab) {
-        return tab.title;
+        return tab.isFork ? `${APP_ICONS.fork}${tab.title}` : tab.title;
     }
     buttonLayoutFromText(text, statusStart, statusLength) {
         const closeStart = Math.max(0, text.lastIndexOf(APP_ICONS.close));

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

@@ -1,7 +1,7 @@
-import { colorLine } from "../../theme.js";
-import { stringDisplayWidth, wrapDisplayLine } from "../../terminal-width.js";
+import { ANSI_RESET, ansiStylePrefix } from "../../theme.js";
+import { expandTabs, stringDisplayWidth, wrapDisplayLine } from "../../terminal-width.js";
 import { APP_ICONS } from "../icons.js";
-import { padOrTrimPlain, sanitizeText } from "./render-text.js";
+import { padOrTrimPlain } from "./render-text.js";
 export function renderToastOverlays(states, width, maxRows, theme) {
     if (maxRows <= 0)
         return [];
@@ -22,11 +22,12 @@ export function renderToastOverlays(states, width, maxRows, theme) {
         const toastWidth = Math.min(Math.max(12, contentWidth + 2), Math.max(1, width - 4));
         const leftWidth = Math.max(0, width - toastWidth - 2);
         const column = leftWidth + 1;
+        const style = toastStyle(state, theme);
         for (const line of visibleLines) {
             const message = ` ${padOrTrimPlain(line, Math.max(0, toastWidth - 2))} `;
-            const text = padOrTrimPlain(message, toastWidth);
-            const output = colorLine(message, toastWidth, {
-                ...toastKindStyle(state.kind, theme),
+            const text = padOrTrimPlain(` ${padOrTrimPlain(stripToastAnsi(line), Math.max(0, toastWidth - 2))} `, toastWidth);
+            const output = colorToastLine(message, toastWidth, {
+                ...style,
                 bold: true,
             });
             overlays.push({
@@ -47,7 +48,7 @@ function toastMessageLines(message, icon, maxWidth) {
     const safeMaxWidth = Math.max(1, maxWidth);
     const safeContinuationPrefix = stringDisplayWidth(continuationPrefix) < safeMaxWidth ? continuationPrefix : "";
     const lines = [];
-    const logicalLines = sanitizeText(message).split("\n");
+    const logicalLines = sanitizeToastText(message).split("\n");
     for (const [index, logicalLine] of logicalLines.entries()) {
         const prefix = index === 0 ? firstPrefix : continuationPrefix;
         const prefixWidth = stringDisplayWidth(prefix);
@@ -74,21 +75,21 @@ function renderDialogToastOverlay(state, width, maxRows, theme, rowOffset) {
     const visibleBodyLines = bodyLines.slice(0, bodyRows);
     const includeBottom = maxRows > 1;
     const dialogRows = [
-        dialogTopLine(closeLabel, dialogWidth),
-        ...visibleBodyLines.map((line) => `│ ${padOrTrimPlain(line, bodyWidth)} │`),
-        ...(includeBottom ? [`╰${"─".repeat(Math.max(0, dialogWidth - 2))}╯`] : []),
+        toastRow(dialogTopLine(closeLabel, dialogWidth)),
+        ...visibleBodyLines.map((line) => toastRow(`│ ${padOrTrimPlain(line, bodyWidth)} │`, `│ ${padOrTrimPlain(stripToastAnsi(line), bodyWidth)} │`)),
+        ...(includeBottom ? [toastRow(`╰${"─".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 style = toastStyle(state, theme);
     const closeStartColumn = column + 1 + dialogTopCloseOffset(closeLabel, dialogWidth);
     const closeEndColumn = closeStartColumn + stringDisplayWidth(closeLabel);
-    return dialogRows.map((text, index) => ({
+    return dialogRows.map((row, index) => ({
         id: state.id,
         row: rowOffset + index + 1,
         column,
-        text,
-        output: colorLine(text, dialogWidth, { ...style, bold: true }),
+        text: row.text,
+        output: colorToastLine(row.output, dialogWidth, { ...style, bold: true }),
         target: index === 0
             ? { kind: "toast", id: state.id, action: "close", startColumn: closeStartColumn, endColumn: closeEndColumn }
             : { kind: "toast", id: state.id, action: "body", startColumn: column, endColumn: column + dialogWidth },
@@ -96,9 +97,29 @@ function renderDialogToastOverlay(state, width, maxRows, theme, rowOffset) {
 }
 function dialogMessageLines(message, maxWidth) {
     const safeMaxWidth = Math.max(1, maxWidth);
-    const lines = sanitizeText(message).split("\n").flatMap((line) => wrapDisplayLine(line, safeMaxWidth));
+    const lines = sanitizeToastText(message).split("\n").flatMap((line) => wrapDisplayLine(line, safeMaxWidth));
     return lines.length > 0 ? lines : [""];
 }
+function toastRow(output, text = output) {
+    return { output, text };
+}
+function sanitizeToastText(text) {
+    return expandTabs(text.replace(/⚠️?|\u{f0026}/gu, APP_ICONS.alert).replace(/\r/g, ""))
+        .replace(/\x1b(?!\[[\d;:]*m)/gu, "␛");
+}
+function stripToastAnsi(text) {
+    return text.replace(/\x1b\[[\d;:]*m/gu, "");
+}
+function hasToastAnsiColor(text) {
+    return /\x1b\[[\d;:]*m/u.test(text);
+}
+function colorToastLine(text, width, options) {
+    const line = padOrTrimPlain(text, width);
+    const prefix = ansiStylePrefix(options);
+    if (!prefix)
+        return line;
+    return `${prefix}${line.replaceAll(ANSI_RESET, `${ANSI_RESET}${prefix}`)}${ANSI_RESET}`;
+}
 function dialogTopLine(closeLabel, width) {
     const innerWidth = Math.max(0, width - 2);
     const closeOffset = dialogTopCloseOffset(closeLabel, width);
@@ -135,3 +156,7 @@ function toastKindStyle(kind, theme) {
             return { foreground: theme.colors.background, background: theme.colors.info };
     }
 }
+function toastStyle(state, theme) {
+    const style = toastKindStyle(state.kind, theme);
+    return hasToastAnsiColor(state.message) ? { ...style, background: "#000000" } : style;
+}

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

@@ -1,13 +1,14 @@
 import { type ResolvedToolRule } from "../../config.js";
 import type { ToolBodySyntaxHighlights } from "../../syntax-highlight.js";
 import type { Theme } from "../../theme.js";
-import type { RenderedLine } from "../types.js";
+import type { RenderedLine, StyledSegment } from "../types.js";
 import type { ToolBodyLineStyle } from "../../tool-renderers/types.js";
 export type ToolBlockEntry = {
     id: string;
     toolName: string;
     headerLabel?: string | undefined;
     headerArgs?: string | undefined;
+    headerArgSegments?: readonly StyledSegment[] | undefined;
     bodyLineStyles?: readonly ToolBodyLineStyle[] | undefined;
     bodyStyle?: "diff" | undefined;
     preserveAnsi?: boolean | undefined;

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

@@ -28,9 +28,16 @@ export function renderToolBlock(entry, rule, width, colors, options = {}) {
     const headerArgs = formatToolHeaderArgs(entry.headerArgs);
     const headerArgsWidth = width - stringDisplayWidth(headerPrefix) - 1;
     const clippedHeaderArgs = headerArgsWidth > 0 ? sliceByDisplayWidth(headerArgs, headerArgsWidth) : "";
+    const header = clippedHeaderArgs ? `${headerPrefix} ${clippedHeaderArgs}` : headerPrefix;
+    const headerArgsStart = headerPrefix.length + 1;
+    const clippedHeaderArgSegments = clippedHeaderArgs
+        ? clipAndShiftSegments(entry.headerArgSegments, headerArgsStart, clippedHeaderArgs.length)
+        : [];
+    const headerArgBaseSegments = clippedHeaderArgs
+        ? uncoveredSegments(headerArgsStart, header.length, toolOutputColor, clippedHeaderArgSegments)
+        : [];
     const target = { kind: "tool", id: entry.id };
     const showGutter = options.showGutter ?? true;
-    const header = clippedHeaderArgs ? `${headerPrefix} ${clippedHeaderArgs}` : headerPrefix;
     const headerLine = {
         text: header,
         target,
@@ -39,7 +46,8 @@ export function renderToolBlock(entry, rule, width, colors, options = {}) {
         segments: [
             { start: 0, end: stateIcon.length, foreground: toolStatusIconColor(entry, colors), bold: true },
             { start: stateIcon.length, end: headerPrefix.length, bold: true },
-            ...(clippedHeaderArgs ? [{ start: headerPrefix.length + 1, end: header.length, foreground: toolOutputColor }] : []),
+            ...headerArgBaseSegments,
+            ...clippedHeaderArgSegments,
         ],
     };
     const headerLines = [headerLine];
@@ -85,6 +93,35 @@ export function renderToolBlock(entry, rule, width, colors, options = {}) {
     ];
     return headerLines;
 }
+function clipAndShiftSegments(segments, offset, length) {
+    if (!segments || length <= 0)
+        return [];
+    return segments.flatMap((segment) => {
+        const start = Math.max(0, segment.start);
+        const end = Math.min(length, segment.end);
+        if (end <= start)
+            return [];
+        return [{ ...segment, start: offset + start, end: offset + end }];
+    });
+}
+function uncoveredSegments(start, end, foreground, coveredSegments) {
+    if (end <= start)
+        return [];
+    const result = [];
+    let offset = start;
+    for (const segment of [...coveredSegments].sort((a, b) => a.start - b.start || a.end - b.end)) {
+        const segmentStart = Math.max(start, Math.min(end, segment.start));
+        const segmentEnd = Math.max(segmentStart, Math.min(end, segment.end));
+        if (segmentEnd <= offset)
+            continue;
+        if (segmentStart > offset)
+            result.push({ start: offset, end: segmentStart, foreground });
+        offset = segmentEnd;
+    }
+    if (offset < end)
+        result.push({ start: offset, end, foreground });
+    return result;
+}
 function renderCollapsedPreviewLines(entry, body, rule, width, target, color, colors, hasLspDiagnostics, showGutter) {
     const preview = previewBodyText(body, rule.direction, rule.previewLines);
     const allPreviewLines = renderToolBodyLines(preview.text, width, target, color, entry.bodyStyle, colors, undefined, entry.bodyWrap, hasLspDiagnostics, entry.bodyLineStyles, entry.preserveAnsi, showGutter, { rawLineOffset: preview.rawLineOffset, bodyEndsAfterText: !preview.omittedAfter });
@@ -467,7 +504,10 @@ function syntaxHighlightForLine(highlights, lineIndex) {
     return list.find((highlight) => lineIndex >= highlight.startLine && (highlight.endLine == null || lineIndex < highlight.endLine));
 }
 function diffLineStyle(line, colors) {
-    const content = line.trimStart();
+    // Diff markers are only markers at column 0. Context lines in unified/apply_patch
+    // output start with a leading space, so trimming would incorrectly color
+    // markdown bullets like ` - item` as deletions and ` + item` as additions.
+    const content = line;
     if (/^(?:diff --git|index |\*\*\* (?:Begin|End) Patch)/.test(content))
         return { foreground: colors.muted, bold: true };
     if (/^(?:---|\+\+\+|\*\*\* (?:Update|Add|Delete) File:)/.test(content))

package/dist/app/screen/mouse-controller.d.ts

@@ -169,6 +169,7 @@ export declare class AppMouseController {
     private handleStatusVoiceMicClick;
     private handleStatusVoiceLanguageClick;
     private handleStatusQuickScrollClick;
+    private statusTargetContains;
     private handleInputClick;
     private handleExtensionInputClick;
     private openUserMessageMenu;