partway towards commands

I got very confused and started mucking about with "spawn" when in fact all I needed was the "inline" extension type in orcx that allows the interpreter to expose custom constants.

orchid-host/src/extension.rs

@@ -1,9 +1,11 @@
+use std::any::Any;
 use std::cell::RefCell;
 use std::future::Future;
 use std::io;
 use std::num::NonZeroU64;
 use std::pin::Pin;
 use std::rc::{Rc, Weak};
+use std::time::Duration;
 
 use async_fn_stream::stream;
 use derive_destructure::destructure;
@@ -14,28 +16,23 @@ use futures::{AsyncRead, AsyncWrite, AsyncWriteExt, SinkExt, StreamExt};
 use hashbrown::{HashMap, HashSet};
 use itertools::Itertools;
 use orchid_api_traits::{Decode, Encode, Request};
-use orchid_base::format::{FmtCtxImpl, Format};
-use orchid_base::interner::{IStr, IStrv, es, ev, is, iv};
-use orchid_base::location::Pos;
-use orchid_base::logging::log;
-use orchid_base::name::Sym;
-use orchid_base::reqnot::{
-	Client, ClientExt, CommCtx, MsgReaderExt, ReqHandleExt, ReqReaderExt, io_comm,
+use orchid_base::{
+	AtomRepr, Client, ClientExt, CommCtx, FmtCtxImpl, Format, IStr, IStrv, MsgReaderExt, Pos,
+	ReqHandleExt, ReqReaderExt, Sym, Witness, es, ev, io_comm, is, iv, log, stash, with_stash,
 };
-use orchid_base::stash::{stash, with_stash};
-use orchid_base::tree::AtomRepr;
 
 use crate::api;
 use crate::atom::AtomHand;
 use crate::ctx::{Ctx, JoinHandle};
 use crate::dealias::{ChildError, ChildErrorKind, walk};
-use crate::expr::{Expr, PathSetBuilder};
+use crate::expr::{Expr, ExprFromApiCtx, PathSetBuilder};
 use crate::system::SystemCtor;
 use crate::tree::MemberKind;
 
 pub struct ExtPort {
 	pub input: Pin<Box<dyn AsyncWrite>>,
 	pub output: Pin<Box<dyn AsyncRead>>,
+	pub drop_trigger: Box<dyn Any>,
 }
 
 pub struct ReqPair<R: Request>(R, Sender<R::Response>);
@@ -56,6 +53,8 @@ pub struct ExtensionData {
 	lex_recur: Mutex<HashMap<api::ParsId, Sender<ReqPair<api::SubLex>>>>,
 	strings: RefCell<HashSet<IStr>>,
 	string_vecs: RefCell<HashSet<IStrv>>,
+	/// Moved over from [ExtPort] to allow hooking to the extension's drop
+	_drop_trigger: Box<dyn Any>,
 }
 impl Drop for ExtensionData {
 	fn drop(&mut self) {
@@ -85,7 +84,7 @@ impl Extension {
 			let weak2 = weak;
 			let weak = weak.clone();
 			let ctx2 = ctx.clone();
-			let join_ext = ctx.clone().spawn(async move {
+			let join_ext = ctx.clone().spawn(Duration::ZERO, async move {
 				comm
 					.listen(
 						async |reader| {
@@ -192,11 +191,17 @@ impl Extension {
 												})
 												.await
 										},
-										api::ExprReq::Create(ref cre @ api::Create(ref expr)) => {
-											let expr = Expr::from_api(expr, PathSetBuilder::new(), ctx.clone()).await;
+										api::ExprReq::Create(cre) => {
+											let req = Witness::of(&cre);
+											let api::Create(sys, expr) = cre;
+											let expr = Expr::from_api(expr, PathSetBuilder::new(), ExprFromApiCtx {
+												ctx: ctx.clone(),
+												sys,
+											})
+											.await;
 											let expr_id = expr.id();
 											ctx.exprs.give_expr(expr);
-											handle.reply(cre, &expr_id).await
+											handle.reply(req, &expr_id).await
 										},
 									},
 									api::ExtHostReq::LsModule(ref ls @ api::LsModule(_sys, path)) => {
@@ -286,6 +291,7 @@ impl Extension {
 				client: Rc::new(client),
 				strings: RefCell::default(),
 				string_vecs: RefCell::default(),
+				_drop_trigger: init.drop_trigger,
 			}
 		})))
 	}
@@ -336,10 +342,13 @@ impl Extension {
 	}
 	pub fn system_drop(&self, id: api::SysId) {
 		let rc = self.clone();
-		let _ = self.ctx().spawn(with_stash(async move {
-			rc.client().request(api::SystemDrop(id)).await.unwrap();
-			rc.ctx().systems.write().await.remove(&id);
-		}));
+		let _ = self.ctx().spawn(
+			Duration::ZERO,
+			with_stash(async move {
+				rc.client().request(api::SystemDrop(id)).await.unwrap();
+				rc.ctx().systems.write().await.remove(&id);
+			}),
+		);
 	}
 	#[must_use]
 	pub fn downgrade(&self) -> WeakExtension { WeakExtension(Rc::downgrade(&self.0)) }