agentlang 0.6.0 → 0.6.2

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.6.0",
-	"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.22.0"
-}
+  "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.2",
+  "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/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

@@ -115,9 +115,9 @@ AliasSpec: ('@as' (alias=ID | '[' ( aliases+=ID (',' aliases+=ID)*)+ ']'));
 
 ThenSpec: '@then' '{' (statements+=Statement (';' statements+=Statement)*)+ '}';
 
-CrudMap: '{' (name=QueryId '{''}' 
-             | (name=QualifiedName '{''}' ',' '@from' source=Literal (',' upsert+='@upsert')?)
-             | name=QualifiedName body=CrudMapBody)
+CrudMap: '{' (name=QueryId (':')? '{''}' 
+             | (name=QualifiedName (':')? '{''}' ',' '@from' source=Literal (',' upsert+='@upsert')?)
+             | name=QualifiedName (':')? body=CrudMapBody)
              (',' relationships+=RelationshipPattern (',' relationships+=RelationshipPattern)*)?
              (',' join=JoinSpec)?
              (',' into=SelectIntoSpec)?
@@ -151,9 +151,11 @@ FlowDefinition: 'flow' name=GenericName (body=FlowDefBody? | '{''}');
 
 FlowDefBody: '{' (entries+=FlowEntry (entries+=FlowEntry)*)+ '}';
 
-FlowEntry: root=GenericName '-->' (cond=ConditionalFlowStep | next=GenericName);
+FlowEntry: root=GenericName '-->' (cond=ConditionalFlowStep | next=FlowStepSpec);
 
-ConditionalFlowStep: expr=STRING next=GenericName;
+ConditionalFlowStep: expr=STRING next=FlowStepSpec;
+
+FlowStepSpec: GenericName | CrudMap;
 
 DecisionDefinition: 'decision' name=GenericName (body=DecisionDefBody? | '{''}');
 
@@ -200,7 +202,7 @@ Delete: 'delete' pattern=Pattern;
 
 Purge: 'purge' pattern=Pattern;
 
-SetAttribute: name=QueryId op=SqlComparisonOpr? value=AttributeValueExpression;
+SetAttribute: name=QueryId op=SqlComparisonOpr? (':')? value=AttributeValueExpression;
 
 SqlComparisonOpr returns string: ('='|'<>' | '!=' |'<'|'<='|'>'|'>='|'in'|'like'|'between');
 

package/src/language/generated/ast.ts

@@ -156,6 +156,14 @@ export function isExpr(item: unknown): item is Expr {
     return reflection.isInstance(item, Expr);
 }
 
+export type FlowStepSpec = CrudMap;
+
+export const FlowStepSpec = 'FlowStepSpec';
+
+export function isFlowStepSpec(item: unknown): item is FlowStepSpec {
+    return reflection.isInstance(item, FlowStepSpec);
+}
+
 export type GenericName = string;
 
 export function isGenericName(item: unknown): item is GenericName {
@@ -424,7 +432,7 @@ export interface ConditionalFlowStep extends langium.AstNode {
     readonly $container: FlowEntry;
     readonly $type: 'ConditionalFlowStep';
     expr: string;
-    next: GenericName;
+    next: FlowStepSpec;
 }
 
 export const ConditionalFlowStep = 'ConditionalFlowStep';
@@ -434,7 +442,7 @@ export function isConditionalFlowStep(item: unknown): item is ConditionalFlowSte
 }
 
 export interface CrudMap extends langium.AstNode {
-    readonly $container: Pattern;
+    readonly $container: ConditionalFlowStep | FlowEntry | Pattern;
     readonly $type: 'CrudMap';
     body?: CrudMapBody;
     distinct: Array<'@distinct'>;
@@ -622,7 +630,7 @@ export interface FlowEntry extends langium.AstNode {
     readonly $container: FlowDefBody;
     readonly $type: 'FlowEntry';
     cond?: ConditionalFlowStep;
-    next?: GenericName;
+    next?: FlowStepSpec;
     root: GenericName;
 }
 
@@ -1486,6 +1494,7 @@ export type AgentlangAstType = {
     FlowDefBody: FlowDefBody
     FlowDefinition: FlowDefinition
     FlowEntry: FlowEntry
+    FlowStepSpec: FlowStepSpec
     FnCall: FnCall
     ForEach: ForEach
     FullTextSearch: FullTextSearch
@@ -1555,7 +1564,7 @@ export type AgentlangAstType = {
 export class AgentlangAstReflection extends langium.AbstractAstReflection {
 
     getAllTypes(): string[] {
-        return [ActionEntry, AfterTriggerDefinition, AgentDefinition, AgentXtraAttribute, AgentXtraSpec, AliasSpec, ArrayLiteral, AsyncFnCall, AttributeDefinition, AttributeValueExpression, BackoffSpec, BeforeTriggerDefinition, BinExpr, CaseEntry, CatchSpec, CompositeUniqueDefinition, ConditionalFlowStep, CrudMap, CrudMapBody, DecisionDefBody, DecisionDefinition, Definition, Delete, DirectiveDefinition, Else, EntityActionsDefinitions, EntityDefinition, EnumSpec, EventDefinition, Expr, ExtendsClause, FlowDefBody, FlowDefinition, FlowEntry, FnCall, ForEach, FullTextSearch, GenericDefBody, GenericPropertyDef, GlossaryEntryDefinition, Group, Handler, If, Import, JoinSpec, KvPair, KvPairs, Literal, MapEntry, MapKey, MapLiteral, MetaDefinition, ModuleDefinition, NegExpr, NodeDefinition, NotExpr, OneOfSpec, Pattern, PrePostTriggerDefinition, PrimExpr, PropertyDefinition, PublicAgentDefinition, PublicEventDefinition, PublicWorkflowDefinition, Purge, RbacAllowSpec, RbacExpressionSpec, RbacOpr, RbacRolesSpec, RbacSpecDefinition, RbacSpecEntries, RbacSpecEntry, RecordDefinition, RecordExtraDefinition, RecordSchemaDefinition, RefSpec, RelNodes, RelationshipDefinition, RelationshipPattern, ResolverDefinition, ResolverFnName, ResolverMethodName, ResolverMethodSpec, RetryDefinition, Return, RuntimeHint, ScenarioDefinition, SchemaDefinition, SelectIntoEntry, SelectIntoSpec, SetAttribute, StandaloneStatement, Statement, ThenSpec, TriggerDefinition, TriggerEntry, WorkflowDefinition, WorkflowHeader];
+        return [ActionEntry, AfterTriggerDefinition, AgentDefinition, AgentXtraAttribute, AgentXtraSpec, AliasSpec, ArrayLiteral, AsyncFnCall, AttributeDefinition, AttributeValueExpression, BackoffSpec, BeforeTriggerDefinition, BinExpr, CaseEntry, CatchSpec, CompositeUniqueDefinition, ConditionalFlowStep, CrudMap, CrudMapBody, DecisionDefBody, DecisionDefinition, Definition, Delete, DirectiveDefinition, Else, EntityActionsDefinitions, EntityDefinition, EnumSpec, EventDefinition, Expr, ExtendsClause, FlowDefBody, FlowDefinition, FlowEntry, FlowStepSpec, FnCall, ForEach, FullTextSearch, GenericDefBody, GenericPropertyDef, GlossaryEntryDefinition, Group, Handler, If, Import, JoinSpec, KvPair, KvPairs, Literal, MapEntry, MapKey, MapLiteral, MetaDefinition, ModuleDefinition, NegExpr, NodeDefinition, NotExpr, OneOfSpec, Pattern, PrePostTriggerDefinition, PrimExpr, PropertyDefinition, PublicAgentDefinition, PublicEventDefinition, PublicWorkflowDefinition, Purge, RbacAllowSpec, RbacExpressionSpec, RbacOpr, RbacRolesSpec, RbacSpecDefinition, RbacSpecEntries, RbacSpecEntry, RecordDefinition, RecordExtraDefinition, RecordSchemaDefinition, RefSpec, RelNodes, RelationshipDefinition, RelationshipPattern, ResolverDefinition, ResolverFnName, ResolverMethodName, ResolverMethodSpec, RetryDefinition, Return, RuntimeHint, ScenarioDefinition, SchemaDefinition, SelectIntoEntry, SelectIntoSpec, SetAttribute, StandaloneStatement, Statement, ThenSpec, TriggerDefinition, TriggerEntry, WorkflowDefinition, WorkflowHeader];
     }
 
     protected override computeIsSubtype(subtype: string, supertype: string): boolean {
@@ -1580,6 +1589,9 @@ export class AgentlangAstReflection extends langium.AbstractAstReflection {
             case PrimExpr: {
                 return this.isSubtype(Expr, supertype);
             }
+            case CrudMap: {
+                return this.isSubtype(FlowStepSpec, supertype);
+            }
             case EntityDefinition:
             case EventDefinition:
             case PublicEventDefinition: