claudeup 3.5.0 → 3.6.0

package/src/services/claude-settings.js

@@ -414,13 +414,14 @@ export async function getMarketplaceAutoUpdate(marketplaceName) {
     return known[marketplaceName]?.autoUpdate;
 }
 // =============================================================================
-// MARKETPLACE RENAME MIGRATION: mag-claude-plugins → magus
+// MARKETPLACE RENAME MIGRATION: mag-claude-plugins / MadAppGang-claude-code → magus
 // =============================================================================
-const OLD_MARKETPLACE_NAME = "mag-claude-plugins";
+const OLD_MARKETPLACE_NAMES = ["mag-claude-plugins", "MadAppGang-claude-code"];
 const NEW_MARKETPLACE_NAME = "magus";
 /**
- * Rename plugin keys in a Record from old marketplace to new.
+ * Rename plugin keys in a Record from any old marketplace name to new.
  * e.g., "frontend@mag-claude-plugins" → "frontend@magus"
+ *        "dev@MadAppGang-claude-code" → "dev@magus"
  * Returns [migratedRecord, count] — count=0 means no changes.
  */
 function migratePluginKeys(record) {
@@ -429,9 +430,14 @@ function migratePluginKeys(record) {
     const migrated = {};
     let count = 0;
     for (const [key, value] of Object.entries(record)) {
-        if (key.endsWith(`@${OLD_MARKETPLACE_NAME}`)) {
+        const oldName = OLD_MARKETPLACE_NAMES.find((n) => key.endsWith(`@${n}`));
+        if (oldName) {
             const pluginName = key.slice(0, key.lastIndexOf("@"));
-            migrated[`${pluginName}@${NEW_MARKETPLACE_NAME}`] = value;
+            const newKey = `${pluginName}@${NEW_MARKETPLACE_NAME}`;
+            // Don't overwrite if canonical key already exists
+            if (!record[newKey]) {
+                migrated[newKey] = value;
+            }
             count++;
         }
         else {
@@ -456,12 +462,16 @@ function migrateSettingsObject(settings) {
         settings.installedPluginVersions = iv;
         total += ivCount;
     }
-    // Migrate extraKnownMarketplaces key
-    if (settings.extraKnownMarketplaces?.[OLD_MARKETPLACE_NAME]) {
-        const entry = settings.extraKnownMarketplaces[OLD_MARKETPLACE_NAME];
-        delete settings.extraKnownMarketplaces[OLD_MARKETPLACE_NAME];
-        settings.extraKnownMarketplaces[NEW_MARKETPLACE_NAME] = entry;
-        total++;
+    // Migrate extraKnownMarketplaces keys
+    for (const oldName of OLD_MARKETPLACE_NAMES) {
+        if (settings.extraKnownMarketplaces?.[oldName]) {
+            const entry = settings.extraKnownMarketplaces[oldName];
+            delete settings.extraKnownMarketplaces[oldName];
+            if (!settings.extraKnownMarketplaces[NEW_MARKETPLACE_NAME]) {
+                settings.extraKnownMarketplaces[NEW_MARKETPLACE_NAME] = entry;
+            }
+            total++;
+        }
     }
     return total;
 }
@@ -519,33 +529,34 @@ export async function migrateMarketplaceRename(projectPath) {
         }
     }
     catch { /* skip if unreadable */ }
-    // 4. known_marketplaces.json — rename the key + physical directory cleanup
+    // 4. known_marketplaces.json — rename old keys + physical directory cleanup
     const pluginsDir = path.join(os.homedir(), ".claude", "plugins", "marketplaces");
-    const oldDir = path.join(pluginsDir, OLD_MARKETPLACE_NAME);
     const newDir = path.join(pluginsDir, NEW_MARKETPLACE_NAME);
     try {
         const known = await readKnownMarketplaces();
         let knownModified = false;
-        if (known[OLD_MARKETPLACE_NAME]) {
-            const oldEntry = known[OLD_MARKETPLACE_NAME];
-            // If canonical entry already exists, just delete the old one
-            if (!known[NEW_MARKETPLACE_NAME]) {
-                known[NEW_MARKETPLACE_NAME] = {
-                    ...oldEntry,
-                    source: {
-                        ...oldEntry.source,
-                        repo: "MadAppGang/magus",
-                    },
-                };
+        for (const oldName of OLD_MARKETPLACE_NAMES) {
+            if (known[oldName]) {
+                const oldEntry = known[oldName];
+                // If canonical entry doesn't exist yet, create it
+                if (!known[NEW_MARKETPLACE_NAME]) {
+                    known[NEW_MARKETPLACE_NAME] = {
+                        ...oldEntry,
+                        source: {
+                            ...oldEntry.source,
+                            repo: "MadAppGang/magus",
+                        },
+                    };
+                }
+                delete known[oldName];
+                knownModified = true;
+            }
+            // Ensure installLocation doesn't reference old directory names
+            if (known[NEW_MARKETPLACE_NAME]?.installLocation?.includes(oldName)) {
+                known[NEW_MARKETPLACE_NAME].installLocation =
+                    known[NEW_MARKETPLACE_NAME].installLocation.replace(oldName, NEW_MARKETPLACE_NAME);
+                knownModified = true;
             }
-            delete known[OLD_MARKETPLACE_NAME];
-            knownModified = true;
-        }
-        // Ensure installLocation points to new directory name
-        if (known[NEW_MARKETPLACE_NAME]?.installLocation?.includes(OLD_MARKETPLACE_NAME)) {
-            known[NEW_MARKETPLACE_NAME].installLocation =
-                known[NEW_MARKETPLACE_NAME].installLocation.replace(OLD_MARKETPLACE_NAME, NEW_MARKETPLACE_NAME);
-            knownModified = true;
         }
         if (knownModified) {
             await writeKnownMarketplaces(known);
@@ -553,31 +564,33 @@ export async function migrateMarketplaceRename(projectPath) {
         }
     }
     catch { /* skip if unreadable */ }
-    // 4b. Rename/remove the old physical directory (runs even if key was already migrated)
-    try {
-        if (await fs.pathExists(oldDir)) {
-            if (!(await fs.pathExists(newDir))) {
-                await fs.rename(oldDir, newDir);
-            }
-            else {
-                // Both exist — remove the old one (magus dir is canonical)
-                await fs.remove(oldDir);
+    // 4b. Rename/remove old physical directories (runs even if keys were already migrated)
+    for (const oldName of OLD_MARKETPLACE_NAMES) {
+        const oldDir = path.join(pluginsDir, oldName);
+        try {
+            if (await fs.pathExists(oldDir)) {
+                if (!(await fs.pathExists(newDir))) {
+                    await fs.rename(oldDir, newDir);
+                }
+                else {
+                    // Both exist — remove the old one (magus dir is canonical)
+                    await fs.remove(oldDir);
+                }
             }
         }
+        catch { /* non-fatal: directory cleanup is best-effort */ }
     }
-    catch { /* non-fatal: directory cleanup is best-effort */ }
     // 4c. Update git remote URL in the marketplace clone (old → new repo)
     try {
-        const marketplaceDir = await fs.pathExists(newDir) ? newDir : oldDir;
-        if (await fs.pathExists(path.join(marketplaceDir, ".git"))) {
+        if (await fs.pathExists(path.join(newDir, ".git"))) {
             const { execSync } = await import("node:child_process");
             const remote = execSync("git remote get-url origin", {
-                cwd: marketplaceDir, encoding: "utf-8", timeout: 5000,
+                cwd: newDir, encoding: "utf-8", timeout: 5000,
             }).trim();
             if (remote.includes("claude-code") && remote.includes("MadAppGang")) {
                 const newRemote = remote.replace("claude-code", NEW_MARKETPLACE_NAME);
                 execSync(`git remote set-url origin "${newRemote}"`, {
-                    cwd: marketplaceDir, encoding: "utf-8", timeout: 5000,
+                    cwd: newDir, encoding: "utf-8", timeout: 5000,
                 });
             }
         }
@@ -589,9 +602,13 @@ export async function migrateMarketplaceRename(projectPath) {
         let regCount = 0;
         const newPlugins = {};
         for (const [pluginId, entries] of Object.entries(registry.plugins)) {
-            if (pluginId.endsWith(`@${OLD_MARKETPLACE_NAME}`)) {
+            const oldName = OLD_MARKETPLACE_NAMES.find((n) => pluginId.endsWith(`@${n}`));
+            if (oldName) {
                 const pluginName = pluginId.slice(0, pluginId.lastIndexOf("@"));
-                newPlugins[`${pluginName}@${NEW_MARKETPLACE_NAME}`] = entries;
+                const newKey = `${pluginName}@${NEW_MARKETPLACE_NAME}`;
+                if (!newPlugins[newKey]) {
+                    newPlugins[newKey] = entries;
+                }
                 regCount++;
             }
             else {

package/src/services/claude-settings.ts

@@ -630,15 +630,16 @@ export interface MarketplaceRecoveryResult {
 }
 
 // =============================================================================
-// MARKETPLACE RENAME MIGRATION: mag-claude-plugins → magus
+// MARKETPLACE RENAME MIGRATION: mag-claude-plugins / MadAppGang-claude-code → magus
 // =============================================================================
 
-const OLD_MARKETPLACE_NAME = "mag-claude-plugins";
+const OLD_MARKETPLACE_NAMES = ["mag-claude-plugins", "MadAppGang-claude-code"];
 const NEW_MARKETPLACE_NAME = "magus";
 
 /**
- * Rename plugin keys in a Record from old marketplace to new.
+ * Rename plugin keys in a Record from any old marketplace name to new.
  * e.g., "frontend@mag-claude-plugins" → "frontend@magus"
+ *        "dev@MadAppGang-claude-code" → "dev@magus"
  * Returns [migratedRecord, count] — count=0 means no changes.
  */
 function migratePluginKeys<T>(
@@ -648,9 +649,14 @@ function migratePluginKeys<T>(
 	const migrated: Record<string, T> = {};
 	let count = 0;
 	for (const [key, value] of Object.entries(record)) {
-		if (key.endsWith(`@${OLD_MARKETPLACE_NAME}`)) {
+		const oldName = OLD_MARKETPLACE_NAMES.find((n) => key.endsWith(`@${n}`));
+		if (oldName) {
 			const pluginName = key.slice(0, key.lastIndexOf("@"));
-			migrated[`${pluginName}@${NEW_MARKETPLACE_NAME}`] = value;
+			const newKey = `${pluginName}@${NEW_MARKETPLACE_NAME}`;
+			// Don't overwrite if canonical key already exists
+			if (!record[newKey]) {
+				migrated[newKey] = value;
+			}
 			count++;
 		} else {
 			migrated[key] = value;
@@ -678,12 +684,16 @@ function migrateSettingsObject(settings: ClaudeSettings): number {
 		total += ivCount;
 	}
 
-	// Migrate extraKnownMarketplaces key
-	if (settings.extraKnownMarketplaces?.[OLD_MARKETPLACE_NAME]) {
-		const entry = settings.extraKnownMarketplaces[OLD_MARKETPLACE_NAME];
-		delete settings.extraKnownMarketplaces[OLD_MARKETPLACE_NAME];
-		settings.extraKnownMarketplaces[NEW_MARKETPLACE_NAME] = entry;
-		total++;
+	// Migrate extraKnownMarketplaces keys
+	for (const oldName of OLD_MARKETPLACE_NAMES) {
+		if (settings.extraKnownMarketplaces?.[oldName]) {
+			const entry = settings.extraKnownMarketplaces[oldName];
+			delete settings.extraKnownMarketplaces[oldName];
+			if (!settings.extraKnownMarketplaces[NEW_MARKETPLACE_NAME]) {
+				settings.extraKnownMarketplaces[NEW_MARKETPLACE_NAME] = entry;
+			}
+			total++;
+		}
 	}
 
 	return total;
@@ -748,40 +758,40 @@ export async function migrateMarketplaceRename(
 		}
 	} catch { /* skip if unreadable */ }
 
-	// 4. known_marketplaces.json — rename the key + physical directory cleanup
+	// 4. known_marketplaces.json — rename old keys + physical directory cleanup
 	const pluginsDir = path.join(os.homedir(), ".claude", "plugins", "marketplaces");
-	const oldDir = path.join(pluginsDir, OLD_MARKETPLACE_NAME);
 	const newDir = path.join(pluginsDir, NEW_MARKETPLACE_NAME);
 
 	try {
 		const known = await readKnownMarketplaces();
 		let knownModified = false;
 
-		if (known[OLD_MARKETPLACE_NAME]) {
-			const oldEntry = known[OLD_MARKETPLACE_NAME];
-
-			// If canonical entry already exists, just delete the old one
-			if (!known[NEW_MARKETPLACE_NAME]) {
-				known[NEW_MARKETPLACE_NAME] = {
-					...oldEntry,
-					source: {
-						...oldEntry.source,
-						repo: "MadAppGang/magus",
-					},
-				};
+		for (const oldName of OLD_MARKETPLACE_NAMES) {
+			if (known[oldName]) {
+				const oldEntry = known[oldName];
+				// If canonical entry doesn't exist yet, create it
+				if (!known[NEW_MARKETPLACE_NAME]) {
+					known[NEW_MARKETPLACE_NAME] = {
+						...oldEntry,
+						source: {
+							...oldEntry.source,
+							repo: "MadAppGang/magus",
+						},
+					};
+				}
+				delete known[oldName];
+				knownModified = true;
 			}
-			delete known[OLD_MARKETPLACE_NAME];
-			knownModified = true;
-		}
 
-		// Ensure installLocation points to new directory name
-		if (known[NEW_MARKETPLACE_NAME]?.installLocation?.includes(OLD_MARKETPLACE_NAME)) {
-			known[NEW_MARKETPLACE_NAME].installLocation =
-				known[NEW_MARKETPLACE_NAME].installLocation.replace(
-					OLD_MARKETPLACE_NAME,
-					NEW_MARKETPLACE_NAME,
-				);
-			knownModified = true;
+			// Ensure installLocation doesn't reference old directory names
+			if (known[NEW_MARKETPLACE_NAME]?.installLocation?.includes(oldName)) {
+				known[NEW_MARKETPLACE_NAME].installLocation =
+					known[NEW_MARKETPLACE_NAME].installLocation.replace(
+						oldName,
+						NEW_MARKETPLACE_NAME,
+					);
+				knownModified = true;
+			}
 		}
 
 		if (knownModified) {
@@ -790,30 +800,32 @@ export async function migrateMarketplaceRename(
 		}
 	} catch { /* skip if unreadable */ }
 
-	// 4b. Rename/remove the old physical directory (runs even if key was already migrated)
-	try {
-		if (await fs.pathExists(oldDir)) {
-			if (!(await fs.pathExists(newDir))) {
-				await fs.rename(oldDir, newDir);
-			} else {
-				// Both exist — remove the old one (magus dir is canonical)
-				await fs.remove(oldDir);
+	// 4b. Rename/remove old physical directories (runs even if keys were already migrated)
+	for (const oldName of OLD_MARKETPLACE_NAMES) {
+		const oldDir = path.join(pluginsDir, oldName);
+		try {
+			if (await fs.pathExists(oldDir)) {
+				if (!(await fs.pathExists(newDir))) {
+					await fs.rename(oldDir, newDir);
+				} else {
+					// Both exist — remove the old one (magus dir is canonical)
+					await fs.remove(oldDir);
+				}
 			}
-		}
-	} catch { /* non-fatal: directory cleanup is best-effort */ }
+		} catch { /* non-fatal: directory cleanup is best-effort */ }
+	}
 
 	// 4c. Update git remote URL in the marketplace clone (old → new repo)
 	try {
-		const marketplaceDir = await fs.pathExists(newDir) ? newDir : oldDir;
-		if (await fs.pathExists(path.join(marketplaceDir, ".git"))) {
+		if (await fs.pathExists(path.join(newDir, ".git"))) {
 			const { execSync } = await import("node:child_process");
 			const remote = execSync("git remote get-url origin", {
-				cwd: marketplaceDir, encoding: "utf-8", timeout: 5000,
+				cwd: newDir, encoding: "utf-8", timeout: 5000,
 			}).trim();
 			if (remote.includes("claude-code") && remote.includes("MadAppGang")) {
 				const newRemote = remote.replace("claude-code", NEW_MARKETPLACE_NAME);
 				execSync(`git remote set-url origin "${newRemote}"`, {
-					cwd: marketplaceDir, encoding: "utf-8", timeout: 5000,
+					cwd: newDir, encoding: "utf-8", timeout: 5000,
 				});
 			}
 		}
@@ -825,9 +837,13 @@ export async function migrateMarketplaceRename(
 		let regCount = 0;
 		const newPlugins: typeof registry.plugins = {};
 		for (const [pluginId, entries] of Object.entries(registry.plugins)) {
-			if (pluginId.endsWith(`@${OLD_MARKETPLACE_NAME}`)) {
+			const oldName = OLD_MARKETPLACE_NAMES.find((n) => pluginId.endsWith(`@${n}`));
+			if (oldName) {
 				const pluginName = pluginId.slice(0, pluginId.lastIndexOf("@"));
-				newPlugins[`${pluginName}@${NEW_MARKETPLACE_NAME}`] = entries;
+				const newKey = `${pluginName}@${NEW_MARKETPLACE_NAME}`;
+				if (!newPlugins[newKey]) {
+					newPlugins[newKey] = entries;
+				}
 				regCount++;
 			} else {
 				newPlugins[pluginId] = entries;

package/src/ui/App.js

@@ -182,7 +182,7 @@ function AppContentInner({ showDebug, onDebugToggle, updateInfo, onExit, }) {
             type: "SHOW_PROGRESS",
             state: { message: "Scanning marketplaces..." },
         });
-        // Migrate mag-claude-plugins → magus (idempotent), then repair plugin.json files
+        // Migrate old marketplace names → magus (idempotent), then repair plugin.json files
         migrateMarketplaceRename()
             .catch(() => { }); // non-blocking, best-effort
         repairAllMarketplaces()

package/src/ui/App.tsx

@@ -265,7 +265,7 @@ function AppContentInner({
 			state: { message: "Scanning marketplaces..." },
 		});
 
-		// Migrate mag-claude-plugins → magus (idempotent), then repair plugin.json files
+		// Migrate old marketplace names → magus (idempotent), then repair plugin.json files
 		migrateMarketplaceRename()
 			.catch(() => {}); // non-blocking, best-effort
 

package/src/ui/screens/PluginsScreen.js

@@ -8,8 +8,9 @@ import { CategoryHeader } from "../components/CategoryHeader.js";
 import { ScrollableList } from "../components/ScrollableList.js";
 import { fuzzyFilter, highlightMatches } from "../../utils/fuzzy-search.js";
 import { getAllMarketplaces } from "../../data/marketplaces.js";
-import { getAvailablePlugins, refreshAllMarketplaces, clearMarketplaceCache, saveInstalledPluginVersion, removeInstalledPluginVersion, getLocalMarketplacesInfo, } from "../../services/plugin-manager.js";
-import { enablePlugin, enableGlobalPlugin, enableLocalPlugin, saveGlobalInstalledPluginVersion, removeGlobalInstalledPluginVersion, saveLocalInstalledPluginVersion, removeLocalInstalledPluginVersion, setMcpEnvVar, getMcpEnvVars, } from "../../services/claude-settings.js";
+import { getAvailablePlugins, refreshAllMarketplaces, clearMarketplaceCache, getLocalMarketplacesInfo, } from "../../services/plugin-manager.js";
+import { setMcpEnvVar, getMcpEnvVars, } from "../../services/claude-settings.js";
+import { installPlugin as cliInstallPlugin, uninstallPlugin as cliUninstallPlugin, updatePlugin as cliUpdatePlugin, } from "../../services/claude-cli.js";
 import { getPluginEnvRequirements, getPluginSourcePath, } from "../../services/plugin-mcp-config.js";
 export function PluginsScreen() {
     const { state, dispatch } = useApp();
@@ -263,10 +264,10 @@ export function PluginsScreen() {
     };
     const handleShowAddMarketplaceInstructions = async () => {
         await modal.message("Add Marketplace", "To add a marketplace, run this command in your terminal:\n\n" +
-            "  claude marketplace add owner/repo\n\n" +
+            "  claude plugin marketplace add owner/repo\n\n" +
             "Examples:\n" +
-            "  claude marketplace add MadAppGang/magus\n" +
-            "  claude marketplace add anthropics/claude-plugins-official\n\n" +
+            "  claude plugin marketplace add MadAppGang/magus\n" +
+            "  claude plugin marketplace add anthropics/claude-plugins-official\n\n" +
             "Auto-update is enabled by default for new marketplaces.\n\n" +
             "After adding, refresh claudeup with 'r' to see the new marketplace.", "info");
     };
@@ -377,7 +378,7 @@ export function PluginsScreen() {
             else {
                 // Show add marketplace instructions
                 await modal.message(`Add ${mp.displayName}?`, `To add this marketplace, run in your terminal:\n\n` +
-                    `  claude marketplace add ${mp.source.repo || mp.name}\n\n` +
+                    `  claude plugin marketplace add ${mp.source.repo || mp.name}\n\n` +
                     `Auto-update is enabled by default.\n\n` +
                     `After adding, refresh claudeup with 'r' to see it.`, "info");
             }
@@ -454,40 +455,18 @@ export function PluginsScreen() {
                     : `Uninstalling from ${scopeLabel}`;
             modal.loading(`${actionLabel}...`);
             try {
+                const scope = scopeValue;
                 if (action === "uninstall") {
-                    // Uninstall from this scope
-                    if (scopeValue === "user") {
-                        await enableGlobalPlugin(plugin.id, false);
-                        await removeGlobalInstalledPluginVersion(plugin.id);
-                    }
-                    else if (scopeValue === "project") {
-                        await enablePlugin(plugin.id, false, state.projectPath);
-                        await removeInstalledPluginVersion(plugin.id, state.projectPath);
-                    }
-                    else {
-                        await enableLocalPlugin(plugin.id, false, state.projectPath);
-                        await removeLocalInstalledPluginVersion(plugin.id, state.projectPath);
-                    }
+                    await cliUninstallPlugin(plugin.id, scope);
+                }
+                else if (action === "update") {
+                    await cliUpdatePlugin(plugin.id, scope);
                 }
                 else {
-                    // Install or update (both save the latest version)
-                    if (scopeValue === "user") {
-                        await enableGlobalPlugin(plugin.id, true);
-                        await saveGlobalInstalledPluginVersion(plugin.id, latestVersion);
-                    }
-                    else if (scopeValue === "project") {
-                        await enablePlugin(plugin.id, true, state.projectPath);
-                        await saveInstalledPluginVersion(plugin.id, latestVersion, state.projectPath);
-                    }
-                    else {
-                        await enableLocalPlugin(plugin.id, true, state.projectPath);
-                        await saveLocalInstalledPluginVersion(plugin.id, latestVersion, state.projectPath);
-                    }
+                    await cliInstallPlugin(plugin.id, scope);
                     // On fresh install, prompt for MCP server env vars if needed
-                    if (action === "install") {
-                        modal.hideModal();
-                        await collectPluginEnvVars(plugin.name, plugin.marketplace);
-                    }
+                    modal.hideModal();
+                    await collectPluginEnvVars(plugin.name, plugin.marketplace);
                 }
                 if (action !== "install") {
                     modal.hideModal();
@@ -505,16 +484,10 @@ export function PluginsScreen() {
         if (!item || item.type !== "plugin" || !item.plugin?.hasUpdate)
             return;
         const plugin = item.plugin;
-        const isGlobal = pluginsState.scope === "global";
+        const scope = pluginsState.scope === "global" ? "user" : "project";
         modal.loading(`Updating ${plugin.name}...`);
         try {
-            const versionToSave = plugin.version || "0.0.0";
-            if (isGlobal) {
-                await saveGlobalInstalledPluginVersion(plugin.id, versionToSave);
-            }
-            else {
-                await saveInstalledPluginVersion(plugin.id, versionToSave, state.projectPath);
-            }
+            await cliUpdatePlugin(plugin.id, scope);
             modal.hideModal();
             fetchData();
         }
@@ -529,17 +502,11 @@ export function PluginsScreen() {
         const updatable = pluginsState.plugins.data.filter((p) => p.hasUpdate);
         if (updatable.length === 0)
             return;
-        const isGlobal = pluginsState.scope === "global";
+        const scope = pluginsState.scope === "global" ? "user" : "project";
         modal.loading(`Updating ${updatable.length} plugin(s)...`);
         try {
             for (const plugin of updatable) {
-                const versionToSave = plugin.version || "0.0.0";
-                if (isGlobal) {
-                    await saveGlobalInstalledPluginVersion(plugin.id, versionToSave);
-                }
-                else {
-                    await saveInstalledPluginVersion(plugin.id, versionToSave, state.projectPath);
-                }
+                await cliUpdatePlugin(plugin.id, scope);
             }
             modal.hideModal();
             fetchData();
@@ -589,39 +556,16 @@ export function PluginsScreen() {
         modal.loading(`${actionLabel}...`);
         try {
             if (action === "uninstall") {
-                // Uninstall from this scope
-                if (scope === "user") {
-                    await enableGlobalPlugin(plugin.id, false);
-                    await removeGlobalInstalledPluginVersion(plugin.id);
-                }
-                else if (scope === "project") {
-                    await enablePlugin(plugin.id, false, state.projectPath);
-                    await removeInstalledPluginVersion(plugin.id, state.projectPath);
-                }
-                else {
-                    await enableLocalPlugin(plugin.id, false, state.projectPath);
-                    await removeLocalInstalledPluginVersion(plugin.id, state.projectPath);
-                }
+                await cliUninstallPlugin(plugin.id, scope);
+            }
+            else if (action === "update") {
+                await cliUpdatePlugin(plugin.id, scope);
             }
             else {
-                // Install or update to this scope (both save the latest version)
-                if (scope === "user") {
-                    await enableGlobalPlugin(plugin.id, true);
-                    await saveGlobalInstalledPluginVersion(plugin.id, latestVersion);
-                }
-                else if (scope === "project") {
-                    await enablePlugin(plugin.id, true, state.projectPath);
-                    await saveInstalledPluginVersion(plugin.id, latestVersion, state.projectPath);
-                }
-                else {
-                    await enableLocalPlugin(plugin.id, true, state.projectPath);
-                    await saveLocalInstalledPluginVersion(plugin.id, latestVersion, state.projectPath);
-                }
+                await cliInstallPlugin(plugin.id, scope);
                 // On fresh install, prompt for MCP server env vars if needed
-                if (action === "install") {
-                    modal.hideModal();
-                    await collectPluginEnvVars(plugin.name, plugin.marketplace);
-                }
+                modal.hideModal();
+                await collectPluginEnvVars(plugin.name, plugin.marketplace);
             }
             if (action !== "install") {
                 modal.hideModal();
@@ -667,19 +611,7 @@ export function PluginsScreen() {
             return; // Cancelled
         modal.loading(`Uninstalling ${plugin.name}...`);
         try {
-            if (scopeValue === "user") {
-                await enableGlobalPlugin(plugin.id, false);
-                await removeGlobalInstalledPluginVersion(plugin.id);
-            }
-            else if (scopeValue === "project") {
-                await enablePlugin(plugin.id, false, state.projectPath);
-                await removeInstalledPluginVersion(plugin.id, state.projectPath);
-            }
-            else {
-                // local scope
-                await enableLocalPlugin(plugin.id, false, state.projectPath);
-                await removeLocalInstalledPluginVersion(plugin.id, state.projectPath);
-            }
+            await cliUninstallPlugin(plugin.id, scopeValue);
             modal.hideModal();
             fetchData();
         }