@dxos/plugin-client 0.8.4-main.4a85c3132b → 0.8.4-main.51f1e5ca51

package/src/containers/JoinDialog/JoinDialog.tsx

@@ -6,14 +6,14 @@ import React, { useCallback } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { LayoutOperation } from '@dxos/app-toolkit';
-import { ObservabilityOperation } from '@dxos/plugin-observability/types';
+import { ObservabilityOperation } from '@dxos/plugin-observability/operations';
 import { type InvitationResult } from '@dxos/react-client/invitations';
 import { Dialog, useTranslation } from '@dxos/react-ui';
 import { JoinPanel, type JoinPanelProps } from '@dxos/shell/react';
 import { osTranslations } from '@dxos/ui-theme';
 
-import { meta } from '../../meta';
-import { ClientOperation } from '../../types';
+import { meta } from '#meta';
+import { ClientOperation } from '#operations';
 
 export const JoinDialog = (props: JoinPanelProps) => {
   const { invokePromise } = useOperationInvoker();
@@ -35,19 +35,22 @@ export const JoinDialog = (props: JoinPanelProps) => {
     [invokePromise],
   );
 
+  // TODO(burdon): Move JoinHeading into Dialog.Heading.
   return (
     <Dialog.Content>
       <Dialog.Header>
-        <Dialog.Title classNames='sr-only'>{t('join space label', { ns: osTranslations })}</Dialog.Title>
+        <Dialog.Title classNames='sr-only'>{t('join-space.label', { ns: osTranslations })}</Dialog.Title>
       </Dialog.Header>
-      <JoinPanel
-        mode='halo-only'
-        {...props}
-        exitActionParent={<Dialog.Close asChild />}
-        doneActionParent={<Dialog.Close asChild />}
-        onCancelResetStorage={handleCancelResetStorage}
-        onDone={handleDone}
-      />
+      <Dialog.Body>
+        <JoinPanel
+          {...props}
+          mode='halo-only'
+          exitActionParent={<Dialog.Close asChild />}
+          doneActionParent={<Dialog.Close asChild />}
+          onCancelResetStorage={handleCancelResetStorage}
+          onDone={handleDone}
+        />
+      </Dialog.Body>
     </Dialog.Content>
   );
 };

package/src/containers/JoinDialog/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-import { JoinDialog } from './JoinDialog';
-
-export default JoinDialog;
+export { JoinDialog as default } from './JoinDialog';

package/src/containers/ProfileContainer/ProfileContainer.stories.tsx

@@ -7,7 +7,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
 
 import { ProfileContainer } from './ProfileContainer';
 

package/src/containers/ProfileContainer/ProfileContainer.tsx

@@ -13,7 +13,7 @@ import { Form, type FormFieldMap, type FormUpdateMeta, Settings } from '@dxos/re
 import { EmojiPickerBlock, HuePicker } from '@dxos/react-ui-pickers';
 import { hexToEmoji, hexToHue } from '@dxos/util';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
 // TOOD(burdon): Factor out?
 // TODO(wittjosiah): Integrate annotations with translations.
@@ -101,14 +101,14 @@ export const ProfileContainer = () => {
         );
 
         return (
-          <Settings.ItemInput title={label} description={t('display name description')}>
+          <Settings.Item title={label} description={t('display-name.description')}>
             <Input.TextInput
               value={getValue()}
               onChange={handleChange}
-              placeholder={t('display name input placeholder')}
+              placeholder={t('display-name-input.placeholder')}
               classNames='min-w-64'
             />
-          </Settings.ItemInput>
+          </Settings.Item>
         );
       },
       emoji: ({ type, label, getValue, onValueChange }) => {
@@ -119,7 +119,7 @@ export const ProfileContainer = () => {
         );
 
         return (
-          <Settings.Item title={label} description={t('icon description')}>
+          <Settings.Item title={label} description={t('icon.description')}>
             <EmojiPickerBlock
               triggerVariant='default'
               emoji={getValue()}
@@ -138,7 +138,7 @@ export const ProfileContainer = () => {
         );
 
         return (
-          <Settings.Item title={label} description={t('hue description')}>
+          <Settings.Item title={label} description={t('hue.description')}>
             <div role='none' className='flex justify-self-end'>
               <HuePicker value={getValue()} onChange={handleChange} onReset={handleHueReset} />
             </div>
@@ -148,12 +148,12 @@ export const ProfileContainer = () => {
       // TODO(wittjosiah): We need text input annotations for disabled and copyable.
       did: ({ label, getValue }) => {
         return (
-          <Settings.ItemInput title={label} description={t('did description')}>
+          <Settings.Item title={label} description={t('did.description')}>
             <ButtonGroup classNames='w-full'>
               <Input.TextInput value={getValue()} disabled classNames='min-w-64' />
               <Clipboard.IconButton value={getValue() ?? ''} />
             </ButtonGroup>
-          </Settings.ItemInput>
+          </Settings.Item>
         );
       },
     }),
@@ -162,15 +162,15 @@ export const ProfileContainer = () => {
 
   return (
     <Clipboard.Provider>
-      <Settings.Root>
-        <Settings.Section title={t('profile label')} description={t('profile description')}>
+      <Settings.Viewport>
+        <Settings.Section title={t('profile.label')} description={t('profile.description')}>
           <Form.Root schema={UserProfile} values={values} fieldMap={fieldMap} onValuesChanged={handleChange}>
-            <Form.Content>
+            <Form.Content classNames='gap-form-gap'>
               <Form.FieldSet />
             </Form.Content>
           </Form.Root>
         </Settings.Section>
-      </Settings.Root>
+      </Settings.Viewport>
     </Clipboard.Provider>
   );
 };

package/src/containers/ProfileContainer/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-import { ProfileContainer } from './ProfileContainer';
-
-export default ProfileContainer;
+export { ProfileContainer as default } from './ProfileContainer';

package/src/containers/RecoveryCodeDialog/RecoveryCodeDialog.stories.tsx

@@ -10,7 +10,7 @@ import { withClientProvider } from '@dxos/react-client/testing';
 import { AlertDialog, useAsyncEffect } from '@dxos/react-ui';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
 
 import { RecoveryCodeDialog } from './RecoveryCodeDialog';
 

package/src/containers/RecoveryCodeDialog/RecoveryCodeDialog.tsx

@@ -6,7 +6,7 @@ import React, { useCallback, useState } from 'react';
 
 import { AlertDialog, Button, Clipboard, Input, useTranslation } from '@dxos/react-ui';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
 export type RecoveryCodeDialogProps = {
   code: string;
@@ -22,14 +22,14 @@ export const RecoveryCodeDialog = ({ code }: RecoveryCodeDialogProps) => {
   return (
     <AlertDialog.Content size='md' classNames='min-h-[15rem]'>
       <AlertDialog.Body>
-        <AlertDialog.Title>{t('recovery code dialog title')}</AlertDialog.Title>
-        <p className='py-4'>{t('recovery code dialog description')}</p>
+        <AlertDialog.Title>{t('recovery-code-dialog.title')}</AlertDialog.Title>
+        <p className='py-4'>{t('recovery-code-dialog.description')}</p>
         <Clipboard.Provider>
           <Code code={code} />
         </Clipboard.Provider>
         <div className='flex flex-col py-4 gap-2'>
-          <p>{t('recovery code dialog warning 1')}</p>
-          <p>{t('recovery code dialog warning 2')}</p>
+          <p>{t('recovery-code-dialog-warning-1.message')}</p>
+          <p>{t('recovery-code-dialog-warning-2.message')}</p>
         </div>
         <div className='flex items-center gap-2 pb-4'>
           <Input.Root>
@@ -38,14 +38,14 @@ export const RecoveryCodeDialog = ({ code }: RecoveryCodeDialogProps) => {
               checked={confirmation}
               onCheckedChange={handleConfirmation}
             />
-            <Input.Label>{t('recovery code confirmation label')}</Input.Label>
+            <Input.Label>{t('recovery-code-confirmation.label')}</Input.Label>
           </Input.Root>
         </div>
       </AlertDialog.Body>
       <AlertDialog.ActionBar>
         <AlertDialog.Action asChild>
           <Button data-testid='recoveryCode.continue' variant='primary' disabled={!confirmation}>
-            {t('continue label')}
+            {t('continue.label')}
           </Button>
         </AlertDialog.Action>
       </AlertDialog.ActionBar>

package/src/containers/RecoveryCredentialsContainer/RecoveryCredentialsContainer.stories.tsx

@@ -9,9 +9,10 @@ import { OperationPlugin, RuntimePlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { ClientPlugin } from '../../ClientPlugin';
-import { translations } from '../../translations';
+import { initializeIdentity } from '#testing';
+import { translations } from '#translations';
 
+import { ClientPlugin } from '../../ClientPlugin';
 import { RecoveryCredentialsContainer } from './RecoveryCredentialsContainer';
 
 const meta = {
@@ -25,7 +26,7 @@ const meta = {
         ClientPlugin({
           onClientInitialized: ({ client }) =>
             Effect.gen(function* () {
-              yield* Effect.promise(() => client.halo.createIdentity());
+              yield* initializeIdentity(client);
             }),
         }),
         OperationPlugin(),

package/src/containers/RecoveryCredentialsContainer/RecoveryCredentialsContainer.tsx

@@ -9,10 +9,10 @@ import { useCredentials } from '@dxos/react-client/halo';
 import { Icon, IconButton, List, ListItem, Message, useTranslation } from '@dxos/react-ui';
 import { Settings } from '@dxos/react-ui-form';
 
-import { meta } from '../../meta';
-import { ClientOperation } from '../../types';
+import { meta } from '#meta';
+import { ClientOperation } from '#operations';
 
-export const MANAGE_CREDENTIALS_DIALOG = `${meta.id}/ManageCredentialsDialog`;
+export const MANAGE_CREDENTIALS_DIALOG = `${meta.id}.ManageCredentialsDialog`;
 
 export const RecoveryCredentialsContainer = () => {
   const { t } = useTranslation(meta.id);
@@ -23,32 +23,30 @@ export const RecoveryCredentialsContainer = () => {
   );
 
   return (
-    <Settings.Root>
-      <Settings.Section title={t('recovery setup dialog title')} description={t('recovery setup dialog description')}>
-        <Settings.Group>
-          <Settings.Item title={t('create passkey label')} description={t('create passkey description')}>
-            <IconButton
-              label={t('create passkey label')}
-              icon='ph--key--duotone'
-              variant='primary'
-              onClick={() => invokePromise(ClientOperation.CreatePasskey)}
-            />
-          </Settings.Item>
-          <Settings.Item title={t('create recovery code label')} description={t('create recovery code description')}>
-            <IconButton
-              label={t('create recovery code label')}
-              icon='ph--receipt--duotone'
-              variant='default'
-              onClick={() => invokePromise(ClientOperation.CreateRecoveryCode)}
-            />
-          </Settings.Item>
-        </Settings.Group>
+    <Settings.Viewport>
+      <Settings.Section title={t('recovery-setup-dialog.title')} description={t('recovery-setup-dialog.description')}>
+        <Settings.Item title={t('create-passkey.label')} description={t('create-passkey.description')}>
+          <IconButton
+            label={t('create-passkey.label')}
+            icon='ph--key--duotone'
+            variant='primary'
+            onClick={() => invokePromise(ClientOperation.CreatePasskey)}
+          />
+        </Settings.Item>
+        <Settings.Item title={t('create-recovery-code.label')} description={t('create-recovery-code.description')}>
+          <IconButton
+            label={t('create-recovery-code.label')}
+            icon='ph--receipt--duotone'
+            variant='default'
+            onClick={() => invokePromise(ClientOperation.CreateRecoveryCode)}
+          />
+        </Settings.Item>
       </Settings.Section>
-      <Settings.Section title={t('credentials list label')}>
+      <Settings.Section title={t('credentials-list.label')}>
         {recoveryCredentials.length < 1 ? (
           <Message.Root valence='error'>
-            <Message.Title icon='ph--shield-warning--duotone'>{t('no credentials title')}</Message.Title>
-            <Message.Content>{t('no credentials message')}</Message.Content>
+            <Message.Title icon='ph--shield-warning--duotone'>{t('no-credentials.title')}</Message.Title>
+            <Message.Content>{t('no-credentials.message')}</Message.Content>
           </Message.Root>
         ) : (
           <List>
@@ -63,6 +61,6 @@ export const RecoveryCredentialsContainer = () => {
           </List>
         )}
       </Settings.Section>
-    </Settings.Root>
+    </Settings.Viewport>
   );
 };

package/src/containers/RecoveryCredentialsContainer/index.ts

@@ -2,6 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-import { RecoveryCredentialsContainer } from './RecoveryCredentialsContainer';
-
-export default RecoveryCredentialsContainer;
+export { RecoveryCredentialsContainer as default } from './RecoveryCredentialsContainer';

package/src/containers/ResetDialog/ResetDialog.stories.tsx

@@ -12,9 +12,9 @@ import { usePluginManager } from '@dxos/app-framework/ui';
 import { Dialog } from '@dxos/react-ui';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { ClientPlugin } from '../../ClientPlugin';
-import { translations } from '../../translations';
+import { translations } from '#translations';
 
+import { ClientPlugin } from '../../ClientPlugin';
 import { ResetDialog, type ResetDialogProps } from './ResetDialog';
 
 const DefaultStory = (props: Omit<ResetDialogProps, 'capabilityManager'>) => {
@@ -56,13 +56,13 @@ type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {
-    mode: 'reset storage' as const,
+    mode: 'reset-storage' as const,
   } as any,
 };
 
 export const JoinNewIdentity: Story = {
   args: {
-    mode: 'join new identity' as const,
+    mode: 'join-new-identity' as const,
   } as any,
 };
 

package/src/containers/ResetDialog/ResetDialog.tsx

@@ -13,7 +13,7 @@ import { useClient } from '@dxos/react-client';
 import { Dialog, useTranslation } from '@dxos/react-ui';
 import { ConfirmReset, type ConfirmResetProps, translationKey } from '@dxos/shell/react';
 
-import { type ClientPluginOptions } from '../../types';
+import { type ClientPluginOptions } from '#types';
 
 export type ResetDialogProps = Pick<ConfirmResetProps, 'mode'> &
   Pick<ClientPluginOptions, 'onReset'> & {
@@ -28,7 +28,7 @@ export const ResetDialog = ({ mode, onReset, capabilityManager }: ResetDialogPro
   const handleReset = useCallback(async () => {
     await client.reset();
     const target =
-      mode === 'join new identity' ? 'deviceInvitation' : mode === 'recover' ? 'recoverIdentity' : undefined;
+      mode === 'join-new-identity' ? 'deviceInvitation' : mode === 'recover' ? 'recoverIdentity' : undefined;
     if (onReset) {
       await runAndForwardErrors(onReset({ target }).pipe(Effect.provideService(Capability.Service, capabilityManager)));
     }
@@ -41,10 +41,12 @@ export const ResetDialog = ({ mode, onReset, capabilityManager }: ResetDialogPro
   return (
     <Dialog.Content>
       <Dialog.Header>
-        <Dialog.Title>{t('reset dialog title')}</Dialog.Title>
+        <Dialog.Title>{t('reset-dialog.title')}</Dialog.Title>
       </Dialog.Header>
-      <Dialog.Description classNames='sr-only'>{t('reset dialog description')}</Dialog.Description>
-      <ConfirmReset active mode={mode} onConfirm={handleReset} onCancel={handleCancel} />
+      <Dialog.Body>
+        <Dialog.Description classNames='sr-only'>{t('reset-dialog.description')}</Dialog.Description>
+        <ConfirmReset active mode={mode} onConfirm={handleReset} onCancel={handleCancel} />
+      </Dialog.Body>
     </Dialog.Content>
   );
 };

package/src/index.ts

@@ -2,8 +2,5 @@
 // Copyright 2023 DXOS.org
 //
 
-export { ClientCapabilities, ClientEvents } from './types';
-export * from './meta';
-export * from './types';
-
-export * from './ClientPlugin';
+export { ClientPlugin } from './ClientPlugin';
+export { meta } from './meta';

package/src/meta.ts

@@ -6,7 +6,7 @@ import { type Plugin } from '@dxos/app-framework';
 import { trim } from '@dxos/util';
 
 export const meta: Plugin.Meta = {
-  id: 'dxos.org/plugin/client',
+  id: 'org.dxos.plugin.client',
   name: 'Client',
   description: trim`
     Core client connectivity and peer-to-peer networking infrastructure.

package/src/operations/create-agent.ts

@@ -0,0 +1,26 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
+import { invariant } from '@dxos/invariant';
+
+import { ClientCapabilities } from '../types';
+import { CreateAgent } from './definitions';
+
+const handler: Operation.WithHandler<typeof CreateAgent> = CreateAgent.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* () {
+      const client = yield* Capability.get(ClientCapabilities.Client);
+      invariant(client.services.services.EdgeAgentService, 'Missing EdgeAgentService');
+      yield* Effect.promise(() =>
+        client.services.services.EdgeAgentService!.createAgent(undefined, { timeout: 10_000 }),
+      );
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/create-identity.ts

@@ -0,0 +1,29 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
+import { runAndForwardErrors } from '@dxos/effect';
+import { ObservabilityOperation } from '@dxos/plugin-observability/operations';
+
+import { ClientEvents } from '../types';
+import { ClientCapabilities } from '../types';
+import { CreateIdentity } from './definitions';
+
+const handler: Operation.WithHandler<typeof CreateIdentity> = CreateIdentity.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* (profile) {
+      const manager = yield* Capability.get(Capabilities.PluginManager);
+      const client = yield* Capability.get(ClientCapabilities.Client);
+      const data = yield* Effect.promise(() => client.halo.createIdentity(profile));
+      yield* Effect.promise(() => runAndForwardErrors(manager.activate(ClientEvents.IdentityCreated)));
+      yield* Operation.schedule(ObservabilityOperation.SendEvent, { name: 'identity.create' });
+      return data;
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/create-passkey.ts

@@ -0,0 +1,88 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Match from 'effect/Match';
+
+import { Capability } from '@dxos/app-framework';
+import { supportsNativePasskeys, createNativePasskey, extractPublicKeyFromAttestation } from '@dxos/app-toolkit';
+import { PublicKey } from '@dxos/client';
+import { Operation } from '@dxos/compute';
+import { invariant } from '@dxos/invariant';
+
+import { ClientCapabilities } from '../types';
+import { CreatePasskey } from './definitions';
+
+const handler: Operation.WithHandler<typeof CreatePasskey> = CreatePasskey.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* () {
+      const client = yield* Capability.get(ClientCapabilities.Client);
+      const identity = client.halo.identity.get();
+      invariant(identity, 'Identity not available');
+
+      const lookupKey = PublicKey.random();
+
+      const { recoveryKey, algorithm } = yield* Match.value(supportsNativePasskeys()).pipe(
+        Match.when(true, () =>
+          Effect.gen(function* () {
+            const result = yield* Effect.promise(() =>
+              createNativePasskey({
+                username: identity.did,
+                userId: lookupKey.asUint8Array(),
+              }),
+            );
+            const { publicKey, algorithm: alg } = extractPublicKeyFromAttestation(result.attestation_object);
+            return {
+              recoveryKey: PublicKey.from(publicKey),
+              algorithm: alg === -7 ? 'ES256' : 'ED25519',
+            };
+          }),
+        ),
+        Match.orElse(() =>
+          Effect.gen(function* () {
+            const credential = yield* Effect.promise(() =>
+              navigator.credentials.create({
+                publicKey: {
+                  challenge: new Uint8Array(),
+                  rp: { id: location.hostname, name: 'Composer' },
+                  user: {
+                    id: lookupKey.asUint8Array() as Uint8Array<ArrayBuffer>,
+                    name: identity.did,
+                    displayName: identity.profile?.displayName ?? '',
+                  },
+                  pubKeyCredParams: [
+                    { type: 'public-key', alg: -8 },
+                    { type: 'public-key', alg: -7 },
+                  ],
+                  authenticatorSelection: {
+                    residentKey: 'required',
+                    requireResidentKey: true,
+                  },
+                },
+              }),
+            );
+            invariant(credential, 'Credential not available');
+            return {
+              recoveryKey: PublicKey.from(new Uint8Array((credential as any).response.getPublicKey())),
+              algorithm: (credential as any).response.getPublicKeyAlgorithm() === -7 ? 'ES256' : 'ED25519',
+            };
+          }),
+        ),
+      );
+
+      invariant(client.services.services.IdentityService, 'IdentityService not available');
+      yield* Effect.promise(() =>
+        client.services.services.IdentityService!.createRecoveryCredential({
+          data: {
+            recoveryKey,
+            algorithm,
+            lookupKey,
+          },
+        }),
+      );
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/create-recovery-code.ts

@@ -0,0 +1,34 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+import { invariant } from '@dxos/invariant';
+
+import { RECOVERY_CODE_DIALOG } from '../constants';
+import { ClientCapabilities } from '../types';
+import { CreateRecoveryCode } from './definitions';
+
+const handler: Operation.WithHandler<typeof CreateRecoveryCode> = CreateRecoveryCode.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* () {
+      const client = yield* Capability.get(ClientCapabilities.Client);
+      invariant(client.services.services.IdentityService, 'IdentityService not available');
+      const { recoveryCode } = yield* Effect.promise(() =>
+        client.services.services.IdentityService!.createRecoveryCredential({}),
+      );
+      yield* Operation.invoke(LayoutOperation.UpdateDialog, {
+        subject: RECOVERY_CODE_DIALOG,
+        blockAlign: 'start',
+        type: 'alert',
+        props: { code: recoveryCode },
+      });
+    }),
+  ),
+);
+
+export default handler;