diff --git a/desktop/src/components/ChatArea.tsx b/desktop/src/components/ChatArea.tsx
index 8002256..703ed69 100644
--- a/desktop/src/components/ChatArea.tsx
+++ b/desktop/src/components/ChatArea.tsx
@@ -12,7 +12,7 @@ import { type UnlistenFn } from '@tauri-apps/api/event';
 import { safeListenEvent } from '../lib/safe-tauri';
 import { Paperclip, ArrowUp, MessageSquare, Download, X, FileText, Image as ImageIcon, Search, ClipboardList, Square } from 'lucide-react';
 import { Button, EmptyState, MessageListSkeleton, LoadingDots } from './ui';
-import { ResizableChatLayout } from './ai/ResizableChatLayout';
+import { ResizableChatLayout, PanelToggleButton } from './ai/ResizableChatLayout';
 import { ArtifactPanel } from './ai/ArtifactPanel';
 import { ToolCallChain, type ToolCallStep } from './ai/ToolCallChain';
 import { TaskProgress, type Subtask } from './ai/TaskProgress';
@@ -361,6 +361,13 @@ export function ChatArea({ compact, onOpenDetail }: { compact?: boolean; onOpenD
               <Search className="w-3.5 h-3.5" />
             </Button>
           )}
+          {/* Side panel toggle — Trae Solo style, in header */}
+          {!compact && (
+            <PanelToggleButton
+              panelOpen={artifactPanelOpen}
+              onToggle={() => setArtifactPanelOpen(!artifactPanelOpen)}
+            />
+          )}
           {/* 详情按钮 (简洁模式) */}
           {compact && onOpenDetail && (
             <Button
@@ -398,7 +405,7 @@ export function ChatArea({ compact, onOpenDetail }: { compact?: boolean; onOpenD
       </AnimatePresence>
 
       {/* Messages */}
-      <Conversation className="flex-1 bg-white dark:bg-gray-900">
+      <Conversation className="flex-1 bg-white dark:bg-gray-900 px-6 py-4">
         <AnimatePresence mode="popLayout">
           {/* Loading skeleton */}
           {isLoading && messages.length === 0 && (
@@ -467,6 +474,7 @@ export function ChatArea({ compact, onOpenDetail }: { compact?: boolean; onOpenD
                 animate="visible"
                 layout
                 transition={defaultTransition}
+                className="mb-5"
               >
                 <MessageBubble message={message} onRetry={createRetryHandler(message.id)} />
               </motion.div>
diff --git a/desktop/src/components/ai/ResizableChatLayout.tsx b/desktop/src/components/ai/ResizableChatLayout.tsx
index 0480ec2..d81b310 100644
--- a/desktop/src/components/ai/ResizableChatLayout.tsx
+++ b/desktop/src/components/ai/ResizableChatLayout.tsx
@@ -10,6 +10,9 @@ import { X, PanelRightOpen, PanelRightClose } from 'lucide-react';
  * - Right panel: Artifact/detail viewer (collapsible)
  * - Draggable resize handle between panels
  * - Persisted panel sizes via localStorage
+ *
+ * Side-panel toggle is injected into the chat header via `headerAction`
+ * so it sits cleanly in the top-right corner (Trae Solo style).
  */
 
 interface ResizableChatLayoutProps {
@@ -61,16 +64,10 @@ export function ResizableChatLayout({
   }, [rightPanelOpen, onRightPanelToggle]);
 
   if (!rightPanelOpen || !rightPanel) {
+    // Panel closed: just render chat panel, no floating button
     return (
-      <div className="h-full flex flex-col overflow-hidden relative">
+      <div className="h-full flex flex-col overflow-hidden">
         {chatPanel}
-        <button
-          onClick={handleToggle}
-          className="absolute top-20 right-4 z-10 p-1.5 rounded-md bg-white/80 dark:bg-gray-800/80 border border-gray-200 dark:border-gray-700 text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-200 hover:bg-white dark:hover:bg-gray-800 transition-colors shadow-sm"
-          title="打开侧面板"
-        >
-          <PanelRightOpen className="w-4 h-4" />
-        </button>
       </div>
     );
   }
@@ -87,15 +84,8 @@ export function ResizableChatLayout({
           defaultSize={sizes.left}
           minSize="40%"
         >
-          <div className="h-full flex flex-col relative">
+          <div className="h-full flex flex-col">
             {chatPanel}
-            <button
-              onClick={handleToggle}
-              className="absolute top-20 right-4 z-10 p-1.5 rounded-md bg-white/80 dark:bg-gray-800/80 border border-gray-200 dark:border-gray-700 text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-200 hover:bg-white dark:hover:bg-gray-800 transition-colors shadow-sm"
-              title="关闭侧面板"
-            >
-              <PanelRightClose className="w-4 h-4" />
-            </button>
           </div>
         </Panel>
 
@@ -134,3 +124,28 @@ export function ResizableChatLayout({
     </div>
   );
 }
+
+/**
+ * Toggle button for embedding in chat header.
+ * Renders PanelRightOpen/PanelRightClose icon — Trae Solo style.
+ */
+export function PanelToggleButton({
+  panelOpen,
+  onToggle,
+}: {
+  panelOpen: boolean;
+  onToggle: () => void;
+}) {
+  return (
+    <button
+      onClick={onToggle}
+      className="p-1.5 rounded-md text-gray-500 dark:text-gray-400 hover:text-gray-700 dark:hover:text-gray-200 hover:bg-gray-100 dark:hover:bg-gray-800 transition-colors"
+      title={panelOpen ? '关闭侧面板' : '打开侧面板'}
+    >
+      {panelOpen
+        ? <PanelRightClose className="w-4 h-4" />
+        : <PanelRightOpen className="w-4 h-4" />
+      }
+    </button>
+  );
+}