magus-cli 7.6.0 → 7.7.0

package/src/ui/screens/McpScreen.tsx

@@ -2,7 +2,12 @@ import React, { useEffect, useCallback, useMemo } from "react";
 import { ScreenLayout } from "../components/layout/index.js";
 import { useScreenKeys } from "../input/KeyRouter.js";
 import { moveDirection } from "../keymap.js";
-import { useApp, useModal, useNavigation } from "../state/AppContext.js";
+import {
+	useApp,
+	useModal,
+	useNavigation,
+	useNotify,
+} from "../state/AppContext.js";
 import { useDimensions } from "../state/DimensionsContext.js";
 
 import {
@@ -30,6 +35,7 @@ export function McpScreen() {
 	const { state, dispatch } = useApp();
 	const { mcp } = state;
 	const modal = useModal();
+	const notify = useNotify();
 	const { navigateToScreen } = useNavigation();
 	const dimensions = useDimensions();
 
@@ -69,9 +75,12 @@ export function McpScreen() {
 		}
 	}, [dispatch, state.projectPath]);
 
+	// Load data on mount or when dataRefreshVersion changes — a profile
+	// activating changes what this screen shows.
+	// biome-ignore lint/correctness/useExhaustiveDependencies: dataRefreshVersion is the external refresh trigger; bumping it must re-run the fetch even though the body never reads it
 	useEffect(() => {
 		fetchData();
-	}, [fetchData]);
+	}, [fetchData, state.dataRefreshVersion]);
 
 	const allListItems = useMemo((): McpListItem[] => {
 		if (mcp.servers.status !== "success") return [];
@@ -138,11 +147,7 @@ export function McpScreen() {
 				try {
 					await removeMcpServer(server.name, state.projectPath);
 					modal.hideModal();
-					await modal.message(
-						"Removed",
-						`${server.name} has been removed.`,
-						"success",
-					);
+					// The row turns uninstalled; nothing else to say.
 					fetchData();
 				} catch (error) {
 					modal.hideModal();
@@ -216,11 +221,10 @@ export function McpScreen() {
 		try {
 			await addMcpServer(server.name, config, state.projectPath);
 			modal.hideModal();
-			await modal.message(
-				"Installed",
-				`${server.name} has been configured.\n\nRestart Claude Code to activate.`,
-				"success",
-			);
+			// The row shows it installed; the restart it needs does not show,
+			// and it is something the user has to do — so a warning, which also
+			// stays long enough to be read.
+			notify(`Added ${server.name} — restart Claude Code to use it`, "warning");
 			fetchData();
 		} catch (error) {
 			modal.hideModal();

package/src/ui/screens/PluginsScreen.tsx

@@ -91,7 +91,12 @@ import {
 	renderPluginDetail,
 	renderPluginRow,
 } from "../renderers/pluginRenderers.js";
-import { useApp, useModal, useProgress } from "../state/AppContext.js";
+import {
+	useApp,
+	useModal,
+	useNotify,
+	useProgress,
+} from "../state/AppContext.js";
 import { useDimensions } from "../state/DimensionsContext.js";
 import { asyncValue } from "../state/types.js";
 import { theme } from "../theme.js";
@@ -121,6 +126,7 @@ export function PluginsScreen() {
 	const { plugins: pluginsState } = state;
 	const modal = useModal();
 	const progress = useProgress();
+	const notify = useNotify();
 	const dimensions = useDimensions();
 
 	const isSearchActive =
@@ -558,21 +564,15 @@ export function PluginsScreen() {
 			clearContentDriftCache();
 			progress.hide();
 
-			let message =
-				"Cache refreshed.\n\n" +
-				"To update marketplaces from GitHub, run in Claude Code:\n" +
-				"  /plugin marketplace update\n\n" +
-				"Then refresh magus again with 'r'.";
-
-			if (result.repair.length > 0) {
-				const totalRepaired = result.repair.reduce(
-					(sum, r) => sum + r.repaired.length,
-					0,
-				);
-				message += `\n\nAuto-repaired ${totalRepaired} plugin(s) with missing agents/commands.`;
-			}
-
-			await modal.message("Refreshed", message, "success");
+			const totalRepaired = result.repair.reduce(
+				(sum, r) => sum + r.repaired.length,
+				0,
+			);
+			notify(
+				totalRepaired > 0
+					? `Refreshed — repaired ${totalRepaired} plugin(s) with missing files`
+					: "Refreshed",
+			);
 			fetchData();
 		} catch (error) {
 			progress.hide();
@@ -697,10 +697,9 @@ export function PluginsScreen() {
 			);
 
 			if (!wantToConfigure) {
-				await modal.message(
-					"Skipped Configuration",
-					`You can configure these variables later in the Settings tab (press ${tabKey("settings")}).`,
-					"info",
+				notify(
+					`${serverNames.join(", ")} not configured — set the variables in the Settings tab (press ${tabKey("settings")})`,
+					"warning",
 				);
 				return true;
 			}
@@ -725,10 +724,9 @@ export function PluginsScreen() {
 				);
 
 				if (value === null) {
-					await modal.message(
-						"Configuration Incomplete",
-						`Skipped remaining configuration.\nYou can configure these later in the Settings tab (press ${tabKey("settings")}).`,
-						"info",
+					notify(
+						`${serverNames.join(", ")} partly configured — set the rest in the Settings tab (press ${tabKey("settings")})`,
+						"warning",
 					);
 					return true;
 				}
@@ -807,11 +805,7 @@ export function PluginsScreen() {
 					"error",
 				);
 			} else if (result.installed.length > 0) {
-				await modal.message(
-					"Dependencies Installed",
-					`Installed ${result.installed.length} package(s):\n${result.installed.join(", ")}`,
-					"success",
-				);
+				notify(`Installed ${result.installed.join(", ")}`);
 			}
 		} catch (error) {
 			console.error("Error installing plugin deps:", error);
@@ -1047,13 +1041,8 @@ export function PluginsScreen() {
 			// Ran, exited 0, moved nothing — and the row will not have moved
 			// either. Saying nothing here is what made "press U, press U,
 			// forever": the CLI names the cause, so the screen does too.
-			if (result.unchanged.length > 0) {
-				await modal.message(
-					"No change",
-					reasons.lines(result.unchanged),
-					"info",
-				);
-			}
+			const unchanged = reasons.notice(result.unchanged);
+			if (unchanged) notify(unchanged, "warning");
 			fetchData();
 		} catch (error) {
 			modal.hideModal();
@@ -1121,13 +1110,10 @@ export function PluginsScreen() {
 					"error",
 				);
 			}
-			if (result.unchanged.length > 0) {
-				await modal.message(
-					"No change",
-					reasons.lines(result.unchanged),
-					"info",
-				);
-			}
+			// One line however many were left where they were: a line each
+			// filled the banner and pushed out everything else it had to say.
+			const unchanged = reasons.notice(result.unchanged);
+			if (unchanged) notify(unchanged, "warning");
 			fetchData();
 		} catch (error) {
 			modal.hideModal();
@@ -1278,10 +1264,8 @@ export function PluginsScreen() {
 		try {
 			await saveProfile(name.trim(), enabledPlugins, scope, state.projectPath);
 			modal.hideModal();
-			await modal.message(
-				"Saved",
-				`Profile "${name.trim()}" saved.\nPress ${tabKey("profiles")} to manage profiles.`,
-				"success",
+			notify(
+				`Saved profile "${name.trim()}" at ${scope === "user" ? "USER" : "PROJECT"} scope`,
 			);
 		} catch (error) {
 			modal.hideModal();
@@ -1379,18 +1363,13 @@ export function PluginsScreen() {
 		width: dimensions.terminalWidth,
 		now: nowTick,
 	});
-	// Without a resolved profile, exact pins are unknown here and every row is
-	// judged against "latest". Saying so is what keeps a row that disagrees with
-	// `magus update <profile>` from reading as a contradiction.
+	// Without a resolved profile every row is judged against "latest". That is
+	// not said here: the startup question already tells the user there is no
+	// active profile, and "profile not resolved" was mechanism, not state.
 	const notice = isReloading ? (
 		<text fg={theme.colors.muted}>⟳ Refreshing catalogs from GitHub…</text>
 	) : (
-		(catalogNotice ??
-		(pins === null ? (
-			<text fg={theme.colors.muted}>
-				profile not resolved — states judged against latest
-			</text>
-		) : null))
+		catalogNotice
 	);
 
 	return (

package/src/ui/screens/ProfilesScreen.tsx

@@ -2,7 +2,7 @@ import React, { useEffect, useCallback } from "react";
 import { ScreenLayout } from "../components/layout/index.js";
 import { useScreenKeys } from "../input/KeyRouter.js";
 import { moveDirection } from "../keymap.js";
-import { useApp, useModal } from "../state/AppContext.js";
+import { useApp, useModal, useNotify } from "../state/AppContext.js";
 import { useDimensions } from "../state/DimensionsContext.js";
 
 import {
@@ -15,7 +15,6 @@ import {
 	writeSettings,
 } from "../../services/claude-settings.js";
 import { reconcileActiveProfile } from "../../services/profile-absorb.js";
-import { activationNotes } from "../../services/profile-activate.js";
 import { switchToProfile } from "../../services/profile-state.js";
 import {
 	applyUserProfile,
@@ -32,7 +31,7 @@ import {
 	writeClipboard,
 } from "../../utils/clipboard.js";
 import { ScrollableList } from "../components/ScrollableList.js";
-import { describeOutcome } from "../hooks/useProfileStartupModal.js";
+import { activationNotices } from "../hooks/useProfileStartupModal.js";
 import {
 	type ProfileListItem,
 	buildProfileListItems,
@@ -45,6 +44,7 @@ export function ProfilesScreen() {
 	const { state, dispatch } = useApp();
 	const { profiles: profilesState } = state;
 	const modal = useModal();
+	const notify = useNotify();
 	const dimensions = useDimensions();
 
 	const fetchData = useCallback(async () => {
@@ -165,14 +165,10 @@ export function ProfilesScreen() {
 			const recorded = await reconcileActiveProfile(state.projectPath);
 			modal.hideModal();
 			dispatch({ type: "DATA_REFRESH_COMPLETE" });
-			await modal.message(
-				"Applied",
-				[
-					`Profile "${profile.name}" merged into project settings.`,
-					...recorded.lines,
-				].join("\n"),
-				"success",
-			);
+			notify(`Merged "${profile.name}" into this project`);
+			// What was recorded is routine; a refusal to record it is not, and
+			// the user has to fix it before the merge reaches the profile.
+			for (const problem of recorded.problems) notify(problem, "warning");
 		} catch (error) {
 			modal.hideModal();
 			await modal.message(
@@ -215,8 +211,10 @@ export function ProfilesScreen() {
 					{ onDisplace: () => {} },
 				);
 				modal.hideModal();
-				dispatch({ type: "DATA_REFRESH_COMPLETE" });
 				if (result.problems.length > 0 || !result.activation) {
+					// Nothing activated, but what was recorded on the way may have
+					// changed the list.
+					dispatch({ type: "DATA_REFRESH_COMPLETE" });
 					await modal.message(
 						"Could not switch",
 						[...result.lines, ...result.problems].join("\n"),
@@ -224,20 +222,16 @@ export function ProfilesScreen() {
 					);
 					return;
 				}
-				const outcome = describeOutcome(
-					result.activation.profileId,
-					result.activation.displaced,
-					state.projectPath,
-					false,
-					activationNotes(result.activation),
-				);
-				await modal.message(
-					"Profile active",
-					result.lines.length > 0
-						? `${result.lines.join("\n")}\n\n${outcome}`
-						: outcome,
-					"success",
-				);
+				// The same signal as the startup question: every screen reloads,
+				// and the app re-runs its gitignore check — the profile switched
+				// to may generate files git still tracks, and that question is how
+				// the user hears of them (activationNotices leaves them out).
+				dispatch({ type: "PROFILE_ACTIVATED" });
+				// `result.lines` (edits saved into the profile left behind) are not
+				// repeated: the confirmation above already said that happens.
+				for (const line of activationNotices(result.activation)) {
+					notify(line.text, line.tone);
+				}
 			} catch (error) {
 				modal.hideModal();
 				await modal.message(
@@ -266,11 +260,7 @@ export function ProfilesScreen() {
 			await applyUserProfile(selectedProfile);
 			modal.hideModal();
 			dispatch({ type: "DATA_REFRESH_COMPLETE" });
-			await modal.message(
-				"Applied",
-				`Profile "${selectedProfile.name}" applied to ~/.claude/settings.json.`,
-				"success",
-			);
+			notify(`Applied "${selectedProfile.name}" at USER scope`);
 		} catch (error) {
 			modal.hideModal();
 			await modal.message(
@@ -301,12 +291,8 @@ export function ProfilesScreen() {
 				state.projectPath,
 			);
 			modal.hideModal();
+			// The row shows the new name; nothing else to say.
 			await fetchData();
-			await modal.message(
-				"Renamed",
-				`Profile renamed to "${newName.trim()}".`,
-				"success",
-			);
 		} catch (error) {
 			modal.hideModal();
 			await modal.message("Error", `Failed to rename: ${error}`, "error");
@@ -336,8 +322,8 @@ export function ProfilesScreen() {
 				Math.min(profilesState.selectedIndex, allItems.length - 2),
 			);
 			dispatch({ type: "PROFILES_SELECT", index: newIndex });
+			// The row is gone from the list; nothing else to say.
 			await fetchData();
-			await modal.message("Deleted", "Profile deleted.", "success");
 		} catch (error) {
 			modal.hideModal();
 			await modal.message("Error", `Failed to delete: ${error}`, "error");
@@ -358,10 +344,8 @@ export function ProfilesScreen() {
 			modal.hideModal();
 			try {
 				await writeClipboard(json);
-				await modal.message(
-					"Copied",
-					"Profile JSON copied to clipboard.\nShare it with teammates to import.",
-					"success",
+				notify(
+					`Copied "${selectedProfile.name}" — share it for teammates to import`,
 				);
 			} catch (err) {
 				if (err instanceof ClipboardUnavailableError) {
@@ -409,18 +393,10 @@ export function ProfilesScreen() {
 
 		modal.loading("Importing...");
 		try {
-			const id = await importProfileFromJson(
-				json,
-				targetScope,
-				state.projectPath,
-			);
+			await importProfileFromJson(json, targetScope, state.projectPath);
 			modal.hideModal();
+			// The imported profile appears in the list; nothing else to say.
 			await fetchData();
-			await modal.message(
-				"Imported",
-				`Profile imported successfully (id: ${id}).`,
-				"success",
-			);
 		} catch (error) {
 			modal.hideModal();
 			await modal.message("Error", `Failed to import: ${error}`, "error");

package/src/ui/state/AppContext.tsx

@@ -1,10 +1,17 @@
 import type React from "react";
-import { type ReactNode, createContext, useContext, useReducer } from "react";
-import { appReducer, initialState } from "./reducer.js";
+import {
+	type ReactNode,
+	createContext,
+	useCallback,
+	useContext,
+	useReducer,
+} from "react";
+import { NOTICE_DURATION_MS, appReducer, initialState } from "./reducer.js";
 import type {
 	AppAction,
 	AppState,
 	ModalState,
+	NoticeTone,
 	ProgressState,
 	Route,
 	Screen,
@@ -177,7 +184,7 @@ export function useModal() {
 		message: (
 			title: string,
 			message: string,
-			variant: "info" | "success" | "error" = "info",
+			variant: "info" | "error" = "info",
 		): Promise<void> => {
 			return new Promise((resolve) => {
 				dispatch({
@@ -213,6 +220,42 @@ 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/reducer.ts

@@ -1,6 +1,38 @@
-import type { AppAction, AppState } from "./types.js";
+import type { AppAction, AppState, Notice, NoticeTone } 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" },
@@ -10,12 +42,17 @@ export const initialState: AppState = {
 
 	// Global UI state
 	modal: null,
+	notices: [],
+	noticesPausedAt: null,
 	progress: null,
 	isSearching: false,
 
 	// 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",
@@ -777,6 +814,57 @@ 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
 		// =========================================================================
@@ -801,6 +889,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;
 	}