magus-cli 7.6.0 → 7.8.0

package/src/ui/screens/ProfilesScreen.tsx

@@ -1,8 +1,13 @@
 import React, { useEffect, useCallback } from "react";
+import {
+	activationFailureReport,
+	profileProblemsReport,
+	stepFailureReport,
+} from "../adapters/startupReports.js";
 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, useFailurePopup, useModal } from "../state/AppContext.js";
 import { useDimensions } from "../state/DimensionsContext.js";
 
 import {
@@ -15,7 +20,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 +36,6 @@ import {
 	writeClipboard,
 } from "../../utils/clipboard.js";
 import { ScrollableList } from "../components/ScrollableList.js";
-import { describeOutcome } from "../hooks/useProfileStartupModal.js";
 import {
 	type ProfileListItem,
 	buildProfileListItems,
@@ -45,6 +48,7 @@ export function ProfilesScreen() {
 	const { state, dispatch } = useApp();
 	const { profiles: profilesState } = state;
 	const modal = useModal();
+	const showFailures = useFailurePopup();
 	const dimensions = useDimensions();
 
 	const fetchData = useCallback(async () => {
@@ -165,20 +169,23 @@ 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",
+			// What was recorded is routine and the list shows it; a refusal to
+			// record it is a failure the user has to fix before the merge reaches
+			// the profile.
+			await showFailures(
+				profileProblemsReport(
+					recorded.problems,
+					`"${profile.name}" was merged in, but the active profile does not record it`,
+				),
 			);
 		} catch (error) {
 			modal.hideModal();
-			await modal.message(
-				"Error",
-				`Failed to apply profile: ${error}`,
-				"error",
+			await showFailures(
+				stepFailureReport(
+					`"${profile.name}" was not applied`,
+					profile.name,
+					error,
+				),
 			);
 		}
 	};
@@ -215,35 +222,37 @@ export function ProfilesScreen() {
 					{ onDisplace: () => {} },
 				);
 				modal.hideModal();
-				dispatch({ type: "DATA_REFRESH_COMPLETE" });
 				if (result.problems.length > 0 || !result.activation) {
-					await modal.message(
-						"Could not switch",
-						[...result.lines, ...result.problems].join("\n"),
-						"error",
+					// Nothing activated, but what was recorded on the way may have
+					// changed the list. Each refusal goes into the failure popup, the
+					// file it is about named with what to do.
+					dispatch({ type: "DATA_REFRESH_COMPLETE" });
+					const refused = profileProblemsReport(
+						result.problems.length > 0
+							? result.problems
+							: ["the profile was not activated"],
+						`Did not switch to "${selectedProfile.name}"`,
 					);
+					if (refused) await modal.failures(refused);
 					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.
+				dispatch({ type: "PROFILE_ACTIVATED" });
+				// Switched; what the activation could not do — a plugin that will
+				// not load, a skill that did not install — once it has settled.
+				const report = activationFailureReport([result.activation]);
+				if (report) await modal.failures(report);
 			} catch (error) {
 				modal.hideModal();
-				await modal.message(
-					"Error",
-					`Failed to switch profile: ${error}`,
-					"error",
+				await showFailures(
+					stepFailureReport(
+						`Did not switch to "${selectedProfile.name}"`,
+						selectedProfile.name,
+						error,
+					),
 				);
 			}
 			return;
@@ -266,17 +275,14 @@ 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",
-			);
 		} catch (error) {
 			modal.hideModal();
-			await modal.message(
-				"Error",
-				`Failed to apply profile: ${error}`,
-				"error",
+			await showFailures(
+				stepFailureReport(
+					`"${selectedProfile.name}" was not applied`,
+					"USER",
+					error,
+				),
 			);
 		}
 	};
@@ -301,15 +307,17 @@ 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");
+			await showFailures(
+				stepFailureReport(
+					`"${selectedProfile.name}" was not renamed`,
+					selectedProfile.name,
+					error,
+				),
+			);
 		}
 	};
 
@@ -336,11 +344,17 @@ 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");
+			await showFailures(
+				stepFailureReport(
+					`"${selectedProfile.name}" was not deleted`,
+					selectedProfile.name,
+					error,
+				),
+			);
 		}
 	};
 
@@ -358,21 +372,22 @@ 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",
-				);
 			} catch (err) {
 				if (err instanceof ClipboardUnavailableError) {
-					await modal.message("Profile JSON (copy manually)", json, "info");
+					await modal.message("Profile JSON (copy manually)", json);
 				} else {
 					throw err;
 				}
 			}
 		} catch (error) {
 			modal.hideModal();
-			await modal.message("Error", `Failed to export: ${error}`, "error");
+			await showFailures(
+				stepFailureReport(
+					`"${selectedProfile.name}" was not copied`,
+					selectedProfile.name,
+					error,
+				),
+			);
 		}
 	};
 
@@ -385,7 +400,9 @@ export function ProfilesScreen() {
 			if (err instanceof ClipboardUnavailableError) {
 				json = await modal.input("Import Profile", "Paste profile JSON:");
 			} else {
-				await modal.message("Error", `Clipboard error: ${err}`, "error");
+				await showFailures(
+					stepFailureReport("No profile was imported", "clipboard", err),
+				);
 				return;
 			}
 		}
@@ -409,21 +426,19 @@ 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");
+			await showFailures(
+				stepFailureReport(
+					"No profile was imported",
+					targetScope.toUpperCase(),
+					error,
+				),
+			);
 		}
 	};
 

package/src/ui/screens/SkillsScreen.tsx

@@ -8,11 +8,15 @@ import React, {
 	useState,
 	useRef,
 } from "react";
+import { counted, failureReport } from "../adapters/failureReport.js";
+import { exceptionReason } from "../adapters/pluginsAdapter.js";
+import { stepFailureReport } from "../adapters/startupReports.js";
 import { ScreenLayout } from "../components/layout/index.js";
 import { useScreenKeys, useSearchInput } from "../input/KeyRouter.js";
 import { moveDirection } from "../keymap.js";
-import { useApp, useModal } from "../state/AppContext.js";
+import { useApp, useFailurePopup } from "../state/AppContext.js";
 import { useDimensions } from "../state/DimensionsContext.js";
+import type { FailureRow } from "../state/types.js";
 
 import {
 	DEFAULT_SKILL_REPOS,
@@ -53,7 +57,6 @@ import { theme } from "../theme.js";
 export function SkillsScreen() {
 	const { state, dispatch } = useApp();
 	const { skills: skillsState } = state;
-	const modal = useModal();
 	const dimensions = useDimensions();
 	const [curatedSkills, setCuratedSkills] = useState<RecommendedSkill[]>([]);
 	const [skillSets, setSkillSets] = useState<SkillSetInfo[]>([]);
@@ -181,20 +184,9 @@ export function SkillsScreen() {
 		};
 	}, [skillsState.searchQuery]);
 
-	// Status bar message (auto-clears)
-	const [statusMsg, setStatusMsg] = useState<{
-		text: string;
-		tone: "success" | "error";
-	} | null>(null);
-	const statusTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-	const showStatus = useCallback(
-		(text: string, tone: "success" | "error" = "success") => {
-			setStatusMsg({ text, tone });
-			if (statusTimerRef.current) clearTimeout(statusTimerRef.current);
-			statusTimerRef.current = setTimeout(() => setStatusMsg(null), 3000);
-		},
-		[],
-	);
+	// No status messages: a success shows as the rows' new state, and what
+	// failed goes into the one failure popup.
+	const showFailures = useFailurePopup();
 
 	// ── Disk scan for installed skills ────────────────────────────────────────
 
@@ -214,13 +206,13 @@ export function SkillsScreen() {
 	 * Which skills are on disk, per scope. Never rejects: it runs fire-and-forget
 	 * from effects and after every install, and a rejection there is an
 	 * unhandled one, which ends the app. A directory that exists but cannot be
-	 * read is said on the status line — silently treating it as "no skills
+	 * read goes into the failure popup — silently treating it as "no skills
 	 * installed" would misreport the installed rows.
 	 */
 	const scanDisk = useCallback(async () => {
 		const user = new Map<string, SkillFrontmatter | null>();
 		const project = new Map<string, SkillFrontmatter | null>();
-		const unreadable: string[] = [];
+		const unreadable: FailureRow[] = [];
 		const userDir = path.join(os.homedir(), ".claude", "skills");
 		const projDir = path.join(
 			state.projectPath || process.cwd(),
@@ -242,16 +234,22 @@ export function SkillsScreen() {
 					}
 				}
 			} catch (error) {
-				unreadable.push(
-					`${dir} (${error instanceof Error ? error.message : String(error)})`,
-				);
+				unreadable.push({
+					subject: dir,
+					reason: exceptionReason(
+						error instanceof Error ? error.message : String(error),
+					).reason,
+				});
 			}
 		}
 		setInstalledFromDisk({ user, project, scanned: true });
-		if (unreadable.length > 0) {
-			showStatus(`Could not read ${unreadable.join("; ")}`, "error");
-		}
-	}, [state.projectPath, showStatus]);
+		void showFailures(
+			failureReport(
+				`${counted(unreadable.length, "skills folder")} could not be read`,
+				unreadable,
+			),
+		);
+	}, [state.projectPath, showFailures]);
 
 	// biome-ignore lint/correctness/useExhaustiveDependencies: dataRefreshVersion is the external refresh trigger; bumping it must re-scan the disk even though the body never reads it
 	useEffect(() => {
@@ -347,45 +345,50 @@ export function SkillsScreen() {
 			const set = skillSets.find((s) => s.id === setId);
 			if (!set || !set.loaded) return;
 
+			// Every skill already installed: the rows say so.
 			const toInstall = set.skills.filter((s) => !s.installed);
-			if (toInstall.length === 0) {
-				showStatus(`All ${set.name} skills already installed`);
-				return;
-			}
+			if (toInstall.length === 0) return;
 
-			showStatus(`Installing ${toInstall.length} skills from ${set.name}...`);
-			let installed = 0;
-			let failed = 0;
-			let degraded = 0;
+			dispatch({
+				type: "SHOW_MODAL",
+				modal: {
+					type: "loading",
+					message: `Installing ${toInstall.length} skills from ${set.name}…`,
+				},
+			});
+			const problems: FailureRow[] = [];
 			for (const skill of toInstall) {
 				try {
 					const result = await installSkill(skill, scope, state.projectPath);
-					installed++;
-					if (result.degraded) degraded++;
-				} catch {
-					failed++;
+					// Incomplete is not the same as installed. Say so rather than let
+					// a half-written skill pass as a clean success.
+					if (result.degraded) {
+						problems.push({
+							subject: skill.name,
+							reason: `installed incomplete: ${result.degraded}`,
+						});
+					}
+				} catch (error) {
+					problems.push({
+						subject: skill.name,
+						reason: exceptionReason(
+							error instanceof Error ? error.message : String(error),
+						).reason,
+					});
 				}
 			}
 			await scanDisk();
-			if (failed > 0) {
-				showStatus(
-					`Installed ${installed}/${toInstall.length} (${failed} failed)`,
-					"error",
-				);
-			} else if (degraded > 0) {
-				// Incomplete is not the same as installed. Say so rather than let a
-				// batch of half-written skills report a clean success.
-				showStatus(
-					`Installed ${installed} skills from ${set.name} to ${scope} — ${degraded} incomplete (missing supporting files)`,
-					"error",
-				);
-			} else {
-				showStatus(
-					`Installed ${installed} skills from ${set.name} to ${scope}`,
-				);
-			}
+			dispatch({ type: "HIDE_MODAL" });
+			await showFailures(
+				failureReport(
+					`${counted(problems.length, "skill")} from ${set.name} ${
+						problems.length === 1 ? "was" : "were"
+					} not fully installed`,
+					problems,
+				),
+			);
 		},
-		[skillSets, state.projectPath, scanDisk, showStatus],
+		[skillSets, state.projectPath, scanDisk, showFailures, dispatch],
 	);
 
 	// ── Derived data ──────────────────────────────────────────────────────────
@@ -584,23 +587,29 @@ export function SkillsScreen() {
 					state.projectPath,
 				);
 				await scanDisk(); // Re-scan disk only — no network re-fetch needed
-				const files =
-					result.fileCount === 1 ? "1 file" : `${result.fileCount} files`;
 				// An install that silently dropped supporting files used to report plain
 				// success, so a half-installed skill looked identical to a good one.
 				if (result.degraded) {
-					showStatus(
-						`Installed ${selectedSkill.name} to ${scope} (${files}) — ${result.degraded}`,
-						"error",
+					await showFailures(
+						failureReport(`${selectedSkill.name} was not fully installed`, [
+							{
+								subject: selectedSkill.name,
+								reason: `installed incomplete: ${result.degraded}`,
+							},
+						]),
 					);
-				} else {
-					showStatus(`Installed ${selectedSkill.name} to ${scope} (${files})`);
 				}
 			} catch (error) {
-				showStatus(`Failed: ${error}`, "error");
+				await showFailures(
+					stepFailureReport(
+						`${selectedSkill.name} was not installed`,
+						selectedSkill.name,
+						error,
+					),
+				);
 			}
 		},
-		[selectedSkill, state.projectPath, scanDisk, showStatus],
+		[selectedSkill, state.projectPath, scanDisk, showFailures],
 	);
 
 	const handleUninstall = useCallback(async () => {
@@ -611,11 +620,16 @@ export function SkillsScreen() {
 		try {
 			await uninstallSkill(selectedSkill.name, scope, state.projectPath);
 			await scanDisk(); // Re-scan disk only — no network re-fetch needed
-			showStatus(`Removed ${selectedSkill.name} from ${scope}`);
 		} catch (error) {
-			showStatus(`Failed: ${error}`, "error");
+			await showFailures(
+				stepFailureReport(
+					`${selectedSkill.name} was not removed`,
+					selectedSkill.name,
+					error,
+				),
+			);
 		}
-	}, [selectedSkill, state.projectPath, scanDisk, showStatus]);
+	}, [selectedSkill, state.projectPath, scanDisk, showFailures]);
 
 	// ── Keys ──────────────────────────────────────────────────────────────────
 
@@ -709,19 +723,8 @@ export function SkillsScreen() {
 	).length;
 	const query = skillsState.searchQuery.trim();
 
-	const statusContent = statusMsg ? (
-		<text fg={theme.colors.text}>
-			<span
-				fg={
-					statusMsg.tone === "success"
-						? theme.colors.success
-						: theme.colors.danger
-				}
-			>
-				{statusMsg.text}
-			</span>
-		</text>
-	) : (
+	// The header's state line only — counts and search progress, never a message.
+	const statusContent = (
 		<text fg={theme.colors.text}>
 			<span fg={theme.colors.muted}>Skills: </span>
 			{installedFromDisk.scanned ? (