@dxos/app-framework 0.8.4-main.406dc2a → 0.8.4-main.548089c

package/dist/lib/browser/{app-graph-builder-LG4RG2LM.mjs → app-graph-builder-JPUFNED5.mjs}

@@ -8,10 +8,10 @@ import {
   Capabilities,
   contributes,
   createIntent
-} from "./chunk-2GRQ4QXA.mjs";
+} from "./chunk-LVSO2N4X.mjs";
 
 // src/plugin-settings/app-graph-builder.ts
-import { Rx } from "@effect-rx/rx-react";
+import { Atom } from "@effect-atom/atom-react";
 import * as Function from "effect/Function";
 import * as Option from "effect/Option";
 import { ROOT_ID, createExtension } from "@dxos/app-graph";
@@ -19,7 +19,7 @@ import { isNonNullable } from "@dxos/util";
 var app_graph_builder_default = ((context) => contributes(Capabilities.AppGraphBuilder, [
   createExtension({
     id: `${meta.id}/action`,
-    actions: (node) => Rx.make((get) => Function.pipe(get(node), Option.flatMap((node2) => node2.id === ROOT_ID ? Option.some(node2) : Option.none()), Option.map(() => [
+    actions: (node) => Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => node2.id === ROOT_ID ? Option.some(node2) : Option.none()), Option.map(() => [
       {
         id: meta.id,
         data: async () => {
@@ -45,7 +45,7 @@ var app_graph_builder_default = ((context) => contributes(Capabilities.AppGraphB
   }),
   createExtension({
     id: `${meta.id}/core`,
-    connector: (node) => Rx.make((get) => Function.pipe(get(node), Option.flatMap((node2) => node2.id === ROOT_ID ? Option.some(node2) : Option.none()), Option.map(() => [
+    connector: (node) => Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => node2.id === ROOT_ID ? Option.some(node2) : Option.none()), Option.map(() => [
       {
         id: SETTINGS_ID,
         type: meta.id,
@@ -66,7 +66,7 @@ var app_graph_builder_default = ((context) => contributes(Capabilities.AppGraphB
   }),
   createExtension({
     id: `${meta.id}/core-plugins`,
-    connector: (node) => Rx.make((get) => Function.pipe(get(node), Option.flatMap((node2) => node2.id !== SETTINGS_ID ? Option.none() : Option.some(node2)), Option.map(() => {
+    connector: (node) => Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => node2.id !== SETTINGS_ID ? Option.none() : Option.some(node2)), Option.map(() => {
       const manager = get(context.capability(Capabilities.PluginManager));
       const [settingsStore] = get(context.capabilities(Capabilities.SettingsStore));
       return [
@@ -108,7 +108,7 @@ var app_graph_builder_default = ((context) => contributes(Capabilities.AppGraphB
   }),
   createExtension({
     id: `${meta.id}/custom-plugins`,
-    connector: (node) => Rx.make((get) => Function.pipe(get(node), Option.flatMap((node2) => node2.id !== `${SETTINGS_KEY}:custom-plugins` ? Option.none() : Option.some(node2)), Option.map(() => {
+    connector: (node) => Atom.make((get) => Function.pipe(get(node), Option.flatMap((node2) => node2.id !== `${SETTINGS_KEY}:custom-plugins` ? Option.none() : Option.some(node2)), Option.map(() => {
       const manager = get(context.capability(Capabilities.PluginManager));
       const [settingsStore] = get(context.capabilities(Capabilities.SettingsStore));
       return manager.plugins.filter((plugin) => !manager.core.includes(plugin.meta.id)).map((plugin) => {
@@ -135,4 +135,4 @@ var app_graph_builder_default = ((context) => contributes(Capabilities.AppGraphB
 export {
   app_graph_builder_default as default
 };
-//# sourceMappingURL=app-graph-builder-LG4RG2LM.mjs.map
+//# sourceMappingURL=app-graph-builder-JPUFNED5.mjs.map

package/dist/lib/browser/app-graph-builder-JPUFNED5.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/plugin-settings/app-graph-builder.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { Atom } from '@effect-atom/atom-react';\nimport * as Function from 'effect/Function';\nimport * as Option from 'effect/Option';\n\nimport { ROOT_ID, createExtension } from '@dxos/app-graph';\nimport { type SettingsStore, type SettingsValue } from '@dxos/local-storage';\nimport { isNonNullable } from '@dxos/util';\n\nimport { Capabilities } from '../common';\nimport { type PluginContext, type PluginMeta, contributes } from '../core';\nimport { createIntent } from '../plugin-intent';\n\nimport { SETTINGS_ID, SETTINGS_KEY, SettingsAction } from './actions';\nimport { meta } from './meta';\n\nexport default (context: PluginContext) =>\n  contributes(Capabilities.AppGraphBuilder, [\n    createExtension({\n      id: `${meta.id}/action`,\n      actions: (node) =>\n        Atom.make((get) =>\n          Function.pipe(\n            get(node),\n            Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),\n            Option.map(() => [\n              {\n                id: meta.id,\n                data: async () => {\n                  const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);\n                  await dispatch(createIntent(SettingsAction.Open));\n                },\n                properties: {\n                  label: ['open settings label', { ns: meta.id }],\n                  icon: 'ph--gear--regular',\n                  disposition: 'menu',\n                  keyBinding: {\n                    macos: 'meta+,',\n                    windows: 'alt+,',\n                  },\n                },\n              },\n            ]),\n            Option.getOrElse(() => []),\n          ),\n        ),\n    }),\n    createExtension({\n      id: `${meta.id}/core`,\n      connector: (node) =>\n        Atom.make((get) =>\n          Function.pipe(\n            get(node),\n            Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),\n            Option.map(() => [\n              {\n                id: SETTINGS_ID,\n                type: meta.id,\n                properties: {\n                  label: ['app settings label', { ns: meta.id }],\n                  icon: 'ph--gear--regular',\n                  disposition: 'pin-end',\n                  position: 'hoist',\n                  testId: 'treeView.appSettings',\n                },\n              },\n            ]),\n            Option.getOrElse(() => []),\n          ),\n        ),\n    }),\n    createExtension({\n      id: `${meta.id}/core-plugins`,\n      connector: (node) =>\n        Atom.make((get) =>\n          Function.pipe(\n            get(node),\n            Option.flatMap((node) => (node.id !== SETTINGS_ID ? Option.none() : Option.some(node))),\n            Option.map(() => {\n              const manager = get(context.capability(Capabilities.PluginManager));\n              const [settingsStore] = get(context.capabilities(Capabilities.SettingsStore));\n              return [\n                ...manager.plugins\n                  .filter((plugin) => manager.core.includes(plugin.meta.id))\n                  .map((plugin): [PluginMeta, SettingsStore<SettingsValue>] | null => {\n                    const settings = settingsStore?.getStore(plugin.meta.id);\n                    if (!settings) {\n                      return null;\n                    }\n\n                    return [plugin.meta, settings];\n                  })\n                  .filter(isNonNullable)\n                  .map(([meta, settings]) => ({\n                    id: `${SETTINGS_KEY}:${meta.id.replaceAll('/', ':')}`,\n                    type: 'category',\n                    data: settings,\n                    properties: {\n                      label: meta.name ?? meta.id,\n                      icon: meta.icon ?? 'ph--circle--regular',\n                    },\n                  })),\n\n                {\n                  id: `${SETTINGS_KEY}:custom-plugins`,\n                  type: 'category',\n                  properties: {\n                    label: ['custom plugins label', { ns: meta.id }],\n                    icon: 'ph--squares-four--regular',\n                    role: 'branch',\n                    disposition: 'collection',\n                  },\n                },\n              ];\n            }),\n            Option.getOrElse(() => []),\n          ),\n        ),\n    }),\n    createExtension({\n      id: `${meta.id}/custom-plugins`,\n      connector: (node) =>\n        Atom.make((get) =>\n          Function.pipe(\n            get(node),\n            Option.flatMap((node) =>\n              node.id !== `${SETTINGS_KEY}:custom-plugins` ? Option.none() : Option.some(node),\n            ),\n            Option.map(() => {\n              const manager = get(context.capability(Capabilities.PluginManager));\n              const [settingsStore] = get(context.capabilities(Capabilities.SettingsStore));\n              return manager.plugins\n                .filter((plugin) => !manager.core.includes(plugin.meta.id))\n                .map((plugin): [PluginMeta, SettingsStore<SettingsValue>] | null => {\n                  const settings = settingsStore?.getStore(plugin.meta.id);\n                  if (!settings) {\n                    return null;\n                  }\n\n                  return [plugin.meta, settings];\n                })\n                .filter(isNonNullable)\n                .map(([meta, settings]) => ({\n                  id: `${SETTINGS_KEY}:${meta.id.replaceAll('/', ':')}`,\n                  type: 'category',\n                  data: settings,\n                  properties: {\n                    label: meta.name ?? meta.id,\n                    icon: meta.icon ?? 'ph--circle--regular',\n                  },\n                }));\n            }),\n            Option.getOrElse(() => []),\n          ),\n        ),\n    }),\n  ]);\n"],
+  "mappings": "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",
+  "names": ["Atom", "Function", "Option", "ROOT_ID", "createExtension", "isNonNullable", "context", "contributes", "Capabilities", "AppGraphBuilder", "createExtension", "id", "meta", "actions", "node", "Atom", "make", "get", "pipe", "flatMap", "ROOT_ID", "some", "none", "map", "data", "dispatchPromise", "dispatch", "getCapability", "IntentDispatcher", "createIntent", "SettingsAction", "Open", "properties", "label", "ns", "icon", "disposition", "keyBinding", "macos", "windows", "getOrElse", "connector", "SETTINGS_ID", "type", "position", "testId", "manager", "capability", "PluginManager", "settingsStore", "capabilities", "SettingsStore", "plugins", "filter", "plugin", "core", "includes", "settings", "getStore", "isNonNullable", "SETTINGS_KEY", "replaceAll", "name", "role"]
+}

package/dist/lib/browser/{chunk-2GRQ4QXA.mjs → chunk-LVSO2N4X.mjs}

@@ -8,24 +8,11 @@ import { log as log3 } from "@dxos/log";
 import { byPosition } from "@dxos/util";
 
 // src/core/capabilities.ts
-import { Rx } from "@effect-rx/rx-react";
+import { Atom } from "@effect-atom/atom-react";
 import * as Effect from "effect/Effect";
 import { Trigger } from "@dxos/async";
 import { invariant } from "@dxos/invariant";
 import { log } from "@dxos/log";
-function _define_property(obj, key, value2) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value2,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value2;
-  }
-  return obj;
-}
 var __dxlog_file = "/__w/dxos/dxos/packages/sdk/app-framework/src/core/capabilities.ts";
 var InterfaceDefTypeId = Symbol.for("InterfaceDefTypeId");
 var defineCapability = (identifier) => {
@@ -34,9 +21,9 @@ var defineCapability = (identifier) => {
   };
 };
 var CapabilityImpl = class {
+  moduleId;
+  implementation;
   constructor(moduleId, implementation) {
-    _define_property(this, "moduleId", void 0);
-    _define_property(this, "implementation", void 0);
     this.moduleId = moduleId;
     this.implementation = implementation;
   }
@@ -53,6 +40,48 @@ var lazy = (c) => async (props) => {
   return async () => getCapability(props);
 };
 var PluginContext = class {
+  _registry;
+  _capabilityImpls = Atom.family(() => {
+    return Atom.make([]).pipe(Atom.keepAlive);
+  });
+  _capabilities = Atom.family((id) => {
+    return Atom.make((get) => {
+      const current = get(this._capabilityImpls(id));
+      return current.map((c) => c.implementation);
+    });
+  });
+  _capability = Atom.family((id) => {
+    return Atom.make((get) => {
+      const current = get(this._capabilities(id));
+      invariant(current.length > 0, `No capability found for ${id}`, {
+        F: __dxlog_file,
+        L: 126,
+        S: this,
+        A: [
+          "current.length > 0",
+          "`No capability found for ${id}`"
+        ]
+      });
+      return current[0];
+    });
+  });
+  /**
+  * Activates plugins based on the activation event.
+  * @param event The activation event.
+  * @returns Whether the activation was successful.
+  */
+  activate;
+  /**
+  * Re-activates the modules that were activated by the event.
+  * @param event The activation event.
+  * @returns Whether the reset was successful.
+  */
+  reset;
+  constructor({ registry, activate, reset }) {
+    this._registry = registry;
+    this.activate = activate;
+    this.reset = reset;
+  }
   /**
   * @internal
   */
@@ -72,7 +101,7 @@ var PluginContext = class {
       count: current.length
     }, {
       F: __dxlog_file,
-      L: 166,
+      L: 170,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -93,7 +122,7 @@ var PluginContext = class {
         count: current.length
       }, {
         F: __dxlog_file,
-        L: 185,
+        L: 189,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -102,15 +131,15 @@ var PluginContext = class {
         id: interfaceDef.identifier
       }, {
         F: __dxlog_file,
-        L: 187,
+        L: 191,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
   /**
-  * Get the Rx reference to the available capabilities for a given interface.
-  * Primarily useful for deriving other Rx values based on the capabilities or
+  * Get the Atom reference to the available capabilities for a given interface.
+  * Primarily useful for deriving other Atom values based on the capabilities or
   * for subscribing to changes in the capabilities.
   * @returns An Rx reference to the available capabilities.
   */
@@ -118,8 +147,8 @@ var PluginContext = class {
     return this._capabilities(interfaceDef.identifier);
   }
   /**
-  * Get the Rx reference to the available capabilities for a given interface.
-  * Primarily useful for deriving other Rx values based on the capability or
+  * Get the Atom reference to the available capabilities for a given interface.
+  * Primarily useful for deriving other Atom values based on the capability or
   * for subscribing to changes in the capability.
   * @returns An Rx reference to the available capability.
   * @throws If no capability is found.
@@ -167,38 +196,6 @@ var PluginContext = class {
   async resetPromise(event) {
     return this.reset(event).pipe(Effect.runPromise);
   }
-  constructor({ registry, activate, reset }) {
-    _define_property(this, "_registry", void 0);
-    _define_property(this, "_capabilityImpls", Rx.family(() => {
-      return Rx.make([]).pipe(Rx.keepAlive);
-    }));
-    _define_property(this, "_capabilities", Rx.family((id) => {
-      return Rx.make((get) => {
-        const current = get(this._capabilityImpls(id));
-        return current.map((c) => c.implementation);
-      });
-    }));
-    _define_property(this, "_capability", Rx.family((id) => {
-      return Rx.make((get) => {
-        const current = get(this._capabilities(id));
-        invariant(current.length > 0, `No capability found for ${id}`, {
-          F: __dxlog_file,
-          L: 122,
-          S: this,
-          A: [
-            "current.length > 0",
-            "`No capability found for ${id}`"
-          ]
-        });
-        return current[0];
-      });
-    }));
-    _define_property(this, "activate", void 0);
-    _define_property(this, "reset", void 0);
-    this._registry = registry;
-    this.activate = activate;
-    this.reset = reset;
-  }
 };
 
 // src/core/events.ts
@@ -224,7 +221,7 @@ var getEvents = (events) => "type" in events ? events.events : [
 ];
 
 // src/core/manager.ts
-import { Registry } from "@effect-rx/rx-react";
+import { Registry } from "@effect-atom/atom-react";
 import { untracked } from "@preact/signals-core";
 import * as Array from "effect/Array";
 import * as Duration from "effect/Duration";
@@ -237,24 +234,42 @@ import * as Ref from "effect/Ref";
 import { Event } from "@dxos/async";
 import { live } from "@dxos/live-object";
 import { log as log2 } from "@dxos/log";
-function _define_property2(obj, key, value2) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value2,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value2;
-  }
-  return obj;
-}
 var __dxlog_file2 = "/__w/dxos/dxos/packages/sdk/app-framework/src/core/manager.ts";
 var isPromise = (value2) => {
   return value2 !== null && typeof value2 === "object" && "then" in value2;
 };
 var PluginManager = class {
+  activation = new Event();
+  context;
+  registry;
+  // TODO(wittjosiah): Replace with Atom.
+  _state;
+  _pluginLoader;
+  _capabilities = /* @__PURE__ */ new Map();
+  _moduleMemoMap = /* @__PURE__ */ new Map();
+  _activatingEvents = Effect2.runSync(Ref.make([]));
+  _activatingModules = Effect2.runSync(Ref.make([]));
+  constructor({ pluginLoader, plugins = [], core = plugins.map(({ meta: meta2 }) => meta2.id), enabled = [], registry }) {
+    this.registry = registry ?? Registry.make();
+    this.context = new PluginContext({
+      registry: this.registry,
+      activate: (event) => this._activate(event),
+      reset: (id) => this._reset(id)
+    });
+    this._pluginLoader = pluginLoader;
+    this._state = live({
+      plugins,
+      core,
+      enabled,
+      modules: [],
+      active: [],
+      eventsFired: [],
+      pendingReset: []
+    });
+    plugins.forEach((plugin) => this._addPlugin(plugin));
+    core.forEach((id) => this.enable(id));
+    enabled.forEach((id) => this.enable(id));
+  }
   /**
   * Plugins that are currently registered.
   *
@@ -648,6 +663,67 @@ var PluginManager = class {
       return true;
     });
   }
+  // Memoized with _moduleMemoMap
+  _loadModule = (mod) => Effect2.tryPromise({
+    try: async () => {
+      const entry = this._moduleMemoMap.get(mod.id);
+      if (entry) {
+        return entry;
+      }
+      const promise2 = (async () => {
+        const start = performance.now();
+        let failed = false;
+        try {
+          log2("loading module", {
+            module: mod.id
+          }, {
+            F: __dxlog_file2,
+            L: 477,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          let activationResult = await mod.activate(this.context);
+          if (typeof activationResult === "function") {
+            activationResult = await activationResult();
+          }
+          return Array.isArray(activationResult) ? activationResult : [
+            activationResult
+          ];
+        } catch (error) {
+          failed = true;
+          throw error;
+        } finally {
+          performance.measure("activate-module", {
+            start,
+            end: performance.now(),
+            detail: {
+              module: mod.id
+            }
+          });
+          log2("loaded module", {
+            module: mod.id,
+            elapsed: performance.now() - start,
+            failed
+          }, {
+            F: __dxlog_file2,
+            L: 495,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+        }
+      })();
+      this._moduleMemoMap.set(mod.id, promise2);
+      return promise2;
+    },
+    catch: (error) => error
+  }).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: mod.id
+  }, {
+    F: __dxlog_file2,
+    L: 506,
+    S: this,
+    C: (f, a) => f(...a)
+  }))))));
   _contributeCapabilities(module, capabilities) {
     return Effect2.gen(this, function* () {
       capabilities.forEach((capability) => {
@@ -734,96 +810,6 @@ var PluginManager = class {
       }
     });
   }
-  constructor({ pluginLoader, plugins = [], core = plugins.map(({ meta: meta2 }) => meta2.id), enabled = [], registry }) {
-    _define_property2(this, "activation", new Event());
-    _define_property2(this, "context", void 0);
-    _define_property2(this, "registry", void 0);
-    _define_property2(this, "_state", void 0);
-    _define_property2(this, "_pluginLoader", void 0);
-    _define_property2(this, "_capabilities", /* @__PURE__ */ new Map());
-    _define_property2(this, "_moduleMemoMap", /* @__PURE__ */ new Map());
-    _define_property2(this, "_activatingEvents", Effect2.runSync(Ref.make([])));
-    _define_property2(this, "_activatingModules", Effect2.runSync(Ref.make([])));
-    _define_property2(this, "_loadModule", (mod) => Effect2.tryPromise({
-      try: async () => {
-        const entry = this._moduleMemoMap.get(mod.id);
-        if (entry) {
-          return entry;
-        }
-        const promise2 = (async () => {
-          const start = performance.now();
-          let failed = false;
-          try {
-            log2("loading module", {
-              module: mod.id
-            }, {
-              F: __dxlog_file2,
-              L: 477,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-            let activationResult = await mod.activate(this.context);
-            if (typeof activationResult === "function") {
-              activationResult = await activationResult();
-            }
-            return Array.isArray(activationResult) ? activationResult : [
-              activationResult
-            ];
-          } catch (error) {
-            failed = true;
-            throw error;
-          } finally {
-            performance.measure("activate-module", {
-              start,
-              end: performance.now(),
-              detail: {
-                module: mod.id
-              }
-            });
-            log2("loaded module", {
-              module: mod.id,
-              elapsed: performance.now() - start,
-              failed
-            }, {
-              F: __dxlog_file2,
-              L: 495,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-          }
-        })();
-        this._moduleMemoMap.set(mod.id, promise2);
-        return promise2;
-      },
-      catch: (error) => error
-    }).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: mod.id
-    }, {
-      F: __dxlog_file2,
-      L: 506,
-      S: this,
-      C: (f, a) => f(...a)
-    })))))));
-    this.registry = registry ?? Registry.make();
-    this.context = new PluginContext({
-      registry: this.registry,
-      activate: (event) => this._activate(event),
-      reset: (id) => this._reset(id)
-    });
-    this._pluginLoader = pluginLoader;
-    this._state = live({
-      plugins,
-      core,
-      enabled,
-      modules: [],
-      active: [],
-      eventsFired: [],
-      pendingReset: []
-    });
-    plugins.forEach((plugin) => this._addPlugin(plugin));
-    core.forEach((id) => this.enable(id));
-    enabled.forEach((id) => this.enable(id));
-  }
 };
 var together = (togetherEffect) => (effect) => Effect2.gen(function* () {
   const togetherFiber = yield* Effect2.fork(togetherEffect);
@@ -833,26 +819,13 @@ var together = (togetherEffect) => (effect) => Effect2.gen(function* () {
 });
 
 // src/core/plugin.ts
-function _define_property3(obj, key, value2) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value2,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value2;
-  }
-  return obj;
-}
 var PluginModule = class {
+  id;
+  activatesOn;
+  activatesBefore;
+  activatesAfter;
+  activate;
   constructor(options) {
-    _define_property3(this, "id", void 0);
-    _define_property3(this, "activatesOn", void 0);
-    _define_property3(this, "activatesBefore", void 0);
-    _define_property3(this, "activatesAfter", void 0);
-    _define_property3(this, "activate", void 0);
     this.id = options.id;
     this.activatesOn = options.activatesOn;
     this.activatesBefore = options.activatesBefore;
@@ -862,9 +835,9 @@ var PluginModule = class {
 };
 var defineModule = (options) => new PluginModule(options);
 var Plugin = class {
+  meta;
+  modules;
   constructor(meta2, modules) {
-    _define_property3(this, "meta", void 0);
-    _define_property3(this, "modules", void 0);
     this.meta = meta2;
     this.modules = modules;
   }
@@ -882,7 +855,7 @@ var definePlugin = (meta2, provider) => {
 (function(Capabilities2) {
   Capabilities2.Null = defineCapability("dxos.org/app-framework/capability/null");
   Capabilities2.PluginManager = defineCapability("dxos.org/app-framework/capability/plugin-manager");
-  Capabilities2.RxRegistry = defineCapability("dxos.org/app-framework/capability/rx-registry");
+  Capabilities2.RxRegistry = defineCapability("dxos.org/app-framework/capability/atom-registry");
   Capabilities2.ReactContext = defineCapability("dxos.org/app-framework/capability/react-context");
   Capabilities2.ReactRoot = defineCapability("dxos.org/app-framework/capability/react-root");
   Capabilities2.ReactSurface = defineCapability("dxos.org/app-framework/common/react-surface");
@@ -897,7 +870,6 @@ var definePlugin = (meta2, provider) => {
   Capabilities2.Settings = defineCapability("dxos.org/app-framework/capability/settings");
   Capabilities2.Metadata = defineCapability("dxos.org/app-framework/capability/metadata");
   Capabilities2.Toolkit = defineCapability("dxos.org/app-framework/capability/ai-toolkit");
-  Capabilities2.ToolkitHandler = defineCapability("dxos.org/app-framework/capability/ai-toolkit-handler");
   Capabilities2.BlueprintDefinition = defineCapability("dxos.org/app-framework/capability/blueprint-definition");
   Capabilities2.AiServiceLayer = defineCapability("dxos.org/app-framework/capability/ai-service-factory");
   Capabilities2.AiModelResolver = defineCapability("dxos.org/app-framework/capability/ai-model-resolver");
@@ -909,13 +881,13 @@ var Capabilities;
 
 // src/common/collaboration.ts
 import * as Schema from "effect/Schema";
-import { DataType } from "@dxos/schema";
+import { ContentBlock } from "@dxos/types";
 (function(CollaborationActions2) {
   class AcceptProposal extends Schema.TaggedClass()("collaboration/accept-proposal", {
     input: Schema.Struct({
       subject: Schema.Any,
       anchor: Schema.String,
-      proposal: DataType.MessageBlock.Proposal
+      proposal: ContentBlock.Proposal
     }),
     output: Schema.Void
   }) {
@@ -1049,24 +1021,13 @@ var meta = {
 var IntentAction;
 
 // src/plugin-intent/errors.ts
-function _define_property4(obj, key, value2) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value2,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value2;
-  }
-  return obj;
-}
 var BaseError = class extends Error {
+  code;
+  context;
   constructor(code, message, context) {
     super(message ?? code, {
       cause: context
-    }), _define_property4(this, "code", void 0), _define_property4(this, "context", void 0), this.code = code, this.context = context;
+    }), this.code = code, this.context = context;
     this.name = code;
     Object.setPrototypeOf(this, new.target.prototype);
   }
@@ -1095,7 +1056,7 @@ var IntentPlugin = definePlugin(meta, () => [
     activatesAfter: [
       Events.DispatcherReady
     ],
-    activate: lazy(() => import("./intent-dispatcher-6SHA5B3N.mjs"))
+    activate: lazy(() => import("./intent-dispatcher-TNEVDPI6.mjs"))
   })
 ]);
 
@@ -1643,4 +1604,4 @@ export {
   ResourceLanguage,
   Resource
 };
-//# sourceMappingURL=chunk-2GRQ4QXA.mjs.map
+//# sourceMappingURL=chunk-LVSO2N4X.mjs.map