agentlang 0.6.1 → 0.6.3

package/package.json

@@ -1,186 +1,187 @@
 {
-  "name": "agentlang",
-  "description": "The easiest way to build the most reliable AI agents - enterprise-grade teams of AI agents that collaborate with each other and humans",
-  "version": "0.6.1",
-  "license": "Sustainable Use License",
-  "author": "agentlang-ai",
-  "homepage": "https://github.com/agentlang-ai/agentlang#readme",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/agentlang-ai/agentlang.git"
-  },
-  "bugs": {
-    "url": "https://github.com/agentlang-ai/agentlang/issues"
-  },
-  "keywords": [
-    "agentlang",
-    "agents-generation",
-    "ai-agents",
-    "enterprise",
-    "multi-agent",
-    "no-code",
-    "agent-teams",
-    "production-ready"
-  ],
-  "files": [
-    "bin",
-    "out",
-    "src",
-    "LICENSE"
-  ],
-  "type": "module",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "dependencies": {
-    "@aws-sdk/client-cognito-identity": "^3.828.0",
-    "@aws-sdk/client-cognito-identity-provider": "^3.828.0",
-    "@aws-sdk/credential-providers": "^3.828.0",
-    "@isomorphic-git/lightning-fs": "^4.6.1",
-    "@langchain/anthropic": "^0.3.32",
-    "@langchain/core": "^0.3.78",
-    "@langchain/openai": "^0.6.16",
-    "@types/jsonwebtoken": "^9.0.10",
-    "@types/multer": "^1.4.5-lts.1",
-    "amazon-cognito-identity-js": "^6.3.15",
-    "aws-jwt-verify": "^5.1.0",
-    "bcryptjs": "^3.0.2",
-    "buffer": "^6.0.3",
-    "chalk": "~5.3.0",
-    "commander": "~11.0.0",
-    "express": "^5.1.0",
-    "handlebars": "^4.7.8",
-    "jsonwebtoken": "^9.0.2",
-    "langchain": "^0.3.36",
-    "langium": "^3.5.0",
-    "multer": "^1.4.5-lts.1",
-    "openapi-client-axios": "^7.6.0",
-    "pg": "^8.16.1",
-    "pgvector": "^0.2.1",
-    "sql.js": "^1.13.0",
-    "sqlite3": "^5.1.7",
-    "typeorm": "^0.3.25",
-    "vscode-languageserver": "^9.0.1",
-    "winston": "^3.17.0",
-    "winston-daily-rotate-file": "^5.0.0",
-    "zod": "^3.25.55"
-  },
-  "overrides": {
-    "semver": "^7.5.3",
-    "trim-newlines": ">=3.0.1"
-  },
-  "devDependencies": {
-    "@codingame/esbuild-import-meta-url-plugin": "~1.0.2",
-    "@eslint/js": "^9.26.0",
-    "@types/cookie-parser": "^1.4.9",
-    "@types/express": "^5.0.1",
-    "@types/node": "^18.19.110",
-    "@types/sql.js": "^1.4.9",
-    "@types/vscode": "^1.100.0",
-    "@typescript-eslint/eslint-plugin": "~8.32.1",
-    "@typescript-eslint/parser": "~8.32.1",
-    "brace-expansion": ">=2.0.2",
-    "concurrently": "~8.2.1",
-    "esbuild": "^0.25.4",
-    "eslint": "~9.26.0",
-    "generator-langium": "^3.0.0",
-    "http-server": "~14.1.1",
-    "langium-cli": "^3.5.0",
-    "nodemon": "^3.1.10",
-    "prettier": "^3.5.3",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.32.1",
-    "vite": "^6.3.5",
-    "vite-plugin-node-polyfills": "^0.24.0",
-    "vitest": "^3.1.3",
-    "vscode-languageclient": "^9.0.1",
-    "vscode-uri": "^3.1.0"
-  },
-  "volta": {
-    "node": ">=20.0.0",
-    "npm": ">=10.8.2"
-  },
-  "displayName": "agentlang",
-  "engines": {
-    "vscode": "^1.67.0",
-    "node": ">=20.0.0"
-  },
-  "categories": [
-    "Programming Languages"
-  ],
-  "contributes": {
-    "languages": [
-      {
-        "id": "agentlang",
-        "aliases": [
-          "Agentlang",
-          "agentlang"
-        ],
-        "extensions": [
-          ".al"
-        ],
-        "configuration": "./language-configuration.json"
-      }
-    ],
-    "grammars": [
-      {
-        "language": "agentlang",
-        "scopeName": "source.agentlang",
-        "path": "syntaxes/agentlang.tmLanguage.json"
-      }
-    ]
-  },
-  "activationEvents": [
-    "onLanguage:agentlang"
-  ],
-  "main": "./out/extension/main.cjs",
-  "types": "./out/index.d.ts",
-  "exports": {
-    ".": {
-      "types": "./out/index.d.ts",
-      "import": "./out/extension/main.cjs",
-      "require": "./out/extension/main.cjs"
-    },
-    "./browser": {
-      "types": "./out/browser.d.ts",
-      "import": "./out/browser.js",
-      "default": "./out/browser.js"
-    },
-    "./src/*": {
-      "types": "./out/*.d.ts",
-      "import": "./out/*.js",
-      "require": "./out/*.js",
-      "default": "./out/*.js"
-    },
-    "./out/*": "./out/*"
-  },
-  "bin": {
-    "agentlang-cli": "./bin/cli.js"
-  },
-  "lint-staged": {
-    "*.{js,ts,tsx}": [
-      "eslint --fix --cache",
-      "prettier --write"
-    ],
-    "*.{json,md,yml,yaml}": [
-      "prettier --write"
-    ]
-  },
-  "scripts": {
-    "build": "tsc -b tsconfig.src.json && tsc -b tsconfig.declarations.json && node esbuild.mjs",
-    "build:ts": "tsc -b tsconfig.src.json",
-    "watch": "concurrently -n tsc,esbuild -c blue,yellow \"tsc -b tsconfig.src.json --watch\" \"node esbuild.mjs --watch\"",
-    "lint": "eslint . --ext .ts",
-    "lint:fix": "eslint . --ext .ts --fix",
-    "format": "prettier --write \"src/**/*.{js,ts,tsx,json,md}\"",
-    "format:check": "prettier --check \"src/**/*.{js,ts,tsx,json,md}\"",
-    "langium:generate": "langium generate",
-    "langium:generate:production": "langium generate --mode=production",
-    "langium:watch": "langium generate --watch",
-    "vscode:prepublish": "npm run build && npm run lint",
-    "dev": "vite",
-    "test": "vitest run",
-    "test:verbose": "VITEST_VERBOSE=true vitest run"
-  }
-}
+	"name": "agentlang",
+	"description": "The easiest way to build the most reliable AI agents - enterprise-grade teams of AI agents that collaborate with each other and humans",
+	"version": "0.6.3",
+	"license": "Sustainable Use License",
+	"author": "agentlang-ai",
+	"homepage": "https://github.com/agentlang-ai/agentlang#readme",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/agentlang-ai/agentlang.git"
+	},
+	"bugs": {
+		"url": "https://github.com/agentlang-ai/agentlang/issues"
+	},
+	"keywords": [
+		"agentlang",
+		"agents-generation",
+		"ai-agents",
+		"enterprise",
+		"multi-agent",
+		"no-code",
+		"agent-teams",
+		"production-ready"
+	],
+	"files": [
+		"bin",
+		"out",
+		"src",
+		"LICENSE"
+	],
+	"type": "module",
+	"publishConfig": {
+		"access": "public",
+		"registry": "https://registry.npmjs.org/"
+	},
+	"scripts": {
+		"build": "tsc -b tsconfig.src.json && tsc -b tsconfig.declarations.json && node esbuild.mjs",
+		"build:ts": "tsc -b tsconfig.src.json",
+		"watch": "concurrently -n tsc,esbuild -c blue,yellow \"tsc -b tsconfig.src.json --watch\" \"node esbuild.mjs --watch\"",
+		"lint": "eslint . --ext .ts",
+		"lint:fix": "eslint . --ext .ts --fix",
+		"format": "prettier --write \"src/**/*.{js,ts,tsx,json,md}\"",
+		"format:check": "prettier --check \"src/**/*.{js,ts,tsx,json,md}\"",
+		"langium:generate": "langium generate",
+		"langium:generate:production": "langium generate --mode=production",
+		"langium:watch": "langium generate --watch",
+		"vscode:prepublish": "npm run build && npm run lint",
+		"dev": "vite",
+		"test": "vitest run",
+		"test:verbose": "VITEST_VERBOSE=true vitest run"
+	},
+	"dependencies": {
+		"@aws-sdk/client-cognito-identity": "^3.828.0",
+		"@aws-sdk/client-cognito-identity-provider": "^3.828.0",
+		"@aws-sdk/credential-providers": "^3.828.0",
+		"@isomorphic-git/lightning-fs": "^4.6.1",
+		"@langchain/anthropic": "^0.3.32",
+		"@langchain/core": "^0.3.78",
+		"@langchain/openai": "^0.6.16",
+		"@types/jsonwebtoken": "^9.0.10",
+		"@types/multer": "^1.4.5-lts.1",
+		"amazon-cognito-identity-js": "^6.3.15",
+		"aws-jwt-verify": "^5.1.0",
+		"bcryptjs": "^3.0.2",
+		"buffer": "^6.0.3",
+		"chalk": "~5.3.0",
+		"commander": "~11.0.0",
+		"express": "^5.1.0",
+		"handlebars": "^4.7.8",
+		"jsonwebtoken": "^9.0.2",
+		"langchain": "^0.3.36",
+		"langium": "^3.5.0",
+		"multer": "^1.4.5-lts.1",
+		"openapi-client-axios": "^7.6.0",
+		"pg": "^8.16.1",
+		"pgvector": "^0.2.1",
+		"sql.js": "^1.13.0",
+		"sqlite3": "^5.1.7",
+		"typeorm": "^0.3.25",
+		"vscode-languageserver": "^9.0.1",
+		"winston": "^3.17.0",
+		"winston-daily-rotate-file": "^5.0.0",
+		"zod": "^3.25.55"
+	},
+	"overrides": {
+		"semver": "^7.5.3",
+		"trim-newlines": ">=3.0.1"
+	},
+	"devDependencies": {
+		"@codingame/esbuild-import-meta-url-plugin": "~1.0.2",
+		"@eslint/js": "^9.26.0",
+		"@types/cookie-parser": "^1.4.9",
+		"@types/express": "^5.0.1",
+		"@types/node": "^18.19.110",
+		"@types/sql.js": "^1.4.9",
+		"@types/vscode": "^1.100.0",
+		"@typescript-eslint/eslint-plugin": "~8.32.1",
+		"@typescript-eslint/parser": "~8.32.1",
+		"brace-expansion": ">=2.0.2",
+		"concurrently": "~8.2.1",
+		"esbuild": "^0.25.4",
+		"eslint": "^9.39.1",
+		"generator-langium": "^3.0.0",
+		"http-server": "~14.1.1",
+		"langium-cli": "^3.5.0",
+		"nodemon": "^3.1.10",
+		"prettier": "^3.5.3",
+		"typescript": "^5.8.3",
+		"typescript-eslint": "^8.32.1",
+		"vite": "^6.3.5",
+		"vite-plugin-node-polyfills": "^0.24.0",
+		"vitest": "^3.1.3",
+		"vscode-languageclient": "^9.0.1",
+		"vscode-uri": "^3.1.0"
+	},
+	"volta": {
+		"node": ">=20.0.0",
+		"npm": ">=10.8.2"
+	},
+	"displayName": "agentlang",
+	"engines": {
+		"vscode": "^1.67.0",
+		"node": ">=20.0.0"
+	},
+	"categories": [
+		"Programming Languages"
+	],
+	"contributes": {
+		"languages": [
+			{
+				"id": "agentlang",
+				"aliases": [
+					"Agentlang",
+					"agentlang"
+				],
+				"extensions": [
+					".al"
+				],
+				"configuration": "./language-configuration.json"
+			}
+		],
+		"grammars": [
+			{
+				"language": "agentlang",
+				"scopeName": "source.agentlang",
+				"path": "syntaxes/agentlang.tmLanguage.json"
+			}
+		]
+	},
+	"activationEvents": [
+		"onLanguage:agentlang"
+	],
+	"main": "./out/extension/main.cjs",
+	"types": "./out/index.d.ts",
+	"exports": {
+		".": {
+			"types": "./out/index.d.ts",
+			"import": "./out/extension/main.cjs",
+			"require": "./out/extension/main.cjs"
+		},
+		"./browser": {
+			"types": "./out/browser.d.ts",
+			"import": "./out/browser.js",
+			"default": "./out/browser.js"
+		},
+		"./src/*": {
+			"types": "./out/*.d.ts",
+			"import": "./out/*.js",
+			"require": "./out/*.js",
+			"default": "./out/*.js"
+		},
+		"./out/*": "./out/*"
+	},
+	"bin": {
+		"agentlang-cli": "./bin/cli.js"
+	},
+	"lint-staged": {
+		"*.{js,ts,tsx}": [
+			"eslint --fix --cache",
+			"prettier --write"
+		],
+		"*.{json,md,yml,yaml}": [
+			"prettier --write"
+		]
+	},
+	"packageManager": "pnpm@10.22.0"
+}

package/src/api/http.ts

@@ -36,8 +36,14 @@ import {
   DefaultFileHandlingDirectory,
   splitRefs,
   splitFqName,
+  escapeSepInPath,
 } from '../runtime/util.js';
-import { BadRequestError, PathAttributeNameQuery, UnauthorisedError } from '../runtime/defs.js';
+import {
+  BadRequestError,
+  isPathAttribute,
+  PathAttributeNameQuery,
+  UnauthorisedError,
+} from '../runtime/defs.js';
 import { evaluate } from '../runtime/interpreter.js';
 import { Config } from '../runtime/state.js';
 import {
@@ -225,6 +231,9 @@ function patternFromAttributes(
     if (av instanceof Object) {
       av = JSON.stringify(av);
     }
+    if (isPathAttribute(n)) {
+      av = escapeSepInPath(av);
+    }
     attrsStrs.push(`${n} ${av}`);
   });
   return `{${moduleName}/${recName} { ${attrsStrs.join(',\n')} }}`;
@@ -416,10 +425,11 @@ function queryPatternFromPath(path: string, req: Request): string {
       const ns = nameToPath(n);
       const pe = ns.getEntryName();
       const pm = ns.hasModule() ? ns.getModuleName() : moduleName;
-      const p = parts.slice(0, parts.length - 2).join('/');
+      const p = escapeSepInPath(parts.slice(0, parts.length - 2).join('/'));
       return `{${pm}/${pe} {${PathAttributeNameQuery} "${p}"}, ${relName} {${moduleName}/${entityName}? {}}}`;
     }
     entityName = restoreFqName(entityName);
+    path = escapeSepInPath(path);
     if (id === undefined) {
       return `{${moduleName}/${entityName} {${PathAttributeNameQuery}like "${path}%"}}`;
     } else {
@@ -496,7 +506,7 @@ function createChildPattern(moduleName: string, entityName: string, req: Request
     const pinfo = parts.slice(-4);
     const parentFqname = forceAsFqName(pinfo[0], moduleName);
     const relName = forceAsFqName(pinfo[2], moduleName);
-    const parentPath = parts.slice(0, parts.length - 2).join('/');
+    const parentPath = escapeSepInPath(parts.slice(0, parts.length - 2).join('/'));
     const childFqName = forceAsFqName(pinfo[3], moduleName);
     const cparts = nameToPath(childFqName);
     const childModuleName = cparts.getModuleName();

package/src/language/agentlang.langium

@@ -129,7 +129,7 @@ CrudMapBody: '{' (attributes+=SetAttribute (',' attributes+=SetAttribute)*)+ pro
 
 SelectIntoSpec: '@into' '{' entries+=SelectIntoEntry (',' entries+=SelectIntoEntry)* '}';
 
-SelectIntoEntry: alias=ID attribute=Ref;
+SelectIntoEntry: alias=ID (':')? attribute=Ref;
 
 JoinSpec: type=JoinType name=QualifiedName '{' lhs=QueryId op=SqlComparisonOpr? rhs=Ref '}';
 
@@ -186,7 +186,7 @@ ResolverFnName: name=(ID | Ref | STRING);
 
 ResolverMethodName: name=('create' | 'update' | 'upsert' | 'delete' | 'query' | 'subscribe' | 'onSubscription' | 'startTransaction' | 'commitTransaction' | 'rollbackTransaction');
 
-RelationshipPattern: name=QualifiedName pattern=Pattern;
+RelationshipPattern: name=QualifiedName (':')? pattern=Pattern;
 
 CatchSpec: '@catch' '{' (handlers+=Handler)+ '}';
 

package/src/language/generated/grammar.ts

@@ -3822,6 +3822,11 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
               "arguments": []
             }
           },
+          {
+            "$type": "Keyword",
+            "value": ":",
+            "cardinality": "?"
+          },
           {
             "$type": "Assignment",
             "feature": "attribute",
@@ -5455,6 +5460,11 @@ export const AgentlangGrammar = (): Grammar => loadedAgentlangGrammar ?? (loaded
               "arguments": []
             }
           },
+          {
+            "$type": "Keyword",
+            "value": ":",
+            "cardinality": "?"
+          },
           {
             "$type": "Assignment",
             "feature": "pattern",

package/src/runtime/auth/cognito.ts

@@ -16,7 +16,7 @@ import {
   findUserByEmail,
 } from '../modules/auth.js';
 import { logger } from '../logger.js';
-import { sleepMilliseconds } from '../util.js';
+import { sleepMilliseconds, generateUrlSafePassword } from '../util.js';
 import { Instance } from '../module.js';
 import { CognitoJwtVerifier } from 'aws-jwt-verify';
 import { Environment } from '../interpreter.js';
@@ -1084,6 +1084,7 @@ export class CognitoAuth implements AgentlangAuth {
         Username: email,
         UserAttributes: userAttrs,
         DesiredDeliveryMediums: ['EMAIL'],
+        TemporaryPassword: generateUrlSafePassword(),
         ...(userExists ? { MessageAction: 'RESEND' } : {}),
       });
 

package/src/runtime/defs.ts

@@ -5,6 +5,10 @@ export const PathAttributeNameQuery: string = '__path__?';
 export const ParentAttributeName: string = '__parent__';
 export const DeletedFlagAttributeName: string = '__is_deleted__';
 
+export function isPathAttribute(n: string): boolean {
+  return n.startsWith(PathAttributeName);
+}
+
 export type UnautInfo = {
   opr: string;
   entity: string;

package/src/runtime/interpreter.ts

@@ -1878,7 +1878,7 @@ async function agentInvoke(agent: AgentInstance, msg: string, env: Environment):
         } catch (err: any) {
           if (retries < MAX_PLANNER_RETRIES) {
             await agent.invoke(
-              `For my previouns request <${msg}>, you generated this pattern: ${result}. It had these errors: ${err}. Please fix these errors.`,
+              `For my previouns request <${msg}>, you generated this pattern: ${result}. It had these errors: ${err}. Please fix these errors.\nReturn only the fixed code and no other additional text or messages.`,
               env
             );
             const r: string | undefined = env.getLastResult();
@@ -1906,7 +1906,10 @@ async function agentInvoke(agent: AgentInstance, msg: string, env: Environment):
           break;
         } catch (err: any) {
           if (retries < MAX_PLANNER_RETRIES) {
-            await agent.invoke(`Please fix these errors:\n ${err}`, env);
+            await agent.invoke(
+              `Please fix these errors:\n ${err}\nReturn only the fixed response and no other additional text or messages.`,
+              env
+            );
             const r: string | undefined = env.getLastResult();
             result = r;
             ++retries;

package/src/runtime/loader.ts

@@ -593,7 +593,10 @@ function processAgentScenarios(agentName: string, value: Literal): AgentScenario
         let user: string | undefined;
         let ai: string | undefined;
         expr.map.entries.forEach((me: MapEntry) => {
-          const v = isLiteral(me.value) ? me.value.str : undefined;
+          let v = isLiteral(me.value) ? me.value.str : undefined;
+          if (v === undefined) {
+            v = me.value.$cstNode?.text;
+          }
           if (v) {
             if (me.key.str == 'user') {
               user = v;
@@ -606,7 +609,7 @@ function processAgentScenarios(agentName: string, value: Literal): AgentScenario
           const internal = true;
           scenarios.push({ user, ai, internal, ifPattern: undefined });
         } else {
-          throw new Error(`Invalid glossary spec in agent ${agentName}`);
+          throw new Error(`Invalid scenario spec in agent ${agentName}`);
         }
       }
     });

package/src/runtime/module.ts

@@ -45,6 +45,8 @@ import {
   splitFqName,
   splitRefs,
   forceAsFqName,
+  validateIdFormat,
+  nameContainsSepEscape,
 } from './util.js';
 import { parseStatement } from '../language/parser.js';
 import { ActiveSessionInfo, AdminSession } from './auth/defs.js';
@@ -78,6 +80,9 @@ export class ModuleEntry {
   private taggedAsPublic: boolean = false;
 
   constructor(name: string, moduleName: string) {
+    if (nameContainsSepEscape(name)) {
+      throw new Error(`Name cannot contain reserved escape characters - ${name}`);
+    }
     this.name = name;
     this.moduleName = moduleName;
   }
@@ -569,7 +574,7 @@ export class Record extends ModuleEntry {
           targetModuleName,
           targetEntityName,
           targetColumnName,
-          onDelete: 'CASCADE',
+          onDelete: 'SET NULL',
           onUpdate: 'CASCADE',
         });
       }
@@ -1090,7 +1095,7 @@ ${attrs.join(',\n')}
     }
   }
 
-  static Suffix = '__agent';
+  static Suffix = '_agent';
 
   static EscapeName(n: string): string {
     if (n.endsWith(Agent.Suffix)) {
@@ -3680,6 +3685,7 @@ export function makeInstance(
   const record: Record = module.getRecord(entryName);
 
   const schema: RecordSchema = record.schema;
+  const idAttr = record.getIdAttributeName();
   if (schema.size > 0) {
     attributes.forEach((value: any, key: string) => {
       if (!schema.has(key)) {
@@ -3687,6 +3693,9 @@ export function makeInstance(
       }
       const spec: AttributeSpec = getAttributeSpec(schema, key);
       if (value !== null && value !== undefined) validateType(key, value, spec);
+      if (key === idAttr) {
+        validateIdFormat(key, value);
+      }
     });
   }
   if (!queryAttributes && !queryAll) {

package/src/runtime/modules/ai.ts

@@ -512,13 +512,14 @@ Only return a pure JSON object with no extra text, annotations etc.`;
     validationEventName: string
   ): Promise<Instance> {
     let isstr = true;
+    const content = trimGeneratedCode(response.content);
     try {
-      const c = JSON.parse(response.content);
+      const c = JSON.parse(content);
       isstr = isString(c);
     } catch (reason: any) {
       logger.debug(`invokeValidator json/parse - ${reason}`);
     }
-    const d = isstr ? `"${escapeSpecialChars(response.content)}"` : response.content;
+    const d = isstr ? `"${escapeSpecialChars(content)}"` : content;
     const r: Instance | Instance[] = await parseAndEvaluateStatement(
       `{${validationEventName} {data ${d}}}`
     );