@botonic/plugin-ai-agents 0.43.0-beta.0 → 0.44.0-alpha.0

package/src/hubtype-api-client.ts

@@ -74,6 +74,14 @@ export interface GetMessagesV2Result {
   truncated: boolean
 }
 
+interface MessageHistoryV2Params {
+  last_message_id: string
+  max_messages?: number
+  include_tool_calls?: boolean
+  max_full_tool_results?: number
+  debug_mode?: boolean
+}
+
 export class HubtypeApiClient {
   private readonly authToken: string
 
@@ -158,21 +166,20 @@ export class HubtypeApiClient {
       'Content-Type': 'application/json',
       Authorization: `Bearer ${this.authToken}`,
     }
-    const params: Record<string, string | number | boolean> = {
+    const params: MessageHistoryV2Params = {
       last_message_id: request.input.message_id,
-    }
-
-    if (options.maxMessages !== undefined) {
-      params.max_messages = options.maxMessages
-    }
-    if (options.includeToolCalls !== undefined) {
-      params.include_tool_calls = options.includeToolCalls
-    }
-    if (options.maxFullToolResults !== undefined) {
-      params.max_full_tool_results = options.maxFullToolResults
-    }
-    if (options.debugMode !== undefined) {
-      params.debug_mode = options.debugMode
+      ...(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,
+      }),
     }
 
     try {

package/src/index.ts

@@ -20,8 +20,7 @@ import {
 export default class BotonicPluginAiAgents<
   TPlugins extends ResolvedPlugins = ResolvedPlugins,
   TExtraData = any,
-> implements Plugin
-{
+> implements Plugin {
   private readonly authToken?: string
   private readonly messageHistoryApiVersion: MessageHistoryApiVersion
   private readonly memory: MemoryOptions
@@ -60,14 +59,15 @@ export default class BotonicPluginAiAgents<
       const tools = this.buildTools(
         aiAgentArgs.activeTools?.map(tool => tool.name) || []
       )
-      const agent = new AIAgentBuilder<TPlugins, TExtraData>(
-        aiAgentArgs.name,
-        aiAgentArgs.instructions,
-        tools,
-        request.session.user.contact_info || {},
-        aiAgentArgs.inputGuardrailRules || [],
-        aiAgentArgs.sourceIds || []
-      ).build()
+      const agent = new AIAgentBuilder<TPlugins, TExtraData>({
+        name: aiAgentArgs.name,
+        instructions: aiAgentArgs.instructions,
+        tools: tools,
+        contactInfo: request.session.user.contact_info || [],
+        inputGuardrailRules: aiAgentArgs.inputGuardrailRules || [],
+        sourceIds: aiAgentArgs.sourceIds || [],
+        campaignContext: request.input.context?.campaign_v2,
+      }).build()
 
       const messages = await this.getMessages(
         request,

package/src/openai.ts

@@ -3,7 +3,7 @@ import {
   setOpenAIAPI,
   setTracingDisabled,
 } from '@openai/agents'
-import { AzureOpenAI } from 'openai'
+import OpenAI, { AzureOpenAI } from 'openai'
 
 import {
   AZURE_OPENAI_API_BASE,
@@ -11,21 +11,37 @@ import {
   AZURE_OPENAI_API_KEY,
   AZURE_OPENAI_API_VERSION,
   isProd,
+  OPENAI_API_KEY,
+  OPENAI_PROVIDER,
 } from './constants'
 
 export function setUpOpenAI(maxRetries?: number, timeout?: number) {
-  setAzureOpenAIClient(maxRetries, timeout)
+  if (OPENAI_PROVIDER === 'azure') {
+    setAzureOpenAIClient(maxRetries, timeout)
+  } else {
+    setOpenAIClient(maxRetries, timeout)
+  }
   setOpenAIAPI('chat_completions')
   setTracingDisabled(true)
 }
 
+function setOpenAIClient(maxRetries?: number, timeout?: number) {
+  const client = new OpenAI({
+    apiKey: OPENAI_API_KEY,
+    timeout: timeout || 16000, // 16 seconds
+    maxRetries: maxRetries || 2,
+    dangerouslyAllowBrowser: !isProd,
+  })
+  setDefaultOpenAIClient(client)
+}
+
 function setAzureOpenAIClient(maxRetries?: number, timeout?: number) {
   const client = new AzureOpenAI({
     apiKey: AZURE_OPENAI_API_KEY,
     apiVersion: AZURE_OPENAI_API_VERSION,
     deployment: AZURE_OPENAI_API_DEPLOYMENT_NAME,
     baseURL: AZURE_OPENAI_API_BASE,
-    timeout: timeout || 8000, // 8 seconds
+    timeout: timeout || 16000, // 16 seconds
     maxRetries: maxRetries || 2,
     dangerouslyAllowBrowser: !isProd,
   })

package/src/runner.ts

@@ -1,4 +1,4 @@
-import { ResolvedPlugins, ToolExecution } from '@botonic/core'
+import { OutputMessage, ResolvedPlugins, ToolExecution } from '@botonic/core'
 import {
   InputGuardrailTripwireTriggered,
   Runner,
@@ -14,6 +14,15 @@ import {
   RunResult,
 } from './types'
 
+// Minimal interface matching the properties we actually use from Runner.run() result
+// This bypasses strict type checking while maintaining type safety for accessed properties
+interface AIAgentRunnerResult {
+  finalOutput?: {
+    messages?: OutputMessage[]
+  }
+  newItems?: RunToolCallItem[]
+}
+
 export class AIAgentRunner<
   TPlugins extends ResolvedPlugins = ResolvedPlugins,
   TExtraData = any,
@@ -28,15 +37,15 @@ export class AIAgentRunner<
     messages: AgenticInputMessage[],
     context: Context<TPlugins, TExtraData>
   ): Promise<RunResult> {
-    console.log(
-      'Running agent with messages',
-      JSON.stringify(messages, null, 2)
-    )
     try {
       const runner = new Runner({
         modelSettings: { temperature: 0 },
       })
-      const result = await runner.run(this.agent, messages, { context })
+      // Type assertion to bypass strict type checking - the actual return type from runner.run()
+      // doesn't perfectly match our interface, but the properties we access are compatible
+      const result = (await runner.run(this.agent, messages, {
+        context,
+      })) as AIAgentRunnerResult
 
       const outputMessages = result.finalOutput?.messages || []
       const hasExit =

package/src/tools/retrieve-knowledge.ts

@@ -4,7 +4,7 @@ import { z } from 'zod'
 import { HubtypeApiClient } from '../hubtype-api-client'
 import { Context } from '../types'
 
-export const retrieveKnowledge = tool<any, Context, any>({
+export const retrieveKnowledge = tool({
   name: 'retrieve_knowledge',
   description:
     'Consult the knowledge base for information before answering. Use this tool to make sure the information you provide is faithful.',
@@ -12,10 +12,11 @@ export const retrieveKnowledge = tool<any, Context, any>({
     query: z.string().describe('The query to search the knowledge base for'),
   }),
   execute: async (
-    { query }: { query: string },
+    input: { query: string },
     runContext?: RunContext<Context>
   ): Promise<string[]> => {
     const context = runContext?.context
+    const query = input.query
     if (!context) {
       throw new Error('Context is required')
     }

package/src/types.ts

@@ -10,6 +10,7 @@ import {
 import {
   Agent,
   AgentInputItem,
+  AgentOutputType,
   RunContext as OpenAIRunContext,
   Tool as OpenAITool,
 } from '@openai/agents'
@@ -55,16 +56,16 @@ export interface Chunk {
   text: string
 }
 
-export type ContactInfo = Record<string, string>
-
 export type Tool<
   TPlugins extends ResolvedPlugins = ResolvedPlugins,
   TExtraData = any,
 > = OpenAITool<Context<TPlugins, TExtraData>>
+
 export type AIAgent<
   TPlugins extends ResolvedPlugins = ResolvedPlugins,
   TExtraData = any,
-> = Agent<Context<TPlugins, TExtraData>, typeof OutputSchema>
+> = Agent<Context<TPlugins, TExtraData>, AgentOutputType<typeof OutputSchema>>
+
 export type MessageHistoryApiVersion = 'v1' | 'v2'
 
 export interface MemoryOptions {