zam-core 0.9.2 → 0.9.3

package/dist/index.d.ts

@@ -1479,6 +1479,9 @@ declare function cascadeBlock(db: Database, userId: string, tokenSlug: string):
  * If a blocked card has no prerequisites at all, it is unblocked immediately
  * (it was likely blocked in error or its prerequisites were removed).
  *
+ * Unblocking cascades: when unblocking a card satisfies the last unmet
+ * prerequisite of another blocked card, that card unblocks in the same call.
+ *
  * @param db - Database connection
  * @param userId - The user whose blocked cards to check
  * @returns List of cards that were unblocked

package/dist/index.js

@@ -1705,6 +1705,18 @@ async function getTokenBySlug(db, slug) {
   parseTokenFallback(token);
   return token;
 }
+async function getTokensBySlugs(db, slugs) {
+  const tokens = /* @__PURE__ */ new Map();
+  const unique = [...new Set(slugs)];
+  if (unique.length === 0) return tokens;
+  const placeholders = unique.map(() => "?").join(",");
+  const rows = await db.prepare(`SELECT * FROM tokens WHERE slug IN (${placeholders})`).all(...unique);
+  for (const token of rows) {
+    parseTokenFallback(token);
+    tokens.set(token.slug, token);
+  }
+  return tokens;
+}
 async function getTokenById(db, id) {
   const token = await db.prepare("SELECT * FROM tokens WHERE id = ?").get(id);
   parseTokenFallback(token);
@@ -3769,25 +3781,29 @@ async function cascadeBlock(db, userId, tokenSlug) {
   };
 }
 async function unblockReady(db, userId) {
-  const blockedCards = await db.prepare(
-    `SELECT c.token_id, t.slug, t.concept
-       FROM cards c
-       JOIN tokens t ON t.id = c.token_id
-       WHERE c.user_id = ? AND c.blocked = 1`
-  ).all(userId);
   const unblocked = [];
-  for (const card of blockedCards) {
-    const totalPrereqs = await db.prepare("SELECT COUNT(*) as n FROM prerequisites WHERE token_id = ?").get(card.token_id);
-    const metPrereqs = await db.prepare(
-      `SELECT COUNT(*) as n FROM cards c
-         JOIN prerequisites p ON p.requires_id = c.token_id
-         WHERE p.token_id = ? AND c.user_id = ? AND c.reps >= 1 AND c.blocked = 0`
-    ).get(card.token_id, userId);
-    if (totalPrereqs.n === 0 || metPrereqs.n === totalPrereqs.n) {
-      const now = (/* @__PURE__ */ new Date()).toISOString();
-      await db.prepare(
-        "UPDATE cards SET blocked = 0, due_at = ? WHERE token_id = ? AND user_id = ?"
-      ).run(now, card.token_id, userId);
+  for (; ; ) {
+    const readyCards = await db.prepare(
+      `SELECT c.token_id, t.slug, t.concept
+         FROM cards c
+         JOIN tokens t ON t.id = c.token_id
+         WHERE c.user_id = ? AND c.blocked = 1
+           AND (SELECT COUNT(*) FROM prerequisites p
+                WHERE p.token_id = c.token_id) =
+               (SELECT COUNT(*) FROM prerequisites p
+                JOIN cards pc ON pc.token_id = p.requires_id
+                  AND pc.user_id = c.user_id
+                WHERE p.token_id = c.token_id
+                  AND pc.reps >= 1 AND pc.blocked = 0)`
+    ).all(userId);
+    if (readyCards.length === 0) break;
+    const now = (/* @__PURE__ */ new Date()).toISOString();
+    const placeholders = readyCards.map(() => "?").join(",");
+    await db.prepare(
+      `UPDATE cards SET blocked = 0, due_at = ?
+         WHERE user_id = ? AND token_id IN (${placeholders})`
+    ).run(now, userId, ...readyCards.map((card) => card.token_id));
+    for (const card of readyCards) {
       unblocked.push({ slug: card.slug, concept: card.concept });
     }
   }
@@ -3949,10 +3965,14 @@ async function prepareSessionSynthesis(db, input) {
     await buildSkillPatterns(db),
     input.explicitPatterns ?? []
   );
+  const patternTokens = await getTokensBySlugs(
+    db,
+    patterns.map((pattern) => pattern.slug)
+  );
   const validPatterns = [];
   const tokens = /* @__PURE__ */ new Map();
   for (const pattern of patterns) {
-    const token = await getTokenBySlug(db, pattern.slug);
+    const token = patternTokens.get(pattern.slug);
     if (!token || token.deprecated_at) continue;
     validPatterns.push(pattern);
     tokens.set(pattern.slug, token);
@@ -3965,13 +3985,13 @@ async function prepareSessionSynthesis(db, input) {
   const minConfidence = input.minConfidence ?? "medium";
   if (session.execution_context === "ui") {
     const reports = readUiObservationLog(input.sessionId);
-    for (const report of reports) {
-      for (const candidate of report.candidateTokens) {
-        if (tokens.has(candidate.slug)) continue;
-        const token = await getTokenBySlug(db, candidate.slug);
-        if (token && !token.deprecated_at) {
-          tokens.set(candidate.slug, token);
-        }
+    const candidateTokens = await getTokensBySlugs(
+      db,
+      reports.flatMap((report) => report.candidateTokens).map((candidate) => candidate.slug).filter((slug) => !tokens.has(slug))
+    );
+    for (const [slug, token] of candidateTokens) {
+      if (!token.deprecated_at) {
+        tokens.set(slug, token);
       }
     }
     const { candidates: candidates2, skippedLowConfidence: skippedLowConfidence2 } = buildUiSynthesisCandidates(