diff --git a/components.d.ts b/components.d.ts
index 3978490b6..920ce0af4 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -11,8 +11,11 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
+    ApiKeySetup: typeof import('./src/components/chat/ApiKeySetup.vue')['default']
     AppearanceSection: typeof import('./src/components/properties/AppearanceSection.vue')['default']
     CanvasContextMenu: typeof import('./src/components/CanvasContextMenu.vue')['default']
+    ChatInput: typeof import('./src/components/chat/ChatInput.vue')['default']
+    ChatMessage: typeof import('./src/components/chat/ChatMessage.vue')['default']
     ChatPanel: typeof import('./src/components/ChatPanel.vue')['default']
     ColorInput: typeof import('./src/components/ColorInput.vue')['default']
     ColorPicker: typeof import('./src/components/ColorPicker.vue')['default']
diff --git a/src/components/ChatPanel.vue b/src/components/ChatPanel.vue
index 5e03c7f7a..72855542d 100644
--- a/src/components/ChatPanel.vue
+++ b/src/components/ChatPanel.vue
@@ -1,44 +1,22 @@
 <script setup lang="ts">
-import {
-  CollapsibleContent,
-  CollapsibleRoot,
-  CollapsibleTrigger,
-  ScrollAreaRoot,
-  ScrollAreaScrollbar,
-  ScrollAreaThumb,
-  ScrollAreaViewport,
-  SelectContent,
-  SelectItem,
-  SelectPortal,
-  SelectRoot,
-  SelectTrigger,
-  SelectValue,
-  SelectViewport,
-  TooltipContent,
-  TooltipPortal,
-  TooltipProvider,
-  TooltipRoot,
-  TooltipTrigger
-} from 'reka-ui'
+import { ScrollAreaRoot, ScrollAreaScrollbar, ScrollAreaThumb, ScrollAreaViewport } from 'reka-ui'
 import { computed, nextTick, ref, watch } from 'vue'
-import { Markdown } from 'vue-stream-markdown'
-import 'vue-stream-markdown/index.css'
 
-import { MODELS, useAIChat } from '@/composables/use-chat'
+import ApiKeySetup from '@/components/chat/ApiKeySetup.vue'
+import ChatInput from '@/components/chat/ChatInput.vue'
+import ChatMessage from '@/components/chat/ChatMessage.vue'
+import { useAIChat } from '@/composables/use-chat'
 
 import type { DesignMessage } from '@/composables/use-chat'
 import type { Chat } from '@ai-sdk/vue'
 
-const { apiKey, modelId, isConfigured, createChat } = useAIChat()
+const { isConfigured, createChat } = useAIChat()
 
 const chat = ref<Chat<DesignMessage> | null>(null)
-const input = ref('')
 const messagesEnd = ref<HTMLDivElement>()
-const apiKeyInput = ref('')
 
 const messages = computed(() => chat.value?.messages ?? [])
 const status = computed(() => chat.value?.status ?? 'ready')
-const isStreaming = computed(() => status.value === 'streaming' || status.value === 'submitted')
 
 function ensureChat() {
   if (!chat.value && isConfigured.value) {
@@ -55,100 +33,21 @@ function scrollToBottom() {
 
 watch(messages, scrollToBottom, { deep: true })
 
-function handleSubmit(e: Event) {
-  e.preventDefault()
-  const text = input.value.trim()
-  if (!text) return
-
+function handleSubmit(text: string) {
   const c = ensureChat()
   if (!c) return
-
   c.sendMessage({ text })
-  input.value = ''
 }
 
 function handleStop() {
   chat.value?.stop()
 }
-
-function saveApiKey() {
-  apiKey.value = apiKeyInput.value.trim()
-  apiKeyInput.value = ''
-}
-
-function getTextContent(msg: DesignMessage): string {
-  return msg.parts
-    .filter((p): p is { type: 'text'; text: string } => p.type === 'text')
-    .map((p) => p.text)
-    .join('')
-}
-
-interface ToolPart {
-  type: string
-  toolCallId: string
-  toolName: string
-  state: string
-  input?: unknown
-  output?: unknown
-  errorText?: string
-}
-
-function isToolPart(part: unknown): part is ToolPart {
-  return (
-    typeof part === 'object' &&
-    part !== null &&
-    'type' in part &&
-    typeof (part as ToolPart).type === 'string' &&
-    (part as ToolPart).type.startsWith('tool-')
-  )
-}
-
-function getToolParts(msg: DesignMessage): ToolPart[] {
-  return msg.parts.filter(isToolPart)
-}
-
-function toolDisplayName(name: string): string {
-  return name.replace(/_/g, ' ').replace(/\b\w/g, (c) => c.toUpperCase())
-}
-
-function toolState(part: ToolPart): 'pending' | 'done' | 'error' {
-  if (part.state === 'error') return 'error'
-  if (part.state === 'output-available') return 'done'
-  return 'pending'
-}
 </script>
 
 <template>
   <div class="flex min-w-0 flex-1 flex-col overflow-hidden">
-    <!-- API key setup -->
-    <div v-if="!isConfigured" class="flex flex-1 flex-col items-center justify-center gap-4 px-4">
-      <icon-lucide-key-round class="size-8 text-muted" />
-      <p class="text-center text-xs text-muted">Enter your OpenRouter API key to start chatting.</p>
-      <form class="flex w-full gap-1.5" @submit.prevent="saveApiKey">
-        <input
-          v-model="apiKeyInput"
-          type="password"
-          placeholder="sk-or-…"
-          class="min-w-0 flex-1 rounded border border-border bg-input px-2 py-1 text-xs text-surface outline-none focus:border-accent"
-        />
-        <button
-          type="submit"
-          class="shrink-0 rounded bg-accent px-2.5 py-1 text-xs font-medium text-white hover:bg-accent/90"
-          :disabled="!apiKeyInput.trim()"
-        >
-          Save
-        </button>
-      </form>
-      <a
-        href="https://openrouter.ai/keys"
-        target="_blank"
-        class="text-[10px] text-muted underline hover:text-surface"
-      >
-        Get an API key →
-      </a>
-    </div>
+    <ApiKeySetup v-if="!isConfigured" />
 
-    <!-- Chat messages -->
     <template v-else>
       <ScrollAreaRoot class="min-h-0 flex-1">
         <ScrollAreaViewport class="h-full px-3 py-3 [&>div]:h-full">
@@ -163,95 +62,7 @@ function toolState(part: ToolPart): 'pending' | 'done' | 'error' {
 
           <!-- Messages -->
           <div v-else class="flex flex-col gap-3">
-            <div
-              v-for="msg in messages"
-              :key="msg.id"
-              class="flex gap-2"
-              :class="msg.role === 'user' ? 'flex-row-reverse' : ''"
-            >
-              <!-- Avatar -->
-              <div
-                class="flex size-6 shrink-0 items-center justify-center rounded-full text-[10px] font-bold"
-                :class="msg.role === 'user' ? 'bg-accent/20 text-accent' : 'bg-muted/20 text-muted'"
-              >
-                {{ msg.role === 'user' ? 'U' : 'AI' }}
-              </div>
-
-              <!-- Content -->
-              <div class="min-w-0 max-w-[85%] space-y-1.5">
-                <!-- Tool timeline -->
-                <div
-                  v-if="msg.role === 'assistant' && getToolParts(msg).length > 0"
-                  class="space-y-0.5 rounded-lg border border-border bg-canvas p-2"
-                >
-                  <CollapsibleRoot v-for="tool in getToolParts(msg)" :key="tool.toolCallId">
-                    <CollapsibleTrigger
-                      class="flex w-full items-center gap-2 rounded px-1 py-0.5 hover:bg-hover"
-                    >
-                      <div
-                        class="flex size-4 items-center justify-center rounded-full"
-                        :class="{
-                          'bg-accent/20 text-accent': toolState(tool) === 'pending',
-                          'bg-green-500/20 text-green-400': toolState(tool) === 'done',
-                          'bg-red-500/20 text-red-400': toolState(tool) === 'error'
-                        }"
-                      >
-                        <icon-lucide-loader-circle
-                          v-if="toolState(tool) === 'pending'"
-                          class="size-3 animate-spin"
-                        />
-                        <icon-lucide-check v-else-if="toolState(tool) === 'done'" class="size-3" />
-                        <icon-lucide-triangle-alert v-else class="size-3" />
-                      </div>
-                      <span class="text-[11px] text-surface">
-                        {{ toolDisplayName(tool.toolName) }}
-                      </span>
-                      <span class="text-[10px] text-muted">
-                        {{
-                          toolState(tool) === 'pending'
-                            ? 'Running…'
-                            : toolState(tool) === 'done'
-                              ? 'Done'
-                              : 'Error'
-                        }}
-                      </span>
-                      <icon-lucide-chevron-down
-                        v-if="toolState(tool) !== 'pending'"
-                        class="ml-auto size-3 text-muted transition-transform [[data-state=open]>&]:rotate-180"
-                      />
-                    </CollapsibleTrigger>
-                    <CollapsibleContent
-                      v-if="toolState(tool) !== 'pending'"
-                      class="overflow-hidden text-[10px] data-[state=closed]:collapsible-up data-[state=open]:collapsible-down"
-                    >
-                      <pre class="mt-1 overflow-x-auto rounded bg-input p-2 text-muted">{{
-                        tool.state === 'error' && tool.errorText
-                          ? tool.errorText
-                          : JSON.stringify(tool.output, null, 2)
-                      }}</pre>
-                    </CollapsibleContent>
-                  </CollapsibleRoot>
-                </div>
-
-                <!-- Text bubble -->
-                <div
-                  v-if="getTextContent(msg)"
-                  class="rounded-xl px-3 py-2 text-xs leading-relaxed"
-                  :class="
-                    msg.role === 'user'
-                      ? 'whitespace-pre-wrap rounded-br-md bg-accent text-white'
-                      : 'rounded-tl-md bg-hover text-surface'
-                  "
-                >
-                  <Markdown
-                    v-if="msg.role === 'assistant'"
-                    :content="getTextContent(msg)"
-                    class="chat-markdown"
-                  />
-                  <template v-else>{{ getTextContent(msg) }}</template>
-                </div>
-              </div>
-            </div>
+            <ChatMessage v-for="msg in messages" :key="msg.id" :message="msg" />
 
             <!-- Typing indicator -->
             <div v-if="status === 'submitted'" class="flex gap-2">
@@ -284,97 +95,7 @@ function toolState(part: ToolPart): 'pending' | 'done' | 'error' {
         </ScrollAreaScrollbar>
       </ScrollAreaRoot>
 
-      <!-- Input -->
-      <TooltipProvider>
-        <div class="shrink-0 border-t border-border px-3 py-2">
-          <!-- Model selector -->
-          <div class="mb-1.5 flex items-center">
-            <SelectRoot v-model="modelId">
-              <SelectTrigger
-                class="flex items-center gap-1 rounded px-1.5 py-0.5 text-[10px] text-muted hover:bg-hover hover:text-surface"
-              >
-                <icon-lucide-bot class="size-3" />
-                <SelectValue />
-                <icon-lucide-chevron-down class="size-2.5" />
-              </SelectTrigger>
-              <SelectPortal>
-                <SelectContent
-                  position="popper"
-                  side="top"
-                  :side-offset="4"
-                  class="z-50 max-h-60 overflow-y-auto rounded-lg border border-border bg-panel p-1 shadow-lg"
-                >
-                  <SelectViewport>
-                    <SelectItem
-                      v-for="model in MODELS"
-                      :key="model.id"
-                      :value="model.id"
-                      class="flex cursor-pointer items-center gap-2 rounded px-2 py-1.5 text-[11px] text-surface outline-none data-[highlighted]:bg-hover"
-                    >
-                      <span class="flex-1">{{ model.name }}</span>
-                      <span
-                        v-if="model.tag"
-                        class="rounded bg-accent/10 px-1 py-px text-[9px] text-accent"
-                      >
-                        {{ model.tag }}
-                      </span>
-                    </SelectItem>
-                  </SelectViewport>
-                </SelectContent>
-              </SelectPortal>
-            </SelectRoot>
-          </div>
-          <form class="flex gap-1.5" @submit="handleSubmit">
-            <input
-              v-model="input"
-              type="text"
-              placeholder="Describe a change…"
-              class="min-w-0 flex-1 rounded border border-border bg-input px-2.5 py-1.5 text-xs text-surface outline-none placeholder:text-muted focus:border-accent"
-              :disabled="status === 'submitted'"
-            />
-            <TooltipRoot v-if="isStreaming">
-              <TooltipTrigger as-child>
-                <button
-                  type="button"
-                  class="shrink-0 rounded border border-border px-2 py-1.5 text-xs text-muted hover:bg-hover"
-                  @click="handleStop"
-                >
-                  <icon-lucide-square class="size-3" />
-                </button>
-              </TooltipTrigger>
-              <TooltipPortal>
-                <TooltipContent
-                  side="top"
-                  :side-offset="4"
-                  class="rounded bg-surface px-2 py-1 text-[10px] text-canvas"
-                >
-                  Stop generating
-                </TooltipContent>
-              </TooltipPortal>
-            </TooltipRoot>
-            <TooltipRoot v-else>
-              <TooltipTrigger as-child>
-                <button
-                  type="submit"
-                  class="shrink-0 rounded bg-accent px-2.5 py-1.5 text-xs font-medium text-white hover:bg-accent/90"
-                  :disabled="!input.trim()"
-                >
-                  <icon-lucide-send class="size-3" />
-                </button>
-              </TooltipTrigger>
-              <TooltipPortal>
-                <TooltipContent
-                  side="top"
-                  :side-offset="4"
-                  class="rounded bg-surface px-2 py-1 text-[10px] text-canvas"
-                >
-                  Send message
-                </TooltipContent>
-              </TooltipPortal>
-            </TooltipRoot>
-          </form>
-        </div>
-      </TooltipProvider>
+      <ChatInput :status="status" @submit="handleSubmit" @stop="handleStop" />
     </template>
   </div>
 </template>
diff --git a/src/components/chat/ApiKeySetup.vue b/src/components/chat/ApiKeySetup.vue
new file mode 100644
index 000000000..0dd9c3263
--- /dev/null
+++ b/src/components/chat/ApiKeySetup.vue
@@ -0,0 +1,43 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+
+import { useAIChat } from '@/composables/use-chat'
+
+const { apiKey } = useAIChat()
+
+const input = ref('')
+
+function save() {
+  apiKey.value = input.value.trim()
+  input.value = ''
+}
+</script>
+
+<template>
+  <div class="flex flex-1 flex-col items-center justify-center gap-4 px-4">
+    <icon-lucide-key-round class="size-8 text-muted" />
+    <p class="text-center text-xs text-muted">Enter your OpenRouter API key to start chatting.</p>
+    <form class="flex w-full gap-1.5" @submit.prevent="save">
+      <input
+        v-model="input"
+        type="password"
+        placeholder="sk-or-…"
+        class="min-w-0 flex-1 rounded border border-border bg-input px-2 py-1 text-xs text-surface outline-none focus:border-accent"
+      />
+      <button
+        type="submit"
+        class="shrink-0 rounded bg-accent px-2.5 py-1 text-xs font-medium text-white hover:bg-accent/90"
+        :disabled="!input.trim()"
+      >
+        Save
+      </button>
+    </form>
+    <a
+      href="https://openrouter.ai/keys"
+      target="_blank"
+      class="text-[10px] text-muted underline hover:text-surface"
+    >
+      Get an API key →
+    </a>
+  </div>
+</template>
diff --git a/src/components/chat/ChatInput.vue b/src/components/chat/ChatInput.vue
new file mode 100644
index 000000000..2471c4e0a
--- /dev/null
+++ b/src/components/chat/ChatInput.vue
@@ -0,0 +1,137 @@
+<script setup lang="ts">
+import {
+  SelectContent,
+  SelectItem,
+  SelectPortal,
+  SelectRoot,
+  SelectTrigger,
+  SelectValue,
+  SelectViewport,
+  TooltipContent,
+  TooltipPortal,
+  TooltipProvider,
+  TooltipRoot,
+  TooltipTrigger
+} from 'reka-ui'
+import { computed, ref } from 'vue'
+
+import { MODELS, useAIChat } from '@/composables/use-chat'
+
+const { modelId } = useAIChat()
+
+const props = defineProps<{
+  status: 'ready' | 'submitted' | 'streaming' | 'error'
+}>()
+
+const emit = defineEmits<{
+  submit: [text: string]
+  stop: []
+}>()
+
+const input = ref('')
+
+const isStreaming = computed(() => props.status === 'streaming' || props.status === 'submitted')
+
+function handleSubmit(e: Event) {
+  e.preventDefault()
+  const text = input.value.trim()
+  if (!text) return
+  emit('submit', text)
+  input.value = ''
+}
+</script>
+
+<template>
+  <TooltipProvider>
+    <div class="shrink-0 border-t border-border px-3 py-2">
+      <!-- Model selector -->
+      <div class="mb-1.5 flex items-center">
+        <SelectRoot v-model="modelId">
+          <SelectTrigger
+            class="flex items-center gap-1 rounded px-1.5 py-0.5 text-[10px] text-muted hover:bg-hover hover:text-surface"
+          >
+            <icon-lucide-bot class="size-3" />
+            <SelectValue />
+            <icon-lucide-chevron-down class="size-2.5" />
+          </SelectTrigger>
+          <SelectPortal>
+            <SelectContent
+              position="popper"
+              side="top"
+              :side-offset="4"
+              class="z-50 max-h-60 overflow-y-auto rounded-lg border border-border bg-panel p-1 shadow-lg"
+            >
+              <SelectViewport>
+                <SelectItem
+                  v-for="model in MODELS"
+                  :key="model.id"
+                  :value="model.id"
+                  class="flex cursor-pointer items-center gap-2 rounded px-2 py-1.5 text-[11px] text-surface outline-none data-[highlighted]:bg-hover"
+                >
+                  <span class="flex-1">{{ model.name }}</span>
+                  <span
+                    v-if="model.tag"
+                    class="rounded bg-accent/10 px-1 py-px text-[9px] text-accent"
+                  >
+                    {{ model.tag }}
+                  </span>
+                </SelectItem>
+              </SelectViewport>
+            </SelectContent>
+          </SelectPortal>
+        </SelectRoot>
+      </div>
+
+      <!-- Input form -->
+      <form class="flex gap-1.5" @submit="handleSubmit">
+        <input
+          v-model="input"
+          type="text"
+          placeholder="Describe a change…"
+          class="min-w-0 flex-1 rounded border border-border bg-input px-2.5 py-1.5 text-xs text-surface outline-none placeholder:text-muted focus:border-accent"
+          :disabled="status === 'submitted'"
+        />
+        <TooltipRoot v-if="isStreaming">
+          <TooltipTrigger as-child>
+            <button
+              type="button"
+              class="shrink-0 rounded border border-border px-2 py-1.5 text-xs text-muted hover:bg-hover"
+              @click="emit('stop')"
+            >
+              <icon-lucide-square class="size-3" />
+            </button>
+          </TooltipTrigger>
+          <TooltipPortal>
+            <TooltipContent
+              side="top"
+              :side-offset="4"
+              class="rounded bg-surface px-2 py-1 text-[10px] text-canvas"
+            >
+              Stop generating
+            </TooltipContent>
+          </TooltipPortal>
+        </TooltipRoot>
+        <TooltipRoot v-else>
+          <TooltipTrigger as-child>
+            <button
+              type="submit"
+              class="shrink-0 rounded bg-accent px-2.5 py-1.5 text-xs font-medium text-white hover:bg-accent/90"
+              :disabled="!input.trim()"
+            >
+              <icon-lucide-send class="size-3" />
+            </button>
+          </TooltipTrigger>
+          <TooltipPortal>
+            <TooltipContent
+              side="top"
+              :side-offset="4"
+              class="rounded bg-surface px-2 py-1 text-[10px] text-canvas"
+            >
+              Send message
+            </TooltipContent>
+          </TooltipPortal>
+        </TooltipRoot>
+      </form>
+    </div>
+  </TooltipProvider>
+</template>
diff --git a/src/components/chat/ChatMessage.vue b/src/components/chat/ChatMessage.vue
new file mode 100644
index 000000000..481d00680
--- /dev/null
+++ b/src/components/chat/ChatMessage.vue
@@ -0,0 +1,137 @@
+<script setup lang="ts">
+import { CollapsibleContent, CollapsibleRoot, CollapsibleTrigger } from 'reka-ui'
+import { Markdown } from 'vue-stream-markdown'
+import 'vue-stream-markdown/index.css'
+
+import type { DesignMessage } from '@/composables/use-chat'
+
+const { message } = defineProps<{ message: DesignMessage }>()
+
+function getTextContent(msg: DesignMessage): string {
+  return msg.parts
+    .filter((p): p is { type: 'text'; text: string } => p.type === 'text')
+    .map((p) => p.text)
+    .join('')
+}
+
+interface ToolPart {
+  type: string
+  toolCallId: string
+  toolName: string
+  state: string
+  input?: unknown
+  output?: unknown
+  errorText?: string
+}
+
+function isToolPart(part: unknown): part is ToolPart {
+  return (
+    typeof part === 'object' &&
+    part !== null &&
+    'type' in part &&
+    typeof (part as ToolPart).type === 'string' &&
+    (part as ToolPart).type.startsWith('tool-')
+  )
+}
+
+function getToolParts(msg: DesignMessage): ToolPart[] {
+  return msg.parts.filter(isToolPart)
+}
+
+function toolDisplayName(name: string): string {
+  return name.replace(/_/g, ' ').replace(/\b\w/g, (c) => c.toUpperCase())
+}
+
+function toolState(part: ToolPart): 'pending' | 'done' | 'error' {
+  if (part.state === 'error') return 'error'
+  if (part.state === 'output-available') return 'done'
+  return 'pending'
+}
+</script>
+
+<template>
+  <div class="flex gap-2" :class="message.role === 'user' ? 'flex-row-reverse' : ''">
+    <!-- Avatar -->
+    <div
+      class="flex size-6 shrink-0 items-center justify-center rounded-full text-[10px] font-bold"
+      :class="message.role === 'user' ? 'bg-accent/20 text-accent' : 'bg-muted/20 text-muted'"
+    >
+      {{ message.role === 'user' ? 'U' : 'AI' }}
+    </div>
+
+    <!-- Content -->
+    <div class="min-w-0 max-w-[85%] space-y-1.5">
+      <!-- Tool timeline -->
+      <div
+        v-if="message.role === 'assistant' && getToolParts(message).length > 0"
+        class="space-y-0.5 rounded-lg border border-border bg-canvas p-2"
+      >
+        <CollapsibleRoot v-for="tool in getToolParts(message)" :key="tool.toolCallId">
+          <CollapsibleTrigger
+            class="flex w-full items-center gap-2 rounded px-1 py-0.5 hover:bg-hover"
+          >
+            <div
+              class="flex size-4 items-center justify-center rounded-full"
+              :class="{
+                'bg-accent/20 text-accent': toolState(tool) === 'pending',
+                'bg-green-500/20 text-green-400': toolState(tool) === 'done',
+                'bg-red-500/20 text-red-400': toolState(tool) === 'error'
+              }"
+            >
+              <icon-lucide-loader-circle
+                v-if="toolState(tool) === 'pending'"
+                class="size-3 animate-spin"
+              />
+              <icon-lucide-check v-else-if="toolState(tool) === 'done'" class="size-3" />
+              <icon-lucide-triangle-alert v-else class="size-3" />
+            </div>
+            <span class="text-[11px] text-surface">
+              {{ toolDisplayName(tool.toolName) }}
+            </span>
+            <span class="text-[10px] text-muted">
+              {{
+                toolState(tool) === 'pending'
+                  ? 'Running…'
+                  : toolState(tool) === 'done'
+                    ? 'Done'
+                    : 'Error'
+              }}
+            </span>
+            <icon-lucide-chevron-down
+              v-if="toolState(tool) !== 'pending'"
+              class="ml-auto size-3 text-muted transition-transform [[data-state=open]>&]:rotate-180"
+            />
+          </CollapsibleTrigger>
+          <CollapsibleContent
+            v-if="toolState(tool) !== 'pending'"
+            class="overflow-hidden text-[10px] data-[state=closed]:collapsible-up data-[state=open]:collapsible-down"
+          >
+            <pre class="mt-1 overflow-x-auto rounded bg-input p-2 text-muted">{{
+              tool.state === 'error' && tool.errorText
+                ? tool.errorText
+                : JSON.stringify(tool.output, null, 2)
+            }}</pre>
+          </CollapsibleContent>
+        </CollapsibleRoot>
+      </div>
+
+      <!-- Text bubble -->
+      <div
+        v-if="getTextContent(message)"
+        class="rounded-xl px-3 py-2 text-xs leading-relaxed"
+        :class="
+          message.role === 'user'
+            ? 'whitespace-pre-wrap rounded-br-md bg-accent text-white'
+            : 'rounded-tl-md bg-hover text-surface'
+        "
+      >
+        <Markdown
+          v-if="message.role === 'assistant'"
+          :content="getTextContent(message)"
+          class="chat-markdown"
+        />
+        <template v-else>{{ getTextContent(message) }}</template>
+      </div>
+    </div>
+  </div>
+</template>