@@ -144,6 +144,7 @@ import {
144144} from "@t3tools/mobile-markdown-text/links" ;
145145import {
146146 deriveThreadFeedPresentation ,
147+ deriveUnsettledTurnId ,
147148 isContextCompactionActivityGroup ,
148149 type ThreadFeedEntry ,
149150 type ThreadFeedLatestTurn ,
@@ -158,6 +159,7 @@ import {
158159 collapsedWorkLogHeight ,
159160 ThreadAgentSpawnCard ,
160161 ThreadDisclosureChevron ,
162+ ThreadReasoningRow ,
161163 ThreadWorkGroupToggle ,
162164 ThreadThinkingRow ,
163165 ThreadWorkLog ,
@@ -193,6 +195,9 @@ import {
193195 ThreadMarkdownImageView ,
194196} from "./ThreadMarkdownImage" ;
195197
198+ /** `ml-7` gutter plus the `px-3` padding of the expanded reasoning container. */
199+ const REASONING_CONTENT_INSET = 52 ;
200+
196201const WIDE_MARKDOWN_BLOCK_OPTIONS = {
197202 // Native iOS blockquotes and adjacent selectable text are separate layout
198203 // chunks. Giving their shrink-to-fit bubble a definite width keeps both
@@ -1348,14 +1353,17 @@ function renderFeedEntry(
13481353 > & {
13491354 readonly copiedRowId : string | null ;
13501355 readonly expandedWorkRows : Record < string , boolean > ;
1356+ readonly expandedReasoningMessageIds : ReadonlySet < string > ;
13511357 readonly workRowSizing : ReturnType < typeof deriveThreadWorkLogSizing > ;
13521358 readonly workGroupScrollPositions : Map < string , ThreadWorkGroupScrollPosition > ;
13531359 readonly terminalAssistantMessageIds : ReadonlySet < string > ;
13541360 readonly unsettledTurnId : TurnId | null ;
1361+ readonly isWorking : boolean ;
13551362 readonly onCopyWorkRow : ( rowId : string , value : string ) => void ;
13561363 readonly onToggleWorkGroup : ( groupId : string , anchorKey : string ) => void ;
13571364 readonly onToggleWorkRow : ( rowId : string , anchorKey : string ) => void ;
13581365 readonly onToggleTurnFold : ( turnId : TurnId ) => void ;
1366+ readonly onToggleReasoning : ( messageId : string ) => void ;
13591367 readonly onPressPreview : ( source : FilePreviewSource ) => void ;
13601368 readonly onPressVideo : ( attachment : ChatFileAttachment , sourceIdentifier : string ) => void ;
13611369 readonly markdownLinkHandlers : MarkdownLinkHandlers ;
@@ -1467,6 +1475,38 @@ function renderFeedEntry(
14671475
14681476 if ( entry . type === "message" ) {
14691477 const { message } = entry ;
1478+ if ( message . role === "reasoning" ) {
1479+ // Only the live turn may claim to still be thinking, and only while the
1480+ // thread is actually working: a block left open by a crashed provider
1481+ // must not shimmer on a turn that settled long ago. Same test as web.
1482+ const liveReasoning =
1483+ Boolean ( message . streaming ) &&
1484+ props . isWorking &&
1485+ message . turnId !== null &&
1486+ message . turnId === props . unsettledTurnId ;
1487+ return (
1488+ < ThreadReasoningRow
1489+ rowSizing = { props . workRowSizing }
1490+ iconSubtleColor = { iconSubtleColor }
1491+ expanded = { props . expandedReasoningMessageIds . has ( message . id ) }
1492+ label = { liveReasoning ? "Thinking" : "Thought" }
1493+ streaming = { liveReasoning }
1494+ onToggle = { ( ) => props . onToggleReasoning ( message . id ) }
1495+ >
1496+ < MarkdownImageAvailableWidthContext
1497+ value = { props . markdownContentWidth - REASONING_CONTENT_INSET }
1498+ >
1499+ < AssistantMarkdownContent
1500+ markdown = { message . text }
1501+ markdownStyles = { markdownStyles . assistant }
1502+ linkHandlers = { props . markdownLinkHandlers }
1503+ renderImage = { props . renderMarkdownImage }
1504+ skills = { props . skills }
1505+ />
1506+ </ MarkdownImageAvailableWidthContext >
1507+ </ ThreadReasoningRow >
1508+ ) ;
1509+ }
14701510 const isUser = message . role === "user" ;
14711511 const renderedText = renderAssistantCitationsAsText ( message . text ) ;
14721512 const styles = isUser ? markdownStyles . user : markdownStyles . assistant ;
@@ -1960,13 +2000,21 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
19602000 readonly expandedWorkGroups : Record < string , boolean > ;
19612001 readonly expandedWorkRows : Record < string , boolean > ;
19622002 readonly expandedTurnIds : ReadonlySet < TurnId > ;
2003+ readonly expandedReasoningMessageIds : ReadonlySet < string > ;
19632004 } > ( {
19642005 copiedRowId : null ,
19652006 expandedWorkGroups : { } ,
19662007 expandedWorkRows : { } ,
19672008 expandedTurnIds : new Set ( ) ,
2009+ expandedReasoningMessageIds : new Set ( ) ,
19682010 } ) ;
1969- const { copiedRowId, expandedWorkGroups, expandedWorkRows, expandedTurnIds } = interactionState ;
2011+ const {
2012+ copiedRowId,
2013+ expandedWorkGroups,
2014+ expandedWorkRows,
2015+ expandedTurnIds,
2016+ expandedReasoningMessageIds,
2017+ } = interactionState ;
19702018 const [ expandedFile , setExpandedFile ] = useState < FilePreviewSource | null > ( null ) ;
19712019 const [ expandedVideo , setExpandedVideo ] = useState < VideoPreviewSource | null > ( null ) ;
19722020 const fileShareSourceIdentifier = useId ( ) ;
@@ -2218,11 +2266,9 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
22182266 ) ;
22192267 const markdownStyles = useMarkdownStyles ( onMarkdownLinkPress , renderMarkdownImage ) ;
22202268 const reviewCommentColors = useReviewCommentColors ( ) ;
2221- const unsettledTurnId =
2222- props . latestTurn &&
2223- ( props . latestTurn . completedAt === null || props . latestTurn . state === "running" )
2224- ? props . latestTurn . turnId
2225- : null ;
2269+ // One definition of "still live", shared with the fold derivation: two
2270+ // copies of this test are what let a row and the fold beside it disagree.
2271+ const unsettledTurnId = deriveUnsettledTurnId ( props . latestTurn ?? null ) ;
22262272 // LegendList does not invalidate visible rows when only the renderItem closure changes.
22272273 // Include turn completion so unchanged message rows reveal their footer and spacing
22282274 // even when the final message update arrives before the turn settles.
@@ -2232,6 +2278,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
22322278 unsettledTurnId,
22332279 copiedRowId,
22342280 expandedWorkRows,
2281+ expandedReasoningMessageIds,
22352282 workRowSizing,
22362283 iconSubtleColor,
22372284 markdownStyles,
@@ -2245,6 +2292,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
22452292 unsettledTurnId ,
22462293 copiedRowId ,
22472294 expandedWorkRows ,
2295+ expandedReasoningMessageIds ,
22482296 workRowSizing ,
22492297 iconSubtleColor ,
22502298 markdownStyles ,
@@ -2517,7 +2565,13 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
25172565 if ( disclosureAnchorKeyRef . current !== null ) {
25182566 settleDisclosureAfterLayout ( ) ;
25192567 }
2520- } , [ expandedTurnIds , expandedWorkGroups , expandedWorkRows , settleDisclosureAfterLayout ] ) ;
2568+ } , [
2569+ expandedTurnIds ,
2570+ expandedWorkGroups ,
2571+ expandedWorkRows ,
2572+ expandedReasoningMessageIds ,
2573+ settleDisclosureAfterLayout ,
2574+ ] ) ;
25212575
25222576 const handleItemSizeChanged = useCallback ( ( ) => {
25232577 if ( disclosureAnchorKeyRef . current !== null ) {
@@ -2600,6 +2654,24 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
26002654 [ suspendEndScrollMaintenanceForDisclosure ] ,
26012655 ) ;
26022656
2657+ const onToggleReasoning = useCallback (
2658+ ( messageId : string ) => {
2659+ // The anchor must be the feed row id, which for a message row is the
2660+ // message id, or position restoration is skipped for every row.
2661+ suspendEndScrollMaintenanceForDisclosure ( messageId ) ;
2662+ setInteractionState ( ( current ) => {
2663+ const next = new Set ( current . expandedReasoningMessageIds ) ;
2664+ if ( next . has ( messageId ) ) {
2665+ next . delete ( messageId ) ;
2666+ } else {
2667+ next . add ( messageId ) ;
2668+ }
2669+ return { ...current , expandedReasoningMessageIds : next } ;
2670+ } ) ;
2671+ } ,
2672+ [ suspendEndScrollMaintenanceForDisclosure ] ,
2673+ ) ;
2674+
26032675 const onPressPreview = useCallback ( ( source : FilePreviewSource ) => {
26042676 setExpandedFile ( ( current ) => current ?? source ) ;
26052677 } , [ ] ) ;
@@ -2626,6 +2698,12 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
26262698 return undefined ;
26272699 }
26282700 switch ( entry . type ) {
2701+ case "message" :
2702+ // A collapsed reasoning row is the same chrome as a work toggle.
2703+ return entry . message . role === "reasoning" &&
2704+ ! expandedReasoningMessageIds . has ( entry . message . id )
2705+ ? WORK_GROUP_TOGGLE_HEIGHT
2706+ : undefined ;
26292707 case "turn-fold" :
26302708 return TURN_FOLD_HEIGHT ;
26312709 case "work-toggle" :
@@ -2644,7 +2722,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
26442722 return undefined ;
26452723 }
26462724 } ,
2647- [ expandedWorkRows , workRowSizing . fixedRowHeight ] ,
2725+ [ expandedReasoningMessageIds , expandedWorkRows , workRowSizing . fixedRowHeight ] ,
26482726 ) ;
26492727
26502728 // Disclosures can mount existing offscreen rows as well as new work rows.
@@ -2662,14 +2740,17 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
26622740 onEditPendingMessage : props . onEditPendingMessage ,
26632741 copiedRowId,
26642742 expandedWorkRows,
2743+ expandedReasoningMessageIds,
26652744 workRowSizing,
26662745 workGroupScrollPositions,
26672746 terminalAssistantMessageIds,
26682747 unsettledTurnId,
2748+ isWorking : props . activeWorkStartedAt !== null ,
26692749 onCopyWorkRow,
26702750 onToggleWorkGroup,
26712751 onToggleWorkRow,
26722752 onToggleTurnFold,
2753+ onToggleReasoning,
26732754 onPressPreview,
26742755 onPressVideo,
26752756 markdownLinkHandlers,
@@ -2696,10 +2777,12 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
26962777 copiedRowId ,
26972778 disclosureToggleSettling ,
26982779 expandedWorkRows ,
2780+ expandedReasoningMessageIds ,
26992781 workRowSizing ,
27002782 workGroupScrollPositions ,
27012783 terminalAssistantMessageIds ,
27022784 unsettledTurnId ,
2785+ props . activeWorkStartedAt ,
27032786 iconSubtleColor ,
27042787 screenColor ,
27052788 userBubbleColor ,
@@ -2713,6 +2796,7 @@ export const ThreadFeed = memo(function ThreadFeed(props: ThreadFeedProps) {
27132796 markdownLinkHandlers ,
27142797 onPressPreview ,
27152798 onPressVideo ,
2799+ onToggleReasoning ,
27162800 onToggleTurnFold ,
27172801 onToggleWorkGroup ,
27182802 onToggleWorkRow ,
0 commit comments