@@ -202,6 +202,7 @@ export function resolveAutoSettlementAt(input: {
202202 readonly nowMs : number ;
203203 readonly autoSettleAfterDays : number | null ;
204204 readonly autoSettleOnMerge : boolean ;
205+ readonly autoSettleKeepPullRequests ?: boolean ;
205206} ) : DateTime . Utc | null {
206207 const { thread } = input ;
207208 let pullRequest = input . pullRequest ;
@@ -236,6 +237,9 @@ export function resolveAutoSettlementAt(input: {
236237 if ( pullRequest !== null && pullRequestSettles ( thread , pullRequest , input . autoSettleOnMerge ) ) {
237238 return activityAtMs === null ? thread . createdAt : DateTime . makeUnsafe ( activityAtMs ) ;
238239 }
240+ const hasPullRequest =
241+ pullRequest !== null || thread . linkedPullRequest != null || thread . branchPullRequest != null ;
242+ if ( input . autoSettleKeepPullRequests === true && hasPullRequest ) return null ;
239243 if ( input . autoSettleAfterDays === null || activityAtMs === null ) return null ;
240244 // A passed wake timer restarts inactivity. An earlier wake can only delay settlement.
241245 const snoozedUntilMs = toMillis ( thread . snoozedUntil ) ;
@@ -275,14 +279,16 @@ export function autoSettlementSettingsKey(
275279 return JSON . stringify ( [
276280 settings . sidebarAutoSettleOnMerge ,
277281 settings . sidebarAutoSettleAfterDays ,
282+ settings . sidebarAutoSettleKeepPullRequests ,
278283 // Only entries that touch settlement, in a stable order, so a project
279284 // override on an unrelated key does not queue a sweep. JSON drops
280285 // undefined, so inherit (absent) and never (null) need distinct marks.
281286 Object . entries ( settings . projectSettingsOverrides )
282287 . filter (
283288 ( [ , entry ] ) =>
284289 entry . sidebarAutoSettleOnMerge !== undefined ||
285- entry . sidebarAutoSettleAfterDays !== undefined ,
290+ entry . sidebarAutoSettleAfterDays !== undefined ||
291+ entry . sidebarAutoSettleKeepPullRequests !== undefined ,
286292 )
287293 . sort ( ( [ left ] , [ right ] ) => left . localeCompare ( right ) )
288294 . map ( ( [ projectId , entry ] ) => [
@@ -291,6 +297,7 @@ export function autoSettlementSettingsKey(
291297 entry . sidebarAutoSettleAfterDays === undefined
292298 ? "inherit"
293299 : entry . sidebarAutoSettleAfterDays ,
300+ entry . sidebarAutoSettleKeepPullRequests ?? "inherit" ,
294301 ] ) ,
295302 ] ) ;
296303}
@@ -343,6 +350,7 @@ export const make = Effect.gen(function* () {
343350 nowMs : DateTime . toEpochMillis ( decisionNow ) ,
344351 autoSettleAfterDays : currentSettings . sidebarAutoSettleAfterDays ,
345352 autoSettleOnMerge : currentSettings . sidebarAutoSettleOnMerge ,
353+ autoSettleKeepPullRequests : currentSettings . sidebarAutoSettleKeepPullRequests ,
346354 } ) ;
347355 if ( settledAt === null ) return thread ;
348356 const uuid = yield * crypto . randomUUIDv4 ( ) ;
@@ -445,6 +453,7 @@ export const make = Effect.gen(function* () {
445453 nowMs : DateTime . toEpochMillis ( decisionNow ) ,
446454 autoSettleAfterDays : settings . sidebarAutoSettleAfterDays ,
447455 autoSettleOnMerge : settings . sidebarAutoSettleOnMerge ,
456+ autoSettleKeepPullRequests : settings . sidebarAutoSettleKeepPullRequests ,
448457 } ) !== null
449458 ) ;
450459 } ) ;
0 commit comments