magus-cli 7.5.1 → 7.5.3

package/src/ui/hooks/useGitignoreModal.ts

@@ -12,19 +12,38 @@ import type { ModalState } from "../state/types.js";
 export interface BuildModalArgs {
 	violationCount: number;
 	safeCount: number;
+	/**
+	 * Files magus generates from `.claude/profiles.json` that git tracks. The
+	 * fix untracks these in place; every other destructive fix stays in the tab.
+	 */
+	generated?: readonly string[];
 	onFixSafe: () => void;
 	onOpenTab: () => void;
 	onDismiss: () => void;
 }
 
+function entries(n: number): string {
+	return `${n} missing .gitignore entr${n === 1 ? "y" : "ies"}`;
+}
+
+function fixLabel(safeCount: number, generated: number): string {
+	if (generated > 0) {
+		const files = `${generated} generated file${generated === 1 ? "" : "s"}`;
+		return safeCount > 0
+			? `Stop tracking ${files} and add ${entries(safeCount)}`
+			: `Stop tracking ${files}`;
+	}
+	return safeCount > 0
+		? `Add ${entries(safeCount)}`
+		: "(no missing .gitignore entries)";
+}
+
 export function buildGitignoreModal(args: BuildModalArgs): ModalState {
 	const { violationCount, safeCount, onFixSafe, onOpenTab, onDismiss } = args;
+	const generated = args.generated ?? [];
 	const options = [
 		{
-			label:
-				safeCount > 0
-					? `Add ${safeCount} missing .gitignore entr${safeCount === 1 ? "y" : "ies"}`
-					: "(no missing .gitignore entries)",
+			label: fixLabel(safeCount, generated.length),
 			value: "fix-safe",
 		},
 		{
@@ -36,10 +55,20 @@ export function buildGitignoreModal(args: BuildModalArgs): ModalState {
 			value: "dismiss",
 		},
 	];
+	const generatedNote =
+		generated.length > 0
+			? `magus generates ${generated.length === 1 ? "this file" : "these files"} from .claude/profiles.json for each developer, so ${
+					generated.length === 1 ? "it is" : "they are"
+				} expected to be gitignored — but git tracks ${generated.length === 1 ? "it" : "them"}:\n${generated
+					.map((p) => `  ${p}`)
+					.join(
+						"\n",
+					)}\n\nThe first choice stops tracking ${generated.length === 1 ? "it" : "them"} (git rm --cached, staged for you to commit) and adds the .gitignore entries.\n\n`
+			: "";
 	return {
 		type: "select",
 		title: "Gitignore violations detected",
-		message: `Found ${violationCount} managed gitignore item(s) that do not match the current repo state.\n\nMissing .gitignore entries can be added now. Items that change git tracking are reviewed and fixed from the Gitignore tab.`,
+		message: `${generatedNote}Found ${violationCount} managed gitignore item(s) that do not match the current repo state.\n\nMissing .gitignore entries can be added now. Other items that change git tracking are reviewed and fixed from the Gitignore tab.`,
 		options,
 		onSelect: (value: string) => {
 			if (value === "fix-safe") onFixSafe();
@@ -58,27 +87,44 @@ export function useGitignoreModal() {
 		(args: {
 			violationCount: number;
 			safeCount: number;
-			onFixSafe: () => Promise<void> | void;
+			generated?: readonly string[];
+			/** Returns what it did, shown before returning to the app. */
+			onFixSafe: () => Promise<string | undefined> | string | undefined;
 		}) => {
 			if (args.violationCount === 0) return;
 			const dismiss = () => dispatch({ type: "HIDE_MODAL" });
 			const modal = buildGitignoreModal({
 				violationCount: args.violationCount,
 				safeCount: args.safeCount,
+				generated: args.generated,
 				onFixSafe: () => {
 					dispatch({ type: "HIDE_MODAL" });
-					void Promise.resolve(args.onFixSafe()).catch((err) => {
-						dispatch({
-							type: "SHOW_MODAL",
-							modal: {
-								type: "message",
-								title: "Safe fixes failed",
-								message: err instanceof Error ? err.message : String(err),
-								variant: "error",
-								onDismiss: dismiss,
-							},
+					void Promise.resolve(args.onFixSafe())
+						.then((report) => {
+							if (!report) return;
+							dispatch({
+								type: "SHOW_MODAL",
+								modal: {
+									type: "message",
+									title: "Gitignore fixed",
+									message: report,
+									variant: "success",
+									onDismiss: dismiss,
+								},
+							});
+						})
+						.catch((err) => {
+							dispatch({
+								type: "SHOW_MODAL",
+								modal: {
+									type: "message",
+									title: "Safe fixes failed",
+									message: err instanceof Error ? err.message : String(err),
+									variant: "error",
+									onDismiss: dismiss,
+								},
+							});
 						});
-					});
 				},
 				onOpenTab: () => {
 					dispatch({ type: "HIDE_MODAL" });

package/src/ui/hooks/useProfileStartupModal.ts

@@ -157,7 +157,11 @@ export function describeFailure(
 	].join("\n");
 }
 
-export function useProfileStartupModal(onQuit: () => void) {
+export function useProfileStartupModal(
+	onQuit: () => void,
+	/** Called once a choice has activated a profile — see App's gitignore re-check. */
+	onActivated?: () => void,
+) {
 	const { state, dispatch } = useApp();
 	const { navigateToScreen } = useNavigation();
 	const projectPath = state.projectPath;
@@ -191,6 +195,7 @@ export function useProfileStartupModal(onQuit: () => void) {
 					onDisplace: (artifact) => moved.push(artifact),
 				})
 					.then((result: ActivationResult) => {
+						onActivated?.();
 						const { profileId, displaced } = result;
 						dispatch({
 							type: "SHOW_MODAL",
@@ -270,7 +275,7 @@ export function useProfileStartupModal(onQuit: () => void) {
 			}
 			ask();
 		},
-		[dispatch, navigateToScreen, projectPath, onQuit],
+		[dispatch, navigateToScreen, projectPath, onQuit, onActivated],
 	);
 
 	return { show };

package/src/ui/screens/PluginsScreen.tsx

@@ -44,7 +44,6 @@ import {
 	fetchPluginContents,
 	fetchPluginSkillDetail,
 } from "../../services/skills-manager.js";
-import { LiveFileRefusal } from "../../services/tracked-live-files.js";
 // The one update implementation, shared with `magus update`. See the header
 // of update-engine.ts for what drifted while the TUI had its own loop.
 import {
@@ -983,11 +982,7 @@ export function PluginsScreen() {
 				fetchData();
 			} catch (error) {
 				modal.hideModal();
-				await modal.message(
-					"Error",
-					error instanceof LiveFileRefusal ? error.message : `Failed: ${error}`,
-					"error",
-				);
+				await modal.message("Error", `Failed: ${error}`, "error");
 			}
 		}
 	};
@@ -1207,11 +1202,7 @@ export function PluginsScreen() {
 			fetchData();
 		} catch (error) {
 			modal.hideModal();
-			await modal.message(
-				"Error",
-				error instanceof LiveFileRefusal ? error.message : `Failed: ${error}`,
-				"error",
-			);
+			await modal.message("Error", `Failed: ${error}`, "error");
 		}
 	};
 

package/src/ui/screens/ProfilesScreen.tsx

@@ -26,7 +26,6 @@ import {
 	renameProfile,
 } from "../../services/profiles.js";
 import { writableMap } from "../../services/settings-file.js";
-import { LiveFileRefusal } from "../../services/tracked-live-files.js";
 import {
 	ClipboardUnavailableError,
 	readClipboard,
@@ -178,9 +177,7 @@ export function ProfilesScreen() {
 			modal.hideModal();
 			await modal.message(
 				"Error",
-				error instanceof LiveFileRefusal
-					? error.message
-					: `Failed to apply profile: ${error}`,
+				`Failed to apply profile: ${error}`,
 				"error",
 			);
 		}
@@ -245,9 +242,7 @@ export function ProfilesScreen() {
 				modal.hideModal();
 				await modal.message(
 					"Error",
-					error instanceof LiveFileRefusal
-						? error.message
-						: `Failed to switch profile: ${error}`,
+					`Failed to switch profile: ${error}`,
 					"error",
 				);
 			}
@@ -280,9 +275,7 @@ export function ProfilesScreen() {
 			modal.hideModal();
 			await modal.message(
 				"Error",
-				error instanceof LiveFileRefusal
-					? error.message
-					: `Failed to apply profile: ${error}`,
+				`Failed to apply profile: ${error}`,
 				"error",
 			);
 		}