@@ -18,7 +18,7 @@ import {
1818 sortWorkingThreadsBySend ,
1919} from "@t3tools/client-runtime/state/thread-inbox" ;
2020import {
21- sortActiveThreadsByOrderKey ,
21+ sortActiveThreads ,
2222 resolveSettledThreadTimestamp ,
2323 sortPinnedThreadsByOrderKey ,
2424 sortSettledThreads ,
@@ -187,18 +187,21 @@ export function sortThreadsForListV2<
187187 T extends {
188188 readonly id : string ;
189189 readonly createdAt : string ;
190+ readonly updatedAt ?: string ;
191+ readonly latestUserMessageAt ?: string | null ;
190192 readonly unsettledAt ?: string | null | undefined ;
191193 readonly activeOrderKey ?: string | null | undefined ;
192194 readonly environmentId ?: string | undefined ;
193195 } ,
194- > ( threads : readonly T [ ] ) : T [ ] {
195- return sortActiveThreadsByOrderKey ( threads ) ;
196+ > ( threads : readonly T [ ] , sortByLastMessage = false ) : T [ ] {
197+ return sortActiveThreads ( threads , sortByLastMessage ) ;
196198}
197199
198200export function getThreadListV2OrderedSection ( input : {
199201 readonly threads : readonly EnvironmentThreadShell [ ] ;
200202 readonly section : "pinned" | "active" ;
201203 readonly pendingOrder ?: PendingThreadOrder | null ;
204+ readonly sortByLastMessage ?: boolean ;
202205 readonly now : string ;
203206 readonly settlementEnvironmentIds ?: ReadonlySet < EnvironmentId > ;
204207 readonly snoozeEnvironmentIds ?: ReadonlySet < EnvironmentId > ;
@@ -226,12 +229,14 @@ export function getThreadListV2OrderedSection(input: {
226229 const ordered =
227230 input . section === "pinned"
228231 ? sortPinnedThreadsByOrderKey ( threads )
229- : sortActiveThreadsByOrderKey ( threads ) ;
232+ : sortActiveThreads ( threads , input . sortByLastMessage ) ;
230233 const pending =
231234 input . pendingOrder ?. section === input . section
232235 ? reconcilePendingThreadOrder ( input . pendingOrder , ordered )
233236 : null ;
234- return applyPendingThreadOrder ( ordered , input . section , pending ) ;
237+ return input . section === "active" && input . sortByLastMessage
238+ ? ordered
239+ : applyPendingThreadOrder ( ordered , input . section , pending ) ;
235240}
236241
237242export interface ThreadListV2Item {
@@ -544,6 +549,7 @@ function sortSettledThreadsReusingLast(
544549
545550export function buildThreadListV2Items ( input : {
546551 readonly pendingOrder ?: PendingThreadOrder | null ;
552+ readonly sortByLastMessage ?: boolean ;
547553 readonly threads : ReadonlyArray < EnvironmentThreadShell > ;
548554 readonly environmentId : EnvironmentId | null ;
549555 readonly projectRefs ?: ReadonlyArray < {
@@ -638,7 +644,9 @@ export function buildThreadListV2Items(input: {
638644
639645 const orderedActive = workingShelfEnabled
640646 ? sortInboxThreadsByReturn ( active , input . inboxReturnAt )
641- : applyPendingThreadOrder ( sortThreadsForListV2 ( active ) , "active" , pending ) ;
647+ : input . sortByLastMessage
648+ ? sortActiveThreads ( active , true )
649+ : applyPendingThreadOrder ( sortThreadsForListV2 ( active ) , "active" , pending ) ;
642650 const orderedWorking = sortWorkingThreadsBySend ( working ) ;
643651 const orderedSnoozed = [ ...snoozed ] . sort (
644652 ( left , right ) =>
0 commit comments