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

package/dist/testing-tools.cjs

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var dev = require("./dev-5557cad7.cjs");
-require("./spirits-011bdf25.cjs");
+var dev = require("./dev-c58715b1.cjs");
+require("./_rollupPluginBabelHelpers-606d8129.cjs");
 require('util');
 require('stream');
 require('path');
@@ -24,11 +24,12 @@ require('node:url');
 require('node:events');
 require('node:stream');
 require('node:string_decoder');
-require("./macros-f62cceac.cjs");
+require("./macros-9ad79144.cjs");
 require('node:readline');
 require('node:process');
 require('node:os');
 require('fs/promises');
+require("./spirits.cjs");
 
 
 

package/package.json

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

package/src/public.d.ts

@@ -516,6 +516,11 @@ export type EntityConfigurationBase = {
      */
     id?: string;
 
+    /**
+     * What type of entity this represents
+     */
+    type: 'reference' | 'entity';
+
     /**
      * The corpus definitions used to compute embeddings for NLP models.
      */

package/src/runtime/schemas/entity.js

@@ -41,6 +41,7 @@ const _EntityConfigurationSchema = z.object({
   definitions: z.array(EntityConfigurationDefinitionSchema).optional(),
   training: z.array(EntityConfigurationTrainingSchema).optional(),
   tests: z.array(EntityConfigurationTestSchema).optional(),
+  type: z.enum(['entity', 'reference']).describe('What type of entity this represents')
 }, {description: 'full entity NLP configuration file used for training/tuning its corresponding NLP model(s)'}).strict();
 
 export const EntityConfigurationSchema = _EntityConfigurationSchema.superRefine((data, ctx) => {

package/src/testing-tools/spirits.js

@@ -142,7 +142,7 @@ export const Spirits = {
       messages: messagesBefore,
       conversation: conversationBefore
     } = input;
-    let {conversation, messages, context, message} = input;
+    let { conversation, messages, context, message } = input;
 
     // Storing post process events here
     const followup = [];
@@ -177,7 +177,7 @@ export const Spirits = {
     const lockConversation = (_conversation, reason) => {
       return updateConversation(
         _conversation,
-        {locked: true, lockedReason: conversation.lockedReason || reason || 'Unknown'}
+        { locked: true, lockedReason: conversation.lockedReason || reason || 'Unknown' }
       );
     };
 
@@ -333,7 +333,7 @@ export const Spirits = {
         'Updated conversation intent',
         'info',
         'UPDATE_CONVERSATION',
-        {intent: parsePayload.intent, intentScore: parsePayload?.intentScore || 0}
+        { intent: parsePayload.intent, intentScore: parsePayload?.intentScore || 0 }
       );
     }
     const oldKeyCount = Object.keys(context).length;
@@ -345,7 +345,7 @@ export const Spirits = {
       conversation.locked = false;
       conversation.lockAttempts = 0;
       conversation.lockedReason = '';
-      progress('Reset lock', 'info', 'UPDATE_CONVERSATION', {locked: false, lockAttempts: 0, lockedReason: ''});
+      progress('Reset lock', 'info', 'UPDATE_CONVERSATION', { locked: false, lockAttempts: 0, lockedReason: '' });
     }
 
     const noNewContext = Object.keys(parsePayload.context).length === 0;
@@ -370,7 +370,7 @@ export const Spirits = {
 
     // 3. Run the contextualizer
     progress('Running contextualizer', 'info', 'SET_PROCESSING', 'system');
-    const newContextMessages = await contextualizer({conversation, messages});
+    const newContextMessages = await contextualizer({ conversation, messages });
     for (const contextMessage of newContextMessages) {
       if (!messages.find(mes => mes.content === contextMessage.content)) {
         messages.push(contextMessage);
@@ -418,7 +418,7 @@ export const Spirits = {
       conversation.lockAttempts = 0;
       conversation.locked = false;
       conversation.lockedReason = '';
-      progress('Reset lock', 'info', 'UPDATE_CONVERSATION', {lockAttempts: 0, locked: false, lockedReason: ''});
+      progress('Reset lock', 'info', 'UPDATE_CONVERSATION', { lockAttempts: 0, locked: false, lockedReason: '' });
     }
 
     let resettedIntent = false;
@@ -451,7 +451,7 @@ export const Spirits = {
           const slots = {};
           const map = [];
           for (let i = 0; i < anticipate.length; i++) {
-            const {keywords, ..._slot} = anticipate[i];
+            const { keywords, ..._slot } = anticipate[i];
             const slotId = `${i}`;
             slots[slotId] = _slot;
             map.push({
@@ -499,7 +499,7 @@ export const Spirits = {
         _forward = forward;
         _forwardNote = forwardNote;
         if (typeof forward === 'string') {
-          updateConversation(conversation, {forwarded: forward});
+          updateConversation(conversation, { forwarded: forward });
           messages.push({
             id: idGenerator('sys'),
             role: 'system',
@@ -508,7 +508,7 @@ export const Spirits = {
           });
           progress(`Forwarded to "${forward}"`, 'info', 'ADD_MESSAGE', messages[messages.length - 1]);
         } else if (typeof forward === 'boolean') {
-          updateConversation(conversation, {forwarded: conversation.$agent});
+          updateConversation(conversation, { forwarded: conversation.$agent });
           messages.push({
             id: idGenerator('sys'),
             role: 'system',
@@ -530,7 +530,7 @@ export const Spirits = {
             'ADD_MESSAGE',
             messages[messages.length - 1]
           );
-          updateConversation(conversation, {forwarded: forward.to});
+          updateConversation(conversation, { forwarded: forward.to });
         }
       }
 
@@ -622,7 +622,7 @@ export const Spirits = {
         'Reset conversation intent',
         'info',
         'UPDATE_CONVERSATION',
-        {intent: null, intentScore: null, locked: false, lockAttempts: 0, lockedReason: ''}
+        { intent: null, intentScore: null, locked: false, lockAttempts: 0, lockedReason: '' }
       );
     }
 
@@ -652,7 +652,7 @@ export const Spirits = {
               'Generated response',
               'failed',
               undefined,
-              {error: generatorPayload.errors?.join('\n\n') || 'Unknown Reason'}
+              { error: generatorPayload.errors?.join('\n\n') || 'Unknown Reason' }
             );
             console.error(
               `Locking conversation, api returned send false: ${generatorPayload.messages}`,
@@ -667,40 +667,59 @@ export const Spirits = {
             // Check if already had message
             const agentMessages = messages.filter(m => m.role === 'agent');
             const lastAgentMessage = agentMessages[agentMessages.length - 1];
-            const addedMessages = [
-              ...(generatorPayload?.messages || [])
-                .map((message) => {
-
-                  let time = message.time;
-
-                  if (typeof time !== 'string') {
-                    // Convert the time string
-                    if (!time) {
-                      progress(`Message "${message.content}" wasn't given a timestamp, defaulting to now`);
-                      time = new Date().toISOString();
-                    } else if (!'toDate' in time) {
-                      progress(`Message "${message.content}" wasn't given a timestamp (${JSON.stringify(time)}) without a toDate method, defaulting to now`);
-                      time = new Date().toISOString();
-                    } else {
-                      time = message.time.toDate().toISOString();
-                    }
+
+            // Build addedMessages from generatorPayload.messages
+            const addedMessages = (generatorPayload?.messages ?? [])
+              .map((message) => {
+                // Normalize time → ISO string
+                const t = message.time;
+                let isoTime;
+
+                if (typeof t === "string") {
+                  isoTime = t;
+                } else if (t instanceof Date) {
+                  isoTime = t.toISOString();
+                } else if (t && typeof t.toDate === "function") {
+                  // Firestore Timestamp
+                  isoTime = t.toDate().toISOString();
+                } else {
+                  progress(
+                    `Message "${message.content}" wasn't given a usable timestamp (${JSON.stringify(
+                      t
+                    )}), defaulting to now`
+                  );
+                  isoTime = new Date().toISOString();
+                }
+
+                // Base fields we guarantee
+                const base = {
+                  role: message.role,
+                  content: message.content,
+                  id: idGenerator(message.role),
+                  time: isoTime,
+                };
+
+                // Copy any other non-nullish fields without overwriting base
+                return Object.entries(message).reduce((acc, [key, value]) => {
+                  if (!Object.prototype.hasOwnProperty.call(acc, key) && value != null) {
+                    acc[key] = value;
+                  }
+                  return acc;
+                }, base);
+              })
+              // De-dupe by content (change the key if you want stricter uniqueness)
+              .reduce(
+                (acc, msg) => {
+                  const key = String(msg.content); // e.g. `${msg.role}::${msg.content}` for stronger uniqueness
+                  if (!acc.seen.has(key)) {
+                    acc.seen.add(key);
+                    acc.items.push(msg);
                   }
+                  return acc;
+                },
+                { seen: new Set(), items: [] }
+              ).items;
 
-                  return ({
-                    id: idGenerator(message.role),
-                    content: message.content,
-                    role: message.role,
-                    time,
-                    entities: message.entities ?? {},
-                    context: message.context ?? {},
-                    mediaUrls: message.mediaUrls
-                  });
-                })
-            ]
-              .reduce((accumulator, message) => {
-                if (!accumulator.find(m => m.content === message.content)) accumulator.push(message);
-                return accumulator;
-              }, []);
 
             if (lastAgentMessage && lastAgentMessage.content && addedMessages.some((message) => message.content === lastAgentMessage.content)) {
               // Error should not have happened

package/types/index.d.ts

@@ -459,6 +459,11 @@ declare module '@scout9/app' {
 	   */
 	  id?: string;
 
+	  /**
+	   * What type of entity this represents
+	   */
+	  type: 'reference' | 'entity';
+
 	  /**
 	   * The corpus definitions used to compute embeddings for NLP models.
 	   */
@@ -1721,7 +1726,7 @@ declare module '@scout9/app/schemas' {
 			} | undefined;
 		}>, "many">;
 		entities: z.ZodArray<z.ZodEffects<z.ZodObject<{
-			type: z.ZodOptional<z.ZodEnum<["entity", "reference"]>>;
+			type: z.ZodEnum<["entity", "reference"]>;
 			id: z.ZodOptional<z.ZodString>;
 			model: z.ZodOptional<z.ZodAny>;
 			references: z.ZodOptional<z.ZodString>;
@@ -1798,6 +1803,7 @@ declare module '@scout9/app/schemas' {
 				DELETE?: boolean | undefined;
 			}>>;
 		}, "strict", z.ZodTypeAny, {
+			type: "entity" | "reference";
 			entity: string;
 			entities: string[];
 			api: {
@@ -1808,7 +1814,6 @@ declare module '@scout9/app/schemas' {
 				PATCH?: boolean | undefined;
 				DELETE?: boolean | undefined;
 			} | null;
-			type?: "entity" | "reference" | undefined;
 			id?: string | undefined;
 			model?: any;
 			references?: string | undefined;
@@ -1829,6 +1834,7 @@ declare module '@scout9/app/schemas' {
 				};
 			}[] | undefined;
 		}, {
+			type: "entity" | "reference";
 			entity: string;
 			entities: string[];
 			api: {
@@ -1839,7 +1845,6 @@ declare module '@scout9/app/schemas' {
 				PATCH?: boolean | undefined;
 				DELETE?: boolean | undefined;
 			} | null;
-			type?: "entity" | "reference" | undefined;
 			id?: string | undefined;
 			model?: any;
 			references?: string | undefined;
@@ -1860,6 +1865,7 @@ declare module '@scout9/app/schemas' {
 				};
 			}[] | undefined;
 		}>, {
+			type: "entity" | "reference";
 			entity: string;
 			entities: string[];
 			api: {
@@ -1870,7 +1876,6 @@ declare module '@scout9/app/schemas' {
 				PATCH?: boolean | undefined;
 				DELETE?: boolean | undefined;
 			} | null;
-			type?: "entity" | "reference" | undefined;
 			id?: string | undefined;
 			model?: any;
 			references?: string | undefined;
@@ -1891,6 +1896,7 @@ declare module '@scout9/app/schemas' {
 				};
 			}[] | undefined;
 		}, {
+			type: "entity" | "reference";
 			entity: string;
 			entities: string[];
 			api: {
@@ -1901,7 +1907,6 @@ declare module '@scout9/app/schemas' {
 				PATCH?: boolean | undefined;
 				DELETE?: boolean | undefined;
 			} | null;
-			type?: "entity" | "reference" | undefined;
 			id?: string | undefined;
 			model?: any;
 			references?: string | undefined;
@@ -2005,6 +2010,7 @@ declare module '@scout9/app/schemas' {
 			} | undefined;
 		}[];
 		entities: {
+			type: "entity" | "reference";
 			entity: string;
 			entities: string[];
 			api: {
@@ -2015,7 +2021,6 @@ declare module '@scout9/app/schemas' {
 				PATCH?: boolean | undefined;
 				DELETE?: boolean | undefined;
 			} | null;
-			type?: "entity" | "reference" | undefined;
 			id?: string | undefined;
 			model?: any;
 			references?: string | undefined;
@@ -2135,6 +2140,7 @@ declare module '@scout9/app/schemas' {
 			} | undefined;
 		}[];
 		entities: {
+			type: "entity" | "reference";
 			entity: string;
 			entities: string[];
 			api: {
@@ -2145,7 +2151,6 @@ declare module '@scout9/app/schemas' {
 				PATCH?: boolean | undefined;
 				DELETE?: boolean | undefined;
 			} | null;
-			type?: "entity" | "reference" | undefined;
 			id?: string | undefined;
 			model?: any;
 			references?: string | undefined;
@@ -2228,7 +2233,7 @@ declare module '@scout9/app/schemas' {
 	export const EntityConfigurationSchema: z.ZodEffects<z.ZodObject<{
 		id: z.ZodOptional<z.ZodString>;
 		model: z.ZodOptional<z.ZodAny>;
-		type: z.ZodOptional<z.ZodEnum<["entity", "reference"]>>;
+		type: z.ZodEnum<["entity", "reference"]>;
 		references: z.ZodOptional<z.ZodString>;
 		definitions: z.ZodOptional<z.ZodArray<z.ZodObject<{
 			utterance: z.ZodOptional<z.ZodString>;
@@ -2279,9 +2284,9 @@ declare module '@scout9/app/schemas' {
 			};
 		}>, "many">>;
 	}, "strict", z.ZodTypeAny, {
+		type: "entity" | "reference";
 		id?: string | undefined;
 		model?: any;
-		type?: "entity" | "reference" | undefined;
 		references?: string | undefined;
 		definitions?: {
 			value: string;
@@ -2300,9 +2305,9 @@ declare module '@scout9/app/schemas' {
 			};
 		}[] | undefined;
 	}, {
+		type: "entity" | "reference";
 		id?: string | undefined;
 		model?: any;
-		type?: "entity" | "reference" | undefined;
 		references?: string | undefined;
 		definitions?: {
 			value: string;
@@ -2321,9 +2326,9 @@ declare module '@scout9/app/schemas' {
 			};
 		}[] | undefined;
 	}>, {
+		type: "entity" | "reference";
 		id?: string | undefined;
 		model?: any;
-		type?: "entity" | "reference" | undefined;
 		references?: string | undefined;
 		definitions?: {
 			value: string;
@@ -2342,9 +2347,9 @@ declare module '@scout9/app/schemas' {
 			};
 		}[] | undefined;
 	}, {
+		type: "entity" | "reference";
 		id?: string | undefined;
 		model?: any;
-		type?: "entity" | "reference" | undefined;
 		references?: string | undefined;
 		definitions?: {
 			value: string;
@@ -2366,7 +2371,7 @@ declare module '@scout9/app/schemas' {
 	export const EntitiesRootConfigurationSchema: z.ZodArray<z.ZodEffects<z.ZodObject<{
 		id: z.ZodOptional<z.ZodString>;
 		model: z.ZodOptional<z.ZodAny>;
-		type: z.ZodOptional<z.ZodEnum<["entity", "reference"]>>;
+		type: z.ZodEnum<["entity", "reference"]>;
 		references: z.ZodOptional<z.ZodString>;
 		definitions: z.ZodOptional<z.ZodArray<z.ZodObject<{
 			utterance: z.ZodOptional<z.ZodString>;
@@ -2417,9 +2422,9 @@ declare module '@scout9/app/schemas' {
 			};
 		}>, "many">>;
 	}, "strict", z.ZodTypeAny, {
+		type: "entity" | "reference";
 		id?: string | undefined;
 		model?: any;
-		type?: "entity" | "reference" | undefined;
 		references?: string | undefined;
 		definitions?: {
 			value: string;
@@ -2438,9 +2443,9 @@ declare module '@scout9/app/schemas' {
 			};
 		}[] | undefined;
 	}, {
+		type: "entity" | "reference";
 		id?: string | undefined;
 		model?: any;
-		type?: "entity" | "reference" | undefined;
 		references?: string | undefined;
 		definitions?: {
 			value: string;
@@ -2459,9 +2464,9 @@ declare module '@scout9/app/schemas' {
 			};
 		}[] | undefined;
 	}>, {
+		type: "entity" | "reference";
 		id?: string | undefined;
 		model?: any;
-		type?: "entity" | "reference" | undefined;
 		references?: string | undefined;
 		definitions?: {
 			value: string;
@@ -2480,9 +2485,9 @@ declare module '@scout9/app/schemas' {
 			};
 		}[] | undefined;
 	}, {
+		type: "entity" | "reference";
 		id?: string | undefined;
 		model?: any;
-		type?: "entity" | "reference" | undefined;
 		references?: string | undefined;
 		definitions?: {
 			value: string;
@@ -2505,7 +2510,7 @@ declare module '@scout9/app/schemas' {
 	 * @TODO why type extend not valid?
 	 */
 	export const EntityRootProjectConfigurationSchema: z.ZodEffects<z.ZodObject<{
-		type: z.ZodOptional<z.ZodEnum<["entity", "reference"]>>;
+		type: z.ZodEnum<["entity", "reference"]>;
 		id: z.ZodOptional<z.ZodString>;
 		model: z.ZodOptional<z.ZodAny>;
 		references: z.ZodOptional<z.ZodString>;
@@ -2582,6 +2587,7 @@ declare module '@scout9/app/schemas' {
 			DELETE?: boolean | undefined;
 		}>>;
 	}, "strict", z.ZodTypeAny, {
+		type: "entity" | "reference";
 		entity: string;
 		entities: string[];
 		api: {
@@ -2592,7 +2598,6 @@ declare module '@scout9/app/schemas' {
 			PATCH?: boolean | undefined;
 			DELETE?: boolean | undefined;
 		} | null;
-		type?: "entity" | "reference" | undefined;
 		id?: string | undefined;
 		model?: any;
 		references?: string | undefined;
@@ -2613,6 +2618,7 @@ declare module '@scout9/app/schemas' {
 			};
 		}[] | undefined;
 	}, {
+		type: "entity" | "reference";
 		entity: string;
 		entities: string[];
 		api: {
@@ -2623,7 +2629,6 @@ declare module '@scout9/app/schemas' {
 			PATCH?: boolean | undefined;
 			DELETE?: boolean | undefined;
 		} | null;
-		type?: "entity" | "reference" | undefined;
 		id?: string | undefined;
 		model?: any;
 		references?: string | undefined;
@@ -2644,6 +2649,7 @@ declare module '@scout9/app/schemas' {
 			};
 		}[] | undefined;
 	}>, {
+		type: "entity" | "reference";
 		entity: string;
 		entities: string[];
 		api: {
@@ -2654,7 +2660,6 @@ declare module '@scout9/app/schemas' {
 			PATCH?: boolean | undefined;
 			DELETE?: boolean | undefined;
 		} | null;
-		type?: "entity" | "reference" | undefined;
 		id?: string | undefined;
 		model?: any;
 		references?: string | undefined;
@@ -2675,6 +2680,7 @@ declare module '@scout9/app/schemas' {
 			};
 		}[] | undefined;
 	}, {
+		type: "entity" | "reference";
 		entity: string;
 		entities: string[];
 		api: {
@@ -2685,7 +2691,6 @@ declare module '@scout9/app/schemas' {
 			PATCH?: boolean | undefined;
 			DELETE?: boolean | undefined;
 		} | null;
-		type?: "entity" | "reference" | undefined;
 		id?: string | undefined;
 		model?: any;
 		references?: string | undefined;
@@ -2707,7 +2712,7 @@ declare module '@scout9/app/schemas' {
 		}[] | undefined;
 	}>;
 	export const EntitiesRootProjectConfigurationSchema: z.ZodArray<z.ZodEffects<z.ZodObject<{
-		type: z.ZodOptional<z.ZodEnum<["entity", "reference"]>>;
+		type: z.ZodEnum<["entity", "reference"]>;
 		id: z.ZodOptional<z.ZodString>;
 		model: z.ZodOptional<z.ZodAny>;
 		references: z.ZodOptional<z.ZodString>;
@@ -2784,6 +2789,7 @@ declare module '@scout9/app/schemas' {
 			DELETE?: boolean | undefined;
 		}>>;
 	}, "strict", z.ZodTypeAny, {
+		type: "entity" | "reference";
 		entity: string;
 		entities: string[];
 		api: {
@@ -2794,7 +2800,6 @@ declare module '@scout9/app/schemas' {
 			PATCH?: boolean | undefined;
 			DELETE?: boolean | undefined;
 		} | null;
-		type?: "entity" | "reference" | undefined;
 		id?: string | undefined;
 		model?: any;
 		references?: string | undefined;
@@ -2815,6 +2820,7 @@ declare module '@scout9/app/schemas' {
 			};
 		}[] | undefined;
 	}, {
+		type: "entity" | "reference";
 		entity: string;
 		entities: string[];
 		api: {
@@ -2825,7 +2831,6 @@ declare module '@scout9/app/schemas' {
 			PATCH?: boolean | undefined;
 			DELETE?: boolean | undefined;
 		} | null;
-		type?: "entity" | "reference" | undefined;
 		id?: string | undefined;
 		model?: any;
 		references?: string | undefined;
@@ -2846,6 +2851,7 @@ declare module '@scout9/app/schemas' {
 			};
 		}[] | undefined;
 	}>, {
+		type: "entity" | "reference";
 		entity: string;
 		entities: string[];
 		api: {
@@ -2856,7 +2862,6 @@ declare module '@scout9/app/schemas' {
 			PATCH?: boolean | undefined;
 			DELETE?: boolean | undefined;
 		} | null;
-		type?: "entity" | "reference" | undefined;
 		id?: string | undefined;
 		model?: any;
 		references?: string | undefined;
@@ -2877,6 +2882,7 @@ declare module '@scout9/app/schemas' {
 			};
 		}[] | undefined;
 	}, {
+		type: "entity" | "reference";
 		entity: string;
 		entities: string[];
 		api: {
@@ -2887,7 +2893,6 @@ declare module '@scout9/app/schemas' {
 			PATCH?: boolean | undefined;
 			DELETE?: boolean | undefined;
 		} | null;
-		type?: "entity" | "reference" | undefined;
 		id?: string | undefined;
 		model?: any;
 		references?: string | undefined;