pi-ui-extend 1.0.42 → 1.0.45

package/dist/app/rendering/dcp-stats.js

@@ -1,439 +1,54 @@
-import { existsSync, readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import { parse as parseJsonc } from "jsonc-parser";
-import { normalizeToolName, parseArgsText } from "../../tool-renderers/utils.js";
-const NUDGE_TYPES = ["turn", "iteration", "context-soft", "context-strong"];
-export function formatDcpStatsToast(session, options = {}) {
-    const branch = dcpStatsBranch(session);
-    const latestState = resolveJournalDcpState(branch);
-    const manualModeBaseline = options.manualModeBaseline ?? readDcpManualModeBaseline(session, options.configPath);
-    const stats = collectDcpSessionStats(session, latestState, branch, manualModeBaseline);
-    const nudgeStats = collectDcpNudgeStats(branch, latestState?.data);
-    const activeBlocks = stats.activeBlocks ?? 0;
-    const totalBlocks = stats.totalBlocks ?? stats.activeBlocks ?? 0;
-    const totalNudgeEvents = nudgeStats.emitted + nudgeStats.reapplied + nudgeStats.upgraded;
-    const activeAnchors = NUDGE_TYPES.reduce((sum, type) => sum + nudgeStats.activeByType[type], 0);
-    const lines = [
-        "DCP Session Statistics:",
-        `  Tokens saved (estimated): ${fmt(stats.tokensSaved)}`,
-        `  Total pruning operations: ${fmt(stats.totalPruneCount)}`,
-        `  Compression blocks active: ${activeBlocks} / ${totalBlocks} total`,
-        `  Manual mode: ${stats.manualMode === true ? "on" : stats.manualMode === false ? "off" : "unknown"}`,
-        `  State source: ${formatStateSource(stats.stateSource)}`,
-        "",
-        "Nudge telemetry:",
-        `  Sent: ${fmt(nudgeStats.emitted)} emitted, ${fmt(nudgeStats.reapplied)} reapplied, ${fmt(nudgeStats.upgraded)} upgraded`,
-        `  By type: ${NUDGE_TYPES.map((type) => `${type}=${fmt(nudgeStats.byType[type])}`).join(", ")}`,
-        `  Active anchors: ${fmt(activeAnchors)}${activeAnchors > 0 ? ` (${NUDGE_TYPES.map((type) => `${type}=${fmt(nudgeStats.activeByType[type])}`).join(", ")})` : ""}`,
-        `  Cleared after compress: ${fmt(nudgeStats.clearedEvents)} time${nudgeStats.clearedEvents === 1 ? "" : "s"} (${fmt(nudgeStats.clearedAnchors)} anchor${nudgeStats.clearedAnchors === 1 ? "" : "s"})`,
-        `  Compliance proxy: ${fmt(nudgeStats.clearedEvents)} compress-after-nudge / ${fmt(totalNudgeEvents)} nudge event${totalNudgeEvents === 1 ? "" : "s"} (${pct(nudgeStats.clearedEvents, totalNudgeEvents)})`,
-        nudgeStats.last
-            ? `  Last nudge: ${nudgeStats.last.type} ${nudgeStats.last.event} at ${formatDate(nudgeStats.last.createdAt)} (${formatContextPercent(nudgeStats.last.contextPercent)})`
-            : "  Last nudge: none recorded",
-        "",
-        `Context: ${formatContextUsage(stats)}`,
-    ];
-    return lines.join("\n");
-}
-function collectDcpSessionStats(session, latestState, branch, manualModeBaseline) {
-    const usage = session.getContextUsage();
-    const stats = {
-        runs: 0,
-        tokensSaved: 0,
-        totalPruneCount: 0,
-        items: 0,
-        summaryTokens: 0,
-        prunedTools: 0,
-        stateSource: latestState?.source ?? "tool-results",
-        ...(latestState ? { manualMode: manualModeBaseline } : {}),
-        ...(usage?.tokens != null ? { contextTokens: usage.tokens } : {}),
-        ...(usage?.contextWindow != null ? { contextWindow: usage.contextWindow } : {}),
-        ...(usage?.percent != null ? { contextPercent: usage.percent } : {}),
-    };
-    if (latestState)
-        applyDcpStateStats(stats, latestState.data);
-    for (const entry of branch) {
-        if (entry.type !== "message")
-            continue;
-        const message = entry.message;
-        if (message.role !== "toolResult")
-            continue;
-        if (normalizeToolName(message.toolName) !== "compress")
-            continue;
-        if ("isError" in message && message.isError === true)
-            continue;
-        const result = parseToolResultText(message.content);
-        if (!result)
-            continue;
-        if (result.idempotentReplay !== true) {
-            stats.runs += 1;
-            stats.tokensSaved += numberValue(result.tokensSaved) ?? 0;
-            stats.items += numberValue(result.itemCount) ?? sumDefined(numberValue(result.ranges), numberValue(result.messages)) ?? 0;
-            stats.summaryTokens += numberValue(result.totalSummaryTokens) ?? 0;
-        }
-        if (!latestState) {
-            stats.totalPruneCount = Math.max(stats.totalPruneCount, numberValue(result.totalPruneCount) ?? 0);
-            const prunedTools = numberValue(result.prunedTools);
-            if (prunedTools != null)
-                stats.prunedTools = prunedTools;
-            const activeBlocks = numberValue(result.activeBlocks);
-            const totalBlocks = numberValue(result.totalBlocks);
-            if (activeBlocks != null)
-                stats.activeBlocks = activeBlocks;
-            if (totalBlocks != null)
-                stats.totalBlocks = totalBlocks;
-        }
-        const contextTokens = numberValue(result.contextTokens);
-        const contextWindow = numberValue(result.contextWindow);
-        const contextPercent = numberValue(result.contextPercent);
-        if (stats.contextTokens == null && contextTokens != null)
-            stats.contextTokens = contextTokens;
-        if (stats.contextWindow == null && contextWindow != null)
-            stats.contextWindow = contextWindow;
-        if (stats.contextPercent == null && contextPercent != null)
-            stats.contextPercent = contextPercent;
-    }
-    if (latestState) {
-        // Journal state owns durable block/prune counts; successful compress tool
-        // results own operation gain because the journal intentionally stores only
-        // projection decisions rather than derived accounting snapshots.
-        stats.totalPruneCount = Math.max(stats.totalPruneCount, (stats.totalBlocks ?? 0) + stats.prunedTools);
-    }
-    return stats;
-}
-function applyDcpStateStats(stats, data) {
-    stats.tokensSaved = numberValue(data.tokensSaved) ?? stats.tokensSaved;
-    stats.tokensSaved += numberValue(data.prunedTokensSaved) ?? 0;
-    stats.totalPruneCount = numberValue(data.totalPruneCount) ?? stats.totalPruneCount;
-    const blocks = Array.isArray(data.compressionBlocks) ? data.compressionBlocks : undefined;
-    if (blocks) {
-        stats.totalBlocks = blocks.length;
-        stats.activeBlocks = blocks.filter((block) => isRecord(block) && block.active !== false).length;
-    }
-    if (Array.isArray(data.prunedToolIds))
-        stats.prunedTools = data.prunedToolIds.length;
-    if (typeof data.manualMode === "boolean")
-        stats.manualMode = data.manualMode;
-}
-function collectDcpNudgeStats(branch, latestState) {
-    const stats = {
-        emitted: 0,
-        reapplied: 0,
-        upgraded: 0,
-        clearedEvents: 0,
-        clearedAnchors: 0,
-        byType: { "turn": 0, "iteration": 0, "context-soft": 0, "context-strong": 0 },
-        activeByType: { "turn": 0, "iteration": 0, "context-soft": 0, "context-strong": 0 },
-    };
-    if (latestState)
-        applyActiveAnchorStats(stats, latestState);
-    for (const entry of branch) {
-        const data = customEntryData(entry, "dcp-nudge");
-        if (!data)
-            continue;
-        const event = data.event;
-        if ((event === "emitted" || event === "reapplied" || event === "upgraded") && isNudgeType(data.type)) {
-            if (event === "emitted")
-                stats.emitted += 1;
-            else if (event === "reapplied")
-                stats.reapplied += 1;
-            else
-                stats.upgraded += 1;
-            stats.byType[data.type] += 1;
-            const createdAt = numberValue(data.createdAt);
-            const contextPercent = typeof data.contextPercent === "number" || data.contextPercent === null ? data.contextPercent : undefined;
-            if (!stats.last || (createdAt ?? 0) >= (stats.last.createdAt ?? 0)) {
-                stats.last = {
-                    type: data.type,
-                    event,
-                    ...(createdAt !== undefined ? { createdAt } : {}),
-                    ...(contextPercent !== undefined ? { contextPercent } : {}),
-                };
-            }
-        }
-        else if (event === "cleared") {
-            stats.clearedEvents += 1;
-            stats.clearedAnchors += Math.max(0, numberValue(data.clearedAnchors) ?? 0);
-        }
-    }
-    return stats;
-}
-function readDcpManualModeBaseline(session, configPath = join(homedir(), ".config", "pi", "pi-tools-suite.jsonc")) {
-    let enabled = false;
-    if (!existsSync(configPath))
-        return enabled;
+import { formatDcpStatistics } from "../../../external/pi-tools-suite/src/dcp/statistics.js";
+/** On-demand TUI path: read the full branch asynchronously without hydrating
+ * the lazy presentation manager or blocking terminal input. ACP supplies a
+ * complete branch directly to the synchronous formatter instead. */
+export async function loadDcpStatsToast(session) {
+    const manager = session.sessionManager;
+    if (!manager.readFullBranchEntries)
+        return formatDcpStatsToast(session);
+    const sessionId = manager.getSessionId?.(), leafId = manager.getLeafId?.();
+    const model = session.model;
     try {
-        const parsed = parseJsonc(readFileSync(configPath, "utf8"));
-        if (!isRecord(parsed))
-            return enabled;
-        const dcp = parsed.dcp;
-        if (!isRecord(dcp))
-            return enabled;
-        const manualMode = dcp.manualMode;
-        if (isRecord(manualMode) && typeof manualMode.enabled === "boolean")
-            enabled = manualMode.enabled;
-        const overrides = dcp.modelOverrides;
-        if (!isRecord(overrides))
-            return enabled;
-        for (const override of matchingModelOverrides(overrides, dcpModelKeys(session))) {
-            const overrideManualMode = override.manualMode;
-            if (isRecord(overrideManualMode) && typeof overrideManualMode.enabled === "boolean") {
-                enabled = overrideManualMode.enabled;
-            }
+        const branch = await manager.readFullBranchEntries();
+        if (session.sessionManager !== manager || manager.getSessionId?.() !== sessionId || manager.getLeafId?.() !== leafId || session.model !== model) {
+            throw new Error("Statistics owner changed during read");
         }
+        return formatDcpStatsToast(session, { branch });
     }
     catch {
-        return false;
-    }
-    return enabled;
-}
-function dcpModelKeys(session) {
-    const model = session.model;
-    const provider = normalizeModelKey(model?.provider);
-    const id = normalizeModelKey(model?.id);
-    return [provider && id ? `${provider}/${id}` : undefined, id].filter((key) => key !== undefined);
-}
-function matchingModelOverrides(overrides, modelKeys) {
-    const candidates = modelKeys.map(normalizeModelKey).filter((key, index, all) => key !== undefined && all.indexOf(key) === index);
-    const exact = new Map();
-    const wildcard = [];
-    for (const [rawKey, value] of Object.entries(overrides)) {
-        const key = normalizeModelKey(rawKey);
-        if (!key || !isRecord(value))
-            continue;
-        if (key.includes("*") || key.includes("?"))
-            wildcard.push([key, value]);
-        else
-            exact.set(key, value);
-    }
-    const bare = candidates.filter((candidate) => !candidate.includes("/"));
-    const full = candidates.filter((candidate) => candidate.includes("/"));
-    const matches = [];
-    for (const candidate of bare)
-        for (const [pattern, value] of wildcard)
-            if (!pattern.includes("/") && globMatches(pattern, candidate))
-                matches.push(value);
-    for (const candidate of bare) {
-        const value = exact.get(candidate);
-        if (value)
-            matches.push(value);
-    }
-    for (const candidate of full)
-        for (const [pattern, value] of wildcard)
-            if (pattern.includes("/") && globMatches(pattern, candidate))
-                matches.push(value);
-    for (const candidate of full) {
-        const value = exact.get(candidate);
-        if (value)
-            matches.push(value);
-    }
-    return matches;
-}
-function normalizeModelKey(value) {
-    if (typeof value !== "string")
-        return undefined;
-    const trimmed = value.trim();
-    return trimmed || undefined;
-}
-function globMatches(pattern, candidate) {
-    let source = "^";
-    for (const char of pattern) {
-        if (char === "*")
-            source += ".*";
-        else if (char === "?")
-            source += ".";
-        else
-            source += char.replace(/[|\\{}()[\]^$+?.]/g, "\\$&");
-    }
-    return new RegExp(`${source}$`).test(candidate);
-}
-function applyActiveAnchorStats(stats, data) {
-    stats.activeByType = { "turn": 0, "iteration": 0, "context-soft": 0, "context-strong": 0 };
-    const anchors = Array.isArray(data.nudgeAnchors) ? data.nudgeAnchors : [];
-    for (const anchor of anchors) {
-        if (isRecord(anchor) && isNudgeType(anchor.type))
-            stats.activeByType[anchor.type] += 1;
-    }
-    const last = isRecord(data.lastNudge) ? data.lastNudge : undefined;
-    if (last && isNudgeType(last.type) && !stats.last) {
-        const contextPercent = numberValue(last.contextPercent);
-        const createdAt = numberValue(last.createdAt);
-        stats.last = {
-            type: last.type,
-            event: "emitted",
-            ...(createdAt !== undefined ? { createdAt } : {}),
-            ...(contextPercent !== undefined ? { contextPercent: contextPercent * 100 } : {}),
-        };
-    }
-}
-function resolveJournalDcpState(branch) {
-    const blocks = new Map();
-    const pruned = new Map();
-    let initialized = false;
-    let manualMode;
-    let nudgeAnchors = [];
-    let lastNudge;
-    for (const entry of branch) {
-        const operation = customEntryData(entry, "dcp-journal");
-        if (!operation || operation.schemaVersion !== 1)
-            continue;
-        if (operation.kind === "init") {
-            initialized = true;
-            continue;
-        }
-        if (!initialized || operation.kind !== "delta")
-            continue;
-        if (Array.isArray(operation.blocks)) {
-            for (const raw of operation.blocks) {
-                if (!isRecord(raw) || typeof raw.id !== "number")
-                    continue;
-                blocks.set(raw.id, { ...raw });
-            }
-        }
-        if (Array.isArray(operation.blockStates)) {
-            for (const raw of operation.blockStates) {
-                if (!isRecord(raw) || typeof raw.id !== "number")
-                    continue;
-                const block = blocks.get(raw.id);
-                if (!block)
-                    continue;
-                if (typeof raw.active === "boolean")
-                    block.active = raw.active;
-                if (typeof raw.deactivatedReason === "string")
-                    block.deactivatedReason = raw.deactivatedReason;
-            }
+        let usage;
+        try {
+            usage = session.getContextUsage();
         }
-        if (Array.isArray(operation.prunedTools)) {
-            for (const raw of operation.prunedTools) {
-                if (!isRecord(raw) || typeof raw.toolCallId !== "string")
-                    continue;
-                pruned.set(raw.toolCallId, {
-                    ...(typeof raw.reason === "string" ? { reason: raw.reason } : {}),
-                    tokenEstimate: Math.max(0, numberValue(raw.tokenEstimate) ?? 0),
-                });
-            }
-        }
-        if (typeof operation.manualMode === "boolean")
-            manualMode = operation.manualMode;
-        if (Array.isArray(operation.nudgeAnchors))
-            nudgeAnchors = operation.nudgeAnchors;
-        if (Object.prototype.hasOwnProperty.call(operation, "lastNudge"))
-            lastNudge = operation.lastNudge ?? undefined;
+        catch { /* Unknown. */ }
+        return formatDcpStatistics({ model: session.model, usage, historyStatus: "unavailable" });
     }
-    if (!initialized)
-        return undefined;
-    return {
-        source: "journal",
-        data: {
-            compressionBlocks: [...blocks.values()],
-            prunedToolIds: [...pruned.keys()],
-            prunedTokensSaved: [...pruned.values()].reduce((sum, item) => sum + item.tokenEstimate, 0),
-            manualMode,
-            nudgeAnchors,
-            lastNudge,
-        },
-    };
 }
-function dcpStatsBranch(session) {
-    const manager = session.sessionManager;
+/** TUI and ACP use the same passive report as /dcp stats. Opening this view
+ * never re-runs pruning, mutates history, or launches a model. */
+export function formatDcpStatsToast(session, options = {}) {
+    let branch = [];
+    let historyStatus = "full";
     try {
-        const full = manager.readFullBranchEntriesSync?.();
-        if (Array.isArray(full))
-            return full;
+        if (options.branch)
+            branch = options.branch;
+        else {
+            const manager = session.sessionManager;
+            branch = manager.readFullBranchEntriesSync ? manager.readFullBranchEntriesSync() : manager.getBranch();
+        }
+        if (!Array.isArray(branch) || branch[0]?.parentId != null) {
+            historyStatus = "unavailable";
+            branch = [];
+        }
     }
     catch {
-        // Fall back to the manager's currently materialized branch below.
+        // A broken full reader is not permission to substitute the UI's lazy tail.
+        historyStatus = "unavailable";
     }
+    let usage;
     try {
-        const branch = manager.getBranch();
-        return Array.isArray(branch) ? branch : [];
-    }
-    catch {
-        return [];
+        usage = session.getContextUsage();
     }
-}
-function formatStateSource(source) {
-    if (source === "journal")
-        return "session journal";
-    return "compress tool results";
-}
-function customEntryData(entry, customType) {
-    if (!isRecord(entry) || entry.type !== "custom" || entry.customType !== customType)
-        return undefined;
-    return isRecord(entry.data) ? entry.data : undefined;
-}
-function parseToolResultText(content) {
-    const parsed = parseArgsText(textContent(content));
-    return isRecord(parsed) ? parsed : undefined;
-}
-function textContent(content) {
-    if (typeof content === "string")
-        return content;
-    if (!Array.isArray(content))
-        return "";
-    return content
-        .map((part) => isRecord(part) && typeof part.text === "string" ? part.text : "")
-        .filter(Boolean)
-        .join("\n");
-}
-function formatContextUsage(stats) {
-    const percent = stats.contextPercent;
-    const tokens = stats.contextTokens;
-    const window = stats.contextWindow;
-    const percentText = percent != null ? formatPercent(percent) : "unknown";
-    if (tokens != null && window != null)
-        return `${percentText} (${formatCompactNumber(tokens)}/${formatCompactNumber(window)})`;
-    if (tokens != null)
-        return `${formatCompactNumber(tokens)} tokens`;
-    if (window != null)
-        return `${percentText} of ${formatCompactNumber(window)}`;
-    return percentText;
-}
-function isNudgeType(value) {
-    return typeof value === "string" && NUDGE_TYPES.includes(value);
-}
-function fmt(n) {
-    return Math.round(n).toLocaleString();
-}
-function pct(numerator, denominator) {
-    if (denominator <= 0)
-        return "n/a";
-    return `${((numerator / denominator) * 100).toFixed(1)}%`;
-}
-function formatDate(ts) {
-    if (typeof ts !== "number" || !Number.isFinite(ts) || ts <= 0)
-        return "unknown time";
-    return new Date(ts).toLocaleString();
-}
-function formatContextPercent(value) {
-    if (value === null)
-        return "unknown context";
-    if (typeof value !== "number" || !Number.isFinite(value))
-        return "unknown context";
-    return `${value.toFixed(1)}% context`;
-}
-function numberValue(value) {
-    return typeof value === "number" && Number.isFinite(value) ? value : undefined;
-}
-function sumDefined(...values) {
-    const defined = values.filter((value) => value != null);
-    return defined.length > 0 ? defined.reduce((sum, value) => sum + value, 0) : undefined;
-}
-function formatCompactNumber(value) {
-    const abs = Math.abs(value);
-    if (abs >= 1_000_000)
-        return `${trimDecimal(value / 1_000_000)}M`;
-    if (abs >= 1_000)
-        return `${trimDecimal(value / 1_000)}K`;
-    return Math.round(value).toLocaleString();
-}
-function formatPercent(value) {
-    return `${trimDecimal(value)}%`;
-}
-function trimDecimal(value) {
-    return value.toFixed(1).replace(/\.0$/, "");
-}
-function isRecord(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
+    catch { /* Explicitly unknown. */ }
+    return formatDcpStatistics({ branch, historyStatus, model: session.model, usage });
 }

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

@@ -2,7 +2,7 @@ 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";
+import type { Entry, ModelMenuValue, ModelThinkingMenuState, PixMenuItem, PixMenuOptions, QueueMessageMenuValue, RenderedLine, ResumeMenuValue, SlashCommand, UserMessageJumpMenuValue, UserMessageMenuValue } from "../types.js";
 import type { AgentSession } from "@earendil-works/pi-coding-agent";
 export type PopupMenuRendererHost = {
     readonly theme: Theme;
@@ -24,12 +24,12 @@ export declare class PopupMenuRenderer {
     overlayPlainText(line: RenderedLine, width: number): string;
     renderUserMessageMenu(width: number, menu: PopupMenu<UserMessageMenuValue>): RenderedLine[];
     renderSlashCommandMenu(width: number, menu: PopupMenu<SlashCommand>): RenderedLine[];
-    renderModelMenu(width: number, menu: PopupMenu<ModelMenuValue>): RenderedLine[];
-    renderThinkingMenu(width: number, menu: PopupMenu<ThinkingMenuValue>): RenderedLine[];
+    renderModelMenu(width: number, menu: PopupMenu<ModelMenuValue>, state: ModelThinkingMenuState): RenderedLine[];
     renderResumeMenu(width: number, menu: PopupMenu<ResumeMenuValue>, state: {
         directQuery: string;
         allSessionsLoaded: boolean;
         loadedSessionCount: number;
+        draft: boolean;
     }): RenderedLine[];
     renderUserMessageJumpMenu(width: number, menu: PopupMenu<UserMessageJumpMenuValue>, directQuery: string): RenderedLine[];
     renderQueueMessageMenu(width: number, menu: PopupMenu<QueueMessageMenuValue>): RenderedLine[];
@@ -40,10 +40,8 @@ export declare class PopupMenuRenderer {
     private labelDescriptionText;
     private userMessageActionForeground;
     private selectableItemVariant;
-    private thinkingMenuItemSegments;
     private modelMenuItemSegments;
     private modelMenuItemColor;
-    private availableThinkingLevels;
     private queueMessageItemVariant;
     private sdkItemVariant;
     private sdkMenuItemSegments;

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

@@ -1,7 +1,7 @@
 import { colorLine } from "../../theme.js";
 import { stringDisplayWidth } from "../../terminal-width.js";
 import { resolveColor, resolveModelColor } from "../../config.js";
-import { SLASH_COMMAND_DESCRIPTION_COLUMN, THINKING_LEVELS, } from "../constants.js";
+import { SLASH_COMMAND_DESCRIPTION_COLUMN, } from "../constants.js";
 import { APP_ICONS } from "../icons.js";
 import { ellipsizeDisplay, padOrTrimPlain, sanitizeText } from "./render-text.js";
 import { modelProviderThemeColor, thinkingLevelThemeColor } from "./status-line-renderer.js";
@@ -96,8 +96,8 @@ export class PopupMenuRenderer {
         }
         return lines;
     }
-    renderModelMenu(width, menu) {
-        const lines = [this.popupMenuHeader("Select model", width)];
+    renderModelMenu(width, menu, state) {
+        const lines = [this.popupMenuHeader(state.visibilityMode ? "Manage visible models" : "Select model & thinking", width)];
         const visibleItems = menu.visibleItems();
         if (!this.hasPopupActionItems(menu.items)) {
             lines.push({
@@ -106,37 +106,55 @@ export class PopupMenuRenderer {
             });
         }
         for (const item of visibleItems) {
-            const marker = item.selected ? "▶ " : "  ";
-            const text = `${marker}${this.labelDescriptionText(item.label, item.description, width - 2)}`;
+            const selectionMarker = item.selected ? "▶ " : "  ";
+            const visibilityMarker = state.visibilityMode ? `${item.value.visible === false ? "○" : APP_ICONS.check} ` : "";
+            const marker = `${selectionMarker}${visibilityMarker}`;
+            const text = `${marker}${this.labelDescriptionText(item.label, item.description, width - marker.length)}`;
             lines.push({
                 text,
                 variant: this.selectableItemVariant(item.value),
-                segments: [...this.modelMenuItemSegments(item.value), ...this.itemHighlightSegments(item, text)],
+                segments: [
+                    ...this.modelMenuItemSegments(item.value, marker.length),
+                    ...this.itemHighlightSegments(item, text, marker.length),
+                ],
                 target: { kind: "popup-menu", index: item.index },
             });
         }
-        return lines;
-    }
-    renderThinkingMenu(width, menu) {
-        const lines = [this.popupMenuHeader("Thinking level", width)];
-        const visibleItems = menu.visibleItems();
-        if (!this.hasPopupActionItems(menu.items)) {
-            lines.push({ text: "  No matching thinking levels", variant: "muted" });
+        if (state.visibilityMode && menu.selectedItem()) {
+            const selected = menu.selectedItem().value;
+            lines.push({
+                text: selected.current
+                    ? "  Current model stays visible until another model is selected"
+                    : "  Enter toggles whether this model appears in model pickers",
+                variant: "muted",
+            });
+            lines.push({
+                text: "  Clear all",
+                variant: "error",
+                target: { kind: "model-visibility-clear" },
+            });
+            lines.push({ text: "  ↑/↓ model · Enter show/hide · Shift+Tab select", variant: "muted" });
         }
-        for (const item of visibleItems) {
-            const marker = item.selected ? "▶ " : "  ";
-            const text = `${marker}${this.labelDescriptionText(item.label, item.description, width - 2)}`;
+        else if (menu.selectedItem()) {
+            const thinkingPrefix = "  Thinking  ← ";
+            const thinkingSuffix = " →";
             lines.push({
-                text,
-                variant: this.selectableItemVariant(item.value),
-                segments: this.thinkingMenuItemSegments(item.value),
-                target: { kind: "popup-menu", index: item.index },
+                text: `${thinkingPrefix}${state.thinkingLevel}${thinkingSuffix}`,
+                variant: "normal",
+                segments: [{
+                        start: thinkingPrefix.length,
+                        end: thinkingPrefix.length + state.thinkingLevel.length,
+                        foreground: thinkingLevelThemeColor(state.thinkingLevel, this.host.theme.colors, state.availableThinkingLevels),
+                        bold: true,
+                    }],
             });
+            lines.push({ text: "  ↑/↓ model · ←/→ thinking · Enter apply · Shift+Tab manage", variant: "muted" });
         }
         return lines;
     }
     renderResumeMenu(width, menu, state) {
-        const title = this.host.resumeLoading ? `Resume session ${APP_ICONS.timerSand}` : "Resume session";
+        const titleBase = state.draft ? "Open a conversation" : "Resume session";
+        const title = this.host.resumeLoading ? `${titleBase} ${APP_ICONS.timerSand}` : titleBase;
         const lines = [this.popupMenuHeader(title, width)];
         const visibleItems = menu.visibleItems();
         if (!this.host.resumeLoading && !this.hasPopupActionItems(menu.items)) {
@@ -261,16 +279,7 @@ export class PopupMenuRenderer {
     selectableItemVariant(value) {
         return value.current ? "muted" : "normal";
     }
-    thinkingMenuItemSegments(value) {
-        const markerOffset = 2; // "▶ " or "  "
-        return [{
-                start: markerOffset,
-                end: markerOffset + value.level.length,
-                foreground: thinkingLevelThemeColor(value.level, this.host.theme.colors, this.availableThinkingLevels()),
-            }];
-    }
-    modelMenuItemSegments(value) {
-        const markerOffset = 2; // "▶ " or "  "
+    modelMenuItemSegments(value, markerOffset = 2) {
         return [{
                 start: markerOffset,
                 end: markerOffset + value.ref.length,
@@ -285,10 +294,6 @@ export class PopupMenuRenderer {
             ? resolveColor(configuredColor, this.host.theme.colors)
             : modelProviderThemeColor(value.model.provider, this.host.theme.colors);
     }
-    availableThinkingLevels() {
-        const levels = this.host.session?.getAvailableThinkingLevels();
-        return Array.isArray(levels) && levels.length > 0 ? levels.map(String) : [...THINKING_LEVELS];
-    }
     queueMessageItemVariant(value) {
         return value === "cancel" ? "error" : "normal";
     }
@@ -301,8 +306,8 @@ export class PopupMenuRenderer {
             ...this.descriptionHighlightSegments(item.description, item.descriptionHighlightRanges ?? item.value.descriptionHighlightRanges ?? [], text),
         ];
     }
-    itemHighlightSegments(item, text) {
-        return this.highlightSegments(item.labelHighlightRanges ?? [], text, 2);
+    itemHighlightSegments(item, text, markerOffset = 2) {
+        return this.highlightSegments(item.labelHighlightRanges ?? [], text, markerOffset);
     }
     highlightSegments(ranges, text, markerOffset) {
         if (ranges.length === 0)