fix: update context handling in ChatClient and API route

Author: ahmedrowaihi

examples/ts-react-chat/src/routes/api.tanchat.ts

@@ -59,7 +59,7 @@ export const Route = createFileRoute('/api/tanchat')({
         const abortController = new AbortController()
 
         const body = await request.json()
-        const { messages, data, context } = body
+        const { messages, data } = body
 
         // Extract provider, model, and conversationId from data
         const provider: Provider = data?.provider || 'openai'
@@ -97,6 +97,13 @@ export const Route = createFileRoute('/api/tanchat')({
             `[API Route] Using provider: ${provider}, model: ${selectedModel}`,
           )
 
+          // Server-side context (e.g., database connections, user session)
+          // This is separate from client context and only used for server tools
+          const serverContext = {
+            // Add server-side context here if needed
+            // e.g., db, userId from session, etc.
+          }
+
           const stream = chat({
             adapter: adapter as any,
             model: selectedModel as any,
@@ -112,7 +119,7 @@ export const Route = createFileRoute('/api/tanchat')({
             messages,
             abortController,
             conversationId,
-            ...(context !== undefined && { context }),
+            context: serverContext,
           })
           return toStreamResponse(stream, { abortController })
         } catch (error: any) {

packages/typescript/ai-client/src/chat-client.ts

@@ -310,13 +310,10 @@ export class ChatClient<
       // Call onResponse callback
       await this.callbacksRef.current.onResponse()
 
-      // Include conversationId and context in the body for server-side event correlation
+      // Include conversationId in the body for server-side event correlation
       const bodyWithConversationId = {
         ...this.body,
         conversationId: this.uniqueId,
-        ...(this.options.context !== undefined && {
-          context: this.options.context,
-        }),
       }
 
       // Connect and stream

packages/typescript/ai-client/src/types.ts

@@ -211,20 +211,19 @@ export interface ChatClientOptions<
   }
 
   /**
-   * Context object that is automatically passed to all tool execute functions.
+   * Context object that is automatically passed to client-side tool execute functions.
    *
-   * This allows tools to access shared context (like user ID, local storage,
+   * This allows client tools to access shared context (like user ID, local storage,
    * browser APIs, etc.) without needing to capture them via closures.
-   * Works for both client and server tools.
    *
-   * The context is also sent to the server in the request body, so server tools
-   * can access the same context.
+   * Note: This context is only used for client-side tools. Server tools should receive
+   * their own context from the server-side chat() function.
    *
    * @example
    * const client = new ChatClient({
    *   connection: fetchServerSentEvents('/api/chat'),
    *   context: { userId: '123', localStorage },
-   *   tools: [getUserData],
+   *   tools: [clientTool],
    * });
    */
   context?: TContext

packages/typescript/ai-client/tests/chat-client.test.ts

@@ -667,7 +667,7 @@ describe('ChatClient', () => {
       expect(mockStorage.setItem).toHaveBeenCalledWith('pref_123_theme', 'dark')
     })
 
-    it('should send context to server in request body', async () => {
+    it('should not send context to server (context is only for client tools)', async () => {
       const testContext = {
         userId: '123',
         sessionId: 'session-456',
@@ -688,9 +688,9 @@ describe('ChatClient', () => {
 
       await client.sendMessage('Hello')
 
-      // Context should be in the request body
+      // Context should NOT be in the request body (only used for client tools)
       expect(capturedBody).toBeDefined()
-      expect(capturedBody.context).toEqual(testContext)
+      expect(capturedBody.context).toBeUndefined()
     })
 
     it('should work without context (context is optional)', async () => {