diff --git a/ui/src/conversation-panel/components/content/items/group/index.vue b/ui/src/conversation-panel/components/content/items/group/index.vue
index 2d3bcc9a551..78b1d832fd8 100644
--- a/ui/src/conversation-panel/components/content/items/group/index.vue
+++ b/ui/src/conversation-panel/components/content/items/group/index.vue
@@ -3,7 +3,7 @@
     <!-- 分组头部：标题 + 状态，收起时附当前进展，点击展开/收起组内内容 -->
     <button type="button" class="group-header" @click="isExpanded = !isExpanded">
       <svg class="group-chevron" :class="{ open: isExpanded }" viewBox="0 0 16 16" fill="none">
-        <path d="M6 4l4 4-4 4" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round"/>
+        <path d="M6 4l4 4-4 4" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" />
       </svg>
       <span class="group-name">{{ content.name }}</span>
       <span v-if="!isExpanded && currentActivity" class="group-activity">{{ currentActivity }}</span>
diff --git a/ui/src/conversation-panel/components/content/items/tool/Terminal.vue b/ui/src/conversation-panel/components/content/items/tool/Terminal.vue
index fd1a41bd65b..c98e64b1d85 100644
--- a/ui/src/conversation-panel/components/content/items/tool/Terminal.vue
+++ b/ui/src/conversation-panel/components/content/items/tool/Terminal.vue
@@ -1,32 +1,38 @@
 <template>
-  <div class="tool-call">
-    <button class="tc-head" @click="$emit('toggle')">
+  <!-- 展开或收起终端输出 -->
+  <MkCollapse
+    class="w-full"
+    :expanded="expanded"
+    trigger-class="group w-fit max-w-full overflow-hidden py-[3px] text-N500 hover:text-N900 transition-colors"
+    @update:expanded="$emit('toggle')"
+  >
+    <template #indicator="{ expanded }">
       <svg class="tc-chevron" :class="{ open: expanded }" viewBox="0 0 16 16" fill="none">
         <path d="M6 4l4 4-4 4" stroke="currentColor" stroke-width="1.6" stroke-linecap="round" stroke-linejoin="round" />
       </svg>
+    </template>
+    <template #label>
       <span class="tc-icon" :class="{ spin: loading }">
         <Loading v-if="loading" :size="14" />
         <svg v-else viewBox="0 0 16 16" fill="none">
           <path d="M11.5 2.5a1 1 0 0 1 1.4 0l.6.6a1 1 0 0 1 0 1.4l-7.1 7.1-2-2L11.5 2.5ZM4.2 10.2l2 2L3 15l-.7-.7 1.9-4.1Z" fill="currentColor" />
         </svg>
       </span>
-      <span class="tc-name">{{ commandText || 'terminal' }}</span>
-    </button>
+      <span class="tc-name" :title="commandText || 'terminal'">{{ commandText || 'terminal' }}</span>
+    </template>
 
-    <Transition enter-active-class="tc-expand-enter" leave-active-class="tc-expand-leave" @after-enter="onAfterEnter">
-      <div v-if="expanded" class="tc-body">
-        <div class="tc-term-block">
-          <div class="tc-term-line cmd">$ {{ commandText }}</div>
-          <pre class="tc-term-line out" v-if="content.content">{{ content.content }}</pre>
-          <span v-if="loading" class="tc-cursor">▋</span>
-        </div>
+    <div class="tc-body">
+      <div ref="terminalBlock" class="tc-term-block">
+        <div class="tc-term-line cmd">$ {{ commandText }}</div>
+        <pre class="tc-term-line out" v-if="content.content">{{ content.content }}</pre>
+        <span v-if="loading" class="tc-cursor">▋</span>
       </div>
-    </Transition>
-  </div>
+    </div>
+  </MkCollapse>
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue'
+import { computed, ref, watch } from 'vue'
 import Loading from '@/conversation-panel/loading/index.vue'
 import { extractPartialJsonField } from './extract-partial-json'
 
@@ -39,35 +45,20 @@ const commandText = computed(() => {
   return extractPartialJsonField(raw, 'code') || extractPartialJsonField(raw, 'cmd') || raw
 })
 
-const onAfterEnter = (el: Element) => {
-  const termBlock = (el as HTMLElement).querySelector('.tc-term-block')
-  if (termBlock) termBlock.scrollTop = termBlock.scrollHeight
-}
+// 展开后定位到终端输出底部。
+const terminalBlock = ref<HTMLElement>()
+watch(
+  () => props.expanded,
+  (expanded) => {
+    if (expanded && terminalBlock.value) {
+      terminalBlock.value.scrollTop = terminalBlock.value.scrollHeight
+    }
+  },
+  { flush: 'post' },
+)
 </script>
 
 <style scoped>
-.tool-call {
-  width: 100%;
-}
-
-.tc-head {
-  display: inline-flex;
-  align-items: center;
-  gap: 6px;
-  padding: 3px 0;
-  border: none;
-  background: none;
-  cursor: pointer;
-  font-family: inherit;
-  color: var(--mk-N500);
-  transition: color 0.15s;
-  max-width: 100%;
-  overflow: hidden;
-}
-.tc-head:hover {
-  color: var(--mk-N900);
-}
-
 .tc-chevron {
   width: 14px;
   height: 14px;
@@ -101,35 +92,6 @@ const onAfterEnter = (el: Element) => {
   max-width: 400px;
 }
 
-.tc-expand-enter {
-  animation: tc-open 0.2s ease-out;
-  overflow: hidden;
-}
-.tc-expand-leave {
-  animation: tc-close 0.15s ease-in forwards;
-  overflow: hidden;
-}
-@keyframes tc-open {
-  from {
-    opacity: 0;
-    max-height: 0;
-  }
-  to {
-    opacity: 1;
-    max-height: 600px;
-  }
-}
-@keyframes tc-close {
-  from {
-    opacity: 1;
-    max-height: 600px;
-  }
-  to {
-    opacity: 0;
-    max-height: 0;
-  }
-}
-
 .tc-body {
   padding: 6px 0 4px 8px;
   display: flex;
diff --git a/ui/src/conversation-panel/components/log-message-list/index.vue b/ui/src/conversation-panel/components/log-message-list/index.vue
index a45f567b1fc..43b19a4435a 100644
--- a/ui/src/conversation-panel/components/log-message-list/index.vue
+++ b/ui/src/conversation-panel/components/log-message-list/index.vue
@@ -16,8 +16,8 @@ const showUserAvatar = computed(() => appInfo.value?.show_user_avatar)
   <ReverseInfiniteScroll content-class="p-4" :loading="loading" :has-more="hasMore" :count="messages.length" :load-more="loadMore">
     <template v-for="(msg, i) in messages" :key="msg.id || i">
       <!-- 用户提问靠右：头像独占一行在上，提问容器在下方靠右收缩 -->
-      <div v-if="msg.role === 'USER'" class="flex flex-col items-end">
-        <div v-if="showUserAvatar">
+      <div v-if="msg.role === 'USER'">
+        <div v-if="showUserAvatar" class="text-right">
           <el-avatar v-if="userAvatar" class="bg-transparent!" shape="square" :size="24">
             <img :src="userAvatar" alt="" />
           </el-avatar>
diff --git a/ui/src/conversation-panel/components/message-list/index.vue b/ui/src/conversation-panel/components/message-list/index.vue
index bdee1b7d32e..d4a78452c65 100644
--- a/ui/src/conversation-panel/components/message-list/index.vue
+++ b/ui/src/conversation-panel/components/message-list/index.vue
@@ -37,7 +37,7 @@ const showUserAvatar = computed(() => appInfo.value?.show_user_avatar)
       <div>
         <!-- 用户提问靠右：头像独占一行在上，提问容器在下方靠右收缩 -->
         <div v-if="msg.role === 'USER'">
-          <div v-if="showUserAvatar">
+          <div v-if="showUserAvatar" class="text-right">
             <el-avatar v-if="userAvatar" class="bg-transparent!" shape="square" :size="24">
               <img :src="userAvatar" alt="" />
             </el-avatar>
diff --git a/ui/src/conversation-panel/index.scss b/ui/src/conversation-panel/index.scss
index f77412adbf4..d5a034010b3 100644
--- a/ui/src/conversation-panel/index.scss
+++ b/ui/src/conversation-panel/index.scss
@@ -10,6 +10,7 @@
   flex-direction: column;
   overflow: hidden;
   position: relative;
+  width: 50px;
 }
 
 /* 对话左右两侧 */