@memberjunction/ai-agents 3.1.1 → 3.3.0

package/dist/base-agent.js

@@ -32,6 +32,7 @@ const aiengine_1 = require("@memberjunction/aiengine");
 const actions_1 = require("@memberjunction/actions");
 const ai_engine_base_1 = require("@memberjunction/ai-engine-base");
 const agent_context_injector_1 = require("./agent-context-injector");
+const ai_reranker_1 = require("@memberjunction/ai-reranker");
 const ai_core_plus_1 = require("@memberjunction/ai-core-plus");
 const AgentRunner_1 = require("./AgentRunner");
 const PayloadManager_1 = require("./PayloadManager");
@@ -510,6 +511,8 @@ class BaseAgent {
             return { notes: [], examples: [] };
         }
         const injector = new agent_context_injector_1.AgentContextInjector();
+        const rerankerConfigJson = agent.Get('RerankerConfiguration');
+        const rerankerConfig = ai_reranker_1.RerankerService.Instance.parseConfiguration(rerankerConfigJson);
         const notes = agent.InjectNotes
             ? await injector.GetNotesForContext({
                 agentId: agent.ID,
@@ -518,9 +521,15 @@ class BaseAgent {
                 currentInput: input,
                 strategy: agent.NoteInjectionStrategy,
                 maxNotes: agent.MaxNotesToInject || 5,
-                contextUser: contextUser
+                contextUser: contextUser,
+                rerankerConfig,
+                observability: this._agentRun ? {
+                    agentRunID: this._agentRun.ID,
+                    stepNumber: (this._agentRun.Steps?.length || 0) + 1
+                } : undefined
             })
             : [];
+        this.logStatus(`BaseAgent: Got ${notes.length} notes from injector`, true);
         const examples = agent.InjectExamples
             ? await injector.GetExamplesForContext({
                 agentId: agent.ID,
@@ -2294,6 +2303,23 @@ The context is now within limits. Please retry your request with the recovered c
         if (params.testRunId) {
             this._agentRun.TestRunID = params.testRunId;
         }
+        if (params.userScope) {
+            if (params.userScope.primaryEntityName) {
+                const primaryEntity = this._metadata.Entities.find(e => e.Name === params.userScope.primaryEntityName);
+                if (primaryEntity) {
+                    this._agentRun.PrimaryScopeEntityID = primaryEntity.ID;
+                }
+                else {
+                    (0, core_1.LogError)(`UserScope: Entity "${params.userScope.primaryEntityName}" not found in metadata`);
+                }
+            }
+            if (params.userScope.primaryRecordId) {
+                this._agentRun.PrimaryScopeRecordID = params.userScope.primaryRecordId;
+            }
+            if (params.userScope.secondary && Object.keys(params.userScope.secondary).length > 0) {
+                this._agentRun.SecondaryScopes = JSON.stringify(params.userScope.secondary);
+            }
+        }
         if (!await this._agentRun.Save()) {
             const errorMessage = JSON.stringify((0, global_1.CopyScalarsAndArrays)(this._agentRun.LatestResult));
             throw new Error(`Failed to create agent run record: Details: ${errorMessage}`);
@@ -3007,7 +3033,7 @@ The context is now within limits. Please retry your request with the recovered c
             };
             await this.finalizeStepEntity(stepEntity, subAgentResult.success, subAgentResult.agentRun?.ErrorMessage, outputData);
             if (subAgentResult.agentRun?.FinalStep === 'Chat') {
-                return {
+                const chatStep = {
                     step: 'Chat',
                     terminate: true,
                     message: subAgentResult.agentRun?.Message || null,
@@ -3017,6 +3043,7 @@ The context is now within limits. Please retry your request with the recovered c
                     actionableCommands: subAgentResult.actionableCommands,
                     automaticCommands: subAgentResult.automaticCommands
                 };
+                return await this.validateChatNextStep(params, chatStep, mergedPayload, this._agentRun, stepEntity);
             }
             const subAgentSummary = {
                 agentName: params.agent.Name,
@@ -3222,7 +3249,7 @@ The context is now within limits. Please retry your request with the recovered c
             }
             await this.finalizeStepEntity(stepEntity, subAgentResult.success, subAgentResult.agentRun?.ErrorMessage, outputData);
             if (subAgentResult.agentRun?.FinalStep === 'Chat') {
-                return {
+                const chatStep = {
                     step: 'Chat',
                     terminate: true,
                     message: subAgentResult.agentRun?.Message || null,
@@ -3232,6 +3259,7 @@ The context is now within limits. Please retry your request with the recovered c
                     actionableCommands: subAgentResult.actionableCommands,
                     automaticCommands: subAgentResult.automaticCommands
                 };
+                return await this.validateChatNextStep(params, chatStep, mergedPayload, this._agentRun, stepEntity);
             }
             const subAgentSummary = {
                 agentName: params.agent.Name,