Tools/Notes
1
0
Fork 0
mirror of https://github.com/TriliumNext/Notes.git synced 2025-11-04 15:11:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

well, this is close enough for now and Anthropic

Browse Source
This commit is contained in:
perf3ct 2025-04-15 22:26:04 +00:00
parent 76d13f682e
commit 38e7d10fd7
No known key found for this signature in database
GPG Key ID: 569C4EEC436F5232
1 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/public/app/widgets/llm_chat/communication.ts
View File

@ -50,7 +50,9 @@ export async function setupStreamingResponse(
): Promise<void> { ): Promise<void> {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
let assistantResponse = ''; let assistantResponse = '';
let postToolResponse = ''; // Separate accumulator for post-tool execution content
let receivedAnyContent = false; let receivedAnyContent = false;
let receivedPostToolContent = false; // Track if we've started receiving post-tool content
let timeoutId: number | null = null; let timeoutId: number | null = null;
let initialTimeoutId: number | null = null; let initialTimeoutId: number | null = null;
let cleanupTimeoutId: number | null = null; let cleanupTimeoutId: number | null = null;
@ -206,13 +208,22 @@ export async function setupStreamingResponse(
// If tools were executed and completed, and we're now getting new content, // If tools were executed and completed, and we're now getting new content,
// this is likely the final response after tool execution from Anthropic // this is likely the final response after tool execution from Anthropic
if (toolsExecuted && toolExecutionCompleted && message.content) { if (toolsExecuted && toolExecutionCompleted && message.content) {
console.log(`[${responseId}] Post-tool execution content detected, resetting previous content`); console.log(`[${responseId}] Post-tool execution content detected`);
// Reset accumulated response for post-tool execution response // If this is the first post-tool chunk, indicate we're starting a new response
assistantResponse = message.content; if (!receivedPostToolContent) {
receivedPostToolContent = true;
postToolResponse = ''; // Clear any previous post-tool response
console.log(`[${responseId}] First post-tool content chunk, starting fresh accumulation`);
}
// Update the UI with the fresh content // Accumulate post-tool execution content
onContentUpdate(assistantResponse, message.done || false); postToolResponse += message.content;
console.log(`[${responseId}] Accumulated post-tool content, now ${postToolResponse.length} chars`);
// Update the UI with the accumulated post-tool content
// This replaces the pre-tool content with our accumulated post-tool content
onContentUpdate(postToolResponse, message.done || false);
} else { } else {
// Standard content handling for non-tool cases or initial tool response // Standard content handling for non-tool cases or initial tool response
@ -308,7 +319,7 @@ export async function setupStreamingResponse(
// Handle completion // Handle completion
if (message.done) { if (message.done) {
console.log(`[${responseId}] Stream completed for session ${sessionId}, has content: ${!!message.content}, content length: ${message.content?.length || 0}, current response: ${assistantResponse.length} chars`); console.log(`[${responseId}] Stream completed for session ${sessionId}, has content: ${!!message.content}, content length: ${message.content?.length || 0}, current response: ${assistantResponse.length} chars, post-tool response: ${postToolResponse.length} chars`);
// Dump message content to console for debugging // Dump message content to console for debugging
if (message.content) { if (message.content) {
@ -322,9 +333,21 @@ export async function setupStreamingResponse(
} }
// Make sure the final message is displayed // Make sure the final message is displayed
if (message.content && !assistantResponse.includes(message.content)) { if (message.content) {
console.log(`[${responseId}] Final message has unique content, using it`); // If we've been collecting post-tool content, add this content to it
assistantResponse = message.content; if (receivedPostToolContent) {
// Only add if it's not already included (avoid duplication)
if (!postToolResponse.includes(message.content)) {
postToolResponse += message.content;
console.log(`[${responseId}] Added final chunk to post-tool response`);
}
// Use the post-tool response as our final response
assistantResponse = postToolResponse;
} else if (!assistantResponse.includes(message.content)) {
// For standard responses, add any new content in the final message
console.log(`[${responseId}] Final message has unique content, using it`);
assistantResponse = message.content;
}
} }
// Always mark as done when we receive the done flag // Always mark as done when we receive the done flag