@memberjunction/ai-agents 2.112.0 → 2.113.0

package/dist/base-agent.js

@@ -24,13 +24,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseAgent = void 0;
-const global_1 = require("@memberjunction/global");
+const core_1 = require("@memberjunction/core");
 const ai_prompts_1 = require("@memberjunction/ai-prompts");
 const base_agent_type_1 = require("./agent-types/base-agent-type");
-const global_2 = require("@memberjunction/global");
+const global_1 = require("@memberjunction/global");
 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_core_plus_1 = require("@memberjunction/ai-core-plus");
 const AgentRunner_1 = require("./AgentRunner");
 const PayloadManager_1 = require("./PayloadManager");
@@ -39,7 +40,7 @@ const _ = __importStar(require("lodash"));
 class BaseAgent {
     constructor() {
         this._promptRunner = new ai_prompts_1.AIPromptRunner();
-        this._metadata = new global_1.Metadata();
+        this._metadata = new core_1.Metadata();
         this._agentTypeState = null;
         this._executionCounts = new Map();
         this._generalValidationRetryCount = 0;
@@ -51,7 +52,10 @@ class BaseAgent {
         this._subAgentRuns = [];
         this._payloadManager = new PayloadManager_1.PayloadManager();
         this._validationRetryCount = 0;
-        this._contextRecoveryAttempted = false;
+        this._contextRecoveryAttempts = 0;
+        this.MAX_RECOVERY_ATTEMPTS = 1;
+        this._memoryContext = '';
+        this._injectedMemory = { notes: [], examples: [] };
     }
     get AgentTypeState() {
         return this._agentTypeState;
@@ -67,21 +71,21 @@ class BaseAgent {
     }
     logStatus(message, verboseOnly = false, params) {
         if (verboseOnly) {
-            (0, global_1.LogStatusEx)({
+            (0, core_1.LogStatusEx)({
                 message,
                 verboseOnly: true,
-                isVerboseEnabled: () => params?.verbose === true || (0, global_1.IsVerboseLoggingEnabled)(),
+                isVerboseEnabled: () => params?.verbose === true || (0, core_1.IsVerboseLoggingEnabled)()
             });
         }
         else {
-            (0, global_1.LogStatus)(message);
+            (0, core_1.LogStatus)(message);
         }
     }
     logError(error, options) {
         const errorMessage = error instanceof Error ? error.message : error;
         const errorObj = error instanceof Error ? error : undefined;
         const metadata = {
-            ...options?.metadata,
+            ...options?.metadata
         };
         if (options?.agent) {
             metadata.agentId = options.agent.ID;
@@ -91,12 +95,12 @@ class BaseAgent {
             metadata.agentTypeId = options.agentType.ID;
             metadata.agentTypeName = options.agentType.Name;
         }
-        (0, global_1.LogErrorEx)({
+        (0, core_1.LogErrorEx)({
             message: errorMessage,
             error: errorObj,
             category: options?.category || 'BaseAgent',
             severity: options?.severity || 'error',
-            metadata: Object.keys(metadata).length > 0 ? metadata : undefined,
+            metadata: Object.keys(metadata).length > 0 ? metadata : undefined
         });
     }
     wrapProgressCallback(originalCallback) {
@@ -107,15 +111,15 @@ class BaseAgent {
                 ...progress,
                 timestamp: new Date(),
                 agentHierarchy: this._agentHierarchy || [],
-                depth: this._depth || 0,
+                depth: this._depth || 0
             });
             try {
                 const enhancedProgress = {
                     ...progress,
                     metadata: {
                         ...progress.metadata,
-                        agentRun: this._agentRun,
-                    },
+                        agentRun: this._agentRun
+                    }
                 };
                 originalCallback(enhancedProgress);
             }
@@ -124,8 +128,8 @@ class BaseAgent {
                     category: 'ProgressEnhancement',
                     metadata: {
                         progress: progress,
-                        agentRunId: this._agentRun?.ID || 'N/A',
-                    },
+                        agentRunId: this._agentRun?.ID || 'N/A'
+                    }
                 });
                 originalCallback(progress);
             }
@@ -159,15 +163,15 @@ class BaseAgent {
                 this.logStatus(`📊 Preloaded ${totalSources} data source(s) for agent '${params.agent.Name}': ${destinations.join(', ')}`, true, params);
                 params.data = {
                     ...preloadedResult.data,
-                    ...params.data,
+                    ...params.data
                 };
                 params.context = {
                     ...preloadedResult.context,
-                    ...params.context,
+                    ...params.context
                 };
                 params.payload = {
                     ...preloadedResult.payload,
-                    ...params.payload,
+                    ...params.payload
                 };
             }
             else {
@@ -178,7 +182,7 @@ class BaseAgent {
             this.logError(`Failed to preload data for agent '${params.agent.Name}': ${error.message}`, {
                 agent: params.agent,
                 category: 'DataPreloading',
-                severity: 'warning',
+                severity: 'warning'
             });
         }
     }
@@ -193,7 +197,7 @@ class BaseAgent {
             }
             const wrappedParams = {
                 ...params,
-                onProgress: this.wrapProgressCallback(params.onProgress),
+                onProgress: this.wrapProgressCallback(params.onProgress)
             };
             await this.initializeStartingPayload(wrappedParams);
             if (params.cancellationToken?.aborted) {
@@ -203,12 +207,12 @@ class BaseAgent {
             wrappedParams.onProgress?.({
                 step: 'initialization',
                 percentage: 0,
-                message: this.formatHierarchicalMessage(`Initializing ${params.agent.Name} agent and preparing execution environment`),
+                message: this.formatHierarchicalMessage(`Initializing ${params.agent.Name} agent and preparing execution environment`)
             });
             await this.initializeAgentRun(wrappedParams);
             this._validationRetryCount = 0;
             this._generalValidationRetryCount = 0;
-            this._contextRecoveryAttempted = false;
+            this._contextRecoveryAttempts = 0;
             this._messageLifecycleCallback = params.onMessageLifecycle;
             await this.initializeEngines(params.contextUser);
             if (params.cancellationToken?.aborted) {
@@ -221,7 +225,7 @@ class BaseAgent {
             wrappedParams.onProgress?.({
                 step: 'validation',
                 percentage: 10,
-                message: this.formatHierarchicalMessage('Validating agent configuration and loading prompts'),
+                message: this.formatHierarchicalMessage('Validating agent configuration and loading prompts')
             });
             const validationResult = await this.validateAgentWithTracking(params.agent, params.contextUser);
             if (validationResult)
@@ -231,19 +235,26 @@ class BaseAgent {
             if (!config.success) {
                 this.logError(`Failed to load agent configuration: ${config.errorMessage}`, {
                     agent: params.agent,
-                    category: 'AgentConfiguration',
+                    category: 'AgentConfiguration'
                 });
                 return await this.createFailureResult(config.errorMessage || 'Failed to load agent configuration', params.contextUser);
             }
             await this.preloadAgentData(wrappedParams);
             await this.initializeAgentType(wrappedParams, config);
+            const userId = params.userId || params.contextUser?.ID;
+            const companyId = params.companyId;
+            const lastUserMessage = params.conversationMessages
+                .filter(m => m.role === 'user')
+                .pop();
+            const inputText = lastUserMessage?.content || '';
+            await this.InjectContextMemory(typeof inputText === 'string' ? inputText : '', params.agent, userId, companyId, params.contextUser, wrappedParams.conversationMessages);
             this.logStatus(`🚀 Executing agent '${params.agent.Name}' internal logic`, true, params);
             const executionResult = await this.executeAgentInternal(wrappedParams, config);
             wrappedParams.onProgress?.({
                 step: 'finalization',
                 percentage: 95,
                 metadata: { result: executionResult },
-                message: this.formatHierarchicalMessage('Finalizing agent execution'),
+                message: this.formatHierarchicalMessage('Finalizing agent execution')
             });
             this.logStatus(`✅ Finalizing execution for agent '${params.agent.Name}'`, true, params);
             const finalPayload = executionResult.finalStep.newPayload || executionResult.finalStep.previousPayload;
@@ -257,7 +268,7 @@ class BaseAgent {
             this.logError(error, {
                 agent: params.agent,
                 category: 'AgentExecution',
-                severity: 'critical',
+                severity: 'critical'
             });
             return await this.createFailureResult(error.message, params.contextUser);
         }
@@ -298,6 +309,50 @@ class BaseAgent {
         await aiengine_1.AIEngine.Instance.Config(false, contextUser);
         await actions_1.ActionEngineServer.Instance.Config(false, contextUser);
     }
+    async InjectContextMemory(input, agent, userId, companyId, contextUser, conversationMessages) {
+        if (!agent.InjectNotes && !agent.InjectExamples) {
+            return { notes: [], examples: [] };
+        }
+        const injector = new agent_context_injector_1.AgentContextInjector();
+        const notes = agent.InjectNotes
+            ? await injector.GetNotesForContext({
+                agentId: agent.ID,
+                userId,
+                companyId,
+                currentInput: input,
+                strategy: agent.NoteInjectionStrategy,
+                maxNotes: agent.MaxNotesToInject || 5,
+                contextUser: contextUser
+            })
+            : [];
+        const examples = agent.InjectExamples
+            ? await injector.GetExamplesForContext({
+                agentId: agent.ID,
+                userId,
+                companyId,
+                currentInput: input,
+                strategy: agent.ExampleInjectionStrategy,
+                maxExamples: agent.MaxExamplesToInject || 3,
+                contextUser: contextUser
+            })
+            : [];
+        if ((notes.length > 0 || examples.length > 0) && conversationMessages) {
+            const notesText = injector.FormatNotesForInjection(notes);
+            const examplesText = injector.FormatExamplesForInjection(examples);
+            this._memoryContext = '';
+            if (notesText)
+                this._memoryContext += notesText + '\n\n';
+            if (examplesText)
+                this._memoryContext += examplesText + '\n\n';
+            conversationMessages.unshift({
+                role: 'system',
+                content: this._memoryContext
+            });
+            this.logStatus(`💾 Injected ${notes.length} notes and ${examples.length} examples into conversation context`, true);
+        }
+        this._injectedMemory = { notes, examples };
+        return { notes, examples };
+    }
     async validateRunChain(lastRunId, contextUser) {
         const visitedRunIds = new Set();
         visitedRunIds.add(this._agentRun.ID);
@@ -312,11 +367,11 @@ class BaseAgent {
                 throw new Error(`Run chain exceeds maximum length of ${maxChainLength}. This may indicate a data issue.`);
             }
             visitedRunIds.add(currentRunId);
-            const rv = new global_1.RunView();
+            const rv = new core_1.RunView();
             const result = await rv.RunView({
                 EntityName: 'MJ: AI Agent Runs',
                 ExtraFilter: `ID='${currentRunId}'`,
-                ResultType: 'simple',
+                ResultType: 'simple'
             }, contextUser);
             if (!result.Success || result.Results.length === 0) {
                 break;
@@ -334,7 +389,7 @@ class BaseAgent {
             }
             return {
                 success: false,
-                agentRun: this._agentRun,
+                agentRun: this._agentRun
             };
         }
         return null;
@@ -355,16 +410,16 @@ class BaseAgent {
                     metadata: {
                         agentName: agent.Name,
                         agentId: agent.ID,
-                        validationSchema: agent.StartingPayloadValidation,
-                    },
+                        validationSchema: agent.StartingPayloadValidation
+                    }
                 });
                 return null;
             }
             let payloadToValidate = params.payload;
-            const jsonValidator = new global_2.JSONValidator();
+            const jsonValidator = new global_1.JSONValidator();
             const validationResult = jsonValidator.validate(payloadToValidate, validationSchema);
             if (!validationResult.Success) {
-                const errorMessages = validationResult.Errors.map((e) => e.Message);
+                const errorMessages = validationResult.Errors.map(e => e.Message);
                 return this.handleStartingValidationFailure(params, errorMessages);
             }
             this.logStatus(`✅ Starting payload validation passed for agent ${agent.Name}`, true, params);
@@ -376,8 +431,8 @@ class BaseAgent {
                 metadata: {
                     agentName: agent.Name,
                     agentId: agent.ID,
-                    error: error.message,
-                },
+                    error: error.message
+                }
             });
             return null;
         }
@@ -389,7 +444,7 @@ class BaseAgent {
             this.logError(`Starting payload validation failed for agent ${params.agent.Name}`, {
                 agent: params.agent,
                 category: 'StartingPayloadValidation',
-                metadata: { errors: errorMessages },
+                metadata: { errors: errorMessages }
             });
             if (this._agentRun) {
                 this._agentRun.ErrorMessage = validationFeedback;
@@ -400,7 +455,7 @@ class BaseAgent {
             return {
                 success: false,
                 agentRun: this._agentRun,
-                payload: params.payload,
+                payload: params.payload
             };
         }
         else {
@@ -415,41 +470,43 @@ class BaseAgent {
             this.logStatus(`🔧 Using custom driver class '${agent.DriverClass}' for agent '${agent.Name}'`, true);
             metadataOptional = true;
         }
-        const agentType = engine.AgentTypes.find((at) => at.ID === agent.TypeID);
+        const agentType = engine.AgentTypes.find(at => at.ID === agent.TypeID);
         if (!agentType && !metadataOptional) {
             return {
                 success: false,
-                errorMessage: `Agent type not found for ID: ${agent.TypeID}`,
+                errorMessage: `Agent type not found for ID: ${agent.TypeID}`
             };
         }
-        const systemPrompt = engine.Prompts.find((p) => p.ID === agentType.SystemPromptID);
+        const systemPrompt = engine.Prompts.find(p => p.ID === agentType.SystemPromptID);
         if (!systemPrompt)
             metadataOptional = true;
-        const agentPrompt = engine.AgentPrompts.filter((ap) => ap.AgentID === agent.ID && ap.Status === 'Active').sort((a, b) => a.ExecutionOrder - b.ExecutionOrder)[0];
+        const agentPrompt = engine.AgentPrompts
+            .filter(ap => ap.AgentID === agent.ID && ap.Status === 'Active')
+            .sort((a, b) => a.ExecutionOrder - b.ExecutionOrder)[0];
         if (!agentPrompt && !metadataOptional) {
             return {
                 success: false,
-                errorMessage: `No prompts configured for agent: ${agent.Name}`,
+                errorMessage: `No prompts configured for agent: ${agent.Name}`
             };
         }
-        const childPrompt = engine.Prompts.find((p) => p.ID === agentPrompt?.PromptID);
+        const childPrompt = engine.Prompts.find(p => p.ID === agentPrompt?.PromptID);
         if (!childPrompt && !metadataOptional) {
             return {
                 success: false,
-                errorMessage: `Child prompt not found for ID: ${agentPrompt?.PromptID}`,
+                errorMessage: `Child prompt not found for ID: ${agentPrompt?.PromptID}`
             };
         }
         if (!agentType.AgentPromptPlaceholder && !metadataOptional) {
             return {
                 success: false,
-                errorMessage: `Agent type '${agentType.Name}' does not have AgentPromptPlaceholder configured.`,
+                errorMessage: `Agent type '${agentType.Name}' does not have AgentPromptPlaceholder configured.`
             };
         }
         return {
             success: true,
             agentType,
             systemPrompt,
-            childPrompt,
+            childPrompt
         };
     }
     async preparePromptParams(config, payload, params) {
@@ -488,7 +545,7 @@ class BaseAgent {
         const atInstance = await base_agent_type_1.BaseAgentType.GetAgentTypeInstance(config.agentType);
         await atInstance.InjectPayload(payload, this.AgentTypeState, promptParams, {
             agentId: params.agent.ID,
-            agentRunId: this._agentRun?.ID,
+            agentRunId: this._agentRun?.ID
         });
         if (systemPrompt) {
             const childPromptParams = {
@@ -498,7 +555,7 @@ class BaseAgent {
                 conversationMessages: params.conversationMessages,
                 templateMessageRole: 'user',
                 verbose: params.verbose,
-                agentRunId: this.AgentRun?.ID,
+                agentRunId: this.AgentRun?.ID
             };
             if (params.effortLevel !== undefined && params.effortLevel !== null) {
                 childPromptParams.effortLevel = params.effortLevel;
@@ -513,7 +570,9 @@ class BaseAgent {
                 promptParams.configurationId = params.configurationId;
                 childPromptParams.configurationId = params.configurationId;
             }
-            promptParams.childPrompts = [new ai_core_plus_1.ChildPromptParam(childPromptParams, agentType.AgentPromptPlaceholder)];
+            promptParams.childPrompts = [
+                new ai_core_plus_1.ChildPromptParam(childPromptParams, agentType.AgentPromptPlaceholder)
+            ];
         }
         else {
             if (params.apiKeys && params.apiKeys.length > 0) {
@@ -540,7 +599,7 @@ class BaseAgent {
     async executePrompt(promptParams) {
         const newParams = {
             ...promptParams,
-            attemptJSONRepair: true,
+            attemptJSONRepair: true
         };
         return await this._promptRunner.ExecutePrompt(newParams);
     }
@@ -570,23 +629,23 @@ class BaseAgent {
             default:
                 this.logError(`Invalid next step '${nextStep.step}' for agent '${params.agent.Name}'`, {
                     agent: params.agent,
-                    category: 'NextStepValidation',
+                    category: 'NextStepValidation'
                 });
                 return {
                     step: 'Failed',
                     terminate: true,
-                    errorMessage: `Invalid next step '${nextStep.step}'`,
+                    errorMessage: `Invalid next step '${nextStep.step}'`
                 };
         }
     }
     async validateSubAgentNextStep(params, nextStep, currentPayload, agentRun, currentStep) {
         const name = nextStep.subAgent?.name;
         const curAgentSubAgents = aiengine_1.AIEngine.Instance.GetSubAgents(params.agent.ID, 'Active');
-        const subAgent = curAgentSubAgents.find((a) => a.Name.trim().toLowerCase() === name?.trim().toLowerCase());
+        const subAgent = curAgentSubAgents.find(a => a.Name.trim().toLowerCase() === name?.trim().toLowerCase());
         if (!name || !subAgent) {
             this.logError(`Sub-agent '${name}' not found or not active for agent '${params.agent.Name}'`, {
                 agent: params.agent,
-                category: 'SubAgentExecution',
+                category: 'SubAgentExecution'
             });
             if (nextStep.step !== 'Retry') {
                 this._generalValidationRetryCount++;
@@ -594,7 +653,7 @@ class BaseAgent {
             return {
                 step: 'Retry',
                 terminate: false,
-                errorMessage: `Sub-agent '${name}' not found or not active`,
+                errorMessage: `Sub-agent '${name}' not found or not active`
             };
         }
         if (subAgent.MaxExecutionsPerRun != null) {
@@ -606,8 +665,8 @@ class BaseAgent {
                     metadata: {
                         subAgentName: name,
                         executionCount,
-                        maxExecutions: subAgent.MaxExecutionsPerRun,
-                    },
+                        maxExecutions: subAgent.MaxExecutionsPerRun
+                    }
                 });
                 if (nextStep.step !== 'Retry') {
                     this._generalValidationRetryCount++;
@@ -615,20 +674,20 @@ class BaseAgent {
                 return {
                     step: 'Retry',
                     terminate: false,
-                    errorMessage: `Sub-agent '${name}' has reached its maximum execution limit of ${subAgent.MaxExecutionsPerRun}`,
+                    errorMessage: `Sub-agent '${name}' has reached its maximum execution limit of ${subAgent.MaxExecutionsPerRun}`
                 };
             }
         }
         return nextStep;
     }
     async validateActionsNextStep(params, nextStep, currentPayload, agentRun, currentStep) {
-        const curAgentActions = aiengine_1.AIEngine.Instance.AgentActions.filter((aa) => aa.AgentID === params.agent.ID && aa.Status === 'Active');
-        const missingActions = nextStep.actions?.filter((action) => {
+        const curAgentActions = aiengine_1.AIEngine.Instance.AgentActions.filter(aa => aa.AgentID === params.agent.ID && aa.Status === 'Active');
+        const missingActions = nextStep.actions?.filter(action => {
             const actionName = action.name.trim().toLowerCase();
-            const exactMatch = curAgentActions.find((aa) => aa.Action.trim().toLowerCase() === actionName);
+            const exactMatch = curAgentActions.find(aa => aa.Action.trim().toLowerCase() === actionName);
             if (exactMatch)
                 return false;
-            const containsMatches = curAgentActions.filter((aa) => aa.Action.trim().toLowerCase().includes(actionName));
+            const containsMatches = curAgentActions.filter(aa => aa.Action.trim().toLowerCase().includes(actionName));
             if (containsMatches.length === 1) {
                 const correctedName = containsMatches[0].Action;
                 this.logStatus(`Action name fuzzy matched: '${action.name}' → '${correctedName}'`, true, params);
@@ -636,15 +695,15 @@ class BaseAgent {
                 return false;
             }
             if (containsMatches.length > 1) {
-                this.logStatus(`Ambiguous action name '${action.name}' matches ${containsMatches.length} actions: ${containsMatches.map((a) => a.Action).join(', ')}`, true, params);
+                this.logStatus(`Ambiguous action name '${action.name}' matches ${containsMatches.length} actions: ${containsMatches.map(a => a.Action).join(', ')}`, true, params);
             }
             return true;
         });
         if (missingActions && missingActions.length > 0) {
-            const missingActionNames = missingActions.map((a) => a.name).join(', ');
+            const missingActionNames = missingActions.map(a => a.name).join(', ');
             this.logError(`Actions '${missingActionNames}' not found or not active for agent '${params.agent.Name}'`, {
                 agent: params.agent,
-                category: 'ActionExecution',
+                category: 'ActionExecution'
             });
             if (nextStep.step !== 'Retry') {
                 this._generalValidationRetryCount++;
@@ -652,13 +711,13 @@ class BaseAgent {
             return {
                 step: 'Retry',
                 terminate: false,
-                errorMessage: `Actions '${missingActionNames}' not found or not active`,
+                errorMessage: `Actions '${missingActionNames}' not found or not active`
             };
         }
         if (nextStep.actions) {
             const violatedActions = [];
             for (const action of nextStep.actions) {
-                const agentAction = curAgentActions.find((aa) => aa.Action.trim().toLowerCase() === action.name.trim().toLowerCase());
+                const agentAction = curAgentActions.find(aa => aa.Action.trim().toLowerCase() === action.name.trim().toLowerCase());
                 if (agentAction && agentAction.MaxExecutionsPerRun != null) {
                     const executionCount = await this.getActionExecutionCount(agentRun.ID, agentAction.ActionID);
                     if (executionCount >= agentAction.MaxExecutionsPerRun) {
@@ -672,8 +731,8 @@ class BaseAgent {
                     agent: params.agent,
                     category: 'ActionExecution',
                     metadata: {
-                        violatedActions,
-                    },
+                        violatedActions
+                    }
                 });
                 if (nextStep.step !== 'Retry') {
                     this._generalValidationRetryCount++;
@@ -681,7 +740,7 @@ class BaseAgent {
                 return {
                     step: 'Retry',
                     terminate: false,
-                    errorMessage: violationMessage,
+                    errorMessage: violationMessage
                 };
             }
         }
@@ -693,7 +752,7 @@ class BaseAgent {
             const violationMessage = `Minimum execution requirements not met:\n${minViolations.join('\n')}`;
             this.logError(violationMessage, {
                 agent: params.agent,
-                category: 'MinimumExecutionValidation',
+                category: 'MinimumExecutionValidation'
             });
             if (nextStep.step !== 'Retry') {
                 this._generalValidationRetryCount++;
@@ -701,7 +760,7 @@ class BaseAgent {
             return {
                 step: 'Retry',
                 terminate: false,
-                errorMessage: violationMessage,
+                errorMessage: violationMessage
             };
         }
         const agent = params.agent;
@@ -719,8 +778,8 @@ class BaseAgent {
                     metadata: {
                         agentName: agent.Name,
                         agentId: agent.ID,
-                        validationSchema: agent.FinalPayloadValidation,
-                    },
+                        validationSchema: agent.FinalPayloadValidation
+                    }
                 });
                 return nextStep;
             }
@@ -732,11 +791,11 @@ class BaseAgent {
                     return this.handleFinalPayloadValidationFailure(params, nextStep, currentPayload, agent.FinalPayloadValidationMode || 'Retry', [errorMessage], agentRun, currentStep);
                 }
             }
-            const jsonValidator = new global_2.JSONValidator();
+            const jsonValidator = new global_1.JSONValidator();
             const validationResult = jsonValidator.validate(payloadToValidate, validationSchema);
             if (!validationResult.Success) {
                 const mode = agent.FinalPayloadValidationMode || 'Retry';
-                const errorMessages = validationResult.Errors.map((e) => e.Message);
+                const errorMessages = validationResult.Errors.map(e => e.Message);
                 this.logStatus(`⚠️ Final payload validation failed for agent ${agent.Name} (mode: ${mode}):`, true, params);
                 errorMessages.forEach((error, index) => {
                     this.logStatus(`   ${index + 1}. ${error}`, true, params);
@@ -752,7 +811,7 @@ class BaseAgent {
             catch (error) {
                 this.logError(`Failed to save validation success result: ${error.message}`, {
                     category: 'PayloadValidation',
-                    metadata: { stepId: currentStep.ID },
+                    metadata: { stepId: currentStep.ID }
                 });
             }
             return nextStep;
@@ -763,8 +822,8 @@ class BaseAgent {
                 metadata: {
                     agentName: agent.Name,
                     agentId: agent.ID,
-                    error: error.message,
-                },
+                    error: error.message
+                }
             });
             return nextStep;
         }
@@ -785,7 +844,7 @@ class BaseAgent {
                             ...nextStep,
                             step: 'Failed',
                             message: `${validationFeedback}\n\nMax validation retries (${maxRetries}) exceeded.`,
-                            terminate: true,
+                            terminate: true
                         };
                     }
                     currentStep.FinalPayloadValidationResult = 'Retry';
@@ -795,7 +854,7 @@ class BaseAgent {
                         ...nextStep,
                         step: 'Retry',
                         retryInstructions: `${validationFeedback}\n\nRetry attempt ${this._validationRetryCount} of ${maxRetries}`,
-                        terminate: false,
+                        terminate: false
                     };
                 case 'Fail':
                     currentStep.FinalPayloadValidationResult = 'Fail';
@@ -804,7 +863,7 @@ class BaseAgent {
                         ...nextStep,
                         step: 'Failed',
                         message: validationFeedback,
-                        terminate: true,
+                        terminate: true
                     };
                 case 'Warn':
                     this.logStatus(`⚠️ WARNING: ${validationFeedback}`, false, params);
@@ -819,23 +878,21 @@ class BaseAgent {
                         ...nextStep,
                         step: 'Retry',
                         retryInstructions: validationFeedback,
-                        terminate: false,
+                        terminate: false
                     };
             }
         }
         catch (error) {
             this.logError(`Failed to save validation results: ${error.message}`, {
                 category: 'PayloadValidation',
-                metadata: { stepId: currentStep.ID },
+                metadata: { stepId: currentStep.ID }
             });
-            return mode === 'Warn'
-                ? nextStep
-                : {
-                    ...nextStep,
-                    step: mode === 'Fail' ? 'Failed' : 'Retry',
-                    message: validationFeedback,
-                    terminate: mode === 'Fail',
-                };
+            return mode === 'Warn' ? nextStep : {
+                ...nextStep,
+                step: mode === 'Fail' ? 'Failed' : 'Retry',
+                message: validationFeedback,
+                terminate: mode === 'Fail'
+            };
         }
     }
     async validateFailedNextStep(params, nextStep, currentPayload, agentRun, currentStep) {
@@ -859,15 +916,15 @@ class BaseAgent {
                     mappedStep = 'Retry';
                     break;
                 default:
-                    (0, global_1.LogError)(`Invalid ChatHandlingOption value: ${chatHandlingOption}. Expected 'Success', 'Failed', or 'Retry'. Treating as null and allowing Chat to propagate.`);
+                    (0, core_1.LogError)(`Invalid ChatHandlingOption value: ${chatHandlingOption}. Expected 'Success', 'Failed', or 'Retry'. Treating as null and allowing Chat to propagate.`);
                     return nextStep;
             }
             const remappedStep = {
                 ...nextStep,
-                step: mappedStep,
+                step: mappedStep
             };
-            if (params.verbose === true || (0, global_1.IsVerboseLoggingEnabled)()) {
-                (0, global_1.LogStatus)(`Remapping Chat step to ${chatHandlingOption} based on agent's ChatHandlingOption`);
+            if (params.verbose === true || (0, core_1.IsVerboseLoggingEnabled)()) {
+                (0, core_1.LogStatus)(`Remapping Chat step to ${chatHandlingOption} based on agent's ChatHandlingOption`);
             }
             return await this.validateNextStep(params, remappedStep, currentPayload, agentRun, currentStep);
         }
@@ -889,15 +946,15 @@ class BaseAgent {
                         limit: guardrailResult.limit,
                         current: guardrailResult.current,
                         reason: guardrailResult.reason,
-                        timestamp: new Date().toISOString(),
-                    },
+                        timestamp: new Date().toISOString()
+                    }
                 });
                 await currentStep.Save();
             }
             catch (error) {
                 this.logError(`Failed to save guardrail violation to step: ${error.message}`, {
                     category: 'Guardrails',
-                    metadata: { stepId: currentStep.ID },
+                    metadata: { stepId: currentStep.ID }
                 });
             }
             return {
@@ -905,7 +962,7 @@ class BaseAgent {
                 step: 'Failed',
                 terminate: true,
                 message: guardrailResult.reason,
-                errorMessage: guardrailResult.reason,
+                errorMessage: guardrailResult.reason
             };
         }
         return nextStep;
@@ -919,7 +976,7 @@ class BaseAgent {
                     type: 'cost',
                     limit: agent.MaxCostPerRun,
                     current: agentRun.TotalCost,
-                    reason: `Maximum cost limit of $${agent.MaxCostPerRun} exceeded. Current cost: $${agentRun.TotalCost.toFixed(4)}`,
+                    reason: `Maximum cost limit of $${agent.MaxCostPerRun} exceeded. Current cost: $${agentRun.TotalCost.toFixed(4)}`
                 };
             }
         }
@@ -930,7 +987,7 @@ class BaseAgent {
                     type: 'tokens',
                     limit: agent.MaxTokensPerRun,
                     current: agentRun.TotalTokensUsed,
-                    reason: `Maximum token limit of ${agent.MaxTokensPerRun} exceeded. Current tokens: ${agentRun.TotalTokensUsed}`,
+                    reason: `Maximum token limit of ${agent.MaxTokensPerRun} exceeded. Current tokens: ${agentRun.TotalTokensUsed}`
                 };
             }
         }
@@ -941,7 +998,7 @@ class BaseAgent {
                     type: 'iterations',
                     limit: agent.MaxIterationsPerRun,
                     current: agentRun.TotalPromptIterations,
-                    reason: `Maximum iteration limit of ${agent.MaxIterationsPerRun} exceeded. Current iterations: ${agentRun.TotalPromptIterations}`,
+                    reason: `Maximum iteration limit of ${agent.MaxIterationsPerRun} exceeded. Current iterations: ${agentRun.TotalPromptIterations}`
                 };
             }
         }
@@ -953,7 +1010,7 @@ class BaseAgent {
                     type: 'time',
                     limit: agent.MaxTimePerRun,
                     current: elapsedSeconds,
-                    reason: `Maximum time limit of ${agent.MaxTimePerRun} seconds exceeded. Elapsed time: ${elapsedSeconds} seconds`,
+                    reason: `Maximum time limit of ${agent.MaxTimePerRun} seconds exceeded. Elapsed time: ${elapsedSeconds} seconds`
                 };
             }
         }
@@ -963,7 +1020,7 @@ class BaseAgent {
                 type: 'iterations',
                 limit: BaseAgent.MAX_VALIDATION_RETRIES,
                 current: this._generalValidationRetryCount,
-                reason: `Maximum validation retries of ${BaseAgent.MAX_VALIDATION_RETRIES} exceeded. The agent is unable to produce valid output after ${this._generalValidationRetryCount} validation failures.`,
+                reason: `Maximum validation retries of ${BaseAgent.MAX_VALIDATION_RETRIES} exceeded. The agent is unable to produce valid output after ${this._generalValidationRetryCount} validation failures.`
             };
         }
         return { exceeded: false };
@@ -979,7 +1036,7 @@ class BaseAgent {
         const fatalErrorTypes = [
             'ContextLengthExceeded',
             'Authentication',
-            'InvalidRequest',
+            'InvalidRequest'
         ];
         return fatalErrorTypes.includes(errorInfo.errorType);
     }
@@ -987,14 +1044,12 @@ class BaseAgent {
         if (typeof content === 'string') {
             return content;
         }
-        return content
-            .map((block) => {
+        return content.map((block) => {
             if (block.type === 'text') {
                 return block.content;
             }
             return `[${block.type}: ${block.content}]`;
-        })
-            .join('\n');
+        }).join('\n');
     }
     smartTrimContent(content, maxLength = 1000) {
         const originalLength = content.length;
@@ -1009,7 +1064,7 @@ class BaseAgent {
                     return {
                         trimmed,
                         strategy: 'JSON array truncation',
-                        originalLength,
+                        originalLength
                     };
                 }
             }
@@ -1036,7 +1091,7 @@ class BaseAgent {
                 return {
                     trimmed: JSON.stringify(truncated, null, 2),
                     strategy: 'JSON object field truncation',
-                    originalLength,
+                    originalLength
                 };
             }
         }
@@ -1055,7 +1110,7 @@ class BaseAgent {
                     return {
                         trimmed,
                         strategy: 'CSV row truncation',
-                        originalLength,
+                        originalLength
                     };
                 }
             }
@@ -1064,78 +1119,264 @@ class BaseAgent {
             return {
                 trimmed: content.substring(0, maxLength) + '\n\n... (truncated due to context length)',
                 strategy: 'character truncation',
-                originalLength,
+                originalLength
             };
         }
         return {
             trimmed: content,
             strategy: 'no truncation needed',
-            originalLength,
+            originalLength
+        };
+    }
+    recoveryStrategy_RemoveOldestActionResults(params, tokensToSave, currentStepCount, minAge = 5) {
+        let tokensSaved = 0;
+        const removedIndices = [];
+        const candidates = params.conversationMessages
+            .map((msg, index) => ({
+            message: msg,
+            index: index,
+            age: msg.metadata?.turnAdded
+                ? currentStepCount - msg.metadata.turnAdded
+                : 0,
+            tokens: this.estimateTokens(msg.content),
+            isActionResult: msg.metadata?.messageType === 'action-result'
+        }))
+            .filter(c => c.isActionResult && c.age >= minAge)
+            .sort((a, b) => b.age - a.age);
+        for (const candidate of candidates) {
+            if (tokensSaved >= tokensToSave)
+                break;
+            removedIndices.push(candidate.index);
+            tokensSaved += candidate.tokens;
+            this.logStatus(`Removing action-result from ${candidate.age} turns ago (${candidate.tokens} tokens)`, true, params);
+        }
+        removedIndices.sort((a, b) => b - a).forEach(index => {
+            const removed = params.conversationMessages.splice(index, 1)[0];
+            this.emitMessageLifecycleEvent({
+                type: 'message-removed',
+                turn: currentStepCount,
+                messageIndex: index,
+                message: removed,
+                reason: 'Context recovery - oldest action results',
+                tokensSaved: this.estimateTokens(removed.content)
+            });
+        });
+        return {
+            tokensSaved,
+            strategyName: `Removed ${removedIndices.length} old action-results (${minAge}+ turns)`
+        };
+    }
+    async recoveryStrategy_CompactOldActionResults(params, tokensToSave, currentStepCount, minAge = 3) {
+        let tokensSaved = 0;
+        let compactedCount = 0;
+        const candidates = params.conversationMessages
+            .map((msg, index) => ({
+            message: msg,
+            index: index,
+            age: msg.metadata?.turnAdded
+                ? currentStepCount - msg.metadata.turnAdded
+                : 0,
+            tokens: this.estimateTokens(msg.content),
+            isActionResult: msg.metadata?.messageType === 'action-result',
+            alreadyCompacted: msg.metadata?.wasCompacted === true
+        }))
+            .filter(c => c.isActionResult && c.age >= minAge && !c.alreadyCompacted)
+            .sort((a, b) => b.age - a.age);
+        for (const candidate of candidates) {
+            if (tokensSaved >= tokensToSave)
+                break;
+            const originalTokens = candidate.tokens;
+            const originalMessage = candidate.message;
+            const originalContent = typeof originalMessage.content === 'string'
+                ? originalMessage.content
+                : JSON.stringify(originalMessage.content);
+            const compactedContent = await this.compactMessage(originalMessage, {
+                compactMode: 'First N Chars',
+                compactLength: 500,
+                compactPromptId: '',
+                originalLength: originalContent.length
+            }, params);
+            const newTokens = this.estimateTokens(compactedContent);
+            const saved = originalTokens - newTokens;
+            if (saved > 0) {
+                params.conversationMessages[candidate.index] = {
+                    ...originalMessage,
+                    content: compactedContent,
+                    metadata: {
+                        ...originalMessage.metadata,
+                        wasCompacted: true,
+                        originalLength: originalContent.length,
+                        tokensSaved: saved
+                    }
+                };
+                tokensSaved += saved;
+                compactedCount++;
+                this.logStatus(`Compacted action-result from ${candidate.age} turns ago (saved ${saved} tokens)`, true, params);
+            }
+        }
+        return {
+            tokensSaved,
+            strategyName: `Compacted ${compactedCount} old action-results (${minAge}+ turns)`
         };
     }
-    async attemptContextRecovery(params, payload, errorMessage) {
-        this.logStatus(`⚠️ Context length exceeded - attempting recovery by trimming conversation messages`, true, params);
-        const messages = params.conversationMessages;
+    async recoveryStrategy_CompactAllActionResults(params, tokensToSave) {
+        let tokensSaved = 0;
+        let compactedCount = 0;
+        const candidates = params.conversationMessages
+            .map((msg, index) => ({
+            message: msg,
+            index: index,
+            tokens: this.estimateTokens(msg.content),
+            isActionResult: msg.metadata?.messageType === 'action-result',
+            alreadyCompacted: msg.metadata?.wasCompacted === true
+        }))
+            .filter(c => c.isActionResult && !c.alreadyCompacted && c.tokens > 200)
+            .sort((a, b) => b.tokens - a.tokens);
+        for (const candidate of candidates) {
+            if (tokensSaved >= tokensToSave)
+                break;
+            const originalTokens = candidate.tokens;
+            const originalMessage = candidate.message;
+            const originalContent = typeof originalMessage.content === 'string'
+                ? originalMessage.content
+                : JSON.stringify(originalMessage.content);
+            const compactedContent = await this.compactMessage(originalMessage, {
+                compactMode: 'First N Chars',
+                compactLength: 200,
+                compactPromptId: '',
+                originalLength: originalContent.length
+            }, params);
+            const newTokens = this.estimateTokens(compactedContent);
+            const saved = originalTokens - newTokens;
+            if (saved > 0) {
+                params.conversationMessages[candidate.index] = {
+                    ...originalMessage,
+                    content: compactedContent,
+                    metadata: {
+                        ...originalMessage.metadata,
+                        wasCompacted: true,
+                        originalLength: originalContent.length,
+                        tokensSaved: saved
+                    }
+                };
+                tokensSaved += saved;
+                compactedCount++;
+            }
+        }
+        return {
+            tokensSaved,
+            strategyName: `Aggressively compacted ${compactedCount} action-results`
+        };
+    }
+    recoveryStrategy_TrimLastUserMessage(params, tokensToSave) {
         let lastUserMessageIndex = -1;
-        for (let i = messages.length - 1; i >= 0; i--) {
-            if (messages[i].role === 'user') {
+        for (let i = params.conversationMessages.length - 1; i >= 0; i--) {
+            if (params.conversationMessages[i].role === 'user') {
                 lastUserMessageIndex = i;
                 break;
             }
         }
         if (lastUserMessageIndex === -1) {
-            this.logStatus(`❌ Context recovery failed: No trimmable user messages found`, true, params);
+            return { tokensSaved: 0, strategyName: 'No user message to trim' };
+        }
+        const lastUserMessage = params.conversationMessages[lastUserMessageIndex];
+        const originalTokens = this.estimateTokens(lastUserMessage.content);
+        const contentString = this.contentToString(lastUserMessage.content);
+        const targetChars = 1000;
+        if (contentString.length <= targetChars) {
+            return { tokensSaved: 0, strategyName: 'User message already short' };
+        }
+        const trimResult = this.smartTrimContent(contentString, targetChars);
+        const newContent = trimResult.trimmed +
+            '\n\n<CONTEXT_LIMIT_REACHED>\n' +
+            'Note: The conversation has exceeded the model\'s context window. ' +
+            'The remainder of your message was trimmed to fit within the limit. ' +
+            'The beginning of your request (shown above) has been preserved.\n' +
+            '</CONTEXT_LIMIT_REACHED>';
+        const newTokens = this.estimateTokens(newContent);
+        const saved = originalTokens - newTokens;
+        if (saved > 0) {
+            params.conversationMessages[lastUserMessageIndex] = {
+                ...lastUserMessage,
+                content: newContent
+            };
+        }
+        return {
+            tokensSaved: saved,
+            strategyName: 'Preserved beginning of user message with context limit marker'
+        };
+    }
+    async attemptContextRecovery(params, payload, errorMessage, modelSelectionInfo) {
+        this.logStatus(`⚠️ Context length exceeded - attempting recovery with multi-strategy approach`, true, params);
+        const modelLimit = this.getModelContextLimit(modelSelectionInfo);
+        const currentTokens = this.estimateConversationTokens(params.conversationMessages);
+        const tokensToSave = currentTokens - Math.floor(modelLimit * 0.9);
+        this.logStatus(`Need to save ~${tokensToSave} tokens (current: ${currentTokens}, limit: ${modelLimit})`, true, params);
+        if (tokensToSave <= 0) {
+            this.logStatus(`Already under context limit, retrying...`, true, params);
+            return {
+                step: 'Retry',
+                retryReason: 'Context recovery - already under limit',
+                retryInstructions: 'The context is now within limits.',
+                terminate: false,
+                previousPayload: payload,
+                newPayload: payload
+            };
+        }
+        const currentStepCount = this._agentRun?.Steps?.length || 0;
+        const strategies = [
+            () => this.recoveryStrategy_RemoveOldestActionResults(params, tokensToSave, currentStepCount, 5),
+            () => this.recoveryStrategy_CompactOldActionResults(params, tokensToSave, currentStepCount, 3),
+            () => this.recoveryStrategy_RemoveOldestActionResults(params, tokensToSave, currentStepCount, 2),
+            () => this.recoveryStrategy_CompactAllActionResults(params, tokensToSave),
+            () => Promise.resolve(this.recoveryStrategy_TrimLastUserMessage(params, tokensToSave))
+        ];
+        let tokensSaved = 0;
+        const strategiesUsed = [];
+        for (const strategy of strategies) {
+            const result = await strategy();
+            tokensSaved += result.tokensSaved;
+            if (result.tokensSaved > 0) {
+                strategiesUsed.push(result.strategyName);
+                this.logStatus(`${result.strategyName}: saved ${result.tokensSaved} tokens`, true, params);
+            }
+            if (tokensSaved >= tokensToSave) {
+                break;
+            }
+        }
+        if (tokensSaved < tokensToSave * 0.5) {
+            this.logStatus(`❌ Context recovery insufficient: only saved ${tokensSaved}/${tokensToSave} tokens`, true, params);
             return {
-                errorMessage: `Context overflow with no trimmable messages: ${errorMessage}`,
+                errorMessage: `Context recovery failed: only saved ${tokensSaved}/${tokensToSave} tokens. ${errorMessage}`,
                 step: 'Failed',
                 terminate: true,
                 previousPayload: payload,
-                newPayload: payload,
+                newPayload: payload
             };
         }
-        const originalMessage = messages[lastUserMessageIndex];
-        const contentString = this.contentToString(originalMessage.content);
-        const trimResult = this.smartTrimContent(contentString, 1000);
-        this.logStatus(`✂️ Trimmed message from ${trimResult.originalLength.toLocaleString()} to ${trimResult.trimmed.length.toLocaleString()} characters using ${trimResult.strategy}`, true, params);
-        messages[lastUserMessageIndex] = {
-            role: 'user',
-            content: `⚠️ CONTEXT OVERFLOW RECOVERY ⚠️
-
-The previous step returned a result that exceeded the context window (${(trimResult.originalLength - trimResult.trimmed.length).toLocaleString()} characters truncated).
-
-Here is a PARTIAL result from the previous action:
----
-${trimResult.trimmed}
----
-
-❗ THE ABOVE IS INCOMPLETE - the full result was too large for the context window.
-
-RECOMMENDED ACTIONS:
-1. Use a different action with more specific filters to get smaller result sets
-2. Request data in batches or pages instead of all at once
-3. Ask the user to clarify scope to narrow the query
-4. If you need the full data, acknowledge the limitation and ask the user how to proceed
-
-Please choose an alternative approach to complete your task.`,
-        };
+        this.logStatus(`✅ Context recovery successful: saved ${tokensSaved} tokens using ${strategiesUsed.length} strategies`, true, params);
+        const strategyDescriptions = strategiesUsed.map((strategy, index) => `${index + 1}. ${strategy}`).join('\n');
         return {
             step: 'Retry',
-            retryReason: 'Context length recovery - previous result too large',
-            retryInstructions: 'The previous action result exceeded context limits. Use more specific filters or request data in smaller batches.',
+            retryReason: `Context recovery successful - ${tokensSaved} tokens freed`,
+            retryInstructions: `The conversation exceeded the model's context limit (${modelLimit} tokens). I've applied the following context recovery strategies to free up ${tokensSaved} tokens:
+
+${strategyDescriptions}
+
+The context is now within limits. Please retry your request with the recovered context.`,
             terminate: false,
             previousPayload: payload,
-            newPayload: payload,
+            newPayload: payload
         };
     }
     async processNextStep(nextStep, params, agentType, promptResult, currentPayload, currentStep) {
         const validatedNextStep = await this.validateNextStep(params, nextStep, currentPayload, this._agentRun, currentStep);
         const guardrailCheckedStep = await this.checkExecutionGuardrails(params, validatedNextStep, currentPayload, this._agentRun, currentStep);
         this.logStatus(`📌 Next step determined: ${guardrailCheckedStep.step}${guardrailCheckedStep.terminate ? ' (terminating)' : ''}`, true, params);
-        if (guardrailCheckedStep.step === 'Retry' &&
-            (guardrailCheckedStep.message || guardrailCheckedStep.errorMessage || guardrailCheckedStep.retryInstructions)) {
+        if (guardrailCheckedStep.step === 'Retry' && (guardrailCheckedStep.message || guardrailCheckedStep.errorMessage || guardrailCheckedStep.retryInstructions)) {
             params.conversationMessages.push({
                 role: 'user',
-                content: `Retrying due to: ${guardrailCheckedStep.retryInstructions || guardrailCheckedStep.message || guardrailCheckedStep.errorMessage}`,
+                content: `Retrying due to: ${guardrailCheckedStep.retryInstructions || guardrailCheckedStep.message || guardrailCheckedStep.errorMessage}`
             });
         }
         return guardrailCheckedStep;
@@ -1152,36 +1393,37 @@ Please choose an alternative approach to complete your task.`,
                 outputs: outputParams.reduce((acc, param) => {
                     acc[param.Name] = param.Value;
                     return acc;
-                }, {}),
+                }, {})
             };
         });
         return {
             role: 'user',
-            content: `Action results:\n${JSON.stringify(resultSummary, null, 2)}`,
+            content: `Action results:\n${JSON.stringify(resultSummary, null, 2)}`
         };
     }
     createSubAgentResultMessage(subAgent, result) {
         return {
             role: 'user',
-            content: `Sub-agent '${subAgent.name}' result:\n${typeof result === 'string' ? result : JSON.stringify(result, null, 2)}`,
+            content: `Sub-agent '${subAgent.name}' result:\n${typeof result === 'string' ? result : JSON.stringify(result, null, 2)}`
         };
     }
     async gatherPromptTemplateData(agent, _contextUser, extraData) {
         try {
             const engine = aiengine_1.AIEngine.Instance;
-            const activeSubAgents = engine.Agents.filter((a) => a.ParentID === agent.ID && a.Status === 'Active').sort((a, b) => a.ExecutionOrder - b.ExecutionOrder);
-            const activeAgentRelationships = engine.AgentRelationships.filter((ar) => ar.AgentID === agent.ID && ar.Status === 'Active');
+            const activeSubAgents = engine.Agents.filter(a => a.ParentID === agent.ID && a.Status === 'Active')
+                .sort((a, b) => a.ExecutionOrder - b.ExecutionOrder);
+            const activeAgentRelationships = engine.AgentRelationships.filter(ar => ar.AgentID === agent.ID && ar.Status === 'Active');
             const uniqueActiveSubAgentIDs = new Set();
-            activeSubAgents.forEach((a) => uniqueActiveSubAgentIDs.add(a.ID));
-            activeAgentRelationships.forEach((ar) => uniqueActiveSubAgentIDs.add(ar.SubAgentID));
-            const uniqueActiveSubAgents = Array.from(uniqueActiveSubAgentIDs).map((id) => engine.Agents.find((a) => a.ID === id));
-            const agentActions = engine.AgentActions.filter((aa) => aa.AgentID === agent.ID && aa.Status === 'Active');
-            const actions = actions_1.ActionEngineServer.Instance.Actions.filter((a) => agentActions.some((aa) => aa.ActionID === a.ID));
-            const activeActions = actions.filter((a) => a.Status === 'Active');
+            activeSubAgents.forEach(a => uniqueActiveSubAgentIDs.add(a.ID));
+            activeAgentRelationships.forEach(ar => uniqueActiveSubAgentIDs.add(ar.SubAgentID));
+            const uniqueActiveSubAgents = Array.from(uniqueActiveSubAgentIDs).map(id => engine.Agents.find(a => a.ID === id));
+            const agentActions = engine.AgentActions.filter(aa => aa.AgentID === agent.ID && aa.Status === 'Active');
+            const actions = actions_1.ActionEngineServer.Instance.Actions.filter(a => agentActions.some(aa => aa.ActionID === a.ID));
+            const activeActions = actions.filter(a => a.Status === 'Active');
             const contextData = {
                 agentName: agent.Name,
                 agentDescription: agent.Description,
-                parentAgentName: agent.Parent ? agent.Parent.trim() : '',
+                parentAgentName: agent.Parent ? agent.Parent.trim() : "",
                 subAgentCount: uniqueActiveSubAgents.length,
                 subAgentDetails: this.formatSubAgentDetails(uniqueActiveSubAgents),
                 actionCount: actions.length,
@@ -1190,7 +1432,7 @@ Please choose an alternative approach to complete your task.`,
             if (extraData) {
                 return {
                     ...contextData,
-                    ...extraData,
+                    ...extraData
                 };
             }
             else {
@@ -1207,7 +1449,7 @@ Please choose an alternative approach to complete your task.`,
             const actionParams = Object.entries(action.params || {}).map(([key, value]) => ({
                 Name: key,
                 Value: value,
-                Type: 'Input',
+                Type: 'Input'
             }));
             const result = await actionEngine.RunAction({
                 Action: actionEntity,
@@ -1215,7 +1457,7 @@ Please choose an alternative approach to complete your task.`,
                 ContextUser: contextUser,
                 Filters: [],
                 SkipActionLog: false,
-                Context: params.context,
+                Context: params.context
             });
             if (result.Success) {
                 this.logStatus(`   ✅ Action '${action.name}' completed successfully`, true, params);
@@ -1230,24 +1472,67 @@ Please choose an alternative approach to complete your task.`,
                 category: 'ActionExecution',
                 metadata: {
                     actionName: action.name,
-                    actionParams: action.params,
-                },
+                    actionParams: action.params
+                }
             });
             throw new Error(`Error executing actions: ${error.message}`);
         }
     }
+    prepareSubAgentMessages(params, subAgentRequest, subAgent, contextMessage) {
+        const engine = aiengine_1.AIEngine.Instance;
+        let messages = [];
+        const relationship = engine.AgentRelationships.find(r => r.AgentID === params.agent.ID && r.SubAgentID === subAgent.ID);
+        let messageMode = relationship?.MessageMode || subAgent.MessageMode || 'None';
+        let maxMessages = relationship?.MaxMessages || subAgent.MaxMessages || null;
+        switch (messageMode) {
+            case 'None':
+                break;
+            case 'All':
+                messages = [...params.conversationMessages];
+                break;
+            case 'Latest':
+                if (maxMessages && maxMessages > 0) {
+                    messages = params.conversationMessages.slice(-maxMessages);
+                }
+                else {
+                    messages = [...params.conversationMessages];
+                }
+                break;
+            case 'Bookend':
+                if (maxMessages && maxMessages > 2 && params.conversationMessages.length > maxMessages) {
+                    const firstTwo = params.conversationMessages.slice(0, 2);
+                    const remaining = params.conversationMessages.slice(-(maxMessages - 2));
+                    const omittedCount = params.conversationMessages.length - maxMessages;
+                    messages = [
+                        ...firstTwo,
+                        {
+                            role: 'system',
+                            content: `[${omittedCount} messages omitted for context management]`
+                        },
+                        ...remaining
+                    ];
+                }
+                else {
+                    messages = [...params.conversationMessages];
+                }
+                break;
+            default:
+                break;
+        }
+        if (contextMessage) {
+            messages.push(contextMessage);
+        }
+        messages.push({
+            role: 'user',
+            content: subAgentRequest.message
+        });
+        return messages;
+    }
     async ExecuteSubAgent(params, subAgentRequest, subAgent, stepEntity, payload, contextMessage) {
         try {
             this.logStatus(`🤖 Executing sub-agent '${subAgentRequest.name}'`, true, params);
             const runner = new AgentRunner_1.AgentRunner();
-            const subAgentMessages = [];
-            if (contextMessage) {
-                subAgentMessages.push(contextMessage);
-            }
-            subAgentMessages.push({
-                role: 'user',
-                content: subAgentRequest.message,
-            });
+            const subAgentMessages = this.prepareSubAgentMessages(params, subAgentRequest, subAgent, contextMessage);
             this.logStatus(`📨 Sub-agent message: "${subAgentRequest.message}"`, true, params);
             if (subAgentRequest.templateParameters) {
                 this.logStatus(`📎 Template parameters: ${JSON.stringify(subAgentRequest.templateParameters)}`, true, params);
@@ -1277,7 +1562,7 @@ Please choose an alternative approach to complete your task.`,
                 onAgentRunCreated: async (agentRunId) => {
                     stepEntity.TargetLogID = agentRunId;
                     await stepEntity.Save();
-                },
+                }
             });
             if (result.success) {
                 this.logStatus(`✅ Sub-agent '${subAgentRequest.name}' completed successfully`, true, params);
@@ -1293,17 +1578,17 @@ Please choose an alternative approach to complete your task.`,
                 metadata: {
                     agentName: params.agent.Name,
                     subAgentName: subAgentRequest.name,
-                    message: subAgentRequest.message,
-                },
+                    message: subAgentRequest.message
+                }
             });
             throw new Error(`Error executing sub-agent: ${error.message}`);
         }
     }
     formatSubAgentDetails(subAgents) {
-        return JSON.stringify(subAgents.map((sa) => {
+        return JSON.stringify(subAgents.map(sa => {
             const result = {
                 Name: sa.Name,
-                Description: sa.Description,
+                Description: sa.Description
             };
             if (sa.ExecutionMode !== 'Sequential') {
                 result['ExecutionMode'] = sa.ExecutionMode;
@@ -1314,39 +1599,45 @@ Please choose an alternative approach to complete your task.`,
     }
     getAgentPromptParameters(agent) {
         const engine = aiengine_1.AIEngine.Instance;
-        const agentPrompt = engine.AgentPrompts.filter((ap) => ap.AgentID === agent.ID && ap.Status === 'Active').sort((a, b) => a.ExecutionOrder - b.ExecutionOrder)[0];
+        const agentPrompt = engine.AgentPrompts
+            .filter(ap => ap.AgentID === agent.ID && ap.Status === 'Active')
+            .sort((a, b) => a.ExecutionOrder - b.ExecutionOrder)[0];
         if (!agentPrompt)
             return [];
-        const prompt = engine.Prompts.find((p) => p.ID === agentPrompt.PromptID);
+        const prompt = engine.Prompts.find(p => p.ID === agentPrompt.PromptID);
         if (!prompt)
             return [];
         return prompt.TemplateParams;
     }
     getAgentPromptParametersJSON(agent) {
         const params = this.getAgentPromptParameters(agent);
-        return JSON.stringify(params.map((param) => ({
+        return JSON.stringify(params.map(param => ({
             Name: param.Name,
             Type: param.Type,
             IsRequired: param.IsRequired,
             DefaultValue: param.DefaultValue,
-            Description: param.Description,
+            Description: param.Description
         })), null, 2);
     }
     formatActionDetails(actions) {
-        return JSON.stringify(actions.map((action) => ({
+        return JSON.stringify(actions.map(action => ({
             Name: action.Name,
             Description: action.Description,
             Parameters: {
-                Input: action.Params.filter((p) => p.Type.trim().toLowerCase() === 'input' || p.Type.trim().toLowerCase() === 'both').map((param) => this.formatActionParameter(param)),
-                Output: action.Params.filter((p) => p.Type.trim().toLowerCase() === 'output' || p.Type.trim().toLowerCase() === 'both').map((param) => this.formatActionParameter(param)),
+                Input: action.Params
+                    .filter(p => p.Type.trim().toLowerCase() === 'input' || p.Type.trim().toLowerCase() === 'both')
+                    .map(param => this.formatActionParameter(param)),
+                Output: action.Params
+                    .filter(p => p.Type.trim().toLowerCase() === 'output' || p.Type.trim().toLowerCase() === 'both')
+                    .map(param => this.formatActionParameter(param))
             },
-            ResultCodes: action.ResultCodes.map((rc) => ({
+            ResultCodes: action.ResultCodes.map(rc => ({
                 Code: rc.ResultCode,
                 IsSuccess: rc.IsSuccess,
                 Description: rc.Description || 'No description provided',
             })),
             Category: action.CategoryID ? this.getActionCategoryName(action.CategoryID) : null,
-            Status: action.Status,
+            Status: action.Status
         })), null, 2);
     }
     formatActionParameter(param) {
@@ -1357,7 +1648,7 @@ Please choose an alternative approach to complete your task.`,
             IsArray: param.IsArray,
             DefaultValue: param.DefaultValue,
             Description: param.Description,
-            ValueType: param.ValueType,
+            ValueType: param.ValueType
         };
     }
     formatParamValueForMessage(value, maxLength = 100) {
@@ -1380,7 +1671,7 @@ Please choose an alternative approach to complete your task.`,
         return `\`${stringValue}\``;
     }
     getAgentTypeName(typeID) {
-        const agentType = aiengine_1.AIEngine.Instance.AgentTypes.find((at) => at.ID === typeID);
+        const agentType = aiengine_1.AIEngine.Instance.AgentTypes.find(at => at.ID === typeID);
         return agentType?.Name || 'Unknown';
     }
     getValueListItems(valueListID) {
@@ -1392,11 +1683,11 @@ Please choose an alternative approach to complete your task.`,
     async initializeAgentRun(params) {
         let modifiedParams = params;
         if (params.lastRunId && params.autoPopulateLastRunPayload) {
-            const rv = new global_1.RunView();
+            const rv = new core_1.RunView();
             const lastRunResult = await rv.RunView({
                 EntityName: 'MJ: AI Agent Runs',
                 ExtraFilter: `ID='${params.lastRunId}'`,
-                ResultType: 'simple',
+                ResultType: 'simple'
             }, params.contextUser);
             if (lastRunResult.Success && lastRunResult.Results.length > 0) {
                 const lastRun = lastRunResult.Results[0];
@@ -1406,14 +1697,14 @@ Please choose an alternative approach to complete your task.`,
                         if (!params.payload) {
                             modifiedParams = {
                                 ...params,
-                                payload: lastPayload,
+                                payload: lastPayload
                             };
                         }
                     }
                     catch (e) {
                         this.logError(`Failed to parse FinalPayload from last run: ${e}`, {
                             category: 'LastRunPayload',
-                            metadata: { lastRunId: params.lastRunId },
+                            metadata: { lastRunId: params.lastRunId }
                         });
                     }
                 }
@@ -1454,8 +1745,8 @@ Please choose an alternative approach to complete your task.`,
             this._agentRun.Data = JSON.stringify(params.data);
         }
         this._agentRun.Verbose = params.verbose || false;
-        if (!(await this._agentRun.Save())) {
-            const errorMessage = JSON.stringify((0, global_2.CopyScalarsAndArrays)(this._agentRun.LatestResult));
+        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}`);
         }
         if (modifiedParams.onAgentRunCreated) {
@@ -1463,7 +1754,7 @@ Please choose an alternative approach to complete your task.`,
                 await modifiedParams.onAgentRunCreated(this._agentRun.ID);
             }
             catch (callbackError) {
-                (0, global_1.LogStatus)(`Error in onAgentRunCreated callback: ${callbackError.message}`);
+                (0, core_1.LogStatus)(`Error in onAgentRunCreated callback: ${callbackError.message}`);
             }
         }
         this._agentHierarchy = params.parentAgentHierarchy
@@ -1515,11 +1806,11 @@ Please choose an alternative approach to complete your task.`,
                 context: {
                     agentHierarchy: this._agentHierarchy,
                     depth: this._depth,
-                    stepNumber: stepEntity.StepNumber,
-                },
+                    stepNumber: stepEntity.StepNumber
+                }
             });
         }
-        if (!(await stepEntity.Save())) {
+        if (!await stepEntity.Save()) {
             throw new Error(`Failed to create agent run step record: ${JSON.stringify(stepEntity.LatestResult)}`);
         }
         if (this._agentRun) {
@@ -1533,35 +1824,29 @@ Please choose an alternative approach to complete your task.`,
             warnings: changeResult.warnings,
             requiresFeedback: changeResult.requiresFeedback,
             timestamp: changeResult.timestamp,
-            payloadValidation: changeResult.blockedOperations && changeResult.blockedOperations.length > 0
-                ? {
-                    selfWriteViolations: {
-                        deniedOperations: changeResult.blockedOperations,
-                        timestamp: changeResult.timestamp.toISOString(),
-                    },
-                }
-                : undefined,
-            analysis: changeResult.analysis
-                ? {
-                    totalWarnings: changeResult.analysis.summary.totalWarnings,
-                    warningsByType: changeResult.analysis.summary.warningsByType,
-                    suspiciousChanges: changeResult.analysis.summary.suspiciousChanges,
-                    criticalWarnings: changeResult.analysis.criticalWarnings.map((w) => ({
-                        type: w.type,
-                        severity: w.severity,
-                        path: w.path,
-                        message: w.message,
-                    })),
-                }
-                : undefined,
-            diffSummary: changeResult.diff
-                ? {
-                    added: changeResult.diff.summary.added,
-                    removed: changeResult.diff.summary.removed,
-                    modified: changeResult.diff.summary.modified,
-                    totalChanges: changeResult.diff.summary.totalPaths,
-                }
-                : undefined,
+            payloadValidation: changeResult.blockedOperations && changeResult.blockedOperations.length > 0 ? {
+                selfWriteViolations: {
+                    deniedOperations: changeResult.blockedOperations,
+                    timestamp: changeResult.timestamp.toISOString()
+                }
+            } : undefined,
+            analysis: changeResult.analysis ? {
+                totalWarnings: changeResult.analysis.summary.totalWarnings,
+                warningsByType: changeResult.analysis.summary.warningsByType,
+                suspiciousChanges: changeResult.analysis.summary.suspiciousChanges,
+                criticalWarnings: changeResult.analysis.criticalWarnings.map(w => ({
+                    type: w.type,
+                    severity: w.severity,
+                    path: w.path,
+                    message: w.message
+                }))
+            } : undefined,
+            diffSummary: changeResult.diff ? {
+                added: changeResult.diff.summary.added,
+                removed: changeResult.diff.summary.removed,
+                modified: changeResult.diff.summary.modified,
+                totalChanges: changeResult.diff.summary.totalPaths
+            } : undefined
         };
     }
     async finalizeStepEntity(stepEntity, success, errorMessage, outputData) {
@@ -1575,11 +1860,11 @@ Please choose an alternative approach to complete your task.`,
                 context: {
                     success,
                     durationMs: stepEntity.CompletedAt.getTime() - stepEntity.StartedAt.getTime(),
-                    errorMessage,
-                },
+                    errorMessage
+                }
             });
         }
-        if (!(await stepEntity.Save())) {
+        if (!await stepEntity.Save()) {
             console.error('Failed to update agent run step record');
         }
     }
@@ -1645,7 +1930,9 @@ Please choose an alternative approach to complete your task.`,
     }
     formatHierarchicalMessage(baseMessage) {
         if (this._depth > 0) {
-            const breadcrumb = this._agentHierarchy.slice(1).join(' → ');
+            const breadcrumb = this._agentHierarchy
+                .slice(1)
+                .join(' → ');
             return breadcrumb ? `${breadcrumb}: ${baseMessage}` : baseMessage;
         }
         return baseMessage;
@@ -1691,7 +1978,7 @@ Please choose an alternative approach to complete your task.`,
                         terminate: true,
                         step: 'Success',
                         previousPayload: previousDecision.previousPayload,
-                        newPayload: previousDecision.newPayload,
+                        newPayload: previousDecision.newPayload
                     };
                 }
                 else {
@@ -1703,7 +1990,7 @@ Please choose an alternative approach to complete your task.`,
                         terminate: true,
                         step: 'Failed',
                         previousPayload: previousDecision.previousPayload,
-                        newPayload: previousDecision.newPayload,
+                        newPayload: previousDecision.newPayload
                     };
                 }
                 else {
@@ -1725,23 +2012,14 @@ Please choose an alternative approach to complete your task.`,
             promptId: promptId,
             promptName: promptName,
             isRetry: !!previousDecision,
-            retryContext: previousDecision
-                ? {
-                    reason: previousDecision.retryReason,
-                    instructions: previousDecision.retryInstructions,
-                }
-                : undefined,
+            retryContext: previousDecision ? {
+                reason: previousDecision.retryReason,
+                instructions: previousDecision.retryInstructions
+            } : undefined,
             conversationMessages: params.conversationMessages,
         };
         const payload = previousDecision?.newPayload || params.payload;
-        const stepEntity = await this.createStepEntity({
-            stepType: 'Prompt',
-            stepName: 'Execute Agent Prompt',
-            contextUser: params.contextUser,
-            targetId: promptId,
-            inputData,
-            payloadAtStart: payload,
-        });
+        const stepEntity = await this.createStepEntity({ stepType: 'Prompt', stepName: 'Execute Agent Prompt', contextUser: params.contextUser, targetId: promptId, inputData, payloadAtStart: payload });
         try {
             const isRetry = !!previousDecision;
             const promptMessage = isRetry
@@ -1754,9 +2032,9 @@ Please choose an alternative approach to complete your task.`,
                 metadata: {
                     promptId: promptId,
                     isRetry,
-                    promptName: promptName,
+                    promptName: promptName
                 },
-                displayMode: 'live',
+                displayMode: 'live'
             });
             if (stepEntity && payload) {
                 stepEntity.PayloadAtStart = JSON.stringify(payload);
@@ -1766,36 +2044,32 @@ Please choose an alternative approach to complete your task.`,
                 const downstreamPaths = JSON.parse(params.agent.PayloadSelfReadPaths);
                 downstreamPayload = this._payloadManager.extractDownstreamPayload(`Self: ${params.agent.Name}`, payload, downstreamPaths);
             }
-            const promptConfig = promptToUse && promptToUse !== config.childPrompt
-                ? {
-                    ...config,
-                    childPrompt: promptToUse,
-                    systemPrompt: null,
-                }
-                : config;
+            const promptConfig = (promptToUse && promptToUse !== config.childPrompt) ? {
+                ...config,
+                childPrompt: promptToUse,
+                systemPrompt: null
+            } : config;
             if (this._agentRun) {
                 this._agentRun.TotalPromptIterations = (this._agentRun.TotalPromptIterations || 0) + 1;
             }
             const promptParams = await this.preparePromptParams(promptConfig, downstreamPayload, params);
             promptParams.cancellationToken = params.cancellationToken;
-            promptParams.onStreaming = params.onStreaming
-                ? (chunk) => {
-                    params.onStreaming({
-                        ...chunk,
-                        stepType: 'prompt',
-                        stepEntityId: stepEntity.ID,
-                    });
-                }
-                : undefined;
+            promptParams.onStreaming = params.onStreaming ? (chunk) => {
+                params.onStreaming({
+                    ...chunk,
+                    stepType: 'prompt',
+                    stepEntityId: stepEntity.ID
+                });
+            } : undefined;
             promptParams.onPromptRunCreated = async (promptRunId) => {
                 stepEntity.TargetLogID = promptRunId;
                 await stepEntity.Save();
             };
             const promptResult = await this.executePrompt(promptParams);
-            const loopMsgIndex = params.conversationMessages.findIndex((m) => m.metadata?._loopResults === true);
-            if (loopMsgIndex !== -1) {
-                params.conversationMessages.splice(loopMsgIndex, 1);
-            }
+            params.conversationMessages = params.conversationMessages.filter(m => {
+                const metadata = m.metadata;
+                return !metadata?._loopResults && !metadata?._subAgentResult;
+            });
             if (promptResult.promptRun?.ID) {
                 stepEntity.TargetLogID = promptResult.promptRun.ID;
                 stepEntity.PromptRun = promptResult.promptRun;
@@ -1803,11 +2077,12 @@ Please choose an alternative approach to complete your task.`,
             if (!promptResult.success) {
                 await this.finalizeStepEntity(stepEntity, false, promptResult.errorMessage);
                 const isFatal = this.isFatalPromptError(promptResult);
-                const isContextOverflow = isFatal && promptResult.chatResult?.errorInfo?.errorType === 'ContextLengthExceeded';
-                if (isContextOverflow && !this._contextRecoveryAttempted) {
-                    this._contextRecoveryAttempted = true;
+                const isContextOverflow = isFatal &&
+                    promptResult.chatResult?.errorInfo?.errorType === 'ContextLengthExceeded';
+                if (isContextOverflow && this._contextRecoveryAttempts < this.MAX_RECOVERY_ATTEMPTS) {
+                    this._contextRecoveryAttempts++;
                     this.logStatus(`⚠️ Context length exceeded - attempting recovery by trimming conversation`, true, params);
-                    return await this.attemptContextRecovery(params, payload, promptResult.errorMessage || 'Context length exceeded');
+                    return await this.attemptContextRecovery(params, payload, promptResult.errorMessage || 'Context length exceeded', promptResult.modelSelectionInfo);
                 }
                 this.logStatus(`❌ Prompt execution failed: ${promptResult.errorMessage} (fatal: ${isFatal})`, true, params);
                 return {
@@ -1815,7 +2090,7 @@ Please choose an alternative approach to complete your task.`,
                     step: 'Failed',
                     terminate: isFatal,
                     previousPayload: payload,
-                    newPayload: payload,
+                    newPayload: payload
                 };
             }
             if (params.cancellationToken?.aborted) {
@@ -1826,20 +2101,22 @@ Please choose an alternative approach to complete your task.`,
                     terminate: true,
                     step: 'Failed',
                     previousPayload: cancelledResult.payload,
-                    newPayload: cancelledResult.payload,
+                    newPayload: cancelledResult.payload
                 };
             }
             params.onProgress?.({
                 step: 'decision_processing',
                 percentage: 70,
                 message: this.formatHierarchicalMessage('Analyzing response and determining next steps'),
-                displayMode: 'both',
+                displayMode: 'both'
             });
             const initialNextStep = await this.determineNextStep(params, config.agentType, promptResult, payload);
             let finalPayload = payload;
             let currentStepPayloadChangeResult = undefined;
             if (initialNextStep.payloadChangeRequest) {
-                const allowedPaths = params.agent.PayloadSelfWritePaths ? JSON.parse(params.agent.PayloadSelfWritePaths) : undefined;
+                const allowedPaths = params.agent.PayloadSelfWritePaths
+                    ? JSON.parse(params.agent.PayloadSelfWritePaths)
+                    : undefined;
                 const changeResult = this._payloadManager.applyAgentChangeRequest(payload, initialNextStep.payloadChangeRequest, {
                     validateChanges: true,
                     logChanges: true,
@@ -1847,10 +2124,10 @@ Please choose an alternative approach to complete your task.`,
                     analyzeChanges: true,
                     generateDiff: true,
                     allowedPaths: allowedPaths,
-                    verbose: params.verbose === true || (0, global_1.IsVerboseLoggingEnabled)(),
+                    verbose: params.verbose === true || (0, core_1.IsVerboseLoggingEnabled)()
                 });
-                if (changeResult.warnings.length > 0 && (params.verbose === true || (0, global_1.IsVerboseLoggingEnabled)())) {
-                    (0, global_1.LogStatus)(`Payload warnings: ${changeResult.warnings.join('; ')}`);
+                if (changeResult.warnings.length > 0 && (params.verbose === true || (0, core_1.IsVerboseLoggingEnabled)())) {
+                    (0, core_1.LogStatus)(`Payload warnings: ${changeResult.warnings.join('; ')}`);
                 }
                 currentStepPayloadChangeResult = this.buildPayloadChangeResultSummary(changeResult);
                 finalPayload = changeResult.result;
@@ -1863,8 +2140,8 @@ Please choose an alternative approach to complete your task.`,
                     reasoning: this.getNextStepReasoning(updatedNextStep),
                 },
                 ...(currentStepPayloadChangeResult && {
-                    payloadChangeResult: currentStepPayloadChangeResult,
-                }),
+                    payloadChangeResult: currentStepPayloadChangeResult
+                })
             };
             if (stepEntity && finalPayload) {
                 stepEntity.PayloadAtEnd = JSON.stringify(finalPayload);
@@ -1895,12 +2172,13 @@ Please choose an alternative approach to complete your task.`,
                 step: 'Failed',
                 terminate: false,
                 previousPayload: payload,
-                newPayload: payload,
+                newPayload: payload
             };
             const guardailCheck = await this.hasExceededAgentRunGuardrails(params, this.AgentRun);
             if (guardailCheck && guardailCheck.exceeded) {
                 errorNextStep.terminate = true;
             }
+            ;
             return errorNextStep;
         }
     }
@@ -1916,12 +2194,12 @@ Please choose an alternative approach to complete your task.`,
             metadata: {
                 agentName: params.agent.Name,
                 subAgentName: subAgentRequest.name,
-                reason: subAgentRequest.message,
-            },
+                reason: subAgentRequest.message
+            }
         });
         params.conversationMessages.push({
             role: 'assistant',
-            content: `I'm delegating this task to the "${subAgentRequest.name}" agent.\n\nReason: ${subAgentRequest.message}`,
+            content: `I'm delegating this task to the "${subAgentRequest.name}" agent.\n\nReason: ${subAgentRequest.message}`
         });
         const inputData = {
             agentName: params.agent.Name,
@@ -1929,20 +2207,14 @@ Please choose an alternative approach to complete your task.`,
             message: subAgentRequest.message,
             terminateAfter: subAgentRequest.terminateAfter,
             conversationMessages: params.conversationMessages,
-            parentAgentHierarchy: this._agentHierarchy,
+            parentAgentHierarchy: this._agentHierarchy
         };
-        const subAgentEntity = aiengine_1.AIEngine.Instance.Agents.find((a) => a.Name === subAgentRequest.name && a.ParentID === params.agent.ID);
+        const subAgentEntity = aiengine_1.AIEngine.Instance.Agents.find(a => a.Name === subAgentRequest.name &&
+            a.ParentID === params.agent.ID);
         if (!subAgentEntity) {
             throw new Error(`Sub-agent '${subAgentRequest.name}' not found`);
         }
-        const stepEntity = await this.createStepEntity({
-            stepType: 'Sub-Agent',
-            stepName: `Execute Sub-Agent: ${subAgentRequest.name}`,
-            contextUser: params.contextUser,
-            targetId: subAgentEntity.ID,
-            inputData,
-            payloadAtStart: previousDecision.newPayload,
-        });
+        const stepEntity = await this.createStepEntity({ stepType: 'Sub-Agent', stepName: `Execute Sub-Agent: ${subAgentRequest.name}`, contextUser: params.contextUser, targetId: subAgentEntity.ID, inputData, payloadAtStart: previousDecision.newPayload });
         this.incrementExecutionCount(subAgentEntity.ID);
         try {
             let downstreamPaths = ['*'];
@@ -1963,8 +2235,8 @@ Please choose an alternative approach to complete your task.`,
                         subAgentName: subAgentRequest.name,
                         subAgentId: subAgentEntity.ID,
                         downstreamPaths: subAgentEntity.PayloadDownstreamPaths,
-                        upstreamPaths: subAgentEntity.PayloadUpstreamPaths,
-                    },
+                        upstreamPaths: subAgentEntity.PayloadUpstreamPaths
+                    }
                 });
             }
             let downstreamPayload = this._payloadManager.extractDownstreamPayload(subAgentRequest.name, previousDecision.newPayload, downstreamPaths);
@@ -1979,8 +2251,8 @@ Please choose an alternative approach to complete your task.`,
                             agentName: params.agent.Name,
                             subAgentName: subAgentRequest.name,
                             payloadScope: subAgentEntity.PayloadScope,
-                            availableKeys: Object.keys(downstreamPayload || {}),
-                        },
+                            availableKeys: Object.keys(downstreamPayload || {})
+                        }
                     });
                     throw new Error(errorMessage);
                 }
@@ -1994,12 +2266,12 @@ Please choose an alternative approach to complete your task.`,
                 if (subAgentEntity.PayloadScope) {
                     resultPayloadForMerge = this._payloadManager.reversePayloadScope(subAgentResult.payload, subAgentEntity.PayloadScope);
                 }
-                const mergeResult = this._payloadManager.mergeUpstreamPayload(subAgentRequest.name, previousDecision.newPayload, resultPayloadForMerge, upstreamPaths, params.verbose === true || (0, global_1.IsVerboseLoggingEnabled)());
+                const mergeResult = this._payloadManager.mergeUpstreamPayload(subAgentRequest.name, previousDecision.newPayload, resultPayloadForMerge, upstreamPaths, params.verbose === true || (0, core_1.IsVerboseLoggingEnabled)());
                 mergedPayload = mergeResult.result;
                 const mergeChangeRequest = {
                     newElements: {},
                     updateElements: {},
-                    removeElements: {},
+                    removeElements: {}
                 };
                 const originalKeys = Object.keys(previousDecision.newPayload || {});
                 const mergedKeys = Object.keys(mergedPayload || {});
@@ -2025,7 +2297,7 @@ Please choose an alternative approach to complete your task.`,
                         analyzeChanges: true,
                         generateDiff: true,
                         agentName: `${subAgentRequest.name} (upstream merge)`,
-                        verbose: params.verbose === true || (0, global_1.IsVerboseLoggingEnabled)(),
+                        verbose: params.verbose === true || (0, core_1.IsVerboseLoggingEnabled)()
                     });
                     currentStepPayloadChangeResult = this.buildPayloadChangeResultSummary(mergeAnalysis);
                     if (mergeResult.blockedOperations && mergeResult.blockedOperations.length > 0) {
@@ -2036,17 +2308,17 @@ Please choose an alternative approach to complete your task.`,
                             subAgentName: subAgentRequest.name,
                             attemptedOperations: mergeResult.blockedOperations,
                             authorizedPaths: upstreamPaths,
-                            timestamp: new Date().toISOString(),
+                            timestamp: new Date().toISOString()
                         };
                     }
-                    if (mergeAnalysis.warnings.length > 0 && (params.verbose === true || (0, global_1.IsVerboseLoggingEnabled)())) {
-                        (0, global_1.LogStatus)(`Sub-agent merge warnings: ${mergeAnalysis.warnings.join('; ')}`);
+                    if (mergeAnalysis.warnings.length > 0 && (params.verbose === true || (0, core_1.IsVerboseLoggingEnabled)())) {
+                        (0, core_1.LogStatus)(`Sub-agent merge warnings: ${mergeAnalysis.warnings.join('; ')}`);
                     }
                 }
             }
             else {
                 const msg = `Sub-agent '${subAgentRequest.name}' execution failed: ${subAgentResult.agentRun?.ErrorMessage || 'Unknown error'}`;
-                (0, global_1.LogError)(msg);
+                (0, core_1.LogError)(msg);
                 stepEntity.Success = false;
                 stepEntity.ErrorMessage = msg;
             }
@@ -2071,8 +2343,8 @@ Please choose an alternative approach to complete your task.`,
                 shouldTerminate: shouldTerminate,
                 nextStep: shouldTerminate ? 'success' : 'retry',
                 ...(currentStepPayloadChangeResult && {
-                    payloadChangeResult: currentStepPayloadChangeResult,
-                }),
+                    payloadChangeResult: currentStepPayloadChangeResult
+                })
             };
             await this.finalizeStepEntity(stepEntity, subAgentResult.success, subAgentResult.agentRun?.ErrorMessage, outputData);
             if (subAgentResult.agentRun?.FinalStep === 'Chat') {
@@ -2081,7 +2353,7 @@ Please choose an alternative approach to complete your task.`,
                     terminate: true,
                     message: subAgentResult.agentRun?.Message || null,
                     previousPayload: previousDecision?.newPayload,
-                    newPayload: previousDecision?.newPayload,
+                    newPayload: previousDecision?.newPayload
                 };
             }
             const subAgentSummary = {
@@ -2090,7 +2362,7 @@ Please choose an alternative approach to complete your task.`,
                 subAgentId: subAgentEntity.ID,
                 success: subAgentResult.success,
                 finalStep: subAgentResult.agentRun?.FinalStep,
-                errorMessage: subAgentResult.agentRun?.ErrorMessage || null,
+                errorMessage: subAgentResult.agentRun?.ErrorMessage || null
             };
             const resultMessage = subAgentResult.success
                 ? `Sub-agent completed successfully:\n${JSON.stringify(subAgentSummary, null, 2)}`
@@ -2098,6 +2370,12 @@ Please choose an alternative approach to complete your task.`,
             params.conversationMessages.push({
                 role: 'user',
                 content: resultMessage,
+                metadata: {
+                    _temporary: true,
+                    _subAgentResult: true,
+                    subAgentName: subAgentRequest.name,
+                    subAgentId: subAgentEntity.ID
+                }
             });
             if (stepEntity) {
                 stepEntity.PayloadAtEnd = JSON.stringify(mergedPayload);
@@ -2110,7 +2388,7 @@ Please choose an alternative approach to complete your task.`,
                 step: subAgentResult.success ? 'Success' : 'Failed',
                 terminate: shouldTerminate,
                 previousPayload: previousDecision?.newPayload,
-                newPayload: mergedPayload,
+                newPayload: mergedPayload
             };
         }
         catch (error) {
@@ -2122,7 +2400,7 @@ Please choose an alternative approach to complete your task.`,
                 step: 'Failed',
                 terminate: false,
                 previousPayload: payload,
-                newPayload: payload,
+                newPayload: payload
             };
         }
     }
@@ -2135,31 +2413,34 @@ Please choose an alternative approach to complete your task.`,
                 terminate: false,
                 errorMessage: 'Sub-agent name is required',
                 previousPayload: previousDecision?.newPayload,
-                newPayload: previousDecision?.newPayload,
+                newPayload: previousDecision?.newPayload
             };
         }
-        const childAgents = aiengine_1.AIEngine.Instance.Agents.filter((a) => a.ParentID === params.agent.ID && a.Status === 'Active');
-        const childAgent = childAgents.find((a) => a.Name.trim().toLowerCase() === name.trim().toLowerCase());
+        const childAgents = aiengine_1.AIEngine.Instance.Agents.filter(a => a.ParentID === params.agent.ID &&
+            a.Status === 'Active');
+        const childAgent = childAgents.find(a => a.Name.trim().toLowerCase() === name.trim().toLowerCase());
         if (childAgent) {
             return await this.executeChildSubAgentStep(params, previousDecision);
         }
-        const activeRelationships = aiengine_1.AIEngine.Instance.AgentRelationships.filter((ar) => ar.AgentID === params.agent.ID && ar.Status === 'Active');
+        const activeRelationships = aiengine_1.AIEngine.Instance.AgentRelationships.filter(ar => ar.AgentID === params.agent.ID &&
+            ar.Status === 'Active');
         for (const relationship of activeRelationships) {
-            const relatedAgent = aiengine_1.AIEngine.Instance.Agents.find((a) => a.ID === relationship.SubAgentID && a.Status === 'Active');
+            const relatedAgent = aiengine_1.AIEngine.Instance.Agents.find(a => a.ID === relationship.SubAgentID &&
+                a.Status === 'Active');
             if (relatedAgent && relatedAgent.Name.trim().toLowerCase() === name.trim().toLowerCase()) {
                 return await this.executeRelatedSubAgentStep(params, previousDecision, relatedAgent, relationship);
             }
         }
         this.logError(`Sub-agent '${name}' not found or not active for agent '${params.agent.Name}'`, {
             agent: params.agent,
-            category: 'SubAgentExecution',
+            category: 'SubAgentExecution'
         });
         return {
             step: 'Retry',
             terminate: false,
             errorMessage: `Sub-agent '${name}' not found or not active`,
             previousPayload: previousDecision?.newPayload,
-            newPayload: previousDecision?.newPayload,
+            newPayload: previousDecision?.newPayload
         };
     }
     async executeRelatedSubAgentStep(params, previousDecision, subAgentEntity, relationship) {
@@ -2175,12 +2456,12 @@ Please choose an alternative approach to complete your task.`,
                 agentName: params.agent.Name,
                 subAgentName: subAgentRequest.name,
                 reason: subAgentRequest.message,
-                relationshipType: 'related',
-            },
+                relationshipType: 'related'
+            }
         });
         params.conversationMessages.push({
             role: 'assistant',
-            content: `I'm delegating this task to the "${subAgentRequest.name}" agent.\n\nReason: ${subAgentRequest.message}`,
+            content: `I'm delegating this task to the "${subAgentRequest.name}" agent.\n\nReason: ${subAgentRequest.message}`
         });
         const inputData = {
             agentName: params.agent.Name,
@@ -2189,7 +2470,7 @@ Please choose an alternative approach to complete your task.`,
             terminateAfter: subAgentRequest.terminateAfter,
             conversationMessages: params.conversationMessages,
             parentAgentHierarchy: this._agentHierarchy,
-            relationshipType: 'related',
+            relationshipType: 'related'
         };
         const stepEntity = await this.createStepEntity({
             stepType: 'Sub-Agent',
@@ -2197,7 +2478,7 @@ Please choose an alternative approach to complete your task.`,
             contextUser: params.contextUser,
             targetId: subAgentEntity.ID,
             inputData,
-            payloadAtStart: previousDecision.newPayload,
+            payloadAtStart: previousDecision.newPayload
         });
         this.incrementExecutionCount(subAgentEntity.ID);
         try {
@@ -2207,8 +2488,8 @@ Please choose an alternative approach to complete your task.`,
                 const mapped = this.applySubAgentInputMapping(previousDecision.newPayload, relationship.SubAgentInputMapping);
                 if (mapped && Object.keys(mapped).length > 0) {
                     initialSubAgentPayload = mapped;
-                    if (params.verbose === true || (0, global_1.IsVerboseLoggingEnabled)()) {
-                        (0, global_1.LogStatus)(`Related sub-agent '${subAgentRequest.name}' receiving mapped payload: ${JSON.stringify(Object.keys(mapped))}`);
+                    if (params.verbose === true || (0, core_1.IsVerboseLoggingEnabled)()) {
+                        (0, core_1.LogStatus)(`Related sub-agent '${subAgentRequest.name}' receiving mapped payload: ${JSON.stringify(Object.keys(mapped))}`);
                     }
                 }
             }
@@ -2218,12 +2499,12 @@ Please choose an alternative approach to complete your task.`,
                     contextPaths = JSON.parse(relationship.SubAgentContextPaths);
                 }
                 catch (parseError) {
-                    (0, global_1.LogError)(`Failed to parse SubAgentContextPaths for sub-agent ${subAgentRequest.name}: ${parseError.message}`);
+                    (0, core_1.LogError)(`Failed to parse SubAgentContextPaths for sub-agent ${subAgentRequest.name}: ${parseError.message}`);
                 }
             }
             const contextMessage = this.prepareRelatedSubAgentContextMessage(previousDecision.newPayload, contextPaths);
-            if (contextMessage && (params.verbose === true || (0, global_1.IsVerboseLoggingEnabled)())) {
-                (0, global_1.LogStatus)(`Related sub-agent '${subAgentRequest.name}' receiving context from paths: ${contextPaths.join(', ')}`);
+            if (contextMessage && (params.verbose === true || (0, core_1.IsVerboseLoggingEnabled)())) {
+                (0, core_1.LogStatus)(`Related sub-agent '${subAgentRequest.name}' receiving context from paths: ${contextPaths.join(', ')}`);
             }
             const subAgentResult = await this.ExecuteSubAgent(params, subAgentRequest, subAgentEntity, stepEntity, initialSubAgentPayload, contextMessage);
             let mergedPayload = previousDecision.newPayload;
@@ -2237,12 +2518,12 @@ Please choose an alternative approach to complete your task.`,
                         analyzeChanges: true,
                         generateDiff: true,
                         agentName: `${subAgentRequest.name} (related agent mapping)`,
-                        verbose: params.verbose === true || (0, global_1.IsVerboseLoggingEnabled)(),
+                        verbose: params.verbose === true || (0, core_1.IsVerboseLoggingEnabled)()
                     });
                     mergedPayload = mergeResult.result;
                     currentStepPayloadChangeResult = this.buildPayloadChangeResultSummary(mergeResult);
-                    if (mergeResult.warnings.length > 0 && (params.verbose === true || (0, global_1.IsVerboseLoggingEnabled)())) {
-                        (0, global_1.LogStatus)(`Related sub-agent mapping warnings: ${mergeResult.warnings.join('; ')}`);
+                    if (mergeResult.warnings.length > 0 && (params.verbose === true || (0, core_1.IsVerboseLoggingEnabled)())) {
+                        (0, core_1.LogStatus)(`Related sub-agent mapping warnings: ${mergeResult.warnings.join('; ')}`);
                     }
                 }
             }
@@ -2253,13 +2534,13 @@ Please choose an alternative approach to complete your task.`,
                     finalStep: subAgentResult.agentRun?.FinalStep,
                     errorMessage: subAgentResult.agentRun?.ErrorMessage,
                     stepCount: subAgentResult.agentRun?.Steps?.length || 0,
-                    hasMergedPayload: !!(relationship.SubAgentOutputMapping && mergedPayload !== previousDecision.newPayload),
+                    hasMergedPayload: !!(relationship.SubAgentOutputMapping && mergedPayload !== previousDecision.newPayload)
                 },
                 shouldTerminate: shouldTerminate,
                 nextStep: shouldTerminate ? 'success' : 'retry',
                 ...(currentStepPayloadChangeResult && {
-                    payloadChangeResult: currentStepPayloadChangeResult,
-                }),
+                    payloadChangeResult: currentStepPayloadChangeResult
+                })
             };
             if (stepEntity) {
                 stepEntity.PayloadAtEnd = JSON.stringify(mergedPayload);
@@ -2271,7 +2552,7 @@ Please choose an alternative approach to complete your task.`,
                     terminate: true,
                     message: subAgentResult.agentRun?.Message || null,
                     previousPayload: previousDecision?.newPayload,
-                    newPayload: previousDecision?.newPayload,
+                    newPayload: previousDecision?.newPayload
                 };
             }
             const subAgentSummary = {
@@ -2279,11 +2560,11 @@ Please choose an alternative approach to complete your task.`,
                 subAgentName: subAgentRequest.name,
                 success: subAgentResult.success,
                 payload: subAgentResult.payload,
-                errorMessage: subAgentResult.agentRun?.ErrorMessage,
+                errorMessage: subAgentResult.agentRun?.ErrorMessage
             };
             params.conversationMessages.push({
                 role: 'user',
-                content: `Related sub-agent "${subAgentRequest.name}" completed:\n${JSON.stringify(subAgentSummary, null, 2)}`,
+                content: `Related sub-agent "${subAgentRequest.name}" completed:\n${JSON.stringify(subAgentSummary, null, 2)}`
             });
             if (this._agentRun) {
                 this._agentRun.FinalPayloadObject = mergedPayload;
@@ -2293,7 +2574,7 @@ Please choose an alternative approach to complete your task.`,
                 step: subAgentResult.success ? 'Success' : 'Failed',
                 terminate: shouldTerminate,
                 previousPayload: previousDecision?.newPayload,
-                newPayload: mergedPayload,
+                newPayload: mergedPayload
             };
         }
         catch (error) {
@@ -2305,7 +2586,7 @@ Please choose an alternative approach to complete your task.`,
                 step: 'Failed',
                 terminate: false,
                 previousPayload: payload,
-                newPayload: payload,
+                newPayload: payload
             };
         }
     }
@@ -2338,11 +2619,11 @@ Please choose an alternative approach to complete your task.`,
                 return null;
             }
             return {
-                updateElements: updateObj,
+                updateElements: updateObj
             };
         }
         catch (error) {
-            (0, global_1.LogError)(`Failed to parse SubAgentOutputMapping: ${error.message}`);
+            (0, core_1.LogError)(`Failed to parse SubAgentOutputMapping: ${error.message}`);
             return null;
         }
     }
@@ -2377,7 +2658,7 @@ Please choose an alternative approach to complete your task.`,
             return subAgentPayload;
         }
         catch (error) {
-            (0, global_1.LogError)(`Failed to parse SubAgentInputMapping: ${error.message}`);
+            (0, core_1.LogError)(`Failed to parse SubAgentInputMapping: ${error.message}`);
             return null;
         }
     }
@@ -2388,7 +2669,7 @@ Please choose an alternative approach to complete your task.`,
         if (contextPaths.includes('*')) {
             return {
                 role: 'user',
-                content: `Parent Agent Context:\n\n${JSON.stringify(parentPayload, null, 2)}`,
+                content: `Parent Agent Context:\n\n${JSON.stringify(parentPayload, null, 2)}`
             };
         }
         const contextData = {};
@@ -2402,12 +2683,14 @@ Please choose an alternative approach to complete your task.`,
             return null;
         }
         const contextLines = Object.entries(contextData).map(([key, value]) => {
-            const valueStr = typeof value === 'object' ? JSON.stringify(value, null, 2) : String(value);
+            const valueStr = typeof value === 'object'
+                ? JSON.stringify(value, null, 2)
+                : String(value);
             return `${key}:\n${valueStr}`;
         });
         return {
             role: 'user',
-            content: `Parent Agent Context:\n\n${contextLines.join('\n\n')}`,
+            content: `Parent Agent Context:\n\n${contextLines.join('\n\n')}`
         };
     }
     async executeActionsStep(params, previousDecision, parentStepId, addConversationMessage = true) {
@@ -2435,23 +2718,19 @@ Please choose an alternative approach to complete your task.`,
                 }
             }
             else {
-                progressMessage =
-                    `Executing **${actions.length} actions** in parallel:\n\n` +
-                        actions
-                            .map((aa, index) => {
-                            let actionText = `${index + 1}. **${aa.name}**`;
-                            if (aa.params && Object.keys(aa.params).length > 0) {
-                                const paramsList = Object.entries(aa.params)
-                                    .map(([key, value]) => {
-                                    const displayValue = this.formatParamValueForMessage(value);
-                                    return `   • **${key}**: ${displayValue}`;
-                                })
-                                    .join('\n');
-                                actionText += `\n${paramsList}`;
-                            }
-                            return actionText;
+                progressMessage = `Executing **${actions.length} actions** in parallel:\n\n` + actions.map((aa, index) => {
+                    let actionText = `${index + 1}. **${aa.name}**`;
+                    if (aa.params && Object.keys(aa.params).length > 0) {
+                        const paramsList = Object.entries(aa.params)
+                            .map(([key, value]) => {
+                            const displayValue = this.formatParamValueForMessage(value);
+                            return `   • **${key}**: ${displayValue}`;
                         })
-                            .join('\n\n');
+                            .join('\n');
+                        actionText += `\n${paramsList}`;
+                    }
+                    return actionText;
+                }).join('\n\n');
             }
             params.onProgress?.({
                 step: 'action_execution',
@@ -2459,9 +2738,9 @@ Please choose an alternative approach to complete your task.`,
                 message: this.formatHierarchicalMessage(progressMessage),
                 metadata: {
                     actionCount: actions.length,
-                    actionNames: actions.map((a) => a.name),
+                    actionNames: actions.map(a => a.name)
                 },
-                displayMode: 'live',
+                displayMode: 'live'
             });
             let actionMessage;
             if (actions.length === 1) {
@@ -2481,61 +2760,48 @@ Please choose an alternative approach to complete your task.`,
                 }
             }
             else {
-                actionMessage =
-                    `I'm executing **${actions.length} actions** in parallel:\n\n` +
-                        actions
-                            .map((aa, index) => {
-                            let actionText = `${index + 1}. **${aa.name}**`;
-                            if (aa.params && Object.keys(aa.params).length > 0) {
-                                const paramsList = Object.entries(aa.params)
-                                    .map(([key, value]) => {
-                                    const displayValue = this.formatParamValueForMessage(value);
-                                    return `   • **${key}**: ${displayValue}`;
-                                })
-                                    .join('\n');
-                                actionText += `\n${paramsList}`;
-                            }
-                            return actionText;
+                actionMessage = `I'm executing **${actions.length} actions** in parallel:\n\n` + actions.map((aa, index) => {
+                    let actionText = `${index + 1}. **${aa.name}**`;
+                    if (aa.params && Object.keys(aa.params).length > 0) {
+                        const paramsList = Object.entries(aa.params)
+                            .map(([key, value]) => {
+                            const displayValue = this.formatParamValueForMessage(value);
+                            return `   • **${key}**: ${displayValue}`;
                         })
-                            .join('\n\n');
+                            .join('\n');
+                        actionText += `\n${paramsList}`;
+                    }
+                    return actionText;
+                }).join('\n\n');
             }
             if (addConversationMessage) {
                 params.conversationMessages.push({
                     role: 'assistant',
-                    content: actionMessage,
+                    content: actionMessage
                 });
             }
             const actionEngine = actions_1.ActionEngineServer.Instance;
-            const agentActions = aiengine_1.AIEngine.Instance.AgentActions.filter((aa) => aa.AgentID === params.agent.ID);
+            const agentActions = aiengine_1.AIEngine.Instance.AgentActions.filter(aa => aa.AgentID === params.agent.ID);
             try {
                 const currentPayload = previousDecision?.newPayload || previousDecision?.previousPayload || params.payload;
                 await this.AgentTypeInstance.PreProcessActionStep(actions, currentPayload, this.AgentTypeState, previousDecision);
             }
             catch (error) {
-                (0, global_1.LogError)(`Error in PreProcessActionStep: ${error.message}`);
+                (0, core_1.LogError)(`Error in PreProcessActionStep: ${error.message}`);
             }
             let numActionsProcessed = 0;
             const baseStepNumber = (this._agentRun.Steps?.length || 0) + 1;
             let lastStep = undefined;
             const actionPromises = actions.map(async (aa) => {
-                const actionEntity = actionEngine.Actions.find((a) => a.Name === aa.name && agentActions.some((aa) => aa.ActionID === a.ID));
+                const actionEntity = actionEngine.Actions.find(a => a.Name === aa.name && agentActions.some(aa => aa.ActionID === a.ID));
                 if (!actionEntity) {
                     throw new Error(`Action "${aa.name}" Not Found for Agent "${params.agent.Name}"`);
                 }
                 const actionInputData = {
                     actionName: aa.name,
-                    actionParams: aa.params,
+                    actionParams: aa.params
                 };
-                const stepEntity = await this.createStepEntity({
-                    stepType: 'Actions',
-                    stepName: `Execute Action: ${aa.name}`,
-                    contextUser: params.contextUser,
-                    targetId: actionEntity.ID,
-                    inputData: actionInputData,
-                    payloadAtStart: currentPayload,
-                    payloadAtEnd: currentPayload,
-                    parentId: parentStepId,
-                });
+                const stepEntity = await this.createStepEntity({ stepType: 'Actions', stepName: `Execute Action: ${aa.name}`, contextUser: params.contextUser, targetId: actionEntity.ID, inputData: actionInputData, payloadAtStart: currentPayload, payloadAtEnd: currentPayload, parentId: parentStepId });
                 lastStep = stepEntity;
                 stepEntity.StepNumber = baseStepNumber + numActionsProcessed++;
                 this.incrementExecutionCount(actionEntity.ID);
@@ -2551,8 +2817,8 @@ Please choose an alternative approach to complete your task.`,
                             success: actionResult.Success,
                             resultCode: actionResult.Result?.ResultCode,
                             message: actionResult.Message,
-                            parameters: actionResult.Params,
-                        },
+                            parameters: actionResult.Params
+                        }
                     };
                     await this.finalizeStepEntity(stepEntity, actionResult.Success, actionResult.Success ? undefined : actionResult.Message, outputData);
                     return { success: true, result: actionResult, action: aa, actionEntity, stepEntity };
@@ -2566,23 +2832,22 @@ Please choose an alternative approach to complete your task.`,
             if (params.cancellationToken?.aborted) {
                 throw new Error('Cancelled after action execution');
             }
-            const actionSummaries = actionResults.map((result) => {
+            const actionSummaries = actionResults.map(result => {
                 const actionResult = result.success ? result.result : null;
                 return {
                     actionName: result.action.name,
                     success: result.success,
-                    params: result.result?.Params.filter((p) => p.Type === 'Both' || p.Type === 'Output'),
+                    params: result.result?.Params.filter(p => p.Type === 'Both' || p.Type === 'Output'),
                     resultCode: actionResult?.Result?.ResultCode || (result.success ? 'SUCCESS' : 'ERROR'),
-                    message: result.success ? actionResult?.Message || 'Action completed' : result.error,
+                    message: result.success ? actionResult?.Message || 'Action completed' : result.error
                 };
             });
-            const failedActions = actionSummaries.filter((a) => !a.success);
-            const resultsMessage = (failedActions.length > 0 ? `${failedActions.length} of ${actionSummaries.length} failed:` : `Action results:`) +
-                `\n${JSON.stringify(actionSummaries, null, 2)}`;
+            const failedActions = actionSummaries.filter(a => !a.success);
+            const resultsMessage = (failedActions.length > 0 ? `${failedActions.length} of ${actionSummaries.length} failed:` : `Action results:`) + `\n${JSON.stringify(actionSummaries, null, 2)}`;
             let metadata;
             const agentActionConfigs = actionResults
-                .map((r) => agentActions.find((aa) => aa.ActionID === r.actionEntity.ID))
-                .filter((aa) => aa != null);
+                .map(r => agentActions.find(aa => aa.ActionID === r.actionEntity.ID))
+                .filter(aa => aa != null);
             if (agentActionConfigs.length > 0) {
                 let minExpirationTurns = null;
                 let expirationMode = 'None';
@@ -2609,7 +2874,7 @@ Please choose an alternative approach to complete your task.`,
                         expirationMode: expirationMode,
                         compactMode: compactMode,
                         compactLength: compactLength,
-                        compactPromptId: compactPromptId,
+                        compactPromptId: compactPromptId
                     };
                 }
             }
@@ -2617,15 +2882,17 @@ Please choose an alternative approach to complete your task.`,
                 params.conversationMessages.push({
                     role: 'user',
                     content: resultsMessage,
-                    metadata: metadata,
+                    metadata: metadata
                 });
             }
             let finalPayload = currentPayload;
             try {
-                const actionResultsOnly = actionResults.map((r) => r.result).filter((r) => r !== undefined);
+                const actionResultsOnly = actionResults.map(r => r.result).filter(r => r !== undefined);
                 const payloadChangeRequest = await this.AgentTypeInstance.PostProcessActionStep(actionResultsOnly, actions, currentPayload, this.AgentTypeState, previousDecision);
                 if (payloadChangeRequest) {
-                    const allowedPaths = params.agent.PayloadSelfWritePaths ? JSON.parse(params.agent.PayloadSelfWritePaths) : undefined;
+                    const allowedPaths = params.agent.PayloadSelfWritePaths
+                        ? JSON.parse(params.agent.PayloadSelfWritePaths)
+                        : undefined;
                     const changeResult = this._payloadManager.applyAgentChangeRequest(currentPayload, payloadChangeRequest, {
                         validateChanges: true,
                         logChanges: true,
@@ -2633,20 +2900,20 @@ Please choose an alternative approach to complete your task.`,
                         analyzeChanges: true,
                         generateDiff: true,
                         allowedPaths: allowedPaths,
-                        verbose: params.verbose === true || (0, global_1.IsVerboseLoggingEnabled)(),
+                        verbose: params.verbose === true || (0, core_1.IsVerboseLoggingEnabled)()
                     });
                     finalPayload = changeResult.result;
                     if (lastStep) {
                         lastStep.PayloadAtEnd = JSON.stringify(finalPayload);
                         await lastStep.Save();
                     }
-                    if (changeResult.warnings.length > 0 && (params.verbose === true || (0, global_1.IsVerboseLoggingEnabled)())) {
-                        (0, global_1.LogStatus)(`Action post-processing payload warnings: ${changeResult.warnings.join('; ')}`);
+                    if (changeResult.warnings.length > 0 && (params.verbose === true || (0, core_1.IsVerboseLoggingEnabled)())) {
+                        (0, core_1.LogStatus)(`Action post-processing payload warnings: ${changeResult.warnings.join('; ')}`);
                     }
                 }
             }
             catch (error) {
-                (0, global_1.LogError)(`Error in PostProcessActionStep: ${error.message}`);
+                (0, core_1.LogError)(`Error in PostProcessActionStep: ${error.message}`);
             }
             return {
                 terminate: false,
@@ -2655,8 +2922,8 @@ Please choose an alternative approach to complete your task.`,
                 newPayload: finalPayload,
                 priorStepResult: actionSummaries,
                 retryReason: failedActions.length > 0
-                    ? `Processing results with ${failedActions.length} failed action(s): ${failedActions.map((a) => a.actionName).join(', ')}`
-                    : `Analyzing results from ${actionSummaries.length} completed action(s) to formulate response`,
+                    ? `Processing results with ${failedActions.length} failed action(s): ${failedActions.map(a => a.actionName).join(', ')}`
+                    : `Analyzing results from ${actionSummaries.length} completed action(s) to formulate response`
             };
         }
         catch (e) {
@@ -2682,7 +2949,7 @@ Please choose an alternative approach to complete your task.`,
             confidence: previousDecision.confidence,
             previousPayload: previousDecision.previousPayload,
             newPayload: previousDecision.newPayload || previousDecision.previousPayload,
-            suggestedResponses: previousDecision.suggestedResponses,
+            suggestedResponses: previousDecision.suggestedResponses
         };
     }
     async executeForEachLoop(params, config, previousDecision) {
@@ -2734,12 +3001,10 @@ Please choose an alternative approach to complete your task.`,
         return null;
     }
     validateActionInAgent(actionName) {
-        const aa = aiengine_1.AIEngine.Instance.AgentActions.filter((aa) => aa.AgentID === this._agentRun.AgentID);
-        let action = aa.filter((a) => a.Agent?.trim().toLowerCase() === actionName.trim().toLowerCase());
+        const aa = aiengine_1.AIEngine.Instance.AgentActions.filter(aa => aa.AgentID === this._agentRun.AgentID);
+        let action = aa.filter(a => a.Agent?.trim().toLowerCase() === actionName.trim().toLowerCase());
         if (!action) {
-            const partialAction = aa.filter((a) => a.Agent?.trim()
-                .toLowerCase()
-                .includes(actionName.trim().toLowerCase() || ''));
+            const partialAction = aa.filter(a => a.Agent?.trim().toLowerCase().includes(actionName.trim().toLowerCase() || ''));
             if (partialAction.length > 1) {
                 return `Ambiguous action '${actionName}' specified`;
             }
@@ -2750,22 +3015,18 @@ Please choose an alternative approach to complete your task.`,
         return null;
     }
     validateSubAgentInAgent(subAgentName) {
-        const relatedAgents = aiengine_1.AIEngine.Instance.AgentRelationships.filter((ar) => ar.AgentID === this._agentRun.AgentID);
-        const childAgents = aiengine_1.AIEngine.Instance.Agents.filter((a) => a.ParentID === this._agentRun.AgentID);
-        let subAgent = relatedAgents.filter((ra) => ra.SubAgent?.trim().toLowerCase() === subAgentName.trim().toLowerCase());
+        const relatedAgents = aiengine_1.AIEngine.Instance.AgentRelationships.filter(ar => ar.AgentID === this._agentRun.AgentID);
+        const childAgents = aiengine_1.AIEngine.Instance.Agents.filter(a => a.ParentID === this._agentRun.AgentID);
+        let subAgent = relatedAgents.filter(ra => ra.SubAgent?.trim().toLowerCase() === subAgentName.trim().toLowerCase());
         if (subAgent.length === 0) {
-            subAgent = relatedAgents.filter((ra) => ra.SubAgent?.trim()
-                .toLowerCase()
-                .includes(subAgentName.trim().toLowerCase() || ''));
+            subAgent = relatedAgents.filter(ra => ra.SubAgent?.trim().toLowerCase().includes(subAgentName.trim().toLowerCase() || ''));
             if (subAgent.length > 1) {
                 return `Ambiguous sub-agent '${subAgentName}' specified`;
             }
             else if (subAgent.length === 0) {
-                let childAgent = childAgents.filter((ca) => ca.Name?.trim().toLowerCase() === subAgentName.trim().toLowerCase());
+                let childAgent = childAgents.filter(ca => ca.Name?.trim().toLowerCase() === subAgentName.trim().toLowerCase());
                 if (childAgent.length === 0) {
-                    childAgent = childAgents.filter((ca) => ca.Name?.trim()
-                        .toLowerCase()
-                        .includes(subAgentName.trim().toLowerCase() || ''));
+                    childAgent = childAgents.filter(ca => ca.Name?.trim().toLowerCase().includes(subAgentName.trim().toLowerCase() || ''));
                     if (childAgent.length > 1) {
                         return `Ambiguous child agent '${subAgentName}' specified`;
                     }
@@ -2780,7 +3041,9 @@ Please choose an alternative approach to complete your task.`,
         return null;
     }
     getCollectionFromPayload(payload, path) {
-        const cleanPath = path.toLowerCase().startsWith('payload.') ? path.substring(8) : path;
+        const cleanPath = path.toLowerCase().startsWith('payload.')
+            ? path.substring(8)
+            : path;
         const value = this.getValueFromPath(payload, cleanPath);
         return Array.isArray(value) ? value : null;
     }
@@ -2790,7 +3053,7 @@ Please choose an alternative approach to complete your task.`,
             stepName: `ForEach: ${forEach.collectionPath} (${collection.length} items)`,
             contextUser: params.contextUser,
             inputData: { forEach, count: collection.length },
-            payloadAtStart: payload,
+            payloadAtStart: payload
         });
         return stepEntity;
     }
@@ -2810,7 +3073,7 @@ Please choose an alternative approach to complete your task.`,
         const errors = [];
         for (let i = 0; i < Math.min(collection.length, maxIterations); i++) {
             if (i > 0 && forEach.delayBetweenIterationsMs) {
-                await new Promise((resolve) => setTimeout(resolve, forEach.delayBetweenIterationsMs));
+                await new Promise(resolve => setTimeout(resolve, forEach.delayBetweenIterationsMs));
             }
             const iterResult = await this.executeSingleForEachIteration(forEach, collection[i], i, currentPayload, parentStepId, params, config);
             if (iterResult.error) {
@@ -2833,18 +3096,18 @@ Please choose an alternative approach to complete your task.`,
         const allResults = [];
         for (let batchIndex = 0; batchIndex < batches.length; batchIndex++) {
             const batch = batches[batchIndex];
-            const batchPromises = batch.map(({ item, index }) => this.executeSingleForEachIteration(forEach, item, index, initialPayload, parentStepId, params, config).then((iterResult) => ({
+            const batchPromises = batch.map(({ item, index }) => this.executeSingleForEachIteration(forEach, item, index, initialPayload, parentStepId, params, config).then(iterResult => ({
                 index,
                 result: iterResult.result,
                 error: iterResult.error,
-                payload: iterResult.payload,
+                payload: iterResult.payload
             })));
             const batchResults = await Promise.all(batchPromises);
             allResults.push(...batchResults);
             if (forEach.delayBetweenIterationsMs && batchIndex < batches.length - 1) {
-                await new Promise((resolve) => setTimeout(resolve, forEach.delayBetweenIterationsMs));
+                await new Promise(resolve => setTimeout(resolve, forEach.delayBetweenIterationsMs));
             }
-            const hasFailure = batchResults.some((r) => r.error);
+            const hasFailure = batchResults.some(r => r.error);
             if (hasFailure && !forEach.continueOnError) {
                 break;
             }
@@ -2857,7 +3120,7 @@ Please choose an alternative approach to complete your task.`,
         for (let i = 0; i < items.length; i += maxConcurrency) {
             const batch = items.slice(i, i + maxConcurrency).map((item, batchOffset) => ({
                 item,
-                index: i + batchOffset,
+                index: i + batchOffset
             }));
             batches.push(batch);
         }
@@ -2883,51 +3146,27 @@ Please choose an alternative approach to complete your task.`,
     }
     async executeSingleForEachIteration(forEach, item, index, currentPayload, parentStepId, params, config) {
         try {
-            const beforeHook = this.AgentTypeInstance.BeforeLoopIteration?.({
-                item,
-                itemVariable: forEach.itemVariable,
-                index,
-                payload: currentPayload,
-                loopType: 'ForEach',
-                actionParams: forEach.action?.params || {},
-            });
+            const beforeHook = this.AgentTypeInstance.BeforeLoopIteration?.({ item, itemVariable: forEach.itemVariable, index, payload: currentPayload, loopType: 'ForEach', actionParams: forEach.action?.params || {} });
             const resolvedParams = beforeHook?.actionParams || forEach.action?.params || {};
             let result;
             if (forEach.action) {
                 const matchedAction = this.findAgentActionForLoop(forEach.action.name, params.agent.ID, params.agent.Name, params);
                 const resolvedAction = {
                     name: matchedAction.Action,
-                    params: resolvedParams,
-                };
-                const actionStep = {
-                    step: 'Actions',
-                    actions: [resolvedAction],
-                    newPayload: currentPayload,
-                    previousPayload: currentPayload,
-                    terminate: false,
+                    params: resolvedParams
                 };
+                const actionStep = { step: 'Actions', actions: [resolvedAction], newPayload: currentPayload, previousPayload: currentPayload, terminate: false };
                 result = await this.executeActionsStep(params, actionStep, parentStepId, false);
             }
             else if (forEach.subAgent) {
-                const subAgentStep = {
-                    step: 'Sub-Agent',
-                    subAgent: forEach.subAgent,
-                    newPayload: currentPayload,
-                    previousPayload: currentPayload,
-                };
+                const subAgentStep = { step: 'Sub-Agent', subAgent: forEach.subAgent, newPayload: currentPayload, previousPayload: currentPayload };
                 result = await this.processSubAgentStep(params, subAgentStep);
             }
             else {
                 throw new Error('ForEach missing action/subAgent');
             }
             const iterPayload = result.newPayload || currentPayload;
-            const afterHook = this.AgentTypeInstance.AfterLoopIteration?.({
-                currentPayload: iterPayload,
-                item,
-                itemVariable: forEach.itemVariable,
-                index,
-                loopContext: { actionOutputMapping: forEach.action?.outputMapping },
-            });
+            const afterHook = this.AgentTypeInstance.AfterLoopIteration?.({ currentPayload: iterPayload, item, itemVariable: forEach.itemVariable, index, loopContext: { actionOutputMapping: forEach.action?.outputMapping } });
             return { payload: afterHook || iterPayload, result };
         }
         catch (error) {
@@ -2945,31 +3184,31 @@ Please choose an alternative approach to complete your task.`,
             retryInstructions: `Completed ForEach loop request using collection at '${forEach.collectionPath}'`,
             terminate: false,
             newPayload: loopResults.finalPayload,
-            previousPayload: previousDecision.previousPayload,
+            previousPayload: previousDecision.previousPayload
         };
     }
     injectLoopResultsMessage(loopType, collectionOrCondition, results, errors, params) {
-        const extractedResults = results.map((r) => r.priorStepResult);
+        const extractedResults = results.map(r => r.priorStepResult);
         const label = loopType === 'ForEach' ? 'Collection' : 'Condition';
         params.conversationMessages.push({
             role: 'user',
             content: `## Loop Completed\n**Type:** ${loopType}\n**${label}:** ${collectionOrCondition}\n` +
                 `**Processed:** ${results.length}, **Errors:** ${errors.length}\n\n` +
                 `**Results:**\n\`\`\`json\n${JSON.stringify(extractedResults, null, 2)}\n\`\`\``,
-            metadata: { _temporary: true, _loopResults: true },
+            metadata: { _temporary: true, _loopResults: true }
         });
     }
     findAgentActionForLoop(actionName, agentId, agentName, params) {
-        const agentActions = aiengine_1.AIEngine.Instance.AgentActions.filter((aa) => aa.AgentID === agentId && aa.Status === 'Active');
-        let matched = agentActions.find((aa) => aa.Action.trim().toLowerCase() === actionName.trim().toLowerCase());
+        const agentActions = aiengine_1.AIEngine.Instance.AgentActions.filter(aa => aa.AgentID === agentId && aa.Status === 'Active');
+        let matched = agentActions.find(aa => aa.Action.trim().toLowerCase() === actionName.trim().toLowerCase());
         if (!matched) {
-            const containsMatches = agentActions.filter((aa) => aa.Action.trim().toLowerCase().includes(actionName.trim().toLowerCase()));
+            const containsMatches = agentActions.filter(aa => aa.Action.trim().toLowerCase().includes(actionName.trim().toLowerCase()));
             if (containsMatches.length === 1) {
                 matched = containsMatches[0];
                 this.logStatus(`Action fuzzy matched: '${actionName}' → '${matched.Action}'`, true, params);
             }
             else if (containsMatches.length > 1) {
-                throw new Error(`Ambiguous action '${actionName}'. Matches: ${containsMatches.map((a) => a.Action).join(', ')}`);
+                throw new Error(`Ambiguous action '${actionName}'. Matches: ${containsMatches.map(a => a.Action).join(', ')}`);
             }
             else {
                 throw new Error(`Action '${actionName}' not found for agent '${agentName}'`);
@@ -2983,7 +3222,7 @@ Please choose an alternative approach to complete your task.`,
             terminate: false,
             errorMessage,
             previousPayload: previousDecision.previousPayload,
-            newPayload: previousDecision.newPayload || previousDecision.previousPayload,
+            newPayload: previousDecision.newPayload || previousDecision.previousPayload
         };
     }
     async executeWhileLoop(params, config, previousDecision) {
@@ -3006,7 +3245,7 @@ Please choose an alternative approach to complete your task.`,
             stepName: `While: ${whileOp.condition}`,
             contextUser: params.contextUser,
             inputData: { while: whileOp },
-            payloadAtStart: payload,
+            payloadAtStart: payload
         });
         return stepEntity;
     }
@@ -3020,7 +3259,7 @@ Please choose an alternative approach to complete your task.`,
         const evaluator = new SafeExpressionEvaluator();
         while (iterationCount < maxIterations) {
             if (iterationCount > 0 && whileOp.delayBetweenIterationsMs) {
-                await new Promise((resolve) => setTimeout(resolve, whileOp.delayBetweenIterationsMs));
+                await new Promise(resolve => setTimeout(resolve, whileOp.delayBetweenIterationsMs));
             }
             const evalResult = evaluator.evaluate(whileOp.condition, { payload: currentPayload, results, errors });
             if (!evalResult.success || !evalResult.value) {
@@ -3043,51 +3282,27 @@ Please choose an alternative approach to complete your task.`,
     }
     async executeSingleWhileIteration(whileOp, attemptContext, index, currentPayload, parentStepId, params, config) {
         try {
-            const beforeHook = this.AgentTypeInstance.BeforeLoopIteration?.({
-                item: attemptContext,
-                index,
-                itemVariable: whileOp.itemVariable,
-                payload: currentPayload,
-                loopType: 'While',
-                actionParams: whileOp.action?.params || {},
-            });
+            const beforeHook = this.AgentTypeInstance.BeforeLoopIteration?.({ item: attemptContext, index, itemVariable: whileOp.itemVariable, payload: currentPayload, loopType: 'While', actionParams: whileOp.action?.params || {} });
             const resolvedParams = beforeHook?.actionParams || whileOp.action?.params || {};
             let result;
             if (whileOp.action) {
                 const matchedAction = this.findAgentActionForLoop(whileOp.action.name, params.agent.ID, params.agent.Name, params);
                 const resolvedAction = {
                     name: matchedAction.Action,
-                    params: resolvedParams,
-                };
-                const actionStep = {
-                    step: 'Actions',
-                    actions: [resolvedAction],
-                    newPayload: currentPayload,
-                    previousPayload: currentPayload,
-                    terminate: false,
+                    params: resolvedParams
                 };
+                const actionStep = { step: 'Actions', actions: [resolvedAction], newPayload: currentPayload, previousPayload: currentPayload, terminate: false };
                 result = await this.executeActionsStep(params, actionStep, parentStepId, false);
             }
             else if (whileOp.subAgent) {
-                const subAgentStep = {
-                    step: 'Sub-Agent',
-                    subAgent: whileOp.subAgent,
-                    newPayload: currentPayload,
-                    previousPayload: currentPayload,
-                };
+                const subAgentStep = { step: 'Sub-Agent', subAgent: whileOp.subAgent, newPayload: currentPayload, previousPayload: currentPayload };
                 result = await this.processSubAgentStep(params, subAgentStep);
             }
             else {
                 throw new Error('While missing action/subAgent');
             }
             const iterPayload = result.newPayload || currentPayload;
-            const afterHook = this.AgentTypeInstance.AfterLoopIteration?.({
-                currentPayload: iterPayload,
-                item: attemptContext,
-                itemVariable: whileOp.itemVariable,
-                index,
-                loopContext: { actionOutputMapping: whileOp.action?.outputMapping },
-            });
+            const afterHook = this.AgentTypeInstance.AfterLoopIteration?.({ currentPayload: iterPayload, item: attemptContext, itemVariable: whileOp.itemVariable, index, loopContext: { actionOutputMapping: whileOp.action?.outputMapping } });
             return { payload: afterHook || iterPayload, result };
         }
         catch (error) {
@@ -3105,7 +3320,7 @@ Please choose an alternative approach to complete your task.`,
             retryInstructions: `Completed While loop request using condition '${whileOp.condition}' after ${loopResults.iterations} iteration(s)`,
             terminate: false,
             newPayload: loopResults.finalPayload,
-            previousPayload: previousDecision.previousPayload,
+            previousPayload: previousDecision.previousPayload
         };
     }
     async createFailureResult(errorMessage, contextUser) {
@@ -3123,7 +3338,7 @@ Please choose an alternative approach to complete your task.`,
         }
         return {
             success: false,
-            agentRun: this._agentRun,
+            agentRun: this._agentRun
         };
     }
     async createCancelledResult(message, contextUser) {
@@ -3141,7 +3356,7 @@ Please choose an alternative approach to complete your task.`,
         }
         return {
             success: false,
-            agentRun: this._agentRun,
+            agentRun: this._agentRun
         };
     }
     async finalizeAgentRun(finalStep, payload, contextUser) {
@@ -3169,7 +3384,7 @@ Please choose an alternative approach to complete your task.`,
             this._agentRun.TotalCost = tokenStats.totalCost;
             const ok = await this._agentRun.Save();
             if (!ok) {
-                (0, global_1.LogError)(`Failed to finalize agent run ${this._agentRun.ID}`);
+                (0, core_1.LogError)(`Failed to finalize agent run ${this._agentRun.ID}`);
             }
         }
         return {
@@ -3177,6 +3392,9 @@ Please choose an alternative approach to complete your task.`,
             payload,
             agentRun: this._agentRun,
             suggestedResponses: finalStep.suggestedResponses,
+            memoryContext: this._injectedMemory.notes.length > 0 || this._injectedMemory.examples.length > 0
+                ? this._injectedMemory
+                : undefined
         };
     }
     calculateTokenStats() {
@@ -3217,14 +3435,18 @@ Please choose an alternative approach to complete your task.`,
     }
     async checkMinimumExecutionRequirements(agent, agentRun) {
         const violations = [];
-        const agentActions = aiengine_1.AIEngine.Instance.AgentActions.filter((aa) => aa.AgentID === agent.ID && aa.Status === 'Active' && aa.MinExecutionsPerRun != null && aa.MinExecutionsPerRun > 0);
+        const agentActions = aiengine_1.AIEngine.Instance.AgentActions.filter(aa => aa.AgentID === agent.ID &&
+            aa.Status === 'Active' &&
+            aa.MinExecutionsPerRun != null &&
+            aa.MinExecutionsPerRun > 0);
         for (const agentAction of agentActions) {
             const executionCount = await this.getActionExecutionCount(agentRun.ID, agentAction.ActionID);
             if (executionCount < agentAction.MinExecutionsPerRun) {
                 violations.push(`Action '${agentAction.Action}' requires ${agentAction.MinExecutionsPerRun} execution(s) but was executed ${executionCount} time(s)`);
             }
         }
-        const subAgents = aiengine_1.AIEngine.Instance.GetSubAgents(agent.ID, 'Active').filter((a) => a.MinExecutionsPerRun != null && a.MinExecutionsPerRun > 0);
+        const subAgents = aiengine_1.AIEngine.Instance.GetSubAgents(agent.ID, "Active").filter(a => a.MinExecutionsPerRun != null &&
+            a.MinExecutionsPerRun > 0);
         for (const subAgent of subAgents) {
             const executionCount = await this.getSubAgentExecutionCount(agentRun.ID, subAgent.ID);
             if (executionCount < subAgent.MinExecutionsPerRun) {
@@ -3255,7 +3477,7 @@ Please choose an alternative approach to complete your task.`,
                         turn: currentTurn,
                         messageIndex: i,
                         message: msg,
-                        reason: `Expired after ${turnsAlive} turns (limit: ${msg.metadata.expirationTurns})`,
+                        reason: `Expired after ${turnsAlive} turns (limit: ${msg.metadata.expirationTurns})`
                     });
                 }
                 else if (msg.metadata.expirationMode === 'Compact') {
@@ -3267,8 +3489,10 @@ Please choose an alternative approach to complete your task.`,
                                 compactMode: msg.metadata.compactMode,
                                 compactLength: msg.metadata.compactLength || 500,
                                 compactPromptId: msg.metadata.compactPromptId || '',
-                                originalLength: typeof msg.content === 'string' ? msg.content.length : JSON.stringify(msg.content).length,
-                            },
+                                originalLength: typeof msg.content === 'string'
+                                    ? msg.content.length
+                                    : JSON.stringify(msg.content).length
+                            }
                         });
                     }
                 }
@@ -3290,8 +3514,8 @@ Please choose an alternative approach to complete your task.`,
                     originalContent: preserveOriginal ? originalContent : undefined,
                     originalLength: item.metadata.originalLength,
                     tokensSaved,
-                    canExpand: preserveOriginal,
-                },
+                    canExpand: preserveOriginal
+                }
             };
             this.emitMessageLifecycleEvent({
                 type: 'message-compacted',
@@ -3299,7 +3523,7 @@ Please choose an alternative approach to complete your task.`,
                 messageIndex: item.index,
                 message: params.conversationMessages[item.index],
                 reason: `Compacted using ${item.metadata.compactMode} (saved ${tokensSaved} tokens)`,
-                tokensSaved,
+                tokensSaved
             });
         }
         for (let i = messagesToRemove.length - 1; i >= 0; i--) {
@@ -3310,7 +3534,7 @@ Please choose an alternative approach to complete your task.`,
                 turn: currentTurn,
                 messageIndex: index,
                 message: removed,
-                reason: 'Removed due to expiration',
+                reason: 'Removed due to expiration'
             });
         }
         if (params.verbose && (messagesToCompact.length > 0 || messagesToRemove.length > 0)) {
@@ -3327,7 +3551,7 @@ Please choose an alternative approach to complete your task.`,
         if (!this._agentRun) {
             throw new Error('Cannot create compaction step: agent run not initialized');
         }
-        const md = new global_1.Metadata();
+        const md = new core_1.Metadata();
         const step = await md.GetEntityObject('MJ: AI Agent Run Steps', params.contextUser);
         step.NewRecord();
         step.AgentRunID = this._agentRun.ID;
@@ -3342,7 +3566,7 @@ Please choose an alternative approach to complete your task.`,
                 (typeof message.content === 'string' ? message.content.length : JSON.stringify(message.content).length),
             compactMode: 'AI Summary',
             promptId: prompt.ID,
-            promptName: prompt.Name,
+            promptName: prompt.Name
         });
         await step.Save();
         return step;
@@ -3358,7 +3582,7 @@ Please choose an alternative approach to complete your task.`,
             promptTokens,
             completionTokens,
             totalTokens: promptTokens + completionTokens,
-            cost: result.cost,
+            cost: result.cost
         });
         if (!result.success) {
             step.ErrorMessage = result.errorMessage || 'AI Summary compaction failed';
@@ -3366,7 +3590,9 @@ Please choose an alternative approach to complete your task.`,
         await step.Save();
     }
     async compactMessage(message, metadata, params) {
-        const originalContent = typeof message.content === 'string' ? message.content : JSON.stringify(message.content);
+        const originalContent = typeof message.content === 'string'
+            ? message.content
+            : JSON.stringify(message.content);
         switch (metadata.compactMode) {
             case 'First N Chars': {
                 const length = metadata.compactLength;
@@ -3379,7 +3605,7 @@ Please choose an alternative approach to complete your task.`,
             case 'AI Summary': {
                 try {
                     const promptId = metadata.compactPromptId || this.getSystemDefaultCompactPromptId();
-                    const prompt = aiengine_1.AIEngine.Instance.Prompts.find((p) => p.ID === promptId);
+                    const prompt = aiengine_1.AIEngine.Instance.Prompts.find(p => p.ID === promptId);
                     if (!prompt) {
                         console.warn(`Compact prompt ${promptId} not found, falling back to First N Chars`);
                         return this.compactMessage(message, { ...metadata, compactMode: 'First N Chars' }, params);
@@ -3392,7 +3618,7 @@ Please choose an alternative approach to complete your task.`,
                         originalLength: metadata.originalLength,
                         targetLength: metadata.compactLength || 500,
                         messageType: message.metadata?.messageType || 'unknown',
-                        turnAdded: message.metadata?.turnAdded || 0,
+                        turnAdded: message.metadata?.turnAdded || 0
                     };
                     promptParams.contextUser = params.contextUser;
                     const runner = new ai_prompts_1.AIPromptRunner();
@@ -3414,16 +3640,72 @@ Please choose an alternative approach to complete your task.`,
         }
     }
     getSystemDefaultCompactPromptId() {
-        const prompt = aiengine_1.AIEngine.Instance.Prompts.find((p) => p.Name === 'Compact Agent Message');
+        const prompt = aiengine_1.AIEngine.Instance.Prompts.find(p => p.Name === 'Compact Agent Message');
         if (!prompt) {
             console.warn('System default compact prompt not found. Ensure "Compact Agent Message" prompt exists.');
             return '';
         }
         return prompt.ID;
     }
-    estimateTokens(content) {
-        const text = typeof content === 'string' ? content : JSON.stringify(content);
-        return Math.ceil(text.length / 4);
+    estimateTokens(content, modelName) {
+        const text = typeof content === 'string'
+            ? content
+            : JSON.stringify(content);
+        return this.heuristicTokenCount(text);
+    }
+    heuristicTokenCount(text) {
+        const charCount = text.length;
+        const structuralChars = (text.match(/[\{\}\[\],:]/g) || []).length;
+        const whitespaceChars = (text.match(/\s/g) || []).length;
+        const effectiveChars = charCount - (whitespaceChars * 0.5);
+        const baseTokens = effectiveChars / 4;
+        const structuralTokens = structuralChars * 0.05;
+        return Math.ceil(baseTokens + structuralTokens);
+    }
+    getModelContextLimit(modelSelectionInfo) {
+        const DEFAULT_LIMIT = 8000;
+        if (!modelSelectionInfo) {
+            this.logStatus(`No model selection info available, using default limit: ${DEFAULT_LIMIT}`, true);
+            return DEFAULT_LIMIT;
+        }
+        try {
+            const modelSelected = modelSelectionInfo.modelSelected;
+            const vendorSelected = modelSelectionInfo.vendorSelected;
+            if (!modelSelected) {
+                this.logStatus(`No model selected in model selection info, using default limit: ${DEFAULT_LIMIT}`, true);
+                return DEFAULT_LIMIT;
+            }
+            if (!vendorSelected) {
+                this.logStatus(`No vendor selected, using default limit: ${DEFAULT_LIMIT}`, true);
+                return DEFAULT_LIMIT;
+            }
+            const modelVendors = modelSelected.ModelVendors;
+            if (!modelVendors || modelVendors.length === 0) {
+                this.logStatus(`No ModelVendors array found on model, using default limit: ${DEFAULT_LIMIT}`, true);
+                return DEFAULT_LIMIT;
+            }
+            const vendorEntry = modelVendors.find((mv) => mv.VendorID === vendorSelected.ID);
+            if (!vendorEntry) {
+                this.logStatus(`No matching vendor entry found in ModelVendors, using default limit: ${DEFAULT_LIMIT}`, true);
+                return DEFAULT_LIMIT;
+            }
+            const maxInputTokens = vendorEntry.MaxInputTokens;
+            if (!maxInputTokens || maxInputTokens <= 0) {
+                this.logStatus(`MaxInputTokens not set or invalid on vendor entry, using default limit: ${DEFAULT_LIMIT}`, true);
+                return DEFAULT_LIMIT;
+            }
+            this.logStatus(`Using vendor-specific MaxInputTokens: ${maxInputTokens} (Model: ${modelSelected.Name}, Vendor: ${vendorSelected.Name})`, true);
+            return maxInputTokens;
+        }
+        catch (error) {
+            this.logStatus(`Error extracting model context limit: ${error}, using default limit: ${DEFAULT_LIMIT}`, true);
+            return DEFAULT_LIMIT;
+        }
+    }
+    estimateConversationTokens(messages) {
+        return messages.reduce((total, msg) => {
+            return total + this.estimateTokens(msg.content);
+        }, 0);
     }
     emitMessageLifecycleEvent(event) {
         if (this._messageLifecycleCallback) {
@@ -3451,7 +3733,7 @@ Please choose an alternative approach to complete your task.`,
             turn: currentTurn,
             messageIndex,
             message,
-            reason: reason || 'Agent requested expansion',
+            reason: reason || 'Agent requested expansion'
         });
         if (params.verbose) {
             console.log(`[Turn ${currentTurn}] Expanded message at index ${messageIndex}`);