Fix config-location migrator eating the user config when project dir is the config home

A project-scope config-location migration could move the USER config aside and
leave the user on schema defaults. The project legacy-source list includes a
bare-root source <root>/magic-context.{jsonc,json} (Magic Context historically
allowed a repo-root config). When a session's project directory IS the CortexKit
user config home (e.g. opencode opened with cwd ~/.config/cortexkit), that
bare-root source resolves to ~/.config/cortexkit/magic-context.jsonc — the user
config itself. The project migration then 'migrated' it into
<root>/.cortexkit/magic-context.jsonc and renamed the original to
.MOVED_READPLEASE, so the user config path went empty and MC ran on defaults.
(Same collision class for a project opened in ~/.config/opencode or ~/.pi/agent,
where bare-root resolves to a user legacy config.)

Fix: filter project-scope legacy sources against the full user-scope path set
(the CortexKit user target in both extensions + the OpenCode/Pi user legacy
paths). A project migration can never move a user-scope file. Pi inherits the
fix automatically (shared resolveLegacyConfigSources from @magic-context/core).
Added two regression tests covering the cortexkit-home and opencode-home cwds.

No data is lost by the original bug (content is preserved at both the misplaced
target and the .MOVED_READPLEASE marker), but the user silently ran on defaults.

Co-authored-by: Alfonso [Magic Context] <288211368+alfonso-magic-context@users.noreply.github.com>

Author: ualtinok

packages/plugin/src/config/migrate-config-location.test.ts

@@ -285,4 +285,48 @@ describe("resolveLegacyConfigSources", () => {
             true,
         );
     });
+
+    it("never lists a user-scope config as a project source when the project dir is the CortexKit config home", () => {
+        // Regression: opencode opened with cwd = ~/.config/cortexkit made the
+        // bare-root project source `<root>/magic-context.jsonc` collide with the
+        // USER config, so the project migration ate the user config into
+        // `<root>/.cortexkit/` and left the user on schema defaults.
+        const prev = process.env.XDG_CONFIG_HOME;
+        const home = tmp();
+        try {
+            process.env.XDG_CONFIG_HOME = home;
+            const cortexkitHome = join(home, "cortexkit");
+            const sources = resolveLegacyConfigSources(cortexkitHome);
+            const projectPaths = sources.project.map((s) => s.path);
+            // The user config path must NOT be a project migration source.
+            expect(projectPaths).not.toContain(join(cortexkitHome, "magic-context.jsonc"));
+            expect(projectPaths).not.toContain(join(cortexkitHome, "magic-context.json"));
+            // The genuine project subdir sources are still present.
+            expect(projectPaths).toContain(join(cortexkitHome, ".opencode", "magic-context.jsonc"));
+            expect(projectPaths).toContain(join(cortexkitHome, ".pi", "magic-context.jsonc"));
+        } finally {
+            if (prev === undefined) delete process.env.XDG_CONFIG_HOME;
+            else process.env.XDG_CONFIG_HOME = prev;
+            rmSync(home, { recursive: true, force: true });
+        }
+    });
+
+    it("never lists the OpenCode/Pi user legacy paths as project sources when the project dir is the user config dir", () => {
+        // Same collision class for a project opened directly in ~/.config/opencode
+        // (bare-root would resolve to the OpenCode user legacy config).
+        const prev = process.env.XDG_CONFIG_HOME;
+        const home = tmp();
+        try {
+            process.env.XDG_CONFIG_HOME = home;
+            const opencodeHome = join(home, "opencode");
+            const sources = resolveLegacyConfigSources(opencodeHome);
+            const projectPaths = sources.project.map((s) => s.path);
+            expect(projectPaths).not.toContain(join(opencodeHome, "magic-context.jsonc"));
+            expect(projectPaths).not.toContain(join(opencodeHome, "magic-context.json"));
+        } finally {
+            if (prev === undefined) delete process.env.XDG_CONFIG_HOME;
+            else process.env.XDG_CONFIG_HOME = prev;
+            rmSync(home, { recursive: true, force: true });
+        }
+    });
 });

packages/plugin/src/config/migrate-config-location.ts

@@ -110,16 +110,44 @@ function legacySourcesForBase(basePath: string, label: string): LegacyConfigSour
     ];
 }
 
+/**
+ * Every user-scope config path the migrator knows: the CortexKit user target
+ * plus the user legacy sources. A project-scope migration must NEVER move any of
+ * these (they are user-scope files, not project files).
+ */
+function userScopeConfigPaths(): Set<string> {
+    return new Set<string>([
+        // The CortexKit user target, both extensions: the bare-root project
+        // source produces `.jsonc` AND `.json`, so exclude both or a stray
+        // `~/.config/cortexkit/magic-context.json` would still be eaten.
+        `${cortexKitUserConfigBasePath()}.jsonc`,
+        `${cortexKitUserConfigBasePath()}.json`,
+        join(configHome(), "opencode", `${CONFIG_FILE_BASENAME}.jsonc`),
+        join(configHome(), "opencode", `${CONFIG_FILE_BASENAME}.json`),
+        join(homeDir(), ".pi", "agent", `${CONFIG_FILE_BASENAME}.jsonc`),
+        join(homeDir(), ".pi", "agent", `${CONFIG_FILE_BASENAME}.json`),
+    ]);
+}
+
 /**
  * The legacy config locations to migrate FROM, by scope. Each base produces a
  * `.jsonc` and a `.json` candidate; whichever exists migrates, target is always
  * `.jsonc`. The bare-root project source (`<root>/magic-context.*`) is unique to
  * Magic Context (AFT never had it) — omitting it would orphan repo-root configs.
+ *
+ * Project sources are filtered against the user-scope path set: when a session's
+ * project directory IS the user config home (e.g. opencode opened in
+ * `~/.config/cortexkit`), the bare-root project source `<root>/magic-context.jsonc`
+ * resolves to the USER config path. Without this guard the project migration
+ * would "migrate" the user's own config into `<root>/.cortexkit/` and rename the
+ * original aside, leaving the user on schema defaults (the config-eats-itself
+ * bug). A project migration must never touch a user-scope file.
  */
 export function resolveLegacyConfigSources(directory: string): {
     user: LegacyConfigSource[];
     project: LegacyConfigSource[];
 } {
+    const userPaths = userScopeConfigPaths();
     return {
         user: [
             ...legacySourcesForBase(
@@ -138,7 +166,7 @@ export function resolveLegacyConfigSources(directory: string): {
                 "OpenCode project",
             ),
             ...legacySourcesForBase(join(directory, ".pi", CONFIG_FILE_BASENAME), "Pi project"),
-        ],
+        ].filter((source) => !userPaths.has(source.path)),
     };
 }