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

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

@@ -1,11 +1,14 @@
+import { SessionTerminalPresentation } from "./session-terminal-presentation.js";
 import { ShellClipboard } from "./shell-clipboard.js";
-import { PromptHistoryController } from "./prompt-history-controller.js";
+import { SessionPromptHistory } from "./session-prompt-history.js";
+import { shellResourceEntries } from "./resource-labels.js";
 import { SessionDialogCoordinator } from "./dialog-coordinator.js";
 import { LoginInteraction } from "./login-interaction.js";
 import { PromptSubmission } from "./prompt-submission.js";
 import { SessionConcerns } from "./session-concern.js";
 import { composeExitText, SessionStopLatch } from "./session-lifecycle.js";
 import { openWorkflowSelector } from "./workflow-router.js";
+import { SessionSelectors } from "./session-selectors.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";
@@ -14,7 +17,7 @@ import { copyAcknowledgementText } from "../../ui/components/selection-copy.js";
 import { ShellPromptSuggestions } from "./shell-prompt-suggestions.js";
 import { OwnedUiTerminalHost, componentRuntime, sessionTerminalHostOptions, } from "./shell-host.js";
 import { STREAM_PRESENTATION_INTERVAL_MS, StreamPresentationCoalescer, } from "./stream-presentation-coalescer.js";
-import { OwnedUiSessionShellRoot, shellResourceEntries, } from "./session-shell-root.js";
+import { OwnedUiSessionShellRoot, } 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() { } };
 export { OwnedUiSessionShellRoot, } from "./session-shell-root.js";
@@ -27,21 +30,19 @@ export { formatSessionResumeCommand, quoteCommandArgument } from "./session-life
 export class OwnedUiSessionPresenter {
     backend;
     #presenters;
-    #dialogHost;
+    selectors;
     root;
     #host;
     #terminal;
     #submission;
     #login;
     #concerns;
-    #listeners = new Set();
     #unsubscribe;
     #promptSuggestions;
     #promptImages;
     #skills;
     #installedCommandSignature = "";
-    #promptHistory = null;
-    #historyBinding;
+    #history = null;
     #extensionBridge;
     #stop = new SessionStopLatch();
     #dialogs;
@@ -64,7 +65,11 @@ export class OwnedUiSessionPresenter {
     #inputCoordination;
     #unbindShellSettings;
     #unbindSessionSettings;
-    #terminalProgressEnabled = false;
+    #terminalPresentation = new SessionTerminalPresentation({
+        terminal: () => this.#terminal,
+        programStatus: () => this.#programStatus,
+        titleEnabled: () => this.#customViewport && this.#started && !this.#disposed,
+    });
     #programStatus;
     #fullscreenExitOutput = "transcript";
     #lastClearTime = 0;
@@ -85,8 +90,6 @@ export class OwnedUiSessionPresenter {
         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();
         // 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;
@@ -124,7 +127,7 @@ export class OwnedUiSessionPresenter {
                 onInterrupt: () => { void this.interrupt(); },
                 onClear: () => { void this.clearOrExit(); },
                 onExit: () => { void this.shutdown(); },
-                onModelSelect: () => this.#customViewport ? this.showModelsDialog() : this.showModelSelector(),
+                onModelSelect: () => this.#customViewport ? this.selectors.showModelsDialog() : this.selectors.showModelSelector(),
                 onModelCycle: direction => { void this.cycleModel(direction); },
                 onThinkingCycle: () => { void this.cycleThinkingLevel(); },
                 onThinkingToggle: () => {
@@ -150,7 +153,7 @@ export class OwnedUiSessionPresenter {
                 },
                 onInputSurfaceChanged: () => {
                     this.#promptSuggestions?.invalidate();
-                    this.#promptHistory?.synchronize();
+                    this.#history?.synchronize();
                 },
                 onCopyText: (text, cut) => {
                     const delivery = this.#clipboard.copyText(text);
@@ -183,11 +186,12 @@ export class OwnedUiSessionPresenter {
                 ...(startupRoute === undefined ? {} : { startupRoute }),
             });
             constructed.push(() => this.#dialogs.dispose());
+            this.selectors = this.#createSelectors(options.presenters);
             const initialPiSettings = this.backend.settings.snapshot();
             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, dialogs: options.presenters.components.dialogs,
-                syncProgress: () => this.#syncTerminalProgress(this.view()),
+                syncProgress: () => this.#terminalPresentation.syncProgress(this.view()),
             });
             this.#submission = this.#createSubmission(cwd);
             this.#reloadPresentation = reloadPresentation;
@@ -217,24 +221,15 @@ export class OwnedUiSessionPresenter {
                 terminal: this.#terminal,
                 root: this.root,
                 setTerminalProgress: enabled => {
-                    this.#terminalProgressEnabled = enabled;
+                    this.#terminalPresentation.progressEnabled = enabled;
                     if (this.#terminal.running)
-                        this.#syncTerminalProgress(this.view());
+                        this.#terminalPresentation.syncProgress(this.view());
                 },
             }, { customViewport: this.#customViewport });
             constructed.push(this.#unbindSessionSettings);
             if (this.#customViewport && promptHistory !== undefined) {
-                this.#historyBinding = { options: promptHistory, scope: promptHistory.scope ?? "unique", sessionId: promptHistory.sessionId, imageSidecar: promptHistory.imageSidecar };
-                this.#promptHistory = new PromptHistoryController({
-                    editor: this.root.editor,
-                    store: promptHistory.store,
-                    limit: promptHistory.limit,
-                    fallback: this.view().transcript.flatMap(block => block.kind === "user" ? [block.text] : []),
-                    active: () => this.root.usesDefaultInputSurface(),
-                    render: () => this.#terminal.requestRender(),
-                    rehydrate: value => this.root.rehydrateHistoryText(value, id => this.#historyBinding?.imageSidecar?.readAttachment(id) ?? null),
-                });
-                constructed.push(() => { void this.#promptHistory?.close().catch(() => false); });
+                this.#history = this.#createHistory(promptHistory);
+                constructed.push(() => { void this.#history?.close().catch(() => false); });
             }
             this.#extensionBridge = this.#createExtensionBridge();
             constructed.push(() => this.#extensionBridge.dispose());
@@ -291,7 +286,7 @@ export class OwnedUiSessionPresenter {
         return this.root.inputCoordinationSurface();
     }
     setOverlaySurfaces(surfaces) {
-        this.root.setViewportOverlaySurfaces(surfaces);
+        this.root.viewport.setOverlaySurfaces(surfaces);
     }
     noteImmediatePresentation() {
         this.#streamPresentation.noteImmediatePresentation();
@@ -301,7 +296,9 @@ export class OwnedUiSessionPresenter {
         return this.#layoutParts[part];
     }
     activated() {
-        this.#syncTerminalProgress(this.view());
+        const view = this.view();
+        this.#terminalPresentation.syncProgress(view);
+        this.#terminalPresentation.syncTitle(view, true);
     }
     handleViewportInput(data) {
         if (!this.#inputCoordination)
@@ -354,7 +351,7 @@ export class OwnedUiSessionPresenter {
         // resynchronizes the view, which is cheap next to re-reading the transcript.
         if (event.type === "agent-run-started") {
             this.#promptSuggestions?.invalidate();
-            this.root.resumeViewportFollowing();
+            this.root.viewport.resumeFollowing();
         }
         if (event.type === "assistant-message-completed" && !event.successful) {
             this.#programStatus.setErrorMessage(this.view().status.diagnostics.at(-1));
@@ -363,14 +360,14 @@ export class OwnedUiSessionPresenter {
             this.#programStatus.handleEvent(event);
         }
         if (event.type === "assistant-message-completed") {
-            this.root.noteCompletedAssistantMessage();
+            this.root.viewport.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.#terminalPresentation.syncProgress(view);
         this.#promptSuggestions?.noteView(view, this.backend.identity.sessionGeneration !== this.#sessionGeneration);
         if (event.type === "status" && /^(Retrying|Compacting)/.test(event.status.workingMessage ?? "")) {
             this.#promptSuggestions?.invalidate();
@@ -395,8 +392,9 @@ export class OwnedUiSessionPresenter {
             return;
         this.#started = true;
         this.#terminal.start();
-        this.#promptHistory?.start();
-        this.#syncTerminalProgress(this.view());
+        this.#terminalPresentation.syncTitle(this.view());
+        this.#history?.start();
+        this.#terminalPresentation.syncProgress(this.view());
         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.
@@ -405,15 +403,10 @@ export class OwnedUiSessionPresenter {
                 return;
             this.#dialogs.presentStartupRoute();
             void this.#presenters.components.dialogs.lazySelectors().then(selectors => selectors.prepare()).catch(() => { });
-            this.root.warmPastePreparation();
+            this.root.promptChips.warm();
             this.#clipboard.warm();
         });
     }
-    onView(listener) {
-        this.#listeners.add(listener);
-        listener(this.view());
-        return () => this.#listeners.delete(listener);
-    }
     waitUntilStopped() {
         return this.#stop.stopped;
     }
@@ -450,9 +443,9 @@ export class OwnedUiSessionPresenter {
         if (now - this.#lastEscapeTime < 500) {
             this.#lastEscapeTime = 0;
             if (action === "tree")
-                await this.showTreeSelector();
+                await this.selectors.showTreeSelector();
             else
-                this.showForkSelector();
+                this.selectors.showForkSelector();
             return { outcome: "completed", diagnostic: null };
         }
         this.#lastEscapeTime = now;
@@ -461,36 +454,6 @@ export class OwnedUiSessionPresenter {
     async abort() {
         return this.#submission.execute(this.#simple("abort"));
     }
-    async retry() {
-        this.#promptSuggestions?.invalidate();
-        return this.#submission.execute(this.#simple("retry"));
-    }
-    async compact() {
-        this.#promptSuggestions?.invalidate();
-        return this.#submission.execute(this.#simple("compact"));
-    }
-    async newSession() {
-        this.#promptSuggestions?.invalidate();
-        return this.#submission.execute(this.#simple("new-session"));
-    }
-    async resumeSession(sessionPath) {
-        this.#promptSuggestions?.invalidate();
-        return this.#submission.execute({
-            type: "resume-session",
-            correlationId: this.#correlation("resume"),
-            sessionId: this.backend.identity.sessionId,
-            sessionPath,
-        });
-    }
-    async setModel(providerId, modelId) {
-        this.#promptSuggestions?.invalidate();
-        return this.#submission.execute({
-            type: "set-model",
-            correlationId: this.#correlation("model"),
-            sessionId: this.backend.identity.sessionId,
-            model: { providerId, modelId, displayName: modelId },
-        });
-    }
     async setThinkingLevel(thinkingLevel) {
         return this.#submission.execute({
             type: "set-thinking-level",
@@ -519,185 +482,6 @@ export class OwnedUiSessionPresenter {
     showSelector(title, options, onSelect, onCancel) {
         return this.#dialogs.showSelector(title, options, onSelect, onCancel);
     }
-    // Rationale: presenters see the shell only as a dialog host; selectors open in the input dock and run choices as workflows.
-    #createDialogHost() {
-        const isDisposed = () => this.#disposed;
-        return {
-            get disposed() { return isDisposed(); },
-            setInputSurface: surface => this.root.setInputSurface(surface),
-            requestRender: () => this.#terminal.requestRender(),
-            viewport: () => this.#terminal.viewport(),
-            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.
-            ...(this.#customViewport
-                ? { beginPresentationHold: () => this.#terminal.beginPresentationHold() }
-                : { switchTuiMode: mode => this.#terminal.switchMode(mode) }),
-        };
-    }
-    async showThinkingSelector() {
-        const snapshot = this.backend.settings.snapshot();
-        const close = () => {
-            this.root.setFooterLevel(true);
-            this.root.setInputSurface(null);
-            this.#terminal.requestRender();
-        };
-        const select = (level) => {
-            close();
-            void this.runWorkflow({ command: "thinking", argument: "", selection: level });
-        };
-        const releasePresentation = this.#customViewport ? this.#terminal.beginPresentationHold() : undefined;
-        try {
-            const selectors = await this.#presenters.components.dialogs.lazySelectors();
-            const component = await selectors.createThinking({
-                currentLevel: snapshot.thinkingLevel,
-                availableLevels: snapshot.availableThinkingLevels,
-                onSelect: select,
-                onCancel: close,
-                onSelectAsDefault: level => this.backend.settings.setDefaultThinkingLevel(level),
-                defaultLevel: snapshot.defaultThinkingLevel,
-                ...(this.backend.settings.productMode === "bare" ? {
-                    presentation: {
-                        profile: "bare",
-                        cycleBinding: this.root.editor.keybindingConfig()["app.thinking.cycle"] ?? [],
-                    },
-                } : {}),
-            });
-            if (this.#disposed)
-                return;
-            this.root.setFooterLevel(false);
-            this.root.setInputSurface(component);
-            this.#terminal.requestRender();
-        }
-        finally {
-            releasePresentation?.();
-        }
-    }
-    /** 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 = this.#presenters.components.dialogs.skillsSelector({
-            skills,
-            onSelect: name => {
-                close();
-                void this.#submission.sendSlashPrompt(this.#presenters.components.skills.prompt(name), this.#presenters.components.skills.prompt(name)).catch(() => this.#submission.reportError());
-            },
-            onCancel: close,
-        });
-        this.root.setInputSurface(component);
-        this.#terminal.requestRender();
-    }
-    showModelSelector(initialSearchInput) {
-        this.#presenters.openModelSelector(this.#dialogHost, initialSearchInput);
-    }
-    showForkSelector() {
-        const options = this.backend.catalog.pinnedForkOptions();
-        if (options.length === 0) {
-            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 = this.#presenters.components.dialogs.userMessageSelector(options, selection => {
-            close();
-            void this.runWorkflow({ command: "fork", argument: "", selection });
-        }, close);
-        this.root.setInputSurface(component);
-        this.#terminal.requestRender();
-    }
-    async showLogoutSelector() {
-        let options;
-        try {
-            options = await this.backend.catalog.pinnedLogoutOptions();
-        }
-        catch (error) {
-            this.root.workflow.appendResult({
-                command: "logout",
-                outcome: "failed",
-                message: `Could not read stored credentials: ${error instanceof Error ? error.message : String(error)}`,
-            });
-            this.#terminal.requestRender();
-            return;
-        }
-        if (options.length === 0) {
-            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 = this.#presenters.components.dialogs.authProviderSelector("logout", options, selection => {
-            close();
-            void this.runWorkflow({ command: "logout", argument: "", selection });
-        }, close);
-        this.root.setInputSurface(component);
-        this.#terminal.requestRender();
-    }
-    showLoginMethodSelector(providerReference) {
-        const method = this.backend.catalog.pinnedLoginMethodOptions(providerReference);
-        if (method.options.length === 0) {
-            this.showLoginProviderSelector(undefined, providerReference);
-            return;
-        }
-        if (method.options.length === 1) {
-            const selection = method.options[0]?.id;
-            if (selection)
-                void this.runWorkflow({ command: "login", argument: "", selection });
-            return;
-        }
-        const close = this.#dialogs.closeInputSurface;
-        const labels = method.options.map(option => option.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;
-            close();
-            void this.runWorkflow({ command: "login", argument: "", selection });
-        }, close);
-        this.root.setInputSurface(component);
-        this.#terminal.requestRender();
-    }
-    showTreeSelector(initialSelectedId) {
-        return this.#presenters.openTreeSelector(this.#dialogHost, (entryId, skipSummaryPrompt) => {
-            void this.#completeTreeSelection(entryId, skipSummaryPrompt);
-        }, initialSelectedId);
-    }
-    showLoginAuthTypeSelector() {
-        const close = this.#dialogs.closeInputSurface;
-        const labels = ["Sign in with an account", "Sign in with an API key"];
-        const component = this.#presenters.components.dialogs.extensionSelector("Select authentication method:", labels, label => {
-            close();
-            this.showLoginProviderSelector(label === labels[0] ? "oauth" : "api_key");
-        }, close);
-        this.root.setInputSurface(component);
-        this.#terminal.requestRender();
-    }
-    showLoginProviderSelector(authType, initialSearchInput) {
-        const options = this.backend.catalog.pinnedLoginOptions(authType);
-        if (options.length === 0) {
-            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 = this.#presenters.components.dialogs.authProviderSelector("login", options, id => {
-            close();
-            void this.runWorkflow({ command: "login", argument: "", selection: id });
-        }, () => {
-            close();
-            if (authType !== undefined)
-                this.showLoginAuthTypeSelector();
-        }, initialSearchInput);
-        this.root.setInputSurface(component);
-        this.#terminal.requestRender();
-    }
-    showSessionSelector() {
-        return this.#presenters.openSessionSelector(this.#dialogHost, () => { void this.shutdown(); });
-    }
-    showSettingsSelector() {
-        this.#presenters.openSettingsSelector(this.#dialogHost);
-    }
     shutdown() {
         this.#shutdownPromise ??= this.#shutdown().finally(() => {
             // Invariant: a failed quit is retryable; ordinary shutdown has disposed the shell already.
@@ -757,7 +541,7 @@ export class OwnedUiSessionPresenter {
                 return { outcome: "completed", diagnostic: null };
             }
         }
-        const selected = openWorkflowSelector(request, this);
+        const selected = openWorkflowSelector(request, this.selectors);
         if (selected !== undefined)
             return selected;
         if (request.command === "reload") {
@@ -807,7 +591,7 @@ export class OwnedUiSessionPresenter {
                 for (const message of result.messages)
                     this.root.workflow.appendMessage(message);
             }
-            this.showModelSelector((result.detail ?? request.argument.trim()) || undefined);
+            this.selectors.showModelSelector((result.detail ?? request.argument.trim()) || undefined);
             return { outcome: "completed", diagnostic: null };
         }
         if (result.outcome === "requires-confirmation" && request.command === "resume") {
@@ -836,7 +620,7 @@ export class OwnedUiSessionPresenter {
         if (request.command === "tree" && result.outcome === "completed") {
             if (result.detail && !this.root.editor.getText().trim())
                 this.root.editor.setText(result.detail);
-            this.root.resumeViewportFollowing();
+            this.root.viewport.resumeFollowing();
         }
         if (shareDialog !== undefined && this.#customViewport && result.outcome === "completed" && result.detail !== undefined) {
             this.root.workflow.appendStatus(shareDialog.renderShellShareResult(result.message, result.detail, this.#presenters.theme.current(), url => this.#presenters.components.text.hyperlink(url)));
@@ -855,40 +639,11 @@ export class OwnedUiSessionPresenter {
         const sleep = this.#reloadPresentation?.sleep ?? ((ms) => new Promise(resolve => setTimeout(resolve, ms)));
         await sleep(remaining);
     }
-    showTrustSelector() {
-        const context = this.backend.catalog.pinnedProjectTrustContext();
-        const close = this.#dialogs.closeInputSurface;
-        const component = this.#presenters.components.dialogs.trustSelector({
-            ...context,
-            onSelect: selection => {
-                try {
-                    this.backend.catalog.persistProjectTrust(selection.updates);
-                    close();
-                    this.root.workflow.appendStatus(`Saved trust decision: ${selection.trusted ? "trusted" : "untrusted"}. Restart pi for this to take effect.`);
-                }
-                catch (error) {
-                    close();
-                    this.root.workflow.appendResult({ command: "trust", outcome: "failed", message: error instanceof Error ? error.message : String(error) });
-                }
-                this.#terminal.requestRender();
-            },
-            onCancel: close,
-        });
-        this.root.setInputSurface(component);
-        this.#terminal.requestRender();
-    }
-    showScopedModelsSelector() {
-        this.#presenters.openScopedModelsSelector(this.#dialogHost);
-    }
     // Invariant: bare A1 routes `models`; the comparison profile keeps the pinned `model`/`scoped-models` pair. Hidden routes are shared.
     #isWorkflowRoute(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. */
-    showModelsDialog(initialQuery) {
-        this.#presenters.openModelsDialog(this.#dialogHost, initialQuery);
-    }
     // 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.
@@ -923,9 +678,9 @@ export class OwnedUiSessionPresenter {
         this.#submission.cancelWaiting();
         let pasteCleanup = Promise.resolve();
         let historyCleanup = Promise.resolve(true);
-        attempt(() => { historyCleanup = this.#promptHistory?.close() ?? Promise.resolve(true); });
+        attempt(() => { historyCleanup = this.#history?.close() ?? Promise.resolve(true); });
         attempt(() => { pasteCleanup = this.root.disposePendingPastes(); });
-        attempt(() => this.root.clearViewportPointerState());
+        attempt(() => this.root.viewport.clearPointerState());
         attempt(() => this.#streamPresentation.dispose());
         attempt(() => this.#promptSuggestions?.dispose());
         attempt(() => this.#unbindShellSettings());
@@ -975,8 +730,6 @@ export class OwnedUiSessionPresenter {
             this.#streamPresentation.presentImmediate();
         }
         const view = this.view();
-        for (const listener of this.#listeners)
-            listener(view);
         return view;
     }
     // Rationale: extensions reach the shell only through this bridge; every surface they draw lands in the root.
@@ -1005,14 +758,40 @@ export class OwnedUiSessionPresenter {
             setToolsExpanded: expanded => this.root.setToolsExpanded(expanded),
         });
     }
+    #createSelectors(presenters) {
+        return new SessionSelectors({
+            root: this.root,
+            terminal: this.#terminal,
+            dialogs: this.#dialogs,
+            presenters,
+            backend: this.backend,
+            customViewport: this.#customViewport,
+            disposed: () => this.#disposed,
+            runWorkflow: request => this.runWorkflow(request),
+            sendSlashPrompt: (text, typed) => this.#submission.sendSlashPrompt(text, typed),
+            reportError: () => this.#submission.reportError(),
+            input: (title, placeholder, inputOptions) => this.#extensionBridge.input(title, placeholder, inputOptions),
+            shutdown: () => { void this.shutdown(); },
+        });
+    }
+    #createHistory(promptHistory) {
+        return new SessionPromptHistory(promptHistory, {
+            editor: this.root.editor,
+            usesDefaultInputSurface: () => this.root.usesDefaultInputSurface(),
+            rehydrate: (text, resolveImage) => this.root.promptChips.rehydrateHistoryText(text, resolveImage),
+            requestRender: () => this.#terminal.requestRender(),
+            transcript: () => this.view().transcript,
+            currentHistorySessionId: () => this.backend.identity.currentHistorySessionId(),
+        });
+    }
     #createSubmission(cwd) {
         return new PromptSubmission({
             backend: this.backend,
             root: this.root,
             terminal: this.#terminal,
             cwd, statusText: this.#presenters.components.info.statusText,
-            promptHistory: () => this.#promptHistory,
-            imageSidecar: () => this.#historyBinding?.imageSidecar,
+            promptHistory: () => this.#history?.controller ?? null,
+            imageSidecar: () => this.#history?.imageSidecar,
             disposed: () => this.#disposed,
             correlation: prefix => this.#correlation(prefix),
             lifecycle: () => this.view().lifecycle,
@@ -1033,7 +812,7 @@ export class OwnedUiSessionPresenter {
             this.#login,
             { onSessionReplaced: () => this.#extensionBridge.reset() },
             // Invariant: a replaced session takes its transient viewport and owned-route state with it.
-            { onSessionReplaced: () => this.root.resetViewport() },
+            { onSessionReplaced: () => this.root.viewport.reset() },
             this.#dialogs,
             { onSessionReplaced: () => this.root.setInputSurface(null) },
             { onSessionReplaced: () => this.root.resetExtensionUi() },
@@ -1049,64 +828,7 @@ export class OwnedUiSessionPresenter {
             this.#sessionBindingGeneration = this.backend.identity.sessionBindingGeneration;
             this.root.transcript.reset();
         }
-        const binding = this.#historyBinding;
-        if (binding?.options.forSession !== undefined || binding?.options.forScope !== undefined) {
-            const sessionId = this.backend.identity.currentHistorySessionId();
-            const selectedScope = scope ?? binding.scope;
-            if (selectedScope !== binding.scope || sessionId !== binding.sessionId) {
-                if (!replaced)
-                    this.root.editor.recall?.restoreDraft?.();
-                const previous = this.#promptHistory;
-                this.#promptHistory = null;
-                binding.imageSidecar = undefined;
-                binding.scope = selectedScope;
-                binding.sessionId = sessionId ?? undefined;
-                void previous?.close().catch(() => false);
-                const destination = binding.options.forScope !== undefined
-                    ? binding.options.forScope(selectedScope, sessionId)
-                    : sessionId === null ? null : binding.options.forSession(sessionId);
-                if (destination !== null) {
-                    binding.imageSidecar = destination.imageSidecar;
-                    const controller = new PromptHistoryController({
-                        editor: this.root.editor,
-                        store: destination.store,
-                        limit: binding.options.limit,
-                        fallback: replaced ? this.view().transcript.flatMap(block => block.kind === "user" ? [block.text] : []) : [],
-                        active: () => this.root.usesDefaultInputSurface(),
-                        render: () => this.#terminal.requestRender(),
-                        rehydrate: value => this.root.rehydrateHistoryText(value, id => this.#historyBinding?.imageSidecar?.readAttachment(id) ?? null),
-                    });
-                    this.#promptHistory = controller;
-                    if (this.#started)
-                        controller.start();
-                }
-                else {
-                    // Security: missing identity must not reopen Shared or retain another session's recall.
-                    const fallback = replaced ? this.view().transcript.flatMap(block => block.kind === "user" ? [block.text] : []).reverse() : [];
-                    this.root.editor.recall?.reset();
-                    this.root.editor.recall?.replace(fallback);
-                }
-                return;
-            }
-        }
-        if (replaced)
-            this.#promptHistory?.reset(this.view().transcript.flatMap(block => block.kind === "user" ? [block.text] : []));
-    }
-    #syncTerminalProgress(view) {
-        if (!this.#terminal.running)
-            return;
-        this.#terminal.setTerminalProgress(this.#terminalProgressEnabled && view.lifecycle === "busy");
-        if (view.lifecycle === "stopped" || view.lifecycle === "stopping") {
-            this.#programStatus.clear();
-            return;
-        }
-        this.#programStatus.setBlocked("dialog", view.dialog === null ? undefined : {
-            kind: "question",
-            message: view.dialog.title,
-        });
-        if (view.lifecycle === "failed")
-            this.#programStatus.setErrorMessage(view.status.diagnostics.at(-1));
-        this.#programStatus.report();
+        this.#history?.rebind(replaced, scope);
     }
     #syncView() {
         this.#streamPresentation.noteImmediatePresentation();
@@ -1114,11 +836,10 @@ export class OwnedUiSessionPresenter {
         if (this.backend.identity.sessionGeneration !== this.#sessionGeneration)
             this.#concerns.replaceSession();
         this.root.update(view);
+        this.#terminalPresentation.syncTitle(view);
         this.#dialogs.syncBackend(view.dialog);
         this.#presentStartupTrustWarning(view);
         this.#terminal.requestRender();
-        for (const listener of this.#listeners)
-            listener(view);
         return view;
     }
     // Rationale: a cancelled or failed trust choice explains the restricted session where the
@@ -1188,7 +909,7 @@ export class OwnedUiSessionPresenter {
         const skills = this.#skillSummaries();
         const trimmed = argument.trim();
         if (trimmed.length === 0) {
-            this.showSkillsSelector(skills);
+            this.selectors.showSkillsSelector(skills);
             return { outcome: "completed", diagnostic: null };
         }
         const separator = trimmed.search(/\s/u);
@@ -1202,45 +923,6 @@ export class OwnedUiSessionPresenter {
         }
         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(this.#presenters.components.dialogs.extensionSelector("Summarize Branch?", ["No summary", "Summarize", "Summarize with custom prompt"], resolve, () => resolve(undefined)), true, "opaque");
-            this.#terminal.requestRender();
-        });
-    }
-    async #completeTreeSelection(entryId, skipSummaryPrompt) {
-        let summarize = false;
-        let customInstructions;
-        if (!skipSummaryPrompt) {
-            while (true) {
-                const choice = await this.#treeSummary();
-                if (choice === undefined) {
-                    await this.showTreeSelector(entryId);
-                    return;
-                }
-                summarize = choice !== "No summary";
-                if (choice === "Summarize with custom prompt") {
-                    customInstructions = await this.#extensionBridge.input("Custom Summarization Instructions", "", { retainSurfaceOnSettle: true });
-                    if (customInstructions === undefined)
-                        continue;
-                }
-                break;
-            }
-        }
-        this.root.setInputSurface(null);
-        this.#terminal.requestRender();
-        const result = await this.runWorkflow({
-            command: "tree",
-            argument: "",
-            selection: entryId,
-            treeSummary: {
-                summarize,
-                ...(customInstructions === undefined ? {} : { customInstructions }),
-            },
-        });
-        if (result.diagnostic === "Branch summarization cancelled")
-            await this.showTreeSelector(entryId);
-    }
     #simple(type) {
         return { type, correlationId: this.#correlation(type), sessionId: this.backend.identity.sessionId };
     }