feat: optimize WebUI stream output and sanitize user-facing answers

This commit is contained in:
2026-03-13 13:14:37 +08:00
parent 8dc5354fa4
commit 33c357a1de
8 changed files with 228 additions and 45 deletions

View File

@@ -220,14 +220,7 @@ func runMessageChannel(ctx context.Context, cfg config.Config, engine *agent.Orc
return engine.HandleMessage(ctx, msg.ChatID, msg.UserID, msg.Text)
},
func(ctx context.Context, msg webui.IncomingMessage, callback webui.StreamEventCallback) (string, error) {
return engine.HandleMessageStream(ctx, msg.ChatID, msg.UserID, msg.Text, func(event agent.StreamEvent) error {
return callback(webui.StreamEvent{
Type: webui.StreamEventType(event.Type),
Content: event.Content,
Step: event.Step,
ToolName: event.ToolName,
})
})
return engine.HandleMessageStream(ctx, msg.ChatID, msg.UserID, msg.Text, buildWebUIStreamForwarder(callback))
},
func(ctx context.Context, chatID, userID string, files []llm.InputFile) ([]string, error) {
return engine.UploadAndCacheFiles(ctx, chatID, userID, files)
@@ -237,3 +230,20 @@ func runMessageChannel(ctx context.Context, cfg config.Config, engine *agent.Orc
return fmt.Errorf("unsupported message channel: %s", cfg.MessageChannel)
}
}
func buildWebUIStreamForwarder(callback webui.StreamEventCallback) agent.StreamEventCallback {
return func(event agent.StreamEvent) error {
if callback == nil {
return nil
}
switch event.Type {
case agent.StreamEventTypeFinal, agent.StreamEventTypeError:
return callback(webui.StreamEvent{
Type: webui.StreamEventType(event.Type),
Content: event.Content,
})
default:
return nil
}
}
}

43
cmd/bot/main_test.go Normal file
View File

@@ -0,0 +1,43 @@
package main
import (
"testing"
"laodingbot/internal/agent"
"laodingbot/internal/transport/webui"
)
func TestBuildWebUIStreamForwarderFiltersTraceEvents(t *testing.T) {
var got []webui.StreamEvent
forwarder := buildWebUIStreamForwarder(func(event webui.StreamEvent) error {
got = append(got, event)
return nil
})
events := []agent.StreamEvent{
{Type: agent.StreamEventTypeThought, Content: "thinking", Step: 1},
{Type: agent.StreamEventTypeToolCall, Content: "pwd", Step: 1, ToolName: "shell"},
{Type: agent.StreamEventTypeToolResult, Content: "C:/Project", Step: 1, ToolName: "shell"},
{Type: agent.StreamEventTypeFinal, Content: "done", Step: 2},
{Type: agent.StreamEventTypeError, Content: "boom", Step: 3},
}
for _, event := range events {
if err := forwarder(event); err != nil {
t.Fatalf("forwarder returned error: %v", err)
}
}
if len(got) != 2 {
t.Fatalf("expected 2 forwarded events, got %d", len(got))
}
if got[0].Type != webui.StreamEventTypeFinal || got[0].Content != "done" {
t.Fatalf("unexpected final event: %+v", got[0])
}
if got[0].Step != 0 || got[0].ToolName != "" {
t.Fatalf("expected final event without trace fields, got %+v", got[0])
}
if got[1].Type != webui.StreamEventTypeError || got[1].Content != "boom" {
t.Fatalf("unexpected error event: %+v", got[1])
}
}