@dxos/plugin-client 0.9.0 → 0.9.1-staging.ee54ba693a

package/dist/lib/neutral/ClientPlugin.node.mjs

@@ -1,54 +1,259 @@
 import "./chunk-J5LGTIGS.mjs";
 
 // src/ClientPlugin.node.ts
-import { ActivationEvents, Capability, Plugin as Plugin2 } from "@dxos/app-framework";
+import { ActivationEvents, Capability, Plugin } from "@dxos/app-framework";
 import { AppActivationEvents, AppPlugin } from "@dxos/app-toolkit";
 import { Client, LayerSpecs, Migrations, OperationHandler, SchemaDefs } from "#capabilities";
 import { meta } from "#meta";
 import { ClientEvents } from "#types";
 
-// src/commands/config/index.ts
-import * as Command2 from "@effect/cli/Command";
+// src/commands/account/index.ts
+import * as Command3 from "@effect/cli/Command";
 
-// src/commands/config/view.ts
+// src/commands/account/login/login.ts
+import * as Args from "@effect/cli/Args";
 import * as Command from "@effect/cli/Command";
+import * as Options from "@effect/cli/Options";
+import * as Prompt from "@effect/cli/Prompt";
 import * as Console from "effect/Console";
+import * as Effect2 from "effect/Effect";
+import * as Match from "effect/Match";
+import * as Option from "effect/Option";
+import { CommandConfig, performRecoveryOAuthFlow, print } from "@dxos/cli-util";
+import { ClientService } from "@dxos/client";
+import { Invitation as Invitation2, InvitationEncoder } from "@dxos/client/invitations";
+import { Context as DxContext } from "@dxos/context";
+import { HubHttpClient } from "@dxos/edge-client";
+import { invariant } from "@dxos/invariant";
+import { ATPROTO_OAUTH_SCOPES, OAuthProvider } from "@dxos/protocols";
+
+// src/commands/halo/util.ts
+import * as Duration from "effect/Duration";
 import * as Effect from "effect/Effect";
+import { FormBuilder } from "@dxos/cli-util";
+import { Invitation } from "@dxos/client/invitations";
+var printIdentity = (identity2) => FormBuilder.make({
+  title: "Identity"
+}).pipe(FormBuilder.set("identityDid", identity2.identityDid), FormBuilder.set("displayName", identity2.profile?.displayName ?? "<none>"), FormBuilder.build);
+var TERMINAL_FAILURE_STATES = /* @__PURE__ */ new Set([
+  Invitation.State.CANCELLED,
+  Invitation.State.TIMEOUT,
+  Invitation.State.ERROR,
+  Invitation.State.EXPIRED
+]);
+var waitForState = (invitation, state) => Effect.async((resume) => {
+  const subscription = invitation.subscribe((inv) => {
+    if (inv.state === state) {
+      resume(Effect.void);
+    } else if (TERMINAL_FAILURE_STATES.has(inv.state)) {
+      resume(Effect.fail(new Error(`Invitation failed with state: ${Invitation.State[inv.state]}`)));
+    }
+  });
+  return Effect.sync(() => subscription.unsubscribe());
+}).pipe(Effect.timeout(Duration.minutes(3)));
+
+// src/commands/account/login/login.ts
+var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-client/src/commands/account/login/login.ts";
+var LOGIN_METHODS = [
+  "email",
+  "atproto",
+  "device-invitation",
+  "recovery-code"
+];
+var METHOD_CHOICES = [
+  {
+    title: "Email",
+    value: "email"
+  },
+  {
+    title: "AT Protocol",
+    value: "atproto"
+  },
+  {
+    title: "Device invitation",
+    value: "device-invitation"
+  },
+  {
+    title: "Recovery code",
+    value: "recovery-code"
+  }
+];
+var INPUT_PROMPT = {
+  "email": "Email address",
+  "atproto": "atproto handle or DID (e.g. alice.bsky.social)",
+  "device-invitation": "Invitation code or URL",
+  "recovery-code": "Recovery code (seed phrase)"
+};
+var login = Command.make("login", {
+  method: Options.choice("method", LOGIN_METHODS).pipe(Options.withDescription("Login method (email | atproto | device-invitation | recovery-code). Prompted if omitted."), Options.optional),
+  input: Args.text({
+    name: "input"
+  }).pipe(Args.withDescription("Method input: email address / atproto handle / invitation code / recovery code."), Args.optional)
+}, Effect2.fn(function* ({ method, input }) {
+  const { json } = yield* CommandConfig;
+  const client = yield* ClientService;
+  invariant(!client.halo.identity.get(), "Already logged in. Run `dx account logout` first.", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 59, S: this, A: ["!client.halo.identity.get()", "'Already logged in. Run `dx account logout` first.'"] });
+  const resolvedMethod = Option.isSome(method) ? method.value : yield* Prompt.select({
+    message: "Choose a login method:",
+    choices: METHOD_CHOICES
+  }).pipe(Prompt.run);
+  const resolvedInput = Option.isSome(input) ? input.value : yield* Prompt.text({
+    message: `${INPUT_PROMPT[resolvedMethod]}:`
+  }).pipe(Prompt.run);
+  const identity2 = yield* Match.value(resolvedMethod).pipe(Match.when("atproto", () => loginWithAtproto(client, resolvedInput)), Match.when("email", () => loginWithEmail(client, resolvedInput)), Match.when("recovery-code", () => loginWithRecoveryCode(client, resolvedInput)), Match.when("device-invitation", () => loginWithDeviceInvitation(client, resolvedInput)), Match.exhaustive);
+  if (json) {
+    yield* Console.log(JSON.stringify({
+      identityDid: identity2.did,
+      displayName: identity2.profile?.displayName
+    }, null, 2));
+  } else {
+    yield* Console.log("Logged in successfully");
+    yield* Console.log(print(printIdentity({
+      identityDid: identity2.did,
+      profile: identity2.profile
+    })));
+  }
+})).pipe(Command.withDescription("Log in to an existing DXOS identity (same methods as Composer)."));
+var loginWithAtproto = (client, handle) => Effect2.gen(function* () {
+  const edgeBaseUrl = client.config.values.runtime?.services?.edge?.url;
+  invariant(edgeBaseUrl, "Edge services not configured (runtime.services.edge.url).", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 86, S: this, A: ["edgeBaseUrl", "'Edge services not configured (runtime.services.edge.url).'"] });
+  const { recoveryProof } = yield* performRecoveryOAuthFlow({
+    edgeBaseUrl,
+    provider: OAuthProvider.ATPROTO,
+    scopes: ATPROTO_OAUTH_SCOPES,
+    loginHint: handle
+  });
+  return yield* Effect2.tryPromise(() => client.halo.recoverIdentity({
+    recoveryProof
+  }));
+});
+var loginWithRecoveryCode = (client, recoveryCode) => Effect2.tryPromise(() => client.halo.recoverIdentity({
+  recoveryCode
+}));
+var loginWithEmail = (client, email) => Effect2.gen(function* () {
+  const hubUrl = client.config.values?.runtime?.app?.env?.DX_HUB_URL;
+  invariant(hubUrl, "Hub URL not configured (runtime.app.env.DX_HUB_URL).", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 105, S: this, A: ["hubUrl", "'Hub URL not configured (runtime.app.env.DX_HUB_URL).'"] });
+  const hub = new HubHttpClient(hubUrl);
+  const { token: inlineToken } = yield* Effect2.tryPromise(() => hub.login(DxContext.default(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 107 }), {
+    email
+  }));
+  let token = inlineToken;
+  if (!token) {
+    yield* Console.log(`A login link was sent to ${email}. Paste the token from the email below.`);
+    token = yield* Prompt.text({
+      message: "Login token"
+    }).pipe(Prompt.run);
+  }
+  return yield* Effect2.tryPromise(() => client.halo.recoverIdentity({
+    token
+  }));
+});
+var loginWithDeviceInvitation = (client, encoded) => Effect2.gen(function* () {
+  let code = encoded;
+  if (code.startsWith("http") || code.startsWith("socket")) {
+    code = new URL(code).searchParams.get("deviceInvitationCode") ?? code;
+  }
+  const invitation = client.halo.join(InvitationEncoder.decode(code));
+  yield* waitForState(invitation, Invitation2.State.READY_FOR_AUTHENTICATION);
+  const authCode = yield* Prompt.text({
+    message: "Enter the authentication code"
+  }).pipe(Prompt.run);
+  yield* Effect2.tryPromise(() => invitation.authenticate(authCode));
+  yield* waitForState(invitation, Invitation2.State.SUCCESS);
+  const identity2 = client.halo.identity.get();
+  invariant(identity2, "Device invitation completed but no identity is present.", { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 138, S: this, A: ["identity", "'Device invitation completed but no identity is present.'"] });
+  return identity2;
+});
+
+// src/commands/account/logout/logout.ts
+import * as Command2 from "@effect/cli/Command";
+import * as Options2 from "@effect/cli/Options";
+import * as Prompt2 from "@effect/cli/Prompt";
+import * as FileSystem from "@effect/platform/FileSystem";
+import * as Console2 from "effect/Console";
+import * as Effect3 from "effect/Effect";
+import { CommandConfig as CommandConfig2 } from "@dxos/cli-util";
+import { DX_DATA, getProfilePath } from "@dxos/client-protocol";
+import { ConfigService } from "@dxos/config";
+var logout = Command2.make("logout", {
+  force: Options2.boolean("force", {
+    ifPresent: true
+  }).pipe(Options2.withDescription("Skip confirmation prompt."))
+}, Effect3.fnUntraced(function* ({ force }) {
+  const fs = yield* FileSystem.FileSystem;
+  const config2 = yield* ConfigService;
+  const { json, profile: profile2 } = yield* CommandConfig2;
+  const path = config2.values.runtime?.client?.storage?.dataRoot ?? getProfilePath(DX_DATA, profile2);
+  if (!force) {
+    const confirmed = yield* Prompt2.confirm({
+      message: `Log out of profile (${profile2})? This removes the local identity and data; spaces re-sync on next login.`,
+      initial: false
+    }).pipe(Prompt2.run);
+    if (!confirmed) {
+      return;
+    }
+  }
+  yield* fs.remove(path, {
+    recursive: true
+  }).pipe(Effect3.catchIf((e) => e._tag === "SystemError" && e.reason === "NotFound", () => Effect3.void));
+  if (json) {
+    yield* Console2.log(JSON.stringify({
+      profile: profile2,
+      loggedOut: true
+    }, null, 2));
+  } else {
+    yield* Console2.log(`Logged out of profile (${profile2}).`);
+  }
+})).pipe(Command2.withDescription("Log out of the current profile (clears the local identity and data)."));
+
+// src/commands/account/index.ts
+var account = Command3.make("account").pipe(Command3.withDescription("Log in and out of a DXOS identity."), Command3.withSubcommands([
+  login,
+  logout
+]));
+
+// src/commands/config/index.ts
+import * as Command5 from "@effect/cli/Command";
+
+// src/commands/config/view.ts
+import * as Command4 from "@effect/cli/Command";
+import * as Console3 from "effect/Console";
+import * as Effect4 from "effect/Effect";
 import * as Yaml from "yaml";
-import { CommandConfig } from "@dxos/cli-util";
-import { ConfigService } from "@dxos/client";
+import { CommandConfig as CommandConfig3 } from "@dxos/cli-util";
+import { ConfigService as ConfigService2 } from "@dxos/client";
 import { DX_CONFIG, getProfileConfigPath } from "@dxos/client-protocol";
-var view = Command.make("view", {}, Effect.fnUntraced(function* () {
-  const config2 = yield* ConfigService;
-  const { json, profile: profile2 } = yield* CommandConfig;
+var view = Command4.make("view", {}, Effect4.fnUntraced(function* () {
+  const config2 = yield* ConfigService2;
+  const { json, profile: profile2 } = yield* CommandConfig3;
   const configPath = getProfileConfigPath(DX_CONFIG, profile2);
   if (json) {
-    yield* Console.log(JSON.stringify(config2.values, null, 2));
+    yield* Console3.log(JSON.stringify(config2.values, null, 2));
   } else {
-    yield* Console.log(`Path: ${configPath}`);
-    yield* Console.log(Yaml.stringify(config2.values));
+    yield* Console3.log(`Path: ${configPath}`);
+    yield* Console3.log(Yaml.stringify(config2.values));
   }
 }));
 
 // src/commands/config/index.ts
-var config = Command2.make("config").pipe(Command2.withDescription("Config commands."), Command2.withSubcommands([
+var config = Command5.make("config").pipe(Command5.withDescription("Config commands."), Command5.withSubcommands([
   view
 ]));
 
 // src/commands/device/index.ts
-import * as Command6 from "@effect/cli/Command";
+import * as Command9 from "@effect/cli/Command";
 
 // src/commands/device/info/info.ts
-import * as Command3 from "@effect/cli/Command";
-import * as Console2 from "effect/Console";
-import * as Effect2 from "effect/Effect";
-import { CommandConfig as CommandConfig2 } from "@dxos/cli-util";
-import { print } from "@dxos/cli-util";
-import { ClientService } from "@dxos/client";
+import * as Command6 from "@effect/cli/Command";
+import * as Console4 from "effect/Console";
+import * as Effect5 from "effect/Effect";
+import { CommandConfig as CommandConfig4 } from "@dxos/cli-util";
+import { print as print2 } from "@dxos/cli-util";
+import { ClientService as ClientService2 } from "@dxos/client";
 import { DeviceType as DeviceType2 } from "@dxos/protocols/proto/dxos/halo/credentials";
 
 // src/commands/device/util.ts
-import { FormBuilder } from "@dxos/cli-util";
+import { FormBuilder as FormBuilder2 } from "@dxos/cli-util";
 import { Device, DeviceKind, DeviceType } from "@dxos/client/halo";
 var maybeTruncateKey = (key, truncate = false) => truncate ? key.truncate() : key.toHex();
 var getDeviceTitle = (device2) => {
@@ -73,30 +278,30 @@ var mapDevices = (devices, truncateKeys = false) => {
     presence: device2?.kind === DeviceKind.CURRENT ? "THIS DEVICE" : Device.PresenceState[device2.presence]
   }));
 };
-var printDevice = (device2) => FormBuilder.make({
+var printDevice = (device2) => FormBuilder2.make({
   title: getDeviceTitle(device2)
-}).pipe(FormBuilder.set("deviceKey", device2.deviceKey.truncate()), FormBuilder.set("label", device2.profile?.label ?? "<none>"), FormBuilder.set("type", device2.profile?.type ? DeviceType[device2.profile?.type] : "UNKNOWN"), FormBuilder.set("kind", DeviceKind[device2.kind]), FormBuilder.set("presence", device2?.kind === DeviceKind.CURRENT ? "THIS DEVICE" : Device.PresenceState[device2.presence]), FormBuilder.set("platform", device2.profile?.platform ?? "<none>"), FormBuilder.set("platformVersion", device2.profile?.platformVersion ?? "<none>"), FormBuilder.set("architecture", device2.profile?.architecture ?? "<none>"), FormBuilder.set("os", device2.profile?.os ?? "<none>"), FormBuilder.set("osVersion", device2.profile?.osVersion ?? "<none>"), FormBuilder.build);
+}).pipe(FormBuilder2.set("deviceKey", device2.deviceKey.truncate()), FormBuilder2.set("label", device2.profile?.label ?? "<none>"), FormBuilder2.set("type", device2.profile?.type ? DeviceType[device2.profile?.type] : "UNKNOWN"), FormBuilder2.set("kind", DeviceKind[device2.kind]), FormBuilder2.set("presence", device2?.kind === DeviceKind.CURRENT ? "THIS DEVICE" : Device.PresenceState[device2.presence]), FormBuilder2.set("platform", device2.profile?.platform ?? "<none>"), FormBuilder2.set("platformVersion", device2.profile?.platformVersion ?? "<none>"), FormBuilder2.set("architecture", device2.profile?.architecture ?? "<none>"), FormBuilder2.set("os", device2.profile?.os ?? "<none>"), FormBuilder2.set("osVersion", device2.profile?.osVersion ?? "<none>"), FormBuilder2.build);
 var printDevices = (devices) => {
   return devices.map(printDevice);
 };
 
 // src/commands/device/info/info.ts
-var handler = Effect2.fn(function* () {
-  const { json } = yield* CommandConfig2;
-  const client = yield* ClientService;
+var handler = Effect5.fn(function* () {
+  const { json } = yield* CommandConfig4;
+  const client = yield* ClientService2;
   const device2 = client.halo.device;
   if (!device2) {
     if (json) {
-      yield* Console2.log(JSON.stringify({
+      yield* Console4.log(JSON.stringify({
         error: "No device found"
       }, null, 2));
     } else {
-      yield* Console2.log("No device found.");
+      yield* Console4.log("No device found.");
     }
     return;
   }
   if (json) {
-    yield* Console2.log(JSON.stringify({
+    yield* Console4.log(JSON.stringify({
       deviceKey: device2.deviceKey.toHex(),
       profile: {
         ...device2.profile,
@@ -104,50 +309,50 @@ var handler = Effect2.fn(function* () {
       }
     }, null, 2));
   } else {
-    yield* Console2.log(print(printDevice(device2)));
+    yield* Console4.log(print2(printDevice(device2)));
   }
 });
-var info = Command3.make("info", {}, handler).pipe(Command3.withDescription("Show device info."));
+var info = Command6.make("info", {}, handler).pipe(Command6.withDescription("Show device info."));
 
 // src/commands/device/list/list.ts
-import * as Command4 from "@effect/cli/Command";
-import * as Console3 from "effect/Console";
-import * as Effect3 from "effect/Effect";
-import { CommandConfig as CommandConfig3 } from "@dxos/cli-util";
+import * as Command7 from "@effect/cli/Command";
+import * as Console5 from "effect/Console";
+import * as Effect6 from "effect/Effect";
+import { CommandConfig as CommandConfig5 } from "@dxos/cli-util";
 import { printList } from "@dxos/cli-util";
-import { ClientService as ClientService2 } from "@dxos/client";
-var handler2 = Effect3.fn(function* () {
-  const { json } = yield* CommandConfig3;
-  const client = yield* ClientService2;
+import { ClientService as ClientService3 } from "@dxos/client";
+var handler2 = Effect6.fn(function* () {
+  const { json } = yield* CommandConfig5;
+  const client = yield* ClientService3;
   const devices = client.halo.devices.get();
   if (json) {
-    yield* Console3.log(JSON.stringify(mapDevices(devices), null, 2));
+    yield* Console5.log(JSON.stringify(mapDevices(devices), null, 2));
   } else {
     const formatted = printDevices(devices);
-    yield* Console3.log(printList(formatted));
+    yield* Console5.log(printList(formatted));
   }
 });
-var list = Command4.make("list", {}, handler2).pipe(Command4.withDescription("List devices."));
+var list = Command7.make("list", {}, handler2).pipe(Command7.withDescription("List devices."));
 
 // src/commands/device/update/update.ts
-import * as Command5 from "@effect/cli/Command";
-import * as Options from "@effect/cli/Options";
-import * as Console4 from "effect/Console";
-import * as Effect4 from "effect/Effect";
-import { CommandConfig as CommandConfig4 } from "@dxos/cli-util";
-import { print as print2 } from "@dxos/cli-util";
-import { ClientService as ClientService3 } from "@dxos/client";
-var handler3 = Effect4.fn(function* ({ label }) {
-  const { json } = yield* CommandConfig4;
-  const client = yield* ClientService3;
+import * as Command8 from "@effect/cli/Command";
+import * as Options3 from "@effect/cli/Options";
+import * as Console6 from "effect/Console";
+import * as Effect7 from "effect/Effect";
+import { CommandConfig as CommandConfig6 } from "@dxos/cli-util";
+import { print as print3 } from "@dxos/cli-util";
+import { ClientService as ClientService4 } from "@dxos/client";
+var handler3 = Effect7.fn(function* ({ label }) {
+  const { json } = yield* CommandConfig6;
+  const client = yield* ClientService4;
   const device2 = client.halo.device;
   if (!device2) {
     if (json) {
-      yield* Console4.log(JSON.stringify({
+      yield* Console6.log(JSON.stringify({
         error: "No device found"
       }, null, 2));
     } else {
-      yield* Console4.log("No device found.");
+      yield* Console6.log("No device found.");
     }
     return;
   }
@@ -158,234 +363,171 @@ var handler3 = Effect4.fn(function* ({ label }) {
   const devicesService = client.services.services.DevicesService;
   if (!devicesService) {
     if (json) {
-      yield* Console4.log(JSON.stringify({
+      yield* Console6.log(JSON.stringify({
         error: "DevicesService not found"
       }, null, 2));
     } else {
-      yield* Console4.log("DevicesService not found.");
+      yield* Console6.log("DevicesService not found.");
     }
     return;
   }
-  const updatedDevice = yield* Effect4.tryPromise(() => devicesService.updateDevice(updatedProfile));
+  const updatedDevice = yield* Effect7.tryPromise(() => devicesService.updateDevice(updatedProfile));
   if (json) {
-    yield* Console4.log(JSON.stringify({
+    yield* Console6.log(JSON.stringify({
       deviceKey: updatedDevice.deviceKey.toHex(),
       profile: updatedDevice.profile
     }, null, 2));
   } else {
-    yield* Console4.log(print2(printDevice(updatedDevice)));
+    yield* Console6.log(print3(printDevice(updatedDevice)));
   }
 });
-var update = Command5.make("update", {
-  label: Options.text("label").pipe(Options.withDescription("The device label."))
-}, handler3).pipe(Command5.withDescription("Update device label."));
+var update = Command8.make("update", {
+  label: Options3.text("label").pipe(Options3.withDescription("The device label."))
+}, handler3).pipe(Command8.withDescription("Update device label."));
 
 // src/commands/device/index.ts
-var device = Command6.make("device").pipe(Command6.withDescription("Manage HALO devices."), Command6.withSubcommands([
+var device = Command9.make("device").pipe(Command9.withDescription("Manage HALO devices."), Command9.withSubcommands([
   info,
   list,
   update
 ]));
 
 // src/commands/edge/index.ts
-import * as Command8 from "@effect/cli/Command";
+import * as Command11 from "@effect/cli/Command";
 
 // src/commands/edge/status.ts
-import * as Command7 from "@effect/cli/Command";
-import * as Console5 from "effect/Console";
-import * as Effect5 from "effect/Effect";
-import * as Option from "effect/Option";
-import { CommandConfig as CommandConfig5 } from "@dxos/cli-util";
-import { ClientService as ClientService4 } from "@dxos/client";
+import * as Command10 from "@effect/cli/Command";
+import * as Console7 from "effect/Console";
+import * as Effect8 from "effect/Effect";
+import * as Option2 from "effect/Option";
+import { CommandConfig as CommandConfig7 } from "@dxos/cli-util";
+import { ClientService as ClientService5 } from "@dxos/client";
 import { createEdgeIdentity } from "@dxos/client/edge";
 import { Context } from "@dxos/context";
-var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-client/src/commands/edge/status.ts";
-var getStatus = () => Effect5.gen(function* () {
-  const client = yield* ClientService4;
+var __dxlog_file2 = "/__w/dxos/dxos/packages/plugins/plugin-client/src/commands/edge/status.ts";
+var getStatus = () => Effect8.gen(function* () {
+  const client = yield* ClientService5;
   const identity2 = createEdgeIdentity(client);
   client.edge.http.setIdentity(identity2);
-  const status2 = yield* Effect5.tryPromise(() => client.edge.http.getStatus(Context.default(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file, L: 16 })));
-  if (yield* CommandConfig5.isJson) {
-    yield* Console5.log(JSON.stringify(status2, null, 2));
+  const status2 = yield* Effect8.tryPromise(() => client.edge.http.getStatus(Context.default(void 0, { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 16 })));
+  if (yield* CommandConfig7.isJson) {
+    yield* Console7.log(JSON.stringify(status2, null, 2));
   } else if (status2.problems.length > 0) {
     for (const problem of status2.problems) {
-      yield* Console5.error(problem);
+      yield* Console7.error(problem);
     }
   } else {
-    yield* Console5.log("No problems found.");
+    yield* Console7.log("No problems found.");
   }
 }).pipe(
   // TODO(wittjosiah): Tagged error.
-  Effect5.catchSome((error2) => {
+  Effect8.catchSome((error2) => {
     if (error2 instanceof Error && error2.message === "Identity not available") {
-      return Option.some(Console5.error(error2.message));
+      return Option2.some(Console7.error(error2.message));
     } else {
-      return Option.none();
+      return Option2.none();
     }
   })
 );
-var status = Command7.make("status", {}, getStatus).pipe(Command7.withDescription("Get the EDGE status for the current identity."));
+var status = Command10.make("status", {}, getStatus).pipe(Command10.withDescription("Get the EDGE status for the current identity."));
 
 // src/commands/edge/index.ts
-var edge = Command8.make("edge").pipe(Command8.withDescription("EDGE commands."), Command8.withSubcommands([
+var edge = Command11.make("edge").pipe(Command11.withDescription("EDGE commands."), Command11.withSubcommands([
   status
 ]));
 
 // src/commands/halo/index.ts
-import * as Command18 from "@effect/cli/Command";
-
-// src/commands/halo/create/create.ts
-import * as Command9 from "@effect/cli/Command";
-import * as Options2 from "@effect/cli/Options";
-import * as Console6 from "effect/Console";
-import * as Effect6 from "effect/Effect";
-import * as Option2 from "effect/Option";
-import { Capabilities, Plugin } from "@dxos/app-framework";
-import { PERSONAL_SPACE_TAG } from "@dxos/app-toolkit";
-import { CommandConfig as CommandConfig6, flushAndSync, spaceLayer } from "@dxos/cli-util";
-import { print as print3 } from "@dxos/cli-util";
-import { ClientService as ClientService5 } from "@dxos/client";
-import { invariant } from "@dxos/invariant";
-import { EdgeReplicationSetting } from "@dxos/protocols/proto/dxos/echo/metadata";
-import { MembershipPolicy } from "@dxos/protocols/proto/dxos/halo/credentials";
-import { ClientOperation } from "#operations";
-
-// src/commands/halo/util.ts
-import { FormBuilder as FormBuilder2 } from "@dxos/cli-util";
-var printIdentity = (identity2) => FormBuilder2.make({
-  title: "Identity"
-}).pipe(FormBuilder2.set("identityDid", identity2.identityDid), FormBuilder2.set("displayName", identity2.profile?.displayName ?? "<none>"), FormBuilder2.build);
-
-// src/commands/halo/create/create.ts
-var __dxlog_file2 = "/__w/dxos/dxos/packages/plugins/plugin-client/src/commands/halo/create/create.ts";
-var handler4 = Effect6.fn(function* ({ agent, displayName }) {
-  const { json } = yield* CommandConfig6;
-  const client = yield* ClientService5;
-  invariant(!client.halo.identity.get(), "Identity already exists", { "~LogMeta": "~LogMeta", F: __dxlog_file2, L: 23, S: this, A: ["!client.halo.identity.get()", "'Identity already exists'"] });
-  const manager = yield* Plugin.Service;
-  const { invoke } = manager.capabilities.get(Capabilities.OperationInvoker);
-  const identity2 = yield* invoke(ClientOperation.CreateIdentity, {
-    displayName: Option2.getOrUndefined(displayName)
-  });
-  if (agent) {
-    yield* invoke(ClientOperation.CreateAgent);
-  }
-  const space = yield* Effect6.promise(() => client.spaces.create({}, {
-    tags: [
-      PERSONAL_SPACE_TAG
-    ],
-    membershipPolicy: MembershipPolicy.LOCKED
-  }));
-  yield* Effect6.promise(() => space.waitUntilReady());
-  yield* Effect6.promise(() => space.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED));
-  yield* flushAndSync({
-    indexes: true
-  }).pipe(Effect6.provide(spaceLayer(Option2.some(space.id))));
-  if (json) {
-    yield* Console6.log(JSON.stringify({
-      identityDid: identity2.identityDid,
-      displayName: identity2.profile?.displayName
-    }, null, 2));
-  } else {
-    yield* Console6.log(print3(printIdentity(identity2)));
-  }
-});
-var create = Command9.make("create", {
-  agent: Options2.boolean("noAgent", {
-    ifPresent: false
-  }).pipe(Options2.withDescription("Do not create an EDGE agent for the identity.")),
-  displayName: Options2.text("displayName").pipe(Options2.withDescription("The display name of the identity."), Options2.optional)
-}, handler4).pipe(Command9.withDescription("Create a new identity."));
+import * as Command19 from "@effect/cli/Command";
 
 // src/commands/halo/credential/index.ts
-import * as Command12 from "@effect/cli/Command";
+import * as Command14 from "@effect/cli/Command";
 
 // src/commands/halo/credential/add/add.ts
-import * as Args from "@effect/cli/Args";
-import * as Command10 from "@effect/cli/Command";
-import * as Prompt from "@effect/cli/Prompt";
-import * as Console7 from "effect/Console";
-import * as Effect7 from "effect/Effect";
+import * as Args2 from "@effect/cli/Args";
+import * as Command12 from "@effect/cli/Command";
+import * as Prompt3 from "@effect/cli/Prompt";
+import * as Console8 from "effect/Console";
+import * as Effect9 from "effect/Effect";
 import * as Option3 from "effect/Option";
-import { CommandConfig as CommandConfig7 } from "@dxos/cli-util";
+import { CommandConfig as CommandConfig8 } from "@dxos/cli-util";
 import { ClientService as ClientService6 } from "@dxos/client";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { schema } from "@dxos/protocols/proto";
 var __dxlog_file3 = "/__w/dxos/dxos/packages/plugins/plugin-client/src/commands/halo/credential/add/add.ts";
-var handler5 = Effect7.fn(function* ({ credential: credential2 }) {
-  const { json } = yield* CommandConfig7;
+var handler4 = Effect9.fn(function* ({ credential: credential2 }) {
+  const { json } = yield* CommandConfig8;
   const client = yield* ClientService6;
   let credentialHex = Option3.getOrUndefined(credential2);
   if (!credentialHex) {
-    credentialHex = yield* Prompt.text({
+    credentialHex = yield* Prompt3.text({
       message: "Enter credential (hex string)"
-    }).pipe(Prompt.run);
+    }).pipe(Prompt3.run);
   }
   invariant2(credentialHex, "Invalid credential.", { "~LogMeta": "~LogMeta", F: __dxlog_file3, L: 23, S: this, A: ["credentialHex", "'Invalid credential.'"] });
   const identity2 = client.halo.identity;
   if (!identity2) {
     if (json) {
-      yield* Console7.log(JSON.stringify({
+      yield* Console8.log(JSON.stringify({
         error: "Profile not initialized"
       }, null, 2));
     } else {
-      yield* Console7.log("Profile not initialized.");
+      yield* Console8.log("Profile not initialized.");
     }
     return;
   }
-  yield* Effect7.gen(function* () {
+  yield* Effect9.gen(function* () {
     const codec = schema.getCodecForType("dxos.halo.credentials.Credential");
-    const credentialBytes = yield* Effect7.try({
+    const credentialBytes = yield* Effect9.try({
       try: () => Buffer.from(credentialHex, "hex"),
       catch: (error2) => new Error(`Failed to parse hex string: ${error2}`)
     });
     const verifyError = codec.protoType.verify(credentialBytes);
     if (verifyError) {
-      yield* Effect7.fail(new Error(verifyError));
+      yield* Effect9.fail(new Error(verifyError));
     }
-    const credentialObj = yield* Effect7.try({
+    const credentialObj = yield* Effect9.try({
       try: () => codec.decode(credentialBytes),
       catch: (error2) => new Error(`Failed to decode credential: ${error2}`)
     });
-    yield* Effect7.tryPromise({
+    yield* Effect9.tryPromise({
       try: () => client.halo.writeCredentials([
         credentialObj
       ]),
       catch: (error2) => new Error(`Failed to write credential: ${error2}`)
     });
     if (json) {
-      yield* Console7.log(JSON.stringify({
+      yield* Console8.log(JSON.stringify({
         success: true
       }, null, 2));
     } else {
-      yield* Console7.log("Credential added successfully.");
+      yield* Console8.log("Credential added successfully.");
     }
-  }).pipe(Effect7.catchAll((error2) => Effect7.gen(function* () {
+  }).pipe(Effect9.catchAll((error2) => Effect9.gen(function* () {
     if (json) {
-      yield* Console7.log(JSON.stringify({
+      yield* Console8.log(JSON.stringify({
         error: "Invalid credential",
         message: error2 instanceof Error ? error2.message : String(error2)
       }, null, 2));
     } else {
-      yield* Console7.log("Invalid credential.");
+      yield* Console8.log("Invalid credential.");
     }
-    yield* Effect7.fail(error2);
+    yield* Effect9.fail(error2);
   })));
 });
-var add = Command10.make("add", {
-  credential: Args.text({
+var add = Command12.make("add", {
+  credential: Args2.text({
     name: "credential"
-  }).pipe(Args.withDescription("Credential as hex string."), Args.optional)
-}, handler5).pipe(Command10.withDescription("Import credential into HALO."));
+  }).pipe(Args2.withDescription("Credential as hex string."), Args2.optional)
+}, handler4).pipe(Command12.withDescription("Import credential into HALO."));
 
 // src/commands/halo/credential/list/list.ts
-import * as Command11 from "@effect/cli/Command";
-import * as Options3 from "@effect/cli/Options";
-import * as Console8 from "effect/Console";
-import * as Duration from "effect/Duration";
-import * as Effect8 from "effect/Effect";
+import * as Command13 from "@effect/cli/Command";
+import * as Options4 from "@effect/cli/Options";
+import * as Console9 from "effect/Console";
+import * as Duration2 from "effect/Duration";
+import * as Effect10 from "effect/Effect";
 import * as Option4 from "effect/Option";
-import { CommandConfig as CommandConfig8, Common, FormBuilder as FormBuilder3, getSpace, printList as printList2 } from "@dxos/cli-util";
+import { CommandConfig as CommandConfig9, Common, FormBuilder as FormBuilder3, getSpace, printList as printList2 } from "@dxos/cli-util";
 import { ClientService as ClientService7 } from "@dxos/client";
 var mapCredentials = (credentials) => {
   return credentials.map((credential2) => ({
@@ -402,109 +544,109 @@ var printCredential = (credential2) => {
     title: type
   }).pipe(FormBuilder3.option("id", Option4.fromNullable(credential2.id?.truncate())), FormBuilder3.option("issuer", Option4.fromNullable(credential2.issuer?.truncate())), FormBuilder3.option("subject", Option4.fromNullable(credential2.subject?.id?.truncate())), FormBuilder3.build);
 };
-var handler6 = Effect8.fn(function* ({ type, spaceId, timeout: timeout2, delay }) {
-  const { json } = yield* CommandConfig8;
+var handler5 = Effect10.fn(function* ({ type, spaceId, timeout: timeout3, delay }) {
+  const { json } = yield* CommandConfig9;
   const client = yield* ClientService7;
   let credentials;
   if (Option4.isSome(spaceId)) {
     const space = yield* getSpace(spaceId.value);
-    credentials = yield* Effect8.tryPromise(() => space.internal.getCredentials());
+    credentials = yield* Effect10.tryPromise(() => space.internal.getCredentials());
   } else {
     const identity2 = client.halo.identity;
     if (!identity2) {
       if (json) {
-        yield* Console8.log(JSON.stringify({
+        yield* Console9.log(JSON.stringify({
           error: "Profile not initialized"
         }, null, 2));
       } else {
-        yield* Console8.log("Profile not initialized.");
+        yield* Console9.log("Profile not initialized.");
       }
       return;
     }
-    const latch = yield* Effect8.makeLatch();
+    const latch = yield* Effect10.makeLatch();
     const subscription = client.halo.credentials.subscribe((creds) => {
       if (creds.length > 0) {
-        Effect8.runSync(latch.open);
+        Effect10.runSync(latch.open);
       }
     });
-    yield* latch.await.pipe(Effect8.timeout(Duration.millis(timeout2)), Effect8.catchAll(() => Effect8.void), Effect8.ensuring(Effect8.sync(() => {
+    yield* latch.await.pipe(Effect10.timeout(Duration2.millis(timeout3)), Effect10.catchAll(() => Effect10.void), Effect10.ensuring(Effect10.sync(() => {
       subscription.unsubscribe();
     })));
-    yield* Effect8.sleep(Duration.millis(delay));
+    yield* Effect10.sleep(Duration2.millis(delay));
     credentials = client.halo.queryCredentials({
       type: Option4.getOrUndefined(type)
     });
   }
   if (json) {
-    yield* Console8.log(JSON.stringify(mapCredentials(credentials), null, 2));
+    yield* Console9.log(JSON.stringify(mapCredentials(credentials), null, 2));
   } else {
     const formatted = credentials.map(printCredential);
-    yield* Console8.log(printList2(formatted));
+    yield* Console9.log(printList2(formatted));
   }
 });
-var list2 = Command11.make("list", {
-  type: Options3.text("type").pipe(Options3.withDescription("Filter by credential type."), Options3.optional),
-  spaceId: Common.spaceId.pipe(Options3.withDescription("Space ID to show credentials from."), Options3.optional),
-  timeout: Options3.integer("timeout").pipe(Options3.withDescription("Time in milliseconds to wait for at least one credential before listing."), Options3.withDefault(500)),
-  delay: Options3.integer("delay").pipe(Options3.withDescription("Delay in milliseconds before listing."), Options3.withDefault(250))
-}, handler6).pipe(Command11.withDescription("List HALO credentials."));
+var list2 = Command13.make("list", {
+  type: Options4.text("type").pipe(Options4.withDescription("Filter by credential type."), Options4.optional),
+  spaceId: Common.spaceId.pipe(Options4.withDescription("Space ID to show credentials from."), Options4.optional),
+  timeout: Options4.integer("timeout").pipe(Options4.withDescription("Time in milliseconds to wait for at least one credential before listing."), Options4.withDefault(500)),
+  delay: Options4.integer("delay").pipe(Options4.withDescription("Delay in milliseconds before listing."), Options4.withDefault(250))
+}, handler5).pipe(Command13.withDescription("List HALO credentials."));
 
 // src/commands/halo/credential/index.ts
-var credential = Command12.make("credential").pipe(Command12.withDescription("Manage HALO credentials."), Command12.withSubcommands([
+var credential = Command14.make("credential").pipe(Command14.withDescription("Manage HALO credentials."), Command14.withSubcommands([
   add,
   list2
 ]));
 
 // src/commands/halo/identity/identity.ts
-import * as Command13 from "@effect/cli/Command";
-import * as Console9 from "effect/Console";
-import * as Effect9 from "effect/Effect";
-import { CommandConfig as CommandConfig9 } from "@dxos/cli-util";
+import * as Command15 from "@effect/cli/Command";
+import * as Console10 from "effect/Console";
+import * as Effect11 from "effect/Effect";
+import { CommandConfig as CommandConfig10 } from "@dxos/cli-util";
 import { print as print4 } from "@dxos/cli-util";
 import { ClientService as ClientService8 } from "@dxos/client";
-var handler7 = Effect9.fn(function* () {
-  const { json } = yield* CommandConfig9;
+var handler6 = Effect11.fn(function* () {
+  const { json } = yield* CommandConfig10;
   const client = yield* ClientService8;
   const identity2 = client.halo.identity.get();
   if (!identity2) {
     if (json) {
-      yield* Console9.log(JSON.stringify({
+      yield* Console10.log(JSON.stringify({
         error: "Identity not initialized"
       }, null, 2));
     } else {
-      yield* Console9.log("Identity not initialized.");
+      yield* Console10.log("Identity not initialized.");
     }
   } else {
     if (json) {
-      yield* Console9.log(JSON.stringify({
+      yield* Console10.log(JSON.stringify({
         identityDid: identity2.did,
         displayName: identity2.profile?.displayName
       }, null, 2));
     } else {
-      yield* Console9.log(print4(printIdentity({
+      yield* Console10.log(print4(printIdentity({
         identityDid: identity2.did,
         profile: identity2.profile
       })));
     }
   }
 });
-var identity = Command13.make("identity", {}, handler7).pipe(Command13.withDescription("Get the current identity."));
+var identity = Command15.make("identity", {}, handler6).pipe(Command15.withDescription("Get the current identity."));
 
 // src/commands/halo/keys/keys.ts
-import * as Command14 from "@effect/cli/Command";
-import * as Console10 from "effect/Console";
-import * as Effect10 from "effect/Effect";
+import * as Command16 from "@effect/cli/Command";
+import * as Console11 from "effect/Console";
+import * as Effect12 from "effect/Effect";
 import * as Option5 from "effect/Option";
-import { CommandConfig as CommandConfig10 } from "@dxos/cli-util";
+import { CommandConfig as CommandConfig11 } from "@dxos/cli-util";
 import { FormBuilder as FormBuilder4, print as print5 } from "@dxos/cli-util";
 import { ClientService as ClientService9 } from "@dxos/client";
-var handler8 = Effect10.fn(function* () {
-  const { json } = yield* CommandConfig10;
+var handler7 = Effect12.fn(function* () {
+  const { json } = yield* CommandConfig11;
   const client = yield* ClientService9;
   const identity2 = client.halo.identity.get();
   const device2 = client.halo.device;
   if (json) {
-    yield* Console10.log(JSON.stringify({
+    yield* Console11.log(JSON.stringify({
       identityKey: identity2?.identityKey.toHex(),
       deviceKey: device2?.deviceKey.toHex()
     }, null, 2));
@@ -512,54 +654,20 @@ var handler8 = Effect10.fn(function* () {
     const builder = FormBuilder4.make({
       title: "HALO Keys"
     }).pipe(FormBuilder4.option("identityKey", Option5.fromNullable(identity2?.identityKey.truncate())), FormBuilder4.option("deviceKey", Option5.fromNullable(device2?.deviceKey.truncate())));
-    yield* Console10.log(print5(FormBuilder4.build(builder)));
+    yield* Console11.log(print5(FormBuilder4.build(builder)));
   }
 });
-var keys = Command14.make("keys", {}, handler8).pipe(Command14.withDescription("Show HALO keys."));
-
-// src/commands/halo/recover/recover.ts
-import * as Args2 from "@effect/cli/Args";
-import * as Command15 from "@effect/cli/Command";
-import * as Console11 from "effect/Console";
-import * as Effect11 from "effect/Effect";
-import { CommandConfig as CommandConfig11, print as print6 } from "@dxos/cli-util";
-import { ClientService as ClientService10 } from "@dxos/client";
-import { invariant as invariant3 } from "@dxos/invariant";
-var __dxlog_file4 = "/__w/dxos/dxos/packages/plugins/plugin-client/src/commands/halo/recover/recover.ts";
-var recover = Command15.make("recover", {
-  recoveryCode: Args2.text({
-    name: "recoveryCode"
-  }).pipe(Args2.withDescription("The recovery code seed phrase."))
-}, Effect11.fn(function* ({ recoveryCode }) {
-  const { json } = yield* CommandConfig11;
-  const client = yield* ClientService10;
-  invariant3(!client.halo.identity.get(), "Identity already exists", { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 20, S: this, A: ["!client.halo.identity.get()", "'Identity already exists'"] });
-  const identity2 = yield* Effect11.tryPromise(() => client.halo.recoverIdentity({
-    recoveryCode
-  }));
-  if (json) {
-    yield* Console11.log(JSON.stringify({
-      identityDid: identity2.did,
-      displayName: identity2.profile?.displayName
-    }, null, 2));
-  } else {
-    yield* Console11.log("Identity recovered successfully");
-    yield* Console11.log(print6(printIdentity({
-      identityDid: identity2.did,
-      profile: identity2.profile
-    })));
-  }
-})).pipe(Command15.withDescription("Recover an existing identity using a recovery code."));
+var keys = Command16.make("keys", {}, handler7).pipe(Command16.withDescription("Show HALO keys."));
 
 // src/commands/halo/seed/seed.ts
-import * as Command16 from "@effect/cli/Command";
+import * as Command17 from "@effect/cli/Command";
 import * as Console12 from "effect/Console";
-import * as Effect12 from "effect/Effect";
+import * as Effect13 from "effect/Effect";
 import { CommandConfig as CommandConfig12 } from "@dxos/cli-util";
-import { ClientService as ClientService11 } from "@dxos/client";
-var handler9 = Effect12.fn(function* () {
+import { ClientService as ClientService10 } from "@dxos/client";
+var handler8 = Effect13.fn(function* () {
   const { json } = yield* CommandConfig12;
-  const client = yield* ClientService11;
+  const client = yield* ClientService10;
   const identityService = client.services.services.IdentityService;
   if (!identityService) {
     if (json) {
@@ -571,7 +679,7 @@ var handler9 = Effect12.fn(function* () {
     }
     return;
   }
-  const result = yield* Effect12.tryPromise(() => identityService.createRecoveryCredential({}));
+  const result = yield* Effect13.tryPromise(() => identityService.createRecoveryCredential({}));
   if (json) {
     yield* Console12.log(JSON.stringify({
       recoveryCode: result.recoveryCode
@@ -580,19 +688,19 @@ var handler9 = Effect12.fn(function* () {
     yield* Console12.log(result.recoveryCode);
   }
 });
-var seed = Command16.make("seed", {}, handler9).pipe(Command16.withDescription("Generate a seedphrase that can be used for identity recovery."));
+var seed = Command17.make("seed", {}, handler8).pipe(Command17.withDescription("Generate a seedphrase that can be used for identity recovery."));
 
 // src/commands/halo/update/update.ts
-import * as Command17 from "@effect/cli/Command";
-import * as Options4 from "@effect/cli/Options";
+import * as Command18 from "@effect/cli/Command";
+import * as Options5 from "@effect/cli/Options";
 import * as Console13 from "effect/Console";
-import * as Effect13 from "effect/Effect";
+import * as Effect14 from "effect/Effect";
 import { CommandConfig as CommandConfig13 } from "@dxos/cli-util";
-import { print as print7 } from "@dxos/cli-util";
-import { ClientService as ClientService12 } from "@dxos/client";
-var handler10 = Effect13.fn(function* ({ displayName }) {
+import { print as print6 } from "@dxos/cli-util";
+import { ClientService as ClientService11 } from "@dxos/client";
+var handler9 = Effect14.fn(function* ({ displayName }) {
   const { json } = yield* CommandConfig13;
-  const client = yield* ClientService12;
+  const client = yield* ClientService11;
   const identity2 = client.halo.identity.get();
   if (!identity2) {
     if (json) {
@@ -615,7 +723,7 @@ var handler10 = Effect13.fn(function* ({ displayName }) {
     }
     return;
   }
-  const updatedIdentity = yield* Effect13.tryPromise(() => identityService.updateProfile({
+  const updatedIdentity = yield* Effect14.tryPromise(() => identityService.updateProfile({
     displayName
   }));
   if (json) {
@@ -624,40 +732,38 @@ var handler10 = Effect13.fn(function* ({ displayName }) {
       displayName: updatedIdentity.profile?.displayName
     }, null, 2));
   } else {
-    yield* Console13.log(print7(printIdentity({
+    yield* Console13.log(print6(printIdentity({
       identityDid: updatedIdentity.did,
       profile: updatedIdentity.profile
     })));
   }
 });
-var update2 = Command17.make("update", {
-  displayName: Options4.text("displayName").pipe(Options4.withDescription("The display name of the identity."))
-}, handler10).pipe(Command17.withDescription("Update identity profile."));
+var update2 = Command18.make("update", {
+  displayName: Options5.text("displayName").pipe(Options5.withDescription("The display name of the identity."))
+}, handler9).pipe(Command18.withDescription("Update identity profile."));
 
 // src/commands/halo/index.ts
-var halo = Command18.make("halo").pipe(Command18.withDescription("Manage HALO identity."), Command18.withSubcommands([
-  create,
+var halo = Command19.make("halo").pipe(Command19.withDescription("Manage HALO identity."), Command19.withSubcommands([
   credential,
   identity,
   keys,
-  recover,
   seed,
   update2
 ]));
 
 // src/commands/profile/index.ts
-import * as Command25 from "@effect/cli/Command";
+import * as Command26 from "@effect/cli/Command";
 
 // src/commands/profile/create.ts
-import * as Command19 from "@effect/cli/Command";
-import * as Options5 from "@effect/cli/Options";
-import * as FileSystem from "@effect/platform/FileSystem";
+import * as Command20 from "@effect/cli/Command";
+import * as Options6 from "@effect/cli/Options";
+import * as FileSystem3 from "@effect/platform/FileSystem";
 import * as Path from "@effect/platform/Path";
 import * as Console14 from "effect/Console";
-import * as Effect14 from "effect/Effect";
+import * as Effect15 from "effect/Effect";
 import * as Option6 from "effect/Option";
 import * as Record from "effect/Record";
-import { CommandConfig as CommandConfig14, print as print8 } from "@dxos/cli-util";
+import { CommandConfig as CommandConfig14, print as print7 } from "@dxos/cli-util";
 import { DX_CONFIG as DX_CONFIG2, getProfileConfigPath as getProfileConfigPath2 } from "@dxos/client-protocol";
 import { trim } from "@dxos/util";
 
@@ -722,12 +828,12 @@ var TEMPLATES = {
           url: http://localhost:8787
   `
 };
-var create2 = Command19.make("create", {
-  template: Options5.choice("template", Record.keys(TEMPLATES)).pipe(Options5.withDescription("Template to use"), Options5.withDefault("default")),
-  name: Options5.text("name").pipe(Options5.withDescription("Profile name"), Options5.optional)
-}, Effect14.fnUntraced(function* ({ template, name }) {
+var create = Command20.make("create", {
+  template: Options6.choice("template", Record.keys(TEMPLATES)).pipe(Options6.withDescription("Template to use"), Options6.withDefault("default")),
+  name: Options6.text("name").pipe(Options6.withDescription("Profile name"), Options6.optional)
+}, Effect15.fnUntraced(function* ({ template, name }) {
   const { json } = yield* CommandConfig14;
-  const fs = yield* FileSystem.FileSystem;
+  const fs = yield* FileSystem3.FileSystem;
   const path = yield* Path.Path;
   const profileName = name.pipe(Option6.getOrElse(() => template));
   const configPath = getProfileConfigPath2(DX_CONFIG2, profileName);
@@ -744,67 +850,67 @@ var create2 = Command19.make("create", {
       path: configPath
     }, null, 2));
   } else {
-    yield* Console14.log(print8(printProfileCreated(profileName, configPath)));
+    yield* Console14.log(print7(printProfileCreated(profileName, configPath)));
   }
 }));
 
 // src/commands/profile/delete.ts
-import * as Command20 from "@effect/cli/Command";
-import * as Options6 from "@effect/cli/Options";
-import * as FileSystem3 from "@effect/platform/FileSystem";
+import * as Command21 from "@effect/cli/Command";
+import * as Options7 from "@effect/cli/Options";
+import * as FileSystem5 from "@effect/platform/FileSystem";
 import * as Console15 from "effect/Console";
-import * as Effect15 from "effect/Effect";
+import * as Effect16 from "effect/Effect";
 import * as Option7 from "effect/Option";
-import { CommandConfig as CommandConfig15, print as print9 } from "@dxos/cli-util";
+import { CommandConfig as CommandConfig15, print as print8 } from "@dxos/cli-util";
 import { DX_CONFIG as DX_CONFIG3, getProfileConfigPath as getProfileConfigPath3 } from "@dxos/client-protocol";
-var del = Command20.make("delete", {
-  name: Options6.text("name").pipe(Options6.withDescription("Profile name"), Options6.optional)
-}, Effect15.fnUntraced(function* ({ name }) {
+var del = Command21.make("delete", {
+  name: Options7.text("name").pipe(Options7.withDescription("Profile name"), Options7.optional)
+}, Effect16.fnUntraced(function* ({ name }) {
   const { json } = yield* CommandConfig15;
-  const fs = yield* FileSystem3.FileSystem;
+  const fs = yield* FileSystem5.FileSystem;
   const profileName = name.pipe(Option7.getOrElse(() => "default"));
   const configPath = getProfileConfigPath3(DX_CONFIG3, profileName);
   const pluginsPath = `${DX_CONFIG3}/plugins/${profileName}.yml`;
-  yield* fs.remove(configPath).pipe(Effect15.ignore);
-  yield* fs.remove(pluginsPath).pipe(Effect15.ignore);
+  yield* fs.remove(configPath).pipe(Effect16.ignore);
+  yield* fs.remove(pluginsPath).pipe(Effect16.ignore);
   if (json) {
     yield* Console15.log(JSON.stringify({
       name: profileName,
       deleted: true
     }, null, 2));
   } else {
-    yield* Console15.log(print9(printProfileDeleted(profileName)));
+    yield* Console15.log(print8(printProfileDeleted(profileName)));
   }
 }));
 
 // src/commands/profile/import.ts
-import * as Command21 from "@effect/cli/Command";
-import * as Options7 from "@effect/cli/Options";
-import * as Prompt2 from "@effect/cli/Prompt";
-import * as FileSystem5 from "@effect/platform/FileSystem";
+import * as Command22 from "@effect/cli/Command";
+import * as Options8 from "@effect/cli/Options";
+import * as Prompt4 from "@effect/cli/Prompt";
+import * as FileSystem7 from "@effect/platform/FileSystem";
 import * as Path3 from "@effect/platform/Path";
 import * as Console16 from "effect/Console";
-import * as Effect16 from "effect/Effect";
+import * as Effect17 from "effect/Effect";
 import * as Option8 from "effect/Option";
 import { CommandConfig as CommandConfig16 } from "@dxos/cli-util";
-import { ConfigService as ConfigService2 } from "@dxos/config";
+import { ConfigService as ConfigService3 } from "@dxos/config";
 import { log as log17 } from "@dxos/log";
-var __dxlog_file5 = "/__w/dxos/dxos/packages/plugins/plugin-client/src/commands/profile/import.ts";
-var handler11 = Effect16.fn(function* ({ file, dataDir, force }) {
+var __dxlog_file4 = "/__w/dxos/dxos/packages/plugins/plugin-client/src/commands/profile/import.ts";
+var handler10 = Effect17.fn(function* ({ file, dataDir, force }) {
   const dataDirValue = Option8.getOrUndefined(dataDir);
   const { json, profile: profile2 } = yield* CommandConfig16;
-  const fs = yield* FileSystem5.FileSystem;
+  const fs = yield* FileSystem7.FileSystem;
   const path = yield* Path3.Path;
-  const config2 = yield* ConfigService2;
-  const { createLevel, createStorageObjects, importProfileData, decodeProfileArchive } = yield* Effect16.promise(() => import("@dxos/client-services"));
+  const config2 = yield* ConfigService3;
+  const { createLevel, createStorageObjects, importProfileData, decodeProfileArchive } = yield* Effect17.promise(() => import("@dxos/client-services"));
   let storageConfig;
   if (!dataDirValue) {
     if (!force) {
       yield* Console16.log(`Will overwrite profile: ${profile2}`);
-      const confirmed = yield* Prompt2.confirm({
+      const confirmed = yield* Prompt4.confirm({
         message: `Delete all data? (Profile: ${profile2})`,
         initial: false
-      }).pipe(Prompt2.run);
+      }).pipe(Prompt4.run);
       if (!confirmed) {
         return;
       }
@@ -821,7 +927,7 @@ var handler11 = Effect16.fn(function* ({ file, dataDir, force }) {
   if (yield* fs.exists(storageConfig.dataRoot)) {
     log17.error("data directory already exists", {
       path: storageConfig.dataRoot
-    }, { "~LogMeta": "~LogMeta", F: __dxlog_file5, L: 44, S: this });
+    }, { "~LogMeta": "~LogMeta", F: __dxlog_file4, L: 44, S: this });
     if (json) {
       yield* Console16.log(JSON.stringify({
         error: "Data directory already exists"
@@ -835,12 +941,12 @@ var handler11 = Effect16.fn(function* ({ file, dataDir, force }) {
   const archive = decodeProfileArchive(data);
   yield* Console16.log(`Importing archive with ${archive.storage.length} entries`);
   const { storage } = createStorageObjects(storageConfig);
-  const level = yield* Effect16.tryPromise({
+  const level = yield* Effect17.tryPromise({
     try: () => createLevel(storageConfig),
     catch: (error2) => new Error(`Failed to create level: ${error2}`)
   });
   yield* Console16.log("Beginning profile import...");
-  yield* Effect16.tryPromise({
+  yield* Effect17.tryPromise({
     try: () => importProfileData({
       storage,
       level
@@ -856,27 +962,27 @@ var handler11 = Effect16.fn(function* ({ file, dataDir, force }) {
     }, null, 2));
   }
 });
-var importCommand = Command21.make("import", {
-  file: Options7.text("file").pipe(Options7.withDescription("Archive filename."), Options7.withAlias("f")),
-  dataDir: Options7.text("data-dir").pipe(Options7.withDescription("Storage directory."), Options7.optional),
-  force: Options7.boolean("force", {
+var importCommand = Command22.make("import", {
+  file: Options8.text("file").pipe(Options8.withDescription("Archive filename."), Options8.withAlias("f")),
+  dataDir: Options8.text("data-dir").pipe(Options8.withDescription("Storage directory."), Options8.optional),
+  force: Options8.boolean("force", {
     ifPresent: true
-  }).pipe(Options7.withDescription("Skip confirmation prompt."))
-}, handler11).pipe(Command21.withDescription("Import profile."));
+  }).pipe(Options8.withDescription("Skip confirmation prompt."))
+}, handler10).pipe(Command22.withDescription("Import profile."));
 
 // src/commands/profile/inspect.ts
-import * as Command22 from "@effect/cli/Command";
-import * as Options8 from "@effect/cli/Options";
-import * as FileSystem7 from "@effect/platform/FileSystem";
+import * as Command23 from "@effect/cli/Command";
+import * as Options9 from "@effect/cli/Options";
+import * as FileSystem9 from "@effect/platform/FileSystem";
 import * as Console17 from "effect/Console";
-import * as Effect17 from "effect/Effect";
-import { CommandConfig as CommandConfig17, FormBuilder as FormBuilder6, print as print10 } from "@dxos/cli-util";
+import * as Effect18 from "effect/Effect";
+import { CommandConfig as CommandConfig17, FormBuilder as FormBuilder6, print as print9 } from "@dxos/cli-util";
 import { ProfileArchiveEntryType } from "@dxos/protocols";
 import { arrayToBuffer } from "@dxos/util";
-var handler12 = Effect17.fn(function* ({ file, storage }) {
+var handler11 = Effect18.fn(function* ({ file, storage }) {
   const { json } = yield* CommandConfig17;
-  const fs = yield* FileSystem7.FileSystem;
-  const { decodeProfileArchive } = yield* Effect17.promise(() => import("@dxos/client-services"));
+  const fs = yield* FileSystem9.FileSystem;
+  const { decodeProfileArchive } = yield* Effect18.promise(() => import("@dxos/client-services"));
   const data = yield* fs.readFile(file);
   const archive = decodeProfileArchive(data);
   if (json) {
@@ -889,8 +995,8 @@ var handler12 = Effect17.fn(function* ({ file, storage }) {
   } else {
     const builder = FormBuilder6.make({
       title: "Profile Archive"
-    }).pipe(FormBuilder6.when(archive.meta, FormBuilder6.each(Object.entries(archive.meta ?? {}), ([key, value]) => FormBuilder6.set(key, String(value)))), FormBuilder6.build);
-    yield* Console17.log(print10(builder));
+    }).pipe(FormBuilder6.when(archive.meta, FormBuilder6.each(Object.entries(archive.meta ?? {}), ([key, value2]) => FormBuilder6.set(key, String(value2)))), FormBuilder6.build);
+    yield* Console17.log(print9(builder));
     if (storage) {
       yield* Console17.log("\nStorage entries:\n");
       for (const entry of archive.storage) {
@@ -900,41 +1006,41 @@ var handler12 = Effect17.fn(function* ({ file, storage }) {
     }
   }
 });
-var inspect = Command22.make("inspect", {
-  file: Options8.text("file").pipe(Options8.withDescription("Archive filename."), Options8.withAlias("f")),
-  storage: Options8.boolean("storage", {
+var inspect = Command23.make("inspect", {
+  file: Options9.text("file").pipe(Options9.withDescription("Archive filename."), Options9.withAlias("f")),
+  storage: Options9.boolean("storage", {
     ifPresent: true
-  }).pipe(Options8.withDescription("List storage entries."))
-}, handler12).pipe(Command22.withDescription("Inspect profile archive."));
+  }).pipe(Options9.withDescription("List storage entries."))
+}, handler11).pipe(Command23.withDescription("Inspect profile archive."));
 
 // src/commands/profile/list.ts
-import * as Command23 from "@effect/cli/Command";
-import * as FileSystem9 from "@effect/platform/FileSystem";
+import * as Command24 from "@effect/cli/Command";
+import * as FileSystem11 from "@effect/platform/FileSystem";
 import * as Path5 from "@effect/platform/Path";
 import * as Console18 from "effect/Console";
-import * as Effect18 from "effect/Effect";
+import * as Effect19 from "effect/Effect";
 import * as Yaml2 from "yaml";
 import { CommandConfig as CommandConfig18, printList as printList3 } from "@dxos/cli-util";
 import { Config } from "@dxos/client";
-import { DX_CONFIG as DX_CONFIG4, DX_DATA, getProfilePath } from "@dxos/client-protocol";
-var list3 = Command23.make("list", {}, Effect18.fnUntraced(function* () {
+import { DX_CONFIG as DX_CONFIG4, DX_DATA as DX_DATA2, getProfilePath as getProfilePath2 } from "@dxos/client-protocol";
+var list3 = Command24.make("list", {}, Effect19.fnUntraced(function* () {
   const { profile: currentProfile } = yield* CommandConfig18;
-  const fs = yield* FileSystem9.FileSystem;
+  const fs = yield* FileSystem11.FileSystem;
   const path = yield* Path5.Path;
   const profileDir = path.join(DX_CONFIG4, "profile");
   const entries = yield* fs.readDirectory(profileDir);
   const profileFiles = entries.filter((entry) => entry.endsWith(".yml"));
-  const profiles = yield* Effect18.forEach(profileFiles, (filename) => Effect18.gen(function* () {
+  const profiles = yield* Effect19.forEach(profileFiles, (filename) => Effect19.gen(function* () {
     const name = filename.slice(0, -4);
     const configPath = path.join(profileDir, filename);
-    const configContent = yield* fs.readFileString(configPath).pipe(Effect18.catchTag("SystemError", () => Effect18.succeed("{}")));
+    const configContent = yield* fs.readFileString(configPath).pipe(Effect19.catchTag("SystemError", () => Effect19.succeed("{}")));
     const configValues = Yaml2.parse(configContent) ?? {};
     const config2 = new Config(configValues);
     return {
       name,
       isCurrent: name === currentProfile,
       fullPath: configPath,
-      storagePath: getProfilePath(configValues?.runtime?.client?.storage?.dataRoot ?? DX_DATA, name),
+      storagePath: getProfilePath2(configValues?.runtime?.client?.storage?.dataRoot ?? DX_DATA2, name),
       edge: config2.values.runtime?.services?.edge?.url
     };
   }));
@@ -948,26 +1054,26 @@ var list3 = Command23.make("list", {}, Effect18.fnUntraced(function* () {
 }));
 
 // src/commands/profile/reset.ts
-import * as Command24 from "@effect/cli/Command";
-import * as Options9 from "@effect/cli/Options";
-import * as Prompt3 from "@effect/cli/Prompt";
-import * as FileSystem11 from "@effect/platform/FileSystem";
+import * as Command25 from "@effect/cli/Command";
+import * as Options10 from "@effect/cli/Options";
+import * as Prompt5 from "@effect/cli/Prompt";
+import * as FileSystem13 from "@effect/platform/FileSystem";
 import * as Console19 from "effect/Console";
-import * as Effect19 from "effect/Effect";
-import { CommandConfig as CommandConfig19, print as print11 } from "@dxos/cli-util";
-import { DX_DATA as DX_DATA2, getProfilePath as getProfilePath2 } from "@dxos/client-protocol";
-import { ConfigService as ConfigService3 } from "@dxos/config";
-var reset = Command24.make("reset", {
-  force: Options9.boolean("force", {
+import * as Effect20 from "effect/Effect";
+import { CommandConfig as CommandConfig19, print as print10 } from "@dxos/cli-util";
+import { DX_DATA as DX_DATA3, getProfilePath as getProfilePath3 } from "@dxos/client-protocol";
+import { ConfigService as ConfigService4 } from "@dxos/config";
+var reset = Command25.make("reset", {
+  force: Options10.boolean("force", {
     ifPresent: true
-  }).pipe(Options9.withDescription("Skip confirmation prompt"))
-}, Effect19.fnUntraced(function* ({ force }) {
-  const fs = yield* FileSystem11.FileSystem;
-  const config2 = yield* ConfigService3;
+  }).pipe(Options10.withDescription("Skip confirmation prompt"))
+}, Effect20.fnUntraced(function* ({ force }) {
+  const fs = yield* FileSystem13.FileSystem;
+  const config2 = yield* ConfigService4;
   const { json, profile: profile2 } = yield* CommandConfig19;
-  const path = config2.values.runtime?.client?.storage?.dataRoot ?? getProfilePath2(DX_DATA2, profile2);
+  const path = config2.values.runtime?.client?.storage?.dataRoot ?? getProfilePath3(DX_DATA3, profile2);
   if (!force) {
-    const confirmed = yield* Prompt3.confirm({
+    const confirmed = yield* Prompt5.confirm({
       message: `Are you sure you want to reset the profile (${profile2})?`,
       initial: false
     });
@@ -984,13 +1090,13 @@ var reset = Command24.make("reset", {
       reset: true
     }, null, 2));
   } else {
-    yield* Console19.log(print11(printProfileReset(profile2)));
+    yield* Console19.log(print10(printProfileReset(profile2)));
   }
 }));
 
 // src/commands/profile/index.ts
-var profile = Command25.make("profile").pipe(Command25.withDescription("Profile commands."), Command25.withSubcommands([
-  create2,
+var profile = Command26.make("profile").pipe(Command26.withDescription("Profile commands."), Command26.withSubcommands([
+  create,
   del,
   importCommand,
   inspect,
@@ -999,10 +1105,11 @@ var profile = Command25.make("profile").pipe(Command25.withDescription("Profile
 ]));
 
 // src/ClientPlugin.node.ts
-var ClientPlugin = Plugin2.define(meta).pipe(
+var ClientPlugin = Plugin.define(meta).pipe(
   // TODO(wittjosiah): Could some of these commands make use of operations?
   AppPlugin.addCommandModule({
     commands: [
+      account,
       config,
       device,
       edge,
@@ -1013,7 +1120,7 @@ var ClientPlugin = Plugin2.define(meta).pipe(
   AppPlugin.addOperationHandlerModule({
     activate: OperationHandler
   }),
-  Plugin2.addModule((options) => ({
+  Plugin.addModule((options) => ({
     id: Capability.getModuleTag(Client),
     activatesOn: ActivationEvents.Startup,
     firesAfterActivation: [
@@ -1021,25 +1128,25 @@ var ClientPlugin = Plugin2.define(meta).pipe(
     ],
     activate: () => Client(options)
   })),
-  Plugin2.addModule({
+  Plugin.addModule({
     activatesOn: ClientEvents.ClientReady,
     firesBeforeActivation: [
       AppActivationEvents.SetupSchema
     ],
     activate: SchemaDefs
   }),
-  Plugin2.addModule({
+  Plugin.addModule({
     activatesOn: ClientEvents.ClientReady,
     firesBeforeActivation: [
       ClientEvents.SetupMigration
     ],
     activate: Migrations
   }),
-  Plugin2.addModule({
+  Plugin.addModule({
     activatesOn: ActivationEvents.SetupProcessManager,
     activate: LayerSpecs
   }),
-  Plugin2.make
+  Plugin.make
 );
 var ClientPlugin_node_default = ClientPlugin;
 export {