@timurproko/a1 0.2.7-dev.1270 → 0.2.7-dev.1276

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

@@ -19,6 +19,17 @@ function renderOwnedAutocompleteSelection(text) {
     const description = row === null ? "" : theme.fg("muted", row[2]);
     return renderPiListSelection(arrow + label + description);
 }
+/** Models and thinking share the active declarations, independent of input presentation. */
+function bindModelActions(editor, options) {
+    if (options.onModelSelect !== undefined)
+        editor.onAction("app.model.select", options.onModelSelect);
+    if (options.onModelCycle !== undefined) {
+        editor.onAction("app.model.cycleForward", () => options.onModelCycle?.("forward"));
+        editor.onAction("app.model.cycleBackward", () => options.onModelCycle?.("backward"));
+    }
+    if (options.onThinkingCycle !== undefined)
+        editor.onAction("app.thinking.cycle", options.onThinkingCycle);
+}
 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" };
@@ -52,8 +63,10 @@ export const OWNED_BUILTIN_SLASH_COMMANDS = PINNED_PI_BUILTIN_SLASH_COMMANDS.fla
     if (command.name === "model") {
         return [{ name: "models", description: "Switch models and manage scoped model cycling" }, OWNED_THINKING_SLASH_COMMAND];
     }
-    if (command.name === "thinking" || command.name === "scoped-models")
+    if (command.name === "thinking" || command.name === "scoped-models" || command.name === "settings" || command.name === "changelog" || command.name === "hotkeys")
         return [];
+    if (command.name === "export")
+        return [{ ...command, description: "Export session to user storage (--jsonl or an explicit path)" }];
     if (command.name === "login")
         return [OWNED_LOGIN_SLASH_COMMAND];
     return [command];
@@ -179,14 +192,7 @@ export function createPiShellEditor(options) {
     }
     if (options.onExtensionShortcut !== undefined)
         editor.onExtensionShortcut = options.onExtensionShortcut;
-    if (options.onModelSelect !== undefined)
-        editor.onAction("app.model.select", options.onModelSelect);
-    if (options.onModelCycle !== undefined) {
-        editor.onAction("app.model.cycleForward", () => options.onModelCycle?.("forward"));
-        editor.onAction("app.model.cycleBackward", () => options.onModelCycle?.("backward"));
-    }
-    if (options.onThinkingCycle !== undefined)
-        editor.onAction("app.thinking.cycle", options.onThinkingCycle);
+    bindModelActions(editor, options);
     if (options.onThinkingToggle !== undefined)
         editor.onAction("app.thinking.toggle", options.onThinkingToggle);
     if (options.onToolsExpand !== undefined)
@@ -230,6 +236,7 @@ export function createPiShellEditor(options) {
         },
         activateKeybindings: () => host.ensureActive(),
         keybindingConfig: () => keybindings.getEffectiveConfig(),
+        matchesAction: (data, action) => keybindings.matches(data, action),
         reloadKeybindings: () => host.reload(),
         matchesTerminalKey: (data, key) => matchesKey(data, key),
         handleInput: data => {
@@ -348,12 +355,11 @@ function autocompleteCommandSetter(options, editor, state, enabled) {
         state.skills = collapsed.skills;
         const additions = new Map(collapsed.commands.map(command => [command.name, command]));
         const builtInNames = new Set(builtInCatalog.map(command => command.name));
-        const builtIns = builtInCatalog.flatMap(command => [
-            autocompleteCommand(command, additions.get(command.name)),
-            // Rationale: the collapsed browser is a primary bare-A1 command, not a resource after quit.
-            ...(command.name === "settings" && collapsed.collapsedCommand !== undefined
-                ? [autocompleteCommand(collapsed.collapsedCommand)] : []),
-        ]);
+        // Rationale: Skills is a primary command, independent of retired application commands.
+        const builtIns = [
+            ...(collapsed.collapsedCommand === undefined ? [] : [autocompleteCommand(collapsed.collapsedCommand)]),
+            ...builtInCatalog.map(command => autocompleteCommand(command, additions.get(command.name))),
+        ];
         const resources = collapsed.commands
             .filter(command => command.name !== collapsed.collapsedCommand?.name && command.source !== "builtin" && !builtInNames.has(command.name))
             .map(command => autocompleteCommand(command));

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

@@ -301,8 +301,9 @@ function expandedHeaderText(bindings) {
         rawKeyHint(process.platform === "win32" ? "" : "ctrl+z", "to suspend"),
         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"),
-        // Invariant: only bare A1 supplies live bindings, and its unbound fallback is the unified `/models` command.
+        rawKeyHint(keys === undefined ? "ctrl+p/shift+ctrl+p" : [...keys.getKeys("app.model.cycleForward"), ...keys.getKeys("app.model.cycleBackward")].join("/") || "unbound", "to cycle models"),
+        ...(keys === undefined ? [] : [rawKeyHint(keys.getKeys("owned.apps.open").join("/") || "unbound", "to open Launcher")]),
+        // Invariant: only bare A1 supplies live bindings; unbound selection remains reachable through `/models`.
         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"),

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

@@ -180,7 +180,7 @@ export function hotkeysMarkdown(bindings, getShortcuts, profile) {
             ? 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"], 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 selection or last assistant message"), row(["app.message.followUp"], "Queue follow-up message"), row(["app.message.dequeue"], "Restore queued messages"), row(["app.clipboard.pasteImage"], profile === "a1" ? "Paste image or text from clipboard" : "Paste files on macOS, images, 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");
+    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 in-place Models selector (`/models`)" : "Open model selector"), ...(profile === "a1" ? [row(["owned.apps.open"], "Open Launcher (Agent, Settings, Changelog, Hotkeys)")] : []), 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 selection or last assistant message"), row(["app.message.followUp"], "Queue follow-up message"), row(["app.message.dequeue"], "Restore queued messages"), row(["app.clipboard.pasteImage"], profile === "a1" ? "Paste image or text from clipboard" : "Paste files on macOS, images, or text from clipboard"), "| `/` | Slash commands |", "| `!` | Run bash command |", "| `!!` | Run bash command (excluded from context) |", ...(profile === "a1" ? ["", "Legacy Ctrl+M that is indistinguishable from Enter keeps Enter behavior; use `/models` to select a model.", "", "**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";

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

@@ -206,7 +206,9 @@ function transcriptComponent(block, cwd, expanded, extensions, submittedPrompt,
                 summary: block.text,
                 tokensBefore: numericPayload(block, "tokensBefore"),
                 timestamp: numericPayload(block, "timestamp") || 0,
-            }, getPiMarkdownTheme());
+            }, getPiMarkdownTheme(), outputPad, [
+                createMermaidMarkdownTransformer({ getMode: () => mermaidRenderingMode, theme: piTheme() }),
+            ], block.id);
             component.setExpanded(expanded);
             return component;
         }

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

@@ -1,10 +1,11 @@
 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 { ModelsDialogCallbacks, ModelsDialogConfig } from "./models-dialog.js";
+import type { TrustDecision, TrustOption, 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 { createPiShellSkillsSelector } from "./deferred-selector.js";
+export type { PiShellSkillsSelectorOptions } from "./skills-dialog.js";
+export declare function createPiShellSelector(options: PiShellSelectorOptions, standard?: boolean): PiShellComponentPort;
 export interface PiShellSettingsSelectorOptions {
     readonly config: SettingsConfig;
     readonly onChange: (callback: keyof SettingsCallbacks, value: unknown) => void;
@@ -13,6 +14,7 @@ export interface PiShellSettingsSelectorOptions {
 export declare function createPiShellSettingsSelector(options: PiShellSettingsSelectorOptions): PiShellComponentPort;
 type PiModelSelectorArguments = ConstructorParameters<typeof ModelSelectorComponent>;
 export interface PiShellModelSelectorOptions {
+    readonly standardStyle?: boolean;
     readonly currentModel: unknown;
     readonly modelRuntime: unknown;
     readonly scopedModels: readonly unknown[];
@@ -50,6 +52,7 @@ export declare function createPiShellScopedModelsSelector(options: PiShellScoped
 export interface PiShellModelsDialogOptions extends ModelsDialogConfig, ModelsDialogCallbacks {
 }
 export interface PiShellModelsDialogPort extends PiShellComponentPort {
+    readonly ready?: Promise<void>;
     updateModels(models: readonly PiShellScopedModelDescriptor[]): void;
     setRefreshStatus(message: string, kind: "muted" | "success" | "warning"): void;
     readonly dirty: () => boolean;
@@ -57,6 +60,7 @@ export interface PiShellModelsDialogPort extends PiShellComponentPort {
 /** 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 standardStyle?: boolean;
     readonly cwd: string;
     readonly savedDecision: TrustDecision | null;
     readonly projectTrusted: boolean;
@@ -90,7 +94,7 @@ export declare function createPiShellTreeSelector(options: {
     readonly initialSelectedId?: string;
     readonly initialFilterMode?: "default" | "no-tools" | "user-only" | "labeled-only" | "all";
 }): Promise<PiShellComponentPort>;
-export declare function createPiShellUserMessageSelector(messages: readonly PiShellSelectorOption[], onSelect: (id: string) => void, onCancel: () => void, initialSelectedId?: string): PiShellComponentPort;
+export declare function createPiShellUserMessageSelector(messages: readonly PiShellSelectorOption[], onSelect: (id: string) => void, onCancel: () => void, initialSelectedId?: string, standard?: boolean): PiShellComponentPort;
 export interface PiShellLoginDialogPort extends PiShellComponentPort {
     showAuth(url: string, instructions?: string): void;
     showDeviceCode(info: {
@@ -107,7 +111,7 @@ export interface PiShellLoginDialogPort extends PiShellComponentPort {
     showWaiting(message: string): void;
     showProgress(message: string): void;
 }
-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 createPiShellLoginDialog(runtime: Pick<PiShellEditorOptions, "getColumns" | "getRows" | "requestRender">, providerId: string, onComplete: (success: boolean, message?: string) => void, providerName?: string, title?: string, standard?: boolean): PiShellLoginDialogPort;
 export declare function createPiShellArmin(runtime: Pick<PiShellEditorOptions, "getColumns" | "getRows" | "requestRender">): PiShellComponentPort;
 export declare function createPiShellEarendilAnnouncement(): PiShellComponentPort;
 export declare function createPiShellReloadBox(): PiShellComponentPort;
@@ -119,11 +123,11 @@ export interface PiShellAuthProviderOption extends PiShellSelectorOption {
         readonly source?: string;
     };
 }
-export declare function createPiShellAuthProviderSelector(mode: "login" | "logout", providers: readonly PiShellAuthProviderOption[], onSelect: (id: string) => void, onCancel: () => void, initialSearchInput?: string): PiShellComponentPort;
-export declare function createPiShellExtensionSelector(title: string, options: readonly string[], onSelect: (value: string) => void, onCancel: () => void): PiShellComponentPort;
+export declare function createPiShellAuthProviderSelector(mode: "login" | "logout", providers: readonly PiShellAuthProviderOption[], onSelect: (id: string) => void, onCancel: () => void, initialSearchInput?: string, standardStyle?: boolean): PiShellComponentPort;
+export declare function createPiShellExtensionSelector(title: string, options: readonly string[], onSelect: (value: string) => void, onCancel: () => void, standardSelection?: boolean): PiShellComponentPort;
 export declare function createPiShellThemeSelector(currentTheme: string, onSelect: (theme: string) => void, onCancel: () => void, onPreview: (theme: string) => void): PiShellComponentPort;
 export declare function createPiShellShowImagesSelector(currentValue: boolean, onSelect: (show: boolean) => void, onCancel: () => void): PiShellComponentPort;
 export declare function createPiShellDialog(dialog: OwnedUiDialog, handlers?: {
     readonly onSelect?: (id: string) => void;
     readonly onCancel?: () => void;
-}): PiShellComponentPort;
+}, standard?: boolean): PiShellComponentPort;

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

@@ -3,13 +3,14 @@ import { EarendilAnnouncementComponent } from "./upstream/components/earendil-an
 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 { addPiModalSelectFooter, adoptPiModalFrame, adoptPiModalHeader, adoptPiModalSearchInput } 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, getPiSelectListTheme, paintPiBorder, piTheme, renderPiModalShortcutHints, } from "./theme.js";
+import { addPiModalSelectFooter, adoptPiModalFrame, adoptPiModalHeader, adoptPiModalSearchInput, renderPiModalSelectedPrimary, standardInternalChoicePort } from "./modal-frame.js";
+import { deferredLoginDialog } from "./login-dialog-loader.js";
+import { deferredSelector } from "./deferred-selector.js";
+import { createDeferredModelsDialog } from "./models-dialog-loader.js";
+import { canonicalizePiSettingsHint, DIALOG_CLOSE_SHORTCUT_HINT, PINNED_PI_LAYOUT, getPiSelectListTheme, paintPiBorder, piTheme, renderPiModalShortcutHints, internalDialogTitle, } from "./theme.js";
 import { componentFromPort, componentPort, createTuiFacade, ensureTheme, isRecord, } from "./shell-shared-facade.js";
-export { createPiShellSkillsSelector } from "./skills-dialog.js";
-export function createPiShellSelector(options) {
+export { createPiShellSkillsSelector } from "./deferred-selector.js";
+export function createPiShellSelector(options, standard = false) {
     ensureTheme();
     const items = options.options.map(toSelectItem);
     const list = new SelectList(items, options.maxVisible ?? Math.min(PINNED_PI_LAYOUT.selectorMaxVisible, Math.max(1, items.length)), getPiSelectListTheme());
@@ -17,11 +18,11 @@ export function createPiShellSelector(options) {
         list.onSelect = item => options.onSelect?.(item.value);
     if (options.onCancel !== undefined)
         list.onCancel = options.onCancel;
-    if (!options.title && options.onCancel === undefined)
+    if (!options.title && options.onCancel === undefined && !standard)
         return componentPort(list);
     const container = new Container();
     if (options.title)
-        container.addChild(new Text(piTheme().fg("accent", piTheme().bold(options.title)), PINNED_PI_LAYOUT.contentPaddingX, 0));
+        container.addChild(new Text(piTheme().fg("accent", piTheme().bold(standard ? internalDialogTitle(options.title) : options.title)), PINNED_PI_LAYOUT.contentPaddingX, 0));
     container.addChild(list);
     if (options.onCancel !== undefined) {
         container.addChild(new Spacer(1));
@@ -31,7 +32,8 @@ export function createPiShellSelector(options) {
             DIALOG_CLOSE_SHORTCUT_HINT,
         ]), 0, 0));
     }
-    return componentPort(container, data => list.handleInput(data));
+    const port = componentPort(container, data => list.handleInput(data));
+    return standard ? { ...port, render: width => port.render(width).map(row => renderPiModalSelectedPrimary(` ${row}`, width + 1, options.options.map(option => option.label)).slice(1)) } : port;
 }
 export function createPiShellSettingsSelector(options) {
     ensureTheme();
@@ -98,7 +100,8 @@ export function createPiShellModelSelector(options) {
     const selector = new ModelSelectorComponent(createTuiFacade(options.runtime), options.currentModel, options.modelRuntime, options.scopedModels, options.onSelect, options.onCancel, options.initialSearchInput, options.onSelectAsDefault, options.defaultModel);
     adoptPiModalSearchInput(selector, selector.getSearchInput());
     adoptPiModalFrame(selector, { topIndex: 0, bottomIndex: selector.children.length - 1 });
-    return componentPort(selector);
+    const port = componentPort(selector);
+    return options.standardStyle ? standardInternalChoicePort(port, true) : port;
 }
 function toPiScopedModel(model) {
     const candidate = { provider: model.provider, id: model.id, name: model.name };
@@ -133,17 +136,12 @@ export function createPiShellScopedModelsSelector(options) {
 /** 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,
-    };
+    return createDeferredModelsDialog(options);
 }
 export function createPiShellTrustSelector(options) {
     ensureTheme();
-    return componentPort(new TrustSelectorComponent(options));
+    return deferredSelector(() => import("./upstream/components/trust-selector.js")
+        .then(({ TrustSelectorComponent }) => componentPort(new TrustSelectorComponent(options))), options.onCancel);
 }
 export async function createPiShellSessionSelector(options) {
     ensureTheme();
@@ -159,21 +157,26 @@ export async function createPiShellTreeSelector(options) {
         selector.onCopy = options.onCopy;
     return componentPort(selector);
 }
-export function createPiShellUserMessageSelector(messages, onSelect, onCancel, initialSelectedId) {
+export function createPiShellUserMessageSelector(messages, onSelect, onCancel, initialSelectedId, standard = false) {
     ensureTheme();
     const selector = new UserMessageSelectorComponent(messages.map(message => ({ id: message.id, text: message.label })), onSelect, onCancel, initialSelectedId);
     const list = selector.getMessageList();
+    if (standard)
+        selector.children[1] = new Text(piTheme().fg("accent", piTheme().bold("Fork from Message")), 1, 0);
     addPiModalSelectFooter(selector);
     adoptPiModalFrame(selector, { topIndex: 4, bottomIndex: selector.children.length - 1 });
-    return componentPort(selector, data => list.handleInput(data));
+    const port = componentPort(selector, data => list.handleInput(data));
+    return standard ? standardInternalChoicePort(port) : port;
 }
-export function createPiShellLoginDialog(runtime, providerId, onComplete, providerName, title) {
+export function createPiShellLoginDialog(runtime, providerId, onComplete, providerName, title, standard = false) {
     ensureTheme();
+    if (standard)
+        return deferredLoginDialog(runtime, providerId, onComplete, providerName, title);
     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 stripHint = (result) => { content.children.pop(); return result; };
     const header = adoptPiModalHeader(dialog, 0, 1);
     adoptPiModalFrame(dialog, {
         topIndex: 0,
@@ -185,23 +188,12 @@ export function createPiShellLoginDialog(runtime, providerId, onComplete, provid
         ...componentPort(dialog),
         showAuth: (url, instructions) => dialog.showAuth(url, instructions),
         showDeviceCode: info => dialog.showDeviceCode(info),
-        showManualInput(message) {
-            const result = dialog.showManualInput(message);
-            removeDependencyHint();
-            return result;
-        },
-        showPrompt(message, placeholder) {
-            const result = dialog.showPrompt(message, placeholder);
-            removeDependencyHint();
-            return result;
-        },
+        showManualInput: message => stripHint(dialog.showManualInput(message)),
+        showPrompt: (message, placeholder) => stripHint(dialog.showPrompt(message, placeholder)),
         showDetails: lines => dialog.showDetails([...lines]),
-        // Rationale: The persistent canonical footer replaces the dependency's optional close hint.
+        // Rationale: one footer replaces optional hints.
         showInfo: (message, links = []) => dialog.showInfo(message, [...links], false),
-        showWaiting(message) {
-            dialog.showWaiting(message);
-            removeDependencyHint();
-        },
+        showWaiting: message => stripHint(dialog.showWaiting(message)),
         showProgress: message => dialog.showProgress(message),
     };
 }
@@ -224,8 +216,11 @@ export function createPiShellReloadBox() {
     adoptPiModalFrame(container, { topIndex: 0, bottomIndex: container.children.length - 1 });
     return componentPort(container);
 }
-export function createPiShellAuthProviderSelector(mode, providers, onSelect, onCancel, initialSearchInput) {
+export function createPiShellAuthProviderSelector(mode, providers, onSelect, onCancel, initialSearchInput, standardStyle = false) {
     ensureTheme();
+    if (standardStyle)
+        return deferredSelector(() => import("./upstream/components/oauth-selector.js")
+            .then(({ AuthProviderSelector }) => componentPort(new AuthProviderSelector(mode, providers, onSelect, onCancel, initialSearchInput))), onCancel);
     const selector = new OAuthSelectorComponent(mode, providers.map(provider => ({
         id: provider.providerId,
         name: provider.label,
@@ -236,7 +231,7 @@ export function createPiShellAuthProviderSelector(mode, providers, onSelect, onC
         if (selected)
             onSelect(selected.id);
     }, onCancel, initialSearchInput);
-    // Provenance: OAuth selector slot is top rule, spacer, title, spacer, then its search Input.
+    // Provenance: public search slot 4.
     adoptPiModalSearchInput(selector, selector.children[4]);
     addPiModalSelectFooter(selector);
     const preInsetContent = [selector.children[2], selector.children[6]];
@@ -249,9 +244,9 @@ export function createPiShellAuthProviderSelector(mode, providers, onSelect, onC
     });
     return componentPort(selector);
 }
-export function createPiShellExtensionSelector(title, options, onSelect, onCancel) {
+export function createPiShellExtensionSelector(title, options, onSelect, onCancel, standardSelection = false) {
     ensureTheme();
-    return componentPort(new ExtensionSelectorComponent(title, [...options], onSelect, onCancel));
+    return componentPort(new ExtensionSelectorComponent(standardSelection ? internalDialogTitle(title) : title, [...options], onSelect, onCancel, { standardSelection }));
 }
 export function createPiShellThemeSelector(currentTheme, onSelect, onCancel, onPreview) {
     ensureTheme();
@@ -269,7 +264,7 @@ export function createPiShellShowImagesSelector(currentValue, onSelect, onCancel
     adoptPiModalFrame(selector, { topIndex: 0, bottomIndex: selector.children.length - 1 });
     return componentPort(selector, data => list.handleInput(data));
 }
-export function createPiShellDialog(dialog, handlers = {}) {
+export function createPiShellDialog(dialog, handlers = {}, standard = false) {
     ensureTheme();
     const selector = createPiShellSelector({
         title: dialog.title,
@@ -277,7 +272,7 @@ export function createPiShellDialog(dialog, handlers = {}) {
         maxVisible: 8,
         ...(handlers.onSelect === undefined ? {} : { onSelect: handlers.onSelect }),
         ...(handlers.onCancel === undefined ? {} : { onCancel: handlers.onCancel }),
-    });
+    }, standard);
     const box = new Box(1, 1);
     box.addChild(componentFromPort(selector));
     return componentPort(box, data => selector.handleInput?.(data));

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

@@ -6,6 +6,6 @@ interface PiShellSessionInfoReferenceDocument {
         readonly rows: readonly string[];
     }[];
 }
-/** Renders the pinned report values while leaving group names semantic for the owned screen. */
+/** Renders complete report data in semantic rows sharing a left-aligned value column. */
 export declare function renderPiShellSessionInfoReferenceDocument(presentation: PiShellSessionInfoPresentation, width: number): PiShellSessionInfoReferenceDocument;
 export {};

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

@@ -14,7 +14,7 @@ function splitSessionFile(sessionFile, firstWidth, continuationWidth) {
             rowWidth = continuationWidth;
             continue;
         }
-        // Compatibility: a one-column frame cannot fit a wide grapheme; preserve it for outer truncation.
+        // Compatibility: preserve a wide grapheme even when the outer frame cannot fit it.
         if (!row)
             row = sliceByColumn(remaining, 0, rowWidth);
         rows.push(row);
@@ -23,72 +23,75 @@ function splitSessionFile(sessionFile, firstWidth, 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. */
+/** Renders complete report data in semantic rows sharing a left-aligned value column. */
 export function renderPiShellSessionInfoReferenceDocument(presentation, width) {
     ensureTheme();
     const { stats, sessionName, cacheWaste, usageBreakdown, cacheWarming } = presentation;
-    const render = (rows) => new Text(rows.join("\n"), 1, 0).render(width);
-    const preamble = [
-        ...(sessionName ? [`${piTheme().fg("dim", "Name:")} ${sessionName}`] : []),
-        ...sessionFileRows(stats.sessionFile ?? "In-memory", width),
-        `${piTheme().fg("dim", "ID:")} ${stats.sessionId}`,
+    const identity = [
+        ...(sessionName ? [{ label: "Name:", value: sessionName }] : []),
+        { label: "File:", value: stats.sessionFile ?? "In-memory" },
+        { label: "ID:", value: stats.sessionId },
     ];
     const messages = [
-        `${piTheme().fg("dim", "Total:")} ${stats.totalMessages}`,
-        `${piTheme().fg("dim", "User:")} ${stats.userMessages}`,
-        `${piTheme().fg("dim", "Assistant:")} ${stats.assistantMessages}`,
-        `${piTheme().fg("dim", "Tools:")} ${stats.toolCalls} calls, ${stats.toolResults} results`,
+        { label: "Total:", value: String(stats.totalMessages) },
+        { label: "User:", value: String(stats.userMessages) },
+        { label: "Assistant:", value: String(stats.assistantMessages) },
+        { label: "Tools:", value: `${stats.toolCalls} calls, ${stats.toolResults} results` },
     ];
     const { input, cacheRead, cacheWrite } = stats.tokens;
     const promptTokens = input + cacheRead + cacheWrite;
-    const tokens = [`${piTheme().fg("dim", "Input:")} ${promptTokens.toLocaleString()}`];
+    const tokens = [{ label: "Input:", value: promptTokens.toLocaleString() }];
     if (promptTokens > 0 && (cacheRead > 0 || cacheWrite > 0)) {
-        tokens.push(`  ${piTheme().fg("dim", "Cached:")} ${cacheRead.toLocaleString()} ${piTheme().fg("dim", `(${((cacheRead / promptTokens) * 100).toFixed(1)}%)`)}`);
+        tokens.push({ label: "Cached:", indent: 2, value: `${cacheRead.toLocaleString()} ${piTheme().fg("dim", `(${((cacheRead / promptTokens) * 100).toFixed(1)}%)`)}` });
         const written = cacheWrite > 0 ? ` ${piTheme().fg("dim", `(${cacheWrite.toLocaleString()} written to cache)`)}` : "";
-        tokens.push(`  ${piTheme().fg("dim", "Uncached:")} ${(input + cacheWrite).toLocaleString()}${written}`);
+        tokens.push({ label: "Uncached:", indent: 2, value: `${(input + cacheWrite).toLocaleString()}${written}` });
     }
-    tokens.push(`${piTheme().fg("dim", "Output:")} ${stats.tokens.output.toLocaleString()}`);
-    tokens.push(`${piTheme().fg("dim", "Total:")} ${stats.tokens.total.toLocaleString()}`);
+    tokens.push({ label: "Output:", value: stats.tokens.output.toLocaleString() });
+    tokens.push({ label: "Total:", value: stats.tokens.total.toLocaleString() });
     const warmingStatus = cacheWarming.status;
     const warming = [
-        `${piTheme().fg("dim", "Mode:")} ${cacheWarming.mode}`,
-        `${piTheme().fg("dim", "Status:")} ${warmingStatus ? formatCacheWarmingStatus(warmingStatus) : "Inactive (cache warming unavailable)"}`,
+        { label: "Mode:", value: cacheWarming.mode },
+        { label: "Status:", value: warmingStatus ? formatCacheWarmingStatus(warmingStatus) : "Inactive (cache warming unavailable)" },
     ];
-    const warmingDecision = warmingStatus?.decision;
-    if (warmingDecision?.economicsAvailable) {
-        warming.push(`${piTheme().fg("dim", "Cache miss penalty:")} $${warmingDecision.missCost.toFixed(3)}`);
-        warming.push(`${piTheme().fg("dim", "Refresh cost:")} $${warmingDecision.warmCost.toFixed(3)}`);
+    const decision = warmingStatus?.decision;
+    if (decision?.economicsAvailable) {
+        warming.push({ label: "Cache miss penalty:", value: `$${decision.missCost.toFixed(3)}` });
+        warming.push({ label: "Refresh cost:", value: `$${decision.warmCost.toFixed(3)}` });
     }
-    const sections = [
-        { title: "Messages", rows: render(messages) },
-        { title: "Tokens", rows: render(tokens) },
-        { title: "Cache Warming", rows: render(warming) },
-    ];
+    const groups = [{ title: "Messages", rows: messages }, { title: "Tokens", rows: tokens }, { title: "Cache Warming", rows: warming }];
     if (stats.cost > 0 || cacheWaste.missedTokens > 0) {
-        const cost = [`${piTheme().fg("dim", "Total:")} $${stats.cost.toFixed(3)}`];
+        const cost = [{ label: "Total:", value: `$${stats.cost.toFixed(3)}` }];
         if (usageBreakdown.length > 1)
             for (const entry of usageBreakdown) {
-                cost.push(`  ${piTheme().fg("dim", `${entry.key}:`)} $${entry.cost.toFixed(3)} ${piTheme().fg("dim", `(${formatSessionTokens(entry.tokens)} tokens)`)}`);
+                cost.push({ label: `${entry.key}:`, indent: 2, value: `$${entry.cost.toFixed(3)} ${piTheme().fg("dim", `(${formatSessionTokens(entry.tokens)} tokens)`)}` });
             }
         if (cacheWaste.missedTokens > 0) {
             const detail = `${cacheWaste.missedTokens.toLocaleString()} tokens, ${cacheWaste.missCount === 1 ? "1 miss" : `${cacheWaste.missCount} misses`}`;
-            cost.push(cacheWaste.missedCost >= 0.0001
-                ? `${piTheme().fg("dim", "Cache Re-billed:")} $${cacheWaste.missedCost.toFixed(3)} ${piTheme().fg("dim", `(${detail})`)}`
-                : `${piTheme().fg("dim", "Cache Re-billed:")} ${detail}`);
+            cost.push({ label: "Cache Re-billed:", value: cacheWaste.missedCost >= 0.0001
+                    ? `$${cacheWaste.missedCost.toFixed(3)} ${piTheme().fg("dim", `(${detail})`)}` : detail });
+        }
+        groups.push({ title: "Cost", rows: cost });
+    }
+    // Compatibility: match Text's reduced-padding rule so explicit path breaks survive rendering.
+    const padding = Math.min(1, Math.max(0, Math.floor((width - 1) / 2)));
+    const contentWidth = Math.max(1, width - padding * 2);
+    const allRows = [...identity, ...groups.flatMap(group => group.rows)];
+    const column = Math.min(Math.max(...allRows.map(row => (row.indent ?? 0) + visibleWidth(row.label))) + 1, contentWidth - 1);
+    const prefix = (row) => `${" ".repeat(row.indent ?? 0)}${piTheme().fg("dim", row.label)}${" ".repeat(Math.max(1, column - (row.indent ?? 0) - visibleWidth(row.label)))}`;
+    const render = (rows) => new Text(rows.map(row => `${prefix(row)}${row.value}`).join("\n"), 1, 0).render(width);
+    const preamble = [];
+    for (const row of identity) {
+        if (row.label !== "File:") {
+            preamble.push(`${prefix(row)}${row.value}`);
+            continue;
         }
-        sections.push({ title: "Cost", rows: render(cost) });
+        const label = prefix(row);
+        const firstWidth = Math.max(0, contentWidth - visibleWidth(label));
+        const [first = "", ...continuation] = splitSessionFile(row.value, firstWidth, contentWidth);
+        preamble.push(firstWidth > 0 ? `${label}${first}` : piTheme().fg("dim", row.label), ...continuation);
     }
-    return { preamble: render(preamble), sections };
+    return {
+        preamble: new Text(preamble.join("\n"), 1, 0).render(width),
+        sections: groups.map(group => ({ title: group.title, rows: render(group.rows) })),
+    };
 }

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

@@ -2,6 +2,8 @@ import { DIALOG_CLOSE_SHORTCUT_HINT, displayShortcutKeyLabel, type SemanticShort
 import { type MarkdownTheme, type SelectListTheme } from "@earendil-works/pi-tui";
 export { PINNED_PI_LAYOUT, applyPiTheme, applyPiThemeInstance, currentPiThemeName, ensurePiTheme, getAvailablePiThemes, loadPiTheme, piCanvasBackgroundAnsi, piTheme, setPiAccentColor, setPiPackageBorderProjectionEnabled, } from "./upstream/theme/theme.js";
 type Paint = (text: string) => string;
+/** The owned floating-panel background in the live terminal color capability. */
+export declare function paintPiFloatingDialog(text: string): string;
 /** The live Pi theme in neutral roles; `panel` and `disabled` default to plain and dim. */
 export declare function piUiTheme(options?: {
     readonly panel?: Paint;
@@ -18,6 +20,8 @@ export declare function getPiMarkdownTheme(): MarkdownTheme;
 export declare function getPiHotkeysMarkdownTheme(): MarkdownTheme;
 /** Select-list roles resolved through A1's active theme rather than Pi's package-global base theme. */
 export declare function getPiSelectListTheme(): SelectListTheme;
+/** Display casing for internal headings, preserving provider spelling and acronyms. */
+export declare function internalDialogTitle(title: string): string;
 /** 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. */

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

@@ -1,8 +1,13 @@
 import { DIALOG_CLOSE_SHORTCUT_HINT, displayShortcutKeyLabel, renderSemanticShortcutHints, } from "../../../contracts/presentation/index.js";
+import { renderFloatingDialogSurface } from "../../../ui/components/spans.js";
 import { stripTerminalSequences, truncateToWidth } from "@earendil-works/pi-tui";
 import { getMarkdownTheme } from "../startup-public.js";
 import { onPiThemeChange, piTheme, renderPiAccentPreview } from "./upstream/theme/theme.js";
 export { PINNED_PI_LAYOUT, applyPiTheme, applyPiThemeInstance, currentPiThemeName, ensurePiTheme, getAvailablePiThemes, loadPiTheme, piCanvasBackgroundAnsi, piTheme, setPiAccentColor, setPiPackageBorderProjectionEnabled, } from "./upstream/theme/theme.js";
+/** The owned floating-panel background in the live terminal color capability. */
+export function paintPiFloatingDialog(text) {
+    return renderFloatingDialogSurface(text, piTheme().getColorMode());
+}
 /** The live Pi theme in neutral roles; `panel` and `disabled` default to plain and dim. */
 export function piUiTheme(options = {}) {
     return {
@@ -48,6 +53,10 @@ export function getPiSelectListTheme() {
         noMatch: text => piTheme().fg("muted", text),
     };
 }
+/** Display casing for internal headings, preserving provider spelling and acronyms. */
+export function internalDialogTitle(title) {
+    return title.replace(/:\s*$/u, "").replace(/\b[a-z][a-z]*/gu, (word, offset) => offset > 0 && /^(a|an|and|for|in|of|on|or|the|to|with)$/u.test(word) ? word : word[0].toUpperCase() + word.slice(1));
+}
 /** Paint one selected bare-A1 list item with the standard blue selection surface. */
 export function renderPiListSelection(content) {
     return piTheme().bg("selectedBg", content);

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

@@ -1,16 +1,17 @@
 /**
- * Provenance: @earendil-works/pi-coding-agent 1.5.0 (MIT), commit f9a26365568127461c47a07a37dcb42c140a3ac5,
+ * Provenance: @earendil-works/pi-coding-agent 1.5.1 (MIT), commit dd30101cfc5b0609411dd80b6f93adbc14db14cf,
  * 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, 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,
+ * resolution, and an opt-in bare-A1 input profile including Ctrl+L level cycling, Ctrl+M model cycling
+ * with ordinary Enter preserved, Ctrl+P Launcher, command-only model 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-apps-shortcuts,
  * 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 {
+    "owned.apps.open": true;
     "app.interrupt": true;
     "app.clear": true;
     "app.exit": true;
@@ -153,7 +154,7 @@ export declare const KEYBINDINGS: {
         readonly description: "Restore queued messages";
     };
     readonly "app.clipboard.pasteImage": {
-        readonly defaultKeys: "ctrl+v" | "alt+v";
+        readonly defaultKeys: "ctrl+v" | ("ctrl+v" | "alt+v")[];
         readonly description: "Paste files on macOS, images, or text from clipboard";
     };
     readonly "app.session.new": {