agentlang 0.5.4 → 0.5.5

package/package.json

@@ -1,187 +1,186 @@
 {
-	"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.5.4",
-	"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.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"
-		]
-	},
-	"packageManager": "pnpm@10.13.1+sha512.37ebf1a5c7a30d5fabe0c5df44ee8da4c965ca0c5af3dbab28c3a1681b70a256218d05c81c9c0dcf767ef6b8551eb5b960042b9ed4300c59242336377e01cfad"
-}
+  "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.5.5",
+  "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"
+  }
+}

package/src/language/parser.ts

@@ -110,55 +110,89 @@ export async function parseWorkflow(workflowDef: string): Promise<WorkflowDefini
   }
 }
 
-export function maybeGetValidationErrors(document: LangiumDocument): string[] | undefined {
+const ErrorIndicator = '<-- ERROR';
+
+export function maybeGetValidationErrors(
+  document: LangiumDocument,
+  lines?: string[]
+): string[] | undefined {
+  if (lines === undefined) {
+    lines = document.textDocument.getText().split('\n');
+  }
   const validationErrors = (document.diagnostics ?? []).filter(e => e.severity === 1);
 
   const sls = new Set<number>();
   const scs = new Set<number>();
   if (validationErrors.length > 0) {
-    const lineErrs = new Array<string>();
     for (const validationError of validationErrors) {
       if (
         !sls.has(validationError.range.start.line) &&
         !scs.has(validationError.range.start.character)
       ) {
-        const s = document.textDocument.getText(validationError.range);
-        lineErrs.push(
-          `Error on line ${validationError.range.start.line + 1}, column ${validationError.range.start.character + 1}, unexpected token(s) '${s}'`
-        );
+        const t = document.textDocument.getText(validationError.range);
+        const s = `(${validationError.range.start.line + 1}:${validationError.range.start.character + 1}) unexpected token(s) '${t}'`;
+        const ln = lines[validationError.range.start.line];
+        if (ln.indexOf(ErrorIndicator) > 0) {
+          lines[validationError.range.start.line] = `${ln}, ${s}`;
+        } else {
+          lines[validationError.range.start.line] = `${ln}    ${ErrorIndicator} ${s}`;
+        }
         sls.add(validationError.range.start.line);
         scs.add(validationError.range.start.character);
       }
     }
-
-    return lineErrs;
+    return lines;
   } else {
     return undefined;
   }
 }
 
+function trimErrorMessage(s: string): string {
+  const start = s.indexOf('Expecting:');
+  if (start >= 0) {
+    const end = s.indexOf('but found:');
+    if (end > 0) {
+      return `Expecting a valid token sequence, ${s.substring(end)}`;
+    }
+  }
+  return s;
+}
+
 export function maybeRaiseParserErrors(document: LangiumDocument) {
+  const code = document.textDocument.getText();
+  const lines = code.split('\n');
+  let hasErrors = false;
+  const errLines = new Set<number>();
   if (document.parseResult.lexerErrors.length > 0) {
-    throw new Error(
-      `Lexer errors: ${document.parseResult.lexerErrors
-        .map((err: any) => {
-          return err.message;
-        })
-        .join('\n')}`
-    );
+    document.parseResult.lexerErrors.forEach((err: any) => {
+      if (!errLines.has(err.line)) {
+        const errMsg = trimErrorMessage(err.message);
+        const s = `${ErrorIndicator} (${err.line}:${err.column}) ${errMsg}`;
+        lines[err.line - 1] = `${lines[err.line - 1]}    ${s}`;
+        errLines.add(err.line);
+      }
+    });
+    hasErrors = true;
   }
   if (document.parseResult.parserErrors.length > 0) {
-    throw new Error(
-      `Parser errors: ${document.parseResult.parserErrors
-        .map((err: any) => {
-          return err.message;
-        })
-        .join('\n')}`
-    );
+    document.parseResult.parserErrors.forEach((err: any) => {
+      const errMsg = trimErrorMessage(err.message);
+      if (err.token.startLine && err.token.endLine) {
+        if (!errLines.has(err.token.startLine)) {
+          const s = `${ErrorIndicator} (${err.token.startLine}:${err.token.startColumn}) ${errMsg}`;
+          lines[err.token.endLine - 1] = `${lines[err.token.endLine - 1]}    ${s}`;
+          lines.join('\n');
+          errLines.add(err.token.startLine);
+        }
+      } else {
+        lines.push(`ERROR: ${errMsg}`);
+      }
+    });
+    hasErrors = true;
   }
-  const errs = maybeGetValidationErrors(document);
-  if (errs) {
-    throw new Error(errs.join('\n'));
+  const errs = maybeGetValidationErrors(document, lines);
+  if (hasErrors || errs !== undefined) {
+    throw new Error(lines.join('\n'));
   }
 }
 
@@ -440,3 +474,12 @@ export async function introspectCase(caseStr: string): Promise<CasePattern> {
   const ifPat = pat[0] as IfPattern;
   return { condition: ifPat.condition, body: ifPat.body[0] };
 }
+
+export function canParse(s: string): boolean {
+  const ts = s.trim();
+  if (ts) {
+    const contents = ts.substring(1, ts.length - 1).trim();
+    return contents.length > 0;
+  }
+  return false;
+}

package/src/runtime/defs.ts

@@ -134,6 +134,7 @@ export class ExecGraph {
   private rootNodes: ExecGraphNode[];
   private subGraphs: ExecGraph[];
   private parentGraph: ExecGraph | undefined = undefined;
+  private eventName: string | undefined;
   private activeModuleName: string | undefined;
   private hasAgentsFlag: boolean = false;
   private loopBody: boolean = false;
@@ -212,6 +213,17 @@ export class ExecGraph {
     return this.parentGraph;
   }
 
+  setEventName(eventName: string | undefined): ExecGraph {
+    if (eventName !== undefined) {
+      this.eventName = eventName;
+    }
+    return this;
+  }
+
+  getEventName(): string | undefined {
+    return this.eventName;
+  }
+
   setHasAgents(flag: boolean): ExecGraph {
     this.hasAgentsFlag = flag;
     if (this.parentGraph) {