@cortexkit/opencode-magic-context 0.49.2 → 0.49.3

package/dist/index-v0p37hm2.js

@@ -0,0 +1,22 @@
+// src/shared/exit-abort-registry.ts
+var controllers = new Set;
+var listenerRegistered = false;
+function abortAll() {
+  for (const controller of controllers) {
+    try {
+      controller.abort();
+    } catch {}
+  }
+}
+function registerExitAbort(controller) {
+  controllers.add(controller);
+  if (listenerRegistered)
+    return;
+  listenerRegistered = true;
+  process.once("exit", abortAll);
+}
+function unregisterExitAbort(controller) {
+  controllers.delete(controller);
+}
+
+export { registerExitAbort, unregisterExitAbort };

package/dist/{index-eypn4ba6.js → index-w9pe0nx1.js}

@@ -3,16 +3,16 @@ import {
 } from "./index-nsjyysj0.js";
 import {
   clearEmergencyRecovery
-} from "./index-sv0bb7vg.js";
+} from "./index-7zg9dvx0.js";
 import {
   requestPendingMaterialization,
   dropSlot,
   executeContextRecomp
-} from "./index-zfzdpeq2.js";
+} from "./index-s4ztdn8v.js";
 import {
   renderUserFacingFailure,
   userFacingFailureCode
-} from "./index-rafsaxac.js";
+} from "./index-fjtgekd4.js";
 
 // src/hooks/magic-context/recomp-orchestrator.ts
 function resolveLiveModelKey(liveSessionState, sessionId) {

package/dist/{index-p0n5ryq8.js → index-ws3gcy5m.js}

@@ -68,7 +68,7 @@ import {
   adoptNullOwnerToolTag2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./index-nydv6g8r.js";
+} from "./index-yqps2zsv.js";
 import {
   textMentionsRecentCommit,
   hasMeaningfulUserText2,
@@ -91,7 +91,7 @@ import {
   getProjectEmbeddingSnapshot2,
   embedTextForProject2,
   embedBatchForProject2
-} from "./index-fg00p1cg.js";
+} from "./index-c0b01zrc.js";
 import {
   isEmbeddingHostBusy2
 } from "./index-qt1qqasc.js";
@@ -185,7 +185,7 @@ import {
   extractToolCallObservation,
   ToolMutationBatch,
   createToolDropTarget
-} from "./index-sv0bb7vg.js";
+} from "./index-7zg9dvx0.js";
 import {
   getMaxM0MutationId,
   rememberUnpublishedAutoSearchNoHint,
@@ -202,6 +202,7 @@ import {
   replaceSourceContent,
   getSourceContents,
   compareOpenCodeMessagesByCanonicalOrder,
+  prepareCompactionMarkerCandidates,
   MARKER_SUMMARY_TEXT,
   applyDeferredCompactionMarker,
   injectTemporalMarkers,
@@ -218,21 +219,21 @@ import {
   peekNoteNudgeText,
   markNoteNudgeDelivered,
   getActiveCompartmentRun
-} from "./index-zfzdpeq2.js";
+} from "./index-s4ztdn8v.js";
 import {
   runSessionWarmupWorker
-} from "./index-h5zfkjyk.js";
+} from "./index-jpm52v9x.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-0pjvpfkf.js";
+} from "./index-qvr78ej6.js";
 import {
   BoundedSessionMap
-} from "./index-sfhndpcb.js";
+} from "./index-3wckxwfp.js";
 import {
   renderUserFacingFailure
-} from "./index-rafsaxac.js";
+} from "./index-fjtgekd4.js";
 import {
   getErrorMessage
 } from "./index-y8v6yerm.js";
@@ -4766,6 +4767,9 @@ function applyRustModeDeferredCompactionMarker2(args) {
   const outcome = (args.applyDeferred ?? applyDeferredCompactionMarker)(args.db, args.sessionId, pending, args.sessionDirectory, trustedBoundary);
   args.afterApply?.(outcome);
   switch (outcome.kind) {
+    case "deferred":
+      sessionLog2(args.sessionId, "rust compaction-marker drain: candidate preparation deferred; pending target retained");
+      break;
     case "applied":
     case "already-current":
     case "stale-skip":
@@ -5976,9 +5980,15 @@ async function runPostTransformPhase2(args) {
         sessionLog2(args.sessionId, `compaction-marker drain: refusing ordinal ${pending.ordinal} because prefix trim through ${args.pendingCompartmentInjection?.compartmentEndMessageId ?? "<none>"} was not proven; preserving deferred history refresh signal`);
       } else {
         const tMarkerDrain = performance.now();
-        const outcome = (args.compactionMarkerStrategy ?? defaultCompactionMarkerStrategy2).applyDeferred(args.db, args.sessionId, pending, args.sessionDirectory);
+        const strategy = args.compactionMarkerStrategy ?? defaultCompactionMarkerStrategy2;
+        const candidatesReady = strategy.applyDeferred !== applyDeferredCompactionMarker || await prepareCompactionMarkerCandidates(args.sessionId);
+        const outcome = candidatesReady ? strategy.applyDeferred(args.db, args.sessionId, pending, args.sessionDirectory) : { kind: "deferred", reason: "candidate-preparation" };
         logTransformTiming(args.sessionId, "pp.markerDrain", tMarkerDrain, `outcome=${outcome.kind}`);
         switch (outcome.kind) {
+          case "deferred":
+            suppressV12HistoryDrain = true;
+            sessionLog2(args.sessionId, "compaction-marker drain: candidate preparation deferred; preserving deferred history refresh signal");
+            break;
           case "applied":
           case "already-current":
           case "stale-skip":

package/dist/{index-att4bfan.js → index-xfbfrngb.js}

@@ -20,7 +20,7 @@ import {
 import {
   normalizeStoredProjectPath,
   storedPathBelongsToIdentity
-} from "./index-gzky5rva.js";
+} from "./index-41gqa557.js";
 import {
   logSlowWriteTransaction
 } from "./index-4mjhqadz.js";

package/dist/{index-nydv6g8r.js → index-yqps2zsv.js}

@@ -129,6 +129,7 @@ function isThinkingPart(part) {
 
 // src/shared/tag-owner-id.ts
 var TEXT_TAG_IDENTITY_MARKER = ":mc-text-v1:";
+var PI_FALLBACK_PREFIXES_JSON = JSON.stringify([..."pi-msg-"].reduce((prefixes, char) => prefixes.flatMap((prefix) => /[a-z]/.test(char) ? [prefix + char, prefix + char.toUpperCase()] : [prefix + char]), [""]));
 var POSITIONAL_CONTENT_SUFFIX = /:(?:p|file)\d+$/;
 var CONTENT_DERIVED_TEXT_SUFFIX = /:mc-text-v1:[0-9a-f]+:[0-9a-f]+:o\d+$/;
 function contentTagOwnerMessageId(contentId) {
@@ -2257,8 +2258,41 @@ function getPersistedToolTagAccounting2(db, sessionId, tagNumber) {
   }
   return row;
 }
-function getAllStatusTagTokenTotalsFlat2(db, sessionId, floor = 0, calibration = { proseRatio: 1, toolsRatio: 1 }) {
-  const rows = floor > 0 ? db.prepare(`SELECT type, message_id, tool_owner_message_id, token_count, input_token_count, reasoning_token_count
+function getAllStatusTagTokenTotalsFlat2(db, sessionId, floor = 0, calibration = { proseRatio: 1, toolsRatio: 1 }, ownerMessageIds) {
+  const columns = "type, message_id, tool_owner_message_id, token_count, input_token_count, reasoning_token_count";
+  const owners = ownerMessageIds ? new Set(ownerMessageIds) : undefined;
+  let scanOrder = "id";
+  if (owners) {
+    const planStatement = db.prepare(`EXPLAIN QUERY PLAN SELECT ${columns} FROM tags WHERE session_id = ?${floor > 0 ? " AND tag_number >= ?" : ""}`);
+    let plan;
+    try {
+      plan = planStatement.all(sessionId, ...floor > 0 ? [floor] : []);
+    } finally {
+      planStatement.finalize?.();
+    }
+    const index = plan.map((row) => /USING (?:COVERING )?INDEX (\S+)/.exec(row.detail)?.[1]).find(Boolean);
+    if (index) {
+      const keyStatement = db.prepare("SELECT name, coll, desc FROM pragma_index_xinfo(?) WHERE key = 1 ORDER BY seqno");
+      let keys;
+      try {
+        keys = keyStatement.all(index);
+      } finally {
+        keyStatement.finalize?.();
+      }
+      scanOrder = [
+        ...keys.map((key) => `"${(key.name ?? "id").replaceAll('"', '""')}" COLLATE "${key.coll.replaceAll('"', '""')}"${key.desc ? " DESC" : ""}`),
+        "id"
+      ].join(", ");
+    }
+  }
+  const rows = owners ? db.prepare(`SELECT ${columns} FROM tags WHERE id IN (
+                SELECT t.id FROM json_each(?) o CROSS JOIN tags t INDEXED BY idx_tags_session_message_id
+                ON t.session_id = ? AND t.message_id >= o.value AND t.message_id < o.value || ';'
+                UNION
+                SELECT t.id FROM json_each(?) o CROSS JOIN tags t INDEXED BY idx_tags_pi_fallback_tool_owner
+                ON t.session_id = ? AND t.tool_owner_message_id = o.value
+                WHERE t.type = 'tool'
+              ) AND tag_number >= ? ORDER BY ${scanOrder}`).all(JSON.stringify([...owners]), sessionId, JSON.stringify([...owners]), sessionId, floor) : floor > 0 ? db.prepare(`SELECT type, message_id, tool_owner_message_id, token_count, input_token_count, reasoning_token_count
                        FROM tags
                        WHERE session_id = ? AND tag_number >= ?`).all(sessionId, floor) : db.prepare(`SELECT type, message_id, tool_owner_message_id, token_count, input_token_count, reasoning_token_count
                        FROM tags
@@ -2269,6 +2303,8 @@ function getAllStatusTagTokenTotalsFlat2(db, sessionId, floor = 0, calibration =
     if (row.type === "tool" && row.tool_owner_message_id === null)
       continue;
     const owner = ownerMessageIdForTagRow(row);
+    if (owners && !owners.has(owner))
+      continue;
     if (row.token_count === null) {
       nullMessageIds.add(owner);
       totals.delete(owner);
@@ -3032,11 +3068,13 @@ function findPiFallbackToolOwnerTags2(db, sessionId) {
                     message_id AS callId,
                     tool_owner_message_id AS toolOwnerMessageId,
                     status
-             FROM tags
+             FROM json_each(?) prefix CROSS JOIN tags
              WHERE session_id = ?
-               AND type = 'tool'
-               AND tool_owner_message_id LIKE 'pi-msg-%'
-             ORDER BY tag_number ASC`).all(sessionId).filter(isPiFallbackToolOwnerTag);
+               AND tags.type = 'tool'
+                AND tool_owner_message_id >= prefix.value
+                AND tool_owner_message_id < substr(prefix.value, 1, 6) || '.'
+                AND tool_owner_message_id LIKE 'pi-msg-%'
+             ORDER BY tag_number ASC`).all(PI_FALLBACK_PREFIXES_JSON, sessionId).filter(isPiFallbackToolOwnerTag);
 }
 
 class PiTagIdentityConflictError extends Error {

package/dist/index-yxawqmdd.js

@@ -0,0 +1,212 @@
+import {
+  registerExitAbort
+} from "./index-v0p37hm2.js";
+import {
+  log2
+} from "./index-nsjyysj0.js";
+import {
+  getSqliteDatabasePath2
+} from "./index-kb9nn0a0.js";
+
+// src/features/magic-context/compaction-marker-candidates.ts
+import { existsSync, realpathSync } from "node:fs";
+import { fileURLToPath } from "node:url";
+import { Worker } from "node:worker_threads";
+var candidates = new WeakMap;
+var pending = new WeakMap;
+var workers = new Set;
+var missingWorkerWarnings = new Set;
+var ownWriteRevisions = new Map;
+var exitRegistered = false;
+function reportWorkerUnavailable(entry, detail) {
+  if (missingWorkerWarnings.has(entry.href))
+    return;
+  missingWorkerWarnings.add(entry.href);
+  const path = entry.protocol === "file:" ? fileURLToPath(entry) : entry.href;
+  log2(`[magic-context] [ERROR] compaction-marker: candidate worker unavailable ${path}: ${detail}; marker unchanged, advancement deferred`);
+}
+var MARKER_CERTIFICATION_SQL = `SELECT
+    (SELECT rowid FROM message WHERE id = ?) AS previousRowid,
+    (SELECT rowid FROM message ORDER BY rowid DESC LIMIT 1) AS newestRowid,
+    (SELECT id FROM message ORDER BY rowid DESC LIMIT 1) AS newestId,
+    EXISTS(SELECT 1 FROM message
+      WHERE rowid > ? AND +session_id = ? AND json_valid(data)
+        AND COALESCE(json_extract(data, '$.summary'), 0) = 1) AS newSummary`;
+function isMarkerCandidateBasisCurrent2(db, basis) {
+  if (basis.connection !== db || ownWriteRevisions.get(basis.revisionKey) !== basis.ownWriteRevision)
+    return false;
+  try {
+    const current = db.prepare(MARKER_CERTIFICATION_SQL).get(basis.frontier?.id ?? null, basis.frontier?.rowid ?? 0, basis.sessionId);
+    if (current.newSummary || basis.frontier && (current.previousRowid !== basis.frontier.rowid || current.newestRowid === null || current.newestRowid < basis.frontier.rowid))
+      return false;
+    if (current.newestRowid !== null && (!Number.isSafeInteger(current.newestRowid) || current.newestId === null))
+      return false;
+    basis.frontier = current.newestRowid === null || current.newestId === null ? null : { rowid: current.newestRowid, id: current.newestId };
+    return true;
+  } catch {
+    return false;
+  }
+}
+function invalidateMarkerCandidateBasis2(db, sessionId) {
+  candidates.get(db)?.delete(sessionId);
+  const path = getSqliteDatabasePath2(db);
+  if (!path)
+    return;
+  const key = `${realpathSync(path)}\x00${sessionId}`;
+  const revision = ownWriteRevisions.get(key);
+  if (revision !== undefined)
+    ownWriteRevisions.set(key, revision + 1);
+}
+function readMarkerCandidateBasis2(db, sessionId) {
+  const basis = candidates.get(db)?.get(sessionId);
+  if (basis && isMarkerCandidateBasisCurrent2(db, basis))
+    return basis;
+  candidates.get(db)?.delete(sessionId);
+  return;
+}
+function prepareMarkerCandidateBasis2(db, sessionId, options = {}) {
+  if (readMarkerCandidateBasis2(db, sessionId))
+    return Promise.resolve(true);
+  const path = getSqliteDatabasePath2(db);
+  if (!path || db.inTransaction)
+    return Promise.resolve(false);
+  const active = pending.get(db) ?? new Map;
+  const existing = active.get(sessionId);
+  if (existing)
+    return existing;
+  const revisionKey = `${realpathSync(path)}\x00${sessionId}`;
+  const ownWriteRevision = ownWriteRevisions.get(revisionKey) ?? 0;
+  ownWriteRevisions.set(revisionKey, ownWriteRevision);
+  const entry = options.entry ?? markerWorkerEntry();
+  if (entry.protocol === "file:" && !existsSync(fileURLToPath(entry))) {
+    reportWorkerUnavailable(entry, "file missing");
+    return Promise.resolve(false);
+  }
+  const preparation = runCandidateWorker(path, sessionId, options).then((snapshot) => {
+    if (!snapshot)
+      return false;
+    const basis = {
+      ...snapshot,
+      connection: db,
+      sessionId,
+      revisionKey,
+      ownWriteRevision
+    };
+    if (!isMarkerCandidateBasisCurrent2(db, basis)) {
+      candidates.get(db)?.delete(sessionId);
+      log2(`[magic-context] compaction-marker: deferred candidate preparation for ${sessionId}: summary set or frontier changed during discovery; marker unchanged`);
+      return false;
+    }
+    const sessions = candidates.get(db) ?? new Map;
+    sessions.set(sessionId, basis);
+    candidates.set(db, sessions);
+    return true;
+  }).finally(() => {
+    if (active.get(sessionId) === preparation)
+      active.delete(sessionId);
+  });
+  active.set(sessionId, preparation);
+  pending.set(db, active);
+  return preparation;
+}
+function markerWorkerEntry() {
+  return new URL(new URL(import.meta.url).pathname.endsWith(".ts") ? "./compaction-marker-candidates-worker.ts" : "./compaction-marker-candidates-worker.js", import.meta.url);
+}
+function runCandidateWorker(path, sessionId, options) {
+  if (!exitRegistered) {
+    exitRegistered = true;
+    const controller = new AbortController;
+    controller.signal.addEventListener("abort", () => {
+      for (const worker of workers) {
+        worker.terminate();
+        worker.unref();
+      }
+    }, { once: true });
+    registerExitAbort(controller);
+  }
+  return new Promise((resolve) => {
+    const entry = options.entry ?? markerWorkerEntry();
+    let worker;
+    let timer;
+    let done = false;
+    const finish = (snapshot) => {
+      if (done)
+        return;
+      done = true;
+      clearTimeout(timer);
+      if (!worker) {
+        resolve(snapshot);
+        return;
+      }
+      workers.delete(worker);
+      const stopped = worker.terminate();
+      worker.unref();
+      stopped.then(() => resolve(snapshot), () => resolve(snapshot));
+    };
+    const deadline = (ms) => {
+      clearTimeout(timer);
+      timer = setTimeout(() => {
+        reportWorkerUnavailable(entry, "worker deadline exceeded");
+        finish();
+      }, ms);
+      timer.unref?.();
+    };
+    try {
+      worker = new Worker(entry, { workerData: { path, sessionId } });
+      workers.add(worker);
+      worker.unref();
+      deadline(options.acceptMs ?? 2000);
+      worker.on("message", (reply) => {
+        if (reply.kind === "accepted")
+          deadline(options.resultMs ?? 600000);
+        else if (reply.kind === "candidates")
+          finish(reply.snapshot);
+        else {
+          reportWorkerUnavailable(entry, reply.error);
+          finish();
+        }
+      });
+      worker.on("error", (error) => {
+        reportWorkerUnavailable(entry, error.message);
+        finish();
+      });
+      worker.on("exit", (code) => {
+        if (!done)
+          reportWorkerUnavailable(entry, `worker exited before replying (${code})`);
+        finish();
+      });
+    } catch (error) {
+      reportWorkerUnavailable(entry, error instanceof Error ? error.message : String(error));
+      finish();
+    }
+  });
+}
+function scanMarkerSummaryCandidates(db, sessionId) {
+  const ownsSnapshot = !db.inTransaction;
+  if (ownsSnapshot)
+    db.exec("BEGIN");
+  try {
+    return db.prepare(`SELECT id FROM message WHERE session_id=? AND
+            CASE WHEN json_valid(data) THEN COALESCE(json_extract(data,'$.summary'),0) ELSE 0 END=1`).all(sessionId).map((row) => row.id);
+  } finally {
+    if (ownsSnapshot)
+      db.exec("ROLLBACK");
+  }
+}
+function scanMarkerCandidateSnapshot2(db, sessionId) {
+  const ownsSnapshot = !db.inTransaction;
+  if (ownsSnapshot)
+    db.exec("BEGIN");
+  try {
+    const ids = scanMarkerSummaryCandidates(db, sessionId);
+    const frontier = db.prepare("SELECT rowid,id FROM message ORDER BY rowid DESC LIMIT 1").get() ?? null;
+    if (frontier && !Number.isSafeInteger(frontier.rowid))
+      throw new Error("marker frontier rowid is not a safe integer");
+    return { ids, frontier };
+  } finally {
+    if (ownsSnapshot)
+      db.exec("ROLLBACK");
+  }
+}
+
+export { isMarkerCandidateBasisCurrent2, invalidateMarkerCandidateBasis2, readMarkerCandidateBasis2, prepareMarkerCandidateBasis2, scanMarkerCandidateSnapshot2 };

package/dist/{index-zg8yq4ya.js → index-znzgze2v.js}

@@ -47,7 +47,7 @@ import {
   hasPendingMigrations,
   getMainThreadMigrationBodyCount,
   runMigrations
-} from "./index-att4bfan.js";
+} from "./index-xfbfrngb.js";
 import {
   installTagIdentityRevisionTrigger,
   ensureColumn,
@@ -60,7 +60,7 @@ import {
 import {
   bootQuietRemainingMs,
   scheduleAfterBootQuiet
-} from "./index-gzky5rva.js";
+} from "./index-41gqa557.js";
 import {
   setDatabase,
   loadToolDefinitionMeasurements
@@ -1259,7 +1259,7 @@ function finishDatabaseOpen(db, dbPath, explicitDbPath, latestSupportedVersion)
       startMessageFtsRowidMapBackfill(db).then(async () => {
         if (!readsOpenCodeStore)
           return;
-        const { readRawSessionMessagePage, readRawSessionMessages } = await importPluginModule(() => import("./read-session-chunk-5mh0bh8y.js"));
+        const { readRawSessionMessagePage, readRawSessionMessages } = await importPluginModule(() => import("./read-session-chunk-cwgjwjd0.js"));
         const { startMessageTimeBackfill } = await importPluginModule(() => import("./message-time-backfill-8x06r9kx.js"));
         await startMessageTimeBackfill(db, Object.assign(readRawSessionMessages, {
           readPage: readRawSessionMessagePage