pi-extmgr 0.1.28 → 0.2.0

package/src/packages/install.ts

@@ -11,6 +11,7 @@ import {
 } from "@mariozechner/pi-coding-agent";
 import { TIMEOUTS } from "../constants.js";
 import { runTaskWithLoader } from "../ui/async-task.js";
+import { parseChoiceByLabel } from "../utils/command.js";
 import { normalizePackageSource } from "../utils/format.js";
 import { fileExists } from "../utils/fs.js";
 import { logPackageInstall } from "../utils/history.js";
@@ -32,6 +33,17 @@ export interface InstallOptions {
   scope?: InstallScope;
 }
 
+export interface InstallOutcome {
+  installed: boolean;
+  reloaded: boolean;
+}
+
+const INSTALL_SCOPE_CHOICES = {
+  global: "Global (~/.pi/agent/settings.json)",
+  project: "Project (.pi/settings.json)",
+  cancel: "Cancel",
+} as const;
+
 function getProgressMessage(event: ProgressEvent, fallback: string): string {
   return event.message?.trim() || fallback;
 }
@@ -44,14 +56,12 @@ async function resolveInstallScope(
 
   if (!ctx.hasUI) return "global";
 
-  const choice = await ctx.ui.select("Install scope", [
-    "Global (~/.pi/agent/settings.json)",
-    "Project (.pi/settings.json)",
-    "Cancel",
-  ]);
+  const choice = parseChoiceByLabel(
+    INSTALL_SCOPE_CHOICES,
+    await ctx.ui.select("Install scope", Object.values(INSTALL_SCOPE_CHOICES))
+  );
 
-  if (!choice || choice === "Cancel") return undefined;
-  return choice.startsWith("Project") ? "project" : "global";
+  return choice === "cancel" ? undefined : choice;
 }
 
 function getExtensionInstallDir(ctx: ExtensionCommandContext, scope: InstallScope): string {
@@ -61,28 +71,6 @@ function getExtensionInstallDir(ctx: ExtensionCommandContext, scope: InstallScop
   return join(homedir(), ".pi", "agent", "extensions");
 }
 
-interface GithubUrlInfo {
-  owner: string;
-  repo: string;
-  branch: string;
-  filePath: string;
-}
-
-/**
- * Safely extracts regex match groups with validation
- */
-function safeExtractGithubMatch(match: RegExpMatchArray | null): GithubUrlInfo | undefined {
-  if (!match) return undefined;
-
-  const [, owner, repo, branch, filePath] = match;
-
-  if (!owner || !repo || !branch || !filePath) {
-    return undefined;
-  }
-
-  return { owner, repo, branch, filePath };
-}
-
 async function ensureTarAvailable(
   pi: ExtensionAPI,
   ctx: ExtensionCommandContext
@@ -157,36 +145,35 @@ async function cleanupStandaloneTempArtifacts(tempDir: string, extractDir?: stri
   );
 }
 
-export async function installPackage(
+async function installPackageInternal(
   source: string,
   ctx: ExtensionCommandContext,
   pi: ExtensionAPI,
   options?: InstallOptions
-): Promise<void> {
+): Promise<InstallOutcome> {
   const scope = await resolveInstallScope(ctx, options?.scope);
   if (!scope) {
     notify(ctx, "Installation cancelled.", "info");
-    return;
+    return { installed: false, reloaded: false };
   }
 
   // Check if it's a GitHub URL to a .ts file - handle as direct download
   const githubTsMatch = source.match(
     /^https:\/\/github\.com\/([^/]+)\/([^/]+)\/blob\/([^/]+)\/(.+\.ts)$/
   );
-  const githubInfo = safeExtractGithubMatch(githubTsMatch);
-  if (githubInfo) {
-    const rawUrl = `https://raw.githubusercontent.com/${githubInfo.owner}/${githubInfo.repo}/${githubInfo.branch}/${githubInfo.filePath}`;
-    const fileName =
-      githubInfo.filePath.split("/").pop() || `${githubInfo.owner}-${githubInfo.repo}.ts`;
-    await installFromUrl(rawUrl, fileName, ctx, pi, { scope });
-    return;
+  if (githubTsMatch) {
+    const [, owner, repo, branch, filePath] = githubTsMatch;
+    if (owner && repo && branch && filePath) {
+      const rawUrl = `https://raw.githubusercontent.com/${owner}/${repo}/${branch}/${filePath}`;
+      const fileName = filePath.split("/").pop() || `${owner}-${repo}.ts`;
+      return await installFromUrl(rawUrl, fileName, ctx, pi, { scope });
+    }
   }
 
   // Check if it's already a raw URL to a .ts file
   if (source.match(/^https:\/\/raw\.githubusercontent\.com\/.*\.ts$/)) {
     const fileName = source.split("/").pop() || "extension.ts";
-    await installFromUrl(source, fileName, ctx, pi, { scope });
-    return;
+    return await installFromUrl(source, fileName, ctx, pi, { scope });
   }
 
   const normalized = normalizePackageSource(source);
@@ -199,7 +186,7 @@ export async function installPackage(
   );
   if (!confirmed) {
     notify(ctx, "Installation cancelled.", "info");
-    return;
+    return { installed: false, reloaded: false };
   }
 
   showProgress(ctx, "Installing", normalized);
@@ -226,7 +213,7 @@ export async function installPackage(
     logPackageInstall(pi, normalized, normalized, undefined, scope, false, errorMsg);
     notifyError(ctx, errorMsg);
     void updateExtmgrStatus(ctx, pi);
-    return;
+    return { installed: false, reloaded: false };
   }
 
   clearSearchCache();
@@ -238,6 +225,26 @@ export async function installPackage(
   if (!reloaded) {
     void updateExtmgrStatus(ctx, pi);
   }
+
+  return { installed: true, reloaded };
+}
+
+export async function installPackage(
+  source: string,
+  ctx: ExtensionCommandContext,
+  pi: ExtensionAPI,
+  options?: InstallOptions
+): Promise<void> {
+  await installPackageInternal(source, ctx, pi, options);
+}
+
+export async function installPackageWithOutcome(
+  source: string,
+  ctx: ExtensionCommandContext,
+  pi: ExtensionAPI,
+  options?: InstallOptions
+): Promise<InstallOutcome> {
+  return installPackageInternal(source, ctx, pi, options);
 }
 
 export async function installFromUrl(
@@ -246,11 +253,11 @@ export async function installFromUrl(
   ctx: ExtensionCommandContext,
   pi: ExtensionAPI,
   options?: InstallOptions
-): Promise<void> {
+): Promise<InstallOutcome> {
   const scope = await resolveInstallScope(ctx, options?.scope);
   if (!scope) {
     notify(ctx, "Installation cancelled.", "info");
-    return;
+    return { installed: false, reloaded: false };
   }
 
   const extensionDir = getExtensionInstallDir(ctx, scope);
@@ -263,7 +270,7 @@ export async function installFromUrl(
   );
   if (!confirmed) {
     notify(ctx, "Installation cancelled.", "info");
-    return;
+    return { installed: false, reloaded: false };
   }
 
   const result = await tryOperation(
@@ -289,7 +296,7 @@ export async function installFromUrl(
   if (!result) {
     logPackageInstall(pi, url, fileName, undefined, scope, false, "Installation failed");
     void updateExtmgrStatus(ctx, pi);
-    return;
+    return { installed: false, reloaded: false };
   }
 
   const { fileName: name, destPath } = result;
@@ -300,6 +307,8 @@ export async function installFromUrl(
   if (!reloaded) {
     void updateExtmgrStatus(ctx, pi);
   }
+
+  return { installed: true, reloaded };
 }
 
 /**
@@ -324,16 +333,16 @@ function parsePackageInfo(viewOutput: string): { version: string; tarballUrl: st
   }
 }
 
-export async function installPackageLocally(
+async function installPackageLocallyInternal(
   packageName: string,
   ctx: ExtensionCommandContext,
   pi: ExtensionAPI,
   options?: InstallOptions
-): Promise<void> {
+): Promise<InstallOutcome> {
   const scope = await resolveInstallScope(ctx, options?.scope);
   if (!scope) {
     notify(ctx, "Installation cancelled.", "info");
-    return;
+    return { installed: false, reloaded: false };
   }
 
   const extensionDir = getExtensionInstallDir(ctx, scope);
@@ -346,7 +355,7 @@ export async function installPackageLocally(
   );
   if (!confirmed) {
     notify(ctx, "Installation cancelled.", "info");
-    return;
+    return { installed: false, reloaded: false };
   }
 
   const result = await tryOperation(
@@ -384,7 +393,7 @@ export async function installPackageLocally(
       "Failed to fetch package info"
     );
     void updateExtmgrStatus(ctx, pi);
-    return;
+    return { installed: false, reloaded: false };
   }
   const { version, tarballUrl } = result;
 
@@ -401,7 +410,7 @@ export async function installPackageLocally(
       tarAvailability.error
     );
     void updateExtmgrStatus(ctx, pi);
-    return;
+    return { installed: false, reloaded: false };
   }
 
   // Download and extract
@@ -439,7 +448,7 @@ export async function installPackageLocally(
       "Download failed"
     );
     void updateExtmgrStatus(ctx, pi);
-    return;
+    return { installed: false, reloaded: false };
   }
   const { tarballPath } = extractResult;
 
@@ -496,7 +505,7 @@ export async function installPackageLocally(
       "Extraction failed"
     );
     void updateExtmgrStatus(ctx, pi);
-    return;
+    return { installed: false, reloaded: false };
   }
 
   // Copy to extensions dir
@@ -527,7 +536,7 @@ export async function installPackageLocally(
       "Failed to copy extension"
     );
     void updateExtmgrStatus(ctx, pi);
-    return;
+    return { installed: false, reloaded: false };
   }
 
   clearSearchCache();
@@ -538,4 +547,24 @@ export async function installPackageLocally(
   if (!reloaded) {
     void updateExtmgrStatus(ctx, pi);
   }
+
+  return { installed: true, reloaded };
+}
+
+export async function installPackageLocally(
+  packageName: string,
+  ctx: ExtensionCommandContext,
+  pi: ExtensionAPI,
+  options?: InstallOptions
+): Promise<void> {
+  await installPackageLocallyInternal(packageName, ctx, pi, options);
+}
+
+export async function installPackageLocallyWithOutcome(
+  packageName: string,
+  ctx: ExtensionCommandContext,
+  pi: ExtensionAPI,
+  options?: InstallOptions
+): Promise<InstallOutcome> {
+  return installPackageLocallyInternal(packageName, ctx, pi, options);
 }

package/src/packages/management.ts

@@ -10,6 +10,7 @@ import {
 import { UI } from "../constants.js";
 import { type InstalledPackage } from "../types/index.js";
 import { runTaskWithLoader } from "../ui/async-task.js";
+import { parseChoiceByLabel } from "../utils/command.js";
 import { formatInstalledPackageLabel } from "../utils/format.js";
 import { logPackageRemove, logPackageUpdate } from "../utils/history.js";
 import { requireUI } from "../utils/mode.js";
@@ -34,17 +35,13 @@ export interface PackageMutationOutcome {
   reloaded: boolean;
 }
 
-const NO_PACKAGE_MUTATION_OUTCOME: PackageMutationOutcome = {
-  reloaded: false,
-};
-
 const BULK_UPDATE_LABEL = "all packages";
-
-function packageMutationOutcome(
-  overrides: Partial<PackageMutationOutcome>
-): PackageMutationOutcome {
-  return { ...NO_PACKAGE_MUTATION_OUTCOME, ...overrides };
-}
+const REMOVAL_SCOPE_CHOICES = {
+  both: "Both global + project",
+  global: "Global only",
+  project: "Project only",
+  cancel: "Cancel",
+} as const;
 
 function getProgressMessage(event: ProgressEvent, fallback: string): string {
   return event.message?.trim() || fallback;
@@ -70,7 +67,7 @@ async function updatePackageInternal(
       logPackageUpdate(pi, source, source, undefined, true);
       clearUpdatesAvailable(pi, ctx, [updateIdentity]);
       void updateExtmgrStatus(ctx, pi);
-      return NO_PACKAGE_MUTATION_OUTCOME;
+      return { reloaded: false };
     }
 
     await runTaskWithLoader(
@@ -94,7 +91,7 @@ async function updatePackageInternal(
     logPackageUpdate(pi, source, source, undefined, false, errorMsg);
     notifyError(ctx, errorMsg);
     void updateExtmgrStatus(ctx, pi);
-    return NO_PACKAGE_MUTATION_OUTCOME;
+    return { reloaded: false };
   }
 
   logPackageUpdate(pi, source, source, undefined, true);
@@ -105,7 +102,7 @@ async function updatePackageInternal(
   if (!reloaded) {
     void updateExtmgrStatus(ctx, pi);
   }
-  return packageMutationOutcome({ reloaded });
+  return { reloaded };
 }
 
 async function updatePackagesInternal(
@@ -121,7 +118,7 @@ async function updatePackagesInternal(
       logPackageUpdate(pi, BULK_UPDATE_LABEL, BULK_UPDATE_LABEL, undefined, true);
       clearUpdatesAvailable(pi, ctx);
       void updateExtmgrStatus(ctx, pi);
-      return NO_PACKAGE_MUTATION_OUTCOME;
+      return { reloaded: false };
     }
 
     await runTaskWithLoader(
@@ -145,7 +142,7 @@ async function updatePackagesInternal(
     logPackageUpdate(pi, BULK_UPDATE_LABEL, BULK_UPDATE_LABEL, undefined, false, errorMsg);
     notifyError(ctx, errorMsg);
     void updateExtmgrStatus(ctx, pi);
-    return NO_PACKAGE_MUTATION_OUTCOME;
+    return { reloaded: false };
   }
 
   logPackageUpdate(pi, BULK_UPDATE_LABEL, BULK_UPDATE_LABEL, undefined, true);
@@ -156,7 +153,7 @@ async function updatePackagesInternal(
   if (!reloaded) {
     void updateExtmgrStatus(ctx, pi);
   }
-  return packageMutationOutcome({ reloaded });
+  return { reloaded };
 }
 
 export async function updatePackage(
@@ -230,25 +227,15 @@ interface RemovalTarget {
   name: string;
 }
 
-function scopeChoiceFromLabel(choice: string | undefined): RemovalScopeChoice {
-  if (!choice || choice === "Cancel") return "cancel";
-  if (choice.includes("Both")) return "both";
-  if (choice.includes("Global")) return "global";
-  if (choice.includes("Project")) return "project";
-  return "cancel";
-}
-
 async function selectRemovalScope(ctx: ExtensionCommandContext): Promise<RemovalScopeChoice> {
   if (!ctx.hasUI) return "global";
 
-  const choice = await ctx.ui.select("Remove scope", [
-    "Both global + project",
-    "Global only",
-    "Project only",
-    "Cancel",
-  ]);
-
-  return scopeChoiceFromLabel(choice);
+  return (
+    parseChoiceByLabel(
+      REMOVAL_SCOPE_CHOICES,
+      await ctx.ui.select("Remove scope", Object.values(REMOVAL_SCOPE_CHOICES))
+    ) ?? "cancel"
+  );
 }
 
 function buildRemovalTargets(
@@ -374,18 +361,18 @@ async function removePackageInternal(
 
   if (scopeChoice === "cancel") {
     notify(ctx, "Removal cancelled.", "info");
-    return NO_PACKAGE_MUTATION_OUTCOME;
+    return { reloaded: false };
   }
 
   if (matching.length === 0) {
     notify(ctx, `${source} is not installed.`, "info");
-    return NO_PACKAGE_MUTATION_OUTCOME;
+    return { reloaded: false };
   }
 
   const targets = buildRemovalTargets(matching, ctx.hasUI, scopeChoice);
   if (targets.length === 0) {
     notify(ctx, "Nothing to remove.", "info");
-    return NO_PACKAGE_MUTATION_OUTCOME;
+    return { reloaded: false };
   }
 
   const confirmed = await confirmAction(
@@ -396,7 +383,7 @@ async function removePackageInternal(
   );
   if (!confirmed) {
     notify(ctx, "Removal cancelled.", "info");
-    return NO_PACKAGE_MUTATION_OUTCOME;
+    return { reloaded: false };
   }
 
   const results = await executeRemovalTargets(targets, ctx, pi);
@@ -424,7 +411,7 @@ async function removePackageInternal(
 
   if (successfulRemovalCount === 0) {
     void updateExtmgrStatus(ctx, pi);
-    return NO_PACKAGE_MUTATION_OUTCOME;
+    return { reloaded: false };
   }
 
   const reloaded = await confirmReload(ctx, "Removal complete.");
@@ -432,7 +419,7 @@ async function removePackageInternal(
     void updateExtmgrStatus(ctx, pi);
   }
 
-  return packageMutationOutcome({ reloaded });
+  return { reloaded };
 }
 
 export async function removePackage(

package/src/types/index.ts

@@ -19,6 +19,7 @@ export interface NpmPackage {
   name: string;
   version?: string | undefined;
   description?: string | undefined;
+  author?: string | undefined;
   keywords?: string[] | undefined;
   date?: string | undefined;
   size?: number | undefined; // Package size in bytes
@@ -64,6 +65,7 @@ export interface PackageUnifiedItem {
   displayName: string;
   scope: Scope;
   source: string;
+  resolvedPath?: string | undefined;
   version?: string | undefined;
   description?: string | undefined;
   size?: number | undefined; // Package size in bytes
@@ -97,7 +99,7 @@ export type BrowseAction =
   | { type: "prev" }
   | { type: "next" }
   | { type: "refresh" }
+  | { type: "search"; query: string }
+  | { type: "install" }
   | { type: "menu" }
-  | { type: "main" }
-  | { type: "help" }
   | { type: "cancel" };

package/src/ui/footer.ts

@@ -4,18 +4,24 @@
 import { type State, type UnifiedItem } from "../types/index.js";
 
 export interface FooterState {
-  hasLocals: boolean;
-  hasPackages: boolean;
+  selectedType?: UnifiedItem["type"];
+  pendingChanges: number;
 }
 
-/**
- * Build footer state from visible items.
- */
-export function buildFooterState(items: UnifiedItem[]): FooterState {
-  return {
-    hasLocals: items.some((i) => i.type === "local"),
-    hasPackages: items.some((i) => i.type === "package"),
+export function buildFooterState(
+  staged: Map<string, State>,
+  byId: Map<string, UnifiedItem>,
+  selectedItem?: UnifiedItem
+): FooterState {
+  const state: FooterState = {
+    pendingChanges: getPendingToggleChangeCount(staged, byId),
   };
+
+  if (selectedItem) {
+    state.selectedType = selectedItem.type;
+  }
+
+  return state;
 }
 
 export function getPendingToggleChangeCount(
@@ -37,27 +43,41 @@ export function getPendingToggleChangeCount(
 }
 
 /**
- * Build keyboard shortcuts text for the footer.
+ * Build contextual keyboard shortcuts text for the footer.
  */
 export function buildFooterShortcuts(state: FooterState): string {
   const parts: string[] = [];
-  parts.push("↑↓ Navigate");
-
-  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");
-  if (state.hasPackages || state.hasLocals) parts.push("X Remove");
-
-  parts.push("i Install");
-  parts.push("f Search");
-  parts.push("U Update all");
-  parts.push("t Auto-update");
-  parts.push("P Palette");
-  parts.push("R Browse");
-  parts.push("? Help");
-  parts.push("Esc Cancel");
-
-  return parts.join(" | ");
+
+  if (state.selectedType === "local") {
+    parts.push("Space toggle");
+    parts.push("Enter/A actions");
+    parts.push("V details");
+    parts.push("X remove");
+  }
+
+  if (state.selectedType === "package") {
+    parts.push("Enter/A actions");
+    parts.push("V details");
+    parts.push("c configure");
+    parts.push("u update");
+    parts.push("X remove");
+  }
+
+  if (state.pendingChanges > 0) {
+    parts.push(`S save (${state.pendingChanges})`);
+  }
+
+  parts.push("/ search");
+  parts.push("Tab filters");
+  parts.push("1-5 filters");
+  parts.push("i install");
+  parts.push("f remote search");
+  parts.push("U update all");
+  parts.push("t auto-update");
+  parts.push("P palette");
+  parts.push("R browse");
+  parts.push("? help");
+  parts.push("Esc clear/cancel");
+
+  return parts.join(" · ");
 }

package/src/ui/help.ts

@@ -2,6 +2,7 @@
  * Help display
  */
 import { type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import { notify } from "../utils/notify.js";
 
 export function showHelp(ctx: ExtensionCommandContext): void {
   const lines = [
@@ -9,25 +10,33 @@ export function showHelp(ctx: ExtensionCommandContext): void {
     "",
     "Unified View:",
     "  Local extensions and npm/git packages are displayed together",
+    "  The list is grouped into Local extensions and Installed packages sections",
+    "  Rows stay compact; details for the selected item appear below the list",
     "  Local extensions show ● enabled / ○ disabled with G/P scope",
-    "  Packages show 📦 with name@version and G/P scope",
+    "  Packages show a source-type icon with name@version, scope, and size when known",
     "",
     "Navigation:",
     "  ↑↓           Navigate list",
-    "  Space/Enter  Toggle local extension enabled/disabled",
+    "  PageUp/Down  Jump through longer lists",
+    "  Home/End     Jump to top or bottom",
+    "  Space        Toggle selected local extension enabled/disabled",
     "  S            Save changes to local extensions",
-    "  Enter/A      Open actions for selected package",
+    "  Enter/A      Open actions for the selected item",
+    "  / or Ctrl+F  Search visible items",
+    "  Tab/Shift+Tab Cycle filters",
+    "  1-5          Quick filters: All / Local / Packages / Updates / Disabled",
     "  c            Configure selected package extensions (reload after save)",
     "  u            Update selected package",
+    "  V            View full details for the selected item",
     "  X            Remove selected item (package or local extension)",
     "  i            Quick install by source",
-    "  f            Quick search",
+    "  f            Remote package search",
     "  U            Update all packages",
     "  t            Auto-update wizard",
     "  P/M          Quick actions palette",
     "  R            Browse remote packages",
     "  ?/H          Show this help",
-    "  Esc          Cancel",
+    "  Esc          Clear search or cancel",
     "",
     "Extension Sources:",
     "  - ~/.pi/agent/extensions/ (global - G)",
@@ -49,10 +58,5 @@ export function showHelp(ctx: ExtensionCommandContext): void {
     "  /extensions auto-update  Show or change update schedule",
   ];
 
-  const output = lines.join("\n");
-  if (ctx.hasUI) {
-    ctx.ui.notify(output, "info");
-  } else {
-    console.log(output);
-  }
+  notify(ctx, lines.join("\n"), "info");
 }