pi-extmgr 0.1.27 → 0.2.0

package/src/packages/install.ts

@@ -1,30 +1,31 @@
 /**
  * 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 { parseChoiceByLabel } from "../utils/command.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";
 
@@ -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)$/
+    /^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);
@@ -211,6 +198,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) => {
@@ -225,18 +213,38 @@ 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();
   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) {
     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(
@@ -245,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);
@@ -262,7 +270,7 @@ export async function installFromUrl(
   );
   if (!confirmed) {
     notify(ctx, "Installation cancelled.", "info");
-    return;
+    return { installed: false, reloaded: false };
   }
 
   const result = await tryOperation(
@@ -288,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;
@@ -299,6 +307,8 @@ export async function installFromUrl(
   if (!reloaded) {
     void updateExtmgrStatus(ctx, pi);
   }
+
+  return { installed: true, reloaded };
 }
 
 /**
@@ -323,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);
@@ -345,7 +355,7 @@ export async function installPackageLocally(
   );
   if (!confirmed) {
     notify(ctx, "Installation cancelled.", "info");
-    return;
+    return { installed: false, reloaded: false };
   }
 
   const result = await tryOperation(
@@ -383,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;
 
@@ -400,7 +410,7 @@ export async function installPackageLocally(
       tarAvailability.error
     );
     void updateExtmgrStatus(ctx, pi);
-    return;
+    return { installed: false, reloaded: false };
   }
 
   // Download and extract
@@ -438,7 +448,7 @@ export async function installPackageLocally(
       "Download failed"
     );
     void updateExtmgrStatus(ctx, pi);
-    return;
+    return { installed: false, reloaded: false };
   }
   const { tarballPath } = extractResult;
 
@@ -495,7 +505,7 @@ export async function installPackageLocally(
       "Extraction failed"
     );
     void updateExtmgrStatus(ctx, pi);
-    return;
+    return { installed: false, reloaded: false };
   }
 
   // Copy to extensions dir
@@ -526,7 +536,7 @@ export async function installPackageLocally(
       "Failed to copy extension"
     );
     void updateExtmgrStatus(ctx, pi);
-    return;
+    return { installed: false, reloaded: false };
   }
 
   clearSearchCache();
@@ -537,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

@@ -1,49 +1,47 @@
 /**
  * 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 { parseChoiceByLabel } from "../utils/command.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;
 }
 
-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;
@@ -56,7 +54,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();
@@ -69,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(
@@ -78,6 +76,7 @@ async function updatePackageInternal(
         title: "Update Package",
         message: `Updating ${source}...`,
         cancellable: false,
+        fallbackWithoutLoader: true,
       },
       async ({ setMessage }) => {
         await getPackageCatalog(ctx.cwd).update(source, (event) => {
@@ -92,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);
@@ -103,7 +102,7 @@ async function updatePackageInternal(
   if (!reloaded) {
     void updateExtmgrStatus(ctx, pi);
   }
-  return packageMutationOutcome({ reloaded });
+  return { reloaded };
 }
 
 async function updatePackagesInternal(
@@ -119,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(
@@ -128,6 +127,7 @@ async function updatePackagesInternal(
         title: "Update Packages",
         message: "Updating all packages...",
         cancellable: false,
+        fallbackWithoutLoader: true,
       },
       async ({ setMessage }) => {
         await getPackageCatalog(ctx.cwd).update(undefined, (event) => {
@@ -142,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);
@@ -153,7 +153,7 @@ async function updatePackagesInternal(
   if (!reloaded) {
     void updateExtmgrStatus(ctx, pi);
   }
-  return packageMutationOutcome({ reloaded });
+  return { reloaded };
 }
 
 export async function updatePackage(
@@ -186,8 +186,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(
@@ -204,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(
@@ -244,7 +257,6 @@ function buildRemovalTargets(
         return addTarget("global");
       case "project":
         return addTarget("project");
-      case "cancel":
       default:
         return [];
     }
@@ -285,6 +297,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 +351,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") &&
@@ -348,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(
@@ -370,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);
@@ -385,20 +398,20 @@ 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;
 
   if (successfulRemovalCount === 0) {
     void updateExtmgrStatus(ctx, pi);
-    return NO_PACKAGE_MUTATION_OUTCOME;
+    return { reloaded: false };
   }
 
   const reloaded = await confirmReload(ctx, "Removal complete.");
@@ -406,7 +419,7 @@ async function removePackageInternal(
     void updateExtmgrStatus(ctx, pi);
   }
 
-  return packageMutationOutcome({ reloaded });
+  return { reloaded };
 }
 
 export async function removePackage(