@timurproko/a1 0.2.5-dev.683 → 0.2.5-dev.704

package/dist/integrations/pi/components/upstream/components/trust-selector.js

@@ -2,14 +2,15 @@
  * Provenance: @earendil-works/pi-coding-agent 1.0.4 (MIT), commit 7c10bd4337495ee613f2224843ecdf349b80d1df,
  * packages/coding-agent/src/modes/interactive/components/trust-selector.ts.
  * Modifications: Mechanical source-synchronized trust selector port with injected public
- * ProjectTrustStore-derived options, remapped owned theme imports, and the shared bare-A1 modal
- * shortcut row and compact padded modal frame.
+ * ProjectTrustStore-derived options, remapped owned theme imports, the shared bare-A1 modal shortcut
+ * row and compact padded modal frame, and standard semantic trust styling with marker-free choice
+ * geometry.
  * Deviations: owned-modal-shortcut-hints.
  */
 import { DynamicBorder } from "../../../startup-public.js";
 import { Container, getKeybindings, Spacer, Text } from "@earendil-works/pi-tui";
 import { addPiModalHeader, adoptPiModalFrame } from "../../modal-frame.js";
-import { piTheme, renderPiModalShortcutHints } from "../../theme.js";
+import { DIALOG_CLOSE_SHORTCUT_HINT, piTheme, renderPiModalShortcutHints } from "../../theme.js";
 function formatDecision(trustPath, decision) {
     if (decision === null)
         return "none";
@@ -30,11 +31,11 @@ export class TrustSelectorComponent extends Container {
             && options.savedDecision?.decision === option.trusted
             && options.savedDecision.path === option.savedPath;
         this.selectedIndex = Math.max(0, this.trustOptions.findIndex(isSaved));
-        const header = addPiModalHeader(this, new DynamicBorder(), new Text(piTheme().fg("accent", piTheme().bold("Project trust")), 0, 0));
+        const header = addPiModalHeader(this, new DynamicBorder(text => piTheme().fg("border", text)), new Text(piTheme().fg("accent", piTheme().bold("Project trust")), 0, 0));
         this.addChild(new Text(piTheme().fg("muted", options.cwd), 0, 0));
         this.addChild(new Spacer(1));
-        this.addChild(new Text(piTheme().fg("muted", `Saved decision: ${formatDecision(this.trustOptions[0]?.savedPath, options.savedDecision)}`), 0, 0));
-        this.addChild(new Text(piTheme().fg("muted", `Current session: ${options.projectTrusted ? "trusted" : "untrusted"}`), 0, 0));
+        this.addChild(new Text(`${piTheme().fg("muted", "Saved decision:")} ${piTheme().fg("text", formatDecision(this.trustOptions[0]?.savedPath, options.savedDecision))}`, 0, 0));
+        this.addChild(new Text(`${piTheme().fg("muted", "Current session:")} ${piTheme().fg("text", options.projectTrusted ? "trusted" : "untrusted")}`, 0, 0));
         this.addChild(new Spacer(1));
         this.listContainer = new Container();
         this.addChild(this.listContainer);
@@ -43,12 +44,11 @@ export class TrustSelectorComponent extends Container {
         this.addChild(new Text(renderPiModalShortcutHints([
             { key: "↑↓", action: "navigate" },
             { key: keybindings.getKeys("tui.select.confirm").join("/"), action: "save" },
-            { key: keybindings.getKeys("tui.select.cancel").join("/"), action: "cancel" },
+            DIALOG_CLOSE_SHORTCUT_HINT,
         ]), 0, 0));
-        this.addChild(new Spacer(1));
-        this.addChild(new DynamicBorder());
+        this.addChild(new DynamicBorder(text => piTheme().fg("border", text)));
         adoptPiModalFrame(this, { topIndex: 0, bottomIndex: this.children.length - 1, header });
-        this.updateList(options.savedDecision);
+        this.updateList();
         this.handleInput = data => {
             const kb = getKeybindings();
             if (kb.matches(data, "tui.select.up") || data === "k")
@@ -67,21 +67,19 @@ export class TrustSelectorComponent extends Container {
             }
             else
                 return;
-            this.updateList(options.savedDecision);
+            this.updateList();
         };
     }
-    updateList(savedDecision) {
+    updateList() {
         this.listContainer.clear();
         for (let index = 0; index < this.trustOptions.length; index += 1) {
             const option = this.trustOptions[index];
             if (!option)
                 continue;
             const selected = index === this.selectedIndex;
-            const current = option.savedPath !== undefined && savedDecision?.decision === option.trusted && savedDecision.path === option.savedPath;
             const prefix = selected ? piTheme().fg("accent", "→ ") : "  ";
             const label = selected ? piTheme().fg("accent", option.label) : piTheme().fg("text", option.label);
-            const currentMarker = current ? piTheme().fg("accent", "✓ ") : "  ";
-            this.listContainer.addChild(new Text(`${prefix}${currentMarker}${label}`, 0, 0));
+            this.listContainer.addChild(new Text(`${prefix}${label}`, 0, 0));
         }
     }
 }

package/dist/integrations/pi/engine/adapter.js

@@ -382,8 +382,12 @@ export class PiEngineAdapter {
     reloadBlockedResult() {
         return this.#workflows.reloadBlockedResult();
     }
-    executeWorkflow(request) {
-        return this.#workflows.executeWorkflow(request);
+    async executeWorkflow(request) {
+        const result = await this.#workflows.executeWorkflow(request);
+        if (request.command === "tree" && result.outcome === "completed" && request.selection !== undefined) {
+            this.#refreshNavigatedSession(result.detail);
+        }
+        return result;
     }
     /**
      * The theme the engine is configured with, in the engine's own grammar: a
@@ -575,6 +579,21 @@ export class PiEngineAdapter {
                 throw new Error("owned UI state commands belong to the owned UI layer, not the Pi engine adapter");
         }
     }
+    // Invariant: in-place tree navigation rebuilds derived content without clearing the editor draft.
+    #refreshNavigatedSession(editorText) {
+        const session = this.#engine.session;
+        if (!session)
+            return;
+        if (editorText && !this.#editor.text.trim()) {
+            this.#editor = { ...this.#editor, text: editorText, selection: null, cursorOffset: editorText.length };
+        }
+        this.#activeModel = readModel(session.model);
+        this.#reconcileActiveModelAvailability();
+        this.#thinkingLevel = readThinkingLevel(session.thinkingLevel);
+        this.#projection.assets.clear();
+        this.#setTranscript(this.#projection.rebuild(session.messages, "finalized"));
+        this.#emitView();
+    }
     // Invariant: the runtime already advanced the generation and subscribed; this rebuilds what the view derives from a session.
     #sessionReplaced(session) {
         this.#delivery.discardObsolete(this.#engine.generation);

package/dist/integrations/pi/engine/workflow-runner.js

@@ -448,7 +448,8 @@ export class PiWorkflowRunner {
                     return workflowResult(request.command, "cancelled", "Branch summarization cancelled", undefined, "status");
                 if (isRecord(result) && result.cancelled === true)
                     return workflowResult(request.command, "cancelled", "Navigation cancelled", undefined, "status");
-                return workflowResult(request.command, "completed", "Navigated to selected point");
+                const editorText = isRecord(result) && typeof result.editorText === "string" ? result.editorText : undefined;
+                return workflowResult(request.command, "completed", "Navigated to selected point", editorText);
             }
             case "trust": {
                 if (!selection)

package/dist/native/darwin-arm64/manifest.json

@@ -5,7 +5,7 @@
   "platform": "darwin",
   "architecture": "arm64",
   "capability": "supported",
-  "builtAt": "2026-10-06T10:29:08.307Z",
+  "builtAt": "2026-10-07T15:28:34.230Z",
   "artifact": {
     "filename": "process-guardian",
     "sha256": "51b0b2dc1c9ae577f2586c4217066929278726c2c15308d9144eb6f538e118ff",

package/dist/native/linux-x64/manifest.json

@@ -5,7 +5,7 @@
   "platform": "linux",
   "architecture": "x64",
   "capability": "supported",
-  "builtAt": "2026-10-06T10:28:54.790Z",
+  "builtAt": "2026-10-07T15:28:19.388Z",
   "artifact": {
     "filename": "process-guardian",
     "sha256": "ef62679e83bc1fad3d38f9f21675d9256f08d20e67fd4791571032115ca1b0e9",

package/dist/native/win32-x64/manifest.json

@@ -5,10 +5,10 @@
   "platform": "win32",
   "architecture": "x64",
   "capability": "supported",
-  "builtAt": "2026-10-06T10:29:36.873Z",
+  "builtAt": "2026-10-07T15:29:15.953Z",
   "artifact": {
     "filename": "process-guardian.exe",
-    "sha256": "26318c5b3429492b1f5f3378b926fb83c83c5d274bc2c6e37f10973b23781920",
+    "sha256": "a8e1e48b23cfa2a33b4821ccf799bf703b984ac5453c08926f8b5928801c07bb",
     "size": 288256
   },
   "provenance": {

package/dist/ui/apps/host.d.ts

@@ -22,9 +22,10 @@ export interface AppHostOptions {
     readonly theme?: UiTheme;
 }
 /**
- * Presents at most one app. Input reaches the presented app first; anything it
- * does not consume continues to the caller. A failure while rendering or
- * handling input closes the app rather than leaving a broken surface on screen.
+ * Presents at most one app. An opted-in interrupt closes at the host boundary;
+ * other input reaches the presented app first and anything it does not consume
+ * continues to the caller. A failure while rendering or handling input closes
+ * the app rather than leaving a broken surface on screen.
  */
 export declare class UiAppHost {
     #private;

package/dist/ui/apps/host.js

@@ -5,9 +5,10 @@ const INTERRUPT = "";
 /** How long the first interrupt of the chord stays armed. */
 const INTERRUPT_CHORD_MS = 1_500;
 /**
- * Presents at most one app. Input reaches the presented app first; anything it
- * does not consume continues to the caller. A failure while rendering or
- * handling input closes the app rather than leaving a broken surface on screen.
+ * Presents at most one app. An opted-in interrupt closes at the host boundary;
+ * other input reaches the presented app first and anything it does not consume
+ * continues to the caller. A failure while rendering or handling input closes
+ * the app rather than leaving a broken surface on screen.
  */
 export class UiAppHost {
     #registry;
@@ -70,6 +71,10 @@ export class UiAppHost {
         const app = this.#app;
         if (app === null)
             return { consumed: false };
+        if (data === INTERRUPT && this.#closeOnInterrupt) {
+            this.close();
+            return { consumed: true, render: true };
+        }
         const result = this.#guard(() => app.onInput?.(data, this.#services())) ?? { consumed: false };
         if (this.#app === null)
             return { consumed: true, render: true };
@@ -91,7 +96,7 @@ export class UiAppHost {
             this.render();
         return result;
     }
-    // Protocol: two interrupts within the chord window leave A1 from every screen.
+    // Protocol: a non-opted-in host preserves the two-interrupt application exit chord.
     #interrupt() {
         const now = Date.now();
         const armed = this.#interruptArmedAt;

package/dist/ui/components/dialog-panel.d.ts

@@ -1,3 +1,4 @@
+import { LineInput } from "./line-input.js";
 import { type ShortcutHintEntry } from "./shortcut-hints.js";
 import type { UiTheme } from "./theme.js";
 /**
@@ -7,11 +8,13 @@ import type { UiTheme } from "./theme.js";
  */
 export interface DialogRow {
     readonly label: string;
+    readonly labelSuffix?: string;
     readonly value: string;
     /** What this part does, shown while it is the one in hand. */
     readonly description?: string;
 }
 export interface DialogPanelState {
+    readonly title: string;
     readonly rows: readonly DialogRow[];
     /** The row in hand. */
     readonly index: number;
@@ -26,6 +29,16 @@ export interface DialogPanelFrame {
     /** Column the values start at, so a label stays a label. */
     readonly valueColumn: number;
 }
+export interface SteppedDialogPanelState {
+    readonly title: string;
+    readonly step: number;
+    readonly steps: number;
+    readonly description: string;
+    readonly input?: LineInput;
+    readonly rows: readonly DialogRow[];
+    readonly index: number;
+    readonly hint: readonly ShortcutHintEntry[];
+}
 /** The column values start at: past the widest label, capped so one long name cannot push them off. */
 export declare function dialogValueColumn(rows: readonly DialogRow[]): number;
 /**
@@ -33,5 +46,7 @@ export declare function dialogValueColumn(rows: readonly DialogRow[]): number;
  * one line below the panel's top.
  */
 export declare function renderDialogPanel(state: DialogPanelState, width: number, theme: UiTheme): readonly string[];
+/** Owned stepped-selector composition for structured settings with nested choices. */
+export declare function renderSteppedDialogPanel(state: SteppedDialogPanelState, width: number, theme: UiTheme): readonly string[];
 /** The row a pointer report lands on, or null when it is not on one. */
 export declare function dialogRowAt(frame: DialogPanelFrame, row: number, column: number, valueWidth: number): number | null;

package/dist/ui/components/dialog-panel.js

@@ -1,6 +1,8 @@
-import { renderShortcutHints, shortcutHintsText } from "./shortcut-hints.js";
+import { LineInput, renderInputRow } from "./line-input.js";
+import { renderShortcutHints, renderShortcutHintsWithClose, shortcutHintsText } from "./shortcut-hints.js";
 import { displayWidth, truncateToWidth } from "./text.js";
 const LABEL_COLUMN_CAP = 30;
+const STEPPED_LABEL_COLUMN_CAP = 46;
 /** The column values start at: past the widest label, capped so one long name cannot push them off. */
 export function dialogValueColumn(rows) {
     const widest = Math.min(LABEL_COLUMN_CAP, Math.max(0, ...rows.map(row => displayWidth(row.label))));
@@ -22,28 +24,72 @@ export function renderDialogPanel(state, width, theme) {
         const padded = `${row.label}${" ".repeat(Math.max(0, labelColumn - displayWidth(row.label)))}`;
         const cursor = selected ? "→ " : "  ";
         const raw = `${cursor}${padded}  ${row.value}`;
-        // Compatibility: match pinned SettingsList: selected cursor, label, and value all use the
-        // accent role; an unselected label is plain and its value is muted.
-        const painted = selected
-            ? `${theme.fg("accent", cursor)}${theme.fg("accent", padded)}  ${theme.fg("accent", row.value)}`
+        const content = selected
+            ? `${theme.fg("accent", cursor)}${theme.fg("text", padded)}  ${theme.fg("muted", row.value)}`
             : `${cursor}${padded}  ${theme.fg("muted", row.value)}`;
+        const painted = selected ? theme.highlight(content) : content;
         return contentRow(painted, raw);
     });
     const description = state.rows[state.index]?.description ?? "";
     const hint = typeof state.hint === "string"
         ? theme.fg("dim", state.hint)
-        : renderShortcutHints(state.hint, theme, 0);
-    const plainHint = typeof state.hint === "string" ? state.hint : shortcutHintsText(state.hint, 0);
+        : renderShortcutHintsWithClose(state.hint, theme, contentWidth, 0);
+    const plainHint = typeof state.hint === "string" ? state.hint : " ".repeat(displayWidth(hint));
     return [
         rule,
-        ...rows,
+        contentRow(theme.bold(theme.fg("accent", state.title)), state.title),
+        contentRow(theme.fg("dim", description), description),
         "",
-        contentRow(theme.fg("dim", `  ${description}`), `  ${description}`),
+        ...rows,
         "",
         contentRow(hint, plainHint),
         rule,
     ];
 }
+/** Owned stepped-selector composition for structured settings with nested choices. */
+export function renderSteppedDialogPanel(state, width, theme) {
+    const rule = theme.fg("border", "─".repeat(Math.max(0, width)));
+    const contentPadding = Math.min(1, Math.max(0, width));
+    const contentWidth = Math.max(0, width - contentPadding);
+    const inset = " ".repeat(contentPadding);
+    const contentRow = (painted, raw) => `${inset}${pad(truncateToWidth(painted, contentWidth), contentWidth, raw)}`;
+    const labelColumn = Math.min(STEPPED_LABEL_COLUMN_CAP, Math.max(0, ...state.rows.map(row => displayWidth(`${row.label}${row.labelSuffix ?? ""}`))));
+    const rows = state.rows.map((row, index) => {
+        const selected = index === state.index;
+        const completeLabel = `${row.label}${row.labelSuffix ?? ""}`;
+        const padding = " ".repeat(Math.max(0, labelColumn - displayWidth(completeLabel)));
+        const suffix = row.value.length === 0 ? "" : `  ${row.value}`;
+        const cursor = selected ? "→ " : "  ";
+        const raw = `${cursor}${completeLabel}${padding}${suffix}`;
+        const label = `${theme.fg("text", row.label)}${theme.fg("muted", row.labelSuffix ?? "")}${padding}`;
+        const content = selected
+            ? `${theme.fg("accent", cursor)}${label}${theme.fg("muted", suffix)}`
+            : `${cursor}${label}${theme.fg("muted", suffix)}`;
+        return contentRow(selected ? theme.highlight(content) : content, raw);
+    });
+    const input = state.input === undefined
+        ? []
+        : [...renderInputRow(state.input, width, { ruled: false, promptGlyph: "> ", theme }).lines, ""];
+    const step = `(step ${state.step}/${state.steps})`;
+    const title = `${state.title} ${step}`;
+    const paintedTitle = `${theme.bold(theme.fg("accent", state.title))} ${theme.fg("dim", step)}`;
+    return [
+        rule,
+        contentRow(paintedTitle, title),
+        contentRow(theme.fg("dim", state.description), state.description),
+        "",
+        ...input,
+        ...rows,
+        "",
+        renderSteppedHint(state.hint, width, theme),
+        rule,
+    ];
+}
+function renderSteppedHint(entries, width, theme) {
+    const raw = shortcutHintsText(entries, 1, " · ");
+    const painted = renderShortcutHints(entries, theme, 1, theme.fg("dim", " · "));
+    return `${truncateToWidth(painted, width)}${" ".repeat(Math.max(0, width - displayWidth(raw)))}`;
+}
 /** The row a pointer report lands on, or null when it is not on one. */
 export function dialogRowAt(frame, row, column, valueWidth) {
     const at = row - frame.firstRow;

package/dist/ui/components/index.d.ts

@@ -1,5 +1,5 @@
-export { dialogRowAt, dialogValueColumn, renderDialogPanel } from "./dialog-panel.js";
-export type { DialogPanelFrame, DialogPanelState, DialogRow } from "./dialog-panel.js";
+export { dialogRowAt, dialogValueColumn, renderDialogPanel, renderSteppedDialogPanel } from "./dialog-panel.js";
+export type { DialogPanelFrame, DialogPanelState, DialogRow, SteppedDialogPanelState } from "./dialog-panel.js";
 export { FrameContractError, assertPaneRect, finalizeFrame, validateFrame } from "./frame.js";
 export type { PaneRect } from "./frame.js";
 export { humanizeLabel, humanizeTitle } from "./label.js";
@@ -23,7 +23,7 @@ export { MAX_COPY_ROWS, MAX_COPY_SOURCE_UNITS, selectionCopyLineContent, selecti
 export type { SelectionCopyPrompt, SelectionCopyRow, SelectionCopySnapshot } from "./selection-copy.js";
 export { ScrollbarRails, isThumbRow, scrollForThumbRow, scrollForTrackPage, scrollbarGeometry, scrollbarPresentation, scrollbarReservesSpace, scrollbarSelectionRows, scrollbarWheelRows, } from "./scrollbar.js";
 export type { RailPointer, RailPosition, ScrollbarAppearance, ScrollbarGeometry, ScrollbarInput, ScrollbarPresentation, ScrollbarPresentationInput, ScrollbarSpeed, ScrollbarStyle, } from "./scrollbar.js";
-export { renderShortcutHints } from "./shortcut-hints.js";
+export { assertOwnedShortcutHintConventions, renderShortcutHints, renderShortcutHintsWithClose, shortcutHintsText } from "./shortcut-hints.js";
 export type { ShortcutHintEntry } from "./shortcut-hints.js";
 export { GLOBAL_SCOPE, ShortcutRegistry, assembleShortcuts, assertNoShortcutConflicts } from "./shortcuts.js";
 export type { ShortcutConflict, ShortcutDeclaration, ShortcutRegistryResult } from "./shortcuts.js";

package/dist/ui/components/index.js

@@ -1,4 +1,4 @@
-export { dialogRowAt, dialogValueColumn, renderDialogPanel } from "./dialog-panel.js";
+export { dialogRowAt, dialogValueColumn, renderDialogPanel, renderSteppedDialogPanel } from "./dialog-panel.js";
 export { FrameContractError, assertPaneRect, finalizeFrame, validateFrame } from "./frame.js";
 export { humanizeLabel, humanizeTitle } from "./label.js";
 export { LineInput, caretCell, handleLineInputKey, renderInputRow, wordLeft, wordRight } from "./line-input.js";
@@ -11,7 +11,7 @@ export { progressStatusFrame, progressStatusText } from "./progress-status.js";
 export { FrameCache, RENDER_REVISION_KINDS, RenderRevisionTracker, ZERO_REVISIONS, normalizeRevisions, revisionsEqual } from "./revision.js";
 export { MAX_COPY_ROWS, MAX_COPY_SOURCE_UNITS, selectionCopyLineContent, selectionCopyRowText } from "./selection-copy.js";
 export { ScrollbarRails, isThumbRow, scrollForThumbRow, scrollForTrackPage, scrollbarGeometry, scrollbarPresentation, scrollbarReservesSpace, scrollbarSelectionRows, scrollbarWheelRows, } from "./scrollbar.js";
-export { renderShortcutHints } from "./shortcut-hints.js";
+export { assertOwnedShortcutHintConventions, renderShortcutHints, renderShortcutHintsWithClose, shortcutHintsText } from "./shortcut-hints.js";
 export { GLOBAL_SCOPE, ShortcutRegistry, assembleShortcuts, assertNoShortcutConflicts } from "./shortcuts.js";
 export { backgroundSgrSpan, heldNativeHyperlinkStyle, hyperlinkSgrSpan, hyperlinkTargetAtColumn, nativeHyperlinkStyle, overlaySpan } from "./spans.js";
 export { readVisibleHyperlinks } from "./visible-hyperlinks.js";

package/dist/ui/components/line-input.d.ts

@@ -58,6 +58,8 @@ export interface InputRowOptions {
     readonly placeholder?: string;
     /** Rules above and below, in the prompt's own grey. Default true. */
     readonly ruled?: boolean;
+    /** Prompt marker including any following spacing. Defaults to the shared prompt glyph. */
+    readonly promptGlyph?: string;
     readonly theme?: Pick<UiTheme, "fg">;
 }
 export interface InputRow {

package/dist/ui/components/line-input.js

@@ -209,7 +209,7 @@ export function caretCell(text) {
 /** The input row as the reference draws one, padded to exactly the width. */
 export function renderInputRow(input, width, options = {}) {
     const presentation = new PromptInput(options.theme);
-    const view = input.view(Math.max(0, width - presentation.geometry(width).prefixWidth));
+    const view = input.view(Math.max(0, width - presentation.geometry(width, 0, options.promptGlyph).prefixWidth));
     const placeholder = options.placeholder ?? "";
     const empty = view.text.length === 0 && placeholder.length > 0;
     const before = view.text.slice(0, view.caretColumn);
@@ -220,5 +220,5 @@ export function renderInputRow(input, width, options = {}) {
     const body = empty
         ? `${caretCell(placeholder.slice(0, 1))}${faint(placeholder.slice(1))}`
         : `${before}${caretCell(under)}${after}`;
-    return { lines: presentation.render(width, () => ({ rows: [body] }), options.ruled) };
+    return { lines: presentation.render(width, () => ({ rows: [body] }), options.ruled, 0, options.promptGlyph) };
 }

package/dist/ui/components/list-view.d.ts

@@ -44,9 +44,9 @@ export declare function valueColumnFor(rows: readonly ListViewRow[], indent?: nu
 /** A group's name with the shared one-cell section inset used by owned screens. */
 export declare function renderGroupHeader(title: string, width: number, theme: UiTheme): string;
 /**
- * One row, painted. The label carries the selection, the value carries the
- * pointer, and the stepper appears only when the pointer is on the value it
- * belongs to — an affordance, not decoration.
+ * One row, painted. The selected item keeps an accent cursor, normal-text label,
+ * muted value, and item-bounded highlight; the value carries the pointer, and the
+ * stepper appears only when the pointer is on the value it belongs to.
  */
 export declare function renderListRow(row: ListViewRow, state: ListRowState, valueColumn: number, width: number, theme: UiTheme): string;
 /** A line that stands in for rows: why a group has none, or what it is waiting on. */

package/dist/ui/components/list-view.js

@@ -18,9 +18,9 @@ export function renderGroupHeader(title, width, theme) {
     return ` ${truncateToWidth(theme.fg("mdHeading", theme.bold(title)), width - 1)}`;
 }
 /**
- * One row, painted. The label carries the selection, the value carries the
- * pointer, and the stepper appears only when the pointer is on the value it
- * belongs to — an affordance, not decoration.
+ * One row, painted. The selected item keeps an accent cursor, normal-text label,
+ * muted value, and item-bounded highlight; the value carries the pointer, and the
+ * stepper appears only when the pointer is on the value it belongs to.
  */
 export function renderListRow(row, state, valueColumn, width, theme) {
     const cursor = state.selected ? "→ " : "  ";
@@ -28,13 +28,11 @@ export function renderListRow(row, state, valueColumn, width, theme) {
     const labelPadded = `${row.label}${" ".repeat(Math.max(0, labelColumn - displayWidth(row.label)))}`;
     const leftRaw = `${cursor}${labelPadded}`;
     const left = state.selected
-        ? `${theme.fg("accent", cursor)}${theme.fg("accent", labelPadded)}`
+        ? `${theme.fg("accent", cursor)}${theme.fg("text", labelPadded)}`
         : `${cursor}${theme.plain(labelPadded)}`;
     const gap = Math.max(2, valueColumn - displayWidth(leftRaw));
-    // Rationale: a declared difference from pinned SettingsList, which paints the selected
-    // value in the accent too. Here only the cursor and label carry the selection; the
-    // value reads the same on every row, and pointer hover brightens it without moving
-    // the keyboard selection.
+    // Rationale: the value keeps the same semantic foreground on selected and unselected
+    // rows; pointer hover brightens it without moving keyboard selection.
     const valueHovered = state.hovered && state.region !== "label";
     const stepper = row.stepper !== undefined && valueHovered;
     const value = valueHovered ? theme.plain(row.value) : theme.fg("muted", row.value);
@@ -50,7 +48,8 @@ export function renderListRow(row, state, valueColumn, width, theme) {
         : "";
     const indent = Math.max(2, stepper ? gap - STEPPER_RESERVE : gap);
     const suffix = row.suffix === undefined ? "" : theme.fg("dim", `  ${row.suffix}`);
-    return truncateToWidth(`${left}${" ".repeat(indent)}${minus}${value}${plus}${suffix}`, width);
+    const rendered = truncateToWidth(`${left}${" ".repeat(indent)}${minus}${value}${plus}${suffix}`, width);
+    return state.selected ? theme.highlight(rendered) : rendered;
 }
 /** A line that stands in for rows: why a group has none, or what it is waiting on. */
 export function renderNote(text, width, theme) {

package/dist/ui/components/prompt-input.d.ts

@@ -21,12 +21,12 @@ export declare class PromptInput {
     readonly metrics: PromptInputMetrics;
     constructor(theme?: Pick<UiTheme, "fg">, metrics?: PromptInputMetrics);
     styleRule(text: string): string;
-    geometry(width: number, padding?: number): {
+    geometry(width: number, padding?: number, promptGlyph?: string): {
         prefixWidth: number;
         innerWidth: number;
         paddingX: number;
         contentWidth: number;
         layoutWidth: number;
     };
-    render(width: number, renderBody: (innerWidth: number) => PromptInputBody, ruled?: boolean, padding?: number): string[];
+    render(width: number, renderBody: (innerWidth: number) => PromptInputBody, ruled?: boolean, padding?: number, promptGlyph?: string): string[];
 }

package/dist/ui/components/prompt-input.js

@@ -17,8 +17,8 @@ export class PromptInput {
     metrics;
     constructor(theme = PLAIN_THEME, metrics = { measure: displayWidth, truncate: truncateToWidth }) { this.theme = theme; this.metrics = metrics; }
     styleRule(text) { return promptRuleText(text); }
-    geometry(width, padding = 0) {
-        const prefixWidth = Math.min(PROMPT_PREFIX_WIDTH, Math.max(0, width));
+    geometry(width, padding = 0, promptGlyph = PROMPT_GLYPH) {
+        const prefixWidth = Math.min(this.metrics.measure(promptGlyph), Math.max(0, width));
         // Compatibility: editor wrapping needs room for a two-cell grapheme plus its cursor cell.
         // Lay out against a safe virtual width, then clip only at the shared frame boundary.
         const innerWidth = Math.max(3 + padding * 2, width - prefixWidth);
@@ -26,17 +26,17 @@ export class PromptInput {
         const contentWidth = Math.max(1, innerWidth - paddingX * 2);
         return { prefixWidth, innerWidth, paddingX, contentWidth, layoutWidth: Math.max(1, contentWidth - (paddingX ? 0 : 1)) };
     }
-    render(width, renderBody, ruled = true, padding = 0) {
+    render(width, renderBody, ruled = true, padding = 0, promptGlyph = PROMPT_GLYPH) {
         if (width <= 0)
             return [];
-        const { prefixWidth, innerWidth } = this.geometry(width, padding);
+        const { prefixWidth, innerWidth } = this.geometry(width, padding, promptGlyph);
         const body = renderBody(innerWidth);
         const fit = (row) => {
             const clipped = this.metrics.truncate(row, width);
             return clipped + " ".repeat(Math.max(0, width - this.metrics.measure(clipped)));
         };
         const rows = body.rows.map((row, index) => fit(`${index === 0
-            ? promptArrow(PROMPT_GLYPH, this.theme)
+            ? promptArrow(promptGlyph, this.theme)
             : " ".repeat(prefixWidth)}${row}`));
         const rule = (fragment) => fragment === undefined
             ? promptRule(width)

package/dist/ui/components/shortcut-hints.d.ts

@@ -1,7 +1,14 @@
 import { type SemanticShortcutHint } from "../../contracts/presentation/index.js";
 import type { UiTheme } from "./theme.js";
 export type ShortcutHintEntry = SemanticShortcutHint;
+/**
+ * Enforces the owned-dialog hint grammar at the shared rendering boundary.
+ * Pinned Pi surfaces use their separate adapter and retain upstream wording.
+ */
+export declare function assertOwnedShortcutHintConventions(entries: readonly ShortcutHintEntry[]): void;
 /** Returns an unstyled modal instruction row for width-aware clipping. */
-export declare function shortcutHintsText(entries: readonly ShortcutHintEntry[], indent?: number): string;
-/** Paints one modal instruction row without decorative separator glyphs. */
-export declare function renderShortcutHints(entries: readonly ShortcutHintEntry[], theme: Pick<UiTheme, "fg">, indent?: number): string;
+export declare function shortcutHintsText(entries: readonly ShortcutHintEntry[], indent?: number, separator?: string): string;
+/** Paints one modal instruction row with shared key/action roles and caller-selected spacing. */
+export declare function renderShortcutHints(entries: readonly ShortcutHintEntry[], theme: Pick<UiTheme, "fg">, indent?: number, separator?: string): string;
+/** Clips preceding guidance first so a final canonical close entry remains complete whenever it fits. */
+export declare function renderShortcutHintsWithClose(entries: readonly ShortcutHintEntry[], theme: Pick<UiTheme, "fg">, width: number, indent?: number): string;

package/dist/ui/components/shortcut-hints.js

@@ -1,12 +1,48 @@
-import { renderSemanticShortcutHints, } from "../../contracts/presentation/index.js";
+import { DIALOG_CLOSE_SHORTCUT_HINT, renderSemanticShortcutHints, } from "../../contracts/presentation/index.js";
+import { displayWidth, truncateToWidth } from "./text.js";
+/**
+ * Enforces the owned-dialog hint grammar at the shared rendering boundary.
+ * Pinned Pi surfaces use their separate adapter and retain upstream wording.
+ */
+export function assertOwnedShortcutHintConventions(entries) {
+    for (const entry of entries) {
+        if (entry.key === undefined || entry.key.trim().length === 0)
+            continue;
+        if (entry.key !== entry.key.trim())
+            throw new TypeError("owned shortcut hint keys must not have surrounding whitespace");
+        if (entry.action !== entry.action.trim() || entry.action.length === 0) {
+            throw new TypeError("owned shortcut hint actions must be nonempty and have no surrounding whitespace");
+        }
+        if (/^to(?:\s|$)/iu.test(entry.action)) {
+            throw new TypeError(`owned shortcut hint actions omit connective "to": ${entry.key} ${entry.action}`);
+        }
+    }
+}
 /** Returns an unstyled modal instruction row for width-aware clipping. */
-export function shortcutHintsText(entries, indent = 0) {
-    return renderSemanticShortcutHints(entries, { key: text => text, action: text => text }, indent);
+export function shortcutHintsText(entries, indent = 0, separator = "  ") {
+    assertOwnedShortcutHintConventions(entries);
+    return renderSemanticShortcutHints(entries, { key: text => text, action: text => text }, indent, separator);
 }
-/** Paints one modal instruction row without decorative separator glyphs. */
-export function renderShortcutHints(entries, theme, indent = 0) {
+/** Paints one modal instruction row with shared key/action roles and caller-selected spacing. */
+export function renderShortcutHints(entries, theme, indent = 0, separator = "  ") {
+    assertOwnedShortcutHintConventions(entries);
     return renderSemanticShortcutHints(entries, {
         key: text => theme.fg("dim", text),
         action: text => theme.fg("muted", text),
-    }, indent);
+    }, indent, separator);
+}
+/** Clips preceding guidance first so a final canonical close entry remains complete whenever it fits. */
+export function renderShortcutHintsWithClose(entries, theme, width, indent = 0) {
+    const hasClose = entries.at(-1)?.key === DIALOG_CLOSE_SHORTCUT_HINT.key
+        && entries.at(-1)?.action === DIALOG_CLOSE_SHORTCUT_HINT.action;
+    if (!hasClose)
+        return truncateToWidth(renderShortcutHints(entries, theme, indent), width);
+    const withoutClose = entries.slice(0, -1);
+    const close = renderShortcutHints([DIALOG_CLOSE_SHORTCUT_HINT], theme);
+    const closeWidth = displayWidth(close);
+    if (width <= closeWidth)
+        return truncateToWidth(close, width);
+    const bodyWidth = Math.max(0, width - closeWidth - 2);
+    const body = bodyWidth < 3 ? "" : truncateToWidth(renderShortcutHints(withoutClose, theme, indent), bodyWidth);
+    return displayWidth(body) === 0 ? close : `${body}  ${close}`;
 }

package/dist/ui/components/shortcuts.d.ts

@@ -4,7 +4,7 @@
  * assembled, and any listing is generated from the same declarations — so a
  * listed shortcut is one dispatch would actually invoke.
  */
-import type { ShortcutHintEntry } from "./shortcut-hints.js";
+import { type ShortcutHintEntry } from "./shortcut-hints.js";
 export interface ShortcutDeclaration {
     /** Key token, for example `up`, `shift+down`, `ctrl+c`, or a literal character. */
     readonly key: string;

package/dist/ui/components/shortcuts.js

@@ -4,6 +4,7 @@
  * assembled, and any listing is generated from the same declarations — so a
  * listed shortcut is one dispatch would actually invoke.
  */
+import { assertOwnedShortcutHintConventions } from "./shortcut-hints.js";
 export const GLOBAL_SCOPE = "global";
 function overlaps(left, right) {
     return left === right || left === GLOBAL_SCOPE || right === GLOBAL_SCOPE;
@@ -45,6 +46,9 @@ export class ShortcutRegistry {
     #declarations = [];
     #actions = new Map();
     declare(declaration, action) {
+        if (declaration.hint !== undefined) {
+            assertOwnedShortcutHintConventions([{ key: declaration.hint.keys, action: declaration.hint.does }]);
+        }
         this.#declarations.push(declaration);
         this.#actions.set(`${declaration.scope}\u0000${declaration.key}`, action);
     }