@cortexkit/opencode-magic-context 0.48.0 → 0.49.1

package/dist/v2/{server-vqpf3167.js → server-ras2sxnc.js}

@@ -1,6 +1,6 @@
 import {
   DEFAULT_LOCAL_EMBEDDING_MODEL
-} from "./server-zm570tr2.js";
+} from "./server-cw6521wn.js";
 import {
   getHarness2
 } from "./server-pavzsdc6.js";
@@ -8,10 +8,10 @@ import {
   getMagicContextStorageDir,
   importPluginModule,
   log2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 import {
   getSynapseLaneIdentity
-} from "./server-4k748ke6.js";
+} from "./server-hb6xhh9q.js";
 import {
   computeNormalizedHash
 } from "./server-2bvekkfy.js";
@@ -21,7 +21,7 @@ import {
   writeStorageFileAsync,
   writeStorageFileHandleAsync,
   createStorageFileHandleAsync
-} from "./server-1bc61ans.js";
+} from "./server-fvnzcnww.js";
 
 // src/features/magic-context/memory/embedding-local.ts
 import { readdirSync, statSync } from "node:fs";
@@ -238,29 +238,116 @@ function getEmbeddingProviderIdentity(config) {
 }
 
 // src/features/magic-context/memory/embedding-worker-client.ts
+import { fork } from "node:child_process";
 import { Worker } from "node:worker_threads";
+
+// src/features/magic-context/memory/onnx-telemetry.ts
+import { isMainThread } from "node:worker_threads";
+var FFI_SPECIFIER = "bun:ffi";
+async function prepareNativeOnnxTelemetry() {
+  if (process.platform === "win32")
+    return true;
+  if (!process.versions.bun) {
+    if (!isMainThread)
+      return false;
+    process.env.ORT_DISABLE_TELEMETRY = "1";
+    return true;
+  }
+  let ffi;
+  try {
+    ffi = await import(FFI_SPECIFIER);
+  } catch {
+    return false;
+  }
+  const { dlopen, FFIType } = ffi;
+  const paths = process.platform === "darwin" ? ["/usr/lib/libSystem.B.dylib"] : ["libc.so.6", `/lib/ld-musl-${process.arch === "arm64" ? "aarch64" : "x86_64"}.so.1`];
+  for (const path of paths) {
+    try {
+      const library = dlopen(path, {
+        setenv: {
+          args: [FFIType.cstring, FFIType.cstring, FFIType.i32],
+          returns: FFIType.i32
+        },
+        getenv: { args: [FFIType.cstring], returns: FFIType.cstring }
+      });
+      try {
+        const name = Buffer.from("ORT_DISABLE_TELEMETRY\x00");
+        const value = Buffer.from("1\x00");
+        const disabled = library.symbols.setenv(name, value, 1) === 0 && String(library.symbols.getenv(name)) === "1";
+        if (disabled)
+          process.env.ORT_DISABLE_TELEMETRY = "1";
+        return disabled;
+      } finally {
+        library.close();
+      }
+    } catch {}
+  }
+  return false;
+}
+
+// src/features/magic-context/memory/embedding-worker-client.ts
+var warnedWindowsTelemetry = false;
+
 class EmbeddingWorkerClient {
   data;
   entry;
   timeoutMs;
+  prepareTelemetry;
   worker = null;
+  startPromise = null;
   nextId = 1;
   pending = new Map;
   disposed = false;
-  constructor(data, entry = new URL(new URL(import.meta.url).pathname.endsWith(".ts") ? "./embedding-worker.ts" : "./embedding-worker.js", import.meta.url), timeoutMs = 5 * 60000) {
+  constructor(data, entry = new URL(new URL(import.meta.url).pathname.endsWith(".ts") ? "./embedding-worker.ts" : "./embedding-worker.js", import.meta.url), timeoutMs = 5 * 60000, prepareTelemetry = prepareNativeOnnxTelemetry) {
     this.data = data;
     this.entry = entry;
     this.timeoutMs = timeoutMs;
+    this.prepareTelemetry = prepareTelemetry;
   }
   start() {
+    if (this.startPromise)
+      return this.startPromise;
+    this.startPromise = this.startOwner().finally(() => {
+      this.startPromise = null;
+    });
+    return this.startPromise;
+  }
+  async startOwner() {
     if (this.disposed)
       throw new Error("embedding worker disposed");
     if (this.worker)
       return this.worker;
-    const worker = new Worker(this.entry, { workerData: this.data });
+    const compiledBun = process.versions.bun && globalThis.Bun?.isStandaloneExecutable;
+    const inProcess = !compiledBun && await this.prepareTelemetry();
+    if (this.disposed)
+      throw new Error("embedding worker disposed");
+    const worker = inProcess ? new Worker(this.entry, { workerData: this.data }) : fork(new URL(new URL(import.meta.url).pathname.endsWith(".ts") ? "./embedding-worker-process.ts" : "./embedding-worker-process.js", import.meta.url), [], {
+      env: {
+        ...process.env,
+        ORT_DISABLE_TELEMETRY: "1",
+        ...process.versions.bun ? { BUN_BE_BUN: "1" } : {}
+      },
+      execArgv: [],
+      serialization: "json",
+      ...{ windowsHide: true },
+      stdio: ["ignore", "inherit", "inherit", "ipc"]
+    });
+    if (process.platform === "win32" && this.data.runtimePreference !== "wasm") {
+      if (!warnedWindowsTelemetry) {
+        warnedWindowsTelemetry = true;
+        const warning = "[magic-context] ORT_DISABLE_TELEMETRY=1 prevents ONNX uploads on POSIX. Windows native ONNX uses OS-controlled ETW diagnostics instead and exposes no JavaScript telemetry-disable API; Windows diagnostic settings and trace collectors govern collection.";
+        log2(warning);
+      }
+    }
     this.worker = worker;
     worker.unref();
-    worker.on("message", (reply) => {
+    if (!(worker instanceof Worker))
+      worker.channel?.unref?.();
+    worker.on("message", (wire) => {
+      const reply = worker instanceof Worker ? wire : {
+        ...wire,
+        vectors: wire.vectors?.map((vector) => vector === null ? null : new Float32Array(Uint8Array.from(Buffer.from(vector, "base64")).buffer))
+      };
       if (this.worker !== worker)
         return;
       const request = this.pending.get(reply.id);
@@ -272,8 +359,11 @@ class EmbeddingWorkerClient {
         request.reject(new Error(reply.error));
       else
         request.resolve(reply);
-      if (this.pending.size === 0)
+      if (this.pending.size === 0) {
         worker.unref();
+        if (!(worker instanceof Worker))
+          worker.channel?.unref?.();
+      }
     });
     const fail = (error) => {
       if (this.worker !== worker)
@@ -285,20 +375,29 @@ class EmbeddingWorkerClient {
       }
       this.pending.clear();
       log2("[magic-context] embedding worker exited unexpectedly:", error);
-      worker.terminate();
+      if (worker instanceof Worker)
+        worker.terminate();
+      else
+        worker.kill();
     };
     worker.on("error", fail);
-    worker.on("exit", (code) => fail(new Error(`embedding worker exited (${code})`)));
+    worker.on("exit", (code, signal) => fail(new Error(`embedding worker exited (${signal ?? code})`)));
+    if (!(worker instanceof Worker))
+      worker.send({ entry: this.entry.href, data: this.data });
     return worker;
   }
   isRunning() {
     return this.worker !== null;
   }
-  request(texts, signal) {
+  async request(texts, signal) {
     if (signal?.aborted)
       return Promise.reject(new Error("embedding request aborted"));
+    const worker = await this.start();
+    if (this.disposed)
+      throw new Error("embedding worker disposed");
+    if (signal?.aborted)
+      throw new Error("embedding request aborted");
     return new Promise((resolve, reject) => {
-      const worker = this.start();
       const id = this.nextId++;
       const timer = setTimeout(() => {
         this.stop(new Error("embedding worker request timed out"));
@@ -308,8 +407,11 @@ class EmbeddingWorkerClient {
         this.pending.delete(id);
         signal?.removeEventListener("abort", abort);
         reject(new Error("embedding request aborted"));
-        if (this.pending.size === 0)
+        if (this.pending.size === 0) {
           worker.unref();
+          if (!(worker instanceof Worker))
+            worker.channel?.unref?.();
+        }
       };
       signal?.addEventListener("abort", abort, { once: true });
       const cleanup = () => signal?.removeEventListener("abort", abort);
@@ -325,8 +427,16 @@ class EmbeddingWorkerClient {
         }
       });
       worker.ref();
+      if (!(worker instanceof Worker))
+        worker.channel?.ref?.();
       try {
-        worker.postMessage({ id, texts });
+        if (worker instanceof Worker)
+          worker.postMessage({ id, texts });
+        else
+          worker.send({ id, texts }, (error) => {
+            if (error && this.worker === worker)
+              this.stop(error);
+          });
       } catch (error) {
         this.stop(error instanceof Error ? error : new Error(String(error)));
       }
@@ -340,10 +450,20 @@ class EmbeddingWorkerClient {
       request.reject(error);
     }
     this.pending.clear();
-    await worker?.terminate();
+    if (worker instanceof Worker) {
+      await worker.terminate();
+    } else if (worker && worker.exitCode === null && worker.signalCode === null) {
+      worker.ref();
+      worker.channel?.ref?.();
+      await new Promise((resolve) => {
+        worker.once("exit", () => resolve());
+        worker.kill();
+      });
+    }
   }
   async dispose() {
     this.disposed = true;
+    await this.startPromise?.catch(() => {});
     await this.stop(new Error("embedding worker disposed"));
   }
 }

package/dist/v2/{server-ezhze64f.js → server-s2st631p.js}

@@ -1,19 +1,19 @@
 import {
   getTokenEstimatorFingerprint,
   estimateTokens
-} from "./server-1r6pmz4f.js";
+} from "./server-kzns2hbz.js";
 import {
   getHarness2
 } from "./server-pavzsdc6.js";
 import {
   log2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 import {
   isSynapseEmbeddingTruncated
-} from "./server-4k748ke6.js";
+} from "./server-hb6xhh9q.js";
 import {
   messageFtsOrdinalRangeIsMapped
-} from "./server-k228xhjg.js";
+} from "./server-2htmbqbv.js";
 
 // src/features/magic-context/compartment-chunk-embedding.ts
 import { createHash } from "node:crypto";

package/dist/v2/{server-5m3dt5r1.js → server-t4k4qexw.js}

@@ -552,8 +552,12 @@ function flush() {
     let currentSize = getCurrentLogSize(logFile);
     const dataSize = Buffer.byteLength(data);
     if (currentSize > 0 && currentSize + dataSize > MAX_LOG_FILE_BYTES) {
-      rotateLogFile(logFile, currentSize);
-      currentSize = 0;
+      flushesSinceSizeCheck = SIZE_CHECK_INTERVAL_FLUSHES;
+      currentSize = getCurrentLogSize(logFile);
+      if (currentSize > 0 && currentSize + dataSize > MAX_LOG_FILE_BYTES) {
+        rotateLogFile(logFile, currentSize);
+        currentSize = 0;
+      }
     }
     fs.appendFileSync(logFile, data, { encoding: "utf8", mode: 384 });
     buffer = [];

package/dist/v2/{server-z2037m6z.js → server-t528t8qm.js}

@@ -1,11 +1,11 @@
 import {
   log2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 import {
   getSdkWindowGeometry,
   getSdkContextLimit,
   getSdkInputLimit
-} from "./server-v06jcv0w.js";
+} from "./server-vb7pbd9p.js";
 import {
   localBudget,
   calibrationForModelKey

package/dist/v2/{server-v06jcv0w.js → server-vb7pbd9p.js}

@@ -2,25 +2,21 @@ import {
   getHarness2
 } from "./server-pavzsdc6.js";
 import {
-  getDataDir,
   getMagicContextStorageDir,
   sessionLog2
-} from "./server-5m3dt5r1.js";
+} from "./server-t4k4qexw.js";
 import {
   writeStorageFileAtomicSync
-} from "./server-1bc61ans.js";
+} from "./server-fvnzcnww.js";
 import {
   modelRefLookupOrder
 } from "./server-avwt563y.js";
 
 // src/shared/models-dev-cache.ts
-import { readFileSync as readFileSync2 } from "node:fs";
-import { join as join2 } from "node:path";
-
-// src/shared/window-geometry.ts
 import { readFileSync } from "node:fs";
 import { join } from "node:path";
-var WINDOW_OVERLAY_SCHEMA = "fusiform-window-overlay/v1";
+
+// src/shared/window-geometry.ts
 var PROMPT_WALL_MARGIN = 4096;
 var PI_OUTPUT_FLOOR = 4096;
 var OPENCODE_OUTPUT_CAP = 32000;
@@ -35,241 +31,10 @@ var PROVIDER_GEOMETRY = {
   google: "separate",
   "google-antigravity": "separate"
 };
-var GRADES = new Set([
-  "provider_asserted_runtime",
-  "measured",
-  "provider_asserted_doc",
-  "catalog",
-  "unknown"
-]);
-var UNITS = new Set(["provider", "estimate"]);
-var BOUNDARIES = new Set(["Observed", "Asserted", "Corrected"]);
-var UNKNOWN_REASONS = new Set([
-  "placeholder_output_equals_context",
-  "placeholder_zero",
-  "never_measured",
-  "not_single_valued_at_key",
-  "retracted"
-]);
-var NUMERIC_FACT_KEYS = new Set([
-  "window.advertised",
-  "window.enforced",
-  "output.advertised",
-  "output.enforced",
-  "output.default"
-]);
-var configuredOverlayPath;
-var loadedOverlayPath;
-var loadedOverlay;
 var geometryClampLogSeen = new Set;
-function isRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
-}
 function isFinitePositive(value) {
   return typeof value === "number" && Number.isFinite(value) && value > 0;
 }
-function scalarizeFact(value) {
-  if (value.kind === "stated")
-    return isFinitePositive(value.value) ? value.value : undefined;
-  if (value.kind === "bracket") {
-    return isFinitePositive(value.at_least) ? value.at_least : undefined;
-  }
-  return;
-}
-function parseFactValue(value) {
-  if (!isRecord(value) || typeof value.kind !== "string")
-    return;
-  if (value.kind === "stated") {
-    if ((typeof value.value !== "number" || !Number.isFinite(value.value)) && typeof value.value !== "string") {
-      return;
-    }
-    return { kind: "stated", value: value.value };
-  }
-  if (value.kind === "bracket") {
-    const atLeast = value.at_least;
-    const below = value.below;
-    if (atLeast === undefined && below === undefined)
-      return { kind: "bracket" };
-    if (atLeast !== undefined && !isFinitePositive(atLeast))
-      return;
-    if (below !== undefined && !isFinitePositive(below))
-      return;
-    if (isFinitePositive(atLeast) && isFinitePositive(below) && below <= atLeast) {
-      return;
-    }
-    return {
-      kind: "bracket",
-      ...isFinitePositive(atLeast) ? { at_least: atLeast } : {},
-      ...isFinitePositive(below) ? { below } : {}
-    };
-  }
-  if (value.kind === "unknown" && UNKNOWN_REASONS.has(value.why)) {
-    return { kind: "unknown", why: value.why };
-  }
-  return;
-}
-function parseFact(key, value) {
-  if (!isRecord(value))
-    return;
-  const parsedValue = parseFactValue(value.value);
-  if (!parsedValue || !GRADES.has(value.grade) || !UNITS.has(value.units) || !BOUNDARIES.has(value.boundary) || typeof value.source_ref !== "string" || value.source_ref.length === 0 || typeof value.observed_at !== "string" || value.observed_at.length === 0) {
-    return;
-  }
-  if (NUMERIC_FACT_KEYS.has(key) && parsedValue.kind === "stated" && !isFinitePositive(parsedValue.value)) {
-    return;
-  }
-  if (key === "geometry" && parsedValue.kind === "stated" && !["shared_upfront", "shared_truncating", "separate"].includes(String(parsedValue.value))) {
-    return;
-  }
-  return {
-    ...value,
-    value: parsedValue,
-    grade: value.grade,
-    units: value.units,
-    boundary: value.boundary,
-    source_ref: value.source_ref,
-    observed_at: value.observed_at
-  };
-}
-function parseWindowOverlay(value) {
-  if (!isRecord(value)) {
-    return { badCells: 0, refusal: "overlay root is not an object" };
-  }
-  if (value.schema !== WINDOW_OVERLAY_SCHEMA) {
-    return {
-      badCells: 0,
-      refusal: `unrecognized schema ${JSON.stringify(value.schema)}`
-    };
-  }
-  if (typeof value.generated_at !== "string" || !Array.isArray(value.minted_provider_ids) || !value.minted_provider_ids.every((id) => typeof id === "string" && id.length > 0) || !Array.isArray(value.cells)) {
-    return { badCells: 0, refusal: "invalid v1 envelope" };
-  }
-  const cells = [];
-  let badCells = 0;
-  for (const rawCell of value.cells) {
-    if (!isRecord(rawCell) || typeof rawCell.provider_id !== "string" || rawCell.provider_id.length === 0 || typeof rawCell.model_id !== "string" || rawCell.model_id.length === 0 || !isRecord(rawCell.facts)) {
-      badCells++;
-      continue;
-    }
-    const facts = {};
-    let valid = true;
-    for (const [key, rawFact] of Object.entries(rawCell.facts)) {
-      const fact = parseFact(key, rawFact);
-      if (!fact) {
-        valid = false;
-        break;
-      }
-      facts[key] = fact;
-    }
-    if (!valid) {
-      badCells++;
-      continue;
-    }
-    cells.push({
-      provider_id: rawCell.provider_id,
-      model_id: rawCell.model_id,
-      facts
-    });
-  }
-  return {
-    overlay: {
-      schema: WINDOW_OVERLAY_SCHEMA,
-      generated_at: value.generated_at,
-      minted_provider_ids: [...value.minted_provider_ids],
-      cells
-    },
-    badCells
-  };
-}
-function defaultWindowOverlayPath() {
-  return join(getDataDir(), "fusiform", "window-overlay.json");
-}
-function readWindowOverlayFile(path, log = (message) => sessionLog2("global", message)) {
-  let raw;
-  try {
-    raw = readFileSync(path, "utf8");
-  } catch (error) {
-    if (error.code === "ENOENT")
-      return;
-    log(`window-overlay: unable to read ${path}; overlay ignored`);
-    return;
-  }
-  let decoded;
-  try {
-    decoded = JSON.parse(raw);
-  } catch {
-    log(`window-overlay: invalid JSON in ${path}; overlay ignored`);
-    return;
-  }
-  const parsed = parseWindowOverlay(decoded);
-  if (parsed.refusal) {
-    log(`window-overlay: ${parsed.refusal} in ${path}; entire overlay ignored`);
-    return;
-  }
-  if (parsed.badCells > 0) {
-    log(`window-overlay: skipped ${parsed.badCells} invalid cell(s) from ${path}`);
-  }
-  return parsed.overlay;
-}
-function setWindowOverlayPath(path) {
-  if (configuredOverlayPath === path)
-    return;
-  reloadWindowOverlay(path);
-}
-function reloadWindowOverlay(path) {
-  configuredOverlayPath = path;
-  loadedOverlayPath = undefined;
-  loadedOverlay = undefined;
-}
-function getWindowOverlay() {
-  const path = configuredOverlayPath ?? defaultWindowOverlayPath();
-  if (loadedOverlayPath === path && loadedOverlay !== undefined) {
-    return loadedOverlay ?? undefined;
-  }
-  loadedOverlayPath = path;
-  loadedOverlay = readWindowOverlayFile(path) ?? null;
-  return loadedOverlay ?? undefined;
-}
-function resolveWindowOverlayFacts(providerID, modelID, overlay = getWindowOverlay()) {
-  if (!overlay)
-    return;
-  const modelRefs = modelRefLookupOrder(`${providerID}/${modelID}`);
-  const providerCandidates = new Set(modelRefs.map((ref) => ref.slice(0, ref.indexOf("/"))));
-  const modelCandidates = new Set([
-    modelID,
-    ...modelRefs.map((ref) => ref.slice(ref.indexOf("/") + 1))
-  ]);
-  const colon = modelID.lastIndexOf(":");
-  if (colon > 0)
-    modelCandidates.add(modelID.slice(0, colon));
-  const wildcardFacts = {};
-  const specificFacts = {};
-  for (const cell of overlay.cells) {
-    if (!providerCandidates.has(cell.provider_id))
-      continue;
-    if (cell.model_id === "*")
-      Object.assign(wildcardFacts, cell.facts);
-    else if (modelCandidates.has(cell.model_id))
-      Object.assign(specificFacts, cell.facts);
-  }
-  const facts = { ...wildcardFacts, ...specificFacts };
-  return Object.keys(facts).length > 0 ? { facts } : undefined;
-}
-function numericOverlayFact(overlay, key) {
-  const fact = overlay?.facts[key];
-  return fact ? scalarizeFact(fact.value) : undefined;
-}
-function overlayGeometry(overlay) {
-  const fact = overlay?.facts.geometry;
-  if (fact === undefined)
-    return;
-  if (fact.value.kind === "unknown")
-    return { kind: "unknown" };
-  if (fact.value.kind !== "stated")
-    return;
-  const value = fact.value.value;
-  return value === "shared_upfront" || value === "shared_truncating" || value === "separate" ? { kind: "stated", value } : undefined;
-}
 function placeholderFilteredOutput(output, context) {
   if (!isFinitePositive(output))
     return;
@@ -277,8 +42,8 @@ function placeholderFilteredOutput(output, context) {
     return;
   return output;
 }
-function mergePositive(overlayValue, providerValue) {
-  return isFinitePositive(providerValue) ? providerValue : overlayValue;
+function mergePositive(catalogValue, providerValue) {
+  return isFinitePositive(providerValue) ? providerValue : catalogValue;
 }
 function logGeometryClampOnce(key, message, log) {
   if (geometryClampLogSeen.has(key))
@@ -292,10 +57,8 @@ function deriveWindowGeometry(providerID, modelID, catalogLimit, options = {}) {
   const providerLimit = options.providerLimit;
   const catalogContext = isFinitePositive(catalogLimit?.context) ? catalogLimit.context : undefined;
   const providerContext = isFinitePositive(providerLimit?.context) ? providerLimit.context : undefined;
-  const advertised = numericOverlayFact(options.overlay, "window.advertised");
-  const enforced = numericOverlayFact(options.overlay, "window.enforced");
-  let softContext = mergePositive(enforced ?? advertised ?? catalogContext, providerContext);
-  let hardContext = mergePositive(enforced ?? softContext, providerContext);
+  let softContext = mergePositive(catalogContext, providerContext);
+  let hardContext = mergePositive(softContext, providerContext);
   const contextCap = isFinitePositive(options.contextCap) ? options.contextCap : undefined;
   const hasContextCap = contextCap !== undefined;
   if (contextCap !== undefined) {
@@ -305,13 +68,10 @@ function deriveWindowGeometry(providerID, modelID, catalogLimit, options = {}) {
   const input = mergePositive(isFinitePositive(catalogLimit?.input) ? catalogLimit.input : undefined, providerLimit?.input);
   if (!isFinitePositive(softContext) && !isFinitePositive(input))
     return;
-  const catalogOutput = options.overlay === undefined && options.providerLimit === undefined ? isFinitePositive(catalogLimit?.output) ? catalogLimit.output : undefined : placeholderFilteredOutput(catalogLimit?.output, softContext);
-  const overlayOutput = placeholderFilteredOutput(numericOverlayFact(options.overlay, "output.enforced") ?? numericOverlayFact(options.overlay, "output.default") ?? numericOverlayFact(options.overlay, "output.advertised"), softContext);
+  const catalogOutput = options.providerLimit === undefined ? isFinitePositive(catalogLimit?.output) ? catalogLimit.output : undefined : placeholderFilteredOutput(catalogLimit?.output, softContext);
   const providerOutput = placeholderFilteredOutput(providerLimit?.output, softContext);
-  const output = providerOutput ?? overlayOutput ?? catalogOutput;
-  const geometryFact = overlayGeometry(options.overlay);
-  const geometry = geometryFact?.kind === "stated" ? geometryFact.value : geometryFact?.kind === "unknown" ? "shared_upfront" : PROVIDER_GEOMETRY[providerID] ?? "shared_upfront";
-  const geometryOverride = geometryFact?.kind === "stated" ? geometryFact.value : undefined;
+  const output = providerOutput ?? catalogOutput;
+  const geometry = PROVIDER_GEOMETRY[providerID] ?? "shared_upfront";
   const preCarvedInput = isFinitePositive(input) && (!isFinitePositive(softContext) || input < softContext);
   const outputReserveOverride = typeof options.outputReserveOverride === "number" && Number.isFinite(options.outputReserveOverride) && options.outputReserveOverride >= 0 ? options.outputReserveOverride : undefined;
   let derivationWindow = softContext ?? input;
@@ -339,14 +99,14 @@ function deriveWindowGeometry(providerID, modelID, catalogLimit, options = {}) {
       reserveSource = "output_catalog";
     }
   } else if (isFinitePositive(softContext)) {
-    if (geometry === "separate" && (options.overlay === undefined || options.harness === "pi" || geometryOverride !== undefined)) {
+    if (geometry === "separate") {
       softReserve = 0;
       reserveSource = "none";
     } else {
       softReserve = output ?? 0;
       reserveSource = output === undefined ? "none" : "output_catalog";
       const cap = softContext * OUTPUT_RESERVE_CAP_RATIO;
-      softReserve = Math.min(softReserve, options.harness === "pi" || options.overlay === undefined ? cap : Math.min(cap, OPENCODE_OUTPUT_CAP));
+      softReserve = Math.min(softReserve, cap);
     }
     const floor = Math.max(MIN_PLAUSIBLE_CONTEXT_LIMIT, softContext * 0.5);
     const flooredReserve = Math.min(softReserve, Math.max(0, softContext - floor));
@@ -361,7 +121,7 @@ function deriveWindowGeometry(providerID, modelID, catalogLimit, options = {}) {
   const hardWindow = hardContext ?? softContext ?? input;
   if (!isFinitePositive(hardWindow))
     return;
-  const windowSource = hasContextCap ? "detected" : providerContext !== undefined ? "provider" : enforced !== undefined || advertised !== undefined ? "overlay" : "catalog";
+  const windowSource = hasContextCap ? "detected" : providerContext !== undefined ? "provider" : "catalog";
   let usableHard;
   if (geometry === "separate") {
     usableHard = hardWindow;
@@ -377,7 +137,7 @@ function deriveWindowGeometry(providerID, modelID, catalogLimit, options = {}) {
   }
   usableHard = Math.max(MIN_PLAUSIBLE_CONTEXT_LIMIT, Math.floor(usableHard));
   if (usableHard < usableSoft) {
-    logGeometryClampOnce(`${providerID}/${modelID}|${usableSoft}|${usableHard}`, `usable hard limit clamped for ${providerID}/${modelID}: ${usableHard} → ${usableSoft} (overlay/provider inversion)`, options.log);
+    logGeometryClampOnce(`${providerID}/${modelID}|${usableSoft}|${usableHard}`, `usable hard limit clamped for ${providerID}/${modelID}: ${usableHard} → ${usableSoft} (window limit inversion)`, options.log);
     usableHard = usableSoft;
   }
   const resolvedWindow = derivationWindow ?? usableSoft;
@@ -444,14 +204,14 @@ var apiCache = null;
 var apiLoadedAt = 0;
 var persistSeedLoaded = false;
 function persistFilePath() {
-  return join2(getMagicContextStorageDir(), `model-context-limits-${getHarness2()}.json`);
+  return join(getMagicContextStorageDir(), `model-context-limits-${getHarness2()}.json`);
 }
 function loadPersistedApiCacheOnce() {
   if (persistSeedLoaded || apiCache !== null)
     return;
   persistSeedLoaded = true;
   try {
-    const raw = readFileSync2(persistFilePath(), "utf-8");
+    const raw = readFileSync(persistFilePath(), "utf-8");
     const obj = JSON.parse(raw);
     const map = new Map;
     for (const [key, persisted] of Object.entries(obj)) {
@@ -641,7 +401,6 @@ function getSdkWindowGeometry(providerID, modelID, detectedContextLimit, options
     input: metadata.inputLimit,
     output: metadata.outputLimit
   }, {
-    overlay: resolveWindowOverlayFacts(providerID, modelID, getWindowOverlay()),
     outputReserveOverride: resolveOutputReserve(providerID, modelID),
     harness: options?.harness ?? "opencode",
     contextCap: promptOnlyDetected === undefined && isFinitePositive2(detectedContextLimit) ? detectedContextLimit : undefined
@@ -725,4 +484,4 @@ function getModelsDevCacheState() {
   };
 }
 
-export { catalogOutputReserve, setWindowOverlayPath, hasTrustedAbsoluteWall, applyProvenInputFloor, isSaneLimit, setOutputReserveConfig, resolveLimit, refreshModelLimitsFromApi, getSdkWindowGeometry, getSdkContextLimit, modelSupportsVision, getSdkOutputLimit, getSdkInputLimit, getModelsDevCacheState };
+export { catalogOutputReserve, hasTrustedAbsoluteWall, applyProvenInputFloor, isSaneLimit, setOutputReserveConfig, resolveLimit, refreshModelLimitsFromApi, getSdkWindowGeometry, getSdkContextLimit, modelSupportsVision, getSdkOutputLimit, getSdkInputLimit, getModelsDevCacheState };