dougong 0.9.0 → 0.10.0

package/dist/index.js

@@ -1,78 +1,96 @@
-import { _ as e, a as t, b as n, c as r, d as i, f as a, g as o, h as s, i as c, l, m as u, n as d, o as f, p, r as m, s as h, t as g, u as _, v, y } from "./record-CZVpq8vk.js";
+import { A as e, B as t, C as n, D as r, E as i, F as a, G as o, H as s, I as c, J as l, K as u, L as d, M as f, N as p, O as m, P as ee, R as te, S as ne, T as re, U as ie, V as ae, W as h, Y as g, _, a as oe, b as v, c as y, d as b, f as x, g as se, h as S, i as ce, j as le, k as ue, l as C, m as de, n as fe, o as w, p as pe, q as T, r as me, s as E, t as he, u as D, v as ge, w as _e, x as ve, y as ye, z as O } from "./serial-queue-DjEs2KFf.js";
 // src/contracts/contracts.ts
-function ee(e, t) {
-	if (!b(t)) throw TypeError(typeof t == "string" && t.trim() ? `${e} id cannot start or end with whitespace` : `${e} id must be a non-empty string`);
+function be(e, t) {
+	if (!xe(t)) throw TypeError(typeof t == "string" && t.trim() ? `${e} id cannot start or end with whitespace` : `${e} id must be a non-empty string`);
 }
-function b(e) {
+function xe(e) {
 	return typeof e == "string" && e.length > 0 && e === e.trim();
 }
-function x(e, t) {
-	return ee("Contract", t), Object.freeze({
+function k(e, t) {
+	return be("Contract", t), Object.freeze({
 		id: t,
 		kind: e
 	});
 }
-function S(e, t) {
+function A(e, t) {
 	let n = Object.getOwnPropertyDescriptor(e, t);
-	return n && "value" in n ? n.value : void 0;
+	if (n && !("value" in n)) throw TypeError(`Contract field '${t}' must be a data property`);
+	return n?.value;
 }
-function C(e, t) {
-	let n = S(e, "id");
-	if (b(n) && (t === "service" || t === "extensionPoint" || t === "event")) return {
+function j(e, t) {
+	let n = A(e, "id");
+	if (xe(n) && (t === "service" || t === "extensionPoint" || t === "event")) return {
 		id: n,
 		kind: t
 	};
 }
-function w(e, t, n) {
-	let r = e && typeof e == "object" ? C(e, S(e, "kind")) : void 0;
-	if (!r || t !== void 0 && r.kind !== t) throw TypeError(n ?? (t ? `Expected ${te(t)}` : "Invalid contract"));
+function M(e, t, n) {
+	let r = e && typeof e == "object" ? j(e, A(e, "kind")) : void 0;
+	if (!r || t !== void 0 && r.kind !== t) throw TypeError(n ?? (t ? `Expected ${Se(t)}` : "Invalid contract"));
 	return Object.freeze(r);
 }
-function te(e) {
+function Se(e) {
 	return e === "extensionPoint" ? "an ExtensionPoint" : e === "event" ? "an Event" : "a Service";
 }
-function ne(e) {
-	return x("service", e);
+function Ce(e) {
+	return k("service", e);
 }
-function re(e) {
-	return x("event", e);
+function we(e) {
+	return k("event", e);
 }
-function ie(e) {
-	return x("extensionPoint", e);
+function Te(e) {
+	return k("extensionPoint", e);
 }
-function ae(e) {
+function Ee(e) {
 	return Object.freeze({
 		kind: "optional",
-		service: w(e, "service", "optional() expects a Service")
+		service: M(e, "service", "optional() expects a Service")
 	});
 }
-function T(e, t = "Expected a Service or ExtensionPoint", n = "Expected a Service") {
+function De(e, t = "Expected a Service or ExtensionPoint", n = "Expected a Service") {
 	if (!e || typeof e != "object") throw TypeError(t);
-	let r = S(e, "kind");
+	let r = A(e, "kind");
 	if (r === "optional") return Object.freeze({
 		kind: r,
-		service: w(S(e, "service"), "service", n)
+		service: M(A(e, "service"), "service", n)
 	});
-	let i = C(e, r);
+	let i = j(e, r);
 	if (!i || i.kind === "event") throw TypeError(t);
 	return Object.freeze(i);
 }
 // src/contracts/resource.ts
-function E(e) {
+var N = /* @__PURE__ */ new WeakMap(), Oe = Object.freeze({ kind: "control" });
+function P(e) {
+	return N.set(e, Oe), e;
+}
+function ke(e) {
+	let t = N.get(e);
+	if (t) throw TypeError(t.kind === "control" ? "Owned control handles cannot be adopted as resources" : "Resource already has a Lifetime owner");
+	let n = { kind: "claim" };
+	return N.set(e, n), () => {
+		N.get(e) === n && N.delete(e);
+	};
+}
+function Ae(e) {
 	if (typeof e != "object" && typeof e != "function" || e === null) throw TypeError("Resource must implement Symbol.dispose or Symbol.asyncDispose");
-	let t = e[y];
+	let t = e[l];
 	if (t != null) {
 		if (typeof t != "function") throw TypeError("Symbol.asyncDispose must be a function");
 		return () => Reflect.apply(t, e, []);
 	}
-	let r = e[n];
-	if (typeof r != "function") throw TypeError("Resource must implement Symbol.dispose or Symbol.asyncDispose");
-	return () => v(Reflect.apply(r, e, []), "Symbol.dispose must be synchronous");
+	let n = e[g];
+	if (typeof n != "function") throw TypeError("Resource must implement Symbol.dispose or Symbol.asyncDispose");
+	return () => u(Reflect.apply(n, e, []), "Symbol.dispose must be synchronous");
 }
 // src/lifetime/lifetime.ts
-var D = /* @__PURE__ */ new WeakMap(), oe = class {
+var je = y()("lifetime"), F = /* @__PURE__ */ new WeakMap(), Me = class {
 	published = !1;
-}, O = Object.freeze(new DOMException("Resource disposed", "AbortError")), se = class {
+};
+function I() {
+	let e = new DOMException("Resource disposed", "AbortError");
+	return Reflect.set(e, "stack", void 0), Object.freeze(e);
+}
+var Ne = class {
 	id;
 	kind;
 	#e;
@@ -80,8 +98,9 @@ var D = /* @__PURE__ */ new WeakMap(), oe = class {
 	#n;
 	#r;
 	#i;
-	constructor(e, t, n, r, i) {
-		this.#i = i, this.id = e, this.kind = t, this.#e = n, this.#t = r;
+	#a;
+	constructor(e, t, n, r, i, a) {
+		this.#i = i, this.#a = a, this.id = e, this.kind = t, this.#e = n, this.#t = r;
 	}
 	get failure() {
 		return this.#r;
@@ -91,71 +110,66 @@ var D = /* @__PURE__ */ new WeakMap(), oe = class {
 		let e = this.#e;
 		if (!e) return Promise.resolve();
 		let t = Promise.withResolvers();
-		return this.#n = Object.freeze(t.promise), Promise.resolve().then(e).then(() => {
+		return this.#n = Object.freeze(t.promise), Promise.resolve().then(() => T(e())).then(() => {
 			this.#e = void 0;
 			let e = this.#t;
-			this.#t = void 0, this.#i = void 0, e?.(), t.resolve();
+			this.#t = void 0, this.#i = void 0, this.#a = void 0, e?.(), t.resolve();
 		}, (e) => {
-			this.#r = new _(e), this.#i?.(), t.reject(e);
+			this.#i?.(e), this.#r = new b(e), this.#a?.(), t.reject(e);
 		}), t.promise;
 	}
 	forget() {
 		if (this.#n) return;
-		this.#e = void 0, this.#i = void 0;
+		this.#e = void 0, this.#i = void 0, this.#a = void 0;
 		let e = this.#t;
 		this.#t = void 0, e?.();
 	}
-}, ce = class {
+}, Pe = class {
 	id;
 	publication;
 	failure;
-	constructor(e, t) {
-		this.id = e, this.publication = t;
+	#e;
+	constructor(e, t, n) {
+		this.id = e, this.publication = t, this.#e = n;
 	}
 	withdraw() {
 		if (this.failure) return !1;
 		try {
-			v(this.publication[n](), "Publication withdrawal must be synchronous");
+			u(this.publication[g](), "Publication withdrawal must be synchronous");
 		} catch (e) {
 			return this.failure = {
 				reason: e,
-				recorded: new _(e)
-			}, !1;
+				recorded: void 0
+			}, this.#e?.(e), this.failure.recorded = new b(e), !1;
 		}
-		return !0;
+		return this.#e = void 0, !0;
 	}
-}, le = class {
+}, Fe = class {
 	handle;
 	#e;
 	#t;
 	settled;
 	constructor(e, t, n) {
-		let r = new AbortController();
-		this.#e = r, this.#t = n;
+		let i = new AbortController();
+		this.#e = i, this.#t = n;
 		let a = t, o = (e) => {
 			if (!a) return;
 			let t = a;
 			a = void 0;
 			try {
-				i(r.signal, e) || t(e);
+				r(i.signal, e) || t(e);
 			} catch (e) {
 				queueMicrotask(() => {
 					throw e;
 				});
 			}
-		}, s = Promise.resolve().then(() => {
-			try {
-				return e(r.signal);
-			} catch (e) {
-				throw o(e), e;
-			}
-		});
+		}, s = Promise.resolve().then(() => T(e(i.signal)));
 		this.settled = Object.freeze(s.then(() => this.#n(), (e) => {
 			o(e), this.#n();
-		})), this.handle = Object.freeze({
+		})), this.handle = P(Object.freeze({
 			result: s,
-			[y]: this.#r.bind(this)
-		});
+			[l]: this.#r.bind(this)
+		}));
 	}
 	#n() {
 		this.#e = void 0;
@@ -163,13 +177,13 @@ var D = /* @__PURE__ */ new WeakMap(), oe = class {
 		this.#t = void 0, e?.();
 	}
 	#r() {
-		return this.cancel(O), this.settled;
+		return this.cancel(I()), this.settled;
 	}
 	cancel(e) {
 		let t = this.#e;
 		this.#e = void 0, t?.abort(e);
 	}
-}, ue = class t {
+}, Ie = class n {
 	#e;
 	#t = new AbortController();
 	#n;
@@ -182,25 +196,26 @@ var D = /* @__PURE__ */ new WeakMap(), oe = class {
 	#l;
 	#u;
 	#d;
-	#f = "active";
-	#p = 0;
+	#f;
+	#p = "active";
 	#m = 0;
-	#h;
+	#h = 0;
 	#g;
 	#_;
 	#v;
 	#y;
 	#b;
-	constructor(t, n) {
-		if (de(t.label), typeof t.report != "function") throw TypeError("Lifetime error reporter must be a function");
-		this.#e = t.label, this.#u = t.report, this.#d = t.changed, this.#l = A(t.shutdownTimeoutMilliseconds), this.#n = n?.visibility ?? new oe(), this.#g = n?.detach, t.parentSignal && (this.#h = e(t.parentSignal, (e) => {
-			this.block(), this.#D(e);
+	#x;
+	constructor(e, t) {
+		if (Re(e.label), typeof e.report != "function") throw TypeError("Lifetime error reporter must be a function");
+		this.#e = e.label, this.#u = e.report, this.#d = e.releaseFailed, this.#f = e.changed, this.#l = L(e.shutdownTimeoutMilliseconds), this.#n = t?.visibility ?? new Me(), this.#_ = t?.detach, e.parentSignal && (this.#g = o(e.parentSignal, (e) => {
+			this.block(), this.#O(e);
 		}));
 	}
 	get handle() {
-		return this.#b ??= this.#x({});
+		return this.#x ??= this.#S({});
 	}
-	#x(e) {
+	#S(e) {
 		let t = this, n = Object.freeze({
 			...e,
 			get signal() {
@@ -213,15 +228,16 @@ var D = /* @__PURE__ */ new WeakMap(), oe = class {
 			acquire: (e) => this.acquire(e),
 			interrupt: (e) => this.interrupt(e)
 		});
-		return D.set(n, this), n;
+		return F.set(n, this), n;
 	}
 	resolveOwner(e) {
-		if (this.#N(), e === void 0) return this;
-		let t = D.get(e);
-		if (!t || !this.#C(t)) throw TypeError("Lifetime owner must belong to the current scope tree");
-		return t.#N(), t;
+		let t = e === void 0 ? void 0 : E(e, "Lifetime ownership", { fields: je }).lifetime;
+		if (this.#F(), t === void 0) return this;
+		let n = F.get(t);
+		if (!n || !this.#w(n)) throw TypeError("Lifetime owner must belong to the current scope tree");
+		return n.#F(), n;
 	}
-	*#S() {
+	*#C() {
 		let e = [this];
 		for (; e.length;) {
 			let t = e.pop();
@@ -229,32 +245,32 @@ var D = /* @__PURE__ */ new WeakMap(), oe = class {
 			for (let n of [...t.#r].reverse()) e.push(n);
 		}
 	}
-	#C(e) {
-		for (let t of this.#S()) if (t === e) return !0;
+	#w(e) {
+		for (let t of this.#C()) if (t === e) return !0;
 		return !1;
 	}
 	get signal() {
 		return this.#t.signal;
 	}
 	get phase() {
-		return this.#f;
+		return this.#p;
 	}
 	get acceptsWork() {
-		return this.#f === "active" && !o(this.signal);
+		return this.#p === "active" && !h(this.signal);
 	}
 	get published() {
 		return this.#n.published;
 	}
 	get busy() {
-		for (let e of this.#S()) if (e.#p > 0) return !0;
+		for (let e of this.#C()) if (e.#m > 0) return !0;
 		return !1;
 	}
 	snapshot() {
 		let e = /* @__PURE__ */ new Map();
-		for (let t of [...this.#S()].reverse()) e.set(t, t.#w([...t.#r].map((t) => e.get(t))));
+		for (let t of [...this.#C()].reverse()) e.set(t, t.#T([...t.#r].map((t) => e.get(t))));
 		return e.get(this);
 	}
-	#w(e) {
+	#T(e) {
 		let t = [], n = (e, n, r) => {
 			r && t.push(Object.freeze({
 				id: e,
@@ -265,173 +281,179 @@ var D = /* @__PURE__ */ new WeakMap(), oe = class {
 		for (let e of this.#i) n(e.id, e.kind, e.failure);
 		for (let e of this.#a) n(e.id, e.kind, e.failure);
 		for (let e of this.#o) n(e.id, "publication", e.failure?.recorded);
-		return n(0, "shutdown", this.#y), Object.freeze({
+		return n(0, "shutdown", this.#b), Object.freeze({
 			label: this.#e,
-			phase: this.#f,
+			phase: this.#p,
 			cleanups: this.#i.size,
 			interrupts: this.#a.size,
 			tasks: this.#s.size,
 			acquisitions: this.#c.size,
 			publications: this.#o.size,
-			foreground: this.#p,
+			foreground: this.#m,
 			unresolved: Object.freeze(t),
 			children: Object.freeze(e)
 		});
 	}
 	use(e) {
-		return this.#T(e), e;
+		return this.#E(e), e;
 	}
 	own(e) {
-		let t = this.#T(e);
+		let t = this.#E(e);
 		return () => t.forget();
 	}
-	#T(e) {
-		this.#N();
-		let t = E(e);
-		return this.#N(), this.#j(t, "cleanup");
+	#E(e, t = !1) {
+		if (t || this.#F(), F.has(e)) throw TypeError("Lifetime handles cannot be adopted as resources");
+		let n = ke(e), r;
+		try {
+			r = Ae(e), t || this.#F();
+		} catch (e) {
+			throw n(), e;
+		}
+		return this.#M(r, "cleanup", n);
 	}
 	defer(e) {
-		if (this.#N(), typeof e != "function") throw TypeError("Cleanup must be a function");
-		let t = this.#j(e, "cleanup");
-		return Object.freeze({ [y]: () => t.dispose() });
+		if (this.#F(), typeof e != "function") throw TypeError("Cleanup must be a function");
+		let t = this.#M(e, "cleanup");
+		return P(Object.freeze({ [l]: () => t.dispose() }));
 	}
 	interrupt(e) {
-		if (this.#N(), typeof e != "function") throw TypeError("Interrupt must be a function");
-		let t = this.#j(e, "interrupt");
-		return Object.freeze({ [n]: () => t.forget() });
+		if (this.#F(), typeof e != "function") throw TypeError("Interrupt must be a function");
+		let t = this.#M(e, "interrupt");
+		return P(Object.freeze({ [g]: () => t.forget() }));
 	}
 	child(e) {
-		this.#N();
-		let n = new t({
+		this.#F();
+		let t = new n({
 			label: e,
 			report: this.#u,
-			...this.#d && { changed: this.#d },
+			...this.#d && { releaseFailed: this.#d },
+			...this.#f && { changed: this.#f },
 			...this.#l === void 0 ? {} : { shutdownTimeoutMilliseconds: this.#l }
 		}, {
 			visibility: this.#n,
-			detach: (e) => {
-				this.#r.delete(e), this.#d?.();
-			}
+			detach: (e) => this.#r.delete(e)
 		});
-		this.#r.add(n), this.#d?.();
-		let r = n.#x({ [y]: n.dispose.bind(n) });
-		return n.#b = r, r;
+		this.#r.add(t), this.#f?.();
+		let r = t.#S({ [l]: t.dispose.bind(t) });
+		return t.#x = r, r;
 	}
 	spawn(e) {
-		return this.#E(e, (e) => this.#M(e));
+		return this.#D(e, (e) => this.#N(e));
 	}
 	prepare(e) {
-		return this.#E(e).result;
+		return this.#D(e).result;
 	}
-	#E(e, t) {
-		if (this.#N(), typeof e != "function") throw TypeError("Task must be a function");
-		let n = new le(e, t, () => {
-			this.#s.delete(n), this.#d?.();
+	#D(e, t) {
+		if (this.#F(), typeof e != "function") throw TypeError("Task must be a function");
+		let n = new Fe(e, t, () => {
+			this.#s.delete(n), this.#f?.();
 		});
-		return this.#s.add(n), this.#d?.(), n.handle;
+		return this.#s.add(n), this.#f?.(), n.handle;
 	}
 	acquire(e) {
-		if (this.#N(), typeof e != "function") throw TypeError("Acquisition must be a function");
-		let t = Promise.resolve().then(() => e(this.signal)).then(async (e) => {
-			let t = this.#j(E(e), "cleanup");
-			if (!this.acceptsWork) {
-				let e = o(this.signal) ? s(this.signal) : O;
+		if (this.#F(), typeof e != "function") throw TypeError("Acquisition must be a function");
+		let t = Promise.resolve().then(() => T(e(this.signal))).then(async ({ value: e }) => {
+			let t = this.#E(e, !0);
+			if (h(this.signal)) {
+				let e = ie(this.signal);
 				throw await t.dispose(), e;
 			}
 			return Object.freeze({ resource: e });
 		}), n = () => {
-			this.#c.delete(r), this.#d?.();
+			this.#c.delete(r), this.#f?.();
 		}, r = t.then(n, n);
-		return this.#c.add(r), this.#d?.(), t;
+		return this.#c.add(r), this.#f?.(), t;
 	}
 	stage(e) {
-		this.#N();
+		this.#F();
 		let t, n = e(() => {
-			t && !t.failure && this.#o.delete(t), this.#d?.();
+			t && !t.failure && this.#o.delete(t), this.#f?.();
 		});
-		return t = new ce(++this.#m, n), this.#o.add(t), this.#d?.(), this.published && n.publish(), n;
+		return t = new Pe(++this.#h, n, (e) => this.#P(e, "publication")), this.#o.add(t), w(() => {
+			this.#f?.(), this.published && n.publish();
+		}), n;
 	}
 	borrow(e) {
-		if (this.#N(), typeof e != "function") throw TypeError("Borrow callback must be a function");
-		this.#p++, this.#d?.();
+		if (this.#F(), typeof e != "function") throw TypeError("Borrow callback must be a function");
+		this.#m++, this.#f?.();
 		let t = () => {
-			this.#p--, this.#d?.();
+			this.#m--, this.#f?.();
 		};
 		try {
-			let n = e(), r = new Promise((e) => e(n));
-			return r.then(t, t), r;
+			let n = T(e());
+			return n.then(t, t), n;
 		} catch (e) {
 			return t(), Promise.reject(e);
 		}
 	}
 	seal() {
-		if (this.busy) throw new l("BUSY", "Lifetime has in-flight foreground work");
+		if (this.busy) throw new D(ue, "Lifetime has in-flight foreground work");
 		this.block();
 	}
 	block() {
-		for (let e of this.#S()) e.#f === "active" && (e.#f = "sealed");
+		for (let e of this.#C()) e.#p === "active" && (e.#p = "sealed");
 	}
-	#D(e) {
-		for (let t of this.#S()) {
+	#O(e) {
+		for (let t of this.#C()) {
 			t.#t.abort?.(e);
 			for (let n of t.#s) n.cancel(e);
 		}
 	}
 	publish() {
-		if (this.#N(), this.#g) throw TypeError("Only the root Lifetime may publish declarations");
+		if (this.#F(), this.#_) throw TypeError("Only the root Lifetime may publish declarations");
 		if (!this.#n.published) {
 			this.#n.published = !0;
-			for (let e of this.#S()) for (let t of e.#o) t.publication.publish();
+			for (let e of this.#C()) for (let t of e.#o) t.publication.publish();
 		}
 	}
 	detachStartupSignal() {
-		this.#h?.(), this.#h = void 0;
+		this.#g?.(), this.#g = void 0;
 	}
 	dispose() {
-		if (this.#_) return this.#_;
-		if (this.#f === "disposed") return Promise.resolve();
+		if (this.#v) return this.#v;
+		if (this.#p === "disposed") return Promise.resolve();
 		try {
 			this.seal();
 		} catch (e) {
 			return Promise.reject(e);
 		}
-		let e = [...this.#S()].filter((e) => !e.#_), t = [];
+		let e = [...this.#C()].filter((e) => !e.#v), t = [];
 		for (let n = e.length - 1; n >= 0; n--) {
 			let r = e[n];
-			r.#O(r === this ? t : []);
+			r.#k(r === this ? t : []);
 		}
 		try {
-			h(() => {
-				for (let t of e) t.#A();
-				this.#d?.();
+			w(() => {
+				for (let t of e) t.#j();
+				this.#f?.();
 			});
 		} catch (e) {
 			t.push(e);
 		}
-		return this.#D(O), this.#_;
+		return this.#O(I()), this.#v;
 	}
-	#O(e) {
-		this.#f = "disposing", this.detachStartupSignal();
-		let t = Promise.resolve().then(() => this.#k(e));
-		if (this.#v = t, this.#l === void 0) {
-			this.#_ = Object.freeze(t);
+	#k(e) {
+		this.#p = "disposing", this.detachStartupSignal();
+		let n = Promise.resolve().then(() => this.#A(e));
+		if (this.#y = n, this.#l === void 0) {
+			this.#v = Object.freeze(n);
 			return;
 		}
-		let n = Promise.withResolvers();
-		this.#_ = Object.freeze(n.promise), n.promise.catch(() => void 0);
-		let r = setTimeout(() => {
-			let e = new l("SHUTDOWN_TIMEOUT", "Lifetime shutdown did not complete before its deadline");
-			this.#y = new _(e), this.#f = "quarantined", this.#d?.(), n.reject(e);
+		let r = Promise.withResolvers();
+		this.#v = Object.freeze(r.promise), r.promise.catch(() => void 0);
+		let i = setTimeout(() => {
+			let e = new D(t, "Lifetime shutdown did not complete before its deadline");
+			this.#p = "quarantined", this.#P(e, "shutdown"), this.#b = new b(e), this.#f?.(), r.reject(e);
 		}, this.#l);
-		t.then(() => {
-			clearTimeout(r), n.resolve();
+		n.then(() => {
+			clearTimeout(i), r.resolve();
 		}, (e) => {
-			clearTimeout(r), n.reject(e);
+			clearTimeout(i), r.reject(e);
 		});
 	}
-	async #k(e) {
+	async #A(e) {
 		for (let t of this.#o) t.failure && e.push(t.failure.reason);
-		let t = Promise.allSettled([...this.#r].map((e) => e.#v)), n = [...this.#a].reverse().map((e) => e.dispose());
+		let t = Promise.allSettled([...this.#r].map((e) => e.#y)), n = [...this.#a].reverse().map((e) => e.dispose());
 		for (let t of await Promise.allSettled(n)) t.status === "rejected" && e.push(t.reason);
 		let r = [...this.#s].map((e) => e.settled);
 		await Promise.all(r), await Promise.allSettled([...this.#c]);
@@ -442,39 +464,46 @@ var D = /* @__PURE__ */ new WeakMap(), oe = class {
 		} catch (t) {
 			e.push(t);
 		}
-		if (this.#y = void 0, e.length) throw this.#f = "quarantined", this.#d?.(), AggregateError(e, "Lifetime has unresolved cleanup obligations");
-		this.#f = "disposed", this.#t = { signal: AbortSignal.abort(O) }, this.#d?.(), this.#d = void 0;
-		let a = this.#g;
-		this.#g = void 0, a?.(this), this.#u = void 0;
+		if (this.#b = void 0, e.length) throw this.#p = "quarantined", this.#f?.(), AggregateError(e, "Lifetime has unresolved cleanup obligations");
+		this.#p = "disposed", this.#t = { signal: AbortSignal.abort(I()) };
+		let a = this.#_;
+		this.#_ = void 0, a?.(this), this.#u = void 0, this.#d = void 0, this.#f?.(), this.#f = void 0;
 	}
-	#A() {
+	#j() {
 		for (let e of [...this.#o].reverse()) e.withdraw() ? this.#o.delete(e) : this.#o.add(e);
 	}
-	#j(e, t) {
-		let n = t === "cleanup" ? this.#i : this.#a, r;
-		return r = new se(++this.#m, t, e, () => {
-			n.delete(r), this.#d?.();
-		}, () => this.#d?.()), n.add(r), this.#d?.(), r;
+	#M(e, t, n) {
+		let r = t === "cleanup" ? this.#i : this.#a, i;
+		return i = new Ne(++this.#h, t, e, () => {
+			r.delete(i), n?.(), this.#f?.();
+		}, (e) => this.#P(e, t), () => this.#f?.()), r.add(i), this.#f?.(), i;
 	}
-	#M(e) {
+	#N(e) {
 		let t = this.#u;
-		t && v(t(e), "Lifetime error reporters must be synchronous");
+		t && u(t(e), "Lifetime error reporters must be synchronous");
 	}
-	#N() {
-		if (!this.acceptsWork) throw new l("LIFETIME_DISPOSED", "Lifetime is closed to new work");
+	#P(e, t) {
+		this.#d?.(Object.freeze({
+			owner: this,
+			kind: t,
+			error: e
+		}));
+	}
+	#F() {
+		if (!this.acceptsWork) throw new D(e, "Lifetime is closed to new work");
 	}
-}, k = 2 ** 31 - 1;
-function A(e) {
+}, Le = 2 ** 31 - 1;
+function L(e) {
 	if (e !== void 0) {
-		if (typeof e != "number" || !Number.isFinite(e) || e <= 0 || e > k) throw TypeError(`shutdownTimeoutMilliseconds must be a positive finite number no greater than ${k}`);
+		if (typeof e != "number" || !Number.isFinite(e) || e <= 0 || e > Le) throw TypeError(`shutdownTimeoutMilliseconds must be a positive finite number no greater than ${Le}`);
 		return e;
 	}
 }
-function de(e) {
+function Re(e) {
 	if (typeof e != "string" || !e.trim() || e !== e.trim()) throw TypeError("Lifetime label must be a non-empty trimmed string");
 }
 // src/contracts/contract-registry.ts
-var fe = class {
+var ze = class {
 	#e = /* @__PURE__ */ new Map();
 	assertKinds(e) {
 		for (let [t, n] of e) this.assertCompatible({
@@ -483,19 +512,19 @@ var fe = class {
 		});
 	}
 	assertCompatible(e) {
-		M(this.#e, e);
+		z(this.#e, e);
 	}
 	remember(e) {
-		j(this.#e, e);
+		R(this.#e, e);
 	}
 	writer(e) {
-		return new pe(this, e);
+		return new Be(this, e);
 	}
 	commit(e) {
 		this.assertKinds(e);
 		for (let [t, n] of e) this.#e.set(t, n);
 	}
-}, pe = class {
+}, Be = class {
 	#e;
 	constructor(e, t) {
 		this.#e = {
@@ -513,7 +542,7 @@ var fe = class {
 		if (t.phase === "committed") t.registry.remember(e);
 		else {
 			if (t.phase === "discarded") throw Error("Contract registry writer has been discarded");
-			t.registry.assertCompatible(e), j(t.pending, e);
+			t.registry.assertCompatible(e), R(t.pending, e);
 		}
 	}
 	commit() {
@@ -527,25 +556,25 @@ var fe = class {
 		this.#e.phase === "staged" && (this.#e = { phase: "discarded" });
 	}
 };
-function j(e, t) {
-	M(e, t), e.set(t.id, t.kind);
+function R(e, t) {
+	z(e, t), e.set(t.id, t.kind);
 }
-function M(e, t) {
+function z(e, t) {
 	let n = e.get(t.id);
-	if (n && n !== t.kind) throw new l("CONTRACT_CONFLICT", `Contract '${t.id}' is used as both '${n}' and '${t.kind}'`);
+	if (n && n !== t.kind) throw new D(de, `Contract '${t.id}' is used as both '${n}' and '${t.kind}'`);
 }
 // src/events/event-hub.ts
-var me = class {
+var Ve = class {
 	#e;
 	#t;
 	handle;
-	constructor(e, t, r, i, a) {
+	constructor(e, t, n, r, i) {
 		this.#e = t, this.#t = {
 			hub: e,
-			listener: r,
-			owner: i,
-			detach: a
-		}, this.handle = Object.freeze({ [n]: () => this[n]() });
+			listener: n,
+			owner: r,
+			detach: i
+		}, this.handle = P(Object.freeze({ [g]: () => this[g]() }));
 	}
 	publish() {
 		let e = this.#t;
@@ -553,15 +582,15 @@ var me = class {
 	}
 	invoke(e) {
 		let t = this.#t;
-		if (!t) return Promise.resolve();
+		if (!t?.owner.acceptsWork) return Promise.resolve();
 		let { owner: n, listener: r } = t;
 		return n.borrow(() => r(e));
 	}
-	[n]() {
+	[g]() {
 		let e = this.#t;
 		e && (this.#t = void 0, e.hub.delete(this.#e, this), e.detach());
 	}
-}, he = class {
+}, He = class {
 	#e;
 	constructor(e, t, n) {
 		this.#e = {
@@ -575,27 +604,27 @@ var me = class {
 	on(e, t, n) {
 		let r = this.#t();
 		if (typeof t != "function") throw TypeError("Event listener must be a function");
-		let i = w(e, "event"), a = r.owner.resolveOwner(n?.lifetime);
+		let i = M(e, "event"), a = r.owner.resolveOwner(n);
 		return r.remember(i), r.hub.stage(i.id, t, a);
 	}
 	async emit(e, ...t) {
 		let n = this.#t();
-		if (!n.owner.published) throw new l("EVENT_BEFORE_COMMIT", "Candidate setup cannot emit into the committed event graph");
-		let r = w(e, "event");
+		if (!n.owner.published) throw new D(se, "Candidate setup cannot emit into the committed event graph");
+		let r = M(e, "event");
 		this.#t(), n.remember(r), await n.hub.emit(r.id, t[0]);
 	}
 	#t() {
-		let e = this.#e;
-		if (!e || !e.owner.acceptsWork) throw new l("LIFETIME_DISPOSED", "Event scope is closed");
-		return e;
+		let t = this.#e;
+		if (!t || !t.owner.acceptsWork) throw new D(e, "Event scope is closed");
+		return t;
 	}
-}, ge = class {
+}, Ue = class {
 	#e = /* @__PURE__ */ new Map();
 	scope(e, t) {
-		return new he(this, e, t);
+		return new He(this, e, t);
 	}
 	stage(e, t, n) {
-		return n.stage((r) => new me(this, e, t, n, r)).handle;
+		return n.stage((r) => new Ve(this, e, t, n, r)).handle;
 	}
 	add(e, t) {
 		let n = this.#e.get(e) ?? /* @__PURE__ */ new Set();
@@ -615,7 +644,7 @@ var me = class {
 		}))).flatMap((e) => e.status === "rejected" ? [e.reason] : []);
 		if (r.length) throw AggregateError(r, `Event '${e}' listeners failed`);
 	}
-}, N = class {
+}, B = class {
 	#e;
 	get;
 	subscribe;
@@ -640,21 +669,21 @@ var me = class {
 		}, t.own);
 	}
 	#r() {
-		let e = this.#e.binding;
-		if (!e) throw TypeError("Contribution view has been disposed");
-		if (e.owner && !e.owner.acceptsWork) throw new l("LIFETIME_DISPOSED", "Contribution view owner is closed");
-		return e;
+		let t = this.#e.binding;
+		if (!t) throw new D(e, "Contribution view has been disposed");
+		if (t.owner && !t.owner.acceptsWork) throw new D(e, "Contribution view owner is closed");
+		return t;
 	}
-}, _e = class {
+}, We = class {
 	#e;
 	constructor(e) {
 		this.#e = e, Object.freeze(this);
 	}
 	update = (e) => this.#e.update(e);
-	[n]() {
-		this.#e[n]();
+	[g]() {
+		this.#e[g]();
 	}
-}, ve = class {
+}, Ge = class {
 	#e;
 	#t;
 	handle;
@@ -665,7 +694,7 @@ var me = class {
 			value: n,
 			owner: r,
 			detachFromOwner: i
-		}, this.handle = new _e(this);
+		}, this.handle = P(new We(this));
 	}
 	publish() {
 		let e = this.#e;
@@ -673,28 +702,27 @@ var me = class {
 	}
 	use(e) {
 		let t = this.#e;
-		if (t.phase === "disposed") throw new l("CONTRIBUTION_UNAVAILABLE", "Contribution is no longer available");
+		if (t.phase === "disposed") throw new D(S, "Contribution is no longer available");
 		let { owner: n, value: r } = t;
 		return n.borrow(() => e(r));
 	}
-	update(e) {
-		let t = this.#e;
-		if (t.phase === "disposed") throw TypeError(`Contribution '${this.#t}' has been disposed`);
-		if (!t.owner.acceptsWork) throw new l("LIFETIME_DISPOSED", "Contribution owner is closed");
-		Object.is(t.value, e) || (t.value = e, t.store.valueChanged(this.#t, this));
+	update(t) {
+		let n = this.#e;
+		if (n.phase === "disposed") throw TypeError(`Contribution '${this.#t}' has been disposed`);
+		if (!n.owner.acceptsWork) throw new D(e, "Contribution owner is closed");
+		Object.is(n.value, t) || (n.value = t, n.store.valueChanged(this.#t, this));
 	}
-	[n]() {
+	[g]() {
 		let e = this.#e;
-		if (e.phase !== "disposed") {
-			this.#e = { phase: "disposed" };
+		e.phase !== "disposed" && (this.#e = { phase: "disposed" }, w(() => {
 			try {
 				e.store.removeContribution(this.#t, this);
 			} finally {
 				e.detachFromOwner();
 			}
-		}
+		}));
 	}
-}, ye = class {
+}, Ke = class {
 	#e;
 	#t;
 	#n = /* @__PURE__ */ new Map();
@@ -705,16 +733,16 @@ var me = class {
 	#s;
 	#c = !1;
 	constructor(e, t, n) {
-		this.#e = e, this.#t = n, this.#r = new f(() => this.#i, t);
+		this.#e = e, this.#t = n, this.#r = new oe(() => this.#i, t);
 	}
 	stage(e, t, n, r, i) {
 		try {
-			Se(t);
-			let a = Ce(e, t);
+			Xe(t);
+			let a = Ze(e, t);
 			if (this.#n.has(a)) throw TypeError(`Duplicate contribution '${a}'`);
 			return r.stage((e) => {
 				i?.();
-				let t = new ve(this, a, n, r, e);
+				let t = new Ge(this, a, n, r, e);
 				return this.#n.set(a, {
 					contribution: t,
 					phase: "staged"
@@ -730,7 +758,7 @@ var me = class {
 			store: this,
 			own: e,
 			...t && { owner: t }
-		} }, r, i = new P(n, () => {
+		} }, r, i = new qe(n, () => {
 			let e = r;
 			r = void 0;
 			try {
@@ -744,14 +772,14 @@ var me = class {
 		} catch (e) {
 			throw n.binding = void 0, this.#a--, this.#u(), e;
 		}
-		return new N(n);
+		return new B(n);
 	}
 	hostView() {
-		return this.#s ??= new N({ binding: { store: this } });
+		return this.#s ??= new B({ binding: { store: this } });
 	}
 	use(e, t) {
 		let n = this.#n.get(e);
-		if (n?.phase !== "published") throw new l("CONTRIBUTION_UNAVAILABLE", `Contribution '${e}' is not available`);
+		if (n?.phase !== "published") throw new D(S, `Contribution '${e}' is not available`);
 		if (typeof t != "function") throw TypeError("Contribution callback must be a function");
 		return n.contribution.use(t);
 	}
@@ -760,12 +788,12 @@ var me = class {
 	}
 	subscribe(e, t) {
 		if (typeof e != "function") throw TypeError("Contribution subscriber must be a function");
-		let r = this.#r.view.subscribe(e);
-		if (!t) return r;
+		let n = this.#r.view.subscribe(e);
+		if (!t) return n;
 		this.#o++;
-		let i, a = new be(r, () => {
-			let e = i;
-			i = void 0;
+		let r, i = new Je(n, () => {
+			let e = r;
+			r = void 0;
 			try {
 				e?.();
 			} finally {
@@ -773,11 +801,11 @@ var me = class {
 			}
 		});
 		try {
-			i = t(a);
+			r = t(i), P(i);
 		} catch (e) {
-			throw a[n](), e;
+			throw i[g](), e;
 		}
-		return a;
+		return i;
 	}
 	publishClaim(e, t) {
 		let n = this.#l(e, t);
@@ -809,13 +837,13 @@ var me = class {
 		if (!(this.#c || this.#s || this.#n.size || this.#o || this.#a)) {
 			this.#c = !0;
 			try {
-				this.#r[n]();
+				this.#r[g]();
 			} finally {
 				this.#t(this);
 			}
 		}
 	}
-}, P = class {
+}, qe = class {
 	#e;
 	constructor(e, t) {
 		this.#e = {
@@ -823,11 +851,11 @@ var me = class {
 			release: t
 		}, Object.freeze(this);
 	}
-	[n]() {
+	[g]() {
 		let e = this.#e;
 		e && (this.#e = void 0, e.state.binding = void 0, e.release());
 	}
-}, be = class {
+}, Je = class {
 	#e;
 	constructor(e, t) {
 		this.#e = {
@@ -835,18 +863,18 @@ var me = class {
 			release: t
 		}, Object.freeze(this);
 	}
-	[n]() {
+	[g]() {
 		let e = this.#e;
 		if (e) {
 			this.#e = void 0;
 			try {
-				e.subscription[n]();
+				e.subscription[g]();
 			} finally {
 				e.release();
 			}
 		}
 	}
-}, xe = class {
+}, Ye = class {
 	#e = /* @__PURE__ */ new Map();
 	#t = /* @__PURE__ */ new Set();
 	#n;
@@ -857,7 +885,7 @@ var me = class {
 	get(e) {
 		let t = e.id, n = this.#e.get(t);
 		if (n) return n;
-		let r = new ye((e) => this.#i(e), this.#n, (e) => {
+		let r = new Ke((e) => this.#i(e), this.#n, (e) => {
 			this.#e.get(t) === e && (this.#t.delete(e), this.#e.delete(t));
 		});
 		return this.#e.set(t, r), r;
@@ -867,7 +895,7 @@ var me = class {
 		return t ? n.view((e) => t.own(e), t) : n.hostView();
 	}
 	scope(e, t, n) {
-		return new we(this, e, t, n);
+		return new Qe(this, e, t, n);
 	}
 	beginBatch() {
 		this.#r++;
@@ -876,7 +904,7 @@ var me = class {
 		if (!this.#r) throw Error("Contribution batch is not active");
 		if (this.#r--, this.#r) return;
 		let e = [...this.#t];
-		this.#t.clear(), h(() => {
+		this.#t.clear(), w(() => {
 			let t = [];
 			for (let n of e) try {
 				n.publishSnapshot();
@@ -891,17 +919,17 @@ var me = class {
 		this.#t.add(e), !this.#r && (this.#t.delete(e), e.publishSnapshot());
 	}
 };
-function Se(e) {
+function Xe(e) {
 	if (typeof e != "string" || !e.trim()) throw TypeError("Contribution key must be a non-empty string");
 	if (e !== e.trim()) throw TypeError("Contribution key cannot start or end with whitespace");
 }
-function Ce(e, t) {
-	return `${F(e)}/${F(t)}`;
+function Ze(e, t) {
+	return `${V(e)}/${V(t)}`;
 }
-function F(e) {
+function V(e) {
 	return e.replaceAll("%", "%25").replaceAll("/", "%2F");
 }
-var we = class {
+var Qe = class {
 	#e;
 	constructor(e, t, n, r) {
 		this.#e = {
@@ -913,14 +941,14 @@ var we = class {
 			this.#e = void 0;
 		}), Object.freeze(this);
 	}
-	add(e, t, n, r) {
-		let i = this.#e;
-		if (!i || !i.owner.acceptsWork) throw new l("LIFETIME_DISPOSED", "Contribution scope is closed");
-		let a = w(e, "extensionPoint"), o = i.owner.resolveOwner(r?.lifetime);
-		return i.registry.get(a).stage(i.installationId, t, n, o, () => i.remember(a));
+	add(t, n, r, i) {
+		let a = this.#e;
+		if (!a || !a.owner.acceptsWork) throw new D(e, "Contribution scope is closed");
+		let o = M(t, "extensionPoint"), s = a.owner.resolveOwner(i);
+		return a.registry.get(o).stage(a.installationId, n, r, s, () => a.remember(o));
 	}
-}, Te = 64;
-function I(e) {
+}, $e = 64;
+function H(e) {
 	let t = /* @__PURE__ */ new Set(), n = /* @__PURE__ */ new Map(), r = (e, i) => {
 		if (e === null || typeof e == "string" || typeof e == "boolean" || typeof e == "number" && Number.isFinite(e)) return {
 			value: e,
@@ -929,105 +957,91 @@ function I(e) {
 		if (typeof e != "object" || !e) throw TypeError(`Unsupported configuration value at ${i}`);
 		if (t.has(e)) throw TypeError(`Circular configuration at ${i}`);
 		let a = n.get(e);
-		if (t.size + (a?.height ?? 1) > Te) throw TypeError("Configuration exceeds the supported nesting depth");
+		if (t.size + (a?.height ?? 1) > $e) throw TypeError("Configuration exceeds the supported nesting depth");
 		if (a) return a;
 		t.add(e);
-		let o = 1, s = (e, t) => {
+		let o = 1, c = (e, t) => {
 			let n = r(e, t);
 			return o = Math.max(o, n.height + 1), n.value;
-		}, c;
+		}, l;
 		if (Array.isArray(e)) {
-			let t = u(e, `Configuration array at ${i}`);
-			c = Object.freeze(t.map((e, t) => s(e, `${i}[${t}]`)));
+			let t = s(e, `Configuration array at ${i}`);
+			l = Object.freeze(t.map((e, t) => c(e, `${i}[${t}]`)));
 		} else {
-			let t = Object.getPrototypeOf(e);
-			if (t !== Object.prototype && t !== null) throw TypeError(`Configuration must contain plain records at ${i}`);
-			let n = Object.create(null);
-			for (let t of Reflect.ownKeys(e)) {
-				if (typeof t != "string") throw TypeError(`Configuration keys must be strings at ${i}`);
-				let r = Object.getOwnPropertyDescriptor(e, t);
-				if (!r || !("value" in r) || !r.enumerable) throw TypeError(`Configuration must contain enumerable data properties at ${i}.${t}`);
-				r.value !== void 0 && (n[t] = s(r.value, `${i}.${t}`));
-			}
-			c = Object.freeze(n);
+			let t = E(e, i), n = Object.create(null);
+			for (let [e, r] of Object.entries(t)) r !== void 0 && (n[e] = c(r, `${i}.${e}`));
+			l = Object.freeze(n);
 		}
 		t.delete(e);
-		let l = {
-			value: c,
+		let u = {
+			value: l,
 			height: o
 		};
-		return n.set(e, l), l;
+		return n.set(e, u), u;
 	};
 	return e === void 0 ? void 0 : r(e, "configuration").value;
 }
-async function Ee(e, t, n, i) {
-	if (i?.throwIfAborted(), !e) return Object.freeze({ value: t });
-	let a = e["~standard"].validate(t), o = i ? (await De(a, i)).result : await a;
-	if (i?.throwIfAborted(), !o || typeof o != "object") throw TypeError(`Installation '${n}' configuration validator returned a non-object result`);
-	let s = Object.hasOwn(o, "issues") ? o.issues : void 0;
-	if (s !== void 0) throw Array.isArray(s) ? new r(s, { details: {
+async function et(e, t, n, r) {
+	if (r?.throwIfAborted(), !e) return Object.freeze({ value: t });
+	let i = e["~standard"].validate(t), a = r ? (await tt(i, r)).value : (await T(i)).value;
+	if (r?.throwIfAborted(), !a || typeof a != "object" && typeof a != "function") throw TypeError(`Installation '${n}' configuration validator returned a non-object result`);
+	let o = a.issues;
+	if (o !== void 0) throw Array.isArray(o) ? new C(o, { details: {
 		installation: n,
 		phase: "configuration",
 		outcome: "rejected"
 	} }) : TypeError(`Installation '${n}' configuration validator returned non-array issues`);
-	if (!Object.hasOwn(o, "value")) throw TypeError(`Installation '${n}' configuration validator returned neither value nor issues`);
-	let c = o.value;
-	return Object.freeze({ value: Object.is(c, t) ? t : I(c) });
+	if (!("value" in a)) throw TypeError(`Installation '${n}' configuration validator returned neither value nor issues`);
+	let s = a.value;
+	return Object.freeze({ value: Object.is(s, t) ? t : H(s) });
 }
-function De(t, n) {
-	let r = Promise.withResolvers(), { promise: i } = r, a = e(n, (e) => {
-		r?.reject(e), r = void 0;
+function tt(e, t) {
+	let n = Promise.withResolvers(), { promise: r } = n, i = o(t, (e) => {
+		n?.reject(e), n = void 0;
 	});
-	return Oe(t).then((e) => r?.resolve(e), (e) => r?.reject(e)), i.finally(() => {
-		r = void 0, a();
+	return T(e).then((e) => n?.resolve(e), (e) => n?.reject(e)), r.finally(() => {
+		n = void 0, i();
 	});
 }
-async function Oe(e) {
-	return { result: await e };
-}
 // src/composition/plugin.ts
-var ke = /* @__PURE__ */ new Set([
-	"name",
-	"configuration",
-	"requires",
-	"provides",
-	"setup"
-]);
-function Ae(e) {
-	return L(e);
+var nt = y()("name", "configuration", "requires", "provides", "setup");
+function rt(e) {
+	return W(e);
 }
-function L(e) {
-	let t = g(e, "Plugin declaration", { fields: ke }), { name: n, configuration: r, setup: i } = t;
+var U = /* @__PURE__ */ new WeakSet();
+function W(e) {
+	if (U.has(e)) return e;
+	let t = E(e, "Plugin declaration", { fields: nt }), { name: n, configuration: r, setup: i } = t;
 	if (typeof n != "string" || !n.trim()) throw TypeError("Plugin name must be a non-empty string");
 	if (n !== n.trim()) throw TypeError("Plugin name cannot start or end with whitespace");
 	if (typeof i != "function") throw TypeError(`Plugin '${n}' must define setup()`);
-	let a = r === void 0 ? void 0 : je(r, n), o = t.requires === void 0 ? void 0 : g(t.requires, `Plugin '${n}' requires`), s = t.provides === void 0 ? void 0 : g(t.provides, `Plugin '${n}' provides`), c = new Ne(n), l = c.normalizeRequirements(o ?? {}), u = c.normalizeProvisions(s ?? {});
-	return Object.freeze({
+	let a = r === void 0 ? void 0 : it(r, n), o = t.requires === void 0 ? void 0 : E(t.requires, `Plugin '${n}' requires`), s = t.provides === void 0 ? void 0 : E(t.provides, `Plugin '${n}' provides`), c = new ot(n), l = c.normalizeRequirements(o ?? {}), u = c.normalizeProvisions(s ?? {}), d = Object.freeze({
 		name: n,
 		...a === void 0 ? {} : { configuration: a },
 		requires: l,
 		provides: u,
 		setup: i
 	});
+	return U.add(d), d;
 }
-var R = /* @__PURE__ */ new WeakSet();
-function je(e, t) {
+var G = /* @__PURE__ */ new WeakSet();
+function it(e, t) {
 	let n = () => /* @__PURE__ */ TypeError("Plugin '" + t + "' configuration must implement Standard Schema V1");
 	if (!e || typeof e != "object" && typeof e != "function") throw n();
-	if (R.has(e)) return e;
+	if (G.has(e)) return e;
 	let r = e["~standard"];
 	if (!r || typeof r != "object") throw n();
 	let { version: i, vendor: a, validate: o, jsonSchema: s } = r;
 	if (i !== 1 || typeof a != "string" || typeof o != "function") throw n();
-	let c = (...e) => Reflect.apply(o, r, e), l = s === void 0 ? void 0 : Me(s, t), u = Object.freeze({ "~standard": Object.freeze({
+	let c = (...e) => Reflect.apply(o, r, e), l = s === void 0 ? void 0 : at(s, t), u = Object.freeze({ "~standard": Object.freeze({
 		version: 1,
 		vendor: a,
 		validate: c,
 		...l === void 0 ? {} : { jsonSchema: l }
 	}) });
-	return R.add(u), u;
+	return G.add(u), u;
 }
-function Me(e, t) {
+function at(e, t) {
 	let n = () => /* @__PURE__ */ TypeError("Plugin '" + t + "' jsonSchema must implement Standard JSON Schema input/output exporters");
 	if (!e || typeof e != "object" && typeof e != "function") throw n();
 	let { input: r, output: i } = e;
@@ -1037,7 +1051,7 @@ function Me(e, t) {
 		output: (t) => Reflect.apply(i, e, [t])
 	});
 }
-var Ne = class {
+var ot = class {
 	pluginName;
 	#e = /* @__PURE__ */ new Map();
 	constructor(e) {
@@ -1046,8 +1060,8 @@ var Ne = class {
 	normalizeRequirements(e) {
 		let t = Object.create(null);
 		for (let [n, r] of Object.entries(e)) {
-			if (this.#t(n, "requirement"), !r || typeof r != "object") throw TypeError(`Plugin requirement '${n}' is not a contract`);
-			let e = T(g(r, `Plugin requirement '${n}'`), `Plugin requirement '${n}' must be a Service or ExtensionPoint`, `Optional requirement '${n}' must wrap a Service`);
+			this.#t(n, "requirement");
+			let e = De(r, `Plugin requirement '${n}' must be a Service or ExtensionPoint`, `Optional requirement '${n}' must wrap a Service`);
 			this.#n("requirement", n, e.kind === "optional" ? e.service : e), t[n] = e;
 		}
 		return Object.freeze(t);
@@ -1056,7 +1070,7 @@ var Ne = class {
 		let t = Object.create(null);
 		for (let [n, r] of Object.entries(e)) {
 			if (this.#t(n, "provision"), n === "then") throw TypeError("Plugin provision alias 'then' conflicts with the Promise protocol");
-			let e = w(r, "service", `Plugin provision '${n}' must be a Service`);
+			let e = M(r, "service", `Plugin provision '${n}' must be a Service`);
 			this.#n("provision", n, e), t[n] = e;
 		}
 		return Object.freeze(t);
@@ -1075,37 +1089,37 @@ var Ne = class {
 			});
 			return;
 		}
-		if (r.kind !== n.kind) throw TypeError(`Plugin '${this.pluginName}' uses Contract '${n.id}' as both ${z(r.kind)} and ${z(n.kind)}`);
-		let i = z(n.kind);
+		if (r.kind !== n.kind) throw TypeError(`Plugin '${this.pluginName}' uses Contract '${n.id}' as both ${K(r.kind)} and ${K(n.kind)}`);
+		let i = K(n.kind);
 		throw r.role === e ? TypeError(`Plugin '${this.pluginName}' ${e} aliases '${r.alias}' and '${t}' reference the same ${i} '${n.id}'`) : TypeError(`Plugin '${this.pluginName}' cannot both require and provide ${i} '${n.id}'`);
 	}
 };
-function z(e) {
+function K(e) {
 	return e === "extensionPoint" ? "ExtensionPoint" : e === "event" ? "Event" : "Service";
 }
-function B(e) {
-	return L(e);
+function q(e) {
+	return W(e);
 }
 // src/composition/installation.ts
-function V(e, t) {
-	if (e.has(t)) throw new l("INSTALLATION_CONFLICT", "Installation id is already installed: " + t);
+function J(e, t) {
+	if (e.has(t)) throw new D(_e, "Installation id is already installed: " + t);
 	e.add(t);
 }
-function H(e, t, n) {
+function st(e, t, n) {
 	return Object.freeze({
-		plugin: B(e),
-		configuration: I(t),
-		origin: U(n)
+		plugin: q(e),
+		configuration: H(t),
+		origin: ct(n)
 	});
 }
-function U(e) {
-	let t = I(e);
+function ct(e) {
+	let t = H(e);
 	if (t !== void 0) {
 		if (t === null || Array.isArray(t) || typeof t != "object") throw TypeError("Installation origin must be a data record");
 		return t;
 	}
 }
-var W = class {
+var Y = class {
 	#e = {
 		status: "pending",
 		origin: void 0
@@ -1117,9 +1131,8 @@ var W = class {
 	retire() {
 		this.#e.status = "removed";
 	}
-}, Pe = class {
+}, lt = class {
 	id;
-	index;
 	group;
 	facade;
 	#e;
@@ -1127,17 +1140,17 @@ var W = class {
 		status: "pending",
 		origin: void 0
 	});
-	constructor(e, t, n) {
-		this.id = e, this.index = t, this.group = n;
-		let r = this;
+	constructor(e, t) {
+		this.id = e, this.group = t;
+		let n = this;
 		this.facade = Object.freeze({
 			id: e,
-			groupId: n?.id,
+			groupId: t?.id,
 			get status() {
-				return r.#n().status;
+				return n.#n().status;
 			},
 			get origin() {
-				return r.#n().origin;
+				return n.#n().origin;
 			}
 		});
 	}
@@ -1153,16 +1166,15 @@ var W = class {
 	#n() {
 		return this.#e?.() ?? this.#t;
 	}
-};
-// src/composition/change-set.ts
-function G(e, t) {
+}, ut = y()("id", "configuration", "origin", "group"), dt = y()("plugin", "configuration", "origin");
+function X(e, t) {
 	if (typeof e != "string" || !e.trim() || e.trim() !== e) throw TypeError(t + " must be a non-empty trimmed string");
 }
-var Fe = class {
+var ft = class {
 	#e = /* @__PURE__ */ new WeakMap();
-	#t = new W();
+	#t = new Y();
 	create(e) {
-		let t = new Ie(this);
+		let t = new pt(this);
 		return this.#n().set(t.handle, {
 			port: e,
 			operations: [],
@@ -1171,7 +1183,7 @@ var Fe = class {
 	}
 	take(e) {
 		let t = this.#n(), n = t.get(e);
-		if (!n) throw new l("CHANGE_FOREIGN", "ChangeSet belongs to another Host or was already planned");
+		if (!n) throw new D(pe, "ChangeSet belongs to another Host or was already planned");
 		return t.delete(e), Object.freeze(n.operations);
 	}
 	requireOpen(e) {
@@ -1186,10 +1198,10 @@ var Fe = class {
 		this.#e = e, this.#t.retire();
 	}
 	#n() {
-		if (typeof this.#e == "number") throw p(this.#e);
+		if (typeof this.#e == "number") throw a(this.#e);
 		return this.#e;
 	}
-}, Ie = class {
+}, pt = class {
 	authority;
 	handle = Object.freeze({
 		install: this.install.bind(this),
@@ -1201,15 +1213,10 @@ var Fe = class {
 	constructor(e) {
 		this.authority = e, Object.freeze(this);
 	}
-	install(e, t) {
-		let { port: n } = this.#t(), r = g(t, "Installation options", { fields: /* @__PURE__ */ new Set([
-			"id",
-			"configuration",
-			"origin",
-			"group"
-		]) });
-		G(r.id, "Installation id");
-		let i = r.group === void 0 ? void 0 : n.resolveGroup(r.group), a = H(e, r.configuration, r.origin);
+	install(...[e, t]) {
+		let { port: n } = this.#t(), r = E(t, "Installation options", { fields: ut });
+		X(r.id, "Installation id");
+		let i = r.group === void 0 ? void 0 : n.resolveGroup(r.group), a = st(e, r.configuration, r.origin);
 		this.#t();
 		let o = n.create(r.id, i);
 		return this.#e(o, {
@@ -1219,19 +1226,17 @@ var Fe = class {
 		}), o.facade;
 	}
 	update(e, t) {
-		let { port: n } = this.#t(), r = g(t, "Installation update", { fields: /* @__PURE__ */ new Set([
-			"plugin",
-			"configuration",
-			"origin"
-		]) }), i = Object.hasOwn(r, "plugin"), a = Object.hasOwn(r, "configuration");
+		let { port: n } = this.#t(), r = E(t, "Installation update", { fields: dt }), i = Object.hasOwn(r, "plugin"), a = Object.hasOwn(r, "configuration");
 		if (!i && !a) throw TypeError("Installation update requires plugin or configuration");
 		if (!i && Object.hasOwn(r, "origin")) throw TypeError("Origin can only change with its Plugin");
-		let o = {
-			...i ? {
-				plugin: B(r.plugin),
-				origin: U(r.origin)
-			} : {},
-			...a ? { configuration: I(r.configuration) } : {}
+		let o = i ? {
+			kind: "replace",
+			plugin: q(r.plugin),
+			origin: ct(r.origin),
+			...a ? { configuration: H(r.configuration) } : {}
+		} : {
+			kind: "configure",
+			configuration: H(r.configuration)
 		}, s = n.resolve(e);
 		this.#e(s, {
 			kind: "update",
@@ -1248,7 +1253,7 @@ var Fe = class {
 	}
 	group(e, t) {
 		let { port: n } = this.#t();
-		G(e, "Group id");
+		X(e, "Group id");
 		let r = n.createGroup(e, t === void 0 ? void 0 : n.resolveGroup(t));
 		return this.#e(r, {
 			kind: "group",
@@ -1270,7 +1275,7 @@ var Fe = class {
 	#t() {
 		return this.authority.requireOpen(this.handle);
 	}
-}, K = class e {
+}, mt = class e {
 	declarations;
 	byId;
 	order;
@@ -1282,7 +1287,7 @@ var Fe = class {
 		this.declarations = e, this.byId = t, this.order = n, this.layers = r, this.providers = i, this.dependents = a, this.contractKinds = o;
 	}
 	static build(t) {
-		let n = [...t.keys()].sort((e, t) => e.index - t.index), r = /* @__PURE__ */ new Map(), i = Le(t, r), a = Re(t, i, r), { order: o, layers: s } = ze(n, a.dependents, a.indegree);
+		let n = [...t.keys()], r = /* @__PURE__ */ new Map(), i = ht(t, r), a = gt(t, i, r), { order: o, layers: s } = _t(n, a.dependents, a.indegree);
 		return new e(t, new Map(n.map((e) => [e.id, e])), Object.freeze(o), Object.freeze(s.map((e) => Object.freeze(e))), i, a.dependents, r);
 	}
 	declarationFor(e) {
@@ -1305,12 +1310,12 @@ var Fe = class {
 		}
 	}
 };
-function Le(e, t) {
+function ht(e, t) {
 	let n = /* @__PURE__ */ new Map();
 	for (let [r, i] of e) for (let e of Object.values(i.plugin.provides)) {
-		j(t, e);
+		R(t, e);
 		let i = n.get(e.id);
-		if (i) throw new l("SERVICE_CONFLICT", `Service '${e.id}' is provided by both '${i.id}' and '${r.id}'`, { details: {
+		if (i) throw new D(c, `Service '${e.id}' is provided by both '${i.id}' and '${r.id}'`, { details: {
 			outcome: "rejected",
 			contract: e.id,
 			affectedInstallations: [i.id, r.id]
@@ -1319,21 +1324,21 @@ function Le(e, t) {
 	}
 	return n;
 }
-function Re(e, t, n) {
+function gt(e, t, n) {
 	let r = /* @__PURE__ */ new Map(), i = new Map([...e.keys()].map((e) => [e, 0]));
 	for (let [a, o] of e) for (let e of Object.values(o.plugin.requires)) {
 		let o = e.kind === "optional" ? e.service : e;
-		if (j(n, o), o.kind === "extensionPoint") continue;
+		if (R(n, o), o.kind === "extensionPoint") continue;
 		let s = t.get(o.id);
 		if (!s) {
 			if (e.kind === "optional") continue;
-			throw new l("SERVICE_MISSING", `Installation '${a.id}' requires missing Service '${o.id}'`, { details: {
+			throw new D(te, `Installation '${a.id}' requires missing Service '${o.id}'`, { details: {
 				outcome: "rejected",
 				installation: a.id,
 				contract: o.id
 			} });
 		}
-		if (s === a) throw new l("SERVICE_CYCLE", `Installation '${a.id}' cannot require Service '${o.id}' that it provides`, { details: {
+		if (s === a) throw new D(d, `Installation '${a.id}' cannot require Service '${o.id}' that it provides`, { details: {
 			outcome: "rejected",
 			installation: a.id,
 			contract: o.id,
@@ -1347,33 +1352,33 @@ function Re(e, t, n) {
 		indegree: i
 	};
 }
-function ze(e, t, n) {
-	let r = e.filter((e) => n.get(e) === 0), i = [], a = [];
-	for (; r.length;) {
-		r.sort((e, t) => e.index - t.index);
-		let e = r;
-		r = [], a.push(e);
-		for (let a of e) {
-			i.push(a);
-			for (let e of t.get(a) ?? []) {
+function _t(e, t, n) {
+	let r = new Map(e.map((e, t) => [e, t])), i = e.filter((e) => n.get(e) === 0), a = [], o = [];
+	for (; i.length;) {
+		i.sort((e, t) => r.get(e) - r.get(t));
+		let e = i;
+		i = [], o.push(e);
+		for (let r of e) {
+			a.push(r);
+			for (let e of t.get(r) ?? []) {
 				let t = (n.get(e) ?? 0) - 1;
-				n.set(e, t), t || r.push(e);
+				n.set(e, t), t || i.push(e);
 			}
 		}
 	}
-	if (i.length !== e.length) {
-		let e = Be(t, n);
-		throw new l("SERVICE_CYCLE", `Installation dependency cycle: ${e.map((e) => e.id).join(" -> ")}`, { details: {
+	if (a.length !== e.length) {
+		let e = vt(t, n);
+		throw new D(d, `Installation dependency cycle: ${e.map((e) => e.id).join(" -> ")}`, { details: {
 			outcome: "rejected",
 			dependencyPath: e.map((e) => e.id)
 		} });
 	}
 	return {
-		order: i,
-		layers: a
+		order: a,
+		layers: o
 	};
 }
-function Be(e, t) {
+function vt(e, t) {
 	let n = /* @__PURE__ */ new Map();
 	for (let [r, i] of e) if (t.get(r)) for (let e of i) n.set(e, r);
 	let r = n.keys().next().value, i = /* @__PURE__ */ new Map();
@@ -1381,7 +1386,7 @@ function Be(e, t) {
 	return [...Array.from(i.keys()).slice(i.get(r)), r].reverse();
 }
 // src/composition/group.ts
-var Ve = class {
+var yt = class {
 	id;
 	parent;
 	facade;
@@ -1395,13 +1400,13 @@ var Ve = class {
 		return this.parent?.id;
 	}
 };
-function He(e, t) {
+function bt(e, t) {
 	let n = /* @__PURE__ */ new Map();
 	for (let r of e.keys()) {
 		let i = /* @__PURE__ */ new Set(), a = r;
 		for (; a !== void 0 && !n.has(a);) {
-			if (!e.has(a)) throw new l("GROUP_MISSING", "Initial Group is missing: " + a);
-			if (i.has(a)) throw new l("GROUP_CYCLE", "Group ownership must be acyclic");
+			if (!e.has(a)) throw new D(v, "Initial Group is missing: " + a);
+			if (i.has(a)) throw new D(ge, "Group ownership must be acyclic");
 			i.add(a), a = e.get(a);
 		}
 		let o = a === void 0 ? void 0 : n.get(a);
@@ -1410,56 +1415,91 @@ function He(e, t) {
 	return n;
 }
 // src/composition/plan.ts
-function q(e, t) {
-	return new l("PLAN_STALE", "Host state changed during or after planning", { details: {
+function Z(e, t) {
+	return new D(p, "Host state changed during or after planning", { details: {
 		outcome: "rejected",
 		expectedRevision: e,
 		stateRevision: t
 	} });
 }
-var Ue = class {
+var xt = class {
 	#e = /* @__PURE__ */ new WeakMap();
 	#t = /* @__PURE__ */ new WeakMap();
-	#n = new W();
+	#n = new Y();
 	#r;
 	get validationSignal() {
 		return (this.#r ??= new AbortController()).signal;
 	}
 	issue(e, t) {
 		let { report: n } = e;
-		if (n.baseStateRevision !== t.revision) throw q(n.baseStateRevision, t.revision);
+		if (n.baseStateRevision !== t.revision) throw Z(n.baseStateRevision, t.revision);
 		let r = Object.freeze({ report: n });
 		for (let n of e.graph.declarations.keys()) t.graph.declarations.has(n) || this.#n.attach(n);
 		return this.#e.set(r, "issued"), this.#t.set(r, e), r;
 	}
 	read(e, t) {
 		let n = this.#e.get(e);
-		if (n === void 0) throw new l("PLAN_FOREIGN", "Plan was not issued by this Host");
-		if (n === "consumed") throw new l("PLAN_CONSUMED", "Plan has already been executed");
+		if (n === void 0) throw new D(f, "Plan was not issued by this Host");
+		if (n === "consumed") throw new D(le, "Plan has already been executed");
 		let r = this.#t.get(e);
-		if (!r) throw this.consume(e), q(e.report.baseStateRevision, t);
+		if (!r) throw this.consume(e), Z(e.report.baseStateRevision, t);
 		return r;
 	}
 	consume(e) {
 		this.#e.set(e, "consumed"), this.#t.delete(e);
 	}
 	invalidate(e, t) {
-		this.#r?.abort(t ? p(e) : q(e - 1, e)), this.#r = void 0, this.#n.retire(), this.#n = new W(), this.#t = /* @__PURE__ */ new WeakMap();
+		this.#r?.abort(Object.freeze(t ? a(e) : Z(e - 1, e))), this.#r = void 0, this.#n.retire(), this.#n = new Y(), this.#t = /* @__PURE__ */ new WeakMap();
 	}
 };
-function J(e, t = e.order) {
+function St(e, t, n) {
+	return Object.freeze(e.map((e) => {
+		switch (e.kind) {
+			case "install": return Object.freeze({
+				kind: e.kind,
+				id: e.installation.id,
+				before: void 0,
+				after: $(n.declarationFor(e.installation))
+			});
+			case "update": return Object.freeze({
+				kind: e.kind,
+				id: e.installation.id,
+				before: $(t.declarationFor(e.installation)),
+				after: $(n.declarationFor(e.installation))
+			});
+			case "remove": return Object.freeze({
+				kind: e.kind,
+				id: e.installation.id,
+				before: $(t.declarationFor(e.installation)),
+				after: void 0
+			});
+			case "group":
+			case "remove-group": return Object.freeze({
+				kind: e.kind,
+				id: e.group.id,
+				parentId: e.group.parentId
+			});
+		}
+	}));
+}
+function Q(e, t = e.order) {
 	return Object.freeze(t.flatMap((t) => Object.values(e.declarationFor(t).plugin.requires).flatMap((n) => {
 		if (n.kind === "extensionPoint") return [];
-		let r = n.kind === "optional" ? n.service : n;
+		let r = n.kind === "optional" ? n.service : n, i = e.providers.get(r.id);
 		return [Object.freeze({
 			installation: t.id,
 			contract: r.id,
-			optional: n.kind === "optional",
-			provider: e.providers.get(r.id)?.id
+			...n.kind === "optional" ? {
+				optional: !0,
+				provider: i?.id
+			} : {
+				optional: !1,
+				provider: i.id
+			}
 		})];
 	})));
 }
-function We(e, t, n, r) {
+function Ct(e, t, n, r) {
 	let i = [];
 	for (let a of n) {
 		let o = r.get(a);
@@ -1469,120 +1509,121 @@ function We(e, t, n, r) {
 		}));
 		else for (let r of Object.values(t.declarationFor(a).plugin.requires)) {
 			if (r.kind === "extensionPoint") continue;
-			let o = (r.kind === "optional" ? r.service : r).id, s = e.providers.get(o), c = t.providers.get(o);
-			(s && n.has(s) || c && n.has(c)) && i.push(Object.freeze({
+			let o = (r.kind === "optional" ? r.service : r).id, s = e.providers.get(o), c = t.providers.get(o), l;
+			if (c && n.has(c)) l = {
+				provider: c.id,
+				...s && { previousProvider: s.id }
+			};
+			else if (s && n.has(s)) l = {
+				previousProvider: s.id,
+				...c && { provider: c.id }
+			};
+			else continue;
+			i.push(Object.freeze({
 				installation: a.id,
 				kind: "provider_changed",
 				contract: o,
-				...s === void 0 ? {} : { previousProvider: s.id },
-				...c === void 0 ? {} : { provider: c.id }
+				...l
 			}));
 		}
 	}
 	return Object.freeze(i);
 }
-function Y(e) {
-	return e && Object.freeze({
+function $(e) {
+	return Object.freeze({
 		pluginName: e.plugin.name,
 		origin: e.origin
 	});
 }
 // src/composition/planner.ts
-async function X(e, t, n, r, i) {
-	let a = new Map(e.graph.declarations), o = new Map(e.groups), s = new Set(e.graph.byId.keys()), c = /* @__PURE__ */ new Map();
-	for (let e of t) {
-		if (e.kind === "group") {
-			if (o.has(e.group.id)) throw new l("GROUP_CONFLICT", "Group id is already installed: " + e.group.id);
-			o.set(e.group.id, e.group);
+async function wt(e, t, n, r, a) {
+	let o = new Map(e.graph.declarations), s = new Map(e.groups), c = new Set(e.graph.byId.keys()), l = /* @__PURE__ */ new Map(), u = /* @__PURE__ */ new Set();
+	for (let n of t) {
+		if (n.kind === "group") {
+			if (s.has(n.group.id)) throw new D(_, "Group id is already installed: " + n.group.id);
+			s.set(n.group.id, n.group);
 			continue;
 		}
-		if (e.kind === "remove-group") continue;
-		let t = e.installation;
-		if (e.kind === "install") V(s, t.id), a.set(t, e.declaration), c.set(t, "installed");
+		if (n.kind === "remove-group") {
+			if (e.groups.get(n.group.id) !== n.group) throw new D(ve, "Group is not committed: " + n.group.id);
+			u.add(n.group);
+			continue;
+		}
+		let t = n.installation;
+		if (n.kind === "install") J(c, t.id), o.set(t, n.declaration), l.set(t, "installed");
 		else {
-			let n = a.get(t);
-			if (!n) throw new l("INSTALLATION_REMOVED", "Installation is not committed: " + t.id);
-			if (e.kind === "remove") a.delete(t), c.set(t, "removed");
+			let e = o.get(t);
+			if (!e) throw new D(i, "Installation is not committed: " + t.id);
+			if (n.kind === "remove") o.delete(t), l.set(t, "removed");
 			else {
-				let r = e.update, i = Object.hasOwn(r, "plugin");
-				a.set(t, Object.freeze({
-					plugin: r.plugin ?? n.plugin,
-					configuration: Object.hasOwn(r, "configuration") ? r.configuration : n.configuration,
-					origin: i ? r.origin : n.origin
-				})), c.set(t, "updated");
+				let r = n.update;
+				o.set(t, Object.freeze(r.kind === "replace" ? {
+					plugin: r.plugin,
+					configuration: Object.hasOwn(r, "configuration") ? r.configuration : e.configuration,
+					origin: r.origin
+				} : {
+					...e,
+					configuration: r.configuration
+				})), l.set(t, "updated");
 			}
 		}
 	}
-	for (let n of t) {
-		if (n.kind !== "remove-group") continue;
-		if (e.groups.get(n.group.id) !== n.group) throw new l("GROUP_REMOVED", "Group is not committed: " + n.group.id);
-		let t = /* @__PURE__ */ new Set([n.group.id]), r = !0;
-		for (; r;) {
-			r = !1;
-			for (let e of o.values()) e.parentId && t.has(e.parentId) && !t.has(e.id) && (t.add(e.id), r = !0);
+	if (u.size) {
+		let t = Map.groupBy(s.values(), (e) => e.parent);
+		for (let n of u) {
+			if (e.groups.get(n.id) !== n) throw new D(x, "Group creation conflicts with ancestor removal: " + n.id);
+			s.delete(n.id);
+			for (let e of t.get(n) ?? []) u.add(e);
 		}
-		for (let [e] of a) if (e.groupId !== void 0 && t.has(e.groupId)) {
-			if (c.has(e)) throw new l("CHANGE_CONFLICT", "Installation change conflicts with Group removal: " + e.id);
-			a.delete(e), c.set(e, "removed");
-		}
-		for (let n of t) {
-			if (!e.groups.has(n)) throw new l("CHANGE_CONFLICT", "Group creation conflicts with ancestor removal: " + n);
-			o.delete(n);
+		for (let e of o.keys()) if (e.group && u.has(e.group)) {
+			if (l.has(e)) throw new D(x, "Installation change conflicts with Group removal: " + e.id);
+			o.delete(e), l.set(e, "removed");
 		}
 	}
-	Ge(o, a);
-	let u = K.build(a);
-	r.assertKinds(u.contractKinds);
-	let d = n === "change" ? e.graph.affectedByTransitionTo(u, [...c.keys()]) : new Set(u.order), f = /* @__PURE__ */ new Map();
-	for (let [t, r] of a) {
-		let a = e.graph.declarations.get(t) === r ? e.configurations.get(t) : void 0;
-		a ? f.set(t, a) : (n === "start" || c.has(t)) && f.set(t, await Ee(r.plugin.configuration, r.configuration, t.id, i));
+	Tt(s, o);
+	let d = mt.build(o);
+	r.assertKinds(d.contractKinds);
+	let f = n === "change" ? e.graph.affectedByTransitionTo(d, [...l.keys()]) : new Set(d.order), p = /* @__PURE__ */ new Map();
+	for (let [t, r] of o) {
+		let i = e.graph.declarations.get(t) === r ? e.configurations.get(t) : void 0;
+		i ? p.set(t, i) : (n === "start" || l.has(t)) && p.set(t, await et(r.plugin.configuration, r.configuration, t.id, a));
 	}
-	if (n !== "change") for (let e of d) c.set(e, n);
-	let p = Object.freeze(n === "stop" || n === "change" && e.phase === "stopped" ? [] : u.order.filter((e) => d.has(e)).map((e) => e.id)), m = Object.freeze({
+	if (n !== "change") for (let e of f) l.set(e, n);
+	let m = Object.freeze(n === "stop" || n === "change" && e.phase === "stopped" ? [] : d.order.filter((e) => f.has(e)).map((e) => e.id)), ee = Object.freeze({
 		baseStateRevision: e.revision,
 		intent: n,
-		operations: Object.freeze(t.map((t) => "installation" in t ? Object.freeze({
-			kind: t.kind,
-			id: t.installation.id,
-			before: Y(e.graph.declarations.get(t.installation)),
-			after: Y(a.get(t.installation))
-		}) : Object.freeze({
-			kind: t.kind,
-			id: t.group.id,
-			parentId: t.group.parentId
-		}))),
+		operations: St(t, e.graph, d),
 		bindings: Object.freeze({
-			before: J(e.graph),
-			after: J(u)
+			before: Q(e.graph),
+			after: Q(d)
 		}),
-		affectedInstallations: Object.freeze([...d].map((e) => e.id)),
-		reasons: We(e.graph, u, d, c),
-		stopOrder: Object.freeze(e.phase === "running" ? e.graph.order.filter((e) => d.has(e)).reverse().map((e) => e.id) : []),
-		prepareOrder: p,
-		publishOrder: p,
+		affectedInstallations: Object.freeze([...f].map((e) => e.id)),
+		reasons: Ct(e.graph, d, f, l),
+		stopOrder: Object.freeze(e.phase === "running" ? e.graph.order.filter((e) => f.has(e)).reverse().map((e) => e.id) : []),
+		prepareOrder: m,
+		publishOrder: m,
 		execution: Object.freeze({
 			atomicPublication: !0,
 			externalEffectsRollback: !1
 		})
 	});
 	return Object.freeze({
-		groups: o,
-		graph: u,
-		affected: d,
-		configurations: f,
-		report: m
+		groups: s,
+		graph: d,
+		affected: f,
+		configurations: p,
+		report: ee
 	});
 }
-function Ge(e, t) {
+function Tt(e, t) {
 	for (let t of e.values()) {
 		let n = t.parent;
-		if (n && e.get(n.id) !== n) throw new l("GROUP_MISSING", "Group parent is not committed: " + n.id);
+		if (n && e.get(n.id) !== n) throw new D(v, "Group parent is not committed: " + n.id);
 	}
-	for (let n of t.keys()) if (n.group && e.get(n.group.id) !== n.group) throw new l("GROUP_MISSING", "Installation Group is not committed: " + n.group.id);
+	for (let n of t.keys()) if (n.group && e.get(n.group.id) !== n.group) throw new D(v, "Installation Group is not committed: " + n.group.id);
 }
 // src/execution/instance.ts
-var Ke = class {
+var Et = class {
 	installation;
 	declaration;
 	generation;
@@ -1590,44 +1631,53 @@ var Ke = class {
 	lifetime;
 	#e = /* @__PURE__ */ new Map();
 	constructor(e, t, n, r) {
-		this.installation = e, this.declaration = t, this.generation = n, this.environment = r, this.lifetime = new ue({
+		this.installation = e, this.declaration = t, this.generation = n, this.environment = r, this.lifetime = new Ie({
 			label: e.id + "@" + n,
 			report: r.report,
+			releaseFailed: r.releaseFailed,
 			changed: r.changed,
 			parentSignal: r.startupSignal,
 			...r.shutdownTimeoutMilliseconds === void 0 ? {} : { shutdownTimeoutMilliseconds: r.shutdownTimeoutMilliseconds }
 		});
 	}
 	async prepare(e, t) {
-		let n = this.environment, r = Object.freeze({
-			hostName: n.hostName,
+		let n = this.lifetime.signal, r = this.environment, i = Object.freeze({
+			hostName: r.hostName,
 			installationId: this.installation.id,
 			pluginName: this.declaration.plugin.name,
 			generation: this.generation,
 			groupId: this.installation.groupId
-		}), i = Object.freeze({
+		}), a = Object.freeze({
 			dependencies: e,
 			lifetime: this.lifetime.handle,
-			events: n.events.scope(this.lifetime, (e) => n.contracts.remember(e)),
-			contributions: n.contributions.scope(this.lifetime, this.installation.id, (e) => n.contracts.remember(e)),
-			metadata: r,
-			logger: this.lifetime.use(new m(n.logger, r)).handle
-		}), { setup: a } = this.declaration.plugin, o = await this.lifetime.prepare(() => a(i, t));
-		AbortSignal.prototype.throwIfAborted.call(this.lifetime.signal);
-		let s = Object.entries(this.declaration.plugin.provides);
-		if (!s.length) {
-			if (o !== void 0) throw new l("PROVIDES_INVALID", "Plugin without provisions must return undefined");
+			events: r.events.scope(this.lifetime, (e) => r.contracts.remember(e)),
+			contributions: r.contributions.scope(this.lifetime, this.installation.id, (e) => r.contracts.remember(e)),
+			metadata: i,
+			logger: this.lifetime.use(new fe(r.logger, i)).handle
+		}), { setup: o } = this.declaration.plugin, { value: s } = await this.lifetime.prepare(() => o(a, t));
+		AbortSignal.prototype.throwIfAborted.call(n);
+		let c = Object.entries(this.declaration.plugin.provides), l = (e, t) => new D(ee, e, {
+			...t,
+			details: { installation: this.installation.id }
+		});
+		if (!c.length) {
+			if (s !== void 0) throw l("Plugin without provisions must return undefined");
 			return;
 		}
-		let c = g(o, "Provided Services", { fields: new Set(s.map(([e]) => e)) });
-		AbortSignal.prototype.throwIfAborted.call(this.lifetime.signal);
-		for (let [e, t] of s) {
-			if (!Object.hasOwn(c, e)) throw new l("PROVIDES_INVALID", "Plugin did not provide " + e);
-			this.#e.set(t.id, c[e]);
+		let u;
+		try {
+			u = E(s, "Provided Services", { fields: new Set(c.map(([e]) => e)) });
+		} catch (e) {
+			throw l("Plugin returned invalid or unreadable provided Services", { cause: e });
+		}
+		AbortSignal.prototype.throwIfAborted.call(n);
+		for (let [e, t] of c) {
+			if (!Object.hasOwn(u, e)) throw l("Plugin did not provide " + e);
+			this.#e.set(t.id, u[e]);
 		}
 	}
 	read(e) {
-		if (!this.#e.has(e)) throw new l("SERVICE_UNAVAILABLE", "Service has not been prepared: " + e);
+		if (!this.#e.has(e)) throw new D(O, "Service has not been prepared: " + e);
 		return this.#e.get(e);
 	}
 	use(e, t) {
@@ -1643,7 +1693,7 @@ var Ke = class {
 			this.lifetime.phase === "disposed" && this.#e.clear();
 		}
 	}
-}, Z = class {
+}, Dt = y()("name", "installations", "groups", "logger", "onError", "shutdownTimeoutMilliseconds"), Ot = y()("id", "parentId"), kt = y()("id", "plugin", "configuration", "origin", "groupId"), At = class {
 	#e = [];
 	#t;
 	constructor(e) {
@@ -1656,71 +1706,58 @@ var Ke = class {
 		let t = this.#e;
 		return this.#e = void 0, t?.length ? t.length === 1 ? t[0] : AggregateError(t, "Plugin preparation failed") : e;
 	}
-}, qe = class {
+}, jt = class {
 	name;
 	#e;
 	#t;
 	#n;
-	#r = new fe();
-	#i = new ge();
+	#r = new ze();
+	#i = new Ue();
 	#a;
-	#o = new d();
-	#s = new Ue();
-	#c = new Fe();
+	#o = new he();
+	#s = new xt();
+	#c = new ft();
 	#l = /* @__PURE__ */ new WeakMap();
 	#u = /* @__PURE__ */ new WeakMap();
 	#d;
 	#f;
 	#p;
-	#m = 0;
+	#m;
 	#h = 0;
 	constructor(e = {}) {
-		let t = g(e, "Host options", { fields: /* @__PURE__ */ new Set([
-			"name",
-			"installations",
-			"groups",
-			"logger",
-			"onError",
-			"shutdownTimeoutMilliseconds"
-		]) }), n = t.name === void 0 ? "host" : t.name;
-		if (G(n, "Host name"), this.name = n, t.onError !== void 0 && typeof t.onError != "function") throw TypeError("Host onError must be a function");
-		this.#e = c(t.logger === void 0 ? console : t.logger), this.#t = t.onError ?? ((e) => this.#e.error(e)), this.#n = A(t.shutdownTimeoutMilliseconds), this.#a = new xe((e) => this.#L(e));
-		let r = /* @__PURE__ */ new Map(), i = u(t.groups === void 0 ? [] : t.groups, "Initial Groups"), a = u(t.installations === void 0 ? [] : t.installations, "Initial Installations"), o = /* @__PURE__ */ new Map();
+		let t = E(e, "Host options", { fields: Dt }), n = t.name === void 0 ? "host" : t.name;
+		if (X(n, "Host name"), this.name = n, t.onError !== void 0 && typeof t.onError != "function") throw TypeError("Host onError must be a function");
+		this.#e = me(t.logger === void 0 ? console : t.logger), this.#t = t.onError ?? ((e) => this.#e.error(e)), this.#n = L(t.shutdownTimeoutMilliseconds), this.#a = new Ye((e) => this.#z(e));
+		let r = /* @__PURE__ */ new Map(), i = s(t.groups === void 0 ? [] : t.groups, "Initial Groups"), a = s(t.installations === void 0 ? [] : t.installations, "Initial Installations"), o = /* @__PURE__ */ new Map();
 		for (let e of i) {
-			let t = g(e, "Initial Group", { fields: /* @__PURE__ */ new Set(["id", "parentId"]) });
-			if (G(t.id, "Group id"), t.parentId !== void 0 && G(t.parentId, "Parent Group id"), o.has(t.id)) throw new l("GROUP_CONFLICT", "Duplicate initial Group: " + t.id);
+			let t = E(e, "Initial Group", { fields: Ot });
+			if (X(t.id, "Group id"), t.parentId !== void 0 && X(t.parentId, "Parent Group id"), o.has(t.id)) throw new D(_, "Duplicate initial Group: " + t.id);
 			o.set(t.id, t.parentId);
 		}
-		let s = He(o, (e, t) => this.#j(e, t)), d = /* @__PURE__ */ new Set();
+		let c = bt(o, (e, t) => this.#N(e, t)), l = /* @__PURE__ */ new Set();
 		for (let e of a) {
-			let t = g(e, "Initial Installation", { fields: /* @__PURE__ */ new Set([
-				"id",
-				"plugin",
-				"configuration",
-				"origin",
-				"groupId"
-			]) });
-			G(t.id, "Installation id"), t.groupId !== void 0 && G(t.groupId, "Installation Group id"), V(d, t.id);
-			let n = t.groupId === void 0 ? void 0 : s.get(t.groupId);
-			if (t.groupId !== void 0 && !n) throw new l("GROUP_MISSING", "Initial Group is missing: " + t.groupId);
-			let i = this.#O(t.id, n);
-			r.set(i, H(t.plugin, t.configuration, t.origin));
+			let t = E(e, "Initial Installation", { fields: kt });
+			X(t.id, "Installation id"), t.groupId !== void 0 && X(t.groupId, "Installation Group id"), J(l, t.id);
+			let n = t.groupId === void 0 ? void 0 : c.get(t.groupId);
+			if (t.groupId !== void 0 && !n) throw new D(v, "Initial Group is missing: " + t.groupId);
+			let i = this.#A(t.id, n);
+			r.set(i, st(t.plugin, t.configuration, t.origin));
 		}
 		this.#f = Object.freeze({
 			revision: 0,
-			groups: s,
-			graph: K.build(r),
+			groups: c,
+			graph: mt.build(r),
 			configurations: /* @__PURE__ */ new Map(),
 			phase: "stopped",
 			instances: /* @__PURE__ */ new Map(),
 			unresolved: Object.freeze([]),
 			error: void 0
-		}), this.#d = new f(() => this.#F(), (e) => this.#L(e)), this.#r.commit(this.#f.graph.contractKinds);
-		for (let e of r.keys()) this.#k(e);
+		}), this.#d = new oe(() => this.#L(), (e) => this.#z(e)), this.#r.commit(this.#f.graph.contractKinds);
+		for (let e of r.keys()) this.#j(e);
 		Object.freeze(this);
 	}
 	get status() {
-		return this.#p?.phase ?? this.#f.phase;
+		return this.#D() ? "quarantined" : this.#p?.phase ?? this.#f.phase;
 	}
 	get stateRevision() {
 		return this.#f.revision;
@@ -1736,38 +1773,38 @@ var Ke = class {
 	}
 	explain(e) {
 		let { graph: t } = this.#f, n = t.byId.get(e);
-		return J(t, n ? [n] : []);
+		return Q(t, n ? [n] : []);
 	}
 	change() {
-		return this.#E(), this.#c.create({
-			create: (e, t) => this.#O(e, t),
-			resolve: (e) => this.#M(e),
-			createGroup: (e, t) => this.#j(e, t),
+		return this.#O(), this.#c.create({
+			create: (e, t) => this.#A(e, t),
+			resolve: (e) => this.#P(e),
+			createGroup: (e, t) => this.#N(e, t),
 			resolveGroup: (e) => {
 				let t = this.#u.get(e);
-				if (!t) throw new l("GROUP_FOREIGN", "Group belongs to another Host");
+				if (!t) throw new D(ye, "Group belongs to another Host");
 				return t;
 			}
 		});
 	}
-	async plan(t, n) {
-		this.#E();
-		let r = this.#c.take(t), i = this.#s.validationSignal, a, o;
+	async plan(e, t) {
+		this.#O();
+		let n = this.#c.take(e), r = this.#s.validationSignal, i, a;
 		try {
-			if (n !== void 0) {
-				let t = new AbortController(), r = (e) => t.abort(e);
-				o = e(i, r), a = e(n, r), i = t.signal, i.throwIfAborted();
+			if (t !== void 0) {
+				let e = new AbortController(), n = (t) => e.abort(t);
+				a = o(r, n), i = o(t, n), r = e.signal, r.throwIfAborted();
 			}
-			let t = await X(this.#f, r, "change", this.#r, i);
-			return i.throwIfAborted(), this.#r.assertKinds(t.graph.contractKinds), this.#s.issue(t, this.#f);
+			let e = await wt(this.#f, n, "change", this.#r, r);
+			return r.throwIfAborted(), this.#r.assertKinds(e.graph.contractKinds), this.#s.issue(e, this.#f);
 		} catch (e) {
-			throw this.#N(r), e;
+			throw this.#F(n), e;
 		} finally {
-			o?.(), a?.();
+			a?.(), i?.();
 		}
 	}
 	apply(e) {
-		return this.#p ? Promise.reject(this.#D()) : this.#o.run(() => this.#_(e));
+		return this.#D() ? Promise.reject(a(this.#f.revision)) : this.#p ? Promise.reject(this.#k()) : this.#o.run(() => this.#_(e)).then(({ value: e }) => e);
 	}
 	start() {
 		return this.#g("start");
@@ -1778,48 +1815,49 @@ var Ke = class {
 	use(e, t) {
 		try {
 			if (typeof t != "function") throw TypeError("Service callback must be a function");
-			let n = T(e);
+			let n = De(e);
 			if (n.kind === "extensionPoint") throw TypeError("Expected a Service");
 			let r = n.kind === "optional" ? n.service : n;
-			if (this.#r.assertCompatible(r), this.#E(), this.#f.phase !== "running") throw new l("SERVICE_UNAVAILABLE", "Host is not running");
+			if (this.#r.assertCompatible(r), this.#O(), this.#f.phase !== "running") throw new D(O, "Host is not running");
 			let i = this.#f.graph.providers.get(r.id);
 			if (!i) {
-				if (n.kind === "optional") return Promise.resolve(t(void 0));
-				throw new l("SERVICE_UNAVAILABLE", "No provider for " + r.id);
+				if (n.kind === "optional") return T(t(void 0));
+				throw new D(O, "No provider for " + r.id);
 			}
-			if (this.#p?.affected.has(i)) throw new l("SERVICE_UNAVAILABLE", "Service is changing: " + r.id);
+			if (this.#p?.affected.has(i)) throw new D(O, "Service is changing: " + r.id);
 			let a = this.#f.instances.get(i);
-			if (!a) throw new l("SERVICE_UNAVAILABLE", "Service is not running: " + r.id);
+			if (!a) throw new D(O, "Service is not running: " + r.id);
 			return a.use(r.id, t);
 		} catch (e) {
 			return Promise.reject(e);
 		}
 	}
 	contributions(e) {
-		let t = w(e, "extensionPoint");
+		let t = M(e, "extensionPoint");
 		return this.#r.remember(t), this.#a.view(t);
 	}
 	#g(e) {
-		return this.#p ? Promise.reject(this.#D()) : this.#o.run(async () => {
-			if (this.#E(), e === "start" && this.#f.phase === "running" || e === "stop" && this.#f.phase === "stopped") return this.#T([]);
+		return this.#D() ? Promise.reject(a(this.#f.revision)) : this.#p ? Promise.reject(this.#k()) : this.#o.run(async () => {
+			if (this.#O(), e === "start" && this.#f.phase === "running" || e === "stop" && this.#f.phase === "stopped") return this.#E([]);
 			e === "start" && (this.#p = {
 				phase: "starting",
-				affected: new Set(this.#f.graph.declarations.keys())
-			}, this.#I());
+				affected: new Set(this.#f.graph.declarations.keys()),
+				scopes: []
+			}, this.#R());
 			try {
-				let t = await X(this.#f, [], e, this.#r);
+				let t = await wt(this.#f, [], e, this.#r);
 				return await this.#_(this.#s.issue(t, this.#f));
 			} finally {
-				this.#p && (this.#p = void 0, this.#I());
+				this.#p && (this.#p = void 0, this.#R());
 			}
-		});
+		}).then(({ value: e }) => e);
 	}
 	async #_(e) {
-		this.#E();
+		this.#O();
 		let t = this.#s.read(e, this.#f.revision);
-		if (t.report.intent === "change" && t.report.operations.length === 0) return this.#s.consume(e), this.#T([]);
+		if (t.report.intent === "change" && t.report.operations.length === 0) return this.#s.consume(e), this.#E([]);
 		let n = this.#f, r = n.graph.order.filter((e) => t.affected.has(e)).flatMap((e) => n.instances.get(e) ?? []);
-		for (let e of r) if (e.lifetime.busy) throw new l("HOST_BUSY", "Affected work is still in flight", { details: {
+		for (let e of r) if (e.lifetime.busy) throw new D(ne, "Affected work is still in flight", { details: {
 			outcome: "rejected",
 			installation: e.installation.id,
 			stateRevision: n.revision
@@ -1829,125 +1867,127 @@ var Ke = class {
 		try {
 			i = this.#r.writer(t.graph.contractKinds);
 		} catch (e) {
-			throw this.#A(t.graph.declarations.keys()), e;
+			throw this.#M(t.graph.declarations.keys()), e;
 		}
 		for (let e of r) e.lifetime.seal();
-		this.#p = {
-			phase: t.report.intent === "start" ? "starting" : t.report.intent === "stop" ? "stopping" : "changing",
-			affected: t.affected
-		}, this.#a.beginBatch(), this.#I();
+		let a = this.#p;
+		this.#p = a ?? {
+			phase: t.report.intent === "stop" ? "stopping" : "changing",
+			affected: t.affected,
+			scopes: []
+		}, this.#p.scopes.push(n), this.#a.beginBatch(), a || this.#R();
 		try {
-			if (n.phase === "stopped" && t.report.intent !== "start") return i.commit(), this.#b(t, /* @__PURE__ */ new Map(), "stopped"), this.#T(t.report.affectedInstallations);
-			let e = await this.#C([n], new Set(r));
-			if (e.length || r.some((e) => e.lifetime.phase !== "disposed")) throw i.discard(), await this.#S(n, [], e, t, "stop");
-			if (t.report.intent === "stop") return i.commit(), this.#b(t, /* @__PURE__ */ new Map(), "stopped"), this.#T(t.report.affectedInstallations);
+			if (n.phase === "stopped" && t.report.intent !== "start") return i.commit(), this.#b(t, /* @__PURE__ */ new Map(), "stopped"), this.#E(t.report.affectedInstallations);
+			let e = await this.#w([n], new Set(r));
+			if (this.#D() || e.length || r.some((e) => e.lifetime.phase !== "disposed")) throw i.discard(), await this.#C(n, e, t, "stop");
+			if (t.report.intent === "stop") return i.commit(), this.#b(t, /* @__PURE__ */ new Map(), "stopped"), this.#E(t.report.affectedInstallations);
 			let a = new Map(n.instances);
 			for (let e of t.affected) a.delete(e);
-			let o = /* @__PURE__ */ new Map(), s = new Z((e) => this.#L(e));
+			let o = new Map(a), s = {
+				graph: t.graph,
+				instances: o
+			};
+			this.#p.scopes.push(s);
+			let c = new At((e) => this.#z(e));
 			try {
-				await this.#v(t, a, o, i, s);
-				for (let e of o.values()) AbortSignal.prototype.throwIfAborted.call(e.lifetime.signal);
-				i.commit(), s.seal();
+				await this.#v(t, o, i, c), i.commit(), c.seal();
 			} catch (e) {
 				i.discard();
-				let r = {
-					graph: t.graph,
-					instances: new Map([...a, ...o])
-				}, c = await this.#C([r], new Set(o.values())), l = s.seal(e);
-				throw c.length || [...o.values()].some((e) => e.lifetime.phase !== "disposed") ? await this.#S(n, [r], [l, ...c], t, "prepare") : n.phase === "stopped" ? (this.#x({
+				let r = c.seal(e);
+				if (this.#D()) throw await this.#C(n, [r], t, "prepare");
+				let l = new Set([...o.values()].filter((e) => t.affected.has(e.installation))), u = await this.#w([s], l);
+				throw this.#D() || u.length || [...l].some((e) => e.lifetime.phase !== "disposed") ? await this.#C(n, [r, ...u], t, "prepare") : n.phase === "stopped" ? (this.#x({
 					...n,
-					error: new _(l).snapshot
-				}), this.#w("TRANSITION_FAILED", "Startup failed", l, "restored", t, "prepare")) : (await this.#y(n, a, t, l), this.#w("TRANSITION_FAILED", "Change failed; previous declarations were restored", l, "restored", t, "prepare"));
+					error: new b(r).snapshot
+				}), this.#T("Startup failed", r, "restored", t.report.affectedInstallations, "prepare")) : (await this.#y(n, a, t, r), this.#T("Change failed; previous declarations were restored", r, "restored", t.report.affectedInstallations, "prepare"));
 			}
-			for (let [e, t] of o) a.set(e, t);
 			try {
-				this.#b(t, a, "running", o);
+				this.#b(t, o, "running");
 			} catch (e) {
-				throw i.discard(), await this.#S(this.#f, [{
-					graph: t.graph,
-					instances: new Map(a)
-				}], [e], t, "publish");
+				throw i.discard(), await this.#C(this.#f, [e], t, "publish");
 			}
-			return this.#T(t.report.affectedInstallations);
+			return this.#E(t.report.affectedInstallations);
 		} finally {
-			this.#p = void 0, this.#A(t.graph.declarations.keys()), h(() => {
-				this.#a.endBatch(), this.#I();
+			this.#p = void 0, this.#M(t.graph.declarations.keys()), w(() => {
+				this.#a.endBatch(), this.#R();
 			});
 		}
 	}
-	async #v(e, t, n, r, i) {
+	async #v(e, t, n, i) {
 		let a = new AbortController(), o = ++this.#h;
 		for (let s of e.graph.layers) {
-			let c = s.filter((t) => e.affected.has(t)).map((t) => {
-				let i = new Ke(t, e.graph.declarationFor(t), o, {
+			this.#O();
+			let c = s.filter((t) => e.affected.has(t)).map((r) => {
+				let i = new Et(r, e.graph.declarationFor(r), o, {
 					hostName: this.name,
 					logger: this.#e,
-					report: (e) => this.#L(e),
+					report: (e) => this.#z(e),
+					releaseFailed: (e) => this.#S(i, e),
 					changed: () => {
-						(this.#f.instances.get(t) === i || this.#f.unresolved.includes(i)) && this.#I();
+						(this.#f.instances.get(r) === i || this.#f.unresolved.includes(i)) && this.#R();
 					},
 					events: this.#i,
 					contributions: this.#a,
-					contracts: r,
+					contracts: n,
 					startupSignal: a.signal,
 					shutdownTimeoutMilliseconds: this.#n
 				});
-				return n.set(t, i), i;
+				return t.set(r, i), i;
 			});
 			try {
-				await Promise.all(c.map(async (r) => {
-					let o = Object.create(null);
-					for (let [i, a] of Object.entries(r.declaration.plugin.requires)) {
-						if (a.kind === "extensionPoint") {
-							o[i] = this.#a.view(a, r.lifetime);
+				await Promise.all(c.map(async (n) => {
+					let o = n.lifetime.signal, s = Object.create(null);
+					for (let [r, i] of Object.entries(n.declaration.plugin.requires)) {
+						if (i.kind === "extensionPoint") {
+							s[r] = this.#a.view(i, n.lifetime);
 							continue;
 						}
-						let s = a.kind === "optional" ? a.service : a, c = e.graph.providers.get(s.id);
-						o[i] = c ? (n.get(c) ?? t.get(c))?.read(s.id) : void 0;
+						let a = i.kind === "optional" ? i.service : i, o = e.graph.providers.get(a.id);
+						s[r] = o ? t.get(o)?.read(a.id) : void 0;
 					}
 					try {
-						await r.prepare(Object.freeze(o), e.configurations.get(r.installation)?.value);
+						await n.prepare(Object.freeze(s), e.configurations.get(n.installation)?.value);
 					} catch (e) {
-						throw a.signal.aborted && Object.is(e, a.signal.reason) || i.add(e), a.abort(e), e;
+						throw r(o, e) || i.add(e), a.abort(e), e;
 					}
-				}));
+				})), this.#O();
+				for (let e of c) AbortSignal.prototype.throwIfAborted.call(e.lifetime.signal);
 			} catch (e) {
 				throw a.abort(e), e;
 			}
 		}
 	}
 	async #y(e, t, n, r) {
-		let i = /* @__PURE__ */ new Map(), a = new Z((e) => this.#L(e)), o = this.#r.writer(e.graph.contractKinds);
+		this.#O();
+		let i = new Map(t), a = {
+			graph: e.graph,
+			instances: i
+		};
+		this.#p.scopes.push(a);
+		let o = new At((e) => this.#z(e)), s = this.#r.writer(e.graph.contractKinds);
 		try {
 			await this.#v({
 				graph: e.graph,
 				affected: n.affected,
 				configurations: e.configurations
-			}, t, i, o, a);
-			for (let e of i.values()) AbortSignal.prototype.throwIfAborted.call(e.lifetime.signal);
-			a.seal();
-			for (let [e, n] of i) t.set(e, n);
-			o.commit(), this.#x({
+			}, i, s, o), o.seal(), s.commit(), this.#x({
 				...e,
-				instances: t,
-				error: new _(r).snapshot
+				instances: i,
+				error: new b(r).snapshot
 			});
-			for (let e of i.values()) e.publish();
-		} catch (s) {
-			o.discard();
-			let c = {
-				graph: e.graph,
-				instances: new Map([...t, ...i])
-			}, l = await this.#C([c], new Set(i.values()));
-			throw await this.#S(e, [c], [
+			for (let [e, t] of i) n.affected.has(e) && t.publish(), this.#O();
+		} catch (t) {
+			s.discard();
+			let c = this.#D() ? [] : await this.#w([a], new Set([...i.values()].filter((e) => n.affected.has(e.installation))));
+			throw await this.#C(e, [
 				r,
-				a.seal(s),
-				...l
+				o.seal(t),
+				...c
 			], n, "restore");
 		}
 	}
-	#b(e, t, n, r = /* @__PURE__ */ new Map()) {
-		let i = this.#f;
+	#b(e, t, n) {
+		let r = this.#f;
 		this.#x({
 			groups: e.groups,
 			graph: e.graph,
@@ -1956,16 +1996,16 @@ var Ke = class {
 			instances: t,
 			unresolved: Object.freeze([]),
 			error: void 0
-		});
-		for (let t of e.graph.declarations.keys()) i.graph.declarations.has(t) || this.#k(t);
-		for (let t of i.graph.declarations.keys()) e.graph.declarations.has(t) || t.detach({
+		}), this.#O();
+		for (let t of e.graph.declarations.keys()) r.graph.declarations.has(t) || this.#j(t);
+		for (let t of r.graph.declarations.keys()) e.graph.declarations.has(t) || t.detach({
 			status: "removed",
 			origin: void 0
 		});
-		for (let e of r.values()) e.publish();
+		for (let [n, r] of t) e.affected.has(n) && r.publish(), this.#O();
 	}
 	#x(e) {
-		this.#f = Object.freeze({
+		this.#O(), this.#f = Object.freeze({
 			...e,
 			revision: this.#f.revision + 1
 		});
@@ -1978,23 +2018,44 @@ var Ke = class {
 			});
 		}
 	}
-	async #S(e, t, n, r, i) {
-		let a = [e, ...t], o = [...new Set(a.flatMap((e) => [...e.instances.values()]))].filter((e) => e.lifetime.phase !== "disposed");
-		for (let e of o) e.lifetime.block();
-		this.#p &&= {
-			...this.#p,
-			affected: /* @__PURE__ */ new Set([...this.#p.affected, ...o.map((e) => e.installation)])
+	#S(e, t) {
+		if (this.#D()) return;
+		let n = e.lifetime;
+		if ((t.kind !== "shutdown" || t.owner === n) && n.phase !== "active" && n.phase !== "sealed") return;
+		let r = e.installation;
+		(this.#f.instances.get(r) === e || this.#p?.scopes.some((t) => t.instances.get(r) === e)) && this.#C(this.#f, [t.error], void 0, "release").then((e) => this.#z(e), (e) => this.#z(e));
+	}
+	#C(e, t, n, r) {
+		if (this.#m || this.#D()) {
+			let e = this.#m ?? Promise.resolve(a(this.#f.revision));
+			return t.length ? e.then((e) => this.#T("Operation failed while Host was quarantined", AggregateError([...t, e], "Execution failed during quarantine"), "quarantined", n?.report.affectedInstallations ?? [], r)) : e;
+		}
+		let i = [e, ...this.#p?.scopes ?? []], o = [...new Set(i.flatMap((e) => [...e.instances.values()]))].filter((e) => e.lifetime.phase !== "disposed"), s = n?.report.affectedInstallations ?? [...new Set(o.map((e) => e.installation.id))], c = "Execution could not establish a healthy state", l = Promise.resolve().then(async () => {
+			let e = await this.#w(i, new Set(o)), n = AggregateError([...t, ...e], c);
+			return this.#f = Object.freeze({
+				...this.#f,
+				unresolved: Object.freeze(o.filter((e) => e.lifetime.phase !== "disposed")),
+				error: new b(n).snapshot
+			}), this.#R(), this.#T("Host is quarantined after execution could not establish a healthy state", n, "quarantined", s, r);
+		});
+		this.#m = l;
+		let u = () => {
+			this.#m = void 0;
 		};
-		let s = await this.#C(a, new Set(o)), c = o.filter((e) => e.lifetime.phase !== "disposed"), l = AggregateError([...n, ...s], "Execution could not establish a healthy state");
+		l.then(u, u);
+		for (let e of o) e.lifetime.block();
 		return this.#x({
 			...e,
 			phase: "quarantined",
 			instances: /* @__PURE__ */ new Map(),
-			unresolved: Object.freeze(c),
-			error: new _(l).snapshot
-		}), this.#w("HOST_QUARANTINED", "Host is quarantined after execution could not establish a healthy state", l, "quarantined", r, i);
+			unresolved: Object.freeze(o),
+			error: void 0
+		}), this.#R(), this.#f = Object.freeze({
+			...this.#f,
+			error: new b(AggregateError(t, c)).snapshot
+		}), this.#R(), l;
 	}
-	async #C(e, t) {
+	async #w(e, t) {
 		let n = /* @__PURE__ */ new Map();
 		for (let { graph: t, instances: r } of e) for (let [e, i] of t.dependents) {
 			let t = r.get(e);
@@ -2013,71 +2074,74 @@ var Ke = class {
 		}));
 		return (await Promise.allSettled(r.values())).flatMap((e) => e.status === "rejected" ? [e.reason] : []);
 	}
-	#w(e, t, n, r, i, a) {
-		return new l(e, t, {
-			cause: n,
+	#T(e, t, r, i, a) {
+		return new D(r === "restored" ? ae : n, e, {
+			cause: t,
 			details: {
 				outcome: r,
 				phase: a,
 				stateRevision: this.#f.revision,
-				affectedInstallations: i.report.affectedInstallations
+				affectedInstallations: i
 			}
 		});
 	}
-	#T(e) {
+	#E(e) {
 		return Object.freeze({
 			stateRevision: this.#f.revision,
 			affectedInstallations: Object.freeze([...e])
 		});
 	}
-	#E() {
-		if (this.#f.phase === "quarantined") throw p(this.#f.revision);
-	}
 	#D() {
-		return new l("HOST_BUSY", "Another Host transition is in progress", { details: {
+		return this.#f.phase === "quarantined";
+	}
+	#O() {
+		if (this.#D()) throw a(this.#f.revision);
+	}
+	#k() {
+		return new D(ne, "Another Host transition is in progress", { details: {
 			outcome: "rejected",
 			stateRevision: this.#f.revision
 		} });
 	}
-	#O(e, t) {
-		let n = new Pe(e, ++this.#m, t);
+	#A(e, t) {
+		let n = new lt(e, t);
 		return this.#l.set(n.facade, n), n;
 	}
-	#k(e) {
+	#j(e) {
 		e.attach(() => ({
-			status: this.#P(e),
+			status: this.#I(e),
 			origin: this.#f.graph.declarations.get(e)?.origin
 		}));
 	}
-	#A(e) {
+	#M(e) {
 		for (let t of e) this.#f.graph.declarations.has(t) || t.detach({
 			status: "removed",
 			origin: void 0
 		});
 	}
-	#j(e, t) {
-		let n = new Ve(e, t);
+	#N(e, t) {
+		let n = new yt(e, t);
 		return this.#u.set(n.facade, n), n;
 	}
-	#M(e) {
+	#P(e) {
 		let t = this.#l.get(e);
-		if (!t) throw new l("INSTALLATION_FOREIGN", "Installation belongs to another Host");
+		if (!t) throw new D(re, "Installation belongs to another Host");
 		return t;
 	}
-	#N(e) {
-		this.#A(e.flatMap((e) => e.kind === "install" ? [e.installation] : []));
+	#F(e) {
+		this.#M(e.flatMap((e) => e.kind === "install" ? [e.installation] : []));
 	}
-	#P(e) {
-		return this.#f.graph.declarations.has(e) ? this.#f.phase === "quarantined" ? "quarantined" : this.#p?.affected.has(e) ? "changing" : this.#f.instances.has(e) ? "running" : "stopped" : "pending";
+	#I(e) {
+		return this.#f.graph.declarations.has(e) ? this.#D() ? "quarantined" : this.#p?.affected.has(e) ? "changing" : this.#f.instances.has(e) ? "running" : "stopped" : "pending";
 	}
-	#F() {
+	#L() {
 		let e = [...this.#f.graph.declarations].map(([e, t]) => {
 			let n = this.#f.instances.get(e);
 			return Object.freeze({
 				id: e.id,
 				groupId: e.groupId,
 				pluginName: t.plugin.name,
-				status: this.#P(e),
+				status: this.#I(e),
 				origin: t.origin,
 				generation: n?.generation,
 				requires: Object.freeze(Object.values(t.plugin.requires).map((e) => e.kind === "optional" ? e.service.id : e.id)),
@@ -2095,7 +2159,7 @@ var Ke = class {
 				parentId: e.parentId,
 				installations: Object.freeze((t.get(e.id) ?? []).map((e) => e.id))
 			}))),
-			bindings: J(this.#f.graph),
+			bindings: Q(this.#f.graph),
 			unresolved: Object.freeze(this.#f.unresolved.map((e) => Object.freeze({
 				installation: e.installation.id,
 				generation: e.generation,
@@ -2104,7 +2168,7 @@ var Ke = class {
 			error: this.#f.error
 		});
 	}
-	#I() {
+	#R() {
 		this.#f.unresolved.some((e) => e.lifetime.phase === "disposed") && (this.#f = Object.freeze({
 			...this.#f,
 			unresolved: Object.freeze(this.#f.unresolved.filter((e) => e.lifetime.phase !== "disposed"))
@@ -2112,26 +2176,26 @@ var Ke = class {
 		try {
 			this.#d.invalidate();
 		} catch (e) {
-			this.#L(e);
+			this.#z(e);
 		}
 	}
-	#L(e) {
+	#z(e) {
 		let t = this.#e, n = (n) => {
 			try {
-				Promise.resolve(t.error(AggregateError([e, n], "Host error reporter failed"))).catch(() => void 0);
+				T(t.error(AggregateError([e, n], "Host error reporter failed"))).catch(() => void 0);
 			} catch {}
 		};
 		try {
 			let t = this.#t;
-			Promise.resolve(t(e)).catch(n);
+			T(t(e)).catch(n);
 		} catch (e) {
 			n(e);
 		}
 	}
 };
 // src/execution/host.ts
-function Je(e) {
-	let t = new qe(e);
+function Mt(e) {
+	let t = new jt(e);
 	return Object.freeze({
 		get name() {
 			return t.name;
@@ -2155,17 +2219,17 @@ function Je(e) {
 		installation: t.installation.bind(t),
 		group: t.group.bind(t),
 		explain: t.explain.bind(t),
-		[y]: async () => {
+		[l]: async () => {
 			await t.stop();
 		}
 	});
 }
 // src/composition/plugin-description.ts
-var Ye = /* @__PURE__ */ new Set(["jsonSchemaTarget"]);
-function Q(e, t = {}) {
-	let n = g(t, "Plugin description options", { fields: Ye }), r = n.jsonSchemaTarget === void 0 ? "draft-2020-12" : n.jsonSchemaTarget;
+var Nt = y()("jsonSchemaTarget");
+function Pt(e, t = {}) {
+	let n = E(t, "Plugin description options", { fields: Nt }), r = n.jsonSchemaTarget === void 0 ? "draft-2020-12" : n.jsonSchemaTarget;
 	if (typeof r != "string" || !r || r.trim() !== r) throw TypeError("JSON Schema target must be a non-empty trimmed string");
-	let i = B(e), a = i.configuration?.["~standard"], o;
+	let i = q(e), a = i.configuration?.["~standard"], o;
 	if (!a) o = Object.freeze({ status: "none" });
 	else if (!a.jsonSchema) o = Object.freeze({
 		status: "unavailable",
@@ -2177,8 +2241,8 @@ function Q(e, t = {}) {
 			status: "available",
 			vendor: a.vendor,
 			target: r,
-			input: $(a.jsonSchema.input(e)),
-			output: $(a.jsonSchema.output(e))
+			input: Ft(a.jsonSchema.input(e)),
+			output: Ft(a.jsonSchema.output(e))
 		});
 	}
 	return Object.freeze({
@@ -2199,10 +2263,10 @@ function Q(e, t = {}) {
 		configuration: o
 	});
 }
-function $(e) {
-	v(e, "JSON Schema exporters must be synchronous");
-	let t = I(e);
+function Ft(e) {
+	u(e, "JSON Schema exporters must be synchronous");
+	let t = H(e);
 	if (typeof t != "object" || !t || Array.isArray(t)) throw TypeError("JSON Schema exporters must return a plain data record");
 	return t;
 }
-export { r as ConfigurationValidationError, l as DougongError, _ as RecordedFailure, y as asyncDisposeSymbol, I as captureConfiguration, Je as createHost, Ae as definePlugin, Q as describePlugin, n as disposeSymbol, re as event, ie as extensionPoint, i as isCancellationReason, a as isError, t as isLogger, ae as optional, ne as service };
+export { C as ConfigurationValidationError, D as DougongError, b as RecordedFailure, l as asyncDisposeSymbol, H as captureConfiguration, Mt as createHost, rt as definePlugin, Pt as describePlugin, g as disposeSymbol, we as event, Te as extensionPoint, r as isCancellationReason, m as isError, ce as isLogger, Ee as optional, Ce as service };