@dxos/plugin-client 0.8.4-main.c85a9c8dae → 0.8.4-main.d9fc60f731

package/src/{cli/commands → commands}/halo/identity/identity.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { describe, expect, it } from '@effect/vitest';
+import { describe, test } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 
 import { TestConsole, TestLayer } from '@dxos/cli-util/testing';
@@ -12,7 +12,7 @@ import { runAndForwardErrors } from '@dxos/effect';
 import { handler } from './identity';
 
 describe('halo identity', () => {
-  it('should log if identity is not initialized', () =>
+  test('should log if identity is not initialized', ({ expect }) =>
     Effect.gen(function* () {
       yield* handler();
       const logger = yield* TestConsole.TestConsole;
@@ -23,7 +23,7 @@ describe('halo identity', () => {
       );
     }).pipe(Effect.provide(TestLayer), Effect.scoped, runAndForwardErrors));
 
-  it('should print identity if initialized', () =>
+  test('should print identity if initialized', ({ expect }) =>
     Effect.gen(function* () {
       const client = yield* ClientService;
       yield* Effect.tryPromise(() => client.halo.createIdentity({ displayName: 'Test' }));
@@ -33,7 +33,7 @@ describe('halo identity', () => {
       expect(logs).toHaveLength(1);
       const parsedIdentity = TestConsole.parseJson(logs[0]);
       expect(parsedIdentity).toEqual({
-        identityKey: client.halo.identity.get()?.identityKey.toHex(),
+        identityDid: client.halo.identity.get()?.did,
         displayName: client.halo.identity.get()?.profile?.displayName,
       });
     }).pipe(Effect.provide(TestLayer), Effect.scoped, runAndForwardErrors));

package/src/{cli/commands → commands}/halo/identity/identity.ts

@@ -23,12 +23,11 @@ export const handler = Effect.fn(function* () {
       yield* Console.log('Identity not initialized.');
     }
   } else {
-    yield* Effect.tryPromise(() => client.spaces.waitUntilReady());
     if (json) {
       yield* Console.log(
         JSON.stringify(
           {
-            identityKey: identity.identityKey.toHex(),
+            identityDid: identity.did,
             displayName: identity.profile?.displayName,
           },
           null,
@@ -36,7 +35,7 @@ export const handler = Effect.fn(function* () {
         ),
       );
     } else {
-      yield* Console.log(print(printIdentity(identity)));
+      yield* Console.log(print(printIdentity({ identityDid: identity.did, profile: identity.profile })));
     }
   }
 });

package/src/{cli/commands → commands}/halo/join/join.ts

@@ -41,7 +41,7 @@ export const join = Command.make(
       yield* Console.log(
         JSON.stringify(
           {
-            identityKey: identity.identityKey.toHex(),
+            identityDid: identity.did,
             displayName: identity.profile?.displayName,
           },
           null,
@@ -49,7 +49,7 @@ export const join = Command.make(
         ),
       );
     } else {
-      yield* Console.log(print(printIdentity(identity)));
+      yield* Console.log(print(printIdentity({ identityDid: identity.did, profile: identity.profile })));
     }
   }),
 ).pipe(Command.withDescription('Join an existing identity using an invitation code.'));

package/src/{cli/commands → commands}/halo/keys/keys.ts

@@ -14,8 +14,6 @@ import { ClientService } from '@dxos/client';
 export const handler = Effect.fn(function* () {
   const { json } = yield* CommandConfig;
   const client = yield* ClientService;
-  yield* Effect.tryPromise(() => client.spaces.waitUntilReady());
-
   const identity = client.halo.identity.get();
   const device = client.halo.device;
 

package/src/{cli/commands → commands}/halo/recover/recover.ts

@@ -29,7 +29,7 @@ export const recover = Command.make(
       yield* Console.log(
         JSON.stringify(
           {
-            identityKey: identity.identityKey.toHex(),
+            identityDid: identity.did,
             displayName: identity.profile?.displayName,
           },
           null,
@@ -38,7 +38,7 @@ export const recover = Command.make(
       );
     } else {
       yield* Console.log('Identity recovered successfully');
-      yield* Console.log(print(printIdentity(identity)));
+      yield* Console.log(print(printIdentity({ identityDid: identity.did, profile: identity.profile })));
     }
   }),
 ).pipe(Command.withDescription('Recover an existing identity using a recovery code.'));

package/src/{cli/commands → commands}/halo/seed/seed.ts

@@ -12,8 +12,6 @@ import { ClientService } from '@dxos/client';
 export const handler = Effect.fn(function* () {
   const { json } = yield* CommandConfig;
   const client = yield* ClientService;
-  yield* Effect.tryPromise(() => client.spaces.waitUntilReady());
-
   const identityService = client.services.services.IdentityService;
   if (!identityService) {
     if (json) {

package/src/{cli/commands → commands}/halo/update/update.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { describe, expect, it } from '@effect/vitest';
+import { describe, test } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 
 import { TestConsole, TestLayer } from '@dxos/cli-util/testing';
@@ -12,18 +12,17 @@ import { runAndForwardErrors } from '@dxos/effect';
 import { handler } from './update';
 
 describe('halo update', () => {
-  it('should update identity display name', () =>
+  test('should update identity display name', ({ expect }) =>
     Effect.gen(function* () {
       const client = yield* ClientService;
       yield* Effect.tryPromise(() => client.halo.createIdentity());
-      yield* Effect.tryPromise(() => client.spaces.waitUntilReady());
       yield* handler({ displayName: 'Updated Name' });
       const logger = yield* TestConsole.TestConsole;
       const logs = logger.logs;
       expect(logs).toHaveLength(1);
-      const parsed = TestConsole.parseJson<{ identityKey: string; displayName: string }>(logs[0]);
-      expect(parsed).toHaveProperty('identityKey');
+      const parsed = TestConsole.parseJson<{ identityDid: string; displayName: string }>(logs[0]);
+      expect(parsed).toHaveProperty('identityDid');
       expect(parsed).toHaveProperty('displayName', 'Updated Name');
-      expect(parsed.identityKey).toBe(client.halo.identity.get()?.identityKey.toHex());
+      expect(parsed.identityDid).toBe(client.halo.identity.get()?.did);
     }).pipe(Effect.provide(TestLayer), Effect.scoped, runAndForwardErrors));
 });

package/src/{cli/commands → commands}/halo/update/update.ts

@@ -16,8 +16,6 @@ import { printIdentity } from '../util';
 export const handler = Effect.fn(function* ({ displayName }: { displayName: string }) {
   const { json } = yield* CommandConfig;
   const client = yield* ClientService;
-  yield* Effect.tryPromise(() => client.spaces.waitUntilReady());
-
   const identity = client.halo.identity.get();
   if (!identity) {
     if (json) {
@@ -48,7 +46,7 @@ export const handler = Effect.fn(function* ({ displayName }: { displayName: stri
     yield* Console.log(
       JSON.stringify(
         {
-          identityKey: updatedIdentity.identityKey.toHex(),
+          identityDid: updatedIdentity.did,
           displayName: updatedIdentity.profile?.displayName,
         },
         null,
@@ -56,7 +54,7 @@ export const handler = Effect.fn(function* ({ displayName }: { displayName: stri
       ),
     );
   } else {
-    yield* Console.log(print(printIdentity(updatedIdentity)));
+    yield* Console.log(print(printIdentity({ identityDid: updatedIdentity.did, profile: updatedIdentity.profile })));
   }
 });
 

package/src/{cli/commands → commands}/halo/util.ts

@@ -7,12 +7,9 @@ import { FormBuilder } from '@dxos/cli-util';
 /**
  * Pretty prints an identity with ANSI colors.
  */
-export const printIdentity = (identity: {
-  identityKey: { toHex(): string; truncate(): string };
-  profile?: { displayName?: string };
-}) =>
+export const printIdentity = (identity: { identityDid: string; profile?: { displayName?: string } }) =>
   FormBuilder.make({ title: 'Identity' }).pipe(
-    FormBuilder.set('identityKey', identity.identityKey.truncate()),
+    FormBuilder.set('identityDid', identity.identityDid),
     FormBuilder.set('displayName', identity.profile?.displayName ?? '<none>'),
     FormBuilder.build,
   );

package/src/{cli/commands → commands}/profile/create.ts

@@ -5,13 +5,14 @@
 import * as Command from '@effect/cli/Command';
 import * as Options from '@effect/cli/Options';
 import * as FileSystem from '@effect/platform/FileSystem';
+import * as Path from '@effect/platform/Path';
 import * as Console from 'effect/Console';
 import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 import * as Record from 'effect/Record';
 
 import { CommandConfig, print } from '@dxos/cli-util';
-import { DX_CONFIG, getProfilePath } from '@dxos/client-protocol';
+import { DX_CONFIG, getProfileConfigPath } from '@dxos/client-protocol';
 import { trim } from '@dxos/util';
 
 import { printProfileCreated } from './util';
@@ -71,17 +72,19 @@ export const create = Command.make(
   Effect.fnUntraced(function* ({ template, name }) {
     const { json } = yield* CommandConfig;
     const fs = yield* FileSystem.FileSystem;
+    const path = yield* Path.Path;
     const profileName = name.pipe(Option.getOrElse(() => template));
-    const profilePath = `${getProfilePath(DX_CONFIG, profileName)}.yml`;
-    if (yield* fs.exists(profilePath)) {
+    const configPath = getProfileConfigPath(DX_CONFIG, profileName);
+    if (yield* fs.exists(configPath)) {
       throw new Error(`Profile ${profileName} already exists`);
     }
 
-    yield* fs.writeFileString(profilePath, TEMPLATES[template]);
+    yield* fs.makeDirectory(path.dirname(configPath), { recursive: true });
+    yield* fs.writeFileString(configPath, TEMPLATES[template]);
     if (json) {
-      yield* Console.log(JSON.stringify({ name: profileName, path: profilePath }, null, 2));
+      yield* Console.log(JSON.stringify({ name: profileName, path: configPath }, null, 2));
     } else {
-      yield* Console.log(print(printProfileCreated(profileName, profilePath)));
+      yield* Console.log(print(printProfileCreated(profileName, configPath)));
     }
   }),
 );

package/src/{cli/commands → commands}/profile/delete.ts

@@ -10,7 +10,7 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { CommandConfig, print } from '@dxos/cli-util';
-import { DX_CONFIG, getProfilePath } from '@dxos/client-protocol';
+import { DX_CONFIG, getProfileConfigPath } from '@dxos/client-protocol';
 
 import { printProfileDeleted } from './util';
 
@@ -23,7 +23,10 @@ export const del = Command.make(
     const { json } = yield* CommandConfig;
     const fs = yield* FileSystem.FileSystem;
     const profileName = name.pipe(Option.getOrElse(() => 'default'));
-    yield* fs.remove(`${getProfilePath(DX_CONFIG, profileName)}.yml`);
+    const configPath = getProfileConfigPath(DX_CONFIG, profileName);
+    const pluginsPath = `${DX_CONFIG}/plugins/${profileName}.yml`;
+    yield* fs.remove(configPath).pipe(Effect.ignore);
+    yield* fs.remove(pluginsPath).pipe(Effect.ignore);
     if (json) {
       yield* Console.log(JSON.stringify({ name: profileName, deleted: true }, null, 2));
     } else {

package/src/{cli/commands → commands}/profile/list.ts

@@ -23,21 +23,22 @@ export const list = Command.make(
     const fs = yield* FileSystem.FileSystem;
     const path = yield* Path.Path;
     const profileDir = path.join(DX_CONFIG, 'profile');
-    const files = yield* fs.readDirectory(profileDir);
-    const profiles = yield* Effect.forEach(
-      files,
-      Effect.fnUntraced(function* (filename) {
-        const ext = path.extname(filename);
-        const name = filename.slice(0, -ext.length);
-        const fullPath = path.join(DX_CONFIG, 'profile', filename);
-        const configContent = yield* fs.readFileString(fullPath);
-        const configValues = Yaml.parse(configContent);
+    const entries = yield* fs.readDirectory(profileDir);
+    const profileFiles = entries.filter((entry) => entry.endsWith('.yml'));
+    const profiles = yield* Effect.forEach(profileFiles, (filename) =>
+      Effect.gen(function* () {
+        const name = filename.slice(0, -4);
+        const configPath = path.join(profileDir, filename);
+        const configContent = yield* fs
+          .readFileString(configPath)
+          .pipe(Effect.catchTag('SystemError', () => Effect.succeed('{}')));
+        const configValues = Yaml.parse(configContent) ?? {};
         const config = new Config(configValues);
         return {
           name,
           isCurrent: name === currentProfile,
-          fullPath,
-          storagePath: getProfilePath(configValues?.runtime?.client?.storage.dataRoot ?? DX_DATA, name),
+          fullPath: configPath,
+          storagePath: getProfilePath(configValues?.runtime?.client?.storage?.dataRoot ?? DX_DATA, name),
           edge: config.values.runtime?.services?.edge?.url,
         };
       }),

package/src/constants.ts

@@ -2,8 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { meta } from './meta';
+import { DXN } from '@dxos/keys';
 
-export const JOIN_DIALOG = `${meta.id}/JoinDialog`;
-export const RECOVERY_CODE_DIALOG = `${meta.id}/RecoveryCodeDialog`;
-export const RESET_DIALOG = `${meta.id}/ResetDialog`;
+import { meta } from '#meta';
+
+export const JOIN_DIALOG = DXN.make(`${meta.id}.joinDialog`);
+export const RECOVERY_CODE_DIALOG = DXN.make(`${meta.id}.recoveryCodeDialog`);
+export const RESET_DIALOG = DXN.make(`${meta.id}.resetDialog`);

package/src/containers/AccountContainer/AccountContainer.tsx

@@ -0,0 +1,179 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { useAtom, useAtomSet } from '@effect-atom/atom-react';
+import React, { type FormEvent, useCallback, useState } from 'react';
+
+import { useCapability, useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Context } from '@dxos/context';
+import { createDidFromIdentityKey } from '@dxos/credentials';
+import { useIdentity } from '@dxos/react-client/halo';
+import { Button, Icon, IconButton, Input, Message, useAsyncEffect, useTranslation } from '@dxos/react-ui';
+import { Settings } from '@dxos/react-ui-form';
+
+import { meta } from '#meta';
+import { ClientCapabilities } from '#types';
+
+import { RESET_DIALOG } from '../../constants';
+import { useHubHttpClient } from '../../state/use-hub-http';
+
+type AccountState = 'loading' | 'present' | 'missing' | 'error';
+
+export const AccountContainer = () => {
+  const { t } = useTranslation(meta.id);
+  const identity = useIdentity();
+  const { invokePromise } = useOperationInvoker();
+  const accountCacheAtom = useCapability(ClientCapabilities.AccountCache);
+  const [cache] = useAtom(accountCacheAtom);
+  const setCache = useAtomSet(accountCacheAtom);
+  const [resendStatus, setResendStatus] = useState<string | null>(null);
+  const [accountState, setAccountState] = useState<AccountState>(cache.account ? 'present' : 'loading');
+  const [requestEmail, setRequestEmail] = useState('');
+  const [requestSubmitted, setRequestSubmitted] = useState(false);
+
+  // Single shared instance keeps the VP-auth handshake (request → 401 → signed
+  // retry) at one round-trip per session instead of one per panel.
+  const hubHttp = useHubHttpClient();
+
+  useAsyncEffect(async () => {
+    if (!hubHttp) {
+      return;
+    }
+    try {
+      const account = await hubHttp.getAccount(new Context());
+      setCache((prev) => ({ ...prev, account, fetchedAt: Date.now() }));
+      setAccountState('present');
+    } catch (err: any) {
+      if (err?.data?.type === 'no_account') {
+        setCache((prev) => ({ ...prev, account: undefined, fetchedAt: Date.now() }));
+        setAccountState('missing');
+      } else {
+        setAccountState((prev) => (prev === 'present' ? 'present' : 'error'));
+      }
+    }
+  }, [hubHttp, setCache]);
+
+  const handleResend = useCallback(async () => {
+    if (!hubHttp) {
+      return;
+    }
+    try {
+      const result = await hubHttp.resendVerificationEmail(new Context());
+      if (result.sent) {
+        setResendStatus(t('verification-sent.message'));
+      } else if (result.cooldownSecondsRemaining) {
+        setResendStatus(t('verification-cooldown.message', { seconds: result.cooldownSecondsRemaining }));
+      } else {
+        setResendStatus(t('verification-failed.message'));
+      }
+    } catch {
+      setResendStatus(t('verification-failed.message'));
+    }
+  }, [hubHttp, t]);
+
+  const handleRequestAccess = useCallback(
+    async (event: FormEvent<HTMLFormElement>) => {
+      event.preventDefault();
+      const email = requestEmail.trim();
+      if (!email || !hubHttp) {
+        return;
+      }
+      try {
+        const identityDid = identity ? await createDidFromIdentityKey(identity.identityKey) : undefined;
+        await hubHttp.requestAccess(new Context(), { email, identityDid });
+      } catch {
+        // Surface a generic confirmation; failure details would leak signal.
+      }
+      setRequestSubmitted(true);
+    },
+    [hubHttp, identity, requestEmail],
+  );
+
+  // Opens the standard reset confirmation dialog. The `onBeforeReset` hook
+  // deletes the hub account first; if that fails the reset is aborted so the
+  // local identity is not wiped while the server record remains.
+  const handleDeleteAccount = useCallback(() => {
+    if (!hubHttp) {
+      return;
+    }
+    void invokePromise(LayoutOperation.UpdateDialog, {
+      subject: RESET_DIALOG,
+      blockAlign: 'start',
+      props: {
+        mode: 'reset-storage',
+        onBeforeReset: async () => {
+          await hubHttp.deleteAccount(new Context());
+          setCache(() => ({}));
+        },
+      },
+    });
+  }, [hubHttp, invokePromise, setCache]);
+
+  const account = cache.account;
+
+  return (
+    <Settings.Viewport>
+      <Settings.Section title={t('account-section.title')} description={t('account-section.description')}>
+        {accountState === 'loading' ? null : accountState === 'missing' ? (
+          <>
+            <Message.Root valence='warning'>
+              <Message.Title icon='ph--warning--duotone'>{t('no-edge-access.title')}</Message.Title>
+              <Message.Content>{t('no-edge-access.description')}</Message.Content>
+            </Message.Root>
+            <Settings.Item title={t('request-access.label')} description={t('request-access.description')}>
+              {requestSubmitted ? (
+                <span className='text-sm text-description'>{t('access-request-submitted.message')}</span>
+              ) : (
+                <form onSubmit={handleRequestAccess} className='flex gap-2 items-center justify-end'>
+                  <Input.Root>
+                    <Input.TextInput
+                      type='email'
+                      required
+                      placeholder={t('access-request-email.placeholder')}
+                      value={requestEmail}
+                      onChange={(event) => setRequestEmail(event.target.value)}
+                      classNames='min-w-64'
+                    />
+                  </Input.Root>
+                  <Button type='submit' density='sm'>
+                    {t('request-access.label')}
+                  </Button>
+                </form>
+              )}
+            </Settings.Item>
+          </>
+        ) : accountState === 'error' && !account ? (
+          <Message.Root valence='error'>
+            <Message.Title icon='ph--cloud-x--duotone'>{t('account-offline.title')}</Message.Title>
+            <Message.Content>{t('account-offline.description')}</Message.Content>
+          </Message.Root>
+        ) : account ? (
+          <>
+            <Settings.Item title={t('email.label')} description={account.email}>
+              {account.emailVerified ? (
+                <Icon icon='ph--check-circle--duotone' size={5} classNames='text-success-text justify-self-end' />
+              ) : (
+                <div className='flex flex-col gap-1 items-end'>
+                  <IconButton
+                    icon='ph--paper-plane-tilt--regular'
+                    label={t('resend-verification.label')}
+                    onClick={handleResend}
+                    density='sm'
+                  />
+                  {resendStatus ? <span className='text-xs text-description'>{resendStatus}</span> : null}
+                </div>
+              )}
+            </Settings.Item>
+            <Settings.Item title={t('delete-account.label')} description={t('delete-account.description')}>
+              <Button variant='destructive' density='sm' onClick={handleDeleteAccount}>
+                {t('delete-account.label')}
+              </Button>
+            </Settings.Item>
+          </>
+        ) : null}
+      </Settings.Section>
+    </Settings.Viewport>
+  );
+};

package/src/containers/AccountContainer/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+export { AccountContainer as default } from './AccountContainer';

package/src/containers/DevicesContainer/DevicesContainer.stories.tsx

@@ -5,14 +5,15 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import * as Effect from 'effect/Effect';
 
-import { OperationPlugin, RuntimePlugin } from '@dxos/app-framework';
+import { ProcessManagerPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { translations as shellTranslations } from '@dxos/shell/react';
 
-import { ClientPlugin } from '../../ClientPlugin';
-import { translations } from '../../translations';
+import { initializeIdentity } from '#testing';
+import { translations } from '#translations';
 
+import { ClientPlugin } from '../../ClientPlugin';
 import { DevicesContainer } from './DevicesContainer';
 
 const meta = {
@@ -26,11 +27,10 @@ const meta = {
         ClientPlugin({
           onClientInitialized: ({ client }) =>
             Effect.gen(function* () {
-              yield* Effect.promise(() => client.halo.createIdentity());
+              yield* initializeIdentity(client);
             }),
         }),
-        OperationPlugin(),
-        RuntimePlugin(),
+        ProcessManagerPlugin(),
       ],
     }),
   ],