@timurproko/a1 0.1.8-dev.544 → 0.1.8-dev.558

package/dist/integrations/pi/components/upstream/adjacent/core/keybindings.d.ts

@@ -139,7 +139,7 @@ export declare const KEYBINDINGS: {
         readonly description: "Copy selection or last assistant message";
     };
     readonly "app.message.followUp": {
-        readonly defaultKeys: "ctrl+q" | "alt+enter";
+        readonly defaultKeys: "alt+enter" | "ctrl+q";
         readonly description: "Queue follow-up message";
     };
     readonly "app.message.dequeue": {
@@ -147,7 +147,7 @@ export declare const KEYBINDINGS: {
         readonly description: "Restore queued messages";
     };
     readonly "app.clipboard.pasteImage": {
-        readonly defaultKeys: "ctrl+v" | "alt+v";
+        readonly defaultKeys: "alt+v" | "ctrl+v";
         readonly description: "Paste image from clipboard (text fallback)";
     };
     readonly "app.session.new": {
@@ -167,11 +167,11 @@ export declare const KEYBINDINGS: {
         readonly description: "Resume a session";
     };
     readonly "app.tree.foldOrUp": {
-        readonly defaultKeys: ("ctrl+left" | "alt+left")[];
+        readonly defaultKeys: ("alt+left" | "ctrl+left")[];
         readonly description: "Fold tree branch or move up";
     };
     readonly "app.tree.unfoldOrDown": {
-        readonly defaultKeys: ("ctrl+right" | "alt+right")[];
+        readonly defaultKeys: ("alt+right" | "ctrl+right")[];
         readonly description: "Unfold tree branch or move down";
     };
     readonly "app.tree.editLabel": {

package/dist/integrations/pi/components/upstream/components/extension-editor.d.ts

@@ -3,8 +3,8 @@
  * packages/coding-agent/src/modes/interactive/components/extension-editor.ts.
  * Modifications: Mechanical port: remap pi-tui to the root public singleton, use owned
  * keybindings/theme and external-editor seams, preserve editor layout, hints, focus, submission,
- * cancellation, and external-editor lifecycle.
- * Deviations: none.
+ * cancellation, and external-editor lifecycle; bare A1 uses the shared semantic modal shortcut row.
+ * Deviations: owned-modal-shortcut-hints.
  */
 import { Container, type TUI } from "@earendil-works/pi-tui";
 import type { KeybindingsManager } from "../adjacent/core/keybindings.js";

package/dist/integrations/pi/components/upstream/components/extension-editor.js

@@ -3,16 +3,13 @@
  * packages/coding-agent/src/modes/interactive/components/extension-editor.ts.
  * Modifications: Mechanical port: remap pi-tui to the root public singleton, use owned
  * keybindings/theme and external-editor seams, preserve editor layout, hints, focus, submission,
- * cancellation, and external-editor lifecycle.
- * Deviations: none.
+ * cancellation, and external-editor lifecycle; bare A1 uses the shared semantic modal shortcut row.
+ * Deviations: owned-modal-shortcut-hints.
  */
 import { Container, Editor, Spacer, Text, } from "@earendil-works/pi-tui";
 import { DynamicBorder, getSelectListTheme } from "../../../startup-public.js";
 import { editInExternalEditor } from "../external-editor.js";
-import { piTheme } from "../../theme.js";
-function keyHint(keybindings, keybinding, description) {
-    return piTheme().fg("dim", keybindings.getKeys(keybinding).join("/")) + piTheme().fg("muted", ` ${description}`);
-}
+import { piTheme, renderPiModalShortcutHints } from "../../theme.js";
 export class ExtensionEditorComponent extends Container {
     #editor;
     #tui;
@@ -54,10 +51,12 @@ export class ExtensionEditorComponent extends Container {
         this.#editor.onSubmit = onSubmit;
         this.addChild(this.#editor);
         this.addChild(new Spacer(1));
-        const hint = keyHint(this.#keybindings, "tui.select.confirm", "submit")
-            + "  " + keyHint(this.#keybindings, "tui.input.newLine", "newline")
-            + "  " + keyHint(this.#keybindings, "tui.select.cancel", "cancel")
-            + "  " + keyHint(this.#keybindings, "app.editor.external", "external editor");
+        const hint = renderPiModalShortcutHints([
+            { key: this.#keybindings.getKeys("tui.select.confirm").join("/"), action: "submit" },
+            { key: this.#keybindings.getKeys("tui.input.newLine").join("/"), action: "newline" },
+            { key: this.#keybindings.getKeys("tui.select.cancel").join("/"), action: "cancel" },
+            { key: this.#keybindings.getKeys("app.editor.external").join("/"), action: "external editor" },
+        ]);
         this.addChild(new Text(hint, 1, 0));
         this.addChild(new Spacer(1));
         this.addChild(new DynamicBorder());

package/dist/integrations/pi/components/upstream/components/extension-input.d.ts

@@ -0,0 +1,17 @@
+import { Container, type TUI } from "@earendil-works/pi-tui";
+interface ExtensionInputOptions {
+    readonly tui?: TUI;
+    readonly timeout?: number;
+    readonly description?: string;
+    readonly initialValue?: string;
+}
+/** Bare-A1 extension text input using the common modal shortcut row. */
+export declare class ExtensionInputComponent extends Container {
+    #private;
+    get focused(): boolean;
+    set focused(value: boolean);
+    constructor(title: string, _placeholder: string | undefined, onSubmit: (value: string) => void, onCancel: () => void, opts?: ExtensionInputOptions);
+    handleInput(keyData: string): void;
+    dispose(): void;
+}
+export {};

package/dist/integrations/pi/components/upstream/components/extension-input.js

@@ -0,0 +1,72 @@
+/**
+ * Provenance: @earendil-works/pi-coding-agent 0.87.0 (MIT), commit 16787ad5b2dc748047f314ca1bfe7708f30f54f3,
+ * packages/coding-agent/src/modes/interactive/components/extension-input.ts.
+ * Modifications: Mechanical port: remap public imports, use ECMAScript private fields, and route the
+ * bare-A1 instruction row through the shared semantic shortcut renderer while preserving input,
+ * timeout, focus, submission, cancellation, and disposal behavior.
+ * Deviations: owned-modal-shortcut-hints.
+ */
+import { DynamicBorder } from "../../../startup-public.js";
+import { Container, getKeybindings, Input, Spacer, Text } from "@earendil-works/pi-tui";
+import { piTheme, renderPiModalShortcutHints } from "../../theme.js";
+import { CountdownTimer } from "./countdown-timer.js";
+/** Bare-A1 extension text input using the common modal shortcut row. */
+export class ExtensionInputComponent extends Container {
+    #input = new Input();
+    #onSubmit;
+    #onCancel;
+    #titleText;
+    #baseTitle;
+    #countdown;
+    #focused = false;
+    get focused() { return this.#focused; }
+    set focused(value) {
+        this.#focused = value;
+        this.#input.focused = value;
+    }
+    constructor(title, _placeholder, onSubmit, onCancel, opts) {
+        super();
+        this.#onSubmit = onSubmit;
+        this.#onCancel = onCancel;
+        this.#baseTitle = title;
+        const theme = piTheme();
+        this.addChild(new DynamicBorder());
+        this.addChild(new Spacer(1));
+        this.#titleText = new Text(theme.fg("accent", title), 1, 0);
+        this.addChild(this.#titleText);
+        if (opts?.description) {
+            this.addChild(new Spacer(1));
+            this.addChild(new Text(theme.fg("text", opts.description), 1, 0));
+        }
+        this.addChild(new Spacer(1));
+        this.#countdown = opts?.timeout !== undefined && opts.timeout > 0 && opts.tui !== undefined
+            ? new CountdownTimer(opts.timeout, opts.tui, seconds => {
+                const current = piTheme();
+                this.#titleText.setText(current.fg("accent", `${this.#baseTitle} (${seconds}s)`));
+            }, () => this.#onCancel())
+            : undefined;
+        if (opts?.initialValue !== undefined)
+            this.#input.setValue(opts.initialValue);
+        this.addChild(this.#input);
+        this.addChild(new Spacer(1));
+        const keys = getKeybindings();
+        this.addChild(new Text(renderPiModalShortcutHints([
+            { key: keys.getKeys("tui.select.confirm").join("/"), action: "submit" },
+            { key: keys.getKeys("tui.select.cancel").join("/"), action: "cancel" },
+        ]), 1, 0));
+        this.addChild(new Spacer(1));
+        this.addChild(new DynamicBorder());
+    }
+    handleInput(keyData) {
+        const keys = getKeybindings();
+        if (keys.matches(keyData, "tui.select.confirm") || keyData === "\n")
+            this.#onSubmit(this.#input.getValue());
+        else if (keys.matches(keyData, "tui.select.cancel"))
+            this.#onCancel();
+        else
+            this.#input.handleInput(keyData);
+    }
+    dispose() {
+        this.#countdown?.dispose();
+    }
+}

package/dist/integrations/pi/components/upstream/components/extension-selector.d.ts

@@ -0,0 +1,15 @@
+import { Container, type TUI } from "@earendil-works/pi-tui";
+interface ExtensionSelectorOptions {
+    readonly tui?: TUI;
+    readonly timeout?: number;
+    readonly description?: string;
+    readonly onToggleToolsExpanded?: () => void;
+}
+/** Bare-A1 extension selector using the common modal shortcut row. */
+export declare class ExtensionSelectorComponent extends Container {
+    #private;
+    constructor(title: string, options: readonly string[], onSelect: (value: string) => void, onCancel: () => void, opts?: ExtensionSelectorOptions);
+    handleInput(keyData: string): void;
+    dispose(): void;
+}
+export {};

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

@@ -0,0 +1,92 @@
+/**
+ * Provenance: @earendil-works/pi-coding-agent 0.87.0 (MIT), commit 16787ad5b2dc748047f314ca1bfe7708f30f54f3,
+ * packages/coding-agent/src/modes/interactive/components/extension-selector.ts.
+ * Modifications: Mechanical port: remap public imports, use ECMAScript private fields, and route the
+ * bare-A1 instruction row through the shared semantic shortcut renderer while preserving options,
+ * timeout, navigation, selection, cancellation, and disposal behavior.
+ * Deviations: owned-modal-shortcut-hints.
+ */
+import { DynamicBorder } from "../../../startup-public.js";
+import { Container, getKeybindings, Spacer, Text } from "@earendil-works/pi-tui";
+import { piTheme, renderPiModalShortcutHints } from "../../theme.js";
+import { CountdownTimer } from "./countdown-timer.js";
+/** Bare-A1 extension selector using the common modal shortcut row. */
+export class ExtensionSelectorComponent extends Container {
+    #options;
+    #selectedIndex = 0;
+    #listContainer = new Container();
+    #onSelect;
+    #onCancel;
+    #titleText;
+    #baseTitle;
+    #countdown;
+    #onToggleToolsExpanded;
+    constructor(title, options, onSelect, onCancel, opts) {
+        super();
+        this.#options = options;
+        this.#onSelect = onSelect;
+        this.#onCancel = onCancel;
+        this.#baseTitle = title;
+        this.#onToggleToolsExpanded = opts?.onToggleToolsExpanded;
+        const theme = piTheme();
+        this.addChild(new DynamicBorder());
+        this.addChild(new Spacer(1));
+        this.#titleText = new Text(theme.fg("accent", theme.bold(title)), 1, 0);
+        this.addChild(this.#titleText);
+        if (opts?.description) {
+            this.addChild(new Spacer(1));
+            this.addChild(new Text(theme.fg("text", opts.description), 1, 0));
+        }
+        this.addChild(new Spacer(1));
+        this.#countdown = opts?.timeout !== undefined && opts.timeout > 0 && opts.tui !== undefined
+            ? new CountdownTimer(opts.timeout, opts.tui, seconds => {
+                const current = piTheme();
+                this.#titleText.setText(current.fg("accent", current.bold(`${this.#baseTitle} (${seconds}s)`)));
+            }, () => this.#onCancel())
+            : undefined;
+        this.addChild(this.#listContainer);
+        this.addChild(new Spacer(1));
+        const keys = getKeybindings();
+        this.addChild(new Text(renderPiModalShortcutHints([
+            { key: "↑↓", action: "navigate" },
+            { key: keys.getKeys("tui.select.confirm").join("/"), action: "select" },
+            { key: keys.getKeys("tui.select.cancel").join("/"), action: "cancel" },
+        ]), 1, 0));
+        this.addChild(new Spacer(1));
+        this.addChild(new DynamicBorder());
+        this.#updateList();
+    }
+    #updateList() {
+        this.#listContainer.clear();
+        const theme = piTheme();
+        for (let index = 0; index < this.#options.length; index += 1) {
+            const option = this.#options[index];
+            this.#listContainer.addChild(new Text(index === this.#selectedIndex
+                ? theme.fg("accent", "→ ") + theme.fg("accent", option)
+                : `  ${theme.fg("text", option)}`, 1, 0));
+        }
+    }
+    handleInput(keyData) {
+        const keys = getKeybindings();
+        if (keys.matches(keyData, "app.tools.expand"))
+            this.#onToggleToolsExpanded?.();
+        else if (keys.matches(keyData, "tui.select.up") || keyData === "k") {
+            this.#selectedIndex = Math.max(0, this.#selectedIndex - 1);
+            this.#updateList();
+        }
+        else if (keys.matches(keyData, "tui.select.down") || keyData === "j") {
+            this.#selectedIndex = Math.min(this.#options.length - 1, this.#selectedIndex + 1);
+            this.#updateList();
+        }
+        else if (keys.matches(keyData, "tui.select.confirm") || keyData === "\n") {
+            const selected = this.#options[this.#selectedIndex];
+            if (selected !== undefined)
+                this.#onSelect(selected);
+        }
+        else if (keys.matches(keyData, "tui.select.cancel"))
+            this.#onCancel();
+    }
+    dispose() {
+        this.#countdown?.dispose();
+    }
+}

package/dist/integrations/pi/components/upstream/components/scoped-models-selector.d.ts

@@ -4,8 +4,9 @@
  * Modifications: Source-synchronized scoped-model selector port: preserve session-only toggles,
  * search, bulk/provider/reorder actions, dirty state, Ctrl+S persistence, refresh status,
  * cancellation, and focus while remapping theme and public helper imports; local key labels preserve
- * pinned platform formatting before layout without changing binding identities.
- * Deviations: none.
+ * pinned platform formatting before layout without changing binding identities, and bare A1 uses the
+ * shared semantic modal shortcut row.
+ * Deviations: owned-modal-shortcut-hints.
  */
 interface ScopedModel {
     readonly provider: string;

package/dist/integrations/pi/components/upstream/components/scoped-models-selector.js

@@ -1,7 +1,7 @@
 import { Container, fuzzyFilter, getKeybindings, Input, Key, matchesKey, Spacer, Text, } from "@earendil-works/pi-tui";
 import { DynamicBorder } from "../../../startup-public.js";
 import { getModelSearchText } from "../model-search.js";
-import { piTheme } from "../theme/theme.js";
+import { piTheme, renderPiModalShortcutHints } from "../../theme.js";
 // Rationale: upstream's capitalized hint formatter is private to the package; the same mapping lives here.
 function keyDisplayText(keybinding) {
     return getKeybindings().getKeys(keybinding)
@@ -113,7 +113,9 @@ export class ScopedModelsSelectorComponent extends Container {
         this.addChild(new DynamicBorder());
         this.addChild(new Spacer(1));
         this.addChild(new Text(theme.fg("accent", theme.bold("Model Configuration")), 0, 0));
-        this.addChild(new Text(theme.fg("muted", `Session-only. ${keyDisplayText("app.models.save")} to save to settings.`), 0, 0));
+        const saveKey = keyDisplayText("app.models.save");
+        this.addChild(new Text(theme.fg("muted", "Session-only.")
+            + (saveKey ? ` ${renderPiModalShortcutHints([{ key: saveKey, action: "to save to settings." }])}` : ""), 0, 0));
         this.addChild(new Spacer(1));
         // Search input
         this.searchInput = new Input();
@@ -167,19 +169,18 @@ export class ScopedModelsSelectorComponent extends Container {
         const allEnabled = this.enabledIds === null;
         const countText = allEnabled
             ? "all enabled"
-            : `${enabledCount}/${this.allIds.length} enabled${unavailableCount ? ` · ${unavailableCount} unavailable` : ""}`;
-        const parts = [
-            `${keyDisplayText("tui.select.confirm")} toggle`,
-            `${keyDisplayText("app.models.enableAll")} all`,
-            `${keyDisplayText("app.models.clearAll")} clear`,
-            `${keyDisplayText("app.models.toggleProvider")} provider`,
-            `${keyDisplayText("app.models.reorderUp")}/${keyDisplayText("app.models.reorderDown")} reorder`,
-            `${keyDisplayText("app.models.save")} save`,
-            countText,
-        ];
-        return this.isDirty
-            ? theme.fg("dim", `  ${parts.join(" · ")} `) + theme.fg("warning", "(unsaved)")
-            : theme.fg("dim", `  ${parts.join(" · ")}`);
+            : `${enabledCount}/${this.allIds.length} enabled${unavailableCount ? `, ${unavailableCount} unavailable` : ""}`;
+        const reorderKeys = [keyDisplayText("app.models.reorderUp"), keyDisplayText("app.models.reorderDown")].filter(Boolean).join("/");
+        const hint = renderPiModalShortcutHints([
+            { key: keyDisplayText("tui.select.confirm"), action: "toggle" },
+            { key: keyDisplayText("app.models.enableAll"), action: "all" },
+            { key: keyDisplayText("app.models.clearAll"), action: "clear" },
+            { key: keyDisplayText("app.models.toggleProvider"), action: "provider" },
+            { key: reorderKeys, action: "reorder" },
+            { key: keyDisplayText("app.models.save"), action: "save" },
+            { action: countText },
+        ]);
+        return this.isDirty ? `${hint} ${theme.fg("warning", "(unsaved)")}` : hint;
     }
     refresh() {
         const query = this.searchInput.getValue();

package/dist/integrations/pi/components/upstream/components/session-footer.js

@@ -2,9 +2,9 @@
  * Provenance: @earendil-works/pi-coding-agent 0.87.0 (MIT), commit 16787ad5b2dc748047f314ca1bfe7708f30f54f3,
  * packages/coding-agent/src/modes/interactive/components/footer.ts.
  * Modifications: Consumes neutral owned-UI view data instead of a fabricated concrete AgentSession; an
- * explicit bare-A1 profile colors the thinking-level name and adds its linked pull-request badge while
- * preserving the remaining footer layout and formatting, and replacement surfaces may suppress a
- * thinking level they already present.
+ * explicit bare-A1 profile colors the thinking-level name, renders its repository-context path, and
+ * reserves its linked pull-request badge before path truncation while preserving the remaining footer
+ * layout and formatting; replacement surfaces may suppress a thinking level they already present.
  * Deviations: owned-status-level-color, owned-pull-request-badge.
  */
 import { isAbsolute, relative, resolve, sep } from "node:path";
@@ -36,17 +36,33 @@ export class SessionFooter {
         const contextPercentValue = usage?.contextPercent ?? 0;
         const contextPercentSource = usage?.contextAvailable === false ? undefined : usage?.contextPercent;
         const contextPercent = contextPercentSource !== null ? contextPercentValue.toFixed(1) : "?";
-        let pwd = formatCwd(this.cwd, process.env.HOME || process.env.USERPROFILE);
+        const repositoryPath = this.profile === "a1" ? view.status.footer?.repositoryPath ?? this.cwd : this.cwd;
+        let pwd = formatCwd(repositoryPath, process.env.HOME || process.env.USERPROFILE);
         const branch = view.status.footer?.branch;
         if (branch)
             pwd = `${pwd} (${branch})`;
         const sessionName = view.status.footer?.sessionName;
         const pullRequest = this.profile === "a1" ? view.status.footer?.pullRequest : null;
-        const pathRow = pullRequest === undefined || pullRequest === null
-            ? theme.fg("dim", sessionName ? `${pwd} • ${sessionName}` : pwd)
-            : theme.fg("dim", `${pwd} PR `)
-                + hyperlink(theme.fg("mdLink", `#${pullRequest.number}`), pullRequest.url)
-                + (sessionName ? theme.fg("dim", ` • ${sessionName}`) : "");
+        let pathRow;
+        if (pullRequest === undefined || pullRequest === null) {
+            pathRow = theme.fg("dim", sessionName ? `${pwd} • ${sessionName}` : pwd);
+        }
+        else {
+            const badge = theme.fg("dim", " ")
+                + hyperlink(theme.fg("mdLink", `#${pullRequest.number}`), pullRequest.url);
+            const sessionSuffix = sessionName ? theme.fg("dim", ` • ${sessionName}`) : "";
+            const full = theme.fg("dim", pwd) + badge + sessionSuffix;
+            if (visibleWidth(full) <= width)
+                pathRow = full;
+            else if (visibleWidth(badge) <= width) {
+                const pathWidth = Math.max(0, width - visibleWidth(badge));
+                const path = pathWidth === 0 ? "" : truncateToWidth(theme.fg("dim", pwd), pathWidth, theme.fg("dim", "..."));
+                pathRow = path + badge;
+            }
+            else {
+                pathRow = truncateToWidth(badge, width, theme.fg("dim", "..."));
+            }
+        }
         const parts = [];
         if (input)
             parts.push(`↑${formatTokens(input)}`);

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

@@ -4,8 +4,8 @@
  * Modifications: Source-synchronized session selector port: preserve threaded/current/all scope,
  * search, sort, named/path filters, rename, delete confirmation, active-session protection, loading
  * progress, cancellation, focus, and disposal while remapping public helpers, owned keybindings/theme,
- * and canonical path handling.
- * Deviations: none.
+ * canonical path handling, and the shared bare-A1 modal shortcut row.
+ * Deviations: owned-modal-shortcut-hints.
  */
 import { spawnSync } from "node:child_process";
 import { existsSync, realpathSync } from "node:fs";
@@ -14,7 +14,7 @@ import * as os from "node:os";
 import { Container, getKeybindings, Input, Spacer, Text, truncateToWidth, visibleWidth, } from "@earendil-works/pi-tui";
 import { KeybindingsManager } from "../adjacent/core/keybindings.js";
 import { DynamicBorder } from "../../../startup-public.js";
-import { piTheme } from "../theme/theme.js";
+import { piTheme, renderPiModalShortcutHints } from "../../theme.js";
 const theme = new Proxy({}, {
     get(_target, property) {
         const active = piTheme();
@@ -25,8 +25,8 @@ const theme = new Proxy({}, {
 function keyText(keybinding, keybindings) {
     return keybindings.getKeys(keybinding).join("/");
 }
-function keyHint(keybinding, description, keybindings) {
-    return theme.fg("dim", keyText(keybinding, keybindings)) + theme.fg("muted", ` ${description}`);
+function shortcutHint(keybinding, action, keybindings) {
+    return { key: keyText(keybinding, keybindings), action };
 }
 import { filterAndSortSessions, hasSessionName } from "./session-selector-search.js";
 function shortenPath(path) {
@@ -158,8 +158,11 @@ class SessionSelectorHeader {
         let hintLine1;
         let hintLine2;
         if (this.confirmingDeletePath !== null) {
-            const confirmHint = `Delete session? ${keyHint("tui.select.confirm", "confirm", this.keybindings)} · ${keyHint("tui.select.cancel", "cancel", this.keybindings)}`;
-            hintLine1 = theme.fg("error", truncateToWidth(confirmHint, width, "…"));
+            const confirmHint = theme.fg("error", "Delete session? ") + renderPiModalShortcutHints([
+                shortcutHint("tui.select.confirm", "confirm", this.keybindings),
+                shortcutHint("tui.select.cancel", "cancel", this.keybindings),
+            ]);
+            hintLine1 = truncateToWidth(confirmHint, width, "…");
             hintLine2 = "";
         }
         else if (this.statusMessage) {
@@ -169,18 +172,21 @@ class SessionSelectorHeader {
         }
         else {
             const pathState = this.showPath ? "(on)" : "(off)";
-            const sep = theme.fg("muted", " · ");
-            const hint1 = keyHint("tui.input.tab", "scope", this.keybindings) + sep + theme.fg("muted", 're:<pattern> regex · "phrase" exact');
+            const hint1 = renderPiModalShortcutHints([
+                shortcutHint("tui.input.tab", "scope", this.keybindings),
+                { action: "re:<pattern> regex" },
+                { action: '"phrase" exact' },
+            ]);
             const hint2Parts = [
-                keyHint("app.session.toggleSort", "sort", this.keybindings),
-                keyHint("app.session.toggleNamedFilter", "named", this.keybindings),
-                keyHint("app.session.delete", "delete", this.keybindings),
-                keyHint("app.session.togglePath", `path ${pathState}`, this.keybindings),
+                shortcutHint("app.session.toggleSort", "sort", this.keybindings),
+                shortcutHint("app.session.toggleNamedFilter", "named", this.keybindings),
+                shortcutHint("app.session.delete", "delete", this.keybindings),
+                shortcutHint("app.session.togglePath", `path ${pathState}`, this.keybindings),
             ];
             if (this.showRenameHint) {
-                hint2Parts.push(keyHint("app.session.rename", "rename", this.keybindings));
+                hint2Parts.push(shortcutHint("app.session.rename", "rename", this.keybindings));
             }
-            const hint2 = hint2Parts.join(sep);
+            const hint2 = renderPiModalShortcutHints(hint2Parts);
             hintLine1 = truncateToWidth(hint1, width, "…");
             hintLine2 = truncateToWidth(hint2, width, "…");
         }
@@ -776,7 +782,10 @@ export class SessionSelectorComponent extends Container {
         panel.addChild(new Spacer(1));
         panel.addChild(this.renameInput);
         panel.addChild(new Spacer(1));
-        panel.addChild(new Text(theme.fg("muted", `${keyText("tui.select.confirm", this.keybindings)} to save · ${keyText("tui.select.cancel", this.keybindings)} to cancel`), 1, 0));
+        panel.addChild(new Text(renderPiModalShortcutHints([
+            shortcutHint("tui.select.confirm", "to save", this.keybindings),
+            shortcutHint("tui.select.cancel", "to cancel", this.keybindings),
+        ]), 1, 0));
         this.buildBaseLayout(panel, { showHeader: false });
         this.requestRender();
     }

package/dist/integrations/pi/components/upstream/components/thinking-selector.d.ts

@@ -4,10 +4,11 @@
  * Modifications: Preserve the searchable thinking-level selector, current/default semantics,
  * selection, save, cancellation, and focus while accepting the active bare-A1 cycle-key label from the
  * shell, styling the title with the established bold semantic accent treatment, placing its muted hint
- * directly below it, deduplicating levels, and rendering aligned muted descriptions after an adjacent
- * success-colored active marker. All list and border colors use the owned theme and its explicit color
- * mode. The comparison profile retains the public pinned component.
- * Deviations: owned-level-cycle-shortcut, owned-thinking-selector-heading.
+ * directly below it, deduplicating levels, and rendering aligned muted descriptions after adjacent
+ * active and bracketed default markers. All list and border colors use the owned theme and its
+ * explicit color mode, and the footer uses the shared bare-A1 modal shortcut row. The comparison
+ * profile retains the public pinned component.
+ * Deviations: owned-modal-shortcut-hints, owned-level-cycle-shortcut, owned-thinking-selector-heading.
  */
 import { Container, type Focusable, SelectList } from "@earendil-works/pi-tui";
 export type ThinkingSelectorLevel = "off" | "minimal" | "low" | "medium" | "high" | "xhigh" | "max";
@@ -21,6 +22,7 @@ export declare class OwnedThinkingSelectorComponent extends Container implements
     private onCancel;
     private onSelectAsDefault;
     private currentLevel;
+    private defaultThinkingLevel;
     private _focused;
     get focused(): boolean;
     set focused(value: boolean);

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

@@ -4,14 +4,15 @@
  * Modifications: Preserve the searchable thinking-level selector, current/default semantics,
  * selection, save, cancellation, and focus while accepting the active bare-A1 cycle-key label from the
  * shell, styling the title with the established bold semantic accent treatment, placing its muted hint
- * directly below it, deduplicating levels, and rendering aligned muted descriptions after an adjacent
- * success-colored active marker. All list and border colors use the owned theme and its explicit color
- * mode. The comparison profile retains the public pinned component.
- * Deviations: owned-level-cycle-shortcut, owned-thinking-selector-heading.
+ * directly below it, deduplicating levels, and rendering aligned muted descriptions after adjacent
+ * active and bracketed default markers. All list and border colors use the owned theme and its
+ * explicit color mode, and the footer uses the shared bare-A1 modal shortcut row. The comparison
+ * profile retains the public pinned component.
+ * Deviations: owned-modal-shortcut-hints, owned-level-cycle-shortcut, owned-thinking-selector-heading.
  */
 import { Container, fuzzyFilter, getKeybindings, Input, SelectList, Spacer, Text, } from "@earendil-works/pi-tui";
 import { DynamicBorder } from "../../../startup-public.js";
-import { piTheme } from "../theme/theme.js";
+import { piTheme, renderPiModalShortcutHints } from "../../theme.js";
 const THINKING_SELECT_LIST_LAYOUT = {
     minPrimaryColumnWidth: 12,
     maxPrimaryColumnWidth: 32,
@@ -35,6 +36,7 @@ export class OwnedThinkingSelectorComponent extends Container {
     onCancel;
     onSelectAsDefault;
     currentLevel;
+    defaultThinkingLevel;
     _focused = false;
     get focused() {
         return this._focused;
@@ -49,10 +51,11 @@ export class OwnedThinkingSelectorComponent extends Container {
         this.onCancel = onCancel;
         this.onSelectAsDefault = onSelectAsDefault;
         this.currentLevel = currentLevel;
+        this.defaultThinkingLevel = defaultThinkingLevel;
         this.allItems = [...new Set(availableLevels)].map((level) => ({
             value: level,
             label: level,
-            description: level === defaultThinkingLevel ? `${LEVEL_DESCRIPTIONS[level]} · default` : LEVEL_DESCRIPTIONS[level],
+            description: LEVEL_DESCRIPTIONS[level],
         }));
         this.addChild(new DynamicBorder((text) => piTheme().fg("border", text)));
         this.addChild(new Spacer(1));
@@ -67,7 +70,11 @@ export class OwnedThinkingSelectorComponent extends Container {
         this.selectListChildIndex = this.children.length;
         this.addChild(this.selectList);
         this.addChild(new Spacer(1));
-        this.addChild(new Text(piTheme().fg("dim", `  ${this.keyDisplayText("tui.select.confirm")} to select · ${this.keyDisplayText("app.thinking.save")} to set as default · ${this.keyDisplayText("tui.select.cancel")} to cancel`), 0, 0));
+        this.addChild(new Text(renderPiModalShortcutHints([
+            { key: this.keyDisplayText("tui.select.confirm"), action: "to select" },
+            { key: this.keyDisplayText("app.thinking.save"), action: "to set as default" },
+            { key: this.keyDisplayText("tui.select.cancel"), action: "to cancel" },
+        ]), 0, 0));
         this.addChild(new DynamicBorder((text) => piTheme().fg("border", text)));
     }
     keyDisplayText(keybinding) {
@@ -79,17 +86,20 @@ export class OwnedThinkingSelectorComponent extends Container {
             .join("/");
     }
     buildSelectList(items, preselect) {
+        const markerWidth = (item) => (item.value === this.currentLevel ? 2 : 0) + (item.value === this.defaultThinkingLevel ? 10 : 0);
         const primaryWidth = this.allItems.reduce((widest, item) => {
             const level = item.label ?? item.value;
-            return Math.max(widest, level.length + (item.value === this.currentLevel ? 2 : 0));
+            return Math.max(widest, level.length + markerWidth(item));
         }, 0);
         const themedItems = items.map((item) => {
             const level = item.label ?? item.value;
-            const current = item.value === this.currentLevel;
-            const currentMarker = current ? ` ${piTheme().fg("success", "✓")}` : "";
-            const separator = " ".repeat(Math.max(1, primaryWidth - level.length - (current ? 2 : 0) + 1));
+            const currentMarker = item.value === this.currentLevel ? ` ${piTheme().fg("success", "✓")}` : "";
+            const defaultMarker = item.value === this.defaultThinkingLevel
+                ? ` ${piTheme().fg("muted", "[default]")}`
+                : "";
+            const separator = " ".repeat(Math.max(1, primaryWidth - level.length - markerWidth(item) + 1));
             const description = item.description ? piTheme().fg("muted", item.description) : "";
-            return { value: item.value, label: `${level}${currentMarker}${separator}${description}` };
+            return { value: item.value, label: `${level}${currentMarker}${defaultMarker}${separator}${description}` };
         });
         // Invariant: the bare selector uses the owned theme's explicit color mode, not upstream's host detection.
         const list = new SelectList(themedItems, Math.max(1, themedItems.length), {

package/dist/integrations/pi/components/upstream/components/tree-selector.d.ts

@@ -3,8 +3,9 @@
  * packages/coding-agent/src/modes/interactive/components/tree-selector.ts.
  * Modifications: Source-synchronized tree selector port: preserve filtering, folding, labels, copying,
  * tree navigation, key hints, focus, and viewport behavior while remapping public types/components
- * plus owned keybindings/theme helpers required to avoid the pinned package nested pi-tui singleton.
- * Deviations: none.
+ * plus owned keybindings/theme helpers required to avoid the pinned package nested pi-tui singleton;
+ * bare A1 uses the shared semantic modal shortcut row.
+ * Deviations: owned-modal-shortcut-hints.
  */
 import { type Component, Container, type Focusable } from "@earendil-works/pi-tui";
 import { type SessionTreeNode } from "@earendil-works/pi-coding-agent";