Skip to content
Open
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
10 changes: 6 additions & 4 deletions packages/v2/react/src/components/chat/CopilotChat.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -281,10 +281,12 @@ export function CopilotChat({
// Memoize messages array - only create new reference when content actually changes
// (agent.messages is mutated in place, so we need a new reference for React to detect changes)

const messages = useMemo(
() => [...agent.messages],
[JSON.stringify(agent.messages)],
);
const messages = useMemo(() => {
const seen = new Map<string, number>();
const raw = [...agent.messages];
raw.forEach((msg, i) => seen.set(msg.id, i));
return raw.filter((msg, i) => seen.get(msg.id) === i);
}, [JSON.stringify(agent.messages)]);

const finalProps = merge(mergedProps, {
messages,
Expand Down
15 changes: 8 additions & 7 deletions packages/v2/react/src/components/chat/CopilotChatMessageView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -356,15 +356,16 @@ export function CopilotChatMessageView({
};

const messageElements: React.ReactElement[] = messages
.flatMap((message) => {
.flatMap((message, idx) => {
const keyBase = `${message.id}-${idx}`;
const elements: (React.ReactElement | null | undefined)[] = [];
const stateSnapshot = getStateSnapshotForMessage(message.id);

// Render custom message before (using memoized wrapper)
if (renderCustomMessage) {
elements.push(
<MemoizedCustomMessage
key={`${message.id}-custom-before`}
key={`${keyBase}-custom-before`}
message={message}
position="before"
renderCustomMessage={renderCustomMessage}
Expand Down Expand Up @@ -397,7 +398,7 @@ export function CopilotChatMessageView({

elements.push(
<MemoizedAssistantMessage
key={message.id}
key={keyBase}
message={message as AssistantMessage}
messages={messages}
isRunning={isRunning}
Expand Down Expand Up @@ -427,7 +428,7 @@ export function CopilotChatMessageView({

elements.push(
<MemoizedUserMessage
key={message.id}
key={keyBase}
message={message as UserMessage}
UserMessageComponent={UserComponent}
slotProps={userSlotProps}
Expand All @@ -438,7 +439,7 @@ export function CopilotChatMessageView({
const activityMsg = message as ActivityMessage;
elements.push(
<MemoizedActivityMessage
key={message.id}
key={keyBase}
message={activityMsg}
renderActivityMessage={renderActivityMessage}
/>,
Expand All @@ -463,7 +464,7 @@ export function CopilotChatMessageView({

elements.push(
<MemoizedReasoningMessage
key={message.id}
key={keyBase}
message={message as ReasoningMessage}
messages={messages}
isRunning={isRunning}
Expand All @@ -477,7 +478,7 @@ export function CopilotChatMessageView({
if (renderCustomMessage) {
elements.push(
<MemoizedCustomMessage
key={`${message.id}-custom-after`}
key={`${keyBase}-custom-after`}
message={message}
position="after"
renderCustomMessage={renderCustomMessage}
Expand Down