@scout9/app 1.0.0-alpha.0.7.1 → 1.0.0-alpha.0.7.2

package/dist/{dev-b1573a91.cjs → dev-d2f96a9d.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var spirits = require("./spirits-8ee2b3b6.cjs");
+var spirits = require("./spirits-51104a4a.cjs");
 var require$$0$4 = require('util');
 var require$$0$3 = require('stream');
 var require$$1 = require('path');
@@ -35241,7 +35241,7 @@ function _loadUserPackageJson() {
           targetPkgUrl = isTest ? packageTestJsonUrl : packageJsonUrl;
           _context2.t0 = JSON;
           _context2.next = 10;
-          return fs__default["default"].readFile(new URL(targetPkgUrl, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('dev-b1573a91.js', document.baseURI).href))), 'utf-8');
+          return fs__default["default"].readFile(new URL(targetPkgUrl, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('dev-d2f96a9d.js', document.baseURI).href))), 'utf-8');
         case 10:
           _context2.t1 = _context2.sent;
           pkg = _context2.t0.parse.call(_context2.t0, _context2.t1);

package/dist/{index-ee8d473f.cjs → index-5a88279c.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var spirits = require("./spirits-8ee2b3b6.cjs");
-var dev = require("./dev-b1573a91.cjs");
+var spirits = require("./spirits-51104a4a.cjs");
+var dev = require("./dev-d2f96a9d.cjs");
 var macros = require("./macros-22b2e0b8.cjs");
 var require$$0 = require('fs');
 var require$$2$1 = require('events');
@@ -29483,7 +29483,7 @@ class Body {
     }
     const {
       toFormData
-    } = await Promise.resolve().then(function () { return require("./multipart-parser-5a398f28.cjs"); });
+    } = await Promise.resolve().then(function () { return require("./multipart-parser-d0654ebb.cjs"); });
     return toFormData(this.body, ct);
   }
 
@@ -41884,7 +41884,7 @@ function _loadUserPackageJson() {
           targetPkgUrl = isTest ? packageTestJsonUrl : packageJsonUrl;
           _context.t0 = JSON;
           _context.next = 10;
-          return fs__default["default"].readFile(new URL(targetPkgUrl, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-ee8d473f.js', document.baseURI).href))), 'utf-8');
+          return fs__default["default"].readFile(new URL(targetPkgUrl, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-5a88279c.js', document.baseURI).href))), 'utf-8');
         case 10:
           _context.t1 = _context.sent;
           pkg = _context.t0.parse.call(_context.t0, _context.t1);
@@ -43176,7 +43176,7 @@ var ProjectFiles = /*#__PURE__*/function () {
   return ProjectFiles;
 }();
 
-var __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-ee8d473f.js', document.baseURI).href)));
+var __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-5a88279c.js', document.baseURI).href)));
 var __dirname$1 = path__default["default"].dirname(__filename$1);
 function zipDirectory(source, out) {
   var archive = archiver$1('tar', {
@@ -43391,7 +43391,7 @@ function _buildApp() {
         case 11:
           _context4.t0 = JSON;
           _context4.next = 14;
-          return fs__default["default"].readFile(new URL(templatePackagePath, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-ee8d473f.js', document.baseURI).href))), 'utf-8');
+          return fs__default["default"].readFile(new URL(templatePackagePath, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-5a88279c.js', document.baseURI).href))), 'utf-8');
         case 14:
           _context4.t1 = _context4.sent;
           packageTemplate = _context4.t0.parse.call(_context4.t0, _context4.t1);

package/dist/index.cjs

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require("./index-ee8d473f.cjs");
-var dev = require("./dev-b1573a91.cjs");
-require("./spirits-8ee2b3b6.cjs");
+var index = require("./index-5a88279c.cjs");
+var dev = require("./dev-d2f96a9d.cjs");
+require("./spirits-51104a4a.cjs");
 require("./macros-22b2e0b8.cjs");
 require('fs');
 require('events');

package/dist/{multipart-parser-5a398f28.cjs → multipart-parser-d0654ebb.cjs}

@@ -2,9 +2,9 @@
 
 require('node:fs');
 require('node:path');
-var index = require("./index-ee8d473f.cjs");
-require("./spirits-8ee2b3b6.cjs");
-require("./dev-b1573a91.cjs");
+var index = require("./index-5a88279c.cjs");
+require("./spirits-51104a4a.cjs");
+require("./dev-d2f96a9d.cjs");
 require('util');
 require('stream');
 require('path');

package/dist/{spirits-8ee2b3b6.cjs → spirits-51104a4a.cjs}

@@ -807,22 +807,27 @@ var Spirits = {
         _slot,
         slotId,
         _tasks2,
-        _iterator3,
-        _step3,
-        instruction,
         _iterator4,
         _step4,
+        instruction,
+        _iterator5,
+        _step5,
         _loop,
         manualMessageObj,
         now,
         generatorInput,
         generatorPayload,
-        agentMessages,
-        lastAgentMessage,
         _generatorPayload$ent,
         _generatorPayload$con,
+        _generatorPayload$med,
+        agentMessages,
+        lastAgentMessage,
+        addedMessages,
         _iterator2,
         _step2,
+        newMessage,
+        _iterator3,
+        _step3,
         transformResponse,
         _agentMessages,
         _lastAgentMessage,
@@ -1228,10 +1233,10 @@ var Spirits = {
               _context2.next = 85;
               break;
             }
-            _iterator3 = _createForOfIteratorHelper(instructions);
+            _iterator4 = _createForOfIteratorHelper(instructions);
             try {
-              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-                instruction = _step3.value;
+              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                instruction = _step4.value;
                 if (typeof instruction === 'string') {
                   addInstruction(instruction, previousLockAttempt);
                 } else {
@@ -1239,9 +1244,9 @@ var Spirits = {
                 }
               }
             } catch (err) {
-              _iterator3.e(err);
+              _iterator4.e(err);
             } finally {
-              _iterator3.f();
+              _iterator4.f();
             }
             _context2.next = 90;
             break;
@@ -1260,14 +1265,14 @@ var Spirits = {
               _context2.next = 107;
               break;
             }
-            _iterator4 = _createForOfIteratorHelper(removeInstructions);
+            _iterator5 = _createForOfIteratorHelper(removeInstructions);
             _context2.prev = 92;
             _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
               var instructionId, index;
               return _regeneratorRuntime().wrap(function _loop$(_context) {
                 while (1) switch (_context.prev = _context.next) {
                   case 0:
-                    instructionId = _step4.value;
+                    instructionId = _step5.value;
                     index = messages.findIndex(function (m) {
                       return m.id === instructionId;
                     });
@@ -1285,9 +1290,9 @@ var Spirits = {
                 }
               }, _loop);
             });
-            _iterator4.s();
+            _iterator5.s();
           case 95:
-            if ((_step4 = _iterator4.n()).done) {
+            if ((_step5 = _iterator5.n()).done) {
               _context2.next = 99;
               break;
             }
@@ -1301,10 +1306,10 @@ var Spirits = {
           case 101:
             _context2.prev = 101;
             _context2.t1 = _context2["catch"](92);
-            _iterator4.e(_context2.t1);
+            _iterator5.e(_context2.t1);
           case 104:
             _context2.prev = 104;
-            _iterator4.f();
+            _iterator5.f();
             return _context2.finish(104);
           case 107:
             if (!manualMessage) {
@@ -1420,8 +1425,8 @@ var Spirits = {
               progress('Generated response', 'failed', undefined, {
                 error: generatorPayload.error || 'Unknown Reason'
               });
-              console.error("Locking conversation, api returned send false: ".concat(generatorPayload.message), generatorPayload.error || 'Unknown Reason');
-              conversation = lockConversation(conversation, 'API: ' + generatorPayload.error || 'Unknown Reason');
+              console.error("Locking conversation, api returned send false: ".concat(generatorPayload.message), generatorPayload.error || generatorPayload.forwardNote || 'Unknown Reason');
+              conversation = lockConversation(conversation, 'API: ' + generatorPayload.error || generatorPayload.forwardNote || 'Unknown Reason');
             } else {
               progress('Generated response', 'success', undefined, undefined);
               // Check if already had message
@@ -1429,19 +1434,49 @@ var Spirits = {
                 return m.role === 'agent';
               });
               lastAgentMessage = agentMessages[agentMessages.length - 1];
-              if (lastAgentMessage && lastAgentMessage.content === generatorPayload.message) {
+              addedMessages = [{
+                id: idGenerator('agent'),
+                content: generatorPayload.message,
+                role: 'agent',
+                time: new Date().toISOString(),
+                entities: (_generatorPayload$ent = generatorPayload.entities) !== null && _generatorPayload$ent !== void 0 ? _generatorPayload$ent : [],
+                context: (_generatorPayload$con = generatorPayload.context) !== null && _generatorPayload$con !== void 0 ? _generatorPayload$con : {},
+                mediaUrls: (_generatorPayload$med = generatorPayload.mediaUrls) !== null && _generatorPayload$med !== void 0 ? _generatorPayload$med : []
+              }].concat(_toConsumableArray(((generatorPayload === null || generatorPayload === void 0 ? void 0 : generatorPayload.addedMessages) || []).map(function (message) {
+                var _message$time, _message$entities, _message$context;
+                return {
+                  id: idGenerator('agent'),
+                  content: message.content,
+                  role: 'agent',
+                  time: ((_message$time = message.time) === null || _message$time === void 0 || (_message$time = _message$time.toDate()) === null || _message$time === void 0 ? void 0 : _message$time.toISOString()) || new Date().toISOString(),
+                  entities: (_message$entities = message.entities) !== null && _message$entities !== void 0 ? _message$entities : {},
+                  context: (_message$context = message.context) !== null && _message$context !== void 0 ? _message$context : {},
+                  mediaUrls: message.mediaUrls
+                };
+              }))).reduce(function (accumulator, message) {
+                if (!accumulator.find(function (m) {
+                  return m.content === message.content;
+                })) accumulator.push(message);
+                return accumulator;
+              }, []);
+              if (lastAgentMessage && lastAgentMessage.content && addedMessages.some(function (message) {
+                return message.content === lastAgentMessage.content;
+              })) {
                 // Error should not have happened
                 conversation = lockConversation(conversation, 'Duplicate message');
               } else {
-                messages.push({
-                  id: idGenerator('agent'),
-                  role: 'agent',
-                  content: generatorPayload.message,
-                  time: new Date().toISOString(),
-                  entities: (_generatorPayload$ent = generatorPayload.entities) !== null && _generatorPayload$ent !== void 0 ? _generatorPayload$ent : [],
-                  context: (_generatorPayload$con = generatorPayload.context) !== null && _generatorPayload$con !== void 0 ? _generatorPayload$con : {}
-                });
-                progress('Added agent message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
+                _iterator2 = _createForOfIteratorHelper(addedMessages);
+                try {
+                  for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                    newMessage = _step2.value;
+                    messages.push(message);
+                    progress('Added agent message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
+                  }
+                } catch (err) {
+                  _iterator2.e(err);
+                } finally {
+                  _iterator2.f();
+                }
               }
 
               // Check if conversation was marked for forward (generator message still allowed to be sent)
@@ -1467,15 +1502,15 @@ var Spirits = {
               break;
             }
             _context2.prev = 154;
-            _iterator2 = _createForOfIteratorHelper(messagesToTransform);
+            _iterator3 = _createForOfIteratorHelper(messagesToTransform);
             _context2.prev = 156;
-            _iterator2.s();
+            _iterator3.s();
           case 158:
-            if ((_step2 = _iterator2.n()).done) {
+            if ((_step3 = _iterator3.n()).done) {
               _context2.next = 169;
               break;
             }
-            _step2.value;
+            _step3.value;
             _context2.next = 162;
             return transformer({
               message: messagesToTransform,
@@ -1513,10 +1548,10 @@ var Spirits = {
           case 171:
             _context2.prev = 171;
             _context2.t4 = _context2["catch"](156);
-            _iterator2.e(_context2.t4);
+            _iterator3.e(_context2.t4);
           case 174:
             _context2.prev = 174;
-            _iterator2.f();
+            _iterator3.f();
             return _context2.finish(174);
           case 177:
             _context2.next = 184;

package/dist/spirits.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var spirits = require("./spirits-8ee2b3b6.cjs");
+var spirits = require("./spirits-51104a4a.cjs");
 
 
 

package/dist/testing-tools.cjs

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dev = require("./dev-b1573a91.cjs");
-require("./spirits-8ee2b3b6.cjs");
+var dev = require("./dev-d2f96a9d.cjs");
+require("./spirits-51104a4a.cjs");
 require('util');
 require('stream');
 require('path');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scout9/app",
-  "version": "1.0.0-alpha.0.7.1",
+  "version": "1.0.0-alpha.0.7.2",
   "description": "Build and deploy your Scout9 app for SMS auto replies",
   "publishConfig": {
     "access": "public"

package/src/testing-tools/spirits.js

@@ -117,7 +117,8 @@ export const Spirits = {
    * @param {(error: Error) => void} onError
    * @returns {Promise<ConversationEvent>}
    */
-  customer: async function (input, onError = () => {}) {
+  customer: async function (input, onError = () => {
+  }) {
     const {
       customer,
       config,
@@ -433,7 +434,7 @@ export const Spirits = {
               yes: anticipate.yes,
               no: anticipate.no
             },
-            did: anticipate.did,
+            did: anticipate.did
           });
         } else {
           throw new Error(`Invalid anticipate payload "${JSON.stringify(anticipate)}"`);
@@ -510,7 +511,8 @@ export const Spirits = {
         } else if (typeof instructions === 'object' && 'content' in instructions) {
           addInstruction(instructions.content, previousLockAttempt, instructions.id);
         } else {
-          throw new Error(`SpiritsError: instructions must be a string or array or {content: "<instruction>"}, got: ${JSON.stringify(instructions)}`);
+          throw new Error(`SpiritsError: instructions must be a string or array or {content: "<instruction>"}, got: ${JSON.stringify(
+            instructions)}`);
         }
       }
 
@@ -523,7 +525,8 @@ export const Spirits = {
             messages.splice(index, 1);
             progress('Remove instruction', 'info', 'REMOVE_MESSAGE', instructionId);
           } else {
-            console.log(`Instruction not found "${instructionId}", other ids: ${messages.map(m => `"${m.id}"`).join(', ')}`);
+            console.log(`Instruction not found "${instructionId}", other ids: ${messages.map(m => `"${m.id}"`)
+              .join(', ')}`);
           }
         }
       }
@@ -600,7 +603,7 @@ export const Spirits = {
             context,
             llm: config.llm,
             pmt: config.pmt
-          }
+          };
 
           if (!!_tasks && Array.isArray(_tasks) && !!_tasks.length) {
             generatorInput.tasks = _tasks;
@@ -610,27 +613,51 @@ export const Spirits = {
             progress('Generated response', 'failed', undefined, {error: generatorPayload.error || 'Unknown Reason'});
             console.error(
               `Locking conversation, api returned send false: ${generatorPayload.message}`,
-              generatorPayload.error || 'Unknown Reason'
+              generatorPayload.error || generatorPayload.forwardNote || 'Unknown Reason'
+            );
+            conversation = lockConversation(
+              conversation,
+              'API: ' + generatorPayload.error || generatorPayload.forwardNote || 'Unknown Reason'
             );
-            conversation = lockConversation(conversation, 'API: ' + generatorPayload.error || 'Unknown Reason');
           } else {
             progress('Generated response', 'success', undefined, undefined);
             // Check if already had message
             const agentMessages = messages.filter(m => m.role === 'agent');
             const lastAgentMessage = agentMessages[agentMessages.length - 1];
-            if (lastAgentMessage && lastAgentMessage.content === generatorPayload.message) {
-              // Error should not have happened
-              conversation = lockConversation(conversation, 'Duplicate message');
-            } else {
-              messages.push({
+            const addedMessages = [
+              {
                 id: idGenerator('agent'),
-                role: 'agent',
                 content: generatorPayload.message,
+                role: 'agent',
                 time: new Date().toISOString(),
                 entities: generatorPayload.entities ?? [],
-                context: generatorPayload.context ?? {}
-              });
-              progress('Added agent message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
+                context: generatorPayload.context ?? {},
+                mediaUrls: generatorPayload.mediaUrls ?? []
+              },
+              ...(generatorPayload?.addedMessages || [])
+                .map((message) => ({
+                  id: idGenerator('agent'),
+                  content: message.content,
+                  role: 'agent',
+                  time: message.time?.toDate()?.toISOString() || new Date().toISOString(),
+                  entities: message.entities ?? {},
+                  context: message.context ?? {},
+                  mediaUrls: message.mediaUrls
+                }))
+            ]
+              .reduce((accumulator, message) => {
+                if (!accumulator.find(m => m.content === message.content)) accumulator.push(message);
+                return accumulator;
+              }, []);
+
+            if (lastAgentMessage && lastAgentMessage.content && addedMessages.some((message) => message.content === lastAgentMessage.content)) {
+              // Error should not have happened
+              conversation = lockConversation(conversation, 'Duplicate message');
+            } else {
+              for (const newMessage of addedMessages) {
+                messages.push(message);
+                progress('Added agent message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
+              }
             }
 
             // Check if conversation was marked for forward (generator message still allowed to be sent)
@@ -688,7 +715,7 @@ export const Spirits = {
           onError(e);
         }
       } else if (messagesToTransform.length) {
-        console.warn(`No transformer provided`)
+        console.warn(`No transformer provided`);
       }
     }