@vue-skuilder/db 0.2.1 → 0.2.3

package/dist/impl/couch/index.mjs

@@ -1731,10 +1731,8 @@ var init_elo = __esm({
           { limit, elo: "user" },
           (c) => !activeCards.some((ac) => c.cardID === ac.cardID)
         )).map((c) => ({ ...c, status: "new" }));
-        const cardIds = newCards.map((c) => c.cardID);
-        const cardEloData = await this.course.getCardEloData(cardIds);
-        const scored = newCards.map((c, i) => {
-          const cardElo = cardEloData[i]?.global?.score ?? 1e3;
+        const scored = newCards.map((c) => {
+          const cardElo = c.elo ?? 1e3;
           const distance = Math.abs(cardElo - userGlobalElo);
           const rawScore = Math.max(0, 1 - distance / 500);
           const samplingKey = rawScore > 0 ? Math.random() ** (1 / rawScore) : 0;
@@ -3712,7 +3710,8 @@ var init_orchestration = __esm({
 // src/core/navigators/Pipeline.ts
 var Pipeline_exports = {};
 __export(Pipeline_exports, {
-  Pipeline: () => Pipeline
+  Pipeline: () => Pipeline,
+  mergeHints: () => mergeHints2
 });
 import { toCourseElo as toCourseElo5 } from "@vue-skuilder/common";
 function globToRegex(pattern) {
@@ -5451,6 +5450,7 @@ ${above.rows.map((r) => `	${r.id}-${r.key}
       }
       async addNavigationStrategy(data) {
         logger.debug(`[courseDB] Adding navigation strategy: ${data._id}`);
+        this.invalidateNavigatorCache();
         return this.remoteDB.put(data).then(() => {
         });
       }
@@ -5517,23 +5517,67 @@ ${e.stack}` : JSON.stringify(e);
        * @returns Cards sorted by score descending
        */
       _pendingHints = null;
+      /**
+       * Session-scoped cache of the broad ELO-neighbor pool used by
+       * getCardsCenteredAtELO. The `elo` view query re-indexes on first touch per
+       * call (PouchDB 9 ignores `stale`), so without this each plan/replan pays
+       * ~1.5-2s. The pool is fetched once and re-ranked against the live (roaming)
+       * ELO in memory on subsequent calls.
+       */
+      _eloPoolCache = null;
+      _eloPoolTtlMs = 5 * 60 * 1e3;
+      /**
+       * Cached assembled navigator (Pipeline). createNavigator() reads strategy
+       * docs and builds a fresh Pipeline every call — whose internal `_tagCache`
+       * and `_cachedOrchestration` are designed to make replans cheap but never
+       * survive, because the instance is discarded each run. Caching it lets those
+       * caches persist across plan/replan within a session (SessionController holds
+       * one CourseDB instance for the session's lifetime). Rebuilt on user change,
+       * TTL expiry, or explicit invalidation after a strategy-doc write.
+       */
+      _cachedNavigator = null;
+      _navigatorTtlMs = 5 * 60 * 1e3;
       setEphemeralHints(hints) {
         this._pendingHints = hints;
       }
       async getWeightedCards(limit) {
         const u = await this._getCurrentUser();
         try {
-          const navigator2 = await this.createNavigator(u);
+          const { navigator: navigator2 } = await this._getCachedNavigator(u);
           if (this._pendingHints) {
             navigator2.setEphemeralHints(this._pendingHints);
             this._pendingHints = null;
           }
-          return navigator2.getWeightedCards(limit);
+          const result = await navigator2.getWeightedCards(limit);
+          return result;
         } catch (e) {
           logger.error(`[courseDB] Error getting weighted cards: ${e}`);
           throw e;
         }
       }
+      /**
+       * Return the assembled navigator, reusing the cached instance when possible.
+       * Reuse preserves the Pipeline's per-session caches (tags, orchestration
+       * context) across replans, which is the dominant per-replan cost once the
+       * ELO-pool cost is removed. Rebuilds on user change or TTL expiry.
+       */
+      async _getCachedNavigator(user) {
+        const userId = user.getUsername();
+        const now = Date.now();
+        if (this._cachedNavigator && this._cachedNavigator.userId === userId && now - this._cachedNavigator.builtAt < this._navigatorTtlMs) {
+          return { navigator: this._cachedNavigator.navigator, cacheStatus: "hit" };
+        }
+        const navigator2 = await this.createNavigator(user);
+        this._cachedNavigator = { navigator: navigator2, userId, builtAt: now };
+        return { navigator: navigator2, cacheStatus: "miss" };
+      }
+      /**
+       * Drop the cached navigator so the next getWeightedCards() rebuilds it.
+       * Call after mutating this course's navigation strategy documents.
+       */
+      invalidateNavigatorCache() {
+        this._cachedNavigator = null;
+      }
       async getCardsCenteredAtELO(options = {
         limit: 99,
         elo: "user"
@@ -5556,20 +5600,31 @@ ${e.stack}` : JSON.stringify(e);
         } else {
           targetElo = options.elo;
         }
-        let cards = [];
-        let mult = 4;
-        let previousCount = -1;
-        let newCount = 0;
-        while (cards.length < options.limit && newCount !== previousCount) {
-          cards = await this.getCardsByELO(targetElo, mult * options.limit);
-          previousCount = newCount;
-          newCount = cards.length;
-          logger.debug(`Found ${cards.length} elo neighbor cards...`);
-          if (filter) {
-            cards = cards.filter(filter);
-            logger.debug(`Filtered to ${cards.length} cards...`);
-          }
-          mult *= 2;
+        const POOL_SIZE = Math.max(2e3, options.limit * 4);
+        const nowMs = Date.now();
+        let cacheStatus = "hit";
+        if (!this._eloPoolCache || nowMs - this._eloPoolCache.fetchedAt > this._eloPoolTtlMs) {
+          const fetched = await this.getCardsByELO(targetElo, POOL_SIZE);
+          if (fetched.length > 0) {
+            this._eloPoolCache = { rows: fetched, fetchedAt: nowMs };
+          }
+          cacheStatus = "miss";
+        }
+        const rankAgainstCurrentElo = () => {
+          const raw = this._eloPoolCache?.rows ?? [];
+          const survivors = filter ? raw.filter((c) => filter(c)) : raw;
+          return survivors.map((c) => ({ ...c })).sort(
+            (a, b) => Math.abs((a.elo ?? targetElo) - targetElo) - Math.abs((b.elo ?? targetElo) - targetElo)
+          );
+        };
+        let cards = rankAgainstCurrentElo();
+        if (cards.length < options.limit && (cacheStatus === "hit" || !this._eloPoolCache)) {
+          const fetched = await this.getCardsByELO(targetElo, POOL_SIZE);
+          if (fetched.length > 0) {
+            this._eloPoolCache = { rows: fetched, fetchedAt: nowMs };
+          }
+          cards = rankAgainstCurrentElo();
+          cacheStatus = "refresh";
         }
         const selectedCards = [];
         while (selectedCards.length < options.limit && cards.length > 0) {