@cortexkit/opencode-magic-context 0.36.0 → 0.37.0

package/dist/{index-nsx2n9eg.js → index-4cz5nfxf.js}

@@ -1,9 +1,9 @@
 import {
   isMidTurn
-} from "./index-3tnkymva.js";
+} from "./index-sw8gnq34.js";
 import {
   sessionLog
-} from "./index-f1tnb3vm.js";
+} from "./index-8pqfcghm.js";
 import {
   __require
 } from "./index-wckvcay0.js";
@@ -171,7 +171,7 @@ async function sendIgnoredMessageNow(client, sessionId, text, params, forcePersi
     queueIgnoredNotification({ client, sessionId, text, params, forcePersist });
     return "queued";
   }
-  const { waitForSafeNotificationTarget } = await import("./safe-notification-target-c11fdda2.js");
+  const { waitForSafeNotificationTarget } = await import("./safe-notification-target-b693f9x3.js");
   if (await waitForSafeNotificationTarget(client, sessionId) === "skip") {
     sessionLog(sessionId, "notification skipped (session not titled yet)");
     return "skipped";

package/dist/{index-0c9dmw9m.js → index-8mtsfhyg.js}

@@ -90,9 +90,39 @@ function stripTrailingCommas(content) {
   }
   return result;
 }
-function parseJsonc(content) {
+var PROTOTYPE_POLLUTION_KEYS = new Set(["__proto__", "constructor", "prototype"]);
+function isPrototypePollutionKey(key) {
+  return PROTOTYPE_POLLUTION_KEYS.has(key);
+}
+function sanitizeParsedJson(value, options = {}, path = []) {
+  if (Array.isArray(value)) {
+    return value.map((entry, index) => sanitizeParsedJson(entry, options, [...path, index]));
+  }
+  if (value === null || typeof value !== "object")
+    return value;
+  const source = value;
+  const sourcePrototype = Object.getPrototypeOf(source);
+  if (sourcePrototype !== null && sourcePrototype !== Object.prototype) {
+    options.onRejectedKey?.([...path, "__proto__"]);
+  }
+  const sanitized = {};
+  for (const key of Object.keys(source)) {
+    if (isPrototypePollutionKey(key)) {
+      options.onRejectedKey?.([...path, key]);
+      continue;
+    }
+    Object.defineProperty(sanitized, key, {
+      value: sanitizeParsedJson(source[key], options, [...path, key]),
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  }
+  return sanitized;
+}
+function parseJsonc(content, options = {}) {
   const normalized = stripTrailingCommas(stripJsonComments(content));
-  return JSON.parse(normalized);
+  return sanitizeParsedJson(JSON.parse(normalized), options);
 }
 function readJsoncFile(filePath) {
   try {
@@ -113,4 +143,4 @@ function detectConfigFile(basePath) {
   return { format: "none", path: jsoncPath };
 }
 
-export { stripJsonComments, parseJsonc, readJsoncFile, detectConfigFile };
+export { stripJsonComments, isPrototypePollutionKey, parseJsonc, readJsoncFile, detectConfigFile };

package/dist/{index-f1tnb3vm.js → index-8pqfcghm.js}

@@ -10,16 +10,19 @@ var buffer = [];
 var flushTimer = null;
 var FLUSH_INTERVAL_MS = 500;
 var BUFFER_SIZE_LIMIT = 50;
-var lastEnsuredDir = null;
-function ensureDir(filePath) {
-  const dir = path.dirname(filePath);
-  if (dir === lastEnsuredDir)
-    return;
+var swallowedWriteCount = 0;
+var lastErrorMessage = null;
+var lastErrorTime = null;
+function recordSwallowedWrite(error) {
   try {
-    fs.mkdirSync(dir, { recursive: true });
-    lastEnsuredDir = dir;
+    swallowedWriteCount++;
+    lastErrorMessage = error instanceof Error ? error.message : String(error);
+    lastErrorTime = new Date().toISOString();
   } catch {}
 }
+function ensureDir(filePath) {
+  fs.mkdirSync(path.dirname(filePath), { recursive: true });
+}
 function flush() {
   if (flushTimer) {
     clearTimeout(flushTimer);
@@ -33,7 +36,9 @@ function flush() {
     const logFile = getMagicContextLogPath();
     ensureDir(logFile);
     fs.appendFileSync(logFile, data);
-  } catch {}
+  } catch (error) {
+    recordSwallowedWrite(error);
+  }
 }
 function scheduleFlush() {
   if (flushTimer)
@@ -62,8 +67,15 @@ ${data.stack}` : ""}` : ` ${JSON.stringify(data)}`;
 function sessionLog(sessionId, message, data) {
   log(`[magic-context][${sessionId}] ${message}`, data);
 }
+function getLoggerDiagnostics() {
+  return {
+    swallowedWriteCount,
+    lastErrorMessage,
+    lastErrorTime
+  };
+}
 if (!isTestEnv) {
   process.on("exit", flush);
 }
 
-export { log, sessionLog };
+export { log, sessionLog, getLoggerDiagnostics };

package/dist/{index-37rt2bka.js → index-cae89eas.js}

@@ -1,12 +1,12 @@
 import {
   readJsoncFile
-} from "./index-0c9dmw9m.js";
+} 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-z8v31d85.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";
@@ -53,7 +56,11 @@ function removeSystemReminders(text) {
 }
 
 // src/hooks/magic-context/read-session-formatting.ts
+import { existsSync, readFileSync, realpathSync } from "node:fs";
 import { createRequire } from "node:module";
+import { homedir } from "node:os";
+import { dirname, join, resolve } from "node:path";
+import { pathToFileURL } from "node:url";
 
 // src/shared/commit-detection.ts
 var HASH_HEX = "[0-9a-f]{7,12}";
@@ -146,23 +153,146 @@ function truncateArg(value, maxLen = 60) {
     return value;
   return `${value.slice(0, maxLen)}…`;
 }
-var requireFromThisModule = createRequire(import.meta.url);
+var TOKENIZER_PACKAGE_DIRS = [
+  ["@cortexkit", "opencode-magic-context"],
+  ["@cortexkit", "pi-magic-context"]
+];
 var tokenizer;
-function getTokenizer() {
+var tokenizerLoadAttempted = false;
+var tokenizerLoadPromise;
+var tokenizerWarningSent = false;
+function tokenizerPackageRoots() {
+  const cwd = process.cwd();
+  const openCodeCache = join(process.env.XDG_CACHE_HOME ?? join(homedir(), ".cache"), "opencode");
+  const roots = [cwd, openCodeCache];
+  const candidates = [];
+  for (const root of roots) {
+    for (const packageDir of TOKENIZER_PACKAGE_DIRS) {
+      candidates.push(join(root, "node_modules", ...packageDir, "node_modules", "ai-tokenizer"));
+    }
+    candidates.push(join(root, "node_modules", "ai-tokenizer"));
+  }
+  let ancestor = process.argv[1] ? dirname(resolve(process.argv[1])) : cwd;
+  while (true) {
+    candidates.push(join(ancestor, "node_modules", "ai-tokenizer"));
+    const parent = dirname(ancestor);
+    if (parent === ancestor)
+      break;
+    ancestor = parent;
+  }
+  return [...new Set(candidates)];
+}
+function packageImportTarget(value) {
+  if (typeof value === "string")
+    return value;
+  if (!value || typeof value !== "object")
+    return;
+  const conditions = value;
+  return packageImportTarget(conditions.import) ?? packageImportTarget(conditions.default);
+}
+function findTokenizerImportPaths() {
+  for (const packageRoot of tokenizerPackageRoots()) {
+    const packageJsonPath = join(packageRoot, "package.json");
+    if (!existsSync(packageJsonPath))
+      continue;
+    try {
+      const packageJson = JSON.parse(readFileSync(packageJsonPath, "utf8"));
+      const tokenizerTarget = packageImportTarget(packageJson.exports?.["."]) ?? (typeof packageJson.module === "string" ? packageJson.module : undefined) ?? (typeof packageJson.main === "string" ? packageJson.main : undefined);
+      const encodingTarget = packageImportTarget(packageJson.exports?.["./encoding/claude"]);
+      if (!tokenizerTarget || !encodingTarget)
+        continue;
+      return {
+        tokenizerPath: realpathSync(join(packageRoot, tokenizerTarget)),
+        encodingPath: realpathSync(join(packageRoot, encodingTarget))
+      };
+    } catch {}
+  }
+  return;
+}
+function constructTokenizer(tokenizerModule, claudeEncoding) {
+  const typedModule = tokenizerModule;
+  const Tokenizer = typedModule.default ?? typedModule.Tokenizer;
+  if (!Tokenizer) {
+    throw new Error("ai-tokenizer does not expose a Tokenizer constructor");
+  }
+  return new Tokenizer(claudeEncoding);
+}
+function loadTokenizer() {
+  const requireFromThisModule = createRequire(import.meta.url);
+  return constructTokenizer(requireFromThisModule("ai-" + "tokenizer"), requireFromThisModule("ai-tokenizer/encoding/" + "claude"));
+}
+async function loadTokenizerFromInstalledPackage() {
+  const installedPaths = findTokenizerImportPaths();
+  if (!installedPaths) {
+    throw new Error("ai-tokenizer was not found under the project, runtime, or OpenCode cache node_modules roots");
+  }
+  const [tokenizerModule, claudeEncoding] = await Promise.all([
+    import(pathToFileURL(installedPaths.tokenizerPath).href),
+    import(pathToFileURL(installedPaths.encodingPath).href)
+  ]);
+  return constructTokenizer(tokenizerModule, claudeEncoding);
+}
+function warnTokenizerFallback(error) {
+  if (tokenizerWarningSent)
+    return;
+  tokenizerWarningSent = true;
+  const reason = error instanceof Error ? error.message : String(error);
+  console.warn("[magic-context] ai-tokenizer is unavailable; using approximate character-based token counts for this process. Token budgets, persisted per-message counts, and protected-tail/compartment boundaries may be less accurate until restart:", reason);
+}
+async function preloadTokenizer() {
   if (tokenizer)
+    return true;
+  if (tokenizerLoadAttempted)
+    return false;
+  if (tokenizerLoadPromise)
+    return tokenizerLoadPromise;
+  tokenizerLoadPromise = (async () => {
+    try {
+      try {
+        tokenizer = loadTokenizer();
+      } catch {
+        tokenizer = await loadTokenizerFromInstalledPackage();
+      }
+      tokenizerLoadAttempted = true;
+      return true;
+    } catch (error) {
+      tokenizerLoadAttempted = true;
+      warnTokenizerFallback(error);
+      return false;
+    } finally {
+      tokenizerLoadPromise = undefined;
+    }
+  })();
+  return tokenizerLoadPromise;
+}
+function getTokenizer() {
+  if (tokenizer || tokenizerLoadAttempted)
     return tokenizer;
-  const tokenizerModule = requireFromThisModule("ai-" + "tokenizer");
-  const Tokenizer = tokenizerModule.default ?? tokenizerModule.Tokenizer;
-  if (!Tokenizer)
-    throw new Error("ai-tokenizer does not expose a Tokenizer constructor");
-  const claudeEncoding = requireFromThisModule("ai-tokenizer/encoding/" + "claude");
-  tokenizer = new Tokenizer(claudeEncoding);
+  tokenizerLoadAttempted = true;
+  try {
+    tokenizer = loadTokenizer();
+  } catch (error) {
+    warnTokenizerFallback(error);
+  }
   return tokenizer;
 }
+function estimateTokensHeuristically(text) {
+  return Math.ceil(text.length / 3.5);
+}
 function estimateTokens(text) {
   if (!text)
     return 0;
-  return getTokenizer().encode(text, "all").length;
+  const activeTokenizer = getTokenizer();
+  if (!activeTokenizer)
+    return estimateTokensHeuristically(text);
+  try {
+    return activeTokenizer.encode(text, "all").length;
+  } catch (error) {
+    tokenizer = undefined;
+    tokenizerLoadAttempted = true;
+    warnTokenizerFallback(error);
+    return estimateTokensHeuristically(text);
+  }
 }
 function normalizeText(text) {
   return text.replace(/\s+/g, " ").trim();
@@ -2695,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);
@@ -2817,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) {
@@ -2889,4 +3019,4 @@ function clearSession(db, sessionId) {
   })();
 }
 
-export { textMentionsRecentCommit, hasMeaningfulUserText, extractTexts, extractToolCallSummaries, estimateTokens, normalizeText, stableStringify, clearCompressionDepth, clearCompressionDepthRange, ensureSessionMetaRow, persistCachedM0, clearCachedM0M1, isRawCompactionSummaryInfo, extractInMemoryMessageViews, buildInMemoryTailRawMessages, isRecord, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, isEditTool, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, setRawMessageProvider, cleanUserText, withRawSessionMessageCache, readRawSessionMessages, primeTailRawMessageCache, getCachedAbsoluteMessageCount, primeInMemoryTailRawMessageCache, readRawSessionMessageOrdinalPage, getRawSessionStoredMessageCount, readRawSessionMessagePartsById, readRawSessionMessageOrdinalById, readRawSessionMessageById, getRawSessionMessageCount, getRawSessionTagKeysThrough, getLegacyProtectedTailStartOrdinal, readSessionChunk, getMessageIndexSourceIdentity, isMessageIndexSourceCurrent, getLastIndexedOrdinal, getIndexedMessageCorpusSize, getMessageIndexReconciliationStartOrdinal, isMessageIndexReconciledThrough, deleteIndexedMessage, clearIndexedMessages, indexSingleMessage, indexMessagesAfterOrdinal, sweepOrphanedOpenCodeMessageIndexes, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, retryPendingSessionCleanups, clearSession };
+export { textMentionsRecentCommit, hasMeaningfulUserText, extractTexts, extractToolCallSummaries, preloadTokenizer, estimateTokens, normalizeText, stableStringify, clearCompressionDepth, clearCompressionDepthRange, ensureSessionMetaRow, persistCachedM0, clearCachedM0M1, isRawCompactionSummaryInfo, extractInMemoryMessageViews, buildInMemoryTailRawMessages, isRecord, completedToolArcCrossesBoundary, estimateTrueRawMessageTokens, buildToolArcs, fenceBoundaryForToolArcs, buildTrueRawTokenIndex, computeRawRangeFingerprint, invalidateTrueRawTokenCache, stripPersistedAssistantText, byteSize, stripTagPrefix, peelLeadingMcTagNotation, prependTag, isThinkingPart, isTextPart, isToolPartWithOutput, isFilePart, buildFileSourceContent, isEditTool, partHasCompletedResult, extractToolCallObservation, ToolMutationBatch, createToolDropTarget, setRawMessageProvider, cleanUserText, withRawSessionMessageCache, readRawSessionMessages, primeTailRawMessageCache, getCachedAbsoluteMessageCount, primeInMemoryTailRawMessageCache, readRawSessionMessageOrdinalPage, getRawSessionStoredMessageCount, readRawSessionMessagePartsById, readRawSessionMessageOrdinalById, readRawSessionMessageById, getRawSessionMessageCount, getRawSessionTagKeysThrough, getLegacyProtectedTailStartOrdinal, readSessionChunk, getMessageIndexSourceIdentity, isMessageIndexSourceCurrent, getLastIndexedOrdinal, getIndexedMessageCorpusSize, getMessageIndexReconciliationStartOrdinal, isMessageIndexReconciledThrough, deleteIndexedMessage, clearIndexedMessages, indexSingleMessage, indexMessagesAfterOrdinal, sweepOrphanedOpenCodeMessageIndexes, getOrCreateSessionMeta, updateSessionMeta, advanceToolReclaimWatermark, markSessionCleanupPending, retryPendingSessionCleanups, clearSession };

package/dist/{index-tsgs7td8.js → index-pck9vadr.js}

@@ -1,6 +1,6 @@
 import {
   log
-} from "./index-f1tnb3vm.js";
+} from "./index-8pqfcghm.js";
 
 // src/shared/safe-notification-target.ts
 var DEFAULT_TITLE_RE = /^(New session - |Child session - )\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;