magus-cli 7.6.0 → 7.8.0

package/src/ui/state/AppContext.tsx

@@ -1,9 +1,16 @@
 import type React from "react";
-import { type ReactNode, createContext, useContext, useReducer } from "react";
+import {
+	type ReactNode,
+	createContext,
+	useCallback,
+	useContext,
+	useReducer,
+} from "react";
 import { appReducer, initialState } from "./reducer.js";
 import type {
 	AppAction,
 	AppState,
+	FailureReport,
 	ModalState,
 	ProgressState,
 	Route,
@@ -83,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
 // ============================================================================
@@ -174,11 +219,11 @@ export function useModal() {
 			});
 		},
 
-		message: (
-			title: string,
-			message: string,
-			variant: "info" | "success" | "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",
@@ -186,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();

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

@@ -16,6 +16,9 @@ export const initialState: AppState = {
 	// Refresh counter for triggering data refetch
 	dataRefreshVersion: 0,
 
+	// 0 is the check every open runs; each bump asks for another
+	gitignoreCheckRequest: 0,
+
 	// Screen-specific state
 	plugins: {
 		scope: "project",
@@ -33,6 +36,7 @@ export const initialState: AppState = {
 		selectedIndex: 0,
 		servers: { status: "idle" },
 		installedServers: {},
+		changedThisSession: [],
 	},
 
 	mcpRegistry: {
@@ -69,7 +73,6 @@ export const initialState: AppState = {
 		searchQuery: "",
 		snapshot: { status: "idle" },
 		selected: new Set(),
-		status: null,
 		isFilling: false,
 	},
 
@@ -81,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
@@ -294,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
 		// =========================================================================
@@ -647,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 } };
 
@@ -742,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 } };
 
@@ -801,6 +801,17 @@ export function appReducer(state: AppState, action: AppAction): AppState {
 		case "DATA_REFRESH_COMPLETE":
 			return { ...state, dataRefreshVersion: state.dataRefreshVersion + 1 };
 
+		// One action for both, so no activation path can do one and forget the
+		// other: the screens reload what the profile turned on, and the gitignore
+		// question is asked again, because a first activation is what turns a
+		// committed settings file into a generated one git should not track.
+		case "PROFILE_ACTIVATED":
+			return {
+				...state,
+				dataRefreshVersion: state.dataRefreshVersion + 1,
+				gitignoreCheckRequest: state.gitignoreCheckRequest + 1,
+			};
+
 		default:
 			return state;
 	}

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";
@@ -122,10 +151,21 @@ export type ModalState =
 			cancellable?: boolean;
 	  }
 	| {
+			/**
+			 * 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" | "success" | "error";
+			onDismiss: () => void;
+	  }
+	| {
+			/** What failed and why — see {@link FailureReport}. Any key dismisses it. */
+			type: "failures";
+			report: FailureReport;
 			onDismiss: () => void;
 	  }
 	| {
@@ -188,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 {
@@ -252,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.
 	 *
@@ -293,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.
 	 *
@@ -364,6 +392,14 @@ export interface AppState {
 	// Screens can watch this to know when to refetch data
 	dataRefreshVersion: number;
 
+	/**
+	 * Bumped to ask the app for a fresh gitignore check. The app shell owns the
+	 * check and its question (ui/App.tsx); anything that makes generated files
+	 * appear — a profile activating — asks through this rather than reaching
+	 * into the shell.
+	 */
+	gitignoreCheckRequest: number;
+
 	// Screen-specific state
 	plugins: PluginsScreenState;
 	mcp: McpScreenState;
@@ -422,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 }
@@ -487,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[] }
@@ -508,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.
@@ -520,4 +548,6 @@ export type AppAction =
 	| { type: "MODELS_CATALOG_LOADED"; catalog: CatalogModel[] }
 
 	// Data refresh - triggers screens to refetch
-	| { type: "DATA_REFRESH_COMPLETE" };
+	| { type: "DATA_REFRESH_COMPLETE" }
+	// A profile became active: screens refetch, and the gitignore check re-runs
+	| { type: "PROFILE_ACTIVATED" };

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));
+}

package/src/__tests__/styles-status-line.test.ts

@@ -1,72 +0,0 @@
-import { describe, expect, test } from "bun:test";
-import { appReducer, initialState } from "../ui/state/reducer.js";
-import type { AppAction, AppState } from "../ui/state/types.js";
-
-function run(actions: AppAction[], from: AppState = initialState): AppState {
-	return actions.reduce(appReducer, from);
-}
-
-/**
- * The status line lives in app state, not in the screen.
- *
- * Two bugs drove this, and both were invisible to every test we had:
- *
- *  1. It was cleared on a 5-second wall clock, so the message describing what
- *     you just did was usually gone before you looked at it — and unobservable
- *     to anything sampling the screen a moment later.
- *  2. It was component-local, and `Router` swaps the component type on a tab
- *     change, so `9 → 1 → 9` destroyed it.
- */
-describe("status line state", () => {
-	test("survives leaving the tab and coming back", () => {
-		const shown = run([
-			{
-				type: "STYLES_STATUS_SET",
-				status: { text: "Selection reset to the live style", tone: "success" },
-			},
-		]);
-		expect(shown.styles.status?.text).toBe("Selection reset to the live style");
-
-		// Navigating away and back is what unmounts the screen.
-		const roundTrip = run(
-			[
-				{ type: "NAVIGATE", route: { screen: "plugins" } },
-				{ type: "NAVIGATE", route: { screen: "styles" } },
-			],
-			shown,
-		);
-		expect(roundTrip.styles.status?.text).toBe(
-			"Selection reset to the live style",
-		);
-	});
-
-	test("a new message replaces the previous one", () => {
-		const state = run([
-			{ type: "STYLES_STATUS_SET", status: { text: "first", tone: "success" } },
-			{ type: "STYLES_STATUS_SET", status: { text: "second", tone: "error" } },
-		]);
-		expect(state.styles.status).toEqual({ text: "second", tone: "error" });
-	});
-
-	test("clearing returns the line to its default", () => {
-		const state = run([
-			{ type: "STYLES_STATUS_SET", status: { text: "done", tone: "success" } },
-			{ type: "STYLES_STATUS_CLEAR" },
-		]);
-		expect(state.styles.status).toBeNull();
-	});
-
-	test("starts empty", () => {
-		expect(initialState.styles.status).toBeNull();
-	});
-
-	test("keeps the tone, so an error cannot render as a success", () => {
-		const state = run([
-			{
-				type: "STYLES_STATUS_SET",
-				status: { text: "Already talking to GitHub", tone: "error" },
-			},
-		]);
-		expect(state.styles.status?.tone).toBe("error");
-	});
-});