@dxos/plugin-client 0.8.2-main.f081794 → 0.8.2-main.fbd8ed0

package/dist/types/src/types.d.ts

@@ -1,101 +1,101 @@
-import { type PluginsContext } from '@dxos/app-framework';
-import { S } from '@dxos/echo-schema';
+import { Schema } from 'effect';
+import { type PluginContext } from '@dxos/app-framework';
 import { type Client, PublicKey, type ClientOptions } from '@dxos/react-client';
 import { type MaybePromise } from '@dxos/util';
 export declare namespace ClientAction {
-    const CreateIdentity_base: S.TaggedClass<CreateIdentity, "dxos.org/plugin/client/action/create-identity", {
-        readonly _tag: S.tag<"dxos.org/plugin/client/action/create-identity">;
+    const CreateIdentity_base: Schema.TaggedClass<CreateIdentity, "dxos.org/plugin/client/action/create-identity", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/client/action/create-identity">;
     } & {
-        input: S.Struct<{
-            displayName: S.optional<typeof S.String>;
+        input: Schema.Struct<{
+            displayName: Schema.optional<typeof Schema.String>;
         }>;
-        output: S.Struct<{
-            identityKey: S.instanceOf<PublicKey>;
-            spaceKey: S.optional<S.instanceOf<PublicKey>>;
-            profile: S.optional<S.Struct<{
-                displayName: S.optional<typeof S.String>;
-                avatarCid: S.optional<typeof S.String>;
-                data: S.optional<S.Record$<typeof S.String, typeof S.Any>>;
+        output: Schema.Struct<{
+            identityKey: Schema.instanceOf<PublicKey>;
+            spaceKey: Schema.optional<Schema.instanceOf<PublicKey>>;
+            profile: Schema.optional<Schema.Struct<{
+                displayName: Schema.optional<typeof Schema.String>;
+                avatarCid: Schema.optional<typeof Schema.String>;
+                data: Schema.optional<Schema.Record$<typeof Schema.String, typeof Schema.Any>>;
             }>>;
         }>;
     }>;
     export class CreateIdentity extends CreateIdentity_base {
     }
-    const JoinIdentity_base: S.TaggedClass<JoinIdentity, "dxos.org/plugin/client/action/join-identity", {
-        readonly _tag: S.tag<"dxos.org/plugin/client/action/join-identity">;
+    const JoinIdentity_base: Schema.TaggedClass<JoinIdentity, "dxos.org/plugin/client/action/join-identity", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/client/action/join-identity">;
     } & {
-        input: S.Struct<{
-            invitationCode: S.optional<typeof S.String>;
+        input: Schema.Struct<{
+            invitationCode: Schema.optional<typeof Schema.String>;
         }>;
-        output: typeof S.Void;
+        output: typeof Schema.Void;
     }>;
     export class JoinIdentity extends JoinIdentity_base {
     }
-    const ShareIdentity_base: S.TaggedClass<ShareIdentity, "dxos.org/plugin/client/action/share-identity", {
-        readonly _tag: S.tag<"dxos.org/plugin/client/action/share-identity">;
+    const ShareIdentity_base: Schema.TaggedClass<ShareIdentity, "dxos.org/plugin/client/action/share-identity", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/client/action/share-identity">;
     } & {
-        input: typeof S.Void;
-        output: typeof S.Void;
+        input: typeof Schema.Void;
+        output: typeof Schema.Void;
     }>;
     export class ShareIdentity extends ShareIdentity_base {
     }
-    const RecoverIdentity_base: S.TaggedClass<RecoverIdentity, "dxos.org/plugin/client/action/recover-identity", {
-        readonly _tag: S.tag<"dxos.org/plugin/client/action/recover-identity">;
+    const RecoverIdentity_base: Schema.TaggedClass<RecoverIdentity, "dxos.org/plugin/client/action/recover-identity", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/client/action/recover-identity">;
     } & {
-        input: typeof S.Void;
-        output: typeof S.Void;
+        input: typeof Schema.Void;
+        output: typeof Schema.Void;
     }>;
     export class RecoverIdentity extends RecoverIdentity_base {
     }
-    const ResetStorage_base: S.TaggedClass<ResetStorage, "dxos.org/plugin/client/action/reset-storage", {
-        readonly _tag: S.tag<"dxos.org/plugin/client/action/reset-storage">;
+    const ResetStorage_base: Schema.TaggedClass<ResetStorage, "dxos.org/plugin/client/action/reset-storage", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/client/action/reset-storage">;
     } & {
-        input: S.Struct<{
-            mode: S.optional<typeof S.String>;
+        input: Schema.Struct<{
+            mode: Schema.optional<typeof Schema.String>;
         }>;
-        output: typeof S.Void;
+        output: typeof Schema.Void;
     }>;
     export class ResetStorage extends ResetStorage_base {
     }
-    const CreateAgent_base: S.TaggedClass<CreateAgent, "dxos.org/plugin/client/action/create-agent", {
-        readonly _tag: S.tag<"dxos.org/plugin/client/action/create-agent">;
+    const CreateAgent_base: Schema.TaggedClass<CreateAgent, "dxos.org/plugin/client/action/create-agent", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/client/action/create-agent">;
     } & {
-        input: typeof S.Void;
-        output: typeof S.Void;
+        input: typeof Schema.Void;
+        output: typeof Schema.Void;
     }>;
     export class CreateAgent extends CreateAgent_base {
     }
-    const CreateRecoveryCode_base: S.TaggedClass<CreateRecoveryCode, "dxos.org/plugin/client/action/create-recovery-code", {
-        readonly _tag: S.tag<"dxos.org/plugin/client/action/create-recovery-code">;
+    const CreateRecoveryCode_base: Schema.TaggedClass<CreateRecoveryCode, "dxos.org/plugin/client/action/create-recovery-code", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/client/action/create-recovery-code">;
     } & {
-        input: typeof S.Void;
-        output: typeof S.Void;
+        input: typeof Schema.Void;
+        output: typeof Schema.Void;
     }>;
     export class CreateRecoveryCode extends CreateRecoveryCode_base {
     }
-    const CreatePasskey_base: S.TaggedClass<CreatePasskey, "dxos.org/plugin/client/action/create-passkey", {
-        readonly _tag: S.tag<"dxos.org/plugin/client/action/create-passkey">;
+    const CreatePasskey_base: Schema.TaggedClass<CreatePasskey, "dxos.org/plugin/client/action/create-passkey", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/client/action/create-passkey">;
     } & {
-        input: typeof S.Void;
-        output: typeof S.Void;
+        input: typeof Schema.Void;
+        output: typeof Schema.Void;
     }>;
     export class CreatePasskey extends CreatePasskey_base {
     }
-    const RedeemPasskey_base: S.TaggedClass<RedeemPasskey, "dxos.org/plugin/client/action/redeem-passkey", {
-        readonly _tag: S.tag<"dxos.org/plugin/client/action/redeem-passkey">;
+    const RedeemPasskey_base: Schema.TaggedClass<RedeemPasskey, "dxos.org/plugin/client/action/redeem-passkey", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/client/action/redeem-passkey">;
     } & {
-        input: typeof S.Void;
-        output: typeof S.Void;
+        input: typeof Schema.Void;
+        output: typeof Schema.Void;
     }>;
     export class RedeemPasskey extends RedeemPasskey_base {
     }
-    const RedeemToken_base: S.TaggedClass<RedeemToken, "dxos.org/plugin/client/action/redeem-token", {
-        readonly _tag: S.tag<"dxos.org/plugin/client/action/redeem-token">;
+    const RedeemToken_base: Schema.TaggedClass<RedeemToken, "dxos.org/plugin/client/action/redeem-token", {
+        readonly _tag: Schema.tag<"dxos.org/plugin/client/action/redeem-token">;
     } & {
-        input: S.Struct<{
-            token: typeof S.String;
+        input: Schema.Struct<{
+            token: typeof Schema.String;
         }>;
-        output: typeof S.Void;
+        output: typeof Schema.Void;
     }>;
     export class RedeemToken extends RedeemToken_base {
     }
@@ -113,7 +113,7 @@ export type ClientPluginOptions = ClientOptions & {
     /**
      * Run after the client has been initialized.
      */
-    onClientInitialized?: (context: PluginsContext, client: Client) => MaybePromise<void>;
+    onClientInitialized?: (context: PluginContext, client: Client) => MaybePromise<void>;
     /**
      * Called when the client is reset.
      */

package/dist/types/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAC;AACtC,OAAO,EAAE,KAAK,MAAM,EAAE,SAAS,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAkB/C,yBAAiB,YAAY,CAAC;;;;;;;;;;;;;;;;;IAC5B,MAAM,OAAO,cAAe,SAAQ,mBAKlC;KAAG;;;;;;;;;IAEL,MAAM,OAAO,YAAa,SAAQ,iBAKhC;KAAG;;;;;;;IAEL,MAAM,OAAO,aAAc,SAAQ,kBAGjC;KAAG;;;;;;;IAEL,MAAM,OAAO,eAAgB,SAAQ,oBAGnC;KAAG;;;;;;;;;IAEL,MAAM,OAAO,YAAa,SAAQ,iBAKhC;KAAG;;;;;;;IAEL,MAAM,OAAO,WAAY,SAAQ,gBAG/B;KAAG;;;;;;;IAEL,MAAM,OAAO,kBAAmB,SAAQ,uBAGtC;KAAG;;;;;;;IAEL,MAAM,OAAO,aAAc,SAAQ,kBAGjC;KAAG;;;;;;;IAEL,MAAM,OAAO,aAAc,SAAQ,kBAGjC;KAAG;;;;;;;;;IAEL,MAAM,OAAO,WAAY,SAAQ,gBAK/B;KAAG;;CACN;AAED,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG;IAChD;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;OAEG;IACH,mBAAmB,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAEtF;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CAC/D,CAAC;AAEF,yBAAiB,OAAO,CAAC;IAKhB,MAAM,EAAE,oCAAY,CAAC;IAErB,MAAM,OAAO,2CAAmB,CAAC;IACjC,MAAM,OAAO,2CAAmB,CAAC;IACjC,MAAM,QAAQ,4CAAoB,CAAC;CAC3C"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,KAAK,MAAM,EAAE,SAAS,EAAE,KAAK,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,YAAY,CAAC;AAkB/C,yBAAiB,YAAY,CAAC;;;;;;;;;;;;;;;;;IAC5B,MAAM,OAAO,cAAe,SAAQ,mBAKlC;KAAG;;;;;;;;;IAEL,MAAM,OAAO,YAAa,SAAQ,iBAKhC;KAAG;;;;;;;IAEL,MAAM,OAAO,aAAc,SAAQ,kBAGjC;KAAG;;;;;;;IAEL,MAAM,OAAO,eAAgB,SAAQ,oBAGnC;KAAG;;;;;;;;;IAEL,MAAM,OAAO,YAAa,SAAQ,iBAKhC;KAAG;;;;;;;IAEL,MAAM,OAAO,WAAY,SAAQ,gBAG/B;KAAG;;;;;;;IAEL,MAAM,OAAO,kBAAmB,SAAQ,uBAMvC;KAAG;;;;;;;IAEJ,MAAM,OAAO,aAAc,SAAQ,kBAGjC;KAAG;;;;;;;IAEL,MAAM,OAAO,aAAc,SAAQ,kBAGjC;KAAG;;;;;;;;;IAEL,MAAM,OAAO,WAAY,SAAQ,gBAK/B;KAAG;;CACN;AAED,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG;IAChD;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB;;OAEG;IACH,mBAAmB,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;IAErF;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,YAAY,CAAC,IAAI,CAAC,CAAC;CAC/D,CAAC;AAEF,yBAAiB,OAAO,CAAC;IAKhB,MAAM,EAAE,oCAAY,CAAC;IAErB,MAAM,OAAO,2CAAmB,CAAC;IACjC,MAAM,OAAO,2CAAmB,CAAC;IACjC,MAAM,QAAQ,4CAAoB,CAAC;CAC3C"}

package/dist/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.7.3"}
+{"version":"5.8.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-client",
-  "version": "0.8.2-main.f081794",
+  "version": "0.8.2-main.fbd8ed0",
   "description": "DXOS Surface plugin for DXOS Client",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -34,44 +34,50 @@
   ],
   "dependencies": {
     "@preact/signals-core": "^1.6.0",
+    "effect": "3.14.21",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/app-framework": "0.8.2-main.f081794",
-    "@dxos/config": "0.8.2-main.f081794",
-    "@dxos/async": "0.8.2-main.f081794",
-    "@dxos/echo-schema": "0.8.2-main.f081794",
-    "@dxos/echo-signals": "0.8.2-main.f081794",
-    "@dxos/invariant": "0.8.2-main.f081794",
-    "@dxos/local-storage": "0.8.2-main.f081794",
-    "@dxos/log": "0.8.2-main.f081794",
-    "@dxos/plugin-graph": "0.8.2-main.f081794",
-    "@dxos/plugin-observability": "0.8.2-main.f081794",
-    "@dxos/react-ui-form": "0.8.2-main.f081794",
-    "@dxos/react-client": "0.8.2-main.f081794",
-    "@dxos/react-ui-stack": "0.8.2-main.f081794",
-    "@dxos/react-ui-pickers": "0.8.2-main.f081794",
-    "@dxos/shell": "0.8.2-main.f081794",
-    "@dxos/util": "0.8.2-main.f081794"
+    "@dxos/async": "0.8.2-main.fbd8ed0",
+    "@dxos/app-framework": "0.8.2-main.fbd8ed0",
+    "@dxos/config": "0.8.2-main.fbd8ed0",
+    "@dxos/echo": "0.8.2-main.fbd8ed0",
+    "@dxos/echo-schema": "0.8.2-main.fbd8ed0",
+    "@dxos/echo-signals": "0.8.2-main.fbd8ed0",
+    "@dxos/invariant": "0.8.2-main.fbd8ed0",
+    "@dxos/local-storage": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-graph": "0.8.2-main.fbd8ed0",
+    "@dxos/log": "0.8.2-main.fbd8ed0",
+    "@dxos/plugin-observability": "0.8.2-main.fbd8ed0",
+    "@dxos/react-client": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-form": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-stack": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-pickers": "0.8.2-main.fbd8ed0",
+    "@dxos/shell": "0.8.2-main.fbd8ed0",
+    "@dxos/util": "0.8.2-main.fbd8ed0"
   },
   "devDependencies": {
+    "@effect-rx/rx-react": "^0.34.1",
+    "@effect/platform": "0.80.12",
     "@phosphor-icons/react": "^2.1.5",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.13.3",
+    "effect": "3.14.21",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/live-object": "0.8.2-main.f081794",
-    "@dxos/react-ui": "0.8.2-main.f081794",
-    "@dxos/react-ui-theme": "0.8.2-main.f081794",
-    "@dxos/storybook-utils": "0.8.2-main.f081794"
+    "@dxos/react-ui": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-theme": "0.8.2-main.fbd8ed0",
+    "@dxos/live-object": "0.8.2-main.fbd8ed0",
+    "@dxos/storybook-utils": "0.8.2-main.fbd8ed0"
   },
   "peerDependencies": {
+    "@effect-rx/rx-react": "^0.34.1",
+    "@effect/platform": "0.80.12",
     "@phosphor-icons/react": "^2.1.5",
-    "effect": "3.13.3",
+    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.2-main.f081794",
-    "@dxos/react-ui-theme": "0.8.2-main.f081794"
+    "@dxos/react-ui": "0.8.2-main.fbd8ed0",
+    "@dxos/react-ui-theme": "0.8.2-main.fbd8ed0"
   },
   "publishConfig": {
     "access": "public"

package/src/ClientPlugin.ts

@@ -11,7 +11,7 @@ import {
   Migrations,
   ReactContext,
   ReactSurface,
-  Schema,
+  SchemaDefs,
 } from './capabilities';
 import { ClientEvents } from './events';
 import { meta } from './meta';
@@ -41,7 +41,7 @@ export const ClientPlugin = ({
       id: `${meta.id}/module/schema`,
       activatesOn: ClientEvents.ClientReady,
       activatesBefore: [ClientEvents.SetupSchema],
-      activate: Schema,
+      activate: SchemaDefs,
     }),
     defineModule({
       id: `${meta.id}/module/migration`,

package/src/capabilities/app-graph-builder.ts

@@ -2,94 +2,112 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Rx } from '@effect-rx/rx-react';
+import { Option, pipe } from 'effect';
+
 import { createIntent } from '@dxos/app-framework';
-import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
-import { createExtension, toSignal, type Node } from '@dxos/plugin-graph';
+import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
+import { createExtension, rxFromObservable, ROOT_ID } from '@dxos/plugin-graph';
 import { ConnectionState } from '@dxos/react-client/mesh';
 
 import { ClientCapabilities } from './capabilities';
 import { CLIENT_PLUGIN } from '../meta';
 import { Account, ClientAction } from '../types';
 
-export default (context: PluginsContext) =>
+export default (context: PluginContext) =>
   contributes(
     Capabilities.AppGraphBuilder,
     createExtension({
       id: CLIENT_PLUGIN,
-      filter: (node): node is Node<null> => node.id === 'root',
-      actions: () => [
-        {
-          id: `${CLIENT_PLUGIN}/open-user-account`,
-          data: async () => {
-            const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-            await dispatch(createIntent(ClientAction.ShareIdentity));
-          },
-          properties: {
-            label: ['open user account label', { ns: CLIENT_PLUGIN }],
-            icon: 'ph--user--regular',
-            keyBinding: {
-              macos: 'meta+shift+.',
-              // TODO(wittjosiah): Test on windows to see if it behaves the same as linux.
-              windows: 'alt+shift+.',
-              linux: 'alt+shift+>',
-            },
-          },
-        },
-      ],
-      connector: () => {
-        const client = context.requestCapability(ClientCapabilities.Client);
-        const identity = client.halo.identity.get();
-        const status = toSignal(
-          (onChange) => client.mesh.networkStatus.subscribe(() => onChange()).unsubscribe,
-          () => client.mesh.networkStatus.get(),
-        );
-
-        return [
-          {
-            id: Account.id,
-            type: CLIENT_PLUGIN,
-            properties: {
-              label: ['account label', { ns: CLIENT_PLUGIN }],
-              icon: 'ph--user--regular',
-              disposition: 'user-account',
-              // NOTE: This currently needs to be the identity key because the fallback is generated from hex.
-              userId: identity?.identityKey.toHex(),
-              hue: identity?.profile?.data?.hue,
-              emoji: identity?.profile?.data?.emoji,
-              status: status?.swarm === ConnectionState.OFFLINE ? 'error' : 'active',
-            },
-            nodes: [
-              {
-                id: Account.Profile,
-                data: Account.Profile,
-                type: CLIENT_PLUGIN,
-                properties: {
-                  label: ['profile label', { ns: CLIENT_PLUGIN }],
-                  icon: 'ph--user--regular',
+      actions: (node) =>
+        Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
+            Option.map(() => {
+              return [
+                {
+                  id: `${CLIENT_PLUGIN}/open-user-account`,
+                  data: async () => {
+                    const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+                    await dispatch(createIntent(ClientAction.ShareIdentity));
+                  },
+                  properties: {
+                    label: ['open user account label', { ns: CLIENT_PLUGIN }],
+                    icon: 'ph--user--regular',
+                    disposition: 'menu',
+                    keyBinding: {
+                      macos: 'meta+shift+.',
+                      // TODO(wittjosiah): Test on windows to see if it behaves the same as linux.
+                      windows: 'alt+shift+.',
+                      linux: 'alt+shift+>',
+                    },
+                  },
                 },
-              },
-              {
-                id: Account.Devices,
-                data: Account.Devices,
-                type: CLIENT_PLUGIN,
-                properties: {
-                  label: ['devices label', { ns: CLIENT_PLUGIN }],
-                  icon: 'ph--devices--regular',
-                  testId: 'clientPlugin.devices',
-                },
-              },
-              {
-                id: Account.Security,
-                data: Account.Security,
-                type: CLIENT_PLUGIN,
-                properties: {
-                  label: ['security label', { ns: CLIENT_PLUGIN }],
-                  icon: 'ph--key--regular',
+              ];
+            }),
+            Option.getOrElse(() => []),
+          ),
+        ),
+      connector: (node) =>
+        Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
+            Option.map(() => {
+              const client = context.getCapability(ClientCapabilities.Client);
+              const identity = get(rxFromObservable(client.halo.identity));
+              const status = get(rxFromObservable(client.mesh.networkStatus));
+
+              return [
+                {
+                  id: Account.id,
+                  type: CLIENT_PLUGIN,
+                  properties: {
+                    label: ['account label', { ns: CLIENT_PLUGIN }],
+                    icon: 'ph--user--regular',
+                    disposition: 'user-account',
+                    // NOTE: This currently needs to be the identity key because the fallback is generated from hex.
+                    userId: identity?.identityKey.toHex(),
+                    hue: identity?.profile?.data?.hue,
+                    emoji: identity?.profile?.data?.emoji,
+                    status: status.swarm === ConnectionState.OFFLINE ? 'error' : 'active',
+                  },
+                  nodes: [
+                    {
+                      id: Account.Profile,
+                      data: Account.Profile,
+                      type: CLIENT_PLUGIN,
+                      properties: {
+                        label: ['profile label', { ns: CLIENT_PLUGIN }],
+                        icon: 'ph--user--regular',
+                      },
+                    },
+                    {
+                      id: Account.Devices,
+                      data: Account.Devices,
+                      type: CLIENT_PLUGIN,
+                      properties: {
+                        label: ['devices label', { ns: CLIENT_PLUGIN }],
+                        icon: 'ph--devices--regular',
+                        testId: 'clientPlugin.devices',
+                      },
+                    },
+                    {
+                      id: Account.Security,
+                      data: Account.Security,
+                      type: CLIENT_PLUGIN,
+                      properties: {
+                        label: ['security label', { ns: CLIENT_PLUGIN }],
+                        icon: 'ph--key--regular',
+                      },
+                    },
+                  ],
                 },
-              },
-            ],
-          },
-        ];
-      },
+              ];
+            }),
+            Option.getOrElse(() => []),
+          ),
+        ),
     }),
   );

package/src/capabilities/client.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, type PluginsContext } from '@dxos/app-framework';
+import { contributes, type PluginContext } from '@dxos/app-framework';
 import { Client } from '@dxos/react-client';
 
 import { ClientCapabilities } from './capabilities';
@@ -10,7 +10,7 @@ import { ClientEvents } from '../events';
 import { type ClientPluginOptions } from '../types';
 
 type ClientCapabilityOptions = Omit<ClientPluginOptions, 'appKey' | 'invitationUrl' | 'invitationParam' | 'onReset'> & {
-  context: PluginsContext;
+  context: PluginContext;
 };
 
 export default async ({ context, onClientInitialized, ...options }: ClientCapabilityOptions) => {

package/src/capabilities/index.ts

@@ -10,6 +10,6 @@ export const IntentResolver = lazy(async () => import('./intent-resolver'));
 export const Migrations = lazy(async () => import('./migrations'));
 export const ReactContext = lazy(async () => import('./react-context'));
 export const ReactSurface = lazy(async () => import('./react-surface'));
-export const Schema = lazy(async () => import('./schema'));
+export const SchemaDefs = lazy(async () => import('./schema-defs'));
 
 export * from './capabilities';

package/src/capabilities/intent-resolver.ts

@@ -11,7 +11,7 @@ import {
   createIntent,
   createResolver,
   LayoutAction,
-  type PluginsContext,
+  type PluginContext,
 } from '@dxos/app-framework';
 import { invariant } from '@dxos/invariant';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
@@ -24,7 +24,7 @@ import { ClientEvents } from '../events';
 import { Account, ClientAction } from '../types';
 
 type IntentResolverOptions = {
-  context: PluginsContext;
+  context: PluginContext;
   appName?: string;
 };
 
@@ -35,8 +35,8 @@ export default ({ context, appName = 'Composer' }: IntentResolverOptions) =>
     createResolver({
       intent: ClientAction.CreateIdentity,
       resolve: async () => {
-        const manager = context.requestCapability(Capabilities.PluginManager);
-        const client = context.requestCapability(ClientCapabilities.Client);
+        const manager = context.getCapability(Capabilities.PluginManager);
+        const client = context.getCapability(ClientCapabilities.Client);
         const data = await client.halo.createIdentity();
         await manager.activate(ClientEvents.IdentityCreated);
         return {
@@ -132,7 +132,7 @@ export default ({ context, appName = 'Composer' }: IntentResolverOptions) =>
     createResolver({
       intent: ClientAction.CreateAgent,
       resolve: async () => {
-        const client = context.requestCapability(ClientCapabilities.Client);
+        const client = context.getCapability(ClientCapabilities.Client);
         invariant(client.services.services.EdgeAgentService, 'Missing EdgeAgentService');
         await client.services.services.EdgeAgentService.createAgent(null as any, { timeout: 10_000 });
       },
@@ -140,7 +140,7 @@ export default ({ context, appName = 'Composer' }: IntentResolverOptions) =>
     createResolver({
       intent: ClientAction.CreateRecoveryCode,
       resolve: async () => {
-        const client = context.requestCapability(ClientCapabilities.Client);
+        const client = context.getCapability(ClientCapabilities.Client);
         invariant(client.services.services.IdentityService, 'IdentityService not available');
         // TODO(wittjosiah): This needs a proper api.
         const { recoveryCode } = await client.services.services.IdentityService.createRecoveryCredential({});
@@ -162,7 +162,7 @@ export default ({ context, appName = 'Composer' }: IntentResolverOptions) =>
     createResolver({
       intent: ClientAction.CreatePasskey,
       resolve: async () => {
-        const client = context.requestCapability(ClientCapabilities.Client);
+        const client = context.getCapability(ClientCapabilities.Client);
         const identity = client.halo.identity.get();
         invariant(identity, 'Identity not available');
 
@@ -207,7 +207,7 @@ export default ({ context, appName = 'Composer' }: IntentResolverOptions) =>
     createResolver({
       intent: ClientAction.RedeemPasskey,
       resolve: async () => {
-        const client = context.requestCapability(ClientCapabilities.Client);
+        const client = context.getCapability(ClientCapabilities.Client);
         // TODO(wittjosiah): This needs a proper api.
         invariant(client.services.services.IdentityService, 'IdentityService not available');
         const { deviceKey, controlFeedKey, challenge } =
@@ -238,7 +238,7 @@ export default ({ context, appName = 'Composer' }: IntentResolverOptions) =>
     createResolver({
       intent: ClientAction.RedeemToken,
       resolve: async (data) => {
-        const client = context.requestCapability(ClientCapabilities.Client);
+        const client = context.getCapability(ClientCapabilities.Client);
         // TODO(wittjosiah): This needs a proper api.
         invariant(client.services.services.IdentityService, 'IdentityService not available');
         await client.services.services.IdentityService.recoverIdentity(

package/src/capabilities/migrations.ts

@@ -2,21 +2,24 @@
 // Copyright 2025 DXOS.org
 //
 
-import { effect } from '@preact/signals-core';
-
-import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
+import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
 
 import { ClientCapabilities } from './capabilities';
 
-export default (context: PluginsContext) => {
-  const client = context.requestCapability(ClientCapabilities.Client);
+export default (context: PluginContext) => {
+  const registry = context.getCapability(Capabilities.RxRegistry);
+  const client = context.getCapability(ClientCapabilities.Client);
 
   // NOTE: Migrations are currently unidirectional and idempotent.
-  const unsubscribe = effect(() => {
-    const migrations = Array.from(new Set(context.requestCapabilities(ClientCapabilities.Migration).flat()));
-    const spaces = client.spaces.get();
-    void Promise.all(spaces.map((space) => space.db.runMigrations(migrations)));
-  });
+  const cancel = registry.subscribe(
+    context.capabilities(ClientCapabilities.Migration),
+    (_migrations) => {
+      const migrations = Array.from(new Set(_migrations.flat()));
+      const spaces = client.spaces.get();
+      void Promise.all(spaces.map((space) => space.db.runMigrations(migrations)));
+    },
+    { immediate: true },
+  );
 
-  return contributes(Capabilities.Null, null, () => unsubscribe());
+  return contributes(Capabilities.Null, null, () => cancel());
 };

package/src/capabilities/schema-defs.ts

@@ -0,0 +1,29 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
+import { type TypedObject } from '@dxos/echo-schema';
+
+import { ClientCapabilities } from './capabilities';
+
+export default (context: PluginContext) => {
+  const registry = context.getCapability(Capabilities.RxRegistry);
+  const client = context.getCapability(ClientCapabilities.Client);
+
+  // TODO(wittjosiah): Unregister schemas when they are disabled.
+  let previous: TypedObject[] = [];
+  const cancel = registry.subscribe(
+    context.capabilities(ClientCapabilities.Schema),
+    (_schemas) => {
+      const schemas = Array.from(new Set(_schemas.flat()));
+      // TODO(wittjosiah): Filter out schemas which the client has already registered.
+      const newSchemas = schemas.filter((schema) => !previous.includes(schema));
+      previous = schemas;
+      client.addTypes(newSchemas);
+    },
+    { immediate: true },
+  );
+
+  return contributes(Capabilities.Null, null, () => cancel());
+};