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

package/dist/integrations/pi/components/share-operation-dialog.js

@@ -0,0 +1,40 @@
+import { CancellableLoader, Spacer, Text, } from "@earendil-works/pi-tui";
+import { BorderedLoader, DynamicBorder } from "../startup-public.js";
+import { adoptPiModalFrame, PiModalFrame } from "./modal-frame.js";
+import { DIALOG_CLOSE_SHORTCUT_HINT, piTheme, renderPiModalShortcutHints } from "./theme.js";
+import { componentPort, createTuiFacade, ensureTheme, } from "./shell-shared-facade.js";
+/** Bare A1's titled share progress surface; the pinned comparison keeps its bordered loader. */
+class ShareOperationDialog {
+    #loader;
+    #frame;
+    constructor(runtime, message) {
+        const theme = piTheme();
+        this.#loader = new CancellableLoader(createTuiFacade(runtime), text => theme.fg("accent", text), text => theme.fg("muted", text), message);
+        this.#frame = new PiModalFrame(new DynamicBorder(text => theme.fg("border", text)), [
+            new Text(theme.fg("accent", theme.bold("Share")), 0, 0),
+            this.#loader,
+            new Spacer(1),
+            new Text(renderPiModalShortcutHints([DIALOG_CLOSE_SHORTCUT_HINT]), 0, 0),
+        ], new DynamicBorder(text => theme.fg("border", text)));
+    }
+    get signal() { return this.#loader.signal; }
+    invalidate() { this.#frame.invalidate(); }
+    render(width) { return this.#frame.render(width); }
+    handleInput(data) { this.#loader.handleInput(data); }
+    dispose() { this.#loader.dispose(); }
+}
+export function createPiShellShareOperationDialog(runtime, message) {
+    ensureTheme();
+    const dialog = new ShareOperationDialog(runtime, message);
+    return { ...componentPort(dialog), signal: dialog.signal };
+}
+export function createPiShellOperationLoader(runtime, message) {
+    ensureTheme();
+    const loader = new BorderedLoader(createTuiFacade(runtime), piTheme(), message, { cancellable: true });
+    adoptPiModalFrame(loader, {
+        topIndex: 0,
+        bottomIndex: loader.children.length - 1,
+        preInsetContent: loader.children[3] === undefined ? [] : [loader.children[3]],
+    });
+    return { ...componentPort(loader), signal: loader.signal };
+}

package/dist/integrations/pi/components/shell-editor-autocomplete.js

@@ -4,11 +4,21 @@ import { PROMPT_HISTORY_EDITOR_REPLACEMENT } from "../../../contracts/owned-ui/i
 import { KeybindingsManager } from "./upstream/adjacent/core/keybindings.js";
 import { OwnedEditor } from "./upstream/components/owned-editor.js";
 import { OwnedEditorUxInterception, createPromptSelectionInterceptor, editorVisualLineCount, } from "./owned-editor-ux.js";
-import { PINNED_PI_LAYOUT, piTheme, } from "./theme.js";
+import { PINNED_PI_LAYOUT, piTheme, renderPiListSelection, } from "./theme.js";
 import { createTuiFacade, ensureTheme, isAutocompleteProvider, } from "./shell-shared-facade.js";
 import { SKILLS_COMMAND_NAME, collapseSkillCommands, createSkillsTunnelProvider, } from "./skills-command.js";
-/** A selected autocomplete row: the accent primary column, then the aligned description. */
+/** A selected autocomplete row: its arrow/primary column, then the aligned description. */
 const SELECTED_DESCRIBED_ROW = /^(→ .*?\S)(\s{2,}.*)$/u;
+function renderOwnedAutocompleteSelection(text) {
+    const theme = piTheme();
+    const row = SELECTED_DESCRIBED_ROW.exec(text);
+    const primary = row?.[1] ?? text;
+    const hasArrow = primary.startsWith("→ ");
+    const arrow = hasArrow ? theme.fg("accent", "→ ") : "";
+    const label = theme.fg("text", hasArrow ? primary.slice(2) : primary);
+    const description = row === null ? "" : theme.fg("muted", row[2]);
+    return renderPiListSelection(arrow + label + description);
+}
 const PINNED_THINKING_SLASH_COMMAND = { name: "thinking", description: "Set thinking level", argumentHint: "<level>" };
 const OWNED_THINKING_SLASH_COMMAND = { name: "thinking", description: "Set thinking level" };
 const OWNED_LOGIN_SLASH_COMMAND = { name: "login", description: "Configure provider authentication" };
@@ -74,10 +84,9 @@ export function createPiShellEditor(options) {
                 return selectListTheme.scrollInfo(text);
             },
             selectedText: text => {
-                // Rationale: the pinned list styles a whole selected row at once. Bare A1 keeps the
-                // actionable primary column accented while every aligned description remains muted.
-                const row = SELECTED_DESCRIBED_ROW.exec(text);
-                return row === null ? selectListTheme.selectedText(text) : selectListTheme.selectedText(row[1]) + selectListTheme.description(row[2]);
+                // Rationale: bare A1 keeps the arrow accented, the actionable label readable, and descriptions muted
+                // on the same item-bounded blue surface used by its standard modal selectors.
+                return renderOwnedAutocompleteSelection(text);
             },
         },
     }, keybindings, {

package/dist/integrations/pi/components/shell-extension-ui.d.ts

@@ -28,6 +28,9 @@ export interface PiExtensionUiBridgeHost {
 }
 export interface PiExtensionUiBridge {
     readonly context: ExtensionUIContext;
+    input(title: string, placeholder: string, options?: {
+        readonly retainSurfaceOnSettle?: boolean;
+    }): Promise<string | undefined>;
     reset(): void;
     dispose(): void;
 }

package/dist/integrations/pi/components/shell-extension-ui.js

@@ -5,7 +5,7 @@ import { ExtensionSelectorComponent } from "./upstream/components/extension-sele
 import { setKeybindings, Text, } from "@earendil-works/pi-tui";
 import { KeybindingsManager, } from "./upstream/adjacent/core/keybindings.js";
 import { PINNED_PI_LAYOUT, applyPiTheme, applyPiThemeInstance, getAvailablePiThemes, loadPiTheme, piTheme, } from "./theme.js";
-import { componentPort, createTuiFacade, ensureTheme, isRecord, } from "./shell-shared-facade.js";
+import { componentPort, createTuiFacade, ensureTheme, isRecord, withPiDialogCancel, } from "./shell-shared-facade.js";
 /** Public ExtensionUIContext ported from pinned InteractiveMode without constructing it. */
 export function createPiExtensionUiBridge(host) {
     ensureTheme();
@@ -45,7 +45,7 @@ export function createPiExtensionUiBridge(host) {
             disposers.delete(dispose);
         };
     };
-    const showInput = (create, options) => new Promise(resolve => {
+    const showInput = (create, options, retainSurfaceOnSettle = false) => new Promise(resolve => {
         let settled = false;
         let surface;
         let untrack = () => { };
@@ -56,7 +56,10 @@ export function createPiExtensionUiBridge(host) {
             if (activeCancel === cancel)
                 activeCancel = undefined;
             untrack();
-            closeSurface(surface);
+            if (retainSurfaceOnSettle && activeSurface === surface)
+                activeSurface = undefined;
+            else
+                closeSurface(surface);
             resolve(value);
         };
         const cancel = () => finish(undefined);
@@ -173,7 +176,7 @@ export function createPiExtensionUiBridge(host) {
                         component.dispose();
                     return;
                 }
-                surface = componentPort(component);
+                surface = withPiDialogCancel(componentPort(component), cancelCustom);
                 activeCancel = cancelCustom;
                 if (options?.overlay) {
                     const overlayOptions = typeof options.overlayOptions === "function" ? options.overlayOptions() : options.overlayOptions;
@@ -247,6 +250,7 @@ export function createPiExtensionUiBridge(host) {
     };
     return {
         context,
+        input: (title, placeholder, options) => showInput((resolve, cancel) => componentPort(new ExtensionInputComponent(title, placeholder, resolve, cancel, { tui })), undefined, options?.retainSurfaceOnSettle === true),
         reset,
         dispose() {
             reset();

package/dist/integrations/pi/components/shell-selectors-dialogs.d.ts

@@ -110,10 +110,6 @@ export interface PiShellLoginDialogPort extends PiShellComponentPort {
 export declare function createPiShellLoginDialog(runtime: Pick<PiShellEditorOptions, "getColumns" | "getRows" | "requestRender">, providerId: string, onComplete: (success: boolean, message?: string) => void, providerName?: string, title?: string): PiShellLoginDialogPort;
 export declare function createPiShellArmin(runtime: Pick<PiShellEditorOptions, "getColumns" | "getRows" | "requestRender">): PiShellComponentPort;
 export declare function createPiShellEarendilAnnouncement(): PiShellComponentPort;
-export interface PiShellOperationLoaderPort extends PiShellComponentPort {
-    readonly signal: AbortSignal;
-}
-export declare function createPiShellOperationLoader(runtime: Pick<PiShellEditorOptions, "getColumns" | "getRows" | "requestRender">, message: string): PiShellOperationLoaderPort;
 export declare function createPiShellReloadBox(): PiShellComponentPort;
 export interface PiShellAuthProviderOption extends PiShellSelectorOption {
     readonly providerId: string;

package/dist/integrations/pi/components/shell-selectors-dialogs.js

@@ -1,11 +1,12 @@
-import { ArminComponent, BorderedLoader, DynamicBorder, ExtensionSelectorComponent, getSelectListTheme, LoginDialogComponent, ModelSelectorComponent, OAuthSelectorComponent, SettingsSelectorComponent, ShowImagesSelectorComponent, ThemeSelectorComponent, UserMessageSelectorComponent, } from "../startup-public.js";
-import { EarendilAnnouncementComponent, } from "./upstream/components/earendil-announcement.js";
+import { ArminComponent, DynamicBorder, getSelectListTheme, LoginDialogComponent, ModelSelectorComponent, OAuthSelectorComponent, SettingsSelectorComponent, ShowImagesSelectorComponent, ThemeSelectorComponent, UserMessageSelectorComponent, } from "../startup-public.js";
+import { EarendilAnnouncementComponent } from "./upstream/components/earendil-announcement.js";
+import { ExtensionSelectorComponent } from "./upstream/components/extension-selector.js";
 import { Box, Container, SelectList, Spacer, Text, } from "@earendil-works/pi-tui";
-import { ScopedModelsSelectorComponent, } from "./upstream/components/scoped-models-selector.js";
-import { adoptPiModalFrame, adoptPiModalHeader } from "./modal-frame.js";
-import { ModelsDialogComponent, } from "./models-dialog.js";
-import { TrustSelectorComponent, } from "./upstream/components/trust-selector.js";
-import { PINNED_PI_LAYOUT, piTheme, } from "./theme.js";
+import { ScopedModelsSelectorComponent } from "./upstream/components/scoped-models-selector.js";
+import { addPiModalSelectFooter, adoptPiModalFrame, adoptPiModalHeader } from "./modal-frame.js";
+import { ModelsDialogComponent } from "./models-dialog.js";
+import { TrustSelectorComponent } from "./upstream/components/trust-selector.js";
+import { canonicalizePiSettingsHint, DIALOG_CLOSE_SHORTCUT_HINT, PINNED_PI_LAYOUT, piTheme, renderPiModalShortcutHints, } from "./theme.js";
 import { componentFromPort, componentPort, createTuiFacade, ensureTheme, isRecord, } from "./shell-shared-facade.js";
 export { createPiShellSkillsSelector } from "./skills-dialog.js";
 export function createPiShellSelector(options) {
@@ -16,11 +17,20 @@ export function createPiShellSelector(options) {
         list.onSelect = item => options.onSelect?.(item.value);
     if (options.onCancel !== undefined)
         list.onCancel = options.onCancel;
-    if (!options.title)
+    if (!options.title && options.onCancel === undefined)
         return componentPort(list);
     const container = new Container();
-    container.addChild(new Text(piTheme().fg("accent", piTheme().bold(options.title)), PINNED_PI_LAYOUT.contentPaddingX, 0));
+    if (options.title)
+        container.addChild(new Text(piTheme().fg("accent", piTheme().bold(options.title)), PINNED_PI_LAYOUT.contentPaddingX, 0));
     container.addChild(list);
+    if (options.onCancel !== undefined) {
+        container.addChild(new Spacer(1));
+        container.addChild(new Text(renderPiModalShortcutHints([
+            { key: "↑↓", action: "navigate" },
+            { key: "enter", action: "select" },
+            DIALOG_CLOSE_SHORTCUT_HINT,
+        ]), 0, 0));
+    }
     return componentPort(container, data => list.handleInput(data));
 }
 export function createPiShellSettingsSelector(options) {
@@ -68,7 +78,19 @@ export function createPiShellSettingsSelector(options) {
     };
     const selector = new SettingsSelectorComponent(options.config, callbacks);
     const settingsList = selector.getSettingsList();
-    return componentPort(selector, data => settingsList.handleInput(data));
+    const port = componentPort(selector, data => settingsList.handleInput(data));
+    return {
+        ...port,
+        // Rationale: Pi's nested settings components own their hint rows and do not expose hint entries.
+        // Rebuild only the footer row so the canonical close entry survives narrow clipping.
+        render(width) {
+            const rows = [...port.render(width)];
+            const hintIndex = rows.length - 2;
+            if (rows[hintIndex] !== undefined)
+                rows[hintIndex] = canonicalizePiSettingsHint(rows[hintIndex], width);
+            return rows;
+        },
+    };
 }
 export function createPiShellModelSelector(options) {
     ensureTheme();
@@ -139,6 +161,7 @@ export function createPiShellUserMessageSelector(messages, onSelect, onCancel, i
     ensureTheme();
     const selector = new UserMessageSelectorComponent(messages.map(message => ({ id: message.id, text: message.label })), onSelect, onCancel, initialSelectedId);
     const list = selector.getMessageList();
+    addPiModalSelectFooter(selector);
     adoptPiModalFrame(selector, { topIndex: 4, bottomIndex: selector.children.length - 1 });
     return componentPort(selector, data => list.handleInput(data));
 }
@@ -146,6 +169,9 @@ export function createPiShellLoginDialog(runtime, providerId, onComplete, provid
     ensureTheme();
     const dialog = new LoginDialogComponent(createTuiFacade(runtime), providerId, onComplete, providerName, title);
     const preInsetTitle = dialog.children[1];
+    const content = dialog.children[2];
+    dialog.children.splice(dialog.children.length - 1, 0, new Spacer(1), new Text(renderPiModalShortcutHints([DIALOG_CLOSE_SHORTCUT_HINT]), 0, 0));
+    const removeDependencyHint = () => { content.children.pop(); };
     const header = adoptPiModalHeader(dialog, 0, 1);
     adoptPiModalFrame(dialog, {
         topIndex: 0,
@@ -157,11 +183,23 @@ export function createPiShellLoginDialog(runtime, providerId, onComplete, provid
         ...componentPort(dialog),
         showAuth: (url, instructions) => dialog.showAuth(url, instructions),
         showDeviceCode: info => dialog.showDeviceCode(info),
-        showManualInput: message => dialog.showManualInput(message),
-        showPrompt: (message, placeholder) => dialog.showPrompt(message, placeholder),
+        showManualInput(message) {
+            const result = dialog.showManualInput(message);
+            removeDependencyHint();
+            return result;
+        },
+        showPrompt(message, placeholder) {
+            const result = dialog.showPrompt(message, placeholder);
+            removeDependencyHint();
+            return result;
+        },
         showDetails: lines => dialog.showDetails([...lines]),
-        showInfo: (message, links = [], showCloseHint = false) => dialog.showInfo(message, [...links], showCloseHint),
-        showWaiting: message => dialog.showWaiting(message),
+        // Rationale: The persistent canonical footer replaces the dependency's optional close hint.
+        showInfo: (message, links = []) => dialog.showInfo(message, [...links], false),
+        showWaiting(message) {
+            dialog.showWaiting(message);
+            removeDependencyHint();
+        },
         showProgress: message => dialog.showProgress(message),
     };
 }
@@ -173,16 +211,6 @@ export function createPiShellEarendilAnnouncement() {
     ensureTheme();
     return componentPort(new EarendilAnnouncementComponent());
 }
-export function createPiShellOperationLoader(runtime, message) {
-    ensureTheme();
-    const loader = new BorderedLoader(createTuiFacade(runtime), piTheme(), message, { cancellable: true });
-    adoptPiModalFrame(loader, {
-        topIndex: 0,
-        bottomIndex: loader.children.length - 1,
-        preInsetContent: loader.children[3] === undefined ? [] : [loader.children[3]],
-    });
-    return { ...componentPort(loader), signal: loader.signal };
-}
 export function createPiShellReloadBox() {
     ensureTheme();
     const container = new Container();
@@ -207,6 +235,7 @@ export function createPiShellAuthProviderSelector(mode, providers, onSelect, onC
         if (selected)
             onSelect(selected.id);
     }, onCancel, initialSearchInput);
+    addPiModalSelectFooter(selector);
     const preInsetContent = [selector.children[2], selector.children[6]];
     const header = adoptPiModalHeader(selector, 0, 2);
     adoptPiModalFrame(selector, {
@@ -219,21 +248,13 @@ export function createPiShellAuthProviderSelector(mode, providers, onSelect, onC
 }
 export function createPiShellExtensionSelector(title, options, onSelect, onCancel) {
     ensureTheme();
-    const selector = new ExtensionSelectorComponent(title, [...options], onSelect, onCancel);
-    const preInsetContent = [selector.children[2], selector.children[4], selector.children[6]];
-    const header = adoptPiModalHeader(selector, 0, 2);
-    adoptPiModalFrame(selector, {
-        topIndex: 0,
-        bottomIndex: selector.children.length - 1,
-        header,
-        preInsetContent,
-    });
-    return componentPort(selector);
+    return componentPort(new ExtensionSelectorComponent(title, [...options], onSelect, onCancel));
 }
 export function createPiShellThemeSelector(currentTheme, onSelect, onCancel, onPreview) {
     ensureTheme();
     const selector = new ThemeSelectorComponent(currentTheme, onSelect, onCancel, onPreview);
     const list = selector.getSelectList();
+    addPiModalSelectFooter(selector);
     adoptPiModalFrame(selector, { topIndex: 0, bottomIndex: selector.children.length - 1 });
     return componentPort(selector, data => list.handleInput(data));
 }
@@ -241,6 +262,7 @@ export function createPiShellShowImagesSelector(currentValue, onSelect, onCancel
     ensureTheme();
     const selector = new ShowImagesSelectorComponent(currentValue, onSelect, onCancel);
     const list = selector.getSelectList();
+    addPiModalSelectFooter(selector);
     adoptPiModalFrame(selector, { topIndex: 0, bottomIndex: selector.children.length - 1 });
     return componentPort(selector, data => list.handleInput(data));
 }

package/dist/integrations/pi/components/shell-session-info-reference.js

@@ -1,7 +1,40 @@
-import { Text } from "@earendil-works/pi-tui";
+import { sliceByColumn, Text, visibleWidth } from "@earendil-works/pi-tui";
 import { formatCacheWarmingStatus } from "./shell-presenters-info.js";
 import { ensureTheme, formatSessionTokens } from "./shell-shared-facade.js";
 import { piTheme } from "./theme.js";
+/** Splits a plain path by visible columns, preserving every source grapheme in order. */
+function splitSessionFile(sessionFile, firstWidth, continuationWidth) {
+    const rows = [];
+    let remaining = sessionFile;
+    let rowWidth = firstWidth;
+    while (remaining) {
+        let row = sliceByColumn(remaining, 0, rowWidth, true);
+        if (!row && rowWidth !== continuationWidth) {
+            rows.push("");
+            rowWidth = continuationWidth;
+            continue;
+        }
+        // Compatibility: a one-column frame cannot fit a wide grapheme; preserve it for outer truncation.
+        if (!row)
+            row = sliceByColumn(remaining, 0, rowWidth);
+        rows.push(row);
+        remaining = remaining.slice(row.length);
+        rowWidth = continuationWidth;
+    }
+    return rows.length > 0 ? rows : [""];
+}
+/** Keeps the file value on its labelled row before using full continuation rows. */
+function sessionFileRows(sessionFile, width) {
+    // Compatibility: match Text's reduced-padding rule so these explicit breaks survive its renderer.
+    const paddingX = Math.min(1, Math.max(0, Math.floor((width - 1) / 2)));
+    const contentWidth = Math.max(1, width - paddingX * 2);
+    const label = piTheme().fg("dim", "File:");
+    const firstValueWidth = Math.max(0, contentWidth - visibleWidth("File: "));
+    const [first = "", ...continuation] = splitSessionFile(sessionFile, firstValueWidth, contentWidth);
+    return firstValueWidth > 0
+        ? [`${label} ${first}`, ...continuation]
+        : [label, ...continuation];
+}
 /** Renders the pinned report values while leaving group names semantic for the owned screen. */
 export function renderPiShellSessionInfoReferenceDocument(presentation, width) {
     ensureTheme();
@@ -9,7 +42,7 @@ export function renderPiShellSessionInfoReferenceDocument(presentation, width) {
     const render = (rows) => new Text(rows.join("\n"), 1, 0).render(width);
     const preamble = [
         ...(sessionName ? [`${piTheme().fg("dim", "Name:")} ${sessionName}`] : []),
-        `${piTheme().fg("dim", "File:")} ${stats.sessionFile ?? "In-memory"}`,
+        ...sessionFileRows(stats.sessionFile ?? "In-memory", width),
         `${piTheme().fg("dim", "ID:")} ${stats.sessionId}`,
     ];
     const messages = [

package/dist/integrations/pi/components/shell-shared-facade.d.ts

@@ -46,7 +46,7 @@ export interface PiShellEditorPort extends PiShellComponentPort {
     keybindingConfig(): KeybindingsConfig;
     reloadKeybindings(): void;
     /** Uses Pi's terminal decoder rather than assuming one terminal escape spelling. */
-    matchesTerminalKey(data: string, key: "home" | "end" | "ctrl+home" | "ctrl+end" | "alt+home" | "ctrl+v"): boolean;
+    matchesTerminalKey(data: string, key: "home" | "end" | "pageUp" | "pageDown" | "ctrl+home" | "ctrl+end" | "alt+home" | "ctrl+v"): boolean;
     getText(): string;
     setText(text: string): void;
     insertText(text: string): void;
@@ -227,6 +227,8 @@ export declare function createTuiFacade(options: Pick<PiShellEditorOptions, "get
     readonly onSubmit?: (text: string) => void;
 }): TUI;
 export declare function componentPort(component: Component, handleInput?: (data: string) => void): PiShellComponentPort;
+/** Gives an extension-hosted dialog the shell's implicit close alias without rewriting its component. */
+export declare function withPiDialogCancel(port: PiShellComponentPort, onCancel: () => void): PiShellComponentPort;
 export declare function componentFromPort(port: PiShellComponentPort): Component;
 export declare function formatSessionTokens(count: number): string;
 export declare function isAutocompleteProvider(value: unknown): value is AutocompleteProvider;

package/dist/integrations/pi/components/shell-shared-facade.js

@@ -1,4 +1,4 @@
-import { hyperlink, setKeybindings, visibleWidth, truncateToWidth, } from "@earendil-works/pi-tui";
+import { hyperlink, matchesKey, setKeybindings, visibleWidth, truncateToWidth, } from "@earendil-works/pi-tui";
 import { KeybindingsManager, } from "./upstream/adjacent/core/keybindings.js";
 import { ensurePiTheme, } from "./theme.js";
 /** Terminal-cell width authority used by Pi-rendered component rows. */
@@ -61,6 +61,18 @@ export function componentPort(component, handleInput) {
         ...(typeof disposable.dispose === "function" ? { dispose: () => disposable.dispose?.() } : {}),
     };
 }
+/** Gives an extension-hosted dialog the shell's implicit close alias without rewriting its component. */
+export function withPiDialogCancel(port, onCancel) {
+    return {
+        ...port,
+        handleInput: data => {
+            if (matchesKey(data, "ctrl+c"))
+                onCancel();
+            else
+                port.handleInput?.(data);
+        },
+    };
+}
 export function componentFromPort(port) {
     return {
         render: width => [...port.render(width)],

package/dist/integrations/pi/components/skills-dialog.js

@@ -1,9 +1,9 @@
 import { DynamicBorder } from "../startup-public.js";
 import { Container, getKeybindings, Input, Spacer, Text } from "@earendil-works/pi-tui";
 import { addPiModalHeader, adoptPiModalFrame } from "./modal-frame.js";
-import { PINNED_PI_LAYOUT, piTheme, renderPiModalShortcutHints } from "./theme.js";
+import { DIALOG_CLOSE_SHORTCUT_HINT, PINNED_PI_LAYOUT, piTheme, renderPiModalListRow, renderPiModalShortcutHints, } from "./theme.js";
 import { componentPort, ensureTheme, piShellTruncateToWidth, piShellVisibleWidth } from "./shell-shared-facade.js";
-import { SKILL_COMMAND_PREFIX, skillMatchesQuery } from "./skills-command.js";
+import { skillMatchesQuery } from "./skills-command.js";
 /** A single line clipped at the viewport width: no wrap, no ellipsis, padded to the full width. */
 class ClippedLine {
     #text;
@@ -14,10 +14,22 @@ class ClippedLine {
         return [line + " ".repeat(Math.max(0, width - piShellVisibleWidth(line)))];
     }
 }
+class SkillRow {
+    #content;
+    #selected;
+    constructor(content, selected) {
+        this.#content = content;
+        this.#selected = selected;
+    }
+    invalidate() { }
+    render(width) {
+        return [renderPiModalListRow(this.#content, width, this.#selected)];
+    }
+}
 /**
  * The A1-owned searchable Skills dialog. Its composition is the model selector's (border, spacer,
  * search input, spacer, list, spacer, hint footer, border) built from public pi-tui components; its
- * content follows the v2 skills extension: an accent bold title, `skill:<name>` rows, the selected
+ * content follows the v2 skills extension: an accent bold title, bare skill-name rows, the selected
  * skill's description cut to one line under the rows, the pinned scroll counter on overflow,
  * and the two empty states. Enter applies the selected skill with no arguments; the query is never appended.
  */
@@ -47,7 +59,7 @@ class SkillsSelectorComponent extends Container {
         this.addChild(new Text(renderPiModalShortcutHints([
             { key: "↑↓", action: "navigate" },
             { key: bindings.getKeys("tui.select.confirm").join("/"), action: "select" },
-            { key: bindings.getKeys("tui.select.cancel").join("/"), action: "cancel" },
+            DIALOG_CLOSE_SHORTCUT_HINT,
         ]), 0, 0));
         this.addChild(new DynamicBorder());
         adoptPiModalFrame(this, { topIndex: 0, bottomIndex: this.children.length - 1, header });
@@ -108,8 +120,9 @@ class SkillsSelectorComponent extends Container {
         for (let index = start; index < end; index++) {
             const skill = this.#filtered[index];
             const selected = index === this.#selectedIndex;
-            const label = `${SKILL_COMMAND_PREFIX}${skill.name}`;
-            this.#listContainer.addChild(new Text(`${selected ? theme.fg("accent", "→ ") : "  "}${selected ? theme.fg("accent", label) : label}`, 0, 0));
+            const label = skill.name;
+            const content = `${selected ? theme.fg("accent", "→ ") : "  "}${selected ? theme.fg("text", label) : label}`;
+            this.#listContainer.addChild(new SkillRow(content, selected));
         }
         if (start > 0 || end < this.#filtered.length) {
             this.#listContainer.addChild(new Text(theme.fg("muted", `  (${this.#selectedIndex + 1}/${this.#filtered.length})`), 0, 0));

package/dist/integrations/pi/components/theme.d.ts

@@ -1,5 +1,12 @@
-import { type SemanticShortcutHint } from "../../../contracts/presentation/index.js";
+import { DIALOG_CLOSE_SHORTCUT_HINT, displayShortcutKeyLabel, type SemanticShortcutHint } from "../../../contracts/presentation/index.js";
 export * from "./upstream/theme/theme.js";
 export type PiModalShortcutHint = SemanticShortcutHint;
+export { DIALOG_CLOSE_SHORTCUT_HINT, displayShortcutKeyLabel };
+/** Paint one selected bare-A1 list item with the standard blue selection surface. */
+export declare function renderPiListSelection(content: string): string;
+/** One standard bare-A1 modal row, clipped before its item-bounded selection is painted. */
+export declare function renderPiModalListRow(content: string, width: number, selected: boolean): string;
 /** The common bare-A1 modal footer: quiet display-cased keys, muted names, and whitespace-only gaps. */
 export declare function renderPiModalShortcutHints(entries: readonly PiModalShortcutHint[], indent?: number): string;
+/** Adapts Pi's closed settings footer while reserving the canonical close suffix. */
+export declare function canonicalizePiSettingsHint(row: string, width: number): string;

package/dist/integrations/pi/components/theme.js

@@ -1,6 +1,17 @@
-import { renderSemanticShortcutHints, } from "../../../contracts/presentation/index.js";
+import { DIALOG_CLOSE_SHORTCUT_HINT, displayShortcutKeyLabel, renderSemanticShortcutHints, } from "../../../contracts/presentation/index.js";
+import { stripTerminalSequences, truncateToWidth } from "@earendil-works/pi-tui";
 import { piTheme } from "./upstream/theme/theme.js";
 export * from "./upstream/theme/theme.js";
+export { DIALOG_CLOSE_SHORTCUT_HINT, displayShortcutKeyLabel };
+/** Paint one selected bare-A1 list item with the standard blue selection surface. */
+export function renderPiListSelection(content) {
+    return piTheme().bg("selectedBg", content);
+}
+/** One standard bare-A1 modal row, clipped before its item-bounded selection is painted. */
+export function renderPiModalListRow(content, width, selected) {
+    const clipped = truncateToWidth(content, Math.max(0, width), "");
+    return selected ? renderPiListSelection(clipped) : clipped;
+}
 /** The common bare-A1 modal footer: quiet display-cased keys, muted names, and whitespace-only gaps. */
 export function renderPiModalShortcutHints(entries, indent = 0) {
     const theme = piTheme();
@@ -9,3 +20,19 @@ export function renderPiModalShortcutHints(entries, indent = 0) {
         action: text => theme.fg("muted", text),
     }, indent);
 }
+/** Adapts Pi's closed settings footer while reserving the canonical close suffix. */
+export function canonicalizePiSettingsHint(row, width) {
+    const plain = stripTerminalSequences(row);
+    const body = plain.includes("Type to search") ? "  Type to search · Enter/Space to change"
+        : plain.includes("Enter/Space to change") ? "  Enter/Space to change"
+            : plain.includes("Type to filter") ? "  Type to filter · Enter to select"
+                : plain.includes("Enter to select") && plain.includes("Esc") ? "  Enter to select"
+                    : /^\s*(?:Type to|Enter(?:\/Space)? to)/u.test(plain) ? plain.replace(/\.{3}$/u, "") : null;
+    if (body === null)
+        return row;
+    const close = `${displayShortcutKeyLabel(DIALOG_CLOSE_SHORTCUT_HINT.key)} ${DIALOG_CLOSE_SHORTCUT_HINT.action}`;
+    if (width <= close.length)
+        return piTheme().fg("dim", truncateToWidth(close, width, ""));
+    const bodyWidth = width - close.length - 3;
+    return piTheme().fg("dim", bodyWidth <= 0 ? close : `${truncateToWidth(body, bodyWidth, "…")} · ${close}`);
+}

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

@@ -3,9 +3,11 @@
  * packages/coding-agent/src/core/keybindings.ts.
  * Modifications: Mechanical source port with Node import prefixes, public package-root agent-directory
  * resolution, and an opt-in bare-A1 input profile including Ctrl+L level cycling, unbound model
- * selection, and cross-platform Alt+Up queued-message restoration.
+ * selection, Tab tree-filter cycling, tree-local navigation aliases, cross-platform Alt+Up
+ * queued-message restoration, and an implicit Ctrl+C selection-cancel alias omitted from shortcut
+ * labels.
  * Deviations: keybindings-public-config-boundary, owned-level-cycle-shortcut,
- * owned-input-keybinding-aliases.
+ * owned-input-keybinding-aliases, owned-session-tree-dialog, owned-dialog-ctrl-c-cancel.
  */
 import { type Keybinding, type KeybindingDefinitions, type KeybindingsConfig, type KeyId, KeybindingsManager as TuiKeybindingsManager } from "@earendil-works/pi-tui";
 export interface AppKeybindings {
@@ -58,6 +60,10 @@ export interface AppKeybindings {
     "owned.editor.redo": true;
     "owned.editor.extendLeft": true;
     "owned.editor.extendRight": true;
+    "owned.tree.collapse": true;
+    "owned.tree.expand": true;
+    "owned.tree.first": true;
+    "owned.tree.last": true;
 }
 export type AppKeybinding = keyof AppKeybindings;
 export declare function useWindowsKeybindings(platform?: NodeJS.Platform, env?: NodeJS.ProcessEnv): boolean;
@@ -437,6 +443,8 @@ export declare class KeybindingsManager extends TuiKeybindingsManager {
     static create(agentDir?: string): KeybindingsManager;
     static fromOwnedBindings(bindings?: KeybindingsConfig): KeybindingsManager;
     static createForOwnedInput(agentDir?: string): KeybindingsManager;
+    matches(data: string, keybinding: Keybinding): boolean;
+    getKeys(keybinding: Keybinding): KeyId[];
     private static createWithDefinitions;
     reload(): void;
     getEffectiveConfig(): KeybindingsConfig;

package/dist/integrations/pi/components/upstream/adjacent/core/keybindings.js

@@ -3,11 +3,13 @@
  * packages/coding-agent/src/core/keybindings.ts.
  * Modifications: Mechanical source port with Node import prefixes, public package-root agent-directory
  * resolution, and an opt-in bare-A1 input profile including Ctrl+L level cycling, unbound model
- * selection, and cross-platform Alt+Up queued-message restoration.
+ * selection, Tab tree-filter cycling, tree-local navigation aliases, cross-platform Alt+Up
+ * queued-message restoration, and an implicit Ctrl+C selection-cancel alias omitted from shortcut
+ * labels.
  * Deviations: keybindings-public-config-boundary, owned-level-cycle-shortcut,
- * owned-input-keybinding-aliases.
+ * owned-input-keybinding-aliases, owned-session-tree-dialog, owned-dialog-ctrl-c-cancel.
  */
-import { TUI_KEYBINDINGS, KeybindingsManager as TuiKeybindingsManager, } from "@earendil-works/pi-tui";
+import { matchesKey, TUI_KEYBINDINGS, KeybindingsManager as TuiKeybindingsManager, } from "@earendil-works/pi-tui";
 import { existsSync, readFileSync } from "node:fs";
 import { join } from "node:path";
 import { getAgentDir } from "../../../../startup-public.js";
@@ -185,6 +187,7 @@ const OWNED_INPUT_KEYBINDINGS = {
     "app.thinking.cycle": { ...KEYBINDINGS["app.thinking.cycle"], defaultKeys: "ctrl+l" },
     "app.model.select": { ...KEYBINDINGS["app.model.select"], defaultKeys: [] },
     "app.message.dequeue": { ...KEYBINDINGS["app.message.dequeue"], defaultKeys: "alt+up" },
+    "app.tree.filter.cycleForward": { ...KEYBINDINGS["app.tree.filter.cycleForward"], defaultKeys: "tab" },
     "tui.editor.deleteWordBackward": {
         ...KEYBINDINGS["tui.editor.deleteWordBackward"],
         defaultKeys: [...KEYBINDINGS["tui.editor.deleteWordBackward"].defaultKeys, "ctrl+backspace"],
@@ -199,15 +202,17 @@ const OWNED_INPUT_KEYBINDINGS = {
     },
     // Ctrl+Z edits the prompt in bare A1 instead of suspending the process.
     "app.suspend": { ...KEYBINDINGS["app.suspend"], defaultKeys: [] },
-    // Owned prompt-selection actions are intercepted before vanilla Pi editor
-    // actions. Keeping them in the keybinding manager makes the UX declarative,
-    // configurable, and independent of terminal escape-sequence spellings.
+    // Owned prompt-selection actions remain declarative and take priority.
     "owned.editor.selectAll": { defaultKeys: "ctrl+a", description: "Select all prompt text" },
     "owned.editor.cut": { defaultKeys: "ctrl+x", description: "Cut selected prompt text" },
     "owned.editor.paste": { defaultKeys: "ctrl+v", description: "Paste clipboard text" },
     "owned.editor.redo": { defaultKeys: "ctrl+y", description: "Redo prompt edit" },
     "owned.editor.extendLeft": { defaultKeys: "shift+left", description: "Extend prompt selection left" },
     "owned.editor.extendRight": { defaultKeys: "shift+right", description: "Extend prompt selection right" },
+    "owned.tree.collapse": { defaultKeys: "left", description: "Collapse selected tree branch" },
+    "owned.tree.expand": { defaultKeys: "right", description: "Expand selected tree branch" },
+    "owned.tree.first": { defaultKeys: "home", description: "Select first tree entry" },
+    "owned.tree.last": { defaultKeys: "end", description: "Select last tree entry" },
 };
 const KEYBINDING_NAME_MIGRATIONS = {
     cursorUp: "tui.editor.cursorUp",
@@ -349,6 +354,15 @@ export class KeybindingsManager extends TuiKeybindingsManager {
     static createForOwnedInput(agentDir = getAgentDir()) {
         return KeybindingsManager.createWithDefinitions(agentDir, OWNED_INPUT_KEYBINDINGS);
     }
+    // Protocol: Ctrl+C is a conventional dialog escape hatch, not advertised keybinding chrome.
+    matches(data, keybinding) {
+        return keybinding === "tui.select.cancel" && matchesKey(data, "ctrl+c")
+            || super.matches(data, keybinding);
+    }
+    getKeys(keybinding) {
+        const keys = super.getKeys(keybinding);
+        return keybinding === "tui.select.cancel" ? keys.filter(key => key !== "ctrl+c") : keys;
+    }
     static createWithDefinitions(agentDir, definitions) {
         const configPath = join(agentDir, "keybindings.json");
         const userBindings = KeybindingsManager.loadFromFile(configPath);

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

@@ -11,7 +11,7 @@ import { Container, Editor, Spacer, Text, } from "@earendil-works/pi-tui";
 import { DynamicBorder, getSelectListTheme } from "../../../startup-public.js";
 import { editInExternalEditor } from "../external-editor.js";
 import { addPiModalHeader, adoptPiModalFrame } from "../../modal-frame.js";
-import { piTheme, renderPiModalShortcutHints } from "../../theme.js";
+import { DIALOG_CLOSE_SHORTCUT_HINT, piTheme, renderPiModalShortcutHints } from "../../theme.js";
 export class ExtensionEditorComponent extends Container {
     #editor;
     #tui;
@@ -54,8 +54,8 @@ export class ExtensionEditorComponent extends Container {
         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" },
+            DIALOG_CLOSE_SHORTCUT_HINT,
         ]);
         this.addChild(new Text(hint, 0, 0));
         this.addChild(new Spacer(1));