pi-ui-extend 0.1.13 → 0.1.15

package/dist/app/rendering/render-controller.js

@@ -57,7 +57,6 @@ export class AppRenderController {
         const underTabsOverlayStartRow = Math.min(rows, topReservedRows + 1);
         const underTabsOverlayLines = menuLines.slice(0, Math.max(0, statusRow - underTabsOverlayStartRow));
         const { lines: visible, metrics: scrollMetrics } = this.deps.scrollController.conversationView(columns, bodyHeight);
-        const scrollBar = this.deps.scrollController.scrollBarForMetrics(scrollMetrics);
         const conversationColumns = Math.max(1, Math.min(columns, scrollMetrics.viewportColumns));
         this.deps.mouseController.syncConversationSelectionForRender(scrollMetrics.start, bodyHeight, topReservedRows, conversationColumns);
         this.deps.mouseController.renderedTargets.clear();
@@ -130,17 +129,6 @@ export class AppRenderController {
             setRenderedBackground(row, rendered?.backgroundOverride);
             appendFrameOutput("conversation", row, this.renderFrameRow(row, this.deps.screenStyler.styleBaseLine(row, rendered, conversationColumns)));
         }
-        if (scrollBar && columns > 0) {
-            for (let layoutRow = 1; layoutRow <= bodyHeight; layoutRow += 1) {
-                const row = toScreenRow(layoutRow);
-                const isThumb = layoutRow >= scrollBar.thumbStartRow && layoutRow <= scrollBar.thumbEndRow;
-                const marker = isThumb ? " " : "│";
-                appendFrameOutput("conversation", row, `\x1b[${row};${columns}H${colorize(marker, {
-                    foreground: this.deps.theme.colors.inputBorder,
-                    ...(isThumb ? { background: this.deps.theme.colors.inputBorder } : {}),
-                })}`);
-            }
-        }
         const aboveEditorStartRow = inputSeparatorRow + 1;
         for (let index = 0; index < aboveEditorLines.length; index += 1) {
             const rendered = frameRenderedLine(aboveEditorLines[index], columns, this.deps.theme, this.deps.screenStyler);
@@ -245,7 +233,7 @@ export class AppRenderController {
                 appendFrameOutput(regionForOverlayRow(row), row, this.renderFrameRow(row, this.deps.popupMenus.styleOverlayLine(row, line ?? { text: "" }, columns)));
             }
         }
-        for (const toastOverlay of renderToastOverlays(this.deps.toastController.toast.visibleStates, columns, Math.max(0, statusRow - topReservedRows - 1), this.deps.theme)) {
+        for (const toastOverlay of renderToastOverlays(visibleToastStates(this.deps.toastController), columns, Math.max(0, statusRow - topReservedRows - 1), this.deps.theme)) {
             const row = topReservedRows + toastOverlay.row;
             const rowText = this.deps.mouseController.renderedRowTexts.get(row) ?? "";
             if (toastOverlay.target)
@@ -326,6 +314,10 @@ export class AppRenderController {
         return { row: Math.min(2, rows - 1), text, output };
     }
 }
+function visibleToastStates(toastController) {
+    const candidate = toastController;
+    return typeof candidate.visibleStates === "function" ? candidate.visibleStates() : candidate.toast?.visibleStates ?? [];
+}
 function inputFrameLine(width, edge) {
     if (width <= 0)
         return "";

package/dist/app/rendering/status-line-renderer.d.ts

@@ -67,10 +67,10 @@ export declare class StatusLineRenderer {
     private modelProviderColor;
     private thinkingLevelColor;
     private availableThinkingLevels;
-    private thinkingRankColor;
     private contextBarLabel;
     private widgetLayout;
     private voiceWidgetLayout;
     private statusDotColor;
 }
+export declare function thinkingLevelThemeColor(label: string, colors: Theme["colors"], availableLevels?: readonly string[]): string;
 export declare function modelProviderThemeColor(provider: string, colors: Theme["colors"]): string;

package/dist/app/rendering/status-line-renderer.js

@@ -408,35 +408,12 @@ export class StatusLineRenderer {
             : modelProviderThemeColor(provider, this.host.theme.colors);
     }
     thinkingLevelColor(label) {
-        const levels = this.availableThinkingLevels();
-        const rank = levels.indexOf(label);
-        if (rank >= 0)
-            return this.thinkingRankColor(label, rank, levels.length);
-        const fallbackLevels = ["off", "minimal", "low", "medium", "high", "xhigh"];
-        const fallbackRank = fallbackLevels.indexOf(label);
-        return fallbackRank >= 0
-            ? this.thinkingRankColor(label, fallbackRank, fallbackLevels.length)
-            : this.host.theme.colors.info;
+        return thinkingLevelThemeColor(label, this.host.theme.colors, this.availableThinkingLevels());
     }
     availableThinkingLevels() {
         const levels = this.host.session?.getAvailableThinkingLevels();
         return Array.isArray(levels) && levels.length > 0 ? levels.map(String) : ["off", "minimal", "low", "medium", "high", "xhigh"];
     }
-    thinkingRankColor(label, rank, count) {
-        const baseColors = [
-            this.host.theme.colors.muted,
-            this.host.theme.colors.success,
-            this.host.theme.colors.warning,
-            this.host.theme.colors.toolMutation,
-            this.host.theme.colors.error,
-            this.host.theme.colors.thinkingXHigh,
-        ];
-        const colors = count > baseColors.length ? [this.host.theme.colors.statusForeground, ...baseColors] : baseColors;
-        const fallbackLevels = ["off", "minimal", "low", "medium", "high", "xhigh"];
-        const fallbackRank = fallbackLevels.indexOf(label);
-        const colorIndex = count <= baseColors.length && fallbackRank >= 0 ? fallbackRank : rank;
-        return colors[Math.max(0, Math.min(colors.length - 1, colorIndex))] ?? this.host.theme.colors.info;
-    }
     contextBarLabel(status, width, workspaceLabel) {
         const session = this.host.session;
         if (!session)
@@ -483,6 +460,32 @@ export class StatusLineRenderer {
         }
     }
 }
+export function thinkingLevelThemeColor(label, colors, availableLevels) {
+    const levels = availableLevels && availableLevels.length > 0 ? availableLevels.map(String) : ["off", "minimal", "low", "medium", "high", "xhigh"];
+    const rank = levels.indexOf(label);
+    if (rank >= 0)
+        return thinkingRankThemeColor(label, rank, levels.length, colors);
+    const fallbackLevels = ["off", "minimal", "low", "medium", "high", "xhigh"];
+    const fallbackRank = fallbackLevels.indexOf(label);
+    return fallbackRank >= 0
+        ? thinkingRankThemeColor(label, fallbackRank, fallbackLevels.length, colors)
+        : colors.info;
+}
+function thinkingRankThemeColor(label, rank, count, colors) {
+    const baseColors = [
+        colors.muted,
+        colors.success,
+        colors.warning,
+        colors.toolMutation,
+        colors.error,
+        colors.thinkingXHigh,
+    ];
+    const palette = count > baseColors.length ? [colors.statusForeground, ...baseColors] : baseColors;
+    const fallbackLevels = ["off", "minimal", "low", "medium", "high", "xhigh"];
+    const fallbackRank = fallbackLevels.indexOf(label);
+    const colorIndex = count <= baseColors.length && fallbackRank >= 0 ? fallbackRank : rank;
+    return palette[Math.max(0, Math.min(palette.length - 1, colorIndex))] ?? colors.info;
+}
 export function modelProviderThemeColor(provider, colors) {
     const palette = modelProviderThemePalette(colors);
     const hash = hashString(provider.trim().toLowerCase());

package/dist/app/rendering/toast-controller.d.ts

@@ -1,16 +1,24 @@
-import { Toast, type ToastKind, type ToastVariant } from "../../ui.js";
+import { type ToastEntry, type ToastKind, type ToastVariant } from "../../ui.js";
 export type AppToastControllerHost = {
+    activeScope?(): string | undefined;
     render(): void;
 };
 export declare class AppToastController {
     private readonly host;
-    readonly toast: Toast;
+    private readonly toastsByScope;
     private readonly timers;
     constructor(host: AppToastControllerHost);
     showToast(message: string, kind?: ToastKind, options?: {
         durationMs?: number;
         variant?: ToastVariant;
+        scopeKey?: string;
     }): void;
-    dismissToast(toastId: number): void;
+    dismissToast(toastId: number, scopeKey?: string): void;
+    visibleStates(scopeKey?: string): readonly ToastEntry[];
+    entry(toastId: number, scopeKey?: string): ToastEntry | undefined;
     clearToastTimers(): void;
+    private toastForScope;
+    private timersForScope;
+    private deleteScopeIfEmpty;
+    private normalizeScopeKey;
 }

package/dist/app/rendering/toast-controller.js

@@ -2,13 +2,15 @@ import { Toast } from "../../ui.js";
 import { TOAST_DURATION_MS } from "../constants.js";
 export class AppToastController {
     host;
-    toast = new Toast();
+    toastsByScope = new Map();
     timers = new Map();
     constructor(host) {
         this.host = host;
     }
     showToast(message, kind = "info", options = {}) {
-        const toastId = this.toast.show(message, kind, options.variant ? { variant: options.variant } : {});
+        const scopeKey = this.normalizeScopeKey(options.scopeKey ?? this.host.activeScope?.());
+        const toast = this.toastForScope(scopeKey);
+        const toastId = toast.show(message, kind, options.variant ? { variant: options.variant } : {});
         if (kind === "error" || options.variant === "dialog") {
             this.host.render();
             return;
@@ -17,27 +19,66 @@ export class AppToastController {
             ? Math.floor(options.durationMs)
             : TOAST_DURATION_MS;
         const timer = setTimeout(() => {
-            this.toast.hide(toastId);
-            this.timers.delete(toastId);
+            toast.hide(toastId);
+            this.timers.get(scopeKey)?.delete(toastId);
+            this.deleteScopeIfEmpty(scopeKey);
             this.host.render();
         }, durationMs);
-        this.timers.set(toastId, timer);
+        this.timersForScope(scopeKey).set(toastId, timer);
         timer.unref();
         this.host.render();
     }
-    dismissToast(toastId) {
-        const timer = this.timers.get(toastId);
+    dismissToast(toastId, scopeKey = this.normalizeScopeKey(this.host.activeScope?.())) {
+        const timers = this.timers.get(scopeKey);
+        const timer = timers?.get(toastId);
         if (timer) {
             clearTimeout(timer);
-            this.timers.delete(toastId);
+            timers?.delete(toastId);
         }
-        this.toast.hide(toastId);
+        this.toastsByScope.get(scopeKey)?.hide(toastId);
+        this.deleteScopeIfEmpty(scopeKey);
         this.host.render();
     }
+    visibleStates(scopeKey = this.normalizeScopeKey(this.host.activeScope?.())) {
+        return this.toastsByScope.get(scopeKey)?.visibleStates ?? [];
+    }
+    entry(toastId, scopeKey = this.normalizeScopeKey(this.host.activeScope?.())) {
+        return this.toastsByScope.get(scopeKey)?.entry(toastId);
+    }
     clearToastTimers() {
-        for (const timer of this.timers.values())
-            clearTimeout(timer);
+        for (const timers of this.timers.values()) {
+            for (const timer of timers.values())
+                clearTimeout(timer);
+        }
         this.timers.clear();
-        this.toast.hide();
+        for (const toast of this.toastsByScope.values())
+            toast.hide();
+        this.toastsByScope.clear();
+    }
+    toastForScope(scopeKey) {
+        let toast = this.toastsByScope.get(scopeKey);
+        if (!toast) {
+            toast = new Toast();
+            this.toastsByScope.set(scopeKey, toast);
+        }
+        return toast;
+    }
+    timersForScope(scopeKey) {
+        let timers = this.timers.get(scopeKey);
+        if (!timers) {
+            timers = new Map();
+            this.timers.set(scopeKey, timers);
+        }
+        return timers;
+    }
+    deleteScopeIfEmpty(scopeKey) {
+        const timers = this.timers.get(scopeKey);
+        if (timers && timers.size === 0)
+            this.timers.delete(scopeKey);
+        if (!this.toastsByScope.get(scopeKey)?.visible)
+            this.toastsByScope.delete(scopeKey);
+    }
+    normalizeScopeKey(scopeKey) {
+        return scopeKey ?? "";
     }
 }

package/dist/app/runtime.d.ts

@@ -1,6 +1,6 @@
 import { SessionManager, type EventBus, type AgentSessionRuntime, type LoadExtensionsResult, type SessionEntry } from "@earendil-works/pi-coding-agent";
 import { type PixConfig } from "../config.js";
-import type { AppOptions } from "./types.js";
+import type { AppOptions, ThinkingLevel } from "./types.js";
 export type PiToolsSuiteInstallAction = "installed" | "already-installed" | "existing-kept" | "missing-source";
 export type PiToolsSuiteInstallResult = {
     action: PiToolsSuiteInstallAction;
@@ -39,6 +39,7 @@ export type CreatePixRuntimeOptions = {
 };
 type RuntimeSessionManagerModelState = Pick<SessionManager, "getEntries" | "getBranch">;
 export declare function resolvePixRuntimeModelRef(options: Pick<AppOptions, "modelRef">, sessionManager: RuntimeSessionManagerModelState, config?: PixConfig): string | undefined;
+export declare function resolvePixRuntimeInitialThinkingLevel(options: Pick<AppOptions, "modelRef">, sessionManager: RuntimeSessionManagerModelState, config: PixConfig): ThinkingLevel | undefined;
 export declare function resolveSessionModelRefFromTail(entries: readonly SessionEntry[]): string | undefined;
 export declare function createPixRuntime(options: AppOptions, runtimeOptions?: CreatePixRuntimeOptions): Promise<AgentSessionRuntime>;
 export {};

package/dist/app/runtime.js

@@ -7,6 +7,7 @@ import { createAgentSessionFromServices, createAgentSessionRuntime, createAgentS
 import { loadPixConfig, resolveDefaultModelRef } from "../config.js";
 import { PI_FAVORITE_MODEL_REFS } from "./constants.js";
 import { isThinkingLevel, parseModelRef, parseScopedModelRef } from "./model/model-ref.js";
+import { openLazySessionManager } from "./session/lazy-session-manager.js";
 const BUNDLED_QUESTION_EXTENSION_NAME = "question";
 const PI_TOOLS_SUITE_EXTENSION_NAME = "pi-tools-suite";
 const BUNDLED_EXTENSIONS_DIR = resolve(dirname(fileURLToPath(import.meta.url)), "../..", "extensions");
@@ -140,6 +141,11 @@ export function resolvePixRuntimeModelRef(options, sessionManager, config = load
         return resolveSessionModelRefFromTail(sessionManager.getBranch());
     return resolveDefaultModelRef(config);
 }
+export function resolvePixRuntimeInitialThinkingLevel(options, sessionManager, config) {
+    const effectiveModelRef = resolvePixRuntimeModelRef(options, sessionManager, config);
+    const parsedModel = effectiveModelRef ? parseModelRef(effectiveModelRef) : undefined;
+    return parsedModel?.thinkingLevel;
+}
 export function resolveSessionModelRefFromTail(entries) {
     let modelRef;
     let thinkingLevel;
@@ -166,8 +172,10 @@ export function resolveSessionModelRefFromTail(entries) {
 export async function createPixRuntime(options, runtimeOptions = {}) {
     const agentDir = getAgentDir();
     const createRuntime = async ({ cwd, sessionManager, sessionStartEvent }) => {
-        const effectiveModelRef = resolvePixRuntimeModelRef(options, sessionManager);
+        const config = loadPixConfig(cwd);
+        const effectiveModelRef = resolvePixRuntimeModelRef(options, sessionManager, config);
         const parsedModel = effectiveModelRef ? parseModelRef(effectiveModelRef) : undefined;
+        const initialThinkingLevel = resolvePixRuntimeInitialThinkingLevel(options, sessionManager, config);
         await ensureBundledSkillsInstalled();
         await ensurePiToolsSuiteExtensionInstalled({ agentDir });
         const bundledExtensionPaths = getBundledExtensionPaths();
@@ -175,6 +183,7 @@ export async function createPixRuntime(options, runtimeOptions = {}) {
             cwd,
             agentDir,
             resourceLoaderOptions: {
+                ...(config.ignoreContextFiles ? { noContextFiles: true } : {}),
                 ...(runtimeOptions.eventBus === undefined ? {} : { eventBus: runtimeOptions.eventBus }),
                 ...(bundledExtensionPaths.length === 0 ? {} : {
                     additionalExtensionPaths: bundledExtensionPaths,
@@ -203,15 +212,16 @@ export async function createPixRuntime(options, runtimeOptions = {}) {
                 },
             ];
         });
+        const created = await createAgentSessionFromServices({
+            services,
+            sessionManager,
+            ...(sessionStartEvent === undefined ? {} : { sessionStartEvent }),
+            ...(model === undefined ? {} : { model }),
+            ...(initialThinkingLevel === undefined ? {} : { thinkingLevel: initialThinkingLevel }),
+            ...(scopedModels.length === 0 ? {} : { scopedModels }),
+        });
         return {
-            ...(await createAgentSessionFromServices({
-                services,
-                sessionManager,
-                ...(sessionStartEvent === undefined ? {} : { sessionStartEvent }),
-                ...(model === undefined ? {} : { model }),
-                ...(parsedModel?.thinkingLevel === undefined ? {} : { thinkingLevel: parsedModel.thinkingLevel }),
-                ...(scopedModels.length === 0 ? {} : { scopedModels }),
-            })),
+            ...created,
             services,
             diagnostics: services.diagnostics,
         };
@@ -222,7 +232,7 @@ export async function createPixRuntime(options, runtimeOptions = {}) {
         sessionManager: options.noSession
             ? SessionManager.inMemory(options.cwd)
             : options.sessionPath
-                ? SessionManager.open(options.sessionPath, undefined, options.cwd)
+                ? openLazySessionManager(options.sessionPath, { cwdOverride: options.cwd })
                 : SessionManager.create(options.cwd),
     });
 }

package/dist/app/screen/mouse-controller.d.ts

@@ -56,6 +56,7 @@ export type AppMouseControllerHost = {
     }): void;
     dismissToast(toastId: number): void;
     refreshModelUsageStatus(): void | Promise<void>;
+    refreshUserMessageJumpMenuItems?(): Promise<void>;
     queueInputFromStatus?(): void | Promise<void>;
     toggleAllThinkingExpanded?(): void;
     toggleSuperCompactTools?(): void;
@@ -111,7 +112,6 @@ export declare class AppMouseController {
     statusVoiceLanguageTarget: StatusVoiceLanguageTarget | undefined;
     readonly tabLineTargets: TabLineMouseTarget[];
     mouseSelection: MouseSelection | undefined;
-    private scrollBarDragActive;
     private inputScrollBarDragActive;
     private autoScrollTimer;
     private autoScrollDirection;
@@ -142,7 +142,6 @@ export declare class AppMouseController {
     private statusTargetAt;
     private handleImageClick;
     private handleFileLinkClick;
-    private handleConversationScrollBar;
     private handleInputScrollBar;
     private finishInputScrollBarDrag;
     private handleInputWheel;
@@ -155,6 +154,7 @@ export declare class AppMouseController {
     private handleStatusContextClick;
     private handleStatusModelUsageClick;
     private handleStatusUserJumpClick;
+    private openStatusUserJumpMenu;
     private handleStatusDraftQueueClick;
     private handleStatusThinkingExpandClick;
     private handleStatusCompactToolsClick;

package/dist/app/screen/mouse-controller.js

@@ -3,7 +3,7 @@ import { stringifyUnknown } from "../rendering/message-content.js";
 import { horizontalPaddingLayout } from "../rendering/render-text.js";
 import { orderedSelection, samePoint } from "./screen-selection.js";
 import { openImageContent as openSystemImageContent } from "./image-opener.js";
-import { stringDisplayWidth } from "../../terminal-width.js";
+import { sliceByDisplayColumns, stringDisplayWidth } from "../../terminal-width.js";
 import { formatDcpStatsToast } from "../rendering/dcp-stats.js";
 import { detectFileLinks } from "./file-links.js";
 import { openFileLink as openDetectedFileLink } from "./file-link-opener.js";
@@ -34,7 +34,6 @@ export class AppMouseController {
     statusVoiceLanguageTarget;
     tabLineTargets = [];
     mouseSelection;
-    scrollBarDragActive = false;
     inputScrollBarDragActive = false;
     autoScrollTimer;
     autoScrollDirection;
@@ -57,8 +56,6 @@ export class AppMouseController {
     handleMouse(event) {
         if (this.handleInputScrollBar(event))
             return;
-        if (this.handleConversationScrollBar(event))
-            return;
         this.showClickFlashOnPress(event);
         if (this.handleMouseSelection(event))
             return;
@@ -339,39 +336,6 @@ export class AppMouseController {
             this.host.showToast("Could not open file link. Install the Zed CLI or set ZED_CLI.", "warning");
         return true;
     }
-    handleConversationScrollBar(event) {
-        if (!this.scrollBarDragActive && this.tabLineTargetAt(event))
-            return false;
-        const columns = this.host.terminalColumns();
-        const terminalRows = this.host.terminalRows();
-        const tabPanelRows = this.host.tabPanelRows(terminalRows);
-        const rows = editorLayoutRows(terminalRows, tabPanelRows);
-        const topOffset = editorLayoutTopOffset(tabPanelRows);
-        if (columns <= 0 || rows <= 0)
-            return false;
-        const { bodyHeight } = this.host.editorLayoutRenderer().computeLayout(columns, rows);
-        const localY = event.y - topOffset;
-        const insideBody = localY >= 1 && localY <= bodyHeight;
-        const onScrollBar = insideBody && event.x === columns && !!this.scrollController.scrollBarMetrics(columns, bodyHeight);
-        const baseButton = event.button & 3;
-        const draggingLeftButton = (event.button & 32) !== 0 && baseButton === 0;
-        if (event.released) {
-            if (!this.scrollBarDragActive)
-                return false;
-            this.scrollBarDragActive = false;
-            return true;
-        }
-        if (event.button === 0 && onScrollBar) {
-            this.scrollBarDragActive = true;
-            this.scrollController.scrollToScrollbarPosition(localY - 1);
-            return true;
-        }
-        if (!draggingLeftButton || !this.scrollBarDragActive)
-            return false;
-        const bodyRow = Math.max(0, Math.min(Math.max(0, bodyHeight - 1), localY - 1));
-        this.scrollController.scrollToScrollbarPosition(bodyRow);
-        return true;
-    }
     handleInputScrollBar(event) {
         if (!this.inputScrollBarDragActive && this.tabLineTargetAt(event))
             return false;
@@ -509,10 +473,24 @@ export class AppMouseController {
             return false;
         if (event.y !== target.row || event.x < target.startColumn || event.x >= target.endColumn)
             return false;
-        this.popupMenus.openDirectPopupMenu("user-message-jump", { preserveStatus: true });
-        this.host.render();
+        void this.openStatusUserJumpMenu();
         return true;
     }
+    async openStatusUserJumpMenu() {
+        try {
+            if (this.host.refreshUserMessageJumpMenuItems) {
+                this.host.setStatus("scanning session messages…");
+                this.host.render();
+                await this.host.refreshUserMessageJumpMenuItems();
+            }
+            this.popupMenus.openDirectPopupMenu("user-message-jump", { preserveStatus: true });
+            this.host.render();
+        }
+        catch (error) {
+            this.host.showToast(`Could not load jump messages: ${error instanceof Error ? error.message : stringifyUnknown(error)}`, "error");
+            this.host.render();
+        }
+    }
     handleStatusDraftQueueClick(event) {
         const target = this.statusDraftQueueTarget;
         if (!target)
@@ -829,9 +807,7 @@ export class AppMouseController {
             const line = range.start.line + index;
             const startColumn = line === range.start.line ? range.start.x : 1;
             const endColumn = line === range.end.line ? range.end.x : text.length + 1;
-            const startIndex = Math.max(0, Math.min(text.length, startColumn - 1));
-            const endIndex = Math.max(startIndex, Math.min(text.length, endColumn - 1));
-            lines.push(text.slice(startIndex, endIndex).trimEnd());
+            lines.push(sliceByDisplayColumns(text, startColumn, endColumn).trimEnd());
         }
         return lines.join("\n").replace(/\s+$/u, "");
     }
@@ -839,10 +815,10 @@ export class AppMouseController {
         const area = this.conversationArea();
         if (!area || area.bodyHeight <= 0)
             return undefined;
-        if (!clampToViewport && (event.y < area.topRow || event.y > area.bottomRow || event.x === this.host.terminalColumns()))
+        if (!clampToViewport && (event.y < area.topRow || event.y > area.bottomRow))
             return undefined;
         const screenY = Math.max(area.topRow, Math.min(area.bottomRow, event.y));
-        const screenX = Math.max(1, Math.min(area.viewportColumns + 1, event.x));
+        const screenX = viewportSelectionColumn(event.x, area.viewportColumns);
         return {
             conversation: {
                 line: area.metrics.start + (screenY - area.topRow),
@@ -945,7 +921,7 @@ export class AppMouseController {
         if (!area)
             return;
         const screenY = this.autoScrollDirection < 0 ? area.topRow : area.bottomRow;
-        const screenX = Math.max(1, Math.min(area.viewportColumns + 1, this.autoScrollCursorX));
+        const screenX = viewportSelectionColumn(this.autoScrollCursorX, area.viewportColumns);
         selection.current = { x: screenX, y: screenY };
         selection.conversationCurrent = {
             line: area.metrics.start + (screenY - area.topRow),
@@ -971,13 +947,16 @@ export function screenSelectionLineText(row, text, startColumn, endColumn, input
         copyStartColumn = Math.max(copyStartColumn, inputFrame.contentStartColumn);
         copyEndColumn = Math.min(copyEndColumn, inputFrame.contentEndColumn);
     }
-    const startIndex = Math.max(0, Math.min(text.length, copyStartColumn - 1));
-    const endIndex = Math.max(startIndex, Math.min(text.length, copyEndColumn - 1));
-    return text.slice(startIndex, endIndex);
+    return sliceByDisplayColumns(text, copyStartColumn, copyEndColumn);
 }
 function sameConversationPoint(left, right) {
     return !!left && left.line === right.line && left.x === right.x;
 }
+function viewportSelectionColumn(mouseX, viewportColumns) {
+    if (mouseX >= viewportColumns)
+        return viewportColumns + 1;
+    return Math.max(1, Math.min(viewportColumns + 1, mouseX));
+}
 function toastTargetContainsEvent(target, event) {
     if (target.startColumn === undefined || target.endColumn === undefined)
         return true;

package/dist/app/screen/screen-styler.d.ts

@@ -29,7 +29,7 @@ export declare class ScreenStyler {
         end: number;
     }[] | undefined, width: number, tagColor: string, suggestionColor: string, frameColor?: string): string;
     private styleAnsiLine;
-    selectionRangeForRow(row: number, width: number): {
+    selectionRangeForRow(row: number, width: number, text?: string): {
         startIndex: number;
         endIndex: number;
     } | undefined;

package/dist/app/screen/screen-styler.js

@@ -1,6 +1,7 @@
 import { ANSI_RESET, colorize } from "../../theme.js";
 import { renderMarkdownLine } from "../../markdown-format.js";
 import { syntaxHighlightSegmentsForLine } from "../../syntax-highlight.js";
+import { displayIndexForColumn } from "../../terminal-width.js";
 import { padOrTrimPlain } from "../rendering/render-text.js";
 import { orderedSelection } from "./screen-selection.js";
 export class ScreenStyler {
@@ -19,7 +20,7 @@ export class ScreenStyler {
             ? renderMarkdownDisplayLine(line.text, width, line.syntaxHighlight.start)
             : undefined;
         const text = markdownLine?.text ?? line?.text ?? "";
-        if (line?.syntaxHighlight && !this.selectionRangeForRow(row, width)) {
+        if (line?.syntaxHighlight && !this.selectionRangeForRow(row, width, text)) {
             const syntaxHighlight = markdownLine ? { ...line.syntaxHighlight, start: Math.min(line.syntaxHighlight.start, markdownLine.text.length) } : line.syntaxHighlight;
             const segments = [
                 ...syntaxHighlightSegmentsForLine(text, syntaxHighlight, colors),
@@ -35,7 +36,7 @@ export class ScreenStyler {
         return this.styleLine(row, text, width, options);
     }
     styleLineSegments(row, text, width, baseOptions, segments) {
-        if (this.selectionRangeForRow(row, width))
+        if (this.selectionRangeForRow(row, width, text))
             return this.styleLine(row, text, width, baseOptions);
         const plain = padOrTrimPlain(text, width);
         const chunks = [];
@@ -56,7 +57,7 @@ export class ScreenStyler {
     }
     styleLine(row, text, width, options) {
         const plain = padOrTrimPlain(text, width);
-        const range = this.selectionRangeForRow(row, width);
+        const range = this.selectionRangeForRow(row, width, plain);
         if (!range)
             return colorize(plain, options);
         const before = plain.slice(0, range.startIndex);
@@ -75,7 +76,7 @@ export class ScreenStyler {
     styleInputLine(row, text, tagSpans, suggestionSpans, width, tagColor, suggestionColor, frameColor) {
         const colors = this.host.theme.colors;
         const baseOptions = { foreground: colors.inputForeground };
-        if (this.selectionRangeForRow(row, width))
+        if (this.selectionRangeForRow(row, width, text))
             return this.styleLine(row, text, width, baseOptions);
         const plain = padOrTrimPlain(text, width);
         const frameSpans = inputFrameSpans(plain, width, frameColor);
@@ -109,7 +110,7 @@ export class ScreenStyler {
             return text;
         return `${prefix}${text.replaceAll(ANSI_RESET, `${ANSI_RESET}${prefix}`)}${ANSI_RESET}`;
     }
-    selectionRangeForRow(row, width) {
+    selectionRangeForRow(row, width, text) {
         if (!this.host.mouseSelection)
             return undefined;
         const anchor = this.host.mouseSelection.screenAnchor ?? this.host.mouseSelection.anchor;
@@ -119,8 +120,9 @@ export class ScreenStyler {
             return undefined;
         const startColumn = row === start.y ? start.x : 1;
         const endColumn = row === end.y ? end.x : width + 1;
-        const startIndex = Math.max(0, Math.min(width, startColumn - 1));
-        const endIndex = Math.max(startIndex, Math.min(width, endColumn - 1));
+        const plain = text ?? " ".repeat(Math.max(0, width));
+        const startIndex = Math.max(0, Math.min(plain.length, displayIndexForColumn(plain, startColumn)));
+        const endIndex = Math.max(startIndex, Math.min(plain.length, displayIndexForColumn(plain, endColumn)));
         return endIndex > startIndex ? { startIndex, endIndex } : undefined;
     }
     baseLineForeground(variant) {

package/dist/app/screen/scroll-controller.d.ts

@@ -1,6 +1,6 @@
 import type { ConversationViewport } from "../rendering/conversation-viewport.js";
 import type { EditorLayoutRenderer } from "../rendering/editor-layout-renderer.js";
-import type { RenderedLine } from "../types.js";
+import type { Entry, RenderedLine } from "../types.js";
 export type AppScrollMetrics = {
     bodyHeight: number;
     viewportColumns: number;
@@ -8,10 +8,6 @@ export type AppScrollMetrics = {
     maxScroll: number;
     start: number;
 };
-export type AppScrollBarMetrics = {
-    thumbStartRow: number;
-    thumbEndRow: number;
-};
 export type ConversationTextScrollTarget = {
     entryId?: string;
     needles: readonly string[];
@@ -22,12 +18,19 @@ export type AppScrollControllerHost = {
     terminalColumns(): number;
     terminalRows(): number;
     tabPanelRows(terminalRows: number): number;
+    hasOlderSessionHistory?(): boolean;
+    isLoadingOlderSessionHistory?(): boolean;
+    loadOlderSessionHistory?(options?: {
+        render?: boolean;
+        onPrependedEntries?: (entries: readonly Entry[]) => void;
+    }): Promise<boolean>;
     render(): void;
 };
 export declare class AppScrollController {
     private readonly host;
     private scrollFromBottom;
     private detachedScrollStart;
+    private readonly olderHistoryThresholdLines;
     constructor(host: AppScrollControllerHost);
     reset(): void;
     conversationView(columns: number, bodyHeight: number): {
@@ -36,16 +39,15 @@ export declare class AppScrollController {
     };
     visibleConversationLines(columns: number, bodyHeight: number): RenderedLine[];
     scrollMetrics(columns: number, bodyHeight: number): AppScrollMetrics;
-    scrollBarForMetrics(metrics: AppScrollMetrics): AppScrollBarMetrics | undefined;
-    scrollBarMetrics(columns: number, bodyHeight: number): AppScrollBarMetrics | undefined;
     scrollByPage(direction: -1 | 1): void;
     scrollByLines(delta: number, options?: {
         render?: boolean;
     }): boolean;
-    scrollToScrollbarPosition(bodyRow: number): boolean;
+    private shouldLoadOlderHistory;
+    private loadOlderHistoryAnchored;
+    adjustForHistoryWindowPrune(edge: "top" | "bottom", lineCount: number): void;
     scrollToConversationEntry(entryId: string): boolean;
     scrollToConversationText(target: ConversationTextScrollTarget): boolean;
-    private scrollToStart;
     private setScrollStart;
     private viewportColumns;
 }