@dxos/app-framework 0.8.1-main.ae460ac → 0.8.1-staging.31c3ee1

package/dist/lib/browser/{app-graph-builder-IAEV7KKF.mjs → app-graph-builder-576BHZC7.mjs}

@@ -3,12 +3,12 @@ import {
   SETTINGS_KEY,
   SETTINGS_PLUGIN,
   SettingsAction
-} from "./chunk-CB3W6T5E.mjs";
+} from "./chunk-SFPT4Z2C.mjs";
 import {
   Capabilities,
   contributes,
   createIntent
-} from "./chunk-PWAAJE2Z.mjs";
+} from "./chunk-6AVTZPMT.mjs";
 
 // packages/sdk/app-framework/src/plugin-settings/app-graph-builder.ts
 import { createExtension } from "@dxos/app-graph";
@@ -134,4 +134,4 @@ var app_graph_builder_default = (context) => contributes(Capabilities.AppGraphBu
 export {
   app_graph_builder_default as default
 };
-//# sourceMappingURL=app-graph-builder-IAEV7KKF.mjs.map
+//# sourceMappingURL=app-graph-builder-576BHZC7.mjs.map

package/dist/lib/browser/{chunk-PWAAJE2Z.mjs → chunk-6AVTZPMT.mjs}

@@ -1,5 +1,5 @@
 // packages/sdk/app-framework/src/plugin-intent/intent-dispatcher.ts
-import { Effect as Effect2, Option, pipe as pipe2, Ref } from "effect";
+import { Effect as Effect3, Option, pipe as pipe2, Ref } from "effect";
 import { create as create3 } from "@dxos/live-object";
 import { log as log3 } from "@dxos/log";
 import { byPosition } from "@dxos/util";
@@ -55,6 +55,15 @@ var INTENT_PLUGIN = "dxos.org/plugin/intent";
 var INTENT_ACTION = `${INTENT_PLUGIN}/action`;
 var IntentAction;
 (function(IntentAction2) {
+  class Track extends S2.TaggedClass()(`${INTENT_ACTION}/track`, {
+    input: S2.Struct({
+      intents: S2.Array(S2.String),
+      error: S2.optional(S2.String)
+    }),
+    output: S2.Void
+  }) {
+  }
+  IntentAction2.Track = Track;
   class ShowUndo extends S2.TaggedClass()(`${INTENT_ACTION}/show-undo`, {
     input: S2.Struct({
       message: Label
@@ -92,6 +101,7 @@ var CycleDetectedError = class extends BaseError {
 
 // packages/sdk/app-framework/src/core/capabilities.ts
 import { effect, untracked } from "@preact/signals-core";
+import { Effect } from "effect";
 import { Trigger } from "@dxos/async";
 import { invariant } from "@dxos/invariant";
 import { create } from "@dxos/live-object";
@@ -233,6 +243,12 @@ var PluginsContext = class {
     unsubscribe();
     return capability;
   }
+  async activatePromise(event) {
+    return this.activate(event).pipe(Effect.runPromise);
+  }
+  async resetPromise(event) {
+    return this.reset(event).pipe(Effect.runPromise);
+  }
 };
 
 // packages/sdk/app-framework/src/core/events.ts
@@ -259,7 +275,7 @@ var getEvents = (events) => "type" in events ? events.events : [
 
 // packages/sdk/app-framework/src/core/manager.ts
 import { untracked as untracked2 } from "@preact/signals-core";
-import { Array as A, Effect, Either, Match, pipe } from "effect";
+import { Array as A, Effect as Effect2, Either, Match, pipe } from "effect";
 import { Event } from "@dxos/async";
 import { create as create2 } from "@dxos/live-object";
 import { log as log2 } from "@dxos/log";
@@ -271,8 +287,8 @@ var PluginManager = class {
   constructor({ pluginLoader, plugins = [], core = plugins.map(({ meta }) => meta.id), enabled = [] }) {
     this.activation = new Event();
     this.context = new PluginsContext({
-      activate: (event) => this.activate(event),
-      reset: (id) => this.reset(id)
+      activate: (event) => this._activate(event),
+      reset: (id) => this._reset(id)
     });
     this._capabilities = /* @__PURE__ */ new Map();
     this._pluginLoader = pluginLoader;
@@ -399,7 +415,7 @@ var PluginManager = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      await Effect.runPromise(Effect.all(this.pendingReset.map((event) => this._activate(event)), {
+      await Effect2.runPromise(Effect2.all(this.pendingReset.map((event) => this._activate(event)), {
         concurrency: "unbounded"
       }));
       return true;
@@ -451,7 +467,7 @@ var PluginManager = class {
       const enabledIndex = this._state.enabled.findIndex((enabled) => enabled === id);
       if (enabledIndex !== -1) {
         this._state.enabled.splice(enabledIndex, 1);
-        await Effect.runPromise(this._deactivate(id));
+        await Effect2.runPromise(this._deactivate(id));
         plugin.modules.forEach((module) => {
           this._removeModule(module.id);
         });
@@ -465,7 +481,7 @@ var PluginManager = class {
   * @returns Whether the activation was successful.
   */
   activate(event) {
-    return untracked2(() => Effect.runPromise(this._activate(event)));
+    return untracked2(() => Effect2.runPromise(this._activate(event)));
   }
   /**
   * Deactivates all of the modules for a plugin.
@@ -473,7 +489,7 @@ var PluginManager = class {
   * @returns Whether the deactivation was successful.
   */
   deactivate(id) {
-    return untracked2(() => Effect.runPromise(this._deactivate(id)));
+    return untracked2(() => Effect2.runPromise(this._deactivate(id)));
   }
   /**
   * Re-activates the modules that were activated by the event.
@@ -481,7 +497,7 @@ var PluginManager = class {
   * @returns Whether the reset was successful.
   */
   reset(event) {
-    return untracked2(() => Effect.runPromise(this._reset(event)));
+    return untracked2(() => Effect2.runPromise(this._reset(event)));
   }
   _addPlugin(plugin) {
     untracked2(() => {
@@ -582,7 +598,7 @@ var PluginManager = class {
   */
   // TODO(wittjosiah): Improve error typing.
   _activate(event) {
-    return Effect.gen(this, function* () {
+    return Effect2.gen(this, function* () {
       const key = typeof event === "string" ? event : eventKey(event);
       log2("activating", {
         key
@@ -631,7 +647,7 @@ var PluginManager = class {
         event: key,
         state: "activating"
       });
-      const getCapabilities = yield* Effect.all(modules.map(({ activate }) => Effect.tryPromise({
+      const getCapabilities = yield* Effect2.all(modules.map(({ activate }) => Effect2.tryPromise({
         try: async () => activate(this.context),
         catch: (error) => error
       })), {
@@ -643,8 +659,8 @@ var PluginManager = class {
         A.map(([module, getCapabilities2]) => this._activateModule(module, getCapabilities2)),
         // TODO(wittjosiah): This currently can't be run in parallel.
         //   Running this with concurrency causes races with `allOf` activation events.
-        Effect.all,
-        Effect.either
+        Effect2.all,
+        Effect2.either
       );
       if (Either.isLeft(result)) {
         this.activation.emit({
@@ -652,7 +668,7 @@ var PluginManager = class {
           state: "error",
           error: result.left
         });
-        yield* Effect.fail(result.left);
+        yield* Effect2.fail(result.left);
       }
       if (!this._state.eventsFired.includes(key)) {
         this._state.eventsFired.push(key);
@@ -673,8 +689,8 @@ var PluginManager = class {
     });
   }
   _activateModule(module, getCapabilities) {
-    return Effect.gen(this, function* () {
-      yield* Effect.all(module.activatesBefore?.map((event) => this._activate(event)) ?? [], {
+    return Effect2.gen(this, function* () {
+      yield* Effect2.all(module.activatesBefore?.map((event) => this._activate(event)) ?? [], {
         concurrency: "unbounded"
       });
       log2("activating module...", {
@@ -689,11 +705,11 @@ var PluginManager = class {
       const resolvedCapabilities = yield* Match.value(maybeCapabilities).pipe(
         // TODO(wittjosiah): Activate with an effect?
         // Match.when(Effect.isEffect, (effect) => effect),
-        Match.when(isPromise, (promise) => Effect.tryPromise({
+        Match.when(isPromise, (promise) => Effect2.tryPromise({
           try: () => promise,
           catch: (error) => error
         })),
-        Match.orElse((program) => Effect.succeed(program))
+        Match.orElse((program) => Effect2.succeed(program))
       );
       const capabilities = Match.value(resolvedCapabilities).pipe(Match.when(Array.isArray, (array) => array), Match.orElse((value) => [
         value
@@ -714,26 +730,26 @@ var PluginManager = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      yield* Effect.all(module.activatesAfter?.map((event) => this._activate(event)) ?? [], {
+      yield* Effect2.all(module.activatesAfter?.map((event) => this._activate(event)) ?? [], {
         concurrency: "unbounded"
       });
     });
   }
   _deactivate(id) {
-    return Effect.gen(this, function* () {
+    return Effect2.gen(this, function* () {
       const plugin = this._getPlugin(id);
       if (!plugin) {
         return false;
       }
       const modules = plugin.modules;
-      const results = yield* Effect.all(modules.map((module) => this._deactivateModule(module)), {
+      const results = yield* Effect2.all(modules.map((module) => this._deactivateModule(module)), {
         concurrency: "unbounded"
       });
       return results.every((result) => result);
     });
   }
   _deactivateModule(module) {
-    return Effect.gen(this, function* () {
+    return Effect2.gen(this, function* () {
       const id = module.id;
       log2("deactivating", {
         id
@@ -748,10 +764,10 @@ var PluginManager = class {
         for (const capability of capabilities) {
           this.context.removeCapability(capability.interface, capability.implementation);
           const program = capability.deactivate?.();
-          yield* Match.value(program).pipe(Match.when(Effect.isEffect, (effect2) => effect2), Match.when(isPromise, (promise) => Effect.tryPromise({
+          yield* Match.value(program).pipe(Match.when(Effect2.isEffect, (effect2) => effect2), Match.when(isPromise, (promise) => Effect2.tryPromise({
             try: () => promise,
             catch: (error) => error
-          })), Match.orElse((program2) => Effect.succeed(program2)));
+          })), Match.orElse((program2) => Effect2.succeed(program2)));
         }
         this._capabilities.delete(id);
       }
@@ -771,7 +787,7 @@ var PluginManager = class {
     });
   }
   _reset(event) {
-    return Effect.gen(this, function* () {
+    return Effect2.gen(this, function* () {
       const key = typeof event === "string" ? event : eventKey(event);
       log2("reset", {
         key
@@ -782,7 +798,7 @@ var PluginManager = class {
         C: (f, a) => f(...a)
       });
       const modules = this._getActiveModulesByEvent(key);
-      const results = yield* Effect.all(modules.map((module) => this._deactivateModule(module)), {
+      const results = yield* Effect2.all(modules.map((module) => this._deactivateModule(module)), {
         concurrency: "unbounded"
       });
       if (results.every((result) => result)) {
@@ -889,7 +905,8 @@ import { Schema as S4 } from "effect";
 
 // packages/sdk/app-framework/src/plugin-intent/IntentPlugin.tsx
 var IntentPlugin = () => definePlugin({
-  id: INTENT_PLUGIN
+  id: INTENT_PLUGIN,
+  name: "Intent"
 }, [
   defineModule({
     id: `${INTENT_PLUGIN}/module/dispatcher`,
@@ -900,7 +917,7 @@ var IntentPlugin = () => definePlugin({
     activatesAfter: [
       Events.DispatcherReady
     ],
-    activate: lazy(() => import("./intent-dispatcher-UR566RVO.mjs"))
+    activate: lazy(() => import("./intent-dispatcher-3Q67MHZZ.mjs"))
   })
 ]);
 
@@ -1129,6 +1146,9 @@ var LayoutAction;
         state: S4.optional(S4.Literal(true).annotations({
           description: "The items are being added."
         })),
+        variant: S4.optional(S4.String.annotations({
+          description: "The variant of the item to open."
+        })),
         key: S4.optional(S4.String.annotations({
           description: "If provided, will replace item with a matching key (id prefix)."
         })),
@@ -1244,23 +1264,23 @@ var HISTORY_LIMIT = 100;
 var createResolver = (resolver) => resolver;
 var isUndoable = (historyEntry) => historyEntry.length > 0 && historyEntry.every(({ undoable }) => !!undoable);
 var createDispatcher = (getResolvers, { executionLimit = EXECUTION_LIMIT, historyLimit = HISTORY_LIMIT } = {}) => {
-  const historyRef = Effect2.runSync(Ref.make([]));
-  const handleIntent = (intent) => Effect2.gen(function* () {
-    const candidates = getResolvers(intent.module).filter((r) => r.intent._tag === intent.id).filter((r) => !r.filter || r.filter(intent.data)).toSorted(byPosition);
+  const historyRef = Effect3.runSync(Ref.make([]));
+  const handleIntent = (intent) => Effect3.gen(function* () {
+    const candidates = getResolvers(intent.module).filter((resolver) => resolver.intent._tag === intent.id).filter((resolver) => !resolver.filter || resolver.filter(intent.data)).toSorted(byPosition);
     if (candidates.length === 0) {
-      yield* Effect2.fail(new NoResolversError(intent.id));
+      yield* Effect3.fail(new NoResolversError(intent.id));
     }
     const effect2 = candidates[0].resolve(intent.data, intent.undo ?? false);
-    const result = Effect2.isEffect(effect2) ? yield* effect2 : yield* Effect2.promise(async () => effect2);
+    const result = Effect3.isEffect(effect2) ? yield* effect2 : yield* Effect3.promise(async () => effect2);
     return {
       _intent: intent,
       ...result
     };
   });
   const dispatch = (intentChain, depth = 0) => {
-    return Effect2.gen(function* () {
+    return Effect3.gen(function* () {
       if (depth > executionLimit) {
-        yield* Effect2.fail(new CycleDetectedError());
+        yield* Effect3.fail(new CycleDetectedError());
       }
       const resultsRef = yield* Ref.make([]);
       for (const intent of intentChain.all) {
@@ -1282,7 +1302,7 @@ var createDispatcher = (getResolvers, { executionLimit = EXECUTION_LIMIT, histor
           }
         }
         if (result2.error) {
-          yield* Effect2.fail(result2.error);
+          yield* Effect3.fail(result2.error);
         }
       }
       const results = yield* resultsRef.get;
@@ -1300,18 +1320,18 @@ var createDispatcher = (getResolvers, { executionLimit = EXECUTION_LIMIT, histor
       if (result.undoable && isUndoable(results)) {
         yield* pipe2(dispatch(createIntent(IntentAction.ShowUndo, {
           message: result.undoable.message
-        })), Effect2.catchSome((err) => err instanceof NoResolversError ? Option.some(Effect2.succeed(void 0)) : Option.none()));
+        })), Effect3.catchSome((err) => err instanceof NoResolversError ? Option.some(Effect3.succeed(void 0)) : Option.none()));
       }
       return result.data;
     });
   };
   const dispatchPromise = (intentChain) => {
-    return Effect2.runPromise(dispatch(intentChain)).then((data) => ({
+    return Effect3.runPromise(dispatch(intentChain)).then((data) => ({
       data
     })).catch((error) => {
       log3.catch(error, void 0, {
         F: __dxlog_file3,
-        L: 241,
+        L: 254,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -1321,7 +1341,7 @@ var createDispatcher = (getResolvers, { executionLimit = EXECUTION_LIMIT, histor
     });
   };
   const undo = () => {
-    return Effect2.gen(function* () {
+    return Effect3.gen(function* () {
       const history = yield* historyRef.get;
       const last = history.findLastIndex(isUndoable);
       const result = last !== -1 ? history[last] : void 0;
@@ -1349,7 +1369,7 @@ var createDispatcher = (getResolvers, { executionLimit = EXECUTION_LIMIT, histor
     });
   };
   const undoPromise = () => {
-    return Effect2.runPromise(undo()).then((data) => ({
+    return Effect3.runPromise(undo()).then((data) => ({
       data
     })).catch((error) => ({
       error
@@ -1362,8 +1382,8 @@ var createDispatcher = (getResolvers, { executionLimit = EXECUTION_LIMIT, histor
     undoPromise
   };
 };
-var defaultEffect = () => Effect2.fail(new Error("Intent runtime not ready"));
-var defaultPromise = () => Effect2.runPromise(defaultEffect());
+var defaultEffect = () => Effect3.fail(new Error("Intent runtime not ready"));
+var defaultPromise = () => Effect3.runPromise(defaultEffect());
 var intent_dispatcher_default = (context) => {
   const state = create3({
     dispatch: defaultEffect,
@@ -1376,7 +1396,7 @@ var intent_dispatcher_default = (context) => {
   }).flat());
   const manager = context.requestCapability(Capabilities.PluginManager);
   state.dispatch = (intentChain, depth) => {
-    return Effect2.gen(function* () {
+    return Effect3.gen(function* () {
       yield* manager._activate(Events.SetupIntentResolver);
       return yield* dispatch(intentChain, depth);
     });
@@ -1429,4 +1449,4 @@ export {
   ResourceLanguage,
   Resource
 };
-//# sourceMappingURL=chunk-PWAAJE2Z.mjs.map
+//# sourceMappingURL=chunk-6AVTZPMT.mjs.map