@thanh01.pmt/curriculum-kit 1.4.52 → 1.4.53

package/dist/index.cjs

@@ -11805,10 +11805,16 @@ function canCoalesceWithinZpdBudget(curr, next, nodeById, maxNew) {
 }
 function packUnitSessions(group, nodeById, spec, warnings) {
   const sessions = [];
-  const fresh = () => ({ groupId: group.key, nodeIds: [], entries: [], knowledgeMinutes: 0, practiceMinutes: 0, oversized: false });
+  const fresh = () => ({ groupId: group.key, nodeIds: [], entries: [], knowledgeMinutes: 0, practiceMinutes: 0, oversized: false, cognitiveNew: 0 });
   let current = fresh();
+  const seenConcepts = /* @__PURE__ */ new Set();
   const flush = () => {
-    if (current.entries.length > 0) sessions.push(current);
+    if (current.entries.length > 0) {
+      for (const nid of current.nodeIds) {
+        for (const c of nodeById.get(nid)?.concept_codes || []) seenConcepts.add(c);
+      }
+      sessions.push(current);
+    }
     current = fresh();
   };
   const filled = () => current.knowledgeMinutes + current.practiceMinutes;
@@ -11850,14 +11856,11 @@ function packUnitSessions(group, nodeById, spec, warnings) {
       continue;
     }
     const minutes = node.estimated_minutes;
-    if (spec.maxNewConceptsPerSession && spec.maxNewConceptsPerSession > 0 && current.entries.length > 0) {
-      const currentConcepts = new Set(current.nodeIds.flatMap((nid) => nodeById.get(nid)?.concept_codes || []));
-      const incoming = nodeById.get(id)?.concept_codes || [];
-      const wouldAdd = incoming.filter((c) => !currentConcepts.has(c)).length;
-      if (currentConcepts.size + wouldAdd > spec.maxNewConceptsPerSession) {
-        warnings.push(`ZPD pack flush: session ${group.key}#${sessions.length + 1} cut at ${currentConcepts.size} new concepts (budget ${spec.maxNewConceptsPerSession})`);
-        flush();
-      }
+    const localConcepts = new Set(current.nodeIds.flatMap((nid) => nodeById.get(nid)?.concept_codes || []));
+    const nodeNew = node.concept_codes.filter((c) => !seenConcepts.has(c) && !localConcepts.has(c)).length;
+    if (spec.maxNewConceptsPerSession && spec.maxNewConceptsPerSession > 0 && current.entries.length > 0 && current.cognitiveNew + nodeNew > spec.maxNewConceptsPerSession) {
+      warnings.push(`ZPD pack flush: session ${group.key}#${sessions.length + 1} cut at ${current.cognitiveNew} new concepts (budget ${spec.maxNewConceptsPerSession})`);
+      flush();
     }
     if (current.entries.length > 0 && filled() + minutes > spec.contentBudget) {
       const displaced = cutBackToCheckpoint(current, nodeById, spec, warnings);
@@ -11869,11 +11872,33 @@ function packUnitSessions(group, nodeById, spec, warnings) {
       }
       flush();
     }
-    if (isKnowledge) current.knowledgeMinutes += minutes;
-    else current.practiceMinutes += minutes;
+    if (isKnowledge) {
+      current.knowledgeMinutes += minutes;
+      current.cognitiveNew += nodeNew;
+    } else {
+      current.practiceMinutes += minutes;
+      current.cognitiveNew += nodeNew;
+    }
     current.entries.push({ id, minutes, part: 1, totalParts: 1 });
     current.nodeIds.push(id);
-    if (filled() >= spec.contentBudget && current.entries.length >= MAX_SESSION_NODES) flush();
+    if (filled() >= spec.contentBudget && current.entries.length >= MAX_SESSION_NODES) {
+      flush();
+    } else if (!isKnowledge && current.entries.length < MAX_SESSION_NODES) {
+      while (ids.length > 0 && current.entries.length < MAX_SESSION_NODES) {
+        const nxtId = ids[0];
+        const nxt = nodeById.get(nxtId);
+        if (!nxt || nxt.kind !== "concept" || nxt.estimated_minutes > spec.contentBudget) break;
+        const nxtLocal = new Set(current.nodeIds.flatMap((nid) => nodeById.get(nid)?.concept_codes || []));
+        const nxtNew = nxt.concept_codes.filter((c) => !seenConcepts.has(c) && !nxtLocal.has(c)).length;
+        if (spec.maxNewConceptsPerSession && spec.maxNewConceptsPerSession > 0 && current.cognitiveNew + nxtNew > spec.maxNewConceptsPerSession) break;
+        if (filled() + nxt.estimated_minutes > spec.contentBudget) break;
+        ids.shift();
+        current.knowledgeMinutes += nxt.estimated_minutes;
+        current.cognitiveNew += nxtNew;
+        current.entries.push({ id: nxtId, minutes: nxt.estimated_minutes, part: 1, totalParts: 1 });
+        current.nodeIds.push(nxtId);
+      }
+    }
   }
   flush();
   return sessions;
@@ -12008,7 +12033,7 @@ function computeConceptSpiralProgression(sessions, nodeById) {
   }
   return encounters;
 }
-function checkSessionZpd(sessionIndex, nodeIds, nodeById, allSeenConcepts, allSeenKeywords, entryKw, warnings) {
+function checkSessionZpd(sessionIndex, nodeIds, nodeById, allSeenConcepts, allSeenKeywords, entryKw, warnings, conceptPrereqMap) {
   const concepts = [...new Set(nodeIds.flatMap((id) => nodeById.get(id)?.concept_codes || []))];
   const newConcepts = concepts.filter((c) => !allSeenConcepts.has(c));
   const knownConcepts = concepts.filter((c) => allSeenConcepts.has(c));
@@ -12027,7 +12052,15 @@ function checkSessionZpd(sessionIndex, nodeIds, nodeById, allSeenConcepts, allSe
   if (sessionIndex > 0) {
     if (concepts.length > 1 && knownConcepts.length === 0) {
       if (verdict !== "TOO_MANY_NEW") verdict = "NO_ZPD_BRIDGE";
-      issues.push("No known concepts from previous sessions to bridge new learning");
+      const seenList = [...allSeenConcepts];
+      const prevConcept = seenList[seenList.length - 1];
+      const bridgedByPrereq = prevConcept !== void 0 && concepts.some((c) => (conceptPrereqMap?.get(c) || []).includes(prevConcept));
+      if (bridgedByPrereq) {
+        verdict = verdict === "TOO_MANY_NEW" ? verdict : "OK";
+        issues.push(`Bridge satisfied via prerequisite: prior session ended with recap of ${prevConcept}, a declared prerequisite of this session's concepts`);
+      } else {
+        issues.push("No known concepts from previous sessions to bridge new learning");
+      }
     } else if (concepts.length === 0 && allKeywords.length > 2 && knownKeywords.length === 0) {
       if (verdict !== "TOO_MANY_NEW") verdict = "NO_ZPD_BRIDGE";
       issues.push("No known keywords from previous sessions to bridge new learning");
@@ -12284,6 +12317,17 @@ async function buildCurriculumPlan(rawGraph, options) {
   const allSeenConcepts = /* @__PURE__ */ new Set();
   const allSeenKeywords = /* @__PURE__ */ new Set();
   const conceptEncounterMap = /* @__PURE__ */ new Map();
+  const conceptPrereqMap = /* @__PURE__ */ new Map();
+  for (const e of graph.edges) {
+    for (const to of nodeById.get(e.to)?.concept_codes || []) {
+      for (const from of nodeById.get(e.from)?.concept_codes || []) {
+        if (to === from) continue;
+        const list = conceptPrereqMap.get(to) || [];
+        if (!list.includes(from)) list.push(from);
+        conceptPrereqMap.set(to, list);
+      }
+    }
+  }
   for (let i = 0; i < packed.length; i++) {
     const s = packed[i];
     for (const id of s.nodeIds) {
@@ -12337,7 +12381,7 @@ async function buildCurriculumPlan(rawGraph, options) {
       const curCount = (conceptEncounterMap.get(cCode) || 0) + 1;
       conceptEncounterMap.set(cCode, curCount);
     }
-    const zpdResult = checkSessionZpd(i, s.nodeIds, nodeById, allSeenConcepts, allSeenKeywords, entryKw, warnings);
+    const zpdResult = checkSessionZpd(i, s.nodeIds, nodeById, allSeenConcepts, allSeenKeywords, entryKw, warnings, conceptPrereqMap);
     const prereqDecisions = decidePrerequisites(ctx, nodeById, graph.edges, sessionIndexByNode, sessionOrderByIndex, constraints);
     if (zpdResult.bridgeRepair) {
       prereqDecisions.unshift(zpdResult.bridgeRepair);