magus-cli 7.7.0 → 7.9.0

package/README.md

@@ -155,7 +155,7 @@ check. So does `magus install --check`.
 | MCP | Add MCP servers from a curated catalog |
 | Settings | Claude Code settings, from a catalog of known keys |
 | Profiles | Saved plugin sets (the TUI's own, older profile concept) |
-| CLI Tools | Install claudish, mnemex and friends via the right package manager |
+| CLI Tools | Install and update CLI tools via the right package manager; a tool a plugin installs from a release shows as managed by that plugin |
 | Git State | Gitignore conventions and repo hygiene |
 | Alias | Shell alias + flag management for launching `claude` |
 | Styles | Communication style presets, composed into one native output style |

package/package.json

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

package/src/__tests__/blackbox-parity.test.ts

@@ -17,11 +17,11 @@
  * _synthetic exist only to reach states the real data lacks.
  */
 import { describe, expect, test } from "bun:test";
-import { cliTools } from "../data/cli-tools.js";
 import { selectProfileId } from "../services/active-closure.js";
 import type { PluginInfo } from "../services/plugin-manager.js";
 import { resolveProfile } from "../services/resolver.js";
 import { type ToolFacts, specForCatalogTool } from "../services/tool-probe.js";
+import { managedBins, managedTool } from "../services/toolchain.js";
 import {
 	type BinUpdateItem,
 	type PluginUpdateItem,
@@ -31,7 +31,7 @@ import {
 	planPluginUpdates,
 } from "../services/update-plan.js";
 import type {
-	BinRequirement,
+	ManagedTool,
 	Marketplace,
 	ProfileManifest,
 	ResolvedClosure,
@@ -42,6 +42,7 @@ import {
 	buildPluginBrowserItems,
 } from "../ui/adapters/pluginsAdapter.js";
 import { pluginRowText } from "../ui/renderers/pluginRowText.js";
+import { ownedAsDeclared, selected, testCatalogue } from "./fixtures/bins.js";
 
 // ── fixture ────────────────────────────────────────────────────────────────
 
@@ -199,7 +200,7 @@ function makeManifest(): ProfileManifest {
 	};
 }
 
-const PLUGIN_BINS: Record<string, BinRequirement[]> = {
+const PLUGIN_BINS: Record<string, ManagedTool[]> = {
 	"terminal@magus": [
 		{ name: "tmux", via: "brew", check: "tmux -V" },
 		{
@@ -215,8 +216,8 @@ const PLUGIN_BINS: Record<string, BinRequirement[]> = {
 	],
 };
 
-async function fixtureBins(pluginId: string): Promise<BinRequirement[]> {
-	return (PLUGIN_BINS[pluginId] ?? []).map((b) => ({ ...b }));
+async function fixtureBins(pluginId: string) {
+	return (PLUGIN_BINS[pluginId] ?? []).map((b) => selected(b));
 }
 
 function facts(name: string, over: Partial<ToolFacts>): ToolFacts {
@@ -330,7 +331,9 @@ async function runBothPaths(): Promise<Paths> {
 	if (profileId === null) throw new Error("fixture: no profile selected");
 	const closure = await resolveProfile(manifest, profileId, {
 		binResolver: fixtureBins,
+		ownedResolver: ownedAsDeclared,
 	});
+	const tools = managedBins(closure.bins);
 
 	// CLI path
 	const cliPluginList = planPluginUpdates(
@@ -359,18 +362,18 @@ async function runBothPaths(): Promise<Paths> {
 	// tools
 	const factList = makeFacts();
 	const cliBins = new Map(
-		planBinUpdates(closure.bins, factList).map((b) => [b.name, b]),
+		planBinUpdates(tools, factList).map((b) => [b.name, b]),
 	);
 	const factsByName = new Map(factList.map((f) => [f.name, f]));
-	const declared = new Set(closure.bins.map((b) => b.name));
+	const declared = new Set(tools.map((b) => b.name));
 	const tuiTools = new Map<string, ReturnType<typeof buildToolRow>>();
-	for (const tool of cliTools) {
+	for (const tool of testCatalogue()) {
 		if (!declared.has(tool.name)) continue;
 		tuiTools.set(
 			tool.name,
 			buildToolRow(
 				tool,
-				specForCatalogTool(tool, closure.bins, undefined),
+				specForCatalogTool(tool, tools, undefined),
 				factsByName.get(tool.name),
 			),
 		);
@@ -430,7 +433,15 @@ describe("R7 parity: one fixture through the CLI path and the TUI path", () => {
 			if (!row) throw new Error(`no TUI row for ${id}`);
 			const { text } = pluginRowText(row);
 			expect({ id, empty: text.trim() === "" }).toEqual({ id, empty: false });
-			if (cli.note) {
+			// A deprecated row says its verdict and the key that acts on it, in the
+			// same words on every row, rather than the note — which the CLI does not
+			// print for it either (its DEPRECATED heading carries the fact).
+			if (cli.action === "remove") {
+				expect({ id, text }).toEqual({
+					id,
+					text: expect.stringContaining("deprecated — press a to remove"),
+				});
+			} else if (cli.note) {
 				expect({ id, containsNote: text.includes(cli.note) }).toEqual({
 					id,
 					containsNote: true,
@@ -490,13 +501,13 @@ describe("R7 parity: one fixture through the CLI path and the TUI path", () => {
 				reason: "catalog-unverified",
 				target: null,
 			},
-			// Was `moved`, which guessed a destination from a bare name match and
-			// could not tell a move from a dual publication. An orphan is simply
-			// not offered.
-			"seo@magus": { action: "unknown", reason: "not-offered", target: null },
+			// Its marketplace no longer lists it, but magus-marketing lists the
+			// same name: it MOVED. Not removed — the plugin still exists — and
+			// nothing is installed in its place: `unknown`, never applied.
+			"seo@magus": { action: "unknown", reason: "moved", target: null },
 			"legacy-tool@magus": {
-				action: "unknown",
-				reason: "not-offered",
+				action: "remove",
+				reason: "deprecated",
 				target: null,
 			},
 			"pinned-behind@magus": {
@@ -535,7 +546,7 @@ describe("R7 parity: one fixture through the CLI path and the TUI path", () => {
 		expect(undeliverable?.note).toBeTruthy();
 
 		// declared but absent from the catalog: a CLI item, never a TUI row
-		expect(p.cliPlugins.get("gone@magus")?.action).toBe("unknown");
+		expect(p.cliPlugins.get("gone@magus")?.action).toBe("remove");
 		expect(p.tuiRows.has("gone@magus")).toBe(false);
 	});
 
@@ -584,9 +595,11 @@ describe("R7 parity: one fixture through the CLI path and the TUI path", () => {
 		//   − pinned-unorderable  (sha install against a semver pin)
 		// What is left is unknown because something is genuinely wrong or unread:
 		//   claudish        catalog-unverified — the check itself failed
-		//   seo@magus       not-offered — an orphan
-		//   legacy-tool     not-offered — an orphan
-		expect(cliCounts.unknown).toBe(3);
+		//   seo@magus       moved — magus-marketing lists the same name
+		// The orphan nothing else lists is deprecated:
+		//   legacy-tool     remove — no longer published
+		expect(cliCounts.unknown).toBe(2);
+		expect(cliCounts.remove).toBe(1);
 		expect(cliCounts.update).toBeGreaterThanOrEqual(2); // designer, pinned-behind
 	});
 
@@ -614,7 +627,8 @@ describe("R7 parity: one fixture through the CLI path and the TUI path", () => {
 				target: cli?.target,
 			});
 			// the TUI judges a declared tool against the closure's own spec
-			const declared = p.closure.bins.find((b) => b.name === name);
+			const bin = p.closure.bins.find((b) => b.name === name);
+			const declared = bin ? managedTool(bin) : null;
 			expect({ name, via: tui?.spec.via, version: tui?.spec.version }).toEqual({
 				name,
 				via: declared?.via,
@@ -687,7 +701,8 @@ describe("fixture discriminates the pre-change logic", () => {
 		const p = await runBothPaths();
 
 		for (const name of ["tmux", "browser-use", "mcp"]) {
-			const spec = p.closure.bins.find((b) => b.name === name);
+			const bin = p.closure.bins.find((b) => b.name === name);
+			const spec = bin ? managedTool(bin) : null;
 			expect(legacyPlanBin(true, Boolean(spec?.version))).toBe("upgrade");
 			expect(p.cliBins.get(name)?.action).toBe("current");
 		}
@@ -716,12 +731,16 @@ describe("fixture discriminates the pre-change logic", () => {
 
 		// Where they still disagree outright: an orphan carries neither
 		// `hasUpdate` nor `updateCheckFailed`, so the flags call it healthy while
-		// the classifier says no marketplace offers it at all.
-		for (const id of ["seo@magus", "legacy-tool@magus"]) {
+		// the classifier says it moved, or is no longer published and removes it.
+		const orphans: Array<[string, string, string]> = [
+			["seo@magus", "unknown", "moved"],
+			["legacy-tool@magus", "remove", "deprecated"],
+		];
+		for (const [id, action, reason] of orphans) {
 			const info = p.catalog.find((c) => c.id === id) as PluginInfo;
 			expect(legacyFlagState(info)).toBe("healthy");
-			expect(p.tuiRows.get(id)?.status?.action).toBe("unknown");
-			expect(p.tuiRows.get(id)?.status?.reason).toBe("not-offered");
+			expect(p.tuiRows.get(id)?.status?.action).toBe(action);
+			expect(p.tuiRows.get(id)?.status?.reason).toBe(reason);
 		}
 	});
 });

package/src/__tests__/blackbox-plugin-state.test.ts

@@ -90,7 +90,7 @@ describe("indexCatalog", () => {
 });
 
 describe("classifyPlugin — one state plus a human reason", () => {
-	test("declared, absent from the catalog, marketplace read: unknown / not-offered, no target", () => {
+	test("declared, absent from the catalog, marketplace read: remove / deprecated, no target", () => {
 		const idx = indexCatalog([info("dev@magus", "1.0.0", "1.0.0")]);
 
 		const got = classifyPlugin("gone@magus", "latest", idx);
@@ -100,8 +100,8 @@ describe("classifyPlugin — one state plus a human reason", () => {
 			reason: got.reason,
 			target: got.target,
 		}).toEqual({
-			action: "unknown",
-			reason: "not-offered",
+			action: "remove",
+			reason: "deprecated",
 			target: null,
 		});
 		expect(got.note).toBeTruthy();
@@ -219,7 +219,11 @@ describe("classifyPlugin — one state plus a human reason", () => {
 		// version is `current` now, not unknown. It is the negative control
 		// below — without it this loop would pass even if every state collapsed
 		// into one.
-		for (const id of ["b@magus", "c@magus", "d@magus", "e@nowhere"]) {
+		//
+		// Neither are `b@magus` (an orphan of a marketplace we read) and `d@magus`
+		// (declared, listed nowhere, same marketplace): both are DEPRECATED now, a
+		// `remove` — not a guess. They are the second control, after the loop.
+		for (const id of ["c@magus", "e@nowhere"]) {
 			const got = classifyPlugin(id, "latest", idx);
 			expect({ id, action: got.action }).toEqual({ id, action: "unknown" });
 			expect({ id, target: got.target, hasNote: Boolean(got.note) }).toEqual({
@@ -234,6 +238,12 @@ describe("classifyPlugin — one state plus a human reason", () => {
 		const a = classifyPlugin("a@magus", "latest", idx);
 		expect(a.action).toBe("current");
 		expect(a.note).toBeUndefined();
+		for (const id of ["b@magus", "d@magus"]) {
+			expect({ id, action: classifyPlugin(id, "latest", idx).action }).toEqual({
+				id,
+				action: "remove",
+			});
+		}
 	});
 });
 
@@ -318,6 +328,7 @@ describe("countPluginStates", () => {
 			repair: 1,
 			current: 1,
 			"stale-load": 0,
+			remove: 0,
 			unknown: 1,
 		});
 	});
@@ -329,6 +340,7 @@ describe("countPluginStates", () => {
 			repair: 0,
 			current: 0,
 			"stale-load": 0,
+			remove: 0,
 			unknown: 0,
 		});
 	});
@@ -499,8 +511,12 @@ describe("pluginRowText", () => {
 	// The fixture is an ORPHAN at 0.0.0, not a plain 0.0.0 install. A plain one
 	// is `current` with no note now, which would leave nothing for this test to
 	// find and let the gate come back unnoticed.
+	//
+	// Its marketplace is one we did NOT read, so it stays `unknown` with a note.
+	// An orphan of a marketplace we read is deprecated now, whose row says
+	// "deprecated — press a to remove" instead of its note.
 	test("a note renders on a 0.0.0 install — no version gate", () => {
-		const plugin = info("zero-version@magus", null, "0.0.0", {
+		const plugin = info("zero-version@unread-mp", null, "0.0.0", {
 			isOrphaned: true,
 		});
 		const sibling = info("dev@magus", "1.0.0", "1.0.0");
@@ -529,8 +545,11 @@ describe("pluginRowText", () => {
 		expect(out.text).toContain(pluginStatusText(status).suffix);
 	});
 
+	// An orphan whose marketplace was not read; see the note on the 0.0.0 test.
 	test("an orphan row renders its note", () => {
-		const plugin = info("legacy@magus", null, "0.5.0", { isOrphaned: true });
+		const plugin = info("legacy@unread-mp", null, "0.5.0", {
+			isOrphaned: true,
+		});
 		const sibling = info("dev@magus", "1.0.0", "1.0.0");
 		const status = classifyPlugin(
 			plugin.id,