Update config.yaml

config.yaml

@@ -10,7 +10,7 @@
 # ============================================
 
 # 前端显示的版本号（可选，不填则显示默认版本）
-version: "v1.4.4"
+version: "v1.4.5"
 # 服务器配置
 server:
   host: 0.0.0.0 # 监听地址，0.0.0.0 表示监听所有网络接口

internal/handler/agent.go

@@ -12,6 +12,7 @@ import (
 	"path/filepath"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 	"unicode/utf8"
 
@@ -121,9 +122,10 @@ func (h *AgentHandler) SetAgentsMarkdownDir(absDir string) {
 
 // ChatAttachment 聊天附件（用户上传的文件）
 type ChatAttachment struct {
-	FileName string `json:"fileName"` // 文件名
-	Content  string `json:"content"`  // 文本内容或 base64（由 MimeType 决定是否解码）
-	MimeType string `json:"mimeType,omitempty"`
+	FileName   string `json:"fileName"`             // 展示用文件名
+	Content    string `json:"content,omitempty"`    // 文本或 base64；若已预先上传到服务器可留空
+	MimeType   string `json:"mimeType,omitempty"`
+	ServerPath string `json:"serverPath,omitempty"` // 已保存在 chat_uploads 下的绝对路径（由 POST /api/chat-uploads 返回）
 }
 
 // ChatRequest 聊天请求
@@ -140,7 +142,115 @@ const (
 	chatUploadsDirName = "chat_uploads" // 对话附件保存的根目录（相对当前工作目录）
 )
 
-// saveAttachmentsToDateAndConversationDir 将附件保存到 chat_uploads/YYYY-MM-DD/{conversationID}/，返回每个文件的保存路径（与 attachments 顺序一致）
+// validateChatAttachmentServerPath 校验绝对路径落在工作目录 chat_uploads 下且为普通文件（防路径穿越）
+func validateChatAttachmentServerPath(abs string) (string, error) {
+	p := strings.TrimSpace(abs)
+	if p == "" {
+		return "", fmt.Errorf("empty path")
+	}
+	cwd, err := os.Getwd()
+	if err != nil {
+		return "", fmt.Errorf("获取当前工作目录失败: %w", err)
+	}
+	root := filepath.Join(cwd, chatUploadsDirName)
+	rootAbs, err := filepath.Abs(filepath.Clean(root))
+	if err != nil {
+		return "", err
+	}
+	pathAbs, err := filepath.Abs(filepath.Clean(p))
+	if err != nil {
+		return "", err
+	}
+	sep := string(filepath.Separator)
+	if pathAbs != rootAbs && !strings.HasPrefix(pathAbs, rootAbs+sep) {
+		return "", fmt.Errorf("path outside chat_uploads")
+	}
+	st, err := os.Stat(pathAbs)
+	if err != nil {
+		return "", err
+	}
+	if st.IsDir() {
+		return "", fmt.Errorf("not a regular file")
+	}
+	return pathAbs, nil
+}
+
+// avoidChatUploadDestCollision 若 path 已存在则生成带时间戳+随机后缀的新文件名（与上传接口命名风格一致）
+func avoidChatUploadDestCollision(path string) string {
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		return path
+	}
+	dir := filepath.Dir(path)
+	base := filepath.Base(path)
+	ext := filepath.Ext(base)
+	nameNoExt := strings.TrimSuffix(base, ext)
+	suffix := fmt.Sprintf("_%s_%s", time.Now().Format("150405"), shortRand(6))
+	var unique string
+	if ext != "" {
+		unique = nameNoExt + suffix + ext
+	} else {
+		unique = base + suffix
+	}
+	return filepath.Join(dir, unique)
+}
+
+// relocateManualOrNewUploadToConversation 无会话 ID 时前端会上传到 …/日期/_manual；首条消息创建会话后，将文件移入 …/日期/{conversationId}/ 以便按对话隔离。
+func relocateManualOrNewUploadToConversation(absPath, conversationID string, logger *zap.Logger) (string, error) {
+	conv := strings.TrimSpace(conversationID)
+	if conv == "" {
+		return absPath, nil
+	}
+	convSan := strings.ReplaceAll(conv, string(filepath.Separator), "_")
+	if convSan == "" || convSan == "_manual" || convSan == "_new" {
+		return absPath, nil
+	}
+	cwd, err := os.Getwd()
+	if err != nil {
+		return absPath, err
+	}
+	rootAbs, err := filepath.Abs(filepath.Join(cwd, chatUploadsDirName))
+	if err != nil {
+		return absPath, err
+	}
+	rel, err := filepath.Rel(rootAbs, absPath)
+	if err != nil {
+		return absPath, nil
+	}
+	rel = filepath.ToSlash(filepath.Clean(rel))
+	var segs []string
+	for _, p := range strings.Split(rel, "/") {
+		if p != "" && p != "." {
+			segs = append(segs, p)
+		}
+	}
+	// 仅处理扁平结构：日期/_manual|_new/文件名
+	if len(segs) != 3 {
+		return absPath, nil
+	}
+	datePart, placeFolder, baseName := segs[0], segs[1], segs[2]
+	if placeFolder != "_manual" && placeFolder != "_new" {
+		return absPath, nil
+	}
+	targetDir := filepath.Join(rootAbs, datePart, convSan)
+	if err := os.MkdirAll(targetDir, 0755); err != nil {
+		return "", fmt.Errorf("创建会话附件目录失败: %w", err)
+	}
+	dest := filepath.Join(targetDir, baseName)
+	dest = avoidChatUploadDestCollision(dest)
+	if err := os.Rename(absPath, dest); err != nil {
+		return "", fmt.Errorf("将附件移入会话目录失败: %w", err)
+	}
+	out, _ := filepath.Abs(dest)
+	if logger != nil {
+		logger.Info("对话附件已从占位目录移入会话目录",
+			zap.String("from", absPath),
+			zap.String("to", out),
+			zap.String("conversationId", conv))
+	}
+	return out, nil
+}
+
+// saveAttachmentsToDateAndConversationDir 处理附件：若带 serverPath 则仅校验已存在文件；否则将 content 写入 chat_uploads/YYYY-MM-DD/{conversationID}/。
 // conversationID 为空时使用 "_new" 作为目录名（新对话尚未有 ID）
 func saveAttachmentsToDateAndConversationDir(attachments []ChatAttachment, conversationID string, logger *zap.Logger) (savedPaths []string, err error) {
 	if len(attachments) == 0 {
@@ -163,6 +273,24 @@ func saveAttachmentsToDateAndConversationDir(attachments []ChatAttachment, conve
 	}
 	savedPaths = make([]string, 0, len(attachments))
 	for i, a := range attachments {
+		if sp := strings.TrimSpace(a.ServerPath); sp != "" {
+			valid, verr := validateChatAttachmentServerPath(sp)
+			if verr != nil {
+				return nil, fmt.Errorf("附件 %s: %w", a.FileName, verr)
+			}
+			finalPath, rerr := relocateManualOrNewUploadToConversation(valid, conversationID, logger)
+			if rerr != nil {
+				return nil, fmt.Errorf("附件 %s: %w", a.FileName, rerr)
+			}
+			savedPaths = append(savedPaths, finalPath)
+			if logger != nil {
+				logger.Debug("对话附件使用已上传路径", zap.Int("index", i+1), zap.String("fileName", a.FileName), zap.String("path", finalPath))
+			}
+			continue
+		}
+		if strings.TrimSpace(a.Content) == "" {
+			return nil, fmt.Errorf("附件 %s 缺少内容或未提供 serverPath", a.FileName)
+		}
 		raw, decErr := attachmentContentToBytes(a)
 		if decErr != nil {
 			return nil, fmt.Errorf("附件 %s 解码失败: %w", a.FileName, decErr)
@@ -776,6 +904,8 @@ func (h *AgentHandler) AgentLoopStream(c *gin.Context) {
 	// 发送初始事件
 	// 用于跟踪客户端是否已断开连接
 	clientDisconnected := false
+	// 与 sseKeepalive 共用：禁止并发写 ResponseWriter，否则会破坏 chunked 编码（ERR_INVALID_CHUNKED_ENCODING）。
+	var sseWriteMu sync.Mutex
 	// 用于快速确认模型是否真的产生了流式 delta
 	var responseDeltaCount int
 	var responseStartLogged bool
@@ -843,19 +973,20 @@ func (h *AgentHandler) AgentLoopStream(c *gin.Context) {
 		}
 		eventJSON, _ := json.Marshal(event)
 
-		// 尝试写入事件，如果失败则标记客户端断开
-		if _, err := fmt.Fprintf(c.Writer, "data: %s\n\n", eventJSON); err != nil {
+		sseWriteMu.Lock()
+		_, err := fmt.Fprintf(c.Writer, "data: %s\n\n", eventJSON)
+		if err != nil {
+			sseWriteMu.Unlock()
 			clientDisconnected = true
 			h.logger.Debug("客户端断开连接，停止发送SSE事件", zap.Error(err))
 			return
 		}
-
-		// 刷新响应，如果失败则标记客户端断开
 		if flusher, ok := c.Writer.(http.Flusher); ok {
 			flusher.Flush()
 		} else {
 			c.Writer.Flush()
 		}
+		sseWriteMu.Unlock()
 	}
 
 	// 如果没有对话ID，创建新对话（WebShell 助手模式下关联连接 ID 以便持久化展示）
@@ -1066,7 +1197,7 @@ func (h *AgentHandler) AgentLoopStream(c *gin.Context) {
 	sendEvent("progress", "正在分析您的请求...", nil)
 	// 注意：roleSkills 已在上方根据 req.Role 或 WebShell 模式设置
 	stopKeepalive := make(chan struct{})
-	go sseKeepalive(c, stopKeepalive)
+	go sseKeepalive(c, stopKeepalive, &sseWriteMu)
 	defer close(stopKeepalive)
 
 	result, err := h.agent.AgentLoopWithProgress(taskCtx, finalMessage, agentHistoryMessages, conversationID, progressCallback, roleTools, roleSkills)

internal/handler/chat_uploads.go

@@ -86,8 +86,10 @@ func (h *ChatUploadsHandler) List(c *gin.Context) {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
-	if _, err := os.Stat(root); os.IsNotExist(err) {
-		c.JSON(http.StatusOK, gin.H{"files": []ChatUploadFileItem{}})
+	// 保证根目录存在，否则「按文件夹」浏览时无法 mkdir，且首次列表为空时界面无路径工具栏
+	if err := os.MkdirAll(root, 0755); err != nil {
+		h.logger.Warn("创建 chat_uploads 根目录失败", zap.Error(err))
+		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 		return
 	}
 	var files []ChatUploadFileItem

internal/handler/multi_agent.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"net/http"
 	"strings"
+	"sync"
 	"time"
 
 	"cyberstrike-ai/internal/multiagent"
@@ -49,6 +50,8 @@ func (h *AgentHandler) MultiAgentLoopStream(c *gin.Context) {
 	var baseCtx context.Context
 
 	clientDisconnected := false
+	// 与 sseKeepalive 共用：禁止并发写 ResponseWriter，否则会破坏 chunked 编码（ERR_INVALID_CHUNKED_ENCODING）。
+	var sseWriteMu sync.Mutex
 	sendEvent := func(eventType, message string, data interface{}) {
 		if clientDisconnected {
 			return
@@ -66,7 +69,10 @@ func (h *AgentHandler) MultiAgentLoopStream(c *gin.Context) {
 		}
 		ev := StreamEvent{Type: eventType, Message: message, Data: data}
 		b, _ := json.Marshal(ev)
-		if _, err := fmt.Fprintf(c.Writer, "data: %s\n\n", b); err != nil {
+		sseWriteMu.Lock()
+		_, err := fmt.Fprintf(c.Writer, "data: %s\n\n", b)
+		if err != nil {
+			sseWriteMu.Unlock()
 			clientDisconnected = true
 			return
 		}
@@ -75,6 +81,7 @@ func (h *AgentHandler) MultiAgentLoopStream(c *gin.Context) {
 		} else {
 			c.Writer.Flush()
 		}
+		sseWriteMu.Unlock()
 	}
 
 	h.logger.Info("收到 Eino DeepAgent 流式请求",
@@ -130,7 +137,7 @@ func (h *AgentHandler) MultiAgentLoopStream(c *gin.Context) {
 	})
 
 	stopKeepalive := make(chan struct{})
-	go sseKeepalive(c, stopKeepalive)
+	go sseKeepalive(c, stopKeepalive, &sseWriteMu)
 	defer close(stopKeepalive)
 
 	result, runErr := multiagent.RunDeepAgent(

internal/handler/sse_keepalive.go

@@ -3,15 +3,27 @@ package handler
 import (
 	"fmt"
 	"net/http"
+	"sync"
 	"time"
 
 	"github.com/gin-gonic/gin"
 )
 
-// sseKeepalive sends periodic SSE comment lines so proxies (e.g. nginx proxy_read_timeout)
-// and idle TCP paths do not close long-running streams when no data events are emitted for a while.
-func sseKeepalive(c *gin.Context, stop <-chan struct{}) {
-	ticker := time.NewTicker(20 * time.Second)
+// sseInterval is how often we write on long SSE streams. Shorter intervals help NATs and
+// some proxies that treat connections as idle; 10s is a reasonable balance with traffic.
+const sseKeepaliveInterval = 10 * time.Second
+
+// sseKeepalive sends periodic SSE traffic so proxies (e.g. nginx proxy_read_timeout), NATs,
+// and load balancers do not close long-running streams. Some intermediaries ignore comment-only
+// lines, so we send both a comment and a minimal data frame (type heartbeat) per tick.
+//
+// writeMu must be the same mutex used by sendEvent for this request: concurrent writes to
+// http.ResponseWriter break chunked transfer encoding (browser: net::ERR_INVALID_CHUNKED_ENCODING).
+func sseKeepalive(c *gin.Context, stop <-chan struct{}, writeMu *sync.Mutex) {
+	if writeMu == nil {
+		return
+	}
+	ticker := time.NewTicker(sseKeepaliveInterval)
 	defer ticker.Stop()
 	for {
 		select {
@@ -27,12 +39,20 @@ func sseKeepalive(c *gin.Context, stop <-chan struct{}) {
 				return
 			default:
 			}
+			writeMu.Lock()
 			if _, err := fmt.Fprintf(c.Writer, ": keepalive\n\n"); err != nil {
+				writeMu.Unlock()
+				return
+			}
+			// data: frame so strict proxies still see downstream bytes (comments alone may not reset timers)
+			if _, err := fmt.Fprintf(c.Writer, `data: {"type":"heartbeat"}`+"\n\n"); err != nil {
+				writeMu.Unlock()
 				return
 			}
 			if flusher, ok := c.Writer.(http.Flusher); ok {
 				flusher.Flush()
 			}
+			writeMu.Unlock()
 		}
 	}
 }

web/static/css/style.css

@@ -1803,6 +1803,16 @@ header {
     color: var(--text-primary);
 }
 
+.chat-file-chip--uploading {
+    opacity: 0.92;
+    border-style: dashed;
+}
+
+.chat-file-chip--error {
+    border-color: rgba(220, 38, 38, 0.45);
+    background: rgba(220, 38, 38, 0.06);
+}
+
 .chat-file-input-hidden {
     position: absolute;
     width: 0;
@@ -14622,3 +14632,47 @@ button.chat-files-dropdown-item:hover:not(:disabled) {
     transform: translateX(-50%) translateY(0);
 }
 
+/* 对话附件读取 / 文件管理上传 进度条 */
+/* [hidden] 默认会被本类的 display:flex 覆盖，须显式隐藏否则空闲时仍露出灰条 */
+.chat-upload-progress-row[hidden] {
+    display: none !important;
+}
+
+.chat-upload-progress-row {
+    display: flex;
+    flex-direction: column;
+    gap: 6px;
+    margin: 8px 0 4px;
+    padding: 8px 10px;
+    border-radius: 8px;
+    background: var(--bg-secondary, rgba(0, 0, 0, 0.04));
+    border: 1px solid var(--border-color, rgba(0, 0, 0, 0.08));
+}
+
+.chat-upload-progress-row--files {
+    margin-top: 12px;
+    margin-bottom: 0;
+}
+
+.chat-upload-progress-track {
+    height: 6px;
+    border-radius: 4px;
+    background: var(--border-color, rgba(0, 0, 0, 0.1));
+    overflow: hidden;
+}
+
+.chat-upload-progress-fill {
+    height: 100%;
+    width: 0%;
+    border-radius: 4px;
+    background: var(--accent-primary, #2563eb);
+    transition: width 0.12s ease-out;
+}
+
+.chat-upload-progress-label {
+    font-size: 0.8rem;
+    color: var(--text-secondary, #666);
+    line-height: 1.35;
+    word-break: break-all;
+}
+

web/static/i18n/en-US.json

@@ -123,6 +123,13 @@
     "inputPlaceholder": "Enter target or command... (type @ to select tools | Shift+Enter newline, Enter send)",
     "selectFile": "Select file",
     "uploadFile": "Upload file (multi-select or drag & drop)",
+    "readingAttachmentsDetail": "Reading attachment {{current}}/{{total}} · {{name}} · {{percent}}%",
+    "uploadingAttachmentsDetail": "Uploading attachments · {{done}}/{{total}} done · {{percent}}% overall",
+    "waitingAttachmentsUpload": "Waiting for attachments to finish uploading…",
+    "attachmentsUploadIncomplete": "Some attachments failed to upload. Remove the failed items or pick files again before sending.",
+    "attachmentUploading": "Uploading…",
+    "attachmentUploadFailed": "Failed",
+    "attachmentUploadAlert": "Upload failed: {{name}}",
     "send": "Send",
     "searchInGroup": "Search in group...",
     "loadingTools": "Loading tools...",
@@ -1124,6 +1131,7 @@
     "copyPathTitle": "Copy the absolute path on the server; paste into chat to reference this file",
     "pathCopied": "Path copied — paste it into chat",
     "uploadOkHint": "Uploaded. Use “Copy path” to copy the absolute path.",
+    "uploadingFile": "Uploading {{name}} · {{percent}}%",
     "moreActions": "More: open chat, edit, rename, delete",
     "download": "Download",
     "edit": "Edit",

web/static/i18n/zh-CN.json

@@ -123,6 +123,13 @@
     "inputPlaceholder": "输入测试目标或命令... (输入 @ 选择工具 | Shift+Enter 换行，Enter 发送)",
     "selectFile": "选择文件",
     "uploadFile": "上传文件（可多选或拖拽到此处）",
+    "readingAttachmentsDetail": "读取附件 {{current}}/{{total}} · {{name}} · {{percent}}%",
+    "uploadingAttachmentsDetail": "上传附件 · {{done}}/{{total}} 已完成 · 总进度 {{percent}}%",
+    "waitingAttachmentsUpload": "正在等待附件上传完成…",
+    "attachmentsUploadIncomplete": "部分附件未上传成功，请移除失败项或重新选择文件后再发送。",
+    "attachmentUploading": "上传中…",
+    "attachmentUploadFailed": "失败",
+    "attachmentUploadAlert": "上传失败：{{name}}",
     "send": "发送",
     "searchInGroup": "搜索分组中的对话...",
     "loadingTools": "正在加载工具...",
@@ -1124,6 +1131,7 @@
     "copyPathTitle": "复制服务器上的绝对路径，可粘贴到对话中让模型引用该文件",
     "pathCopied": "路径已复制，可到对话中粘贴使用",
     "uploadOkHint": "上传成功。点击「复制路径」可复制绝对路径到剪贴板。",
+    "uploadingFile": "正在上传 {{name}} · {{percent}}%",
     "moreActions": "更多：打开对话、编辑、重命名、删除",
     "download": "下载",
     "edit": "编辑",

web/static/js/auth.js

@@ -163,6 +163,54 @@ async function apiFetch(url, options = {}) {
     return response;
 }
 
+/**
+ * multipart POST with XMLHttpRequest so upload progress is available (fetch 无法可靠上报进度).
+ * 返回与 fetch 类似的对象：ok、status、json()、text()
+ */
+async function apiUploadWithProgress(url, formData, options = {}) {
+    await ensureAuthenticated();
+    const onProgress = typeof options.onProgress === 'function' ? options.onProgress : null;
+    return new Promise((resolve, reject) => {
+        const xhr = new XMLHttpRequest();
+        xhr.open('POST', url);
+        if (authToken) {
+            xhr.setRequestHeader('Authorization', `Bearer ${authToken}`);
+        }
+        xhr.upload.onprogress = (e) => {
+            if (!onProgress || !e.lengthComputable) return;
+            const percent = e.total > 0 ? Math.round((e.loaded / e.total) * 100) : 0;
+            onProgress({ loaded: e.loaded, total: e.total, percent });
+        };
+        xhr.onerror = () => {
+            reject(new Error('Network error'));
+        };
+        xhr.onload = () => {
+            if (xhr.status === 401) {
+                handleUnauthorized();
+                const msg = (typeof window !== 'undefined' && typeof window.t === 'function')
+                    ? window.t('auth.unauthorized')
+                    : '未授权访问';
+                reject(new Error(msg));
+                return;
+            }
+            const responseText = xhr.responseText || '';
+            resolve({
+                ok: xhr.status >= 200 && xhr.status < 300,
+                status: xhr.status,
+                text: async () => responseText,
+                json: async () => {
+                    try {
+                        return responseText ? JSON.parse(responseText) : {};
+                    } catch (err) {
+                        throw err;
+                    }
+                },
+            });
+        };
+        xhr.send(formData);
+    });
+}
+
 async function submitLogin(event) {
     event.preventDefault();
     const passwordInput = document.getElementById('login-password');

web/static/js/chat-files.js

@@ -12,6 +12,8 @@ const CHAT_FILES_BROWSE_PATH_KEY = 'csai_chat_files_browse_path';
 let chatFilesBrowsePath = [];
 /** 非空时，下一次上传文件落到此相对路径（chat_uploads 下目录），如 2026-03-21/uuid/sub */
 let chatFilesPendingUploadDir = '';
+/** 文件管理页面向服务器上传进行中，避免重复选择并禁用顶栏按钮 */
+let chatFilesXHRUploadBusy = false;
 
 /** 仅前端记录的「空目录」键 parentPath（'' 表示 chat_uploads 根）-> 子目录名列表，与树合并以便 mkdir 后可见 */
 const CHAT_FILES_SYNTHETIC_DIRS_KEY = 'csai_chat_files_synthetic_dirs';
@@ -301,7 +303,7 @@ function chatFilesNameFilter(files) {
 
 /** 仅前端按文件名筛选，不重新请求 */
 function chatFilesFilterNameOnInput() {
-    if (!chatFilesCache.length) return;
+    if (!chatFilesCache.length && chatFilesGetGroupByMode() !== 'folder') return;
     renderChatFilesTable();
 }
 
@@ -554,8 +556,10 @@ function renderChatFilesTable() {
     if (!wrap) return;
 
     chatFilesDisplayed = chatFilesNameFilter(chatFilesCache);
+    const groupMode = chatFilesGetGroupByMode();
     const emptyMsg = (typeof window.t === 'function') ? window.t('chatFilesPage.empty') : '暂无文件';
-    if (!chatFilesDisplayed.length) {
+    // 「按文件夹」模式下即使尚无文件，也要显示 chat_uploads 路径栏与「新建文件夹」，否则无法先建目录
+    if (!chatFilesDisplayed.length && groupMode !== 'folder') {
         wrap.classList.remove('chat-files-table-wrap--grouped');
         wrap.classList.remove('chat-files-table-wrap--tree');
         wrap.innerHTML = '<div class="empty-state" data-i18n="chatFilesPage.empty">' + escapeHtml(emptyMsg) + '</div>';
@@ -665,7 +669,6 @@ function renderChatFilesTable() {
         <th>${escapeHtml(thActions)}</th>
     </tr></thead>`;
 
-    const groupMode = chatFilesGetGroupByMode();
     let innerHtml;
 
     if (groupMode === 'folder') {
@@ -1197,7 +1200,36 @@ async function submitChatFilesMkdir() {
     }
 }
 
+function chatFilesSetUploadProgressUI(visible, percent, fileName) {
+    const wrap = document.getElementById('chat-files-upload-progress');
+    const fill = document.getElementById('chat-files-upload-progress-fill');
+    const label = document.getElementById('chat-files-upload-progress-label');
+    if (!wrap || !fill || !label) return;
+    if (!visible) {
+        wrap.hidden = true;
+        fill.style.width = '0%';
+        label.textContent = '';
+        return;
+    }
+    wrap.hidden = false;
+    const p = Math.min(100, Math.max(0, Math.round(percent)));
+    fill.style.width = p + '%';
+    const name = fileName || '';
+    label.textContent = (typeof window.t === 'function')
+        ? window.t('chatFilesPage.uploadingFile', { name: name, percent: p })
+        : ('正在上传 ' + name + ' · ' + p + '%');
+}
+
+function chatFilesSetUploadBusy(busy) {
+    chatFilesXHRUploadBusy = !!busy;
+    ['chat-files-header-upload-btn', 'chat-files-refresh-btn'].forEach(function (id) {
+        const el = document.getElementById(id);
+        if (el) el.disabled = chatFilesXHRUploadBusy;
+    });
+}
+
 function chatFilesOpenUploadPicker() {
+    if (chatFilesXHRUploadBusy) return;
     if (chatFilesGetGroupByMode() === 'folder') {
         chatFilesPendingUploadDir = chatFilesBrowsePath.join('/');
     } else {
@@ -1209,6 +1241,7 @@ function chatFilesOpenUploadPicker() {
 
 function chatFilesUploadToFolderClick(ev, btn) {
     if (ev) ev.stopPropagation();
+    if (chatFilesXHRUploadBusy) return;
     const raw = btn.getAttribute('data-upload-dir');
     if (!raw) return;
     try {
@@ -1237,12 +1270,22 @@ async function onChatFilesUploadPick(ev) {
             form.append('conversationId', conv.value.trim());
         }
     }
+    chatFilesSetUploadBusy(true);
+    chatFilesSetUploadProgressUI(true, 0, file.name);
     try {
-        const res = await apiFetch('/api/chat-uploads', { method: 'POST', body: form });
+        const doXhr = typeof apiUploadWithProgress === 'function';
+        const res = doXhr
+            ? await apiUploadWithProgress('/api/chat-uploads', form, {
+                onProgress: function (p) {
+                    chatFilesSetUploadProgressUI(true, p.percent, file.name);
+                }
+            })
+            : await apiFetch('/api/chat-uploads', { method: 'POST', body: form });
         if (!res.ok) {
             throw new Error(await res.text());
         }
         const data = await res.json().catch(() => ({}));
+        chatFilesSetUploadProgressUI(true, 100, file.name);
         loadChatFilesPage();
         if (data && data.ok) {
             const msg = (typeof window.t === 'function')
@@ -1253,6 +1296,8 @@ async function onChatFilesUploadPick(ev) {
     } catch (e) {
         alert((e && e.message) ? e.message : String(e));
     } finally {
+        chatFilesSetUploadBusy(false);
+        chatFilesSetUploadProgressUI(false);
         input.value = '';
     }
 }

web/static/js/chat.js

@@ -25,8 +25,12 @@ const DRAFT_SAVE_DELAY = 500; // 500ms防抖延迟
 // 对话文件上传相关（后端会拼接路径与内容发给大模型，前端不再重复发文件列表）
 const MAX_CHAT_FILES = 10;
 const CHAT_FILE_DEFAULT_PROMPT = '请根据上传的文件内容进行分析。';
-/** @type {{ fileName: string, content: string, mimeType: string }[]} */
+/**
+ * 对话附件：选文件后异步 POST /api/chat-uploads，发送时只传 serverPath（绝对路径），请求体不再内联大文件内容。
+ * @type {{ id: number, fileName: string, mimeType: string, serverPath: string|null, uploading: boolean, uploadPercent: number, uploadPromise: Promise<void>|null, uploadError: string|null }[]}
+ */
 let chatAttachments = [];
+let chatAttachmentSeq = 0;
 
 // 多代理（Eino）：需后端 multi_agent.enabled，与单代理 /agent-loop 并存
 const AGENT_MODE_STORAGE_KEY = 'cyberstrike-chat-agent-mode';
@@ -236,6 +240,30 @@ async function sendMessage() {
     if (!message && !hasAttachments) {
         return;
     }
+
+    if (hasAttachments) {
+        const needWait = chatAttachments.some((a) => a.uploading);
+        if (needWait) {
+            const waitLabel = (typeof window.t === 'function')
+                ? window.t('chat.waitingAttachmentsUpload')
+                : '正在等待附件上传完成…';
+            chatAttachmentProgressSet(true, 0, waitLabel);
+        }
+        try {
+            await Promise.all(chatAttachments.map((a) => (a.uploadPromise ? a.uploadPromise : Promise.resolve())));
+        } finally {
+            refreshChatAttachmentUploadProgress();
+        }
+        const bad = chatAttachments.filter((a) => !a.serverPath);
+        if (bad.length) {
+            const hint = (typeof window.t === 'function')
+                ? window.t('chat.attachmentsUploadIncomplete')
+                : '部分附件未上传成功，请移除失败项或重新选择文件后再发送。';
+            alert(hint);
+            return;
+        }
+    }
+
     // 有附件且用户未输入时，发一句简短默认提示即可（后端会拼接路径和文件内容给大模型）
     if (hasAttachments && !message) {
         message = CHAT_FILE_DEFAULT_PROMPT;
@@ -274,10 +302,10 @@ async function sendMessage() {
         role: typeof getCurrentRole === 'function' ? getCurrentRole() : ''
     };
     if (hasAttachments) {
-        body.attachments = chatAttachments.map(a => ({
+        body.attachments = chatAttachments.map((a) => ({
             fileName: a.fileName,
-            content: a.content,
-            mimeType: a.mimeType || ''
+            mimeType: a.mimeType || '',
+            serverPath: a.serverPath
         }));
     }
     // 发送后清空附件列表
@@ -386,11 +414,19 @@ function renderChatFileChips() {
     chatAttachments.forEach((a, i) => {
         const chip = document.createElement('div');
         chip.className = 'chat-file-chip';
+        if (a.uploading) chip.classList.add('chat-file-chip--uploading');
+        if (a.uploadError) chip.classList.add('chat-file-chip--error');
         chip.setAttribute('role', 'listitem');
         const name = document.createElement('span');
         name.className = 'chat-file-chip-name';
         name.title = a.fileName;
-        name.textContent = a.fileName;
+        let label = a.fileName;
+        if (a.uploading) {
+            label += ' · ' + ((typeof window.t === 'function') ? window.t('chat.attachmentUploading') : '上传中…');
+        } else if (a.uploadError) {
+            label += ' · ' + ((typeof window.t === 'function') ? window.t('chat.attachmentUploadFailed') : '失败');
+        }
+        name.textContent = label;
         const remove = document.createElement('button');
         remove.type = 'button';
         remove.className = 'chat-file-chip-remove';
@@ -407,6 +443,7 @@ function renderChatFileChips() {
 function removeChatAttachment(index) {
     chatAttachments.splice(index, 1);
     renderChatFileChips();
+    refreshChatAttachmentUploadProgress();
 }
 
 // 有附件且输入框为空时，填入一句默认提示（可编辑）；后端会单独拼接路径与内容给大模型
@@ -419,46 +456,122 @@ function appendChatFilePrompt() {
     }
 }
 
-function readFileAsAttachment(file) {
-    return new Promise((resolve, reject) => {
-        const mimeType = file.type || '';
-        const isTextLike = /^text\//i.test(mimeType) || /^(application\/(json|xml|javascript)|image\/svg\+xml)/i.test(mimeType);
-        const reader = new FileReader();
-        reader.onload = () => {
-            let content = reader.result;
-            if (typeof content === 'string' && content.startsWith('data:')) {
-                content = content.replace(/^data:[^;]+;base64,/, '');
-            }
-            resolve({ fileName: file.name, content: content, mimeType: mimeType });
-        };
-        reader.onerror = () => reject(reader.error);
-        if (isTextLike) {
-            reader.readAsText(file, 'UTF-8');
-        } else {
-            reader.readAsDataURL(file);
-        }
-    });
+function chatAttachmentProgressSet(visible, percent, detailText) {
+    const wrap = document.getElementById('chat-attachment-progress');
+    const fill = document.getElementById('chat-attachment-progress-fill');
+    const label = document.getElementById('chat-attachment-progress-label');
+    if (!wrap || !fill || !label) return;
+    if (!visible) {
+        wrap.hidden = true;
+        fill.style.width = '0%';
+        label.textContent = '';
+        return;
+    }
+    wrap.hidden = false;
+    const p = Math.min(100, Math.max(0, Math.round(percent)));
+    fill.style.width = p + '%';
+    label.textContent = detailText || '';
 }
 
-function addFilesToChat(files) {
+function refreshChatAttachmentUploadProgress() {
+    if (!chatAttachments.length) {
+        chatAttachmentProgressSet(false);
+        return;
+    }
+    const uploading = chatAttachments.filter((a) => a.uploading);
+    if (!uploading.length) {
+        chatAttachmentProgressSet(false);
+        return;
+    }
+    let sum = 0;
+    chatAttachments.forEach((a) => {
+        sum += a.uploading ? (a.uploadPercent || 0) : 100;
+    });
+    const overall = Math.round(sum / chatAttachments.length);
+    const line = (typeof window.t === 'function')
+        ? window.t('chat.uploadingAttachmentsDetail', {
+            done: chatAttachments.length - uploading.length,
+            total: chatAttachments.length,
+            percent: overall
+        })
+        : ('上传附件 ' + (chatAttachments.length - uploading.length) + '/' + chatAttachments.length + ' · ' + overall + '%');
+    chatAttachmentProgressSet(true, overall, line);
+}
+
+async function uploadOneChatAttachment(entry, file) {
+    const form = new FormData();
+    form.append('file', file);
+    const conv = currentConversationId;
+    if (conv && String(conv).trim()) {
+        form.append('conversationId', String(conv).trim());
+    }
+    const entryId = entry.id;
+    try {
+        const res = typeof apiUploadWithProgress === 'function'
+            ? await apiUploadWithProgress('/api/chat-uploads', form, {
+                onProgress: function (p) {
+                    const cur = chatAttachments.find((x) => x.id === entryId);
+                    if (cur) {
+                        cur.uploadPercent = p.percent;
+                        refreshChatAttachmentUploadProgress();
+                    }
+                }
+            })
+            : await apiFetch('/api/chat-uploads', { method: 'POST', body: form });
+        if (!res.ok) {
+            throw new Error(await res.text());
+        }
+        const data = await res.json().catch(() => ({}));
+        const abs = data.absolutePath ? String(data.absolutePath).trim() : '';
+        if (!abs) {
+            throw new Error('no absolutePath in response');
+        }
+        const cur = chatAttachments.find((x) => x.id === entryId);
+        if (cur) {
+            cur.serverPath = abs;
+            cur.uploading = false;
+            cur.uploadPercent = 100;
+            cur.uploadError = null;
+        }
+    } catch (e) {
+        const msg = (e && e.message) ? e.message : String(e);
+        const cur = chatAttachments.find((x) => x.id === entryId);
+        if (cur) {
+            cur.uploading = false;
+            cur.uploadError = msg;
+            cur.serverPath = null;
+        }
+        alert(((typeof window.t === 'function') ? window.t('chat.attachmentUploadAlert', { name: file.name }) : ('上传失败：' + file.name)) + '\n' + msg);
+    }
+    renderChatFileChips();
+    refreshChatAttachmentUploadProgress();
+}
+
+async function addFilesToChat(files) {
     if (!files || !files.length) return;
     const next = Array.from(files);
     if (chatAttachments.length + next.length > MAX_CHAT_FILES) {
         alert('最多同时上传 ' + MAX_CHAT_FILES + ' 个文件，当前已选 ' + chatAttachments.length + ' 个。');
         return;
     }
-    const addOne = (file) => {
-        return readFileAsAttachment(file).then((a) => {
-            chatAttachments.push(a);
-            renderChatFileChips();
-            appendChatFilePrompt();
-        }).catch(() => {
-            alert('读取文件失败：' + file.name);
-        });
-    };
-    let p = Promise.resolve();
-    next.forEach((file) => { p = p.then(() => addOne(file)); });
-    p.then(() => {});
+    next.forEach((file) => {
+        const id = ++chatAttachmentSeq;
+        const entry = {
+            id: id,
+            fileName: file.name,
+            mimeType: file.type || '',
+            serverPath: null,
+            uploading: true,
+            uploadPercent: 0,
+            uploadPromise: null,
+            uploadError: null
+        };
+        entry.uploadPromise = uploadOneChatAttachment(entry, file);
+        chatAttachments.push(entry);
+    });
+    renderChatFileChips();
+    refreshChatAttachmentUploadProgress();
+    appendChatFilePrompt();
 }
 
 function setupChatFileUpload() {
@@ -469,7 +582,7 @@ function setupChatFileUpload() {
     inputEl.addEventListener('change', function () {
         const files = this.files;
         if (files && files.length) {
-            addFilesToChat(files);
+            addFilesToChat(files).catch(function () { /* addFilesToChat 已提示 */ });
         }
         this.value = '';
     });
@@ -491,7 +604,7 @@ function setupChatFileUpload() {
         e.stopPropagation();
         this.classList.remove('drag-over');
         const files = e.dataTransfer && e.dataTransfer.files;
-        if (files && files.length) addFilesToChat(files);
+        if (files && files.length) addFilesToChat(files).catch(function () { /* addFilesToChat 已提示 */ });
     });
 }
 

web/static/js/monitor.js

@@ -691,6 +691,9 @@ function handleStreamEvent(event, progressElement, progressId,
     };
     
     switch (event.type) {
+        case 'heartbeat':
+            // SSE 长连接保活，无需更新 UI
+            break;
         case 'conversation':
             if (event.data && event.data.conversationId) {
                 // 在更新之前，先获取任务对应的原始对话ID

web/templates/index.html

@@ -626,6 +626,10 @@
                                 </div>
                                 <div class="chat-input-with-files">
                                     <div id="chat-file-list" class="chat-file-list" aria-label="已选文件列表"></div>
+                                    <div id="chat-attachment-progress" class="chat-upload-progress-row" hidden role="status" aria-live="polite">
+                                        <div class="chat-upload-progress-track" aria-hidden="true"><div class="chat-upload-progress-fill" id="chat-attachment-progress-fill"></div></div>
+                                        <span class="chat-upload-progress-label" id="chat-attachment-progress-label"></span>
+                                    </div>
                                     <div class="chat-input-field">
                                         <textarea id="chat-input" data-i18n="chat.inputPlaceholder" data-i18n-attr="placeholder" data-i18n-skip-text="true" placeholder="输入测试目标或命令... (输入 @ 选择工具 | Shift+Enter 换行，Enter 发送)" rows="1"></textarea>
                                         <div id="mention-suggestions" class="mention-suggestions" role="listbox" aria-label="工具提及候选"></div>
@@ -637,7 +641,7 @@
                                         <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4M17 8l-5-5-5 5M12 3v12" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
                                     </svg>
                                 </button>
-                                <button class="send-btn" onclick="sendMessage()">
+                                <button type="button" class="send-btn" id="chat-send-btn" onclick="sendMessage()">
                                     <span data-i18n="chat.send">发送</span>
                                     <svg width="14" height="14" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
                                         <path d="M5 12h14M12 5l7 7-7 7" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
@@ -1074,9 +1078,9 @@
                     <div class="page-header">
                         <h2 data-i18n="chatFilesPage.title">文件管理</h2>
                         <div class="page-header-actions">
-                            <button type="button" class="btn-primary" onclick="chatFilesOpenUploadPicker()" data-i18n="chatFilesPage.upload">上传文件</button>
+                            <button type="button" class="btn-primary" id="chat-files-header-upload-btn" onclick="chatFilesOpenUploadPicker()" data-i18n="chatFilesPage.upload">上传文件</button>
                             <input type="file" id="chat-files-upload-input" style="display:none" onchange="onChatFilesUploadPick(event)" />
-                            <button class="btn-secondary" onclick="loadChatFilesPage()" data-i18n="common.refresh">刷新</button>
+                            <button type="button" class="btn-secondary" id="chat-files-refresh-btn" onclick="loadChatFilesPage()" data-i18n="common.refresh">刷新</button>
                         </div>
                     </div>
                     <div class="page-content">
@@ -1101,6 +1105,10 @@
                             </label>
                             <button class="btn-secondary" type="button" onclick="loadChatFilesPage()" data-i18n="common.search">搜索</button>
                         </div>
+                        <div id="chat-files-upload-progress" class="chat-upload-progress-row chat-upload-progress-row--files" hidden role="status" aria-live="polite">
+                            <div class="chat-upload-progress-track" aria-hidden="true"><div class="chat-upload-progress-fill" id="chat-files-upload-progress-fill"></div></div>
+                            <span class="chat-upload-progress-label" id="chat-files-upload-progress-label"></span>
+                        </div>
                         <div id="chat-files-list-wrap" class="chat-files-table-wrap">
                             <div class="loading-spinner" data-i18n="common.loading">加载中…</div>
                         </div>