@dxos/plugin-client 0.8.4-main.bc674ce → 0.8.4-main.c351d160a8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-client",
-  "version": "0.8.4-main.bc674ce",
+  "version": "0.8.4-main.c351d160a8",
   "description": "DXOS Surface plugin for DXOS Client",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -44,54 +44,55 @@
     "src"
   ],
   "dependencies": {
-    "@effect/cli": "0.72.1",
-    "@effect/platform": "0.93.6",
-    "effect": "3.19.11",
+    "@effect/cli": "0.73.2",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
     "react-qr-rounded": "^1.0.0",
     "yaml": "^2.7.0",
-    "@dxos/app-framework": "0.8.4-main.bc674ce",
-    "@dxos/async": "0.8.4-main.bc674ce",
-    "@dxos/cli-util": "0.8.4-main.bc674ce",
-    "@dxos/client": "0.8.4-main.bc674ce",
-    "@dxos/client-protocol": "0.8.4-main.bc674ce",
-    "@dxos/client-services": "0.8.4-main.bc674ce",
-    "@dxos/config": "0.8.4-main.bc674ce",
-    "@dxos/effect": "0.8.4-main.bc674ce",
-    "@dxos/echo": "0.8.4-main.bc674ce",
-    "@dxos/invariant": "0.8.4-main.bc674ce",
-    "@dxos/log": "0.8.4-main.bc674ce",
-    "@dxos/operation": "0.8.4-main.bc674ce",
-    "@dxos/plugin-graph": "0.8.4-main.bc674ce",
-    "@dxos/plugin-observability": "0.8.4-main.bc674ce",
-    "@dxos/protocols": "0.8.4-main.bc674ce",
-    "@dxos/react-client": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-form": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-pickers": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-stack": "0.8.4-main.bc674ce",
-    "@dxos/shell": "0.8.4-main.bc674ce",
-    "@dxos/util": "0.8.4-main.bc674ce"
+    "@dxos/app-framework": "0.8.4-main.c351d160a8",
+    "@dxos/cli-util": "0.8.4-main.c351d160a8",
+    "@dxos/app-toolkit": "0.8.4-main.c351d160a8",
+    "@dxos/async": "0.8.4-main.c351d160a8",
+    "@dxos/client-protocol": "0.8.4-main.c351d160a8",
+    "@dxos/client": "0.8.4-main.c351d160a8",
+    "@dxos/config": "0.8.4-main.c351d160a8",
+    "@dxos/client-services": "0.8.4-main.c351d160a8",
+    "@dxos/echo": "0.8.4-main.c351d160a8",
+    "@dxos/effect": "0.8.4-main.c351d160a8",
+    "@dxos/log": "0.8.4-main.c351d160a8",
+    "@dxos/invariant": "0.8.4-main.c351d160a8",
+    "@dxos/operation": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-graph": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-observability": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-form": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-pickers": "0.8.4-main.c351d160a8",
+    "@dxos/protocols": "0.8.4-main.c351d160a8",
+    "@dxos/react-client": "0.8.4-main.c351d160a8",
+    "@dxos/shell": "0.8.4-main.c351d160a8",
+    "@dxos/util": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-stack": "0.8.4-main.c351d160a8"
   },
   "devDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
+    "@effect-atom/atom-react": "^0.5.0",
     "@effect/printer": "0.47.0",
     "@effect/printer-ansi": "0.47.0",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/react-ui": "0.8.4-main.bc674ce",
-    "@dxos/storybook-utils": "0.8.4-main.bc674ce",
-    "@dxos/ui-theme": "0.8.4-main.bc674ce"
+    "vite": "^7.1.11",
+    "@dxos/react-ui": "0.8.4-main.c351d160a8",
+    "@dxos/storybook-utils": "0.8.4-main.c351d160a8",
+    "@dxos/ui-theme": "0.8.4-main.c351d160a8"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
-    "effect": "3.19.11",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.8.4-main.bc674ce",
-    "@dxos/react-ui": "0.8.4-main.bc674ce"
+    "@dxos/react-ui": "0.8.4-main.c351d160a8",
+    "@dxos/ui-theme": "0.8.4-main.c351d160a8"
   },
   "publishConfig": {
     "access": "public"

package/src/ClientPlugin.ts

@@ -2,7 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-import { ActivationEvent, Capability, Common, Plugin } from '@dxos/app-framework';
+import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 
 import {
   AppGraphBuilder,
@@ -19,17 +20,21 @@ import { ClientEvents } from './types';
 import { type ClientPluginOptions } from './types';
 
 export const ClientPlugin = Plugin.define<ClientPluginOptions>(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addReactContextModule({ activate: ReactContext }),
+  AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule((options) => {
     return {
       id: Capability.getModuleTag(Client),
-      activatesOn: ActivationEvent.oneOf(Common.ActivationEvent.Startup, Common.ActivationEvent.SetupAppGraph),
+      activatesOn: ActivationEvent.oneOf(ActivationEvents.Startup, AppActivationEvents.SetupAppGraph),
       activatesAfter: [ClientEvents.ClientReady],
       activate: () => Client(options),
     };
   }),
   Plugin.addModule({
     activatesOn: ClientEvents.ClientReady,
-    activatesBefore: [Common.ActivationEvent.SetupSchema],
+    activatesBefore: [AppActivationEvents.SetupSchema],
     activate: SchemaDefs,
   }),
   Plugin.addModule({
@@ -37,22 +42,25 @@ export const ClientPlugin = Plugin.define<ClientPluginOptions>(meta).pipe(
     activatesBefore: [ClientEvents.SetupMigration],
     activate: Migrations,
   }),
-  Common.Plugin.addReactContextModule({ activate: ReactContext }),
-  Plugin.addModule(({ invitationUrl = window.location.origin, invitationProp = 'deviceInvitationCode', onReset }) => {
-    const createInvitationUrl = (invitationCode: string) => {
-      const baseUrl = new URL(invitationUrl);
-      baseUrl.searchParams.set(invitationProp, invitationCode);
-      return baseUrl.toString();
-    };
+  Plugin.addModule(
+    ({
+      shareableLinkOrigin = typeof window !== 'undefined' ? window.location.origin : 'http://localhost',
+      invitationPath = '/',
+      invitationProp = 'deviceInvitationCode',
+      onReset,
+    }) => {
+      const createInvitationUrl = (invitationCode: string) => {
+        const baseUrl = new URL(invitationPath || '/', shareableLinkOrigin);
+        baseUrl.searchParams.set(invitationProp, invitationCode);
+        return baseUrl.toString();
+      };
 
-    return {
-      id: Capability.getModuleTag(ReactSurface),
-      activatesOn: Common.ActivationEvent.SetupReactSurface,
-      activate: () => ReactSurface({ createInvitationUrl, onReset }),
-    };
-  }),
-  Common.Plugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  Common.Plugin.addOperationResolverModule({ activate: OperationResolver }),
-  Common.Plugin.addTranslationsModule({ translations }),
+      return {
+        id: Capability.getModuleTag(ReactSurface),
+        activatesOn: ActivationEvents.SetupReactSurface,
+        activate: () => ReactSurface({ createInvitationUrl, onReset }),
+      };
+    },
+  ),
   Plugin.make,
 );

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

@@ -4,7 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { Operation } from '@dxos/operation';
 import { CreateAtom, GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 import { ConnectionState } from '@dxos/react-client/mesh';
@@ -20,7 +21,7 @@ export default Capability.makeModule(
       actions: () =>
         Effect.succeed([
           {
-            id: `${meta.id}/open-user-account`,
+            id: `${meta.id}.open-user-account`,
             data: () => Operation.invoke(ClientOperation.ShareIdentity),
             properties: {
               label: ['open user account label', { ns: meta.id }],
@@ -90,6 +91,6 @@ export default Capability.makeModule(
       }),
     });
 
-    return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
   }),
 );

package/src/capabilities/client/client.ts

@@ -4,7 +4,7 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common, Plugin } from '@dxos/app-framework';
+import { Capabilities, Capability, Plugin } from '@dxos/app-framework';
 import { Client, ClientService } from '@dxos/client';
 import { runAndForwardErrors } from '@dxos/effect';
 import { log } from '@dxos/log';
@@ -12,19 +12,21 @@ import { log } from '@dxos/log';
 import { ClientEvents } from '../../types';
 import { ClientCapabilities, type ClientPluginOptions } from '../../types';
 
-type ClientCapabilityOptions = Omit<ClientPluginOptions, 'appKey' | 'invitationUrl' | 'invitationParam' | 'onReset'>;
+type ClientCapabilityOptions = Omit<
+  ClientPluginOptions,
+  'appKey' | 'shareableLinkOrigin' | 'invitationPath' | 'invitationParam' | 'onReset'
+>;
 
 export default Capability.makeModule(
-  Effect.fnUntraced(function* (props?: ClientCapabilityOptions) {
-    const { onClientInitialized, onSpacesReady, ...options } = props!;
+  Effect.fnUntraced(function* ({ onClientInitialized, onSpacesReady, ...options }: ClientCapabilityOptions) {
     const capabilityManager = yield* Capability.Service;
     const pluginManager = yield* Plugin.Service;
 
     log('creating client');
     const client = new Client(options);
-    log('initializing client');
+    log('initializing client (calling client.initialize())...');
     yield* Effect.tryPromise(() => client.initialize());
-    log('initialized client');
+    log('client.initialize() returned successfully');
     if (onClientInitialized) {
       yield* onClientInitialized({ client }).pipe(
         Effect.provideService(Capability.Service, capabilityManager),
@@ -65,11 +67,12 @@ export default Capability.makeModule(
       //  Perhaps move to using layer has source of truth and add a getter capability for the client.
       Capability.contributes(ClientCapabilities.Client, client, () =>
         Effect.gen(function* () {
+          log.info('client capability: destroying client');
           subscription.unsubscribe();
           yield* Effect.tryPromise(() => client.destroy());
         }),
       ),
-      Capability.contributes(Common.Capability.Layer, ClientService.fromClient(client)),
+      Capability.contributes(Capabilities.Layer, ClientService.fromClient(client)),
     ];
   }),
 );

package/src/capabilities/migrations/migrations.ts

@@ -4,13 +4,13 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
 
 import { ClientCapabilities } from '../../types';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
-    const registry = yield* Capability.get(Common.Capability.AtomRegistry);
+    const registry = yield* Capability.get(Capabilities.AtomRegistry);
     const client = yield* Capability.get(ClientCapabilities.Client);
     const migrationsAtom = yield* Capability.atom(ClientCapabilities.Migration);
 
@@ -25,6 +25,6 @@ export default Capability.makeModule(
       { immediate: true },
     );
 
-    return Capability.contributes(Common.Capability.Null, null, () => Effect.sync(() => cancel()));
+    return Capability.contributes(Capabilities.Null, null, () => Effect.sync(() => cancel()));
   }),
 );

package/src/capabilities/operation-resolver/operation-resolver.ts

@@ -4,7 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { LayoutOperation, getSpacePath } from '@dxos/app-toolkit';
 import { PublicKey } from '@dxos/client';
 import { runAndForwardErrors } from '@dxos/effect';
 import { invariant } from '@dxos/invariant';
@@ -24,17 +25,15 @@ type OperationResolverOptions = {
 const RECOVER_IDENTITY_RPC_TIMEOUT = 20_000;
 
 export default Capability.makeModule(
-  Effect.fnUntraced(function* (props?: OperationResolverOptions) {
-    const { appName = 'Composer' } = props ?? {};
-
-    return Capability.contributes(Common.Capability.OperationResolver, [
+  Effect.fnUntraced(function* ({ appName = 'Composer' }: OperationResolverOptions = {}) {
+    return Capability.contributes(Capabilities.OperationResolver, [
       //
       // CreateIdentity
       //
       OperationResolver.make({
         operation: ClientOperation.CreateIdentity,
         handler: Effect.fnUntraced(function* (profile) {
-          const manager = yield* Capability.get(Common.Capability.PluginManager);
+          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)));
@@ -49,7 +48,7 @@ export default Capability.makeModule(
       OperationResolver.make({
         operation: ClientOperation.JoinIdentity,
         handler: Effect.fnUntraced(function* (data) {
-          yield* Operation.invoke(Common.LayoutOperation.UpdateDialog, {
+          yield* Operation.invoke(LayoutOperation.UpdateDialog, {
             subject: JOIN_DIALOG,
             blockAlign: 'start',
             props: {
@@ -66,8 +65,10 @@ export default Capability.makeModule(
       OperationResolver.make({
         operation: ClientOperation.ShareIdentity,
         handler: Effect.fnUntraced(function* () {
-          yield* Operation.invoke(Common.LayoutOperation.SwitchWorkspace, { subject: Account.id });
-          yield* Operation.invoke(Common.LayoutOperation.Open, { subject: [Account.Profile] });
+          yield* Operation.invoke(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(Account.id) });
+          yield* Operation.invoke(LayoutOperation.Open, {
+            subject: [`${getSpacePath(Account.id)}/${Account.Profile}`],
+          });
           yield* Operation.schedule(ObservabilityOperation.SendEvent, { name: 'identity.share' });
         }),
       }),
@@ -78,7 +79,7 @@ export default Capability.makeModule(
       OperationResolver.make({
         operation: ClientOperation.RecoverIdentity,
         handler: Effect.fnUntraced(function* () {
-          yield* Operation.invoke(Common.LayoutOperation.UpdateDialog, {
+          yield* Operation.invoke(LayoutOperation.UpdateDialog, {
             subject: JOIN_DIALOG,
             blockAlign: 'start',
             props: {
@@ -94,7 +95,7 @@ export default Capability.makeModule(
       OperationResolver.make({
         operation: ClientOperation.ResetStorage,
         handler: Effect.fnUntraced(function* (data) {
-          yield* Operation.invoke(Common.LayoutOperation.UpdateDialog, {
+          yield* Operation.invoke(LayoutOperation.UpdateDialog, {
             subject: RESET_DIALOG,
             blockAlign: 'start',
             props: {
@@ -129,7 +130,7 @@ export default Capability.makeModule(
           const { recoveryCode } = yield* Effect.promise(() =>
             client.services.services.IdentityService!.createRecoveryCredential({}),
           );
-          yield* Operation.invoke(Common.LayoutOperation.UpdateDialog, {
+          yield* Operation.invoke(LayoutOperation.UpdateDialog, {
             subject: RECOVERY_CODE_DIALOG,
             blockAlign: 'start',
             type: 'alert',

package/src/capabilities/react-context/react-context.tsx

@@ -5,8 +5,8 @@
 import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capability, Common } 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';
@@ -14,7 +14,7 @@ import { ClientCapabilities } from '../../types';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
-    Capability.contributes(Common.Capability.ReactContext, {
+    Capability.contributes(Capabilities.ReactContext, {
       id: meta.id,
       context: ({ children }: { children?: React.ReactNode }) => {
         const client = useCapability(ClientCapabilities.Client);

package/src/capabilities/react-surface/react-surface.tsx

@@ -5,9 +5,11 @@
 import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
 import { type JoinPanelProps } from '@dxos/shell/react';
 
+import { JOIN_DIALOG, RECOVERY_CODE_DIALOG, RESET_DIALOG } from '../../constants';
 import {
   DevicesContainer,
   JoinDialog,
@@ -17,8 +19,7 @@ import {
   RecoveryCredentialsContainer,
   ResetDialog,
   type ResetDialogProps,
-} from '../../components';
-import { JOIN_DIALOG, RECOVERY_CODE_DIALOG, RESET_DIALOG } from '../../constants';
+} from '../../containers';
 import { Account, type ClientPluginOptions } from '../../types';
 
 type ReactSurfaceOptions = Pick<ClientPluginOptions, 'onReset'> & {
@@ -26,42 +27,41 @@ type ReactSurfaceOptions = Pick<ClientPluginOptions, 'onReset'> & {
 };
 
 export default Capability.makeModule(
-  Effect.fnUntraced(function* (props?: ReactSurfaceOptions) {
-    const { createInvitationUrl, onReset } = props!;
+  Effect.fnUntraced(function* ({ createInvitationUrl, onReset }: ReactSurfaceOptions) {
     const capabilityManager = yield* Capability.Service;
 
-    return Capability.contributes(Common.Capability.ReactSurface, [
-      Common.createSurface({
+    return Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
         id: Account.Profile,
         role: 'article',
         filter: (data): data is any => data.subject === Account.Profile,
         component: () => <ProfileContainer />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: Account.Devices,
         role: 'article',
         filter: (data): data is any => data.subject === Account.Devices,
         component: () => <DevicesContainer createInvitationUrl={createInvitationUrl} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: Account.Security,
         role: 'article',
         filter: (data): data is any => data.subject === Account.Security,
         component: () => <RecoveryCredentialsContainer />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: JOIN_DIALOG,
         role: 'dialog',
         filter: (data): data is { props: JoinPanelProps } => data.component === JOIN_DIALOG,
         component: ({ data }: { data: any }) => <JoinDialog {...data.props} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: RECOVERY_CODE_DIALOG,
         role: 'dialog',
         filter: (data): data is { props: RecoveryCodeDialogProps } => data.component === RECOVERY_CODE_DIALOG,
         component: ({ data }: { data: any }) => <RecoveryCodeDialog {...data.props} />,
       }),
-      Common.createSurface({
+      Surface.create({
         id: RESET_DIALOG,
         role: 'dialog',
         filter: (data): data is { props: ResetDialogProps } => data.component === RESET_DIALOG,

package/src/capabilities/schema-defs/schema-defs.ts

@@ -4,24 +4,25 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { type Type } from '@dxos/echo';
 
 import { ClientCapabilities } from '../../types';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
-    const registry = yield* Capability.get(Common.Capability.AtomRegistry);
+    const registry = yield* Capability.get(Capabilities.AtomRegistry);
     const client = yield* Capability.get(ClientCapabilities.Client);
-    const schemasAtom = yield* Capability.atom(Common.Capability.Schema);
+    const schemasAtom = yield* Capability.atom(AppCapabilities.Schema);
 
     // TODO(wittjosiah): Unregister schemas when they are disabled.
-    let previous: Type.Entity.Any[] = [];
+    let previous: Type.AnyEntity[] = [];
     const cancel = registry.subscribe(
       schemasAtom,
       async (_schemas: any[]) => {
         // TODO(wittjosiah): This doesn't seem to de-dupe schemas as expected.
-        const schemas = Array.from(new Set(_schemas.flat())) as Type.Entity.Any[];
+        const schemas = Array.from(new Set(_schemas.flat())) as Type.AnyEntity[];
         // TODO(wittjosiah): Filter out schemas which the client has already registered.
         const newSchemas = schemas.filter((schema) => !previous.includes(schema));
         previous = schemas;
@@ -30,6 +31,6 @@ export default Capability.makeModule(
       { immediate: true },
     );
 
-    return Capability.contributes(Common.Capability.Null, null, () => Effect.sync(() => cancel()));
+    return Capability.contributes(Capabilities.Null, null, () => Effect.sync(() => cancel()));
   }),
 );

package/src/cli/commands/edge/status.ts

@@ -15,8 +15,8 @@ export const getStatus = () =>
   Effect.gen(function* () {
     const client = yield* ClientService;
     const identity = createEdgeIdentity(client);
-    client.edge.setIdentity(identity);
-    const status = yield* Effect.tryPromise(() => client.edge.getStatus());
+    client.edge.http.setIdentity(identity);
+    const status = yield* Effect.tryPromise(() => client.edge.http.getStatus());
 
     if (yield* CommandConfig.isJson) {
       yield* Console.log(JSON.stringify(status, null, 2));

package/src/cli/commands/halo/create/create.ts

@@ -8,7 +8,7 @@ import * as Console from 'effect/Console';
 import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
-import { Common, Plugin } from '@dxos/app-framework';
+import { Capabilities, Plugin } from '@dxos/app-framework';
 import { CommandConfig, flushAndSync, spaceLayer } from '@dxos/cli-util';
 import { print } from '@dxos/cli-util';
 import { ClientService } from '@dxos/client';
@@ -30,7 +30,7 @@ export const handler = Effect.fn(function* ({
   invariant(!client.halo.identity.get(), 'Identity already exists');
 
   const manager = yield* Plugin.Service;
-  const { invoke } = manager.capabilities.get(Common.Capability.OperationInvoker);
+  const { invoke } = manager.capabilities.get(Capabilities.OperationInvoker);
   const identity = yield* invoke(ClientOperation.CreateIdentity, {
     displayName: Option.getOrUndefined(displayName),
   });

package/src/cli/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/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/profile/list.ts

@@ -7,6 +7,7 @@ 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 Yaml from 'yaml';
 
 import { CommandConfig, printList } from '@dxos/cli-util';
@@ -23,21 +24,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,
         };
       }),