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

package/README.md

@@ -59,6 +59,12 @@ Launch A1, one agent in this terminal (profile: `~/.a1/agent`):
 a1
 ```
 
+In A1, **Ctrl+P** opens the searchable **Launcher**: Agent, Settings, Changelog, and Hotkeys. You can switch from any of those screens; returning to Agent keeps the current session and draft. Settings, Changelog, and Hotkeys are applications rather than Agent slash commands.
+
+**Ctrl+M** cycles to the next model: all available models when no scope is set, or only available scoped models when a scope exists. **`/models`** opens the in-place Models selector to select a model or manage that scope. **Ctrl+L** cycles thinking levels, and **Alt+Up** restores queued messages. In legacy terminals that encode Ctrl+M as Enter, ordinary Enter still sends the prompt; use `/models` to select a model instead. Explicit keybinding overrides remain supported. Successful model changes update the status bar without an extra success message; errors and warnings remain visible.
+
+Session exports without an explicit destination are saved in **`~/.a1/exports/`**, outside disposable worktrees. Use `/export` for HTML or `/export --jsonl` for JSONL; explicit destinations retain their existing meaning. See [session exports](docs/features/session-exports.md).
+
 Resume a saved session:
 
 ```text

package/dist/app/session-shell/apps-dialog.d.ts

@@ -0,0 +1,33 @@
+import { type TerminalComponentPort } from "../../contracts/presentation/index.js";
+import { type UiTheme } from "../../ui/components/index.js";
+declare const APPS: readonly [{
+    readonly id: "agent";
+    readonly label: "Agent";
+}, {
+    readonly id: "settings";
+    readonly label: "Settings";
+}, {
+    readonly id: "changelog";
+    readonly label: "Changelog";
+}, {
+    readonly id: "hotkeys";
+    readonly label: "Hotkeys";
+}];
+type AppId = typeof APPS[number]["id"];
+/** A compact application chooser; actions return to the same session and never launch a process. */
+export declare class AppsDialog implements TerminalComponentPort {
+    #private;
+    readonly ports: {
+        theme(): UiTheme;
+        height(): number;
+        legacyKey(data: string): string;
+        select(id: AppId): void;
+        cancel(): void;
+        requestRender(): void;
+    };
+    constructor(ports: AppsDialog["ports"]);
+    render(width: number): readonly string[];
+    handleInput(data: string): void;
+    invalidate(): void;
+}
+export {};

package/dist/app/session-shell/apps-dialog.js

@@ -0,0 +1,62 @@
+import { wrapChoiceIndex } from "../../contracts/presentation/index.js";
+import { LineInput, handleLineInputKey, ShortcutRegistry, configureDialogChoiceCapacity, renderSteppedDialogPanel } from "../../ui/components/index.js";
+const APPS = [
+    { id: "agent", label: "Agent" },
+    { id: "settings", label: "Settings" },
+    { id: "changelog", label: "Changelog" },
+    { id: "hotkeys", label: "Hotkeys" },
+];
+const SCOPE = "apps";
+const SHORTCUTS = new ShortcutRegistry();
+SHORTCUTS.declare({ key: "up", scope: SCOPE, description: "Previous app", hint: { keys: "↑↓", does: "navigate" } }, "previous");
+SHORTCUTS.declare({ key: "down", scope: SCOPE, description: "Next app", hint: { keys: "↑↓", does: "navigate" } }, "next");
+SHORTCUTS.declare({ key: "enter", scope: SCOPE, description: "Open app", hint: { keys: "Enter", does: "open" } }, "open");
+SHORTCUTS.declare({ key: "escape", scope: SCOPE, description: "Close Launcher", hint: { keys: "Esc", does: "close" } }, "close");
+/** A compact application chooser; actions return to the same session and never launch a process. */
+export class AppsDialog {
+    #input = new LineInput();
+    #index = 0;
+    ports;
+    constructor(ports) { this.ports = ports; }
+    #matches() { return APPS.filter(app => app.label.toLowerCase().includes(this.#input.value.toLowerCase())); }
+    render(width) {
+        const matches = this.#matches();
+        const height = Math.max(1, this.ports.height());
+        const compact = height < 12;
+        const capacity = compact ? Math.max(1, height - 3) : configureDialogChoiceCapacity(height, true, 0);
+        const start = Math.max(0, this.#index - capacity + 1);
+        return renderSteppedDialogPanel({
+            title: "Launcher", input: this.#input, compact,
+            rows: matches.length === 0 ? [{ label: "No apps found", value: "" }]
+                : matches.slice(start, start + capacity).map(app => ({ label: app.label, value: "" })),
+            index: matches.length === 0 ? -1 : this.#index - start,
+            hint: [{ key: "Type", action: "search" }, ...SHORTCUTS.hintEntries(SCOPE)],
+        }, width, this.ports.theme()).slice(0, height);
+    }
+    handleInput(data) {
+        const key = this.ports.legacyKey(data);
+        const token = key === "\u001b[A" ? "up" : key === "\u001b[B" ? "down"
+            : key === "\r" || key === "\n" ? "enter" : key === "\u001b" || key === "\u0003" ? "escape" : "edit";
+        const action = SHORTCUTS.resolve(token, SCOPE);
+        const matches = this.#matches();
+        if (action === "close") {
+            this.ports.cancel();
+            return;
+        }
+        if (action === "open") {
+            const selected = matches[this.#index];
+            if (selected !== undefined)
+                this.ports.select(selected.id);
+            return;
+        }
+        if (action === "previous" || action === "next") {
+            this.#index = wrapChoiceIndex(this.#index, action === "next" ? 1 : -1, matches.length);
+        }
+        else {
+            handleLineInputKey(this.#input, key);
+            this.#index = 0;
+        }
+        this.ports.requestRender();
+    }
+    invalidate() { }
+}

package/dist/app/session-shell/dialog-coordinator.d.ts

@@ -1,4 +1,5 @@
 import type { OwnedUiShellComponents, OwnedUiShellSelectorOption } from "../../contracts/owned-ui/index.js";
+import type { ShellPresentationPorts } from "../../contracts/presentation/index.js";
 import type { TerminalOverlayHandle } from "../../contracts/presentation/index.js";
 import type { OwnedUiCommandResult, OwnedUiDialog } from "../../contracts/owned-ui/index.js";
 import type { UiRouteHost, UiRouteInput } from "../../ui/apps/contracts.js";
@@ -7,6 +8,11 @@ import type { OwnedUiSessionShellOptions, OwnedUiSessionShellRoot } from "./sess
 type StartupRoute = NonNullable<OwnedUiSessionShellOptions["engine"]["startupRoute"]>;
 interface SessionDialogPorts {
     readonly terminal: Pick<OwnedUiPresenterTerminal, "running" | "hasOverlay" | "showOverlay" | "openRoute" | "requestRender">;
+    readonly presentation?: Pick<ShellPresentationPorts, "theme" | "terminalRuntime">;
+    readonly viewport?: () => {
+        rows: number;
+    };
+    readonly inPlaceSession?: boolean;
     readonly root: Pick<OwnedUiSessionShellRoot, "chrome" | "setInputSurface" | "usesDefaultInputSurface">;
     readonly routeHost: UiRouteHost | null;
     readonly dialogs: Pick<OwnedUiShellComponents["dialogs"], "dialog" | "selector">;
@@ -17,20 +23,21 @@ interface SessionDialogPorts {
     readonly routeClosed?: (route: string) => void;
     readonly startupRoute?: StartupRoute;
 }
-/**
- * Owns the one modal overlay a session shows at a time, whichever source opened it: an owned route,
- * a local selector, or a backend dialog. Opening one hides the previous one, and every close path
- * clears the same state.
- */
+/** Coordinates owned routes, dock dialogs, and backend overlays through one replacement/close lifecycle. */
 export declare class SessionDialogCoordinator {
     #private;
     constructor(ports: SessionDialogPorts);
+    /** Apps may cover a full-screen route, but never steal another dialog's local shortcuts. */
+    canOpenApps(): boolean;
+    showApps(): void;
     /** Clears the replacement input surface a selector put in the dock; the shared close action of every dock selector. */
     readonly closeInputSurface: () => void;
     showSelector(title: string, options: readonly OwnedUiShellSelectorOption[], onSelect: (id: string) => void, onCancel?: () => void): TerminalOverlayHandle;
     /** Mirrors the backend's pending dialog; locally owned routes and selectors are left alone when it has none. */
     syncBackend(dialog: OwnedUiDialog | null): void;
     openRoute(route: string, input?: UiRouteInput, onClosed?: () => void | Promise<void>): OwnedUiCommandResult;
+    /** Close the route before global abort. */
+    handleInputRouteInterrupt(data: string): boolean;
     claimsRoute(name: string): boolean;
     /** Retains a route requested before the runtime runs; the latest request wins. */
     retainStartupRoute(route: string): void;

package/dist/app/session-shell/dialog-coordinator.js

@@ -1,21 +1,82 @@
+import { InputRoute } from "./input-route.js";
 const OVERLAY_OPTIONS = { width: "70%", maxHeight: "80%", anchor: "center", inputCoordination: "owned" };
 const STARTUP_ROUTE_RETRY_MS = 25;
-/**
- * Owns the one modal overlay a session shows at a time, whichever source opened it: an owned route,
- * a local selector, or a backend dialog. Opening one hides the previous one, and every close path
- * clears the same state.
- */
+/** Coordinates owned routes, dock dialogs, and backend overlays through one replacement/close lifecycle. */
 export class SessionDialogCoordinator {
     #ports;
     #handle;
     #id;
     #source;
+    #route;
+    #apps;
+    #inputRoute;
     #startupRoute;
     #startupRouteTimer;
     constructor(ports) {
         this.#ports = ports;
         this.#startupRoute = ports.startupRoute;
     }
+    /** Apps may cover a full-screen route, but never steal another dialog's local shortcuts. */
+    canOpenApps() {
+        return this.#apps === undefined && (this.#source === "route"
+            || !this.#ports.terminal.hasOverlay() && this.#ports.root.usesDefaultInputSurface());
+    }
+    showApps() {
+        const presentation = this.#ports.presentation;
+        if (presentation === undefined || !this.#ports.terminal.running || !this.canOpenApps())
+            return;
+        let dialog;
+        let closed = false;
+        let loading = "Loading Launcher…";
+        const pending = [];
+        const cancel = () => { closed = true; pending.length = 0; this.#apps?.hide(); this.#apps = undefined; };
+        this.#apps = this.#ports.terminal.showOverlay({
+            render: width => dialog?.render(width) ?? [loading.slice(0, width)],
+            handleInput: data => {
+                if (dialog !== undefined)
+                    dialog.handleInput?.(data);
+                else if (presentation.terminalRuntime.legacyKeyInput(data) === "\u001b")
+                    cancel();
+                else if (pending.length < 32)
+                    pending.push(data);
+            },
+            invalidate: () => dialog?.invalidate(),
+            dispose: () => { closed = true; pending.length = 0; },
+        }, { width: 60, maxHeight: "100%", anchor: "center", inputCoordination: "owned", modal: true });
+        // Performance: Apps and its search/list controller are optional workflows, not eager startup dependencies.
+        void import("./apps-dialog.js").then(({ AppsDialog }) => {
+            if (closed || this.#ports.disposed())
+                return;
+            dialog = new AppsDialog({
+                theme: () => presentation.theme.current(),
+                height: () => this.#ports.viewport?.().rows ?? 24,
+                legacyKey: data => presentation.terminalRuntime.legacyKeyInput(data),
+                requestRender: () => this.#ports.terminal.requestRender(),
+                cancel,
+                select: route => {
+                    cancel();
+                    if (route === this.#route)
+                        return;
+                    this.#handle?.close?.();
+                    if (route === "agent")
+                        this.#close();
+                    else {
+                        const result = this.openRoute(route);
+                        if (result.diagnostic !== null)
+                            this.#ports.root.chrome.setNotice({ kind: "error", message: result.diagnostic });
+                    }
+                },
+            });
+            for (const key of pending.splice(0)) {
+                if (!closed)
+                    dialog.handleInput?.(key);
+            }
+            this.#ports.terminal.requestRender();
+        }).catch(() => { if (!closed && !this.#ports.disposed()) {
+            loading = "Launcher unavailable — Esc close";
+            this.#ports.terminal.requestRender();
+        } });
+    }
     /** Clears the replacement input surface a selector put in the dock; the shared close action of every dock selector. */
     closeInputSurface = () => {
         this.#ports.root.setInputSurface(null);
@@ -29,15 +90,15 @@ export class SessionDialogCoordinator {
             title,
             options,
             onSelect: id => {
-                onSelect(id);
                 this.#close();
+                onSelect(id);
             },
             onCancel: () => {
                 this.#close();
                 onCancel?.();
             },
         });
-        const handle = this.#ports.terminal.showOverlay(component, OVERLAY_OPTIONS);
+        const handle = this.#ports.terminal.showOverlay(component, { ...OVERLAY_OPTIONS, modal: true });
         this.#handle = handle;
         return handle;
     }
@@ -57,7 +118,7 @@ export class SessionDialogCoordinator {
         this.#handle?.hide();
         this.#source = "backend";
         const component = this.#ports.dialogs.dialog(dialog, { onSelect: () => this.#close(), onCancel: () => this.#close() });
-        this.#handle = this.#ports.terminal.showOverlay(component, OVERLAY_OPTIONS);
+        this.#handle = this.#ports.terminal.showOverlay(component, { ...OVERLAY_OPTIONS, modal: true });
         this.#id = dialog.id;
     }
     openRoute(route, input, onClosed) {
@@ -69,24 +130,55 @@ export class SessionDialogCoordinator {
         this.#ports.root.chrome.dismissNotice();
         this.#handle?.hide();
         this.#source = "route";
+        this.#route = route;
+        const closed = (rendered) => {
+            if (rendered) {
+                try {
+                    void onClosed?.()?.catch(() => undefined);
+                }
+                catch { /* Rationale: a failed acknowledgement stays pending. */ }
+                this.#ports.routeClosed?.(route);
+            }
+        };
+        if (route === "session" && this.#ports.inPlaceSession) {
+            const component = new InputRoute(surface, {
+                requestRender: () => this.#ports.terminal.requestRender(),
+                closed: rendered => { this.closeInputSurface(); closed(rendered); },
+                released: () => { if (this.#handle === handle)
+                    this.#clear(); },
+                key: data => this.#ports.presentation?.terminalRuntime.legacyKeyInput(data) ?? data,
+                exit: () => this.#ports.exit(),
+            });
+            const handle = { hide: () => component.close(), close: () => component.close() };
+            this.#handle = handle;
+            this.#inputRoute = component;
+            this.#id = surface.id;
+            this.#ports.root.setInputSurface(component);
+            this.#ports.terminal.requestRender();
+            return { outcome: "completed", diagnostic: null };
+        }
         const handle = this.#ports.terminal.openRoute(surface, {
             exit: () => this.#ports.exit(),
             closed: rendered => {
                 if (this.#handle === handle)
                     this.#clear();
-                if (rendered) {
-                    try {
-                        void onClosed?.()?.catch(() => undefined);
-                    }
-                    catch { /* Rationale: a failed acknowledgement stays pending. */ }
-                    this.#ports.routeClosed?.(route);
-                }
+                closed(rendered);
             },
         });
         this.#handle = handle;
         this.#id = surface.id;
         return { outcome: "completed", diagnostic: null };
     }
+    /** Close the route before global abort. */
+    handleInputRouteInterrupt(data) {
+        if (this.#inputRoute === undefined || this.#apps !== undefined)
+            return false;
+        const key = this.#ports.presentation?.terminalRuntime.legacyKeyInput(data) ?? data;
+        if (key !== "\u0003")
+            return false;
+        this.#inputRoute.handleInput(key);
+        return true;
+    }
     claimsRoute(name) {
         return this.#ports.routeHost?.claims(name) ?? false;
     }
@@ -118,9 +210,13 @@ export class SessionDialogCoordinator {
         if (this.#startupRouteTimer !== undefined)
             clearTimeout(this.#startupRouteTimer);
         this.#startupRouteTimer = undefined;
+        this.#apps?.hide();
+        this.#apps = undefined;
         this.#handle?.hide();
     }
     #close() {
+        this.#apps?.hide();
+        this.#apps = undefined;
         this.#handle?.hide();
         this.#clear();
     }
@@ -128,5 +224,7 @@ export class SessionDialogCoordinator {
         this.#handle = undefined;
         this.#id = undefined;
         this.#source = undefined;
+        this.#route = undefined;
+        this.#inputRoute = undefined;
     }
 }

package/dist/app/session-shell/input-route.d.ts

@@ -0,0 +1,23 @@
+import type { OwnedUiShellComponentPort } from "../../contracts/owned-ui/index.js";
+import type { UiRouteSurface } from "../../ui/apps/index.js";
+import type { PaneMouseEvent } from "../../ui/components/index.js";
+type InputRouteOptions = {
+    readonly requestRender: () => void;
+    readonly closed: (rendered: boolean) => void;
+    readonly exit: () => void;
+    readonly released: () => void;
+    readonly key: (data: string) => string;
+};
+/** Hosts a bounded dock route. */
+export declare class InputRoute implements OwnedUiShellComponentPort {
+    #private;
+    constructor(surface: UiRouteSurface, options: InputRouteOptions);
+    render(width: number): readonly string[];
+    renderInDock(width: number, maxHeight: number): readonly string[];
+    handleInput(data: string): void;
+    handleLocalMouse(event: PaneMouseEvent): void;
+    invalidate(): void;
+    close(): void;
+    dispose(): void;
+}
+export {};

package/dist/app/session-shell/input-route.js

@@ -0,0 +1,59 @@
+/** Hosts a bounded dock route. */
+export class InputRoute {
+    #surface;
+    #options;
+    #disposed = false;
+    #rendered = false;
+    constructor(surface, options) {
+        this.#surface = surface;
+        this.#options = options;
+        surface.onRenderRequested(() => { if (!this.#disposed)
+            this.#refresh(); });
+        surface.onExitRequested(() => { this.close(); options.exit(); });
+    }
+    render(width) { return this.renderInDock(width, 24); }
+    renderInDock(width, maxHeight) {
+        if (this.#disposed)
+            return [];
+        const frame = this.#surface.render(width, Math.max(1, Math.min(24, maxHeight)));
+        this.#rendered = true;
+        return frame;
+    }
+    handleInput(data) {
+        if (this.#disposed)
+            return;
+        const key = this.#options.key(data);
+        // Compatibility: close even while the deferred document is loading.
+        if (key === "\u001b" || key === "\u0003") {
+            this.close();
+            return;
+        }
+        this.#surface.handleInput(key);
+        this.#refresh();
+    }
+    handleLocalMouse(event) {
+        if (this.#disposed)
+            return;
+        this.#surface.handleMouse(event);
+        this.#refresh();
+    }
+    invalidate() { }
+    close() {
+        if (this.#disposed)
+            return;
+        this.#options.closed(this.#rendered);
+        this.dispose();
+    }
+    dispose() {
+        if (this.#disposed)
+            return;
+        this.#disposed = true;
+        this.#surface.close();
+        this.#options.released();
+    }
+    #refresh() {
+        if (this.#surface.isClosed())
+            this.close();
+        this.#options.requestRender();
+    }
+}

package/dist/app/session-shell/session-selectors.d.ts

@@ -28,8 +28,8 @@ export declare class SessionSelectors implements WorkflowSelectors {
     #private;
     constructor(ports: SessionSelectorPorts);
     showThinkingSelector(): Promise<void>;
-    /** The Skills dialog: a replacement input like the model selector, applying the chosen skill through the prompt path. */
-    showSkillsSelector(skills: readonly OwnedUiShellSkillSummary[]): void;
+    /** Applies a dock-selected skill through the prompt path. */
+    showSkillsSelector(skills: readonly OwnedUiShellSkillSummary[]): Promise<void> | undefined;
     showModelSelector(initialSearchInput?: string): void;
     showForkSelector(): void;
     showLogoutSelector(): Promise<void>;
@@ -39,8 +39,8 @@ export declare class SessionSelectors implements WorkflowSelectors {
     showLoginProviderSelector(authType?: "oauth" | "api_key", initialSearchInput?: string): void;
     showSessionSelector(): Promise<void>;
     showSettingsSelector(): void;
-    showTrustSelector(): void;
+    showTrustSelector(): Promise<void> | undefined;
     showScopedModelsSelector(): void;
     /** The bare-A1 unified Models dialog: switch on Enter, scope on Space, persist on Ctrl+S, all through the engine. */
-    showModelsDialog(initialQuery?: string): void;
+    showModelsDialog(initialQuery?: string): void | Promise<void>;
 }

package/dist/app/session-shell/session-selectors.js

@@ -77,7 +77,7 @@ export class SessionSelectors {
             releasePresentation?.();
         }
     }
-    /** The Skills dialog: a replacement input like the model selector, applying the chosen skill through the prompt path. */
+    /** Applies a dock-selected skill through the prompt path. */
     showSkillsSelector(skills) {
         const close = this.#dialogs.closeInputSurface;
         const component = this.#presenters.components.dialogs.skillsSelector({
@@ -89,6 +89,7 @@ export class SessionSelectors {
             onCancel: close,
         });
         this.#present(component);
+        return component.ready;
     }
     showModelSelector(initialSearchInput) {
         this.#presenters.openModelSelector(this.#dialogHost, initialSearchInput);
@@ -214,13 +215,14 @@ export class SessionSelectors {
             onCancel: close,
         });
         this.#present(component);
+        return component.ready;
     }
     showScopedModelsSelector() {
         this.#presenters.openScopedModelsSelector(this.#dialogHost);
     }
     /** The bare-A1 unified Models dialog: switch on Enter, scope on Space, persist on Ctrl+S, all through the engine. */
     showModelsDialog(initialQuery) {
-        this.#presenters.openModelsDialog(this.#dialogHost, initialQuery);
+        return this.#presenters.openModelsDialog(this.#dialogHost, initialQuery);
     }
     #treeSummary() {
         return new Promise(resolve => {
@@ -261,9 +263,12 @@ export class SessionSelectors {
         if (result.diagnostic === "Branch summarization cancelled")
             await this.showTreeSelector(entryId);
     }
-    // Invariant: a selector replaces the editor in the input dock and paints in the same frame.
+    // Performance: retain the frame until a deferred selector is ready.
     #present(component) {
+        const release = component?.ready === undefined ? undefined : this.#terminal.beginPresentationHold();
         this.#root.setInputSurface(component);
+        void component?.ready?.finally(() => { release?.(); if (!this.#ports.disposed())
+            this.#terminal.requestRender(); });
         this.#terminal.requestRender();
     }
 }

package/dist/app/session-shell/session-shell-root.js

@@ -357,10 +357,14 @@ export class OwnedUiSessionShellRoot {
         const messageStart = queued.length;
         const copyableMessageRows = Array.from({ length: statusRows.length + noticeRows.length }, (_value, index) => ({ row: messageStart + index }));
         const aboveWidgets = this.#extensions.renderWidgets("aboveEditor", width);
-        const input = this.#input.surface.render(width);
-        const body = this.usesDefaultInputSurface() ? this.editor.bodyGeometry?.() : undefined;
         const belowWidgets = this.#extensions.renderWidgets("belowEditor", width);
         const footer = this.#renderFooter(width);
+        // Invariant: reserve transcript context above scrollable routes.
+        const available = Math.max(1, this.#componentRuntime.getRows() - transientRows.length - aboveWidgets.length - belowWidgets.length - footer.length - 3);
+        const surface = this.#input.surface;
+        const input = this.#customViewport && surface.renderInDock !== undefined
+            ? surface.renderInDock(width, available) : surface.render(width);
+        const body = this.usesDefaultInputSurface() ? this.editor.bodyGeometry?.() : undefined;
         const rowsWithoutTransient = [...aboveWidgets, ...input, ...belowWidgets, ...footer];
         const inputOffset = transientRows.length + aboveWidgets.length;
         return {

package/dist/app/session-shell/session-shell.js

@@ -79,7 +79,7 @@ export class OwnedUiSessionPresenter {
     #sessionGeneration;
     #sessionBindingGeneration;
     constructor(host, options) {
-        const { backend, cwd, routeHost, sessionLayout } = options.engine;
+        const { backend, cwd, routeHost, startupRoute, sessionLayout } = options.engine;
         const { terminal, startup, viewportSettings, reload: reloadPresentation, stream: streamPresentationOptions, input: inputPresentation, } = options.presentation ?? {};
         const { clipboard, responseCopy, paste: pasteDiagnostics, pastePreparation } = options.diagnostics ?? {};
         const promptHistory = options.history;
@@ -178,11 +178,11 @@ export class OwnedUiSessionPresenter {
             // Invariant: the presenter owns its root (theme subscription and helper clients) and disposes it once the
             // terminal no longer renders it.
             constructed.push(() => this.root.dispose());
-            const startupRoute = options.engine.startupRoute;
             this.#dialogs = new SessionDialogCoordinator({
                 terminal: this.#terminal,
                 root: this.root,
-                routeHost: routeHost ?? null, dialogs: options.presenters.components.dialogs,
+                routeHost: routeHost ?? null, dialogs: options.presenters.components.dialogs, inPlaceSession: this.#customViewport,
+                presentation: options.presenters, viewport: () => this.#terminal.viewport(),
                 disposed: () => this.#disposed,
                 exit: () => { void this.shutdown(); },
                 ...(startupRoute === undefined ? {} : { startupRoute }),
@@ -308,8 +308,15 @@ export class OwnedUiSessionPresenter {
     handleViewportInput(data) {
         if (!this.#inputCoordination)
             this.#streamPresentation.noteImmediatePresentation();
+        if (this.#customViewport && this.#dialogs.canOpenApps()
+            && this.root.editor.matchesAction?.(data, "owned.apps.open")) {
+            this.#dialogs.showApps();
+            return { consume: true };
+        }
         // Compatibility: route modal paging and boundary keys before Pi's fullscreen handlers.
         const isDefault = this.root.usesDefaultInputSurface();
+        if (this.#dialogs.handleInputRouteInterrupt(data))
+            return { consume: true };
         if (!this.#terminal.hasOverlay() && !isDefault
             && (this.root.editor.matchesTerminalKey(data, "pageUp")
                 || this.root.editor.matchesTerminalKey(data, "pageDown"))) {
@@ -881,7 +888,8 @@ export class OwnedUiSessionPresenter {
         const separator = body.search(/\s/);
         const name = separator < 0 ? body : body.slice(0, separator);
         const argument = separator < 0 ? "" : body.slice(separator + 1).trimStart();
-        if (this.#dialogs.claimsRoute(name))
+        const applicationOnly = this.#customViewport && (name === "settings" || name === "changelog" || name === "hotkeys");
+        if (!applicationOnly && this.#dialogs.claimsRoute(name))
             return this.#dialogs.openRoute(name);
         if (this.#isWorkflowRoute(name))
             return this.runWorkflow({ command: name, argument });
@@ -915,7 +923,7 @@ export class OwnedUiSessionPresenter {
         const skills = this.#skillSummaries();
         const trimmed = argument.trim();
         if (trimmed.length === 0) {
-            this.selectors.showSkillsSelector(skills);
+            await this.selectors.showSkillsSelector(skills);
             return { outcome: "completed", diagnostic: null };
         }
         const separator = trimmed.search(/\s/u);

package/dist/app/session-shell/shell-host.d.ts

@@ -49,6 +49,7 @@ export interface OwnedUiPresenterTerminal extends OwnedUiPresenterHost {
     requestHyperlinkCleanup(rows?: readonly number[]): void;
     openRoute(surface: UiRouteSurface, callbacks: OwnedUiRouteCallbacks): {
         hide(): void;
+        close?(): void;
     };
     beginPresentationHold(): () => void;
     switchMode(mode: "regular" | "fullscreen"): boolean;