@scout9/app 1.0.0-alpha.1.0.5 → 1.0.0-alpha.1.0.7

package/dist/{dev-8c238c7b.cjs → dev-74c0ba94.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var _rollupPluginBabelHelpers = require("./_rollupPluginBabelHelpers-9c73c95c.cjs");
-var spirits = require("./spirits-ab87b546.cjs");
+var spirits = require("./spirits-c773fc77.cjs");
 var require$$0$4 = require('util');
 var require$$0$3 = require('stream');
 var require$$1 = require('path');
@@ -35307,7 +35307,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-8c238c7b.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-74c0ba94.js', document.baseURI).href))), 'utf-8');
         case 10:
           _context2.t1 = _context2.sent;
           pkg = _context2.t0.parse.call(_context2.t0, _context2.t1);

package/dist/{index-57129cdc.cjs → index-37eb47ef.cjs}

@@ -1,9 +1,9 @@
 'use strict';
 
 var _rollupPluginBabelHelpers = require("./_rollupPluginBabelHelpers-9c73c95c.cjs");
-var dev = require("./dev-8c238c7b.cjs");
+var dev = require("./dev-74c0ba94.cjs");
 var macros = require("./macros-c0acaa02.cjs");
-var spirits = require("./spirits-ab87b546.cjs");
+var spirits = require("./spirits-c773fc77.cjs");
 var require$$0 = require('fs');
 var require$$2$1 = require('events');
 var require$$1 = require('path');
@@ -29484,7 +29484,7 @@ class Body {
     }
     const {
       toFormData
-    } = await Promise.resolve().then(function () { return require("./multipart-parser-4f099bcf.cjs"); });
+    } = await Promise.resolve().then(function () { return require("./multipart-parser-531d0e35.cjs"); });
     return toFormData(this.body, ct);
   }
 
@@ -41885,7 +41885,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-57129cdc.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-37eb47ef.js', document.baseURI).href))), 'utf-8');
         case 10:
           _context.t1 = _context.sent;
           pkg = _context.t0.parse.call(_context.t0, _context.t1);
@@ -43177,7 +43177,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-57129cdc.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-37eb47ef.js', document.baseURI).href)));
 var __dirname$1 = path__default["default"].dirname(__filename$1);
 function zipDirectory(source, out) {
   var archive = archiver$1('tar', {
@@ -43392,7 +43392,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-57129cdc.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-37eb47ef.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,11 +2,11 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require("./index-57129cdc.cjs");
-var dev = require("./dev-8c238c7b.cjs");
+var index = require("./index-37eb47ef.cjs");
+var dev = require("./dev-74c0ba94.cjs");
 require("./_rollupPluginBabelHelpers-9c73c95c.cjs");
 require("./macros-c0acaa02.cjs");
-require("./spirits-ab87b546.cjs");
+require("./spirits-c773fc77.cjs");
 require('fs');
 require('events');
 require('path');

package/dist/{multipart-parser-4f099bcf.cjs → multipart-parser-531d0e35.cjs}

@@ -2,10 +2,10 @@
 
 require('node:fs');
 require('node:path');
-var index = require("./index-57129cdc.cjs");
+var index = require("./index-37eb47ef.cjs");
 require("./_rollupPluginBabelHelpers-9c73c95c.cjs");
-require("./dev-8c238c7b.cjs");
-require("./spirits-ab87b546.cjs");
+require("./dev-74c0ba94.cjs");
+require("./spirits-c773fc77.cjs");
 require('util');
 require('stream');
 require('path');

package/dist/{spirits-ab87b546.cjs → spirits-c773fc77.cjs}

@@ -4692,7 +4692,8 @@ function enforceMonotonicInPlace(arr) {
   }
 }
 
-var _excluded = ["keywords"];
+var _excluded = ["id"],
+  _excluded2 = ["keywords"];
 
 /**
  * @typedef {Object} Document
@@ -4934,6 +4935,8 @@ var Spirits = {
         messages,
         context,
         message,
+        elapsedSeconds,
+        rootStart,
         err,
         followup,
         entityContextUpsert,
@@ -4955,6 +4958,7 @@ var Spirits = {
         lockConversation,
         incrementLockAttempt,
         _addInstruction,
+        instructionsAdded,
         addInstruction,
         onStatus,
         wrapStep,
@@ -4963,6 +4967,9 @@ var Spirits = {
         parsePayload,
         index,
         _message,
+        patch,
+        id,
+        updatedFields,
         previousUserMessages,
         oldKeyCount,
         newKeyCount,
@@ -5027,6 +5034,7 @@ var Spirits = {
         _transformResponse$me,
         transformResponse,
         transformedMessages,
+        appendedList,
         _iterator9,
         _step9,
         _loop,
@@ -5038,6 +5046,11 @@ var Spirits = {
             onError = _args6.length > 1 && _args6[1] !== undefined ? _args6[1] : function () {};
             customer = input.customer, config = input.config, messageBefore = input.message, contextBefore = input.context, messagesBefore = input.messages, conversationBefore = input.conversation, parser = input.parser, contextualizer = input.contextualizer, 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, _input$onSetContext = input.onSetContext, onSetContext = _input$onSetContext === void 0 ? function (_ctx) {} : _input$onSetContext, _input$onUpdateContex = input.onUpdateContext, onUpdateContext = _input$onUpdateContex === void 0 ? function (_patch) {} : _input$onUpdateContex, _input$onSetConversat = input.onSetConversation, onSetConversation = _input$onSetConversat === void 0 ? function (_conv) {} : _input$onSetConversat, _input$onUpdateConver = input.onUpdateConversation, onUpdateConversation = _input$onUpdateConver === void 0 ? function (_patch) {} : _input$onUpdateConver, input.onChunkMessage, _input$onAddMessage = input.onAddMessage, onAddMessage = _input$onAddMessage === void 0 ? function (_msg) {} : _input$onAddMessage, _input$onUpdateMessag = input.onUpdateMessage, onUpdateMessage = _input$onUpdateMessag === void 0 ? function (_patch) {} : _input$onUpdateMessag, _input$onDeleteMessag = input.onDeleteMessage, onDeleteMessage = _input$onDeleteMessag === void 0 ? function (_id) {} : _input$onDeleteMessag;
             conversation = input.conversation, messages = input.messages, context = input.context, message = input.message;
+            elapsedSeconds = function elapsedSeconds(start) {
+              return ((performance.now() - start) / 1000).toFixed(2);
+            };
+            rootStart = performance.now();
+            progress("Spirits.customer start", 'info', undefined, undefined);
             if (typeof message.content !== 'string') {
               err = new Error("Spirits: customer message.content is not string (id=".concat(message.id, ", type=").concat(_rollupPluginBabelHelpers._typeof(message.content), ")"));
               progress('customer message.content is not string', 'error', 'INVALID_CUSTOMER_MESSAGE', {
@@ -5172,13 +5185,15 @@ var Spirits = {
             isEmptySystemMessage = function isEmptySystemMessage(m) {
               return (m === null || m === void 0 ? void 0 : m.role) === 'system' && (typeof m.content !== 'string' || m.content.trim() === '');
             };
-            updateConversation = function updateConversation(previousConversation, conversationUpdates) {
-              progress('Update conversation', 'info', 'UPDATE_CONVERSATION', conversationUpdates);
+            updateConversation = function updateConversation(previousConversation, conversationUpdates, note) {
+              var _note = ["Updated conversation fields", note].filter(Boolean).join(', ');
+              progress("".concat(_note, ": ").concat(JSON.stringify(Object.keys(conversationUpdates))), 'info', 'UPDATE_CONVERSATION', conversationUpdates);
               emitUpdateConversation(conversationUpdates);
               return _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({}, previousConversation), conversationUpdates);
             };
-            updateContext = function updateContext(previousContext, newContext) {
-              progress('Update context', 'info', 'UPDATE_CONTEXT', newContext);
+            updateContext = function updateContext(previousContext, newContext, note) {
+              var _note = ["Updated context fields", note].filter(Boolean).join(', ');
+              progress("".concat(_note, ": ").concat(JSON.stringify(Object.keys(newContext))), 'info', 'UPDATE_CONTEXT', newContext);
               emitUpdateContext(newContext);
               return _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({}, previousContext), newContext);
             };
@@ -5195,7 +5210,7 @@ var Spirits = {
               return updateConversation(_conversation, {
                 locked: true,
                 lockedReason: _conversation.lockedReason || reason || 'Unknown'
-              });
+              }, 'lock conversation');
             };
             incrementLockAttempt = function incrementLockAttempt(_conversation, _config) {
               var max = (_config === null || _config === void 0 ? void 0 : _config.maxLockAttempts) || 3;
@@ -5210,8 +5225,11 @@ var Spirits = {
                 patch.locked = true;
                 patch.lockedReason = "Max lock attempts exceeded (".concat(next, " > ").concat(max, ")");
               }
-              var updated = updateConversation(_conversation, patch);
-              return updated;
+              var updated = updateConversation(_conversation, patch, 'increment lock');
+              return {
+                updated: updated,
+                patch: patch
+              };
             };
             _addInstruction = function _addInstruction(instruction, _messages, _conversation, _config, previousLockAttempt, id) {
               var systemMessages = _messages.filter(function (m) {
@@ -5219,7 +5237,7 @@ var Spirits = {
               });
               var lastSystemMessage = systemMessages[systemMessages.length - 1];
               var addedMessage = false;
-              var changedConversation = false;
+              var changedConversation = [];
 
               // If instruction does not equal previous system message, add it, otherwise lock attempt
               if (!lastSystemMessage || instruction !== lastSystemMessage.content) {
@@ -5242,8 +5260,11 @@ var Spirits = {
                 // Handle repeated instruction
                 // Increment lock attempt if instructions are repeated and we haven't already incremented lock attempt (for example if a forward is provided)
                 if (previousLockAttempt === (_conversation.lockAttempts || 0)) {
-                  _conversation = incrementLockAttempt(_conversation, _config);
-                  changedConversation = true;
+                  var _incrementLockAttempt = incrementLockAttempt(_conversation, _config),
+                    updated = _incrementLockAttempt.updated,
+                    patch = _incrementLockAttempt.patch;
+                  _conversation = updated;
+                  changedConversation = Object.keys(patch);
                 }
               }
               return {
@@ -5253,6 +5274,7 @@ var Spirits = {
                 changedConversation: changedConversation
               };
             };
+            instructionsAdded = 0;
             addInstruction = function addInstruction(instruction, previousLockAttempt) {
               var id = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : idGenerator('sys');
               var _addInstruction2 = _addInstruction(instruction, messages, conversation, config, previousLockAttempt, id),
@@ -5263,10 +5285,11 @@ var Spirits = {
               conversation = newConversation;
               messages = newMessages;
               if (addedMessage) {
-                progress('Added instruction', 'info', 'ADD_MESSAGE', newMessages[newMessages.length - 1]);
+                instructionsAdded++;
+                progress("Added ".concat(instructionsAdded, " instruction").concat(instructionsAdded === 1 ? '' : 's'), 'info', 'ADD_MESSAGE', newMessages[newMessages.length - 1]);
               }
-              if (changedConversation) {
-                progress('Updated conversation', 'info', 'UPDATE_CONVERSATION', newConversation);
+              if (changedConversation.length) {
+                progress("Updated conversation fields: ".concat(JSON.stringify(changedConversation)), 'info', 'UPDATE_CONVERSATION', newConversation);
               }
             };
             onStatus = function onStatus(statusType) {
@@ -5283,8 +5306,7 @@ var Spirits = {
             wrapStep = /*#__PURE__*/function () {
               var _ref2 = _rollupPluginBabelHelpers._asyncToGenerator( /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _callee(prom, step) {
                 var stepAction,
-                  start,
-                  elapsedSeconds,
+                  stepStart,
                   result,
                   msg,
                   _args2 = arguments;
@@ -5292,71 +5314,68 @@ var Spirits = {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
                       stepAction = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : step;
-                      start = performance.now();
-                      elapsedSeconds = function elapsedSeconds() {
-                        return ((performance.now() - start) / 1000).toFixed(2);
-                      };
-                      _context.prev = 3;
+                      stepStart = performance.now();
+                      _context.prev = 2;
                       progress("".concat(stepAction, " start"), 'info', undefined, undefined);
-                      _context.next = 7;
+                      _context.next = 6;
                       return prom;
-                    case 7:
+                    case 6:
                       result = _context.sent;
-                      progress("".concat(stepAction, " succeeded in ").concat(elapsedSeconds(), "s"), 'success', undefined, undefined);
+                      progress("".concat(stepAction, " succeeded in ").concat(elapsedSeconds(stepStart), "s"), 'success', undefined, undefined);
                       return _context.abrupt("return", result);
-                    case 12:
-                      _context.prev = 12;
-                      _context.t0 = _context["catch"](3);
+                    case 11:
+                      _context.prev = 11;
+                      _context.t0 = _context["catch"](2);
                       msg = (_context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.message) || 'UNHANDLED ERROR';
-                      progress("".concat(stepAction, " failed in ").concat(elapsedSeconds(), "s"), 'error', undefined, {
+                      progress("".concat(stepAction, " failed in ").concat(elapsedSeconds(stepStart), "s"), 'error', undefined, {
                         error: msg
                       });
                       throw SpiritError.fromError(_context.t0, step);
-                    case 17:
+                    case 16:
                     case "end":
                       return _context.stop();
                   }
-                }, _callee, null, [[3, 12]]);
+                }, _callee, null, [[2, 11]]);
               }));
               return function wrapStep(_x2, _x3) {
                 return _ref2.apply(this, arguments);
               };
             }(); // 1. Check inputs
             if (conversation.$agent) {
-              _context5.next = 30;
+              _context5.next = 34;
               break;
             }
             throw new Error("SpiritsError: No agent found in conversation, must define \".$agent\" in the conversation");
-          case 30:
+          case 34:
             persona = (config.persona || config.personas || config.agents).find(function (p) {
               return p.id === conversation.$agent;
             });
             if (persona) {
-              _context5.next = 35;
+              _context5.next = 39;
               break;
             }
             if (!(config.persona || config.personas || config.agents).some(function (a) {
               return !a.id;
             })) {
-              _context5.next = 34;
+              _context5.next = 38;
               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 34:
+          case 38:
             throw new Error("SpiritsError: No persona found (\"".concat(conversation.$agent, "\") in provided config"));
-          case 35:
+          case 39:
             if (messages.every(function (m) {
               return !!m.id;
             })) {
-              _context5.next = 37;
+              _context5.next = 41;
               break;
             }
             throw new Error("SpiritsError: Every message must have an \".id\", ensure all messages have an id assigned before running");
-          case 37:
+          case 41:
             if (messages.every(function (m) {
               return m.role === 'customer' || m.role === 'agent' || m.role === 'system' || m.role === 'tool';
             })) {
-              _context5.next = 40;
+              _context5.next = 44;
               break;
             }
             invalidRoles = messages.filter(function (m) {
@@ -5365,7 +5384,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 40:
+          case 44:
             // Normalize existing message times ONCE at the start
             enforceMonotonicWithEmits(messages, 1);
 
@@ -5381,9 +5400,9 @@ var Spirits = {
             }
 
             // 2. Parse the message
-            _context5.next = 46;
+            _context5.next = 50;
             return wrapStep(parser(message.content, 'en'), 'parse', 'parsing message');
-          case 46:
+          case 50:
             parsePayload = _context5.sent;
             if (parsePayload.intent) {
               message.intent = parsePayload.intent;
@@ -5415,7 +5434,7 @@ var Spirits = {
               message = _message;
               message = pushMessage(messages, _message);
               emitAddMessage(message);
-              progress('Added message', 'info', 'ADD_MESSAGE', _message);
+              progress("Added \"".concat(_message.role, "\" message"), 'info', 'ADD_MESSAGE', _message);
             } else {
               messages[index].context = parsePayload.context;
               messages[index].entities = parsePayload.entities;
@@ -5426,7 +5445,7 @@ var Spirits = {
                 messages[index].intentScore = parsePayload.intentScore;
               }
               message = messages[index];
-              emitUpdateMessage(_rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({
+              patch = _rollupPluginBabelHelpers._objectSpread2(_rollupPluginBabelHelpers._objectSpread2({
                 id: messages[index].id,
                 context: parsePayload.context,
                 entities: parsePayload.entities
@@ -5434,8 +5453,10 @@ var Spirits = {
                 intent: parsePayload.intent
               } : {}), typeof parsePayload.intentScore === 'number' ? {
                 intentScore: parsePayload.intentScore
-              } : {}));
-              progress('Parsed message', 'success', 'UPDATE_MESSAGE', message);
+              } : {});
+              emitUpdateMessage(patch);
+              id = patch.id, updatedFields = _rollupPluginBabelHelpers._objectWithoutProperties(patch, _excluded);
+              progress("updated ".concat(id, " message fields ").concat(JSON.stringify(Object.keys(updatedFields))), 'info', 'UPDATE_MESSAGE', message);
             }
             // If this is the first user message, then update conversations intent
             previousUserMessages = messages.filter(function (m) {
@@ -5445,11 +5466,7 @@ var Spirits = {
               conversation = updateConversation(conversation, {
                 intent: parsePayload.intent,
                 intentScore: (parsePayload === null || parsePayload === void 0 ? void 0 : parsePayload.intentScore) || 0
-              });
-              progress('Updated conversation intent', 'info', 'UPDATE_CONVERSATION', {
-                intent: parsePayload.intent,
-                intentScore: (parsePayload === null || parsePayload === void 0 ? void 0 : parsePayload.intentScore) || 0
-              });
+              }, 'intent mapping');
             }
             oldKeyCount = Object.keys(context).length;
             context = updateContext(context, parsePayload.context);
@@ -5460,12 +5477,7 @@ var Spirits = {
                 locked: false,
                 lockAttempts: 0,
                 lockedReason: ''
-              });
-              progress('Reset lock', 'info', 'UPDATE_CONVERSATION', {
-                locked: false,
-                lockAttempts: 0,
-                lockedReason: ''
-              });
+              }, 'reset lock attempts');
             }
             noNewContext = Object.keys(parsePayload.context).length === 0; // upsert parse system messages
             if (parsePayload.contextMessages.length) {
@@ -5506,15 +5518,15 @@ var Spirits = {
 
             // 3. Run the contextualizer
             // progress('Running contextualizer', 'info', 'SET_PROCESSING', 'system');
-            _context5.next = 63;
+            _context5.next = 67;
             return wrapStep(contextualizer({
               conversation: conversation,
               messages: messages
             }), 'contextualize', 'contextualizing');
-          case 63:
+          case 67:
             newContextMessages = _context5.sent;
             _iterator6 = _rollupPluginBabelHelpers._createForOfIteratorHelper(newContextMessages);
-            _context5.prev = 65;
+            _context5.prev = 69;
             _loop2 = /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _loop2() {
               var contextMessage;
               return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _loop2$(_context3) {
@@ -5530,7 +5542,7 @@ var Spirits = {
                       return messageKey(mes) === messageKey(contextMessage);
                     })) {
                       emitAddMessage(pushMessage(messages, contextMessage));
-                      progress("Added context", 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
+                      progress("Added context ".concat(message.role, " message"), 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
                     } else {
                       progress("Already have system context, skipping", 'info');
                     }
@@ -5541,28 +5553,28 @@ var Spirits = {
               }, _loop2);
             });
             _iterator6.s();
-          case 68:
+          case 72:
             if ((_step6 = _iterator6.n()).done) {
-              _context5.next = 72;
+              _context5.next = 76;
               break;
             }
-            return _context5.delegateYield(_loop2(), "t0", 70);
-          case 70:
-            _context5.next = 68;
+            return _context5.delegateYield(_loop2(), "t0", 74);
+          case 74:
+            _context5.next = 72;
             break;
-          case 72:
-            _context5.next = 77;
+          case 76:
+            _context5.next = 81;
             break;
-          case 74:
-            _context5.prev = 74;
-            _context5.t1 = _context5["catch"](65);
+          case 78:
+            _context5.prev = 78;
+            _context5.t1 = _context5["catch"](69);
             _iterator6.e(_context5.t1);
-          case 77:
-            _context5.prev = 77;
+          case 81:
+            _context5.prev = 81;
             _iterator6.f();
-            return _context5.finish(77);
-          case 80:
-            _context5.next = 82;
+            return _context5.finish(81);
+          case 84:
+            _context5.next = 86;
             return wrapStep(workflow({
               messages: messages,
               conversation: conversation,
@@ -5591,7 +5603,7 @@ var Spirits = {
                 return accumulator;
               }, []);
             });
-          case 82:
+          case 86:
             slots = _context5.sent;
             hasNoInstructions = slots.every(function (s) {
               return !s.instructions || Array.isArray(s.instructions) && s.instructions.length === 0;
@@ -5651,43 +5663,38 @@ var Spirits = {
             enforceMonotonicWithEmits(messagesToTransform, 1);
             previousLockAttempt = conversation.lockAttempts || 0; // Used to track
             if (hasNoInstructions && noNewContext) {
-              conversation = incrementLockAttempt(conversation, config);
+              conversation = incrementLockAttempt(conversation, config).updated;
             } else {
               conversation = updateConversation(conversation, {
                 lockAttempts: 0,
                 locked: false,
                 lockedReason: ''
-              });
-              progress('Reset lock', 'info', 'UPDATE_CONVERSATION', {
-                lockAttempts: 0,
-                locked: false,
-                lockedReason: ''
-              });
+              }, 'reset lock');
             }
             resettedIntent = false;
             /** @type {Array<string> | undefined} */
             _iterator7 = _rollupPluginBabelHelpers._createForOfIteratorHelper(slots);
-            _context5.prev = 91;
+            _context5.prev = 95;
             _iterator7.s();
-          case 93:
+          case 97:
             if ((_step7 = _iterator7.n()).done) {
-              _context5.next = 148;
+              _context5.next = 152;
               break;
             }
             _step7$value = _step7.value, forward = _step7$value.forward, forwardNote = _step7$value.forwardNote, instructions = _step7$value.instructions, removeInstructions = _step7$value.removeInstructions, _step7$value.message, _step7$value.scheduled, resetIntent = _step7$value.resetIntent, _step7$value.secondsDelay, contextUpsert = _step7$value.contextUpsert, anticipate = _step7$value.anticipate, slotFollowup = _step7$value.followup, slotEntityContextUpsert = _step7$value.entityContextUpsert, tasks = _step7$value.tasks;
             if (!anticipate) {
-              _context5.next = 108;
+              _context5.next = 112;
               break;
             }
             if (!Array.isArray(anticipate)) {
-              _context5.next = 103;
+              _context5.next = 107;
               break;
             }
             // 'literal' anticipation
             _slots = {};
             map = [];
             for (i = 0; i < anticipate.length; i++) {
-              _anticipate$i = anticipate[i], keywords = _anticipate$i.keywords, _slot = _rollupPluginBabelHelpers._objectWithoutProperties(_anticipate$i, _excluded);
+              _anticipate$i = anticipate[i], keywords = _anticipate$i.keywords, _slot = _rollupPluginBabelHelpers._objectWithoutProperties(_anticipate$i, _excluded2);
               slotId = "".concat(i);
               _slots[slotId] = _slot;
               map.push({
@@ -5699,12 +5706,12 @@ var Spirits = {
               type: 'literal',
               slots: _slots,
               map: map
-            });
-            _context5.next = 108;
+            }, 'anticipation slots');
+            _context5.next = 112;
             break;
-          case 103:
+          case 107:
             if (!('yes' in anticipate && 'no' in anticipate && 'did' in anticipate)) {
-              _context5.next = 107;
+              _context5.next = 111;
               break;
             }
             // "did" anticipation
@@ -5715,12 +5722,12 @@ var Spirits = {
                 no: anticipate.no
               },
               did: anticipate.did
-            });
-            _context5.next = 108;
+            }, 'anticipation slots');
+            _context5.next = 112;
             break;
-          case 107:
+          case 111:
             throw new Error("Invalid anticipate payload \"".concat(JSON.stringify(anticipate), "\""));
-          case 108:
+          case 112:
             // tasks from auto/manual ingress to execute
             if (!!tasks && Array.isArray(tasks) && !!tasks.length) {
               if (!_tasks) _tasks = [];
@@ -5741,7 +5748,7 @@ var Spirits = {
               if (typeof forward === 'string') {
                 conversation = updateConversation(conversation, {
                   forwarded: forward
-                });
+                }, 'forward');
                 emitAddMessage(pushMessage(messages, {
                   id: idGenerator("sys"),
                   role: "system",
@@ -5752,7 +5759,7 @@ var Spirits = {
               } else if (typeof forward === 'boolean') {
                 conversation = updateConversation(conversation, {
                   forwarded: conversation.$agent
-                });
+                }, 'forward');
                 emitAddMessage(pushMessage(messages, {
                   id: idGenerator("sys"),
                   role: "system",
@@ -5763,7 +5770,7 @@ var Spirits = {
               } else {
                 conversation = updateConversation(conversation, {
                   forwarded: forward.to
-                });
+                }, 'forward');
                 emitAddMessage(pushMessage(messages, {
                   id: idGenerator("sys"),
                   role: "system",
@@ -5776,19 +5783,19 @@ var Spirits = {
 
             // Insert instructions context
             if (!instructions) {
-              _context5.next = 127;
+              _context5.next = 131;
               break;
             }
             if (!(typeof instructions === 'string')) {
-              _context5.next = 117;
+              _context5.next = 121;
               break;
             }
             addInstruction(instructions, previousLockAttempt);
-            _context5.next = 127;
+            _context5.next = 131;
             break;
-          case 117:
+          case 121:
             if (!Array.isArray(instructions)) {
-              _context5.next = 122;
+              _context5.next = 126;
               break;
             }
             _iterator10 = _rollupPluginBabelHelpers._createForOfIteratorHelper(instructions);
@@ -5806,25 +5813,25 @@ var Spirits = {
             } finally {
               _iterator10.f();
             }
-            _context5.next = 127;
+            _context5.next = 131;
             break;
-          case 122:
+          case 126:
             if (!(_rollupPluginBabelHelpers._typeof(instructions) === 'object' && 'content' in instructions)) {
-              _context5.next = 126;
+              _context5.next = 130;
               break;
             }
             addInstruction(instructions.content, previousLockAttempt, instructions.id);
-            _context5.next = 127;
+            _context5.next = 131;
             break;
-          case 126:
+          case 130:
             throw new Error("SpiritsError: instructions must be a string or array or {content: \"<instruction>\"}, got: ".concat(JSON.stringify(instructions)));
-          case 127:
+          case 131:
             if (!removeInstructions) {
-              _context5.next = 144;
+              _context5.next = 148;
               break;
             }
             _iterator11 = _rollupPluginBabelHelpers._createForOfIteratorHelper(removeInstructions);
-            _context5.prev = 129;
+            _context5.prev = 133;
             _loop3 = /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _loop3() {
               var instructionId, index, removed;
               return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _loop3$(_context4) {
@@ -5850,27 +5857,27 @@ var Spirits = {
               }, _loop3);
             });
             _iterator11.s();
-          case 132:
+          case 136:
             if ((_step11 = _iterator11.n()).done) {
-              _context5.next = 136;
+              _context5.next = 140;
               break;
             }
-            return _context5.delegateYield(_loop3(), "t2", 134);
-          case 134:
-            _context5.next = 132;
+            return _context5.delegateYield(_loop3(), "t2", 138);
+          case 138:
+            _context5.next = 136;
             break;
-          case 136:
-            _context5.next = 141;
+          case 140:
+            _context5.next = 145;
             break;
-          case 138:
-            _context5.prev = 138;
-            _context5.t3 = _context5["catch"](129);
+          case 142:
+            _context5.prev = 142;
+            _context5.t3 = _context5["catch"](133);
             _iterator11.e(_context5.t3);
-          case 141:
-            _context5.prev = 141;
+          case 145:
+            _context5.prev = 145;
             _iterator11.f();
-            return _context5.finish(141);
-          case 144:
+            return _context5.finish(145);
+          case 148:
             // @TODO this logic is now handled at messagesToTransform's initialization, maybe move back down here
             // if (manualMessage) {
 
@@ -5908,26 +5915,25 @@ var Spirits = {
 
             if (contextUpsert) {
               context = updateContext(context, contextUpsert);
-              progress('Upserted context', 'info', 'UPDATE_CONTEXT', contextUpsert);
             }
             if (resetIntent) {
               resettedIntent = true;
             }
-          case 146:
-            _context5.next = 93;
+          case 150:
+            _context5.next = 97;
             break;
-          case 148:
-            _context5.next = 153;
+          case 152:
+            _context5.next = 157;
             break;
-          case 150:
-            _context5.prev = 150;
-            _context5.t4 = _context5["catch"](91);
+          case 154:
+            _context5.prev = 154;
+            _context5.t4 = _context5["catch"](95);
             _iterator7.e(_context5.t4);
-          case 153:
-            _context5.prev = 153;
+          case 157:
+            _context5.prev = 157;
             _iterator7.f();
-            return _context5.finish(153);
-          case 156:
+            return _context5.finish(157);
+          case 160:
             enforceMonotonicWithEmits(messages, 1);
             if (resettedIntent && !_forward) {
               conversation = updateConversation(conversation, {
@@ -5936,27 +5942,20 @@ var Spirits = {
                 locked: false,
                 lockedReason: '',
                 lockAttempts: 0
-              });
-              progress('Reset conversation intent', 'info', 'UPDATE_CONVERSATION', {
-                intent: null,
-                intentScore: null,
-                locked: false,
-                lockAttempts: 0,
-                lockedReason: ''
-              });
+              }, 'reset conversation intent');
             }
 
             // 5. Generate response
             // If conversation previously locked, don't generate
             if (input.conversation.locked) {
-              _context5.next = 211;
+              _context5.next = 217;
               break;
             }
             if (!((!conversation.locked || !hasNoInstructions) && !!hasNoCustomMessage)) {
-              _context5.next = 176;
+              _context5.next = 180;
               break;
             }
-            _context5.prev = 160;
+            _context5.prev = 164;
             // progress('Generating message', 'info', 'SET_PROCESSING', 'system');
             /** @type {import('@scout9/admin').GenerateRequestOneOf1} */
             generatorInput = {
@@ -5969,9 +5968,9 @@ var Spirits = {
             if (!!_tasks && Array.isArray(_tasks) && !!_tasks.length) {
               generatorInput.tasks = _tasks;
             }
-            _context5.next = 165;
+            _context5.next = 169;
             return wrapStep(generator(generatorInput), 'generate');
-          case 165:
+          case 169:
             generatorPayload = _context5.sent;
             if (!generatorPayload.send) {
               progress('Generated response send rejected', 'error', undefined, {
@@ -6076,26 +6075,26 @@ var Spirits = {
                 }
               }
             }
-            _context5.next = 174;
+            _context5.next = 178;
             break;
-          case 169:
-            _context5.prev = 169;
-            _context5.t5 = _context5["catch"](160);
+          case 173:
+            _context5.prev = 173;
+            _context5.t5 = _context5["catch"](164);
             onError(_context5.t5);
             console.error("Spirits: Locking conversation, error generating response: ".concat(_context5.t5.message));
             conversation = lockConversation(conversation, 'API: ' + _context5.t5.message);
-          case 174:
-            _context5.next = 177;
+          case 178:
+            _context5.next = 181;
             break;
-          case 176:
+          case 180:
             onStatus('generate', 'ignored');
-          case 177:
+          case 181:
             if (!(messagesToTransform.length && transformer)) {
-              _context5.next = 208;
+              _context5.next = 214;
               break;
             }
-            _context5.prev = 178;
-            _context5.next = 181;
+            _context5.prev = 182;
+            _context5.next = 185;
             return wrapStep(transformer({
               // message: messagesToTransform,
               addedMessages: messagesToTransform,
@@ -6104,15 +6103,16 @@ var Spirits = {
               messages: messages,
               context: context
             }), 'transform');
-          case 181:
+          case 185:
             transformResponse = _context5.sent;
             // @TODO check for duplicates, or have already sent the message
             transformedMessages = (_transformResponse$me = transformResponse.messages) !== null && _transformResponse$me !== void 0 && _transformResponse$me.length ? transformResponse.messages : [{
               role: 'agent',
               content: transformResponse.message
             }];
+            appendedList = [];
             _iterator9 = _rollupPluginBabelHelpers._createForOfIteratorHelper(transformedMessages);
-            _context5.prev = 184;
+            _context5.prev = 189;
             _loop = /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _loop() {
               var message, adjusted, prior, _adjusted$contentGene2, _adjusted$contentTran, appended;
               return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _loop$(_context2) {
@@ -6142,7 +6142,7 @@ var Spirits = {
                       adjusted.contentTransformed = adjusted.content;
                     }
                     appended = pushMessage(messages, adjusted);
-                    progress("Added agent message", "info", "ADD_MESSAGE", appended);
+                    appendedList.push(appended);
                     emitAddMessage(appended);
                   case 7:
                   case "end":
@@ -6151,52 +6151,53 @@ var Spirits = {
               }, _loop);
             });
             _iterator9.s();
-          case 187:
+          case 192:
             if ((_step9 = _iterator9.n()).done) {
-              _context5.next = 191;
+              _context5.next = 196;
               break;
             }
-            return _context5.delegateYield(_loop(), "t6", 189);
-          case 189:
-            _context5.next = 187;
+            return _context5.delegateYield(_loop(), "t6", 194);
+          case 194:
+            _context5.next = 192;
             break;
-          case 191:
-            _context5.next = 196;
-            break;
-          case 193:
-            _context5.prev = 193;
-            _context5.t7 = _context5["catch"](184);
-            _iterator9.e(_context5.t7);
           case 196:
-            _context5.prev = 196;
-            _iterator9.f();
-            return _context5.finish(196);
-          case 199:
-            _context5.next = 206;
+            _context5.next = 201;
             break;
+          case 198:
+            _context5.prev = 198;
+            _context5.t7 = _context5["catch"](189);
+            _iterator9.e(_context5.t7);
           case 201:
             _context5.prev = 201;
-            _context5.t8 = _context5["catch"](178);
+            _iterator9.f();
+            return _context5.finish(201);
+          case 204:
+            progress("Added ".concat(appendedList.length, " persona message").concat(appendedList.length === 1 ? '' : 's'), "info", "ADD_MESSAGES", appendedList);
+            _context5.next = 212;
+            break;
+          case 207:
+            _context5.prev = 207;
+            _context5.t8 = _context5["catch"](182);
             console.error("Spirits: Locking conversation, error transforming response: ".concat(_context5.t8.message));
             conversation = lockConversation(conversation, 'API: ' + _context5.t8.message);
             onError(_context5.t8);
-          case 206:
-            _context5.next = 209;
+          case 212:
+            _context5.next = 215;
             break;
-          case 208:
+          case 214:
             if (messagesToTransform.length) {
               console.warn("Spirits: No transformer provided");
               onStatus('transform', 'ignored');
             } else {
               onStatus('transform', 'ignored');
             }
-          case 209:
-            _context5.next = 213;
+          case 215:
+            _context5.next = 219;
             break;
-          case 211:
+          case 217:
             onStatus('generate', 'ignored');
             onStatus('transform', 'ignored');
-          case 213:
+          case 219:
             emptySystemMessages = messages.filter(isEmptySystemMessage);
             if (emptySystemMessages.length) {
               progress('Empty system messages detected post-run', 'error', 'EMPTY_SYSTEM_MESSAGE_FINAL', {
@@ -6208,6 +6209,7 @@ var Spirits = {
               console.error('Spirits: Empty system messages detected', emptySystemMessages);
             }
             logToolPairingIssues(messages, 'final');
+            progress("Spirits.customer executed in ".concat(elapsedSeconds(rootStart), "s total"), 'success', undefined, undefined);
             return _context5.abrupt("return", {
               conversation: {
                 before: conversationBefore,
@@ -6230,11 +6232,11 @@ var Spirits = {
               followup: followup,
               entityContextUpsert: entityContextUpsert
             });
-          case 217:
+          case 224:
           case "end":
             return _context5.stop();
         }
-      }, _callee2, null, [[65, 74, 77, 80], [91, 150, 153, 156], [129, 138, 141, 144], [160, 169], [178, 201], [184, 193, 196, 199]]);
+      }, _callee2, null, [[69, 78, 81, 84], [95, 154, 157, 160], [133, 142, 145, 148], [164, 173], [182, 207], [189, 198, 201, 204]]);
     }));
     function customer(_x) {
       return _customer.apply(this, arguments);

package/dist/spirits.cjs

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 require("./_rollupPluginBabelHelpers-9c73c95c.cjs");
-var spirits = require("./spirits-ab87b546.cjs");
+var spirits = require("./spirits-c773fc77.cjs");
 
 
 

package/dist/testing-tools.cjs

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dev = require("./dev-8c238c7b.cjs");
+var dev = require("./dev-74c0ba94.cjs");
 require("./_rollupPluginBabelHelpers-9c73c95c.cjs");
-require("./spirits-ab87b546.cjs");
+require("./spirits-c773fc77.cjs");
 require('util');
 require('stream');
 require('path');

package/package.json

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

package/src/testing-tools/spirits.js

@@ -232,6 +232,9 @@ export const Spirits = {
       onDeleteMessage = (_id) => { },
     } = input;
     let { conversation, messages, context, message } = input;
+    const elapsedSeconds = (start) => ((performance.now() - start) / 1000).toFixed(2);
+    const rootStart = performance.now();
+    progress(`Spirits.customer start`, 'info', undefined, undefined);
 
     if (typeof message.content !== 'string') {
       const err = new Error(
@@ -326,8 +329,9 @@ export const Spirits = {
       m?.role === 'system' &&
       (typeof m.content !== 'string' || m.content.trim() === '');
 
-    const updateConversation = (previousConversation, conversationUpdates) => {
-      progress('Update conversation', 'info', 'UPDATE_CONVERSATION', conversationUpdates);
+    const updateConversation = (previousConversation, conversationUpdates, note) => {
+      const _note = [`Updated conversation fields`, note].filter(Boolean).join(', ')
+      progress(`${_note}: ${JSON.stringify(Object.keys(conversationUpdates))}`, 'info', 'UPDATE_CONVERSATION', conversationUpdates);
       emitUpdateConversation(conversationUpdates);
       return {
         ...previousConversation,
@@ -335,8 +339,9 @@ export const Spirits = {
       };
     };
 
-    const updateContext = (previousContext, newContext) => {
-      progress('Update context', 'info', 'UPDATE_CONTEXT', newContext);
+    const updateContext = (previousContext, newContext, note) => {
+      const _note = [`Updated context fields`, note].filter(Boolean).join(', ')
+      progress(`${_note}: ${JSON.stringify(Object.keys(newContext))}`, 'info', 'UPDATE_CONTEXT', newContext);
       emitUpdateContext(newContext);
       return {
         ...previousContext,
@@ -356,7 +361,8 @@ export const Spirits = {
     const lockConversation = (_conversation, reason) => {
       return updateConversation(
         _conversation,
-        { locked: true, lockedReason: _conversation.lockedReason || reason || 'Unknown' }
+        { locked: true, lockedReason: _conversation.lockedReason || reason || 'Unknown' },
+        'lock conversation'
       );
     };
 
@@ -372,8 +378,8 @@ export const Spirits = {
         patch.locked = true;
         patch.lockedReason = `Max lock attempts exceeded (${next} > ${max})`;
       }
-      const updated = updateConversation(_conversation, patch);
-      return updated;
+      const updated = updateConversation(_conversation, patch, 'increment lock');
+      return {updated, patch}
     };
 
     const _addInstruction = (
@@ -387,7 +393,7 @@ export const Spirits = {
       const systemMessages = _messages.filter(m => m.role === 'system');
       const lastSystemMessage = systemMessages[systemMessages.length - 1];
       let addedMessage = false;
-      let changedConversation = false;
+      let changedConversation = [];
 
       // If instruction does not equal previous system message, add it, otherwise lock attempt
       if (!lastSystemMessage || instruction !== lastSystemMessage.content) {
@@ -410,8 +416,9 @@ export const Spirits = {
         // Handle repeated instruction
         // Increment lock attempt if instructions are repeated and we haven't already incremented lock attempt (for example if a forward is provided)
         if (previousLockAttempt === (_conversation.lockAttempts || 0)) {
-          _conversation = incrementLockAttempt(_conversation, _config);
-          changedConversation = true;
+          const {updated, patch} = incrementLockAttempt(_conversation, _config);
+          _conversation = updated;
+          changedConversation = Object.keys(patch);
         }
       }
       return {
@@ -422,6 +429,7 @@ export const Spirits = {
       };
     };
 
+    let instructionsAdded = 0;
     const addInstruction = (instruction, previousLockAttempt, id = idGenerator('sys')) => {
       const {
         conversation: newConversation,
@@ -432,10 +440,11 @@ export const Spirits = {
       conversation = newConversation;
       messages = newMessages;
       if (addedMessage) {
-        progress('Added instruction', 'info', 'ADD_MESSAGE', newMessages[newMessages.length - 1]);
+        instructionsAdded++;
+        progress(`Added ${instructionsAdded} instruction${instructionsAdded === 1 ? '' : 's'}`, 'info', 'ADD_MESSAGE', newMessages[newMessages.length - 1]);
       }
-      if (changedConversation) {
-        progress('Updated conversation', 'info', 'UPDATE_CONVERSATION', newConversation);
+      if (changedConversation.length) {
+        progress(`Updated conversation fields: ${JSON.stringify(changedConversation)}`, 'info', 'UPDATE_CONVERSATION', newConversation);
       }
     };
 
@@ -454,18 +463,17 @@ export const Spirits = {
      * @param {string} stepAction - overrides step name in logs
      */
     const wrapStep = async (prom, step, stepAction = step) => {
-      const start = performance.now();
-      const elapsedSeconds = () => ((performance.now() - start) / 1000).toFixed(2);
+      const stepStart = performance.now();
 
       try {
         progress(`${stepAction} start`, 'info', undefined, undefined);
         const result = await prom;
-        progress(`${stepAction} succeeded in ${elapsedSeconds()}s`, 'success', undefined, undefined);
+        progress(`${stepAction} succeeded in ${elapsedSeconds(stepStart)}s`, 'success', undefined, undefined);
         return result;
       } catch (error) {
         const msg = error?.message || 'UNHANDLED ERROR';
         progress(
-          `${stepAction} failed in ${elapsedSeconds()}s`,
+          `${stepAction} failed in ${elapsedSeconds(stepStart)}s`,
           'error',
           undefined,
           { error: msg }
@@ -537,7 +545,7 @@ export const Spirits = {
       message = _message;
       message = pushMessage(messages, _message);
       emitAddMessage(message);
-      progress('Added message', 'info', 'ADD_MESSAGE', _message);
+      progress(`Added "${_message.role}" message`, 'info', 'ADD_MESSAGE', _message);
     } else {
       messages[index].context = parsePayload.context;
       messages[index].entities = parsePayload.entities;
@@ -548,14 +556,16 @@ export const Spirits = {
         messages[index].intentScore = parsePayload.intentScore;
       }
       message = messages[index];
-      emitUpdateMessage({
+      const patch = {
         id: messages[index].id,
         context: parsePayload.context,
         entities: parsePayload.entities,
         ...(parsePayload.intent ? { intent: parsePayload.intent } : {}),
         ...(typeof parsePayload.intentScore === 'number' ? { intentScore: parsePayload.intentScore } : {}),
-      });
-      progress('Parsed message', 'success', 'UPDATE_MESSAGE', message);
+      };
+      emitUpdateMessage(patch);
+      const {id, ...updatedFields} = patch;
+      progress(`updated ${id} message fields ${JSON.stringify(Object.keys(updatedFields))}`, 'info', 'UPDATE_MESSAGE', message);
     }
     // If this is the first user message, then update conversations intent
     const previousUserMessages = messages.filter(m => m.role === 'customer' && m.content !== message.content);
@@ -563,13 +573,7 @@ export const Spirits = {
       conversation = updateConversation(conversation, {
         intent: parsePayload.intent,
         intentScore: parsePayload?.intentScore || 0,
-      });
-      progress(
-        'Updated conversation intent',
-        'info',
-        'UPDATE_CONVERSATION',
-        { intent: parsePayload.intent, intentScore: parsePayload?.intentScore || 0 }
-      );
+      }, 'intent mapping');
     }
     const oldKeyCount = Object.keys(context).length;
     context = updateContext(context, parsePayload.context);
@@ -581,8 +585,7 @@ export const Spirits = {
         locked: false,
         lockAttempts: 0,
         lockedReason: '',
-      });
-      progress('Reset lock', 'info', 'UPDATE_CONVERSATION', { locked: false, lockAttempts: 0, lockedReason: '' });
+      }, 'reset lock attempts');
     }
 
     const noNewContext = Object.keys(parsePayload.context).length === 0;
@@ -624,7 +627,7 @@ export const Spirits = {
         });
       } else if (!messages.find(mes => messageKey(mes) === messageKey(contextMessage))) {
         emitAddMessage(pushMessage(messages, contextMessage));
-        progress(`Added context`, 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
+        progress(`Added context ${message.role} message`, 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
       } else {
         progress(`Already have system context, skipping`, 'info');
       }
@@ -716,14 +719,13 @@ export const Spirits = {
     const previousLockAttempt = conversation.lockAttempts || 0; // Used to track
 
     if (hasNoInstructions && noNewContext) {
-      conversation = incrementLockAttempt(conversation, config);
+      conversation = incrementLockAttempt(conversation, config).updated;
     } else {
       conversation = updateConversation(conversation, {
         lockAttempts: 0,
         locked: false,
         lockedReason: '',
-      });
-      progress('Reset lock', 'info', 'UPDATE_CONVERSATION', { lockAttempts: 0, locked: false, lockedReason: '' });
+      }, 'reset lock');
     }
 
     let resettedIntent = false;
@@ -768,7 +770,7 @@ export const Spirits = {
             type: 'literal',
             slots,
             map
-          });
+          }, 'anticipation slots');
         } else if ('yes' in anticipate && 'no' in anticipate && 'did' in anticipate) {
           // "did" anticipation
           conversation = updateConversation(conversation, {
@@ -778,7 +780,7 @@ export const Spirits = {
               no: anticipate.no
             },
             did: anticipate.did
-          });
+          }, 'anticipation slots');
         } else {
           throw new Error(`Invalid anticipate payload "${JSON.stringify(anticipate)}"`);
         }
@@ -804,7 +806,7 @@ export const Spirits = {
         _forward = forward;
         _forwardNote = forwardNote;
         if (typeof forward === 'string') {
-          conversation = updateConversation(conversation, { forwarded: forward });
+          conversation = updateConversation(conversation, { forwarded: forward }, 'forward');
           emitAddMessage(pushMessage(messages, {
             id: idGenerator("sys"),
             role: "system",
@@ -813,7 +815,7 @@ export const Spirits = {
           }));
           progress(`Forwarded to "${forward}"`, 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
         } else if (typeof forward === 'boolean') {
-          conversation = updateConversation(conversation, { forwarded: conversation.$agent });
+          conversation = updateConversation(conversation, { forwarded: conversation.$agent }, 'forward');
           emitAddMessage(pushMessage(messages, {
             id: idGenerator("sys"),
             role: "system",
@@ -823,7 +825,7 @@ export const Spirits = {
           progress(`Forwarded to agent`, 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
 
         } else {
-          conversation = updateConversation(conversation, { forwarded: forward.to });
+          conversation = updateConversation(conversation, { forwarded: forward.to }, 'forward');
           emitAddMessage(pushMessage(messages, {
             id: idGenerator("sys"),
             role: "system",
@@ -912,7 +914,6 @@ export const Spirits = {
 
       if (contextUpsert) {
         context = updateContext(context, contextUpsert);
-        progress('Upserted context', 'info', 'UPDATE_CONTEXT', contextUpsert);
       }
 
       if (resetIntent) {
@@ -930,13 +931,7 @@ export const Spirits = {
         locked: false,
         lockedReason: '',
         lockAttempts: 0,
-      });
-      progress(
-        'Reset conversation intent',
-        'info',
-        'UPDATE_CONVERSATION',
-        { intent: null, intentScore: null, locked: false, lockAttempts: 0, lockedReason: '' }
-      );
+      }, 'reset conversation intent');
     }
 
     // 5. Generate response
@@ -1101,6 +1096,7 @@ export const Spirits = {
               ? transformResponse.messages
               : [{ role: 'agent', content: transformResponse.message }];
 
+              const appendedList = [];
           for (const message of transformedMessages) {
             const adjusted = {
               id: idGenerator('agent'),
@@ -1127,10 +1123,12 @@ export const Spirits = {
             }
 
             const appended = pushMessage(messages, adjusted);
-            progress("Added agent message", "info", "ADD_MESSAGE", appended);
+            appendedList.push(appended);
             emitAddMessage(appended);
           }
 
+          progress(`Added ${appendedList.length} persona message${appendedList.length === 1 ? '' : 's'}`, "info", "ADD_MESSAGES", appendedList);
+
         } catch (e) {
           console.error(`Spirits: Locking conversation, error transforming response: ${e.message}`);
           conversation = lockConversation(conversation, 'API: ' + e.message);
@@ -1158,6 +1156,8 @@ export const Spirits = {
 
     logToolPairingIssues(messages, 'final');
 
+    progress(`Spirits.customer executed in ${elapsedSeconds(rootStart)}s total`, 'success', undefined, undefined);
+
     return {
       conversation: {
         before: conversationBefore,