fix: rebase

Author: DavSanchez

agent-control/src/agent_control/run/on_host.rs

@@ -151,21 +151,18 @@ impl AgentControlRunner {
             })?;
         }
 
-        let auto_generated_dir_path = self.base_paths.remote_dir.join(GENERATED_FOLDER_NAME);
         let agents_assembler = Arc::new(
             LocalEffectiveAgentsAssembler::new(
                 self.agent_type_registry.clone(),
                 template_renderer,
                 self.agent_type_var_constraints,
                 secrets_providers,
             )
-            .with_autogenerated_dir(self.base_paths.remote_dir),
+            .with_autogenerated_dir(&self.base_paths.remote_dir),
         );
 
-        let supervisor_builder = SupervisortBuilderOnHost::new(
-            self.base_paths.log_dir.join(SUB_AGENT_DIR),
-            auto_generated_dir_path,
-        );
+        let supervisor_builder =
+            SupervisortBuilderOnHost::new(self.base_paths.log_dir.join(SUB_AGENT_DIR));
 
         let remote_config_validators = vec![
             SupportedRemoteConfigValidator::Signature(self.signature_validator),

agent-control/src/sub_agent/on_host/builder.rs

@@ -132,15 +132,11 @@ where
 
 pub struct SupervisortBuilderOnHost {
     logging_path: PathBuf,
-    autogenerated_dir_path: PathBuf,
 }
 
 impl SupervisortBuilderOnHost {
-    pub fn new(logging_path: PathBuf, autogenerated_dir_path: PathBuf) -> Self {
-        Self {
-            logging_path,
-            autogenerated_dir_path,
-        }
+    pub fn new(logging_path: PathBuf) -> Self {
+        Self { logging_path }
     }
 }
 

agent-control/src/sub_agent/supervisor/starter.rs

@@ -1,5 +1,3 @@
-use std::io;
-
 use crate::event::SubAgentInternalEvent;
 use crate::event::channel::EventPublisher;
 use crate::health::health_checker::HealthCheckerError;