claudeup 4.8.0 → 4.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudeup",
-  "version": "4.8.0",
+  "version": "4.10.1",
   "description": "TUI tool for managing Claude Code plugins, MCPs, and configuration",
   "type": "module",
   "main": "src/main.tsx",

package/src/__tests__/dual-write-prevention.test.ts

@@ -99,7 +99,7 @@ let mockGetAvailablePlugins: ReturnType<typeof mock>;
 
 mock.module("../services/claude-settings.js", () => ({
   recoverMarketplaceSettings: mock(() =>
-    Promise.resolve({ enabledAutoUpdate: [], removed: [] }),
+    Promise.resolve({ enabledAutoUpdate: [], removed: [], reregistered: [] }),
   ),
   migrateMarketplaceRename: mock(() =>
     Promise.resolve({

package/src/prerunner/index.js

@@ -214,6 +214,24 @@ export async function prerunClaude(claudeArgs, options = {}) {
             if (recovery.removed.length > 0) {
                 console.log(`✓ Removed stale marketplaces: ${recovery.removed.join(", ")}`);
             }
+            if (recovery.reregistered.length > 0) {
+                console.log(`✓ Re-registered as GitHub source: ${recovery.reregistered.join(", ")}`);
+                // Trigger marketplace update for re-registered entries so the local
+                // clone gets refreshed with the latest plugins.
+                const cliAvailable = await isClaudeAvailable();
+                if (cliAvailable) {
+                    const { updateMarketplace } = await import("../services/claude-cli.js");
+                    for (const mpName of recovery.reregistered) {
+                        try {
+                            await updateMarketplace(mpName);
+                            console.log(`✓ Updated marketplace: ${mpName}`);
+                        }
+                        catch (error) {
+                            console.warn(`⚠ Failed to update marketplace ${mpName}:`, error instanceof Error ? error.message : "Unknown error");
+                        }
+                    }
+                }
+            }
             // STEP 2: Clear cache to force fresh plugin info
             clearMarketplaceCache();
             // STEP 3: Get updated plugin info (to detect versions)

package/src/prerunner/index.ts

@@ -293,6 +293,30 @@ export async function prerunClaude(
 					`✓ Removed stale marketplaces: ${recovery.removed.join(", ")}`,
 				);
 			}
+			if (recovery.reregistered.length > 0) {
+				console.log(
+					`✓ Re-registered as GitHub source: ${recovery.reregistered.join(", ")}`,
+				);
+				// Trigger marketplace update for re-registered entries so the local
+				// clone gets refreshed with the latest plugins.
+				const cliAvailable = await isClaudeAvailable();
+				if (cliAvailable) {
+					const { updateMarketplace } = await import(
+						"../services/claude-cli.js"
+					);
+					for (const mpName of recovery.reregistered) {
+						try {
+							await updateMarketplace(mpName);
+							console.log(`✓ Updated marketplace: ${mpName}`);
+						} catch (error) {
+							console.warn(
+								`⚠ Failed to update marketplace ${mpName}:`,
+								error instanceof Error ? error.message : "Unknown error",
+							);
+						}
+					}
+				}
+			}
 
 			// STEP 2: Clear cache to force fresh plugin info
 			clearMarketplaceCache();

package/src/services/claude-cli.js

@@ -50,10 +50,39 @@ async function execClaude(args, timeoutMs = 30000) {
 }
 /**
  * Install a plugin using claude CLI
- * Handles enabling + version tracking + cache copy in one shot
+ * Handles enabling + version tracking + cache copy in one shot.
+ *
+ * If the install fails because the plugin is "not found in marketplace",
+ * recovers the marketplace registry (fixes stale "directory" sources),
+ * triggers a marketplace update, and retries once.
  */
 export async function installPlugin(pluginId, scope = "user") {
-    await execClaude(["plugin", "install", pluginId, "--scope", scope]);
+    try {
+        await execClaude(["plugin", "install", pluginId, "--scope", scope]);
+    }
+    catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        if (msg.includes("not found in marketplace")) {
+            const parts = pluginId.split("@");
+            const marketplace = parts[1];
+            if (marketplace) {
+                // Fix known_marketplaces.json first (stale "directory" → "github"),
+                // then update, then retry
+                const { recoverMarketplaceSettings } = await import("./claude-settings.js");
+                await recoverMarketplaceSettings();
+                await updateMarketplace(marketplace);
+                await execClaude([
+                    "plugin",
+                    "install",
+                    pluginId,
+                    "--scope",
+                    scope,
+                ]);
+                return;
+            }
+        }
+        throw error;
+    }
 }
 /**
  * Uninstall a plugin using claude CLI.
@@ -96,9 +125,28 @@ export async function disablePlugin(pluginId, scope = "user") {
  * originally installed via the CLI. `install` handles both fresh installs
  * and re-installs (upgrades) of existing plugins regardless of how they
  * were originally added.
+ *
+ * Retries with marketplace update on "not found" errors (same as installPlugin).
  */
 export async function updatePlugin(pluginId, scope = "user") {
-    await execClaude(["plugin", "install", pluginId, "--scope", scope], 60000);
+    try {
+        await execClaude(["plugin", "install", pluginId, "--scope", scope], 60000);
+    }
+    catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        if (msg.includes("not found in marketplace")) {
+            const parts = pluginId.split("@");
+            const marketplace = parts[1];
+            if (marketplace) {
+                const { recoverMarketplaceSettings } = await import("./claude-settings.js");
+                await recoverMarketplaceSettings();
+                await updateMarketplace(marketplace);
+                await execClaude(["plugin", "install", pluginId, "--scope", scope], 60000);
+                return;
+            }
+        }
+        throw error;
+    }
 }
 /**
  * Add a marketplace by GitHub repo (e.g., "MadAppGang/magus")

package/src/services/claude-cli.ts

@@ -67,13 +67,44 @@ async function execClaude(args: string[], timeoutMs = 30000): Promise<string> {
 
 /**
  * Install a plugin using claude CLI
- * Handles enabling + version tracking + cache copy in one shot
+ * Handles enabling + version tracking + cache copy in one shot.
+ *
+ * If the install fails because the plugin is "not found in marketplace",
+ * recovers the marketplace registry (fixes stale "directory" sources),
+ * triggers a marketplace update, and retries once.
  */
 export async function installPlugin(
 	pluginId: string,
 	scope: PluginScope = "user",
 ): Promise<void> {
-	await execClaude(["plugin", "install", pluginId, "--scope", scope]);
+	try {
+		await execClaude(["plugin", "install", pluginId, "--scope", scope]);
+	} catch (error) {
+		const msg =
+			error instanceof Error ? error.message : String(error);
+		if (msg.includes("not found in marketplace")) {
+			const parts = pluginId.split("@");
+			const marketplace = parts[1];
+			if (marketplace) {
+				// Fix known_marketplaces.json first (stale "directory" → "github"),
+				// then update, then retry
+				const { recoverMarketplaceSettings } = await import(
+					"./claude-settings.js"
+				);
+				await recoverMarketplaceSettings();
+				await updateMarketplace(marketplace);
+				await execClaude([
+					"plugin",
+					"install",
+					pluginId,
+					"--scope",
+					scope,
+				]);
+				return;
+			}
+		}
+		throw error;
+	}
 }
 
 /**
@@ -127,12 +158,39 @@ export async function disablePlugin(
  * originally installed via the CLI. `install` handles both fresh installs
  * and re-installs (upgrades) of existing plugins regardless of how they
  * were originally added.
+ *
+ * Retries with marketplace update on "not found" errors (same as installPlugin).
  */
 export async function updatePlugin(
 	pluginId: string,
 	scope: PluginScope = "user",
 ): Promise<void> {
-	await execClaude(["plugin", "install", pluginId, "--scope", scope], 60000);
+	try {
+		await execClaude(
+			["plugin", "install", pluginId, "--scope", scope],
+			60000,
+		);
+	} catch (error) {
+		const msg =
+			error instanceof Error ? error.message : String(error);
+		if (msg.includes("not found in marketplace")) {
+			const parts = pluginId.split("@");
+			const marketplace = parts[1];
+			if (marketplace) {
+				const { recoverMarketplaceSettings } = await import(
+					"./claude-settings.js"
+				);
+				await recoverMarketplaceSettings();
+				await updateMarketplace(marketplace);
+				await execClaude(
+					["plugin", "install", pluginId, "--scope", scope],
+					60000,
+				);
+				return;
+			}
+		}
+		throw error;
+	}
 }
 
 /**

package/src/services/claude-settings.js

@@ -881,14 +881,18 @@ function isMadAppGangMarketplace(entry) {
  * Recover/sync marketplace settings:
  * - Enable autoUpdate for Magus marketplaces that don't have it set
  * - Remove entries for marketplaces whose installLocation no longer exists
+ * - Fix stale "directory" source for known Magus marketplaces that should be "github"
  */
 export async function recoverMarketplaceSettings() {
     const known = await readKnownMarketplaces();
     const result = {
         enabledAutoUpdate: [],
         removed: [],
+        reregistered: [],
     };
     const updatedKnown = {};
+    // Import defaultMarketplaces lazily to get canonical repo URLs
+    const { defaultMarketplaces } = await import("../data/marketplaces.js");
     for (const [name, entry] of Object.entries(known)) {
         // Check if install location still exists
         if (entry.installLocation &&
@@ -896,6 +900,23 @@ export async function recoverMarketplaceSettings() {
             result.removed.push(name);
             continue;
         }
+        // Fix stale "directory" source for known marketplaces.
+        // Some machines have magus registered as source: "directory" pointing to
+        // a local dev checkout. This prevents Claude Code's auto-update from
+        // refreshing the marketplace, causing "plugin not found" errors for
+        // newly added plugins. Re-register as "github" with the canonical repo.
+        if (entry.source?.source === "directory") {
+            const defaultMp = defaultMarketplaces.find((m) => m.name === name);
+            if (defaultMp?.source.repo) {
+                const marketplacesDir = path.join(os.homedir(), ".claude", "plugins", "marketplaces");
+                entry.source = {
+                    source: "github",
+                    repo: defaultMp.source.repo,
+                };
+                entry.installLocation = path.join(marketplacesDir, name);
+                result.reregistered.push(name);
+            }
+        }
         // Enable autoUpdate if not set - only for Magus (MadAppGang) marketplaces
         if (entry.autoUpdate === undefined && isMadAppGangMarketplace(entry)) {
             entry.autoUpdate = true;
@@ -904,7 +925,9 @@ export async function recoverMarketplaceSettings() {
         updatedKnown[name] = entry;
     }
     // Write back if any changes were made
-    if (result.enabledAutoUpdate.length > 0 || result.removed.length > 0) {
+    if (result.enabledAutoUpdate.length > 0 ||
+        result.removed.length > 0 ||
+        result.reregistered.length > 0) {
         await writeKnownMarketplaces(updatedKnown);
     }
     return result;

package/src/services/claude-settings.ts

@@ -808,6 +808,7 @@ export async function getMarketplaceAutoUpdate(
 export interface MarketplaceRecoveryResult {
 	enabledAutoUpdate: string[];
 	removed: string[];
+	reregistered: string[];
 }
 
 // =============================================================================
@@ -1163,16 +1164,21 @@ function isMadAppGangMarketplace(entry: KnownMarketplaceEntry): boolean {
  * Recover/sync marketplace settings:
  * - Enable autoUpdate for Magus marketplaces that don't have it set
  * - Remove entries for marketplaces whose installLocation no longer exists
+ * - Fix stale "directory" source for known Magus marketplaces that should be "github"
  */
 export async function recoverMarketplaceSettings(): Promise<MarketplaceRecoveryResult> {
 	const known = await readKnownMarketplaces();
 	const result: MarketplaceRecoveryResult = {
 		enabledAutoUpdate: [],
 		removed: [],
+		reregistered: [],
 	};
 
 	const updatedKnown: KnownMarketplaces = {};
 
+	// Import defaultMarketplaces lazily to get canonical repo URLs
+	const { defaultMarketplaces } = await import("../data/marketplaces.js");
+
 	for (const [name, entry] of Object.entries(known)) {
 		// Check if install location still exists
 		if (
@@ -1183,6 +1189,29 @@ export async function recoverMarketplaceSettings(): Promise<MarketplaceRecoveryR
 			continue;
 		}
 
+		// Fix stale "directory" source for known marketplaces.
+		// Some machines have magus registered as source: "directory" pointing to
+		// a local dev checkout. This prevents Claude Code's auto-update from
+		// refreshing the marketplace, causing "plugin not found" errors for
+		// newly added plugins. Re-register as "github" with the canonical repo.
+		if (entry.source?.source === "directory") {
+			const defaultMp = defaultMarketplaces.find((m) => m.name === name);
+			if (defaultMp?.source.repo) {
+				const marketplacesDir = path.join(
+					os.homedir(),
+					".claude",
+					"plugins",
+					"marketplaces",
+				);
+				entry.source = {
+					source: "github",
+					repo: defaultMp.source.repo,
+				};
+				entry.installLocation = path.join(marketplacesDir, name);
+				result.reregistered.push(name);
+			}
+		}
+
 		// Enable autoUpdate if not set - only for Magus (MadAppGang) marketplaces
 		if (entry.autoUpdate === undefined && isMadAppGangMarketplace(entry)) {
 			entry.autoUpdate = true;
@@ -1193,7 +1222,11 @@ export async function recoverMarketplaceSettings(): Promise<MarketplaceRecoveryR
 	}
 
 	// Write back if any changes were made
-	if (result.enabledAutoUpdate.length > 0 || result.removed.length > 0) {
+	if (
+		result.enabledAutoUpdate.length > 0 ||
+		result.removed.length > 0 ||
+		result.reregistered.length > 0
+	) {
 		await writeKnownMarketplaces(updatedKnown);
 	}
 

package/src/ui/App.js

@@ -7,7 +7,7 @@ import { DimensionsProvider, useDimensions, } from "./state/DimensionsContext.js
 import { ModalContainer } from "./components/modals/index.js";
 import { PluginsScreen, McpScreen, McpRegistryScreen, SettingsScreen, CliToolsScreen, ModelSelectorScreen, ProfilesScreen, SkillsScreen, } from "./screens/index.js";
 import { repairAllMarketplaces } from "../services/local-marketplace.js";
-import { migrateMarketplaceRename } from "../services/claude-settings.js";
+import { migrateMarketplaceRename, recoverMarketplaceSettings, } from "../services/claude-settings.js";
 import { checkForUpdates, getCurrentVersion, } from "../services/version-check.js";
 import { useKeyboardHandler } from "./hooks/useKeyboardHandler.js";
 import { ProgressBar } from "./components/layout/ProgressBar.js";
@@ -179,6 +179,7 @@ function AppContentInner({ showDebug, onDebugToggle, updateInfo, onExit, }) {
     const { state, dispatch } = useApp();
     const { progress } = state;
     const dimensions = useDimensions();
+    const [recoveryReport, setRecoveryReport] = useState(null);
     // Auto-refresh marketplaces on startup
     useEffect(() => {
         const noRefresh = process.argv.includes("--no-refresh");
@@ -190,6 +191,35 @@ function AppContentInner({ showDebug, onDebugToggle, updateInfo, onExit, }) {
         });
         // Migrate old marketplace names → magus (idempotent), then repair plugin.json files
         migrateMarketplaceRename().catch(() => { }); // non-blocking, best-effort
+        // Recover stale marketplace registry entries (e.g. "directory" → "github")
+        recoverMarketplaceSettings()
+            .then(async (recovery) => {
+            const msgs = [];
+            if (recovery.reregistered.length > 0) {
+                msgs.push(`Re-registered as GitHub: ${recovery.reregistered.join(", ")}`);
+                // Update the marketplace clone now that the source is fixed
+                const { updateMarketplace } = await import("../services/claude-cli.js");
+                for (const mp of recovery.reregistered) {
+                    try {
+                        await updateMarketplace(mp);
+                        msgs.push(`Updated marketplace: ${mp}`);
+                    }
+                    catch {
+                        msgs.push(`Failed to update: ${mp}`);
+                    }
+                }
+            }
+            if (recovery.enabledAutoUpdate.length > 0) {
+                msgs.push(`Enabled auto-update: ${recovery.enabledAutoUpdate.join(", ")}`);
+            }
+            if (recovery.removed.length > 0) {
+                msgs.push(`Removed stale: ${recovery.removed.join(", ")}`);
+            }
+            if (msgs.length > 0) {
+                setRecoveryReport(msgs.join("\n"));
+            }
+        })
+            .catch(() => { }); // non-fatal
         repairAllMarketplaces()
             .then(async () => {
             dispatch({ type: "HIDE_PROGRESS" });
@@ -199,7 +229,7 @@ function AppContentInner({ showDebug, onDebugToggle, updateInfo, onExit, }) {
             dispatch({ type: "HIDE_PROGRESS" });
         });
     }, [dispatch]);
-    return (_jsxs("box", { flexDirection: "column", height: dimensions.terminalHeight, children: [updateInfo?.updateAvailable && _jsx(UpdateBanner, { result: updateInfo }), showDebug && (_jsx("box", { paddingLeft: 1, paddingRight: 1, children: _jsxs("text", { fg: "#888888", children: ["DEBUG: ", dimensions.terminalWidth, "x", dimensions.terminalHeight, " | content=", dimensions.contentHeight, " | screen=", state.currentRoute.screen] }) })), progress && _jsx(ProgressIndicator, { ...progress }), _jsx("box", { flexDirection: "column", height: dimensions.contentHeight, paddingLeft: 1, paddingRight: 1, children: _jsx(Router, {}) }), _jsx(GlobalKeyHandler, { onDebugToggle: onDebugToggle, onExit: onExit }), _jsx(ModalContainer, {})] }));
+    return (_jsxs("box", { flexDirection: "column", height: dimensions.terminalHeight, children: [updateInfo?.updateAvailable && _jsx(UpdateBanner, { result: updateInfo }), recoveryReport && (_jsxs("box", { paddingLeft: 1, paddingRight: 1, children: [_jsx("text", { bg: "green", fg: "black", children: _jsx("strong", { children: " RECOVERED " }) }), _jsxs("text", { fg: "green", children: [" ", recoveryReport.split("\n").join(" | ")] })] })), showDebug && (_jsx("box", { paddingLeft: 1, paddingRight: 1, children: _jsxs("text", { fg: "#888888", children: ["DEBUG: ", dimensions.terminalWidth, "x", dimensions.terminalHeight, " | content=", dimensions.contentHeight, " | screen=", state.currentRoute.screen] }) })), progress && _jsx(ProgressIndicator, { ...progress }), _jsx("box", { flexDirection: "column", height: dimensions.contentHeight, paddingLeft: 1, paddingRight: 1, children: _jsx(Router, {}) }), _jsx(GlobalKeyHandler, { onDebugToggle: onDebugToggle, onExit: onExit }), _jsx(ModalContainer, {})] }));
 }
 function AppContent({ onExit }) {
     const { state } = useApp();

package/src/ui/App.tsx

@@ -24,7 +24,10 @@ import {
 } from "./screens/index.js";
 import type { Screen } from "./state/types.js";
 import { repairAllMarketplaces } from "../services/local-marketplace.js";
-import { migrateMarketplaceRename } from "../services/claude-settings.js";
+import {
+	migrateMarketplaceRename,
+	recoverMarketplaceSettings,
+} from "../services/claude-settings.js";
 import {
 	checkForUpdates,
 	getCurrentVersion,
@@ -258,6 +261,7 @@ function AppContentInner({
 	const { state, dispatch } = useApp();
 	const { progress } = state;
 	const dimensions = useDimensions();
+	const [recoveryReport, setRecoveryReport] = useState<string | null>(null);
 
 	// Auto-refresh marketplaces on startup
 	useEffect(() => {
@@ -272,6 +276,43 @@ function AppContentInner({
 		// Migrate old marketplace names → magus (idempotent), then repair plugin.json files
 		migrateMarketplaceRename().catch(() => {}); // non-blocking, best-effort
 
+		// Recover stale marketplace registry entries (e.g. "directory" → "github")
+		recoverMarketplaceSettings()
+			.then(async (recovery) => {
+				const msgs: string[] = [];
+				if (recovery.reregistered.length > 0) {
+					msgs.push(
+						`Re-registered as GitHub: ${recovery.reregistered.join(", ")}`,
+					);
+					// Update the marketplace clone now that the source is fixed
+					const { updateMarketplace } = await import(
+						"../services/claude-cli.js"
+					);
+					for (const mp of recovery.reregistered) {
+						try {
+							await updateMarketplace(mp);
+							msgs.push(`Updated marketplace: ${mp}`);
+						} catch {
+							msgs.push(`Failed to update: ${mp}`);
+						}
+					}
+				}
+				if (recovery.enabledAutoUpdate.length > 0) {
+					msgs.push(
+						`Enabled auto-update: ${recovery.enabledAutoUpdate.join(", ")}`,
+					);
+				}
+				if (recovery.removed.length > 0) {
+					msgs.push(
+						`Removed stale: ${recovery.removed.join(", ")}`,
+					);
+				}
+				if (msgs.length > 0) {
+					setRecoveryReport(msgs.join("\n"));
+				}
+			})
+			.catch(() => {}); // non-fatal
+
 		repairAllMarketplaces()
 			.then(async () => {
 				dispatch({ type: "HIDE_PROGRESS" });
@@ -285,6 +326,14 @@ function AppContentInner({
 	return (
 		<box flexDirection="column" height={dimensions.terminalHeight}>
 			{updateInfo?.updateAvailable && <UpdateBanner result={updateInfo} />}
+			{recoveryReport && (
+				<box paddingLeft={1} paddingRight={1}>
+					<text bg="green" fg="black">
+						<strong> RECOVERED </strong>
+					</text>
+					<text fg="green"> {recoveryReport.split("\n").join(" | ")}</text>
+				</box>
+			)}
 			{showDebug && (
 				<box paddingLeft={1} paddingRight={1}>
 					<text fg="#888888">

package/src/ui/components/modals/LoadingModal.js

@@ -9,6 +9,9 @@ export function LoadingModal({ message }) {
         }, 80);
         return () => clearInterval(interval);
     }, []);
-    return (_jsxs("box", { flexDirection: "row", border: true, borderStyle: "rounded", borderColor: "#525252", backgroundColor: "#1C1C1E", paddingLeft: 3, paddingRight: 3, paddingTop: 1, paddingBottom: 1, children: [_jsx("text", { fg: "#A1A1AA", children: SPINNER_FRAMES[frame] }), _jsxs("text", { fg: "#EDEDED", children: [" ", message] })] }));
+    const lines = message.split("\n");
+    const mainMessage = lines[0];
+    const detail = lines.slice(1).join("\n");
+    return (_jsxs("box", { flexDirection: "column", border: true, borderStyle: "rounded", borderColor: "#525252", backgroundColor: "#1C1C1E", paddingLeft: 3, paddingRight: 3, paddingTop: 1, paddingBottom: 1, children: [_jsxs("box", { flexDirection: "row", children: [_jsx("text", { fg: "#A1A1AA", children: SPINNER_FRAMES[frame] }), _jsxs("text", { fg: "#EDEDED", children: [" ", mainMessage] })] }), detail ? (_jsx("box", { marginTop: 0, paddingLeft: 2, children: _jsx("text", { fg: "#525252", children: detail }) })) : null] }));
 }
 export default LoadingModal;

package/src/ui/components/modals/LoadingModal.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from "react";
 
 interface LoadingModalProps {
-	/** Loading message */
+	/** Loading message — supports multiline (first line = status, subsequent = detail) */
 	message: string;
 }
 
@@ -18,9 +18,13 @@ export function LoadingModal({ message }: LoadingModalProps) {
 		return () => clearInterval(interval);
 	}, []);
 
+	const lines = message.split("\n");
+	const mainMessage = lines[0];
+	const detail = lines.slice(1).join("\n");
+
 	return (
 		<box
-			flexDirection="row"
+			flexDirection="column"
 			border
 			borderStyle="rounded"
 			borderColor="#525252"
@@ -30,8 +34,15 @@ export function LoadingModal({ message }: LoadingModalProps) {
 			paddingTop={1}
 			paddingBottom={1}
 		>
-			<text fg="#A1A1AA">{SPINNER_FRAMES[frame]}</text>
-			<text fg="#EDEDED"> {message}</text>
+			<box flexDirection="row">
+				<text fg="#A1A1AA">{SPINNER_FRAMES[frame]}</text>
+				<text fg="#EDEDED"> {mainMessage}</text>
+			</box>
+			{detail ? (
+				<box marginTop={0} paddingLeft={2}>
+					<text fg="#525252">{detail}</text>
+				</box>
+			) : null}
 		</box>
 	);
 }

package/src/ui/screens/PluginsScreen.js

@@ -443,22 +443,19 @@ export function PluginsScreen() {
             else {
                 action = "install";
             }
-            const actionLabel = action === "update"
-                ? `Updating ${scopeLabel}`
-                : action === "install"
-                    ? `Installing to ${scopeLabel}`
-                    : `Uninstalling from ${scopeLabel}`;
-            modal.loading(`${actionLabel}...`);
             try {
                 const scope = scopeValue;
                 if (action === "uninstall") {
+                    modal.loading(`Uninstalling ${plugin.name} from ${scopeLabel}…\nclaude plugin uninstall ${plugin.id} --scope ${scope}`);
                     await cliUninstallPlugin(plugin.id, scope, state.projectPath);
                 }
                 else if (action === "update") {
+                    modal.loading(`Updating ${plugin.name} in ${scopeLabel}…\nclaude plugin install ${plugin.id} --scope ${scope}`);
                     await cliUpdatePlugin(plugin.id, scope);
                     await saveVersionForScope(plugin.id, latestVersion, scope);
                 }
                 else {
+                    modal.loading(`Installing ${plugin.name} to ${scopeLabel}…\nclaude plugin install ${plugin.id} --scope ${scope}`);
                     await cliInstallPlugin(plugin.id, scope);
                     await saveVersionForScope(plugin.id, latestVersion, scope);
                     modal.hideModal();
@@ -482,7 +479,7 @@ export function PluginsScreen() {
             return;
         const plugin = item.plugin;
         const scope = pluginsState.scope === "global" ? "user" : "project";
-        modal.loading(`Updating ${plugin.name}...`);
+        modal.loading(`Updating ${plugin.name}…\nclaude plugin install ${plugin.id} --scope ${scope}`);
         try {
             await cliUpdatePlugin(plugin.id, scope);
             if (plugin.version) {
@@ -503,9 +500,10 @@ export function PluginsScreen() {
         if (updatable.length === 0)
             return;
         const scope = pluginsState.scope === "global" ? "user" : "project";
-        modal.loading(`Updating ${updatable.length} plugin(s)...`);
         try {
-            for (const plugin of updatable) {
+            for (let i = 0; i < updatable.length; i++) {
+                const plugin = updatable[i];
+                modal.loading(`Updating ${plugin.name} (${i + 1}/${updatable.length})…\nclaude plugin install ${plugin.id} --scope ${scope}`);
                 await cliUpdatePlugin(plugin.id, scope);
                 if (plugin.version) {
                     await saveVersionForScope(plugin.id, plugin.version, scope);
@@ -547,21 +545,18 @@ export function PluginsScreen() {
         else {
             action = "install";
         }
-        const actionLabel = action === "update"
-            ? `Updating ${scopeLabel}`
-            : action === "install"
-                ? `Installing to ${scopeLabel}`
-                : `Uninstalling from ${scopeLabel}`;
-        modal.loading(`${actionLabel}...`);
         try {
             if (action === "uninstall") {
+                modal.loading(`Uninstalling ${plugin.name} from ${scopeLabel}…\nclaude plugin uninstall ${plugin.id} --scope ${scope}`);
                 await cliUninstallPlugin(plugin.id, scope, state.projectPath);
             }
             else if (action === "update") {
+                modal.loading(`Updating ${plugin.name} in ${scopeLabel}…\nclaude plugin install ${plugin.id} --scope ${scope}`);
                 await cliUpdatePlugin(plugin.id, scope);
                 await saveVersionForScope(plugin.id, latestVersion, scope);
             }
             else {
+                modal.loading(`Installing ${plugin.name} to ${scopeLabel}…\nclaude plugin install ${plugin.id} --scope ${scope}`);
                 await cliInstallPlugin(plugin.id, scope);
                 await saveVersionForScope(plugin.id, latestVersion, scope);
                 modal.hideModal();
@@ -583,12 +578,12 @@ export function PluginsScreen() {
         if (!item || item.kind !== "plugin" || !item.plugin.isOrphaned)
             return;
         const plugin = item.plugin;
-        modal.loading(`Removing ${plugin.name}...`);
         try {
             // Remove from all scopes — try all to clean up stale references
             const scopes = ["user", "project", "local"];
             for (const scope of scopes) {
                 try {
+                    modal.loading(`Removing ${plugin.name} from ${scope}…\nclaude plugin uninstall ${plugin.id} --scope ${scope}`);
                     await cliUninstallPlugin(plugin.id, scope, state.projectPath);
                 }
                 catch {

package/src/ui/screens/PluginsScreen.tsx

@@ -559,22 +559,23 @@ export function PluginsScreen() {
 				action = "install";
 			}
 
-			const actionLabel =
-				action === "update"
-					? `Updating ${scopeLabel}`
-					: action === "install"
-						? `Installing to ${scopeLabel}`
-						: `Uninstalling from ${scopeLabel}`;
-			modal.loading(`${actionLabel}...`);
-
 			try {
 				const scope = scopeValue as PluginScope;
 				if (action === "uninstall") {
+					modal.loading(
+						`Uninstalling ${plugin.name} from ${scopeLabel}…\nclaude plugin uninstall ${plugin.id} --scope ${scope}`,
+					);
 					await cliUninstallPlugin(plugin.id, scope, state.projectPath);
 				} else if (action === "update") {
+					modal.loading(
+						`Updating ${plugin.name} in ${scopeLabel}…\nclaude plugin install ${plugin.id} --scope ${scope}`,
+					);
 					await cliUpdatePlugin(plugin.id, scope);
 					await saveVersionForScope(plugin.id, latestVersion, scope);
 				} else {
+					modal.loading(
+						`Installing ${plugin.name} to ${scopeLabel}…\nclaude plugin install ${plugin.id} --scope ${scope}`,
+					);
 					await cliInstallPlugin(plugin.id, scope);
 					await saveVersionForScope(plugin.id, latestVersion, scope);
 					modal.hideModal();
@@ -599,7 +600,9 @@ export function PluginsScreen() {
 		const plugin = item.plugin;
 		const scope: PluginScope = pluginsState.scope === "global" ? "user" : "project";
 
-		modal.loading(`Updating ${plugin.name}...`);
+		modal.loading(
+			`Updating ${plugin.name}…\nclaude plugin install ${plugin.id} --scope ${scope}`,
+		);
 		try {
 			await cliUpdatePlugin(plugin.id, scope);
 			if (plugin.version) {
@@ -620,10 +623,13 @@ export function PluginsScreen() {
 		if (updatable.length === 0) return;
 
 		const scope: PluginScope = pluginsState.scope === "global" ? "user" : "project";
-		modal.loading(`Updating ${updatable.length} plugin(s)...`);
 
 		try {
-			for (const plugin of updatable) {
+			for (let i = 0; i < updatable.length; i++) {
+				const plugin = updatable[i];
+				modal.loading(
+					`Updating ${plugin.name} (${i + 1}/${updatable.length})…\nclaude plugin install ${plugin.id} --scope ${scope}`,
+				);
 				await cliUpdatePlugin(plugin.id, scope);
 				if (plugin.version) {
 					await saveVersionForScope(plugin.id, plugin.version, scope);
@@ -670,21 +676,22 @@ export function PluginsScreen() {
 			action = "install";
 		}
 
-		const actionLabel =
-			action === "update"
-				? `Updating ${scopeLabel}`
-				: action === "install"
-					? `Installing to ${scopeLabel}`
-					: `Uninstalling from ${scopeLabel}`;
-		modal.loading(`${actionLabel}...`);
-
 		try {
 			if (action === "uninstall") {
+				modal.loading(
+					`Uninstalling ${plugin.name} from ${scopeLabel}…\nclaude plugin uninstall ${plugin.id} --scope ${scope}`,
+				);
 				await cliUninstallPlugin(plugin.id, scope, state.projectPath);
 			} else if (action === "update") {
+				modal.loading(
+					`Updating ${plugin.name} in ${scopeLabel}…\nclaude plugin install ${plugin.id} --scope ${scope}`,
+				);
 				await cliUpdatePlugin(plugin.id, scope);
 				await saveVersionForScope(plugin.id, latestVersion, scope);
 			} else {
+				modal.loading(
+					`Installing ${plugin.name} to ${scopeLabel}…\nclaude plugin install ${plugin.id} --scope ${scope}`,
+				);
 				await cliInstallPlugin(plugin.id, scope);
 				await saveVersionForScope(plugin.id, latestVersion, scope);
 				modal.hideModal();
@@ -706,12 +713,14 @@ export function PluginsScreen() {
 		if (!item || item.kind !== "plugin" || !item.plugin.isOrphaned) return;
 
 		const plugin = item.plugin;
-		modal.loading(`Removing ${plugin.name}...`);
 		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 cliUninstallPlugin(plugin.id, scope, state.projectPath);
 				} catch {
 					// Ignore errors for scopes where it doesn't exist