claudeup 3.4.0 → 3.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudeup",
-  "version": "3.4.0",
+  "version": "3.5.1",
   "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,24 @@
 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",
+    "MadAppGang-claude-code": "magus",
+};
 export const defaultMarketplaces = [
     {
         name: "magus",
@@ -37,23 +57,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 +94,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,29 @@ 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",
+	"MadAppGang-claude-code": "magus",
+};
+
 export const defaultMarketplaces: Marketplace[] = [
 	{
 		name: "magus",
@@ -45,7 +68,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 +78,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 +112,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/prerunner/index.js

@@ -11,13 +11,13 @@ import { recoverMarketplaceSettings, migrateMarketplaceRename } from "../service
 export async function prerunClaude(claudeArgs, options = {}) {
     const cache = new UpdateCache();
     try {
-        // STEP 0: Migrate mag-claude-plugins → magus (idempotent, no-ops if already migrated)
+        // STEP 0: Migrate old marketplace names → magus (idempotent, no-ops if already migrated)
         const migration = await migrateMarketplaceRename();
         const migTotal = migration.projectMigrated + migration.globalMigrated
             + migration.localMigrated + migration.registryMigrated
             + (migration.knownMarketplacesMigrated ? 1 : 0);
         if (migTotal > 0) {
-            console.log(`✓ Migrated ${migTotal} plugin reference(s) from mag-claude-plugins → magus`);
+            console.log(`✓ Migrated ${migTotal} plugin reference(s) → magus`);
         }
         // STEP 1: Check if we should update (time-based cache, or forced)
         const shouldUpdate = options.force || (await cache.shouldCheckForUpdates());

package/src/prerunner/index.ts

@@ -24,13 +24,13 @@ export async function prerunClaude(
 	const cache = new UpdateCache();
 
 	try {
-		// STEP 0: Migrate mag-claude-plugins → magus (idempotent, no-ops if already migrated)
+		// STEP 0: Migrate old marketplace names → magus (idempotent, no-ops if already migrated)
 		const migration = await migrateMarketplaceRename();
 		const migTotal = migration.projectMigrated + migration.globalMigrated
 			+ migration.localMigrated + migration.registryMigrated
 			+ (migration.knownMarketplacesMigrated ? 1 : 0);
 		if (migTotal > 0) {
-			console.log(`✓ Migrated ${migTotal} plugin reference(s) from mag-claude-plugins → magus`);
+			console.log(`✓ Migrated ${migTotal} plugin reference(s) → magus`);
 		}
 
 		// STEP 1: Check if we should update (time-based cache, or forced)

package/src/services/claude-settings.js

@@ -414,13 +414,14 @@ export async function getMarketplaceAutoUpdate(marketplaceName) {
     return known[marketplaceName]?.autoUpdate;
 }
 // =============================================================================
-// MARKETPLACE RENAME MIGRATION: mag-claude-plugins → magus
+// MARKETPLACE RENAME MIGRATION: mag-claude-plugins / MadAppGang-claude-code → magus
 // =============================================================================
-const OLD_MARKETPLACE_NAME = "mag-claude-plugins";
+const OLD_MARKETPLACE_NAMES = ["mag-claude-plugins", "MadAppGang-claude-code"];
 const NEW_MARKETPLACE_NAME = "magus";
 /**
- * Rename plugin keys in a Record from old marketplace to new.
+ * Rename plugin keys in a Record from any old marketplace name to new.
  * e.g., "frontend@mag-claude-plugins" → "frontend@magus"
+ *        "dev@MadAppGang-claude-code" → "dev@magus"
  * Returns [migratedRecord, count] — count=0 means no changes.
  */
 function migratePluginKeys(record) {
@@ -429,9 +430,14 @@ function migratePluginKeys(record) {
     const migrated = {};
     let count = 0;
     for (const [key, value] of Object.entries(record)) {
-        if (key.endsWith(`@${OLD_MARKETPLACE_NAME}`)) {
+        const oldName = OLD_MARKETPLACE_NAMES.find((n) => key.endsWith(`@${n}`));
+        if (oldName) {
             const pluginName = key.slice(0, key.lastIndexOf("@"));
-            migrated[`${pluginName}@${NEW_MARKETPLACE_NAME}`] = value;
+            const newKey = `${pluginName}@${NEW_MARKETPLACE_NAME}`;
+            // Don't overwrite if canonical key already exists
+            if (!record[newKey]) {
+                migrated[newKey] = value;
+            }
             count++;
         }
         else {
@@ -456,12 +462,16 @@ function migrateSettingsObject(settings) {
         settings.installedPluginVersions = iv;
         total += ivCount;
     }
-    // Migrate extraKnownMarketplaces key
-    if (settings.extraKnownMarketplaces?.[OLD_MARKETPLACE_NAME]) {
-        const entry = settings.extraKnownMarketplaces[OLD_MARKETPLACE_NAME];
-        delete settings.extraKnownMarketplaces[OLD_MARKETPLACE_NAME];
-        settings.extraKnownMarketplaces[NEW_MARKETPLACE_NAME] = entry;
-        total++;
+    // Migrate extraKnownMarketplaces keys
+    for (const oldName of OLD_MARKETPLACE_NAMES) {
+        if (settings.extraKnownMarketplaces?.[oldName]) {
+            const entry = settings.extraKnownMarketplaces[oldName];
+            delete settings.extraKnownMarketplaces[oldName];
+            if (!settings.extraKnownMarketplaces[NEW_MARKETPLACE_NAME]) {
+                settings.extraKnownMarketplaces[NEW_MARKETPLACE_NAME] = entry;
+            }
+            total++;
+        }
     }
     return total;
 }
@@ -519,32 +529,86 @@ export async function migrateMarketplaceRename(projectPath) {
         }
     }
     catch { /* skip if unreadable */ }
-    // 4. known_marketplaces.json — rename the key
+    // 4. known_marketplaces.json — rename old keys + physical directory cleanup
+    const pluginsDir = path.join(os.homedir(), ".claude", "plugins", "marketplaces");
+    const newDir = path.join(pluginsDir, NEW_MARKETPLACE_NAME);
     try {
         const known = await readKnownMarketplaces();
-        if (known[OLD_MARKETPLACE_NAME]) {
-            known[NEW_MARKETPLACE_NAME] = {
-                ...known[OLD_MARKETPLACE_NAME],
-                source: {
-                    ...known[OLD_MARKETPLACE_NAME].source,
-                    repo: "MadAppGang/magus",
-                },
-            };
-            delete known[OLD_MARKETPLACE_NAME];
+        let knownModified = false;
+        for (const oldName of OLD_MARKETPLACE_NAMES) {
+            if (known[oldName]) {
+                const oldEntry = known[oldName];
+                // If canonical entry doesn't exist yet, create it
+                if (!known[NEW_MARKETPLACE_NAME]) {
+                    known[NEW_MARKETPLACE_NAME] = {
+                        ...oldEntry,
+                        source: {
+                            ...oldEntry.source,
+                            repo: "MadAppGang/magus",
+                        },
+                    };
+                }
+                delete known[oldName];
+                knownModified = true;
+            }
+            // Ensure installLocation doesn't reference old directory names
+            if (known[NEW_MARKETPLACE_NAME]?.installLocation?.includes(oldName)) {
+                known[NEW_MARKETPLACE_NAME].installLocation =
+                    known[NEW_MARKETPLACE_NAME].installLocation.replace(oldName, NEW_MARKETPLACE_NAME);
+                knownModified = true;
+            }
+        }
+        if (knownModified) {
             await writeKnownMarketplaces(known);
             result.knownMarketplacesMigrated = true;
         }
     }
     catch { /* skip if unreadable */ }
+    // 4b. Rename/remove old physical directories (runs even if keys were already migrated)
+    for (const oldName of OLD_MARKETPLACE_NAMES) {
+        const oldDir = path.join(pluginsDir, oldName);
+        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 {
+        if (await fs.pathExists(path.join(newDir, ".git"))) {
+            const { execSync } = await import("node:child_process");
+            const remote = execSync("git remote get-url origin", {
+                cwd: newDir, 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: newDir, 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();
         let regCount = 0;
         const newPlugins = {};
         for (const [pluginId, entries] of Object.entries(registry.plugins)) {
-            if (pluginId.endsWith(`@${OLD_MARKETPLACE_NAME}`)) {
+            const oldName = OLD_MARKETPLACE_NAMES.find((n) => pluginId.endsWith(`@${n}`));
+            if (oldName) {
                 const pluginName = pluginId.slice(0, pluginId.lastIndexOf("@"));
-                newPlugins[`${pluginName}@${NEW_MARKETPLACE_NAME}`] = entries;
+                const newKey = `${pluginName}@${NEW_MARKETPLACE_NAME}`;
+                if (!newPlugins[newKey]) {
+                    newPlugins[newKey] = entries;
+                }
                 regCount++;
             }
             else {

package/src/services/claude-settings.ts

@@ -630,15 +630,16 @@ export interface MarketplaceRecoveryResult {
 }
 
 // =============================================================================
-// MARKETPLACE RENAME MIGRATION: mag-claude-plugins → magus
+// MARKETPLACE RENAME MIGRATION: mag-claude-plugins / MadAppGang-claude-code → magus
 // =============================================================================
 
-const OLD_MARKETPLACE_NAME = "mag-claude-plugins";
+const OLD_MARKETPLACE_NAMES = ["mag-claude-plugins", "MadAppGang-claude-code"];
 const NEW_MARKETPLACE_NAME = "magus";
 
 /**
- * Rename plugin keys in a Record from old marketplace to new.
+ * Rename plugin keys in a Record from any old marketplace name to new.
  * e.g., "frontend@mag-claude-plugins" → "frontend@magus"
+ *        "dev@MadAppGang-claude-code" → "dev@magus"
  * Returns [migratedRecord, count] — count=0 means no changes.
  */
 function migratePluginKeys<T>(
@@ -648,9 +649,14 @@ function migratePluginKeys<T>(
 	const migrated: Record<string, T> = {};
 	let count = 0;
 	for (const [key, value] of Object.entries(record)) {
-		if (key.endsWith(`@${OLD_MARKETPLACE_NAME}`)) {
+		const oldName = OLD_MARKETPLACE_NAMES.find((n) => key.endsWith(`@${n}`));
+		if (oldName) {
 			const pluginName = key.slice(0, key.lastIndexOf("@"));
-			migrated[`${pluginName}@${NEW_MARKETPLACE_NAME}`] = value;
+			const newKey = `${pluginName}@${NEW_MARKETPLACE_NAME}`;
+			// Don't overwrite if canonical key already exists
+			if (!record[newKey]) {
+				migrated[newKey] = value;
+			}
 			count++;
 		} else {
 			migrated[key] = value;
@@ -678,12 +684,16 @@ function migrateSettingsObject(settings: ClaudeSettings): number {
 		total += ivCount;
 	}
 
-	// Migrate extraKnownMarketplaces key
-	if (settings.extraKnownMarketplaces?.[OLD_MARKETPLACE_NAME]) {
-		const entry = settings.extraKnownMarketplaces[OLD_MARKETPLACE_NAME];
-		delete settings.extraKnownMarketplaces[OLD_MARKETPLACE_NAME];
-		settings.extraKnownMarketplaces[NEW_MARKETPLACE_NAME] = entry;
-		total++;
+	// Migrate extraKnownMarketplaces keys
+	for (const oldName of OLD_MARKETPLACE_NAMES) {
+		if (settings.extraKnownMarketplaces?.[oldName]) {
+			const entry = settings.extraKnownMarketplaces[oldName];
+			delete settings.extraKnownMarketplaces[oldName];
+			if (!settings.extraKnownMarketplaces[NEW_MARKETPLACE_NAME]) {
+				settings.extraKnownMarketplaces[NEW_MARKETPLACE_NAME] = entry;
+			}
+			total++;
+		}
 	}
 
 	return total;
@@ -748,32 +758,92 @@ export async function migrateMarketplaceRename(
 		}
 	} catch { /* skip if unreadable */ }
 
-	// 4. known_marketplaces.json — rename the key
+	// 4. known_marketplaces.json — rename old keys + physical directory cleanup
+	const pluginsDir = path.join(os.homedir(), ".claude", "plugins", "marketplaces");
+	const newDir = path.join(pluginsDir, NEW_MARKETPLACE_NAME);
+
 	try {
 		const known = await readKnownMarketplaces();
-		if (known[OLD_MARKETPLACE_NAME]) {
-			known[NEW_MARKETPLACE_NAME] = {
-				...known[OLD_MARKETPLACE_NAME],
-				source: {
-					...known[OLD_MARKETPLACE_NAME].source,
-					repo: "MadAppGang/magus",
-				},
-			};
-			delete known[OLD_MARKETPLACE_NAME];
+		let knownModified = false;
+
+		for (const oldName of OLD_MARKETPLACE_NAMES) {
+			if (known[oldName]) {
+				const oldEntry = known[oldName];
+				// If canonical entry doesn't exist yet, create it
+				if (!known[NEW_MARKETPLACE_NAME]) {
+					known[NEW_MARKETPLACE_NAME] = {
+						...oldEntry,
+						source: {
+							...oldEntry.source,
+							repo: "MadAppGang/magus",
+						},
+					};
+				}
+				delete known[oldName];
+				knownModified = true;
+			}
+
+			// Ensure installLocation doesn't reference old directory names
+			if (known[NEW_MARKETPLACE_NAME]?.installLocation?.includes(oldName)) {
+				known[NEW_MARKETPLACE_NAME].installLocation =
+					known[NEW_MARKETPLACE_NAME].installLocation.replace(
+						oldName,
+						NEW_MARKETPLACE_NAME,
+					);
+				knownModified = true;
+			}
+		}
+
+		if (knownModified) {
 			await writeKnownMarketplaces(known);
 			result.knownMarketplacesMigrated = true;
 		}
 	} catch { /* skip if unreadable */ }
 
+	// 4b. Rename/remove old physical directories (runs even if keys were already migrated)
+	for (const oldName of OLD_MARKETPLACE_NAMES) {
+		const oldDir = path.join(pluginsDir, oldName);
+		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 {
+		if (await fs.pathExists(path.join(newDir, ".git"))) {
+			const { execSync } = await import("node:child_process");
+			const remote = execSync("git remote get-url origin", {
+				cwd: newDir, 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: newDir, 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();
 		let regCount = 0;
 		const newPlugins: typeof registry.plugins = {};
 		for (const [pluginId, entries] of Object.entries(registry.plugins)) {
-			if (pluginId.endsWith(`@${OLD_MARKETPLACE_NAME}`)) {
+			const oldName = OLD_MARKETPLACE_NAMES.find((n) => pluginId.endsWith(`@${n}`));
+			if (oldName) {
 				const pluginName = pluginId.slice(0, pluginId.lastIndexOf("@"));
-				newPlugins[`${pluginName}@${NEW_MARKETPLACE_NAME}`] = entries;
+				const newKey = `${pluginName}@${NEW_MARKETPLACE_NAME}`;
+				if (!newPlugins[newKey]) {
+					newPlugins[newKey] = entries;
+				}
 				regCount++;
 			} else {
 				newPlugins[pluginId] = entries;

package/src/ui/App.js

@@ -182,7 +182,7 @@ function AppContentInner({ showDebug, onDebugToggle, updateInfo, onExit, }) {
             type: "SHOW_PROGRESS",
             state: { message: "Scanning marketplaces..." },
         });
-        // Migrate mag-claude-plugins → magus (idempotent), then repair plugin.json files
+        // Migrate old marketplace names → magus (idempotent), then repair plugin.json files
         migrateMarketplaceRename()
             .catch(() => { }); // non-blocking, best-effort
         repairAllMarketplaces()

package/src/ui/App.tsx

@@ -265,7 +265,7 @@ function AppContentInner({
 			state: { message: "Scanning marketplaces..." },
 		});
 
-		// Migrate mag-claude-plugins → magus (idempotent), then repair plugin.json files
+		// Migrate old marketplace names → magus (idempotent), then repair plugin.json files
 		migrateMarketplaceRename()
 			.catch(() => {}); // non-blocking, best-effort