fix: feature matrix — grpc + lab combinations were broken

Post-PR-#238 audit (user's "Careful" warning) surfaced three latent
bugs that --features serve tests alone couldn't catch:

1. --features grpc ALONE failed to compile — wire.rs was `serve`-only
   gated but codec_research.rs (gated on any(serve, grpc)) imported
   wire types unconditionally. Pre-existing architectural gap from
   before this session; latent because no CI path exercised grpc-only.

   Fix: widen wire.rs + auto_detect.rs + codec_kernel_cache.rs +
   rotation_kernel.rs + decode_kernel.rs + token_agreement.rs gates
   from `serve` to `any(serve, grpc)`. Both transports share the same
   DTO surface; both need wire compiled.

2. --features grpc missing serde/serde_json/base64/bytemuck deps.
   wire.rs needs them (serde derives on DTOs; serde_json in tests;
   base64 for WireTensorView decode; bytemuck for lane casting).
   Previously only `serve` pulled them.

   Fix: new internal feature `_lab-dtos` that both serve + grpc pull
   in. Keeps the dependency sharing explicit:
     _lab-dtos = ["dep:serde", "dep:serde_json", "dep:base64", "dep:bytemuck"]
     serve = ["_lab-dtos", "dep:axum", "dep:tokio"]
     grpc  = ["_lab-dtos", "dep:prost", "dep:tonic", "dep:tonic-build", "dep:tokio"]

3. --features lab failed with E0063 at grpc.rs:210 — WireCalibrateRequest
   struct-literal was missing the `params` + `tensor_view` fields I
   added in D0.1 (PR #227). Another latent bug: my --features serve
   tests didn't exercise grpc.rs.

   Fix: add `params: None, tensor_view: None` explicitly, with a
   comment noting the gRPC path uses legacy num_* fields only until
   the proto schema catches up (D0.3b follow-up).

4. Bonus — 3x redundant closures in grpc.rs that clippy only caught
   under `--features lab`:
     .map_err(|e| Status::invalid_argument(e)) → .map_err(Status::invalid_argument)

Rust 1.95 match-ergonomics check: grep'd `mut ref` + `ref mut` in
struct pattern field shorthand across cognitive-shader-driver/src.
Zero hits — no Rust 1.95 breakage lurking.

Verification (all passing now):
  cargo check  (default)         ✓
  cargo check --features serve   ✓
  cargo check --features grpc    ✓
  cargo check --features lab     ✓
  cargo test --features lab --lib:         117/117 pass
  cargo test --features serve --lib:       117/117 pass
  cargo test --lib (default):               39/39 pass
  cargo clippy --features lab -- -D warnings:  CLEAN
  cargo clippy --features serve -- -D warnings: CLEAN

The session's 16 PRs all ran under --features serve only; this
commit is the rescue that proves the other feature combinations
compile clean too. Future sessions should exercise the full
feature matrix before declaring any DTO change complete.

https://claude.ai/code/session_01SbYsmmbPf9YQuYbHZN52Zh

Author: claude

crates/cognitive-shader-driver/Cargo.toml

@@ -68,8 +68,12 @@ tonic-build = { version = "0.12", optional = true }
 default = []
 with-engine = ["dep:thinking-engine"]
 with-planner = ["dep:lance-graph-planner"]
-serve = ["dep:serde", "dep:serde_json", "dep:axum", "dep:tokio", "dep:base64", "dep:bytemuck"]
-grpc = ["dep:prost", "dep:tonic", "dep:tonic-build", "dep:tokio"]
+# Shared LAB DTOs — `wire.rs` + `auto_detect.rs` + codec kernel scaffolds
+# + token_agreement use these regardless of whether the transport is REST
+# (serve) or gRPC (grpc). Both features pull this set.
+_lab-dtos = ["dep:serde", "dep:serde_json", "dep:base64", "dep:bytemuck"]
+serve = ["_lab-dtos", "dep:axum", "dep:tokio"]
+grpc = ["_lab-dtos", "dep:prost", "dep:tonic", "dep:tonic-build", "dep:tokio"]
 
 # `lab` — umbrella switch for the single shader-lab binary. Enables every
 # endpoint (REST + gRPC), the planner bridge, the thinking-engine bridge,

crates/cognitive-shader-driver/src/grpc.rs

@@ -185,7 +185,7 @@ impl CognitiveShaderService for ShaderGrpcService {
             route_filter: if req.route_filter.is_empty() { None } else { Some(req.route_filter) },
         };
         let r = crate::codec_research::list_tensors(&wire_req)
-            .map_err(|e| Status::invalid_argument(e))?;
+            .map_err(Status::invalid_argument)?;
         Ok(Response::new(pb::TensorsResponse {
             total: r.total as u32,
             shown: r.shown as u32,
@@ -210,14 +210,19 @@ impl CognitiveShaderService for ShaderGrpcService {
         let wire_req = crate::wire::WireCalibrateRequest {
             model_path: req.model_path,
             tensor_name: req.tensor_name,
+            // D0.1 extension fields — gRPC path uses legacy num_*
+            // fields only; the richer CodecParams + TensorView path is
+            // REST-only until the proto schema catches up (D0.3b).
+            params: None,
+            tensor_view: None,
             num_subspaces: if req.num_subspaces == 0 { 6 } else { req.num_subspaces as usize },
             num_centroids: if req.num_centroids == 0 { 256 } else { req.num_centroids as usize },
             kmeans_iterations: if req.kmeans_iterations == 0 { 20 } else { req.kmeans_iterations as usize },
             max_rows: if req.max_rows == 0 { None } else { Some(req.max_rows as usize) },
             icc_samples: if req.icc_samples == 0 { 512 } else { req.icc_samples as usize },
         };
         let r = crate::codec_research::calibrate_tensor(&wire_req)
-            .map_err(|e| Status::invalid_argument(e))?;
+            .map_err(Status::invalid_argument)?;
         Ok(Response::new(pb::CalibrateResponse {
             tensor_name: r.tensor_name,
             dims: r.dims,
@@ -248,7 +253,7 @@ impl CognitiveShaderService for ShaderGrpcService {
             icc_samples: if req.icc_samples == 0 { 512 } else { req.icc_samples as usize },
         };
         let r = crate::codec_research::row_count_probe(&wire_req)
-            .map_err(|e| Status::invalid_argument(e))?;
+            .map_err(Status::invalid_argument)?;
         Ok(Response::new(pb::ProbeResponse {
             tensor_name: r.tensor_name,
             n_rows: r.n_rows as u32,

crates/cognitive-shader-driver/src/lib.rs

@@ -112,37 +112,40 @@ pub mod sigma_rosetta;
 // reachable through the canonical bridge.
 
 // Per-op Wire DTOs (REST + protobuf). LAB-ONLY.
-#[cfg(feature = "serve")]
+// Gated on `any(serve, grpc)` because both transports share the same
+// DTOs; gRPC consumers (grpc.rs) and REST consumers (serve.rs) both
+// convert to/from the `Wire*` types in wire.rs.
+#[cfg(any(feature = "serve", feature = "grpc"))]
 pub mod wire;
 
 // D0.5 — model architecture auto-detection from config.json.
 // CODING_PRACTICES.md gap 1 remediation. LAB-ONLY.
-#[cfg(feature = "serve")]
+#[cfg(any(feature = "serve", feature = "grpc"))]
 pub mod auto_detect;
 
 // D1.1 — JIT kernel cache keyed by CodecParams::kernel_signature().
 // Structural layer; actual Cranelift IR emission defers to D1.1b. LAB-ONLY.
-#[cfg(feature = "serve")]
+#[cfg(any(feature = "serve", feature = "grpc"))]
 pub mod codec_kernel_cache;
 
 // D1.2 — rotation primitives (Identity / Hadamard / OPQ-stub). LAB-ONLY.
 // Hadamard is real (in-place butterfly); OPQ is stub pending D1.1b's
 // ndarray::hpc::jitson_cranelift::JitEngine adapter + matrix-blob loader.
-#[cfg(feature = "serve")]
+#[cfg(any(feature = "serve", feature = "grpc"))]
 pub mod rotation_kernel;
 
 // D1.3 — decode-kernel trait + residual composition.
 // Hydration/calibration path (NOT cascade inference — that uses
 // p64_bridge::CognitiveShader per cognitive-shader-architecture.md
 // line 582). LAB-ONLY.
-#[cfg(feature = "serve")]
+#[cfg(any(feature = "serve", feature = "grpc"))]
 pub mod decode_kernel;
 
 // D2.1 — token-agreement harness scaffold (I11 cert gate infra).
 // Reference model loader stub + top-k comparator + stub result with
 // machine-checkable `stub:true` flag. D2.2 adds real safetensors decode.
 // LAB-ONLY.
-#[cfg(feature = "serve")]
+#[cfg(any(feature = "serve", feature = "grpc"))]
 pub mod token_agreement;
 
 // Axum REST server. LAB-ONLY.