@cortexkit/opencode-magic-context 0.49.7 → 0.49.8

package/dist/hooks/magic-context/unresolved-history-boundary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unresolved-history-boundary.d.ts","sourceRoot":"","sources":["../../../src/hooks/magic-context/unresolved-history-boundary.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,qBAAa,8BAA+B,SAAQ,KAAK;IAKjD,QAAQ,CAAC,eAAe,EAAE,MAAM;IAChC,QAAQ,CAAC,kBAAkB,EAAE,MAAM;IALvC,QAAQ,CAAC,IAAI,iCAAiC;IAC9C,QAAQ,CAAC,WAAW,QAAQ;gBAGf,eAAe,EAAE,MAAM,EACvB,kBAAkB,EAAE,MAAM;CAK1C"}
+{"version":3,"file":"unresolved-history-boundary.d.ts","sourceRoot":"","sources":["../../../src/hooks/magic-context/unresolved-history-boundary.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAIpD,sGAAsG;AACtG,wBAAgB,6BAA6B,CACzC,EAAE,EAAE,QAAQ,EACZ,SAAS,EAAE,MAAM,GAClB,OAAO,GAAG,SAAS,CAWrB;AAED;;;;;;GAMG;AACH,qBAAa,8BAA+B,SAAQ,KAAK;IAKjD,QAAQ,CAAC,eAAe,EAAE,MAAM;IAChC,QAAQ,CAAC,kBAAkB,EAAE,MAAM;IACnC,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO;IANtC,QAAQ,CAAC,IAAI,iCAAiC;IAC9C,QAAQ,CAAC,WAAW,QAAQ;gBAGf,eAAe,EAAE,MAAM,EACvB,kBAAkB,EAAE,MAAM,EAC1B,eAAe,CAAC,EAAE,OAAO,YAAA;CAWzC"}

package/dist/hooks/magic-context/wrapup-orchestrator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrapup-orchestrator.d.ts","sourceRoot":"","sources":["../../../src/hooks/magic-context/wrapup-orchestrator.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AASvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAIlE,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAC9D,YAAY,EAAE,MAAM,CAAC;IACrB,0BAA0B,EAAE,MAAM,CAAC;IACnC,qBAAqB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;IACvD,4BAA4B,CAAC,EAAE,OAAO,mBAAmB,CAAC;IAC1D,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACrC;AAED,MAAM,WAAW,aAAa;IAC1B,cAAc,EAAE,MAAM,CAAC;CAC1B;AA+OD,wBAAsB,gBAAgB,CAClC,GAAG,EAAE,oBAAoB,EACzB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,aAAa,GACvB,OAAO,CAAC,MAAM,CAAC,CA2BjB"}
+{"version":3,"file":"wrapup-orchestrator.d.ts","sourceRoot":"","sources":["../../../src/hooks/magic-context/wrapup-orchestrator.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AASvE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AAIlE,MAAM,WAAW,oBAAqB,SAAQ,oBAAoB;IAC9D,YAAY,EAAE,MAAM,CAAC;IACrB,0BAA0B,EAAE,MAAM,CAAC;IACnC,qBAAqB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC;IACvD,4BAA4B,CAAC,EAAE,OAAO,mBAAmB,CAAC;IAC1D,wBAAwB,CAAC,EAAE,MAAM,CAAC;CACrC;AAED,MAAM,WAAW,aAAa;IAC1B,cAAc,EAAE,MAAM,CAAC;CAC1B;AAkPD,wBAAsB,gBAAgB,CAClC,GAAG,EAAE,oBAAoB,EACzB,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,aAAa,GACvB,OAAO,CAAC,MAAM,CAAC,CA2BjB"}

package/dist/{index-g8qbdb03.js → index-0jz47061.js}

@@ -3,10 +3,13 @@ import {
 } from "./index-0sahzkwr.js";
 import {
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
+import {
+  inRootAsyncContext2
+} from "./index-wafzvyhg.js";
 import {
   projectDirectoryKey
-} from "./index-rzmjkdd6.js";
+} from "./index-knvkbfvh.js";
 import {
   writeStorageFileAtomicSync
 } from "./index-fvnzcnww.js";
@@ -539,7 +542,7 @@ function bootQuietRemainingMs(now = Date.now()) {
   return Math.max(0, bootQuietUntilMs - now);
 }
 function scheduleAfterBootQuiet(task, additionalDelayMs = 0) {
-  const timer = setTimeout(task, bootQuietRemainingMs() + Math.max(0, additionalDelayMs));
+  const timer = inRootAsyncContext2(() => setTimeout(task, bootQuietRemainingMs() + Math.max(0, additionalDelayMs)));
   timer.unref?.();
   return timer;
 }

package/dist/{index-4mjhqadz.js → index-150zz6fh.js}

@@ -1,6 +1,6 @@
 import {
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 
 // src/shared/write-transaction-timing.ts
 var SLOW_WRITE_TRANSACTION_THRESHOLD_MS = 1000;

package/dist/{index-j58gqrn2.js → index-2rw244rh.js}

@@ -6,7 +6,7 @@ import {
   StaleRouteHandleError,
   SubcClient,
   isConsumerReconnectTransient
-} from "./index-vkbqdnkj.js";
+} from "./index-kvw6xew3.js";
 import {
   getHarness2
 } from "./index-pavzsdc6.js";
@@ -15,11 +15,14 @@ import {
 } from "./index-0sahzkwr.js";
 import {
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
+import {
+  inRootAsyncContext2
+} from "./index-wafzvyhg.js";
 import {
   buildCanonicalChunkTextFromFts,
   loadCompartmentChunkEmbeddingsForSearch
-} from "./index-ax2jhztn.js";
+} from "./index-7bjgyaj1.js";
 import {
   recordEmbeddingMeasurement,
   saveCommitEmbedding,
@@ -36,7 +39,7 @@ import {
   enqueueShadowEmbeddingItems2,
   getProjectEmbeddingSnapshot2,
   embedItemsForProject2
-} from "./index-sf94at64.js";
+} from "./index-rg1cezmj.js";
 import {
   getProjectEmbeddings2
 } from "./index-4dhv7mqz.js";
@@ -45,13 +48,13 @@ import {
   isEmbeddingEnabled,
   embedText,
   ensureMemoryEmbeddings2
-} from "./index-w6bd03dc.js";
+} from "./index-a43xq1pg.js";
 import {
   ModuleMemoryAuthorityError2,
   getMemoriesByProject2,
   getMemoriesByProjects2,
   updateMemoryRetrievalCount2
-} from "./index-9yyqq3mm.js";
+} from "./index-n78avt2p.js";
 import {
   USER_FACING_FAILURES,
   getNotes,
@@ -60,20 +63,20 @@ import {
   sanitizeFtsQuery,
   searchMemoriesFTS,
   searchMemoriesFTSUnion
-} from "./index-n7kwfw2r.js";
+} from "./index-ydjgz36f.js";
 import {
   isRecord
-} from "./index-tmtty2x5.js";
+} from "./index-xpn05jxq.js";
 import {
   getIndexedMessageCorpusSize2
-} from "./index-wq16ahsn.js";
+} from "./index-b4gcb3rk.js";
 import {
   resolveWorkspaceShareCategories,
   resolveWorkspaceIdentitySet,
   expandWorkspaceIdentitySetWithAliases,
   resolveStoredPathWorkspaceIdentity,
   sourceNameForMemory
-} from "./index-j5hce1ab.js";
+} from "./index-qgp5vnt4.js";
 import {
   isKnownAutocommit
 } from "./index-8ajstryz.js";
@@ -234,6 +237,10 @@ var SERIAL_LANE_MAX_WAITERS = 16;
 var SERIAL_LANE_MAX_WAITERS_PER_SESSION = 8;
 var SERIAL_LANE_MIN_REMAINING_MS = 25;
 var CANONICAL_ROOT_CACHE_MAX_ENTRIES = 256;
+var monotonicClockForTests;
+function monotonicNow() {
+  return monotonicClockForTests?.() ?? performance.now();
+}
 function getDefaultSubcConnectionFile() {
   return join(getDataDir(), "cortexkit", "run", "subc-connection.json");
 }
@@ -481,7 +488,7 @@ class SubcModuleTransport {
     });
   }
   async call(args) {
-    const callStartedAt = performance.now();
+    const callStartedAt = monotonicNow();
     const timings = {
       lane: 0,
       route: 0,
@@ -527,7 +534,7 @@ class SubcModuleTransport {
       }
       throw error;
     }
-    timings.lane = performance.now() - callStartedAt;
+    timings.lane = monotonicNow() - callStartedAt;
     let rejectAbort;
     const aborted = new Promise((_resolve, reject) => {
       rejectAbort = reject;
@@ -544,25 +551,25 @@ class SubcModuleTransport {
             throw args.signal.reason ?? new Error("module transport call aborted");
           }
           const attemptDeadlineMs = Date.now() + attemptTimeoutMs;
-          const routeStartedAt = performance.now();
+          const routeStartedAt = monotonicNow();
           ensuredRoute = await this.ensureRoute(args.sessionId, args.projectRoot, attemptDeadlineMs, args.signal);
           if (args.signal?.aborted) {
             throw args.signal.reason ?? new Error("module transport call aborted");
           }
-          timings.route += performance.now() - routeStartedAt;
-          const encodeStartedAt = performance.now();
+          timings.route += monotonicNow() - routeStartedAt;
+          const encodeStartedAt = monotonicNow();
           const body = args.body instanceof Uint8Array ? args.body : Buffer.from(JSON.stringify(moduleRequestBody(args.body, args.method)));
-          timings.encode += performance.now() - encodeStartedAt;
-          const issueStartedAt = performance.now();
+          timings.encode += monotonicNow() - encodeStartedAt;
+          const issueStartedAt = monotonicNow();
           const request = ensuredRoute.client.request(ensuredRoute.route, body, {
             priority: Priority.Background,
             admissionClass: AdmissionClass.Normal,
             timeoutMs: Math.max(1, attemptDeadlineMs - Date.now())
           });
-          timings.issue += performance.now() - issueStartedAt;
-          const waitStartedAt = performance.now();
+          timings.issue += monotonicNow() - issueStartedAt;
+          const waitStartedAt = monotonicNow();
           const response = await this.beforeDeadline(Promise.race([request, aborted]), attemptDeadlineMs, "waiting for the module response");
-          timings.responseWait += performance.now() - waitStartedAt;
+          timings.responseWait += monotonicNow() - waitStartedAt;
           initialResponseReceived = true;
           if (this.client !== ensuredRoute.client || this.connectionGeneration !== ensuredRoute.generation) {
             throw this.connectionChangedError("subc connection changed while awaiting the module response");
@@ -647,7 +654,7 @@ class SubcModuleTransport {
       args.signal?.removeEventListener("abort", onAbort);
       finishWrapupTracking();
       releaseLane();
-      timings.settle = Math.max(0, performance.now() - callStartedAt - timings.lane - timings.route - timings.encode - timings.issue - timings.responseWait);
+      timings.settle = Math.max(0, monotonicNow() - callStartedAt - timings.lane - timings.route - timings.encode - timings.issue - timings.responseWait);
       args.onTimings?.(timings);
     }
   }
@@ -746,10 +753,10 @@ class SubcModuleTransport {
     return resolved;
   }
   connectClient() {
-    return SubcClient.connect({
+    return inRootAsyncContext2(() => SubcClient.connect({
       connectionFile: this.connectionFile,
       handshakeTimeoutMs: HANDSHAKE_TIMEOUT_MS
-    });
+    }));
   }
   backoffActiveError() {
     const error = new Error(`subc connection backoff active until ${this.nextProbeMs}`);
@@ -1606,7 +1613,7 @@ var connections = new Map;
 async function connect(connectionFile) {
   let connection = connections.get(connectionFile);
   if (!connection) {
-    connection = SubcClient.connect({ connectionFile });
+    connection = inRootAsyncContext2(() => SubcClient.connect({ connectionFile }));
     connections.set(connectionFile, connection);
     connection.catch(() => connections.delete(connectionFile));
   }

package/dist/{index-0gyq3djm.js → index-4hb8nt93.js}

@@ -1,13 +1,13 @@
 import {
   importPluginModule,
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 import {
   sendStatusNotification2
-} from "./index-vt4sf4ep.js";
+} from "./index-pgy3h49n.js";
 import {
   formatConflictShort
-} from "./index-z1tjp257.js";
+} from "./index-b64n4d0h.js";
 
 // src/plugin/conflict-warning-hook.ts
 import { existsSync, readFileSync } from "node:fs";

package/dist/{index-ax2jhztn.js → index-7bjgyaj1.js}

@@ -1,19 +1,19 @@
 import {
   getTokenEstimatorFingerprint,
   estimateTokens
-} from "./index-qx53vezw.js";
+} from "./index-gjvjh960.js";
 import {
   getHarness2
 } from "./index-pavzsdc6.js";
 import {
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 import {
   isSynapseEmbeddingTruncated
-} from "./index-vkbqdnkj.js";
+} from "./index-kvw6xew3.js";
 import {
   messageFtsOrdinalRangeIsMapped
-} from "./index-rzmjkdd6.js";
+} from "./index-mp2kghkv.js";
 
 // src/features/magic-context/compartment-chunk-embedding.ts
 import { createHash } from "node:crypto";

package/dist/{index-h2wc01qk.js → index-8kk7yh6m.js}

@@ -1,9 +1,9 @@
 import {
   estimateTokens
-} from "./index-qx53vezw.js";
+} from "./index-gjvjh960.js";
 import {
   stableStringify
-} from "./index-1bt88epp.js";
+} from "./index-bd9cjab3.js";
 
 // src/features/magic-context/tool-definition-tokens.ts
 import { createHash } from "node:crypto";

package/dist/{index-n5a170gs.js → index-9g1c4bt9.js}

@@ -3,7 +3,7 @@ import {
 } from "./index-pavzsdc6.js";
 import {
   sessionLog2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 import {
   UNKNOWN_FIT_RATIO,
   resolveDecisionCalibration,
@@ -23,7 +23,7 @@ import {
   TAG_SELECT_COLUMNS2,
   getCandidateToolOwners2,
   pickNearestPriorOwner2
-} from "./index-tmtty2x5.js";
+} from "./index-xpn05jxq.js";
 import {
   OMO_INTERNAL_INITIATOR_MARKER,
   isSystemDirective,
@@ -40,18 +40,18 @@ import {
   formatBlock,
   compactTextForSummary,
   mergeCommitHashes
-} from "./index-qx53vezw.js";
+} from "./index-gjvjh960.js";
 import {
   prepareCachedStatement2
-} from "./index-j8epsc0g.js";
+} from "./index-wafzvyhg.js";
 import {
   stableStringify
-} from "./index-1bt88epp.js";
+} from "./index-bd9cjab3.js";
 import {
   renderToolTemplate,
   resolveModelConfigValue,
   deriveDefaultProtectedTokens
-} from "./index-k6xvbj2e.js";
+} from "./index-w28y7d0z.js";
 import {
   readRawSessionMessagesFromDb2,
   readRawSessionMessagePageFromDb2,
@@ -68,25 +68,25 @@ import {
   readRawSeedTailFromDb2,
   readRawSessionBoundaryEndpointsFromDb2,
   prewarmRawSessionOrdinalsForDb
-} from "./index-37q80veb.js";
+} from "./index-angx1s0k.js";
 import {
   openCodeDbExists,
   withReadOnlySessionDb,
   getRawSessionMessageCountFromDb,
   getMessageTimesFromOpenCodeDb
-} from "./index-a8acx4gc.js";
+} from "./index-q76br5zn.js";
 import {
   getToolDefinitionMeasurementSignature,
   getLargestMeasuredToolDefinitionTokens,
   getMeasuredToolDefinitionTokens
-} from "./index-h2wc01qk.js";
+} from "./index-8kk7yh6m.js";
 import {
   canonicalModelIdentity,
   piModelRefToCanonical
 } from "./index-avwt563y.js";
 import {
   logSlowWriteTransaction
-} from "./index-4mjhqadz.js";
+} from "./index-150zz6fh.js";
 
 // src/features/magic-context/dreamer/token-budget.ts
 class DreamTokenBudgetExceeded extends Error {
@@ -1182,6 +1182,12 @@ function safeSlice(str, maxLen) {
 function isEditTool(name) {
   return name === "edit" || name === "write";
 }
+function needsEditMarker(input) {
+  return Object.keys(input).some((key) => {
+    const value = input[key];
+    return DIFF_KEYS.has(key) && typeof value === "string" && value.length > EDIT_REGION_HINT_LEN && !value.endsWith(TRUNCATION_SENTINEL);
+  });
+}
 function applyEditMarkerToInput(input) {
   for (const key of Object.keys(input)) {
     if (PATH_KEYS.has(key))
@@ -5824,24 +5830,18 @@ function setToolContent(part, content) {
   }
 }
 function clonePart(part) {
-  if (part === null || typeof part !== "object")
-    return part;
-  try {
-    return structuredClone(part);
-  } catch {
-    try {
-      return JSON.parse(JSON.stringify(part));
-    } catch {
-      return part;
-    }
-  }
+  return {
+    ...part,
+    ...isRecord(part.state) ? { state: { ...part.state } } : {}
+  };
 }
 function clampCloneInPlace(occurrence, clamp) {
-  const clone = clonePart(occurrence.part);
-  clamp(clone);
   const parts = occurrence.message.parts;
   const index = parts.indexOf(servedPart(occurrence));
   if (index >= 0) {
+    const clone = clamp(occurrence.part);
+    if (clone === servedPart(occurrence))
+      return;
     parts[index] = clone;
     occurrence.served = clone;
   }
@@ -5851,17 +5851,24 @@ function servedPart(occurrence) {
 }
 function skeletonRealToolPart(part, tagId, stripAttachments = false) {
   if (!isRecord(part))
-    return;
+    return part;
   const sentinel = `[dropped §${tagId}§]`;
   if (part.type === "tool" && isRecord(part.state)) {
-    part.state.output = sentinel;
+    if (part.state.output === sentinel && !needsAttachmentStrip(part.state, stripAttachments))
+      return part;
+    const clone = clonePart(part);
+    const state = clone.state;
+    state.output = sentinel;
     if (stripAttachments)
-      part.state.attachments = [];
-    return;
-  }
-  if (part.type === "tool_result") {
-    part.content = sentinel;
+      state.attachments = [];
+    return clone;
   }
+  if (part.type === "tool_result" && part.content !== sentinel)
+    return { ...part, content: sentinel };
+  return part;
+}
+function needsAttachmentStrip(state, strip) {
+  return strip && (!Array.isArray(state.attachments) || state.attachments.length !== 0);
 }
 function readToolPartRawInput(part) {
   if (!isRecord(part))
@@ -5874,51 +5881,62 @@ function readToolPartRawInput(part) {
     return part.input;
   return;
 }
+function isDroppedInput(input, sentinel) {
+  return isRecord(input) && Object.keys(input).length === 1 && Object.hasOwn(input, "dropped") && input.dropped === sentinel;
+}
 function truncateToolPart(part, tagId) {
   if (!isRecord(part))
-    return;
+    return part;
   const sentinel = `[dropped §${tagId}§]`;
   if (part.type === "tool" && isRecord(part.state)) {
-    const state = part.state;
+    if (part.state.output === sentinel && isDroppedInput(part.state.input, sentinel))
+      return part;
+    const clone = clonePart(part);
+    const state = clone.state;
     state.output = sentinel;
     state.input = droppedInputMarker(tagId);
-    return;
+    return clone;
   }
   if (part.type === "tool_result") {
-    part.content = sentinel;
-    return;
+    return part.content === sentinel ? part : { ...part, content: sentinel };
   }
   if (part.type === "tool-invocation") {
-    part.args = droppedInputMarker(tagId);
-    return;
+    return isDroppedInput(part.args, sentinel) ? part : { ...part, args: droppedInputMarker(tagId) };
   }
   if (part.type === "tool_use") {
-    part.input = droppedInputMarker(tagId);
+    return isDroppedInput(part.input, sentinel) ? part : { ...part, input: droppedInputMarker(tagId) };
   }
+  return part;
 }
 function editMarkerToolPart(part, tagId, stripAttachments = false) {
   if (!isRecord(part))
-    return;
+    return part;
   const sentinel = `[dropped §${tagId}§]`;
+  const input = readToolPartInput(part);
+  const rewriteInput = input !== null && needsEditMarker(input);
   if (part.type === "tool" && isRecord(part.state)) {
-    part.state.output = sentinel;
+    if (part.state.output === sentinel && !rewriteInput && !needsAttachmentStrip(part.state, stripAttachments))
+      return part;
+    const clone = clonePart(part);
+    const state = clone.state;
+    state.output = sentinel;
     if (stripAttachments)
-      part.state.attachments = [];
-    if (isRecord(part.state.input))
-      applyEditMarkerToInput(part.state.input);
-    return;
+      state.attachments = [];
+    if (rewriteInput) {
+      state.input = { ...input };
+      applyEditMarkerToInput(state.input);
+    }
+    return clone;
   }
   if (part.type === "tool_result") {
-    part.content = sentinel;
-    return;
-  }
-  if (part.type === "tool-invocation" && isRecord(part.args)) {
-    applyEditMarkerToInput(part.args);
-    return;
+    return part.content === sentinel ? part : { ...part, content: sentinel };
   }
-  if (part.type === "tool_use" && isRecord(part.input)) {
-    applyEditMarkerToInput(part.input);
+  if (rewriteInput) {
+    const markedInput = { ...input };
+    applyEditMarkerToInput(markedInput);
+    return { ...part, [part.type === "tool-invocation" ? "args" : "input"]: markedInput };
   }
+  return part;
 }
 function readToolPartInput(part) {
   if (!isRecord(part))
@@ -6147,9 +6165,7 @@ function createToolDropTarget(compositeKey, thinkingParts, index, batch, tagId)
         parts
       });
       const before = count(parts);
-      const retained = skeleton ? structuredClone(parts) : [];
-      for (const part of retained)
-        skeletonRealToolPart(part, tagId);
+      const retained = skeleton ? parts.map((part) => skeletonRealToolPart(part, tagId)) : [];
       const after = count(retained);
       return {
         beforeTools: before.toolCall,
@@ -6701,13 +6717,20 @@ function readRawSessionMessageOrdinalById2(sessionId, messageId) {
     return null;
   return withReadOnlySessionDb((db) => readRawSessionMessageOrdinalByIdFromDb2(db, sessionId, messageId));
 }
+function readRawSessionMessageOrderPosition(sessionId, messageId) {
+  const provider = sessionProviders.get(sessionId)?.provider;
+  if (provider) {
+    return provider.readMessageOrderById ? provider.readMessageOrderById(messageId) : provider.readMessageOrdinalById?.(messageId) ?? null;
+  }
+  return readRawSessionMessageOrdinalById2(sessionId, messageId);
+}
 function compareRawSessionMessageOrder2(sessionId, leftId, rightId) {
   const provider = sessionProviders.get(sessionId)?.provider;
   if (provider) {
-    if (!provider.readMessageOrdinalById)
+    if (!provider.readMessageOrderById && !provider.readMessageOrdinalById)
       return null;
-    const left = provider.readMessageOrdinalById(leftId);
-    const right = provider.readMessageOrdinalById(rightId);
+    const left = readRawSessionMessageOrderPosition(sessionId, leftId);
+    const right = readRawSessionMessageOrderPosition(sessionId, rightId);
     return left === null || right === null ? null : left - right;
   }
   if (!openCodeDbExists())

package/dist/{index-w6bd03dc.js → index-a43xq1pg.js}

@@ -1,21 +1,21 @@
 import {
   DEFAULT_LOCAL_EMBEDDING_MODEL
-} from "./index-k6xvbj2e.js";
+} from "./index-w28y7d0z.js";
 import {
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 import {
   isSynapseEmbeddingTruncated,
   SynapseEmbeddingProvider
-} from "./index-vkbqdnkj.js";
+} from "./index-kvw6xew3.js";
 import {
   LocalEmbeddingProvider
-} from "./index-gbmqa9x9.js";
+} from "./index-bmwfzz28.js";
 import {
   OpenAICompatibleEmbeddingProvider,
   getProjectEmbeddingSnapshot2,
   embedBatchForProject2
-} from "./index-sf94at64.js";
+} from "./index-rg1cezmj.js";
 import {
   isEmbeddingHostBusy2
 } from "./index-qt1qqasc.js";

package/dist/{index-tqf7yg27.js → index-a4b0gbyg.js}

@@ -1,6 +1,6 @@
 import {
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.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$/;

package/dist/{index-37q80veb.js → index-angx1s0k.js}

@@ -1,13 +1,14 @@
 import {
+  inRootAsyncContext2,
   getSqliteDatabasePath2,
   releaseIndexOwner2
-} from "./index-j8epsc0g.js";
+} from "./index-wafzvyhg.js";
 import {
   registerExitAbort
 } from "./index-v0p37hm2.js";
 import {
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 
 // src/hooks/magic-context/read-session-raw.ts
 import { isMainThread } from "node:worker_threads";
@@ -69,7 +70,7 @@ function runSessionWarmupWorker(input, options) {
       deadline.unref?.();
     };
     try {
-      worker = new Worker(options.entry ?? defaultEntry(), { workerData: input });
+      worker = inRootAsyncContext2(() => new Worker(options.entry ?? defaultEntry(), { workerData: input }));
     } catch (error) {
       finish({ failure: "start-failed", detail: String(error) });
       return;

package/dist/{index-wq16ahsn.js → index-b4gcb3rk.js}

@@ -5,7 +5,7 @@ import {
   tagRevisionKey,
   tagIdentityRevisionKey,
   deleteTagIdentityRevisions
-} from "./index-1bt88epp.js";
+} from "./index-bd9cjab3.js";
 import {
   getHarness2
 } from "./index-pavzsdc6.js";
@@ -13,30 +13,30 @@ import {
   removeSystemReminders,
   hasMeaningfulUserText2,
   extractTexts2
-} from "./index-qx53vezw.js";
+} from "./index-gjvjh960.js";
 import {
   getMagicContextStorageDir
 } from "./index-0sahzkwr.js";
 import {
   withSqliteBackgroundWriter2,
   withoutSqliteTransformPass2
-} from "./index-j8epsc0g.js";
+} from "./index-wafzvyhg.js";
 import {
   cleanUserText2
-} from "./index-n5a170gs.js";
+} from "./index-9g1c4bt9.js";
 import {
   recordMessageFtsRowid,
   recordIndexedMessageTime,
   messageFtsOrdinalRangeIsMapped,
   deleteUnmappedMessageFtsRows
-} from "./index-rzmjkdd6.js";
+} from "./index-mp2kghkv.js";
 import {
   isPidAlive,
   readProcessStartTime
-} from "./index-w4mw92w3.js";
+} from "./index-q28hsbpg.js";
 import {
   deleteChunkEmbedBackoffForSession
-} from "./index-ax2jhztn.js";
+} from "./index-7bjgyaj1.js";
 import {
   ensurePrivateStorageDirectorySync,
   writeStorageFileSync,
@@ -49,7 +49,7 @@ import {
 } from "./index-8ajstryz.js";
 import {
   logSlowWriteTransaction
-} from "./index-4mjhqadz.js";
+} from "./index-150zz6fh.js";
 
 // src/shared/bounded-session-map.ts
 class BoundedSessionMap {

package/dist/{index-z1tjp257.js → index-b64n4d0h.js}

@@ -3,7 +3,7 @@ import {
 } from "./index-sd3egckz.js";
 import {
   log2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 
 // src/shared/conflict-detector.ts
 import { homedir as homedir2 } from "node:os";

package/dist/{index-1bt88epp.js → index-bd9cjab3.js}

@@ -1,6 +1,6 @@
 import {
   sessionLog2
-} from "./index-nsjyysj0.js";
+} from "./index-mvvephtj.js";
 import {
   isKnownAutocommit
 } from "./index-8ajstryz.js";