@@ -62,28 +62,31 @@ function pullRequestSettles(
6262 return pullRequestAt >= userAnchorAt ;
6363}
6464
65- export function shouldAutoSettleThread ( input : {
65+ export function resolveAutoSettlementAt ( input : {
6666 readonly thread : OrchestrationThreadShell ;
6767 readonly pullRequest : SettlementPullRequest | null ;
6868 readonly now : string ;
6969 readonly autoSettleAfterDays : number | null ;
7070 readonly autoSettleOnMerge : boolean ;
71- } ) : boolean {
71+ } ) : string | null {
7272 const { thread, pullRequest } = input ;
73- if ( ! isAutoSettlementCandidate ( thread , input . now ) ) return false ;
74- if ( pullRequest !== null ) {
75- if ( pullRequestSettles ( thread , pullRequest , input . autoSettleOnMerge ) ) return true ;
76- if ( pullRequest . state === "open" ) return false ;
77- }
78- if ( input . autoSettleAfterDays === null ) return false ;
73+ if ( ! isAutoSettlementCandidate ( thread , input . now ) ) return null ;
7974 const activityAt = latestTimestamp ( [
8075 thread . latestUserMessageAt ,
8176 thread . latestTurn ?. requestedAt ,
8277 thread . latestTurn ?. startedAt ,
8378 thread . latestTurn ?. completedAt ,
8479 ] ) ;
85- if ( activityAt === null ) return false ;
86- return Date . parse ( activityAt ) < Date . parse ( input . now ) - input . autoSettleAfterDays * DAY_MS ;
80+ if ( pullRequest !== null ) {
81+ if ( pullRequestSettles ( thread , pullRequest , input . autoSettleOnMerge ) ) {
82+ return activityAt ?? thread . updatedAt ;
83+ }
84+ if ( pullRequest . state === "open" ) return null ;
85+ }
86+ if ( input . autoSettleAfterDays === null || activityAt === null ) return null ;
87+ return Date . parse ( activityAt ) < Date . parse ( input . now ) - input . autoSettleAfterDays * DAY_MS
88+ ? activityAt
89+ : null ;
8790}
8891
8992/** Cheap checks that run before any source control lookup. */
0 commit comments