@timurproko/a1 0.2.7-dev.1249 → 0.2.7-dev.1255

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

@@ -1,42 +1,22 @@
-import { ResponseCopyCoordinator } from "./response-copy-coordinator.js";
-import { createResponseCopyExecutor, responseCopyDestination } from "./response-copy-transport.js";
-import { MAX_COPY_CONTROL_BYTES } from "./response-copy-protocol.js";
+import { ShellClipboard } from "./shell-clipboard.js";
 import { PromptHistoryController } from "./prompt-history-controller.js";
 import { SessionDialogCoordinator } from "./dialog-coordinator.js";
 import { LoginInteraction } from "./login-interaction.js";
 import { PromptSubmission } from "./prompt-submission.js";
-import { ResidentTabCoordinator } from "./resident-tab-coordinator.js";
 import { SessionConcerns } from "./session-concern.js";
 import { composeExitText, SessionStopLatch } from "./session-lifecycle.js";
 import { openWorkflowSelector } from "./workflow-router.js";
-import { bindSessionSettings } from "./settings-bindings.js";
-import { promptSuggestionSurface, routeResponseToSuggestions, suggestionModelKey, suggestionPresentationBlockReason, } from "./suggestion-surface.js";
+import { bindSessionSettings, bindShellSettings } from "./settings-bindings.js";
+import { promptSuggestionSurface, suggestionPresentationBlockReason, } from "./suggestion-surface.js";
 import { CLEAR_EXIT_INTERVAL_MS, boundedCleanup } from "../../foundation/terminal-cleanup/terminal-reset.js";
 import { OWNED_UI_HIDDEN_COMMAND_NAMES } from "../../contracts/owned-ui/index.js";
-import { ImageAttachmentError } from "../../contracts/owned-ui/index.js";
 import { copyAcknowledgementText } from "../../ui/components/selection-copy.js";
-import { ContextualPromptSuggestionController } from "./prompt-suggestion-controller.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, createPiShellExtensionSelector, createPiShellLoginDialog, createPiShellReloadBox, createPiShellSkillsSelector, createPiShellTrustSelector, createPiShellUserMessageSelector, } from "../../integrations/pi/components/shell-selectors-dialogs.js";
+import { ShellPromptSuggestions } from "./shell-prompt-suggestions.js";
 import { OwnedUiTerminalHost, componentRuntime, 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";
 import { OwnedUiSessionShellRoot, shellResourceEntries, } from "./session-shell-root.js";
 // Invariant: a disposed shell leaves the engine a host that holds no reference back to it.
 const DETACHED_WORKFLOW_INTERACTION = { prompt: async () => null, notify() { } };
-// Invariant: the resume mode belongs to the presenter instance, not the persisted session or profile.
-const SOLO_RESUME_HINTS = new WeakSet();
-/** Resident Agents refuse the commands their tab bar serves instead, naming where they live. */
-const RESIDENT_UTILITY_TAB_REFUSALS = Object.freeze({
-    settings: "Settings is available from the global Settings tab.",
-    // Platform: macOS labels Alt `Option`.
-    changelog: `The changelog opens as its own tab from the command palette (${process.platform === "darwin" ? "Option" : "Alt"}+/).`,
-    name: "Rename the session by renaming its tab (F2).",
-});
 export { OwnedUiSessionShellRoot, } from "./session-shell-root.js";
 export { OwnedUiTerminalHost, sessionTerminalHostOptions } from "./shell-host.js";
 export { formatSessionResumeCommand, quoteCommandArgument } from "./session-lifecycle.js";
@@ -51,18 +31,14 @@ export class OwnedUiSessionPresenter {
     root;
     #host;
     #terminal;
-    #resident;
     #submission;
     #login;
     #concerns;
     #listeners = new Set();
     #unsubscribe;
-    #unsubscribePromptSuggestions;
     #promptSuggestions;
     #promptImages;
     #skills;
-    #unsubscribePromptImages;
-    #unsubscribeSkills;
     #installedCommandSignature = "";
     #promptHistory = null;
     #historyBinding;
@@ -76,21 +52,17 @@ export class OwnedUiSessionPresenter {
     #shutdownPromise;
     #disposePromise;
     #layoutParts;
-    #pendingClipboardWrite = Promise.resolve();
     // Invariant: translated startup diagnostics create at most one dock notice per kind per shell.
     #startupTrustHandled = false;
     #customViewport;
-    #lazySelectors;
-    #lazySelectorsPromise;
-    #responseCopy;
+    #clipboard;
     // Rationale: only an executor this shell created owns a spare copy helper worth warming and disposing.
-    #copyExecutor;
     #copyIntentSequence = 0;
     #unbindClipboardWriter;
     #reloadPresentation;
     #streamPresentation;
     #inputCoordination;
-    #unsubscribeSettings;
+    #unbindShellSettings;
     #unbindSessionSettings;
     #terminalProgressEnabled = false;
     #programStatus;
@@ -99,7 +71,6 @@ export class OwnedUiSessionPresenter {
     #lastEscapeTime = 0;
     #sessionGeneration;
     #sessionBindingGeneration;
-    #suggestionModelKey;
     constructor(host, options) {
         const { backend, cwd, routeHost, sessionLayout } = options.engine;
         const { terminal, startup, viewportSettings, reload: reloadPresentation, stream: streamPresentationOptions, input: inputPresentation, } = options.presentation ?? {};
@@ -110,17 +81,12 @@ export class OwnedUiSessionPresenter {
         this.#presenters = options.presenters;
         this.#sessionGeneration = this.backend.identity.sessionGeneration;
         this.#sessionBindingGeneration = this.backend.identity.sessionBindingGeneration;
-        this.#suggestionModelKey = suggestionModelKey(this.backend.session.view());
         this.#customViewport = sessionLayout === "custom-viewport";
-        if (options.presentation?.soloResumeHint)
-            SOLO_RESUME_HINTS.add(this);
         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;
-        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;
@@ -128,48 +94,19 @@ export class OwnedUiSessionPresenter {
         // throw releases them in reverse, so a shell that never finished constructing holds nothing.
         const constructed = [() => host.disconnect(this)];
         try {
-            this.#responseCopy = this.#customViewport ? new ResponseCopyCoordinator({
-                execute: responseCopy?.execute ?? (this.#copyExecutor = createResponseCopyExecutor({
-                    ...(sharedClipboard === undefined ? {} : { pool: sharedClipboard.copy }),
-                    ...(terminal === undefined && clipboard === undefined ? {} : { destination: "terminal" }),
-                    ...(clipboard?.writeText === undefined ? {} : { writeText: (text, signal) => clipboard.writeText(text, signal) }),
-                    // Invariant: the owned host is the route contract. Resident and pseudoterminal children must not infer
-                    // clipboard reachability from Node's view of stdout, and inactive presenters are fenced here.
-                    terminal: { submit: async (control, signal) => {
-                            if (signal.aborted || this.#disposed || !this.#terminal.running || !this.#terminal.attached)
-                                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");
-                            }
-                            this.#terminal.writeControl(control);
-                        } },
-                })),
-                ...(responseCopy?.onEvent === undefined ? {} : { onEvent: responseCopy.onEvent }),
-            }) : null;
-            constructed.push(() => { this.#responseCopy?.dispose(); this.#copyExecutor?.dispose(); });
-            const readClipboard = async (signal) => {
-                if (signal.aborted)
-                    throw new ImageAttachmentError("image-canceled");
-                if (clipboard === undefined)
-                    return runImageWorker({ kind: "clipboard" }, signal);
-                try {
-                    const image = await clipboard.readImage?.(signal);
-                    if (image !== null && image !== undefined) {
-                        const canonical = await runImageWorker({ kind: "canonicalize", source: image }, signal);
-                        if (canonical !== null)
-                            return { kind: "image", ...canonical };
-                    }
-                }
-                catch (error) {
-                    if (error instanceof ImageAttachmentError)
-                        throw error;
-                    // Compatibility: an unavailable image reader can still provide text.
-                }
-                const text = await clipboard.readText(signal);
-                return text === null ? null : { kind: "text", text };
-            };
-            this.root = new OwnedUiSessionShellRoot(this.backend.session.view(), cwd, {
+            this.#clipboard = new ShellClipboard({
+                ownedCopy: this.#customViewport, substituteTerminal: terminal !== undefined,
+                ...(sharedClipboard === undefined ? {} : { shared: sharedClipboard }),
+                ...(clipboard === undefined ? {} : { clipboard }),
+                ...(responseCopy === undefined ? {} : { responseCopy }),
+                ...(pastePreparation === undefined ? {} : { pastePreparation }),
+                disposed: () => this.#disposed,
+                terminalAttached: () => this.#terminal.running && this.#terminal.attached,
+                writeControl: control => this.#terminal.writeControl(control),
+            });
+            constructed.push(() => this.#clipboard.dispose());
+            const pastePreparationOptions = this.#clipboard.pastePreparation();
+            this.root = new OwnedUiSessionShellRoot(this.backend.session.view(), cwd, { presentation: options.presenters, components: options.presenters.components,
                 getColumns: () => this.#terminal.viewport().columns,
                 getRows: () => this.#terminal.viewport().rows,
                 requestRender: force => this.#terminal.requestRender(force),
@@ -180,8 +117,6 @@ export class OwnedUiSessionPresenter {
                     replacementSurfaceActive: !this.root.usesDefaultInputSurface(),
                 }),
                 enableDockInputReuse: inputPresentation?.viewportReuse !== false,
-                footerSessionName: options.engine.residentTab === undefined,
-                hideUtilityTabCommands: options.engine.residentTab !== undefined,
                 persistentHistory: this.#customViewport && promptHistory !== undefined,
                 ...(promptHistory === undefined ? {} : { historyEditor: promptHistory.editor }),
                 onSubmit: text => { void this.submit(text).catch(() => this.#submission.reportError()); },
@@ -201,56 +136,31 @@ export class OwnedUiSessionPresenter {
                 onDequeue: () => this.restoreQueuedInput(),
                 onEditorChange: text => {
                     this.#submission.noteEditorChange();
-                    this.#resident.checkpoint(text);
-                    promptSuggestionController?.abortPending();
+                    this.#promptSuggestions?.abortPending();
                     if (text.length === 0) {
                         // Concurrency: the editor synchronizes deletion-owned autocomplete after onChange.
                         // Reassert retained ghost text in the microtask before Pi emits its scheduled frame.
-                        queueMicrotask(() => promptSuggestionController?.restoreAvailable());
+                        queueMicrotask(() => this.#promptSuggestions?.restoreAvailable());
                     }
                     this.root.reconcilePromptImageLimitNotice(text);
                 },
-                onPromptSuggestionAccepted: () => promptSuggestionController?.accept(),
+                onPromptSuggestionAccepted: () => this.#promptSuggestions?.accept(),
                 onPromptSuggestionEligibilityChanged: () => {
-                    queueMicrotask(() => promptSuggestionController?.restoreAvailable());
+                    queueMicrotask(() => this.#promptSuggestions?.restoreAvailable());
                 },
                 onInputSurfaceChanged: () => {
-                    promptSuggestionController?.invalidate();
+                    this.#promptSuggestions?.invalidate();
                     this.#promptHistory?.synchronize();
                 },
                 onCopyText: (text, cut) => {
-                    if (this.#responseCopy !== null) {
-                        this.#trackCopy(this.#responseCopy.submitText(text), cut ? undefined : text.length);
-                        return;
-                    }
-                    const write = () => {
-                        if (this.#disposed)
-                            return Promise.resolve();
-                        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.
-                    this.#pendingClipboardWrite = write().catch(() => { });
-                },
-                readClipboardContent: async (signal = new AbortController().signal) => {
-                    await this.#pendingClipboardWrite;
-                    return readClipboard(signal);
-                },
-                captureClipboardPaste: () => {
-                    const before = this.#responseCopy?.capturePasteBarrier() ?? (async () => true);
-                    if (clipboard !== undefined)
-                        return { kind: "provided", read: readClipboard, before };
-                    if (responseCopyDestination(process.env) === "terminal")
-                        return {
-                            kind: "provided", before, read: async () => { throw new ImageAttachmentError("paste-unavailable"); },
-                        };
-                    return { kind: "native", before };
+                    const delivery = this.#clipboard.copyText(text);
+                    if (delivery !== undefined)
+                        this.#trackCopy(delivery, cut ? undefined : text.length);
                 },
+                readClipboardContent: signal => this.#clipboard.readContent(signal),
+                captureClipboardPaste: () => this.#clipboard.capturePaste(),
                 ...(pasteDiagnostics === undefined ? {} : { pasteDiagnostics: pasteDiagnostics }),
-                ...(pastePreparation === undefined && sharedClipboard === undefined ? {} : {
-                    pastePreparation: { ...pastePreparation, ...(sharedClipboard === undefined ? {} : { pool: sharedClipboard.paste }) },
-                }),
+                ...(pastePreparationOptions === undefined ? {} : { pastePreparation: pastePreparationOptions }),
                 ...(sharedKeybindings === undefined ? {} : { keybindings: sharedKeybindings }),
                 ...(this.#promptImages === null ? {} : { promptImageLimit: this.#promptImages.limit }),
                 skillsPresentation: () => this.#skills?.presentation() ?? "expand",
@@ -263,76 +173,46 @@ 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());
-            this.#resident = new ResidentTabCoordinator(options.engine.residentTab, { root: this.root });
-            constructed.push(() => this.#resident.dispose());
             const startupRoute = options.engine.startupRoute;
             this.#dialogs = new SessionDialogCoordinator({
                 terminal: this.#terminal,
                 root: this.root,
-                routeHost: routeHost ?? null,
+                routeHost: routeHost ?? null, dialogs: options.presenters.components.dialogs,
                 disposed: () => this.#disposed,
                 exit: () => { void this.shutdown(); },
-                routeClosed: route => this.#resident.closeOwnedRoute(route),
                 ...(startupRoute === undefined ? {} : { startupRoute }),
             });
             constructed.push(() => this.#dialogs.dispose());
             const initialPiSettings = this.backend.settings.snapshot();
-            this.#programStatus = new ProgramStatusReporter(status => this.#terminal.setProgramStatus(status), () => this.view().status.footer?.sessionName ?? undefined);
+            this.#programStatus = options.presenters.components.chrome.programStatusReporter(status => this.#terminal.setProgramStatus(status), () => this.view().status.footer?.sessionName ?? undefined);
             this.#login = new LoginInteraction({
-                terminal: this.#terminal, root: this.root, programStatus: this.#programStatus,
+                terminal: this.#terminal, root: this.root, programStatus: this.#programStatus, dialogs: options.presenters.components.dialogs,
                 syncProgress: () => this.#syncTerminalProgress(this.view()),
             });
             this.#submission = this.#createSubmission(cwd);
-            this.#resident.restoreInput(options.history?.imageSidecar);
             this.#reloadPresentation = reloadPresentation;
-            const presentationInterval = streamPresentationOptions?.intervalMs ?? STREAM_PRESENTATION_INTERVAL_MS;
-            this.#streamPresentation = streamPresentationOptions?.scheduler === undefined
-                ? new StreamPresentationCoalescer(() => this.#terminal.requestRender(), presentationInterval)
-                : new StreamPresentationCoalescer(() => this.#terminal.requestRender(), presentationInterval, streamPresentationOptions.scheduler);
+            this.#streamPresentation = new StreamPresentationCoalescer(() => this.#terminal.requestRender(), streamPresentationOptions?.intervalMs ?? STREAM_PRESENTATION_INTERVAL_MS, streamPresentationOptions?.scheduler);
             constructed.push(() => this.#streamPresentation.dispose());
-            const promptSuggestionOptions = this.#customViewport ? options.suggestions : undefined;
-            promptSuggestionController = promptSuggestionOptions === undefined ? null : new ContextualPromptSuggestionController({
-                generator: promptSuggestionOptions.generator,
-                enabled: promptSuggestionOptions.enabled(),
-                ...(promptSuggestionOptions.diagnostics === undefined ? {} : { diagnostics: promptSuggestionOptions.diagnostics }),
-                surface: promptSuggestionSurface(this.root, identity => this.#promptSuggestionPresentationBlockReason(identity), () => this.#terminal.requestRender()),
-            });
-            this.#promptSuggestions = promptSuggestionController;
+            this.#promptSuggestions = new ShellPromptSuggestions(this.#customViewport ? options.suggestions : undefined, promptSuggestionSurface(this.root, identity => suggestionPresentationBlockReason(identity, { disposed: this.#disposed, view: this.view(), sessionGeneration: this.backend.identity.sessionGeneration }, () => this.root.promptSuggestionPresentationBlockReason()), () => this.#terminal.requestRender()), this.backend.session.view());
             constructed.push(() => this.#promptSuggestions?.dispose());
-            this.#unsubscribePromptSuggestions = promptSuggestionOptions === undefined
-                ? () => { }
-                : promptSuggestionOptions.onChange(enabled => this.#promptSuggestions?.setEnabled(enabled));
-            constructed.push(this.#unsubscribePromptSuggestions);
-            this.#unsubscribePromptImages = this.#promptImages === null ? () => { } : this.#promptImages.onChange(() => {
-                if (!this.#disposed && this.root.reconcilePromptImageLimitNotice())
+            this.#fullscreenExitOutput = initialPiSettings.fullscreenExitOutput;
+            this.#unbindShellSettings = bindShellSettings({
+                customViewport: this.#customViewport, promptImages: this.#promptImages, skills: this.#skills,
+                viewport: viewportSettings, historyScope: promptHistory?.onScopeChange,
+            }, {
+                root: this.root,
+                promptImageLimitChanged: () => { if (!this.#disposed && this.root.reconcilePromptImageLimitNotice())
+                    this.#terminal.requestRender(); },
+                skillsChanged: () => {
+                    // Invariant: reinstalling drops extension provider wrappers, so an unrelated setting change leaves the list alone.
+                    if (this.#disposed || this.#commandListSignature() === this.#installedCommandSignature)
+                        return;
+                    this.#installAutocompleteCommands();
                     this.#terminal.requestRender();
+                },
+                historyScopeChanged: scope => this.#rebindTranscript(scope),
             });
-            constructed.push(this.#unsubscribePromptImages);
-            // Rationale: the same listener refreshes the menu for the A1 presentation choice and for the engine's
-            // skill-command registration, both of which the owned settings manager reports through one change.
-            this.#unsubscribeSkills = this.#skills === null ? () => { } : this.#skills.onChange(() => {
-                // Invariant: reinstalling drops extension provider wrappers, so an unrelated setting change leaves the list alone.
-                if (this.#disposed || this.#commandListSignature() === this.#installedCommandSignature)
-                    return;
-                this.#installAutocompleteCommands();
-                this.#terminal.requestRender();
-            });
-            constructed.push(this.#unsubscribeSkills);
-            this.#fullscreenExitOutput = initialPiSettings.fullscreenExitOutput;
-            const applyViewportSettings = () => {
-                const snapshot = viewportSettings?.snapshot();
-                this.root.setViewportConfig(snapshot ?? {
-                    scrollbarAppearance: "auto",
-                    scrollbarStyle: "thin",
-                    scrollbarSpeed: "normal",
-                });
-            };
-            applyViewportSettings();
-            const unsubscribeViewport = this.#customViewport && viewportSettings ? viewportSettings.onChange(settings => this.root.setViewportConfig(settings)) : () => { };
-            const unsubscribeHistoryScope = this.#customViewport && promptHistory?.onScopeChange?.(scope => this.#rebindTranscript(scope));
-            this.#unsubscribeSettings = () => { unsubscribeViewport(); if (unsubscribeHistoryScope)
-                unsubscribeHistoryScope(); };
-            constructed.push(this.#unsubscribeSettings);
+            constructed.push(this.#unbindShellSettings);
             this.#unbindSessionSettings = bindSessionSettings(this.backend.settings, initialPiSettings, {
                 terminal: this.#terminal,
                 root: this.root,
@@ -365,65 +245,16 @@ export class OwnedUiSessionPresenter {
                 prompt: request => this.#login.requestInput(request),
                 notify: event => this.#login.notify(event),
                 publish: message => {
-                    this.root.appendWorkflowMessage(message);
+                    this.root.workflow.appendMessage(message);
                     this.#terminal.requestRender();
                 },
                 finishLogin: () => this.#login.finish(),
             });
             this.#installAutocompleteCommands();
-            this.#unsubscribe = this.backend.session.onEvent(event => {
-                // Invariant: once disposal begins no event touches the view; only the stop still settles the shell.
-                if (this.#disposed) {
-                    if (event.type === "session-lifecycle" && event.lifecycle === "stopped")
-                        this.#stop.settleAfter(() => this.dispose());
-                    return;
-                }
-                this.#resident.observeLifecycle(event);
-                // Performance: a streamed chunk names one block, and touching only that block is what keeps the
-                // cost of a chunk the same in a long session as in a new one. Everything else
-                // resynchronizes the view, which is cheap next to re-reading the transcript.
-                if (event.type === "agent-run-started") {
-                    this.#promptSuggestions?.invalidate();
-                    this.root.resumeViewportFollowing();
-                }
-                if (event.type === "assistant-message-completed" && !event.successful) {
-                    this.#programStatus.setErrorMessage(this.view().status.diagnostics.at(-1));
-                }
-                if (event.type === "agent-run-started" || event.type === "assistant-message-completed" || event.type === "agent-run-settled") {
-                    this.#programStatus.handleEvent(event);
-                }
-                if (event.type === "assistant-message-completed") {
-                    this.root.noteCompletedAssistantMessage();
-                    routeResponseToSuggestions(this.#promptSuggestions, event, () => this.root.promptSuggestionPrepareBlockReason());
-                }
-                const semanticOnly = event.type === "agent-run-started" || event.type === "assistant-message-completed";
-                const view = event.type === "transcript-block" && this.#sessionGeneration === this.backend.identity.sessionGeneration
-                    ? this.#syncBlock(event.block)
-                    : semanticOnly ? this.view() : this.#syncView();
-                this.#syncTerminalProgress(view);
-                const currentModelKey = suggestionModelKey(view);
-                if (this.backend.identity.sessionGeneration !== this.#sessionGeneration || currentModelKey !== this.#suggestionModelKey) {
-                    this.#promptSuggestions?.invalidate();
-                    this.#suggestionModelKey = currentModelKey;
-                }
-                if (event.type === "status" && /^(Retrying|Compacting)/.test(event.status.workingMessage ?? "")) {
-                    this.#promptSuggestions?.invalidate();
-                }
-                if (event.type === "agent-run-settled") {
-                    routeResponseToSuggestions(this.#promptSuggestions, event, () => this.root.promptSuggestionPrepareBlockReason());
-                }
-                if (event.type === "session-lifecycle" && event.lifecycle === "stopped")
-                    this.#stop.settleAfter(() => this.dispose());
-            });
+            this.#unsubscribe = this.backend.session.onEvent(event => this.#onSessionEvent(event));
             constructed.push(this.#unsubscribe);
-            this.#unbindClipboardWriter = this.#responseCopy === null ? () => { } : this.backend.extensions.bindClipboardWriter(async (text) => {
-                const result = await this.#responseCopy.submitText(text);
-                if (result.outcome === "delivered")
-                    return true;
-                if (result.outcome === "submitted-unverified")
-                    return false;
-                throw new Error(result.outcome === "timed-out" ? "Clipboard delivery timed out" : "Clipboard delivery could not be completed");
-            });
+            this.#unbindClipboardWriter = this.#clipboard.responseCopy === null ? () => { }
+                : this.backend.extensions.bindClipboardWriter(text => this.#clipboard.writeForExtension(text));
             constructed.push(this.#unbindClipboardWriter);
             if (this.backend.session.view().lifecycle === "stopped")
                 this.#stop.resolve();
@@ -503,7 +334,7 @@ export class OwnedUiSessionPresenter {
         const routed = this.root.handleViewportPreInput(data, true, Date.now(), this.root.usesDefaultInputSurface() && !this.#terminal.hasFocusedOverlay());
         if (routed.copySelection !== undefined) {
             const snapshot = routed.copySelection;
-            this.#trackCopy(this.#responseCopy?.submit(snapshot, this.#pendingClipboardWrite), copyCharacters(snapshot));
+            this.#trackCopy(this.#clipboard.copySelection(snapshot), copyCharacters(snapshot));
         }
         if (routed.copyLastMessage)
             void this.runWorkflow({ command: "copy", argument: "" });
@@ -511,18 +342,54 @@ export class OwnedUiSessionPresenter {
             return routed.data === data ? undefined : { data: routed.data };
         return routed.data.length === 0 ? { consume: true } : { data: routed.data };
     }
+    #onSessionEvent(event) {
+        // Invariant: once disposal begins no event touches the view; only the stop still settles the shell.
+        if (this.#disposed) {
+            if (event.type === "session-lifecycle" && event.lifecycle === "stopped")
+                this.#stop.settleAfter(() => this.dispose());
+            return;
+        }
+        // Performance: a streamed chunk names one block, and touching only that block is what keeps the
+        // cost of a chunk the same in a long session as in a new one. Everything else
+        // resynchronizes the view, which is cheap next to re-reading the transcript.
+        if (event.type === "agent-run-started") {
+            this.#promptSuggestions?.invalidate();
+            this.root.resumeViewportFollowing();
+        }
+        if (event.type === "assistant-message-completed" && !event.successful) {
+            this.#programStatus.setErrorMessage(this.view().status.diagnostics.at(-1));
+        }
+        if (event.type === "agent-run-started" || event.type === "assistant-message-completed" || event.type === "agent-run-settled") {
+            this.#programStatus.handleEvent(event);
+        }
+        if (event.type === "assistant-message-completed") {
+            this.root.noteCompletedAssistantMessage();
+            this.#promptSuggestions?.route(event, () => this.root.promptSuggestionPrepareBlockReason());
+        }
+        const semanticOnly = event.type === "agent-run-started" || event.type === "assistant-message-completed";
+        const view = event.type === "transcript-block" && this.#sessionGeneration === this.backend.identity.sessionGeneration
+            ? this.#syncBlock(event.block)
+            : semanticOnly ? this.view() : this.#syncView();
+        this.#syncTerminalProgress(view);
+        this.#promptSuggestions?.noteView(view, this.backend.identity.sessionGeneration !== this.#sessionGeneration);
+        if (event.type === "status" && /^(Retrying|Compacting)/.test(event.status.workingMessage ?? "")) {
+            this.#promptSuggestions?.invalidate();
+        }
+        if (event.type === "agent-run-settled") {
+            this.#promptSuggestions?.route(event, () => this.root.promptSuggestionPrepareBlockReason());
+        }
+        if (event.type === "session-lifecycle" && event.lifecycle === "stopped")
+            this.#stop.settleAfter(() => this.dispose());
+    }
     #trackCopy(delivery, count) {
         const intent = ++this.#copyIntentSequence;
         void delivery?.then(({ outcome }) => {
             if (count === undefined || this.#disposed || !this.#terminal.running || intent !== this.#copyIntentSequence
                 || outcome !== "delivered" && outcome !== "submitted-unverified")
                 return;
-            this.root.showCopyAcknowledgement(copyAcknowledgementText(count));
+            this.root.chrome.showCopyAcknowledgement(copyAcknowledgementText(count));
         });
     }
-    #promptSuggestionPresentationBlockReason(identity) {
-        return suggestionPresentationBlockReason(identity, { disposed: this.#disposed, view: this.view(), sessionGeneration: this.backend.identity.sessionGeneration }, () => this.root.promptSuggestionPresentationBlockReason());
-    }
     start() {
         if (this.#started)
             return;
@@ -537,9 +404,9 @@ export class OwnedUiSessionPresenter {
             if (this.#disposed || !this.#customViewport)
                 return;
             this.#dialogs.presentStartupRoute();
-            void this.#loadLazySelectors().then(selectors => selectors.prepare()).catch(() => { });
+            void this.#presenters.components.dialogs.lazySelectors().then(selectors => selectors.prepare()).catch(() => { });
             this.root.warmPastePreparation();
-            this.#copyExecutor?.warm();
+            this.#clipboard.warm();
         });
     }
     onView(listener) {
@@ -639,7 +506,7 @@ export class OwnedUiSessionPresenter {
     }
     async cycleModel(direction) {
         const result = await this.backend.workflows.cycleModelWorkflow(direction);
-        this.root.appendWorkflowResult(result);
+        this.root.workflow.appendResult(result);
         this.#terminal.requestRender();
         return workflowAdapterResult(result);
     }
@@ -660,8 +527,8 @@ export class OwnedUiSessionPresenter {
             setInputSurface: surface => this.root.setInputSurface(surface),
             requestRender: () => this.#terminal.requestRender(),
             viewport: () => this.#terminal.viewport(),
-            appendWorkflowStatus: text => this.root.appendWorkflowStatus(text),
-            appendWorkflowResult: result => this.root.appendWorkflowResult(result),
+            appendWorkflowStatus: text => this.root.workflow.appendStatus(text),
+            appendWorkflowResult: result => this.root.workflow.appendResult(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.
@@ -670,14 +537,6 @@ export class OwnedUiSessionPresenter {
                 : { switchTuiMode: mode => this.#terminal.switchMode(mode) }),
         };
     }
-    #loadLazySelectors() {
-        if (this.#lazySelectors !== undefined)
-            return Promise.resolve(this.#lazySelectors);
-        return this.#lazySelectorsPromise ??= import("../../integrations/pi/components/lazy-selectors.js").then(module => {
-            this.#lazySelectors = module.piShellLazySelectors;
-            return module.piShellLazySelectors;
-        });
-    }
     async showThinkingSelector() {
         const snapshot = this.backend.settings.snapshot();
         const close = () => {
@@ -691,7 +550,7 @@ export class OwnedUiSessionPresenter {
         };
         const releasePresentation = this.#customViewport ? this.#terminal.beginPresentationHold() : undefined;
         try {
-            const selectors = await this.#loadLazySelectors();
+            const selectors = await this.#presenters.components.dialogs.lazySelectors();
             const component = await selectors.createThinking({
                 currentLevel: snapshot.thinkingLevel,
                 availableLevels: snapshot.availableThinkingLevels,
@@ -699,7 +558,7 @@ export class OwnedUiSessionPresenter {
                 onCancel: close,
                 onSelectAsDefault: level => this.backend.settings.setDefaultThinkingLevel(level),
                 defaultLevel: snapshot.defaultThinkingLevel,
-                ...(this.#customViewport ? {
+                ...(this.backend.settings.productMode === "bare" ? {
                     presentation: {
                         profile: "bare",
                         cycleBinding: this.root.editor.keybindingConfig()["app.thinking.cycle"] ?? [],
@@ -719,11 +578,11 @@ export class OwnedUiSessionPresenter {
     /** The Skills dialog: a replacement input like the model selector, applying the chosen skill through the prompt path. */
     showSkillsSelector(skills = this.#skillSummaries()) {
         const close = this.#dialogs.closeInputSurface;
-        const component = createPiShellSkillsSelector({
+        const component = this.#presenters.components.dialogs.skillsSelector({
             skills,
             onSelect: name => {
                 close();
-                void this.#submission.sendSlashPrompt(skillPrompt(name), skillPrompt(name)).catch(() => this.#submission.reportError());
+                void this.#submission.sendSlashPrompt(this.#presenters.components.skills.prompt(name), this.#presenters.components.skills.prompt(name)).catch(() => this.#submission.reportError());
             },
             onCancel: close,
         });
@@ -736,12 +595,12 @@ export class OwnedUiSessionPresenter {
     showForkSelector() {
         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.root.workflow.appendResult({ command: "fork", outcome: "completed", message: "No messages to fork from", messageKind: "status" });
             this.#terminal.requestRender();
             return;
         }
         const close = this.#dialogs.closeInputSurface;
-        const component = createPiShellUserMessageSelector(options, selection => {
+        const component = this.#presenters.components.dialogs.userMessageSelector(options, selection => {
             close();
             void this.runWorkflow({ command: "fork", argument: "", selection });
         }, close);
@@ -754,7 +613,7 @@ export class OwnedUiSessionPresenter {
             options = await this.backend.catalog.pinnedLogoutOptions();
         }
         catch (error) {
-            this.root.appendWorkflowResult({
+            this.root.workflow.appendResult({
                 command: "logout",
                 outcome: "failed",
                 message: `Could not read stored credentials: ${error instanceof Error ? error.message : String(error)}`,
@@ -763,12 +622,12 @@ export class OwnedUiSessionPresenter {
             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.root.workflow.appendStatus("No stored credentials to remove. /logout only removes credentials saved by /login; environment variables and models.json config are unchanged.");
             this.#terminal.requestRender();
             return;
         }
         const close = this.#dialogs.closeInputSurface;
-        const component = createPiShellAuthProviderSelector("logout", options, selection => {
+        const component = this.#presenters.components.dialogs.authProviderSelector("logout", options, selection => {
             close();
             void this.runWorkflow({ command: "logout", argument: "", selection });
         }, close);
@@ -789,7 +648,7 @@ export class OwnedUiSessionPresenter {
         }
         const close = this.#dialogs.closeInputSurface;
         const labels = method.options.map(option => option.label);
-        const component = createPiShellExtensionSelector(method.title, labels, label => {
+        const component = this.#presenters.components.dialogs.extensionSelector(method.title, labels, label => {
             const selection = method.options.find(option => option.label === label)?.id;
             if (!selection)
                 return;
@@ -807,7 +666,7 @@ export class OwnedUiSessionPresenter {
     showLoginAuthTypeSelector() {
         const close = this.#dialogs.closeInputSurface;
         const labels = ["Sign in with an account", "Sign in with an API key"];
-        const component = createPiShellExtensionSelector("Select authentication method:", labels, label => {
+        const component = this.#presenters.components.dialogs.extensionSelector("Select authentication method:", labels, label => {
             close();
             this.showLoginProviderSelector(label === labels[0] ? "oauth" : "api_key");
         }, close);
@@ -817,12 +676,12 @@ export class OwnedUiSessionPresenter {
     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.root.workflow.appendStatus(authType === "oauth" ? "No account providers available." : authType === "api_key" ? "No API key providers available." : "No login providers available.");
             this.#terminal.requestRender();
             return;
         }
         const close = this.#dialogs.closeInputSurface;
-        const component = createPiShellAuthProviderSelector("login", options, id => {
+        const component = this.#presenters.components.dialogs.authProviderSelector("login", options, id => {
             close();
             void this.runWorkflow({ command: "login", argument: "", selection: id });
         }, () => {
@@ -841,21 +700,13 @@ export class OwnedUiSessionPresenter {
     }
     shutdown() {
         this.#shutdownPromise ??= this.#shutdown().finally(() => {
-            // Invariant: a rejected resident detach is retryable; ordinary shutdown has disposed the shell already.
+            // Invariant: a failed quit is retryable; ordinary shutdown has disposed the shell already.
             if (!this.#disposed)
                 this.#shutdownPromise = undefined;
         });
         return this.#shutdownPromise;
     }
     async #shutdown() {
-        const detached = await this.#resident.detach();
-        if (detached === true)
-            return { outcome: "completed", diagnostic: null };
-        if (detached !== undefined) {
-            this.root.appendWorkflowStatus(detached);
-            this.#terminal.requestRender();
-            return rejected("resident tab detach is unavailable");
-        }
         try {
             const quit = this.backend.workflows.executeWorkflow({ command: "quit", argument: "" });
             // Invariant: a slow or hung engine quit never holds the terminal past the cleanup deadline. The
@@ -889,7 +740,7 @@ export class OwnedUiSessionPresenter {
             }).catch(error => {
                 if (this.#disposed)
                     return;
-                this.root.appendWorkflowResult({ command: "name", outcome: "failed", message: error instanceof Error ? error.message : String(error) });
+                this.root.workflow.appendResult({ command: "name", outcome: "failed", message: error instanceof Error ? error.message : String(error) });
                 this.#terminal.requestRender();
             });
             return { outcome: "completed", diagnostic: null };
@@ -899,20 +750,20 @@ export class OwnedUiSessionPresenter {
             const setup = this.backend.catalog.pinnedAmbientAuthentication(request.selection);
             if (setup) {
                 const close = this.#dialogs.closeInputSurface;
-                const dialog = createPiShellLoginDialog(componentRuntime(this.#terminal), setup.providerId, close, setup.providerName, setup.title);
+                const dialog = this.#presenters.components.dialogs.loginDialog(componentRuntime(this.#terminal), setup.providerId, close, setup.providerName, setup.title);
                 dialog.showInfo(setup.message, [], true);
                 this.root.setInputSurface(dialog);
                 this.#terminal.requestRender();
                 return { outcome: "completed", diagnostic: null };
             }
         }
-        const selected = openWorkflowSelector(request, this, { residentTab: this.#resident.active });
+        const selected = openWorkflowSelector(request, this);
         if (selected !== undefined)
             return selected;
         if (request.command === "reload") {
             const blocked = this.backend.workflows.reloadBlockedResult();
             if (blocked) {
-                this.root.appendWorkflowResult(blocked);
+                this.root.workflow.appendResult(blocked);
                 this.#terminal.requestRender();
                 return workflowAdapterResult(blocked);
             }
@@ -922,8 +773,8 @@ export class OwnedUiSessionPresenter {
             ? await import("./share-operation.js")
             : undefined;
         const shareSurface = shareDialog === undefined ? undefined
-            : (this.#customViewport ? shareDialog.createPiShellShareOperationDialog : shareDialog.createPiShellOperationLoader)(componentRuntime(this.#terminal), "Creating gist…");
-        const operationSurface = shareSurface ?? (request.command === "reload" ? createPiShellReloadBox() : undefined);
+            : await this.#presenters.components.dialogs.shareProgress(componentRuntime(this.#terminal), "Creating gist…", this.#customViewport ? "dialog" : "loader");
+        const operationSurface = shareSurface ?? (request.command === "reload" ? this.#presenters.components.info.reloadBox() : undefined);
         const now = this.#reloadPresentation?.now ?? Date.now;
         const shownAt = now();
         if (operationSurface) {
@@ -954,7 +805,7 @@ export class OwnedUiSessionPresenter {
         if (result.outcome === "requires-selection" && request.command === "model") {
             if (result.messages !== undefined) {
                 for (const message of result.messages)
-                    this.root.appendWorkflowMessage(message);
+                    this.root.workflow.appendMessage(message);
             }
             this.showModelSelector((result.detail ?? request.argument.trim()) || undefined);
             return { outcome: "completed", diagnostic: null };
@@ -973,7 +824,7 @@ export class OwnedUiSessionPresenter {
             });
         }
         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.root.workflow.appendResult({ command: request.command, outcome: "failed", message: `Owned controller missing for ${request.command}` });
             this.#terminal.requestRender();
             return { outcome: "failed", diagnostic: `Owned controller missing for ${request.command}` };
         }
@@ -988,10 +839,10 @@ export class OwnedUiSessionPresenter {
             this.root.resumeViewportFollowing();
         }
         if (shareDialog !== undefined && this.#customViewport && result.outcome === "completed" && result.detail !== undefined) {
-            this.root.appendWorkflowStatus(shareDialog.renderPiShellShareResult(result.message, result.detail));
+            this.root.workflow.appendStatus(shareDialog.renderShellShareResult(result.message, result.detail, this.#presenters.theme.current(), url => this.#presenters.components.text.hyperlink(url)));
         }
         else {
-            this.root.appendWorkflowResult(result);
+            this.root.workflow.appendResult(result);
         }
         this.#terminal.requestRender();
         return workflowAdapterResult(result);
@@ -1007,17 +858,17 @@ export class OwnedUiSessionPresenter {
     showTrustSelector() {
         const context = this.backend.catalog.pinnedProjectTrustContext();
         const close = this.#dialogs.closeInputSurface;
-        const component = createPiShellTrustSelector({
+        const component = this.#presenters.components.dialogs.trustSelector({
             ...context,
             onSelect: selection => {
                 try {
                     this.backend.catalog.persistProjectTrust(selection.updates);
                     close();
-                    this.root.appendWorkflowStatus(`Saved trust decision: ${selection.trusted ? "trusted" : "untrusted"}. Restart pi for this to take effect.`);
+                    this.root.workflow.appendStatus(`Saved trust decision: ${selection.trusted ? "trusted" : "untrusted"}. Restart pi for this to take effect.`);
                 }
                 catch (error) {
                     close();
-                    this.root.appendWorkflowResult({ command: "trust", outcome: "failed", message: error instanceof Error ? error.message : String(error) });
+                    this.root.workflow.appendResult({ command: "trust", outcome: "failed", message: error instanceof Error ? error.message : String(error) });
                 }
                 this.#terminal.requestRender();
             },
@@ -1031,7 +882,7 @@ export class OwnedUiSessionPresenter {
     }
     // Invariant: bare A1 routes `models`; the comparison profile keeps the pinned `model`/`scoped-models` pair. Hidden routes are shared.
     #isWorkflowRoute(value) {
-        return workflowCommandNames(this.#customViewport ? "bare" : "comparison").includes(value)
+        return this.#presenters.components.workflows.commandNames(this.backend.settings.productMode).includes(value)
             || OWNED_UI_HIDDEN_COMMAND_NAMES.includes(value);
     }
     /** The bare-A1 unified Models dialog: switch on Enter, scope on Space, persist on Ctrl+S, all through the engine. */
@@ -1068,8 +919,7 @@ export class OwnedUiSessionPresenter {
         // Invariant: events stop first, so nothing re-enters the view during history close, outro, or restoration.
         attempt(() => this.#unsubscribe());
         this.#copyIntentSequence += 1;
-        this.#responseCopy?.dispose();
-        this.#copyExecutor?.dispose();
+        this.#clipboard.dispose();
         this.#submission.cancelWaiting();
         let pasteCleanup = Promise.resolve();
         let historyCleanup = Promise.resolve(true);
@@ -1078,10 +928,7 @@ export class OwnedUiSessionPresenter {
         attempt(() => this.root.clearViewportPointerState());
         attempt(() => this.#streamPresentation.dispose());
         attempt(() => this.#promptSuggestions?.dispose());
-        attempt(() => this.#unsubscribePromptSuggestions());
-        attempt(() => this.#unsubscribePromptImages());
-        attempt(() => this.#unsubscribeSkills());
-        attempt(() => this.#unsubscribeSettings());
+        attempt(() => this.#unbindShellSettings());
         let exitText = "";
         attempt(() => {
             exitText = composeExitText({
@@ -1089,8 +936,7 @@ export class OwnedUiSessionPresenter {
                 customViewport: this.#customViewport,
                 exitMode: this.backend.identity.disposed ? this.#fullscreenExitOutput : this.backend.settings.snapshot().fullscreenExitOutput,
                 resume: this.backend.identity.currentSessionResumeMetadata(),
-                soloResumeHint: SOLO_RESUME_HINTS.has(this),
-                transcript: () => this.root.exitTranscript(terminal.columns),
+                transcript: () => this.root.transcript.exitTranscript(terminal.columns),
             });
         });
         attempt(() => this.#unbindClipboardWriter());
@@ -1110,8 +956,6 @@ export class OwnedUiSessionPresenter {
             }
             await historyCleanup.catch(() => false); // Security: background durability outcomes never enter terminal output.
             await boundedCleanup(() => pasteCleanup).catch(error => settled.push(error));
-            await boundedCleanup(() => this.#resident.gracefulStop(this.#currentSessionFile()))
-                .catch(error => settled.push(error));
             await boundedCleanup(() => this.backend.extensions.unbindExtensionUi()).catch(error => settled.push(error));
             return settled;
         };
@@ -1120,7 +964,7 @@ export class OwnedUiSessionPresenter {
     }
     // Invariant: incremental block updates notify listeners with the same complete view contract.
     #syncBlock(block) {
-        this.root.applyTranscriptBlock(block);
+        this.root.transcript.apply(block);
         if (this.#customViewport && block.status === "live" && isCoalescedStreamBlock(block.kind)) {
             this.#streamPresentation.request();
         }
@@ -1137,7 +981,7 @@ export class OwnedUiSessionPresenter {
     }
     // Rationale: extensions reach the shell only through this bridge; every surface they draw lands in the root.
     #createExtensionBridge() {
-        return createPiExtensionUiBridge({
+        return this.#presenters.components.dialogs.extensionUiBridge({
             runtime: componentRuntime(this.#terminal),
             agentDir: this.backend.identity.agentDir,
             setInputSurface: component => this.root.setInputSurface(component, true, "opaque"),
@@ -1166,8 +1010,7 @@ export class OwnedUiSessionPresenter {
             backend: this.backend,
             root: this.root,
             terminal: this.#terminal,
-            residentTab: this.#resident,
-            cwd,
+            cwd, statusText: this.#presenters.components.info.statusText,
             promptHistory: () => this.#promptHistory,
             imageSidecar: () => this.#historyBinding?.imageSidecar,
             disposed: () => this.#disposed,
@@ -1181,7 +1024,7 @@ export class OwnedUiSessionPresenter {
     // Invariant: the order is the reset order on session replacement; copy intent before pastes before the input surface.
     #createConcerns() {
         return new SessionConcerns([
-            { onSessionReplaced: () => { this.#copyIntentSequence += 1; this.#responseCopy?.reset(); } },
+            { onSessionReplaced: () => { this.#copyIntentSequence += 1; this.#clipboard.reset(); } },
             this.#submission,
             { onSessionReplaced: () => this.root.resetPendingPastes() },
             { onSessionReplaced: () => this.#promptSuggestions?.invalidate() },
@@ -1195,7 +1038,6 @@ export class OwnedUiSessionPresenter {
             { onSessionReplaced: () => this.root.setInputSurface(null) },
             { onSessionReplaced: () => this.root.resetExtensionUi() },
             { onSessionReplaced: () => this.root.resetWorkflowPresentation() },
-            this.#resident,
         ]);
     }
     // Invariant: delivery recovery does not replace a store; conversation or live scope changes can.
@@ -1205,7 +1047,7 @@ export class OwnedUiSessionPresenter {
             return;
         if (replaced) {
             this.#sessionBindingGeneration = this.backend.identity.sessionBindingGeneration;
-            this.root.resetTranscript();
+            this.root.transcript.reset();
         }
         const binding = this.#historyBinding;
         if (binding?.options.forSession !== undefined || binding?.options.forScope !== undefined) {
@@ -1288,42 +1130,38 @@ export class OwnedUiSessionPresenter {
         if (diagnostic === undefined || !this.#terminal.running)
             return;
         this.#startupTrustHandled = true;
-        this.root.appendWorkflowMessage({ kind: "warning", message: diagnostic.message });
+        this.root.workflow.appendMessage({ kind: "warning", message: diagnostic.message });
     }
     openOwnedRoute(route) {
         if (this.#disposed)
             return;
-        // Invariant: a route requested before the runtime runs (the resident Settings bridge route arrives
-        // before start()) is retained, latest wins, and presented through the startup-route path once started.
+        // Invariant: a route requested before the runtime runs is retained, latest wins, and presented
+        // through the startup-route path once started.
         if (!this.#terminal.running) {
             this.#dialogs.retainStartupRoute(route);
             return;
         }
         const result = this.#dialogs.openRoute(route);
         if (result.outcome !== "completed" && result.diagnostic !== null) {
-            this.root.appendWorkflowMessage({ kind: "warning", message: result.diagnostic });
+            this.root.workflow.appendMessage({ kind: "warning", message: result.diagnostic });
         }
     }
     hotkeysPresentation() {
-        const presentation = this.root.hotkeysPresentation();
-        return this.#resident.active ? { ...presentation, residentTabs: true } : presentation;
+        return this.root.hotkeysPresentation();
     }
     async #slashCommand(text) {
         const body = text.slice(1).trim();
         const separator = body.search(/\s/);
         const name = separator < 0 ? body : body.slice(0, separator);
         const argument = separator < 0 ? "" : body.slice(separator + 1).trimStart();
-        const utilityTab = this.#resident.active ? RESIDENT_UTILITY_TAB_REFUSALS[name] : undefined;
-        if (utilityTab !== undefined)
-            return rejected(utilityTab);
         if (this.#dialogs.claimsRoute(name))
             return this.#dialogs.openRoute(name);
         if (this.#isWorkflowRoute(name))
             return this.runWorkflow({ command: name, argument });
         if (this.#skillsCollapsed()) {
-            if (name === SKILLS_COMMAND_NAME)
+            if (name === this.#presenters.components.skills.commandName)
                 return this.#runSkillsCommand(text, argument);
-            const rewritten = rewriteSkillsTunnelSubmission(text);
+            const rewritten = this.#presenters.components.skills.rewriteTunnelSubmission(text);
             if (rewritten !== text)
                 return this.#submission.sendSlashPrompt(rewritten, text);
         }
@@ -1343,7 +1181,7 @@ export class OwnedUiSessionPresenter {
             && !this.backend.identity.disposed && this.backend.settings.snapshot().enableSkillCommands;
     }
     #skillSummaries() {
-        return skillsFromCommands(this.backend.workflows.workflowAutocompleteCommands());
+        return this.#presenters.components.skills.fromCommands(this.backend.workflows.workflowAutocompleteCommands());
     }
     // Protocol: bare "/skills" opens the dialog, "/skills <name> [args]" applies directly, and an unknown name is a command outcome.
     async #runSkillsCommand(text, argument) {
@@ -1355,18 +1193,18 @@ export class OwnedUiSessionPresenter {
         }
         const separator = trimmed.search(/\s/u);
         const token = separator < 0 ? trimmed : trimmed.slice(0, separator);
-        const skill = findSkillByArgument(skills, token);
+        const skill = this.#presenters.components.skills.findByArgument(skills, token);
         if (skill === undefined) {
             const message = "Unknown skill: " + token;
-            this.root.appendWorkflowMessage({ kind: "error", message });
+            this.root.workflow.appendMessage({ kind: "error", message });
             this.#terminal.requestRender();
             return { outcome: "failed", diagnostic: message };
         }
-        return this.#submission.sendSlashPrompt(skillPrompt(skill.name, separator < 0 ? "" : trimmed.slice(separator + 1)), text);
+        return this.#submission.sendSlashPrompt(this.#presenters.components.skills.prompt(skill.name, separator < 0 ? "" : trimmed.slice(separator + 1)), text);
     }
     #treeSummary() {
         return new Promise(resolve => {
-            this.root.setInputSurface(createPiShellExtensionSelector("Summarize Branch?", ["No summary", "Summarize", "Summarize with custom prompt"], resolve, () => resolve(undefined)), true, "opaque");
+            this.root.setInputSurface(this.#presenters.components.dialogs.extensionSelector("Summarize Branch?", ["No summary", "Summarize", "Summarize with custom prompt"], resolve, () => resolve(undefined)), true, "opaque");
             this.#terminal.requestRender();
         });
     }
@@ -1447,9 +1285,6 @@ function copyCharacters(snapshot) {
     }
     return hasContent ? count : undefined;
 }
-function rejected(diagnostic) {
-    return { outcome: "rejected", diagnostic };
-}
 function workflowAdapterResult(result) {
     if (result.outcome === "completed")
         return { outcome: "completed", diagnostic: null };