@@ -79,6 +79,7 @@ import {
7979} from "./ThreadComposer" ;
8080import { ThreadFeed } from "./ThreadFeed" ;
8181import type { ThreadContentPresentation } from "./threadContentPresentation" ;
82+ import { resolveThreadFeedSubmissionAnchor } from "./thread-feed-live-follow" ;
8283
8384export interface ThreadDetailScreenProps {
8485 readonly selectedThread : OrchestrationThreadShell ;
@@ -521,21 +522,34 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
521522
522523 const handleSendMessage = useCallback ( async ( ) => {
523524 const targetThreadKey = selectedThreadKey ;
524- const shouldAnchorFirstMessage =
525- props . selectedThread . latestTurn === null &&
526- ! selectedThreadFeed . some (
527- ( entry ) => entry . type === "message" && entry . message . role === "user" ,
528- ) ;
525+ const hasUserMessage = selectedThreadFeed . some (
526+ ( entry ) => entry . type === "message" && entry . message . role === "user" ,
527+ ) ;
529528 const messageId = await props . onSendMessage ( ) ;
530529 if ( messageId === null || selectedThreadKeyRef . current !== targetThreadKey ) {
531530 return messageId ;
532531 }
533532
534533 setSubmittedMessageId ( messageId ) ;
535- setAnchorMessageId ( shouldAnchorFirstMessage ? messageId : null ) ;
534+ setAnchorMessageId (
535+ resolveThreadFeedSubmissionAnchor ( {
536+ currentAnchorMessageId : anchorMessageId ,
537+ submittedMessageId : messageId ,
538+ hasStartedTurn : props . selectedThread . latestTurn !== null ,
539+ hasUserMessage,
540+ queuedMessageCount : props . selectedThreadQueueCount ,
541+ } ) ,
542+ ) ;
536543 composerEditorRef . current ?. blur ( ) ;
537544 return messageId ;
538- } , [ props . onSendMessage , props . selectedThread . latestTurn , selectedThreadFeed , selectedThreadKey ] ) ;
545+ } , [
546+ anchorMessageId ,
547+ props . onSendMessage ,
548+ props . selectedThread . latestTurn ,
549+ props . selectedThreadQueueCount ,
550+ selectedThreadFeed ,
551+ selectedThreadKey ,
552+ ] ) ;
539553
540554 const collapseComposer = useCallback ( ( ) => {
541555 composerEditorRef . current ?. blur ( ) ;
0 commit comments