tao.chen
789f62669c
The opencode acp binary streams agent_message_chunk notifications with an EMPTY messageId. The backend was already correct (it groups when a messageId is present), but the UI rendered every chunk as its own bubble, so a single 'count 1 to 5' reply showed as 9 separate bubbles. Backend: - internal/acp/history.go: add MessageID to Message; new AppendOrCreate method that finds or creates an entry by messageId and appends text to it (preserving the original timestamp). - internal/acp/client.go: agent_message_chunk and user_message_chunk use AppendOrCreate. - internal/model/acp.go: expose MessageID in the wire response. - internal/service/acp_service.go: copy MessageID into the API DTO. - internal/acp/client_test.go: add TestHistoryAppendOrCreateGroupsByMessageID. Frontend: - web/src/components/acp/groupMessages.ts: new pure helper that coalesces consecutive same-role history entries into a single bubble (keeps the first chunk's time + messageId). - web/src/components/acp/AcpPanel.tsx: render coalesced messages; auto-scroll effect now depends on coalesced so it fires as the agent streams. Verified via e2e: 'count from 1 to 5' now returns a single agent entry with text '1\n2\n3\n4\n5' instead of 9 separate entries.
95 lines
2.3 KiB
Go
95 lines
2.3 KiB
Go
package acp
|
|
|
|
import (
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// Message is one entry in the conversation history.
|
|
type Message struct {
|
|
Role string `json:"role"`
|
|
Text string `json:"text"`
|
|
Time time.Time `json:"time"`
|
|
MessageID string `json:"messageId,omitempty"`
|
|
}
|
|
|
|
// History accumulates prompt/response messages in memory for a session.
|
|
type History struct {
|
|
mu sync.RWMutex
|
|
messages []Message
|
|
indexByID map[string]int
|
|
}
|
|
|
|
// NewHistory creates an empty History.
|
|
func NewHistory() *History {
|
|
return &History{indexByID: make(map[string]int)}
|
|
}
|
|
|
|
// Add appends a message with the current time. It is used for messages that
|
|
// have no messageId (e.g. the user prompt path).
|
|
func (h *History) Add(role, text string) {
|
|
h.AppendOrCreate(role, "", text)
|
|
}
|
|
|
|
// AppendOrCreate finds the existing entry with the same messageId and appends
|
|
// text to it; otherwise creates a new entry. When messageId is empty this
|
|
// behaves like Add(role, text). It returns the time of the created or existing
|
|
// entry.
|
|
func (h *History) AppendOrCreate(role, messageId, text string) time.Time {
|
|
h.mu.Lock()
|
|
defer h.mu.Unlock()
|
|
|
|
if messageId == "" {
|
|
h.messages = append(h.messages, Message{Role: role, Text: text, Time: time.Now()})
|
|
return h.messages[len(h.messages)-1].Time
|
|
}
|
|
|
|
if idx, ok := h.indexByID[messageId]; ok {
|
|
h.messages[idx].Text += text
|
|
return h.messages[idx].Time
|
|
}
|
|
|
|
h.messages = append(h.messages, Message{Role: role, Text: text, Time: time.Now(), MessageID: messageId})
|
|
h.indexByID[messageId] = len(h.messages) - 1
|
|
return h.messages[len(h.messages)-1].Time
|
|
}
|
|
|
|
// List returns a copy of all messages, oldest first.
|
|
func (h *History) List() []Message {
|
|
h.mu.RLock()
|
|
defer h.mu.RUnlock()
|
|
out := make([]Message, len(h.messages))
|
|
copy(out, h.messages)
|
|
return out
|
|
}
|
|
|
|
// Len returns the number of stored messages.
|
|
func (h *History) Len() int {
|
|
h.mu.RLock()
|
|
defer h.mu.RUnlock()
|
|
return len(h.messages)
|
|
}
|
|
|
|
// Since returns messages starting at index idx.
|
|
func (h *History) Since(idx int) []Message {
|
|
h.mu.RLock()
|
|
defer h.mu.RUnlock()
|
|
if idx < 0 {
|
|
idx = 0
|
|
}
|
|
if idx > len(h.messages) {
|
|
idx = len(h.messages)
|
|
}
|
|
out := make([]Message, len(h.messages)-idx)
|
|
copy(out, h.messages[idx:])
|
|
return out
|
|
}
|
|
|
|
// Clear removes all stored messages.
|
|
func (h *History) Clear() {
|
|
h.mu.Lock()
|
|
defer h.mu.Unlock()
|
|
h.messages = h.messages[:0]
|
|
h.indexByID = make(map[string]int)
|
|
}
|