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

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

@@ -1,6 +1,6 @@
 'use strict';
 
-var spirits = require("./spirits-59475def.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-d74b94c8.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-ddb54eed.cjs → index-5a88279c.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
-var spirits = require("./spirits-59475def.cjs");
-var dev = require("./dev-d74b94c8.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-8ce4a465.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-ddb54eed.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-ddb54eed.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-ddb54eed.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-ddb54eed.cjs");
-var dev = require("./dev-d74b94c8.cjs");
-require("./spirits-59475def.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-8ce4a465.cjs → multipart-parser-d0654ebb.cjs}

@@ -2,9 +2,9 @@
 
 require('node:fs');
 require('node:path');
-var index = require("./index-ddb54eed.cjs");
-require("./spirits-59475def.cjs");
-require("./dev-d74b94c8.cjs");
+var index = require("./index-5a88279c.cjs");
+require("./spirits-51104a4a.cjs");
+require("./dev-d2f96a9d.cjs");
 require('util');
 require('stream');
 require('path');

package/dist/{spirits-59475def.cjs → spirits-51104a4a.cjs}

@@ -731,15 +731,111 @@ var Spirits = {
   /**
    * Customer message
    * @param {ConversationData & CustomerSpiritCallbacks} input
+   * @param {(error: Error) => void} onError
    * @returns {Promise<ConversationEvent>}
    */
   customer: function () {
     var _customer = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(input) {
       var _recentUserMessage;
-      var customer, config, parser, workflow, generator, transformer, idGenerator, _input$progress, progress, messageBefore, contextBefore, messagesBefore, conversationBefore, conversation, messages, context, message, followup, entityContextUpsert, updateConversation, updateContext, userMessages, recentUserMessage, lockConversation, incrementLockAttempt, _addInstruction, addInstruction, persona, invalidRoles, parsePayload, index, _message, previousUserMessages, oldKeyCount, newKeyCount, noNewContext, slots, hasNoInstructions, hasNoCustomMessage, messagesToTransform, previousLockAttempt, resettedIntent, _forward, _forwardNote, _tasks, _iterator, _step, _step$value, forward, forwardNote, instructions, removeInstructions, manualMessage, scheduled, resetIntent, secondsDelay, contextUpsert, anticipate, slotFollowup, slotEntityContextUpsert, tasks, _slots, map, i, _anticipate$i, keywords, _slot, slotId, _tasks2, _iterator3, _step3, instruction, _iterator4, _step4, _loop, manualMessageObj, now, generatorInput, generatorPayload, agentMessages, lastAgentMessage, _generatorPayload$ent, _generatorPayload$con, _iterator2, _step2, transformResponse, _agentMessages, _lastAgentMessage;
+      var onError,
+        customer,
+        config,
+        parser,
+        workflow,
+        generator,
+        transformer,
+        idGenerator,
+        _input$progress,
+        progress,
+        messageBefore,
+        contextBefore,
+        messagesBefore,
+        conversationBefore,
+        conversation,
+        messages,
+        context,
+        message,
+        followup,
+        entityContextUpsert,
+        updateConversation,
+        updateContext,
+        userMessages,
+        recentUserMessage,
+        lockConversation,
+        incrementLockAttempt,
+        _addInstruction,
+        addInstruction,
+        persona,
+        invalidRoles,
+        parsePayload,
+        index,
+        _message,
+        previousUserMessages,
+        oldKeyCount,
+        newKeyCount,
+        noNewContext,
+        slots,
+        hasNoInstructions,
+        hasNoCustomMessage,
+        messagesToTransform,
+        previousLockAttempt,
+        resettedIntent,
+        _forward,
+        _forwardNote,
+        _tasks,
+        _iterator,
+        _step,
+        _step$value,
+        forward,
+        forwardNote,
+        instructions,
+        removeInstructions,
+        manualMessage,
+        scheduled,
+        resetIntent,
+        secondsDelay,
+        contextUpsert,
+        anticipate,
+        slotFollowup,
+        slotEntityContextUpsert,
+        tasks,
+        _slots,
+        map,
+        i,
+        _anticipate$i,
+        keywords,
+        _slot,
+        slotId,
+        _tasks2,
+        _iterator4,
+        _step4,
+        instruction,
+        _iterator5,
+        _step5,
+        _loop,
+        manualMessageObj,
+        now,
+        generatorInput,
+        generatorPayload,
+        _generatorPayload$ent,
+        _generatorPayload$con,
+        _generatorPayload$med,
+        agentMessages,
+        lastAgentMessage,
+        addedMessages,
+        _iterator2,
+        _step2,
+        newMessage,
+        _iterator3,
+        _step3,
+        transformResponse,
+        _agentMessages,
+        _lastAgentMessage,
+        _args2 = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
+            onError = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : function () {};
             customer = input.customer, config = input.config, parser = input.parser, workflow = input.workflow, generator = input.generator, transformer = input.transformer, idGenerator = input.idGenerator, _input$progress = input.progress, progress = _input$progress === void 0 ? function (message, level, type, payload) {} : _input$progress, messageBefore = input.message, contextBefore = input.context, messagesBefore = input.messages, conversationBefore = input.conversation;
             conversation = input.conversation, messages = input.messages, context = input.context, message = input.message; // Storing post process events here
             followup = [];
@@ -832,40 +928,40 @@ var Spirits = {
               }
             }; // 1. Check inputs
             if (conversation.$agent) {
-              _context2.next = 14;
+              _context2.next = 15;
               break;
             }
             throw new Error("SpiritsError: No agent found in conversation, must define \".$agent\" in the conversation");
-          case 14:
+          case 15:
             persona = (config.persona || config.personas || config.agents).find(function (p) {
               return p.id === conversation.$agent;
             });
             if (persona) {
-              _context2.next = 19;
+              _context2.next = 20;
               break;
             }
             if (!(config.persona || config.personas || config.agents).some(function (a) {
               return !a.id;
             })) {
-              _context2.next = 18;
+              _context2.next = 19;
               break;
             }
             throw new Error("SpiritsError: No persona found (\"".concat(conversation.$agent, "\") in provided config, some persona's did not contain an \"id\" (Internal Mapping Error)"));
-          case 18:
-            throw new Error("SpiritsError: No persona found (\"".concat(conversation.$agent, "\") in provided config"));
           case 19:
+            throw new Error("SpiritsError: No persona found (\"".concat(conversation.$agent, "\") in provided config"));
+          case 20:
             if (messages.every(function (m) {
               return !!m.id;
             })) {
-              _context2.next = 21;
+              _context2.next = 22;
               break;
             }
             throw new Error("SpiritsError: Every message must have an \".id\", ensure all messages have an id assigned before running");
-          case 21:
+          case 22:
             if (messages.every(function (m) {
               return m.role === 'customer' || m.role === 'agent' || m.role === 'system';
             })) {
-              _context2.next = 24;
+              _context2.next = 25;
               break;
             }
             invalidRoles = messages.filter(function (m) {
@@ -874,7 +970,7 @@ var Spirits = {
             throw new Error("SpiritsError: Every message must have a role of \"customer\", \"agent\", or \"system\". Got invalid roles: ".concat(invalidRoles.map(function (m) {
               return m.role;
             }).join(', ')));
-          case 24:
+          case 25:
             // if message is not in messages, then add it
             if (!messages.find(function (m) {
               return m.id === input.message.id;
@@ -884,9 +980,9 @@ var Spirits = {
 
             // 2. Parse the message
             progress('Parsing message', 'info', 'SET_PROCESSING', 'user');
-            _context2.next = 28;
+            _context2.next = 29;
             return parser(message.content, 'en');
-          case 28:
+          case 29:
             parsePayload = _context2.sent;
             if (parsePayload.intent) {
               message.intent = parsePayload.intent;
@@ -957,7 +1053,7 @@ var Spirits = {
             }
             noNewContext = Object.keys(parsePayload.context).length === 0; // 3. Run the workflow
             progress('Running workflow', 'info', 'SET_PROCESSING', 'system');
-            _context2.next = 45;
+            _context2.next = 46;
             return workflow({
               messages: messages,
               conversation: conversation,
@@ -986,7 +1082,7 @@ var Spirits = {
                 return accumulator;
               }, []);
             });
-          case 45:
+          case 46:
             slots = _context2.sent;
             hasNoInstructions = slots.every(function (s) {
               return !s.instructions || Array.isArray(s.instructions) && s.instructions.length === 0;
@@ -1013,20 +1109,20 @@ var Spirits = {
             resettedIntent = false;
             /** @type {Array<string> | undefined} */
             _iterator = _createForOfIteratorHelper(slots);
-            _context2.prev = 53;
+            _context2.prev = 54;
             _iterator.s();
-          case 55:
+          case 56:
             if ((_step = _iterator.n()).done) {
-              _context2.next = 126;
+              _context2.next = 127;
               break;
             }
             _step$value = _step.value, forward = _step$value.forward, forwardNote = _step$value.forwardNote, instructions = _step$value.instructions, removeInstructions = _step$value.removeInstructions, manualMessage = _step$value.message, scheduled = _step$value.scheduled, resetIntent = _step$value.resetIntent, secondsDelay = _step$value.secondsDelay, contextUpsert = _step$value.contextUpsert, anticipate = _step$value.anticipate, slotFollowup = _step$value.followup, slotEntityContextUpsert = _step$value.entityContextUpsert, tasks = _step$value.tasks;
             if (!anticipate) {
-              _context2.next = 70;
+              _context2.next = 71;
               break;
             }
             if (!Array.isArray(anticipate)) {
-              _context2.next = 65;
+              _context2.next = 66;
               break;
             }
             // 'literal' anticipation
@@ -1046,11 +1142,11 @@ var Spirits = {
               slots: _slots,
               map: map
             });
-            _context2.next = 70;
+            _context2.next = 71;
             break;
-          case 65:
+          case 66:
             if (!('yes' in anticipate && 'no' in anticipate && 'did' in anticipate)) {
-              _context2.next = 69;
+              _context2.next = 70;
               break;
             }
             // "did" anticipation
@@ -1062,11 +1158,11 @@ var Spirits = {
               },
               did: anticipate.did
             });
-            _context2.next = 70;
+            _context2.next = 71;
             break;
-          case 69:
-            throw new Error("Invalid anticipate payload \"".concat(JSON.stringify(anticipate), "\""));
           case 70:
+            throw new Error("Invalid anticipate payload \"".concat(JSON.stringify(anticipate), "\""));
+          case 71:
             // tasks from auto/manual ingress to execute
             if (!!tasks && Array.isArray(tasks) && !!tasks.length) {
               if (!_tasks) _tasks = [];
@@ -1122,25 +1218,25 @@ var Spirits = {
 
             // Insert instructions context
             if (!instructions) {
-              _context2.next = 89;
+              _context2.next = 90;
               break;
             }
             if (!(typeof instructions === 'string')) {
-              _context2.next = 79;
+              _context2.next = 80;
               break;
             }
             addInstruction(instructions, previousLockAttempt);
-            _context2.next = 89;
+            _context2.next = 90;
             break;
-          case 79:
+          case 80:
             if (!Array.isArray(instructions)) {
-              _context2.next = 84;
+              _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 {
@@ -1148,35 +1244,35 @@ var Spirits = {
                 }
               }
             } catch (err) {
-              _iterator3.e(err);
+              _iterator4.e(err);
             } finally {
-              _iterator3.f();
+              _iterator4.f();
             }
-            _context2.next = 89;
+            _context2.next = 90;
             break;
-          case 84:
+          case 85:
             if (!(_typeof(instructions) === 'object' && 'content' in instructions)) {
-              _context2.next = 88;
+              _context2.next = 89;
               break;
             }
             addInstruction(instructions.content, previousLockAttempt, instructions.id);
-            _context2.next = 89;
+            _context2.next = 90;
             break;
-          case 88:
-            throw new Error("SpiritsError: instructions must be a string or array or {content: \"<instruction>\"}, got: ".concat(JSON.stringify(instructions)));
           case 89:
+            throw new Error("SpiritsError: instructions must be a string or array or {content: \"<instruction>\"}, got: ".concat(JSON.stringify(instructions)));
+          case 90:
             if (!removeInstructions) {
-              _context2.next = 106;
+              _context2.next = 107;
               break;
             }
-            _iterator4 = _createForOfIteratorHelper(removeInstructions);
-            _context2.prev = 91;
+            _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;
                     });
@@ -1194,30 +1290,30 @@ var Spirits = {
                 }
               }, _loop);
             });
-            _iterator4.s();
-          case 94:
-            if ((_step4 = _iterator4.n()).done) {
-              _context2.next = 98;
+            _iterator5.s();
+          case 95:
+            if ((_step5 = _iterator5.n()).done) {
+              _context2.next = 99;
               break;
             }
-            return _context2.delegateYield(_loop(), "t0", 96);
-          case 96:
-            _context2.next = 94;
+            return _context2.delegateYield(_loop(), "t0", 97);
+          case 97:
+            _context2.next = 95;
             break;
-          case 98:
-            _context2.next = 103;
+          case 99:
+            _context2.next = 104;
             break;
-          case 100:
-            _context2.prev = 100;
-            _context2.t1 = _context2["catch"](91);
-            _iterator4.e(_context2.t1);
-          case 103:
-            _context2.prev = 103;
-            _iterator4.f();
-            return _context2.finish(103);
-          case 106:
+          case 101:
+            _context2.prev = 101;
+            _context2.t1 = _context2["catch"](92);
+            _iterator5.e(_context2.t1);
+          case 104:
+            _context2.prev = 104;
+            _iterator5.f();
+            return _context2.finish(104);
+          case 107:
             if (!manualMessage) {
-              _context2.next = 122;
+              _context2.next = 123;
               break;
             }
             /** @type {import('@scout9/app').Message} */
@@ -1229,25 +1325,25 @@ var Spirits = {
               time: new Date().toISOString()
             };
             if (!(_typeof(manualMessage) === 'object')) {
-              _context2.next = 114;
+              _context2.next = 115;
               break;
             }
             Object.assign(manualMessageObj, manualMessage);
             manualMessageObj.role = 'agent';
             manualMessageObj.time = new Date().toISOString();
-            _context2.next = 119;
+            _context2.next = 120;
             break;
-          case 114:
+          case 115:
             if (!(typeof manualMessage === 'string')) {
-              _context2.next = 118;
+              _context2.next = 119;
               break;
             }
             manualMessageObj.content = manualMessage;
-            _context2.next = 119;
+            _context2.next = 120;
             break;
-          case 118:
-            throw new Error('Manual message must be of type "string" or "DirectMessage"');
           case 119:
+            throw new Error('Manual message must be of type "string" or "DirectMessage"');
+          case 120:
             if (scheduled) {
               manualMessageObj.time = new Date(scheduled * 1000).toISOString();
               manualMessageObj.scheduled = manualMessageObj.time;
@@ -1259,7 +1355,7 @@ var Spirits = {
             }
             messages.push(manualMessageObj);
             progress('Added manual message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
-          case 122:
+          case 123:
             if (contextUpsert) {
               context = updateContext(context, contextUpsert);
               progress('Upserted context', 'info', 'UPDATE_CONTEXT', contextUpsert);
@@ -1267,21 +1363,21 @@ var Spirits = {
             if (resetIntent) {
               resettedIntent = true;
             }
-          case 124:
-            _context2.next = 55;
+          case 125:
+            _context2.next = 56;
             break;
-          case 126:
-            _context2.next = 131;
+          case 127:
+            _context2.next = 132;
             break;
-          case 128:
-            _context2.prev = 128;
-            _context2.t2 = _context2["catch"](53);
+          case 129:
+            _context2.prev = 129;
+            _context2.t2 = _context2["catch"](54);
             _iterator.e(_context2.t2);
-          case 131:
-            _context2.prev = 131;
+          case 132:
+            _context2.prev = 132;
             _iterator.f();
-            return _context2.finish(131);
-          case 134:
+            return _context2.finish(132);
+          case 135:
             if (resettedIntent && !_forward) {
               conversation.intent = null;
               conversation.intentScore = null;
@@ -1300,15 +1396,17 @@ var Spirits = {
             // 4. Generate response
             // If conversation previously locked, don't generate
             if (input.conversation.locked) {
-              _context2.next = 184;
+              _context2.next = 187;
               break;
             }
             if (!((!conversation.locked || !hasNoInstructions) && !!hasNoCustomMessage)) {
-              _context2.next = 151;
+              _context2.next = 153;
               break;
             }
-            _context2.prev = 137;
+            _context2.prev = 138;
             progress('Generating message', 'info', 'SET_PROCESSING', 'system');
+
+            /** @type {import('@scout9/admin').GenerateRequestOneOf1} */
             generatorInput = {
               messages: messages,
               persona: persona,
@@ -1319,16 +1417,16 @@ var Spirits = {
             if (!!_tasks && Array.isArray(_tasks) && !!_tasks.length) {
               generatorInput.tasks = _tasks;
             }
-            _context2.next = 143;
+            _context2.next = 144;
             return generator(generatorInput);
-          case 143:
+          case 144:
             generatorPayload = _context2.sent;
             if (!generatorPayload.send) {
               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
@@ -1336,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)
@@ -1360,29 +1488,30 @@ var Spirits = {
                 }
               }
             }
-            _context2.next = 151;
+            _context2.next = 153;
             break;
-          case 147:
-            _context2.prev = 147;
-            _context2.t3 = _context2["catch"](137);
-            console.error("Locking conversation, error generating response: ".concat(_context2.t3.message));
+          case 148:
+            _context2.prev = 148;
+            _context2.t3 = _context2["catch"](138);
+            onError(_context2.t3);
+            console.error("Spirits: Locking conversation, error generating response: ".concat(_context2.t3.message));
             conversation = lockConversation(conversation, 'API: ' + _context2.t3.message);
-          case 151:
+          case 153:
             if (!(messagesToTransform.length && transformer)) {
-              _context2.next = 183;
+              _context2.next = 186;
               break;
             }
-            _context2.prev = 152;
-            _iterator2 = _createForOfIteratorHelper(messagesToTransform);
             _context2.prev = 154;
-            _iterator2.s();
-          case 156:
-            if ((_step2 = _iterator2.n()).done) {
-              _context2.next = 167;
+            _iterator3 = _createForOfIteratorHelper(messagesToTransform);
+            _context2.prev = 156;
+            _iterator3.s();
+          case 158:
+            if ((_step3 = _iterator3.n()).done) {
+              _context2.next = 169;
               break;
             }
-            _step2.value;
-            _context2.next = 160;
+            _step3.value;
+            _context2.next = 162;
             return transformer({
               message: messagesToTransform,
               persona: persona,
@@ -1390,7 +1519,7 @@ var Spirits = {
               messages: messages,
               context: context
             });
-          case 160:
+          case 162:
             transformResponse = _context2.sent;
             progress('Generated response', 'success', undefined, undefined);
             // Check if already had message
@@ -1410,36 +1539,37 @@ var Spirits = {
               });
               progress('Added agent message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
             }
-          case 165:
-            _context2.next = 156;
-            break;
           case 167:
-            _context2.next = 172;
+            _context2.next = 158;
             break;
           case 169:
-            _context2.prev = 169;
-            _context2.t4 = _context2["catch"](154);
-            _iterator2.e(_context2.t4);
-          case 172:
-            _context2.prev = 172;
-            _iterator2.f();
-            return _context2.finish(172);
-          case 175:
-            _context2.next = 181;
+            _context2.next = 174;
             break;
+          case 171:
+            _context2.prev = 171;
+            _context2.t4 = _context2["catch"](156);
+            _iterator3.e(_context2.t4);
+          case 174:
+            _context2.prev = 174;
+            _iterator3.f();
+            return _context2.finish(174);
           case 177:
-            _context2.prev = 177;
-            _context2.t5 = _context2["catch"](152);
+            _context2.next = 184;
+            break;
+          case 179:
+            _context2.prev = 179;
+            _context2.t5 = _context2["catch"](154);
             console.error("Locking conversation, error transforming response: ".concat(_context2.t5.message));
             conversation = lockConversation(conversation, 'API: ' + _context2.t5.message);
-          case 181:
-            _context2.next = 184;
+            onError(_context2.t5);
+          case 184:
+            _context2.next = 187;
             break;
-          case 183:
+          case 186:
             if (messagesToTransform.length) {
               console.warn("No transformer provided");
             }
-          case 184:
+          case 187:
             progress('Parsing message', 'info', 'SET_PROCESSING', null);
             return _context2.abrupt("return", {
               conversation: {
@@ -1463,11 +1593,11 @@ var Spirits = {
               followup: followup,
               entityContextUpsert: entityContextUpsert
             });
-          case 186:
+          case 189:
           case "end":
             return _context2.stop();
         }
-      }, _callee, null, [[53, 128, 131, 134], [91, 100, 103, 106], [137, 147], [152, 177], [154, 169, 172, 175]]);
+      }, _callee, null, [[54, 129, 132, 135], [92, 101, 104, 107], [138, 148], [154, 179], [156, 171, 174, 177]]);
     }));
     function customer(_x) {
       return _customer.apply(this, arguments);

package/dist/spirits.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var spirits = require("./spirits-59475def.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-d74b94c8.cjs");
-require("./spirits-59475def.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.0",
+  "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

@@ -114,9 +114,11 @@ export const Spirits = {
   /**
    * Customer message
    * @param {ConversationData & CustomerSpiritCallbacks} input
+   * @param {(error: Error) => void} onError
    * @returns {Promise<ConversationEvent>}
    */
-  customer: async function (input) {
+  customer: async function (input, onError = () => {
+  }) {
     const {
       customer,
       config,
@@ -432,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)}"`);
@@ -509,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)}`);
         }
       }
 
@@ -522,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(', ')}`);
           }
         }
       }
@@ -591,13 +595,16 @@ export const Spirits = {
       if ((!conversation.locked || !hasNoInstructions) && !!hasNoCustomMessage) {
         try {
           progress('Generating message', 'info', 'SET_PROCESSING', 'system');
+
+          /** @type {import('@scout9/admin').GenerateRequestOneOf1} */
           const generatorInput = {
             messages,
             persona,
             context,
             llm: config.llm,
             pmt: config.pmt
-          }
+          };
+
           if (!!_tasks && Array.isArray(_tasks) && !!_tasks.length) {
             generatorInput.tasks = _tasks;
           }
@@ -606,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)
@@ -643,7 +674,8 @@ export const Spirits = {
           }
 
         } catch (e) {
-          console.error(`Locking conversation, error generating response: ${e.message}`);
+          onError(e);
+          console.error(`Spirits: Locking conversation, error generating response: ${e.message}`);
           conversation = lockConversation(conversation, 'API: ' + e.message);
         }
       }
@@ -680,9 +712,10 @@ export const Spirits = {
         } catch (e) {
           console.error(`Locking conversation, error transforming response: ${e.message}`);
           conversation = lockConversation(conversation, 'API: ' + e.message);
+          onError(e);
         }
       } else if (messagesToTransform.length) {
-        console.warn(`No transformer provided`)
+        console.warn(`No transformer provided`);
       }
     }
 

package/types/index.d.ts

@@ -883,7 +883,7 @@ declare module '@scout9/app/testing-tools' {
 
 declare module '@scout9/app/spirits' {
 	export namespace Spirits {
-		function customer(input: ConversationData & CustomerSpiritCallbacks): Promise<ConversationEvent>;
+		function customer(input: ConversationData & CustomerSpiritCallbacks, onError?: (error: Error) => void): Promise<ConversationEvent>;
 	}
 	export type Document = {
 		id: string;