Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 37 additions & 1 deletion apps/web/features/chat/components/message/message-discussion.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { useTranslations } from "next-intl";
import { cn } from "@/lib/utils";
import { StreamdownRender } from "@/shared/components/markdown/streamdown-render";
import type {
DiscussionPromptMessage,
DiscussionRuntimeRound,
DiscussionState,
DiscussionTurn,
Expand Down Expand Up @@ -97,14 +98,40 @@ function usageStatusMark(status: string) {
}
}

function DebugPromptMessage({ message, defaultOpen }: { message: DiscussionPromptMessage; defaultOpen: boolean }) {
const [open, setOpen] = React.useState(defaultOpen);
const preview = message.content.trim().replace(/\s+/g, " ");
return (
<div className="overflow-hidden rounded-md border border-border/50 bg-muted/40">
<button
type="button"
aria-expanded={open}
className="flex w-full items-center gap-1.5 px-2 py-1.5 text-left text-[10px] text-muted-foreground transition-colors hover:text-foreground"
onClick={() => setOpen((value) => !value)}
>
{open ? <ChevronDown className="size-3 shrink-0" /> : <ChevronRight className="size-3 shrink-0" />}
<span className="shrink-0 font-mono font-medium">{message.role}</span>
{!open && preview ? <span className="truncate font-mono opacity-70">{preview}</span> : null}
</button>
{open ? (
<pre className="max-h-52 overflow-auto whitespace-pre-wrap break-words border-t border-border/50 px-2 py-1.5 font-mono text-[11px] leading-5 text-foreground/90">
{message.content}
</pre>
) : null}
</div>
);
}

/** Collapsible view of the exact prompt sent to one model; debug only. */
function DebugPrompt({
model,
prompt,
promptMessages,
label,
}: {
model: string;
prompt?: string;
promptMessages?: DiscussionPromptMessage[];
label: string;
}) {
const t = useTranslations("chat.discussion");
Expand All @@ -113,6 +140,7 @@ function DebugPrompt({
<div className="mt-1.5">
<button
type="button"
aria-expanded={open}
className="inline-flex items-center gap-1 rounded-md border border-border/60 px-1.5 py-0.5 text-[10px] text-muted-foreground transition-colors hover:text-foreground"
onClick={() => setOpen((value) => !value)}
title={label}
Expand All @@ -122,7 +150,13 @@ function DebugPrompt({
<span className="font-mono opacity-70">{model || "—"}</span>
</button>
{open ? (
prompt ? (
promptMessages?.length ? (
<div className="mt-1 space-y-1">
{promptMessages.map((message, index) => (
<DebugPromptMessage key={`${index}-${message.role}`} message={message} defaultOpen={index === 0} />
))}
</div>
) : prompt ? (
<pre className="mt-1 max-h-64 overflow-auto whitespace-pre-wrap break-words rounded-md border border-border/50 bg-muted/40 p-2 font-mono text-[11px] leading-5 text-foreground/90">
{prompt}
</pre>
Expand Down Expand Up @@ -423,6 +457,7 @@ export function MessageDiscussion({ discussion }: { discussion?: DiscussionState
<DebugPrompt
model={active.model}
prompt={activeTurn?.prompt}
promptMessages={activeTurn?.promptMessages}
label={t("debugPromptFor", { model: active.model })}
/>
) : null}
Expand Down Expand Up @@ -462,6 +497,7 @@ export function MessageDiscussion({ discussion }: { discussion?: DiscussionState
<DebugPrompt
model={discussion.summary?.model ?? ""}
prompt={discussion.summaryPrompt}
promptMessages={discussion.summaryPromptMessages}
label={t("debugSummaryPrompt")}
/>
) : null}
Expand Down
2 changes: 2 additions & 0 deletions apps/web/features/chat/model/discussion-stream.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ export function applyDiscussionEvent(
model: event.model,
status: "running",
prompt: event.prompt,
promptMessages: event.promptMessages,
}),
updatedAt: now,
};
Expand Down Expand Up @@ -103,6 +104,7 @@ export function applyDiscussionEvent(
status: "summarizing",
summary: { ...current.summary, participant: event.participant, model: event.model },
summaryPrompt: event.prompt,
summaryPromptMessages: event.promptMessages,
updatedAt: now,
};
}
Expand Down
3 changes: 3 additions & 0 deletions apps/web/shared/api/conversation-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ import type {

import type {
DiscussionPlaceholder,
DiscussionPromptMessage,
DiscussionRuntimeRound,
DiscussionRuntimeSummary,
DiscussionState,
Expand Down Expand Up @@ -410,6 +411,7 @@ export type StreamMessageEvent =
participant: string;
model: string;
prompt: string;
promptMessages: DiscussionPromptMessage[];
}
| {
type: "discussion_turn_delta";
Expand Down Expand Up @@ -437,6 +439,7 @@ export type StreamMessageEvent =
participant: string;
model: string;
prompt: string;
promptMessages: DiscussionPromptMessage[];
}
| {
type: "discussion_summary_delta";
Expand Down
7 changes: 7 additions & 0 deletions apps/web/shared/api/discussion-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ export type DiscussionTemplatePayload = {
sortOrder?: number;
};

export type DiscussionPromptMessage = {
role: string;
content: string;
};

export type DiscussionTurn = {
round: number;
stepId: string;
Expand All @@ -62,6 +67,7 @@ export type DiscussionTurn = {
error?: string;
/** Exact prompt sent to the model; debug output, absent on messages recorded before it existed. */
prompt?: string;
promptMessages?: DiscussionPromptMessage[];
inputTokens?: number;
outputTokens?: number;
cacheReadTokens?: number;
Expand Down Expand Up @@ -96,6 +102,7 @@ export type DiscussionState = {
summary: DiscussionRuntimeSummary;
/** Exact prompt sent to the summary model; debug output. */
summaryPrompt?: string;
summaryPromptMessages?: DiscussionPromptMessage[];
turns: DiscussionTurn[];
finalContent?: string;
error?: string;
Expand Down
50 changes: 34 additions & 16 deletions backend/internal/application/conversation/service_discussion.go
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ func (s *Service) StreamDiscussionMessage(ctx context.Context, input DiscussionS
finalText = discussionFallbackSummary(state.Turns, summaryTurn.Error)
}
state.SummaryPrompt = summaryTurn.Prompt
state.SummaryPromptMessages = summaryTurn.PromptMessages
totalInput += summaryTurn.InputTokens
totalOutput += summaryTurn.OutputTokens
totalCacheRead += summaryTurn.CacheReadTokens
Expand Down Expand Up @@ -292,14 +293,15 @@ func (s *Service) runDiscussionTurn(
}
messages := append([]llm.Message{{Role: "system", Content: prompt}}, history...)
messages = append(messages, llm.Message{Role: "user", Content: discussionTurnUserContent(input.Content, transcript)})
output, promptText, err := s.generateDiscussion(ctx, input, conversation, step.Model, messages, func(promptText string) {
output, promptText, promptMessages, err := s.generateDiscussion(ctx, input, conversation, step.Model, messages, func(promptText string, promptMessages []domaindiscussion.PromptMessage) {
if input.OnEvent != nil {
_ = input.OnEvent("discussion_turn_start", map[string]any{
"round": roundIndex,
"stepId": step.ID,
"participant": step.Participant,
"model": step.Model,
"prompt": promptText,
"round": roundIndex,
"stepId": step.ID,
"participant": step.Participant,
"model": step.Model,
"prompt": promptText,
"promptMessages": discussionPromptMessagesPayloadOf(promptMessages),
})
}
}, func(delta string) {
Expand All @@ -314,6 +316,7 @@ func (s *Service) runDiscussionTurn(
}
})
turn.Prompt = promptText
turn.PromptMessages = promptMessages
if err != nil {
turn.Status = "error"
turn.Error = err.Error()
Expand Down Expand Up @@ -357,16 +360,18 @@ func (s *Service) runDiscussionSummary(
}
messages := append([]llm.Message{{Role: "system", Content: prompt}}, history...)
messages = append(messages, llm.Message{Role: "user", Content: discussionSummaryUserContent(input.Content, transcript)})
output, promptText, err := s.generateDiscussion(ctx, input, conversation, plan.Summary.Model, messages, func(promptText string) {
output, promptText, promptMessages, err := s.generateDiscussion(ctx, input, conversation, plan.Summary.Model, messages, func(promptText string, promptMessages []domaindiscussion.PromptMessage) {
emit("discussion_summary_start", map[string]any{
"participant": plan.Summary.Participant,
"model": plan.Summary.Model,
"prompt": promptText,
"participant": plan.Summary.Participant,
"model": plan.Summary.Model,
"prompt": promptText,
"promptMessages": discussionPromptMessagesPayloadOf(promptMessages),
})
}, func(delta string) {
emit("discussion_summary_delta", map[string]any{"delta": delta})
})
turn.Prompt = promptText
turn.PromptMessages = promptMessages
if err != nil {
turn.Status = "error"
turn.Error = err.Error()
Expand All @@ -389,9 +394,9 @@ func (s *Service) generateDiscussion(
conversation *model.Conversation,
platformModelName string,
messages []llm.Message,
onPrompt func(string),
onPrompt func(string, []domaindiscussion.PromptMessage),
onDelta func(string),
) (*llm.GenerateOutput, string, error) {
) (*llm.GenerateOutput, string, []domaindiscussion.PromptMessage, error) {
route, err := s.routeResolver.ResolveRoute(ctx, channel.ResolveRouteInput{
PlatformModelName: platformModelName,
TaskType: channel.TaskTypeChat,
Expand All @@ -401,7 +406,7 @@ func (s *Service) generateDiscussion(
RequestID: input.RequestID,
})
if err != nil {
return nil, "", err
return nil, "", nil, err
}
attributionReferer, attributionTitle := s.llmAttribution()
routeConfig := routeConfigFromResolved(route, llm.DefaultEndpointForAdapter(route.Protocol), attributionReferer, attributionTitle)
Expand All @@ -420,8 +425,9 @@ func (s *Service) generateDiscussion(
s.logPromptBudgetFit(ctx, route.UpstreamModel, budgetFit)
}
promptText := renderDiscussionPrompt(generateInput.Messages)
promptMessages := discussionPromptMessagesOf(generateInput.Messages)
if onPrompt != nil {
onPrompt(promptText)
onPrompt(promptText, promptMessages)
}
output, err := s.llmClient.GenerateStream(ctx, routeConfig, generateInput, func(event llm.GenerateStreamEvent) error {
if event.Delta != "" && onDelta != nil {
Expand All @@ -430,9 +436,21 @@ func (s *Service) generateDiscussion(
return nil
})
if err != nil {
return nil, promptText, err
return nil, promptText, promptMessages, err
}
return output, promptText, promptMessages, nil
}

func discussionPromptMessagesOf(messages []llm.Message) []domaindiscussion.PromptMessage {
result := make([]domaindiscussion.PromptMessage, 0, len(messages))
for _, message := range messages {
content := strings.TrimSpace(message.Content)
if content == "" {
continue
}
result = append(result, domaindiscussion.PromptMessage{Role: message.Role, Content: content})
}
return output, promptText, nil
return result
}

// discussionTurnUserContent 组装一次轮次发言的当前用户消息:本次问题 + 本轮之前的讨论记录。
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ type discussionSummaryPayload struct {
Prompt string `json:"prompt"`
}

type discussionPromptMessagePayload struct {
Role string `json:"role"`
Content string `json:"content"`
}

type discussionTurnPayload struct {
Round int `json:"round"`
StepID string `json:"stepId"`
Expand All @@ -37,29 +42,31 @@ type discussionTurnPayload struct {
Content string `json:"content,omitempty"`
Error string `json:"error,omitempty"`
// Prompt is the exact prompt sent to this model; it is debug output, not a summary.
Prompt string `json:"prompt,omitempty"`
InputTokens int64 `json:"inputTokens,omitempty"`
OutputTokens int64 `json:"outputTokens,omitempty"`
CacheReadTokens int64 `json:"cacheReadTokens,omitempty"`
CacheWriteTokens int64 `json:"cacheWriteTokens,omitempty"`
ReasoningTokens int64 `json:"reasoningTokens,omitempty"`
LatencyMS int64 `json:"latencyMs,omitempty"`
Prompt string `json:"prompt,omitempty"`
PromptMessages []discussionPromptMessagePayload `json:"promptMessages,omitempty"`
InputTokens int64 `json:"inputTokens,omitempty"`
OutputTokens int64 `json:"outputTokens,omitempty"`
CacheReadTokens int64 `json:"cacheReadTokens,omitempty"`
CacheWriteTokens int64 `json:"cacheWriteTokens,omitempty"`
ReasoningTokens int64 `json:"reasoningTokens,omitempty"`
LatencyMS int64 `json:"latencyMs,omitempty"`
}

type discussionStatePayload struct {
Enabled bool `json:"enabled"`
Status string `json:"status"`
TemplateID string `json:"templateId"`
TemplateName string `json:"templateName"`
Placeholders []discussionPlaceholderPayload `json:"placeholders"`
Rounds []discussionRoundPayload `json:"rounds"`
Summary discussionSummaryPayload `json:"summary"`
SummaryPrompt string `json:"summaryPrompt,omitempty"`
Turns []discussionTurnPayload `json:"turns"`
FinalContent string `json:"finalContent,omitempty"`
Error string `json:"error,omitempty"`
CreatedAt int64 `json:"createdAt"`
UpdatedAt int64 `json:"updatedAt"`
Enabled bool `json:"enabled"`
Status string `json:"status"`
TemplateID string `json:"templateId"`
TemplateName string `json:"templateName"`
Placeholders []discussionPlaceholderPayload `json:"placeholders"`
Rounds []discussionRoundPayload `json:"rounds"`
Summary discussionSummaryPayload `json:"summary"`
SummaryPrompt string `json:"summaryPrompt,omitempty"`
SummaryPromptMessages []discussionPromptMessagePayload `json:"summaryPromptMessages,omitempty"`
Turns []discussionTurnPayload `json:"turns"`
FinalContent string `json:"finalContent,omitempty"`
Error string `json:"error,omitempty"`
CreatedAt int64 `json:"createdAt"`
UpdatedAt int64 `json:"updatedAt"`
}

func discussionPlaceholdersPayloadOf(items []domaindiscussion.Placeholder) []discussionPlaceholderPayload {
Expand Down Expand Up @@ -109,6 +116,17 @@ func discussionSummaryPayloadOf(summary domaindiscussion.RuntimeSummary) discuss
}
}

func discussionPromptMessagesPayloadOf(messages []domaindiscussion.PromptMessage) []discussionPromptMessagePayload {
if len(messages) == 0 {
return nil
}
payload := make([]discussionPromptMessagePayload, 0, len(messages))
for _, message := range messages {
payload = append(payload, discussionPromptMessagePayload{Role: message.Role, Content: message.Content})
}
return payload
}

func discussionTurnPayloadOf(turn domaindiscussion.Turn) discussionTurnPayload {
return discussionTurnPayload{
Round: turn.Round,
Expand All @@ -119,6 +137,7 @@ func discussionTurnPayloadOf(turn domaindiscussion.Turn) discussionTurnPayload {
Content: turn.Content,
Error: turn.Error,
Prompt: turn.Prompt,
PromptMessages: discussionPromptMessagesPayloadOf(turn.PromptMessages),
InputTokens: turn.InputTokens,
OutputTokens: turn.OutputTokens,
CacheReadTokens: turn.CacheReadTokens,
Expand All @@ -138,18 +157,19 @@ func discussionTurnsPayloadOf(turns []domaindiscussion.Turn) []discussionTurnPay

func discussionStatePayloadOf(state domaindiscussion.State) discussionStatePayload {
return discussionStatePayload{
Enabled: state.Enabled,
Status: state.Status,
TemplateID: state.TemplateID,
TemplateName: state.TemplateName,
Placeholders: discussionPlaceholdersPayloadOf(state.Placeholders),
Rounds: discussionRoundsPayloadOf(state.Rounds),
Summary: discussionSummaryPayloadOf(state.Summary),
SummaryPrompt: state.SummaryPrompt,
Turns: discussionTurnsPayloadOf(state.Turns),
FinalContent: state.FinalContent,
Error: state.Error,
CreatedAt: state.CreatedAt,
UpdatedAt: state.UpdatedAt,
Enabled: state.Enabled,
Status: state.Status,
TemplateID: state.TemplateID,
TemplateName: state.TemplateName,
Placeholders: discussionPlaceholdersPayloadOf(state.Placeholders),
Rounds: discussionRoundsPayloadOf(state.Rounds),
Summary: discussionSummaryPayloadOf(state.Summary),
SummaryPrompt: state.SummaryPrompt,
SummaryPromptMessages: discussionPromptMessagesPayloadOf(state.SummaryPromptMessages),
Turns: discussionTurnsPayloadOf(state.Turns),
FinalContent: state.FinalContent,
Error: state.Error,
CreatedAt: state.CreatedAt,
UpdatedAt: state.UpdatedAt,
}
}
Loading
Loading