agents-inc 0.170.1 → 0.170.2

package/dist/commands/uninstall.js

@@ -1,36 +1,35 @@
 #!/usr/bin/env node
 import {
   RemovalPlanConfirm
-} from "../chunk-USVBYQSQ.js";
+} from "../chunk-O4LN3HFI.js";
 import {
   promptConfirm
-} from "../chunk-4AAOOAIN.js";
+} from "../chunk-P6CYS4JK.js";
 import "../chunk-OZXAJNLA.js";
 import {
   lazyGateDeps,
   mutateGlobal,
   propagateGlobalRemoval
-} from "../chunk-7RDMTR64.js";
-import "../chunk-F2BHT5C4.js";
+} from "../chunk-66AEVERM.js";
+import "../chunk-IWY5IR4F.js";
 import {
   loadAgentDefs
-} from "../chunk-HED2DAXZ.js";
-import "../chunk-3G7X2WKI.js";
+} from "../chunk-THO7LO5B.js";
+import "../chunk-5BNX73OU.js";
 import {
   listAgentFilesOf,
   splitAgentsByProvenance
-} from "../chunk-BMRUNMPV.js";
-import "../chunk-JFLVEFFP.js";
+} from "../chunk-2YA4DDRM.js";
+import "../chunk-KIK5EZYD.js";
 import {
   providerFlag,
   providerNamedBy,
   refuseAnAmbiguousInstallation
-} from "../chunk-RIPSGNLU.js";
+} from "../chunk-OCAVW6N5.js";
 import {
   BaseCommand,
   EXIT_CODES
-} from "../chunk-V3KTSP3Q.js";
-import "../chunk-CLPUWOSA.js";
+} from "../chunk-GEMW5RQ2.js";
 import {
   ConfigLoadError,
   INFO_MESSAGES,
@@ -52,6 +51,7 @@ import {
   localSkillsRemoval,
   notInstalledHere,
   parseMarketplacePluginRef,
+  pluginLeftRegistered,
   providerInUse,
   readForkedFromMetadata,
   registeredProjectUpdateSkipped,
@@ -64,20 +64,23 @@ import {
   sourceRootOf,
   uninstallConfigUnreadable,
   uninstallNeedsTerminal,
+  uninstallSkillMetadataUnreadable,
   unmarkedAgentsKept
-} from "../chunk-MQ6CGZNJ.js";
-import "../chunk-52HDHJ7I.js";
+} from "../chunk-GAKVZNTX.js";
+import {
+  plural
+} from "../chunk-AUNRHWH4.js";
 import {
   CLAUDE_DIR,
   DEFAULT_BRANDING,
   EJECT_SOURCE,
   STANDARD_FILES
-} from "../chunk-PJWGTNOX.js";
-import "../chunk-NQW25DCF.js";
+} from "../chunk-7C3PFRBU.js";
+import "../chunk-GHHJYNAN.js";
 
 // src/cli/commands/uninstall.tsx
 import "react";
-import { partition } from "remeda";
+import { unique } from "remeda";
 import path from "path";
 import { Flags } from "@oclif/core";
 import { jsx } from "react/jsx-runtime";
@@ -101,18 +104,18 @@ function pluginsEntry(target) {
   return [{ kind: "plugins", pluginsDir: target.pluginsDir, names: [...target.cliPluginNames] }];
 }
 function localSkillsEntry(target) {
-  if (!target.hasLocalSkills) return [];
-  return [{ kind: "skills", skillsDir: target.skillsDir }];
+  if (target.cliSkills.length === 0) return [];
+  return [{ kind: "skills", skillsDir: target.skillsDir, skillNames: [...target.cliSkills] }];
 }
 function compiledAgentsEntry(target) {
-  if (!target.hasLocalAgents) return [];
   const agentNames = identifiableAgents(target);
   if (agentNames.length === 0) return [];
   return [{ kind: "agents", agentsDir: target.agentsDir, agentNames, codec: target.agentCodec }];
 }
 function identifiableAgents(target) {
-  if (target.configuredAgents.length > 0) return target.configuredAgents;
-  return target.markedAgents;
+  const agentFiles = /* @__PURE__ */ new Set([...target.markedAgents, ...target.unmarkedAgents]);
+  const configuredWithAFile = target.configuredAgents.filter((name) => agentFiles.has(name));
+  return unique([...configuredWithAFile, ...target.markedAgents]);
 }
 function configManifestEntries(target) {
   const { dir, manifestFiles } = target.sourceFolder;
@@ -180,17 +183,7 @@ function sectionWithItems(label, items) {
 }
 var UNINSTALL_CONFIRM_MESSAGE = "Are you sure you want to uninstall?";
 var Uninstall = class _Uninstall extends BaseCommand {
-  /**
-   * The name this run prints itself under, resolved once in {@link run} because three separate
-   * lines carry it: the heading, the sign-off, and the warning naming the tool a preserved
-   * directory was not created by. The last of those sits three calls below the resolution, and
-   * threading a display string through `executeUninstall` -> `removeLocalFiles` ->
-   * `removePlannedSkills` would widen three signatures to deliver one word.
-   *
-   * A plain `string` holding the shipped default rather than an optional every reader would have
-   * to answer for. `run` replaces it before the first line is printed, so what a user sees is
-   * always what their configuration says.
-   */
+  /** Replaced in `run` before anything prints. */
   brandingName = DEFAULT_BRANDING.NAME;
   static summary = `Remove ${DEFAULT_BRANDING.NAME} from this project`;
   static description = `Uninstall ${DEFAULT_BRANDING.NAME} from this project. Removes CLI-managed skills (matched by marketplace), compiled agents, plugins, and the config manifest (config.ts + config-types.ts) this project keeps. User-created content is preserved.`;
@@ -206,38 +199,32 @@ var Uninstall = class _Uninstall extends BaseCommand {
     }),
     provider: providerFlag()
   };
-  /**
-   * Starts at any terminal size: a plan and a one-line confirm fit any terminal, and this command
-   * is the way out of every state, so a small window must not hold up an uninstall.
-   */
   async ensureTerminalSize() {
   }
   async run() {
     const { flags } = await this.parse(_Uninstall);
     const projectDir = process.cwd();
+    const namedProvider = providerNamedBy(flags.provider);
     await refuseAnAmbiguousInstallation(
       projectDir,
       "uninstall",
-      providerNamedBy(flags.provider),
+      namedProvider,
       (message) => this.error(message, { exit: EXIT_CODES.INVALID_ARGS })
     );
     this.brandingName = await this.resolveBrandingName(projectDir);
     this.printHeader();
-    const target = await detectUninstallTarget(
-      projectDir,
-      (failure) => this.warn(uninstallConfigUnreadable(failure))
-    );
+    const target = await detectUninstallTarget(projectDir, {
+      onConfigLoadFailed: (failure) => this.warn(uninstallConfigUnreadable(failure)),
+      // Aborts: guessing would either remove the user's skill or keep this CLI's.
+      onSkillMetadataUnreadable: (metadataPath) => this.error(uninstallSkillMetadataUnreadable(metadataPath), { exit: EXIT_CODES.ERROR })
+    });
     const plan = buildRemovalPlan(target);
     if (!hasAnythingToRemove(plan)) {
       this.reportNothingToUninstall();
       return;
     }
-    const confirmed = flags.yes ? this.printRemovalPlan(plan) : await this.confirmRemoval(plan);
-    if (!confirmed) {
-      this.log("");
-      this.log("Uninstall cancelled");
-      this.exit(EXIT_CODES.CANCELLED);
-    }
+    const approved = await this.removalApproved(plan, flags.yes, namedProvider);
+    if (!approved) this.cancelUninstall();
     await this.executeUninstall(plan, target, projectDir);
     this.reportSuccess();
   }
@@ -253,6 +240,16 @@ var Uninstall = class _Uninstall extends BaseCommand {
     this.log("");
     this.log(INFO_MESSAGES.NO_CHANGES_MADE);
   }
+  async removalApproved(plan, skipConfirmation, namedProvider) {
+    if (!skipConfirmation) return this.confirmRemoval(plan, namedProvider);
+    this.printRemovalPlan(plan);
+    return true;
+  }
+  cancelUninstall() {
+    this.log("");
+    this.log("Uninstall cancelled");
+    this.exit(EXIT_CODES.CANCELLED);
+  }
   printRemovalPlan(plan) {
     this.log(UNINSTALL_PLAN.PREVIEW_HEADING);
     this.log("");
@@ -267,11 +264,10 @@ var Uninstall = class _Uninstall extends BaseCommand {
       this.log(statement);
     }
     this.log("");
-    return true;
   }
-  async confirmRemoval(plan) {
+  async confirmRemoval(plan, namedProvider) {
     if (!process.stdin.isTTY) {
-      this.error(uninstallNeedsTerminal(), { exit: EXIT_CODES.ERROR });
+      this.error(uninstallNeedsTerminal(namedProvider), { exit: EXIT_CODES.ERROR });
     }
     const outcome = await promptConfirm(({ onConfirm, onCancel }) => /* @__PURE__ */ jsx(
       RemovalPlanConfirm,
@@ -290,20 +286,15 @@ var Uninstall = class _Uninstall extends BaseCommand {
     const isGlobalUninstall = isHomeDirectory(projectDir);
     const propagation = isGlobalUninstall ? await this.prepareGlobalPropagation(target, projectDir) : null;
     await this.removePlannedPlugins(planEntry(plan, "plugins"), target.config, projectDir);
-    try {
-      await this.removeLocalFiles(plan, target);
-    } catch (error) {
-      this.log("Failed to remove local files");
-      this.error(getErrorMessage(error), {
-        exit: EXIT_CODES.ERROR
-      });
-    }
-    if (isGlobalUninstall) {
-      if (propagation) {
-        await this.updateRegisteredProjects(propagation);
-      }
+    await this.removeLocalFilesOrFail(plan, target);
+    if (!isGlobalUninstall) {
+      await this.deregisterProject(projectDir);
       return;
     }
+    if (propagation) await this.updateRegisteredProjects(propagation);
+  }
+  /** Degrades: a missing or corrupt global config must never fail the uninstall. */
+  async deregisterProject(projectDir) {
     try {
       await mutateGlobal({ kind: "deregister-project", projectDir }, lazyGateDeps(projectDir));
     } catch (error) {
@@ -311,25 +302,8 @@ var Uninstall = class _Uninstall extends BaseCommand {
     }
   }
   /**
-   * Loads what updating registered projects needs (global config with its
-   * projects[] registry, skills matrix, agent definitions) BEFORE the global
-   * the config manifest is deleted — source resolution reads that config.
-   * Returns null when nothing is registered or loading fails; a load failure
-   * warns and never aborts the uninstall.
-   *
-   * `skipExtraSources: true` is NOT a divergence from a full multi-source
-   * load: extra-source loading only annotates each skill's
-   * `availableSources`/`activeSource` — it never adds
-   * skills or categories to the matrix, and the config-types writer never reads
-   * those annotations, so the regenerated project types are byte-identical
-   * either way (pinned by the skipExtraSources parity test in
-   * local-installer.test.ts). Skipping avoids fetching every registered extra
-   * source (network on a cold cache, plus unreachable-remote warnings) during
-   * an uninstall that must never hang or noise-fail on remote state.
-   *
-   * `purpose: "upkeep"` because the prune only rewrites projects that are already installed: a
-   * marketplace that has since lost its manifest must not leave every registered project naming
-   * the global content this uninstall deletes.
+   * A load failure warns and never aborts. `skipExtraSources` cannot change the output (extra
+   * sources only annotate skills) and keeps the uninstall off the network.
    */
   async prepareGlobalPropagation(target, projectDir) {
     if (target.config === null || target.registeredProjects.length === 0) return null;
@@ -355,14 +329,7 @@ var Uninstall = class _Uninstall extends BaseCommand {
       return null;
     }
   }
-  /**
-   * Prunes the inlined global-scoped config entries from every registered
-   * project and regenerates its config-types.ts. Runs AFTER the global manifest
-   * removal so the regenerated project types fall back to the standalone form
-   * instead of importing from the deleted global config-types.ts. Best-effort:
-   * unreachable projects are warned and skipped, and no failure here may abort
-   * the uninstall.
-   */
+  /** Runs after the global manifest is gone, so regenerated types use the standalone form. */
   async updateRegisteredProjects(propagation) {
     try {
       const report = await propagateGlobalRemoval(
@@ -370,18 +337,21 @@ var Uninstall = class _Uninstall extends BaseCommand {
         { matrix: propagation.matrix, agents: propagation.agents },
         propagation.provider
       );
-      const { updated, unreadable, failed } = report.propagated;
-      this.reportProjectsOutOfReach(report.propagated);
-      for (const skippedPath of [...unreadable, ...failed]) {
-        this.warn(registeredProjectUpdateSkipped(skippedPath));
-      }
-      if (updated.length === 0) return;
-      this.logSuccess(registeredProjectsUpdated(updated.length));
-      this.reportPropagatedRecompile(report);
+      this.reportRegisteredProjectsUpdate(report);
     } catch (error) {
       this.warn(registeredProjectsUpdateFailed(getErrorMessage(error)));
     }
   }
+  reportRegisteredProjectsUpdate(report) {
+    const { updated, unreadable, failed } = report.propagated;
+    this.reportProjectsOutOfReach(report.propagated);
+    for (const skippedPath of [...unreadable, ...failed]) {
+      this.warn(registeredProjectUpdateSkipped(skippedPath));
+    }
+    if (updated.length === 0) return;
+    this.logSuccess(registeredProjectsUpdated(updated.length));
+    this.reportPropagatedRecompile(report);
+  }
   reportSuccess() {
     this.log("");
     this.log(`${this.brandingName} has been uninstalled.`);
@@ -389,10 +359,16 @@ var Uninstall = class _Uninstall extends BaseCommand {
     this.logSuccess(SUCCESS_MESSAGES.UNINSTALL_COMPLETE);
     this.log("");
   }
-  /**
-   * Each step acts only when the plan carries its entry, so what the user was shown and
-   * what this run removes are the same list read twice.
-   */
+  async removeLocalFilesOrFail(plan, target) {
+    try {
+      await this.removeLocalFiles(plan, target);
+    } catch (error) {
+      this.log("Failed to remove local files");
+      this.error(getErrorMessage(error), {
+        exit: EXIT_CODES.ERROR
+      });
+    }
+  }
   async removeLocalFiles(plan, target) {
     await this.removePlannedSkills(planEntry(plan, "skills"));
     await this.removePlannedAgents(planEntry(plan, "agents"));
@@ -401,14 +377,9 @@ var Uninstall = class _Uninstall extends BaseCommand {
     }
     const cleanup = await cleanupEmptyDirs(target, planEntries(plan, "config"));
     this.reportSourceFolderCleanup(cleanup.sourceFolder);
-    this.reportSourceRootCleanup(target.sourceRoot, cleanup);
-    if (cleanup.claudeDirRemoved) {
-      this.logSuccess(`Removed ${CLAUDE_DIR}/`);
-    } else if (cleanup.claudeDirKept) {
-      this.log(`Kept ${CLAUDE_DIR}/ (contains user content)`);
-    }
+    this.reportDirCleanup(target.sourceRoot.relName, cleanup.sourceRoot);
+    this.reportDirCleanup(CLAUDE_DIR, cleanup.claudeDir);
   }
-  /** What became of one source folder: gone, emptied of the CLI's files, or kept for the user's. */
   reportSourceFolderCleanup(folder) {
     if (folder.dirRemoved) {
       this.logSuccess(`Removed ${folder.relName}/`);
@@ -418,30 +389,25 @@ var Uninstall = class _Uninstall extends BaseCommand {
       this.log(`Kept ${folder.relName}/ (contains user content)`);
     }
   }
-  /** What became of the `.agents-inc/` parent, said out loud in both directions. */
-  reportSourceRootCleanup(sourceRoot, cleanup) {
-    if (cleanup.sourceRootRemoved) {
-      this.logSuccess(`Removed ${sourceRoot.relName}/`);
+  reportDirCleanup(relName, cleanup) {
+    if (cleanup.removed) {
+      this.logSuccess(`Removed ${relName}/`);
       return;
     }
-    if (cleanup.sourceRootKept) {
-      this.log(`Kept ${sourceRoot.relName}/ (contains user content)`);
+    if (cleanup.kept) {
+      this.log(`Kept ${relName}/ (contains user content)`);
     }
   }
   async removePlannedPlugins(entry, config, projectDir) {
     if (!entry) return;
     this.log("Uninstalling plugins...");
     try {
-      const pluginResult = await uninstallPlugins(
-        entry,
-        config,
-        projectDir,
-        (name) => this.log(`  Uninstalled plugin '${name}'`)
-      );
+      const pluginResult = await uninstallPlugins(entry, config, projectDir, {
+        onUninstalled: (name) => this.log(`  Uninstalled plugin '${name}'`),
+        onLeftRegistered: (name, provider) => this.warn(pluginLeftRegistered(name, provider))
+      });
       if (pluginResult.totalUninstalled > 0) {
-        this.logSuccess(
-          `Uninstalled ${pluginResult.totalUninstalled} ${pluginResult.totalUninstalled === 1 ? "plugin" : "plugins"}`
-        );
+        this.logSuccess(`Uninstalled ${plural(pluginResult.totalUninstalled, "plugin")}`);
       }
     } catch (error) {
       this.log("Plugin uninstall failed");
@@ -452,26 +418,21 @@ var Uninstall = class _Uninstall extends BaseCommand {
   }
   async removePlannedSkills(entry) {
     if (!entry) return;
-    const result = await removeMatchingSkills(
+    const removedNames = await removeMatchingSkills(
       entry,
-      (dirName) => this.log(`  Uninstalled skill '${dirName}'`),
-      (dirName) => this.warn(`Skipping '${dirName}': not created by ${this.brandingName} CLI`)
-    );
-    if (result.removedCount === 0) return;
-    this.logSuccess(
-      `Removed ${result.removedCount} CLI-installed ${result.removedCount === 1 ? "skill" : "skills"}`
+      (dirName) => this.log(`  Uninstalled skill '${dirName}'`)
     );
+    if (removedNames.length === 0) return;
+    this.logSuccess(`Removed ${plural(removedNames.length, "CLI-installed skill")}`);
   }
   async removePlannedAgents(entry) {
     if (!entry) return;
-    const result = await removeMatchingAgents(
+    const removedNames = await removeMatchingAgents(
       entry,
       (agentName) => this.log(`  Uninstalled agent '${agentName}'`)
     );
-    if (result.removedCount === 0) return;
-    this.logSuccess(
-      `Removed ${result.removedCount} compiled ${result.removedCount === 1 ? "agent" : "agents"}`
-    );
+    if (removedNames.length === 0) return;
+    this.logSuccess(`Removed ${plural(removedNames.length, "compiled agent")}`);
   }
 };
 function collectConfiguredAgents(config) {
@@ -481,15 +442,14 @@ function collectConfiguredAgents(config) {
 function getCliInstalledPluginKeys(config) {
   if (!config?.skills) return /* @__PURE__ */ new Set();
   const { marketplaceName } = config;
-  return new Set(
-    config.skills.flatMap((skill) => [
-      // Primary key: skill.id@skill.origin
-      buildMarketplacePluginRef(skill.id, skill.origin),
-      // Marketplace variant for plugins installed via marketplace where
-      // skill.origin may differ (e.g., "eject" vs the marketplace name)
-      ...marketplaceName && skill.origin !== marketplaceName && skill.origin !== EJECT_SOURCE ? [buildMarketplacePluginRef(skill.id, marketplaceName)] : []
-    ])
-  );
+  return new Set(config.skills.flatMap((skill) => pluginRefsOf(skill, marketplaceName)));
+}
+function pluginRefsOf(skill, marketplaceName) {
+  const ownRef = buildMarketplacePluginRef(skill.id, skill.origin);
+  if (!marketplaceName || skill.origin === marketplaceName || skill.origin === EJECT_SOURCE) {
+    return [ownRef];
+  }
+  return [ownRef, buildMarketplacePluginRef(skill.id, marketplaceName)];
 }
 async function loadUninstallConfig(configPath, projectDir, provider, onLoadFailed) {
   try {
@@ -527,39 +487,30 @@ function activeConfigOf(config) {
     agents: config.agents.filter((a) => !a.excluded)
   };
 }
-async function detectUninstallTarget(projectDir, onConfigLoadFailed) {
+async function detectUninstallTarget(projectDir, handlers) {
   const pluginsDir = getProjectPluginsDir(projectDir);
   const { skillsDir, agentsDir } = resolveInstallPaths(projectDir);
   const claudeDir = path.join(projectDir, CLAUDE_DIR);
   const provider = providerInUse(projectDir);
-  const [hasLocalSkills, hasLocalAgents, hasClaudeDir, sourceFolder, agentProvenance] = await Promise.all([
-    directoryExists(skillsDir),
-    directoryExists(agentsDir),
+  const codec = agentCodec(provider);
+  const [cliSkills, hasClaudeDir, sourceFolder, agentProvenance] = await Promise.all([
+    skillsThisCliInstalled(skillsDir, handlers.onSkillMetadataUnreadable),
     directoryExists(claudeDir),
     readSourceFolder(
       sourceFolderInUse(projectDir, provider),
       projectDir,
       provider,
-      onConfigLoadFailed
+      handlers.onConfigLoadFailed
     ),
-    splitAgentsByProvenance(agentsDir, agentCodec(provider))
+    splitAgentsByProvenance(agentsDir, codec)
   ]);
   const { config } = sourceFolder;
-  let pluginNames = [];
-  try {
-    pluginNames = await listPluginNames(projectDir);
-  } catch {
-  }
   const activeConfig = config === null ? null : activeConfigOf(config);
-  const configuredAgents = collectConfiguredAgents(activeConfig);
-  const cliInstalledKeys = getCliInstalledPluginKeys(activeConfig);
-  const cliPluginNames = thisRunOwnsAnyPlugin(projectDir) ? pluginNames.filter((name) => cliInstalledKeys.has(name)) : [];
+  const cliPluginNames = await pluginsThisRunRemoves(projectDir, activeConfig);
   return {
     hasPlugins: cliPluginNames.length > 0,
-    pluginNames,
     cliPluginNames,
-    hasLocalSkills,
-    hasLocalAgents,
+    cliSkills,
     hasClaudeDir,
     pluginsDir,
     skillsDir,
@@ -569,71 +520,57 @@ async function detectUninstallTarget(projectDir, onConfigLoadFailed) {
     sourceRoot: sourceRootOf(projectDir),
     config,
     registeredProjects: config?.projects ?? [],
-    configuredAgents,
-    agentCodec: agentCodec(provider),
+    configuredAgents: collectConfiguredAgents(activeConfig),
+    agentCodec: codec,
     markedAgents: agentProvenance.marked,
     unmarkedAgents: agentProvenance.unmarked
   };
 }
+async function pluginsThisRunRemoves(projectDir, activeConfig) {
+  const installed = await listPluginNames(projectDir);
+  if (!thisRunOwnsAnyPlugin(projectDir)) return [];
+  const cliInstalledKeys = getCliInstalledPluginKeys(activeConfig);
+  return installed.filter((name) => cliInstalledKeys.has(name));
+}
 function thisRunOwnsAnyPlugin(projectDir) {
   if (isHomeDirectory(projectDir)) return true;
   return hostAt(projectDir).installsProjectScopedPlugins;
 }
-function shouldRemoveSkill(forkedFrom) {
-  return forkedFrom !== null;
-}
-async function removeMatchingSkills(entry, onRemoved, onSkipped) {
-  const classified = await classifySkillDirs(entry.skillsDir);
-  const removedNames = await removeClassifiedSkills(
-    classified.toRemove,
-    entry.skillsDir,
-    onRemoved
-  );
-  classified.toSkip.forEach((name) => onSkipped?.(name));
-  const dirCleaned = await cleanupSkillsDir(entry.skillsDir, classified.toSkip.length === 0);
-  return {
-    removedCount: removedNames.length,
-    skippedCount: classified.toSkip.length,
-    removedNames,
-    skippedNames: classified.toSkip,
-    dirCleaned
-  };
-}
-async function classifySkillDirs(skillsDir) {
+async function skillsThisCliInstalled(skillsDir, onMetadataUnreadable) {
   const dirNames = await listDirectories(skillsDir);
-  const entries = await Promise.all(
+  const skills = await Promise.all(
     dirNames.map(async (name) => ({
       name,
-      forkedFrom: await readForkedFromMetadata(path.join(skillsDir, name))
+      forkedFrom: await readSkillProvenance(skillsDir, name, onMetadataUnreadable)
     }))
   );
-  const [removable, skippable] = partition(entries, (entry) => shouldRemoveSkill(entry.forkedFrom));
-  return { toRemove: removable.map((e) => e.name), toSkip: skippable.map((e) => e.name) };
+  return skills.filter((skill) => skill.forkedFrom !== null).map((skill) => skill.name);
 }
-async function removeClassifiedSkills(names, skillsDir, onRemoved) {
-  for (const name of names) {
-    await remove(path.join(skillsDir, name));
-    onRemoved?.(name);
+async function readSkillProvenance(skillsDir, dirName, onUnreadable) {
+  const skillDir = path.join(skillsDir, dirName);
+  try {
+    return await readForkedFromMetadata(skillDir);
+  } catch {
+    return onUnreadable(path.join(skillDir, STANDARD_FILES.METADATA_YAML));
   }
-  return names;
 }
-async function cleanupSkillsDir(dir, allRemoved) {
-  if (!allRemoved) return false;
-  return removeDirIfEmpty(dir);
+async function removeMatchingSkills(entry, onRemoved) {
+  const present = await listDirectories(entry.skillsDir);
+  const removedNames = present.filter((name) => entry.skillNames.includes(name));
+  for (const name of removedNames) {
+    await remove(path.join(entry.skillsDir, name));
+    onRemoved(name);
+  }
+  return removedNames;
 }
 async function removeMatchingAgents(entry, onRemoved) {
   const agentFiles = await listAgentFiles(entry.agentsDir, entry.codec);
   const removedNames = agentFiles.map((agentFile) => path.basename(agentFile, entry.codec.extension)).filter((agentName) => entry.agentNames.includes(agentName));
   for (const agentName of removedNames) {
     await remove(path.join(entry.agentsDir, `${agentName}${entry.codec.extension}`));
-    onRemoved?.(agentName);
+    onRemoved(agentName);
   }
-  const dirCleaned = await removeDirIfEmpty(entry.agentsDir);
-  return {
-    removedCount: removedNames.length,
-    removedNames,
-    dirCleaned
-  };
+  return removedNames;
 }
 var SCOPE_OF_AN_UNRECORDED_SKILL = "project";
 function pluginScopesToSweep(host, primary) {
@@ -652,10 +589,13 @@ async function removePluginWhereverItIsFiled(host, pluginRef, primaryScope, proj
   }
   return outcome;
 }
-async function uninstallPlugins(entry, config, projectDir, onUninstalled) {
+async function uninstallPlugins(entry, config, projectDir, { onUninstalled, onLeftRegistered } = {}) {
   const host = hostAt(projectDir);
   const hostAvailable = await host.isAvailable();
   const observed = [];
+  if (!hostAvailable) {
+    for (const pluginName of entry.names) onLeftRegistered?.(pluginName, host.provider);
+  }
   for (const pluginName of entry.names) {
     const removal = hostAvailable ? await removePluginWhereverItIsFiled(
       host,
@@ -669,10 +609,7 @@ async function uninstallPlugins(entry, config, projectDir, onUninstalled) {
       onUninstalled?.(pluginName);
     }
   }
-  return {
-    uninstalledNames: observed,
-    totalUninstalled: observed.length
-  };
+  return { totalUninstalled: observed.length };
 }
 function scopeThePluginIsFiledUnder(config, pluginName) {
   const skillId = parseMarketplacePluginRef(pluginName);
@@ -689,20 +626,15 @@ async function removeConfigManifest(entry) {
   return { manifestRemoved: true, dirRemoved: await removeDirIfEmpty(entry.sourceDir) };
 }
 async function cleanupEmptyDirs(target, manifestEntries) {
+  await removeDirIfEmpty(target.skillsDir);
+  await removeDirIfEmpty(target.agentsDir);
   const sourceFolder = await cleanupSourceFolder(
     target.sourceFolder,
     manifestEntries.find((entry) => entry.sourceDir === target.sourceFolder.dir)
   );
   const sourceRoot = await cleanupSourceRoot(target.sourceRoot, sourceFolder.dirRemoved);
-  const claudeDirRemoved = target.hasClaudeDir && await removeDirIfEmpty(target.claudeDir);
-  const claudeDirKept = !claudeDirRemoved && target.hasClaudeDir && await directoryExists(target.claudeDir);
-  return {
-    claudeDirRemoved,
-    sourceFolder,
-    sourceRootRemoved: sourceRoot.removed,
-    sourceRootKept: sourceRoot.kept,
-    claudeDirKept
-  };
+  const claudeDir = await cleanupClaudeDir(target);
+  return { sourceFolder, sourceRoot, claudeDir };
 }
 async function cleanupSourceFolder(folder, entry) {
   const manifest = await removeConfigManifest(entry);
@@ -717,8 +649,15 @@ async function cleanupSourceFolder(folder, entry) {
 }
 async function cleanupSourceRoot(sourceRoot, providerDirRemoved) {
   if (!providerDirRemoved) return { removed: false, kept: false };
-  const removed = await removeDirIfEmpty(sourceRoot.dir);
-  return { removed, kept: !removed && await directoryExists(sourceRoot.dir) };
+  return removeDirUnlessUserContent(sourceRoot.dir);
+}
+async function cleanupClaudeDir(target) {
+  if (!target.hasClaudeDir) return { removed: false, kept: false };
+  return removeDirUnlessUserContent(target.claudeDir);
+}
+async function removeDirUnlessUserContent(dir) {
+  const removed = await removeDirIfEmpty(dir);
+  return { removed, kept: !removed && await directoryExists(dir) };
 }
 async function listAgentFiles(agentsDir, codec) {
   try {
@@ -728,8 +667,6 @@ async function listAgentFiles(agentsDir, codec) {
   }
 }
 export {
-  Uninstall as default,
-  getCliInstalledPluginKeys,
-  uninstallPlugins
+  Uninstall as default
 };
 //# sourceMappingURL=uninstall.js.map