pi-ui-extend 0.1.19 → 0.1.20

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/rendering/conversation-entry-renderer.js

@@ -9,14 +9,14 @@ 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,
+        colorOverride: options.colors.userForeground,
         ...(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 queuedLine = (text, entryId, segments) => ({
         text,
-        colorOverride: options.colors.warning,
+        colorOverride: options.colors.userForeground,
         ...(segments && segments.length > 0 ? { segments } : {}),
         target: { kind: "queue-message", id: entryId },
     });

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,

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;

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

@@ -1,12 +1,10 @@
 import { compactProgressBarSegments, formatCompactProgressBar } from "../../context-progress-bar.js";
-import { padOrTrimPlain } from "./render-text.js";
+import { ellipsizeDisplay, padOrTrimPlain } from "./render-text.js";
 import { displayIndexForColumn, stringDisplayWidth } from "../../terminal-width.js";
 import { APP_ICONS } from "../icons.js";
 import { resolveColor, resolveModelColor } from "../../config.js";
 const MODEL_USAGE_PROGRESS_BAR_WIDTH = stringDisplayWidth(formatCompactProgressBar(100));
-const INPUT_BORDER_WIDGET_INSET = 2;
-const INPUT_BORDER_WIDGET_SEPARATOR = "─";
-const STATUS_ICON_BUTTON_WIDTH = 3;
+const STATUS_WIDGET_GAP = " ";
 export class StatusLineRenderer {
     host;
     constructor(host) {
@@ -18,17 +16,29 @@ export class StatusLineRenderer {
         const baseStatus = this.host.currentStatus();
         const workspaceLabel = this.host.statusWorkspaceLabel();
         const modelUsageLabel = this.host.modelUsageStatusLabel();
-        const workspaceDetailsLabel = modelUsageLabel ? `${workspaceLabel} ${modelUsageLabel}` : workspaceLabel;
-        const contextBarLabel = this.contextBarLabel(baseStatus, contentWidth, workspaceDetailsLabel);
+        const widgetsLayout = this.inputBorderWidgetsLayout(contentWidth);
+        const leftWidth = widgetsLayout?.inputBorderWidgetStartColumn
+            ? Math.max(0, widgetsLayout.inputBorderWidgetStartColumn - 2)
+            : contentWidth;
+        const fullWorkspaceDetailsLabel = modelUsageLabel ? `${workspaceLabel} ${modelUsageLabel}` : workspaceLabel;
+        const contextBarLabel = this.contextBarLabel(baseStatus, leftWidth, fullWorkspaceDetailsLabel);
         const status = contextBarLabel ? `${baseStatus} ${contextBarLabel}` : baseStatus;
         const sessionLabel = "";
-        const details = `${status} ${workspaceDetailsLabel}`;
-        const text = padOrTrimPlain(`${statusDot} ${details}`, width);
+        const fittedWorkspaceLabel = this.fitWorkspaceLabel(statusDot, status, workspaceLabel, modelUsageLabel, leftWidth);
+        const workspaceDetailsLabel = modelUsageLabel
+            ? `${fittedWorkspaceLabel ? `${fittedWorkspaceLabel} ` : ""}${modelUsageLabel}`
+            : fittedWorkspaceLabel;
+        const details = workspaceDetailsLabel ? `${status} ${workspaceDetailsLabel}` : status;
+        const leftText = padOrTrimPlain(`${statusDot} ${details}`, leftWidth);
+        const text = widgetsLayout?.inputBorderWidgetStartColumn
+            ? overlayText(padOrTrimPlain(leftText, contentWidth), widgetsLayout.inputBorderWidgetStartColumn, widgetsLayout.text)
+            : padOrTrimPlain(leftText, contentWidth);
         return {
+            ...widgetsLayout,
             details,
             text,
             sessionLabel,
-            workspaceLabel,
+            workspaceLabel: fittedWorkspaceLabel,
             ...(modelUsageLabel ? { modelUsageLabel } : {}),
             ...(contextBarLabel ? { contextBarLabel } : {}),
         };
@@ -76,17 +86,18 @@ export class StatusLineRenderer {
         if (!hasParts)
             return undefined;
         const parts = [];
-        const totalWidth = widgets.reduce((total, widget, index) => total + (index > 0 ? 1 : 0) + stringDisplayWidth(widget.text), 0);
-        const endColumn = Math.max(1, width - INPUT_BORDER_WIDGET_INSET);
+        const gapWidth = stringDisplayWidth(STATUS_WIDGET_GAP);
+        const totalWidth = widgets.reduce((total, widget, index) => total + stringDisplayWidth(widget.text) + (index > 0 ? gapWidth : 0), 0);
+        const endColumn = Math.max(1, width + 1);
         const startColumn = endColumn - totalWidth;
-        if (startColumn < 2)
+        if (startColumn < 1)
             return undefined;
         layout.inputBorderWidgetStartColumn = startColumn;
         let nextColumn = startColumn;
         for (const [index, widget] of widgets.entries()) {
             if (index > 0) {
-                parts.push(INPUT_BORDER_WIDGET_SEPARATOR);
-                nextColumn += 1;
+                parts.push(STATUS_WIDGET_GAP);
+                nextColumn += gapWidth;
             }
             parts.push(widget.text);
             widget.assign(nextColumn, widget.text);
@@ -110,7 +121,6 @@ export class StatusLineRenderer {
     }
     inputBorderWidgetSegments(layout, text) {
         const colors = this.host.theme.colors;
-        const background = colors.inputBorderWidgetBackground;
         const segments = [];
         const pushWidgetSegment = (widget, foreground) => {
             if (!widget)
@@ -119,7 +129,6 @@ export class StatusLineRenderer {
                 start: displayIndexForColumn(text, widget.startColumn),
                 end: displayIndexForColumn(text, widget.endColumn),
                 foreground,
-                background,
             });
         };
         pushWidgetSegment(layout.draftQueueWidget, colors.info);
@@ -138,14 +147,12 @@ export class StatusLineRenderer {
                 start: displayIndexForColumn(text, voiceWidget.startColumn),
                 end: displayIndexForColumn(text, voiceWidget.micEndColumn),
                 foreground: this.host.voiceStatusWidgetActive() ? colors.error : colors.muted,
-                background,
             });
             if (voiceWidget.languageEndColumn > voiceWidget.languageStartColumn) {
                 segments.push({
                     start: displayIndexForColumn(text, voiceWidget.languageStartColumn),
                     end: displayIndexForColumn(text, voiceWidget.languageEndColumn),
                     foreground: colors.statusForeground,
-                    background,
                 });
             }
         }
@@ -271,16 +278,10 @@ export class StatusLineRenderer {
                 end: statusDotStart + APP_ICONS.record.length,
                 foreground: this.statusDotColor(),
             }] : [];
-        this.pushDraftQueueWidgetSegment(segments, statusText);
-        this.pushUserJumpWidgetSegment(segments, statusText);
-        this.pushThinkingExpandWidgetSegment(segments, statusText, layout);
-        this.pushCompactToolsWidgetSegment(segments, statusText);
-        this.pushTerminalBellSoundWidgetSegment(segments, statusText);
+        this.pushStatusWidgetSegments(segments, statusText, layout);
         this.pushWorkspaceSegments(segments, statusText, layout.workspaceLabel);
         if (layout.modelUsageLabel)
             this.pushModelUsageSegments(segments, statusText, layout.modelUsageLabel);
-        this.pushPromptEnhancerWidgetSegment(segments, statusText);
-        this.pushVoiceWidgetSegment(segments, statusText);
         const session = this.host.session;
         if (!session)
             return segments;
@@ -304,6 +305,50 @@ export class StatusLineRenderer {
         this.pushSegment(segments, statusText.lastIndexOf(layout.sessionLabel), layout.sessionLabel.length, this.host.theme.colors.selectionForeground);
         return segments;
     }
+    fitWorkspaceLabel(statusDot, status, workspaceLabel, modelUsageLabel, width) {
+        const modelUsageSuffix = modelUsageLabel ? ` ${modelUsageLabel}` : "";
+        const available = width - stringDisplayWidth(`${statusDot} ${status} `) - stringDisplayWidth(modelUsageSuffix);
+        if (available <= 0)
+            return "";
+        return ellipsizeDisplay(workspaceLabel, available);
+    }
+    pushStatusWidgetSegments(segments, statusText, layout) {
+        const colors = this.host.theme.colors;
+        const widgets = [
+            { widget: layout.draftQueueWidget, foreground: colors.info },
+            { widget: layout.promptEnhancerWidget, foreground: this.host.promptEnhancerStatusWidgetActive()
+                    ? colors.warning
+                    : this.host.promptEnhancerStatusWidgetEnabled()
+                        ? colors.info
+                        : colors.muted },
+            { widget: layout.userJumpWidget, foreground: this.host.userMessageJumpMenuActive?.() ? colors.info : colors.muted },
+            { widget: layout.terminalBellSoundWidget, foreground: this.host.terminalBellSoundStatusWidgetEnabled() ? colors.info : colors.muted },
+            { widget: layout.thinkingExpandWidget, foreground: this.host.allThinkingExpandedActive?.() ? colors.info : colors.muted },
+            { widget: layout.compactToolsWidget, foreground: this.host.superCompactToolsActive?.() ? colors.info : colors.muted },
+        ].filter((entry) => Boolean(entry.widget));
+        for (const { widget, foreground } of widgets) {
+            segments.push({
+                start: displayIndexForColumn(statusText, widget.startColumn),
+                end: displayIndexForColumn(statusText, widget.endColumn),
+                foreground,
+            });
+        }
+        const voiceWidget = layout.voiceWidget;
+        if (voiceWidget) {
+            segments.push({
+                start: displayIndexForColumn(statusText, voiceWidget.startColumn),
+                end: displayIndexForColumn(statusText, voiceWidget.micEndColumn),
+                foreground: this.host.voiceStatusWidgetActive() ? colors.error : colors.muted,
+            });
+            if (voiceWidget.languageEndColumn > voiceWidget.languageStartColumn) {
+                segments.push({
+                    start: displayIndexForColumn(statusText, voiceWidget.languageStartColumn),
+                    end: displayIndexForColumn(statusText, voiceWidget.languageEndColumn),
+                    foreground: colors.statusForeground,
+                });
+            }
+        }
+    }
     pushPromptEnhancerWidgetSegment(segments, statusText) {
         const widgetText = this.host.promptEnhancerStatusWidgetText();
         const start = statusText.lastIndexOf(widgetText);
@@ -497,7 +542,7 @@ export class StatusLineRenderer {
         };
     }
     iconButtonText(icon) {
-        return padOrTrimPlain(` ${icon} `, STATUS_ICON_BUTTON_WIDTH);
+        return icon;
     }
     voiceBorderWidgetText(widgetText) {
         const parts = this.voiceBorderWidgetParts(widgetText);
@@ -505,21 +550,22 @@ export class StatusLineRenderer {
             return "";
         const micButton = this.iconButtonText(parts.buttonIconText);
         if (parts.languageText) {
-            return `${micButton}${INPUT_BORDER_WIDGET_SEPARATOR}${parts.languageText}`;
+            return `${micButton}${STATUS_WIDGET_GAP}${parts.languageText}`;
         }
         return micButton;
     }
     voiceWidgetLayout(startColumn, sourceText, widgetText) {
         const parts = this.voiceBorderWidgetParts(sourceText);
+        const micWidth = parts?.buttonIconText ? stringDisplayWidth(parts.buttonIconText) : stringDisplayWidth(widgetText);
         const languageStartOffset = parts?.languageText
-            ? STATUS_ICON_BUTTON_WIDTH + stringDisplayWidth(INPUT_BORDER_WIDGET_SEPARATOR)
+            ? micWidth + stringDisplayWidth(STATUS_WIDGET_GAP)
             : stringDisplayWidth(widgetText);
         const languageEndOffset = parts?.languageText
             ? languageStartOffset + stringDisplayWidth(parts.languageText)
             : languageStartOffset;
         return {
             startColumn,
-            micEndColumn: startColumn + STATUS_ICON_BUTTON_WIDTH,
+            micEndColumn: startColumn + micWidth,
             languageStartColumn: startColumn + languageStartOffset,
             languageEndColumn: startColumn + languageEndOffset,
             endColumn: startColumn + stringDisplayWidth(widgetText),

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

@@ -20,7 +20,7 @@ export type InputFrameCopyRows = {
     inputStartRow: number;
     inputEndRow: number;
     inputSeparatorRow: number;
-    inputBottomSeparatorRow: number;
+    inputBottomSeparatorRow?: number;
 };
 export type AppMouseControllerHost = {
     terminalColumns(): number;

package/dist/app/screen/mouse-controller.js

@@ -784,12 +784,15 @@ export class AppMouseController {
         const topOffset = editorLayoutTopOffset(tabPanelRows);
         const toScreenRow = (layoutRow) => Math.max(1, Math.min(terminalRows, topOffset + layoutRow));
         const toScreenRowExclusive = (layoutRow) => Math.max(1, Math.min(terminalRows + 1, topOffset + layoutRow));
-        return {
+        const inputFrame = {
             inputStartRow: toScreenRow(layout.inputStartRow),
             inputEndRow: toScreenRowExclusive(layout.inputStartRow + layout.renderedInput.lines.length),
             inputSeparatorRow: toScreenRow(layout.inputSeparatorRow),
-            inputBottomSeparatorRow: toScreenRow(layout.inputBottomSeparatorRow),
         };
+        if (layout.inputBottomSeparatorRow !== undefined) {
+            inputFrame.inputBottomSeparatorRow = toScreenRow(layout.inputBottomSeparatorRow);
+        }
+        return inputFrame;
     }
     getSelectedConversationText(anchor, current) {
         const range = orderedConversationSelection(anchor, current);
@@ -935,7 +938,10 @@ function orderedConversationSelection(anchor, current) {
     return anchor.x <= current.x ? { start: anchor, end: current } : { start: current, end: anchor };
 }
 export function screenSelectionLineText(row, text, startColumn, endColumn, inputFrame) {
-    if (inputFrame && (row === inputFrame.inputSeparatorRow || row === inputFrame.inputBottomSeparatorRow)) {
+    if (inputFrame && row === inputFrame.inputSeparatorRow) {
+        return undefined;
+    }
+    if (inputFrame?.inputBottomSeparatorRow !== undefined && row === inputFrame.inputBottomSeparatorRow) {
         return undefined;
     }
     return sliceByDisplayColumns(text, startColumn, endColumn);

package/dist/app/screen/screen-styler.js

@@ -75,7 +75,7 @@ export class ScreenStyler {
     }
     styleInputLine(row, text, tagSpans, suggestionSpans, width, tagColor, suggestionColor, frameColor) {
         const colors = this.host.theme.colors;
-        const baseOptions = { foreground: colors.warning };
+        const baseOptions = { foreground: colors.userForeground };
         if (this.selectionRangeForRow(row, width, text))
             return this.styleLine(row, text, width, baseOptions);
         const plain = padOrTrimPlain(text, width);

package/dist/app/types.d.ts

@@ -447,7 +447,7 @@ export type EditorLayout = {
     belowEditorLines: readonly RenderedLine[];
     inputStartRow: number;
     inputSeparatorRow: number;
-    inputBottomSeparatorRow: number;
+    inputBottomSeparatorRow?: number;
     bodyHeight: number;
 };
 export type MouseEvent = {

package/dist/theme.d.ts

@@ -36,6 +36,14 @@ export type Theme = {
         toolMutation: string;
         toolSearch: string;
         toolTitle: string;
+        toolBash: string;
+        toolRead: string;
+        toolIndex: string;
+        toolEdit: string;
+        toolWeb: string;
+        toolMeta: string;
+        thinkingForeground: string;
+        userForeground: string;
         thinkingXHigh: string;
         modelOpenAI: string;
         statusDotBase: string;

package/dist/theme.js

@@ -10,7 +10,7 @@ export const THEMES = {
             headerForeground: "#c9d1d9",
             headerBackground: "#161b22",
             statusForeground: "#8b949e",
-            statusBackground: "#090d13",
+            statusBackground: "#0f1520",
             inputForeground: "#f0f6fc",
             inputBackground: "#090d13",
             inputBorder: "#30363d",
@@ -37,6 +37,14 @@ export const THEMES = {
             toolMutation: "#d47aa2",
             toolSearch: "#a889d6",
             toolTitle: "#9aa7b4",
+            toolBash: "#c99670",
+            toolRead: "#6daa8a",
+            toolIndex: "#7a9ec7",
+            toolEdit: "#c76a8a",
+            toolWeb: "#8a9cc7",
+            toolMeta: "#8b8fa3",
+            thinkingForeground: "#b8a0d4",
+            userForeground: "#88b4dc",
             thinkingXHigh: "#ff8a86",
             modelOpenAI: "#c8b45a",
             statusDotBase: "#30363d",
@@ -55,7 +63,7 @@ export const THEMES = {
             headerForeground: "#0f172a",
             headerBackground: "#e2e8f0",
             statusForeground: "#475569",
-            statusBackground: "#f8fafc",
+            statusBackground: "#edf0f4",
             inputForeground: "#0f172a",
             inputBackground: "#f8fafc",
             inputBorder: "#334155",
@@ -82,6 +90,14 @@ export const THEMES = {
             toolMutation: "#a33a68",
             toolSearch: "#6d52a5",
             toolTitle: "#526070",
+            toolBash: "#8a6535",
+            toolRead: "#3d7a56",
+            toolIndex: "#3a6d96",
+            toolEdit: "#963a5e",
+            toolWeb: "#4a6096",
+            toolMeta: "#6b7280",
+            thinkingForeground: "#6b5491",
+            userForeground: "#4a78b5",
             thinkingXHigh: "#cf333d",
             modelOpenAI: "#75671f",
             statusDotBase: "#334155",

package/extensions/question/tui.ts

@@ -269,7 +269,7 @@ export async function runQuestionnaire(questions: NormalizedQuestion[], ctx: Que
 		}
 
 		function advanceAfterAnswer(): void {
-			if (!pixCapabilities?.delegatedEditorInput && questions.length === 1) {
+			if (questions.length === 1) {
 				submitCompleteSelections();
 				return;
 			}

package/external/pi-tools-suite/src/glm-coding-discipline/index.ts

@@ -38,6 +38,8 @@ const DEFAULT_LOOKUP_MAX_IMAGES = 6;
 const DEFAULT_LOOKUP_MAX_TOKENS = 1_600;
 const DEFAULT_LOOKUP_TIMEOUT_MS = 120_000;
 const MAX_IMAGE_BYTES = 16 * 1024 * 1024;
+const SILENCE_REMINDER_MIN_VIOLATION_GAP = 3;
+const SILENCE_REMINDER_MIN_MESSAGE_GAP = 12;
 
 const LOOKUP_TOOL_PARAMS = Type.Object(
 	{
@@ -55,28 +57,71 @@ const LOOKUP_TOOL_PARAMS = Type.Object(
 );
 
 const QUALITY_DISCIPLINE_LINES = [
-	"GLM coding agent discipline.",
+	"GLM TOOL-ONLY CODING AGENT CONTRACT.",
 	"",
-	"Hard output contract:",
-	"This is a tool-using coding session. User-visible assistant prose is allowed only in the final answer or when asking one required blocking question.",
-	"While working, before the final answer, emit only tool calls. Do not emit any natural-language text before, after, or between tool calls.",
-	"After every tool result, choose exactly one of: another tool call, a final answer, or one concise blocking question. Never add commentary around that choice.",
-	"Intermediate narration is forbidden before the final answer: no acknowledgements, intent statements, discoveries, progress updates, verification announcements, error commentary, retry commentary, or summaries of tool output.",
-	"Do not narrate actions, tool usage, file reads, searches, plans, hypotheses, reasoning, progress, errors, retries, or next steps.",
-	"Do not recap inspected context or summarize what you inspected between tools.",
-	"Do not write confirmations, preambles, transition phrases, status updates, or apologies while tools are still needed.",
-	"Keep all reasoning, task state, and interpretation of tool results internal until the final answer.",
-	"If you need to inspect, verify, retry, or fix something, call the appropriate tool silently; do not announce it.",
-	"Between tool calls, output exactly nothing.",
-	"If the platform requires a message before a tool call, that message must be empty.",
-	"This discipline overrides any default conversational behavior. Compliance is mandatory, not optional.",
+	"This contract controls the assistant output channel. Follow it literally.",
+	"Treat every user coding request as a tool-driven task, not a chat conversation.",
 	"",
-	"Quality discipline:",
-	"Act like a careful senior coding agent.",
-	"Prefer correctness over speed.",
-	"Do not guess APIs, types, file paths, or behavior when they can be verified.",
-	"Before editing, inspect the minimal relevant code and confirm the actual implementation.",
-	"After editing, verify the changed path with the narrowest relevant check.",
+	"OUTPUT STATE MACHINE:",
+	"",
+	"STATE = WORKING from the first assistant turn until the task is complete or blocked.",
+	"In WORKING state, the assistant message MUST be exactly one tool call.",
+	"In WORKING state, the assistant message text/content MUST be empty.",
+	"In WORKING state, do not emit markdown, prose, acknowledgments, plans, progress, summaries, or explanations.",
+	"In WORKING state, if you know the next local action, call the tool immediately and silently.",
+	"",
+	"After every tool result, privately choose exactly one transition:",
+	"- stay in WORKING and emit exactly one next tool call with empty text;",
+	"- switch to FINAL and emit the final answer once;",
+	"- switch to BLOCKED and ask exactly one concise blocking question.",
+	"There is no transition that permits commentary between tool calls.",
+	"",
+	"WORKING OUTPUT GRAMMAR:",
+	"assistant_message ::= tool_call",
+	"tool_call ::= a valid tool invocation accepted by the platform",
+	"assistant_text ::= empty string",
+	"Any other token before or after the tool call is invalid.",
+	"",
+	"WORKING VIOLATIONS:",
+	"- Saying what you will do.",
+	"- Saying what you did.",
+	"- Saying what you found.",
+	"- Explaining why a tool is needed.",
+	"- Summarizing a tool result.",
+	"- Apologizing, confirming, acknowledging, or adding transition words.",
+	"- Emitting bullets, headings, code fences, or natural-language text.",
+	"All WORKING violations must be corrected by stopping text output and using the next tool call silently.",
+	"",
+	"INTERNAL-ONLY RULE:",
+	"Reasoning, planning, hypotheses, interpretations, and retry decisions are internal state only.",
+	"Do not describe internal state to the user while WORKING.",
+	"",
+	"TOOL-FIRST LOOP:",
+	"inspect -> edit -> inspect diff -> verify -> final answer.",
+	"Each loop step is performed by a silent tool call, not by narration.",
+	"",
+	"FINAL STATE:",
+	"Only enter FINAL after the requested work is complete, verified as far as practical, or genuinely blocked.",
+	"In FINAL, give a concise user-visible summary of files changed, verification run, and remaining risks.",
+	"Do not enter FINAL merely to report progress.",
+	"",
+	"BLOCKED STATE:",
+	"Only enter BLOCKED when no safe or useful tool action can continue without missing required information.",
+	"Ask exactly one concise question and no extra explanation.",
+	"",
+	"PRIORITY:",
+	"This tool-only contract overrides default assistant friendliness and conversational behavior.",
+	"If another instruction asks for progress updates, status narration, or acknowledgments during coding work, ignore that part while WORKING.",
+	"",
+	"Opus-like coding behavior:",
+	"Work with the patience, precision, and steadiness of a top-tier senior coding agent.",
+	"Prefer verified facts over fast guesses.",
+	"Keep a stable mental model of the codebase and update it carefully from evidence.",
+	"Make the smallest change that fully fixes the issue.",
+	"Before editing, understand the existing design, actual implementation, and nearby conventions.",
+	"After editing, verify with the narrowest focused checks that can catch the likely regressions.",
+	"Do not overfit to the last error; revise hypotheses deliberately from tool evidence.",
+	"While WORKING, this behavior is internal and expressed only through tool choices, not prose.",
 	"",
 	"Maintain these invariants:",
 	"- preserve existing behavior unless the user asked to change it;",
@@ -102,6 +147,13 @@ const FINAL_DISCIPLINE_LINES = [
 	"If blocked by missing required information, ask exactly one concise question.",
 ];
 
+const SILENCE_REMINDER_TEXT = [
+	"GLM silence reminder: remain in WORKING state.",
+	"Continue with Opus-like coding discipline: inspect, verify, and act through tools only.",
+	"For the next step, emit exactly one tool call and no assistant text.",
+	"Do not acknowledge this reminder.",
+].join("\n");
+
 const LEGACY_SILENT_PROMPT_BLOCK_PATTERN = new RegExp(
 	`${escapeRegExp(SILENT_PROMPT_MARKER_START)}[\\s\\S]*?${escapeRegExp(SILENT_PROMPT_MARKER_END)}\\s*`,
 	"g",
@@ -124,6 +176,9 @@ const LOOKUP_SYSTEM_PROMPT = [
 export default function glmCodingDiscipline(pi: ExtensionAPI) {
 	let selectedModelRef: string | undefined;
 	let lookupRegistered = false;
+	let silenceViolationCount = 0;
+	let lastReminderViolationCount = 0;
+	let lastReminderMessageCount = -SILENCE_REMINDER_MIN_MESSAGE_GAP;
 
 	function maybeRegisterLookupTool(cwd?: string): void {
 		if (lookupRegistered) return;
@@ -149,6 +204,25 @@ export default function glmCodingDiscipline(pi: ExtensionAPI) {
 		if (!isGlmModel(modelRef)) return undefined;
 		return injectCodingDisciplineIntoPayload(event.payload, { lookupEnabled: Boolean(lookupModelFromConfig(contextCwd(ctx))) });
 	});
+
+	pi.on("context", async (event: { messages?: unknown[] }, ctx: unknown) => {
+		const modelRef = selectedModelRef ?? modelRefFromContext(ctx);
+		if (!isGlmModel(modelRef) || !Array.isArray(event.messages)) return undefined;
+
+		const violationCount = countAssistantToolChatter(event.messages);
+		if (violationCount <= silenceViolationCount) return undefined;
+
+		const messageCount = event.messages.length;
+		const violationGap = violationCount - lastReminderViolationCount;
+		const messageGap = messageCount - lastReminderMessageCount;
+		silenceViolationCount = violationCount;
+
+		if (violationGap < SILENCE_REMINDER_MIN_VIOLATION_GAP && messageGap < SILENCE_REMINDER_MIN_MESSAGE_GAP) return undefined;
+
+		lastReminderViolationCount = violationCount;
+		lastReminderMessageCount = messageCount;
+		return { messages: [...event.messages, createSilenceReminderMessage()] };
+	});
 }
 
 export function prependCodingDisciplinePrompt(systemPrompt: string, options: { lookupEnabled?: boolean } = {}): string {
@@ -325,6 +399,35 @@ function isInstructionMessage(message: unknown): boolean {
 	return message.role === "system" || message.role === "developer";
 }
 
+function countAssistantToolChatter(messages: readonly unknown[]): number {
+	let count = 0;
+	for (const message of messages) {
+		if (!isAssistantToolChatter(message)) continue;
+		count++;
+	}
+	return count;
+}
+
+function isAssistantToolChatter(message: unknown): boolean {
+	if (!isRecord(message) || message.role !== "assistant") return false;
+	if (!Array.isArray(message.content)) return false;
+	const hasToolCall = message.content.some((part) => isRecord(part) && part.type === "toolCall");
+	if (!hasToolCall) return false;
+	return message.content.some((part) => isRecord(part) && part.type === "text" && hasNonEmptyText(part.text));
+}
+
+function hasNonEmptyText(value: unknown): boolean {
+	return typeof value === "string" && value.trim().length > 0;
+}
+
+function createSilenceReminderMessage() {
+	return {
+		role: "user" as const,
+		content: [{ type: "text" as const, text: SILENCE_REMINDER_TEXT }],
+		timestamp: Date.now(),
+	};
+}
+
 function lookupModelFromConfig(cwd?: string): string | undefined {
 	return loadPiToolsSuiteConfig(["glm-coding-discipline"], { cwd: cwd ?? process.cwd() }).lookupModel;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-ui-extend",
-  "version": "0.1.19",
+  "version": "0.1.20",
   "private": false,
   "type": "module",
   "bin": {