@luckydraw/cumulus 0.28.2 → 0.28.4

package/dist/gateway/static/widget.js

@@ -1226,6 +1226,10 @@
   // WeakMap: DOM element -> BlockHandle[] for lifecycle management
   var blexHandles = typeof WeakMap !== 'undefined' ? new WeakMap() : null;
 
+  // Per-thread store for blex interaction values (poll answers, confirm clicks, etc.)
+  // Key: "threadName" → Map<"msgTimestamp:blockIdx", interactionValue>
+  var blexInteractionStore = {};
+
   // Extract ~~~blex:TYPE\n{json}\n~~~ fences from text
   // Returns { text: string (with placeholders), blocks: Array<{type, json, idx}> }
   function extractBlexBlocks(text) {
@@ -1240,18 +1244,23 @@
   }
 
   // Render blex blocks into placeholder divs within a message element
-  function renderBlexBlocks(el, blexBlocks, isStreaming) {
+  function renderBlexBlocks(el, blexBlocks, isStreaming, msgKey, threadName) {
     if (!blexBlocks || blexBlocks.length === 0) return;
     if (typeof Blex === 'undefined') {
       console.warn('[blex] Blex library not loaded — blex.min.js may have failed to fetch');
       return;
     }
     var placeholders = el.querySelectorAll('.blex-block-container');
+    // Get the interaction store for this thread
+    var store = threadName
+      ? blexInteractionStore[threadName] || (blexInteractionStore[threadName] = {})
+      : null;
 
     placeholders.forEach(function (container) {
       var idx = parseInt(container.getAttribute('data-blex-idx'), 10);
       if (isNaN(idx) || idx >= blexBlocks.length) return;
       var block = blexBlocks[idx];
+      var storeKey = msgKey ? msgKey + ':' + idx : null;
 
       try {
         var data = JSON.parse(block.json);
@@ -1261,8 +1270,14 @@
           // During streaming, show placeholder skeleton
           Blex.renderPlaceholder(block.type, container);
         } else {
+          // Check for previously stored interaction value
+          var renderOpts = {};
+          if (store && storeKey && store[storeKey]) {
+            renderOpts.previousValue = store[storeKey];
+          }
+
           // Final render — full interactive block
-          Blex.renderBlock(blockObj, container)
+          Blex.renderBlock(blockObj, container, renderOpts)
             .then(function (handle) {
               // Store handle immediately (inside async callback, not after sync loop)
               if (blexHandles) {
@@ -1273,6 +1288,11 @@
               if (handle && handle.onInteraction) {
                 // Wire interaction handler
                 handle.onInteraction(function (interaction) {
+                  // Store the interaction value for persistence across re-renders
+                  if (store && storeKey && interaction.value !== undefined) {
+                    store[storeKey] = interaction.value;
+                  }
+
                   // Find the panel — try el.closest first, fall back to document query
                   // (el may be detached from DOM if renderPanelMessages rebuilt the message list)
                   var panel = el.closest('.cumulus-thread-panel') || el.closest('.cumulus-panel');
@@ -1287,8 +1307,11 @@
 
                   if (inputEl && interaction.serialized) {
                     if (interaction.immediate) {
-                      // Immediate: inject into textarea and auto-send
-                      inputEl.value = interaction.serialized;
+                      // Immediate: prepend any existing input text, then auto-send
+                      var existingText = inputEl.value.trim();
+                      inputEl.value = existingText
+                        ? existingText + '\n\n' + interaction.serialized
+                        : interaction.serialized;
                       inputEl.dispatchEvent(new Event('input', { bubbles: true }));
                       // Find and click the send button
                       var sendBtn = panel ? panel.querySelector('[data-testid*="send"]') : null;
@@ -1389,14 +1412,25 @@
   // ── Inline Annotations (Google Docs-style highlight + comment) ──────────
 
   // Add an annotation chip to the chip tray
-  function addAnnotationChip(panel, quote, comment) {
+  function addAnnotationChip(panel, quote, comment, isCodeBlock, codeLang) {
     if (!panel) return;
     var tray = panel.querySelector('.cumulus-chip-tray');
     if (!tray) return;
 
     var truncatedQuote = quote.length > 30 ? quote.substring(0, 30) + '\u2026' : quote;
     var truncatedComment = comment.length > 30 ? comment.substring(0, 30) + '\u2026' : comment;
-    var serialized = '> ' + quote.replace(/\n/g, '\n> ') + '\n' + comment;
+    var serialized;
+    if (isCodeBlock) {
+      serialized =
+        '```' +
+        (codeLang && codeLang !== 'text' ? codeLang : '') +
+        '\n' +
+        quote +
+        '\n```\n' +
+        comment;
+    } else {
+      serialized = '> ' + quote.replace(/\n/g, '\n> ') + '\n' + comment;
+    }
 
     var chip = document.createElement('span');
     chip.className = 'cumulus-annotation-chip';
@@ -1420,7 +1454,7 @@
   }
 
   // Show the annotation popover near a text selection
-  function showAnnotationPopover(panel, selectedText, anchorRect) {
+  function showAnnotationPopover(panel, selectedText, anchorRect, isCodeBlock, codeLang) {
     // Remove any existing popover
     dismissAnnotationPopover(panel);
 
@@ -1469,7 +1503,7 @@
     submitBtn.addEventListener('click', function () {
       var comment = textarea.value.trim();
       if (comment) {
-        addAnnotationChip(panel, selectedText, comment);
+        addAnnotationChip(panel, selectedText, comment, isCodeBlock, codeLang);
       }
       dismissAnnotationPopover(panel);
       window.getSelection().removeAllRanges();
@@ -1491,10 +1525,8 @@
 
     panel.appendChild(popover);
 
-    // Focus the textarea after a tick (so the popover is in the DOM)
-    setTimeout(function () {
-      textarea.focus();
-    }, 0);
+    // Don't auto-focus the textarea — it clears the text selection.
+    // User can click into it when ready to type.
   }
 
   function dismissAnnotationPopover(panel) {
@@ -1521,10 +1553,22 @@
         var msgEl = container.closest ? container.closest('.cumulus-msg.assistant') : null;
         if (!msgEl) return;
 
+        // Detect if selection is inside a code block
+        var codeAncestor = container.closest ? container.closest('pre, code') : null;
+        var isCodeBlock = !!codeAncestor;
+        var codeLang = '';
+        if (isCodeBlock) {
+          var wrapper = container.closest ? container.closest('.code-block-wrapper') : null;
+          if (wrapper) {
+            var langEl = wrapper.querySelector('.code-block-language');
+            if (langEl) codeLang = langEl.textContent.trim();
+          }
+        }
+
         // Get anchor position for the popover
         var rect = range.getBoundingClientRect();
 
-        showAnnotationPopover(panel, selectedText, rect);
+        showAnnotationPopover(panel, selectedText, rect, isCodeBlock, codeLang);
       }, 10);
     });
 
@@ -2170,7 +2214,8 @@
       function buildUserMsgEl(msg) {
         var el = document.createElement('div');
         el.className = 'cumulus-msg user' + (isWideUserMessage(msg.content) ? ' wide' : '');
-        el.textContent = msg.content;
+        var mdResult = renderMarkdown(msg.content);
+        el.innerHTML = mdResult.html;
         if (msg.attachments && msg.attachments.length > 0) {
           var attRow = document.createElement('div');
           attRow.className = 'cumulus-msg-attachments';
@@ -2195,7 +2240,7 @@
         return el;
       }
 
-      function buildAssistantMsgEl(content, isStreaming) {
+      function buildAssistantMsgEl(content, isStreaming, msgKey) {
         var el = document.createElement('div');
         el.className = 'cumulus-msg assistant';
         if (isStreaming) el.setAttribute('data-testid', 'webchat-streaming');
@@ -2207,7 +2252,7 @@
           }
           // Render blex blocks — skip during streaming to avoid destroy/recreate churn
           if (!isStreaming) {
-            renderBlexBlocks(el, mdResult.blexBlocks, false);
+            renderBlexBlocks(el, mdResult.blexBlocks, false, msgKey, threadName);
           }
           el.querySelectorAll('.code-block-copy-btn').forEach(function (btn) {
             btn.addEventListener('click', function () {
@@ -2298,7 +2343,7 @@
               row.appendChild(buildUserMsgEl(msg));
             }
           } else {
-            row.appendChild(buildAssistantMsgEl(msg.content, false));
+            row.appendChild(buildAssistantMsgEl(msg.content, false, String(msg.timestamp)));
           }
           appendTimestamp(row, msg.timestamp);
           messagesEl.appendChild(row);
@@ -3735,7 +3780,8 @@
       function buildUserMsgEl(msg) {
         var el = document.createElement('div');
         el.className = 'cumulus-msg user' + (isWideUserMessage(msg.content) ? ' wide' : '');
-        el.textContent = msg.content;
+        var mdResult = renderMarkdown(msg.content);
+        el.innerHTML = mdResult.html;
         if (msg.attachments && msg.attachments.length > 0) {
           var attRow = document.createElement('div');
           attRow.className = 'cumulus-msg-attachments';
@@ -3760,7 +3806,7 @@
         return el;
       }
 
-      function buildAssistantMsgEl(content, isStreaming) {
+      function buildAssistantMsgEl(content, isStreaming, msgKey) {
         var el = document.createElement('div');
         el.className = 'cumulus-msg assistant';
         if (isStreaming) el.setAttribute('data-testid', 'webchat-streaming');
@@ -3772,7 +3818,7 @@
           }
           // Render blex blocks — skip during streaming to avoid destroy/recreate churn
           if (!isStreaming) {
-            renderBlexBlocks(el, mdResult.blexBlocks, false);
+            renderBlexBlocks(el, mdResult.blexBlocks, false, msgKey, threadName);
           }
           el.querySelectorAll('.code-block-copy-btn').forEach(function (btn) {
             btn.addEventListener('click', function () {
@@ -3855,7 +3901,7 @@
               row.appendChild(buildUserMsgEl(msg));
             }
           } else {
-            row.appendChild(buildAssistantMsgEl(msg.content, false));
+            row.appendChild(buildAssistantMsgEl(msg.content, false, String(msg.timestamp)));
           }
           appendTimestamp(row, msg.timestamp);
           messagesEl.appendChild(row);
@@ -4131,13 +4177,15 @@
             return;
           }
 
-          // Freeze the partial assistant response as a message
+          // Freeze the partial assistant response as a message so the interjection
+          // appears AFTER the (partial) LLM response, not next to the prior user message
           if (state.streamBuffer) {
             state.messages.push({ role: 'assistant', content: state.streamBuffer });
           }
           // Reset streaming state — the server will send 'interjected' for the old stream
           state.streamBuffer = '';
           state.interjecting = true;
+          state.interjectionStreamId = (state.interjectionStreamId || 0) + 1;
           // Don't set streaming=false — the new message will keep streaming
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luckydraw/cumulus",
-  "version": "0.28.2",
+  "version": "0.28.4",
   "description": "RLM-based CLI chat wrapper for Claude with external history context management",
   "type": "module",
   "main": "dist/index.js",