@falai/agent 1.1.3 → 1.2.1

package/dist/core/ResponseModal.js

@@ -2,13 +2,12 @@
  * ResponseModal handles all response generation logic for the Agent
  * Provides both streaming and non-streaming response generation with unified logic
  */
-import { EventKind, MessageRole } from "../types";
 import { Step } from "./Step";
 import { ResponseEngine } from "./ResponseEngine";
 import { ResponsePipeline } from "./ResponsePipeline";
 import { BatchExecutor } from "./BatchExecutor";
 import { BatchPromptBuilder } from "./BatchPromptBuilder";
-import { cloneDeep, mergeCollected, enterStep, getLastMessageFromHistory, render, logger, historyToEvents } from "../utils";
+import { cloneDeep, mergeCollected, enterStep, getLastMessageFromHistory, render, logger, historyToEvents, eventsToHistory } from "../utils";
 import { createTemplateContext } from "../utils/template";
 import { END_ROUTE_ID } from "../constants";
 /**
@@ -47,14 +46,14 @@ export class ResponseModal {
         this.agent = agent;
         this.options = options;
         // Initialize response engine
-        this.responseEngine = new ResponseEngine();
+        this.responseEngine = new ResponseEngine(this.agent.promptSectionCache);
         // Initialize response pipeline with agent dependencies
         this.responsePipeline = new ResponsePipeline(this.agent.getAgentOptions(), () => this.agent.getRoutes(), // Pass a function to get routes dynamically
         this.agent.getTools(), this.agent.getRoutingEngine(), this.agent.updateContext.bind(this.agent), this.agent.getUpdateDataMethod(), this.agent.updateCollectedData.bind(this.agent), this.getToolManager());
         // Initialize batch executor for multi-step execution
         this.batchExecutor = new BatchExecutor();
         // Initialize batch prompt builder for combined prompts
-        this.batchPromptBuilder = new BatchPromptBuilder();
+        this.batchPromptBuilder = new BatchPromptBuilder(this.agent.promptSectionCache);
     }
     /**
      * Generate a non-streaming response using unified logic
@@ -443,12 +442,14 @@ export class ResponseModal {
             extractionPrompt.push(`Optional fields: ${route.optionalFields.join(', ')}`);
         }
         extractionPrompt.push(``, `Return ONLY the extracted data as JSON. If no data can be extracted, return an empty object {}.`);
+        // Convert Event[] to HistoryItem[] for provider call
+        const historyItems = eventsToHistory(history);
         // Call AI to extract data
         const agentOptions = this.agent.getAgentOptions();
         try {
             const result = await agentOptions.provider.generateMessage({
                 prompt: extractionPrompt.join('\n'),
-                history,
+                history: historyItems,
                 context: {}, // Passed as empty object so AI doesn't "extract" from context
                 // NOTE: context is intentionally NOT passed here.
                 // Passing context caused the AI to "extract" data from the lead's context
@@ -476,7 +477,6 @@ export class ResponseModal {
         // Get last user message (needed for both route and completion handling)
         // Convert HistoryItem[] to Event[] for internal processing
         const historyEvents = historyToEvents(history);
-        const lastMessageText = getLastMessageFromHistory(historyEvents);
         let message;
         let toolCalls = undefined;
         let executedSteps;
@@ -511,7 +511,6 @@ export class ResponseModal {
                     session,
                     history,
                     context: effectiveContext,
-                    lastMessageText,
                     historyEvents,
                     signal: undefined,
                 });
@@ -536,7 +535,7 @@ export class ResponseModal {
                     selectedRoute,
                     session,
                     context: effectiveContext,
-                    lastMessageText,
+                    history,
                     historyEvents,
                     signal: undefined,
                 });
@@ -556,7 +555,7 @@ export class ResponseModal {
         else {
             // Fallback: No routes defined, generate a simple response
             message = await this.generateFallbackResponse({
-                history: historyEvents, // Use Event[] for fallback response
+                history,
                 context: effectiveContext,
                 session,
             });
@@ -642,7 +641,7 @@ export class ResponseModal {
         const agentOptions = this.agent.getAgentOptions();
         const result = await agentOptions.provider.generateMessage({
             prompt: batchPromptResult.prompt,
-            history: historyEvents,
+            history, // Use HistoryItem[] for AI provider
             context,
             tools: availableTools,
             signal,
@@ -798,7 +797,6 @@ export class ResponseModal {
         // Get last user message (needed for both route and completion handling)
         // Convert HistoryItem[] to Event[] for internal processing
         const historyEvents = historyToEvents(history);
-        const lastMessageText = getLastMessageFromHistory(historyEvents);
         if (selectedRoute && !isRouteComplete) {
             // Check if we have batch steps to execute
             if (batchSteps && batchSteps.length > 0) {
@@ -825,7 +823,6 @@ export class ResponseModal {
                     session,
                     history,
                     context: effectiveContext,
-                    lastMessageText,
                     historyEvents,
                 });
             }
@@ -836,14 +833,14 @@ export class ResponseModal {
                 selectedRoute,
                 session,
                 context: effectiveContext,
-                lastMessageText,
+                history,
                 historyEvents,
             });
         }
         else {
             // Fallback: No routes defined, stream a simple response
             yield* this.streamFallbackResponse({
-                history: historyEvents, // Use Event[] for fallback response
+                history,
                 context: effectiveContext,
                 session,
             });
@@ -857,7 +854,7 @@ export class ResponseModal {
      * @private
      */
     async *streamBatchResponse(params) {
-        const { selectedRoute, batchSteps, context, historyEvents, batchStoppedReason, signal } = params;
+        const { selectedRoute, batchSteps, history, context, historyEvents, batchStoppedReason, signal } = params;
         let session = params.session;
         // Create hook executor function
         const executeHook = async (hook, hookContext, data, step) => {
@@ -898,7 +895,7 @@ export class ResponseModal {
         const agentOptions = this.agent.getAgentOptions();
         const stream = agentOptions.provider.generateMessageStream({
             prompt: batchPromptResult.prompt,
-            history: historyEvents,
+            history, // Use HistoryItem[] for AI provider
             context,
             tools: availableTools,
             signal,
@@ -994,7 +991,7 @@ export class ResponseModal {
      * @private
      */
     async processRouteResponse(params) {
-        const { selectedRoute, selectedStep, responseDirectives, history, context, lastMessageText, historyEvents, signal } = params;
+        const { selectedRoute, selectedStep, responseDirectives, history, context, historyEvents, signal } = params;
         let session = params.session;
         // Determine next step
         let nextStep;
@@ -1061,8 +1058,7 @@ export class ResponseModal {
             rules: selectedRoute.getRules(),
             prohibitions: selectedRoute.getProhibitions(),
             directives: responseDirectives,
-            history: historyEvents, // Use Event[] for buildResponsePrompt
-            lastMessage: lastMessageText, // Use string for buildResponsePrompt
+            history: historyEvents,
             agentOptions: this.agent.getAgentOptions(),
             combinedGuidelines: [...this.agent.getGuidelines(), ...selectedRoute.getGuidelines()],
             combinedTerms: this.mergeTerms(this.agent.getTerms(), selectedRoute.getTerms()),
@@ -1076,7 +1072,7 @@ export class ResponseModal {
         const agentOptions = this.agent.getAgentOptions();
         const result = await agentOptions.provider.generateMessage({
             prompt: responsePrompt,
-            history: historyEvents, // Use Event[] for AI provider
+            history, // Use HistoryItem[] for AI provider
             context,
             tools: availableTools,
             signal,
@@ -1118,7 +1114,7 @@ export class ResponseModal {
      * @private
      */
     async *processRouteStreamingResponse(params) {
-        const { selectedRoute, selectedStep, responseDirectives, history, context, lastMessageText, historyEvents, signal } = params;
+        const { selectedRoute, selectedStep, responseDirectives, history, context, historyEvents, signal } = params;
         let session = params.session;
         // Determine next step (same logic as non-streaming)
         let nextStep;
@@ -1179,8 +1175,7 @@ export class ResponseModal {
             rules: selectedRoute.getRules(),
             prohibitions: selectedRoute.getProhibitions(),
             directives: responseDirectives,
-            history: historyEvents, // Use Event[] for buildResponsePrompt
-            lastMessage: lastMessageText, // Use string for buildResponsePrompt
+            history: historyEvents,
             agentOptions: this.agent.getAgentOptions(),
             combinedGuidelines: [...this.agent.getGuidelines(), ...selectedRoute.getGuidelines()],
             combinedTerms: this.mergeTerms(this.agent.getTerms(), selectedRoute.getTerms()),
@@ -1194,7 +1189,7 @@ export class ResponseModal {
         const agentOptions = this.agent.getAgentOptions();
         const stream = agentOptions.provider.generateMessageStream({
             prompt: responsePrompt,
-            history: historyEvents, // Use Event[] for AI provider
+            history, // Use HistoryItem[] for AI provider
             context,
             tools: availableTools,
             signal,
@@ -1206,20 +1201,79 @@ export class ResponseModal {
             // Extract tool calls from AI response on final chunk
             if (chunk.done && chunk.structured?.toolCalls) {
                 toolCalls = chunk.structured.toolCalls;
-                // Execute tools with unified loop handling
-                const toolResult = await this.executeUnifiedToolLoop({
-                    toolCalls,
-                    context,
-                    session,
-                    history,
-                    selectedRoute,
-                    responsePrompt,
-                    availableTools,
-                    responseSchema,
-                    signal,
-                });
-                session = toolResult.session;
-                toolCalls = toolResult.finalToolCalls;
+                const toolManager = this.getToolManager();
+                // Use concurrent execution for the initial batch of tool calls
+                if (toolManager && typeof toolManager.executeWithConcurrency === 'function') {
+                    const toolCallRequests = toolCalls.map((tc, i) => ({
+                        id: `${tc.toolName}-${i}-${Date.now()}`,
+                        toolName: tc.toolName,
+                        arguments: tc.arguments,
+                    }));
+                    const historyEvents = historyToEvents(history);
+                    try {
+                        for await (const update of toolManager.executeWithConcurrency({
+                            toolCalls: toolCallRequests,
+                            context,
+                            data: session.data,
+                            history: historyEvents,
+                            signal,
+                            route: selectedRoute,
+                            step: nextStep,
+                        })) {
+                            // Apply context updates
+                            if (update.contextUpdate) {
+                                try {
+                                    await this.agent.updateContext(update.contextUpdate);
+                                }
+                                catch (error) {
+                                    logger.error(`[ResponseModal] Failed to update context from concurrent tool:`, error);
+                                }
+                            }
+                            // Apply data updates
+                            if (update.dataUpdate) {
+                                try {
+                                    const updateDataMethod = this.agent.getUpdateDataMethod();
+                                    session = await updateDataMethod(session, update.dataUpdate);
+                                }
+                                catch (error) {
+                                    logger.error(`[ResponseModal] Failed to update data from concurrent tool:`, error);
+                                }
+                            }
+                            // Yield progress updates immediately
+                            if (update.progress) {
+                                yield {
+                                    delta: '',
+                                    accumulated: chunk.accumulated,
+                                    done: false,
+                                    session,
+                                    toolCalls: undefined,
+                                    isRouteComplete: false,
+                                    metadata: { toolProgress: update.progress, toolCallId: update.toolCallId },
+                                };
+                            }
+                        }
+                        logger.debug(`[ResponseModal] Concurrent tool execution completed for ${toolCallRequests.length} tools`);
+                    }
+                    catch (error) {
+                        logger.error(`[ResponseModal] Concurrent tool execution failed, falling back to sequential:`, error);
+                        // Fall back to the unified tool loop on failure
+                        const toolResult = await this.executeUnifiedToolLoop({
+                            toolCalls, context, session, history, selectedRoute,
+                            responsePrompt, availableTools, responseSchema, signal,
+                        });
+                        session = toolResult.session;
+                        toolCalls = toolResult.finalToolCalls;
+                    }
+                }
+                else {
+                    // Fallback: no ToolManager or no executeWithConcurrency, use unified tool loop
+                    const toolResult = await this.executeUnifiedToolLoop({
+                        toolCalls, context, session, history, selectedRoute,
+                        responsePrompt, availableTools, responseSchema, signal,
+                    });
+                    session = toolResult.session;
+                    toolCalls = toolResult.finalToolCalls;
+                }
             }
             // Extract collected data on final chunk
             if (chunk.done && chunk.structured && nextStep.collect) {
@@ -1336,33 +1390,33 @@ export class ResponseModal {
             while (hasToolCalls && toolLoopCount < MAX_TOOL_LOOPS) {
                 toolLoopCount++;
                 logger.debug(`[ResponseModal] Starting tool loop ${toolLoopCount}/${MAX_TOOL_LOOPS} with ${toolCalls?.length || 0} tool calls`);
-                // Create tool result events with proper Event format structure
-                const toolResultEvents = [];
+                // Create tool result history items
+                const toolResultHistoryItems = [];
                 for (const toolCall of toolCalls || []) {
                     const tool = this.findAvailableTool(toolCall.toolName, selectedRoute);
                     if (tool) {
-                        // Create proper Event format for tool results
-                        const toolResultEvent = {
-                            kind: EventKind.TOOL,
-                            source: MessageRole.AGENT,
-                            timestamp: new Date().toISOString(),
-                            data: {
-                                tool_calls: [
-                                    {
-                                        tool_id: toolCall.toolName,
-                                        arguments: toolCall.arguments,
-                                        result: {
-                                            data: "Tool executed successfully",
-                                        },
-                                    },
-                                ],
-                            },
-                        };
-                        toolResultEvents.push(toolResultEvent);
+                        // Create HistoryItem format for tool results
+                        // Add assistant message with tool_calls
+                        toolResultHistoryItems.push({
+                            role: "assistant",
+                            content: null,
+                            tool_calls: [{
+                                    id: toolCall.toolName,
+                                    name: toolCall.toolName,
+                                    arguments: toolCall.arguments,
+                                }],
+                        });
+                        // Add tool result
+                        toolResultHistoryItems.push({
+                            role: "tool",
+                            tool_call_id: toolCall.toolName,
+                            name: toolCall.toolName,
+                            content: "Tool executed successfully",
+                        });
                     }
                 }
-                // Create updated history with tool results (combine Event arrays)
-                const updatedHistoryEvents = [...historyEvents, ...toolResultEvents];
+                // Create updated history with tool results
+                const updatedHistory = [...history, ...toolResultHistoryItems];
                 // Make follow-up AI call to see if more tools are needed
                 // After first iteration, don't provide tools to force a text response
                 const agentOptions = this.agent.getAgentOptions();
@@ -1374,7 +1428,7 @@ export class ResponseModal {
                 });
                 const followUpResult = await agentOptions.provider.generateMessage({
                     prompt: responsePrompt + (toolLoopCount > 1 ? "\n\nProvide a text response to the user based on the tool results." : ""),
-                    history: updatedHistoryEvents, // Use Event[] for AI provider
+                    history: updatedHistory, // Use HistoryItem[] for AI provider
                     context,
                     tools: shouldProvideTools ? availableTools : [], // Only provide tools on first iteration
                     parameters: responseSchema ? {
@@ -1412,7 +1466,7 @@ export class ResponseModal {
                                     context,
                                     updateContext: this.agent.updateContext.bind(this.agent),
                                     updateData: this.agent.updateCollectedData.bind(this.agent),
-                                    history: updatedHistoryEvents, // Use Event[] for tool execution
+                                    history: historyToEvents(updatedHistory), // Convert to Event[] for tool execution
                                     data: session.data,
                                     toolArguments: toolCall.arguments,
                                 });
@@ -1567,7 +1621,7 @@ export class ResponseModal {
      * @private
      */
     async handleRouteCompletion(params) {
-        const { selectedRoute, session, context, lastMessageText, historyEvents, signal } = params;
+        const { selectedRoute, session, context, history, historyEvents, signal } = params;
         // Get endStep spec from route
         const endStepSpec = selectedRoute.endStepSpec;
         // Create a temporary step for completion message generation using endStep configuration
@@ -1617,7 +1671,6 @@ export class ResponseModal {
                 completitionPrompt,
             ],
             history: historyEvents,
-            lastMessage: lastMessageText,
             agentOptions: this.agent.getAgentOptions(),
             combinedGuidelines: alwaysActiveGuidelines, // Only non-conditional guidelines
             combinedTerms: this.mergeTerms(this.agent.getTerms(), selectedRoute.getTerms()),
@@ -1630,7 +1683,7 @@ export class ResponseModal {
         logger.debug(`[ResponseModal] Calling AI provider for completion message...`);
         const completionResult = await agentOptions.provider.generateMessage({
             prompt: completionPrompt,
-            history: historyEvents,
+            history, // Use HistoryItem[] for AI provider
             context,
             signal,
             parameters: { jsonSchema: completionSchema, schemaName: "completion_message" },
@@ -1664,7 +1717,7 @@ export class ResponseModal {
      * @private
      */
     async *streamRouteCompletion(params) {
-        const { selectedRoute, context, lastMessageText, historyEvents, signal } = params;
+        const { selectedRoute, context, history, historyEvents, signal } = params;
         let session = params.session;
         // Get endStep spec from route
         const endStepSpec = selectedRoute.endStepSpec;
@@ -1686,8 +1739,7 @@ export class ResponseModal {
             rules: selectedRoute.getRules(),
             prohibitions: selectedRoute.getProhibitions(),
             directives: undefined, // No directives for completion
-            history: historyEvents, // Use Event[] for buildResponsePrompt
-            lastMessage: lastMessageText, // Use string for buildResponsePrompt
+            history: historyEvents,
             agentOptions: this.agent.getAgentOptions(),
             combinedGuidelines: [...this.agent.getGuidelines(), ...selectedRoute.getGuidelines()],
             combinedTerms: this.mergeTerms(this.agent.getTerms(), selectedRoute.getTerms()),
@@ -1699,7 +1751,7 @@ export class ResponseModal {
         const agentOptions = this.agent.getAgentOptions();
         const stream = agentOptions.provider.generateMessageStream({
             prompt: completionPrompt,
-            history: historyEvents, // Use Event[] for AI provider
+            history, // Use HistoryItem[] for AI provider
             context,
             signal,
             parameters: { jsonSchema: responseSchema, schemaName: "completion_message_stream" },
@@ -1763,7 +1815,6 @@ export class ResponseModal {
         logger.debug(`[ResponseModal] No route selected, generating basic response`);
         // Build basic response prompt without route context
         const fallbackPrompt = await this.responseEngine.buildFallbackPrompt({
-            history,
             agentOptions: this.agent.getAgentOptions(),
             terms: this.agent.getTerms(),
             guidelines: this.agent.getGuidelines(),
@@ -1795,7 +1846,6 @@ export class ResponseModal {
     async *streamFallbackResponse(params) {
         const { history, context, session, signal } = params;
         const fallbackPrompt = await this.responseEngine.buildFallbackPrompt({
-            history,
             agentOptions: this.agent.getAgentOptions(),
             terms: this.agent.getTerms(),
             guidelines: this.agent.getGuidelines(),