@dxos/plugin-client 0.8.4-main.21d9917 → 0.8.4-main.2244d791bb

package/dist/lib/node-esm/{migrations-WSZSFGDK.mjs → migrations-ZH5GNG4U.mjs}

@@ -5,9 +5,9 @@ import {
 
 // src/capabilities/migrations/migrations.ts
 import * as Effect from "effect/Effect";
-import { Capability, Common } from "@dxos/app-framework";
+import { Capabilities, Capability } from "@dxos/app-framework";
 var migrations_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);
   const cancel = registry.subscribe(migrationsAtom, (_migrations) => {
@@ -17,9 +17,9 @@ var migrations_default = Capability.makeModule(Effect.fnUntraced(function* () {
   }, {
     immediate: true
   });
-  return Capability.contributes(Common.Capability.Null, null, () => Effect.sync(() => cancel()));
+  return Capability.contributes(Capabilities.Null, null, () => Effect.sync(() => cancel()));
 }));
 export {
   migrations_default as default
 };
-//# sourceMappingURL=migrations-WSZSFGDK.mjs.map
+//# sourceMappingURL=migrations-ZH5GNG4U.mjs.map

package/dist/lib/node-esm/migrations-ZH5GNG4U.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/capabilities/migrations/migrations.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { Capabilities, Capability } from '@dxos/app-framework';\n\nimport { ClientCapabilities } from '../../types';\n\nexport default Capability.makeModule(\n  Effect.fnUntraced(function* () {\n    const registry = yield* Capability.get(Capabilities.AtomRegistry);\n    const client = yield* Capability.get(ClientCapabilities.Client);\n    const migrationsAtom = yield* Capability.atom(ClientCapabilities.Migration);\n\n    // NOTE: Migrations are currently unidirectional and idempotent.\n    const cancel = registry.subscribe(\n      migrationsAtom,\n      (_migrations: any[]) => {\n        const migrations = Array.from(new Set(_migrations.flat()));\n        const spaces = client.spaces.get();\n        void Promise.all(spaces.map((space: any) => space.internal.db.runMigrations(migrations)));\n      },\n      { immediate: true },\n    );\n\n    return Capability.contributes(Capabilities.Null, null, () => Effect.sync(() => cancel()));\n  }),\n);\n"],
+  "mappings": ";;;;;;AAIA,YAAYA,YAAY;AAExB,SAASC,cAAcC,kBAAkB;AAIzC,IAAA,qBAAeC,WAAWC,WACjBC,kBAAW,aAAA;AAChB,QAAMC,WAAW,OAAOH,WAAWI,IAAIC,aAAaC,YAAY;AAChE,QAAMC,SAAS,OAAOP,WAAWI,IAAII,mBAAmBC,MAAM;AAC9D,QAAMC,iBAAiB,OAAOV,WAAWW,KAAKH,mBAAmBI,SAAS;AAG1E,QAAMC,SAASV,SAASW,UACtBJ,gBACA,CAACK,gBAAAA;AACC,UAAMC,aAAaC,MAAMC,KAAK,IAAIC,IAAIJ,YAAYK,KAAI,CAAA,CAAA;AACtD,UAAMC,SAASd,OAAOc,OAAOjB,IAAG;AAChC,SAAKkB,QAAQC,IAAIF,OAAOG,IAAI,CAACC,UAAeA,MAAMC,SAASC,GAAGC,cAAcZ,UAAAA,CAAAA,CAAAA;EAC9E,GACA;IAAEa,WAAW;EAAK,CAAA;AAGpB,SAAO7B,WAAW8B,YAAYzB,aAAa0B,MAAM,MAAM,MAAaC,YAAK,MAAMnB,OAAAA,CAAAA,CAAAA;AACjF,CAAA,CAAA;",
+  "names": ["Effect", "Capabilities", "Capability", "Capability", "makeModule", "fnUntraced", "registry", "get", "Capabilities", "AtomRegistry", "client", "ClientCapabilities", "Client", "migrationsAtom", "atom", "Migration", "cancel", "subscribe", "_migrations", "migrations", "Array", "from", "Set", "flat", "spaces", "Promise", "all", "map", "space", "internal", "db", "runMigrations", "immediate", "contributes", "Null", "sync"]
+}

package/dist/lib/node-esm/{operation-resolver-VW5R2BE4.mjs → operation-resolver-CHGWI5P2.mjs}

@@ -13,7 +13,8 @@ import {
 
 // src/capabilities/operation-resolver/operation-resolver.ts
 import * as Effect from "effect/Effect";
-import { Capability, Common } from "@dxos/app-framework";
+import { Capabilities, Capability } from "@dxos/app-framework";
+import { LayoutOperation } from "@dxos/app-toolkit";
 import { PublicKey } from "@dxos/client";
 import { runAndForwardErrors } from "@dxos/effect";
 import { invariant } from "@dxos/invariant";
@@ -24,14 +25,14 @@ var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-client/src/capabiliti
 var RECOVER_IDENTITY_RPC_TIMEOUT = 2e4;
 var operation_resolver_default = Capability.makeModule(Effect.fnUntraced(function* (props) {
   const { appName = "Composer" } = props ?? {};
-  return Capability.contributes(Common.Capability.OperationResolver, [
+  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)));
@@ -47,7 +48,7 @@ var operation_resolver_default = Capability.makeModule(Effect.fnUntraced(functio
     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: {
@@ -63,10 +64,10 @@ var operation_resolver_default = Capability.makeModule(Effect.fnUntraced(functio
     OperationResolver.make({
       operation: ClientOperation.ShareIdentity,
       handler: Effect.fnUntraced(function* () {
-        yield* Operation.invoke(Common.LayoutOperation.SwitchWorkspace, {
+        yield* Operation.invoke(LayoutOperation.SwitchWorkspace, {
           subject: Account.id
         });
-        yield* Operation.invoke(Common.LayoutOperation.Open, {
+        yield* Operation.invoke(LayoutOperation.Open, {
           subject: [
             Account.Profile
           ]
@@ -82,7 +83,7 @@ var operation_resolver_default = Capability.makeModule(Effect.fnUntraced(functio
     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: {
@@ -97,7 +98,7 @@ var operation_resolver_default = Capability.makeModule(Effect.fnUntraced(functio
     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: {
@@ -115,7 +116,7 @@ var operation_resolver_default = Capability.makeModule(Effect.fnUntraced(functio
         const client = yield* Capability.get(ClientCapabilities.Client);
         invariant(client.services.services.EdgeAgentService, "Missing EdgeAgentService", {
           F: __dxlog_file,
-          L: 114,
+          L: 115,
           S: this,
           A: [
             "client.services.services.EdgeAgentService",
@@ -136,7 +137,7 @@ var operation_resolver_default = Capability.makeModule(Effect.fnUntraced(functio
         const client = yield* Capability.get(ClientCapabilities.Client);
         invariant(client.services.services.IdentityService, "IdentityService not available", {
           F: __dxlog_file,
-          L: 128,
+          L: 129,
           S: this,
           A: [
             "client.services.services.IdentityService",
@@ -144,7 +145,7 @@ var operation_resolver_default = Capability.makeModule(Effect.fnUntraced(functio
           ]
         });
         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",
@@ -164,7 +165,7 @@ var operation_resolver_default = Capability.makeModule(Effect.fnUntraced(functio
         const identity = client.halo.identity.get();
         invariant(identity, "Identity not available", {
           F: __dxlog_file,
-          L: 149,
+          L: 150,
           S: this,
           A: [
             "identity",
@@ -202,7 +203,7 @@ var operation_resolver_default = Capability.makeModule(Effect.fnUntraced(functio
         }));
         invariant(credential, "Credential not available", {
           F: __dxlog_file,
-          L: 174,
+          L: 175,
           S: this,
           A: [
             "credential",
@@ -213,7 +214,7 @@ var operation_resolver_default = Capability.makeModule(Effect.fnUntraced(functio
         const algorithm = credential.response.getPublicKeyAlgorithm() === -7 ? "ES256" : "ED25519";
         invariant(client.services.services.IdentityService, "IdentityService not available", {
           F: __dxlog_file,
-          L: 178,
+          L: 179,
           S: this,
           A: [
             "client.services.services.IdentityService",
@@ -238,7 +239,7 @@ var operation_resolver_default = Capability.makeModule(Effect.fnUntraced(functio
         const client = yield* Capability.get(ClientCapabilities.Client);
         invariant(client.services.services.IdentityService, "IdentityService not available", {
           F: __dxlog_file,
-          L: 198,
+          L: 199,
           S: this,
           A: [
             "client.services.services.IdentityService",
@@ -277,7 +278,7 @@ var operation_resolver_default = Capability.makeModule(Effect.fnUntraced(functio
         const client = yield* Capability.get(ClientCapabilities.Client);
         invariant(client.services.services.IdentityService, "IdentityService not available", {
           F: __dxlog_file,
-          L: 237,
+          L: 238,
           S: this,
           A: [
             "client.services.services.IdentityService",
@@ -296,4 +297,4 @@ var operation_resolver_default = Capability.makeModule(Effect.fnUntraced(functio
 export {
   operation_resolver_default as default
 };
-//# sourceMappingURL=operation-resolver-VW5R2BE4.mjs.map
+//# sourceMappingURL=operation-resolver-CHGWI5P2.mjs.map

package/dist/lib/node-esm/operation-resolver-CHGWI5P2.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/capabilities/operation-resolver/operation-resolver.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { Capabilities, Capability } from '@dxos/app-framework';\nimport { LayoutOperation } from '@dxos/app-toolkit';\nimport { PublicKey } from '@dxos/client';\nimport { runAndForwardErrors } from '@dxos/effect';\nimport { invariant } from '@dxos/invariant';\nimport { OperationResolver } from '@dxos/operation';\nimport { Operation } from '@dxos/operation';\nimport { ObservabilityOperation } from '@dxos/plugin-observability/types';\nimport { type JoinPanelProps } from '@dxos/shell/react';\n\nimport { JOIN_DIALOG, RECOVERY_CODE_DIALOG, RESET_DIALOG } from '../../constants';\nimport { ClientEvents } from '../../types';\nimport { Account, ClientCapabilities, ClientOperation } from '../../types';\n\ntype OperationResolverOptions = {\n  appName?: string;\n};\n\nconst RECOVER_IDENTITY_RPC_TIMEOUT = 20_000;\n\nexport default Capability.makeModule(\n  Effect.fnUntraced(function* (props?: OperationResolverOptions) {\n    const { appName = 'Composer' } = props ?? {};\n\n    return Capability.contributes(Capabilities.OperationResolver, [\n      //\n      // CreateIdentity\n      //\n      OperationResolver.make({\n        operation: ClientOperation.CreateIdentity,\n        handler: Effect.fnUntraced(function* (profile) {\n          const manager = yield* Capability.get(Capabilities.PluginManager);\n          const client = yield* Capability.get(ClientCapabilities.Client);\n          const data = yield* Effect.promise(() => client.halo.createIdentity(profile));\n          yield* Effect.promise(() => runAndForwardErrors(manager.activate(ClientEvents.IdentityCreated)));\n          yield* Operation.schedule(ObservabilityOperation.SendEvent, { name: 'identity.create' });\n          return data;\n        }),\n      }),\n\n      //\n      // JoinIdentity\n      //\n      OperationResolver.make({\n        operation: ClientOperation.JoinIdentity,\n        handler: Effect.fnUntraced(function* (data) {\n          yield* Operation.invoke(LayoutOperation.UpdateDialog, {\n            subject: JOIN_DIALOG,\n            blockAlign: 'start',\n            props: {\n              initialInvitationCode: data.invitationCode,\n              initialDisposition: 'accept-halo-invitation',\n            },\n          });\n        }),\n      }),\n\n      //\n      // ShareIdentity\n      //\n      OperationResolver.make({\n        operation: ClientOperation.ShareIdentity,\n        handler: Effect.fnUntraced(function* () {\n          yield* Operation.invoke(LayoutOperation.SwitchWorkspace, { subject: Account.id });\n          yield* Operation.invoke(LayoutOperation.Open, { subject: [Account.Profile] });\n          yield* Operation.schedule(ObservabilityOperation.SendEvent, { name: 'identity.share' });\n        }),\n      }),\n\n      //\n      // RecoverIdentity\n      //\n      OperationResolver.make({\n        operation: ClientOperation.RecoverIdentity,\n        handler: Effect.fnUntraced(function* () {\n          yield* Operation.invoke(LayoutOperation.UpdateDialog, {\n            subject: JOIN_DIALOG,\n            blockAlign: 'start',\n            props: {\n              initialDisposition: 'recover-identity',\n            } satisfies Partial<JoinPanelProps>,\n          });\n        }),\n      }),\n\n      //\n      // ResetStorage\n      //\n      OperationResolver.make({\n        operation: ClientOperation.ResetStorage,\n        handler: Effect.fnUntraced(function* (data) {\n          yield* Operation.invoke(LayoutOperation.UpdateDialog, {\n            subject: RESET_DIALOG,\n            blockAlign: 'start',\n            props: {\n              mode: data.mode ?? 'reset storage',\n            },\n          });\n        }),\n      }),\n\n      //\n      // CreateAgent\n      //\n      OperationResolver.make({\n        operation: ClientOperation.CreateAgent,\n        handler: Effect.fnUntraced(function* () {\n          const client = yield* Capability.get(ClientCapabilities.Client);\n          invariant(client.services.services.EdgeAgentService, 'Missing EdgeAgentService');\n          yield* Effect.promise(() =>\n            client.services.services.EdgeAgentService!.createAgent(undefined, { timeout: 10_000 }),\n          );\n        }),\n      }),\n\n      //\n      // CreateRecoveryCode\n      //\n      OperationResolver.make({\n        operation: ClientOperation.CreateRecoveryCode,\n        handler: Effect.fnUntraced(function* () {\n          const client = yield* Capability.get(ClientCapabilities.Client);\n          invariant(client.services.services.IdentityService, 'IdentityService not available');\n          const { recoveryCode } = yield* Effect.promise(() =>\n            client.services.services.IdentityService!.createRecoveryCredential({}),\n          );\n          yield* Operation.invoke(LayoutOperation.UpdateDialog, {\n            subject: RECOVERY_CODE_DIALOG,\n            blockAlign: 'start',\n            type: 'alert',\n            props: { code: recoveryCode },\n          });\n        }),\n      }),\n\n      //\n      // CreatePasskey\n      //\n      OperationResolver.make({\n        operation: ClientOperation.CreatePasskey,\n        handler: Effect.fnUntraced(function* () {\n          const client = yield* Capability.get(ClientCapabilities.Client);\n          const identity = client.halo.identity.get();\n          invariant(identity, 'Identity not available');\n\n          const lookupKey = PublicKey.random();\n          const credential = yield* Effect.promise(() =>\n            navigator.credentials.create({\n              publicKey: {\n                challenge: new Uint8Array(),\n                rp: { id: location.hostname, name: appName },\n                user: {\n                  id: lookupKey.asUint8Array() as Uint8Array<ArrayBuffer>,\n                  name: identity.did,\n                  displayName: identity.profile?.displayName ?? '',\n                },\n                pubKeyCredParams: [\n                  { type: 'public-key', alg: -8 }, // Ed25519 (not yet supported across all browsers)\n                  { type: 'public-key', alg: -7 }, // ES256\n                ],\n                authenticatorSelection: {\n                  residentKey: 'required',\n                  requireResidentKey: true,\n                },\n              },\n            }),\n          );\n\n          invariant(credential, 'Credential not available');\n          const recoveryKey = PublicKey.from(new Uint8Array((credential as any).response.getPublicKey()));\n          const algorithm = (credential as any).response.getPublicKeyAlgorithm() === -7 ? 'ES256' : 'ED25519';\n\n          invariant(client.services.services.IdentityService, 'IdentityService not available');\n          yield* Effect.promise(() =>\n            client.services.services.IdentityService!.createRecoveryCredential({\n              data: {\n                recoveryKey,\n                algorithm,\n                lookupKey,\n              },\n            }),\n          );\n        }),\n      }),\n\n      //\n      // RedeemPasskey\n      //\n      OperationResolver.make({\n        operation: ClientOperation.RedeemPasskey,\n        handler: Effect.fnUntraced(function* () {\n          const client = yield* Capability.get(ClientCapabilities.Client);\n          invariant(client.services.services.IdentityService, 'IdentityService not available');\n          const { deviceKey, controlFeedKey, challenge } = yield* Effect.promise(() =>\n            client.services.services.IdentityService!.requestRecoveryChallenge(),\n          );\n          const credential = yield* Effect.promise(() =>\n            navigator.credentials.get({\n              publicKey: {\n                challenge: Buffer.from(challenge, 'base64'),\n                rpId: location.hostname,\n                userVerification: 'required',\n              },\n            }),\n          );\n          const lookupKey = PublicKey.from(new Uint8Array((credential as any).response.userHandle));\n          yield* Effect.promise(() =>\n            client.services.services.IdentityService!.recoverIdentity(\n              {\n                external: {\n                  lookupKey,\n                  deviceKey,\n                  controlFeedKey,\n                  signature: Buffer.from((credential as any).response.signature),\n                  clientDataJson: Buffer.from((credential as any).response.clientDataJSON),\n                  authenticatorData: Buffer.from((credential as any).response.authenticatorData),\n                },\n              },\n              { timeout: RECOVER_IDENTITY_RPC_TIMEOUT },\n            ),\n          );\n        }),\n      }),\n\n      //\n      // RedeemToken\n      //\n      OperationResolver.make({\n        operation: ClientOperation.RedeemToken,\n        handler: Effect.fnUntraced(function* (data) {\n          const client = yield* Capability.get(ClientCapabilities.Client);\n          invariant(client.services.services.IdentityService, 'IdentityService not available');\n          yield* Effect.promise(() =>\n            client.services.services.IdentityService!.recoverIdentity(\n              { token: data.token },\n              { timeout: RECOVER_IDENTITY_RPC_TIMEOUT },\n            ),\n          );\n        }),\n      }),\n    ]);\n  }),\n);\n"],
+  "mappings": "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",
+  "names": ["Effect", "Capabilities", "Capability", "LayoutOperation", "PublicKey", "runAndForwardErrors", "invariant", "OperationResolver", "Operation", "ObservabilityOperation", "RECOVER_IDENTITY_RPC_TIMEOUT", "Capability", "makeModule", "fnUntraced", "props", "appName", "contributes", "Capabilities", "OperationResolver", "make", "operation", "ClientOperation", "CreateIdentity", "handler", "profile", "manager", "get", "PluginManager", "client", "ClientCapabilities", "Client", "data", "promise", "halo", "createIdentity", "runAndForwardErrors", "activate", "ClientEvents", "IdentityCreated", "Operation", "schedule", "ObservabilityOperation", "SendEvent", "name", "JoinIdentity", "invoke", "LayoutOperation", "UpdateDialog", "subject", "JOIN_DIALOG", "blockAlign", "initialInvitationCode", "invitationCode", "initialDisposition", "ShareIdentity", "SwitchWorkspace", "Account", "id", "Open", "Profile", "RecoverIdentity", "ResetStorage", "RESET_DIALOG", "mode", "CreateAgent", "invariant", "services", "EdgeAgentService", "createAgent", "undefined", "timeout", "CreateRecoveryCode", "IdentityService", "recoveryCode", "createRecoveryCredential", "RECOVERY_CODE_DIALOG", "type", "code", "CreatePasskey", "identity", "lookupKey", "PublicKey", "random", "credential", "navigator", "credentials", "create", "publicKey", "challenge", "Uint8Array", "rp", "location", "hostname", "user", "asUint8Array", "did", "displayName", "pubKeyCredParams", "alg", "authenticatorSelection", "residentKey", "requireResidentKey", "recoveryKey", "from", "response", "getPublicKey", "algorithm", "getPublicKeyAlgorithm", "RedeemPasskey", "deviceKey", "controlFeedKey", "requestRecoveryChallenge", "Buffer", "rpId", "userVerification", "userHandle", "recoverIdentity", "external", "signature", "clientDataJson", "clientDataJSON", "authenticatorData", "RedeemToken", "token"]
+}

package/dist/lib/node-esm/{react-context-UVXMGPW4.mjs → react-context-7Z2TVUTV.mjs}

@@ -7,10 +7,10 @@ import {
 // src/capabilities/react-context/react-context.tsx
 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";
-var react_context_default = Capability.makeModule(() => Effect.succeed(Capability.contributes(Common.Capability.ReactContext, {
+var react_context_default = Capability.makeModule(() => Effect.succeed(Capability.contributes(Capabilities.ReactContext, {
   id: meta.id,
   context: ({ children }) => {
     const client = useCapability(ClientCapabilities.Client);
@@ -22,4 +22,4 @@ var react_context_default = Capability.makeModule(() => Effect.succeed(Capabilit
 export {
   react_context_default as default
 };
-//# sourceMappingURL=react-context-UVXMGPW4.mjs.map
+//# sourceMappingURL=react-context-7Z2TVUTV.mjs.map

package/dist/lib/node-esm/react-context-7Z2TVUTV.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/capabilities/react-context/react-context.tsx"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\nimport React from 'react';\n\nimport { Capabilities, Capability } from '@dxos/app-framework';\nimport { useCapability } from '@dxos/app-framework/ui';\nimport { ClientProvider } from '@dxos/react-client';\n\nimport { meta } from '../../meta';\nimport { ClientCapabilities } from '../../types';\n\nexport default Capability.makeModule(() =>\n  Effect.succeed(\n    Capability.contributes(Capabilities.ReactContext, {\n      id: meta.id,\n      context: ({ children }: { children?: React.ReactNode }) => {\n        const client = useCapability(ClientCapabilities.Client);\n        return <ClientProvider client={client}>{children}</ClientProvider>;\n      },\n    }),\n  ),\n);\n"],
+  "mappings": ";;;;;;;AAIA,YAAYA,YAAY;AACxB,OAAOC,WAAW;AAElB,SAASC,cAAcC,kBAAkB;AACzC,SAASC,qBAAqB;AAC9B,SAASC,sBAAsB;AAK/B,IAAA,wBAAeC,WAAWC,WAAW,MAC5BC,eACLF,WAAWG,YAAYC,aAAaC,cAAc;EAChDC,IAAIC,KAAKD;EACTE,SAAS,CAAC,EAAEC,SAAQ,MAAkC;AACpD,UAAMC,SAASC,cAAcC,mBAAmBC,MAAM;AACtD,WAAO,sBAAA,cAACC,gBAAAA;MAAeJ;OAAiBD,QAAAA;EAC1C;AACF,CAAA,CAAA,CAAA;",
+  "names": ["Effect", "React", "Capabilities", "Capability", "useCapability", "ClientProvider", "Capability", "makeModule", "succeed", "contributes", "Capabilities", "ReactContext", "id", "meta", "context", "children", "client", "useCapability", "ClientCapabilities", "Client", "ClientProvider"]
+}

package/dist/lib/node-esm/{react-surface-KBHANGGC.mjs → react-surface-BHJMHIMH.mjs}

@@ -13,21 +13,21 @@ import {
 // src/capabilities/react-surface/react-surface.tsx
 import * as Effect2 from "effect/Effect";
 import React7 from "react";
-import { Capability as Capability2, Common as Common3 } from "@dxos/app-framework";
+import { Capabilities, Capability as Capability2 } from "@dxos/app-framework";
+import { Surface } from "@dxos/app-framework/ui";
 
 // src/components/DevicesContainer.tsx
 import React, { useCallback, useEffect, useState } from "react";
 import { QR } from "react-qr-rounded";
-import { useOperationInvoker } from "@dxos/app-framework/react";
+import { useOperationInvoker } from "@dxos/app-framework/ui";
 import { log } from "@dxos/log";
 import { useClient, useMulticastObservable } from "@dxos/react-client";
 import { useDevices } from "@dxos/react-client/halo";
 import { Invitation, InvitationEncoder } from "@dxos/react-client/invitations";
 import { useNetworkStatus } from "@dxos/react-client/mesh";
 import { Button, Clipboard, Icon, IconButton, List, useId, useTranslation } from "@dxos/react-ui";
-import { ControlFrame, ControlFrameItem, ControlGroup, ControlItem, ControlPage, ControlSection } from "@dxos/react-ui-form";
-import { translationKey } from "@dxos/shell/react";
-import { AuthCode, Centered, DeviceListItem, Emoji, Viewport } from "@dxos/shell/react";
+import { Settings } from "@dxos/react-ui-form";
+import { AuthCode, Centered, DeviceListItem, Emoji, Viewport, translationKey } from "@dxos/shell/react";
 import { osTranslations } from "@dxos/ui-theme";
 import { hexToEmoji } from "@dxos/util";
 var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-client/src/components/DevicesContainer.tsx";
@@ -49,35 +49,33 @@ var DevicesContainer = ({ createInvitationUrl }) => {
   }), [
     invokePromise
   ]);
-  return /* @__PURE__ */ React.createElement(Clipboard.Provider, null, /* @__PURE__ */ React.createElement(ControlPage, null, /* @__PURE__ */ React.createElement(ControlSection, {
+  return /* @__PURE__ */ React.createElement(Clipboard.Provider, null, /* @__PURE__ */ React.createElement(Settings.Root, null, /* @__PURE__ */ React.createElement(Settings.Section, {
     title: t("devices verbose label", {
       ns: meta.id
     }),
     description: t("devices description", {
       ns: meta.id
     })
-  }, /* @__PURE__ */ React.createElement(ControlFrame, null, /* @__PURE__ */ React.createElement(ControlFrameItem, {
+  }, /* @__PURE__ */ React.createElement(Settings.Frame, null, /* @__PURE__ */ React.createElement(Settings.FrameItem, {
     title: t("devices label", {
       ns: meta.id
     })
-  }, /* @__PURE__ */ React.createElement(List, null, devices.map((device) => {
-    return /* @__PURE__ */ React.createElement(DeviceListItem, {
-      key: device.deviceKey.toHex(),
-      device,
-      connectionState
-    });
-  }))), createInvitationUrl && /* @__PURE__ */ React.createElement(ControlFrameItem, {
+  }, /* @__PURE__ */ React.createElement(List, null, devices.map((device) => /* @__PURE__ */ React.createElement(DeviceListItem, {
+    key: device.deviceKey.toHex(),
+    device,
+    connectionState
+  })))), createInvitationUrl && /* @__PURE__ */ React.createElement(Settings.FrameItem, {
     title: "Add device"
   }, /* @__PURE__ */ React.createElement(DeviceInvitation, {
     createInvitationUrl
-  })))), /* @__PURE__ */ React.createElement(ControlSection, {
+  })))), /* @__PURE__ */ React.createElement(Settings.Section, {
     title: t("danger zone title", {
       ns: meta.id
     }),
     description: t("danger zone description", {
       ns: meta.id
     })
-  }, /* @__PURE__ */ React.createElement(ControlGroup, null, /* @__PURE__ */ React.createElement(ControlItem, {
+  }, /* @__PURE__ */ React.createElement(Settings.Group, null, /* @__PURE__ */ React.createElement(Settings.Item, {
     title: t("reset device label"),
     description: t("reset device description", {
       ns: meta.id
@@ -86,7 +84,7 @@ var DevicesContainer = ({ createInvitationUrl }) => {
     variant: "destructive",
     onClick: handleResetStorage,
     "data-testid": "devicesContainer.reset"
-  }, t("reset device label"))), /* @__PURE__ */ React.createElement(ControlItem, {
+  }, t("reset device label"))), /* @__PURE__ */ React.createElement(Settings.Item, {
     title: t("recover identity label"),
     description: t("recover identity description", {
       ns: meta.id
@@ -95,7 +93,7 @@ var DevicesContainer = ({ createInvitationUrl }) => {
     variant: "destructive",
     onClick: handleRecover,
     "data-testid": "devicesContainer.recover"
-  }, t("recover identity label"))), /* @__PURE__ */ React.createElement(ControlItem, {
+  }, t("recover identity label"))), /* @__PURE__ */ React.createElement(Settings.Item, {
     title: t("join new identity label"),
     description: t("join new identity description", {
       ns: meta.id
@@ -120,7 +118,7 @@ var DeviceInvitation = (props) => {
             authCode: invitation3.authCode
           }), void 0, {
             F: __dxlog_file,
-            L: 127,
+            L: 117,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -273,8 +271,8 @@ var InvitationComplete = ({ statusValue }) => {
 
 // src/components/JoinDialog.tsx
 import React2, { useCallback as useCallback2 } from "react";
-import { Common } from "@dxos/app-framework";
-import { useOperationInvoker as useOperationInvoker2 } from "@dxos/app-framework/react";
+import { useOperationInvoker as useOperationInvoker2 } from "@dxos/app-framework/ui";
+import { LayoutOperation } from "@dxos/app-toolkit";
 import { ObservabilityOperation } from "@dxos/plugin-observability/types";
 import { Dialog, useTranslation as useTranslation2 } from "@dxos/react-ui";
 import { JoinPanel } from "@dxos/shell/react";
@@ -288,7 +286,7 @@ var JoinDialog = (props) => {
   const handleDone = useCallback2(async (result) => {
     if (result?.identityKey) {
       await Promise.all([
-        invokePromise(Common.LayoutOperation.UpdateDialog, {
+        invokePromise(LayoutOperation.UpdateDialog, {
           state: false
         }),
         invokePromise(ObservabilityOperation.SendEvent, {
@@ -324,7 +322,7 @@ import { debounce } from "@dxos/async";
 import { useClient as useClient2 } from "@dxos/react-client";
 import { useIdentity } from "@dxos/react-client/halo";
 import { ButtonGroup, Clipboard as Clipboard2, Input, useTranslation as useTranslation3 } from "@dxos/react-ui";
-import { ControlItem as ControlItem2, ControlItemInput, ControlPage as ControlPage2, ControlSection as ControlSection2, Form } from "@dxos/react-ui-form";
+import { Form, Settings as Settings2 } from "@dxos/react-ui-form";
 import { EmojiPickerBlock, HuePicker } from "@dxos/react-ui-pickers";
 import { hexToEmoji as hexToEmoji2, hexToHue } from "@dxos/util";
 var UserProfile = Schema.Struct({
@@ -398,7 +396,7 @@ var ProfileContainer = () => {
         onValueChange,
         type
       ]);
-      return /* @__PURE__ */ React3.createElement(ControlItemInput, {
+      return /* @__PURE__ */ React3.createElement(Settings2.ItemInput, {
         title: label,
         description: t("display name description")
       }, /* @__PURE__ */ React3.createElement(Input.TextInput, {
@@ -417,7 +415,7 @@ var ProfileContainer = () => {
         onValueChange,
         type
       ]);
-      return /* @__PURE__ */ React3.createElement(ControlItem2, {
+      return /* @__PURE__ */ React3.createElement(Settings2.Item, {
         title: label,
         description: t("icon description")
       }, /* @__PURE__ */ React3.createElement(EmojiPickerBlock, {
@@ -437,7 +435,7 @@ var ProfileContainer = () => {
         onValueChange,
         type
       ]);
-      return /* @__PURE__ */ React3.createElement(ControlItem2, {
+      return /* @__PURE__ */ React3.createElement(Settings2.Item, {
         title: label,
         description: t("hue description")
       }, /* @__PURE__ */ React3.createElement("div", {
@@ -451,10 +449,12 @@ var ProfileContainer = () => {
     },
     // TODO(wittjosiah): We need text input annotations for disabled and copyable.
     did: ({ label, getValue }) => {
-      return /* @__PURE__ */ React3.createElement(ControlItemInput, {
+      return /* @__PURE__ */ React3.createElement(Settings2.ItemInput, {
         title: label,
         description: t("did description")
-      }, /* @__PURE__ */ React3.createElement(ButtonGroup, null, /* @__PURE__ */ React3.createElement(Input.TextInput, {
+      }, /* @__PURE__ */ React3.createElement(ButtonGroup, {
+        classNames: "is-full"
+      }, /* @__PURE__ */ React3.createElement(Input.TextInput, {
         value: getValue(),
         disabled: true,
         classNames: "min-is-64"
@@ -465,7 +465,7 @@ var ProfileContainer = () => {
   }), [
     t
   ]);
-  return /* @__PURE__ */ React3.createElement(ControlPage2, null, /* @__PURE__ */ React3.createElement(Clipboard2.Provider, null, /* @__PURE__ */ React3.createElement(ControlSection2, {
+  return /* @__PURE__ */ React3.createElement(Clipboard2.Provider, null, /* @__PURE__ */ React3.createElement(Settings2.Root, null, /* @__PURE__ */ React3.createElement(Settings2.Section, {
     title: t("profile label"),
     description: t("profile description")
   }, /* @__PURE__ */ React3.createElement(Form.Root, {
@@ -474,7 +474,7 @@ var ProfileContainer = () => {
     fieldMap,
     onValuesChanged: handleChange
   }, /* @__PURE__ */ React3.createElement(Form.Content, null, /* @__PURE__ */ React3.createElement(Form.FieldSet, {
-    classNames: "container-max-width grid grid-cols-1 md:grid-cols-[1fr_min-content]"
+    classNames: "space-y-trimMd"
   }))))));
 };
 
@@ -530,20 +530,20 @@ var Code = ({ code }) => {
 
 // src/components/RecoveryCredentialsContainer.tsx
 import React5 from "react";
-import { useOperationInvoker as useOperationInvoker3 } from "@dxos/app-framework/react";
+import { useOperationInvoker as useOperationInvoker3 } from "@dxos/app-framework/ui";
 import { useCredentials } from "@dxos/react-client/halo";
 import { Icon as Icon2, IconButton as IconButton2, List as List2, ListItem, Message, useTranslation as useTranslation5 } from "@dxos/react-ui";
-import { ControlGroup as ControlGroup2, ControlItem as ControlItem3, ControlPage as ControlPage3, ControlSection as ControlSection3 } from "@dxos/react-ui-form";
+import { Settings as Settings3 } from "@dxos/react-ui-form";
 var MANAGE_CREDENTIALS_DIALOG = `${meta.id}/ManageCredentialsDialog`;
 var RecoveryCredentialsContainer = () => {
   const { t } = useTranslation5(meta.id);
   const { invokePromise } = useOperationInvoker3();
   const credentials = useCredentials();
   const recoveryCredentials = credentials.filter((credential) => credential.subject.assertion["@type"] === "dxos.halo.credentials.IdentityRecovery");
-  return /* @__PURE__ */ React5.createElement(ControlPage3, null, /* @__PURE__ */ React5.createElement(ControlSection3, {
+  return /* @__PURE__ */ React5.createElement(Settings3.Root, null, /* @__PURE__ */ React5.createElement(Settings3.Section, {
     title: t("recovery setup dialog title"),
     description: t("recovery setup dialog description")
-  }, /* @__PURE__ */ React5.createElement(ControlGroup2, null, /* @__PURE__ */ React5.createElement(ControlItem3, {
+  }, /* @__PURE__ */ React5.createElement(Settings3.Group, null, /* @__PURE__ */ React5.createElement(Settings3.Item, {
     title: t("create passkey label"),
     description: t("create passkey description")
   }, /* @__PURE__ */ React5.createElement(IconButton2, {
@@ -551,7 +551,7 @@ var RecoveryCredentialsContainer = () => {
     icon: "ph--key--duotone",
     variant: "primary",
     onClick: () => invokePromise(ClientOperation.CreatePasskey)
-  })), /* @__PURE__ */ React5.createElement(ControlItem3, {
+  })), /* @__PURE__ */ React5.createElement(Settings3.Item, {
     title: t("create recovery code label"),
     description: t("create recovery code description")
   }, /* @__PURE__ */ React5.createElement(IconButton2, {
@@ -559,7 +559,7 @@ var RecoveryCredentialsContainer = () => {
     icon: "ph--receipt--duotone",
     variant: "default",
     onClick: () => invokePromise(ClientOperation.CreateRecoveryCode)
-  })))), /* @__PURE__ */ React5.createElement(ControlSection3, {
+  })))), /* @__PURE__ */ React5.createElement(Settings3.Section, {
     title: t("credentials list label")
   }, recoveryCredentials.length < 1 ? /* @__PURE__ */ React5.createElement(Message.Root, {
     valence: "error",
@@ -578,8 +578,9 @@ var RecoveryCredentialsContainer = () => {
 // src/components/ResetDialog.tsx
 import * as Effect from "effect/Effect";
 import React6, { useCallback as useCallback5 } from "react";
-import { Capability, Common as Common2 } from "@dxos/app-framework";
-import { useOperationInvoker as useOperationInvoker4 } from "@dxos/app-framework/react";
+import { Capability } from "@dxos/app-framework";
+import { useOperationInvoker as useOperationInvoker4 } from "@dxos/app-framework/ui";
+import { LayoutOperation as LayoutOperation2 } from "@dxos/app-toolkit";
 import { runAndForwardErrors } from "@dxos/effect";
 import { useClient as useClient3 } from "@dxos/react-client";
 import { Dialog as Dialog2, useTranslation as useTranslation6 } from "@dxos/react-ui";
@@ -603,13 +604,13 @@ var ResetDialog = ({ mode, onReset, capabilityManager }) => {
     capabilityManager
   ]);
   const handleCancel = useCallback5(() => {
-    void invokePromise(Common2.LayoutOperation.UpdateDialog, {
+    void invokePromise(LayoutOperation2.UpdateDialog, {
       state: false
     });
   }, [
     invokePromise
   ]);
-  return /* @__PURE__ */ React6.createElement(Dialog2.Content, null, /* @__PURE__ */ React6.createElement(Dialog2.Title, {
+  return /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Dialog2.Content, null, /* @__PURE__ */ React6.createElement(Dialog2.Title, {
     classNames: "sr-only"
   }, t("reset dialog title")), /* @__PURE__ */ React6.createElement(Dialog2.Description, {
     classNames: "sr-only"
@@ -618,21 +619,21 @@ var ResetDialog = ({ mode, onReset, capabilityManager }) => {
     mode,
     onConfirm: handleReset,
     onCancel: handleCancel
-  }));
+  })));
 };
 
 // src/capabilities/react-surface/react-surface.tsx
 var react_surface_default = Capability2.makeModule(Effect2.fnUntraced(function* (props) {
   const { createInvitationUrl, onReset } = props;
   const capabilityManager = yield* Capability2.Service;
-  return Capability2.contributes(Common3.Capability.ReactSurface, [
-    Common3.createSurface({
+  return Capability2.contributes(Capabilities.ReactSurface, [
+    Surface.create({
       id: Account.Profile,
       role: "article",
       filter: (data) => data.subject === Account.Profile,
       component: () => /* @__PURE__ */ React7.createElement(ProfileContainer, null)
     }),
-    Common3.createSurface({
+    Surface.create({
       id: Account.Devices,
       role: "article",
       filter: (data) => data.subject === Account.Devices,
@@ -640,25 +641,25 @@ var react_surface_default = Capability2.makeModule(Effect2.fnUntraced(function*
         createInvitationUrl
       })
     }),
-    Common3.createSurface({
+    Surface.create({
       id: Account.Security,
       role: "article",
       filter: (data) => data.subject === Account.Security,
       component: () => /* @__PURE__ */ React7.createElement(RecoveryCredentialsContainer, null)
     }),
-    Common3.createSurface({
+    Surface.create({
       id: JOIN_DIALOG,
       role: "dialog",
       filter: (data) => data.component === JOIN_DIALOG,
       component: ({ data }) => /* @__PURE__ */ React7.createElement(JoinDialog, data.props)
     }),
-    Common3.createSurface({
+    Surface.create({
       id: RECOVERY_CODE_DIALOG,
       role: "dialog",
       filter: (data) => data.component === RECOVERY_CODE_DIALOG,
       component: ({ data }) => /* @__PURE__ */ React7.createElement(RecoveryCodeDialog, data.props)
     }),
-    Common3.createSurface({
+    Surface.create({
       id: RESET_DIALOG,
       role: "dialog",
       filter: (data) => data.component === RESET_DIALOG,
@@ -673,4 +674,4 @@ var react_surface_default = Capability2.makeModule(Effect2.fnUntraced(function*
 export {
   react_surface_default as default
 };
-//# sourceMappingURL=react-surface-KBHANGGC.mjs.map
+//# sourceMappingURL=react-surface-BHJMHIMH.mjs.map