@vue-skuilder/db 0.2.4 → 0.2.5

package/dist/index.d.cts

@@ -315,6 +315,21 @@ interface SessionQueueDebug {
     /** cardIDs in queue order, head (next draw) first. */
     cards: string[];
 }
+/**
+ * A card the learner has interacted with this session (one entry per card in
+ * the session record, regardless of which queue — if any — still holds it).
+ */
+interface SessionDrawnCardDebug {
+    cardID: string;
+    /** Queue status at draw time: 'new' | 'review' | 'failed-new' | 'failed-review'. */
+    status: string;
+    /** Number of CardRecords logged for this card this session (≥1). */
+    attempts: number;
+    /** Latest record's correctness; null for non-question (info) records. */
+    correct: boolean | null;
+    /** Total time spent across all of this card's records, in ms. */
+    timeSpentMs: number;
+}
 /** Live snapshot of the controller, read fresh on each overlay tick. */
 interface SessionDebugSnapshot {
     secondsRemaining: number;
@@ -332,6 +347,8 @@ interface SessionDebugSnapshot {
     reviewQ: SessionQueueDebug;
     newQ: SessionQueueDebug;
     failedQ: SessionQueueDebug;
+    /** Every card the learner has interacted with this session, draw order. */
+    drawnCards: SessionDrawnCardDebug[];
 }
 
 /**
@@ -366,6 +383,21 @@ interface ReplanOptions {
      * multiply, require/exclude lists concatenate).
      */
     sessionHints?: ReplanHints;
+    /**
+     * Like `sessionHints`, but *merged* into the existing session-durable hints
+     * (via `mergeHints`) instead of replacing them. Use when emphasis should
+     * *accumulate* across replans rather than clobber — e.g. introducing a second
+     * concept mid-session must not wipe the first concept's boost, nor any
+     * `difficultyBooster`/`conceptBackoff` state on other concepts.
+     *
+     * Merge semantics (see `mergeHints`): boosts MULTIPLY, require/exclude lists
+     * concat-dedup. Re-emphasising the *same* tag therefore compounds — callers
+     * boosting a tag they may have already boosted should clamp at the call site.
+     *
+     * If both `sessionHints` and `mergeSessionHints` are supplied, the replace is
+     * applied first, then the merge — but they are normally mutually exclusive.
+     */
+    mergeSessionHints?: ReplanHints;
     /**
      * Maximum number of new cards to return from the pipeline.
      * Default: 20 (the standard session batch size).
@@ -549,6 +581,21 @@ declare class SessionController<TView = unknown> extends Loggable {
      * recomputed per-run in `_runReplan` and would otherwise go stale.
      */
     private _sessionHints;
+    /**
+     * Card IDs that have been *served* (drawn/consumed) this session. Populated
+     * at the single consumption choke-point (removeItemFromQueue), so it reflects
+     * a draw the instant it happens — earlier than `_sessionRecord`, which only
+     * lands once the card is *responded to*.
+     *
+     * Used to keep already-served cards out of newQ on every (re)plan: a `new`
+     * card shown once must never re-enter newQ this session. This is the general
+     * guard against re-presentation — including the case where a replan in flight
+     * captured a now-drawn card (e.g. a +INF require-injected follow-up the
+     * depletion prefetch grabbed just before it was drawn). Reviews/failed cards
+     * legitimately recur and are tracked by their own queues, so this only gates
+     * `new`-origin candidates.
+     */
+    private _servedCardIds;
     /**
      * Consumer-supplied hooks invoked after each question response is processed.
      * Seeded from constructor options (threaded from
@@ -863,6 +910,17 @@ declare class SessionController<TView = unknown> extends Loggable {
      * Remove an item from its source queue after consumption by nextCard().
      */
     private removeItemFromQueue;
+    /**
+     * Remove a satisfied card ID from the durable session-hint `requireCards`
+     * list. Called when a card is consumed (see removeItemFromQueue). No-op if
+     * the card was not a durable requirement.
+     *
+     * Matches literal IDs only: a glob/pattern requirement (which may stand for
+     * several cards) is NOT considered satisfied by a single draw and is left in
+     * place — durable patterns are the caller's responsibility, one-shot `hints`
+     * remain the right tool for them.
+     */
+    private _clearDurableRequirement;
     /**
      * End the session and record learning outcomes.
      *

package/dist/index.d.ts

@@ -315,6 +315,21 @@ interface SessionQueueDebug {
     /** cardIDs in queue order, head (next draw) first. */
     cards: string[];
 }
+/**
+ * A card the learner has interacted with this session (one entry per card in
+ * the session record, regardless of which queue — if any — still holds it).
+ */
+interface SessionDrawnCardDebug {
+    cardID: string;
+    /** Queue status at draw time: 'new' | 'review' | 'failed-new' | 'failed-review'. */
+    status: string;
+    /** Number of CardRecords logged for this card this session (≥1). */
+    attempts: number;
+    /** Latest record's correctness; null for non-question (info) records. */
+    correct: boolean | null;
+    /** Total time spent across all of this card's records, in ms. */
+    timeSpentMs: number;
+}
 /** Live snapshot of the controller, read fresh on each overlay tick. */
 interface SessionDebugSnapshot {
     secondsRemaining: number;
@@ -332,6 +347,8 @@ interface SessionDebugSnapshot {
     reviewQ: SessionQueueDebug;
     newQ: SessionQueueDebug;
     failedQ: SessionQueueDebug;
+    /** Every card the learner has interacted with this session, draw order. */
+    drawnCards: SessionDrawnCardDebug[];
 }
 
 /**
@@ -366,6 +383,21 @@ interface ReplanOptions {
      * multiply, require/exclude lists concatenate).
      */
     sessionHints?: ReplanHints;
+    /**
+     * Like `sessionHints`, but *merged* into the existing session-durable hints
+     * (via `mergeHints`) instead of replacing them. Use when emphasis should
+     * *accumulate* across replans rather than clobber — e.g. introducing a second
+     * concept mid-session must not wipe the first concept's boost, nor any
+     * `difficultyBooster`/`conceptBackoff` state on other concepts.
+     *
+     * Merge semantics (see `mergeHints`): boosts MULTIPLY, require/exclude lists
+     * concat-dedup. Re-emphasising the *same* tag therefore compounds — callers
+     * boosting a tag they may have already boosted should clamp at the call site.
+     *
+     * If both `sessionHints` and `mergeSessionHints` are supplied, the replace is
+     * applied first, then the merge — but they are normally mutually exclusive.
+     */
+    mergeSessionHints?: ReplanHints;
     /**
      * Maximum number of new cards to return from the pipeline.
      * Default: 20 (the standard session batch size).
@@ -549,6 +581,21 @@ declare class SessionController<TView = unknown> extends Loggable {
      * recomputed per-run in `_runReplan` and would otherwise go stale.
      */
     private _sessionHints;
+    /**
+     * Card IDs that have been *served* (drawn/consumed) this session. Populated
+     * at the single consumption choke-point (removeItemFromQueue), so it reflects
+     * a draw the instant it happens — earlier than `_sessionRecord`, which only
+     * lands once the card is *responded to*.
+     *
+     * Used to keep already-served cards out of newQ on every (re)plan: a `new`
+     * card shown once must never re-enter newQ this session. This is the general
+     * guard against re-presentation — including the case where a replan in flight
+     * captured a now-drawn card (e.g. a +INF require-injected follow-up the
+     * depletion prefetch grabbed just before it was drawn). Reviews/failed cards
+     * legitimately recur and are tracked by their own queues, so this only gates
+     * `new`-origin candidates.
+     */
+    private _servedCardIds;
     /**
      * Consumer-supplied hooks invoked after each question response is processed.
      * Seeded from constructor options (threaded from
@@ -863,6 +910,17 @@ declare class SessionController<TView = unknown> extends Loggable {
      * Remove an item from its source queue after consumption by nextCard().
      */
     private removeItemFromQueue;
+    /**
+     * Remove a satisfied card ID from the durable session-hint `requireCards`
+     * list. Called when a card is consumed (see removeItemFromQueue). No-op if
+     * the card was not a durable requirement.
+     *
+     * Matches literal IDs only: a glob/pattern requirement (which may stand for
+     * several cards) is NOT considered satisfied by a single draw and is left in
+     * place — durable patterns are the caller's responsibility, one-shot `hints`
+     * remain the right tool for them.
+     */
+    private _clearDurableRequirement;
     /**
      * End the session and record learning outcomes.
      *

package/dist/index.js

@@ -1939,13 +1939,14 @@ var elo_exports = {};
 __export(elo_exports, {
   default: () => ELONavigator
 });
-var import_common5, ELONavigator;
+var import_common5, ELO_RELEVANCE_SIGMA, ELONavigator;
 var init_elo = __esm({
   "src/core/navigators/generators/elo.ts"() {
     "use strict";
     init_navigators();
     import_common5 = require("@vue-skuilder/common");
     init_logger();
+    ELO_RELEVANCE_SIGMA = 300;
     ELONavigator = class extends ContentNavigator {
       /** Human-readable name for CardGenerator interface */
       name;
@@ -1985,8 +1986,8 @@ var init_elo = __esm({
         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;
+          const relevance = Math.exp(-((distance / ELO_RELEVANCE_SIGMA) ** 2));
+          const samplingKey = relevance * (0.5 + 0.5 * Math.random());
           return {
             cardId: c.cardID,
             courseId: c.courseID,
@@ -1998,7 +1999,7 @@ var init_elo = __esm({
                 strategyId: this.strategyId || "NAVIGATION_STRATEGY-ELO-default",
                 action: "generated",
                 score: samplingKey,
-                reason: `ELO distance ${Math.round(distance)} (card: ${Math.round(cardElo)}, user: ${Math.round(userGlobalElo)}), raw ${rawScore.toFixed(3)}, key ${samplingKey.toFixed(3)}`
+                reason: `ELO distance ${Math.round(distance)} (card: ${Math.round(cardElo)}, user: ${Math.round(userGlobalElo)}), relevance ${relevance.toFixed(3)}, key ${samplingKey.toFixed(3)}`
               }
             ]
           };
@@ -13173,7 +13174,15 @@ var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834"
 var spinnerFrame = 0;
 var overlayEl = null;
 var pollHandle = null;
-var expanded = { reviewQ: false, newQ: false, failedQ: false };
+var lastSnapshot = null;
+var copyFlashUntil = 0;
+var minified = false;
+var expanded = {
+  reviewQ: false,
+  newQ: false,
+  failedQ: false,
+  drawn: false
+};
 function toggleSessionOverlay() {
   if (typeof document === "undefined") {
     logger.info("[Session Overlay] No DOM available (non-browser host); overlay unavailable.");
@@ -13188,6 +13197,7 @@ function toggleSessionOverlay() {
   }
 }
 function mount() {
+  minified = false;
   overlayEl = document.createElement("div");
   overlayEl.id = OVERLAY_ID;
   Object.assign(overlayEl.style, {
@@ -13226,11 +13236,23 @@ function render() {
   spinnerFrame++;
   const ctrl = getActiveController();
   if (!ctrl) {
-    overlayEl.innerHTML = headerHtml() + `<div style="opacity:.65">No active session.</div>`;
+    lastSnapshot = null;
+    overlayEl.innerHTML = headerHtml() + (minified ? "" : `<div style="opacity:.65">No active session.</div>`);
+    attachHandlers();
     return;
   }
   const s = ctrl.getDebugSnapshot();
-  overlayEl.innerHTML = headerHtml() + replanHtml(s) + metaHtml(s) + hintsHtml(s.sessionHints) + queueHtml("reviewQ", "reviewQ", s.reviewQ) + queueHtml("newQ", "newQ", s.newQ) + queueHtml("failedQ", "failedQ", s.failedQ);
+  lastSnapshot = s;
+  if (minified) {
+    overlayEl.innerHTML = headerHtml();
+    attachHandlers();
+    return;
+  }
+  overlayEl.innerHTML = headerHtml() + replanHtml(s) + metaHtml(s) + hintsHtml(s.sessionHints) + queueHtml("reviewQ", "reviewQ", s.reviewQ) + queueHtml("newQ", "newQ", s.newQ) + queueHtml("failedQ", "failedQ", s.failedQ) + drawnHtml("drawn", s.drawnCards);
+  attachHandlers();
+}
+function attachHandlers() {
+  if (!overlayEl) return;
   overlayEl.querySelectorAll("[data-q]").forEach((el) => {
     el.onclick = () => {
       const key = el.dataset.q;
@@ -13239,9 +13261,45 @@ function render() {
       render();
     };
   });
+  const copyBtn = overlayEl.querySelector("[data-copy]");
+  if (copyBtn) {
+    copyBtn.onclick = (ev) => {
+      ev.stopPropagation();
+      copySnapshot();
+    };
+  }
+  const minBtn = overlayEl.querySelector("[data-min]");
+  if (minBtn) {
+    minBtn.onclick = (ev) => {
+      ev.stopPropagation();
+      minified = !minified;
+      render();
+    };
+  }
+}
+function copySnapshot() {
+  const text = snapshotToText(lastSnapshot);
+  const flash = () => {
+    copyFlashUntil = Date.now() + 1200;
+    render();
+  };
+  const clip = typeof navigator !== "undefined" ? navigator.clipboard : void 0;
+  if (clip?.writeText) {
+    clip.writeText(text).then(flash, (err) => {
+      logger.warn(`[Session Overlay] Clipboard write failed: ${String(err)}`);
+    });
+  } else {
+    logger.info(`[Session Overlay] Clipboard unavailable; snapshot follows:
+${text}`);
+  }
 }
 function headerHtml() {
-  return `<div style="font-weight:600;color:#93c5fd;margin-bottom:4px">\u2699 SessionController</div>`;
+  const flashing = Date.now() < copyFlashUntil;
+  const btnLabel = flashing ? "\u2713 copied" : "\u2398 copy";
+  const btnColor = flashing ? "#86efac" : "#93c5fd";
+  const copyBtn = `<span data-copy style="cursor:pointer;float:right;font-weight:400;color:${btnColor};border:1px solid currentColor;border-radius:4px;padding:0 4px;line-height:1.3">${btnLabel}</span>`;
+  const minBtn = `<span data-min title="${minified ? "Restore" : "Minify"}" style="cursor:pointer;float:right;font-weight:400;color:#93c5fd;border:1px solid currentColor;border-radius:4px;padding:0 5px;margin-right:4px;line-height:1.3">${minified ? "\u25A2" : "\u2014"}</span>`;
+  return `<div style="font-weight:600;color:#93c5fd;margin-bottom:${minified ? 0 : 4}px">${copyBtn}${minBtn}\u2699 SessionController</div>`;
 }
 function replanHtml(s) {
   if (!s.replanActive) {
@@ -13284,22 +13342,98 @@ function hintsHtml(h) {
 }
 function queueHtml(key, label, q) {
   const collapsible = q.length > INLINE_THRESHOLD;
-  const isOpen = !collapsible || expanded[key];
+  const isOpen = collapsible && expanded[key];
   const caret = collapsible ? expanded[key] ? "\u25BE " : "\u25B8 " : "";
   const drawn = q.dequeueCount ? ` <span style="opacity:.5">drawn ${q.dequeueCount}</span>` : "";
   const titleStyle = collapsible ? "cursor:pointer;color:#f9a8d4" : "color:#f9a8d4";
   const titleAttr = collapsible ? ` data-q="${key}"` : "";
   const title = `<div${titleAttr} style="${titleStyle}">${caret}${label}: ${q.length}${drawn}</div>`;
-  let body = "";
-  if (isOpen && q.cards.length) {
-    body = `<ol style="margin:2px 0 6px 0;padding-left:20px">` + q.cards.map((c) => `<li style="white-space:nowrap">${esc(c)}</li>`).join("") + `</ol>`;
-  } else if (!q.cards.length) {
-    body = `<div style="margin:1px 0 6px 6px;opacity:.5">empty</div>`;
-  } else {
-    body = `<div style="margin:1px 0 6px 6px;opacity:.55">(${q.length} cards \u2014 click to expand)</div>`;
+  if (!q.cards.length) {
+    return title + `<div style="margin:1px 0 6px 6px;opacity:.5">empty</div>`;
+  }
+  const shown = isOpen ? q.cards : q.cards.slice(0, INLINE_THRESHOLD);
+  const hiddenCount = q.length - shown.length;
+  const listMarginBottom = collapsible ? 2 : 6;
+  let body = `<ol style="margin:2px 0 ${listMarginBottom}px 0;padding-left:20px">` + shown.map((c) => `<li style="white-space:nowrap">${esc(c)}</li>`).join("") + `</ol>`;
+  if (collapsible) {
+    const footer = isOpen ? "\u25BE show less" : `\u2026 +${hiddenCount} more`;
+    body += `<div data-q="${key}" style="cursor:pointer;margin:0 0 6px 20px;opacity:.6">${footer}</div>`;
+  }
+  return title + body;
+}
+function outcomeGlyph(correct) {
+  if (correct === true) return `<span style="color:#86efac">\u2713</span>`;
+  if (correct === false) return `<span style="color:#fca5a5">\u2717</span>`;
+  return `<span style="opacity:.5">\xB7</span>`;
+}
+function drawnHtml(key, drawn) {
+  const collapsible = drawn.length > INLINE_THRESHOLD;
+  const isOpen = collapsible && expanded[key];
+  const caret = collapsible ? expanded[key] ? "\u25BE " : "\u25B8 " : "";
+  const titleStyle = collapsible ? "cursor:pointer;color:#c4b5fd" : "color:#c4b5fd";
+  const titleAttr = collapsible ? ` data-q="${key}"` : "";
+  const title = `<div${titleAttr} style="${titleStyle}">${caret}drawn: ${drawn.length}</div>`;
+  if (!drawn.length) {
+    return title + `<div style="margin:1px 0 6px 6px;opacity:.5">none yet</div>`;
+  }
+  const shown = isOpen ? drawn : drawn.slice(0, INLINE_THRESHOLD);
+  const hiddenCount = drawn.length - shown.length;
+  const listMarginBottom = collapsible ? 2 : 6;
+  const rows = shown.map((d) => {
+    const retries = d.attempts > 1 ? `<span style="opacity:.5"> \xD7${d.attempts}</span>` : "";
+    const time = `<span style="opacity:.45"> ${Math.round(d.timeSpentMs / 100) / 10}s</span>`;
+    return `<li style="white-space:nowrap">${outcomeGlyph(d.correct)} ${esc(d.cardID)}<span style="opacity:.5"> [${esc(d.status)}]</span>${retries}${time}</li>`;
+  }).join("");
+  let body = `<ol style="margin:2px 0 ${listMarginBottom}px 0;padding-left:20px">${rows}</ol>`;
+  if (collapsible) {
+    const footer = isOpen ? "\u25BE show less" : `\u2026 +${hiddenCount} more`;
+    body += `<div data-q="${key}" style="cursor:pointer;margin:0 0 6px 20px;opacity:.6">${footer}</div>`;
   }
   return title + body;
 }
+function snapshotToText(s) {
+  if (!s) return "SessionController \u2014 no active session.";
+  const lines = [];
+  lines.push("=== SessionController ===");
+  lines.push(`time ${formatTime(s.secondsRemaining)}`);
+  if (s.hasCardGuarantee) lines.push(`guarantee: ${s.minCardsGuarantee}`);
+  lines.push(`well-indicated left: ${s.wellIndicatedRemaining}`);
+  lines.push(`current: ${s.currentCard ?? "\u2014"}`);
+  lines.push(
+    s.replanActive ? `replan: ACTIVE [${s.replanLabel ?? "(auto)"}]` : "replan: idle"
+  );
+  lines.push("");
+  lines.push("sessionHints:");
+  const h = s.sessionHints;
+  const hintParts = [];
+  if (h) {
+    if (h.boostTags && Object.keys(h.boostTags).length)
+      hintParts.push(`  boost: ${Object.entries(h.boostTags).map(([k, v]) => `${k}\xD7${v}`).join(", ")}`);
+    if (h.boostCards && Object.keys(h.boostCards).length)
+      hintParts.push(`  boostCards: ${Object.entries(h.boostCards).map(([k, v]) => `${k}\xD7${v}`).join(", ")}`);
+    if (h.requireCards?.length) hintParts.push(`  require: ${h.requireCards.join(", ")}`);
+    if (h.requireTags?.length) hintParts.push(`  requireTags: ${h.requireTags.join(", ")}`);
+    if (h.excludeTags?.length) hintParts.push(`  exclude: ${h.excludeTags.join(", ")}`);
+    if (h.excludeCards?.length) hintParts.push(`  excludeCards: ${h.excludeCards.join(", ")}`);
+  }
+  lines.push(hintParts.length ? hintParts.join("\n") : "  none");
+  const queueText = (label, q) => {
+    lines.push("");
+    lines.push(`${label}: ${q.length} (drawn ${q.dequeueCount})`);
+    q.cards.forEach((c, i) => lines.push(`  ${i + 1}. ${c}`));
+  };
+  queueText("reviewQ", s.reviewQ);
+  queueText("newQ", s.newQ);
+  queueText("failedQ", s.failedQ);
+  lines.push("");
+  lines.push(`drawn: ${s.drawnCards.length}`);
+  s.drawnCards.forEach((d, i) => {
+    const mark = d.correct === true ? "\u2713" : d.correct === false ? "\u2717" : "\xB7";
+    const time = `${Math.round(d.timeSpentMs / 100) / 10}s`;
+    lines.push(`  ${i + 1}. ${mark} ${d.cardID} [${d.status}] \xD7${d.attempts} ${time}`);
+  });
+  return lines.join("\n");
+}
 function formatTime(totalSeconds) {
   const s = Math.max(0, Math.round(totalSeconds));
   const m = Math.floor(s / 60);
@@ -13669,6 +13803,21 @@ var SessionController = class _SessionController extends Loggable {
    * recomputed per-run in `_runReplan` and would otherwise go stale.
    */
   _sessionHints = null;
+  /**
+   * Card IDs that have been *served* (drawn/consumed) this session. Populated
+   * at the single consumption choke-point (removeItemFromQueue), so it reflects
+   * a draw the instant it happens — earlier than `_sessionRecord`, which only
+   * lands once the card is *responded to*.
+   *
+   * Used to keep already-served cards out of newQ on every (re)plan: a `new`
+   * card shown once must never re-enter newQ this session. This is the general
+   * guard against re-presentation — including the case where a replan in flight
+   * captured a now-drawn card (e.g. a +INF require-injected follow-up the
+   * depletion prefetch grabbed just before it was drawn). Reviews/failed cards
+   * legitimately recur and are tracked by their own queues, so this only gates
+   * `new`-origin candidates.
+   */
+  _servedCardIds = /* @__PURE__ */ new Set();
   /**
    * Consumer-supplied hooks invoked after each question response is processed.
    * Seeded from constructor options (threaded from
@@ -13878,6 +14027,7 @@ var SessionController = class _SessionController extends Loggable {
     if (opts.mode && opts.mode !== "replace") return true;
     if (opts.hints && Object.keys(opts.hints).length > 0) return true;
     if (opts.sessionHints !== void 0) return true;
+    if (opts.mergeSessionHints !== void 0) return true;
     return false;
   }
   /**
@@ -13913,6 +14063,10 @@ var SessionController = class _SessionController extends Loggable {
         `[Replan] Session hints ${opts.sessionHints ? "set" : "cleared"}: ${JSON.stringify(opts.sessionHints)}`
       );
     }
+    if (opts.mergeSessionHints !== void 0) {
+      this._sessionHints = mergeHints2([this._sessionHints, opts.mergeSessionHints]) ?? null;
+      this.log(`[Replan] Session hints merged: ${JSON.stringify(this._sessionHints)}`);
+    }
     this._applyHintsToSources(opts.hints, opts.label);
     const labelTag = opts.label ? ` [${opts.label}]` : "";
     this.log(
@@ -13965,6 +14119,16 @@ var SessionController = class _SessionController extends Loggable {
       }
       return { length: q.length, dequeueCount: q.dequeueCount, cards };
     };
+    const drawnCards = this._sessionRecord.map((r) => {
+      const last = r.records[r.records.length - 1];
+      return {
+        cardID: r.item.cardID,
+        status: r.item.status,
+        attempts: r.records.length,
+        correct: last && isQuestionRecord(last) ? last.isCorrect : null,
+        timeSpentMs: r.records.reduce((sum, rec) => sum + rec.timeSpent, 0)
+      };
+    });
     return {
       secondsRemaining: this.secondsRemaining,
       hasCardGuarantee: this.hasCardGuarantee,
@@ -13976,7 +14140,8 @@ var SessionController = class _SessionController extends Loggable {
       replanLabel: this._activeReplanLabel,
       reviewQ: describe(this.reviewQ),
       newQ: describe(this.newQ),
-      failedQ: describe(this.failedQ)
+      failedQ: describe(this.failedQ),
+      drawnCards
     };
   }
   /**
@@ -14285,7 +14450,7 @@ 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").slice(0, newLimit);
+    const newWeighted = mixedWeighted.filter((w) => getCardOrigin(w) === "new" && !this._servedCardIds.has(w.cardId)).slice(0, newLimit);
     logger.debug(`[reviews] got ${reviewWeighted.length} reviews from mixer`);
     let report = replan ? "Replan content:\n" : "Mixed content session created with:\n";
     if (!replan) {
@@ -14422,7 +14587,7 @@ var SessionController = class _SessionController extends Loggable {
       this.log(
         `[AutoReplan:depletion] newQ has ${this.newQ.length} card(s) (${otherContent} in other queues) with ${this._secondsRemaining}s remaining. Triggering background replan.`
       );
-      void this.requestReplan({ label: "auto:depletion" });
+      void this.requestReplan({ label: "auto:depletion", mode: "merge" });
     }
     const REPLAN_BUFFER = 3;
     if (!this._suppressQualityReplan && this._wellIndicatedRemaining <= REPLAN_BUFFER && this.newQ.length > 0 && !this._replanPromise) {
@@ -14563,6 +14728,8 @@ var SessionController = class _SessionController extends Loggable {
    * Remove an item from its source queue after consumption by nextCard().
    */
   removeItemFromQueue(item) {
+    this._clearDurableRequirement(item.cardID);
+    this._servedCardIds.add(item.cardID);
     if (this.reviewQ.peek(0)?.cardID === item.cardID) {
       this.reviewQ.dequeue((queueItem) => queueItem.cardID);
     } else if (this.newQ.peek(0)?.cardID === item.cardID) {
@@ -14574,6 +14741,27 @@ var SessionController = class _SessionController extends Loggable {
       this.failedQ.dequeue((queueItem) => queueItem.cardID);
     }
   }
+  /**
+   * Remove a satisfied card ID from the durable session-hint `requireCards`
+   * list. Called when a card is consumed (see removeItemFromQueue). No-op if
+   * the card was not a durable requirement.
+   *
+   * Matches literal IDs only: a glob/pattern requirement (which may stand for
+   * several cards) is NOT considered satisfied by a single draw and is left in
+   * place — durable patterns are the caller's responsibility, one-shot `hints`
+   * remain the right tool for them.
+   */
+  _clearDurableRequirement(cardID) {
+    const req = this._sessionHints?.requireCards;
+    if (!req || req.length === 0) return;
+    const next = req.filter((id) => id !== cardID);
+    if (next.length === req.length) return;
+    this._sessionHints = {
+      ...this._sessionHints,
+      requireCards: next.length > 0 ? next : void 0
+    };
+    this.log(`[Replan] Durable requirement satisfied & cleared on draw: ${cardID}`);
+  }
   /**
    * End the session and record learning outcomes.
    *