botium-core 1.12.5 → 1.13.1

package/dist/botium-cjs.js

@@ -14,7 +14,7 @@ var randomatic = require('randomatic');
 var lodash = require('lodash');
 var boolean$1 = require('boolean');
 var events = require('events');
-var debug$l = require('debug');
+var debug$m = require('debug');
 var vm2 = require('vm2');
 var isClass = require('is-class');
 var crypto = require('crypto');
@@ -53,7 +53,7 @@ var randomatic__default = /*#__PURE__*/_interopDefaultLegacy(randomatic);
 var lodash__default = /*#__PURE__*/_interopDefaultLegacy(lodash);
 var boolean__default = /*#__PURE__*/_interopDefaultLegacy(boolean$1);
 var events__default = /*#__PURE__*/_interopDefaultLegacy(events);
-var debug__default = /*#__PURE__*/_interopDefaultLegacy(debug$l);
+var debug__default = /*#__PURE__*/_interopDefaultLegacy(debug$m);
 var vm2__default = /*#__PURE__*/_interopDefaultLegacy(vm2);
 var isClass__default = /*#__PURE__*/_interopDefaultLegacy(isClass);
 var crypto__default = /*#__PURE__*/_interopDefaultLegacy(crypto);
@@ -79,7 +79,7 @@ var express__default = /*#__PURE__*/_interopDefaultLegacy(express);
 var bodyParser__default = /*#__PURE__*/_interopDefaultLegacy(bodyParser);
 
 var name = "botium-core";
-var version$1 = "1.12.5";
+var version$1 = "1.13.1";
 var description = "The Selenium for Chatbots";
 var main = "index.js";
 var module$1 = "dist/botium-es.js";
@@ -111,25 +111,25 @@ var bugs = {
 };
 var homepage = "https://www.botium.ai";
 var dependencies = {
-	"@babel/runtime": "^7.17.9",
-	async: "^3.2.3",
+	"@babel/runtime": "^7.18.6",
+	async: "^3.2.4",
 	"body-parser": "^1.20.0",
 	boolean: "^3.2.0",
 	bottleneck: "^2.19.5",
-	"csv-parse": "^5.0.4",
+	"csv-parse": "^5.3.0",
 	debug: "^4.3.4",
 	esprima: "^4.0.1",
-	express: "^4.17.3",
+	express: "^4.18.1",
 	globby: "11.0.4",
-	ioredis: "^5.0.4",
+	ioredis: "^5.1.0",
 	"is-class": "^0.0.9",
 	"is-json": "^2.0.1",
 	jsonpath: "^1.1.1",
 	lodash: "^4.17.21",
-	"markdown-it": "^12.3.2",
+	"markdown-it": "^13.0.1",
 	"mime-types": "^2.1.35",
 	mkdirp: "^1.0.4",
-	moment: "^2.29.3",
+	moment: "^2.29.4",
 	mustache: "^4.2.0",
 	"promise-retry": "^2.0.1",
 	"promise.allsettled": "^1.0.5",
@@ -138,39 +138,39 @@ var dependencies = {
 	rimraf: "^3.0.2",
 	"sanitize-filename": "^1.6.3",
 	slugify: "^1.6.5",
-	"socket.io": "^4.4.1",
-	"socket.io-client": "^4.4.1",
+	"socket.io": "^4.5.1",
+	"socket.io-client": "^4.5.1",
 	"socketio-auth": "^0.1.1",
 	"swagger-jsdoc": "^6.2.1",
-	"swagger-ui-express": "^4.3.0",
+	"swagger-ui-express": "^4.4.0",
 	uuid: "^8.3.2",
-	vm2: "^3.9.9",
+	vm2: "^3.9.10",
 	"write-yaml": "^1.0.0",
 	xlsx: "^0.18.5",
-	xregexp: "^5.1.0",
-	yaml: "^2.0.1"
+	xregexp: "^5.1.1",
+	yaml: "^2.1.1"
 };
 var devDependencies = {
-	"@babel/core": "^7.17.9",
-	"@babel/node": "^7.16.8",
-	"@babel/plugin-transform-runtime": "^7.17.0",
-	"@babel/preset-env": "^7.16.11",
+	"@babel/core": "^7.18.6",
+	"@babel/node": "^7.18.6",
+	"@babel/plugin-transform-runtime": "^7.18.6",
+	"@babel/preset-env": "^7.18.6",
 	chai: "^4.3.6",
 	"chai-as-promised": "^7.1.1",
 	"cross-env": "^7.0.3",
-	eslint: "^8.13.0",
+	eslint: "^8.19.0",
 	"eslint-config-standard": "^17.0.0",
 	"eslint-plugin-import": "^2.26.0",
-	"eslint-plugin-n": "^15.1.0",
+	"eslint-plugin-n": "^15.2.4",
 	"eslint-plugin-promise": "^6.0.0",
 	"eslint-plugin-standard": "^4.1.0",
 	"license-checker": "^25.0.1",
 	"license-compatibility-checker": "^0.3.5",
-	mocha: "^9.2.2",
-	nock: "^13.2.4",
-	"npm-check-updates": "^12.5.9",
+	mocha: "^10.0.0",
+	nock: "^13.2.8",
+	"npm-check-updates": "^15.2.6",
 	nyc: "^15.1.0",
-	rollup: "^2.70.2",
+	rollup: "^2.76.0",
 	"rollup-plugin-babel": "^4.4.0",
 	"rollup-plugin-commonjs": "^10.1.0",
 	"rollup-plugin-json": "^4.0.0",
@@ -319,6 +319,10 @@ var Capabilities = {
   SCRIPTING_XLSX_SHEETNAMES_PCONVOS: 'SCRIPTING_XLSX_SHEETNAMES_PCONVOS',
   SCRIPTING_XLSX_SHEETNAMES_UTTERANCES: 'SCRIPTING_XLSX_SHEETNAMES_UTTERANCES',
   SCRIPTING_XLSX_SHEETNAMES_SCRIPTING_MEMORY: 'SCRIPTING_XLSX_SHEETNAMES_SCRIPTING_MEMORY',
+  // hidden capability. All newly in Box created testsets will have this as true. CsvCompiler
+  // - throws less error (Box reads csv files as utterances, and convo. Compiler cant throw exception if a file is correct, but box tries to load it with incorrect script type)
+  // 4 or more colums are compiled just as utterances.
+  SCRIPTING_CSV_LEGACY_MODE_OFF: 'SCRIPTING_CSV_LEGACY_MODE_OFF',
   SCRIPTING_CSV_DELIMITER: 'SCRIPTING_CSV_DELIMITER',
   SCRIPTING_CSV_SKIP_HEADER: 'SCRIPTING_CSV_SKIP_HEADER',
   SCRIPTING_CSV_QUOTE: 'SCRIPTING_CSV_QUOTE',
@@ -328,6 +332,9 @@ var Capabilities = {
   SCRIPTING_CSV_MULTIROW_COLUMN_TEXT: 'SCRIPTING_CSV_MULTIROW_COLUMN_TEXT',
   SCRIPTING_CSV_QA_COLUMN_QUESTION: 'SCRIPTING_CSV_QA_COLUMN_QUESTION',
   SCRIPTING_CSV_QA_COLUMN_ANSWER: 'SCRIPTING_CSV_QA_COLUMN_ANSWER',
+  SCRIPTING_CSV_UTTERANCE_STARTROW: 'SCRIPTING_CSV_UTTERANCE_STARTROW',
+  SCRIPTING_CSV_UTTERANCE_STARTROW_HEADER: 'SCRIPTING_CSV_UTTERANCE_STARTROW_HEADER',
+  SCRIPTING_CSV_UTTERANCE_STOP_ON_EMPTY: 'SCRIPTING_CSV_UTTERANCE_STOP_ON_EMPTY',
   SCRIPTING_NORMALIZE_TEXT: 'SCRIPTING_NORMALIZE_TEXT',
   SCRIPTING_ENABLE_MEMORY: 'SCRIPTING_ENABLE_MEMORY',
   SCRIPTING_ENABLE_MULTIPLE_ASSERT_ERRORS: 'SCRIPTING_ENABLE_MULTIPLE_ASSERT_ERRORS',
@@ -469,6 +476,7 @@ Capabilities.SCRIPTING_XLSX_SHEETNAMES;
 Capabilities.SCRIPTING_XLSX_SHEETNAMES_PCONVOS;
 Capabilities.SCRIPTING_XLSX_SHEETNAMES_UTTERANCES;
 Capabilities.SCRIPTING_XLSX_SHEETNAMES_SCRIPTING_MEMORY;
+Capabilities.SCRIPTING_CSV_LEGACY_MODE_OFF;
 Capabilities.SCRIPTING_CSV_DELIMITER;
 Capabilities.SCRIPTING_CSV_SKIP_HEADER;
 Capabilities.SCRIPTING_CSV_QUOTE;
@@ -478,6 +486,9 @@ Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_SENDER;
 Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_TEXT;
 Capabilities.SCRIPTING_CSV_QA_COLUMN_QUESTION;
 Capabilities.SCRIPTING_CSV_QA_COLUMN_ANSWER;
+Capabilities.SCRIPTING_CSV_UTTERANCE_STARTROW;
+Capabilities.SCRIPTING_CSV_UTTERANCE_STARTROW_HEADER;
+Capabilities.SCRIPTING_CSV_UTTERANCE_STOP_ON_EMPTY;
 Capabilities.SCRIPTING_NORMALIZE_TEXT;
 Capabilities.SCRIPTING_ENABLE_MEMORY;
 Capabilities.SCRIPTING_ENABLE_MULTIPLE_ASSERT_ERRORS;
@@ -1220,7 +1231,7 @@ LogicHookConsts.DEFAULT_USER_INPUTS;
 const {
   NodeVM: NodeVM$2
 } = vm2__default["default"];
-const debug$k = debug__default["default"]('botium-core-asserterUtils');
+const debug$l = debug__default["default"]('botium-core-asserterUtils');
 const {
   BotiumError: BotiumError$6
 } = BotiumError_1;
@@ -1285,7 +1296,7 @@ var LogicHookUtils_1 = class LogicHookUtils {
   _fetchAsserters() {
     this.caps[Capabilities.ASSERTERS].forEach(asserter => {
       if (this.asserters[asserter.ref]) {
-        debug$k(`${asserter.ref} asserter already exists, overwriting.`);
+        debug$l(`${asserter.ref} asserter already exists, overwriting.`);
       }
 
       this.asserters[asserter.ref] = this._loadClass(asserter, 'asserter');
@@ -1299,7 +1310,7 @@ var LogicHookUtils_1 = class LogicHookUtils {
   _fetchLogicHooks() {
     this.caps[Capabilities.LOGIC_HOOKS].forEach(logicHook => {
       if (this.logicHooks[logicHook.ref]) {
-        debug$k(`${logicHook.ref} logic hook already exists, overwriting.`);
+        debug$l(`${logicHook.ref} logic hook already exists, overwriting.`);
       }
 
       this.logicHooks[logicHook.ref] = this._loadClass(logicHook, 'logichook');
@@ -1313,7 +1324,7 @@ var LogicHookUtils_1 = class LogicHookUtils {
   _fetchUserInputs() {
     this.caps[Capabilities.USER_INPUTS].forEach(userInput => {
       if (this.userInputs[userInput.ref]) {
-        debug$k(`${userInput.ref} userinput already exists, overwriting.`);
+        debug$l(`${userInput.ref} userinput already exists, overwriting.`);
       }
 
       this.userInputs[userInput.ref] = this._loadClass(userInput, 'userinput');
@@ -1456,7 +1467,7 @@ var LogicHookUtils_1 = class LogicHookUtils {
                 });
                 return vm.run(script);
               } catch (err) {
-                throw new Error(`${err.message || err}`);
+                throw new Error(`Script ${key} is not valid - ${err.message || err}`);
               }
             } else {
               throw new Error(`Script "${key}" is not valid - only functions and javascript code accepted`);
@@ -1547,7 +1558,7 @@ var LogicHookUtils_1 = class LogicHookUtils {
         }
       }
 
-      loadErr.forEach(debug$k);
+      loadErr.forEach(debug$l);
     }
 
     throw new Error(`Failed to fetch ${ref} ${hookType}, no idea how to load ...`);
@@ -1863,6 +1874,14 @@ const flatString = str => {
   return str ? str.split('\n').map(s => s.trim()).join(' ') : '';
 };
 
+const _formatAppendArgs = args => {
+  return args ? ` ${args.map(a => lodash__default["default"].isString(a) ? a.replace(/\|/g, '\\|') : `${a}`).join('|')}` : '';
+};
+
+const _parseArgs = str => {
+  return str && str.length > 0 && str.replace(/\\\|/g, '###ESCAPESPLIT###').split('|').map(s => s.replace(/###ESCAPESPLIT###/g, '|').trim()) || [];
+};
+
 const linesToConvoStep$5 = (lines, sender, context, eol, singleLineMode = false) => {
   if (!validateSender$1(sender)) throw new Error(`Failed to parse conversation. Section "${sender}" unknown.`);
   const convoStep = {
@@ -1904,7 +1923,7 @@ const linesToConvoStep$5 = (lines, sender, context, eol, singleLineMode = false)
       const name = logicLine.split(' ')[0];
 
       if (sender !== 'me' && context.IsAsserterValid(name)) {
-        const args = logicLine.length > name.length ? logicLine.substr(name.length + 1).split('|').map(a => a.trim()) : [];
+        const args = logicLine.length > name.length ? _parseArgs(logicLine.substr(name.length + 1)) : [];
         convoStep.asserters.push({
           name,
           args,
@@ -1912,14 +1931,14 @@ const linesToConvoStep$5 = (lines, sender, context, eol, singleLineMode = false)
           optional
         });
       } else if (sender === 'me' && context.IsUserInputValid(name)) {
-        const args = logicLine.length > name.length ? logicLine.substr(name.length + 1).split('|').map(a => a.trim()) : [];
+        const args = logicLine.length > name.length ? _parseArgs(logicLine.substr(name.length + 1)) : [];
         convoStep.userInputs.push({
           name,
           args
         });
         textLinesAccepted = false;
       } else if (context.IsLogicHookValid(name)) {
-        const args = logicLine.length > name.length ? logicLine.substr(name.length + 1).split('|').map(a => a.trim()) : [];
+        const args = logicLine.length > name.length ? _parseArgs(logicLine.substr(name.length + 1)) : [];
         convoStep.logicHooks.push({
           name,
           args
@@ -2269,7 +2288,7 @@ const convoStepToLines$2 = step => {
 
   if (step.sender === 'me') {
     step.forms && step.forms.filter(form => form.value).forEach(form => {
-      lines.push(`FORM ${form.name}|${form.value}`);
+      lines.push(`FORM${_formatAppendArgs([form.name, form.value])}`);
     });
 
     if (step.buttons && step.buttons.length > 0) {
@@ -2281,18 +2300,18 @@ const convoStepToLines$2 = step => {
     }
 
     step.userInputs && step.userInputs.forEach(userInput => {
-      lines.push(userInput.name + (userInput.args ? ' ' + userInput.args.join('|') : ''));
+      lines.push(userInput.name + _formatAppendArgs(userInput.args));
     });
     step.logicHooks && step.logicHooks.forEach(logicHook => {
-      lines.push(logicHook.name + (logicHook.args ? ' ' + logicHook.args.join('|') : ''));
+      lines.push(logicHook.name + _formatAppendArgs(logicHook.args));
     });
   } else {
     if (step.messageText) {
       lines.push((step.optional ? '?' : '') + (step.not ? '!' : '') + step.messageText);
     }
 
-    if (step.buttons && step.buttons.length > 0) lines.push('BUTTONS ' + step.buttons.filter(b => b.text).map(b => flatString(b.text)).join('|'));
-    if (step.media && step.media.length > 0) lines.push('MEDIA ' + step.media.filter(m => !m.buffer && m.mediaUri).map(m => m.mediaUri).join('|'));
+    if (step.buttons && step.buttons.length > 0) lines.push('BUTTONS' + _formatAppendArgs(step.buttons.filter(b => b.text).map(b => flatString(b.text))));
+    if (step.media && step.media.length > 0) lines.push('MEDIA' + _formatAppendArgs(step.media.filter(m => !m.buffer && m.mediaUri).map(m => m.mediaUri)));
 
     if (step.cards && step.cards.length > 0) {
       step.cards.forEach(c => {
@@ -2300,17 +2319,17 @@ const convoStepToLines$2 = step => {
         if (c.text) cardTexts = cardTexts.concat(lodash__default["default"].isArray(c.text) ? c.text : [c.text]);
         if (c.subtext) cardTexts = cardTexts.concat(lodash__default["default"].isArray(c.subtext) ? c.subtext : [c.subtext]);
         if (c.content) cardTexts = cardTexts.concat(lodash__default["default"].isArray(c.content) ? c.content : [c.content]);
-        if (cardTexts.length > 0) lines.push('CARDS ' + cardTexts.map(c => flatString(c)).join('|'));
-        if (c.buttons && c.buttons.length > 0) lines.push('BUTTONS ' + c.buttons.filter(b => b.text).map(b => flatString(b.text)).join('|'));
+        if (cardTexts.length > 0) lines.push('CARDS' + _formatAppendArgs(cardTexts.map(c => flatString(c))));
+        if (c.buttons && c.buttons.length > 0) lines.push('BUTTONS' + _formatAppendArgs(c.buttons.filter(b => b.text).map(b => flatString(b.text))));
         if (c.image && !c.image.buffer && c.image.mediaUri) lines.push('MEDIA ' + c.image.mediaUri);
       });
     }
 
     step.asserters && step.asserters.forEach(asserter => {
-      lines.push((asserter.optional ? '?' : '') + (asserter.not ? '!' : '') + asserter.name + (asserter.args ? ' ' + asserter.args.join('|') : ''));
+      lines.push((asserter.optional ? '?' : '') + (asserter.not ? '!' : '') + asserter.name + _formatAppendArgs(asserter.args));
     });
     step.logicHooks && step.logicHooks.forEach(logicHook => {
-      lines.push(logicHook.name + (logicHook.args ? ' ' + logicHook.args.join('|') : ''));
+      lines.push(logicHook.name + _formatAppendArgs(logicHook.args));
     });
   }
 
@@ -2398,7 +2417,7 @@ var helper = {
   linesToScriptingMemories: linesToScriptingMemories$2
 };
 
-const debug$j = debug__default["default"]('botium-core-ScriptingMemory');
+const debug$k = debug__default["default"]('botium-core-ScriptingMemory');
 const {
   v1: uuidv1
 } = uuid__default["default"];
@@ -2656,7 +2675,7 @@ const extractVarNames = text => {
 };
 
 const fill = (container, scriptingMemory, result, utterance, scriptingEvents) => {
-  debug$j(`fill start: ${util__default["default"].inspect(scriptingMemory)}`);
+  debug$k(`fill start: ${util__default["default"].inspect(scriptingMemory)}`);
   let varRegex;
 
   switch (container.caps[Capabilities.SCRIPTING_MEMORY_MATCHING_MODE]) {
@@ -2700,14 +2719,14 @@ const fill = (container, scriptingMemory, result, utterance, scriptingEvents) =>
           const varName = varMatches[i - 1];
 
           if (RESERVED_WORDS.indexOf(varName) >= 0) {
-            debug$j(`fill Variable "${varName}" is not overwritten, because it is reserved word. `);
+            debug$k(`fill Variable "${varName}" is not overwritten, because it is reserved word. `);
           } else {
             scriptingMemory[varName] = resultMatches[i];
           }
         }
       }
     });
-    debug$j(`fill end: ${util__default["default"].inspect(scriptingMemory)}`);
+    debug$k(`fill end: ${util__default["default"].inspect(scriptingMemory)}`);
   }
 };
 
@@ -2726,6 +2745,47 @@ ScriptingMemory.extractVarNames;
 ScriptingMemory.RESERVED_WORDS;
 ScriptingMemory.SCRIPTING_FUNCTIONS;
 
+const debug$j = debug__default["default"]('botium-core-RetryHelper');
+var RetryHelper_1 = class RetryHelper {
+  constructor(caps, section, options = {}) {
+    this.retryErrorPatterns = [];
+    const onErrorRegexp = caps[`RETRY_${section.toUpperCase()}_ONERROR_REGEXP`] || [];
+
+    if (onErrorRegexp) {
+      if (lodash__default["default"].isArray(onErrorRegexp)) {
+        onErrorRegexp.forEach(r => {
+          if (lodash__default["default"].isString(r)) this.retryErrorPatterns.push(new RegExp(r, 'i'));else this.retryErrorPatterns.push(r);
+        });
+      } else if (lodash__default["default"].isString(onErrorRegexp)) {
+        this.retryErrorPatterns.push(new RegExp(onErrorRegexp, 'i'));
+      } else {
+        this.retryErrorPatterns.push(onErrorRegexp);
+      }
+    } // to turn on retries, NUMRETRIES or ONERROR_REGEXP has to be set
+
+
+    this.retrySettings = {
+      retries: caps[`RETRY_${section.toUpperCase()}_NUMRETRIES`] || (!lodash__default["default"].isNil(options.numRetries) ? options.numRetries : this.retryErrorPatterns.length === 0 ? 0 : 1),
+      factor: caps[`RETRY_${section.toUpperCase()}_FACTOR`] || (lodash__default["default"].isNil(options.factor) ? 1 : options.factor),
+      minTimeout: caps[`RETRY_${section.toUpperCase()}_MINTIMEOUT`] || (lodash__default["default"].isNil(options.minTimeout) ? 1000 : options.minTimeout)
+    };
+    debug$j(`Retry for ${section} is ${this.retrySettings.retries > 0 ? 'enabled' : 'disabled'}. Settings: ${JSON.stringify(this.retrySettings)} Patterns: ${JSON.stringify(this.retryErrorPatterns.map(r => r.toString()))}`);
+  }
+
+  shouldRetry(err) {
+    if (!err) return false;
+    if (this.retryErrorPatterns.length === 0) return true;
+    const errString = util__default["default"].inspect(err);
+
+    for (const re of this.retryErrorPatterns) {
+      if (errString.match(re)) return true;
+    }
+
+    return false;
+  }
+
+};
+
 const debug$i = debug__default["default"]('botium-core-Convo');
 const {
   BotiumError: BotiumError$4,
@@ -2951,6 +3011,26 @@ class Convo$6 {
   }
 
   async Run(container) {
+    const retryHelper = new RetryHelper_1(container.caps, 'CONVO');
+    return promiseRetry__default["default"](async (retry, number) => {
+      return this.RunImpl(container).catch(err => {
+        const retryRemaining = retryHelper.retrySettings.retries - number + 1;
+
+        if (retryHelper.shouldRetry(err)) {
+          debug$i(`Convo failed with error "${err.message || JSON.stringify(err)}". Retry ${retryRemaining > 0 ? 'enabled' : 'disabled'} (remaining #${retryRemaining}/${retryHelper.retrySettings.retries}, criterion matches)`);
+          retry(err);
+        } else {
+          if (retryHelper.retryErrorPatterns.length > 0) {
+            debug$i(`Convo failed with error "${err.message || JSON.stringify(err)}". Retry 'disabled' (remaining (#${retryRemaining}/${retryHelper.retrySettings.retries}), criterion does not match)`);
+          }
+
+          throw err;
+        }
+      });
+    }, retryHelper.retrySettings);
+  }
+
+  async RunImpl(container) {
     const transcript = new Transcript({
       steps: [],
       attachments: [],
@@ -3436,7 +3516,7 @@ class Convo$6 {
         const transcriptStepErrs = transcript.steps.filter(s => s.err).map(s => s.err);
 
         if (transcriptStepErrs && transcriptStepErrs.length > 0) {
-          transcript.err = botiumErrorFromList$1([transcriptStepErrs, transcript.err].filter(e => e), {});
+          transcript.err = botiumErrorFromList$1([...transcriptStepErrs.filter(err => err !== transcript.err), transcript.err].filter(e => e), {});
         }
       }
     }
@@ -3622,42 +3702,6 @@ var Convo_1 = {
   ConvoStep: ConvoStep$1
 };
 
-var RetryHelper_1 = class RetryHelper {
-  constructor(caps, section) {
-    this.retrySettings = {
-      retries: caps[`RETRY_${section.toUpperCase()}_NUMRETRIES`] || 1,
-      factor: caps[`RETRY_${section.toUpperCase()}_FACTOR`] || 1,
-      minTimeout: caps[`RETRY_${section.toUpperCase()}_MINTIMEOUT`] || 1000
-    };
-    this.retryErrorPatterns = [];
-    const onErrorRegexp = caps[`RETRY_${section.toUpperCase()}_ONERROR_REGEXP`] || [];
-
-    if (onErrorRegexp) {
-      if (lodash__default["default"].isArray(onErrorRegexp)) {
-        onErrorRegexp.forEach(r => {
-          if (lodash__default["default"].isString(r)) this.retryErrorPatterns.push(new RegExp(r, 'i'));else this.retryErrorPatterns.push(r);
-        });
-      } else if (lodash__default["default"].isString(onErrorRegexp)) {
-        this.retryErrorPatterns.push(new RegExp(onErrorRegexp, 'i'));
-      } else {
-        this.retryErrorPatterns.push(onErrorRegexp);
-      }
-    }
-  }
-
-  shouldRetry(err) {
-    if (!err || this.retryErrorPatterns.length === 0) return false;
-    const errString = util__default["default"].inspect(err);
-
-    for (const re of this.retryErrorPatterns) {
-      if (errString.match(re)) return true;
-    }
-
-    return false;
-  }
-
-};
-
 const {
   toString,
   quoteRegexpString
@@ -5330,6 +5374,8 @@ var CompilerCsv_1 = class CompilerCsv extends CompilerBase_1 {
       return [];
     }
 
+    const legacyModeOn = !this._GetOptionalCapability(Capabilities.SCRIPTING_CSV_LEGACY_MODE_OFF, false);
+
     let delimiter = this._GetOptionalCapability(Capabilities.SCRIPTING_CSV_DELIMITER);
 
     if (!delimiter) {
@@ -5357,7 +5403,8 @@ var CompilerCsv_1 = class CompilerCsv extends CompilerBase_1 {
         delimiter,
         escape: this.caps[Capabilities.SCRIPTING_CSV_ESCAPE],
         quote: this.caps[Capabilities.SCRIPTING_CSV_QUOTE],
-        columns: false
+        columns: false,
+        relax_column_count: true
       });
     } catch (err) {
       throw new Error(`Invalid CSV: ${err.message || err}`);
@@ -5367,120 +5414,175 @@ var CompilerCsv_1 = class CompilerCsv extends CompilerBase_1 {
       return [];
     }
 
-    if (rows[0].length === 1) {
-      debug$c('Found 1-column CSV file, treating it as utterance file');
+    const columnCount = rows[0].length;
+    debug$c(`Legacy mode ${legacyModeOn ? 'on' : 'off'} rows ${rows.length} columns ${columnCount}`);
 
-      if (scriptType === Constants.SCRIPTING_TYPE_UTTERANCES) {
-        const result = [{
-          name: rows[0][0],
-          utterances: rows.slice(1).map(r => r[0])
-        }];
-        this.context.AddUtterances(result);
-        return result;
-      } else {
+    if (scriptType === Constants.SCRIPTING_TYPE_CONVO || scriptType === Constants.SCRIPTING_TYPE_PCONVO) {
+      if (columnCount === 1 || !legacyModeOn && columnCount > 3) {
+        debug$c(`Invalid column count '${columnCount}' in convo mode`);
         return [];
       }
-    }
 
-    if (scriptType !== Constants.SCRIPTING_TYPE_CONVO && scriptType !== Constants.SCRIPTING_TYPE_PCONVO) {
-      return [];
-    }
+      let header = null;
 
-    let header = null;
+      if (rows.length > 0 && this.caps[Capabilities.SCRIPTING_CSV_SKIP_HEADER]) {
+        header = rows[0];
+        rows = rows.slice(1);
+      }
 
-    if (rows.length > 0 && this.caps[Capabilities.SCRIPTING_CSV_SKIP_HEADER]) {
-      header = rows[0];
-      rows = rows.slice(1);
-    }
+      if (rows.length === 0) {
+        debug$c('Datarows not found in convo mode');
+        return [];
+      }
 
-    if (rows.length === 0) {
-      return [];
-    }
+      const lineNumberBase = this.caps[Capabilities.SCRIPTING_CSV_SKIP_HEADER] ? 2 : 1;
 
-    const lineNumberBase = this.caps[Capabilities.SCRIPTING_CSV_SKIP_HEADER] ? 2 : 1;
+      if (columnCount === 2) {
+        let colQuestion = DEFAULT_QA_COLUMN_QUESTION;
+        let colAnswer = DEFAULT_QA_COLUMN_ANSWER;
 
-    if (rows[0].length === 2) {
-      debug$c('Found 2-column CSV file, treating it as question/answer file');
-      let colQuestion = DEFAULT_QA_COLUMN_QUESTION;
-      let colAnswer = DEFAULT_QA_COLUMN_ANSWER;
+        if (header) {
+          if (this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_QUESTION] !== undefined) {
+            colQuestion = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_QUESTION]);
+          }
 
-      if (header) {
-        if (this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_QUESTION] !== undefined) {
-          colQuestion = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_QUESTION]);
+          if (this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_ANSWER] !== undefined) {
+            colAnswer = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_ANSWER]);
+          }
         }
 
-        if (this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_ANSWER] !== undefined) {
-          colAnswer = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_QA_COLUMN_ANSWER]);
-        }
-      }
+        const convos = rows.map((row, i) => new Convo$3(this.context, {
+          header: {
+            name: `L${i + lineNumberBase}`
+          },
+          conversation: [Object.assign({}, linesToConvoStep$2([row[colQuestion]], 'me', this.context, undefined, true), {
+            stepTag: `L${i + lineNumberBase}-Question`
+          }), Object.assign({}, linesToConvoStep$2([row[colAnswer]], 'bot', this.context, undefined, true), {
+            stepTag: `L${i + lineNumberBase}-Answer`
+          })]
+        }));
 
-      const convos = rows.map((row, i) => new Convo$3(this.context, {
-        header: {
-          name: `L${i + lineNumberBase}`
-        },
-        conversation: [Object.assign({}, linesToConvoStep$2([row[colQuestion]], 'me', this.context, undefined, true), {
-          stepTag: `L${i + lineNumberBase}-Question`
-        }), Object.assign({}, linesToConvoStep$2([row[colAnswer]], 'bot', this.context, undefined, true), {
-          stepTag: `L${i + lineNumberBase}-Answer`
-        })]
-      }));
+        if (scriptType === Constants.SCRIPTING_TYPE_CONVO) {
+          this.context.AddConvos(convos);
+        } else if (scriptType === Constants.SCRIPTING_TYPE_PCONVO) {
+          this.context.AddPartialConvos(convos);
+        }
 
-      if (scriptType === Constants.SCRIPTING_TYPE_CONVO) {
-        this.context.AddConvos(convos);
-      } else if (scriptType === Constants.SCRIPTING_TYPE_PCONVO) {
-        this.context.AddPartialConvos(convos);
+        debug$c(`Found 2-column CSV file, treating it as question/answer file, extracted ${convos.length} convos`);
+        return convos;
       }
 
-      return convos;
-    }
+      if (columnCount >= 3) {
+        let colConversationId = DEFAULT_MULTIROW_COLUMN_CONVERSATION;
+        let colSender = DEFAULT_MULTIROW_COLUMN_SENDER;
+        let colText = DEFAULT_MULTIROW_COLUMN_TEXT;
 
-    if (rows[0].length >= 3) {
-      debug$c('Found 3-column CSV file, treating it as multi-row conversation file');
-      let colConversationId = DEFAULT_MULTIROW_COLUMN_CONVERSATION;
-      let colSender = DEFAULT_MULTIROW_COLUMN_SENDER;
-      let colText = DEFAULT_MULTIROW_COLUMN_TEXT;
+        if (header) {
+          if (this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_CONVERSATION_ID] !== undefined) {
+            colConversationId = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_CONVERSATION_ID]);
+          }
 
-      if (header) {
-        if (this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_CONVERSATION_ID] !== undefined) {
-          colConversationId = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_CONVERSATION_ID]);
-        }
+          if (this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_SENDER] !== undefined) {
+            colSender = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_SENDER]);
+          }
 
-        if (this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_SENDER] !== undefined) {
-          colSender = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_SENDER]);
+          if (this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_TEXT] !== undefined) {
+            colText = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_TEXT]);
+          }
         }
 
-        if (this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_TEXT] !== undefined) {
-          colText = _findColIndex(header, this.caps[Capabilities.SCRIPTING_CSV_MULTIROW_COLUMN_TEXT]);
+        const conversationIds = lodash__default["default"].uniq(rows.map(r => r[colConversationId]));
+
+        const convos = conversationIds.map(conversationId => {
+          const convoRows = rows.map((row, i) => {
+            if (row[colConversationId] === conversationId) {
+              return Object.assign({}, linesToConvoStep$2([row[colText]], row[colSender], this.context, undefined, true), {
+                stepTag: `L${i + lineNumberBase}`
+              });
+            }
+
+            return null;
+          }).filter(c => c);
+          return new Convo$3(this.context, {
+            header: {
+              name: conversationId
+            },
+            conversation: convoRows
+          });
+        });
+
+        if (scriptType === Constants.SCRIPTING_TYPE_CONVO) {
+          this.context.AddConvos(convos);
+        } else if (scriptType === Constants.SCRIPTING_TYPE_PCONVO) {
+          this.context.AddPartialConvos(convos);
         }
+
+        debug$c(`Found 3-column CSV file, treating it as multi-row conversation file, extracted ${convos.length} convos`);
+        return convos;
+      }
+    } else if (scriptType === Constants.SCRIPTING_TYPE_UTTERANCES) {
+      if (columnCount === 2 || columnCount === 3 || legacyModeOn && columnCount > 4) {
+        debug$c(`Invalid column count '${columnCount}' in utterances mode`);
+        return [];
       }
 
-      const conversationIds = lodash__default["default"].uniq(rows.map(r => r[colConversationId]));
+      const result = [];
+      const startRow = this._GetOptionalCapability(Capabilities.SCRIPTING_CSV_UTTERANCE_STARTROW, 2) - 1;
 
-      const convos = conversationIds.map(conversationId => {
-        const convoRows = rows.map((row, i) => {
-          if (row[colConversationId] === conversationId) {
-            return Object.assign({}, linesToConvoStep$2([row[colText]], row[colSender], this.context, undefined, true), {
-              stepTag: `L${i + lineNumberBase}`
-            });
+      const startRowHeader = this._GetOptionalCapability(Capabilities.SCRIPTING_CSV_UTTERANCE_STARTROW_HEADER);
+
+      const stopOnEmpty = this._GetOptionalCapability(Capabilities.SCRIPTING_CSV_UTTERANCE_STOP_ON_EMPTY);
+
+      for (let col = 0; col < columnCount; col++) {
+        const name = rows[0][col];
+
+        if (!name || name.trim().length === 0) {
+          debug$c(`Column ${col + 1} has no header, skipping`);
+          continue;
+        }
+
+        const uttStruct = {
+          name,
+          utterances: []
+        };
+        let skip = !!startRowHeader;
+
+        const getData = row => {
+          return rows[row][col] ? rows[row][col].trim() : false;
+        }; //
+
+
+        for (let row = startRow; row < rows.length && (skip || !stopOnEmpty || !!getData(row)); row++) {
+          // eslint-disable-line no-unmodified-loop-condition
+          const data = getData(row);
+
+          if (!data) {
+            continue;
           }
 
-          return null;
-        }).filter(c => c);
-        return new Convo$3(this.context, {
-          header: {
-            name: conversationId
-          },
-          conversation: convoRows
-        });
-      });
+          if (!skip) {
+            uttStruct.utterances.push(data);
+          } else {
+            if (startRowHeader === rows[row][col]) {
+              skip = false;
+            }
+          }
+        }
 
-      if (scriptType === Constants.SCRIPTING_TYPE_CONVO) {
-        this.context.AddConvos(convos);
-      } else if (scriptType === Constants.SCRIPTING_TYPE_PCONVO) {
-        this.context.AddPartialConvos(convos);
+        if (uttStruct.utterances.length === 0) {
+          // liveperson, skipping meta intents
+          debug$c(`Column ${col + 1} has no utterances, skipping`);
+          continue;
+        }
+
+        result.push(uttStruct);
       }
 
-      return convos;
+      debug$c(`Multi-column utterance file, extracted ${result.length} utterances`);
+      this.context.AddUtterances(result);
+      return result;
+    } else {
+      return [];
     }
   }
 
@@ -5807,7 +5909,7 @@ const {
 const {
   getMatchFunction
 } = MatchFunctions;
-const globPattern = '**/+(*.convo.txt|*.utterances.txt|*.pconvo.txt|*.scriptingmemory.txt|*.xlsx|*.xlsm|*.convo.csv|*.pconvo.csv|*.yaml|*.yml|*.json|*.md|*.markdown)';
+const globPattern = '**/+(*.convo.txt|*.utterances.txt|*.pconvo.txt|*.scriptingmemory.txt|*.xlsx|*.xlsm|*.convo.csv|*.pconvo.csv|*.utterances.csv|*.yaml|*.yml|*.json|*.md|*.markdown)';
 const skipPattern = /^skip[.\-_]/i;
 
 const p = (retryHelper, fn) => {
@@ -6502,6 +6604,10 @@ var ScriptingProvider_1 = class ScriptingProvider {
         result = this.ReadScriptFromBuffer(scriptBuffer, Constants.SCRIPTING_FORMAT_CSV, Constants.SCRIPTING_TYPE_CONVO);
       } else if (filename.endsWith('.pconvo.csv')) {
         result = this.ReadScriptFromBuffer(scriptBuffer, Constants.SCRIPTING_FORMAT_CSV, Constants.SCRIPTING_TYPE_PCONVO);
+      } else if (filename.endsWith('.pconvo.csv')) {
+        result = this.ReadScriptFromBuffer(scriptBuffer, Constants.SCRIPTING_FORMAT_CSV, Constants.SCRIPTING_TYPE_PCONVO);
+      } else if (filename.endsWith('.utterance.csv')) {
+        result = this.ReadScriptFromBuffer(scriptBuffer, Constants.SCRIPTING_FORMAT_CSV, Constants.SCRIPTING_TYPE_UTTERANCES);
       } else if (filename.endsWith('.yaml') || filename.endsWith('.yml')) {
         result = this.ReadScriptFromBuffer(scriptBuffer, Constants.SCRIPTING_FORMAT_YAML, [Constants.SCRIPTING_TYPE_UTTERANCES, Constants.SCRIPTING_TYPE_PCONVO, Constants.SCRIPTING_TYPE_CONVO, Constants.SCRIPTING_TYPE_SCRIPTING_MEMORY]);
       } else if (filename.endsWith('.json')) {