diff --git a/frontend/src/components/LogViewer/LogStreamViewer.tsx b/frontend/src/components/LogViewer/LogStreamViewer.tsx
index 9d034097..28e51a81 100644
--- a/frontend/src/components/LogViewer/LogStreamViewer.tsx
+++ b/frontend/src/components/LogViewer/LogStreamViewer.tsx
@@ -73,7 +73,7 @@ export const LogStreamViewer: React.FC<LogStreamViewerProps> = ({
   console.log('[LogStreamViewer] Render - status:', currentStatus, 'error:', error, 'shouldShowError:', shouldShowError, 'isConnecting:', isConnecting);
 
   return (
-    <div className={`flex flex-col h-full ${className}`}>
+    <div className={`flex flex-col h-full relative ${className}`}>
       {/* 自定义控制栏 */}
       {customToolbar && (
         <div className="flex-shrink-0">
@@ -82,7 +82,7 @@ export const LogStreamViewer: React.FC<LogStreamViewerProps> = ({
       )}
 
       {/* 日志显示区域 */}
-      <div className="flex-1 overflow-hidden">
+      <div className="flex-1 overflow-hidden relative">
         {shouldShowError ? (
           <div className="h-full flex items-center justify-center p-4 bg-gray-950">
             <div className="text-center max-w-md">
diff --git a/frontend/src/components/LogViewer/MonacoLogViewer.tsx b/frontend/src/components/LogViewer/MonacoLogViewer.tsx
index f3f3a0fe..f2af88ab 100644
--- a/frontend/src/components/LogViewer/MonacoLogViewer.tsx
+++ b/frontend/src/components/LogViewer/MonacoLogViewer.tsx
@@ -12,6 +12,7 @@ export const MonacoLogViewer: React.FC<MonacoLogViewerProps> = ({
   fontSize = 12,
   theme = 'vs-dark',
   height = '100%',
+  wordWrap = false,
   onReady,
   className = '',
   style = {},
@@ -27,6 +28,15 @@ export const MonacoLogViewer: React.FC<MonacoLogViewerProps> = ({
     autoScrollRef.current = autoScroll;
   }, [autoScroll]);
 
+  // 更新wordWrap设置
+  useEffect(() => {
+    if (editorRef.current) {
+      editorRef.current.updateOptions({
+        wordWrap: wordWrap ? 'on' : 'off',
+      });
+    }
+  }, [wordWrap]);
+
   // Monaco Editor挂载完成
   const handleEditorDidMount = (editor: editor.IStandaloneCodeEditor, monaco: Monaco) => {
     editorRef.current = editor;
@@ -125,7 +135,7 @@ export const MonacoLogViewer: React.FC<MonacoLogViewerProps> = ({
   };
 
   return (
-    <div className={`w-full h-full ${className}`} style={{ height, ...style }}>
+    <div className={`w-full h-full relative ${className}`} style={{ height, ...style }}>
       <Editor
         height="100%"
         defaultLanguage="plaintext"
@@ -137,7 +147,7 @@ export const MonacoLogViewer: React.FC<MonacoLogViewerProps> = ({
           readOnly: true,
           minimap: { enabled: false },
           scrollBeyondLastLine: false,
-          wordWrap: 'off',
+          wordWrap: wordWrap ? 'on' : 'off',
           lineNumbers: 'on',
           glyphMargin: false,
           folding: false,
diff --git a/frontend/src/components/LogViewer/types.ts b/frontend/src/components/LogViewer/types.ts
index c1b2d50e..6effcf00 100644
--- a/frontend/src/components/LogViewer/types.ts
+++ b/frontend/src/components/LogViewer/types.ts
@@ -159,6 +159,9 @@ export interface MonacoLogViewerProps {
   /** 高度 */
   height?: string | number;
   
+  /** 自动换行 */
+  wordWrap?: boolean;
+  
   /** 就绪回调 */
   onReady?: (api: LogViewerAPI) => void;
   
diff --git a/frontend/src/components/Terminal/TerminalWindowManager.tsx b/frontend/src/components/Terminal/TerminalWindowManager.tsx
index 3c55eae4..b2495bbc 100644
--- a/frontend/src/components/Terminal/TerminalWindowManager.tsx
+++ b/frontend/src/components/Terminal/TerminalWindowManager.tsx
@@ -199,9 +199,9 @@ export function TerminalWindowManager<TResource = any>({
             {windows.map(win => (
                 <div
                     key={win.id}
-                    style={{ 
-                        visibility: win.isMinimized ? 'hidden' : 'visible',
-                        pointerEvents: win.isMinimized ? 'none' : 'auto',
+                    style={{
+                        // 使用 display:none 彻底隐藏最小化窗口，避免Monaco滚动条残影
+                        display: win.isMinimized ? 'none' : 'block',
                     }}
                 >
                     <DraggableWindow
diff --git a/frontend/src/components/ui/draggable-window.tsx b/frontend/src/components/ui/draggable-window.tsx
index f69521f3..d04afd19 100644
--- a/frontend/src/components/ui/draggable-window.tsx
+++ b/frontend/src/components/ui/draggable-window.tsx
@@ -214,8 +214,8 @@ export const DraggableWindow: React.FC<DraggableWindowProps> = ({
                 </div>
             </div>
 
-            {/* 窗口内容 */}
-            <div className="flex-1 overflow-hidden">
+            {/* 窗口内容 - relative定位确保子元素的absolute定位正确 */}
+            <div className="flex-1 overflow-hidden relative">
                 {children}
             </div>
 
diff --git a/frontend/src/pages/Dashboard/components/LogWindowManager.tsx b/frontend/src/pages/Dashboard/components/LogWindowManager.tsx
index 79d71559..f2eb090f 100644
--- a/frontend/src/pages/Dashboard/components/LogWindowManager.tsx
+++ b/frontend/src/pages/Dashboard/components/LogWindowManager.tsx
@@ -28,6 +28,7 @@ import {
   Loader2,
   ChevronUp,
   ChevronDown,
+  WrapText,
 } from 'lucide-react';
 import { Badge } from '@/components/ui/badge';
 import { 
@@ -76,6 +77,7 @@ const LogViewerContent: React.FC<{
   const [loadingPods, setLoadingPods] = useState(app.runtimeType === 'K8S');
   const [isControlBarCollapsed, setIsControlBarCollapsed] = useState(false);
   const [status, setStatus] = useState<LogStreamStatus>(LogStreamStatus.DISCONNECTED);
+  const [wordWrap, setWordWrap] = useState(true);
   
   const controlApiRef = useRef<LogStreamControlAPI | null>(null);
   const logApiRef = useRef<LogViewerAPI | null>(null);
@@ -392,6 +394,9 @@ const LogViewerContent: React.FC<{
     
     controlApiRef.current.send(JSON.stringify(stopMessage));
     
+    // 立即更新状态为DISCONNECTED，确保UI正确显示开始按钮
+    setStatus(LogStreamStatus.DISCONNECTED);
+    
     setTimeout(() => {
       controlApiRef.current?.disconnect();
     }, 100);
@@ -537,6 +542,20 @@ const LogViewerContent: React.FC<{
                   </TooltipTrigger>
                   <TooltipContent>清空</TooltipContent>
                 </Tooltip>
+
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <Button
+                      size="sm"
+                      variant={wordWrap ? "default" : "outline"}
+                      onClick={() => setWordWrap(!wordWrap)}
+                      className="h-7 w-7 p-0"
+                    >
+                      <WrapText className="h-3 w-3" />
+                    </Button>
+                  </TooltipTrigger>
+                  <TooltipContent>{wordWrap ? '关闭换行' : '自动换行'}</TooltipContent>
+                </Tooltip>
               </div>
             </div>
           </TooltipProvider>
@@ -587,6 +606,7 @@ const LogViewerContent: React.FC<{
           theme: 'vs-dark',
           fontSize: 13,
           height: '100%',
+          wordWrap: wordWrap,
         }}
         onReady={(controlApi, logApi) => {
           controlApiRef.current = controlApi;