hailin
/
it0
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: deduplicate text events from SDK stream_event and assistant message 

SDK sends text both via stream_event deltas (token-level) and assistant
message (complete block). Track hasStreamedText flag per session to skip
duplicate text extraction from assistant messages.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
hailin 2026-02-24 03:31:48 -08:00
parent 65e68a0487
commit 8e4bd573f4
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/services/agent-service/src/infrastructure/engines/claude-agent-sdk/claude-agent-sdk-engine.ts
View File

@ -35,6 +35,8 @@ interface ActiveSession {
abort: AbortController; abort: AbortController;
gate: ApprovalGate; gate: ApprovalGate;
sdkSessionId?: string; sdkSessionId?: string;
/** Whether text was already streamed via stream_event deltas (to avoid duplicate from assistant message). */
hasStreamedText?: boolean;
} }
@Injectable() @Injectable()
@ -165,7 +167,7 @@ export class ClaudeAgentSdkEngine implements AgentEnginePort {
} }
} }
const events = this.mapSdkMessage(message); const events = this.mapSdkMessage(message, params.sessionId);
for (const event of events) { for (const event of events) {
pushEvent(event); pushEvent(event);
} }
@ -296,7 +298,7 @@ export class ClaudeAgentSdkEngine implements AgentEnginePort {
}); });
for await (const msg of sdkQuery) { for await (const msg of sdkQuery) {
const events = this.mapSdkMessage(msg); const events = this.mapSdkMessage(msg, sessionId);
for (const event of events) { for (const event of events) {
yield event; yield event;
} }
@ -351,8 +353,9 @@ export class ClaudeAgentSdkEngine implements AgentEnginePort {
return CommandRiskLevel.READ_ONLY; return CommandRiskLevel.READ_ONLY;
} }
private mapSdkMessage(message: any): EngineStreamEvent[] { private mapSdkMessage(message: any, sessionId: string): EngineStreamEvent[] {
const events: EngineStreamEvent[] = []; const events: EngineStreamEvent[] = [];
const session = this.activeSessions.get(sessionId);
// Log every SDK message type for debugging // Log every SDK message type for debugging
if (message.type === 'stream_event') { if (message.type === 'stream_event') {
@ -371,21 +374,26 @@ export class ClaudeAgentSdkEngine implements AgentEnginePort {
const delta = streamEvent.delta; const delta = streamEvent.delta;
if (delta?.type === 'text_delta' && delta.text) { if (delta?.type === 'text_delta' && delta.text) {
events.push({ type: 'text', content: delta.text }); events.push({ type: 'text', content: delta.text });
if (session) session.hasStreamedText = true;
} else if (delta?.type === 'thinking_delta' && delta.thinking) { } else if (delta?.type === 'thinking_delta' && delta.thinking) {
events.push({ type: 'thinking', content: delta.thinking }); events.push({ type: 'thinking', content: delta.thinking });
if (session) session.hasStreamedText = true;
} }
} }
// Ignore content_block_start/stop/message_start/message_stop — they are structural // Ignore content_block_start/stop/message_start/message_stop — they are structural
} else if (message.type === 'assistant') { } else if (message.type === 'assistant') {
// Complete assistant message — extract ALL content blocks. // Complete assistant message — extract content blocks.
// Text/thinking blocks are emitted here as fallback since the SDK // Skip text/thinking if already streamed via stream_event deltas to avoid duplication.
// may not always send stream_event deltas (depends on SDK version/config). const alreadyStreamed = session?.hasStreamedText ?? false;
// Reset flag for next assistant turn
if (session) session.hasStreamedText = false;
const content = message.message?.content; const content = message.message?.content;
if (Array.isArray(content)) { if (Array.isArray(content)) {
for (const block of content) { for (const block of content) {
if (block.type === 'text' && block.text) { if (block.type === 'text' && block.text && !alreadyStreamed) {
events.push({ type: 'text', content: block.text }); events.push({ type: 'text', content: block.text });
} else if (block.type === 'thinking' && block.thinking) { } else if (block.type === 'thinking' && block.thinking && !alreadyStreamed) {
events.push({ type: 'thinking', content: block.thinking }); events.push({ type: 'thinking', content: block.thinking });
} else if (block.type === 'tool_use') { } else if (block.type === 'tool_use') {
events.push({ events.push({