Skip to content

fix: preserve turns added during hydration window in FlowChatStore #2052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xielixing wants to merge 1 commit into
base: main
Choose a base branch
from
+15 −3
Open

fix: preserve turns added during hydration window in FlowChatStore #2052

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions src/web-ui/src/flow_chat/store/FlowChatStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7103,15 +7103,27 @@ export class FlowChatStore {
const session = prev.sessions.get(sessionId);
if (!session) return prev;

// Preserve turns that were added to the session during the async
// hydration window and are absent from the restored turns.
// Without this, the restored dialogTurns would overwrite any
// live turns added between the restore request and its response,
// causing message action buttons (copy/edit/rollback) to break
// because the turn IDs are no longer in the session's dialogTurns.
const restoredTurnIds = new Set(dialogTurns.map(turn => turn.id));
const turnsAddedDuringHydration = session.dialogTurns.filter(
turn => !restoredTurnIds.has(turn.id),
);
const mergedDialogTurns = [...dialogTurns, ...turnsAddedDuringHydration];

const updatedSession = {
...session,
dialogTurns,
dialogTurns: mergedDialogTurns,
isHistorical: false,
historyState: 'ready' as const,
contextRestoreState,
isPartial: restoredHistoryPartial,
loadedTurnCount: restoredLoadedTurnCount ?? dialogTurns.length,
totalTurnCount: restoredTotalTurnCount ?? dialogTurns.length,
loadedTurnCount: restoredLoadedTurnCount ?? mergedDialogTurns.length,
totalTurnCount: restoredTotalTurnCount ?? mergedDialogTurns.length,
turnCatalog: selectPreferredTurnCatalog(session.turnCatalog, restoredTurnCatalog),
error: null,
config: {
Expand Down