Merge remote-tracking branch 'origin/main' into fix/8306-finalize-committed-branch

Author: chubes4

src/command_contract/lab/handoff.rs

@@ -1,10 +1,6 @@
 //! Durable handoff and run-location evidence for detached Lab jobs.
 
-use crate::core::run_outcome_envelope::RunOutcomeEnvelope;
-use crate::core::runner_execution_envelope::{
-    PathMaterializationPlan, RunnerExecutionArtifactRef, RunnerExecutionNextAction,
-    RunnerExecutionRecord,
-};
+use crate::core::path_materialization::PathMaterializationPlan;
 
 use super::RunnerWorkloadArtifactRef;
 
@@ -258,46 +254,6 @@ impl RunnerHandoffEnvelope {
             follow_commands,
         }
     }
-
-    pub fn runner_execution_record(&self) -> RunnerExecutionRecord {
-        let record = if self.status == "running" {
-            RunnerExecutionRecord::in_flight(self.job_id.clone(), self.runner_id.clone(), "daemon")
-        } else {
-            RunnerExecutionRecord::terminal(
-                self.job_id.clone(),
-                self.runner_id.clone(),
-                "daemon",
-                if self.status == "succeeded" { 0 } else { 1 },
-            )
-        };
-        record
-            .with_job_id(self.job_id.clone())
-            .with_mirror_run_id(
-                self.mirror_run_id
-                    .clone()
-                    .or_else(|| self.persisted_run_id.clone())
-                    .or_else(|| self.durable_run_id.clone()),
-            )
-            .with_path_materialization_plan(self.path_materialization_plan.clone())
-            .with_artifact_refs(self.evidence.artifact_refs.iter().map(|artifact| {
-                RunnerExecutionArtifactRef {
-                    id: artifact.id.clone(),
-                    name: artifact.name.clone(),
-                    path: artifact.path.clone(),
-                    url: artifact.url.clone(),
-                }
-            }))
-            .with_next_actions(self.evidence.next_commands.iter().map(|command| {
-                RunnerExecutionNextAction {
-                    label: command.label.clone(),
-                    command: command.command.clone(),
-                }
-            }))
-    }
-
-    pub fn run_outcome_envelope(&self) -> RunOutcomeEnvelope {
-        RunOutcomeEnvelope::from_runner_execution_record(&self.runner_execution_record())
-    }
 }
 
 impl RunnerHandoffArtifactManifestRef {

src/command_contract/lab/workload.rs

@@ -48,7 +48,7 @@ pub struct RunnerWorkloadAgentTask {
     pub plan_ref: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub resolved_provider_policy:
-        Option<crate::core::agent_task_dispatch_service::ResolvedAgentTaskProviderPolicy>,
+        Option<crate::core::agent_task_schedule::ResolvedAgentTaskProviderPolicy>,
     pub dispatch_kind: RunnerWorkloadAgentTaskDispatchKind,
     pub lifecycle_mirror_policy: RunnerWorkloadAgentTaskLifecycleMirrorPolicy,
 }