@dxos/app-framework 0.8.4-main.8360d9e660 → 0.8.4-main.8baae0fced

package/moon.yml

@@ -20,3 +20,18 @@ tasks:
       - '--entryPoint=src/common/activation-events.ts'
       - '--entryPoint=src/ui/index.ts'
       - '--entryPoint=src/testing/index.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.8360d9e660",
+  "version": "0.8.4-main.8baae0fced",
   "description": "A framework for building applications from composible plugins.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": false,
   "type": "module",
@@ -55,6 +55,16 @@
       "node": "./dist/lib/node-esm/plugin-manager/index.mjs",
       "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",
@@ -67,6 +77,12 @@
       "node": "./dist/lib/node-esm/testing/index.mjs",
       "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",
@@ -75,72 +91,55 @@
     }
   },
   "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-atom/atom": "^0.5.1",
     "@effect/cli": "0.73.2",
-    "@dxos/async": "0.8.4-main.8360d9e660",
-    "@dxos/debug": "0.8.4-main.8360d9e660",
-    "@dxos/echo": "0.8.4-main.8360d9e660",
-    "@dxos/effect": "0.8.4-main.8360d9e660",
-    "@dxos/invariant": "0.8.4-main.8360d9e660",
-    "@dxos/operation": "0.8.4-main.8360d9e660",
-    "@dxos/react-error-boundary": "0.8.4-main.8360d9e660",
-    "@dxos/log": "0.8.4-main.8360d9e660",
-    "@dxos/react-hooks": "0.8.4-main.8360d9e660",
-    "@dxos/web-context": "0.8.4-main.8360d9e660",
-    "@dxos/util": "0.8.4-main.8360d9e660",
-    "@dxos/web-context-react": "0.8.4-main.8360d9e660"
+    "@effect/platform": "0.94.4",
+    "cjs-module-lexer": "^2.2.0",
+    "@dxos/async": "0.8.4-main.8baae0fced",
+    "@dxos/context": "0.8.4-main.8baae0fced",
+    "@dxos/debug": "0.8.4-main.8baae0fced",
+    "@dxos/compute": "0.8.4-main.8baae0fced",
+    "@dxos/echo": "0.8.4-main.8baae0fced",
+    "@dxos/edge-client": "0.8.4-main.8baae0fced",
+    "@dxos/effect": "0.8.4-main.8baae0fced",
+    "@dxos/compute-runtime": "0.8.4-main.8baae0fced",
+    "@dxos/errors": "0.8.4-main.8baae0fced",
+    "@dxos/log": "0.8.4-main.8baae0fced",
+    "@dxos/invariant": "0.8.4-main.8baae0fced",
+    "@dxos/functions": "0.8.4-main.8baae0fced",
+    "@dxos/operation": "0.8.4-main.8baae0fced",
+    "@dxos/protocols": "0.8.4-main.8baae0fced",
+    "@dxos/react-error-boundary": "0.8.4-main.8baae0fced",
+    "@dxos/react-hooks": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui": "0.8.4-main.8baae0fced",
+    "@dxos/ui-theme": "0.8.4-main.8baae0fced",
+    "@dxos/util": "0.8.4-main.8baae0fced",
+    "@dxos/web-context": "0.8.4-main.8baae0fced",
+    "@dxos/web-context-react": "0.8.4-main.8baae0fced"
   },
   "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/random": "0.8.4-main.8360d9e660",
-    "@dxos/echo-db": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui": "0.8.4-main.8360d9e660",
-    "@dxos/storybook-utils": "0.8.4-main.8360d9e660",
-    "@dxos/test-utils": "0.8.4-main.8360d9e660",
-    "@dxos/ui-theme": "0.8.4-main.8360d9e660"
+    "vite": "^8.0.13",
+    "@dxos/random": "0.8.4-main.8baae0fced",
+    "@dxos/brand": "0.8.4-main.8baae0fced",
+    "@dxos/echo-db": "0.8.4-main.8baae0fced",
+    "@dxos/storybook-utils": "0.8.4-main.8baae0fced",
+    "@dxos/test-utils": "0.8.4-main.8baae0fced"
   },
   "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>>];
@@ -28,7 +28,6 @@ export type CreateCliAppOptions = {
   pluginManager?: PluginManager.PluginManager;
   pluginLoader?: PluginManager.ManagerOptions['pluginLoader'];
   plugins?: Plugin.Plugin[];
-  core?: string[];
   enabled?: string[];
   safeMode?: boolean;
 };
@@ -44,8 +43,7 @@ export type CreateCliAppOptions = {
  *
  * @param options.pluginManager Optional existing PluginManager instance.
  * @param options.pluginLoader Function to load plugins by ID.
- * @param options.plugins All plugins available to the application.
- * @param options.core Core plugins which will always be enabled.
+ * @param options.plugins All plugins available to the application. Plugins whose `meta.tags` includes `'system'` are treated as core.
  * @param options.enabled Enabled plugins.
  * @param options.safeMode Whether to enable safe mode, which disables optional plugins.
  */
@@ -55,12 +53,10 @@ export const createCliApp = Effect.fn(function* ({
   pluginManager: pluginManagerProp,
   pluginLoader: pluginLoaderProp,
   plugins: pluginsProp = [],
-  core: coreProp,
   enabled: enabledProp = [],
   safeMode = false,
 }: CreateCliAppOptions) {
   const plugins = pluginsProp;
-  const core = coreProp ?? plugins.map(({ meta }) => meta.id);
   const pluginLoader = pluginLoaderProp ?? defaultPluginLoader(plugins);
   const enabled = safeMode ? [] : enabledProp;
   const manager =
@@ -68,7 +64,6 @@ export const createCliApp = Effect.fn(function* ({
     PluginManager.make({
       pluginLoader,
       plugins,
-      core,
       enabled,
     });
 

package/src/common/activation-events.ts

@@ -19,26 +19,21 @@ export const Startup = ActivationEvent$.make('org.dxos.app-framework.event.start
 export const SetupReactSurface = ActivationEvent$.make('org.dxos.app-framework.event.setup-react-surface');
 
 /**
- * Fired before the operation invoker is activated.
+ * Fired before the process manager is created.
+ * Plugins should contribute their {@link Capabilities.LayerSpec} entries and
+ * {@link Capabilities.OperationHandler} sets before this event fires so the
+ * process manager's {@link ServiceResolver} and {@link OperationInvoker} pick
+ * them up at construction time.
  */
-export const SetupOperationResolver = ActivationEvent$.make('org.dxos.app-framework.event.setup-operation-resolver');
-
-/**
- * Fired before the managed runtime is created.
- * Plugins should contribute their Layer capabilities before this event.
- */
-export const SetupLayer = ActivationEvent$.make('org.dxos.app-framework.event.setup-layer');
+export const SetupProcessManager = ActivationEvent$.make('org.dxos.app-framework.event.setup-process-manager');
 
 //
 // Triggered Events
 //
 
 /**
- * Fired after the operation invoker is ready.
- */
-export const OperationInvokerReady = ActivationEvent$.make('org.dxos.app-framework.event.operation-invoker-ready');
-
-/**
- * Fired after the managed runtime is ready.
+ * Fired after the process manager runtime is ready and its derived capabilities
+ * (`ProcessManagerRuntime`, `ServiceResolver`, `ProcessMonitor`, `OperationInvoker`)
+ * have been contributed.
  */
-export const ManagedRuntimeReady = ActivationEvent$.make('org.dxos.app-framework.event.managed-runtime-ready');
+export const ProcessManagerReady = ActivationEvent$.make('org.dxos.app-framework.event.process-manager-ready');

package/src/common/annotations.ts

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

package/src/common/capabilities.ts

@@ -2,21 +2,33 @@
 // 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 Exit$ from 'effect/Exit';
+import type * as Fiber$ from 'effect/Fiber';
 import type * as Layer$ from 'effect/Layer';
 import type * as ManagedRuntime$ from 'effect/ManagedRuntime';
+import type * as Runtime$ from 'effect/Runtime';
 import type { FC, PropsWithChildren } from 'react';
 
-import type { OperationInvoker as OperationInvoker$, OperationResolver as OperationResolver$ } from '@dxos/operation';
-
-import { Capability as Capability$, type PluginManager as PluginManager$ } from '../core';
+import type {
+  LayerSpec as LayerSpec$,
+  Operation as Operation$,
+  OperationHandlerSet,
+  Process as Process$,
+  ServiceResolver as ServiceResolver$,
+  Trace as Trace$,
+} from '@dxos/compute';
+import type { ProcessManager as ProcessManager$ } from '@dxos/compute-runtime';
+import { OperationInvoker as OperationInvoker$ } from '@dxos/operation';
+
+import { Capability as Capability$, Plugin as Plugin$, type PluginManager as PluginManager$ } from '../core';
 import type {
   HistoryTracker as HistoryTracker$,
   UndoMapping as UndoMapping$,
   UndoRegistry as UndoRegistry$,
-} from '../plugin-operation';
+} from '../plugin-process-manager';
 import type { Surface } from '../ui';
 
 /**
@@ -77,6 +89,127 @@ export const Command = Capability$.make<AnyCommand>('org.dxos.app-framework.capa
  */
 export const Layer = Capability$.make<Layer$.Layer<any, any, any>>('org.dxos.app-framework.capability.layer');
 
+/**
+ * Layer specification contributed by plugins.
+ *
+ * Plugins contribute {@link LayerSpec.LayerSpec} entries that are collected by the
+ * process-manager module and composed into a {@link LayerStack} which backs the
+ * {@link ProcessManagerRuntime}'s service resolver.
+ *
+ * @category Capability
+ */
+export const LayerSpec = Capability$.make<LayerSpec$.LayerSpec>('org.dxos.app-framework.capability.layer-spec');
+
+/**
+ * Context passed to {@link TraceSinkFactory} implementations when the
+ * process-manager capability materialises contributed sinks.
+ */
+export interface TraceSinkFactoryContext {
+  /**
+   * Service resolver backing the shared {@link ProcessManagerRuntime}. Use it
+   * to resolve per-space (or per-process) services like `FeedTraceSink` when
+   * building a routing sink.
+   */
+  readonly resolver: ServiceResolver$.ServiceResolver;
+}
+
+/**
+ * Factory that builds a {@link Trace$.Sink} when the process-manager
+ * capability is ready. Plugins that only need a static sink can ignore the
+ * context (e.g. `() => myConsoleSink`); plugins that need per-space routing
+ * can use {@link TraceSinkFactoryContext.resolver} to look up services.
+ */
+export type TraceSinkFactory = (ctx: TraceSinkFactoryContext) => Trace$.Sink;
+
+/**
+ * Trace sink contribution.
+ *
+ * Plugins contribute {@link TraceSinkFactory} functions; the process-manager
+ * capability invokes each factory with the runtime's
+ * {@link ServiceResolver$.ServiceResolver}, collects the resulting
+ * {@link Trace$.Sink}s, merges them via {@link Trace$.mergeSinks}, and
+ * installs the merged sink as {@link Trace$.TraceSink} in the runtime layer
+ * so every process writes to every contributed sink.
+ *
+ * @category Capability
+ */
+export const TraceSink = Capability$.make<TraceSinkFactory>('org.dxos.app-framework.capability.trace-sink');
+
+/**
+ * Service resolver backing the shared {@link ProcessManagerRuntime}.
+ *
+ * Contributed by the process-manager capability module. Consumers can combine
+ * it with {@link ServiceResolver$.provide} to build space-scoped layers without
+ * having to go through the process-manager runtime:
+ *
+ * @example
+ * ```ts
+ * const resolver = yield* Capability.get(Capabilities.ServiceResolver);
+ * yield* effect.pipe(
+ *   Effect.provide(
+ *     ServiceResolver.provide({ space }, Database.Service, QueueService).pipe(
+ *       Layer.provide(Layer.succeed(ServiceResolver.ServiceResolver, resolver)),
+ *     ),
+ *   ),
+ * );
+ * ```
+ *
+ * @category Capability
+ */
+export const ServiceResolver = Capability$.make<ServiceResolver$.ServiceResolver>(
+  'org.dxos.app-framework.capability.service-resolver',
+);
+
+/**
+ * Process monitor backing the shared {@link ProcessManagerRuntime}. Exposes the
+ * live process tree (including inactive/terminated entries) via
+ * {@link Process$.Monitor#processTreeAtom}.
+ *
+ * @category Capability
+ */
+export const ProcessMonitor = Capability$.make<Process$.Monitor>('org.dxos.app-framework.capability.process-monitor');
+
+/**
+ * Services that are always available when running effects through a {@link ProcessManagerRuntime}.
+ */
+export type ProcessManagerRuntimeServices =
+  | Capability$.Service
+  | Plugin$.Service
+  | ProcessManager$.ProcessManagerService
+  | Operation$.Service
+  | ProcessManager$.ProcessOperationInvoker.Service
+  | ServiceResolver$.ServiceResolver;
+
+/**
+ * Runtime that runs effects requiring a fixed set of capability-manager and
+ * process-manager services.
+ *
+ * The shape mirrors {@link ManagedRuntime$.ManagedRuntime} but deliberately does
+ * not expose `dispose` – lifecycle is driven by the host plugin manager.
+ */
+export interface ProcessManagerRuntime {
+  runPromise<A, E>(
+    effect: Effect.Effect<A, E, ProcessManagerRuntimeServices>,
+    options?: { readonly signal?: AbortSignal },
+  ): Promise<A>;
+  runPromiseExit<A, E>(
+    effect: Effect.Effect<A, E, ProcessManagerRuntimeServices>,
+    options?: { readonly signal?: AbortSignal },
+  ): Promise<Exit$.Exit<A, E>>;
+  runFork<A, E>(
+    effect: Effect.Effect<A, E, ProcessManagerRuntimeServices>,
+    options?: Runtime$.RunForkOptions,
+  ): Fiber$.RuntimeFiber<A, E>;
+  runSync<A, E>(effect: Effect.Effect<A, E, ProcessManagerRuntimeServices>): A;
+}
+
+/**
+ * @category Capability
+ */
+export const ProcessManagerRuntime = Capability$.make<ProcessManagerRuntime>(
+  'org.dxos.app-framework.capability.process-manager-runtime',
+);
+
 export type ManagedRuntime = ManagedRuntime$.ManagedRuntime<any, any>;
 
 /**
@@ -88,14 +221,8 @@ export const ManagedRuntime = Capability$.make<ManagedRuntime>('org.dxos.app-fra
 // 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[]>(
-  'org.dxos.app-framework.capability.operation-resolver',
+export const OperationHandler = Capability$.make<OperationHandlerSet.OperationHandlerSet>(
+  'org.dxos.app-framework.capability.operation-handler',
 );
 
 export type UndoMapping = UndoMapping$.UndoMapping;
@@ -106,10 +233,14 @@ export type UndoMapping = UndoMapping$.UndoMapping;
  */
 export const UndoMapping = Capability$.make<UndoMapping[]>('org.dxos.app-framework.capability.undo-mapping');
 
+/**
+ * Operation invoker backed by the process manager. Spawns a process per
+ * operation invocation; see {@link ProcessManager$.ProcessOperationInvoker}.
+ */
 export type OperationInvoker = OperationInvoker$.OperationInvoker;
 
 /**
- * Operation invoker - provided by OperationPlugin.
+ * Operation invoker - provided by the process-manager capability.
  * @category Capability
  */
 export const OperationInvoker = Capability$.make<OperationInvoker>(
@@ -119,7 +250,7 @@ export const OperationInvoker = Capability$.make<OperationInvoker>(
 export type UndoRegistry = UndoRegistry$.UndoRegistry;
 
 /**
- * Undo registry - provided by OperationPlugin.
+ * Undo registry - provided by ProcessManagerPlugin.
  * @category Capability
  */
 export const UndoRegistry = Capability$.make<UndoRegistry>('org.dxos.app-framework.capability.undo-registry');
@@ -127,7 +258,7 @@ export const UndoRegistry = Capability$.make<UndoRegistry>('org.dxos.app-framewo
 export type HistoryTracker = HistoryTracker$.HistoryTracker;
 
 /**
- * History tracker - provided by OperationPlugin.
+ * History tracker - provided by ProcessManagerPlugin.
  * @category Capability
  */
 export const HistoryTracker = Capability$.make<HistoryTracker>('org.dxos.app-framework.capability.history-tracker');

package/src/common/operations.ts

@@ -4,10 +4,9 @@
 
 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 = 'org.dxos.app-framework.undo';
@@ -28,11 +27,9 @@ export namespace UndoOperation {
     },
     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/core/activation-event.ts

@@ -2,6 +2,8 @@
 // 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.
@@ -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

@@ -5,6 +5,7 @@
 import { type Atom } from '@effect-atom/atom-react';
 import * as Context from 'effect/Context';
 import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
 
 import type * as CapabilityManager from './capability-manager';
 import type * as Plugin from './plugin';
@@ -62,6 +63,22 @@ 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));
+
+/**
+ * Constructs a layer that will request its interface implementation from the capability manager.
+ */
+export const asLayer = <T, I>(interfaceDef: InterfaceDef<T>, tag: Context.Tag<I, T>): Layer.Layer<I, never, Service> =>
+  Layer.effect(tag, get(interfaceDef).pipe(Effect.orDie));
+
 const InterfaceDefTypeId: unique symbol = Symbol.for('InterfaceDefTypeId');
 
 /**
@@ -120,6 +137,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'],
@@ -164,7 +182,7 @@ export const lazy = <T = void, R extends ModuleReturn = ModuleReturn>(
 ): LazyCapability<T, R> => {
   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>;
@@ -221,7 +239,7 @@ export const getModuleTag = (capability: unknown): string | undefined => {
  * export default Capability.makeModule(
  *   Effect.fnUntraced(function* (props: { observability: boolean }) {
  *     const invoker = yield* Capability.get(Capabilities.OperationInvoker);
- *     return contributes(Capabilities.IntentResolver, ...);
+ *     return contributes(Capabilities.OperationHandler, ...);
  *   })
  * );
  * ```