claudeup 4.5.2 → 4.5.3

package/package.json

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

package/src/ui/renderers/pluginRenderers.js

@@ -50,12 +50,12 @@ function pluginRow(item, isSelected) {
     const hasProject = !!plugin.projectScope?.enabled;
     const hasLocal = !!plugin.localScope?.enabled;
     const hasAnyScope = hasUser || hasProject || hasLocal;
-    // Build version string
+    // Build version string — only show if plugin is installed in at least one scope
     let versionStr = "";
     if (plugin.isOrphaned) {
         versionStr = " deprecated";
     }
-    else if (plugin.installedVersion && plugin.installedVersion !== "0.0.0") {
+    else if (hasAnyScope && plugin.installedVersion && plugin.installedVersion !== "0.0.0") {
         versionStr = ` v${plugin.installedVersion}`;
         if (plugin.hasUpdate && plugin.version) {
             versionStr += ` → v${plugin.version}`;
@@ -98,8 +98,8 @@ function pluginDetail(item) {
         components.push(`${Object.keys(plugin.lspServers).length} LSP`);
     }
     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: theme.selection.bg, fg: theme.selection.fg, children: _jsxs("strong", { children: [" ", plugin.name, plugin.hasUpdate ? " ⬆" : "", " "] }) }) }), _jsx("box", { marginTop: 1, children: _jsx("text", { fg: isInstalled ? theme.colors.success : theme.colors.muted, children: isInstalled ? "● Installed" : "○ Not installed" }) }), _jsx("box", { marginTop: 1, marginBottom: 1, children: _jsx("text", { fg: theme.colors.text, children: plugin.description }) }), showVersion ? (_jsx(KeyValueLine, { label: "Version", value: _jsxs("span", { children: [_jsxs("span", { fg: theme.colors.link, children: ["v", plugin.version] }), showInstalledVersion && plugin.installedVersion !== plugin.version ? (_jsxs("span", { children: [" (v", plugin.installedVersion, " installed)"] })) : null] }) })) : null, plugin.category ? (_jsx(KeyValueLine, { label: "Category", value: _jsx("span", { fg: theme.colors.accent, children: plugin.category }) })) : null, plugin.author ? (_jsx(KeyValueLine, { label: "Author", value: _jsx("span", { children: plugin.author.name }) })) : null, components.length > 0 ? (_jsx(KeyValueLine, { label: "Contains", value: _jsx("span", { fg: theme.colors.warning, children: components.join(" · ") }) })) : null, _jsxs(DetailSection, { children: [_jsx("text", { children: "─".repeat(24) }), _jsx("text", { children: _jsx("strong", { children: "Scopes:" }) }), _jsxs("box", { marginTop: 1, flexDirection: "column", children: [_jsxs("text", { children: [_jsxs("span", { bg: theme.scopes.user, fg: "black", children: [" ", "u", " "] }), _jsx("span", { fg: plugin.userScope?.enabled ? theme.scopes.user : theme.colors.muted, children: plugin.userScope?.enabled ? " ● " : " ○ " }), _jsx("span", { fg: theme.scopes.user, children: "User" }), _jsx("span", { children: " global" }), plugin.userScope?.version ? (_jsxs("span", { fg: theme.scopes.user, children: [" v", plugin.userScope.version] })) : null] }), _jsxs("text", { children: [_jsxs("span", { bg: theme.scopes.project, fg: "black", children: [" ", "p", " "] }), _jsx("span", { fg: plugin.projectScope?.enabled ? theme.scopes.project : theme.colors.muted, children: plugin.projectScope?.enabled ? " ● " : " ○ " }), _jsx("span", { fg: theme.scopes.project, children: "Project" }), _jsx("span", { children: " team" }), plugin.projectScope?.version ? (_jsxs("span", { fg: theme.scopes.project, children: [" v", plugin.projectScope.version] })) : null] }), _jsxs("text", { children: [_jsxs("span", { bg: theme.scopes.local, fg: "black", children: [" ", "l", " "] }), _jsx("span", { fg: plugin.localScope?.enabled ? theme.scopes.local : theme.colors.muted, children: plugin.localScope?.enabled ? " ● " : " ○ " }), _jsx("span", { fg: theme.scopes.local, children: "Local" }), _jsx("span", { children: " private" }), plugin.localScope?.version ? (_jsxs("span", { fg: theme.scopes.local, children: [" v", plugin.localScope.version] })) : null] })] })] }), isInstalled && plugin.hasUpdate ? (_jsx(ActionHints, { hints: [{ key: "U", label: `Update to v${plugin.version}`, tone: "primary" }] })) : null] }));
+    const showInstalledVersion = isInstalled && plugin.installedVersion && plugin.installedVersion !== "0.0.0";
+    return (_jsxs("box", { flexDirection: "column", children: [_jsx("box", { justifyContent: "center", children: _jsx("text", { bg: theme.selection.bg, fg: theme.selection.fg, children: _jsxs("strong", { children: [" ", plugin.name, isInstalled && plugin.hasUpdate ? " ⬆" : "", " "] }) }) }), _jsx("box", { marginTop: 1, children: _jsx("text", { fg: isInstalled ? theme.colors.success : theme.colors.muted, children: isInstalled ? "● Installed" : "○ Not installed" }) }), _jsx("box", { marginTop: 1, marginBottom: 1, children: _jsx("text", { fg: theme.colors.text, children: plugin.description }) }), showVersion ? (_jsx(KeyValueLine, { label: "Version", value: _jsxs("span", { children: [_jsxs("span", { fg: theme.colors.link, children: ["v", plugin.version] }), showInstalledVersion && plugin.installedVersion !== plugin.version ? (_jsxs("span", { children: [" (v", plugin.installedVersion, " installed)"] })) : null] }) })) : null, plugin.category ? (_jsx(KeyValueLine, { label: "Category", value: _jsx("span", { fg: theme.colors.accent, children: plugin.category }) })) : null, plugin.author ? (_jsx(KeyValueLine, { label: "Author", value: _jsx("span", { children: plugin.author.name }) })) : null, components.length > 0 ? (_jsx(KeyValueLine, { label: "Contains", value: _jsx("span", { fg: theme.colors.warning, children: components.join(" · ") }) })) : null, _jsxs(DetailSection, { children: [_jsx("text", { children: "─".repeat(24) }), _jsx("text", { children: _jsx("strong", { children: "Scopes:" }) }), _jsxs("box", { marginTop: 1, flexDirection: "column", children: [_jsxs("text", { children: [_jsxs("span", { bg: theme.scopes.user, fg: "black", children: [" ", "u", " "] }), _jsx("span", { fg: plugin.userScope?.enabled ? theme.scopes.user : theme.colors.muted, children: plugin.userScope?.enabled ? " ● " : " ○ " }), _jsx("span", { fg: theme.scopes.user, children: "User" }), _jsx("span", { children: " global" }), plugin.userScope?.version ? (_jsxs("span", { fg: theme.scopes.user, children: [" v", plugin.userScope.version] })) : null] }), _jsxs("text", { children: [_jsxs("span", { bg: theme.scopes.project, fg: "black", children: [" ", "p", " "] }), _jsx("span", { fg: plugin.projectScope?.enabled ? theme.scopes.project : theme.colors.muted, children: plugin.projectScope?.enabled ? " ● " : " ○ " }), _jsx("span", { fg: theme.scopes.project, children: "Project" }), _jsx("span", { children: " team" }), plugin.projectScope?.version ? (_jsxs("span", { fg: theme.scopes.project, children: [" v", plugin.projectScope.version] })) : null] }), _jsxs("text", { children: [_jsxs("span", { bg: theme.scopes.local, fg: "black", children: [" ", "l", " "] }), _jsx("span", { fg: plugin.localScope?.enabled ? theme.scopes.local : theme.colors.muted, children: plugin.localScope?.enabled ? " ● " : " ○ " }), _jsx("span", { fg: theme.scopes.local, children: "Local" }), _jsx("span", { children: " private" }), plugin.localScope?.version ? (_jsxs("span", { fg: theme.scopes.local, children: [" v", plugin.localScope.version] })) : null] })] })] }), isInstalled && plugin.hasUpdate ? (_jsx(ActionHints, { hints: [{ key: "U", label: `Update to v${plugin.version}`, tone: "primary" }] })) : null] }));
 }
 // ─── Public dispatch functions ────────────────────────────────────────────────
 /**

package/src/ui/renderers/pluginRenderers.tsx

@@ -113,11 +113,11 @@ function pluginRow(item: PluginPluginItem, isSelected: boolean): React.ReactNode
   const hasLocal = !!plugin.localScope?.enabled;
   const hasAnyScope = hasUser || hasProject || hasLocal;
 
-  // Build version string
+  // Build version string — only show if plugin is installed in at least one scope
   let versionStr = "";
   if (plugin.isOrphaned) {
     versionStr = " deprecated";
-  } else if (plugin.installedVersion && plugin.installedVersion !== "0.0.0") {
+  } else if (hasAnyScope && plugin.installedVersion && plugin.installedVersion !== "0.0.0") {
     versionStr = ` v${plugin.installedVersion}`;
     if (plugin.hasUpdate && plugin.version) {
       versionStr += ` → v${plugin.version}`;
@@ -210,7 +210,7 @@ function pluginDetail(item: PluginPluginItem): React.ReactNode {
 
   const showVersion = plugin.version && plugin.version !== "0.0.0";
   const showInstalledVersion =
-    plugin.installedVersion && plugin.installedVersion !== "0.0.0";
+    isInstalled && plugin.installedVersion && plugin.installedVersion !== "0.0.0";
 
   return (
     <box flexDirection="column">
@@ -220,7 +220,7 @@ function pluginDetail(item: PluginPluginItem): React.ReactNode {
           <strong>
             {" "}
             {plugin.name}
-            {plugin.hasUpdate ? " ⬆" : ""}{" "}
+            {isInstalled && plugin.hasUpdate ? " ⬆" : ""}{" "}
           </strong>
         </text>
       </box>

package/src/ui/screens/PluginsScreen.js

@@ -643,7 +643,7 @@ export function PluginsScreen() {
     const scopeLabel = pluginsState.scope === "global" ? "Global" : "Project";
     const plugins = pluginsState.plugins.status === "success" ? pluginsState.plugins.data : [];
     const installedCount = plugins.filter((p) => p.enabled).length;
-    const updateCount = plugins.filter((p) => p.hasUpdate).length;
+    const updateCount = plugins.filter((p) => p.hasUpdate && (p.userScope?.enabled || p.projectScope?.enabled || p.localScope?.enabled)).length;
     const subtitle = `${scopeLabel} │ ${installedCount} installed${updateCount > 0 ? ` │ ${updateCount} updates` : ""}`;
     const searchPlaceholder = `${scopeLabel} │ ${installedCount} installed${updateCount > 0 ? ` │ ${updateCount} ⬆` : ""} │ / to search`;
     return (_jsx(ScreenLayout, { title: "claudeup Plugins", subtitle: subtitle, currentScreen: "plugins", search: {

package/src/ui/screens/PluginsScreen.tsx

@@ -799,7 +799,7 @@ export function PluginsScreen() {
 	const plugins: PluginInfo[] =
 		pluginsState.plugins.status === "success" ? pluginsState.plugins.data : [];
 	const installedCount = plugins.filter((p) => p.enabled).length;
-	const updateCount = plugins.filter((p) => p.hasUpdate).length;
+	const updateCount = plugins.filter((p) => p.hasUpdate && (p.userScope?.enabled || p.projectScope?.enabled || p.localScope?.enabled)).length;
 	const subtitle = `${scopeLabel} │ ${installedCount} installed${updateCount > 0 ? ` │ ${updateCount} updates` : ""}`;
 	const searchPlaceholder = `${scopeLabel} │ ${installedCount} installed${updateCount > 0 ? ` │ ${updateCount} ⬆` : ""} │ / to search`;
 

package/src/ui/screens/SkillsScreen.js

@@ -98,28 +98,28 @@ export function SkillsScreen() {
     }, [skillsState.searchQuery]);
     // ── Disk scan for installed skills ────────────────────────────────────────
     const [installedFromDisk, setInstalledFromDisk] = useState({ user: new Set(), project: new Set() });
-    useEffect(() => {
-        async function scanDisk() {
-            const user = new Set();
-            const project = new Set();
-            const userDir = path.join(os.homedir(), ".claude", "skills");
-            const projDir = path.join(state.projectPath || process.cwd(), ".claude", "skills");
-            for (const [dir, set] of [[userDir, user], [projDir, project]]) {
-                try {
-                    if (await fs.pathExists(dir)) {
-                        const entries = await fs.readdir(dir);
-                        for (const e of entries) {
-                            if (await fs.pathExists(path.join(dir, e, "SKILL.md")))
-                                set.add(e);
-                        }
+    const scanDisk = useCallback(async () => {
+        const user = new Set();
+        const project = new Set();
+        const userDir = path.join(os.homedir(), ".claude", "skills");
+        const projDir = path.join(state.projectPath || process.cwd(), ".claude", "skills");
+        for (const [dir, set] of [[userDir, user], [projDir, project]]) {
+            try {
+                if (await fs.pathExists(dir)) {
+                    const entries = await fs.readdir(dir);
+                    for (const e of entries) {
+                        if (await fs.pathExists(path.join(dir, e, "SKILL.md")))
+                            set.add(e);
                     }
                 }
-                catch { /* ignore */ }
             }
-            setInstalledFromDisk({ user, project });
+            catch { /* ignore */ }
         }
+        setInstalledFromDisk({ user, project });
+    }, [state.projectPath]);
+    useEffect(() => {
         scanDisk();
-    }, [state.projectPath, state.dataRefreshVersion]);
+    }, [scanDisk, state.dataRefreshVersion]);
     // ── Derived data ──────────────────────────────────────────────────────────
     const staticRecommended = useMemo(() => {
         return RECOMMENDED_SKILLS.map((r) => {
@@ -150,8 +150,15 @@ export function SkillsScreen() {
             const match = fetched.find((f) => f.source.repo === staticSkill.source.repo && f.name === staticSkill.name);
             if (!match)
                 return staticSkill;
-            // Merge: prefer fetched data but keep static stars as fallback
-            return { ...staticSkill, ...match, stars: match.stars || staticSkill.stars };
+            // Merge: prefer fetched data for description/stars, but disk scan is
+            // authoritative for installed state (staticSkill reflects current disk)
+            return {
+                ...staticSkill,
+                ...match,
+                installed: staticSkill.installed,
+                installedScope: staticSkill.installedScope,
+                stars: match.stars || staticSkill.stars,
+            };
         });
     }, [staticRecommended, skillsState.skills]);
     const installedSkills = useMemo(() => {
@@ -203,6 +210,15 @@ export function SkillsScreen() {
         skillsState.searchQuery,
         isSearchLoading,
     ]);
+    // Auto-correct selection if it lands on a category header (e.g. initial load, reset)
+    useEffect(() => {
+        const item = allItems[skillsState.selectedIndex];
+        if (item && item.kind === "category") {
+            const firstSkill = allItems.findIndex((i) => i.kind === "skill");
+            if (firstSkill >= 0)
+                dispatch({ type: "SKILLS_SELECT", index: firstSkill });
+        }
+    }, [allItems, skillsState.selectedIndex, dispatch]);
     const selectedItem = allItems[skillsState.selectedIndex];
     const selectedSkill = selectedItem?.kind === "skill" ? selectedItem.skill : undefined;
     // ── Lazy-load frontmatter for selected skill ───────────────────────────────
@@ -232,13 +248,13 @@ export function SkillsScreen() {
             return;
         try {
             await installSkill(selectedSkill, scope, state.projectPath);
-            await fetchData();
+            await scanDisk(); // Re-scan disk only — no network re-fetch needed
             showStatus(`Installed ${selectedSkill.name} to ${scope}`);
         }
         catch (error) {
             showStatus(`Failed: ${error}`, "error");
         }
-    }, [selectedSkill, state.projectPath, fetchData, showStatus]);
+    }, [selectedSkill, state.projectPath, scanDisk, showStatus]);
     const handleUninstall = useCallback(async () => {
         if (!selectedSkill || !selectedSkill.installed)
             return;
@@ -247,13 +263,13 @@ export function SkillsScreen() {
             return;
         try {
             await uninstallSkill(selectedSkill.name, scope, state.projectPath);
-            await fetchData();
+            await scanDisk(); // Re-scan disk only — no network re-fetch needed
             showStatus(`Removed ${selectedSkill.name} from ${scope}`);
         }
         catch (error) {
             showStatus(`Failed: ${error}`, "error");
         }
-    }, [selectedSkill, state.projectPath, fetchData, showStatus]);
+    }, [selectedSkill, state.projectPath, scanDisk, showStatus]);
     // ── Keyboard handling ─────────────────────────────────────────────────────
     useKeyboard((event) => {
         if (state.modal)
@@ -280,15 +296,23 @@ export function SkillsScreen() {
         if (event.name === "up" || event.name === "k") {
             if (isSearchActive)
                 dispatch({ type: "SET_SEARCHING", isSearching: false });
-            const newIndex = Math.max(0, skillsState.selectedIndex - 1);
-            dispatch({ type: "SKILLS_SELECT", index: newIndex });
+            let newIndex = skillsState.selectedIndex - 1;
+            // Skip category headers
+            while (newIndex >= 0 && allItems[newIndex]?.kind === "category")
+                newIndex--;
+            if (newIndex >= 0)
+                dispatch({ type: "SKILLS_SELECT", index: newIndex });
             return;
         }
         if (event.name === "down" || event.name === "j") {
             if (isSearchActive)
                 dispatch({ type: "SET_SEARCHING", isSearching: false });
-            const newIndex = Math.min(Math.max(0, allItems.length - 1), skillsState.selectedIndex + 1);
-            dispatch({ type: "SKILLS_SELECT", index: newIndex });
+            let newIndex = skillsState.selectedIndex + 1;
+            // Skip category headers
+            while (newIndex < allItems.length && allItems[newIndex]?.kind === "category")
+                newIndex++;
+            if (newIndex < allItems.length)
+                dispatch({ type: "SKILLS_SELECT", index: newIndex });
             return;
         }
         if (event.name === "return" || event.name === "enter") {
@@ -301,6 +325,21 @@ export function SkillsScreen() {
             }
             return;
         }
+        // Action keys work regardless of search mode when a skill is selected
+        if (event.name === "u" && selectedSkill) {
+            if (selectedSkill.installed && selectedSkill.installedScope === "user")
+                handleUninstall();
+            else
+                handleInstall("user");
+            return;
+        }
+        else if (event.name === "p" && selectedSkill) {
+            if (selectedSkill.installed && selectedSkill.installedScope === "project")
+                handleUninstall();
+            else
+                handleInstall("project");
+            return;
+        }
         if (isSearchActive) {
             if (event.name === "k" || event.name === "j") {
                 const delta = event.name === "k" ? -1 : 1;
@@ -314,19 +353,7 @@ export function SkillsScreen() {
             }
             return;
         }
-        if (event.name === "u" && selectedSkill) {
-            if (selectedSkill.installed && selectedSkill.installedScope === "user")
-                handleUninstall();
-            else
-                handleInstall("user");
-        }
-        else if (event.name === "p" && selectedSkill) {
-            if (selectedSkill.installed && selectedSkill.installedScope === "project")
-                handleUninstall();
-            else
-                handleInstall("project");
-        }
-        else if (event.name === "r") {
+        if (event.name === "r") {
             fetchData();
         }
         else if (event.name === "o" && selectedSkill) {

package/src/ui/screens/SkillsScreen.tsx

@@ -121,26 +121,27 @@ export function SkillsScreen() {
     project: Set<string>;
   }>({ user: new Set(), project: new Set() });
 
-  useEffect(() => {
-    async function scanDisk() {
-      const user = new Set<string>();
-      const project = new Set<string>();
-      const userDir = path.join(os.homedir(), ".claude", "skills");
-      const projDir = path.join(state.projectPath || process.cwd(), ".claude", "skills");
-      for (const [dir, set] of [[userDir, user], [projDir, project]] as const) {
-        try {
-          if (await fs.pathExists(dir)) {
-            const entries = await fs.readdir(dir);
-            for (const e of entries) {
-              if (await fs.pathExists(path.join(dir, e, "SKILL.md"))) set.add(e);
-            }
+  const scanDisk = useCallback(async () => {
+    const user = new Set<string>();
+    const project = new Set<string>();
+    const userDir = path.join(os.homedir(), ".claude", "skills");
+    const projDir = path.join(state.projectPath || process.cwd(), ".claude", "skills");
+    for (const [dir, set] of [[userDir, user], [projDir, project]] as const) {
+      try {
+        if (await fs.pathExists(dir)) {
+          const entries = await fs.readdir(dir);
+          for (const e of entries) {
+            if (await fs.pathExists(path.join(dir, e, "SKILL.md"))) set.add(e);
           }
-        } catch { /* ignore */ }
-      }
-      setInstalledFromDisk({ user, project });
+        }
+      } catch { /* ignore */ }
     }
+    setInstalledFromDisk({ user, project });
+  }, [state.projectPath]);
+
+  useEffect(() => {
     scanDisk();
-  }, [state.projectPath, state.dataRefreshVersion]);
+  }, [scanDisk, state.dataRefreshVersion]);
 
   // ── Derived data ──────────────────────────────────────────────────────────
 
@@ -174,8 +175,15 @@ export function SkillsScreen() {
         (f) => f.source.repo === staticSkill.source.repo && f.name === staticSkill.name,
       );
       if (!match) return staticSkill;
-      // Merge: prefer fetched data but keep static stars as fallback
-      return { ...staticSkill, ...match, stars: match.stars || staticSkill.stars };
+      // Merge: prefer fetched data for description/stars, but disk scan is
+      // authoritative for installed state (staticSkill reflects current disk)
+      return {
+        ...staticSkill,
+        ...match,
+        installed: staticSkill.installed,
+        installedScope: staticSkill.installedScope,
+        stars: match.stars || staticSkill.stars,
+      };
     });
   }, [staticRecommended, skillsState.skills]);
 
@@ -234,6 +242,15 @@ export function SkillsScreen() {
     ],
   );
 
+  // Auto-correct selection if it lands on a category header (e.g. initial load, reset)
+  useEffect(() => {
+    const item = allItems[skillsState.selectedIndex];
+    if (item && item.kind === "category") {
+      const firstSkill = allItems.findIndex((i) => i.kind === "skill");
+      if (firstSkill >= 0) dispatch({ type: "SKILLS_SELECT", index: firstSkill });
+    }
+  }, [allItems, skillsState.selectedIndex, dispatch]);
+
   const selectedItem = allItems[skillsState.selectedIndex];
   const selectedSkill =
     selectedItem?.kind === "skill" ? selectedItem.skill : undefined;
@@ -266,12 +283,12 @@ export function SkillsScreen() {
     if (!selectedSkill) return;
     try {
       await installSkill(selectedSkill, scope, state.projectPath);
-      await fetchData();
+      await scanDisk(); // Re-scan disk only — no network re-fetch needed
       showStatus(`Installed ${selectedSkill.name} to ${scope}`);
     } catch (error) {
       showStatus(`Failed: ${error}`, "error");
     }
-  }, [selectedSkill, state.projectPath, fetchData, showStatus]);
+  }, [selectedSkill, state.projectPath, scanDisk, showStatus]);
 
   const handleUninstall = useCallback(async () => {
     if (!selectedSkill || !selectedSkill.installed) return;
@@ -280,12 +297,12 @@ export function SkillsScreen() {
 
     try {
       await uninstallSkill(selectedSkill.name, scope, state.projectPath);
-      await fetchData();
+      await scanDisk(); // Re-scan disk only — no network re-fetch needed
       showStatus(`Removed ${selectedSkill.name} from ${scope}`);
     } catch (error) {
       showStatus(`Failed: ${error}`, "error");
     }
-  }, [selectedSkill, state.projectPath, fetchData, showStatus]);
+  }, [selectedSkill, state.projectPath, scanDisk, showStatus]);
 
   // ── Keyboard handling ─────────────────────────────────────────────────────
 
@@ -315,17 +332,18 @@ export function SkillsScreen() {
 
     if (event.name === "up" || event.name === "k") {
       if (isSearchActive) dispatch({ type: "SET_SEARCHING", isSearching: false });
-      const newIndex = Math.max(0, skillsState.selectedIndex - 1);
-      dispatch({ type: "SKILLS_SELECT", index: newIndex });
+      let newIndex = skillsState.selectedIndex - 1;
+      // Skip category headers
+      while (newIndex >= 0 && allItems[newIndex]?.kind === "category") newIndex--;
+      if (newIndex >= 0) dispatch({ type: "SKILLS_SELECT", index: newIndex });
       return;
     }
     if (event.name === "down" || event.name === "j") {
       if (isSearchActive) dispatch({ type: "SET_SEARCHING", isSearching: false });
-      const newIndex = Math.min(
-        Math.max(0, allItems.length - 1),
-        skillsState.selectedIndex + 1,
-      );
-      dispatch({ type: "SKILLS_SELECT", index: newIndex });
+      let newIndex = skillsState.selectedIndex + 1;
+      // Skip category headers
+      while (newIndex < allItems.length && allItems[newIndex]?.kind === "category") newIndex++;
+      if (newIndex < allItems.length) dispatch({ type: "SKILLS_SELECT", index: newIndex });
       return;
     }
 
@@ -340,6 +358,17 @@ export function SkillsScreen() {
       return;
     }
 
+    // Action keys work regardless of search mode when a skill is selected
+    if (event.name === "u" && selectedSkill) {
+      if (selectedSkill.installed && selectedSkill.installedScope === "user") handleUninstall();
+      else handleInstall("user");
+      return;
+    } else if (event.name === "p" && selectedSkill) {
+      if (selectedSkill.installed && selectedSkill.installedScope === "project") handleUninstall();
+      else handleInstall("project");
+      return;
+    }
+
     if (isSearchActive) {
       if (event.name === "k" || event.name === "j") {
         const delta = event.name === "k" ? -1 : 1;
@@ -354,13 +383,7 @@ export function SkillsScreen() {
       return;
     }
 
-    if (event.name === "u" && selectedSkill) {
-      if (selectedSkill.installed && selectedSkill.installedScope === "user") handleUninstall();
-      else handleInstall("user");
-    } else if (event.name === "p" && selectedSkill) {
-      if (selectedSkill.installed && selectedSkill.installedScope === "project") handleUninstall();
-      else handleInstall("project");
-    } else if (event.name === "r") {
+    if (event.name === "r") {
       fetchData();
     } else if (event.name === "o" && selectedSkill) {
       const repo = selectedSkill.source.repo;