@timurproko/a1 0.2.7-dev.1252 → 0.2.7-dev.1264

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

@@ -1,12 +1,13 @@
-import type { PiTuiPointerSurface } from "../../integrations/pi/tui-runtime/contracts.js";
+import type { OwnedUiShellEditorPort } from "../../contracts/owned-ui/index.js";
+import type { TerminalPointerSurface } from "../../contracts/presentation/index.js";
 import type { OwnedUiViewportSettings } from "../../contracts/owned-ui/index.js";
 import { type TranscriptViewportFrame, type TranscriptViewportFrameInput } from "../../ui/components/transcript-viewport.js";
 import type { SelectionCopySnapshot } from "../../ui/components/selection-copy.js";
-import type { PiShellEditorPort } from "../../integrations/pi/components/shell-shared-facade.js";
 import type { PasteEvent } from "./paste-protocol.js";
-export interface SessionViewportControllerOptions {
+import { type TailControl, type TailControlRegion } from "./viewport-pointer.js";
+interface SessionViewportControllerOptions {
     readonly enabled: boolean;
-    readonly editor: PiShellEditorPort;
+    readonly editor: OwnedUiShellEditorPort;
     readonly requestRender: (force?: boolean) => void;
     readonly requestHyperlinkCleanup?: (rows?: readonly number[]) => void;
     /** Whether mutable editor URL chips need targeted link-cell cleanup on deletion. */
@@ -15,13 +16,6 @@ export interface SessionViewportControllerOptions {
     readonly pasteDiagnostics?: (event: PasteEvent) => void;
     readonly nextPasteDiagnosticRequest?: () => number;
 }
-/** 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 interface SessionViewportInputResult {
     readonly data: string;
     readonly consumed: boolean;
@@ -54,15 +48,13 @@ export declare class SessionViewportController {
         readonly rowEnd: number;
     } | undefined): void;
     /** The visible close control of a viewport-tail notice, or undefined when none is on screen. */
-    setTailControl(control: (TailControlRegion & {
-        readonly activate: () => void;
-    }) | undefined): void;
+    setTailControl(control: TailControl | undefined): void;
     /** Whether the pointer currently rests on the tail control; drives its hover paint. */
     tailControlHovered(target: TailControlRegion | undefined): boolean;
     /** Replacement input changed before its new bounds have been painted. */
     invalidateInputSurface(): void;
-    setInputSurfaceFrame(surface: PiTuiPointerSurface | undefined): void;
-    setOverlaySurfaces(surfaces: readonly PiTuiPointerSurface[] | null): void;
+    setInputSurfaceFrame(surface: TerminalPointerSurface | undefined): void;
+    setOverlaySurfaces(surfaces: readonly TerminalPointerSurface[] | null): void;
     get inputGeometryReady(): boolean;
     compose(input: Omit<TranscriptViewportFrameInput, "pointerPosition">): TranscriptViewportFrame;
     composeDockOnly(dockRows: readonly string[], width: number, height: number, copyableDockRows?: TranscriptViewportFrameInput["copyableDockRows"]): TranscriptViewportFrame | null;
@@ -74,3 +66,4 @@ export declare class SessionViewportController {
     clearPointerState(): void;
     handlePreInput(data: string, allowWheel?: boolean, now?: number, editorActive?: boolean): SessionViewportInputResult;
 }
+export {};

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

@@ -1,11 +1,7 @@
-import { samePointerSurfaces } from "../../integrations/pi/tui-runtime/overlay-geometry.js";
+import { samePointerSurfaces } from "../../contracts/presentation/index.js";
 import { TranscriptViewport } from "../../ui/components/transcript-viewport.js";
-import { readVisibleHyperlinks } from "../../ui/components/visible-hyperlinks.js";
-import { routeMouseInput } from "../../ui/components/mouse.js";
-import { scrollForTrackPage, scrollForThumbRow, scrollbarSelectionRows, scrollbarWheelRows } from "../../ui/components/scrollbar.js";
-function withinTailControl(region, column, row) {
-    return row >= region.rowStart && row <= region.rowEnd && column >= region.columnStart && column <= region.columnEnd;
-}
+import { scrollbarSelectionRows } from "../../ui/components/scrollbar.js";
+import { ViewportPointerGestures, withinTailControl } from "./viewport-pointer.js";
 /**
  * Owns the stateful interaction policy of the bare-A1 session viewport. The
  * shell root supplies semantic rows and dock geometry; this controller owns
@@ -26,27 +22,16 @@ export class SessionViewportController {
         scrollbarStyle: "thin",
         scrollbarSpeed: "normal",
     };
-    #dragGrabOffset = null;
     #inputSurface;
     #inputSurfacePending = false;
     #overlays = [];
-    #pointerOwner;
-    // Invariant: a right-click editor gesture remains owned by the dock.
-    #dockPointerSuppressed = false;
-    // Invariant: a gesture begun on an explicit control remains owned by that control.
-    #tailPointerSuppressed = false;
-    // Invariant: editor selection remains true only while its left button is held.
-    #editorPointerSelecting = false;
-    // Invariant: no-drag editor presses replay on release; distinct motion promotes frame selection.
-    #pendingEditorClick;
     // Invariant: pointer routing uses the most recently composed editor rows.
     #editorPointerFrame;
     // Invariant: one clickable region in the viewport tail, located by the most recent composition.
     #tailControl;
     #selectionAutoScrollTimer;
     #selectionAutoScrollPointer;
-    #pointerPosition;
-    #hoveredHyperlinkKey;
+    #gestures;
     #lastRequestedSelectionRevision = -1;
     #presentationRevision = 0;
     #copyOnSelect = true;
@@ -62,12 +47,32 @@ export class SessionViewportController {
         this.#requestHyperlinkCleanup = options.requestHyperlinkCleanup ?? (() => { });
         this.#pasteDiagnostics = options.pasteDiagnostics;
         this.#nextPasteDiagnosticRequest = options.nextPasteDiagnosticRequest ?? (() => --this.#pasteDiagnosticRequest);
+        this.#gestures = new ViewportPointerGestures({
+            viewport: this.#viewport,
+            editor: this.#editor,
+            config: () => this.#config,
+            copyOnSelect: () => this.#copyOnSelect,
+            inputGeometryReady: () => this.inputGeometryReady,
+            modalAt: (column, row) => this.#modalAt(column, row),
+            editorFrame: () => this.#editorPointerFrame,
+            tailControl: () => this.#tailControl,
+            clearTailControl: () => { this.#tailControl = undefined; },
+            requestRender: () => { this.#requestRender(); },
+            requestHyperlinkCleanup: rows => { this.#requestHyperlinkCleanup(rows); },
+            updateSelectionAutoScroll: (column, row, viewportHeight, frameHeight) => { this.#updateSelectionAutoScroll(column, row, viewportHeight, frameHeight); },
+            stopSelectionAutoScroll: () => { this.#stopSelectionAutoScroll(); },
+            pasteFromPointer: () => {
+                const request = this.#nextPasteDiagnosticRequest();
+                if (this.#editor.pasteClipboard())
+                    this.#emitPasteRoute(request, "pointer-admitted");
+            },
+        });
     }
     get config() {
         return this.#config;
     }
     get editorPointerSelecting() {
-        return this.#editorPointerSelecting;
+        return this.#gestures.editorSelecting;
     }
     get transcriptPointerSelecting() {
         return this.#viewport.selectionActive;
@@ -83,7 +88,7 @@ export class SessionViewportController {
     }
     /** Latest reported coordinates; exposed without rendering for frame provenance and evidence. */
     get pointerPosition() {
-        return this.#pointerPosition;
+        return this.#gestures.position;
     }
     setCopyOnSelect(enabled) {
         this.#copyOnSelect = enabled;
@@ -100,7 +105,7 @@ export class SessionViewportController {
     }
     /** Whether the pointer currently rests on the tail control; drives its hover paint. */
     tailControlHovered(target) {
-        const pointer = this.#pointerPosition;
+        const pointer = this.#gestures.position;
         return target !== undefined && pointer !== undefined && withinTailControl(target, pointer.column, pointer.row);
     }
     /** Replacement input changed before its new bounds have been painted. */
@@ -143,7 +148,7 @@ export class SessionViewportController {
         })));
         const frame = this.#viewport.compose({
             ...input,
-            ...(this.#pointerPosition === undefined ? {} : { pointerPosition: this.#pointerPosition }),
+            ...(this.#gestures.position === undefined ? {} : { pointerPosition: this.#gestures.position }),
             ...(coveredCells.length === 0 ? {} : { coveredCells }),
         });
         // Concurrency: if selection changed during composition, this frame truthfully carries
@@ -153,16 +158,7 @@ export class SessionViewportController {
             this.#lastRequestedSelectionRevision = this.#viewport.selectionRevision;
             this.#requestRender();
         }
-        if (this.#pointerPosition !== undefined && !this.#viewport.selectionActive && !this.#editorPointerSelecting) {
-            const next = this.#hyperlinkKeyAt(frame, this.#pointerPosition.column, this.#pointerPosition.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.#requestHyperlinkCleanup([this.#pointerPosition.row]);
-                this.#requestRender();
-            }
-            this.#hoveredHyperlinkKey = next;
-        }
+        this.#gestures.refreshHover(frame);
         return frame;
     }
     composeDockOnly(dockRows, width, height, copyableDockRows = []) {
@@ -196,32 +192,18 @@ export class SessionViewportController {
         this.#presentationRevision += 1;
         this.#clearActivityTimer();
         this.#stopSelectionAutoScroll();
-        this.#editorPointerSelecting = false;
-        this.#pendingEditorClick = undefined;
+        this.#gestures.clear();
         this.#editorPointerFrame = undefined;
-        this.#pointerPosition = undefined;
-        this.#hoveredHyperlinkKey = undefined;
         this.#viewport.reset();
-        this.#pointerOwner = undefined;
-        this.#dragGrabOffset = null;
-        this.#dockPointerSuppressed = false;
-        this.#tailPointerSuppressed = false;
     }
     clearPointerState() {
         this.#presentationRevision += 1;
         this.#clearActivityTimer();
-        this.#dragGrabOffset = null;
-        this.#dockPointerSuppressed = false;
-        this.#tailPointerSuppressed = false;
-        this.#editorPointerSelecting = false;
-        this.#pendingEditorClick = undefined;
+        this.#gestures.clear();
         this.#editorPointerFrame = undefined;
-        this.#pointerPosition = undefined;
-        this.#hoveredHyperlinkKey = undefined;
         this.#stopSelectionAutoScroll();
         this.#viewport.clearSelection();
         this.#viewport.clearTransient();
-        this.#pointerOwner = undefined;
     }
     #emitPasteRoute(request, phase) {
         try {
@@ -230,15 +212,15 @@ export class SessionViewportController {
         catch { /* Invariant: payload-free diagnostics cannot interfere with input routing. */ }
     }
     #cancelGesture() {
-        const held = this.#pointerOwner !== undefined || this.#viewport.selectionActive || this.#editorPointerSelecting;
+        const held = this.#gestures.held;
         const repaint = this.#viewport.hasSelection || held;
-        if (!repaint && this.#pointerPosition === undefined && this.#hoveredHyperlinkKey === undefined)
+        if (!repaint && this.#gestures.idle)
             return;
         const editorFrame = this.#editorPointerFrame;
         this.clearPointerState();
         this.#editorPointerFrame = editorFrame;
         if (held)
-            this.#pointerOwner = "drain";
+            this.#gestures.drain();
         if (repaint)
             this.#requestRender();
     }
@@ -291,16 +273,8 @@ export class SessionViewportController {
         if (data === "\u0018" && editorActive && !this.#viewport.hasSelection && !this.#editor.hasSelection()) {
             return { data: "", consumed: true, copyLastMessage: true };
         }
-        if (this.#viewport.frame === null) {
-            // 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.#tailPointerSuppressed = true;
-                if (event.kind === "release")
-                    this.#tailPointerSuppressed = false;
-                return event.kind === "motion" || event.kind === "release" || (event.kind === "press" && event.button === 0);
-            });
-        }
+        if (this.#viewport.frame === null)
+            return this.#gestures.routeUnpainted(data);
         if ((data === "\u0003" || data === "\u0018") && this.#viewport.hasSelection) {
             // Invariant: the newest frame selection wins over an older editor selection.
             const copySelection = this.#viewport.captureSelectedText();
@@ -325,259 +299,14 @@ export class SessionViewportController {
         if (!data.includes("\u001b[<") && data !== "\u0003" && this.#viewport.clearSelection()) {
             this.#requestRender();
         }
-        const frame = this.#viewport.frame;
-        let repaint = false;
-        let forceRepaint = false;
-        let activity = false;
-        let completedCopy;
-        const routed = routeMouseInput(data, (event, report) => {
-            const hits = frame.hits;
-            const overModal = this.#modalAt(event.column, event.row);
-            const wheel = event.kind === "wheel-up" || event.kind === "wheel-down";
-            // Invariant: latch each gesture to one surface.
-            if (this.#pointerOwner === "drain" || !this.inputGeometryReady) {
-                if (event.kind === "release")
-                    this.#pointerOwner = undefined;
-                else if (event.kind === "press")
-                    this.#pointerOwner = "drain";
-                return true;
-            }
-            const owner = !wheel && this.#pointerOwner !== undefined ? this.#pointerOwner : overModal;
-            if (owner !== undefined && owner !== "viewport") {
-                if (event.kind === "press")
-                    this.#pointerOwner = owner;
-                if (event.kind === "release")
-                    this.#pointerOwner = undefined;
-                if (event.kind === "press" && this.#viewport.clearSelection())
-                    repaint = true;
-                this.#viewport.setRailHovered(false);
-                this.#viewport.setStickyHovered(false);
-                this.#pointerPosition = undefined;
-                owner.component.handleInput?.(report);
-                repaint = true;
-                return true;
-            }
-            if (event.kind === "press")
-                this.#pointerOwner = "viewport";
-            if (event.kind === "release")
-                this.#pointerOwner = undefined;
-            const overRail = overModal === undefined && hits.rail !== null
-                && event.column === hits.rail.column
-                && event.row >= hits.rail.rowStart
-                && event.row < hits.rail.rowStart + hits.rail.trackHeight;
-            const overSticky = overModal === undefined && hits.sticky !== null && event.row === hits.sticky.row && event.column <= hits.sticky.width;
-            const overBottom = overModal === undefined && hits.bottom !== null && event.row === hits.bottom.row
-                && event.column >= hits.bottom.columnStart && event.column <= hits.bottom.columnEnd;
-            const tailControl = this.#tailControl;
-            const overTailControl = overModal === undefined && tailControl !== undefined
-                && withinTailControl(tailControl, event.column, event.row);
-            const previousPointer = this.#pointerPosition;
-            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.#pointerPosition = { column: event.column, row: event.row };
-            repaint ||= wasOverBottom !== overBottom;
-            const wasOverTailControl = tailControl !== undefined && previousPointer !== undefined
-                && withinTailControl(tailControl, previousPointer.column, previousPointer.row);
-            repaint ||= wasOverTailControl !== overTailControl;
-            if (!this.#viewport.selectionActive && !this.#editorPointerSelecting) {
-                const nextHyperlink = this.#hyperlinkKeyAt(frame, event.column, event.row);
-                if (this.#hoveredHyperlinkKey !== undefined && nextHyperlink !== this.#hoveredHyperlinkKey) {
-                    // Platform: overwrite Windows Terminal's cached native-hover underline exactly once.
-                    this.#requestHyperlinkCleanup(previousPointer === undefined ? undefined : [previousPointer.row]);
-                    repaint = true;
-                }
-                this.#hoveredHyperlinkKey = nextHyperlink;
-            }
-            if (event.kind === "motion") {
-                this.#viewport.setRailHovered(overRail);
-                this.#viewport.setStickyHovered(overSticky);
-                repaint = true;
-                if (editorActive && this.#editorPointerSelecting && this.#editorPointerFrame !== undefined) {
-                    this.#editor.handlePointer({
-                        kind: "motion",
-                        button: event.button,
-                        column: event.column,
-                        row: event.row - this.#editorPointerFrame.rowStart + 1,
-                    });
-                    return true;
-                }
-                if (this.#dockPointerSuppressed || this.#tailPointerSuppressed)
-                    return true;
-                const pendingEditorClick = this.#pendingEditorClick;
-                if (pendingEditorClick !== undefined) {
-                    if (event.column === pendingEditorClick.column && event.row === pendingEditorClick.row)
-                        return true;
-                    this.#pendingEditorClick = undefined;
-                    const editorFrame = editorActive ? this.#editorPointerFrame : undefined;
-                    if (editorFrame !== undefined && this.#editor.handlePointer({ kind: "press", button: 0, column: pendingEditorClick.column, row: pendingEditorClick.row - editorFrame.rowStart + 1 })) {
-                        this.#editorPointerSelecting = true;
-                        this.#editor.handlePointer({ kind: "motion", button: event.button, column: event.column, row: event.row - editorFrame.rowStart + 1 });
-                        return true;
-                    }
-                    this.#viewport.pressSelection(pendingEditorClick.column, pendingEditorClick.row, now, { continueMultiClick: false });
-                    this.#viewport.extendSelection(event.column, event.row, now, false);
-                    this.#updateSelectionAutoScroll(event.column, event.row, hits.viewportHeight, frame.rows.length);
-                    activity = true;
-                    return true;
-                }
-                if (this.#viewport.selectionActive) {
-                    this.#viewport.extendSelection(event.column, event.row, now, false);
-                    this.#updateSelectionAutoScroll(event.column, event.row, hits.viewportHeight, frame.rows.length);
-                    activity = true;
-                    return true;
-                }
-                if (this.#dragGrabOffset !== null && hits.rail !== null) {
-                    const target = scrollForThumbRow(hits.rail.geometry, event.row - hits.rail.rowStart - this.#dragGrabOffset);
-                    this.#viewport.scrollTo(target, now);
-                    activity = true;
-                    return true;
-                }
-                return overRail || overSticky || overBottom || overTailControl;
-            }
-            if (event.kind === "wheel-up" || event.kind === "wheel-down") {
-                if (!allowWheel || event.row < 1 || event.row > hits.viewportHeight)
-                    return false;
-                const distance = scrollbarWheelRows(this.#config.scrollbarSpeed);
-                this.#viewport.scrollBy(event.kind === "wheel-up" ? -distance : distance, now);
-                activity = true;
-                repaint = true;
-                forceRepaint = true;
-                return true;
-            }
-            if (event.kind === "press") {
-                const editorFrame = editorActive ? this.#editorPointerFrame : undefined;
-                if (event.button === 2 && editorFrame !== undefined
-                    && event.row >= editorFrame.rowStart && event.row <= editorFrame.rowEnd) {
-                    this.#stopSelectionAutoScroll();
-                    if (this.#viewport.clearSelection())
-                        repaint = true;
-                    const request = this.#nextPasteDiagnosticRequest();
-                    if (this.#editor.pasteClipboard())
-                        this.#emitPasteRoute(request, "pointer-admitted");
-                    this.#dockPointerSuppressed = true;
-                    repaint = true;
-                    return true;
-                }
-                if (event.button !== 0)
-                    return false;
-                this.#dockPointerSuppressed = false;
-                this.#tailPointerSuppressed = false;
-                this.#pendingEditorClick = undefined;
-                this.#stopSelectionAutoScroll();
-                if (this.#viewport.clearSelection())
-                    repaint = true;
-                if (overTailControl) {
-                    this.#tailControl = undefined;
-                    tailControl.activate();
-                    this.#tailPointerSuppressed = true;
-                    repaint = true;
-                    return true;
-                }
-                if (overBottom) {
-                    this.#viewport.scrollToEnd(now);
-                    this.#tailPointerSuppressed = true;
-                    activity = true;
-                    repaint = true;
-                    return true;
-                }
-                if (overSticky && hits.sticky !== null) {
-                    this.#viewport.scrollTo(hits.sticky.target, now);
-                    this.#tailPointerSuppressed = true;
-                    activity = true;
-                    repaint = true;
-                    return true;
-                }
-                if (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;
-                        this.#viewport.setRailDragging(true);
-                    }
-                    else {
-                        this.#viewport.scrollTo(scrollForTrackPage(geometry, trackRow, frame.scrollTop, hits.viewportHeight), now);
-                        this.#tailPointerSuppressed = true;
-                    }
-                    activity = true;
-                    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 {
-                        this.#viewport.pressSelection(event.column, event.row, now);
-                    }
-                    repaint = true;
-                    return true;
-                }
-                this.#tailPointerSuppressed = true;
-                return true;
-            }
-            if (event.kind === "release") {
-                if (editorActive && this.#editorPointerSelecting && this.#editorPointerFrame !== undefined) {
-                    const wasEditorSelecting = this.#editorPointerSelecting;
-                    this.#editor.handlePointer({
-                        kind: "release",
-                        button: event.button,
-                        column: event.column,
-                        row: event.row - this.#editorPointerFrame.rowStart + 1,
-                    });
-                    this.#editorPointerSelecting = false;
-                    forceRepaint ||= wasEditorSelecting;
-                    repaint = true;
-                    return true;
-                }
-                const pendingEditorClick = this.#pendingEditorClick;
-                if (pendingEditorClick !== undefined) {
-                    this.#pendingEditorClick = undefined;
-                    if (this.#editorPointerFrame !== undefined) {
-                        const editorRow = pendingEditorClick.row - this.#editorPointerFrame.rowStart + 1;
-                        this.#editor.handlePointer({ kind: "press", button: 0, column: pendingEditorClick.column, row: editorRow });
-                        this.#editor.handlePointer({ kind: "release", button: 0, column: pendingEditorClick.column, row: editorRow });
-                    }
-                    forceRepaint = true;
-                    repaint = true;
-                    return true;
-                }
-                if (this.#viewport.releaseSelection()) {
-                    this.#stopSelectionAutoScroll();
-                    if (this.#copyOnSelect)
-                        completedCopy = this.#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.
-                    forceRepaint = true;
-                    repaint = true;
-                    return true;
-                }
-                if (this.#dragGrabOffset !== null) {
-                    this.#dragGrabOffset = null;
-                    this.#viewport.setRailDragging(false);
-                    repaint = true;
-                    return true;
-                }
-                if (this.#dockPointerSuppressed) {
-                    this.#dockPointerSuppressed = false;
-                    return true;
-                }
-                if (this.#tailPointerSuppressed) {
-                    this.#tailPointerSuppressed = false;
-                    return true;
-                }
-            }
-            return false;
-        });
-        if (activity)
+        const { routed, outcome } = this.#gestures.route(data, this.#viewport.frame, { allowWheel, now, editorActive });
+        if (outcome.activity)
             this.#scheduleActivityExpiry();
-        if (repaint) {
+        if (outcome.repaint) {
             this.#lastRequestedSelectionRevision = this.#viewport.selectionRevision;
-            this.#requestRender(forceRepaint);
+            this.#requestRender(outcome.forceRepaint);
         }
-        return completedCopy === undefined ? routed : { ...routed, copySelection: completedCopy };
+        return outcome.completedCopy === undefined ? routed : { ...routed, copySelection: outcome.completedCopy };
     }
     #modalAt(column, row) {
         const contains = (surface) => column >= surface.columnStart && column <= surface.columnEnd
@@ -585,13 +314,6 @@ export class SessionViewportController {
         const overlay = this.#overlays?.findLast(contains);
         return overlay ?? (this.#inputSurface !== undefined && contains(this.#inputSurface) ? this.#inputSurface : undefined);
     }
-    #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]);
-    }
     #updateSelectionAutoScroll(column, row, viewportHeight, frameHeight) {
         // Invariant: the last content row stays selectable; only the pointer below it scrolls,
         // unless no row exists below. The top row scrolls because nothing lies above it. A
@@ -657,6 +379,6 @@ export class SessionViewportController {
 const SELECTION_AUTO_SCROLL_INTERVAL_MS = 30;
 const EDITOR_LINK_DELETION_INPUTS = new Set(["\b", "\u007f", "\u001b[3~"]);
 // Platform: Windows Terminal may consume Shift+Arrow for native selection. Ctrl+Arrow matches
-// solo A1's Windows binding while retaining Shift+Arrow whenever the terminal delivers it.
+// A1's Windows binding while retaining Shift+Arrow whenever the terminal delivers it.
 const PROMPT_UP_INPUTS = new Set(["\u001b[1;2A", "\u001b[1;5A"]);
 const PROMPT_DOWN_INPUTS = new Set(["\u001b[1;2B", "\u001b[1;5B"]);

package/dist/app/session-shell/settings-bindings.d.ts

@@ -1,10 +1,10 @@
-import type { OwnedUiSessionSettingsPort, OwnedUiSessionSettingsSnapshot } from "../../contracts/owned-ui/index.js";
+import type { OwnedUiSessionSettingsPort, OwnedUiSessionSettingsSnapshot, OwnedUiViewportSettingsPort } from "../../contracts/owned-ui/index.js";
 import type { OwnedUiPresenterTerminal } from "./shell-host.js";
 import type { OwnedUiSessionShellRoot } from "./session-shell-root.js";
 /** What the session's live setting effects reach: terminal modes, root presentation, and the presenter's progress flag. */
-export interface SessionSettingsTargets {
+interface SessionSettingsTargets {
     readonly terminal: Pick<OwnedUiPresenterTerminal, "setHardwareCursor" | "setClearOnShrink" | "setWheelScrollLines">;
-    readonly root: Pick<OwnedUiSessionShellRoot, "setEditorPaddingX" | "setAutocompleteMaxVisible" | "setOutputPad" | "setHideThinkingBlock" | "setMermaidRenderingMode" | "setImagePresentation" | "setFullscreenCopyOnSelect">;
+    readonly root: Pick<OwnedUiSessionShellRoot, "setEditorPaddingX" | "setAutocompleteMaxVisible" | "setOutputPad" | "setHideThinkingBlock" | "setMermaidRenderingMode" | "setImagePresentation" | "viewport">;
     setTerminalProgress(enabled: boolean): void;
 }
 /**
@@ -15,3 +15,25 @@ export interface SessionSettingsTargets {
 export declare function bindSessionSettings(settings: Pick<OwnedUiSessionSettingsPort, "bindOwner" | "productMode">, snapshot: OwnedUiSessionSettingsSnapshot, targets: SessionSettingsTargets, options: {
     readonly customViewport: boolean;
 }): () => void;
+/** The shell's own live setting sources besides the session settings; absent sources bind nothing. */
+export interface ShellSettingSources {
+    readonly customViewport: boolean;
+    readonly promptImages: {
+        onChange(listener: () => void): () => void;
+    } | null;
+    readonly skills: {
+        onChange(listener: () => void): () => void;
+    } | null;
+    readonly viewport: OwnedUiViewportSettingsPort | undefined;
+    readonly historyScope: ((listener: (scope: "unique" | "shared") => void) => () => void) | undefined;
+}
+/** What those sources change: the prompt-image notice, the command menu, the viewport, and the transcript binding. */
+export interface ShellSettingEffects {
+    readonly root: Pick<OwnedUiSessionShellRoot, "setViewportConfig">;
+    promptImageLimitChanged(): void;
+    skillsChanged(): void;
+    historyScopeChanged(scope: "unique" | "shared"): void;
+}
+/** Seeds the viewport and subscribes every shell setting source; the returned release undoes all of them. */
+export declare function bindShellSettings(sources: ShellSettingSources, effects: ShellSettingEffects): () => void;
+export {};

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

@@ -49,13 +49,13 @@ function settingBindings(targets, snapshot, customViewport, bare) {
         { owner: null, key: "imageWidthCells", live: () => { }, seed: presentImages },
         // Invariant: the custom viewport owns copy-on-select; the pinned comparison profile keeps Pi's wheel distance.
         customViewport
-            ? setting("shell", "fullscreenCopyOnSelect", "Fullscreen copy-on-select setting is invalid", isBoolean, value => root.setFullscreenCopyOnSelect(value))
+            ? setting("shell", "fullscreenCopyOnSelect", "Fullscreen copy-on-select setting is invalid", isBoolean, value => root.viewport.setCopyOnSelect(value))
             : setting("shell", "fullscreenWheelScrollLines", "Fullscreen wheel-scroll distance is invalid", isWheelDistance, value => terminal.setWheelScrollLines(value), false),
         ...(customViewport ? [] : [{
                 owner: null,
                 key: "fullscreenCopyOnSelect",
                 live: () => { },
-                seed: (initial) => root.setFullscreenCopyOnSelect(initial.fullscreenCopyOnSelect),
+                seed: (initial) => root.viewport.setCopyOnSelect(initial.fullscreenCopyOnSelect),
             }]),
     ];
 }
@@ -89,3 +89,27 @@ export function bindSessionSettings(settings, snapshot, targets, options) {
     }
     return release;
 }
+/** Seeds the viewport and subscribes every shell setting source; the returned release undoes all of them. */
+export function bindShellSettings(sources, effects) {
+    const releases = [];
+    const release = () => { for (const unbind of releases.splice(0).reverse())
+        unbind(); };
+    try {
+        if (sources.promptImages !== null)
+            releases.push(sources.promptImages.onChange(() => effects.promptImageLimitChanged()));
+        // 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.
+        if (sources.skills !== null)
+            releases.push(sources.skills.onChange(() => effects.skillsChanged()));
+        effects.root.setViewportConfig(sources.viewport?.snapshot() ?? { scrollbarAppearance: "auto", scrollbarStyle: "thin", scrollbarSpeed: "normal" });
+        if (sources.customViewport && sources.viewport !== undefined)
+            releases.push(sources.viewport.onChange(settings => effects.root.setViewportConfig(settings)));
+        if (sources.customViewport && sources.historyScope !== undefined)
+            releases.push(sources.historyScope(scope => effects.historyScopeChanged(scope)));
+    }
+    catch (error) {
+        release();
+        throw error;
+    }
+    return release;
+}

package/dist/app/session-shell/share-operation.d.ts

@@ -1,3 +1,3 @@
-import { createPiShellOperationLoader, createPiShellShareOperationDialog } from "../../integrations/pi/components/index.js";
-export { createPiShellOperationLoader, createPiShellShareOperationDialog };
-export declare function renderPiShellShareResult(message: string, gistUrl: string): string;
+import type { UiTheme } from "../../contracts/presentation/index.js";
+/** The completed share result in bare A1: dim labels with the share and gist URLs made clickable. */
+export declare function renderShellShareResult(message: string, gistUrl: string, theme: UiTheme, hyperlink: (url: string) => string): string;

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

@@ -1,11 +1,9 @@
-import { createPiShellOperationLoader, createPiShellShareOperationDialog, piShellHyperlink, piTheme, } from "../../integrations/pi/components/index.js";
 import { nativeHyperlinkStyle } from "../../ui/components/index.js";
-export { createPiShellOperationLoader, createPiShellShareOperationDialog };
-export function renderPiShellShareResult(message, gistUrl) {
-    const theme = piTheme();
+/** The completed share result in bare A1: dim labels with the share and gist URLs made clickable. */
+export function renderShellShareResult(message, gistUrl, theme, hyperlink) {
     const match = /^Share URL: (\S+)$/u.exec(message);
     const linked = match === null
         ? theme.fg("dim", message)
-        : `${theme.fg("dim", "Share URL: ")}${piShellHyperlink(match[1])}`;
-    return nativeHyperlinkStyle(`${linked}\n${theme.fg("dim", "Gist: ")}${piShellHyperlink(gistUrl)}`, text => theme.fg("mdLink", text));
+        : `${theme.fg("dim", "Share URL: ")}${hyperlink(match[1])}`;
+    return nativeHyperlinkStyle(`${linked}\n${theme.fg("dim", "Gist: ")}${hyperlink(gistUrl)}`, text => theme.fg("mdLink", text));
 }