claudeup 4.32.0 → 4.33.0

package/src/ui/screens/McpScreen.tsx

@@ -9,6 +9,7 @@ import {
 	getCategoryDisplayName,
 	categoryOrder,
 } from "../../data/mcp-servers.js";
+import { fetchCuratedMcpServers } from "../../services/mcp-registry.js";
 import {
 	addMcpServer,
 	removeMcpServer,
@@ -33,7 +34,10 @@ export function McpScreen() {
 	const fetchData = useCallback(async () => {
 		dispatch({ type: "MCP_DATA_LOADING" });
 		try {
-			const serversByCategory = getMcpServersByCategory();
+			const curatedServers = await fetchCuratedMcpServers(
+				AbortSignal.timeout(10_000),
+			);
+			const serversByCategory = getMcpServersByCategory(curatedServers);
 			const installedServers = await getInstalledMcpServers(state.projectPath);
 			const enabledServers = await getEnabledMcpServers(state.projectPath);
 
@@ -70,7 +74,7 @@ export function McpScreen() {
 	const allListItems = useMemo((): McpListItem[] => {
 		if (mcp.servers.status !== "success") return [];
 
-		const serversByCategory = getMcpServersByCategory();
+		const serversByCategory = getMcpServersByCategory(mcp.servers.data);
 		const items: McpListItem[] = [];
 
 		for (const category of categoryOrder) {
@@ -86,7 +90,7 @@ export function McpScreen() {
 		}
 
 		return items;
-	}, [mcp.servers.status, mcp.installedServers]);
+	}, [mcp.servers, mcp.installedServers]);
 
 	useKeyboard((event) => {
 		if (state.isSearching || state.modal) return;
@@ -142,10 +146,14 @@ export function McpScreen() {
 		let config: McpServerConfig;
 
 		if (server.type === "http") {
-			config = { type: "http", url: server.url! };
+			if (!server.url) throw new Error(`${server.name} is missing its HTTP URL`);
+			config = { type: "http", url: server.url };
 		} else {
+			if (!server.command) {
+				throw new Error(`${server.name} is missing its launch command`);
+			}
 			config = {
-				command: server.command!,
+				command: server.command,
 				args: server.args ? [...server.args] : undefined,
 				env: server.env ? { ...server.env } : undefined,
 			};

package/src/ui/screens/PluginsScreen.tsx

@@ -18,8 +18,11 @@ import {
 	refreshAllMarketplaces,
 	clearMarketplaceCache,
 	getLocalMarketplacesInfo,
+	isInstalledInScope,
+	resolveScopeAction,
 	saveInstalledPluginVersion,
 	type PluginInfo,
+	type ScopeStatus,
 } from "../../services/plugin-manager.js";
 import {
 	setMcpEnvVar,
@@ -605,10 +608,10 @@ export function PluginsScreen() {
 
 			const buildScopeLabel = (
 				name: string,
-				scope: { enabled?: boolean; version?: string } | undefined,
+				scope: ScopeStatus | undefined,
 				desc: string,
 			) => {
-				const installed = scope?.enabled;
+				const installed = isInstalledInScope(scope);
 				const ver = scope?.version;
 				const hasUpdate =
 					ver &&
@@ -619,6 +622,10 @@ export function PluginsScreen() {
 				label += ` (${desc})`;
 				if (ver) label += ` v${ver}`;
 				if (hasUpdate) label += ` → v${latestVersion}`;
+				// Enabled in settings with nothing installed. Without saying so the
+				// row reads exactly like a scope that was never enabled, and the
+				// user cannot tell that picking it repairs rather than adds.
+				if (!installed && scope?.enabled) label += " — not installed, repairs";
 				return label;
 			};
 
@@ -650,8 +657,6 @@ export function PluginsScreen() {
 					: scopeValue === "project"
 						? plugin.projectScope
 						: plugin.localScope;
-			const isInstalledInScope = selectedScope?.enabled;
-			const installedVersion = selectedScope?.version;
 			const scopeLabel =
 				scopeValue === "user"
 					? "User"
@@ -659,20 +664,9 @@ export function PluginsScreen() {
 						? "Project"
 						: "Local";
 
-			const hasUpdateInScope =
-				isInstalledInScope &&
-				installedVersion &&
-				latestVersion !== "0.0.0" &&
-				installedVersion !== latestVersion;
-
-			let action: "update" | "install" | "uninstall";
-			if (isInstalledInScope && hasUpdateInScope) {
-				action = "update";
-			} else if (isInstalledInScope) {
-				action = "uninstall";
-			} else {
-				action = "install";
-			}
+			// Decided from the registry-backed version, not the `enabledPlugins`
+			// flag alone — see resolveScopeAction.
+			const action = resolveScopeAction(selectedScope, latestVersion);
 
 			try {
 				const scope = scopeValue as PluginScope;
@@ -843,23 +837,12 @@ export function PluginsScreen() {
 				: scope === "project"
 					? plugin.projectScope
 					: plugin.localScope;
-		const isInstalledInScope = scopeData?.enabled;
-		const installedVersion = scopeData?.version;
-
-		const hasUpdateInScope =
-			isInstalledInScope &&
-			installedVersion &&
-			latestVersion !== "0.0.0" &&
-			installedVersion !== latestVersion;
-
-		let action: "update" | "install" | "uninstall";
-		if (isInstalledInScope && hasUpdateInScope) {
-			action = "update";
-		} else if (isInstalledInScope) {
-			action = "uninstall";
-		} else {
-			action = "install";
-		}
+
+		// This used to key off `scopeData.enabled` alone, so a plugin the list
+		// had just labelled "not installed" answered its own scope key by
+		// uninstalling itself — the `enabledPlugins` flag was set, the registry
+		// entry was missing, and only the flag was consulted.
+		const action = resolveScopeAction(scopeData, latestVersion);
 
 		try {
 			if (action === "uninstall") {

package/src/ui/screens/SkillsScreen.tsx

@@ -15,8 +15,8 @@ import {
   installSkill,
   uninstallSkill,
 } from "../../services/skills-manager.js";
-import { searchSkills } from "../../services/skillsmp-client.js";
-import { DEFAULT_SKILL_REPOS, RECOMMENDED_SKILLS, RECOMMENDED_SKILL_SETS, classifyStarReliability } from "../../data/skill-repos.js";
+import { fetchCuratedSkillsCatalog, searchSkills } from "../../services/skillsmp-client.js";
+import { DEFAULT_SKILL_REPOS, classifyStarReliability, type RecommendedSkill } from "../../data/skill-repos.js";
 import type { SkillInfo, SkillSetInfo, SkillSource } from "../../types/index.js";
 import { buildSkillBrowserItems } from "../adapters/skillsAdapter.js";
 import type { SkillBrowserItem } from "../adapters/skillsAdapter.js";
@@ -28,6 +28,9 @@ export function SkillsScreen() {
   const { skills: skillsState } = state;
   const modal = useModal();
   const dimensions = useDimensions();
+  const [curatedSkills, setCuratedSkills] = useState<RecommendedSkill[]>([]);
+  const [skillSets, setSkillSets] = useState<SkillSetInfo[]>([]);
+  const [expandedSets, setExpandedSets] = useState<Set<string>>(new Set());
 
   const isSearchActive =
     state.isSearching &&
@@ -39,9 +42,30 @@ export function SkillsScreen() {
   const fetchData = useCallback(async () => {
     dispatch({ type: "SKILLS_DATA_LOADING" });
     try {
+      const catalog = await fetchCuratedSkillsCatalog();
+      setCuratedSkills(catalog.skills);
+      setSkillSets((previous) =>
+        catalog.skillSets.map((skillSet) => {
+          const existing = previous.find((item) => item.repo === skillSet.repo);
+          return existing
+            ? { ...existing, ...skillSet, id: skillSet.repo }
+            : {
+                id: skillSet.repo,
+                name: skillSet.name,
+                description: skillSet.description,
+                repo: skillSet.repo,
+                icon: skillSet.icon,
+                stars: skillSet.stars,
+                skills: [],
+                loaded: false,
+                loading: false,
+              };
+        }),
+      );
       const skills = await fetchAvailableSkills(
         DEFAULT_SKILL_REPOS,
         state.projectPath,
+        catalog.skills,
       );
       dispatch({ type: "SKILLS_DATA_SUCCESS", skills });
     } catch (error) {
@@ -159,20 +183,6 @@ export function SkillsScreen() {
 
   // ── Skill Sets state ──────────────────────────────────────────────────────
 
-  const [skillSets, setSkillSets] = useState<SkillSetInfo[]>(() =>
-    RECOMMENDED_SKILL_SETS.map((rs) => ({
-      id: rs.repo,
-      name: rs.name,
-      description: rs.description,
-      repo: rs.repo,
-      icon: rs.icon,
-      stars: rs.stars,
-      skills: [],
-      loaded: false,
-      loading: false,
-    })),
-  );
-  const [expandedSets, setExpandedSets] = useState<Set<string>>(new Set());
 
   // Re-mark installed status on child skills when disk state changes
   useEffect(() => {
@@ -282,7 +292,7 @@ export function SkillsScreen() {
   // ── Derived data ──────────────────────────────────────────────────────────
 
   const staticRecommended = useMemo((): SkillInfo[] => {
-    return RECOMMENDED_SKILLS.map((r) => {
+    return curatedSkills.map((r) => {
       const slug = r.name.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
       const isUser = installedFromDisk.user.has(slug) || installedFromDisk.user.has(r.name);
       const isProj = installedFromDisk.project.has(slug) || installedFromDisk.project.has(r.name);
@@ -302,7 +312,7 @@ export function SkillsScreen() {
         starReliability: classifyStarReliability(r.repo, r.stars),
       };
     });
-  }, [installedFromDisk]);
+  }, [curatedSkills, installedFromDisk]);
 
   const mergedRecommended = useMemo((): SkillInfo[] => {
     if (skillsState.skills.status !== "success") return staticRecommended;