agentlang 0.7.0 → 0.7.2

package/src/runtime/modules/ai.ts

@@ -15,6 +15,7 @@ import {
   parseAndEvaluateStatement,
 } from '../interpreter.js';
 import {
+  Agent,
   asJSONSchema,
   Decision,
   fetchModule,
@@ -663,12 +664,25 @@ 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>();
-            const entry = m.getEntry(entryName);
-            const s =
-              entry instanceof Record ? (entry as Record).toString_(true) : entry.toString();
-            defs?.push(s);
-            if (!hasmod && defs) {
-              slimModules.set(moduleName, defs);
+            // 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) : 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}'`);
             }
           } else {
             tooldefs.push(fetchModule(moduleName).toString());

package/src/runtime/modules/core.ts

@@ -7,8 +7,17 @@ import {
   escapeSpecialChars,
   isString,
   restoreSpecialChars,
+  makeCoreModuleName,
 } from '../util.js';
-import { Instance, isInstanceOfType, makeInstance, newInstanceAttributes } from '../module.js';
+import {
+  fetchModule,
+  Instance,
+  isInstanceOfType,
+  isModule,
+  makeInstance,
+  newInstanceAttributes,
+  removeModule,
+} from '../module.js';
 import {
   Environment,
   evaluate,
@@ -20,7 +29,12 @@ import { logger } from '../logger.js';
 import { Statement } from '../../language/generated/ast.js';
 import { parseModule, parseStatements } from '../../language/parser.js';
 import { Resolver } from '../resolvers/interface.js';
-import { FlowSuspensionTag, ForceReadPermFlag, PathAttributeName } from '../defs.js';
+import {
+  FlowSuspensionTag,
+  ForceReadPermFlag,
+  InternDynamicModule,
+  PathAttributeName,
+} from '../defs.js';
 import { getMonitor, getMonitorsForEvent, Monitor } from '../monitor.js';
 
 const CoreModuleDefinition = `module ${DefaultModuleName}
@@ -127,6 +141,18 @@ workflow validateModule {
   await Core.validateModule(validateModule.data)
 }
 
+entity Module {
+  name String @id,
+  definition String
+}
+
+resolver moduleResolver [agentlang/Module] {
+    create Core.createModule,
+    update Core.updateModule,
+    delete Core.deleteModule,
+    query Core.getModule
+}
+
 entity Migration {
   appVersion String @id,
   ups String @optional,
@@ -139,9 +165,18 @@ export const CoreModules: string[] = [];
 export function registerCoreModules() {
   DefaultModules.add(DefaultModuleName);
   CoreModules.push(CoreModuleDefinition);
-  [auth, ai, files].forEach((mdef: string) => {
-    CoreModules.push(mdef);
-    DefaultModules.add(mdef);
+
+  // 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') },
+  ];
+
+  coreModuleInfo.forEach(({ def, name }) => {
+    CoreModules.push(def);
+    // Add module NAME (not definition) to DefaultModules so flushAllModules() doesn't remove core modules
+    DefaultModules.add(name);
   });
 }
 
@@ -417,6 +452,46 @@ export async function validateModule(moduleDef: any): Promise<Instance> {
   }
 }
 
+export async function internModuleHelper(
+  name: string,
+  definition: string
+): Promise<string | undefined> {
+  if (InternDynamicModule !== undefined) {
+    return await InternDynamicModule(name, definition);
+  } else {
+    return undefined;
+  }
+}
+
+export async function createModule(_: Resolver, inst: Instance) {
+  await internModuleHelper(inst.lookup('name'), inst.lookup('definition'));
+  return inst;
+}
+
+export async function updateModule(r: Resolver, inst: Instance) {
+  return await createModule(r, inst);
+}
+
+export async function deleteModule(_: Resolver, inst: Instance) {
+  removeModule(inst.lookup('name'));
+  return inst;
+}
+
+export async function getModule(_: Resolver, inst: Instance) {
+  const p = inst.lookupQueryVal(PathAttributeName);
+  if (p !== undefined) {
+    const idx = p.lastIndexOf('/');
+    const n = p.substring(idx + 1);
+    if (isModule(n)) {
+      const m = fetchModule(n);
+      const defn = inst.lookup('definition') || m.toString();
+      const attrs = newInstanceAttributes().set('name', n).set('definition', defn);
+      return [makeInstance('agentlang', 'Module', attrs)];
+    }
+  }
+  return null;
+}
+
 const SqlSep = ';\n\n';
 
 export async function saveMigration(

package/src/syntaxes/agentlang.monarch.ts

@@ -1,7 +1,7 @@
 // Monarch syntax highlighting for the agentlang language.
 export default {
     keywords: [
-        '@actions','@after','@as','@async','@before','@catch','@distinct','@enum','@expr','@from','@full_join','@inner_join','@into','@join','@left_join','@meta','@oneof','@public','@rbac','@ref','@right_join','@then','@upsert','@with_unique','agent','agentlang/retry','allow','and','attempts','await','backoff','between','case','commitTransaction','contains','create','decision','delete','directive','else','entity','error','event','extends','false','flow','for','glossaryEntry','if','import','in','like','module','not','not_found','onSubscription','or','purge','query','read','record','relationship','resolver','return','roles','rollbackTransaction','scenario','startTransaction','subscribe','true','update','upsert','where','workflow'
+        '@actions','@after','@as','@async','@before','@catch','@distinct','@enum','@expr','@from','@full_join','@inner_join','@into','@join','@left_join','@meta','@oneof','@public','@rbac','@ref','@right_join','@then','@upsert','@with_unique','agent','agentlang/retry','allow','and','attempts','await','backoff','between','case','commitTransaction','contains','create','decision','delete','directive','else','entity','error','event','extends','false','flow','for','glossaryEntry','if','import','in','like','module','not','not_found','onSubscription','or','purge','query','read','record','relationship','resolver','return','roles','rollbackTransaction','scenario','startTransaction','subscribe','throw','true','update','upsert','where','workflow'
     ],
     operators: [
         '!=','*','+',',','-','-->','.','/',':',';','<','<=','<>','=','==','>','>=','?','@'