feat: use previousMessages for AiAgent Context

Iru89 · Iru89 · commit f16db7cc0896 · 2026-03-20T17:49:12.000+01:00
diff --git a/packages/botonic-core/src/models/ai-agents.ts b/packages/botonic-core/src/models/ai-agents.ts
@@ -93,6 +93,16 @@ export enum VerbosityLevel {
   High = 'high',
 }
 
+export interface HubtypeAssistantMessage {
+  role: 'assistant'
+  content: string
+}
+
+export interface HubtypeUserMessage {
+  role: 'user'
+  content: string
+}
+
 export interface AiAgentArgs {
   name: string
   instructions: string
@@ -101,5 +111,5 @@ export interface AiAgentArgs {
   activeTools?: { name: string }[]
   inputGuardrailRules?: GuardrailRule[]
   sourceIds?: string[]
-  previousFollowUps?: any[]
+  previousHubtypeMessages?: HubtypeAssistantMessage[]
 }
diff --git a/packages/botonic-plugin-ai-agents/src/debug-logger.ts b/packages/botonic-plugin-ai-agents/src/debug-logger.ts
@@ -1,6 +1,6 @@
 import type { AiAgentArgs, ToolExecution } from '@botonic/core'
 import type { ModelSettings } from '@openai/agents'
-import { MAX_MEMORY_LENGTH, OPENAI_PROVIDER } from './constants'
+import { OPENAI_PROVIDER } from './constants'
 import type { AgenticInputMessage, MemoryOptions, RunResult } from './types'
 
 const PREFIX = '[BotonicPluginAiAgents]'
@@ -50,10 +50,10 @@ class EnabledDebugLogger implements DebugLogger {
       `${PREFIX} Custom Tools Registered: ${config.customToolNames.join(', ') || 'none'}`
     )
     console.log(`${PREFIX} Memory Options:`, {
-      maxMessages: config.memory.maxMessages ?? MAX_MEMORY_LENGTH,
-      includeToolCalls: config.memory.includeToolCalls ?? true,
-      maxFullToolResults: config.memory.maxFullToolResults ?? 1,
-      debugMode: config.memory.debugMode ?? false,
+      maxMessages: config.memory.maxMessages,
+      includeToolCalls: config.memory.includeToolCalls,
+      maxFullToolResults: config.memory.maxFullToolResults,
+      debugMode: config.memory.debugMode,
     })
     console.log(`${PREFIX} === End Plugin Initialization ===`)
   }
diff --git a/packages/botonic-plugin-ai-agents/src/index.ts b/packages/botonic-plugin-ai-agents/src/index.ts
@@ -1,6 +1,7 @@
 import type {
   AiAgentArgs,
   BotContext,
+  HubtypeAssistantMessage,
   Plugin,
   ResolvedPlugins,
 } from '@botonic/core'
@@ -52,20 +53,29 @@ export default class BotonicPluginAiAgents<
     this.authToken = options?.authToken
     this.toolDefinitions = options?.customTools || []
     this.messageHistoryApiVersion = options?.messageHistoryApiVersion ?? 'v2'
-    this.memory = options?.memory ?? {}
+    this.memory = this.getMemoryOptions(options?.memory)
     this.timeout = options?.timeout ?? DEFAULT_TIMEOUT_16_SECONDS
     this.maxRetries = options?.maxRetries ?? DEFAULT_MAX_RETRIES
     this.logger = createDebugLogger(options?.enableDebug ?? false)
 
     this.logger.logInitialConfig({
       messageHistoryApiVersion: this.messageHistoryApiVersion,
-      maxRetries: options?.maxRetries ?? 2,
-      timeout: options?.timeout ?? 16000,
+      maxRetries: options?.maxRetries ?? DEFAULT_MAX_RETRIES,
+      timeout: options?.timeout ?? DEFAULT_TIMEOUT_16_SECONDS,
       customToolNames: this.toolDefinitions.map(t => t.name),
       memory: this.memory,
     })
   }
 
+  private getMemoryOptions(memory?: Partial<MemoryOptions>): MemoryOptions {
+    return {
+      maxMessages: memory?.maxMessages ?? MAX_MEMORY_LENGTH,
+      includeToolCalls: memory?.includeToolCalls ?? true,
+      maxFullToolResults: memory?.maxFullToolResults ?? 1,
+      debugMode: memory?.debugMode ?? false,
+    }
+  }
+
   pre(): void {
     return
   }
@@ -120,7 +130,7 @@ export default class BotonicPluginAiAgents<
       const messages = await this.getMessages(
         botContext,
         authToken,
-        MAX_MEMORY_LENGTH
+        aiAgentArgs.previousHubtypeMessages || []
       )
 
       // Build context
@@ -168,25 +178,22 @@ export default class BotonicPluginAiAgents<
   private async getMessages(
     botContext: BotContext,
     authToken: string,
-    memoryLength: number
+    previousHubtypeMessages: HubtypeAssistantMessage[]
   ): Promise<AgenticInputMessage[]> {
     const hubtypeClient = new HubtypeApiClient(authToken)
-
     if (!isProd) {
-      return await hubtypeClient.getLocalMessages(memoryLength)
+      return await hubtypeClient.getLocalMessages(
+        MAX_MEMORY_LENGTH,
+        previousHubtypeMessages
+      )
     }
 
-    // if (this.messageHistoryApiVersion === 'v1') {
-    //   return await hubtypeClient.getMessages(botContext, memoryLength)
-    // }
-
     // Default to V2
-    const result = await hubtypeClient.getMessagesV2(botContext, {
-      maxMessages: this.memory.maxMessages ?? memoryLength,
-      includeToolCalls: this.memory.includeToolCalls ?? true,
-      maxFullToolResults: this.memory.maxFullToolResults ?? 1,
-      debugMode: this.memory.debugMode ?? false,
-    })
+    const result = await hubtypeClient.getMessagesV2(
+      botContext,
+      this.memory,
+      previousHubtypeMessages
+    )
     return result.messages
   }
 
diff --git a/packages/botonic-plugin-ai-agents/src/services/hubtype-api-client.ts b/packages/botonic-plugin-ai-agents/src/services/hubtype-api-client.ts
@@ -1,11 +1,10 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import type { BotContext } from '@botonic/core'
+import type { BotContext, HubtypeAssistantMessage } from '@botonic/core'
 import axios from 'axios'
 
 import { HUBTYPE_API_URL } from '../constants'
-import type { AgenticInputMessage, Chunk } from '../types'
+import type { AgenticInputMessage, Chunk, MemoryOptions } from '../types'
 import type {
-  GetMessagesV2Options,
   GetMessagesV2Result,
   HubtypeAssistantMessageV2,
   HubtypeMessage,
@@ -46,7 +45,8 @@ export class HubtypeApiClient {
   }
 
   async getLocalMessages(
-    maxMemoryLength: number
+    maxMemoryLength: number,
+    previousHubtypeMessages: HubtypeAssistantMessage[]
   ): Promise<AgenticInputMessage[]> {
     const localBotonicState =
       typeof globalThis !== 'undefined' && globalThis.localStorage
@@ -61,39 +61,15 @@ export class HubtypeApiClient {
         content: message.data.text,
       }))
       .map(message => this.formatMessage(message))
-    return filteredMessages.slice(-maxMemoryLength)
-  }
-
-  // async getMessages(
-  //   botContext: BotContext,
-  //   maxMemoryLength: number
-  // ): Promise<AgenticInputMessage[]> {
-  //   const url = `${HUBTYPE_API_URL}/external/v1/ai/agent/message_history/`
-  //   const headers = {
-  //     'Content-Type': 'application/json',
-  //     Authorization: `Bearer ${this.authToken}`,
-  //   }
-  //   const params = {
-  //     last_message_id: botContext.input.message_id,
-  //     num_messages: maxMemoryLength,
-  //   }
+    const resultMessages = [...filteredMessages, ...previousHubtypeMessages]
 
-  //   try {
-  //     const response = await axios.get<{ messages: HubtypeMessage[] }>(url, {
-  //       headers,
-  //       params,
-  //     })
-  //     const messages = response.data.messages
-  //     return messages.map(message => this.formatMessage(message))
-  //   } catch (error) {
-  //     console.error(error)
-  //     throw new Error('Failed to get messages from Hubtype')
-  //   }
-  // }
+    return resultMessages.slice(-maxMemoryLength)
+  }
 
   async getMessagesV2(
     botContext: BotContext,
-    options: GetMessagesV2Options = {}
+    options: MemoryOptions,
+    previousHubtypeMessages: HubtypeAssistantMessage[]
   ): Promise<GetMessagesV2Result> {
     const url = `${HUBTYPE_API_URL}/external/v2/ai/agent/message_history/`
     const headers = {
@@ -102,18 +78,10 @@ export class HubtypeApiClient {
     }
     const params: MessageHistoryV2Params = {
       last_message_id: botContext.input.message_id,
-      ...(options.maxMessages !== undefined && {
-        max_messages: options.maxMessages,
-      }),
-      ...(options.includeToolCalls !== undefined && {
-        include_tool_calls: options.includeToolCalls,
-      }),
-      ...(options.maxFullToolResults !== undefined && {
-        max_full_tool_results: options.maxFullToolResults,
-      }),
-      ...(options.debugMode !== undefined && {
-        debug_mode: options.debugMode,
-      }),
+      max_messages: options.maxMessages,
+      include_tool_calls: options.includeToolCalls,
+      max_full_tool_results: options.maxFullToolResults,
+      debug_mode: options.debugMode,
     }
 
     try {
@@ -122,9 +90,10 @@ export class HubtypeApiClient {
         params,
       })
       const { messages, conversation_id, truncated } = response.data
-      const formattedMessages = messages
+      const formattedMessages = [...messages, ...previousHubtypeMessages]
         .map(message => this.formatMessageV2(message))
         .filter((message): message is AgenticInputMessage => message !== null)
+
       return {
         messages: formattedMessages,
         conversationId: conversation_id,
diff --git a/packages/botonic-plugin-ai-agents/src/services/types.ts b/packages/botonic-plugin-ai-agents/src/services/types.ts
@@ -1,3 +1,4 @@
+import type { HubtypeAssistantMessage, HubtypeUserMessage } from '@botonic/core'
 import type { AgenticInputMessage } from '../types'
 
 export enum TrackProductName {
@@ -28,16 +29,6 @@ export interface TrackLlmRunsData {
   llm_runs: LlmRunData[]
 }
 
-interface HubtypeAssistantMessage {
-  role: 'assistant'
-  content: string
-}
-
-interface HubtypeUserMessage {
-  role: 'user'
-  content: string
-}
-
 export type HubtypeMessage = HubtypeAssistantMessage | HubtypeUserMessage
 
 // V2 API Types
@@ -84,13 +75,6 @@ export interface MessageHistoryResponseV2 {
   truncated: boolean
 }
 
-export interface GetMessagesV2Options {
-  maxMessages?: number
-  includeToolCalls?: boolean
-  maxFullToolResults?: number
-  debugMode?: boolean
-}
-
 export interface GetMessagesV2Result {
   messages: AgenticInputMessage[]
   conversationId: string | null
diff --git a/packages/botonic-plugin-ai-agents/src/types.ts b/packages/botonic-plugin-ai-agents/src/types.ts
@@ -69,10 +69,10 @@ export type AIAgent<
 export type MessageHistoryApiVersion = 'v1' | 'v2'
 
 export interface MemoryOptions {
-  maxMessages?: number
-  includeToolCalls?: boolean
-  maxFullToolResults?: number
-  debugMode?: boolean
+  maxMessages: number
+  includeToolCalls: boolean
+  maxFullToolResults: number
+  debugMode: boolean
 }
 
 export interface PluginAiAgentOptions<
@@ -86,7 +86,7 @@ export interface PluginAiAgentOptions<
   /** API version for message history endpoint. Defaults to 'v2'. */
   messageHistoryApiVersion?: MessageHistoryApiVersion
   /** Options for V2 message history API. Only used when messageHistoryApiVersion is 'v2'. */
-  memory?: MemoryOptions
+  memory?: Partial<MemoryOptions>
   /** Enable debug logging for AI agent configuration and execution details. */
   enableDebug?: boolean
 }
diff --git a/packages/botonic-plugin-ai-agents/tests/debug-logger.test.ts b/packages/botonic-plugin-ai-agents/tests/debug-logger.test.ts
@@ -55,6 +55,7 @@ describe('DebugLogger', () => {
           maxMessages: 30,
           includeToolCalls: true,
           maxFullToolResults: 2,
+          debugMode: false,
         },
       })
 
@@ -207,7 +208,12 @@ describe('DebugLogger', () => {
         maxRetries: 2,
         timeout: 16000,
         customToolNames: [],
-        memory: {},
+        memory: {
+          maxMessages: 30,
+          includeToolCalls: true,
+          maxFullToolResults: 2,
+          debugMode: false,
+        },
       })
       logger.logAgentDebugInfo(
         {
diff --git a/packages/botonic-plugin-flow-builder/src/action/ai-agent.ts b/packages/botonic-plugin-flow-builder/src/action/ai-agent.ts
@@ -15,15 +15,16 @@ export async function getContentsByAiAgent({
   const contents =
     await flowBuilderPlugin.getContentsByNode(startNodeAiAgentFlow)
 
-  const aiAgentContent = contents.find(
-    content => content instanceof FlowAiAgent
-  ) as FlowAiAgent
-
-  if (!aiAgentContent) {
+  const splitContents = splitAiAgentAndContentsBefore(contents)
+  if (!splitContents) {
     return []
   }
+  const { aiAgentContent, contentsBeforeAiAgent } = splitContents
 
-  const aiAgentResponse = await aiAgentContent.getAIAgentResponse(request)
+  const aiAgentResponse = await aiAgentContent.getAIAgentResponse(
+    request,
+    contentsBeforeAiAgent
+  )
 
   if (!aiAgentResponse) {
     return []
@@ -39,3 +40,24 @@ export async function getContentsByAiAgent({
 
   return contents
 }
+
+interface SplitAiAgentAndContentsBeforeResult {
+  aiAgentContent: FlowAiAgent
+  contentsBeforeAiAgent: FlowContent[]
+}
+
+export function splitAiAgentAndContentsBefore(
+  contents: FlowContent[]
+): SplitAiAgentAndContentsBeforeResult | undefined {
+  const aiAgentIndex = contents.findIndex(
+    content => content instanceof FlowAiAgent
+  )
+  if (aiAgentIndex < 0) {
+    return undefined
+  }
+
+  const aiAgentContent = contents[aiAgentIndex] as FlowAiAgent
+  const contentsBeforeAiAgent = contents.slice(0, aiAgentIndex)
+
+  return { aiAgentContent, contentsBeforeAiAgent }
+}
diff --git a/packages/botonic-plugin-flow-builder/src/action/index.tsx b/packages/botonic-plugin-flow-builder/src/action/index.tsx
diff --git a/packages/botonic-plugin-flow-builder/src/content-fields/flow-ai-agent.tsx b/packages/botonic-plugin-flow-builder/src/content-fields/flow-ai-agent.tsx
