diff --git a/frontend/src/api/chat.ts b/frontend/src/api/chat.ts
index b352e4d..8b3ac93 100644
--- a/frontend/src/api/chat.ts
+++ b/frontend/src/api/chat.ts
@@ -16,8 +16,8 @@ export interface ChatSession {
 
 export interface ChatResponse {
   session_id: string
-  message: ChatMessage
-  response: ChatMessage
+  user_message: ChatMessage
+  assistant_message: ChatMessage
 }
 
 export async function sendChatMessage(
diff --git a/frontend/src/components/chat/ChatPanel.tsx b/frontend/src/components/chat/ChatPanel.tsx
index ba3c88a..08e0717 100644
--- a/frontend/src/components/chat/ChatPanel.tsx
+++ b/frontend/src/components/chat/ChatPanel.tsx
@@ -66,7 +66,7 @@ export default function ChatPanel({ open, onClose, contextType, contextId }: Cha
       sendChatMessage(message, sessionId, contextType, contextId),
     onSuccess: (data) => {
       setSessionId(data.session_id)
-      setMessages((prev) => [...prev, data.message, data.response])
+      setMessages((prev) => [...prev, data.user_message, data.assistant_message])
       queryClient.invalidateQueries({ queryKey: ['chat-sessions'] })
     },
   })