@falai/agent 1.2.0 → 1.2.1

package/src/core/ResponseModal.ts

@@ -12,13 +12,11 @@ import type {
     HistoryItem,
     Tool,
     Event,
-    ToolEventData,
     AgentStructuredResponse,
     Term,
     StoppedReason,
     ToolCallRequest,
 } from "../types";
-import { EventKind, MessageRole } from "../types";
 import type { Agent } from "./Agent";
 import type { Route } from "./Route";
 import { Step } from "./Step";
@@ -26,7 +24,7 @@ import { ResponseEngine } from "./ResponseEngine";
 import { ResponsePipeline } from "./ResponsePipeline";
 import { BatchExecutor, type HookFunction } 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 type { ToolManager } from "./ToolManager";
 import { END_ROUTE_ID } from "../constants";
@@ -669,12 +667,15 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
             `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<TContext, Partial<TData>>({
                 prompt: extractionPrompt.join('\n'),
-                history,
+                history: historyItems,
                 context: {} as TContext, // 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
@@ -716,7 +717,6 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
         // 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: string;
         let toolCalls: Array<{ toolName: string; arguments: Record<string, unknown> }> | undefined = undefined;
@@ -757,7 +757,6 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
                     session,
                     history,
                     context: effectiveContext,
-                    lastMessageText,
                     historyEvents,
                     signal: undefined,
                 });
@@ -785,7 +784,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
                     selectedRoute,
                     session,
                     context: effectiveContext,
-                    lastMessageText,
+                    history,
                     historyEvents,
                     signal: undefined,
                 });
@@ -806,7 +805,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
             // Fallback: No routes defined, generate a simple response
 
             message = await this.generateFallbackResponse({
-                history: historyEvents, // Use Event[] for fallback response
+                history,
                 context: effectiveContext,
                 session,
             });
@@ -926,7 +925,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
         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,
@@ -1125,7 +1124,6 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
         // 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
@@ -1153,7 +1151,6 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
                     session,
                     history,
                     context: effectiveContext,
-                    lastMessageText,
                     historyEvents,
                 });
             }
@@ -1164,14 +1161,14 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
                 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,
             });
@@ -1196,7 +1193,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
         batchStoppedReason?: StoppedReason;
         signal?: AbortSignal;
     }): AsyncGenerator<AgentResponseStreamChunk<TData>> {
-        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
@@ -1251,7 +1248,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
         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,
@@ -1380,17 +1377,16 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
         selectedStep?: Step<TContext, TData>;
         responseDirectives?: string[];
         session: SessionState<TData>;
-        history: HistoryItem[]; // Keep as HistoryItem[] for AI provider compatibility
+        history: HistoryItem[];
         context: TContext;
-        lastMessageText: string; // String version for buildResponsePrompt
-        historyEvents: Event[]; // Event[] version for buildResponsePrompt
+        historyEvents: Event[];
         signal?: AbortSignal;
     }): Promise<{
         message: string;
         toolCalls?: Array<{ toolName: string; arguments: Record<string, unknown> }>;
         session: SessionState<TData>;
     }> {
-        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
@@ -1466,8 +1462,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
             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()),
@@ -1483,7 +1478,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
         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,
@@ -1538,11 +1533,10 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
         session: SessionState<TData>;
         history: HistoryItem[];
         context: TContext;
-        lastMessageText: string; // String version for buildResponsePrompt
-        historyEvents: Event[]; // Event[] version for buildResponsePrompt
+        historyEvents: Event[];
         signal?: AbortSignal;
     }): AsyncGenerator<AgentResponseStreamChunk<TData>> {
-        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)
@@ -1609,8 +1603,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
             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()),
@@ -1626,7 +1619,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
         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,
@@ -1863,34 +1856,34 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
                 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: Event<ToolEventData>[] = [];
+                // Create tool result history items
+                const toolResultHistoryItems: HistoryItem[] = [];
                 for (const toolCall of toolCalls || []) {
                     const tool = this.findAvailableTool(toolCall.toolName, selectedRoute);
                     if (tool) {
-                        // Create proper Event format for tool results
-                        const toolResultEvent: Event<ToolEventData> = {
-                            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" as const,
+                            content: null,
+                            tool_calls: [{
+                                id: toolCall.toolName,
+                                name: toolCall.toolName,
+                                arguments: toolCall.arguments,
+                            }],
+                        });
+                        // Add tool result
+                        toolResultHistoryItems.push({
+                            role: "tool" as const,
+                            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
@@ -1905,7 +1898,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
 
                 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 ? {
@@ -1949,7 +1942,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
                                     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,
                                 });
@@ -2121,11 +2114,11 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
         selectedRoute: Route<TContext, TData>;
         session: SessionState<TData>;
         context: TContext;
-        lastMessageText: string; // String version for buildResponsePrompt
-        historyEvents: Event[]; // Event[] version for buildResponsePrompt
+        history: HistoryItem[];
+        historyEvents: Event[];
         signal?: AbortSignal;
     }): Promise<string> {
-        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;
@@ -2181,7 +2174,6 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
                 completitionPrompt,
             ],
             history: historyEvents,
-            lastMessage: lastMessageText,
             agentOptions: this.agent.getAgentOptions(),
             combinedGuidelines: alwaysActiveGuidelines, // Only non-conditional guidelines
             combinedTerms: this.mergeTerms(this.agent.getTerms(), selectedRoute.getTerms()),
@@ -2196,7 +2188,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
 
         const completionResult = await agentOptions.provider.generateMessage({
             prompt: completionPrompt,
-            history: historyEvents,
+            history, // Use HistoryItem[] for AI provider
             context,
             signal,
             parameters: { jsonSchema: completionSchema, schemaName: "completion_message" },
@@ -2240,11 +2232,11 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
         selectedRoute: Route<TContext, TData>;
         session: SessionState<TData>;
         context: TContext;
-        lastMessageText: string; // String version for buildResponsePrompt
-        historyEvents: Event[]; // Event[] version for buildResponsePrompt
+        history: HistoryItem[];
+        historyEvents: Event[];
         signal?: AbortSignal;
     }): AsyncGenerator<AgentResponseStreamChunk<TData>> {
-        const { selectedRoute, context, lastMessageText, historyEvents, signal } = params;
+        const { selectedRoute, context, history, historyEvents, signal } = params;
         let session = params.session;
 
         // Get endStep spec from route
@@ -2270,8 +2262,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
             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()),
@@ -2284,7 +2275,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
         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" },
@@ -2353,7 +2344,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
      * @private
      */
     private async generateFallbackResponse(params: {
-        history: Event[]; // Use Event[] for buildFallbackPrompt
+        history: HistoryItem[];
         context: TContext;
         session: SessionState<TData>;
         signal?: AbortSignal;
@@ -2364,7 +2355,6 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
 
         // 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(),
@@ -2397,7 +2387,7 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
      * @private
      */
     private async *streamFallbackResponse(params: {
-        history: Event[]; // Use Event[] for buildFallbackPrompt
+        history: HistoryItem[];
         context: TContext;
         session: SessionState<TData>;
         signal?: AbortSignal;
@@ -2405,7 +2395,6 @@ export class ResponseModal<TContext = unknown, TData = unknown> {
         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(),

package/src/core/ResponsePipeline.ts

@@ -10,7 +10,7 @@ import type {
   Tool,
   RouteTransitionConfig,
 } from "../types";
-import { EventKind, MessageRole } from "../types/history";
+import type { HistoryItem } from "../types/history";
 import {
   createSession,
   enterRoute,
@@ -18,6 +18,7 @@ import {
   mergeCollected,
   logger,
   render,
+  historyToEvents,
 } from "../utils";
 import { createTemplateContext } from "../utils/template";
 import { Route } from "../core/Route";
@@ -171,7 +172,7 @@ export class ResponsePipeline<TContext = unknown, TData = unknown> {
         };
       }
     }
-    
+
     // If no pending transition or transition handled, do normal routing
     if (routes.length > 0 && !selectedRoute) {
       const orchestration = await this.routingEngine.decideRouteAndStep({
@@ -242,7 +243,7 @@ export class ResponsePipeline<TContext = unknown, TData = unknown> {
         currentStep, // Pass current step instead of undefined to maintain progression
         createTemplateContext({ data: session.data, session, context: contextToUse })
       );
-      
+
       if (candidates.length > 0) {
         nextStep = candidates[0].step;
         logger.debug(
@@ -368,7 +369,7 @@ export class ResponsePipeline<TContext = unknown, TData = unknown> {
     selectedRoute?: Route<TContext, TData>;
     nextStep: Step<TContext, TData>;
     responsePrompt: string;
-    history: Event[];
+    history: HistoryItem[];
     context: TContext;
     session: SessionState<TData>;
     responseSchema: Record<string, unknown>;
@@ -400,31 +401,30 @@ export class ResponsePipeline<TContext = unknown, TData = unknown> {
       );
 
       // Add tool execution results to history so AI knows what happened
-      const toolResultsEvents: Event[] = [];
+      const toolResultItems: HistoryItem[] = [];
       for (const toolCall of currentToolCalls || []) {
         const tool = this.findAvailableTool(toolCall.toolName, selectedRoute);
         if (tool) {
-          toolResultsEvents.push({
-            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",
-                  },
-                },
-              ],
-            },
+          toolResultItems.push({
+            role: "assistant" as const,
+            content: null,
+            tool_calls: [{
+              id: toolCall.toolName,
+              name: toolCall.toolName,
+              arguments: toolCall.arguments,
+            }],
+          });
+          toolResultItems.push({
+            role: "tool" as const,
+            tool_call_id: toolCall.toolName,
+            name: toolCall.toolName,
+            content: "Tool executed successfully",
           });
         }
       }
 
       // Create updated history with tool results
-      const updatedHistory = [...history, ...toolResultsEvents];
+      const updatedHistory = [...history, ...toolResultItems];
 
       // Make follow-up AI call to see if more tools are needed
       const followUpResult = await this.options.provider.generateMessage({
@@ -454,7 +454,7 @@ export class ResponsePipeline<TContext = unknown, TData = unknown> {
           selectedRoute,
           context,
           session: currentSession,
-          history: updatedHistory,
+          history: historyToEvents(updatedHistory),
           isStreaming,
         });
 

package/src/core/RoutingEngine.ts

@@ -12,7 +12,7 @@ import type { Step } from "./Step";
 import { PromptComposer } from "./PromptComposer";
 import { PromptSectionCache } from "./PromptSectionCache";
 import { END_ROUTE_ID } from "../constants";
-import { createTemplateContext, getLastMessageFromHistory, logger } from "../utils";
+import { createTemplateContext, getLastMessageFromHistory, logger, eventsToHistory } from "../utils";
 
 export interface CandidateStep<TContext = unknown, TData = unknown> {
   step: Step<TContext, TData>;
@@ -246,7 +246,7 @@ export class RoutingEngine<TContext = unknown, TData = unknown> {
       }
     >({
       prompt: stepPrompt,
-      history,
+      history: eventsToHistory(history),
       context,
       signal,
       parameters: {
@@ -659,7 +659,7 @@ export class RoutingEngine<TContext = unknown, TData = unknown> {
       RoutingDecisionOutput
     >({
       prompt: routingPrompt,
-      history,
+      history: eventsToHistory(history),
       context,
       signal,
       parameters: {

package/src/providers/AnthropicProvider.ts

@@ -15,6 +15,7 @@ import type {
   GenerateMessageStreamChunk,
   AgentStructuredResponse,
 } from "../types";
+import type { HistoryItem } from "../types/history";
 import { withTimeoutAndRetry, logger } from "../utils";
 
 const DEFAULT_RETRY_CONFIG = {
@@ -152,6 +153,67 @@ export class AnthropicProvider implements AiProvider {
     };
   }
 
+  /**
+   * Build Anthropic-formatted messages from HistoryItem[] array.
+   * System messages are extracted separately (Anthropic uses a `system` param).
+   * Tool results are mapped to Anthropic's tool_result content blocks.
+   * Assistant tool_calls are mapped to tool_use content blocks.
+   */
+  private buildAnthropicMessages(history: HistoryItem[]): {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    messages: any[];
+    systemMessages: string[];
+  } {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const messages: any[] = [];
+    const systemMessages: string[] = [];
+
+    for (const item of history) {
+      switch (item.role) {
+        case "system":
+          systemMessages.push(item.content);
+          break;
+        case "user":
+          messages.push({ role: "user", content: item.content });
+          break;
+        case "assistant":
+          if (item.tool_calls && item.tool_calls.length > 0) {
+            const content: Array<Record<string, unknown>> = [];
+            if (item.content) {
+              content.push({ type: "text", text: item.content });
+            }
+            for (const tc of item.tool_calls) {
+              content.push({
+                type: "tool_use",
+                id: tc.id,
+                name: tc.name,
+                input: tc.arguments,
+              });
+            }
+            messages.push({ role: "assistant", content });
+          } else {
+            messages.push({ role: "assistant", content: item.content || "" });
+          }
+          break;
+        case "tool":
+          // Anthropic tool results are sent as user messages with tool_result content blocks
+          messages.push({
+            role: "user",
+            content: [
+              {
+                type: "tool_result",
+                tool_use_id: item.tool_call_id,
+                content: typeof item.content === "string" ? item.content : JSON.stringify(item.content),
+              },
+            ],
+          });
+          break;
+      }
+    }
+
+    return { messages, systemMessages };
+  }
+
   async generateMessage<
     TContext = unknown,
     TStructured = AgentStructuredResponse
@@ -248,18 +310,36 @@ export class AnthropicProvider implements AiProvider {
       // Anthropic requires max_tokens to be specified
       const maxTokens = input.parameters?.maxOutputTokens || 4096;
 
+      // Build messages from history
+      const { messages: historyMessages, systemMessages } = this.buildAnthropicMessages(input.history);
+
+      // Append the current prompt as the final user message
+      historyMessages.push({
+        role: "user",
+        content: input.prompt,
+      });
+
       const params: MessageCreateParamsNonStreaming = {
         model,
         max_tokens: maxTokens,
-        messages: [
-          {
-            role: "user",
-            content: input.prompt,
-          },
-        ],
+        messages: historyMessages,
         ...this.config,
       };
 
+      // Set system messages from history if present
+      if (systemMessages.length > 0) {
+        if (typeof this.config?.system === "string") {
+          params.system = `${this.config.system}\n\n${systemMessages.join("\n\n")}`;
+        } else if (Array.isArray(this.config?.system)) {
+          params.system = [
+            ...this.config.system,
+            ...systemMessages.map(s => ({ type: "text" as const, text: s })),
+          ];
+        } else {
+          params.system = systemMessages.join("\n\n");
+        }
+      }
+
       // Add tools if provided
       if (input.tools && input.tools.length > 0) {
         params.tools = input.tools.map((tool) => ({
@@ -438,19 +518,37 @@ export class AnthropicProvider implements AiProvider {
     // Anthropic requires max_tokens to be specified
     const maxTokens = input.parameters?.maxOutputTokens || 4096;
 
+    // Build messages from history
+    const { messages: historyMessages, systemMessages } = this.buildAnthropicMessages(input.history);
+
+    // Append the current prompt as the final user message
+    historyMessages.push({
+      role: "user" as const,
+      content: input.prompt,
+    });
+
     const params = {
       model,
       max_tokens: maxTokens,
-      messages: [
-        {
-          role: "user" as const,
-          content: input.prompt,
-        },
-      ],
+      messages: historyMessages,
       stream: true,
       ...this.config,
     };
 
+    // Set system messages from history if present
+    if (systemMessages.length > 0) {
+      if (typeof this.config?.system === "string") {
+        params.system = `${this.config.system}\n\n${systemMessages.join("\n\n")}`;
+      } else if (Array.isArray(this.config?.system)) {
+        params.system = [
+          ...this.config.system,
+          ...systemMessages.map(s => ({ type: "text" as const, text: s })),
+        ];
+      } else {
+        params.system = systemMessages.join("\n\n");
+      }
+    }
+
     // Add tools if provided
     if (input.tools && input.tools.length > 0) {
       params.tools = input.tools.map((tool) => ({