magus-cli 7.7.0 → 7.8.0

package/src/__tests__/format-update-outcome.test.ts

@@ -64,7 +64,6 @@ describe("REQ-12 formatUpdateOutcome: what the TUI shows after Update it now", (
 	test('REQ-12a a problem makes the outcome "failed" with the fixed title and the problem in the message, even when the state reads ok', () => {
 		const result: ProfileStartup = {
 			need: needIn("ok"),
-			notices: [],
 			problems: ["boom"],
 		};
 
@@ -79,7 +78,7 @@ describe("REQ-12 formatUpdateOutcome: what the TUI shows after Update it now", (
 
 	test('REQ-12b no problems and a need still to answer gives "ask" carrying the same need object', () => {
 		const need = needIn("inactive");
-		const result: ProfileStartup = { need, notices: [], problems: [] };
+		const result: ProfileStartup = { need, problems: [] };
 
 		const outcome = formatUpdateOutcome(result);
 
@@ -87,34 +86,12 @@ describe("REQ-12 formatUpdateOutcome: what the TUI shows after Update it now", (
 		expect((outcome as { need?: unknown }).need).toBe(need);
 	});
 
-	test('REQ-12c no problems, state ok and a notice gives "updated" with one notice line, not the gate\'s working log', () => {
-		const result: ProfileStartup = {
-			need: needIn("ok"),
-			notices: ["absorbed 1 edit"],
-			problems: [],
-		};
+	test('REQ-12c no problems and state ok gives "updated", and nothing to say about it', () => {
+		const result: ProfileStartup = { need: needIn("ok"), problems: [] };
 
 		const outcome = formatUpdateOutcome(result);
 
-		expect(outcome).toEqual({
-			kind: "updated",
-			notice: "Profile format updated",
-		});
-	});
-
-	test('REQ-12d no problems, state ok and no notices gives the same "updated" notice', () => {
-		const result: ProfileStartup = {
-			need: needIn("ok"),
-			notices: [],
-			problems: [],
-		};
-
-		const outcome = formatUpdateOutcome(result);
-
-		expect(outcome).toEqual({
-			kind: "updated",
-			notice: "Profile format updated",
-		});
+		expect(outcome).toEqual({ kind: "updated" });
 	});
 });
 
@@ -137,7 +114,6 @@ for (const stream of [process.stdin, process.stdout, process.stderr]) {
 
 const out = {
 	state: null,
-	notices: null,
 	problems: null,
 	outcome: null,
 	error: null,
@@ -148,14 +124,13 @@ try {
 			? await startup.prepareProfileStartup(project, { convert: true })
 			: await startup.prepareProfileStartup(project);
 	out.state = prepared.need.state;
-	out.notices = prepared.notices;
 	out.problems = Array.isArray(prepared.problems) ? prepared.problems : null;
 	const outcome = startup.formatUpdateOutcome(prepared);
 	out.outcome =
 		outcome.kind === "ask"
 			? { kind: "ask", needState: outcome.need.state }
 			: outcome.kind === "updated"
-				? { kind: "updated", notice: outcome.notice }
+				? { kind: "updated" }
 				: { kind: outcome.kind, title: outcome.title, message: outcome.message };
 } catch (e) {
 	out.error = e instanceof Error ? (e.stack ?? e.message) : String(e);
@@ -166,12 +141,11 @@ process.exit(0);
 
 interface StartupRun {
 	state: ProfileStartupState | null;
-	notices: string[] | null;
 	/** Null when the result carried no `problems` array at all. */
 	problems: string[] | null;
 	outcome:
 		| { kind: "ask"; needState: ProfileStartupState }
-		| { kind: "updated"; notice: string }
+		| { kind: "updated" }
 		| { kind: "failed"; title: string; message: string }
 		| null;
 	error: string | null;

package/src/__tests__/gitignore-profile.test.ts

@@ -31,10 +31,7 @@ import {
 	prepareProfileState,
 } from "../services/profile-state.js";
 import type { ProfileManifest } from "../types/index.js";
-import {
-	buildGitignoreModal,
-	startupFixNotices,
-} from "../ui/hooks/useGitignoreModal.js";
+import { buildGitignoreModal } from "../ui/hooks/useGitignoreModal.js";
 
 const MANIFEST: ProfileManifest = {
 	version: 2,
@@ -155,11 +152,6 @@ describe("the startup fix untracks generated files in place", () => {
 		expect(await fs.readFile(join(project, ".gitignore"), "utf8")).toContain(
 			".claude/settings.json",
 		);
-		// Untracking is unfinished until the user commits, so it is a warning.
-		expect(startupFixNotices(result)).toContainEqual({
-			text: "Stopped tracking .claude/settings.json — commit the staged removal",
-			tone: "warning",
-		});
 		// Asked again on the next open: nothing generated is tracked any more.
 		expect((await startupGitignoreNeed(project))?.generated ?? []).toEqual([]);
 	});

package/src/__tests__/models-screen-state.test.ts

@@ -51,10 +51,9 @@ const roundTrip: AppAction[] = [
 ];
 
 describe("models screen initial state", () => {
-	test("starts idle, unfiltered, and with no message", () => {
+	test("starts idle, unfiltered, and not writing", () => {
 		expect(initialState.models.data.status).toBe("idle");
 		expect(initialState.models.searchQuery).toBe("");
-		expect(initialState.models.status).toBeNull();
 		expect(initialState.models.isApplying).toBe(false);
 		// The mate slots are not drawn until something says they can be served. Starting
 		// true would put three rows on screen before anything had been asked.
@@ -166,39 +165,6 @@ describe("models data state", () => {
 	});
 });
 
-describe("models status line", () => {
-	test("survives the screen unmounting, because it lives in app state", () => {
-		// `Router` swaps the component type on a tab change, so a message held in
-		// the screen's own useState is destroyed by 0 → 1 → 0 — and the message is
-		// the only record of what the last apply did.
-		const messaged = run([
-			{
-				type: "MODELS_STATUS_SET",
-				status: { text: "Routed opus-lead", tone: "success" },
-			},
-		]);
-		expect(run(roundTrip, messaged).models.status?.text).toBe(
-			"Routed opus-lead",
-		);
-	});
-
-	test("is replaced by the next message, not appended to", () => {
-		const state = run([
-			{ type: "MODELS_STATUS_SET", status: { text: "one", tone: "success" } },
-			{ type: "MODELS_STATUS_SET", status: { text: "two", tone: "error" } },
-		]);
-		expect(state.models.status).toEqual({ text: "two", tone: "error" });
-	});
-
-	test("clearing removes it", () => {
-		const state = run([
-			{ type: "MODELS_STATUS_SET", status: { text: "one", tone: "success" } },
-			{ type: "MODELS_STATUS_CLEAR" },
-		]);
-		expect(state.models.status).toBeNull();
-	});
-});
-
 describe("apply-in-flight state", () => {
 	test("survives the screen unmounting", () => {
 		// An apply rewrites the profile, re-materializes it and registers a hook.
@@ -297,11 +263,10 @@ describe("ModelsScreen keybindings", () => {
 		expect(src.slice(apply, apply + 120)).toContain("handleApply()");
 	});
 
-	test("digits and Tab never reach the screen, so a message survives a tab round trip", () => {
-		// The status line is cleared only by this screen's own bindings. Every
-		// digit (0 included) and Tab navigate, and they belong to the global key
-		// layer: no Models binding may claim one, or the message would be wiped
-		// on the way OUT of the tab — the loss the state was moved to prevent.
+	test("digits and Tab never reach the screen", () => {
+		// Every digit (0 included) and Tab navigate, and they belong to the global
+		// key layer: a Models binding claiming one would make the tab unleavable
+		// by that key.
 		for (const digit of "1234567890") {
 			expect(
 				matchBinding(SCREEN_BINDINGS.models, press(digit)),
@@ -319,6 +284,19 @@ describe("ModelsScreen keybindings", () => {
 		expect(styles).not.toContain("/^[1-9]$/");
 	});
 
+	test("no status line: a failure goes to the failure popup, a success says nothing", async () => {
+		// The TUI shows no status lines, notices or success messages; the screen
+		// reloads and shows state. The header row carries state only.
+		const src = stripComments(await fs.readFile(SCREEN, "utf8"));
+		expect(src).not.toContain("notice=");
+		expect(src).not.toContain("MODELS_STATUS");
+		expect(src).not.toMatch(/\bApplied\b/);
+		// Negative control: the failure path is really wired, so the guard is
+		// not passing over a screen that reports nothing at all.
+		expect(src).toContain("useFailurePopup()");
+		expect(src).toContain("stepFailureReport(");
+	});
+
 	test("screen state is held in the reducer, never in useState", async () => {
 		// The rule the two "survives unmounting" tests above enforce at runtime,
 		// pinned at the source so a new piece of state cannot quietly opt out.

package/src/__tests__/plugin-resolution.test.ts

@@ -191,17 +191,11 @@ describe("isRelevantInstallation", () => {
 		).toBe(false);
 	});
 
-	test("two rootless paths DO match each other, as the original's compare does", () => {
-		// `repoRoot(entry.projectPath) === repoRoot(originalCwd)` with both sides
-		// null is true in the decompiled filter, so a row from any directory in no
-		// repository competes when Claude Code runs from another such directory —
-		// a scratch dir, a home directory, a plain non-git project.
-		//
-		// The port used to answer false here, which made magus name a
-		// `loadedVersion` the loader would not pick in any non-git directory. It is
-		// the loader's answer this module owes, not the more cautious one; what
-		// magus may WRITE is a separate question, pinned in stale-load-repair.test.ts
-		// ("a rootless row from another directory is relevant but NOT rewritten").
+	test("two rootless paths do NOT match each other (Claude Code 2.1.284)", () => {
+		// 2.1.284 guards the root comparison with `cwdRoot !== null`. Before it,
+		// two nulls compared equal and every rootless folder shared every other
+		// rootless folder's rows. Measured with `--debug-file` in a rootless folder:
+		// a row from an existing non-git folder did not load there.
 		const loose = path.join(base, "loose");
 		expect(
 			isRelevantInstallation(
@@ -212,12 +206,57 @@ describe("isRelevantInstallation", () => {
 				loose,
 				repoRootForPath(loose),
 			),
+		).toBe(false);
+	});
+
+	test("in a rootless folder its own row and USER rows still count", () => {
+		const loose = path.join(base, "loose");
+		const looseRoot = repoRootForPath(loose);
+		expect(looseRoot).toBeNull();
+		expect(
+			isRelevantInstallation(
+				entry({ version: "1.0.0", projectPath: loose }),
+				loose,
+				looseRoot,
+			),
+		).toBe(true);
+		expect(
+			isRelevantInstallation(
+				entry({ version: "1.0.0", scope: "user", projectPath: undefined }),
+				loose,
+				looseRoot,
+			),
+		).toBe(true);
+	});
+
+	test("a row's path is compared RAW, as the binary compares it: '/p/a/' is not '/p/a' in a rootless folder", () => {
+		// Normalising the row's path made this pair relevant — and in a rootless
+		// folder nothing else could, since the root comparison matches nothing —
+		// so the port named a row the loader rejects.
+		const loose = path.join(base, "loose");
+		const looseRoot = repoRootForPath(loose);
+		expect(looseRoot).toBeNull();
+		expect(
+			isRelevantInstallation(
+				entry({ version: "1.0.0", projectPath: `${loose}/` }),
+				loose,
+				looseRoot,
+			),
+		).toBe(false);
+		// The caller's directory stands in for the binary's own working
+		// directory, which is always absolute with no trailing slash.
+		expect(
+			isRelevantInstallation(
+				entry({ version: "1.0.0", projectPath: loose }),
+				`${loose}/`,
+				looseRoot,
+			),
 		).toBe(true);
 	});
 
 	test("a rootless row is still irrelevant to a directory inside a repository", () => {
-		// The null-matches-null rule must not leak the other way: `cwdRoot` is a
-		// real root here, so a rootless row's null root does not equal it.
+		// `cwdRoot` is a real root here, so a rootless row's null root does not
+		// equal it.
 		expect(
 			isRelevantInstallation(
 				entry({ version: "1.0.0", projectPath: path.join(base, "loose") }),

package/src/__tests__/plugin-row-text.test.ts

@@ -140,7 +140,7 @@ describe("pluginRowText — orphans say what the CLI says (F9)", () => {
 	// match, and it cannot tell a move from a dual publication: claudish ships
 	// to two marketplaces with both copies installed, and the row announced
 	// "moved → magus" about a plugin that had not moved anywhere.
-	test("an orphan is 'not offered', and never names a destination", () => {
+	test("an orphan is deprecated, and never names a destination", () => {
 		const seo = info({
 			id: "seo@magus",
 			version: "1.8.0",
@@ -149,16 +149,15 @@ describe("pluginRowText — orphans say what the CLI says (F9)", () => {
 			projectScope: { installed: true, version: "1.8.0" },
 		});
 		const row = rows([seo]).get(seo.id) as PluginPluginItem;
-		expect(cliNote([seo], seo.id)).toBe(
-			"not offered by any configured marketplace",
-		);
+		expect(cliNote([seo], seo.id)).toBe("no longer published");
+		// The row's own words, not the note: the verdict and the key that acts.
 		expect(pluginRowText(row).text).toBe(
-			" v1.8.0 ? not offered by any configured marketplace",
+			" v1.8.0 deprecated — press a to remove",
 		);
 		expect(pluginRowText(row).text).not.toMatch(/moved/i);
 	});
 
-	test("an orphan from a marketplace we DID read is 'not offered'", () => {
+	test("an orphan from a marketplace we DID read is deprecated", () => {
 		const gone = info({
 			id: "gone@magus",
 			version: "2.0.0",
@@ -168,14 +167,12 @@ describe("pluginRowText — orphans say what the CLI says (F9)", () => {
 		});
 		const row = rows([gone]).get(gone.id) as PluginPluginItem;
 		expect(pluginRowText(row).text).toBe(
-			` v2.0.0 ? ${cliNote([gone], gone.id)}`,
-		);
-		expect(pluginRowText(row).text).toContain(
-			"not offered by any configured marketplace",
+			" v2.0.0 deprecated — press a to remove",
 		);
+		expect(row.status?.action).toBe("remove");
 	});
 
-	test("the old words are gone: no 'deprecated', no 'moved →'", () => {
+	test("the old words are gone: no 'moved →', and no marketplace wording", () => {
 		const seo = info({
 			id: "seo@magus",
 			installedVersion: "1.8.0",
@@ -183,14 +180,14 @@ describe("pluginRowText — orphans say what the CLI says (F9)", () => {
 			projectScope: { installed: true, version: "1.8.0" },
 		});
 		const { text } = pluginRowText(rows([seo]).get(seo.id) as PluginPluginItem);
-		expect(text).not.toContain("deprecated");
+		expect(text).not.toMatch(/marketplace/i);
 		expect(text).not.toContain("moved →");
 	});
 });
 
-describe("pluginRowText — history badges combine with the state", () => {
-	const updated = (over: Partial<PluginInfo>) =>
-		info({
+describe("pluginRowText — the current version and the state, no history", () => {
+	const row = (over: Partial<PluginInfo>) => {
+		const p = info({
 			id: "terminal@magus",
 			version: "3.3.1",
 			installedVersion: "3.0.1",
@@ -198,40 +195,36 @@ describe("pluginRowText — history badges combine with the state", () => {
 			author: { name: "MadAppGang" },
 			...over,
 		});
+		return rows([p]).get(p.id) as PluginPluginItem;
+	};
 
-	test("'updated' and a pending update are both shown", () => {
-		// An external update moved 2.9.0 → 3.0.1 while 3.3.1 is already out.
-		const p = updated({ recentlyUpdatedFrom: "2.9.0" });
-		const row = rows([p]).get(p.id) as PluginPluginItem;
-		const { text, segments } = pluginRowText(row);
-		expect(text).toBe(" v2.9.0 → v3.0.1 updated → v3.3.1 available");
-		expect(segments.map((s) => s.tone)).toEqual(["success", "warning"]);
+	test("a pending update: the installed version, then what is available", () => {
+		const { text, segments } = pluginRowText(row({}));
+		expect(text).toBe(" v3.0.1 → v3.3.1 available");
+		expect(segments.map((s) => s.tone)).toEqual(["muted", "warning"]);
 	});
 
-	test("'new' and a pending update are both shown", () => {
-		const p = updated({ recentlyInstalled: true });
-		const row = rows([p]).get(p.id) as PluginPluginItem;
-		expect(pluginRowText(row).text).toBe(" v3.0.1 new → v3.3.1 available");
+	test("NEGATIVE CONTROL: no 'updated' or 'new' badge — the row has no memory of earlier versions", () => {
+		// The badge rendered "v1.8.0 → v1.7.4 updated → v1.8.0 available": a
+		// downgrade called "updated". A row now says nothing about what changed.
+		const text = pluginRowText(row({})).text;
+		expect(text).not.toContain("updated");
+		expect(text).not.toContain(" new");
 	});
 
-	test("'new' with no displayable version still says new", () => {
-		const p = updated({
-			recentlyInstalled: true,
+	test("an unknown version is not printed", () => {
+		const r = row({
 			version: "0.0.0",
 			installedVersion: "0.0.0",
 			projectScope: { installed: true, version: "0.0.0" },
 		});
-		const row = rows([p]).get(p.id) as PluginPluginItem;
-		expect(pluginRowText(row).text).toBe(" new");
+		expect(pluginRowText(r).text).not.toContain("v0.0.0");
 	});
 
 	test("a current row shows only its version", () => {
-		const p = updated({
-			version: "3.0.1",
-		});
-		const row = rows([p]).get(p.id) as PluginPluginItem;
-		expect(row.status?.action).toBe("current");
-		expect(pluginRowText(row).text).toBe(" v3.0.1");
+		const r = row({ version: "3.0.1" });
+		expect(r.status?.action).toBe("current");
+		expect(pluginRowText(r).text).toBe(" v3.0.1");
 	});
 });
 

package/src/__tests__/profile-dependencies.test.ts

@@ -141,6 +141,13 @@ describe("the render enables what the profile's plugins depend on", () => {
 			"lib@mkt",
 			"shared@other",
 		]);
+		// Which plugin asked for each — what `magus update` names when a derived
+		// dependency is no longer published.
+		expect(closure.dependencies?.requiredBy).toEqual({
+			"lib@mkt": "app@mkt",
+			"core@mkt": "lib@mkt",
+			"shared@other": "core@mkt",
+		});
 		await start(manifest, "only");
 		expect(await enabled()).toEqual({
 			"app@mkt": true,

package/src/__tests__/profile-startup-old-format.test.ts

@@ -60,7 +60,6 @@ const out = {
 	described: null,
 	options: null,
 	updateFormatValue: startup.UPDATE_FORMAT_VALUE,
-	notices: null,
 	error: null,
 };
 try {
@@ -78,7 +77,6 @@ try {
 			mode === "convert" ? { convert: true } : undefined,
 		);
 		out.need = { state: prepared.need.state };
-		out.notices = prepared.notices;
 	}
 } catch (e) {
 	out.error = e instanceof Error ? (e.stack ?? e.message) : String(e);
@@ -93,7 +91,6 @@ interface OldFormatRun {
 	described: { title: string; message: string } | null;
 	options: Array<{ label: string; value: string; meta?: string }> | null;
 	updateFormatValue: string;
-	notices: string[] | null;
 	error: string | null;
 }
 

package/src/__tests__/profile-startup.test.ts

@@ -137,7 +137,7 @@ describe("detectProfileStartupNeed", () => {
 		expect(describeNeed(need).message).toContain('"gone"');
 	});
 
-	test("the TUI startup runs the gate first and reports what it absorbed", async () => {
+	test("the TUI startup runs the gate first, absorbing edits into the profile", async () => {
 		await fs.outputJson(join(project, ".claude", "profiles.json"), LEAN);
 		await activateProfile(LEAN, "lean", project, { onDisplace: () => {} });
 		const live = join(project, ".claude", "settings.json");
@@ -145,10 +145,13 @@ describe("detectProfileStartupNeed", () => {
 		settings.enabledPlugins["code-search@magus"] = true;
 		await fs.writeFile(live, JSON.stringify(settings));
 
-		const { need, notices } = await prepareProfileStartup(project);
+		const { need } = await prepareProfileStartup(project);
 
 		expect(need.state).toBe("ok");
-		expect(notices).toEqual(['Added code-search@magus to profile "lean"']);
+		const manifest = await fs.readJson(
+			join(project, ".claude", "profiles.json"),
+		);
+		expect(manifest.profiles.lean.plugins["code-search@magus"]).toBeTruthy();
 	});
 
 	test("what is enabled never changes the answer", async () => {
@@ -403,46 +406,71 @@ describe("a failure that already moved something", () => {
 		link: `/p/.claude/${name}`,
 		savedTo: `/p/.claude/.magus-backups/S/${name}`,
 	});
+	const lean = { kind: "activate" as const, id: "lean" };
+	/** Everything the failure popup says, as one string. */
+	const said = (report: ReturnType<typeof describeFailure>): string =>
+		[
+			report.headline,
+			...report.rows.map((r) => `${r.subject} ${r.reason} ${r.fix ?? ""}`),
+			report.fix ?? "",
+		].join("\n");
 
 	test("a true no-op says so", () => {
-		const msg = describeFailure(new Error("boom"), [], "/p", null);
+		const report = describeFailure(new Error("boom"), [], "/p", null, lean);
+		expect(report.headline).toBe('Profile "lean" was not activated');
+		const msg = said(report);
 		expect(msg).toContain("boom");
 		expect(msg).toContain("exactly as it was");
 	});
 
+	test("an adoption that failed says the profile was not created", () => {
+		const report = describeFailure(new Error("boom"), [], "/p", null, {
+			kind: "adopt",
+			id: "default",
+			name: "Mine",
+		});
+		expect(report.headline).toBe('Profile "Mine" was not created');
+	});
+
 	test("a partial failure never claims nothing happened", () => {
 		// Activation moves up to four artifacts in sequence and settings.json goes
 		// FIRST, so a throw on the second leaves it already in the backup. The old
 		// message said "Nothing was activated" unconditionally — false about the
 		// user's own file, and `.magus-backups/` is gitignored, so git status
 		// showed the deletion with no sign of the copy.
-		const msg = describeFailure(
+		const report = describeFailure(
 			new Error("EACCES: skills"),
 			[at("settings.json")],
 			"/p",
 			"lean",
+			lean,
 		);
+		const msg = said(report);
 
-		expect(msg).not.toContain("Nothing was moved");
+		expect(msg.toLowerCase()).not.toContain("nothing was moved");
 		expect(msg).not.toContain("exactly as it was");
-		// It must name where the file went, project-relative.
-		expect(msg).toContain(".claude/settings.json");
-		expect(msg).toContain(".claude/.magus-backups/S/settings.json");
+		// It must name where the file went, project-relative: one row per file.
+		expect(report.rows).toContainEqual({
+			subject: ".claude/settings.json",
+			reason: "is kept at .claude/.magus-backups/S/settings.json",
+		});
 	});
 
 	test("it warns against the re-attempt that would capture an empty set", () => {
 		// Re-choosing save-what-you-have runs adoption again, and adoption reads
 		// settings.json — now in the backup. It would capture an empty plugin set
 		// into a second profile and call that the user's setup.
-		const msg = describeFailure(
+		const report = describeFailure(
 			new Error("boom"),
 			[at("settings.json")],
 			"/p",
 			"lean",
+			lean,
 		);
 
-		expect(msg).toContain("Do NOT save-what-you-have");
-		expect(msg).toContain("Activating lean again is safe");
+		// The fix line, said once under the rows.
+		expect(report.fix).toContain("Do NOT save-what-you-have");
+		expect(report.fix).toContain("Activating lean again is safe");
 	});
 });