@@ -1542,6 +1542,7 @@ describe("ThreadSettlementServiceV2 terminals", () => {
15421542 yield * fixture . publishEvent ( settledEvent ( marker ) ) ;
15431543 assert . deepStrictEqual ( yield * Queue . take ( fixture . closedIdle ) , { threadId : settled . id } ) ;
15441544 assert . deepStrictEqual ( yield * Queue . take ( fixture . closedIdle ) , { threadId : marker . id } ) ;
1545+ yield * service . drain ;
15451546 assert . deepStrictEqual (
15461547 ( yield * Ref . get ( fixture . deviceCloses ) ) . filter ( ( close ) => close . threadId === settled . id ) ,
15471548 [ { threadId : settled . id , hostId : "slow-ssh" , deviceId : "pixel" } ] ,
@@ -1551,6 +1552,42 @@ describe("ThreadSettlementServiceV2 terminals", () => {
15511552 ) ,
15521553 ) ;
15531554
1555+ it . effect ( "closes another thread's terminals while a device release waits on the lock" , ( ) =>
1556+ Effect . scoped (
1557+ Effect . gen ( function * ( ) {
1558+ const releaseStarted = yield * Deferred . make < void > ( ) ;
1559+ const lockFreed = yield * Deferred . make < void > ( ) ;
1560+ const waiting = appThread ( "waiting-device-thread" , "settled" ) ;
1561+ const other = appThread ( "other-thread" , "settled" ) ;
1562+ const fixture = yield * makeHarness ( {
1563+ snapshot : makeSnapshot ( [ ] ) ,
1564+ currentThreads : [ waiting , other ] ,
1565+ deviceSessions : [ { hostId : "starting-ssh" , deviceId : "pixel" } ] ,
1566+ onDeviceClose : ( ) =>
1567+ Deferred . succeed ( releaseStarted , undefined ) . pipe (
1568+ Effect . andThen ( Deferred . await ( lockFreed ) ) ,
1569+ ) ,
1570+ } ) ;
1571+
1572+ yield * Effect . gen ( function * ( ) {
1573+ const service = yield * ThreadSettlementService . ThreadSettlementServiceV2 ;
1574+ yield * startHarness ( service , fixture . activation , fixture . snapshotReads ) ;
1575+ yield * fixture . publishEvent ( settledEvent ( waiting ) ) ;
1576+ assert . deepStrictEqual ( yield * Queue . take ( fixture . closedIdle ) , { threadId : waiting . id } ) ;
1577+ yield * Deferred . await ( releaseStarted ) ;
1578+ yield * fixture . publishEvent ( settledEvent ( other ) ) ;
1579+ assert . deepStrictEqual ( yield * Queue . take ( fixture . closedIdle ) , { threadId : other . id } ) ;
1580+ yield * Deferred . succeed ( lockFreed , undefined ) ;
1581+ yield * service . drain ;
1582+ assert . deepStrictEqual (
1583+ ( yield * Ref . get ( fixture . deviceCloses ) ) . map ( ( close ) => close . threadId ) ,
1584+ [ waiting . id , other . id ] ,
1585+ ) ;
1586+ } ) . pipe ( Effect . provide ( fixture . layer ) ) ;
1587+ } ) ,
1588+ ) ,
1589+ ) ;
1590+
15541591 it . effect ( "releases a settled thread's devices without shutting them down" , ( ) =>
15551592 Effect . scoped (
15561593 Effect . gen ( function * ( ) {
@@ -1568,6 +1605,7 @@ describe("ThreadSettlementServiceV2 terminals", () => {
15681605 yield * fixture . publishEvent ( settledEvent ( marker ) ) ;
15691606 assert . deepStrictEqual ( yield * Queue . take ( fixture . closedIdle ) , { threadId : settled . id } ) ;
15701607 assert . deepStrictEqual ( yield * Queue . take ( fixture . closedIdle ) , { threadId : marker . id } ) ;
1608+ yield * service . drain ;
15711609 const closes = yield * Ref . get ( fixture . deviceCloses ) ;
15721610 assert . deepStrictEqual (
15731611 closes . filter ( ( close ) => close . threadId === settled . id ) ,
@@ -1603,6 +1641,7 @@ describe("ThreadSettlementServiceV2 terminals", () => {
16031641 assert . deepStrictEqual ( yield * Queue . take ( fixture . closedIdle ) , { threadId : settled . id } ) ;
16041642 const run = yield * Queue . take ( fixture . scriptRuns ) ;
16051643 assert . strictEqual ( run . threadId , settled . id ) ;
1644+ yield * service . drain ;
16061645 assert . deepStrictEqual ( yield * Ref . get ( fixture . deviceCloses ) , [
16071646 { threadId : settled . id , hostId : "ssh-host" , deviceId : "remote-pixel" } ,
16081647 { threadId : settled . id , hostId : "local" , deviceId : "emulator-5554" } ,
@@ -1628,6 +1667,7 @@ describe("ThreadSettlementServiceV2 terminals", () => {
16281667 yield * startHarness ( service , fixture . activation , fixture . snapshotReads ) ;
16291668 yield * fixture . publishEvent ( settledEvent ( settled ) ) ;
16301669 assert . strictEqual ( ( yield * Queue . take ( fixture . scriptRuns ) ) . threadId , settled . id ) ;
1670+ yield * service . drain ;
16311671 assert . deepStrictEqual ( yield * Ref . get ( fixture . deviceCloses ) , [ ] ) ;
16321672 } ) . pipe ( Effect . provide ( fixture . layer ) ) ;
16331673 } ) ,
@@ -1683,6 +1723,7 @@ describe("ThreadSettlementServiceV2 terminals", () => {
16831723 yield * fixture . publishEvent ( settledEvent ( settled ) ) ;
16841724 yield * fixture . publishEvent ( settledEvent ( marker ) ) ;
16851725 assert . strictEqual ( ( yield * Queue . take ( fixture . scriptRuns ) ) . threadId , marker . id ) ;
1726+ yield * service . drain ;
16861727 assert . deepStrictEqual (
16871728 ( yield * Ref . get ( fixture . deviceCloses ) ) . filter ( ( close ) => close . threadId === settled . id ) ,
16881729 [ ] ,
0 commit comments