magus-cli 7.6.0 → 7.8.0

package/src/ui/hooks/useProfileStartupModal.ts

@@ -17,11 +17,7 @@
 
 import { useCallback, useRef } from "react";
 import { getManifestPath } from "../../services/manifest.js";
-import {
-	type ActivationResult,
-	type ProfileChoice,
-	activationNotes,
-} from "../../services/profile-activate.js";
+import type { ProfileChoice } from "../../services/profile-activate.js";
 import type { DisplacedArtifact } from "../../services/profile-live.js";
 import {
 	type ProfileStartupNeed,
@@ -37,8 +33,17 @@ import {
 } from "../../services/profile-startup.js";
 import { applyProfileChoice } from "../../services/profile-state.js";
 import { SettingsParseError } from "../../services/settings-file.js";
-import { useApp, useNavigation } from "../state/AppContext.js";
-import type { ModalState } from "../state/types.js";
+import { exceptionReason } from "../adapters/pluginsAdapter.js";
+import {
+	activationFailureReport,
+	profileProblemsReport,
+	stepFailureReport,
+} from "../adapters/startupReports.js";
+import { useApp } from "../state/AppContext.js";
+import type { FailureReport, ModalState } from "../state/types.js";
+
+/** The headline for every way "Update it now" can fail. */
+const FORMAT_NOT_UPDATED = "The profile format was not updated";
 
 export interface BuildProfileModalArgs {
 	need: ProfileStartupNeed;
@@ -85,40 +90,6 @@ export function buildProfileStartupModal(
 	};
 }
 
-/** What changed, phrased for a message modal rather than a terminal. */
-export function describeOutcome(
-	profileId: string,
-	displaced: DisplacedArtifact[],
-	projectPath: string,
-	/** True when this happened without asking, following the committed default. */
-	automatic = false,
-	/** Anything else activation reported (see `activationNotes`). */
-	notes: string[] = [],
-): string {
-	const lines = [
-		automatic
-			? `This project declares "${profileId}" as its profile, so magus activated it.`
-			: `"${profileId}" is now the active profile.`,
-	];
-	if (displaced.length > 0) {
-		lines.push(
-			"",
-			"These were moved aside to make room for the profile's files, and are kept:",
-			...displaced.map((d) => {
-				const from = d.link.startsWith(projectPath)
-					? d.link.slice(projectPath.length + 1)
-					: d.link;
-				const to = d.savedTo.startsWith(projectPath)
-					? d.savedTo.slice(projectPath.length + 1)
-					: d.savedTo;
-				return `  ${from} → ${to}`;
-			}),
-		);
-	}
-	if (notes.length > 0) lines.push("", ...notes);
-	return lines.join("\n");
-}
-
 /** Project-relative, so a path does not wrap over two lines. */
 function rel(p: string, projectPath: string): string {
 	return p.startsWith(projectPath) ? p.slice(projectPath.length + 1) : p;
@@ -144,33 +115,59 @@ export function describeFailure(
 	moved: DisplacedArtifact[],
 	projectPath: string,
 	declaredDefault: string | null,
-): string {
-	const reason = error instanceof Error ? error.message : String(error);
+	choice: ProfileChoice,
+): FailureReport {
+	const profile =
+		choice.kind === "adopt" ? (choice.name ?? choice.id) : choice.id;
+	const headline =
+		choice.kind === "adopt"
+			? `Profile "${profile}" was not created`
+			: `Profile "${profile}" was not activated`;
+	const e = exceptionReason(
+		error instanceof Error ? error.message : String(error),
+	);
 	if (moved.length === 0) {
-		return `${reason}\n\nNothing was moved, so this project is exactly as it was.`;
+		return {
+			headline,
+			rows: [
+				{
+					subject: profile,
+					reason: `${e.reason}; nothing was moved, so this project is exactly as it was`,
+				},
+			],
+			fix: e.fix ?? null,
+		};
 	}
-	return [
-		reason,
-		"",
-		"This did not finish, and these were already moved aside. They are kept:",
-		...moved.map(
-			(d) => `  ${rel(d.link, projectPath)} → ${rel(d.savedTo, projectPath)}`,
-		),
-		"",
+	return {
+		headline,
+		rows: [
+			{
+				subject: profile,
+				reason: `${e.reason}; this did not finish, and these files were already moved aside`,
+			},
+			...moved.map((d) => ({
+				subject: rel(d.link, projectPath),
+				reason: `is kept at ${rel(d.savedTo, projectPath)}`,
+			})),
+		],
 		// The trap the reviewer found: re-choosing "save what you have" after a
 		// partial failure runs adoption again, and adoption reads settings.json —
 		// which is now in the backup. It would capture an empty plugin set into a
 		// second profile and call that the user's setup.
-		declaredDefault !== null
-			? `Activating ${declaredDefault} again is safe. Do NOT save-what-you-have — the files above have moved, so it would capture an empty set.`
-			: "Activating a profile again is safe. Do NOT save-what-you-have — the files above have moved, so it would capture an empty set.",
-	].join("\n");
+		fix:
+			declaredDefault !== null
+				? `Activating ${declaredDefault} again is safe. Do NOT save-what-you-have — the files above have moved, so it would capture an empty set.`
+				: "Activating a profile again is safe. Do NOT save-what-you-have — the files above have moved, so it would capture an empty set.",
+	};
 }
 
 export interface ProfileStartupModalCallbacks {
 	/** Leave magus: the modal's only non-action. */
 	onQuit: () => void;
-	/** Called once a choice has activated a profile — see App's gitignore re-check. */
+	/**
+	 * Called once a choice has activated a profile, or a format update has
+	 * rewritten it — the app dispatches PROFILE_ACTIVATED on it.
+	 */
 	onActivated?: () => void;
 	/**
 	 * The question is ANSWERED: a profile is active, or the user chose to quit.
@@ -185,7 +182,8 @@ export interface ProfileStartupModalCallbacks {
  * question on screen NOW, which is not always the one magus opened with: "Update
  * it now" asks a new one, and a manifest that stopped parsing turns the question
  * into the unparseable one. `working` is true while an activation or a format
- * update is running — its result modal takes the slot when it settles.
+ * update is running — when it settles it empties the slot (success) or puts its
+ * error modal there.
  */
 interface ProfileFlow {
 	need: ProfileStartupNeed;
@@ -198,7 +196,6 @@ export function useProfileStartupModal({
 	onAnswered,
 }: ProfileStartupModalCallbacks) {
 	const { state, dispatch } = useApp();
-	const { navigateToScreen } = useNavigation();
 	const projectPath = state.projectPath;
 	// A ref, not state: `show` is recreated on every render, and the flow must
 	// survive that — a re-show has to know what was last asked, and that work is
@@ -227,6 +224,26 @@ export function useProfileStartupModal({
 				answered();
 				onQuit();
 			};
+			/**
+			 * End a flow that activated a profile: empty the slot, or — when the
+			 * activation could not do something — put the failure popup in it.
+			 * Either way the question is already answered, so dismissing the popup
+			 * lets the next startup question in.
+			 */
+			const settle = (report: FailureReport | null): void => {
+				if (!report) {
+					dispatch({ type: "HIDE_MODAL" });
+					return;
+				}
+				dispatch({
+					type: "SHOW_MODAL",
+					modal: {
+						type: "failures",
+						report,
+						onDismiss: () => dispatch({ type: "HIDE_MODAL" }),
+					},
+				});
+			};
 
 			/**
 			 * Apply a choice, reporting the outcome either way. `current` is the
@@ -235,7 +252,6 @@ export function useProfileStartupModal({
 			 */
 			const apply = (
 				choice: ProfileChoice,
-				automatic: boolean,
 				current: ProfileStartupNeed = need,
 			): void => {
 				flowRef.current = { need: current, working: true };
@@ -263,34 +279,17 @@ export function useProfileStartupModal({
 				void applyProfileChoice(choice, current.manifest, projectPath, {
 					onDisplace: (artifact) => moved.push(artifact),
 				})
-					.then((result: ActivationResult) => {
+					.then((result) => {
 						// Answered here, on success — NOT when the question was shown.
 						// Clearing it on show let a screen's modal replace it and the
 						// question never came back.
 						answered();
 						onActivated?.();
-						const { profileId, displaced } = result;
-						dispatch({
-							type: "SHOW_MODAL",
-							modal: {
-								type: "message",
-								title: "Profile active",
-								message: describeOutcome(
-									profileId,
-									displaced,
-									projectPath,
-									automatic,
-									activationNotes(result),
-								),
-								variant: "success",
-								onDismiss: () => {
-									dispatch({ type: "HIDE_MODAL" });
-									// The Profiles tab is where the result is visible, and
-									// where the user will want to look next.
-									navigateToScreen("profiles");
-								},
-							},
-						});
+						// No result modal and no jump to the Profiles tab: the user
+						// stays where they are, and the screen reloads under them —
+						// unless the activation could not do something, which the one
+						// failure popup says once it has settled.
+						settle(activationFailureReport([result]));
 					})
 					.catch((error: unknown) => {
 						// The manifest stopped parsing between launch and this answer —
@@ -308,18 +307,14 @@ export function useProfileStartupModal({
 						dispatch({
 							type: "SHOW_MODAL",
 							modal: {
-								type: "message",
-								title:
-									choice.kind === "adopt"
-										? "Could not create the profile"
-										: "Could not activate the profile",
-								message: describeFailure(
+								type: "failures",
+								report: describeFailure(
 									error,
 									moved,
 									projectPath,
 									current.declaredDefault,
+									choice,
 								),
-								variant: "error",
 								// A failure leaves the project without an active profile, so
 								// dismissing returns to the question — including when the
 								// attempt was automatic, which is the one case where there
@@ -344,24 +339,47 @@ export function useProfileStartupModal({
 				void prepareProfileStartup(projectPath, { convert: true })
 					.then((result) => {
 						const outcome = formatUpdateOutcome(result);
+						const report = activationFailureReport(result.activations ?? []);
 						if (outcome.kind === "ask") {
 							// Converted, but no profile is active yet: a new question,
-							// still unanswered.
+							// still unanswered — asked once what the conversion could not
+							// do has been read.
 							onActivated?.();
+							if (report) {
+								flowRef.current = { need: outcome.need, working: false };
+								dispatch({
+									type: "SHOW_MODAL",
+									modal: {
+										type: "failures",
+										report,
+										onDismiss: () => ask(outcome.need),
+									},
+								});
+								return;
+							}
 							ask(outcome.need);
 							return;
 						}
 						if (outcome.kind === "failed") {
 							// Refused, so still the old format: back to the question,
 							// as the CLI stops on the same lines.
+							// Each refusal in the failure popup, the file it is about
+							// named, and what to do about it.
+							// A "failed" outcome always carries problems; the fallback
+							// only keeps the popup's type honest.
 							flowRef.current = { need, working: false };
+							const refused =
+								profileProblemsReport(result.problems, FORMAT_NOT_UPDATED) ??
+								stepFailureReport(
+									FORMAT_NOT_UPDATED,
+									"profile",
+									outcome.message,
+								);
 							dispatch({
 								type: "SHOW_MODAL",
 								modal: {
-									type: "message",
-									title: outcome.title,
-									message: outcome.message,
-									variant: "error",
+									type: "failures",
+									report: refused,
 									onDismiss: () => ask(need),
 								},
 							});
@@ -370,29 +388,20 @@ export function useProfileStartupModal({
 						// Nothing left to ask: the converted profile is active.
 						answered();
 						onActivated?.();
-						dispatch({
-							type: "SHOW_MODAL",
-							modal: {
-								type: "message",
-								title: outcome.title,
-								message: outcome.message,
-								variant: "success",
-								onDismiss: () => {
-									dispatch({ type: "HIDE_MODAL" });
-									navigateToScreen("profiles");
-								},
-							},
-						});
+						settle(report);
 					})
 					.catch((error: unknown) => {
 						flowRef.current = { need, working: false };
 						dispatch({
 							type: "SHOW_MODAL",
 							modal: {
-								type: "message",
-								title: "Could not update the profile format",
-								message: `${error instanceof Error ? error.message : String(error)}\n\nYour profiles are kept. Open magus again to retry.`,
-								variant: "error",
+								type: "failures",
+								report: stepFailureReport(
+									FORMAT_NOT_UPDATED,
+									"profile",
+									error,
+									"Your profiles are kept. Open magus again to retry",
+								),
 								onDismiss: () => ask(need),
 							},
 						});
@@ -427,11 +436,7 @@ export function useProfileStartupModal({
 								askName(suggestion, current, value, check.reason);
 								return;
 							}
-							apply(
-								{ kind: "adopt", id: check.id, name: check.name },
-								false,
-								current,
-							);
+							apply({ kind: "adopt", id: check.id, name: check.name }, current);
 						},
 						onCancel: () => ask(current),
 					},
@@ -447,7 +452,7 @@ export function useProfileStartupModal({
 						onChoose: (choice) =>
 							choice.kind === "adopt"
 								? askName(choice.id, current)
-								: apply(choice, false, current),
+								: apply(choice, current),
 						onUpdateFormat: updateFormat,
 						onQuit: quit,
 					}),
@@ -466,15 +471,15 @@ export function useProfileStartupModal({
 
 			// The repo already answered and there is nothing of the user's to
 			// replace: asking here would ask someone to re-decide what their team
-			// decided, with nothing at stake. Reported in the outcome modal, so it
-			// is never invisible.
+			// decided, with nothing at stake. The Profiles tab names the profile
+			// in use.
 			if (need.autoActivate && need.declaredDefault !== null) {
-				apply({ kind: "activate", id: need.declaredDefault }, true);
+				apply({ kind: "activate", id: need.declaredDefault });
 				return;
 			}
 			ask();
 		},
-		[dispatch, navigateToScreen, projectPath, onQuit, onActivated, onAnswered],
+		[dispatch, projectPath, onQuit, onActivated, onAnswered],
 	);
 
 	return { show };

package/src/ui/hooks/useStaleLoadModal.ts

@@ -1,6 +1,7 @@
 import { useCallback } from "react";
+import { stepFailureReport } from "../adapters/startupReports.js";
 import { useApp, useNavigation } from "../state/AppContext.js";
-import type { ModalState } from "../state/types.js";
+import type { FailureReport, ModalState } from "../state/types.js";
 
 /**
  * Startup broken-plugin modal: magus launches, finds that Claude Code will load
@@ -75,8 +76,16 @@ export function useStaleLoadModal() {
 	const show = useCallback(
 		(args: {
 			brokenCount: number;
-			/** Runs the repair. Resolves to what to tell the user afterwards. */
-			onFix: () => Promise<string> | string;
+			/**
+			 * Runs the repair and answers what it could not fix — null when every
+			 * plugin now loads its installed version. The Plugins screen shows
+			 * what now loads; the failures go into the one failure popup.
+			 */
+			onFix: () =>
+				| Promise<FailureReport | null | undefined>
+				| FailureReport
+				| null
+				| undefined;
 		}) => {
 			if (args.brokenCount === 0) return;
 			const dismiss = () => dispatch({ type: "HIDE_MODAL" });
@@ -87,38 +96,34 @@ export function useStaleLoadModal() {
 						type: "SHOW_MODAL",
 						modal: { type: "loading", message: "Repairing plugins…" },
 					});
-					// The outcome is REPORTED, never assumed. `repairStaleLoad` re-asks
-					// the loader after writing and can legitimately answer "still not
-					// loading the target"; swallowing that would leave the user believing
-					// a broken plugin was fixed.
+					// The outcome is never assumed: `repairStaleLoad` re-asks the loader
+					// after writing, and a plugin it could not fix still reads BROKEN on
+					// the Plugins screen.
 					//
 					// Called inside `.then` so a synchronous throw reaches `.catch`
 					// too; otherwise the loading modal stays up and swallows every key.
+					const fail = (report: FailureReport) =>
+						dispatch({
+							type: "SHOW_MODAL",
+							modal: { type: "failures", report, onDismiss: dismiss },
+						});
 					void Promise.resolve()
 						.then(() => args.onFix())
-						.then((summary) => {
-							dispatch({
-								type: "SHOW_MODAL",
-								modal: {
-									type: "message",
-									title: "Plugin repair",
-									message: summary,
-									variant: "info",
-									onDismiss: dismiss,
-								},
-							});
+						.then((report) => {
+							// The loading modal must go — it swallows every key — and the
+							// next startup question is waiting for the slot. A repair
+							// that did not take puts the failure popup there instead.
+							if (report) fail(report);
+							else dispatch({ type: "HIDE_MODAL" });
 						})
 						.catch((err) => {
-							dispatch({
-								type: "SHOW_MODAL",
-								modal: {
-									type: "message",
-									title: "Plugin repair failed",
-									message: err instanceof Error ? err.message : String(err),
-									variant: "error",
-									onDismiss: dismiss,
-								},
-							});
+							fail(
+								stepFailureReport(
+									"The plugins were not repaired",
+									"repair",
+									err,
+								),
+							);
 						});
 				},
 				onOpenTab: () => {
@@ -134,28 +139,3 @@ export function useStaleLoadModal() {
 
 	return { show };
 }
-
-/**
- * One line per repair attempt, for the modal that follows the fix.
- *
- * Exported and pure so the wording is tested rather than inspected by eye. Each
- * line says what the loader resolves NOW, because that — not the row count — is
- * the thing the user came here to change.
- */
-export function staleLoadRepairSummary(
-	results: ReadonlyArray<{
-		pluginId: string;
-		target: string;
-		ok: boolean;
-		error?: string;
-	}>,
-): string {
-	if (results.length === 0) return "Nothing to repair.";
-	return results
-		.map((r) =>
-			r.ok
-				? `✓ ${r.pluginId} now loads v${r.target}`
-				: `✗ ${r.pluginId} — ${r.error ?? "repair did not take effect"}`,
-		)
-		.join("\n");
-}

package/src/ui/keymap.ts

@@ -166,6 +166,13 @@ const PLUGINS = [
 		"Remove a deprecated plugin from every scope",
 		30,
 	),
+	bind(
+		"set-env",
+		["e"],
+		"settings",
+		"Set the variables a plugin's MCP server needs",
+		35,
+	),
 	bind("add-marketplace", ["n"], "add marketplace", "Add a marketplace", 30),
 	bind("team-help", ["t"], "team", "How to share marketplaces with a team", 10),
 	refresh("Refresh the local marketplace caches"),
@@ -374,7 +381,13 @@ const ALIAS = [
 		"Turn the flag on or off; in the flag editor, the row",
 		90,
 	),
-	bind("write", ["w"], "write", "Write the alias to your shell's rc file", 85),
+	bind(
+		"write",
+		["w"],
+		"write",
+		"Write the alias to your shell's rc file; a new shell picks it up",
+		85,
+	),
 	bind("edit", ["e"], "edit", "Edit the flag's value", 80),
 	bind("reset", ["r"], "reset", "Reset the row to its default", 50),
 	bind("add", ["a"], "add", "Flag editor: add a value", 80),