@dxos/plugin-client 0.8.4-main.72ec0f3 → 0.8.4-main.765dc60934

package/package.json

@@ -1,84 +1,152 @@
 {
   "name": "@dxos/plugin-client",
-  "version": "0.8.4-main.72ec0f3",
+  "version": "0.8.4-main.765dc60934",
   "description": "DXOS Surface plugin for DXOS Client",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
-  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
+  "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": {
+        "node": "./src/ClientPlugin.node.ts",
+        "default": "./src/ClientPlugin.ts"
+      },
+      "types": "./dist/types/src/ClientPlugin.d.ts",
+      "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"
     },
-    "./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"
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.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"
   ],
   "dependencies": {
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.12.1",
+    "@effect/cli": "0.73.2",
+    "@effect/platform": "0.94.4",
+    "@tauri-apps/api": "^2.11.0",
+    "effect": "3.20.0",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/app-framework": "0.8.4-main.72ec0f3",
-    "@dxos/config": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/invariant": "0.8.4-main.72ec0f3",
-    "@dxos/async": "0.8.4-main.72ec0f3",
-    "@dxos/local-storage": "0.8.4-main.72ec0f3",
-    "@dxos/echo-signals": "0.8.4-main.72ec0f3",
-    "@dxos/log": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-graph": "0.8.4-main.72ec0f3",
-    "@dxos/plugin-observability": "0.8.4-main.72ec0f3",
-    "@dxos/react-client": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-pickers": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-stack": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-form": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3",
-    "@dxos/shell": "0.8.4-main.72ec0f3"
+    "yaml": "^2.8.2",
+    "@dxos/app-framework": "0.8.4-main.765dc60934",
+    "@dxos/app-toolkit": "0.8.4-main.765dc60934",
+    "@dxos/async": "0.8.4-main.765dc60934",
+    "@dxos/cli-util": "0.8.4-main.765dc60934",
+    "@dxos/client": "0.8.4-main.765dc60934",
+    "@dxos/client-protocol": "0.8.4-main.765dc60934",
+    "@dxos/client-services": "0.8.4-main.765dc60934",
+    "@dxos/echo": "0.8.4-main.765dc60934",
+    "@dxos/context": "0.8.4-main.765dc60934",
+    "@dxos/config": "0.8.4-main.765dc60934",
+    "@dxos/compute": "0.8.4-main.765dc60934",
+    "@dxos/effect": "0.8.4-main.765dc60934",
+    "@dxos/invariant": "0.8.4-main.765dc60934",
+    "@dxos/log": "0.8.4-main.765dc60934",
+    "@dxos/plugin-graph": "0.8.4-main.765dc60934",
+    "@dxos/protocols": "0.8.4-main.765dc60934",
+    "@dxos/plugin-observability": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-form": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-pickers": "0.8.4-main.765dc60934",
+    "@dxos/react-client": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-stack": "0.8.4-main.765dc60934",
+    "@dxos/shell": "0.8.4-main.765dc60934",
+    "@dxos/util": "0.8.4-main.765dc60934"
   },
   "devDependencies": {
-    "@effect-atom/atom-react": "^0.3.4",
-    "@effect/platform": "0.92.1",
-    "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.2",
-    "effect": "3.18.3",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
-    "vite": "7.1.9",
-    "@dxos/live-object": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3",
-    "@dxos/storybook-utils": "0.8.4-main.72ec0f3"
+    "@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": "^8.0.13",
+    "@dxos/react-ui": "0.8.4-main.765dc60934",
+    "@dxos/plugin-testing": "0.8.4-main.765dc60934",
+    "@dxos/ui-theme": "0.8.4-main.765dc60934",
+    "@dxos/storybook-utils": "0.8.4-main.765dc60934"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.3.4",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.72ec0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.72ec0f3"
-  },
-  "publishConfig": {
-    "access": "public"
+    "@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.765dc60934",
+    "@dxos/ui-theme": "0.8.4-main.765dc60934"
   }
 }

package/src/ClientPlugin.node.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
+
+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.addOperationHandlerModule({ activate: OperationHandler }),
+  Plugin.addModule((options) => ({
+    id: Capability.getModuleTag(Client),
+    activatesOn: ActivationEvents.Startup,
+    firesAfterActivation: [ClientEvents.ClientReady],
+    activate: () => Client(options),
+  })),
+  Plugin.addModule({
+    activatesOn: ClientEvents.ClientReady,
+    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 — SetupOperationHandler fires lazily when an operation is invoked.
+    await harness.fire(ActivationEvents.SetupOperationHandler);
+    expect(harness.manager.getActive()).toContain(moduleId('OperationHandler'));
+  });
+});

package/src/ClientPlugin.ts

@@ -2,75 +2,71 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, Events, contributes, defineModule, definePlugin, oneOf } from '@dxos/app-framework';
+import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 
 import {
   AppGraphBuilder,
   Client,
-  IntentResolver,
   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';
+} from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
+import { ClientEvents } from '#types';
+import { type ClientPluginOptions } from '#types';
 
-export const ClientPlugin = definePlugin<ClientPluginOptions>(
-  meta,
-  ({ invitationUrl = window.location.origin, invitationParam = 'deviceInvitationCode', onReset, ...options }) => {
-    const createInvitationUrl = (invitationCode: string) => {
-      const baseUrl = new URL(invitationUrl);
-      baseUrl.searchParams.set(invitationParam, invitationCode);
-      return baseUrl.toString();
+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),
+      firesAfterActivation: [ClientEvents.ClientReady],
+      activate: () => Client(options),
     };
+  }),
+  Plugin.addModule({
+    activatesOn: ClientEvents.ClientReady,
+    firesBeforeActivation: [AppActivationEvents.SetupSchema],
+    activate: SchemaDefs,
+  }),
+  Plugin.addModule({
+    activatesOn: ClientEvents.ClientReady,
+    firesBeforeActivation: [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 [
-      defineModule({
-        id: `${meta.id}/module/client`,
-        activatesOn: oneOf(Events.Startup, Events.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,
+      return {
+        id: Capability.getModuleTag(ReactSurface),
+        activatesOn: ActivationEvents.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),
-      }),
-    ];
-  },
+      };
+    },
+  ),
+  Plugin.make,
 );
+
+export default ClientPlugin;

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

@@ -2,114 +2,96 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Atom } from '@effect-atom/atom-react';
-import * as Function from 'effect/Function';
-import * as Option from 'effect/Option';
+import * as Effect from 'effect/Effect';
 
-import { createIntent } from '@dxos/app-framework';
-import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
-import { ROOT_ID, atomFromObservable, createExtension } from '@dxos/plugin-graph';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+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, ClientAction } from '../types';
+import { meta } from '#meta';
+import { ClientOperation } from '#operations';
+import { Account, ClientCapabilities } from '#types';
 
-import { ClientCapabilities } from './capabilities';
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const extensions = yield* GraphBuilder.createExtension({
+      id: 'root',
+      match: NodeMatcher.whenRoot,
+      actions: () =>
+        Effect.succeed([
+          {
+            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));
 
-export default (context: PluginContext) =>
-  contributes(
-    Capabilities.AppGraphBuilder,
-    createExtension({
-      id: meta.id,
-      actions: (node) =>
-        Atom.make((get) =>
-          Function.pipe(
-            get(node),
-            Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
-            Option.map(() => {
-              return [
-                {
-                  id: `${meta.id}/open-user-account`,
-                  data: async () => {
-                    const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-                    await dispatch(createIntent(ClientAction.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+>',
-                    },
-                  },
+        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',
                 },
-              ];
-            }),
-            Option.getOrElse(() => []),
-          ),
-        ),
-      connector: (node) =>
-        Atom.make((get) =>
-          Function.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(atomFromObservable(client.halo.identity));
-              const status = get(atomFromObservable(client.mesh.networkStatus));
-
-              return [
-                {
-                  id: Account.id,
-                  type: meta.id,
-                  properties: {
-                    label: ['account label', { ns: meta.id }],
-                    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: meta.id,
-                      properties: {
-                        label: ['profile label', { ns: meta.id }],
-                        icon: 'ph--user--regular',
-                      },
-                    },
-                    {
-                      id: Account.Devices,
-                      data: Account.Devices,
-                      type: meta.id,
-                      properties: {
-                        label: ['devices label', { ns: meta.id }],
-                        icon: 'ph--devices--regular',
-                        testId: 'clientPlugin.devices',
-                      },
-                    },
-                    {
-                      id: Account.Security,
-                      data: Account.Security,
-                      type: meta.id,
-                      properties: {
-                        label: ['security label', { ns: meta.id }],
-                        icon: 'ph--key--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',
+                },
+              }),
+              Node.make({
+                id: Account.Security,
+                data: Account.Security,
+                type: meta.id,
+                properties: {
+                  label: ['security.label', { ns: meta.id }],
+                  icon: 'ph--key--regular',
                 },
-              ];
-            }),
-            Option.getOrElse(() => []),
-          ),
-        ),
-    }),
-  );
+              }),
+            ],
+          }),
+        ];
+      }),
+    });
+
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
+  }),
+);