@narumitw/pi-usage 0.60.6 → 0.60.7

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-usage",
-	"version": "0.60.6",
+	"version": "0.60.7",
 	"description": "Pi extension that shows current-account usage and DeepSeek API balance for supported providers.",
 	"type": "module",
 	"license": "MIT",
@@ -71,6 +71,6 @@
 		"directory": "packages/pi-usage"
 	},
 	"dependencies": {
-		"@narumitw/pi-tui-kit": "^0.59.0"
+		"@narumitw/pi-tui-kit": "^0.61.0"
 	}
 }

package/src/usage-settings-ui.ts

@@ -3,14 +3,7 @@ import {
 	type ExtensionCommandContext,
 	getSettingsListTheme,
 } from "@earendil-works/pi-coding-agent";
-import {
-	Container,
-	Key,
-	matchesKey,
-	type SettingItem,
-	SettingsList,
-	Text,
-} from "@earendil-works/pi-tui";
+import { Key, matchesKey, type SettingItem, SettingsList, Text } from "@earendil-works/pi-tui";
 import { errorMessage } from "./core.js";
 import type { UsageSettingsRuntime } from "./settings.js";
 
@@ -19,26 +12,6 @@ const ON = "On";
 
 type UsageSettingId = "codexFastMode" | "codexStatusResetCountdown";
 
-function fitSettingsRows(lines: string[], maxRows: number): string[] {
-	if (lines.length <= maxRows) return lines;
-	const content = lines.filter((line) => stripVTControlCharacters(line).trim().length > 0);
-	if (content.length <= maxRows) return content;
-	const selectedIndex = content.findIndex((line) =>
-		/^[→›]\s/u.test(stripVTControlCharacters(line)),
-	);
-	if (selectedIndex < 0) return content.slice(0, maxRows);
-	return content
-		.map((line, index) => ({ index, line }))
-		.sort(
-			(left, right) =>
-				Math.abs(left.index - selectedIndex) - Math.abs(right.index - selectedIndex) ||
-				left.index - right.index,
-		)
-		.slice(0, maxRows)
-		.sort((left, right) => left.index - right.index)
-		.map(({ line }) => line);
-}
-
 export async function showUsageSettings(
 	ctx: ExtensionCommandContext,
 	settingsRuntime: UsageSettingsRuntime,
@@ -50,7 +23,7 @@ export async function showUsageSettings(
 		if (ctx.hasUI) ctx.ui.notify(`Edit settings manually: ${settingsRuntime.get().path}`, "info");
 		return false;
 	}
-	const { HorizontalRule } = await import("@narumitw/pi-tui-kit");
+	const { HorizontalRule, renderBoundedFrame } = await import("@narumitw/pi-tui-kit");
 	if (parentSignal.aborted || !isCurrent()) return false;
 	return (
 		(await ctx.ui.custom<boolean>((tui, theme, _keybindings, done) => {
@@ -76,9 +49,7 @@ export async function showUsageSettings(
 					values: [OFF, ON],
 				},
 			];
-			const container = new Container();
 			const rule = new HorizontalRule({ ruleStyle: (text) => theme.fg("border", text) });
-			container.addChild(new Text(theme.fg("accent", theme.bold("pi-usage Settings")), 1, 1));
 
 			let settingsList: SettingsList;
 			const cancel = () => {
@@ -126,23 +97,34 @@ export async function showUsageSettings(
 				},
 				cancel,
 			);
-			container.addChild(settingsList);
 
 			parentSignal.addEventListener("abort", cancel, { once: true });
 			return {
 				render(width: number) {
-					const content = container.render(width);
+					// Compatibility: Kit puts the title directly below the top rule and keeps compact
+					// rules when at least five rows fit; both replace the legacy wrapper layout.
+					const title = new Text(theme.fg("accent", theme.bold("pi-usage Settings")), 1, 0).render(
+						width,
+					);
+					const content = settingsList.render(width);
+					const focusedRow = content.findIndex((line) =>
+						/^[→›]\s/u.test(stripVTControlCharacters(line)),
+					);
 					const terminalRows = Number.isFinite(tui.terminal?.rows)
 						? Math.floor(tui.terminal.rows)
 						: 24;
-					const availableRows = Math.max(1, terminalRows - 3);
-					if (content.length + 2 > availableRows) {
-						return fitSettingsRows(content, availableRows);
-					}
 					const [ruleLine = ""] = rule.render(width);
-					return [ruleLine, ...content, ruleLine];
+					return renderBoundedFrame({
+						width,
+						maxRows: Math.max(1, terminalRows - 3),
+						rule: ruleLine,
+						title,
+						content,
+						priorityRows: focusedRow < 0 ? [] : [focusedRow],
+						focusedRow,
+					});
 				},
-				invalidate: () => container.invalidate(),
+				invalidate: () => settingsList.invalidate(),
 				handleInput(data: string) {
 					if (closing) return;
 					if (matchesKey(data, Key.ctrl("c"))) cancel();