claudeup 4.5.3 → 4.5.5

package/package.json

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

package/src/prerunner/index.js

@@ -4,7 +4,7 @@ import os from "node:os";
 import { UpdateCache } from "../services/update-cache.js";
 import { getAvailablePlugins, clearMarketplaceCache, } from "../services/plugin-manager.js";
 import { runClaude } from "../services/claude-runner.js";
-import { recoverMarketplaceSettings, migrateMarketplaceRename, getGlobalEnabledPlugins, getEnabledPlugins, getLocalEnabledPlugins, readGlobalSettings, writeGlobalSettings, saveGlobalInstalledPluginVersion, } from "../services/claude-settings.js";
+import { recoverMarketplaceSettings, migrateMarketplaceRename, cleanupExtraKnownMarketplaces, getGlobalEnabledPlugins, getEnabledPlugins, getLocalEnabledPlugins, readGlobalSettings, writeGlobalSettings, saveGlobalInstalledPluginVersion, } from "../services/claude-settings.js";
 import { parsePluginId } from "../utils/string-utils.js";
 import { defaultMarketplaces } from "../data/marketplaces.js";
 import { updatePlugin, addMarketplace, updateMarketplace, isClaudeAvailable, } from "../services/claude-cli.js";
@@ -170,6 +170,17 @@ export async function prerunClaude(claudeArgs, options = {}) {
                 console.log(`✓ Auto-added marketplace(s): ${addedMarketplaces.join(", ")}`);
             }
         }
+        // STEP 0.55: Clean up extraKnownMarketplaces entries that are now in known_marketplaces.json
+        // extraKnownMarketplaces was the old install mechanism; the official way is known_marketplaces.json
+        try {
+            const cleaned = await cleanupExtraKnownMarketplaces();
+            if (cleaned.length > 0) {
+                console.log(`✓ Cleaned up legacy extraKnownMarketplaces: ${cleaned.join(", ")}`);
+            }
+        }
+        catch {
+            // Non-fatal: cleanup is best-effort
+        }
         // STEP 0.6: Ensure tmux-claude-continuity hooks are configured
         const addedHooks = await ensureTmuxContinuityHooks();
         if (addedHooks) {

package/src/prerunner/index.ts

@@ -10,6 +10,7 @@ import { runClaude } from "../services/claude-runner.js";
 import {
 	recoverMarketplaceSettings,
 	migrateMarketplaceRename,
+	cleanupExtraKnownMarketplaces,
 	getGlobalEnabledPlugins,
 	getEnabledPlugins,
 	getLocalEnabledPlugins,
@@ -234,6 +235,19 @@ export async function prerunClaude(
 			}
 		}
 
+		// STEP 0.55: Clean up extraKnownMarketplaces entries that are now in known_marketplaces.json
+		// extraKnownMarketplaces was the old install mechanism; the official way is known_marketplaces.json
+		try {
+			const cleaned = await cleanupExtraKnownMarketplaces();
+			if (cleaned.length > 0) {
+				console.log(
+					`✓ Cleaned up legacy extraKnownMarketplaces: ${cleaned.join(", ")}`,
+				);
+			}
+		} catch {
+			// Non-fatal: cleanup is best-effort
+		}
+
 		// STEP 0.6: Ensure tmux-claude-continuity hooks are configured
 		const addedHooks = await ensureTmuxContinuityHooks();
 		if (addedHooks) {

package/src/services/claude-settings.js

@@ -279,16 +279,48 @@ export async function getEnabledMcpServers(projectPath) {
     }
     return enabled;
 }
-// Get all configured marketplaces
+// Get all configured marketplaces — merges known_marketplaces.json (primary) with extraKnownMarketplaces (legacy fallback)
 export async function getConfiguredMarketplaces(projectPath) {
+    const result = {};
+    // Primary: known_marketplaces.json (official Claude Code registry)
+    const known = await readKnownMarketplaces();
+    for (const [name, entry] of Object.entries(known)) {
+        if (entry.source?.repo) {
+            result[name] = {
+                source: { source: "github", repo: entry.source.repo },
+            };
+        }
+    }
+    // Fallback: extraKnownMarketplaces (legacy — only adds entries not already in known)
     const settings = await readSettings(projectPath);
-    return settings.extraKnownMarketplaces || {};
+    for (const [name, config] of Object.entries(settings.extraKnownMarketplaces || {})) {
+        if (!result[name]) {
+            result[name] = config;
+        }
+    }
+    return result;
 }
 // Global marketplace management - READ ONLY
 // Marketplaces are managed via Claude Code's native system
 export async function getGlobalConfiguredMarketplaces() {
+    const result = {};
+    // Primary: known_marketplaces.json
+    const known = await readKnownMarketplaces();
+    for (const [name, entry] of Object.entries(known)) {
+        if (entry.source?.repo) {
+            result[name] = {
+                source: { source: "github", repo: entry.source.repo },
+            };
+        }
+    }
+    // Fallback: extraKnownMarketplaces
     const settings = await readGlobalSettings();
-    return settings.extraKnownMarketplaces || {};
+    for (const [name, config] of Object.entries(settings.extraKnownMarketplaces || {})) {
+        if (!result[name]) {
+            result[name] = config;
+        }
+    }
+    return result;
 }
 // Global plugin management
 export async function enableGlobalPlugin(pluginId, enabled) {
@@ -331,13 +363,29 @@ export async function removeGlobalInstalledPluginVersion(pluginId) {
     await removeFromInstalledPluginsRegistry(pluginId, "user");
 }
 // Shared logic for discovering marketplaces from settings
-function discoverMarketplacesFromSettings(settings) {
+function discoverMarketplacesFromSettings(settings, knownMarketplaces) {
     const discovered = new Map();
-    // 1. From extraKnownMarketplaces (explicitly configured)
+    // 1. From known_marketplaces.json (official Claude Code registry — primary source)
+    if (knownMarketplaces) {
+        for (const [name, entry] of Object.entries(knownMarketplaces)) {
+            if (entry.source?.repo) {
+                discovered.set(name, {
+                    name,
+                    source: "configured",
+                    config: {
+                        source: { source: "github", repo: entry.source.repo },
+                    },
+                });
+            }
+        }
+    }
+    // 2. From extraKnownMarketplaces (legacy/team fallback — only adds entries not already in known_marketplaces.json)
     for (const [name, config] of Object.entries(settings.extraKnownMarketplaces || {})) {
-        discovered.set(name, { name, source: "configured", config });
+        if (!discovered.has(name)) {
+            discovered.set(name, { name, source: "configured", config });
+        }
     }
-    // 2. From enabledPlugins (infer marketplace from plugin ID format: pluginName@marketplaceName)
+    // 3. From enabledPlugins (infer marketplace from plugin ID format: pluginName@marketplaceName)
     for (const pluginId of Object.keys(settings.enabledPlugins || {})) {
         const parsed = parsePluginId(pluginId);
         if (parsed && !discovered.has(parsed.marketplace)) {
@@ -347,7 +395,7 @@ function discoverMarketplacesFromSettings(settings) {
             });
         }
     }
-    // 3. From installedPluginVersions (same format)
+    // 4. From installedPluginVersions (same format)
     for (const pluginId of Object.keys(settings.installedPluginVersions || {})) {
         const parsed = parsePluginId(pluginId);
         if (parsed && !discovered.has(parsed.marketplace)) {
@@ -363,7 +411,8 @@ function discoverMarketplacesFromSettings(settings) {
 export async function discoverAllMarketplaces(projectPath) {
     try {
         const settings = await readSettings(projectPath);
-        return discoverMarketplacesFromSettings(settings);
+        const known = await readKnownMarketplaces();
+        return discoverMarketplacesFromSettings(settings, known);
     }
     catch (error) {
         // Graceful degradation - return empty array instead of crashing
@@ -375,7 +424,8 @@ export async function discoverAllMarketplaces(projectPath) {
 export async function discoverAllGlobalMarketplaces() {
     try {
         const settings = await readGlobalSettings();
-        return discoverMarketplacesFromSettings(settings);
+        const known = await readKnownMarketplaces();
+        return discoverMarketplacesFromSettings(settings, known);
     }
     catch (error) {
         // Graceful degradation - return empty array instead of crashing
@@ -758,6 +808,74 @@ export async function recoverMarketplaceSettings() {
     }
     return result;
 }
+/**
+ * Clean up extraKnownMarketplaces entries that are now properly registered
+ * in known_marketplaces.json (the official Claude Code marketplace registry).
+ *
+ * extraKnownMarketplaces was the old claudeup install mechanism. The official
+ * way is `claude plugin marketplace add` which writes to known_marketplaces.json.
+ * extraKnownMarketplaces should only be used in project settings for team
+ * marketplace suggestions — not in user settings as a primary install path.
+ *
+ * This function removes magus-related entries from extraKnownMarketplaces in
+ * both user and project settings when they're already in known_marketplaces.json.
+ */
+export async function cleanupExtraKnownMarketplaces(projectPath) {
+    const known = await readKnownMarketplaces();
+    const cleaned = [];
+    // Clean user-level settings
+    try {
+        const globalSettings = await readGlobalSettings();
+        if (globalSettings.extraKnownMarketplaces) {
+            let changed = false;
+            for (const name of Object.keys(globalSettings.extraKnownMarketplaces)) {
+                if (known[name]) {
+                    delete globalSettings.extraKnownMarketplaces[name];
+                    cleaned.push(`user:${name}`);
+                    changed = true;
+                }
+            }
+            // Remove the field entirely if empty
+            if (changed &&
+                Object.keys(globalSettings.extraKnownMarketplaces).length === 0) {
+                delete globalSettings.extraKnownMarketplaces;
+            }
+            if (changed) {
+                await writeGlobalSettings(globalSettings);
+            }
+        }
+    }
+    catch {
+        // Non-fatal: user settings cleanup is best-effort
+    }
+    // Clean project-level settings
+    if (projectPath) {
+        try {
+            const projectSettings = await readSettings(projectPath);
+            if (projectSettings.extraKnownMarketplaces) {
+                let changed = false;
+                for (const name of Object.keys(projectSettings.extraKnownMarketplaces)) {
+                    if (known[name]) {
+                        delete projectSettings.extraKnownMarketplaces[name];
+                        cleaned.push(`project:${name}`);
+                        changed = true;
+                    }
+                }
+                if (changed &&
+                    Object.keys(projectSettings.extraKnownMarketplaces).length === 0) {
+                    delete projectSettings.extraKnownMarketplaces;
+                }
+                if (changed) {
+                    await writeSettings(projectSettings, projectPath);
+                }
+            }
+        }
+        catch {
+            // Non-fatal: project settings cleanup is best-effort
+        }
+    }
+    return cleaned;
+}
 /**
  * Read known_marketplaces.json to get marketplace source info
  */

package/src/services/claude-settings.ts

@@ -415,12 +415,33 @@ export async function getEnabledMcpServers(
 	return enabled;
 }
 
-// Get all configured marketplaces
+// Get all configured marketplaces — merges known_marketplaces.json (primary) with extraKnownMarketplaces (legacy fallback)
 export async function getConfiguredMarketplaces(
 	projectPath?: string,
 ): Promise<Record<string, MarketplaceSource>> {
+	const result: Record<string, MarketplaceSource> = {};
+
+	// Primary: known_marketplaces.json (official Claude Code registry)
+	const known = await readKnownMarketplaces();
+	for (const [name, entry] of Object.entries(known)) {
+		if (entry.source?.repo) {
+			result[name] = {
+				source: { source: "github" as const, repo: entry.source.repo },
+			};
+		}
+	}
+
+	// Fallback: extraKnownMarketplaces (legacy — only adds entries not already in known)
 	const settings = await readSettings(projectPath);
-	return settings.extraKnownMarketplaces || {};
+	for (const [name, config] of Object.entries(
+		settings.extraKnownMarketplaces || {},
+	)) {
+		if (!result[name]) {
+			result[name] = config;
+		}
+	}
+
+	return result;
 }
 
 // Global marketplace management - READ ONLY
@@ -429,8 +450,29 @@ export async function getConfiguredMarketplaces(
 export async function getGlobalConfiguredMarketplaces(): Promise<
 	Record<string, MarketplaceSource>
 > {
+	const result: Record<string, MarketplaceSource> = {};
+
+	// Primary: known_marketplaces.json
+	const known = await readKnownMarketplaces();
+	for (const [name, entry] of Object.entries(known)) {
+		if (entry.source?.repo) {
+			result[name] = {
+				source: { source: "github" as const, repo: entry.source.repo },
+			};
+		}
+	}
+
+	// Fallback: extraKnownMarketplaces
 	const settings = await readGlobalSettings();
-	return settings.extraKnownMarketplaces || {};
+	for (const [name, config] of Object.entries(
+		settings.extraKnownMarketplaces || {},
+	)) {
+		if (!result[name]) {
+			result[name] = config;
+		}
+	}
+
+	return result;
 }
 
 // Global plugin management
@@ -494,17 +536,35 @@ export async function removeGlobalInstalledPluginVersion(
 // Shared logic for discovering marketplaces from settings
 function discoverMarketplacesFromSettings(
 	settings: ClaudeSettings,
+	knownMarketplaces?: KnownMarketplaces,
 ): DiscoveredMarketplace[] {
 	const discovered = new Map<string, DiscoveredMarketplace>();
 
-	// 1. From extraKnownMarketplaces (explicitly configured)
+	// 1. From known_marketplaces.json (official Claude Code registry — primary source)
+	if (knownMarketplaces) {
+		for (const [name, entry] of Object.entries(knownMarketplaces)) {
+			if (entry.source?.repo) {
+				discovered.set(name, {
+					name,
+					source: "configured",
+					config: {
+						source: { source: "github" as const, repo: entry.source.repo },
+					},
+				});
+			}
+		}
+	}
+
+	// 2. From extraKnownMarketplaces (legacy/team fallback — only adds entries not already in known_marketplaces.json)
 	for (const [name, config] of Object.entries(
 		settings.extraKnownMarketplaces || {},
 	)) {
-		discovered.set(name, { name, source: "configured", config });
+		if (!discovered.has(name)) {
+			discovered.set(name, { name, source: "configured", config });
+		}
 	}
 
-	// 2. From enabledPlugins (infer marketplace from plugin ID format: pluginName@marketplaceName)
+	// 3. From enabledPlugins (infer marketplace from plugin ID format: pluginName@marketplaceName)
 	for (const pluginId of Object.keys(settings.enabledPlugins || {})) {
 		const parsed = parsePluginId(pluginId);
 		if (parsed && !discovered.has(parsed.marketplace)) {
@@ -515,7 +575,7 @@ function discoverMarketplacesFromSettings(
 		}
 	}
 
-	// 3. From installedPluginVersions (same format)
+	// 4. From installedPluginVersions (same format)
 	for (const pluginId of Object.keys(settings.installedPluginVersions || {})) {
 		const parsed = parsePluginId(pluginId);
 		if (parsed && !discovered.has(parsed.marketplace)) {
@@ -535,7 +595,8 @@ export async function discoverAllMarketplaces(
 ): Promise<DiscoveredMarketplace[]> {
 	try {
 		const settings = await readSettings(projectPath);
-		return discoverMarketplacesFromSettings(settings);
+		const known = await readKnownMarketplaces();
+		return discoverMarketplacesFromSettings(settings, known);
 	} catch (error) {
 		// Graceful degradation - return empty array instead of crashing
 		console.error(
@@ -552,7 +613,8 @@ export async function discoverAllGlobalMarketplaces(): Promise<
 > {
 	try {
 		const settings = await readGlobalSettings();
-		return discoverMarketplacesFromSettings(settings);
+		const known = await readKnownMarketplaces();
+		return discoverMarketplacesFromSettings(settings, known);
 	} catch (error) {
 		// Graceful degradation - return empty array instead of crashing
 		console.error(
@@ -1019,6 +1081,84 @@ export async function recoverMarketplaceSettings(): Promise<MarketplaceRecoveryR
 	return result;
 }
 
+/**
+ * Clean up extraKnownMarketplaces entries that are now properly registered
+ * in known_marketplaces.json (the official Claude Code marketplace registry).
+ *
+ * extraKnownMarketplaces was the old claudeup install mechanism. The official
+ * way is `claude plugin marketplace add` which writes to known_marketplaces.json.
+ * extraKnownMarketplaces should only be used in project settings for team
+ * marketplace suggestions — not in user settings as a primary install path.
+ *
+ * This function removes magus-related entries from extraKnownMarketplaces in
+ * both user and project settings when they're already in known_marketplaces.json.
+ */
+export async function cleanupExtraKnownMarketplaces(
+	projectPath?: string,
+): Promise<string[]> {
+	const known = await readKnownMarketplaces();
+	const cleaned: string[] = [];
+
+	// Clean user-level settings
+	try {
+		const globalSettings = await readGlobalSettings();
+		if (globalSettings.extraKnownMarketplaces) {
+			let changed = false;
+			for (const name of Object.keys(globalSettings.extraKnownMarketplaces)) {
+				if (known[name]) {
+					delete globalSettings.extraKnownMarketplaces[name];
+					cleaned.push(`user:${name}`);
+					changed = true;
+				}
+			}
+			// Remove the field entirely if empty
+			if (
+				changed &&
+				Object.keys(globalSettings.extraKnownMarketplaces).length === 0
+			) {
+				delete globalSettings.extraKnownMarketplaces;
+			}
+			if (changed) {
+				await writeGlobalSettings(globalSettings);
+			}
+		}
+	} catch {
+		// Non-fatal: user settings cleanup is best-effort
+	}
+
+	// Clean project-level settings
+	if (projectPath) {
+		try {
+			const projectSettings = await readSettings(projectPath);
+			if (projectSettings.extraKnownMarketplaces) {
+				let changed = false;
+				for (const name of Object.keys(
+					projectSettings.extraKnownMarketplaces,
+				)) {
+					if (known[name]) {
+						delete projectSettings.extraKnownMarketplaces[name];
+						cleaned.push(`project:${name}`);
+						changed = true;
+					}
+				}
+				if (
+					changed &&
+					Object.keys(projectSettings.extraKnownMarketplaces).length === 0
+				) {
+					delete projectSettings.extraKnownMarketplaces;
+				}
+				if (changed) {
+					await writeSettings(projectSettings, projectPath);
+				}
+			}
+		} catch {
+			// Non-fatal: project settings cleanup is best-effort
+		}
+	}
+
+	return cleaned;
+}
+
 /**
  * Read known_marketplaces.json to get marketplace source info
  */

package/src/ui/screens/SkillsScreen.js

@@ -325,20 +325,22 @@ 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;
+        // Action keys only when NOT actively typing in search
+        if (!isSearchActive) {
+            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") {

package/src/ui/screens/SkillsScreen.tsx

@@ -358,15 +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;
+    // Action keys only when NOT actively typing in search
+    if (!isSearchActive) {
+      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) {