wingbot 3.76.10 → 3.76.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.76.10",
+  "version": "3.76.12",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "type": "commonjs",

package/src/LLMDispatcher.js

@@ -183,7 +183,9 @@ class LLMDispatcher {
 
         let aiRes;
         let llmRes;
-        if ((!res || bounceAllow) && routing?.router) {
+
+        // lets skip llm routing when user uploads an attachment
+        if ((!res || bounceAllow) && routing?.router && !this._req.isAttachment()) {
             aiRes = await routing.router.resolve(this._llm, this._req, routing);
         }
 

package/src/Responder.js

@@ -911,6 +911,52 @@ class Responder {
         this.routePath = routePath;
     }
 
+    /**
+     *
+     * @param {Object.<string,string|QuickReply>|QuickReply[]} [replies] - quick replies
+     * @param {object} [messageData]
+     * @returns {QuickReply[]}
+     */
+    resolveQuickRepliesForAnswer (replies = null, messageData = null) {
+        if (!replies && this._quickReplyCollector.length === 0) {
+            return [];
+        }
+
+        const {
+            quickReplies: qrs, expectedKeywords, disambiguationIntents
+        } = makeQuickReplies(
+            replies,
+            this.path,
+            this._t,
+            this._quickReplyCollector,
+            Ai.ai,
+            this.currentAction()
+        );
+
+        if (!messageData) {
+            return qrs;
+        }
+
+        if (disambiguationIntents.length > 0) {
+            this._senderMeta = {
+                flag: ResponseFlag.DISAMBIGUATION_OFFERED,
+                disambiguationIntents
+            };
+        }
+
+        if (qrs.length > 0) {
+            this.finalMessageSent = true;
+            Object.assign(messageData.message, {
+                quick_replies: qrs
+            });
+
+            this._addExpectedIntents(expectedKeywords);
+            this._quickReplyCollector = [];
+        }
+
+        return qrs;
+    }
+
     /**
      * @typedef {object} MessageOptions
      * @prop {boolean} [disableAutoTyping]
@@ -953,27 +999,7 @@ class Responder {
 
         this._textResponses.push(text);
 
-        if (replies || this._quickReplyCollector.length !== 0) {
-            const qrc = this._quickReplyCollector;
-            const {
-                quickReplies: qrs, expectedKeywords, disambiguationIntents
-            } = makeQuickReplies(replies, this.path, this._t, qrc, Ai.ai, this.currentAction());
-
-            if (disambiguationIntents.length > 0) {
-                this._senderMeta = {
-                    flag: ResponseFlag.DISAMBIGUATION_OFFERED,
-                    disambiguationIntents
-                };
-            }
-
-            if (qrs.length > 0) {
-                this.finalMessageSent = true;
-                messageData.message.quick_replies = qrs;
-
-                this._addExpectedIntents(expectedKeywords);
-                this._quickReplyCollector = [];
-            }
-        }
+        this.resolveQuickRepliesForAnswer(replies, messageData);
 
         if (this._features.includes(FEATURE_VOICE)
             && (voice || this.voiceControl)) {

package/src/prompt.js

@@ -93,7 +93,9 @@ function prompt (strings, ...args) {
 
     const renderer = async (req, res = null) => {
         const reqIsRequest = 'action' in req && typeof req.action === 'function';
+        const reqIsResponder = typeof req?.send === 'function';
         const data = {
+            ...(reqIsResponder ? stateData(null, req) : {}),
             ...(reqIsRequest ? stateData(req, res) : req),
             ...inputData
         };

package/src/resolvers/message.js

@@ -446,6 +446,10 @@ function message (params, context = {}) {
             };
         }
 
+        res.setData({
+            _qRepliesToSend: sendReplies || []
+        });
+
         if (params.type === 'prompt' && !res.llm.configuration.disableLLM) {
             res.typingOn()
                 .wait(1000);

package/src/utils/quickReplies.js

@@ -122,14 +122,15 @@ function makeQuickReplies (replies, path = '', translate = (w) => w, quickReplyC
 
     let unshift = 0;
     quickReplyCollector.forEach((reply) => {
-        if (reply._justToExisting) {
-            delete reply._justToExisting; // eslint-disable-line no-param-reassign
+        const clear = { ...reply };
+        if (clear._justToExisting) {
+            delete clear._justToExisting;
         }
-        if (reply._prepend) {
-            delete reply._prepend; // eslint-disable-line no-param-reassign
-            iterate.splice(unshift++, 0, reply);
+        if (clear._prepend) {
+            delete clear._prepend;
+            iterate.splice(unshift++, 0, clear);
         } else {
-            iterate.push(reply);
+            iterate.push(clear);
         }
     });
 

package/src/utils/stateData.js

@@ -56,6 +56,16 @@ module.exports = function stateData (
         state: res.options.state
     };
 
+    let $qrTexts;
+
+    if (typeof res?.resolveQuickRepliesForAnswer === 'function') {
+        $qrTexts = res?.resolveQuickRepliesForAnswer(res.data._qRepliesToSend || [])
+            .filter((r) => r.title)
+            .map((r) => r.title);
+    } else {
+        $qrTexts = [];
+    }
+
     return {
         senderId,
         pageId,
@@ -73,6 +83,7 @@ module.exports = function stateData (
         // yes - res because of circular dependency
         ...(res && req && req.actionData()),
         ...(res ? res.data : {}),
-        $input: $this
+        $input: $this,
+        $qrTexts
     };
 };

package/.claude/settings.local.json

@@ -1,11 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(npx mocha:*)",
-      "Bash(npx tsc *)",
-      "Bash(npm test *)",
-      "Bash(node -e \"const p = require\\('./bot/plugins/BTMLLM'\\); console.log\\('factory type:', typeof p\\); console.log\\('factory name:', p.name\\);\")",
-      "Bash(grep -n \"prompt\\\\`\\\\|tagged\\\\|render\\\\|compile\\\\|hbs\" /Users/ondrejveres/Wingbot/wingbot-llm/src/prompt.js)"
-    ]
-  }
-}