@patch-adams/core 1.4.2 → 1.4.5

package/dist/cli.js

@@ -1047,48 +1047,55 @@ function generateLrsBridgeCode(options) {
 
     function setupBridge() {
       try {
-        // 1. Try PlayerIntegration first (Xyleme native mode)
+        // 1. Try PlayerIntegration first (Xyleme native mode) - for SCORM APIs
         var integrationResult = findPlayerIntegration(10);
         if (integrationResult) {
           LRS.integration = integrationResult.integration;
           LRS.integrationLevel = integrationResult.level;
-          LRS.mode = 'playerIntegration';
-          log('Using PlayerIntegration mode');
+          log('Found PlayerIntegration at level', integrationResult.level);
 
           if (LRS.integration.Internal_SCORM_2004_API) {
             window.API_1484_11 = LRS.integration.Internal_SCORM_2004_API;
             LRS.scormApi = window.API_1484_11;
+            LRS.scormApiFound = true;
+            LRS.scormApiType = '2004';
           }
           if (LRS.integration.Internal_SCORM_12_API) {
             window.API = LRS.integration.Internal_SCORM_12_API;
+            if (!LRS.scormApiFound) {
+              LRS.scormApi = window.API;
+              LRS.scormApiFound = true;
+              LRS.scormApiType = '1.2';
+            }
           }
-          return true;
-        }
-
-        // 2. Search for SCORM APIs
-        log('No PlayerIntegration found, searching for SCORM APIs...');
-
-        var api2004 = findAPIInFrameHierarchy('API_1484_11', 10);
-        if (api2004) {
-          LRS.scormApi = api2004.api;
-          LRS.scormApiLevel = api2004.level;
-          LRS.scormApiWindow = api2004.window;
-          LRS.scormApiFound = true;
-          LRS.scormApiType = '2004';
-          log('Found SCORM 2004 API at level ' + api2004.level);
+          // Don't return early - continue to detect LRS endpoint for direct xAPI
         } else {
-          var api12 = findAPIInFrameHierarchy('API', 10);
-          if (api12) {
-            LRS.scormApi = api12.api;
-            LRS.scormApiLevel = api12.level;
-            LRS.scormApiWindow = api12.window;
+          // 2. Search for SCORM APIs directly
+          log('No PlayerIntegration found, searching for SCORM APIs...');
+
+          var api2004 = findAPIInFrameHierarchy('API_1484_11', 10);
+          if (api2004) {
+            LRS.scormApi = api2004.api;
+            LRS.scormApiLevel = api2004.level;
+            LRS.scormApiWindow = api2004.window;
             LRS.scormApiFound = true;
-            LRS.scormApiType = '1.2';
-            log('Found SCORM 1.2 API at level ' + api12.level);
+            LRS.scormApiType = '2004';
+            log('Found SCORM 2004 API at level ' + api2004.level);
+          } else {
+            var api12 = findAPIInFrameHierarchy('API', 10);
+            if (api12) {
+              LRS.scormApi = api12.api;
+              LRS.scormApiLevel = api12.level;
+              LRS.scormApiWindow = api12.window;
+              LRS.scormApiFound = true;
+              LRS.scormApiType = '1.2';
+              log('Found SCORM 1.2 API at level ' + api12.level);
+            }
           }
         }
 
-        // 3. Determine LRS endpoint
+        // 3. ALWAYS try to determine LRS endpoint for direct xAPI statements
+        // This is critical for detailed tracking (media, interactions, quizzes)
         // Priority: 1) Configured endpoint, 2) Auto-detected Bravais endpoint
         if (LRS_ENDPOINT_CONFIG && LRS_ENDPOINT_CONFIG.length > 0) {
           LRS_ENDPOINT = LRS_ENDPOINT_CONFIG;
@@ -1104,9 +1111,17 @@ function generateLrsBridgeCode(options) {
         LRS.lrsEndpoint = LRS_ENDPOINT;
 
         // 4. Determine mode based on what we found
+        // Prefer directLRS when available for detailed tracking
         if (LRS_ENDPOINT && LRS_ENDPOINT.length > 0) {
           LRS.mode = 'directLRS';
           log('Using direct LRS mode with endpoint:', LRS_ENDPOINT);
+          if (LRS.integration) {
+            log('PlayerIntegration also available for SCORM state');
+          }
+          return true;
+        } else if (LRS.integration) {
+          LRS.mode = 'playerIntegration';
+          log('Using PlayerIntegration mode (no direct LRS endpoint)');
           return true;
         } else if (LRS.scormApiFound) {
           LRS.mode = 'scormOnly';
@@ -2325,6 +2340,154 @@ function generateLrsBridgeCode(options) {
       return info;
     }
 
+    // ========================================================================
+    // 4b. LESSON/SECTION NAME EXTRACTION
+    // ========================================================================
+
+    /**
+     * Get the current lesson/section information from Rise DOM
+     * Returns { id, name, lessonIndex, sectionName }
+     */
+    function getCurrentLessonInfo() {
+      var lessonInfo = {
+        id: window.location.hash || '#/',
+        name: null,
+        lessonIndex: null,
+        sectionName: null
+      };
+
+      try {
+        // 1. Try to get from Rise's navigation sidebar
+        // Rise shows active lesson with specific classes
+        var activeLesson = document.querySelector(
+          '.sidebar__link--current, ' +
+          '.sidebar-lesson--active, ' +
+          '.nav-sidebar__lesson--active, ' +
+          '[class*="sidebar"] [class*="current"], ' +
+          '[class*="sidebar"] [class*="active"], ' +
+          '[aria-current="page"], ' +
+          '[aria-current="true"]'
+        );
+
+        if (activeLesson) {
+          var lessonTitle = activeLesson.querySelector(
+            '.sidebar__link-text, ' +
+            '.lesson-title, ' +
+            '.sidebar-lesson__title, ' +
+            '[class*="title"], ' +
+            '[class*="label"]'
+          );
+          if (lessonTitle) {
+            lessonInfo.name = lessonTitle.textContent.trim();
+          } else {
+            lessonInfo.name = activeLesson.textContent.trim();
+          }
+
+          // Try to get the section/module name (parent group)
+          var section = activeLesson.closest(
+            '.sidebar__section, ' +
+            '.sidebar-section, ' +
+            '[class*="section"], ' +
+            '[class*="module"]'
+          );
+          if (section) {
+            var sectionTitle = section.querySelector(
+              '.sidebar__section-title, ' +
+              '.section-title, ' +
+              '[class*="section-title"], ' +
+              '[class*="module-title"], ' +
+              'h2, h3'
+            );
+            if (sectionTitle) {
+              lessonInfo.sectionName = sectionTitle.textContent.trim();
+            }
+          }
+        }
+
+        // 2. Try Rise's header/breadcrumb
+        if (!lessonInfo.name) {
+          var headerTitle = document.querySelector(
+            '.lesson-header__title, ' +
+            '.lesson__title, ' +
+            '.content-header__title, ' +
+            '[class*="lesson"] [class*="header"] [class*="title"], ' +
+            '.blocks-lesson-header__title'
+          );
+          if (headerTitle) {
+            lessonInfo.name = headerTitle.textContent.trim();
+          }
+        }
+
+        // 3. Try breadcrumbs
+        if (!lessonInfo.name || !lessonInfo.sectionName) {
+          var breadcrumbs = document.querySelectorAll(
+            '.breadcrumb__item, ' +
+            '.breadcrumbs li, ' +
+            '[class*="breadcrumb"] span, ' +
+            '[class*="breadcrumb"] a'
+          );
+          if (breadcrumbs.length >= 2) {
+            // Usually: Course > Section > Lesson
+            if (!lessonInfo.sectionName && breadcrumbs.length >= 2) {
+              lessonInfo.sectionName = breadcrumbs[breadcrumbs.length - 2].textContent.trim();
+            }
+            if (!lessonInfo.name) {
+              lessonInfo.name = breadcrumbs[breadcrumbs.length - 1].textContent.trim();
+            }
+          }
+        }
+
+        // 4. Try Rise's internal data
+        if (window.__RISE_COURSE_DATA__ && window.__RISE_COURSE_DATA__.lessons) {
+          var lessonId = lessonInfo.id.replace('#/lessons/', '').replace('#/', '');
+          var lessons = window.__RISE_COURSE_DATA__.lessons;
+          for (var i = 0; i < lessons.length; i++) {
+            if (lessons[i].id === lessonId || lessons[i].slug === lessonId) {
+              lessonInfo.name = lessons[i].title || lessonInfo.name;
+              lessonInfo.lessonIndex = i;
+              break;
+            }
+          }
+        }
+
+        // 5. Clean up - remove any "Home" or generic names if we're on a real lesson
+        if (lessonInfo.name) {
+          lessonInfo.name = lessonInfo.name.replace(/^\\d+\\.\\s*/, ''); // Remove leading numbers "1. "
+          if (lessonInfo.name.length > 200) {
+            lessonInfo.name = lessonInfo.name.substring(0, 200) + '...';
+          }
+        }
+
+        if (lessonInfo.sectionName) {
+          lessonInfo.sectionName = lessonInfo.sectionName.replace(/^\\d+\\.\\s*/, '');
+          if (lessonInfo.sectionName.length > 200) {
+            lessonInfo.sectionName = lessonInfo.sectionName.substring(0, 200) + '...';
+          }
+        }
+
+      } catch (e) {
+        warn('Error extracting lesson info:', e);
+      }
+
+      log('Current lesson info:', lessonInfo);
+      return lessonInfo;
+    }
+
+    /**
+     * Cache the current lesson info (updates on navigation)
+     */
+    var cachedLessonInfo = null;
+    var cachedLessonHash = null;
+
+    function getCachedLessonInfo() {
+      var currentHash = window.location.hash;
+      if (cachedLessonHash !== currentHash) {
+        cachedLessonInfo = getCurrentLessonInfo();
+        cachedLessonHash = currentHash;
+      }
+      return cachedLessonInfo || getCurrentLessonInfo();
+    }
+
     // ========================================================================
     // 5. XAPI STATEMENT BUILDING
     // ========================================================================
@@ -2669,14 +2832,20 @@ function generateLrsBridgeCode(options) {
       LRS.eventLog.push({
         statement: statement,
         timestamp: new Date().toISOString(),
-        mode: LRS.mode
+        mode: LRS.mode,
+        lrsEndpoint: LRS_ENDPOINT
       });
 
-      // Route based on mode
-      if (LRS.mode === 'playerIntegration' && LRS.integration) {
-        return sendViaPlayerIntegration(statement);
-      } else if (LRS.mode === 'directLRS' && LRS_ENDPOINT) {
+      // ALWAYS prefer direct LRS when endpoint is available
+      // This ensures all our detailed tracking (media, interactions, etc.) goes to the LRS
+      // PlayerIntegration is used only for SCORM state, not for xAPI statements
+      if (LRS_ENDPOINT && LRS_ENDPOINT.length > 0) {
+        log('Sending via directLRS:', LRS_ENDPOINT);
         return sendViaDirectLRS(statement);
+      } else if (LRS.mode === 'playerIntegration' && LRS.integration) {
+        // Fallback to PlayerIntegration only if no direct LRS endpoint
+        log('No LRS endpoint, falling back to PlayerIntegration');
+        return sendViaPlayerIntegration(statement);
       } else {
         // SCORM-only or offline mode - just log
         log('Statement logged (no LRS):', statement.verb.display['en-US']);
@@ -2815,13 +2984,16 @@ function generateLrsBridgeCode(options) {
     LRS.contentOpened = function(data) {
       if (!TRACK_NAVIGATION) return;
 
+      // Get current lesson info from DOM (includes name)
+      var lessonInfo = getCurrentLessonInfo();
+
       var result = null;
       if (data.duration) {
         result = { duration: data.duration };
       }
 
       // Extract clean page/lesson ID from Rise hash paths
-      var lessonId = data.pageGuid || data.lessonId || '';
+      var lessonId = data.pageGuid || data.lessonId || lessonInfo.id || '';
       if (lessonId.indexOf('#/lessons/') === 0) {
         lessonId = lessonId.substring(10);  // Remove '#/lessons/'
       } else if (lessonId.indexOf('#/') === 0) {
@@ -2832,7 +3004,9 @@ function generateLrsBridgeCode(options) {
       var additionalContext = {
         extensions: {
           pageId: lessonId || 'home',
-          pageTitle: data.title || 'Page',
+          pageTitle: data.title || lessonInfo.name || 'Page',
+          lessonName: lessonInfo.name,
+          sectionName: lessonInfo.sectionName,
           pageUrl: data.url || window.location.href
         }
       };
@@ -2842,7 +3016,12 @@ function generateLrsBridgeCode(options) {
       var statement = buildStatement(
         'experienced',
         'http://xyleme.com/bravais/activities/document',
-        { event: 'page_viewed', pageId: lessonId },
+        {
+          event: 'page_viewed',
+          pageId: lessonId,
+          lessonName: lessonInfo.name,
+          sectionName: lessonInfo.sectionName
+        },
         result,
         additionalContext
       );
@@ -2853,6 +3032,9 @@ function generateLrsBridgeCode(options) {
     LRS.mediaPlayed = function(data) {
       if (!TRACK_MEDIA) return;
 
+      // Get current lesson context
+      var lessonInfo = getCachedLessonInfo();
+
       var mediaType = data.type === 'audio' ? ACTIVITY_TYPES.audio : ACTIVITY_TYPES.video;
       var verbKey = data.action === 'play' ? 'played' :
                     data.action === 'pause' ? 'paused' :
@@ -2863,7 +3045,11 @@ function generateLrsBridgeCode(options) {
         mediaSrc: data.src || 'media-' + Date.now(),
         mediaName: data.name || (data.type || 'Media'),
         mediaType: data.type || 'video',
-        'https://w3id.org/xapi/video/extensions/length': data.duration || 0
+        'https://w3id.org/xapi/video/extensions/length': data.duration || 0,
+        // Include lesson/section context
+        lessonId: lessonInfo.id,
+        lessonName: lessonInfo.name,
+        sectionName: lessonInfo.sectionName
       };
 
       var result = {
@@ -2886,12 +3072,21 @@ function generateLrsBridgeCode(options) {
     LRS.assessmentStarted = function(data) {
       if (!TRACK_QUIZZES) return;
 
+      // Get lesson context
+      var lessonInfo = getCachedLessonInfo();
+
       // Build assessment activity object for Xyleme format
       var assessmentObject = buildAssessmentActivityObject({
         assessmentGuid: data.assessmentGuid || data.id,
-        title: data.title || 'Assessment'
+        title: data.title || data.assessmentName || 'Assessment'
       });
 
+      // Add lesson context to extensions
+      assessmentObject.definition = assessmentObject.definition || {};
+      assessmentObject.definition.extensions = assessmentObject.definition.extensions || {};
+      assessmentObject.definition.extensions.lessonName = lessonInfo.name;
+      assessmentObject.definition.extensions.sectionName = lessonInfo.sectionName;
+
       var statement = buildStatementXyleme('attempted', assessmentObject);
       sendStatement(statement);
     };
@@ -2900,13 +3095,31 @@ function generateLrsBridgeCode(options) {
     LRS.assessmentEnded = function(data) {
       if (!TRACK_QUIZZES) return;
 
+      // Get lesson context (may be passed in from extractQuizResult)
+      var lessonInfo = data.lessonName ? { name: data.lessonName, sectionName: data.sectionName } : getCachedLessonInfo();
+
       // Build assessment activity object for Xyleme format
       var assessmentObject = buildAssessmentActivityObject({
-        assessmentGuid: data.assessmentGuid || data.id,
-        title: data.title || 'Assessment'
+        assessmentGuid: data.assessmentGuid || data.assessmentId || data.id,
+        title: data.title || data.assessmentName || 'Assessment'
       });
 
-      var result = { completion: true };
+      // Add lesson context to extensions
+      assessmentObject.definition = assessmentObject.definition || {};
+      assessmentObject.definition.extensions = assessmentObject.definition.extensions || {};
+      assessmentObject.definition.extensions.lessonName = lessonInfo.name;
+      assessmentObject.definition.extensions.sectionName = lessonInfo.sectionName;
+      assessmentObject.definition.extensions.assessmentName = data.assessmentName || data.title;
+
+      var result = {
+        completion: true,
+        extensions: {
+          'https://patch-adams.io/xapi/extensions/assessmentName': data.assessmentName || data.title || null,
+          'https://patch-adams.io/xapi/extensions/lessonName': lessonInfo.name || null,
+          'https://patch-adams.io/xapi/extensions/sectionName': lessonInfo.sectionName || null,
+          'https://patch-adams.io/xapi/extensions/questionCount': data.questionCount || null
+        }
+      };
 
       if (typeof data.score === 'number') {
         result.score = {
@@ -2935,14 +3148,27 @@ function generateLrsBridgeCode(options) {
     LRS.questionAnswered = function(data) {
       if (!TRACK_QUIZZES) return;
 
+      // Get lesson context if not provided
+      var lessonInfo = data.lessonName ? data : getCachedLessonInfo();
+
       // Build question activity object for Xyleme format
       var questionObject = buildQuestionActivityObject({
         questionGuid: data.questionGuid || data.questionId,
         text: data.questionText || 'Question'
       });
 
+      // Build comprehensive result with human-readable data
       var result = {
-        response: data.answer || data.response || ''
+        response: data.answer || data.response || '',
+        extensions: {
+          'https://patch-adams.io/xapi/extensions/questionNumber': data.questionNumber || null,
+          'https://patch-adams.io/xapi/extensions/questionText': data.questionText || null,
+          'https://patch-adams.io/xapi/extensions/answerText': data.answer || data.response || null,
+          'https://patch-adams.io/xapi/extensions/correctAnswer': data.correctAnswer || null,
+          'https://patch-adams.io/xapi/extensions/assessmentName': data.assessmentName || null,
+          'https://patch-adams.io/xapi/extensions/lessonName': lessonInfo.lessonName || lessonInfo.name || null,
+          'https://patch-adams.io/xapi/extensions/sectionName': lessonInfo.sectionName || null
+        }
       };
 
       if (data.result === 'correct' || data.correct === true) {
@@ -2974,6 +3200,9 @@ function generateLrsBridgeCode(options) {
     LRS.interacted = function(data) {
       if (!TRACK_INTERACTIONS) return;
 
+      // Get current lesson context
+      var lessonInfo = getCachedLessonInfo();
+
       // Activity type is interaction, details include interaction ID and type
       var statement = buildStatement(
         'interacted',
@@ -2981,7 +3210,11 @@ function generateLrsBridgeCode(options) {
         {
           interactionId: data.id || 'interaction-' + Date.now(),
           interactionName: data.name || data.type || 'Interaction',
-          interactionType: data.interactionType || data.type || 'other'
+          interactionType: data.interactionType || data.type || 'other',
+          // Include lesson/section context
+          lessonId: lessonInfo.id,
+          lessonName: lessonInfo.name,
+          sectionName: lessonInfo.sectionName
         }
       );
       sendStatement(statement);
@@ -3062,49 +3295,146 @@ function generateLrsBridgeCode(options) {
     function setupMediaInterceptors() {
       if (!TRACK_MEDIA) return;
 
-      document.addEventListener('play', function(e) {
-        var target = e.target;
-        if (target.tagName === 'VIDEO' || target.tagName === 'AUDIO') {
+      // Track which elements we've already attached listeners to
+      var trackedMedia = new WeakSet();
+
+      // Helper to get media name/title from element or surrounding context
+      function getMediaName(el) {
+        // Check element attributes
+        var name = el.title || el.getAttribute('aria-label') || el.getAttribute('data-name');
+        if (name) return name;
+
+        // Check parent Rise video block for title
+        var videoBlock = findClosest(el, '[data-block-type="video"], .blocks-video, .video-block');
+        if (videoBlock) {
+          var titleEl = videoBlock.querySelector('.video-title, .block-title, [class*="title"]');
+          if (titleEl) return titleEl.textContent.trim();
+        }
+
+        // Use src filename as fallback
+        var src = el.src || el.currentSrc || '';
+        if (src) {
+          var filename = src.split('/').pop().split('?')[0];
+          if (filename && filename.length < 100) return filename;
+        }
+
+        return el.tagName.toLowerCase();
+      }
+
+      // Attach media event listeners to a single element
+      function attachMediaListeners(el) {
+        if (trackedMedia.has(el)) return;
+        trackedMedia.add(el);
+
+        var mediaType = el.tagName.toLowerCase();
+        log('Attaching media listeners to:', mediaType, el.src || el.currentSrc || 'no-src');
+
+        el.addEventListener('play', function() {
+          log('Media play event captured:', mediaType);
           LRS.mediaPlayed({
-            type: target.tagName.toLowerCase(),
-            src: target.src || target.currentSrc || '',
-            name: target.title || target.getAttribute('aria-label') || '',
-            currentTime: target.currentTime || 0,
-            duration: target.duration || 0,
+            type: mediaType,
+            src: el.src || el.currentSrc || '',
+            name: getMediaName(el),
+            currentTime: el.currentTime || 0,
+            duration: el.duration || 0,
             action: 'play'
           });
-        }
-      }, true);
+        });
 
-      document.addEventListener('pause', function(e) {
-        var target = e.target;
-        if (target.tagName === 'VIDEO' || target.tagName === 'AUDIO') {
+        el.addEventListener('pause', function() {
+          // Ignore pause events that fire right before ended
+          if (el.ended) return;
+          log('Media pause event captured:', mediaType);
           LRS.mediaPlayed({
-            type: target.tagName.toLowerCase(),
-            src: target.src || target.currentSrc || '',
-            name: target.title || target.getAttribute('aria-label') || '',
-            currentTime: target.currentTime || 0,
-            duration: target.duration || 0,
+            type: mediaType,
+            src: el.src || el.currentSrc || '',
+            name: getMediaName(el),
+            currentTime: el.currentTime || 0,
+            duration: el.duration || 0,
             action: 'pause'
           });
-        }
-      }, true);
+        });
 
-      document.addEventListener('ended', function(e) {
-        var target = e.target;
-        if (target.tagName === 'VIDEO' || target.tagName === 'AUDIO') {
+        el.addEventListener('ended', function() {
+          log('Media ended event captured:', mediaType);
           LRS.mediaPlayed({
-            type: target.tagName.toLowerCase(),
-            src: target.src || target.currentSrc || '',
-            name: target.title || target.getAttribute('aria-label') || '',
-            currentTime: target.duration || 0,
-            duration: target.duration || 0,
+            type: mediaType,
+            src: el.src || el.currentSrc || '',
+            name: getMediaName(el),
+            currentTime: el.duration || 0,
+            duration: el.duration || 0,
             action: 'completed'
           });
+        });
+      }
+
+      // Scan for and attach listeners to all video/audio elements
+      function scanForMedia(root) {
+        var elements = (root || document).querySelectorAll('video, audio');
+        log('Scanning for media elements, found:', elements.length);
+        for (var i = 0; i < elements.length; i++) {
+          attachMediaListeners(elements[i]);
+        }
+      }
+
+      // Initial scan
+      scanForMedia();
+
+      // Document-level capture for any we might miss
+      document.addEventListener('play', function(e) {
+        var target = e.target;
+        if (target.tagName === 'VIDEO' || target.tagName === 'AUDIO') {
+          // Attach listeners if not already tracked
+          if (!trackedMedia.has(target)) {
+            log('Captured play from untracked media, attaching listeners');
+            attachMediaListeners(target);
+          }
         }
       }, true);
 
-      log('Media interceptors set up');
+      // MutationObserver to detect dynamically added video/audio elements
+      var mediaObserver = new MutationObserver(function(mutations) {
+        var needsScan = false;
+        mutations.forEach(function(mutation) {
+          mutation.addedNodes.forEach(function(node) {
+            if (node.nodeType === 1) {
+              if (node.tagName === 'VIDEO' || node.tagName === 'AUDIO') {
+                attachMediaListeners(node);
+              } else if (node.querySelectorAll) {
+                // Check for nested video/audio
+                var nested = node.querySelectorAll('video, audio');
+                if (nested.length > 0) {
+                  needsScan = true;
+                }
+              }
+            }
+          });
+        });
+        if (needsScan) {
+          scanForMedia();
+        }
+      });
+
+      // Start observing once DOM is ready
+      function startMediaObserver() {
+        if (document.body) {
+          mediaObserver.observe(document.body, {
+            childList: true,
+            subtree: true
+          });
+          log('Media mutation observer started');
+        } else {
+          setTimeout(startMediaObserver, 100);
+        }
+      }
+      startMediaObserver();
+
+      // Periodic rescan for Rise lazy-loaded content
+      setInterval(function() {
+        scanForMedia();
+      }, 3000);
+
+      log('Media interceptors set up (enhanced)');
     }
 
     function setupNavigationInterceptors() {
@@ -3185,43 +3515,152 @@ function generateLrsBridgeCode(options) {
              'quiz-' + Date.now();
     }
 
+    /**
+     * Extract quiz/assessment name from the DOM
+     */
+    function extractAssessmentName(node) {
+      // Try various selectors for assessment/quiz titles
+      var titleEl = node.querySelector(
+        '.quiz-title, .assessment-title, .knowledge-check-title, ' +
+        '.blocks-quiz__title, .block-title, ' +
+        '[class*="quiz"] [class*="title"], ' +
+        '[class*="assessment"] [class*="title"], ' +
+        'h2, h3'
+      );
+      if (titleEl) {
+        return titleEl.textContent.trim().substring(0, 200);
+      }
+
+      // Try to get from parent block
+      var parentBlock = node.closest('[data-block-type]');
+      if (parentBlock) {
+        var blockTitle = parentBlock.querySelector('.block-title, h2, h3');
+        if (blockTitle) {
+          return blockTitle.textContent.trim().substring(0, 200);
+        }
+      }
+
+      // Get current lesson name as context
+      var lessonInfo = getCachedLessonInfo();
+      if (lessonInfo.name) {
+        return 'Quiz in ' + lessonInfo.name;
+      }
+
+      return 'Knowledge Check';
+    }
+
     function extractQuizResult(node) {
       var scoreEl = node.querySelector('.score-value, .quiz-score, .score-percentage, [class*="score"]');
       var score = scoreEl ? parseFloat(scoreEl.textContent.replace(/[^0-9.]/g, '')) : null;
 
-      var questions = node.querySelectorAll('.question-result, .question-feedback, .question-item, [class*="question"]');
+      // Get assessment name and lesson context
+      var assessmentName = extractAssessmentName(node);
+      var lessonInfo = getCachedLessonInfo();
+
+      // Find all question containers - Rise uses various structures
+      var questions = node.querySelectorAll(
+        '.question-result, .question-feedback, .question-item, ' +
+        '.blocks-quiz__question, .quiz-question, ' +
+        '[class*="question-"][class*="result"], ' +
+        '[class*="question-"][class*="feedback"], ' +
+        '[data-question-id]'
+      );
+
+      log('Found', questions.length, 'question elements in quiz result');
 
       if (questions.length > 0) {
         questions.forEach(function(q, index) {
+          // Determine if correct - check multiple indicators
           var isCorrect = q.classList.contains('correct') ||
-                          q.querySelector('.correct, [class*="correct"]') !== null ||
-                          q.getAttribute('data-correct') === 'true';
+                          q.classList.contains('is-correct') ||
+                          q.querySelector('.correct, .is-correct, [class*="correct"]') !== null ||
+                          q.getAttribute('data-correct') === 'true' ||
+                          q.getAttribute('data-result') === 'correct';
 
+          // Get the question text - try multiple selectors
           var questionText = '';
-          var questionEl = q.querySelector('.question-text, .question-stem, .question-title, [class*="question-text"]');
+          var questionEl = q.querySelector(
+            '.question-text, .question-stem, .question-title, ' +
+            '.blocks-quiz__question-text, .quiz-question__text, ' +
+            '[class*="question-text"], [class*="question-stem"], ' +
+            '[class*="prompt"], p:first-of-type'
+          );
           if (questionEl) {
             questionText = questionEl.textContent.trim();
           }
 
+          // Get the learner's selected answer text
           var answerText = '';
-          var answerEl = q.querySelector('.selected-answer, .learner-response, .answer-text, [class*="response"]');
+          var answerEl = q.querySelector(
+            '.selected-answer, .learner-response, .answer-text, ' +
+            '.user-answer, .chosen-answer, .response-text, ' +
+            '.blocks-quiz__response, .quiz-question__response, ' +
+            '[class*="selected"], [class*="chosen"], [class*="response"], ' +
+            '[class*="user-answer"]'
+          );
           if (answerEl) {
             answerText = answerEl.textContent.trim();
           }
 
+          // If no specific answer element, try to find selected radio/checkbox label
+          if (!answerText) {
+            var selectedInput = q.querySelector('input:checked, [aria-checked="true"]');
+            if (selectedInput) {
+              var label = q.querySelector('label[for="' + selectedInput.id + '"]');
+              if (label) {
+                answerText = label.textContent.trim();
+              } else {
+                var parentLabel = selectedInput.closest('label');
+                if (parentLabel) {
+                  answerText = parentLabel.textContent.trim();
+                }
+              }
+            }
+          }
+
+          // Get question ID if available
+          var questionId = q.getAttribute('data-question-id') ||
+                           q.getAttribute('data-block-id') ||
+                           q.getAttribute('id') ||
+                           'q' + (index + 1);
+
+          // Get correct answer text if available (for reporting)
+          var correctAnswerText = '';
+          var correctEl = q.querySelector(
+            '.correct-answer, .right-answer, ' +
+            '[class*="correct-answer"], [class*="right-answer"]'
+          );
+          if (correctEl) {
+            correctAnswerText = correctEl.textContent.trim();
+          }
+
+          log('Question', index + 1, ':', {
+            questionText: questionText.substring(0, 50) + '...',
+            answerText: answerText.substring(0, 50) + '...',
+            isCorrect: isCorrect
+          });
+
           LRS.questionAnswered({
-            questionId: 'q' + (index + 1),
-            questionText: questionText.substring(0, 200),
-            answer: answerText.substring(0, 200),
-            result: isCorrect ? 'correct' : 'incorrect'
+            questionId: questionId,
+            questionNumber: index + 1,
+            questionText: questionText.substring(0, 500),
+            answer: answerText.substring(0, 500),
+            correctAnswer: correctAnswerText.substring(0, 500),
+            result: isCorrect ? 'correct' : 'incorrect',
+            assessmentName: assessmentName,
+            lessonName: lessonInfo.name,
+            sectionName: lessonInfo.sectionName
           });
         });
       }
 
       LRS.assessmentEnded({
         assessmentId: extractAssessmentId(node),
+        assessmentName: assessmentName,
         score: score,
-        questionCount: questions.length
+        questionCount: questions.length,
+        lessonName: lessonInfo.name,
+        sectionName: lessonInfo.sectionName
       });
     }
 
@@ -3345,7 +3784,7 @@ function generateLrsBridgeCode(options) {
     // ========================================================================
 
     function init() {
-      log('Initializing LRS bridge v2.2.0...');
+      log('Initializing LRS bridge v2.5.0...');
 
       // Extract course info early
       extractCourseInfo();