@vue-skuilder/db 0.2.5 → 0.2.7

package/dist/index.d.cts

@@ -4,7 +4,7 @@ import { D as DataLayerProvider } from './dataLayerProvider-CiA2Rr0v.cjs';
 import { C as CardHistory, c as CardRecord, d as QuestionRecord } from './types-legacy-4tlwHnXo.cjs';
 export { e as CardData, f as CourseListData, h as DataShapeData, g as DisplayableData, D as DocType, b as DocTypePrefixes, F as Field, G as GuestUsername, Q as QualifiedCardID, i as QuestionData, S as SkuilderCourseData, a as Tag, T as TagStub, l as log } from './types-legacy-4tlwHnXo.cjs';
 import { Loggable } from './core/index.cjs';
-export { BulkCardProcessorConfig, CardFilter, CardFilterFactory, FilterContext, FilterImpact, GeneratorSummary, GradientObservation, GradientResult, ImportResult, PeriodUpdateInput, PeriodUpdateResult, PipelineRunReport, SignalConfig, StrategyLearningState, StrategyStateDoc, StrategyStateId, aggregateOutcomesForGradient, areQuestionRecords, buildStrategyStateId, computeOutcomeSignal, computeStrategyGradient, docIsDeleted, getCardHistoryID, getDefaultLearnableWeight, importParsedCards, isQuestionRecord, mountPipelineDebugger, mountUserDBDebugger, parseCardHistoryID, pipelineDebugAPI, recordUserOutcome, runPeriodUpdate, scoreAccuracyInZone, updateLearningState, updateStrategyWeight, userDBDebugAPI, validateProcessorConfig } from './core/index.cjs';
+export { BulkCardProcessorConfig, CardFilter, CardFilterFactory, DIVERSITY_FLOOR, DIVERSITY_STRENGTH, DiversityRerankOptions, FilterContext, FilterImpact, GeneratorSummary, GradientObservation, GradientResult, ImportResult, PeriodUpdateInput, PeriodUpdateResult, PipelineRunReport, SignalConfig, StrategyLearningState, StrategyStateDoc, StrategyStateId, aggregateOutcomesForGradient, areQuestionRecords, buildStrategyStateId, computeOutcomeSignal, computeStrategyGradient, diversityRerank, docIsDeleted, getCardHistoryID, getDefaultLearnableWeight, importParsedCards, isQuestionRecord, mountPipelineDebugger, mountUserDBDebugger, parseCardHistoryID, pipelineDebugAPI, recordUserOutcome, runPeriodUpdate, scoreAccuracyInZone, updateLearningState, updateStrategyWeight, userDBDebugAPI, validateProcessorConfig } from './core/index.cjs';
 import { TaggedPerformance, TagFilter, DataShape, CourseConfig } from '@vue-skuilder/common';
 import { S as StaticCourseManifest } from './types-BFUa1pa3.cjs';
 export { A as AttachmentData, C as ChunkMetadata, D as DesignDocument, I as IndexMetadata, a as PackedCourseData, P as PackerConfig } from './types-BFUa1pa3.cjs';

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import { D as DataLayerProvider } from './dataLayerProvider-DrBqOUa3.js';
 import { C as CardHistory, c as CardRecord, d as QuestionRecord } from './types-legacy-4tlwHnXo.js';
 export { e as CardData, f as CourseListData, h as DataShapeData, g as DisplayableData, D as DocType, b as DocTypePrefixes, F as Field, G as GuestUsername, Q as QualifiedCardID, i as QuestionData, S as SkuilderCourseData, a as Tag, T as TagStub, l as log } from './types-legacy-4tlwHnXo.js';
 import { Loggable } from './core/index.js';
-export { BulkCardProcessorConfig, CardFilter, CardFilterFactory, FilterContext, FilterImpact, GeneratorSummary, GradientObservation, GradientResult, ImportResult, PeriodUpdateInput, PeriodUpdateResult, PipelineRunReport, SignalConfig, StrategyLearningState, StrategyStateDoc, StrategyStateId, aggregateOutcomesForGradient, areQuestionRecords, buildStrategyStateId, computeOutcomeSignal, computeStrategyGradient, docIsDeleted, getCardHistoryID, getDefaultLearnableWeight, importParsedCards, isQuestionRecord, mountPipelineDebugger, mountUserDBDebugger, parseCardHistoryID, pipelineDebugAPI, recordUserOutcome, runPeriodUpdate, scoreAccuracyInZone, updateLearningState, updateStrategyWeight, userDBDebugAPI, validateProcessorConfig } from './core/index.js';
+export { BulkCardProcessorConfig, CardFilter, CardFilterFactory, DIVERSITY_FLOOR, DIVERSITY_STRENGTH, DiversityRerankOptions, FilterContext, FilterImpact, GeneratorSummary, GradientObservation, GradientResult, ImportResult, PeriodUpdateInput, PeriodUpdateResult, PipelineRunReport, SignalConfig, StrategyLearningState, StrategyStateDoc, StrategyStateId, aggregateOutcomesForGradient, areQuestionRecords, buildStrategyStateId, computeOutcomeSignal, computeStrategyGradient, diversityRerank, docIsDeleted, getCardHistoryID, getDefaultLearnableWeight, importParsedCards, isQuestionRecord, mountPipelineDebugger, mountUserDBDebugger, parseCardHistoryID, pipelineDebugAPI, recordUserOutcome, runPeriodUpdate, scoreAccuracyInZone, updateLearningState, updateStrategyWeight, userDBDebugAPI, validateProcessorConfig } from './core/index.js';
 import { TaggedPerformance, TagFilter, DataShape, CourseConfig } from '@vue-skuilder/common';
 import { S as StaticCourseManifest } from './types-CHgpWQAY.js';
 export { A as AttachmentData, C as ChunkMetadata, D as DesignDocument, I as IndexMetadata, a as PackedCourseData, P as PackerConfig } from './types-CHgpWQAY.js';

package/dist/index.js

@@ -872,6 +872,95 @@ var init_courseLookupDB = __esm({
   }
 });
 
+// src/core/navigators/diversityRerank.ts
+var diversityRerank_exports = {};
+__export(diversityRerank_exports, {
+  DIVERSITY_FLOOR: () => DIVERSITY_FLOOR,
+  DIVERSITY_STRENGTH: () => DIVERSITY_STRENGTH,
+  diversityRerank: () => diversityRerank
+});
+function diversityRerank(cards, opts = {}) {
+  const strength = opts.strength ?? DIVERSITY_STRENGTH;
+  const floor = opts.floor ?? DIVERSITY_FLOOR;
+  const n = cards.length;
+  if (n <= 1) return cards;
+  const df = /* @__PURE__ */ new Map();
+  for (const card of cards) {
+    for (const tag of card.tags ?? []) {
+      df.set(tag, (df.get(tag) ?? 0) + 1);
+    }
+  }
+  const idf = /* @__PURE__ */ new Map();
+  for (const [tag, freq] of df) {
+    idf.set(tag, Math.log(n / freq));
+  }
+  const remaining = [...cards];
+  const emittedCount = /* @__PURE__ */ new Map();
+  const out = [];
+  const repetitionLoad = (card) => {
+    let load = 0;
+    for (const tag of card.tags ?? []) {
+      const seen = emittedCount.get(tag);
+      if (seen) load += (idf.get(tag) ?? 0) * seen;
+    }
+    return load;
+  };
+  while (remaining.length > 0) {
+    let bestIdx = 0;
+    let bestValue = -Infinity;
+    let bestPenalty = 1;
+    let bestLoad = 0;
+    for (let i = 0; i < remaining.length; i++) {
+      const card = remaining[i];
+      const load = repetitionLoad(card);
+      const penalty = load > 0 ? Math.max(floor, 1 / (1 + strength * load)) : 1;
+      const value = card.score * penalty;
+      if (value > bestValue) {
+        bestValue = value;
+        bestIdx = i;
+        bestPenalty = penalty;
+        bestLoad = load;
+      }
+    }
+    const [picked] = remaining.splice(bestIdx, 1);
+    if (Number.isFinite(picked.score) && bestPenalty < 1) {
+      const newScore = picked.score * bestPenalty;
+      out.push({
+        ...picked,
+        score: newScore,
+        provenance: [
+          ...picked.provenance,
+          {
+            strategy: STRATEGY,
+            strategyId: STRATEGY_ID,
+            strategyName: STRATEGY_NAME,
+            action: "penalized",
+            score: newScore,
+            reason: `repeated tags (load ${bestLoad.toFixed(2)}) \u2192 \xD7${bestPenalty.toFixed(2)}`
+          }
+        ]
+      });
+    } else {
+      out.push(picked);
+    }
+    for (const tag of picked.tags ?? []) {
+      emittedCount.set(tag, (emittedCount.get(tag) ?? 0) + 1);
+    }
+  }
+  return out;
+}
+var DIVERSITY_STRENGTH, DIVERSITY_FLOOR, STRATEGY, STRATEGY_ID, STRATEGY_NAME;
+var init_diversityRerank = __esm({
+  "src/core/navigators/diversityRerank.ts"() {
+    "use strict";
+    DIVERSITY_STRENGTH = 0.6;
+    DIVERSITY_FLOOR = 0.3;
+    STRATEGY = "diversityRerank";
+    STRATEGY_ID = "DIVERSITY_RERANK";
+    STRATEGY_NAME = "Diversity Re-rank";
+  }
+});
+
 // src/core/navigators/PipelineDebugger.ts
 var PipelineDebugger_exports = {};
 __export(PipelineDebugger_exports, {
@@ -2067,7 +2156,7 @@ function shuffleInPlace(arr) {
 function pickTopByScore(cards, limit) {
   return [...cards].sort((a, b) => b.score - a.score || a.cardId.localeCompare(b.cardId)).slice(0, limit);
 }
-var DEFAULT_FRESHNESS_WINDOW, DEFAULT_MAX_DIRECT_PER_RUN, DEFAULT_MAX_SUPPORT_PER_RUN, DEFAULT_HIERARCHY_DEPTH, DEFAULT_MIN_COUNT, BASE_TARGET_SCORE, BASE_SUPPORT_SCORE, DISCOVERED_SUPPORT_SCORE, MAX_TARGET_MULTIPLIER, MAX_SUPPORT_MULTIPLIER, PRESCRIBED_DEBUG_VERSION, PrescribedCardsGenerator;
+var DEFAULT_FRESHNESS_WINDOW, DEFAULT_MAX_DIRECT_PER_RUN, DEFAULT_MAX_SUPPORT_PER_RUN, DEFAULT_HIERARCHY_DEPTH, DEFAULT_MIN_COUNT, DEFAULT_PRACTICE_MIN_COUNT, DEFAULT_MAX_PRACTICE_PER_RUN, BASE_TARGET_SCORE, BASE_SUPPORT_SCORE, DISCOVERED_SUPPORT_SCORE, BASE_PRACTICE_SCORE, MAX_TARGET_MULTIPLIER, MAX_SUPPORT_MULTIPLIER, PRESCRIBED_DEBUG_VERSION, PrescribedCardsGenerator;
 var init_prescribed = __esm({
   "src/core/navigators/generators/prescribed.ts"() {
     "use strict";
@@ -2078,9 +2167,12 @@ var init_prescribed = __esm({
     DEFAULT_MAX_SUPPORT_PER_RUN = 3;
     DEFAULT_HIERARCHY_DEPTH = 2;
     DEFAULT_MIN_COUNT = 3;
+    DEFAULT_PRACTICE_MIN_COUNT = 3;
+    DEFAULT_MAX_PRACTICE_PER_RUN = 4;
     BASE_TARGET_SCORE = 1;
     BASE_SUPPORT_SCORE = 0.8;
     DISCOVERED_SUPPORT_SCORE = 12;
+    BASE_PRACTICE_SCORE = 1;
     MAX_TARGET_MULTIPLIER = 8;
     MAX_SUPPORT_MULTIPLIER = 4;
     PRESCRIBED_DEBUG_VERSION = "testversion-prescribed-v3";
@@ -2188,7 +2280,18 @@ var init_prescribed = __esm({
             courseId,
             emittedIds
           );
-          emitted.push(...directCards, ...supportCards, ...discoveredSupportCards);
+          const practiceCards = this.buildPracticeCards({
+            group,
+            courseId,
+            emittedIds,
+            cardsByTag,
+            hierarchyConfigs,
+            userTagElo,
+            userGlobalElo,
+            activeIds,
+            seenIds
+          });
+          emitted.push(...directCards, ...supportCards, ...discoveredSupportCards, ...practiceCards);
         }
         const hintSummary = this.buildSupportHintSummary(groupRuntimes);
         const hints = Object.keys(hintSummary.boostTags).length > 0 ? {
@@ -2216,6 +2319,7 @@ var init_prescribed = __esm({
         const surfacedByGroup = /* @__PURE__ */ new Map();
         for (const card of finalCards) {
           const prov = card.provenance[0];
+          if (prov?.reason.includes("mode=practice")) continue;
           const groupId = prov?.reason.match(/group=([^;]+)/)?.[1];
           const mode = prov?.reason.includes("mode=support") ? "supportIds" : "targetIds";
           if (!groupId) continue;
@@ -2285,7 +2389,12 @@ var init_prescribed = __esm({
               enabled: raw.hierarchyWalk?.enabled !== false,
               maxDepth: typeof raw.hierarchyWalk?.maxDepth === "number" ? raw.hierarchyWalk.maxDepth : DEFAULT_HIERARCHY_DEPTH
             },
-            retireOnEncounter: raw.retireOnEncounter !== false
+            retireOnEncounter: raw.retireOnEncounter !== false,
+            practiceTagPatterns: dedupe(
+              Array.isArray(raw.practiceTagPatterns) ? raw.practiceTagPatterns.filter((v) => typeof v === "string") : []
+            ),
+            practiceMinCount: typeof raw.practiceMinCount === "number" ? raw.practiceMinCount : DEFAULT_PRACTICE_MIN_COUNT,
+            maxPracticeCardsPerRun: typeof raw.maxPracticeCardsPerRun === "number" ? raw.maxPracticeCardsPerRun : DEFAULT_MAX_PRACTICE_PER_RUN
           })).filter((g) => g.targetCardIds.length > 0);
           return { groups };
         } catch {
@@ -2508,6 +2617,92 @@ var init_prescribed = __esm({
         }
         return cards;
       }
+      /**
+       * Emit drill cards for *unlocked-but-under-practiced* skills.
+       *
+       * For each course tag matching the group's `practiceTagPatterns` that is both
+       * unlocked (all hierarchy prerequisites met — i.e. the learner has been
+       * introduced to it) and under-practiced (per-tag attempt count below
+       * `practiceMinCount`), this resolves cards carrying that tag and emits them
+       * into the candidate pool. It exists because global-ELO retrieval
+       * systematically fails to fetch the (low-ELO) drill cards for a
+       * freshly-introduced skill — putting them in the pool here lets the pipeline's
+       * scoring + the durable per-skill boost order them. Ordering/emphasis is NOT
+       * this method's job; it only guarantees presence.
+       *
+       * Fully data-driven: the unlock relation comes from the hierarchy config and
+       * practice-status from per-tag ELO. No card-id or tag-namespace hard-coding.
+       */
+      buildPracticeCards(args) {
+        const {
+          group,
+          courseId,
+          emittedIds,
+          cardsByTag,
+          hierarchyConfigs,
+          userTagElo,
+          userGlobalElo,
+          activeIds,
+          seenIds
+        } = args;
+        const patterns = group.practiceTagPatterns ?? [];
+        if (patterns.length === 0) return [];
+        const practiceMinCount = group.practiceMinCount ?? DEFAULT_PRACTICE_MIN_COUNT;
+        const maxPractice = group.maxPracticeCardsPerRun ?? DEFAULT_MAX_PRACTICE_PER_RUN;
+        const practiceTags = [...cardsByTag.keys()].filter(
+          (tag) => patterns.some((p) => matchesTagPattern(tag, p)) && this.isUnlockedGatedSkill(tag, hierarchyConfigs, userTagElo, userGlobalElo) && (userTagElo[tag]?.count ?? 0) < practiceMinCount
+        );
+        if (practiceTags.length === 0) return [];
+        const practiceCardIds = this.findDiscoveredSupportCards({
+          supportTags: practiceTags,
+          cardsByTag,
+          activeIds,
+          seenIds,
+          excludedIds: emittedIds,
+          limit: maxPractice
+        });
+        if (practiceCardIds.length === 0) return [];
+        logger.info(
+          `[Prescribed] Group '${group.id}' practice: ${practiceTags.length} unlocked under-practiced skill(s), emitting ${practiceCardIds.length} drill card(s)`
+        );
+        const cards = [];
+        for (const cardId of practiceCardIds) {
+          emittedIds.add(cardId);
+          cards.push({
+            cardId,
+            courseId,
+            score: BASE_PRACTICE_SCORE,
+            provenance: [
+              {
+                strategy: "prescribed",
+                strategyName: this.strategyName || this.name,
+                strategyId: this.strategyId || "NAVIGATION_STRATEGY-prescribed",
+                action: "generated",
+                score: BASE_PRACTICE_SCORE,
+                reason: `mode=practice;group=${group.id};underPracticedSkills=${practiceTags.length};practiceTags=${practiceTags.slice(0, 8).join("|")}${practiceTags.length > 8 ? "|\u2026" : ""};testversion=${PRESCRIBED_DEBUG_VERSION}`
+              }
+            ]
+          });
+        }
+        return cards;
+      }
+      /**
+       * True for a skill that was *gated and is now reached*: it has at least one
+       * declared hierarchy prerequisite set, and every set is fully satisfied by the
+       * learner's per-tag ELO. This deliberately EXCLUDES tags with no prerequisites
+       * — an ungated tag was never "introduced" in the curricular sense, so it isn't
+       * a post-intro drill target (e.g. whole-word spelling tags that share the
+       * `gpc:exercise:*` prefix but have no intro gate). Those are left to normal
+       * ELO retrieval. This is the precise population the retrieval gap strands:
+       * just-unlocked, low-ELO skills.
+       */
+      isUnlockedGatedSkill(tag, hierarchyConfigs, userTagElo, userGlobalElo) {
+        const prereqSets = hierarchyConfigs.map((hierarchy) => hierarchy.prerequisites[tag]).filter((prereqs) => Array.isArray(prereqs) && prereqs.length > 0);
+        if (prereqSets.length === 0) return false;
+        return prereqSets.every(
+          (prereqs) => prereqs.every((pr) => this.isPrerequisiteMet(pr, userTagElo[pr.tag], userGlobalElo))
+        );
+      }
       findSupportCardsByTags(group, tagsByCard, supportTags) {
         if (supportTags.length === 0) {
           return [];
@@ -4301,7 +4496,7 @@ function logResultCards(cards) {
   for (let i = 0; i < cards.length; i++) {
     const c = cards[i];
     const tags = c.tags?.slice(0, 3).join(", ") || "";
-    const filters = c.provenance.filter((p) => p.strategy === "hierarchyDefinition" || p.strategy === "priorityDefinition" || p.strategy === "interferenceFilter" || p.strategy === "letterGating" || p.strategy === "ephemeralHint").map((p) => {
+    const filters = c.provenance.filter((p) => p.strategy === "hierarchyDefinition" || p.strategy === "priorityDefinition" || p.strategy === "interferenceFilter" || p.strategy === "letterGating" || p.strategy === "ephemeralHint" || p.strategy === "diversityRerank").map((p) => {
       const arrow = p.action === "boosted" ? "\u2191" : p.action === "penalized" ? "\u2193" : "=";
       return `${p.strategyName}${arrow}${p.score.toFixed(2)}`;
     }).join(" | ");
@@ -4333,6 +4528,7 @@ var init_Pipeline = __esm({
     init_logger();
     init_orchestration();
     init_PipelineDebugger();
+    init_diversityRerank();
     VERBOSE_RESULTS = true;
     Pipeline = class extends ContentNavigator {
       generator;
@@ -4506,6 +4702,7 @@ var init_Pipeline = __esm({
           this._ephemeralHints = null;
           cards = this.applyHints(cards, hints, allCardsBeforeFiltering);
         }
+        cards = diversityRerank(cards);
         cards.sort((a, b) => b.score - a.score);
         const tFilter = performance.now();
         const result = cards.slice(0, limit);
@@ -5074,6 +5271,7 @@ var init_3 = __esm({
       "./PipelineAssembler.ts": () => Promise.resolve().then(() => (init_PipelineAssembler(), PipelineAssembler_exports)),
       "./PipelineDebugger.ts": () => Promise.resolve().then(() => (init_PipelineDebugger(), PipelineDebugger_exports)),
       "./defaults.ts": () => Promise.resolve().then(() => (init_defaults(), defaults_exports)),
+      "./diversityRerank.ts": () => Promise.resolve().then(() => (init_diversityRerank(), diversityRerank_exports)),
       "./filters/WeightedFilter.ts": () => Promise.resolve().then(() => (init_WeightedFilter(), WeightedFilter_exports)),
       "./filters/eloDistance.ts": () => Promise.resolve().then(() => (init_eloDistance(), eloDistance_exports)),
       "./filters/hierarchyDefinition.ts": () => Promise.resolve().then(() => (init_hierarchyDefinition(), hierarchyDefinition_exports)),
@@ -5099,9 +5297,12 @@ var init_3 = __esm({
 var navigators_exports = {};
 __export(navigators_exports, {
   ContentNavigator: () => ContentNavigator,
+  DIVERSITY_FLOOR: () => DIVERSITY_FLOOR,
+  DIVERSITY_STRENGTH: () => DIVERSITY_STRENGTH,
   NavigatorRole: () => NavigatorRole,
   NavigatorRoles: () => NavigatorRoles,
   Navigators: () => Navigators,
+  diversityRerank: () => diversityRerank,
   getCardOrigin: () => getCardOrigin,
   getRegisteredNavigator: () => getRegisteredNavigator,
   getRegisteredNavigatorNames: () => getRegisteredNavigatorNames,
@@ -5185,6 +5386,7 @@ var navigatorRegistry, Navigators, NavigatorRole, NavigatorRoles, ContentNavigat
 var init_navigators = __esm({
   "src/core/navigators/index.ts"() {
     "use strict";
+    init_diversityRerank();
     init_PipelineDebugger();
     init_logger();
     init_();
@@ -10187,6 +10389,8 @@ __export(index_exports, {
   ContentNavigator: () => ContentNavigator,
   CouchDBToStaticPacker: () => CouchDBToStaticPacker,
   CourseLookup: () => CourseLookup,
+  DIVERSITY_FLOOR: () => DIVERSITY_FLOOR,
+  DIVERSITY_STRENGTH: () => DIVERSITY_STRENGTH,
   DocType: () => DocType,
   DocTypePrefixes: () => DocTypePrefixes,
   ENV: () => ENV,
@@ -10212,6 +10416,7 @@ __export(index_exports, {
   computeSpread: () => computeSpread,
   computeStrategyGradient: () => computeStrategyGradient,
   createOrchestrationContext: () => createOrchestrationContext,
+  diversityRerank: () => diversityRerank,
   docIsDeleted: () => docIsDeleted,
   endSessionTracking: () => endSessionTracking,
   ensureAppDataDirectory: () => ensureAppDataDirectory,
@@ -11323,8 +11528,17 @@ var ItemQueue = class {
    * Merge new items into the front of the queue, skipping duplicates.
    * Used by additive replans to inject high-quality candidates without
    * discarding the existing queue contents.
+   *
+   * `forceFrontIds` carries the mandatory (`+INF`) cards in this batch — a
+   * durable `requireCard`/`requireTag` re-asserted by every replan. An ordinary
+   * duplicate is left in place (skip), but a mandatory one that's *already*
+   * queued is pulled out of its current slot so it rejoins at the front in batch
+   * order. Without this, an additive merge unshifts fresh non-required cards
+   * ahead of an already-present required card, steadily burying it until it never
+   * gets drawn — defeating the "must appear" guarantee. Returns the count of
+   * genuinely new cards added (re-fronted duplicates are not counted).
    */
-  mergeToFront(items, cardIdExtractor) {
+  mergeToFront(items, cardIdExtractor, forceFrontIds) {
     let added = 0;
     const toInsert = [];
     for (const item of items) {
@@ -11333,6 +11547,11 @@ var ItemQueue = class {
         this.seenCardIds.push(cardId);
         toInsert.push(item);
         added++;
+      } else if (forceFrontIds?.has(cardId)) {
+        const idx = this.q.findIndex((qi) => cardIdExtractor(qi) === cardId);
+        if (idx >= 0) {
+          toInsert.push(...this.q.splice(idx, 1));
+        }
       }
     }
     this.q.unshift(...toInsert);
@@ -14450,7 +14669,16 @@ var SessionController = class _SessionController extends Loggable {
       mixedWeighted
     );
     const reviewWeighted = mixedWeighted.filter((w) => getCardOrigin(w) === "review").slice(0, this._initialReviewCap);
-    const newWeighted = mixedWeighted.filter((w) => getCardOrigin(w) === "new" && !this._servedCardIds.has(w.cardId)).slice(0, newLimit);
+    const newCandidates = mixedWeighted.filter(
+      (w) => getCardOrigin(w) === "new" && !this._servedCardIds.has(w.cardId)
+    );
+    const mandatoryWeighted = newCandidates.filter((w) => w.score === Number.POSITIVE_INFINITY);
+    const optionalWeighted = newCandidates.filter((w) => w.score !== Number.POSITIVE_INFINITY);
+    const newWeighted = [
+      ...mandatoryWeighted,
+      ...optionalWeighted.slice(0, Math.max(0, newLimit - mandatoryWeighted.length))
+    ];
+    const mandatoryIds = new Set(mandatoryWeighted.map((w) => w.cardId));
     logger.debug(`[reviews] got ${reviewWeighted.length} reviews from mixer`);
     let report = replan ? "Replan content:\n" : "Mixed content session created with:\n";
     if (!replan) {
@@ -14485,7 +14713,7 @@ var SessionController = class _SessionController extends Loggable {
 `;
     }
     if (additive) {
-      const added = this.newQ.mergeToFront(newItems, (item) => item.cardID);
+      const added = this.newQ.mergeToFront(newItems, (item) => item.cardID, mandatoryIds);
       report += `Additive merge: ${added} new cards added to front of newQ
 `;
     } else if (replan) {
@@ -14817,6 +15045,8 @@ init_factory();
   ContentNavigator,
   CouchDBToStaticPacker,
   CourseLookup,
+  DIVERSITY_FLOOR,
+  DIVERSITY_STRENGTH,
   DocType,
   DocTypePrefixes,
   ENV,
@@ -14842,6 +15072,7 @@ init_factory();
   computeSpread,
   computeStrategyGradient,
   createOrchestrationContext,
+  diversityRerank,
   docIsDeleted,
   endSessionTracking,
   ensureAppDataDirectory,