@scout9/app 1.0.0-alpha.0.4.8 → 1.0.0-alpha.0.5.0

package/dist/{index-2d62ac36.cjs → index-45f6ee5e.cjs}

@@ -1,8 +1,8 @@
 'use strict';
 
-var spirits = require("./spirits-5c9243a1.cjs");
-var dev = require("./dev-332ccb5a.cjs");
-var macros = require("./macros-e4105c56.cjs");
+var spirits = require("./spirits-2ab4d673.cjs");
+var dev = require("./dev-5c6f5d76.cjs");
+var macros = require("./macros-2f21c706.cjs");
 var require$$0 = require('fs');
 var require$$2$1 = require('events');
 var require$$1 = require('path');
@@ -29483,7 +29483,7 @@ class Body {
     }
     const {
       toFormData
-    } = await Promise.resolve().then(function () { return require("./multipart-parser-948d98ce.cjs"); });
+    } = await Promise.resolve().then(function () { return require("./multipart-parser-bac8efc8.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-2d62ac36.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-45f6ee5e.js', document.baseURI).href))), 'utf-8');
         case 10:
           _context.t1 = _context.sent;
           pkg = _context.t0.parse.call(_context.t0, _context.t1);
@@ -42011,6 +42011,7 @@ function did(_x) {
  */
 function _did() {
   _did = spirits._asyncToGenerator( /*#__PURE__*/spirits._regeneratorRuntime().mark(function _callee(prompt) {
+    var _event$context;
     var convoId, event, _yield$Scout9Api$did$, value;
     return spirits._regeneratorRuntime().wrap(function _callee$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -42031,7 +42032,8 @@ function _did() {
           })).did(processPayload({
             prompt: prompt,
             convoId: convoId,
-            event: event
+            event: event,
+            cache: !((_event$context = event.context) !== null && _event$context !== void 0 && _event$context.__no_cache)
           })).then(handleAxiosResponse)["catch"](function (err) {
             console.error('Error in did macro', err);
             throw err;
@@ -42076,6 +42078,7 @@ function does(_x2) {
  */
 function _does() {
   _does = spirits._asyncToGenerator( /*#__PURE__*/spirits._regeneratorRuntime().mark(function _callee2(prompt) {
+    var _event$context2;
     var relation,
       convoId,
       event,
@@ -42103,7 +42106,8 @@ function _does() {
             prompt: prompt,
             convoId: convoId,
             role: relation,
-            event: event
+            event: event,
+            cache: !((_event$context2 = event.context) !== null && _event$context2 !== void 0 && _event$context2.__no_cache)
           })).then(handleAxiosResponse)["catch"](function (err) {
             console.error('Error in did macro', err);
             throw err;
@@ -42125,6 +42129,7 @@ function context(_x3, _x4) {
 }
 function _context() {
   _context = spirits._asyncToGenerator( /*#__PURE__*/spirits._regeneratorRuntime().mark(function _callee3(prompt, examples) {
+    var _event$context3;
     var convoId, event, _yield$Scout9Api$capt, value;
     return spirits._regeneratorRuntime().wrap(function _callee3$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
@@ -42146,7 +42151,8 @@ function _context() {
             prompt: prompt,
             examples: examples,
             convoId: convoId,
-            event: event
+            event: event,
+            cache: !((_event$context3 = event.context) !== null && _event$context3 !== void 0 && _event$context3.__no_cache)
           })).then(handleAxiosResponse)["catch"](function (err) {
             console.error('Error in context macro', err);
             throw err;
@@ -43158,7 +43164,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-2d62ac36.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-45f6ee5e.js', document.baseURI).href)));
 var __dirname$1 = path__default["default"].dirname(__filename$1);
 function zipDirectory(source, out) {
   var archive = archiver$1('tar', {
@@ -43373,7 +43379,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-2d62ac36.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-45f6ee5e.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,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var index = require("./index-2d62ac36.cjs");
-var dev = require("./dev-332ccb5a.cjs");
-require("./spirits-5c9243a1.cjs");
-require("./macros-e4105c56.cjs");
+var index = require("./index-45f6ee5e.cjs");
+var dev = require("./dev-5c6f5d76.cjs");
+require("./spirits-2ab4d673.cjs");
+require("./macros-2f21c706.cjs");
 require('fs');
 require('events');
 require('path');
@@ -49,6 +49,7 @@ exports.does = index.does;
 exports.json = index.json;
 exports.run = index.run;
 exports.sendEvent = index.sendEvent;
+exports.ProgressLogger = dev.ProgressLogger;
 exports.Scout9Test = dev.Scout9Test;
 exports.createMockAgent = dev.createMockAgent;
 exports.createMockConversation = dev.createMockConversation;

package/dist/{macros-e4105c56.cjs → macros-2f21c706.cjs}

@@ -4131,7 +4131,7 @@ var PersonasConfigurationSchema = z.array(PersonaConfigurationSchema);
 var AgentsSchema = z.array(AgentSchema);
 var PersonasSchema = z.array(PersonaSchema);
 
-var ConversationContext = z.record(z.union([z.string(), z.number(), z["boolean"](), z["null"](), z.array(z.union([z.string(), z.number(), z["boolean"](), z["null"]()]))]));
+var ConversationContext = z.record(z.union([z.any(), z.string(), z.number(), z["boolean"](), z["null"](), z.array(z.union([z.string(), z.number(), z["boolean"](), z["null"]()]))]));
 var ConversationAnticipateSchema = z.object({
   type: z["enum"](['did', 'literal', 'context'], {
     description: "Determines the runtime to address the next response"
@@ -4275,6 +4275,11 @@ var WorkflowConfigurationSchema = z.object({
   entity: zId('Workflow Folder', z.string())
 });
 var WorkflowsConfigurationSchema = z.array(WorkflowConfigurationSchema);
+var CommandSchema = z.object({
+  path: z.string(),
+  entity: zId('Command ID', z.string())
+});
+var CommandsSchema = z.array(CommandSchema);
 var IntentWorkflowEventSchema = z.object({
   current: z.string().nullable(),
   flow: z.array(z.string()),
@@ -4545,6 +4550,8 @@ exports.AgentConfigurationSchema = AgentConfigurationSchema;
 exports.AgentSchema = AgentSchema;
 exports.AgentsConfigurationSchema = AgentsConfigurationSchema;
 exports.AgentsSchema = AgentsSchema;
+exports.CommandSchema = CommandSchema;
+exports.CommandsSchema = CommandsSchema;
 exports.ContextExampleSchema = ContextExampleSchema;
 exports.ContextExampleWithTrainingDataSchema = ContextExampleWithTrainingDataSchema;
 exports.ConversationAnticipateSchema = ConversationAnticipateSchema;

package/dist/{multipart-parser-948d98ce.cjs → multipart-parser-bac8efc8.cjs}

@@ -2,9 +2,9 @@
 
 require('node:fs');
 require('node:path');
-var index = require("./index-2d62ac36.cjs");
-require("./spirits-5c9243a1.cjs");
-require("./dev-332ccb5a.cjs");
+var index = require("./index-45f6ee5e.cjs");
+require("./spirits-2ab4d673.cjs");
+require("./dev-5c6f5d76.cjs");
 require('util');
 require('stream');
 require('path');
@@ -25,7 +25,7 @@ require('node:stream');
 require('node:string_decoder');
 require('node:readline');
 require('node:process');
-require("./macros-e4105c56.cjs");
+require("./macros-2f21c706.cjs");
 require('node:os');
 require('fs/promises');
 require('constants');

package/dist/schemas.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var macros = require("./macros-e4105c56.cjs");
+var macros = require("./macros-2f21c706.cjs");
 
 
 
@@ -10,6 +10,8 @@ exports.AgentConfigurationSchema = macros.AgentConfigurationSchema;
 exports.AgentSchema = macros.AgentSchema;
 exports.AgentsConfigurationSchema = macros.AgentsConfigurationSchema;
 exports.AgentsSchema = macros.AgentsSchema;
+exports.CommandSchema = macros.CommandSchema;
+exports.CommandsSchema = macros.CommandsSchema;
 exports.ContextExampleSchema = macros.ContextExampleSchema;
 exports.ContextExampleWithTrainingDataSchema = macros.ContextExampleWithTrainingDataSchema;
 exports.ConversationAnticipateSchema = macros.ConversationAnticipateSchema;

package/dist/{spirits-5c9243a1.cjs → spirits-2ab4d673.cjs}

@@ -596,6 +596,12 @@ function _classCheckPrivateStaticFieldDescriptor(descriptor, action) {
     throw new TypeError("attempted to " + action + " private static field before its declaration");
   }
 }
+function _classPrivateMethodGet(receiver, privateSet, fn) {
+  if (!privateSet.has(receiver)) {
+    throw new TypeError("attempted to get private field on non-instance");
+  }
+  return fn;
+}
 function _checkPrivateRedeclaration(obj, privateCollection) {
   if (privateCollection.has(obj)) {
     throw new TypeError("Cannot initialize the same private elements twice on an object");
@@ -605,6 +611,10 @@ function _classPrivateFieldInitSpec(obj, privateMap, value) {
   _checkPrivateRedeclaration(obj, privateMap);
   privateMap.set(obj, value);
 }
+function _classPrivateMethodInitSpec(obj, privateSet) {
+  _checkPrivateRedeclaration(obj, privateSet);
+  privateSet.add(obj);
+}
 
 var _excluded = ["keywords"];
 /**
@@ -1116,7 +1126,7 @@ var Spirits = {
             _context2.next = 84;
             break;
           case 79:
-            if (!(_typeof(instructions) === 'object' && 'content' in instructions && 'id' in instructions)) {
+            if (!(_typeof(instructions) === 'object' && 'content' in instructions)) {
               _context2.next = 83;
               break;
             }
@@ -1124,7 +1134,7 @@ var Spirits = {
             _context2.next = 84;
             break;
           case 83:
-            throw new Error('SpiritsError: instructions must be a string or array or {content: "", id: ""}');
+            throw new Error("SpiritsError: instructions must be a string or array or {content: \"<instruction>\"}, got: ".concat(JSON.stringify(instructions)));
           case 84:
             if (!removeInstructions) {
               _context2.next = 101;
@@ -1348,6 +1358,8 @@ exports._classCallCheck = _classCallCheck;
 exports._classPrivateFieldGet = _classPrivateFieldGet;
 exports._classPrivateFieldInitSpec = _classPrivateFieldInitSpec;
 exports._classPrivateFieldSet = _classPrivateFieldSet;
+exports._classPrivateMethodGet = _classPrivateMethodGet;
+exports._classPrivateMethodInitSpec = _classPrivateMethodInitSpec;
 exports._classStaticPrivateFieldSpecGet = _classStaticPrivateFieldSpecGet;
 exports._createClass = _createClass;
 exports._createForOfIteratorHelper = _createForOfIteratorHelper;

package/dist/spirits.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var spirits = require("./spirits-5c9243a1.cjs");
+var spirits = require("./spirits-2ab4d673.cjs");
 
 
 

package/dist/testing-tools.cjs

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dev = require("./dev-332ccb5a.cjs");
-require("./spirits-5c9243a1.cjs");
+var dev = require("./dev-5c6f5d76.cjs");
+require("./spirits-2ab4d673.cjs");
 require('util');
 require('stream');
 require('path');
@@ -26,7 +26,7 @@ require('node:stream');
 require('node:string_decoder');
 require('node:readline');
 require('node:process');
-require("./macros-e4105c56.cjs");
+require("./macros-2f21c706.cjs");
 require('node:os');
 require('fs/promises');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scout9/app",
-  "version": "1.0.0-alpha.0.4.8",
+  "version": "1.0.0-alpha.0.5.0",
   "description": "Build and deploy your Scout9 app for SMS auto replies",
   "publishConfig": {
     "access": "public"
@@ -85,8 +85,8 @@
     "zod-to-ts": "^1.2.0"
   },
   "dependencies": {
-    "@scout9/admin": "^1.0.0-alpha.0.0.51",
-    "@scout9/crm": "^1.0.0-alpha.0.0.4",
+    "@scout9/admin": "latest",
+    "@scout9/crm": "latest",
     "archiver": "^6.0.1",
     "body-parser": "^1.20.2",
     "compression": "^1.7.4",

package/src/core/config/commands.js

@@ -0,0 +1,41 @@
+import { globSync } from 'glob';
+import { CommandsSchema } from '../../runtime/index.js';
+import { basename, dirname } from 'node:path';
+
+
+/**
+ * @returns {Promise<CommandConfiguration[]>}
+ */
+export default async function loadCommandsConfig(
+  {
+    cwd = process.cwd(),
+    src = 'src',
+    cb = (message) => {}
+  } = {}
+) {
+  // const config = globSync(path.resolve(cwd, `${src}/workflows/**/workflow.{ts,js}`), {cwd, absolute: true})
+  const config = globSync(`${src}/commands/**/{index,command,*.command}.{ts,js}`, {cwd, absolute: false})
+    .map((path) => {
+
+      const dir = dirname(path);
+      let entity = basename(path).replace(/\..*$/, ''); // Removes any "."'s
+      if (!entity) {
+        throw new Error(`Invalid command path "${path}"`)
+      }
+      switch (entity) {
+        case "index":
+        case "command":
+          entity = basename(dir);
+          break;
+      }
+      return {
+        entity,
+        path: path.split(src + '/commands/')[1]
+      }
+    });
+
+  // Validate the config
+  CommandsSchema.parse(config);
+
+  return config;
+}

package/src/core/config/index.js

@@ -7,6 +7,7 @@ import loadProjectConfig from './project.js';
 import loadWorkflowsConfig from './workflow.js';
 import { Scout9ProjectBuildConfigSchema } from '../../runtime/index.js';
 import { ProgressLogger } from '../../utils/index.js';
+import loadCommandsConfig from './commands.js';
 
 
 export function loadEnvConfig({
@@ -47,6 +48,7 @@ export async function loadConfig({
   const entitiesConfig = await loadEntitiesConfig({cwd, src, logger, cb, deploying});
   const agentsConfig = await loadAgentConfig({cwd, src, logger, cb, deploying, dest});
   const workflowsConfig = await loadWorkflowsConfig({cwd, src, logger, deploying, cb});
+  const commandsConfig = await loadCommandsConfig({cwd, src, logger, deploying, cb});
 
   /**
    * @type {Scout9ProjectBuildConfig}
@@ -55,7 +57,8 @@ export async function loadConfig({
     ...baseProjectConfig,
     entities: entitiesConfig,
     agents: agentsConfig,
-    workflows: workflowsConfig
+    workflows: workflowsConfig,
+    commands: commandsConfig
   };
 
   // Validate the config