@cortexkit/pi-magic-context 0.49.22 → 0.49.24

package/dist/{index-5j6vwg4z.js → index-ygzh9xdg.js}

@@ -15,7 +15,7 @@ import {
 } from "./index-2qtx0q6h.js";
 import {
   createFailClosedBlockingError
-} from "./index-dbgg6hsf.js";
+} from "./index-3jde7hdr.js";
 import {
   createWorkerShutdown
 } from "./index-54wmg4rj.js";
@@ -407,7 +407,7 @@ function startPiTagSnapshotWorker(request, options = {}) {
         reject(new PiTagHydrationError(`worker exited with code ${code} before a clean complete result`));
     });
   });
-  function abort(error = new PiTagHydrationError("cancelled")) {
+  function abort(error = new PiTagHydrationError("cancelled", "cancelled")) {
     if (settled)
       return;
     settled = true;
@@ -535,9 +535,9 @@ function createPiTagSnapshotReader(db) {
   const managed = new Set;
   const epoch = ++connectionEpoch;
   const sessionEpochs = new Map;
+  let closed = false;
   let jobId = 0;
   let current;
-  let desiredSession;
   let failedUntil = 0;
   let lastFailure;
   let failedSession;
@@ -580,24 +580,30 @@ function createPiTagSnapshotReader(db) {
   };
   const cancel = (sessionId) => {
     sessionEpochs.set(sessionId, (sessionEpochs.get(sessionId) ?? 0) + 1);
-    if (desiredSession === sessionId)
-      desiredSession = undefined;
     if (current?.sessionId === sessionId)
       current.cancel();
   };
-  const load = (sessionId) => inSnapshotRoot(async () => {
+  const load = (sessionId, kind) => inSnapshotRoot(async () => {
+    if (closed)
+      throw new PiTagHydrationError("connection closed");
     managed.add(sessionId);
     if (ready(sessionId))
       return;
-    desiredSession = sessionId;
     if (current) {
-      if (current.sessionId === sessionId && !current.stale)
+      if (current.sessionId === sessionId && !current.retryable && !current.preempted) {
+        if (kind === "turn")
+          current.kind = "turn";
         return current.result;
-      current.cancel();
-      await current.released;
-      if (desiredSession !== sessionId)
-        throw new PiTagHydrationError("session hydration superseded", "stale");
-      return load(sessionId);
+      }
+      if (kind === "turn" && current.kind === "prewarm" && current.sessionId !== sessionId && !current.preempted) {
+        current.preempted = true;
+        current.cancel();
+      }
+      const epoch = sessionEpochs.get(sessionId) ?? 0;
+      await Promise.allSettled([current.result, current.released]);
+      if (epoch !== (sessionEpochs.get(sessionId) ?? 0))
+        throw new PiTagHydrationError("session hydration cancelled while queued", "cancelled");
+      return load(sessionId, kind);
     }
     if (failedSession === sessionId && performance.now() < failedUntil)
       throw lastFailure;
@@ -620,6 +626,7 @@ function createPiTagSnapshotReader(db) {
     }, previous?.tags ?? []);
     const destination = {
       sessionId,
+      kind,
       result: Promise.resolve(),
       released: worker.released,
       cancel: worker.cancel
@@ -639,8 +646,10 @@ function createPiTagSnapshotReader(db) {
     };
     jobs.add(lifetime);
     destination.result = worker.result.then(({ candidate, generation }) => {
+      if (destination.preempted)
+        throw new PiTagHydrationError("prewarm yielded to a turn", "cancelled");
       const live = stamps(sessionId, token.jobId);
-      if (current !== destination || desiredSession !== sessionId || !samePiTagSnapshotToken(token, live) || token.totalRevision !== live.totalRevision || generation.revision !== token.totalRevision || generation.durable !== token.durableVersion)
+      if (closed || current !== destination || !samePiTagSnapshotToken(token, live) || token.totalRevision !== live.totalRevision || generation.revision !== token.totalRevision || generation.durable !== token.durableVersion)
         throw new PiTagHydrationError("owner generation or lifetime changed", "stale");
       const snapshot = {
         firstAllocationPending: live.revisionPresent ? undefined : candidate.tags.length === 0 && !db.prepare("SELECT 1 FROM tags WHERE session_id = ? LIMIT 1").get(sessionId) ? "empty" : "legacy",
@@ -669,12 +678,13 @@ function createPiTagSnapshotReader(db) {
       }
       cache.set(sessionId, snapshot);
     }).catch((error) => {
-      if (error instanceof PiTagHydrationError && error.code === "stale")
-        destination.stale = true;
-      if (current === destination && desiredSession === sessionId && token.sessionEpoch === (sessionEpochs.get(sessionId) ?? 0)) {
+      const retryable = error instanceof PiTagHydrationError && (error.code === "stale" || error.code === "cancelled");
+      if (retryable)
+        destination.retryable = true;
+      if (!destination.preempted && current === destination && token.sessionEpoch === (sessionEpochs.get(sessionId) ?? 0)) {
         failedSession = sessionId;
         lastFailure = error;
-        failedUntil = performance.now() + (error instanceof PiTagHydrationError && error.code === "stale" ? 0 : 500);
+        failedUntil = performance.now() + (retryable ? 0 : 500);
       }
       throw error;
     });
@@ -795,7 +805,7 @@ function createPiTagSnapshotReader(db) {
     configurable: true,
     writable: true,
     value: (...args) => {
-      desiredSession = undefined;
+      closed = true;
       nativeWaiters.clear();
       current?.cancel();
       cache.clear();
@@ -979,7 +989,7 @@ var activeJobs = new Map;
 var waitDeadlines = new WeakMap;
 function prewarmPiTagSnapshot(db, sessionId) {
   createPiTagSnapshotReader(db);
-  owners.get(db)?.load(sessionId).catch(() => {});
+  owners.get(db)?.load(sessionId, "prewarm").catch(() => {});
 }
 function cancelPiTagSnapshotSession(sessionId) {
   for (const job of activeJobs.get(sessionId) ?? [])
@@ -1023,7 +1033,7 @@ function ensurePiTagSnapshotReady(db, sessionId, budget) {
       const releaseNativeWaiter = owner.addNativeWaiter(() => budget.remainingOutcome() - PI_CONTEXT_BUDGET.completionReserveMs);
       try {
         await budget.wait(Promise.race([
-          owner.load(sessionId),
+          owner.load(sessionId, "turn"),
           new Promise((_, reject) => {
             timer = setTimeout(() => reject(new PiTagHydrationError("remaining pass budget exhausted waiting for tag snapshot; turn not sent, retry", "deadline")), allowance);
           })
@@ -1033,7 +1043,7 @@ function ensurePiTagSnapshotReady(db, sessionId, budget) {
         return;
       } catch (error) {
         budget.assert();
-        if (!(error instanceof PiTagHydrationError && error.code === "stale"))
+        if (!(error instanceof PiTagHydrationError && (error.code === "stale" || error.code === "cancelled")))
           throw error;
       } finally {
         clearTimeout(timer);