agentlang 0.9.0 → 0.9.2

package/src/runtime/modules/ai.ts

@@ -15,7 +15,6 @@ import {
   parseAndEvaluateStatement,
 } from '../interpreter.js';
 import {
-  Agent,
   asJSONSchema,
   Decision,
   fetchModule,
@@ -757,27 +756,12 @@ Only return a pure JSON object with no extra text, annotations etc.`;
           if (entryName) {
             const hasmod = slimModules.has(moduleName);
             const defs = hasmod ? slimModules.get(moduleName) : new Array<string>();
-            // Try to get entry directly first, then try as an agent (agents have _agent suffix)
-            let entry = m.getEntrySafe(entryName);
-            if (!entry) {
-              // Try with agent suffix - agents are stored with escaped names
-              entry = m.getEntrySafe(Agent.EscapeName(entryName));
-            }
-            if (entry) {
-              const s =
-                entry instanceof Record
-                  ? (entry as Record).toString_(true, true)
-                  : entry.toString();
-              // Add full qualified name comment so LLM knows how to reference it
-              const fqName = `${moduleName}/${entryName}`;
-              defs?.push(
-                `# Tool: ${fqName}\n# Use as: {${fqName} {...}} or {${fqName}? {...}}\n${s}`
-              );
-              if (!hasmod && defs) {
-                slimModules.set(moduleName, defs);
-              }
-            } else {
-              logger.warn(`Tool entry '${entryName}' not found in module '${moduleName}'`);
+            const entry = m.getEntry(entryName);
+            const s =
+              entry instanceof Record ? (entry as Record).toString_(true, true) : entry.toString();
+            defs?.push(s);
+            if (!hasmod && defs) {
+              slimModules.set(moduleName, defs);
             }
           } else {
             tooldefs.push(fetchModule(moduleName).toString());

package/src/runtime/modules/auth.ts

@@ -337,13 +337,13 @@ entity Session {
   {Role {name? UpdatePermissionAssignment.roleName}} @as [role]
   {Permission {id? UpdatePermissionAssignment.permissionId}} @as [permission]
   if (role and permission) {
-    {RolePermission {__path__? UpdatePermissionAssignment.rolePermission, Permission? permission.__path__, Role role.__path__}}
+    {RolePermission {__path__? UpdatePermissionAssignment.rolePermission, Permission permission.__path__, Role role.__path__}}
   }
   else if (role) {
     {RolePermission {__path__? UpdatePermissionAssignment.rolePermission, Role role.__path__}}
   }
   else if (permission) {
-    {RolePermission {__path__? UpdatePermissionAssignment.rolePermission, Permission? permission.__path__}}
+    {RolePermission {__path__? UpdatePermissionAssignment.rolePermission, Permission permission.__path__}}
   }
 }
 

package/src/runtime/modules/core.ts

@@ -1,6 +1,7 @@
 import { default as ai } from './ai.js';
 import { default as auth } from './auth.js';
 import { default as files } from './files.js';
+import { default as mcp } from './mcp.js';
 import {
   DefaultModuleName,
   DefaultModules,
@@ -39,7 +40,7 @@ import {
 } from '../defs.js';
 import { getMonitor, getMonitorsForEvent, Monitor } from '../monitor.js';
 import { registerResolver, setResolver } from '../resolvers/registry.js';
-import { base64Encode } from '../../utils/runtime.js';
+import { base64Encode, isNodeEnv } from '../../utils/runtime.js';
 
 const CoreModuleDefinition = `module ${DefaultModuleName}
 
@@ -180,14 +181,17 @@ export function registerCoreModules() {
   DefaultModules.add(DefaultModuleName);
   CoreModules.push(CoreModuleDefinition);
 
+  const mcpn = makeCoreModuleName('mcp');
   // Map of module definitions to their names for proper DefaultModules registration
   const coreModuleInfo: Array<{ def: string; name: string }> = [
     { def: auth, name: makeCoreModuleName('auth') },
     { def: ai, name: makeCoreModuleName('ai') },
     { def: files, name: makeCoreModuleName('files') },
+    { def: mcp, name: mcpn },
   ];
 
   coreModuleInfo.forEach(({ def, name }) => {
+    if (!isNodeEnv && name == mcpn) return;
     CoreModules.push(def);
     // Add module NAME (not definition) to DefaultModules so flushAllModules() doesn't remove core modules
     DefaultModules.add(name);

package/src/runtime/modules/mcp.ts

@@ -0,0 +1,45 @@
+import { listClientTools } from '../mcpclient.js';
+import { makeCoreModuleName } from '../util.js';
+
+export const CoreMcpModuleName = makeCoreModuleName('mcp');
+
+export default `module ${CoreMcpModuleName}
+
+import "./modules/mcp.js" @as mcp
+
+entity Client {
+    name String @id,
+    version String @default("1.0.0"),
+    serverUrl String,
+    clientId String @optional,
+    clientSecret String @optional,
+    bearerToken String @optional
+}
+
+@public event listTools {
+    clientName String
+}
+
+workflow listTools {
+    {Client {name? listTools.clientName}} @as [client];
+    await mcp.listClientTools_(client)
+}
+
+@public event createClient {
+    name String @id,
+    version String @default("1.0.0"),
+    serverUrl String,
+    clientId String @optional,
+    clientSecret String @optional,
+    bearerToken String @optional
+}
+
+workflow createClient {
+    purge {Client {name? createClient.name}}
+    {Client {}, @from createClient} @as client
+    {listTools {clientName client.name}}
+    client
+}
+`;
+
+export const listClientTools_ = listClientTools;

package/src/runtime/resolvers/sqldb/database.ts

@@ -1081,10 +1081,11 @@ export async function getManyByJoin(
   if (querySpec.intoSpec === undefined) {
     throw new Error('SELECT-INTO pattern is missing');
   }
-  const intos = intoSpecToSql(querySpec.intoSpec);
+  const intos = querySpec.intoSpec.size > 0 ? intoSpecToSql(querySpec.intoSpec) : '';
+  const intos_sep = intos.length === 0 ? '' : ',';
   const aggrs =
     querySpec.aggregates !== undefined ? intoSpecToSql(querySpec.aggregates) : undefined;
-  const cols = aggrs ? `${intos}, ${aggrs}` : intos;
+  const cols = aggrs ? `${intos} ${intos_sep} ${aggrs}` : intos;
   let sql = `SELECT ${querySpec.distinct ? 'DISTINCT' : ''} ${cols} FROM ${tableName} ${joinSql.join('\n')} WHERE ${queryStr}`;
   if (querySpec.groupBy !== undefined) {
     sql = `${sql} GROUP BY ${querySpec.groupBy.join(', ')}`;

package/src/syntaxes/agentlang.monarch.ts

@@ -13,6 +13,7 @@ export default {
             { regex: /(([_a-zA-Z][\w_]*)(\/([_a-zA-Z][\w_]*))?)/, action: { cases: { '@keywords': {"token":"keyword"}, '@default': {"token":"string"} }} },
             { regex: /[_a-zA-Z][\w_]*/, action: { cases: { '@keywords': {"token":"keyword"}, '@default': {"token":"string"} }} },
             { regex: /("(((\\([\s\S]))|((?!(((\\|")|\r)|\n))[\s\S]*?))|(\r?\n))*")/, action: {"token":"string"} },
+            { regex: /(`(((\\([\s\S]))|((?!(((\\|`)|\r)|\n))[\s\S]*?))|(\r?\n))*`)/, action: {"token":"string"} },
             { regex: /-?[0-9]+/, action: {"token":"number"} },
             { include: '@whitespace' },
             { regex: /@symbols/, action: { cases: { '@operators': {"token":"operator"}, '@default': {"token":""} }} },