@dxos/plugin-client 0.8.4-main.8360d9e660 → 0.8.4-main.8baae0fced

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-client",
-  "version": "0.8.4-main.8360d9e660",
+  "version": "0.8.4-main.8baae0fced",
   "description": "DXOS Surface plugin for DXOS Client",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,37 +8,91 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#capabilities/node": {
+      "source": "./src/capabilities/node.ts",
+      "types": "./dist/types/src/capabilities/node.d.ts",
+      "default": "./dist/lib/neutral/capabilities/node.mjs"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "workerd": "./src/ClientPlugin.workerd.ts",
+        "node": "./src/ClientPlugin.node.ts",
+        "default": "./src/ClientPlugin.ts"
+      },
+      "types": "./dist/types/src/ClientPlugin.d.ts",
+      "workerd": "./dist/lib/neutral/ClientPlugin.workerd.mjs",
+      "node": "./dist/lib/neutral/ClientPlugin.node.mjs",
+      "default": "./dist/lib/neutral/ClientPlugin.mjs"
+    },
+    "#testing": {
+      "source": "./src/testing/index.ts",
+      "types": "./dist/types/src/testing/index.d.ts",
+      "default": "./dist/lib/neutral/testing/index.mjs"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    },
+    "#types": {
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
+    }
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
     },
-    "./cli": {
-      "source": "./src/cli/index.ts",
-      "types": "./dist/types/src/cli/index.d.ts",
-      "node": "./dist/lib/node-esm/cli/index.mjs"
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
     },
-    "./types": {
-      "source": "./src/types/index.ts",
-      "types": "./dist/types/src/types/index.d.ts",
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs"
+    "./testing": {
+      "source": "./src/testing/index.ts",
+      "types": "./dist/types/src/testing/index.d.ts",
+      "default": "./dist/lib/neutral/testing/index.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
@@ -46,31 +100,35 @@
   "dependencies": {
     "@effect/cli": "0.73.2",
     "@effect/platform": "0.94.4",
-    "effect": "3.19.16",
+    "@tauri-apps/api": "^2.11.0",
+    "effect": "3.20.0",
     "react-qr-rounded": "^1.0.0",
-    "yaml": "^2.7.0",
-    "@dxos/app-framework": "0.8.4-main.8360d9e660",
-    "@dxos/app-toolkit": "0.8.4-main.8360d9e660",
-    "@dxos/async": "0.8.4-main.8360d9e660",
-    "@dxos/cli-util": "0.8.4-main.8360d9e660",
-    "@dxos/client-protocol": "0.8.4-main.8360d9e660",
-    "@dxos/client": "0.8.4-main.8360d9e660",
-    "@dxos/client-services": "0.8.4-main.8360d9e660",
-    "@dxos/config": "0.8.4-main.8360d9e660",
-    "@dxos/effect": "0.8.4-main.8360d9e660",
-    "@dxos/echo": "0.8.4-main.8360d9e660",
-    "@dxos/invariant": "0.8.4-main.8360d9e660",
-    "@dxos/log": "0.8.4-main.8360d9e660",
-    "@dxos/operation": "0.8.4-main.8360d9e660",
-    "@dxos/plugin-graph": "0.8.4-main.8360d9e660",
-    "@dxos/plugin-observability": "0.8.4-main.8360d9e660",
-    "@dxos/protocols": "0.8.4-main.8360d9e660",
-    "@dxos/react-client": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-form": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-stack": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui-pickers": "0.8.4-main.8360d9e660",
-    "@dxos/shell": "0.8.4-main.8360d9e660",
-    "@dxos/util": "0.8.4-main.8360d9e660"
+    "yaml": "^2.8.2",
+    "@dxos/app-framework": "0.8.4-main.8baae0fced",
+    "@dxos/app-toolkit": "0.8.4-main.8baae0fced",
+    "@dxos/cli-util": "0.8.4-main.8baae0fced",
+    "@dxos/async": "0.8.4-main.8baae0fced",
+    "@dxos/client-protocol": "0.8.4-main.8baae0fced",
+    "@dxos/compute": "0.8.4-main.8baae0fced",
+    "@dxos/client": "0.8.4-main.8baae0fced",
+    "@dxos/client-services": "0.8.4-main.8baae0fced",
+    "@dxos/config": "0.8.4-main.8baae0fced",
+    "@dxos/echo": "0.8.4-main.8baae0fced",
+    "@dxos/echo-db": "0.8.4-main.8baae0fced",
+    "@dxos/context": "0.8.4-main.8baae0fced",
+    "@dxos/effect": "0.8.4-main.8baae0fced",
+    "@dxos/invariant": "0.8.4-main.8baae0fced",
+    "@dxos/functions": "0.8.4-main.8baae0fced",
+    "@dxos/log": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-observability": "0.8.4-main.8baae0fced",
+    "@dxos/protocols": "0.8.4-main.8baae0fced",
+    "@dxos/react-client": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-form": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-stack": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-pickers": "0.8.4-main.8baae0fced",
+    "@dxos/shell": "0.8.4-main.8baae0fced",
+    "@dxos/util": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-graph": "0.8.4-main.8baae0fced"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -80,19 +138,20 @@
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/storybook-utils": "0.8.4-main.8360d9e660",
-    "@dxos/ui-theme": "0.8.4-main.8360d9e660",
-    "@dxos/react-ui": "0.8.4-main.8360d9e660"
+    "vite": "^8.0.13",
+    "@dxos/plugin-testing": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui": "0.8.4-main.8baae0fced",
+    "@dxos/storybook-utils": "0.8.4-main.8baae0fced",
+    "@dxos/ui-theme": "0.8.4-main.8baae0fced"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "0.94.4",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.8360d9e660",
-    "@dxos/ui-theme": "0.8.4-main.8360d9e660"
+    "@dxos/react-ui": "0.8.4-main.8baae0fced",
+    "@dxos/ui-theme": "0.8.4-main.8baae0fced"
   },
   "publishConfig": {
     "access": "public"

package/src/{cli/plugin.ts → ClientPlugin.node.ts}

@@ -5,30 +5,29 @@
 import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 
-// NOTE: Must not import from index to avoid pulling in react dependencies.
-import { Client } from '../capabilities/client';
-import { OperationResolver } from '../capabilities/operation-resolver';
-import { SchemaDefs } from '../capabilities/schema-defs';
-import { meta } from '../meta';
-import { ClientEvents } from '../types';
-import { type ClientPluginOptions } from '../types';
+import { Client, OperationHandler, SchemaDefs } from '#capabilities';
+import { meta } from '#meta';
+import { ClientEvents } from '#types';
+import { type ClientPluginOptions } from '#types';
 
 import { config, device, edge, halo, profile } from './commands';
 
 export const ClientPlugin = Plugin.define<ClientPluginOptions>(meta).pipe(
   // TODO(wittjosiah): Could some of these commands make use of operations?
   AppPlugin.addCommandModule({ commands: [config, device, edge, halo, profile] }),
-  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   Plugin.addModule((options) => ({
     id: Capability.getModuleTag(Client),
     activatesOn: ActivationEvents.Startup,
-    activatesAfter: [ClientEvents.ClientReady],
+    firesAfterActivation: [ClientEvents.ClientReady],
     activate: () => Client(options),
   })),
   Plugin.addModule({
     activatesOn: ClientEvents.ClientReady,
-    activatesBefore: [AppActivationEvents.SetupSchema],
+    firesBeforeActivation: [AppActivationEvents.SetupSchema],
     activate: SchemaDefs,
   }),
   Plugin.make,
 );
+
+export default ClientPlugin;

package/src/ClientPlugin.test.ts

@@ -0,0 +1,29 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { ActivationEvents } from '@dxos/app-framework';
+// #plugin resolves to ClientPlugin.node.ts under the source condition used by vitest.
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('ClientPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({})],
+    });
+
+    // The CLI variant activates Client and SchemaDefs on startup.
+    expect(harness.manager.getActive()).toEqual(expect.arrayContaining([moduleId('Client'), moduleId('SchemaDefs')]));
+
+    // Operation handlers are not loaded on startup — SetupProcessManager fires lazily when an operation is invoked.
+    await harness.fire(ActivationEvents.SetupProcessManager);
+    expect(harness.manager.getActive()).toContain(moduleId('OperationHandler'));
+  });
+});

package/src/ClientPlugin.ts

@@ -8,40 +8,50 @@ import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 import {
   AppGraphBuilder,
   Client,
+  LayerSpecs,
   Migrations,
-  OperationResolver,
+  NavigationHandler,
+  OperationHandler,
   ReactContext,
   ReactSurface,
   SchemaDefs,
-} from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
-import { ClientEvents } from './types';
-import { type ClientPluginOptions } from './types';
+} from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
+import { ClientEvents } from '#types';
+import { type ClientPluginOptions } from '#types';
 
 export const ClientPlugin = Plugin.define<ClientPluginOptions>(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addNavigationHandlerModule(({ invitationProp }) => ({
+    activate: () => NavigationHandler({ invitationProp }),
+  })),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addReactContextModule({ activate: ReactContext }),
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule((options) => {
     return {
       id: Capability.getModuleTag(Client),
       activatesOn: ActivationEvent.oneOf(ActivationEvents.Startup, AppActivationEvents.SetupAppGraph),
-      activatesAfter: [ClientEvents.ClientReady],
+      firesAfterActivation: [ClientEvents.ClientReady],
       activate: () => Client(options),
     };
   }),
   Plugin.addModule({
     activatesOn: ClientEvents.ClientReady,
-    activatesBefore: [AppActivationEvents.SetupSchema],
+    firesBeforeActivation: [AppActivationEvents.SetupSchema],
     activate: SchemaDefs,
   }),
   Plugin.addModule({
     activatesOn: ClientEvents.ClientReady,
-    activatesBefore: [ClientEvents.SetupMigration],
+    firesBeforeActivation: [ClientEvents.SetupMigration],
     activate: Migrations,
   }),
+  Plugin.addModule({
+    activatesOn: ClientEvents.ClientReady,
+    firesBeforeActivation: [ActivationEvents.SetupProcessManager],
+    activate: LayerSpecs,
+  }),
   Plugin.addModule(
     ({
       shareableLinkOrigin = typeof window !== 'undefined' ? window.location.origin : 'http://localhost',
@@ -64,3 +74,5 @@ export const ClientPlugin = Plugin.define<ClientPluginOptions>(meta).pipe(
   ),
   Plugin.make,
 );
+
+export default ClientPlugin;

package/src/ClientPlugin.workerd.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+
+import { OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+
+export const ClientPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  Plugin.make,
+);
+
+export default ClientPlugin;

package/src/capabilities/{app-graph-builder/app-graph-builder.ts → app-graph-builder.ts}

@@ -6,25 +6,26 @@ import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/operation';
-import { CreateAtom, GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
+import { Operation } from '@dxos/compute';
+import { CreateAtom, GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
 import { ConnectionState } from '@dxos/react-client/mesh';
 
-import { meta } from '../../meta';
-import { Account, ClientCapabilities, ClientOperation } from '../../types';
+import { meta } from '#meta';
+import { ClientOperation } from '#operations';
+import { Account, ClientCapabilities } from '#types';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const extensions = yield* GraphBuilder.createExtension({
-      id: meta.id,
+      id: 'root',
       match: NodeMatcher.whenRoot,
       actions: () =>
         Effect.succeed([
           {
-            id: `${meta.id}.open-user-account`,
+            id: 'open-user-account',
             data: () => Operation.invoke(ClientOperation.ShareIdentity),
             properties: {
-              label: ['open user account label', { ns: meta.id }],
+              label: ['open-user-account.label', { ns: meta.id }],
               icon: 'ph--user--regular',
               disposition: 'menu',
               keyBinding: {
@@ -42,11 +43,11 @@ export default Capability.makeModule(
         const status = get(CreateAtom.fromObservable(client.mesh.networkStatus));
 
         return [
-          {
+          Node.make({
             id: Account.id,
             type: meta.id,
             properties: {
-              label: ['account label', { ns: meta.id }],
+              label: ['account.label', { ns: meta.id }],
               icon: 'ph--user--regular',
               disposition: 'user-account',
               testId: 'clientPlugin.account',
@@ -57,36 +58,36 @@ export default Capability.makeModule(
               status: status.swarm === ConnectionState.OFFLINE ? 'error' : 'active',
             },
             nodes: [
-              {
+              Node.make({
                 id: Account.Profile,
                 data: Account.Profile,
                 type: meta.id,
                 properties: {
-                  label: ['profile label', { ns: meta.id }],
+                  label: ['profile.label', { ns: meta.id }],
                   icon: 'ph--user--regular',
                 },
-              },
-              {
+              }),
+              Node.make({
                 id: Account.Devices,
                 data: Account.Devices,
                 type: meta.id,
                 properties: {
-                  label: ['devices label', { ns: meta.id }],
+                  label: ['devices.label', { ns: meta.id }],
                   icon: 'ph--devices--regular',
                   testId: 'clientPlugin.devices',
                 },
-              },
-              {
+              }),
+              Node.make({
                 id: Account.Security,
                 data: Account.Security,
                 type: meta.id,
                 properties: {
-                  label: ['security label', { ns: meta.id }],
+                  label: ['security.label', { ns: meta.id }],
                   icon: 'ph--key--regular',
                 },
-              },
+              }),
             ],
-          },
+          }),
         ];
       }),
     });

package/src/capabilities/{client/client.ts → client.ts}

@@ -9,8 +9,8 @@ import { Client, ClientService } from '@dxos/client';
 import { runAndForwardErrors } from '@dxos/effect';
 import { log } from '@dxos/log';
 
-import { ClientEvents } from '../../types';
-import { ClientCapabilities, type ClientPluginOptions } from '../../types';
+import { ClientEvents } from '#types';
+import { ClientCapabilities, type ClientPluginOptions } from '#types';
 
 type ClientCapabilityOptions = Omit<
   ClientPluginOptions,
@@ -44,9 +44,10 @@ export default Capability.makeModule(
       });
     });
 
-    // TODO(burdon): The callback isn't called?
-    const subscription = client.spaces.isReady.subscribe(async (ready) => {
-      if (ready) {
+    let spacesReadyFired = false;
+    const subscription = client.spaces.subscribe(async () => {
+      if (!spacesReadyFired) {
+        spacesReadyFired = true;
         await Effect.gen(function* () {
           yield* Plugin.activate(ClientEvents.SpacesReady);
           if (onSpacesReady) {

package/src/capabilities/index.ts

@@ -2,10 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './app-graph-builder';
-export * from './client';
-export * from './migrations';
-export * from './operation-resolver';
-export * from './react-context';
-export * from './react-surface';
-export * from './schema-defs';
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/compute';
+
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
+export const Client = Capability.lazy('Client', () => import('./client'));
+export const LayerSpecs = Capability.lazy<void, Capability.Any[]>('LayerSpecs', () => import('./layer-specs'));
+export const Migrations = Capability.lazy('Migrations', () => import('./migrations'));
+export { NavigationHandler } from './navigation-handler';
+export type { NavigationHandlerOptions } from './navigation-handler';
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);
+export const ReactContext = Capability.lazy('ReactContext', () => import('./react-context'));
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
+export const SchemaDefs = Capability.lazy('SchemaDefs', () => import('./schema-defs'));

package/src/capabilities/layer-specs.ts

@@ -0,0 +1,96 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { ClientService } from '@dxos/client';
+import { Credential, LayerSpec } from '@dxos/compute';
+import { Database, Feed } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-db';
+import { credentialsLayerFromDatabase, QueueService } from '@dxos/functions';
+import { invariant } from '@dxos/invariant';
+
+import { ClientCapabilities } from '#types';
+
+//
+// Capability Module
+//
+// Contributes the core client/space service layer specs:
+//   - {@link ClientService} (application affinity).
+//   - {@link Database.Service}, {@link QueueService}, {@link Feed.FeedService},
+//     {@link Credential.CredentialsService} (space affinity).
+//
+// Specs are declared at module level and resolve the underlying
+// {@link ClientCapabilities.Client} through the Effect layer graph (via
+// {@link Capability.Service}) rather than capturing it from an outer scope.
+//
+
+/**
+ * Provides the Effect-level {@link ClientService} backed by the
+ * {@link ClientCapabilities.Client} capability contributed by the plugin
+ * runtime.
+ */
+const ClientLayerSpec = LayerSpec.make(
+  {
+    affinity: 'application',
+    requires: [Capability.Service],
+    provides: [ClientService],
+  },
+  () =>
+    Layer.unwrapEffect(
+      Effect.gen(function* () {
+        const client = yield* Capability.get(ClientCapabilities.Client);
+        return ClientService.fromClient(client);
+      }).pipe(Effect.orDie),
+    ),
+);
+
+/**
+ * Space-scoped database/queue/feed services resolved from the `Client`'s space
+ * registry. One spec for all three so the `client.spaces.get` /
+ * `waitUntilReady` round-trip only happens once per space slice. Fails hard if
+ * the context is missing a `space` id or the client cannot resolve it — both
+ * indicate a configuration bug in the layer graph.
+ */
+const DatabaseLayerSpec = LayerSpec.make(
+  {
+    affinity: 'space',
+    requires: [ClientService],
+    provides: [Database.Service, QueueService, Feed.FeedService],
+  },
+  (context) =>
+    Layer.unwrapEffect(
+      Effect.gen(function* () {
+        invariant(context.space, 'space context required for Database layer');
+        const client = yield* ClientService;
+        const space = client.spaces.get(context.space);
+        invariant(space, `space not found on client: ${context.space}`);
+        yield* Effect.promise(() => space.waitUntilReady());
+        return Layer.mergeAll(
+          Database.layer(space.db),
+          QueueService.layer(space.queues),
+          createFeedServiceLayer(space.queues),
+        );
+      }),
+    ),
+);
+
+const CredentialsLayerSpec = LayerSpec.make(
+  {
+    affinity: 'space',
+    requires: [Database.Service],
+    provides: [Credential.CredentialsService],
+  },
+  () => credentialsLayerFromDatabase(),
+);
+
+export default Capability.makeModule(() =>
+  Effect.succeed([
+    Capability.contributes(Capabilities.LayerSpec, ClientLayerSpec),
+    Capability.contributes(Capabilities.LayerSpec, DatabaseLayerSpec),
+    Capability.contributes(Capabilities.LayerSpec, CredentialsLayerSpec),
+  ]),
+);

package/src/capabilities/{migrations/migrations.ts → migrations.ts}

@@ -6,7 +6,7 @@ import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 
-import { ClientCapabilities } from '../../types';
+import { ClientCapabilities } from '#types';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {

package/src/capabilities/navigation-handler/index.ts

@@ -0,0 +1,9 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export type { NavigationHandlerOptions } from './navigation-handler';
+
+export const NavigationHandler = Capability.lazy('NavigationHandler', () => import('./navigation-handler'));