@dxos/app-framework 0.8.4-main.422d1c7879 → 0.8.4-main.51f1e5ca51

package/dist/lib/browser/{capability-KSNT34SN.mjs → capability-FU2RXY4V.mjs}

@@ -1,20 +1,20 @@
-import "./chunk-T3Y4AEKX.mjs";
+import "./chunk-5GNRIKCE.mjs";
 import {
   capabilities_exports
-} from "./chunk-JKWMHZP6.mjs";
+} from "./chunk-2F5RSEOR.mjs";
 import {
   activation_events_exports
-} from "./chunk-I34GF4NG.mjs";
-import "./chunk-RFSO3JRG.mjs";
-import "./chunk-Y543KCO7.mjs";
-import "./chunk-7B6AJK4D.mjs";
-import "./chunk-QSXYHXCE.mjs";
+} from "./chunk-45CHLTBV.mjs";
+import "./chunk-G7SDBRKH.mjs";
+import "./chunk-UNGY3SDY.mjs";
+import "./chunk-2FUSTGNO.mjs";
+import "./chunk-66IXTIVK.mjs";
 import {
   plugin_exports
-} from "./chunk-GDWTW4ZW.mjs";
+} from "./chunk-GUJTQEK7.mjs";
 import {
   capability_exports
-} from "./chunk-2CKCJ6PN.mjs";
+} from "./chunk-TZGMTFCT.mjs";
 import "./chunk-J5LGTIGS.mjs";
 
 // src/plugin-runtime/capability.ts
@@ -35,4 +35,4 @@ var capability_default = capability_exports.makeModule(Effect.fnUntraced(functio
 export {
   capability_default as default
 };
-//# sourceMappingURL=capability-KSNT34SN.mjs.map
+//# sourceMappingURL=capability-FU2RXY4V.mjs.map

package/dist/lib/browser/{capability-DOMNPRJP.mjs → capability-UZNIX34E.mjs}

@@ -1,20 +1,20 @@
 import {
   make,
   make2
-} from "./chunk-F7FW2RK2.mjs";
-import "./chunk-T3Y4AEKX.mjs";
+} from "./chunk-EV4VOV4X.mjs";
+import "./chunk-5GNRIKCE.mjs";
 import {
   capabilities_exports
-} from "./chunk-JKWMHZP6.mjs";
-import "./chunk-I34GF4NG.mjs";
-import "./chunk-RFSO3JRG.mjs";
-import "./chunk-Y543KCO7.mjs";
-import "./chunk-7B6AJK4D.mjs";
-import "./chunk-QSXYHXCE.mjs";
-import "./chunk-GDWTW4ZW.mjs";
+} from "./chunk-2F5RSEOR.mjs";
+import "./chunk-45CHLTBV.mjs";
+import "./chunk-G7SDBRKH.mjs";
+import "./chunk-UNGY3SDY.mjs";
+import "./chunk-2FUSTGNO.mjs";
+import "./chunk-66IXTIVK.mjs";
+import "./chunk-GUJTQEK7.mjs";
 import {
   capability_exports
-} from "./chunk-2CKCJ6PN.mjs";
+} from "./chunk-TZGMTFCT.mjs";
 import "./chunk-J5LGTIGS.mjs";
 
 // src/plugin-operation/history/capability.ts
@@ -32,4 +32,4 @@ var capability_default = capability_exports.makeModule(Effect.fnUntraced(functio
 export {
   capability_default as default
 };
-//# sourceMappingURL=capability-DOMNPRJP.mjs.map
+//# sourceMappingURL=capability-UZNIX34E.mjs.map

package/dist/lib/browser/capability-UZNIX34E.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/plugin-operation/history/capability.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { type OperationInvoker } from '@dxos/compute';\n\nimport { Capabilities } from '../../common';\nimport { Capability } from '../../core';\nimport * as HistoryTracker from './history-tracker';\nimport * as UndoRegistry from './undo-registry';\n\n//\n// Capability Module - contributes both UndoRegistry and HistoryTracker.\n//\n\nexport default Capability.makeModule(\n  Effect.fnUntraced(function* () {\n    // Get the context for synchronous access in callbacks.\n    const capabilities = yield* Capability.Service;\n\n    // Create UndoRegistry.\n    const undoRegistry = UndoRegistry.make(() => capabilities.getAll(Capabilities.UndoMapping).flat());\n\n    // Create HistoryTracker (depends on UndoRegistry and OperationInvoker).\n    const invoker = yield* Capability.get(Capabilities.OperationInvoker);\n    // Cast to internal type - the factory always returns OperationInvokerInternal.\n    const historyTracker = HistoryTracker.make(invoker as OperationInvoker.OperationInvokerInternal, undoRegistry);\n\n    return [\n      Capability.contributes(Capabilities.UndoRegistry, undoRegistry),\n      Capability.contributes(Capabilities.HistoryTracker, historyTracker),\n    ];\n  }),\n);\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAIA,YAAYA,YAAY;AAaxB,IAAA,qBAAeC,mBAAWC,WACjBC,kBAAW,aAAA;AAEhB,QAAMC,eAAe,OAAOH,mBAAWI;AAGvC,QAAMC,eAA4BC,KAAK,MAAMH,aAAaI,OAAOC,qBAAaC,WAAW,EAAEC,KAAI,CAAA;AAG/F,QAAMC,UAAU,OAAOX,mBAAWY,IAAIJ,qBAAaK,gBAAgB;AAEnE,QAAMC,iBAAgCR,MAAKK,SAAsDN,YAAAA;AAEjG,SAAO;IACLL,mBAAWe,YAAYP,qBAAaQ,cAAcX,YAAAA;IAClDL,mBAAWe,YAAYP,qBAAaS,gBAAgBH,cAAAA;;AAExD,CAAA,CAAA;",
+  "names": ["Effect", "Capability", "makeModule", "fnUntraced", "capabilities", "Service", "undoRegistry", "make", "getAll", "Capabilities", "UndoMapping", "flat", "invoker", "get", "OperationInvoker", "historyTracker", "contributes", "UndoRegistry", "HistoryTracker"]
+}

package/dist/lib/browser/{chunk-JKWMHZP6.mjs → chunk-2F5RSEOR.mjs}

@@ -1,6 +1,6 @@
 import {
   capability_exports
-} from "./chunk-2CKCJ6PN.mjs";
+} from "./chunk-TZGMTFCT.mjs";
 import {
   __export
 } from "./chunk-J5LGTIGS.mjs";
@@ -77,4 +77,4 @@ export {
   subscribeAtom,
   capabilities_exports
 };
-//# sourceMappingURL=chunk-JKWMHZP6.mjs.map
+//# sourceMappingURL=chunk-2F5RSEOR.mjs.map

package/dist/lib/browser/chunk-2F5RSEOR.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/common/capabilities.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { type Atom, type Registry } from '@effect-atom/atom-react';\nimport type * as Command$ from '@effect/cli/Command';\nimport * as Effect from 'effect/Effect';\nimport type * as Layer$ from 'effect/Layer';\nimport type * as ManagedRuntime$ from 'effect/ManagedRuntime';\nimport type { FC, PropsWithChildren } from 'react';\n\nimport type { OperationInvoker as OperationInvoker$, OperationHandlerSet } from '@dxos/compute';\n\nimport { Capability as Capability$, type PluginManager as PluginManager$ } from '../core';\nimport type {\n  HistoryTracker as HistoryTracker$,\n  UndoMapping as UndoMapping$,\n  UndoRegistry as UndoRegistry$,\n} from '../plugin-operation';\nimport type { Surface } from '../ui';\n\n/**\n * Null capability.\n * @category Capability\n */\nexport const Null = Capability$.make<null>('org.dxos.app-framework.capability.null');\n\n/**\n * @category Capability\n */\nexport const PluginManager = Capability$.make<PluginManager$.PluginManager>(\n  'org.dxos.app-framework.capability.plugin-manager',\n);\n\n/**\n * @category Capability\n */\nexport const AtomRegistry = Capability$.make<Registry.Registry>('org.dxos.app-framework.capability.atom-registry');\n\nexport type ReactContext = Readonly<{\n  id: string;\n  dependsOn?: string[];\n  context: FC<PropsWithChildren>;\n}>;\n\n/**\n * @category Capability\n */\nexport const ReactContext = Capability$.make<ReactContext>('org.dxos.app-framework.capability.react-context');\n\nexport type ReactRoot = Readonly<{ id: string; root: FC<PropsWithChildren> }>;\n\n/**\n * @category Capability\n */\nexport const ReactRoot = Capability$.make<ReactRoot>('org.dxos.app-framework.capability.react-root');\n\n/**\n * Surface definitions that can be either React components or Web Components.\n */\nexport type ReactSurface = Surface.Definition | readonly Surface.Definition[];\n\n/**\n * @category Capability\n */\nexport const ReactSurface = Capability$.make<ReactSurface>('org.dxos.app-framework.common.react-surface');\n\nexport type AnyCommand = Command$.Command<any, any, any, any>;\n\n/**\n * @category Capability\n */\nexport const Command = Capability$.make<AnyCommand>('org.dxos.app-framework.capability.command');\n\n/**\n * @category Capability\n */\nexport const Layer = Capability$.make<Layer$.Layer<any, any, any>>('org.dxos.app-framework.capability.layer');\n\nexport type ManagedRuntime = ManagedRuntime$.ManagedRuntime<any, any>;\n\n/**\n * @category Capability\n */\nexport const ManagedRuntime = Capability$.make<ManagedRuntime>('org.dxos.app-framework.capability.managed-runtime');\n\n//\n// Operation System Capabilities\n//\n\nexport const OperationHandler = Capability$.make<OperationHandlerSet.OperationHandlerSet>(\n  'org.dxos.app-framework.capability.operation-handler',\n);\n\nexport type UndoMapping = UndoMapping$.UndoMapping;\n\n/**\n * Undo mapping registration - contributed by plugins.\n * @category Capability\n */\nexport const UndoMapping = Capability$.make<UndoMapping[]>('org.dxos.app-framework.capability.undo-mapping');\n\nexport type OperationInvoker = OperationInvoker$.OperationInvoker;\n\n/**\n * Operation invoker - provided by OperationPlugin.\n * @category Capability\n */\nexport const OperationInvoker = Capability$.make<OperationInvoker>(\n  'org.dxos.app-framework.capability.operation-invoker',\n);\n\nexport type UndoRegistry = UndoRegistry$.UndoRegistry;\n\n/**\n * Undo registry - provided by OperationPlugin.\n * @category Capability\n */\nexport const UndoRegistry = Capability$.make<UndoRegistry>('org.dxos.app-framework.capability.undo-registry');\n\nexport type HistoryTracker = HistoryTracker$.HistoryTracker;\n\n/**\n * History tracker - provided by OperationPlugin.\n * @category Capability\n */\nexport const HistoryTracker = Capability$.make<HistoryTracker>('org.dxos.app-framework.capability.history-tracker');\n\n//\n// Atom Capability Helpers\n//\n\n/**\n * Get the current value of an atom capability.\n * @example const settings = yield* Capabilities.getAtomValue(ThreadCapabilities.Settings);\n */\nexport const getAtomValue = <T>(\n  atomCapability: Capability$.InterfaceDef<Atom.Atom<T>>,\n): Effect.Effect<T, Error, Capability$.Service> =>\n  Effect.gen(function* () {\n    const registry = yield* Capability$.get(AtomRegistry);\n    const atom = yield* Capability$.get(atomCapability);\n    return registry.get(atom);\n  });\n\n/**\n * Update an atom capability value (requires writable atom).\n * @example yield* Capabilities.updateAtomValue(ThreadCapabilities.Settings, (s) => ({ ...s, foo: true }));\n */\nexport const updateAtomValue = <T>(\n  atomCapability: Capability$.InterfaceDef<Atom.Writable<T>>,\n  fn: (current: T) => T,\n): Effect.Effect<void, Error, Capability$.Service> =>\n  Effect.gen(function* () {\n    const registry = yield* Capability$.get(AtomRegistry);\n    const atom = yield* Capability$.get(atomCapability);\n    registry.set(atom, fn(registry.get(atom)));\n  });\n\n/**\n * Subscribe to an atom capability.\n * @example const unsubscribe = yield* Capabilities.subscribeAtom(ThreadCapabilities.Settings, (value) => ...);\n */\nexport const subscribeAtom = <T>(\n  atomCapability: Capability$.InterfaceDef<Atom.Atom<T>>,\n  callback: (value: T) => void,\n): Effect.Effect<() => void, Error, Capability$.Service> =>\n  Effect.gen(function* () {\n    const registry = yield* Capability$.get(AtomRegistry);\n    const atom = yield* Capability$.get(atomCapability);\n    return registry.subscribe(atom, () => callback(registry.get(atom)));\n  });\n"],
+  "mappings": ";;;;;;;;AAAA;;;;;;;;;;;;;;;;;;;;AAMA,YAAYA,YAAY;AAmBjB,IAAMC,OAAOC,mBAAYC,KAAW,wCAAA;AAKpC,IAAMC,gBAAgBF,mBAAYC,KACvC,kDAAA;AAMK,IAAME,eAAeH,mBAAYC,KAAwB,iDAAA;AAWzD,IAAMG,eAAeJ,mBAAYC,KAAmB,iDAAA;AAOpD,IAAMI,YAAYL,mBAAYC,KAAgB,8CAAA;AAU9C,IAAMK,eAAeN,mBAAYC,KAAmB,6CAAA;AAOpD,IAAMM,UAAUP,mBAAYC,KAAiB,2CAAA;AAK7C,IAAMO,QAAQR,mBAAYC,KAAkC,yCAAA;AAO5D,IAAMQ,iBAAiBT,mBAAYC,KAAqB,mDAAA;AAMxD,IAAMS,mBAAmBV,mBAAYC,KAC1C,qDAAA;AASK,IAAMU,cAAcX,mBAAYC,KAAoB,gDAAA;AAQpD,IAAMW,mBAAmBZ,mBAAYC,KAC1C,qDAAA;AASK,IAAMY,eAAeb,mBAAYC,KAAmB,iDAAA;AAQpD,IAAMa,iBAAiBd,mBAAYC,KAAqB,mDAAA;AAUxD,IAAMc,eAAe,CAC1BC,mBAEOC,WAAI,aAAA;AACT,QAAMC,WAAW,OAAOlB,mBAAYmB,IAAIhB,YAAAA;AACxC,QAAMiB,OAAO,OAAOpB,mBAAYmB,IAAIH,cAAAA;AACpC,SAAOE,SAASC,IAAIC,IAAAA;AACtB,CAAA;AAMK,IAAMC,kBAAkB,CAC7BL,gBACAM,OAEOL,WAAI,aAAA;AACT,QAAMC,WAAW,OAAOlB,mBAAYmB,IAAIhB,YAAAA;AACxC,QAAMiB,OAAO,OAAOpB,mBAAYmB,IAAIH,cAAAA;AACpCE,WAASK,IAAIH,MAAME,GAAGJ,SAASC,IAAIC,IAAAA,CAAAA,CAAAA;AACrC,CAAA;AAMK,IAAMI,gBAAgB,CAC3BR,gBACAS,aAEOR,WAAI,aAAA;AACT,QAAMC,WAAW,OAAOlB,mBAAYmB,IAAIhB,YAAAA;AACxC,QAAMiB,OAAO,OAAOpB,mBAAYmB,IAAIH,cAAAA;AACpC,SAAOE,SAASQ,UAAUN,MAAM,MAAMK,SAASP,SAASC,IAAIC,IAAAA,CAAAA,CAAAA;AAC9D,CAAA;",
+  "names": ["Effect", "Null", "Capability$", "make", "PluginManager", "AtomRegistry", "ReactContext", "ReactRoot", "ReactSurface", "Command", "Layer", "ManagedRuntime", "OperationHandler", "UndoMapping", "OperationInvoker", "UndoRegistry", "HistoryTracker", "getAtomValue", "atomCapability", "gen", "registry", "get", "atom", "updateAtomValue", "fn", "set", "subscribeAtom", "callback", "subscribe"]
+}

package/dist/lib/browser/{chunk-7B6AJK4D.mjs → chunk-2FUSTGNO.mjs}

@@ -2,13 +2,13 @@ import {
   eventKey,
   getEvents,
   isAllOf
-} from "./chunk-QSXYHXCE.mjs";
+} from "./chunk-66IXTIVK.mjs";
 import {
   Service as Service2
-} from "./chunk-GDWTW4ZW.mjs";
+} from "./chunk-GUJTQEK7.mjs";
 import {
   Service
-} from "./chunk-2CKCJ6PN.mjs";
+} from "./chunk-TZGMTFCT.mjs";
 import {
   __export
 } from "./chunk-J5LGTIGS.mjs";
@@ -70,15 +70,7 @@ var CapabilityManagerImpl = class {
   _capability = Atom.family((id) => {
     return Atom.make((get2) => {
       const current = get2(this._capabilities(id));
-      invariant(current.length > 0, `No capability found for ${id}`, {
-        F: __dxlog_file,
-        L: 101,
-        S: this,
-        A: [
-          "current.length > 0",
-          "`No capability found for ${id}`"
-        ]
-      });
+      invariant(current.length > 0, `No capability found for ${id}`, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 35, S: this, A: ["current.length > 0", "`No capability found for ${id}`"] });
       return current[0];
     });
   });
@@ -92,12 +84,7 @@ var CapabilityManagerImpl = class {
       log("capability already contributed, skipping", {
         id: interfaceDef.identifier,
         moduleId
-      }, {
-        F: __dxlog_file,
-        L: 122,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 46, S: this });
       return;
     }
     const entry = {
@@ -112,12 +99,7 @@ var CapabilityManagerImpl = class {
       id: interfaceDef.identifier,
       moduleId,
       count: current.length
-    }, {
-      F: __dxlog_file,
-      L: 128,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 60, S: this });
   }
   remove(interfaceDef, implementation) {
     const current = this._registry.get(this._capabilityEntries(interfaceDef.identifier));
@@ -130,21 +112,11 @@ var CapabilityManagerImpl = class {
       log("capability removed", {
         id: interfaceDef.identifier,
         count: current.length
-      }, {
-        F: __dxlog_file,
-        L: 144,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 74, S: this });
     } else {
       log.warn("capability not removed", {
         id: interfaceDef.identifier
-      }, {
-        F: __dxlog_file,
-        L: 146,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 79, S: this });
     }
   }
   atom(interfaceDef) {
@@ -155,15 +127,7 @@ var CapabilityManagerImpl = class {
   }
   get(interfaceDef) {
     const capabilities = this.getAll(interfaceDef);
-    invariant(capabilities.length > 0, `No capability found for ${interfaceDef.identifier}`, {
-      F: __dxlog_file,
-      L: 161,
-      S: this,
-      A: [
-        "capabilities.length > 0",
-        "`No capability found for ${interfaceDef.identifier}`"
-      ]
-    });
+    invariant(capabilities.length > 0, `No capability found for ${interfaceDef.identifier}`, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 93, S: this, A: ["capabilities.length > 0", "`No capability found for ${interfaceDef.identifier}`"] });
     return capabilities[0];
   }
   waitFor(interfaceDef) {
@@ -208,6 +172,7 @@ var ManagerImpl = class {
   _eventsFiredAtom;
   _pendingResetAtom;
   _pluginLoader;
+  _onRemove;
   _capabilities = /* @__PURE__ */ new Map();
   _moduleMemoMap = /* @__PURE__ */ new Map();
   _moduleSemaphores = /* @__PURE__ */ new Map();
@@ -216,12 +181,13 @@ var ManagerImpl = class {
   _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 }) {
+  constructor({ pluginLoader, plugins = [], core = plugins.map(({ meta }) => meta.id), enabled = [], registry, onRemove }) {
     this.registry = registry ?? Registry.make();
     this.capabilities = make2({
       registry: this.registry
     });
     this._pluginLoader = pluginLoader;
+    this._onRemove = onRemove;
     this._pluginsAtom = Atom2.make(plugins).pipe(Atom2.keepAlive);
     this._coreAtom = Atom2.make(core).pipe(Atom2.keepAlive);
     this._enabledAtom = Atom2.make(enabled).pipe(Atom2.keepAlive);
@@ -301,12 +267,7 @@ var ManagerImpl = class {
     return Effect2.gen(this, function* () {
       log2("add plugin", {
         id
-      }, {
-        F: __dxlog_file2,
-        L: 233,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 132, S: this });
       const plugin = yield* this._pluginLoader(id);
       this._addPlugin(plugin);
       return plugin;
@@ -320,12 +281,7 @@ var ManagerImpl = class {
     return Effect2.gen(this, function* () {
       log2("enable plugin", {
         id
-      }, {
-        F: __dxlog_file2,
-        L: 246,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 145, S: this });
       const plugin = this._getPlugin(id);
       if (!plugin) {
         return false;
@@ -342,12 +298,7 @@ var ManagerImpl = class {
         events: [
           ...this.getPendingReset()
         ]
-      }, {
-        F: __dxlog_file2,
-        L: 259,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 160, S: this });
       yield* Effect2.all(this.getPendingReset().map((event) => this.activate(event)), {
         concurrency: "unbounded"
       });
@@ -359,20 +310,23 @@ var ManagerImpl = class {
   * @param id The id of the plugin.
   */
   remove(id) {
-    log2("remove plugin", {
-      id
-    }, {
-      F: __dxlog_file2,
-      L: 274,
-      S: this,
-      C: (f, a) => f(...a)
+    return Effect2.gen(this, function* () {
+      log2("remove plugin", {
+        id
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 176, S: this });
+      const disabled = yield* this.disable(id);
+      if (!disabled) {
+        return false;
+      }
+      this._removePlugin(id);
+      if (this._onRemove) {
+        this._runForkedFiber(this._onRemove(id).pipe(Effect2.tapError((error) => Effect2.sync(() => log2.warn("plugin remove hook failed", {
+          id,
+          error
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 185, S: this }))), Effect2.ignore));
+      }
+      return true;
     });
-    const result = this.disable(id);
-    if (!result) {
-      return false;
-    }
-    this._removePlugin(id);
-    return true;
   }
   /**
   * Disables a plugin.
@@ -382,12 +336,7 @@ var ManagerImpl = class {
     return Effect2.gen(this, function* () {
       log2("disable plugin", {
         id
-      }, {
-        F: __dxlog_file2,
-        L: 290,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 198, S: this });
       if (this._get(this._coreAtom).includes(id)) {
         return false;
       }
@@ -418,22 +367,12 @@ var ManagerImpl = class {
         log2("skipping activation during shutdown", {
           key,
           ...params
-        }, {
-          F: __dxlog_file2,
-          L: 326,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 227, S: this });
         return false;
       }
       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: 334,
-        S: this,
-        C: (f, a) => f(...a)
-      }))))), Performance.addTrackEntry({
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 233, S: this }))))), Performance.addTrackEntry({
         name: typeof event === "string" ? event : eventKey(event),
         devtools: {
           dataType: "track-entry",
@@ -472,12 +411,7 @@ var ManagerImpl = class {
       const key = typeof event === "string" ? event : eventKey(event);
       log2("reset", {
         key
-      }, {
-        F: __dxlog_file2,
-        L: 380,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 270, S: this });
       const modules = this._getActiveModulesByEvent(key);
       const results = yield* Effect2.all(modules.map((module) => this._deactivateModule(module)), {
         concurrency: "unbounded"
@@ -492,12 +426,7 @@ 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: 399,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      log2("shutdown", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 287, S: this });
       yield* this._interruptInFlightActivations();
       const activeIds = [
         ...this._get(this._activeAtom)
@@ -512,12 +441,7 @@ var ManagerImpl = class {
       this._moduleMemoMap.clear();
       yield* Ref.set(this._activatingEvents, []);
       yield* Ref.set(this._activatingModules, []);
-      log2("shutdown complete", void 0, {
-        F: __dxlog_file2,
-        L: 419,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      log2("shutdown complete", void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 302, S: this });
       return true;
     }).pipe(Effect2.ensuring(Ref.set(this._shuttingDown, false))));
   }
@@ -562,12 +486,7 @@ var ManagerImpl = class {
     if (pendingReset.length > 0) {
       log2("pending reset", {
         events: pendingReset
-      }, {
-        F: __dxlog_file2,
-        L: 481,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 345, S: this });
       this._update(this._pendingResetAtom, (current) => [
         ...current,
         ...pendingReset
@@ -600,18 +519,24 @@ var ManagerImpl = class {
   _untrackFiber(ref, fiber) {
     return Ref.update(ref, (fibers) => fibers.filter((trackedFiber) => trackedFiber !== fiber));
   }
+  /**
+  * Spawns an effect on the default runtime and registers the resulting fiber in
+  * `_inFlightFibers` so {@link shutdown} can interrupt it. Used from sync entry
+  * points like {@link remove} where there is no enclosing Effect to fork from;
+  * inside an Effect chain prefer the existing track/await/untrack pattern.
+  */
+  _runForkedFiber(effect) {
+    const fiber = Effect2.runFork(effect);
+    Effect2.runSync(this._trackFiber(this._inFlightFibers, fiber));
+    Effect2.runFork(Fiber.await(fiber).pipe(Effect2.andThen(() => this._untrackFiber(this._inFlightFibers, fiber))));
+  }
   //
   // Registration helpers
   //
   _addPlugin(plugin) {
     log2("add plugin", {
       id: plugin.meta.id
-    }, {
-      F: __dxlog_file2,
-      L: 525,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 394, S: this });
     this._update(this._pluginsAtom, (plugins) => plugins.includes(plugin) ? plugins : [
       ...plugins,
       plugin
@@ -620,23 +545,13 @@ var ManagerImpl = class {
   _removePlugin(id) {
     log2("remove plugin", {
       id
-    }, {
-      F: __dxlog_file2,
-      L: 531,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 404, S: this });
     this._update(this._pluginsAtom, (plugins) => plugins.filter((plugin) => plugin.meta.id !== id));
   }
   _addModule(module) {
     log2("add module", {
       id: module.id
-    }, {
-      F: __dxlog_file2,
-      L: 536,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 410, S: this });
     this._update(this._modulesAtom, (modules) => modules.includes(module) ? modules : [
       ...modules,
       module
@@ -645,12 +560,7 @@ var ManagerImpl = class {
   _removeModule(id) {
     log2("remove module", {
       id
-    }, {
-      F: __dxlog_file2,
-      L: 542,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 420, S: this });
     this._update(this._modulesAtom, (modules) => modules.filter((module) => module.id !== id));
   }
   //
@@ -662,12 +572,7 @@ var ManagerImpl = class {
       log2("activating", {
         key,
         ...params
-      }, {
-        F: __dxlog_file2,
-        L: 557,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 431, S: this });
       yield* Ref.update(this._activatingEvents, (activating) => Array.append(activating, key));
       this._clearPendingReset(key);
       const activatingEvents = yield* this._activatingEvents;
@@ -676,12 +581,7 @@ var ManagerImpl = class {
       if (modules.length === 0) {
         log2("no modules to activate", {
           key
-        }, {
-          F: __dxlog_file2,
-          L: 565,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 441, S: this });
         if (!this._get(this._eventsFiredAtom).includes(key)) {
           this._update(this._eventsFiredAtom, (events) => [
             ...events,
@@ -703,12 +603,7 @@ var ManagerImpl = class {
       log2("activating modules", {
         key,
         modules: activatingModuleIds
-      }, {
-        F: __dxlog_file2,
-        L: 592,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 462, S: this });
       performance.mark(`event:${key}:start`);
       yield* PubSub.publish(this.activation, {
         event: key,
@@ -732,12 +627,7 @@ var ManagerImpl = class {
       });
       log2("activated", {
         key
-      }, {
-        F: __dxlog_file2,
-        L: 610,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 487, S: this });
       return true;
     }).pipe(Effect2.ensuring(Ref.update(this._activatingModules, (activating) => Array.filter(activating, (module) => !activatingModuleIds.includes(module)))));
   }
@@ -769,18 +659,13 @@ var ManagerImpl = class {
     }), 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: 689,
-      S: this,
-      C: (f, a) => f(...a)
-    }))))), Effect2.asVoid);
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 520, S: this }))))), Effect2.asVoid);
   }
   //
   // Module lifecycle helpers
   //
   _loadCapabilitiesForModules(key, modules) {
-    return Function.pipe(modules, Array.map((mod) => this._loadModule(mod)), Effect2.allWith({
+    return Function.pipe(modules, Array.map((mod) => this._loadModule(mod, key)), Effect2.allWith({
       concurrency: "unbounded"
     }), Effect2.catchAll((error) => {
       return Effect2.gen(this, function* () {
@@ -810,7 +695,14 @@ var ManagerImpl = class {
     }
     return semaphore;
   }
-  _loadModule = (module) => Effect2.gen(this, function* () {
+  // `parentEvent` is the activation event that first triggered this module
+  // load — included in `activating`/`activated` PubSub messages so subscribers
+  // (e.g. the boot loader's status listener) can associate a module with its
+  // triggering event in the trace. The same module may be referenced by
+  // multiple events, but module loads are memoized via `_moduleMemoMap`, so
+  // only the first event to need it will appear here; later events await the
+  // cached deferred without re-publishing.
+  _loadModule = (module, parentEvent) => Effect2.gen(this, function* () {
     const semaphore = this._getModuleSemaphore(module.id);
     const deferredToAwait = yield* Effect2.gen(this, function* () {
       const existing = this._moduleMemoMap.get(module.id);
@@ -821,16 +713,12 @@ var ManagerImpl = class {
       this._moduleMemoMap.set(module.id, deferred);
       const loadEffect = Effect2.gen(this, function* () {
         log2("loading module", {
-          module: module.id
-        }, {
-          F: __dxlog_file2,
-          L: 766,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+          module: module.id,
+          parentEvent
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 578, S: this });
         performance.mark(`module:${module.id}:start`);
         yield* PubSub.publish(this.activation, {
-          event: "",
+          event: parentEvent,
           state: "activating",
           module: module.id
         });
@@ -842,29 +730,20 @@ var ManagerImpl = class {
         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: "",
+          event: parentEvent,
           state: "activated",
           module: module.id
         });
         log2("loaded module", {
           module: module.id,
+          parentEvent,
           elapsed,
           failed: false
-        }, {
-          F: __dxlog_file2,
-          L: 781,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 600, S: this });
         return normalized;
       }).pipe(Effect2.withSpan("PluginManager._loadModule"), together(Effect2.sleep(Duration.seconds(10)).pipe(Effect2.andThen(Effect2.sync(() => log2.warn(`module is taking a long time to activate`, {
         module: module.id
-      }, {
-        F: __dxlog_file2,
-        L: 792,
-        S: this,
-        C: (f, a) => f(...a)
-      }))))), Performance.addTrackEntry({
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 607, S: this }))))), Performance.addTrackEntry({
         name: module.id,
         devtools: {
           dataType: "track-entry",
@@ -880,12 +759,7 @@ var ManagerImpl = class {
           error: error instanceof Error ? error.message : String(error),
           stack: error instanceof Error ? error.stack : void 0,
           isDefect: !Cause.isFailure(cause)
-        }, {
-          F: __dxlog_file2,
-          L: 813,
-          S: this,
-          C: (f, a) => f(...a)
-        });
+        }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 621, S: this });
         return Deferred2.fail(deferred, error instanceof Error ? error : new Error(String(error)));
       })));
       yield* this._trackFiber(this._inFlightFibers, fiber);
@@ -914,12 +788,7 @@ var ManagerImpl = class {
       const id = module.id;
       log2("deactivating", {
         id
-      }, {
-        F: __dxlog_file2,
-        L: 851,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 654, S: this });
       this._moduleMemoMap.delete(id);
       const capabilities = this._capabilities.get(id);
       if (capabilities) {
@@ -936,12 +805,7 @@ var ManagerImpl = class {
       }
       log2("deactivated", {
         id
-      }, {
-        F: __dxlog_file2,
-        L: 869,
-        S: this,
-        C: (f, a) => f(...a)
-      });
+      }, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 671, S: this });
       return true;
     });
   }
@@ -961,4 +825,4 @@ export {
   make5 as make,
   plugin_manager_exports
 };
-//# sourceMappingURL=chunk-7B6AJK4D.mjs.map
+//# sourceMappingURL=chunk-2FUSTGNO.mjs.map