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

package/dist/app/session-shell/viewport-pointer.d.ts

@@ -0,0 +1,83 @@
+import type { OwnedUiShellEditorPort, OwnedUiViewportSettings } from "../../contracts/owned-ui/index.js";
+import type { TerminalPointerSurface } from "../../contracts/presentation/index.js";
+import { type RoutedMouseInput } from "../../ui/components/mouse.js";
+import type { SelectionCopySnapshot } from "../../ui/components/selection-copy.js";
+import type { TranscriptViewport, TranscriptViewportFrame } from "../../ui/components/transcript-viewport.js";
+/** One-based, inclusive terminal cells of a clickable viewport-tail control. */
+export interface TailControlRegion {
+    readonly rowStart: number;
+    readonly rowEnd: number;
+    readonly columnStart: number;
+    readonly columnEnd: number;
+}
+export type TailControl = TailControlRegion & {
+    readonly activate: () => void;
+};
+export declare function withinTailControl(region: TailControlRegion, column: number, row: number): boolean;
+export interface ViewportPointerPorts {
+    readonly viewport: TranscriptViewport;
+    readonly editor: OwnedUiShellEditorPort;
+    config(): OwnedUiViewportSettings;
+    copyOnSelect(): boolean;
+    /** False while replacement input or overlay bounds have not been painted yet. */
+    inputGeometryReady(): boolean;
+    /** The topmost overlay or input surface under a cell. */
+    modalAt(column: number, row: number): TerminalPointerSurface | undefined;
+    /** The editor rows of the most recent composition. */
+    editorFrame(): {
+        readonly rowStart: number;
+        readonly rowEnd: number;
+    } | undefined;
+    tailControl(): TailControl | undefined;
+    clearTailControl(): void;
+    requestRender(): void;
+    requestHyperlinkCleanup(rows?: readonly number[]): void;
+    updateSelectionAutoScroll(column: number, row: number, viewportHeight: number, frameHeight: number): void;
+    stopSelectionAutoScroll(): void;
+    /** A right-click on the editor pastes the clipboard. */
+    pasteFromPointer(): void;
+}
+/** How one input chunk's mouse reports changed the viewport. */
+export interface ViewportPointerOutcome {
+    repaint: boolean;
+    forceRepaint: boolean;
+    activity: boolean;
+    completedCopy: SelectionCopySnapshot | undefined;
+}
+interface PointerCall {
+    readonly allowWheel: boolean;
+    readonly now: number;
+    readonly editorActive: boolean;
+}
+/**
+ * The pointer gestures of the session viewport: which surface a gesture is latched to, the
+ * suppression of a gesture begun on the dock or a control, the editor click that waits for drag
+ * or release, the rail drag offset, the pointer position and the hovered link. Each report is
+ * routed in the same order of checks, and its effect is reported as an outcome.
+ */
+export declare class ViewportPointerGestures {
+    #private;
+    constructor(ports: ViewportPointerPorts);
+    get position(): {
+        readonly column: number;
+        readonly row: number;
+    } | undefined;
+    get editorSelecting(): boolean;
+    /** A gesture is latched to a surface or a selection is being dragged. */
+    get held(): boolean;
+    /** No pointer position or hovered link is remembered. */
+    get idle(): boolean;
+    /** Forget every latch. */
+    clear(): void;
+    /** Swallow the rest of a held gesture until its release. */
+    drain(): void;
+    /** Before the first paint, a left press and its motion and release belong to no surface. */
+    routeUnpainted(data: string): RoutedMouseInput;
+    route(data: string, frame: TranscriptViewportFrame, call: PointerCall): {
+        readonly routed: RoutedMouseInput;
+        readonly outcome: ViewportPointerOutcome;
+    };
+    /** A newly composed frame may move a link away from a stationary pointer. */
+    refreshHover(frame: TranscriptViewportFrame): void;
+}
+export {};

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

@@ -0,0 +1,361 @@
+import { routeMouseInput } from "../../ui/components/mouse.js";
+import { scrollForThumbRow, scrollForTrackPage, scrollbarWheelRows } from "../../ui/components/scrollbar.js";
+import { readVisibleHyperlinks } from "../../ui/components/visible-hyperlinks.js";
+export function withinTailControl(region, column, row) {
+    return row >= region.rowStart && row <= region.rowEnd && column >= region.columnStart && column <= region.columnEnd;
+}
+/**
+ * The pointer gestures of the session viewport: which surface a gesture is latched to, the
+ * suppression of a gesture begun on the dock or a control, the editor click that waits for drag
+ * or release, the rail drag offset, the pointer position and the hovered link. Each report is
+ * routed in the same order of checks, and its effect is reported as an outcome.
+ */
+export class ViewportPointerGestures {
+    #ports;
+    #dragGrabOffset = null;
+    #owner;
+    // Invariant: a right-click editor gesture remains owned by the dock.
+    #dockSuppressed = false;
+    // Invariant: a gesture begun on an explicit control remains owned by that control.
+    #tailSuppressed = false;
+    // Invariant: editor selection remains true only while its left button is held.
+    #editorSelecting = false;
+    // Invariant: no-drag editor presses replay on release; distinct motion promotes frame selection.
+    #pendingEditorClick;
+    #position;
+    #hoveredHyperlinkKey;
+    constructor(ports) {
+        this.#ports = ports;
+    }
+    get position() {
+        return this.#position;
+    }
+    get editorSelecting() {
+        return this.#editorSelecting;
+    }
+    /** A gesture is latched to a surface or a selection is being dragged. */
+    get held() {
+        return this.#owner !== undefined || this.#ports.viewport.selectionActive || this.#editorSelecting;
+    }
+    /** No pointer position or hovered link is remembered. */
+    get idle() {
+        return this.#position === undefined && this.#hoveredHyperlinkKey === undefined;
+    }
+    /** Forget every latch. */
+    clear() {
+        this.#dragGrabOffset = null;
+        this.#dockSuppressed = false;
+        this.#tailSuppressed = false;
+        this.#editorSelecting = false;
+        this.#pendingEditorClick = undefined;
+        this.#position = undefined;
+        this.#hoveredHyperlinkKey = undefined;
+        this.#owner = undefined;
+    }
+    /** Swallow the rest of a held gesture until its release. */
+    drain() {
+        this.#owner = "drain";
+    }
+    /** Before the first paint, a left press and its motion and release belong to no surface. */
+    routeUnpainted(data) {
+        // Invariant: a not-yet-painted A1 screen is not Pi's selection surface.
+        return routeMouseInput(data, event => {
+            if (event.kind === "press" && event.button === 0)
+                this.#tailSuppressed = true;
+            if (event.kind === "release")
+                this.#tailSuppressed = false;
+            return event.kind === "motion" || event.kind === "release" || (event.kind === "press" && event.button === 0);
+        });
+    }
+    route(data, frame, call) {
+        const outcome = { repaint: false, forceRepaint: false, activity: false, completedCopy: undefined };
+        const routed = routeMouseInput(data, (event, report) => this.#report(event, report, frame, call, outcome));
+        return { routed, outcome };
+    }
+    /** A newly composed frame may move a link away from a stationary pointer. */
+    refreshHover(frame) {
+        const pointer = this.#position;
+        if (pointer === undefined || this.#ports.viewport.selectionActive || this.#editorSelecting)
+            return;
+        const next = hyperlinkKeyAt(frame, pointer.column, pointer.row);
+        if (this.#hoveredHyperlinkKey !== undefined && next !== this.#hoveredHyperlinkKey) {
+            // Platform: Windows Terminal can leave its solid native-hover underline behind
+            // when a following viewport moves the link away from a stationary pointer.
+            this.#ports.requestHyperlinkCleanup([pointer.row]);
+            this.#ports.requestRender();
+        }
+        this.#hoveredHyperlinkKey = next;
+    }
+    #report(event, report, frame, call, outcome) {
+        const viewport = this.#ports.viewport;
+        const hits = frame.hits;
+        const overModal = this.#ports.modalAt(event.column, event.row);
+        const wheel = event.kind === "wheel-up" || event.kind === "wheel-down";
+        // Invariant: latch each gesture to one surface.
+        if (this.#owner === "drain" || !this.#ports.inputGeometryReady()) {
+            if (event.kind === "release")
+                this.#owner = undefined;
+            else if (event.kind === "press")
+                this.#owner = "drain";
+            return true;
+        }
+        const owner = !wheel && this.#owner !== undefined ? this.#owner : overModal;
+        if (owner !== undefined && owner !== "viewport") {
+            if (event.kind === "press")
+                this.#owner = owner;
+            if (event.kind === "release")
+                this.#owner = undefined;
+            if (event.kind === "press" && viewport.clearSelection())
+                outcome.repaint = true;
+            viewport.setRailHovered(false);
+            viewport.setStickyHovered(false);
+            this.#position = undefined;
+            owner.component.handleInput?.(report);
+            outcome.repaint = true;
+            return true;
+        }
+        if (event.kind === "press")
+            this.#owner = "viewport";
+        if (event.kind === "release")
+            this.#owner = undefined;
+        const tailControl = this.#ports.tailControl();
+        const target = {
+            frame,
+            overRail: overModal === undefined && hits.rail !== null
+                && event.column === hits.rail.column
+                && event.row >= hits.rail.rowStart
+                && event.row < hits.rail.rowStart + hits.rail.trackHeight,
+            overSticky: overModal === undefined && hits.sticky !== null && event.row === hits.sticky.row && event.column <= hits.sticky.width,
+            overBottom: overModal === undefined && hits.bottom !== null && event.row === hits.bottom.row
+                && event.column >= hits.bottom.columnStart && event.column <= hits.bottom.columnEnd,
+            tailControl,
+            overTailControl: overModal === undefined && tailControl !== undefined
+                && withinTailControl(tailControl, event.column, event.row),
+        };
+        this.#track(event, target, outcome);
+        switch (event.kind) {
+            case "motion": return this.#motion(event, target, call, outcome);
+            case "wheel-up":
+            case "wheel-down": return this.#wheel(event, frame, call, outcome);
+            case "press": return this.#press(event, target, call, outcome);
+            case "release": return this.#release(event, call, outcome);
+        }
+    }
+    // Rationale: every report updates the pointer position, the hover of the bottom and tail controls, and the hovered link.
+    #track(event, target, outcome) {
+        const hits = target.frame.hits;
+        const tailControl = target.tailControl;
+        const previousPointer = this.#position;
+        const wasOverBottom = hits.bottom !== null && previousPointer !== undefined
+            && previousPointer.row === hits.bottom.row
+            && previousPointer.column >= hits.bottom.columnStart && previousPointer.column <= hits.bottom.columnEnd;
+        // Invariant: every report updates the pointer position.
+        this.#position = { column: event.column, row: event.row };
+        outcome.repaint ||= wasOverBottom !== target.overBottom;
+        const wasOverTailControl = tailControl !== undefined && previousPointer !== undefined
+            && withinTailControl(tailControl, previousPointer.column, previousPointer.row);
+        outcome.repaint ||= wasOverTailControl !== target.overTailControl;
+        if (!this.#ports.viewport.selectionActive && !this.#editorSelecting) {
+            const nextHyperlink = hyperlinkKeyAt(target.frame, event.column, event.row);
+            if (this.#hoveredHyperlinkKey !== undefined && nextHyperlink !== this.#hoveredHyperlinkKey) {
+                // Platform: overwrite Windows Terminal's cached native-hover underline exactly once.
+                this.#ports.requestHyperlinkCleanup(previousPointer === undefined ? undefined : [previousPointer.row]);
+                outcome.repaint = true;
+            }
+            this.#hoveredHyperlinkKey = nextHyperlink;
+        }
+    }
+    #motion(event, target, call, outcome) {
+        const viewport = this.#ports.viewport;
+        const { frame } = target;
+        const hits = frame.hits;
+        viewport.setRailHovered(target.overRail);
+        viewport.setStickyHovered(target.overSticky);
+        outcome.repaint = true;
+        const editorFrame = this.#ports.editorFrame();
+        if (call.editorActive && this.#editorSelecting && editorFrame !== undefined) {
+            this.#ports.editor.handlePointer({
+                kind: "motion",
+                button: event.button,
+                column: event.column,
+                row: event.row - editorFrame.rowStart + 1,
+            });
+            return true;
+        }
+        if (this.#dockSuppressed || this.#tailSuppressed)
+            return true;
+        const pendingEditorClick = this.#pendingEditorClick;
+        if (pendingEditorClick !== undefined) {
+            if (event.column === pendingEditorClick.column && event.row === pendingEditorClick.row)
+                return true;
+            this.#pendingEditorClick = undefined;
+            const activeEditorFrame = call.editorActive ? editorFrame : undefined;
+            if (activeEditorFrame !== undefined && this.#ports.editor.handlePointer({ kind: "press", button: 0, column: pendingEditorClick.column, row: pendingEditorClick.row - activeEditorFrame.rowStart + 1 })) {
+                this.#editorSelecting = true;
+                this.#ports.editor.handlePointer({ kind: "motion", button: event.button, column: event.column, row: event.row - activeEditorFrame.rowStart + 1 });
+                return true;
+            }
+            viewport.pressSelection(pendingEditorClick.column, pendingEditorClick.row, call.now, { continueMultiClick: false });
+            viewport.extendSelection(event.column, event.row, call.now, false);
+            this.#ports.updateSelectionAutoScroll(event.column, event.row, hits.viewportHeight, frame.rows.length);
+            outcome.activity = true;
+            return true;
+        }
+        if (viewport.selectionActive) {
+            viewport.extendSelection(event.column, event.row, call.now, false);
+            this.#ports.updateSelectionAutoScroll(event.column, event.row, hits.viewportHeight, frame.rows.length);
+            outcome.activity = true;
+            return true;
+        }
+        if (this.#dragGrabOffset !== null && hits.rail !== null) {
+            const scroll = scrollForThumbRow(hits.rail.geometry, event.row - hits.rail.rowStart - this.#dragGrabOffset);
+            viewport.scrollTo(scroll, call.now);
+            outcome.activity = true;
+            return true;
+        }
+        return target.overRail || target.overSticky || target.overBottom || target.overTailControl;
+    }
+    #wheel(event, frame, call, outcome) {
+        if (!call.allowWheel || event.row < 1 || event.row > frame.hits.viewportHeight)
+            return false;
+        const distance = scrollbarWheelRows(this.#ports.config().scrollbarSpeed);
+        this.#ports.viewport.scrollBy(event.kind === "wheel-up" ? -distance : distance, call.now);
+        outcome.activity = true;
+        outcome.repaint = true;
+        outcome.forceRepaint = true;
+        return true;
+    }
+    #press(event, target, call, outcome) {
+        const viewport = this.#ports.viewport;
+        const { frame } = target;
+        const hits = frame.hits;
+        const editorFrame = call.editorActive ? this.#ports.editorFrame() : undefined;
+        if (event.button === 2 && editorFrame !== undefined
+            && event.row >= editorFrame.rowStart && event.row <= editorFrame.rowEnd) {
+            this.#ports.stopSelectionAutoScroll();
+            if (viewport.clearSelection())
+                outcome.repaint = true;
+            this.#ports.pasteFromPointer();
+            this.#dockSuppressed = true;
+            outcome.repaint = true;
+            return true;
+        }
+        if (event.button !== 0)
+            return false;
+        this.#dockSuppressed = false;
+        this.#tailSuppressed = false;
+        this.#pendingEditorClick = undefined;
+        this.#ports.stopSelectionAutoScroll();
+        if (viewport.clearSelection())
+            outcome.repaint = true;
+        if (target.overTailControl && target.tailControl !== undefined) {
+            this.#ports.clearTailControl();
+            target.tailControl.activate();
+            this.#tailSuppressed = true;
+            outcome.repaint = true;
+            return true;
+        }
+        if (target.overBottom) {
+            viewport.scrollToEnd(call.now);
+            this.#tailSuppressed = true;
+            outcome.activity = true;
+            outcome.repaint = true;
+            return true;
+        }
+        if (target.overSticky && hits.sticky !== null) {
+            viewport.scrollTo(hits.sticky.target, call.now);
+            this.#tailSuppressed = true;
+            outcome.activity = true;
+            outcome.repaint = true;
+            return true;
+        }
+        if (target.overRail && hits.rail !== null) {
+            const trackRow = event.row - hits.rail.rowStart;
+            const geometry = hits.rail.geometry;
+            if (trackRow >= geometry.thumbTop && trackRow < geometry.thumbTop + geometry.thumbHeight) {
+                this.#dragGrabOffset = trackRow - geometry.thumbTop;
+                viewport.setRailDragging(true);
+            }
+            else {
+                viewport.scrollTo(scrollForTrackPage(geometry, trackRow, frame.scrollTop, hits.viewportHeight), call.now);
+                this.#tailSuppressed = true;
+            }
+            outcome.activity = true;
+            outcome.repaint = true;
+            return true;
+        }
+        if (event.row >= 1 && event.row <= frame.rows.length && event.column <= frame.descriptor.width) {
+            if (editorFrame !== undefined && event.row >= editorFrame.rowStart && event.row <= editorFrame.rowEnd) {
+                // Invariant: no-drag clicks remain editor-owned; first motion latches an editor drag.
+                this.#pendingEditorClick = { column: event.column, row: event.row };
+            }
+            else {
+                viewport.pressSelection(event.column, event.row, call.now);
+            }
+            outcome.repaint = true;
+            return true;
+        }
+        this.#tailSuppressed = true;
+        return true;
+    }
+    #release(event, call, outcome) {
+        const viewport = this.#ports.viewport;
+        const editorFrame = this.#ports.editorFrame();
+        if (call.editorActive && this.#editorSelecting && editorFrame !== undefined) {
+            this.#ports.editor.handlePointer({
+                kind: "release",
+                button: event.button,
+                column: event.column,
+                row: event.row - editorFrame.rowStart + 1,
+            });
+            this.#editorSelecting = false;
+            outcome.forceRepaint = true;
+            outcome.repaint = true;
+            return true;
+        }
+        const pendingEditorClick = this.#pendingEditorClick;
+        if (pendingEditorClick !== undefined) {
+            this.#pendingEditorClick = undefined;
+            if (editorFrame !== undefined) {
+                const editorRow = pendingEditorClick.row - editorFrame.rowStart + 1;
+                this.#ports.editor.handlePointer({ kind: "press", button: 0, column: pendingEditorClick.column, row: editorRow });
+                this.#ports.editor.handlePointer({ kind: "release", button: 0, column: pendingEditorClick.column, row: editorRow });
+            }
+            outcome.forceRepaint = true;
+            outcome.repaint = true;
+            return true;
+        }
+        if (viewport.releaseSelection()) {
+            this.#ports.stopSelectionAutoScroll();
+            if (this.#ports.copyOnSelect())
+                outcome.completedCopy = viewport.captureSelectedText() ?? undefined;
+            // Platform: restore OSC 8 links only after the held-button selection paint has
+            // ended, then overwrite any terminal-cached hover cells immediately.
+            outcome.forceRepaint = true;
+            outcome.repaint = true;
+            return true;
+        }
+        if (this.#dragGrabOffset !== null) {
+            this.#dragGrabOffset = null;
+            viewport.setRailDragging(false);
+            outcome.repaint = true;
+            return true;
+        }
+        if (this.#dockSuppressed) {
+            this.#dockSuppressed = false;
+            return true;
+        }
+        if (this.#tailSuppressed) {
+            this.#tailSuppressed = false;
+            return true;
+        }
+        return false;
+    }
+}
+function hyperlinkKeyAt(frame, column, row) {
+    if (row < 1 || row > frame.rows.length || column < 1)
+        return undefined;
+    const range = readVisibleHyperlinks(frame.rows[row - 1] ?? "").ranges
+        .find(candidate => column - 1 >= candidate.from && column - 1 < candidate.to);
+    return range === undefined ? undefined : JSON.stringify([row, range]);
+}

package/dist/composition/owned-ui.js

@@ -39,6 +39,8 @@ export async function composeOwnedUi(options = {}) {
             profileId: options.profileId,
             agentProvider: () => backend.settingsPort(),
         });
+    // Invariant: bare A1 owns the settings-driven ports; the comparison profile receives none of them.
+    const bareSettings = bare ? settings : null;
     const projectTrustPrompt = options.projectTrustPrompt;
     // Invariant: process-wide engine state has one owner. The host installs the HTTP dispatcher, applies
     // the theme singletons, and announces startup notices once; every session is created through it.
@@ -48,7 +50,7 @@ export async function composeOwnedUi(options = {}) {
         announceStartupChangelog: !bare,
         theme: {
             base: bare ? "dark" : "engine-configured",
-            accentColor: settings !== null && bare ? settings.value("accentColor") : "purple",
+            accentColor: bareSettings?.value("accentColor") ?? "purple",
             packageBorderProjection: bare,
             apply: { base: applyConfiguredPiTheme, accentColor: setPiAccentColor, packageBorderProjection: setPiPackageBorderProjectionEnabled },
         },
@@ -75,21 +77,20 @@ export async function composeOwnedUi(options = {}) {
         ...(options.packageVersion === undefined ? {} : { packageVersion: options.packageVersion }),
         ...(options.profileId === undefined ? {} : { profileId: options.profileId }),
     });
-    const unsubscribeAccentChange = settings === null || !bare
+    const unsubscribeAccentChange = bareSettings === null
         ? () => { }
-        : settings.onChange(current => {
+        : bareSettings.onChange(current => {
             const accent = current.value("accentColor");
             host.setAccentColor(accent);
         });
     // Rationale: separate A1 processes share one settings document; a live scope change saved in
     // one reaches the others only by rereading that document.
-    const unwatchSharedSettings = settings === null || !bare
+    const unwatchSharedSettings = bareSettings === null
         ? () => { }
-        : watchSharedSettings(settings);
+        : watchSharedSettings(bareSettings);
     const unsubscribeAccent = () => { unwatchSharedSettings(); unsubscribeAccentChange(); };
     // Invariant: the Settings search and agent prompt borrow the same resolved Pi keybindings.
     const keybindingsHost = createPiKeybindingsHost({ profile: bare ? "a1" : "pi", agentDir: backend.identity.agentDir });
-    const keybindings = keybindingsHost;
     // Rationale: Routes open only after shell construction.
     const references = {
         changelog: async (input) => {
@@ -105,41 +106,29 @@ export async function composeOwnedUi(options = {}) {
         },
         session: () => import("./session-info-reference.js").then(m => m.loadSessionInfoReference(backend)),
     };
-    const routeHost = settings === null || !bare ? null
-        : createOwnedRouteHost(settings, references, settingsRouteOptions(keybindings, backend.identity.agentDir, cwd));
-    const viewportSettings = settings === null || !bare ? null : {
-        snapshot: () => viewportSettingsSnapshot(settings),
-        onChange: listener => settings.onChange(() => listener(viewportSettingsSnapshot(settings))),
-    };
-    const backgroundSettings = settings === null || !bare ? null : {
-        snapshot: () => settings.value("backgroundStyle"),
-        // Rationale: one manager notification also recomputes an accent-derived canvas after accentColor changes.
-        onChange: listener => settings.onChange(current => listener(current.value("backgroundStyle"))),
-    };
+    const routeHost = bareSettings === null ? null
+        : createOwnedRouteHost(bareSettings, references, settingsRouteOptions(keybindingsHost, backend.identity.agentDir, cwd));
     const diagnosticDestination = options.suggestionDiagnosticsPath ?? process.env[PRODUCT_IDENTITY.environment.suggestionDiagnostics];
-    const suggestionDiagnostics = settings !== null && bare && diagnosticDestination?.trim()
+    const suggestionDiagnostics = bareSettings !== null && diagnosticDestination?.trim()
         ? await import("../features/prompt-suggestions/diagnostics.js").then(module => new module.SuggestionDiagnosticCapture({ enabled: true, destination: diagnosticDestination })) : null;
-    const promptSuggestions = settings === null || !bare ? null : {
-        ...(suggestionDiagnostics === null ? {} : { diagnostics: suggestionDiagnostics }),
-        generator: backend,
-        enabled: () => settings.value("promptSuggestions"),
-        onChange: (listener) => settings.onChange(() => listener(settings.value("promptSuggestions"))),
-    };
-    const promptImages = settings === null || !bare ? null : {
-        limit: () => settings.value("promptImageLimit"),
-        onChange: (listener) => settings.onChange(listener),
-    };
-    const skills = settings === null || !bare ? null : {
-        presentation: () => settings.value("skillsPresentation"),
-        // Rationale: one listener covers both the A1 presentation choice and the engine skill-command toggle.
-        onChange: (listener) => settings.onChange(() => listener()),
-    };
+    const barePorts = bareSettings === null ? null : bareShellPorts(bareSettings, backend, suggestionDiagnostics);
     const promptHistory = createPromptHistoryConfiguration(settings, backend, bare);
     const clipboardDestination = options.clipboardDiagnosticsPath ?? process.env[PRODUCT_IDENTITY.environment.clipboardDiagnostics];
-    const clipboardDiagnostics = settings !== null && bare && clipboardDestination?.trim()
+    const clipboardDiagnostics = bareSettings !== null && clipboardDestination?.trim()
         ? new ClipboardDiagnosticCapture(clipboardDestination) : null;
     // Invariant: process-wide services are created once here and borrowed by every session shell.
     const clipboardServices = bare ? createOwnedUiClipboardServices() : null;
+    // Invariant: one release order for a failed construction and for dispose. The shared spares outlive every
+    // shell and stop only after the last one is disposed; the host outlives the application and is released last.
+    const releaseShared = async () => {
+        clipboardServices?.dispose();
+        unsubscribeAccent();
+        await sessionRuntimes.dispose();
+        await releaseNote.releaseClaim();
+        suggestionDiagnostics?.dispose();
+        clipboardDiagnostics?.dispose();
+        await host.dispose();
+    };
     let createdTerminalHost;
     let terminalHost;
     let presenter;
@@ -156,20 +145,14 @@ export async function composeOwnedUi(options = {}) {
             presentation: {
                 ...(options.terminal === undefined ? {} : { terminal: createPiTerminalBridge(options.terminal) }),
                 ...(clipboardDiagnostics === null ? {} : { input: { onEvent: event => clipboardDiagnostics.runtime(event) } }),
-                ...(viewportSettings === null ? {} : { viewportSettings }),
-                ...(backgroundSettings === null ? {} : { backgroundSettings }),
-                ...(settings === null || !bare ? {} : {
-                    quitOutro: { snapshot: () => quitOutroSettingsSnapshot(settings), interactive: process.stdout.isTTY === true },
-                }),
+                ...barePorts?.presentation,
             },
             ...(clipboardDiagnostics === null ? {} : { diagnostics: {
                     responseCopy: { onEvent: event => clipboardDiagnostics.copy(event) },
                     paste: event => clipboardDiagnostics.paste(event),
                 } }),
-            ...(promptSuggestions === null ? {} : { suggestions: promptSuggestions }),
-            ...(promptImages === null ? {} : { promptImages }),
-            ...(skills === null ? {} : { skills }),
-            shared: { keybindings, ...(clipboardServices === null ? {} : { clipboard: clipboardServices }) },
+            ...(barePorts === null ? {} : { suggestions: barePorts.suggestions, promptImages: barePorts.promptImages, skills: barePorts.skills }),
+            shared: { keybindings: keybindingsHost, ...(clipboardServices === null ? {} : { clipboard: clipboardServices }) },
             ...(promptHistory === null ? {} : { history: {
                     ...promptHistory,
                     editor: await import("../integrations/pi/components/history-editor-loader.js").then(module => module.loadHistoryEditor()),
@@ -183,12 +166,7 @@ export async function composeOwnedUi(options = {}) {
     }
     catch (error) {
         await createdTerminalHost?.dispose().catch(() => undefined);
-        unsubscribeAccent();
-        await releaseNote.releaseClaim();
-        clipboardDiagnostics?.dispose();
-        suggestionDiagnostics?.dispose();
-        clipboardServices?.dispose();
-        await host.dispose();
+        await releaseShared();
         throw error;
     }
     // Rationale: pinned Pi's version check is unreachable because the owned shell never runs its
@@ -197,7 +175,7 @@ export async function composeOwnedUi(options = {}) {
     const releaseUpdates = deferStartupReleaseUpdateObservation({
         backend,
         configDir: productPaths.configDir,
-        mode: settings === null || !bare ? "auto" : settings.value("updateCheck"),
+        mode: bareSettings === null ? "auto" : bareSettings.value("updateCheck"),
         packageVersion: releaseNote.packageVersion, readPackageVersion,
         checkForNewerRelease: options.checkForNewerRelease,
     });
@@ -226,20 +204,46 @@ export async function composeOwnedUi(options = {}) {
                 await releaseNote.settleAcknowledgement();
             }
             finally {
-                // Invariant: the shared spares outlive every shell and stop only after the last one is disposed.
-                clipboardServices?.dispose();
-                unsubscribeAccent();
-                await sessionRuntimes.dispose();
-                await releaseNote.releaseClaim();
-                suggestionDiagnostics?.dispose();
-                clipboardDiagnostics?.dispose();
-                // Invariant: the host outlives the application; disposing it cancels host-level probes last.
-                await host.dispose();
+                await releaseShared();
             }
         },
     };
     return { application, settings };
 }
+/** The settings-driven ports only bare A1 receives: viewport, background, quit outro, suggestions, image limit, and skills. */
+function bareShellPorts(settings, generator, diagnostics) {
+    const viewportSettings = {
+        snapshot: () => viewportSettingsSnapshot(settings),
+        onChange: listener => settings.onChange(() => listener(viewportSettingsSnapshot(settings))),
+    };
+    const backgroundSettings = {
+        snapshot: () => settings.value("backgroundStyle"),
+        // Rationale: one manager notification also recomputes an accent-derived canvas after accentColor changes.
+        onChange: listener => settings.onChange(current => listener(current.value("backgroundStyle"))),
+    };
+    return {
+        presentation: {
+            viewportSettings,
+            backgroundSettings,
+            quitOutro: { snapshot: () => quitOutroSettingsSnapshot(settings), interactive: process.stdout.isTTY === true },
+        },
+        suggestions: {
+            ...(diagnostics === null || diagnostics === undefined ? {} : { diagnostics }),
+            generator,
+            enabled: () => settings.value("promptSuggestions"),
+            onChange: (listener) => settings.onChange(() => listener(settings.value("promptSuggestions"))),
+        },
+        promptImages: {
+            limit: () => settings.value("promptImageLimit"),
+            onChange: (listener) => settings.onChange(listener),
+        },
+        skills: {
+            presentation: () => settings.value("skillsPresentation"),
+            // Rationale: one listener covers both the A1 presentation choice and the engine skill-command toggle.
+            onChange: (listener) => settings.onChange(() => listener()),
+        },
+    };
+}
 function createPromptHistoryConfiguration(settings, backend, bare) {
     const limit = settings?.value("promptHistoryMaxItems") ?? 100;
     const scope = settings?.value("promptHistoryScope") ?? "unique";

package/dist/contracts/owned-ui/index.d.ts

@@ -17,5 +17,5 @@ export { SUGGESTION_ATTEMPT_TRIGGERS, SUGGESTION_DECISION_REASONS, SUGGESTION_DI
 export type { SuggestionAttemptTrigger, SuggestionDecision, SuggestionDecisionReason, SuggestionDiagnosticEvent, SuggestionDiagnosticObserver, SuggestionDiagnosticRecord, } from "./suggestion-diagnostics.js";
 export { PROMPT_HISTORY_EDITOR_REPLACEMENT, PROMPT_HISTORY_MAX_ENTRY_BYTES, PROMPT_HISTORY_MAX_PENDING, PROMPT_HISTORY_MAX_TEXT_BYTES, assertPromptHistorySubmission, } from "./prompt-history.js";
 export type { PromptHistoryFailure, PromptHistoryImageSidecarAttachment, PromptHistoryImageSidecarPort, PromptHistoryImageSidecarRecord, PromptHistoryKind, PromptHistoryPort, PromptHistoryResult, PromptHistorySnapshot, PromptHistorySubmission, } from "./prompt-history.js";
-export { assertOwnedUiCommand, assertOwnedUiCustomization, assertOwnedUiDiagnostics, assertOwnedUiEditorState, assertOwnedUiEvent, assertOwnedUiPromptSuggestionIdentity, assertOwnedUiPromptSuggestionRequest, assertOwnedUiPromptSuggestionResult, assertOwnedUiPromptSuggestionState, assertOwnedUiSessionViewModel, assertOwnedUiSnapshot, assertOwnedUiStatusView, assertOwnedUiTerminalSurface, assertOwnedUiTranscriptBlock, } from "./validation.js";
+export { assertOwnedUiCommand, assertOwnedUiPromptSuggestionRequest, assertOwnedUiPromptSuggestionResult, assertOwnedUiSnapshot, } from "./validation.js";
 export type { OwnedUiShellAuthProviderOption, OwnedUiShellAutocompleteCommand, OwnedUiShellClipboardContent, OwnedUiShellCommandMessage, OwnedUiShellComponentPort, OwnedUiShellComponents, OwnedUiShellEditorBodyGeometry, OwnedUiShellEditorOptions, OwnedUiShellEditorPointerEvent, OwnedUiShellEditorPort, OwnedUiShellEditorRecall, OwnedUiShellEditorTextRange, OwnedUiShellExtensionRendererResolver, OwnedUiShellExtensionUiBridge, OwnedUiShellExtensionUiBridgeHost, OwnedUiShellHeaderOptions, OwnedUiShellHeaderPort, OwnedUiShellHistoryEditor, OwnedUiShellHotkeysPresentation, OwnedUiShellImageAssetResolver, OwnedUiShellKeybindings, OwnedUiShellKeybindingsHost, OwnedUiShellLazySelectorLoader, OwnedUiShellLoadedResourcesPort, OwnedUiShellLoginDialogPort, OwnedUiShellMermaidRenderingMode, OwnedUiShellOperationLoaderPort, OwnedUiShellPasteReservation, OwnedUiShellProgramStatus, OwnedUiShellProgramStatusBlocked, OwnedUiShellProgramStatusReporter, OwnedUiShellProgressPresentationMode, OwnedUiShellProgressStatusPresentation, OwnedUiShellPromptInputBody, OwnedUiShellPromptInputGeometry, OwnedUiShellPromptInputPresentation, OwnedUiShellQueuedInputPort, OwnedUiShellReleaseUpdate, OwnedUiShellReleaseUpdateBanner, OwnedUiShellResourceEntry, OwnedUiShellResourceSection, OwnedUiShellRuntime, OwnedUiShellSelectorOption, OwnedUiShellSelectorOptions, OwnedUiShellSkillSummary, OwnedUiShellStartupNotice, OwnedUiShellStatusPlacement, OwnedUiShellStatusPort, OwnedUiShellSubmittedPromptComposer, OwnedUiShellThinkingLevel, OwnedUiShellThinkingSelectorOptions, OwnedUiShellTranscriptComponentPort, OwnedUiShellTreeFilterMode, OwnedUiShellTreeSelectorOptions, OwnedUiShellTrustDecision, OwnedUiShellTrustOption, OwnedUiShellTrustSelectorOptions, OwnedUiShellTrustUpdate, OwnedUiShellViewComponentPort, } from "./shell-components.js";

package/dist/contracts/owned-ui/index.js

@@ -7,4 +7,4 @@ export { CONTEXTUAL_PROMPT_SUGGESTION_INSTRUCTION, normalizePromptSuggestionCand
 export { canonicalPromptChipMatches, protectPromptChipWrapping, replaceCanonicalPromptChips } from "./prompt-chips.js";
 export { SUGGESTION_ATTEMPT_TRIGGERS, SUGGESTION_DECISION_REASONS, SUGGESTION_DIAGNOSTIC_EVENTS } from "./suggestion-diagnostics.js";
 export { PROMPT_HISTORY_EDITOR_REPLACEMENT, PROMPT_HISTORY_MAX_ENTRY_BYTES, PROMPT_HISTORY_MAX_PENDING, PROMPT_HISTORY_MAX_TEXT_BYTES, assertPromptHistorySubmission, } from "./prompt-history.js";
-export { assertOwnedUiCommand, assertOwnedUiCustomization, assertOwnedUiDiagnostics, assertOwnedUiEditorState, assertOwnedUiEvent, assertOwnedUiPromptSuggestionIdentity, assertOwnedUiPromptSuggestionRequest, assertOwnedUiPromptSuggestionResult, assertOwnedUiPromptSuggestionState, assertOwnedUiSessionViewModel, assertOwnedUiSnapshot, assertOwnedUiStatusView, assertOwnedUiTerminalSurface, assertOwnedUiTranscriptBlock, } from "./validation.js";
+export { assertOwnedUiCommand, assertOwnedUiPromptSuggestionRequest, assertOwnedUiPromptSuggestionResult, assertOwnedUiSnapshot, } from "./validation.js";