claudeup 3.10.0 → 3.12.0

package/package.json

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

package/src/ui/screens/PluginsScreen.js

@@ -16,6 +16,10 @@ import { saveInstalledPluginVersion } from "../../services/plugin-manager.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";
 import { getPluginSetupFromSource, checkMissingDeps, installPluginDeps, } from "../../services/plugin-setup.js";
+// Virtual marketplace name for the community sub-section of claude-plugins-official
+const COMMUNITY_VIRTUAL_MARKETPLACE = "claude-plugins-official:community";
+// The marketplace that gets split into Anthropic Official + Community sections
+const SPLIT_MARKETPLACE = "claude-plugins-official";
 export function PluginsScreen() {
     const { state, dispatch } = useApp();
     const { plugins: pluginsState } = state;
@@ -77,6 +81,64 @@ export function PluginsScreen() {
             const isCollapsed = collapsed.has(marketplace.name);
             const isEnabled = marketplacePlugins.length > 0 || marketplace.official;
             const hasPlugins = marketplacePlugins.length > 0;
+            // Special handling: split claude-plugins-official into two sub-sections
+            if (marketplace.name === SPLIT_MARKETPLACE && hasPlugins) {
+                const anthropicPlugins = marketplacePlugins.filter((p) => p.author?.name?.toLowerCase() === "anthropic");
+                const communityPlugins = marketplacePlugins.filter((p) => p.author?.name?.toLowerCase() !== "anthropic");
+                // Sub-section 1: Anthropic Official (plugins by Anthropic)
+                const anthropicCollapsed = collapsed.has(marketplace.name);
+                const anthropicHasPlugins = anthropicPlugins.length > 0;
+                items.push({
+                    id: `mp:${marketplace.name}`,
+                    type: "category",
+                    label: marketplace.displayName,
+                    marketplace,
+                    marketplaceEnabled: isEnabled,
+                    pluginCount: anthropicPlugins.length,
+                    isExpanded: !anthropicCollapsed && anthropicHasPlugins,
+                });
+                if (isEnabled && anthropicHasPlugins && !anthropicCollapsed) {
+                    for (const plugin of anthropicPlugins) {
+                        items.push({
+                            id: `pl:${plugin.id}`,
+                            type: "plugin",
+                            label: plugin.name,
+                            plugin,
+                        });
+                    }
+                }
+                // Sub-section 2: Community (third-party plugins in same marketplace)
+                if (communityPlugins.length > 0) {
+                    const communityVirtualMp = {
+                        name: COMMUNITY_VIRTUAL_MARKETPLACE,
+                        displayName: "Community",
+                        source: marketplace.source,
+                        description: "Third-party plugins from the community",
+                    };
+                    const communityCollapsed = collapsed.has(COMMUNITY_VIRTUAL_MARKETPLACE);
+                    items.push({
+                        id: `mp:${COMMUNITY_VIRTUAL_MARKETPLACE}`,
+                        type: "category",
+                        label: "Community",
+                        marketplace: communityVirtualMp,
+                        marketplaceEnabled: true,
+                        pluginCount: communityPlugins.length,
+                        isExpanded: !communityCollapsed,
+                        isCommunitySection: true,
+                    });
+                    if (!communityCollapsed) {
+                        for (const plugin of communityPlugins) {
+                            items.push({
+                                id: `pl:${plugin.id}`,
+                                type: "plugin",
+                                label: plugin.name,
+                                plugin,
+                            });
+                        }
+                    }
+                }
+                continue;
+            }
             // Category header (marketplace)
             items.push({
                 id: `mp:${marketplace.name}`,
@@ -113,32 +175,44 @@ export function PluginsScreen() {
         // Only search plugins, not categories
         const pluginItems = allItems.filter((item) => item.type === "plugin");
         const fuzzyResults = fuzzyFilter(pluginItems, query, (item) => item.label);
-        // Include parent categories for matched plugins
-        const matchedMarketplaces = new Set();
+        // Build a set of matched plugin item ids for O(1) lookup
+        const matchedPluginIds = new Set();
         for (const result of fuzzyResults) {
-            if (result.item.plugin) {
-                matchedMarketplaces.add(result.item.plugin.marketplace);
+            matchedPluginIds.add(result.item.id);
+        }
+        // Walk allItems sequentially: track the current category section.
+        // For each category, include it only if any plugin under it matched.
+        // We build a map from category item id -> whether any plugin below matched.
+        const categoryHasMatch = new Map();
+        let currentCategoryId = null;
+        for (const item of allItems) {
+            if (item.type === "category") {
+                currentCategoryId = item.id;
+                if (!categoryHasMatch.has(item.id)) {
+                    categoryHasMatch.set(item.id, false);
+                }
+            }
+            else if (item.type === "plugin" && currentCategoryId) {
+                if (matchedPluginIds.has(item.id)) {
+                    categoryHasMatch.set(currentCategoryId, true);
+                }
             }
         }
         const result = [];
-        let currentMarketplace = null;
+        let currentCatIncluded = false;
+        currentCategoryId = null;
         for (const item of allItems) {
-            if (item.type === "category" && item.marketplace) {
-                if (matchedMarketplaces.has(item.marketplace.name)) {
+            if (item.type === "category") {
+                currentCategoryId = item.id;
+                currentCatIncluded = categoryHasMatch.get(item.id) === true;
+                if (currentCatIncluded) {
                     result.push(item);
-                    currentMarketplace = item.marketplace.name;
-                }
-                else {
-                    currentMarketplace = null;
                 }
             }
-            else if (item.type === "plugin" && item.plugin) {
-                if (currentMarketplace === item.plugin.marketplace) {
-                    // Check if this plugin matched
+            else if (item.type === "plugin" && currentCatIncluded) {
+                if (matchedPluginIds.has(item.id)) {
                     const matched = fuzzyResults.find((r) => r.item.id === item.id);
-                    if (matched) {
-                        result.push({ ...item, _matches: matched.matches });
-                    }
+                    result.push({ ...item, _matches: matched?.matches });
                 }
             }
         }
@@ -251,8 +325,6 @@ export function PluginsScreen() {
             handleUpdate();
         else if (event.name === "a")
             handleUpdateAll();
-        else if (event.name === "d")
-            handleUninstall();
         else if (event.name === "s")
             handleSaveAsProfile();
         // "/" to enter search mode
@@ -621,7 +693,7 @@ export function PluginsScreen() {
         const plugin = item.plugin;
         const latestVersion = plugin.version || "0.0.0";
         const scopeLabel = scope === "user" ? "User" : scope === "project" ? "Project" : "Local";
-        // Check if installed in this scope
+        // Check if installed in this specific scope
         const scopeData = scope === "user"
             ? plugin.userScope
             : scope === "project"
@@ -629,12 +701,16 @@ export function PluginsScreen() {
                 : plugin.localScope;
         const isInstalledInScope = scopeData?.enabled;
         const installedVersion = scopeData?.version;
+        // Also check if installed in ANY scope (for the toggle behavior)
+        const isInstalledAnywhere = plugin.userScope?.enabled || plugin.projectScope?.enabled || plugin.localScope?.enabled;
         // Check if this scope has an update available
         const hasUpdateInScope = isInstalledInScope &&
             installedVersion &&
             latestVersion !== "0.0.0" &&
             installedVersion !== latestVersion;
-        // Determine action: update if available, otherwise toggle install/uninstall
+        // Determine action: if installed in this scope → uninstall
+        // If installed anywhere else but not this scope → uninstall from detected scope
+        // Otherwise → install
         let action;
         if (isInstalledInScope && hasUpdateInScope) {
             action = "update";
@@ -642,9 +718,13 @@ export function PluginsScreen() {
         else if (isInstalledInScope) {
             action = "uninstall";
         }
-        else {
+        else if (!isInstalledAnywhere) {
             action = "install";
         }
+        else {
+            // Installed in a different scope — uninstall from the scope it's actually in
+            action = "uninstall";
+        }
         const actionLabel = action === "update"
             ? `Updating ${scopeLabel}`
             : action === "install"
@@ -771,7 +851,11 @@ export function PluginsScreen() {
             let statusText = "";
             let statusColor = "green";
             if (item.marketplaceEnabled) {
-                if (mp.name === "claude-plugins-official") {
+                if (item.isCommunitySection) {
+                    statusText = "3rd Party";
+                    statusColor = "gray";
+                }
+                else if (mp.name === "claude-plugins-official") {
                     statusText = "★ Official";
                     statusColor = "yellow";
                 }
@@ -801,18 +885,15 @@ export function PluginsScreen() {
             const plugin = item.plugin;
             let statusIcon = "○";
             let statusColor = "gray";
+            const isAnyScope = plugin.userScope?.enabled || plugin.projectScope?.enabled || plugin.localScope?.enabled;
             if (plugin.isOrphaned) {
                 statusIcon = "x";
                 statusColor = "red";
             }
-            else if (plugin.enabled) {
+            else if (isAnyScope) {
                 statusIcon = "●";
                 statusColor = "green";
             }
-            else if (plugin.installedVersion) {
-                statusIcon = "●";
-                statusColor = "yellow";
-            }
             // Build version string
             let versionStr = "";
             if (plugin.isOrphaned) {
@@ -854,6 +935,8 @@ export function PluginsScreen() {
             const isEnabled = selectedItem.marketplaceEnabled;
             // Get appropriate badge for marketplace type
             const getBadge = () => {
+                if (selectedItem.isCommunitySection)
+                    return " 3rd Party";
                 if (mp.name === "claude-plugins-official")
                     return " ★";
                 if (mp.name === "claude-code-plugins")
@@ -881,7 +964,7 @@ export function PluginsScreen() {
         }
         if (selectedItem.type === "plugin" && selectedItem.plugin) {
             const plugin = selectedItem.plugin;
-            const isInstalled = plugin.enabled || plugin.installedVersion;
+            const isInstalled = plugin.userScope?.enabled || plugin.projectScope?.enabled || plugin.localScope?.enabled;
             // Orphaned/deprecated plugin
             if (plugin.isOrphaned) {
                 return (_jsxs("box", { flexDirection: "column", children: [_jsx("box", { justifyContent: "center", children: _jsx("text", { bg: "yellow", fg: "black", children: _jsxs("strong", { children: [" ", plugin.name, " \u2014 DEPRECATED "] }) }) }), _jsx("box", { marginTop: 1, children: _jsx("text", { fg: "yellow", children: "This plugin is no longer in the marketplace." }) }), _jsx("box", { marginTop: 1, children: _jsx("text", { fg: "gray", children: "It was removed from the marketplace but still referenced in your settings. Press d to uninstall and clean up." }) }), isInstalled && (_jsx("box", { flexDirection: "column", marginTop: 2, children: _jsxs("box", { children: [_jsx("text", { bg: "red", fg: "white", children: " d " }), _jsx("text", { children: " Uninstall (recommended)" })] }) }))] }));
@@ -903,13 +986,13 @@ export function PluginsScreen() {
             const showVersion = plugin.version && plugin.version !== "0.0.0";
             const showInstalledVersion = plugin.installedVersion && plugin.installedVersion !== "0.0.0";
             return (_jsxs("box", { flexDirection: "column", children: [_jsx("box", { justifyContent: "center", children: _jsx("text", { bg: "magenta", fg: "white", children: _jsxs("strong", { children: [" ", plugin.name, plugin.hasUpdate ? " ⬆" : "", " "] }) }) }), _jsx("box", { marginTop: 1, children: isInstalled ? (_jsx("text", { fg: "green", children: "\u25CF Installed" })) : (_jsx("text", { fg: "gray", children: "\u25CB Not installed" })) }), _jsx("box", { marginTop: 1, marginBottom: 1, children: _jsx("text", { fg: "white", children: plugin.description }) }), showVersion && (_jsxs("text", { children: [_jsx("span", { children: "Version " }), _jsxs("span", { fg: "#5c9aff", children: ["v", plugin.version] }), showInstalledVersion &&
-                                plugin.installedVersion !== plugin.version && (_jsxs("span", { children: [" (v", plugin.installedVersion, " installed)"] }))] })), plugin.category && (_jsxs("text", { children: [_jsx("span", { children: "Category " }), _jsx("span", { fg: "magenta", children: plugin.category })] })), plugin.author && (_jsxs("text", { children: [_jsx("span", { children: "Author " }), _jsx("span", { children: plugin.author.name })] })), components.length > 0 && (_jsxs("text", { children: [_jsx("span", { children: "Contains " }), _jsx("span", { fg: "yellow", children: components.join(" · ") })] })), _jsxs("box", { flexDirection: "column", marginTop: 1, children: [_jsx("text", { children: "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }), _jsx("text", { children: _jsx("strong", { children: "Scopes:" }) }), _jsxs("box", { marginTop: 1, flexDirection: "column", children: [_jsxs("text", { children: [_jsxs("span", { bg: "cyan", fg: "black", children: [" ", "u", " "] }), _jsx("span", { fg: plugin.userScope?.enabled ? "cyan" : "gray", children: plugin.userScope?.enabled ? " ● " : " ○ " }), _jsx("span", { fg: "cyan", children: "User" }), _jsx("span", { children: " global" }), plugin.userScope?.version && (_jsxs("span", { fg: "cyan", children: [" v", plugin.userScope.version] }))] }), _jsxs("text", { children: [_jsxs("span", { bg: "green", fg: "black", children: [" ", "p", " "] }), _jsx("span", { fg: plugin.projectScope?.enabled ? "green" : "gray", children: plugin.projectScope?.enabled ? " ● " : " ○ " }), _jsx("span", { fg: "green", children: "Project" }), _jsx("span", { children: " team" }), plugin.projectScope?.version && (_jsxs("span", { fg: "green", children: [" v", plugin.projectScope.version] }))] }), _jsxs("text", { children: [_jsxs("span", { bg: "yellow", fg: "black", children: [" ", "l", " "] }), _jsx("span", { fg: plugin.localScope?.enabled ? "yellow" : "gray", children: plugin.localScope?.enabled ? " ● " : " ○ " }), _jsx("span", { fg: "yellow", children: "Local" }), _jsx("span", { children: " private" }), plugin.localScope?.version && (_jsxs("span", { fg: "yellow", children: [" v", plugin.localScope.version] }))] })] })] }), isInstalled && (_jsxs("box", { flexDirection: "column", marginTop: 1, children: [plugin.hasUpdate && (_jsxs("box", { children: [_jsxs("text", { bg: "magenta", fg: "white", children: [" ", "U", " "] }), _jsxs("text", { children: [" Update to v", plugin.version] })] })), _jsxs("box", { children: [_jsxs("text", { bg: "red", fg: "white", children: [" ", "d", " "] }), _jsx("text", { children: " Uninstall" })] })] }))] }));
+                                plugin.installedVersion !== plugin.version && (_jsxs("span", { children: [" (v", plugin.installedVersion, " installed)"] }))] })), plugin.category && (_jsxs("text", { children: [_jsx("span", { children: "Category " }), _jsx("span", { fg: "magenta", children: plugin.category })] })), plugin.author && (_jsxs("text", { children: [_jsx("span", { children: "Author " }), _jsx("span", { children: plugin.author.name })] })), components.length > 0 && (_jsxs("text", { children: [_jsx("span", { children: "Contains " }), _jsx("span", { fg: "yellow", children: components.join(" · ") })] })), _jsxs("box", { flexDirection: "column", marginTop: 1, children: [_jsx("text", { children: "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500" }), _jsx("text", { children: _jsx("strong", { children: "Scopes:" }) }), _jsxs("box", { marginTop: 1, flexDirection: "column", children: [_jsxs("text", { children: [_jsxs("span", { bg: "cyan", fg: "black", children: [" ", "u", " "] }), _jsx("span", { fg: plugin.userScope?.enabled ? "cyan" : "gray", children: plugin.userScope?.enabled ? " ● " : " ○ " }), _jsx("span", { fg: "cyan", children: "User" }), _jsx("span", { children: " global" }), plugin.userScope?.version && (_jsxs("span", { fg: "cyan", children: [" v", plugin.userScope.version] }))] }), _jsxs("text", { children: [_jsxs("span", { bg: "green", fg: "black", children: [" ", "p", " "] }), _jsx("span", { fg: plugin.projectScope?.enabled ? "green" : "gray", children: plugin.projectScope?.enabled ? " ● " : " ○ " }), _jsx("span", { fg: "green", children: "Project" }), _jsx("span", { children: " team" }), plugin.projectScope?.version && (_jsxs("span", { fg: "green", children: [" v", plugin.projectScope.version] }))] }), _jsxs("text", { children: [_jsxs("span", { bg: "yellow", fg: "black", children: [" ", "l", " "] }), _jsx("span", { fg: plugin.localScope?.enabled ? "yellow" : "gray", children: plugin.localScope?.enabled ? " ● " : " ○ " }), _jsx("span", { fg: "yellow", children: "Local" }), _jsx("span", { children: " private" }), plugin.localScope?.version && (_jsxs("span", { fg: "yellow", children: [" v", plugin.localScope.version] }))] })] })] }), isInstalled && (_jsx("box", { flexDirection: "column", marginTop: 1, children: plugin.hasUpdate && (_jsxs("box", { children: [_jsxs("text", { bg: "magenta", fg: "white", children: [" ", "U", " "] }), _jsxs("text", { children: [" Update to v", plugin.version] })] })) }))] }));
         }
         return null;
     };
     const footerHints = isSearchActive
         ? "type to filter │ Enter:done │ Esc:clear"
-        : "u/p/l:scope │ U:update │ a:all │ d:remove │ s:profile │ /:search";
+        : "u/p/l:toggle │ U:update │ a:all │ s:profile │ /:search";
     // Calculate status for subtitle
     const scopeLabel = pluginsState.scope === "global" ? "Global" : "Project";
     const plugins = pluginsState.plugins.status === "success" ? pluginsState.plugins.data : [];

package/src/ui/screens/PluginsScreen.tsx

@@ -41,6 +41,11 @@ import {
 } from "../../services/plugin-setup.js";
 import type { Marketplace } from "../../types/index.js";
 
+// Virtual marketplace name for the community sub-section of claude-plugins-official
+const COMMUNITY_VIRTUAL_MARKETPLACE = "claude-plugins-official:community";
+// The marketplace that gets split into Anthropic Official + Community sections
+const SPLIT_MARKETPLACE = "claude-plugins-official";
+
 interface ListItem {
 	id: string;
 	type: "category" | "plugin";
@@ -50,6 +55,8 @@ interface ListItem {
 	plugin?: PluginInfo;
 	pluginCount?: number;
 	isExpanded?: boolean;
+	/** True for the virtual Community sub-section derived from claude-plugins-official */
+	isCommunitySection?: boolean;
 }
 
 export function PluginsScreen() {
@@ -128,6 +135,72 @@ export function PluginsScreen() {
 			const isEnabled = marketplacePlugins.length > 0 || marketplace.official;
 			const hasPlugins = marketplacePlugins.length > 0;
 
+			// Special handling: split claude-plugins-official into two sub-sections
+			if (marketplace.name === SPLIT_MARKETPLACE && hasPlugins) {
+				const anthropicPlugins = marketplacePlugins.filter(
+					(p) => p.author?.name?.toLowerCase() === "anthropic",
+				);
+				const communityPlugins = marketplacePlugins.filter(
+					(p) => p.author?.name?.toLowerCase() !== "anthropic",
+				);
+
+				// Sub-section 1: Anthropic Official (plugins by Anthropic)
+				const anthropicCollapsed = collapsed.has(marketplace.name);
+				const anthropicHasPlugins = anthropicPlugins.length > 0;
+				items.push({
+					id: `mp:${marketplace.name}`,
+					type: "category",
+					label: marketplace.displayName,
+					marketplace,
+					marketplaceEnabled: isEnabled,
+					pluginCount: anthropicPlugins.length,
+					isExpanded: !anthropicCollapsed && anthropicHasPlugins,
+				});
+				if (isEnabled && anthropicHasPlugins && !anthropicCollapsed) {
+					for (const plugin of anthropicPlugins) {
+						items.push({
+							id: `pl:${plugin.id}`,
+							type: "plugin",
+							label: plugin.name,
+							plugin,
+						});
+					}
+				}
+
+				// Sub-section 2: Community (third-party plugins in same marketplace)
+				if (communityPlugins.length > 0) {
+					const communityVirtualMp: Marketplace = {
+						name: COMMUNITY_VIRTUAL_MARKETPLACE,
+						displayName: "Community",
+						source: marketplace.source,
+						description: "Third-party plugins from the community",
+					};
+					const communityCollapsed = collapsed.has(COMMUNITY_VIRTUAL_MARKETPLACE);
+					items.push({
+						id: `mp:${COMMUNITY_VIRTUAL_MARKETPLACE}`,
+						type: "category",
+						label: "Community",
+						marketplace: communityVirtualMp,
+						marketplaceEnabled: true,
+						pluginCount: communityPlugins.length,
+						isExpanded: !communityCollapsed,
+						isCommunitySection: true,
+					});
+					if (!communityCollapsed) {
+						for (const plugin of communityPlugins) {
+							items.push({
+								id: `pl:${plugin.id}`,
+								type: "plugin",
+								label: plugin.name,
+								plugin,
+							});
+						}
+					}
+				}
+
+				continue;
+			}
+
 			// Category header (marketplace)
 			items.push({
 				id: `mp:${marketplace.name}`,
@@ -168,34 +241,47 @@ export function PluginsScreen() {
 		const pluginItems = allItems.filter((item) => item.type === "plugin");
 		const fuzzyResults = fuzzyFilter(pluginItems, query, (item) => item.label);
 
-		// Include parent categories for matched plugins
-		const matchedMarketplaces = new Set<string>();
+		// Build a set of matched plugin item ids for O(1) lookup
+		const matchedPluginIds = new Set<string>();
 		for (const result of fuzzyResults) {
-			if (result.item.plugin) {
-				matchedMarketplaces.add(result.item.plugin.marketplace);
+			matchedPluginIds.add(result.item.id);
+		}
+
+		// Walk allItems sequentially: track the current category section.
+		// For each category, include it only if any plugin under it matched.
+		// We build a map from category item id -> whether any plugin below matched.
+		const categoryHasMatch = new Map<string, boolean>();
+		let currentCategoryId: string | null = null;
+		for (const item of allItems) {
+			if (item.type === "category") {
+				currentCategoryId = item.id;
+				if (!categoryHasMatch.has(item.id)) {
+					categoryHasMatch.set(item.id, false);
+				}
+			} else if (item.type === "plugin" && currentCategoryId) {
+				if (matchedPluginIds.has(item.id)) {
+					categoryHasMatch.set(currentCategoryId, true);
+				}
 			}
 		}
 
 		const result: ListItem[] = [];
-		let currentMarketplace: string | null = null;
+		let currentCatIncluded = false;
+		currentCategoryId = null;
 
 		for (const item of allItems) {
-			if (item.type === "category" && item.marketplace) {
-				if (matchedMarketplaces.has(item.marketplace.name)) {
+			if (item.type === "category") {
+				currentCategoryId = item.id;
+				currentCatIncluded = categoryHasMatch.get(item.id) === true;
+				if (currentCatIncluded) {
 					result.push(item);
-					currentMarketplace = item.marketplace.name;
-				} else {
-					currentMarketplace = null;
 				}
-			} else if (item.type === "plugin" && item.plugin) {
-				if (currentMarketplace === item.plugin.marketplace) {
-					// Check if this plugin matched
+			} else if (item.type === "plugin" && currentCatIncluded) {
+				if (matchedPluginIds.has(item.id)) {
 					const matched = fuzzyResults.find((r) => r.item.id === item.id);
-					if (matched) {
-						result.push({ ...item, _matches: matched.matches } as ListItem & {
-							_matches?: number[];
-						});
-					}
+					result.push({ ...item, _matches: matched?.matches } as ListItem & {
+						_matches?: number[];
+					});
 				}
 			}
 		}
@@ -317,7 +403,6 @@ export function PluginsScreen() {
 		else if (event.name === "l") handleScopeToggle("local");
 		else if (event.name === "U") handleUpdate();
 		else if (event.name === "a") handleUpdateAll();
-		else if (event.name === "d") handleUninstall();
 		else if (event.name === "s") handleSaveAsProfile();
 		// "/" to enter search mode
 		else if (event.name === "/") {
@@ -792,7 +877,7 @@ export function PluginsScreen() {
 		const scopeLabel =
 			scope === "user" ? "User" : scope === "project" ? "Project" : "Local";
 
-		// Check if installed in this scope
+		// Check if installed in this specific scope
 		const scopeData =
 			scope === "user"
 				? plugin.userScope
@@ -802,6 +887,9 @@ export function PluginsScreen() {
 		const isInstalledInScope = scopeData?.enabled;
 		const installedVersion = scopeData?.version;
 
+		// Also check if installed in ANY scope (for the toggle behavior)
+		const isInstalledAnywhere = plugin.userScope?.enabled || plugin.projectScope?.enabled || plugin.localScope?.enabled;
+
 		// Check if this scope has an update available
 		const hasUpdateInScope =
 			isInstalledInScope &&
@@ -809,14 +897,19 @@ export function PluginsScreen() {
 			latestVersion !== "0.0.0" &&
 			installedVersion !== latestVersion;
 
-		// Determine action: update if available, otherwise toggle install/uninstall
+		// Determine action: if installed in this scope → uninstall
+		// If installed anywhere else but not this scope → uninstall from detected scope
+		// Otherwise → install
 		let action: "update" | "install" | "uninstall";
 		if (isInstalledInScope && hasUpdateInScope) {
 			action = "update";
 		} else if (isInstalledInScope) {
 			action = "uninstall";
-		} else {
+		} else if (!isInstalledAnywhere) {
 			action = "install";
+		} else {
+			// Installed in a different scope — uninstall from the scope it's actually in
+			action = "uninstall";
 		}
 
 		const actionLabel =
@@ -998,7 +1091,10 @@ export function PluginsScreen() {
 			let statusText = "";
 			let statusColor = "green";
 			if (item.marketplaceEnabled) {
-				if (mp.name === "claude-plugins-official") {
+				if (item.isCommunitySection) {
+					statusText = "3rd Party";
+					statusColor = "gray";
+				} else if (mp.name === "claude-plugins-official") {
 					statusText = "★ Official";
 					statusColor = "yellow";
 				} else if (mp.name === "claude-code-plugins") {
@@ -1046,15 +1142,13 @@ export function PluginsScreen() {
 			let statusIcon = "○";
 			let statusColor = "gray";
 
+			const isAnyScope = plugin.userScope?.enabled || plugin.projectScope?.enabled || plugin.localScope?.enabled;
 			if (plugin.isOrphaned) {
 				statusIcon = "x";
 				statusColor = "red";
-			} else if (plugin.enabled) {
+			} else if (isAnyScope) {
 				statusIcon = "●";
 				statusColor = "green";
-			} else if (plugin.installedVersion) {
-				statusIcon = "●";
-				statusColor = "yellow";
 			}
 
 			// Build version string
@@ -1126,6 +1220,7 @@ export function PluginsScreen() {
 
 			// Get appropriate badge for marketplace type
 			const getBadge = () => {
+				if (selectedItem.isCommunitySection) return " 3rd Party";
 				if (mp.name === "claude-plugins-official") return " ★";
 				if (mp.name === "claude-code-plugins") return " ⚠";
 				if (mp.official) return " ★";
@@ -1178,7 +1273,7 @@ export function PluginsScreen() {
 
 		if (selectedItem.type === "plugin" && selectedItem.plugin) {
 			const plugin = selectedItem.plugin;
-			const isInstalled = plugin.enabled || plugin.installedVersion;
+			const isInstalled = plugin.userScope?.enabled || plugin.projectScope?.enabled || plugin.localScope?.enabled;
 
 			// Orphaned/deprecated plugin
 			if (plugin.isOrphaned) {
@@ -1345,13 +1440,6 @@ export function PluginsScreen() {
 									<text> Update to v{plugin.version}</text>
 								</box>
 							)}
-							<box>
-								<text bg="red" fg="white">
-									{" "}
-									d{" "}
-								</text>
-								<text> Uninstall</text>
-							</box>
 						</box>
 					)}
 				</box>
@@ -1363,7 +1451,7 @@ export function PluginsScreen() {
 
 	const footerHints = isSearchActive
 			? "type to filter │ Enter:done │ Esc:clear"
-			: "u/p/l:scope │ U:update │ a:all │ d:remove │ s:profile │ /:search";
+			: "u/p/l:toggle │ U:update │ a:all │ s:profile │ /:search";
 
 	// Calculate status for subtitle
 	const scopeLabel = pluginsState.scope === "global" ? "Global" : "Project";