@dougongjs/core 0.0.2 → 0.1.0

package/dist/index.js

@@ -1,91 +1,145 @@
-function F(r, t) {
+function tt(r, t) {
   if (typeof t != "string" || !t.trim())
     throw new TypeError(`${r} id must be a non-empty string`);
   if (t !== t.trim())
     throw new TypeError(`${r} id cannot start or end with whitespace`);
 }
-function k(r, t) {
-  return F("Contract", t), Object.freeze({ id: t, kind: r });
+function N(r, t) {
+  return tt("Contract", t), Object.freeze({ id: t, kind: r });
 }
 function w(r, t) {
   if (!r || typeof r != "object") return !1;
   const e = r;
-  return typeof e.id == "string" && e.id.length > 0 && e.id === e.id.trim() && (e.kind === "service" || e.kind === "extension" || e.kind === "event") && (t === void 0 || e.kind === t);
+  return typeof e.id == "string" && e.id.length > 0 && e.id === e.id.trim() && (e.kind === "service" || e.kind === "extensionPoint" || e.kind === "event") && (t === void 0 || e.kind === t);
 }
-function v(r, t) {
+function y(r, t) {
   if (!w(r, t))
-    throw new TypeError(t ? `Expected a ${t} contract` : "Invalid contract");
+    throw new TypeError(t ? `Expected ${et(t)}` : "Invalid contract");
 }
-function qt(r) {
-  return k("service", r);
+function et(r) {
+  return r === "extensionPoint" ? "an ExtensionPoint" : r === "event" ? "an Event" : "a Service";
 }
-function Dt(r) {
-  return k("event", r);
+function ne(r) {
+  return N("service", r);
 }
-function Gt(r) {
-  return k("extension", r);
+function oe(r) {
+  return N("event", r);
 }
-function Vt(r) {
+function ae(r) {
+  return N("extensionPoint", r);
+}
+function he(r) {
   if (!w(r, "service"))
-    throw new TypeError("optional() expects a service contract");
+    throw new TypeError("optional() expects a Service");
   return Object.freeze({ kind: "optional", service: r });
 }
-class p extends Error {
+class u extends Error {
   constructor(t, e, i) {
     super(e, i), this.code = t;
   }
   code;
   name = "DougongError";
 }
-function $(r, t, e) {
-  return r instanceof Error ? r : new p(t, e, { cause: r });
+class j extends u {
 }
-class H extends p {
+function A(r, t, e) {
+  return r instanceof j ? r.code === t ? r : new j(t, e, { cause: r.cause }) : r instanceof Error ? r : new j(t, e, { cause: r });
+}
+function Y(r, t) {
+  if (!r || typeof r != "object" || typeof r.aborted != "boolean" || typeof r.addEventListener != "function" || typeof r.removeEventListener != "function" || typeof r.throwIfAborted != "function")
+    throw new TypeError("Cancellation classifier expects an AbortSignal");
+  return r.aborted ? Object.is(t, r.reason) ? !0 : t instanceof Error && t.name === "AbortError" : !1;
+}
+class it extends u {
   name = "ConfigValidationError";
   issues;
   constructor(t) {
-    const e = Object.freeze(
-      t.map(
-        (i) => Object.freeze({
-          message: i.message,
-          ...i.path === void 0 ? {} : {
-            path: Object.freeze(
-              i.path.map(
-                (s) => typeof s == "object" && s !== null ? Object.freeze({ key: s.key }) : s
-              )
-            )
-          }
-        })
-      )
-    );
+    const e = st(t);
     super(
       "CONFIG_INVALID",
-      `Invalid plugin config:
+      `Invalid Plugin config:
 ${e.map((i) => `  - ${i.message}`).join(`
 `)}`
     ), this.issues = e;
   }
 }
-class K {
+function st(r) {
+  if (!Array.isArray(r))
+    throw new TypeError("Config validation issues must be an array");
+  return Object.freeze(
+    Array.from(r, (t, e) => {
+      if (!t || typeof t != "object")
+        throw new TypeError(`Config validation issue at index ${e} must be an object`);
+      const i = t;
+      if (typeof i.message != "string")
+        throw new TypeError(`Config validation issue at index ${e} message must be a string`);
+      return Object.freeze({
+        message: i.message,
+        ...i.path === void 0 ? {} : { path: rt(i.path, e) }
+      });
+    })
+  );
+}
+function rt(r, t) {
+  if (!Array.isArray(r))
+    throw new TypeError(`Config validation issue at index ${t} path must be an array`);
+  return Object.freeze(
+    Array.from(r, (e, i) => {
+      if (M(e)) return e;
+      if (!e || typeof e != "object")
+        throw new TypeError(
+          `Config validation issue at index ${t} path segment ${i} must be a property key`
+        );
+      const s = e.key;
+      if (!M(s))
+        throw new TypeError(
+          `Config validation issue at index ${t} path segment ${i} must contain a property key`
+        );
+      return Object.freeze({ key: s });
+    })
+  );
+}
+function M(r) {
+  return typeof r == "string" || typeof r == "number" || typeof r == "symbol";
+}
+async function Q(r, t, e) {
+  if (!r) return t;
+  const i = await r["~standard"].validate(t);
+  if (!i || typeof i != "object")
+    throw new TypeError(
+      `Installation '${e}' config validator returned a non-object result`
+    );
+  const s = Object.hasOwn(i, "issues") ? i.issues : void 0;
+  if (s !== void 0)
+    throw Array.isArray(s) ? new it(s) : new TypeError(
+      `Installation '${e}' config validator returned non-array issues`
+    );
+  if (!Object.hasOwn(i, "value"))
+    throw new TypeError(
+      `Installation '${e}' config validator returned neither value nor issues`
+    );
+  return i.value;
+}
+class nt {
   #t = /* @__PURE__ */ new Map();
   get kinds() {
     return this.#t;
   }
   assertCompatible(t) {
-    V(this.#t, t);
+    J(this.#t, t);
   }
   remember(t) {
-    S(this.#t, t);
+    $(this.#t, t);
   }
   draft(t) {
-    return new W(this, t);
+    return new ot(this, t);
   }
   commit(t) {
     for (const [e, i] of t) this.assertCompatible({ id: e, kind: i });
     for (const [e, i] of t) this.#t.set(e, i);
   }
 }
-class W {
+class ot {
   #t;
   constructor(t, e) {
     this.#t = { phase: "open", registry: t, pending: /* @__PURE__ */ new Map() };
@@ -98,8 +152,8 @@ class W {
       return;
     }
     if (e.phase === "discarded")
-      throw new TypeError("Contract registry draft has been discarded");
-    e.registry.assertCompatible(t), !e.registry.kinds.has(t.id) && S(e.pending, t);
+      throw new Error("Contract registry draft has been discarded");
+    e.registry.assertCompatible(t), !e.registry.kinds.has(t.id) && $(e.pending, t);
   }
   commit() {
     const t = this.#t;
@@ -109,81 +163,152 @@ class W {
     this.#t.phase === "open" && (this.#t = { phase: "discarded" });
   }
 }
-function S(r, t) {
-  V(r, t), r.set(t.id, t.kind);
+function $(r, t) {
+  J(r, t), r.set(t.id, t.kind);
 }
-function V(r, t) {
+function J(r, t) {
   const e = r.get(t.id);
   if (e && e !== t.kind)
-    throw new p(
+    throw new u(
       "CONTRACT_CONFLICT",
       `Contract '${t.id}' is used as both '${e}' and '${t.kind}'`
     );
 }
-class Y {
-  #t;
-  constructor(t) {
-    this.#t = t, Object.freeze(this);
+class x {
+  constructor(t, e, i, s, n, o) {
+    this.order = t, this.layers = e, this.providers = i, this.dependents = s, this.contractKinds = n, this.#t = o;
   }
-  dispose() {
-    const t = this.#t;
-    this.#t = void 0, t?.dispose();
+  order;
+  layers;
+  providers;
+  dependents;
+  contractKinds;
+  #t;
+  static build(t, e) {
+    const i = [...t].sort((h, d) => h.index - d.index), s = new Map(e), n = at(i, s), o = ht(i, n, s), { order: a, layers: c } = ct(
+      i,
+      o.dependents,
+      o.indegree
+    );
+    return new x(
+      Object.freeze(a),
+      Object.freeze(c.map((h) => Object.freeze(h))),
+      n,
+      o.dependents,
+      s,
+      o.resolvedProviders
+    );
   }
-  [Symbol.dispose]() {
-    this.dispose();
+  providerFor(t, e) {
+    return this.#t.get(t)?.get(e);
   }
-}
-class Q {
-  #t;
-  #e;
-  handle;
-  constructor(t, e, i, s) {
-    this.#e = e, this.#t = { phase: "staged", hub: t, listener: i, release: s }, this.handle = new Y(this);
+  provider(t) {
+    return this.providers.get(t);
   }
-  publish() {
-    const t = this.#t;
-    t.phase === "staged" && (t.hub.add(this.#e, t.listener), t.phase = "published");
+  affectedByTransitionTo(t, e) {
+    const i = /* @__PURE__ */ new Set();
+    return this.#e(e, i), t.#e(e, i), i;
   }
-  dispose() {
-    const t = this.#t;
-    if (t.phase !== "removed") {
-      this.#t = { phase: "removed" };
-      try {
-        t.phase === "published" && t.hub.delete(this.#e, t.listener);
-      } finally {
-        t.release(this);
+  #e(t, e) {
+    const i = [...t], s = /* @__PURE__ */ new Set();
+    for (let n = 0; n < i.length; n++) {
+      const o = i[n];
+      if (o && !s.has(o)) {
+        s.add(o), e.add(o);
+        for (const a of this.dependents.get(o) ?? []) i.push(a);
       }
     }
   }
-  [Symbol.dispose]() {
-    this.dispose();
-  }
 }
-class J {
-  #t = /* @__PURE__ */ new Map();
-  stage(t, e, i) {
-    if (typeof e != "function") throw new TypeError("Event listener must be a function");
-    return new Q(this, t, e, i);
-  }
-  add(t, e) {
-    const i = this.#t.get(t) ?? /* @__PURE__ */ new Set();
-    this.#t.set(t, i), i.add(e);
+function at(r, t) {
+  const e = /* @__PURE__ */ new Map();
+  for (const i of r)
+    for (const s of Object.values(i.declaration.plugin.provides ?? {})) {
+      $(t, s);
+      const n = e.get(s.id);
+      if (n)
+        throw new u(
+          "SERVICE_CONFLICT",
+          `Service '${s.id}' is provided by both '${n.id}' and '${i.id}'`
+        );
+      e.set(s.id, i);
+    }
+  return e;
+}
+function ht(r, t, e) {
+  const i = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), n = new Map(r.map((o) => [o, 0]));
+  for (const o of r)
+    for (const a of Object.values(o.declaration.plugin.requires ?? {})) {
+      const c = a.kind === "optional" ? a.service : a;
+      if ($(e, c), c.kind === "extensionPoint") continue;
+      const h = t.get(c.id);
+      if (!h) {
+        if (a.kind === "optional") continue;
+        throw new u(
+          "SERVICE_MISSING",
+          `Installation '${o.id}' requires missing Service '${c.id}'`
+        );
+      }
+      if (h === o)
+        throw new u(
+          "SERVICE_CYCLE",
+          `Installation '${o.id}' cannot require Service '${c.id}' that it provides`
+        );
+      const d = i.get(o) ?? /* @__PURE__ */ new Map();
+      d.set(c.id, h), i.set(o, d);
+      const l = s.get(h) ?? /* @__PURE__ */ new Set();
+      l.has(o) || (l.add(o), s.set(h, l), n.set(o, (n.get(o) ?? 0) + 1));
+    }
+  return { resolvedProviders: i, dependents: s, indegree: n };
+}
+function ct(r, t, e) {
+  let i = r.filter((o) => e.get(o) === 0);
+  const s = [], n = [];
+  for (; i.length; ) {
+    i.sort((a, c) => a.index - c.index);
+    const o = i;
+    i = [], n.push(o), s.push(...o);
+    for (const a of o)
+      for (const c of t.get(a) ?? []) {
+        const h = (e.get(c) ?? 0) - 1;
+        e.set(c, h), h || i.push(c);
+      }
   }
-  delete(t, e) {
-    const i = this.#t.get(t);
-    i && (i.delete(e), i.size || this.#t.delete(t));
+  if (s.length !== r.length) {
+    const o = dt(r, t);
+    throw new u(
+      "SERVICE_CYCLE",
+      `Installation dependency cycle: ${o.map((a) => a.id).join(" -> ")}`
+    );
   }
-  async emit(t, e) {
-    const i = [...this.#t.get(t) ?? []], n = (await Promise.allSettled(
-      i.map((o) => Promise.resolve().then(() => o(e)))
-    )).filter((o) => o.status === "rejected").map((o) => o.reason);
-    if (n.length)
-      throw new AggregateError(n, `Event '${t}' listeners failed`);
+  return { order: s, layers: n };
+}
+function dt(r, t) {
+  const e = /* @__PURE__ */ new Set(), i = /* @__PURE__ */ new Set(), s = [], n = (o) => {
+    i.add(o), s.push(o);
+    for (const a of t.get(o) ?? []) {
+      if (i.has(a)) {
+        const h = s.indexOf(a);
+        return [...s.slice(h), a];
+      }
+      if (e.has(a)) continue;
+      const c = n(a);
+      if (c) return c;
+    }
+    s.pop(), i.delete(o), e.add(o);
+  };
+  for (const o of r) {
+    if (e.has(o)) continue;
+    const a = n(o);
+    if (a) return a;
   }
+  throw new Error("Dependency graph is cyclic but no cycle path was found");
 }
-class C {
+class O {
   #t;
-  constructor(t) {
+  constructor(t = []) {
+    if (!t || typeof t != "object" && typeof t != "function" || typeof t[Symbol.iterator] != "function")
+      throw new TypeError("ReadonlyMapSnapshot values must be an iterable object");
     this.#t = new Map(t), Object.freeze(this);
   }
   get size() {
@@ -211,7 +336,96 @@ class C {
     return this.entries();
   }
 }
-class X {
+const v = /* @__PURE__ */ new WeakMap();
+class q {
+  #t = /* @__PURE__ */ new Set();
+  #e;
+  #i;
+  #s = !1;
+  constructor(t, e) {
+    if (typeof t != "function") throw new TypeError("Snapshot reader must be a function");
+    if (typeof e != "function")
+      throw new TypeError("Snapshot error reporter must be a function");
+    this.#e = { phase: "active", read: t, report: e }, this.#i = t(), Object.freeze(this);
+  }
+  view = Object.freeze({
+    get: () => this.#n(),
+    subscribe: (t) => this.#a(t)
+  });
+  invalidate() {
+    const { report: t } = this.#o();
+    this.#s = !0;
+    const e = [];
+    for (const i of [...this.#t])
+      try {
+        ut(i);
+      } catch (s) {
+        try {
+          t(s);
+        } catch (n) {
+          e.push(s, n);
+        }
+      }
+    if (e.length)
+      throw new AggregateError(e, "Snapshot error reporting failed");
+  }
+  dispose() {
+    const t = this.#e;
+    if (t.phase !== "disposed") {
+      this.#e = { phase: "disposed" };
+      try {
+        this.#r(t.read);
+      } finally {
+        this.#s = !1;
+        const e = [...this.#t];
+        this.#t.clear();
+        for (const i of e) ft(i);
+      }
+    }
+  }
+  [Symbol.dispose]() {
+    this.dispose();
+  }
+  #n() {
+    const t = this.#e;
+    return t.phase === "active" && this.#r(t.read), this.#i;
+  }
+  #a(t) {
+    if (typeof t != "function") throw new TypeError("Subscriber must be a function");
+    this.#o();
+    const e = new lt(t, (i) => {
+      this.#t.delete(i);
+    });
+    return this.#t.add(e), e;
+  }
+  #r(t) {
+    this.#s && (this.#i = t(), this.#s = !1);
+  }
+  #o() {
+    const t = this.#e;
+    if (t.phase === "disposed") throw new TypeError("Snapshot publisher is disposed");
+    return t;
+  }
+}
+class lt {
+  constructor(t, e) {
+    v.set(this, { listener: t, detach: e }), Object.freeze(this);
+  }
+  dispose() {
+    const t = v.get(this);
+    t && (v.delete(this), t.detach(this));
+  }
+  [Symbol.dispose]() {
+    this.dispose();
+  }
+}
+function ut(r) {
+  v.get(r)?.listener();
+}
+function ft(r) {
+  v.delete(r);
+}
+class pt {
   #t;
   get;
   subscribe;
@@ -219,7 +433,7 @@ class X {
     this.#t = t, this.get = () => this.#e(), this.subscribe = (e) => this.#i(e), Object.freeze(this);
   }
   // The handle retains only revocable binding state. Disposing its lease clears
-  // the Store edge even when downstream code retains the public view.
+  // the ContributionStore edge even when downstream code retains the public view.
   #e() {
     return this.#s().store.snapshot();
   }
@@ -229,11 +443,11 @@ class X {
   }
   #s() {
     const t = this.#t.binding;
-    if (!t) throw new TypeError("Extension view has been disposed");
+    if (!t) throw new TypeError("Contribution view has been disposed");
     return t;
   }
 }
-class Z {
+class gt {
   #t;
   constructor(t) {
     this.#t = t, Object.freeze(this);
@@ -248,16 +462,22 @@ class Z {
     this.dispose();
   }
 }
-class tt {
+class wt {
   #t;
   #e;
   handle;
   constructor(t, e, i, s) {
-    this.#e = e, this.#t = { phase: "staged", store: t, value: i, detachFromOwner: s }, this.handle = new Z(this);
+    this.#e = e, this.#t = { phase: "staged", store: t, value: i, detachFromOwner: s }, this.handle = new gt(this);
   }
   publish() {
     const t = this.#t;
-    t.phase === "staged" && (t.store.insert(this.#e, this, t.value), t.phase = "published");
+    t.phase === "staged" && t.store.insert(this.#e, this, t.value);
+  }
+  commitPublication() {
+    const t = this.#t;
+    if (t.phase !== "staged")
+      throw new Error(`Contribution '${this.#e}' is not staged`);
+    t.phase = "published";
   }
   update(t) {
     const e = this.#t;
@@ -280,93 +500,115 @@ class tt {
     this.dispose();
   }
 }
-class et {
+class vt {
   #t;
   #e;
-  #i;
+  #i = /* @__PURE__ */ new Map();
   #s = /* @__PURE__ */ new Map();
-  #r = /* @__PURE__ */ new Map();
-  #n = /* @__PURE__ */ new Set();
-  #a = new C();
+  #n;
+  #a = new O();
+  #r = 0;
   #o = 0;
+  #c = !1;
   constructor(t, e, i) {
-    this.#t = t, this.#e = e, this.#i = i;
+    this.#t = t, this.#e = i, this.#n = new q(() => this.#a, e);
   }
   stage(t, e, i, s) {
-    nt(e);
-    const n = ot(t, e);
-    if (this.#s.has(n))
-      throw new TypeError(`Duplicate extension contribution '${n}'`);
-    const o = new tt(this, n, i, s);
-    return this.#s.set(n, o), o;
+    Et(e);
+    const n = Ct(t, e);
+    if (this.#i.has(n))
+      throw new TypeError(`Duplicate contribution '${n}'`);
+    const o = new wt(this, n, i, s);
+    return this.#i.set(n, o), o;
   }
   view(t) {
-    this.#o++;
+    this.#r++;
     const e = { binding: { store: this, own: t } };
     let i;
-    const s = new it(e, () => {
+    const s = new bt(e, () => {
       const n = i;
       i = void 0;
       try {
         n?.();
       } finally {
-        this.#o--, this.#h();
+        this.#r--, this.#l();
       }
     });
     try {
       i = t(s, "view");
     } catch (n) {
-      throw e.binding = void 0, this.#o--, this.#h(), n;
+      throw e.binding = void 0, this.#r--, this.#l(), n;
     }
-    return new X(e);
+    return new pt(e);
   }
   snapshot() {
-    return this.#a;
+    return this.#n.view.get();
   }
   subscribe(t, e) {
     if (typeof t != "function")
-      throw new TypeError("Extension subscriber must be a function");
-    let i;
-    const s = new st(this, t, () => {
-      const n = i;
-      i = void 0, n?.();
+      throw new TypeError("Contribution subscriber must be a function");
+    const i = this.#n.view.subscribe(t);
+    this.#o++;
+    let s;
+    const n = new mt(i, () => {
+      const o = s;
+      s = void 0;
+      try {
+        o?.();
+      } finally {
+        this.#o--, this.#l();
+      }
     });
-    return i = e(s, "subscription"), this.#n.add(t), s;
+    try {
+      s = e(n, "subscription");
+    } catch (o) {
+      throw n.dispose(), o;
+    }
+    return n;
   }
   insert(t, e, i) {
-    if (this.#s.get(t) !== e)
-      throw new Error(`Extension contribution '${t}' is not the current claim`);
-    if (this.#r.has(t))
-      throw new Error(`Extension contribution '${t}' is already published`);
-    this.#r.set(t, { contribution: e, value: i }), this.#t(this);
+    if (this.#f(t, e), this.#s.has(t))
+      throw new Error(`Contribution '${t}' is already published`);
+    e.commitPublication(), this.#s.set(t, { contribution: e, value: i }), this.#t(this);
   }
   update(t, e, i) {
-    const s = this.#r.get(t);
-    s?.contribution === e && (s.value = i, this.#t(this));
+    const s = this.#u(t, e);
+    s.value = i, this.#t(this);
   }
   removeContribution(t, e, i) {
-    this.#s.get(t) === e && this.#s.delete(t), i === "published" && this.#r.get(t)?.contribution === e && (this.#r.delete(t), this.#t(this)), this.#h();
+    this.#f(t, e), i === "published" && this.#u(t, e);
+    try {
+      this.#i.delete(t), i === "published" && (this.#s.delete(t), this.#t(this));
+    } finally {
+      this.#l();
+    }
   }
   publishSnapshot() {
-    const t = [...this.#r].map(([i, s]) => [i, s.value]);
-    if (!(t.length === this.#a.size && t.every(([i, s]) => Object.is(this.#a.get(i), s)))) {
-      this.#a = new C(t);
-      for (const i of [...this.#n])
-        try {
-          i();
-        } catch (s) {
-          this.#e(s);
-        }
-    }
+    const t = [...this.#s].map(([i, s]) => [i, s.value]);
+    t.length === this.#a.size && t.every(([i, s]) => Object.is(this.#a.get(i), s)) || (this.#a = new O(t), this.#n.invalidate());
   }
-  removeListener(t) {
-    this.#n.delete(t), this.#h();
+  #f(t, e) {
+    if (this.#i.get(t) !== e)
+      throw new Error(`Contribution '${t}' is not the current claim`);
   }
-  #h() {
-    this.#s.size || this.#r.size || this.#n.size || this.#o || this.#i(this);
+  #u(t, e) {
+    const i = this.#s.get(t);
+    if (i?.contribution !== e)
+      throw new Error(`Contribution '${t}' is not the published entry`);
+    return i;
+  }
+  #l() {
+    if (!(this.#c || this.#i.size || this.#s.size || this.#o || this.#r)) {
+      this.#c = !0;
+      try {
+        this.#n.dispose();
+      } finally {
+        this.#e(this);
+      }
+    }
   }
 }
-class it {
+class bt {
   #t;
   constructor(t, e) {
     this.#t = { state: t, release: e }, Object.freeze(this);
@@ -379,17 +621,17 @@ class it {
     this.dispose();
   }
 }
-class st {
+class mt {
   #t;
-  constructor(t, e, i) {
-    this.#t = { store: t, listener: e, release: i }, Object.freeze(this);
+  constructor(t, e) {
+    this.#t = { subscription: t, release: e }, Object.freeze(this);
   }
   dispose() {
     const t = this.#t;
     if (t) {
       this.#t = void 0;
       try {
-        t.store.removeListener(t.listener);
+        t.subscription.dispose();
       } finally {
         t.release();
       }
@@ -399,7 +641,7 @@ class st {
     this.dispose();
   }
 }
-class rt {
+class yt {
   #t = /* @__PURE__ */ new Map();
   #e = /* @__PURE__ */ new Set();
   #i;
@@ -410,8 +652,8 @@ class rt {
   get(t) {
     const e = this.#t.get(t.id);
     if (e) return e;
-    const i = new et(
-      (s) => this.#r(s),
+    const i = new vt(
+      (s) => this.#n(s),
       this.#i,
       (s) => {
         this.#t.get(t.id) === s && (this.#e.delete(s), this.#t.delete(t.id));
@@ -423,122 +665,112 @@ class rt {
     this.#s++;
   }
   endBatch() {
-    if (!this.#s) throw new TypeError("Extension batch is not active");
+    if (!this.#s) throw new Error("Contribution batch is not active");
     if (this.#s--, this.#s) return;
     const t = [...this.#e];
     this.#e.clear();
-    for (const e of t) e.publishSnapshot();
+    const e = [];
+    for (const i of t)
+      try {
+        i.publishSnapshot();
+      } catch (s) {
+        e.push(s);
+      }
+    if (e.length === 1) throw e[0];
+    if (e.length > 1)
+      throw new AggregateError(e, "Contribution batch publication failed");
   }
-  #r(t) {
+  #n(t) {
     this.#e.add(t), !this.#s && (this.#e.delete(t), t.publishSnapshot());
   }
 }
-function nt(r) {
+function Et(r) {
   if (typeof r != "string" || !r.trim())
     throw new TypeError("Contribution key must be a non-empty string");
   if (r !== r.trim())
     throw new TypeError("Contribution key cannot start or end with whitespace");
 }
-function ot(r, t) {
-  return `${x(r)}/${x(t)}`;
+function Ct(r, t) {
+  return `${D(r)}/${D(t)}`;
 }
-function x(r) {
+function D(r) {
   return r.replaceAll("%", "%25").replaceAll("/", "%2F");
 }
-const m = /* @__PURE__ */ new WeakMap();
-class U {
-  #t = /* @__PURE__ */ new Set();
-  #e;
-  #i;
-  #s = !1;
-  constructor(t, e) {
-    if (typeof t != "function") throw new TypeError("Snapshot reader must be a function");
-    if (typeof e != "function")
-      throw new TypeError("Snapshot error reporter must be a function");
-    this.#e = { phase: "active", read: t, report: e }, this.#i = t(), Object.freeze(this);
+class Ot {
+  #t;
+  constructor(t) {
+    this.#t = t, Object.freeze(this);
   }
-  view = Object.freeze({
-    get: () => this.#r(),
-    subscribe: (t) => this.#n(t)
-  });
-  invalidate() {
-    const { report: t } = this.#o();
-    this.#s = !0;
-    for (const e of [...this.#t])
-      try {
-        ht(e);
-      } catch (i) {
-        t(i);
-      }
+  dispose() {
+    const t = this.#t;
+    this.#t = void 0, t?.dispose();
+  }
+  [Symbol.dispose]() {
+    this.dispose();
+  }
+}
+class St {
+  #t;
+  #e;
+  handle;
+  constructor(t, e, i, s) {
+    this.#e = e, this.#t = { phase: "staged", hub: t, slot: { listener: i }, release: s }, this.handle = new Ot(this);
+  }
+  publish() {
+    const t = this.#t;
+    t.phase === "staged" && (t.hub.add(this.#e, t.slot), t.phase = "published");
   }
   dispose() {
-    const t = this.#e;
-    if (t.phase !== "disposed") {
-      this.#e = { phase: "disposed" };
+    const t = this.#t;
+    if (t.phase !== "removed") {
+      this.#t = { phase: "removed" };
       try {
-        this.#a(t.read);
+        t.phase === "published" && t.hub.delete(this.#e, t.slot);
       } finally {
-        this.#s = !1;
-        const e = [...this.#t];
-        this.#t.clear();
-        for (const i of e) ct(i);
+        t.release(this);
       }
     }
   }
   [Symbol.dispose]() {
     this.dispose();
   }
-  #r() {
-    const t = this.#e;
-    return t.phase === "active" && this.#a(t.read), this.#i;
-  }
-  #n(t) {
-    if (typeof t != "function") throw new TypeError("Subscriber must be a function");
-    this.#o();
-    const e = new at(t, (i) => {
-      this.#t.delete(i);
-    });
-    return this.#t.add(e), e;
-  }
-  #a(t) {
-    this.#s && (this.#i = t(), this.#s = !1);
-  }
-  #o() {
-    const t = this.#e;
-    if (t.phase === "disposed") throw new TypeError("Snapshot publisher is disposed");
-    return t;
-  }
 }
-class at {
-  constructor(t, e) {
-    m.set(this, { listener: t, detach: e }), Object.freeze(this);
+class It {
+  #t = /* @__PURE__ */ new Map();
+  stage(t, e, i) {
+    if (typeof e != "function") throw new TypeError("Event listener must be a function");
+    return new St(this, t, e, i);
   }
-  dispose() {
-    const t = m.get(this);
-    t && (m.delete(this), t.detach(this));
+  add(t, e) {
+    const i = this.#t.get(t) ?? /* @__PURE__ */ new Set();
+    this.#t.set(t, i), i.add(e);
   }
-  [Symbol.dispose]() {
-    this.dispose();
+  delete(t, e) {
+    const i = this.#t.get(t);
+    i && (i.delete(e), i.size || this.#t.delete(t));
+  }
+  async emit(t, e) {
+    const i = [...this.#t.get(t) ?? []].map(
+      (o) => o.listener
+    ), n = (await Promise.allSettled(
+      i.map((o) => Promise.resolve().then(() => o(e)))
+    )).filter((o) => o.status === "rejected").map((o) => o.reason);
+    if (n.length)
+      throw new AggregateError(n, `Event '${t}' listeners failed`);
   }
 }
-function ht(r) {
-  m.get(r)?.listener();
-}
-function ct(r) {
-  m.delete(r);
-}
-class dt {
+class At {
   #t;
   root;
   view;
   constructor(t, e) {
-    this.root = R(t), this.#t = new U(() => B(this.root), e), this.view = this.#t.view;
+    this.root = G(t), this.#t = new q(() => X(this.root), e), this.view = this.#t.view;
   }
   createNode(t) {
-    return R(t);
+    return G(t);
   }
   attach(t, e) {
-    if (t.children.has(e)) throw new TypeError("Lifetime diagnostic node is attached");
+    if (t.children.has(e)) throw new Error("Lifetime diagnostic node is attached");
     t.children.add(e), this.#t.invalidate();
   }
   detach(t, e) {
@@ -546,7 +778,7 @@ class dt {
   }
   change(t, e, i) {
     const s = t.counts[e] + i;
-    if (s < 0) throw new TypeError(`Lifetime '${e}' count cannot be negative`);
+    if (s < 0) throw new Error(`Lifetime '${e}' count cannot be negative`);
     t.counts[e] = s, this.#t.invalidate();
   }
   beginDisposing(t) {
@@ -556,7 +788,7 @@ class dt {
     this.root.phase !== "disposed" && (this.root.phase = "disposed", this.#t.invalidate(), this.#t.dispose());
   }
 }
-function R(r) {
+function G(r) {
   return {
     label: r,
     phase: "active",
@@ -565,14 +797,14 @@ function R(r) {
       tasks: 0,
       listeners: 0,
       contributions: 0,
-      extensionViews: 0,
+      contributionViews: 0,
       subscriptions: 0
     },
     children: /* @__PURE__ */ new Set()
   };
 }
-function B(r) {
-  const t = Object.freeze([...r.children].map(B));
+function X(r) {
+  const t = Object.freeze([...r.children].map(X));
   return Object.freeze({
     label: r.label,
     phase: r.phase,
@@ -580,7 +812,14 @@ function B(r) {
     children: t
   });
 }
-const A = Object.freeze(new DOMException("Resource disposed", "AbortError"));
+function $t(r) {
+  if (!r || typeof r != "object") return !1;
+  const t = r;
+  return [t.debug, t.info, t.warn, t.error].every(
+    (e) => typeof e == "function"
+  );
+}
+const L = Object.freeze(new DOMException("Resource disposed", "AbortError"));
 class g {
   #t = /* @__PURE__ */ new Set();
   #e;
@@ -588,7 +827,7 @@ class g {
     this.#e = t;
   }
   add(t) {
-    if (this.#t.has(t)) throw new TypeError("Lifetime already owns this resource");
+    if (this.#t.has(t)) throw new Error("Lifetime already owns this resource");
     this.#t.add(t);
     const e = this.#e;
     e && e.diagnostics.change(e.node, e.kind, 1);
@@ -619,7 +858,7 @@ class g {
     return this.#t[Symbol.iterator]();
   }
 }
-class lt {
+class Tt {
   #t;
   constructor(t, e) {
     this.#t = { phase: "active", cleanup: t, detachFromParent: e }, Object.freeze(this);
@@ -643,7 +882,7 @@ class lt {
     return this.dispose();
   }
 }
-class ut {
+class jt {
   #t;
   #e;
   #i;
@@ -656,7 +895,7 @@ class ut {
       () => this.#s(),
       (a) => {
         try {
-          n.signal.aborted || i(a);
+          Y(n.signal, a) || i(a);
         } finally {
           this.#s();
         }
@@ -674,78 +913,78 @@ class ut {
       () => {
       }
     );
-    return this.#i = { phase: "disposing", completion: e }, t.controller.abort(A), this.#r(), e;
+    return this.#i = { phase: "disposing", completion: e }, t.controller.abort(L), this.#n(), e;
   }
   [Symbol.asyncDispose]() {
     return this.dispose();
   }
   #s() {
     if (this.#i.phase === "settled") return;
-    this.#i = { phase: "settled" }, this.#r();
+    this.#i = { phase: "settled" }, this.#n();
     const t = this.#e;
     this.#e = void 0, t?.(this);
   }
-  #r() {
+  #n() {
     const t = this.#t;
     this.#t = void 0, t?.();
   }
 }
-class L {
+class V {
   #t;
   #e;
   #i;
   #s;
-  #r;
   #n;
   #a;
+  #r;
   #o;
-  #h;
   #c;
-  #p;
-  #g;
-  handle;
+  #f;
+  #u;
   #l;
+  handle;
+  #d;
   constructor(t, e, i = {}) {
-    this.#e = e, this.handle = new pt(this);
+    this.#e = e, this.handle = new kt(this);
     const s = new AbortController();
-    this.#l = {
+    this.#d = {
       phase: "active",
       controller: s,
       declarations: i.declarations ?? "staged"
     };
     const n = i.parent;
-    this.#g = n?.detach, this.#c = n ? "child" : "root";
-    const o = n?.diagnostics ?? new dt(e, (l) => t.report(l)), a = n?.diagnosticNode ?? o.root;
-    this.#t = { host: t, diagnostics: o, diagnosticNode: a };
-    const h = (l) => ({
+    this.#l = n?.detach, this.#f = n ? "child" : "root";
+    const o = n?.diagnostics ?? new At(e, (l) => t.report(l)), a = n?.diagnosticNode ?? o.root;
+    this.#t = { port: t, diagnostics: o, diagnosticNode: a };
+    const c = (l) => ({
       diagnostics: o,
       node: a,
       kind: l
     });
-    this.#i = new g(h("listeners")), this.#s = new g(h("contributions")), this.#r = new g(h("extensionViews")), this.#n = new g(h("subscriptions")), this.#a = new g(h("tasks")), this.#o = new g(), this.#h = new g(h("cleanups"));
-    const c = i.parentSignal;
-    if (!c) return;
-    const d = () => s.abort(c.reason);
-    c.addEventListener("abort", d, { once: !0 }), this.#p = () => c.removeEventListener("abort", d), c.aborted && d();
+    this.#i = new g(c("listeners")), this.#s = new g(c("contributions")), this.#n = new g(c("contributionViews")), this.#a = new g(c("subscriptions")), this.#r = new g(c("tasks")), this.#o = new g(), this.#c = new g(c("cleanups"));
+    const h = i.parentSignal;
+    if (!h) return;
+    const d = () => s.abort(h.reason);
+    h.addEventListener("abort", d, { once: !0 }), this.#u = () => h.removeEventListener("abort", d), h.aborted && d();
   }
   get signal() {
-    const t = this.#l;
+    const t = this.#d;
     return t.phase === "disposed" ? t.signal : t.controller.signal;
   }
   get diagnostics() {
-    return this.#d().diagnostics.view;
+    return this.#h().diagnostics.view;
   }
   cleanup(t) {
-    if (this.#d(), typeof t != "function") throw new TypeError("Cleanup must be a function");
-    const e = new lt(t, this.#h.release);
-    return this.#h.add(e), e;
+    if (this.#h(), typeof t != "function") throw new TypeError("Cleanup must be a function");
+    const e = new Tt(t, this.#c.release);
+    return this.#c.add(e), e;
   }
   lifetime(t) {
-    const { host: e, diagnostics: i, diagnosticNode: s } = this.#d();
-    ft(t);
-    const n = i.createNode(t), o = new L(e, this.#e, {
+    const { port: e, diagnostics: i, diagnosticNode: s } = this.#h();
+    Pt(t);
+    const n = i.createNode(t), o = new V(e, this.#e, {
       parentSignal: this.signal,
-      declarations: this.#w(),
+      declarations: this.#g(),
       parent: {
         diagnostics: i,
         diagnosticNode: n,
@@ -757,94 +996,94 @@ class L {
     return this.#o.add(o), i.attach(s, n), o.handle;
   }
   spawn(t) {
-    const { host: e } = this.#d();
+    const { port: e } = this.#h();
     if (typeof t != "function") throw new TypeError("Background task must be a function");
-    const i = new ut(
+    const i = new jt(
       this.signal,
       t,
       (s) => e.report(s),
-      this.#a.release
+      this.#r.release
     );
-    return this.#a.add(i), i;
+    return this.#r.add(i), i;
   }
   on(t, e) {
-    const { host: i } = this.#d(), s = i.stageOn(this.#e, t, e, this.#i.release);
-    return this.#i.add(s), this.#w() === "published" && s.publish(), s.handle;
+    const { port: i } = this.#h(), s = i.stageOn(this.#e, t, e, this.#i.release);
+    return this.#i.add(s), this.#g() === "published" && s.publish(), s.handle;
   }
   emit(t, e) {
-    return this.#d().host.emit(this.#e, t, e);
+    return this.#h().port.emit(this.#e, t, e);
   }
   contribute(t, e, i) {
-    const { host: s } = this.#d(), n = s.stageContribution(
+    const { port: s } = this.#h(), n = s.stageContribution(
       this.#e,
       t,
       e,
       i,
       this.#s.release
     );
-    return this.#s.add(n), this.#w() === "published" && n.publish(), n.handle;
+    return this.#s.add(n), this.#g() === "published" && n.publish(), n.handle;
   }
   /** Owns an internal live capability without exposing a second Context API. */
   ownLease(t, e) {
-    return this.#d(), (e === "view" ? this.#r : this.#n).own(t);
+    return this.#h(), (e === "view" ? this.#n : this.#a).own(t);
   }
   /** Releases a temporary startup cancellation edge after its layer commits. */
   detachStartupSignal() {
-    const t = this.#p;
-    this.#p = void 0, t?.();
+    const t = this.#u;
+    this.#u = void 0, t?.();
   }
   /** Atomically makes all declarations staged during setup visible. */
   publish() {
-    const t = this.#l;
+    const t = this.#d;
     if (t.phase !== "active") throw b();
-    if (this.#d(), t.declarations !== "published") {
+    if (this.#h(), t.declarations !== "published") {
       for (const e of this.#i) e.publish();
       for (const e of this.#s) e.publish();
       for (const e of this.#o) e.publish();
-      this.#l = { ...t, declarations: "published" };
+      this.#d = { ...t, declarations: "published" };
     }
   }
   dispose() {
-    const t = this.#l;
+    const t = this.#d;
     if (t.phase === "disposing") return t.completion;
     if (t.phase === "disposed") return Promise.resolve();
-    const e = this.#b(), i = Promise.resolve().then(async () => {
+    const e = this.#p(), i = Promise.resolve().then(async () => {
       const s = [];
-      if (await this.#i.dispose(s), await this.#s.dispose(s), await this.#n.dispose(s), await this.#r.dispose(s), t.controller.abort(A), this.detachStartupSignal(), await this.#a.dispose(s), await this.#o.dispose(s), await this.#h.dispose(s), s.length === 1) throw s[0];
+      if (await this.#i.dispose(s), await this.#s.dispose(s), await this.#a.dispose(s), await this.#n.dispose(s), t.controller.abort(L), this.detachStartupSignal(), await this.#r.dispose(s), await this.#o.dispose(s), await this.#c.dispose(s), s.length === 1) throw s[0];
       if (s.length > 1) throw new AggregateError(s, "Lifetime cleanup failed");
     }).finally(() => {
-      this.#l = { phase: "disposed", signal: AbortSignal.abort(A) };
-      const s = this.#g;
-      this.#g = void 0;
+      this.#d = { phase: "disposed", signal: AbortSignal.abort(L) };
+      const s = this.#l;
+      this.#l = void 0;
       try {
-        s?.(this), this.#c === "root" && e.diagnostics.finishRoot();
+        s?.(this), this.#f === "root" && e.diagnostics.finishRoot();
       } finally {
         this.#t = void 0;
       }
     });
-    return this.#l = { phase: "disposing", controller: t.controller, completion: i }, e.diagnostics.beginDisposing(e.diagnosticNode), i;
+    return this.#d = { phase: "disposing", controller: t.controller, completion: i }, e.diagnostics.beginDisposing(e.diagnosticNode), i;
   }
   [Symbol.asyncDispose]() {
     return this.dispose();
   }
-  #d() {
+  #h() {
     const t = this.#t;
-    if (this.#l.phase !== "active" || this.signal.aborted || !t)
+    if (this.#d.phase !== "active" || this.signal.aborted || !t)
       throw b();
     return t;
   }
-  #b() {
+  #p() {
     const t = this.#t;
     if (!t) throw b();
     return t;
   }
-  #w() {
-    const t = this.#l;
+  #g() {
+    const t = this.#d;
     if (t.phase !== "active") throw b();
     return t.declarations;
   }
 }
-class pt {
+class kt {
   #t;
   constructor(t) {
     this.#t = t, Object.freeze(this);
@@ -877,7 +1116,7 @@ class pt {
     return this.dispose();
   }
 }
-function ft(r) {
+function Pt(r) {
   if (typeof r != "string" || !r.trim())
     throw new TypeError("Lifetime label must be a non-empty string");
   if (r !== r.trim())
@@ -886,632 +1125,409 @@ function ft(r) {
 function b() {
   return new TypeError("Lifetime is disposing or has been disposed");
 }
-class z {
-  constructor(t, e, i, s, n, o) {
-    this.order = t, this.layers = e, this.providers = i, this.dependents = s, this.contractKinds = n, this.#t = o;
-  }
-  order;
-  layers;
-  providers;
-  dependents;
-  contractKinds;
+class z extends AggregateError {
+}
+class Lt {
   #t;
-  static build(t, e) {
-    const i = [...t].sort((c, d) => c.index - d.index), s = new Map(e), n = gt(i, s), o = wt(i, n, s), { order: a, layers: h } = mt(
-      i,
-      o.dependents,
-      o.indegree
-    );
-    return new z(
-      Object.freeze(a),
-      Object.freeze(h.map((c) => Object.freeze(c))),
-      n,
-      o.dependents,
-      s,
-      o.resolvedProviders
-    );
+  #e;
+  #i;
+  #s;
+  #n = /* @__PURE__ */ new Map();
+  #a = new It();
+  #r;
+  #o = [];
+  constructor(t) {
+    this.#t = t.hostName, this.#e = t.logger, this.#i = t.isInstalled, this.#s = t.report, this.#r = new yt(t.report);
   }
-  providerFor(t, e) {
-    return this.#t.get(t)?.get(e);
+  readService(t, e) {
+    const i = this.#n.get(t);
+    return i?.has(e) ? { found: !0, value: i.get(e) } : { found: !1 };
   }
-  provider(t) {
-    return this.providers.get(t);
+  captureConfigs(t) {
+    const e = /* @__PURE__ */ new Map();
+    for (const i of t) {
+      const s = i.instance;
+      s && e.set(i, s.config);
+    }
+    return e;
   }
-  affectedByTransitionTo(t, e) {
-    const i = /* @__PURE__ */ new Set();
-    return this.#e(e, i), t.#e(e, i), i;
+  resetActivationState() {
+    this.#n.clear(), this.#o = [];
   }
-  #e(t, e) {
-    const i = [...t], s = /* @__PURE__ */ new Set();
-    for (let n = 0; n < i.length; n++) {
-      const o = i[n];
-      if (o && !s.has(o)) {
-        s.add(o), e.add(o);
-        for (const a of this.dependents.get(o) ?? []) i.push(a);
+  commitActivationOrder(t) {
+    this.#o = t.slice();
+  }
+  deactivateAll() {
+    return this.deactivate(new Set(this.#o));
+  }
+  async activate(t, e, i, s) {
+    const n = this.#h(s);
+    for (const o of t.layers) {
+      const a = o.filter(
+        (f) => e.has(f) && !f.instance
+      );
+      if (!a.length) continue;
+      const c = new AbortController(), h = await Promise.allSettled(
+        a.map(async (f) => {
+          try {
+            const p = i.has(f) ? i.get(f) : await Q(
+              f.declaration.plugin.config,
+              f.declaration.config,
+              f.id
+            );
+            return await this.#c(
+              t,
+              f,
+              p,
+              c.signal,
+              n
+            );
+          } catch (p) {
+            throw c.abort(p), p;
+          }
+        })
+      ), d = zt(h, c.signal), l = h.filter(
+        (f) => f.status === "fulfilled"
+      ).map((f) => f.value);
+      if (d.length) {
+        const f = await this.#u(l), p = d.length === 1 ? d[0] : new AggregateError(d, "Installation startup layer failed");
+        throw f.length ? new z(
+          [p, ...f],
+          "Installation startup layer failed and could not be cleanly disposed"
+        ) : p;
       }
+      this.#f(l);
     }
   }
-}
-function gt(r, t) {
-  const e = /* @__PURE__ */ new Map();
-  for (const i of r)
-    for (const s of Object.values(i.spec.plugin.provides ?? {})) {
-      S(t, s);
-      const n = e.get(s.id);
-      if (n)
-        throw new p(
-          "SERVICE_CONFLICT",
-          `Service '${s.id}' is provided by both '${n.id}' and '${i.id}'`
-        );
-      e.set(s.id, i);
-    }
-  return e;
-}
-function wt(r, t, e) {
-  const i = /* @__PURE__ */ new Map(), s = /* @__PURE__ */ new Map(), n = new Map(r.map((o) => [o, 0]));
-  for (const o of r)
-    for (const a of Object.values(o.spec.plugin.requires ?? {})) {
-      const h = a.kind === "optional" ? a.service : a;
-      if (S(e, h), h.kind === "extension") continue;
-      const c = t.get(h.id);
-      if (!c) {
-        if (a.kind === "optional") continue;
-        throw new p(
-          "SERVICE_MISSING",
-          `Plugin '${o.id}' requires missing service '${h.id}'`
-        );
+  async deactivate(t) {
+    const e = [], i = this.#o.filter((s) => t.has(s)).reverse();
+    this.#o = this.#o.filter(
+      (s) => !t.has(s)
+    );
+    for (const s of i) {
+      const n = s.instance;
+      if (n) {
+        s.beginStopping(), this.#n.delete(s);
+        try {
+          await n.lifetime.dispose();
+        } catch (o) {
+          e.push(o);
+        } finally {
+          s.deactivate();
+        }
       }
-      if (c === o)
-        throw new p(
-          "SERVICE_CYCLE",
-          `Plugin '${o.id}' cannot require service '${h.id}' that it provides`
-        );
-      const d = i.get(o) ?? /* @__PURE__ */ new Map();
-      d.set(h.id, c), i.set(o, d);
-      const l = s.get(c) ?? /* @__PURE__ */ new Set();
-      l.has(o) || (l.add(o), s.set(c, l), n.set(o, (n.get(o) ?? 0) + 1));
     }
-  return { resolvedProviders: i, dependents: s, indegree: n };
-}
-function mt(r, t, e) {
-  let i = r.filter((o) => e.get(o) === 0);
-  const s = [], n = [];
-  for (; i.length; ) {
-    i.sort((a, h) => a.index - h.index);
-    const o = i;
-    i = [], n.push(o), s.push(...o);
-    for (const a of o)
-      for (const h of t.get(a) ?? []) {
-        const c = (e.get(h) ?? 0) - 1;
-        e.set(h, c), c || i.push(h);
-      }
+    return e;
   }
-  if (s.length !== r.length) {
-    const o = vt(r, t);
-    throw new p(
-      "SERVICE_CYCLE",
-      `Plugin dependency cycle: ${o.map((a) => a.id).join(" -> ")}`
-    );
+  async withContributionBatch(t) {
+    this.#r.beginBatch();
+    let e;
+    try {
+      e = { ok: !0, value: await t() };
+    } catch (s) {
+      e = { ok: !1, error: s };
+    }
+    let i;
+    try {
+      this.#r.endBatch(), i = { ok: !0 };
+    } catch (s) {
+      i = { ok: !1, error: s };
+    }
+    if (!e.ok && !i.ok)
+      throw new AggregateError(
+        [e.error, i.error],
+        "Host operation and contribution publication failed"
+      );
+    if (!e.ok) throw e.error;
+    if (!i.ok) throw i.error;
+    return e.value;
   }
-  return { order: s, layers: n };
-}
-function vt(r, t) {
-  const e = /* @__PURE__ */ new Set(), i = /* @__PURE__ */ new Set(), s = [], n = (o) => {
-    i.add(o), s.push(o);
-    for (const a of t.get(o) ?? []) {
-      if (i.has(a)) {
-        const c = s.indexOf(a);
-        return [...s.slice(c), a];
+  async #c(t, e, i, s, n) {
+    e.deactivate();
+    const o = e.declaration.plugin, a = new V(n, e.id, { parentSignal: s });
+    try {
+      const c = this.#l(t, e, o, a), h = {
+        hostName: this.#t,
+        pluginName: o.name,
+        installationId: e.id,
+        groupId: e.groupId
+      }, d = this.#d(a, h, c), l = await o.setup(d, i), f = /* @__PURE__ */ new Map();
+      for (const [p, Z] of Object.entries(o.provides ?? {})) {
+        if (typeof l != "object" || l === null || !Object.hasOwn(l, p))
+          throw new u(
+            "SERVICE_NOT_RETURNED",
+            `Installation '${e.id}' did not return provided Service '${p}'`
+          );
+        f.set(Z.id, l[p]);
       }
-      if (e.has(a)) continue;
-      const h = n(a);
-      if (h) return h;
+      return Object.freeze({
+        installation: e,
+        instance: Object.freeze({ plugin: o, config: i, lifetime: a }),
+        services: f
+      });
+    } catch (c) {
+      const h = e.fail(c);
+      try {
+        await a.dispose();
+      } catch (d) {
+        throw new z(
+          [h, d],
+          `Installation '${e.id}' failed to start and could not be cleanly disposed`
+        );
+      }
+      throw h;
     }
-    s.pop(), i.delete(o), e.add(o);
-  };
-  for (const o of r) {
-    if (e.has(o)) continue;
-    const a = n(o);
-    if (a) return a;
-  }
-  throw new TypeError("Dependency graph is cyclic but no cycle path was found");
-}
-function N(r, t) {
-  return Object.freeze({ plugin: r, config: t });
-}
-class bt {
-  constructor(t, e, i, s) {
-    this.id = t, this.index = e, this.groupId = i.id, this.#i = { spec: s, group: i, notifyChanged: void 0 };
   }
-  id;
-  index;
-  #t = { phase: "pending" };
-  #e;
-  #i;
-  groupId;
-  #s = /* @__PURE__ */ new Set();
-  attach(t) {
-    const e = this.#h();
-    if (e.notifyChanged) throw new TypeError(`Plugin '${this.id}' is already attached`);
-    e.notifyChanged = t;
+  #f(t) {
+    for (const { installation: e, instance: i, services: s } of t)
+      this.#n.set(e, s), e.activate(i), this.#o.push(e);
+    for (const { instance: e } of t)
+      e.lifetime.publish(), e.lifetime.detachStartupSignal();
   }
-  get status() {
-    return this.#t.phase;
-  }
-  get runtime() {
-    const t = this.#t;
-    return t.phase === "active" || t.phase === "stopping" ? t.runtime : void 0;
-  }
-  get error() {
-    const t = this.#t;
-    if (t.phase === "failed")
-      return t.failure.retention === "live" ? t.failure.error : Et(t.failure.summary);
-    if (t.phase === "removed")
-      return new p("PLUGIN_REMOVED", `Plugin '${this.id}' has been removed`);
-  }
-  get group() {
-    return this.#h().group;
-  }
-  get spec() {
-    return this.#h().spec;
-  }
-  reconfigure(t) {
-    this.#h().spec = t;
+  async #u(t) {
+    const e = [];
+    for (const i of [...t].reverse())
+      try {
+        await i.instance.lifetime.dispose();
+      } catch (s) {
+        e.push(s);
+      }
+    return e;
   }
-  ready() {
-    const t = this.#e;
-    return t ? t.barrier.then(() => this.#r()) : this.#r();
+  #l(t, e, i, s) {
+    const n = /* @__PURE__ */ Object.create(null);
+    for (const [o, a] of Object.entries(i.requires ?? {}))
+      if (a.kind === "optional") {
+        const c = t.providerFor(e, a.service.id);
+        if (!c) {
+          n[o] = void 0;
+          continue;
+        }
+        const h = this.#n.get(c);
+        if (!h?.has(a.service.id))
+          throw new u(
+            "SERVICE_UNAVAILABLE",
+            `Optional Service '${a.service.id}' is not active for Installation '${e.id}'`
+          );
+        n[o] = h.get(a.service.id);
+      } else if (a.kind === "service") {
+        const c = t.providerFor(e, a.id), h = c ? this.#n.get(c) : void 0;
+        if (!c || !h?.has(a.id))
+          throw new u(
+            "SERVICE_UNAVAILABLE",
+            `Service '${a.id}' is not active for Installation '${e.id}'`
+          );
+        n[o] = h.get(a.id);
+      } else
+        n[o] = this.#b(a, s);
+    return n;
   }
-  trackReadiness(t) {
-    const e = {}, i = t.then(
-      () => {
-        this.#e?.attempt === e && (this.#e = void 0);
+  #d(t, e, i) {
+    return Object.freeze({
+      ...i,
+      get signal() {
+        return t.signal;
       },
-      (s) => {
-        if (this.#e?.attempt === e && (this.#e = void 0), this.#t.phase !== "active") throw s;
-      }
-    );
-    this.#e = { attempt: e, barrier: i }, i.catch(() => {
-    });
-  }
-  #r() {
-    const t = this.#t;
-    if ((t.phase === "active" || t.phase === "failed" || t.phase === "removed") && t.readiness === "settled") {
-      if (t.phase === "active") return Promise.resolve();
-      if (t.phase === "failed" || t.phase === "removed")
-        return Promise.reject(
-          this.error ?? new p("PLUGIN_UNAVAILABLE", `Plugin '${this.id}' is ${t.phase}`)
-        );
-    }
-    return new Promise((e, i) => {
-      this.#s.add({ resolve: e, reject: i });
+      meta: Object.freeze(e),
+      log: this.#e,
+      cleanup: t.cleanup.bind(t),
+      lifetime: t.lifetime.bind(t),
+      spawn: t.spawn.bind(t),
+      on: t.on.bind(t),
+      emit: t.emit.bind(t),
+      contribute: t.contribute.bind(t)
     });
   }
-  activate(t) {
-    this.#a({ phase: "active", runtime: t, readiness: "unsettled" });
-  }
-  settleReady() {
-    const t = this.#t;
-    if (!(t.phase !== "active" && t.phase !== "failed" && t.phase !== "removed") && t.readiness !== "settled") {
-      if (this.#t = { ...t, readiness: "settled" }, t.phase === "active")
-        for (const e of this.#s) e.resolve();
-      else {
-        const e = this.error ?? new p("PLUGIN_UNAVAILABLE", `Plugin '${this.id}' is ${t.phase}`);
-        for (const i of this.#s) i.reject(e);
-      }
-      this.#s.clear();
-    }
-  }
-  beginStopping() {
-    const t = this.#t;
-    return t.phase !== "active" ? !1 : (this.#a({ phase: "stopping", runtime: t.runtime }), !0);
-  }
-  deactivate() {
-    this.#a({ phase: "pending" });
-  }
-  fail(t) {
-    this.#n(t);
-  }
-  discard(t) {
-    const e = this.#o(t);
-    this.#a({
-      phase: "failed",
-      failure: { retention: "summary", summary: yt(e) },
-      readiness: "settled"
-    });
-    for (const i of this.#s) i.reject(e);
-    this.#s.clear(), this.#e = void 0, this.#i = void 0;
+  #h(t) {
+    return {
+      stageOn: (e, i, s, n) => this.#p(e, i, s, n, t),
+      emit: (e, i, s) => this.#g(e, i, s, t),
+      stageContribution: (e, i, s, n, o) => this.#v(e, i, s, n, o, t),
+      report: this.#s
+    };
   }
-  #n(t) {
-    const e = this.#o(t);
-    return this.#a({
-      phase: "failed",
-      failure: { retention: "live", error: e },
-      readiness: "unsettled"
-    }), e;
+  #p(t, e, i, s, n) {
+    return this.#w(t), y(e, "event"), n.remember(e), this.#a.stage(e.id, i, s);
   }
-  remove() {
-    this.#a({ phase: "removed", readiness: "unsettled" }), this.#e = void 0, this.#i = void 0;
+  #g(t, e, i, s) {
+    return this.#w(t), y(e, "event"), s.remember(e), this.#a.emit(e.id, i);
   }
-  #a(t) {
-    this.#t = t, this.#i?.notifyChanged?.();
+  #v(t, e, i, s, n, o) {
+    return this.#w(t), y(e, "extensionPoint"), o.remember(e), this.#r.get(e).stage(t, i, s, n);
   }
-  #o(t) {
-    return $(
-      t,
-      "PLUGIN_UNAVAILABLE",
-      `Plugin '${this.id}' failed with a non-Error value`
-    );
+  #b(t, e) {
+    return this.#r.get(t).view((i, s) => e.ownLease(i, s));
   }
-  #h() {
-    const t = this.#i;
-    if (!t) throw new TypeError(`Plugin '${this.id}' is no longer installed`);
-    return t;
+  #w(t) {
+    if (!this.#i(t))
+      throw new Error(`Installation '${t}' is not installed`);
   }
 }
-function yt(r) {
-  return r instanceof p ? { name: r.name, message: r.message, code: r.code } : { name: r.name, message: r.message };
-}
-function Et(r) {
-  const t = r.code === void 0 ? new Error(r.message) : new p(r.code, r.message);
-  return t.name = r.name, t;
-}
-class O extends AggregateError {
+function zt(r, t) {
+  const e = [];
+  let i = !1;
+  for (const s of r)
+    s.status !== "fulfilled" && (Object.is(s.reason, t.reason) ? (i || e.push(s.reason), i = !0) : Y(t, s.reason) || e.push(s.reason));
+  return e;
 }
-class Ct {
-  #t;
+class Rt {
+  #t = new nt();
   #e;
   #i;
-  #s;
-  #r = /* @__PURE__ */ new Map();
-  #n = new K();
-  #a = new J();
-  #o;
-  #h;
-  #c = [];
   constructor(t) {
-    this.#t = t.applicationName, this.#e = t.logger, this.#i = t.isInstalled, this.#s = t.report, this.#o = new rt(t.report);
+    this.#e = new Lt(t);
   }
   get hasCommittedPlan() {
-    return this.#h !== void 0;
+    return this.#i !== void 0;
   }
   get(t, e) {
-    if (v(t, "service"), this.#n.assertCompatible(t), e === "unavailable")
-      throw M();
-    const i = this.#I().provider(t.id), s = i ? this.#r.get(i) : void 0;
-    if (!i || !s?.has(t.id))
-      throw new p("SERVICE_UNAVAILABLE", `Service '${t.id}' is not active`);
-    return s.get(t.id);
+    if (y(t, "service"), this.#t.assertCompatible(t), e === "unavailable") throw B();
+    const i = this.#o().provider(t.id);
+    if (!i)
+      throw new u("SERVICE_UNAVAILABLE", `Service '${t.id}' is not active`);
+    const s = this.#e.readService(i, t.id);
+    if (!s.found)
+      throw new u("SERVICE_UNAVAILABLE", `Service '${t.id}' is not active`);
+    return s.value;
   }
   buildPlan(t) {
-    return z.build(t, this.#n.kinds);
+    return x.build(t, this.#t.kinds);
   }
   async start(t) {
-    const e = this.#n.draft(t.contractKinds);
+    const e = this.#t.draft(t.contractKinds);
     try {
-      await this.#j(() => this.#p(t, e)), this.#h = t;
+      await this.#e.withContributionBatch(() => this.#s(t, e)), this.#i = t;
     } catch (i) {
-      throw e.discard(), this.#h = void 0, i;
+      throw e.discard(), this.#i = void 0, i;
     }
   }
   async stop() {
-    const t = await this.#j(
-      () => this.#f(new Set(this.#c))
-    );
-    return this.#h = void 0, t;
+    const t = await this.#e.withContributionBatch(() => this.#e.deactivateAll());
+    return this.#i = void 0, t;
   }
   async transition(t, e, i) {
-    return this.#j(async () => {
-      const s = this.#I(), n = s.affectedByTransitionTo(t, e);
+    return this.#e.withContributionBatch(async () => {
+      const s = this.#o(), n = s.affectedByTransitionTo(t, e);
       let o, a;
       try {
-        o = await this.#v(
+        o = await this.#r(
           t.order.filter((d) => n.has(d))
-        ), a = this.#n.draft(t.contractKinds);
+        ), a = this.#t.draft(t.contractKinds);
       } catch (d) {
         throw i(), d;
       }
-      const h = /* @__PURE__ */ new Map();
-      for (const d of n) {
-        const l = d.runtime;
-        l && h.set(d, l.config);
-      }
-      const c = await this.#f(n);
-      if (c.length)
-        return a.discard(), this.#g(
+      const c = this.#e.captureConfigs(n), h = await this.#e.deactivate(n);
+      if (h.length)
+        return a.discard(), this.#n(
           i,
-          c,
-          "Plugin change could not cleanly stop the affected runtime"
+          h,
+          "Installation change could not cleanly stop the affected Instances"
         );
       try {
-        return await this.#d(t, n, o, a), a.commit(), this.#c = t.order.slice(), this.#h = t, Object.freeze({ kind: "committed", affected: n });
+        return await this.#e.activate(t, n, o, a), a.commit(), this.#e.commitActivationOrder(t.order), this.#i = t, Object.freeze({ kind: "committed", affected: n });
       } catch (d) {
-        const l = await this.#f(n);
-        return a.discard(), d instanceof O || l.length ? this.#g(
+        const l = await this.#e.deactivate(n);
+        return a.discard(), d instanceof z || l.length ? this.#n(
           i,
           [d, ...l],
-          "Plugin change failed and its partial runtime could not be cleanly disposed"
-        ) : this.#l(i, s, n, h, [
+          "Installation change failed and its partial activation could not be cleanly disposed"
+        ) : this.#a(i, s, n, c, [
           d,
           ...l
         ]);
       }
     });
   }
-  async #p(t, e) {
-    const i = new Set(t.order), s = await this.#v(t.order);
-    this.#r.clear(), this.#c = [];
+  async #s(t, e) {
+    const i = new Set(t.order), s = await this.#r(t.order);
+    this.#e.resetActivationState();
     try {
-      await this.#d(t, i, s, e), e.commit(), this.#c = t.order.slice();
+      await this.#e.activate(t, i, s, e), e.commit(), this.#e.commitActivationOrder(t.order);
     } catch (n) {
-      const o = await this.#f(i);
-      throw o.length ? new AggregateError([n, ...o], "Application startup failed") : n;
+      const o = await this.#e.deactivate(i);
+      throw o.length ? new AggregateError([n, ...o], "Host startup failed") : n;
     }
   }
-  async #g(t, e, i) {
+  async #n(t, e, i) {
     t();
-    const s = await this.#f(new Set(this.#c));
-    throw this.#h = void 0, new AggregateError([...e, ...s], i);
+    const s = await this.#e.deactivateAll();
+    throw this.#i = void 0, new AggregateError([...e, ...s], i);
   }
-  async #l(t, e, i, s, n) {
+  async #a(t, e, i, s, n) {
     t();
-    const o = this.#n.draft(e.contractKinds);
+    const o = this.#t.draft(e.contractKinds);
     try {
-      await this.#d(e, i, s, o), o.commit(), this.#c = e.order.slice(), this.#h = e;
-    } catch (h) {
-      const c = await this.#f(new Set(this.#c));
-      throw o.discard(), this.#h = void 0, new AggregateError(
-        [...n, h, ...c],
-        "Plugin change failed and the previous application could not be restored"
+      await this.#e.activate(e, i, s, o), o.commit(), this.#e.commitActivationOrder(e.order), this.#i = e;
+    } catch (c) {
+      const h = await this.#e.deactivateAll();
+      throw o.discard(), this.#i = void 0, new AggregateError(
+        [...n, c, ...h],
+        "Installation change failed and the previous Instances could not be restored"
       );
     }
-    const a = n.length === 1 ? n[0] : new AggregateError(n, "Plugin change failed");
+    const a = n.length === 1 ? n[0] : new AggregateError(n, "Installation change failed");
     return Object.freeze({ kind: "rolled-back", affected: i, error: a });
   }
-  async #d(t, e, i, s) {
-    const n = this.#E(s);
-    for (const o of t.layers) {
-      const a = o.filter(
-        (u) => e.has(u) && !u.runtime
-      );
-      if (!a.length) continue;
-      const h = new AbortController(), c = await Promise.allSettled(
-        a.map(async (u) => {
-          try {
-            const f = i.has(u) ? i.get(u) : await this.#y(
-              u.spec.plugin.config,
-              u.spec.config
-            );
-            return await this.#b(
-              t,
-              u,
-              f,
-              h.signal,
-              n
-            );
-          } catch (f) {
-            throw h.abort(f), f;
-          }
-        })
-      ), d = c.filter((u) => u.status === "rejected").map((u) => u.reason), l = c.filter(
-        (u) => u.status === "fulfilled"
-      ).map((u) => u.value);
-      if (d.length) {
-        const u = await this.#O(l), f = d.length === 1 ? d[0] : new AggregateError(d, "Plugin startup layer failed");
-        throw u.length ? new O(
-          [f, ...u],
-          "Plugin startup layer failed and could not be cleanly disposed"
-        ) : f;
-      }
-      for (const u of l) this.#w(u);
-    }
-  }
-  async #b(t, e, i, s, n) {
-    e.deactivate();
-    const o = e.spec.plugin, a = new L(n, e.id, { parentSignal: s });
-    try {
-      const h = this.#C(t, e, o, a), c = {
-        applicationName: this.#t,
-        pluginName: o.name,
-        installationId: e.id,
-        groupId: e.groupId
-      }, d = this.#T(a, c, h), l = await o.setup(d, i), u = /* @__PURE__ */ new Map();
-      for (const [f, _] of Object.entries(o.provides ?? {})) {
-        if (typeof l != "object" || l === null || !Object.hasOwn(l, f))
-          throw new p(
-            "SERVICE_NOT_RETURNED",
-            `Plugin '${e.id}' did not return provided service '${f}'`
-          );
-        u.set(_.id, l[f]);
-      }
-      return Object.freeze({
-        installation: e,
-        runtime: Object.freeze({ plugin: o, config: i, lifetime: a }),
-        services: u
-      });
-    } catch (h) {
-      e.fail(h);
+  async #r(t) {
+    const e = /* @__PURE__ */ new Map();
+    for (const i of t)
       try {
-        await a.dispose();
-      } catch (c) {
-        throw new O(
-          [h, c],
-          `Plugin '${e.id}' failed to start and could not be cleanly disposed`
+        e.set(
+          i,
+          await Q(
+            i.declaration.plugin.config,
+            i.declaration.config,
+            i.id
+          )
         );
-      }
-      throw h;
-    }
-  }
-  #w(t) {
-    const { installation: e, runtime: i, services: s } = t;
-    this.#r.set(e, s), i.lifetime.publish(), i.lifetime.detachStartupSignal(), e.activate(i), this.#c.push(e);
-  }
-  async #O(t) {
-    const e = [];
-    for (const i of [...t].reverse())
-      try {
-        await i.runtime.lifetime.dispose();
       } catch (s) {
-        e.push(s);
-      }
-    return e;
-  }
-  async #f(t) {
-    const e = [], i = this.#c.filter((s) => t.has(s)).reverse();
-    this.#c = this.#c.filter(
-      (s) => !t.has(s)
-    );
-    for (const s of i) {
-      const n = s.runtime;
-      if (n) {
-        s.beginStopping(), this.#r.delete(s);
-        try {
-          await n.lifetime.dispose();
-        } catch (o) {
-          e.push(o);
-        } finally {
-          s.deactivate();
-        }
+        throw A(
+          s,
+          "INSTALLATION_UNAVAILABLE",
+          `Installation '${i.id}' failed with a non-Error value`
+        );
       }
-    }
     return e;
   }
-  async #v(t) {
-    const e = /* @__PURE__ */ new Map();
-    for (const i of t)
-      e.set(
-        i,
-        await this.#y(i.spec.plugin.config, i.spec.config)
-      );
-    return e;
-  }
-  #C(t, e, i, s) {
-    const n = /* @__PURE__ */ Object.create(null);
-    for (const [o, a] of Object.entries(i.requires ?? {}))
-      if (a.kind === "optional") {
-        const h = t.providerFor(e, a.service.id);
-        if (!h) {
-          n[o] = void 0;
-          continue;
-        }
-        const c = this.#r.get(h);
-        if (!c?.has(a.service.id))
-          throw new p(
-            "SERVICE_UNAVAILABLE",
-            `Optional service '${a.service.id}' is not active for plugin '${e.id}'`
-          );
-        n[o] = c.get(a.service.id);
-      } else if (a.kind === "service") {
-        const h = t.providerFor(e, a.id), c = h ? this.#r.get(h) : void 0;
-        if (!h || !c?.has(a.id))
-          throw new p(
-            "SERVICE_UNAVAILABLE",
-            `Service '${a.id}' is not active for plugin '${e.id}'`
-          );
-        n[o] = c.get(a.id);
-      } else
-        n[o] = this.#u(a, s);
-    return n;
-  }
-  #T(t, e, i) {
-    return Object.freeze({
-      ...i,
-      get signal() {
-        return t.signal;
-      },
-      meta: Object.freeze(e),
-      log: this.#e,
-      cleanup: t.cleanup.bind(t),
-      lifetime: t.lifetime.bind(t),
-      spawn: t.spawn.bind(t),
-      on: t.on.bind(t),
-      emit: t.emit.bind(t),
-      contribute: t.contribute.bind(t)
-    });
-  }
-  async #y(t, e) {
-    if (!t) return e;
-    const i = await t["~standard"].validate(e);
-    if (i.issues)
-      throw new H(
-        i.issues.map((s) => ({
-          message: s.message,
-          ...s.path ? { path: s.path } : {}
-        }))
-      );
-    return i.value;
-  }
-  #E(t) {
-    return {
-      stageOn: (e, i, s, n) => this.#A(e, i, s, n, t),
-      emit: (e, i, s) => this.#P(e, i, s, t),
-      stageContribution: (e, i, s, n, o) => this.#S(e, i, s, n, o, t),
-      report: this.#s
-    };
-  }
-  #A(t, e, i, s, n) {
-    return this.#m(t), v(e, "event"), n.remember(e), this.#a.stage(e.id, i, s);
-  }
-  #P(t, e, i, s) {
-    return this.#m(t), v(e, "event"), s.remember(e), this.#a.emit(e.id, i);
-  }
-  #S(t, e, i, s, n, o) {
-    return this.#m(t), v(e, "extension"), o.remember(e), this.#o.get(e).stage(t, i, s, n);
-  }
-  #u(t, e) {
-    return this.#o.get(t).view((i, s) => e.ownLease(i, s));
-  }
-  #m(t) {
-    if (!this.#i(t)) throw new TypeError(`Plugin '${t}' is not installed`);
-  }
-  async #j(t) {
-    this.#o.beginBatch();
-    try {
-      return await t();
-    } finally {
-      this.#o.endBatch();
-    }
-  }
-  #I() {
-    if (!this.#h)
-      throw M();
-    return this.#h;
+  #o() {
+    if (!this.#i) throw B();
+    return this.#i;
   }
 }
-function M() {
-  return new p("SERVICE_UNAVAILABLE", "Application services are not active");
+function B() {
+  return new u("SERVICE_UNAVAILABLE", "Host services are not active");
 }
-class Pt {
+class Nt {
   #t;
   #e;
   #i;
   #s = 0;
   view;
   constructor(t, e, i) {
-    this.#t = t, this.#i = this.#r("idle", [], e), this.#e = new U(() => this.#i, i), this.view = this.#e.view;
+    this.#t = t, this.#i = this.#n("idle", [], e), this.#e = new q(() => this.#i, i), this.view = this.#e.view;
   }
   publish(t, e, i) {
-    this.#s++, this.#i = this.#r(t, e, i), this.#e.invalidate();
+    this.#s++, this.#i = this.#n(t, e, i), this.#e.invalidate();
   }
-  #r(t, e, i) {
+  #n(t, e, i) {
     const s = /* @__PURE__ */ new Map();
     for (const o of e) {
       const a = {
         id: o.id,
-        name: o.spec.plugin.name,
+        pluginName: o.declaration.plugin.name,
         groupId: o.groupId,
         status: o.status,
         requires: Object.freeze(
-          Object.values(o.spec.plugin.requires ?? {}).map((c) => c.kind === "optional" ? c.service.id : c.id)
+          Object.values(o.declaration.plugin.requires ?? {}).map((h) => h.kind === "optional" ? h.service.id : h.id)
         ),
         provides: Object.freeze(
-          Object.values(o.spec.plugin.provides ?? {}).map((c) => c.id)
+          Object.values(o.declaration.plugin.provides ?? {}).map((h) => h.id)
         ),
-        ...o.runtime ? { lifetime: o.runtime.lifetime.diagnostics } : {}
-      }, h = o.error;
+        ...o.instance ? { lifetime: o.instance.lifetime.diagnostics } : {}
+      }, c = o.error;
       s.set(
         o.id,
-        Object.freeze(h === void 0 ? a : { ...a, error: h })
+        Object.freeze(c === void 0 ? a : { ...a, error: c })
       );
     }
     const n = /* @__PURE__ */ new Map();
@@ -1526,12 +1542,28 @@ class Pt {
       name: this.#t,
       status: t,
       revision: this.#s,
-      plugins: new C(s),
-      groups: new C(n)
+      installations: new O(s),
+      groups: new O(n)
     });
   }
 }
-const St = /* @__PURE__ */ new Set([
+function T(r, t, e = {}) {
+  if (!r || typeof r != "object" || Array.isArray(r))
+    throw m(e, `${t} must be a plain record`);
+  const i = Object.getPrototypeOf(r);
+  if (i !== Object.prototype && i !== null)
+    throw m(e, `${t} must be a plain record`);
+  for (const s of Reflect.ownKeys(r)) {
+    if (typeof s != "string" || !Object.prototype.propertyIsEnumerable.call(r, s))
+      throw m(e, `${t} keys must be enumerable strings`);
+    if (e.fields && !e.fields.has(s))
+      throw m(e, `${t}: unknown field '${s}'`);
+  }
+}
+function m(r, t) {
+  return r.createError?.(t) ?? new TypeError(t);
+}
+const xt = /* @__PURE__ */ new Set([
   "signal",
   "meta",
   "log",
@@ -1541,138 +1573,184 @@ const St = /* @__PURE__ */ new Set([
   "on",
   "emit",
   "contribute"
-]);
-function q(r) {
-  if (typeof r?.name != "string" || !r.name.trim())
+]), qt = /* @__PURE__ */ new Set(["name", "config", "requires", "provides", "setup"]);
+function Vt(r) {
+  Mt(r);
+  const t = Object.hasOwn(r, "name") ? r.name : void 0, e = Object.hasOwn(r, "config") ? r.config : void 0, i = Object.hasOwn(r, "requires") ? r.requires : void 0, s = Object.hasOwn(r, "provides") ? r.provides : void 0, n = Object.hasOwn(r, "setup") ? r.setup : void 0;
+  if (typeof t != "string" || !t.trim())
     throw new TypeError("Plugin name must be a non-empty string");
-  if (r.name !== r.name.trim())
+  if (t !== t.trim())
     throw new TypeError("Plugin name cannot start or end with whitespace");
-  if (typeof r.setup != "function")
-    throw new TypeError(`Plugin '${r.name}' must define setup()`);
-  if (r.config !== void 0 && typeof r.config["~standard"]?.validate != "function")
-    throw new TypeError(`Plugin '${r.name}' config must implement Standard Schema`);
-  for (const [i, s] of Object.entries(r.requires ?? {})) {
-    if (!i.trim()) throw new TypeError("Plugin requirement alias cannot be empty");
-    if (i !== i.trim())
+  if (typeof n != "function")
+    throw new TypeError(`Plugin '${t}' must define setup()`);
+  if (e !== void 0 && !Dt(e))
+    throw new TypeError(`Plugin '${t}' config must implement Standard Schema V1`);
+  F(i, t, "requires"), F(s, t, "provides");
+  const o = i ? Object.freeze({ ...i }) : void 0, a = s ? Object.freeze({ ...s }) : void 0, c = /* @__PURE__ */ new Map();
+  for (const [h, d] of Object.entries(o ?? {})) {
+    if (!h.trim()) throw new TypeError("Plugin requirement alias cannot be empty");
+    if (h !== h.trim())
       throw new TypeError("Plugin requirement alias cannot start or end with whitespace");
-    if (St.has(i))
-      throw new TypeError(`Plugin requirement '${i}' conflicts with the context API`);
-    if (!s || typeof s != "object")
-      throw new TypeError(`Plugin requirement '${i}' is not a contract`);
-    if (s.kind === "optional") {
-      if (!w(s.service, "service"))
-        throw new TypeError(`Optional requirement '${i}' must wrap a service contract`);
-    } else if (!w(s, "service") && !w(s, "extension"))
-      throw new TypeError(`Plugin requirement '${i}' must be a service or extension contract`);
-  }
-  for (const [i, s] of Object.entries(r.provides ?? {})) {
-    if (!i.trim()) throw new TypeError("Plugin provision alias cannot be empty");
-    if (i !== i.trim())
+    if (xt.has(h))
+      throw new TypeError(`Plugin requirement '${h}' conflicts with the context API`);
+    if (!d || typeof d != "object")
+      throw new TypeError(`Plugin requirement '${h}' is not a contract`);
+    if (d.kind === "optional") {
+      if (!w(d.service, "service"))
+        throw new TypeError(`Optional requirement '${h}' must wrap a Service`);
+    } else if (!w(d, "service") && !w(d, "extensionPoint"))
+      throw new TypeError(`Plugin requirement '${h}' must be a Service or ExtensionPoint`);
+    U(
+      t,
+      c,
+      "requirement",
+      h,
+      d.kind === "optional" ? d.service : d
+    );
+  }
+  for (const [h, d] of Object.entries(a ?? {})) {
+    if (!h.trim()) throw new TypeError("Plugin provision alias cannot be empty");
+    if (h !== h.trim())
       throw new TypeError("Plugin provision alias cannot start or end with whitespace");
-    if (!w(s, "service"))
-      throw new TypeError(`Plugin provision '${i}' must be a service contract`);
+    if (!w(d, "service"))
+      throw new TypeError(`Plugin provision '${h}' must be a Service`);
+    U(t, c, "provision", h, d);
   }
-  const t = r.requires ? Object.freeze({ ...r.requires }) : void 0, e = r.provides ? Object.freeze({ ...r.provides }) : void 0;
   return Object.freeze({
-    ...r,
-    ...t ? { requires: t } : {},
-    ...e ? { provides: e } : {}
+    name: t,
+    ...e === void 0 ? {} : { config: e },
+    ...o ? { requires: o } : {},
+    ...a ? { provides: a } : {},
+    setup: n
   });
 }
-const j = /* @__PURE__ */ new WeakMap();
-function Ot(r, t) {
-  j.get(r)?.(t);
+function Mt(r) {
+  T(r, "Plugin declaration", { fields: qt });
 }
-class Tt {
+function Dt(r) {
+  if (!r || typeof r != "object" && typeof r != "function") return !1;
+  const t = r["~standard"];
+  if (!t || typeof t != "object") return !1;
+  const e = t;
+  return e.version === 1 && typeof e.vendor == "string" && typeof e.validate == "function";
+}
+function F(r, t, e) {
+  r !== void 0 && T(r, `Plugin '${t}' ${e}`);
+}
+function U(r, t, e, i, s) {
+  const n = t.get(s.id);
+  if (!n) {
+    t.set(s.id, { alias: i, kind: s.kind, role: e });
+    return;
+  }
+  if (n.kind !== s.kind)
+    throw new TypeError(
+      `Plugin '${r}' uses Contract '${s.id}' as both ${k(n.kind)} and ${k(s.kind)}`
+    );
+  const o = k(s.kind);
+  throw n.role !== e ? new TypeError(
+    `Plugin '${r}' cannot both require and provide ${o} '${s.id}'`
+  ) : new TypeError(
+    `Plugin '${r}' ${e} aliases '${n.alias}' and '${i}' reference the same ${o} '${s.id}'`
+  );
+}
+function k(r) {
+  return r === "extensionPoint" ? "ExtensionPoint" : r === "event" ? "Event" : "Service";
+}
+function _(r) {
+  return Vt(r);
+}
+const Gt = /* @__PURE__ */ new Set(["plugin", "config"]), R = /* @__PURE__ */ new WeakMap();
+function Bt(r, t) {
+  R.get(r)?.(t);
+}
+class Ft {
   #t = /* @__PURE__ */ new Map();
   #e;
   constructor(t) {
-    this.#e = { phase: "open", host: t }, j.set(this, (e) => this.#i(e)), Object.freeze(this);
+    this.#e = { phase: "open", port: t }, R.set(this, (e) => this.#i(e)), Object.freeze(this);
   }
   install(t, ...e) {
-    const i = this.#r(), s = q(t), n = i.create(s, e[0]);
-    return this.#s({ kind: "install", installation: n.installation }), n.handle;
+    const i = this.#n(), s = _(t), n = i.create(s, e[0]);
+    return this.#s({ kind: "install", installation: n.record }), n.publicInstallation;
   }
   update(t, e) {
-    const i = this.#r();
-    if (!e || typeof e != "object")
-      throw new TypeError("Plugin update must be an object");
+    const i = this.#n();
+    T(e, "Installation update", { fields: Gt });
     const s = Object.hasOwn(e, "plugin"), n = Object.hasOwn(e, "config");
     if (!s && !n)
-      throw new TypeError("Plugin update must include 'plugin' or 'config'");
+      throw new TypeError("Installation update must include 'plugin' or 'config'");
     const o = i.resolve(t);
     let a;
     if (s) {
       const d = e.plugin;
-      if (!d) throw new TypeError("Plugin update 'plugin' must be a plugin definition");
-      a = q(d);
+      if (!d) throw new TypeError("Installation update 'plugin' must be a Plugin");
+      a = _(d);
     }
-    let h;
-    a && n ? h = { kind: "plugin-and-config", plugin: a, config: e.config } : a ? h = { kind: "plugin", plugin: a } : h = { kind: "config", config: e.config };
-    const c = { kind: "update", installation: o, declaration: h };
-    return this.#s(c), this;
+    let c;
+    a && n ? c = { kind: "plugin-and-config", plugin: a, config: e.config } : a ? c = { kind: "plugin", plugin: a } : c = { kind: "config", config: e.config };
+    const h = { kind: "update", installation: o, declaration: c };
+    return this.#s(h), this;
   }
   remove(t) {
-    const e = this.#r();
+    const e = this.#n();
     return this.#s({ kind: "remove", installation: e.resolve(t) }), this;
   }
   commit() {
     const t = this.#e;
     if (t.phase === "submitted") return t.promise;
     if (t.phase === "discarded")
-      throw new TypeError("Cannot commit a discarded ChangeSet");
+      throw new Error("Cannot commit a discarded ChangeSet");
     if (t.phase === "committing")
-      throw new TypeError("Core ChangeSet commit is already being prepared");
+      throw new Error("Core ChangeSet commit is already being prepared");
     this.#e = { phase: "committing" };
-    const e = Object.freeze([...this.#t.values()]), i = t.host;
+    const e = Object.freeze([...this.#t.values()]), i = t.port;
     try {
       for (const n of e)
         n.kind === "install" && i.attach(n.installation);
     } catch (n) {
       for (const o of e)
         o.kind === "install" && i.discard(o.installation, n);
-      return this.#n(Promise.reject(n));
+      return this.#a(Promise.reject(n));
     }
-    if (!e.length)
-      return this.#n(Promise.resolve());
     let s;
     try {
       s = i.execute(e);
     } catch (n) {
       s = Promise.reject(n);
     }
-    return this.#n(s);
+    return this.#a(s);
   }
   #i(t) {
     const e = this.#e;
     if (e.phase !== "open") return;
     this.#e = { phase: "discarded" };
     const i = [...this.#t.values()];
-    this.#a();
+    this.#r();
     for (const s of i)
-      s.kind === "install" && e.host.discard(s.installation, t);
+      s.kind === "install" && e.port.discard(s.installation, t);
   }
   #s(t) {
     if (this.#t.has(t.installation))
       throw new TypeError(
-        `Plugin '${t.installation.id}' can only appear once in the same ChangeSet`
+        `Installation '${t.installation.id}' can only appear once in the same ChangeSet`
       );
     this.#t.set(t.installation, Object.freeze(t));
   }
-  #r() {
+  #n() {
     const t = this.#e;
     if (t.phase !== "open")
       throw new TypeError(`Cannot modify a ${t.phase} ChangeSet`);
-    return t.host;
+    return t.port;
   }
-  #n(t) {
-    return this.#e = { phase: "submitted", promise: t }, this.#a(), t;
+  #a(t) {
+    return this.#e = { phase: "submitted", promise: t }, this.#r(), t;
   }
-  #a() {
-    this.#t.clear(), j.delete(this);
+  #r() {
+    this.#t.clear(), R.delete(this);
   }
 }
-class At {
+class Ut {
   #t;
   constructor(t, e, i) {
     this.#t = { phase: "open", draft: t, discard: e, normalize: i };
@@ -1683,7 +1761,7 @@ class At {
   requireDraft() {
     const t = this.#t;
     if (t.phase === "failed") throw t.error;
-    if (t.phase === "sealed") throw T();
+    if (t.phase === "sealed") throw P();
     return t.draft;
   }
   assertOpen() {
@@ -1692,7 +1770,7 @@ class At {
   fail(t) {
     const e = this.#t;
     if (e.phase === "failed") return e.error;
-    if (e.phase === "sealed") throw T();
+    if (e.phase === "sealed") throw P();
     const i = e.normalize(t);
     return this.#t = {
       phase: "failed",
@@ -1704,7 +1782,7 @@ class At {
   seal() {
     const t = this.#t;
     if (t.phase === "failed") throw t.error;
-    if (t.phase === "sealed") throw T();
+    if (t.phase === "sealed") throw P();
     return this.#t = { phase: "sealed" }, t.draft;
   }
   discard(t) {
@@ -1714,10 +1792,10 @@ class At {
     this.#t = { phase: "sealed" }, e.discard(e.draft, i);
   }
 }
-function T() {
-  return new TypeError("Group configuration has been sealed");
+function P() {
+  return new Error("Group configuration has been sealed");
 }
-class P {
+class S {
   constructor(t, e, i) {
     this.id = t, this.name = e, this.#e = { phase: "attached", parent: i };
   }
@@ -1726,7 +1804,7 @@ class P {
   #t = /* @__PURE__ */ new Map();
   #e;
   static root(t) {
-    return new P("/", t, void 0);
+    return new S("/", t, void 0);
   }
   get attached() {
     return this.#e.phase !== "detached";
@@ -1739,13 +1817,16 @@ class P {
     return t.phase === "detached" ? void 0 : t.parent;
   }
   create(t) {
-    if (this.assertAttached(), jt(t), this.#t.has(t))
+    if (this.assertAttached(), _t(t), this.#t.has(t))
       throw new TypeError(`Group '${this.#i(t)}' already exists`);
-    const e = new P(this.#i(t), t, this);
+    const e = new S(this.#i(t), t, this);
     return this.#t.set(t, e), e;
   }
-  containsId(t) {
-    return this.id === "/" ? t.startsWith("/") : t === this.id || t.startsWith(`${this.id}/`);
+  contains(t) {
+    if (t === this) return !0;
+    for (const e of this.#t.values())
+      if (e.contains(t)) return !0;
+    return !1;
   }
   assertAttached() {
     if (this.#e.phase === "detached")
@@ -1770,14 +1851,14 @@ class P {
     return this.id === "/" ? `/${t}` : `${this.id}/${t}`;
   }
 }
-function jt(r) {
+function _t(r) {
   if (typeof r != "string" || !r.trim())
     throw new TypeError("Group name must be a non-empty string");
   if (r !== r.trim())
     throw new TypeError("Group name cannot start or end with whitespace");
   if (r.includes("/")) throw new TypeError("Group name cannot contain '/'");
 }
-class D {
+class H {
   constructor(t, e, i) {
     this.node = t, this.#t = { phase: e }, this.#e = i;
   }
@@ -1804,7 +1885,7 @@ class D {
         this.#i(s) && (this.#t = { phase: "established" }, this.#e?.());
       },
       (o) => {
-        const a = $(
+        const a = A(
           o,
           "GROUP_UNAVAILABLE",
           `Group '${this.node.id}' operation failed with a non-Error value`
@@ -1829,14 +1910,14 @@ class D {
   }
 }
 function I(r) {
-  return new p("GROUP_REMOVED", `Group '${r.id}' has been removed`);
+  return new u("GROUP_REMOVED", `Group '${r.id}' has been removed`);
 }
-const y = /* @__PURE__ */ new WeakMap();
-class It {
+const E = /* @__PURE__ */ new WeakMap();
+class Ht {
   #t;
   #e;
   constructor(t, e, i) {
-    this.#t = e, this.#e = i ? { phase: "configuring", coordinator: t, configuration: i } : { phase: "attached", coordinator: t }, y.set(this, {
+    this.#t = e, this.#e = i ? { phase: "configuring", coordinator: t, configuration: i } : { phase: "attached", coordinator: t }, E.set(this, {
       finishConfiguration: () => {
         const s = this.#e;
         s.phase === "configuring" && (this.#e = { phase: "attached", coordinator: s.coordinator });
@@ -1861,12 +1942,8 @@ class It {
     return t.phase === "revoked" ? Promise.reject(I(this.#t)) : t.coordinator.ready(this.#t);
   }
   install(t, ...e) {
-    const i = this.#e;
-    return i.phase === "configuring" ? i.configuration.requireDraft().install(t, ...e) : this.#i().install(
-      this.#t,
-      t,
-      e[0]
-    );
+    const i = this.#e;
+    return i.phase === "configuring" ? i.configuration.requireDraft().install(t, ...e) : this.#i().install(this.#t, t, ...e);
   }
   change() {
     if (this.#e.phase === "configuring")
@@ -1894,15 +1971,15 @@ class It {
     return t.coordinator;
   }
 }
-class kt {
+class Kt {
   root;
   #t;
   #e = /* @__PURE__ */ new WeakMap();
   #i = /* @__PURE__ */ new WeakMap();
   constructor(t, e) {
-    this.root = P.root(t), this.#t = e, this.#i.set(
+    this.root = S.root(t), this.#t = e, this.#i.set(
       this.root,
-      new D(this.root, "established", () => e.notifyChanged())
+      new H(this.root, "established", () => e.notifyChanged())
     );
   }
   nodes() {
@@ -1910,68 +1987,71 @@ class kt {
   }
   install(t, e, ...i) {
     const s = this.change(t), n = s.install(e, ...i);
-    return G(s.commit()), n;
+    return K(s.commit()), n;
   }
   change(t, e = "immediate") {
-    return t.assertAttached(), new Tt({
-      create: (i, s) => this.#t.createDraft(t, i, s),
+    return this.#r(t), new Ft({
+      create: (i, s) => (this.#r(t), this.#t.createDraft(t, i, s)),
       resolve: (i) => {
-        const s = this.#t.resolveHandle(i);
-        if (!t.containsId(s.groupId))
-          throw new TypeError(
-            `Plugin '${s.id}' is outside ChangeSet group '${t.id}'`
-          );
+        this.#r(t);
+        const s = this.#t.resolveInstallation(i);
+        if (!s.attached) throw s.unavailableError();
+        if (!t.contains(s.group))
+          throw new TypeError(`Installation '${s.id}' is outside Group '${t.id}'`);
         return s;
       },
       execute: (i) => {
-        const s = this.#t.executeChanges(i);
+        this.#r(t);
+        const s = this.#t.executeChanges(t, i);
         for (const n of i) n.installation.trackReadiness(s);
-        return e === "immediate" && this.#n(t, s), s;
+        return i.length && e === "immediate" && this.#a(t, s), s;
+      },
+      attach: (i) => {
+        this.#r(t), this.#t.attachInstallation(i);
       },
-      attach: (i) => this.#t.attachInstallation(i),
       discard: (i, s) => this.#t.discardInstallation(i, s)
     });
   }
   create(t, e, i, s) {
     if (typeof i != "function") throw new TypeError("Group configure must be a function");
     const n = t.create(e);
-    this.#i.set(n, new D(n, "new", () => this.#t.notifyChanged()));
-    const o = s === void 0, a = s ?? new At(
+    this.#i.set(n, new H(n, "new", () => this.#t.notifyChanged()));
+    const o = s === void 0, a = s ?? new Ut(
       this.change(n, "deferred"),
-      Ot,
-      (c) => $(
-        c,
+      Bt,
+      (h) => A(
+        h,
         "GROUP_UNAVAILABLE",
         `Group '${n.id}' configuration failed with a non-Error value`
       )
-    ), h = new It(this, n, a);
-    this.#e.set(n, h);
+    ), c = new Ht(this, n, a);
+    this.#e.set(n, c);
     try {
-      const c = i(h);
-      Lt(c) && $t(c);
+      const h = i(c);
+      Yt(h) && Wt(h);
       const d = a.failure;
       if (d) throw d;
-    } catch (c) {
-      const d = a.fail(c), l = n.walk();
+    } catch (h) {
+      const d = a.fail(h), l = n.walk();
       throw n.detach(), this.#o(l), o && a.discard(d), this.#t.notifyChanged(), d;
     }
     if (o) {
-      const c = a.seal().commit();
+      const h = a.seal().commit();
       for (const d of n.walk()) {
         const l = this.#e.get(d);
-        l && y.get(l)?.finishConfiguration(), this.#n(d, c);
+        l && E.get(l)?.finishConfiguration(), this.#a(d, h);
       }
-      G(c);
+      K(h);
     }
-    return this.#t.notifyChanged(), h;
+    return this.#t.notifyChanged(), c;
   }
   async ready(t) {
-    await this.#a(t).ready(async () => {
+    await this.#r(t).ready(async () => {
       await Promise.all(this.#s(t).map((e) => e.ready()));
     });
   }
   status(t) {
-    return t.attached ? this.#a(t).status(this.#r(t)) : "removed";
+    return t.attached ? this.#r(t).status(this.#n(t)) : "removed";
   }
   remove(t) {
     if (t === this.root) throw new TypeError("The root Group cannot be removed");
@@ -1980,74 +2060,214 @@ class kt {
         this.#o([t]);
         return;
       }
-      const e = t.walk(), i = this.#s(t).map(
-        (s) => ({ kind: "remove", installation: s })
-      );
+      const e = t.walk(), i = this.#s(t).map((s) => ({
+        kind: "remove",
+        installation: s
+      }));
       await this.#t.removeInstallations(i), t.detach(), this.#o(e), this.#t.notifyChanged();
     }) : (this.#o([t]), Promise.resolve());
   }
   #s(t) {
     return [...this.#t.installations()].filter(
-      (e) => t.containsId(e.groupId)
+      (e) => t.contains(e.group)
     );
   }
-  #r(t) {
+  #n(t) {
     const e = this.#s(t);
     return e.some((i) => i.status === "failed") ? "failed" : e.some((i) => i.status === "stopping") ? "stopping" : e.length && e.every((i) => i.status === "active") ? "active" : e.length ? "pending" : "active";
   }
-  #n(t, e) {
-    this.#a(t).track(e);
+  #a(t, e) {
+    this.#r(t).track(e);
   }
-  #a(t) {
+  #r(t) {
     const e = this.#i.get(t);
-    if (!e) throw I(t);
+    if (!t.attached || !e) throw I(t);
     return e;
   }
   #o(t) {
     for (const e of t) {
       this.#i.get(e)?.release(), this.#i.delete(e);
       const i = this.#e.get(e);
-      i && (y.get(i)?.revoke(), y.delete(i)), this.#e.delete(e);
+      i && (E.get(i)?.revoke(), E.delete(i)), this.#e.delete(e);
     }
   }
 }
-function G(r) {
+function K(r) {
   Promise.resolve(r).catch(() => {
   });
 }
-function $t(r) {
+function Wt(r) {
   throw Promise.resolve(r).catch(() => {
   }), new TypeError("Group configure must be synchronous");
 }
-function Lt(r) {
+function Yt(r) {
   return r === null || typeof r != "object" && typeof r != "function" ? !1 : typeof r.then == "function";
 }
-class zt {
-  #t = Promise.resolve();
-  get settled() {
-    return this.#t;
+function W(r, t) {
+  return Object.freeze({ plugin: r, config: t });
+}
+class Qt {
+  constructor(t, e, i, s) {
+    this.id = t, this.index = e, this.groupId = i.id, this.#i = { declaration: s, group: i, notifyChanged: void 0 };
   }
-  run(t) {
-    if (typeof t != "function")
-      throw new TypeError("SerialQueue operation must be a function");
-    const e = this.#t.then(t);
-    return this.#t = e.then(
+  id;
+  index;
+  #t = { phase: "pending" };
+  #e;
+  #i;
+  groupId;
+  #s = /* @__PURE__ */ new Set();
+  attach(t) {
+    const e = this.#c();
+    if (e.notifyChanged) throw new Error(`Installation '${this.id}' is already attached`);
+    e.notifyChanged = t;
+  }
+  get status() {
+    return this.#t.phase;
+  }
+  /** Whether the owning ChangeSet has granted this Installation Host authority. */
+  get attached() {
+    return this.#i?.notifyChanged !== void 0;
+  }
+  get instance() {
+    const t = this.#t;
+    return t.phase === "active" || t.phase === "stopping" ? t.instance : void 0;
+  }
+  get error() {
+    const t = this.#t;
+    if (t.phase === "failed")
+      return t.failure.retention === "live" ? t.failure.error : Xt(t.failure.summary);
+    if (t.phase === "removed")
+      return new u("INSTALLATION_REMOVED", `Installation '${this.id}' has been removed`);
+  }
+  get group() {
+    return this.#c().group;
+  }
+  get declaration() {
+    return this.#c().declaration;
+  }
+  replaceDeclaration(t) {
+    this.#c().declaration = t;
+  }
+  ready() {
+    const t = this.#e;
+    return t ? t.barrier.then(() => this.#n()) : this.#n();
+  }
+  unavailableError() {
+    return this.error ?? new u(
+      "INSTALLATION_UNAVAILABLE",
+      `Installation '${this.id}' has not been committed`
+    );
+  }
+  trackReadiness(t) {
+    const e = {}, i = t.then(
       () => {
+        this.#e?.attempt === e && (this.#e = void 0);
       },
-      () => {
+      (s) => {
+        if (this.#e?.attempt === e && (this.#e = void 0), this.#t.phase !== "active") throw s;
       }
-    ), e;
+    );
+    this.#e = { attempt: e, barrier: i }, i.catch(() => {
+    });
+  }
+  #n() {
+    const t = this.#t;
+    if ((t.phase === "active" || t.phase === "failed" || t.phase === "removed") && t.readiness === "settled") {
+      if (t.phase === "active") return Promise.resolve();
+      if (t.phase === "failed" || t.phase === "removed")
+        return Promise.reject(
+          this.error ?? new u(
+            "INSTALLATION_UNAVAILABLE",
+            `Installation '${this.id}' is ${t.phase}`
+          )
+        );
+    }
+    const e = Promise.withResolvers();
+    return this.#s.add(e), e.promise;
+  }
+  activate(t) {
+    this.#r({ phase: "active", instance: t, readiness: "unsettled" });
+  }
+  settleReady() {
+    const t = this.#t;
+    if (!(t.phase !== "active" && t.phase !== "failed" && t.phase !== "removed") && t.readiness !== "settled") {
+      if (this.#t = { ...t, readiness: "settled" }, t.phase === "active")
+        for (const e of this.#s) e.resolve();
+      else {
+        const e = this.error ?? new u("INSTALLATION_UNAVAILABLE", `Installation '${this.id}' is ${t.phase}`);
+        for (const i of this.#s) i.reject(e);
+      }
+      this.#s.clear();
+    }
+  }
+  beginStopping() {
+    const t = this.#t;
+    return t.phase !== "active" ? !1 : (this.#r({ phase: "stopping", instance: t.instance }), !0);
+  }
+  deactivate() {
+    this.#r({ phase: "pending" });
+  }
+  fail(t) {
+    return this.#a(t);
+  }
+  discard(t) {
+    const e = this.#o(t);
+    this.#r({
+      phase: "failed",
+      failure: { retention: "summary", summary: Jt(e) },
+      readiness: "settled"
+    });
+    for (const i of this.#s) i.reject(e);
+    this.#s.clear(), this.#e = void 0, this.#i = void 0;
+  }
+  #a(t) {
+    const e = this.#o(t);
+    return this.#r({
+      phase: "failed",
+      failure: { retention: "live", error: e },
+      readiness: "unsettled"
+    }), e;
+  }
+  remove() {
+    this.#r({ phase: "removed", readiness: "unsettled" }), this.#e = void 0, this.#i = void 0;
+  }
+  #r(t) {
+    this.#t = t, this.#i?.notifyChanged?.();
+  }
+  #o(t) {
+    return A(
+      t,
+      "INSTALLATION_UNAVAILABLE",
+      `Installation '${this.id}' failed with a non-Error value`
+    );
+  }
+  #c() {
+    const t = this.#i;
+    if (!t) throw new Error(`Installation '${this.id}' is no longer installed`);
+    return t;
   }
 }
-const xt = console, E = /* @__PURE__ */ new WeakMap();
-class Rt {
+function Jt(r) {
+  return r instanceof u ? { category: "dougong", name: r.name, message: r.message, code: r.code } : {
+    category: r instanceof TypeError ? "typeError" : "error",
+    name: r.name,
+    message: r.message
+  };
+}
+function Xt(r) {
+  const t = r.category === "dougong" ? new u(r.code, r.message) : r.category === "typeError" ? new TypeError(r.message) : new Error(r.message);
+  return t.name = r.name, t;
+}
+const C = /* @__PURE__ */ new WeakMap();
+class Zt {
   #t;
   #e = { phase: "draft" };
   constructor(t) {
-    this.#t = t, E.set(this, {
+    this.#t = t, C.set(this, {
       attach: (e, i) => {
         if (this.#e.phase !== "draft")
-          throw new TypeError(`Plugin '${this.#t.id}' control is already sealed`);
+          throw new Error(`Installation '${this.#t.id}' control is already sealed`);
         this.#e = {
           phase: "attached",
           update: e,
@@ -2074,8 +2294,7 @@ class Rt {
   async update(t) {
     const e = this.#e;
     if (e.phase === "draft") throw this.#i();
-    if (e.phase === "revoked")
-      throw this.#t.error ?? new p("PLUGIN_REMOVED", `Plugin '${this.#t.id}' has been removed`);
+    if (e.phase === "revoked") throw this.#t.unavailableError();
     await e.update(t);
   }
   async remove() {
@@ -2084,261 +2303,288 @@ class Rt {
     t.phase === "attached" && await t.remove();
   }
   #i() {
-    return new p(
-      "PLUGIN_UNAVAILABLE",
-      `Plugin '${this.#t.id}' installation has not been committed`
+    return new u(
+      "INSTALLATION_UNAVAILABLE",
+      `Installation '${this.#t.id}' has not been committed`
     );
   }
 }
-class Nt {
-  name;
-  diagnostics;
+class te {
   #t = /* @__PURE__ */ new Map();
   #e = /* @__PURE__ */ new WeakMap();
   #i = /* @__PURE__ */ new WeakMap();
   #s;
-  #r;
+  #n = 0;
+  constructor(t) {
+    this.#s = t;
+  }
+  values() {
+    return this.#t.values();
+  }
+  has(t) {
+    return this.#t.has(t);
+  }
+  contains(t) {
+    return this.#t.get(t.id) === t;
+  }
+  create(t, e, i) {
+    t.assertAttached();
+    const s = ++this.#n, n = new Qt(
+      `${e.name}:${s}`,
+      s,
+      t,
+      W(e, i)
+    ), o = new Zt(n);
+    return this.#e.set(o, n), this.#i.set(n, o), { record: n, publicInstallation: o };
+  }
+  resolve(t) {
+    const e = this.#e.get(t);
+    if (!e) throw new TypeError("Installation belongs to a different Host");
+    return e;
+  }
+  attach(t) {
+    const e = this.#i.get(t);
+    if (!e) throw new Error(`Installation '${t.id}' has no public facade`);
+    const i = C.get(e);
+    if (!i) throw new Error(`Installation '${t.id}' has no draft control`);
+    t.attach(this.#s.notifyChanged), i.attach(
+      (s) => this.#s.update(t, e, s),
+      () => this.#s.remove(t, e)
+    );
+  }
+  apply(t) {
+    for (const e of t) {
+      if (e.kind === "install") {
+        if (e.installation.group.assertAttached(), this.#t.has(e.installation.id))
+          throw new Error(`Installation '${e.installation.id}' is already installed`);
+        continue;
+      }
+      if (!this.contains(e.installation))
+        throw e.installation.unavailableError();
+      if (e.kind === "update" && e.declaration.kind !== "config" && e.declaration.plugin.name !== e.installation.declaration.plugin.name)
+        throw new u(
+          "INSTALLATION_IDENTITY",
+          `Installation '${e.installation.id}' cannot change name from '${e.installation.declaration.plugin.name}' to '${e.declaration.plugin.name}'`
+        );
+    }
+    for (const e of t)
+      if (e.kind === "install")
+        this.#t.set(e.installation.id, e.installation);
+      else if (e.kind === "update") {
+        const i = e.installation.declaration, s = e.declaration.kind === "config" ? i.plugin : e.declaration.plugin, n = e.declaration.kind === "plugin" ? i.config : e.declaration.config;
+        e.installation.replaceDeclaration(W(s, n));
+      } else this.contains(e.installation) && this.#t.delete(e.installation.id);
+  }
+  settleChanges(t, e) {
+    for (const i of t)
+      i.kind === "remove" ? (i.installation.remove(), i.installation.settleReady(), this.#a(i.installation)) : e || i.installation.deactivate();
+  }
+  settleReadiness(t) {
+    for (const e of t) e.settleReady();
+  }
+  discard(t, e) {
+    t.discard(e), this.#a(t);
+  }
+  capture() {
+    return [...this.#t].map(([t, e]) => ({
+      id: t,
+      installation: e,
+      declaration: e.declaration
+    }));
+  }
+  restore(t) {
+    this.#t.clear();
+    for (const e of t)
+      e.installation.replaceDeclaration(e.declaration), this.#t.set(e.id, e.installation);
+  }
+  #a(t) {
+    const e = this.#i.get(t);
+    e && (C.get(e)?.revoke(), C.delete(e)), this.#i.delete(t);
+  }
+}
+class ee {
+  #t = Promise.resolve();
+  get settled() {
+    return this.#t;
+  }
+  run(t) {
+    if (typeof t != "function")
+      throw new TypeError("SerialQueue operation must be a function");
+    const e = this.#t.then(t);
+    return this.#t = e.then(
+      () => {
+      },
+      () => {
+      }
+    ), e;
+  }
+}
+const ie = console, se = /* @__PURE__ */ new Set(["name", "logger", "onError"]);
+class re {
+  name;
+  diagnostics;
+  #t;
+  #e;
+  #i;
+  #s;
   #n;
   #a;
-  #o;
-  #h = 0;
-  #c = "idle";
-  #p = new zt();
+  #r = "idle";
+  #o = new ee();
   constructor(t = {}) {
-    if (!t || typeof t != "object")
-      throw new TypeError("Application options must be an object");
-    const e = t.name ?? "app";
-    if (typeof e != "string" || !e.trim())
-      throw new TypeError("Application name must be a non-empty string");
-    if (e !== e.trim())
-      throw new TypeError("Application name cannot start or end with whitespace");
-    if (t.onError !== void 0 && typeof t.onError != "function")
-      throw new TypeError("Application onError must be a function");
-    if (t.logger !== void 0 && !Mt(t.logger))
-      throw new TypeError("Application logger must implement debug/info/warn/error");
-    this.name = e, this.#r = t.logger ?? xt, this.#a = t.onError ?? ((i) => this.#r.error(i)), this.#o = new Ct({
-      applicationName: e,
-      logger: this.#r,
-      isInstalled: (i) => this.#t.has(i),
-      report: (i) => this.#S(i)
-    }), this.#n = new kt(e, {
+    T(t, "Host options", { fields: se });
+    const e = Object.hasOwn(t, "name") ? t.name : void 0, i = Object.hasOwn(t, "logger") ? t.logger : void 0, s = Object.hasOwn(t, "onError") ? t.onError : void 0, n = e ?? "host";
+    if (typeof n != "string" || !n.trim())
+      throw new TypeError("Host name must be a non-empty string");
+    if (n !== n.trim())
+      throw new TypeError("Host name cannot start or end with whitespace");
+    if (s !== void 0 && typeof s != "function")
+      throw new TypeError("Host onError must be a function");
+    if (i !== void 0 && !$t(i))
+      throw new TypeError("Host logger must implement debug/info/warn/error");
+    this.name = n, this.#i = i ?? ie, this.#n = s ?? ((o) => this.#i.error(o)), this.#t = new te({
+      notifyChanged: () => this.#p(),
+      update: (o, a, c) => this.#s.change(o.group).update(a, c).commit(),
+      remove: (o, a) => this.#s.change(o.group).remove(a).commit()
+    }), this.#a = new Rt({
+      hostName: n,
+      logger: this.#i,
+      isInstalled: (o) => this.#t.has(o),
+      report: (o) => this.#d(o)
+    }), this.#s = new Kt(n, {
       installations: () => this.#t.values(),
-      createDraft: (i, s, n) => this.#g(i, s, n),
-      resolveHandle: (i) => this.#l(i),
-      executeChanges: (i) => this.#d(i),
-      attachInstallation: (i) => this.#T(i),
-      discardInstallation: (i, s) => {
-        this.#C(i, s);
-      },
-      runExclusive: (i) => this.#p.run(i),
-      removeInstallations: (i) => this.#b(i),
-      notifyChanged: () => this.#m()
-    }), this.#s = new Pt(
-      e,
-      this.#n.nodes(),
-      (i) => this.#S(i)
-    ), this.diagnostics = this.#s.view, Object.freeze(this);
+      createDraft: (o, a, c) => this.#t.create(o, a, c),
+      resolveInstallation: (o) => this.#t.resolve(o),
+      executeChanges: (o, a) => this.#c(o, a),
+      attachInstallation: (o) => this.#t.attach(o),
+      discardInstallation: (o, a) => this.#t.discard(o, a),
+      runExclusive: (o) => this.#o.run(o),
+      removeInstallations: (o) => this.#f(o),
+      notifyChanged: () => this.#p()
+    }), this.#e = new Nt(
+      n,
+      this.#s.nodes(),
+      (o) => this.#d(o)
+    ), this.diagnostics = this.#e.view, Object.freeze(this);
   }
   get status() {
-    return this.#c;
+    return this.#r;
   }
   get(t) {
-    const e = this.#c === "active" ? "available" : "unavailable";
-    return this.#o.get(t, e);
+    const e = this.#r === "active" ? "available" : "unavailable";
+    return this.#a.get(t, e);
   }
   install(t, ...e) {
-    return this.#n.install(this.#n.root, t, ...e);
+    return this.#s.install(this.#s.root, t, ...e);
   }
   change() {
-    return this.#n.change(this.#n.root);
+    return this.#s.change(this.#s.root);
   }
   group(t, e) {
-    return this.#n.create(this.#n.root, t, e);
+    return this.#s.create(this.#s.root, t, e);
   }
   start() {
-    return this.#p.run(async () => {
-      if (this.#c !== "active") {
-        this.#u("starting");
+    return this.#o.run(async () => {
+      if (this.#r !== "active") {
+        this.#h("starting");
         try {
-          const t = this.#o.buildPlan(this.#t.values());
-          await this.#o.start(t), this.#u("active"), this.#E(t.order);
+          const t = this.#a.buildPlan(this.#t.values());
+          await this.#a.start(t), this.#h("active"), this.#t.settleReadiness(t.order);
         } catch (t) {
-          this.#u("idle");
+          this.#h("idle");
           for (const e of this.#t.values())
             e.status !== "active" && e.fail(t);
-          throw this.#E(this.#t.values()), t;
+          throw this.#t.settleReadiness(this.#t.values()), t;
         }
       }
     });
   }
   stop() {
-    return this.#p.run(async () => {
-      if (this.#c === "idle") return;
-      this.#u("stopping");
-      const t = await this.#o.stop();
-      if (this.#u("idle"), t.length === 1) throw t[0];
-      if (t.length > 1) throw new AggregateError(t, "Application shutdown failed");
+    return this.#o.run(async () => {
+      if (this.#r === "idle") return;
+      this.#h("stopping");
+      const t = await this.#a.stop();
+      if (this.#h("idle"), t.length === 1) throw t[0];
+      if (t.length > 1) throw new AggregateError(t, "Host shutdown failed");
     });
   }
-  #g(t, e, i) {
-    t.assertAttached();
-    const s = ++this.#h, n = `${e.name}:${s}`, o = new bt(
-      n,
-      s,
-      t,
-      N(e, i)
-    ), a = new Rt(o);
-    return this.#e.set(a, o), this.#i.set(o, a), { installation: o, handle: a };
-  }
-  #l(t) {
-    const e = this.#e.get(t);
-    if (!e) throw new TypeError("PluginHandle belongs to a different Application");
-    return e;
-  }
-  #d(t) {
-    const e = t.filter((i) => i.kind === "install").map((i) => i.installation);
-    return this.#p.run(async () => {
+  #c(t, e) {
+    const i = e.filter((s) => s.kind === "install").map((s) => s.installation);
+    return this.#o.run(async () => {
       try {
-        this.#c === "active" ? await this.#w(t) : (this.#f(t), this.#v(t)), this.#m();
-      } catch (i) {
-        for (const s of e)
-          this.#t.get(s.id) !== s && this.#C(s, i);
-        throw i;
+        if (!t.attached) throw I(t);
+        if (!e.length) return;
+        this.#r === "active" ? await this.#u(e) : (this.#t.apply(e), this.#t.settleChanges(e, !1)), this.#p();
+      } catch (s) {
+        for (const n of i)
+          this.#t.contains(n) || this.#t.discard(n, s);
+        throw s;
       }
     });
   }
-  async #b(t) {
-    t.length && this.#c === "active" ? await this.#w(t) : (this.#f(t), this.#v(t));
+  async #f(t) {
+    t.length && this.#r === "active" ? await this.#u(t) : (this.#t.apply(t), this.#t.settleChanges(t, !1));
   }
-  async #w(t) {
-    const e = await this.#O(t);
-    if (this.#E(e.affected), e.kind === "rolled-back") throw e.error;
-    this.#v(t);
+  async #u(t) {
+    const e = await this.#l(t);
+    if (this.#t.settleReadiness(e.affected), e.kind === "rolled-back") throw e.error;
+    this.#t.settleChanges(t, !0);
   }
-  async #O(t) {
-    const e = this.#A(), i = new Set(t.map((n) => n.installation));
-    this.#u("changing");
+  async #l(t) {
+    const e = this.#t.capture(), i = new Set(t.map((n) => n.installation));
+    this.#h("changing");
     let s;
     try {
-      this.#f(t), s = this.#o.buildPlan(this.#t.values());
+      this.#t.apply(t), s = this.#a.buildPlan(this.#t.values());
     } catch (n) {
-      throw this.#P(e), this.#u("active"), n;
+      throw this.#t.restore(e), this.#h("active"), n;
     }
     try {
-      const n = await this.#o.transition(
+      const n = await this.#a.transition(
         s,
         i,
-        () => this.#P(e)
+        () => this.#t.restore(e)
       );
-      return this.#u("active"), n;
+      return this.#h("active"), n;
     } catch (n) {
-      throw this.#u(this.#o.hasCommittedPlan ? "active" : "idle"), n;
-    }
-  }
-  #f(t) {
-    for (const e of t) {
-      if (e.kind === "install") {
-        if (e.installation.group.assertAttached(), this.#t.has(e.installation.id))
-          throw new TypeError(`Plugin '${e.installation.id}' is already installed`);
-        continue;
-      }
-      const i = this.#t.get(e.installation.id) === e.installation;
-      if (!(e.kind === "remove" && !i && e.installation.status === "removed")) {
-        if (!i)
-          throw new p(
-            "PLUGIN_REMOVED",
-            `Plugin '${e.installation.id}' has been removed`
-          );
-        if (e.kind === "update" && e.declaration.kind !== "config" && e.declaration.plugin.name !== e.installation.spec.plugin.name)
-          throw new p(
-            "PLUGIN_IDENTITY",
-            `Plugin '${e.installation.id}' cannot change name from '${e.installation.spec.plugin.name}' to '${e.declaration.plugin.name}'`
-          );
-      }
+      throw this.#h(this.#a.hasCommittedPlan ? "active" : "idle"), n;
     }
-    for (const e of t)
-      if (e.kind === "install")
-        this.#t.set(e.installation.id, e.installation);
-      else if (e.kind === "update") {
-        const i = e.installation.spec, s = e.declaration.kind === "config" ? i.plugin : e.declaration.plugin, n = e.declaration.kind === "plugin" ? i.config : e.declaration.config;
-        e.installation.reconfigure(N(s, n));
-      } else this.#t.get(e.installation.id) === e.installation && this.#t.delete(e.installation.id);
-  }
-  #v(t) {
-    for (const e of t)
-      e.kind === "remove" ? (e.installation.remove(), e.installation.settleReady(), this.#y(e.installation)) : this.#c !== "active" && e.installation.deactivate();
-  }
-  #C(t, e) {
-    t.discard(e), this.#y(t);
-  }
-  #T(t) {
-    const e = this.#i.get(t);
-    if (!e) throw new TypeError(`Plugin '${t.id}' has no control handle`);
-    const i = E.get(e);
-    if (!i) throw new TypeError(`Plugin '${t.id}' has no draft control`);
-    t.attach(() => this.#m()), i.attach(
-      (s) => this.#n.change(t.group).update(e, s).commit(),
-      () => this.#n.change(t.group).remove(e).commit()
-    );
-  }
-  #y(t) {
-    const e = this.#i.get(t);
-    e && (E.get(e)?.revoke(), E.delete(e)), this.#i.delete(t);
-  }
-  #E(t) {
-    for (const e of t) e.settleReady();
   }
-  #A() {
-    return [...this.#t].map(([t, e]) => ({
-      id: t,
-      installation: e,
-      spec: e.spec
-    }));
-  }
-  #P(t) {
-    this.#t.clear();
-    for (const e of t)
-      e.installation.reconfigure(e.spec), this.#t.set(e.id, e.installation);
-  }
-  #S(t) {
+  #d(t) {
     try {
-      this.#a(t);
+      this.#n(t);
     } catch (e) {
       try {
-        this.#r.error(
-          new AggregateError([t, e], "Application error reporter failed")
+        this.#i.error(
+          new AggregateError([t, e], "Host error reporter failed")
         );
       } catch {
       }
     }
   }
-  #u(t) {
-    this.#c = t, this.#m();
+  #h(t) {
+    this.#r = t, this.#p();
   }
-  #m() {
-    this.#s.publish(this.#c, this.#t.values(), this.#n.nodes());
+  #p() {
+    this.#e.publish(this.#r, this.#t.values(), this.#s.nodes());
   }
 }
-function Mt(r) {
-  if (!r || typeof r != "object") return !1;
-  const t = r;
-  return [t.debug, t.info, t.warn, t.error].every(
-    (e) => typeof e == "function"
-  );
-}
-function Ut(r) {
-  return new Nt(r);
+function ce(r) {
+  return new re(r);
 }
 export {
-  H as ConfigValidationError,
-  p as DougongError,
-  C as ReadonlyMapSnapshot,
-  zt as SerialQueue,
-  U as SnapshotPublisher,
-  Ut as createApp,
-  q as definePlugin,
-  Dt as event,
-  Gt as extension,
-  Vt as optional,
-  qt as service
+  it as ConfigValidationError,
+  u as DougongError,
+  O as ReadonlyMapSnapshot,
+  ee as SerialQueue,
+  q as SnapshotPublisher,
+  T as assertPlainRecord,
+  ce as createHost,
+  Vt as definePlugin,
+  oe as event,
+  ae as extensionPoint,
+  Y as isCancellationReason,
+  $t as isLogger,
+  he as optional,
+  ne as service
 };