Merge remote-tracking branch 'upstream/dev' into feat/unified-model-connections

This commit is contained in:
Anish Sarkar 2026-06-12 03:20:46 +05:30
commit 72a7fe04b5
5 changed files with 118 additions and 58 deletions

View file

@ -753,6 +753,9 @@ export default function NewChatPage() {
const loadedMessages = reconcileInterruptedAssistantMessages(messagesResponse.messages).map(
convertToThreadMessage
);
if (messages.length > 0 && loadedMessages.length < messages.length) {
return;
}
setMessages(loadedMessages);
tokenUsageStore.clear();
@ -773,6 +776,7 @@ export default function NewChatPage() {
}, [
activeThreadId,
isRunning,
messages.length,
setMessageDocumentsMap,
threadMessagesQuery.data,
tokenUsageStore,
@ -2537,7 +2541,7 @@ export default function NewChatPage() {
>
<div key={searchSpaceId} className="flex h-full overflow-hidden">
<div className="relative flex-1 flex flex-col min-w-0 overflow-hidden">
<Thread />
<Thread hasActiveThread={!!activeThreadId} />
{isThreadMessagesLoading ? (
<div className="absolute inset-0 z-10 bg-panel">
<ThreadMessagesSkeleton />