magus-cli 7.4.0 → 7.4.1

package/src/ui/screens/CliToolsScreen.tsx

@@ -9,7 +9,11 @@ import { useDimensions } from "../state/DimensionsContext.js";
 
 import { cliTools } from "../../data/cli-tools.js";
 import { loadActiveClosure } from "../../services/active-closure.js";
-import { cliToolUninstall } from "../../services/cli-tool-commands.js";
+import {
+	type InstallMethod,
+	cliToolUninstall,
+	uninstallBlocker,
+} from "../../services/cli-tool-commands.js";
 import {
 	type InstallInfo,
 	PROBE_CONCURRENCY,
@@ -247,6 +251,20 @@ export function CliToolsScreen() {
 		}
 	};
 
+	/**
+	 * Keep one install of a tool installed more than one way.
+	 *
+	 * Two rules, both from R9.10. An install magus cannot remove is never
+	 * offered as something to remove: a choice reading "Keep npm, remove others"
+	 * used to include Claude Code's native copy in "others", find no uninstall
+	 * command for it, `continue` past it and report done — leaving the conflict
+	 * exactly as it was, with the row still showing "!". And whatever is left
+	 * behind is named afterwards, rather than silently skipped.
+	 *
+	 * Which installs can be removed comes from `cliToolUninstall` itself
+	 * (through `uninstallBlocker`), so the list of choices and the commands that
+	 * run cannot disagree about a method.
+	 */
 	const handleResolveConflict = async () => {
 		const row = rows[cliToolsState.selectedIndex];
 		const install: InstallInfo | undefined = row?.install;
@@ -254,38 +272,81 @@ export function CliToolsScreen() {
 
 		const { tool } = row;
 		const allMethods = install.all;
+		const blockers = new Map(
+			allMethods.map((m) => [
+				m,
+				uninstallBlocker(tool, m, install.brewFormula),
+			]),
+		);
+		const removable = allMethods.filter((m) => blockers.get(m) === null);
+		const stuck = allMethods.filter((m) => blockers.get(m) !== null);
+		const stuckList = (methods: readonly InstallMethod[]): string =>
+			methods
+				.map((m) => `The ${m} install stays: ${blockers.get(m)}.`)
+				.join("\n");
+
+		// One choice per install that can be KEPT — but only where keeping it
+		// removes something. "Keep npm" beside an unremovable native copy would
+		// promise a removal magus cannot perform.
+		const options = allMethods
+			.map((keep) => ({ keep, remove: removable.filter((m) => m !== keep) }))
+			.filter(({ remove }) => remove.length > 0)
+			.map(({ keep, remove }) => ({
+				label: `Keep ${keep}${keep === install.primary ? " (active)" : ""}, remove ${remove.join(" + ")}`,
+				value: keep,
+			}));
 
-		// Let user pick which install to keep
-		const options = allMethods.map((method) => ({
-			label: `Keep ${method}${method === install.primary ? " (active)" : ""}, remove others`,
-			value: method,
-		}));
+		if (options.length === 0) {
+			await modal.message(
+				`${tool.displayName} conflict`,
+				`Installed via ${allMethods.join(" + ")}, and magus can remove none of them.\n\n${stuckList(allMethods)}\n\nRemove one by hand, then press r.`,
+				"error",
+			);
+			return;
+		}
 
 		const keep = await modal.select(
 			`Resolve ${tool.displayName} conflict`,
-			`Installed via ${allMethods.join(" + ")}. Which to keep?`,
+			stuck.length > 0
+				? `Installed via ${allMethods.join(" + ")}. Which to keep?\n\n${stuckList(stuck)}`
+				: `Installed via ${allMethods.join(" + ")}. Which to keep?`,
 			options,
 		);
 		if (keep === null) return;
 
-		const toRemove = allMethods.filter((m) => m !== keep);
+		const toRemove = removable.filter((m) => m !== keep);
+		const leftBehind = stuck.filter((m) => m !== keep);
 		modal.loading(`Removing ${toRemove.join(", ")} install(s)...`);
 
 		const errors: string[] = [];
 		for (const method of toRemove) {
 			const cmd = cliToolUninstall(tool, method, install.brewFormula);
-			if (!cmd) continue;
+			// Unreachable: `removable` was built from this same call. Reported
+			// rather than skipped, because a silent skip is the defect above.
+			if (!cmd) {
+				errors.push(`${method}: no uninstall command`);
+				continue;
+			}
 			const result = await runCommand(cmd);
 			if (!result.ok) errors.push(`${method}: ${formatCommand(cmd)}`);
 		}
 
 		modal.hideModal();
 
-		if (errors.length > 0) {
+		const report = [
+			errors.length > 0
+				? `These removals failed. Run them by hand:\n${errors.join("\n")}`
+				: "",
+			leftBehind.length > 0
+				? `${stuckList(leftBehind)}\nRemove it by hand if you want it gone.`
+				: "",
+		].filter((part) => part !== "");
+
+		if (report.length > 0) {
 			await modal.message(
-				"Partial",
-				`Some removals failed. Try manually:\n\n${errors.join("\n")}`,
-				"error",
+				errors.length > 0 ? "Partly removed" : "One install stays",
+				report.join("\n\n"),
+				errors.length > 0 ? "error" : "info",
 			);
 		}
 

package/src/ui/screens/PluginsScreen.tsx

@@ -157,8 +157,12 @@ export function PluginsScreen() {
 		try {
 			const localMarketplaces = await getLocalMarketplacesInfo();
 			const allMarketplaces = getAllMarketplaces(localMarketplaces);
-			// Read-only, never throws. `resolveBins: false`: this screen needs only
-			// the plugin pins, not every declared plugin's binary requirements.
+			// Read-only, and it throws for exactly one thing: a settings file or an
+			// installed_plugins.json that exists and cannot be read. That lands in
+			// the catch below and is shown on this screen, which is the point —
+			// "nothing installed" would be a lie about a file nobody could read.
+			// `resolveBins: false`: this screen needs only the plugin pins, not
+			// every declared plugin's binary requirements.
 			const [pluginData, active] = await Promise.all([
 				getAvailablePlugins(state.projectPath),
 				loadActiveClosure(state.projectPath || process.cwd(), {