fix(chat): stop pushing follow-up messages to the top#7897

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

Merged
t3dotgg merged 3 commits into from
Aug 22, 2026
Merged

fix(chat): stop pushing follow-up messages to the top #7897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
606d983
fix(chat): stop pushing follow-up messages to the top
t3dotgg Aug 22, 2026
fba3c7c
fix(mobile): preserve the first queued message anchor
t3dotgg Aug 22, 2026
6d72b36
fix(chat): keep the working row stable while sessions start
t3dotgg Aug 22, 2026
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
49 changes: 37 additions & 12 deletions apps/mobile/src/features/threads/ThreadDetailScreen.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ import {
} from "./ThreadComposer";
import { ThreadFeed } from "./ThreadFeed";
import type { ThreadContentPresentation } from "./threadContentPresentation";
import { resolveThreadFeedSubmissionAnchor } from "./thread-feed-live-follow";

export interface ThreadDetailScreenProps {
readonly selectedThread: OrchestrationThreadShell;
Expand DownExpand Up@@ -257,9 +258,10 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
const listRef = useRef<LegendListRef>(null);
const feedTouchStartRef = useRef<{ pageX: number; pageY: number } | null>(null);
const selectedThreadKeyRef = useRef(selectedThreadKey);
const lastScrolledAnchorMessageIdRef = useRef<MessageId | null>(null);
const lastScrolledSubmittedMessageIdRef = useRef<MessageId | null>(null);
const [composerExpanded, setComposerExpanded] = useState(false);
const [anchorMessageId, setAnchorMessageId] = useState<MessageId | null>(null);
const [submittedMessageId, setSubmittedMessageId] = useState<MessageId | null>(null);
const [endFollowEnabled, setEndFollowEnabled] = useState(true);
// Android keys the safe-area padding on keyboard visibility (#5988): the
// back gesture closes the keyboard while the editor stays focused, and a
Expand DownExpand Up@@ -458,17 +460,20 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

useEffect(() => {
setAnchorMessageId(null);
lastScrolledAnchorMessageIdRef.current = null;
setSubmittedMessageId(null);
lastScrolledSubmittedMessageIdRef.current = null;
setEndFollowEnabled(true);
freeze.set(false);
}, [freeze, selectedThreadKey]);

useEffect(() => {
if (
anchorMessageId === null ||
lastScrolledAnchorMessageIdRef.current === anchorMessageId ||
submittedMessageId === null ||
lastScrolledSubmittedMessageIdRef.current === submittedMessageId ||
contentPresentationKind !== "ready" ||
!selectedThreadFeed.some((entry) => entry.type === "message" && entry.id === anchorMessageId)
!selectedThreadFeed.some(
(entry) => entry.type === "message" && entry.id === submittedMessageId,
)
) {
return;
}
Expand All@@ -478,7 +483,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
if (selectedThreadKeyRef.current !== targetThreadKey) {
return;
}
lastScrolledAnchorMessageIdRef.current = anchorMessageId;
lastScrolledSubmittedMessageIdRef.current = submittedMessageId;
// Wait for the keyboard dismissal (started by blur() on send) to finish
// before scrolling: scrollMessageToEnd freezes keyboard-driven inset
// updates while it runs, and a close event swallowed by that freeze
Expand All@@ -488,7 +493,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
.then(() => {
if (
selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
) {
return;
}
Expand All@@ -497,17 +502,17 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
.catch(() => {
if (
selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
) {
return;
}
lastScrolledAnchorMessageIdRef.current = null;
lastScrolledSubmittedMessageIdRef.current = null;
freeze.set(false);
});
});
return () => cancelAnimationFrame(frame);
}, [
anchorMessageId,
submittedMessageId,
freeze,
contentPresentationKind,
selectedThreadFeed,
Expand All@@ -517,15 +522,34 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

const handleSendMessage = useCallback(async () => {
const targetThreadKey = selectedThreadKey;
const hasUserMessage = selectedThreadFeed.some(
(entry) => entry.type === "message" && entry.message.role === "user",
);
const messageId = await props.onSendMessage();
if (messageId === null || selectedThreadKeyRef.current !== targetThreadKey) {
return messageId;
}

setAnchorMessageId(messageId);
setSubmittedMessageId(messageId);
setAnchorMessageId(
resolveThreadFeedSubmissionAnchor({
currentAnchorMessageId: anchorMessageId,
submittedMessageId: messageId,
hasStartedTurn: props.selectedThread.latestTurn !== null,
hasUserMessage,
queuedMessageCount: props.selectedThreadQueueCount,
}),
);
composerEditorRef.current?.blur();
return messageId;
}, [props.onSendMessage, selectedThreadKey]);
}, [
anchorMessageId,
props.onSendMessage,
props.selectedThread.latestTurn,
props.selectedThreadQueueCount,
selectedThreadFeed,
selectedThreadKey,
]);

const collapseComposer = useCallback(() => {
composerEditorRef.current?.blur();
Expand DownExpand Up@@ -595,6 +619,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
listRef={listRef}
freeze={freeze}
anchorMessageId={anchorMessageId}
submittedMessageId={submittedMessageId}
contentInsetEndAdjustment={combinedContentInsetEndAdjustment}
contentTopInset={0}
contentBottomInset={estimatedOverlayHeight}
Expand Down
7 changes: 4 additions & 3 deletions apps/mobile/src/features/threads/ThreadFeed.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ export interface ThreadFeedProps {
readonly listRef: RefObject<LegendListRef | null>;
readonly freeze: SharedValue<boolean>;
readonly anchorMessageId: MessageId | null;
readonly submittedMessageId: MessageId | null;
readonly contentInsetEndAdjustment: SharedValue<number>;
readonly contentTopInset?: number;
readonly contentBottomInset?: number;
Expand DownExpand Up@@ -1546,12 +1547,12 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
transitionEndFollow({ type: "reset" });
}, [clearUserScrollSettle, feedThreadKey, transitionEndFollow]);
useEffect(() => {
if (props.anchorMessageId !== null) {
if (props.submittedMessageId !== null) {
clearUserScrollSettle();
userScrollSessionRef.current = false;
transitionEndFollow({ type: "reset" });
}
}, [clearUserScrollSettle, props.anchorMessageId, transitionEndFollow]);
}, [clearUserScrollSettle, props.submittedMessageId, transitionEndFollow]);

const expandedWorkGroupIds = useMemo(() => {
const ids = new Set<string>();
Expand DownExpand Up@@ -1600,7 +1601,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
resolveChatListAnchoredEndSpace(
presentedFeed,
props.anchorMessageId,
(entry) => (entry.type === "message" ? entry.id : null),
(entry) => (entry.type === "message" && entry.message.role === "user" ? entry.id : null),
{ anchorOffset: anchorTopInset + CHAT_LIST_ANCHOR_OFFSET },
),
[presentedFeed, props.anchorMessageId, anchorTopInset],
Expand Down
67 changes: 66 additions & 1 deletion apps/mobile/src/features/threads/thread-feed-live-follow.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,71 @@
import { describe, expect, it } from "vite-plus/test";

import { resolveThreadFeedLiveFollow } from "./thread-feed-live-follow";
import {
resolveThreadFeedLiveFollow,
resolveThreadFeedSubmissionAnchor,
} from "./thread-feed-live-follow";

describe("resolveThreadFeedSubmissionAnchor", () => {
it("anchors the first user message in a thread", () => {
expect(
resolveThreadFeedSubmissionAnchor({
currentAnchorMessageId: null,
submittedMessageId: "first-message",
hasStartedTurn: false,
hasUserMessage: false,
queuedMessageCount: 0,
}),
).toBe("first-message");
});

it("preserves the first-message anchor when another message is queued", () => {
expect(
resolveThreadFeedSubmissionAnchor({
currentAnchorMessageId: "first-message",
submittedMessageId: "second-message",
hasStartedTurn: false,
hasUserMessage: false,
queuedMessageCount: 1,
}),
).toBe("first-message");
});

it("preserves the first-message anchor after its outbox entry drains", () => {
expect(
resolveThreadFeedSubmissionAnchor({
currentAnchorMessageId: "first-message",
submittedMessageId: "second-message",
hasStartedTurn: false,
hasUserMessage: false,
queuedMessageCount: 0,
}),
).toBe("first-message");
});

it("does not anchor a follow-up after a user message appears", () => {
expect(
resolveThreadFeedSubmissionAnchor({
currentAnchorMessageId: "first-message",
submittedMessageId: "second-message",
hasStartedTurn: false,
hasUserMessage: true,
queuedMessageCount: 0,
}),
).toBeNull();
});

it("does not anchor a thread that has already started a turn", () => {
expect(
resolveThreadFeedSubmissionAnchor({
currentAnchorMessageId: null,
submittedMessageId: "second-message",
hasStartedTurn: true,
hasUserMessage: false,
queuedMessageCount: 0,
}),
).toBeNull();
});
});

describe("resolveThreadFeedLiveFollow", () => {
it("pauses immediately when the user starts scrolling", () => {
Expand Down
18 changes: 18 additions & 0 deletions apps/mobile/src/features/threads/thread-feed-live-follow.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,24 @@ export type ThreadFeedLiveFollowEvent =
readonly userScrollSessionActive: boolean;
};

export function resolveThreadFeedSubmissionAnchor<AnchorId>(input: {
readonly currentAnchorMessageId: AnchorId | null;
readonly submittedMessageId: AnchorId;
readonly hasStartedTurn: boolean;
readonly hasUserMessage: boolean;
readonly queuedMessageCount: number;
}): AnchorId | null {
if (input.hasStartedTurn || input.hasUserMessage) {
return null;
}

if (input.currentAnchorMessageId !== null) {
return input.currentAnchorMessageId;
}

return input.queuedMessageCount > 0 ? null : input.submittedMessageId;
}

export function resolveThreadFeedLiveFollow(
current: boolean,
event: ThreadFeedLiveFollowEvent,
Expand Down
23 changes: 23 additions & 0 deletions apps/web/src/components/ChatView.logic.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,29 @@ describe("hasServerAcknowledgedLocalDispatch", () => {
).toBe(false);
});

it("keeps a follow-up active while its provider session is starting", () => {
const localDispatch = createLocalDispatchSnapshot(
makeThread({ latestTurn: completedTurn, session: readySession }),
);

expect(
hasServerAcknowledgedLocalDispatch({
localDispatch,
phase: "connecting",
latestTurn: completedTurn,
latestUserMessageId: MessageId.make("message-followup"),
session: {
...readySession,
status: "starting",
updatedAt: "2026-03-29T00:01:00.000Z",
},
hasPendingApproval: false,
hasPendingUserInput: false,
threadError: null,
}),
).toBe(false);
});

it("acknowledges a settled newer turn", () => {
const localDispatch = createLocalDispatchSnapshot(
makeThread({ latestTurn: completedTurn, session: readySession }),
Expand Down
3 changes: 3 additions & 0 deletions apps/web/src/components/ChatView.logic.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -601,6 +601,9 @@ export function hasServerAcknowledgedLocalDispatch(input: {
if (input.hasPendingApproval || input.hasPendingUserInput || Boolean(input.threadError)) {
return true;
}
if (input.phase === "connecting") {
return false;
}

const latestTurn = input.latestTurn ?? null;
const session = input.session ?? null;
Expand Down
49 changes: 21 additions & 28 deletions apps/web/src/components/ChatView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5297,21 +5297,25 @@ function ChatViewContent(props: ChatViewProps) {
sizeBytes: image.sizeBytes,
previewUrl: image.previewUrl,
}));
// Sending always returns to the live edge. The new row becomes the
// anchored end-space target so it lands near the top while the response
// streams into the reserved space below it.
isAtEndRef.current = true;
timelineScrollModeRef.current = "anchoring-new-turn";
liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
setTimelineLiveFollowEnabled(true);
pendingTimelineAnchorRef.current = messageIdForSend;
activeTimelineAnchorIndexRef.current = null;
showScrollDebouncer.current.cancel();
setShowScrollToBottom(false);
setTimelineAnchor({
threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
messageId: messageIdForSend,
});
const shouldAnchorFirstMessage =
activeThread.latestTurn === null &&
!timelineMessages.some((message) => message.role === "user");
if (shouldAnchorFirstMessage) {
isAtEndRef.current = true;
timelineScrollModeRef.current = "anchoring-new-turn";
liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
setTimelineLiveFollowEnabled(true);
pendingTimelineAnchorRef.current = messageIdForSend;
activeTimelineAnchorIndexRef.current = null;
showScrollDebouncer.current.cancel();
setShowScrollToBottom(false);
setTimelineAnchor({
threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
messageId: messageIdForSend,
});
} else {
scrollToEnd();
}
setOptimisticUserMessages((existing) => [
...existing,
{
Expand DownExpand Up@@ -5815,19 +5819,7 @@ function ChatViewContent(props: ChatViewProps) {
beginLocalDispatch({ preparingWorktree: false });
setThreadError(threadIdForSend, null);

// Position this sent row once LegendList has measured the anchored tail.
isAtEndRef.current = true;
timelineScrollModeRef.current = "anchoring-new-turn";
liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
setTimelineLiveFollowEnabled(true);
pendingTimelineAnchorRef.current = messageIdForSend;
activeTimelineAnchorIndexRef.current = null;
showScrollDebouncer.current.cancel();
setShowScrollToBottom(false);
setTimelineAnchor({
threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
messageId: messageIdForSend,
});
scrollToEnd();

setOptimisticUserMessages((existing) => [
...existing,
Expand DownExpand Up@@ -5922,6 +5914,7 @@ function ChatViewContent(props: ChatViewProps) {
persistThreadSettingsForNextTurn,
resetLocalDispatch,
runtimeMode,
scrollToEnd,
setComposerDraftInteractionMode,
setThreadError,
startThreadTurn,
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
fix(chat): stop pushing follow-up messages to the top#7897

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

 Merged

t3dotgg
merged 3 commits into

from

Aug 22, 2026
 Merged


fix(chat): stop pushing follow-up messages to the top
#7897
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
606d983

fix(chat): stop pushing follow-up messages to the top


t3dotgg Aug 22, 2026
fba3c7c

fix(mobile): preserve the first queued message anchor


t3dotgg Aug 22, 2026
6d72b36

fix(chat): keep the working row stable while sessions start


t3dotgg Aug 22, 2026

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


49 changes: 37 additions & 12 deletions
apps/mobile/src/features/threads/ThreadDetailScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ import {
} from "./ThreadComposer";
import { ThreadFeed } from "./ThreadFeed";
import type { ThreadContentPresentation } from "./threadContentPresentation";
import { resolveThreadFeedSubmissionAnchor } from "./thread-feed-live-follow";

export interface ThreadDetailScreenProps {
 readonly selectedThread: OrchestrationThreadShell;
Expand DownExpand Up@@ -257,9 +258,10 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 const listRef = useRef<LegendListRef>(null);
 const feedTouchStartRef = useRef<{ pageX: number; pageY: number } | null>(null);
 const selectedThreadKeyRef = useRef(selectedThreadKey);
 const lastScrolledAnchorMessageIdRef = useRef<MessageId | null>(null);
 const lastScrolledSubmittedMessageIdRef = useRef<MessageId | null>(null);
 const [composerExpanded, setComposerExpanded] = useState(false);
 const [anchorMessageId, setAnchorMessageId] = useState<MessageId | null>(null);
 const [submittedMessageId, setSubmittedMessageId] = useState<MessageId | null>(null);
 const [endFollowEnabled, setEndFollowEnabled] = useState(true);
 // Android keys the safe-area padding on keyboard visibility (#5988): the
 // back gesture closes the keyboard while the editor stays focused, and a
Expand DownExpand Up@@ -458,17 +460,20 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

 useEffect(() => {
 setAnchorMessageId(null);
 lastScrolledAnchorMessageIdRef.current = null;
 setSubmittedMessageId(null);
 lastScrolledSubmittedMessageIdRef.current = null;
 setEndFollowEnabled(true);
 freeze.set(false);
 }, [freeze, selectedThreadKey]);

 useEffect(() => {
 if (
anchorMessageId === null ||
lastScrolledAnchorMessageIdRef.current === anchorMessageId ||
submittedMessageId === null ||
lastScrolledSubmittedMessageIdRef.current === submittedMessageId ||
 contentPresentationKind !== "ready" ||
 !selectedThreadFeed.some((entry) => entry.type === "message" && entry.id === anchorMessageId)
 !selectedThreadFeed.some(
 (entry) => entry.type === "message" && entry.id === submittedMessageId,
 )
 ) {
 return;
 }
Expand All@@ -478,7 +483,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 if (selectedThreadKeyRef.current !== targetThreadKey) {
 return;
 }
lastScrolledAnchorMessageIdRef.current = anchorMessageId;
lastScrolledSubmittedMessageIdRef.current = submittedMessageId;
 // Wait for the keyboard dismissal (started by blur() on send) to finish
 // before scrolling: scrollMessageToEnd freezes keyboard-driven inset
 // updates while it runs, and a close event swallowed by that freeze
Expand All@@ -488,7 +493,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 .then(() => {
 if (
 selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
 ) {
 return;
 }
Expand All@@ -497,17 +502,17 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 .catch(() => {
 if (
 selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
 ) {
 return;
 }
lastScrolledAnchorMessageIdRef.current = null;
lastScrolledSubmittedMessageIdRef.current = null;
 freeze.set(false);
 });
 });
 return () => cancelAnimationFrame(frame);
 }, [
anchorMessageId,
submittedMessageId,
 freeze,
 contentPresentationKind,
 selectedThreadFeed,
Expand All@@ -517,15 +522,34 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

 const handleSendMessage = useCallback(async () => {
 const targetThreadKey = selectedThreadKey;
 const hasUserMessage = selectedThreadFeed.some(
 (entry) => entry.type === "message" && entry.message.role === "user",
 );
 const messageId = await props.onSendMessage();
 if (messageId === null || selectedThreadKeyRef.current !== targetThreadKey) {
 return messageId;
 }

 setAnchorMessageId(messageId);
 setSubmittedMessageId(messageId);
 setAnchorMessageId(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: anchorMessageId,
 submittedMessageId: messageId,
 hasStartedTurn: props.selectedThread.latestTurn !== null,
 hasUserMessage,
 queuedMessageCount: props.selectedThreadQueueCount,
 }),
 );
 composerEditorRef.current?.blur();
 return messageId;
 }, [props.onSendMessage, selectedThreadKey]);
 }, [
 anchorMessageId,
 props.onSendMessage,
 props.selectedThread.latestTurn,
 props.selectedThreadQueueCount,
 selectedThreadFeed,
 selectedThreadKey,
 ]);

 const collapseComposer = useCallback(() => {
 composerEditorRef.current?.blur();
Expand DownExpand Up@@ -595,6 +619,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 listRef={listRef}
 freeze={freeze}
 anchorMessageId={anchorMessageId}
 submittedMessageId={submittedMessageId}
 contentInsetEndAdjustment={combinedContentInsetEndAdjustment}
 contentTopInset={0}
 contentBottomInset={estimatedOverlayHeight}
Expand Down

7 changes: 4 additions & 3 deletions
apps/mobile/src/features/threads/ThreadFeed.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ export interface ThreadFeedProps {
 readonly listRef: RefObject<LegendListRef | null>;
 readonly freeze: SharedValue<boolean>;
 readonly anchorMessageId: MessageId | null;
 readonly submittedMessageId: MessageId | null;
 readonly contentInsetEndAdjustment: SharedValue<number>;
 readonly contentTopInset?: number;
 readonly contentBottomInset?: number;
Expand DownExpand Up@@ -1546,12 +1547,12 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
 transitionEndFollow({ type: "reset" });
 }, [clearUserScrollSettle, feedThreadKey, transitionEndFollow]);
 useEffect(() => {
 if (props.anchorMessageId !== null) {
 if (props.submittedMessageId !== null) {
 clearUserScrollSettle();
 userScrollSessionRef.current = false;
 transitionEndFollow({ type: "reset" });
 }
 }, [clearUserScrollSettle, props.anchorMessageId, transitionEndFollow]);
 }, [clearUserScrollSettle, props.submittedMessageId, transitionEndFollow]);

 const expandedWorkGroupIds = useMemo(() => {
 const ids = new Set<string>();
Expand DownExpand Up@@ -1600,7 +1601,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
 resolveChatListAnchoredEndSpace(
 presentedFeed,
 props.anchorMessageId,
 (entry) => (entry.type === "message" ? entry.id : null),
 (entry) => (entry.type === "message" && entry.message.role === "user" ? entry.id : null),
 { anchorOffset: anchorTopInset + CHAT_LIST_ANCHOR_OFFSET },
 ),
 [presentedFeed, props.anchorMessageId, anchorTopInset],
Expand Down

67 changes: 66 additions & 1 deletion
apps/mobile/src/features/threads/thread-feed-live-follow.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,71 @@
import { describe, expect, it } from "vite-plus/test";

import { resolveThreadFeedLiveFollow } from "./thread-feed-live-follow";
import {
 resolveThreadFeedLiveFollow,
 resolveThreadFeedSubmissionAnchor,
} from "./thread-feed-live-follow";

describe("resolveThreadFeedSubmissionAnchor", () => {
 it("anchors the first user message in a thread", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: null,
 submittedMessageId: "first-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBe("first-message");
 });

 it("preserves the first-message anchor when another message is queued", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 1,
 }),
 ).toBe("first-message");
 });

 it("preserves the first-message anchor after its outbox entry drains", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBe("first-message");
 });

 it("does not anchor a follow-up after a user message appears", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: true,
 queuedMessageCount: 0,
 }),
 ).toBeNull();
 });

 it("does not anchor a thread that has already started a turn", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: null,
 submittedMessageId: "second-message",
 hasStartedTurn: true,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBeNull();
 });
});

describe("resolveThreadFeedLiveFollow", () => {
 it("pauses immediately when the user starts scrolling", () => {
Expand Down

18 changes: 18 additions & 0 deletions
apps/mobile/src/features/threads/thread-feed-live-follow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,24 @@ export type ThreadFeedLiveFollowEvent =
 readonly userScrollSessionActive: boolean;
 };

export function resolveThreadFeedSubmissionAnchor<AnchorId>(input: {
 readonly currentAnchorMessageId: AnchorId | null;
 readonly submittedMessageId: AnchorId;
 readonly hasStartedTurn: boolean;
 readonly hasUserMessage: boolean;
 readonly queuedMessageCount: number;
}): AnchorId | null {
 if (input.hasStartedTurn || input.hasUserMessage) {
 return null;
 }

 if (input.currentAnchorMessageId !== null) {
 return input.currentAnchorMessageId;
 }

 return input.queuedMessageCount > 0 ? null : input.submittedMessageId;
}

export function resolveThreadFeedLiveFollow(
 current: boolean,
 event: ThreadFeedLiveFollowEvent,
Expand Down

23 changes: 23 additions & 0 deletions
apps/web/src/components/ChatView.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,29 @@ describe("hasServerAcknowledgedLocalDispatch", () => {
 ).toBe(false);
 });

 it("keeps a follow-up active while its provider session is starting", () => {
 const localDispatch = createLocalDispatchSnapshot(
 makeThread({ latestTurn: completedTurn, session: readySession }),
 );

 expect(
 hasServerAcknowledgedLocalDispatch({
 localDispatch,
 phase: "connecting",
 latestTurn: completedTurn,
 latestUserMessageId: MessageId.make("message-followup"),
 session: {
 ...readySession,
 status: "starting",
 updatedAt: "2026-03-29T00:01:00.000Z",
 },
 hasPendingApproval: false,
 hasPendingUserInput: false,
 threadError: null,
 }),
 ).toBe(false);
 });

 it("acknowledges a settled newer turn", () => {
 const localDispatch = createLocalDispatchSnapshot(
 makeThread({ latestTurn: completedTurn, session: readySession }),
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/components/ChatView.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -601,6 +601,9 @@ export function hasServerAcknowledgedLocalDispatch(input: {
 if (input.hasPendingApproval || input.hasPendingUserInput || Boolean(input.threadError)) {
 return true;
 }
 if (input.phase === "connecting") {
 return false;
 }

 const latestTurn = input.latestTurn ?? null;
 const session = input.session ?? null;
Expand Down

49 changes: 21 additions & 28 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5297,21 +5297,25 @@ function ChatViewContent(props: ChatViewProps) {
 sizeBytes: image.sizeBytes,
 previewUrl: image.previewUrl,
 }));
 // Sending always returns to the live edge. The new row becomes the
 // anchored end-space target so it lands near the top while the response
 // streams into the reserved space below it.
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 const shouldAnchorFirstMessage =
 activeThread.latestTurn === null &&
 !timelineMessages.some((message) => message.role === "user");
 if (shouldAnchorFirstMessage) {
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 } else {
 scrollToEnd();
 }
 setOptimisticUserMessages((existing) => [
 ...existing,
 {
Expand DownExpand Up@@ -5815,19 +5819,7 @@ function ChatViewContent(props: ChatViewProps) {
 beginLocalDispatch({ preparingWorktree: false });
 setThreadError(threadIdForSend, null);

 // Position this sent row once LegendList has measured the anchored tail.
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 scrollToEnd();

 setOptimisticUserMessages((existing) => [
 ...existing,
Expand DownExpand Up@@ -5922,6 +5914,7 @@ function ChatViewContent(props: ChatViewProps) {
 persistThreadSettingsForNextTurn,
 resetLocalDispatch,
 runtimeMode,
 scrollToEnd,
 setComposerDraftInteractionMode,
 setThreadError,
 startThreadTurn,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(chat): stop pushing follow-up messages to the top#7897

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

 Merged

t3dotgg
merged 3 commits into

from

Aug 22, 2026
 Merged


fix(chat): stop pushing follow-up messages to the top
#7897
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
606d983

fix(chat): stop pushing follow-up messages to the top


t3dotgg Aug 22, 2026
fba3c7c

fix(mobile): preserve the first queued message anchor


t3dotgg Aug 22, 2026
6d72b36

fix(chat): keep the working row stable while sessions start


t3dotgg Aug 22, 2026

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


49 changes: 37 additions & 12 deletions
apps/mobile/src/features/threads/ThreadDetailScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ import {
} from "./ThreadComposer";
import { ThreadFeed } from "./ThreadFeed";
import type { ThreadContentPresentation } from "./threadContentPresentation";
import { resolveThreadFeedSubmissionAnchor } from "./thread-feed-live-follow";

export interface ThreadDetailScreenProps {
 readonly selectedThread: OrchestrationThreadShell;
Expand DownExpand Up@@ -257,9 +258,10 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 const listRef = useRef<LegendListRef>(null);
 const feedTouchStartRef = useRef<{ pageX: number; pageY: number } | null>(null);
 const selectedThreadKeyRef = useRef(selectedThreadKey);
 const lastScrolledAnchorMessageIdRef = useRef<MessageId | null>(null);
 const lastScrolledSubmittedMessageIdRef = useRef<MessageId | null>(null);
 const [composerExpanded, setComposerExpanded] = useState(false);
 const [anchorMessageId, setAnchorMessageId] = useState<MessageId | null>(null);
 const [submittedMessageId, setSubmittedMessageId] = useState<MessageId | null>(null);
 const [endFollowEnabled, setEndFollowEnabled] = useState(true);
 // Android keys the safe-area padding on keyboard visibility (#5988): the
 // back gesture closes the keyboard while the editor stays focused, and a
Expand DownExpand Up@@ -458,17 +460,20 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

 useEffect(() => {
 setAnchorMessageId(null);
 lastScrolledAnchorMessageIdRef.current = null;
 setSubmittedMessageId(null);
 lastScrolledSubmittedMessageIdRef.current = null;
 setEndFollowEnabled(true);
 freeze.set(false);
 }, [freeze, selectedThreadKey]);

 useEffect(() => {
 if (
anchorMessageId === null ||
lastScrolledAnchorMessageIdRef.current === anchorMessageId ||
submittedMessageId === null ||
lastScrolledSubmittedMessageIdRef.current === submittedMessageId ||
 contentPresentationKind !== "ready" ||
 !selectedThreadFeed.some((entry) => entry.type === "message" && entry.id === anchorMessageId)
 !selectedThreadFeed.some(
 (entry) => entry.type === "message" && entry.id === submittedMessageId,
 )
 ) {
 return;
 }
Expand All@@ -478,7 +483,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 if (selectedThreadKeyRef.current !== targetThreadKey) {
 return;
 }
lastScrolledAnchorMessageIdRef.current = anchorMessageId;
lastScrolledSubmittedMessageIdRef.current = submittedMessageId;
 // Wait for the keyboard dismissal (started by blur() on send) to finish
 // before scrolling: scrollMessageToEnd freezes keyboard-driven inset
 // updates while it runs, and a close event swallowed by that freeze
Expand All@@ -488,7 +493,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 .then(() => {
 if (
 selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
 ) {
 return;
 }
Expand All@@ -497,17 +502,17 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 .catch(() => {
 if (
 selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
 ) {
 return;
 }
lastScrolledAnchorMessageIdRef.current = null;
lastScrolledSubmittedMessageIdRef.current = null;
 freeze.set(false);
 });
 });
 return () => cancelAnimationFrame(frame);
 }, [
anchorMessageId,
submittedMessageId,
 freeze,
 contentPresentationKind,
 selectedThreadFeed,
Expand All@@ -517,15 +522,34 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

 const handleSendMessage = useCallback(async () => {
 const targetThreadKey = selectedThreadKey;
 const hasUserMessage = selectedThreadFeed.some(
 (entry) => entry.type === "message" && entry.message.role === "user",
 );
 const messageId = await props.onSendMessage();
 if (messageId === null || selectedThreadKeyRef.current !== targetThreadKey) {
 return messageId;
 }

 setAnchorMessageId(messageId);
 setSubmittedMessageId(messageId);
 setAnchorMessageId(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: anchorMessageId,
 submittedMessageId: messageId,
 hasStartedTurn: props.selectedThread.latestTurn !== null,
 hasUserMessage,
 queuedMessageCount: props.selectedThreadQueueCount,
 }),
 );
 composerEditorRef.current?.blur();
 return messageId;
 }, [props.onSendMessage, selectedThreadKey]);
 }, [
 anchorMessageId,
 props.onSendMessage,
 props.selectedThread.latestTurn,
 props.selectedThreadQueueCount,
 selectedThreadFeed,
 selectedThreadKey,
 ]);

 const collapseComposer = useCallback(() => {
 composerEditorRef.current?.blur();
Expand DownExpand Up@@ -595,6 +619,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 listRef={listRef}
 freeze={freeze}
 anchorMessageId={anchorMessageId}
 submittedMessageId={submittedMessageId}
 contentInsetEndAdjustment={combinedContentInsetEndAdjustment}
 contentTopInset={0}
 contentBottomInset={estimatedOverlayHeight}
Expand Down

7 changes: 4 additions & 3 deletions
apps/mobile/src/features/threads/ThreadFeed.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ export interface ThreadFeedProps {
 readonly listRef: RefObject<LegendListRef | null>;
 readonly freeze: SharedValue<boolean>;
 readonly anchorMessageId: MessageId | null;
 readonly submittedMessageId: MessageId | null;
 readonly contentInsetEndAdjustment: SharedValue<number>;
 readonly contentTopInset?: number;
 readonly contentBottomInset?: number;
Expand DownExpand Up@@ -1546,12 +1547,12 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
 transitionEndFollow({ type: "reset" });
 }, [clearUserScrollSettle, feedThreadKey, transitionEndFollow]);
 useEffect(() => {
 if (props.anchorMessageId !== null) {
 if (props.submittedMessageId !== null) {
 clearUserScrollSettle();
 userScrollSessionRef.current = false;
 transitionEndFollow({ type: "reset" });
 }
 }, [clearUserScrollSettle, props.anchorMessageId, transitionEndFollow]);
 }, [clearUserScrollSettle, props.submittedMessageId, transitionEndFollow]);

 const expandedWorkGroupIds = useMemo(() => {
 const ids = new Set<string>();
Expand DownExpand Up@@ -1600,7 +1601,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
 resolveChatListAnchoredEndSpace(
 presentedFeed,
 props.anchorMessageId,
 (entry) => (entry.type === "message" ? entry.id : null),
 (entry) => (entry.type === "message" && entry.message.role === "user" ? entry.id : null),
 { anchorOffset: anchorTopInset + CHAT_LIST_ANCHOR_OFFSET },
 ),
 [presentedFeed, props.anchorMessageId, anchorTopInset],
Expand Down

67 changes: 66 additions & 1 deletion
apps/mobile/src/features/threads/thread-feed-live-follow.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,71 @@
import { describe, expect, it } from "vite-plus/test";

import { resolveThreadFeedLiveFollow } from "./thread-feed-live-follow";
import {
 resolveThreadFeedLiveFollow,
 resolveThreadFeedSubmissionAnchor,
} from "./thread-feed-live-follow";

describe("resolveThreadFeedSubmissionAnchor", () => {
 it("anchors the first user message in a thread", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: null,
 submittedMessageId: "first-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBe("first-message");
 });

 it("preserves the first-message anchor when another message is queued", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 1,
 }),
 ).toBe("first-message");
 });

 it("preserves the first-message anchor after its outbox entry drains", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBe("first-message");
 });

 it("does not anchor a follow-up after a user message appears", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: true,
 queuedMessageCount: 0,
 }),
 ).toBeNull();
 });

 it("does not anchor a thread that has already started a turn", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: null,
 submittedMessageId: "second-message",
 hasStartedTurn: true,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBeNull();
 });
});

describe("resolveThreadFeedLiveFollow", () => {
 it("pauses immediately when the user starts scrolling", () => {
Expand Down

18 changes: 18 additions & 0 deletions
apps/mobile/src/features/threads/thread-feed-live-follow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,24 @@ export type ThreadFeedLiveFollowEvent =
 readonly userScrollSessionActive: boolean;
 };

export function resolveThreadFeedSubmissionAnchor<AnchorId>(input: {
 readonly currentAnchorMessageId: AnchorId | null;
 readonly submittedMessageId: AnchorId;
 readonly hasStartedTurn: boolean;
 readonly hasUserMessage: boolean;
 readonly queuedMessageCount: number;
}): AnchorId | null {
 if (input.hasStartedTurn || input.hasUserMessage) {
 return null;
 }

 if (input.currentAnchorMessageId !== null) {
 return input.currentAnchorMessageId;
 }

 return input.queuedMessageCount > 0 ? null : input.submittedMessageId;
}

export function resolveThreadFeedLiveFollow(
 current: boolean,
 event: ThreadFeedLiveFollowEvent,
Expand Down

23 changes: 23 additions & 0 deletions
apps/web/src/components/ChatView.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,29 @@ describe("hasServerAcknowledgedLocalDispatch", () => {
 ).toBe(false);
 });

 it("keeps a follow-up active while its provider session is starting", () => {
 const localDispatch = createLocalDispatchSnapshot(
 makeThread({ latestTurn: completedTurn, session: readySession }),
 );

 expect(
 hasServerAcknowledgedLocalDispatch({
 localDispatch,
 phase: "connecting",
 latestTurn: completedTurn,
 latestUserMessageId: MessageId.make("message-followup"),
 session: {
 ...readySession,
 status: "starting",
 updatedAt: "2026-03-29T00:01:00.000Z",
 },
 hasPendingApproval: false,
 hasPendingUserInput: false,
 threadError: null,
 }),
 ).toBe(false);
 });

 it("acknowledges a settled newer turn", () => {
 const localDispatch = createLocalDispatchSnapshot(
 makeThread({ latestTurn: completedTurn, session: readySession }),
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/components/ChatView.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -601,6 +601,9 @@ export function hasServerAcknowledgedLocalDispatch(input: {
 if (input.hasPendingApproval || input.hasPendingUserInput || Boolean(input.threadError)) {
 return true;
 }
 if (input.phase === "connecting") {
 return false;
 }

 const latestTurn = input.latestTurn ?? null;
 const session = input.session ?? null;
Expand Down

49 changes: 21 additions & 28 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5297,21 +5297,25 @@ function ChatViewContent(props: ChatViewProps) {
 sizeBytes: image.sizeBytes,
 previewUrl: image.previewUrl,
 }));
 // Sending always returns to the live edge. The new row becomes the
 // anchored end-space target so it lands near the top while the response
 // streams into the reserved space below it.
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 const shouldAnchorFirstMessage =
 activeThread.latestTurn === null &&
 !timelineMessages.some((message) => message.role === "user");
 if (shouldAnchorFirstMessage) {
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 } else {
 scrollToEnd();
 }
 setOptimisticUserMessages((existing) => [
 ...existing,
 {
Expand DownExpand Up@@ -5815,19 +5819,7 @@ function ChatViewContent(props: ChatViewProps) {
 beginLocalDispatch({ preparingWorktree: false });
 setThreadError(threadIdForSend, null);

 // Position this sent row once LegendList has measured the anchored tail.
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 scrollToEnd();

 setOptimisticUserMessages((existing) => [
 ...existing,
Expand DownExpand Up@@ -5922,6 +5914,7 @@ function ChatViewContent(props: ChatViewProps) {
 persistThreadSettingsForNextTurn,
 resetLocalDispatch,
 runtimeMode,
 scrollToEnd,
 setComposerDraftInteractionMode,
 setThreadError,
 startThreadTurn,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(chat): stop pushing follow-up messages to the top#7897

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

 Merged

t3dotgg
merged 3 commits into

from

Aug 22, 2026
 Merged


fix(chat): stop pushing follow-up messages to the top
#7897
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
606d983

fix(chat): stop pushing follow-up messages to the top


t3dotgg Aug 22, 2026
fba3c7c

fix(mobile): preserve the first queued message anchor


t3dotgg Aug 22, 2026
6d72b36

fix(chat): keep the working row stable while sessions start


t3dotgg Aug 22, 2026

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


49 changes: 37 additions & 12 deletions
apps/mobile/src/features/threads/ThreadDetailScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ import {
} from "./ThreadComposer";
import { ThreadFeed } from "./ThreadFeed";
import type { ThreadContentPresentation } from "./threadContentPresentation";
import { resolveThreadFeedSubmissionAnchor } from "./thread-feed-live-follow";

export interface ThreadDetailScreenProps {
 readonly selectedThread: OrchestrationThreadShell;
Expand DownExpand Up@@ -257,9 +258,10 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 const listRef = useRef<LegendListRef>(null);
 const feedTouchStartRef = useRef<{ pageX: number; pageY: number } | null>(null);
 const selectedThreadKeyRef = useRef(selectedThreadKey);
 const lastScrolledAnchorMessageIdRef = useRef<MessageId | null>(null);
 const lastScrolledSubmittedMessageIdRef = useRef<MessageId | null>(null);
 const [composerExpanded, setComposerExpanded] = useState(false);
 const [anchorMessageId, setAnchorMessageId] = useState<MessageId | null>(null);
 const [submittedMessageId, setSubmittedMessageId] = useState<MessageId | null>(null);
 const [endFollowEnabled, setEndFollowEnabled] = useState(true);
 // Android keys the safe-area padding on keyboard visibility (#5988): the
 // back gesture closes the keyboard while the editor stays focused, and a
Expand DownExpand Up@@ -458,17 +460,20 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

 useEffect(() => {
 setAnchorMessageId(null);
 lastScrolledAnchorMessageIdRef.current = null;
 setSubmittedMessageId(null);
 lastScrolledSubmittedMessageIdRef.current = null;
 setEndFollowEnabled(true);
 freeze.set(false);
 }, [freeze, selectedThreadKey]);

 useEffect(() => {
 if (
anchorMessageId === null ||
lastScrolledAnchorMessageIdRef.current === anchorMessageId ||
submittedMessageId === null ||
lastScrolledSubmittedMessageIdRef.current === submittedMessageId ||
 contentPresentationKind !== "ready" ||
 !selectedThreadFeed.some((entry) => entry.type === "message" && entry.id === anchorMessageId)
 !selectedThreadFeed.some(
 (entry) => entry.type === "message" && entry.id === submittedMessageId,
 )
 ) {
 return;
 }
Expand All@@ -478,7 +483,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 if (selectedThreadKeyRef.current !== targetThreadKey) {
 return;
 }
lastScrolledAnchorMessageIdRef.current = anchorMessageId;
lastScrolledSubmittedMessageIdRef.current = submittedMessageId;
 // Wait for the keyboard dismissal (started by blur() on send) to finish
 // before scrolling: scrollMessageToEnd freezes keyboard-driven inset
 // updates while it runs, and a close event swallowed by that freeze
Expand All@@ -488,7 +493,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 .then(() => {
 if (
 selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
 ) {
 return;
 }
Expand All@@ -497,17 +502,17 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 .catch(() => {
 if (
 selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
 ) {
 return;
 }
lastScrolledAnchorMessageIdRef.current = null;
lastScrolledSubmittedMessageIdRef.current = null;
 freeze.set(false);
 });
 });
 return () => cancelAnimationFrame(frame);
 }, [
anchorMessageId,
submittedMessageId,
 freeze,
 contentPresentationKind,
 selectedThreadFeed,
Expand All@@ -517,15 +522,34 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

 const handleSendMessage = useCallback(async () => {
 const targetThreadKey = selectedThreadKey;
 const hasUserMessage = selectedThreadFeed.some(
 (entry) => entry.type === "message" && entry.message.role === "user",
 );
 const messageId = await props.onSendMessage();
 if (messageId === null || selectedThreadKeyRef.current !== targetThreadKey) {
 return messageId;
 }

 setAnchorMessageId(messageId);
 setSubmittedMessageId(messageId);
 setAnchorMessageId(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: anchorMessageId,
 submittedMessageId: messageId,
 hasStartedTurn: props.selectedThread.latestTurn !== null,
 hasUserMessage,
 queuedMessageCount: props.selectedThreadQueueCount,
 }),
 );
 composerEditorRef.current?.blur();
 return messageId;
 }, [props.onSendMessage, selectedThreadKey]);
 }, [
 anchorMessageId,
 props.onSendMessage,
 props.selectedThread.latestTurn,
 props.selectedThreadQueueCount,
 selectedThreadFeed,
 selectedThreadKey,
 ]);

 const collapseComposer = useCallback(() => {
 composerEditorRef.current?.blur();
Expand DownExpand Up@@ -595,6 +619,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 listRef={listRef}
 freeze={freeze}
 anchorMessageId={anchorMessageId}
 submittedMessageId={submittedMessageId}
 contentInsetEndAdjustment={combinedContentInsetEndAdjustment}
 contentTopInset={0}
 contentBottomInset={estimatedOverlayHeight}
Expand Down

7 changes: 4 additions & 3 deletions
apps/mobile/src/features/threads/ThreadFeed.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ export interface ThreadFeedProps {
 readonly listRef: RefObject<LegendListRef | null>;
 readonly freeze: SharedValue<boolean>;
 readonly anchorMessageId: MessageId | null;
 readonly submittedMessageId: MessageId | null;
 readonly contentInsetEndAdjustment: SharedValue<number>;
 readonly contentTopInset?: number;
 readonly contentBottomInset?: number;
Expand DownExpand Up@@ -1546,12 +1547,12 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
 transitionEndFollow({ type: "reset" });
 }, [clearUserScrollSettle, feedThreadKey, transitionEndFollow]);
 useEffect(() => {
 if (props.anchorMessageId !== null) {
 if (props.submittedMessageId !== null) {
 clearUserScrollSettle();
 userScrollSessionRef.current = false;
 transitionEndFollow({ type: "reset" });
 }
 }, [clearUserScrollSettle, props.anchorMessageId, transitionEndFollow]);
 }, [clearUserScrollSettle, props.submittedMessageId, transitionEndFollow]);

 const expandedWorkGroupIds = useMemo(() => {
 const ids = new Set<string>();
Expand DownExpand Up@@ -1600,7 +1601,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
 resolveChatListAnchoredEndSpace(
 presentedFeed,
 props.anchorMessageId,
 (entry) => (entry.type === "message" ? entry.id : null),
 (entry) => (entry.type === "message" && entry.message.role === "user" ? entry.id : null),
 { anchorOffset: anchorTopInset + CHAT_LIST_ANCHOR_OFFSET },
 ),
 [presentedFeed, props.anchorMessageId, anchorTopInset],
Expand Down

67 changes: 66 additions & 1 deletion
apps/mobile/src/features/threads/thread-feed-live-follow.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,71 @@
import { describe, expect, it } from "vite-plus/test";

import { resolveThreadFeedLiveFollow } from "./thread-feed-live-follow";
import {
 resolveThreadFeedLiveFollow,
 resolveThreadFeedSubmissionAnchor,
} from "./thread-feed-live-follow";

describe("resolveThreadFeedSubmissionAnchor", () => {
 it("anchors the first user message in a thread", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: null,
 submittedMessageId: "first-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBe("first-message");
 });

 it("preserves the first-message anchor when another message is queued", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 1,
 }),
 ).toBe("first-message");
 });

 it("preserves the first-message anchor after its outbox entry drains", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBe("first-message");
 });

 it("does not anchor a follow-up after a user message appears", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: true,
 queuedMessageCount: 0,
 }),
 ).toBeNull();
 });

 it("does not anchor a thread that has already started a turn", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: null,
 submittedMessageId: "second-message",
 hasStartedTurn: true,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBeNull();
 });
});

describe("resolveThreadFeedLiveFollow", () => {
 it("pauses immediately when the user starts scrolling", () => {
Expand Down

18 changes: 18 additions & 0 deletions
apps/mobile/src/features/threads/thread-feed-live-follow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,24 @@ export type ThreadFeedLiveFollowEvent =
 readonly userScrollSessionActive: boolean;
 };

export function resolveThreadFeedSubmissionAnchor<AnchorId>(input: {
 readonly currentAnchorMessageId: AnchorId | null;
 readonly submittedMessageId: AnchorId;
 readonly hasStartedTurn: boolean;
 readonly hasUserMessage: boolean;
 readonly queuedMessageCount: number;
}): AnchorId | null {
 if (input.hasStartedTurn || input.hasUserMessage) {
 return null;
 }

 if (input.currentAnchorMessageId !== null) {
 return input.currentAnchorMessageId;
 }

 return input.queuedMessageCount > 0 ? null : input.submittedMessageId;
}

export function resolveThreadFeedLiveFollow(
 current: boolean,
 event: ThreadFeedLiveFollowEvent,
Expand Down

23 changes: 23 additions & 0 deletions
apps/web/src/components/ChatView.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,29 @@ describe("hasServerAcknowledgedLocalDispatch", () => {
 ).toBe(false);
 });

 it("keeps a follow-up active while its provider session is starting", () => {
 const localDispatch = createLocalDispatchSnapshot(
 makeThread({ latestTurn: completedTurn, session: readySession }),
 );

 expect(
 hasServerAcknowledgedLocalDispatch({
 localDispatch,
 phase: "connecting",
 latestTurn: completedTurn,
 latestUserMessageId: MessageId.make("message-followup"),
 session: {
 ...readySession,
 status: "starting",
 updatedAt: "2026-03-29T00:01:00.000Z",
 },
 hasPendingApproval: false,
 hasPendingUserInput: false,
 threadError: null,
 }),
 ).toBe(false);
 });

 it("acknowledges a settled newer turn", () => {
 const localDispatch = createLocalDispatchSnapshot(
 makeThread({ latestTurn: completedTurn, session: readySession }),
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/components/ChatView.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -601,6 +601,9 @@ export function hasServerAcknowledgedLocalDispatch(input: {
 if (input.hasPendingApproval || input.hasPendingUserInput || Boolean(input.threadError)) {
 return true;
 }
 if (input.phase === "connecting") {
 return false;
 }

 const latestTurn = input.latestTurn ?? null;
 const session = input.session ?? null;
Expand Down

49 changes: 21 additions & 28 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5297,21 +5297,25 @@ function ChatViewContent(props: ChatViewProps) {
 sizeBytes: image.sizeBytes,
 previewUrl: image.previewUrl,
 }));
 // Sending always returns to the live edge. The new row becomes the
 // anchored end-space target so it lands near the top while the response
 // streams into the reserved space below it.
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 const shouldAnchorFirstMessage =
 activeThread.latestTurn === null &&
 !timelineMessages.some((message) => message.role === "user");
 if (shouldAnchorFirstMessage) {
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 } else {
 scrollToEnd();
 }
 setOptimisticUserMessages((existing) => [
 ...existing,
 {
Expand DownExpand Up@@ -5815,19 +5819,7 @@ function ChatViewContent(props: ChatViewProps) {
 beginLocalDispatch({ preparingWorktree: false });
 setThreadError(threadIdForSend, null);

 // Position this sent row once LegendList has measured the anchored tail.
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 scrollToEnd();

 setOptimisticUserMessages((existing) => [
 ...existing,
Expand DownExpand Up@@ -5922,6 +5914,7 @@ function ChatViewContent(props: ChatViewProps) {
 persistThreadSettingsForNextTurn,
 resetLocalDispatch,
 runtimeMode,
 scrollToEnd,
 setComposerDraftInteractionMode,
 setThreadError,
 startThreadTurn,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
fix(chat): stop pushing follow-up messages to the top#7897

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

 Merged

t3dotgg
merged 3 commits into

from

Aug 22, 2026
 Merged


fix(chat): stop pushing follow-up messages to the top
#7897
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
606d983

fix(chat): stop pushing follow-up messages to the top


t3dotgg Aug 22, 2026
fba3c7c

fix(mobile): preserve the first queued message anchor


t3dotgg Aug 22, 2026
6d72b36

fix(chat): keep the working row stable while sessions start


t3dotgg Aug 22, 2026

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


49 changes: 37 additions & 12 deletions
apps/mobile/src/features/threads/ThreadDetailScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ import {
} from "./ThreadComposer";
import { ThreadFeed } from "./ThreadFeed";
import type { ThreadContentPresentation } from "./threadContentPresentation";
import { resolveThreadFeedSubmissionAnchor } from "./thread-feed-live-follow";

export interface ThreadDetailScreenProps {
 readonly selectedThread: OrchestrationThreadShell;
Expand DownExpand Up@@ -257,9 +258,10 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 const listRef = useRef<LegendListRef>(null);
 const feedTouchStartRef = useRef<{ pageX: number; pageY: number } | null>(null);
 const selectedThreadKeyRef = useRef(selectedThreadKey);
 const lastScrolledAnchorMessageIdRef = useRef<MessageId | null>(null);
 const lastScrolledSubmittedMessageIdRef = useRef<MessageId | null>(null);
 const [composerExpanded, setComposerExpanded] = useState(false);
 const [anchorMessageId, setAnchorMessageId] = useState<MessageId | null>(null);
 const [submittedMessageId, setSubmittedMessageId] = useState<MessageId | null>(null);
 const [endFollowEnabled, setEndFollowEnabled] = useState(true);
 // Android keys the safe-area padding on keyboard visibility (#5988): the
 // back gesture closes the keyboard while the editor stays focused, and a
Expand DownExpand Up@@ -458,17 +460,20 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

 useEffect(() => {
 setAnchorMessageId(null);
 lastScrolledAnchorMessageIdRef.current = null;
 setSubmittedMessageId(null);
 lastScrolledSubmittedMessageIdRef.current = null;
 setEndFollowEnabled(true);
 freeze.set(false);
 }, [freeze, selectedThreadKey]);

 useEffect(() => {
 if (
anchorMessageId === null ||
lastScrolledAnchorMessageIdRef.current === anchorMessageId ||
submittedMessageId === null ||
lastScrolledSubmittedMessageIdRef.current === submittedMessageId ||
 contentPresentationKind !== "ready" ||
 !selectedThreadFeed.some((entry) => entry.type === "message" && entry.id === anchorMessageId)
 !selectedThreadFeed.some(
 (entry) => entry.type === "message" && entry.id === submittedMessageId,
 )
 ) {
 return;
 }
Expand All@@ -478,7 +483,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 if (selectedThreadKeyRef.current !== targetThreadKey) {
 return;
 }
lastScrolledAnchorMessageIdRef.current = anchorMessageId;
lastScrolledSubmittedMessageIdRef.current = submittedMessageId;
 // Wait for the keyboard dismissal (started by blur() on send) to finish
 // before scrolling: scrollMessageToEnd freezes keyboard-driven inset
 // updates while it runs, and a close event swallowed by that freeze
Expand All@@ -488,7 +493,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 .then(() => {
 if (
 selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
 ) {
 return;
 }
Expand All@@ -497,17 +502,17 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 .catch(() => {
 if (
 selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
 ) {
 return;
 }
lastScrolledAnchorMessageIdRef.current = null;
lastScrolledSubmittedMessageIdRef.current = null;
 freeze.set(false);
 });
 });
 return () => cancelAnimationFrame(frame);
 }, [
anchorMessageId,
submittedMessageId,
 freeze,
 contentPresentationKind,
 selectedThreadFeed,
Expand All@@ -517,15 +522,34 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

 const handleSendMessage = useCallback(async () => {
 const targetThreadKey = selectedThreadKey;
 const hasUserMessage = selectedThreadFeed.some(
 (entry) => entry.type === "message" && entry.message.role === "user",
 );
 const messageId = await props.onSendMessage();
 if (messageId === null || selectedThreadKeyRef.current !== targetThreadKey) {
 return messageId;
 }

 setAnchorMessageId(messageId);
 setSubmittedMessageId(messageId);
 setAnchorMessageId(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: anchorMessageId,
 submittedMessageId: messageId,
 hasStartedTurn: props.selectedThread.latestTurn !== null,
 hasUserMessage,
 queuedMessageCount: props.selectedThreadQueueCount,
 }),
 );
 composerEditorRef.current?.blur();
 return messageId;
 }, [props.onSendMessage, selectedThreadKey]);
 }, [
 anchorMessageId,
 props.onSendMessage,
 props.selectedThread.latestTurn,
 props.selectedThreadQueueCount,
 selectedThreadFeed,
 selectedThreadKey,
 ]);

 const collapseComposer = useCallback(() => {
 composerEditorRef.current?.blur();
Expand DownExpand Up@@ -595,6 +619,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 listRef={listRef}
 freeze={freeze}
 anchorMessageId={anchorMessageId}
 submittedMessageId={submittedMessageId}
 contentInsetEndAdjustment={combinedContentInsetEndAdjustment}
 contentTopInset={0}
 contentBottomInset={estimatedOverlayHeight}
Expand Down

7 changes: 4 additions & 3 deletions
apps/mobile/src/features/threads/ThreadFeed.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ export interface ThreadFeedProps {
 readonly listRef: RefObject<LegendListRef | null>;
 readonly freeze: SharedValue<boolean>;
 readonly anchorMessageId: MessageId | null;
 readonly submittedMessageId: MessageId | null;
 readonly contentInsetEndAdjustment: SharedValue<number>;
 readonly contentTopInset?: number;
 readonly contentBottomInset?: number;
Expand DownExpand Up@@ -1546,12 +1547,12 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
 transitionEndFollow({ type: "reset" });
 }, [clearUserScrollSettle, feedThreadKey, transitionEndFollow]);
 useEffect(() => {
 if (props.anchorMessageId !== null) {
 if (props.submittedMessageId !== null) {
 clearUserScrollSettle();
 userScrollSessionRef.current = false;
 transitionEndFollow({ type: "reset" });
 }
 }, [clearUserScrollSettle, props.anchorMessageId, transitionEndFollow]);
 }, [clearUserScrollSettle, props.submittedMessageId, transitionEndFollow]);

 const expandedWorkGroupIds = useMemo(() => {
 const ids = new Set<string>();
Expand DownExpand Up@@ -1600,7 +1601,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
 resolveChatListAnchoredEndSpace(
 presentedFeed,
 props.anchorMessageId,
 (entry) => (entry.type === "message" ? entry.id : null),
 (entry) => (entry.type === "message" && entry.message.role === "user" ? entry.id : null),
 { anchorOffset: anchorTopInset + CHAT_LIST_ANCHOR_OFFSET },
 ),
 [presentedFeed, props.anchorMessageId, anchorTopInset],
Expand Down

67 changes: 66 additions & 1 deletion
apps/mobile/src/features/threads/thread-feed-live-follow.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,71 @@
import { describe, expect, it } from "vite-plus/test";

import { resolveThreadFeedLiveFollow } from "./thread-feed-live-follow";
import {
 resolveThreadFeedLiveFollow,
 resolveThreadFeedSubmissionAnchor,
} from "./thread-feed-live-follow";

describe("resolveThreadFeedSubmissionAnchor", () => {
 it("anchors the first user message in a thread", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: null,
 submittedMessageId: "first-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBe("first-message");
 });

 it("preserves the first-message anchor when another message is queued", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 1,
 }),
 ).toBe("first-message");
 });

 it("preserves the first-message anchor after its outbox entry drains", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBe("first-message");
 });

 it("does not anchor a follow-up after a user message appears", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: true,
 queuedMessageCount: 0,
 }),
 ).toBeNull();
 });

 it("does not anchor a thread that has already started a turn", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: null,
 submittedMessageId: "second-message",
 hasStartedTurn: true,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBeNull();
 });
});

describe("resolveThreadFeedLiveFollow", () => {
 it("pauses immediately when the user starts scrolling", () => {
Expand Down

18 changes: 18 additions & 0 deletions
apps/mobile/src/features/threads/thread-feed-live-follow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,24 @@ export type ThreadFeedLiveFollowEvent =
 readonly userScrollSessionActive: boolean;
 };

export function resolveThreadFeedSubmissionAnchor<AnchorId>(input: {
 readonly currentAnchorMessageId: AnchorId | null;
 readonly submittedMessageId: AnchorId;
 readonly hasStartedTurn: boolean;
 readonly hasUserMessage: boolean;
 readonly queuedMessageCount: number;
}): AnchorId | null {
 if (input.hasStartedTurn || input.hasUserMessage) {
 return null;
 }

 if (input.currentAnchorMessageId !== null) {
 return input.currentAnchorMessageId;
 }

 return input.queuedMessageCount > 0 ? null : input.submittedMessageId;
}

export function resolveThreadFeedLiveFollow(
 current: boolean,
 event: ThreadFeedLiveFollowEvent,
Expand Down

23 changes: 23 additions & 0 deletions
apps/web/src/components/ChatView.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,29 @@ describe("hasServerAcknowledgedLocalDispatch", () => {
 ).toBe(false);
 });

 it("keeps a follow-up active while its provider session is starting", () => {
 const localDispatch = createLocalDispatchSnapshot(
 makeThread({ latestTurn: completedTurn, session: readySession }),
 );

 expect(
 hasServerAcknowledgedLocalDispatch({
 localDispatch,
 phase: "connecting",
 latestTurn: completedTurn,
 latestUserMessageId: MessageId.make("message-followup"),
 session: {
 ...readySession,
 status: "starting",
 updatedAt: "2026-03-29T00:01:00.000Z",
 },
 hasPendingApproval: false,
 hasPendingUserInput: false,
 threadError: null,
 }),
 ).toBe(false);
 });

 it("acknowledges a settled newer turn", () => {
 const localDispatch = createLocalDispatchSnapshot(
 makeThread({ latestTurn: completedTurn, session: readySession }),
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/components/ChatView.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -601,6 +601,9 @@ export function hasServerAcknowledgedLocalDispatch(input: {
 if (input.hasPendingApproval || input.hasPendingUserInput || Boolean(input.threadError)) {
 return true;
 }
 if (input.phase === "connecting") {
 return false;
 }

 const latestTurn = input.latestTurn ?? null;
 const session = input.session ?? null;
Expand Down

49 changes: 21 additions & 28 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5297,21 +5297,25 @@ function ChatViewContent(props: ChatViewProps) {
 sizeBytes: image.sizeBytes,
 previewUrl: image.previewUrl,
 }));
 // Sending always returns to the live edge. The new row becomes the
 // anchored end-space target so it lands near the top while the response
 // streams into the reserved space below it.
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 const shouldAnchorFirstMessage =
 activeThread.latestTurn === null &&
 !timelineMessages.some((message) => message.role === "user");
 if (shouldAnchorFirstMessage) {
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 } else {
 scrollToEnd();
 }
 setOptimisticUserMessages((existing) => [
 ...existing,
 {
Expand DownExpand Up@@ -5815,19 +5819,7 @@ function ChatViewContent(props: ChatViewProps) {
 beginLocalDispatch({ preparingWorktree: false });
 setThreadError(threadIdForSend, null);

 // Position this sent row once LegendList has measured the anchored tail.
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 scrollToEnd();

 setOptimisticUserMessages((existing) => [
 ...existing,
Expand DownExpand Up@@ -5922,6 +5914,7 @@ function ChatViewContent(props: ChatViewProps) {
 persistThreadSettingsForNextTurn,
 resetLocalDispatch,
 runtimeMode,
 scrollToEnd,
 setComposerDraftInteractionMode,
 setThreadError,
 startThreadTurn,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(chat): stop pushing follow-up messages to the top#7897

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

 Merged

t3dotgg
merged 3 commits into

from

Aug 22, 2026
 Merged


fix(chat): stop pushing follow-up messages to the top
#7897
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
606d983

fix(chat): stop pushing follow-up messages to the top


t3dotgg Aug 22, 2026
fba3c7c

fix(mobile): preserve the first queued message anchor


t3dotgg Aug 22, 2026
6d72b36

fix(chat): keep the working row stable while sessions start


t3dotgg Aug 22, 2026

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


49 changes: 37 additions & 12 deletions
apps/mobile/src/features/threads/ThreadDetailScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ import {
} from "./ThreadComposer";
import { ThreadFeed } from "./ThreadFeed";
import type { ThreadContentPresentation } from "./threadContentPresentation";
import { resolveThreadFeedSubmissionAnchor } from "./thread-feed-live-follow";

export interface ThreadDetailScreenProps {
 readonly selectedThread: OrchestrationThreadShell;
Expand DownExpand Up@@ -257,9 +258,10 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 const listRef = useRef<LegendListRef>(null);
 const feedTouchStartRef = useRef<{ pageX: number; pageY: number } | null>(null);
 const selectedThreadKeyRef = useRef(selectedThreadKey);
 const lastScrolledAnchorMessageIdRef = useRef<MessageId | null>(null);
 const lastScrolledSubmittedMessageIdRef = useRef<MessageId | null>(null);
 const [composerExpanded, setComposerExpanded] = useState(false);
 const [anchorMessageId, setAnchorMessageId] = useState<MessageId | null>(null);
 const [submittedMessageId, setSubmittedMessageId] = useState<MessageId | null>(null);
 const [endFollowEnabled, setEndFollowEnabled] = useState(true);
 // Android keys the safe-area padding on keyboard visibility (#5988): the
 // back gesture closes the keyboard while the editor stays focused, and a
Expand DownExpand Up@@ -458,17 +460,20 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

 useEffect(() => {
 setAnchorMessageId(null);
 lastScrolledAnchorMessageIdRef.current = null;
 setSubmittedMessageId(null);
 lastScrolledSubmittedMessageIdRef.current = null;
 setEndFollowEnabled(true);
 freeze.set(false);
 }, [freeze, selectedThreadKey]);

 useEffect(() => {
 if (
anchorMessageId === null ||
lastScrolledAnchorMessageIdRef.current === anchorMessageId ||
submittedMessageId === null ||
lastScrolledSubmittedMessageIdRef.current === submittedMessageId ||
 contentPresentationKind !== "ready" ||
 !selectedThreadFeed.some((entry) => entry.type === "message" && entry.id === anchorMessageId)
 !selectedThreadFeed.some(
 (entry) => entry.type === "message" && entry.id === submittedMessageId,
 )
 ) {
 return;
 }
Expand All@@ -478,7 +483,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 if (selectedThreadKeyRef.current !== targetThreadKey) {
 return;
 }
lastScrolledAnchorMessageIdRef.current = anchorMessageId;
lastScrolledSubmittedMessageIdRef.current = submittedMessageId;
 // Wait for the keyboard dismissal (started by blur() on send) to finish
 // before scrolling: scrollMessageToEnd freezes keyboard-driven inset
 // updates while it runs, and a close event swallowed by that freeze
Expand All@@ -488,7 +493,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 .then(() => {
 if (
 selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
 ) {
 return;
 }
Expand All@@ -497,17 +502,17 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 .catch(() => {
 if (
 selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
 ) {
 return;
 }
lastScrolledAnchorMessageIdRef.current = null;
lastScrolledSubmittedMessageIdRef.current = null;
 freeze.set(false);
 });
 });
 return () => cancelAnimationFrame(frame);
 }, [
anchorMessageId,
submittedMessageId,
 freeze,
 contentPresentationKind,
 selectedThreadFeed,
Expand All@@ -517,15 +522,34 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

 const handleSendMessage = useCallback(async () => {
 const targetThreadKey = selectedThreadKey;
 const hasUserMessage = selectedThreadFeed.some(
 (entry) => entry.type === "message" && entry.message.role === "user",
 );
 const messageId = await props.onSendMessage();
 if (messageId === null || selectedThreadKeyRef.current !== targetThreadKey) {
 return messageId;
 }

 setAnchorMessageId(messageId);
 setSubmittedMessageId(messageId);
 setAnchorMessageId(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: anchorMessageId,
 submittedMessageId: messageId,
 hasStartedTurn: props.selectedThread.latestTurn !== null,
 hasUserMessage,
 queuedMessageCount: props.selectedThreadQueueCount,
 }),
 );
 composerEditorRef.current?.blur();
 return messageId;
 }, [props.onSendMessage, selectedThreadKey]);
 }, [
 anchorMessageId,
 props.onSendMessage,
 props.selectedThread.latestTurn,
 props.selectedThreadQueueCount,
 selectedThreadFeed,
 selectedThreadKey,
 ]);

 const collapseComposer = useCallback(() => {
 composerEditorRef.current?.blur();
Expand DownExpand Up@@ -595,6 +619,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 listRef={listRef}
 freeze={freeze}
 anchorMessageId={anchorMessageId}
 submittedMessageId={submittedMessageId}
 contentInsetEndAdjustment={combinedContentInsetEndAdjustment}
 contentTopInset={0}
 contentBottomInset={estimatedOverlayHeight}
Expand Down

7 changes: 4 additions & 3 deletions
apps/mobile/src/features/threads/ThreadFeed.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ export interface ThreadFeedProps {
 readonly listRef: RefObject<LegendListRef | null>;
 readonly freeze: SharedValue<boolean>;
 readonly anchorMessageId: MessageId | null;
 readonly submittedMessageId: MessageId | null;
 readonly contentInsetEndAdjustment: SharedValue<number>;
 readonly contentTopInset?: number;
 readonly contentBottomInset?: number;
Expand DownExpand Up@@ -1546,12 +1547,12 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
 transitionEndFollow({ type: "reset" });
 }, [clearUserScrollSettle, feedThreadKey, transitionEndFollow]);
 useEffect(() => {
 if (props.anchorMessageId !== null) {
 if (props.submittedMessageId !== null) {
 clearUserScrollSettle();
 userScrollSessionRef.current = false;
 transitionEndFollow({ type: "reset" });
 }
 }, [clearUserScrollSettle, props.anchorMessageId, transitionEndFollow]);
 }, [clearUserScrollSettle, props.submittedMessageId, transitionEndFollow]);

 const expandedWorkGroupIds = useMemo(() => {
 const ids = new Set<string>();
Expand DownExpand Up@@ -1600,7 +1601,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
 resolveChatListAnchoredEndSpace(
 presentedFeed,
 props.anchorMessageId,
 (entry) => (entry.type === "message" ? entry.id : null),
 (entry) => (entry.type === "message" && entry.message.role === "user" ? entry.id : null),
 { anchorOffset: anchorTopInset + CHAT_LIST_ANCHOR_OFFSET },
 ),
 [presentedFeed, props.anchorMessageId, anchorTopInset],
Expand Down

67 changes: 66 additions & 1 deletion
apps/mobile/src/features/threads/thread-feed-live-follow.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,71 @@
import { describe, expect, it } from "vite-plus/test";

import { resolveThreadFeedLiveFollow } from "./thread-feed-live-follow";
import {
 resolveThreadFeedLiveFollow,
 resolveThreadFeedSubmissionAnchor,
} from "./thread-feed-live-follow";

describe("resolveThreadFeedSubmissionAnchor", () => {
 it("anchors the first user message in a thread", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: null,
 submittedMessageId: "first-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBe("first-message");
 });

 it("preserves the first-message anchor when another message is queued", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 1,
 }),
 ).toBe("first-message");
 });

 it("preserves the first-message anchor after its outbox entry drains", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBe("first-message");
 });

 it("does not anchor a follow-up after a user message appears", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: true,
 queuedMessageCount: 0,
 }),
 ).toBeNull();
 });

 it("does not anchor a thread that has already started a turn", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: null,
 submittedMessageId: "second-message",
 hasStartedTurn: true,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBeNull();
 });
});

describe("resolveThreadFeedLiveFollow", () => {
 it("pauses immediately when the user starts scrolling", () => {
Expand Down

18 changes: 18 additions & 0 deletions
apps/mobile/src/features/threads/thread-feed-live-follow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,24 @@ export type ThreadFeedLiveFollowEvent =
 readonly userScrollSessionActive: boolean;
 };

export function resolveThreadFeedSubmissionAnchor<AnchorId>(input: {
 readonly currentAnchorMessageId: AnchorId | null;
 readonly submittedMessageId: AnchorId;
 readonly hasStartedTurn: boolean;
 readonly hasUserMessage: boolean;
 readonly queuedMessageCount: number;
}): AnchorId | null {
 if (input.hasStartedTurn || input.hasUserMessage) {
 return null;
 }

 if (input.currentAnchorMessageId !== null) {
 return input.currentAnchorMessageId;
 }

 return input.queuedMessageCount > 0 ? null : input.submittedMessageId;
}

export function resolveThreadFeedLiveFollow(
 current: boolean,
 event: ThreadFeedLiveFollowEvent,
Expand Down

23 changes: 23 additions & 0 deletions
apps/web/src/components/ChatView.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,29 @@ describe("hasServerAcknowledgedLocalDispatch", () => {
 ).toBe(false);
 });

 it("keeps a follow-up active while its provider session is starting", () => {
 const localDispatch = createLocalDispatchSnapshot(
 makeThread({ latestTurn: completedTurn, session: readySession }),
 );

 expect(
 hasServerAcknowledgedLocalDispatch({
 localDispatch,
 phase: "connecting",
 latestTurn: completedTurn,
 latestUserMessageId: MessageId.make("message-followup"),
 session: {
 ...readySession,
 status: "starting",
 updatedAt: "2026-03-29T00:01:00.000Z",
 },
 hasPendingApproval: false,
 hasPendingUserInput: false,
 threadError: null,
 }),
 ).toBe(false);
 });

 it("acknowledges a settled newer turn", () => {
 const localDispatch = createLocalDispatchSnapshot(
 makeThread({ latestTurn: completedTurn, session: readySession }),
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/components/ChatView.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -601,6 +601,9 @@ export function hasServerAcknowledgedLocalDispatch(input: {
 if (input.hasPendingApproval || input.hasPendingUserInput || Boolean(input.threadError)) {
 return true;
 }
 if (input.phase === "connecting") {
 return false;
 }

 const latestTurn = input.latestTurn ?? null;
 const session = input.session ?? null;
Expand Down

49 changes: 21 additions & 28 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5297,21 +5297,25 @@ function ChatViewContent(props: ChatViewProps) {
 sizeBytes: image.sizeBytes,
 previewUrl: image.previewUrl,
 }));
 // Sending always returns to the live edge. The new row becomes the
 // anchored end-space target so it lands near the top while the response
 // streams into the reserved space below it.
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 const shouldAnchorFirstMessage =
 activeThread.latestTurn === null &&
 !timelineMessages.some((message) => message.role === "user");
 if (shouldAnchorFirstMessage) {
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 } else {
 scrollToEnd();
 }
 setOptimisticUserMessages((existing) => [
 ...existing,
 {
Expand DownExpand Up@@ -5815,19 +5819,7 @@ function ChatViewContent(props: ChatViewProps) {
 beginLocalDispatch({ preparingWorktree: false });
 setThreadError(threadIdForSend, null);

 // Position this sent row once LegendList has measured the anchored tail.
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 scrollToEnd();

 setOptimisticUserMessages((existing) => [
 ...existing,
Expand DownExpand Up@@ -5922,6 +5914,7 @@ function ChatViewContent(props: ChatViewProps) {
 persistThreadSettingsForNextTurn,
 resetLocalDispatch,
 runtimeMode,
 scrollToEnd,
 setComposerDraftInteractionMode,
 setThreadError,
 startThreadTurn,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
fix(chat): stop pushing follow-up messages to the top#7897

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

 Merged

t3dotgg
merged 3 commits into

from

Aug 22, 2026
 Merged


fix(chat): stop pushing follow-up messages to the top
#7897
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
606d983

fix(chat): stop pushing follow-up messages to the top


t3dotgg Aug 22, 2026
fba3c7c

fix(mobile): preserve the first queued message anchor


t3dotgg Aug 22, 2026
6d72b36

fix(chat): keep the working row stable while sessions start


t3dotgg Aug 22, 2026

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


49 changes: 37 additions & 12 deletions
apps/mobile/src/features/threads/ThreadDetailScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ import {
} from "./ThreadComposer";
import { ThreadFeed } from "./ThreadFeed";
import type { ThreadContentPresentation } from "./threadContentPresentation";
import { resolveThreadFeedSubmissionAnchor } from "./thread-feed-live-follow";

export interface ThreadDetailScreenProps {
 readonly selectedThread: OrchestrationThreadShell;
Expand DownExpand Up@@ -257,9 +258,10 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 const listRef = useRef<LegendListRef>(null);
 const feedTouchStartRef = useRef<{ pageX: number; pageY: number } | null>(null);
 const selectedThreadKeyRef = useRef(selectedThreadKey);
 const lastScrolledAnchorMessageIdRef = useRef<MessageId | null>(null);
 const lastScrolledSubmittedMessageIdRef = useRef<MessageId | null>(null);
 const [composerExpanded, setComposerExpanded] = useState(false);
 const [anchorMessageId, setAnchorMessageId] = useState<MessageId | null>(null);
 const [submittedMessageId, setSubmittedMessageId] = useState<MessageId | null>(null);
 const [endFollowEnabled, setEndFollowEnabled] = useState(true);
 // Android keys the safe-area padding on keyboard visibility (#5988): the
 // back gesture closes the keyboard while the editor stays focused, and a
Expand DownExpand Up@@ -458,17 +460,20 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

 useEffect(() => {
 setAnchorMessageId(null);
 lastScrolledAnchorMessageIdRef.current = null;
 setSubmittedMessageId(null);
 lastScrolledSubmittedMessageIdRef.current = null;
 setEndFollowEnabled(true);
 freeze.set(false);
 }, [freeze, selectedThreadKey]);

 useEffect(() => {
 if (
anchorMessageId === null ||
lastScrolledAnchorMessageIdRef.current === anchorMessageId ||
submittedMessageId === null ||
lastScrolledSubmittedMessageIdRef.current === submittedMessageId ||
 contentPresentationKind !== "ready" ||
 !selectedThreadFeed.some((entry) => entry.type === "message" && entry.id === anchorMessageId)
 !selectedThreadFeed.some(
 (entry) => entry.type === "message" && entry.id === submittedMessageId,
 )
 ) {
 return;
 }
Expand All@@ -478,7 +483,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 if (selectedThreadKeyRef.current !== targetThreadKey) {
 return;
 }
lastScrolledAnchorMessageIdRef.current = anchorMessageId;
lastScrolledSubmittedMessageIdRef.current = submittedMessageId;
 // Wait for the keyboard dismissal (started by blur() on send) to finish
 // before scrolling: scrollMessageToEnd freezes keyboard-driven inset
 // updates while it runs, and a close event swallowed by that freeze
Expand All@@ -488,7 +493,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 .then(() => {
 if (
 selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
 ) {
 return;
 }
Expand All@@ -497,17 +502,17 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 .catch(() => {
 if (
 selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
 ) {
 return;
 }
lastScrolledAnchorMessageIdRef.current = null;
lastScrolledSubmittedMessageIdRef.current = null;
 freeze.set(false);
 });
 });
 return () => cancelAnimationFrame(frame);
 }, [
anchorMessageId,
submittedMessageId,
 freeze,
 contentPresentationKind,
 selectedThreadFeed,
Expand All@@ -517,15 +522,34 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

 const handleSendMessage = useCallback(async () => {
 const targetThreadKey = selectedThreadKey;
 const hasUserMessage = selectedThreadFeed.some(
 (entry) => entry.type === "message" && entry.message.role === "user",
 );
 const messageId = await props.onSendMessage();
 if (messageId === null || selectedThreadKeyRef.current !== targetThreadKey) {
 return messageId;
 }

 setAnchorMessageId(messageId);
 setSubmittedMessageId(messageId);
 setAnchorMessageId(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: anchorMessageId,
 submittedMessageId: messageId,
 hasStartedTurn: props.selectedThread.latestTurn !== null,
 hasUserMessage,
 queuedMessageCount: props.selectedThreadQueueCount,
 }),
 );
 composerEditorRef.current?.blur();
 return messageId;
 }, [props.onSendMessage, selectedThreadKey]);
 }, [
 anchorMessageId,
 props.onSendMessage,
 props.selectedThread.latestTurn,
 props.selectedThreadQueueCount,
 selectedThreadFeed,
 selectedThreadKey,
 ]);

 const collapseComposer = useCallback(() => {
 composerEditorRef.current?.blur();
Expand DownExpand Up@@ -595,6 +619,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 listRef={listRef}
 freeze={freeze}
 anchorMessageId={anchorMessageId}
 submittedMessageId={submittedMessageId}
 contentInsetEndAdjustment={combinedContentInsetEndAdjustment}
 contentTopInset={0}
 contentBottomInset={estimatedOverlayHeight}
Expand Down

7 changes: 4 additions & 3 deletions
apps/mobile/src/features/threads/ThreadFeed.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ export interface ThreadFeedProps {
 readonly listRef: RefObject<LegendListRef | null>;
 readonly freeze: SharedValue<boolean>;
 readonly anchorMessageId: MessageId | null;
 readonly submittedMessageId: MessageId | null;
 readonly contentInsetEndAdjustment: SharedValue<number>;
 readonly contentTopInset?: number;
 readonly contentBottomInset?: number;
Expand DownExpand Up@@ -1546,12 +1547,12 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
 transitionEndFollow({ type: "reset" });
 }, [clearUserScrollSettle, feedThreadKey, transitionEndFollow]);
 useEffect(() => {
 if (props.anchorMessageId !== null) {
 if (props.submittedMessageId !== null) {
 clearUserScrollSettle();
 userScrollSessionRef.current = false;
 transitionEndFollow({ type: "reset" });
 }
 }, [clearUserScrollSettle, props.anchorMessageId, transitionEndFollow]);
 }, [clearUserScrollSettle, props.submittedMessageId, transitionEndFollow]);

 const expandedWorkGroupIds = useMemo(() => {
 const ids = new Set<string>();
Expand DownExpand Up@@ -1600,7 +1601,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
 resolveChatListAnchoredEndSpace(
 presentedFeed,
 props.anchorMessageId,
 (entry) => (entry.type === "message" ? entry.id : null),
 (entry) => (entry.type === "message" && entry.message.role === "user" ? entry.id : null),
 { anchorOffset: anchorTopInset + CHAT_LIST_ANCHOR_OFFSET },
 ),
 [presentedFeed, props.anchorMessageId, anchorTopInset],
Expand Down

67 changes: 66 additions & 1 deletion
apps/mobile/src/features/threads/thread-feed-live-follow.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,71 @@
import { describe, expect, it } from "vite-plus/test";

import { resolveThreadFeedLiveFollow } from "./thread-feed-live-follow";
import {
 resolveThreadFeedLiveFollow,
 resolveThreadFeedSubmissionAnchor,
} from "./thread-feed-live-follow";

describe("resolveThreadFeedSubmissionAnchor", () => {
 it("anchors the first user message in a thread", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: null,
 submittedMessageId: "first-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBe("first-message");
 });

 it("preserves the first-message anchor when another message is queued", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 1,
 }),
 ).toBe("first-message");
 });

 it("preserves the first-message anchor after its outbox entry drains", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBe("first-message");
 });

 it("does not anchor a follow-up after a user message appears", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: true,
 queuedMessageCount: 0,
 }),
 ).toBeNull();
 });

 it("does not anchor a thread that has already started a turn", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: null,
 submittedMessageId: "second-message",
 hasStartedTurn: true,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBeNull();
 });
});

describe("resolveThreadFeedLiveFollow", () => {
 it("pauses immediately when the user starts scrolling", () => {
Expand Down

18 changes: 18 additions & 0 deletions
apps/mobile/src/features/threads/thread-feed-live-follow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,24 @@ export type ThreadFeedLiveFollowEvent =
 readonly userScrollSessionActive: boolean;
 };

export function resolveThreadFeedSubmissionAnchor<AnchorId>(input: {
 readonly currentAnchorMessageId: AnchorId | null;
 readonly submittedMessageId: AnchorId;
 readonly hasStartedTurn: boolean;
 readonly hasUserMessage: boolean;
 readonly queuedMessageCount: number;
}): AnchorId | null {
 if (input.hasStartedTurn || input.hasUserMessage) {
 return null;
 }

 if (input.currentAnchorMessageId !== null) {
 return input.currentAnchorMessageId;
 }

 return input.queuedMessageCount > 0 ? null : input.submittedMessageId;
}

export function resolveThreadFeedLiveFollow(
 current: boolean,
 event: ThreadFeedLiveFollowEvent,
Expand Down

23 changes: 23 additions & 0 deletions
apps/web/src/components/ChatView.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,29 @@ describe("hasServerAcknowledgedLocalDispatch", () => {
 ).toBe(false);
 });

 it("keeps a follow-up active while its provider session is starting", () => {
 const localDispatch = createLocalDispatchSnapshot(
 makeThread({ latestTurn: completedTurn, session: readySession }),
 );

 expect(
 hasServerAcknowledgedLocalDispatch({
 localDispatch,
 phase: "connecting",
 latestTurn: completedTurn,
 latestUserMessageId: MessageId.make("message-followup"),
 session: {
 ...readySession,
 status: "starting",
 updatedAt: "2026-03-29T00:01:00.000Z",
 },
 hasPendingApproval: false,
 hasPendingUserInput: false,
 threadError: null,
 }),
 ).toBe(false);
 });

 it("acknowledges a settled newer turn", () => {
 const localDispatch = createLocalDispatchSnapshot(
 makeThread({ latestTurn: completedTurn, session: readySession }),
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/components/ChatView.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -601,6 +601,9 @@ export function hasServerAcknowledgedLocalDispatch(input: {
 if (input.hasPendingApproval || input.hasPendingUserInput || Boolean(input.threadError)) {
 return true;
 }
 if (input.phase === "connecting") {
 return false;
 }

 const latestTurn = input.latestTurn ?? null;
 const session = input.session ?? null;
Expand Down

49 changes: 21 additions & 28 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5297,21 +5297,25 @@ function ChatViewContent(props: ChatViewProps) {
 sizeBytes: image.sizeBytes,
 previewUrl: image.previewUrl,
 }));
 // Sending always returns to the live edge. The new row becomes the
 // anchored end-space target so it lands near the top while the response
 // streams into the reserved space below it.
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 const shouldAnchorFirstMessage =
 activeThread.latestTurn === null &&
 !timelineMessages.some((message) => message.role === "user");
 if (shouldAnchorFirstMessage) {
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 } else {
 scrollToEnd();
 }
 setOptimisticUserMessages((existing) => [
 ...existing,
 {
Expand DownExpand Up@@ -5815,19 +5819,7 @@ function ChatViewContent(props: ChatViewProps) {
 beginLocalDispatch({ preparingWorktree: false });
 setThreadError(threadIdForSend, null);

 // Position this sent row once LegendList has measured the anchored tail.
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 scrollToEnd();

 setOptimisticUserMessages((existing) => [
 ...existing,
Expand DownExpand Up@@ -5922,6 +5914,7 @@ function ChatViewContent(props: ChatViewProps) {
 persistThreadSettingsForNextTurn,
 resetLocalDispatch,
 runtimeMode,
 scrollToEnd,
 setComposerDraftInteractionMode,
 setThreadError,
 startThreadTurn,
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
fix(chat): stop pushing follow-up messages to the top#7897

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

 Merged

t3dotgg
merged 3 commits into

from

Aug 22, 2026
 Merged


fix(chat): stop pushing follow-up messages to the top
#7897
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
606d983

fix(chat): stop pushing follow-up messages to the top


t3dotgg Aug 22, 2026
fba3c7c

fix(mobile): preserve the first queued message anchor


t3dotgg Aug 22, 2026
6d72b36

fix(chat): keep the working row stable while sessions start


t3dotgg Aug 22, 2026

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


49 changes: 37 additions & 12 deletions
apps/mobile/src/features/threads/ThreadDetailScreen.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,6 +79,7 @@ import {
} from "./ThreadComposer";
import { ThreadFeed } from "./ThreadFeed";
import type { ThreadContentPresentation } from "./threadContentPresentation";
import { resolveThreadFeedSubmissionAnchor } from "./thread-feed-live-follow";

export interface ThreadDetailScreenProps {
 readonly selectedThread: OrchestrationThreadShell;
Expand DownExpand Up@@ -257,9 +258,10 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 const listRef = useRef<LegendListRef>(null);
 const feedTouchStartRef = useRef<{ pageX: number; pageY: number } | null>(null);
 const selectedThreadKeyRef = useRef(selectedThreadKey);
 const lastScrolledAnchorMessageIdRef = useRef<MessageId | null>(null);
 const lastScrolledSubmittedMessageIdRef = useRef<MessageId | null>(null);
 const [composerExpanded, setComposerExpanded] = useState(false);
 const [anchorMessageId, setAnchorMessageId] = useState<MessageId | null>(null);
 const [submittedMessageId, setSubmittedMessageId] = useState<MessageId | null>(null);
 const [endFollowEnabled, setEndFollowEnabled] = useState(true);
 // Android keys the safe-area padding on keyboard visibility (#5988): the
 // back gesture closes the keyboard while the editor stays focused, and a
Expand DownExpand Up@@ -458,17 +460,20 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

 useEffect(() => {
 setAnchorMessageId(null);
 lastScrolledAnchorMessageIdRef.current = null;
 setSubmittedMessageId(null);
 lastScrolledSubmittedMessageIdRef.current = null;
 setEndFollowEnabled(true);
 freeze.set(false);
 }, [freeze, selectedThreadKey]);

 useEffect(() => {
 if (
anchorMessageId === null ||
lastScrolledAnchorMessageIdRef.current === anchorMessageId ||
submittedMessageId === null ||
lastScrolledSubmittedMessageIdRef.current === submittedMessageId ||
 contentPresentationKind !== "ready" ||
 !selectedThreadFeed.some((entry) => entry.type === "message" && entry.id === anchorMessageId)
 !selectedThreadFeed.some(
 (entry) => entry.type === "message" && entry.id === submittedMessageId,
 )
 ) {
 return;
 }
Expand All@@ -478,7 +483,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 if (selectedThreadKeyRef.current !== targetThreadKey) {
 return;
 }
lastScrolledAnchorMessageIdRef.current = anchorMessageId;
lastScrolledSubmittedMessageIdRef.current = submittedMessageId;
 // Wait for the keyboard dismissal (started by blur() on send) to finish
 // before scrolling: scrollMessageToEnd freezes keyboard-driven inset
 // updates while it runs, and a close event swallowed by that freeze
Expand All@@ -488,7 +493,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 .then(() => {
 if (
 selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
 ) {
 return;
 }
Expand All@@ -497,17 +502,17 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 .catch(() => {
 if (
 selectedThreadKeyRef.current !== targetThreadKey ||
lastScrolledAnchorMessageIdRef.current !== anchorMessageId
lastScrolledSubmittedMessageIdRef.current !== submittedMessageId
 ) {
 return;
 }
lastScrolledAnchorMessageIdRef.current = null;
lastScrolledSubmittedMessageIdRef.current = null;
 freeze.set(false);
 });
 });
 return () => cancelAnimationFrame(frame);
 }, [
anchorMessageId,
submittedMessageId,
 freeze,
 contentPresentationKind,
 selectedThreadFeed,
Expand All@@ -517,15 +522,34 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread

 const handleSendMessage = useCallback(async () => {
 const targetThreadKey = selectedThreadKey;
 const hasUserMessage = selectedThreadFeed.some(
 (entry) => entry.type === "message" && entry.message.role === "user",
 );
 const messageId = await props.onSendMessage();
 if (messageId === null || selectedThreadKeyRef.current !== targetThreadKey) {
 return messageId;
 }

 setAnchorMessageId(messageId);
 setSubmittedMessageId(messageId);
 setAnchorMessageId(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: anchorMessageId,
 submittedMessageId: messageId,
 hasStartedTurn: props.selectedThread.latestTurn !== null,
 hasUserMessage,
 queuedMessageCount: props.selectedThreadQueueCount,
 }),
 );
 composerEditorRef.current?.blur();
 return messageId;
 }, [props.onSendMessage, selectedThreadKey]);
 }, [
 anchorMessageId,
 props.onSendMessage,
 props.selectedThread.latestTurn,
 props.selectedThreadQueueCount,
 selectedThreadFeed,
 selectedThreadKey,
 ]);

 const collapseComposer = useCallback(() => {
 composerEditorRef.current?.blur();
Expand DownExpand Up@@ -595,6 +619,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
 listRef={listRef}
 freeze={freeze}
 anchorMessageId={anchorMessageId}
 submittedMessageId={submittedMessageId}
 contentInsetEndAdjustment={combinedContentInsetEndAdjustment}
 contentTopInset={0}
 contentBottomInset={estimatedOverlayHeight}
Expand Down

7 changes: 4 additions & 3 deletions
apps/mobile/src/features/threads/ThreadFeed.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -151,6 +151,7 @@ export interface ThreadFeedProps {
 readonly listRef: RefObject<LegendListRef | null>;
 readonly freeze: SharedValue<boolean>;
 readonly anchorMessageId: MessageId | null;
 readonly submittedMessageId: MessageId | null;
 readonly contentInsetEndAdjustment: SharedValue<number>;
 readonly contentTopInset?: number;
 readonly contentBottomInset?: number;
Expand DownExpand Up@@ -1546,12 +1547,12 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
 transitionEndFollow({ type: "reset" });
 }, [clearUserScrollSettle, feedThreadKey, transitionEndFollow]);
 useEffect(() => {
 if (props.anchorMessageId !== null) {
 if (props.submittedMessageId !== null) {
 clearUserScrollSettle();
 userScrollSessionRef.current = false;
 transitionEndFollow({ type: "reset" });
 }
 }, [clearUserScrollSettle, props.anchorMessageId, transitionEndFollow]);
 }, [clearUserScrollSettle, props.submittedMessageId, transitionEndFollow]);

 const expandedWorkGroupIds = useMemo(() => {
 const ids = new Set<string>();
Expand DownExpand Up@@ -1600,7 +1601,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
 resolveChatListAnchoredEndSpace(
 presentedFeed,
 props.anchorMessageId,
 (entry) => (entry.type === "message" ? entry.id : null),
 (entry) => (entry.type === "message" && entry.message.role === "user" ? entry.id : null),
 { anchorOffset: anchorTopInset + CHAT_LIST_ANCHOR_OFFSET },
 ),
 [presentedFeed, props.anchorMessageId, anchorTopInset],
Expand Down

67 changes: 66 additions & 1 deletion
apps/mobile/src/features/threads/thread-feed-live-follow.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,71 @@
import { describe, expect, it } from "vite-plus/test";

import { resolveThreadFeedLiveFollow } from "./thread-feed-live-follow";
import {
 resolveThreadFeedLiveFollow,
 resolveThreadFeedSubmissionAnchor,
} from "./thread-feed-live-follow";

describe("resolveThreadFeedSubmissionAnchor", () => {
 it("anchors the first user message in a thread", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: null,
 submittedMessageId: "first-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBe("first-message");
 });

 it("preserves the first-message anchor when another message is queued", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 1,
 }),
 ).toBe("first-message");
 });

 it("preserves the first-message anchor after its outbox entry drains", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBe("first-message");
 });

 it("does not anchor a follow-up after a user message appears", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: "first-message",
 submittedMessageId: "second-message",
 hasStartedTurn: false,
 hasUserMessage: true,
 queuedMessageCount: 0,
 }),
 ).toBeNull();
 });

 it("does not anchor a thread that has already started a turn", () => {
 expect(
 resolveThreadFeedSubmissionAnchor({
 currentAnchorMessageId: null,
 submittedMessageId: "second-message",
 hasStartedTurn: true,
 hasUserMessage: false,
 queuedMessageCount: 0,
 }),
 ).toBeNull();
 });
});

describe("resolveThreadFeedLiveFollow", () => {
 it("pauses immediately when the user starts scrolling", () => {
Expand Down

18 changes: 18 additions & 0 deletions
apps/mobile/src/features/threads/thread-feed-live-follow.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,24 @@ export type ThreadFeedLiveFollowEvent =
 readonly userScrollSessionActive: boolean;
 };

export function resolveThreadFeedSubmissionAnchor<AnchorId>(input: {
 readonly currentAnchorMessageId: AnchorId | null;
 readonly submittedMessageId: AnchorId;
 readonly hasStartedTurn: boolean;
 readonly hasUserMessage: boolean;
 readonly queuedMessageCount: number;
}): AnchorId | null {
 if (input.hasStartedTurn || input.hasUserMessage) {
 return null;
 }

 if (input.currentAnchorMessageId !== null) {
 return input.currentAnchorMessageId;
 }

 return input.queuedMessageCount > 0 ? null : input.submittedMessageId;
}

export function resolveThreadFeedLiveFollow(
 current: boolean,
 event: ThreadFeedLiveFollowEvent,
Expand Down

23 changes: 23 additions & 0 deletions
apps/web/src/components/ChatView.logic.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -638,6 +638,29 @@ describe("hasServerAcknowledgedLocalDispatch", () => {
 ).toBe(false);
 });

 it("keeps a follow-up active while its provider session is starting", () => {
 const localDispatch = createLocalDispatchSnapshot(
 makeThread({ latestTurn: completedTurn, session: readySession }),
 );

 expect(
 hasServerAcknowledgedLocalDispatch({
 localDispatch,
 phase: "connecting",
 latestTurn: completedTurn,
 latestUserMessageId: MessageId.make("message-followup"),
 session: {
 ...readySession,
 status: "starting",
 updatedAt: "2026-03-29T00:01:00.000Z",
 },
 hasPendingApproval: false,
 hasPendingUserInput: false,
 threadError: null,
 }),
 ).toBe(false);
 });

 it("acknowledges a settled newer turn", () => {
 const localDispatch = createLocalDispatchSnapshot(
 makeThread({ latestTurn: completedTurn, session: readySession }),
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/components/ChatView.logic.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -601,6 +601,9 @@ export function hasServerAcknowledgedLocalDispatch(input: {
 if (input.hasPendingApproval || input.hasPendingUserInput || Boolean(input.threadError)) {
 return true;
 }
 if (input.phase === "connecting") {
 return false;
 }

 const latestTurn = input.latestTurn ?? null;
 const session = input.session ?? null;
Expand Down

49 changes: 21 additions & 28 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5297,21 +5297,25 @@ function ChatViewContent(props: ChatViewProps) {
 sizeBytes: image.sizeBytes,
 previewUrl: image.previewUrl,
 }));
 // Sending always returns to the live edge. The new row becomes the
 // anchored end-space target so it lands near the top while the response
 // streams into the reserved space below it.
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 const shouldAnchorFirstMessage =
 activeThread.latestTurn === null &&
 !timelineMessages.some((message) => message.role === "user");
 if (shouldAnchorFirstMessage) {
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 } else {
 scrollToEnd();
 }
 setOptimisticUserMessages((existing) => [
 ...existing,
 {
Expand DownExpand Up@@ -5815,19 +5819,7 @@ function ChatViewContent(props: ChatViewProps) {
 beginLocalDispatch({ preparingWorktree: false });
 setThreadError(threadIdForSend, null);

 // Position this sent row once LegendList has measured the anchored tail.
 isAtEndRef.current = true;
 timelineScrollModeRef.current = "anchoring-new-turn";
 liveFollowUserScrollGenerationRef.current = anchorUserScrollGenerationRef.current;
 setTimelineLiveFollowEnabled(true);
 pendingTimelineAnchorRef.current = messageIdForSend;
 activeTimelineAnchorIndexRef.current = null;
 showScrollDebouncer.current.cancel();
 setShowScrollToBottom(false);
 setTimelineAnchor({
 threadKey: scopedThreadKey(scopeThreadRef(activeThread.environmentId, threadIdForSend)),
 messageId: messageIdForSend,
 });
 scrollToEnd();

 setOptimisticUserMessages((existing) => [
 ...existing,
Expand DownExpand Up@@ -5922,6 +5914,7 @@ function ChatViewContent(props: ChatViewProps) {
 persistThreadSettingsForNextTurn,
 resetLocalDispatch,
 runtimeMode,
 scrollToEnd,
 setComposerDraftInteractionMode,
 setThreadError,
 startThreadTurn,
Expand Down
Loading
Loading