pi-ui-extend 0.1.15 → 0.1.17

package/dist/app/app.d.ts

@@ -44,6 +44,7 @@ export declare class PiUiExtendApp {
     private readonly extensionShutdownHandler;
     private runtime;
     private readonly inputEditor;
+    private lastInputEditorContentVersion;
     private readonly requestHistory;
     /** Shortcut: get/set the editor text as a plain string. */
     private get input();
@@ -101,6 +102,7 @@ export declare class PiUiExtendApp {
     private clearToastTimers;
     private render;
     private scheduleRender;
+    private syncScrollAfterInputEditorChange;
     private renderStatusLine;
     private terminalColumns;
     private terminalRows;

package/dist/app/app.js

@@ -110,6 +110,7 @@ export class PiUiExtendApp {
     extensionShutdownHandler = () => { };
     runtime;
     inputEditor = new InputEditor();
+    lastInputEditorContentVersion = this.inputEditor.contentVersion;
     requestHistory;
     /** Shortcut: get/set the editor text as a plain string. */
     get input() { return this.inputEditor.text; }
@@ -126,6 +127,8 @@ export class PiUiExtendApp {
     constructor(options) {
         this.options = options;
         this.theme = THEMES[options.themeName];
+        this.pixConfig = loadPixConfig(this.options.cwd);
+        setAppIconTheme(this.pixConfig.iconTheme.name);
         const app = this;
         this.blinkController = new AppBlinkController({
             render: () => this.render(),
@@ -157,6 +160,7 @@ export class PiUiExtendApp {
         });
         this.tabsController = new AppTabsController({
             options: this.options,
+            maxProjectSessions: this.pixConfig.maxProjectSessions,
             blinkController: this.blinkController,
             runtime: () => this.runtime,
             createRuntimeForNewSession: () => this.createRuntime(newTabRuntimeOptions(this.options)),
@@ -175,8 +179,8 @@ export class PiUiExtendApp {
             loadSessionHistory: () => this.loadSessionHistory(),
             loadSessionHistoryAsync: (options) => this.loadSessionHistoryAsync(options),
             syncUserSessionEntryMetadata: () => this.workspaceActions.syncUserSessionEntryMetadata(),
-            captureInputState: () => ({ text: this.inputEditor.text, cursor: this.inputEditor.cursor }),
-            restoreInputState: (state) => this.restoreTabInputState(state.text, state.cursor),
+            captureInputState: () => this.inputEditor.draftState,
+            restoreInputState: (state) => this.restoreTabInputState(state),
             closeMenusForTabSwitch: () => this.popupMenus.closeMenusForTabSwitch(),
             captureDeferredUserMessages: () => this.queuedMessages.captureDeferredUserMessages(),
             restoreDeferredUserMessages: (messages) => this.queuedMessages.restoreDeferredUserMessages(messages),
@@ -184,8 +188,6 @@ export class PiUiExtendApp {
             showToast: (message, kind) => this.showToast(message, kind),
             render: () => this.render(),
         });
-        this.pixConfig = loadPixConfig(this.options.cwd);
-        setAppIconTheme(this.pixConfig.iconTheme.name);
         this.terminalBellSoundController = new TerminalBellSoundController();
         this.promptEnhancer = new AppPromptEnhancerController({
             runtime: () => this.runtime,
@@ -224,10 +226,12 @@ export class PiUiExtendApp {
         const popupMenuRenderer = new PopupMenuRenderer({
             theme: this.theme,
             screenStyler: this.screenStyler,
+            modelColors: this.pixConfig.modelColors,
             get entries() { return app.entries; },
             get session() { return app.runtime?.session; },
             get resumeLoading() { return app.resumeLoading; },
             get resumeSessionCount() { return app.resumeSessions.length; },
+            get userMessageJumpLoading() { return app.menuItems.isUserMessageJumpLoading(); },
         });
         this.popupMenus = new AppPopupMenuController({
             get entries() { return app.entries; },
@@ -430,6 +434,7 @@ export class PiUiExtendApp {
         this.commandController = new AppCommandController({
             options: this.options,
             runtime: () => this.runtime,
+            requestHistory: () => this.requestHistory,
             getInput: () => this.input,
             setInput: (value) => this.setInput(value),
             promptEnhancerModelRef: () => this.pixConfig.promptEnhancer.modelRef,
@@ -614,6 +619,7 @@ export class PiUiExtendApp {
             addEntry: (entry) => this.addEntry(entry),
             addSessionAbortedEntry: () => this.sessionEvents.addSessionAbortedEntry(),
             showToast: (message, kind) => this.showToast(message, kind),
+            dismissActiveDialog: () => this.toastController.dismissActiveDialog(),
             stopVoiceInput: () => this.voiceController.stopRecording(),
             isShellCommandRunning: () => this.shellController.isRunning(),
             runChatShellCommand: (command) => this.shellController.run(command),
@@ -814,10 +820,10 @@ export class PiUiExtendApp {
         this.popupMenus.resetInputMenuDismissals();
         this.autocompleteController.dispose();
     }
-    restoreTabInputState(text, cursor) {
+    restoreTabInputState(state) {
         this.requestHistory.resetNavigation();
         this.popupMenus.resetInputMenuDismissals();
-        this.inputEditor.setText(text, cursor);
+        this.inputEditor.setDraftState(state);
         this.autocompleteController.dispose();
     }
     async clearPersistedInputDraft() {
@@ -1007,6 +1013,7 @@ export class PiUiExtendApp {
             this.scheduledRenderTimer = undefined;
         }
         this.autocompleteController.observeInput();
+        this.syncScrollAfterInputEditorChange();
         this.renderController.render();
     }
     scheduleRender() {
@@ -1014,10 +1021,18 @@ export class PiUiExtendApp {
             return;
         this.scheduledRenderTimer = setTimeout(() => {
             this.scheduledRenderTimer = undefined;
+            this.syncScrollAfterInputEditorChange();
             this.renderController.render();
         }, COALESCED_RENDER_DELAY_MS);
         this.scheduledRenderTimer.unref?.();
     }
+    syncScrollAfterInputEditorChange() {
+        const contentVersion = this.inputEditor.contentVersion;
+        if (contentVersion === this.lastInputEditorContentVersion)
+            return;
+        this.lastInputEditorContentVersion = contentVersion;
+        this.scrollController.scrollToBottom();
+    }
     renderStatusLine() {
         this.renderController.renderStatusLine();
     }

package/dist/app/commands/command-controller.js

@@ -54,6 +54,7 @@ export class AppCommandController {
             runCloneCommand: () => this.navigationActions.runCloneCommand(),
             runTreeCommand: (argumentsText) => this.navigationActions.runTreeCommand(argumentsText),
             runJumpCommand: (argumentsText) => this.navigationActions.runJumpCommand(argumentsText),
+            runHistoryCommand: (argumentsText) => this.navigationActions.runHistoryCommand(argumentsText),
             runSearchCommand: (argumentsText) => this.navigationActions.runSearchCommand(argumentsText),
             runUnsupportedBuiltinCommand: (commandName, message) => this.navigationActions.runUnsupportedBuiltinCommand(commandName, message),
             runResumePathCommand: (sessionPath) => this.navigationActions.runResumePathCommand(sessionPath),

package/dist/app/commands/command-host.d.ts

@@ -1,11 +1,13 @@
 import type { AgentSession, AgentSessionRuntime, SessionInfo } from "@earendil-works/pi-coding-agent";
 import type { SessionSearchResult } from "../session/session-search.js";
+import type { AppRequestHistory } from "../session/request-history.js";
 import type { ActivePopupMenu, AppOptions, Entry, ModelMenuValue, PixMenuItem, PixMenuOptions, PopupMenuPlacement, ScopedSessionModel, SessionModel, ThinkingMenuValue } from "../types.js";
 import type { ToastNotifier } from "../../ui.js";
 export type DirectPopupMenu = Exclude<ActivePopupMenu, "slash">;
 export type CommandControllerHost = {
     readonly options: AppOptions;
     runtime(): AgentSessionRuntime | undefined;
+    requestHistory(): AppRequestHistory;
     getInput(): string;
     setInput(value: string): void;
     promptEnhancerModelRef(): string;

package/dist/app/commands/command-navigation-actions.d.ts

@@ -2,6 +2,14 @@ import type { SessionInfo } from "@earendil-works/pi-coding-agent";
 import type { CommandControllerHost } from "./command-host.js";
 import { type ResumeSessionLoaderOptions } from "../session/resume-session-loader.js";
 import type { PopupMenuPlacement } from "../types.js";
+export declare function formatHistoryMenuLabel(text: string): string;
+export declare function historyHighlightRanges(ranges: readonly {
+    start: number;
+    end: number;
+}[], text: string): {
+    start: number;
+    end: number;
+}[];
 export declare class NavigationCommandActions {
     private readonly host;
     private readonly resumeSessionLoader;
@@ -11,6 +19,7 @@ export declare class NavigationCommandActions {
     runCloneCommand(): Promise<void>;
     runTreeCommand(argumentsText: string): Promise<void>;
     runJumpCommand(argumentsText: string): Promise<void>;
+    runHistoryCommand(argumentsText: string): Promise<void>;
     runSearchCommand(argumentsText: string): Promise<void>;
     runUnsupportedBuiltinCommand(commandName: string, message: string): Promise<void>;
     runResumePathCommand(sessionPath: string): Promise<void>;

package/dist/app/commands/command-navigation-actions.js

@@ -11,6 +11,24 @@ function nextTick() {
         setImmediate(resolve);
     });
 }
+export function formatHistoryMenuLabel(text) {
+    return sanitizeText(text).replace(/\n/g, " ↵ ");
+}
+export function historyHighlightRanges(ranges, text) {
+    return ranges.map((range) => ({
+        start: historyLabelIndex(range.start, text),
+        end: historyLabelIndex(range.end, text),
+    })).filter((range) => range.end > range.start);
+}
+function historyLabelIndex(index, text) {
+    const before = text.slice(0, Math.max(0, Math.min(index, text.length)));
+    const newlineCount = before.split("\n").length - 1;
+    return before.length + newlineCount * 2;
+}
+function formatHistoryMenuDescription(text) {
+    const lines = sanitizeText(text).split("\n");
+    return lines.length > 1 ? `${lines.length} lines` : undefined;
+}
 export class NavigationCommandActions {
     host;
     resumeSessionLoader;
@@ -98,12 +116,53 @@ export class NavigationCommandActions {
         const runtime = getRuntime(this.host, "jump");
         if (!runtime)
             return;
-        this.host.setStatus("scanning session messages…");
-        this.host.render();
-        await this.host.refreshUserMessageJumpMenuItems();
         this.host.openDirectPopupMenu("user-message-jump", { preserveStatus: true });
         this.host.setDirectPopupMenuQuery(argumentsText.trim());
         this.host.render();
+        try {
+            await this.host.refreshUserMessageJumpMenuItems();
+        }
+        catch (error) {
+            this.host.toast.error(`Could not load jump messages: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        finally {
+            this.host.render();
+        }
+    }
+    async runHistoryCommand(argumentsText) {
+        const query = argumentsText.trim();
+        const matches = this.host.requestHistory().searchMatches(query, 100);
+        if (matches.length === 0) {
+            this.host.addEntry({ id: createId("system"), kind: "system", text: query ? `No command history found for: ${query}` : "Command history is empty." });
+            this.host.toast.info(query ? "No matching command history" : "Command history is empty");
+            this.host.setSessionStatus(this.host.runtime()?.session);
+            this.host.render();
+            return;
+        }
+        const selected = await this.host.showMenu(matches.map((match) => {
+            const description = formatHistoryMenuDescription(match.value);
+            return {
+                value: match.value,
+                label: formatHistoryMenuLabel(match.value),
+                labelHighlightRanges: match.matchedText === match.label ? historyHighlightRanges(match.matchedRanges, match.value) : [],
+                ...(description === undefined ? {} : { description }),
+            };
+        }), {
+            title: query ? `Search command history: ${query}` : "Command history",
+            placeholder: "Filter history",
+            emptyText: "No matching command history",
+            searchable: true,
+            minScorePerCharacter: 8,
+            preferKeyboardLayoutMatches: true,
+        });
+        if (!selected) {
+            this.host.setSessionStatus(this.host.runtime()?.session);
+            return;
+        }
+        this.host.setInput(selected);
+        this.host.toast.info("Restored command from history");
+        this.host.setSessionStatus(this.host.runtime()?.session);
+        this.host.render();
     }
     async runSearchCommand(argumentsText) {
         const runtime = getIdleRuntime(this.host, "search");

package/dist/app/commands/command-registry.d.ts

@@ -25,6 +25,7 @@ export type CommandRegistryActions = {
     runCloneCommand(): Promise<void>;
     runTreeCommand(argumentsText: string): Promise<void>;
     runJumpCommand(argumentsText: string): Promise<void>;
+    runHistoryCommand(argumentsText: string): Promise<void>;
     runSearchCommand(argumentsText: string): Promise<void>;
     runUnsupportedBuiltinCommand(commandName: string, message: string): Promise<void>;
     runReloadCommand(): Promise<void>;

package/dist/app/commands/command-registry.js

@@ -185,6 +185,14 @@ export function createSlashCommands(actions, host) {
             allowArguments: true,
             run: (argumentsText) => actions.runJumpCommand(argumentsText),
         },
+        {
+            name: "history",
+            description: "Search command history and restore a match",
+            kind: "builtin",
+            keywords: ["command", "request", "prompt", "find", "recent"],
+            allowArguments: true,
+            run: (argumentsText) => actions.runHistoryCommand(argumentsText),
+        },
         {
             name: "search",
             description: "Search sessions and open a match in a new tab",

package/dist/app/constants.d.ts

@@ -42,7 +42,6 @@ export declare const GIT_BRANCH_CACHE_MS = 30000;
 export declare const TODO_TOOL_NAME = "todo";
 export declare const TODO_ACTIONS: readonly ["create", "update", "batch_create", "batch_update", "list", "get", "delete", "clear", "export", "import"];
 export declare const TODO_STATUSES: readonly ["pending", "in_progress", "deferred", "completed", "deleted"];
-export declare const TODO_PRIORITIES: readonly ["low", "medium", "high", "urgent"];
 export declare const SUBAGENT_STATUSES: readonly ["planned", "running", "retrying", "done", "failed", "stopped"];
 export declare const SUBAGENT_ACTIVE_STATUSES: readonly ["planned", "running", "retrying"];
 export declare const SUBAGENT_TERMINAL_STATUSES: readonly ["done", "failed", "stopped"];

package/dist/app/constants.js

@@ -90,7 +90,6 @@ export const TODO_ACTIONS = [
     "import",
 ];
 export const TODO_STATUSES = ["pending", "in_progress", "deferred", "completed", "deleted"];
-export const TODO_PRIORITIES = ["low", "medium", "high", "urgent"];
 export const SUBAGENT_STATUSES = ["planned", "running", "retrying", "done", "failed", "stopped"];
 export const SUBAGENT_ACTIVE_STATUSES = ["planned", "running", "retrying"];
 export const SUBAGENT_TERMINAL_STATUSES = ["done", "failed", "stopped"];

package/dist/app/icons.d.ts

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

package/dist/app/icons.js

@@ -18,6 +18,7 @@ const NERD_FONT_ICONS = {
     deleted: "\u{f0159}",
     deferred: "\u{f0377}",
     info: "\u{f02fc}",
+    lightbulb: "\u{f0335}",
     microphone: "\u{f036c}",
     plus: "\u{f0415}",
     pause: "\u{f03e4}",
@@ -44,6 +45,7 @@ const FALLBACK_ICONS = {
     deleted: "×",
     deferred: "↷",
     info: "i",
+    lightbulb: "💡",
     microphone: "m",
     plus: "+",
     pause: "⏸",

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

@@ -19,6 +19,7 @@ export type AppInputActionControllerHost = {
     addEntry(entry: Entry): void;
     addSessionAbortedEntry(): void;
     showToast(message: string, kind: "success" | "error" | "warning" | "info"): void;
+    dismissActiveDialog?(): boolean;
     stopVoiceInput(): Promise<void>;
     isShellCommandRunning(): boolean;
     runChatShellCommand(command: string): Promise<InteractiveShellCommandResult>;

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

@@ -80,10 +80,11 @@ export class AppInputActionController {
         }
     }
     closeActiveGlobalUi() {
-        if (!this.popupMenus.syncActivePopupMenu())
-            return false;
-        this.popupMenus.cancelActivePopupMenu();
-        return true;
+        if (this.popupMenus.syncActivePopupMenu()) {
+            this.popupMenus.cancelActivePopupMenu();
+            return true;
+        }
+        return this.host.dismissActiveDialog?.() ?? false;
     }
     async abortStreamingSession(runtime, options) {
         const session = runtime.session;

package/dist/app/popup/menu-items-controller.d.ts

@@ -11,6 +11,7 @@ export declare class AppMenuItemsController {
     private readonly host;
     private resumeMenuLoaderCache;
     private userMessageJumpItems;
+    private userMessageJumpLoading;
     constructor(host: AppMenuItemsControllerHost);
     parseSlashInput(text: string): import("../types.js").ParsedSlashInput | undefined;
     getResourceSlashCommands(): SlashCommand[];
@@ -22,6 +23,7 @@ export declare class AppMenuItemsController {
     getThinkingMenuItems(query: string): PopupMenuItem<ThinkingMenuValue>[];
     getUserMessageMenuItems(): PopupMenuItem<UserMessageMenuValue>[];
     getUserMessageJumpMenuItems(query: string): PopupMenuItem<UserMessageJumpMenuValue>[];
+    isUserMessageJumpLoading(): boolean;
     refreshUserMessageJumpMenuItems(): Promise<void>;
     getQueueMessageMenuItems(): PopupMenuItem<QueueMessageMenuValue>[];
     getResumeMenuItems(query: string, limit?: number): PopupMenuItem<ResumeMenuValue>[];

package/dist/app/popup/menu-items-controller.js

@@ -12,6 +12,7 @@ export class AppMenuItemsController {
     host;
     resumeMenuLoaderCache;
     userMessageJumpItems;
+    userMessageJumpLoading = false;
     constructor(host) {
         this.host = host;
     }
@@ -29,6 +30,9 @@ export class AppMenuItemsController {
             value: match.value,
             label: `/${match.value.name}`,
             description: match.value.description,
+            labelHighlightRanges: match.matchedText === match.label
+                ? match.matchedRanges.map((range) => ({ start: range.start + 1, end: range.end + 1 }))
+                : [],
         }));
     }
     modelRef(model) {
@@ -64,6 +68,7 @@ export class AppMenuItemsController {
             value: match.value,
             label: `${match.value.ref}${match.value.current ? ` ${APP_ICONS.check}` : ""}`,
             description: match.value.model.name,
+            labelHighlightRanges: labelHighlightRangesFromMatch(match.matchedText, match.matchedRanges, match.label),
         }));
     }
     getThinkingMenuItems(query) {
@@ -96,26 +101,36 @@ export class AppMenuItemsController {
     getUserMessageJumpMenuItems(query) {
         return filterUserMessageJumpItems(this.userMessageJumpItems ?? buildUserMessageJumpItems(this.host.getEntries()), query);
     }
+    isUserMessageJumpLoading() {
+        return this.userMessageJumpLoading;
+    }
     async refreshUserMessageJumpMenuItems() {
         const runtime = this.host.runtime();
         if (!runtime) {
             this.userMessageJumpItems = undefined;
+            this.userMessageJumpLoading = false;
             return;
         }
-        const entries = await sessionHistoryFullBranchEntries(runtime.session);
-        const loadedBySessionEntryId = new Map(this.host.getEntries()
-            .filter((entry) => entry.kind === "user" && typeof entry.sessionEntryId === "string")
-            .map((entry) => [entry.sessionEntryId, entry]));
-        const sources = entries.flatMap((entry) => {
-            if (entry.type !== "message" || !isRecord(entry.message) || entry.message.role !== "user")
-                return [];
-            const text = renderUserMessageContent(entry.message.content);
-            if (!text)
-                return [];
-            const loaded = loadedBySessionEntryId.get(entry.id);
-            return [{ text, ...(loaded ? { entryId: loaded.id } : {}), sessionEntryId: entry.id }];
-        });
-        this.userMessageJumpItems = buildUserMessageJumpItems(sources);
+        this.userMessageJumpLoading = true;
+        try {
+            const entries = await sessionHistoryFullBranchEntries(runtime.session);
+            const loadedBySessionEntryId = new Map(this.host.getEntries()
+                .filter((entry) => entry.kind === "user" && typeof entry.sessionEntryId === "string")
+                .map((entry) => [entry.sessionEntryId, entry]));
+            const sources = entries.flatMap((entry) => {
+                if (entry.type !== "message" || !isRecord(entry.message) || entry.message.role !== "user")
+                    return [];
+                const text = renderUserMessageContent(entry.message.content);
+                if (!text)
+                    return [];
+                const loaded = loadedBySessionEntryId.get(entry.id);
+                return [{ text, ...(loaded ? { entryId: loaded.id } : {}), sessionEntryId: entry.id }];
+            });
+            this.userMessageJumpItems = buildUserMessageJumpItems(sources);
+        }
+        finally {
+            this.userMessageJumpLoading = false;
+        }
     }
     getQueueMessageMenuItems() {
         return [
@@ -205,6 +220,14 @@ export class AppMenuItemsController {
         }
     }
 }
+function labelHighlightRangesFromMatch(matchedText, matchedRanges, label) {
+    if (matchedText === label)
+        return matchedRanges;
+    const offset = label.toLocaleLowerCase().indexOf(matchedText.toLocaleLowerCase());
+    if (offset < 0)
+        return [];
+    return matchedRanges.map((range) => ({ start: offset + range.start, end: offset + range.end }));
+}
 function normalizeAvailableThinkingLevels(levels) {
     const seen = new Set();
     const normalized = [];

package/dist/app/popup/popup-menu-controller.js

@@ -666,10 +666,18 @@ export class AppPopupMenuController {
                 value: item,
                 label: item.label,
                 ...(item.keywords === undefined ? {} : { keywords: item.keywords }),
-            })), query).map((match) => match.value);
+            })), query, {
+                ...(request.options.minScorePerCharacter === undefined ? {} : { minScorePerCharacter: request.options.minScorePerCharacter }),
+                preferKeyboardLayoutMatches: request.options.preferKeyboardLayoutMatches ?? false,
+            }).map((match) => ({
+                ...match.value,
+                labelHighlightRanges: match.matchedText === match.label ? match.matchedRanges : [],
+            }));
         return this.withoutCloseMenuItems(items.map((item) => ({
             value: item,
             label: item.label,
+            ...(item.labelHighlightRanges === undefined ? {} : { labelHighlightRanges: item.labelHighlightRanges }),
+            ...(item.descriptionHighlightRanges === undefined ? {} : { descriptionHighlightRanges: item.descriptionHighlightRanges }),
             ...(item.description === undefined ? {} : { description: item.description }),
         })));
     }
@@ -733,7 +741,8 @@ function formatSessionMenuDateTime(dateTime) {
         time: dateTime.toLocaleTimeString("ru-RU", { hour: "2-digit", minute: "2-digit", hourCycle: "h23" }),
     };
 }
-function formatSessionInfoMenuItem(session, labelPrefix = "") {
+function formatSessionInfoMenuItem(source) {
+    const { session, labelPrefix } = source;
     const { date, time } = formatSessionMenuDateTime(session.modified);
     const messages = `${session.messageCount} msg${session.messageCount !== 1 ? "s" : ""}`;
     const label = session.name ?? session.firstMessage.slice(0, 50);
@@ -741,6 +750,7 @@ function formatSessionInfoMenuItem(session, labelPrefix = "") {
         value: session,
         label: `${labelPrefix}${label}`,
         description: `${date} ${time} · ${messages} · ${session.id.slice(0, 8)}`,
+        ...(source.labelHighlightRanges === undefined ? {} : { labelHighlightRanges: source.labelHighlightRanges }),
     };
 }
 function buildSessionInfoMenuSource(sessions, currentSessionFile, query) {
@@ -761,7 +771,11 @@ function buildSessionInfoMenuSource(sessions, currentSessionFile, query) {
             session.id,
         ],
     }));
-    return fuzzySearch(items, query).map((match) => ({ session: match.value, labelPrefix: "" }));
+    return fuzzySearch(items, query).map((match) => ({
+        session: match.value,
+        labelPrefix: "",
+        labelHighlightRanges: match.matchedText === match.label ? match.matchedRanges : [],
+    }));
 }
 export function createSessionInfoMenuItemsLoader(sessions, currentSessionFile, query) {
     const source = buildSessionInfoMenuSource(sessions, currentSessionFile, query);
@@ -775,7 +789,7 @@ export function createSessionInfoMenuItemsLoader(sessions, currentSessionFile, q
             const cached = cachedItems.get(effectiveLimit);
             if (cached)
                 return cached;
-            const result = source.slice(0, effectiveLimit).map((item) => formatSessionInfoMenuItem(item.session, item.labelPrefix));
+            const result = source.slice(0, effectiveLimit).map((item) => formatSessionInfoMenuItem(item));
             cachedItems.set(effectiveLimit, result);
             return result;
         },
@@ -812,5 +826,16 @@ export function filterUserMessageJumpItems(items, query) {
         ...(item.aliases === undefined ? {} : { aliases: item.aliases }),
         ...(item.keywords === undefined ? {} : { keywords: item.keywords }),
     }));
-    return fuzzySearch(searchableItems, query).map((match) => match.value);
+    return fuzzySearch(searchableItems, query).map((match) => ({
+        ...match.value,
+        labelHighlightRanges: labelHighlightRangesFromMatch(match.matchedText, match.matchedRanges, match.label),
+    }));
+}
+function labelHighlightRangesFromMatch(matchedText, matchedRanges, label) {
+    if (matchedText === label)
+        return matchedRanges;
+    const offset = label.toLocaleLowerCase().indexOf(matchedText.toLocaleLowerCase());
+    if (offset < 0)
+        return [];
+    return matchedRanges.map((range) => ({ start: offset + range.start, end: offset + range.end }));
 }

package/dist/app/rendering/editor-panels.js

@@ -20,35 +20,46 @@ export function renderTodoPanel(details, expanded, width, colors) {
     const todoPanelColor = colors.warning;
     const todoMetaColor = colors.muted;
     const todoThinkingColor = (level) => thinkingLevelThemeColor(level, colors);
+    const todoStatusThemeColor = (status) => {
+        switch (status) {
+            case "pending": return colors.muted;
+            case "in_progress": return colors.warning;
+            case "deferred": return colors.muted;
+            case "completed": return colors.success;
+            case "deleted": return colors.error;
+        }
+    };
     if (!expanded) {
         const prefix = `${headerText} — current: `;
         const current = activeTask ? formatTodoTaskLine(activeTask) : "no active todo";
         const collapsedText = `${prefix}${current}`;
-        const segments = activeTask
-            ? todoTaskLineSegments(activeTask, todoMetaColor, { thinkingColor: todoThinkingColor }).map((segment) => ({
+        const segments = [
+            { start: 0, end: headerText.length, foreground: todoPanelColor },
+            { start: headerText.length, end: prefix.length, foreground: todoMetaColor },
+        ];
+        if (activeTask) {
+            const activeSegments = todoTaskLineSegments(activeTask, todoMetaColor, { thinkingColor: todoThinkingColor, statusColor: todoStatusThemeColor }).map((segment) => ({
                 ...segment,
                 start: segment.start + prefix.length,
                 end: segment.end + prefix.length,
-            }))
-            : undefined;
+            }));
+            segments.push(...activeSegments);
+        }
         const line = {
             text: padOrTrimPlain(ellipsizeDisplay(collapsedText, contentWidth), width),
-            colorOverride: todoPanelColor,
+            segments,
             target,
         };
-        if (segments)
-            line.segments = segments;
         return [line];
     }
     const lines = [];
     for (const { task, depth } of visibleTodoTaskRows(details)) {
         const text = formatTodoTaskLine(task, { depth });
-        const segments = todoTaskLineSegments(task, todoMetaColor, { depth, thinkingColor: todoThinkingColor });
+        const segments = todoTaskLineSegments(task, todoMetaColor, { depth, thinkingColor: todoThinkingColor, statusColor: todoStatusThemeColor });
         let start = 0;
         for (const wrapped of wrapLine(text, contentWidth)) {
             lines.push({
                 text: padOrTrimPlain(wrapped, width),
-                colorOverride: todoPanelColor,
                 segments: shiftSegmentsToSlice(segments, start, wrapped.length),
                 target,
             });

package/dist/app/rendering/popup-menu-renderer.d.ts

@@ -1,4 +1,5 @@
 import { type Theme } from "../../theme.js";
+import { type ModelColorsConfig } from "../../config.js";
 import type { PopupMenu } from "../../ui.js";
 import type { ScreenStyler } from "../screen/screen-styler.js";
 import type { Entry, ModelMenuValue, PixMenuItem, PixMenuOptions, QueueMessageMenuValue, RenderedLine, ResumeMenuValue, SlashCommand, ThinkingMenuValue, UserMessageJumpMenuValue, UserMessageMenuValue } from "../types.js";
@@ -8,8 +9,10 @@ export type PopupMenuRendererHost = {
     readonly screenStyler: ScreenStyler;
     readonly entries: readonly Entry[];
     readonly session: AgentSession | undefined;
+    readonly modelColors?: ModelColorsConfig;
     readonly resumeLoading: boolean;
     readonly resumeSessionCount: number;
+    readonly userMessageJumpLoading: boolean;
 };
 export declare class PopupMenuRenderer {
     private readonly host;
@@ -38,10 +41,19 @@ export declare class PopupMenuRenderer {
         options: PixMenuOptions;
     } | undefined, directQuery: string): RenderedLine[];
     private hasPopupActionItems;
+    private labelDescriptionText;
     private userMessageActionForeground;
     private selectableItemVariant;
+    private thinkingMenuItemSegments;
+    private modelMenuItemSegments;
+    private modelMenuItemColor;
+    private availableThinkingLevels;
     private queueMessageItemVariant;
     private sdkItemVariant;
+    private sdkMenuItemSegments;
+    private itemHighlightSegments;
+    private highlightSegments;
+    private descriptionHighlightSegments;
     private resumeMenuItemSegments;
     private popupMenuHeader;
     private popupLineForeground;