claudeup 3.4.0 → 3.5.0

package/package.json

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

package/src/data/marketplaces.js

@@ -1,4 +1,23 @@
 import { formatMarketplaceName } from "../utils/string-utils.js";
+/**
+ * Known repo aliases — GitHub redirects the old repo to the new one,
+ * so these should be treated as identical for deduplication.
+ */
+const REPO_ALIASES = {
+    "madappgang/claude-code": "madappgang/magus",
+};
+/** Normalize a repo string through known aliases. */
+function normalizeRepo(repo) {
+    const lower = repo.toLowerCase();
+    return REPO_ALIASES[lower] || lower;
+}
+/**
+ * Deprecated marketplace names that should be hidden if the canonical
+ * marketplace is already present.  Maps deprecated name → canonical name.
+ */
+export const deprecatedMarketplaces = {
+    "mag-claude-plugins": "magus",
+};
 export const defaultMarketplaces = [
     {
         name: "magus",
@@ -37,23 +56,36 @@ export function getMarketplaceByName(name) {
 }
 // Get all available marketplaces from local cache + hardcoded defaults
 // Local cache is primary source of truth, defaults are fallback
-// Deduplicates by repo URL to avoid showing same marketplace twice
+// Deduplicates by normalized repo URL to avoid showing same marketplace twice
 export function getAllMarketplaces(localMarketplaces) {
     const all = new Map();
     const seenRepos = new Set();
     // Primary source: local cache (what's actually cloned)
     if (localMarketplaces) {
         for (const [name, local] of localMarketplaces) {
-            const repo = local.gitRepo || "";
+            const repo = normalizeRepo(local.gitRepo || "");
+            // Skip deprecated marketplaces if their canonical replacement exists
+            // (or will be added from defaults)
+            const canonical = deprecatedMarketplaces[name];
+            if (canonical) {
+                // If canonical already in the map or in defaults, skip this entry
+                if (all.has(canonical) || defaultMarketplaces.some((m) => m.name === canonical)) {
+                    continue;
+                }
+            }
+            // Skip if another marketplace already claimed this repo URL
+            if (repo && seenRepos.has(repo))
+                continue;
             if (repo)
-                seenRepos.add(repo.toLowerCase());
+                seenRepos.add(repo);
             // Check if this marketplace has defaults (for official/featured flags)
             const defaultMp = defaultMarketplaces.find((m) => m.name === name);
             all.set(name, {
                 name,
-                displayName: local.name || formatMarketplaceName(name),
-                source: { source: "github", repo },
-                description: local.description || "",
+                // Prefer default displayName over stale local clone data
+                displayName: defaultMp?.displayName || local.name || formatMarketplaceName(name),
+                source: { source: "github", repo: defaultMp?.source.repo || local.gitRepo || "" },
+                description: defaultMp?.description || local.description || "",
                 official: defaultMp?.official ?? repo.toLowerCase().includes("anthropics/"),
                 featured: defaultMp?.featured,
             });
@@ -61,7 +93,7 @@ export function getAllMarketplaces(localMarketplaces) {
     }
     // Fallback: hardcoded defaults (only if their repo isn't already represented)
     for (const mp of defaultMarketplaces) {
-        const repo = mp.source.repo?.toLowerCase() || "";
+        const repo = normalizeRepo(mp.source.repo || "");
         if (!all.has(mp.name) && !seenRepos.has(repo)) {
             all.set(mp.name, mp);
             if (repo)

package/src/data/marketplaces.ts

@@ -2,6 +2,28 @@ import type { Marketplace } from "../types/index.js";
 import type { LocalMarketplace } from "../services/local-marketplace.js";
 import { formatMarketplaceName } from "../utils/string-utils.js";
 
+/**
+ * Known repo aliases — GitHub redirects the old repo to the new one,
+ * so these should be treated as identical for deduplication.
+ */
+const REPO_ALIASES: Record<string, string> = {
+	"madappgang/claude-code": "madappgang/magus",
+};
+
+/** Normalize a repo string through known aliases. */
+function normalizeRepo(repo: string): string {
+	const lower = repo.toLowerCase();
+	return REPO_ALIASES[lower] || lower;
+}
+
+/**
+ * Deprecated marketplace names that should be hidden if the canonical
+ * marketplace is already present.  Maps deprecated name → canonical name.
+ */
+export const deprecatedMarketplaces: Record<string, string> = {
+	"mag-claude-plugins": "magus",
+};
+
 export const defaultMarketplaces: Marketplace[] = [
 	{
 		name: "magus",
@@ -45,7 +67,7 @@ export function getMarketplaceByName(name: string): Marketplace | undefined {
 
 // Get all available marketplaces from local cache + hardcoded defaults
 // Local cache is primary source of truth, defaults are fallback
-// Deduplicates by repo URL to avoid showing same marketplace twice
+// Deduplicates by normalized repo URL to avoid showing same marketplace twice
 export function getAllMarketplaces(
 	localMarketplaces?: Map<string, LocalMarketplace>,
 ): Marketplace[] {
@@ -55,17 +77,31 @@ export function getAllMarketplaces(
 	// Primary source: local cache (what's actually cloned)
 	if (localMarketplaces) {
 		for (const [name, local] of localMarketplaces) {
-			const repo = local.gitRepo || "";
-			if (repo) seenRepos.add(repo.toLowerCase());
+			const repo = normalizeRepo(local.gitRepo || "");
+
+			// Skip deprecated marketplaces if their canonical replacement exists
+			// (or will be added from defaults)
+			const canonical = deprecatedMarketplaces[name];
+			if (canonical) {
+				// If canonical already in the map or in defaults, skip this entry
+				if (all.has(canonical) || defaultMarketplaces.some((m) => m.name === canonical)) {
+					continue;
+				}
+			}
+
+			// Skip if another marketplace already claimed this repo URL
+			if (repo && seenRepos.has(repo)) continue;
+			if (repo) seenRepos.add(repo);
 
 			// Check if this marketplace has defaults (for official/featured flags)
 			const defaultMp = defaultMarketplaces.find((m) => m.name === name);
 
 			all.set(name, {
 				name,
-				displayName: local.name || formatMarketplaceName(name),
-				source: { source: "github" as const, repo },
-				description: local.description || "",
+				// Prefer default displayName over stale local clone data
+				displayName: defaultMp?.displayName || local.name || formatMarketplaceName(name),
+				source: { source: "github" as const, repo: defaultMp?.source.repo || local.gitRepo || "" },
+				description: defaultMp?.description || local.description || "",
 				official:
 					defaultMp?.official ?? repo.toLowerCase().includes("anthropics/"),
 				featured: defaultMp?.featured,
@@ -75,7 +111,7 @@ export function getAllMarketplaces(
 
 	// Fallback: hardcoded defaults (only if their repo isn't already represented)
 	for (const mp of defaultMarketplaces) {
-		const repo = mp.source.repo?.toLowerCase() || "";
+		const repo = normalizeRepo(mp.source.repo || "");
 		if (!all.has(mp.name) && !seenRepos.has(repo)) {
 			all.set(mp.name, mp);
 			if (repo) seenRepos.add(repo);

package/src/services/claude-settings.js

@@ -519,23 +519,70 @@ export async function migrateMarketplaceRename(projectPath) {
         }
     }
     catch { /* skip if unreadable */ }
-    // 4. known_marketplaces.json — rename the key
+    // 4. known_marketplaces.json — rename the key + physical directory cleanup
+    const pluginsDir = path.join(os.homedir(), ".claude", "plugins", "marketplaces");
+    const oldDir = path.join(pluginsDir, OLD_MARKETPLACE_NAME);
+    const newDir = path.join(pluginsDir, NEW_MARKETPLACE_NAME);
     try {
         const known = await readKnownMarketplaces();
+        let knownModified = false;
         if (known[OLD_MARKETPLACE_NAME]) {
-            known[NEW_MARKETPLACE_NAME] = {
-                ...known[OLD_MARKETPLACE_NAME],
-                source: {
-                    ...known[OLD_MARKETPLACE_NAME].source,
-                    repo: "MadAppGang/magus",
-                },
-            };
+            const oldEntry = known[OLD_MARKETPLACE_NAME];
+            // If canonical entry already exists, just delete the old one
+            if (!known[NEW_MARKETPLACE_NAME]) {
+                known[NEW_MARKETPLACE_NAME] = {
+                    ...oldEntry,
+                    source: {
+                        ...oldEntry.source,
+                        repo: "MadAppGang/magus",
+                    },
+                };
+            }
             delete known[OLD_MARKETPLACE_NAME];
+            knownModified = true;
+        }
+        // Ensure installLocation points to new directory name
+        if (known[NEW_MARKETPLACE_NAME]?.installLocation?.includes(OLD_MARKETPLACE_NAME)) {
+            known[NEW_MARKETPLACE_NAME].installLocation =
+                known[NEW_MARKETPLACE_NAME].installLocation.replace(OLD_MARKETPLACE_NAME, NEW_MARKETPLACE_NAME);
+            knownModified = true;
+        }
+        if (knownModified) {
             await writeKnownMarketplaces(known);
             result.knownMarketplacesMigrated = true;
         }
     }
     catch { /* skip if unreadable */ }
+    // 4b. Rename/remove the old physical directory (runs even if key was already migrated)
+    try {
+        if (await fs.pathExists(oldDir)) {
+            if (!(await fs.pathExists(newDir))) {
+                await fs.rename(oldDir, newDir);
+            }
+            else {
+                // Both exist — remove the old one (magus dir is canonical)
+                await fs.remove(oldDir);
+            }
+        }
+    }
+    catch { /* non-fatal: directory cleanup is best-effort */ }
+    // 4c. Update git remote URL in the marketplace clone (old → new repo)
+    try {
+        const marketplaceDir = await fs.pathExists(newDir) ? newDir : oldDir;
+        if (await fs.pathExists(path.join(marketplaceDir, ".git"))) {
+            const { execSync } = await import("node:child_process");
+            const remote = execSync("git remote get-url origin", {
+                cwd: marketplaceDir, encoding: "utf-8", timeout: 5000,
+            }).trim();
+            if (remote.includes("claude-code") && remote.includes("MadAppGang")) {
+                const newRemote = remote.replace("claude-code", NEW_MARKETPLACE_NAME);
+                execSync(`git remote set-url origin "${newRemote}"`, {
+                    cwd: marketplaceDir, encoding: "utf-8", timeout: 5000,
+                });
+            }
+        }
+    }
+    catch { /* non-fatal: git remote update is best-effort */ }
     // 5. installed_plugins.json — rename plugin ID keys
     try {
         const registry = await readInstalledPluginsRegistry();

package/src/services/claude-settings.ts

@@ -748,23 +748,77 @@ export async function migrateMarketplaceRename(
 		}
 	} catch { /* skip if unreadable */ }
 
-	// 4. known_marketplaces.json — rename the key
+	// 4. known_marketplaces.json — rename the key + physical directory cleanup
+	const pluginsDir = path.join(os.homedir(), ".claude", "plugins", "marketplaces");
+	const oldDir = path.join(pluginsDir, OLD_MARKETPLACE_NAME);
+	const newDir = path.join(pluginsDir, NEW_MARKETPLACE_NAME);
+
 	try {
 		const known = await readKnownMarketplaces();
+		let knownModified = false;
+
 		if (known[OLD_MARKETPLACE_NAME]) {
-			known[NEW_MARKETPLACE_NAME] = {
-				...known[OLD_MARKETPLACE_NAME],
-				source: {
-					...known[OLD_MARKETPLACE_NAME].source,
-					repo: "MadAppGang/magus",
-				},
-			};
+			const oldEntry = known[OLD_MARKETPLACE_NAME];
+
+			// If canonical entry already exists, just delete the old one
+			if (!known[NEW_MARKETPLACE_NAME]) {
+				known[NEW_MARKETPLACE_NAME] = {
+					...oldEntry,
+					source: {
+						...oldEntry.source,
+						repo: "MadAppGang/magus",
+					},
+				};
+			}
 			delete known[OLD_MARKETPLACE_NAME];
+			knownModified = true;
+		}
+
+		// Ensure installLocation points to new directory name
+		if (known[NEW_MARKETPLACE_NAME]?.installLocation?.includes(OLD_MARKETPLACE_NAME)) {
+			known[NEW_MARKETPLACE_NAME].installLocation =
+				known[NEW_MARKETPLACE_NAME].installLocation.replace(
+					OLD_MARKETPLACE_NAME,
+					NEW_MARKETPLACE_NAME,
+				);
+			knownModified = true;
+		}
+
+		if (knownModified) {
 			await writeKnownMarketplaces(known);
 			result.knownMarketplacesMigrated = true;
 		}
 	} catch { /* skip if unreadable */ }
 
+	// 4b. Rename/remove the old physical directory (runs even if key was already migrated)
+	try {
+		if (await fs.pathExists(oldDir)) {
+			if (!(await fs.pathExists(newDir))) {
+				await fs.rename(oldDir, newDir);
+			} else {
+				// Both exist — remove the old one (magus dir is canonical)
+				await fs.remove(oldDir);
+			}
+		}
+	} catch { /* non-fatal: directory cleanup is best-effort */ }
+
+	// 4c. Update git remote URL in the marketplace clone (old → new repo)
+	try {
+		const marketplaceDir = await fs.pathExists(newDir) ? newDir : oldDir;
+		if (await fs.pathExists(path.join(marketplaceDir, ".git"))) {
+			const { execSync } = await import("node:child_process");
+			const remote = execSync("git remote get-url origin", {
+				cwd: marketplaceDir, encoding: "utf-8", timeout: 5000,
+			}).trim();
+			if (remote.includes("claude-code") && remote.includes("MadAppGang")) {
+				const newRemote = remote.replace("claude-code", NEW_MARKETPLACE_NAME);
+				execSync(`git remote set-url origin "${newRemote}"`, {
+					cwd: marketplaceDir, encoding: "utf-8", timeout: 5000,
+				});
+			}
+		}
+	} catch { /* non-fatal: git remote update is best-effort */ }
+
 	// 5. installed_plugins.json — rename plugin ID keys
 	try {
 		const registry = await readInstalledPluginsRegistry();