@cortexkit/magic-context 0.16.1 → 0.16.2

package/dist/index.js

@@ -7888,9 +7888,6 @@ function getMagicContextLogPath() {
   return join(tmpdir(), "magic-context.log");
 }
 function getOpenCodePluginCacheDir() {
-  if (process.platform === "win32") {
-    return join(homedir(), "AppData", "Local", "opencode", "Cache", "packages");
-  }
   const xdg = process.env.XDG_CACHE_HOME || join(homedir(), ".cache");
   return join(xdg, "opencode", "packages");
 }
@@ -10508,12 +10505,13 @@ function addPluginToOpenCodeConfig(configPath, format) {
     log.warn(`Could not parse ${configPath} — skipping to avoid data loss`);
     return;
   }
-  const plugins = existing.plugin ?? [];
-  const hasPlugin = plugins.some((p) => p === PLUGIN_NAME3 || p.startsWith(`${PLUGIN_NAME3}@`));
-  if (!hasPlugin) {
-    plugins.push(PLUGIN_ENTRY2);
+  const rawPlugins = Array.isArray(existing.plugin) ? existing.plugin : [];
+  const hasNpmEntry = rawPlugins.some((p) => matchesPluginEntry(p, PLUGIN_NAME3));
+  const hasDevEntry = rawPlugins.some((p) => isDevPathPluginEntry(p));
+  if (!hasNpmEntry && !hasDevEntry) {
+    rawPlugins.push(PLUGIN_ENTRY2);
   }
-  existing.plugin = plugins;
+  existing.plugin = rawPlugins;
   const compaction = existing.compaction ?? {};
   compaction.auto = false;
   compaction.prune = false;
@@ -10533,12 +10531,13 @@ function addPluginToTuiConfig(configPath, format) {
     log.warn(`Could not parse ${configPath} — skipping to avoid data loss`);
     return;
   }
-  const plugins = existing.plugin ?? [];
-  const hasPlugin = plugins.some((p) => p === PLUGIN_NAME3 || p.startsWith(`${PLUGIN_NAME3}@`));
-  if (!hasPlugin) {
-    plugins.push(PLUGIN_ENTRY2);
+  const rawPlugins = Array.isArray(existing.plugin) ? existing.plugin : [];
+  const hasNpmEntry = rawPlugins.some((p) => matchesPluginEntry(p, PLUGIN_NAME3));
+  const hasDevEntry = rawPlugins.some((p) => isDevPathPluginEntry(p));
+  if (!hasNpmEntry && !hasDevEntry) {
+    rawPlugins.push(PLUGIN_ENTRY2);
   }
-  existing.plugin = plugins;
+  existing.plugin = rawPlugins;
   writeFileSync4(configPath, `${import_comment_json3.stringify(existing, null, 2)}
 `);
 }
@@ -10772,6 +10771,7 @@ var import_comment_json3, PLUGIN_NAME3 = "@cortexkit/opencode-magic-context", PL
 var init_setup_opencode = __esm(() => {
   init_conflict_detector();
   init_conflict_fixer();
+  init_opencode();
   init_opencode_helpers();
   init_paths();
   init_prompts();
@@ -25721,6 +25721,13 @@ var init_magic_context = __esm(() => {
       min_clusters: exports_external.number().min(1).default(3)
     }).default({ enabled: true, min_clusters: 3 }),
     compaction_markers: exports_external.boolean().default(true),
+    system_prompt_injection: exports_external.object({
+      enabled: exports_external.boolean().default(true),
+      skip_signatures: exports_external.array(exports_external.string()).default(["<!-- magic-context: skip -->"])
+    }).default({
+      enabled: true,
+      skip_signatures: ["<!-- magic-context: skip -->"]
+    }),
     compressor: exports_external.object({
       enabled: exports_external.boolean().default(true),
       min_compartment_ratio: exports_external.number().min(100).max(1e4).default(DEFAULT_COMPRESSOR_MIN_COMPARTMENT_RATIO),
@@ -27307,33 +27314,45 @@ async function runDoctor(options = {}) {
     try {
       const raw = readFileSync11(paths.opencodeConfig, "utf-8");
       const config2 = import_comment_json7.parse(raw);
-      const plugins = Array.isArray(config2?.plugin) ? config2.plugin : [];
-      const pluginList = plugins.filter((p) => typeof p === "string");
-      const isDevPathEntry = (p) => p.startsWith("file://") || p.startsWith("/") || p.startsWith("./");
-      const existingIdx = pluginList.findIndex((p) => p === PLUGIN_NAME6 || p.startsWith(`${PLUGIN_NAME6}@`) || isDevPathEntry(p) && p.includes("opencode-magic-context"));
+      const rawPlugins = Array.isArray(config2?.plugin) ? config2.plugin : [];
+      const existingIdx = rawPlugins.findIndex((entry) => matchesPluginEntry(entry, PLUGIN_NAME6) || isDevPathPluginEntry(entry));
       const configName = paths.opencodeConfigFormat === "jsonc" ? "opencode.jsonc" : "opencode.json";
-      if (existingIdx >= 0 && pluginList[existingIdx] === PLUGIN_ENTRY_WITH_VERSION2) {
+      const entryAsString = (entry) => {
+        if (typeof entry === "string")
+          return entry;
+        if (Array.isArray(entry) && typeof entry[0] === "string")
+          return entry[0];
+        return null;
+      };
+      if (existingIdx >= 0 && rawPlugins[existingIdx] === PLUGIN_ENTRY_WITH_VERSION2) {
         pass(`Plugin registered in ${configName}`);
       } else if (existingIdx >= 0) {
-        const oldEntry = pluginList[existingIdx];
-        if (isDevPathEntry(oldEntry)) {
-          pass(`Plugin registered in ${configName} (dev path: ${oldEntry})`);
+        const oldEntry = rawPlugins[existingIdx];
+        const oldEntryStr = entryAsString(oldEntry) ?? "";
+        if (isDevPathPluginEntry(oldEntry)) {
+          pass(`Plugin registered in ${configName} (dev path: ${oldEntryStr})`);
         } else {
-          const isPinned = oldEntry !== PLUGIN_NAME6 && oldEntry !== PLUGIN_ENTRY_WITH_VERSION2 && /^@cortexkit\/opencode-magic-context@\d/.test(oldEntry);
+          const isPinned = oldEntryStr !== PLUGIN_NAME6 && oldEntryStr !== PLUGIN_ENTRY_WITH_VERSION2 && /^@cortexkit\/opencode-magic-context@\d/.test(oldEntryStr);
           if (isPinned && !options.force) {
-            warn(`Plugin pinned to ${oldEntry} in ${configName} — use 'doctor --force' to upgrade`);
+            warn(`Plugin pinned to ${oldEntryStr} in ${configName} — use 'doctor --force' to upgrade`);
           } else {
-            pluginList[existingIdx] = PLUGIN_ENTRY_WITH_VERSION2;
-            config2.plugin = pluginList;
+            if (Array.isArray(oldEntry) && oldEntry.length >= 1) {
+              const replacement = [...oldEntry];
+              replacement[0] = PLUGIN_ENTRY_WITH_VERSION2;
+              rawPlugins[existingIdx] = replacement;
+            } else {
+              rawPlugins[existingIdx] = PLUGIN_ENTRY_WITH_VERSION2;
+            }
+            config2.plugin = rawPlugins;
             writeFileSync9(paths.opencodeConfig, `${import_comment_json7.stringify(config2, null, 2)}
 `);
-            pass(`Upgraded plugin entry in ${configName}: ${oldEntry} → ${PLUGIN_ENTRY_WITH_VERSION2}`);
+            pass(`Upgraded plugin entry in ${configName}: ${oldEntryStr} → ${PLUGIN_ENTRY_WITH_VERSION2}`);
             fixed++;
           }
         }
       } else {
-        pluginList.push(PLUGIN_ENTRY_WITH_VERSION2);
-        config2.plugin = pluginList;
+        rawPlugins.push(PLUGIN_ENTRY_WITH_VERSION2);
+        config2.plugin = rawPlugins;
         writeFileSync9(paths.opencodeConfig, `${import_comment_json7.stringify(config2, null, 2)}
 `);
         pass(`Added plugin to ${configName}`);
@@ -27369,22 +27388,40 @@ async function runDoctor(options = {}) {
     try {
       const tuiRaw = readFileSync11(paths.tuiConfig, "utf-8");
       const tuiConfig = import_comment_json7.parse(tuiRaw);
-      const tuiPlugins = Array.isArray(tuiConfig?.plugin) ? tuiConfig.plugin.filter((p) => typeof p === "string") : [];
-      const tuiIdx = tuiPlugins.findIndex((p) => p === PLUGIN_NAME6 || p.startsWith(`${PLUGIN_NAME6}@`));
+      const tuiRawPlugins = Array.isArray(tuiConfig?.plugin) ? tuiConfig.plugin : [];
+      const tuiIdx = tuiRawPlugins.findIndex((entry) => matchesPluginEntry(entry, PLUGIN_NAME6) || isDevPathPluginEntry(entry));
+      const tuiEntryAsString = (entry) => {
+        if (typeof entry === "string")
+          return entry;
+        if (Array.isArray(entry) && typeof entry[0] === "string")
+          return entry[0];
+        return "";
+      };
       if (tuiIdx >= 0) {
-        const tuiEntry = tuiPlugins[tuiIdx];
-        const tuiPinned = tuiEntry !== PLUGIN_NAME6 && tuiEntry !== PLUGIN_ENTRY_WITH_VERSION2 && /^@cortexkit\/opencode-magic-context@\d/.test(tuiEntry);
-        if (tuiPinned && !options.force) {
-          warn(`TUI plugin pinned to ${tuiEntry} — use 'doctor --force' to upgrade`);
-        } else if (tuiPinned && options.force) {
-          tuiPlugins[tuiIdx] = PLUGIN_ENTRY_WITH_VERSION2;
-          tuiConfig.plugin = tuiPlugins;
-          writeFileSync9(paths.tuiConfig, `${import_comment_json7.stringify(tuiConfig, null, 2)}
-`);
-          pass(`Upgraded TUI plugin: ${tuiEntry} → ${PLUGIN_ENTRY_WITH_VERSION2}`);
-          fixed++;
+        const tuiEntry = tuiRawPlugins[tuiIdx];
+        const tuiEntryStr = tuiEntryAsString(tuiEntry);
+        if (isDevPathPluginEntry(tuiEntry)) {
+          pass(`TUI sidebar plugin configured (dev path: ${tuiEntryStr})`);
         } else {
-          pass("TUI sidebar plugin configured");
+          const tuiPinned = tuiEntryStr !== PLUGIN_NAME6 && tuiEntryStr !== PLUGIN_ENTRY_WITH_VERSION2 && /^@cortexkit\/opencode-magic-context@\d/.test(tuiEntryStr);
+          if (tuiPinned && !options.force) {
+            warn(`TUI plugin pinned to ${tuiEntryStr} — use 'doctor --force' to upgrade`);
+          } else if (tuiPinned && options.force) {
+            if (Array.isArray(tuiEntry) && tuiEntry.length >= 1) {
+              const replacement = [...tuiEntry];
+              replacement[0] = PLUGIN_ENTRY_WITH_VERSION2;
+              tuiRawPlugins[tuiIdx] = replacement;
+            } else {
+              tuiRawPlugins[tuiIdx] = PLUGIN_ENTRY_WITH_VERSION2;
+            }
+            tuiConfig.plugin = tuiRawPlugins;
+            writeFileSync9(paths.tuiConfig, `${import_comment_json7.stringify(tuiConfig, null, 2)}
+`);
+            pass(`Upgraded TUI plugin: ${tuiEntryStr} → ${PLUGIN_ENTRY_WITH_VERSION2}`);
+            fixed++;
+          } else {
+            pass("TUI sidebar plugin configured");
+          }
         }
       } else {
         pass("TUI sidebar plugin configured");
@@ -27571,6 +27608,7 @@ var init_doctor_opencode = __esm(async () => {
   init_conflict_fixer();
   init_data_path();
   init_tui_config();
+  init_opencode();
   init_diagnostics_opencode();
   init_logs_opencode();
   init_opencode_helpers();
@@ -161699,7 +161737,12 @@ async function runHealthChecks(options) {
   } else {
     add(results, "pass", `Embedding provider: ${loadedConfig.config.embedding.provider}`);
   }
-  add(results, "pass", "No known conflicting Pi extensions detected");
+  const piEntries = packages.filter((entry) => hasPiPackage([entry]));
+  if (piEntries.length > 1) {
+    add(results, "fail", `Multiple magic-context entries in Pi packages[] — this loads the plugin twice: ${piEntries.join(", ")}`);
+  } else {
+    add(results, "pass", "No conflicting magic-context entries in Pi packages[]");
+  }
   const otherExtensions = packages.filter((entry) => !hasPiPackage([entry]));
   if (otherExtensions.length > 0) {
     add(results, "info", `Other Pi extensions registered: ${otherExtensions.join(", ")}`);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cortexkit/magic-context",
-	"version": "0.16.1",
+	"version": "0.16.2",
 	"description": "Unified CLI for Magic Context — setup, doctor, and migration across OpenCode and Pi",
 	"keywords": [
 		"opencode",