magus-cli 7.4.0 → 7.5.0

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

@@ -3,8 +3,14 @@ import { mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import fs from "fs-extra";
-import { listProfiles, showProfile, switchProfile } from "../cli/profile.js";
-import { activeProfile } from "../services/symlink-manager.js";
+import {
+	listProfiles,
+	runProfileCommand,
+	showProfile,
+	switchProfile,
+} from "../cli/profile.js";
+import { readManifest } from "../services/manifest.js";
+import { activeProfile, writeActiveMarker } from "../services/profile-live.js";
 import type { ProfileManifest } from "../types/index.js";
 
 let logs: string[];
@@ -18,19 +24,10 @@ beforeEach(() => {
 });
 afterEach(() => mock.restore());
 
-async function setupProject(
-	manifest: ProfileManifest,
-	materialize: string[] = [],
-): Promise<string> {
+async function setupProject(manifest: ProfileManifest): Promise<string> {
 	const dir = await mkdtemp(join(tmpdir(), "profcmd-"));
 	await fs.ensureDir(join(dir, ".claude"));
 	await fs.writeJson(join(dir, ".claude", "profiles.json"), manifest);
-	for (const name of materialize) {
-		const pd = join(dir, ".claude", "_profiles", name);
-		await fs.ensureDir(pd);
-		await fs.writeJson(join(pd, "settings.json"), { which: name });
-		await fs.writeJson(join(pd, "mcp.json"), { mcpServers: {} });
-	}
 	return dir;
 }
 
@@ -38,7 +35,7 @@ const twoProfiles: ProfileManifest = {
 	version: 2,
 	profiles: {
 		frontend: { name: "Frontend", plugins: { "dev@magus": "latest" } },
-		backend: { name: "Backend", plugins: { "dev@magus": "2.9.0" } },
+		backend: { name: "Backend", plugins: { "terminal@magus": "2.9.0" } },
 	},
 };
 
@@ -48,18 +45,41 @@ describe("profile list", () => {
 		if (dir) await rm(dir, { recursive: true, force: true });
 	});
 
-	test("lists profiles, marks (not installed) and the active one", async () => {
-		dir = await setupProject(twoProfiles, ["frontend"]);
-		await switchProfile("frontend", dir); // activate
+	test("lists profiles and marks the active one", async () => {
+		dir = await setupProject(twoProfiles);
+		await switchProfile("frontend", dir);
 		logs = [];
-		const code = await listProfiles(dir);
-		expect(code).toBe(0);
+		expect(await listProfiles(dir)).toBe(0);
 		const out = logs.join("\n");
-		expect(out).toContain("frontend");
+		expect(out).toContain("● frontend");
 		expect(out).toContain("Backend");
-		expect(out).toContain("(not installed)"); // backend isn't materialized
 		expect(out).toContain("Active: frontend");
 	});
+
+	test("a recorded profile the manifest no longer defines is named, with the fix", async () => {
+		dir = await setupProject(twoProfiles);
+		await writeActiveMarker(
+			{ version: 1, profile: "gone", files: {}, skills: {} },
+			dir,
+		);
+		expect(await listProfiles(dir)).toBe(0);
+		// No default and two profiles: `<name>`, with the choices spelled out.
+		expect(logs.join("\n")).toContain(
+			'recorded as "gone", which is not defined above. Run: `magus profile switch <name>` (profiles: frontend, backend)',
+		);
+	});
+
+	test("the fix names the declared default, never a real name in angle brackets", async () => {
+		dir = await setupProject({ ...twoProfiles, default: "backend" });
+		await writeActiveMarker(
+			{ version: 1, profile: "gone", files: {}, skills: {} },
+			dir,
+		);
+		expect(await listProfiles(dir)).toBe(0);
+		const out = logs.join("\n");
+		expect(out).toContain("Run: `magus profile switch backend`");
+		expect(out).not.toContain("<backend>");
+	});
 });
 
 describe("profile show", () => {
@@ -70,9 +90,8 @@ describe("profile show", () => {
 
 	test("prints a resolved closure summary", async () => {
 		dir = await setupProject(twoProfiles);
-		const code = await showProfile("backend", dir);
-		expect(code).toBe(0);
-		expect(logs.join("\n")).toContain("dev@magus@2.9.0");
+		expect(await showProfile("backend", dir)).toBe(0);
+		expect(logs.join("\n")).toContain("terminal@magus@2.9.0");
 	});
 
 	test("unknown profile → exit 1", async () => {
@@ -87,20 +106,51 @@ describe("profile switch", () => {
 		if (dir) await rm(dir, { recursive: true, force: true });
 	});
 
-	test("switches when materialized and records the active profile", async () => {
-		dir = await setupProject(twoProfiles, ["frontend", "backend"]);
+	test("switches and records the active profile", async () => {
+		dir = await setupProject(twoProfiles);
 		expect(await switchProfile("backend", dir)).toBe(0);
 		expect(await activeProfile(dir)).toBe("backend");
-		// gitignore got the _profiles entry
-		expect(await fs.readFile(join(dir, ".gitignore"), "utf8")).toContain(
-			".claude/_profiles/",
+		const gitignore = await fs.readFile(join(dir, ".gitignore"), "utf8");
+		expect(gitignore).toContain(".claude/profiles/");
+		expect(gitignore).not.toContain(".claude/_profiles/");
+	});
+
+	test("Claude Code's edits go into the profile being left; nothing is backed up", async () => {
+		dir = await setupProject(twoProfiles);
+		expect(await switchProfile("frontend", dir)).toBe(0);
+		const live = join(dir, ".claude", "settings.json");
+		const settings = await fs.readJson(live);
+		settings.enabledPlugins["code-search@magus"] = true;
+		await fs.writeFile(live, JSON.stringify(settings));
+
+		logs = [];
+		expect(await switchProfile("backend", dir)).toBe(0);
+
+		expect(logs.join("\n")).toContain(
+			'Added code-search@magus to profile "frontend"',
+		);
+		const manifest = await readManifest(dir);
+		expect(manifest.profiles.frontend?.plugins?.["code-search@magus"]).toBe(
+			"latest",
+		);
+		expect((await fs.readJson(live)).enabledPlugins["terminal@magus"]).toBe(
+			true,
+		);
+		expect(logs.some((l) => l.includes("kept at"))).toBe(false);
+		expect(await fs.pathExists(join(dir, ".claude", ".magus-backups"))).toBe(
+			false,
 		);
 	});
 
-	test("refuses to switch to a profile that isn't installed", async () => {
-		dir = await setupProject(twoProfiles, ["frontend"]);
-		expect(await switchProfile("backend", dir)).toBe(1);
-		expect(errs.join("\n")).toContain("magus install backend");
+	test("switching back and forth backs nothing up", async () => {
+		dir = await setupProject(twoProfiles);
+		await switchProfile("frontend", dir);
+		await switchProfile("backend", dir);
+		await switchProfile("frontend", dir);
+		expect(logs.some((l) => l.includes("kept at"))).toBe(false);
+		expect(await fs.pathExists(join(dir, ".claude", ".magus-backups"))).toBe(
+			false,
+		);
 	});
 
 	test("unknown profile → exit 1", async () => {
@@ -108,3 +158,11 @@ describe("profile switch", () => {
 		expect(await switchProfile("ghost", dir)).toBe(1);
 	});
 });
+
+describe("profile sync is gone", () => {
+	test("is an unknown subcommand", async () => {
+		expect(await runProfileCommand(["sync"])).toBe(1);
+		expect(errs.join("\n")).toContain('Unknown profile command "sync"');
+		expect(errs.join("\n")).not.toContain("| sync");
+	});
+});

package/src/__tests__/profile-migration-offer.test.ts

@@ -1,8 +1,8 @@
 /**
  * The CLI gate: no active profile, no command.
  *
- * This replaces `offerAdoptionOnDrift`, which asked only when the manifest had
- * drifted from `enabledPlugins`, let the user decline, and then let `magus
+ * This replaces the old adoption offer, which asked only when the manifest
+ * disagreed with `enabledPlugins`, let the user decline, and then let `magus
  * update` carry on with a profile "for this run only" — resolving against a
  * manifest the project was not running. Two worlds live at once.
  *
@@ -19,8 +19,8 @@ import { join } from "node:path";
 import fs from "fs-extra";
 import { requireActiveProfile } from "../cli/bootstrap.js";
 import { runUpdateCommand } from "../cli/update.js";
-import { materializeAndActivate } from "../services/profile-activate.js";
-import { activeProfile } from "../services/symlink-manager.js";
+import { activateProfile } from "../services/profile-activate.js";
+import { activeProfile } from "../services/profile-live.js";
 import type { ProfileManifest } from "../types/index.js";
 
 const MANIFEST: ProfileManifest = {
@@ -82,9 +82,9 @@ describe("requireActiveProfile", () => {
 
 		await requireActiveProfile(project, MANIFEST);
 
-		// No profile materialized, no backups taken, settings left exactly as it
+		// No profile activated, no backups taken, settings left exactly as it
 		// was: a refusal is not allowed to half-migrate anything.
-		expect(await fs.pathExists(join(project, ".claude", "_profiles"))).toBe(
+		expect(await fs.pathExists(join(project, ".claude", "profiles"))).toBe(
 			false,
 		);
 		expect(
@@ -112,14 +112,16 @@ describe("requireActiveProfile", () => {
 		expect(
 			await requireActiveProfile(project, MANIFEST, { check: true }),
 		).toBeNull();
-		expect(await fs.pathExists(join(project, ".claude", "_profiles"))).toBe(
+		expect(await fs.pathExists(join(project, ".claude", "profiles"))).toBe(
 			false,
 		);
 	});
 
 	test("passes straight through when a profile IS active", async () => {
 		await fs.outputJson(join(project, ".claude", "profiles.json"), MANIFEST);
-		await materializeAndActivate(MANIFEST, "lean", project, () => {});
+		await activateProfile(MANIFEST, "lean", project, {
+			onDisplace: () => {},
+		});
 		noTTY();
 
 		// No prompt, no refusal: the one state where there is nothing to ask.
@@ -166,7 +168,7 @@ describe("requireActiveProfile", () => {
 	test("--dry-run writes nothing and exits 0", async () => {
 		// `--dry-run` promises to write nothing and exit 0. An earlier version
 		// passed only `check: flags.check`, so a dry run reached `autoActivate`,
-		// wrote symlinks and appended to the TRACKED `.gitignore`. A preview that
+		// wrote config files and appended to the TRACKED `.gitignore`. A preview that
 		// mutates the repo is not a preview. Refusing is the right outcome, and
 		// for a preview it is not a failure — hence 0, where `--check` gives 1.
 		await fs.outputJson(join(project, ".claude", "profiles.json"), {
@@ -189,7 +191,7 @@ describe("requireActiveProfile", () => {
 		}
 
 		expect(await activeProfile(project)).toBeNull();
-		expect(await fs.pathExists(join(project, ".claude", "_profiles"))).toBe(
+		expect(await fs.pathExists(join(project, ".claude", "profiles"))).toBe(
 			false,
 		);
 		expect(await fs.pathExists(join(project, ".gitignore"))).toBe(false);
@@ -199,11 +201,12 @@ describe("requireActiveProfile", () => {
 		// The gate must not consult enabledPlugins. A project running a profile is
 		// usable regardless of what its generated settings currently say.
 		await fs.outputJson(join(project, ".claude", "profiles.json"), MANIFEST);
-		await materializeAndActivate(MANIFEST, "lean", project, () => {});
-		await fs.outputJson(
-			join(project, ".claude", "_profiles", "lean", "settings.json"),
-			{ enabledPlugins: { "something-else@magus": true } },
-		);
+		await activateProfile(MANIFEST, "lean", project, {
+			onDisplace: () => {},
+		});
+		await fs.outputJson(join(project, ".claude", "settings.json"), {
+			enabledPlugins: { "something-else@magus": true },
+		});
 		noTTY();
 
 		expect(await requireActiveProfile(project, MANIFEST)).not.toBeNull();