@dxos/plugin-client 0.8.4-main.b97322e → 0.8.4-main.bcb3aa67d6

package/src/cli/commands/halo/identity/index.ts

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

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

@@ -0,0 +1,21 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+
+import { create } from './create';
+import { credential } from './credential';
+import { identity } from './identity';
+// TODO(wittjosiah): Omitted currently due to p2p networking not working in bun.
+// import { join } from './join';
+import { keys } from './keys';
+import { recover } from './recover';
+import { seed } from './seed';
+// import { share } from './share';
+import { update } from './update';
+
+export const halo: Command.Command<any, any, any, any> = Command.make('halo').pipe(
+  Command.withDescription('Manage HALO identity.'),
+  Command.withSubcommands([create, credential, identity, keys, recover, seed, update]),
+);

package/src/cli/commands/halo/join/index.ts

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

package/src/cli/commands/halo/join/join.test.ts

@@ -0,0 +1,10 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { describe, it } from '@effect/vitest';
+
+describe('halo join', () => {
+  // TODO(wittjosiah): Need to be able to test prompts.
+  it.todo('should accept an invitation code');
+});

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

@@ -0,0 +1,87 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Args from '@effect/cli/Args';
+import * as Command from '@effect/cli/Command';
+import * as Prompt from '@effect/cli/Prompt';
+import * as Console from 'effect/Console';
+import * as Effect from 'effect/Effect';
+import * as Match from 'effect/Match';
+
+import { CommandConfig, print } from '@dxos/cli-util';
+import { type Client, ClientService } from '@dxos/client';
+import { type AuthenticatingInvitationObservable, Invitation, InvitationEncoder } from '@dxos/client/invitations';
+import { invariant } from '@dxos/invariant';
+
+import { printIdentity } from '../util';
+
+export const join = Command.make(
+  'join',
+  {
+    invitationCode: Args.text({ name: 'invitationCode' }).pipe(Args.withDescription('The invitation code.')),
+  },
+  Effect.fn(function* ({ invitationCode }) {
+    const { json } = yield* CommandConfig;
+    const client = yield* ClientService;
+    // TODO(wittjosiah): How to surface this error to the user cleanly?
+    invariant(!client.halo.identity.get(), 'Identity already exists');
+
+    const identity = yield* sendInvitation({ client, invitationCode });
+    if (!identity) {
+      if (json) {
+        yield* Console.log(JSON.stringify({ error: 'Failed to join identity' }, null, 2));
+      } else {
+        yield* Console.log('Failed to join identity');
+      }
+      return;
+    }
+
+    if (json) {
+      yield* Console.log(
+        JSON.stringify(
+          {
+            identityKey: identity.identityKey.toHex(),
+            displayName: identity.profile?.displayName,
+          },
+          null,
+          2,
+        ),
+      );
+    } else {
+      yield* Console.log(print(printIdentity(identity)));
+    }
+  }),
+).pipe(Command.withDescription('Join an existing identity using an invitation code.'));
+
+const sendInvitation = Effect.fn(function* ({
+  client,
+  invitationCode: encoded,
+}: {
+  client: Client;
+  invitationCode: string;
+}) {
+  if (encoded.startsWith('http') || encoded.startsWith('socket')) {
+    const searchProps = new URL(encoded).searchParams;
+    encoded = searchProps.get('deviceInvitationCode') ?? encoded;
+  }
+
+  const invitationCode = InvitationEncoder.decode(encoded);
+  const invitation = client.halo.join(invitationCode);
+  yield* waitForState(invitation, Invitation.State.READY_FOR_AUTHENTICATION);
+
+  const authCode = yield* Prompt.text({ message: 'Enter the authentication code' }).pipe(Prompt.run);
+  yield* Effect.tryPromise(() => invitation.authenticate(authCode));
+  yield* waitForState(invitation, Invitation.State.SUCCESS);
+  return client.halo.identity.get();
+});
+
+const waitForState = (invitation: AuthenticatingInvitationObservable, state: Invitation.State) =>
+  Effect.gen(function* () {
+    const latch = yield* Effect.makeLatch();
+    const subscription = invitation.subscribe((invitation) => {
+      Match.value(invitation.state).pipe(Match.when(state, () => Effect.runSync(latch.open)));
+    });
+    yield* latch.await;
+    subscription.unsubscribe();
+  });

package/src/cli/commands/halo/keys/index.ts

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

package/src/cli/commands/halo/keys/keys.test.ts

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

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

@@ -0,0 +1,40 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+import * as Console from 'effect/Console';
+import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
+
+import { CommandConfig } from '@dxos/cli-util';
+import { FormBuilder, print } from '@dxos/cli-util';
+import { ClientService } from '@dxos/client';
+
+export const handler = Effect.fn(function* () {
+  const { json } = yield* CommandConfig;
+  const client = yield* ClientService;
+  const identity = client.halo.identity.get();
+  const device = client.halo.device;
+
+  if (json) {
+    yield* Console.log(
+      JSON.stringify(
+        {
+          identityKey: identity?.identityKey.toHex(),
+          deviceKey: device?.deviceKey.toHex(),
+        },
+        null,
+        2,
+      ),
+    );
+  } else {
+    const builder = FormBuilder.make({ title: 'HALO Keys' }).pipe(
+      FormBuilder.option('identityKey', Option.fromNullable(identity?.identityKey.truncate())),
+      FormBuilder.option('deviceKey', Option.fromNullable(device?.deviceKey.truncate())),
+    );
+    yield* Console.log(print(FormBuilder.build(builder)));
+  }
+});
+
+export const keys = Command.make('keys', {}, handler).pipe(Command.withDescription('Show HALO keys.'));

package/src/cli/commands/halo/recover/index.ts

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

package/src/cli/commands/halo/recover/recover.test.ts

@@ -0,0 +1,10 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { describe, it } from '@effect/vitest';
+
+describe('halo recover', () => {
+  // TODO(wittjosiah): Need to be able to test recovery flow.
+  it.todo('should recover identity with recovery code');
+});

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

@@ -0,0 +1,44 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Args from '@effect/cli/Args';
+import * as Command from '@effect/cli/Command';
+import * as Console from 'effect/Console';
+import * as Effect from 'effect/Effect';
+
+import { CommandConfig, print } from '@dxos/cli-util';
+import { ClientService } from '@dxos/client';
+import { invariant } from '@dxos/invariant';
+
+import { printIdentity } from '../util';
+
+export const recover = Command.make(
+  'recover',
+  {
+    recoveryCode: Args.text({ name: 'recoveryCode' }).pipe(Args.withDescription('The recovery code seed phrase.')),
+  },
+  Effect.fn(function* ({ recoveryCode }) {
+    const { json } = yield* CommandConfig;
+    const client = yield* ClientService;
+    // TODO(wittjosiah): How to surface this error to the user cleanly?
+    invariant(!client.halo.identity.get(), 'Identity already exists');
+
+    const identity = yield* Effect.tryPromise(() => client.halo.recoverIdentity({ recoveryCode }));
+    if (json) {
+      yield* Console.log(
+        JSON.stringify(
+          {
+            identityKey: identity.identityKey.toHex(),
+            displayName: identity.profile?.displayName,
+          },
+          null,
+          2,
+        ),
+      );
+    } else {
+      yield* Console.log('Identity recovered successfully');
+      yield* Console.log(print(printIdentity(identity)));
+    }
+  }),
+).pipe(Command.withDescription('Recover an existing identity using a recovery code.'));

package/src/cli/commands/halo/seed/index.ts

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

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

@@ -0,0 +1,36 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+import * as Console from 'effect/Console';
+import * as Effect from 'effect/Effect';
+
+import { CommandConfig } from '@dxos/cli-util';
+import { ClientService } from '@dxos/client';
+
+export const handler = Effect.fn(function* () {
+  const { json } = yield* CommandConfig;
+  const client = yield* ClientService;
+  const identityService = client.services.services.IdentityService;
+  if (!identityService) {
+    if (json) {
+      yield* Console.log(JSON.stringify({ error: 'IdentityService not found' }, null, 2));
+    } else {
+      yield* Console.log('IdentityService not found.');
+    }
+    return;
+  }
+
+  const result = yield* Effect.tryPromise(() => identityService.createRecoveryCredential({}));
+
+  if (json) {
+    yield* Console.log(JSON.stringify({ recoveryCode: result.recoveryCode }, null, 2));
+  } else {
+    yield* Console.log(result.recoveryCode);
+  }
+});
+
+export const seed = Command.make('seed', {}, handler).pipe(
+  Command.withDescription('Generate a seedphrase that can be used for identity recovery.'),
+);

package/src/cli/commands/halo/share/index.ts

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

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

@@ -0,0 +1,97 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+import * as Options from '@effect/cli/Options';
+import * as Console from 'effect/Console';
+import * as Effect from 'effect/Effect';
+
+import { CommandConfig, copyToClipboard, openBrowser, print } from '@dxos/cli-util';
+import { FormBuilder } from '@dxos/cli-util';
+import { ClientService } from '@dxos/client';
+import { Invitation, InvitationEncoder, hostInvitation } from '@dxos/client/invitations';
+
+export const handler = Effect.fn(function* ({
+  lifetime,
+  open,
+  host,
+}: {
+  lifetime: number;
+  open: boolean;
+  host: string;
+}) {
+  const { json } = yield* CommandConfig;
+  const client = yield* ClientService;
+
+  // Always use persistent and delegated (auth required) due to P2P limitations
+  const observable = client.halo.share({
+    authMethod: Invitation.AuthMethod.SHARED_SECRET,
+    persistent: true,
+    lifetime,
+  });
+
+  const invitation = yield* hostInvitation({
+    observable,
+    callbacks: {
+      onConnecting: (invitation) =>
+        Effect.gen(function* () {
+          const invitationCode = InvitationEncoder.encode(invitation);
+          const authCode = invitation.authCode!;
+
+          // Copy auth code to clipboard
+          yield* copyToClipboard(authCode).pipe(Effect.catchAll(() => Effect.void));
+
+          if (!json) {
+            yield* Console.log(`\nSecret: ${authCode} (copied to clipboard)\n`);
+          }
+
+          if (open) {
+            const url = new URL(host);
+            url.searchParams.append('deviceInvitationCode', invitationCode);
+            yield* openBrowser(url.toString()).pipe(Effect.catchAll(() => Effect.void));
+          } else if (!json) {
+            yield* Console.log(`\nInvitation: ${invitationCode}\n`);
+          }
+        }),
+    },
+    waitForSuccess: true,
+  });
+
+  if (json) {
+    yield* Console.log(
+      JSON.stringify(
+        {
+          invitationCode: InvitationEncoder.encode(invitation),
+          authCode: invitation.authCode,
+          state: Invitation.State[invitation.state],
+        },
+        null,
+        2,
+      ),
+    );
+  } else {
+    const builder = FormBuilder.make({ title: 'HALO Invitation' }).pipe(
+      FormBuilder.set('invitationCode', InvitationEncoder.encode(invitation)),
+      FormBuilder.set('authCode', invitation.authCode ?? '<none>'),
+      FormBuilder.set('state', Invitation.State[invitation.state]),
+    );
+    yield* Console.log(print(FormBuilder.build(builder)));
+  }
+});
+
+export const share = Command.make(
+  'share',
+  {
+    lifetime: Options.integer('lifetime').pipe(
+      Options.withDescription('Lifetime of the invitation in seconds.'),
+      Options.withDefault(12 * 60 * 60), // 12 hours - HALO invitations are typically shorter-lived
+    ),
+    open: Options.boolean('open', { ifPresent: true }).pipe(Options.withDescription('Open browser with invitation.')),
+    host: Options.text('host').pipe(
+      Options.withDescription('Application Host URL.'),
+      Options.withDefault('https://composer.space'),
+    ),
+  },
+  handler,
+).pipe(Command.withDescription('Create HALO (device) invitation.'));

package/src/cli/commands/halo/update/index.ts

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

package/src/cli/commands/halo/update/update.test.ts

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

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

@@ -0,0 +1,67 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+import * as Options from '@effect/cli/Options';
+import * as Console from 'effect/Console';
+import * as Effect from 'effect/Effect';
+
+import { CommandConfig } from '@dxos/cli-util';
+import { print } from '@dxos/cli-util';
+import { ClientService } from '@dxos/client';
+
+import { printIdentity } from '../util';
+
+export const handler = Effect.fn(function* ({ displayName }: { displayName: string }) {
+  const { json } = yield* CommandConfig;
+  const client = yield* ClientService;
+  const identity = client.halo.identity.get();
+  if (!identity) {
+    if (json) {
+      yield* Console.log(JSON.stringify({ error: 'Identity not initialized' }, null, 2));
+    } else {
+      yield* Console.log('Identity not initialized.');
+    }
+    return;
+  }
+
+  const identityService = client.services.services.IdentityService;
+  if (!identityService) {
+    if (json) {
+      yield* Console.log(JSON.stringify({ error: 'IdentityService not found' }, null, 2));
+    } else {
+      yield* Console.log('IdentityService not found.');
+    }
+    return;
+  }
+
+  const updatedIdentity = yield* Effect.tryPromise(() =>
+    identityService.updateProfile({
+      displayName,
+    }),
+  );
+
+  if (json) {
+    yield* Console.log(
+      JSON.stringify(
+        {
+          identityKey: updatedIdentity.identityKey.toHex(),
+          displayName: updatedIdentity.profile?.displayName,
+        },
+        null,
+        2,
+      ),
+    );
+  } else {
+    yield* Console.log(print(printIdentity(updatedIdentity)));
+  }
+});
+
+export const update = Command.make(
+  'update',
+  {
+    displayName: Options.text('displayName').pipe(Options.withDescription('The display name of the identity.')),
+  },
+  handler,
+).pipe(Command.withDescription('Update identity profile.'));

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

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

package/src/cli/commands/index.ts

@@ -0,0 +1,9 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './config';
+export * from './device';
+export * from './edge';
+export * from './halo';
+export * from './profile';

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

@@ -0,0 +1,90 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+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, getProfileConfigPath } from '@dxos/client-protocol';
+import { trim } from '@dxos/util';
+
+import { printProfileCreated } from './util';
+
+const TEMPLATES = {
+  default: trim`
+    version: 1
+    runtime:
+      client:
+        storage:
+          persistent: true
+      services:
+        edge:
+          url: https://edge-production.dxos.workers.dev
+  `,
+  main: trim`
+    version: 1
+    runtime:
+      client:
+        storage:
+          persistent: true
+      services:
+        edge:
+          url: https://edge-main.dxos.workers.dev
+  `,
+  dev: trim`
+    version: 1
+    runtime:
+      client:
+        storage:
+          persistent: true
+      services:
+        edge:
+          url: https://edge.dxos.workers.dev
+  `,
+  local: trim`
+    version: 1
+    runtime:
+      client:
+        storage:
+          persistent: true
+      services:
+        edge:
+          url: http://localhost:8787
+  `,
+} as const;
+
+export const create = Command.make(
+  'create',
+  {
+    template: Options.choice('template', Record.keys(TEMPLATES)).pipe(
+      Options.withDescription('Template to use'),
+      Options.withDefault('default'),
+    ),
+    name: Options.text('name').pipe(Options.withDescription('Profile name'), Options.optional),
+  },
+  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 configPath = getProfileConfigPath(DX_CONFIG, profileName);
+    if (yield* fs.exists(configPath)) {
+      throw new Error(`Profile ${profileName} already exists`);
+    }
+
+    yield* fs.makeDirectory(path.dirname(configPath), { recursive: true });
+    yield* fs.writeFileString(configPath, TEMPLATES[template]);
+    if (json) {
+      yield* Console.log(JSON.stringify({ name: profileName, path: configPath }, null, 2));
+    } else {
+      yield* Console.log(print(printProfileCreated(profileName, configPath)));
+    }
+  }),
+);