@dxos/plugin-client 0.8.4-main.b97322e → 0.8.4-main.bcb3aa67d6

package/package.json

@@ -1,30 +1,73 @@
 {
   "name": "@dxos/plugin-client",
-  "version": "0.8.4-main.b97322e",
+  "version": "0.8.4-main.bcb3aa67d6",
   "description": "DXOS Surface plugin for DXOS Client",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./src/capabilities/index.ts",
+      "browser": "./src/capabilities/index.ts",
+      "node": "./src/capabilities/node.ts"
+    },
+    "#components": "./src/components/index.ts",
+    "#containers": "./src/containers/index.ts",
+    "#meta": "./src/meta.ts",
+    "#operations": "./src/operations/index.ts",
+    "#testing": "./src/testing/index.ts",
+    "#types": "./src/types/index.ts"
+  },
   "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"
     },
+    "./cli": {
+      "source": "./src/cli/index.ts",
+      "types": "./dist/types/src/cli/index.d.ts",
+      "node": "./dist/lib/node-esm/cli/index.mjs"
+    },
+    "./operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "browser": "./dist/lib/browser/operations/index.mjs",
+      "node": "./dist/lib/node-esm/operations/index.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",
+      "browser": "./dist/lib/browser/testing/index.mjs",
+      "node": "./dist/lib/node-esm/testing/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
+      "operations": [
+        "dist/types/src/operations/index.d.ts"
+      ],
       "types": [
         "dist/types/src/types/index.d.ts"
+      ],
+      "testing": [
+        "dist/types/src/testing/index.d.ts"
       ]
     }
   },
@@ -33,49 +76,58 @@
     "src"
   ],
   "dependencies": {
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@effect/cli": "0.73.2",
+    "@effect/platform": "0.94.4",
+    "@tauri-apps/api": "^2.8.0",
+    "effect": "3.20.0",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/app-framework": "0.8.4-main.b97322e",
-    "@dxos/async": "0.8.4-main.b97322e",
-    "@dxos/config": "0.8.4-main.b97322e",
-    "@dxos/echo-schema": "0.8.4-main.b97322e",
-    "@dxos/echo": "0.8.4-main.b97322e",
-    "@dxos/echo-signals": "0.8.4-main.b97322e",
-    "@dxos/invariant": "0.8.4-main.b97322e",
-    "@dxos/log": "0.8.4-main.b97322e",
-    "@dxos/local-storage": "0.8.4-main.b97322e",
-    "@dxos/plugin-graph": "0.8.4-main.b97322e",
-    "@dxos/plugin-observability": "0.8.4-main.b97322e",
-    "@dxos/react-client": "0.8.4-main.b97322e",
-    "@dxos/react-ui-form": "0.8.4-main.b97322e",
-    "@dxos/react-ui-pickers": "0.8.4-main.b97322e",
-    "@dxos/react-ui-stack": "0.8.4-main.b97322e",
-    "@dxos/util": "0.8.4-main.b97322e",
-    "@dxos/shell": "0.8.4-main.b97322e"
+    "yaml": "^2.8.2",
+    "@dxos/app-framework": "0.8.4-main.bcb3aa67d6",
+    "@dxos/app-toolkit": "0.8.4-main.bcb3aa67d6",
+    "@dxos/async": "0.8.4-main.bcb3aa67d6",
+    "@dxos/cli-util": "0.8.4-main.bcb3aa67d6",
+    "@dxos/client-protocol": "0.8.4-main.bcb3aa67d6",
+    "@dxos/client": "0.8.4-main.bcb3aa67d6",
+    "@dxos/client-services": "0.8.4-main.bcb3aa67d6",
+    "@dxos/context": "0.8.4-main.bcb3aa67d6",
+    "@dxos/config": "0.8.4-main.bcb3aa67d6",
+    "@dxos/echo": "0.8.4-main.bcb3aa67d6",
+    "@dxos/effect": "0.8.4-main.bcb3aa67d6",
+    "@dxos/log": "0.8.4-main.bcb3aa67d6",
+    "@dxos/invariant": "0.8.4-main.bcb3aa67d6",
+    "@dxos/operation": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-graph": "0.8.4-main.bcb3aa67d6",
+    "@dxos/protocols": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-client": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-observability": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-form": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-stack": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-pickers": "0.8.4-main.bcb3aa67d6",
+    "@dxos/shell": "0.8.4-main.bcb3aa67d6",
+    "@dxos/util": "0.8.4-main.bcb3aa67d6"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.89.0",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.17.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/live-object": "0.8.4-main.b97322e",
-    "@dxos/react-ui-theme": "0.8.4-main.b97322e",
-    "@dxos/react-ui": "0.8.4-main.b97322e",
-    "@dxos/storybook-utils": "0.8.4-main.b97322e"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/printer": "0.47.0",
+    "@effect/printer-ansi": "0.47.0",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/plugin-testing": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui": "0.8.4-main.bcb3aa67d6",
+    "@dxos/storybook-utils": "0.8.4-main.bcb3aa67d6",
+    "@dxos/ui-theme": "0.8.4-main.bcb3aa67d6"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.b97322e",
-    "@dxos/react-ui-theme": "0.8.4-main.b97322e"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.bcb3aa67d6",
+    "@dxos/ui-theme": "0.8.4-main.bcb3aa67d6"
   },
   "publishConfig": {
     "access": "public"

package/src/ClientPlugin.ts

@@ -2,77 +2,70 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, defineModule, definePlugin, Events, oneOf } from '@dxos/app-framework';
+import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
+
+import { meta } from '#meta';
+import { translations } from './translations';
+import { ClientEvents } from '#types';
+import { type ClientPluginOptions } from '#types';
 
 import {
-  Client,
   AppGraphBuilder,
-  IntentResolver,
+  Client,
   Migrations,
+  NavigationHandler,
+  OperationHandler,
   ReactContext,
   ReactSurface,
   SchemaDefs,
-} from './capabilities';
-import { ClientEvents } from './events';
-import { meta } from './meta';
-import { translations } from './translations';
-import { type ClientPluginOptions } from './types';
-
-export const ClientPlugin = ({
-  invitationUrl = window.location.origin,
-  invitationParam = 'deviceInvitationCode',
-  onReset,
-  ...options
-}: ClientPluginOptions) => {
-  const createInvitationUrl = (invitationCode: string) => {
-    const baseUrl = new URL(invitationUrl);
-    baseUrl.searchParams.set(invitationParam, invitationCode);
-    return baseUrl.toString();
-  };
+} from '#capabilities';
 
-  return definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/client`,
-      activatesOn: oneOf(Events.Startup, Events.SetupAppGraph),
+export const ClientPlugin = Plugin.define<ClientPluginOptions>(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  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],
-      activate: (context) => Client({ ...options, context }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.ClientReady,
-      activatesBefore: [ClientEvents.SetupSchema],
-      activate: SchemaDefs,
-    }),
-    defineModule({
-      id: `${meta.id}/module/migration`,
-      activatesOn: ClientEvents.ClientReady,
-      activatesBefore: [ClientEvents.SetupMigration],
-      activate: Migrations,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-context`,
-      activatesOn: Events.Startup,
-      activate: ReactContext,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: () => ReactSurface({ createInvitationUrl, onReset }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: (context) => IntentResolver({ context }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, translations),
-    }),
-  ]);
-};
+      activate: () => Client(options),
+    };
+  }),
+  Plugin.addModule({
+    activatesOn: ClientEvents.ClientReady,
+    activatesBefore: [AppActivationEvents.SetupSchema],
+    activate: SchemaDefs,
+  }),
+  Plugin.addModule({
+    activatesOn: ClientEvents.ClientReady,
+    activatesBefore: [ClientEvents.SetupMigration],
+    activate: Migrations,
+  }),
+  Plugin.addModule(
+    ({
+      shareableLinkOrigin = typeof window !== 'undefined' ? window.location.origin : 'http://localhost',
+      invitationPath = '/',
+      invitationProp = 'deviceInvitationCode',
+      onReset,
+    }) => {
+      const createInvitationUrl = (invitationCode: string) => {
+        const baseUrl = new URL(invitationPath || '/', shareableLinkOrigin);
+        baseUrl.searchParams.set(invitationProp, invitationCode);
+        return baseUrl.toString();
+      };
+
+      return {
+        id: Capability.getModuleTag(ReactSurface),
+        activatesOn: ActivationEvents.SetupReactSurface,
+        activate: () => ReactSurface({ createInvitationUrl, onReset }),
+      };
+    },
+  ),
+  Plugin.make,
+);

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

@@ -2,112 +2,96 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
-import { Option, pipe } from 'effect';
+import * as Effect from 'effect/Effect';
 
-import { createIntent } from '@dxos/app-framework';
-import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
-import { createExtension, rxFromObservable, ROOT_ID } from '@dxos/plugin-graph';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/operation';
+import { CreateAtom, GraphBuilder, Node, NodeMatcher } 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';
+import { meta } from '#meta';
+import { Account, ClientCapabilities } from '#types';
+import { ClientOperation } from '#operations';
 
-export default (context: PluginContext) =>
-  contributes(
-    Capabilities.AppGraphBuilder,
-    createExtension({
-      id: CLIENT_PLUGIN,
-      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+>',
-                    },
-                  },
-                },
-              ];
-            }),
-            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));
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const extensions = yield* GraphBuilder.createExtension({
+      id: meta.id,
+      match: NodeMatcher.whenRoot,
+      actions: () =>
+        Effect.succeed([
+          {
+            id: `${meta.id}.open-user-account`,
+            data: () => Operation.invoke(ClientOperation.ShareIdentity),
+            properties: {
+              label: ['open-user-account.label', { ns: meta.id }],
+              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+>',
+              },
+            },
+          },
+        ]),
+      connector: Effect.fnUntraced(function* (node, get) {
+        const client = yield* Capability.get(ClientCapabilities.Client);
+        const identity = get(CreateAtom.fromObservable(client.halo.identity));
+        const status = get(CreateAtom.fromObservable(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',
-                      },
-                    },
-                  ],
+        return [
+          Node.make({
+            id: Account.id,
+            type: meta.id,
+            properties: {
+              label: ['account.label', { ns: meta.id }],
+              icon: 'ph--user--regular',
+              disposition: 'user-account',
+              testId: 'clientPlugin.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: [
+              Node.make({
+                id: Account.Profile,
+                data: Account.Profile,
+                type: meta.id,
+                properties: {
+                  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 }],
+                  icon: 'ph--devices--regular',
+                  testId: 'clientPlugin.devices',
                 },
-              ];
-            }),
-            Option.getOrElse(() => []),
-          ),
-        ),
-    }),
-  );
+              }),
+              Node.make({
+                id: Account.Security,
+                data: Account.Security,
+                type: meta.id,
+                properties: {
+                  label: ['security.label', { ns: meta.id }],
+                  icon: 'ph--key--regular',
+                },
+              }),
+            ],
+          }),
+        ];
+      }),
+    });
+
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
+  }),
+);

package/src/capabilities/client.ts

@@ -2,40 +2,78 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, type PluginContext } from '@dxos/app-framework';
-import { Client } from '@dxos/react-client';
-
-import { ClientCapabilities } from './capabilities';
-import { ClientEvents } from '../events';
-import { type ClientPluginOptions } from '../types';
-
-type ClientCapabilityOptions = Omit<ClientPluginOptions, 'appKey' | 'invitationUrl' | 'invitationParam' | 'onReset'> & {
-  context: PluginContext;
-};
-
-export default async ({ context, onClientInitialized, onSpacesReady, ...options }: ClientCapabilityOptions) => {
-  const client = new Client(options);
-  await client.initialize();
-  await onClientInitialized?.(context, client);
-
-  // TODO(wittjosiah): Remove. This is a hack to get the app to boot with the new identity after a reset.
-  client.reloaded.on(() => {
-    client.halo.identity.subscribe(async (identity) => {
-      if (identity) {
-        window.location.href = window.location.origin;
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability, Plugin } from '@dxos/app-framework';
+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';
+
+type ClientCapabilityOptions = Omit<
+  ClientPluginOptions,
+  'appKey' | 'shareableLinkOrigin' | 'invitationPath' | 'invitationParam' | 'onReset'
+>;
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* ({ onClientInitialized, onSpacesReady, ...options }: ClientCapabilityOptions) {
+    const capabilityManager = yield* Capability.Service;
+    const pluginManager = yield* Plugin.Service;
+
+    log('creating client');
+    const client = new Client(options);
+    log('initializing client (calling client.initialize())...');
+    yield* Effect.tryPromise(() => client.initialize());
+    log('client.initialize() returned successfully');
+    if (onClientInitialized) {
+      yield* onClientInitialized({ client }).pipe(
+        Effect.provideService(Capability.Service, capabilityManager),
+        Effect.provideService(Plugin.Service, pluginManager),
+      );
+    }
+    log('called client initialized callback');
+
+    // TODO(wittjosiah): Remove. This is a hack to get the app to boot with the new identity after a reset.
+    client.reloaded.on(() => {
+      client.halo.identity.subscribe(async (identity) => {
+        if (identity) {
+          window.location.href = window.location.origin;
+        }
+      });
+    });
+
+    let spacesReadyFired = false;
+    const subscription = client.spaces.subscribe(async () => {
+      if (!spacesReadyFired) {
+        spacesReadyFired = true;
+        await Effect.gen(function* () {
+          yield* Plugin.activate(ClientEvents.SpacesReady);
+          if (onSpacesReady) {
+            yield* onSpacesReady({ client });
+          }
+        }).pipe(
+          Effect.provideService(Capability.Service, capabilityManager),
+          Effect.provideService(Plugin.Service, pluginManager),
+          runAndForwardErrors,
+        );
       }
     });
-  });
 
-  const subscription = client.spaces.isReady.subscribe(async (ready) => {
-    if (ready) {
-      await context.activatePromise(ClientEvents.SpacesReady);
-      await onSpacesReady?.(context, client);
-    }
-  });
+    log('client capability ready');
 
-  return contributes(ClientCapabilities.Client, client, async () => {
-    subscription.unsubscribe();
-    await client.destroy();
-  });
-};
+    return [
+      // TODO(wittjosiah): Try to remove and prefer layer?
+      //  Perhaps move to using layer has source of truth and add a getter capability for the client.
+      Capability.contributes(ClientCapabilities.Client, client, () =>
+        Effect.gen(function* () {
+          log.info('client capability: destroying client');
+          subscription.unsubscribe();
+          yield* Effect.tryPromise(() => client.destroy());
+        }),
+      ),
+      Capability.contributes(Capabilities.Layer, ClientService.fromClient(client)),
+    ];
+  }),
+);