@oh-my-pi/pi-tui 18.13.1 → 18.13.3

package/dist/types/status-line/context-usage.d.ts

@@ -1,10 +1,6 @@
 import type { AgentMessage, Tokenizer } from "@oh-my-pi/pi-agent-core";
 import type { CompactionSettings } from "@oh-my-pi/pi-agent-core/compaction";
 import type { Tool as AiTool, Model } from "@oh-my-pi/pi-ai";
-import type { Theme } from "../theme/index.js";
-import { Container } from "../tui.js";
-import type { TspText } from "@oh-my-pi/pi-wire";
-import type { DescribeContext, NativeNode } from "../native/node.js";
 interface ContextSkill {
     readonly name: string;
     readonly description?: string;
@@ -63,8 +59,6 @@ interface CategoryInfo {
     id: CategoryId;
     label: string;
     tokens: number;
-    color: "accent" | "warning" | "success" | "userMessageText" | "customMessageLabel";
-    glyph: string;
 }
 export interface ContextBreakdown {
     model: Model | undefined;
@@ -128,6 +122,21 @@ export declare function getToolSchemaMetadataRevision(tools: ToolSchemaSource):
  * discovered-agent metadata changes).
  */
 export declare function invalidateToolSchemaMetadata(tools: ToolSchemaSource): void;
+/** Provider-visible text of one tool definition, in wire order. */
+export interface ToolSchemaFragments {
+    /** Name, description, wire schema JSON, then rendered examples; fields that cannot be serialized are omitted. */
+    readonly fragments: string[];
+    /** `fragments` with the schema JSON indented for reading; present only when a display indent was requested. */
+    readonly display?: string[];
+    /** Why serialization stopped; the schema or examples after that point are missing from `fragments`. */
+    readonly schemaError?: string;
+}
+/**
+ * Provider-visible text of one tool definition. `displayIndent` additionally
+ * returns `display`, the same fragments with the schema JSON indented, from
+ * the same schema conversion.
+ */
+export declare function toolSchemaFragments(tool: ContextTool, displayIndent?: number): ToolSchemaFragments;
 /**
  * Estimate provider-visible tool-schema tokens.
  *
@@ -158,28 +167,4 @@ export declare function computeNonMessageBreakdown(session: NonMessageTokenSourc
  * session and model.
  */
 export declare function computeContextBreakdown(session: ContextUsageSession, options: ContextUsageOptions): ContextBreakdown;
-/** The `/context` title: the model once one is selected (the body leads with its window). */
-export declare function contextUsageHead(breakdown: ContextBreakdown): TspText;
-/**
- * Native context-usage panel for terminals without `meter`: the cell grid as
- * unwrapped styled rows beside the legend. The terminal places the legend
- * beside the grid, or below it when narrow.
- */
-export declare function describeContextUsage(breakdown: ContextBreakdown): NativeNode;
-/**
- * The `/context` report body, without a frame or title of its own (the panel
- * showing it is titled {@link contextUsageHead}): ANSI renders the cell grid
- * beside the legend; natively it is drawn with `meter`s where the terminal has
- * them and as the glyph grid otherwise.
- */
-export declare class ContextUsageView extends Container {
-    #private;
-    constructor(breakdown: ContextBreakdown, theme: Theme);
-    describe(cx: DescribeContext): NativeNode;
-}
-/**
- * Render a colorful context-usage panel as ANSI text. Output is a series of
- * lines pairing the grid (left) with the legend (right).
- */
-export declare function renderContextUsage(breakdown: ContextBreakdown, theme: Theme): string;
 export {};

package/dist/types/theme/symbols.d.ts

@@ -2,7 +2,7 @@ export type SymbolPreset = "unicode" | "nerd" | "ascii";
 /**
  * All available symbol keys organized by category.
  */
-export type SymbolKey = "status.success" | "status.error" | "status.warning" | "status.info" | "status.pending" | "status.disabled" | "status.enabled" | "status.running" | "status.shadowed" | "status.aborted" | "status.done" | "nav.cursor" | "nav.selected" | "nav.expand" | "nav.collapse" | "nav.back" | "tree.branch" | "tree.last" | "tree.vertical" | "tree.horizontal" | "tree.hook" | "progress.filled" | "progress.empty" | "context.speculation" | "context.compaction" | "boxRound.topLeft" | "boxRound.topRight" | "boxRound.bottomLeft" | "boxRound.bottomRight" | "boxRound.horizontal" | "boxRound.vertical" | "boxDotted.horizontal" | "boxDotted.vertical" | "boxSharp.topLeft" | "boxSharp.topRight" | "boxSharp.bottomLeft" | "boxSharp.bottomRight" | "boxSharp.horizontal" | "boxSharp.vertical" | "boxSharp.cross" | "boxSharp.teeDown" | "boxSharp.teeUp" | "boxSharp.teeRight" | "boxSharp.teeLeft" | "sep.powerline" | "sep.powerlineThin" | "sep.powerlineLeft" | "sep.powerlineRight" | "sep.powerlineThinLeft" | "sep.powerlineThinRight" | "sep.powerlineCapLeft" | "sep.block" | "sep.space" | "sep.asciiLeft" | "sep.asciiRight" | "sep.dot" | "sep.slash" | "sep.pipe" | "icon.model" | "icon.plan" | "icon.prewalk" | "icon.goal" | "icon.pause" | "icon.loop" | "icon.folder" | "icon.worktree" | "icon.search" | "icon.scratchFolder" | "icon.file" | "icon.git" | "icon.branch" | "icon.pr" | "icon.pin" | "icon.tokens" | "icon.context" | "icon.cost" | "icon.subscription" | "icon.advisor" | "icon.advisorClosed" | "icon.time" | "icon.omp" | "icon.ghost" | "icon.agents" | "icon.job" | "icon.cache" | "icon.cacheMiss" | "icon.input" | "icon.output" | "icon.throughput" | "icon.intelligence" | "icon.host" | "icon.session" | "icon.package" | "icon.warning" | "icon.rewind" | "icon.auto" | "icon.fast" | "icon.extensionSkill" | "icon.extensionTool" | "icon.extensionSlashCommand" | "icon.extensionMcp" | "icon.extensionRule" | "icon.extensionHook" | "icon.extensionPrompt" | "icon.extensionContextFile" | "icon.extensionInstruction" | "icon.vimNormal" | "icon.vimInsert" | "icon.vimVisual" | "icon.vimVisualLine" | "icon.vimReplace" | "cmd.action" | "cmd.prompt" | "cmd.extension" | "cmd.settings" | "cmd.gear" | "cmd.shield" | "cmd.wave" | "cmd.compass" | "cmd.inbox" | "cmd.swap" | "cmd.expand" | "cmd.computer" | "cmd.eye" | "cmd.todo" | "cmd.stats" | "cmd.news" | "cmd.keyboard" | "cmd.export" | "cmd.clipboard" | "cmd.share" | "cmd.broadcast" | "cmd.globe" | "cmd.copy" | "cmd.plus" | "cmd.restart" | "cmd.eraser" | "cmd.trash" | "cmd.compress" | "cmd.vibrate" | "cmd.handoff" | "cmd.history" | "cmd.question" | "cmd.rocket" | "cmd.stethoscope" | "cmd.redo" | "cmd.bug" | "cmd.memory" | "cmd.pencil" | "cmd.folderMove" | "cmd.folderPlus" | "cmd.folderMinus" | "cmd.hammer" | "cmd.power" | "cmd.cart" | "icon.mic" | "icon.camera" | "thinking.minimal" | "thinking.low" | "thinking.medium" | "thinking.high" | "thinking.xhigh" | "thinking.max" | "thinking.autoPending" | "checkbox.checked" | "checkbox.unchecked" | "radio.selected" | "radio.unselected" | "format.bullet" | "format.dash" | "format.bracketLeft" | "format.bracketRight" | "md.quoteBorder" | "md.hrChar" | "md.bullet" | "md.colorSwatch" | "advisor.rail" | "skill.rail" | "lang.default" | "lang.typescript" | "lang.javascript" | "lang.python" | "lang.rust" | "lang.go" | "lang.java" | "lang.c" | "lang.cpp" | "lang.csharp" | "lang.ruby" | "lang.julia" | "lang.php" | "lang.swift" | "lang.kotlin" | "lang.shell" | "lang.html" | "lang.css" | "lang.json" | "lang.yaml" | "lang.markdown" | "lang.sql" | "lang.docker" | "lang.lua" | "lang.text" | "lang.env" | "lang.toml" | "lang.xml" | "lang.ini" | "lang.conf" | "lang.log" | "lang.csv" | "lang.tsv" | "lang.image" | "lang.pdf" | "lang.archive" | "lang.binary" | "chip.image" | "chip.video" | "chip.paste" | "tab.appearance" | "tab.model" | "tab.interaction" | "tab.context" | "tab.files" | "tab.shell" | "tab.tools" | "tab.memory" | "tab.tasks" | "tab.providers" | "tool.write" | "tool.edit" | "tool.bash" | "tool.ssh" | "tool.lsp" | "tool.gh" | "tool.webSearch" | "tool.exa" | "tool.browser" | "tool.eval" | "tool.debug" | "tool.mcp" | "tool.job" | "tool.launch" | "tool.task" | "tool.todo" | "tool.memory" | "tool.ask" | "tool.resolve" | "tool.review" | "tool.goal" | "tool.irc" | "tool.delete" | "tool.move" | "key.ctrl" | "key.ctrlMac" | "key.shift" | "key.alt" | "key.altMac" | "key.super" | "key.superMac" | "key.joiner" | "key.enter" | "key.esc" | "key.tab" | "key.backspace" | "key.delete" | "key.space" | "key.up" | "key.down" | "key.left" | "key.right";
+export type SymbolKey = "status.success" | "status.error" | "status.warning" | "status.info" | "status.pending" | "status.disabled" | "status.enabled" | "status.running" | "status.shadowed" | "status.aborted" | "status.done" | "nav.cursor" | "nav.selected" | "nav.expand" | "nav.collapse" | "nav.back" | "tree.branch" | "tree.last" | "tree.vertical" | "tree.horizontal" | "tree.hook" | "progress.filled" | "progress.empty" | "context.speculation" | "context.compaction" | "context.content" | "context.messages" | "context.buffer" | "context.free" | "boxRound.topLeft" | "boxRound.topRight" | "boxRound.bottomLeft" | "boxRound.bottomRight" | "boxRound.horizontal" | "boxRound.vertical" | "boxDotted.horizontal" | "boxDotted.vertical" | "boxSharp.topLeft" | "boxSharp.topRight" | "boxSharp.bottomLeft" | "boxSharp.bottomRight" | "boxSharp.horizontal" | "boxSharp.vertical" | "boxSharp.cross" | "boxSharp.teeDown" | "boxSharp.teeUp" | "boxSharp.teeRight" | "boxSharp.teeLeft" | "sep.powerline" | "sep.powerlineThin" | "sep.powerlineLeft" | "sep.powerlineRight" | "sep.powerlineThinLeft" | "sep.powerlineThinRight" | "sep.powerlineCapLeft" | "sep.block" | "sep.space" | "sep.asciiLeft" | "sep.asciiRight" | "sep.dot" | "sep.slash" | "sep.pipe" | "icon.model" | "icon.plan" | "icon.prewalk" | "icon.goal" | "icon.pause" | "icon.loop" | "icon.folder" | "icon.worktree" | "icon.search" | "icon.scratchFolder" | "icon.file" | "icon.git" | "icon.branch" | "icon.pr" | "icon.pin" | "icon.tokens" | "icon.context" | "icon.cost" | "icon.subscription" | "icon.advisor" | "icon.advisorClosed" | "icon.time" | "icon.omp" | "icon.ghost" | "icon.agents" | "icon.job" | "icon.cache" | "icon.cacheMiss" | "icon.input" | "icon.output" | "icon.throughput" | "icon.intelligence" | "icon.host" | "icon.session" | "icon.package" | "icon.warning" | "icon.rewind" | "icon.auto" | "icon.fast" | "icon.extensionSkill" | "icon.extensionTool" | "icon.extensionSlashCommand" | "icon.extensionMcp" | "icon.extensionRule" | "icon.extensionHook" | "icon.extensionPrompt" | "icon.extensionContextFile" | "icon.extensionInstruction" | "icon.vimNormal" | "icon.vimInsert" | "icon.vimVisual" | "icon.vimVisualLine" | "icon.vimReplace" | "cmd.action" | "cmd.prompt" | "cmd.extension" | "cmd.settings" | "cmd.gear" | "cmd.shield" | "cmd.wave" | "cmd.compass" | "cmd.inbox" | "cmd.swap" | "cmd.expand" | "cmd.computer" | "cmd.eye" | "cmd.todo" | "cmd.stats" | "cmd.news" | "cmd.keyboard" | "cmd.export" | "cmd.clipboard" | "cmd.share" | "cmd.broadcast" | "cmd.globe" | "cmd.copy" | "cmd.plus" | "cmd.restart" | "cmd.eraser" | "cmd.trash" | "cmd.compress" | "cmd.vibrate" | "cmd.handoff" | "cmd.history" | "cmd.question" | "cmd.rocket" | "cmd.stethoscope" | "cmd.redo" | "cmd.bug" | "cmd.memory" | "cmd.pencil" | "cmd.folderMove" | "cmd.folderPlus" | "cmd.folderMinus" | "cmd.hammer" | "cmd.power" | "cmd.cart" | "icon.mic" | "icon.camera" | "thinking.minimal" | "thinking.low" | "thinking.medium" | "thinking.high" | "thinking.xhigh" | "thinking.max" | "thinking.autoPending" | "checkbox.checked" | "checkbox.unchecked" | "radio.selected" | "radio.unselected" | "format.bullet" | "format.dash" | "format.bracketLeft" | "format.bracketRight" | "md.quoteBorder" | "md.hrChar" | "md.bullet" | "md.colorSwatch" | "advisor.rail" | "skill.rail" | "lang.default" | "lang.typescript" | "lang.javascript" | "lang.python" | "lang.rust" | "lang.go" | "lang.java" | "lang.c" | "lang.cpp" | "lang.csharp" | "lang.ruby" | "lang.julia" | "lang.php" | "lang.swift" | "lang.kotlin" | "lang.shell" | "lang.html" | "lang.css" | "lang.json" | "lang.yaml" | "lang.markdown" | "lang.sql" | "lang.docker" | "lang.lua" | "lang.text" | "lang.env" | "lang.toml" | "lang.xml" | "lang.ini" | "lang.conf" | "lang.log" | "lang.csv" | "lang.tsv" | "lang.image" | "lang.pdf" | "lang.archive" | "lang.binary" | "chip.image" | "chip.video" | "chip.paste" | "tab.appearance" | "tab.model" | "tab.interaction" | "tab.context" | "tab.files" | "tab.shell" | "tab.tools" | "tab.memory" | "tab.tasks" | "tab.providers" | "tool.write" | "tool.edit" | "tool.bash" | "tool.ssh" | "tool.lsp" | "tool.gh" | "tool.webSearch" | "tool.exa" | "tool.browser" | "tool.eval" | "tool.debug" | "tool.mcp" | "tool.job" | "tool.launch" | "tool.task" | "tool.todo" | "tool.memory" | "tool.ask" | "tool.resolve" | "tool.review" | "tool.goal" | "tool.irc" | "tool.delete" | "tool.move" | "key.ctrl" | "key.ctrlMac" | "key.shift" | "key.alt" | "key.altMac" | "key.super" | "key.superMac" | "key.joiner" | "key.enter" | "key.esc" | "key.tab" | "key.backspace" | "key.delete" | "key.space" | "key.up" | "key.down" | "key.left" | "key.right";
 export type SymbolMap = Record<SymbolKey, string>;
 /**
  * Icon vocabulary for slash-command autocomplete type indicators. Each name

package/dist/types/theme/theme.d.ts

@@ -114,29 +114,6 @@ export declare function stopThemeWatcher(): void;
  * Used by HTML export to generate CSS custom properties.
  */
 export declare function getResolvedThemeColors(themeName?: string): Promise<Record<string, string>>;
-/** One appearance variant of {@link NativeThemePalette}: token name → `#rrggbb`. */
-export type NativeThemeVariant = Record<string, string>;
-/** omp's resolved theme for a Tern Surface Protocol terminal (the `t` verb body minus `sf`). */
-export interface NativeThemePalette {
-    dark?: NativeThemeVariant;
-    light?: NativeThemeVariant;
-    name: {
-        dark?: string;
-        light?: string;
-    };
-}
-/**
- * Cheap identity of everything {@link getNativeThemePalette} depends on;
- * recompute the palette only when it changes.
- */
-export declare function getNativeThemePaletteKey(): string;
-/**
- * omp's theme for a native surface: with auto theme, the configured dark and
- * light themes; otherwise (or while the theme selector previews one) the
- * active theme under its own appearance only. Themes without a loadable
- * definition (in-memory instances) contribute nothing.
- */
-export declare function getNativeThemePalette(): NativeThemePalette;
 /**
  * Check if a theme is a "light" theme by analyzing its status-line background
  * luminance. Loads theme JSON synchronously (built-in or custom file on disk)

package/dist/types/tools/ask.d.ts

@@ -26,6 +26,8 @@ export interface AskToolDetails {
     customInput?: string;
     /** Optional note attached to the selected answer in the rich ask dialog. */
     note?: string;
+    /** Label of the option the note is on; unset when it is on the custom answer. */
+    noteOption?: string;
     /** True when the answer was auto-selected because the dialog timed out. */
     timedOut?: boolean;
     /** Multi-part question mode */

package/dist/types/tools/bash-interactive.d.ts

@@ -6,6 +6,12 @@ import type { Theme } from "../theme/theme.js";
 export interface BashInteractiveTerminalBackend {
     resize(columns: number, rows: number): void;
 }
+/**
+ * Translates a TUI key event into the bytes a terminal would send to a PTY
+ * child; key releases encode to "". Shared by the agent `pty` console and
+ * `!` commands (`BashExecutionComponent.encodePtyInput`).
+ */
+export declare function normalizeInputForPty(data: string, applicationCursorKeysMode: boolean): string;
 /** Interactive terminal overlay driven by an external PTY controller. */
 export declare class BashInteractiveOverlayComponent implements Component {
     #private;

package/dist/types/tools/fetch.d.ts

@@ -9,6 +9,7 @@ export interface ReadUrlToolDetails {
     finalUrl: string;
     contentType: string;
     method: string;
+    raw?: boolean;
     truncated: boolean;
     notes: string[];
     meta?: OutputMeta;

package/dist/types/tools/github.d.ts

@@ -85,6 +85,7 @@ export interface GhRunWatchFailedLogDetails {
     conclusion?: string;
     tail?: string;
     available: boolean;
+    unavailableReason?: string;
 }
 /** Live workflow watcher display snapshot. */
 export interface GhRunWatchViewDetails {
@@ -130,6 +131,8 @@ export interface GhFailedJobLog {
     full?: string;
     tail?: string;
     available: boolean;
+    unavailableReason?: string;
+    truncated?: boolean;
 }
 /** Choose the terminal conclusion or current job state. */
 export declare function formatJobState(job: GhRunJobSnapshot): string;

package/dist/types/tools/read.d.ts

@@ -29,7 +29,10 @@ export interface ReadToolDetails {
     suffixResolution?: {
         from: string;
         to: string;
+        raw?: boolean;
     };
+    /** Raw source output keeps descriptive diagnostics in details, not in the body. */
+    raw?: boolean;
     url?: string;
     finalUrl?: string;
     contentType?: string;

package/dist/types/tools/wait.d.ts

@@ -55,6 +55,12 @@ export interface JobSnapshot {
      * on collision, else the job id itself. See {@link AsyncJob.agentId}.
      */
     agentUrlId?: string;
+    /**
+     * Whether this job's turn published `<agentUrlId>.md`. False where the job
+     * body reported that it wrote none, so `agent://` still holds an earlier
+     * turn's output; undefined where the body does not report it.
+     */
+    agentOutputPublished?: boolean;
 }
 /** Outcome of cancelling one background job. */
 export type CancelStatus = "cancelled" | "not_found" | "already_completed";

package/dist/types/tui.d.ts

@@ -363,6 +363,8 @@ export declare class TUI extends Container {
      * observers (live stream publisher, session recorder) coexist.
      */
     addPaintListener(listener: PaintListener): () => void;
+    /** Observe actual ANSI frame writes, including transient resize paints; returns the unsubscribe. */
+    addFrameWriteListener(listener: (data: string) => void): () => void;
     /** Install the product-owned bounded frame provider. */
     setFrameProvider(provider: TerminalFrameProvider | undefined): void;
     get fullRedraws(): number;
@@ -505,7 +507,10 @@ export declare class TUI extends Container {
      * never come.
      */
     addStartListener(listener: StartListener): () => void;
-    addInputListener(listener: InputListener): () => void;
+    /** Registers a key listener; `prepend` gives a foreground input owner first refusal over global shortcuts. */
+    addInputListener(listener: InputListener, options?: {
+        prepend?: boolean;
+    }): () => void;
     removeInputListener(listener: InputListener): void;
     stop(): void;
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-tui",
-	"version": "18.13.1",
+	"version": "18.13.3",
 	"description": "Terminal User Interface library with differential rendering for efficient text-based applications",
 	"homepage": "https://omp.sh",
 	"author": {
@@ -41,20 +41,20 @@
 		"gen:glyphs": "bun scripts/gen-glyphs.ts"
 	},
 	"dependencies": {
-		"@oh-my-pi/omptype": "18.13.1",
-		"@oh-my-pi/pi-agent-core": "18.13.1",
-		"@oh-my-pi/pi-ai": "18.13.1",
-		"@oh-my-pi/pi-catalog": "18.13.1",
-		"@oh-my-pi/pi-natives": "18.13.1",
-		"@oh-my-pi/pi-utils": "18.13.1",
-		"@oh-my-pi/pi-wire": "18.13.1",
-		"@oh-my-pi/snapcompact": "18.13.1"
+		"@oh-my-pi/omptype": "18.13.3",
+		"@oh-my-pi/pi-agent-core": "18.13.3",
+		"@oh-my-pi/pi-ai": "18.13.3",
+		"@oh-my-pi/pi-catalog": "18.13.3",
+		"@oh-my-pi/pi-natives": "18.13.3",
+		"@oh-my-pi/pi-utils": "18.13.3",
+		"@oh-my-pi/pi-wire": "18.13.3",
+		"@oh-my-pi/snapcompact": "18.13.3"
 	},
 	"devDependencies": {
 		"kitty-vt-wasm": "^0.2.0"
 	},
 	"engines": {
-		"bun": ">=1.3.14"
+		"bun": ">=1.4.4"
 	},
 	"files": [
 		"src",

package/src/apps/session-picker.ts

@@ -11,6 +11,8 @@ export interface SessionPickerHost<T extends SessionSelectorEntry = SessionSelec
 	loadPinnedIds?(): Promise<ReadonlySet<string>>;
 	loadHistoryMatcher?(): SessionHistoryMatcher;
 	deleteSession?(session: T): Promise<boolean>;
+	/** Rename the session and resolve with the title as stored, or null when it did not happen. */
+	renameSession?(session: T, title: string): Promise<string | null>;
 	loadAllSessions?(): Promise<T[]>;
 }
 
@@ -21,6 +23,8 @@ export interface SessionPickerOptions<T extends SessionSelectorEntry = SessionSe
 	scopeLabel?: string | false;
 	showCwd?: boolean;
 	allowDelete?: boolean;
+	/** Rename the selected session; resolve with the title as stored, or null when it did not happen. */
+	onRename?: (session: T, title: string) => Promise<string | null>;
 	allowGlobalScope?: boolean;
 	historySearch?: boolean;
 	pinnedIds?: ReadonlySet<string>;
@@ -63,6 +67,7 @@ export async function selectSession<T extends SessionSelectorEntry>(
 				},
 				{
 					onDelete: options.allowDelete === false ? undefined : host.deleteSession,
+					onRename: options.onRename ?? host.renameSession,
 					historyMatcher,
 					loadAllSessions: options.allowGlobalScope === false ? undefined : host.loadAllSessions,
 					allSessions: options.allSessions,

package/src/chat/advisor-message.ts

@@ -2,6 +2,7 @@ import { type Component } from "../tui";
 import { Disclosure } from "../components/disclosure";
 import { visibleWidth } from "../utils";
 import type { AdvisorMessageDetails, AdvisorNote, AdvisorSeverity } from "./messages";
+import { chatTranscriptDisplayPreferences } from "./display-preferences";
 import { formatBadge, replaceTabs, type ToolUIColor, wrapTextWithAnsi } from "../render/render-utils";
 import { Ellipsis, truncateToWidth } from "../render";
 import type { Theme } from "../theme";
@@ -274,6 +275,7 @@ export function createAdvisorMessageCard(
 		body: () => new AdvisorNotes(notes, 0, uiTheme),
 		expanded: getExpanded(),
 		paddingX: 1,
+		maxCollapsedRows: chatTranscriptDisplayPreferences.advisorCollapsedLines || undefined,
 	});
 	// The tool-output toggle owns expansion state; synchronize the controlled
 	// disclosure from the callback on every render.

package/src/chat/assistant-message.ts

@@ -792,8 +792,9 @@ export class AssistantMessageComponent extends Container {
 		return this.#transcriptBlockFinalized;
 	}
 
-	/** Whether a figure still waits for the raster of its final source; the transcript holds retirement meanwhile. */
+	/** Hold image and figure rendering until the completed block can enter immutable scrollback. */
 	isTranscriptBlockPending(): boolean {
+		if (this.#showImages && this.#kittyConversionsAwaited.size > 0) return true;
 		for (const block of this.#figureBlocks.values()) if (block.pending) return true;
 		return false;
 	}
@@ -1615,6 +1616,7 @@ export class AssistantMessageComponent extends Container {
 				})
 				.catch(() => {
 					this.#kittyConversionsAwaited.delete(key);
+					this.#onImageUpdate?.();
 				});
 		}
 	}

package/src/chat/bash-execution.ts

@@ -16,6 +16,7 @@ import type { TruncationMeta } from "../tools/output-meta";
 import { resolveImageOptions } from "../render/render-utils";
 import { OutputPane } from "../render/output-pane";
 import { loadXtermTerminal, readTerminalRows, styleTerminalRow } from "../tools/terminal-output";
+import { normalizeInputForPty } from "../tools/bash-interactive";
 import { getSixelLineMask, isSixelPassthroughEnabled, sanitizeWithOptionalSixelPassthrough } from "../render/sixel";
 import {
 	buildExecutionFrame,
@@ -286,6 +287,11 @@ export class BashExecutionComponent extends Container {
 		this.#drainPtyQueue();
 	}
 
+	/** Bytes a terminal would send for a key event, honoring the command's cursor-key mode; "" for key releases. */
+	encodePtyInput(data: string): string {
+		return normalizeInputForPty(data, this.#ptyTerminal?.modes.applicationCursorKeysMode ?? false);
+	}
+
 	#drainPtyQueue(): void {
 		const terminal = this.#ptyTerminal;
 		if (!terminal || this.#ptyWriting) return;

package/src/chat/display-preferences.ts

@@ -6,6 +6,8 @@ export interface ChatTranscriptDisplayPreferences {
 	cacheMissMarker: boolean;
 	showTokenUsage: boolean;
 	showTurnTime: boolean;
+	/** Max rows a collapsed advisor card shows below its header; 0 = no cap. */
+	advisorCollapsedLines: number;
 }
 
 /** Current transcript display preferences. */
@@ -16,6 +18,7 @@ export const chatTranscriptDisplayPreferences: ChatTranscriptDisplayPreferences
 	cacheMissMarker: false,
 	showTokenUsage: false,
 	showTurnTime: false,
+	advisorCollapsedLines: 0,
 };
 
 /** Apply host display preferences without pulling settings into the renderer. */

package/src/chat/tool-execution.ts

@@ -711,14 +711,15 @@ export class ToolExecutionComponent extends Container {
 			// Convert async - catch errors from processing
 			convertImageToPngShared(image)
 				.then(converted => {
+					this.#kittyConversionsAwaited.delete(key);
 					this.#kittyConverted.set(key, converted);
 					this.#displayInputVersion++;
 					this.#updateDisplay();
 					this.#ui.requestRender();
 				})
 				.catch(() => {
-					// Ignore conversion failures - display will use original image format
 					this.#kittyConversionsAwaited.delete(key);
+					this.#ui.requestRender();
 				});
 		}
 	}
@@ -859,9 +860,12 @@ export class ToolExecutionComponent extends Container {
 		}
 	}
 
-	/** Whether the result's figure still waits for its raster; the transcript holds retirement meanwhile. */
+	/** Hold visible results until their figures and Kitty images are ready for immutable scrollback. */
 	isTranscriptBlockPending(): boolean {
-		return this.#toolActivityVisible && this.#figure?.pending === true;
+		return (
+			this.#toolActivityVisible &&
+			((this.#showImages && this.#kittyConversionsAwaited.size > 0) || this.#figure?.pending === true)
+		);
 	}
 
 	/**

package/src/chrome/context-map.ts

@@ -0,0 +1,62 @@
+/** Pure occupancy calculations for contiguous token segments, independent of themes and renderers. */
+export interface ContextMapSegment<T> {
+	readonly id: T;
+	readonly tokens: number;
+}
+
+export interface ContextMapCell<T> {
+	readonly id: T;
+	readonly full: boolean;
+}
+
+/**
+ * Lays `segments` out in order over a `columns` × `rows` grid representing `windowTokens`; each cell takes the
+ * segment covering most of it and is `full` at 70% coverage or more. Returns `[]` when the window or grid
+ * size is unusable, and omits cells no segment touches.
+ */
+export function planContextMap<T>(
+	segments: readonly ContextMapSegment<T>[],
+	windowTokens: number,
+	columns: number,
+	rows: number,
+): ContextMapCell<T>[] {
+	if (
+		!Number.isFinite(windowTokens) ||
+		windowTokens <= 0 ||
+		!Number.isInteger(columns) ||
+		!Number.isInteger(rows) ||
+		columns <= 0 ||
+		rows <= 0
+	)
+		return [];
+	const cellCount = columns * rows;
+	const tokensPerCell = windowTokens / cellCount;
+	const ranges: { id: T; start: number; end: number }[] = [];
+	let cursor = 0;
+	for (const segment of segments) {
+		if (!Number.isFinite(segment.tokens) || segment.tokens <= 0) continue;
+		const end = Math.min(windowTokens, cursor + segment.tokens);
+		if (end > cursor) ranges.push({ id: segment.id, start: cursor, end });
+		cursor = end;
+		if (cursor >= windowTokens) break;
+	}
+	const cells: ContextMapCell<T>[] = [];
+	let first = 0;
+	for (let index = 0; index < cellCount; index++) {
+		const start = index * tokensPerCell;
+		const end = (index + 1) * tokensPerCell;
+		while (first < ranges.length && ranges[first]!.end <= start) first++;
+		let winner: T | undefined;
+		let overlap = 0;
+		for (let part = first; part < ranges.length && ranges[part]!.start < end; part++) {
+			const range = ranges[part]!;
+			const covered = Math.min(end, range.end) - Math.max(start, range.start);
+			if (covered > overlap) {
+				overlap = covered;
+				winner = range.id;
+			}
+		}
+		if (winner !== undefined) cells.push({ id: winner, full: overlap / tokensPerCell >= 0.7 });
+	}
+	return cells;
+}

package/src/chrome/context-presentation.ts

@@ -0,0 +1,26 @@
+import type { ThemeColor } from "../theme";
+import type { SymbolKey } from "../theme/symbols";
+import type { ContextCategoryId } from "./context-view-model";
+
+/** Shared category styles for maps and interactive legends; resolve glyphs at render time. */
+const SYSTEM = { color: "accent", symbol: "context.content" } as const;
+const DETAILS = { color: "customMessageLabel", symbol: "context.content" } as const;
+const TOOLS = { color: "warning", symbol: "context.content" } as const;
+const SKILLS = { color: "success", symbol: "context.content" } as const;
+const MESSAGES = { color: "userMessageText", symbol: "context.messages" } as const;
+const OUTPUT = { color: "muted", symbol: "context.messages" } as const;
+export const CONTEXT_PRESENTATION = {
+	"system-prompt": SYSTEM,
+	skills: SKILLS,
+	"built-in-tools": TOOLS,
+	"custom-tools": DETAILS,
+	// Shares the System Prompt color; the message glyph tells them apart in the map.
+	"user-messages": { color: "accent", symbol: "context.messages" },
+	"assistant-messages": MESSAGES,
+	"assistant-thinking": DETAILS,
+	"tool-calls": TOOLS,
+	"tool-output": OUTPUT,
+	buffer: { color: "warning", symbol: "context.buffer" },
+	free: { color: "dim", symbol: "context.free" },
+} as const satisfies Record<ContextPresentationId, { color: ThemeColor; symbol: SymbolKey }>;
+export type ContextPresentationId = ContextCategoryId | "buffer" | "free";

package/src/chrome/context-view-model.ts

@@ -0,0 +1,73 @@
+/** Context snapshot shapes shared by the session snapshot builder and the context viewer. */
+import type { ContextBreakdown } from "../status-line/context-usage";
+
+interface ContextCategoryDescriptor {
+	readonly id: string;
+	readonly label: string;
+	/** Overview row label when the Overview weight differs from the category's content. */
+	readonly overviewLabel?: string;
+	/** Listed with its weight but never opened. */
+	readonly openable?: false;
+}
+
+/** Context categories in display order. */
+export const CONTEXT_CATEGORIES = [
+	// The Overview weight excludes the Skills listing; content views keep complete system blocks.
+	{ id: "system-prompt", label: "System Prompt", overviewLabel: "System Prompt (excluding Skills)" },
+	// An estimate of the prompt's skill listing, without entries of its own.
+	{ id: "skills", label: "Skills", openable: false },
+	{ id: "built-in-tools", label: "Built-in Tools" },
+	{ id: "custom-tools", label: "Custom Tools" },
+	{ id: "user-messages", label: "User / Developer Messages" },
+	{ id: "assistant-messages", label: "Assistant Messages" },
+	{ id: "assistant-thinking", label: "Assistant Thinking" },
+	{ id: "tool-calls", label: "Tool Calls" },
+	{ id: "tool-output", label: "Tool Output" },
+] as const satisfies readonly ContextCategoryDescriptor[];
+
+export type ContextCategoryId = (typeof CONTEXT_CATEGORIES)[number]["id"];
+
+const DESCRIPTORS_BY_ID = new Map<ContextCategoryId, ContextCategoryDescriptor>(
+	CONTEXT_CATEGORIES.map(descriptor => [descriptor.id, descriptor]),
+);
+
+/** Descriptor of a category id: its label, optional Overview label, and whether it can be opened. */
+export function contextCategoryDescriptor(id: ContextCategoryId): ContextCategoryDescriptor {
+	return DESCRIPTORS_BY_ID.get(id)!;
+}
+
+export interface ContextThinkingGroup {
+	readonly id: string;
+	readonly label: string;
+	readonly tokens: number;
+	readonly interrupted?: boolean;
+}
+
+export interface ContextViewEntry {
+	readonly id: string;
+	readonly label: string;
+	readonly text: string;
+	/** Aggregation weight for the unscaled replay estimate; shared blocks contribute through their group. */
+	readonly tokens: number;
+	readonly interrupted?: boolean;
+	readonly thinkingGroup?: ContextThinkingGroup;
+	readonly path?: string;
+	readonly info?: string;
+	readonly timestamp?: number;
+	readonly callId?: string;
+}
+
+export interface ContextViewCategory {
+	id: ContextCategoryId;
+	key?: string;
+	label: string;
+	/** Overview attribution weight, not reported usage; may differ from the entry sum (e.g. Skills subtraction). */
+	tokens: number;
+	entries: ContextViewEntry[];
+	children?: ContextViewCategory[];
+}
+
+export interface ContextViewData {
+	readonly breakdown: ContextBreakdown;
+	readonly categories: readonly ContextViewCategory[];
+}