@@ -302,6 +302,35 @@ const startHarness = Effect.fn("startThreadSettlementHarness")(function* (
302302} ) ;
303303
304304describe ( "ThreadSettlementReactor" , ( ) => {
305+ it ( "distinguishes a project that inherits the threshold from one that disables it" , ( ) => {
306+ const inherits = ThreadSettlementReactor . autoSettlementSettingsKey ( {
307+ ...DEFAULT_SERVER_SETTINGS ,
308+ projectSettingsOverrides : { [ PROJECT_ID ] : { sidebarAutoSettleOnMerge : true } } ,
309+ } ) ;
310+ const never = ThreadSettlementReactor . autoSettlementSettingsKey ( {
311+ ...DEFAULT_SERVER_SETTINGS ,
312+ projectSettingsOverrides : {
313+ [ PROJECT_ID ] : { sidebarAutoSettleOnMerge : true , sidebarAutoSettleAfterDays : null } ,
314+ } ,
315+ } ) ;
316+ assert . notStrictEqual ( inherits , never ) ;
317+ } ) ;
318+
319+ it ( "ignores project overrides that do not touch settlement" , ( ) => {
320+ const base = ThreadSettlementReactor . autoSettlementSettingsKey ( {
321+ ...DEFAULT_SERVER_SETTINGS ,
322+ projectSettingsOverrides : { [ PROJECT_ID ] : { sidebarAutoSettleOnMerge : false } } ,
323+ } ) ;
324+ const unrelated = ThreadSettlementReactor . autoSettlementSettingsKey ( {
325+ ...DEFAULT_SERVER_SETTINGS ,
326+ projectSettingsOverrides : {
327+ [ LINKED_PROJECT_ID ] : { defaultThreadEnvMode : "worktree" } ,
328+ [ PROJECT_ID ] : { sidebarAutoSettleOnMerge : false , defaultAutoPull : true } ,
329+ } ,
330+ } ) ;
331+ assert . strictEqual ( base , unrelated ) ;
332+ } ) ;
333+
305334 it . effect (
306335 "settles all-terminal links from snapshots and keeps open or unsynced links active" ,
307336 ( ) =>
@@ -486,6 +515,59 @@ describe("ThreadSettlementReactor", () => {
486515 ) ,
487516 ) ;
488517
518+ it . effect ( "a project override settles only that project's inactive threads" , ( ) =>
519+ Effect . scoped (
520+ Effect . gen ( function * ( ) {
521+ yield * TestClock . setTime ( Date . parse ( NOW ) ) ;
522+ const overriddenProject = ProjectId . make ( "overridden-project" ) ;
523+ const fixture = yield * makeHarness ( {
524+ snapshot : makeSnapshot (
525+ [
526+ makeThread ( "inherits-thread" ) ,
527+ makeThread ( "overridden-thread" , { projectId : overriddenProject } ) ,
528+ ] ,
529+ [ makeProject ( ) , makeProject ( overriddenProject , "/workspace/overridden" ) ] ,
530+ ) ,
531+ settings : {
532+ ...DEFAULT_SERVER_SETTINGS ,
533+ sidebarAutoSettleAfterDays : null ,
534+ sidebarAutoSettleOnMerge : false ,
535+ projectSettingsOverrides : {
536+ [ overriddenProject ] : { sidebarAutoSettleAfterDays : 1 } ,
537+ } ,
538+ } ,
539+ } ) ;
540+
541+ yield * Effect . gen ( function * ( ) {
542+ const reactor = yield * ThreadSettlementReactor . ThreadSettlementReactor ;
543+ yield * reactor . start ( ) ;
544+ yield * Queue . take ( fixture . settingsReads ) ;
545+ yield * Deferred . succeed ( fixture . activation , undefined ) ;
546+ yield * Queue . take ( fixture . snapshotReads ) ;
547+ yield * reactor . drain ;
548+ assert . deepStrictEqual (
549+ ( yield * Ref . get ( fixture . commands ) ) . map ( ( command ) => command . threadId ) ,
550+ [ ThreadId . make ( "overridden-thread" ) ] ,
551+ ) ;
552+
553+ // Clearing the override is a settlement change, so the sweep re-arms.
554+ yield * fixture . updateSettings ( {
555+ projectSettingsOverrides : { [ overriddenProject ] : null } ,
556+ sidebarAutoSettleAfterDays : 1 ,
557+ } ) ;
558+ yield * Queue . take ( fixture . snapshotReads ) ;
559+ yield * reactor . drain ;
560+ // The static snapshot never records the first settlement, so the
561+ // second sweep dispatches for both; the inheriting thread is new.
562+ assert . include (
563+ ( yield * Ref . get ( fixture . commands ) ) . map ( ( command ) => command . threadId ) ,
564+ ThreadId . make ( "inherits-thread" ) ,
565+ ) ;
566+ } ) . pipe ( Effect . provide ( fixture . layer ) ) ;
567+ } ) ,
568+ ) ,
569+ ) ;
570+
489571 it . effect ( "starts without clients and skips protected threads before pull request lookup" , ( ) =>
490572 Effect . scoped (
491573 Effect . gen ( function * ( ) {
0 commit comments