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.
89 lines
2.7 KiB
Go
89 lines
2.7 KiB
Go
package service
|
|
|
|
import (
|
|
"log/slog"
|
|
|
|
"codespace/internal/acp"
|
|
"codespace/internal/model"
|
|
"codespace/internal/process"
|
|
"codespace/internal/workspace"
|
|
)
|
|
|
|
// AcpService wraps the low-level acp.Service with logging and model mapping.
|
|
type AcpService struct {
|
|
svc acp.Service
|
|
lg *slog.Logger
|
|
}
|
|
|
|
// NewAcpService creates an AcpService.
|
|
// If lg is nil, slog.Default() is used.
|
|
func NewAcpService(processes process.Manager, workspaces workspace.Manager, lg *slog.Logger) *AcpService {
|
|
if lg == nil {
|
|
lg = slog.Default()
|
|
}
|
|
return &AcpService{svc: acp.NewService(processes, workspaces, lg), lg: lg}
|
|
}
|
|
|
|
// Status returns the ACP status for the workspace.
|
|
func (s *AcpService) Status(workspaceID string) (model.AcpStatusResponse, error) {
|
|
status, err := s.svc.Status(workspaceID)
|
|
if err != nil {
|
|
s.lg.Error("acp status failed", "workspace_id", workspaceID, "error", err)
|
|
return model.AcpStatusResponse{}, err
|
|
}
|
|
return model.AcpStatusResponse{
|
|
WorkspaceID: status.WorkspaceID,
|
|
Ready: status.Ready,
|
|
SessionID: status.SessionID,
|
|
Running: status.Running,
|
|
PID: status.PID,
|
|
Error: status.Error,
|
|
}, nil
|
|
}
|
|
|
|
// History returns the ACP conversation history for the workspace.
|
|
func (s *AcpService) History(workspaceID string) (model.AcpHistoryResponse, error) {
|
|
hist, err := s.svc.History(workspaceID)
|
|
if err != nil {
|
|
s.lg.Error("acp history failed", "workspace_id", workspaceID, "error", err)
|
|
return model.AcpHistoryResponse{}, err
|
|
}
|
|
messages := make([]model.AcpMessage, len(hist.Messages))
|
|
for i, m := range hist.Messages {
|
|
messages[i] = model.AcpMessage{Role: m.Role, Text: m.Text, Time: m.Time, MessageID: m.MessageID}
|
|
}
|
|
return model.AcpHistoryResponse{SessionID: hist.SessionID, Messages: messages}, nil
|
|
}
|
|
|
|
// Prompt sends a prompt to the agent and returns its response.
|
|
func (s *AcpService) Prompt(workspaceID string, content string) (model.AcpPromptResponse, error) {
|
|
res, err := s.svc.Prompt(workspaceID, content)
|
|
if err != nil {
|
|
s.lg.Error("acp prompt failed", "workspace_id", workspaceID, "error", err)
|
|
return model.AcpPromptResponse{}, err
|
|
}
|
|
return model.AcpPromptResponse{
|
|
SessionID: res.SessionID,
|
|
StopReason: res.StopReason,
|
|
Text: res.Text,
|
|
}, nil
|
|
}
|
|
|
|
// Cancel interrupts an in-flight prompt.
|
|
func (s *AcpService) Cancel(workspaceID string) error {
|
|
if err := s.svc.Cancel(workspaceID); err != nil {
|
|
s.lg.Error("acp cancel failed", "workspace_id", workspaceID, "error", err)
|
|
return err
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// EnsureReady ensures the ACP process is started and initialized.
|
|
func (s *AcpService) EnsureReady(workspaceID string) error {
|
|
if err := s.svc.EnsureReady(workspaceID); err != nil {
|
|
s.lg.Error("acp ensure ready failed", "workspace_id", workspaceID, "error", err)
|
|
return err
|
|
}
|
|
return nil
|
|
}
|