Host: one place for the instance config; message ids are strings

cli/src/supervisor.rs

@@ -12,7 +12,7 @@ use tokio::sync::{mpsc, oneshot};
 use wasmtime::component::Component;
 
 use crate::broker::{Broker, Envelope, SHUTDOWN_DEADLINE, shutdown_line};
-use crate::runtime::{Exit, Instance, InstanceConfig};
+use crate::runtime::{Exit, Instance};
 
 /// A new version that crashes this often within `CRASH_WINDOW` after an
 /// upgrade is rolled back automatically.
@@ -178,16 +178,7 @@ impl Supervisor {
         if self.component.is_none() {
             self.component = Some(self.broker.load_version(&self.id, self.version)?);
         }
-        let world = &self.broker.world;
-        let cfg = InstanceConfig {
-            mounts: self.broker.mounts(&self.id),
-            allow_http: true,
-            stderr_log: world.actor_dir(&self.id).join("stderr.log"),
-            env: vec![
-                ("SAUSAGE_ACTOR".into(), self.id.clone()),
-                ("SAUSAGE_VERSION".into(), self.version.to_string()),
-            ],
-        };
+        let cfg = self.broker.instance_config(&self.id, self.version, None);
         self.instance = Some(self.broker.runtime.start(self.component.as_ref().unwrap(), cfg)?);
         Ok(())
     }