@dxos/app-framework 0.8.4-main.5ad4a44 → 0.8.4-main.66e292d

package/dist/lib/node-esm/{chunk-7DNZQ6H2.mjs → chunk-XJZGUJ3H.mjs}

@@ -10,24 +10,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) => {
@@ -36,9 +23,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;
   }
@@ -55,6 +42,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
   */
@@ -74,7 +103,7 @@ var PluginContext = class {
       count: current.length
     }, {
       F: __dxlog_file,
-      L: 166,
+      L: 170,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -95,7 +124,7 @@ var PluginContext = class {
         count: current.length
       }, {
         F: __dxlog_file,
-        L: 185,
+        L: 189,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -104,26 +133,26 @@ 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.
+  * @returns An atom reference to the available capabilities.
   */
   capabilities(interfaceDef) {
     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.
+  * @returns An atom reference to the available capability.
   * @throws If no capability is found.
   */
   capability(interfaceDef) {
@@ -169,38 +198,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
@@ -226,7 +223,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";
@@ -239,24 +236,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.
   *
@@ -650,6 +665,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) => {
@@ -736,96 +812,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);
@@ -835,26 +821,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;
@@ -864,9 +837,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;
   }
@@ -884,7 +857,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.AtomRegistry = 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");
@@ -899,7 +872,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");
@@ -911,13 +883,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
   }) {
@@ -1051,31 +1023,20 @@ 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);
   }
 };
 var NoResolversError = class extends BaseError {
   constructor(action) {
-    super("NO_RESOLVERS", "No resolvers were found for the action", {
+    super("NO_RESOLVERS", `No resolvers were found for the action: ${action}`, {
       action
     });
   }
@@ -1097,7 +1058,7 @@ var IntentPlugin = definePlugin(meta, () => [
     activatesAfter: [
       Events.DispatcherReady
     ],
-    activate: lazy(() => import("./intent-dispatcher-R4CCPBHO.mjs"))
+    activate: lazy(() => import("./intent-dispatcher-MGOJ3CHD.mjs"))
   })
 ]);
 
@@ -1476,12 +1437,29 @@ var createDispatcher = (getResolvers, { executionLimit = EXECUTION_LIMIT, histor
     };
   });
   const dispatch = (intentChain, depth = 0) => {
+    log3("dispatch", {
+      intentChain: intentChain.all.map((i) => i.id),
+      depth
+    }, {
+      F: __dxlog_file3,
+      L: 212,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
     return Effect3.gen(function* () {
       if (depth > executionLimit) {
         return yield* Effect3.fail(new CycleDetectedError());
       }
       const resultsRef = yield* Ref2.make([]);
       for (const intent of intentChain.all) {
+        log3("processing", {
+          intent
+        }, {
+          F: __dxlog_file3,
+          L: 220,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         const { data: prev } = (yield* resultsRef.get)[0] ?? {};
         const result2 = yield* handleIntent({
           ...intent,
@@ -1490,6 +1468,15 @@ var createDispatcher = (getResolvers, { executionLimit = EXECUTION_LIMIT, histor
             ...prev
           }
         });
+        log3("ok", {
+          intent: intent.id,
+          result: result2
+        }, {
+          F: __dxlog_file3,
+          L: 223,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         yield* Ref2.update(resultsRef, (results2) => [
           result2,
           ...results2
@@ -1500,6 +1487,15 @@ var createDispatcher = (getResolvers, { executionLimit = EXECUTION_LIMIT, histor
           }
         }
         if (result2.error) {
+          log3.error("failed", {
+            intent: intent.id,
+            error: result2.error
+          }, {
+            F: __dxlog_file3,
+            L: 240,
+            S: this,
+            C: (f, a) => f(...a)
+          });
           return yield* Effect3.fail(result2.error);
         }
       }
@@ -1520,6 +1516,15 @@ var createDispatcher = (getResolvers, { executionLimit = EXECUTION_LIMIT, histor
           message: result.undoable.message
         })), Effect3.catchSome((err) => err instanceof NoResolversError ? Option.some(Effect3.succeed(void 0)) : Option.none()));
       }
+      log3("done", {
+        intent: intentChain.all.map((i) => i.id),
+        result: result.data
+      }, {
+        F: __dxlog_file3,
+        L: 270,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       return result.data;
     });
   };
@@ -1529,7 +1534,7 @@ var createDispatcher = (getResolvers, { executionLimit = EXECUTION_LIMIT, histor
     })).catch((error) => {
       log3.catch(error, void 0, {
         F: __dxlog_file3,
-        L: 274,
+        L: 279,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -1645,4 +1650,4 @@ export {
   ResourceLanguage,
   Resource
 };
-//# sourceMappingURL=chunk-7DNZQ6H2.mjs.map
+//# sourceMappingURL=chunk-XJZGUJ3H.mjs.map