@dxos/plugin-space 0.8.2-staging.7ac8446 → 0.8.2

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

@@ -2,19 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, createIntent, type PluginsContext } from '@dxos/app-framework';
+import { Capabilities, contributes, createIntent, type PluginContext } from '@dxos/app-framework';
 import { isSpace } from '@dxos/client/echo';
-import { create } from '@dxos/live-object';
+import { live } from '@dxos/live-object';
 
 import { SPACE_PLUGIN } from '../meta';
 import translations from '../translations';
-import { CollectionType, SpaceAction } from '../types';
-import { SPACES, SPACE_TYPE } from '../util';
+import { CollectionType, SpaceAction, SPACE_TYPE } from '../types';
+import { SPACES } from '../util';
 
 // https://stackoverflow.com/a/19016910
 const DIRECTORY_TYPE = 'text/directory';
 
-export default (context: PluginsContext) =>
+export default (context: PluginContext) =>
   contributes(Capabilities.AppGraphSerializer, [
     {
       inputType: SPACES,
@@ -37,7 +37,7 @@ export default (context: PluginsContext) =>
         type: DIRECTORY_TYPE,
       }),
       deserialize: async (data) => {
-        const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
+        const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
         const result = await dispatch(createIntent(SpaceAction.Create, { name: data.name, edgeReplication: true }));
         return result.data?.space;
       },
@@ -59,11 +59,11 @@ export default (context: PluginsContext) =>
           return;
         }
 
-        const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
+        const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
         const result = await dispatch(
           createIntent(SpaceAction.AddObject, {
             target: collection,
-            object: create(CollectionType, { name: data.name, objects: [], views: {} }),
+            object: live(CollectionType, { name: data.name, objects: [], views: {} }),
           }),
         );
 

package/src/capabilities/capabilities.ts

@@ -17,12 +17,3 @@ export namespace SpaceCapabilities {
 
   export const ObjectForm = defineCapability<ObjectForm<any>>(`${SPACE_PLUGIN}/capability/object-form`);
 }
-
-// TODO(wittjosiah): Factor out.
-export namespace ThreadCapabilities {
-  type ThreadCapability<T = any> = {
-    predicate: (obj: any) => obj is T;
-    createSort: (obj: T) => (anchorA: string | undefined, anchorB: string | undefined) => number;
-  };
-  export const Thread = defineCapability<ThreadCapability>(`${SPACE_PLUGIN}/capability/thread`);
-}

package/src/capabilities/identity-created.ts

@@ -2,22 +2,22 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, type PluginsContext, Capabilities } from '@dxos/app-framework';
-import { create, makeRef } from '@dxos/live-object';
+import { contributes, type PluginContext, Capabilities } from '@dxos/app-framework';
+import { live, makeRef } from '@dxos/live-object';
 import { Migrations } from '@dxos/migrations';
 import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { CollectionType } from '../types';
 
-export default async (context: PluginsContext) => {
-  const client = context.requestCapability(ClientCapabilities.Client);
+export default async (context: PluginContext) => {
+  const client = context.getCapability(ClientCapabilities.Client);
   await client.spaces.waitUntilReady();
 
   const defaultSpace = client.spaces.default;
   await defaultSpace.waitUntilReady();
 
   // Create root collection structure.
-  defaultSpace.properties[CollectionType.typename] = makeRef(create(CollectionType, { objects: [], views: {} }));
+  defaultSpace.properties[CollectionType.typename] = makeRef(live(CollectionType, { objects: [], views: {} }));
   if (Migrations.versionProperty) {
     defaultSpace.properties[Migrations.versionProperty] = Migrations.targetVersion;
   }

package/src/capabilities/index.ts

@@ -10,8 +10,8 @@ export const IdentityCreated = lazy(() => import('./identity-created'));
 export const IntentResolver = lazy(() => import('./intent-resolver'));
 export const ReactRoot = lazy(() => import('./react-root'));
 export const ReactSurface = lazy(() => import('./react-surface'));
-export const Schema = lazy(() => import('./schema'));
-export const Tools = lazy(() => import('./schema-tools'));
+export const SchemaDefs = lazy(() => import('./schema-defs'));
+export const SchemaTools = lazy(() => import('./schema-tools'));
 export const SpaceSettings = lazy(() => import('./settings'));
 export const SpaceState = lazy(() => import('./state'));
 export const SpacesReady = lazy(() => import('./spaces-ready'));

package/src/capabilities/intent-resolver.ts

@@ -2,26 +2,26 @@
 // Copyright 2025 DXOS.org
 //
 
-import { pipe } from 'effect';
+import { Effect } from 'effect';
 
 import {
   Capabilities,
-  chain,
   contributes,
   createIntent,
   createResolver,
   LayoutAction,
-  type PluginsContext,
+  type PluginContext,
 } from '@dxos/app-framework';
-import { type Expando, getTypename, type HasId } from '@dxos/echo-schema';
+import { type Expando, getTypename, type HasId, RelationSourceId, RelationTargetId } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
-import { create, makeRef, type ReactiveObject } from '@dxos/live-object';
+import { live, makeRef, type Live } from '@dxos/live-object';
 import { Migrations } from '@dxos/migrations';
 import { ClientCapabilities } from '@dxos/plugin-client';
-import { ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
-import { isSpace, getSpace, SpaceState, type Space, fullyQualifiedId, isEchoObject } from '@dxos/react-client/echo';
+import { isSpace, getSpace, SpaceState, fullyQualifiedId, isEchoObject } from '@dxos/react-client/echo';
+import { Invitation, InvitationEncoder } from '@dxos/react-client/invitations';
+import { ATTENDABLE_PATH_SEPARATOR } from '@dxos/react-ui-attention';
 
 import { SpaceCapabilities } from './capabilities';
 import {
@@ -32,7 +32,6 @@ import {
   CREATE_OBJECT_DIALOG,
   type CreateObjectDialogProps,
   POPOVER_RENAME_OBJECT,
-  POPOVER_ADD_SPACE,
 } from '../components';
 import { SPACE_PLUGIN } from '../meta';
 import { CollectionAction, CollectionType, SpaceAction } from '../types';
@@ -42,13 +41,14 @@ import { cloneObject, COMPOSER_SPACE_LOCK, getNestedObjects } from '../util';
 const SPACE_MAX_OBJECTS = 500;
 
 type IntentResolverOptions = {
-  context: PluginsContext;
+  context: PluginContext;
+  createInvitationUrl: (invitationCode: string) => string;
   observability?: boolean;
 };
 
-export default ({ context, observability }: IntentResolverOptions) => {
+export default ({ context, observability, createInvitationUrl }: IntentResolverOptions) => {
   const resolve = (typename: string) =>
-    context.requestCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
+    context.getCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
 
   return contributes(Capabilities.IntentResolver, [
     createResolver({
@@ -67,14 +67,14 @@ export default ({ context, observability }: IntentResolverOptions) => {
     }),
     createResolver({
       intent: SpaceAction.Create,
-      resolve: async ({ name, edgeReplication }) => {
-        const client = context.requestCapability(ClientCapabilities.Client);
-        const space = await client.spaces.create({ name });
+      resolve: async ({ name, hue, icon, edgeReplication }) => {
+        const client = context.getCapability(ClientCapabilities.Client);
+        const space = await client.spaces.create({ name, hue, icon });
         if (edgeReplication) {
           await space.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED);
         }
         await space.waitUntilReady();
-        const collection = create(CollectionType, { objects: [], views: {} });
+        const collection = live(CollectionType, { objects: [], views: {} });
         space.properties[CollectionType.typename] = makeRef(collection);
 
         if (Migrations.versionProperty) {
@@ -120,52 +120,74 @@ export default ({ context, observability }: IntentResolverOptions) => {
         ],
       }),
     }),
+    createResolver({
+      intent: SpaceAction.OpenMembers,
+      resolve: ({ space }) => ({
+        intents: [
+          createIntent(LayoutAction.Open, {
+            part: 'main',
+            subject: [`members-settings${ATTENDABLE_PATH_SEPARATOR}${space.id}`],
+            options: {
+              workspace: space.id,
+            },
+          }),
+        ],
+      }),
+    }),
     createResolver({
       intent: SpaceAction.Share,
-      filter: (data): data is { space: Space } => !data.space.properties[COMPOSER_SPACE_LOCK],
-      resolve: ({ space }) => {
-        const layout = context.requestCapability(Capabilities.Layout);
-        const id = `${space.id}${ATTENDABLE_PATH_SEPARATOR}members`;
-        if (layout.active.includes(id)) {
-          return {
-            intents: [
-              createIntent(LayoutAction.ScrollIntoView, {
-                part: 'current',
-                subject: id,
-              }),
-            ],
-          };
-        }
-
+      resolve: ({ space, type, authMethod, multiUse, target }) => {
+        const invitation = space.share({ type, authMethod, multiUse, target });
         return {
-          intents: [
-            pipe(
-              createIntent(LayoutAction.SwitchWorkspace, {
-                part: 'workspace',
-                subject: space.id,
-              }),
-              chain(LayoutAction.Open, {
-                part: 'main',
-                subject: [space.id],
-                options: {
-                  variant: 'members',
-                },
-              }),
-            ),
-            ...(observability
-              ? [
-                  createIntent(ObservabilityAction.SendEvent, {
-                    name: 'space.share',
-                    properties: {
-                      spaceId: space.id,
-                    },
-                  }),
-                ]
-              : []),
-          ],
+          data: invitation,
+          intents: observability
+            ? [
+                createIntent(ObservabilityAction.SendEvent, {
+                  name: 'space.share',
+                  properties: {
+                    spaceId: space.id,
+                  },
+                }),
+              ]
+            : [],
         };
       },
     }),
+    createResolver({
+      intent: SpaceAction.GetShareLink,
+      resolve: ({ space, target, copyToClipboard }) =>
+        Effect.gen(function* () {
+          const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+          const invitation = yield* dispatch(
+            createIntent(SpaceAction.Share, {
+              space,
+              type: Invitation.Type.DELEGATED,
+              authMethod: Invitation.AuthMethod.KNOWN_PUBLIC_KEY,
+              multiUse: true,
+              target,
+            }),
+          );
+
+          // TODO(wittjosiah): Better api to for this.
+          // NOTE: Delegated invitations are invalid until the connecting state when keys are filled in.
+          const invitationCode = yield* Effect.tryPromise(
+            () =>
+              new Promise<string>((resolve) => {
+                invitation.subscribe((invitation) => {
+                  if (invitation.state === Invitation.State.CONNECTING) {
+                    resolve(InvitationEncoder.encode(invitation));
+                  }
+                });
+              }),
+          );
+          const url = createInvitationUrl(invitationCode);
+          if (copyToClipboard) {
+            yield* Effect.tryPromise(() => navigator.clipboard.writeText(url));
+          }
+
+          return { data: url };
+        }),
+    }),
     createResolver({
       intent: SpaceAction.Lock,
       resolve: ({ space }) => {
@@ -223,57 +245,19 @@ export default ({ context, observability }: IntentResolverOptions) => {
         };
       },
     }),
-    createResolver({
-      intent: SpaceAction.AddSpace,
-      resolve: () => {
-        return {
-          intents: [
-            createIntent(LayoutAction.UpdatePopover, {
-              part: 'popover',
-              subject: POPOVER_ADD_SPACE,
-              options: {
-                anchorId: SpaceAction.AddSpace._tag,
-                side: 'right',
-              },
-            }),
-          ],
-        };
-      },
-    }),
     createResolver({
       intent: SpaceAction.OpenSettings,
-      resolve: ({ space }) => {
-        const layout = context.requestCapability(Capabilities.Layout);
-        const id = `${space.id}${ATTENDABLE_PATH_SEPARATOR}settings`;
-        if (layout.active.includes(id)) {
-          return {
-            intents: [
-              createIntent(LayoutAction.ScrollIntoView, {
-                part: 'current',
-                subject: id,
-              }),
-            ],
-          };
-        }
-
-        return {
-          intents: [
-            pipe(
-              createIntent(LayoutAction.SwitchWorkspace, {
-                part: 'workspace',
-                subject: space.id,
-              }),
-              chain(LayoutAction.Open, {
-                part: 'main',
-                subject: [space.id],
-                options: {
-                  variant: 'settings',
-                },
-              }),
-            ),
-          ],
-        };
-      },
+      resolve: ({ space }) => ({
+        intents: [
+          createIntent(LayoutAction.Open, {
+            part: 'main',
+            subject: [`properties-settings${ATTENDABLE_PATH_SEPARATOR}${space.id}`],
+            options: {
+              workspace: space.id,
+            },
+          }),
+        ],
+      }),
     }),
     createResolver({
       intent: SpaceAction.Open,
@@ -290,7 +274,7 @@ export default ({ context, observability }: IntentResolverOptions) => {
     createResolver({
       intent: SpaceAction.Migrate,
       resolve: async ({ space, version: targetVersion }) => {
-        const state = context.requestCapability(SpaceCapabilities.MutableState);
+        const state = context.getCapability(SpaceCapabilities.MutableState);
 
         if (space.state.get() === SpaceState.SPACE_REQUIRES_MIGRATION) {
           state.sdkMigrationRunning[space.id] = true;
@@ -321,7 +305,7 @@ export default ({ context, observability }: IntentResolverOptions) => {
     createResolver({
       intent: SpaceAction.OpenCreateObject,
       resolve: ({ target, navigable = true }) => {
-        const state = context.requestCapability(SpaceCapabilities.State);
+        const state = context.getCapability(SpaceCapabilities.State);
 
         return {
           intents: [
@@ -333,7 +317,7 @@ export default ({ context, observability }: IntentResolverOptions) => {
                 props: {
                   target,
                   shouldNavigate: navigable
-                    ? (object: ReactiveObject<any>) => !(object instanceof CollectionType) || state.navigableCollections
+                    ? (object: Live<any>) => !(object instanceof CollectionType) || state.navigableCollections
                     : () => false,
                 } satisfies Partial<CreateObjectDialogProps>,
               },
@@ -390,7 +374,7 @@ export default ({ context, observability }: IntentResolverOptions) => {
             collection.objects.push(makeRef(object as HasId));
           } else {
             // TODO(wittjosiah): Can't add non-echo objects by including in a collection because of types.
-            const collection = create(CollectionType, { objects: [makeRef(object as HasId)], views: {} });
+            const collection = live(CollectionType, { objects: [makeRef(object as HasId)], views: {} });
             space.properties[CollectionType.typename] = makeRef(collection);
           }
         }
@@ -418,10 +402,22 @@ export default ({ context, observability }: IntentResolverOptions) => {
         };
       },
     }),
+    createResolver({
+      intent: SpaceAction.AddRelation,
+      resolve: ({ space, schema, source, target, fields }) => {
+        const relation = live(schema, { [RelationSourceId]: source, [RelationTargetId]: target, ...fields });
+        space.db.add(relation);
+        return {
+          data: {
+            relation,
+          },
+        };
+      },
+    }),
     createResolver({
       intent: SpaceAction.RemoveObjects,
       resolve: async ({ objects, target, deletionData }, undo) => {
-        const layout = context.requestCapability(Capabilities.Layout);
+        const layout = context.getCapability(Capabilities.Layout);
 
         // All objects must be a member of the same space.
         const space = getSpace(objects[0]);
@@ -550,14 +546,14 @@ export default ({ context, observability }: IntentResolverOptions) => {
     createResolver({
       intent: SpaceAction.WaitForObject,
       resolve: async ({ id }) => {
-        const state = context.requestCapability(SpaceCapabilities.MutableState);
+        const state = context.getCapability(SpaceCapabilities.MutableState);
         state.awaiting = id;
       },
     }),
     createResolver({
       intent: CollectionAction.Create,
       resolve: async ({ name }) => ({
-        data: { object: create(CollectionType, { name, objects: [], views: {} }) },
+        data: { object: live(CollectionType, { name, objects: [], views: {} }) },
       }),
     }),
   ]);