@dxos/app-framework 0.8.2-main.fbd8ed0 → 0.8.2-staging.7ac8446

package/src/common/layout.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema } from 'effect';
+import { Schema as S } from 'effect';
 
 import { Label } from '../plugin-intent';
 
@@ -18,17 +18,17 @@ export namespace LayoutAction {
   /**
    * Generic layout action.
    */
-  export class UpdateLayout extends Schema.TaggedClass<UpdateLayout>()(UPDATE_LAYOUT, {
-    input: Schema.Struct({
-      part: Schema.String.annotations({ description: 'The part of the layout to mutate.' }),
-      subject: Schema.optional(Schema.Any.annotations({ description: 'The subject of the layout update.' })),
-      options: Schema.optional(
-        Schema.Record({ key: Schema.String, value: Schema.Any }).annotations({
+  export class UpdateLayout extends S.TaggedClass<UpdateLayout>()(UPDATE_LAYOUT, {
+    input: S.Struct({
+      part: S.String.annotations({ description: 'The part of the layout to mutate.' }),
+      subject: S.optional(S.Any.annotations({ description: 'The subject of the layout update.' })),
+      options: S.optional(
+        S.Record({ key: S.String, value: S.Any }).annotations({
           description: 'Additional options for the layout action.',
         }),
       ),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
   //
@@ -41,230 +41,199 @@ export namespace LayoutAction {
   //  This allows for plugins to update the layout without depending on a specific layout plugin.
   //  The expectation is that other norms other than these will emerge over time.
 
-  export class SetLayoutMode extends Schema.TaggedClass<SetLayoutMode>()(UPDATE_LAYOUT, {
-    input: Schema.Struct({
-      part: Schema.Literal('mode').annotations({ description: 'Setting the layout mode.' }),
-      subject: Schema.optional(
-        Schema.String.annotations({ description: 'Item which is the subject of the new layout mode.' }),
-      ),
-      options: Schema.Union(
-        Schema.Struct({ mode: Schema.String.annotations({ description: 'The new layout mode.' }) }),
-        Schema.Struct({ revert: Schema.Boolean.annotations({ description: 'Revert to the previous layout mode.' }) }),
+  export class SetLayoutMode extends S.TaggedClass<SetLayoutMode>()(UPDATE_LAYOUT, {
+    input: S.Struct({
+      part: S.Literal('mode').annotations({ description: 'Setting the layout mode.' }),
+      subject: S.optional(S.String.annotations({ description: 'Item which is the subject of the new layout mode.' })),
+      options: S.Union(
+        S.Struct({ mode: S.String.annotations({ description: 'The new layout mode.' }) }),
+        S.Struct({ revert: S.Boolean.annotations({ description: 'Revert to the previous layout mode.' }) }),
       ),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
-  export class UpdateSidebar extends Schema.TaggedClass<UpdateSidebar>()(UPDATE_LAYOUT, {
-    input: Schema.Struct({
-      part: Schema.Literal('sidebar').annotations({ description: 'Updating the sidebar.' }),
-      subject: Schema.optional(
-        Schema.String.annotations({ description: 'URI of the component to display in the sidebar.' }),
-      ),
-      options: Schema.optional(
-        Schema.Struct({
-          state: Schema.Literal('closed', 'collapsed', 'expanded').annotations({
+  export class UpdateSidebar extends S.TaggedClass<UpdateSidebar>()(UPDATE_LAYOUT, {
+    input: S.Struct({
+      part: S.Literal('sidebar').annotations({ description: 'Updating the sidebar.' }),
+      subject: S.optional(S.String.annotations({ description: 'URI of the component to display in the sidebar.' })),
+      options: S.optional(
+        S.Struct({
+          state: S.Literal('closed', 'collapsed', 'expanded').annotations({
             description: 'Whether the sidebar is closed, collapsed, or expanded.',
           }),
         }),
       ),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
-  export class UpdateComplementary extends Schema.TaggedClass<UpdateComplementary>()(UPDATE_LAYOUT, {
-    input: Schema.Struct({
-      part: Schema.Literal('complementary').annotations({ description: 'Updating the complementary sidebar.' }),
-      subject: Schema.optional(
-        Schema.String.annotations({ description: 'URI of the component to display in the complementary area.' }),
+  export class UpdateComplementary extends S.TaggedClass<UpdateComplementary>()(UPDATE_LAYOUT, {
+    input: S.Struct({
+      part: S.Literal('complementary').annotations({ description: 'Updating the complementary sidebar.' }),
+      subject: S.optional(
+        S.String.annotations({ description: 'URI of the component to display in the complementary area.' }),
       ),
-      options: Schema.optional(
-        Schema.Struct({
-          state: Schema.Literal('closed', 'collapsed', 'expanded').annotations({
+      options: S.optional(
+        S.Struct({
+          state: S.Literal('closed', 'collapsed', 'expanded').annotations({
             description: 'Whether the complementary sidebar is closed, collapsed, or expanded.',
           }),
         }),
       ),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
-  export class UpdateDialog extends Schema.TaggedClass<UpdateDialog>()(UPDATE_LAYOUT, {
-    input: Schema.Struct({
-      part: Schema.Literal('dialog').annotations({ description: 'Updating the dialog.' }),
-      subject: Schema.optional(
-        Schema.String.annotations({ description: 'URI of the component to display in the dialog.' }),
-      ),
-      options: Schema.Struct({
-        state: Schema.optional(Schema.Boolean.annotations({ description: 'Whether the dialog is open or closed.' })),
-        blockAlign: Schema.optional(
-          Schema.Literal('start', 'center', 'end').annotations({ description: 'The alignment of the dialog.' }),
+  export class UpdateDialog extends S.TaggedClass<UpdateDialog>()(UPDATE_LAYOUT, {
+    input: S.Struct({
+      part: S.Literal('dialog').annotations({ description: 'Updating the dialog.' }),
+      subject: S.optional(S.String.annotations({ description: 'URI of the component to display in the dialog.' })),
+      options: S.Struct({
+        state: S.optional(S.Boolean.annotations({ description: 'Whether the dialog is open or closed.' })),
+        blockAlign: S.optional(
+          S.Literal('start', 'center', 'end').annotations({ description: 'The alignment of the dialog.' }),
         ),
-        type: Schema.optional(Schema.Literal('default', 'alert').annotations({ description: 'The type of dialog.' })),
-        props: Schema.optional(
-          Schema.Record({ key: Schema.String, value: Schema.Any }).annotations({
+        type: S.optional(S.Literal('default', 'alert').annotations({ description: 'The type of dialog.' })),
+        props: S.optional(
+          S.Record({ key: S.String, value: S.Any }).annotations({
             description: 'Additional props for the dialog.',
           }),
         ),
       }),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
-  export class UpdatePopover extends Schema.TaggedClass<UpdatePopover>()(UPDATE_LAYOUT, {
-    input: Schema.Struct({
-      part: Schema.Literal('popover').annotations({ description: 'Updating the popover.' }),
-      subject: Schema.optional(
-        Schema.Any.annotations({
-          description: 'URI of the component to display in the popover or data to pass to the popover.',
-        }),
-      ),
-      options: Schema.Struct({
-        side: Schema.optional(
-          Schema.Literal('top', 'right', 'bottom', 'left').annotations({ description: 'The side of the anchor.' }),
+  export class UpdatePopover extends S.TaggedClass<UpdatePopover>()(UPDATE_LAYOUT, {
+    input: S.Struct({
+      part: S.Literal('popover').annotations({ description: 'Updating the popover.' }),
+      subject: S.optional(S.String.annotations({ description: 'URI of the component to display in the popover.' })),
+      options: S.Struct({
+        anchorId: S.String.annotations({ description: 'The id of the element to anchor the popover to.' }),
+        side: S.optional(
+          S.Literal('top', 'right', 'bottom', 'left').annotations({ description: 'The side of the anchor.' }),
         ),
-        state: Schema.optional(Schema.Boolean.annotations({ description: 'Whether the popover is open or closed.' })),
-        props: Schema.optional(
-          Schema.Record({ key: Schema.String, value: Schema.Any }).annotations({
+        state: S.optional(S.Boolean.annotations({ description: 'Whether the popover is open or closed.' })),
+        props: S.optional(
+          S.Record({ key: S.String, value: S.Any }).annotations({
             description: 'Additional props for the popover.',
           }),
         ),
-      }).pipe(
-        Schema.extend(
-          Schema.Union(
-            Schema.Struct({
-              variant: Schema.Literal('virtual'),
-              anchor: Schema.Any.annotations({ description: 'The DOM element to anchor the popover to.' }),
-            }),
-            Schema.Struct({
-              variant: Schema.optional(Schema.Literal('react')),
-              anchorId: Schema.String.annotations({
-                description: 'An id that can be used to determine whether to render the anchor subcomponent.',
-              }),
-            }),
-          ),
-        ),
-      ),
+      }),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
-  export const Toast = Schema.Struct({
-    id: Schema.String.annotations({ description: 'The id of the toast.' }),
-    title: Schema.optional(Label.annotations({ description: 'The title of the toast.' })),
-    description: Schema.optional(Label.annotations({ description: 'The description of the toast.' })),
-    icon: Schema.optional(Schema.String.annotations({ description: 'The icon of the toast.' })),
-    duration: Schema.optional(Schema.Number.annotations({ description: 'The duration of the toast.' })),
-    closeLabel: Schema.optional(Label.annotations({ description: 'The label of the close button.' })),
-    actionLabel: Schema.optional(Label.annotations({ description: 'The label of the action button.' })),
-    actionAlt: Schema.optional(Label.annotations({ description: 'The alt text of the action button.' })),
-    onAction: Schema.optional(
-      Schema.Any.annotations({ description: 'The action to perform when the action button is clicked.' }),
+  export const Toast = S.Struct({
+    id: S.String.annotations({ description: 'The id of the toast.' }),
+    title: S.optional(Label.annotations({ description: 'The title of the toast.' })),
+    description: S.optional(Label.annotations({ description: 'The description of the toast.' })),
+    icon: S.optional(S.String.annotations({ description: 'The icon of the toast.' })),
+    duration: S.optional(S.Number.annotations({ description: 'The duration of the toast.' })),
+    closeLabel: S.optional(Label.annotations({ description: 'The label of the close button.' })),
+    actionLabel: S.optional(Label.annotations({ description: 'The label of the action button.' })),
+    actionAlt: S.optional(Label.annotations({ description: 'The alt text of the action button.' })),
+    onAction: S.optional(
+      S.Any.annotations({ description: 'The action to perform when the action button is clicked.' }),
     ),
   });
 
-  export interface Toast extends Omit<Schema.Schema.Type<typeof Toast>, 'onAction'> {
+  export interface Toast extends Omit<S.Schema.Type<typeof Toast>, 'onAction'> {
     onAction?: () => void;
   }
 
-  export class AddToast extends Schema.TaggedClass<AddToast>()(UPDATE_LAYOUT, {
-    input: Schema.Struct({
-      part: Schema.Literal('toast').annotations({ description: 'Adding a toast.' }),
+  export class AddToast extends S.TaggedClass<AddToast>()(UPDATE_LAYOUT, {
+    input: S.Struct({
+      part: S.Literal('toast').annotations({ description: 'Adding a toast.' }),
       subject: Toast.annotations({ description: 'The toast to add.' }),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
-  export class SwitchWorkspace extends Schema.TaggedClass<SwitchWorkspace>()(UPDATE_LAYOUT, {
-    input: Schema.Struct({
-      part: Schema.Literal('workspace').annotations({ description: 'Switching the workspace.' }),
-      subject: Schema.String.annotations({ description: 'The id of the workspace to switch to.' }),
+  export class SwitchWorkspace extends S.TaggedClass<SwitchWorkspace>()(UPDATE_LAYOUT, {
+    input: S.Struct({
+      part: S.Literal('workspace').annotations({ description: 'Switching the workspace.' }),
+      subject: S.String.annotations({ description: 'The id of the workspace to switch to.' }),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
-  export class RevertWorkspace extends Schema.TaggedClass<RevertWorkspace>()(UPDATE_LAYOUT, {
-    input: Schema.Struct({
-      part: Schema.Literal('workspace').annotations({ description: 'Switching the workspace.' }),
-      options: Schema.Struct({
-        revert: Schema.Literal(true).annotations({ description: 'Revert to the previous workspace.' }),
+  export class RevertWorkspace extends S.TaggedClass<RevertWorkspace>()(UPDATE_LAYOUT, {
+    input: S.Struct({
+      part: S.Literal('workspace').annotations({ description: 'Switching the workspace.' }),
+      options: S.Struct({
+        revert: S.Literal(true).annotations({ description: 'Revert to the previous workspace.' }),
       }),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
-  export class Open extends Schema.TaggedClass<Open>()(UPDATE_LAYOUT, {
-    input: Schema.Struct({
-      part: Schema.Literal('main').annotations({ description: 'Opening an item in the main content area.' }),
-      subject: Schema.Array(Schema.String.annotations({ description: 'Ids of the items to open.' })),
-      options: Schema.optional(
-        Schema.Struct({
-          state: Schema.optional(Schema.Literal(true).annotations({ description: 'The items are being added.' })),
-          variant: Schema.optional(Schema.String.annotations({ description: 'The variant of the item to open.' })),
-          key: Schema.optional(
-            Schema.String.annotations({
-              description: 'If provided, will replace item with a matching key (id prefix).',
-            }),
+  export class Open extends S.TaggedClass<Open>()(UPDATE_LAYOUT, {
+    input: S.Struct({
+      part: S.Literal('main').annotations({ description: 'Opening an item in the main content area.' }),
+      subject: S.Array(S.String.annotations({ description: 'Ids of the items to open.' })),
+      options: S.optional(
+        S.Struct({
+          state: S.optional(S.Literal(true).annotations({ description: 'The items are being added.' })),
+          variant: S.optional(S.String.annotations({ description: 'The variant of the item to open.' })),
+          key: S.optional(
+            S.String.annotations({ description: 'If provided, will replace item with a matching key (id prefix).' }),
           ),
-          workspace: Schema.optional(Schema.String.annotations({ description: 'The workspace to open the items in.' })),
-          scrollIntoView: Schema.optional(Schema.Boolean.annotations({ description: 'Scroll the items into view.' })),
-          pivotId: Schema.optional(
-            Schema.String.annotations({ description: 'The id of the item to place new items next to.' }),
-          ),
-          positioning: Schema.optional(
-            Schema.Union(
-              Schema.Literal('start').annotations({ description: 'The items are being added before the pivot item.' }),
-              Schema.Literal('end').annotations({ description: 'The items are being added after the pivot item.' }),
+          scrollIntoView: S.optional(S.Boolean.annotations({ description: 'Scroll the items into view.' })),
+          pivotId: S.optional(S.String.annotations({ description: 'The id of the item to place new items next to.' })),
+          positioning: S.optional(
+            S.Union(
+              S.Literal('start').annotations({ description: 'The items are being added before the pivot item.' }),
+              S.Literal('end').annotations({ description: 'The items are being added after the pivot item.' }),
             ),
           ),
         }),
       ),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
-  export class Set extends Schema.TaggedClass<Set>()(UPDATE_LAYOUT, {
-    input: Schema.Struct({
-      part: Schema.Literal('main').annotations({ description: 'Setting items in the main content area.' }),
-      subject: Schema.Array(Schema.String.annotations({ description: 'Ids of the items to set.' })),
-      options: Schema.Struct({
-        override: Schema.Literal(true).annotations({
-          description: 'Override the current items in the main content area.',
-        }),
+  export class Set extends S.TaggedClass<Set>()(UPDATE_LAYOUT, {
+    input: S.Struct({
+      part: S.Literal('main').annotations({ description: 'Setting items in the main content area.' }),
+      subject: S.Array(S.String.annotations({ description: 'Ids of the items to set.' })),
+      options: S.Struct({
+        override: S.Literal(true).annotations({ description: 'Override the current items in the main content area.' }),
       }),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
-  export class Close extends Schema.TaggedClass<Close>()(UPDATE_LAYOUT, {
-    input: Schema.Struct({
-      part: Schema.Literal('main').annotations({ description: 'Closing items in the main content area.' }),
-      subject: Schema.Array(Schema.String.annotations({ description: 'Ids of the items to close.' })),
-      options: Schema.Struct({
-        state: Schema.Literal(false).annotations({ description: 'The items are being removed.' }),
+  export class Close extends S.TaggedClass<Close>()(UPDATE_LAYOUT, {
+    input: S.Struct({
+      part: S.Literal('main').annotations({ description: 'Closing items in the main content area.' }),
+      subject: S.Array(S.String.annotations({ description: 'Ids of the items to close.' })),
+      options: S.Struct({
+        state: S.Literal(false).annotations({ description: 'The items are being removed.' }),
       }),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
-  export class ScrollIntoView extends Schema.TaggedClass<ScrollIntoView>()(UPDATE_LAYOUT, {
-    input: Schema.Struct({
-      part: Schema.Literal('current').annotations({ description: 'Setting the current item' }),
-      subject: Schema.optional(Schema.String.annotations({ description: 'The id of the item to set as current.' })),
-      options: Schema.optional(
-        Schema.Record({ key: Schema.String, value: Schema.Any }).annotations({
+  export class ScrollIntoView extends S.TaggedClass<ScrollIntoView>()(UPDATE_LAYOUT, {
+    input: S.Struct({
+      part: S.Literal('current').annotations({ description: 'Setting the current item' }),
+      subject: S.optional(S.String.annotations({ description: 'The id of the item to set as current.' })),
+      options: S.optional(
+        S.Record({ key: S.String, value: S.Any }).annotations({
           description: 'Additional options for the scroll into view.',
         }),
       ),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 
-  export class Expose extends Schema.TaggedClass<Expose>()(UPDATE_LAYOUT, {
-    input: Schema.Struct({
-      part: Schema.Literal('navigation').annotations({ description: 'Exposing an item in the navigation area.' }),
-      subject: Schema.String.annotations({ description: 'The id of the item to expose.' }),
+  export class Expose extends S.TaggedClass<Expose>()(UPDATE_LAYOUT, {
+    input: S.Struct({
+      part: S.Literal('navigation').annotations({ description: 'Exposing an item in the navigation area.' }),
+      subject: S.String.annotations({ description: 'The id of the item to expose.' }),
     }),
-    output: Schema.Void,
+    output: S.Void,
   }) {}
 }

package/src/common/translations.ts

@@ -2,16 +2,16 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema } from 'effect';
+import { Schema as S } from 'effect';
 
-export const ResourceKey = Schema.Union(Schema.String, Schema.Record({ key: Schema.String, value: Schema.Any }));
-export type ResourceKey = Schema.Schema.Type<typeof ResourceKey>;
+export const ResourceKey = S.Union(S.String, S.Record({ key: S.String, value: S.Any }));
+export type ResourceKey = S.Schema.Type<typeof ResourceKey>;
 
-export const ResourceLanguage = Schema.Record({ key: Schema.String, value: ResourceKey });
-export type ResourceLanguage = Schema.Schema.Type<typeof ResourceLanguage>;
+export const ResourceLanguage = S.Record({ key: S.String, value: ResourceKey });
+export type ResourceLanguage = S.Schema.Type<typeof ResourceLanguage>;
 
 /**
  * A resource is a collection of translations for a language.
  */
-export const Resource = Schema.Record({ key: Schema.String, value: ResourceLanguage });
-export type Resource = Schema.Schema.Type<typeof Resource>;
+export const Resource = S.Record({ key: S.String, value: ResourceLanguage });
+export type Resource = S.Schema.Type<typeof Resource>;

package/src/core/capabilities.test.ts

@@ -2,11 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Registry } from '@effect-rx/rx-react';
 import { Effect } from 'effect';
-import { describe, expect, it, onTestFinished } from 'vitest';
+import { describe, expect, it } from 'vitest';
 
-import { defineCapability, PluginContext } from './capabilities';
+import { updateCounter } from '@dxos/echo-schema/testing';
+import { registerSignalsRuntime } from '@dxos/echo-signals';
+
+import { defineCapability, PluginsContext } from './capabilities';
+
+registerSignalsRuntime();
 
 const defaultOptions = {
   activate: () => Effect.succeed(false),
@@ -15,122 +19,99 @@ const defaultOptions = {
 
 describe('PluginsContext', () => {
   it('should return empty array if no capabilities are contributed', () => {
-    const registry = Registry.make();
-    const context = new PluginContext({ registry, ...defaultOptions });
+    const context = new PluginsContext(defaultOptions);
     const interfaceDef = defineCapability<{ example: string }>('@dxos/app-framework/test/example');
-    expect(context.getCapabilities(interfaceDef)).toEqual([]);
+    expect(context.requestCapabilities(interfaceDef)).toEqual([]);
   });
 
   it('should be able to contribute and request capabilities', () => {
-    const registry = Registry.make();
-    const context = new PluginContext({ registry, ...defaultOptions });
+    const context = new PluginsContext(defaultOptions);
     const interfaceDef = defineCapability<{ example: string }>('@dxos/app-framework/test/example');
     const implementation = { example: 'identifier' };
     context.contributeCapability({ interface: interfaceDef, implementation, module: 'test' });
-    expect(context.getCapabilities(interfaceDef)).toEqual([implementation]);
+    expect(context.requestCapabilities(interfaceDef)).toEqual([implementation]);
   });
 
   it('should be able to remove capabilities', () => {
-    const registry = Registry.make();
-    const context = new PluginContext({ registry, ...defaultOptions });
+    const context = new PluginsContext(defaultOptions);
     const interfaceDef = defineCapability<{ example: string }>('@dxos/app-framework/test/example');
     const implementation = { example: 'identifier' };
     context.contributeCapability({ interface: interfaceDef, implementation, module: 'test' });
-    expect(context.getCapabilities(interfaceDef)).toEqual([implementation]);
+    expect(context.requestCapabilities(interfaceDef)).toEqual([implementation]);
     context.removeCapability(interfaceDef, implementation);
-    expect(context.getCapabilities(interfaceDef)).toEqual([]);
+    expect(context.requestCapabilities(interfaceDef)).toEqual([]);
   });
 
   it('should be able to contribute and request multiple implementations', () => {
-    const registry = Registry.make();
-    const context = new PluginContext({ registry, ...defaultOptions });
+    const context = new PluginsContext(defaultOptions);
     const interfaceDef = defineCapability<{ example: string }>('@dxos/app-framework/test/example');
     const implementation1 = { example: 'first' };
     const implementation2 = { example: 'second' };
     context.contributeCapability({ interface: interfaceDef, implementation: implementation1, module: 'test' });
     context.contributeCapability({ interface: interfaceDef, implementation: implementation2, module: 'test' });
-    expect(context.getCapabilities(interfaceDef)).toEqual([implementation1, implementation2]);
+    expect(context.requestCapabilities(interfaceDef)).toEqual([implementation1, implementation2]);
   });
 
   it('should be able to request multiple capabilities', () => {
-    const registry = Registry.make();
-    const context = new PluginContext({ registry, ...defaultOptions });
+    const context = new PluginsContext(defaultOptions);
     const interfaceDef1 = defineCapability<{ one: number }>('@dxos/app-framework/test/one');
     const interfaceDef2 = defineCapability<{ two: number }>('@dxos/app-framework/test/two');
     const implementation1 = { one: 1 };
     const implementation2 = { two: 2 };
     context.contributeCapability({ interface: interfaceDef1, implementation: implementation1, module: 'test' });
     context.contributeCapability({ interface: interfaceDef2, implementation: implementation2, module: 'test' });
-    expect(context.getCapabilities(interfaceDef1)).toEqual([implementation1]);
-    expect(context.getCapabilities(interfaceDef2)).toEqual([implementation2]);
+    expect(context.requestCapabilities(interfaceDef1)).toEqual([implementation1]);
+    expect(context.requestCapabilities(interfaceDef2)).toEqual([implementation2]);
   });
 
   it('should be reactive', () => {
-    const registry = Registry.make();
-    const context = new PluginContext({ registry, ...defaultOptions });
+    const context = new PluginsContext(defaultOptions);
     const interfaceDef = defineCapability<{ example: string }>('@dxos/app-framework/test/example');
 
-    let count = 0;
-    const cancel = registry.subscribe(context.capabilities(interfaceDef), () => {
-      count++;
+    using updates = updateCounter(() => {
+      context.requestCapabilities(interfaceDef);
     });
-    onTestFinished(() => cancel());
-    expect(count).toEqual(0);
 
-    registry.get(context.capabilities(interfaceDef));
-    expect(count).toEqual(1);
+    expect(updates.count).toEqual(0);
 
     const implementation = { example: 'identifier' };
     context.contributeCapability({ interface: interfaceDef, implementation, module: 'test' });
-    expect(count).toEqual(2);
+    expect(updates.count).toEqual(1);
 
     context.removeCapability(interfaceDef, implementation);
-    expect(count).toEqual(3);
+    expect(updates.count).toEqual(2);
   });
 
   it('should not be reactive to changes within the implementation', () => {
-    const registry = Registry.make();
-    const context = new PluginContext({ registry, ...defaultOptions });
+    const context = new PluginsContext(defaultOptions);
     const interfaceDef = defineCapability<{ example: string }>('@dxos/app-framework/test/example');
 
-    let count = 0;
-    const cancel = registry.subscribe(context.capabilities(interfaceDef), () => {
-      count++;
+    using updates = updateCounter(() => {
+      context.requestCapabilities(interfaceDef);
     });
-    onTestFinished(() => cancel());
-    expect(count).toEqual(0);
 
-    registry.get(context.capabilities(interfaceDef));
-    expect(count).toEqual(1);
+    expect(updates.count).toEqual(0);
 
     const implementation = { example: 'identifier' };
     context.contributeCapability({ interface: interfaceDef, implementation, module: 'test' });
-    expect(count).toEqual(2);
+    expect(updates.count).toEqual(1);
 
     implementation.example = 'updated';
-    expect(count).toEqual(2);
+    expect(updates.count).toEqual(1);
 
-    const capabilities = context.getCapabilities(interfaceDef);
+    const capabilities = context.requestCapabilities(interfaceDef);
     expect(capabilities).toEqual([implementation]);
     expect(capabilities[0].example).toEqual('updated');
-    expect(count).toEqual(2);
+    expect(updates.count).toEqual(1);
   });
 
   it('should be able to wait for a capability', async () => {
-    const registry = Registry.make();
-    const context = new PluginContext({ registry, ...defaultOptions });
+    const context = new PluginsContext(defaultOptions);
     const interfaceDef = defineCapability<{ example: string }>('@dxos/app-framework/test/example');
-
-    let capability: { example: string } | undefined;
-    const cancel = registry.subscribe(context.capabilities(interfaceDef), (capabilities) => {
-      capability = capabilities[0];
-    });
-    onTestFinished(() => cancel());
-    registry.get(context.capabilities(interfaceDef));
-    expect(capability).toBeUndefined();
-
     const implementation = { example: 'identifier' };
+    const promise = context.waitForCapability(interfaceDef);
     context.contributeCapability({ interface: interfaceDef, implementation, module: 'test' });
+    const capability = await promise;
     expect(capability).toEqual(implementation);
   });
 });