pi-extmgr 0.1.27 → 0.1.28

package/README.md

@@ -6,6 +6,7 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
 A better way to manage Pi extensions. Browse, install, enable/disable, and remove extensions from one place.
+Built on top of Pi's native package install, update, and config flows, so extmgr stays aligned with current upstream behavior.
 
 **🌐 [pi-extmgr landing page](https://ayagmar.github.io/pi-extmgr)**
 
@@ -15,9 +16,9 @@ A better way to manage Pi extensions. Browse, install, enable/disable, and remov
 pi install npm:pi-extmgr
 ```
 
-Then reload Pi.
+If Pi is already running, use `/reload`.
 
-Requires Node.js `>=22.5.0`.
+Requires Node.js `>=22`.
 
 ## Features
 
@@ -155,7 +156,7 @@ Examples:
 
 - **Staged local changes**: Toggle local extensions on/off, then press `S` to apply all at once.
 - **Package extension config**: Select a package and press `c` (or Enter/A → Configure) to enable/disable individual package entrypoints.
-  - After saving package extension config, restart pi to fully apply changes.
+  - After saving package extension config, run /reload to apply changes.
 - **Two install modes**:
   - **Managed** (npm): Auto-updates with `pi update`, stored in pi's package cache, supports Pi package manifest/convention loading
   - **Local** (standalone): Copies to `~/.pi/agent/extensions/{package}/`, so it only accepts runnable standalone layouts (manifest-declared/root entrypoints), requires `tar` on `PATH`, and rejects packages whose runtime `dependencies` are not already bundled with the package contents

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-extmgr",
-  "version": "0.1.27",
+  "version": "0.1.28",
   "description": "Enhanced UX for managing local Pi extensions and community packages",
   "keywords": [
     "pi-package",
@@ -19,14 +19,14 @@
     "README.md"
   ],
   "scripts": {
-    "lint": "eslint . --max-warnings=0",
-    "lint:fix": "eslint . --fix",
-    "format": "prettier --write .",
-    "format:check": "prettier --check .",
+    "lint": "biome lint . --error-on-warnings",
+    "lint:fix": "biome check --write .",
+    "format": "biome format --write .",
+    "format:check": "biome format .",
     "typecheck": "tsc --noEmit -p tsconfig.json",
     "smoke-test": "node --import=tsx ./scripts/smoke-test.mjs",
     "test": "node --import=tsx --test ./test/*.test.ts",
-    "check": "pnpm run typecheck && pnpm run smoke-test && pnpm run test && pnpm run lint && pnpm run format:check",
+    "check": "tsc --noEmit -p tsconfig.json && node --import=tsx ./scripts/smoke-test.mjs && node --import=tsx --test ./test/*.test.ts && pnpm run lint && pnpm run format:check",
     "prepublishOnly": "pnpm run check",
     "prepare": "husky"
   },
@@ -42,22 +42,19 @@
     "@mariozechner/pi-tui": "*"
   },
   "devDependencies": {
-    "@mariozechner/pi-coding-agent": "^0.62.0",
-    "@mariozechner/pi-tui": "^0.62.0",
-    "@types/node": "^22.13.10",
-    "@typescript-eslint/eslint-plugin": "^8.42.0",
-    "@typescript-eslint/parser": "^8.42.0",
-    "eslint": "^9.38.0",
-    "eslint-config-prettier": "^10.1.8",
+    "@biomejs/biome": "^2.4.9",
+    "@mariozechner/pi-coding-agent": "^0.63.1",
+    "@mariozechner/pi-tui": "^0.63.1",
+    "@types/node": "^22.19.10",
     "husky": "^9.1.7",
-    "prettier": "^3.8.1",
-    "tsx": "^4.19.3",
+    "tsx": "^4.21.0",
     "typescript": "^5.9.3"
   },
   "author": "ayagmar",
   "license": "MIT",
+  "packageManager": "pnpm@10.33.0",
   "engines": {
-    "node": ">=22.5.0"
+    "node": ">=22"
   },
   "repository": {
     "type": "git",

package/src/commands/auto-update.ts

@@ -1,7 +1,7 @@
-import type {
-  ExtensionAPI,
-  ExtensionCommandContext,
-  ExtensionContext,
+import {
+  type ExtensionAPI,
+  type ExtensionCommandContext,
+  type ExtensionContext,
 } from "@mariozechner/pi-coding-agent";
 import {
   disableAutoUpdate,

package/src/commands/cache.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI, ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import { type ExtensionAPI, type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
 import { clearSearchCache } from "../packages/discovery.js";
 import { clearRemotePackageInfoCache } from "../ui/remote.js";
 import { clearCache } from "../utils/cache.js";

package/src/commands/history.ts

@@ -1,10 +1,10 @@
-import type { ExtensionAPI, ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import { type ExtensionAPI, type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
 import {
+  type ChangeAction,
   formatChangeEntry,
+  type HistoryFilters,
   queryGlobalHistory,
   querySessionChanges,
-  type ChangeAction,
-  type HistoryFilters,
 } from "../utils/history.js";
 import { notify } from "../utils/notify.js";
 import { formatListOutput } from "../utils/ui-helpers.js";

package/src/commands/install.ts

@@ -1,5 +1,5 @@
-import type { ExtensionAPI, ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
-import { installPackage, type InstallScope } from "../packages/install.js";
+import { type ExtensionAPI, type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import { type InstallScope, installPackage } from "../packages/install.js";
 import { notify } from "../utils/notify.js";
 
 export const INSTALL_USAGE = "Usage: /extensions install <source> [--project|--global]";

package/src/commands/registry.ts

@@ -1,7 +1,5 @@
-import type { ExtensionAPI, ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
-import type { AutocompleteItem } from "@mariozechner/pi-tui";
-import { showInteractive, showInstalledPackagesLegacy, showListOnly } from "../ui/unified.js";
-import { showRemote } from "../ui/remote.js";
+import { type ExtensionAPI, type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import { type AutocompleteItem } from "@mariozechner/pi-tui";
 import {
   promptRemove,
   removePackage,
@@ -9,12 +7,14 @@ import {
   updatePackage,
   updatePackages,
 } from "../packages/management.js";
+import { showRemote } from "../ui/remote.js";
+import { showInstalledPackagesLegacy, showInteractive, showListOnly } from "../ui/unified.js";
 import { notify } from "../utils/notify.js";
-import { handleInstallSubcommand, INSTALL_USAGE } from "./install.js";
-import { handleHistorySubcommand } from "./history.js";
 import { handleAutoUpdateSubcommand } from "./auto-update.js";
 import { clearMetadataCacheCommand } from "./cache.js";
-import type { CommandDefinition, CommandId } from "./types.js";
+import { handleHistorySubcommand } from "./history.js";
+import { handleInstallSubcommand, INSTALL_USAGE } from "./install.js";
+import { type CommandDefinition, type CommandId } from "./types.js";
 
 const REMOVE_USAGE = "Usage: /extensions remove <npm:package|git:url|path>";
 

package/src/commands/types.ts

@@ -1,4 +1,4 @@
-import type { ExtensionAPI, ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import { type ExtensionAPI, type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
 
 export type CommandId =
   | "local"

package/src/extensions/discovery.ts

@@ -4,12 +4,13 @@
  * This module handles discovery and management of local Pi extensions
  * in both global (~/.pi/agent/extensions) and project (.pi/extensions) scopes.
  */
+
+import { type Dirent } from "node:fs";
 import { readdir, rename, rm } from "node:fs/promises";
-import { basename, dirname, join, relative } from "node:path";
 import { homedir } from "node:os";
-import type { Dirent } from "node:fs";
-import type { ExtensionEntry, Scope, State } from "../types/index.js";
+import { basename, dirname, join, relative } from "node:path";
 import { DISABLED_SUFFIX } from "../constants.js";
+import { type ExtensionEntry, type Scope, type State } from "../types/index.js";
 import { fileExists, readSummary } from "../utils/fs.js";
 
 interface RootConfig {

package/src/index.ts

@@ -3,21 +3,12 @@
  *
  * Entry point - exports the main extension function
  */
-import type {
-  ExtensionAPI,
-  ExtensionCommandContext,
-  ExtensionContext,
-} from "@mariozechner/pi-coding-agent";
-import { isPackageSource } from "./utils/format.js";
-import { installPackage } from "./packages/install.js";
-import { tokenizeArgs } from "./utils/command.js";
-import { updateExtmgrStatus } from "./utils/status.js";
 import {
-  startAutoUpdateTimer,
-  stopAutoUpdateTimer,
-  type ContextProvider,
-} from "./utils/auto-update.js";
-import { hydrateAutoUpdateConfig, getAutoUpdateConfig } from "./utils/settings.js";
+  type ExtensionAPI,
+  type ExtensionCommandContext,
+  type ExtensionContext,
+} from "@mariozechner/pi-coding-agent";
+import { createAutoUpdateNotificationHandler } from "./commands/auto-update.js";
 import {
   getExtensionsAutocompleteItems,
   resolveCommand,
@@ -25,7 +16,16 @@ import {
   showNonInteractiveHelp,
   showUnknownCommandMessage,
 } from "./commands/registry.js";
-import { createAutoUpdateNotificationHandler } from "./commands/auto-update.js";
+import { installPackage } from "./packages/install.js";
+import {
+  type ContextProvider,
+  startAutoUpdateTimer,
+  stopAutoUpdateTimer,
+} from "./utils/auto-update.js";
+import { tokenizeArgs } from "./utils/command.js";
+import { isPackageSource } from "./utils/format.js";
+import { getAutoUpdateConfig, hydrateAutoUpdateConfig } from "./utils/settings.js";
+import { updateExtmgrStatus } from "./utils/status.js";
 
 async function executeExtensionsCommand(
   args: string,

package/src/packages/catalog.ts

@@ -1,11 +1,11 @@
 import {
   DefaultPackageManager,
   getAgentDir,
-  SettingsManager,
   type PackageSource,
   type ProgressEvent,
+  SettingsManager,
 } from "@mariozechner/pi-coding-agent";
-import type { InstalledPackage, Scope } from "../types/index.js";
+import { type InstalledPackage, type Scope } from "../types/index.js";
 import { normalizePackageIdentity, parsePackageNameAndVersion } from "../utils/package-source.js";
 
 type PiScope = "user" | "project";
@@ -57,14 +57,15 @@ function createPackageRecord(
   };
 }
 
-function dedupeInstalledPackages(packages: InstalledPackage[]): InstalledPackage[] {
+function dedupeInstalledPackages(packages: InstalledPackage[], cwd: string): InstalledPackage[] {
   const byIdentity = new Map<string, InstalledPackage>();
 
   for (const pkg of packages) {
-    const identity = normalizePackageIdentity(
-      pkg.source,
-      pkg.resolvedPath ? { resolvedPath: pkg.resolvedPath } : undefined
-    );
+    const baseCwd = pkg.scope === "project" ? cwd : getAgentDir();
+    const identity = normalizePackageIdentity(pkg.source, {
+      ...(pkg.resolvedPath ? { resolvedPath: pkg.resolvedPath } : {}),
+      cwd: baseCwd,
+    });
 
     if (!byIdentity.has(identity)) {
       byIdentity.set(identity, pkg);
@@ -97,7 +98,7 @@ function createDefaultPackageCatalog(cwd: string): PackageCatalog {
 
       const installed = [...projectPackages, ...globalPackages];
       return Promise.resolve(
-        options?.dedupe === false ? installed : dedupeInstalledPackages(installed)
+        options?.dedupe === false ? installed : dedupeInstalledPackages(installed, cwd)
       );
     },
 

package/src/packages/discovery.ts

@@ -3,19 +3,20 @@
  */
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
-import type {
-  ExtensionAPI,
-  ExtensionCommandContext,
-  ExtensionContext,
+import {
+  type ExtensionAPI,
+  type ExtensionCommandContext,
+  type ExtensionContext,
+  getAgentDir,
 } from "@mariozechner/pi-coding-agent";
-import type { InstalledPackage, NpmPackage, SearchCache } from "../types/index.js";
 import { CACHE_TTL, TIMEOUTS } from "../constants.js";
-import { readSummary } from "../utils/fs.js";
+import { type InstalledPackage, type NpmPackage, type SearchCache } from "../types/index.js";
 import { parseNpmSource } from "../utils/format.js";
+import { readSummary } from "../utils/fs.js";
+import { fetchWithTimeout } from "../utils/network.js";
+import { execNpm } from "../utils/npm-exec.js";
 import { normalizePackageIdentity } from "../utils/package-source.js";
 import { getPackageCatalog } from "./catalog.js";
-import { execNpm } from "../utils/npm-exec.js";
-import { fetchWithTimeout } from "../utils/network.js";
 
 const NPM_SEARCH_API = "https://registry.npmjs.org/-/v1/search";
 const NPM_SEARCH_PAGE_SIZE = 250;
@@ -69,13 +70,13 @@ export function isCacheValid(query: string): boolean {
 
 // Import persistent cache
 import {
-  getCachedSearch,
-  setCachedSearch,
   getCachedPackage,
-  setCachedPackage,
-  getPackageDescriptions,
   getCachedPackageSize,
+  getCachedSearch,
+  getPackageDescriptions,
+  setCachedPackage,
   setCachedPackageSize,
+  setCachedSearch,
 } from "../utils/cache.js";
 
 function toNpmPackage(entry: NpmSearchResultObject): NpmPackage | undefined {
@@ -201,11 +202,13 @@ export async function getInstalledPackages(
   return packages;
 }
 
-function getInstalledPackageIdentity(pkg: InstalledPackage): string {
-  return normalizePackageIdentity(
-    pkg.source,
-    pkg.resolvedPath ? { resolvedPath: pkg.resolvedPath } : undefined
-  );
+function getInstalledPackageIdentity(pkg: InstalledPackage, options?: { cwd?: string }): string {
+  const baseCwd = pkg.scope === "project" ? options?.cwd : getAgentDir();
+
+  return normalizePackageIdentity(pkg.source, {
+    ...(pkg.resolvedPath ? { resolvedPath: pkg.resolvedPath } : {}),
+    ...(baseCwd ? { cwd: baseCwd } : {}),
+  });
 }
 
 export async function isSourceInstalled(
@@ -214,10 +217,10 @@ export async function isSourceInstalled(
   options?: { scope?: "global" | "project" }
 ): Promise<boolean> {
   const installed = await getPackageCatalog(ctx.cwd).listInstalledPackages({ dedupe: false });
-  const expected = normalizePackageIdentity(source);
+  const expected = normalizePackageIdentity(source, { cwd: ctx.cwd });
 
   return installed.some((pkg) => {
-    if (getInstalledPackageIdentity(pkg) !== expected) {
+    if (getInstalledPackageIdentity(pkg, { cwd: ctx.cwd }) !== expected) {
       return false;
     }
     return options?.scope ? pkg.scope === options.scope : true;

package/src/packages/extensions.ts

@@ -1,12 +1,17 @@
-import { mkdir, readFile, writeFile, rename, rm, readdir } from "node:fs/promises";
-import type { Dirent } from "node:fs";
+import { execFile } from "node:child_process";
+import { type Dirent } from "node:fs";
+import { mkdir, readdir, readFile, rename, rm, writeFile } from "node:fs/promises";
+import { homedir } from "node:os";
 import { dirname, join, matchesGlob, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
-import { homedir } from "node:os";
-import { execFile } from "node:child_process";
 import { promisify } from "node:util";
 import { getAgentDir } from "@mariozechner/pi-coding-agent";
-import type { InstalledPackage, PackageExtensionEntry, Scope, State } from "../types/index.js";
+import {
+  type InstalledPackage,
+  type PackageExtensionEntry,
+  type Scope,
+  type State,
+} from "../types/index.js";
 import { parseNpmSource } from "../utils/format.js";
 import { fileExists, readSummary } from "../utils/fs.js";
 import { resolveNpmCommand } from "../utils/npm-exec.js";

package/src/packages/install.ts

@@ -1,30 +1,30 @@
 /**
  * Package installation logic
  */
-import { mkdir, rm, writeFile, cp } from "node:fs/promises";
-import { join } from "node:path";
+import { cp, mkdir, rm, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
-import type {
-  ExtensionAPI,
-  ExtensionCommandContext,
-  ProgressEvent,
+import { join } from "node:path";
+import {
+  type ExtensionAPI,
+  type ExtensionCommandContext,
+  type ProgressEvent,
 } from "@mariozechner/pi-coding-agent";
+import { TIMEOUTS } from "../constants.js";
+import { runTaskWithLoader } from "../ui/async-task.js";
 import { normalizePackageSource } from "../utils/format.js";
 import { fileExists } from "../utils/fs.js";
-import { clearSearchCache } from "./discovery.js";
-import { getPackageCatalog } from "./catalog.js";
-import { discoverPackageExtensionEntrypoints, readPackageManifest } from "./extensions.js";
 import { logPackageInstall } from "../utils/history.js";
-import { clearUpdatesAvailable } from "../utils/settings.js";
-import { notify, error as notifyError, success } from "../utils/notify.js";
-import { confirmAction, confirmReload, showProgress } from "../utils/ui-helpers.js";
 import { tryOperation } from "../utils/mode.js";
-import { runTaskWithLoader } from "../ui/async-task.js";
-import { updateExtmgrStatus } from "../utils/status.js";
+import { fetchWithTimeout } from "../utils/network.js";
+import { notify, error as notifyError, success } from "../utils/notify.js";
 import { execNpm } from "../utils/npm-exec.js";
 import { normalizePackageIdentity } from "../utils/package-source.js";
-import { fetchWithTimeout } from "../utils/network.js";
-import { TIMEOUTS } from "../constants.js";
+import { clearUpdatesAvailable } from "../utils/settings.js";
+import { updateExtmgrStatus } from "../utils/status.js";
+import { confirmAction, confirmReload, showProgress } from "../utils/ui-helpers.js";
+import { getPackageCatalog } from "./catalog.js";
+import { clearSearchCache } from "./discovery.js";
+import { discoverPackageExtensionEntrypoints, readPackageManifest } from "./extensions.js";
 
 export type InstallScope = "global" | "project";
 
@@ -171,7 +171,7 @@ export async function installPackage(
 
   // Check if it's a GitHub URL to a .ts file - handle as direct download
   const githubTsMatch = source.match(
-    /^https:\/\/github\.com\/([^\/]+)\/([^\/]+)\/blob\/([^\/]+)\/(.+\.ts)$/
+    /^https:\/\/github\.com\/([^/]+)\/([^/]+)\/blob\/([^/]+)\/(.+\.ts)$/
   );
   const githubInfo = safeExtractGithubMatch(githubTsMatch);
   if (githubInfo) {
@@ -211,6 +211,7 @@ export async function installPackage(
         title: "Install Package",
         message: `Installing ${normalized}...`,
         cancellable: false,
+        fallbackWithoutLoader: true,
       },
       async ({ setMessage }) => {
         await getPackageCatalog(ctx.cwd).install(normalized, scope, (event) => {
@@ -231,7 +232,7 @@ export async function installPackage(
   clearSearchCache();
   logPackageInstall(pi, normalized, normalized, undefined, scope, true);
   success(ctx, `Installed ${normalized} (${scope})`);
-  clearUpdatesAvailable(pi, ctx, [normalizePackageIdentity(normalized)]);
+  clearUpdatesAvailable(pi, ctx, [normalizePackageIdentity(normalized, { cwd: ctx.cwd })]);
 
   const reloaded = await confirmReload(ctx, "Package installed.");
   if (!reloaded) {

package/src/packages/management.ts

@@ -1,33 +1,34 @@
 /**
  * Package management (update, remove)
  */
-import type {
-  ExtensionAPI,
-  ExtensionCommandContext,
-  ProgressEvent,
-} from "@mariozechner/pi-coding-agent";
-import type { InstalledPackage } from "../types/index.js";
 import {
-  getInstalledPackages,
-  getInstalledPackagesAllScopes,
-  clearSearchCache,
-} from "./discovery.js";
-import { getPackageCatalog } from "./catalog.js";
+  type ExtensionAPI,
+  type ExtensionCommandContext,
+  getAgentDir,
+  type ProgressEvent,
+} from "@mariozechner/pi-coding-agent";
+import { UI } from "../constants.js";
+import { type InstalledPackage } from "../types/index.js";
+import { runTaskWithLoader } from "../ui/async-task.js";
 import { formatInstalledPackageLabel } from "../utils/format.js";
+import { logPackageRemove, logPackageUpdate } from "../utils/history.js";
+import { requireUI } from "../utils/mode.js";
+import { notify, error as notifyError, success } from "../utils/notify.js";
 import { normalizePackageIdentity } from "../utils/package-source.js";
-import { logPackageUpdate, logPackageRemove } from "../utils/history.js";
 import { clearUpdatesAvailable } from "../utils/settings.js";
-import { notify, error as notifyError, success } from "../utils/notify.js";
+import { updateExtmgrStatus } from "../utils/status.js";
 import {
   confirmAction,
   confirmReload,
-  showProgress,
   formatListOutput,
+  showProgress,
 } from "../utils/ui-helpers.js";
-import { requireUI } from "../utils/mode.js";
-import { runTaskWithLoader } from "../ui/async-task.js";
-import { updateExtmgrStatus } from "../utils/status.js";
-import { UI } from "../constants.js";
+import { getPackageCatalog } from "./catalog.js";
+import {
+  clearSearchCache,
+  getInstalledPackages,
+  getInstalledPackagesAllScopes,
+} from "./discovery.js";
 
 export interface PackageMutationOutcome {
   reloaded: boolean;
@@ -56,7 +57,7 @@ async function updatePackageInternal(
 ): Promise<PackageMutationOutcome> {
   showProgress(ctx, "Updating", source);
 
-  const updateIdentity = normalizePackageIdentity(source);
+  const updateIdentity = normalizePackageIdentity(source, { cwd: ctx.cwd });
 
   try {
     const updates = await getPackageCatalog(ctx.cwd).checkForAvailableUpdates();
@@ -78,6 +79,7 @@ async function updatePackageInternal(
         title: "Update Package",
         message: `Updating ${source}...`,
         cancellable: false,
+        fallbackWithoutLoader: true,
       },
       async ({ setMessage }) => {
         await getPackageCatalog(ctx.cwd).update(source, (event) => {
@@ -128,6 +130,7 @@ async function updatePackagesInternal(
         title: "Update Packages",
         message: "Updating all packages...",
         cancellable: false,
+        fallbackWithoutLoader: true,
       },
       async ({ setMessage }) => {
         await getPackageCatalog(ctx.cwd).update(undefined, (event) => {
@@ -186,8 +189,31 @@ export async function updatePackagesWithOutcome(
   return updatePackagesInternal(ctx, pi);
 }
 
-function packageIdentity(source: string): string {
-  return normalizePackageIdentity(source);
+function packageIdentity(
+  source: string,
+  options?: { resolvedPath?: string; cwd?: string }
+): string {
+  return normalizePackageIdentity(source, options);
+}
+
+function packageSourceIdentities(source: string, ctx: ExtensionCommandContext): Set<string> {
+  return new Set([
+    packageIdentity(source, { cwd: ctx.cwd }),
+    packageIdentity(source, { cwd: getAgentDir() }),
+  ]);
+}
+
+function installedPackageMatchesSource(
+  pkg: InstalledPackage,
+  identities: Set<string>,
+  ctx: ExtensionCommandContext
+): boolean {
+  return identities.has(
+    packageIdentity(pkg.source, {
+      ...(pkg.resolvedPath ? { resolvedPath: pkg.resolvedPath } : {}),
+      cwd: pkg.scope === "project" ? ctx.cwd : getAgentDir(),
+    })
+  );
 }
 
 async function getInstalledPackagesAllScopesForRemoval(
@@ -244,7 +270,6 @@ function buildRemovalTargets(
         return addTarget("global");
       case "project":
         return addTarget("project");
-      case "cancel":
       default:
         return [];
     }
@@ -285,6 +310,7 @@ async function executeRemovalTargets(
           title: "Remove Package",
           message: `Removing ${target.source}...`,
           cancellable: false,
+          fallbackWithoutLoader: true,
         },
         async ({ setMessage }) => {
           await getPackageCatalog(ctx.cwd).remove(target.source, target.scope, (event) => {
@@ -338,8 +364,8 @@ async function removePackageInternal(
   pi: ExtensionAPI
 ): Promise<PackageMutationOutcome> {
   const installed = await getInstalledPackagesAllScopesForRemoval(ctx);
-  const identity = packageIdentity(source);
-  const matching = installed.filter((p) => packageIdentity(p.source) === identity);
+  const identities = packageSourceIdentities(source, ctx);
+  const matching = installed.filter((pkg) => installedPackageMatchesSource(pkg, identities, ctx));
 
   const hasBothScopes =
     matching.some((pkg) => pkg.scope === "global") &&
@@ -385,13 +411,13 @@ async function removePackageInternal(
     .filter((result) => result.success)
     .map((result) => result.target);
 
-  const remaining = (await getInstalledPackagesAllScopesForRemoval(ctx)).filter(
-    (p) => packageIdentity(p.source) === identity
+  const remaining = (await getInstalledPackagesAllScopesForRemoval(ctx)).filter((pkg) =>
+    installedPackageMatchesSource(pkg, identities, ctx)
   );
   notifyRemovalSummary(source, remaining, failures, ctx);
 
   if (failures.length === 0 && remaining.length === 0) {
-    clearUpdatesAvailable(pi, ctx, [identity]);
+    clearUpdatesAvailable(pi, ctx, identities);
   }
 
   const successfulRemovalCount = successfulTargets.length;

package/src/types/index.ts

@@ -46,25 +46,32 @@ export interface PackageExtensionEntry {
   state: State;
 }
 
-export interface UnifiedItem {
-  type: "local" | "package";
+export interface LocalUnifiedItem {
+  type: "local";
   id: string;
   displayName: string;
   summary: string;
   scope: Scope;
-  // Local extension fields
-  state?: State | undefined;
-  activePath?: string | undefined;
-  disabledPath?: string | undefined;
-  originalState?: State | undefined;
-  // Package fields
-  source?: string | undefined;
+  state: State;
+  activePath: string;
+  disabledPath: string;
+  originalState: State;
+}
+
+export interface PackageUnifiedItem {
+  type: "package";
+  id: string;
+  displayName: string;
+  scope: Scope;
+  source: string;
   version?: string | undefined;
   description?: string | undefined;
   size?: number | undefined; // Package size in bytes
   updateAvailable?: boolean | undefined;
 }
 
+export type UnifiedItem = LocalUnifiedItem | PackageUnifiedItem;
+
 export interface SearchCache {
   query: string;
   results: NpmPackage[];