@dxos/plugin-client 0.8.4-main.84f28bd → 0.8.4-main.ae835ea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-client",
-  "version": "0.8.4-main.84f28bd",
+  "version": "0.8.4-main.ae835ea",
   "description": "DXOS Surface plugin for DXOS Client",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,21 +10,23 @@
   "type": "module",
   "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"
     },
     "./types": {
-      "types": "./dist/types/src/types.d.ts",
-      "browser": "./dist/lib/browser/types.mjs",
-      "node": "./dist/lib/node-esm/types.mjs"
+      "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"
     }
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
       "types": [
-        "dist/types/src/types.d.ts"
+        "dist/types/src/types/index.d.ts"
       ]
     }
   },
@@ -34,50 +36,47 @@
   ],
   "dependencies": {
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@preact/signals-core": "^1.12.1",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/app-framework": "0.8.4-main.84f28bd",
-    "@dxos/async": "0.8.4-main.84f28bd",
-    "@dxos/config": "0.8.4-main.84f28bd",
-    "@dxos/echo-schema": "0.8.4-main.84f28bd",
-    "@dxos/echo": "0.8.4-main.84f28bd",
-    "@dxos/echo-signals": "0.8.4-main.84f28bd",
-    "@dxos/invariant": "0.8.4-main.84f28bd",
-    "@dxos/local-storage": "0.8.4-main.84f28bd",
-    "@dxos/plugin-graph": "0.8.4-main.84f28bd",
-    "@dxos/log": "0.8.4-main.84f28bd",
-    "@dxos/plugin-observability": "0.8.4-main.84f28bd",
-    "@dxos/react-client": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-form": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-pickers": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-stack": "0.8.4-main.84f28bd",
-    "@dxos/shell": "0.8.4-main.84f28bd",
-    "@dxos/util": "0.8.4-main.84f28bd"
+    "@dxos/app-framework": "0.8.4-main.ae835ea",
+    "@dxos/async": "0.8.4-main.ae835ea",
+    "@dxos/config": "0.8.4-main.ae835ea",
+    "@dxos/echo": "0.8.4-main.ae835ea",
+    "@dxos/echo-signals": "0.8.4-main.ae835ea",
+    "@dxos/local-storage": "0.8.4-main.ae835ea",
+    "@dxos/log": "0.8.4-main.ae835ea",
+    "@dxos/plugin-graph": "0.8.4-main.ae835ea",
+    "@dxos/plugin-observability": "0.8.4-main.ae835ea",
+    "@dxos/invariant": "0.8.4-main.ae835ea",
+    "@dxos/react-client": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-form": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-pickers": "0.8.4-main.ae835ea",
+    "@dxos/shell": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-stack": "0.8.4-main.ae835ea",
+    "@dxos/util": "0.8.4-main.ae835ea"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.88.0",
-    "@phosphor-icons/react": "^2.1.5",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.16.13",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/live-object": "0.8.4-main.84f28bd",
-    "@dxos/react-ui": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-theme": "0.8.4-main.84f28bd",
-    "@dxos/storybook-utils": "0.8.4-main.84f28bd"
+    "@effect-rx/rx-react": "0.42.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.ae835ea",
+    "@dxos/react-ui": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-theme": "0.8.4-main.ae835ea",
+    "@dxos/storybook-utils": "0.8.4-main.ae835ea"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
     "@effect/platform": "^0.80.12",
-    "@phosphor-icons/react": "^2.1.5",
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-theme": "0.8.4-main.84f28bd"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-theme": "0.8.4-main.ae835ea"
   },
   "publishConfig": {
     "access": "public"

package/src/ClientPlugin.ts

@@ -2,11 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, defineModule, definePlugin, Events, oneOf } from '@dxos/app-framework';
+import { Capabilities, Events, contributes, defineModule, definePlugin, oneOf } from '@dxos/app-framework';
 
 import {
-  Client,
   AppGraphBuilder,
+  Client,
   IntentResolver,
   Migrations,
   ReactContext,
@@ -18,61 +18,59 @@ 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();
-  };
+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();
+    };
 
-  return definePlugin(meta, [
-    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,
-      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),
-    }),
-  ]);
-};
+    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,
+        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),
+      }),
+    ];
+  },
+);

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

@@ -3,37 +3,39 @@
 //
 
 import { Rx } from '@effect-rx/rx-react';
-import { Option, pipe } from 'effect';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
 
 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 { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
+import { ROOT_ID, createExtension, rxFromObservable } from '@dxos/plugin-graph';
 import { ConnectionState } from '@dxos/react-client/mesh';
 
-import { ClientCapabilities } from './capabilities';
-import { CLIENT_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { Account, ClientAction } from '../types';
 
+import { ClientCapabilities } from './capabilities';
+
 export default (context: PluginContext) =>
   contributes(
     Capabilities.AppGraphBuilder,
     createExtension({
-      id: CLIENT_PLUGIN,
+      id: meta.id,
       actions: (node) =>
         Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
             Option.map(() => {
               return [
                 {
-                  id: `${CLIENT_PLUGIN}/open-user-account`,
+                  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: CLIENT_PLUGIN }],
+                    label: ['open user account label', { ns: meta.id }],
                     icon: 'ph--user--regular',
                     disposition: 'menu',
                     keyBinding: {
@@ -51,7 +53,7 @@ export default (context: PluginContext) =>
         ),
       connector: (node) =>
         Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
             Option.map(() => {
@@ -62,9 +64,9 @@ export default (context: PluginContext) =>
               return [
                 {
                   id: Account.id,
-                  type: CLIENT_PLUGIN,
+                  type: meta.id,
                   properties: {
-                    label: ['account label', { ns: CLIENT_PLUGIN }],
+                    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.
@@ -77,18 +79,18 @@ export default (context: PluginContext) =>
                     {
                       id: Account.Profile,
                       data: Account.Profile,
-                      type: CLIENT_PLUGIN,
+                      type: meta.id,
                       properties: {
-                        label: ['profile label', { ns: CLIENT_PLUGIN }],
+                        label: ['profile label', { ns: meta.id }],
                         icon: 'ph--user--regular',
                       },
                     },
                     {
                       id: Account.Devices,
                       data: Account.Devices,
-                      type: CLIENT_PLUGIN,
+                      type: meta.id,
                       properties: {
-                        label: ['devices label', { ns: CLIENT_PLUGIN }],
+                        label: ['devices label', { ns: meta.id }],
                         icon: 'ph--devices--regular',
                         testId: 'clientPlugin.devices',
                       },
@@ -96,9 +98,9 @@ export default (context: PluginContext) =>
                     {
                       id: Account.Security,
                       data: Account.Security,
-                      type: CLIENT_PLUGIN,
+                      type: meta.id,
                       properties: {
-                        label: ['security label', { ns: CLIENT_PLUGIN }],
+                        label: ['security label', { ns: meta.id }],
                         icon: 'ph--key--regular',
                       },
                     },

package/src/capabilities/capabilities.ts

@@ -5,13 +5,14 @@
 import { defineCapability } from '@dxos/app-framework';
 import { type Client } from '@dxos/client';
 import { type ObjectMigration } from '@dxos/client/echo';
-import { type TypedObject } from '@dxos/echo-schema';
+import { type Type } from '@dxos/echo';
 
-import { CLIENT_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
 export namespace ClientCapabilities {
-  export const Client = defineCapability<Client>(`${CLIENT_PLUGIN}/capability/client`);
-  export const Schema = defineCapability<TypedObject[]>(`${CLIENT_PLUGIN}/capability/schema`);
-  export const SchemaWhiteList = defineCapability<TypedObject[]>(`${CLIENT_PLUGIN}/capability/schema-whitelist`);
-  export const Migration = defineCapability<ObjectMigration[]>(`${CLIENT_PLUGIN}/capability/migration`);
+  export const Client = defineCapability<Client>(`${meta.id}/capability/client`);
+  export const Schema = defineCapability<Type.Obj.Any[]>(`${meta.id}/capability/schema`);
+  // TODO(wittjosiah): More descriptive name.
+  export const SchemaWhiteList = defineCapability<Type.Obj.Any[]>(`${meta.id}/capability/schema-whitelist`);
+  export const Migration = defineCapability<ObjectMigration[]>(`${meta.id}/capability/migration`);
 }

package/src/capabilities/client.ts

@@ -2,13 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, type PluginContext } from '@dxos/app-framework';
+import { type PluginContext, contributes } from '@dxos/app-framework';
 import { Client } from '@dxos/react-client';
 
-import { ClientCapabilities } from './capabilities';
 import { ClientEvents } from '../events';
 import { type ClientPluginOptions } from '../types';
 
+import { ClientCapabilities } from './capabilities';
+
 type ClientCapabilityOptions = Omit<ClientPluginOptions, 'appKey' | 'invitationUrl' | 'invitationParam' | 'onReset'> & {
   context: PluginContext;
 };
@@ -16,7 +17,7 @@ type ClientCapabilityOptions = Omit<ClientPluginOptions, 'appKey' | 'invitationU
 export default async ({ context, onClientInitialized, onSpacesReady, ...options }: ClientCapabilityOptions) => {
   const client = new Client(options);
   await client.initialize();
-  await onClientInitialized?.(context, client);
+  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(() => {
@@ -27,10 +28,11 @@ export default async ({ context, onClientInitialized, onSpacesReady, ...options
     });
   });
 
+  // TODO(burdon): The callback isn't called?
   const subscription = client.spaces.isReady.subscribe(async (ready) => {
     if (ready) {
       await context.activatePromise(ClientEvents.SpacesReady);
-      await onSpacesReady?.(context, client);
+      await onSpacesReady?.({ context, client });
     }
   });
 

package/src/capabilities/intent-resolver.ts

@@ -2,27 +2,28 @@
 // Copyright 2025 DXOS.org
 //
 
-import { pipe } from 'effect';
+import * as Function from 'effect/Function';
 
 import {
   Capabilities,
+  LayoutAction,
+  type PluginContext,
   chain,
   contributes,
   createIntent,
   createResolver,
-  LayoutAction,
-  type PluginContext,
 } from '@dxos/app-framework';
 import { invariant } from '@dxos/invariant';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { PublicKey } from '@dxos/react-client';
 import { type JoinPanelProps } from '@dxos/shell/react';
 
-import { ClientCapabilities } from './capabilities';
 import { JOIN_DIALOG, RECOVERY_CODE_DIALOG, RESET_DIALOG } from '../components';
 import { ClientEvents } from '../events';
 import { Account, ClientAction } from '../types';
 
+import { ClientCapabilities } from './capabilities';
+
 type IntentResolverOptions = {
   context: PluginContext;
   appName?: string;
@@ -74,7 +75,7 @@ export default ({ context, appName = 'Composer' }: IntentResolverOptions) =>
       resolve: async () => {
         return {
           intents: [
-            pipe(
+            Function.pipe(
               createIntent(LayoutAction.SwitchWorkspace, {
                 part: 'workspace',
                 subject: Account.id,
@@ -173,7 +174,7 @@ export default ({ context, appName = 'Composer' }: IntentResolverOptions) =>
             challenge: new Uint8Array(),
             rp: { id: location.hostname, name: appName },
             user: {
-              id: lookupKey.asUint8Array(),
+              id: lookupKey.asUint8Array() as Uint8Array<ArrayBuffer>,
               name: identity.did,
               displayName: identity.profile?.displayName ?? '',
             },

package/src/capabilities/migrations.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
 
 import { ClientCapabilities } from './capabilities';
 

package/src/capabilities/react-context.tsx

@@ -7,12 +7,13 @@ import React from 'react';
 import { Capabilities, contributes, useCapability } from '@dxos/app-framework';
 import { ClientProvider } from '@dxos/react-client';
 
+import { meta } from '../meta';
+
 import { ClientCapabilities } from './capabilities';
-import { CLIENT_PLUGIN } from '../meta';
 
 export default () =>
   contributes(Capabilities.ReactContext, {
-    id: CLIENT_PLUGIN,
+    id: meta.id,
     context: ({ children }) => {
       const client = useCapability(ClientCapabilities.Client);
       return <ClientProvider client={client}>{children}</ClientProvider>;

package/src/capabilities/react-surface.tsx

@@ -4,7 +4,7 @@
 
 import React from 'react';
 
-import { createSurface, Capabilities, contributes } from '@dxos/app-framework';
+import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
 import { type JoinPanelProps } from '@dxos/shell/react';
 
 import {
@@ -13,12 +13,12 @@ import {
   JoinDialog,
   ProfileContainer,
   RECOVERY_CODE_DIALOG,
+  RESET_DIALOG,
   RecoveryCodeDialog,
+  type RecoveryCodeDialogProps,
   RecoveryCredentialsContainer,
-  RESET_DIALOG,
   ResetDialog,
   type ResetDialogProps,
-  type RecoveryCodeDialogProps,
 } from '../components';
 import { Account, type ClientPluginOptions } from '../types';
 

package/src/capabilities/schema-defs.ts

@@ -2,8 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
-import { type TypedObject } from '@dxos/echo-schema';
+import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
+import { type Type } from '@dxos/echo';
 
 import { ClientCapabilities } from './capabilities';
 
@@ -12,7 +12,7 @@ export default (context: PluginContext) => {
   const client = context.getCapability(ClientCapabilities.Client);
 
   // TODO(wittjosiah): Unregister schemas when they are disabled.
-  let previous: TypedObject[] = [];
+  let previous: Type.Obj.Any[] = [];
   const cancel = registry.subscribe(
     context.capabilities(ClientCapabilities.Schema),
     (_schemas) => {

package/src/components/DevicesContainer.stories.tsx

@@ -2,45 +2,43 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
-import { type StoryObj, type Meta } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
+import { withTheme } from '@dxos/react-ui/testing';
 import { translations as shellTranslations } from '@dxos/shell/react';
-import { withTheme, withLayout } from '@dxos/storybook-utils';
 
-import { DevicesContainer } from './DevicesContainer';
 import { ClientPlugin } from '../ClientPlugin';
 import { translations } from '../translations';
 
-const meta: Meta = {
+import { DevicesContainer } from './DevicesContainer';
+
+const meta = {
   title: 'plugins/plugin-client/DevicesContainer',
   component: DevicesContainer,
   decorators: [
+    withTheme,
     withPluginManager({
       plugins: [
         ClientPlugin({
-          onClientInitialized: async (_, client) => {
+          onClientInitialized: async ({ client }) => {
             await client.halo.createIdentity();
           },
         }),
         IntentPlugin(),
       ],
     }),
-    withTheme,
-    withLayout(),
   ],
   parameters: {
     layout: 'fullscreen',
     translations: [...translations, ...shellTranslations],
   },
-};
+} satisfies Meta<typeof DevicesContainer>;
 
 export default meta;
 
-type Story = StoryObj<typeof DevicesContainer>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {