fix(plugin-uninstall): prevent orphaned skill dirs with conflicting plugin names

When uninstalling a plugin whose name is a prefix of another (e.g., my-plugin
when my-plugin-extra exists), the previous fix used exact matching only
(entry.name === flattenedPrefix), which never matched actual skill directories
since skills always have suffixes (aipm-marketplace-plugin-skill1).

This caused all skill directories to remain orphaned instead of being deleted.

The fix reads the plugin's actual skills directory and builds the exact list
of flattened skill names to delete when conflicts exist, ensuring precise
cleanup without false positives.

Author: yordis

src/commands/plugin-uninstall.ts

@@ -147,6 +147,77 @@ export async function pluginUninstall(options: unknown): Promise<void> {
                 }
               }
             }
+
+            // Remove flattened skill directories for this plugin
+            // Pattern: .cursor/skills/aipm-<marketplace>-<plugin>[-subskill]
+            // Must avoid prefix collisions when plugin names are prefixes of others
+            // (e.g., "my-plugin" shouldn't match "my-plugin-extra")
+            const skillsDir = join(cwd, DIR_CURSOR, DIR_SKILLS);
+            try {
+              const entries = await readdir(skillsDir, { withFileTypes: true });
+              const flattenedPrefix = `aipm-${marketplaceName.replace(/\//g, '-')}-${pluginName}`;
+
+              // Check for conflicting plugin names in this marketplace
+              const otherPluginsInMarketplace = Object.keys(config.plugins).filter(
+                (id) => id.endsWith(`@${marketplaceName}`) && id !== cmd.pluginId,
+              );
+
+              const hasConflictingNames = otherPluginsInMarketplace.some((id) => {
+                const otherPluginName = id.substring(0, id.lastIndexOf('@'));
+                return otherPluginName.startsWith(pluginName) && otherPluginName !== pluginName;
+              });
+
+              // When conflicts exist, we need exact skill information to avoid false positives
+              // Read the plugin's skills directory to get the exact list
+              const skillsToDelete = new Set<string>();
+
+              if (hasConflictingNames && pluginPath) {
+                // Load exact skill information from plugin directory
+                const skillsSourcePath = join(pluginPath, 'skills');
+                try {
+                  const skillEntries = await readdir(skillsSourcePath, { withFileTypes: true });
+                  for (const skillEntry of skillEntries) {
+                    if (skillEntry.isDirectory()) {
+                      // Reconstruct the exact flattened name for this skill
+                      const flatSkillName = `${flattenedPrefix}-${skillEntry.name}`;
+                      skillsToDelete.add(flatSkillName);
+                    }
+                  }
+                } catch {
+                  // No skills directory - plugin has no skills
+                }
+              }
+
+              for (const entry of entries) {
+                if (!entry.isDirectory()) continue;
+
+                let shouldDelete = false;
+
+                if (hasConflictingNames) {
+                  // With conflicts, only delete skills we explicitly found in the plugin directory
+                  shouldDelete = skillsToDelete.has(entry.name);
+                } else {
+                  // No conflicts - safe to use prefix matching
+                  shouldDelete = entry.name === flattenedPrefix || entry.name.startsWith(flattenedPrefix + '-');
+                }
+
+                if (shouldDelete) {
+                  try {
+                    await rm(join(skillsDir, entry.name), { recursive: true });
+                    deletedCount++;
+                  } catch (error) {
+                    if (!isFileNotFoundError(error)) {
+                      throw error;
+                    }
+                  }
+                }
+              }
+            } catch (error) {
+              // Ignore errors reading skills directory
+              if (!isFileNotFoundError(error)) {
+                throw error;
+              }
+            }
           }
         } else {
           // Marketplace config missing - can still delete AIPM plugins, but not Claude Code meta-plugins
@@ -174,61 +245,6 @@ export async function pluginUninstall(options: unknown): Promise<void> {
           }
         }
 
-        // Remove flattened skill directories for this plugin
-        // Pattern: .cursor/skills/aipm-<marketplace>-<plugin>[-subskill]
-        // Must avoid prefix collisions when plugin names are prefixes of others
-        // (e.g., "my-plugin" shouldn't match "my-plugin-extra")
-        // Only safe to delete when we have accurate skill information from the manifest
-        if (marketplaceConfig) {
-          const skillsDir = join(cwd, DIR_CURSOR, DIR_SKILLS);
-          try {
-            const entries = await readdir(skillsDir, { withFileTypes: true });
-            const flattenedPrefix = `aipm-${marketplaceName.replace(/\//g, '-')}-${pluginName}`;
-
-            // Only use prefix matching if no other plugins in this marketplace start with our plugin name
-            // This prevents accidentally deleting my-plugin-extra's skills when uninstalling my-plugin
-            const otherPluginsInMarketplace = Object.keys(config.plugins).filter(
-              (id) => id.endsWith(`@${marketplaceName}`) && id !== cmd.pluginId,
-            );
-
-            const hasConflictingNames = otherPluginsInMarketplace.some((id) => {
-              const otherPluginName = id.substring(0, id.lastIndexOf('@'));
-              return otherPluginName.startsWith(pluginName) && otherPluginName !== pluginName;
-            });
-
-            for (const entry of entries) {
-              let shouldDelete = false;
-
-              if (entry.isDirectory()) {
-                if (hasConflictingNames) {
-                  // If there are plugins with conflicting names, only delete exact match for root directory
-                  // This is safer than trying to pattern-match when names could be ambiguous
-                  shouldDelete = entry.name === flattenedPrefix;
-                } else {
-                  // No conflicting names - safe to use prefix matching
-                  shouldDelete = entry.name === flattenedPrefix || entry.name.startsWith(flattenedPrefix + '-');
-                }
-              }
-
-              if (shouldDelete) {
-                try {
-                  await rm(join(skillsDir, entry.name), { recursive: true });
-                  deletedCount++;
-                } catch (error) {
-                  if (!isFileNotFoundError(error)) {
-                    throw error;
-                  }
-                }
-              }
-            }
-          } catch (error) {
-            // Ignore errors reading skills directory
-            if (!isFileNotFoundError(error)) {
-              throw error;
-            }
-          }
-        }
-
         if (deletedCount > 0) {
           defaultIO.logSuccess(`Deleted plugin files from ${deletedCount} location(s) in .cursor/`);
         }