@timurproko/a1 0.2.6-dev.734 → 0.2.6

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

@@ -7,18 +7,13 @@ import { boundedCleanup } from "../../foundation/terminal-cleanup/terminal-reset
 import { assertOwnedUiCommand, OWNED_UI_HIDDEN_COMMAND_NAMES } from "../../contracts/owned-ui/index.js";
 import { assertPromptImages, ImageAttachmentError } from "../../contracts/owned-ui/index.js";
 import { ContextualPromptSuggestionController } from "./prompt-suggestion-controller.js";
-import { MOUSE_TRACKING_OFF, MOUSE_TRACKING_ON, parseMouseInput } from "../../ui/components/mouse.js";
-import { readVisibleHyperlinks } from "../../ui/components/visible-hyperlinks.js";
 import { workflowCommandNames } from "../../integrations/pi/engine/workflows.js";
 import { createPiExtensionUiBridge } from "../../integrations/pi/components/shell-extension-ui.js";
 import { ProgramStatusReporter } from "../../integrations/pi/components/upstream/program-status-reporter.js";
 import { SKILLS_COMMAND_NAME, findSkillByArgument, rewriteSkillsTunnelSubmission, skillPrompt, skillsFromCommands, } from "../../integrations/pi/components/skills-command.js";
 import { createPiShellAuthProviderSelector, createPiShellDialog, createPiShellExtensionSelector, createPiShellLoginDialog, createPiShellReloadBox, createPiShellSelector, createPiShellSkillsSelector, createPiShellTrustSelector, createPiShellUserMessageSelector, } from "../../integrations/pi/components/shell-selectors-dialogs.js";
 import { renderPiShellStatusText, } from "../../integrations/pi/components/shell-presenters-info.js";
-import { piCanvasBackgroundAnsi } from "../../integrations/pi/components/theme.js";
-import { DamageAwareTerminalAdapter } from "../../integrations/pi/tui-runtime/damage-aware-terminal.js";
-import { PiTuiRuntimeAdapter } from "../../integrations/pi/tui-runtime/adapter.js";
-import { classifyPiTuiInput } from "../../integrations/pi/tui-runtime/input-presentation-coordinator.js";
+import { OwnedUiTerminalHost, sessionTerminalHostOptions, } from "./shell-host.js";
 import { runImageWorker } from "./image-preparation-client.js";
 import { STREAM_PRESENTATION_INTERVAL_MS, StreamPresentationCoalescer, } from "./stream-presentation-coalescer.js";
 import { writeSystemClipboardText, } from "./system-clipboard.js";
@@ -26,13 +21,18 @@ import { OwnedUiSessionShellRoot, shellResourceEntries, } from "./session-shell-
 // Invariant: a disposed shell leaves the engine a host that holds no reference back to it.
 const DETACHED_WORKFLOW_INTERACTION = { prompt: async () => null, notify() { } };
 export { OwnedUiSessionShellRoot, } from "./session-shell-root.js";
-/** Coordinates backend, owned presentation, and Pi TUI lifecycles for one interactive session. */
-export class OwnedUiSessionShell {
+export { OwnedUiTerminalHost, sessionTerminalHostOptions } from "./shell-host.js";
+/**
+ * Presents one engine session: its transcript root, editor, controllers, submission, workflows, and dialogs.
+ * It reaches the terminal only through its terminal host's handle, and paints only while it is attached.
+ */
+export class OwnedUiSessionPresenter {
     backend;
     #presenters;
     #dialogHost;
     root;
-    runtime;
+    #host;
+    #terminal;
     #cwd;
     #listeners = new Set();
     #unsubscribe;
@@ -58,9 +58,11 @@ export class OwnedUiSessionShell {
     #editorRevision = 0;
     #started = false;
     #disposed = false;
+    #released;
     #shutdownPromise;
     #disposePromise;
-    #pointerReporting = false;
+    #layoutParts;
+    #pendingClipboardWrite = Promise.resolve();
     // Invariant: translated startup diagnostics create at most one dock notice per kind per shell.
     #startupTrustHandled = false;
     #customViewport;
@@ -71,13 +73,10 @@ export class OwnedUiSessionShell {
     #copyExecutor;
     #copyIntentSequence = 0;
     #unbindClipboardWriter;
-    #damageTerminal;
-    #quitOutro;
     #reloadPresentation;
     #streamPresentation;
-    #removeViewportPreInput;
+    #inputCoordination;
     #unsubscribeSettings;
-    #unsubscribeBackgroundSettings;
     #unbindPiSettings;
     #unbindTerminalSettings;
     #unbindShutdownSettings;
@@ -93,9 +92,9 @@ export class OwnedUiSessionShell {
     #sessionGeneration;
     #sessionBindingGeneration;
     #suggestionModelKey;
-    constructor(options) {
+    constructor(host, options) {
         const { backend, cwd, routeHost, sessionLayout } = options.engine;
-        const { terminal, startup, viewportSettings, backgroundSettings, quitOutro, reload: reloadPresentation, stream: streamPresentationOptions, input: inputPresentation, } = options.presentation ?? {};
+        const { terminal, startup, viewportSettings, reload: reloadPresentation, stream: streamPresentationOptions, input: inputPresentation, } = options.presentation ?? {};
         const { clipboard, responseCopy, paste: pasteDiagnostics, pastePreparation } = options.diagnostics ?? {};
         const promptHistory = options.history;
         const { clipboard: sharedClipboard, keybindings: sharedKeybindings } = options.shared ?? {};
@@ -108,23 +107,22 @@ export class OwnedUiSessionShell {
         this.#routeHost = routeHost ?? null;
         this.#startupRoute = options.engine.startupRoute;
         this.#customViewport = sessionLayout === "custom-viewport";
+        this.#inputCoordination = inputPresentation?.coordination !== false;
+        this.#host = host;
+        this.#terminal = host.connect(this);
         // Invariant: the host's optional members follow the layout, so it is built only once the layout is known.
         this.#dialogHost = this.#createDialogHost();
         this.#lazySelectors = options.diagnostics?.lazySelectors;
         this.#stopped = new Promise(resolve => {
             this.#resolveStopped = resolve;
         });
-        let runtime;
-        let damageTerminal;
-        let streamPresentation;
-        let pendingClipboardWrite = Promise.resolve();
         let promptSuggestionController = null;
         // Invariant: owned prompt limits and collapsed skills are bare-A1 replacements; comparison profiles keep pinned behavior.
         this.#promptImages = this.#customViewport ? options.promptImages ?? null : null;
         this.#skills = this.#customViewport ? options.skills ?? null : null;
         // Invariant: construction is transactional. Each binding registers its release as it is made, and a
         // throw releases them in reverse, so a shell that never finished constructing holds nothing.
-        const constructed = [];
+        const constructed = [() => host.disconnect(this)];
         try {
             const terminalCopy = terminal !== undefined || hasAsyncClipboardOutput();
             this.#responseCopy = this.#customViewport ? new ResponseCopyCoordinator({
@@ -133,23 +131,23 @@ export class OwnedUiSessionShell {
                     ...(terminal === undefined && clipboard === undefined ? {} : { destination: "terminal" }),
                     ...(clipboard?.writeText === undefined ? {} : { writeText: (text, signal) => clipboard.writeText(text, signal) }),
                     ...(terminalCopy ? { terminal: { submit: async (control, signal) => {
-                                if (signal.aborted || this.#disposed || !runtime?.active)
+                                if (signal.aborted || this.#disposed || !this.#terminal.running)
                                     throw new Error("Copy canceled");
                                 // Performance: never grow the real terminal's pending buffer with another clipboard payload.
                                 if (terminal === undefined && process.stdout.writableLength + control.length > MAX_COPY_CONTROL_BYTES) {
                                     throw new Error("Clipboard terminal is busy");
                                 }
-                                runtime.writeControl(control);
+                                this.#terminal.writeControl(control);
                             } } } : {}),
                 })),
                 ...(responseCopy?.onEvent === undefined ? {} : { onEvent: responseCopy.onEvent }),
                 onFailure: result => {
-                    if (this.#disposed || !runtime?.active)
+                    if (this.#disposed || !this.#terminal.running)
                         return;
                     this.root.appendWorkflowStatus(result.outcome === "timed-out" ? "Copy timed out; the clipboard did not respond."
                         : result.failure === "size" ? "Selection exceeds this clipboard route's size limit."
                             : "Could not copy the selection; the clipboard is unavailable.");
-                    runtime.requestRender();
+                    this.#terminal.requestRender();
                 },
             }) : null;
             constructed.push(() => { this.#responseCopy?.dispose(); this.#copyExecutor?.dispose(); });
@@ -175,12 +173,12 @@ export class OwnedUiSessionShell {
                 return text === null ? null : { kind: "text", text };
             };
             this.root = new OwnedUiSessionShellRoot(this.backend.session.view(), cwd, {
-                getColumns: () => runtime?.viewport().columns ?? terminal?.columns ?? 80,
-                getRows: () => runtime?.viewport().rows ?? terminal?.rows ?? 24,
-                requestRender: force => runtime?.requestRender(force),
-                requestHyperlinkCleanup: rows => damageTerminal?.requestHyperlinkCleanup(rows),
-                onViewportFrame: frame => damageTerminal?.arm(frame.descriptor, {
-                    overlayActive: runtime?.hasOverlay() ?? false,
+                getColumns: () => this.#terminal.viewport().columns,
+                getRows: () => this.#terminal.viewport().rows,
+                requestRender: force => this.#terminal.requestRender(force),
+                requestHyperlinkCleanup: rows => this.#terminal.requestHyperlinkCleanup(rows),
+                onViewportFrame: frame => this.#terminal.armFrame(frame.descriptor, {
+                    overlayActive: this.#terminal.hasOverlay(),
                     selectionActive: this.root.hasActiveSelection(),
                     replacementSurfaceActive: !this.root.usesDefaultInputSurface(),
                 }),
@@ -197,7 +195,7 @@ export class OwnedUiSessionShell {
                 onThinkingCycle: () => { void this.cycleThinkingLevel(); },
                 onThinkingToggle: () => {
                     this.root.toggleThinkingVisibility();
-                    this.runtime.requestRender();
+                    this.#terminal.requestRender();
                 },
                 onMessageCopy: () => { void this.runWorkflow({ command: "copy", argument: "" }); },
                 onFollowUp: () => { void this.queueFollowUp().catch(() => this.#reportSubmissionError()); },
@@ -228,15 +226,15 @@ export class OwnedUiSessionShell {
                     const write = () => {
                         if (this.#disposed)
                             return Promise.resolve();
-                        runtime?.writeControl(`\u001b]52;c;${Buffer.from(text, "utf8").toString("base64")}\u0007`);
+                        this.#terminal.writeControl(`\u001b]52;c;${Buffer.from(text, "utf8").toString("base64")}\u0007`);
                         return clipboard === undefined ? writeSystemClipboardText(text)
                             : clipboard.writeText?.(text) ?? Promise.resolve();
                     };
                     // Compatibility: comparison profiles retain their existing clipboard path.
-                    pendingClipboardWrite = write().catch(() => { });
+                    this.#pendingClipboardWrite = write().catch(() => { });
                 },
                 readClipboardContent: async (signal = new AbortController().signal) => {
-                    await pendingClipboardWrite;
+                    await this.#pendingClipboardWrite;
                     return readClipboard(signal);
                 },
                 captureClipboardPaste: () => {
@@ -262,73 +260,16 @@ export class OwnedUiSessionShell {
             }, this.backend.identity.agentDir, this.#presenters.transcriptRenderers(), sessionLayout, {
                 resolve: assetId => this.backend.extensions.resolveTranscriptImage(assetId),
             });
-            // Invariant: the runtime owns the root (its theme subscription and helper clients) once constructed;
-            // stopping an idle runtime disposes it synchronously.
-            constructed.push(() => {
-                if (runtime === undefined)
-                    this.root.dispose();
-                else
-                    void runtime.dispose().catch(() => { });
-            });
+            // 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 initialPiSettings = this.backend.settings.snapshot();
-            // Invariant: bare A1 owns a bounded viewport and therefore always runs on the alternate
-            // fullscreen surface. The pinned comparison profiles still honor Pi's mode.
-            const tuiMode = this.#customViewport
-                ? "fullscreen"
-                : this.backend.identity.disposed ? "regular" : initialPiSettings.tuiMode;
-            const runtimeOptions = {
-                root: this.root,
-                mode: tuiMode,
-                ...(this.#customViewport ? {
-                    // Invariant: the owned shell enables and routes mouse reports itself. Pi's
-                    // enclosing fullscreen renderer must never establish a competing white selection.
-                    mouse: false,
-                    consumeUnhandledMouse: true,
-                    onOverlayGeometry: surfaces => this.root.setViewportOverlaySurfaces(surfaces),
-                    decorateTerminal: (terminal) => {
-                        damageTerminal = new DamageAwareTerminalAdapter(terminal, {
-                            regionalScroll: process.env.TERM !== "dumb",
-                            inspectHyperlinks: readVisibleHyperlinks,
-                            onResize: () => streamPresentation?.noteImmediatePresentation(),
-                            onHyperlinkCleanupRequired: () => runtime?.requestRender(true),
-                        });
-                        return damageTerminal;
-                    },
-                    ...(inputPresentation?.coordination === false ? {} : {
-                        inputCoordination: {
-                            classify: (data, focusedOverlay) => classifyPiTuiInput(data, focusedOverlay ?? this.root.inputCoordinationSurface()),
-                            onReceipt: () => streamPresentation?.noteImmediatePresentation(),
-                            ...(inputPresentation?.scheduler === undefined
-                                ? {}
-                                : { scheduler: inputPresentation.scheduler }),
-                        },
-                    }),
-                } : { layoutRoot: this.root.layoutRoot() }),
-                ...(inputPresentation?.onEvent === undefined ? {} : {
-                    inputDiagnostics: {
-                        onEvent: inputPresentation.onEvent,
-                        ...(inputPresentation.now === undefined ? {} : { now: inputPresentation.now }),
-                    },
-                }),
-                ...(terminal === undefined ? {} : { terminal: terminal }),
-                hardwareCursor: this.backend.session.view().terminal.hardwareCursor,
-                ...(this.#customViewport ? {} : { wheelScrollLines: initialPiSettings.fullscreenWheelScrollLines }),
-            };
-            runtime = new PiTuiRuntimeAdapter(runtimeOptions);
-            this.runtime = runtime;
-            this.#programStatus = new ProgramStatusReporter(status => { if (this.runtime.active)
-                this.runtime.setProgramStatus(status); }, () => this.view().status.footer?.sessionName ?? undefined);
-            this.#damageTerminal = damageTerminal ?? null;
-            if (this.#customViewport && backgroundSettings !== undefined && damageTerminal !== undefined) {
-                damageTerminal.setCanvasBackground(piCanvasBackgroundAnsi(backgroundSettings.snapshot()));
-            }
-            this.#quitOutro = quitOutro;
+            this.#programStatus = new ProgramStatusReporter(status => this.#terminal.setProgramStatus(status), () => this.view().status.footer?.sessionName ?? undefined);
             this.#reloadPresentation = reloadPresentation;
             const presentationInterval = streamPresentationOptions?.intervalMs ?? STREAM_PRESENTATION_INTERVAL_MS;
-            streamPresentation = streamPresentationOptions?.scheduler === undefined
-                ? new StreamPresentationCoalescer(() => this.runtime.requestRender(), presentationInterval)
-                : new StreamPresentationCoalescer(() => this.runtime.requestRender(), presentationInterval, streamPresentationOptions.scheduler);
-            this.#streamPresentation = streamPresentation;
+            this.#streamPresentation = streamPresentationOptions?.scheduler === undefined
+                ? new StreamPresentationCoalescer(() => this.#terminal.requestRender(), presentationInterval)
+                : new StreamPresentationCoalescer(() => this.#terminal.requestRender(), presentationInterval, streamPresentationOptions.scheduler);
             constructed.push(() => this.#streamPresentation.dispose());
             const promptSuggestionOptions = this.#customViewport ? options.suggestions : undefined;
             promptSuggestionController = promptSuggestionOptions === undefined ? null : new ContextualPromptSuggestionController({
@@ -345,7 +286,7 @@ export class OwnedUiSessionShell {
                         return true;
                     },
                     clear: () => this.root.setPromptSuggestion(null),
-                    requestRender: () => this.runtime.requestRender(),
+                    requestRender: () => this.#terminal.requestRender(),
                 },
             });
             this.#promptSuggestions = promptSuggestionController;
@@ -356,7 +297,7 @@ export class OwnedUiSessionShell {
             constructed.push(this.#unsubscribePromptSuggestions);
             this.#unsubscribePromptImages = this.#promptImages === null ? () => { } : this.#promptImages.onChange(() => {
                 if (!this.#disposed && this.root.reconcilePromptImageLimitNotice())
-                    this.runtime.requestRender();
+                    this.#terminal.requestRender();
             });
             constructed.push(this.#unsubscribePromptImages);
             // Rationale: the same listener refreshes the menu for the A1 presentation choice and for the engine's
@@ -366,11 +307,11 @@ export class OwnedUiSessionShell {
                 if (this.#disposed || this.#commandListSignature() === this.#installedCommandSignature)
                     return;
                 this.#installAutocompleteCommands();
-                this.runtime.requestRender();
+                this.#terminal.requestRender();
             });
             constructed.push(this.#unsubscribeSkills);
-            this.runtime.setHardwareCursor(initialPiSettings.showHardwareCursor);
-            this.runtime.setClearOnShrink(initialPiSettings.clearOnShrink);
+            this.#terminal.setHardwareCursor(initialPiSettings.showHardwareCursor);
+            this.#terminal.setClearOnShrink(initialPiSettings.clearOnShrink);
             this.#terminalProgressEnabled = initialPiSettings.showTerminalProgress;
             this.#fullscreenExitOutput = initialPiSettings.fullscreenExitOutput;
             // Invariant: bare A1 prints only the resume hint at exit, so the pinned exit-output
@@ -383,12 +324,12 @@ export class OwnedUiSessionShell {
                 showHardwareCursor: { apply: value => {
                         if (typeof value !== "boolean")
                             throw new TypeError("Hardware cursor setting is invalid");
-                        this.runtime.setHardwareCursor(value);
+                        this.#terminal.setHardwareCursor(value);
                     } },
                 clearOnShrink: { apply: value => {
                         if (typeof value !== "boolean")
                             throw new TypeError("Clear-on-shrink setting is invalid");
-                        this.runtime.setClearOnShrink(value);
+                        this.#terminal.setClearOnShrink(value);
                     } },
                 showTerminalProgress: { apply: value => {
                         if (typeof value !== "boolean")
@@ -398,55 +339,6 @@ export class OwnedUiSessionShell {
                     } },
             });
             constructed.push(this.#unbindTerminalSettings);
-            this.#removeViewportPreInput = this.#customViewport
-                ? this.runtime.addPreInputListener(data => {
-                    if (inputPresentation?.coordination === false)
-                        this.#streamPresentation.noteImmediatePresentation();
-                    // Compatibility: route modal paging and boundary keys before Pi's fullscreen handlers.
-                    const isDefault = this.root.usesDefaultInputSurface();
-                    if (!this.runtime.hasOverlay() && !isDefault
-                        && (this.root.editor.matchesTerminalKey(data, "pageUp")
-                            || this.root.editor.matchesTerminalKey(data, "pageDown"))) {
-                        this.root.handleInput(data);
-                        this.runtime.requestRender();
-                        return { consume: true };
-                    }
-                    if (!this.runtime.hasOverlay() && (this.root.editor.matchesTerminalKey(data, "home")
-                        || this.root.editor.matchesTerminalKey(data, "end")
-                        || !isDefault && (this.root.editor.matchesTerminalKey(data, "ctrl+home")
-                            || this.root.editor.matchesTerminalKey(data, "ctrl+end")))) {
-                        if (isDefault)
-                            this.root.handleViewportPreInput(data, true);
-                        this.root.handleInput(data);
-                        this.runtime.requestRender();
-                        return { consume: true };
-                    }
-                    // Invariant: geometry must belong to the painted frame, including newly opened/nested
-                    // surfaces. Steady pointer input does not trigger a synchronous composition.
-                    const viewport = this.runtime.viewport();
-                    if (data.includes("\u001b[<") && !this.root.viewportInputGeometryReady(viewport.columns, viewport.rows)) {
-                        this.runtime.renderNow();
-                    }
-                    const routed = this.root.handleViewportPreInput(data, true, Date.now(), this.root.usesDefaultInputSurface() && !this.runtime.hasFocusedOverlay());
-                    if (routed.copySelection !== undefined) {
-                        const snapshot = routed.copySelection;
-                        const acknowledgement = copyAcknowledgement(snapshot);
-                        const intent = ++this.#copyIntentSequence;
-                        void this.#responseCopy?.submit(snapshot, pendingClipboardWrite).then(result => {
-                            if (this.#disposed || !this.runtime.active || intent !== this.#copyIntentSequence
-                                || result.outcome !== "delivered" && result.outcome !== "submitted-unverified")
-                                return;
-                            if (acknowledgement.hasNonWhitespace) {
-                                this.root.showCopyAcknowledgement(`copied ${acknowledgement.characters} chars to clipboard`);
-                            }
-                        });
-                    }
-                    if (!routed.consumed)
-                        return routed.data === data ? undefined : { data: routed.data };
-                    return routed.data.length === 0 ? { consume: true } : { data: routed.data };
-                })
-                : () => { };
-            constructed.push(this.#removeViewportPreInput);
             const applyViewportSettings = () => {
                 const snapshot = viewportSettings?.snapshot();
                 this.root.setViewportConfig(snapshot ?? {
@@ -460,14 +352,6 @@ export class OwnedUiSessionShell {
                 ? viewportSettings.onChange(settings => this.root.setViewportConfig(settings))
                 : () => { };
             constructed.push(this.#unsubscribeSettings);
-            this.#unsubscribeBackgroundSettings = this.#customViewport && backgroundSettings
-                ? backgroundSettings.onChange(style => {
-                    if (this.#damageTerminal?.setCanvasBackground(piCanvasBackgroundAnsi(style))) {
-                        this.runtime.requestRender(true);
-                    }
-                })
-                : () => { };
-            constructed.push(this.#unsubscribeBackgroundSettings);
             this.root.setEditorPaddingX(initialPiSettings.editorPaddingX);
             this.root.setAutocompleteMaxVisible(initialPiSettings.autocompleteMaxVisible);
             this.root.setOutputPad(initialPiSettings.outputPad);
@@ -524,7 +408,7 @@ export class OwnedUiSessionShell {
                             if (value !== "auto" && (typeof value !== "number" || !Number.isSafeInteger(value) || value < 1 || value > 100)) {
                                 throw new TypeError("Fullscreen wheel-scroll distance is invalid");
                             }
-                            this.runtime.setWheelScrollLines(value);
+                            this.#terminal.setWheelScrollLines(value);
                         } },
                 }),
             });
@@ -538,29 +422,29 @@ export class OwnedUiSessionShell {
                     limit: promptHistory.limit,
                     fallback: this.view().transcript.flatMap(block => block.kind === "user" ? [block.text] : []),
                     active: () => this.root.usesDefaultInputSurface(),
-                    render: () => this.runtime.requestRender(),
+                    render: () => this.#terminal.requestRender(),
                     rehydrate: value => this.root.rehydrateHistoryText(value, id => sidecar?.readAttachment(id) ?? null),
                 });
                 constructed.push(() => { void this.#promptHistory?.close().catch(() => false); });
             }
             this.#extensionBridge = createPiExtensionUiBridge({
                 runtime: {
-                    getColumns: () => this.runtime.viewport().columns,
-                    getRows: () => this.runtime.viewport().rows,
-                    requestRender: () => this.runtime.requestRender(),
+                    getColumns: () => this.#terminal.viewport().columns,
+                    getRows: () => this.#terminal.viewport().rows,
+                    requestRender: () => this.#terminal.requestRender(),
                 },
                 agentDir: this.backend.identity.agentDir,
                 setInputSurface: component => this.root.setInputSurface(component, true, "opaque"),
                 setProgramStatusBlocked: status => this.#programStatus.setBlocked("extension-dialog", status),
-                showOverlay: (component, overlayOptions) => this.runtime.showOverlay(component, overlayOptions),
-                listenInput: handler => this.runtime.addInputListener(handler),
+                showOverlay: (component, overlayOptions) => this.#terminal.showOverlay(component, overlayOptions),
+                listenInput: handler => this.#terminal.addInputListener(handler),
                 replaceWidget: (key, component, placement) => this.root.setExtensionWidget(key, component, placement),
                 replaceHeader: component => this.root.setExtensionHeader(component),
                 replaceFooter: component => this.root.setExtensionFooter(component),
                 setStatus: (key, text) => this.root.setExtensionStatus(key, text),
                 setWorking: (message, visible) => this.root.setExtensionWorking(message, visible),
                 notify: (message, type) => this.root.addExtensionNotification(message, type),
-                setTitle: title => this.runtime.setTitle(title),
+                setTitle: title => this.#terminal.setTitle(title),
                 getEditorText: () => this.root.editor.getText(),
                 setEditorText: text => this.root.editor.setText(text),
                 pasteToEditor: text => this.root.editor.insertText(text),
@@ -578,7 +462,7 @@ export class OwnedUiSessionShell {
                 notify: event => this.#notifyWorkflowLogin(event),
                 publish: message => {
                     this.root.appendWorkflowMessage(message);
-                    this.runtime.requestRender();
+                    this.#terminal.requestRender();
                 },
                 finishLogin: () => this.#finishWorkflowLogin(),
             });
@@ -680,6 +564,83 @@ export class OwnedUiSessionShell {
     view() {
         return this.backend.session.view();
     }
+    get terminalHost() {
+        return this.#host;
+    }
+    render(width) {
+        return this.root.render(width);
+    }
+    handleInput(data) {
+        this.root.handleInput(data);
+    }
+    invalidate() {
+        this.root.invalidate();
+    }
+    setFocused(focused) {
+        this.root.setFocused(focused);
+    }
+    inputCoordinationSurface() {
+        return this.root.inputCoordinationSurface();
+    }
+    setOverlaySurfaces(surfaces) {
+        this.root.setViewportOverlaySurfaces(surfaces);
+    }
+    noteImmediatePresentation() {
+        this.#streamPresentation.noteImmediatePresentation();
+    }
+    layoutPart(part) {
+        this.#layoutParts ??= this.root.layoutParts();
+        return this.#layoutParts[part];
+    }
+    activated() {
+        this.#syncTerminalProgress(this.view());
+    }
+    handleViewportInput(data) {
+        if (!this.#inputCoordination)
+            this.#streamPresentation.noteImmediatePresentation();
+        // Compatibility: route modal paging and boundary keys before Pi's fullscreen handlers.
+        const isDefault = this.root.usesDefaultInputSurface();
+        if (!this.#terminal.hasOverlay() && !isDefault
+            && (this.root.editor.matchesTerminalKey(data, "pageUp")
+                || this.root.editor.matchesTerminalKey(data, "pageDown"))) {
+            this.root.handleInput(data);
+            this.#terminal.requestRender();
+            return { consume: true };
+        }
+        if (!this.#terminal.hasOverlay() && (this.root.editor.matchesTerminalKey(data, "home")
+            || this.root.editor.matchesTerminalKey(data, "end")
+            || !isDefault && (this.root.editor.matchesTerminalKey(data, "ctrl+home")
+                || this.root.editor.matchesTerminalKey(data, "ctrl+end")))) {
+            if (isDefault)
+                this.root.handleViewportPreInput(data, true);
+            this.root.handleInput(data);
+            this.#terminal.requestRender();
+            return { consume: true };
+        }
+        // Invariant: geometry must belong to the painted frame, including newly opened/nested
+        // surfaces. Steady pointer input does not trigger a synchronous composition.
+        const viewport = this.#terminal.viewport();
+        if (data.includes("\u001b[<") && !this.root.viewportInputGeometryReady(viewport.columns, viewport.rows)) {
+            this.#terminal.renderNow();
+        }
+        const routed = this.root.handleViewportPreInput(data, true, Date.now(), this.root.usesDefaultInputSurface() && !this.#terminal.hasFocusedOverlay());
+        if (routed.copySelection !== undefined) {
+            const snapshot = routed.copySelection;
+            const acknowledgement = copyAcknowledgement(snapshot);
+            const intent = ++this.#copyIntentSequence;
+            void this.#responseCopy?.submit(snapshot, this.#pendingClipboardWrite).then(result => {
+                if (this.#disposed || !this.#terminal.running || intent !== this.#copyIntentSequence
+                    || result.outcome !== "delivered" && result.outcome !== "submitted-unverified")
+                    return;
+                if (acknowledgement.hasNonWhitespace) {
+                    this.root.showCopyAcknowledgement(`copied ${acknowledgement.characters} chars to clipboard`);
+                }
+            });
+        }
+        if (!routed.consumed)
+            return routed.data === data ? undefined : { data: routed.data };
+        return routed.data.length === 0 ? { consume: true } : { data: routed.data };
+    }
     #promptSuggestionPresentationBlockReason(identity) {
         const view = this.view();
         if (this.#disposed)
@@ -689,18 +650,13 @@ export class OwnedUiSessionShell {
             return "stale-identity";
         return this.root.promptSuggestionPresentationBlockReason();
     }
-    damagePresentationDecision() {
-        return this.#damageTerminal?.lastDecision ?? null;
-    }
     start() {
         if (this.#started)
             return;
         this.#started = true;
-        this.runtime.start();
+        this.#terminal.start();
         this.#promptHistory?.start();
         this.#syncTerminalProgress(this.view());
-        if (this.#customViewport)
-            this.#setPointerReporting(true);
         void this.backend.extensions.bindExtensionUi(this.#extensionBridge.context, () => { void this.shutdown(); });
         this.#syncView();
         // Performance: the spare clipboard helpers fork after the first frame is out, so startup never waits on them.
@@ -754,7 +710,7 @@ export class OwnedUiSessionShell {
             render: width => [...renderPiShellStatusText(`Waiting for images (${count} submission${count === 1 ? "" : "s"}) — Esc cancels; dequeue restores`, width)],
             invalidate: () => { },
         }, "aboveEditor");
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
     }
     #cancelWaitingImages() {
         for (const item of this.#waitingImages.values())
@@ -807,13 +763,13 @@ export class OwnedUiSessionShell {
                         ...(result.output ? { detail: result.output } : {}),
                     };
                     this.root.appendWorkflowResult(workflow);
-                    this.runtime.requestRender();
+                    this.#terminal.requestRender();
                     return workflow.outcome === "failed" ? rejected(workflow.message) : { outcome: "completed", diagnostic: null };
                 }
                 catch (error) {
                     const message = `Bash command failed: ${error instanceof Error ? error.message : String(error)}`;
                     this.root.appendWorkflowResult({ command: "debug", outcome: "failed", message });
-                    this.runtime.requestRender();
+                    this.#terminal.requestRender();
                     return rejected(message);
                 }
             }
@@ -843,7 +799,7 @@ export class OwnedUiSessionShell {
             return this.shutdown();
         this.root.editor.setText("");
         this.#lastClearTime = now;
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
         return { outcome: "completed", diagnostic: null };
     }
     async interrupt(now = Date.now()) {
@@ -924,7 +880,7 @@ export class OwnedUiSessionShell {
     async cycleModel(direction) {
         const result = await this.backend.workflows.cycleModelWorkflow(direction);
         this.root.appendWorkflowResult(result);
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
         return workflowAdapterResult(result);
     }
     async queueFollowUp() {
@@ -956,7 +912,7 @@ export class OwnedUiSessionShell {
         if (queued.length === 0)
             return;
         this.root.editor.setText(queued.join("\n"));
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
     }
     showSelector(title, options, onSelect, onCancel) {
         this.#dialogHandle?.hide();
@@ -978,7 +934,7 @@ export class OwnedUiSessionShell {
                 onCancel?.();
             },
         });
-        const handle = this.runtime.showOverlay(component, {
+        const handle = this.#terminal.showOverlay(component, {
             width: "70%",
             maxHeight: "80%",
             anchor: "center",
@@ -993,16 +949,16 @@ export class OwnedUiSessionShell {
         return {
             get disposed() { return isDisposed(); },
             setInputSurface: surface => this.root.setInputSurface(surface),
-            requestRender: () => this.runtime.requestRender(),
-            viewport: () => this.runtime.viewport(),
+            requestRender: () => this.#terminal.requestRender(),
+            viewport: () => this.#terminal.viewport(),
             appendWorkflowStatus: text => this.root.appendWorkflowStatus(text),
             appendWorkflowResult: result => this.root.appendWorkflowResult(result),
             runWorkflow: request => this.runWorkflow(request),
             // Invariant: the custom bare-A1 surface holds frames while optional selectors load and is permanently
             // fullscreen; the pinned comparison profiles render immediately and keep Pi's TUI mode switch.
             ...(this.#customViewport
-                ? { beginPresentationHold: () => this.runtime.beginPresentationHold() }
-                : { switchTuiMode: mode => this.runtime.switchMode(mode) }),
+                ? { beginPresentationHold: () => this.#terminal.beginPresentationHold() }
+                : { switchTuiMode: mode => this.#terminal.switchMode(mode) }),
         };
     }
     #loadLazySelectors() {
@@ -1018,13 +974,13 @@ export class OwnedUiSessionShell {
         const close = () => {
             this.root.setFooterLevel(true);
             this.root.setInputSurface(null);
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
         };
         const select = (level) => {
             close();
             void this.runWorkflow({ command: "thinking", argument: "", selection: level });
         };
-        const releasePresentation = this.#customViewport ? this.runtime.beginPresentationHold() : undefined;
+        const releasePresentation = this.#customViewport ? this.#terminal.beginPresentationHold() : undefined;
         try {
             const selectors = await this.#loadLazySelectors();
             const component = await selectors.createThinking({
@@ -1045,7 +1001,7 @@ export class OwnedUiSessionShell {
                 return;
             this.root.setFooterLevel(false);
             this.root.setInputSurface(component);
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
         }
         finally {
             releasePresentation?.();
@@ -1055,7 +1011,7 @@ export class OwnedUiSessionShell {
     showSkillsSelector(skills = this.#skillSummaries()) {
         const close = () => {
             this.root.setInputSurface(null);
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
         };
         const component = createPiShellSkillsSelector({
             skills,
@@ -1066,7 +1022,7 @@ export class OwnedUiSessionShell {
             onCancel: close,
         });
         this.root.setInputSurface(component);
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
     }
     showModelSelector(initialSearchInput) {
         this.#presenters.openModelSelector(this.#dialogHost, initialSearchInput);
@@ -1075,19 +1031,19 @@ export class OwnedUiSessionShell {
         const options = this.backend.catalog.pinnedForkOptions();
         if (options.length === 0) {
             this.root.appendWorkflowResult({ command: "fork", outcome: "completed", message: "No messages to fork from", messageKind: "status" });
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
             return;
         }
         const close = () => {
             this.root.setInputSurface(null);
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
         };
         const component = createPiShellUserMessageSelector(options, selection => {
             close();
             void this.runWorkflow({ command: "fork", argument: "", selection });
         }, close);
         this.root.setInputSurface(component);
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
     }
     async showLogoutSelector() {
         let options;
@@ -1100,24 +1056,24 @@ export class OwnedUiSessionShell {
                 outcome: "failed",
                 message: `Could not read stored credentials: ${error instanceof Error ? error.message : String(error)}`,
             });
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
             return;
         }
         if (options.length === 0) {
             this.root.appendWorkflowStatus("No stored credentials to remove. /logout only removes credentials saved by /login; environment variables and models.json config are unchanged.");
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
             return;
         }
         const close = () => {
             this.root.setInputSurface(null);
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
         };
         const component = createPiShellAuthProviderSelector("logout", options, selection => {
             close();
             void this.runWorkflow({ command: "logout", argument: "", selection });
         }, close);
         this.root.setInputSurface(component);
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
     }
     showLoginMethodSelector(providerReference) {
         const method = this.backend.catalog.pinnedLoginMethodOptions(providerReference);
@@ -1133,7 +1089,7 @@ export class OwnedUiSessionShell {
         }
         const close = () => {
             this.root.setInputSurface(null);
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
         };
         const labels = method.options.map(option => option.label);
         const component = createPiShellExtensionSelector(method.title, labels, label => {
@@ -1144,7 +1100,7 @@ export class OwnedUiSessionShell {
             void this.runWorkflow({ command: "login", argument: "", selection });
         }, close);
         this.root.setInputSurface(component);
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
     }
     showTreeSelector(initialSelectedId) {
         return this.#presenters.openTreeSelector(this.#dialogHost, (entryId, skipSummaryPrompt) => {
@@ -1154,7 +1110,7 @@ export class OwnedUiSessionShell {
     showLoginAuthTypeSelector() {
         const close = () => {
             this.root.setInputSurface(null);
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
         };
         const labels = ["Sign in with an account", "Sign in with an API key"];
         const component = createPiShellExtensionSelector("Select authentication method:", labels, label => {
@@ -1162,18 +1118,18 @@ export class OwnedUiSessionShell {
             this.showLoginProviderSelector(label === labels[0] ? "oauth" : "api_key");
         }, close);
         this.root.setInputSurface(component);
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
     }
     showLoginProviderSelector(authType, initialSearchInput) {
         const options = this.backend.catalog.pinnedLoginOptions(authType);
         if (options.length === 0) {
             this.root.appendWorkflowStatus(authType === "oauth" ? "No account providers available." : authType === "api_key" ? "No API key providers available." : "No login providers available.");
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
             return;
         }
         const close = () => {
             this.root.setInputSurface(null);
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
         };
         const component = createPiShellAuthProviderSelector("login", options, id => {
             close();
@@ -1184,7 +1140,7 @@ export class OwnedUiSessionShell {
                 this.showLoginAuthTypeSelector();
         }, initialSearchInput);
         this.root.setInputSurface(component);
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
     }
     showSessionSelector() {
         return this.#presenters.openSessionSelector(this.#dialogHost, () => { void this.shutdown(); });
@@ -1224,7 +1180,7 @@ export class OwnedUiSessionShell {
                 if (this.#disposed)
                     return;
                 this.root.appendWorkflowResult({ command: "name", outcome: "failed", message: error instanceof Error ? error.message : String(error) });
-                this.runtime.requestRender();
+                this.#terminal.requestRender();
             });
             return { outcome: "completed", diagnostic: null };
         }
@@ -1234,16 +1190,16 @@ export class OwnedUiSessionShell {
             if (setup) {
                 const close = () => {
                     this.root.setInputSurface(null);
-                    this.runtime.requestRender();
+                    this.#terminal.requestRender();
                 };
                 const dialog = createPiShellLoginDialog({
-                    getColumns: () => this.runtime.viewport().columns,
-                    getRows: () => this.runtime.viewport().rows,
-                    requestRender: () => this.runtime.requestRender(),
+                    getColumns: () => this.#terminal.viewport().columns,
+                    getRows: () => this.#terminal.viewport().rows,
+                    requestRender: () => this.#terminal.requestRender(),
                 }, setup.providerId, close, setup.providerName, setup.title);
                 dialog.showInfo(setup.message, [], true);
                 this.root.setInputSurface(dialog);
-                this.runtime.requestRender();
+                this.#terminal.requestRender();
                 return { outcome: "completed", diagnostic: null };
             }
         }
@@ -1298,7 +1254,7 @@ export class OwnedUiSessionShell {
             const blocked = this.backend.workflows.reloadBlockedResult();
             if (blocked) {
                 this.root.appendWorkflowResult(blocked);
-                this.runtime.requestRender();
+                this.#terminal.requestRender();
                 return workflowAdapterResult(blocked);
             }
             this.root.resetExtensionUi();
@@ -1308,16 +1264,16 @@ export class OwnedUiSessionShell {
             : undefined;
         const shareSurface = shareDialog === undefined ? undefined
             : (this.#customViewport ? shareDialog.createPiShellShareOperationDialog : shareDialog.createPiShellOperationLoader)({
-                getColumns: () => this.runtime.viewport().columns,
-                getRows: () => this.runtime.viewport().rows,
-                requestRender: () => this.runtime.requestRender(),
+                getColumns: () => this.#terminal.viewport().columns,
+                getRows: () => this.#terminal.viewport().rows,
+                requestRender: () => this.#terminal.requestRender(),
             }, "Creating gist…");
         const operationSurface = shareSurface ?? (request.command === "reload" ? createPiShellReloadBox() : undefined);
         const now = this.#reloadPresentation?.now ?? Date.now;
         const shownAt = now();
         if (operationSurface) {
             this.root.setInputSurface(operationSurface);
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
         }
         let result;
         try {
@@ -1330,7 +1286,7 @@ export class OwnedUiSessionShell {
                 if (request.command === "reload")
                     await this.#holdReloadSurface(now() - shownAt);
                 this.root.setInputSurface(null);
-                this.runtime.requestRender();
+                this.#terminal.requestRender();
             }
         }
         if (copyGeneration !== undefined && (this.#disposed || copyGeneration !== this.backend.identity.sessionBindingGeneration)) {
@@ -1359,7 +1315,7 @@ export class OwnedUiSessionShell {
         }
         if (result.outcome === "requires-selection" || result.outcome === "requires-confirmation") {
             this.root.appendWorkflowResult({ command: request.command, outcome: "failed", message: `Owned controller missing for ${request.command}` });
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
             return { outcome: "failed", diagnostic: `Owned controller missing for ${request.command}` };
         }
         if (request.command === "reload" && result.outcome === "completed") {
@@ -1378,7 +1334,7 @@ export class OwnedUiSessionShell {
         else {
             this.root.appendWorkflowResult(result);
         }
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
         return workflowAdapterResult(result);
     }
     async #holdReloadSurface(visibleMs) {
@@ -1393,7 +1349,7 @@ export class OwnedUiSessionShell {
         const context = this.backend.catalog.pinnedProjectTrustContext();
         const close = () => {
             this.root.setInputSurface(null);
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
         };
         const component = createPiShellTrustSelector({
             ...context,
@@ -1407,12 +1363,12 @@ export class OwnedUiSessionShell {
                     close();
                     this.root.appendWorkflowResult({ command: "trust", outcome: "failed", message: error instanceof Error ? error.message : String(error) });
                 }
-                this.runtime.requestRender();
+                this.#terminal.requestRender();
             },
             onCancel: close,
         });
         this.root.setInputSurface(component);
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
     }
     showScopedModelsSelector() {
         this.#presenters.openScopedModelsSelector(this.#dialogHost);
@@ -1426,32 +1382,26 @@ export class OwnedUiSessionShell {
     showModelsDialog(initialQuery) {
         this.#presenters.openModelsDialog(this.#dialogHost, initialQuery);
     }
-    // Invariant: pointer reporting is disabled on every path that ends the owning screen.
-    #setPointerReporting(enabled, forceOff = false) {
-        const effective = forceOff ? false : this.#customViewport || enabled;
-        if (this.#pointerReporting === effective)
-            return;
-        this.#pointerReporting = effective;
-        if (!this.runtime.active)
-            return;
-        this.runtime.writeControl(effective ? MOUSE_TRACKING_ON : MOUSE_TRACKING_OFF);
-    }
-    // Invariant: one teardown per shell, starting on a microtask so never inside the event listener that
-    // requested it. Callers during the teardown share its outcome; a later call finds it done.
+    // Invariant: one teardown per presenter, starting on a microtask so never inside the event listener that
+    // requested it. Callers during the teardown share its outcome; a later call finds it done. Closing the
+    // terminal host's last presenter ends the terminal.
     dispose() {
         if (this.#disposePromise !== undefined)
             return this.#disposePromise;
         if (this.#disposed)
             return Promise.resolve();
         this.#disposed = true;
-        const pending = Promise.resolve().then(() => this.#dispose());
+        const pending = Promise.resolve().then(() => this.#host.close(this));
         this.#disposePromise = pending;
         const clear = () => { if (this.#disposePromise === pending)
             this.#disposePromise = undefined; };
         void pending.then(clear, clear);
         return pending;
     }
-    async #dispose() {
+    release(terminal) {
+        if (this.#released !== undefined)
+            return { exitText: "", failures: [], settle: async () => [] };
+        this.#disposed = true;
         const failures = [];
         const attempt = (action) => { try {
             action();
@@ -1462,8 +1412,6 @@ export class OwnedUiSessionShell {
         // Invariant: events stop first, so nothing re-enters the view during history close, outro, or restoration.
         attempt(() => this.#unsubscribe());
         this.#copyIntentSequence += 1;
-        // Invariant: the outro frame is what the terminal shows now, before any cleanup writes.
-        const outroFrame = this.#captureQuitOutroFrame();
         this.#responseCopy?.dispose();
         this.#copyExecutor?.dispose();
         this.#cancelWaitingImages();
@@ -1472,8 +1420,6 @@ export class OwnedUiSessionShell {
         attempt(() => { historyCleanup = this.#promptHistory?.close() ?? Promise.resolve(true); });
         attempt(() => { pasteCleanup = this.root.disposePendingPastes(); });
         attempt(() => this.root.clearViewportPointerState());
-        attempt(() => this.#setPointerReporting(false, true));
-        attempt(() => this.#removeViewportPreInput());
         attempt(() => this.#streamPresentation.dispose());
         attempt(() => {
             if (this.#startupRouteTimer !== undefined)
@@ -1485,17 +1431,16 @@ export class OwnedUiSessionShell {
         attempt(() => this.#unsubscribePromptImages());
         attempt(() => this.#unsubscribeSkills());
         attempt(() => this.#unsubscribeSettings());
-        attempt(() => this.#unsubscribeBackgroundSettings());
-        let fullscreenExitText = "";
+        let exitText = "";
         attempt(() => {
             const exitMode = this.backend.identity.disposed ? this.#fullscreenExitOutput : this.backend.settings.snapshot().fullscreenExitOutput;
             const resume = this.backend.identity.currentSessionResumeMetadata();
             const resumeHint = resume === null ? "" : `${dim("To resume this session:")} ${formatSessionResumeCommand(resume)}`;
             // Invariant: bare A1 leaves only the hint behind; the pinned comparison profile still
             // honors fullscreenExitOutput, including the styled transcript.
-            fullscreenExitText = this.runtime.mode !== "fullscreen" ? ""
+            exitText = terminal.mode !== "fullscreen" ? ""
                 : this.#customViewport || exitMode === "resume-hint" ? resumeHint
-                    : [this.root.exitTranscript(this.runtime.viewport().columns), resumeHint].filter(Boolean).join("\n\n");
+                    : [this.root.exitTranscript(terminal.columns), resumeHint].filter(Boolean).join("\n\n");
         });
         attempt(() => this.#unbindClipboardWriter());
         attempt(() => this.#unbindPiSettings());
@@ -1505,76 +1450,22 @@ export class OwnedUiSessionShell {
         attempt(() => this.#dialogHandle?.hide());
         attempt(() => this.#extensionBridge.dispose());
         attempt(() => this.#programStatus.clear());
-        // Invariant: from here to the leave nothing but the outro paints. A throttled frame the
-        // renderer still has queued would otherwise land during the stop-time input drain and
-        // flash the prompt and footer, whether or not an effect plays.
-        attempt(() => this.#freezeQuitPresentation());
-        await this.#playQuitOutro(outroFrame);
-        // Invariant: terminal restoration precedes any potentially stalled backend teardown. The
-        // fullscreen leave preserves the screen: the pinned runtime never dumps its final document
-        // into the parent terminal, so only the configured exit text follows the leave.
-        await this.runtime.dispose({ preserveScreen: this.runtime.mode === "fullscreen" }).catch(error => failures.push(error));
-        await historyCleanup.catch(() => false); // Security: background durability outcomes never enter terminal output.
-        await boundedCleanup(() => pasteCleanup).catch(error => failures.push(error));
-        await boundedCleanup(() => this.backend.extensions.unbindExtensionUi()).catch(error => failures.push(error));
-        if (failures.length > 0)
-            throw new AggregateError(failures, "Owned UI disposal failed");
-        if (fullscreenExitText.length > 0)
-            this.runtime.writeAfterStop(`${fullscreenExitText}\n`);
-    }
-    // Invariant: the snapshot is synchronous; the outro module itself loads only at quit.
-    #captureQuitOutroFrame() {
-        const outro = this.#quitOutro;
-        if (outro === undefined || !outro.interactive || !this.#customViewport || this.#damageTerminal === null)
-            return null;
-        if (!this.runtime.active || this.runtime.mode !== "fullscreen")
-            return null;
-        try {
-            if (!outro.snapshot().enabled)
-                return null;
-            const viewport = this.runtime.viewport();
-            return {
-                rows: this.#damageTerminal.presentedRows(), columns: viewport.columns, height: viewport.rows,
-                settings: {
-                    effect: QUIT_OUTRO_EFFECT,
-                    durationMs: QUIT_OUTRO_DURATION_MS,
-                    canvasBackgroundAnsi: this.#damageTerminal.canvasBackgroundAnsi,
-                },
-            };
-        }
-        catch {
-            return null;
-        }
-    }
-    #freezeQuitPresentation() {
-        if (!this.#customViewport || !this.runtime.active || this.runtime.mode !== "fullscreen")
-            return;
-        this.runtime.freezePresentation();
-    }
-    // Rationale: any failure here only skips the effect; restoration always follows.
-    async #playQuitOutro(capture) {
-        const outro = this.#quitOutro;
-        if (capture === null || outro === undefined || !this.runtime.active)
-            return;
-        try {
-            // Rationale: the effects stay off the startup graph; quit is the only time they load.
-            const { captureQuitOutroFrame, playQuitOutro } = await import("./quit-outro.js");
-            const frame = captureQuitOutroFrame(capture.rows, capture.columns, capture.height);
-            if (frame === null || !this.runtime.active)
-                return;
-            await playQuitOutro(frame, capture.settings.effect, capture.settings.durationMs, {
-                write: data => this.runtime.writeControl(data),
-                ...(capture.settings.canvasBackgroundAnsi === null
-                    ? {}
-                    : { canvasBackgroundAnsi: capture.settings.canvasBackgroundAnsi }),
-                ...(outro.now === undefined ? {} : { now: outro.now }),
-                ...(outro.sleep === undefined ? {} : { sleep: outro.sleep }),
-                ...(outro.seed === undefined ? {} : { seed: outro.seed }),
-            });
-        }
-        catch {
-            // Rationale: a failed or interrupted effect must never hold the terminal; restoration follows.
-        }
+        // Invariant: the host settles a presenter only once the terminal is restored, so these never stall it.
+        const settle = async () => {
+            const settled = [];
+            try {
+                this.root.dispose();
+            }
+            catch (error) {
+                settled.push(error);
+            }
+            await historyCleanup.catch(() => false); // Security: background durability outcomes never enter terminal output.
+            await boundedCleanup(() => pasteCleanup).catch(error => settled.push(error));
+            await boundedCleanup(() => this.backend.extensions.unbindExtensionUi()).catch(error => settled.push(error));
+            return settled;
+        };
+        this.#released = { exitText, failures, settle };
+        return this.#released;
     }
     #settleStoppedLifecycle() {
         void this.dispose().then(() => this.#resolveStoppedLifecycle(), () => this.#resolveStoppedLifecycle());
@@ -1602,9 +1493,9 @@ export class OwnedUiSessionShell {
         return view;
     }
     #syncTerminalProgress(view) {
-        if (!this.runtime.active)
+        if (!this.#terminal.running)
             return;
-        this.runtime.setTerminalProgress(this.#terminalProgressEnabled && view.lifecycle === "busy");
+        this.#terminal.setTerminalProgress(this.#terminalProgressEnabled && view.lifecycle === "busy");
         if (view.lifecycle === "stopped" || view.lifecycle === "stopping") {
             this.#programStatus.clear();
             return;
@@ -1642,7 +1533,6 @@ export class OwnedUiSessionShell {
             this.#dialogHandle = undefined;
             this.#dialogId = undefined;
             this.#dialogSource = undefined;
-            this.#setPointerReporting(false);
             this.root.setInputSurface(null);
             this.root.resetExtensionUi();
             this.root.resetWorkflowPresentation();
@@ -1650,7 +1540,7 @@ export class OwnedUiSessionShell {
         this.root.update(view);
         this.#syncDialog(view.dialog);
         this.#presentStartupTrustWarning(view);
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
         for (const listener of this.#listeners)
             listener(view);
         return view;
@@ -1661,16 +1551,16 @@ export class OwnedUiSessionShell {
         if (this.#startupTrustHandled || !this.#customViewport)
             return;
         const diagnostic = view.diagnostics.find(candidate => candidate.code === "project-trust");
-        if (diagnostic === undefined || !this.runtime.active)
+        if (diagnostic === undefined || !this.#terminal.running)
             return;
         this.#startupTrustHandled = true;
         this.root.appendWorkflowMessage({ kind: "warning", message: diagnostic.message });
     }
     #presentStartupRoute() {
         const pending = this.#startupRoute;
-        if (pending === undefined || this.#disposed || !this.runtime.active)
+        if (pending === undefined || this.#disposed || !this.#terminal.running)
             return;
-        if (this.runtime.hasOverlay() || !this.root.usesDefaultInputSurface()) {
+        if (this.#terminal.hasOverlay() || !this.root.usesDefaultInputSurface()) {
             this.#startupRouteTimer = setTimeout(() => {
                 this.#startupRouteTimer = undefined;
                 this.#presentStartupRoute();
@@ -1685,121 +1575,33 @@ export class OwnedUiSessionShell {
         const surface = this.#routeHost?.open(route, input) ?? null;
         if (surface === null)
             return { outcome: "failed", diagnostic: `route is unavailable: ${route}` };
-        if (!this.runtime.active)
+        if (!this.#terminal.running)
             return { outcome: "failed", diagnostic: "runtime is not active" };
         this.root.dismissNotice();
         this.#dialogHandle?.hide();
         this.#dialogSource = "route";
-        // Protocol: any-event reporting: hover and drag are what the screen is driven by, and
-        // it also stops the terminal treating a drag as a text selection.
-        this.#setPointerReporting(true);
-        // Protocol: the interrupt chord is global, so it is watched on raw input rather than
-        // through the overlay: the pinned shell handles that key before an overlay
-        // ever sees it, which is why an owned screen must not rely on being asked.
-        let armedAt = 0;
-        const removeInterruptWatch = this.runtime.addInputListener(data => {
-            if (!data.includes(INTERRUPT))
-                return undefined;
-            // Protocol: route hosts decide whether one interrupt closes their app. Raw-input forwarding
-            // is required because Pi handles Ctrl+C before the fullscreen overlay receives normal input.
-            const consumedBySurface = surface.handleInput(INTERRUPT);
-            if (surface.isClosed()) {
-                armedAt = 0;
-                closeSurface();
-                return { consume: true };
-            }
-            if (consumedBySurface) {
-                armedAt = 0;
-                this.runtime.requestRender();
-                return { consume: true };
-            }
-            const now = Date.now();
-            if (armedAt !== 0 && now - armedAt <= INTERRUPT_CHORD_MS) {
-                armedAt = 0;
-                closeSurface();
-                void this.shutdown();
-                return { consume: true };
-            }
-            armedAt = now;
-            this.runtime.requestRender();
-            // Invariant: the presented screen owns the chord, so the pinned shell never sees a
-            // stray interrupt while it is up.
-            return { consume: true };
-        });
-        let removeSurfacePreInput = () => { };
-        let rendered = false;
-        let closed = false;
-        const closeSurface = () => {
-            if (closed)
-                return;
-            closed = true;
-            removeSurfacePreInput();
-            removeInterruptWatch();
-            this.#setPointerReporting(false);
-            this.#dialogHandle?.hide();
-            this.#dialogHandle = undefined;
-            this.#dialogId = undefined;
-            this.#dialogSource = undefined;
-            if (rendered) {
-                try {
-                    void onClosed?.()?.catch(() => undefined);
+        const handle = this.#terminal.openRoute(surface, {
+            exit: () => { void this.shutdown(); },
+            closed: rendered => {
+                if (this.#dialogHandle === handle) {
+                    this.#dialogHandle = undefined;
+                    this.#dialogId = undefined;
+                    this.#dialogSource = undefined;
                 }
-                catch { /* Rationale: a failed acknowledgement stays pending. */ }
-            }
-        };
-        // Compatibility: fullscreen Pi owns a fallback text-selection layer before focused overlay
-        // components see pointer input. Route every mouse report to the owned screen
-        // at the pre-input boundary so dropdowns, value hover, and numeric +/- work,
-        // and consume even unhandled reports so settings content is never selected.
-        removeSurfacePreInput = this.runtime.addPreInputListener(data => {
-            const { events, rest } = parseMouseInput(data);
-            if (events.length === 0)
-                return undefined;
-            for (const event of events)
-                surface.handleMouse(event);
-            if (surface.isClosed())
-                closeSurface();
-            else
-                this.runtime.requestRender();
-            return rest.length === 0 ? { consume: true } : { data: rest };
-        });
-        const rows = () => Math.max(1, this.runtime.viewport().rows);
-        const component = {
-            render: (width) => {
-                const frame = [...surface.render(Math.max(1, width), rows())];
-                rendered = true;
-                return frame;
-            },
-            handleInput: (data) => {
-                const { events, rest } = parseMouseInput(data);
-                for (const event of events)
-                    surface.handleMouse(event);
-                if (rest.length > 0)
-                    surface.handleInput(rest);
-                if (surface.isClosed()) {
-                    closeSurface();
-                    return;
+                if (rendered) {
+                    try {
+                        void onClosed?.()?.catch(() => undefined);
+                    }
+                    catch { /* Rationale: a failed acknowledgement stays pending. */ }
                 }
-                this.runtime.requestRender();
             },
-            invalidate: () => this.runtime.requestRender(),
-        };
-        surface.onRenderRequested(() => this.runtime.requestRender());
-        surface.onExitRequested(() => {
-            closeSurface();
-            void this.shutdown();
-        });
-        this.#dialogHandle = this.runtime.showOverlay(component, {
-            width: "100%",
-            maxHeight: "100%",
-            anchor: "top-left",
-            inputCoordination: "owned",
         });
+        this.#dialogHandle = handle;
         this.#dialogId = surface.id;
         return { outcome: "completed", diagnostic: null };
     }
     #syncDialog(dialog) {
-        if (!this.runtime.active)
+        if (!this.#terminal.running)
             return;
         if (dialog === null) {
             // Invariant: locally owned routes (notably /settings) are independent of backend
@@ -1830,7 +1632,7 @@ export class OwnedUiSessionShell {
                 this.#dialogSource = undefined;
             },
         });
-        this.#dialogHandle = this.runtime.showOverlay(component, {
+        this.#dialogHandle = this.#terminal.showOverlay(component, {
             width: "70%",
             maxHeight: "80%",
             anchor: "center",
@@ -1896,7 +1698,7 @@ export class OwnedUiSessionShell {
         if (skill === undefined) {
             const message = "Unknown skill: " + token;
             this.root.appendWorkflowMessage({ kind: "error", message });
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
             return { outcome: "failed", diagnostic: message };
         }
         return this.#submitSkillPrompt(skillPrompt(skill.name, separator < 0 ? "" : trimmed.slice(separator + 1)), text);
@@ -1915,7 +1717,7 @@ export class OwnedUiSessionShell {
     #treeSummary() {
         return new Promise(resolve => {
             this.root.setInputSurface(createPiShellExtensionSelector("Summarize Branch?", ["No summary", "Summarize", "Summarize with custom prompt"], resolve, () => resolve(undefined)), true, "opaque");
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
         });
     }
     async #completeTreeSelection(entryId, skipSummaryPrompt) {
@@ -1938,7 +1740,7 @@ export class OwnedUiSessionShell {
             }
         }
         this.root.setInputSurface(null);
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
         const result = await this.runWorkflow({
             command: "tree",
             argument: "",
@@ -1954,9 +1756,9 @@ export class OwnedUiSessionShell {
     #startWorkflowLogin(request) {
         this.#finishWorkflowLogin();
         const dialog = createPiShellLoginDialog({
-            getColumns: () => this.runtime.viewport().columns,
-            getRows: () => this.runtime.viewport().rows,
-            requestRender: () => this.runtime.requestRender(),
+            getColumns: () => this.#terminal.viewport().columns,
+            getRows: () => this.#terminal.viewport().rows,
+            requestRender: () => this.#terminal.requestRender(),
         }, request.providerId, success => {
             if (!success)
                 this.#finishWorkflowLogin();
@@ -1968,7 +1770,7 @@ export class OwnedUiSessionShell {
             message: `Log in to ${request.providerName}`,
         });
         this.#syncTerminalProgress(this.view());
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
     }
     #requestWorkflowInput(request) {
         const dialog = this.#activeLoginDialog;
@@ -1981,7 +1783,7 @@ export class OwnedUiSessionShell {
                 const restoreDialog = () => {
                     if (this.#activeLoginDialog === dialog)
                         this.root.setInputSurface(dialog);
-                    this.runtime.requestRender();
+                    this.#terminal.requestRender();
                 };
                 const selector = createPiShellExtensionSelector(request.message, labels, label => {
                     const id = options.find(option => option.label === label)?.id;
@@ -1992,13 +1794,13 @@ export class OwnedUiSessionShell {
                     resolve(null);
                 });
                 this.root.setInputSurface(selector, false);
-                this.runtime.requestRender();
+                this.#terminal.requestRender();
             });
         }
         const response = request.type === "manual-code"
             ? dialog.showManualInput(request.message)
             : dialog.showPrompt(request.message, request.placeholder);
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
         return response.then(value => value, () => null);
     }
     #notifyWorkflowLogin(event) {
@@ -2017,7 +1819,7 @@ export class OwnedUiSessionShell {
             dialog.showWaiting(event.message);
         else
             dialog.showProgress(event.message);
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
     }
     #finishWorkflowLogin() {
         if (!this.#activeLoginDialog)
@@ -2026,7 +1828,7 @@ export class OwnedUiSessionShell {
         this.root.setInputSurface(null);
         this.#programStatus.setBlocked("authentication", undefined);
         this.#syncTerminalProgress(this.view());
-        this.runtime.requestRender();
+        this.#terminal.requestRender();
     }
     async #execute(command, draft) {
         if (draft === undefined)
@@ -2080,7 +1882,7 @@ export class OwnedUiSessionShell {
         try {
             this.root.appendWorkflowResult({ command: "debug", outcome: "failed", message: message
                     ?? (error instanceof ImageAttachmentError ? error.message : "Submission failed. Check the prompt and try again.") }, error instanceof ImageAttachmentError ? error.code : undefined);
-            this.runtime.requestRender();
+            this.#terminal.requestRender();
         }
         catch { /* Security: error presentation cannot create another rejected submission callback. */ }
     }
@@ -2092,6 +1894,29 @@ export class OwnedUiSessionShell {
         return `pi-shell-${prefix}-${this.#sequence}`;
     }
 }
+/**
+ * One session on a terminal of its own: a terminal host with this presenter attached. Disposing it ends the
+ * terminal, as quitting the single-session product does.
+ */
+export class OwnedUiSessionShell extends OwnedUiSessionPresenter {
+    constructor(options) {
+        const host = new OwnedUiTerminalHost(sessionTerminalHostOptions(options));
+        try {
+            super(host, options);
+        }
+        catch (error) {
+            void host.dispose().catch(() => { });
+            throw error;
+        }
+        host.attach(this);
+    }
+    get runtime() {
+        return this.terminalHost.runtime;
+    }
+    damagePresentationDecision() {
+        return this.terminalHost.damagePresentationDecision;
+    }
+}
 function isCoalescedStreamBlock(kind) {
     return kind === "assistant" || kind === "thinking" || kind === "tool-call" || kind === "tool-result";
 }
@@ -2134,9 +1959,4 @@ function workflowAdapterResult(result) {
         return { outcome: "failed", diagnostic: result.message };
     return { outcome: "rejected", diagnostic: result.message };
 }
-const INTERRUPT = "\u0003";
-const INTERRUPT_CHORD_MS = 1_500;
 const RELOAD_SURFACE_MIN_VISIBLE_MS = 400;
-// Rationale: the outro is not configurable; the switch only decides whether this plan plays.
-const QUIT_OUTRO_EFFECT = "fall";
-const QUIT_OUTRO_DURATION_MS = 800;