magus-cli 7.7.0 → 7.8.0

package/src/__tests__/stale-load-repair.test.ts

@@ -303,7 +303,9 @@ describe("repairStaleLoad — the backup", () => {
 			const result = await repairStaleLoad(PLUGIN, "0.5.0", here, root);
 
 			expect(result.ok).toBe(false);
-			expect(result.error).toContain("could not back up");
+			expect(result.error).toBe(
+				"could not save a backup before changing anything, so nothing was changed",
+			);
 			expect(result.rewritten).toBe(0);
 			expect(result.backup).toBeNull();
 			expect(await fs.readFile(registryFile, "utf8")).toBe(before);
@@ -328,7 +330,7 @@ describe("repairStaleLoad — refusals", () => {
 		const result = await repairStaleLoad(PLUGIN, "0.7.0", here, root);
 
 		expect(result.ok).toBe(false);
-		expect(result.error).toContain("no cache directory for v0.7.0");
+		expect(result.error).toBe("v0.7.0 is not downloaded — run magus install");
 		expect(result.backup).toBeNull();
 		expect(await fs.readFile(registryFile, "utf8")).toBe(before);
 		expect(await backups()).toEqual([]);
@@ -340,7 +342,7 @@ describe("repairStaleLoad — refusals", () => {
 		const result = await repairStaleLoad(PLUGIN, "0.5.0", here, root);
 
 		expect(result.ok).toBe(false);
-		expect(result.error).toContain("has no rows");
+		expect(result.error).toBe("it is not installed on this machine");
 	});
 
 	test("a string that is not a plugin id is refused", async () => {
@@ -360,7 +362,9 @@ describe("repairStaleLoad — refusals", () => {
 		const result = await repairStaleLoad(PLUGIN, "0.5.0", here, root);
 
 		expect(result.ok).toBe(false);
-		expect(result.error).toContain("not a readable registry");
+		expect(result.error).toBe(
+			"Claude Code's list of installed plugins cannot be read, so nothing was changed — run magus doctor",
+		);
 		expect(await fs.readFile(registryFile, "utf8")).toBe("{ not json");
 	});
 });
@@ -400,8 +404,9 @@ describe("repairStaleLoad — scope reach", () => {
 		const result = await repairStaleLoad(PLUGIN, "0.5.0", here, root);
 
 		expect(result.ok).toBe(false);
-		expect(result.error).toContain("machine-wide user-scope record at v0.3.0");
-		expect(result.error).toContain("--scope user");
+		expect(result.error).toBe(
+			"Claude Code loads the USER install of it here — update it at USER scope",
+		);
 		expect(result.rewritten).toBe(0);
 		expect(await fs.readFile(registryFile, "utf8")).toBe(before);
 		expect(await backups()).toEqual([]);
@@ -457,8 +462,9 @@ describe("repairStaleLoad — scope reach", () => {
 		const result = await repairStaleLoad(PLUGIN, "0.5.0", here, root);
 
 		expect(result.ok).toBe(false);
-		expect(result.error).toContain("machine-wide managed-scope record");
-		expect(result.error).toContain("administrator policy");
+		expect(result.error).toBe(
+			"Claude Code loads the install your administrator manages here — ask them to update it",
+		);
 	});
 
 	test("a user-scope row that is not the winner stays where it is", async () => {
@@ -485,13 +491,11 @@ describe("repairStaleLoad — scope reach", () => {
 		expect(after[1].installPath).toBe(cacheFor("0.4.0"));
 	});
 
-	test("a rootless row from another directory is relevant but never rewritten", async () => {
-		// The loader's filter compares repository roots and two nulls are equal
-		// there, so this row genuinely competes — `isRelevantInstallation` says so
-		// and plugin-resolution.test.ts pins it. Writing it is a different question:
-		// "the same repository" cannot be true of two directories that are in no
-		// repository, so the repair reports that it could not fix this rather than
-		// editing a stranger's row.
+	test("a rootless row from another directory neither competes nor is rewritten", async () => {
+		// Claude Code 2.1.284 matches nothing by root in a folder that is in no
+		// repository, so the other folder's older row does not load here and this
+		// folder's own row does. Nothing to repair, and the stranger's row is left
+		// exactly as it was.
 		const looseHere = path.join(base, "loose-here");
 		const looseOther = path.join(base, "loose-other");
 		await fs.ensureDir(looseHere);
@@ -507,13 +511,13 @@ describe("repairStaleLoad — scope reach", () => {
 				looseHere,
 				repoRootForPath(looseHere),
 			),
-		).toBe(true);
+		).toBe(false);
 
 		const result = await repairStaleLoad(PLUGIN, "0.5.0", looseHere, root);
 
 		expect(result.rewritten).toBe(0);
-		expect(result.ok).toBe(false);
-		expect(result.error).toContain("still resolves v0.3.0");
+		expect(result.ok).toBe(true);
+		expect(result.loaded).toBe("0.5.0");
 		expect((await readRegistry()).plugins[PLUGIN][0].version).toBe("0.3.0");
 	});
 });
@@ -557,7 +561,9 @@ describe("repairStaleLoad — a concurrent write is refused, not clobbered", ()
 			const result = await repairStaleLoad(PLUGIN, "0.5.0", here, root);
 
 			expect(result.ok).toBe(false);
-			expect(result.error).toContain("changed on disk after it was read");
+			expect(result.error).toBe(
+				"another Claude Code session changed its plugins at the same moment, so nothing was changed — run it again",
+			);
 			expect(result.rewritten).toBe(0);
 		} finally {
 			spy.mockRestore();
@@ -694,7 +700,9 @@ describe("repairStaleLoad — the post-write assertion", () => {
 		expect(result.rewritten).toBe(1);
 		expect(result.loaded).toBe("0.9.0");
 		expect(result.ok).toBe(false);
-		expect(result.error).toContain("still resolves v0.9.0");
+		expect(result.error).toContain(
+			"Claude Code still loads v0.9.0 in this folder",
+		);
 	});
 
 	test("the assertion reads the file from DISK, not the object it mutated", async () => {
@@ -1147,7 +1155,7 @@ describe("B4: an update brings the loader forward in the same run", () => {
 		expect(result.ok).toBe(1);
 		expect(result.failed).toEqual([]);
 		expect(details).toEqual([
-			"project → 0.5.0 · Claude Code now loads v0.5.0 here (1 older record moved forward)",
+			"project → 0.5.0 · Claude Code now loads v0.5.0 in this folder",
 		]);
 		expect(await loadedVersionHere(PLUGIN, here, root)).toBe("0.5.0");
 		// Moved forward, nothing removed.
@@ -1265,7 +1273,7 @@ describe("7.5.2: Claude Code 2.1.281 updates another project's row of the reposi
 			[here, "0.5.0"],
 		]);
 		expect(details).toEqual([
-			`project → 0.5.0 · Claude Code updated ${mainTree} instead of this project — moved this project's record to v0.5.0 too`,
+			"project → 0.5.0 · Claude Code updated another folder of this repository instead of this one — this folder now loads v0.5.0 too",
 		]);
 		expect(await loadedVersionHere(PLUGIN, here, root)).toBe("0.5.0");
 	});
@@ -1335,7 +1343,7 @@ describe("7.5.2: Claude Code 2.1.281 updates another project's row of the reposi
 				?.version,
 		).toBe("0.4.0");
 		expect(details[0]).toContain(
-			`no change — the installer exited 0 but ${PLUGIN} is still 0.4.0 (Claude Code updated ${mainTree} instead of this project, and this project's record could not follow: no cache directory for v0.6.0`,
+			`no change — the installer exited 0 but ${PLUGIN} is still 0.4.0 (Claude Code updated another folder of this repository instead of this one, and this folder could not follow: v0.6.0 is not downloaded — run magus install)`,
 		);
 	});
 });

package/src/__tests__/update-apply.test.ts

@@ -26,7 +26,6 @@ import type {
 	UpdatePlan,
 } from "../services/update-plan.js";
 import type { InstalledPluginEntry, ResolvedBin } from "../types/index.js";
-import { noMoveReasons } from "../ui/adapters/pluginsAdapter.js";
 
 const PROJECT = "/tmp/project";
 
@@ -776,25 +775,6 @@ describe("applyPlugins — read-back against beforeVersions", () => {
 		expect(result.ok).toBe(1);
 		expect(result.unchanged).toEqual([]);
 	});
-
-	test("the TUI's collector names the same cause the CLI prints", async () => {
-		// The screen used to branch on `failed.length` alone: a no-op update
-		// closed with a success and a row that had not moved.
-		const { deps } = stubDeps("1.0.0");
-		const reasons = noMoveReasons();
-		const result = await applyPlugins(
-			[item({ beforeVersions: { project: "1.0.0" } })],
-			PROJECT,
-			deps,
-			reasons.reporter,
-		);
-		expect(result.unchanged).toEqual(["dev@magus"]);
-		expect(reasons.lines(result.unchanged)).toEqual([
-			"dev@magus: the installer exited 0 but dev@magus is still 1.0.0",
-		]);
-		// An item with no recorded cause still gets a line.
-		expect(reasons.lines(["other@magus"])).toEqual(["other@magus"]);
-	});
 });
 
 // ── B4: installed must mean LOADED ──────────────────────────────────────────
@@ -847,8 +827,7 @@ describe("B4: an install or update ends with the loader on the new version", ()
 			{
 				ok: true,
 				name: "dev@magus",
-				detail:
-					"project → 2.0.0 · Claude Code now loads v2.0.0 here (3 older records moved forward)",
+				detail: "project → 2.0.0 · Claude Code now loads v2.0.0 in this folder",
 			},
 		]);
 	});
@@ -876,8 +855,10 @@ describe("B4: an install or update ends with the loader on the new version", ()
 			{
 				ok: false,
 				name: "dev@magus",
+				// The version still loading IS the reason; the repair's own message
+				// said it a second time, in the mechanism's words.
 				detail:
-					"installed v2.0.0, but Claude Code still loads v1.0.0 here — the loader still resolves v1.0.0 here, not v2.0.0",
+					"installed v2.0.0, but Claude Code still loads v1.0.0 in this folder",
 			},
 		]);
 	});
@@ -917,7 +898,7 @@ describe("B4: an install or update ends with the loader on the new version", ()
 		await expect(
 			updatePluginInScope("dev@magus", "project", PROJECT, deps),
 		).rejects.toThrow(
-			"installed v2.0.0, but Claude Code still loads v1.0.0 here",
+			"installed v2.0.0, but Claude Code still loads v1.0.0 in this folder",
 		);
 	});
 
@@ -938,7 +919,9 @@ describe("B4: an install or update ends with the loader on the new version", ()
 		const { deps } = loaderDeps("1.0.0", false);
 		await expect(
 			updatePluginInScope("dev@magus", "user", PROJECT, deps),
-		).rejects.toThrow("the loader still resolves v1.0.0 here, not v2.0.0");
+		).rejects.toThrow(
+			"installed v2.0.0, but Claude Code still loads v1.0.0 in this folder",
+		);
 	});
 });
 
@@ -1067,7 +1050,8 @@ describe("7.5.2: an update Claude Code applied to another project's row", () =>
 			{
 				ok: true,
 				name: "dev@magus",
-				detail: `project → 8.1.3 · Claude Code updated ${OTHER} instead of this project — moved this project's record to v8.1.3 too`,
+				detail:
+					"project → 8.1.3 · Claude Code updated another folder of this repository instead of this one — this folder now loads v8.1.3 too",
 			},
 		]);
 	});
@@ -1084,7 +1068,7 @@ describe("7.5.2: an update Claude Code applied to another project's row", () =>
 		// forward by the loader check (B4), and no misdirection is reported.
 		expect(repaired).toEqual(["8.1.3"]);
 		expect(rows[0]?.detail).toBe(
-			"project → 8.1.3 · Claude Code now loads v8.1.3 here (1 older record moved forward)",
+			"project → 8.1.3 · Claude Code now loads v8.1.3 in this folder",
 		);
 	});
 
@@ -1097,7 +1081,7 @@ describe("7.5.2: an update Claude Code applied to another project's row", () =>
 		expect(row(HERE).version).toBe("8.0.0");
 		expect(result.unchanged).toEqual(["dev@magus"]);
 		expect(rows[0]?.detail).toBe(
-			`no change — the installer exited 0 but dev@magus is still 8.0.0 (Claude Code updated ${OTHER} instead of this project, and this project's record could not follow: no cache directory for v8.1.3)`,
+			"no change — the installer exited 0 but dev@magus is still 8.0.0 (Claude Code updated another folder of this repository instead of this one, and this folder could not follow: no cache directory for v8.1.3)",
 		);
 	});
 
@@ -1125,7 +1109,7 @@ describe("7.5.2: an update Claude Code applied to another project's row", () =>
 		expect(repaired).toEqual([]);
 		expect(result.unchanged).toEqual(["dev@magus"]);
 		expect(rows[0]?.detail).toBe(
-			`no change — the installer exited 0 but dev@magus is still 8.0.0 (Claude Code updated ${OTHER} instead of this project, and this project's record could not follow: it went to v8.5.0, not the v8.1.3 this update asked for)`,
+			"no change — the installer exited 0 but dev@magus is still 8.0.0 (Claude Code updated another folder of this repository instead of this one, and this folder could not follow: it went to v8.5.0, not the v8.1.3 this update asked for)",
 		);
 	});
 

package/src/__tests__/update-plan.test.ts

@@ -430,19 +430,23 @@ describe("per-scope decisions — a stale scope is never masked", () => {
 		// No note: there is nothing for the reader to do about it.
 		expect(item.note).toBeUndefined();
 		// And it is not confused with the withdrawn case, which is the next test.
-		expect(item.reason).not.toBe("not-offered");
+		expect(item.reason).not.toBe("deprecated");
 	});
 
-	test("an installed plugin ABSENT from every catalog is 'not offered'", () => {
+	test("a declared plugin ABSENT from every catalog is deprecated", () => {
 		// The genuinely withdrawn case: no catalog entry at all, the installed
 		// version known only from the registry.
 		const [item] = planPluginUpdates(
 			{ "withdrawn@magus": "latest" },
 			catalog(info({ id: "dev@magus", version: "4.6.1" })),
 		);
-		expect(item.action).toBe("unknown");
-		expect(item.note).toContain("not offered by any configured marketplace");
-		expect(item.reason).toBe("not-offered");
+		// Its marketplace was read and does not list it: no longer published, so
+		// the work is removing it — here from the profile alone, since nothing is
+		// installed to uninstall.
+		expect(item.action).toBe("remove");
+		expect(item.note).toBe("no longer published");
+		expect(item.reason).toBe("deprecated");
+		expect(item.scopes).toEqual([]);
 	});
 });
 
@@ -993,19 +997,20 @@ describe("classifyPlugin — an orphan is never 'current'", () => {
 				info({ id: "dev@magus", version: "4.7.0" }),
 			),
 		);
-		expect(item.action).toBe("unknown");
+		expect(item.action).toBe("remove");
 		expect(item.action).not.toBe("current");
 		expect(item.available).toBeNull();
 		expect(item.target).toBeNull();
-		expect(item.scopes).toEqual([]);
+		// A removal's scopes are where it is uninstalled: every scope installed here.
+		expect(item.scopes).toEqual(["project"]);
 	});
 
 	// `moved` is GONE, and `movedTo` with it. It was inferred from a bare name
 	// match: a plugin published to two marketplaces — claudish is — reported
 	// "moved → magus" when nothing had moved and both copies were installed.
 	// The inference cannot tell a move from a dual publication, so it is not made
-	// at all. An orphan is `not-offered`, which is a fact rather than a guess.
-	test("an orphan is 'not offered', and never guesses where it went", () => {
+	// at all. An orphan is `deprecated`, which is a fact rather than a guess.
+	test("an orphan is deprecated, and never guesses where it went", () => {
 		const [item] = planPluginUpdates(
 			{ "seo@magus": "latest" },
 			catalog(
@@ -1014,13 +1019,13 @@ describe("classifyPlugin — an orphan is never 'current'", () => {
 			),
 		);
 		expect(item).toMatchObject({
-			action: "unknown",
-			reason: "not-offered",
+			action: "remove",
+			reason: "deprecated",
 		});
 		expect(item.note).not.toMatch(/moved/i);
 	});
 
-	test("an orphan whose marketplace we DID read is 'not offered'", () => {
+	test("an orphan whose marketplace we DID read is deprecated", () => {
 		const [item] = planPluginUpdates(
 			{ "seo@magus": "latest" },
 			catalog(
@@ -1029,9 +1034,9 @@ describe("classifyPlugin — an orphan is never 'current'", () => {
 			),
 		);
 		expect(item).toMatchObject({
-			action: "unknown",
-			reason: "not-offered",
-			note: "not offered by any configured marketplace",
+			action: "remove",
+			reason: "deprecated",
+			note: "no longer published",
 		});
 	});
 
@@ -1062,7 +1067,7 @@ describe("classifyPlugin — an orphan is never 'current'", () => {
 		expect(item.reason).toBe("marketplace-unread");
 	});
 
-	test("an orphan is unknown under an exact pin too", () => {
+	test("an orphan is deprecated under an exact pin too", () => {
 		const [item] = planPluginUpdates(
 			{ "seo@magus": "1.8.0" },
 			catalog(
@@ -1070,7 +1075,7 @@ describe("classifyPlugin — an orphan is never 'current'", () => {
 				info({ id: "dev@magus", version: "4.7.0" }),
 			),
 		);
-		expect(item.action).toBe("unknown");
+		expect(item.action).toBe("remove");
 	});
 });
 
@@ -1359,6 +1364,7 @@ describe("countPluginStates", () => {
 			repair: 1,
 			current: 0,
 			"stale-load": 0,
+			remove: 0,
 			unknown: 1,
 		});
 	});

package/src/__tests__/useStaleLoadModal.test.ts

@@ -1,8 +1,5 @@
 import { describe, expect, it } from "bun:test";
-import {
-	buildStaleLoadModal,
-	staleLoadRepairNotices,
-} from "../ui/hooks/useStaleLoadModal";
+import { buildStaleLoadModal } from "../ui/hooks/useStaleLoadModal";
 
 /**
  * The startup popup for a broken plugin.
@@ -137,56 +134,3 @@ describe("buildStaleLoadModal", () => {
 		});
 	});
 });
-
-describe("staleLoadRepairNotices", () => {
-	it("says what loads NOW for the repaired plugins, in one line", () => {
-		expect(
-			staleLoadRepairNotices([
-				{ pluginId: "madbench@magus", target: "0.5.0", ok: true },
-				{ pluginId: "dev@magus", target: "7.4.0", ok: true },
-			]),
-		).toEqual([
-			{
-				text: "Now loading madbench@magus v0.5.0, dev@magus v7.4.0",
-				tone: "success",
-			},
-		]);
-	});
-
-	it("reports a failed repair with its own reason, never as a success", () => {
-		expect(
-			staleLoadRepairNotices([
-				{
-					pluginId: "madbench@magus",
-					target: "0.5.0",
-					ok: false,
-					error: "the loader still resolves v0.3.0 here, not v0.5.0",
-				},
-			]),
-		).toEqual([
-			{
-				text: "madbench@magus not repaired: the loader still resolves v0.3.0 here, not v0.5.0",
-				tone: "warning",
-			},
-		]);
-	});
-
-	it("falls back to a plain reason rather than an empty line", () => {
-		expect(
-			staleLoadRepairNotices([
-				{ pluginId: "a@magus", target: "1.0.0", ok: false },
-			]),
-		).toEqual([
-			{
-				text: "a@magus not repaired: repair did not take effect",
-				tone: "warning",
-			},
-		]);
-	});
-
-	it("says so when there was nothing to repair", () => {
-		expect(staleLoadRepairNotices([])).toEqual([
-			{ text: "Nothing needed repairing", tone: "success" },
-		]);
-	});
-});

package/src/__tests__/version-unknown-state.test.ts

@@ -178,7 +178,7 @@ const magusCatalog = (...extra: PluginInfo[]) =>
 	);
 
 describe("planPluginUpdates — a pin its own marketplace does not offer", () => {
-	test("declared, not installed, marketplace read, plugin absent → unknown", () => {
+	test("declared, not installed, marketplace read, plugin absent → remove", () => {
 		// The bug: the !installed branch ran before any catalog guard, so
 		// `agentdev@magus` (retired) and `seo@magus` (moved to magus-marketing)
 		// planned as `install` with the literal pin as target on every run,
@@ -188,20 +188,20 @@ describe("planPluginUpdates — a pin its own marketplace does not offer", () =>
 			{ "agentdev@magus": "latest" },
 			magusCatalog(),
 		);
+		// Deprecated now, and the work is dropping the pin from the profile:
+		// still never an `install` of something nothing can fetch.
 		expect(items).toHaveLength(1);
-		expect(items[0]?.action).toBe("unknown");
+		expect(items[0]?.action).toBe("remove");
 		expect(items[0]?.target).toBeNull();
-		expect(items[0]?.note).toContain(
-			"not offered by any configured marketplace",
-		);
-		expect(items[0]?.reason).toBe("not-offered");
+		expect(items[0]?.note).toBe("no longer published");
+		expect(items[0]?.reason).toBe("deprecated");
 	});
 
-	test("an exact pin its marketplace does not offer is also unknown", () => {
+	test("an exact pin its marketplace does not offer is also deprecated", () => {
 		const items = planPluginUpdates({ "gone@magus": "3.0.0" }, magusCatalog());
-		expect(items[0]?.action).toBe("unknown");
+		expect(items[0]?.action).toBe("remove");
 		expect(items[0]?.target).toBeNull();
-		expect(items[0]?.reason).toBe("not-offered");
+		expect(items[0]?.reason).toBe("deprecated");
 	});
 
 	test("declared, not installed, and the catalog does offer it → install", () => {
@@ -345,14 +345,14 @@ describe("installed with no comparable catalog version — two different causes"
 		// The distinction this test exists for is between the two REASONS, and it
 		// still holds. What changed is the verdict: declaring no version is not a
 		// problem, so the row is `current` and says nothing. Being withdrawn IS a
-		// problem, so the next test's row is `unknown` and says so.
+		// problem, so the next test's row is `remove` and says so.
 		expect(items[0]?.reason).toBe("no-published-version");
-		expect(items[0]?.reason).not.toBe("not-offered");
+		expect(items[0]?.reason).not.toBe("deprecated");
 		expect(items[0]?.action).toBe("current");
 		expect(items[0]?.note).toBeUndefined();
 	});
 
-	test("absent from the catalog entirely IS 'not offered'", () => {
+	test("absent from the catalog entirely IS deprecated", () => {
 		const items = planPluginUpdates(
 			{ "gone@magus": "latest" },
 			new Map([
@@ -366,11 +366,9 @@ describe("installed with no comparable catalog version — two different causes"
 				],
 			]),
 		);
-		expect(items[0]?.action).toBe("unknown");
-		expect(items[0]?.note).toContain(
-			"not offered by any configured marketplace",
-		);
-		expect(items[0]?.reason).toBe("not-offered");
+		expect(items[0]?.action).toBe("remove");
+		expect(items[0]?.note).toBe("no longer published");
+		expect(items[0]?.reason).toBe("deprecated");
 	});
 });