@@ -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 ;
@@ -257,9 +258,10 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
257258 const listRef = useRef < LegendListRef > ( null ) ;
258259 const feedTouchStartRef = useRef < { pageX : number ; pageY : number } | null > ( null ) ;
259260 const selectedThreadKeyRef = useRef ( selectedThreadKey ) ;
260- const lastScrolledAnchorMessageIdRef = useRef < MessageId | null > ( null ) ;
261+ const lastScrolledSubmittedMessageIdRef = useRef < MessageId | null > ( null ) ;
261262 const [ composerExpanded , setComposerExpanded ] = useState ( false ) ;
262263 const [ anchorMessageId , setAnchorMessageId ] = useState < MessageId | null > ( null ) ;
264+ const [ submittedMessageId , setSubmittedMessageId ] = useState < MessageId | null > ( null ) ;
263265 const [ endFollowEnabled , setEndFollowEnabled ] = useState ( true ) ;
264266 // Android keys the safe-area padding on keyboard visibility (#5988): the
265267 // back gesture closes the keyboard while the editor stays focused, and a
@@ -458,17 +460,20 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
458460
459461 useEffect ( ( ) => {
460462 setAnchorMessageId ( null ) ;
461- lastScrolledAnchorMessageIdRef . current = null ;
463+ setSubmittedMessageId ( null ) ;
464+ lastScrolledSubmittedMessageIdRef . current = null ;
462465 setEndFollowEnabled ( true ) ;
463466 freeze . set ( false ) ;
464467 } , [ freeze , selectedThreadKey ] ) ;
465468
466469 useEffect ( ( ) => {
467470 if (
468- anchorMessageId === null ||
469- lastScrolledAnchorMessageIdRef . current === anchorMessageId ||
471+ submittedMessageId === null ||
472+ lastScrolledSubmittedMessageIdRef . current === submittedMessageId ||
470473 contentPresentationKind !== "ready" ||
471- ! selectedThreadFeed . some ( ( entry ) => entry . type === "message" && entry . id === anchorMessageId )
474+ ! selectedThreadFeed . some (
475+ ( entry ) => entry . type === "message" && entry . id === submittedMessageId ,
476+ )
472477 ) {
473478 return ;
474479 }
@@ -478,7 +483,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
478483 if ( selectedThreadKeyRef . current !== targetThreadKey ) {
479484 return ;
480485 }
481- lastScrolledAnchorMessageIdRef . current = anchorMessageId ;
486+ lastScrolledSubmittedMessageIdRef . current = submittedMessageId ;
482487 // Wait for the keyboard dismissal (started by blur() on send) to finish
483488 // before scrolling: scrollMessageToEnd freezes keyboard-driven inset
484489 // updates while it runs, and a close event swallowed by that freeze
@@ -488,7 +493,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
488493 . then ( ( ) => {
489494 if (
490495 selectedThreadKeyRef . current !== targetThreadKey ||
491- lastScrolledAnchorMessageIdRef . current !== anchorMessageId
496+ lastScrolledSubmittedMessageIdRef . current !== submittedMessageId
492497 ) {
493498 return ;
494499 }
@@ -497,17 +502,17 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
497502 . catch ( ( ) => {
498503 if (
499504 selectedThreadKeyRef . current !== targetThreadKey ||
500- lastScrolledAnchorMessageIdRef . current !== anchorMessageId
505+ lastScrolledSubmittedMessageIdRef . current !== submittedMessageId
501506 ) {
502507 return ;
503508 }
504- lastScrolledAnchorMessageIdRef . current = null ;
509+ lastScrolledSubmittedMessageIdRef . current = null ;
505510 freeze . set ( false ) ;
506511 } ) ;
507512 } ) ;
508513 return ( ) => cancelAnimationFrame ( frame ) ;
509514 } , [
510- anchorMessageId ,
515+ submittedMessageId ,
511516 freeze ,
512517 contentPresentationKind ,
513518 selectedThreadFeed ,
@@ -517,15 +522,34 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
517522
518523 const handleSendMessage = useCallback ( async ( ) => {
519524 const targetThreadKey = selectedThreadKey ;
525+ const hasUserMessage = selectedThreadFeed . some (
526+ ( entry ) => entry . type === "message" && entry . message . role === "user" ,
527+ ) ;
520528 const messageId = await props . onSendMessage ( ) ;
521529 if ( messageId === null || selectedThreadKeyRef . current !== targetThreadKey ) {
522530 return messageId ;
523531 }
524532
525- setAnchorMessageId ( messageId ) ;
533+ setSubmittedMessageId ( messageId ) ;
534+ setAnchorMessageId (
535+ resolveThreadFeedSubmissionAnchor ( {
536+ currentAnchorMessageId : anchorMessageId ,
537+ submittedMessageId : messageId ,
538+ hasStartedTurn : props . selectedThread . latestTurn !== null ,
539+ hasUserMessage,
540+ queuedMessageCount : props . selectedThreadQueueCount ,
541+ } ) ,
542+ ) ;
526543 composerEditorRef . current ?. blur ( ) ;
527544 return messageId ;
528- } , [ props . onSendMessage , selectedThreadKey ] ) ;
545+ } , [
546+ anchorMessageId ,
547+ props . onSendMessage ,
548+ props . selectedThread . latestTurn ,
549+ props . selectedThreadQueueCount ,
550+ selectedThreadFeed ,
551+ selectedThreadKey ,
552+ ] ) ;
529553
530554 const collapseComposer = useCallback ( ( ) => {
531555 composerEditorRef . current ?. blur ( ) ;
@@ -595,6 +619,7 @@ export const ThreadDetailScreen = memo(function ThreadDetailScreen(props: Thread
595619 listRef = { listRef }
596620 freeze = { freeze }
597621 anchorMessageId = { anchorMessageId }
622+ submittedMessageId = { submittedMessageId }
598623 contentInsetEndAdjustment = { combinedContentInsetEndAdjustment }
599624 contentTopInset = { 0 }
600625 contentBottomInset = { estimatedOverlayHeight }
0 commit comments