@dxos/app-framework 0.8.4-main.937b3ca → 0.8.4-main.9be5663bfe

package/dist/lib/browser/{chunk-FMZN33N4.mjs → chunk-GX4TUNM6.mjs}

@@ -2,13 +2,13 @@ import {
   eventKey,
   getEvents,
   isAllOf
-} from "./chunk-PKQT6C53.mjs";
+} from "./chunk-QSXYHXCE.mjs";
 import {
   Service as Service2
-} from "./chunk-TCLLRCS3.mjs";
+} from "./chunk-FU4GAFUQ.mjs";
 import {
   Service
-} from "./chunk-6Y7PZV72.mjs";
+} from "./chunk-2CKCJ6PN.mjs";
 import {
   __export
 } from "./chunk-J5LGTIGS.mjs";
@@ -32,6 +32,7 @@ import * as HashSet from "effect/HashSet";
 import * as PubSub from "effect/PubSub";
 import * as Ref from "effect/Ref";
 import { runAndForwardErrors } from "@dxos/effect";
+import { Performance } from "@dxos/effect";
 import { log as log2 } from "@dxos/log";
 
 // src/core/capability-manager.ts
@@ -51,17 +52,27 @@ var CapabilityManagerImpl = class {
     return Atom.make([]).pipe(Atom.keepAlive);
   });
   _capabilities = Atom.family((id) => {
-    return Atom.make((get) => {
-      const current = get(this._capabilityEntries(id));
+    return Atom.make((get2) => {
+      const current = get2(this._capabilityEntries(id));
       return current.map((c) => c.implementation);
-    });
+    }).pipe(Atom.keepAlive);
+  });
+  _capabilitiesByModule = Atom.family((id) => {
+    return Atom.make((get2) => {
+      const entries = get2(this._capabilityEntries(id));
+      const result = {};
+      for (const entry of entries) {
+        (result[entry.moduleId] ??= []).push(entry.implementation);
+      }
+      return result;
+    }).pipe(Atom.keepAlive);
   });
   _capability = Atom.family((id) => {
-    return Atom.make((get) => {
-      const current = get(this._capabilities(id));
+    return Atom.make((get2) => {
+      const current = get2(this._capabilities(id));
       invariant(current.length > 0, `No capability found for ${id}`, {
         F: __dxlog_file,
-        L: 84,
+        L: 101,
         S: this,
         A: [
           "current.length > 0",
@@ -83,7 +94,7 @@ var CapabilityManagerImpl = class {
         moduleId
       }, {
         F: __dxlog_file,
-        L: 105,
+        L: 122,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -103,7 +114,7 @@ var CapabilityManagerImpl = class {
       count: current.length
     }, {
       F: __dxlog_file,
-      L: 111,
+      L: 128,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -121,7 +132,7 @@ var CapabilityManagerImpl = class {
         count: current.length
       }, {
         F: __dxlog_file,
-        L: 127,
+        L: 144,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -130,7 +141,7 @@ var CapabilityManagerImpl = class {
         id: interfaceDef.identifier
       }, {
         F: __dxlog_file,
-        L: 129,
+        L: 146,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -146,7 +157,7 @@ var CapabilityManagerImpl = class {
     const capabilities = this.getAll(interfaceDef);
     invariant(capabilities.length > 0, `No capability found for ${interfaceDef.identifier}`, {
       F: __dxlog_file,
-      L: 144,
+      L: 161,
       S: this,
       A: [
         "capabilities.length > 0",
@@ -172,12 +183,15 @@ var CapabilityManagerImpl = class {
       return result;
     });
   }
+  atomByModule(interfaceDef) {
+    return this._capabilitiesByModule(interfaceDef.identifier);
+  }
 };
 var make2 = (options) => new CapabilityManagerImpl(options);
 
 // src/core/plugin-manager.ts
 var __dxlog_file2 = "/__w/dxos/dxos/packages/sdk/app-framework/src/core/plugin-manager.ts";
-var ManagerTypeId = Symbol.for("@dxos/app-framework/Manager");
+var ManagerTypeId = /* @__PURE__ */ Symbol.for("@dxos/app-framework/Manager");
 var isManager = (value) => {
   return typeof value === "object" && value !== null && ManagerTypeId in value;
 };
@@ -199,6 +213,9 @@ var ManagerImpl = class {
   _moduleSemaphores = /* @__PURE__ */ new Map();
   _activatingEvents = Effect2.runSync(Ref.make([]));
   _activatingModules = Effect2.runSync(Ref.make([]));
+  _inFlightFibers = Effect2.runSync(Ref.make([]));
+  _shutdownSemaphore = Effect2.runSync(Effect2.makeSemaphore(1));
+  _shuttingDown = Effect2.runSync(Ref.make(false));
   constructor({ pluginLoader, plugins = [], core = plugins.map(({ meta }) => meta.id), enabled = [], registry }) {
     this.registry = registry ?? Registry.make();
     this.capabilities = make2({
@@ -285,13 +302,13 @@ var ManagerImpl = class {
         id
       }, {
         F: __dxlog_file2,
-        L: 210,
+        L: 227,
         S: this,
         C: (f, a) => f(...a)
       });
       const plugin = yield* this._pluginLoader(id);
       this._addPlugin(plugin);
-      return yield* this.enable(id);
+      return yield* this.enable(plugin.meta.id);
     });
   }
   /**
@@ -304,7 +321,7 @@ var ManagerImpl = class {
         id
       }, {
         F: __dxlog_file2,
-        L: 223,
+        L: 240,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -326,7 +343,7 @@ var ManagerImpl = class {
         ]
       }, {
         F: __dxlog_file2,
-        L: 236,
+        L: 253,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -345,7 +362,7 @@ var ManagerImpl = class {
       id
     }, {
       F: __dxlog_file2,
-      L: 251,
+      L: 268,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -366,7 +383,7 @@ var ManagerImpl = class {
         id
       }, {
         F: __dxlog_file2,
-        L: 267,
+        L: 284,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -396,136 +413,35 @@ var ManagerImpl = class {
   activate(event, params) {
     const key = typeof event === "string" ? event : eventKey(event);
     return Effect2.gen(this, function* () {
-      log2("activating", {
-        key,
-        ...params
-      }, {
-        F: __dxlog_file2,
-        L: 302,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      yield* Ref.update(this._activatingEvents, (activating) => Array.append(activating, key));
-      const pendingIndex = this._get(this._pendingResetAtom).findIndex((event2) => event2 === key);
-      if (pendingIndex !== -1) {
-        this._update(this._pendingResetAtom, (pending) => pending.filter((event2) => event2 !== key));
-      }
-      const activatingEvents = yield* this._activatingEvents;
-      const activatingModules = yield* this._activatingModules;
-      const modules = this._getInactiveModulesByEvent(key).filter((module) => {
-        const allOf = isAllOf(module.activatesOn);
-        if (!allOf) {
-          return true;
-        }
-        const events = getEvents(module.activatesOn).filter((event2) => eventKey(event2) !== key);
-        return events.every((event2) => this._get(this._eventsFiredAtom).includes(eventKey(event2)) || activatingEvents.includes(eventKey(event2))) && !activatingModules.includes(module.id);
-      });
-      yield* Ref.update(this._activatingModules, (activating) => Array.appendAll(activating, modules.map((module) => module.id)));
-      if (modules.length === 0) {
-        log2("no modules to activate", {
-          key
+      if (yield* this._isShuttingDown()) {
+        log2("skipping activation during shutdown", {
+          key,
+          ...params
         }, {
           F: __dxlog_file2,
-          L: 337,
+          L: 320,
           S: this,
           C: (f, a) => f(...a)
         });
-        if (!this._get(this._eventsFiredAtom).includes(key)) {
-          this._update(this._eventsFiredAtom, (events) => [
-            ...events,
-            key
-          ]);
-        }
         return false;
       }
-      log2("activating modules", {
-        key,
-        modules: modules.map((module) => module.id)
-      }, {
-        F: __dxlog_file2,
-        L: 344,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      yield* PubSub.publish(this.activation, {
-        event: key,
-        state: "activating"
-      });
-      const beforeEvents = Function.pipe(modules, Array.flatMap((module) => module.activatesBefore ?? []), HashSet.fromIterable, HashSet.toValues, Array.filter((event2) => !activatingEvents.includes(eventKey(event2))));
-      yield* Function.pipe(beforeEvents, Array.map((event2) => this.activate(event2, {
-        before: key
-      })), Effect2.allWith({
-        concurrency: "unbounded"
-      }), together(Effect2.sleep(Duration.seconds(10)).pipe(Effect2.andThen(Effect2.sync(() => log2.warn("activatesBefore is taking a long time", {
-        event: key,
-        beforeEvents: beforeEvents.map(eventKey)
-      }, {
-        F: __dxlog_file2,
-        L: 363,
-        S: this,
-        C: (f, a) => f(...a)
-      }))))));
-      const getCapabilities = yield* Function.pipe(modules, Array.map((mod) => this._loadModule(mod)), Effect2.allWith({
-        concurrency: "unbounded"
-      }), Effect2.catchAll((error) => {
-        return Effect2.gen(this, function* () {
-          yield* PubSub.publish(this.activation, {
-            event: key,
-            state: "error",
-            error
-          });
-          return yield* Effect2.fail(error);
-        });
-      }));
-      yield* Function.pipe(
-        modules,
-        Array.zip(getCapabilities),
-        Array.map(([module, capabilities]) => this._contributeCapabilities(module, capabilities)),
-        Effect2.all
-      );
-      const afterEvents = Function.pipe(modules, Array.flatMap((module) => module.activatesAfter ?? []), HashSet.fromIterable, HashSet.toValues, Array.filter((event2) => !activatingEvents.includes(eventKey(event2))));
-      yield* Function.pipe(afterEvents, Array.map((event2) => this.activate(event2, {
-        after: key
-      })), Effect2.allWith({
-        concurrency: "unbounded"
-      }), together(Effect2.sleep(Duration.seconds(10)).pipe(Effect2.andThen(Effect2.sync(() => log2.warn("activatesAfter is taking a long time", {
-        event: key,
-        afterEvents: afterEvents.map(eventKey)
-      }, {
-        F: __dxlog_file2,
-        L: 412,
-        S: this,
-        C: (f, a) => f(...a)
-      }))))));
-      yield* Ref.update(this._activatingEvents, (activating) => Array.filter(activating, (event2) => event2 !== key));
-      yield* Ref.update(this._activatingModules, (activating) => Array.filter(activating, (module) => !modules.map((module2) => module2.id).includes(module)));
-      if (!this._get(this._eventsFiredAtom).includes(key)) {
-        this._update(this._eventsFiredAtom, (events) => [
-          ...events,
-          key
-        ]);
-      }
-      yield* PubSub.publish(this.activation, {
-        event: key,
-        state: "activated"
-      });
-      log2("activated", {
-        key
+      return yield* Effect2.withFiberRuntime((fiber) => this._activateEvent(key, params, fiber).pipe(together(Effect2.sleep(Duration.seconds(15)).pipe(Effect2.andThen(Effect2.sync(() => log2.warn("event activation is taking a long time", {
+        event: key
       }, {
         F: __dxlog_file2,
-        L: 432,
+        L: 328,
         S: this,
         C: (f, a) => f(...a)
-      });
-      return true;
-    }).pipe(together(Effect2.sleep(Duration.seconds(15)).pipe(Effect2.andThen(Effect2.sync(() => log2.warn("event activation is taking a long time", {
-      event: key
-    }, {
-      F: __dxlog_file2,
-      L: 438,
-      S: this,
-      C: (f, a) => f(...a)
-    }))))));
+      }))))), Performance.addTrackEntry({
+        name: typeof event === "string" ? event : eventKey(event),
+        devtools: {
+          dataType: "track-entry",
+          track: "Event Activation",
+          trackGroup: "Composer",
+          color: "primary"
+        }
+      })));
+    });
   }
   /**
   * Deactivates all of the modules for a plugin.
@@ -557,7 +473,7 @@ var ManagerImpl = class {
         key
       }, {
         F: __dxlog_file2,
-        L: 473,
+        L: 374,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -572,6 +488,41 @@ var ManagerImpl = class {
       }
     });
   }
+  shutdown() {
+    return this._shutdownSemaphore.withPermits(1)(Effect2.gen(this, function* () {
+      yield* Ref.set(this._shuttingDown, true);
+      log2("shutdown", void 0, {
+        F: __dxlog_file2,
+        L: 393,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      yield* this._interruptInFlightActivations();
+      const activeIds = [
+        ...this._get(this._activeAtom)
+      ].reverse();
+      const allModules = this._get(this._modulesAtom);
+      const modulesToDeactivate = activeIds.map((id) => allModules.find((module) => module.id === id)).filter((module) => module != null);
+      for (const module of modulesToDeactivate) {
+        yield* this._deactivateModule(module);
+      }
+      this._set(this._eventsFiredAtom, []);
+      this._set(this._pendingResetAtom, []);
+      this._moduleMemoMap.clear();
+      yield* Ref.set(this._activatingEvents, []);
+      yield* Ref.set(this._activatingModules, []);
+      log2("shutdown complete", void 0, {
+        F: __dxlog_file2,
+        L: 413,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return true;
+    }).pipe(Effect2.ensuring(Ref.set(this._shuttingDown, false))));
+  }
+  //
+  // State helpers
+  //
   _get(atom) {
     return this.registry.get(atom);
   }
@@ -581,12 +532,82 @@ var ManagerImpl = class {
   _update(atom, updater) {
     this._set(atom, updater(this._get(atom)));
   }
+  _isShuttingDown() {
+    return Ref.get(this._shuttingDown);
+  }
+  _getPlugin(id) {
+    return this._get(this._pluginsAtom).find((plugin) => plugin.meta.id === id);
+  }
+  _getActiveModules() {
+    const active = this._get(this._activeAtom);
+    return this._get(this._modulesAtom).filter((module) => active.includes(module.id));
+  }
+  _getInactiveModules() {
+    const active = this._get(this._activeAtom);
+    return this._get(this._modulesAtom).filter((module) => !active.includes(module.id));
+  }
+  _getActiveModulesByEvent(key) {
+    return this._getActiveModules().filter((module) => getEvents(module.activatesOn).map(eventKey).includes(key));
+  }
+  _getInactiveModulesByEvent(key) {
+    return this._getInactiveModules().filter((module) => getEvents(module.activatesOn).map(eventKey).includes(key));
+  }
+  _setPendingResetByModule(module) {
+    const activationEvents = getEvents(module.activatesOn).map(eventKey).filter((key) => this._get(this._eventsFiredAtom).includes(key));
+    const pendingReset = Array.fromIterable(new Set(activationEvents)).filter((event) => {
+      const pending = this._get(this._pendingResetAtom);
+      return !pending.includes(event);
+    });
+    if (pendingReset.length > 0) {
+      log2("pending reset", {
+        events: pendingReset
+      }, {
+        F: __dxlog_file2,
+        L: 475,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this._update(this._pendingResetAtom, (current) => [
+        ...current,
+        ...pendingReset
+      ]);
+    }
+  }
+  _clearPendingReset(key) {
+    const pendingIndex = this._get(this._pendingResetAtom).findIndex((event) => event === key);
+    if (pendingIndex !== -1) {
+      this._update(this._pendingResetAtom, (pending) => pending.filter((event) => event !== key));
+    }
+  }
+  //
+  // Fiber helpers
+  //
+  _interruptInFlightActivations() {
+    return Effect2.gen(this, function* () {
+      const inFlightFibers = yield* Ref.get(this._inFlightFibers);
+      yield* Effect2.forEach(inFlightFibers, (fiber) => Fiber.interrupt(fiber), {
+        concurrency: "unbounded"
+      });
+    });
+  }
+  _trackFiber(ref, fiber) {
+    return Ref.update(ref, (fibers) => [
+      ...fibers,
+      fiber
+    ]);
+  }
+  _untrackFiber(ref, fiber) {
+    return Ref.update(ref, (fibers) => fibers.filter((trackedFiber) => trackedFiber !== fiber));
+  }
+  //
+  // Registration helpers
+  //
   _addPlugin(plugin) {
     log2("add plugin", {
       id: plugin.meta.id
     }, {
       F: __dxlog_file2,
-      L: 501,
+      L: 519,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -600,7 +621,7 @@ var ManagerImpl = class {
       id
     }, {
       F: __dxlog_file2,
-      L: 507,
+      L: 525,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -611,7 +632,7 @@ var ManagerImpl = class {
       id: module.id
     }, {
       F: __dxlog_file2,
-      L: 512,
+      L: 530,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -625,49 +646,160 @@ var ManagerImpl = class {
       id
     }, {
       F: __dxlog_file2,
-      L: 518,
+      L: 536,
       S: this,
       C: (f, a) => f(...a)
     });
     this._update(this._modulesAtom, (modules) => modules.filter((module) => module.id !== id));
   }
-  _getPlugin(id) {
-    return this._get(this._pluginsAtom).find((plugin) => plugin.meta.id === id);
-  }
-  _getActiveModules() {
-    const active = this._get(this._activeAtom);
-    return this._get(this._modulesAtom).filter((module) => active.includes(module.id));
-  }
-  _getInactiveModules() {
-    const active = this._get(this._activeAtom);
-    return this._get(this._modulesAtom).filter((module) => !active.includes(module.id));
-  }
-  _getActiveModulesByEvent(key) {
-    return this._getActiveModules().filter((module) => getEvents(module.activatesOn).map(eventKey).includes(key));
-  }
-  _getInactiveModulesByEvent(key) {
-    return this._getInactiveModules().filter((module) => getEvents(module.activatesOn).map(eventKey).includes(key));
-  }
-  _setPendingResetByModule(module) {
-    const activationEvents = getEvents(module.activatesOn).map(eventKey).filter((key) => this._get(this._eventsFiredAtom).includes(key));
-    const pendingReset = Array.fromIterable(new Set(activationEvents)).filter((event) => {
-      const pending = this._get(this._pendingResetAtom);
-      return !pending.includes(event);
-    });
-    if (pendingReset.length > 0) {
-      log2("pending reset", {
-        events: pendingReset
+  //
+  // Activation helpers
+  //
+  _activateEvent(key, params, fiber) {
+    return Effect2.gen(this, function* () {
+      yield* this._trackFiber(this._inFlightFibers, fiber);
+      log2("activating", {
+        key,
+        ...params
       }, {
         F: __dxlog_file2,
-        L: 558,
+        L: 551,
         S: this,
         C: (f, a) => f(...a)
       });
-      this._update(this._pendingResetAtom, (current) => [
-        ...current,
-        ...pendingReset
-      ]);
-    }
+      yield* Ref.update(this._activatingEvents, (activating) => Array.append(activating, key));
+      this._clearPendingReset(key);
+      const activatingEvents = yield* this._activatingEvents;
+      const activatingModules = yield* this._activatingModules;
+      const modules = this._getModulesForActivation(key, activatingEvents, activatingModules);
+      if (modules.length === 0) {
+        log2("no modules to activate", {
+          key
+        }, {
+          F: __dxlog_file2,
+          L: 559,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        if (!this._get(this._eventsFiredAtom).includes(key)) {
+          this._update(this._eventsFiredAtom, (events) => [
+            ...events,
+            key
+          ]);
+        }
+        return false;
+      }
+      return yield* this._activateModulesForEvent(key, modules, activatingEvents);
+    }).pipe(Effect2.ensuring(Effect2.all([
+      this._untrackFiber(this._inFlightFibers, fiber),
+      Ref.update(this._activatingEvents, (activating) => Array.filter(activating, (event) => event !== key))
+    ])));
+  }
+  _activateModulesForEvent(key, modules, activatingEvents) {
+    const activatingModuleIds = modules.map((module) => module.id);
+    return Effect2.gen(this, function* () {
+      yield* Ref.update(this._activatingModules, (activating) => Array.appendAll(activating, activatingModuleIds));
+      log2("activating modules", {
+        key,
+        modules: activatingModuleIds
+      }, {
+        F: __dxlog_file2,
+        L: 586,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      performance.mark(`event:${key}:start`);
+      yield* PubSub.publish(this.activation, {
+        event: key,
+        state: "activating"
+      });
+      yield* this._activateRelatedEvents(key, this._getBeforeEvents(modules, activatingEvents), "before");
+      const capabilities = yield* this._loadCapabilitiesForModules(key, modules);
+      yield* this._contributeCapabilitiesForModules(modules, capabilities);
+      yield* this._activateRelatedEvents(key, this._getAfterEvents(modules, activatingEvents), "after");
+      if (!this._get(this._eventsFiredAtom).includes(key)) {
+        this._update(this._eventsFiredAtom, (events) => [
+          ...events,
+          key
+        ]);
+      }
+      performance.mark(`event:${key}:end`);
+      performance.measure(`event:${key}`, `event:${key}:start`, `event:${key}:end`);
+      yield* PubSub.publish(this.activation, {
+        event: key,
+        state: "activated"
+      });
+      log2("activated", {
+        key
+      }, {
+        F: __dxlog_file2,
+        L: 604,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return true;
+    }).pipe(Effect2.ensuring(Ref.update(this._activatingModules, (activating) => Array.filter(activating, (module) => !activatingModuleIds.includes(module)))));
+  }
+  _getModulesForActivation(key, activatingEvents, activatingModules) {
+    return this._getInactiveModulesByEvent(key).filter((module) => {
+      const allOf = isAllOf(module.activatesOn);
+      if (!allOf) {
+        return true;
+      }
+      const events = getEvents(module.activatesOn).filter((event) => eventKey(event) !== key);
+      return events.every((event) => this._get(this._eventsFiredAtom).includes(eventKey(event)) || activatingEvents.includes(eventKey(event))) && !activatingModules.includes(module.id);
+    });
+  }
+  _getBeforeEvents(modules, activatingEvents) {
+    return Function.pipe(modules, Array.flatMap((module) => module.activatesBefore ?? []), HashSet.fromIterable, HashSet.toValues, Array.filter((event) => !activatingEvents.includes(eventKey(event))));
+  }
+  _getAfterEvents(modules, activatingEvents) {
+    return Function.pipe(modules, Array.flatMap((module) => module.activatesAfter ?? []), HashSet.fromIterable, HashSet.toValues, Array.filter((event) => !activatingEvents.includes(eventKey(event))));
+  }
+  _activateRelatedEvents(key, events, phase) {
+    const logLabel = phase === "before" ? "activatesBefore" : "activatesAfter";
+    const eventKey2 = phase === "before" ? "beforeEvents" : "afterEvents";
+    return Function.pipe(events, Array.map((event) => this.activate(event, phase === "before" ? {
+      before: key
+    } : {
+      after: key
+    })), Effect2.allWith({
+      concurrency: "unbounded"
+    }), together(Effect2.sleep(Duration.seconds(10)).pipe(Effect2.andThen(Effect2.sync(() => log2.warn(`${logLabel} is taking a long time`, {
+      event: key,
+      [eventKey2]: events.map(eventKey)
+    }, {
+      F: __dxlog_file2,
+      L: 683,
+      S: this,
+      C: (f, a) => f(...a)
+    }))))), Effect2.asVoid);
+  }
+  //
+  // Module lifecycle helpers
+  //
+  _loadCapabilitiesForModules(key, modules) {
+    return Function.pipe(modules, Array.map((mod) => this._loadModule(mod)), Effect2.allWith({
+      concurrency: "unbounded"
+    }), Effect2.catchAll((error) => {
+      return Effect2.gen(this, function* () {
+        yield* PubSub.publish(this.activation, {
+          event: key,
+          state: "error",
+          error
+        });
+        return yield* Effect2.fail(error);
+      });
+    }));
+  }
+  _contributeCapabilitiesForModules(modules, capabilities) {
+    return Function.pipe(
+      modules,
+      Array.zip(capabilities),
+      Array.map(([module, capabilitySet]) => this._contributeCapabilities(module, capabilitySet)),
+      Effect2.all,
+      Effect2.asVoid
+    );
   }
   _getModuleSemaphore(moduleId) {
     let semaphore = this._moduleSemaphores.get(moduleId);
@@ -691,21 +823,35 @@ var ManagerImpl = class {
           module: module.id
         }, {
           F: __dxlog_file2,
-          L: 588,
+          L: 756,
           S: this,
           C: (f, a) => f(...a)
         });
+        performance.mark(`module:${module.id}:start`);
+        yield* PubSub.publish(this.activation, {
+          event: "",
+          state: "activating",
+          module: module.id
+        });
         const [duration, capabilities] = yield* module.activate().pipe(Effect2.provideService(Service, this.capabilities), Effect2.provideService(Service2, this), Effect2.timed);
         const normalized = capabilities == null ? [] : Array.isArray(capabilities) ? capabilities : [
           capabilities
         ];
+        const elapsed = Duration.toMillis(duration);
+        performance.mark(`module:${module.id}:end`);
+        performance.measure(`module:${module.id}`, `module:${module.id}:start`, `module:${module.id}:end`);
+        yield* PubSub.publish(this.activation, {
+          event: "",
+          state: "activated",
+          module: module.id
+        });
         log2("loaded module", {
           module: module.id,
-          elapsed: Duration.toMillis(duration),
+          elapsed,
           failed: false
         }, {
           F: __dxlog_file2,
-          L: 597,
+          L: 771,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -714,11 +860,19 @@ var ManagerImpl = class {
         module: module.id
       }, {
         F: __dxlog_file2,
-        L: 608,
+        L: 782,
         S: this,
         C: (f, a) => f(...a)
-      }))))));
-      yield* Effect2.forkDaemon(loadEffect.pipe(Effect2.tap((result) => Deferred2.succeed(deferred, result)), Effect2.catchAllCause((cause) => {
+      }))))), Performance.addTrackEntry({
+        name: module.id,
+        devtools: {
+          dataType: "track-entry",
+          track: "Module Activation",
+          trackGroup: "Composer",
+          color: "primary"
+        }
+      }));
+      const fiber = yield* Effect2.forkDaemon(loadEffect.pipe(Effect2.tap((result) => Deferred2.succeed(deferred, result)), Effect2.catchAllCause((cause) => {
         const error = Cause.squash(cause);
         log2.error("module failed to activate", {
           module: module.id,
@@ -727,12 +881,14 @@ var ManagerImpl = class {
           isDefect: !Cause.isFailure(cause)
         }, {
           F: __dxlog_file2,
-          L: 620,
+          L: 803,
           S: this,
           C: (f, a) => f(...a)
         });
         return Deferred2.fail(deferred, error instanceof Error ? error : new Error(String(error)));
       })));
+      yield* this._trackFiber(this._inFlightFibers, fiber);
+      yield* Effect2.forkDaemon(Fiber.await(fiber).pipe(Effect2.andThen(() => this._untrackFiber(this._inFlightFibers, fiber))));
       return deferred;
     }).pipe(semaphore.withPermits(1));
     return yield* Deferred2.await(deferredToAwait);
@@ -759,7 +915,7 @@ var ManagerImpl = class {
         id
       }, {
         F: __dxlog_file2,
-        L: 654,
+        L: 841,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -781,7 +937,7 @@ var ManagerImpl = class {
         id
       }, {
         F: __dxlog_file2,
-        L: 672,
+        L: 859,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -804,4 +960,4 @@ export {
   make5 as make,
   plugin_manager_exports
 };
-//# sourceMappingURL=chunk-FMZN33N4.mjs.map
+//# sourceMappingURL=chunk-GX4TUNM6.mjs.map