pi-extmgr 0.1.11 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-extmgr",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "Enhanced UX for managing local Pi extensions and community packages",
   "keywords": [
     "pi-package",

package/src/packages/discovery.ts

@@ -1,6 +1,8 @@
 /**
  * Package discovery and listing
  */
+import { readFile } from "node:fs/promises";
+import { join } from "node:path";
 import type {
   ExtensionAPI,
   ExtensionCommandContext,
@@ -10,7 +12,7 @@ import type { InstalledPackage, NpmPackage, SearchCache } from "../types/index.j
 import { CACHE_TTL, TIMEOUTS } from "../constants.js";
 import { readSummary } from "../utils/fs.js";
 import { parseNpmSource } from "../utils/format.js";
-import { splitGitRepoAndRef } from "../utils/package-source.js";
+import { getPackageSourceKind, splitGitRepoAndRef } from "../utils/package-source.js";
 
 let searchCache: SearchCache | null = null;
 
@@ -280,8 +282,9 @@ function parsePackageNameAndVersion(fullSource: string): {
     return parsedNpm;
   }
 
-  if (fullSource.startsWith("git:")) {
-    const gitSpec = fullSource.slice(4);
+  const sourceKind = getPackageSourceKind(fullSource);
+  if (sourceKind === "git") {
+    const gitSpec = fullSource.startsWith("git:") ? fullSource.slice(4) : fullSource;
     const { repo } = splitGitRepoAndRef(gitSpec);
     return { name: extractGitPackageName(repo) };
   }
@@ -298,6 +301,45 @@ function parsePackageNameAndVersion(fullSource: string): {
   return { name: fileName || fullSource };
 }
 
+async function hydratePackageFromResolvedPath(pkg: InstalledPackage): Promise<void> {
+  if (!pkg.resolvedPath) return;
+
+  const manifestPath = /(?:^|[\\/])package\.json$/i.test(pkg.resolvedPath)
+    ? pkg.resolvedPath
+    : join(pkg.resolvedPath, "package.json");
+
+  try {
+    const raw = await readFile(manifestPath, "utf8");
+    const manifest = JSON.parse(raw) as {
+      name?: unknown;
+      version?: unknown;
+      description?: unknown;
+    };
+
+    if (!pkg.version && typeof manifest.version === "string" && manifest.version.trim()) {
+      pkg.version = manifest.version.trim();
+    }
+
+    if (
+      !pkg.description &&
+      typeof manifest.description === "string" &&
+      manifest.description.trim()
+    ) {
+      pkg.description = manifest.description.trim();
+    }
+
+    if (
+      (!pkg.name || pkg.name === pkg.source) &&
+      typeof manifest.name === "string" &&
+      manifest.name.trim()
+    ) {
+      pkg.name = manifest.name.trim();
+    }
+  } catch {
+    // ignore
+  }
+}
+
 /**
  * Fetch package size from npm view
  */
@@ -356,7 +398,8 @@ async function addPackageMetadata(
 
     await Promise.all(
       batch.map(async (pkg) => {
-        // Skip if already has description from cache
+        await hydratePackageFromResolvedPath(pkg);
+
         const needsDescription = !pkg.description;
         const needsSize = pkg.size === undefined && pkg.source.startsWith("npm:");
 
@@ -364,7 +407,6 @@ async function addPackageMetadata(
 
         try {
           if (pkg.source.endsWith(".ts") || pkg.source.endsWith(".js")) {
-            // For local files, read description from file
             if (needsDescription) {
               pkg.description = await readSummary(pkg.source);
             }
@@ -373,13 +415,11 @@ async function addPackageMetadata(
             const pkgName = parsed?.name;
 
             if (pkgName) {
-              // Get description
               if (needsDescription) {
                 const cached = await getCachedPackage(pkgName);
                 if (cached?.description) {
                   pkg.description = cached.description;
                 } else {
-                  // Fetch from npm and cache it
                   const res = await pi.exec("npm", ["view", pkgName, "description", "--json"], {
                     timeout: TIMEOUTS.npmView,
                     cwd: ctx.cwd,
@@ -389,7 +429,6 @@ async function addPackageMetadata(
                       const desc = JSON.parse(res.stdout) as string;
                       if (typeof desc === "string" && desc) {
                         pkg.description = desc;
-                        // Cache the description
                         await setCachedPackage(pkgName, {
                           name: pkgName,
                           description: desc,
@@ -402,7 +441,6 @@ async function addPackageMetadata(
                 }
               }
 
-              // Get size
               if (needsSize) {
                 pkg.size = await fetchPackageSize(pkgName, ctx, pi);
               }

package/src/packages/management.ts

@@ -23,11 +23,27 @@ import { requireUI } from "../utils/mode.js";
 import { updateExtmgrStatus } from "../utils/status.js";
 import { TIMEOUTS, UI } from "../constants.js";
 
-export async function updatePackage(
+export interface PackageMutationOutcome {
+  reloaded: boolean;
+  restartRequested: boolean;
+}
+
+const NO_PACKAGE_MUTATION_OUTCOME: PackageMutationOutcome = {
+  reloaded: false,
+  restartRequested: false,
+};
+
+function packageMutationOutcome(
+  overrides: Partial<PackageMutationOutcome>
+): PackageMutationOutcome {
+  return { ...NO_PACKAGE_MUTATION_OUTCOME, ...overrides };
+}
+
+async function updatePackageInternal(
   source: string,
   ctx: ExtensionCommandContext,
   pi: ExtensionAPI
-): Promise<void> {
+): Promise<PackageMutationOutcome> {
   showProgress(ctx, "Updating", source);
 
   const res = await pi.exec("pi", ["update", source], {
@@ -40,28 +56,29 @@ export async function updatePackage(
     logPackageUpdate(pi, source, source, undefined, undefined, false, errorMsg);
     notifyError(ctx, errorMsg);
     void updateExtmgrStatus(ctx, pi);
-    return;
+    return NO_PACKAGE_MUTATION_OUTCOME;
   }
 
   const stdout = res.stdout || "";
   if (stdout.includes("already up to date") || stdout.includes("pinned")) {
     notify(ctx, `${source} is already up to date (or pinned).`, "info");
     logPackageUpdate(pi, source, source, undefined, undefined, true);
-  } else {
-    logPackageUpdate(pi, source, source, undefined, undefined, true);
-    success(ctx, `Updated ${source}`);
     void updateExtmgrStatus(ctx, pi);
-    await confirmReload(ctx, "Package updated.");
-    return;
+    return NO_PACKAGE_MUTATION_OUTCOME;
   }
 
+  logPackageUpdate(pi, source, source, undefined, undefined, true);
+  success(ctx, `Updated ${source}`);
   void updateExtmgrStatus(ctx, pi);
+
+  const reloaded = await confirmReload(ctx, "Package updated.");
+  return packageMutationOutcome({ reloaded });
 }
 
-export async function updatePackages(
+async function updatePackagesInternal(
   ctx: ExtensionCommandContext,
   pi: ExtensionAPI
-): Promise<void> {
+): Promise<PackageMutationOutcome> {
   showProgress(ctx, "Updating", "all packages");
 
   const res = await pi.exec("pi", ["update"], { timeout: 300000, cwd: ctx.cwd });
@@ -69,20 +86,51 @@ export async function updatePackages(
   if (res.code !== 0) {
     notifyError(ctx, `Update failed: ${res.stderr || res.stdout || `exit ${res.code}`}`);
     void updateExtmgrStatus(ctx, pi);
-    return;
+    return NO_PACKAGE_MUTATION_OUTCOME;
   }
 
   const stdout = res.stdout || "";
   if (stdout.includes("already up to date") || stdout.trim() === "") {
     notify(ctx, "All packages are already up to date.", "info");
-  } else {
-    success(ctx, "Packages updated");
     void updateExtmgrStatus(ctx, pi);
-    await confirmReload(ctx, "Packages updated.");
-    return;
+    return NO_PACKAGE_MUTATION_OUTCOME;
   }
 
+  success(ctx, "Packages updated");
   void updateExtmgrStatus(ctx, pi);
+
+  const reloaded = await confirmReload(ctx, "Packages updated.");
+  return packageMutationOutcome({ reloaded });
+}
+
+export async function updatePackage(
+  source: string,
+  ctx: ExtensionCommandContext,
+  pi: ExtensionAPI
+): Promise<void> {
+  await updatePackageInternal(source, ctx, pi);
+}
+
+export async function updatePackageWithOutcome(
+  source: string,
+  ctx: ExtensionCommandContext,
+  pi: ExtensionAPI
+): Promise<PackageMutationOutcome> {
+  return updatePackageInternal(source, ctx, pi);
+}
+
+export async function updatePackages(
+  ctx: ExtensionCommandContext,
+  pi: ExtensionAPI
+): Promise<void> {
+  await updatePackagesInternal(ctx, pi);
+}
+
+export async function updatePackagesWithOutcome(
+  ctx: ExtensionCommandContext,
+  pi: ExtensionAPI
+): Promise<PackageMutationOutcome> {
+  return updatePackagesInternal(ctx, pi);
 }
 
 function packageIdentity(source: string, fallbackName?: string): string {
@@ -234,11 +282,11 @@ function notifyRemovalSummary(
   }
 }
 
-export async function removePackage(
+async function removePackageInternal(
   source: string,
   ctx: ExtensionCommandContext,
   pi: ExtensionAPI
-): Promise<void> {
+): Promise<PackageMutationOutcome> {
   const installed = await getInstalledPackagesAllScopes(ctx, pi);
   const direct = installed.find((p) => p.source === source);
   const identity = packageIdentity(source, direct?.name);
@@ -251,13 +299,13 @@ export async function removePackage(
 
   if (scopeChoice === "cancel") {
     notify(ctx, "Removal cancelled.", "info");
-    return;
+    return NO_PACKAGE_MUTATION_OUTCOME;
   }
 
   const targets = buildRemovalTargets(matching, source, ctx.hasUI, scopeChoice);
   if (targets.length === 0) {
     notify(ctx, "Nothing to remove.", "info");
-    return;
+    return NO_PACKAGE_MUTATION_OUTCOME;
   }
 
   const confirmed = await confirmAction(
@@ -268,7 +316,7 @@ export async function removePackage(
   );
   if (!confirmed) {
     notify(ctx, "Removal cancelled.", "info");
-    return;
+    return NO_PACKAGE_MUTATION_OUTCOME;
   }
 
   const failures = await executeRemovalTargets(targets, ctx, pi);
@@ -281,10 +329,28 @@ export async function removePackage(
 
   void updateExtmgrStatus(ctx, pi);
 
-  await confirmRestart(
+  const restartRequested = await confirmRestart(
     ctx,
     `Removal complete.\n\n⚠️  Extensions/prompts/skills/themes from removed packages are fully unloaded after restarting pi.`
   );
+
+  return packageMutationOutcome({ restartRequested });
+}
+
+export async function removePackage(
+  source: string,
+  ctx: ExtensionCommandContext,
+  pi: ExtensionAPI
+): Promise<void> {
+  await removePackageInternal(source, ctx, pi);
+}
+
+export async function removePackageWithOutcome(
+  source: string,
+  ctx: ExtensionCommandContext,
+  pi: ExtensionAPI
+): Promise<PackageMutationOutcome> {
+  return removePackageInternal(source, ctx, pi);
 }
 
 export async function promptRemove(ctx: ExtensionCommandContext, pi: ExtensionAPI): Promise<void> {
@@ -344,12 +410,14 @@ export async function showPackageActions(
         : "back";
 
   switch (action) {
-    case "remove":
-      await removePackage(pkg.source, ctx, pi);
-      return false;
-    case "update":
-      await updatePackage(pkg.source, ctx, pi);
-      return false;
+    case "remove": {
+      const outcome = await removePackageWithOutcome(pkg.source, ctx, pi);
+      return outcome.reloaded || outcome.restartRequested;
+    }
+    case "update": {
+      const outcome = await updatePackageWithOutcome(pkg.source, ctx, pi);
+      return outcome.reloaded || outcome.restartRequested;
+    }
     case "details": {
       const sizeStr = pkg.size !== undefined ? `\nSize: ${formatBytes(pkg.size)}` : "";
       notify(

package/src/ui/unified.ts

@@ -30,9 +30,9 @@ import { getInstalledPackages } from "../packages/discovery.js";
 import { discoverPackageExtensions, setPackageExtensionState } from "../packages/extensions.js";
 import {
   showPackageActions,
-  updatePackage,
-  removePackage,
-  updatePackages,
+  updatePackageWithOutcome,
+  removePackageWithOutcome,
+  updatePackagesWithOutcome,
 } from "../packages/management.js";
 import { showRemote } from "./remote.js";
 import { showHelp } from "./help.js";
@@ -48,6 +48,7 @@ import { logExtensionToggle } from "../utils/history.js";
 import { getKnownUpdates, promptAutoUpdateWizard } from "../utils/auto-update.js";
 import { updateExtmgrStatus } from "../utils/status.js";
 import { parseChoiceByLabel } from "../utils/command.js";
+import { getPackageSourceKind } from "../utils/package-source.js";
 import { UI } from "../constants.js";
 
 // Type guard for SettingsList with selectedIndex
@@ -268,7 +269,7 @@ async function showInteractiveOnce(
   return await handleUnifiedAction(result, items, staged, byId, ctx, pi);
 }
 
-function buildUnifiedItems(
+export function buildUnifiedItems(
   localEntries: Awaited<ReturnType<typeof discoverExtensions>>,
   installedPackages: InstalledPackage[],
   packageExtensions: PackageExtensionEntry[],
@@ -277,7 +278,22 @@ function buildUnifiedItems(
   const items: UnifiedItem[] = [];
   const localPaths = new Set<string>();
 
-  const packageSourcesWithExtensions = new Set<string>();
+  const packageExtensionGroups = new Map<string, PackageExtensionEntry[]>();
+  for (const entry of packageExtensions) {
+    const key = `${entry.packageScope}:${entry.packageSource.toLowerCase()}`;
+    const group = packageExtensionGroups.get(key) ?? [];
+    group.push(entry);
+    packageExtensionGroups.set(key, group);
+  }
+
+  const visiblePackageExtensions = packageExtensions.filter((entry) => {
+    const key = `${entry.packageScope}:${entry.packageSource.toLowerCase()}`;
+    const group = packageExtensionGroups.get(key) ?? [];
+
+    // Avoid duplicate-looking rows for packages that expose a single enabled extension entrypoint.
+    // Keep extension rows when there are multiple entrypoints, or when an entry is disabled so it can be re-enabled.
+    return group.length > 1 || entry.state === "disabled";
+  });
 
   // Add local extensions
   for (const entry of localEntries) {
@@ -295,8 +311,7 @@ function buildUnifiedItems(
     });
   }
 
-  for (const entry of packageExtensions) {
-    packageSourcesWithExtensions.add(entry.packageSource.toLowerCase());
+  for (const entry of visiblePackageExtensions) {
     items.push({
       type: "package-extension",
       id: entry.id,
@@ -314,8 +329,6 @@ function buildUnifiedItems(
     const pkgSourceLower = pkg.source.toLowerCase();
     const pkgResolvedLower = pkg.resolvedPath?.toLowerCase() ?? "";
 
-    if (packageSourcesWithExtensions.has(pkgSourceLower)) continue;
-
     let isDuplicate = false;
     for (const localPath of localPaths) {
       if (pkgSourceLower === localPath || pkgResolvedLower === localPath) {
@@ -355,7 +368,7 @@ function buildUnifiedItems(
   items.sort((a, b) => {
     const rank = (type: UnifiedItem["type"]): number => {
       if (type === "local") return 0;
-      if (type === "package-extension") return 1;
+      if (type === "package") return 1;
       return 2;
     };
 
@@ -427,7 +440,7 @@ function formatUnifiedItemLabel(
   theme: Theme,
   changed = false
 ): string {
-  if (item.type === "local" || item.type === "package-extension") {
+  if (item.type === "local") {
     const statusIcon = getStatusIcon(theme, state === "enabled" ? "enabled" : "disabled");
     const scopeIcon = getScopeIcon(theme, item.scope as "global" | "project");
     const changeMarker = getChangeMarker(theme, changed);
@@ -436,7 +449,26 @@ function formatUnifiedItemLabel(
     return `${statusIcon} [${scopeIcon}] ${name} - ${summary}${changeMarker}`;
   }
 
-  const pkgIcon = getPackageIcon(theme, item.source?.startsWith("npm:") ? "npm" : "git");
+  if (item.type === "package-extension") {
+    const statusIcon = getStatusIcon(theme, state === "enabled" ? "enabled" : "disabled");
+    const scopeIcon = getScopeIcon(theme, item.scope as "global" | "project");
+    const sourceKind = getPackageSourceKind(item.packageSource ?? "");
+    const pkgIcon = getPackageIcon(
+      theme,
+      sourceKind === "npm" || sourceKind === "git" || sourceKind === "local" ? sourceKind : "local"
+    );
+    const sourceLabel = sourceKind === "unknown" ? "package" : `${sourceKind} package`;
+    const changeMarker = getChangeMarker(theme, changed);
+    const name = theme.bold(item.displayName);
+    const summary = theme.fg("dim", `${item.summary} • ${sourceLabel}`);
+    return `${statusIcon} ${pkgIcon} [${scopeIcon}] ${name} - ${summary}${changeMarker}`;
+  }
+
+  const sourceKind = getPackageSourceKind(item.source ?? "");
+  const pkgIcon = getPackageIcon(
+    theme,
+    sourceKind === "npm" || sourceKind === "git" || sourceKind === "local" ? sourceKind : "local"
+  );
   const scopeIcon = getScopeIcon(theme, item.scope as "global" | "project");
   const name = theme.bold(item.displayName);
   const version = item.version ? theme.fg("dim", `@${item.version}`) : "";
@@ -449,9 +481,9 @@ function formatUnifiedItemLabel(
   // Reserved space: icon (2) + scope (3) + name (~25) + version (~10) + separator (3) = ~43 chars
   if (item.description) {
     infoParts.push(dynamicTruncate(item.description, 43));
-  } else if (item.source?.startsWith("npm:")) {
+  } else if (sourceKind === "npm") {
     infoParts.push("npm");
-  } else if (item.source?.startsWith("git:")) {
+  } else if (sourceKind === "git") {
     infoParts.push("git");
   } else {
     infoParts.push("local");
@@ -616,9 +648,10 @@ async function navigateWithPendingGuard(
     case "browse":
       await showRemote("", ctx, pi);
       return "done";
-    case "update-all":
-      await updatePackages(ctx, pi);
-      return "done";
+    case "update-all": {
+      const outcome = await updatePackagesWithOutcome(ctx, pi);
+      return outcome.reloaded || outcome.restartRequested ? "exit" : "done";
+    }
     case "auto-update":
       await promptAutoUpdateWizard(pi, ctx, (packages) => {
         ctx.ui.notify(
@@ -784,12 +817,14 @@ async function handleUnifiedAction(
     };
 
     switch (result.action) {
-      case "update":
-        await updatePackage(pkg.source, ctx, pi);
-        return false;
-      case "remove":
-        await removePackage(pkg.source, ctx, pi);
-        return false;
+      case "update": {
+        const outcome = await updatePackageWithOutcome(pkg.source, ctx, pi);
+        return outcome.reloaded || outcome.restartRequested;
+      }
+      case "remove": {
+        const outcome = await removePackageWithOutcome(pkg.source, ctx, pi);
+        return outcome.reloaded || outcome.restartRequested;
+      }
       case "details": {
         const sizeStr = pkg.size !== undefined ? `\nSize: ${formatBytes(pkg.size)}` : "";
         ctx.ui.notify(

package/src/utils/package-source.ts

@@ -2,6 +2,44 @@
  * Package source parsing helpers shared across discovery/management flows.
  */
 
+export type PackageSourceKind = "npm" | "git" | "local" | "unknown";
+
+function sanitizeSource(source: string): string {
+  return source
+    .trim()
+    .replace(/\s+\((filtered|pinned)\)$/i, "")
+    .trim();
+}
+
+export function getPackageSourceKind(source: string): PackageSourceKind {
+  const normalized = sanitizeSource(source);
+
+  if (normalized.startsWith("npm:")) return "npm";
+
+  if (
+    normalized.startsWith("git:") ||
+    normalized.startsWith("http://") ||
+    normalized.startsWith("https://") ||
+    normalized.startsWith("ssh://") ||
+    /^git@[^\s:]+:.+/.test(normalized)
+  ) {
+    return "git";
+  }
+
+  if (
+    normalized.startsWith("/") ||
+    normalized.startsWith("./") ||
+    normalized.startsWith("../") ||
+    normalized.startsWith("~/") ||
+    /^[a-zA-Z]:[\\/]/.test(normalized) ||
+    normalized.startsWith("\\\\")
+  ) {
+    return "local";
+  }
+
+  return "unknown";
+}
+
 export function splitGitRepoAndRef(gitSpec: string): { repo: string; ref?: string | undefined } {
   const lastAt = gitSpec.lastIndexOf("@");
   if (lastAt <= 0) {