@@ -380,6 +380,53 @@ describe("resolveAutoSettlementAt", () => {
380380 ) . toBeNull ( ) ;
381381 } ) ;
382382
383+ it ( "does not settle on pull requests that were already merged when linked" , ( ) => {
384+ const link = ( number : number , linkedAt : DateTime . Utc , mergedAt : DateTime . Utc ) => ( {
385+ host : "example.test" ,
386+ repository : "owner/repository" ,
387+ number,
388+ url : `https://example.test/owner/repository/pull/${ number } ` ,
389+ source : "agent" as const ,
390+ linkedAt : DateTime . formatIso ( linkedAt ) ,
391+ snapshot : {
392+ state : "merged" as const ,
393+ title : "Pull request" ,
394+ headBranch : `feature-${ number } ` ,
395+ baseBranch : "main" ,
396+ isDraft : false ,
397+ updatedAt : DateTime . formatIso ( mergedAt ) ,
398+ syncedAt : DateTime . formatIso ( linkedAt ) ,
399+ mergedAt : DateTime . formatIso ( mergedAt ) ,
400+ } ,
401+ stack : null ,
402+ } ) ;
403+ // The user asked the agent to merge pull requests; it merged one, then
404+ // linked it to the thread as a record of the work.
405+ const recorded = link ( 1 , at ( - 50 * 60 * 1_000 ) , at ( - 55 * 60 * 1_000 ) ) ;
406+ const input = {
407+ thread : shell ( {
408+ latestUserMessageAt : at ( - 2 * 60 * 60 * 1_000 ) ,
409+ latestRunCompletedAt : at ( - 45 * 60 * 1_000 ) ,
410+ pullRequests : [ recorded ] ,
411+ } ) ,
412+ pullRequest : null ,
413+ nowMs : NOW_MS ,
414+ autoSettleAfterDays : null ,
415+ autoSettleOnMerge : true ,
416+ } ;
417+ expect ( ThreadSettlementService . resolveAutoSettlementAt ( input ) ) . toBeNull ( ) ;
418+ // A pull request linked while open still settles the thread when it merges.
419+ expect (
420+ ThreadSettlementService . resolveAutoSettlementAt ( {
421+ ...input ,
422+ thread : {
423+ ...input . thread ,
424+ pullRequests : [ recorded , link ( 2 , at ( - 90 * 60 * 1_000 ) , at ( - 40 * 60 * 1_000 ) ) ] ,
425+ } ,
426+ } ) ,
427+ ) . toEqual ( at ( - 45 * 60 * 1_000 ) ) ;
428+ } ) ;
429+
383430 it ( "settles inactive threads even when their pull request remains open" , ( ) => {
384431 const input = {
385432 thread : shell ( { latestUserMessageAt : at ( - 30 * DAY_MS ) } ) ,
@@ -852,6 +899,64 @@ describe("ThreadSettlementServiceV2 worker", () => {
852899 ) ,
853900 ) ;
854901
902+ it . effect ( "does not look up a pull request that was already merged when linked" , ( ) =>
903+ Effect . scoped (
904+ Effect . gen ( function * ( ) {
905+ yield * TestClock . setTime ( Date . parse ( NOW ) ) ;
906+ const reference = {
907+ projectId : PROJECT_ID ,
908+ repository : "owner/repository" ,
909+ number : 42 ,
910+ url : "https://example.test/owner/repository/pull/42" ,
911+ } ;
912+ const fixture = yield * makeHarness ( {
913+ snapshot : makeSnapshot ( [
914+ makeThread ( "merged-then-linked" , {
915+ linkedPullRequest : reference ,
916+ pullRequests : [
917+ {
918+ host : "example.test" ,
919+ repository : reference . repository ,
920+ number : reference . number ,
921+ url : reference . url ,
922+ source : "agent" ,
923+ linkedAt : "2026-08-28T00:00:00.000Z" ,
924+ snapshot : {
925+ state : "merged" ,
926+ title : "Pull request" ,
927+ headBranch : "feature" ,
928+ baseBranch : "main" ,
929+ isDraft : false ,
930+ updatedAt : "2026-08-27T00:00:00.000Z" ,
931+ syncedAt : "2026-08-28T00:00:00.000Z" ,
932+ mergedAt : "2026-08-27T00:00:00.000Z" ,
933+ } ,
934+ stack : null ,
935+ } ,
936+ ] ,
937+ } ) ,
938+ ] ) ,
939+ settings : {
940+ ...DEFAULT_SERVER_SETTINGS ,
941+ sidebarAutoSettleAfterDays : null ,
942+ sidebarAutoSettleOnMerge : true ,
943+ } ,
944+ pullRequestSummary : ( input ) =>
945+ Effect . succeed ( {
946+ ...makePullRequestSummary ( { ...input , state : "merged" } ) ,
947+ mergedAt : "2026-08-27T00:00:00.000Z" ,
948+ } ) ,
949+ } ) ;
950+ yield * Effect . gen ( function * ( ) {
951+ const reactor = yield * ThreadSettlementService . ThreadSettlementServiceV2 ;
952+ yield * startHarness ( reactor , fixture . activation , fixture . snapshotReads ) ;
953+ assert . deepStrictEqual ( yield * Ref . get ( fixture . commands ) , [ ] ) ;
954+ assert . deepStrictEqual ( yield * Ref . get ( fixture . summaryCalls ) , [ ] ) ;
955+ } ) . pipe ( Effect . provide ( fixture . layer ) ) ;
956+ } ) ,
957+ ) ,
958+ ) ;
959+
855960 it . effect ( "reevaluates immediately after a pull request merge" , ( ) =>
856961 Effect . scoped (
857962 Effect . gen ( function * ( ) {
0 commit comments