magus-cli 7.4.0 → 7.5.0

package/src/ui/screens/ProfilesScreen.tsx

@@ -14,8 +14,11 @@ import {
 	readSettings,
 	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 {
-	applyProfile,
+	applyUserProfile,
 	deleteProfile,
 	exportProfileToJson,
 	importProfileFromJson,
@@ -29,6 +32,7 @@ import {
 	writeClipboard,
 } from "../../utils/clipboard.js";
 import { ScrollableList } from "../components/ScrollableList.js";
+import { describeOutcome } from "../hooks/useProfileStartupModal.js";
 import {
 	type ProfileListItem,
 	buildProfileListItems,
@@ -156,11 +160,17 @@ export function ProfilesScreen() {
 				}
 			}
 			await writeSettings(settings, state.projectPath);
+			// In a profiled project the merge is a change to the active profile:
+			// record it there now, rather than at the next magus command.
+			const recorded = await reconcileActiveProfile(state.projectPath);
 			modal.hideModal();
 			dispatch({ type: "DATA_REFRESH_COMPLETE" });
 			await modal.message(
 				"Applied",
-				`Profile "${profile.name}" merged into project settings.`,
+				[
+					`Profile "${profile.name}" merged into project settings.`,
+					...recorded.lines,
+				].join("\n"),
 				"success",
 			);
 		} catch (error) {
@@ -173,28 +183,71 @@ export function ProfilesScreen() {
 		}
 	};
 
+	/**
+	 * Apply a saved profile.
+	 *
+	 * A PROJECT profile is switched to, through the same path as `magus profile
+	 * switch`: what was changed in the live config goes into the profile being
+	 * left, then this one is rendered. Writing its enabledPlugins straight into
+	 * `.claude/settings.json` made the apply invisible to the profile and undone
+	 * by the next render.
+	 *
+	 * A USER-scope profile is a template in `~/.claude/profiles.json` and applies
+	 * to `~/.claude/settings.json` only — never to this project's live files,
+	 * which belong to its active profile.
+	 */
 	const handleApply = async () => {
 		if (selectedItem?.kind !== "saved") return;
 		const selectedProfile = selectedItem.entry;
 
-		const scopeChoice = await modal.select(
-			"Apply Profile",
-			`Apply "${selectedProfile.name}" to which scope?`,
-			[
-				{ label: "User — ~/.claude/settings.json (global)", value: "user" },
-				{
-					label: "Project — .claude/settings.json (this project)",
-					value: "project",
-				},
-			],
-		);
-		if (scopeChoice === null) return;
+		if (selectedProfile.scope === "project") {
+			const confirmed = await modal.confirm(
+				"Switch profile",
+				`Make "${selectedProfile.name}" this project's active profile?\n\nIts plugins, MCP servers, model routing and skills replace the current ones. Anything changed in the current config is saved into the profile you are leaving first.`,
+			);
+			if (!confirmed) return;
 
-		const targetScope = scopeChoice as "user" | "project";
-		const scopeLabel =
-			targetScope === "user"
-				? "~/.claude/settings.json"
-				: ".claude/settings.json";
+			modal.loading(`Switching to "${selectedProfile.name}"...`);
+			try {
+				const result = await switchToProfile(
+					state.projectPath,
+					selectedProfile.id,
+					{ 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",
+					);
+					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",
+				);
+			} catch (error) {
+				modal.hideModal();
+				await modal.message(
+					"Error",
+					`Failed to switch profile: ${error}`,
+					"error",
+				);
+			}
+			return;
+		}
 
 		const pluginCount = Object.keys(selectedProfile.plugins ?? {}).length;
 		const emptyWarning =
@@ -204,23 +257,18 @@ export function ProfilesScreen() {
 
 		const confirmed = await modal.confirm(
 			"Confirm Apply",
-			`This will REPLACE all enabledPlugins in ${scopeLabel}.${emptyWarning}\n\nContinue?`,
+			`This will REPLACE all enabledPlugins in ~/.claude/settings.json (every project on this machine).${emptyWarning}\n\nContinue?`,
 		);
 		if (!confirmed) return;
 
 		modal.loading(`Applying "${selectedProfile.name}"...`);
 		try {
-			await applyProfile(
-				selectedProfile.id,
-				selectedProfile.scope,
-				targetScope,
-				state.projectPath,
-			);
+			await applyUserProfile(selectedProfile);
 			modal.hideModal();
 			dispatch({ type: "DATA_REFRESH_COMPLETE" });
 			await modal.message(
 				"Applied",
-				`Profile "${selectedProfile.name}" applied to ${scopeLabel}.`,
+				`Profile "${selectedProfile.name}" applied to ~/.claude/settings.json.`,
 				"success",
 			);
 		} catch (error) {

package/src/ui/screens/StylesScreen.tsx

@@ -535,7 +535,8 @@ export function StylesScreen() {
 				? `profile "${result.profile}"`
 				: "this project";
 			// Say plainly when the manifest was NOT updated: without that record a
-			// `magus install` re-materializes settings.json and drops the style.
+			// the next activation renders settings.json from the manifest and
+			// drops the style.
 			const durability =
 				result.profile && !result.recordedInManifest
 					? " — not in profiles.json, so `magus install` will drop it"

package/src/ui/state/types.ts

@@ -306,7 +306,7 @@ export interface ModelsScreenState {
 	 * True while an apply or a clear is writing.
 	 *
 	 * App state, not screen state, because the screen UNMOUNTS on a tab switch.
-	 * An apply rewrites the profile, re-materializes it and registers a hook —
+	 * An apply rewrites the profile, re-renders its live files and registers a hook —
 	 * two of those running at once would interleave writes to the same files.
 	 */
 	isApplying: boolean;

package/src/__tests__/profile-materializer.test.ts

@@ -1,238 +0,0 @@
-import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { mkdtemp, rm } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import fs from "fs-extra";
-import type { ModelsConfig } from "../services/models-core.js";
-import {
-	buildProfileMcp,
-	buildProfileSettings,
-	materializeProfile,
-} from "../services/profile-materializer.js";
-import { profileDir } from "../services/symlink-manager.js";
-import type { ResolvedClosure } from "../types/index.js";
-
-const ROUTING: ModelsConfig = {
-	version: 1,
-	preset: "test",
-	main: { model: "opus", effort: "medium" },
-	grades: {
-		smart: { model: "fable", effort: "xhigh" },
-		normal: { model: "opus", effort: "medium" },
-		cheap: { model: "sonnet", effort: "low" },
-	},
-	agents: { "dev:architect": "smart" },
-	fallback: "normal",
-};
-
-function closure(overrides: Partial<ResolvedClosure> = {}): ResolvedClosure {
-	return {
-		marketplaces: {},
-		plugins: {},
-		mcpServers: {},
-		bins: [],
-		skills: [],
-		settings: {},
-		env: { required: [], optional: [] },
-		...overrides,
-	};
-}
-
-describe("buildProfileSettings", () => {
-	test("enables every resolved plugin and merges declared settings", () => {
-		const s = buildProfileSettings(
-			closure({
-				plugins: { "dev@magus": "2.9.0", "terminal@magus": "latest" },
-				settings: { enableAllProjectMcpServers: true },
-			}),
-		);
-		expect(s.enabledPlugins).toEqual({
-			"dev@magus": true,
-			"terminal@magus": true,
-		});
-		expect(s.enableAllProjectMcpServers).toBe(true);
-	});
-
-	// Regression: `install` enables the manifest-wide union at USER scope, and
-	// Claude Code resolves enabledPlugins per plugin id — an id the project
-	// scope omits falls through to the user scope's `true`. A profile that
-	// merely omits another profile's plugins therefore never disables them, so
-	// `profile switch` silently becomes additive instead of exclusive.
-	test("explicitly disables union plugins the profile excludes", () => {
-		const s = buildProfileSettings(
-			closure({ plugins: { "designer@magus": "latest" } }),
-			["designer@magus", "terminal@magus", "madbench@magus"],
-		);
-		expect(s.enabledPlugins).toEqual({
-			"designer@magus": true,
-			"terminal@magus": false,
-			"madbench@magus": false,
-		});
-	});
-
-	test("a profile's own plugin wins over its union entry", () => {
-		const s = buildProfileSettings(
-			closure({ plugins: { "terminal@magus": "4.1.4" } }),
-			["terminal@magus"],
-		);
-		expect(s.enabledPlugins).toEqual({ "terminal@magus": true });
-	});
-
-	test("no union given -> no false entries (unchanged legacy shape)", () => {
-		const s = buildProfileSettings(
-			closure({ plugins: { "dev@magus": "latest" } }),
-		);
-		expect(s.enabledPlugins).toEqual({ "dev@magus": true });
-	});
-});
-
-describe("buildProfileMcp", () => {
-	test("wraps the closure's mcpServers", () => {
-		const m = buildProfileMcp(
-			closure({ mcpServers: { "chrome-devtools": { command: "npx" } } }),
-		);
-		expect(m.mcpServers["chrome-devtools"]).toEqual({ command: "npx" });
-	});
-});
-
-describe("materializeProfile", () => {
-	let project: string;
-	beforeEach(async () => {
-		project = await mkdtemp(join(tmpdir(), "materialize-"));
-	});
-	afterEach(async () => {
-		await rm(project, { recursive: true, force: true });
-	});
-
-	test("writes settings.json, mcp.json, and an empty skills/ dir", async () => {
-		const dir = await materializeProfile(
-			"frontend",
-			closure({
-				plugins: { "dev@magus": "latest" },
-				mcpServers: { x: { command: "y" } },
-			}),
-			project,
-		);
-		expect(dir).toBe(profileDir("frontend", project));
-		expect(
-			(await fs.readJson(join(dir, "settings.json"))).enabledPlugins[
-				"dev@magus"
-			],
-		).toBe(true);
-		expect(
-			(await fs.readJson(join(dir, "mcp.json"))).mcpServers.x.command,
-		).toBe("y");
-		expect(await fs.pathExists(join(dir, "skills"))).toBe(true);
-	});
-
-	test("is idempotent (re-materialize overwrites cleanly)", async () => {
-		await materializeProfile(
-			"p",
-			closure({ plugins: { "a@m": "latest" } }),
-			project,
-		);
-		const dir = await materializeProfile(
-			"p",
-			closure({ plugins: { "b@m": "latest" } }),
-			project,
-		);
-		const settings = await fs.readJson(join(dir, "settings.json"));
-		expect(settings.enabledPlugins).toEqual({ "b@m": true });
-	});
-
-	// Regression: activating a profile replaces .claude/skills with a symlink,
-	// and replacing means fs.remove first. A repo that committed its own project
-	// skills before adopting profiles would lose them at that moment.
-	test("seeds skills/ from the project's pre-existing .claude/skills", async () => {
-		const src = join(project, ".claude", "skills", "systematic-debugging");
-		await fs.outputFile(join(src, "SKILL.md"), "# committed project skill\n");
-
-		const dir = await materializeProfile("p", closure(), project);
-
-		expect(
-			await fs.readFile(
-				join(dir, "skills", "systematic-debugging", "SKILL.md"),
-				"utf8",
-			),
-		).toContain("committed project skill");
-	});
-
-	test("does not re-seed skills/ once the profile dir exists", async () => {
-		await fs.outputFile(
-			join(project, ".claude", "skills", "gone", "SKILL.md"),
-			"# removed later\n",
-		);
-		const dir = await materializeProfile("p", closure(), project);
-		await fs.remove(join(dir, "skills", "gone"));
-
-		await materializeProfile("p", closure(), project);
-
-		expect(await fs.pathExists(join(dir, "skills", "gone"))).toBe(false);
-	});
-
-	test("still creates an empty skills/ when the project has none", async () => {
-		const dir = await materializeProfile("p", closure(), project);
-		expect(await fs.pathExists(join(dir, "skills"))).toBe(true);
-		expect(await fs.readdir(join(dir, "skills"))).toEqual([]);
-	});
-
-	test("writes models.json when the closure carries routing", async () => {
-		const dir = await materializeProfile(
-			"p",
-			closure({ models: ROUTING }),
-			project,
-		);
-		expect(await fs.readJson(join(dir, "models.json"))).toEqual(ROUTING);
-	});
-
-	// The one artifact materialization DELETES. Every other file here is
-	// unconditional, so overwriting is enough; routing is optional, and a
-	// profile that dropped it would otherwise keep routing from a file nothing
-	// writes any more — `magus models off` could not turn routing off,
-	// because the hook walks up to the nearest models.json and finds this one.
-	test("deletes a stale models.json when the closure has no routing", async () => {
-		const dir = await materializeProfile(
-			"p",
-			closure({ models: ROUTING }),
-			project,
-		);
-		expect(await fs.pathExists(join(dir, "models.json"))).toBe(true);
-
-		await materializeProfile("p", closure(), project);
-
-		expect(await fs.pathExists(join(dir, "models.json"))).toBe(false);
-	});
-
-	test("a profile that never had routing gets no models.json", async () => {
-		const dir = await materializeProfile("p", closure(), project);
-		expect(await fs.pathExists(join(dir, "models.json"))).toBe(false);
-	});
-
-	test("two profiles from one union each disable the other's plugins", async () => {
-		const union = ["designer@magus", "terminal@magus"];
-		const fe = await materializeProfile(
-			"frontend",
-			closure({ plugins: { "designer@magus": "latest" } }),
-			project,
-			union,
-		);
-		const be = await materializeProfile(
-			"backend",
-			closure({ plugins: { "terminal@magus": "latest" } }),
-			project,
-			union,
-		);
-		expect(
-			(await fs.readJson(join(fe, "settings.json"))).enabledPlugins,
-		).toEqual({
-			"designer@magus": true,
-			"terminal@magus": false,
-		});
-		expect(
-			(await fs.readJson(join(be, "settings.json"))).enabledPlugins,
-		).toEqual({
-			"designer@magus": false,
-			"terminal@magus": true,
-		});
-	});
-});

package/src/__tests__/profile-sync.test.ts

@@ -1,154 +0,0 @@
-import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { mkdtemp, rm } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import fs from "fs-extra";
-import { computeSync, syncProfile } from "../services/profile-sync.js";
-import { profileDir } from "../services/symlink-manager.js";
-import type { ProfileManifestEntry } from "../types/index.js";
-
-describe("computeSync (pure)", () => {
-	const entry: ProfileManifestEntry = {
-		name: "Frontend",
-		plugins: { "dev@magus": "2.9.0", "terminal@magus": "latest" },
-		settings: { effortLevel: "high" },
-	};
-
-	test("adds a newly-enabled plugin, preserving existing pins", () => {
-		const { entry: next, changes } = computeSync(
-			entry,
-			{
-				enabledPlugins: {
-					"dev@magus": true,
-					"terminal@magus": true,
-					"designer@magus": true,
-				},
-				effortLevel: "high",
-			},
-			{ mcpServers: {} },
-		);
-		// existing pin preserved (not downgraded to latest)
-		expect(next.plugins!["dev@magus"]).toBe("2.9.0");
-		// new plugin added as latest
-		expect(next.plugins!["designer@magus"]).toBe("latest");
-		expect(changes).toContainEqual({
-			kind: "plugin-added",
-			detail: "designer@magus",
-		});
-	});
-
-	test("removes a plugin that was disabled", () => {
-		const { entry: next, changes } = computeSync(
-			entry,
-			{ enabledPlugins: { "dev@magus": true }, effortLevel: "high" },
-			{ mcpServers: {} },
-		);
-		expect(next.plugins!["terminal@magus"]).toBeUndefined();
-		expect(changes).toContainEqual({
-			kind: "plugin-removed",
-			detail: "terminal@magus",
-		});
-	});
-
-	test("captures a settings change and an mcp change", () => {
-		const { entry: next, changes } = computeSync(
-			entry,
-			{
-				enabledPlugins: { "dev@magus": true, "terminal@magus": true },
-				effortLevel: "max",
-			},
-			{ mcpServers: { "chrome-devtools": { command: "npx" } } },
-		);
-		expect(next.settings!.effortLevel).toBe("max");
-		expect(next.mcpServers!["chrome-devtools"]).toEqual({ command: "npx" });
-		expect(changes.some((c) => c.kind === "settings-changed")).toBe(true);
-		expect(changes.some((c) => c.kind === "mcp-changed")).toBe(true);
-	});
-
-	test("no changes when the materialized state matches the manifest", () => {
-		const { changes } = computeSync(
-			entry,
-			{
-				enabledPlugins: { "dev@magus": true, "terminal@magus": true },
-				effortLevel: "high",
-			},
-			{ mcpServers: {} },
-		);
-		expect(changes).toEqual([]);
-	});
-
-	test("refreshes updatedAt to the injected timestamp when changed", () => {
-		const withStamp: ProfileManifestEntry = { ...entry, updatedAt: "OLD" };
-		const { entry: changed } = computeSync(
-			withStamp,
-			{
-				enabledPlugins: {
-					"dev@magus": true,
-					"terminal@magus": true,
-					"new@magus": true,
-				},
-				effortLevel: "high",
-			},
-			{ mcpServers: {} },
-			"2026-07-27T00:00:00.000Z",
-		);
-		expect(changed.updatedAt).toBe("2026-07-27T00:00:00.000Z");
-
-		// Unchanged sync leaves updatedAt alone.
-		const { entry: same } = computeSync(
-			withStamp,
-			{
-				enabledPlugins: { "dev@magus": true, "terminal@magus": true },
-				effortLevel: "high",
-			},
-			{ mcpServers: {} },
-			"2026-07-27T00:00:00.000Z",
-		);
-		expect(same.updatedAt).toBe("OLD");
-	});
-});
-
-describe("syncProfile (io)", () => {
-	let dir: string;
-	beforeEach(async () => {
-		dir = await mkdtemp(join(tmpdir(), "sync-"));
-		await fs.ensureDir(join(dir, ".claude"));
-		await fs.writeJson(join(dir, ".claude", "profiles.json"), {
-			version: 2,
-			profiles: {
-				frontend: { name: "Frontend", plugins: { "dev@magus": "2.9.0" } },
-			},
-		});
-	});
-	afterEach(async () => {
-		await rm(dir, { recursive: true, force: true });
-	});
-
-	test("promotes an edit in the materialized dir into the manifest file", async () => {
-		// A teammate enabled a new plugin directly in the active profile's settings.
-		const pd = profileDir("frontend", dir);
-		await fs.ensureDir(pd);
-		await fs.writeJson(join(pd, "settings.json"), {
-			enabledPlugins: { "dev@magus": true, "designer@magus": true },
-		});
-		await fs.writeJson(join(pd, "mcp.json"), { mcpServers: {} });
-
-		const { changes, wrote } = await syncProfile("frontend", dir);
-		expect(wrote).toBe(true);
-		expect(changes.some((c) => c.detail === "designer@magus")).toBe(true);
-
-		const manifest = await fs.readJson(join(dir, ".claude", "profiles.json"));
-		expect(manifest.profiles.frontend.plugins["designer@magus"]).toBe("latest");
-		expect(manifest.profiles.frontend.plugins["dev@magus"]).toBe("2.9.0"); // pin kept
-	});
-
-	test("no-op when nothing drifted", async () => {
-		const pd = profileDir("frontend", dir);
-		await fs.ensureDir(pd);
-		await fs.writeJson(join(pd, "settings.json"), {
-			enabledPlugins: { "dev@magus": true },
-		});
-		const { wrote } = await syncProfile("frontend", dir);
-		expect(wrote).toBe(false);
-	});
-});