@scout9/app 1.0.0-alpha.0.9.8 → 1.0.0-alpha.0.9.9

package/dist/{dev-a94c40fe.cjs → dev-470b6b68.cjs}

@@ -35338,7 +35338,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-a94c40fe.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-470b6b68.js', document.baseURI).href))), 'utf-8');
         case 10:
           _context2.t1 = _context2.sent;
           pkg = _context2.t0.parse.call(_context2.t0, _context2.t1);

package/dist/{index-d5ac17af.cjs → index-17797705.cjs}

@@ -1,7 +1,7 @@
 'use strict';
 
 var _rollupPluginBabelHelpers = require("./_rollupPluginBabelHelpers-9c73c95c.cjs");
-var dev = require("./dev-a94c40fe.cjs");
+var dev = require("./dev-470b6b68.cjs");
 var macros = require("./macros-93b81169.cjs");
 var require$$0 = require('fs');
 var require$$2$1 = require('events');
@@ -29483,7 +29483,7 @@ class Body {
     }
     const {
       toFormData
-    } = await Promise.resolve().then(function () { return require("./multipart-parser-27956169.cjs"); });
+    } = await Promise.resolve().then(function () { return require("./multipart-parser-9a0333c4.cjs"); });
     return toFormData(this.body, ct);
   }
 
@@ -41884,7 +41884,7 @@ function _loadUserPackageJson() {
           targetPkgUrl = isTest ? packageTestJsonUrl : packageJsonUrl;
           _context.t0 = JSON;
           _context.next = 10;
-          return fs__default["default"].readFile(new URL(targetPkgUrl, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-d5ac17af.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-17797705.js', document.baseURI).href))), 'utf-8');
         case 10:
           _context.t1 = _context.sent;
           pkg = _context.t0.parse.call(_context.t0, _context.t1);
@@ -43176,7 +43176,7 @@ var ProjectFiles = /*#__PURE__*/function () {
   return ProjectFiles;
 }();
 
-var __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-d5ac17af.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-17797705.js', document.baseURI).href)));
 var __dirname$1 = path__default["default"].dirname(__filename$1);
 function zipDirectory(source, out) {
   var archive = archiver$1('tar', {
@@ -43391,7 +43391,7 @@ function _buildApp() {
         case 11:
           _context4.t0 = JSON;
           _context4.next = 14;
-          return fs__default["default"].readFile(new URL(templatePackagePath, (typeof document === 'undefined' ? new (require('u' + 'rl').URL)('file:' + __filename).href : (document.currentScript && document.currentScript.src || new URL('index-d5ac17af.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-17797705.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,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require("./index-d5ac17af.cjs");
-var dev = require("./dev-a94c40fe.cjs");
+var index = require("./index-17797705.cjs");
+var dev = require("./dev-470b6b68.cjs");
 require("./_rollupPluginBabelHelpers-9c73c95c.cjs");
 require("./macros-93b81169.cjs");
 require('fs');

package/dist/{multipart-parser-27956169.cjs → multipart-parser-9a0333c4.cjs}

@@ -2,9 +2,9 @@
 
 require('node:fs');
 require('node:path');
-var index = require("./index-d5ac17af.cjs");
+var index = require("./index-17797705.cjs");
 require("./_rollupPluginBabelHelpers-9c73c95c.cjs");
-require("./dev-a94c40fe.cjs");
+require("./dev-470b6b68.cjs");
 require('util');
 require('stream');
 require('path');

package/dist/spirits.cjs

@@ -226,7 +226,7 @@ var Spirits = {
         newContextMessages,
         _iterator,
         _step,
-        _loop,
+        _loop2,
         slots,
         hasNoInstructions,
         hasNoCustomMessage,
@@ -243,10 +243,7 @@ var Spirits = {
         forwardNote,
         instructions,
         removeInstructions,
-        manualMessage,
-        scheduled,
         resetIntent,
-        secondsDelay,
         contextUpsert,
         anticipate,
         slotFollowup,
@@ -260,14 +257,12 @@ var Spirits = {
         _slot,
         slotId,
         _tasks2,
-        _iterator4,
-        _step4,
-        instruction,
         _iterator5,
         _step5,
-        _loop2,
-        manualMessageObj,
-        now,
+        instruction,
+        _iterator6,
+        _step6,
+        _loop3,
         generatorInput,
         generatorPayload,
         _generatorPayload$err,
@@ -280,14 +275,17 @@ var Spirits = {
         _iterator3,
         _step3,
         newMessage,
+        _transformResponse$me,
         transformResponse,
-        _agentMessages,
-        _lastAgentMessage,
-        _args4 = arguments;
-      return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _callee2$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+        transformedMessages,
+        _iterator4,
+        _step4,
+        _loop,
+        _args5 = arguments;
+      return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _callee2$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            onError = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : function () {};
+            onError = _args5.length > 1 && _args5[1] !== undefined ? _args5[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 = [];
@@ -416,7 +414,7 @@ var Spirits = {
               };
             }(); // 1. Check inputs
             if (conversation.$agent) {
-              _context4.next = 17;
+              _context5.next = 17;
               break;
             }
             throw new Error("SpiritsError: No agent found in conversation, must define \".$agent\" in the conversation");
@@ -425,13 +423,13 @@ var Spirits = {
               return p.id === conversation.$agent;
             });
             if (persona) {
-              _context4.next = 22;
+              _context5.next = 22;
               break;
             }
             if (!(config.persona || config.personas || config.agents).some(function (a) {
               return !a.id;
             })) {
-              _context4.next = 21;
+              _context5.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)"));
@@ -441,7 +439,7 @@ var Spirits = {
             if (messages.every(function (m) {
               return !!m.id;
             })) {
-              _context4.next = 24;
+              _context5.next = 24;
               break;
             }
             throw new Error("SpiritsError: Every message must have an \".id\", ensure all messages have an id assigned before running");
@@ -449,7 +447,7 @@ var Spirits = {
             if (messages.every(function (m) {
               return m.role === 'customer' || m.role === 'agent' || m.role === 'system' || m.role === 'tool';
             })) {
-              _context4.next = 27;
+              _context5.next = 27;
               break;
             }
             invalidRoles = messages.filter(function (m) {
@@ -468,10 +466,10 @@ var Spirits = {
 
             // 2. Parse the message
             progress('Parsing message', 'info', 'SET_PROCESSING', 'user');
-            _context4.next = 31;
+            _context5.next = 31;
             return wrapStep(parser(message.content, 'en'), 'parse');
           case 31:
-            parsePayload = _context4.sent;
+            parsePayload = _context5.sent;
             if (parsePayload.intent) {
               message.intent = parsePayload.intent;
             }
@@ -560,19 +558,19 @@ var Spirits = {
 
             // 3. Run the contextualizer
             progress('Running contextualizer', 'info', 'SET_PROCESSING', 'system');
-            _context4.next = 49;
+            _context5.next = 49;
             return wrapStep(contextualizer({
               conversation: conversation,
               messages: messages
             }), 'contextualize');
           case 49:
-            newContextMessages = _context4.sent;
+            newContextMessages = _context5.sent;
             _iterator = _rollupPluginBabelHelpers._createForOfIteratorHelper(newContextMessages);
-            _context4.prev = 51;
-            _loop = /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _loop() {
+            _context5.prev = 51;
+            _loop2 = /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _loop2() {
               var contextMessage;
-              return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _loop$(_context2) {
-                while (1) switch (_context2.prev = _context2.next) {
+              return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _loop2$(_context3) {
+                while (1) switch (_context3.prev = _context3.next) {
                   case 0:
                     contextMessage = _step.value;
                     if (!messages.find(function (mes) {
@@ -585,35 +583,35 @@ var Spirits = {
                     }
                   case 2:
                   case "end":
-                    return _context2.stop();
+                    return _context3.stop();
                 }
-              }, _loop);
+              }, _loop2);
             });
             _iterator.s();
           case 54:
             if ((_step = _iterator.n()).done) {
-              _context4.next = 58;
+              _context5.next = 58;
               break;
             }
-            return _context4.delegateYield(_loop(), "t0", 56);
+            return _context5.delegateYield(_loop2(), "t0", 56);
           case 56:
-            _context4.next = 54;
+            _context5.next = 54;
             break;
           case 58:
-            _context4.next = 63;
+            _context5.next = 63;
             break;
           case 60:
-            _context4.prev = 60;
-            _context4.t1 = _context4["catch"](51);
-            _iterator.e(_context4.t1);
+            _context5.prev = 60;
+            _context5.t1 = _context5["catch"](51);
+            _iterator.e(_context5.t1);
           case 63:
-            _context4.prev = 63;
+            _context5.prev = 63;
             _iterator.f();
-            return _context4.finish(63);
+            return _context5.finish(63);
           case 66:
             // 4. Run the workflow
             progress('Running workflow', 'info', 'SET_PROCESSING', 'system');
-            _context4.next = 69;
+            _context5.next = 69;
             return wrapStep(workflow({
               messages: messages,
               conversation: conversation,
@@ -643,16 +641,53 @@ var Spirits = {
               }, []);
             });
           case 69:
-            slots = _context4.sent;
+            slots = _context5.sent;
             hasNoInstructions = slots.every(function (s) {
               return !s.instructions || Array.isArray(s.instructions) && s.instructions.length === 0;
             });
             hasNoCustomMessage = slots.every(function (s) {
               return !s.message;
             });
-            messagesToTransform = slots.filter(function (s) {
-              return !!s.message && _rollupPluginBabelHelpers._typeof(s.message) === 'object' && !!s.message.transform;
-            });
+            messagesToTransform = slots.reduce(function (acc, slot, index) {
+              var m = slot === null || slot === void 0 ? void 0 : slot.message;
+
+              // ignore empty
+              if (!m) return acc;
+              var adjusted = {
+                id: idGenerator('agent'),
+                role: 'agent',
+                // ...m,
+                time: new Date().toISOString(),
+                content: typeof m === 'string' ? m : m.content === 'string' ? m.content : ''
+              };
+              if (!(typeof m === 'string')) {
+                Object.assign(adjusted, m);
+              }
+
+              // only include those explicitly requesting transform
+              if (!m.transform) {
+                adjusted.ignoreTransform = true;
+              }
+              if (slot.scheduled) {
+                adjusted.time = new Date(slot.scheduled * 1000).toISOString();
+                adjusted.scheduled = adjusted.time;
+              } else if (slot.secondsDelay) {
+                var now = new Date();
+                now.setSeconds(now.getSeconds() + slot.secondsDelay);
+                adjusted.time = now.toISOString();
+                adjusted.delayInSeconds = slot.secondsDelay;
+              }
+              if (!adjusted.content && !adjusted.tool_calls) {
+                progress("Slot ".concat(index, " input error"), 'failed', 'SLOT_INPUT_ERROR', {
+                  error: "Expected slots[".concat(index, "].message.content to exist (unless tool_calls provided)")
+                });
+                return acc;
+              } else if (!adjusted.tool_calls && adjusted.role === 'agent') {
+                adjusted.contentGenerated = m.content;
+              }
+              acc.push(adjusted);
+              return acc;
+            }, []);
             previousLockAttempt = conversation.lockAttempts || 0; // Used to track
             if (hasNoInstructions && noNewContext) {
               conversation = incrementLockAttempt(conversation, config);
@@ -669,20 +704,20 @@ var Spirits = {
             resettedIntent = false;
             /** @type {Array<string> | undefined} */
             _iterator2 = _rollupPluginBabelHelpers._createForOfIteratorHelper(slots);
-            _context4.prev = 77;
+            _context5.prev = 77;
             _iterator2.s();
           case 79:
             if ((_step2 = _iterator2.n()).done) {
-              _context4.next = 150;
+              _context5.next = 134;
               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;
+            _step2$value = _step2.value, forward = _step2$value.forward, forwardNote = _step2$value.forwardNote, instructions = _step2$value.instructions, removeInstructions = _step2$value.removeInstructions, _step2$value.message, _step2$value.scheduled, resetIntent = _step2$value.resetIntent, _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) {
-              _context4.next = 94;
+              _context5.next = 94;
               break;
             }
             if (!Array.isArray(anticipate)) {
-              _context4.next = 89;
+              _context5.next = 89;
               break;
             }
             // 'literal' anticipation
@@ -702,11 +737,11 @@ var Spirits = {
               slots: _slots,
               map: map
             });
-            _context4.next = 94;
+            _context5.next = 94;
             break;
           case 89:
             if (!('yes' in anticipate && 'no' in anticipate && 'did' in anticipate)) {
-              _context4.next = 93;
+              _context5.next = 93;
               break;
             }
             // "did" anticipation
@@ -718,7 +753,7 @@ var Spirits = {
               },
               did: anticipate.did
             });
-            _context4.next = 94;
+            _context5.next = 94;
             break;
           case 93:
             throw new Error("Invalid anticipate payload \"".concat(JSON.stringify(anticipate), "\""));
@@ -778,25 +813,25 @@ var Spirits = {
 
             // Insert instructions context
             if (!instructions) {
-              _context4.next = 113;
+              _context5.next = 113;
               break;
             }
             if (!(typeof instructions === 'string')) {
-              _context4.next = 103;
+              _context5.next = 103;
               break;
             }
             addInstruction(instructions, previousLockAttempt);
-            _context4.next = 113;
+            _context5.next = 113;
             break;
           case 103:
             if (!Array.isArray(instructions)) {
-              _context4.next = 108;
+              _context5.next = 108;
               break;
             }
-            _iterator4 = _rollupPluginBabelHelpers._createForOfIteratorHelper(instructions);
+            _iterator5 = _rollupPluginBabelHelpers._createForOfIteratorHelper(instructions);
             try {
-              for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                instruction = _step4.value;
+              for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                instruction = _step5.value;
                 if (typeof instruction === 'string') {
                   addInstruction(instruction, previousLockAttempt);
                 } else {
@@ -804,35 +839,35 @@ var Spirits = {
                 }
               }
             } catch (err) {
-              _iterator4.e(err);
+              _iterator5.e(err);
             } finally {
-              _iterator4.f();
+              _iterator5.f();
             }
-            _context4.next = 113;
+            _context5.next = 113;
             break;
           case 108:
             if (!(_rollupPluginBabelHelpers._typeof(instructions) === 'object' && 'content' in instructions)) {
-              _context4.next = 112;
+              _context5.next = 112;
               break;
             }
             addInstruction(instructions.content, previousLockAttempt, instructions.id);
-            _context4.next = 113;
+            _context5.next = 113;
             break;
           case 112:
             throw new Error("SpiritsError: instructions must be a string or array or {content: \"<instruction>\"}, got: ".concat(JSON.stringify(instructions)));
           case 113:
             if (!removeInstructions) {
-              _context4.next = 130;
+              _context5.next = 130;
               break;
             }
-            _iterator5 = _rollupPluginBabelHelpers._createForOfIteratorHelper(removeInstructions);
-            _context4.prev = 115;
-            _loop2 = /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _loop2() {
+            _iterator6 = _rollupPluginBabelHelpers._createForOfIteratorHelper(removeInstructions);
+            _context5.prev = 115;
+            _loop3 = /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _loop3() {
               var instructionId, index;
-              return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _loop2$(_context3) {
-                while (1) switch (_context3.prev = _context3.next) {
+              return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _loop3$(_context4) {
+                while (1) switch (_context4.prev = _context4.next) {
                   case 0:
-                    instructionId = _step5.value;
+                    instructionId = _step6.value;
                     index = messages.findIndex(function (m) {
                       return m.id === instructionId;
                     });
@@ -846,76 +881,67 @@ var Spirits = {
                     }
                   case 3:
                   case "end":
-                    return _context3.stop();
+                    return _context4.stop();
                 }
-              }, _loop2);
+              }, _loop3);
             });
-            _iterator5.s();
+            _iterator6.s();
           case 118:
-            if ((_step5 = _iterator5.n()).done) {
-              _context4.next = 122;
+            if ((_step6 = _iterator6.n()).done) {
+              _context5.next = 122;
               break;
             }
-            return _context4.delegateYield(_loop2(), "t2", 120);
+            return _context5.delegateYield(_loop3(), "t2", 120);
           case 120:
-            _context4.next = 118;
+            _context5.next = 118;
             break;
           case 122:
-            _context4.next = 127;
+            _context5.next = 127;
             break;
           case 124:
-            _context4.prev = 124;
-            _context4.t3 = _context4["catch"](115);
-            _iterator5.e(_context4.t3);
+            _context5.prev = 124;
+            _context5.t3 = _context5["catch"](115);
+            _iterator6.e(_context5.t3);
           case 127:
-            _context4.prev = 127;
-            _iterator5.f();
-            return _context4.finish(127);
+            _context5.prev = 127;
+            _iterator6.f();
+            return _context5.finish(127);
           case 130:
-            if (!manualMessage) {
-              _context4.next = 146;
-              break;
-            }
-            /** @type {import('@scout9/admin').Message} */
-            manualMessageObj = {
-              id: idGenerator('persona'),
-              role: 'agent',
-              // @TODO switch role to persona
-              content: '',
-              time: new Date().toISOString()
-            };
-            if (!(_rollupPluginBabelHelpers._typeof(manualMessage) === 'object')) {
-              _context4.next = 138;
-              break;
-            }
-            Object.assign(manualMessageObj, manualMessage);
-            manualMessageObj.role = 'agent';
-            manualMessageObj.time = new Date().toISOString();
-            _context4.next = 143;
-            break;
-          case 138:
-            if (!(typeof manualMessage === 'string')) {
-              _context4.next = 142;
-              break;
-            }
-            manualMessageObj.content = manualMessage;
-            _context4.next = 143;
-            break;
-          case 142:
-            throw new Error('Manual message must be of type "string" or "DirectMessage"');
-          case 143:
-            if (scheduled) {
-              manualMessageObj.time = new Date(scheduled * 1000).toISOString();
-              manualMessageObj.scheduled = manualMessageObj.time;
-            } else if (secondsDelay) {
-              now = new Date();
-              now.setSeconds(now.getSeconds() + secondsDelay);
-              manualMessageObj.time = now.toISOString();
-              manualMessageObj.delayInSeconds = secondsDelay;
-            }
-            messages.push(manualMessageObj);
-            progress('Added manual message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
-          case 146:
+            // @TODO this logic is now handled at messagesToTransform's initialization, maybe move back down here
+            // if (manualMessage) {
+
+            //   /** @type {import('@scout9/admin').Message} */
+            //   let manualMessageObj = {
+            //     id: idGenerator('persona'),
+            //     role: 'agent', // @TODO switch role to persona
+            //     content: '',
+            //     time: new Date().toISOString()
+            //   };
+            //   if (typeof manualMessage === 'object') {
+            //     Object.assign(manualMessageObj, manualMessage);
+            //     manualMessageObj.role = 'agent';
+            //     manualMessageObj.time = new Date().toISOString();
+            //   } else if (typeof manualMessage === 'string') {
+            //     manualMessageObj.content = manualMessage;
+            //   } else {
+            //     throw new Error('Manual message must be of type "string" or "DirectMessage"');
+            //   }
+
+            //   if (scheduled) {
+            //     manualMessageObj.time = new Date(scheduled * 1000).toISOString();
+            //     manualMessageObj.scheduled = manualMessageObj.time;
+            //   } else if (secondsDelay) {
+            //     const now = new Date();
+            //     now.setSeconds(now.getSeconds() + secondsDelay);
+            //     manualMessageObj.time = now.toISOString();
+            //     manualMessageObj.delayInSeconds = secondsDelay;
+            //   }
+            //   // @TODO should we mark this as ignored transform?
+            //   manualMessageObj.ignoreTransform = true;
+            //   messagesToTransform.push(manualMessageObj);
+            //   progress('Added manual message', 'info', 'ADD_MESSAGE', messagesToTransform[messagesToTransform.length - 1]);
+            // }
+
             if (contextUpsert) {
               context = updateContext(context, contextUpsert);
               progress('Upserted context', 'info', 'UPDATE_CONTEXT', contextUpsert);
@@ -923,21 +949,21 @@ var Spirits = {
             if (resetIntent) {
               resettedIntent = true;
             }
-          case 148:
-            _context4.next = 79;
+          case 132:
+            _context5.next = 79;
             break;
-          case 150:
-            _context4.next = 155;
+          case 134:
+            _context5.next = 139;
             break;
-          case 152:
-            _context4.prev = 152;
-            _context4.t4 = _context4["catch"](77);
-            _iterator2.e(_context4.t4);
-          case 155:
-            _context4.prev = 155;
+          case 136:
+            _context5.prev = 136;
+            _context5.t4 = _context5["catch"](77);
+            _iterator2.e(_context5.t4);
+          case 139:
+            _context5.prev = 139;
             _iterator2.f();
-            return _context4.finish(155);
-          case 158:
+            return _context5.finish(139);
+          case 142:
             if (resettedIntent && !_forward) {
               conversation.intent = null;
               conversation.intentScore = null;
@@ -956,14 +982,14 @@ var Spirits = {
             // 5. Generate response
             // If conversation previously locked, don't generate
             if (input.conversation.locked) {
-              _context4.next = 200;
+              _context5.next = 198;
               break;
             }
             if (!((!conversation.locked || !hasNoInstructions) && !!hasNoCustomMessage)) {
-              _context4.next = 178;
+              _context5.next = 162;
               break;
             }
-            _context4.prev = 161;
+            _context5.prev = 145;
             progress('Generating message', 'info', 'SET_PROCESSING', 'system');
 
             /** @type {import('@scout9/admin').GenerateRequestOneOf1} */
@@ -977,10 +1003,10 @@ var Spirits = {
             if (!!_tasks && Array.isArray(_tasks) && !!_tasks.length) {
               generatorInput.tasks = _tasks;
             }
-            _context4.next = 167;
+            _context5.next = 151;
             return wrapStep(generator(generatorInput), 'generate');
-          case 167:
-            generatorPayload = _context4.sent;
+          case 151:
+            generatorPayload = _context5.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'
@@ -1054,8 +1080,11 @@ var Spirits = {
                 try {
                   for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
                     newMessage = _step3.value;
-                    messages.push(newMessage);
-                    progress('Added agent message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
+                    // messages.push(newMessage); switched to push to messages after transform is complete
+                    messagesToTransform.push(_rollupPluginBabelHelpers._objectSpread2({
+                      contentGenerated: newMessage.content
+                    }, newMessage));
+                    progress('Added agent message for transform', 'info', 'ADD_MESSAGE', messagesToTransform[messagesToTransform.length - 1]);
                   }
                 } catch (err) {
                   _iterator3.e(err);
@@ -1073,82 +1102,128 @@ var Spirits = {
                 }
               }
             }
-            _context4.next = 176;
+            _context5.next = 160;
             break;
-          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;
+          case 155:
+            _context5.prev = 155;
+            _context5.t5 = _context5["catch"](145);
+            onError(_context5.t5);
+            console.error("Spirits: Locking conversation, error generating response: ".concat(_context5.t5.message));
+            conversation = lockConversation(conversation, 'API: ' + _context5.t5.message);
+          case 160:
+            _context5.next = 163;
             break;
-          case 178:
+          case 162:
             onStatus('generate', 'ignored');
-          case 179:
+          case 163:
             if (!(messagesToTransform.length && transformer)) {
-              _context4.next = 197;
+              _context5.next = 195;
               break;
             }
-            _context4.prev = 180;
-            _context4.next = 183;
+            _context5.prev = 164;
+            _context5.next = 167;
             return wrapStep(transformer({
-              message: messagesToTransform,
+              // message: messagesToTransform,
+              addedMessages: messagesToTransform,
               persona: persona,
               customer: customer.id,
               messages: messages,
               context: context
             }), 'transform');
-          case 183:
-            transformResponse = _context4.sent;
+          case 167:
+            transformResponse = _context5.sent;
             progress('Generated response', 'success', undefined, undefined);
-            // Check if already had message
-            _agentMessages = messages.filter(function (m) {
-              return m.role === 'agent';
+
+            // @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
+            }];
+            _iterator4 = _rollupPluginBabelHelpers._createForOfIteratorHelper(transformedMessages);
+            _context5.prev = 171;
+            _loop = /*#__PURE__*/_rollupPluginBabelHelpers._regeneratorRuntime().mark(function _loop() {
+              var message, adjusted, prior, _adjusted$contentGene, _adjusted$contentTran;
+              return _rollupPluginBabelHelpers._regeneratorRuntime().wrap(function _loop$(_context2) {
+                while (1) switch (_context2.prev = _context2.next) {
+                  case 0:
+                    message = _step4.value;
+                    adjusted = _rollupPluginBabelHelpers._objectSpread2({
+                      id: idGenerator('agent'),
+                      role: 'agent',
+                      time: new Date().toISOString()
+                    }, message);
+                    if (adjusted.role === 'agent' && adjusted.content && !adjusted.ignoreTransform && !adjusted.tool_calls) {
+                      prior = messagesToTransform.find(function (m) {
+                        return m.id === message.id;
+                      });
+                      if (prior) {
+                        adjusted.contentGenerated = prior.content; // BEFORE (original)
+                        adjusted.contentTransformed = adjusted.content; // AFTER (transformed)
+                      } else {
+                        // fallback if transformer changed ids
+                        adjusted.contentGenerated = (_adjusted$contentGene = adjusted.contentGenerated) !== null && _adjusted$contentGene !== void 0 ? _adjusted$contentGene : adjusted.content;
+                        adjusted.contentTransformed = (_adjusted$contentTran = adjusted.contentTransformed) !== null && _adjusted$contentTran !== void 0 ? _adjusted$contentTran : adjusted.content;
+                      }
+                    }
+                    if (adjusted.role === 'agent' && adjusted.content && !adjusted.ignoreTransform && !adjusted.tool_calls && !adjusted.contentTransformed) {
+                      progress('missing contentTransformed on a generated message', 'warning', undefined, adjusted);
+                      adjusted.contentTransformed = adjusted.content;
+                    }
+                    messages.push(adjusted);
+                    progress('Added agent message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
+                  case 6:
+                  case "end":
+                    return _context2.stop();
+                }
+              }, _loop);
             });
-            _lastAgentMessage = _agentMessages[_agentMessages.length - 1];
-            if (_lastAgentMessage && _lastAgentMessage.content && _lastAgentMessage.content === transformResponse.message) {
-              // Error should not have happened
-              conversation = lockConversation(conversation, 'Duplicate message');
-            } else {
-              messages.push({
-                id: idGenerator('agent'),
-                role: 'agent',
-                content: transformResponse.message,
-                contentTransformed: transformResponse.message,
-                contentGenerated: messagesToTransform,
-                time: new Date().toISOString()
-              });
-              progress('Added agent message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
+            _iterator4.s();
+          case 174:
+            if ((_step4 = _iterator4.n()).done) {
+              _context5.next = 178;
+              break;
             }
-
-            // }
-            _context4.next = 195;
+            return _context5.delegateYield(_loop(), "t6", 176);
+          case 176:
+            _context5.next = 174;
             break;
-          case 190:
-            _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:
-            _context4.next = 198;
+          case 178:
+            _context5.next = 183;
+            break;
+          case 180:
+            _context5.prev = 180;
+            _context5.t7 = _context5["catch"](171);
+            _iterator4.e(_context5.t7);
+          case 183:
+            _context5.prev = 183;
+            _iterator4.f();
+            return _context5.finish(183);
+          case 186:
+            _context5.next = 193;
+            break;
+          case 188:
+            _context5.prev = 188;
+            _context5.t8 = _context5["catch"](164);
+            console.error("Locking conversation, error transforming response: ".concat(_context5.t8.message));
+            conversation = lockConversation(conversation, 'API: ' + _context5.t8.message);
+            onError(_context5.t8);
+          case 193:
+            _context5.next = 196;
             break;
-          case 197:
+          case 195:
             if (messagesToTransform.length) {
               console.warn("No transformer provided");
               onStatus('transform', 'ignored');
             }
-          case 198:
-            _context4.next = 202;
+          case 196:
+            _context5.next = 200;
             break;
-          case 200:
+          case 198:
             onStatus('generate', 'ignored');
             onStatus('transform', 'ignored');
-          case 202:
+          case 200:
             progress('Parsing message', 'info', 'SET_PROCESSING', null);
-            return _context4.abrupt("return", {
+            return _context5.abrupt("return", {
               conversation: {
                 before: conversationBefore,
                 after: conversation,
@@ -1170,11 +1245,11 @@ var Spirits = {
               followup: followup,
               entityContextUpsert: entityContextUpsert
             });
-          case 204:
+          case 202:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee2, null, [[51, 60, 63, 66], [77, 152, 155, 158], [115, 124, 127, 130], [161, 171], [180, 190]]);
+      }, _callee2, null, [[51, 60, 63, 66], [77, 136, 139, 142], [115, 124, 127, 130], [145, 155], [164, 188], [171, 180, 183, 186]]);
     }));
     function customer(_x) {
       return _customer.apply(this, arguments);

package/dist/testing-tools.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dev = require("./dev-a94c40fe.cjs");
+var dev = require("./dev-470b6b68.cjs");
 require("./_rollupPluginBabelHelpers-9c73c95c.cjs");
 require('util');
 require('stream');

package/package.json

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

package/src/testing-tools/spirits.js

@@ -108,9 +108,9 @@
  * @param {any} message
  * @returns {string}
  */
-export function messageKey (message) {
+export function messageKey(message) {
   // @TODO consider `${msg.role}::${msg.content}` for stronger uniqueness
-  return String(message.content || (message.tool_calls ? JSON.stringify(message.tool_calls) : '')); 
+  return String(message.content || (message.tool_calls ? JSON.stringify(message.tool_calls) : ''));
 }
 
 class SpiritError extends Error {
@@ -302,7 +302,7 @@ export const Spirits = {
     };
 
     const onStatus = (statusType, completeOrError = true) => {
-      progress(`${statusType}: ${completeOrError}`, 'info', 'STATUS', {[statusType]: completeOrError});
+      progress(`${statusType}: ${completeOrError}`, 'info', 'STATUS', { [statusType]: completeOrError });
     }
 
     /**
@@ -472,7 +472,51 @@ export const Spirits = {
       }, []));
     const hasNoInstructions = slots.every(s => !s.instructions || (Array.isArray(s.instructions) && s.instructions.length === 0));
     const hasNoCustomMessage = slots.every(s => !s.message);
-    const messagesToTransform = slots.filter(s => !!s.message && typeof s.message === 'object' && !!s.message.transform);
+    const messagesToTransform = slots.reduce((acc, slot, index) => {
+      const m = slot?.message;
+    
+      // ignore empty
+      if (!m) return acc;
+
+      const adjusted = {
+        id: idGenerator('agent'), 
+        role: 'agent',
+        // ...m,
+        time: new Date().toISOString(), 
+        content: typeof m ==='string' ? m : m.content === 'string' ? m.content : '',
+      };
+    
+      if (!(typeof m === 'string')) {
+        Object.assign(adjusted, m);
+      } 
+    
+      // only include those explicitly requesting transform
+      if (!m.transform) {
+        adjusted.ignoreTransform = true;
+      }
+  
+      
+      if (slot.scheduled) {
+        adjusted.time = new Date(slot.scheduled * 1000).toISOString();
+        adjusted.scheduled = adjusted.time;
+      } else if (slot.secondsDelay) {
+        const now = new Date();
+        now.setSeconds(now.getSeconds() + slot.secondsDelay);
+        adjusted.time = now.toISOString();
+        adjusted.delayInSeconds = slot.secondsDelay;
+      }
+      if (!adjusted.content && !adjusted.tool_calls) {
+        progress(`Slot ${index} input error`, 'failed', 'SLOT_INPUT_ERROR', {
+          error: `Expected slots[${index}].message.content to exist (unless tool_calls provided)`,
+        });
+        return acc;
+      } else if (!adjusted.tool_calls && adjusted.role === 'agent') {
+        adjusted.contentGenerated = m.content;
+      }
+      acc.push(adjusted);
+      return acc;
+    }, []);
+    
     const previousLockAttempt = conversation.lockAttempts || 0; // Used to track
 
     if (hasNoInstructions && noNewContext) {
@@ -632,37 +676,40 @@ export const Spirits = {
         }
       }
 
-      if (manualMessage) {
-
-        /** @type {import('@scout9/admin').Message} */
-        let manualMessageObj = {
-          id: idGenerator('persona'),
-          role: 'agent', // @TODO switch role to persona
-          content: '',
-          time: new Date().toISOString()
-        };
-        if (typeof manualMessage === 'object') {
-          Object.assign(manualMessageObj, manualMessage);
-          manualMessageObj.role = 'agent';
-          manualMessageObj.time = new Date().toISOString();
-        } else if (typeof manualMessage === 'string') {
-          manualMessageObj.content = manualMessage;
-        } else {
-          throw new Error('Manual message must be of type "string" or "DirectMessage"');
-        }
-
-        if (scheduled) {
-          manualMessageObj.time = new Date(scheduled * 1000).toISOString();
-          manualMessageObj.scheduled = manualMessageObj.time;
-        } else if (secondsDelay) {
-          const now = new Date();
-          now.setSeconds(now.getSeconds() + secondsDelay);
-          manualMessageObj.time = now.toISOString();
-          manualMessageObj.delayInSeconds = secondsDelay;
-        }
-        messages.push(manualMessageObj);
-        progress('Added manual message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
-      }
+      // @TODO this logic is now handled at messagesToTransform's initialization, maybe move back down here
+      // if (manualMessage) {
+
+      //   /** @type {import('@scout9/admin').Message} */
+      //   let manualMessageObj = {
+      //     id: idGenerator('persona'),
+      //     role: 'agent', // @TODO switch role to persona
+      //     content: '',
+      //     time: new Date().toISOString()
+      //   };
+      //   if (typeof manualMessage === 'object') {
+      //     Object.assign(manualMessageObj, manualMessage);
+      //     manualMessageObj.role = 'agent';
+      //     manualMessageObj.time = new Date().toISOString();
+      //   } else if (typeof manualMessage === 'string') {
+      //     manualMessageObj.content = manualMessage;
+      //   } else {
+      //     throw new Error('Manual message must be of type "string" or "DirectMessage"');
+      //   }
+
+      //   if (scheduled) {
+      //     manualMessageObj.time = new Date(scheduled * 1000).toISOString();
+      //     manualMessageObj.scheduled = manualMessageObj.time;
+      //   } else if (secondsDelay) {
+      //     const now = new Date();
+      //     now.setSeconds(now.getSeconds() + secondsDelay);
+      //     manualMessageObj.time = now.toISOString();
+      //     manualMessageObj.delayInSeconds = secondsDelay;
+      //   }
+      //   // @TODO should we mark this as ignored transform?
+      //   manualMessageObj.ignoreTransform = true;
+      //   messagesToTransform.push(manualMessageObj);
+      //   progress('Added manual message', 'info', 'ADD_MESSAGE', messagesToTransform[messagesToTransform.length - 1]);
+      // }
 
       if (contextUpsert) {
         context = updateContext(context, contextUpsert);
@@ -787,13 +834,14 @@ export const Spirits = {
               ).items;
 
 
-            if (lastAgentMessage && lastAgentMessage.content && addedMessages.some((message) => message.content  === lastAgentMessage.content)) {
+            if (lastAgentMessage && lastAgentMessage.content && addedMessages.some((message) => message.content === lastAgentMessage.content)) {
               // Error should not have happened
               conversation = lockConversation(conversation, 'Duplicate message');
             } else {
               for (const newMessage of addedMessages) {
-                messages.push(newMessage);
-                progress('Added agent message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
+                // messages.push(newMessage); switched to push to messages after transform is complete
+                messagesToTransform.push({contentGenerated: newMessage.content, ...newMessage});
+                progress('Added agent message for transform', 'info', 'ADD_MESSAGE', messagesToTransform[messagesToTransform.length - 1]);
               }
             }
 
@@ -819,37 +867,55 @@ export const Spirits = {
         onStatus('generate', 'ignored');
       }
 
+      // For manual messages to transform
       if (messagesToTransform.length && transformer) {
         try {
-          // for (const messageToTransform of messagesToTransform) {
-            const transformResponse = await wrapStep(transformer({
-              message: messagesToTransform,
-              persona,
-              customer: customer.id,
-              messages,
-              context: context
-            }), 'transform');
-
-            progress('Generated response', 'success', undefined, undefined);
-            // Check if already had message
-            const agentMessages = messages.filter(m => m.role === 'agent');
-            const lastAgentMessage = agentMessages[agentMessages.length - 1];
-            if (lastAgentMessage && lastAgentMessage.content && lastAgentMessage.content === transformResponse.message) {
-              // Error should not have happened
-              conversation = lockConversation(conversation, 'Duplicate message');
+          const transformResponse = await wrapStep(transformer({
+            // message: messagesToTransform,
+            addedMessages: messagesToTransform,
+            persona,
+            customer: customer.id,
+            messages,
+            context
+          }), 'transform');
+
+          progress('Generated response', 'success', undefined, undefined);
+
+          // @TODO check for duplicates, or have already sent the message
+          const transformedMessages =
+          transformResponse.messages?.length
+            ? transformResponse.messages
+            : [{ role: 'agent', content: transformResponse.message }];
+        
+        for (const message of transformedMessages) {
+          const adjusted = {
+            id: idGenerator('agent'),
+            role: 'agent',
+            time: new Date().toISOString(),
+            ...message,
+          };
+        
+          if (adjusted.role === 'agent' && adjusted.content && !adjusted.ignoreTransform && !adjusted.tool_calls) {
+            const prior = messagesToTransform.find((m) => m.id === message.id);
+            if (prior) {
+              adjusted.contentGenerated = prior.content;        // BEFORE (original)
+              adjusted.contentTransformed = adjusted.content;   // AFTER (transformed)
             } else {
-              messages.push({
-                id: idGenerator('agent'),
-                role: 'agent',
-                content: transformResponse.message,
-                contentTransformed: transformResponse.message,
-                contentGenerated: messagesToTransform,
-                time: new Date().toISOString()
-              });
-              progress('Added agent message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
+              // fallback if transformer changed ids
+              adjusted.contentGenerated = adjusted.contentGenerated ?? adjusted.content;
+              adjusted.contentTransformed = adjusted.contentTransformed ?? adjusted.content;
             }
-
-          // }
+          }
+        
+          if (adjusted.role === 'agent' && adjusted.content && !adjusted.ignoreTransform && !adjusted.tool_calls && !adjusted.contentTransformed) {
+            progress('missing contentTransformed on a generated message', 'warning', undefined, adjusted);
+            adjusted.contentTransformed = adjusted.content;
+          }
+        
+          messages.push(adjusted);
+          progress('Added agent message', 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
+        }
+      
         } catch (e) {
           console.error(`Locking conversation, error transforming response: ${e.message}`);
           conversation = lockConversation(conversation, 'API: ' + e.message);
@@ -860,8 +926,8 @@ export const Spirits = {
         onStatus('transform', 'ignored');
       }
     } else {
-        onStatus('generate', 'ignored');
-        onStatus('transform', 'ignored');
+      onStatus('generate', 'ignored');
+      onStatus('transform', 'ignored');
     }
 
     progress('Parsing message', 'info', 'SET_PROCESSING', null);