@@ -98,6 +98,7 @@ import {
9898 retainMaterializedPaths ,
9999 cleanupRetainedMaterializedPathsForSession ,
100100} from '../../materialized-path-registry.ts' ;
101+ import { LeaseRegistry } from '../../lease-registry.ts' ;
101102import { SessionStore } from '../../session-store.ts' ;
102103import type { DaemonRequest , DaemonResponse , SessionState } from '../../types.ts' ;
103104import { AppError } from '../../../kernel/errors.ts' ;
@@ -3492,6 +3493,161 @@ test('close on macOS session stops runner and dismisses automation alert before
34923493 expect ( sessionStore . get ( sessionName ) ) . toBe ( undefined ) ;
34933494} ) ;
34943495
3496+ test ( 'close on iOS simulator session retains runner and deletes the session' , async ( ) => {
3497+ const sessionStore = makeSessionStore ( ) ;
3498+ const sessionName = 'ios-simulator-session' ;
3499+ sessionStore . set ( sessionName , {
3500+ ...makeSession ( sessionName , {
3501+ platform : 'apple' ,
3502+ id : 'sim-1' ,
3503+ name : 'iPhone 17 Pro' ,
3504+ kind : 'simulator' ,
3505+ booted : true ,
3506+ } ) ,
3507+ appName : 'com.example.app' ,
3508+ } ) ;
3509+
3510+ const response = await handleSessionCommands ( {
3511+ req : {
3512+ token : 't' ,
3513+ session : sessionName ,
3514+ command : 'close' ,
3515+ positionals : [ ] ,
3516+ flags : { } ,
3517+ } ,
3518+ sessionName,
3519+ logPath : path . join ( os . tmpdir ( ) , 'daemon.log' ) ,
3520+ sessionStore,
3521+ invoke : noopInvoke ,
3522+ } ) ;
3523+
3524+ expect ( response ) . toBeTruthy ( ) ;
3525+ expect ( response ?. ok ) . toBe ( true ) ;
3526+ expect ( mockStopIosRunner ) . not . toHaveBeenCalled ( ) ;
3527+ expect ( sessionStore . get ( sessionName ) ) . toBeUndefined ( ) ;
3528+ } ) ;
3529+
3530+ test ( 'close on iOS simulator with scoped simulator set stops runner before deleting session' , async ( ) => {
3531+ const sessionStore = makeSessionStore ( ) ;
3532+ const sessionName = 'ios-scoped-simulator-session' ;
3533+ sessionStore . set ( sessionName , {
3534+ ...makeSession ( sessionName , {
3535+ platform : 'apple' ,
3536+ id : 'sim-1' ,
3537+ name : 'iPhone 17 Pro' ,
3538+ kind : 'simulator' ,
3539+ booted : true ,
3540+ simulatorSetPath : '/tmp/tenant-a/simulator-set' ,
3541+ } ) ,
3542+ appName : 'com.example.app' ,
3543+ } ) ;
3544+
3545+ const response = await handleSessionCommands ( {
3546+ req : {
3547+ token : 't' ,
3548+ session : sessionName ,
3549+ command : 'close' ,
3550+ positionals : [ ] ,
3551+ flags : { } ,
3552+ } ,
3553+ sessionName,
3554+ logPath : path . join ( os . tmpdir ( ) , 'daemon.log' ) ,
3555+ sessionStore,
3556+ invoke : noopInvoke ,
3557+ } ) ;
3558+
3559+ expect ( response ) . toBeTruthy ( ) ;
3560+ expect ( response ?. ok ) . toBe ( true ) ;
3561+ expect ( mockStopIosRunner ) . toHaveBeenCalledWith ( 'sim-1' ) ;
3562+ expect ( sessionStore . get ( sessionName ) ) . toBeUndefined ( ) ;
3563+ } ) ;
3564+
3565+ test ( 'close on leased iOS simulator session stops runner before deleting session' , async ( ) => {
3566+ const sessionStore = makeSessionStore ( ) ;
3567+ const sessionName = 'ios-leased-simulator-session' ;
3568+ const leaseRegistry = new LeaseRegistry ( ) ;
3569+ const lease = leaseRegistry . allocateLease ( {
3570+ tenantId : 'tenant-a' ,
3571+ runId : 'run-1' ,
3572+ leaseBackend : 'ios-simulator' ,
3573+ deviceKey : 'ios:sim-1' ,
3574+ clientId : 'client-a' ,
3575+ } ) ;
3576+ sessionStore . set ( sessionName , {
3577+ ...makeSession ( sessionName , {
3578+ platform : 'apple' ,
3579+ id : 'sim-1' ,
3580+ name : 'iPhone 17 Pro' ,
3581+ kind : 'simulator' ,
3582+ booted : true ,
3583+ } ) ,
3584+ appName : 'com.example.app' ,
3585+ lease : {
3586+ leaseId : lease . leaseId ,
3587+ tenantId : lease . tenantId ,
3588+ runId : lease . runId ,
3589+ leaseBackend : lease . backend ,
3590+ deviceKey : lease . deviceKey ,
3591+ clientId : lease . clientId ,
3592+ expiresAt : lease . expiresAt ,
3593+ } ,
3594+ } ) ;
3595+
3596+ const response = await handleSessionCommands ( {
3597+ req : {
3598+ token : 't' ,
3599+ session : sessionName ,
3600+ command : 'close' ,
3601+ positionals : [ ] ,
3602+ flags : { } ,
3603+ } ,
3604+ sessionName,
3605+ logPath : path . join ( os . tmpdir ( ) , 'daemon.log' ) ,
3606+ sessionStore,
3607+ leaseRegistry,
3608+ invoke : noopInvoke ,
3609+ } ) ;
3610+
3611+ expect ( response ) . toBeTruthy ( ) ;
3612+ expect ( response ?. ok ) . toBe ( true ) ;
3613+ expect ( mockStopIosRunner ) . toHaveBeenCalledWith ( 'sim-1' ) ;
3614+ expect ( sessionStore . get ( sessionName ) ) . toBeUndefined ( ) ;
3615+ } ) ;
3616+
3617+ test ( 'close --shutdown on iOS simulator stops runner before deleting session' , async ( ) => {
3618+ const sessionStore = makeSessionStore ( ) ;
3619+ const sessionName = 'ios-simulator-shutdown-session' ;
3620+ sessionStore . set ( sessionName , {
3621+ ...makeSession ( sessionName , {
3622+ platform : 'apple' ,
3623+ id : 'sim-1' ,
3624+ name : 'iPhone 17 Pro' ,
3625+ kind : 'simulator' ,
3626+ booted : true ,
3627+ } ) ,
3628+ appName : 'com.example.app' ,
3629+ } ) ;
3630+
3631+ const response = await handleSessionCommands ( {
3632+ req : {
3633+ token : 't' ,
3634+ session : sessionName ,
3635+ command : 'close' ,
3636+ positionals : [ ] ,
3637+ flags : { shutdown : true } ,
3638+ } ,
3639+ sessionName,
3640+ logPath : path . join ( os . tmpdir ( ) , 'daemon.log' ) ,
3641+ sessionStore,
3642+ invoke : noopInvoke ,
3643+ } ) ;
3644+
3645+ expect ( response ) . toBeTruthy ( ) ;
3646+ expect ( response ?. ok ) . toBe ( true ) ;
3647+ expect ( mockStopIosRunner ) . toHaveBeenCalledWith ( 'sim-1' ) ;
3648+ expect ( sessionStore . get ( sessionName ) ) . toBeUndefined ( ) ;
3649+ } ) ;
3650+
34953651test ( 'close <app> on iOS stops runner before app close dispatch and performs final idempotent stop' , async ( ) => {
34963652 const sessionStore = makeSessionStore ( ) ;
34973653 const sessionName = 'ios-close-session' ;
0 commit comments