@dxos/plugin-client 0.8.4-main.dedc0f3 → 0.8.4-main.ead640a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-client",
-  "version": "0.8.4-main.dedc0f3",
+  "version": "0.8.4-main.ead640a",
   "description": "DXOS Surface plugin for DXOS Client",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -36,48 +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.dedc0f3",
-    "@dxos/config": "0.8.4-main.dedc0f3",
-    "@dxos/async": "0.8.4-main.dedc0f3",
-    "@dxos/echo": "0.8.4-main.dedc0f3",
-    "@dxos/echo-schema": "0.8.4-main.dedc0f3",
-    "@dxos/echo-signals": "0.8.4-main.dedc0f3",
-    "@dxos/invariant": "0.8.4-main.dedc0f3",
-    "@dxos/log": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-graph": "0.8.4-main.dedc0f3",
-    "@dxos/plugin-observability": "0.8.4-main.dedc0f3",
-    "@dxos/local-storage": "0.8.4-main.dedc0f3",
-    "@dxos/react-client": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-form": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-pickers": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-stack": "0.8.4-main.dedc0f3",
-    "@dxos/shell": "0.8.4-main.dedc0f3",
-    "@dxos/util": "0.8.4-main.dedc0f3"
+    "@dxos/app-framework": "0.8.4-main.ead640a",
+    "@dxos/async": "0.8.4-main.ead640a",
+    "@dxos/config": "0.8.4-main.ead640a",
+    "@dxos/echo": "0.8.4-main.ead640a",
+    "@dxos/invariant": "0.8.4-main.ead640a",
+    "@dxos/local-storage": "0.8.4-main.ead640a",
+    "@dxos/log": "0.8.4-main.ead640a",
+    "@dxos/echo-signals": "0.8.4-main.ead640a",
+    "@dxos/plugin-graph": "0.8.4-main.ead640a",
+    "@dxos/react-client": "0.8.4-main.ead640a",
+    "@dxos/react-ui-pickers": "0.8.4-main.ead640a",
+    "@dxos/react-ui-stack": "0.8.4-main.ead640a",
+    "@dxos/react-ui-form": "0.8.4-main.ead640a",
+    "@dxos/plugin-observability": "0.8.4-main.ead640a",
+    "@dxos/util": "0.8.4-main.ead640a",
+    "@dxos/shell": "0.8.4-main.ead640a"
   },
   "devDependencies": {
-    "@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.17.7",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "7.1.1",
-    "@dxos/live-object": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui": "0.8.4-main.dedc0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.dedc0f3",
-    "@dxos/storybook-utils": "0.8.4-main.dedc0f3"
+    "@effect-rx/rx-react": "0.42.4",
+    "@effect/platform": "0.92.1",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.1",
+    "effect": "3.18.3",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/live-object": "0.8.4-main.ead640a",
+    "@dxos/react-ui": "0.8.4-main.ead640a",
+    "@dxos/react-ui-theme": "0.8.4-main.ead640a",
+    "@dxos/storybook-utils": "0.8.4-main.ead640a"
   },
   "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.dedc0f3",
-    "@dxos/react-ui-theme": "0.8.4-main.dedc0f3"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.ead640a",
+    "@dxos/react-ui-theme": "0.8.4-main.ead640a"
   },
   "publishConfig": {
     "access": "public"

package/src/ClientPlugin.ts

@@ -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,14 +3,15 @@
 //
 
 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, type PluginContext, contributes } from '@dxos/app-framework';
 import { ROOT_ID, createExtension, rxFromObservable } from '@dxos/plugin-graph';
 import { ConnectionState } from '@dxos/react-client/mesh';
 
-import { CLIENT_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { Account, ClientAction } from '../types';
 
 import { ClientCapabilities } from './capabilities';
@@ -19,22 +20,22 @@ 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: {
@@ -52,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(() => {
@@ -63,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.
@@ -78,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',
                       },
@@ -97,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

@@ -7,12 +7,12 @@ import { type Client } from '@dxos/client';
 import { type ObjectMigration } from '@dxos/client/echo';
 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<Type.Obj.Any[]>(`${CLIENT_PLUGIN}/capability/schema`);
+  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[]>(`${CLIENT_PLUGIN}/capability/schema-whitelist`);
-  export const Migration = defineCapability<ObjectMigration[]>(`${CLIENT_PLUGIN}/capability/migration`);
+  export const SchemaWhiteList = defineCapability<Type.Obj.Any[]>(`${meta.id}/capability/schema-whitelist`);
+  export const Migration = defineCapability<ObjectMigration[]>(`${meta.id}/capability/migration`);
 }

package/src/capabilities/intent-resolver.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { pipe } from 'effect';
+import * as Function from 'effect/Function';
 
 import {
   Capabilities,
@@ -75,7 +75,7 @@ export default ({ context, appName = 'Composer' }: IntentResolverOptions) =>
       resolve: async () => {
         return {
           intents: [
-            pipe(
+            Function.pipe(
               createIntent(LayoutAction.SwitchWorkspace, {
                 part: 'workspace',
                 subject: Account.id,

package/src/capabilities/react-context.tsx

@@ -7,13 +7,13 @@ import React from 'react';
 import { Capabilities, contributes, useCapability } from '@dxos/app-framework';
 import { ClientProvider } from '@dxos/react-client';
 
-import { CLIENT_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
 import { ClientCapabilities } from './capabilities';
 
 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/components/DevicesContainer.stories.tsx

@@ -2,14 +2,12 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 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 { withLayout, withTheme } from '@dxos/storybook-utils';
 
 import { ClientPlugin } from '../ClientPlugin';
 import { translations } from '../translations';
@@ -20,6 +18,7 @@ const meta = {
   title: 'plugins/plugin-client/DevicesContainer',
   component: DevicesContainer,
   decorators: [
+    withTheme,
     withPluginManager({
       plugins: [
         ClientPlugin({
@@ -30,8 +29,6 @@ const meta = {
         IntentPlugin(),
       ],
     }),
-    withTheme,
-    withLayout(),
   ],
   parameters: {
     layout: 'fullscreen',

package/src/components/DevicesContainer.tsx

@@ -23,7 +23,7 @@ import {
 import { AuthCode, Centered, DeviceListItem, Emoji, Viewport } from '@dxos/shell/react';
 import { hexToEmoji } from '@dxos/util';
 
-import { CLIENT_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { ClientAction } from '../types';
 
 export type DevicesContainerProps = {
@@ -52,11 +52,11 @@ export const DevicesContainer = ({ createInvitationUrl }: DevicesContainerProps)
     <Clipboard.Provider>
       <ControlPage>
         <ControlSection
-          title={t('devices verbose label', { ns: CLIENT_PLUGIN })}
-          description={t('devices description', { ns: CLIENT_PLUGIN })}
+          title={t('devices verbose label', { ns: meta.id })}
+          description={t('devices description', { ns: meta.id })}
         >
           <ControlFrame>
-            <ControlFrameItem title={t('devices label', { ns: CLIENT_PLUGIN })}>
+            <ControlFrameItem title={t('devices label', { ns: meta.id })}>
               <List>
                 {devices.map((device: Device) => {
                   return (
@@ -73,21 +73,18 @@ export const DevicesContainer = ({ createInvitationUrl }: DevicesContainerProps)
           </ControlFrame>
         </ControlSection>
         <ControlSection
-          title={t('danger zone title', { ns: CLIENT_PLUGIN })}
-          description={t('danger zone description', { ns: CLIENT_PLUGIN })}
+          title={t('danger zone title', { ns: meta.id })}
+          description={t('danger zone description', { ns: meta.id })}
         >
           <ControlGroup>
-            <ControlItem
-              title={t('reset device label')}
-              description={t('reset device description', { ns: CLIENT_PLUGIN })}
-            >
+            <ControlItem title={t('reset device label')} description={t('reset device description', { ns: meta.id })}>
               <Button variant='destructive' onClick={handleResetStorage} data-testid='devicesContainer.reset'>
                 {t('reset device label')}
               </Button>
             </ControlItem>
             <ControlItem
               title={t('recover identity label')}
-              description={t('recover identity description', { ns: CLIENT_PLUGIN })}
+              description={t('recover identity description', { ns: meta.id })}
             >
               <Button variant='destructive' onClick={handleRecover} data-testid='devicesContainer.recover'>
                 {t('recover identity label')}
@@ -95,7 +92,7 @@ export const DevicesContainer = ({ createInvitationUrl }: DevicesContainerProps)
             </ControlItem>
             <ControlItem
               title={t('join new identity label')}
-              description={t('join new identity description', { ns: CLIENT_PLUGIN })}
+              description={t('join new identity description', { ns: meta.id })}
             >
               <Button variant='destructive' onClick={handleJoinNewIdentity} data-testid='devicesContainer.joinExisting'>
                 {t('join new identity label')}
@@ -178,7 +175,7 @@ const InvitationSection = ({
   onInvitationDone = () => {},
   onInvitationCreate = () => {},
 }: InvitationComponentProps) => {
-  const { t } = useTranslation(CLIENT_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const activeView =
     state < 0
       ? 'init'
@@ -225,7 +222,7 @@ const InvitationQR = ({ id, url, onCancel }: { id: string; url: string; onCancel
   const emoji = hexToEmoji(id);
   return (
     <>
-      <p className='text-description'>{t('qr code description', { ns: CLIENT_PLUGIN })}</p>
+      <p className='text-description'>{t('qr code description', { ns: meta.id })}</p>
       <div role='group' className='grid grid-cols-[1fr_min-content] mlb-2 gap-2'>
         <div role='none' className='is-full aspect-square relative text-description'>
           <QR

package/src/components/JoinDialog.tsx

@@ -10,14 +10,14 @@ import { type InvitationResult } from '@dxos/react-client/invitations';
 import { Dialog, useTranslation } from '@dxos/react-ui';
 import { JoinPanel, type JoinPanelProps } from '@dxos/shell/react';
 
-import { CLIENT_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { ClientAction } from '../types';
 
-export const JOIN_DIALOG = `${CLIENT_PLUGIN}/JoinDialog`;
+export const JOIN_DIALOG = `${meta.id}/JoinDialog`;
 
 export const JoinDialog = (props: JoinPanelProps) => {
   const { dispatchPromise: dispatch } = useIntentDispatcher();
-  const { t } = useTranslation(CLIENT_PLUGIN);
+  const { t } = useTranslation(meta.id);
 
   const handleCancelResetStorage = useCallback(() => dispatch(createIntent(ClientAction.ShareIdentity)), [dispatch]);
 

package/src/components/ProfileContainer.stories.tsx

@@ -2,12 +2,10 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { withClientProvider } from '@dxos/react-client/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import { translations } from '../translations';
 
@@ -16,7 +14,7 @@ import { ProfileContainer } from './ProfileContainer';
 const meta = {
   title: 'plugins/plugin-client/ProfileContainer',
   component: ProfileContainer,
-  decorators: [withClientProvider({ createIdentity: true }), withTheme, withLayout()],
+  decorators: [withTheme, withClientProvider({ createIdentity: true })],
   parameters: {
     layout: 'fullscreen',
     translations,

package/src/components/ProfileContainer.tsx

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { type ChangeEvent, useCallback, useMemo, useState } from 'react';
 
 import { debounce } from '@dxos/async';
@@ -20,7 +20,7 @@ import {
 import { EmojiPickerBlock, HuePicker } from '@dxos/react-ui-pickers';
 import { hexToEmoji, hexToHue } from '@dxos/util';
 
-import { CLIENT_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
 // TODO(thure): Factor out?
 const getDefaultHueValue = (identity: Identity | null) => hexToHue(identity?.identityKey.toHex() ?? '0');
@@ -29,7 +29,7 @@ const getHueValue = (identity: Identity | null) => identity?.profile?.data?.hue
 const getEmojiValue = (identity: Identity | null) => identity?.profile?.data?.emoji || getDefaultEmojiValue(identity);
 
 export const ProfileContainer = () => {
-  const { t } = useTranslation(CLIENT_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const client = useClient();
   const identity = useIdentity();
   const [displayName, setDisplayNameDirectly] = useState(identity?.profile?.displayName ?? '');

package/src/components/RecoveryCodeDialog.stories.tsx

@@ -2,15 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 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 { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import { translations } from '../translations';
 
@@ -37,7 +35,7 @@ const meta = {
   title: 'plugins/plugin-client/RecoveryCodeDialog',
   component: RecoveryCodeDialog as any,
   render: DefaultStory,
-  decorators: [withClientProvider({ createIdentity: true }), withTheme, withLayout()],
+  decorators: [withTheme, withClientProvider({ createIdentity: true })],
   parameters: {
     layout: 'fullscreen',
     translations,

package/src/components/RecoveryCodeDialog.tsx

@@ -6,16 +6,16 @@ import React, { useCallback, useState } from 'react';
 
 import { AlertDialog, Button, Clipboard, Input, useTranslation } from '@dxos/react-ui';
 
-import { CLIENT_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
-export const RECOVERY_CODE_DIALOG = `${CLIENT_PLUGIN}/RecoveryCodeDialog`;
+export const RECOVERY_CODE_DIALOG = `${meta.id}/RecoveryCodeDialog`;
 
 export type RecoveryCodeDialogProps = {
   code: string;
 };
 
 export const RecoveryCodeDialog = ({ code }: RecoveryCodeDialogProps) => {
-  const { t } = useTranslation(CLIENT_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const [confirmation, setConfirmation] = useState(false);
 
   const handleConfirmation = useCallback((checked: boolean) => setConfirmation(checked), []);

package/src/components/RecoveryCredentialsContainer.stories.tsx

@@ -2,13 +2,11 @@
 // Copyright 2023 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import { ClientPlugin } from '../ClientPlugin';
 import { translations } from '../translations';
@@ -19,6 +17,7 @@ const meta = {
   title: 'plugins/plugin-client/RecoveryCredentialsContainer',
   component: RecoveryCredentialsContainer,
   decorators: [
+    withTheme,
     withPluginManager({
       plugins: [
         ClientPlugin({
@@ -29,8 +28,6 @@ const meta = {
         IntentPlugin(),
       ],
     }),
-    withTheme,
-    withLayout(),
   ],
   parameters: {
     layout: 'fullscreen',

package/src/components/RecoveryCredentialsContainer.tsx

@@ -9,13 +9,13 @@ import { useCredentials } from '@dxos/react-client/halo';
 import { Icon, IconButton, List, ListItem, Message, useTranslation } from '@dxos/react-ui';
 import { ControlGroup, ControlItem, ControlPage, ControlSection } from '@dxos/react-ui-form';
 
-import { CLIENT_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { ClientAction } from '../types';
 
-export const MANAGE_CREDENTIALS_DIALOG = `${CLIENT_PLUGIN}/ManageCredentialsDialog`;
+export const MANAGE_CREDENTIALS_DIALOG = `${meta.id}/ManageCredentialsDialog`;
 
 export const RecoveryCredentialsContainer = () => {
-  const { t } = useTranslation(CLIENT_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const { dispatchPromise: dispatch } = useIntentDispatcher();
   const credentials = useCredentials();
   const recoveryCredentials = credentials.filter(