fix(sdk): adapt to main proto drift after rebase

Rebasing the SDK extraction onto main surfaced three breaking changes:

- tonic 0.12 -> 0.14 renamed the `tls` feature; use the `channel` +
  `tls-native-roots` features the other client crates use.
- phase and current_policy_version moved out of `Sandbox` into the
  nested `SandboxStatus` message (#1565); read phase from `status`.
- GPU selection moved under `SandboxSpec.resource_requirements` and
  `gpu_device` was removed (#1815, device selection is now driver
  config); map the SDK `gpu` flag onto `ResourceRequirements` and drop
  `gpu_device` from the public spec and napi binding.

Update the client_mock test (status.phase, new update_provider_profiles
RPC, resource_requirements assertion) and regenerate the napi index.d.ts.

Author: maxdubrinsky

crates/openshell-sdk-node/index.d.ts

@@ -134,5 +134,4 @@ export interface SandboxSpec {
   environment?: Record<string, string>
   providers?: Array<string>
   gpu?: boolean
-  gpuDevice?: string
 }

crates/openshell-sdk-node/src/lib.rs

@@ -90,7 +90,6 @@ pub struct SandboxSpec {
     pub environment: Option<HashMap<String, String>>,
     pub providers: Option<Vec<String>>,
     pub gpu: Option<bool>,
-    pub gpu_device: Option<String>,
 }
 
 /// Options for [`OpenShellClient::list_sandboxes`].
@@ -164,7 +163,6 @@ fn sdk_spec_from_js(spec: SandboxSpec) -> sdk::SandboxSpec {
         environment: spec.environment.unwrap_or_default(),
         providers: spec.providers.unwrap_or_default(),
         gpu: spec.gpu.unwrap_or(false),
-        gpu_device: spec.gpu_device,
     }
 }
 

crates/openshell-sdk/Cargo.toml

@@ -27,7 +27,7 @@ tokio = { workspace = true }
 tokio-rustls = { workspace = true }
 tokio-stream = { workspace = true }
 tokio-tungstenite = { workspace = true }
-tonic = { workspace = true, features = ["tls", "tls-native-roots"] }
+tonic = { workspace = true, features = ["channel", "tls-native-roots"] }
 tower = { workspace = true }
 tracing = { workspace = true }
 

crates/openshell-sdk/src/client.rs

@@ -290,19 +290,20 @@ fn create_sandbox_request(spec: SandboxSpec) -> proto::CreateSandboxRequest {
         environment,
         providers,
         gpu,
-        gpu_device,
     } = spec;
     let template = image.map(|image| proto::SandboxTemplate {
         image,
         ..proto::SandboxTemplate::default()
     });
+    let resource_requirements = gpu.then(|| proto::ResourceRequirements {
+        gpu: Some(proto::GpuResourceRequirements { count: None }),
+    });
     proto::CreateSandboxRequest {
         spec: Some(proto::SandboxSpec {
             environment,
             template,
             providers,
-            gpu,
-            gpu_device: gpu_device.unwrap_or_default(),
+            resource_requirements,
             ..proto::SandboxSpec::default()
         }),
         name: name.unwrap_or_default(),

crates/openshell-sdk/src/types.rs

@@ -102,10 +102,6 @@ pub struct SandboxSpec {
     pub providers: Vec<String>,
     /// Request a GPU.
     pub gpu: bool,
-    /// Driver-specific GPU device selector (CDI ID for Docker/Podman; BDF or
-    /// index for VM). Only meaningful when `gpu` is true; empty defers to the
-    /// driver's default selection.
-    pub gpu_device: Option<String>,
 }
 
 /// Reference to a sandbox owned by the gateway.
@@ -122,10 +118,11 @@ pub struct SandboxRef {
 impl SandboxRef {
     pub(crate) fn from_proto(sandbox: proto::Sandbox) -> Self {
         let meta = sandbox.metadata.unwrap_or_default();
+        let phase = sandbox.status.unwrap_or_default().phase;
         Self {
             id: meta.id,
             name: meta.name,
-            phase: sandbox.phase.into(),
+            phase: phase.into(),
             labels: meta.labels,
             resource_version: meta.resource_version,
         }

crates/openshell-sdk/tests/client_mock.rs

@@ -52,9 +52,10 @@ fn sandbox_with_phase(name: &str, phase: proto::SandboxPhase) -> proto::Sandbox
             resource_version: 1,
         }),
         spec: None,
-        status: None,
-        phase: phase.into(),
-        current_policy_version: 0,
+        status: Some(proto::SandboxStatus {
+            phase: phase.into(),
+            ..Default::default()
+        }),
     }
 }
 
@@ -70,6 +71,13 @@ impl OpenShell for TestOpenShell {
         }))
     }
 
+    async fn update_provider_profiles(
+        &self,
+        _: tonic::Request<proto::UpdateProviderProfilesRequest>,
+    ) -> Result<Response<proto::UpdateProviderProfilesResponse>, Status> {
+        Ok(Response::new(proto::UpdateProviderProfilesResponse::default()))
+    }
+
     async fn create_sandbox(
         &self,
         request: tonic::Request<proto::CreateSandboxRequest>,
@@ -599,7 +607,13 @@ async fn create_sandbox_passes_spec_through() {
     assert_eq!(observed.name, "my-box");
     assert_eq!(observed.labels, labels);
     let observed_spec = observed.spec.unwrap();
-    assert!(observed_spec.gpu);
+    assert!(
+        observed_spec
+            .resource_requirements
+            .as_ref()
+            .and_then(|r| r.gpu.as_ref())
+            .is_some()
+    );
     assert_eq!(
         observed_spec.template.as_ref().unwrap().image,
         "ghcr.io/foo:bar"