@underactive/pi-topping 0.11.1 → 0.13.0

package/src/settings.ts

@@ -1,10 +1,10 @@
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
-import { mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
-import { dirname, join } from "node:path";
-import { DEFAULT_METER_UPPER_BOUND_TPS, METER_UPPER_BOUND_TPS_MAX, METER_UPPER_BOUND_TPS_MIN } from "./activity-meter.ts";
+import { join } from "node:path";
+import { createSettingsStore, type SettingsWriteResult } from "@underactive/pi-topping-primitives/settings";
+import { DEFAULT_METER_UPPER_BOUND_TPS, METER_UPPER_BOUND_TPS_MAX, METER_UPPER_BOUND_TPS_MIN } from "@underactive/pi-topping-primitives/activity";
 import { DEFAULT_LOADER_ORDER, type LoaderElement } from "./format.ts";
-import { fromLegacyOutputStyle, isOutputStyleId, OUTPUT_STYLE_IDS, OUTPUT_STYLES, type OutputStyleId } from "./output-style.ts";
-import type { MenuNumberEntry, MenuSection } from "./menu.ts";
+import { isOutputStyleId, OUTPUT_STYLE_IDS, OUTPUT_STYLES, type OutputStyleId } from "./output-style.ts";
+import type { MenuItem, MenuSection, MenuValue } from "@underactive/pi-topping-primitives/menu";
 import { isWordPackEnabled, isWordPackId, WORD_PACK_MENU_PREFIX, type WordPack } from "./word-packs.ts";
 import { isPlainObject } from "./util.ts";
 
@@ -31,7 +31,7 @@ export const DONE_MARKER_BORDER_STYLE_VALUES = [...BORDER_STYLE_VALUES, "none"]
 export type DoneMarkerBorderStyle = (typeof DONE_MARKER_BORDER_STYLE_VALUES)[number];
 export const DONE_MARKER_STYLE_VALUES = ["elite", "bookend"] as const;
 export type DoneMarkerStyle = (typeof DONE_MARKER_STYLE_VALUES)[number];
-export const METER_UPPER_BOUND_TPS_PRESETS = ["10", "20", "30", "40", "50", "60", "80", "100", "150", "200", "300", "500", "1000"] as const;
+export const METER_UPPER_BOUND_TPS_PRESETS = [10, 20, 30, 40, 50, 60, 80, 100, 150, 200, 300, 500, 1000] as const;
 
 export function isBorderStyle(value: unknown): value is BorderStyle {
 	return typeof value === "string" && BORDER_STYLE_VALUES.some(style => style === value);
@@ -169,16 +169,8 @@ export function parseLoaderOrder(value: unknown): LoaderElement[] {
 
 export function settingsPath(): string { return join(getAgentDir(), "pi-topping", "settings.json"); }
 
-/** pi-topping-insights' saved style, honored until pi-topping's own settings record one. */
-function legacyOutputStyle(): OutputStyleId {
-	try {
-		const parsed: unknown = JSON.parse(readFileSync(join(getAgentDir(), "pi-topping-insights", "settings.json"), "utf8"));
-		return (isPlainObject(parsed) ? fromLegacyOutputStyle(parsed.style) : undefined) ?? DEFAULT_SETTINGS.outputStyle;
-	} catch { return DEFAULT_SETTINGS.outputStyle; }
-}
-
 function defaultSettings(): DecoratorSettings {
-	return { ...structuredClone(DEFAULT_SETTINGS), outputStyle: legacyOutputStyle() };
+	return structuredClone(DEFAULT_SETTINGS);
 }
 
 function mergeGroup<T extends Record<string, boolean | string | number>>(defaults: T, parsed: unknown): T {
@@ -206,8 +198,9 @@ type DecorationSettings = DecoratorSettings["decorations"];
 type FeatureSettings = DecoratorSettings["features"];
 type DecorationBooleanKey = { [Key in keyof DecorationSettings]: DecorationSettings[Key] extends boolean ? Key : never }[keyof DecorationSettings];
 type MenuEntryBase = { id: string; label: string; section: MenuSectionName };
-type DecorationMenuEntry = MenuEntryBase & { group: "decorations"; key: keyof DecorationSettings; cycleValues?: readonly string[]; cycleValueLabels?: Readonly<Record<string, string>>; cycleEnabledBy?: DecorationBooleanKey; cycleDisabledValue?: string; numberEntry?: MenuNumberEntry };
-type FeatureMenuEntry = MenuEntryBase & { group: "features"; key: keyof FeatureSettings; cycleValues?: never; cycleValueLabels?: never; cycleEnabledBy?: never; cycleDisabledValue?: never; numberEntry?: never };
+type NumberMenuEntry = { min: number; max: number; unit?: string; presets: readonly number[] };
+type DecorationMenuEntry = MenuEntryBase & { group: "decorations"; key: keyof DecorationSettings; cycleValues?: readonly string[]; cycleValueLabels?: Readonly<Record<string, string>>; cycleEnabledBy?: DecorationBooleanKey; cycleDisabledValue?: string; number?: NumberMenuEntry };
+type FeatureMenuEntry = MenuEntryBase & { group: "features"; key: keyof FeatureSettings; cycleValues?: never; cycleValueLabels?: never; cycleEnabledBy?: never; cycleDisabledValue?: never; number?: never };
 type MenuEntry = DecorationMenuEntry | FeatureMenuEntry;
 const THINKING_LEVEL_CYCLE_LABELS = { "thinking-level": "thinkingLevel" } as const;
 const DIRECTION_CYCLE_LABELS = { ltr: "Left to Right", rtl: "Right to Left" } as const;
@@ -231,7 +224,7 @@ export const MENU_ENTRIES: readonly MenuEntry[] = [
 	{ id: "meterColor", label: "Token activity monitor color", section: "“Working” Loader", group: "decorations", key: "meterColor", cycleValues: THINKING_LEVEL_COLOR_VALUES, cycleValueLabels: THINKING_LEVEL_CYCLE_LABELS, cycleEnabledBy: "meterColorEnabled", cycleDisabledValue: "accent" },
 	{ id: "meterDirection", label: "Token activity monitor direction", section: "“Working” Loader", group: "decorations", key: "meterDirection", cycleValues: ["ltr", "rtl"], cycleValueLabels: DIRECTION_CYCLE_LABELS, cycleEnabledBy: "meterDirectionEnabled", cycleDisabledValue: "rtl" },
 	{ id: "meterDimmed", label: "Token activity monitor dimmed", section: "“Working” Loader", group: "decorations", key: "meterDimmed" },
-	{ id: "meterUpperBoundTps", label: "Token activity monitor upper bound", section: "“Working” Loader", group: "decorations", key: "meterUpperBoundTps", cycleValues: METER_UPPER_BOUND_TPS_PRESETS, numberEntry: { min: METER_UPPER_BOUND_TPS_MIN, max: METER_UPPER_BOUND_TPS_MAX, unit: "tps" } },
+	{ id: "meterUpperBoundTps", label: "Token activity monitor upper bound", section: "“Working” Loader", group: "decorations", key: "meterUpperBoundTps", number: { min: METER_UPPER_BOUND_TPS_MIN, max: METER_UPPER_BOUND_TPS_MAX, unit: "tps", presets: METER_UPPER_BOUND_TPS_PRESETS } },
 	{ id: "elapsedTime", label: "Elapsed time since prompt", section: "“Working” Loader", group: "features", key: "elapsedTime" },
 	{ id: "outputTokens", label: "Show output tokens", section: "“Working” Loader", group: "features", key: "outputTokens" },
 	// id differs from key: the Elements Order row already owns "tokenRate" in the menu's shared value namespace.
@@ -259,12 +252,26 @@ export const MENU_ENTRIES: readonly MenuEntry[] = [
 	{ id: "includeDefaultWorkingText", label: "Include default/random “Working” text", section: "Word Packs", group: "features", key: "includeDefaultWorkingText" },
 ];
 
-function menuItem(entry: MenuEntry, settings: DecoratorSettings): MenuSection["items"][number] {
+function menuItem(entry: MenuEntry, settings: DecoratorSettings): MenuItem {
 	const value = entry.group === "decorations" ? settings.decorations[entry.key] : settings.features[entry.key];
-	const cycleEnabled = entry.group === "decorations" && entry.cycleEnabledBy
-		? settings.decorations[entry.cycleEnabledBy]
-		: undefined;
-	return { id: entry.id, label: entry.label, cycleValues: entry.cycleValues, cycleValueLabels: entry.cycleValueLabels, cycleEnabledBy: entry.cycleEnabledBy, cycleDisabledValue: entry.cycleDisabledValue, cycleEnabled, numberEntry: entry.numberEntry, value: typeof value === "number" ? String(value) : value };
+	if (entry.group === "decorations" && entry.number) {
+		return { kind: "number", id: entry.id, label: entry.label, value: typeof value === "number" ? value : DEFAULT_METER_UPPER_BOUND_TPS, ...entry.number };
+	}
+	if (entry.group === "decorations" && entry.cycleValues) {
+		const gate = entry.cycleEnabledBy
+			? { id: entry.cycleEnabledBy, enabled: settings.decorations[entry.cycleEnabledBy], ...(entry.cycleDisabledValue === undefined ? {} : { disabledValue: entry.cycleDisabledValue }) }
+			: undefined;
+		return {
+			kind: "cycle",
+			id: entry.id,
+			label: entry.label,
+			value: String(value),
+			values: entry.cycleValues,
+			...(entry.cycleValueLabels ? { labels: entry.cycleValueLabels } : {}),
+			...(gate ? { gate } : {}),
+		};
+	}
+	return { kind: "toggle", id: entry.id, label: entry.label, value: value === true };
 }
 
 function isDecorationBooleanKey(key: keyof DecorationSettings): key is DecorationBooleanKey {
@@ -317,12 +324,12 @@ function buildSection(title: MenuSectionName, settings: DecoratorSettings): Menu
 
 export function buildMenuSections(settings: DecoratorSettings, bundledPacks: readonly WordPack[], userPacks: readonly WordPack[] = []): MenuSection[] {
 	const packs = [...bundledPacks, ...userPacks];
-	const packItems = packs.map((pack) => ({ id: `${WORD_PACK_MENU_PREFIX}${pack.id}`, label: pack.name, value: isWordPackEnabled(pack.id, settings.wordPacks) }));
+	const packItems: MenuItem[] = packs.map((pack) => ({ kind: "toggle", id: `${WORD_PACK_MENU_PREFIX}${pack.id}`, label: pack.name, value: isWordPackEnabled(pack.id, settings.wordPacks) }));
 	const packIds = packItems.map(item => item.id);
 	return [
 		buildSection("User Prompt", settings),
 		buildSection("“Working” Loader", settings),
-		{ title: "Elements Order", items: parseLoaderOrder(settings.loaderOrder).map(id => ({ id, label: LOADER_ELEMENT_LABELS[id], value: false, reorderGroup: LOADER_ORDER_ID })) },
+		{ title: "Elements Order", items: parseLoaderOrder(settings.loaderOrder).map(id => ({ kind: "reorder" as const, id, label: LOADER_ELEMENT_LABELS[id], group: LOADER_ORDER_ID })) },
 		buildSection("Completion Marker", settings),
 		{
 			title: "Word Packs",
@@ -333,18 +340,21 @@ export function buildMenuSections(settings: DecoratorSettings, bundledPacks: rea
 		},
 		{
 			title: "Output Style",
-			items: [{ id: OUTPUT_STYLE_ID, label: "Style", value: settings.outputStyle, cycleValues: OUTPUT_STYLE_IDS, cycleValueLabels: Object.fromEntries(OUTPUT_STYLE_IDS.map(id => [id, OUTPUT_STYLES[id].label])) }],
+			items: [{ kind: "cycle", id: OUTPUT_STYLE_ID, label: "Style", value: settings.outputStyle, values: OUTPUT_STYLE_IDS, labels: Object.fromEntries(OUTPUT_STYLE_IDS.map(id => [id, OUTPUT_STYLES[id].label])) }],
 		},
 		buildSection("Options", settings),
 	];
 }
 
-export function applyMenuResult(settings: DecoratorSettings, values: Record<string, boolean | string>): DecoratorSettings {
+export function applyMenuResult(settings: DecoratorSettings, values: Record<string, MenuValue>): DecoratorSettings {
 	const next = structuredClone(settings);
 	for (const entry of MENU_ENTRIES) {
 		const value = values[entry.id];
 		if (value === undefined) continue;
-		if (entry.group === "decorations" && entry.cycleValues && typeof value === "string" && (entry.cycleValues.includes(value) || entry.numberEntry !== undefined)) {
+		if (entry.group === "decorations" && entry.number && (typeof value === "number" || typeof value === "string")) {
+			// The shared menu publishes a number; a decimal string from an older caller still parses.
+			setDecorationCycleValue(next.decorations, entry.key, String(value));
+		} else if (entry.group === "decorations" && entry.cycleValues && typeof value === "string" && entry.cycleValues.includes(value)) {
 			setDecorationCycleValue(next.decorations, entry.key, value);
 			if (entry.cycleEnabledBy) next.decorations[entry.cycleEnabledBy] = values[entry.cycleEnabledBy] !== false;
 		} else if (entry.group === "decorations" && typeof value === "boolean" && isDecorationBooleanKey(entry.key)) {
@@ -375,67 +385,63 @@ export function applyMenuResult(settings: DecoratorSettings, values: Record<stri
  * setting. A missing, non-integer, or out-of-range meter upper bound resolves
  * to the default of 80 tps. A legacy `features.simCityWorkingText: true` enables the
  * `simcity` pack when no explicit preference is stored. A missing or invalid `outputStyle`
- * falls back to `pi-topping-insights/settings.json`'s `style`, then to `default`, without a schema-version gate.
+ * falls back to `default`, without a schema-version gate.
  */
-export function loadSettings(): DecoratorSettings {
-	try {
-		const parsed = JSON.parse(readFileSync(settingsPath(), "utf8"));
-		if (!isPlainObject(parsed)) return defaultSettings();
-		const wordPacks: Record<string, boolean> = { ...DEFAULT_SETTINGS.wordPacks };
-		if (isPlainObject(parsed.wordPacks)) {
-			for (const [id, enabled] of Object.entries(parsed.wordPacks)) {
-				if (isWordPackId(id) && typeof enabled === "boolean") wordPacks[id] = enabled;
-			}
+function sanitizeSettings(parsed: unknown): DecoratorSettings {
+	if (!isPlainObject(parsed)) return defaultSettings();
+	const wordPacks: Record<string, boolean> = { ...DEFAULT_SETTINGS.wordPacks };
+	if (isPlainObject(parsed.wordPacks)) {
+		for (const [id, enabled] of Object.entries(parsed.wordPacks)) {
+			if (isWordPackId(id) && typeof enabled === "boolean") wordPacks[id] = enabled;
 		}
-		if (isPlainObject(parsed.features) && parsed.features.simCityWorkingText === true && !("simcity" in wordPacks)) {
-			wordPacks.simcity = true;
-		}
-		const storedOutputStyle = parsed.outputStyle;
-		const outputStyle = isOutputStyleId(storedOutputStyle) ? storedOutputStyle : legacyOutputStyle();
-		const settings = { decorations: mergeGroup(DEFAULT_SETTINGS.decorations, parsed.decorations), features: mergeGroup(DEFAULT_SETTINGS.features, parsed.features), loaderOrder: parseLoaderOrder(parsed.loaderOrder), wordPacks, outputStyle };
-		if (isPlainObject(parsed.decorations)) {
-			for (const [key, value] of Object.entries(parsed.decorations)) {
-				if (!Object.hasOwn(DEFAULT_SETTINGS.decorations, key) || typeof value !== "string") continue;
-				const k = key as keyof DecorationSettings;
-				if (isDecorationBooleanKey(k)) continue;
-				setDecorationCycleValue(settings.decorations, k,
-					value === "default" && (k === "spinnerColor" || k === "doneMarkerBorderColor") ? "thinking-level" : value);
-			}
-			const bound = parseMeterUpperBoundTps(parsed.decorations.meterUpperBoundTps);
-			if (bound !== undefined) settings.decorations.meterUpperBoundTps = bound;
-		}
-		const schemaVersion = typeof parsed.schemaVersion === "number" ? parsed.schemaVersion : 1;
-		if (schemaVersion < THINKING_LEVEL_COLOR_MIGRATION_VERSION) {
-			settings.decorations.spinnerColor = "thinking-level";
-			if (settings.decorations.borderColor === "borderAccent") settings.decorations.borderColor = "thinking-level";
-		}
-		if (schemaVersion < DONE_MARKER_BORDER_COLOR_MIGRATION_VERSION) {
-			settings.decorations.doneMarkerBorderColor = "thinking-level";
-		}
-		if (schemaVersion < RESPONSE_MODEL_FOOTER_MIGRATION_VERSION) {
-			settings.features.responseModelFooter = settings.features.responseModel;
+	}
+	if (isPlainObject(parsed.features) && parsed.features.simCityWorkingText === true && !("simcity" in wordPacks)) {
+		wordPacks.simcity = true;
+	}
+	const storedOutputStyle = parsed.outputStyle;
+	const outputStyle = isOutputStyleId(storedOutputStyle) ? storedOutputStyle : DEFAULT_SETTINGS.outputStyle;
+	const settings = { decorations: mergeGroup(DEFAULT_SETTINGS.decorations, parsed.decorations), features: mergeGroup(DEFAULT_SETTINGS.features, parsed.features), loaderOrder: parseLoaderOrder(parsed.loaderOrder), wordPacks, outputStyle };
+	if (isPlainObject(parsed.decorations)) {
+		for (const [key, value] of Object.entries(parsed.decorations)) {
+			if (!Object.hasOwn(DEFAULT_SETTINGS.decorations, key) || typeof value !== "string") continue;
+			const k = key as keyof DecorationSettings;
+			if (isDecorationBooleanKey(k)) continue;
+			setDecorationCycleValue(settings.decorations, k,
+				value === "default" && (k === "spinnerColor" || k === "doneMarkerBorderColor") ? "thinking-level" : value);
 		}
-		for (const entry of MENU_ENTRIES) {
-			if (entry.group === "decorations" && entry.cycleEnabledBy && entry.cycleDisabledValue !== undefined && !settings.decorations[entry.cycleEnabledBy]) {
-				setDecorationCycleValue(settings.decorations, entry.key, entry.cycleDisabledValue);
-			}
+		const bound = parseMeterUpperBoundTps(parsed.decorations.meterUpperBoundTps);
+		if (bound !== undefined) settings.decorations.meterUpperBoundTps = bound;
+	}
+	const schemaVersion = typeof parsed.schemaVersion === "number" ? parsed.schemaVersion : 1;
+	if (schemaVersion < THINKING_LEVEL_COLOR_MIGRATION_VERSION) {
+		settings.decorations.spinnerColor = "thinking-level";
+		if (settings.decorations.borderColor === "borderAccent") settings.decorations.borderColor = "thinking-level";
+	}
+	if (schemaVersion < DONE_MARKER_BORDER_COLOR_MIGRATION_VERSION) {
+		settings.decorations.doneMarkerBorderColor = "thinking-level";
+	}
+	if (schemaVersion < RESPONSE_MODEL_FOOTER_MIGRATION_VERSION) {
+		settings.features.responseModelFooter = settings.features.responseModel;
+	}
+	for (const entry of MENU_ENTRIES) {
+		if (entry.group === "decorations" && entry.cycleEnabledBy && entry.cycleDisabledValue !== undefined && !settings.decorations[entry.cycleEnabledBy]) {
+			setDecorationCycleValue(settings.decorations, entry.key, entry.cycleDisabledValue);
 		}
-		return settings;
-	} catch { return defaultSettings(); }
+	}
+	return settings;
 }
 
-export function atomicWriteFile(path: string, contents: string): void {
-	mkdirSync(dirname(path), { recursive: true });
-	const tmpPath = `${path}.${process.pid}.${Date.now()}.tmp`;
-	try {
-		writeFileSync(tmpPath, contents, { flag: "wx" });
-		renameSync(tmpPath, path);
-	} catch (err) {
-		try { unlinkSync(tmpPath); } catch { /* tmp file was never created */ }
-		throw err;
-	}
+const settingsStore = createSettingsStore<DecoratorSettings>({
+	path: settingsPath,
+	codec: { sanitize: sanitizeSettings, version: { key: "schemaVersion", current: SETTINGS_SCHEMA_VERSION } },
+});
+
+/** A missing, unreadable or malformed file reads as the defaults. Never throws. */
+export function loadSettings(): DecoratorSettings {
+	return settingsStore.read();
 }
 
-export function saveSettings(settings: DecoratorSettings): void {
-	atomicWriteFile(settingsPath(), `${JSON.stringify({ schemaVersion: SETTINGS_SCHEMA_VERSION, ...settings }, null, 2)}\n`);
+/** Atomic write with `schemaVersion` first. Returns the store result so callers can report a failure. */
+export function saveSettings(settings: DecoratorSettings): SettingsWriteResult<DecoratorSettings> {
+	return settingsStore.write(settings);
 }

package/src/setup-check.ts

@@ -1,7 +1,7 @@
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import { join } from "node:path";
 import { readFileSync } from "node:fs";
-import { atomicWriteFile } from "./settings.ts";
+import { atomicWriteFile } from "@underactive/pi-topping-primitives/settings";
 import { isPlainObject } from "./util.ts";
 
 const setupCheckPath = (): string => join(getAgentDir(), "pi-topping", "setup-check.json");

package/src/setup-command.ts

@@ -1,6 +1,6 @@
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { hyperlink } from "@earendil-works/pi-tui";
-import { type MenuValue, showMenu } from "./menu.ts";
+import { type MenuSection, type MenuValue, showMenu } from "@underactive/pi-topping-primitives/menu";
 import { type PiInstallResult, spawnPiInstall, spawnPiRemove } from "./pi-installer.ts";
 import { setSetupCheckDisabled } from "./setup-check.ts";
 import { detectToppings, type ToppingStatus } from "./toppings.ts";
@@ -132,11 +132,12 @@ export function registerSetupCommand(
 			const rows = new Map<string, SetupRow>();
 			for (const status of missing) rows.set(`install:${status.topping.pkg}`, { status, action: "install" });
 			for (const status of removable) rows.set(`remove:${status.topping.pkg}`, { status, action: "remove" });
-			const sections = [];
+			const sections: MenuSection[] = [];
 			if (missing.length > 0) {
 				sections.push({
 					title: "Missing Toppings",
 					items: missing.map(({ topping, onDisk }) => ({
+						kind: "toggle" as const,
 						id: `install:${topping.pkg}`,
 						label: `${topping.pkg}${onDisk ? " (on disk, not active)" : ""}`,
 						value: true,
@@ -147,6 +148,7 @@ export function registerSetupCommand(
 				sections.push({
 					title: "Installed Toppings",
 					items: removable.map(({ topping, active }) => ({
+						kind: "toggle" as const,
 						id: `remove:${topping.pkg}`,
 						label: `${topping.pkg}${active ? " (active)" : " (installed, not active)"}`,
 						value: false,
@@ -158,8 +160,11 @@ export function registerSetupCommand(
 				title: "Pi Topping: Setup",
 				sections,
 				hints: ["↑↓ move", "PgUp/PgDn page", "␣ toggle", "⏎ apply", "esc cancel"],
-				previewTitle: "Description",
-				preview: (values, _elapsedMs, activeItemId) => ({ lines: renderDescription(rows, activeItemId, values) }),
+				preview: {
+					title: "Description",
+					// The shared menu adds no margin; keep the one-space indent the local menu drew.
+					render: (values, { activeItemId }) => ({ lines: renderDescription(rows, activeItemId, values).map((line) => ` ${line}`) }),
+				},
 			});
 			if (!result.applied) {
 				ctx.ui.notify("Pi Topping setup cancelled.", "info");

package/src/util.ts

@@ -3,14 +3,15 @@ export function isPlainObject(value: unknown): value is Record<string, unknown>
 	return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
-/** Strip control and formatting characters from untrusted single-line text. */
-export function stripControlChars(text: string): string {
-	return text.replace(/[\p{Cc}\p{Cf}]/gu, "");
-}
+/** Strip control and formatting characters from untrusted single-line text; `sanitizedText` also trims and reads a non-string as empty. */
+export { sanitizedText, stripControlChars } from "@underactive/pi-topping-primitives/text";
 
-export function sanitizedText(value: unknown): string {
-	return typeof value === "string" ? stripControlChars(value).trim() : "";
-}
+/**
+ * True when `version` is a release older than `minimum`, both read as `major.minor.patch`.
+ * A value that does not start with three numbers cannot be compared and counts as new enough;
+ * a pre-release suffix is ignored.
+ */
+export { hostBelow } from "@underactive/pi-topping-primitives/process";
 
 /** True when a reported response model appears to be a decorated form of the selected model. */
 export function modelsResemble(selectedModel?: string, responseModel?: string): boolean {
@@ -20,3 +21,24 @@ export function modelsResemble(selectedModel?: string, responseModel?: string):
 	const normalizedResponse = responseModel.toLowerCase();
 	return selectedTokens.length > 0 && selectedTokens.every((token) => normalizedResponse.includes(token));
 }
+
+/** Lowercase letters and digits only, so names that differ just in case and separators compare equal. */
+function spelling(text: string): string {
+	return text.toLowerCase().replace(/[^\p{L}\p{N}]+/gu, "");
+}
+
+/**
+ * True when a reported response model is the selected model's id, or its display name with or
+ * without trailing parenthesized notes, written with other case and separators: a model named
+ * `Qwen3.8 Flash (Local)` matches `qwen3.8-flash`. Every digit counts, so `qwen3-flash` does not,
+ * and nothing else may differ, so an id with a suffix such as `256k` does not match a response without it.
+ */
+export function modelsSpelledAlike(selected: { id: string; name?: string }, responseModel?: string): boolean {
+	if (!responseModel) return false;
+	const lastSegment = (model: string): string => model.split(/[\\/]/).at(-1) ?? "";
+	const response = spelling(lastSegment(responseModel));
+	if (!response) return false;
+	const name = selected.name ?? "";
+	const candidates = [lastSegment(selected.id), name, name.replace(/(?:\s*\([^()]*\))+\s*$/, "")];
+	return candidates.some((candidate) => spelling(candidate) === response);
+}

package/src/activity-meter.ts

@@ -1,147 +0,0 @@
-import type { ThemeColor } from "@earendil-works/pi-coding-agent";
-import { dimAttribute } from "./format.ts";
-
-export const ActivityMeterLevel = {
-	IDLE: 0,
-	LOW: 1,
-	MEDIUM: 2,
-	HIGH: 3,
-	PEAK_1: 4,
-	PEAK_2: 5,
-	PEAK_3: 6,
-	FULL: 7,
-} as const;
-
-export type ActivityMeterLevel = (typeof ActivityMeterLevel)[keyof typeof ActivityMeterLevel];
-
-const EMA_ALPHA = 0.4;
-export const DEFAULT_METER_UPPER_BOUND_TPS = 80;
-export const METER_UPPER_BOUND_TPS_MIN = 10;
-export const METER_UPPER_BOUND_TPS_MAX = 1000;
-const BRAILLE: Record<ActivityMeterLevel, string> = {
-	[ActivityMeterLevel.IDLE]: "⢀",
-	[ActivityMeterLevel.LOW]: "⣀",
-	[ActivityMeterLevel.MEDIUM]: "⣠",
-	[ActivityMeterLevel.HIGH]: "⣤",
-	[ActivityMeterLevel.PEAK_1]: "⣴",
-	[ActivityMeterLevel.PEAK_2]: "⣶",
-	[ActivityMeterLevel.PEAK_3]: "⣾",
-	[ActivityMeterLevel.FULL]: "⣿",
-};
-const WIDTH = 8;
-const LEGACY_FULL_SCALE_TPS = 40;
-// Levels below full retain the original 40 tps scale's proportions.
-const RATE_THRESHOLDS = [0, 5, 10, 15, 22, 30] as const;
-type CellColorizer = (level: ActivityMeterLevel, char: string) => string;
-
-/**
- * Convert an estimated output-token rate to a display level. Rates at or above `upperBoundTps`
- * render as full; the lower levels scale in proportion to the bound.
- */
-export function rateToLevel(tokensPerSecond: number, upperBoundTps: number = DEFAULT_METER_UPPER_BOUND_TPS): ActivityMeterLevel {
-	if (tokensPerSecond >= upperBoundTps) return ActivityMeterLevel.FULL;
-	for (let i = RATE_THRESHOLDS.length - 1; i >= 0; i--) {
-		if (tokensPerSecond * LEGACY_FULL_SCALE_TPS > RATE_THRESHOLDS[i]! * upperBoundTps) return (i + 1) as ActivityMeterLevel;
-	}
-	return ActivityMeterLevel.IDLE;
-}
-
-/** EMA-smoothed rate tracker for a cumulative output-token estimate. */
-export class TokRateTracker {
-	#lastTotal = 0;
-	#lastTime = 0;
-	#rate = 0;
-	#hasSample = false;
-	#pendingTokens = 0;
-
-	/** Latest EMA-smoothed output-token rate. */
-	get tokenRate(): number {
-		return this.#rate;
-	}
-
-	sample(totalTokens: number, now: number): number {
-		if (!this.#hasSample) {
-			this.#lastTotal = totalTokens;
-			this.#hasSample = true;
-			this.#lastTime = now;
-			return this.#rate;
-		}
-
-		const elapsedSeconds = (now - this.#lastTime) / 1_000;
-		if (elapsedSeconds <= 0) {
-			this.#pendingTokens += Math.max(0, totalTokens - this.#lastTotal);
-			this.#lastTotal = totalTokens;
-			return this.#rate;
-		}
-
-		const totalDelta = this.#pendingTokens + Math.max(0, totalTokens - this.#lastTotal);
-		const instantRate = totalDelta / elapsedSeconds;
-		this.#rate = EMA_ALPHA * instantRate + (1 - EMA_ALPHA) * this.#rate;
-		this.#lastTotal = totalTokens;
-		this.#lastTime = now;
-		this.#pendingTokens = 0;
-		return this.#rate;
-	}
-
-	reset(): void {
-		this.#lastTotal = 0;
-		this.#lastTime = 0;
-		this.#rate = 0;
-		this.#hasSample = false;
-		this.#pendingTokens = 0;
-	}
-}
-
-/** Eight-column scrolling activity meter, scrolling either left-to-right or right-to-left. */
-export class ActivityMeter {
-	#levels: ActivityMeterLevel[] = Array<ActivityMeterLevel>(WIDTH).fill(0);
-	#direction: "ltr" | "rtl";
-
-	constructor(direction: "ltr" | "rtl" = "ltr") {
-		this.#direction = direction;
-	}
-
-	setDirection(direction: "ltr" | "rtl"): void {
-		if (direction !== this.#direction) {
-			this.#direction = direction;
-			// Reverse the existing data so the visual flow instantly flips.
-			this.#levels.reverse();
-		}
-	}
-
-	push(level: ActivityMeterLevel): void {
-		if (this.#direction === "rtl") {
-			this.#levels.shift();
-			this.#levels.push(level);
-		} else {
-			this.#levels.pop();
-			this.#levels.unshift(level);
-		}
-	}
-
-	render(colorize?: CellColorizer): string {
-		return this.#levels
-			.map((level) => {
-				const char = BRAILLE[level];
-				return colorize ? colorize(level, char) : char;
-			})
-			.join("");
-	}
-
-	reset(): void {
-		this.#levels.fill(0);
-	}
-
-	/** Colorize a meter cell (dim at IDLE, `colorize` otherwise). */
-	static colorizeCell(
-		level: ActivityMeterLevel,
-		char: string,
-		theme: { fg: (style: ThemeColor, s: string) => string },
-		colorize: (text: string) => string,
-		dimmed?: boolean,
-	): string {
-		if (level === ActivityMeterLevel.IDLE) return theme.fg("dim", char);
-		const colored = colorize(char);
-		return dimmed ? dimAttribute(colored) : colored;
-	}
-}