claudeup 3.9.0 → 3.11.0

package/src/ui/App.js

@@ -92,24 +92,24 @@ function GlobalKeyHandler({ onDebugToggle, onExit, }) {
             if (input === "1")
                 navigateToScreen("plugins");
             else if (input === "2")
-                navigateToScreen("mcp");
+                navigateToScreen("skills");
             else if (input === "3")
-                navigateToScreen("settings");
+                navigateToScreen("mcp");
             else if (input === "4")
-                navigateToScreen("cli-tools");
+                navigateToScreen("settings");
             else if (input === "5")
                 navigateToScreen("profiles");
             else if (input === "6")
-                navigateToScreen("skills");
+                navigateToScreen("cli-tools");
             // Tab navigation cycling
             if (key.tab) {
                 const screens = [
                     "plugins",
+                    "skills",
                     "mcp",
                     "settings",
-                    "cli-tools",
                     "profiles",
-                    "skills",
+                    "cli-tools",
                 ];
                 const currentIndex = screens.indexOf(state.currentRoute.screen);
                 if (currentIndex !== -1) {
@@ -144,9 +144,9 @@ function GlobalKeyHandler({ onDebugToggle, onExit, }) {
   ?             This help
 
 Quick Navigation
-  1  Plugins      4  CLI Tools
-  2  MCP Servers  5  Profiles
-  3  Settings     6  Skills
+  1  Plugins      4  Settings
+  2  Skills       5  Profiles
+  3  MCP Servers  6  CLI Tools
 
 Plugin Actions
   u  Update        d  Uninstall

package/src/ui/App.tsx

@@ -124,21 +124,21 @@ function GlobalKeyHandler({
 
 		if (isTopLevel) {
 			if (input === "1") navigateToScreen("plugins");
-			else if (input === "2") navigateToScreen("mcp");
-			else if (input === "3") navigateToScreen("settings");
-			else if (input === "4") navigateToScreen("cli-tools");
+			else if (input === "2") navigateToScreen("skills");
+			else if (input === "3") navigateToScreen("mcp");
+			else if (input === "4") navigateToScreen("settings");
 			else if (input === "5") navigateToScreen("profiles");
-			else if (input === "6") navigateToScreen("skills");
+			else if (input === "6") navigateToScreen("cli-tools");
 
 			// Tab navigation cycling
 			if (key.tab) {
 				const screens: Screen[] = [
 					"plugins",
+					"skills",
 					"mcp",
 					"settings",
-					"cli-tools",
 					"profiles",
-					"skills",
+					"cli-tools",
 				];
 				const currentIndex = screens.indexOf(
 					state.currentRoute.screen as Screen,
@@ -177,9 +177,9 @@ function GlobalKeyHandler({
   ?             This help
 
 Quick Navigation
-  1  Plugins      4  CLI Tools
-  2  MCP Servers  5  Profiles
-  3  Settings     6  Skills
+  1  Plugins      4  Settings
+  2  Skills       5  Profiles
+  3  MCP Servers  6  CLI Tools
 
 Plugin Actions
   u  Update        d  Uninstall

package/src/ui/components/EmptyFilterState.js

@@ -0,0 +1,4 @@
+import { jsxs as _jsxs, jsx as _jsx } from "@opentui/react/jsx-runtime";
+export function EmptyFilterState({ query, entityName = "items", }) {
+    return (_jsxs("box", { flexDirection: "column", marginTop: 2, paddingLeft: 2, paddingRight: 2, children: [_jsxs("text", { fg: "yellow", children: ["No ", entityName, " found for \"", query, "\""] }), _jsx("box", { marginTop: 1, children: _jsx("text", { fg: "gray", children: "Try a different search term, or if you think" }) }), _jsx("text", { fg: "gray", children: "this is a bug, report it at:" }), _jsx("box", { marginTop: 1, children: _jsx("text", { fg: "#5c9aff", children: "github.com/MadAppGang/magus/issues" }) }), _jsx("box", { marginTop: 1, children: _jsx("text", { fg: "gray", children: "Press Esc to clear the filter." }) })] }));
+}

package/src/ui/components/EmptyFilterState.tsx

@@ -0,0 +1,27 @@
+import React from "react";
+
+interface EmptyFilterStateProps {
+	query: string;
+	entityName?: string; // "plugins", "skills", "MCP servers"
+}
+
+export function EmptyFilterState({
+	query,
+	entityName = "items",
+}: EmptyFilterStateProps) {
+	return (
+		<box flexDirection="column" marginTop={2} paddingLeft={2} paddingRight={2}>
+			<text fg="yellow">No {entityName} found for "{query}"</text>
+			<box marginTop={1}>
+				<text fg="gray">Try a different search term, or if you think</text>
+			</box>
+			<text fg="gray">this is a bug, report it at:</text>
+			<box marginTop={1}>
+				<text fg="#5c9aff">github.com/MadAppGang/magus/issues</text>
+			</box>
+			<box marginTop={1}>
+				<text fg="gray">Press Esc to clear the filter.</text>
+			</box>
+		</box>
+	);
+}

package/src/ui/components/TabBar.js

@@ -2,11 +2,11 @@ import { jsxs as _jsxs, jsx as _jsx } from "@opentui/react/jsx-runtime";
 import { useKeyboardHandler } from "../hooks/useKeyboardHandler";
 const TABS = [
     { key: "1", label: "Plugins", screen: "plugins" },
-    { key: "2", label: "MCP", screen: "mcp" },
-    { key: "3", label: "Settings", screen: "settings" },
-    { key: "4", label: "CLI", screen: "cli-tools" },
+    { key: "2", label: "Skills", screen: "skills" },
+    { key: "3", label: "MCP", screen: "mcp" },
+    { key: "4", label: "Settings", screen: "settings" },
     { key: "5", label: "Profiles", screen: "profiles" },
-    { key: "6", label: "Skills", screen: "skills" },
+    { key: "6", label: "CLI", screen: "cli-tools" },
 ];
 export function TabBar({ currentScreen, onTabChange }) {
     // Handle number key shortcuts (1-5)

package/src/ui/components/TabBar.tsx

@@ -10,11 +10,11 @@ interface Tab {
 
 const TABS: Tab[] = [
 	{ key: "1", label: "Plugins", screen: "plugins" },
-	{ key: "2", label: "MCP", screen: "mcp" },
-	{ key: "3", label: "Settings", screen: "settings" },
-	{ key: "4", label: "CLI", screen: "cli-tools" },
+	{ key: "2", label: "Skills", screen: "skills" },
+	{ key: "3", label: "MCP", screen: "mcp" },
+	{ key: "4", label: "Settings", screen: "settings" },
 	{ key: "5", label: "Profiles", screen: "profiles" },
-	{ key: "6", label: "Skills", screen: "skills" },
+	{ key: "6", label: "CLI", screen: "cli-tools" },
 ];
 
 interface TabBarProps {

package/src/ui/screens/PluginsScreen.js

@@ -6,6 +6,7 @@ import { useKeyboard } from "../hooks/useKeyboard.js";
 import { ScreenLayout } from "../components/layout/index.js";
 import { CategoryHeader } from "../components/CategoryHeader.js";
 import { ScrollableList } from "../components/ScrollableList.js";
+import { EmptyFilterState } from "../components/EmptyFilterState.js";
 import { fuzzyFilter, highlightMatches } from "../../utils/fuzzy-search.js";
 import { getAllMarketplaces } from "../../data/marketplaces.js";
 import { getAvailablePlugins, refreshAllMarketplaces, clearMarketplaceCache, getLocalMarketplacesInfo, } from "../../services/plugin-manager.js";
@@ -175,31 +176,17 @@ export function PluginsScreen() {
             }
             return;
         }
-        // Navigation — always works (even during search)
+        // Navigation — always works; exits search mode on navigate
         if (event.name === "up" || event.name === "k") {
-            // 'k' navigates when query is empty, otherwise appends to search
-            if (event.name === "k" && (hasQuery || isSearchActive)) {
-                dispatch({
-                    type: "PLUGINS_SET_SEARCH",
-                    query: pluginsState.searchQuery + event.name,
-                });
-                dispatch({ type: "PLUGINS_SELECT", index: 0 });
-                return;
-            }
+            if (isSearchActive)
+                dispatch({ type: "SET_SEARCHING", isSearching: false });
             const newIndex = Math.max(0, pluginsState.selectedIndex - 1);
             dispatch({ type: "PLUGINS_SELECT", index: newIndex });
             return;
         }
         if (event.name === "down" || event.name === "j") {
-            // 'j' navigates when query is empty, otherwise appends to search
-            if (event.name === "j" && (hasQuery || isSearchActive)) {
-                dispatch({
-                    type: "PLUGINS_SET_SEARCH",
-                    query: pluginsState.searchQuery + event.name,
-                });
-                dispatch({ type: "PLUGINS_SELECT", index: 0 });
-                return;
-            }
+            if (isSearchActive)
+                dispatch({ type: "SET_SEARCHING", isSearching: false });
             const newIndex = Math.min(selectableItems.length - 1, pluginsState.selectedIndex + 1);
             dispatch({ type: "PLUGINS_SELECT", index: newIndex });
             return;
@@ -229,9 +216,9 @@ export function PluginsScreen() {
             }
             return;
         }
-        // When search query is non-empty, printable letters go to the query
-        // (shortcuts are suspended while filtering, digits skip to let tab nav work)
-        if (hasQuery || isSearchActive) {
+        // When actively typing in search, letters go to the query
+        // After Enter (isSearchActive=false, hasQuery=true), shortcuts resume
+        if (isSearchActive) {
             if (event.name.length === 1 && !event.ctrl && !event.meta && !/[0-9]/.test(event.name)) {
                 dispatch({
                     type: "PLUGINS_SET_SEARCH",
@@ -241,7 +228,7 @@ export function PluginsScreen() {
             }
             return;
         }
-        // When search query is empty: action shortcuts work normally
+        // Action shortcuts work when not actively typing (even with filter visible)
         // Start explicit search mode with /
         if (event.name === "/") {
             dispatch({ type: "SET_SEARCHING", isSearching: true });
@@ -264,18 +251,11 @@ export function PluginsScreen() {
             handleUpdate();
         else if (event.name === "a")
             handleUpdateAll();
-        else if (event.name === "d")
-            handleUninstall();
         else if (event.name === "s")
             handleSaveAsProfile();
-        // Any other printable letter: start inline search (skip digits — used for tab nav)
-        else if (event.name.length === 1 && !event.ctrl && !event.meta && !/[0-9]/.test(event.name)) {
+        // "/" to enter search mode
+        else if (event.name === "/") {
             dispatch({ type: "SET_SEARCHING", isSearching: true });
-            dispatch({
-                type: "PLUGINS_SET_SEARCH",
-                query: event.name,
-            });
-            dispatch({ type: "PLUGINS_SELECT", index: 0 });
         }
     });
     // Handle actions
@@ -639,7 +619,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"
@@ -647,12 +627,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";
@@ -660,9 +644,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"
@@ -819,18 +807,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) {
@@ -899,7 +884,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)" })] }) }))] }));
@@ -920,14 +905,14 @@ export function PluginsScreen() {
             // Show version only if valid (not null, not 0.0.0)
             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: plugin.enabled ? "green" : "yellow", children: plugin.enabled ? "● Enabled" : "● Disabled" })) : (_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" })] })] }))] }));
+            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 && (_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 || pluginsState.searchQuery
-        ? "↑↓:nav │ Enter:select │ Esc:clear │ type to filter"
-        : "u/p/l:scope │ U:update │ a:all │ d:remove │ s:profile │ type to search";
+    const footerHints = isSearchActive
+        ? "type to filter │ Enter:done │ Esc:clear"
+        : "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 : [];
@@ -940,6 +925,6 @@ export function PluginsScreen() {
             isActive: isSearchActive,
             query: pluginsState.searchQuery,
             placeholder: searchPlaceholder,
-        }, footerHints: footerHints, listPanel: _jsx(ScrollableList, { items: selectableItems, selectedIndex: pluginsState.selectedIndex, renderItem: renderListItem, maxHeight: dimensions.listPanelHeight }), detailPanel: renderDetail() }));
+        }, footerHints: footerHints, listPanel: _jsxs("box", { flexDirection: "column", children: [_jsx(ScrollableList, { items: selectableItems, selectedIndex: pluginsState.selectedIndex, renderItem: renderListItem, maxHeight: dimensions.listPanelHeight }), pluginsState.searchQuery && selectableItems.length === 0 && (_jsx(EmptyFilterState, { query: pluginsState.searchQuery, entityName: "plugins" }))] }), detailPanel: renderDetail() }));
 }
 export default PluginsScreen;

package/src/ui/screens/PluginsScreen.tsx

@@ -5,6 +5,7 @@ import { useKeyboard } from "../hooks/useKeyboard.js";
 import { ScreenLayout } from "../components/layout/index.js";
 import { CategoryHeader } from "../components/CategoryHeader.js";
 import { ScrollableList } from "../components/ScrollableList.js";
+import { EmptyFilterState } from "../components/EmptyFilterState.js";
 import { fuzzyFilter, highlightMatches } from "../../utils/fuzzy-search.js";
 import { getAllMarketplaces } from "../../data/marketplaces.js";
 import {
@@ -240,31 +241,15 @@ export function PluginsScreen() {
 			return;
 		}
 
-		// Navigation — always works (even during search)
+		// Navigation — always works; exits search mode on navigate
 		if (event.name === "up" || event.name === "k") {
-			// 'k' navigates when query is empty, otherwise appends to search
-			if (event.name === "k" && (hasQuery || isSearchActive)) {
-				dispatch({
-					type: "PLUGINS_SET_SEARCH",
-					query: pluginsState.searchQuery + event.name,
-				});
-				dispatch({ type: "PLUGINS_SELECT", index: 0 });
-				return;
-			}
+			if (isSearchActive) dispatch({ type: "SET_SEARCHING", isSearching: false });
 			const newIndex = Math.max(0, pluginsState.selectedIndex - 1);
 			dispatch({ type: "PLUGINS_SELECT", index: newIndex });
 			return;
 		}
 		if (event.name === "down" || event.name === "j") {
-			// 'j' navigates when query is empty, otherwise appends to search
-			if (event.name === "j" && (hasQuery || isSearchActive)) {
-				dispatch({
-					type: "PLUGINS_SET_SEARCH",
-					query: pluginsState.searchQuery + event.name,
-				});
-				dispatch({ type: "PLUGINS_SELECT", index: 0 });
-				return;
-			}
+			if (isSearchActive) dispatch({ type: "SET_SEARCHING", isSearching: false });
 			const newIndex = Math.min(
 				selectableItems.length - 1,
 				pluginsState.selectedIndex + 1,
@@ -302,9 +287,9 @@ export function PluginsScreen() {
 			return;
 		}
 
-		// When search query is non-empty, printable letters go to the query
-		// (shortcuts are suspended while filtering, digits skip to let tab nav work)
-		if (hasQuery || isSearchActive) {
+		// When actively typing in search, letters go to the query
+		// After Enter (isSearchActive=false, hasQuery=true), shortcuts resume
+		if (isSearchActive) {
 			if (event.name.length === 1 && !event.ctrl && !event.meta && !/[0-9]/.test(event.name)) {
 				dispatch({
 					type: "PLUGINS_SET_SEARCH",
@@ -315,7 +300,7 @@ export function PluginsScreen() {
 			return;
 		}
 
-		// When search query is empty: action shortcuts work normally
+		// Action shortcuts work when not actively typing (even with filter visible)
 
 		// Start explicit search mode with /
 		if (event.name === "/") {
@@ -332,16 +317,10 @@ 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();
-		// Any other printable letter: start inline search (skip digits — used for tab nav)
-		else if (event.name.length === 1 && !event.ctrl && !event.meta && !/[0-9]/.test(event.name)) {
+		// "/" to enter search mode
+		else if (event.name === "/") {
 			dispatch({ type: "SET_SEARCHING", isSearching: true });
-			dispatch({
-				type: "PLUGINS_SET_SEARCH",
-				query: event.name,
-			});
-			dispatch({ type: "PLUGINS_SELECT", index: 0 });
 		}
 	});
 
@@ -812,7 +791,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
@@ -822,6 +801,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 &&
@@ -829,14 +811,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 =
@@ -1066,15 +1053,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
@@ -1198,7 +1183,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) {
@@ -1260,9 +1245,7 @@ export function PluginsScreen() {
 					{/* Status line */}
 					<box marginTop={1}>
 						{isInstalled ? (
-							<text fg={plugin.enabled ? "green" : "yellow"}>
-								{plugin.enabled ? "● Enabled" : "● Disabled"}
-							</text>
+							<text fg="green">● Installed</text>
 						) : (
 							<text fg="gray">○ Not installed</text>
 						)}
@@ -1367,13 +1350,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>
@@ -1383,10 +1359,9 @@ export function PluginsScreen() {
 		return null;
 	};
 
-	const footerHints =
-		isSearchActive || pluginsState.searchQuery
-			? "↑↓:nav │ Enter:select │ Esc:clear │ type to filter"
-			: "u/p/l:scope │ U:update │ a:all │ d:remove │ s:profile │ type to search";
+	const footerHints = isSearchActive
+			? "type to filter │ Enter:done │ Esc:clear"
+			: "u/p/l:toggle │ U:update │ a:all │ s:profile │ /:search";
 
 	// Calculate status for subtitle
 	const scopeLabel = pluginsState.scope === "global" ? "Global" : "Project";
@@ -1411,12 +1386,17 @@ export function PluginsScreen() {
 			}}
 			footerHints={footerHints}
 			listPanel={
-				<ScrollableList
-					items={selectableItems}
-					selectedIndex={pluginsState.selectedIndex}
-					renderItem={renderListItem}
-					maxHeight={dimensions.listPanelHeight}
-				/>
+				<box flexDirection="column">
+					<ScrollableList
+						items={selectableItems}
+						selectedIndex={pluginsState.selectedIndex}
+						renderItem={renderListItem}
+						maxHeight={dimensions.listPanelHeight}
+					/>
+					{pluginsState.searchQuery && selectableItems.length === 0 && (
+						<EmptyFilterState query={pluginsState.searchQuery} entityName="plugins" />
+					)}
+				</box>
 			}
 			detailPanel={renderDetail()}
 		/>