@scout9/app 1.0.0-alpha.0.8.9 → 1.0.0-alpha.0.9.1

package/dist/spirits.cjs

@@ -2,14 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _rollupPluginBabelHelpers = require("./_rollupPluginBabelHelpers-606d8129.cjs");
+var _rollupPluginBabelHelpers = require("./_rollupPluginBabelHelpers-9c73c95c.cjs");
 
 var _excluded = ["keywords"];
 /**
  * @typedef {Object} Document
  * @property {string} id
  */
-
 /**
  * Represents a change with before and after states of a given type.
  * @template Type The type of the before and after properties.
@@ -17,7 +16,6 @@ var _excluded = ["keywords"];
  * @property {Type} before - The state before the change.
  * @property {Type} after - The state after the change.
  */
-
 /**
  * @typedef {Object} ConversationData
  * @property {import('@scout9/app').Scout9ProjectBuildConfig} config - used to define generation and extract persona metadata
@@ -28,7 +26,6 @@ var _excluded = ["keywords"];
  * @property {import('@scout9/app').ConversationProgress} progress - progress checklist for manual/auto ingress workflows
  * @property {any} context - event context
  */
-
 /**
  * @typedef {Object} ParseOutput
  * @property {Array<import('@scout9/admin').Message>} messages
@@ -36,7 +33,6 @@ var _excluded = ["keywords"];
  * @property {import('@scout9/admin').Message} message
  * @property {any} context
  */
-
 /**
  * @typedef {Object} WorkflowOutput
  * @property {Array<import('@scout9/app').WorkflowResponseSlot>} slots
@@ -44,7 +40,6 @@ var _excluded = ["keywords"];
  * @property {import('@scout9/app').Conversation} conversation
  * @property {any} context
  */
-
 /**
  * @typedef {Object} GenerateOutput
  * @property {import('@scout9/admin').GenerateResponse | undefined} generate
@@ -52,44 +47,37 @@ var _excluded = ["keywords"];
  * @property {import('@scout9/app').Conversation} conversation
  * @property {any} context
  */
-
 /**
  * @callback ParseFun
  * @param {string} message - message to send
  * @param {string | undefined} language - language to parse in, defaults to "en" for english
  * @returns {Promise<import('@scout9/admin').ParseResponse>}
  */
-
 /**
  * @callback ContextualizerFun
  * @param {Pick<import('@scout9/app').WorkflowEvent, 'messages' | 'conversation'>} args - message to send
  * @returns {Promise<import('@scout9/app').WorkflowEvent['messages']>}
  */
-
 /**
  * @callback WorkflowFun
  * @param {import('@scout9/app').WorkflowEvent} event - conversation data
  * @returns {Promise<import('@scout9/app').WorkflowResponse>}
  */
-
 /**
  * @callback GenerateFun
  * @param {import('@scout9/admin').GenerateRequestOneOf1} data - data to generate from
  * @returns {Promise<import('@scout9/admin').GenerateResponse>}
  */
-
 /**
  * @callback TransformerFun
  * @param {import('@scout9/admin').PmtTransformRequest} data - data to generate from
  * @returns {Promise<import('@scout9/admin').PmtTransformResponse>}
  */
-
 /**
  * @callback IdGeneratorFun
  * @param {import('@scout9/admin').Message['role']} prefix
  * @returns {string}
  */
-
 /**
  * @callback StatusCallback
  * @param {string} message
@@ -98,7 +86,6 @@ var _excluded = ["keywords"];
  * @param {any | undefined} [payload]
  * @returns {void}
  */
-
 /**
  * @typedef {Object} CustomerSpiritCallbacks
  * @property {ParseFun} parser
@@ -109,7 +96,47 @@ var _excluded = ["keywords"];
  * @property {IdGeneratorFun} idGenerator
  * @property {StatusCallback | undefined} [progress]
  */
+var SpiritError = /*#__PURE__*/function (_Error) {
+  _rollupPluginBabelHelpers._inherits(SpiritError, _Error);
+  /**
+   * @param {string} message - Description of the error.
+   * @param {string} step - The step or phase in which the error occurred.
+   */
+  function SpiritError(message, step) {
+    var _this;
+    _rollupPluginBabelHelpers._classCallCheck(this, SpiritError);
+    _this = _rollupPluginBabelHelpers._callSuper(this, SpiritError, [message]);
+    _this.name = _this.constructor.name;
+    _this.step = step;
+
+    // Ensures the stack trace starts from where this error was created
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(_rollupPluginBabelHelpers._assertThisInitialized(_this), _this.constructor);
+    }
+    return _this;
+  }
 
+  /**
+   * 
+   * @param {unknown} err 
+   * @param {string} step 
+   * @returns {SpiritError}
+   */
+  _rollupPluginBabelHelpers._createClass(SpiritError, null, [{
+    key: "fromError",
+    value: function fromError(err, step) {
+      if (err instanceof SpiritError) return err;
+      if (err instanceof Error) {
+        var wrapped = new SpiritError(err.message, step);
+        wrapped.stack = err.stack;
+        return wrapped;
+      }
+      // fallback for non-Error values
+      return new SpiritError(String(err), step);
+    }
+  }]);
+  return SpiritError;
+}( /*#__PURE__*/_rollupPluginBabelHelpers._wrapNativeSuper(Error));
 /**
  * @typedef {Object} ConversationEvent
  * @property {(Change<import('@scout9/app').Conversation> & {
@@ -130,7 +157,7 @@ var Spirits = {
    * @returns {Promise<ConversationEvent>}
    */
   customer: function () {
-    var _customer = _rollupPluginBabelHelpers._asyncToGenerator( /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _callee(input) {
+    var _customer = _rollupPluginBabelHelpers._asyncToGenerator( /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _callee2(input) {
       var _recentUserMessage;
       var onError,
         customer,
@@ -161,6 +188,8 @@ var Spirits = {
         incrementLockAttempt,
         _addInstruction,
         addInstruction,
+        onStatus,
+        wrapStep,
         persona,
         invalidRoles,
         parsePayload,
@@ -208,11 +237,11 @@ var Spirits = {
         _slot,
         slotId,
         _tasks2,
+        _iterator4,
+        _step4,
+        instruction,
         _iterator5,
         _step5,
-        instruction,
-        _iterator6,
-        _step6,
         _loop2,
         manualMessageObj,
         now,
@@ -228,16 +257,14 @@ var Spirits = {
         _iterator3,
         _step3,
         newMessage,
-        _iterator4,
-        _step4,
         transformResponse,
         _agentMessages,
         _lastAgentMessage,
-        _args3 = arguments;
-      return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _callee$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+        _args4 = arguments;
+      return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _callee2$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            onError = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : function () {};
+            onError = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : function () {};
             customer = input.customer, config = input.config, 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, 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 = [];
@@ -328,42 +355,78 @@ var Spirits = {
               if (changedConversation) {
                 progress('Updated conversation', 'info', 'UPDATE_CONVERSATION', newConversation);
               }
-            }; // 1. Check inputs
+            };
+            onStatus = function onStatus(statusType) {
+              var completeOrError = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+              progress("".concat(statusType, ": ").concat(completeOrError), 'info', 'STATUS', _rollupPluginBabelHelpers._defineProperty({}, statusType, completeOrError));
+            };
+            /**
+             * @param {Promise<any>} prom 
+             * @param {string} step
+             */
+            wrapStep = /*#__PURE__*/function () {
+              var _ref = _rollupPluginBabelHelpers._asyncToGenerator( /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _callee(prom, step) {
+                var result;
+                return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) switch (_context.prev = _context.next) {
+                    case 0:
+                      _context.prev = 0;
+                      _context.next = 3;
+                      return prom;
+                    case 3:
+                      result = _context.sent;
+                      onStatus(step);
+                      return _context.abrupt("return", result);
+                    case 8:
+                      _context.prev = 8;
+                      _context.t0 = _context["catch"](0);
+                      onStatus(step, _context.t0.message || 'UNHANDLED ERROR');
+                      throw SpiritError.fromError(_context.t0, step);
+                    case 12:
+                    case "end":
+                      return _context.stop();
+                  }
+                }, _callee, null, [[0, 8]]);
+              }));
+              return function wrapStep(_x2, _x3) {
+                return _ref.apply(this, arguments);
+              };
+            }(); // 1. Check inputs
             if (conversation.$agent) {
-              _context3.next = 15;
+              _context4.next = 17;
               break;
             }
             throw new Error("SpiritsError: No agent found in conversation, must define \".$agent\" in the conversation");
-          case 15:
+          case 17:
             persona = (config.persona || config.personas || config.agents).find(function (p) {
               return p.id === conversation.$agent;
             });
             if (persona) {
-              _context3.next = 20;
+              _context4.next = 22;
               break;
             }
             if (!(config.persona || config.personas || config.agents).some(function (a) {
               return !a.id;
             })) {
-              _context3.next = 19;
+              _context4.next = 21;
               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 19:
+          case 21:
             throw new Error("SpiritsError: No persona found (\"".concat(conversation.$agent, "\") in provided config"));
-          case 20:
+          case 22:
             if (messages.every(function (m) {
               return !!m.id;
             })) {
-              _context3.next = 22;
+              _context4.next = 24;
               break;
             }
             throw new Error("SpiritsError: Every message must have an \".id\", ensure all messages have an id assigned before running");
-          case 22:
+          case 24:
             if (messages.every(function (m) {
               return m.role === 'customer' || m.role === 'agent' || m.role === 'system' || m.role === 'tool';
             })) {
-              _context3.next = 25;
+              _context4.next = 27;
               break;
             }
             invalidRoles = messages.filter(function (m) {
@@ -372,7 +435,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 25:
+          case 27:
             // if message is not in messages, then add it
             if (!messages.find(function (m) {
               return m.id === input.message.id;
@@ -382,10 +445,10 @@ var Spirits = {
 
             // 2. Parse the message
             progress('Parsing message', 'info', 'SET_PROCESSING', 'user');
-            _context3.next = 29;
-            return parser(message.content, 'en');
-          case 29:
-            parsePayload = _context3.sent;
+            _context4.next = 31;
+            return wrapStep(parser(message.content, 'en'), 'parse');
+          case 31:
+            parsePayload = _context4.sent;
             if (parsePayload.intent) {
               message.intent = parsePayload.intent;
             }
@@ -474,19 +537,19 @@ var Spirits = {
 
             // 3. Run the contextualizer
             progress('Running contextualizer', 'info', 'SET_PROCESSING', 'system');
-            _context3.next = 47;
-            return contextualizer({
+            _context4.next = 49;
+            return wrapStep(contextualizer({
               conversation: conversation,
               messages: messages
-            });
-          case 47:
-            newContextMessages = _context3.sent;
+            }), 'contextualize');
+          case 49:
+            newContextMessages = _context4.sent;
             _iterator = _rollupPluginBabelHelpers._createForOfIteratorHelper(newContextMessages);
-            _context3.prev = 49;
+            _context4.prev = 51;
             _loop = /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _loop() {
               var contextMessage;
-              return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _loop$(_context) {
-                while (1) switch (_context.prev = _context.next) {
+              return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _loop$(_context2) {
+                while (1) switch (_context2.prev = _context2.next) {
                   case 0:
                     contextMessage = _step.value;
                     if (!messages.find(function (mes) {
@@ -499,36 +562,36 @@ var Spirits = {
                     }
                   case 2:
                   case "end":
-                    return _context.stop();
+                    return _context2.stop();
                 }
               }, _loop);
             });
             _iterator.s();
-          case 52:
+          case 54:
             if ((_step = _iterator.n()).done) {
-              _context3.next = 56;
+              _context4.next = 58;
               break;
             }
-            return _context3.delegateYield(_loop(), "t0", 54);
-          case 54:
-            _context3.next = 52;
-            break;
+            return _context4.delegateYield(_loop(), "t0", 56);
           case 56:
-            _context3.next = 61;
+            _context4.next = 54;
             break;
           case 58:
-            _context3.prev = 58;
-            _context3.t1 = _context3["catch"](49);
-            _iterator.e(_context3.t1);
-          case 61:
-            _context3.prev = 61;
+            _context4.next = 63;
+            break;
+          case 60:
+            _context4.prev = 60;
+            _context4.t1 = _context4["catch"](51);
+            _iterator.e(_context4.t1);
+          case 63:
+            _context4.prev = 63;
             _iterator.f();
-            return _context3.finish(61);
-          case 64:
+            return _context4.finish(63);
+          case 66:
             // 4. Run the workflow
             progress('Running workflow', 'info', 'SET_PROCESSING', 'system');
-            _context3.next = 67;
-            return workflow({
+            _context4.next = 69;
+            return wrapStep(workflow({
               messages: messages,
               conversation: conversation,
               context: context,
@@ -543,7 +606,7 @@ var Spirits = {
                 initial: conversation.intent || null
               },
               stagnationCount: conversation.lockAttempts || 0
-            }).then(function (res) {
+            }), 'workflow').then(function (res) {
               return Array.isArray(res) ? res : [res];
             }).then(function (slots) {
               return slots.reduce(function (accumulator, slot) {
@@ -556,8 +619,8 @@ var Spirits = {
                 return accumulator;
               }, []);
             });
-          case 67:
-            slots = _context3.sent;
+          case 69:
+            slots = _context4.sent;
             hasNoInstructions = slots.every(function (s) {
               return !s.instructions || Array.isArray(s.instructions) && s.instructions.length === 0;
             });
@@ -583,20 +646,20 @@ var Spirits = {
             resettedIntent = false;
             /** @type {Array<string> | undefined} */
             _iterator2 = _rollupPluginBabelHelpers._createForOfIteratorHelper(slots);
-            _context3.prev = 75;
+            _context4.prev = 77;
             _iterator2.s();
-          case 77:
+          case 79:
             if ((_step2 = _iterator2.n()).done) {
-              _context3.next = 148;
+              _context4.next = 150;
               break;
             }
             _step2$value = _step2.value, forward = _step2$value.forward, forwardNote = _step2$value.forwardNote, instructions = _step2$value.instructions, removeInstructions = _step2$value.removeInstructions, manualMessage = _step2$value.message, scheduled = _step2$value.scheduled, resetIntent = _step2$value.resetIntent, secondsDelay = _step2$value.secondsDelay, contextUpsert = _step2$value.contextUpsert, anticipate = _step2$value.anticipate, slotFollowup = _step2$value.followup, slotEntityContextUpsert = _step2$value.entityContextUpsert, tasks = _step2$value.tasks;
             if (!anticipate) {
-              _context3.next = 92;
+              _context4.next = 94;
               break;
             }
             if (!Array.isArray(anticipate)) {
-              _context3.next = 87;
+              _context4.next = 89;
               break;
             }
             // 'literal' anticipation
@@ -616,11 +679,11 @@ var Spirits = {
               slots: _slots,
               map: map
             });
-            _context3.next = 92;
+            _context4.next = 94;
             break;
-          case 87:
+          case 89:
             if (!('yes' in anticipate && 'no' in anticipate && 'did' in anticipate)) {
-              _context3.next = 91;
+              _context4.next = 93;
               break;
             }
             // "did" anticipation
@@ -632,11 +695,11 @@ var Spirits = {
               },
               did: anticipate.did
             });
-            _context3.next = 92;
+            _context4.next = 94;
             break;
-          case 91:
+          case 93:
             throw new Error("Invalid anticipate payload \"".concat(JSON.stringify(anticipate), "\""));
-          case 92:
+          case 94:
             // tasks from auto/manual ingress to execute
             if (!!tasks && Array.isArray(tasks) && !!tasks.length) {
               if (!_tasks) _tasks = [];
@@ -692,25 +755,25 @@ var Spirits = {
 
             // Insert instructions context
             if (!instructions) {
-              _context3.next = 111;
+              _context4.next = 113;
               break;
             }
             if (!(typeof instructions === 'string')) {
-              _context3.next = 101;
+              _context4.next = 103;
               break;
             }
             addInstruction(instructions, previousLockAttempt);
-            _context3.next = 111;
+            _context4.next = 113;
             break;
-          case 101:
+          case 103:
             if (!Array.isArray(instructions)) {
-              _context3.next = 106;
+              _context4.next = 108;
               break;
             }
-            _iterator5 = _rollupPluginBabelHelpers._createForOfIteratorHelper(instructions);
+            _iterator4 = _rollupPluginBabelHelpers._createForOfIteratorHelper(instructions);
             try {
-              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-                instruction = _step5.value;
+              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                instruction = _step4.value;
                 if (typeof instruction === 'string') {
                   addInstruction(instruction, previousLockAttempt);
                 } else {
@@ -718,35 +781,35 @@ var Spirits = {
                 }
               }
             } catch (err) {
-              _iterator5.e(err);
+              _iterator4.e(err);
             } finally {
-              _iterator5.f();
+              _iterator4.f();
             }
-            _context3.next = 111;
+            _context4.next = 113;
             break;
-          case 106:
+          case 108:
             if (!(_rollupPluginBabelHelpers._typeof(instructions) === 'object' && 'content' in instructions)) {
-              _context3.next = 110;
+              _context4.next = 112;
               break;
             }
             addInstruction(instructions.content, previousLockAttempt, instructions.id);
-            _context3.next = 111;
+            _context4.next = 113;
             break;
-          case 110:
+          case 112:
             throw new Error("SpiritsError: instructions must be a string or array or {content: \"<instruction>\"}, got: ".concat(JSON.stringify(instructions)));
-          case 111:
+          case 113:
             if (!removeInstructions) {
-              _context3.next = 128;
+              _context4.next = 130;
               break;
             }
-            _iterator6 = _rollupPluginBabelHelpers._createForOfIteratorHelper(removeInstructions);
-            _context3.prev = 113;
+            _iterator5 = _rollupPluginBabelHelpers._createForOfIteratorHelper(removeInstructions);
+            _context4.prev = 115;
             _loop2 = /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _loop2() {
               var instructionId, index;
-              return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _loop2$(_context2) {
-                while (1) switch (_context2.prev = _context2.next) {
+              return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _loop2$(_context3) {
+                while (1) switch (_context3.prev = _context3.next) {
                   case 0:
-                    instructionId = _step6.value;
+                    instructionId = _step5.value;
                     index = messages.findIndex(function (m) {
                       return m.id === instructionId;
                     });
@@ -760,34 +823,34 @@ var Spirits = {
                     }
                   case 3:
                   case "end":
-                    return _context2.stop();
+                    return _context3.stop();
                 }
               }, _loop2);
             });
-            _iterator6.s();
-          case 116:
-            if ((_step6 = _iterator6.n()).done) {
-              _context3.next = 120;
+            _iterator5.s();
+          case 118:
+            if ((_step5 = _iterator5.n()).done) {
+              _context4.next = 122;
               break;
             }
-            return _context3.delegateYield(_loop2(), "t2", 118);
-          case 118:
-            _context3.next = 116;
-            break;
+            return _context4.delegateYield(_loop2(), "t2", 120);
           case 120:
-            _context3.next = 125;
+            _context4.next = 118;
             break;
           case 122:
-            _context3.prev = 122;
-            _context3.t3 = _context3["catch"](113);
-            _iterator6.e(_context3.t3);
-          case 125:
-            _context3.prev = 125;
-            _iterator6.f();
-            return _context3.finish(125);
-          case 128:
+            _context4.next = 127;
+            break;
+          case 124:
+            _context4.prev = 124;
+            _context4.t3 = _context4["catch"](115);
+            _iterator5.e(_context4.t3);
+          case 127:
+            _context4.prev = 127;
+            _iterator5.f();
+            return _context4.finish(127);
+          case 130:
             if (!manualMessage) {
-              _context3.next = 144;
+              _context4.next = 146;
               break;
             }
             /** @type {import('@scout9/admin').Message} */
@@ -799,25 +862,25 @@ var Spirits = {
               time: new Date().toISOString()
             };
             if (!(_rollupPluginBabelHelpers._typeof(manualMessage) === 'object')) {
-              _context3.next = 136;
+              _context4.next = 138;
               break;
             }
             Object.assign(manualMessageObj, manualMessage);
             manualMessageObj.role = 'agent';
             manualMessageObj.time = new Date().toISOString();
-            _context3.next = 141;
+            _context4.next = 143;
             break;
-          case 136:
+          case 138:
             if (!(typeof manualMessage === 'string')) {
-              _context3.next = 140;
+              _context4.next = 142;
               break;
             }
             manualMessageObj.content = manualMessage;
-            _context3.next = 141;
+            _context4.next = 143;
             break;
-          case 140:
+          case 142:
             throw new Error('Manual message must be of type "string" or "DirectMessage"');
-          case 141:
+          case 143:
             if (scheduled) {
               manualMessageObj.time = new Date(scheduled * 1000).toISOString();
               manualMessageObj.scheduled = manualMessageObj.time;
@@ -829,7 +892,7 @@ var Spirits = {
             }
             messages.push(manualMessageObj);
             progress('Added manual message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
-          case 144:
+          case 146:
             if (contextUpsert) {
               context = updateContext(context, contextUpsert);
               progress('Upserted context', 'info', 'UPDATE_CONTEXT', contextUpsert);
@@ -837,21 +900,21 @@ var Spirits = {
             if (resetIntent) {
               resettedIntent = true;
             }
-          case 146:
-            _context3.next = 77;
-            break;
           case 148:
-            _context3.next = 153;
+            _context4.next = 79;
             break;
           case 150:
-            _context3.prev = 150;
-            _context3.t4 = _context3["catch"](75);
-            _iterator2.e(_context3.t4);
-          case 153:
-            _context3.prev = 153;
+            _context4.next = 155;
+            break;
+          case 152:
+            _context4.prev = 152;
+            _context4.t4 = _context4["catch"](77);
+            _iterator2.e(_context4.t4);
+          case 155:
+            _context4.prev = 155;
             _iterator2.f();
-            return _context3.finish(153);
-          case 156:
+            return _context4.finish(155);
+          case 158:
             if (resettedIntent && !_forward) {
               conversation.intent = null;
               conversation.intentScore = null;
@@ -870,14 +933,14 @@ var Spirits = {
             // 5. Generate response
             // If conversation previously locked, don't generate
             if (input.conversation.locked) {
-              _context3.next = 208;
+              _context4.next = 200;
               break;
             }
             if (!((!conversation.locked || !hasNoInstructions) && !!hasNoCustomMessage)) {
-              _context3.next = 174;
+              _context4.next = 178;
               break;
             }
-            _context3.prev = 159;
+            _context4.prev = 161;
             progress('Generating message', 'info', 'SET_PROCESSING', 'system');
 
             /** @type {import('@scout9/admin').GenerateRequestOneOf1} */
@@ -891,10 +954,10 @@ var Spirits = {
             if (!!_tasks && Array.isArray(_tasks) && !!_tasks.length) {
               generatorInput.tasks = _tasks;
             }
-            _context3.next = 165;
-            return generator(generatorInput);
-          case 165:
-            generatorPayload = _context3.sent;
+            _context4.next = 167;
+            return wrapStep(generator(generatorInput), 'generate');
+          case 167:
+            generatorPayload = _context4.sent;
             if (!generatorPayload.send) {
               progress('Generated response', 'failed', undefined, {
                 error: ((_generatorPayload$err = generatorPayload.errors) === null || _generatorPayload$err === void 0 ? void 0 : _generatorPayload$err.join('\n\n')) || 'Unknown Reason'
@@ -933,10 +996,10 @@ var Spirits = {
                 };
 
                 // Copy any other non-nullish fields without overwriting base
-                return Object.entries(message).reduce(function (acc, _ref) {
-                  var _ref2 = _rollupPluginBabelHelpers._slicedToArray(_ref, 2),
-                    key = _ref2[0],
-                    value = _ref2[1];
+                return Object.entries(message).reduce(function (acc, _ref2) {
+                  var _ref3 = _rollupPluginBabelHelpers._slicedToArray(_ref2, 2),
+                    key = _ref3[0],
+                    value = _ref3[1];
                   if (!Object.prototype.hasOwnProperty.call(acc, key) && value != null) {
                     acc[key] = value;
                   }
@@ -945,10 +1008,12 @@ var Spirits = {
               })
               // De-dupe by content (change the key if you want stricter uniqueness)
               .reduce(function (acc, msg) {
-                var key = String(msg.content); // e.g. `${msg.role}::${msg.content}` for stronger uniqueness
+                var key = String(msg.content || msg.tool_calls ? JSON.stringify(msg.tool_calls) : ''); // e.g. `${msg.role}::${msg.content}` for stronger uniqueness
                 if (!acc.seen.has(key)) {
                   acc.seen.add(key);
                   acc.items.push(msg);
+                } else {
+                  console.warn("Duplicate message removed: ".concat(JSON.stringify(msg)));
                 }
                 return acc;
               }, {
@@ -984,39 +1049,35 @@ var Spirits = {
                 }
               }
             }
-            _context3.next = 174;
+            _context4.next = 176;
             break;
-          case 169:
-            _context3.prev = 169;
-            _context3.t5 = _context3["catch"](159);
-            onError(_context3.t5);
-            console.error("Spirits: Locking conversation, error generating response: ".concat(_context3.t5.message));
-            conversation = lockConversation(conversation, 'API: ' + _context3.t5.message);
-          case 174:
-            if (!(messagesToTransform.length && transformer)) {
-              _context3.next = 207;
-              break;
-            }
-            _context3.prev = 175;
-            _iterator4 = _rollupPluginBabelHelpers._createForOfIteratorHelper(messagesToTransform);
-            _context3.prev = 177;
-            _iterator4.s();
+          case 171:
+            _context4.prev = 171;
+            _context4.t5 = _context4["catch"](161);
+            onError(_context4.t5);
+            console.error("Spirits: Locking conversation, error generating response: ".concat(_context4.t5.message));
+            conversation = lockConversation(conversation, 'API: ' + _context4.t5.message);
+          case 176:
+            _context4.next = 179;
+            break;
+          case 178:
+            onStatus('generate', 'ignored');
           case 179:
-            if ((_step4 = _iterator4.n()).done) {
-              _context3.next = 190;
+            if (!(messagesToTransform.length && transformer)) {
+              _context4.next = 197;
               break;
             }
-            _step4.value;
-            _context3.next = 183;
-            return transformer({
+            _context4.prev = 180;
+            _context4.next = 183;
+            return wrapStep(transformer({
               message: messagesToTransform,
               persona: persona,
               customer: customer.id,
               messages: messages,
               context: context
-            });
+            }), 'transform');
           case 183:
-            transformResponse = _context3.sent;
+            transformResponse = _context4.sent;
             progress('Generated response', 'success', undefined, undefined);
             // Check if already had message
             _agentMessages = messages.filter(function (m) {
@@ -1035,39 +1096,33 @@ var Spirits = {
               });
               progress('Added agent message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
             }
-          case 188:
-            _context3.next = 179;
+
+            // }
+            _context4.next = 195;
             break;
           case 190:
-            _context3.next = 195;
-            break;
-          case 192:
-            _context3.prev = 192;
-            _context3.t6 = _context3["catch"](177);
-            _iterator4.e(_context3.t6);
+            _context4.prev = 190;
+            _context4.t6 = _context4["catch"](180);
+            console.error("Locking conversation, error transforming response: ".concat(_context4.t6.message));
+            conversation = lockConversation(conversation, 'API: ' + _context4.t6.message);
+            onError(_context4.t6);
           case 195:
-            _context3.prev = 195;
-            _iterator4.f();
-            return _context3.finish(195);
-          case 198:
-            _context3.next = 205;
-            break;
-          case 200:
-            _context3.prev = 200;
-            _context3.t7 = _context3["catch"](175);
-            console.error("Locking conversation, error transforming response: ".concat(_context3.t7.message));
-            conversation = lockConversation(conversation, 'API: ' + _context3.t7.message);
-            onError(_context3.t7);
-          case 205:
-            _context3.next = 208;
+            _context4.next = 198;
             break;
-          case 207:
+          case 197:
             if (messagesToTransform.length) {
               console.warn("No transformer provided");
+              onStatus('transform', 'ignored');
             }
-          case 208:
+          case 198:
+            _context4.next = 202;
+            break;
+          case 200:
+            onStatus('generate', 'ignored');
+            onStatus('transform', 'ignored');
+          case 202:
             progress('Parsing message', 'info', 'SET_PROCESSING', null);
-            return _context3.abrupt("return", {
+            return _context4.abrupt("return", {
               conversation: {
                 before: conversationBefore,
                 after: conversation,
@@ -1089,11 +1144,11 @@ var Spirits = {
               followup: followup,
               entityContextUpsert: entityContextUpsert
             });
-          case 210:
+          case 204:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee, null, [[49, 58, 61, 64], [75, 150, 153, 156], [113, 122, 125, 128], [159, 169], [175, 200], [177, 192, 195, 198]]);
+      }, _callee2, null, [[51, 60, 63, 66], [77, 152, 155, 158], [115, 124, 127, 130], [161, 171], [180, 190]]);
     }));
     function customer(_x) {
       return _customer.apply(this, arguments);