@cortexkit/opencode-magic-context 0.36.1 → 0.38.0

package/dist/{index-zp6x6s6a.js → index-cae89eas.js}

@@ -3,10 +3,10 @@ import {
 } from "./index-8mtsfhyg.js";
 import {
   waitForSafeNotificationTarget
-} from "./index-tsgs7td8.js";
+} from "./index-pck9vadr.js";
 import {
   log
-} from "./index-f1tnb3vm.js";
+} from "./index-8pqfcghm.js";
 import {
   __require
 } from "./index-wckvcay0.js";
@@ -59,14 +59,17 @@ function detectConflicts(directory, options) {
     omoAnthropicRecovery: false
   };
   const reasons = [];
-  const compactionResult = checkCompaction(directory);
+  let compactionResult = options?.resolvedCompaction ?? checkCompaction(directory);
+  if (process.env.OPENCODE_DISABLE_AUTOCOMPACT) {
+    compactionResult = { auto: false, prune: false };
+  }
   if (compactionEnabled && compactionResult.auto) {
     conflicts.compactionAuto = true;
-    reasons.push("OpenCode auto-compaction is enabled (compaction.auto=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) {
     conflicts.compactionPrune = true;
-    reasons.push("OpenCode prune is enabled (compaction.prune=true)");
+    reasons.push(options?.resolvedCompaction ? "OpenCode prune is enabled (compaction.prune=true) (resolved config)" : "OpenCode prune is enabled (compaction.prune=true)");
   }
   const dcpFound = checkDcpPlugin(directory);
   if (dcpFound) {
@@ -93,6 +96,22 @@ function detectConflicts(directory, options) {
     nativeCompaction: { auto: compactionResult.auto, prune: compactionResult.prune }
   };
 }
+async function resolveCompactionForBoot(client, timeoutMs = 2000) {
+  try {
+    const result = await Promise.race([
+      client.config.get(),
+      new Promise((_, reject) => setTimeout(() => reject(new Error("config.get() timed out")), timeoutMs))
+    ]);
+    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`);
+      return null;
+    }
+    return { auto: compaction.auto, prune: compaction.prune };
+  } catch {
+    return null;
+  }
+}
 function checkCompaction(directory) {
   if (process.env.OPENCODE_DISABLE_AUTOCOMPACT) {
     return { auto: false, prune: false };
@@ -586,4 +605,4 @@ async function sendStartupAnnouncement(client, directory, version, features, foo
   markSeen(version);
 }
 
-export { detectConflicts, sendConflictWarning, cleanupConflictWarnings, sendSchemaFenceWarning, sendStartupAnnouncement };
+export { detectConflicts, resolveCompactionForBoot, sendConflictWarning, cleanupConflictWarnings, sendSchemaFenceWarning, sendStartupAnnouncement };

package/dist/index-cgyfn1s2.js

@@ -0,0 +1,53 @@
+// src/shared/harness-provider-map.ts
+var CANONICAL_TO_PI_PROVIDER = {
+  openai: "openai-codex",
+  google: "google-antigravity"
+};
+var PI_TO_CANONICAL_PROVIDER = {
+  "openai-codex": "openai",
+  "google-antigravity": "google"
+};
+var CANONICAL_TO_OMP_PROVIDER = {
+  openai: "openai-codex",
+  google: "google-antigravity"
+};
+var OMP_TO_CANONICAL_PROVIDER = {
+  "openai-codex": "openai",
+  "google-antigravity": "google"
+};
+function remapProviderPrefix(ref, map) {
+  if (typeof ref !== "string")
+    return ref;
+  const slash = ref.indexOf("/");
+  if (slash <= 0)
+    return ref;
+  const provider = ref.slice(0, slash);
+  if (!Object.hasOwn(map, provider))
+    return ref;
+  return `${map[provider]}${ref.slice(slash)}`;
+}
+function piModelRefToCanonical(ref) {
+  return remapProviderPrefix(ref, PI_TO_CANONICAL_PROVIDER);
+}
+function resolveModelRefForPi(ref) {
+  return remapProviderPrefix(piModelRefToCanonical(ref), CANONICAL_TO_PI_PROVIDER);
+}
+function modelRefLookupOrder(ref) {
+  const canonical = piModelRefToCanonical(ompModelRefToCanonical(ref));
+  return [
+    ...new Set([
+      canonical,
+      ref,
+      resolveModelRefForPi(canonical),
+      resolveModelRefForOmp(canonical)
+    ])
+  ];
+}
+function ompModelRefToCanonical(ref) {
+  return remapProviderPrefix(ref, OMP_TO_CANONICAL_PROVIDER);
+}
+function resolveModelRefForOmp(ref) {
+  return remapProviderPrefix(ompModelRefToCanonical(ref), CANONICAL_TO_OMP_PROVIDER);
+}
+
+export { piModelRefToCanonical, modelRefLookupOrder };

package/dist/{index-3zqcdwqr.js → index-crke4z5j.js}

@@ -1,12 +1,15 @@
+import {
+  piModelRefToCanonical
+} from "./index-cgyfn1s2.js";
 import {
   closeQuietly,
   getRawSessionMessageCountFromDb,
   openCodeDbExists,
   withReadOnlySessionDb
-} from "./index-3tnkymva.js";
+} from "./index-sw8gnq34.js";
 import {
   log
-} from "./index-f1tnb3vm.js";
+} from "./index-8pqfcghm.js";
 import {
   getHarness
 } from "./index-mmrhhk9a.js";
@@ -2822,7 +2825,7 @@ function persistCachedM0(db, sessionId, payload) {
             cached_m0_system_hash = ?,
             cached_m0_model_key = ?,
             cached_m0_project_identity = ?
-         WHERE session_id = ?`).run(Buffer.from(payload.m0Bytes), payload.muralDataUrl ?? null, payload.muralHash ?? null, payload.projectMemoryEpoch, payload.workspaceFingerprint ?? null, payload.projectUserProfileVersion, payload.maxCompartmentSeq, payload.maxMemoryId, payload.maxMutationId, payload.maxMemoryMutationId ?? null, payload.m1Bytes ? Buffer.from(payload.m1Bytes) : null, payload.projectDocsHash, payload.materializedAt, payload.sessionFactsVersion, payload.upgradeState, payload.systemHash ?? "", payload.modelKey ?? "", payload.projectIdentity ?? null, sessionId);
+         WHERE session_id = ?`).run(Buffer.from(payload.m0Bytes), payload.muralDataUrl ?? null, payload.muralHash ?? null, payload.projectMemoryEpoch, payload.workspaceFingerprint ?? null, payload.projectUserProfileVersion, payload.maxCompartmentSeq, payload.maxMemoryId, payload.maxMutationId, payload.maxMemoryMutationId ?? null, payload.m1Bytes ? Buffer.from(payload.m1Bytes) : null, payload.projectDocsHash, payload.materializedAt, payload.sessionFactsVersion, payload.upgradeState, payload.systemHash ?? "", payload.modelKey ? piModelRefToCanonical(payload.modelKey) : "", payload.projectIdentity ?? null, sessionId);
 }
 function clearCachedM0M1(db, sessionId) {
   ensureSessionMetaRow(db, sessionId);
@@ -2944,7 +2947,7 @@ function updateSessionMeta(db, sessionId, updates) {
       values.push(value ? 1 : 0);
     } else if (typeof value === "string" || typeof value === "number") {
       setClauses.push(`${column} = ?`);
-      values.push(value);
+      values.push(key === "lastObservedModelKey" && typeof value === "string" ? piModelRefToCanonical(value) : value);
     }
   }
   if (setClauses.length === 0) {