@cortexkit/opencode-magic-context 0.42.5 → 0.42.6

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

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

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

@@ -3,7 +3,7 @@ import {
 } from "./index-qp20p2py.js";
 import {
   sendStatusNotification2
-} from "./index-p474rw9p.js";
+} from "./index-ngjmj6xx.js";
 import {
   readJsoncFile
 } from "./index-sd3egckz.js";
@@ -47,6 +47,7 @@ function getOpenCodeConfigPaths(options) {
 // 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 +57,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 +91,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,6 +113,23 @@ async function resolveCompactionForBoot(client, timeoutMs = 2000) {
     if (result === null)
       return null;
     const compaction = result?.data?.compaction;
+    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" || 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`);
       return null;
@@ -121,26 +142,26 @@ 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);
+  const projectResult = readProjectCompaction(directory, hostGeneration);
   if (projectResult.resolved)
     return projectResult;
-  const userResult = readUserCompaction();
+  const userResult = readUserCompaction(hostGeneration);
   if (userResult.resolved)
     return userResult;
   return { auto: true, prune: false };
 }
-function readProjectCompaction(directory) {
+function readProjectCompaction(directory, hostGeneration) {
   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 };
+    if (c.auto !== undefined || hostGeneration === "v1" && c.prune !== undefined || hostGeneration === "v2" && (c.keep?.tokens !== undefined || c.buffer !== undefined)) {
+      return resolvedCompactionBlock(c, hostGeneration);
     }
   }
   const rootJsonc = join2(directory, "opencode.jsonc");
@@ -148,25 +169,37 @@ function readProjectCompaction(directory) {
   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 };
+    if (c.auto !== undefined || hostGeneration === "v1" && c.prune !== undefined || hostGeneration === "v2" && (c.keep?.tokens !== undefined || c.buffer !== undefined)) {
+      return resolvedCompactionBlock(c, hostGeneration);
     }
   }
   return { auto: false, prune: false, resolved: false };
 }
-function readUserCompaction() {
+function readUserCompaction(hostGeneration) {
   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 };
+      if (c.auto !== undefined || hostGeneration === "v1" && c.prune !== undefined || hostGeneration === "v2" && (c.keep?.tokens !== undefined || c.buffer !== undefined)) {
+        return resolvedCompactionBlock(c, hostGeneration);
       }
     }
   } catch {}
   return { auto: false, prune: false, resolved: false };
 }
+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) {
   const plugins = collectPluginEntries(directory);

package/dist/{index-1ar7b3e9.js → index-znraa0kv.js}

@@ -3,7 +3,7 @@ import {
 } from "./index-qp20p2py.js";
 import {
   withReadOnlySessionDb
-} from "./index-jkrqhc7y.js";
+} from "./index-a9ssj59b.js";
 import {
   piModelRefToCanonical
 } from "./index-avwt563y.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,qBAAqB,CAAC;AA4FvE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAq6BpC,QAAA,MAAM,MAAM,EAAE,YAAY,GAAG;IAAE,KAAK,EAAE,OAAO,KAAK,CAAA;CAIjD,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,YAAY,EAAE,MAAM,qBAAqB,CAAC;AA6FvE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AA46BpC,QAAA,MAAM,MAAM,EAAE,YAAY,GAAG;IAAE,KAAK,EAAE,OAAO,KAAK,CAAA;CAIjD,CAAC;AAEF,eAAe,MAAM,CAAC"}