pi-open-tui 0.2.13 → 0.2.15

package/extensions/open-tui/fullscreen-scroll.ts

@@ -0,0 +1,34 @@
+import type { TUI } from "@earendil-works/pi-tui";
+
+export const MIN_FULLSCREEN_WHEEL_SCROLL_LINES = 1;
+export const MAX_FULLSCREEN_WHEEL_SCROLL_LINES = 10;
+export const DEFAULT_FULLSCREEN_WHEEL_SCROLL_LINES = 4;
+
+export function normalizeFullscreenWheelScrollLines(
+	value: unknown,
+	fallback = DEFAULT_FULLSCREEN_WHEEL_SCROLL_LINES,
+): number {
+	if (typeof value !== "number" || !Number.isFinite(value)) return fallback;
+	return Math.min(
+		MAX_FULLSCREEN_WHEEL_SCROLL_LINES,
+		Math.max(MIN_FULLSCREEN_WHEEL_SCROLL_LINES, Math.floor(value)),
+	);
+}
+
+type FullscreenWheelTui = TUI & { wheelScrollLines?: unknown };
+
+/**
+ * Pi 0.84.2 keeps this constructor option in a private runtime field. Remove
+ * this shim once Pi exposes a public setter; incompatible versions are no-ops.
+ */
+export function applyFullscreenWheelScrollLines(tui: TUI, value: number): boolean {
+	try {
+		const fullscreenTui = tui as FullscreenWheelTui;
+		if (fullscreenTui.mode !== "fullscreen" || typeof fullscreenTui.wheelScrollLines !== "number") {
+			return false;
+		}
+		return Reflect.set(fullscreenTui, "wheelScrollLines", normalizeFullscreenWheelScrollLines(value));
+	} catch {
+		return false;
+	}
+}

package/extensions/open-tui/index.ts

@@ -87,7 +87,7 @@ export default function (pi: ExtensionAPI) {
 					},
 				},
 			);
-			editor = installEditor(pi, ctx, config.cursorStyle);
+			editor = installEditor(pi, ctx, config.cursorStyle, config.fullscreen.wheelScrollLines);
 			active = true;
 		}
 	};
@@ -273,11 +273,15 @@ export default function (pi: ExtensionAPI) {
 		getConfig: () => config,
 		onConfigChanged: (newConfig) => {
 			const cursorStyleChanged = config.cursorStyle !== newConfig.cursorStyle;
+			const wheelScrollLinesChanged = config.fullscreen.wheelScrollLines !== newConfig.fullscreen.wheelScrollLines;
 			saveConfig(newConfig);
 			config = newConfig;
 			if (cursorStyleChanged && active && editor) {
 				editor.setCursorStyle(newConfig.cursorStyle);
 			}
+			if (wheelScrollLinesChanged && active && editor) {
+				editor.setWheelScrollLines(newConfig.fullscreen.wheelScrollLines);
+			}
 			if (lastCtx) {
 				pendingUiChange = getPendingUiChange(newConfig.enabled, active);
 			}

package/extensions/open-tui/settings-command.ts

@@ -1,6 +1,7 @@
 import type { ExtensionAPI, ExtensionContext, Theme } from "@earendil-works/pi-coding-agent";
 import {
 	Box,
+	Input,
 	Key,
 	matchesKey,
 	SelectList,
@@ -9,6 +10,10 @@ import {
 	Text,
 } from "@earendil-works/pi-tui";
 import type { CursorStyle, IconMode, OpenTuiConfig, SettingsLanguage } from "./config.ts";
+import {
+	DEFAULT_FULLSCREEN_WHEEL_SCROLL_LINES,
+	normalizeFullscreenWheelScrollLines,
+} from "./fullscreen-scroll.ts";
 
 interface SettingItem {
 	id: string;
@@ -24,10 +29,11 @@ const COPY = {
 	en: {
 		title: "Open TUI Settings",
 		tabs: { features: "General", icons: "Appearance", segments: "Footer", telemetry: "Telemetry" },
-		hint: "Tab/Shift+Tab/←/→: tabs · ↑/↓: move · Enter/Space: change · Esc/q: close",
+		hint: "Tab/Shift+Tab/←/→: tabs · ↑/↓: move · Enter/Space: change · Enter on wheel speed: type 1-10 · Esc/q: close",
 		labels: {
 			enabled: "Enabled",
 			language: "Language",
+			wheelScrollLines: "Mouse wheel speed",
 			cursorStyle: "Cursor style",
 			iconMode: "Icon mode",
 			cwd: "CWD",
@@ -49,6 +55,8 @@ const COPY = {
 			on: "On",
 			off: "Off",
 			languages: { en: "English", zh: "简体中文" },
+			wheelLines: (count: number) => `${count} ${count === 1 ? "line" : "lines"} / notch`,
+			wheelPrompt: (count: number) => `Wheel scroll lines per notch, 1-10 (current: ${count}). Enter: apply · Esc: cancel`,
 			cursorStyles: { block: "Block", bar: "Bar", underline: "Underline" },
 			icons: { auto: "Auto", nerd: "Nerd", ascii: "ASCII" },
 		},
@@ -56,10 +64,11 @@ const COPY = {
 	zh: {
 		title: "Open TUI 设置",
 		tabs: { features: "常规", icons: "外观", segments: "Footer", telemetry: "遥测" },
-		hint: "Tab/Shift+Tab/←/→：切页 · ↑/↓：移动 · Enter/Space：更改 · Esc/q：关闭",
+		hint: "Tab/Shift+Tab/←/→：切页 · ↑/↓：移动 · Enter/Space：更改 · 滚轮速度项 Enter 输入 1-10 · Esc/q：关闭",
 		labels: {
 			enabled: "启用",
 			language: "语言",
+			wheelScrollLines: "鼠标滚轮速度",
 			cursorStyle: "光标样式",
 			iconMode: "图标模式",
 			cwd: "当前目录",
@@ -81,6 +90,8 @@ const COPY = {
 			on: "开启",
 			off: "关闭",
 			languages: { en: "English", zh: "简体中文" },
+			wheelLines: (count: number) => `每格 ${count} 行`,
+			wheelPrompt: (count: number) => `滚轮每格滚动行数（当前 ${count}，范围 1-10），输入后 Enter 应用 · Esc 取消`,
 			cursorStyles: { block: "块", bar: "竖线", underline: "下划线" },
 			icons: { auto: "自动", nerd: "Nerd", ascii: "ASCII" },
 		},
@@ -121,6 +132,19 @@ function cycleCursorStyle(config: OpenTuiConfig): OpenTuiConfig {
 	return { ...config, cursorStyle: next };
 }
 
+function setWheelScrollLines(config: OpenTuiConfig, raw: string): OpenTuiConfig | undefined {
+	if (!/^\d+$/.test(raw)) return undefined;
+	const parsed = Number(raw);
+	const bounded = Number.isFinite(parsed) ? parsed : Number.MAX_SAFE_INTEGER;
+	return {
+		...config,
+		fullscreen: {
+			...config.fullscreen,
+			wheelScrollLines: normalizeFullscreenWheelScrollLines(bounded, DEFAULT_FULLSCREEN_WHEEL_SCROLL_LINES),
+		},
+	};
+}
+
 function toggleTelemetry(config: OpenTuiConfig, key: keyof OpenTuiConfig["telemetry"]): OpenTuiConfig {
 	return {
 		...config,
@@ -132,6 +156,11 @@ function buildFeaturesItems(config: OpenTuiConfig, copy: SettingsCopy): SettingI
 	return [
 		{ id: "enabled", label: copy.labels.enabled, currentValue: config.enabled ? copy.values.on : copy.values.off },
 		{ id: "settingsLanguage", label: copy.labels.language, currentValue: copy.values.languages[config.settingsLanguage] },
+		{
+			id: "wheelScrollLines",
+			label: copy.labels.wheelScrollLines,
+			currentValue: copy.values.wheelLines(config.fullscreen.wheelScrollLines),
+		},
 	];
 }
 
@@ -223,6 +252,7 @@ class SettingsUi implements SettingsUiHandle {
 	private cachedWidth: number | undefined;
 	private cachedLines: string[] | undefined;
 	private compact = false;
+	private wheelInput: Input | undefined;
 
 	constructor(
 		theme: Theme,
@@ -247,11 +277,35 @@ class SettingsUi implements SettingsUiHandle {
 
 	private applySetting(itemId: string): void {
 		this.selectedItemByTab[this.tab] = itemId;
+		if (this.tab === "features" && itemId === "wheelScrollLines") {
+			this.openWheelInput();
+			this.invalidate();
+			return;
+		}
 		this.config = handleSettingChange(this.tab, itemId, this.config);
 		this.onChange(this.config);
 		this.rebuild(itemId);
 	}
 
+	private openWheelInput(): void {
+		const input = new Input();
+		input.onSubmit = (value) => {
+			const next = setWheelScrollLines(this.config, value);
+			this.wheelInput = undefined;
+			if (next) {
+				this.config = next;
+				this.onChange(this.config);
+			}
+			this.rebuild("wheelScrollLines");
+		};
+		input.onEscape = () => {
+			this.wheelInput = undefined;
+			this.rebuild("wheelScrollLines");
+		};
+		this.wheelInput = input;
+		this.rebuild("wheelScrollLines");
+	}
+
 	private switchTab(offset: number): void {
 		const idx = TABS.indexOf(this.tab);
 		this.tab = TABS[(idx + offset + TABS.length) % TABS.length]!;
@@ -271,11 +325,17 @@ class SettingsUi implements SettingsUiHandle {
 		this.container.addChild(new Text(tabBar, 1, 0));
 		this.container.addChild(new Text(this.theme.fg("dim", copy.hint), 1, 0));
 
-		const items = buildItems(this.tab, this.config).map((item) => ({
-			value: item.id,
-			label: this.compact ? `${item.label}: ${item.currentValue}` : item.label,
-			description: this.compact ? undefined : item.currentValue,
-		} as SelectItem));
+		const editingWheel = this.tab === "features" && this.wheelInput !== undefined;
+		const items = buildItems(this.tab, this.config).map((item) => {
+			const editing = editingWheel && item.id === "wheelScrollLines";
+			return {
+				value: item.id,
+				label: editing
+					? (this.compact ? `${item.label}:` : item.label)
+					: (this.compact ? `${item.label}: ${item.currentValue}` : item.label),
+				description: editing || this.compact ? undefined : item.currentValue,
+			} as SelectItem;
+		});
 		this.selectList = new SelectList(items, Math.min(items.length, 10), {
 			selectedPrefix: (t) => this.theme.fg("accent", t),
 			selectedText: (t) => this.theme.fg("accent", t),
@@ -298,12 +358,28 @@ class SettingsUi implements SettingsUiHandle {
 			this.onClose();
 		};
 		this.container.addChild(this.selectList);
+		if (editingWheel) {
+			this.wheelInput!.focused = true;
+			const wheelInputGroup = new Box(4, 0);
+			wheelInputGroup.addChild(new Text(
+				this.theme.fg("muted", copy.values.wheelPrompt(this.config.fullscreen.wheelScrollLines)),
+				0,
+				0,
+			));
+			wheelInputGroup.addChild(this.wheelInput!);
+			this.container.addChild(wheelInputGroup);
+		}
 
 		this.cachedWidth = undefined;
 		this.cachedLines = undefined;
 	}
 
 	handleInput(data: string): void {
+		if (this.wheelInput && this.tab === "features") {
+			this.wheelInput.handleInput(data);
+			this.invalidate();
+			return;
+		}
 		if (matchesKey(data, Key.tab) || matchesKey(data, Key.right)) {
 			this.switchTab(1);
 			this.invalidate();

package/extensions/open-tui/state.ts

@@ -3,7 +3,7 @@ import type { AssistantMessage } from "@earendil-works/pi-ai";
 import type { GitStatus } from "./git.ts";
 import { emptyGitStatus } from "./git.ts";
 import type { RuntimeInfo } from "./runtime.ts";
-import { fmtTokens, formatProviderLabel } from "./utils.ts";
+import { finiteOrZero, fmtTokens, formatProviderLabel } from "./utils.ts";
 
 export interface FooterState {
 	git: GitStatus;
@@ -43,14 +43,17 @@ export function getUsageTotals(ctx: ExtensionContext): UsageTotals {
 			const m = entry.message as AssistantMessage;
 			const u = m.usage;
 			if (!u) continue;
-			totals.input += u.input ?? 0;
-			totals.output += u.output ?? 0;
-			totals.cacheRead += u.cacheRead ?? 0;
-			totals.cacheWrite += u.cacheWrite ?? 0;
-			totals.cost += u.cost?.total ?? 0;
-			const promptTokens = (u.input ?? 0) + (u.cacheRead ?? 0) + (u.cacheWrite ?? 0);
+			const input = finiteOrZero(u.input);
+			const cacheRead = finiteOrZero(u.cacheRead);
+			const cacheWrite = finiteOrZero(u.cacheWrite);
+			totals.input += input;
+			totals.output += finiteOrZero(u.output);
+			totals.cacheRead += cacheRead;
+			totals.cacheWrite += cacheWrite;
+			totals.cost += finiteOrZero(u.cost?.total);
+			const promptTokens = input + cacheRead + cacheWrite;
 			if (promptTokens > 0) {
-				totals.latestCacheHitRate = ((u.cacheRead ?? 0) / promptTokens) * 100;
+				totals.latestCacheHitRate = (cacheRead / promptTokens) * 100;
 			}
 		}
 	}