Skip to content

Fix: persist multi_content for user messages #1652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trungutt merged 1 commit into from
Feb 9, 2026
Merged

Fix: persist multi_content for user messages #1652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions pkg/runtime/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,23 @@ func newAgentContext(agentName string) AgentContext {

// UserMessageEvent is sent when a user message is received
type UserMessageEvent struct {
Type string `json:"type"`
Message string `json:"message"`
SessionID string `json:"session_id"`
SessionPosition int `json:"session_position"` // Index in session.Messages, -1 if unknown
Type string `json:"type"`
Message string `json:"message"`
MultiContent []chat.MessagePart `json:"multi_content,omitempty"`
SessionID string `json:"session_id"`
SessionPosition int `json:"session_position"` // Index in session.Messages, -1 if unknown
AgentContext
}

func UserMessage(message, sessionID string, sessionPos ...int) Event {
func UserMessage(message, sessionID string, multiContent []chat.MessagePart, sessionPos ...int) Event {
pos := -1
if len(sessionPos) > 0 {
pos = sessionPos[0]
}
return &UserMessageEvent{
Type: "user_message",
Message: message,
MultiContent: multiContent,
SessionID: sessionID,
SessionPosition: pos,
AgentContext: newAgentContext(""),
Expand Down
2 changes: 1 addition & 1 deletion pkg/runtime/persistent_runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ func (r *PersistentRuntime) handleEvent(ctx context.Context, sess *session.Sessi
streaming.agentName = ""
streaming.messageID = 0

if _, err := r.sessionStore.AddMessage(ctx, e.SessionID, session.UserMessage(e.Message)); err != nil {
if _, err := r.sessionStore.AddMessage(ctx, e.SessionID, session.UserMessage(e.Message, e.MultiContent...)); err != nil {
slog.Warn("Failed to persist user message", "session_id", e.SessionID, "error", err)
}

Expand Down
3 changes: 2 additions & 1 deletion pkg/runtime/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,8 @@ func (r *LocalRuntime) RunStream(ctx context.Context, sess *session.Session) <-c

messages := sess.GetMessages(a)
if sess.SendUserMessage {
events <- UserMessage(messages[len(messages)-1].Content, sess.ID, len(sess.Messages)-1)
lastMsg := messages[len(messages)-1]
events <- UserMessage(lastMsg.Content, sess.ID, lastMsg.MultiContent, len(sess.Messages)-1)
}

events <- StreamStarted(sess.ID, a.Name())
Expand Down
8 changes: 4 additions & 4 deletions pkg/runtime/runtime_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ func TestSimple(t *testing.T) {
AgentInfo("root", "test/mock-model", "", ""),
TeamInfo([]AgentDetails{{Name: "root", Provider: "test", Model: "mock-model"}}, "root"),
ToolsetInfo(0, false, "root"),
UserMessage("Hi", sess.ID, 0),
UserMessage("Hi", sess.ID, nil, 0),
StreamStarted(sess.ID, "root"),
AgentChoice("root", "Hello"),
MessageAdded(sess.ID, msgAdded.Message, "root"),
Expand Down Expand Up @@ -316,7 +316,7 @@ func TestMultipleContentChunks(t *testing.T) {
AgentInfo("root", "test/mock-model", "", ""),
TeamInfo([]AgentDetails{{Name: "root", Provider: "test", Model: "mock-model"}}, "root"),
ToolsetInfo(0, false, "root"),
UserMessage("Please greet me", sess.ID, 0),
UserMessage("Please greet me", sess.ID, nil, 0),
StreamStarted(sess.ID, "root"),
AgentChoice("root", "Hello "),
AgentChoice("root", "there, "),
Expand Down Expand Up @@ -356,7 +356,7 @@ func TestWithReasoning(t *testing.T) {
AgentInfo("root", "test/mock-model", "", ""),
TeamInfo([]AgentDetails{{Name: "root", Provider: "test", Model: "mock-model"}}, "root"),
ToolsetInfo(0, false, "root"),
UserMessage("Hi", sess.ID, 0),
UserMessage("Hi", sess.ID, nil, 0),
StreamStarted(sess.ID, "root"),
AgentChoiceReasoning("root", "Let me think about this..."),
AgentChoiceReasoning("root", " I should respond politely."),
Expand Down Expand Up @@ -395,7 +395,7 @@ func TestMixedContentAndReasoning(t *testing.T) {
AgentInfo("root", "test/mock-model", "", ""),
TeamInfo([]AgentDetails{{Name: "root", Provider: "test", Model: "mock-model"}}, "root"),
ToolsetInfo(0, false, "root"),
UserMessage("Hi there", sess.ID, 0),
UserMessage("Hi there", sess.ID, nil, 0),
StreamStarted(sess.ID, "root"),
AgentChoiceReasoning("root", "The user wants a greeting"),
AgentChoice("root", "Hello!"),
Expand Down
Loading