pi-extmgr 0.1.26 → 0.1.28

package/src/ui/unified.ts

@@ -2,19 +2,23 @@
  * Unified extension manager UI
  * Displays local extensions and installed packages in one view
  */
-import type { ExtensionAPI, ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
-import type { Theme } from "@mariozechner/pi-coding-agent";
-import { getSettingsListTheme, DynamicBorder } 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,
-  Text,
   Spacer,
-  type SettingItem,
-  matchesKey,
-  Key,
+  Text,
 } from "@mariozechner/pi-tui";
-import type { UnifiedItem, State, UnifiedAction, InstalledPackage } from "../types/index.js";
+import { UI } from "../constants.js";
 import {
   discoverExtensions,
   removeLocalExtension,
@@ -22,32 +26,40 @@ import {
 } from "../extensions/discovery.js";
 import { getInstalledPackages } from "../packages/discovery.js";
 import {
-  updatePackageWithOutcome,
   removePackageWithOutcome,
-  updatePackagesWithOutcome,
   showInstalledPackagesList,
+  updatePackagesWithOutcome,
+  updatePackageWithOutcome,
 } from "../packages/management.js";
-import { showRemote } from "./remote.js";
-import { showHelp } from "./help.js";
-import { formatEntry as formatExtEntry, dynamicTruncate, formatBytes } from "../utils/format.js";
 import {
-  getStatusIcon,
-  getPackageIcon,
-  getScopeIcon,
-  getChangeMarker,
-  formatSize,
-} from "./theme.js";
-import { buildFooterState, buildFooterShortcuts, getPendingToggleChangeCount } from "./footer.js";
-import { logExtensionDelete, logExtensionToggle } from "../utils/history.js";
+  type InstalledPackage,
+  type LocalUnifiedItem,
+  type State,
+  type UnifiedAction,
+  type UnifiedItem,
+} from "../types/index.js";
 import { getKnownUpdates, promptAutoUpdateWizard } from "../utils/auto-update.js";
-import { updateExtmgrStatus } from "../utils/status.js";
 import { parseChoiceByLabel } from "../utils/command.js";
+import { dynamicTruncate, formatBytes, formatEntry as formatExtEntry } from "../utils/format.js";
+import { logExtensionDelete, logExtensionToggle } from "../utils/history.js";
+import { hasCustomUI, runCustomUI } from "../utils/mode.js";
 import { notify } from "../utils/notify.js";
 import { getPackageSourceKind, normalizePackageIdentity } from "../utils/package-source.js";
-import { hasCustomUI, runCustomUI } from "../utils/mode.js";
 import { getSettingsListSelectedIndex } from "../utils/settings-list.js";
-import { UI } from "../constants.js";
+import { updateExtmgrStatus } from "../utils/status.js";
+import { confirmReload } from "../utils/ui-helpers.js";
+import { runTaskWithLoader } from "./async-task.js";
+import { buildFooterShortcuts, buildFooterState, getPendingToggleChangeCount } from "./footer.js";
+import { showHelp } from "./help.js";
 import { configurePackageExtensions } from "./package-config.js";
+import { showRemote } from "./remote.js";
+import {
+  formatSize,
+  getChangeMarker,
+  getPackageIcon,
+  getScopeIcon,
+  getStatusIcon,
+} from "./theme.js";
 
 async function showInteractiveFallback(
   ctx: ExtensionCommandContext,
@@ -82,11 +94,46 @@ async function showInteractiveOnce(
   ctx: ExtensionCommandContext,
   pi: ExtensionAPI
 ): Promise<boolean> {
-  // Load local extensions and installed packages.
-  const [localEntries, installedPackages] = await Promise.all([
-    discoverExtensions(ctx.cwd),
-    getInstalledPackages(ctx, pi),
-  ]);
+  const initialData = await runTaskWithLoader(
+    ctx,
+    {
+      title: "Extensions Manager",
+      message: "Loading extensions and packages...",
+    },
+    async ({ signal, setMessage }) => {
+      const localEntriesPromise = discoverExtensions(ctx.cwd);
+      const installedPackagesPromise = getInstalledPackages(
+        ctx,
+        pi,
+        (current, total) => {
+          if (total <= 0) {
+            return;
+          }
+          setMessage(`Loading package metadata... ${current}/${total}`);
+        },
+        signal
+      );
+
+      const [localEntries, installedPackages] = await Promise.all([
+        localEntriesPromise,
+        installedPackagesPromise,
+      ]);
+
+      return { localEntries, installedPackages };
+    }
+  );
+
+  if (!initialData) {
+    notify(
+      ctx,
+      "The unified extensions manager requires the full interactive TUI. Showing read-only local and installed package lists instead.",
+      "warning"
+    );
+    await showInteractiveFallback(ctx, pi);
+    return true;
+  }
+
+  const { localEntries, installedPackages } = initialData;
 
   // Build unified items list.
   const knownUpdates = getKnownUpdates(ctx);
@@ -153,8 +200,8 @@ async function showInteractiveOnce(
             if (!item) continue;
 
             if (item.type === "local") {
-              const currentState = staged.get(item.id) ?? item.state!;
-              const changed = staged.has(item.id) && currentState !== item.originalState;
+              const currentState = staged.get(item.id) ?? item.state;
+              const changed = currentState !== item.originalState;
               settingsItem.label = formatUnifiedItemLabel(item, currentState, theme, changed);
             } else {
               settingsItem.label = formatUnifiedItemLabel(item, "enabled", theme, false);
@@ -172,7 +219,11 @@ async function showInteractiveOnce(
             if (!item || item.type !== "local") return;
 
             const state = newValue as State;
-            staged.set(id, state);
+            if (state === item.originalState) {
+              staged.delete(id);
+            } else {
+              staged.set(id, state);
+            }
 
             const settingsItem = settingsItems.find((x) => x.id === id);
             if (settingsItem) {
@@ -343,16 +394,7 @@ export function buildUnifiedItems(
         isDuplicate = true;
         break;
       }
-      if (
-        pkgResolvedNormalized &&
-        (localPath.startsWith(`${pkgResolvedNormalized}/`) ||
-          pkgResolvedNormalized.startsWith(localPath))
-      ) {
-        isDuplicate = true;
-        break;
-      }
-      const localDir = localPath.split("/").slice(0, -1).join("/");
-      if (pkgResolvedNormalized && pkgResolvedNormalized === localDir) {
+      if (pkgResolvedNormalized && localPath.startsWith(`${pkgResolvedNormalized}/`)) {
         isDuplicate = true;
         break;
       }
@@ -363,7 +405,6 @@ export function buildUnifiedItems(
       type: "package",
       id: `pkg:${pkg.source}`,
       displayName: pkg.name,
-      summary: pkg.description || `${pkg.source} (${pkg.scope})`,
       scope: pkg.scope,
       source: pkg.source,
       version: pkg.version,
@@ -395,8 +436,8 @@ function buildSettingsItems(
 ): SettingItem[] {
   return items.map((item) => {
     if (item.type === "local") {
-      const currentState = staged.get(item.id) ?? item.state!;
-      const changed = staged.has(item.id) && staged.get(item.id) !== item.originalState;
+      const currentState = staged.get(item.id) ?? item.state;
+      const changed = currentState !== item.originalState;
       return {
         id: item.id,
         label: formatUnifiedItemLabel(item, currentState, theme, changed),
@@ -421,7 +462,7 @@ function formatUnifiedItemLabel(
   changed = false
 ): string {
   if (item.type === "local") {
-    const statusIcon = getStatusIcon(theme, state === "enabled" ? "enabled" : "disabled");
+    const statusIcon = getStatusIcon(theme, state);
     const scopeIcon = getScopeIcon(theme, item.scope);
     const changeMarker = getChangeMarker(theme, changed);
     const name = theme.bold(item.displayName);
@@ -429,7 +470,7 @@ function formatUnifiedItemLabel(
     return `${statusIcon} [${scopeIcon}] ${name} - ${summary}${changeMarker}`;
   }
 
-  const sourceKind = getPackageSourceKind(item.source ?? "");
+  const sourceKind = getPackageSourceKind(item.source);
   const pkgIcon = getPackageIcon(
     theme,
     sourceKind === "npm" || sourceKind === "git" || sourceKind === "local" ? sourceKind : "local"
@@ -463,8 +504,8 @@ function formatUnifiedItemLabel(
   return `${pkgIcon} [${scopeIcon}] ${name}${version}${updateBadge} - ${summary}`;
 }
 
-function getToggleItemsForApply(items: UnifiedItem[]): UnifiedItem[] {
-  return items.filter((item) => item.type === "local");
+function getToggleItemsForApply(items: UnifiedItem[]): LocalUnifiedItem[] {
+  return items.filter((item): item is LocalUnifiedItem => item.type === "local");
 }
 
 async function applyToggleChangesFromManager(
@@ -473,7 +514,7 @@ async function applyToggleChangesFromManager(
   ctx: ExtensionCommandContext,
   pi: ExtensionAPI,
   options?: { promptReload?: boolean }
-): Promise<{ changed: number; reloaded: boolean }> {
+): Promise<{ changed: number; reloaded: boolean; hasErrors: boolean }> {
   const toggleItems = getToggleItemsForApply(items);
   const apply = await applyStagedChanges(toggleItems, staged, pi);
 
@@ -492,24 +533,14 @@ async function applyToggleChangesFromManager(
     const shouldPromptReload = options?.promptReload ?? true;
 
     if (shouldPromptReload) {
-      const shouldReload = await ctx.ui.confirm(
-        "Reload Required",
-        "Local extensions changed. Reload pi now?"
-      );
-
-      if (shouldReload) {
-        await (ctx as ExtensionCommandContext & { reload: () => Promise<void> }).reload();
-        return { changed: apply.changed, reloaded: true };
-      }
-    } else {
-      ctx.ui.notify(
-        "Changes saved. Reload pi later to fully apply extension state updates.",
-        "info"
-      );
+      const reloaded = await confirmReload(ctx, "Local extensions changed.");
+      return { changed: apply.changed, reloaded, hasErrors: apply.errors.length > 0 };
     }
+
+    ctx.ui.notify("Changes saved. Reload pi later to fully apply extension state updates.", "info");
   }
 
-  return { changed: apply.changed, reloaded: false };
+  return { changed: apply.changed, reloaded: false, hasErrors: apply.errors.length > 0 };
 }
 
 async function resolvePendingChangesBeforeLeave(
@@ -519,7 +550,7 @@ async function resolvePendingChangesBeforeLeave(
   ctx: ExtensionCommandContext,
   pi: ExtensionAPI,
   destinationLabel: string
-): Promise<"continue" | "stay" | "exit"> {
+): Promise<"continue" | "stay"> {
   const pendingCount = getPendingToggleChangeCount(staged, byId);
   if (pendingCount === 0) return "continue";
 
@@ -537,10 +568,10 @@ async function resolvePendingChangesBeforeLeave(
     return "continue";
   }
 
-  const result = await applyToggleChangesFromManager(items, staged, ctx, pi, {
+  const apply = await applyToggleChangesFromManager(items, staged, ctx, pi, {
     promptReload: false,
   });
-  return result.reloaded ? "exit" : "continue";
+  return apply.changed === 0 && apply.hasErrors ? "stay" : "continue";
 }
 
 const PALETTE_OPTIONS = {
@@ -611,7 +642,6 @@ async function navigateWithPendingGuard(
     QUICK_DESTINATION_LABELS[destination]
   );
   if (pending === "stay") return "stay";
-  if (pending === "exit") return "exit";
 
   switch (destination) {
     case "install":
@@ -666,6 +696,7 @@ async function handleUnifiedAction(
       if (choice === "Save and exit") {
         const apply = await applyToggleChangesFromManager(items, staged, ctx, pi);
         if (apply.reloaded) return true;
+        if (apply.changed === 0 && apply.hasErrors) return false;
       }
     }
 
@@ -675,7 +706,6 @@ async function handleUnifiedAction(
   if (result.type === "remote") {
     const pending = await resolvePendingChangesBeforeLeave(items, staged, byId, ctx, pi, "Remote");
     if (pending === "stay") return false;
-    if (pending === "exit") return true;
 
     await showRemote("", ctx, pi);
     return false;
@@ -684,7 +714,6 @@ async function handleUnifiedAction(
   if (result.type === "help") {
     const pending = await resolvePendingChangesBeforeLeave(items, staged, byId, ctx, pi, "Help");
     if (pending === "stay") return false;
-    if (pending === "exit") return true;
 
     showHelp(ctx);
     return false;
@@ -741,7 +770,6 @@ async function handleUnifiedAction(
       pendingDestination
     );
     if (pending === "stay") return false;
-    if (pending === "exit") return true;
 
     if (item.type === "local") {
       if (result.action !== "remove") return false;
@@ -753,7 +781,7 @@ async function handleUnifiedAction(
       if (!confirmed) return false;
 
       const removal = await removeLocalExtension(
-        { activePath: item.activePath!, disabledPath: item.disabledPath! },
+        { activePath: item.activePath, disabledPath: item.disabledPath },
         ctx.cwd
       );
       if (!removal.ok) {
@@ -768,20 +796,11 @@ async function handleUnifiedAction(
         "info"
       );
 
-      const shouldReload = await ctx.ui.confirm(
-        "Reload Recommended",
-        "Extension removed. Reload pi now?"
-      );
-      if (shouldReload) {
-        await (ctx as ExtensionCommandContext & { reload: () => Promise<void> }).reload();
-        return true;
-      }
-
-      return false;
+      return await confirmReload(ctx, "Extension removed.");
     }
 
     const pkg: InstalledPackage = {
-      source: item.source!,
+      source: item.source,
       name: item.displayName,
       ...(item.version ? { version: item.version } : {}),
       scope: item.scope,
@@ -827,7 +846,7 @@ async function handleUnifiedAction(
 }
 
 async function applyStagedChanges(
-  items: UnifiedItem[],
+  items: LocalUnifiedItem[],
   staged: Map<string, State>,
   pi: ExtensionAPI
 ) {
@@ -835,10 +854,6 @@ async function applyStagedChanges(
   const errors: string[] = [];
 
   for (const item of items) {
-    if (item.type !== "local" || !item.originalState || !item.activePath || !item.disabledPath) {
-      continue;
-    }
-
     const target = staged.get(item.id) ?? item.originalState;
     if (target === item.originalState) continue;
 

package/src/utils/auto-update.ts

@@ -1,37 +1,29 @@
 /**
  * Auto-update logic and background checker
  */
-import type {
-  ExtensionAPI,
-  ExtensionCommandContext,
-  ExtensionContext,
+import {
+  type ExtensionAPI,
+  type ExtensionCommandContext,
+  type ExtensionContext,
 } from "@mariozechner/pi-coding-agent";
-import type { InstalledPackage } from "../types/index.js";
-import { getInstalledPackages } from "../packages/discovery.js";
+import { getPackageCatalog } from "../packages/catalog.js";
+import { logAutoUpdateConfig } from "./history.js";
 import { notify } from "./notify.js";
+import { normalizePackageIdentity } from "./package-source.js";
 import {
+  type AutoUpdateConfig,
+  calculateNextCheck,
   getAutoUpdateConfig,
-  saveAutoUpdateConfig,
   getScheduleInterval,
-  calculateNextCheck,
   parseDuration,
-  type AutoUpdateConfig,
+  saveAutoUpdateConfig,
 } from "./settings.js";
-import { parseNpmSource } from "./format.js";
-import { execNpm } from "./npm-exec.js";
-import { normalizePackageIdentity } from "./package-source.js";
-import { logAutoUpdateConfig } from "./history.js";
-import { TIMEOUTS } from "../constants.js";
 
-import { startTimer, stopTimer, isTimerRunning } from "./timer.js";
+import { isTimerRunning, startTimer, stopTimer } from "./timer.js";
 
 // Context provider for safe session handling
 export type ContextProvider = () => (ExtensionCommandContext | ExtensionContext) | undefined;
 
-function getUpdateIdentity(pkg: InstalledPackage): string {
-  return normalizePackageIdentity(pkg.source);
-}
-
 /**
  * Start auto-update background checker
  * Uses a context provider to avoid stale context issues when sessions switch
@@ -67,7 +59,10 @@ export function startAutoUpdateTimer(
         stopAutoUpdateTimer();
         return;
       }
-      void checkForUpdates(pi, checkCtx, onUpdateAvailable);
+
+      void checkForUpdates(pi, checkCtx, onUpdateAvailable).catch((error) => {
+        console.warn("[extmgr] Auto-update check failed:", error);
+      });
     },
     { initialDelayMs }
   );
@@ -96,19 +91,9 @@ export async function checkForUpdates(
   ctx: ExtensionCommandContext | ExtensionContext,
   onUpdateAvailable?: (packages: string[]) => void
 ): Promise<string[]> {
-  const packages = await getInstalledPackages(ctx, pi);
-  const npmPackages = packages.filter((p) => p.source.startsWith("npm:"));
-
-  const updatesAvailable: string[] = [];
-  const updatedPackageNames: string[] = [];
-
-  for (const pkg of npmPackages) {
-    const hasUpdate = await checkPackageUpdate(pkg, ctx, pi);
-    if (hasUpdate) {
-      updatesAvailable.push(getUpdateIdentity(pkg));
-      updatedPackageNames.push(pkg.name);
-    }
-  }
+  const updates = await getPackageCatalog(ctx.cwd).checkForAvailableUpdates();
+  const updatesAvailable = updates.map((update) => normalizePackageIdentity(update.source));
+  const updatedPackageNames = updates.map((update) => update.displayName);
 
   const checkedAt = Date.now();
   const config = getAutoUpdateConfig(ctx);
@@ -126,37 +111,6 @@ export async function checkForUpdates(
   return updatedPackageNames;
 }
 
-/**
- * Check if a specific package has updates available
- */
-async function checkPackageUpdate(
-  pkg: InstalledPackage,
-  ctx: ExtensionCommandContext | ExtensionContext,
-  pi: ExtensionAPI
-): Promise<boolean> {
-  const parsed = parseNpmSource(pkg.source);
-  const pkgName = parsed?.name;
-  if (!pkgName) return false;
-
-  try {
-    const res = await execNpm(pi, ["view", pkgName, "version", "--json"], ctx, {
-      timeout: TIMEOUTS.npmView,
-    });
-
-    if (res.code !== 0) return false;
-
-    const latestVersion = JSON.parse(res.stdout) as string;
-    const currentVersion = pkg.version;
-
-    if (!currentVersion) return false;
-
-    // Simple version comparison (assumes semver)
-    return latestVersion !== currentVersion;
-  } catch {
-    return false;
-  }
-}
-
 /**
  * Get status text for display
  */

package/src/utils/cache.ts

@@ -1,11 +1,11 @@
 /**
  * Persistent cache for package metadata to reduce npm API calls
  */
-import { readFile, writeFile, mkdir, access, rename, rm } from "node:fs/promises";
-import { join } from "node:path";
+import { access, mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
-import type { NpmPackage, InstalledPackage } from "../types/index.js";
+import { join } from "node:path";
 import { CACHE_LIMITS } from "../constants.js";
+import { type InstalledPackage, type NpmPackage } from "../types/index.js";
 import { parseNpmSource } from "./format.js";
 
 const CACHE_DIR = process.env.PI_EXTMGR_CACHE_DIR

package/src/utils/command.ts

@@ -18,7 +18,7 @@ export function tokenizeArgs(input: string): string[] {
   };
 
   for (let i = 0; i < input.length; i++) {
-    const char = input[i]!;
+    const char = input.charAt(i);
     const next = input[i + 1];
 
     if (inSingleQuote) {

package/src/utils/format.ts

@@ -1,11 +1,12 @@
 /**
  * Formatting utilities
  */
-import type { ExtensionEntry, InstalledPackage } from "../types/index.js";
+import { type ExtensionEntry, type InstalledPackage } from "../types/index.js";
 
 export function truncate(text: string, maxLength: number): string {
   if (text.length <= maxLength) return text;
-  return text.slice(0, maxLength - 3) + "...";
+  if (maxLength <= 3) return text.slice(0, maxLength);
+  return `${text.slice(0, maxLength - 3)}...`;
 }
 
 /**
@@ -54,7 +55,7 @@ export function formatBytes(bytes: number): string {
   const k = 1024;
   const sizes = ["B", "KB", "MB", "GB"];
   const i = Math.floor(Math.log(bytes) / Math.log(k));
-  return `${parseFloat((bytes / Math.pow(k, i)).toFixed(1))} ${sizes[i]}`;
+  return `${parseFloat((bytes / k ** i).toFixed(1))} ${sizes[i]}`;
 }
 
 const GIT_PATTERNS = {

package/src/utils/history.ts

@@ -2,10 +2,12 @@
  * Extension change history tracking using pi.appendEntry()
  * This persists extension management actions to the session
  */
-import type { ExtensionAPI, ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+
+import { type Dirent } from "node:fs";
 import { readdir, readFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
+import { type ExtensionAPI, type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
 
 export type ChangeAction =
   | "extension_toggle"
@@ -278,7 +280,7 @@ function isRecord(value: unknown): value is Record<string, unknown> {
 async function walkSessionFiles(dir: string): Promise<string[]> {
   const result: string[] = [];
 
-  let entries;
+  let entries: Dirent<string>[];
   try {
     entries = await readdir(dir, { withFileTypes: true, encoding: "utf8" });
   } catch {

package/src/utils/mode.ts

@@ -1,7 +1,7 @@
 /**
  * UI capability helpers
  */
-import type { ExtensionCommandContext, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import { type ExtensionCommandContext, type ExtensionContext } from "@mariozechner/pi-coding-agent";
 import { notify } from "./notify.js";
 
 type AnyContext = ExtensionCommandContext | ExtensionContext;

package/src/utils/network.ts

@@ -1,11 +1,19 @@
-export async function fetchWithTimeout(url: string, timeoutMs: number): Promise<Response> {
+export async function fetchWithTimeout(
+  url: string,
+  timeoutMs: number,
+  signal?: AbortSignal
+): Promise<Response> {
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), timeoutMs);
+  const combinedSignal = signal ? AbortSignal.any([signal, controller.signal]) : controller.signal;
 
   try {
-    return await fetch(url, { signal: controller.signal });
+    return await fetch(url, { signal: combinedSignal });
   } catch (error) {
     if (error instanceof Error && error.name === "AbortError") {
+      if (signal?.aborted) {
+        throw error;
+      }
       throw new Error(`Request timed out after ${Math.ceil(timeoutMs / 1000)}s`);
     }
     throw error;

package/src/utils/notify.ts

@@ -1,7 +1,7 @@
 /**
  * Centralized notification handling for UI and non-UI modes
  */
-import type { ExtensionCommandContext, ExtensionContext } from "@mariozechner/pi-coding-agent";
+import { type ExtensionCommandContext, type ExtensionContext } from "@mariozechner/pi-coding-agent";
 
 export type NotifyLevel = "info" | "warning" | "error";
 

package/src/utils/npm-exec.ts

@@ -1,6 +1,6 @@
 import path from "node:path";
 import { execPath, platform } from "node:process";
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import { type ExtensionAPI } from "@mariozechner/pi-coding-agent";
 
 interface NpmCommandResolutionOptions {
   platform?: NodeJS.Platform;
@@ -9,6 +9,7 @@ interface NpmCommandResolutionOptions {
 
 interface NpmExecOptions {
   timeout: number;
+  signal?: AbortSignal;
 }
 
 function getNpmCliPath(nodeExecPath: string, runtimePlatform: NodeJS.Platform): string {
@@ -43,5 +44,6 @@ export async function execNpm(
   return pi.exec(resolved.command, resolved.args, {
     timeout: options.timeout,
     cwd: ctx.cwd,
+    ...(options.signal ? { signal: options.signal } : {}),
   });
 }