diff --git a/frontend/src/views/chat/index.vue b/frontend/src/views/chat/index.vue
index fcc5d64e..c0d7b84d 100644
--- a/frontend/src/views/chat/index.vue
+++ b/frontend/src/views/chat/index.vue
@@ -45,12 +45,12 @@
-
+
@@ -159,6 +159,8 @@ const isNeedTitle = ref(false);
const isFirstEnter = ref(true);
const loading = ref(false);
const historyLoading = ref(true);
+const historyLoadingMore = ref(false);
+const hasMoreHistory = ref(true);
let fullContent = ref('')
let userquery = ref('')
const scrollContainer = ref(null)
@@ -270,6 +272,9 @@ watch([() => route.params], (newvalue) => {
// 切换会话时,重置状态
historyLoading.value = true;
+ historyLoadingMore.value = false;
+ hasMoreHistory.value = true;
+ created_at.value = '';
loading.value = false;
isReplying.value = false;
currentAssistantMessageId.value = '';
@@ -309,10 +314,11 @@ const debounce = (fn, delay) => {
}
}
const onChatScrollTop = () => {
- if (scrollLock.value) return;
+ if (scrollLock.value || historyLoadingMore.value || !hasMoreHistory.value) return;
+ if (!scrollContainer.value) return;
const { scrollTop, scrollHeight } = scrollContainer.value;
isFirstEnter.value = false
- if (scrollTop == 0) {
+ if (scrollTop <= 0) {
let data = {
session_id: session_id.value,
created_at: created_at.value,
@@ -328,13 +334,36 @@ const handleScroll = () => {
};
const getmsgList = (data, isScrollType = false, scrollHeight) => {
+ if (isScrollType) {
+ if (historyLoadingMore.value || !hasMoreHistory.value) return;
+ historyLoadingMore.value = true;
+ }
getMessageList(data).then(res => {
- if (res && res.data?.length) {
- created_at.value = res.data[0].created_at;
- handleMsgList(res.data, isScrollType, scrollHeight);
+ const batch = res?.data;
+ if (!batch?.length) {
+ if (isScrollType) {
+ hasMoreHistory.value = false;
+ }
+ return;
+ }
+ const nextCursor = batch[0].created_at;
+ if (isScrollType && created_at.value && nextCursor === created_at.value) {
+ hasMoreHistory.value = false;
+ return;
+ }
+ if (batch.length < limit.value) {
+ hasMoreHistory.value = false;
+ }
+ created_at.value = nextCursor;
+ handleMsgList(batch, isScrollType, scrollHeight);
+ }).catch((err) => {
+ console.error('Failed to load messages:', err);
+ if (isScrollType) {
+ hasMoreHistory.value = false;
}
}).finally(() => {
historyLoading.value = false;
+ historyLoadingMore.value = false;
})
}
@@ -430,9 +459,18 @@ const reconstructEventStreamFromSteps = (agentSteps, messageContent, isCompleted
return events;
};
const handleMsgList = async (data, isScrollType = false, newScrollHeight) => {
- let chatlist = data.reverse()
+ // API 返回 created_at 升序(同秒时 user 在 assistant 前),保持该顺序渲染。
+ const chatlist = [...data];
+ const existingIds = new Set(messagesList.map(m => m.id).filter(Boolean));
+ const processed = [];
for (let i = 0, len = chatlist.length; i < len; i++) {
let item = chatlist[i];
+ if (item.id && existingIds.has(item.id)) {
+ continue;
+ }
+ if (item.id) {
+ existingIds.add(item.id);
+ }
item.isAgentMode = false; // Agent 模式标记
item.agentEventStream = item.agentEventStream || [];
item._eventMap = new Map();
@@ -474,16 +512,27 @@ const handleMsgList = async (data, isScrollType = false, newScrollHeight) => {
// 非 Agent 模式下若 content 为空(例如用户停止时尚未产出任何文字),
// 保持为空;botmsg.vue 会因 hasActualContent=false 不渲染内容区和 toolbar。
// 此前这里会兜底为 "chat.cannotAnswer",会让停止场景显示误导性文案并出现复制按钮。
- messagesList.unshift(item);
- if (isFirstEnter.value) {
- scrollToBottom(true);
- } else if (isScrollType) {
- nextTick(() => {
- const { scrollHeight } = scrollContainer.value;
- scrollContainer.value.scrollTop = scrollHeight - newScrollHeight
- })
+ processed.push(item);
+ }
+ if (processed.length > 0) {
+ if (isScrollType) {
+ // 逆序逐个 unshift,才能保持 user → assistant 的对话顺序。
+ for (let i = processed.length - 1; i >= 0; i--) {
+ messagesList.unshift(processed[i]);
+ }
+ } else {
+ messagesList.push(...processed);
}
}
+ if (isFirstEnter.value) {
+ scrollToBottom(true);
+ } else if (isScrollType && scrollContainer.value && typeof newScrollHeight === 'number') {
+ nextTick(() => {
+ if (!scrollContainer.value) return;
+ const { scrollHeight } = scrollContainer.value;
+ scrollContainer.value.scrollTop = scrollHeight - newScrollHeight;
+ });
+ }
if (messagesList[messagesList.length - 1] && !messagesList[messagesList.length - 1].is_completed) {
isReplying.value = true;
// 保存正在 stream 的消息 ID,以便停止时使用
@@ -1232,6 +1281,8 @@ const handleSessionCleared = (e) => {
if (e.detail?.sessionId === session_id.value) {
messagesList.splice(0);
created_at.value = '';
+ hasMoreHistory.value = true;
+ historyLoadingMore.value = false;
}
};
@@ -1267,6 +1318,8 @@ onMounted(async () => {
usemenuStore.changeFirstQuery('', [], '', [], []);
} else {
scrollLock.value = false;
+ hasMoreHistory.value = true;
+ historyLoadingMore.value = false;
let data = {
session_id: session_id.value,
created_at: '',
diff --git a/internal/handler/message.go b/internal/handler/message.go
index ef2a5978..df444fc2 100644
--- a/internal/handler/message.go
+++ b/internal/handler/message.go
@@ -4,6 +4,7 @@ import (
stderrors "errors"
"net/http"
"strconv"
+ "strings"
"time"
"github.com/gin-gonic/gin"
@@ -97,15 +98,15 @@ func (h *MessageHandler) LoadMessages(c *gin.Context) {
return
}
- // If beforeTime is provided, parse the timestamp
- beforeTime, err := time.Parse(time.RFC3339Nano, beforeTimeStr)
+ // If beforeTime is provided, parse the timestamp (RFC3339Nano or RFC3339).
+ beforeTime, err := parseMessageBeforeTime(beforeTimeStr)
if err != nil {
logger.Errorf(
ctx,
- "Invalid time format, please use RFC3339Nano format, err: %v, beforeTimeStr: %s",
+ "Invalid time format, please use RFC3339/RFC3339Nano format, err: %v, beforeTimeStr: %s",
err, beforeTimeStr,
)
- c.Error(errors.NewBadRequestError("Invalid time format, please use RFC3339Nano format"))
+ c.Error(errors.NewBadRequestError("Invalid time format, please use RFC3339 or RFC3339Nano format"))
return
}
@@ -275,3 +276,22 @@ func (h *MessageHandler) GetChatHistoryKBStats(c *gin.Context) {
"data": stats,
})
}
+
+// parseMessageBeforeTime parses the `before_time` query used by LoadMessages.
+// Frontend cursors may be RFC3339 (no fractional seconds) or RFC3339Nano.
+func parseMessageBeforeTime(raw string) (time.Time, error) {
+ raw = strings.TrimSpace(raw)
+ if raw == "" {
+ return time.Time{}, stderrors.New("empty before_time")
+ }
+ layouts := []string{time.RFC3339Nano, time.RFC3339}
+ var lastErr error
+ for _, layout := range layouts {
+ if t, err := time.Parse(layout, raw); err == nil {
+ return t, nil
+ } else {
+ lastErr = err
+ }
+ }
+ return time.Time{}, lastErr
+}
diff --git a/internal/handler/message_session_not_found_test.go b/internal/handler/message_session_not_found_test.go
index a614ba05..513ad60a 100644
--- a/internal/handler/message_session_not_found_test.go
+++ b/internal/handler/message_session_not_found_test.go
@@ -97,6 +97,32 @@ func TestLoadMessagesBeforeTimeMapsErrSessionNotFoundToNotFound(t *testing.T) {
}
}
+// TestLoadMessagesAcceptsRFC3339BeforeTime ensures pagination cursors sent
+// without fractional seconds (e.g. 2026-05-20T09:43:37+08:00) are accepted.
+func TestLoadMessagesAcceptsRFC3339BeforeTime(t *testing.T) {
+ var capturedBefore time.Time
+ svc := &stubMessageService{
+ getBeforeTime: func(_ context.Context, _ string, beforeTime time.Time, _ int) ([]*types.Message, error) {
+ capturedBefore = beforeTime
+ return []*types.Message{}, nil
+ },
+ }
+ w := httptest.NewRecorder()
+ url := "/messages/sess1/load?limit=20&before_time=2026-05-20T09:43:37%2B08:00"
+ req := httptest.NewRequest(http.MethodGet, url, nil)
+ newMessageTestRouter(svc).ServeHTTP(w, req)
+ if w.Code != http.StatusOK {
+ t.Fatalf("RFC3339 before_time must be accepted, got %d body=%s", w.Code, w.Body.String())
+ }
+ expected, err := time.Parse(time.RFC3339, "2026-05-20T09:43:37+08:00")
+ if err != nil {
+ t.Fatal(err)
+ }
+ if !capturedBefore.Equal(expected) {
+ t.Fatalf("parsed before_time = %v, want %v", capturedBefore, expected)
+ }
+}
+
// TestDeleteMessageMapsErrSessionNotFoundToNotFound mirrors the
// LoadMessages test for the delete endpoint.
func TestDeleteMessageMapsErrSessionNotFoundToNotFound(t *testing.T) {