@dxos/plugin-client 0.8.3 → 0.8.4-main.28f8d3d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-client",
-  "version": "0.8.3",
+  "version": "0.8.4-main.28f8d3d",
   "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"
       ]
     }
   },
@@ -35,50 +37,47 @@
   "dependencies": {
     "@preact-signals/safe-react": "^0.9.0",
     "@preact/signals-core": "^1.9.0",
-    "effect": "3.14.21",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/app-framework": "0.8.3",
-    "@dxos/async": "0.8.3",
-    "@dxos/config": "0.8.3",
-    "@dxos/echo-schema": "0.8.3",
-    "@dxos/echo": "0.8.3",
-    "@dxos/echo-signals": "0.8.3",
-    "@dxos/invariant": "0.8.3",
-    "@dxos/local-storage": "0.8.3",
-    "@dxos/log": "0.8.3",
-    "@dxos/plugin-graph": "0.8.3",
-    "@dxos/react-ui-form": "0.8.3",
-    "@dxos/react-client": "0.8.3",
-    "@dxos/plugin-observability": "0.8.3",
-    "@dxos/react-ui-pickers": "0.8.3",
-    "@dxos/shell": "0.8.3",
-    "@dxos/react-ui-stack": "0.8.3",
-    "@dxos/util": "0.8.3"
+    "@dxos/app-framework": "0.8.4-main.28f8d3d",
+    "@dxos/async": "0.8.4-main.28f8d3d",
+    "@dxos/config": "0.8.4-main.28f8d3d",
+    "@dxos/echo": "0.8.4-main.28f8d3d",
+    "@dxos/echo-schema": "0.8.4-main.28f8d3d",
+    "@dxos/echo-signals": "0.8.4-main.28f8d3d",
+    "@dxos/invariant": "0.8.4-main.28f8d3d",
+    "@dxos/local-storage": "0.8.4-main.28f8d3d",
+    "@dxos/plugin-graph": "0.8.4-main.28f8d3d",
+    "@dxos/log": "0.8.4-main.28f8d3d",
+    "@dxos/plugin-observability": "0.8.4-main.28f8d3d",
+    "@dxos/react-client": "0.8.4-main.28f8d3d",
+    "@dxos/react-ui-stack": "0.8.4-main.28f8d3d",
+    "@dxos/shell": "0.8.4-main.28f8d3d",
+    "@dxos/react-ui-form": "0.8.4-main.28f8d3d",
+    "@dxos/util": "0.8.4-main.28f8d3d",
+    "@dxos/react-ui-pickers": "0.8.4-main.28f8d3d"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "0.80.12",
-    "@phosphor-icons/react": "^2.1.5",
+    "@effect-rx/rx-react": "0.38.0",
+    "@effect/platform": "0.90.2",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.14.21",
+    "effect": "3.17.7",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/live-object": "0.8.3",
-    "@dxos/react-ui": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3",
-    "@dxos/storybook-utils": "0.8.3"
+    "@dxos/live-object": "0.8.4-main.28f8d3d",
+    "@dxos/react-ui": "0.8.4-main.28f8d3d",
+    "@dxos/react-ui-theme": "0.8.4-main.28f8d3d",
+    "@dxos/storybook-utils": "0.8.4-main.28f8d3d"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "0.80.12",
-    "@phosphor-icons/react": "^2.1.5",
+    "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3"
+    "@dxos/react-ui": "0.8.4-main.28f8d3d",
+    "@dxos/react-ui-theme": "0.8.4-main.28f8d3d"
   },
   "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,
@@ -15,7 +15,7 @@ import {
 } from './capabilities';
 import { ClientEvents } from './events';
 import { meta } from './meta';
-import translations from './translations';
+import { translations } from './translations';
 import { type ClientPluginOptions } from './types';
 
 export const ClientPlugin = ({

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

@@ -6,14 +6,15 @@ import { Rx } from '@effect-rx/rx-react';
 import { Option, pipe } from '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 { 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 { Account, ClientAction } from '../types';
 
+import { ClientCapabilities } from './capabilities';
+
 export default (context: PluginContext) =>
   contributes(
     Capabilities.AppGraphBuilder,

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';
 
 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 Schema = defineCapability<Type.Obj.Any[]>(`${CLIENT_PLUGIN}/capability/schema`);
+  // TODO(wittjosiah): More descriptive name.
+  export const SchemaWhiteList = defineCapability<Type.Obj.Any[]>(`${CLIENT_PLUGIN}/capability/schema-whitelist`);
   export const Migration = defineCapability<ObjectMigration[]>(`${CLIENT_PLUGIN}/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

@@ -6,23 +6,24 @@ import { pipe } from 'effect';
 
 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;
@@ -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,9 +7,10 @@ import React from 'react';
 import { Capabilities, contributes, useCapability } from '@dxos/app-framework';
 import { ClientProvider } from '@dxos/react-client';
 
-import { ClientCapabilities } from './capabilities';
 import { CLIENT_PLUGIN } from '../meta';
 
+import { ClientCapabilities } from './capabilities';
+
 export default () =>
   contributes(Capabilities.ReactContext, {
     id: CLIENT_PLUGIN,

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

@@ -4,16 +4,17 @@
 
 import '@dxos-theme';
 
-import { type StoryObj, type Meta } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { osTranslations } from '@dxos/shell/react';
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { translations as shellTranslations } from '@dxos/shell/react';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { DevicesContainer } from './DevicesContainer';
 import { ClientPlugin } from '../ClientPlugin';
-import translations from '../translations';
+import { translations } from '../translations';
+
+import { DevicesContainer } from './DevicesContainer';
 
 const meta: Meta = {
   title: 'plugins/plugin-client/DevicesContainer',
@@ -22,7 +23,7 @@ const meta: Meta = {
     withPluginManager({
       plugins: [
         ClientPlugin({
-          onClientInitialized: async (_, client) => {
+          onClientInitialized: async ({ client }) => {
             await client.halo.createIdentity();
           },
         }),
@@ -34,7 +35,7 @@ const meta: Meta = {
   ],
   parameters: {
     layout: 'fullscreen',
-    translations: [...translations, osTranslations],
+    translations: [...translations, ...shellTranslations],
   },
 };
 

package/src/components/DevicesContainer.tsx

@@ -2,7 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Check, X } from '@phosphor-icons/react';
 import React, { useCallback, useEffect, useState } from 'react';
 import { QR } from 'react-qr-rounded';
 
@@ -12,7 +11,7 @@ import { useClient, useMulticastObservable } from '@dxos/react-client';
 import { type Device, useDevices } from '@dxos/react-client/halo';
 import { type CancellableInvitationObservable, Invitation, InvitationEncoder } from '@dxos/react-client/invitations';
 import { useNetworkStatus } from '@dxos/react-client/mesh';
-import { Button, Clipboard, IconButton, List, useId, useTranslation } from '@dxos/react-ui';
+import { Button, Clipboard, Icon, IconButton, List, useId, useTranslation } from '@dxos/react-ui';
 import {
   ControlFrame,
   ControlFrameItem,
@@ -22,7 +21,6 @@ import {
   ControlSection,
 } from '@dxos/react-ui-form';
 import { StackItem } from '@dxos/react-ui-stack';
-import { getSize, mx } from '@dxos/react-ui-theme';
 import { AuthCode, Centered, DeviceListItem, Emoji, Viewport } from '@dxos/shell/react';
 import { hexToEmoji } from '@dxos/util';
 
@@ -290,5 +288,9 @@ const InvitationAuthCode = ({ id, code, onCancel }: { id: string; code: string;
 };
 
 const InvitationComplete = ({ statusValue }: { statusValue: number }) => {
-  return statusValue > 0 ? <Check className={mx('m-1.5', getSize(6))} /> : <X className={mx('m-1.5', getSize(6))} />;
+  return statusValue > 0 ? (
+    <Icon icon='ph--check--regular' size={6} classNames='m-1.5' />
+  ) : (
+    <Icon icon='ph--x--regular' size={6} classNames='m-1.5' />
+  );
 };

package/src/components/JoinDialog.tsx

@@ -4,7 +4,7 @@
 
 import React, { useCallback } from 'react';
 
-import { createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
+import { LayoutAction, createIntent, useIntentDispatcher } from '@dxos/app-framework';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { type InvitationResult } from '@dxos/react-client/invitations';
 import { Dialog, useTranslation } from '@dxos/react-ui';

package/src/components/ProfileContainer.stories.tsx

@@ -4,13 +4,14 @@
 
 import '@dxos-theme';
 
-import { type StoryObj, type Meta } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { withClientProvider } from '@dxos/react-client/testing';
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
+
+import { translations } from '../translations';
 
 import { ProfileContainer } from './ProfileContainer';
-import translations from '../translations';
 
 const meta: Meta = {
   title: 'plugins/plugin-client/ProfileContainer',

package/src/components/ProfileContainer.tsx

@@ -10,16 +10,16 @@ import { useClient } from '@dxos/react-client';
 import { type Identity, useIdentity } from '@dxos/react-client/halo';
 import { ButtonGroup, Clipboard, Input, useTranslation } from '@dxos/react-ui';
 import {
-  Form,
-  type InputComponent,
   ControlItem,
   ControlItemInput,
-  ControlSection,
   ControlPage,
+  ControlSection,
+  Form,
+  type InputComponent,
 } from '@dxos/react-ui-form';
 import { EmojiPickerBlock, HuePicker } from '@dxos/react-ui-pickers';
 import { StackItem } from '@dxos/react-ui-stack';
-import { hexToHue, hexToEmoji } from '@dxos/util';
+import { hexToEmoji, hexToHue } from '@dxos/util';
 
 import { CLIENT_PLUGIN } from '../meta';
 
@@ -58,7 +58,7 @@ export const ProfileContainer = () => {
       setDisplayNameDirectly(profile.displayName);
       setEmojiDirectly(profile.emoji);
       setHueDirectly(profile.hue);
-      updateProfile(profile);
+      void updateProfile(profile);
     },
     [identity],
   );

package/src/components/RecoveryCodeDialog.stories.tsx

@@ -4,16 +4,17 @@
 
 import '@dxos-theme';
 
-import { type StoryObj, type Meta } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 
 import { useClient } from '@dxos/react-client';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { AlertDialog, useAsyncEffect } from '@dxos/react-ui';
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
+
+import { translations } from '../translations';
 
 import { RecoveryCodeDialog, type RecoveryCodeDialogProps } from './RecoveryCodeDialog';
-import translations from '../translations';
 
 const DefaultStory = () => {
   const client = useClient();

package/src/components/RecoveryCredentialsContainer.stories.tsx

@@ -4,15 +4,16 @@
 
 import '@dxos-theme';
 
-import { type StoryObj, type Meta } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
 
-import { RecoveryCredentialsContainer } from './RecoveryCredentialsContainer';
 import { ClientPlugin } from '../ClientPlugin';
-import translations from '../translations';
+import { translations } from '../translations';
+
+import { RecoveryCredentialsContainer } from './RecoveryCredentialsContainer';
 
 const meta: Meta = {
   title: 'plugins/plugin-client/RecoveryCredentialsContainer',
@@ -21,7 +22,7 @@ const meta: Meta = {
     withPluginManager({
       plugins: [
         ClientPlugin({
-          onClientInitialized: async (_, client) => {
+          onClientInitialized: async ({ client }) => {
             await client.halo.createIdentity();
           },
         }),

package/src/components/RecoveryCredentialsContainer.tsx

@@ -6,7 +6,7 @@ import React from 'react';
 
 import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
 import { useCredentials } from '@dxos/react-client/halo';
-import { Icon, IconButton, List, ListItem, useTranslation, Message } from '@dxos/react-ui';
+import { Icon, IconButton, List, ListItem, Message, useTranslation } from '@dxos/react-ui';
 import { ControlGroup, ControlItem, ControlPage, ControlSection } from '@dxos/react-ui-form';
 import { StackItem } from '@dxos/react-ui-stack';
 

package/src/components/ResetDialog.stories.tsx

@@ -4,16 +4,17 @@
 
 import '@dxos-theme';
 
-import { type StoryObj, type Meta } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
 import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Dialog } from '@dxos/react-ui';
-import { withTheme, withLayout } from '@dxos/storybook-utils';
+import { withLayout, withTheme } from '@dxos/storybook-utils';
+
+import { translations } from '../translations';
 
 import { ResetDialog, type ResetDialogProps } from './ResetDialog';
-import translations from '../translations';
 
 const Render = (props: ResetDialogProps) => {
   return (

package/src/components/ResetDialog.tsx

@@ -4,7 +4,7 @@
 
 import React, { useCallback } from 'react';
 
-import { createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
+import { LayoutAction, createIntent, useIntentDispatcher } from '@dxos/app-framework';
 import { useClient } from '@dxos/react-client';
 import { Dialog, useTranslation } from '@dxos/react-ui';
 import { ConfirmReset, type ConfirmResetProps } from '@dxos/shell/react';

package/src/translations.ts

@@ -2,12 +2,14 @@
 // Copyright 2023 DXOS.org
 //
 
-import { CLIENT_PLUGIN } from './meta';
+import { type Resource } from '@dxos/react-ui';
 
-export default [
+import { meta } from './meta';
+
+export const translations = [
   {
     'en-US': {
-      [CLIENT_PLUGIN]: {
+      [meta.id]: {
         'account label': 'User Account',
         'profile label': 'Profile',
         'profile description': 'You can adjust how your user settings here.',
@@ -65,4 +67,4 @@ export default [
       },
     },
   },
-];
+] as const satisfies Resource[];

package/src/types/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './schema';