claudeup 4.34.0 → 4.35.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claudeup",
-  "version": "4.34.0",
+  "version": "4.35.0",
   "description": "TUI tool for managing Claude Code plugins, MCPs, and configuration",
   "type": "module",
   "main": "src/main.tsx",
@@ -64,8 +64,8 @@
     "typescript": "^5.6.3"
   },
   "optionalDependencies": {
-    "claudeup-darwin-arm64": "4.34.0",
-    "claudeup-darwin-x64": "4.34.0",
-    "claudeup-linux-x64": "4.34.0"
+    "claudeup-darwin-arm64": "4.35.0",
+    "claudeup-darwin-x64": "4.35.0",
+    "claudeup-linux-x64": "4.35.0"
   }
 }

package/src/__tests__/resolver.test.ts

@@ -216,3 +216,74 @@ describe("resolveAllProfiles — union", () => {
 		expect(union.conflicts?.some((c) => c.includes("claudish"))).toBe(true);
 	});
 });
+
+describe("marketplaces derived from plugin ids", () => {
+	const noBins = { binResolver: fakeBinResolver({}) };
+
+	test("a plugin id registers the marketplace it names", async () => {
+		const manifest = manifestOf({
+			solo: { name: "Solo", plugins: { "dev@magus": "latest" } },
+		});
+		const c = await resolveProfile(manifest, "solo", noBins);
+		expect(c.marketplaces.magus).toEqual({
+			source: "github",
+			repo: "MadAppGang/magus",
+		});
+	});
+
+	test("extends alone is enough — the failure this fixes", async () => {
+		// A profile that only extends a predefined one inherits plugins like
+		// dev@magus and previously NO marketplaces, so install resolved every
+		// plugin against a marketplace that was never registered.
+		const manifest = manifestOf({
+			team: { name: "Team", extends: "developer-essentials" },
+		});
+		const c = await resolveProfile(manifest, "team", noBins);
+		expect(Object.keys(c.plugins).length).toBeGreaterThan(0);
+		expect(c.marketplaces.magus?.repo).toBe("MadAppGang/magus");
+	});
+
+	test("each distinct channel is derived, not just the first", async () => {
+		const manifest = manifestOf({
+			mixed: {
+				name: "Mixed",
+				plugins: {
+					"dev@magus": "latest",
+					"seo@magus-marketing": "latest",
+					"autolinear@magus-alpha": "latest",
+				},
+			},
+		});
+		const c = await resolveProfile(manifest, "mixed", noBins);
+		expect(c.marketplaces["magus-marketing"]?.repo).toBe("MadAppGang/magus-marketing");
+		expect(c.marketplaces["magus-alpha"]?.repo).toBe("MadAppGang/magus-alpha");
+	});
+
+	test("an explicit declaration is never overridden", async () => {
+		const manifest = manifestOf({
+			pinned: {
+				name: "Pinned",
+				marketplaces: { magus: { source: "github", repo: "MadAppGang/magus-fork" } },
+				plugins: { "dev@magus": "latest" },
+			},
+		});
+		const c = await resolveProfile(manifest, "pinned", noBins);
+		expect(c.marketplaces.magus?.repo).toBe("MadAppGang/magus-fork");
+	});
+
+	test("an unknown marketplace is left for the manifest to declare", async () => {
+		const manifest = manifestOf({
+			third: { name: "Third", plugins: { "thing@someones-marketplace": "latest" } },
+		});
+		const c = await resolveProfile(manifest, "third", noBins);
+		expect(c.marketplaces["someones-marketplace"]).toBeUndefined();
+	});
+
+	test("a bare plugin id contributes no marketplace", async () => {
+		const manifest = manifestOf({
+			bare: { name: "Bare", plugins: { local: "latest" } },
+		});
+		const c = await resolveProfile(manifest, "bare", noBins);
+		expect(Object.keys(c.marketplaces)).toHaveLength(0);
+	});
+});

package/src/data/marketplaces.ts

@@ -53,6 +53,19 @@ export const defaultMarketplaces: Marketplace[] = [
 		owned: true, // Ours: always listed even when uninstalled, sorted to the top
 		// Not featured: a niche channel, so keep it collapsed by default.
 	},
+	{
+		name: "magus-alpha",
+		displayName: "Magus Alpha",
+		source: {
+			source: "github",
+			repo: "MadAppGang/magus-alpha",
+		},
+		description:
+			"Experimental plugins with evolving interfaces — may change or be withdrawn without notice",
+		official: false,
+		owned: true, // Ours: always listed even when uninstalled, sorted to the top
+		// Not featured: experimental, so keep it collapsed by default.
+	},
 	{
 		name: "claude-plugins-official",
 		displayName: "Anthropic Official",

package/src/services/resolver.ts

@@ -17,6 +17,7 @@ import type {
 	ResolvedClosure,
 } from "../types/index.js";
 import { cliTools } from "../data/cli-tools.js";
+import { getMarketplaceByName } from "../data/marketplaces.js";
 import { PREDEFINED_PROFILES } from "../data/predefined-profiles.js";
 import { resolvePluginBinRequirements } from "./plugin-requires.js";
 
@@ -147,6 +148,36 @@ async function resolveBins(
 }
 
 /** Resolve a single profile (applying `extends`) into an install closure. */
+/**
+ * Add the marketplace every plugin id already names.
+ *
+ * A plugin id carries its marketplace — `dev@magus`, `seo@magus-marketing` —
+ * so requiring the manifest to ALSO declare that marketplace is redundant, and
+ * forgetting to is silent: the plugin resolves against a marketplace that was
+ * never registered. `extends` made this the default failure, because it
+ * inherits plugins from a predefined profile and no marketplaces at all.
+ *
+ * Only marketplaces claudeup already knows are derived, since a repo is needed
+ * to register one. An unknown suffix is left alone for the manifest to declare.
+ * An explicit entry always wins: deriving must never override a pin.
+ */
+function withDerivedMarketplaces(
+	declared: ProfileManifestEntry["marketplaces"],
+	plugins: Record<string, string>,
+): NonNullable<ProfileManifestEntry["marketplaces"]> {
+	const out = { ...(declared ?? {}) };
+	for (const id of Object.keys(plugins)) {
+		const at = id.lastIndexOf("@");
+		if (at <= 0) continue;
+		const name = id.slice(at + 1);
+		if (out[name]) continue;
+		const known = getMarketplaceByName(name);
+		if (!known?.source.repo) continue;
+		out[name] = { source: "github", repo: known.source.repo };
+	}
+	return out;
+}
+
 export async function resolveProfile(
 	manifest: ProfileManifest,
 	profileId: string,
@@ -161,7 +192,7 @@ export async function resolveProfile(
 	const bins = await resolveBins(entry, Object.keys(plugins), binResolver);
 
 	return {
-		marketplaces: { ...(entry.marketplaces ?? {}) },
+		marketplaces: withDerivedMarketplaces(entry.marketplaces, plugins),
 		plugins,
 		mcpServers: { ...(entry.mcpServers ?? {}) },
 		bins,

package/src/ui/screens/PluginsScreen.tsx

@@ -6,7 +6,7 @@ import { ScreenLayout } from "../components/layout/index.js";
 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 { defaultMarketplaces, getAllMarketplaces } from "../../data/marketplaces.js";
 import { clearContentDriftCache } from "../../services/content-drift.js";
 import {
 	diffVersions,
@@ -33,6 +33,7 @@ import {
 } from "../../services/claude-settings.js";
 import { saveProfile } from "../../services/profiles.js";
 import {
+	addMarketplace as cliAddMarketplace,
 	installPlugin as cliInstallPlugin,
 	repairPlugin as cliRepairPlugin,
 	uninstallPlugin as cliUninstallPlugin,
@@ -387,16 +388,60 @@ export function PluginsScreen() {
 		}
 	};
 
+	/**
+	 * Add a marketplace.
+	 *
+	 * The known ones are offered as a menu and added here — that covers every
+	 * marketplace claudeup ships with, including magus, so a first run does not
+	 * have to leave the tool. An arbitrary owner/repo still needs the terminal:
+	 * there is no text-input modal, only confirm/message/select.
+	 */
 	const handleShowAddMarketplaceInstructions = async () => {
+		const installed = new Set(
+			pluginsState.marketplaces.status === "success"
+				? pluginsState.marketplaces.data.map((m) => m.name)
+				: [],
+		);
+		const addable = defaultMarketplaces.filter(
+			(m) => !installed.has(m.name) && !m.deprecated && m.source.repo,
+		);
+
+		if (addable.length > 0) {
+			const choice = await modal.select(
+				"Add Marketplace",
+				"Pick one to add now, or choose Other for a repo not listed.",
+				[
+					...addable.map((m) => ({
+						label: m.displayName || m.name,
+						value: m.source.repo as string,
+						description: m.description,
+					})),
+					{ label: "Other…", value: "", description: "Any owner/repo" },
+				],
+			);
+			if (choice === null) return;
+			if (choice) {
+				try {
+					await cliAddMarketplace(choice);
+					await handleRefresh();
+				} catch (e) {
+					await modal.message(
+						"Could not add marketplace",
+						`${(e as Error).message}\n\nRun it yourself if this persists:\n\n` +
+							`  claude plugin marketplace add ${choice}`,
+						"error",
+					);
+				}
+				return;
+			}
+		}
+
 		await modal.message(
 			"Add Marketplace",
-			"To add a marketplace, run this command in your terminal:\n\n" +
+			"For a marketplace that is not listed, run this in your terminal:\n\n" +
 				"  claude plugin marketplace add owner/repo\n\n" +
-				"Examples:\n" +
-				"  claude plugin marketplace add MadAppGang/magus\n" +
-				"  claude plugin marketplace add anthropics/claude-plugins-official\n\n" +
 				"Auto-update is enabled by default for new marketplaces.\n\n" +
-				"After adding, refresh claudeup with 'r' to see the new marketplace.",
+				"After adding, refresh claudeup with 'r' to see it.",
 			"info",
 		);
 	};
@@ -593,14 +638,30 @@ export function PluginsScreen() {
 					);
 				}
 			} else {
-				await modal.message(
+				// Add it here rather than printing the command for the user to run.
+				// Telling someone to leave the tool, paste a command, come back and
+				// press 'r' is a step claudeup can just take: it already knows the
+				// repo, and addMarketplace() is the same call they would make.
+				const repo = mp.source.repo || mp.name;
+				const wantAdd = await modal.confirm(
 					`Add ${mp.displayName}?`,
-					`To add this marketplace, run in your terminal:\n\n` +
-						`  claude plugin marketplace add ${mp.source.repo || mp.name}\n\n` +
-						`Auto-update is enabled by default.\n\n` +
-						`After adding, refresh claudeup with 'r' to see it.`,
-					"info",
+					`Clone ${repo} and register it as a marketplace?\n\n` +
+						`Auto-update is enabled by default.`,
 				);
+				if (wantAdd) {
+					try {
+						await cliAddMarketplace(repo);
+						await handleRefresh();
+					} catch (e) {
+						await modal.message(
+							"Could not add marketplace",
+							`${(e as Error).message}\n\n` +
+								`Run it yourself if this persists:\n\n` +
+								`  claude plugin marketplace add ${repo}`,
+							"error",
+						);
+					}
+				}
 			}
 		} else if (item.kind === "plugin") {
 			const plugin = item.plugin;