diff --git a/frontend/src/components/chat/MessageTimestamp.vue b/frontend/src/components/chat/MessageTimestamp.vue new file mode 100644 index 00000000..def6e69f --- /dev/null +++ b/frontend/src/components/chat/MessageTimestamp.vue @@ -0,0 +1,37 @@ + + + + + diff --git a/frontend/src/composables/useChatStreamHandler.ts b/frontend/src/composables/useChatStreamHandler.ts index b5aac187..ce677b62 100644 --- a/frontend/src/composables/useChatStreamHandler.ts +++ b/frontend/src/composables/useChatStreamHandler.ts @@ -1,6 +1,7 @@ import { markRaw, nextTick, type Ref } from 'vue' import { useI18n } from 'vue-i18n' import { ensureRagPipelineHistoryStream } from '@/utils/rag-pipeline-history' +import { applyMessageCreatedAt, bindServerTurnTimestamps, ensureMessageCreatedAt } from '@/utils/messageTimestamp' export type ChatMessage = Record @@ -57,6 +58,16 @@ export function useChatStreamHandler(options: UseChatStreamHandlerOptions) { debug = false, } = options + const emitMessageCreated = (message: ChatMessage) => { + ensureMessageCreatedAt(message) + onMessageCreated?.(message) + } + + const emitMessageUpdated = (message: ChatMessage, payload?: ChatMessage) => { + if (payload) applyMessageCreatedAt(message, payload.created_at) + onMessageUpdated?.(message, payload) + } + const log = (...args: unknown[]) => { if (debug) console.log(...args) } @@ -166,7 +177,7 @@ export function useChatStreamHandler(options: UseChatStreamHandlerOptions) { } ensureAgentMessageShell(message, data.id as string | undefined) messagesList.push(message) - onMessageCreated?.(message) + emitMessageCreated(message) loading.value = false } else { ensureAgentMessageShell(message, data.id as string | undefined) @@ -174,7 +185,7 @@ export function useChatStreamHandler(options: UseChatStreamHandlerOptions) { message.knowledge_references = refs.slice() if (created) onAgentChunkBound?.(message, true) - onMessageUpdated?.(message, data) + emitMessageUpdated(message, data) log('[References] Saved to message, count:', refs.length) return message } @@ -194,7 +205,7 @@ export function useChatStreamHandler(options: UseChatStreamHandlerOptions) { return undefined } message.used_memories = memories.slice() - onMessageUpdated?.(message, data) + emitMessageUpdated(message, data) log('[Memory] Saved to message, count:', memories.length) return message } @@ -473,13 +484,13 @@ export function useChatStreamHandler(options: UseChatStreamHandlerOptions) { } if (payload.is_fallback) message.is_fallback = true if (payload.is_completed) message.is_completed = true - onMessageUpdated?.(message, payload) + emitMessageUpdated(message, payload) } else { const entry = { ...payload } if (entry.id && !entry.request_id) entry.request_id = entry.id messagesList.push(entry) - onMessageCreated?.(entry) - onMessageUpdated?.(entry, payload) + emitMessageCreated(entry) + emitMessageUpdated(entry, payload) } scrollToBottom() } @@ -510,7 +521,7 @@ export function useChatStreamHandler(options: UseChatStreamHandlerOptions) { knowledge_references: [], } messagesList.push(newMsg) - onMessageCreated?.(newMsg) + emitMessageCreated(newMsg) loading.value = false scrollToBottom(true) message = newMsg @@ -524,6 +535,7 @@ export function useChatStreamHandler(options: UseChatStreamHandlerOptions) { } ensureAgentMessageShell(message, dataId) + applyMessageCreatedAt(message, data.created_at) if ( loading.value && @@ -921,7 +933,7 @@ export function useChatStreamHandler(options: UseChatStreamHandlerOptions) { knowledge_references: [], } messagesList.push(existingMessage) - onMessageCreated?.(existingMessage) + emitMessageCreated(existingMessage) loading.value = false scrollToBottom(true) log('[Agent Query] Created agent placeholder message') @@ -933,6 +945,11 @@ export function useChatStreamHandler(options: UseChatStreamHandlerOptions) { } log('[Agent Query] Continuing stream for existing message') } + bindServerTurnTimestamps( + messagesList, + (data.data as Record | undefined) || data, + existingMessage, + ) onAgentQuery?.(data, existingMessage, created) return } diff --git a/frontend/src/composables/useEmbedChatSession.ts b/frontend/src/composables/useEmbedChatSession.ts index 38f23a7a..f7c4ad33 100644 --- a/frontend/src/composables/useEmbedChatSession.ts +++ b/frontend/src/composables/useEmbedChatSession.ts @@ -286,6 +286,7 @@ export function useEmbedChatSession(options: { images: displayImages, attachments: displayAttachments, channel: 'embed', + created_at: new Date().toISOString(), }) postEmbedMessageSent(options.channelId, options.sessionId.value, value) relayEmbedWebhookEvent( diff --git a/frontend/src/utils/messageTimestamp.test.ts b/frontend/src/utils/messageTimestamp.test.ts index f43ea856..fabcbcd6 100644 --- a/frontend/src/utils/messageTimestamp.test.ts +++ b/frontend/src/utils/messageTimestamp.test.ts @@ -1,6 +1,22 @@ import assert from 'node:assert/strict' import test from 'node:test' -import { ensureMessageCreatedAt, formatMessageTimestamp } from './messageTimestamp' +import { + applyMessageCreatedAt, + bindServerTurnTimestamps, + ensureMessageCreatedAt, + formatMessageTimestamp, + normalizeMessageCreatedAt, +} from './messageTimestamp' + +test('normalizeMessageCreatedAt accepts parseable timestamps and rejects junk', () => { + assert.equal(normalizeMessageCreatedAt('2026-01-02T03:04:05.000Z'), '2026-01-02T03:04:05.000Z') + assert.equal(normalizeMessageCreatedAt(' 2026-01-02T03:04:05.000Z '), '2026-01-02T03:04:05.000Z') + assert.equal(normalizeMessageCreatedAt(''), '') + assert.equal(normalizeMessageCreatedAt(' '), '') + assert.equal(normalizeMessageCreatedAt('not-a-date'), '') + assert.equal(normalizeMessageCreatedAt(undefined), '') + assert.equal(normalizeMessageCreatedAt(1735787045000), '') +}) test('ensureMessageCreatedAt fills a missing timestamp with the provided fallback', () => { const message: Record = { role: 'assistant' } @@ -10,6 +26,20 @@ test('ensureMessageCreatedAt fills a missing timestamp with the provided fallbac assert.equal(message.created_at, '2026-01-02T03:04:05.000Z') }) +test('ensureMessageCreatedAt replaces empty and invalid local timestamps', () => { + const empty = { created_at: '' } + const blank = { created_at: ' ' } + const invalid = { created_at: 'not-a-date' } + + ensureMessageCreatedAt(empty, '2026-01-02T03:04:05.000Z') + ensureMessageCreatedAt(blank, '2026-01-02T03:04:05.000Z') + ensureMessageCreatedAt(invalid, '2026-01-02T03:04:05.000Z') + + assert.equal(empty.created_at, '2026-01-02T03:04:05.000Z') + assert.equal(blank.created_at, '2026-01-02T03:04:05.000Z') + assert.equal(invalid.created_at, '2026-01-02T03:04:05.000Z') +}) + test('ensureMessageCreatedAt preserves a server timestamp', () => { const message = { created_at: '2026-02-03T04:05:06.000Z' } @@ -18,14 +48,82 @@ test('ensureMessageCreatedAt preserves a server timestamp', () => { assert.equal(message.created_at, '2026-02-03T04:05:06.000Z') }) +test('applyMessageCreatedAt overwrites a local fallback with a server timestamp', () => { + const message = { created_at: '2026-01-02T03:04:05.000Z' } + + applyMessageCreatedAt(message, '2026-02-03T04:05:06.000Z') + + assert.equal(message.created_at, '2026-02-03T04:05:06.000Z') +}) + +test('applyMessageCreatedAt ignores empty or invalid server candidates', () => { + const message = { created_at: '2026-01-02T03:04:05.000Z' } + + applyMessageCreatedAt(message, '') + applyMessageCreatedAt(message, ' ') + applyMessageCreatedAt(message, 'not-a-date') + applyMessageCreatedAt(message, undefined) + + assert.equal(message.created_at, '2026-01-02T03:04:05.000Z') +}) + test('formatMessageTimestamp renders local time to minute precision', () => { const localTime = new Date(2026, 0, 2, 3, 4, 5) assert.equal(formatMessageTimestamp(localTime.toISOString()), '2026-01-02 03:04') }) +test('formatMessageTimestamp converts a UTC string into local wall time', () => { + const utc = '2026-01-02T00:00:00.000Z' + const local = new Date(utc) + const pad = (part: number) => String(part).padStart(2, '0') + const expected = `${local.getFullYear()}-${pad(local.getMonth() + 1)}-${pad(local.getDate())} ${pad(local.getHours())}:${pad(local.getMinutes())}` + + assert.equal(formatMessageTimestamp(utc), expected) + assert.notEqual(expected, '') +}) + +test('bindServerTurnTimestamps replaces local fallbacks with persisted server times', () => { + const user = { role: 'user', created_at: '2026-01-02T03:04:05.000Z' } + const assistant = { role: 'assistant', created_at: '2026-01-02T03:04:06.000Z' } + + bindServerTurnTimestamps( + [user, assistant], + { + user_message_id: 'user-1', + user_created_at: '2026-01-02T03:05:00.000Z', + assistant_created_at: '2026-01-02T03:05:01.000Z', + }, + assistant, + ) + + assert.equal(user.id, 'user-1') + assert.equal(user.created_at, '2026-01-02T03:05:00.000Z') + assert.equal(assistant.created_at, '2026-01-02T03:05:01.000Z') +}) + +test('bindServerTurnTimestamps ignores junk and keeps existing user ids', () => { + const user = { id: 'existing-user', role: 'user', created_at: '2026-01-02T03:04:05.000Z' } + const assistant = { role: 'assistant', created_at: '2026-01-02T03:04:06.000Z' } + + bindServerTurnTimestamps( + [user, assistant], + { + user_message_id: 'user-1', + user_created_at: 'not-a-date', + assistant_created_at: '', + }, + assistant, + ) + + assert.equal(user.id, 'existing-user') + assert.equal(user.created_at, '2026-01-02T03:04:05.000Z') + assert.equal(assistant.created_at, '2026-01-02T03:04:06.000Z') +}) + test('formatMessageTimestamp hides empty and invalid timestamps', () => { assert.equal(formatMessageTimestamp(''), '') + assert.equal(formatMessageTimestamp(' '), '') assert.equal(formatMessageTimestamp('not-a-date'), '') assert.equal(formatMessageTimestamp(undefined), '') }) diff --git a/frontend/src/utils/messageTimestamp.ts b/frontend/src/utils/messageTimestamp.ts index 384afe21..2d6d0686 100644 --- a/frontend/src/utils/messageTimestamp.ts +++ b/frontend/src/utils/messageTimestamp.ts @@ -1,21 +1,64 @@ type MessageWithTimestamp = Record & { created_at?: unknown } +export function normalizeMessageCreatedAt(value: unknown): string { + if (typeof value !== 'string' || !value.trim()) return '' + + const trimmed = value.trim() + const date = new Date(trimmed) + if (Number.isNaN(date.getTime())) return '' + return trimmed +} + +export function applyMessageCreatedAt( + message: T, + candidate: unknown, +): T { + const next = normalizeMessageCreatedAt(candidate) + if (next) message.created_at = next + return message +} + export function ensureMessageCreatedAt( message: T, fallback = new Date().toISOString(), ): T { - if (typeof message.created_at !== 'string' || !message.created_at.trim()) { + if (!normalizeMessageCreatedAt(message.created_at)) { message.created_at = fallback } return message } +export function bindServerTurnTimestamps( + messages: MessageWithTimestamp[], + payload: Record | undefined, + assistant?: MessageWithTimestamp, +): void { + if (!payload) return + + if (assistant) { + applyMessageCreatedAt(assistant, payload.assistant_created_at ?? payload.created_at) + } + + const userCreatedAt = payload.user_created_at + const userMessageId = typeof payload.user_message_id === 'string' ? payload.user_message_id : '' + if (!normalizeMessageCreatedAt(userCreatedAt) && !userMessageId) return + + for (let i = messages.length - 1; i >= 0; i--) { + const message = messages[i] + if (message.role !== 'user') continue + applyMessageCreatedAt(message, userCreatedAt) + if (userMessageId && (typeof message.id !== 'string' || !message.id)) { + message.id = userMessageId + } + break + } +} + export function formatMessageTimestamp(value: unknown): string { - if (typeof value !== 'string' || !value.trim()) return '' - - const date = new Date(value) - if (Number.isNaN(date.getTime())) return '' + const normalized = normalizeMessageCreatedAt(value) + if (!normalized) return '' + const date = new Date(normalized) const pad = (part: number) => String(part).padStart(2, '0') return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}` } diff --git a/frontend/src/views/chat/index.vue b/frontend/src/views/chat/index.vue index bafe7fbf..3e21890a 100644 --- a/frontend/src/views/chat/index.vue +++ b/frontend/src/views/chat/index.vue @@ -76,28 +76,22 @@
-
+
- +
+ class="message-row"> - + { - ensureMessageCreatedAt(message); - attachStreamDebugToMessage(message); - }, + onMessageCreated: (message) => attachStreamDebugToMessage(message), onMessageUpdated: (message, payload) => { attachStreamDebugToMessage(message); if (payload?.is_completed) pendingStreamDebug.value = null; @@ -672,7 +662,6 @@ const handleStopGeneration = () => { }; const sendMsg = async (value, modelId = '', mentionedItems = [], imageFiles = [], attachmentFiles = []) => { - const outgoingMessageCreatedAt = new Date().toISOString(); stopStream(); prepareForNewOutgoingMessage(); isReplying.value = true; @@ -788,7 +777,7 @@ const sendMsg = async (value, modelId = '', mentionedItems = [], imageFiles = [] } // 将@提及的知识库和文件信息存入用户消息 - messagesList.push({ content: value, role: 'user', mentioned_items: mentionedItems, images: userImages, attachments: attachmentFiles.map(a => ({ id: a.documentId, file_name: a.name, file_size: a.size, file_type: '.' + a.name.split('.').pop()?.toLowerCase() })), channel: 'web', created_at: outgoingMessageCreatedAt }); + messagesList.push({ content: value, role: 'user', mentioned_items: mentionedItems, images: userImages, attachments: attachmentFiles.map(a => ({ id: a.documentId, file_name: a.name, file_size: a.size, file_type: '.' + a.name.split('.').pop()?.toLowerCase() })), channel: 'web', created_at: new Date().toISOString() }); userHasScrolledUp.value = false; scrollToBottom(true); @@ -1269,22 +1258,6 @@ onBeforeRouteUpdate((to, from, next) => { width: 100%; } - .message-row--user { - align-items: flex-end; - } - - .message-time { - margin-top: 4px; - color: var(--td-text-color-secondary); - font-size: 12px; - font-variant-numeric: tabular-nums; - line-height: 20px; - } - - .message-row--assistant .message-time { - align-self: flex-start; - } - .botanswer_laoding_gif { width: 24px; height: 18px; diff --git a/frontend/src/views/embed/EmbedChatCore.vue b/frontend/src/views/embed/EmbedChatCore.vue index 610a4ea7..c65f889e 100644 --- a/frontend/src/views/embed/EmbedChatCore.vue +++ b/frontend/src/views/embed/EmbedChatCore.vue @@ -46,7 +46,7 @@ :key="(session.id as string) || `${session.role}-${session.created_at}-${index}`" class="msg-item-wrapper" > -
+
+
-
+
+