claudeup 3.5.0 → 3.6.0

package/package.json

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

package/src/data/marketplaces.js

@@ -17,6 +17,7 @@ function normalizeRepo(repo) {
  */
 export const deprecatedMarketplaces = {
     "mag-claude-plugins": "magus",
+    "MadAppGang-claude-code": "magus",
 };
 export const defaultMarketplaces = [
     {

package/src/data/marketplaces.ts

@@ -22,6 +22,7 @@ function normalizeRepo(repo: string): string {
  */
 export const deprecatedMarketplaces: Record<string, string> = {
 	"mag-claude-plugins": "magus",
+	"MadAppGang-claude-code": "magus",
 };
 
 export const defaultMarketplaces: Marketplace[] = [

package/src/prerunner/index.js

@@ -1,7 +1,78 @@
+import fs from "fs-extra";
+import path from "node:path";
+import os from "node:os";
 import { UpdateCache } from "../services/update-cache.js";
-import { getAvailablePlugins, clearMarketplaceCache, saveInstalledPluginVersion, } from "../services/plugin-manager.js";
+import { getAvailablePlugins, clearMarketplaceCache, } from "../services/plugin-manager.js";
 import { runClaude } from "../services/claude-runner.js";
-import { recoverMarketplaceSettings, migrateMarketplaceRename } from "../services/claude-settings.js";
+import { recoverMarketplaceSettings, migrateMarketplaceRename, getGlobalEnabledPlugins, getEnabledPlugins, getLocalEnabledPlugins, } 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";
+const MARKETPLACES_DIR = path.join(os.homedir(), ".claude", "plugins", "marketplaces");
+/**
+ * Collect all unique marketplace names from enabled plugins across all settings scopes.
+ * Returns a Set of marketplace names (e.g., "magus", "claude-plugins-official").
+ */
+async function getReferencedMarketplaces(projectPath) {
+    const marketplaceNames = new Set();
+    // Collect plugin IDs from all scopes
+    const allPluginIds = new Set();
+    try {
+        const global = await getGlobalEnabledPlugins();
+        for (const id of Object.keys(global))
+            allPluginIds.add(id);
+    }
+    catch { /* skip if unreadable */ }
+    if (projectPath) {
+        try {
+            const project = await getEnabledPlugins(projectPath);
+            for (const id of Object.keys(project))
+                allPluginIds.add(id);
+        }
+        catch { /* skip if unreadable */ }
+        try {
+            const local = await getLocalEnabledPlugins(projectPath);
+            for (const id of Object.keys(local))
+                allPluginIds.add(id);
+        }
+        catch { /* skip if unreadable */ }
+    }
+    // Parse marketplace names from plugin IDs
+    for (const pluginId of allPluginIds) {
+        const parsed = parsePluginId(pluginId);
+        if (parsed) {
+            marketplaceNames.add(parsed.marketplace);
+        }
+    }
+    return marketplaceNames;
+}
+/**
+ * Check which referenced marketplaces are missing locally and auto-add them.
+ * Only adds marketplaces with known repos (from defaultMarketplaces).
+ */
+async function autoAddMissingMarketplaces(projectPath) {
+    const referenced = await getReferencedMarketplaces(projectPath);
+    const added = [];
+    for (const mpName of referenced) {
+        // Check if marketplace directory exists locally
+        const mpDir = path.join(MARKETPLACES_DIR, mpName);
+        if (await fs.pathExists(mpDir))
+            continue;
+        // Look up the repo URL from default marketplaces
+        const defaultMp = defaultMarketplaces.find((m) => m.name === mpName);
+        if (!defaultMp?.source.repo)
+            continue;
+        try {
+            await addMarketplace(defaultMp.source.repo);
+            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");
+        }
+    }
+    return added;
+}
 /**
  * Prerun orchestration: Check for updates, apply them, then run claude
  * @param claudeArgs - Arguments to pass to claude CLI
@@ -11,13 +82,22 @@ 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 0.5: Auto-add missing marketplaces
+        // When plugins reference a marketplace that's not installed locally
+        // (e.g., settings synced from another machine), add it automatically.
+        if (await isClaudeAvailable()) {
+            const addedMarketplaces = await autoAddMissingMarketplaces();
+            if (addedMarketplaces.length > 0) {
+                console.log(`✓ Auto-added marketplace(s): ${addedMarketplaces.join(", ")}`);
+            }
         }
         // STEP 1: Check if we should update (time-based cache, or forced)
         const shouldUpdate = options.force || (await cache.shouldCheckForUpdates());
@@ -34,12 +114,12 @@ export async function prerunClaude(claudeArgs, options = {}) {
                 console.log(`✓ Removed stale marketplaces: ${recovery.removed.join(", ")}`);
             }
             // STEP 2: Clear cache to force fresh plugin info
-            // Note: Marketplace updates should be done via Claude Code's /plugin marketplace update
             clearMarketplaceCache();
             // STEP 3: Get updated plugin info (to detect versions)
             const plugins = await getAvailablePlugins();
-            // STEP 4: Auto-update enabled plugins with available updates
+            // STEP 4: Auto-update enabled plugins via claude CLI
             const autoUpdatedPlugins = [];
+            const cliAvailable = await isClaudeAvailable();
             for (const plugin of plugins) {
                 // Only update if:
                 // 1. Plugin is enabled
@@ -50,11 +130,9 @@ export async function prerunClaude(claudeArgs, options = {}) {
                     plugin.installedVersion &&
                     plugin.version) {
                     try {
-                        // Save new version - this will:
-                        // 1. Update settings.json
-                        // 2. Call updateInstalledPluginsRegistry()
-                        // 3. Copy plugin files to cache (via copyPluginToCache())
-                        await saveInstalledPluginVersion(plugin.id, plugin.version);
+                        if (cliAvailable) {
+                            await updatePlugin(plugin.id, "user");
+                        }
                         autoUpdatedPlugins.push({
                             pluginId: plugin.id,
                             oldVersion: plugin.installedVersion,

package/src/prerunner/index.ts

@@ -1,16 +1,112 @@
+import fs from "fs-extra";
+import path from "node:path";
+import os from "node:os";
 import { UpdateCache } from "../services/update-cache.js";
 import {
 	getAvailablePlugins,
 	clearMarketplaceCache,
-	saveInstalledPluginVersion,
 } from "../services/plugin-manager.js";
 import { runClaude } from "../services/claude-runner.js";
-import { recoverMarketplaceSettings, migrateMarketplaceRename } from "../services/claude-settings.js";
+import {
+	recoverMarketplaceSettings,
+	migrateMarketplaceRename,
+	getGlobalEnabledPlugins,
+	getEnabledPlugins,
+	getLocalEnabledPlugins,
+} 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";
+
+const MARKETPLACES_DIR = path.join(
+	os.homedir(),
+	".claude",
+	"plugins",
+	"marketplaces",
+);
 
 export interface PrerunOptions {
 	force?: boolean; // Bypass cache and force update check
 }
 
+/**
+ * Collect all unique marketplace names from enabled plugins across all settings scopes.
+ * Returns a Set of marketplace names (e.g., "magus", "claude-plugins-official").
+ */
+async function getReferencedMarketplaces(
+	projectPath?: string,
+): Promise<Set<string>> {
+	const marketplaceNames = new Set<string>();
+
+	// Collect plugin IDs from all scopes
+	const allPluginIds = new Set<string>();
+
+	try {
+		const global = await getGlobalEnabledPlugins();
+		for (const id of Object.keys(global)) allPluginIds.add(id);
+	} catch { /* skip if unreadable */ }
+
+	if (projectPath) {
+		try {
+			const project = await getEnabledPlugins(projectPath);
+			for (const id of Object.keys(project)) allPluginIds.add(id);
+		} catch { /* skip if unreadable */ }
+
+		try {
+			const local = await getLocalEnabledPlugins(projectPath);
+			for (const id of Object.keys(local)) allPluginIds.add(id);
+		} catch { /* skip if unreadable */ }
+	}
+
+	// Parse marketplace names from plugin IDs
+	for (const pluginId of allPluginIds) {
+		const parsed = parsePluginId(pluginId);
+		if (parsed) {
+			marketplaceNames.add(parsed.marketplace);
+		}
+	}
+
+	return marketplaceNames;
+}
+
+/**
+ * Check which referenced marketplaces are missing locally and auto-add them.
+ * Only adds marketplaces with known repos (from defaultMarketplaces).
+ */
+async function autoAddMissingMarketplaces(
+	projectPath?: string,
+): Promise<string[]> {
+	const referenced = await getReferencedMarketplaces(projectPath);
+	const added: string[] = [];
+
+	for (const mpName of referenced) {
+		// Check if marketplace directory exists locally
+		const mpDir = path.join(MARKETPLACES_DIR, mpName);
+		if (await fs.pathExists(mpDir)) continue;
+
+		// Look up the repo URL from default marketplaces
+		const defaultMp = defaultMarketplaces.find((m) => m.name === mpName);
+		if (!defaultMp?.source.repo) continue;
+
+		try {
+			await addMarketplace(defaultMp.source.repo);
+			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",
+			);
+		}
+	}
+
+	return added;
+}
+
 /**
  * Prerun orchestration: Check for updates, apply them, then run claude
  * @param claudeArgs - Arguments to pass to claude CLI
@@ -24,13 +120,25 @@ 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 0.5: Auto-add missing marketplaces
+		// When plugins reference a marketplace that's not installed locally
+		// (e.g., settings synced from another machine), add it automatically.
+		if (await isClaudeAvailable()) {
+			const addedMarketplaces = await autoAddMissingMarketplaces();
+			if (addedMarketplaces.length > 0) {
+				console.log(
+					`✓ Auto-added marketplace(s): ${addedMarketplaces.join(", ")}`,
+				);
+			}
 		}
 
 		// STEP 1: Check if we should update (time-based cache, or forced)
@@ -55,19 +163,20 @@ export async function prerunClaude(
 			}
 
 			// STEP 2: Clear cache to force fresh plugin info
-			// Note: Marketplace updates should be done via Claude Code's /plugin marketplace update
 			clearMarketplaceCache();
 
 			// STEP 3: Get updated plugin info (to detect versions)
 			const plugins = await getAvailablePlugins();
 
-			// STEP 4: Auto-update enabled plugins with available updates
+			// STEP 4: Auto-update enabled plugins via claude CLI
 			const autoUpdatedPlugins: Array<{
 				pluginId: string;
 				oldVersion: string;
 				newVersion: string;
 			}> = [];
 
+			const cliAvailable = await isClaudeAvailable();
+
 			for (const plugin of plugins) {
 				// Only update if:
 				// 1. Plugin is enabled
@@ -80,11 +189,9 @@ export async function prerunClaude(
 					plugin.version
 				) {
 					try {
-						// Save new version - this will:
-						// 1. Update settings.json
-						// 2. Call updateInstalledPluginsRegistry()
-						// 3. Copy plugin files to cache (via copyPluginToCache())
-						await saveInstalledPluginVersion(plugin.id, plugin.version);
+						if (cliAvailable) {
+							await updatePlugin(plugin.id, "user");
+						}
 
 						autoUpdatedPlugins.push({
 							pluginId: plugin.id,

package/src/services/claude-cli.js

@@ -0,0 +1,94 @@
+/**
+ * Claude CLI wrapper service
+ *
+ * Delegates plugin and marketplace management to the `claude` CLI
+ * instead of manipulating settings JSON files directly.
+ *
+ * CLI commands used:
+ * - claude plugin install/uninstall/enable/disable/update
+ * - claude marketplace add
+ */
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { which } from "../utils/command-utils.js";
+const execFileAsync = promisify(execFile);
+/**
+ * Get the path to the claude CLI binary
+ * @throws Error if claude CLI is not found in PATH
+ */
+async function getClaudePath() {
+    const claudePath = await which("claude");
+    if (!claudePath) {
+        throw new Error("claude CLI not found in PATH. Install with: npm install -g @anthropic-ai/claude-code");
+    }
+    return claudePath;
+}
+/**
+ * Execute a claude CLI command and return stdout
+ * @param args - Arguments to pass to claude
+ * @param timeoutMs - Timeout in milliseconds (default: 30s)
+ * @returns stdout from the command
+ */
+async function execClaude(args, timeoutMs = 30000) {
+    const claudePath = await getClaudePath();
+    try {
+        const { stdout } = await execFileAsync(claudePath, args, {
+            timeout: timeoutMs,
+        });
+        return stdout.trim();
+    }
+    catch (error) {
+        const execError = error;
+        const msg = execError.stderr?.trim() ||
+            execError.stdout?.trim() ||
+            execError.message ||
+            "claude command failed";
+        throw new Error(msg);
+    }
+}
+/**
+ * Install a plugin using claude CLI
+ * Handles enabling + version tracking + cache copy in one shot
+ */
+export async function installPlugin(pluginId, scope = "user") {
+    await execClaude(["plugin", "install", pluginId, "--scope", scope]);
+}
+/**
+ * Uninstall a plugin using claude CLI
+ * Handles disabling + version removal in one shot
+ */
+export async function uninstallPlugin(pluginId, scope = "user") {
+    await execClaude(["plugin", "uninstall", pluginId, "--scope", scope]);
+}
+/**
+ * Enable a previously disabled plugin
+ */
+export async function enablePlugin(pluginId, scope = "user") {
+    await execClaude(["plugin", "enable", pluginId, "--scope", scope]);
+}
+/**
+ * Disable a plugin without uninstalling it
+ */
+export async function disablePlugin(pluginId, scope = "user") {
+    await execClaude(["plugin", "disable", pluginId, "--scope", scope]);
+}
+/**
+ * Update a plugin to the latest version
+ */
+export async function updatePlugin(pluginId, scope = "user") {
+    await execClaude(["plugin", "update", pluginId, "--scope", scope], 60000);
+}
+/**
+ * Add a marketplace by GitHub repo (e.g., "MadAppGang/magus")
+ * Uses longer timeout since this involves cloning a git repo
+ */
+export async function addMarketplace(repo) {
+    await execClaude(["plugin", "marketplace", "add", repo], 60000);
+}
+/**
+ * Check if the claude CLI is available
+ * @returns true if claude CLI is found in PATH
+ */
+export async function isClaudeAvailable() {
+    return (await which("claude")) !== null;
+}

package/src/services/claude-cli.ts

@@ -0,0 +1,132 @@
+/**
+ * Claude CLI wrapper service
+ *
+ * Delegates plugin and marketplace management to the `claude` CLI
+ * instead of manipulating settings JSON files directly.
+ *
+ * CLI commands used:
+ * - claude plugin install/uninstall/enable/disable/update
+ * - claude marketplace add
+ */
+
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+import { which } from "../utils/command-utils.js";
+
+const execFileAsync = promisify(execFile);
+
+export type PluginScope = "user" | "project" | "local";
+
+/**
+ * Get the path to the claude CLI binary
+ * @throws Error if claude CLI is not found in PATH
+ */
+async function getClaudePath(): Promise<string> {
+	const claudePath = await which("claude");
+	if (!claudePath) {
+		throw new Error(
+			"claude CLI not found in PATH. Install with: npm install -g @anthropic-ai/claude-code",
+		);
+	}
+	return claudePath;
+}
+
+/**
+ * Execute a claude CLI command and return stdout
+ * @param args - Arguments to pass to claude
+ * @param timeoutMs - Timeout in milliseconds (default: 30s)
+ * @returns stdout from the command
+ */
+async function execClaude(
+	args: string[],
+	timeoutMs = 30000,
+): Promise<string> {
+	const claudePath = await getClaudePath();
+	try {
+		const { stdout } = await execFileAsync(claudePath, args, {
+			timeout: timeoutMs,
+		});
+		return stdout.trim();
+	} catch (error: unknown) {
+		const execError = error as {
+			stderr?: string;
+			stdout?: string;
+			message?: string;
+			code?: number;
+		};
+		const msg =
+			execError.stderr?.trim() ||
+			execError.stdout?.trim() ||
+			execError.message ||
+			"claude command failed";
+		throw new Error(msg);
+	}
+}
+
+/**
+ * Install a plugin using claude CLI
+ * Handles enabling + version tracking + cache copy in one shot
+ */
+export async function installPlugin(
+	pluginId: string,
+	scope: PluginScope = "user",
+): Promise<void> {
+	await execClaude(["plugin", "install", pluginId, "--scope", scope]);
+}
+
+/**
+ * Uninstall a plugin using claude CLI
+ * Handles disabling + version removal in one shot
+ */
+export async function uninstallPlugin(
+	pluginId: string,
+	scope: PluginScope = "user",
+): Promise<void> {
+	await execClaude(["plugin", "uninstall", pluginId, "--scope", scope]);
+}
+
+/**
+ * Enable a previously disabled plugin
+ */
+export async function enablePlugin(
+	pluginId: string,
+	scope: PluginScope = "user",
+): Promise<void> {
+	await execClaude(["plugin", "enable", pluginId, "--scope", scope]);
+}
+
+/**
+ * Disable a plugin without uninstalling it
+ */
+export async function disablePlugin(
+	pluginId: string,
+	scope: PluginScope = "user",
+): Promise<void> {
+	await execClaude(["plugin", "disable", pluginId, "--scope", scope]);
+}
+
+/**
+ * Update a plugin to the latest version
+ */
+export async function updatePlugin(
+	pluginId: string,
+	scope: PluginScope = "user",
+): Promise<void> {
+	await execClaude(["plugin", "update", pluginId, "--scope", scope], 60000);
+}
+
+/**
+ * Add a marketplace by GitHub repo (e.g., "MadAppGang/magus")
+ * Uses longer timeout since this involves cloning a git repo
+ */
+export async function addMarketplace(repo: string): Promise<void> {
+	await execClaude(["plugin", "marketplace", "add", repo], 60000);
+}
+
+/**
+ * Check if the claude CLI is available
+ * @returns true if claude CLI is found in PATH
+ */
+export async function isClaudeAvailable(): Promise<boolean> {
+	return (await which("claude")) !== null;
+}