diff --git a/internal/application/service/agent_history.go b/internal/application/service/agent_history.go index 60072e38..93fc1907 100644 --- a/internal/application/service/agent_history.go +++ b/internal/application/service/agent_history.go @@ -127,8 +127,17 @@ func buildUserHistoryMessage(m *types.Message) chat.Message { if content == "" { content = m.Content } - if captions := extractImageCaptionsFromMessage(m.Images); captions != "" && m.RenderedContent == "" { - content += "\n\n[用户上传图片内容]\n" + captions + // Only append fallbacks when RenderedContent is absent — when present, it + // already carries the augmented version persisted by the original turn. + // Agent-mode turns currently do not persist RenderedContent, so attachments + // and image captions would otherwise be invisible to subsequent rounds. + if m.RenderedContent == "" { + if captions := extractImageCaptionsFromMessage(m.Images); captions != "" { + content += "\n\n[用户上传图片内容]\n" + captions + } + if len(m.Attachments) > 0 { + content += m.Attachments.BuildPrompt() + } } return chat.Message{Role: "user", Content: content} } diff --git a/internal/application/service/agent_history_test.go b/internal/application/service/agent_history_test.go index 07e64314..0eaba9d1 100644 --- a/internal/application/service/agent_history_test.go +++ b/internal/application/service/agent_history_test.go @@ -42,6 +42,48 @@ func TestBuildUserHistoryMessage_FallsBackToContentWithCaptions(t *testing.T) { assert.Equal(t, "look at this\n\n[用户上传图片内容]\na bar chart\na pie chart", got.Content) } +// TestBuildUserHistoryMessage_AppendsAttachmentsWhenNoRenderedContent covers +// the Agent-mode multi-turn path: AgentQA does not persist RenderedContent, so +// the next turn's history must reconstruct the original attachment prompt from +// the stored Attachments column. Otherwise, follow-up questions like "what is +// in there?" lose all reference to the uploaded file. +func TestBuildUserHistoryMessage_AppendsAttachmentsWhenNoRenderedContent(t *testing.T) { + msg := &types.Message{ + Role: "user", + Content: "summarize this", + Attachments: types.MessageAttachments{ + { + FileName: "report.pdf", + FileType: ".pdf", + FileSize: 2048, + Content: "hello world", + }, + }, + } + got := buildUserHistoryMessage(msg) + assert.Equal(t, "user", got.Role) + assert.Contains(t, got.Content, "summarize this") + assert.Contains(t, got.Content, ``) + assert.Contains(t, got.Content, "hello world") +} + +// TestBuildUserHistoryMessage_RenderedContentSkipsAttachmentReplay ensures the +// KnowledgeQA path (where RenderedContent already includes the attachment +// prompt persisted by the pipeline) does not double-inject attachments. +func TestBuildUserHistoryMessage_RenderedContentSkipsAttachmentReplay(t *testing.T) { + msg := &types.Message{ + Role: "user", + Content: "summarize this", + RenderedContent: "summarize this [with retrieval context already included]", + Attachments: types.MessageAttachments{ + {FileName: "report.pdf", FileType: ".pdf", Content: "hello"}, + }, + } + got := buildUserHistoryMessage(msg) + assert.Equal(t, "summarize this [with retrieval context already included]", got.Content) + assert.NotContains(t, got.Content, "