magus-cli 7.7.0 → 7.8.0

package/src/ui/state/AppContext.tsx

@@ -6,12 +6,12 @@ import {
 	useContext,
 	useReducer,
 } from "react";
-import { NOTICE_DURATION_MS, appReducer, initialState } from "./reducer.js";
+import { appReducer, initialState } from "./reducer.js";
 import type {
 	AppAction,
 	AppState,
+	FailureReport,
 	ModalState,
-	NoticeTone,
 	ProgressState,
 	Route,
 	Screen,
@@ -90,6 +90,44 @@ export function useNavigation() {
 	};
 }
 
+// ============================================================================
+// Hook: useFailurePopup
+// ============================================================================
+
+/**
+ * The failure popup as ONE stable callback: show `report`, or do nothing for
+ * null — the "nothing failed" answer every report builder gives. Stable
+ * across renders, unlike `useModal()`, so a `useCallback` that reports a
+ * failure can list it without being rebuilt — and without re-running an
+ * effect that depends on that callback.
+ */
+export function useFailurePopup(): (
+	report: FailureReport | null,
+) => Promise<void> {
+	const { dispatch } = useApp();
+	return useCallback(
+		(report: FailureReport | null) =>
+			new Promise<void>((resolve) => {
+				if (!report) {
+					resolve();
+					return;
+				}
+				dispatch({
+					type: "SHOW_MODAL",
+					modal: {
+						type: "failures",
+						report,
+						onDismiss: () => {
+							dispatch({ type: "HIDE_MODAL" });
+							resolve();
+						},
+					},
+				});
+			}),
+		[dispatch],
+	);
+}
+
 // ============================================================================
 // Hook: useModal
 // ============================================================================
@@ -181,11 +219,11 @@ export function useModal() {
 			});
 		},
 
-		message: (
-			title: string,
-			message: string,
-			variant: "info" | "error" = "info",
-		): Promise<void> => {
+		/**
+		 * Information to read and dismiss. Never a failure: that is `failures`,
+		 * which has the one shape every failure uses.
+		 */
+		message: (title: string, message: string): Promise<void> => {
 			return new Promise((resolve) => {
 				dispatch({
 					type: "SHOW_MODAL",
@@ -193,7 +231,27 @@ export function useModal() {
 						type: "message",
 						title,
 						message,
-						variant,
+						onDismiss: () => {
+							dispatch({ type: "HIDE_MODAL" });
+							resolve();
+						},
+					},
+				});
+			});
+		},
+
+		/**
+		 * The failure popup — see {@link FailureReport}. Resolves once dismissed.
+		 * Use it for anything that did not happen and should have; `message` is
+		 * for information.
+		 */
+		failures: (report: FailureReport): Promise<void> => {
+			return new Promise((resolve) => {
+				dispatch({
+					type: "SHOW_MODAL",
+					modal: {
+						type: "failures",
+						report,
 						onDismiss: () => {
 							dispatch({ type: "HIDE_MODAL" });
 							resolve();
@@ -220,42 +278,6 @@ export function useModal() {
 	};
 }
 
-// ============================================================================
-// Hook: useNotify
-// ============================================================================
-
-export { NOTICE_DURATION_MS };
-
-let nextNoticeId = 0;
-
-/**
- * `notify(text, tone)` puts one line in the app's notice banner (rendered by
- * `NoticeBanner` in ui/App.tsx) and returns at once. It is how a screen or hook
- * reports the result of an action: it never opens a modal, never takes a key,
- * and the line clears itself after {@link NOTICE_DURATION_MS}. Time spent
- * under a modal does not count (see PAUSE_NOTICES in the reducer), so a line
- * posted while a question is on screen is still there once it is answered.
- *
- * Stable across renders, so it is safe in a `useCallback` dependency list.
- */
-export function useNotify(): (text: string, tone?: NoticeTone) => void {
-	const { dispatch } = useApp();
-	return useCallback(
-		(text: string, tone: NoticeTone = "success") => {
-			dispatch({
-				type: "NOTIFY",
-				notice: {
-					id: nextNoticeId++,
-					text,
-					tone,
-					expiresAt: Date.now() + NOTICE_DURATION_MS[tone],
-				},
-			});
-		},
-		[dispatch],
-	);
-}
-
 // ============================================================================
 // Hook: useProgress
 // ============================================================================

package/src/ui/state/DimensionsContext.tsx

@@ -29,8 +29,6 @@ interface DimensionsProviderProps {
 	showProgress?: boolean;
 	/** Whether update banner is visible */
 	showUpdateBanner?: boolean;
-	/** Number of transient banners (recovery, mismatch) currently visible */
-	transientBannerCount?: number;
 }
 
 function calculateDimensions(
@@ -38,7 +36,6 @@ function calculateDimensions(
 	rows: number,
 	showProgress: boolean,
 	showUpdateBanner: boolean,
-	transientBannerCount: number,
 ): Dimensions {
 	const terminalWidth = columns;
 	const terminalHeight = rows;
@@ -47,7 +44,6 @@ function calculateDimensions(
 	let contentHeight = terminalHeight - APP_MARGINS;
 	if (showProgress) contentHeight -= PROGRESS_HEIGHT;
 	if (showUpdateBanner) contentHeight -= 1;
-	contentHeight -= transientBannerCount;
 	contentHeight = Math.max(10, contentHeight); // Minimum 10 lines for full layout
 
 	// Calculate available content width (accounting for padding)
@@ -74,7 +70,6 @@ export function DimensionsProvider({
 	children,
 	showProgress = false,
 	showUpdateBanner = false,
-	transientBannerCount = 0,
 }: DimensionsProviderProps) {
 	const renderer = useRenderer();
 
@@ -84,24 +79,17 @@ export function DimensionsProvider({
 			renderer.height,
 			showProgress,
 			showUpdateBanner,
-			transientBannerCount,
 		),
 	);
 
 	// Handle terminal resize
 	useOnResize((width, height) => {
 		setDimensions(
-			calculateDimensions(
-				width,
-				height,
-				showProgress,
-				showUpdateBanner,
-				transientBannerCount,
-			),
+			calculateDimensions(width, height, showProgress, showUpdateBanner),
 		);
 	});
 
-	// Update when showProgress/showUpdateBanner/transientBannerCount changes
+	// Update when showProgress/showUpdateBanner changes
 	useEffect(() => {
 		setDimensions(
 			calculateDimensions(
@@ -109,16 +97,9 @@ export function DimensionsProvider({
 				renderer.height,
 				showProgress,
 				showUpdateBanner,
-				transientBannerCount,
 			),
 		);
-	}, [
-		renderer.width,
-		renderer.height,
-		showProgress,
-		showUpdateBanner,
-		transientBannerCount,
-	]);
+	}, [renderer.width, renderer.height, showProgress, showUpdateBanner]);
 
 	return (
 		<DimensionsContext.Provider value={dimensions}>

package/src/ui/state/reducer.ts

@@ -1,38 +1,6 @@
-import type { AppAction, AppState, Notice, NoticeTone } from "./types.js";
+import type { AppAction, AppState } from "./types.js";
 import { asyncValue } from "./types.js";
 
-/** How many notice lines the banner shows at once. */
-export const MAX_NOTICES = 4;
-
-/**
- * How long a notice stays. A warning may ask the user to do something, so it
- * gets long enough to read and act on; a success only confirms what happened.
- *
- * Here rather than beside `useNotify`, because RESUME_NOTICES caps a held line
- * at its full duration and the reducer cannot import from the context module
- * that imports it.
- */
-export const NOTICE_DURATION_MS: Record<NoticeTone, number> = {
-	success: 4000,
-	warning: 10000,
-};
-
-/**
- * Add `notice` and keep at most {@link MAX_NOTICES}, dropping successes first.
- *
- * A success only confirms what the screen already shows; a warning may be the
- * one thing telling the user to act. So a burst of lines evicts the oldest
- * success, and the oldest warning goes only when nothing but warnings is left.
- */
-function withNotice(notices: readonly Notice[], notice: Notice): Notice[] {
-	const next = [...notices, notice];
-	while (next.length > MAX_NOTICES) {
-		const success = next.findIndex((n) => n.tone === "success");
-		next.splice(success === -1 ? 0 : success, 1);
-	}
-	return next;
-}
-
 export const initialState: AppState = {
 	// Navigation - start on plugins screen
 	currentRoute: { screen: "plugins" },
@@ -42,8 +10,6 @@ export const initialState: AppState = {
 
 	// Global UI state
 	modal: null,
-	notices: [],
-	noticesPausedAt: null,
 	progress: null,
 	isSearching: false,
 
@@ -70,6 +36,7 @@ export const initialState: AppState = {
 		selectedIndex: 0,
 		servers: { status: "idle" },
 		installedServers: {},
+		changedThisSession: [],
 	},
 
 	mcpRegistry: {
@@ -106,7 +73,6 @@ export const initialState: AppState = {
 		searchQuery: "",
 		snapshot: { status: "idle" },
 		selected: new Set(),
-		status: null,
 		isFilling: false,
 	},
 
@@ -118,7 +84,6 @@ export const initialState: AppState = {
 		selectedIndex: 0,
 		searchQuery: "",
 		data: { status: "idle" },
-		status: null,
 		isApplying: false,
 		// False until the plugin lookup answers, and false again if it fails. Both cases
 		// render the screen as it was before mates existed, which is the honest drawing of
@@ -331,6 +296,16 @@ export function appReducer(state: AppState, action: AppAction): AppState {
 				},
 			};
 
+		case "MCP_SERVER_CHANGED":
+			if (state.mcp.changedThisSession.includes(action.name)) return state;
+			return {
+				...state,
+				mcp: {
+					...state.mcp,
+					changedThisSession: [...state.mcp.changedThisSession, action.name],
+				},
+			};
+
 		// =========================================================================
 		// MCP Registry Screen
 		// =========================================================================
@@ -684,12 +659,6 @@ export function appReducer(state: AppState, action: AppAction): AppState {
 				},
 			};
 
-		case "STYLES_STATUS_SET":
-			return { ...state, styles: { ...state.styles, status: action.status } };
-
-		case "STYLES_STATUS_CLEAR":
-			return { ...state, styles: { ...state.styles, status: null } };
-
 		case "STYLES_FILL_START":
 			return { ...state, styles: { ...state.styles, isFilling: true } };
 
@@ -779,12 +748,6 @@ export function appReducer(state: AppState, action: AppAction): AppState {
 				},
 			};
 
-		case "MODELS_STATUS_SET":
-			return { ...state, models: { ...state.models, status: action.status } };
-
-		case "MODELS_STATUS_CLEAR":
-			return { ...state, models: { ...state.models, status: null } };
-
 		case "MODELS_APPLY_START":
 			return { ...state, models: { ...state.models, isApplying: true } };
 
@@ -814,57 +777,6 @@ export function appReducer(state: AppState, action: AppAction): AppState {
 		case "HIDE_MODAL":
 			return { ...state, modal: null };
 
-		// =========================================================================
-		// Notices
-		// =========================================================================
-		// The same text again replaces the old line rather than stacking a copy,
-		// and only a few are kept: the banner takes rows from the screen, and a
-		// burst must not push the content off the terminal. Which few is
-		// `withNotice`'s call — warnings outlast successes.
-		case "NOTIFY": {
-			const rest = state.notices.filter((n) => n.text !== action.notice.text);
-			return { ...state, notices: withNotice(rest, action.notice) };
-		}
-
-		case "EXPIRE_NOTICES": {
-			// Held behind a modal: nothing runs down, so nothing expires.
-			if (state.noticesPausedAt !== null) return state;
-			const live = state.notices.filter((n) => n.expiresAt > action.now);
-			// Same state when nothing expired, so the timer effect is not re-run.
-			return live.length === state.notices.length
-				? state
-				: { ...state, notices: live };
-		}
-
-		// A modal opened. Only the first pause counts: modal to modal (a confirm
-		// followed by its loading modal) is one uninterrupted hold.
-		case "PAUSE_NOTICES":
-			return state.noticesPausedAt !== null
-				? state
-				: { ...state, noticesPausedAt: action.now };
-
-		// The modal slot emptied: every line gets back the time it spent held.
-		// A line posted DURING the hold would be over-credited by the time
-		// between the pause and its posting, so it is capped at its full
-		// duration from now — which is exactly what it would have had, had it
-		// been posted the moment the modal closed.
-		case "RESUME_NOTICES": {
-			const pausedAt = state.noticesPausedAt;
-			if (pausedAt === null) return state;
-			const held = action.now - pausedAt;
-			return {
-				...state,
-				noticesPausedAt: null,
-				notices: state.notices.map((n) => ({
-					...n,
-					expiresAt: Math.min(
-						n.expiresAt + held,
-						action.now + NOTICE_DURATION_MS[n.tone],
-					),
-				})),
-			};
-		}
-
 		// =========================================================================
 		// Progress
 		// =========================================================================

package/src/ui/state/types.ts

@@ -86,6 +86,35 @@ export interface SelectOption {
 	meta?: string;
 }
 
+/**
+ * What failed, as ONE popup shape every failure report on every screen uses:
+ * the state counted in the headline, one row per thing that failed (or per
+ * group sharing a reason), and — only when every row shares it — the one fix.
+ * Subjects are whatever failed: plugins, marketplaces, skills, files, the
+ * profile. Rendered by `FailureListModal`; built by pure functions
+ * (`ui/adapters/failureReport.ts`), so the words are tested without a renderer.
+ */
+export interface FailureReport {
+	/** The state, counted: "3 plugins were not updated", "claudish was not updated". */
+	headline: string;
+	rows: FailureRow[];
+	/** The one thing to do about ALL of them, or null when they differ. */
+	fix: string | null;
+}
+
+export interface FailureRow {
+	/** What failed — a plugin name, a file, or several sharing the reason. */
+	subject: string;
+	/** Why, in the user's terms. One line: an exception keeps its first line only. */
+	reason: string;
+	/**
+	 * What to do about THIS row, when it differs from the others'. Absent when
+	 * there is none, or when every row shares it — the report's `fix` then says
+	 * it once.
+	 */
+	fix?: string;
+}
+
 export type ModalState =
 	| {
 			type: "confirm";
@@ -123,14 +152,20 @@ export type ModalState =
 	  }
 	| {
 			/**
-			 * A dialog the user dismisses. No "success" variant, deliberately: a
-			 * result the screen already shows needs nothing, and one it does not
-			 * is a notice (see {@link Notice}), which never takes a key.
+			 * Information the user dismisses: help text, a command to run. It has
+			 * no variants, deliberately. A success shows as the new state of the
+			 * screen and needs nothing more; a failure goes in the failure popup
+			 * (`failures`), so every failure reads the same way.
 			 */
 			type: "message";
 			title: string;
 			message: string;
-			variant: "info" | "error";
+			onDismiss: () => void;
+	  }
+	| {
+			/** What failed and why — see {@link FailureReport}. Any key dismisses it. */
+			type: "failures";
+			report: FailureReport;
 			onDismiss: () => void;
 	  }
 	| {
@@ -143,28 +178,6 @@ export type ModalState =
 			screen: Screen;
 	  };
 
-// ============================================================================
-// Notice Types
-// ============================================================================
-
-/** A warning is something the user may need to act on, so it stays longer. */
-export type NoticeTone = "success" | "warning";
-
-/**
- * One line of the app-level notice banner: the result of an action, shown
- * without taking the modal slot or any key, and gone by itself at `expiresAt`.
- */
-export interface Notice {
-	id: number;
-	text: string;
-	tone: NoticeTone;
-	/** Epoch ms after which the banner drops it. */
-	expiresAt: number;
-}
-
-/** A notice as a pure function words it, before `notify` stamps it. */
-export type NoticeLine = Pick<Notice, "text" | "tone">;
-
 // ============================================================================
 // Progress Types
 // ============================================================================
@@ -215,6 +228,13 @@ export interface McpScreenState {
 	selectedIndex: number;
 	servers: AsyncData<McpServer[]>;
 	installedServers: Record<string, boolean>;
+	/**
+	 * Servers added or removed in THIS magus session. A running Claude Code
+	 * reads its MCP configuration at startup, so each of these takes effect
+	 * only after it restarts — a property of the server, shown on its row and
+	 * in its detail rather than said once as a message and lost.
+	 */
+	changedThisSession: string[];
 }
 
 export interface McpRegistryScreenState {
@@ -279,16 +299,6 @@ export interface StylesScreenState {
 	 * style, which is not something a stray Space press should do.
 	 */
 	selected: Set<string>;
-	/**
-	 * The status line's current message, or null for the default line.
-	 *
-	 * App state for the same reason `isFilling` is: `Router` swaps the component
-	 * type on a tab change, so anything held in the screen's own `useState` is
-	 * destroyed by `9 → 1 → 9`. It also stops being cleared on a wall clock —
-	 * the message now survives until the next action replaces it, so the last
-	 * thing you did is still on screen whenever you look.
-	 */
-	status: { text: string; tone: "success" | "error" } | null;
 	/**
 	 * True while a template fill (Claude Code over the whole project) is running.
 	 *
@@ -320,15 +330,6 @@ export interface ModelsScreenState {
 	searchQuery: string;
 	/** Routing status + the config behind it, in one read. */
 	data: AsyncData<ModelsSnapshot>;
-	/**
-	 * The status line's current message, or null for the default line.
-	 *
-	 * App state for the same reason the Styles screen's is: `Router` swaps the
-	 * component type on a tab change, so anything held in the screen's own
-	 * `useState` is destroyed by `0 → 1 → 0`. The message survives until the next
-	 * action replaces it, so the last thing you did is still on screen.
-	 */
-	status: { text: string; tone: "success" | "error" } | null;
 	/**
 	 * True while an apply or a clear is writing.
 	 *
@@ -379,14 +380,6 @@ export interface AppState {
 
 	// Global UI state
 	modal: ModalState | null;
-	/** The notice banner, oldest first. Never occupies the modal slot. */
-	notices: Notice[];
-	/**
-	 * When the notices stopped running down, or null while they run. They are
-	 * held while a modal is open: a line posted under a startup question, or
-	 * just before one, would otherwise expire behind it unread.
-	 */
-	noticesPausedAt: number | null;
 	progress: ProgressState | null;
 	/**
 	 * The current screen's search box has focus. It decides what the box draws
@@ -465,6 +458,8 @@ export type AppAction =
 			installedServers: Record<string, boolean>;
 	  }
 	| { type: "MCP_DATA_ERROR"; error: Error }
+	/** A server was added or removed — it needs a Claude Code restart. */
+	| { type: "MCP_SERVER_CHANGED"; name: string }
 
 	// MCP Registry screen
 	| { type: "MCP_REGISTRY_SET_QUERY"; query: string }
@@ -492,12 +487,6 @@ export type AppAction =
 	| { type: "SHOW_MODAL"; modal: ModalState }
 	| { type: "HIDE_MODAL" }
 
-	// Notices
-	| { type: "NOTIFY"; notice: Notice }
-	| { type: "EXPIRE_NOTICES"; now: number }
-	| { type: "PAUSE_NOTICES"; now: number }
-	| { type: "RESUME_NOTICES"; now: number }
-
 	// Progress
 	| { type: "SHOW_PROGRESS"; state: ProgressState }
 	| { type: "UPDATE_PROGRESS"; state: ProgressState }
@@ -536,11 +525,6 @@ export type AppAction =
 	| { type: "STYLES_DATA_SUCCESS"; snapshot: StylesSnapshot }
 	| { type: "STYLES_DATA_ERROR"; error: Error }
 	| { type: "STYLES_TOGGLE"; id: string }
-	| {
-			type: "STYLES_STATUS_SET";
-			status: { text: string; tone: "success" | "error" };
-	  }
-	| { type: "STYLES_STATUS_CLEAR" }
 	| { type: "STYLES_FILL_START" }
 	| { type: "STYLES_FILL_END" }
 	| { type: "STYLES_SET_SELECTION"; ids: string[] }
@@ -557,11 +541,6 @@ export type AppAction =
 	| { type: "MODELS_DATA_LOADING" }
 	| { type: "MODELS_DATA_SUCCESS"; snapshot: ModelsSnapshot }
 	| { type: "MODELS_DATA_ERROR"; error: Error }
-	| {
-			type: "MODELS_STATUS_SET";
-			status: { text: string; tone: "success" | "error" };
-	  }
-	| { type: "MODELS_STATUS_CLEAR" }
 	| { type: "MODELS_APPLY_START" }
 	| { type: "MODELS_APPLY_END" }
 	// Dispatched once, when the plugin lookup behind the mate slots lands.

package/src/utils/user-path.ts

@@ -0,0 +1,60 @@
+/**
+ * A file as the user names it, never as an absolute path.
+ *
+ * magus names a file only when the user must act on it (fix it by hand,
+ * commit it), and then in the words they would type: `~/.claude/settings.json`
+ * for their own settings, `.claude/settings.json` for this project's. The
+ * absolute path is where this machine keeps it — the mechanism, and noise
+ * that pushes the actual problem off the end of the line.
+ */
+
+import os from "node:os";
+import path from "node:path";
+
+/** `true` when `file` is `dir` itself or inside it. */
+function isInside(file: string, dir: string): boolean {
+	const rel = path.relative(dir, file);
+	return rel === "" || (!rel.startsWith("..") && !path.isAbsolute(rel));
+}
+
+/**
+ * `file` in the user's terms:
+ *
+ *  1. Under the user's own `~/.claude/` → `~/.claude/…` (their USER settings),
+ *     checked first so a project opened at the home folder still names it so.
+ *  2. Under the project folder → relative to it: `.claude/settings.json`.
+ *  3. Anywhere else with a `.claude/` folder in its path → from that folder
+ *     on, which is how the user knows a project's settings file.
+ *  4. Under the home folder → `~/…`.
+ *  5. Otherwise its name alone.
+ */
+export function userFacingPath(
+	file: string,
+	projectDir: string = process.cwd(),
+	home: string = os.homedir(),
+): string {
+	const abs = path.resolve(file);
+	const userClaude = home ? path.join(home, ".claude") : "";
+	if (userClaude && isInside(abs, userClaude)) {
+		return `~/${path.relative(home, abs)}`;
+	}
+	if (projectDir && isInside(abs, path.resolve(projectDir))) {
+		const rel = path.relative(path.resolve(projectDir), abs);
+		if (rel) return rel;
+	}
+	const marker = `${path.sep}.claude${path.sep}`;
+	const at = abs.lastIndexOf(marker);
+	if (at >= 0) return abs.slice(at + 1);
+	if (home && isInside(abs, home)) return `~/${path.relative(home, abs)}`;
+	return path.basename(abs);
+}
+
+/** Every occurrence of `file`'s absolute path in `text`, in the user's terms. */
+export function withUserFacingPath(
+	text: string,
+	file: string,
+	projectDir?: string,
+	home?: string,
+): string {
+	return text.split(file).join(userFacingPath(file, projectDir, home));
+}