agentlang 0.0.10 → 0.0.11

package/src/language/syntax.ts

@@ -39,9 +39,9 @@ export class BasePattern {
 
   private aliasesAsString(): string | undefined {
     if (this.alias) {
-      return ` as ${this.alias}`;
+      return ` @as ${this.alias}`;
     } else if (this.aliases) {
-      return ` as [${this.aliases.join(',')}]`;
+      return ` @as [${this.aliases.join(',')}]`;
     } else {
       return undefined;
     }

package/src/runtime/agents/common.ts

@@ -92,24 +92,24 @@ Note the value passed to the 'salary' attribute - it's an arithmetic expression.
 A successful query pattern will return an array of instances. The 'for' pattern can be used to iterate over an array. An example follows:
 
 workflow NotifyEmployees {
-    {Erp/Employee {salary?> 1000}} as employees;
+    {Erp/Employee {salary?> 1000}} @as employees;
     for emp in employees {
         {Erp/SendMail {email emp.email, body "You are selected for an increment!"}}
     }
 }
 
-Also note the use of the 'as' keyword - this binds the result of a pattern to an 'alias'. Here the result of the query is bound to the
+Also note the use of the '@as' keyword - this binds the result of a pattern to an 'alias'. Here the result of the query is bound to the
 alias named 'employees'. Any pattern can have an alias, including 'if' and 'for'. An alias can be used to refer to the attributes of the instance, 
 via the dot(.) notation. Aliases can also be used to destructure a query result - here's an example:
 
 workflow FindFirstTwoEmployees {
-    {Erp/Employee {salary?> 1000}} as [emp1, emp2];
+    {Erp/Employee {salary?> 1000}} @as [emp1, emp2];
     [emp1, emp2]
 }
 
 This alias will bind the first two instances to 'a' and 'b' and the rest of the instances to an array named 'xs':
 
-{SomeEntity {id?> 1}} as [a, b, _, xs]
+{SomeEntity {id?> 1}} @as [a, b, _, xs]
 
 Examples of binding aliases to 'if' and 'for':
 
@@ -117,11 +117,11 @@ if (IncrementSalary.percentage > 10) {
     {Erp/Employee {employeeId IncrementSalary.employeeId, salary salary + salary * IncrementSalary.percentage}}
 } else {
     {Erp/Employee {employeeId IncrementSalary.employeeId, salary salary + 1500}}
-} as emp
+} @as emp
 
 for emp in employees {
     {Erp/SendMail {email emp.email, body "You are selected for an increment!"}}
-} as emails
+} @as emails
 
 Make sure all references based on a preceding pattern is based either on an actual alias or the name of the workflow. For example, the following sequence of patterns
 are invalid, because the alias 'employee' is not defined:
@@ -131,7 +131,7 @@ are invalid, because the alias 'employee' is not defined:
 
 A fix for the reference-error is shown below:
 
-{Employee {id? 101}} as employee;
+{Employee {id? 101}} @as employee;
 {SendEmail {to employee.email, body "hello"}}
 
 Entities in a module can be connected together in relationships. There are two types of relationships - 'contains' and 'between'.
@@ -198,7 +198,7 @@ fill-in values from the available context. For example, if your instruction is "
 'please call me as soon as possible'", the best workflow to return is:
 
 workflow sendEmail {
-    {employee {id? 101}} as emp;
+    {employee {id? 101}} @as emp;
     {email {to emp.email body "please call me as soon as possible"}}
 }
 
@@ -206,7 +206,7 @@ because all the information needed is available in the context. If the instructi
 'please call me as soon as possible'", then you can return:
 
 workflow sendEmail {
-    {employee {id? sendEmail.employeeId}} as emp;
+    {employee {id? sendEmail.employeeId}} @as emp;
     {email {to emp.email body "please call me as soon as possible"}}
 }
 
@@ -215,7 +215,7 @@ The point is use the immediate context to fill-in values in generated patterns,
 Also generate a workflow only if required explicitly by the user or the contextual information is incomplete. Otherwise, just return an array of patterns.
 As an example, if the user request is "send an email to employee 101 with this message - 'please call me as soon as possible'", you must return:
 
-[{employee {id? 101}} as emp;
+[{employee {id? 101}} @as emp;
  {email {to emp.email, body "please call me as soon as possible"}}]
 
 Note that each pattern in the array is separated by a ; and not a comma(,).

package/src/runtime/interpreter.ts

@@ -114,6 +114,7 @@ export class Environment extends Instance {
   private activeUser: string = AdminUserId;
   private activeUserSet: boolean = false;
   private lastResult: Result;
+  private returnFlag: boolean = false;
   private parentPath: string | undefined;
   private normalizedParentPath: string | undefined;
   private betweenRelInfo: BetweenRelInfo | undefined;
@@ -222,6 +223,17 @@ export class Environment extends Instance {
     return this;
   }
 
+  static SuspensionUserData = '^';
+
+  bindSuspensionUserData(userData: string): Environment {
+    this.bind(Environment.SuspensionUserData, userData);
+    return this;
+  }
+
+  lookupSuspensionUserData(): string | undefined {
+    return this.lookup(Environment.SuspensionUserData);
+  }
+
   maybeLookupAgentInstance(entryName: string): Instance | undefined {
     const v = this.lookup(entryName);
     if (v && isInstanceOfType(v, AgentFqName)) {
@@ -263,6 +275,18 @@ export class Environment extends Instance {
     }
   }
 
+  markForReturn(): Environment {
+    if (this.parent) {
+      this.parent.markForReturn();
+    }
+    this.returnFlag = true;
+    return this;
+  }
+
+  isMarkedForReturn(): boolean {
+    return this.returnFlag;
+  }
+
   protected propagateSuspension(suspId: string) {
     this.suspensionId = suspId;
     if (this.parent) {
@@ -597,6 +621,8 @@ export async function evaluateStatements(
         env.setLastResult({ suspension: suspId || 'null' });
         break;
       }
+    } else if (env.isMarkedForReturn()) {
+      break;
     }
   }
   if (continuation != undefined) {
@@ -735,6 +761,9 @@ async function evaluatePattern(pat: Pattern, env: Environment): Promise<void> {
     await evaluatePurge(pat.purge, env);
   } else if (pat.fullTextSearch) {
     await evaluateFullTextSearch(pat.fullTextSearch, env);
+  } else if (pat.return) {
+    await evaluatePattern(pat.return.pat, env);
+    env.markForReturn();
   }
 }
 

package/src/runtime/jsmodules.ts

@@ -17,7 +17,7 @@ export async function importModule(path: string, name: string, moduleFileName?:
     }
     path = `${s}${sep}${path}`;
   }
-  if (!(path.startsWith(sep) || path.startsWith('.'))) {
+  if ((path.startsWith(sep) || path.startsWith('.')) && moduleFileName) {
     path = process.cwd() + sep + path;
   }
   const m = await import(/* @vite-ignore */ path);

package/src/runtime/loader.ts

@@ -45,6 +45,7 @@ import {
   addAgent,
 } from './module.js';
 import {
+  escapeSpecialChars,
   findRbacSchema,
   isString,
   makeFqName,
@@ -446,8 +447,10 @@ async function addAgentDefinition(def: AgentDefinition, moduleName: string) {
       hasUserLlm = true;
     }
     const ov = v;
-    if (apdef.value.str || apdef.value.id || apdef.value.array) {
+    if (apdef.value.id || apdef.value.array) {
       v = `"${v}"`;
+    } else if (apdef.value.str) {
+      v = `"${escapeSpecialChars(v)}"`;
     }
     attrsStrs.push(`${apdef.name} ${v}`);
     attrs.set(apdef.name, ov);

package/src/runtime/modules/ai.ts

@@ -43,7 +43,7 @@ entity agentChatSession {
 }
 
 workflow findAgentChatSession {
-  {agentChatSession {id? findAgentChatSession.id}} as [sess];
+  {agentChatSession {id? findAgentChatSession.id}} @as [sess];
   sess
 }
 

package/src/runtime/modules/auth.ts

@@ -29,7 +29,7 @@ export const CoreAuthModuleName = makeCoreModuleName('auth');
 
 export default `module ${CoreAuthModuleName}
 
-import "./modules/auth.js" as Auth
+import "./modules/auth.js" @as Auth
 
 entity User {
     id UUID @id @default(uuid()),
@@ -52,12 +52,12 @@ workflow CreateUser {
 }
 
 workflow FindUser {
-  {User {id? FindUser.id}} as [user];
+  {User {id? FindUser.id}} @as [user];
   user
 }
 
 workflow FindUserByEmail {
-  {User {email? FindUserByEmail.email}} as [user];
+  {User {email? FindUserByEmail.email}} @as [user];
   user
 }
 
@@ -83,19 +83,19 @@ workflow CreateRole {
 }
 
 workflow FindRole {
-    {Role {name? FindRole.name}} as [role];
+    {Role {name? FindRole.name}} @as [role];
     role
 }
 
 workflow AssignUserToRole {
-    {User {id? AssignUserToRole.userId}} as [user];
-    {Role {name? AssignUserToRole.roleName}} as [role];
+    {User {id? AssignUserToRole.userId}} @as [user];
+    {Role {name? AssignUserToRole.roleName}} @as [role];
     {UserRole {User user, Role role}, @upsert}
 }
 
 workflow AssignUserToRoleByEmail {
-    {User {email? AssignUserToRoleByEmail.email}} as [user];
-    {Role {name? AssignUserToRoleByEmail.roleName}} as [role];
+    {User {email? AssignUserToRoleByEmail.email}} @as [user];
+    {Role {name? AssignUserToRoleByEmail.roleName}} @as [role];
     {UserRole {User user, Role role}, @upsert}
 }
 
@@ -116,8 +116,8 @@ workflow CreatePermission {
 }
 
 workflow AddPermissionToRole {
-    {Role {name? AddPermissionToRole.roleName}} as role;
-    {Permission {id? AddPermissionToRole.permissionId}} as perm;
+    {Role {name? AddPermissionToRole.roleName}} @as role;
+    {Permission {id? AddPermissionToRole.permissionId}} @as perm;
     {RolePermission {Role role, Permission perm}, @upsert}
 }
 
@@ -154,12 +154,12 @@ workflow UpdateSession {
 }
 
 workflow FindSession {
-  {Session {id? FindSession.id}} as [session];
+  {Session {id? FindSession.id}} @as [session];
   session
 }
 
 workflow FindUserSession {
-  {Session {userId? FindUserSession.userId}} as [session];
+  {Session {userId? FindUserSession.userId}} @as [session];
   session
 }
 
@@ -168,7 +168,7 @@ workflow RemoveSession {
 }
 
 workflow RemoveUserSession {
-  {Session {userId? RemoveUserSession.id}} as [session];
+  {Session {userId? RemoveUserSession.id}} @as [session];
   purge {Session {id? session.id}}
 }
 
@@ -837,10 +837,14 @@ export async function refreshUserToken(refreshToken: string, env: Environment):
 }
 
 export function requireAuth(moduleName: string, eventName: string): boolean {
-  const f =
-    moduleName == CoreAuthModuleName &&
-    (eventName == 'login' || eventName == 'signup' || eventName == 'refreshToken');
-  return !f;
+  if (isAuthEnabled()) {
+    const f =
+      moduleName == CoreAuthModuleName &&
+      (eventName == 'login' || eventName == 'signup' || eventName == 'refreshToken');
+    return !f;
+  } else {
+    return false;
+  }
 }
 
 // Export getHttpStatusForError for use in HTTP handlers

package/src/runtime/modules/core.ts

@@ -11,10 +11,12 @@ import {
 import { logger } from '../logger.js';
 import { Statement } from '../../language/generated/ast.js';
 import { parseStatements } from '../../language/parser.js';
+import { Resolver } from '../resolvers/interface.js';
+import { PathAttributeName } from '../defs.js';
 
 const CoreModuleDefinition = `module ${DefaultModuleName}
 
-import "./modules/core.js" as Core
+import "./modules/core.js" @as Core
 
 entity timer {
   name String @id,
@@ -42,6 +44,14 @@ entity suspension {
   createdBy String
 }
 
+entity activeSuspension {
+  id UUID @id
+}
+
+resolver servicenow ["${DefaultModuleName}/activeSuspension"] {
+    query Core.lookupActiveSuspension
+}
+
 workflow createSuspension {
   {suspension 
     {id createSuspension.id
@@ -51,7 +61,7 @@ workflow createSuspension {
 }
 
 workflow restartSuspension {
-  await Core.restartSuspension(restartSuspension.id)
+  await Core.restartSuspension(restartSuspension.id, restartSuspension.data)
 }
 `;
 export const CoreModules: string[] = [];
@@ -191,9 +201,14 @@ async function deleteSuspension(suspId: string, env?: Environment): Promise<any>
   }
 }
 
-export async function restartSuspension(suspId: string, env?: Environment): Promise<any> {
+export async function restartSuspension(
+  suspId: string,
+  userData: string,
+  env?: Environment
+): Promise<any> {
   const susp = await loadSuspension(suspId, env);
   if (susp) {
+    susp.env.bindSuspensionUserData(userData);
     await evaluateStatements(susp.continuation, susp.env);
     await deleteSuspension(suspId, env);
     return susp.env.getLastResult();
@@ -202,3 +217,23 @@ export async function restartSuspension(suspId: string, env?: Environment): Prom
     return undefined;
   }
 }
+
+export async function lookupActiveSuspension(
+  resolver: Resolver,
+  inst: Instance,
+  queryAll: boolean
+) {
+  if (!queryAll) {
+    const data = inst.lookupQueryVal(PathAttributeName).split('/')[1];
+    if (data) {
+      const parts = data.split(':');
+      const id = parts[0];
+      const userData = parts[1];
+      return await restartSuspension(id, userData, resolver.getEnvironment());
+    } else {
+      return [];
+    }
+  } else {
+    return [];
+  }
+}

package/src/syntaxes/agentlang.monarch.ts

@@ -1,7 +1,7 @@
 // Monarch syntax highlighting for the agentlang language.
 export default {
     keywords: [
-        '@actions','@after','@async','@before','@enum','@expr','@from','@meta','@oneof','@rbac','@ref','@upsert','@with_unique','agent','allow','and','as','await','between','catch','contains','create','delete','else','entity','error','event','extends','false','for','if','import','in','into','like','module','not','not_found','onSubscription','or','purge','query','read','record','relationship','resolver','roles','subscribe','true','update','upsert','where','workflow'
+        '@actions','@after','@as','@async','@before','@catch','@enum','@expr','@from','@meta','@oneof','@rbac','@ref','@upsert','@with_unique','agent','allow','and','await','between','contains','create','delete','else','entity','error','event','extends','false','for','if','import','in','into','like','module','not','not_found','onSubscription','or','purge','query','read','record','relationship','resolver','return','roles','subscribe','true','update','upsert','where','workflow'
     ],
     operators: [
         '*','+',',','-','.','/',':',';','<','<=','<>','=','>','>=','?','@'