Skip to content

Revert "fix(vscode-ide-companion): preserve split stream message ordering" #3572

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

Closed
yiliang114 wants to merge 1 commit into from
Closed

Revert "fix(vscode-ide-companion): preserve split stream message ordering" #3572

Show file tree
Hide file tree
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
97 changes: 0 additions & 97 deletions packages/vscode-ide-companion/src/webview/hooks/message/useMessageHandling.test.tsx
View file
Open in desktop

This file was deleted.

18 changes: 4 additions & 14 deletions packages/vscode-ide-companion/src/webview/hooks/message/useMessageHandling.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ export const useMessageHandling = () => {
const streamingMessageIndexRef = useRef<number | null>(null);
// Track the index of the current aggregated thinking message
const thinkingMessageIndexRef = useRef<number | null>(null);
// Preserve one stable timestamp for all message segments in the same turn.
const currentStreamTimestampRef = useRef<number | null>(null);

/**
* Add message
Expand All @@ -56,9 +54,6 @@ export const useMessageHandling = () => {
* Start streaming response
*/
const startStreaming = useCallback((timestamp?: number) => {
const resolvedTimestamp =
typeof timestamp === 'number' ? timestamp : Date.now();
currentStreamTimestampRef.current = resolvedTimestamp;
// Create an assistant placeholder message immediately so tool calls won't jump before it
setMessages((prev) => {
// Record index of the placeholder to update on chunks
Expand All @@ -68,8 +63,8 @@ export const useMessageHandling = () => {
{
role: 'assistant',
content: '',
// Use one stable turn timestamp so later split segments sort correctly.
timestamp: resolvedTimestamp,
// Use provided timestamp (from extension) to keep ordering stable
timestamp: typeof timestamp === 'number' ? timestamp : Date.now(),
},
];
});
Expand All @@ -94,11 +89,7 @@ export const useMessageHandling = () => {
if (idx === null) {
idx = next.length;
streamingMessageIndexRef.current = idx;
next.push({
role: 'assistant',
content: '',
timestamp: currentStreamTimestampRef.current ?? Date.now(),
});
next.push({ role: 'assistant', content: '', timestamp: Date.now() });
}

if (idx < 0 || idx >= next.length) {
Expand Down Expand Up @@ -131,7 +122,6 @@ export const useMessageHandling = () => {
setIsStreaming(false);
streamingMessageIndexRef.current = null;
thinkingMessageIndexRef.current = null;
currentStreamTimestampRef.current = null;
}, []);

/**
Expand Down Expand Up @@ -183,7 +173,7 @@ export const useMessageHandling = () => {
assistantIdx >= 0 &&
assistantIdx < next.length
? next[assistantIdx].timestamp
: (currentStreamTimestampRef.current ?? Date.now());
: Date.now();
next.push({
role: 'thinking',
content: '',
Expand Down
Loading