agentlang 0.7.4 → 0.7.6

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.7.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/"
-  },
-  "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"
-    ]
-  },
-  "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.7.6",
+	"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

@@ -17,6 +17,8 @@ import {
   fetchRefTarget,
   getAttributeNames,
   Module,
+  getAllBetweenRelationshipNames,
+  linkInstancesEvent,
 } from '../runtime/module.js';
 import { isNodeEnv } from '../utils/runtime.js';
 import { parseAndEvaluateStatement, Result } from '../runtime/interpreter.js';
@@ -264,6 +266,24 @@ export async function startServer(
     });
   });
 
+  const addBetweenHandlers = (moduleName: string, n: string) => {
+    app.get(`/${moduleName}/${n}`, (req: Request, res: Response) => {
+      handleEntityGet(moduleName, n, req, res);
+    });
+    app.post(`/${moduleName}/${n}`, (req: Request, res: Response) => {
+      handleBetweenRelationshipPost(moduleName, n, req, res);
+    });
+    app.delete(`/${moduleName}/${n}`, (req: Request, res: Response) => {
+      handleBetweenRelationshipDelete(moduleName, n, req, res);
+    });
+  };
+
+  getAllBetweenRelationshipNames().forEach((entityNames: string[], moduleName: string) => {
+    entityNames.forEach((n: string) => {
+      addBetweenHandlers(moduleName, n);
+    });
+  });
+
   const cb = () => {
     console.log(
       chalk.green(
@@ -584,6 +604,50 @@ async function handleEntityDelete(
   }
 }
 
+async function handleBetweenRelationshipLinking(
+  moduleName: string,
+  betweenRelName: string,
+  req: Request,
+  res: Response,
+  unlink: boolean
+): Promise<void> {
+  try {
+    const sessionInfo = await verifyAuth(moduleName, betweenRelName, req.headers.authorization);
+    if (isNoSession(sessionInfo)) {
+      res.status(401).send('Authorization required');
+      return;
+    }
+    const path = await linkInstancesEvent(moduleName, betweenRelName, unlink);
+    const pattern = patternFromAttributes(
+      path.getModuleName(),
+      path.getEntryName(),
+      objectAsInstanceAttributes(req.body)
+    );
+    parseAndEvaluateStatement(pattern, sessionInfo.userId).then(ok(res)).catch(internalError(res));
+  } catch (err: any) {
+    logger.error(err);
+    res.status(500).send(err.toString());
+  }
+}
+
+async function handleBetweenRelationshipPost(
+  moduleName: string,
+  betweenRelName: string,
+  req: Request,
+  res: Response
+): Promise<void> {
+  await handleBetweenRelationshipLinking(moduleName, betweenRelName, req, res, false);
+}
+
+async function handleBetweenRelationshipDelete(
+  moduleName: string,
+  betweenRelName: string,
+  req: Request,
+  res: Response
+): Promise<void> {
+  await handleBetweenRelationshipLinking(moduleName, betweenRelName, req, res, true);
+}
+
 function fetchTreePattern(fqName: string, path?: string): string {
   let pattern = path ? `{${fqName} {${PathAttributeNameQuery} "${path}"}` : `{${fqName}? {}`;
   const rels = getAllChildRelationships(fqName);

package/src/runtime/interpreter.ts

@@ -1463,7 +1463,8 @@ async function evaluateCrudMap(crud: CrudMap, env: Environment): Promise<void> {
     }
     return;
   }
-  if (isEntityInstance(inst) || isBetweenRelationship(inst.name, inst.moduleName)) {
+  const isBetRel = isBetweenRelationship(inst.name, inst.moduleName);
+  if (isEntityInstance(inst) || isBetRel) {
     if (qattrs === undefined && !isQueryAll) {
       const parentPath: string | undefined = env.getParentPath();
       if (parentPath) {
@@ -1479,10 +1480,22 @@ async function evaluateCrudMap(crud: CrudMap, env: Environment): Promise<void> {
         r = await res.upsertInstance(inst);
         await runPostUpdateEvents(inst, undefined, env);
       } else {
-        await runPreCreateEvents(inst, env);
-        if (isTimer(inst)) triggerTimer(inst);
-        r = await res.createInstance(inst);
-        await runPostCreateEvents(inst, env);
+        if (isBetRel && env.isInDeleteMode()) {
+          const rel: Relationship = getRelationship(inst.name, inst.moduleName);
+          await res.handleInstancesLink(
+            inst.lookup(rel.node1.alias),
+            inst.lookup(rel.node2.alias),
+            rel,
+            false,
+            true
+          );
+          r = inst;
+        } else {
+          await runPreCreateEvents(inst, env);
+          if (isTimer(inst)) triggerTimer(inst);
+          r = await res.createInstance(inst);
+          await runPostCreateEvents(inst, env);
+        }
       }
       if (r && entryName == AgentEntityName && inst.moduleName == CoreAIModuleName) {
         defineAgentEvent(env.getActiveModuleName(), r.lookup('name'), r.lookup('instruction'));
@@ -1490,11 +1503,12 @@ async function evaluateCrudMap(crud: CrudMap, env: Environment): Promise<void> {
       env.setLastResult(r);
       const betRelInfo: BetweenRelInfo | undefined = env.getBetweenRelInfo();
       if (betRelInfo) {
-        await res.connectInstances(
+        await res.handleInstancesLink(
           betRelInfo.connectedInstance,
           env.getLastResult(),
           betRelInfo.relationship,
-          env.isInUpsertMode()
+          env.isInUpsertMode(),
+          env.isInDeleteMode()
         );
       }
       if (crud.relationships !== undefined) {
@@ -1514,7 +1528,13 @@ async function evaluateCrudMap(crud: CrudMap, env: Environment): Promise<void> {
             await evaluatePattern(rel.pattern, newEnv);
             const relResult: any = newEnv.getLastResult();
             const res: Resolver = await getResolverForPath(rel.name, moduleName, env);
-            await res.connectInstances(lastInst, relResult, relEntry, env.isInUpsertMode());
+            await res.handleInstancesLink(
+              lastInst,
+              relResult,
+              relEntry,
+              env.isInUpsertMode(),
+              env.isInDeleteMode()
+            );
             lastInst.attachRelatedInstances(rel.name, newEnv.getLastResult());
           }
         }
@@ -2182,7 +2202,7 @@ export async function maybeDeleteQueriedInstances(
   const inst: Instance[] | Instance = queryEnv.getLastResult();
   let resolver: Resolver = Resolver.Default;
   if (inst instanceof Array) {
-    if (inst.length > 0) {
+    if (inst.length > 0 && isEntityInstance(inst[0])) {
       resolver = await getResolverForPath(inst[0].name, inst[0].moduleName, queryEnv);
       const finalResult: Array<any> = new Array<any>();
       for (let i = 0; i < inst.length; ++i) {
@@ -2195,7 +2215,7 @@ export async function maybeDeleteQueriedInstances(
     } else {
       queryEnv.setLastResult(inst);
     }
-  } else {
+  } else if (isEntityInstance(inst)) {
     resolver = await getResolverForPath(inst.name, inst.moduleName, queryEnv);
     await runPreDeleteEvents(inst, env);
     const r: Instance | null = await resolver.deleteInstance(inst, purge);