@dxos/plugin-client 0.8.4-main.fffef41 → 0.8.4-staging.60fe92afc8

package/src/capabilities/react-context.tsx

@@ -2,21 +2,24 @@
 // Copyright 2025 DXOS.org
 //
 
-import React from 'react';
+import * as Effect from 'effect/Effect';
+import React, { ReactNode } from 'react';
 
-import { Capabilities, contributes } from '@dxos/app-framework';
-import { useCapability } from '@dxos/app-framework/react';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/ui';
 import { ClientProvider } from '@dxos/react-client';
 
-import { meta } from '../meta';
+import { meta } from '#meta';
+import { ClientCapabilities } from '#types';
 
-import { ClientCapabilities } from './capabilities';
-
-export default () =>
-  contributes(Capabilities.ReactContext, {
-    id: meta.id,
-    context: ({ children }) => {
-      const client = useCapability(ClientCapabilities.Client);
-      return <ClientProvider client={client}>{children}</ClientProvider>;
-    },
-  });
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactContext, {
+      id: meta.id,
+      context: ({ children }: { children?: ReactNode }) => {
+        const client = useCapability(ClientCapabilities.Client);
+        return <ClientProvider client={client}>{children}</ClientProvider>;
+      },
+    }),
+  ),
+);

package/src/capabilities/react-surface.tsx

@@ -2,66 +2,81 @@
 // Copyright 2025 DXOS.org
 //
 
-import React from 'react';
+import * as Effect from 'effect/Effect';
+import React, { type ComponentProps } from 'react';
 
-import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
-import { type JoinPanelProps } from '@dxos/shell/react';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
 
 import {
+  AccountContainer,
   DevicesContainer,
-  JOIN_DIALOG,
+  InvitationsContainer,
   JoinDialog,
   ProfileContainer,
-  RECOVERY_CODE_DIALOG,
-  RESET_DIALOG,
   RecoveryCodeDialog,
-  type RecoveryCodeDialogProps,
   RecoveryCredentialsContainer,
   ResetDialog,
-  type ResetDialogProps,
-} from '../components';
-import { Account, type ClientPluginOptions } from '../types';
+} from '#containers';
+import { Account, type ClientPluginOptions } from '#types';
+
+import { JOIN_DIALOG, RECOVERY_CODE_DIALOG, RESET_DIALOG } from '../constants';
 
 type ReactSurfaceOptions = Pick<ClientPluginOptions, 'onReset'> & {
   createInvitationUrl: (invitationCode: string) => string;
 };
 
-export default ({ createInvitationUrl, onReset }: ReactSurfaceOptions) =>
-  contributes(Capabilities.ReactSurface, [
-    createSurface({
-      id: Account.Profile,
-      role: 'article',
-      filter: (data): data is any => data.subject === Account.Profile,
-      component: () => <ProfileContainer />,
-    }),
-    createSurface({
-      id: Account.Devices,
-      role: 'article',
-      filter: (data): data is any => data.subject === Account.Devices,
-      component: ({ data }) => <DevicesContainer createInvitationUrl={createInvitationUrl} />,
-    }),
-    createSurface({
-      id: Account.Security,
-      role: 'article',
-      filter: (data): data is any => data.subject === Account.Security,
-      component: () => <RecoveryCredentialsContainer />,
-    }),
-    createSurface({
-      id: JOIN_DIALOG,
-      role: 'dialog',
-      filter: (data): data is { props: JoinPanelProps } => data.component === JOIN_DIALOG,
-      component: ({ data }) => <JoinDialog {...data.props} />,
-    }),
-    createSurface({
-      id: RECOVERY_CODE_DIALOG,
-      role: 'dialog',
-      filter: (data): data is { props: RecoveryCodeDialogProps } => data.component === RECOVERY_CODE_DIALOG,
-      component: ({ data }) => <RecoveryCodeDialog {...data.props} />,
-    }),
-    createSurface({
-      id: RESET_DIALOG,
-      role: 'dialog',
-      filter: (data): data is { props: ResetDialogProps } => data.component === RESET_DIALOG,
-      component: ({ data }) => <ResetDialog {...data.props} onReset={onReset} />,
-    }),
-  ]);
+export default Capability.makeModule(
+  Effect.fnUntraced(function* ({ createInvitationUrl, onReset }: ReactSurfaceOptions) {
+    const capabilityManager = yield* Capability.Service;
+
+    return Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: Account.Profile,
+        filter: AppSurface.literal(AppSurface.Article, Account.Profile),
+        component: () => <ProfileContainer />,
+      }),
+      Surface.create({
+        id: Account.Devices,
+        filter: AppSurface.literal(AppSurface.Article, Account.Devices),
+        component: () => <DevicesContainer createInvitationUrl={createInvitationUrl} />,
+      }),
+      Surface.create({
+        id: Account.Security,
+        filter: AppSurface.literal(AppSurface.Article, Account.Security),
+        component: () => <RecoveryCredentialsContainer />,
+      }),
+      Surface.create({
+        id: Account.Account,
+        filter: AppSurface.literal(AppSurface.Article, Account.Account),
+        component: () => <AccountContainer />,
+      }),
+      Surface.create({
+        id: Account.Invitations,
+        filter: AppSurface.literal(AppSurface.Article, Account.Invitations),
+        component: () => <InvitationsContainer />,
+      }),
+      Surface.create({
+        id: JOIN_DIALOG,
+        filter: AppSurface.component<ComponentProps<typeof JoinDialog>>(AppSurface.Dialog, JOIN_DIALOG),
+        component: ({ data }) => <JoinDialog {...data.props} />,
+      }),
+      Surface.create({
+        id: RECOVERY_CODE_DIALOG,
+        filter: AppSurface.component<ComponentProps<typeof RecoveryCodeDialog>>(
+          AppSurface.Dialog,
+          RECOVERY_CODE_DIALOG,
+        ),
+        component: ({ data }) => <RecoveryCodeDialog {...data.props} />,
+      }),
+      Surface.create({
+        id: RESET_DIALOG,
+        filter: AppSurface.component<Pick<ComponentProps<typeof ResetDialog>, 'mode'>>(AppSurface.Dialog, RESET_DIALOG),
+        component: ({ data }) => (
+          <ResetDialog {...data.props} onReset={onReset} capabilityManager={capabilityManager} />
+        ),
+      }),
+    ]);
+  }),
+);

package/src/capabilities/schema-defs.ts

@@ -2,28 +2,55 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
-import { type Type } from '@dxos/echo';
-
-import { ClientCapabilities } from './capabilities';
-
-export default (context: PluginContext) => {
-  const registry = context.getCapability(Capabilities.AtomRegistry);
-  const client = context.getCapability(ClientCapabilities.Client);
-
-  // TODO(wittjosiah): Unregister schemas when they are disabled.
-  let previous: Type.Obj.Any[] = [];
-  const cancel = registry.subscribe(
-    context.capabilities(ClientCapabilities.Schema),
-    (_schemas) => {
-      const schemas = Array.from(new Set(_schemas.flat()));
-      // TODO(wittjosiah): Filter out schemas which the client has already registered.
-      const newSchemas = schemas.filter((schema) => !previous.includes(schema));
-      previous = schemas;
-      client.addTypes(newSchemas);
-    },
-    { immediate: true },
-  );
-
-  return contributes(Capabilities.Null, null, () => cancel());
-};
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { Type } from '@dxos/echo';
+import { log } from '@dxos/log';
+
+import { ClientCapabilities } from '#types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const registry = yield* Capability.get(Capabilities.AtomRegistry);
+    const client = yield* Capability.get(ClientCapabilities.Client);
+    const schemasAtom = yield* Capability.atom(AppCapabilities.Schema);
+
+    // TODO(wittjosiah): Unregister schemas when they are disabled.
+    let previousDxns = new Set<string>();
+    const cancel = registry.subscribe(
+      schemasAtom,
+      async (schemas) => {
+        const seenSchemaDxns = new Set<string>();
+        const batch: { schema: Type.AnyEntity; dxnKey: string }[] = [];
+        for (const schema of schemas.flat()) {
+          const uri = Type.getURI(schema);
+          if (!uri) {
+            log.warn('skipping schema without uri');
+            continue;
+          }
+
+          const key = uri.toString();
+          if (seenSchemaDxns.has(key)) {
+            log('skipping duplicate schema for echo registration', { uri: key });
+            continue;
+          }
+
+          seenSchemaDxns.add(key);
+          batch.push({ schema, dxnKey: key });
+        }
+
+        const toRegister = batch.filter(({ dxnKey }) => !previousDxns.has(dxnKey));
+
+        await client.addTypes(toRegister.map(({ schema }) => schema));
+        for (const { dxnKey } of toRegister) {
+          previousDxns.add(dxnKey);
+        }
+      },
+      { immediate: true },
+    );
+
+    return Capability.contributes(Capabilities.Null, null, () => Effect.sync(() => cancel()));
+  }),
+);

package/src/commands/config/index.ts

@@ -0,0 +1,12 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+
+import { view } from './view';
+
+export const config = Command.make('config').pipe(
+  Command.withDescription('Config commands.'),
+  Command.withSubcommands([view]),
+);

package/src/commands/config/view.ts

@@ -0,0 +1,29 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+import * as Console from 'effect/Console';
+import * as Effect from 'effect/Effect';
+import * as Yaml from 'yaml';
+
+import { CommandConfig } from '@dxos/cli-util';
+import { ConfigService } from '@dxos/client';
+import { DX_CONFIG, getProfileConfigPath } from '@dxos/client-protocol';
+
+export const view = Command.make(
+  'view',
+  {},
+  Effect.fnUntraced(function* () {
+    const config = yield* ConfigService;
+    const { json, profile } = yield* CommandConfig;
+    const configPath = getProfileConfigPath(DX_CONFIG, profile);
+
+    if (json) {
+      yield* Console.log(JSON.stringify(config.values, null, 2));
+    } else {
+      yield* Console.log(`Path: ${configPath}`);
+      yield* Console.log(Yaml.stringify(config.values));
+    }
+  }),
+);

package/src/commands/device/index.ts

@@ -0,0 +1,14 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+
+import { info } from './info';
+import { list } from './list';
+import { update } from './update';
+
+export const device = Command.make('device').pipe(
+  Command.withDescription('Manage HALO devices.'),
+  Command.withSubcommands([info, list, update]),
+);

package/src/commands/device/info/index.ts

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

package/src/commands/device/info/info.test.ts

@@ -0,0 +1,28 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { describe, expect, it } from '@effect/vitest';
+import * as Effect from 'effect/Effect';
+
+import { TestConsole, TestLayer } from '@dxos/cli-util/testing';
+import { ClientService } from '@dxos/client';
+import { EffectEx } from '@dxos/effect';
+
+import { handler } from './info';
+
+describe('device info', () => {
+  it('should show device info', () =>
+    Effect.gen(function* () {
+      const client = yield* ClientService;
+      yield* Effect.tryPromise(() => client.halo.createIdentity());
+      yield* handler();
+      const logger = yield* TestConsole.TestConsole;
+      const logs = logger.logs;
+      expect(logs).toHaveLength(1);
+      const parsed = TestConsole.parseJson<{ deviceKey: string; profile: unknown }>(logs[0]);
+      expect(parsed).toHaveProperty('deviceKey');
+      expect(parsed).toHaveProperty('profile');
+      expect(parsed.deviceKey).toBe(client.halo.device?.deviceKey.toHex());
+    }).pipe(Effect.provide(TestLayer), Effect.scoped, EffectEx.runAndForwardErrors));
+});

package/src/commands/device/info/info.ts

@@ -0,0 +1,48 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+import * as Console from 'effect/Console';
+import * as Effect from 'effect/Effect';
+
+import { CommandConfig } from '@dxos/cli-util';
+import { print } from '@dxos/cli-util';
+import { ClientService } from '@dxos/client';
+import { DeviceType } from '@dxos/protocols/proto/dxos/halo/credentials';
+
+import { printDevice } from '../util';
+
+export const handler = Effect.fn(function* () {
+  const { json } = yield* CommandConfig;
+  const client = yield* ClientService;
+  const device = client.halo.device;
+  if (!device) {
+    if (json) {
+      yield* Console.log(JSON.stringify({ error: 'No device found' }, null, 2));
+    } else {
+      yield* Console.log('No device found.');
+    }
+    return;
+  }
+
+  if (json) {
+    yield* Console.log(
+      JSON.stringify(
+        {
+          deviceKey: device.deviceKey.toHex(),
+          profile: {
+            ...device.profile,
+            type: device.profile?.type ? DeviceType[device.profile?.type] : 'UNKNOWN',
+          },
+        },
+        null,
+        2,
+      ),
+    );
+  } else {
+    yield* Console.log(print(printDevice(device)));
+  }
+});
+
+export const info = Command.make('info', {}, handler).pipe(Command.withDescription('Show device info.'));

package/src/commands/device/list/index.ts

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

package/src/commands/device/list/list.test.ts

@@ -0,0 +1,30 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { describe, expect, it } from '@effect/vitest';
+import * as Effect from 'effect/Effect';
+
+import { TestConsole, TestLayer } from '@dxos/cli-util/testing';
+import { ClientService } from '@dxos/client';
+import { EffectEx } from '@dxos/effect';
+
+import { handler } from './list';
+
+describe('device list', () => {
+  it('should list devices', () =>
+    Effect.gen(function* () {
+      const client = yield* ClientService;
+      yield* Effect.tryPromise(() => client.halo.createIdentity());
+      yield* handler();
+      const logger = yield* TestConsole.TestConsole;
+      const logs = logger.logs;
+      expect(logs).toHaveLength(1);
+      const parsed = TestConsole.parseJson<Array<{ key: string; type: string; kind: string }>>(logs[0]);
+      expect(Array.isArray(parsed)).toBe(true);
+      expect(parsed.length).toBeGreaterThan(0);
+      expect(parsed[0]).toHaveProperty('key');
+      expect(parsed[0]).toHaveProperty('type');
+      expect(parsed[0]).toHaveProperty('kind');
+    }).pipe(Effect.provide(TestLayer), Effect.scoped, EffectEx.runAndForwardErrors));
+});

package/src/commands/device/list/list.ts

@@ -0,0 +1,28 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+import * as Console from 'effect/Console';
+import * as Effect from 'effect/Effect';
+
+import { CommandConfig } from '@dxos/cli-util';
+import { printList } from '@dxos/cli-util';
+import { ClientService } from '@dxos/client';
+
+import { mapDevices, printDevices } from '../util';
+
+export const handler = Effect.fn(function* () {
+  const { json } = yield* CommandConfig;
+  const client = yield* ClientService;
+  const devices = client.halo.devices.get();
+
+  if (json) {
+    yield* Console.log(JSON.stringify(mapDevices(devices), null, 2));
+  } else {
+    const formatted = printDevices(devices);
+    yield* Console.log(printList(formatted));
+  }
+});
+
+export const list = Command.make('list', {}, handler).pipe(Command.withDescription('List devices.'));

package/src/commands/device/update/index.ts

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

package/src/commands/device/update/update.ts

@@ -0,0 +1,68 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+import * as Options from '@effect/cli/Options';
+import * as Console from 'effect/Console';
+import * as Effect from 'effect/Effect';
+
+import { CommandConfig } from '@dxos/cli-util';
+import { print } from '@dxos/cli-util';
+import { ClientService } from '@dxos/client';
+
+import { printDevice } from '../util';
+
+export const handler = Effect.fn(function* ({ label }: { label: string }) {
+  const { json } = yield* CommandConfig;
+  const client = yield* ClientService;
+  const device = client.halo.device;
+  if (!device) {
+    if (json) {
+      yield* Console.log(JSON.stringify({ error: 'No device found' }, null, 2));
+    } else {
+      yield* Console.log('No device found.');
+    }
+    return;
+  }
+
+  const updatedProfile = {
+    ...device.profile,
+    label,
+  };
+
+  const devicesService = client.services.services.DevicesService;
+  if (!devicesService) {
+    if (json) {
+      yield* Console.log(JSON.stringify({ error: 'DevicesService not found' }, null, 2));
+    } else {
+      yield* Console.log('DevicesService not found.');
+    }
+    return;
+  }
+
+  const updatedDevice = yield* Effect.tryPromise(() => devicesService.updateDevice(updatedProfile));
+
+  if (json) {
+    yield* Console.log(
+      JSON.stringify(
+        {
+          deviceKey: updatedDevice.deviceKey.toHex(),
+          profile: updatedDevice.profile,
+        },
+        null,
+        2,
+      ),
+    );
+  } else {
+    yield* Console.log(print(printDevice(updatedDevice)));
+  }
+});
+
+export const update = Command.make(
+  'update',
+  {
+    label: Options.text('label').pipe(Options.withDescription('The device label.')),
+  },
+  handler,
+).pipe(Command.withDescription('Update device label.'));

package/src/commands/device/util.ts

@@ -0,0 +1,55 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { FormBuilder } from '@dxos/cli-util';
+import { Device, DeviceKind, DeviceType } from '@dxos/client/halo';
+
+const maybeTruncateKey = (key: { toHex(): string; truncate(): string }, truncate = false) =>
+  truncate ? key.truncate() : key.toHex();
+
+const getDeviceTitle = (device: Device): string => {
+  if (device.profile?.label) {
+    return device.profile.label;
+  }
+  const platform = device.profile?.platform ?? 'Unknown';
+  const os = device.profile?.os ?? 'Unknown';
+  return `${platform} on ${os}`;
+};
+
+export const mapDevices = (devices: Device[], truncateKeys = false) => {
+  return devices.map((device) => ({
+    label: device.profile?.label,
+    type: device.profile?.type ? DeviceType[device.profile?.type] : 'UNKNOWN',
+    key: maybeTruncateKey(device.deviceKey, truncateKeys),
+    kind: DeviceKind[device.kind],
+    platform: device.profile?.platform,
+    platformVersion: device.profile?.platformVersion,
+    architecture: device.profile?.architecture,
+    os: device.profile?.os,
+    osVersion: device.profile?.osVersion,
+    presence: device?.kind === DeviceKind.CURRENT ? 'THIS DEVICE' : Device.PresenceState[device.presence],
+  }));
+};
+
+export const printDevice = (device: Device) =>
+  FormBuilder.make({ title: getDeviceTitle(device) }).pipe(
+    FormBuilder.set('deviceKey', device.deviceKey.truncate()),
+    FormBuilder.set('label', device.profile?.label ?? '<none>'),
+    FormBuilder.set('type', device.profile?.type ? DeviceType[device.profile?.type] : 'UNKNOWN'),
+    FormBuilder.set('kind', DeviceKind[device.kind]),
+    FormBuilder.set(
+      'presence',
+      device?.kind === DeviceKind.CURRENT ? 'THIS DEVICE' : Device.PresenceState[device.presence],
+    ),
+    FormBuilder.set('platform', device.profile?.platform ?? '<none>'),
+    FormBuilder.set('platformVersion', device.profile?.platformVersion ?? '<none>'),
+    FormBuilder.set('architecture', device.profile?.architecture ?? '<none>'),
+    FormBuilder.set('os', device.profile?.os ?? '<none>'),
+    FormBuilder.set('osVersion', device.profile?.osVersion ?? '<none>'),
+    FormBuilder.build,
+  );
+
+export const printDevices = (devices: Device[]) => {
+  return devices.map(printDevice);
+};

package/src/commands/edge/index.ts

@@ -0,0 +1,12 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+
+import { status } from './status';
+
+export const edge = Command.make('edge').pipe(
+  Command.withDescription('EDGE commands.'),
+  Command.withSubcommands([status]),
+);

package/src/commands/edge/status.ts

@@ -0,0 +1,46 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+import * as Console from 'effect/Console';
+import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
+
+import { CommandConfig } from '@dxos/cli-util';
+import { ClientService } from '@dxos/client';
+import { createEdgeIdentity } from '@dxos/client/edge';
+import { Context } from '@dxos/context';
+
+export const getStatus = () =>
+  Effect.gen(function* () {
+    const client = yield* ClientService;
+    const identity = createEdgeIdentity(client);
+    client.edge.http.setIdentity(identity);
+    const status = yield* Effect.tryPromise(() => client.edge.http.getStatus(Context.default()));
+
+    if (yield* CommandConfig.isJson) {
+      yield* Console.log(JSON.stringify(status, null, 2));
+    } else if (status.problems.length > 0) {
+      for (const problem of status.problems) {
+        yield* Console.error(problem);
+      }
+    } else {
+      yield* Console.log('No problems found.');
+    }
+  }).pipe(
+    // TODO(wittjosiah): Tagged error.
+    Effect.catchSome((error) => {
+      if (error instanceof Error && error.message === 'Identity not available') {
+        // TODO(wittjosiah): Error coloring for logs.
+        return Option.some(Console.error(error.message));
+      } else {
+        return Option.none();
+      }
+    }),
+  );
+
+// TODO(wittjosiah): Admin functionality to provide to specify an identity.
+export const status = Command.make('status', {}, getStatus).pipe(
+  Command.withDescription('Get the EDGE status for the current identity.'),
+);