magus-cli 7.6.0 → 7.7.0

package/src/services/gitignore-service.ts

@@ -93,25 +93,6 @@ export async function applyStartupFixes(
 	return result;
 }
 
-/** What {@link applyStartupFixes} did, for the message the TUI shows. */
-export function describeStartupFix(result: StartupFixResult): string {
-	const lines: string[] = [];
-	if (result.untracked.length > 0) {
-		lines.push(
-			"Stopped tracking (the removal is staged — commit it):",
-			...result.untracked.map((p) => `  ${p}`),
-			'  git commit -m "Stop tracking generated Claude Code config"',
-		);
-	}
-	if (result.appended.length > 0) {
-		lines.push("Added to .gitignore:", ...result.appended.map((p) => `  ${p}`));
-	}
-	for (const f of result.failed) {
-		lines.push(`Could not untrack ${f.path}: ${f.reason}`);
-	}
-	return lines.length > 0 ? lines.join("\n") : "Nothing needed changing.";
-}
-
 export async function applyAllSafeFixes(
 	cwd: string,
 	violations: Violation[],

package/src/services/profile-absorb.ts

@@ -59,6 +59,7 @@ import { readManifest, writeManifest } from "./manifest.js";
 import { validateModelsConfig } from "./models-core.js";
 import {
 	type ActivateOptions,
+	type ActivationResult,
 	activateProfile,
 	activationNotes,
 	releasedCommittedSkillNote,
@@ -588,6 +589,12 @@ export interface ReconcileResult {
 	conflicts: string[];
 	/** Everything worth printing, in order. */
 	lines: string[];
+	/**
+	 * The re-render, when profiles.json changed and the live config was
+	 * generated again. `lines` already carries its CLI wording; this is for a
+	 * surface that words it differently (the TUI's notices).
+	 */
+	activation: ActivationResult | null;
 }
 
 function emptyResult(profile: string | null): ReconcileResult {
@@ -600,6 +607,7 @@ function emptyResult(profile: string | null): ReconcileResult {
 		unreadable: [],
 		conflicts: [],
 		lines: [],
+		activation: null,
 	};
 }
 
@@ -1529,6 +1537,7 @@ export async function reconcileActiveProfile(
 			// command that ran it reports that once, itself, and repeating it here
 			// printed the same warning three times in one `magus update`.
 			notes.push(...activationNotes(activation, { tracked: false }));
+			result.activation = activation;
 		} catch (error) {
 			result.problems.push(
 				error instanceof Error ? error.message : String(error),

package/src/services/profile-activate.ts

@@ -209,7 +209,8 @@ export function releasedCommittedSkillNote(folder: string): string {
 
 /**
  * Lines describing what activation did beyond the switch itself, phrased for
- * both the terminal and the TUI's outcome modal.
+ * the terminal. The TUI words its own, shorter set (`activationNotices` in
+ * ui/hooks/useProfileStartupModal.ts).
  *
  * `tracked: false` leaves the tracked-path notices out, for the CLI, which
  * prints them itself as a warning with the fix beneath it

package/src/services/profile-startup.ts

@@ -69,7 +69,11 @@ import {
 	findEnclosingManifest,
 	readManifest,
 } from "./manifest.js";
-import type { ProfileChoice } from "./profile-activate.js";
+import {
+	type ActivationResult,
+	type ProfileChoice,
+	activationNotes,
+} from "./profile-activate.js";
 import { freeProfileId } from "./profile-adopt.js";
 import {
 	activeProfile,
@@ -310,7 +314,10 @@ export async function oldFormatNeed(
 /** What the TUI shows at startup, beyond the question (if any). */
 export interface ProfileStartup {
 	need: ProfileStartupNeed;
-	/** One line per thing the gate did: absorbed edits, regeneration, repairs. */
+	/**
+	 * One line per thing the gate did: absorbed edits, regeneration, repairs.
+	 * Not what an activation reported — see `activations`.
+	 */
 	notices: string[];
 	/**
 	 * One line per thing the gate REFUSED — the lines the CLI stops on. Kept
@@ -319,6 +326,14 @@ export interface ProfileStartup {
 	 * still names its profile, so only this says the update did not happen.
 	 */
 	problems: string[];
+	/**
+	 * The activations the gate ran (a re-render, a format update). Handed over
+	 * as results rather than lines because the CLI's lines are the wrong words
+	 * for the TUI: they name plugin.json and backups, and they say "will not
+	 * load" in a line nothing marks as a warning. The TUI words them itself, in
+	 * user terms and with a tone (`activationWarnings` in the startup hook).
+	 */
+	activations: ActivationResult[];
 }
 
 /**
@@ -338,14 +353,24 @@ export async function prepareProfileStartup(
 ): Promise<ProfileStartup> {
 	if (!opts.convert) {
 		const format = await oldFormatNeed(projectPath);
-		if (format !== null) return { need: format, notices: [], problems: [] };
+		if (format !== null) {
+			return { need: format, notices: [], problems: [], activations: [] };
+		}
 	}
 	const notices: string[] = [];
 	const problems: string[] = [];
+	const activations: ActivationResult[] = [];
 	try {
 		const prep = await prepareProfileState(projectPath);
-		notices.push(...prep.lines);
+		// The gate's lines, less the ones its activations contributed: those
+		// reach the TUI as `activations`, and passing both would say the same
+		// thing twice — once in the CLI's words, as if it were a success.
+		const fromActivations = new Set(
+			prep.activations.flatMap((a) => activationNotes(a, { tracked: false })),
+		);
+		notices.push(...prep.lines.filter((line) => !fromActivations.has(line)));
 		problems.push(...prep.problems);
+		activations.push(...prep.activations);
 	} catch (error) {
 		if (!(error instanceof SettingsParseError)) {
 			problems.push(error instanceof Error ? error.message : String(error));
@@ -355,13 +380,17 @@ export async function prepareProfileStartup(
 		need: await detectProfileStartupNeed(projectPath),
 		notices,
 		problems,
+		activations,
 	};
 }
 
-/** What the TUI shows once "Update it now" has run. */
+/**
+ * What the TUI shows once "Update it now" has run: another question, a notice
+ * line, or an error modal.
+ */
 export type FormatUpdateOutcome =
 	| { kind: "ask"; need: ProfileStartupNeed }
-	| { kind: "updated"; title: string; message: string }
+	| { kind: "updated"; notice: string }
 	| { kind: "failed"; title: string; message: string };
 
 /**
@@ -381,14 +410,12 @@ export function formatUpdateOutcome(
 		};
 	}
 	if (!needsNothing(result.need)) return { kind: "ask", need: result.need };
-	return {
-		kind: "updated",
-		title: "Profile format updated",
-		message:
-			result.notices.length > 0
-				? result.notices.join("\n")
-				: "This project now uses the current profile format.",
-	};
+	// One line, not the gate's notices: those are the conversion's working log
+	// (edits carried over, the old format's backup), and the result the user
+	// cares about is only that the update is done. What the conversion's
+	// activation warns about is NOT dropped: the caller words it from
+	// `result.activations`, as it does for any activation.
+	return { kind: "updated", notice: "Profile format updated" };
 }
 
 // ─── What to offer, as data both surfaces render ─────────────────────────────
@@ -426,9 +453,10 @@ export const UPDATE_FORMAT_VALUE = "update-format";
  * Neither mentions the backup, deliberately. A sentence promising "nothing is
  * deleted — the old files are moved to a backup" raises a question the reader
  * did not have (which files? what was at risk?) and implies data loss, when what
- * changes is settings. Where the displaced files went belongs in the outcome
- * modal AFTER the switch, where it is something to act on rather than a worry to
- * plant beforehand.
+ * changes is settings. The TUI does not name the backup afterwards either: the
+ * backup is magus's own storage, and the user acts on nothing there. Only a
+ * failed activation lists what was moved, because then it is something to act
+ * on (see `describeFailure` in ui/hooks/useProfileStartupModal.ts).
  *
  * No file paths in these strings, deliberately. The TUI modal soft-wraps its
  * message at whatever width the terminal gives it, and OpenTUI treats `.` as a

package/src/services/profile-state.ts

@@ -299,6 +299,12 @@ export interface ProfileStatePrep {
 	problems: string[];
 	/** The files behind `problems` that could not be parsed. */
 	unreadable: SettingsParseError[];
+	/**
+	 * Every activation the gate ran, in order: a re-render after profiles.json
+	 * changed, an older layout converted. `lines` already carries them in the
+	 * CLI's words; the TUI words them itself from these.
+	 */
+	activations: ActivationResult[];
 }
 
 /**
@@ -319,11 +325,13 @@ export async function prepareProfileState(
 		lines: [],
 		problems: [],
 		unreadable: [],
+		activations: [],
 	};
 	const take = (r: ReconcileResult) => {
 		out.lines.push(...r.lines.filter((l) => !r.problems.includes(l)));
 		out.problems.push(...r.problems);
 		out.unreadable.push(...r.unreadable);
+		if (r.activation) out.activations.push(r.activation);
 	};
 
 	if (check.state === "active" && check.restored) {
@@ -358,6 +366,7 @@ export async function prepareProfileState(
 			}
 			// Tracked files are the command's to report, once (see profile-absorb).
 			out.lines.push(...activationNotes(result, { tracked: false }));
+			out.activations.push(result);
 		}
 		out.check = { state: "active", profile, restored: false };
 	}