agentlang 0.9.5 → 0.9.7

package/out/runtime/modules/ai.d.ts

@@ -1,12 +1,19 @@
 import { Environment } from '../interpreter.js';
-import { Decision, Instance } from '../module.js';
+import { AgentEvaluator, Decision, Instance } from '../module.js';
 import { AgentServiceProvider } from '../agents/provider.js';
 import { FlowStep } from '../agents/flows.js';
 export declare const CoreAIModuleName: string;
 export declare const AgentEntityName = "Agent";
 export declare const LlmEntityName = "LLM";
+export declare const AgentLearnerType = "learner";
 declare const _default: string;
 export default _default;
+declare enum AgentCacheType {
+    DIRECTIVE = 0,
+    GLOSSARY = 1,
+    SCENARIO = 2,
+    SUMMARY = 3
+}
 export declare const AgentFqName: string;
 export declare class AgentInstance {
     llm: string;
@@ -38,7 +45,9 @@ export declare class AgentInstance {
     enableSession(): AgentInstance;
     hasSession(): boolean;
     isPlanner(): boolean;
+    isLearner(): boolean;
     isFlowExecutor(): boolean;
+    isEvaluator(): boolean;
     markAsDecisionExecutor(): AgentInstance;
     isDecisionExecutor(): boolean;
     private static CACHE_TTL_MS;
@@ -47,8 +56,11 @@ export declare class AgentInstance {
     private directivesAsString;
     private static GlossaryCache;
     private getUserDefinedAgentGlossary;
+    private static SummariesCache;
+    private getUserDefinedAgentLearningResults;
     private static ScenariosCache;
     private getUserDefinedAgentScenarios;
+    static ResetCache(fqName: string, type: AgentCacheType): void;
     private getFullInstructions;
     private static maybeRewriteTemplatePatterns;
     maybeValidateJsonResponse(response: string | undefined): object | undefined;
@@ -56,6 +68,9 @@ export declare class AgentInstance {
     markAsFlowExecutor(): AgentInstance;
     getScratchNames(): Set<string> | undefined;
     maybeAddScratchData(env: Environment): AgentInstance;
+    private static AgentEvaluators;
+    static RegisterEvaluator(e: AgentEvaluator): AgentInstance;
+    private static maybeEvaluateResponse;
     invoke(message: string, env: Environment): Promise<void>;
     private maybeAddFlowContext;
     private invokeValidator;
@@ -63,6 +78,8 @@ export declare class AgentInstance {
     private getValidationEvent;
     private getExternalToolSpecs;
     private maybeAddRelevantDocuments;
+    private static docTitlesMatch;
+    private static getDocumentTitle;
     private static ToolsCache;
     private toolsAsString;
 }
@@ -71,5 +88,6 @@ export declare function findProviderForLLM(llmName: string, env: Environment): P
 export declare function findAgentChatSession(chatId: string, env: Environment): Promise<Instance | null>;
 export declare function saveAgentChatSession(chatId: string, messages: any[], env: Environment): Promise<void>;
 export declare function agentName(agentInstance: Instance): string;
-export declare function trimGeneratedCode(code: string | undefined): string;
+export declare function normalizeGeneratedCode(code: string | undefined): string;
+export declare function processAgentLearning(moduleName: string, agentName: string, instruction: string, env: Environment): Promise<any>;
 //# sourceMappingURL=ai.d.ts.map

package/out/runtime/modules/ai.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ai.d.ts","sourceRoot":"","sources":["../../../src/runtime/modules/ai.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,WAAW,EAIZ,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAEL,QAAQ,EAIR,QAAQ,EAST,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,oBAAoB,EAKrB,MAAM,uBAAuB,CAAC;AAoB/B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAK9C,eAAO,MAAM,gBAAgB,QAA2B,CAAC;AACzD,eAAO,MAAM,eAAe,UAAU,CAAC;AACvC,eAAO,MAAM,aAAa,QAAQ,CAAC;;AAEnC,wBAsEE;AAEF,eAAO,MAAM,WAAW,QAAgD,CAAC;AAIzE,qBAAa,aAAa;IACxB,GAAG,EAAE,MAAM,CAAM;IACjB,IAAI,EAAE,MAAM,CAAM;IAClB,UAAU,EAAE,MAAM,CAAoB;IACtC,WAAW,EAAE,MAAM,CAAM;IACzB,IAAI,EAAE,MAAM,CAAU;IACtB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,YAAY,EAAE,OAAO,CAAQ;IAC7B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,OAAO,CAAC,UAAU,CAAmC;IACrD,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,gBAAgB,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAoB;IACpC,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO;IAEP,MAAM,CAAC,YAAY,CAAC,aAAa,EAAE,QAAQ,GAAG,aAAa;IA8C3D,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,aAAa;IA0B7F,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,GAAG,aAAa;IAc7F,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM;IAMvC,cAAc,IAAI,aAAa;IAK/B,aAAa,IAAI,aAAa;IAK9B,UAAU,IAAI,OAAO;IAIrB,SAAS,IAAI,OAAO;IAIpB,cAAc,IAAI,OAAO;IAIzB,sBAAsB,IAAI,aAAa;IAKvC,kBAAkB,IAAI,OAAO;IAI7B,OAAO,CAAC,MAAM,CAAC,YAAY,CAAiB;IAC5C,OAAO,CAAC,MAAM,CAAC,eAAe,CAA8D;YAE9E,6BAA6B;YAe7B,kBAAkB;IAqBhC,OAAO,CAAC,MAAM,CAAC,aAAa,CAAkE;YAEhF,2BAA2B;IAmBzC,OAAO,CAAC,MAAM,CAAC,cAAc,CAA6D;YAE5E,4BAA4B;YAe5B,mBAAmB;IAmDjC,OAAO,CAAC,MAAM,CAAC,4BAA4B;IAS3C,yBAAyB,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;IAuB3E,SAAS,IAAI,MAAM;IAOnB,kBAAkB,IAAI,aAAa;IAKnC,eAAe,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,SAAS;IAI1C,mBAAmB,CAAC,GAAG,EAAE,WAAW,GAAG,aAAa;IA8B9C,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW;IA8F9C,OAAO,CAAC,mBAAmB;YAYb,eAAe;YAiCf,gBAAgB;IAwC9B,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,oBAAoB;YAgBd,yBAAyB;IA8BvC,OAAO,CAAC,MAAM,CAAC,UAAU,CAA6B;IAEtD,OAAO,CAAC,aAAa;CA6CtB;AAqBD,wBAAsB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAQ5F;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,WAAW,GACf,OAAO,CAAC,oBAAoB,CAAC,CA2B/B;AAqCD,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,GAAG,EAAE,WAAW,GACf,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAM1B;AAED,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,WAAW,iBAM3F;AAED,wBAAgB,SAAS,CAAC,aAAa,EAAE,QAAQ,GAAG,MAAM,CAEzD;AAuBD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAclE"}
+{"version":3,"file":"ai.d.ts","sourceRoot":"","sources":["../../../src/runtime/modules/ai.ts"],"names":[],"mappings":"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"}

package/out/runtime/modules/ai.js

@@ -1,19 +1,22 @@
-import { escapeSpecialChars, isFqName, isString, makeCoreModuleName, makeFqName, nameToPath, sleepMilliseconds, splitFqName, } from '../util.js';
+import { escapeSpecialChars, isFqName, isString, makeCoreModuleName, makeFqName, nameToPath, restoreSpecialChars, sleepMilliseconds, splitFqName, } from '../util.js';
 import { GlobalEnvironment, makeEventEvaluator, parseAndEvaluateStatement, } from '../interpreter.js';
 import { asJSONSchema, fetchModule, getDecision, getGlobalRetry, Instance, instanceToObject, isAgent, isInstanceOfType, isModule, makeInstance, newInstanceAttributes, Record, } from '../module.js';
 import { provider } from '../agents/registry.js';
 import { assistantMessage, humanMessage, systemMessage, } from '../agents/provider.js';
-import { AIMessage, HumanMessage } from '@langchain/core/messages';
-import { DecisionAgentInstructions, FlowExecInstructions, getAgentDirectives, getAgentGlossary, getAgentResponseSchema, getAgentScenarios, getAgentScratchNames, newAgentDirective, newAgentGlossaryEntry, newAgentScenario, PlannerInstructions, } from '../agents/common.js';
-import { PathAttributeNameQuery } from '../defs.js';
+import { AIMessage, HumanMessage, SystemMessage } from '@langchain/core/messages';
+import { DecisionAgentInstructions, EvalInstructions, FlowExecInstructions, getAgentDirectives, getAgentGlossary, getAgentResponseSchema, getAgentScenarios, getAgentScratchNames, LearningAgentInstructions as LearnerAgentInstructions, newAgentDirective, newAgentGlossaryEntry, newAgentScenario, PlannerInstructions, } from '../agents/common.js';
 import { logger } from '../logger.js';
 import Handlebars from 'handlebars';
 import { isMonitoringEnabled, TtlCache } from '../state.js';
 export const CoreAIModuleName = makeCoreModuleName('ai');
 export const AgentEntityName = 'Agent';
 export const LlmEntityName = 'LLM';
+export const AgentLearnerType = 'learner';
+const AgentEvalType = 'eval';
 export default `module ${CoreAIModuleName}
 
+import "./modules/ai.js" @as ai
+
 entity ${LlmEntityName} {
     name String @id,
     service String @default("openai"),
@@ -23,7 +26,7 @@ entity ${LlmEntityName} {
 entity ${AgentEntityName} {
     name String @id,
     moduleName String @default("${CoreAIModuleName}"),
-    type @enum("chat", "planner", "flow-exec") @default("chat"),
+    type @enum("chat", "planner", "flow-exec", "${AgentEvalType}", "${AgentLearnerType}") @default("chat"),
     runWorkflows Boolean @default(true),
     instruction String @optional,
     tools String @optional, // comma-separated list of tool names
@@ -82,7 +85,78 @@ entity GlossaryEntry {
    meaning String,
    synonyms String @optional
 }
+
+entity EvaluationResult {
+  id UUID @id @default(uuid()),
+  agentFqName String @indexed,
+  userRequest String,
+  score Int,
+  summary String
+}
+
+entity AgentLearningResult {
+   id UUID @id @default(uuid()),
+   agentFqName String @indexed,
+   data String,
+   summary String
+}
+
+@public event agentLearning{
+    agentName String,
+    agentModuleName String,
+    instruction String
+}
+
+workflow agentLearning {
+    await ai.processAgentLearning(agentLearning.agentModuleName, agentLearning.agentName, agentLearning.instruction)
+}
 `;
+var AgentCacheType;
+(function (AgentCacheType) {
+    AgentCacheType[AgentCacheType["DIRECTIVE"] = 0] = "DIRECTIVE";
+    AgentCacheType[AgentCacheType["GLOSSARY"] = 1] = "GLOSSARY";
+    AgentCacheType[AgentCacheType["SCENARIO"] = 2] = "SCENARIO";
+    AgentCacheType[AgentCacheType["SUMMARY"] = 3] = "SUMMARY";
+})(AgentCacheType || (AgentCacheType = {}));
+const MAX_USER_DEFINED_GLOSSARY = 20;
+const MAX_USER_DEFINED_DIRECTIVES = 20;
+const MAX_USER_DEFINED_SCENARIOS = 5;
+const MAX_USER_DEFINED_SUMMARIES = 5;
+async function activatedUserDefinedAgentLearnings(objLabel, learningObjects, activator, maxResults) {
+    const msg = `Consider the following ${objLabel} (in JSON format):
+  ${JSON.stringify(learningObjects)}
+
+  Return the indices of the ${objLabel} relevant for the following text:
+
+  ${activator.userMessage}
+
+  Return the relevant indices and a JSON array of integers with the index starting at zero (0). Do not return any additional comments
+  or text.
+  `;
+    const msgs = new Array();
+    msgs.push(new SystemMessage('You are an agent that filters a JSON array and return relevant indices as a JSON array of integers.'));
+    msgs.push(new HumanMessage(msg));
+    const response = await activator.provider.invoke(msgs, undefined);
+    const indices = JSON.parse(normalizeGeneratedCode(response.content));
+    if (indices.length == 0 || indices.length == learningObjects.length)
+        return learningObjects;
+    const result = new Array();
+    for (let i = 0; i < indices.length; ++i) {
+        if (i >= maxResults)
+            break;
+        result.push(learningObjects[indices[i]]);
+    }
+    return result;
+}
+async function activatedUserDefinedAgentGlossary(gls, activator) {
+    return await activatedUserDefinedAgentLearnings('glossary entries', gls, activator, MAX_USER_DEFINED_GLOSSARY);
+}
+async function activatedUserDefinedAgentScenarios(scns, activator) {
+    return await activatedUserDefinedAgentLearnings('scenarios', scns, activator, MAX_USER_DEFINED_SCENARIOS);
+}
+async function activatedUserDefinedAgentDirectives(dirs, activator) {
+    return await activatedUserDefinedAgentLearnings('directives or conditions', dirs, activator, MAX_USER_DEFINED_DIRECTIVES);
+}
 export const AgentFqName = makeFqName(CoreAIModuleName, AgentEntityName);
 const ProviderDb = new Map();
 export class AgentInstance {
@@ -194,9 +268,15 @@ export class AgentInstance {
     isPlanner() {
         return this.hasModuleTools || this.type == 'planner';
     }
+    isLearner() {
+        return this.type === 'learner';
+    }
     isFlowExecutor() {
         return this.type == 'flow-exec';
     }
+    isEvaluator() {
+        return this.type == AgentEvalType;
+    }
     markAsDecisionExecutor() {
         this.decisionExecutor = true;
         return this;
@@ -212,13 +292,15 @@ export class AgentInstance {
         let r = [];
         if (result && result.length > 0) {
             r = result.map((inst) => {
-                return newAgentDirective(inst.lookup('condition'), inst.lookup('consequent'));
+                return newAgentDirective(restoreSpecialChars(inst.lookup('condition')), restoreSpecialChars(inst.lookup('consequent')));
             });
         }
         return AgentInstance.DirectivesCache.set(fqName, r);
     }
-    async directivesAsString(fqName) {
-        const userDirs = await this.getUserDefinedAgentDirectives(fqName);
+    async directivesAsString(fqName, activator) {
+        let userDirs = await this.getUserDefinedAgentDirectives(fqName);
+        if (userDirs.length > MAX_USER_DEFINED_DIRECTIVES)
+            userDirs = await activatedUserDefinedAgentDirectives(userDirs, activator);
         const dirs = getAgentDirectives(fqName) || [];
         const conds = dirs.concat(userDirs);
         if (conds.length > 0) {
@@ -244,11 +326,24 @@ export class AgentInstance {
         let r = [];
         if (result && result.length > 0) {
             r = result.map((inst) => {
-                return newAgentGlossaryEntry(inst.lookup('name'), inst.lookup('meaning'), inst.lookup('synonyms'));
+                return newAgentGlossaryEntry(inst.lookup('name'), restoreSpecialChars(inst.lookup('meaning')), inst.lookup('synonyms'));
             });
         }
         return AgentInstance.GlossaryCache.set(fqName, r);
     }
+    async getUserDefinedAgentLearningResults(fqName) {
+        const cached = AgentInstance.SummariesCache.get(fqName);
+        if (cached !== undefined)
+            return cached;
+        const result = await parseAndEvaluateStatement(`{${CoreAIModuleName}/AgentLearningResult {agentFqName? "${fqName}"}}`);
+        let r = [];
+        if (result && result.length > 0) {
+            r = result.map((inst) => {
+                return { data: inst.lookup('data'), summary: inst.lookup('summary') };
+            });
+        }
+        return AgentInstance.SummariesCache.set(fqName, r);
+    }
     async getUserDefinedAgentScenarios(fqName) {
         const cached = AgentInstance.ScenariosCache.get(fqName);
         if (cached !== undefined)
@@ -262,12 +357,30 @@ export class AgentInstance {
         }
         return AgentInstance.ScenariosCache.set(fqName, r);
     }
-    async getFullInstructions(env) {
+    static ResetCache(fqName, type) {
+        switch (type) {
+            case AgentCacheType.DIRECTIVE:
+                AgentInstance.DirectivesCache.delete(fqName);
+                break;
+            case AgentCacheType.GLOSSARY:
+                AgentInstance.GlossaryCache.delete(fqName);
+                break;
+            case AgentCacheType.SCENARIO:
+                AgentInstance.ScenariosCache.delete(fqName);
+                break;
+            case AgentCacheType.SUMMARY:
+                AgentInstance.SummariesCache.delete(fqName);
+                break;
+        }
+    }
+    async getFullInstructions(env, activator) {
         const fqName = this.getFqName();
         const ins = this.role ? `${this.role}\n${this.instruction || ''}` : this.instruction || '';
-        let finalInstruction = `${ins} ${await this.directivesAsString(fqName)}`;
+        let finalInstruction = `${ins} ${await this.directivesAsString(fqName, activator)}`;
         const staticGls = getAgentGlossary(fqName) || [];
-        const userGls = await this.getUserDefinedAgentGlossary(fqName);
+        let userGls = await this.getUserDefinedAgentGlossary(fqName);
+        if (userGls.length > MAX_USER_DEFINED_GLOSSARY)
+            userGls = await activatedUserDefinedAgentGlossary(userGls, activator);
         const gls = staticGls.concat(userGls);
         if (gls.length > 0) {
             const glss = new Array();
@@ -278,7 +391,9 @@ export class AgentInstance {
       ${glss.join('\n')}\n`;
         }
         const staticScns = getAgentScenarios(fqName) || [];
-        const userScns = await this.getUserDefinedAgentScenarios(fqName);
+        let userScns = await this.getUserDefinedAgentScenarios(fqName);
+        if (userScns.length > MAX_USER_DEFINED_SCENARIOS)
+            userScns = await activatedUserDefinedAgentScenarios(userScns, activator);
         const scenarios = staticScns.concat(userScns);
         if (scenarios.length > 0) {
             const scs = new Array();
@@ -293,6 +408,15 @@ export class AgentInstance {
             });
             finalInstruction = `${finalInstruction}\nHere are some example user requests and the corresponding responses you are supposed to produce:\n${scs.join('\n')}`;
         }
+        const summaries = await this.getUserDefinedAgentLearningResults(fqName);
+        if (summaries.length > 0) {
+            let s = summaries.map((sa) => {
+                return restoreSpecialChars(sa.summary);
+            });
+            if (s.length > MAX_USER_DEFINED_SUMMARIES)
+                s = await activatedUserDefinedAgentLearnings('summaries', s, activator, MAX_USER_DEFINED_SUMMARIES);
+            finalInstruction = `${finalInstruction}\nAlso keep in mind the following points:\n\n${s.join('\n')}\n\n`;
+        }
         const responseSchema = getAgentResponseSchema(fqName);
         if (responseSchema) {
             finalInstruction = `${finalInstruction}\nReturn your response in the following JSON schema:\n${asJSONSchema(responseSchema)}
@@ -321,7 +445,7 @@ Only return a pure JSON object with no extra text, annotations etc.`;
         if (response) {
             const responseSchema = getAgentResponseSchema(this.getFqName());
             if (responseSchema) {
-                const attrs = JSON.parse(trimGeneratedCode(response));
+                const attrs = JSON.parse(normalizeGeneratedCode(response));
                 const parts = nameToPath(responseSchema);
                 const moduleName = parts.getModuleName();
                 const entryName = parts.getEntryName();
@@ -383,16 +507,61 @@ Only return a pure JSON object with no extra text, annotations etc.`;
             env.addToScratchPad(n, data);
         return this;
     }
+    static RegisterEvaluator(e) {
+        const n = e.normalizedName();
+        const agentFqName = isFqName(n) ? n : makeFqName(e.moduleName, n);
+        const instruction = e.instruction;
+        let llm = e.llm;
+        const [agentModule, agentName] = splitFqName(agentFqName);
+        if (llm === undefined)
+            llm = `${agentName}_llm`;
+        const inst = makeInstance(CoreAIModuleName, AgentEntityName, newInstanceAttributes()
+            .set('llm', llm)
+            .set('name', agentName)
+            .set('moduleName', agentModule)
+            .set('instruction', instruction || 'You are an agent that evaluates the performance of another agent.')
+            .set('type', AgentEvalType));
+        const einst = AgentInstance.FromInstance(inst).disableSession();
+        this.AgentEvaluators.set(agentFqName, einst);
+        return einst;
+    }
+    static async maybeEvaluateResponse(agent, userRequest, fullRequest, response, env) {
+        const fqn = agent.getFqName();
+        const e = AgentInstance.AgentEvaluators.get(fqn);
+        if (e !== undefined) {
+            await e.invoke(JSON.stringify({ requestToAgent: fullRequest, responseFromAgent: response }), env);
+            try {
+                const r = JSON.parse(normalizeGeneratedCode(env.getLastResult()));
+                const score = r.score;
+                if (score === undefined || score === null) {
+                    logger.warn(`Evaluation for agent ${fqn} failed to generate a valid score`);
+                }
+                else {
+                    await parseAndEvaluateStatement(`{${CoreAIModuleName}/EvaluationResult {
+              agentFqName "${fqn}",
+              userRequest "${escapeSpecialChars(userRequest)}",
+              score ${score},
+              summary "${escapeSpecialChars(r.summary)}"
+          }}`);
+                }
+            }
+            catch (reason) {
+                logger.warn(`Failed to save evaluation for agent ${fqn} - ${reason}`);
+            }
+        }
+    }
     async invoke(message, env) {
         const p = await findProviderForLLM(this.llm, env);
         const agentName = this.name;
         const chatId = env.getAgentChatId() || agentName;
         let isplnr = this.isPlanner();
         const isflow = !isplnr && this.isFlowExecutor();
-        if (isplnr && this.withSession) {
+        const iseval = !isplnr && !isflow && this.isEvaluator();
+        const islearner = !isflow && !isplnr && !iseval && this.isLearner();
+        if ((isplnr || islearner || iseval) && this.withSession) {
             this.withSession = false;
         }
-        if (isflow) {
+        if (isflow || islearner) {
             this.withSession = false;
         }
         if (this.withSession && env.getFlowContext()) {
@@ -408,20 +577,32 @@ Only return a pure JSON object with no extra text, annotations etc.`;
         const sess = this.withSession ? await findAgentChatSession(chatId, env) : null;
         let msgs;
         let cachedMsg = undefined;
+        const activator = {
+            provider: p,
+            userMessage: message,
+            agentInstruction: this.instruction,
+            agentRole: this.role,
+        };
         if (sess) {
             msgs = sess.lookup('messages');
         }
         else {
-            cachedMsg = await this.getFullInstructions(env);
+            cachedMsg = await this.getFullInstructions(env, activator);
             msgs = [systemMessage(cachedMsg || '')];
         }
         if (msgs) {
             try {
                 const sysMsg = msgs[0];
-                if (isplnr || isflow) {
-                    const s = isplnr ? PlannerInstructions : FlowExecInstructions;
+                if (isplnr || isflow || iseval || islearner) {
+                    const s = isplnr
+                        ? PlannerInstructions
+                        : isflow
+                            ? FlowExecInstructions
+                            : iseval
+                                ? EvalInstructions
+                                : LearnerAgentInstructions;
                     const ts = this.toolsAsString();
-                    const msg = `${s}\n${ts}\n${cachedMsg || (await this.getFullInstructions(env))}`;
+                    const msg = `${s}\n${ts}\n${cachedMsg || (await this.getFullInstructions(env, activator))}`;
                     const newSysMsg = systemMessage(msg);
                     msgs[0] = newSysMsg;
                 }
@@ -454,6 +635,8 @@ Only return a pure JSON object with no extra text, annotations etc.`;
                 if (v) {
                     response = await this.handleValidation(response, v, msgs, p);
                 }
+                if (!iseval)
+                    await AgentInstance.maybeEvaluateResponse(this, message, msgsContent, response.content, env);
                 msgs.push(assistantMessage(response.content));
                 if (isplnr) {
                     msgs[0] = sysMsg;
@@ -489,7 +672,7 @@ Only return a pure JSON object with no extra text, annotations etc.`;
     }
     async invokeValidator(response, validationEventName) {
         let isstr = true;
-        const content = trimGeneratedCode(response.content);
+        const content = normalizeGeneratedCode(response.content);
         try {
             const c = JSON.parse(content);
             isstr = isString(c);
@@ -575,28 +758,75 @@ Only return a pure JSON object with no extra text, annotations etc.`;
     }
     async maybeAddRelevantDocuments(message, env) {
         if (this.documents && this.documents.length > 0) {
-            const s = `${message}. Relevant documents are: ${this.documents}`;
-            const result = await parseHelper(`{${CoreAIModuleName}/Document? "${s}"}`, env);
-            if (result && result.length > 0) {
-                const docs = [];
-                for (let i = 0; i < result.length; ++i) {
-                    const v = result[i];
-                    const r = await parseHelper(`{${CoreAIModuleName}/Document {${PathAttributeNameQuery} "${v.id}"}}`, env);
-                    if (r && r.length > 0) {
-                        docs.push(r[0]);
+            try {
+                const docNames = this.documents.split(',').map(d => d.trim());
+                const searchQuery = message;
+                try {
+                    const semanticResult = await parseHelper(`{${CoreAIModuleName}/Document {content? "${searchQuery.replace(/"/g, '\\"')}"}}`, env);
+                    if (semanticResult && semanticResult.length > 0) {
+                        const docs = [];
+                        for (const doc of semanticResult) {
+                            const docTitle = doc.lookup ? doc.lookup('title') : doc.title;
+                            if (AgentInstance.docTitlesMatch(docTitle, docNames)) {
+                                docs.push(doc instanceof Instance
+                                    ? doc
+                                    : Instance.newWithAttributes(doc, new Map(Object.entries(doc))));
+                            }
+                        }
+                        if (docs.length > 0) {
+                            return message.concat('\n\nRelevant context from documents:\n').concat(docs
+                                .map((v) => {
+                                return `Document: ${v.lookup('title')}\n${v.lookup('content')}`;
+                            })
+                                .join('\n\n---\n\n'));
+                        }
                     }
                 }
-                if (docs.length > 0) {
-                    message = message.concat('\nUse the additional information given below:\n').concat(docs
-                        .map((v) => {
-                        return v.lookup('content');
-                    })
-                        .join('\n'));
+                catch (semanticErr) {
+                    logger.debug(`Semantic search is not available, falling back to title-based filtering: ${semanticErr}`);
+                }
+                const result = await parseHelper(`{${CoreAIModuleName}/Document? {}}`, env);
+                if (result && result.length > 0) {
+                    const docs = [];
+                    for (let i = 0; i < result.length; ++i) {
+                        const v = result[i];
+                        const docTitle = AgentInstance.getDocumentTitle(v);
+                        if (docTitle && docNames.includes(docTitle)) {
+                            if (v instanceof Instance) {
+                                docs.push(v);
+                            }
+                        }
+                    }
+                    if (docs.length > 0) {
+                        return message.concat('\n\nRelevant context from documents:\n').concat(docs
+                            .map((v) => {
+                            return v.lookup('content');
+                        })
+                            .join('\n\n'));
+                    }
                 }
             }
+            catch (err) {
+                logger.debug(`Error retrieving documents: ${err}`);
+            }
         }
         return message;
     }
+    static docTitlesMatch(title, docNames) {
+        return title !== undefined && docNames.includes(title);
+    }
+    static getDocumentTitle(doc) {
+        if (typeof doc.lookup === 'function') {
+            return doc.lookup('title');
+        }
+        else if (doc.attributes) {
+            return doc.attributes.get('title');
+        }
+        else if (doc.title) {
+            return doc.title;
+        }
+        return undefined;
+    }
     toolsAsString() {
         const cachedTools = AgentInstance.ToolsCache.get(this.name);
         if (cachedTools) {
@@ -648,7 +878,9 @@ Only return a pure JSON object with no extra text, annotations etc.`;
 AgentInstance.CACHE_TTL_MS = 5 * 60 * 1000; // 5 mins
 AgentInstance.DirectivesCache = new TtlCache(AgentInstance.CACHE_TTL_MS);
 AgentInstance.GlossaryCache = new TtlCache(AgentInstance.CACHE_TTL_MS);
+AgentInstance.SummariesCache = new TtlCache(AgentInstance.CACHE_TTL_MS);
 AgentInstance.ScenariosCache = new TtlCache(AgentInstance.CACHE_TTL_MS);
+AgentInstance.AgentEvaluators = new Map();
 AgentInstance.ToolsCache = new Map();
 function extractScratchData(scratchNames, inst) {
     const data = {};
@@ -768,7 +1000,7 @@ function processScenarioResponse(resp) {
     }
     return resp;
 }
-export function trimGeneratedCode(code) {
+export function normalizeGeneratedCode(code) {
     if (code !== undefined) {
         let s = code.trim();
         if (s.startsWith('```')) {
@@ -784,4 +1016,68 @@ export function trimGeneratedCode(code) {
         return '';
     }
 }
+async function parseAndInternAgentLearning(moduleName, agentName, learning, env) {
+    const obj = JSON.parse(normalizeGeneratedCode(learning));
+    const fqName = makeFqName(moduleName, agentName);
+    if (obj.decisions) {
+        for (let j = 0; j < obj.decisions.length; ++j) {
+            const conds = obj.decisions[j].conditions;
+            if (conds && conds.length > 0) {
+                AgentInstance.ResetCache(fqName, AgentCacheType.DIRECTIVE);
+                for (let i = 0; i < conds.length; ++i) {
+                    const entry = conds[i];
+                    const cond = entry.if;
+                    const conseq = entry.then;
+                    if (cond && conseq) {
+                        await parseAndEvaluateStatement(`{${CoreAIModuleName}/Directive {
+  agentFqName "${fqName}",
+  condition "${escapeSpecialChars(cond)}",
+  consequent "${escapeSpecialChars(conseq)}"}}`, env.getActiveUser(), env);
+                    }
+                    else {
+                        throw new Error(`Invalid directive generated - missing 'if' or 'then' in ${learning}`);
+                    }
+                }
+            }
+        }
+    }
+    if (obj.glossary) {
+        AgentInstance.ResetCache(fqName, AgentCacheType.GLOSSARY);
+        for (let i = 0; i < obj.glossary.length; ++i) {
+            const word = obj.glossary[i].word;
+            const meaning = obj.glossary[i].meaning;
+            if (word && meaning) {
+                await parseAndEvaluateStatement(`{${CoreAIModuleName}/GlossaryEntry {
+  agentFqName "${fqName}",
+  name "${word}",
+  meaning "${escapeSpecialChars(meaning)}"}}`, env.getActiveUser(), env);
+            }
+        }
+    }
+    if (obj.scenarios) {
+        AgentInstance.ResetCache(fqName, AgentCacheType.SCENARIO);
+        for (let i = 0; i < obj.scenarios.length; ++i) {
+            const user = obj.scenarios[i].user;
+            const ai = obj.scenarios[i].ai;
+            if (user && ai) {
+                await parseAndEvaluateStatement(`{${CoreAIModuleName}/Scenario {
+  agentFqName "${fqName}",
+  user "${escapeSpecialChars(user)}",
+  ai "${escapeSpecialChars(ai)}"}}`, env.getActiveUser(), env);
+            }
+        }
+    }
+    AgentInstance.ResetCache(fqName, AgentCacheType.SUMMARY);
+    const summary = obj.summary;
+    delete obj.summary;
+    await parseAndEvaluateStatement(`{${CoreAIModuleName}/AgentLearningResult {
+  agentFqName "${fqName}",
+  data "${escapeSpecialChars(JSON.stringify(obj))}",
+  summary "${escapeSpecialChars(summary) || ''}"}}`, env.getActiveUser(), env);
+}
+export async function processAgentLearning(moduleName, agentName, instruction, env) {
+    const learning = await parseAndEvaluateStatement(`{${moduleName}/${agentName}_${AgentLearnerType} {message \`${instruction}\`}}`, env.getActiveUser(), env);
+    await parseAndInternAgentLearning(moduleName, agentName, learning, env);
+    return { agentLearning: { result: learning } };
+}
 //# sourceMappingURL=ai.js.map