@dxos/app-framework 0.8.4-main.3eb6e50203 → 0.8.4-main.3fbcb4aa9b

package/moon.yml

@@ -4,6 +4,7 @@ tags:
   - pack
   - ts-build
   - ts-test
+  - ts-test-storybook
   - typedoc
   - storybook
 tasks:
@@ -19,7 +20,18 @@ tasks:
       - '--entryPoint=src/common/activation-events.ts'
       - '--entryPoint=src/ui/index.ts'
       - '--entryPoint=src/testing/index.ts'
-  test:
-    inputs:
-      - .storybook/*
-      - /tools/storybook-react/.storybook/main.ts
+      - '--entryPoint=src/testing/react.tsx'
+      - '--entryPoint=src/core/url-loader.ts'
+    deps:
+      - compile-plugin
+  compile-plugin:
+    command: dx-compile
+    args:
+      - '--entryPoint=src/vite-plugin/index.ts'
+      - '--outputPath=dist/plugin'
+      - '--platform=node'
+    deps:
+      - ^:compile
+      - dx-compile:compile
+    outputs:
+      - dist/plugin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/app-framework",
-  "version": "0.8.4-main.3eb6e50203",
+  "version": "0.8.4-main.3fbcb4aa9b",
   "description": "A framework for building applications from composible plugins.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -14,132 +14,128 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs",
-      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts"
     },
     "./ActivationEvent": {
+      "source": "./src/core/activation-event.ts",
       "browser": "./dist/lib/browser/activation-event/index.mjs",
       "node": "./dist/lib/node-esm/activation-event/index.mjs",
-      "source": "./src/core/activation-event.ts",
       "types": "./dist/types/src/activation-event/index.d.ts"
     },
     "./ActivationEvents": {
+      "source": "./src/common/activation-events.ts",
       "browser": "./dist/lib/browser/common/activation-events.mjs",
       "node": "./dist/lib/node-esm/common/activation-events.mjs",
-      "source": "./src/common/activation-events.ts",
       "types": "./dist/types/src/common/activation-events.d.ts"
     },
     "./Capabilities": {
+      "source": "./src/common/capabilities.ts",
       "browser": "./dist/lib/browser/common/capabilities.mjs",
       "node": "./dist/lib/node-esm/common/capabilities.mjs",
-      "source": "./src/common/capabilities.ts",
       "types": "./dist/types/src/common/capabilities.d.ts"
     },
     "./Capability": {
+      "source": "./src/core/capability.ts",
       "browser": "./dist/lib/browser/capability/index.mjs",
       "node": "./dist/lib/node-esm/capability/index.mjs",
-      "source": "./src/core/capability.ts",
       "types": "./dist/types/src/capability/index.d.ts"
     },
     "./Plugin": {
+      "source": "./src/core/plugin.ts",
       "browser": "./dist/lib/browser/plugin/index.mjs",
       "node": "./dist/lib/node-esm/plugin/index.mjs",
-      "source": "./src/core/plugin.ts",
       "types": "./dist/types/src/plugin/index.d.ts"
     },
     "./PluginManager": {
+      "source": "./src/core/plugin-manager.ts",
       "browser": "./dist/lib/browser/plugin-manager/index.mjs",
       "node": "./dist/lib/node-esm/plugin-manager/index.mjs",
-      "source": "./src/core/plugin-manager.ts",
       "types": "./dist/types/src/plugin-manager/index.d.ts"
     },
+    "./UrlLoader": {
+      "source": "./src/core/url-loader.ts",
+      "browser": "./dist/lib/browser/url-loader/index.mjs",
+      "node": "./dist/lib/node-esm/url-loader/index.mjs",
+      "types": "./dist/types/src/url-loader/index.d.ts"
+    },
+    "./vite-plugin": {
+      "import": "./dist/plugin/node-esm/index.mjs",
+      "types": "./dist/types/src/vite-plugin/index.d.ts"
+    },
     "./cli": {
+      "source": "./src/cli/index.ts",
       "browser": "./dist/lib/browser/cli/index.mjs",
       "node": "./dist/lib/node-esm/cli/index.mjs",
-      "source": "./src/cli/index.ts",
       "types": "./dist/types/src/cli/index.d.ts"
     },
     "./testing": {
+      "source": "./src/testing/index.ts",
       "browser": "./dist/lib/browser/testing/index.mjs",
       "node": "./dist/lib/node-esm/testing/index.mjs",
-      "source": "./src/testing/index.ts",
       "types": "./dist/types/src/testing/index.d.ts"
     },
+    "./testing-react": {
+      "source": "./src/testing/react.tsx",
+      "browser": "./dist/lib/browser/testing/react.mjs",
+      "node": "./dist/lib/node-esm/testing/react.mjs",
+      "types": "./dist/types/src/testing/react.d.ts"
+    },
     "./ui": {
+      "source": "./src/ui/index.ts",
       "browser": "./dist/lib/browser/ui/index.mjs",
       "node": "./dist/lib/node-esm/ui/index.mjs",
-      "source": "./src/ui/index.ts",
       "types": "./dist/types/src/ui/index.d.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "ActivationEvent": [
-        "dist/types/src/activation-event/index.d.ts"
-      ],
-      "ActivationEvents": [
-        "dist/types/src/common/activation-events.d.ts"
-      ],
-      "Capabilities": [
-        "dist/types/src/common/capabilities.d.ts"
-      ],
-      "Capability": [
-        "dist/types/src/capability/index.d.ts"
-      ],
-      "Plugin": [
-        "dist/types/src/plugin/index.d.ts"
-      ],
-      "PluginManager": [
-        "dist/types/src/plugin-manager/index.d.ts"
-      ],
-      "cli": [
-        "dist/types/src/cli/index.d.ts"
-      ],
-      "testing": [
-        "dist/types/src/testing/index.d.ts"
-      ],
-      "ui": [
-        "dist/types/src/ui/index.d.ts"
-      ]
-    }
-  },
   "dependencies": {
     "@effect/cli": "0.73.2",
-    "@dxos/debug": "0.8.4-main.3eb6e50203",
-    "@dxos/async": "0.8.4-main.3eb6e50203",
-    "@dxos/echo": "0.8.4-main.3eb6e50203",
-    "@dxos/invariant": "0.8.4-main.3eb6e50203",
-    "@dxos/log": "0.8.4-main.3eb6e50203",
-    "@dxos/effect": "0.8.4-main.3eb6e50203",
-    "@dxos/operation": "0.8.4-main.3eb6e50203",
-    "@dxos/react-hooks": "0.8.4-main.3eb6e50203",
-    "@dxos/react-ui": "0.8.4-main.3eb6e50203",
-    "@dxos/util": "0.8.4-main.3eb6e50203",
-    "@dxos/web-context-react": "0.8.4-main.3eb6e50203",
-    "@dxos/web-context": "0.8.4-main.3eb6e50203"
+    "cjs-module-lexer": "^2.2.0",
+    "@dxos/context": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/async": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/compute": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/debug": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/edge-client": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/errors": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/effect": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/log": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/invariant": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/operation": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/protocols": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-error-boundary": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-hooks": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/echo": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/web-context": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/util": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/web-context-react": "0.8.4-main.3fbcb4aa9b"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "0.94.4",
-    "@effect/vitest": "0.27.0",
+    "@effect/vitest": "0.29.0",
+    "@testing-library/react": "^16.3.0",
     "@types/react": "~19.2.7",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "typedoc": "0.28.1",
-    "@dxos/echo-db": "0.8.4-main.3eb6e50203",
-    "@dxos/random": "0.8.4-main.3eb6e50203",
-    "@dxos/ui-theme": "0.8.4-main.3eb6e50203",
-    "@dxos/storybook-utils": "0.8.4-main.3eb6e50203",
-    "@dxos/test-utils": "0.8.4-main.3eb6e50203"
+    "vite": "^8.0.10",
+    "@dxos/brand": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/echo-db": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/random": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/test-utils": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/storybook-utils": "0.8.4-main.3fbcb4aa9b"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "0.94.4",
-    "effect": "3.19.16",
+    "@testing-library/react": "^16.3.0",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3"
   },

package/src/cli/cli.ts

@@ -17,7 +17,7 @@ const defaultPluginLoader =
     Effect.sync(() => {
       const plugin = plugins.find((plugin) => plugin.meta.id === id);
       invariant(plugin, `Plugin not found: ${id}`);
-      return plugin;
+      return { plugin };
     });
 
 type SubCommands = [Command.Command<any, any, any, any>, ...Array<Command.Command<any, any, any, any>>];
@@ -75,13 +75,13 @@ export const createCliApp = Effect.fn(function* ({
   manager.capabilities.contribute({
     interface: Capabilities.PluginManager,
     implementation: manager,
-    module: 'dxos.org/app-framework/plugin-manager',
+    module: 'org.dxos.app-framework.plugin-manager',
   });
 
   manager.capabilities.contribute({
     interface: Capabilities.AtomRegistry,
     implementation: manager.registry,
-    module: 'dxos.org/app-framework/atom-registry',
+    module: 'org.dxos.app-framework.atom-registry',
   });
 
   // Activate startup event to load CLI commands and Effect layers.

package/src/common/activation-events.ts

@@ -7,7 +7,7 @@ import { ActivationEvent as ActivationEvent$ } from '../core';
 /**
  * Fired when the app is started.
  */
-export const Startup = ActivationEvent$.make('dxos.org/app-framework/event/startup');
+export const Startup = ActivationEvent$.make('org.dxos.app-framework.event.startup');
 
 //
 // Dependent Events
@@ -16,18 +16,18 @@ export const Startup = ActivationEvent$.make('dxos.org/app-framework/event/start
 /**
  * Fired to load any newly available surfaces.
  */
-export const SetupReactSurface = ActivationEvent$.make('dxos.org/app-framework/event/setup-react-surface');
+export const SetupReactSurface = ActivationEvent$.make('org.dxos.app-framework.event.setup-react-surface');
 
 /**
  * Fired before the operation invoker is activated.
  */
-export const SetupOperationResolver = ActivationEvent$.make('dxos.org/app-framework/event/setup-operation-resolver');
+export const SetupOperationHandler = ActivationEvent$.make('org.dxos.app-framework.event.setup-operation-handler');
 
 /**
  * Fired before the managed runtime is created.
  * Plugins should contribute their Layer capabilities before this event.
  */
-export const SetupLayer = ActivationEvent$.make('dxos.org/app-framework/event/setup-layer');
+export const SetupLayer = ActivationEvent$.make('org.dxos.app-framework.event.setup-layer');
 
 //
 // Triggered Events
@@ -36,9 +36,9 @@ export const SetupLayer = ActivationEvent$.make('dxos.org/app-framework/event/se
 /**
  * Fired after the operation invoker is ready.
  */
-export const OperationInvokerReady = ActivationEvent$.make('dxos.org/app-framework/event/operation-invoker-ready');
+export const OperationInvokerReady = ActivationEvent$.make('org.dxos.app-framework.event.operation-invoker-ready');
 
 /**
  * Fired after the managed runtime is ready.
  */
-export const ManagedRuntimeReady = ActivationEvent$.make('dxos.org/app-framework/event/managed-runtime-ready');
+export const ManagedRuntimeReady = ActivationEvent$.make('org.dxos.app-framework.event.managed-runtime-ready');

package/src/common/annotations.ts

@@ -0,0 +1,3 @@
+//
+// Copyright 2025 DXOS.org
+//

package/src/common/capabilities.ts

@@ -2,14 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-import type * as Command$ from '@effect/cli/Command';
 import { type Atom, type Registry } from '@effect-atom/atom-react';
+import type * as Command$ from '@effect/cli/Command';
 import * as Effect from 'effect/Effect';
 import type * as Layer$ from 'effect/Layer';
 import type * as ManagedRuntime$ from 'effect/ManagedRuntime';
 import type { FC, PropsWithChildren } from 'react';
 
-import type { OperationInvoker as OperationInvoker$, OperationResolver as OperationResolver$ } from '@dxos/operation';
+import type { OperationHandlerSet } from '@dxos/compute';
+import { OperationInvoker as OperationInvoker$ } from '@dxos/operation';
 
 import { Capability as Capability$, type PluginManager as PluginManager$ } from '../core';
 import type {
@@ -23,19 +24,19 @@ import type { Surface } from '../ui';
  * Null capability.
  * @category Capability
  */
-export const Null = Capability$.make<null>('dxos.org/app-framework/capability/null');
+export const Null = Capability$.make<null>('org.dxos.app-framework.capability.null');
 
 /**
  * @category Capability
  */
 export const PluginManager = Capability$.make<PluginManager$.PluginManager>(
-  'dxos.org/app-framework/capability/plugin-manager',
+  'org.dxos.app-framework.capability.plugin-manager',
 );
 
 /**
  * @category Capability
  */
-export const AtomRegistry = Capability$.make<Registry.Registry>('dxos.org/app-framework/capability/atom-registry');
+export const AtomRegistry = Capability$.make<Registry.Registry>('org.dxos.app-framework.capability.atom-registry');
 
 export type ReactContext = Readonly<{
   id: string;
@@ -46,14 +47,14 @@ export type ReactContext = Readonly<{
 /**
  * @category Capability
  */
-export const ReactContext = Capability$.make<ReactContext>('dxos.org/app-framework/capability/react-context');
+export const ReactContext = Capability$.make<ReactContext>('org.dxos.app-framework.capability.react-context');
 
 export type ReactRoot = Readonly<{ id: string; root: FC<PropsWithChildren> }>;
 
 /**
  * @category Capability
  */
-export const ReactRoot = Capability$.make<ReactRoot>('dxos.org/app-framework/capability/react-root');
+export const ReactRoot = Capability$.make<ReactRoot>('org.dxos.app-framework.capability.react-root');
 
 /**
  * Surface definitions that can be either React components or Web Components.
@@ -63,39 +64,33 @@ export type ReactSurface = Surface.Definition | readonly Surface.Definition[];
 /**
  * @category Capability
  */
-export const ReactSurface = Capability$.make<ReactSurface>('dxos.org/app-framework/common/react-surface');
+export const ReactSurface = Capability$.make<ReactSurface>('org.dxos.app-framework.common.react-surface');
 
 export type AnyCommand = Command$.Command<any, any, any, any>;
 
 /**
  * @category Capability
  */
-export const Command = Capability$.make<AnyCommand>('dxos.org/app-framework/capability/command');
+export const Command = Capability$.make<AnyCommand>('org.dxos.app-framework.capability.command');
 
 /**
  * @category Capability
  */
-export const Layer = Capability$.make<Layer$.Layer<any, any, any>>('dxos.org/app-framework/capability/layer');
+export const Layer = Capability$.make<Layer$.Layer<any, any, any>>('org.dxos.app-framework.capability.layer');
 
 export type ManagedRuntime = ManagedRuntime$.ManagedRuntime<any, any>;
 
 /**
  * @category Capability
  */
-export const ManagedRuntime = Capability$.make<ManagedRuntime>('dxos.org/app-framework/capability/managed-runtime');
+export const ManagedRuntime = Capability$.make<ManagedRuntime>('org.dxos.app-framework.capability.managed-runtime');
 
 //
 // Operation System Capabilities
 //
 
-export type OperationResolver = OperationResolver$.OperationResolver<any, any, any, any>;
-
-/**
- * Handler registration for operations - contributed by plugins.
- * @category Capability
- */
-export const OperationResolver = Capability$.make<OperationResolver[]>(
-  'dxos.org/app-framework/capability/operation-resolver',
+export const OperationHandler = Capability$.make<OperationHandlerSet.OperationHandlerSet>(
+  'org.dxos.app-framework.capability.operation-handler',
 );
 
 export type UndoMapping = UndoMapping$.UndoMapping;
@@ -104,7 +99,7 @@ export type UndoMapping = UndoMapping$.UndoMapping;
  * Undo mapping registration - contributed by plugins.
  * @category Capability
  */
-export const UndoMapping = Capability$.make<UndoMapping[]>('dxos.org/app-framework/capability/undo-mapping');
+export const UndoMapping = Capability$.make<UndoMapping[]>('org.dxos.app-framework.capability.undo-mapping');
 
 export type OperationInvoker = OperationInvoker$.OperationInvoker;
 
@@ -113,7 +108,7 @@ export type OperationInvoker = OperationInvoker$.OperationInvoker;
  * @category Capability
  */
 export const OperationInvoker = Capability$.make<OperationInvoker>(
-  'dxos.org/app-framework/capability/operation-invoker',
+  'org.dxos.app-framework.capability.operation-invoker',
 );
 
 export type UndoRegistry = UndoRegistry$.UndoRegistry;
@@ -122,7 +117,7 @@ export type UndoRegistry = UndoRegistry$.UndoRegistry;
  * Undo registry - provided by OperationPlugin.
  * @category Capability
  */
-export const UndoRegistry = Capability$.make<UndoRegistry>('dxos.org/app-framework/capability/undo-registry');
+export const UndoRegistry = Capability$.make<UndoRegistry>('org.dxos.app-framework.capability.undo-registry');
 
 export type HistoryTracker = HistoryTracker$.HistoryTracker;
 
@@ -130,7 +125,7 @@ export type HistoryTracker = HistoryTracker$.HistoryTracker;
  * History tracker - provided by OperationPlugin.
  * @category Capability
  */
-export const HistoryTracker = Capability$.make<HistoryTracker>('dxos.org/app-framework/capability/history-tracker');
+export const HistoryTracker = Capability$.make<HistoryTracker>('org.dxos.app-framework.capability.history-tracker');
 
 //
 // Atom Capability Helpers

package/src/common/operations.ts

@@ -4,13 +4,12 @@
 
 import * as Schema from 'effect/Schema';
 
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { Capability } from '../core';
-
 import { Label } from './translations';
 
-const UNDO_NAMESPACE = 'dxos.org/app-framework/undo';
+const UNDO_NAMESPACE = 'org.dxos.app-framework.undo';
 
 /**
  * Operations related to undo/history functionality.
@@ -22,17 +21,15 @@ export namespace UndoOperation {
    */
   export const ShowUndo = Operation.make({
     meta: {
-      key: `${UNDO_NAMESPACE}/operation/show-undo`,
+      key: `${UNDO_NAMESPACE}.operation.show-undo`,
       name: 'Show Undo',
       description: 'Show an undo toast notification.',
     },
     executionMode: 'sync',
     services: [Capability.Service],
-    schema: {
-      input: Schema.Struct({
-        message: Schema.optional(Label.annotations({ description: 'The message to display in the undo toast.' })),
-      }),
-      output: Schema.Void,
-    },
+    input: Schema.Struct({
+      message: Schema.optional(Label.annotations({ description: 'The message to display in the undo toast.' })),
+    }),
+    output: Schema.Void,
   });
 }

package/src/context.ts

@@ -6,4 +6,4 @@ import { createContext } from '@dxos/web-context';
 
 import { type PluginManager } from './core';
 
-export const PluginManagerContext = createContext<PluginManager.PluginManager>('dxos.org/app-framework/plugin-manager');
+export const PluginManagerContext = createContext<PluginManager.PluginManager>('org.dxos.app-framework.plugin-manager');

package/src/core/activation-event.ts

@@ -2,11 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
+import { compositeKey } from '@dxos/util';
+
 /**
  * A unique string identifier representing an event.
  * This is expected to be a URI, where initial parts are often the id of the plugin whose package defines the event.
  *
- * @example dxos.org/plugin/example/event/ready
+ * @example org.dxos.plugin.example.event.ready
  */
 export type ActivationEvent = {
   id: string;
@@ -31,7 +33,8 @@ export const make = (id: string, specifier?: string) => {
 /**
  * Helper to create an activation event key.
  */
-export const eventKey = (event: ActivationEvent) => (event.specifier ? `${event.id}:${event.specifier}` : event.id);
+export const eventKey = (event: ActivationEvent) =>
+  event.specifier ? compositeKey(event.id, event.specifier) : event.id;
 
 /**
  * Helper to create an activation event that triggers when any of the given events are activated.

package/src/core/capability-manager.test.ts

@@ -2,8 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { describe, expect, it, onTestFinished } from '@effect/vitest';
 import { Registry } from '@effect-atom/atom-react';
+import { describe, expect, it, onTestFinished } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 
 import * as Capability from './capability';

package/src/core/capability-manager.ts

@@ -59,6 +59,12 @@ export interface CapabilityManager {
    * @returns The capability.
    */
   waitFor<T>(interfaceDef: Capability.InterfaceDef<T>): Effect.Effect<T, Error>;
+
+  /**
+   * Get capabilities grouped by the module that contributed them.
+   * @returns An atom containing a record from module ID to capability implementations.
+   */
+  atomByModule<T>(interfaceDef: Capability.InterfaceDef<T>): Atom.Atom<Record<string, T[]>>;
 }
 
 /**
@@ -75,7 +81,18 @@ class CapabilityManagerImpl implements CapabilityManager {
     return Atom.make((get) => {
       const current = get(this._capabilityEntries(id));
       return current.map((c) => c.implementation);
-    });
+    }).pipe(Atom.keepAlive);
+  });
+
+  readonly _capabilitiesByModule = Atom.family<string, Atom.Atom<Record<string, unknown[]>>>((id: string) => {
+    return Atom.make((get) => {
+      const entries = get(this._capabilityEntries(id));
+      const result: Record<string, unknown[]> = {};
+      for (const entry of entries) {
+        (result[entry.moduleId] ??= []).push(entry.implementation);
+      }
+      return result;
+    }).pipe(Atom.keepAlive);
   });
 
   readonly _capability = Atom.family<string, Atom.Atom<unknown>>((id: string) => {
@@ -163,6 +180,10 @@ class CapabilityManagerImpl implements CapabilityManager {
       return result;
     });
   }
+
+  atomByModule<T>(interfaceDef: Capability.InterfaceDef<T>): Atom.Atom<Record<string, T[]>> {
+    return this._capabilitiesByModule(interfaceDef.identifier) as Atom.Atom<Record<string, T[]>>;
+  }
 }
 
 /**

package/src/core/capability.ts

@@ -62,6 +62,16 @@ export const waitFor = <T>(interfaceDef: InterfaceDef<T>): Effect.Effect<T, Erro
 export const atom = <T>(interfaceDef: InterfaceDef<T>): Effect.Effect<Atom.Atom<T[]>, never, Service> =>
   Effect.map(Service, (manager) => manager.atom(interfaceDef));
 
+/**
+ * Get capabilities grouped by the module that contributed them.
+ * @param interfaceDef The interface definition of the capability.
+ * @returns An Atom containing a record from module ID to capability implementations.
+ */
+export const atomByModule = <T>(
+  interfaceDef: InterfaceDef<T>,
+): Effect.Effect<Atom.Atom<Record<string, T[]>>, never, Service> =>
+  Effect.map(Service, (manager) => manager.atomByModule(interfaceDef));
+
 const InterfaceDefTypeId: unique symbol = Symbol.for('InterfaceDefTypeId');
 
 /**
@@ -120,6 +130,7 @@ export type ModuleReturn = void | Any | Any[] | readonly Any[] | [Any, ...Any[]]
 /**
  * Helper to define the implementation of a capability.
  */
+// TODO(dmaretskyi): Make the return type non-generic so capabilities are non-discernable.
 export const contributes = <I extends InterfaceDef<any>>(
   interfaceDef: I,
   implementation: Capability<InterfaceDef.Implementation<I>>['implementation'],
@@ -133,10 +144,10 @@ export const contributes = <I extends InterfaceDef<any>>(
 };
 
 type LoadCapability<Props, Capabilities extends ModuleReturn = ModuleReturn> = () => Promise<{
-  default: (props?: Props) => Effect.Effect<Capabilities, Error, Service | Plugin.Service | never>;
+  default: (props: Props) => Effect.Effect<Capabilities, Error, Service | Plugin.Service | never>;
 }>;
 type LoadCapabilities<Props, Capabilities extends ModuleReturn = ModuleReturn> = () => Promise<{
-  default: (props?: Props) => Effect.Effect<Capabilities, Error, Service | Plugin.Service | never>;
+  default: (props: Props) => Effect.Effect<Capabilities, Error, Service | Plugin.Service | never>;
 }>;
 
 type NormalizeReturn<R> = R extends readonly (infer A)[]
@@ -148,7 +159,7 @@ type NormalizeReturn<R> = R extends readonly (infer A)[]
       : Any[];
 
 export type LazyCapability<Props = void, Capabilities extends ModuleReturn = ModuleReturn, E extends Error = Error> = (
-  props?: Props,
+  props: Props,
 ) => Effect.Effect<NormalizeReturn<Capabilities>, E, Service | Plugin.Service | never>;
 
 /**
@@ -162,9 +173,9 @@ export const lazy = <T = void, R extends ModuleReturn = ModuleReturn>(
   name: string,
   c: LoadCapability<T, R> | LoadCapabilities<T, R>,
 ): LazyCapability<T, R> => {
-  const lazyFn: LazyCapability<T, R> = (props?: T) =>
+  const lazyFn: LazyCapability<T, R> = (props: T) =>
     Effect.gen(function* () {
-      const { default: getCapability } = yield* Effect.tryPromise(() => c());
+      const { default: getCapability } = yield* Effect.promise(() => c());
       const result = yield* getCapability(props);
       const normalized = result == null ? [] : Array.isArray(result) ? Array.from(result) : [result];
       return normalized as NormalizeReturn<R>;
@@ -217,11 +228,11 @@ export const getModuleTag = (capability: unknown): string | undefined => {
  *   })
  * );
  *
- * // Module with additional options (context accessed via layer)
+ * // Module with required options (context accessed via layer)
  * export default Capability.makeModule(
- *   Effect.fnUntraced(function* ({ observability }: { observability?: boolean }) {
+ *   Effect.fnUntraced(function* (props: { observability: boolean }) {
  *     const invoker = yield* Capability.get(Capabilities.OperationInvoker);
- *     return contributes(Capabilities.IntentResolver, ...);
+ *     return contributes(Capabilities.OperationHandler, ...);
  *   })
  * );
  * ```
@@ -232,5 +243,5 @@ export const makeModule = <
   E extends Error = Error,
   R extends Service | Plugin.Service | never = Service,
 >(
-  fn: (props?: TProps) => Effect.Effect<TReturn, E, R>,
-): ((props?: TProps) => Effect.Effect<TReturn, E, R>) => fn;
+  fn: (props: TProps) => Effect.Effect<TReturn, E, R>,
+): ((props: TProps) => Effect.Effect<TReturn, E, R>) => fn;