magus-cli 7.11.4 → 7.11.6

package/src/ui/screens/PluginsScreen.tsx

@@ -9,14 +9,8 @@ import {
 	type PluginScope,
 	addMarketplace as cliAddMarketplace,
 	repairPlugin as cliRepairPlugin,
-	isNotInstalledAnswer,
-	uninstallPluginViaCli,
 } from "../../services/claude-cli.js";
-import {
-	readInheritedRegistryRows,
-	readSettings,
-	setMcpEnvVar,
-} from "../../services/claude-settings.js";
+import { readSettings, setMcpEnvVar } from "../../services/claude-settings.js";
 import { clearContentDriftCache } from "../../services/content-drift.js";
 import { missingPluginEnvVars } from "../../services/plugin-env-needs.js";
 import {
@@ -49,6 +43,7 @@ import {
 	applyPlugins,
 	installPluginInScope,
 	pluginNeedsWork,
+	removeDeprecatedPlugin,
 	uninstallPluginInScope,
 	updatePluginInScope,
 } from "../../services/update-engine.js";
@@ -176,6 +171,14 @@ export function PluginsScreen() {
 	const [requiredBy, setRequiredBy] = useState<
 		Readonly<Record<string, readonly string[]>>
 	>({});
+	/**
+	 * Every plugin any profile lists — the same set `magus update` plans with,
+	 * so a deprecated plugin only another profile keeps is a `remove` row here
+	 * and a removal there.
+	 */
+	const [listedByProfiles, setListedByProfiles] = useState<readonly string[]>(
+		[],
+	);
 
 	// Fetch data (always fetches all scopes). Only the most recently started
 	// load may touch the screen.
@@ -209,6 +212,7 @@ export function PluginsScreen() {
 			setPins(active?.closure.plugins ?? null);
 			setActiveProfileId(active?.profileId ?? null);
 			setRequiredBy(required);
+			setListedByProfiles(active?.listedByProfiles ?? []);
 
 			// Which catalogs answered, and which only appeared to. Read straight
 			// after the fetch, while the record still describes this attempt.
@@ -300,9 +304,14 @@ export function PluginsScreen() {
 	const statuses = useMemo(
 		(): Map<string, PluginUpdateItem> =>
 			shownPlugins
-				? classifyPluginRows(shownPlugins, pins ?? {}, requiredBy)
+				? classifyPluginRows(
+						shownPlugins,
+						pins ?? {},
+						requiredBy,
+						listedByProfiles,
+					)
 				: new Map(),
-		[shownPlugins, pins, requiredBy],
+		[shownPlugins, pins, requiredBy, listedByProfiles],
 	);
 
 	/**
@@ -1265,39 +1274,16 @@ export function PluginsScreen() {
 			return;
 		}
 
-		// Errors are collected, not dropped: only the CLI's "is not installed in
-		// <scope> scope" answer is expected, and only for a scope with no row.
-		const problems: unknown[] = [];
+		// An orphan the plan keeps rather than removes — it moved, another plugin
+		// still requires it, or its marketplace was not read — and the user asked
+		// for it gone. The engine uninstalls everywhere, drops it from every
+		// profile and renders the active one again, so the row does not come back.
 		try {
-			// Remove from all scopes — try all to clean up stale references
-			const scopes: PluginScope[] = ["user", "project", "local"];
-			for (const scope of scopes) {
-				try {
-					modal.loading(
-						`Removing ${plugin.name} from ${scope}…\nclaude plugin uninstall ${plugin.id} --scope ${scope}`,
-					);
-					await uninstallPluginViaCli(plugin.id, scope, state.projectPath);
-				} catch (error) {
-					if (!isNotInstalledAnswer(error)) problems.push(error);
-				}
-			}
-			// A folder of the same repository may hold the install this one only
-			// shows: the CLI removes it only when run from that folder.
-			const inherited = await readInheritedRegistryRows(
+			modal.loading(`Removing ${plugin.name}…`);
+			const { problems } = await removeDeprecatedPlugin(
 				plugin.id,
 				state.projectPath || process.cwd(),
 			);
-			for (const row of inherited) {
-				if (!row.projectPath) continue;
-				try {
-					modal.loading(
-						`Removing ${plugin.name} from the repository's main folder, which this folder shares…\nclaude plugin uninstall ${plugin.id} --scope ${row.scope}`,
-					);
-					await uninstallPluginViaCli(plugin.id, row.scope, row.projectPath);
-				} catch (error) {
-					problems.push(error);
-				}
-			}
 
 			modal.hideModal();
 			fetchData();