@danypops/pi-packed 0.8.0 → 0.9.0

package/extension/src/discover.ts

@@ -5,13 +5,15 @@
  * itself never mutates; only Install/Cancel (behind the standard
  * approval) does.
  */
-import type { ExtensionCommandContext, Theme } from "@earendil-works/pi-coding-agent";
+import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { DynamicBorder, rawKeyHint } from "@earendil-works/pi-coding-agent";
-import { Container, Input, SelectList, type SelectItem, type SelectListTheme, Spacer, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { Container, Input, Spacer, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { Menu, type MenuItem } from "malevich-tui-components";
 import { shouldSearch } from "./discover-model.js";
 import type { Natives, PackageSummary } from "./packed.js";
 import { InstallServiceError } from "./packed.js";
 import { approvePackageOperation } from "./tools.js";
+import { menuTheme } from "./menu-theme.js";
 
 const SEARCH_LIMIT = 20;
 
@@ -51,28 +53,17 @@ export async function applyInstall(result: PackageSummary, natives: Natives, ctx
 	}
 }
 
-function selectListTheme(theme: Theme): SelectListTheme {
-	return {
-		selectedPrefix: (text) => theme.fg("accent", text),
-		selectedText: (text) => theme.fg("accent", text),
-		description: (text) => theme.fg("muted", text),
-		scrollInfo: (text) => theme.fg("muted", text),
-		noMatch: (text) => theme.fg("muted", text),
-	};
-}
-
 async function showInstallMenu(ctx: ExtensionCommandContext, result: PackageSummary): Promise<boolean> {
-	const items: SelectItem[] = [{ value: "install", label: `Install ${result.name}@${result.version}` }, { value: "cancel", label: "Cancel" }];
-	const choice = await ctx.ui.custom<"install" | "cancel" | undefined>(
+	return ctx.ui.custom<boolean>(
 		(_tui, theme, _kb, done) => {
-			const list = new SelectList(items, items.length, selectListTheme(theme));
-			list.onSelect = (item) => done(item.value as "install" | "cancel");
-			list.onCancel = () => done(undefined);
-			return list;
+			const items: MenuItem[] = [
+				{ label: `Install ${result.name}@${result.version}`, action: () => done(true) },
+				{ label: "Cancel", action: () => done(false) },
+			];
+			return new Menu({ items, theme: menuTheme(theme), onClose: () => done(false) });
 		},
 		{ overlay: true, overlayOptions: { width: 40, anchor: "center" } },
 	);
-	return choice === "install";
 }
 
 export async function showDiscoverPanel(ctx: ExtensionCommandContext, natives: Natives): Promise<void> {

package/extension/src/menu-theme.ts

@@ -0,0 +1,14 @@
+import type { Theme } from "@earendil-works/pi-coding-agent";
+import type { MenuTheme } from "malevich-tui-components";
+
+/** Maps Pi's own Theme onto Malevich's Menu -- the one place this mapping
+ * exists, shared by every ctx.ui.custom overlay menu in this extension. */
+export function menuTheme(theme: Theme): MenuTheme {
+	return {
+		border: (s) => theme.fg("border", s),
+		selected: (s) => theme.fg("accent", s),
+		normal: (s) => s,
+		dim: (s) => theme.fg("muted", s),
+		title: (s) => theme.fg("accent", s),
+	};
+}

package/extension/src/tui.ts

@@ -11,9 +11,10 @@
  * underneath never disappears. All data flows through the packed CLI
  * (thin seam).
  */
-import type { ExtensionCommandContext, Theme } from "@earendil-works/pi-coding-agent";
+import type { ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { DynamicBorder, rawKeyHint } from "@earendil-works/pi-coding-agent";
-import { Container, Input, SelectList, type SelectItem, type SelectListTheme, Spacer, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { Container, Input, Spacer, truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { Menu, type MenuItem } from "malevich-tui-components";
 import { filterRows, mergeRows, nextMode, visibleRows } from "./model.js";
 import type { Row, ViewMode } from "./model.js";
 import type { Natives, PackageResources } from "./packed.js";
@@ -21,6 +22,7 @@ import { approvePackageOperation } from "./tools.js";
 import { showPackedSettings } from "./security-tui.js";
 import { showResourceConfig, applyResourceToggle } from "./resource-config.js";
 import { showDiscoverPanel } from "./discover.js";
+import { menuTheme } from "./menu-theme.js";
 
 interface PanelAction {
 	type: "update" | "updateAll" | "remove" | "disable" | "config" | "find" | "refresh" | "settings";
@@ -173,32 +175,20 @@ async function loadRows(natives: Natives): Promise<{ rows: Row[]; error?: string
 	}
 }
 
-function selectListTheme(theme: Theme): SelectListTheme {
-	return {
-		selectedPrefix: (text) => theme.fg("accent", text),
-		selectedText: (text) => theme.fg("accent", text),
-		description: (text) => theme.fg("muted", text),
-		scrollInfo: (text) => theme.fg("muted", text),
-		noMatch: (text) => theme.fg("muted", text),
-	};
-}
-
 /** Enter's action menu, floated on top of the still-open packages panel
  * via ctx.ui.custom's own overlay:true -- no full-screen teardown, unlike
  * the ctx.ui.select this replaced. */
 async function showActionMenu(ctx: ExtensionCommandContext, row: Row): Promise<"update" | "remove" | "disable" | "config" | undefined> {
-	const items: SelectItem[] = [
-		...(row.hasUpdate ? [{ value: "update", label: `Update to ${row.latest}` }] : []),
-		{ value: "disable", label: "Disable/enable extensions" },
-		{ value: "config", label: "Configure resources" },
-		{ value: "remove", label: "Remove" },
-	];
-	return ctx.ui.custom<"update" | "remove" | "disable" | "config" | undefined>(
+	type Choice = "update" | "remove" | "disable" | "config";
+	return ctx.ui.custom<Choice | undefined>(
 		(_tui, theme, _kb, done) => {
-			const list = new SelectList(items, items.length, selectListTheme(theme));
-			list.onSelect = (item) => done(item.value as "update" | "remove" | "disable" | "config");
-			list.onCancel = () => done(undefined);
-			return list;
+			const items: MenuItem[] = [
+				...(row.hasUpdate ? [{ label: `Update to ${row.latest}`, action: () => done("update" as Choice) }] : []),
+				{ label: "Disable/enable extensions", action: () => done("disable") },
+				{ label: "Configure resources", action: () => done("config") },
+				{ label: "Remove", action: () => done("remove") },
+			];
+			return new Menu({ items, theme: menuTheme(theme), onClose: () => done(undefined) });
 		},
 		{ overlay: true, overlayOptions: { width: 40, anchor: "center" } },
 	);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@danypops/pi-packed",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Pi package tools, commands, profiles, and TUI for the Packed daemon",
   "type": "module",
   "keywords": ["pi-package"],
@@ -14,7 +14,8 @@
   "dependencies": {
     "@danypops/packed": "^0.2.0",
     "@danypops/vehicle-client": "^0.1.1",
-    "@danypops/vehicle-client-pi": "^0.1.5"
+    "@danypops/vehicle-client-pi": "^0.1.5",
+    "malevich-tui-components": "^0.7.0"
   },
   "peerDependencies": {
     "@earendil-works/pi-coding-agent": "*",