claudeup 4.5.0 → 4.5.2

package/package.json

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

package/src/__tests__/dual-write-prevention.test.ts

@@ -1,12 +1,14 @@
 /**
- * Dual-write prevention tests
+ * Version tracking tests
  *
- * Verifies that claudeup does NOT write plugin state (via saveGlobalInstalledPluginVersion
- * or saveVersionAfterInstall) when the Claude CLI has already handled the write.
+ * The Claude CLI's `plugin install` command does NOT update `installedPluginVersions`
+ * in settings.json — it only manages `enabledPlugins`. Claudeup must save the version
+ * itself after a successful CLI install/update.
  *
- * RED before fix: PluginsScreen has 6 saveVersionAfterInstall calls after CLI ops;
- *                 prerunner calls saveGlobalInstalledPluginVersion unconditionally.
- * GREEN after fix: those calls are removed.
+ * PluginsScreen: no saveVersionAfterInstall helper (removed in v4.5.0), but each
+ *   action handler calls saveVersionForScope after CLI success.
+ * Prerunner: calls saveGlobalInstalledPluginVersion after successful updatePlugin,
+ *   but NOT when CLI is unavailable or update fails (no phantom state).
  */
 
 import { describe, it, expect, mock, beforeEach, afterEach } from "bun:test";
@@ -121,6 +123,7 @@ mock.module("../services/claude-cli.js", () => ({
   updatePlugin: (...args: unknown[]) => mockUpdatePlugin(...args),
   isClaudeAvailable: (...args: unknown[]) => mockIsClaudeAvailable(...args),
   addMarketplace: mock(() => Promise.resolve()),
+  updateMarketplace: mock(() => Promise.resolve()),
 }));
 
 mock.module("../services/plugin-manager.js", () => ({
@@ -194,16 +197,16 @@ describe("prerunner — saveGlobalInstalledPluginVersion call count", () => {
     );
   });
 
-  it("does NOT call saveGlobalInstalledPluginVersion when CLI is available and updatePlugin succeeds", async () => {
+  it("calls saveGlobalInstalledPluginVersion once after successful CLI update", async () => {
     // CLI is available, updatePlugin succeeds.
-    // The FIXED code removes the saveGlobalInstalledPluginVersion call entirely —
-    // the CLI already wrote the state.
+    // The CLI does NOT update installedPluginVersions, so claudeup must save
+    // the version after a successful update.
     mockIsClaudeAvailable = mock(() => Promise.resolve(true));
     mockUpdatePlugin = mock(() => Promise.resolve());
 
     await prerunClaude(["--help"], { force: true });
 
-    expect(mockSaveGlobal).toHaveBeenCalledTimes(0);
+    expect(mockSaveGlobal).toHaveBeenCalledTimes(1);
   });
 
   it("does NOT call saveGlobalInstalledPluginVersion when CLI is unavailable", async () => {

package/src/main.js

@@ -27,8 +27,54 @@ async function main() {
     }
     // Handle "claudeup update" - self-update command
     if (args[0] === "update") {
-        // Detect how claudeup was installed by checking the executable path
         const { execSync } = await import("node:child_process");
+        const { existsSync } = await import("node:fs");
+        // Detect all installations of claudeup across package managers
+        const installations = [];
+        // Check bun global
+        try {
+            const bunGlobalBin = execSync("bun pm -g bin", {
+                encoding: "utf-8",
+                timeout: 5000,
+            }).trim();
+            const bunPath = `${bunGlobalBin}/claudeup`;
+            if (existsSync(bunPath))
+                installations.push({ manager: "bun", path: bunPath });
+        }
+        catch {
+            // bun not installed or no global claudeup
+        }
+        // Check npm global
+        try {
+            const npmPrefix = execSync("npm prefix -g", {
+                encoding: "utf-8",
+                timeout: 5000,
+            }).trim();
+            const npmPath = `${npmPrefix}/bin/claudeup`;
+            if (existsSync(npmPath))
+                installations.push({ manager: "npm", path: npmPath });
+        }
+        catch {
+            // npm not installed or no global claudeup
+        }
+        // Warn about duplicate installations
+        if (installations.length > 1) {
+            const activePath = execSync("which claudeup", {
+                encoding: "utf-8",
+                timeout: 5000,
+            }).trim();
+            console.log(`⚠ claudeup is installed via multiple package managers:\n`);
+            for (const inst of installations) {
+                const tag = inst.path === activePath ? " (active)" : " (shadowed)";
+                console.log(`  ${inst.manager}: ${inst.path}${tag}`);
+            }
+            console.log(`\nTo fix, keep one and remove the other:`);
+            for (const inst of installations) {
+                console.log(`  ${inst.manager} uninstall -g claudeup`);
+            }
+            console.log();
+        }
+        // Determine which package manager to use for the update
         let usesBun = false;
         try {
             const claudeupPath = execSync("which claudeup", {
@@ -42,9 +88,7 @@ async function main() {
         }
         const pkgManager = usesBun ? "bun" : "npm";
         console.log(`Updating claudeup using ${pkgManager}...`);
-        const installArgs = usesBun
-            ? ["install", "-g", "claudeup@latest"]
-            : ["install", "-g", "claudeup@latest"];
+        const installArgs = ["install", "-g", "claudeup@latest"];
         const proc = spawn(pkgManager, installArgs, {
             stdio: "inherit",
             shell: false, // Avoid shell for security (fixes DEP0190 warning)

package/src/main.tsx

@@ -38,8 +38,62 @@ async function main(): Promise<void> {
 
 	// Handle "claudeup update" - self-update command
 	if (args[0] === "update") {
-		// Detect how claudeup was installed by checking the executable path
 		const { execSync } = await import("node:child_process");
+		const { existsSync } = await import("node:fs");
+
+		// Detect all installations of claudeup across package managers
+		const installations: Array<{
+			manager: "bun" | "npm";
+			path: string;
+		}> = [];
+
+		// Check bun global
+		try {
+			const bunGlobalBin = execSync("bun pm -g bin", {
+				encoding: "utf-8",
+				timeout: 5000,
+			}).trim();
+			const bunPath = `${bunGlobalBin}/claudeup`;
+			if (existsSync(bunPath)) installations.push({ manager: "bun", path: bunPath });
+		} catch {
+			// bun not installed or no global claudeup
+		}
+
+		// Check npm global
+		try {
+			const npmPrefix = execSync("npm prefix -g", {
+				encoding: "utf-8",
+				timeout: 5000,
+			}).trim();
+			const npmPath = `${npmPrefix}/bin/claudeup`;
+			if (existsSync(npmPath)) installations.push({ manager: "npm", path: npmPath });
+		} catch {
+			// npm not installed or no global claudeup
+		}
+
+		// Warn about duplicate installations
+		if (installations.length > 1) {
+			const activePath = execSync("which claudeup", {
+				encoding: "utf-8",
+				timeout: 5000,
+			}).trim();
+
+			console.log(
+				`⚠ claudeup is installed via multiple package managers:\n`,
+			);
+			for (const inst of installations) {
+				const tag =
+					inst.path === activePath ? " (active)" : " (shadowed)";
+				console.log(`  ${inst.manager}: ${inst.path}${tag}`);
+			}
+			console.log(`\nTo fix, keep one and remove the other:`);
+			for (const inst of installations) {
+				console.log(`  ${inst.manager} uninstall -g claudeup`);
+			}
+			console.log();
+		}
+
+		// Determine which package manager to use for the update
 		let usesBun = false;
 		try {
 			const claudeupPath = execSync("which claudeup", {
@@ -54,9 +108,7 @@ async function main(): Promise<void> {
 		const pkgManager = usesBun ? "bun" : "npm";
 		console.log(`Updating claudeup using ${pkgManager}...`);
 
-		const installArgs = usesBun
-			? ["install", "-g", "claudeup@latest"]
-			: ["install", "-g", "claudeup@latest"];
+		const installArgs = ["install", "-g", "claudeup@latest"];
 
 		const proc = spawn(pkgManager, installArgs, {
 			stdio: "inherit",

package/src/prerunner/index.js

@@ -4,10 +4,10 @@ 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, } from "../services/claude-settings.js";
+import { recoverMarketplaceSettings, migrateMarketplaceRename, 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, isClaudeAvailable, } from "../services/claude-cli.js";
+import { updatePlugin, addMarketplace, updateMarketplace, isClaudeAvailable, } from "../services/claude-cli.js";
 const MARKETPLACES_DIR = path.join(os.homedir(), ".claude", "plugins", "marketplaces");
 /**
  * Collect all unique marketplace names from enabled plugins across all settings scopes.
@@ -55,6 +55,11 @@ async function getReferencedMarketplaces(projectPath) {
 /**
  * Check which referenced marketplaces are missing locally and auto-add them.
  * Only adds marketplaces with known repos (from defaultMarketplaces).
+ *
+ * Uses `marketplace update` (not `marketplace add`) for recovery because
+ * `add` short-circuits when the marketplace is already declared in settings
+ * — even if the directory was deleted. `update` detects the missing dir and
+ * re-clones automatically.
  */
 async function autoAddMissingMarketplaces(projectPath) {
     const referenced = await getReferencedMarketplaces(projectPath);
@@ -69,12 +74,19 @@ async function autoAddMissingMarketplaces(projectPath) {
         if (!defaultMp?.source.repo)
             continue;
         try {
-            await addMarketplace(defaultMp.source.repo);
+            // Try `marketplace update` first — it re-clones missing directories
+            await updateMarketplace(mpName);
             added.push(mpName);
         }
-        catch (error) {
-            // Non-fatal: log and continue
-            console.warn(`⚠ Failed to auto-add marketplace ${mpName}:`, error instanceof Error ? error.message : "Unknown error");
+        catch {
+            // If update fails (marketplace not in settings yet), try add
+            try {
+                await addMarketplace(defaultMp.source.repo);
+                added.push(mpName);
+            }
+            catch (error) {
+                console.warn(`⚠ Failed to auto-add marketplace ${mpName}:`, error instanceof Error ? error.message : "Unknown error");
+            }
         }
     }
     return added;
@@ -199,7 +211,8 @@ export async function prerunClaude(claudeArgs, options = {}) {
                             continue;
                         }
                         await updatePlugin(plugin.id, "user");
-                        // CLI wrote all plugin state; no claudeup write needed
+                        // CLI does NOT update installedPluginVersions — save it ourselves
+                        await saveGlobalInstalledPluginVersion(plugin.id, plugin.version);
                         autoUpdatedPlugins.push({
                             pluginId: plugin.id,
                             oldVersion: plugin.installedVersion,

package/src/prerunner/index.ts

@@ -15,12 +15,14 @@ import {
 	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";
 
@@ -84,6 +86,11 @@ async function getReferencedMarketplaces(
 /**
  * Check which referenced marketplaces are missing locally and auto-add them.
  * Only adds marketplaces with known repos (from defaultMarketplaces).
+ *
+ * Uses `marketplace update` (not `marketplace add`) for recovery because
+ * `add` short-circuits when the marketplace is already declared in settings
+ * — even if the directory was deleted. `update` detects the missing dir and
+ * re-clones automatically.
  */
 async function autoAddMissingMarketplaces(
 	projectPath?: string,
@@ -101,14 +108,20 @@ async function autoAddMissingMarketplaces(
 		if (!defaultMp?.source.repo) continue;
 
 		try {
-			await addMarketplace(defaultMp.source.repo);
+			// Try `marketplace update` first — it re-clones missing directories
+			await updateMarketplace(mpName);
 			added.push(mpName);
-		} catch (error) {
-			// Non-fatal: log and continue
-			console.warn(
-				`⚠ Failed to auto-add marketplace ${mpName}:`,
-				error instanceof Error ? error.message : "Unknown error",
-			);
+		} catch {
+			// If update fails (marketplace not in settings yet), try add
+			try {
+				await addMarketplace(defaultMp.source.repo);
+				added.push(mpName);
+			} catch (error) {
+				console.warn(
+					`⚠ Failed to auto-add marketplace ${mpName}:`,
+					error instanceof Error ? error.message : "Unknown error",
+				);
+			}
 		}
 	}
 
@@ -282,7 +295,8 @@ export async function prerunClaude(
 							continue;
 						}
 						await updatePlugin(plugin.id, "user");
-						// CLI wrote all plugin state; no claudeup write needed
+						// CLI does NOT update installedPluginVersions — save it ourselves
+						await saveGlobalInstalledPluginVersion(plugin.id, plugin.version);
 
 						autoUpdatedPlugins.push({
 							pluginId: plugin.id,

package/src/ui/screens/PluginsScreen.js

@@ -8,8 +8,8 @@ import { ScrollableList } from "../components/ScrollableList.js";
 import { EmptyFilterState } from "../components/EmptyFilterState.js";
 import { fuzzyFilter } from "../../utils/fuzzy-search.js";
 import { getAllMarketplaces } from "../../data/marketplaces.js";
-import { getAvailablePlugins, refreshAllMarketplaces, clearMarketplaceCache, getLocalMarketplacesInfo, } from "../../services/plugin-manager.js";
-import { setMcpEnvVar, getMcpEnvVars, readSettings, } from "../../services/claude-settings.js";
+import { getAvailablePlugins, refreshAllMarketplaces, clearMarketplaceCache, getLocalMarketplacesInfo, saveInstalledPluginVersion, } from "../../services/plugin-manager.js";
+import { setMcpEnvVar, getMcpEnvVars, readSettings, saveGlobalInstalledPluginVersion, saveLocalInstalledPluginVersion, } from "../../services/claude-settings.js";
 import { saveProfile } from "../../services/profiles.js";
 import { installPlugin as cliInstallPlugin, uninstallPlugin as cliUninstallPlugin, updatePlugin as cliUpdatePlugin, } from "../../services/claude-cli.js";
 import { getPluginEnvRequirements, getPluginSourcePath, } from "../../services/plugin-mcp-config.js";
@@ -206,6 +206,23 @@ export function PluginsScreen() {
         else if (event.name === "s")
             handleSaveAsProfile();
     });
+    // ── Helpers ───────────────────────────────────────────────────────────────
+    /**
+     * Save the installed plugin version to the correct settings file for the scope.
+     * The Claude CLI's `plugin install` does NOT update installedPluginVersions,
+     * so claudeup must do it after a successful CLI install/update.
+     */
+    const saveVersionForScope = async (pluginId, version, scope) => {
+        if (scope === "user") {
+            await saveGlobalInstalledPluginVersion(pluginId, version);
+        }
+        else if (scope === "local") {
+            await saveLocalInstalledPluginVersion(pluginId, version, state.projectPath);
+        }
+        else {
+            await saveInstalledPluginVersion(pluginId, version, state.projectPath);
+        }
+    };
     // ── Action handlers ────────────────────────────────────────────────────────
     const handleRefresh = async () => {
         progress.show("Refreshing cache...");
@@ -439,9 +456,11 @@ export function PluginsScreen() {
                 }
                 else if (action === "update") {
                     await cliUpdatePlugin(plugin.id, scope);
+                    await saveVersionForScope(plugin.id, latestVersion, scope);
                 }
                 else {
                     await cliInstallPlugin(plugin.id, scope);
+                    await saveVersionForScope(plugin.id, latestVersion, scope);
                     modal.hideModal();
                     await collectPluginEnvVars(plugin.name, plugin.marketplace);
                     await installPluginSystemDeps(plugin.name, plugin.marketplace);
@@ -466,6 +485,9 @@ export function PluginsScreen() {
         modal.loading(`Updating ${plugin.name}...`);
         try {
             await cliUpdatePlugin(plugin.id, scope);
+            if (plugin.version) {
+                await saveVersionForScope(plugin.id, plugin.version, scope);
+            }
             modal.hideModal();
             fetchData();
         }
@@ -485,6 +507,9 @@ export function PluginsScreen() {
         try {
             for (const plugin of updatable) {
                 await cliUpdatePlugin(plugin.id, scope);
+                if (plugin.version) {
+                    await saveVersionForScope(plugin.id, plugin.version, scope);
+                }
             }
             modal.hideModal();
             fetchData();
@@ -534,9 +559,11 @@ export function PluginsScreen() {
             }
             else if (action === "update") {
                 await cliUpdatePlugin(plugin.id, scope);
+                await saveVersionForScope(plugin.id, latestVersion, scope);
             }
             else {
                 await cliInstallPlugin(plugin.id, scope);
+                await saveVersionForScope(plugin.id, latestVersion, scope);
                 modal.hideModal();
                 await collectPluginEnvVars(plugin.name, plugin.marketplace);
                 await installPluginSystemDeps(plugin.name, plugin.marketplace);

package/src/ui/screens/PluginsScreen.tsx

@@ -12,12 +12,15 @@ import {
 	refreshAllMarketplaces,
 	clearMarketplaceCache,
 	getLocalMarketplacesInfo,
+	saveInstalledPluginVersion,
 	type PluginInfo,
 } from "../../services/plugin-manager.js";
 import {
 	setMcpEnvVar,
 	getMcpEnvVars,
 	readSettings,
+	saveGlobalInstalledPluginVersion,
+	saveLocalInstalledPluginVersion,
 } from "../../services/claude-settings.js";
 import { saveProfile } from "../../services/profiles.js";
 import {
@@ -241,6 +244,27 @@ export function PluginsScreen() {
 		else if (event.name === "s") handleSaveAsProfile();
 	});
 
+	// ── Helpers ───────────────────────────────────────────────────────────────
+
+	/**
+	 * Save the installed plugin version to the correct settings file for the scope.
+	 * The Claude CLI's `plugin install` does NOT update installedPluginVersions,
+	 * so claudeup must do it after a successful CLI install/update.
+	 */
+	const saveVersionForScope = async (
+		pluginId: string,
+		version: string,
+		scope: PluginScope,
+	): Promise<void> => {
+		if (scope === "user") {
+			await saveGlobalInstalledPluginVersion(pluginId, version);
+		} else if (scope === "local") {
+			await saveLocalInstalledPluginVersion(pluginId, version, state.projectPath);
+		} else {
+			await saveInstalledPluginVersion(pluginId, version, state.projectPath);
+		}
+	};
+
 	// ── Action handlers ────────────────────────────────────────────────────────
 
 	const handleRefresh = async () => {
@@ -549,8 +573,10 @@ export function PluginsScreen() {
 					await cliUninstallPlugin(plugin.id, scope, state.projectPath);
 				} else if (action === "update") {
 					await cliUpdatePlugin(plugin.id, scope);
+					await saveVersionForScope(plugin.id, latestVersion, scope);
 				} else {
 					await cliInstallPlugin(plugin.id, scope);
+					await saveVersionForScope(plugin.id, latestVersion, scope);
 					modal.hideModal();
 					await collectPluginEnvVars(plugin.name, plugin.marketplace);
 					await installPluginSystemDeps(plugin.name, plugin.marketplace);
@@ -576,6 +602,9 @@ export function PluginsScreen() {
 		modal.loading(`Updating ${plugin.name}...`);
 		try {
 			await cliUpdatePlugin(plugin.id, scope);
+			if (plugin.version) {
+				await saveVersionForScope(plugin.id, plugin.version, scope);
+			}
 			modal.hideModal();
 			fetchData();
 		} catch (error) {
@@ -596,6 +625,9 @@ export function PluginsScreen() {
 		try {
 			for (const plugin of updatable) {
 				await cliUpdatePlugin(plugin.id, scope);
+				if (plugin.version) {
+					await saveVersionForScope(plugin.id, plugin.version, scope);
+				}
 			}
 			modal.hideModal();
 			fetchData();
@@ -651,8 +683,10 @@ export function PluginsScreen() {
 				await cliUninstallPlugin(plugin.id, scope, state.projectPath);
 			} else if (action === "update") {
 				await cliUpdatePlugin(plugin.id, scope);
+				await saveVersionForScope(plugin.id, latestVersion, scope);
 			} else {
 				await cliInstallPlugin(plugin.id, scope);
+				await saveVersionForScope(plugin.id, latestVersion, scope);
 				modal.hideModal();
 				await collectPluginEnvVars(plugin.name, plugin.marketplace);
 				await installPluginSystemDeps(plugin.name, plugin.marketplace);