@cortexkit/opencode-magic-context 0.42.5 → 0.43.0

package/dist/{index-d8mgqezq.js → index-rpz2me0v.js}

@@ -3,7 +3,7 @@ import {
 } from "./index-qp20p2py.js";
 import {
   sendStatusNotification2
-} from "./index-p474rw9p.js";
+} from "./index-rvwvdq59.js";
 import {
   readJsoncFile
 } from "./index-sd3egckz.js";
@@ -20,33 +20,31 @@ import { join as join2 } from "node:path";
 // src/shared/opencode-config-dir.ts
 import { homedir } from "node:os";
 import { join, resolve } from "node:path";
-function getCliConfigDir() {
-  const envConfigDir = process.env.OPENCODE_CONFIG_DIR?.trim();
-  if (envConfigDir) {
-    return resolve(envConfigDir);
-  }
+function resolveHomeDir() {
+  return process.env.HOME?.trim() || homedir();
+}
+function getOpenCodeGlobalConfigDir() {
   if (process.platform === "win32") {
-    return join(homedir(), ".config", "opencode");
+    return join(resolveHomeDir(), ".config", "opencode");
   }
-  return join(process.env.XDG_CONFIG_HOME || join(homedir(), ".config"), "opencode");
+  return join(process.env.XDG_CONFIG_HOME || join(resolveHomeDir(), ".config"), "opencode");
 }
-function getOpenCodeConfigDir(_options) {
-  return getCliConfigDir();
+function getEnvConfigDir() {
+  const envConfigDir = process.env.OPENCODE_CONFIG_DIR?.trim();
+  return envConfigDir ? resolve(envConfigDir) : undefined;
 }
-function getOpenCodeConfigPaths(options) {
-  const configDir = getOpenCodeConfigDir(options);
-  return {
-    configDir,
-    configJson: join(configDir, "opencode.json"),
-    configJsonc: join(configDir, "opencode.jsonc"),
-    packageJson: join(configDir, "package.json"),
-    omoConfig: join(configDir, "magic-context.jsonc")
-  };
+function getOpenCodeConfigDirs() {
+  const dirs = [getOpenCodeGlobalConfigDir(), join(resolveHomeDir(), ".opencode")];
+  const envDir = getEnvConfigDir();
+  if (envDir)
+    dirs.push(envDir);
+  return [...new Set(dirs)];
 }
 
 // src/shared/conflict-detector.ts
 function detectConflicts(directory, options) {
   const compactionEnabled = options?.compactionEnabled ?? true;
+  const hostGeneration = options?.hostGeneration ?? "v1";
   const conflicts = {
     compactionAuto: false,
     compactionPrune: false,
@@ -56,15 +54,15 @@ function detectConflicts(directory, options) {
     omoAnthropicRecovery: false
   };
   const reasons = [];
-  let compactionResult = options?.resolvedCompaction ?? checkCompaction(directory);
+  let compactionResult = options?.resolvedCompaction ?? checkCompaction(directory, hostGeneration);
   if (process.env.OPENCODE_DISABLE_AUTOCOMPACT) {
     compactionResult = { auto: false, prune: false };
   }
-  if (compactionEnabled && compactionResult.auto) {
+  if (hostGeneration === "v1" && compactionEnabled && compactionResult.auto) {
     conflicts.compactionAuto = true;
     reasons.push(options?.resolvedCompaction ? "OpenCode auto-compaction is enabled (compaction.auto=true) (resolved config)" : "OpenCode auto-compaction is enabled (compaction.auto=true)");
   }
-  if (compactionEnabled && compactionResult.prune) {
+  if (hostGeneration === "v1" && compactionEnabled && compactionResult.prune) {
     conflicts.compactionPrune = true;
     reasons.push(options?.resolvedCompaction ? "OpenCode prune is enabled (compaction.prune=true) (resolved config)" : "OpenCode prune is enabled (compaction.prune=true)");
   }
@@ -90,10 +88,13 @@ function detectConflicts(directory, options) {
     hasConflict: reasons.length > 0,
     reasons,
     conflicts,
-    nativeCompaction: { auto: compactionResult.auto, prune: compactionResult.prune }
+    nativeCompaction: {
+      auto: compactionResult.auto,
+      prune: hostGeneration === "v1" ? compactionResult.prune : false
+    }
   };
 }
-async function resolveCompactionForBoot(client, timeoutMs = 2000) {
+async function resolveCompactionForBoot(client, timeoutMs = 2000, hostGeneration = "v1") {
   const controller = new AbortController;
   let timer;
   try {
@@ -109,11 +110,28 @@ async function resolveCompactionForBoot(client, timeoutMs = 2000) {
     if (result === null)
       return null;
     const compaction = result?.data?.compaction;
-    if (typeof compaction?.auto !== "boolean" || typeof compaction?.prune !== "boolean") {
-      log(`[magic-context] conflict-detector: resolved config carried no explicit compaction block (${JSON.stringify(compaction) ?? "absent"}); falling back to file-based detection`);
+    if (hostGeneration === "v2") {
+      if (typeof compaction?.auto !== "boolean") {
+        log(`[magic-context] conflict-detector: resolved v2 config carried no explicit compaction.auto (${JSON.stringify(compaction) ?? "absent"}); falling back to file-based detection`);
+        return null;
+      }
+      const keepTokens = compaction.keep?.tokens;
+      const buffer = compaction.buffer;
+      if (keepTokens !== undefined && (!Number.isInteger(keepTokens) || keepTokens < 0) || buffer !== undefined && (!Number.isInteger(buffer) || buffer < 0)) {
+        return null;
+      }
+      return {
+        auto: compaction.auto,
+        prune: false,
+        ...keepTokens === undefined ? {} : { keepTokens },
+        ...buffer === undefined ? {} : { buffer }
+      };
+    }
+    if (typeof compaction?.auto !== "boolean") {
+      log(`[magic-context] conflict-detector: resolved config carried no explicit compaction.auto (${JSON.stringify(compaction) ?? "absent"}); falling back to file-based detection`);
       return null;
     }
-    return { auto: compaction.auto, prune: compaction.prune };
+    return { auto: compaction.auto, prune: compaction.prune === true };
   } catch {
     return null;
   } finally {
@@ -121,51 +139,85 @@ async function resolveCompactionForBoot(client, timeoutMs = 2000) {
       clearTimeout(timer);
   }
 }
-function checkCompaction(directory) {
+function checkCompaction(directory, hostGeneration) {
   if (process.env.OPENCODE_DISABLE_AUTOCOMPACT) {
     return { auto: false, prune: false };
   }
-  const projectResult = readProjectCompaction(directory);
-  if (projectResult.resolved)
-    return projectResult;
-  const userResult = readUserCompaction();
-  if (userResult.resolved)
-    return userResult;
-  return { auto: true, prune: false };
-}
-function readProjectCompaction(directory) {
-  const dotOcJsonc = join2(directory, ".opencode", "opencode.jsonc");
-  const dotOcJson = join2(directory, ".opencode", "opencode.json");
-  const dotOcConfig = readJsoncFile(dotOcJsonc) ?? readJsoncFile(dotOcJson);
-  if (dotOcConfig?.compaction) {
-    const c = dotOcConfig.compaction;
-    if (c.auto !== undefined || c.prune !== undefined) {
-      return { auto: c.auto === true, prune: c.prune === true, resolved: true };
-    }
-  }
-  const rootJsonc = join2(directory, "opencode.jsonc");
-  const rootJson = join2(directory, "opencode.json");
-  const rootConfig = readJsoncFile(rootJsonc) ?? readJsoncFile(rootJson);
-  if (rootConfig?.compaction) {
-    const c = rootConfig.compaction;
-    if (c.auto !== undefined || c.prune !== undefined) {
-      return { auto: c.auto === true, prune: c.prune === true, resolved: true };
-    }
+  const merged = readCompactionFromConfigFiles(directory, hostGeneration);
+  if (isRelevantCompactionBlock(merged, hostGeneration)) {
+    return resolvedCompactionBlock(merged, hostGeneration);
   }
-  return { auto: false, prune: false, resolved: false };
+  log("[magic-context] conflict-detector: no OpenCode config file carried an explicit compaction block; treating native compaction as inconclusive (not disabling the plugin)");
+  return { auto: false, prune: false };
 }
-function readUserCompaction() {
-  try {
-    const paths = getOpenCodeConfigPaths({ binary: "opencode" });
-    const config = readJsoncFile(paths.configJsonc) ?? readJsoncFile(paths.configJson);
-    if (config?.compaction) {
-      const c = config.compaction;
-      if (c.auto !== undefined || c.prune !== undefined) {
-        return { auto: c.auto === true, prune: c.prune === true, resolved: true };
-      }
-    }
-  } catch {}
-  return { auto: false, prune: false, resolved: false };
+function openCodeConfigFileChain(directory, hostGeneration) {
+  const globalDir = getOpenCodeGlobalConfigDir();
+  const wellKnown = [
+    join2(globalDir, "config.json"),
+    join2(globalDir, "opencode.json"),
+    join2(globalDir, "opencode.jsonc")
+  ];
+  const globalSupplementary = getOpenCodeConfigDirs().filter((dir) => dir !== globalDir).flatMap((dir) => [join2(dir, "opencode.json"), join2(dir, "opencode.jsonc")]);
+  const explicitConfig = process.env.OPENCODE_CONFIG?.trim();
+  const explicit = explicitConfig ? [explicitConfig] : [];
+  const direct = [join2(directory, "opencode.json"), join2(directory, "opencode.jsonc")];
+  const projectSupplementary = [
+    join2(directory, ".opencode", "opencode.json"),
+    join2(directory, ".opencode", "opencode.jsonc")
+  ];
+  const files = hostGeneration === "v2" ? [
+    ...wellKnown,
+    ...globalSupplementary,
+    ...explicit,
+    ...direct,
+    ...projectSupplementary
+  ] : [
+    ...wellKnown,
+    ...explicit,
+    ...direct,
+    ...projectSupplementary,
+    ...globalSupplementary
+  ];
+  return [...new Set(files)];
+}
+function readCompactionFromConfigFiles(directory, hostGeneration) {
+  const merged = {};
+  for (const filePath of openCodeConfigFileChain(directory, hostGeneration)) {
+    let block;
+    try {
+      block = readJsoncFile(filePath)?.compaction;
+    } catch {}
+    if (!block || typeof block !== "object")
+      continue;
+    if (block.auto !== undefined)
+      merged.auto = block.auto;
+    if (block.prune !== undefined)
+      merged.prune = block.prune;
+    if (block.buffer !== undefined)
+      merged.buffer = block.buffer;
+    if (block.keep !== undefined)
+      merged.keep = { ...merged.keep, ...block.keep };
+  }
+  return merged;
+}
+function isRelevantCompactionBlock(block, hostGeneration) {
+  if (block.auto !== undefined)
+    return true;
+  if (hostGeneration === "v1")
+    return block.prune !== undefined;
+  return block.keep?.tokens !== undefined || block.buffer !== undefined;
+}
+function resolvedCompactionBlock(block, hostGeneration) {
+  if (hostGeneration === "v2") {
+    return {
+      auto: block.auto !== false,
+      prune: false,
+      resolved: true,
+      ...typeof block.keep?.tokens === "number" ? { keepTokens: block.keep.tokens } : {},
+      ...typeof block.buffer === "number" ? { buffer: block.buffer } : {}
+    };
+  }
+  return { auto: block.auto === true, prune: block.prune === true, resolved: true };
 }
 var DCP_PACKAGE_NAMES = new Set(["@tarquinen/opencode-dcp"]);
 function checkDcpPlugin(directory) {
@@ -208,10 +260,13 @@ function collectPluginEntries(directory) {
     pushFrom(config?.plugin);
   }
   try {
-    const paths = getOpenCodeConfigPaths({ binary: "opencode" });
-    for (const configPath of [paths.configJsonc, paths.configJson]) {
-      const config = readJsoncFile(configPath);
-      pushFrom(config?.plugin);
+    const globalDir = getOpenCodeGlobalConfigDir();
+    for (const dir of getOpenCodeConfigDirs()) {
+      const names = dir === globalDir ? ["config.json", "opencode.json", "opencode.jsonc"] : ["opencode.json", "opencode.jsonc"];
+      for (const name of names) {
+        const config = readJsoncFile(join2(dir, name));
+        pushFrom(config?.plugin);
+      }
     }
   } catch {}
   return plugins;
@@ -242,13 +297,13 @@ function readOmoDisabledHooks(directory) {
     "oh-my-openagent.json"
   ];
   try {
-    const paths = getOpenCodeConfigPaths({ binary: "opencode" });
-    for (const name of configNames) {
-      const configPath = join2(paths.configDir, name);
-      const config = readJsoncFile(configPath);
-      if (config?.disabled_hooks) {
-        for (const hook of config.disabled_hooks) {
-          disabled.add(hook);
+    for (const dir of getOpenCodeConfigDirs()) {
+      for (const name of configNames) {
+        const config = readJsoncFile(join2(dir, name));
+        if (config?.disabled_hooks) {
+          for (const hook of config.disabled_hooks) {
+            disabled.add(hook);
+          }
         }
       }
     }

package/dist/{index-p474rw9p.js → index-rvwvdq59.js}

@@ -3,7 +3,7 @@ import {
 } from "./index-qp20p2py.js";
 import {
   shouldHoldIgnoredNotification
-} from "./index-jkrqhc7y.js";
+} from "./index-ykg9sdzz.js";
 
 // src/shared/error-message.ts
 function getErrorMessage(error) {