Merge pull request #7863 from Extra-Chill/refactor/consolidate-lab-dispatch-projection

Consolidate Lab dispatch projection

Author: chubes4

src/command_contract/lab.rs

@@ -41,12 +41,8 @@ pub const RUNNER_ARTIFACT_MANIFEST_SCHEMA: &str = crate::core::artifacts::ARTIFA
 pub const RUNNER_ARTIFACT_MANIFEST_FILE: &str = crate::core::artifacts::ARTIFACT_MANIFEST_FILE;
 pub const RUNNER_ARTIFACT_ROOT_DIR_SUFFIX: &str = "-homeboy-artifacts";
 
-/// Routing-policy flags shared by every Lab command representation
-/// (`LabCommandContract`, `LabRoutePlan`, `LabOffloadCommand`). These four
-/// booleans travel together as one cohesive policy as a command is resolved
-/// from its contract into a route plan and finally an offload command, so they
-/// live in a single embedded struct rather than being duplicated field-by-field
-/// across the three layers.
+/// Routing-policy flags owned by the Lab command contract and retained through
+/// route planning, offload, and runner dispatch.
 #[derive(Debug, Clone, Copy, Default, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub struct LabRoutingPolicy {
     /// Whether the command offloads to a default Lab runner without an explicit
@@ -1075,6 +1071,10 @@ pub(super) fn apply_lab_contract_to_descriptor(
 }
 
 impl LabCommandContract {
+    pub const fn is_portable(self) -> bool {
+        matches!(self.portability, LabCommandPortability::Portable)
+    }
+
     pub(crate) fn into_route_contract(
         self,
         required_extensions: Vec<String>,

src/commands/infra/route.rs

@@ -1086,7 +1086,7 @@ fn strip_component_target_args(
 mod tests {
     use super::*;
     use clap::Parser;
-    use homeboy::command_contract::lab_runner_supports_contract_label;
+    use homeboy::command_contract::{lab_runner_supports_contract_label, LabCommandPortability};
     use std::fs;
     use std::path::Path;
     use std::sync::{Mutex, MutexGuard, OnceLock};
@@ -1228,8 +1228,7 @@ mod tests {
         let command = lab_offload_command(&cli.command).unwrap().unwrap();
 
         assert_eq!(command.hot_label, "review lint");
-        assert!(command.portable);
-        assert!(command.unsupported_reason.is_none());
+        assert!(command.is_portable());
     }
 
     #[test]
@@ -1278,8 +1277,7 @@ mod tests {
         let command = lab_offload_command(&cli.command).unwrap().unwrap();
 
         assert_eq!(command.hot_label, "review lint");
-        assert!(command.portable);
-        assert!(command.unsupported_reason.is_none());
+        assert!(command.is_portable());
     }
 
     #[test]
@@ -1331,8 +1329,7 @@ mod tests {
 
         assert_eq!(cli.runner.as_deref(), Some("homeboy-lab"));
         assert_eq!(command.hot_label, "review test");
-        assert!(command.portable);
-        assert!(command.unsupported_reason.is_none());
+        assert!(command.is_portable());
     }
 
     #[test]
@@ -1977,7 +1974,7 @@ mod tests {
         let command = lab_offload_command(&cli.command).unwrap().unwrap();
 
         assert_eq!(command.hot_label, "rig check");
-        assert!(command.portable);
+        assert!(command.is_portable());
         assert!(!command.routing_policy.default_lab_offload);
         assert!(!command.routing_policy.infer_source_path_tools);
         assert!(cli.command.supports_lab_runner());
@@ -2018,7 +2015,7 @@ mod tests {
         let command = lab_offload_command(&cli.command).unwrap().unwrap();
 
         assert_eq!(command.hot_label, "rig check");
-        assert!(command.portable);
+        assert!(command.is_portable());
         assert!(command.routing_policy.default_lab_offload);
         assert!(!command.routing_policy.infer_source_path_tools);
     }
@@ -2030,8 +2027,7 @@ mod tests {
         let command = lab_offload_command(&cli.command).unwrap().unwrap();
 
         assert_eq!(command.hot_label, "review lint");
-        assert!(command.portable);
-        assert!(command.unsupported_reason.is_none());
+        assert!(command.is_portable());
         assert!(command.routing_policy.requires_extension_parity);
     }
 
@@ -2049,9 +2045,8 @@ mod tests {
         let command = lab_offload_command(&cli.command).unwrap().unwrap();
 
         assert_eq!(command.hot_label, "extension update");
-        assert!(command.portable);
+        assert!(command.is_portable());
         assert!(!command.routing_policy.default_lab_offload);
-        assert!(command.unsupported_reason.is_none());
         assert!(!command.routing_policy.requires_extension_parity);
         assert!(command.required_extensions.is_empty());
         assert!(!command.routing_policy.infer_source_path_tools);
@@ -2076,9 +2071,8 @@ mod tests {
         let command = lab_offload_command(&cli.command).unwrap().unwrap();
 
         assert_eq!(command.hot_label, "extension refresh");
-        assert!(command.portable);
+        assert!(command.is_portable());
         assert!(!command.routing_policy.default_lab_offload);
-        assert!(command.unsupported_reason.is_none());
         assert!(!command.routing_policy.requires_extension_parity);
         assert!(command.required_extensions.is_empty());
         assert!(!command.routing_policy.infer_source_path_tools);
@@ -2117,9 +2111,8 @@ mod tests {
         let command = lab_offload_command(&cli.command).unwrap().unwrap();
 
         assert_eq!(command.hot_label, "extension show");
-        assert!(command.portable);
+        assert!(command.is_portable());
         assert!(!command.routing_policy.default_lab_offload);
-        assert!(command.unsupported_reason.is_none());
         assert!(!command.routing_policy.requires_extension_parity);
         assert!(command.required_extensions.is_empty());
         assert!(!command.routing_policy.infer_source_path_tools);
@@ -2150,7 +2143,7 @@ mod tests {
         assert!(local_policy.deny_local_execution());
         assert_eq!(command.hot_label, "fuzz doctor");
         assert!(lab_runner_supports_contract_label(command.hot_label));
-        assert!(command.portable);
+        assert!(command.is_portable());
         assert!(!command.routing_policy.default_lab_offload);
         assert!(command.routing_policy.requires_extension_parity);
         assert!(command.routing_policy.read_only_polling);
@@ -2372,7 +2365,7 @@ mod tests {
 
             assert_eq!(cli.runner.as_deref(), Some("homeboy-lab"));
             assert!(lab_runner_supports_contract_label(command.hot_label));
-            assert!(command.portable);
+            assert!(command.is_portable());
             assert!(command.routing_policy.default_lab_offload);
         }
     }
@@ -2391,7 +2384,7 @@ mod tests {
             "cargo test --locked",
         ]);
         let automatic_command = lab_offload_command(&automatic.command).unwrap().unwrap();
-        assert!(automatic_command.portable);
+        assert!(automatic_command.is_portable());
         assert!(automatic_command.routing_policy.default_lab_offload);
 
         let explicit = Cli::parse_from([
@@ -2409,7 +2402,7 @@ mod tests {
         ]);
         let explicit_command = lab_offload_command(&explicit.command).unwrap().unwrap();
         assert_eq!(explicit.runner.as_deref(), Some("homeboy-lab"));
-        assert!(explicit_command.portable);
+        assert!(explicit_command.is_portable());
 
         let lab_only = Cli::parse_from([
             "homeboy",
@@ -2428,12 +2421,10 @@ mod tests {
             lab_only.allow_local_fallback,
             lab_only.lab_only,
         );
-        assert!(
-            lab_offload_command(&lab_only.command)
-                .unwrap()
-                .unwrap()
-                .portable
-        );
+        assert!(lab_offload_command(&lab_only.command)
+            .unwrap()
+            .unwrap()
+            .is_portable());
         assert!(local_policy.deny_local_execution());
     }
 
@@ -2451,7 +2442,7 @@ mod tests {
 
         assert_eq!(cli.runner.as_deref(), Some("homeboy-lab"));
         assert!(lab_runner_supports_contract_label(command.hot_label));
-        assert!(command.portable);
+        assert!(command.is_portable());
         assert!(!command.routing_policy.default_lab_offload);
         assert!(!command.routing_policy.requires_extension_parity);
         assert!(command.required_extensions.is_empty());
@@ -2486,7 +2477,7 @@ mod tests {
             command.hot_label,
             "agent-task controller from-spec --resume/run-from-spec/materialize"
         );
-        assert!(command.portable);
+        assert!(command.is_portable());
         assert!(command.routing_policy.default_lab_offload);
         assert!(!command.routing_policy.requires_extension_parity);
         assert_eq!(
@@ -2536,7 +2527,7 @@ mod tests {
                 command.hot_label,
                 "agent-task controller from-spec --resume/run-from-spec/materialize"
             );
-            assert!(command.portable);
+            assert!(command.is_portable());
             assert!(command.routing_policy.default_lab_offload);
             assert!(command.routing_policy.infer_source_path_tools);
             assert!(!command.routing_policy.requires_extension_parity);
@@ -2604,7 +2595,7 @@ mod tests {
         assert_eq!(cli.runner.as_deref(), Some("homeboy-lab"));
         assert!(local_policy.deny_local_execution());
         assert_eq!(command.hot_label, "agent-task fanout run-plan");
-        assert!(command.portable);
+        assert!(command.is_portable());
         assert!(command.routing_policy.default_lab_offload);
         assert!(command.routing_policy.requires_extension_parity);
     }
@@ -2638,7 +2629,7 @@ mod tests {
         assert_eq!(cli.runner.as_deref(), Some("homeboy-lab"));
         assert!(local_policy.deny_local_execution());
         assert_eq!(command.hot_label, "agent-task fanout cook-batch");
-        assert!(command.portable);
+        assert!(command.is_portable());
         assert!(command.routing_policy.default_lab_offload);
         assert!(command.routing_policy.requires_extension_parity);
     }
@@ -2671,7 +2662,7 @@ mod tests {
 
             assert_eq!(cli.runner.as_deref(), Some("homeboy-lab"));
             assert_eq!(command.hot_label, "agent-task fanout status/artifacts");
-            assert!(command.portable);
+            assert!(command.is_portable());
             assert!(!command.routing_policy.default_lab_offload);
             assert_eq!(
                 command.source_path_mode,
@@ -2707,7 +2698,7 @@ mod tests {
 
         assert_eq!(cli.runner.as_deref(), Some("homeboy-lab"));
         assert_eq!(command.hot_label, "tunnel service start");
-        assert!(command.portable);
+        assert!(command.is_portable());
         assert!(!command.routing_policy.default_lab_offload);
         assert_eq!(
             command.source_path_mode,
@@ -2740,7 +2731,7 @@ mod tests {
         let command = lab_offload_command(&cli.command).unwrap().unwrap();
 
         assert_eq!(command.hot_label, "tunnel preview-consumer run");
-        assert!(command.portable);
+        assert!(command.is_portable());
         assert!(!command.routing_policy.default_lab_offload);
     }
 
@@ -2751,8 +2742,7 @@ mod tests {
         let command = lab_offload_command(&cli.command).unwrap().unwrap();
 
         assert_eq!(command.hot_label, "review audit");
-        assert!(command.portable);
-        assert_eq!(command.unsupported_reason, None);
+        assert!(command.is_portable());
         assert!(command.routing_policy.requires_extension_parity);
     }
 
@@ -2763,8 +2753,7 @@ mod tests {
         let command = lab_offload_command(&cli.command).unwrap().unwrap();
 
         assert_eq!(command.hot_label, "review audit");
-        assert!(command.portable);
-        assert_eq!(command.unsupported_reason, None);
+        assert!(command.is_portable());
         assert!(command.routing_policy.requires_extension_parity);
     }
 
@@ -2775,8 +2764,10 @@ mod tests {
         let command = lab_offload_command(&cli.command).unwrap().unwrap();
 
         assert_eq!(command.hot_label, "rig up");
-        assert!(!command.portable);
-        assert!(command.unsupported_reason.is_some());
+        assert!(matches!(
+            command.portability,
+            LabCommandPortability::LocalOnly(_)
+        ));
         assert!(!command.routing_policy.requires_extension_parity);
     }
 

src/core/api_jobs/mod.rs

@@ -814,17 +814,15 @@ mod tests {
         )
         .build();
         let command_contract = crate::core::runner::LabOffloadCommand {
-            hot_label: "tunnel preview-client start",
-            portable: true,
-            unsupported_reason: None,
-            source_path_mode: crate::core::runner::LabOffloadSourcePathMode::CwdOrPathFlag,
-            workspace_mode_policy:
-                crate::core::runner::LabOffloadWorkspaceModePolicy::ChangedSinceGitElseSnapshot,
-            secret_env_sources: Vec::new(),
+            command: crate::command_contract::LabCommandContract::portable(
+                "tunnel preview-client start",
+                None,
+                false,
+                &[],
+            ),
             required_extensions: Vec::new(),
             required_capabilities: Vec::new(),
             workload: None,
-            routing_policy: crate::command_contract::LabRoutingPolicy::default(),
         };
         request.runner_workload = Some(crate::core::runner::workload::build_runner_workload(
             crate::core::runner::workload::RunnerWorkloadBuildInput {

src/core/lab_routing.rs

@@ -9,8 +9,7 @@ use crate::command_contract::{
     LabWorkspaceModePolicy,
 };
 use crate::core::command_execution_plan::{
-    CommandPortability, CommandSourceMaterialization, CommandSourcePolicy, CommandWorkspacePolicy,
-    LabRoutePlan,
+    CommandSourceMaterialization, CommandSourcePolicy, CommandWorkspacePolicy, LabRoutePlan,
 };
 use crate::core::observation::records::RunEvidenceCommands;
 use crate::core::observation::RunStatus;
@@ -448,47 +447,11 @@ pub fn lab_route_plan_from_contract(contract: LabCommandContract) -> LabRoutePla
 pub fn lab_offload_command_from_route_contract(
     route_contract: LabCommandRouteContract,
 ) -> runners::LabOffloadCommand {
-    let hot_label = route_contract.command.hot_label;
-    let portability = route_contract.command.portability;
-    let secret_env_sources = route_contract.command.secret_env_sources.to_vec();
-    let workload = route_contract.workload.clone();
-    let plan = lab_route_plan_from_route_contract(route_contract);
     runners::LabOffloadCommand {
-        hot_label,
-        portable: matches!(plan.portability, CommandPortability::Portable),
-        unsupported_reason: match portability {
-            LabCommandPortability::Portable => None,
-            LabCommandPortability::LocalOnly(reason) => Some(reason),
-        },
-        source_path_mode: match plan.source_policy {
-            CommandSourcePolicy::ControllerCwdOrExplicitPath
-            | CommandSourcePolicy::MaterializeControllerPath => {
-                runners::LabOffloadSourcePathMode::CwdOrPathFlag
-            }
-            CommandSourcePolicy::RunnerResident => {
-                runners::LabOffloadSourcePathMode::RunnerResident
-            }
-        },
-        workspace_mode_policy: match plan.workspace_policy {
-            CommandWorkspacePolicy::ChangedSinceGitElseSnapshot => {
-                runners::LabOffloadWorkspaceModePolicy::ChangedSinceGitElseSnapshot
-            }
-            CommandWorkspacePolicy::Git => runners::LabOffloadWorkspaceModePolicy::Git,
-            CommandWorkspacePolicy::GitCheckoutRequired => {
-                runners::LabOffloadWorkspaceModePolicy::GitCheckoutRequired
-            }
-            CommandWorkspacePolicy::RunnerResident => {
-                runners::LabOffloadWorkspaceModePolicy::RunnerResident
-            }
-            CommandWorkspacePolicy::Snapshot => {
-                runners::LabOffloadWorkspaceModePolicy::ChangedSinceGitElseSnapshot
-            }
-        },
-        secret_env_sources,
-        required_extensions: plan.required_extensions,
-        required_capabilities: plan.required_capabilities,
-        workload,
-        routing_policy: plan.routing_policy,
+        command: route_contract.command,
+        required_extensions: route_contract.required_extensions,
+        required_capabilities: route_contract.required_capabilities,
+        workload: route_contract.workload,
     }
 }
 
@@ -672,10 +635,10 @@ mod tests {
             vec!["wordpress".to_string(), "playwright".to_string()],
         );
 
+        assert_eq!(command.command, lab_contract());
         assert_eq!(command.hot_label, "trace");
-        assert!(command.portable);
+        assert!(command.is_portable());
         assert!(command.routing_policy.default_lab_offload);
-        assert_eq!(command.unsupported_reason, None);
         assert_eq!(
             command.workspace_mode_policy,
             runners::LabOffloadWorkspaceModePolicy::GitCheckoutRequired