@cortexkit/magic-context 0.49.19 → 0.49.20

package/dist/index.js

@@ -2285,6 +2285,15 @@ function scheduleFlush() {
     flush();
   }, FLUSH_INTERVAL_MS);
 }
+function appendLine(line) {
+  buffer.push(line);
+  bufferedBytes += Buffer.byteLength(line);
+  boundBuffer();
+  if (syncLogWrites || buffer.length >= BUFFER_SIZE_LIMIT)
+    flush();
+  else
+    scheduleFlush();
+}
 function log(message, data) {
   try {
     let diagnostic = stalePluginBuildDiagnostic(data);
@@ -2307,24 +2316,18 @@ ${data.stack}` : ""}`)}` : ` ${JSON.stringify(sanitizeConfigValue(data))}`;
       lineForwarder(line);
       return;
     }
-    buffer.push(line);
-    bufferedBytes += Buffer.byteLength(line);
-    boundBuffer();
-    if (buffer.length >= BUFFER_SIZE_LIMIT) {
-      flush();
-    } else {
-      scheduleFlush();
-    }
+    appendLine(line);
   } catch {}
 }
 function sessionLog(sessionId, message, data) {
   log(`[magic-context][${sessionId}] ${message}`, data);
 }
-var isTestEnv = false, buffer, flushTimer = null, FLUSH_INTERVAL_MS = 500, BUFFER_SIZE_LIMIT = 50, MAX_BUFFERED_BYTES, bufferedBytes = 0, droppedLines = 0, MAX_LOG_FILE_BYTES, SIZE_CHECK_INTERVAL_FLUSHES = 64, activeLogFile = null, activeLogSize = null, flushesSinceSizeCheck = 0, swallowedWriteCount = 0, lastErrorMessage = null, lastErrorTime = null, lineForwarder = null;
+var isTestEnv = false, syncLogWrites, buffer, flushTimer = null, FLUSH_INTERVAL_MS = 500, BUFFER_SIZE_LIMIT = 50, MAX_BUFFERED_BYTES, bufferedBytes = 0, droppedLines = 0, MAX_LOG_FILE_BYTES, SIZE_CHECK_INTERVAL_FLUSHES = 64, activeLogFile = null, activeLogSize = null, flushesSinceSizeCheck = 0, swallowedWriteCount = 0, lastErrorMessage = null, lastErrorTime = null, lineForwarder = null;
 var init_logger = __esm(() => {
   init_data_path();
   init_redaction();
   init_stale_plugin_build();
+  syncLogWrites = process.env.MAGIC_CONTEXT_LOG_SYNC === "1";
   buffer = [];
   MAX_BUFFERED_BYTES = 1024 * 1024;
   MAX_LOG_FILE_BYTES = 32 * 1024 * 1024;
@@ -13591,7 +13594,7 @@ async function withAsyncPrivilegedWriter(db, operation, options = {}) {
     } catch (error) {
       if (entered || !(error instanceof SqliteAcquisitionBusyError))
         throw error;
-      options.beforeRetry?.(error);
+      await options.beforeRetry?.(error);
       const elapsed = performance.now() - started;
       if (elapsed >= budgetMs) {
         reportSqliteDiagnostic(`sqlite writer site=privileged_writer lane=foreground acquire_ms=${Math.round(elapsed)} attempts=${attempts} outcome=busy`);
@@ -25440,6 +25443,61 @@ var init_exit_abort_registry = __esm(() => {
   controllers = new Set;
 });
 
+// ../plugin/src/shared/worker-shutdown.ts
+function createWorkerShutdown(worker, site, deadlineMs) {
+  let exited = false;
+  let forced = false;
+  let closing;
+  const exit = new Promise((resolve) => {
+    worker.once("exit", () => {
+      exited = true;
+      resolve();
+    });
+  });
+  const record = () => {
+    const counts = outcomes.get(site) ?? { graceful: 0, forced: 0 };
+    if (forced)
+      counts.forced += 1;
+    else
+      counts.graceful += 1;
+    outcomes.set(site, counts);
+  };
+  const terminate = () => {
+    forced = true;
+    worker.terminate().catch(() => {});
+  };
+  return {
+    close() {
+      if (closing)
+        return closing;
+      if (exited) {
+        closing = Promise.resolve();
+        return closing;
+      }
+      try {
+        worker.postMessage(WORKER_CLOSE_MESSAGE);
+      } catch {
+        terminate();
+      }
+      const fallback = setTimeout(() => {
+        if (!exited)
+          terminate();
+      }, deadlineMs);
+      fallback.unref?.();
+      closing = exit.then(() => {
+        clearTimeout(fallback);
+        record();
+      });
+      return closing;
+    }
+  };
+}
+var WORKER_CLOSE_MESSAGE, outcomes;
+var init_worker_shutdown = __esm(() => {
+  WORKER_CLOSE_MESSAGE = { kind: "close" };
+  outcomes = new Map;
+});
+
 // ../plugin/src/hooks/magic-context/read-session-raw.ts
 import { isMainThread } from "node:worker_threads";
 function isRawMessageRow(row) {
@@ -26463,6 +26521,7 @@ function runSessionWarmupWorker(input, options) {
   return new Promise((resolve) => {
     const openCancellation = new Int32Array(new SharedArrayBuffer(Int32Array.BYTES_PER_ELEMENT));
     let worker;
+    let shutdown;
     let deadline;
     let settled = false;
     const finish = (result) => {
@@ -26474,7 +26533,7 @@ function runSessionWarmupWorker(input, options) {
       options.signal?.removeEventListener("abort", abort);
       if (worker) {
         activeWorkers.delete(worker);
-        const stopped = worker.terminate();
+        const stopped = shutdown?.close() ?? worker.terminate();
         worker.unref();
         stopped.finally(() => {
           releaseIndexOwner(input);
@@ -26500,6 +26559,7 @@ function runSessionWarmupWorker(input, options) {
       worker = inRootAsyncContext(() => new Worker(options.entry ?? defaultEntry(), {
         workerData: { ...input, openCancellation: openCancellation.buffer }
       }));
+      shutdown = createWorkerShutdown(worker, "raw-ordinal-warmup", WARMUP_CLOSE_DEADLINE_MS);
     } catch (error) {
       finish({ failure: "start-failed", detail: String(error) });
       return;
@@ -26594,10 +26654,11 @@ function recordFailure(key, sessionId, failure, detail) {
     failedAt.set(key, Date.now());
   log(`[magic-context] WARN canonical ordinal warm-up failed for ${sessionId} (${failure}: ${detail}); counts remain bounded and callers must defer or retry`);
 }
-var ACCEPT_TIMEOUT_MS = 2000, RESULT_TIMEOUT_MS, FAILURE_BACKOFF_MS, inFlight, connectionIds, nextConnectionId = 0, failedAt, activeWorkers, failures, exitHookRegistered = false;
+var ACCEPT_TIMEOUT_MS = 2000, RESULT_TIMEOUT_MS, WARMUP_CLOSE_DEADLINE_MS = 2000, FAILURE_BACKOFF_MS, inFlight, connectionIds, nextConnectionId = 0, failedAt, activeWorkers, failures, exitHookRegistered = false;
 var init_raw_ordinal_warmup = __esm(async () => {
   init_exit_abort_registry();
   init_logger();
+  init_worker_shutdown();
   await __promiseAll([
     init_sqlite(),
     init_read_session_raw(),
@@ -49217,6 +49278,18 @@ var init_diagnostics_opencode = __esm(async () => {
 // ../plugin/src/features/magic-context/memory/embedding-model-match.ts
 var init_embedding_model_match = () => {};
 
+// ../plugin/src/features/magic-context/memory/local-embedding-pooling.ts
+var decisionLogged, unavailableLogged, metadataByCache, testMetadataByModel;
+var init_local_embedding_pooling = __esm(() => {
+  init_data_path();
+  init_logger();
+  init_storage_permissions();
+  decisionLogged = new Set;
+  unavailableLogged = new Set;
+  metadataByCache = new Map;
+  testMetadataByModel = new Map;
+});
+
 // ../plugin/src/features/magic-context/memory/normalize-hash.ts
 var init_normalize_hash = () => {};
 
@@ -49224,6 +49297,7 @@ var init_normalize_hash = () => {};
 var init_embedding_identity = __esm(async () => {
   init_magic_context();
   init_embedding_model_match();
+  init_local_embedding_pooling();
   init_normalize_hash();
   await init_embedding_synapse();
 });
@@ -49277,6 +49351,7 @@ var init_embedding_local = __esm(async () => {
   init_logger();
   init_stale_plugin_build();
   init_storage_permissions();
+  init_local_embedding_pooling();
   await __promiseAll([
     init_embedding_identity(),
     init_embedding_worker_client(),
@@ -51981,6 +52056,9 @@ function resolveHarnessBlock(container, harness) {
   const selected = harness === "omp" ? container?.omp ?? container?.pi : container?.[harness];
   return asRecord2(selected);
 }
+function sourceHarness(container, harness) {
+  return harness === "omp" && container?.omp == null ? "pi" : harness;
+}
 function normalizeModelEntry(entry, harness) {
   if (typeof entry === "string") {
     const model = readString(entry);
@@ -52027,13 +52105,19 @@ function resolveHistorianModel(config, harness) {
   const block = resolveHarnessBlock(historian, harness);
   if (!block)
     return { fallbacks: [] };
+  const source = `historian.${sourceHarness(historian, harness)}`;
+  const primary = resolvePrimaryEntry({
+    entry: block.model,
+    defaultQualifier: block[harness === "opencode" ? "variant" : "thinking_level"],
+    harness
+  });
+  const fallbacks = resolveFallbackEntries(block.fallback_models, harness);
   return {
-    primary: resolvePrimaryEntry({
-      entry: block.model,
-      defaultQualifier: block[harness === "opencode" ? "variant" : "thinking_level"],
-      harness
-    }),
-    fallbacks: resolveFallbackEntries(block.fallback_models, harness)
+    primary: primary ? { ...primary, sourceConfigKey: `${source}.model` } : undefined,
+    fallbacks: fallbacks.map((entry) => ({
+      ...entry,
+      sourceConfigKey: `${source}.fallback_models`
+    }))
   };
 }
 function resolveDreamerTaskModel(args) {
@@ -52052,15 +52136,25 @@ function resolveDreamerTaskModel(args) {
   const taskQualifier = taskBlock?.[args.harness === "opencode" ? "variant" : "thinking_level"];
   const harnessQualifier = harnessBlock[args.harness === "opencode" ? "variant" : "thinking_level"] ?? normalizeModelEntry(harnessBlock.model, args.harness)?.qualifier;
   const taskHasModel = taskBlock !== undefined && hasOwn2(taskBlock, "model");
+  const taskHasFallbacks = taskBlock !== undefined && hasOwn2(taskBlock, "fallback_models");
   const primarySource = taskHasModel ? taskBlock?.model : harnessBlock.model;
-  const fallbackSource = taskBlock !== undefined && hasOwn2(taskBlock, "fallback_models") ? taskBlock.fallback_models : harnessBlock.fallback_models;
+  const fallbackSource = taskHasFallbacks ? taskBlock?.fallback_models : harnessBlock.fallback_models;
+  const source = `dreamer.${sourceHarness(dreamer, args.harness)}`;
+  const primary = resolvePrimaryEntry({
+    entry: primarySource,
+    defaultQualifier: taskQualifier ?? harnessQualifier,
+    harness: args.harness
+  });
+  const fallbacks = resolveFallbackEntries(fallbackSource, args.harness);
   return {
-    primary: resolvePrimaryEntry({
-      entry: primarySource,
-      defaultQualifier: taskQualifier ?? harnessQualifier,
-      harness: args.harness
-    }),
-    fallbacks: resolveFallbackEntries(fallbackSource, args.harness),
+    primary: primary ? {
+      ...primary,
+      sourceConfigKey: taskHasModel ? `${source}.tasks.${args.task}.model` : `${source}.model`
+    } : undefined,
+    fallbacks: fallbacks.map((entry) => ({
+      ...entry,
+      sourceConfigKey: taskHasFallbacks ? `${source}.tasks.${args.task}.fallback_models` : `${source}.fallback_models`
+    })),
     schedule: readString(schedulingTask?.schedule),
     timeoutMinutes: typeof taskBlock?.timeout_minutes === "number" ? taskBlock.timeout_minutes : undefined,
     promotionThreshold: typeof schedulingTask?.promotion_threshold === "number" ? schedulingTask.promotion_threshold : undefined
@@ -52080,6 +52174,7 @@ function buildDreamTaskRuntimeConfigs(dreamer, harness, language, smartNotesEnab
       schedule: resolved.schedule ?? "",
       model: resolved.primary,
       fallbackModels: resolved.fallbacks,
+      modelConfigKey: resolved.primary?.sourceConfigKey ?? resolved.fallbacks[0]?.sourceConfigKey,
       thinkingLevel: harness === "pi" ? resolved.primary?.qualifier : undefined,
       language,
       timeoutMinutes: resolved.timeoutMinutes ?? 20,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cortexkit/magic-context",
-    "version": "0.49.19",
+    "version": "0.49.20",
     "description": "Unified CLI for Magic Context — setup, doctor, and migration across OpenCode, Pi, and OMP",
     "keywords": [
         "opencode",