pi-ui-extend 0.1.19 → 0.1.21

package/dist/app/app.d.ts

@@ -60,6 +60,9 @@ export declare class PiUiExtendApp {
     private resumeLoading;
     constructor(options: AppOptions);
     private createRuntime;
+    private loadStartupConfig;
+    private applyPixConfig;
+    private updateOutputFilters;
     start(): Promise<void>;
     private checkPixUpdateOnStartup;
     private bindCurrentSession;

package/dist/app/app.js

@@ -1,6 +1,6 @@
 import { THEMES } from "../theme.js";
 import { InputEditor } from "../input-editor.js";
-import { compileOutputFilterPatterns, loadPixConfig, resolveToolRule, } from "../config.js";
+import { compileOutputFilterPatterns, defaultPixConfig, loadPixConfig, resolveToolRule, } from "../config.js";
 import { AppCommandController } from "./commands/command-controller.js";
 import { ConversationViewport } from "./rendering/conversation-viewport.js";
 import { EditorLayoutRenderer } from "./rendering/editor-layout-renderer.js";
@@ -68,7 +68,7 @@ export class PiUiExtendApp {
     extensionUiController;
     extensionActions;
     pixConfig;
-    outputFilters;
+    outputFilters = [];
     commandController;
     inputActions;
     inputController;
@@ -127,7 +127,7 @@ export class PiUiExtendApp {
     constructor(options) {
         this.options = options;
         this.theme = THEMES[options.themeName];
-        this.pixConfig = loadPixConfig(this.options.cwd);
+        this.pixConfig = defaultPixConfig();
         setAppIconTheme(this.pixConfig.iconTheme.name);
         const app = this;
         this.blinkController = new AppBlinkController({
@@ -160,7 +160,7 @@ export class PiUiExtendApp {
         });
         this.tabsController = new AppTabsController({
             options: this.options,
-            maxProjectSessions: this.pixConfig.maxProjectSessions,
+            maxProjectSessions: () => this.pixConfig.maxProjectSessions,
             blinkController: this.blinkController,
             runtime: () => this.runtime,
             createRuntimeForNewSession: () => this.createRuntime(newTabRuntimeOptions(this.options)),
@@ -398,18 +398,16 @@ export class PiUiExtendApp {
             get subagentsWidgetState() { return app.subagentsWidgetController.widgetState; },
             get voicePartialText() { return app.voicePartialText; },
             get autocompleteSuggestion() { return app.autocompleteController.suggestionText(); },
-            get queuedMessageWidgetEntries() { return app.queuedMessages.deferredQueuedEntries(); },
+            get queuedMessageWidgetEntries() { return app.queuedMessages.queuedEntries(); },
             renderExtensionInputComponent: (width) => this.extensionUiController.renderActiveCustomUi(width),
             extensionInputUsesEditor: () => this.extensionUiController.activeCustomUiUsesEditor(),
             widgetTuiHandle: () => this.extensionUiController.widgetTuiHandle(),
             createExtensionTheme: () => this.extensionUiController.createExtensionTheme(),
             suppressExtensionWidget: (key) => this.extensionUiController.suppressWidget(key),
         });
-        this.outputFilters = compileOutputFilterPatterns(this.pixConfig.outputFilters.patterns);
+        this.updateOutputFilters();
         this.conversationViewport = new ConversationViewport({
             get entries() { return app.entries; },
-            get session() { return app.runtime?.session; },
-            get deferredUserMessages() { return app.queuedMessages.deferredUserMessages; },
             get entryRenderVersions() { return app.sessionEvents.entryRenderVersions; },
             get superCompactTools() { return app.superCompactTools; },
             get allThinkingExpanded() { return app.allThinkingExpanded; },
@@ -700,6 +698,7 @@ export class PiUiExtendApp {
             inputEditor: () => this.inputEditor,
             enableTerminal: () => this.terminalController.enableTerminal(),
             disposeRuntimeForQuit: (runtime) => this.terminalController.disposeRuntimeForQuit(runtime),
+            loadStartupConfig: () => this.loadStartupConfig(),
             loadRequestHistory: () => this.requestHistory.load(),
             startSubagentsPolling: () => this.subagentsWidgetController.startPolling(),
             closeSdkMenuForBind: () => this.popupMenus.closeSdkMenu(undefined, { render: false, restoreStatus: false }),
@@ -750,8 +749,35 @@ export class PiUiExtendApp {
     createRuntime(options) {
         return createPixRuntime(options, {
             eventBus: this.createExtensionEventBus(),
+            config: this.pixConfig,
         });
     }
+    async loadStartupConfig() {
+        await yieldToEventLoop();
+        this.applyPixConfig(loadPixConfig(this.options.cwd));
+    }
+    applyPixConfig(config) {
+        replaceRecord(this.pixConfig.toolRenderer, config.toolRenderer);
+        replaceRecord(this.pixConfig.outputFilters, config.outputFilters);
+        replaceRecord(this.pixConfig.promptEnhancer, config.promptEnhancer);
+        replaceRecord(this.pixConfig.autocomplete, config.autocomplete);
+        replaceRecord(this.pixConfig.modelColors, config.modelColors);
+        replaceRecord(this.pixConfig.iconTheme, config.iconTheme);
+        replaceRecord(this.pixConfig.dictation, config.dictation);
+        if (config.defaultModel === undefined)
+            delete this.pixConfig.defaultModel;
+        else
+            this.pixConfig.defaultModel = { ...config.defaultModel };
+        this.pixConfig.ignoreContextFiles = config.ignoreContextFiles;
+        this.pixConfig.maxProjectSessions = config.maxProjectSessions;
+        this.updateOutputFilters();
+        this.voiceController.updateDictationConfig(this.pixConfig.dictation);
+        setAppIconTheme(this.pixConfig.iconTheme.name);
+        this.conversationViewport.clear();
+    }
+    updateOutputFilters() {
+        this.outputFilters.splice(0, this.outputFilters.length, ...compileOutputFilterPatterns(this.pixConfig.outputFilters.patterns));
+    }
     async start() {
         await this.sessionLifecycle.start();
         this.modelUsageController.startPolling();
@@ -1053,3 +1079,37 @@ function newTabRuntimeOptions(options) {
         ...(options.modelRef === undefined ? {} : { modelRef: options.modelRef }),
     };
 }
+async function yieldToEventLoop() {
+    await new Promise((resolve) => { setTimeout(resolve, 0); });
+}
+function replaceRecord(target, source) {
+    for (const key of Object.keys(target)) {
+        if (!(key in source))
+            delete target[key];
+    }
+    for (const [key, value] of Object.entries(source)) {
+        const existing = target[key];
+        if (isMutableRecord(existing) && isMutableRecord(value)) {
+            replaceRecord(existing, value);
+        }
+        else {
+            target[key] = cloneConfigValue(value);
+        }
+    }
+}
+function cloneConfigValue(value) {
+    if (Array.isArray(value))
+        return value.map(cloneConfigValue);
+    if (isMutableRecord(value))
+        return cloneConfigRecord(value);
+    return value;
+}
+function cloneConfigRecord(value) {
+    const cloned = {};
+    for (const [key, nested] of Object.entries(value))
+        cloned[key] = cloneConfigValue(nested);
+    return cloned;
+}
+function isMutableRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}

package/dist/app/constants.js

@@ -73,7 +73,7 @@ export const SUBAGENTS_WIDGET_MAX_ROWS = 8;
 export const DEFAULT_THINKING_TOOL_RULE = {
     previewLines: 0,
     direction: "head",
-    color: "accent",
+    color: "thinkingForeground",
 };
 export const TERMINAL_COMMAND_MODIFIER_FLAG = 8;
 export const GIT_BRANCH_CACHE_MS = 30_000;

package/dist/app/extensions/extension-ui-controller.js

@@ -1,4 +1,4 @@
-import { ANSI_RESET, colorize, THEMES } from "../../theme.js";
+import { ANSI_RESET, ansiStylePrefix, colorize, THEMES } from "../../theme.js";
 import { isToastKind } from "../../ui.js";
 import { ellipsizeDisplay, sanitizeText } from "../rendering/render-text.js";
 const CUSTOM_UI_WIDGET_KEY = "pix-custom-ui";
@@ -20,7 +20,7 @@ export class ExtensionUiController {
         const colors = this.host.theme.colors;
         const foreground = (color) => extensionForegroundColor(colors, String(color));
         const background = (color) => extensionBackgroundColor(colors, String(color));
-        const prefix = (options) => (colorize("", options).replace(new RegExp(`${escapeRegExp(ANSI_RESET)}$`), ""));
+        const prefix = (options) => ansiStylePrefix(options);
         return {
             fg: (color, text) => colorize(text, { foreground: foreground(color) }),
             bg: (color, text) => colorize(text, { background: background(color) }),

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

@@ -54,8 +54,8 @@ type VoiceControllerTestDeps = {
 export declare function setVoiceControllerTestDeps(overrides?: Partial<VoiceControllerTestDeps>): void;
 export declare class AppVoiceController {
     private readonly host;
-    private readonly modelDefinitions;
-    private readonly languages;
+    private modelDefinitions;
+    private languages;
     private language;
     private state;
     private readonly modelCache;
@@ -69,6 +69,7 @@ export declare class AppVoiceController {
     private partialTranscriptTimer;
     private startGeneration;
     constructor(host: AppVoiceControllerHost, dictationConfig: DictationConfig);
+    updateDictationConfig(dictationConfig: DictationConfig): void;
     statusWidgetText(): string;
     showLanguageSwitcher(): boolean;
     statusWidgetActive(): boolean;

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

@@ -51,6 +51,15 @@ export class AppVoiceController {
         this.languages = Object.keys(this.modelDefinitions);
         this.language = this.initialLanguage(dictationConfig.language);
     }
+    updateDictationConfig(dictationConfig) {
+        this.modelDefinitions = dictationConfig.languages;
+        this.languages = Object.keys(this.modelDefinitions);
+        this.language = this.initialLanguage(dictationConfig.language ?? this.language);
+        for (const language of this.modelCache.keys()) {
+            if (!this.modelDefinitions[language])
+                this.modelCache.delete(language);
+        }
+    }
     statusWidgetText() {
         const languageLabel = this.showLanguageSwitcher() ? ` ${this.language.toUpperCase()}` : "";
         switch (this.state) {

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

@@ -1,5 +1,6 @@
 import { applyOutputFilters } from "../../config.js";
 import { renderMarkdownTextLines } from "../../markdown-format.js";
+import { stringDisplayWidth } from "../../terminal-width.js";
 import { attachImageClickTargets } from "../screen/image-click-targets.js";
 import { APP_ICONS } from "../icons.js";
 import { horizontalPaddingLayout, padHorizontalText, wrapText } from "./render-text.js";
@@ -7,16 +8,39 @@ import { renderConversationShellEntry } from "./conversation-shell-renderer.js";
 import { renderConversationToolEntry, renderThinkingEntry } from "./conversation-tool-renderer.js";
 export function renderConversationEntry(entry, width, options) {
     const { left: userContentLeft, contentWidth: userContentWidth } = horizontalPaddingLayout(width);
-    const userLine = (text, entryId, syntaxHighlight, segments) => ({
-        text: padHorizontalText(text, width),
-        colorOverride: options.colors.warning,
-        ...(segments && segments.length > 0 ? { segments: segments.map((segment) => ({ ...segment, start: segment.start + userContentLeft, end: segment.end + userContentLeft })) } : {}),
-        ...(syntaxHighlight === undefined ? {} : { syntaxHighlight }),
-        ...(entryId === undefined ? {} : { target: { kind: "user-message", id: entryId } }),
-    });
+    const userLine = (text, entryId, syntaxHighlight, segments) => {
+        const textWidth = stringDisplayWidth(text);
+        const padding = Math.max(0, width - textWidth);
+        const paddedText = " ".repeat(padding) + text;
+        const offset = padding;
+        return {
+            text: paddedText,
+            colorOverride: options.colors.userForeground,
+            backgroundOverride: options.colors.userMessageBackground,
+            ...(segments && segments.length > 0
+                ? {
+                    segments: segments.map((segment) => ({
+                        ...segment,
+                        start: segment.start + offset,
+                        end: segment.end + offset,
+                        foreground: options.colors.userForeground,
+                    })),
+                }
+                : {}),
+            ...(syntaxHighlight === undefined
+                ? {}
+                : {
+                    syntaxHighlight: {
+                        ...syntaxHighlight,
+                        start: syntaxHighlight.start + offset,
+                    },
+                }),
+            ...(entryId === undefined ? {} : { target: { kind: "user-message", id: entryId } }),
+        };
+    };
     const queuedLine = (text, entryId, segments) => ({
         text,
-        colorOverride: options.colors.warning,
+        colorOverride: options.colors.userForeground,
         ...(segments && segments.length > 0 ? { segments } : {}),
         target: { kind: "queue-message", id: entryId },
     });
@@ -69,10 +93,16 @@ function renderAssistantLines(text, width, options) {
         return [];
     const lines = [];
     for (const line of contentLines) {
+        const headingSegment = line.heading
+            ? { start: contentLeft, end: contentLeft + line.text.length, foreground: options.colors.assistantForeground, bold: true }
+            : undefined;
+        const existingSegments = line.segments?.map((segment) => ({ ...segment, start: segment.start + contentLeft, end: segment.end + contentLeft })) ?? [];
+        const allSegments = headingSegment ? [headingSegment, ...existingSegments] : existingSegments;
         lines.push({
             text: padHorizontalText(line.text, width),
             colorOverride: options.colors.assistantForeground,
-            ...(line.segments && line.segments.length > 0 ? { segments: line.segments.map((segment) => ({ ...segment, start: segment.start + contentLeft, end: segment.end + contentLeft })) } : {}),
+            backgroundOverride: options.colors.assistantMessageBackground,
+            ...(allSegments.length > 0 ? { segments: allSegments } : {}),
             ...(line.syntaxHighlight ? { syntaxHighlight: line.syntaxHighlight } : {}),
         });
     }

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

@@ -63,7 +63,7 @@ export function renderThinkingEntry(entry, width, options) {
         expandedText: compactExpandedText || "(empty)",
         bodyWrap: "word",
         syntaxHighlight: compactExpandedText ? markdownSyntaxHighlightsForText(compactExpandedText) : undefined,
-    }, rule, width, options.colors, { superCompact: Boolean(options.superCompactTools && !forceExpanded) });
+    }, rule, width, options.colors, { superCompact: Boolean(options.superCompactTools && !forceExpanded), backgroundOverride: options.colors.thinkingMessageBackground, skipHeaderBackground: true });
 }
 function trimTrailingBlankLines(text) {
     return text.replace(/(?:\r?\n[ \t]*)+$/u, "");

package/dist/app/rendering/conversation-viewport.d.ts

@@ -1,12 +1,9 @@
-import type { AgentSession } from "@earendil-works/pi-coding-agent";
 import { type PixConfig } from "../../config.js";
 import type { Theme } from "../../theme.js";
 import { type InlineUserMessageMenuContext } from "./conversation-entry-renderer.js";
-import type { ConversationBlockCache, Entry, RenderedLine, SubmittedUserMessage } from "../types.js";
+import type { ConversationBlockCache, Entry, RenderedLine } from "../types.js";
 export type ConversationViewportHost = {
     readonly entries: readonly Entry[];
-    readonly session: AgentSession | undefined;
-    readonly deferredUserMessages: readonly SubmittedUserMessage[];
     readonly entryRenderVersions: ReadonlyMap<string, number>;
     readonly cwd: string;
     readonly colors: Theme["colors"];
@@ -40,7 +37,6 @@ export declare class ConversationViewport {
     blockForEntry(entry: Entry, width: number): ConversationBlockCache;
     entryBlockPositions(width: number): ConversationEntryBlockPosition[];
     measuredLineCountForEntries(width: number, entryIds: readonly string[]): number;
-    private queuedEntries;
     private layoutForWidth;
     private buildLayout;
     private previousMeasuredLineCount;

package/dist/app/rendering/conversation-viewport.js

@@ -2,7 +2,6 @@ import { resolveToolRule } from "../../config.js";
 import { stringDisplayWidth } from "../../terminal-width.js";
 import { renderConversationEntry as renderConversationEntryLines } from "./conversation-entry-renderer.js";
 import { horizontalPaddingLayout } from "./render-text.js";
-import { sdkQueuedMessageEntries } from "../session/queued-message-entries.js";
 export class ConversationViewport {
     host;
     blockCachesByWidth = new Map();
@@ -63,8 +62,7 @@ export class ConversationViewport {
         return { lines: visible, changed: false };
     }
     entries() {
-        const queued = this.queuedEntries();
-        return queued.length === 0 ? [...this.host.entries] : [...this.host.entries, ...queued];
+        return [...this.host.entries];
     }
     blockForEntry(entry, width) {
         const blockCache = this.blockCacheForWidth(width);
@@ -119,21 +117,16 @@ export class ConversationViewport {
         }
         return lineCount;
     }
-    queuedEntries() {
-        return sdkQueuedMessageEntries(this.host.session);
-    }
     layoutForWidth(width) {
-        const queued = this.queuedEntries();
-        const entries = queued.length === 0 ? this.host.entries : [...this.host.entries, ...queued];
-        const queuedSignature = queued.map((entry) => entry.id).join("\n");
+        const entries = this.host.entries;
         const superCompactTools = Boolean(this.host.superCompactTools);
         const allThinkingExpanded = Boolean(this.host.allThinkingExpanded);
         let layout = this.layoutCachesByWidth.get(width);
-        if (!layout || this.layoutStructureChanged(layout, entries, queuedSignature, superCompactTools, allThinkingExpanded)) {
-            const previousLayout = layout && layout.queuedSignature === queuedSignature && layout.superCompactTools === superCompactTools && layout.allThinkingExpanded === allThinkingExpanded
+        if (!layout || this.layoutStructureChanged(layout, entries, superCompactTools, allThinkingExpanded)) {
+            const previousLayout = layout && layout.superCompactTools === superCompactTools && layout.allThinkingExpanded === allThinkingExpanded
                 ? layout
                 : undefined;
-            layout = this.buildLayout(entries, width, queuedSignature, superCompactTools, allThinkingExpanded, previousLayout);
+            layout = this.buildLayout(entries, width, superCompactTools, allThinkingExpanded, previousLayout);
             this.layoutCachesByWidth.set(width, layout);
         }
         else {
@@ -144,7 +137,7 @@ export class ConversationViewport {
         }
         return layout;
     }
-    buildLayout(entries, width, queuedSignature, superCompactTools, allThinkingExpanded, previousLayout) {
+    buildLayout(entries, width, superCompactTools, allThinkingExpanded, previousLayout) {
         const entryIds = [];
         const lineCounts = [];
         const measuredLineCounts = [];
@@ -163,7 +156,7 @@ export class ConversationViewport {
             totalLineCount += lineCount;
         }
         offsets.push(totalLineCount);
-        return { entries, entryIds, lineCounts, measuredLineCounts, offsets, positions, dirtyEntryIds: new Set(), totalLineCount, queuedSignature, superCompactTools, allThinkingExpanded };
+        return { entries, entryIds, lineCounts, measuredLineCounts, offsets, positions, dirtyEntryIds: new Set(), totalLineCount, superCompactTools, allThinkingExpanded };
     }
     previousMeasuredLineCount(previousLayout, entries, index, entry) {
         const previousIndex = previousLayout?.positions.get(entry.id);
@@ -179,8 +172,8 @@ export class ConversationViewport {
             return undefined;
         return previousLayout.lineCounts[previousIndex];
     }
-    layoutStructureChanged(layout, entries, queuedSignature, superCompactTools, allThinkingExpanded) {
-        if (layout.entries.length !== entries.length || layout.queuedSignature !== queuedSignature || layout.superCompactTools !== superCompactTools || layout.allThinkingExpanded !== allThinkingExpanded)
+    layoutStructureChanged(layout, entries, superCompactTools, allThinkingExpanded) {
+        if (layout.entries.length !== entries.length || layout.superCompactTools !== superCompactTools || layout.allThinkingExpanded !== allThinkingExpanded)
             return true;
         if (layout.entries.length === 0)
             return false;

package/dist/app/rendering/editor-layout-renderer.js

@@ -8,7 +8,7 @@ export class EditorLayoutRenderer {
         this.host = host;
     }
     computeLayout(width, rows) {
-        const maxAvailableInputRows = Math.max(1, rows - 5);
+        const maxAvailableInputRows = Math.max(1, rows - 4);
         const renderedInput = this.renderInput(width, Math.min(INPUT_MAX_ROWS, maxAvailableInputRows), maxAvailableInputRows);
         const maxEntityRows = Math.max(0, rows - renderedInput.lines.length - 4);
         const editorEntityWidth = inputFrameContentWidth(width);
@@ -18,9 +18,9 @@ export class EditorLayoutRenderer {
             aboveEditorLines = [...aboveEditorLines, { text: "", variant: "normal" }];
         }
         const belowEditorLines = this.limitEntityLines(this.renderExtensionWidgets("belowEditor", editorEntityWidth), maxEntityRows - aboveEditorLines.length);
-        const inputBottomSeparatorRow = rows - 1;
-        const belowEditorStartRow = inputBottomSeparatorRow - belowEditorLines.length;
-        const inputStartRow = belowEditorStartRow - renderedInput.lines.length;
+        const belowEditorStartRow = rows - belowEditorLines.length;
+        const inputBottomSeparatorRow = belowEditorStartRow - 1;
+        const inputStartRow = inputBottomSeparatorRow - renderedInput.lines.length;
         const inputSeparatorRow = inputStartRow - aboveEditorLines.length - 1;
         return {
             renderedInput,
@@ -111,7 +111,7 @@ export class EditorLayoutRenderer {
             for (const [index, text] of wrapped.entries()) {
                 lines.push({
                     text: padHorizontalText(text, width),
-                    colorOverride: this.host.theme.colors.warning,
+                    colorOverride: this.host.theme.colors.userForeground,
                     target: { kind: "queue-message", id: entry.id },
                     ...(index === 0 ? { segments: [{ start: 0, end: icon.length, foreground: this.host.theme.colors.info }] } : {}),
                 });

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

@@ -150,7 +150,7 @@ export class AppRenderController {
             if (row < statusRow) {
                 this.deps.mouseController.renderedRowTexts.set(row, separatorText);
                 appendFrameOutput("inputStatus", row, this.renderFrameRow(row, this.deps.screenStyler.styleLine(row, separatorText, columns, {
-                    foreground: this.deps.theme.colors.inputBorder,
+                    foreground: this.deps.theme.colors.tabBorder,
                 })));
             }
         }
@@ -176,7 +176,15 @@ export class AppRenderController {
                 })}`);
             }
         }
-        const belowEditorStartRow = inputStartRow + renderedInput.lines.length;
+        if (inputBottomSeparatorRow && inputBottomSeparatorRow > inputSeparatorRow && inputBottomSeparatorRow < statusRow) {
+            const separatorText = inputFrameLine(columns, "bottom");
+            const row = toScreenRow(inputBottomSeparatorRow);
+            this.deps.mouseController.renderedRowTexts.set(row, separatorText);
+            appendFrameOutput("inputStatus", row, this.renderFrameRow(row, this.deps.screenStyler.styleLine(row, separatorText, columns, {
+                foreground: this.deps.theme.colors.tabBorder,
+            })));
+        }
+        const belowEditorStartRow = (inputBottomSeparatorRow ?? (inputStartRow + renderedInput.lines.length - 1)) + 1;
         for (let index = 0; index < belowEditorLines.length; index += 1) {
             const rendered = frameRenderedLine(belowEditorLines[index], columns, this.deps.theme, this.deps.screenStyler);
             const row = toScreenRow(belowEditorStartRow + index);
@@ -191,25 +199,7 @@ export class AppRenderController {
             appendFrameOutput("inputStatus", row, this.renderFrameRow(row, rendered.output(row)));
         }
         const statusLayout = this.deps.statusLineRenderer.layout(columns);
-        const statusLineRenderer = this.deps.statusLineRenderer;
-        const inputBorderWidgetsLayout = statusLineRenderer.inputBorderWidgetsLayout?.(columns);
-        if (inputBottomSeparatorRow > 1) {
-            const separatorText = inputFrameLine(columns, "bottom");
-            const row = toScreenRow(inputBottomSeparatorRow);
-            if (row < statusRow) {
-                const text = inputBorderWidgetsLayout
-                    ? overlayText(separatorText, inputBorderWidgetsLayout.inputBorderWidgetStartColumn ?? 1, inputBorderWidgetsLayout.text)
-                    : separatorText;
-                this.deps.mouseController.renderedRowTexts.set(row, text);
-                const output = inputBorderWidgetsLayout && statusLineRenderer.renderInputBorderWidgets
-                    ? statusLineRenderer.renderInputBorderWidgets(row, inputBorderWidgetsLayout, separatorText, columns)
-                    : this.deps.screenStyler.styleLine(row, separatorText, columns, {
-                        foreground: this.deps.theme.colors.inputBorder,
-                    });
-                appendFrameOutput("inputStatus", row, this.renderFrameRow(row, output));
-            }
-        }
-        this.updateStatusMouseState(statusLayout, statusRow, inputBorderWidgetsLayout, toScreenRow(inputBottomSeparatorRow));
+        this.updateStatusMouseState(statusLayout, statusRow);
         appendFrameOutput("inputStatus", statusRow, this.renderFrameRow(statusRow, this.deps.statusLineRenderer.render(statusRow, statusLayout, columns)));
         const voiceProgressOverlay = this.renderVoiceProgressOverlay(this.deps.voiceProgressOverlayText(), columns, statusRow);
         if (voiceProgressOverlay) {
@@ -287,9 +277,9 @@ export class AppRenderController {
         const text = fixedCellText(flash.text, width);
         return `\x1b[${flash.y};${flash.startColumn}H\x1b[7m${text}${ANSI_RESET}`;
     }
-    updateStatusMouseState(statusLayout, statusRow, inputBorderWidgetsLayout, inputBorderWidgetsRow) {
-        const widgetLayout = inputBorderWidgetsLayout;
-        const widgetRow = inputBorderWidgetsRow ?? statusRow;
+    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);

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

@@ -53,6 +53,8 @@ export declare class StatusLineRenderer {
     terminalBellSoundTarget(layout: StatusLineLayout, row: number): StatusTerminalBellSoundTarget | undefined;
     sessionTarget(statusText: string, row: number, label: string, workspaceLabel: string): StatusSessionTarget | undefined;
     private segments;
+    private fitWorkspaceLabel;
+    private pushStatusWidgetSegments;
     private pushPromptEnhancerWidgetSegment;
     private pushUserJumpWidgetSegment;
     private pushDraftQueueWidgetSegment;