magus-cli 7.7.0 → 7.9.0

package/src/services/local-marketplace.ts

@@ -162,9 +162,6 @@ function getGitRemote(marketplacePath: string): string | undefined {
 	}
 }
 
-/**
- * Scan a single marketplace directory and return marketplace info
- */
 /**
  * Names of the skills under `skillsDir`, recursing through grouping directories.
  *
@@ -260,6 +257,11 @@ export async function scanMcpServers(pluginPath: string): Promise<string[]> {
 	return found;
 }
 
+/**
+ * Read one marketplace clone: its manifest, plus the component counts of each
+ * plugin whose source directory is on disk. Read-only — the manifest and the
+ * clone belong to Claude Code, and nothing here writes either.
+ */
 async function scanSingleMarketplace(
 	marketplacePath: string,
 	marketplaceName: string,
@@ -277,8 +279,6 @@ async function scanSingleMarketplace(
 		const gitRepo = getGitRemote(marketplacePath);
 
 		const plugins: LocalMarketplacePlugin[] = [];
-		const validManifestPlugins: typeof manifest.plugins = [];
-		let manifestModified = false;
 
 		if (manifest.plugins && Array.isArray(manifest.plugins)) {
 			for (const plugin of manifest.plugins) {
@@ -292,18 +292,13 @@ async function scanSingleMarketplace(
 				const sourceStr =
 					typeof plugin.source === "string" ? plugin.source : null;
 
-				if (sourceStr) {
-					const pluginPath = path.join(
-						marketplacePath,
-						sourceStr.replace("./", ""),
-					);
-
-					// Remove plugins whose source directory doesn't exist
-					if (!(await fs.pathExists(pluginPath))) {
-						manifestModified = true;
-						continue;
-					}
-
+				// A plugin whose source directory is not on disk is still listed: the
+				// manifest is Claude Code's, and a scan reads it, never rewrites it.
+				// Its component lists stay empty because there is nothing to count.
+				const pluginPath = sourceStr
+					? path.join(marketplacePath, sourceStr.replace("./", ""))
+					: null;
+				if (pluginPath && (await fs.pathExists(pluginPath))) {
 					try {
 						// Scan for agents
 						const agentsDir = path.join(pluginPath, "agents");
@@ -330,7 +325,6 @@ async function scanSingleMarketplace(
 					}
 				}
 
-				validManifestPlugins.push(plugin);
 				plugins.push({
 					name: plugin.name,
 					version: plugin.version || "0.0.0",
@@ -349,12 +343,6 @@ async function scanSingleMarketplace(
 			}
 		}
 
-		// Update marketplace.json if we removed invalid plugins
-		if (manifestModified) {
-			manifest.plugins = validManifestPlugins;
-			await fs.writeJson(manifestPath, manifest, { spaces: 2 });
-		}
-
 		return {
 			name: manifest.name || marketplaceName,
 			description: manifest.description || manifest.metadata?.description || "",
@@ -466,13 +454,6 @@ export async function hasLocalMarketplace(name: string): Promise<boolean> {
 	return fs.pathExists(manifestPath);
 }
 
-export interface RefreshResult {
-	name: string;
-	success: boolean;
-	updated: boolean;
-	error?: string;
-}
-
 export interface RefreshProgress {
 	current: number;
 	total: number;
@@ -480,178 +461,3 @@ export interface RefreshProgress {
 }
 
 export type ProgressCallback = (progress: RefreshProgress) => void;
-
-export interface RepairResult {
-	repaired: boolean;
-	pluginName: string;
-	added: {
-		agents: string[];
-		commands: string[];
-		skills: string[];
-	};
-}
-
-/**
- * Repair a plugin's plugin.json by adding missing agents/commands/skills arrays
- * based on what files exist on disk.
- *
- * This fixes plugins where the author forgot to add the arrays to plugin.json,
- * causing Claude Code to not load the agents/commands even though files exist.
- */
-export async function repairPluginJson(
-	pluginPath: string,
-): Promise<RepairResult> {
-	const pluginJsonPath = path.join(pluginPath, ".claude-plugin", "plugin.json");
-	const pluginName = path.basename(pluginPath);
-
-	const result: RepairResult = {
-		repaired: false,
-		pluginName,
-		added: { agents: [], commands: [], skills: [] },
-	};
-
-	if (!(await fs.pathExists(pluginJsonPath))) {
-		return result;
-	}
-
-	try {
-		const pluginJson = await fs.readJson(pluginJsonPath);
-		let modified = false;
-
-		// Scan and add agents if array is missing
-		const agentsDir = path.join(pluginPath, "agents");
-		if (await fs.pathExists(agentsDir)) {
-			const files = (await fs.readdir(agentsDir))
-				.filter((f) => f.endsWith(".md"))
-				.map((f) => `./agents/${f}`);
-
-			if (files.length > 0 && !pluginJson.agents) {
-				pluginJson.agents = files;
-				result.added.agents = files;
-				modified = true;
-			}
-		}
-
-		// Scan and add commands if array is missing
-		const commandsDir = path.join(pluginPath, "commands");
-		if (await fs.pathExists(commandsDir)) {
-			const files = (await fs.readdir(commandsDir))
-				.filter((f) => f.endsWith(".md"))
-				.map((f) => `./commands/${f}`);
-
-			if (files.length > 0 && !pluginJson.commands) {
-				pluginJson.commands = files;
-				result.added.commands = files;
-				modified = true;
-			}
-		}
-
-		// Scan and add skills if array is missing
-		const skillsDir = path.join(pluginPath, "skills");
-		if (await fs.pathExists(skillsDir)) {
-			const entries = await fs.readdir(skillsDir, { withFileTypes: true });
-			const skills = entries
-				.filter((e) => e.isDirectory() || e.name.endsWith(".md"))
-				.map((e) => `./skills/${e.name}`);
-
-			if (skills.length > 0 && !pluginJson.skills) {
-				pluginJson.skills = skills;
-				result.added.skills = skills;
-				modified = true;
-			}
-		}
-
-		if (modified) {
-			await fs.writeJson(pluginJsonPath, pluginJson, { spaces: 2 });
-			result.repaired = true;
-		}
-	} catch {
-		// Ignore repair errors for individual plugins
-	}
-
-	return result;
-}
-
-export interface RepairMarketplaceResult {
-	marketplace: string;
-	repaired: RepairResult[];
-}
-
-/**
- * Repair all plugins in a marketplace
- */
-export async function repairMarketplacePlugins(
-	marketplaceName: string,
-): Promise<RepairMarketplaceResult> {
-	const result: RepairMarketplaceResult = {
-		marketplace: marketplaceName,
-		repaired: [],
-	};
-
-	const marketplacePath = path.join(CLAUDE_PLUGINS_DIR, marketplaceName);
-	const manifestPath = path.join(
-		marketplacePath,
-		".claude-plugin",
-		"marketplace.json",
-	);
-
-	if (!(await fs.pathExists(manifestPath))) {
-		return result;
-	}
-
-	try {
-		const manifest = await fs.readJson(manifestPath);
-
-		if (manifest.plugins && Array.isArray(manifest.plugins)) {
-			for (const plugin of manifest.plugins) {
-				if (plugin.source) {
-					const pluginPath = path.join(
-						marketplacePath,
-						plugin.source.replace("./", ""),
-					);
-					const repairResult = await repairPluginJson(pluginPath);
-
-					if (repairResult.repaired) {
-						result.repaired.push(repairResult);
-					}
-				}
-			}
-		}
-	} catch {
-		// Ignore errors
-	}
-
-	return result;
-}
-
-/**
- * Repair all plugins in all marketplaces
- */
-export async function repairAllMarketplaces(): Promise<
-	RepairMarketplaceResult[]
-> {
-	const results: RepairMarketplaceResult[] = [];
-
-	if (!(await fs.pathExists(CLAUDE_PLUGINS_DIR))) {
-		return results;
-	}
-
-	try {
-		const entries = await fs.readdir(CLAUDE_PLUGINS_DIR, {
-			withFileTypes: true,
-		});
-
-		for (const entry of entries) {
-			if (!entry.isDirectory()) continue;
-
-			const repairResult = await repairMarketplacePlugins(entry.name);
-			if (repairResult.repaired.length > 0) {
-				results.push(repairResult);
-			}
-		}
-	} catch {
-		// Return empty on error
-	}
-
-	return results;
-}

package/src/services/marketplace-refresh.ts

@@ -1,12 +1,12 @@
 /**
  * Keep on-disk marketplace clones current — safely.
  *
- * The plugin *list* magus shows is fetched fresh from GitHub, but a plugin's
- * `setup` block and Claude Code's own installer read the on-disk marketplace
- * clone (~/.claude/plugins/marketplaces/<name>). Nothing else keeps that clone
+ * The plugin *list* magus shows is fetched fresh from GitHub, but the
+ * `requires` of a plugin not installed yet and Claude Code's own installer read
+ * the on-disk marketplace clone (~/.claude/plugins/marketplaces/<name>). Nothing else keeps that clone
  * current — recoverMarketplaceSettings only pulls entries it had to re-register —
  * so a healthy marketplace's clone goes stale and its plugin metadata (e.g. a
- * pinned dependency version in a plugin's setup) is never seen, even while the
+ * dependency pin in a plugin's `requires`) is never seen, even while the
  * displayed version looks up to date.
  *
  * IMPORTANT: this refreshes the clone with a NON-DESTRUCTIVE `git pull --ff-only`,

package/src/services/plugin-env-needs.ts

@@ -0,0 +1,69 @@
+/**
+ * Which variables a plugin's MCP server needs and does not have yet.
+ *
+ * DERIVED FROM CURRENT CONFIG, every time: the plugin's own MCP config names
+ * the `${VAR}` references, and a variable counts as set when this project's
+ * MCP variables hold it or magus's environment carries it. Nothing records
+ * that the user declined to set them — so the Plugins screen's "needs N
+ * settings" state disappears on its own the moment they are set, however
+ * they were set.
+ *
+ * One function for both the install flow (which asks for exactly these) and
+ * the detail panel (which states them), so the two cannot disagree.
+ */
+
+import { getMcpEnvVars } from "./claude-settings.js";
+import {
+	type PluginEnvRequirement,
+	getPluginEnvRequirements,
+	getPluginSourcePath,
+} from "./plugin-mcp-config.js";
+
+/** The reads, injectable so a test needs no marketplace clone on disk. */
+export interface PluginEnvNeedsDeps {
+	sourcePath: (
+		marketplace: string,
+		pluginName: string,
+	) => Promise<string | undefined>;
+	requirements: (
+		marketplace: string,
+		pluginSource: string,
+	) => Promise<PluginEnvRequirement[]>;
+	configured: (projectPath?: string) => Promise<Record<string, string>>;
+}
+
+const REAL_DEPS: PluginEnvNeedsDeps = {
+	sourcePath: getPluginSourcePath,
+	requirements: getPluginEnvRequirements,
+	configured: getMcpEnvVars,
+};
+
+/**
+ * The variables `pluginName`'s MCP servers reference that are set nowhere —
+ * empty when it has no MCP server, needs nothing, or has everything.
+ *
+ * Throws when the project's variables cannot be read (a settings file that
+ * does not parse): "needs nothing" would be a guess.
+ */
+export async function missingPluginEnvVars(
+	marketplace: string,
+	pluginName: string,
+	projectPath?: string,
+	env: Readonly<Record<string, string | undefined>> = process.env,
+	deps: PluginEnvNeedsDeps = REAL_DEPS,
+): Promise<PluginEnvRequirement[]> {
+	const source = await deps.sourcePath(marketplace, pluginName);
+	if (!source) return [];
+	const requirements = await deps.requirements(marketplace, source);
+	if (requirements.length === 0) return [];
+	const configured = await deps.configured(projectPath);
+	return requirements.filter((req) => !configured[req.name] && !env[req.name]);
+}
+
+/**
+ * The detail panel's words for a plugin whose MCP server lacks variables:
+ * what is missing, then the one key that sets them.
+ */
+export function mcpSettingsNeededText(count: number): string {
+	return `its MCP server needs ${count} ${count === 1 ? "setting" : "settings"} — press e to set ${count === 1 ? "it" : "them"}`;
+}

package/src/services/plugin-manager.ts

@@ -33,8 +33,6 @@ import { inheritablePaths } from "./git-worktree.js";
 import {
 	type LocalMarketplace,
 	type ProgressCallback,
-	type RepairMarketplaceResult,
-	repairAllMarketplaces,
 	scanLocalMarketplaces,
 } from "./local-marketplace.js";
 import {
@@ -162,17 +160,6 @@ export interface PluginInfo {
 	 * a reinstall delivers the current content. See content-drift.ts.
 	 */
 	contentStale?: boolean;
-	/**
-	 * Set when this plugin's installed version changed since magus last
-	 * rendered it — including updates made by Claude Code or a direct CLI call
-	 * rather than by magus itself. Drives the "updated" badge.
-	 */
-	recentlyUpdatedFrom?: string;
-	/**
-	 * Set when magus is seeing this plugin installed for the first time.
-	 * Never set on the very first run, when there is no baseline to compare to.
-	 */
-	recentlyInstalled?: boolean;
 	/**
 	 * Which catalog supplied `version` — i.e. the number this plugin's installed
 	 * version was compared against.
@@ -389,6 +376,28 @@ export function resolveScopeAction(
 	return behind ? "update" : "uninstall";
 }
 
+/**
+ * The plugin ids the Plugins list may show as installed-but-unlisted rows.
+ *
+ * Installed means a key in this project's `enabledPlugins`, or registry rows.
+ * A version in `installedPluginVersions` with neither behind it is not an
+ * install: Claude Code never writes that field, so such a claim is a leftover
+ * of magus's own, and building a row from it showed a plugin nothing had
+ * installed — the settings key treated as authority, which it never is.
+ */
+export function orphanCandidateIds(
+	enabledPlugins: Readonly<Record<string, boolean>>,
+	installedVersions: Readonly<Record<string, string>>,
+	registryPlugins: InstalledPluginsRegistry["plugins"] | undefined,
+): Set<string> {
+	return new Set([
+		...Object.keys(enabledPlugins),
+		...Object.keys(installedVersions).filter(
+			(id) => (registryPlugins?.[id]?.length ?? 0) > 0,
+		),
+	]);
+}
+
 export async function getAvailablePlugins(
 	projectPath?: string,
 ): Promise<PluginInfo[]> {
@@ -402,8 +411,9 @@ export async function getAvailablePlugins(
 	// ported in services/plugin-resolution.ts. Resolved once for the whole
 	// registry and carried alongside `installedVersion` on every row below; where
 	// the two disagree, the classifier calls it `stale-load`.
+	const registry = await readInstalledPluginsRegistry();
 	const loadedVersions = resolveLoadedVersions(
-		await readInstalledPluginsRegistry(),
+		registry,
 		projectPath ?? process.cwd(),
 	);
 	const loadedVersionOf = (pluginId: string): string | null =>
@@ -568,13 +578,13 @@ export async function getAvailablePlugins(
 		}
 	}
 
-	// Add orphaned plugins (in this project's settings or registry, but not in any cache)
-	const allPluginIds = new Set([
-		...Object.keys(enabledPlugins),
-		...Object.keys(installedVersions),
-	]);
-
-	for (const pluginId of allPluginIds) {
+	// Add orphaned plugins (in this project's settings or registry, but not in
+	// any cache) — see `orphanCandidateIds` for what counts as installed.
+	for (const pluginId of orphanCandidateIds(
+		enabledPlugins,
+		installedVersions,
+		registry.plugins,
+	)) {
 		if (seenPluginIds.has(pluginId)) continue;
 
 		const parsed = parsePluginId(pluginId);
@@ -1031,18 +1041,14 @@ async function autoSyncIfStale(
 	return localMarketplaces;
 }
 
-export interface RefreshAndRepairResult {
-	refresh: never[];
-	repair: RepairMarketplaceResult[];
-}
-
 /**
- * Refresh magus's internal cache
- * Note: Marketplace updates should be done via Claude Code's /plugin marketplace update command
+ * Refresh magus's internal cache. Only magus's own caches are cleared: the
+ * marketplace clones are Claude Code's, and refreshing them is
+ * `claude plugin marketplace update`.
  */
 export async function refreshAllMarketplaces(
 	onProgress?: ProgressCallback,
-): Promise<RefreshAndRepairResult> {
+): Promise<void> {
 	onProgress?.({ current: 1, total: 1, name: "Clearing cache..." });
 
 	// Clear all caches to force fresh data. The on-disk catalog cache is awaited
@@ -1050,14 +1056,6 @@ export async function refreshAllMarketplaces(
 	// entries this is discarding.
 	clearMarketplaceCache();
 	await clearPersistedCatalogs();
-
-	// Auto-repair plugin.json files with missing agents/commands/skills
-	const repairResults = await repairAllMarketplaces();
-
-	return {
-		refresh: [],
-		repair: repairResults,
-	};
 }
 
 // Re-export types for consumers