@@ -103,6 +103,7 @@ struct ProviderState {
103103 fail_delete_provider_profile_message : Arc < Mutex < Option < String > > > ,
104104 sandbox_providers : Arc < Mutex < HashMap < String , Vec < String > > > > ,
105105 sandbox_provider_requests : Arc < Mutex < Vec < SandboxProviderRequestLog > > > ,
106+ sandbox_provider_next_page_token : Arc < Mutex < String > > ,
106107 readiness_receipts : Arc < Mutex < HashMap < String , ProviderMutationReceipt > > > ,
107108 readiness_scripts : Arc < Mutex < ReadinessScript > > ,
108109 readiness_requests : Arc < Mutex < Vec < GetSandboxProviderStatusRequest > > > ,
@@ -139,6 +140,8 @@ enum ProviderRefreshRequestLog {
139140enum SandboxProviderRequestLog {
140141 List {
141142 sandbox_name : String ,
143+ page_size : i32 ,
144+ page_token : String ,
142145 } ,
143146 Attach {
144147 sandbox_name : String ,
@@ -376,6 +379,8 @@ impl OpenShell for TestOpenShell {
376379 . await
377380 . push ( SandboxProviderRequestLog :: List {
378381 sandbox_name : sandbox_name. clone ( ) ,
382+ page_size : request. page_size ,
383+ page_token : request. page_token ,
379384 } ) ;
380385 let provider_names = self
381386 . state
@@ -390,7 +395,15 @@ impl OpenShell for TestOpenShell {
390395 . iter ( )
391396 . filter_map ( |name| providers_by_name. get ( name) . cloned ( ) )
392397 . collect ( ) ;
393- Ok ( Response :: new ( ListSandboxProvidersResponse { providers } ) )
398+ Ok ( Response :: new ( ListSandboxProvidersResponse {
399+ providers,
400+ next_page_token : self
401+ . state
402+ . sandbox_provider_next_page_token
403+ . lock ( )
404+ . await
405+ . clone ( ) ,
406+ } ) )
394407 }
395408
396409 async fn attach_sandbox_provider (
@@ -4160,9 +4173,17 @@ async fn sandbox_provider_cli_run_functions_wire_requests_and_idempotent_results
41604173 )
41614174 . await
41624175 . expect ( "sandbox provider attach is idempotent" ) ;
4163- run:: sandbox_provider_list ( & ts. endpoint , "dev-sandbox" , "table" , "default" , & ts. tls )
4164- . await
4165- . expect ( "sandbox provider list" ) ;
4176+ run:: sandbox_provider_list (
4177+ & ts. endpoint ,
4178+ "dev-sandbox" ,
4179+ 100 ,
4180+ "" ,
4181+ "table" ,
4182+ "default" ,
4183+ & ts. tls ,
4184+ )
4185+ . await
4186+ . expect ( "sandbox provider list" ) ;
41664187 run:: sandbox_provider_detach (
41674188 & ts. endpoint ,
41684189 "dev-sandbox" ,
@@ -4198,6 +4219,8 @@ async fn sandbox_provider_cli_run_functions_wire_requests_and_idempotent_results
41984219 } ,
41994220 SandboxProviderRequestLog :: List {
42004221 sandbox_name: "dev-sandbox" . to_string( ) ,
4222+ page_size: 100 ,
4223+ page_token: String :: new( ) ,
42014224 } ,
42024225 SandboxProviderRequestLog :: Detach {
42034226 sandbox_name: "dev-sandbox" . to_string( ) ,
@@ -4214,6 +4237,85 @@ async fn sandbox_provider_cli_run_functions_wire_requests_and_idempotent_results
42144237 assert ! ( providers. get( "dev-sandbox" ) . is_none_or( Vec :: is_empty) ) ;
42154238}
42164239
4240+ #[ tokio:: test]
4241+ async fn sandbox_provider_list_cli_forwards_pagination_and_emits_envelopes ( ) {
4242+ let ts = run_server ( ) . await ;
4243+ ts. state . providers . lock ( ) . await . insert (
4244+ "work-github" . to_string ( ) ,
4245+ Provider {
4246+ metadata : Some ( openshell_core:: proto:: datamodel:: v1:: ObjectMeta {
4247+ id : "provider-work-github" . to_string ( ) ,
4248+ name : "work-github" . to_string ( ) ,
4249+ workspace : "default" . to_string ( ) ,
4250+ resource_version : 1 ,
4251+ ..Default :: default ( )
4252+ } ) ,
4253+ r#type : "github" . to_string ( ) ,
4254+ ..Default :: default ( )
4255+ } ,
4256+ ) ;
4257+ ts. state
4258+ . sandbox_providers
4259+ . lock ( )
4260+ . await
4261+ . insert ( "dev-sandbox" . to_string ( ) , vec ! [ "work-github" . to_string( ) ] ) ;
4262+ * ts. state . sandbox_provider_next_page_token . lock ( ) . await = "next-page" . to_string ( ) ;
4263+
4264+ for format in [ "json" , "yaml" ] {
4265+ let output = run_readiness_cli (
4266+ & ts,
4267+ & [
4268+ "sandbox" ,
4269+ "provider" ,
4270+ "list" ,
4271+ "dev-sandbox" ,
4272+ "--page-size" ,
4273+ "1" ,
4274+ "--page-token" ,
4275+ "prior-page" ,
4276+ "--output" ,
4277+ format,
4278+ ] ,
4279+ )
4280+ . await ;
4281+ assert ! (
4282+ output. status. success( ) ,
4283+ "sandbox provider list {format} failed:\n {}" ,
4284+ String :: from_utf8_lossy( & output. stderr)
4285+ ) ;
4286+ assert ! (
4287+ output. stderr. is_empty( ) ,
4288+ "structured output wrote to stderr"
4289+ ) ;
4290+
4291+ let value: serde_json:: Value = match format {
4292+ "json" => serde_json:: from_slice ( & output. stdout ) . expect ( "parse JSON envelope" ) ,
4293+ "yaml" => serde_yml:: from_slice ( & output. stdout ) . expect ( "parse YAML envelope" ) ,
4294+ _ => unreachable ! ( ) ,
4295+ } ;
4296+ assert_eq ! ( value[ "next_page_token" ] , "next-page" ) ;
4297+ assert_eq ! ( value[ "providers" ] . as_array( ) . map( Vec :: len) , Some ( 1 ) ) ;
4298+ assert_eq ! ( value[ "providers" ] [ 0 ] [ "name" ] , "work-github" ) ;
4299+ }
4300+
4301+ let requests = ts. state . sandbox_provider_requests . lock ( ) . await . clone ( ) ;
4302+ assert_eq ! (
4303+ requests,
4304+ vec![
4305+ SandboxProviderRequestLog :: List {
4306+ sandbox_name: "dev-sandbox" . to_string( ) ,
4307+ page_size: 1 ,
4308+ page_token: "prior-page" . to_string( ) ,
4309+ } ,
4310+ SandboxProviderRequestLog :: List {
4311+ sandbox_name: "dev-sandbox" . to_string( ) ,
4312+ page_size: 1 ,
4313+ page_token: "prior-page" . to_string( ) ,
4314+ } ,
4315+ ]
4316+ ) ;
4317+ }
4318+
42174319#[ tokio:: test]
42184320async fn sandbox_provider_attach_cli_surfaces_server_errors ( ) {
42194321 let ts = run_server ( ) . await ;
0 commit comments