pi-extmgr 0.1.27 → 0.1.28

package/src/ui/async-task.ts

@@ -1,9 +1,9 @@
-import type {
-  ExtensionCommandContext,
-  ExtensionContext,
-  Theme,
+import {
+  DynamicBorder,
+  type ExtensionCommandContext,
+  type ExtensionContext,
+  type Theme,
 } from "@mariozechner/pi-coding-agent";
-import { DynamicBorder } from "@mariozechner/pi-coding-agent";
 import { CancellableLoader, Container, Loader, Spacer, Text, type TUI } from "@mariozechner/pi-tui";
 import { hasCustomUI } from "../utils/mode.js";
 
@@ -12,6 +12,8 @@ type AnyContext = ExtensionCommandContext | ExtensionContext;
 const TASK_ABORTED = Symbol("task-aborted");
 const TASK_FAILED = Symbol("task-failed");
 
+type TaskSuccess<T> = { type: "ok"; value: T };
+
 export interface TaskControls {
   signal: AbortSignal;
   setMessage: (message: string) => void;
@@ -21,6 +23,7 @@ interface LoaderConfig {
   title: string;
   message: string;
   cancellable?: boolean;
+  fallbackWithoutLoader?: boolean;
 }
 
 function createLoaderComponent(
@@ -69,82 +72,115 @@ function createLoaderComponent(
   return { container, loader, signal };
 }
 
+function runTaskWithoutLoader<T>(task: (controls: TaskControls) => Promise<T>): Promise<T> {
+  return Promise.resolve().then(() =>
+    task({
+      signal: new AbortController().signal,
+      setMessage: () => undefined,
+    })
+  );
+}
+
 export async function runTaskWithLoader<T>(
   ctx: AnyContext,
   config: LoaderConfig,
   task: (controls: TaskControls) => Promise<T>
 ): Promise<T | undefined> {
   if (!hasCustomUI(ctx)) {
-    return task({
-      signal: new AbortController().signal,
-      setMessage: () => undefined,
-    });
+    return runTaskWithoutLoader(task);
   }
 
   let taskError: unknown;
-
-  const result = await ctx.ui.custom<T | typeof TASK_ABORTED | typeof TASK_FAILED>(
-    (tui, theme, _keybindings, done) => {
-      let finished = false;
-      const finish = (value: T | typeof TASK_ABORTED | typeof TASK_FAILED): void => {
-        if (finished) {
-          return;
-        }
-        finished = true;
-        done(value);
-      };
-
-      const { container, loader, signal } = createLoaderComponent(
-        tui,
-        theme,
-        config.title,
-        config.message,
-        config.cancellable ?? true,
-        () => finish(TASK_ABORTED)
-      );
-
-      void task({
+  let startedTask: Promise<T> | undefined;
+  let cleanupStartedTaskUI: (() => void) | undefined;
+
+  const result = await ctx.ui.custom<
+    TaskSuccess<T> | typeof TASK_ABORTED | typeof TASK_FAILED | undefined
+  >((tui, theme, _keybindings, done) => {
+    let finished = false;
+    const finish = (
+      value: TaskSuccess<T> | typeof TASK_ABORTED | typeof TASK_FAILED | undefined
+    ): void => {
+      if (finished) {
+        return;
+      }
+      finished = true;
+      done(value);
+    };
+
+    const { container, loader, signal } = createLoaderComponent(
+      tui,
+      theme,
+      config.title,
+      config.message,
+      config.cancellable ?? true,
+      () => finish(TASK_ABORTED)
+    );
+
+    cleanupStartedTaskUI = () => {
+      if (loader instanceof CancellableLoader) {
+        loader.dispose();
+        return;
+      }
+
+      loader.stop();
+    };
+
+    startedTask = Promise.resolve().then(() =>
+      task({
         signal,
         setMessage: (message) => {
           loader.setMessage(message);
           tui.requestRender();
         },
       })
-        .then((value) => finish(value))
-        .catch((error) => {
-          if (signal.aborted) {
-            finish(TASK_ABORTED);
-            return;
-          }
-
-          taskError = error;
-          finish(TASK_FAILED);
-        });
-
-      return {
-        render(width: number) {
-          return container.render(width);
-        },
-        invalidate() {
-          container.invalidate();
-        },
-        handleInput(data: string) {
-          if (loader instanceof CancellableLoader) {
-            loader.handleInput(data);
-            tui.requestRender();
-          }
-        },
-        dispose() {
-          if (loader instanceof CancellableLoader) {
-            loader.dispose();
-            return;
-          }
+    );
 
-          loader.stop();
-        },
-      };
+    void startedTask
+      .then((value) => finish({ type: "ok", value }))
+      .catch((error) => {
+        if (signal.aborted) {
+          finish(TASK_ABORTED);
+          return;
+        }
+
+        taskError = error;
+        finish(TASK_FAILED);
+      });
+
+    return {
+      render(width: number) {
+        return container.render(width);
+      },
+      invalidate() {
+        container.invalidate();
+      },
+      handleInput(data: string) {
+        if (loader instanceof CancellableLoader) {
+          loader.handleInput(data);
+          tui.requestRender();
+        }
+      },
+      dispose() {
+        if (loader instanceof CancellableLoader) {
+          loader.dispose();
+          return;
+        }
+
+        loader.stop();
+      },
+    };
+  });
+
+  if (result === undefined) {
+    if (startedTask) {
+      return startedTask.finally(() => cleanupStartedTaskUI?.());
     }
-  );
+    if (config.fallbackWithoutLoader) {
+      return runTaskWithoutLoader(task);
+    }
+    return undefined;
+  }
 
   if (result === TASK_ABORTED) {
     return undefined;
@@ -154,5 +190,5 @@ export async function runTaskWithLoader<T>(
     throw taskError;
   }
 
-  return result;
+  return result.value;
 }

package/src/ui/footer.ts

@@ -1,10 +1,9 @@
 /**
  * Footer helpers for the unified extension manager UI
  */
-import type { UnifiedItem, State } from "../types/index.js";
+import { type State, type UnifiedItem } from "../types/index.js";
 
 export interface FooterState {
-  hasToggleRows: boolean;
   hasLocals: boolean;
   hasPackages: boolean;
 }
@@ -13,11 +12,8 @@ export interface FooterState {
  * Build footer state from visible items.
  */
 export function buildFooterState(items: UnifiedItem[]): FooterState {
-  const hasLocals = items.some((i) => i.type === "local");
-
   return {
-    hasToggleRows: hasLocals,
-    hasLocals,
+    hasLocals: items.some((i) => i.type === "local"),
     hasPackages: items.some((i) => i.type === "package"),
   };
 }
@@ -47,8 +43,8 @@ export function buildFooterShortcuts(state: FooterState): string {
   const parts: string[] = [];
   parts.push("↑↓ Navigate");
 
-  if (state.hasToggleRows) parts.push("Space/Enter Toggle");
-  if (state.hasToggleRows) parts.push("S Save");
+  if (state.hasLocals) parts.push("Space/Enter Toggle");
+  if (state.hasLocals) parts.push("S Save");
   if (state.hasPackages) parts.push("Enter/A Actions");
   if (state.hasPackages) parts.push("c Configure");
   if (state.hasPackages) parts.push("u Update");

package/src/ui/help.ts

@@ -1,7 +1,7 @@
 /**
  * Help display
  */
-import type { ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import { type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
 
 export function showHelp(ctx: ExtensionCommandContext): void {
   const lines = [
@@ -17,7 +17,7 @@ export function showHelp(ctx: ExtensionCommandContext): void {
     "  Space/Enter  Toggle local extension enabled/disabled",
     "  S            Save changes to local extensions",
     "  Enter/A      Open actions for selected package",
-    "  c            Configure selected package extensions (restart required after save)",
+    "  c            Configure selected package extensions (reload after save)",
     "  u            Update selected package",
     "  X            Remove selected item (package or local extension)",
     "  i            Quick install by source",

package/src/ui/package-config.ts

@@ -1,31 +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 { runTaskWithLoader } from "./async-task.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 {
@@ -168,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) {
@@ -286,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,
@@ -393,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,26 @@
 /**
  * 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 {

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", "*")}`;
 }
 
 /**