pi-extmgr 0.1.26 → 0.1.28

package/src/ui/package-config.ts

@@ -1,30 +1,37 @@
 /**
  * Package extension configuration panel.
  */
-import type { ExtensionAPI, ExtensionCommandContext, Theme } from "@mariozechner/pi-coding-agent";
-import { DynamicBorder, getSettingsListTheme } from "@mariozechner/pi-coding-agent";
+import {
+  DynamicBorder,
+  type ExtensionAPI,
+  type ExtensionCommandContext,
+  getSettingsListTheme,
+  type Theme,
+} from "@mariozechner/pi-coding-agent";
 import {
   Container,
   Key,
   matchesKey,
+  type SettingItem,
   SettingsList,
   Spacer,
   Text,
-  type SettingItem,
 } from "@mariozechner/pi-tui";
-import type { InstalledPackage, PackageExtensionEntry, State } from "../types/index.js";
+import { UI } from "../constants.js";
 import {
   applyPackageExtensionStateChanges,
   discoverPackageExtensions,
   validatePackageExtensionSettings,
 } from "../packages/extensions.js";
-import { notify } from "../utils/notify.js";
+import { type InstalledPackage, type PackageExtensionEntry, type State } from "../types/index.js";
+import { fileExists } from "../utils/fs.js";
 import { logExtensionToggle } from "../utils/history.js";
 import { requireCustomUI, runCustomUI } from "../utils/mode.js";
+import { notify } from "../utils/notify.js";
 import { getPackageSourceKind } from "../utils/package-source.js";
 import { getSettingsListSelectedIndex } from "../utils/settings-list.js";
-import { fileExists } from "../utils/fs.js";
-import { UI } from "../constants.js";
+import { confirmReload } from "../utils/ui-helpers.js";
+import { runTaskWithLoader } from "./async-task.js";
 import { getChangeMarker, getPackageIcon, getScopeIcon, getStatusIcon } from "./theme.js";
 
 export interface PackageConfigRow {
@@ -167,10 +174,14 @@ async function showConfigurePanel(
         getSettingsListTheme(),
         (id: string, newValue: string) => {
           const row = rowById.get(id);
-          if (!row || !row.available) return;
+          if (!row?.available) return;
 
           const state = newValue as State;
-          staged.set(id, state);
+          if (state === row.originalState) {
+            staged.delete(id);
+          } else {
+            staged.set(id, state);
+          }
 
           const settingsItem = settingsItems.find((item) => item.id === id);
           if (settingsItem) {
@@ -285,35 +296,6 @@ export async function applyPackageExtensionChanges(
   return { changed: changedRows.length, errors };
 }
 
-async function promptRestartForPackageConfig(ctx: ExtensionCommandContext): Promise<boolean> {
-  if (!ctx.hasUI) {
-    notify(
-      ctx,
-      "Restart pi to apply package extension configuration changes. /reload may not be enough.",
-      "warning"
-    );
-    return false;
-  }
-
-  const restartNow = await ctx.ui.confirm(
-    "Restart Required",
-    "Package extension configuration changed.\nA full pi restart is required to apply it.\nExit pi now?"
-  );
-
-  if (!restartNow) {
-    notify(
-      ctx,
-      "Restart pi manually to apply package extension configuration changes. /reload may not be enough.",
-      "warning"
-    );
-    return false;
-  }
-
-  notify(ctx, "Shutting down pi. Start it again to apply changes.", "info");
-  ctx.shutdown();
-  return true;
-}
-
 export async function configurePackageExtensions(
   pkg: InstalledPackage,
   ctx: ExtensionCommandContext,
@@ -329,8 +311,32 @@ export async function configurePackageExtensions(
     return { changed: 0, reloaded: false };
   }
 
-  const discovered = await discoverPackageExtensions([pkg], ctx.cwd);
-  const rows = await buildPackageConfigRows(discovered);
+  let initialData: { rows: PackageConfigRow[] } | undefined;
+  try {
+    initialData = await runTaskWithLoader(
+      ctx,
+      {
+        title: `Configure ${pkg.name}`,
+        message: "Discovering package extensions...",
+        cancellable: false,
+      },
+      async () => {
+        const discovered = await discoverPackageExtensions([pkg], ctx.cwd);
+        const rows = await buildPackageConfigRows(discovered);
+        return { rows };
+      }
+    );
+  } catch (error) {
+    notify(ctx, error instanceof Error ? error.message : String(error), "error");
+    return { changed: 0, reloaded: false };
+  }
+
+  if (!initialData) {
+    notify(ctx, "Package extension configuration requires the full interactive TUI.", "warning");
+    return { changed: 0, reloaded: false };
+  }
+
+  const { rows } = initialData;
 
   if (rows.length === 0) {
     notify(ctx, "No configurable extensions discovered for this package.", "info");
@@ -368,24 +374,31 @@ export async function configurePackageExtensions(
 
     const apply = await applyPackageExtensionChanges(rows, staged, pkg, ctx.cwd, pi);
 
+    if (apply.changed === 0) {
+      if (apply.errors.length > 0) {
+        notify(
+          ctx,
+          `Applied ${apply.changed} change(s), ${apply.errors.length} failed.\n${apply.errors.join("\n")}`,
+          "warning"
+        );
+        continue;
+      }
+
+      notify(ctx, "No changes to apply.", "info");
+      return { changed: 0, reloaded: false };
+    }
+
     if (apply.errors.length > 0) {
       notify(
         ctx,
         `Applied ${apply.changed} change(s), ${apply.errors.length} failed.\n${apply.errors.join("\n")}`,
         "warning"
       );
-    } else if (apply.changed === 0) {
-      notify(ctx, "No changes to apply.", "info");
-      return { changed: 0, reloaded: false };
     } else {
       notify(ctx, `Applied ${apply.changed} package extension change(s).`, "info");
     }
 
-    if (apply.changed === 0) {
-      return { changed: 0, reloaded: false };
-    }
-
-    const restarted = await promptRestartForPackageConfig(ctx);
-    return { changed: apply.changed, reloaded: restarted };
+    const reloaded = await confirmReload(ctx, "Package extension configuration changed.");
+    return { changed: apply.changed, reloaded };
   }
 }

package/src/ui/remote.ts

@@ -1,23 +1,27 @@
 /**
  * Remote package browsing UI
  */
-import type { ExtensionAPI, ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
-import { DynamicBorder } from "@mariozechner/pi-coding-agent";
-import { Container, SelectList, Text, type SelectItem } from "@mariozechner/pi-tui";
-import type { BrowseAction, NpmPackage } from "../types/index.js";
-import { PAGE_SIZE, TIMEOUTS, CACHE_LIMITS } from "../constants.js";
-import { truncate, dynamicTruncate, formatBytes } from "../utils/format.js";
-import { parseChoiceByLabel, splitCommandArgs } from "../utils/command.js";
 import {
-  searchNpmPackages,
+  DynamicBorder,
+  type ExtensionAPI,
+  type ExtensionCommandContext,
+} from "@mariozechner/pi-coding-agent";
+import { Container, type SelectItem, SelectList, Text } from "@mariozechner/pi-tui";
+import { CACHE_LIMITS, PAGE_SIZE, TIMEOUTS } from "../constants.js";
+import {
   getSearchCache,
-  setSearchCache,
   isCacheValid,
+  searchNpmPackages,
+  setSearchCache,
 } from "../packages/discovery.js";
 import { installPackage, installPackageLocally } from "../packages/install.js";
-import { execNpm } from "../utils/npm-exec.js";
-import { notify } from "../utils/notify.js";
+import { type BrowseAction, type NpmPackage } from "../types/index.js";
+import { parseChoiceByLabel, splitCommandArgs } from "../utils/command.js";
+import { dynamicTruncate, formatBytes, truncate } from "../utils/format.js";
 import { requireCustomUI, runCustomUI } from "../utils/mode.js";
+import { notify } from "../utils/notify.js";
+import { execNpm } from "../utils/npm-exec.js";
+import { runTaskWithLoader } from "./async-task.js";
 
 interface PackageInfoCacheEntry {
   timestamp: number;
@@ -109,25 +113,44 @@ const PACKAGE_DETAILS_CHOICES = {
   back: "Back to results",
 } as const;
 
+function createAbortError(): Error {
+  const error = new Error("Operation cancelled");
+  error.name = "AbortError";
+  return error;
+}
+
+function throwIfAborted(signal?: AbortSignal): void {
+  if (signal?.aborted) {
+    throw createAbortError();
+  }
+}
+
 function formatCount(value: number | undefined): string {
   if (typeof value !== "number" || !Number.isFinite(value)) return "unknown";
   return new Intl.NumberFormat().format(value);
 }
 
-async function fetchWeeklyDownloads(packageName: string): Promise<number | undefined> {
+async function fetchWeeklyDownloads(
+  packageName: string,
+  signal?: AbortSignal
+): Promise<number | undefined> {
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), TIMEOUTS.weeklyDownloads);
+  const combinedSignal = signal ? AbortSignal.any([signal, controller.signal]) : controller.signal;
 
   try {
     const encoded = encodeURIComponent(packageName);
     const res = await fetch(`https://api.npmjs.org/downloads/point/last-week/${encoded}`, {
-      signal: controller.signal,
+      signal: combinedSignal,
     });
 
     if (!res.ok) return undefined;
     const data = (await res.json()) as NpmDownloadsPoint;
     return typeof data.downloads === "number" ? data.downloads : undefined;
-  } catch {
+  } catch (error) {
+    if (signal?.aborted && error instanceof Error && error.name === "AbortError") {
+      throw error;
+    }
     return undefined;
   } finally {
     clearTimeout(timer);
@@ -137,7 +160,8 @@ async function fetchWeeklyDownloads(packageName: string): Promise<number | undef
 async function buildPackageInfoText(
   packageName: string,
   ctx: ExtensionCommandContext,
-  pi: ExtensionAPI
+  pi: ExtensionAPI,
+  signal?: AbortSignal
 ): Promise<string> {
   // Check cache first
   const cached = packageInfoCache.get(packageName);
@@ -148,10 +172,13 @@ async function buildPackageInfoText(
   const [infoRes, weeklyDownloads] = await Promise.all([
     execNpm(pi, ["view", packageName, "--json"], ctx, {
       timeout: TIMEOUTS.npmView,
+      ...(signal ? { signal } : {}),
     }),
-    fetchWeeklyDownloads(packageName),
+    fetchWeeklyDownloads(packageName, signal),
   ]);
 
+  throwIfAborted(signal);
+
   if (infoRes.code !== 0) {
     throw new Error(infoRes.stderr || infoRes.stdout || `npm view failed (exit ${infoRes.code})`);
   }
@@ -179,7 +206,7 @@ async function buildPackageInfoText(
 
   const text = lines.join("\n");
 
-  // Store in LRU cache
+  throwIfAborted(signal);
   packageInfoCache.set(packageName, { text });
 
   return text;
@@ -346,20 +373,34 @@ export async function browseRemotePackages(
     return;
   }
 
-  // Check cache first
-  let allPackages: NpmPackage[] = [];
+  let allPackages: NpmPackage[] | undefined;
 
-  if (isCacheValid(query) && offset > 0) {
+  if (isCacheValid(query)) {
     const cache = getSearchCache();
-    if (cache) allPackages = cache.results;
-  } else {
-    // Show searching notification
-    ctx.ui.notify(`Searching npm for: ${truncate(query, 40)}...`, "info");
+    if (cache) {
+      allPackages = cache.results;
+    }
+  }
 
-    // Perform search
-    allPackages = await searchNpmPackages(query, ctx, pi);
+  if (!allPackages) {
+    const results = await runTaskWithLoader(
+      ctx,
+      {
+        title: "Remote Packages",
+        message: `Searching npm for ${truncate(query, 40)}...`,
+      },
+      async ({ signal, setMessage }) => {
+        setMessage(`Searching npm for ${truncate(query, 40)}...`);
+        return searchNpmPackages(query, ctx, { signal });
+      }
+    );
+
+    if (!results) {
+      notify(ctx, "Remote package search was cancelled.", "info");
+      return;
+    }
 
-    // Cache results for pagination
+    allPackages = results;
     setSearchCache({
       query,
       results: allPackages,
@@ -451,7 +492,21 @@ async function showPackageDetails(
       return;
     case "viewInfo":
       try {
-        const text = await buildPackageInfoText(packageName, ctx, pi);
+        const text = await runTaskWithLoader(
+          ctx,
+          {
+            title: packageName,
+            message: `Fetching package details for ${packageName}...`,
+          },
+          ({ signal }) => buildPackageInfoText(packageName, ctx, pi, signal)
+        );
+
+        if (!text) {
+          notify(ctx, `Loading ${packageName} details was cancelled.`, "info");
+          await showPackageDetails(packageName, ctx, pi, previousQuery, previousOffset);
+          return;
+        }
+
         ctx.ui.notify(text, "info");
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);

package/src/ui/theme.ts

@@ -1,7 +1,7 @@
 /**
  * Theme utilities for consistent UI styling across dark/light themes
  */
-import type { Theme } from "@mariozechner/pi-coding-agent";
+import { type Theme } from "@mariozechner/pi-coding-agent";
 
 /**
  * Status icons that work across themes
@@ -62,7 +62,7 @@ export function getScopeIcon(
  */
 export function getChangeMarker(theme: Theme, hasChanges: boolean): string {
   if (!hasChanges) return "";
-  return " " + theme.fg("warning", "*");
+  return ` ${theme.fg("warning", "*")}`;
 }
 
 /**