@timurproko/a1 0.1.8-dev.512 → 0.1.8-dev.521

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

@@ -0,0 +1,310 @@
+import { Input, Key, getKeybindings, matchesKey, truncateToWidth, } from "@earendil-works/pi-tui";
+import { piTheme } from "./theme.js";
+const MAX_VISIBLE_ROWS = 10;
+const MODELS_TITLE = "Models";
+function fullModelId(model) {
+    return `${model.provider}/${model.id}`;
+}
+function sameOrder(left, right) {
+    return left.length === right.length && left.every((value, index) => value === right[index]);
+}
+function matchesQuery(model, query) {
+    const normalized = query.trim().toLowerCase();
+    if (normalized.length === 0)
+        return true;
+    return `${model.id} ${model.name} ${model.provider} ${fullModelId(model)}`.toLowerCase().includes(normalized);
+}
+function keyLabel(action) {
+    return getKeybindings().getKeys(action)
+        .map(key => key.split("+").map(part => process.platform === "darwin" && part.toLowerCase() === "alt" ? "option" : part).join("+"))
+        .join("/");
+}
+/**
+ * Bare A1's one model-management dialog: a searchable catalog with `all`/`scoped` filters where
+ * Enter switches the active model, Space edits the session's cycling scope, and Ctrl+S persists
+ * that scope. The component owns only presentation state (query, filter, selection, desired and
+ * saved scope, refresh status); every switch, scope write, and save goes through its callbacks.
+ */
+export class ModelsDialogComponent {
+    #input = new Input();
+    #callbacks;
+    #models = [];
+    #activeModelId;
+    #scopeIds;
+    #savedScopeIds;
+    #filter;
+    #selectedIndex = 0;
+    #preferredId;
+    #refreshStatus;
+    #disposed = false;
+    #focused = false;
+    constructor(config, callbacks) {
+        this.#callbacks = callbacks;
+        this.#activeModelId = config.activeModelId;
+        this.#scopeIds = [...config.scopeIds];
+        this.#savedScopeIds = [...config.savedScopeIds];
+        this.#filter = config.initialFilter ?? "all";
+        this.#refreshStatus = config.refreshStatus === undefined ? undefined : { message: config.refreshStatus, kind: "muted" };
+        if (config.initialQuery)
+            this.#input.setValue(config.initialQuery);
+        this.#replaceModels(config.models);
+        const rows = this.#rows();
+        const activeIndex = rows.findIndex(row => row.fullId === this.#activeModelId);
+        this.#selectedIndex = activeIndex >= 0 ? activeIndex : 0;
+    }
+    get focused() {
+        return this.#focused;
+    }
+    set focused(value) {
+        this.#focused = value;
+        this.#input.focused = value;
+    }
+    /** True while the desired scope or order differs from the last successful save. */
+    get dirty() {
+        return !sameOrder(this.#scopeIds, this.#savedScopeIds);
+    }
+    get filter() {
+        return this.#filter;
+    }
+    get query() {
+        return this.#input.getValue();
+    }
+    get scopeIds() {
+        return [...this.#scopeIds];
+    }
+    get selectedModelId() {
+        return this.#rows()[this.#selectedIndex]?.fullId;
+    }
+    /** Replace the catalog after a refresh; query, filter, surviving selection, scope edits, and dirty state stay. */
+    updateModels(models) {
+        const selectedId = this.selectedModelId;
+        this.#replaceModels(models);
+        this.#restoreSelection(selectedId);
+    }
+    setRefreshStatus(message, kind) {
+        this.#refreshStatus = { message, kind };
+    }
+    dispose() {
+        this.#disposed = true;
+    }
+    invalidate() {
+        this.#input.invalidate();
+    }
+    handleInput(data) {
+        const kb = getKeybindings();
+        const rows = this.#rows();
+        this.#clampSelection(rows);
+        const selected = rows[this.#selectedIndex];
+        // Rationale: an emptied filter keeps the last highlighted model so switching filters lands back on it.
+        const preferredId = selected?.fullId ?? this.#preferredId;
+        this.#preferredId = preferredId;
+        if (kb.matches(data, "tui.select.up")) {
+            if (rows.length > 0)
+                this.#selectedIndex = this.#selectedIndex === 0 ? rows.length - 1 : this.#selectedIndex - 1;
+            return;
+        }
+        if (kb.matches(data, "tui.select.down")) {
+            if (rows.length > 0)
+                this.#selectedIndex = this.#selectedIndex === rows.length - 1 ? 0 : this.#selectedIndex + 1;
+            return;
+        }
+        if (kb.matches(data, "tui.input.tab")) {
+            this.#filter = this.#filter === "all" ? "scoped" : "all";
+            this.#restoreSelection(preferredId);
+            return;
+        }
+        if (data === " ") {
+            if (selected)
+                this.#setScope(this.#scopeIds.includes(selected.fullId)
+                    ? this.#scopeIds.filter(id => id !== selected.fullId)
+                    : [...this.#scopeIds, selected.fullId], selected.fullId);
+            return;
+        }
+        if (kb.matches(data, "tui.select.confirm")) {
+            if (selected)
+                this.#callbacks.onSelect(selected.fullId);
+            return;
+        }
+        if (kb.matches(data, "app.models.save")) {
+            this.#save();
+            return;
+        }
+        if (kb.matches(data, "app.models.enableAll")) {
+            const targets = this.#bulkTargets(rows);
+            this.#setScope([...this.#scopeIds, ...targets.filter(id => !this.#scopeIds.includes(id))], selected?.fullId);
+            return;
+        }
+        if (kb.matches(data, "app.models.clearAll")) {
+            const targets = new Set(this.#bulkTargets(rows));
+            this.#setScope(this.#scopeIds.filter(id => !targets.has(id)), selected?.fullId);
+            return;
+        }
+        if (kb.matches(data, "app.models.toggleProvider")) {
+            if (!selected)
+                return;
+            const providerIds = this.#models.filter(model => model.provider === selected.model.provider).map(fullModelId);
+            const allScoped = providerIds.every(id => this.#scopeIds.includes(id));
+            this.#setScope(allScoped
+                ? this.#scopeIds.filter(id => !providerIds.includes(id))
+                : [...this.#scopeIds, ...providerIds.filter(id => !this.#scopeIds.includes(id))], selected.fullId);
+            return;
+        }
+        const reorderUp = kb.matches(data, "app.models.reorderUp");
+        if (reorderUp || kb.matches(data, "app.models.reorderDown")) {
+            if (!selected)
+                return;
+            const index = this.#scopeIds.indexOf(selected.fullId);
+            const target = index + (reorderUp ? -1 : 1);
+            if (index < 0 || target < 0 || target >= this.#scopeIds.length)
+                return;
+            const next = [...this.#scopeIds];
+            next[index] = next[target];
+            next[target] = selected.fullId;
+            this.#setScope(next, selected.fullId);
+            return;
+        }
+        if (matchesKey(data, Key.ctrl("c"))) {
+            if (this.#input.getValue().length > 0) {
+                this.#input.setValue("");
+                this.#selectedIndex = 0;
+                return;
+            }
+            this.#callbacks.onCancel();
+            return;
+        }
+        if (kb.matches(data, "tui.select.cancel")) {
+            this.#callbacks.onCancel();
+            return;
+        }
+        const before = this.#input.getValue();
+        this.#input.handleInput(data);
+        if (this.#input.getValue() !== before)
+            this.#selectedIndex = 0;
+    }
+    render(width) {
+        const theme = piTheme();
+        const lines = [];
+        const push = (line = "") => { lines.push(truncateToWidth(line, width)); };
+        const border = theme.fg("border", "─".repeat(Math.max(1, width)));
+        const rows = this.#rows();
+        this.#clampSelection(rows);
+        push(border);
+        push();
+        push(theme.fg("accent", theme.bold(MODELS_TITLE)) + (this.dirty ? theme.fg("warning", " (unsaved)") : ""));
+        push(theme.fg("dim", "Filter: ")
+            + theme.fg(this.#filter === "all" ? "accent" : "dim", "all")
+            + theme.fg("dim", " | ")
+            + theme.fg(this.#filter === "scoped" ? "accent" : "dim", "scoped"));
+        push();
+        for (const line of this.#input.render(width))
+            push(line);
+        push();
+        if (rows.length === 0) {
+            push(theme.fg("muted", `  ${this.#emptyText()}`));
+        }
+        else {
+            const startIndex = Math.max(0, Math.min(this.#selectedIndex - Math.floor(MAX_VISIBLE_ROWS / 2), rows.length - MAX_VISIBLE_ROWS));
+            const endIndex = Math.min(startIndex + MAX_VISIBLE_ROWS, rows.length);
+            for (let index = startIndex; index < endIndex; index += 1) {
+                const row = rows[index];
+                const selected = index === this.#selectedIndex;
+                const scoped = this.#scopeIds.includes(row.fullId);
+                // Invariant: arrow, scope marker, model id, [provider], then the active checkmark, in that order.
+                const prefix = selected ? theme.fg("accent", "→ ") : "  ";
+                const marker = scoped ? theme.fg("success", "●") : theme.fg("dim", "○");
+                const label = selected ? theme.fg("accent", row.model.id) : row.model.id;
+                const provider = theme.fg("muted", `[${row.model.provider}]`);
+                const active = row.fullId === this.#activeModelId ? ` ${theme.fg("success", "✓")}` : "";
+                push(`${prefix}${marker} ${label} ${provider}${active}`);
+            }
+            if (startIndex > 0 || endIndex < rows.length)
+                push(theme.fg("muted", `  (${this.#selectedIndex + 1}/${rows.length})`));
+            const selectedRow = rows[this.#selectedIndex];
+            if (selectedRow) {
+                push();
+                push(theme.fg("muted", `  Model Name: ${selectedRow.model.name}`));
+            }
+        }
+        push();
+        if (this.#refreshStatus !== undefined)
+            push(theme.fg(this.#refreshStatus.kind, `  ${this.#refreshStatus.message}`));
+        push(theme.fg("dim", `  ${this.#hints().join(" · ")}`));
+        push(border);
+        return lines;
+    }
+    #hints() {
+        const tab = keyLabel("tui.input.tab");
+        const confirm = keyLabel("tui.select.confirm");
+        const save = keyLabel("app.models.save");
+        return [
+            "type to search",
+            "↑↓ navigate",
+            ...(tab.length === 0 ? [] : [`${tab} filter`]),
+            ...(confirm.length === 0 ? [] : [`${confirm} switch`]),
+            "space scope",
+            ...(save.length === 0 ? [] : [`${save} save`]),
+            "esc close",
+        ];
+    }
+    #emptyText() {
+        if (this.#input.getValue().trim().length > 0)
+            return "No matching models";
+        if (this.#filter === "scoped")
+            return "No scoped models";
+        return "No models available. Use /login to add providers.";
+    }
+    #replaceModels(models) {
+        this.#models = [...models].sort((left, right) => left.provider.localeCompare(right.provider) || left.id.localeCompare(right.id));
+    }
+    #rows() {
+        const query = this.#input.getValue();
+        const byId = new Map(this.#models.map(model => [fullModelId(model), model]));
+        const ordered = this.#filter === "scoped"
+            // Rationale: the scoped view lists the desired cycling order, then saved members removed in this session so they can be restored.
+            ? [...this.#scopeIds, ...this.#savedScopeIds.filter(id => !this.#scopeIds.includes(id))].flatMap(id => {
+                const model = byId.get(id);
+                return model === undefined ? [] : [model];
+            })
+            : this.#models;
+        return ordered.filter(model => matchesQuery(model, query)).map(model => ({ fullId: fullModelId(model), model }));
+    }
+    #bulkTargets(rows) {
+        // Compatibility: like the pinned scoped selector, a live search narrows bulk actions to the visible rows.
+        return this.#input.getValue().length > 0 || this.#filter === "scoped" ? rows.map(row => row.fullId) : this.#models.map(fullModelId);
+    }
+    #clampSelection(rows) {
+        this.#selectedIndex = Math.min(this.#selectedIndex, Math.max(0, rows.length - 1));
+    }
+    #restoreSelection(fullId) {
+        const rows = this.#rows();
+        const index = fullId === undefined ? -1 : rows.findIndex(row => row.fullId === fullId);
+        this.#selectedIndex = index >= 0 ? index : Math.min(this.#selectedIndex, Math.max(0, rows.length - 1));
+    }
+    #setScope(next, keepSelected) {
+        if (sameOrder(next, this.#scopeIds))
+            return;
+        this.#scopeIds = [...next];
+        this.#restoreSelection(keepSelected);
+        this.#callbacks.onScopeChange([...this.#scopeIds]);
+    }
+    #save() {
+        const snapshot = [...this.#scopeIds];
+        let outcome;
+        try {
+            outcome = this.#callbacks.onSave(snapshot);
+        }
+        catch {
+            return;
+        }
+        Promise.resolve(outcome).then(() => {
+            if (this.#disposed)
+                return;
+            // Invariant: only the exact snapshot that persisted becomes the baseline; later edits stay dirty.
+            this.#savedScopeIds = snapshot;
+            this.#callbacks.requestRender();
+        }, () => {
+            if (!this.#disposed)
+                this.#callbacks.requestRender();
+        });
+    }
+}

package/dist/integrations/pi/components/shell-editor-autocomplete.d.ts

@@ -8,4 +8,14 @@ export declare const PINNED_PI_BUILTIN_SLASH_COMMANDS: ({
     description: string;
     argumentHint: string;
 })[];
+/** Bare A1's built-in catalog: one `models` command replaces the pinned `model` and `scoped-models` entries. */
+export declare const OWNED_BUILTIN_SLASH_COMMANDS: ({
+    name: string;
+    description: string;
+    argumentHint?: never;
+} | {
+    name: string;
+    description: string;
+    argumentHint: string;
+})[];
 export declare function createPiShellEditor(options: PiShellEditorOptions): PiShellEditorPort;

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

@@ -6,6 +6,9 @@ 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 { createTuiFacade, ensureTheme, isAutocompleteProvider, } from "./shell-shared-facade.js";
+import { SKILLS_COMMAND_NAME, collapseSkillCommands, createSkillsTunnelProvider, } from "./skills-command.js";
+/** A selected tunnel row: the accent label, then at least two spaces, then the description. */
+const SELECTED_TUNNEL_ROW = /^(→ skills:\S+)(\s{2,}.*)$/u;
 export const PINNED_PI_BUILTIN_SLASH_COMMANDS = [
     { name: "settings", description: "Open settings menu" },
     { name: "model", description: "Select model (opens selector UI)", argumentHint: "<provider/model>" },
@@ -30,6 +33,10 @@ export const PINNED_PI_BUILTIN_SLASH_COMMANDS = [
     { name: "reload", description: "Reload keybindings, extensions, skills, prompts, themes, and context files" },
     { name: "quit", description: "Quit" },
 ];
+/** Bare A1's built-in catalog: one `models` command replaces the pinned `model` and `scoped-models` entries. */
+export const OWNED_BUILTIN_SLASH_COMMANDS = PINNED_PI_BUILTIN_SLASH_COMMANDS.flatMap(command => command.name === "model"
+    ? [{ name: "models", description: "Switch models and manage scoped model cycling" }]
+    : command.name === "scoped-models" ? [] : [command]);
 export function createPiShellEditor(options) {
     ensureTheme();
     const tui = createTuiFacade(options);
@@ -43,6 +50,7 @@ export function createPiShellEditor(options) {
     }
     const scrollInfo = { emitted: false, counter: undefined };
     const selectListTheme = getSelectListTheme();
+    let tunnelSkills = [];
     const EditorClass = options.keybindingProfile === "a1" && options.persistentHistory === true ? options.historyEditor : OwnedEditor;
     const editor = new EditorClass(tui, {
         borderColor: (value) => inputPresentation === undefined ? piTheme().fg("borderMuted", value) : inputPresentation.styleRule(value),
@@ -54,6 +62,12 @@ export function createPiShellEditor(options) {
                 scrollInfo.counter = /^  \((\d+\/\d+)\)$/u.exec(text)?.[1];
                 return selectListTheme.scrollInfo(text);
             },
+            selectedText: text => {
+                // Rationale: a selected tunnel row keeps its description muted like the unselected rows (v2 behavior);
+                // the pinned list styles the whole selected row, so the split happens in the owned theme.
+                const row = tunnelSkills.length === 0 ? null : SELECTED_TUNNEL_ROW.exec(text);
+                return row === null ? selectListTheme.selectedText(text) : selectListTheme.selectedText(row[1]) + selectListTheme.description(row[2]);
+            },
         },
     }, keybindings, {
         paddingX: PINNED_PI_LAYOUT.editorPaddingX,
@@ -64,6 +78,7 @@ export function createPiShellEditor(options) {
             terminalRows: options.getRows,
             getVisualLineCount: (width) => editorVisualLineCount(editor, width),
             clearCommandSearchOnEscape: true,
+            commandTunnels: () => tunnelSkills.length === 0 ? [] : [SKILLS_COMMAND_NAME],
         } : {}),
         ...(options.keybindingProfile === "a1" && options.promptPresentation !== undefined ? {
             ...(inputPresentation === undefined ? {} : { inputPresentation }),
@@ -105,12 +120,21 @@ export function createPiShellEditor(options) {
         tui.requestRender();
     };
     let autocompleteProvider;
-    const setAutocompleteCommands = (commands) => {
+    const builtInCatalog = options.keybindingProfile === "a1" ? OWNED_BUILTIN_SLASH_COMMANDS : PINNED_PI_BUILTIN_SLASH_COMMANDS;
+    const setAutocompleteCommands = (installed) => {
+        // Invariant: collapse is a bare-A1 presentation; the comparison profile installs the pinned list.
+        const collapsed = options.keybindingProfile === "a1" && options.skillsPresentation?.() === "collapse"
+            ? collapseSkillCommands(installed)
+            : { commands: installed, skills: [] };
+        tunnelSkills = collapsed.skills;
+        const commands = collapsed.commands;
         const additions = new Map(commands.map(command => [command.name, command]));
-        const builtInNames = new Set(PINNED_PI_BUILTIN_SLASH_COMMANDS.map(command => command.name));
-        const builtIns = PINNED_PI_BUILTIN_SLASH_COMMANDS.map(command => autocompleteCommand(command, additions.get(command.name)));
-        const resources = commands.filter(command => !builtInNames.has(command.name)).map(command => autocompleteCommand(command));
-        autocompleteProvider = new CombinedAutocompleteProvider([...builtIns, ...resources], options.cwd ?? process.cwd());
+        const builtInNames = new Set(builtInCatalog.map(command => command.name));
+        const builtIns = builtInCatalog.map(command => autocompleteCommand(command, additions.get(command.name)));
+        // Invariant: the engine's built-in additions only decorate this profile's catalog; they never surface as resources.
+        const resources = commands.filter(command => command.source !== "builtin" && !builtInNames.has(command.name)).map(command => autocompleteCommand(command));
+        const combined = new CombinedAutocompleteProvider([...builtIns, ...resources], options.cwd ?? process.cwd());
+        autocompleteProvider = tunnelSkills.length === 0 ? combined : createSkillsTunnelProvider(combined, tunnelSkills);
         editor.setAutocompleteProvider(autocompleteProvider);
     };
     setAutocompleteCommands(options.autocompleteCommands ?? []);

package/dist/integrations/pi/components/shell-footer-status.js

@@ -222,7 +222,8 @@ function expandedHeaderText(bindings) {
         rawKeyHint("ctrl+k", "to delete to end"),
         rawKeyHint(keys?.getKeys("app.thinking.cycle").join("/") ?? "shift+tab", "to cycle thinking level"),
         rawKeyHint("ctrl+p/shift+ctrl+p", "to cycle models"),
-        rawKeyHint(keys === undefined ? "ctrl+l" : keys.getKeys("app.model.select").join("/") || "/model", "to select model"),
+        // Invariant: only bare A1 supplies live bindings, and its unbound fallback is the unified `/models` command.
+        rawKeyHint(keys === undefined ? "ctrl+l" : keys.getKeys("app.model.select").join("/") || "/models", "to select model"),
         rawKeyHint("ctrl+o", "to expand tools"),
         rawKeyHint("ctrl+t", "to expand thinking"),
         rawKeyHint("ctrl+g", "for external editor"),

package/dist/integrations/pi/components/shell-presenters-info.d.ts

@@ -40,4 +40,14 @@ export declare function renderPiShellCommandMessage(presentation: PiShellCommand
 export declare function createPiShellSessionInfo(presentation: PiShellSessionInfoPresentation): PiShellComponentPort;
 export declare function createPiShellCollapsedChangelog(): PiShellComponentPort;
 export declare function createPiShellChangelog(markdown: string): PiShellComponentPort;
+/** The changelog document rows the feed presenter shows, without its spacer, borders, and heading. */
+export declare function renderPiShellChangelogLines(markdown: string, width: number): readonly string[];
+/** What the hotkeys presenters render: the editor bindings and the extension shortcuts declared over them. */
+export interface PiShellHotkeysPresentation {
+    readonly bindings?: KeybindingsConfig;
+    readonly getShortcuts?: NonNullable<PiShellExtensionRendererResolver["getShortcuts"]>;
+    readonly profile?: "pi" | "a1";
+}
 export declare function createPiShellHotkeys(bindings?: KeybindingsConfig, getShortcuts?: NonNullable<PiShellExtensionRendererResolver["getShortcuts"]>, profile?: "pi" | "a1"): PiShellComponentPort;
+/** The keyboard-shortcut document rows the feed presenter shows, without its spacer, borders, and heading. */
+export declare function renderPiShellHotkeysLines(presentation: PiShellHotkeysPresentation, width: number): readonly string[];

package/dist/integrations/pi/components/shell-presenters-info.js

@@ -73,10 +73,18 @@ export function createPiShellChangelog(markdown) {
     container.addChild(new DynamicBorder());
     container.addChild(new Text(piTheme().bold(piTheme().fg("accent", "What's New")), 1, 0));
     container.addChild(new Spacer(1));
-    container.addChild(new Markdown(markdown.trim() || "No changelog entries found.", 1, 1, getMarkdownTheme()));
+    container.addChild(changelogMarkdown(markdown));
     container.addChild(new DynamicBorder());
     return componentPort(container);
 }
+/** The changelog document rows the feed presenter shows, without its spacer, borders, and heading. */
+export function renderPiShellChangelogLines(markdown, width) {
+    ensureTheme();
+    return changelogMarkdown(markdown).render(width);
+}
+function changelogMarkdown(markdown) {
+    return new Markdown(markdown.trim() || "No changelog entries found.", 1, 1, getMarkdownTheme());
+}
 function shortcutDisplay(key) {
     // Platform: pinned Pi labels Alt as Option on macOS, including extension shortcuts.
     return key.split("/").map(binding => binding.split("+").map(part => {
@@ -86,6 +94,25 @@ function shortcutDisplay(key) {
 }
 export function createPiShellHotkeys(bindings, getShortcuts = () => [], profile = "pi") {
     ensureTheme();
+    const markdown = hotkeysMarkdown(bindings, getShortcuts, profile);
+    const container = new Container();
+    container.addChild(new Spacer(1));
+    container.addChild(new DynamicBorder());
+    container.addChild(new Text(piTheme().bold(piTheme().fg("accent", "Keyboard Shortcuts")), 1, 0));
+    container.addChild(new Spacer(1));
+    container.addChild(hotkeysMarkdownComponent(markdown));
+    container.addChild(new DynamicBorder());
+    return componentPort(container);
+}
+/** The keyboard-shortcut document rows the feed presenter shows, without its spacer, borders, and heading. */
+export function renderPiShellHotkeysLines(presentation, width) {
+    ensureTheme();
+    return hotkeysMarkdownComponent(hotkeysMarkdown(presentation.bindings, presentation.getShortcuts ?? (() => []), presentation.profile ?? "pi")).render(width);
+}
+function hotkeysMarkdownComponent(markdown) {
+    return new Markdown(markdown, 1, 1, getMarkdownTheme());
+}
+function hotkeysMarkdown(bindings, getShortcuts, profile) {
     const keys = profile === "a1" ? KeybindingsManager.fromOwnedBindings(bindings) : new KeybindingsManager(bindings);
     // Compatibility: the owned viewport consumes these physical chords before editor actions.
     const display = (action) => keys.getKeys(action)
@@ -94,21 +121,14 @@ export function createPiShellHotkeys(bindings, getShortcuts = () => [], profile
     const row = (actions, description) => `| ${actions.map(action => {
         const label = display(action);
         return profile === "a1" && label.length === 0
-            ? action === "app.model.select" ? "Unbound (`/model`)" : "Unbound"
+            ? action === "app.model.select" ? "Unbound (`/models`)" : "Unbound"
             : `\`${label}\``;
     }).join(" / ")} | ${description} |`;
-    let markdown = ["**Navigation**", "| Key | Action |", "|-----|--------|", row(["tui.editor.cursorUp", "tui.editor.cursorDown", "tui.editor.cursorLeft", "tui.editor.cursorRight"], "Move cursor / browse history"), row(["tui.editor.cursorWordLeft", "tui.editor.cursorWordRight"], "Move by word"), row(["tui.editor.cursorLineStart"], profile === "a1" ? "Start of prompt line" : "Start of line"), row(["tui.editor.cursorLineEnd"], profile === "a1" ? "End of prompt line" : "End of line"), ...(profile === "a1" ? ["| `Ctrl+Home` | Start of content |", "| `Ctrl+End` | End of content / follow output |"] : []), row(["tui.editor.jumpForward"], "Jump forward to character"), row(["tui.editor.jumpBackward"], "Jump backward to character"), row(["tui.editor.pageUp", "tui.editor.pageDown"], "Scroll by page"), "", "**Editing**", "| Key | Action |", "|-----|--------|", row(["tui.input.submit"], "Send message"), row(["tui.input.newLine"], `New line${process.platform === "win32" ? " (Ctrl+Enter on Windows Terminal)" : ""}`), row(["tui.editor.deleteWordBackward"], "Delete word backwards"), row(["tui.editor.deleteWordForward"], "Delete word forwards"), row(["tui.editor.deleteToLineStart"], "Delete to start of line"), row(["tui.editor.deleteToLineEnd"], "Delete to end of line"), row(["tui.editor.yank"], "Paste the most-recently-deleted text"), row(["tui.editor.yankPop"], "Cycle through the deleted text after pasting"), row(["tui.editor.undo"], "Undo"), "", "**Other**", "| Key | Action |", "|-----|--------|", row(["tui.input.tab"], "Path completion / accept autocomplete"), row(["app.interrupt"], "Cancel autocomplete / abort streaming"), row(["app.clear"], "Clear editor (first) / exit (second)"), row(["app.exit"], "Exit (when editor is empty)"), row(["app.suspend"], "Suspend to background"), row(["app.thinking.cycle"], "Cycle thinking level"), row(["app.model.cycleForward", "app.model.cycleBackward"], "Cycle models"), row(["app.model.select"], "Open model selector"), row(["app.tools.expand"], "Toggle tool output expansion"), row(["app.thinking.toggle"], "Toggle thinking block visibility"), row(["app.editor.external"], "Edit message in external editor"), row(["app.message.copy"], "Copy last assistant message"), row(["app.message.followUp"], "Queue follow-up message"), row(["app.message.dequeue"], "Restore queued messages"), row(["app.clipboard.pasteImage"], "Paste image or text from clipboard"), "| `/` | Slash commands |", "| `!` | Run bash command |", "| `!!` | Run bash command (excluded from context) |"].join("\n");
+    let markdown = ["**Navigation**", "| Key | Action |", "|-----|--------|", row(["tui.editor.cursorUp", "tui.editor.cursorDown", "tui.editor.cursorLeft", "tui.editor.cursorRight"], "Move cursor / browse history"), row(["tui.editor.cursorWordLeft", "tui.editor.cursorWordRight"], "Move by word"), row(["tui.editor.cursorLineStart"], profile === "a1" ? "Start of prompt line" : "Start of line"), row(["tui.editor.cursorLineEnd"], profile === "a1" ? "End of prompt line" : "End of line"), ...(profile === "a1" ? ["| `Ctrl+Home` | Start of content |", "| `Ctrl+End` | End of content / follow output |"] : []), row(["tui.editor.jumpForward"], "Jump forward to character"), row(["tui.editor.jumpBackward"], "Jump backward to character"), row(["tui.editor.pageUp", "tui.editor.pageDown"], "Scroll by page"), "", "**Editing**", "| Key | Action |", "|-----|--------|", row(["tui.input.submit"], "Send message"), row(["tui.input.newLine"], `New line${process.platform === "win32" ? " (Ctrl+Enter on Windows Terminal)" : ""}`), row(["tui.editor.deleteWordBackward"], "Delete word backwards"), row(["tui.editor.deleteWordForward"], "Delete word forwards"), row(["tui.editor.deleteToLineStart"], "Delete to start of line"), row(["tui.editor.deleteToLineEnd"], "Delete to end of line"), row(["tui.editor.yank"], "Paste the most-recently-deleted text"), row(["tui.editor.yankPop"], "Cycle through the deleted text after pasting"), row(["tui.editor.undo"], "Undo"), "", "**Other**", "| Key | Action |", "|-----|--------|", row(["tui.input.tab"], "Path completion / accept autocomplete"), row(["app.interrupt"], "Cancel autocomplete / abort streaming"), row(["app.clear"], "Clear editor (first) / exit (second)"), row(["app.exit"], "Exit (when editor is empty)"), row(["app.suspend"], "Suspend to background"), row(["app.thinking.cycle"], "Cycle thinking level"), row(["app.model.cycleForward", "app.model.cycleBackward"], "Cycle models"), row(["app.model.select"], profile === "a1" ? "Open the Models dialog" : "Open model selector"), row(["app.tools.expand"], "Toggle tool output expansion"), row(["app.thinking.toggle"], "Toggle thinking block visibility"), row(["app.editor.external"], "Edit message in external editor"), row(["app.message.copy"], "Copy last assistant message"), row(["app.message.followUp"], "Queue follow-up message"), row(["app.message.dequeue"], "Restore queued messages"), row(["app.clipboard.pasteImage"], "Paste image or text from clipboard"), "| `/` | Slash commands |", "| `!` | Run bash command |", "| `!!` | Run bash command (excluded from context) |", ...(profile === "a1" ? ["", "**Models dialog**", "| Key | Action |", "|-----|--------|", "| `Space` | Toggle the selected model in the cycling scope |", "| `Tab` | Switch the all/scoped filter |", row(["app.models.save"], "Save the scope to settings"), row(["app.models.enableAll"], "Scope every listed model"), row(["app.models.clearAll"], "Clear the listed models from the scope"), row(["app.models.toggleProvider"], "Toggle the selected model's provider"), row(["app.models.reorderUp", "app.models.reorderDown"], "Reorder the cycling scope")] : [])].join("\n");
     const shortcuts = getShortcuts(bindings ?? keys.getEffectiveConfig());
     if (shortcuts.length > 0) {
         markdown += "\n\n**Extensions**\n| Key | Action |\n|-----|--------|\n";
         markdown += shortcuts.map(shortcut => `| \`${shortcutDisplay(shortcut.key)}\` | ${shortcut.description} |`).join("\n");
     }
-    const container = new Container();
-    container.addChild(new Spacer(1));
-    container.addChild(new DynamicBorder());
-    container.addChild(new Text(piTheme().bold(piTheme().fg("accent", "Keyboard Shortcuts")), 1, 0));
-    container.addChild(new Spacer(1));
-    container.addChild(new Markdown(markdown, 1, 1, getMarkdownTheme()));
-    container.addChild(new DynamicBorder());
-    return componentPort(container);
+    return markdown;
 }

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

@@ -1,7 +1,9 @@
 import { ModelSelectorComponent, type SessionInfo, type SettingsCallbacks, type SettingsConfig } from "../startup-public.js";
 import type { OwnedUiDialog } from "../../../contracts/owned-ui/index.js";
+import { type ModelsDialogCallbacks, type ModelsDialogConfig } from "./models-dialog.js";
 import { type TrustDecision, type TrustOption, type TrustUpdate } from "./upstream/components/trust-selector.js";
 import { type PiShellComponentPort, type PiShellEditorOptions, type PiShellSelectorOption, type PiShellSelectorOptions } from "./shell-shared-facade.js";
+export { createPiShellSkillsSelector, type PiShellSkillsSelectorOptions } from "./skills-dialog.js";
 export declare function createPiShellSelector(options: PiShellSelectorOptions): PiShellComponentPort;
 export interface PiShellSettingsSelectorOptions {
     readonly config: SettingsConfig;
@@ -45,6 +47,15 @@ export interface PiShellScopedModelsSelectorPort extends PiShellComponentPort {
     setRefreshStatus(message: string, kind: "muted" | "success" | "warning"): void;
 }
 export declare function createPiShellScopedModelsSelector(options: PiShellScopedModelsSelectorOptions): PiShellScopedModelsSelectorPort;
+export interface PiShellModelsDialogOptions extends ModelsDialogConfig, ModelsDialogCallbacks {
+}
+export interface PiShellModelsDialogPort extends PiShellComponentPort {
+    updateModels(models: readonly PiShellScopedModelDescriptor[]): void;
+    setRefreshStatus(message: string, kind: "muted" | "success" | "warning"): void;
+    readonly dirty: () => boolean;
+}
+/** The bare-A1 unified Models dialog behind the owned component boundary; the pinned selectors above stay for `a1 pi`. */
+export declare function createPiShellModelsDialog(options: PiShellModelsDialogOptions): PiShellModelsDialogPort;
 export declare function createPiShellTrustSelector(options: {
     readonly cwd: string;
     readonly savedDecision: TrustDecision | null;
@@ -120,4 +131,3 @@ export declare function createPiShellDialog(dialog: OwnedUiDialog, handlers?: {
     readonly onSelect?: (id: string) => void;
     readonly onCancel?: () => void;
 }): PiShellComponentPort;
-export {};

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

@@ -5,9 +5,11 @@ import { SessionSelectorComponent, } from "./upstream/components/session-selecto
 import { TreeSelectorComponent, } from "./upstream/components/tree-selector.js";
 import { Box, Container, SelectList, Spacer, Text, } from "@earendil-works/pi-tui";
 import { ScopedModelsSelectorComponent, } from "./upstream/components/scoped-models-selector.js";
+import { ModelsDialogComponent, } from "./models-dialog.js";
 import { TrustSelectorComponent, } from "./upstream/components/trust-selector.js";
 import { PINNED_PI_LAYOUT, piTheme, } from "./theme.js";
 import { componentFromPort, componentPort, createTuiFacade, ensureTheme, isRecord, } from "./shell-shared-facade.js";
+export { createPiShellSkillsSelector } from "./skills-dialog.js";
 export function createPiShellSelector(options) {
     ensureTheme();
     const items = options.options.map(toSelectItem);
@@ -103,6 +105,17 @@ export function createPiShellScopedModelsSelector(options) {
         setRefreshStatus: (message, kind) => selector.setRefreshStatus(message, kind),
     };
 }
+/** The bare-A1 unified Models dialog behind the owned component boundary; the pinned selectors above stay for `a1 pi`. */
+export function createPiShellModelsDialog(options) {
+    ensureTheme();
+    const dialog = new ModelsDialogComponent(options, options);
+    return {
+        ...componentPort(dialog),
+        updateModels: models => dialog.updateModels(models),
+        setRefreshStatus: (message, kind) => dialog.setRefreshStatus(message, kind),
+        dirty: () => dialog.dirty,
+    };
+}
 export function createPiShellTrustSelector(options) {
     ensureTheme();
     return componentPort(new TrustSelectorComponent(options));

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

@@ -73,6 +73,8 @@ export interface PiShellAutocompleteCommand {
     readonly description?: string;
     readonly argumentHint?: string;
     readonly argumentOptions?: readonly PiShellSelectorOption[];
+    /** Built-in entries decorate the active profile's catalog; everything else is a discovered resource. */
+    readonly source?: "builtin" | "prompt" | "skill" | "extension";
 }
 export interface PiShellViewComponentPort extends PiShellComponentPort {
     update(view: OwnedUiSessionViewModel): void;
@@ -188,6 +190,12 @@ export interface PiShellEditorOptions {
     readonly cwd?: string;
     readonly agentDir?: string;
     readonly autocompleteCommands?: readonly PiShellAutocompleteCommand[];
+    /**
+     * Bare A1's skills presentation, read at every command-list installation. `collapse` replaces the
+     * `skill:<name>` entries with one `skills` command and its tunnel; absent or `expand` keeps the
+     * pinned per-skill entries. Comparison profiles ignore it.
+     */
+    readonly skillsPresentation?: () => "collapse" | "expand";
     readonly promptPresentation?: {
         readonly input: PiShellPromptInputPresentation;
         readonly styleSuggestion: (text: string) => string;

package/dist/integrations/pi/components/skills-command.d.ts

@@ -0,0 +1,47 @@
+import type { AutocompleteItem, AutocompleteProvider } from "@earendil-works/pi-tui";
+import type { PiShellAutocompleteCommand } from "./shell-shared-facade.js";
+/** The collapsed bare-A1 replacement for the per-skill command listing. */
+export declare const SKILLS_COMMAND_NAME = "skills";
+export declare const SKILLS_COMMAND_DESCRIPTION = "Browse, search, and apply a skill";
+/** Pi's own command prefix; the engine expands `/skill:<name>` regardless of how the menu presents it. */
+export declare const SKILL_COMMAND_PREFIX = "skill:";
+export interface PiShellSkillSummary {
+    readonly name: string;
+    readonly description: string;
+}
+export interface PiShellCollapsedSkillCommands {
+    readonly commands: readonly PiShellAutocompleteCommand[];
+    /** The skills withheld from the top-level menu, in the engine's discovery order. */
+    readonly skills: readonly PiShellSkillSummary[];
+}
+/** One line of description, as the v2 extension shows it beside a row. */
+export declare function oneLineSkillDescription(description: string): string;
+/** The skills the engine registered as `skill:<name>` commands, in its order. */
+export declare function skillsFromCommands(commands: readonly PiShellAutocompleteCommand[]): readonly PiShellSkillSummary[];
+/**
+ * Replace every `skill:<name>` entry with one `skills` command whose argument completions are the
+ * skill names. A list without skill entries (registration disabled, or no skills) is returned
+ * unchanged with no `skills` command, so the collapsed presentation never invents a command.
+ */
+export declare function collapseSkillCommands(commands: readonly PiShellAutocompleteCommand[]): PiShellCollapsedSkillCommands;
+/** Case-insensitive substring match on the name or description; a leading `skill:`/`skills:` in the query is ignored for the name. */
+export declare function skillMatchesQuery(skill: PiShellSkillSummary, query: string): boolean;
+/** Resolve a `/skills` argument token to a skill, accepting the name with or without `skill:`. */
+export declare function findSkillByArgument(skills: readonly PiShellSkillSummary[], token: string): PiShellSkillSummary | undefined;
+/** The `/skill:<name>` prompt the engine expands, with any arguments after one space. */
+export declare function skillPrompt(name: string, args?: string): string;
+/**
+ * Rewrite a submitted tunnel form `/skills:<name> rest` to `/skill:<name> rest`; anything else is
+ * returned unchanged so ordinary prompts, `/skills <name>`, and `/skill:` input keep their text.
+ */
+export declare function rewriteSkillsTunnelSubmission(text: string): string;
+/** The tunnel query when single-line content before the cursor is exactly `/skills:<query>`. */
+export declare function skillsTunnelQuery(lines: readonly string[], cursorLine: number, cursorCol: number): string | null;
+export declare function skillsTunnelItems(skills: readonly PiShellSkillSummary[], query: string): AutocompleteItem[];
+/**
+ * Wrap the pinned combined provider with the `skills` tunnel: `/skills:<query>` lists matching
+ * skills as `skills:<name>` rows and shows nothing when none match; every other request, the
+ * completion application, and the file-completion decision are delegated unchanged so extension
+ * wrappers registered over this provider see one ordinary provider.
+ */
+export declare function createSkillsTunnelProvider(base: AutocompleteProvider, skills: readonly PiShellSkillSummary[]): AutocompleteProvider;