magus-cli 7.5.4 → 7.7.0

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

package/src/ui/state/types.ts

@@ -122,10 +122,15 @@ export type ModalState =
 			cancellable?: boolean;
 	  }
 	| {
+			/**
+			 * 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.
+			 */
 			type: "message";
 			title: string;
 			message: string;
-			variant: "info" | "success" | "error";
+			variant: "info" | "error";
 			onDismiss: () => void;
 	  }
 	| {
@@ -138,6 +143,28 @@ 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
 // ============================================================================
@@ -352,6 +379,14 @@ 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
@@ -364,6 +399,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;
@@ -449,6 +492,12 @@ 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 }
@@ -520,4 +569,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" };