claudeup 4.7.0 → 4.10.0

package/src/services/claude-cli.js

@@ -50,10 +50,37 @@ async function execClaude(args, timeoutMs = 30000) {
 }
 /**
  * Install a plugin using claude CLI
- * Handles enabling + version tracking + cache copy in one shot
+ * Handles enabling + version tracking + cache copy in one shot.
+ *
+ * If the install fails because the plugin is "not found in marketplace",
+ * triggers a marketplace update and retries once. This handles the case
+ * where claudeup's remote listing (from GitHub) has newer plugins than
+ * the local marketplace clone.
  */
 export async function installPlugin(pluginId, scope = "user") {
-    await execClaude(["plugin", "install", pluginId, "--scope", scope]);
+    try {
+        await execClaude(["plugin", "install", pluginId, "--scope", scope]);
+    }
+    catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        if (msg.includes("not found in marketplace")) {
+            // Local marketplace clone is stale — update and retry
+            const parts = pluginId.split("@");
+            const marketplace = parts[1];
+            if (marketplace) {
+                await updateMarketplace(marketplace);
+                await execClaude([
+                    "plugin",
+                    "install",
+                    pluginId,
+                    "--scope",
+                    scope,
+                ]);
+                return;
+            }
+        }
+        throw error;
+    }
 }
 /**
  * Uninstall a plugin using claude CLI.
@@ -96,9 +123,26 @@ export async function disablePlugin(pluginId, scope = "user") {
  * originally installed via the CLI. `install` handles both fresh installs
  * and re-installs (upgrades) of existing plugins regardless of how they
  * were originally added.
+ *
+ * Retries with marketplace update on "not found" errors (same as installPlugin).
  */
 export async function updatePlugin(pluginId, scope = "user") {
-    await execClaude(["plugin", "install", pluginId, "--scope", scope], 60000);
+    try {
+        await execClaude(["plugin", "install", pluginId, "--scope", scope], 60000);
+    }
+    catch (error) {
+        const msg = error instanceof Error ? error.message : String(error);
+        if (msg.includes("not found in marketplace")) {
+            const parts = pluginId.split("@");
+            const marketplace = parts[1];
+            if (marketplace) {
+                await updateMarketplace(marketplace);
+                await execClaude(["plugin", "install", pluginId, "--scope", scope], 60000);
+                return;
+            }
+        }
+        throw error;
+    }
 }
 /**
  * Add a marketplace by GitHub repo (e.g., "MadAppGang/magus")

package/src/services/claude-cli.ts

@@ -67,13 +67,40 @@ async function execClaude(args: string[], timeoutMs = 30000): Promise<string> {
 
 /**
  * Install a plugin using claude CLI
- * Handles enabling + version tracking + cache copy in one shot
+ * Handles enabling + version tracking + cache copy in one shot.
+ *
+ * If the install fails because the plugin is "not found in marketplace",
+ * triggers a marketplace update and retries once. This handles the case
+ * where claudeup's remote listing (from GitHub) has newer plugins than
+ * the local marketplace clone.
  */
 export async function installPlugin(
 	pluginId: string,
 	scope: PluginScope = "user",
 ): Promise<void> {
-	await execClaude(["plugin", "install", pluginId, "--scope", scope]);
+	try {
+		await execClaude(["plugin", "install", pluginId, "--scope", scope]);
+	} catch (error) {
+		const msg =
+			error instanceof Error ? error.message : String(error);
+		if (msg.includes("not found in marketplace")) {
+			// Local marketplace clone is stale — update and retry
+			const parts = pluginId.split("@");
+			const marketplace = parts[1];
+			if (marketplace) {
+				await updateMarketplace(marketplace);
+				await execClaude([
+					"plugin",
+					"install",
+					pluginId,
+					"--scope",
+					scope,
+				]);
+				return;
+			}
+		}
+		throw error;
+	}
 }
 
 /**
@@ -127,12 +154,35 @@ export async function disablePlugin(
  * originally installed via the CLI. `install` handles both fresh installs
  * and re-installs (upgrades) of existing plugins regardless of how they
  * were originally added.
+ *
+ * Retries with marketplace update on "not found" errors (same as installPlugin).
  */
 export async function updatePlugin(
 	pluginId: string,
 	scope: PluginScope = "user",
 ): Promise<void> {
-	await execClaude(["plugin", "install", pluginId, "--scope", scope], 60000);
+	try {
+		await execClaude(
+			["plugin", "install", pluginId, "--scope", scope],
+			60000,
+		);
+	} catch (error) {
+		const msg =
+			error instanceof Error ? error.message : String(error);
+		if (msg.includes("not found in marketplace")) {
+			const parts = pluginId.split("@");
+			const marketplace = parts[1];
+			if (marketplace) {
+				await updateMarketplace(marketplace);
+				await execClaude(
+					["plugin", "install", pluginId, "--scope", scope],
+					60000,
+				);
+				return;
+			}
+		}
+		throw error;
+	}
 }
 
 /**

package/src/services/claude-settings.js

@@ -1,6 +1,7 @@
 import fs from "fs-extra";
 import path from "node:path";
 import os from "node:os";
+import semver from "semver";
 import { parsePluginId } from "../utils/string-utils.js";
 const CLAUDE_DIR = ".claude";
 const SETTINGS_FILE = "settings.json";
@@ -377,6 +378,79 @@ export async function saveGlobalInstalledPluginVersion(pluginId, version) {
     // Update registry for user scope
     await updateInstalledPluginsRegistry(pluginId, version, "user");
 }
+/**
+ * Gap-fill: ensure global installedPluginVersions is at least as high as
+ * project and local scopes. When a plugin is updated at project scope,
+ * global may lag behind, causing Claude Code to resolve stale cache paths.
+ *
+ * @returns Array of { pluginId, oldVersion, newVersion } for plugins that were bumped
+ */
+export async function gapFillInstalledPluginVersions(projectPath) {
+    const globalVersions = await getGlobalInstalledPluginVersions();
+    // Collect versions from project and local scopes
+    const allVersions = {};
+    // Start with global versions
+    for (const [id, ver] of Object.entries(globalVersions)) {
+        allVersions[id] = [ver];
+    }
+    // Add project scope versions
+    if (projectPath) {
+        try {
+            const settings = await readSettings(projectPath);
+            for (const [id, ver] of Object.entries(settings.installedPluginVersions || {})) {
+                if (!allVersions[id])
+                    allVersions[id] = [];
+                allVersions[id].push(ver);
+            }
+        }
+        catch {
+            /* skip unreadable */
+        }
+        // Add local scope versions
+        try {
+            const localSettings = await readLocalSettings(projectPath);
+            for (const [id, ver] of Object.entries(localSettings.installedPluginVersions || {})) {
+                if (!allVersions[id])
+                    allVersions[id] = [];
+                allVersions[id].push(ver);
+            }
+        }
+        catch {
+            /* skip unreadable */
+        }
+    }
+    // Find plugins where global needs bumping
+    const bumped = [];
+    for (const [pluginId, versions] of Object.entries(allVersions)) {
+        // Filter to valid semver versions and sort descending
+        const valid = versions.filter((v) => semver.valid(v));
+        if (valid.length === 0)
+            continue;
+        const highest = valid.sort((a, b) => semver.rcompare(a, b))[0];
+        const globalVer = globalVersions[pluginId];
+        // If global is missing, invalid semver, or lower than the highest, bump it
+        if (!globalVer ||
+            !semver.valid(globalVer) ||
+            semver.lt(globalVer, highest)) {
+            bumped.push({
+                pluginId,
+                oldVersion: globalVer || "(missing)",
+                newVersion: highest,
+            });
+        }
+    }
+    // Apply bumps in a single write
+    if (bumped.length > 0) {
+        const settings = await readGlobalSettings();
+        settings.installedPluginVersions =
+            settings.installedPluginVersions || {};
+        for (const { pluginId, newVersion } of bumped) {
+            settings.installedPluginVersions[pluginId] = newVersion;
+        }
+        await writeGlobalSettings(settings);
+    }
+    return bumped;
+}
 export async function removeGlobalInstalledPluginVersion(pluginId) {
     const settings = await readGlobalSettings();
     if (settings.installedPluginVersions) {
@@ -807,14 +881,18 @@ function isMadAppGangMarketplace(entry) {
  * Recover/sync marketplace settings:
  * - Enable autoUpdate for Magus marketplaces that don't have it set
  * - Remove entries for marketplaces whose installLocation no longer exists
+ * - Fix stale "directory" source for known Magus marketplaces that should be "github"
  */
 export async function recoverMarketplaceSettings() {
     const known = await readKnownMarketplaces();
     const result = {
         enabledAutoUpdate: [],
         removed: [],
+        reregistered: [],
     };
     const updatedKnown = {};
+    // Import defaultMarketplaces lazily to get canonical repo URLs
+    const { defaultMarketplaces } = await import("../data/marketplaces.js");
     for (const [name, entry] of Object.entries(known)) {
         // Check if install location still exists
         if (entry.installLocation &&
@@ -822,6 +900,23 @@ export async function recoverMarketplaceSettings() {
             result.removed.push(name);
             continue;
         }
+        // Fix stale "directory" source for known marketplaces.
+        // Some machines have magus registered as source: "directory" pointing to
+        // a local dev checkout. This prevents Claude Code's auto-update from
+        // refreshing the marketplace, causing "plugin not found" errors for
+        // newly added plugins. Re-register as "github" with the canonical repo.
+        if (entry.source?.source === "directory") {
+            const defaultMp = defaultMarketplaces.find((m) => m.name === name);
+            if (defaultMp?.source.repo) {
+                const marketplacesDir = path.join(os.homedir(), ".claude", "plugins", "marketplaces");
+                entry.source = {
+                    source: "github",
+                    repo: defaultMp.source.repo,
+                };
+                entry.installLocation = path.join(marketplacesDir, name);
+                result.reregistered.push(name);
+            }
+        }
         // Enable autoUpdate if not set - only for Magus (MadAppGang) marketplaces
         if (entry.autoUpdate === undefined && isMadAppGangMarketplace(entry)) {
             entry.autoUpdate = true;
@@ -830,7 +925,9 @@ export async function recoverMarketplaceSettings() {
         updatedKnown[name] = entry;
     }
     // Write back if any changes were made
-    if (result.enabledAutoUpdate.length > 0 || result.removed.length > 0) {
+    if (result.enabledAutoUpdate.length > 0 ||
+        result.removed.length > 0 ||
+        result.reregistered.length > 0) {
         await writeKnownMarketplaces(updatedKnown);
     }
     return result;

package/src/services/claude-settings.ts

@@ -1,6 +1,7 @@
 import fs from "fs-extra";
 import path from "node:path";
 import os from "node:os";
+import semver from "semver";
 import type {
 	ClaudeSettings,
 	ClaudeLocalSettings,
@@ -544,6 +545,97 @@ export async function saveGlobalInstalledPluginVersion(
 	await updateInstalledPluginsRegistry(pluginId, version, "user");
 }
 
+/**
+ * Gap-fill: ensure global installedPluginVersions is at least as high as
+ * project and local scopes. When a plugin is updated at project scope,
+ * global may lag behind, causing Claude Code to resolve stale cache paths.
+ *
+ * @returns Array of { pluginId, oldVersion, newVersion } for plugins that were bumped
+ */
+export async function gapFillInstalledPluginVersions(
+	projectPath?: string,
+): Promise<Array<{ pluginId: string; oldVersion: string; newVersion: string }>> {
+	const globalVersions = await getGlobalInstalledPluginVersions();
+
+	// Collect versions from project and local scopes
+	const allVersions: Record<string, string[]> = {};
+
+	// Start with global versions
+	for (const [id, ver] of Object.entries(globalVersions)) {
+		allVersions[id] = [ver];
+	}
+
+	// Add project scope versions
+	if (projectPath) {
+		try {
+			const settings = await readSettings(projectPath);
+			for (const [id, ver] of Object.entries(
+				settings.installedPluginVersions || {},
+			)) {
+				if (!allVersions[id]) allVersions[id] = [];
+				allVersions[id].push(ver);
+			}
+		} catch {
+			/* skip unreadable */
+		}
+
+		// Add local scope versions
+		try {
+			const localSettings = await readLocalSettings(projectPath);
+			for (const [id, ver] of Object.entries(
+				localSettings.installedPluginVersions || {},
+			)) {
+				if (!allVersions[id]) allVersions[id] = [];
+				allVersions[id].push(ver);
+			}
+		} catch {
+			/* skip unreadable */
+		}
+	}
+
+	// Find plugins where global needs bumping
+	const bumped: Array<{
+		pluginId: string;
+		oldVersion: string;
+		newVersion: string;
+	}> = [];
+
+	for (const [pluginId, versions] of Object.entries(allVersions)) {
+		// Filter to valid semver versions and sort descending
+		const valid = versions.filter((v) => semver.valid(v));
+		if (valid.length === 0) continue;
+
+		const highest = valid.sort((a, b) => semver.rcompare(a, b))[0];
+		const globalVer = globalVersions[pluginId];
+
+		// If global is missing, invalid semver, or lower than the highest, bump it
+		if (
+			!globalVer ||
+			!semver.valid(globalVer) ||
+			semver.lt(globalVer, highest)
+		) {
+			bumped.push({
+				pluginId,
+				oldVersion: globalVer || "(missing)",
+				newVersion: highest,
+			});
+		}
+	}
+
+	// Apply bumps in a single write
+	if (bumped.length > 0) {
+		const settings = await readGlobalSettings();
+		settings.installedPluginVersions =
+			settings.installedPluginVersions || {};
+		for (const { pluginId, newVersion } of bumped) {
+			settings.installedPluginVersions[pluginId] = newVersion;
+		}
+		await writeGlobalSettings(settings);
+	}
+
+	return bumped;
+}
+
 export async function removeGlobalInstalledPluginVersion(
 	pluginId: string,
 ): Promise<void> {
@@ -716,6 +808,7 @@ export async function getMarketplaceAutoUpdate(
 export interface MarketplaceRecoveryResult {
 	enabledAutoUpdate: string[];
 	removed: string[];
+	reregistered: string[];
 }
 
 // =============================================================================
@@ -1071,16 +1164,21 @@ function isMadAppGangMarketplace(entry: KnownMarketplaceEntry): boolean {
  * Recover/sync marketplace settings:
  * - Enable autoUpdate for Magus marketplaces that don't have it set
  * - Remove entries for marketplaces whose installLocation no longer exists
+ * - Fix stale "directory" source for known Magus marketplaces that should be "github"
  */
 export async function recoverMarketplaceSettings(): Promise<MarketplaceRecoveryResult> {
 	const known = await readKnownMarketplaces();
 	const result: MarketplaceRecoveryResult = {
 		enabledAutoUpdate: [],
 		removed: [],
+		reregistered: [],
 	};
 
 	const updatedKnown: KnownMarketplaces = {};
 
+	// Import defaultMarketplaces lazily to get canonical repo URLs
+	const { defaultMarketplaces } = await import("../data/marketplaces.js");
+
 	for (const [name, entry] of Object.entries(known)) {
 		// Check if install location still exists
 		if (
@@ -1091,6 +1189,29 @@ export async function recoverMarketplaceSettings(): Promise<MarketplaceRecoveryR
 			continue;
 		}
 
+		// Fix stale "directory" source for known marketplaces.
+		// Some machines have magus registered as source: "directory" pointing to
+		// a local dev checkout. This prevents Claude Code's auto-update from
+		// refreshing the marketplace, causing "plugin not found" errors for
+		// newly added plugins. Re-register as "github" with the canonical repo.
+		if (entry.source?.source === "directory") {
+			const defaultMp = defaultMarketplaces.find((m) => m.name === name);
+			if (defaultMp?.source.repo) {
+				const marketplacesDir = path.join(
+					os.homedir(),
+					".claude",
+					"plugins",
+					"marketplaces",
+				);
+				entry.source = {
+					source: "github",
+					repo: defaultMp.source.repo,
+				};
+				entry.installLocation = path.join(marketplacesDir, name);
+				result.reregistered.push(name);
+			}
+		}
+
 		// Enable autoUpdate if not set - only for Magus (MadAppGang) marketplaces
 		if (entry.autoUpdate === undefined && isMadAppGangMarketplace(entry)) {
 			entry.autoUpdate = true;
@@ -1101,7 +1222,11 @@ export async function recoverMarketplaceSettings(): Promise<MarketplaceRecoveryR
 	}
 
 	// Write back if any changes were made
-	if (result.enabledAutoUpdate.length > 0 || result.removed.length > 0) {
+	if (
+		result.enabledAutoUpdate.length > 0 ||
+		result.removed.length > 0 ||
+		result.reregistered.length > 0
+	) {
 		await writeKnownMarketplaces(updatedKnown);
 	}
 

package/src/services/plugin-manager.js

@@ -5,7 +5,6 @@ import { getConfiguredMarketplaces, getEnabledPlugins, readSettings, writeSettin
 import { defaultMarketplaces } from "../data/marketplaces.js";
 import { scanLocalMarketplaces, repairAllMarketplaces, } from "./local-marketplace.js";
 import { formatMarketplaceName, isValidGitHubRepo, parsePluginId, } from "../utils/string-utils.js";
-import { updateMarketplace } from "./claude-cli.js";
 // Cache for local marketplaces (session-level) - Promise-based to prevent race conditions
 let localMarketplacesPromise = null;
 // Session-level cache for fetched marketplace data (no TTL - persists until explicit refresh)
@@ -434,9 +433,14 @@ export async function getLocalMarketplacesInfo() {
 const autoSyncedMarketplaces = new Set();
 /**
  * If the remote manifest lists plugins that aren't in the local cache,
- * the local clone is stale. Silently run `claude plugin marketplace update`
- * to pull the latest, then invalidate the local cache so the next scan
- * picks up the new plugins.
+ * the local clone is stale. Log a warning but do NOT trigger a marketplace
+ * update from claudeup.
+ *
+ * Previously this called `updateMarketplace()` which invokes Claude Code's
+ * `cacheMarketplaceFromGit()` — a non-atomic delete-then-clone that can
+ * permanently delete the marketplace directory on clone failure.
+ * Claude Code's own background autoupdate handles marketplace refreshing
+ * after session start. See: ai-docs/plugin-marketplace-bug-investigation.md
  */
 async function autoSyncIfStale(mpName, remotePluginNames, localMarketplaces) {
     if (autoSyncedMarketplaces.has(mpName))
@@ -445,20 +449,13 @@ async function autoSyncIfStale(mpName, remotePluginNames, localMarketplaces) {
     if (!localMp)
         return localMarketplaces;
     const localNames = new Set(localMp.plugins.map((p) => p.name));
-    const hasMissing = remotePluginNames.some((name) => !localNames.has(name));
-    if (!hasMissing)
+    const missingPlugins = remotePluginNames.filter((name) => !localNames.has(name));
+    if (missingPlugins.length === 0)
         return localMarketplaces;
     autoSyncedMarketplaces.add(mpName);
-    try {
-        await updateMarketplace(mpName);
-        // Invalidate local cache so re-scan picks up new plugins
-        localMarketplacesPromise = null;
-        return getLocalMarketplaces();
-    }
-    catch {
-        // Update failed (no network, CLI missing, etc.) — continue with stale data
-        return localMarketplaces;
-    }
+    // Log stale state but don't trigger update — Claude Code handles refresh
+    console.log(`ℹ Marketplace ${mpName} is stale (missing: ${missingPlugins.join(", ")}). Claude Code will auto-update on next session start.`);
+    return localMarketplaces;
 }
 /**
  * Refresh claudeup's internal cache

package/src/services/plugin-manager.ts

@@ -27,8 +27,6 @@ import {
 	isValidGitHubRepo,
 	parsePluginId,
 } from "../utils/string-utils.js";
-import { updateMarketplace } from "./claude-cli.js";
-
 // Cache for local marketplaces (session-level) - Promise-based to prevent race conditions
 let localMarketplacesPromise: Promise<Map<string, LocalMarketplace>> | null =
 	null;
@@ -619,9 +617,14 @@ const autoSyncedMarketplaces = new Set<string>();
 
 /**
  * If the remote manifest lists plugins that aren't in the local cache,
- * the local clone is stale. Silently run `claude plugin marketplace update`
- * to pull the latest, then invalidate the local cache so the next scan
- * picks up the new plugins.
+ * the local clone is stale. Log a warning but do NOT trigger a marketplace
+ * update from claudeup.
+ *
+ * Previously this called `updateMarketplace()` which invokes Claude Code's
+ * `cacheMarketplaceFromGit()` — a non-atomic delete-then-clone that can
+ * permanently delete the marketplace directory on clone failure.
+ * Claude Code's own background autoupdate handles marketplace refreshing
+ * after session start. See: ai-docs/plugin-marketplace-bug-investigation.md
  */
 async function autoSyncIfStale(
 	mpName: string,
@@ -634,19 +637,17 @@ async function autoSyncIfStale(
 	if (!localMp) return localMarketplaces;
 
 	const localNames = new Set(localMp.plugins.map((p) => p.name));
-	const hasMissing = remotePluginNames.some((name) => !localNames.has(name));
-	if (!hasMissing) return localMarketplaces;
+	const missingPlugins = remotePluginNames.filter(
+		(name) => !localNames.has(name),
+	);
+	if (missingPlugins.length === 0) return localMarketplaces;
 
 	autoSyncedMarketplaces.add(mpName);
-	try {
-		await updateMarketplace(mpName);
-		// Invalidate local cache so re-scan picks up new plugins
-		localMarketplacesPromise = null;
-		return getLocalMarketplaces();
-	} catch {
-		// Update failed (no network, CLI missing, etc.) — continue with stale data
-		return localMarketplaces;
-	}
+	// Log stale state but don't trigger update — Claude Code handles refresh
+	console.log(
+		`ℹ Marketplace ${mpName} is stale (missing: ${missingPlugins.join(", ")}). Claude Code will auto-update on next session start.`,
+	);
+	return localMarketplaces;
 }
 
 export interface RefreshAndRepairResult {

package/src/ui/components/modals/LoadingModal.js

@@ -9,6 +9,9 @@ export function LoadingModal({ message }) {
         }, 80);
         return () => clearInterval(interval);
     }, []);
-    return (_jsxs("box", { flexDirection: "row", border: true, borderStyle: "rounded", borderColor: "#525252", backgroundColor: "#1C1C1E", paddingLeft: 3, paddingRight: 3, paddingTop: 1, paddingBottom: 1, children: [_jsx("text", { fg: "#A1A1AA", children: SPINNER_FRAMES[frame] }), _jsxs("text", { fg: "#EDEDED", children: [" ", message] })] }));
+    const lines = message.split("\n");
+    const mainMessage = lines[0];
+    const detail = lines.slice(1).join("\n");
+    return (_jsxs("box", { flexDirection: "column", border: true, borderStyle: "rounded", borderColor: "#525252", backgroundColor: "#1C1C1E", paddingLeft: 3, paddingRight: 3, paddingTop: 1, paddingBottom: 1, children: [_jsxs("box", { flexDirection: "row", children: [_jsx("text", { fg: "#A1A1AA", children: SPINNER_FRAMES[frame] }), _jsxs("text", { fg: "#EDEDED", children: [" ", mainMessage] })] }), detail ? (_jsx("box", { marginTop: 0, paddingLeft: 2, children: _jsx("text", { fg: "#525252", children: detail }) })) : null] }));
 }
 export default LoadingModal;

package/src/ui/components/modals/LoadingModal.tsx

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from "react";
 
 interface LoadingModalProps {
-	/** Loading message */
+	/** Loading message — supports multiline (first line = status, subsequent = detail) */
 	message: string;
 }
 
@@ -18,9 +18,13 @@ export function LoadingModal({ message }: LoadingModalProps) {
 		return () => clearInterval(interval);
 	}, []);
 
+	const lines = message.split("\n");
+	const mainMessage = lines[0];
+	const detail = lines.slice(1).join("\n");
+
 	return (
 		<box
-			flexDirection="row"
+			flexDirection="column"
 			border
 			borderStyle="rounded"
 			borderColor="#525252"
@@ -30,8 +34,15 @@ export function LoadingModal({ message }: LoadingModalProps) {
 			paddingTop={1}
 			paddingBottom={1}
 		>
-			<text fg="#A1A1AA">{SPINNER_FRAMES[frame]}</text>
-			<text fg="#EDEDED"> {message}</text>
+			<box flexDirection="row">
+				<text fg="#A1A1AA">{SPINNER_FRAMES[frame]}</text>
+				<text fg="#EDEDED"> {mainMessage}</text>
+			</box>
+			{detail ? (
+				<box marginTop={0} paddingLeft={2}>
+					<text fg="#525252">{detail}</text>
+				</box>
+			) : null}
 		</box>
 	);
 }