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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.2-main.f11618f",
+  "version": "0.8.2-staging.7ac8446",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -41,43 +41,42 @@
     "react-drag-drop-files": "^2.3.8",
     "react-is": "~18.2.0",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/artifact": "0.8.2-main.f11618f",
-    "@dxos/app-framework": "0.8.2-main.f11618f",
-    "@dxos/async": "0.8.2-main.f11618f",
-    "@dxos/automerge": "0.8.2-main.f11618f",
-    "@dxos/context": "0.8.2-main.f11618f",
-    "@dxos/client": "0.8.2-main.f11618f",
-    "@dxos/display-name": "0.8.2-main.f11618f",
-    "@dxos/echo-schema": "0.8.2-main.f11618f",
-    "@dxos/effect": "0.8.2-main.f11618f",
-    "@dxos/echo-signals": "0.8.2-main.f11618f",
-    "@dxos/invariant": "0.8.2-main.f11618f",
-    "@dxos/keys": "0.8.2-main.f11618f",
-    "@dxos/live-object": "0.8.2-main.f11618f",
-    "@dxos/migrations": "0.8.2-main.f11618f",
-    "@dxos/log": "0.8.2-main.f11618f",
-    "@dxos/local-storage": "0.8.2-main.f11618f",
-    "@dxos/plugin-attention": "0.8.2-main.f11618f",
-    "@dxos/plugin-client": "0.8.2-main.f11618f",
-    "@dxos/plugin-graph": "0.8.2-main.f11618f",
-    "@dxos/plugin-status-bar": "0.8.2-main.f11618f",
-    "@dxos/plugin-deck": "0.8.2-main.f11618f",
-    "@dxos/protocols": "0.8.2-main.f11618f",
-    "@dxos/plugin-observability": "0.8.2-main.f11618f",
-    "@dxos/react-client": "0.8.2-main.f11618f",
-    "@dxos/react-ui-attention": "0.8.2-main.f11618f",
-    "@dxos/react-ui-editor": "0.8.2-main.f11618f",
-    "@dxos/react-ui-pickers": "0.8.2-main.f11618f",
-    "@dxos/react-ui-searchlist": "0.8.2-main.f11618f",
-    "@dxos/react-ui-stack": "0.8.2-main.f11618f",
-    "@dxos/react-ui-list": "0.8.2-main.f11618f",
-    "@dxos/react-ui-tabs": "0.8.2-main.f11618f",
-    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.f11618f",
-    "@dxos/react-ui-form": "0.8.2-main.f11618f",
-    "@dxos/schema": "0.8.2-main.f11618f",
-    "@dxos/shell": "0.8.2-main.f11618f",
-    "@dxos/react-ui-theme": "0.8.2-main.f11618f",
-    "@dxos/util": "0.8.2-main.f11618f"
+    "@dxos/app-framework": "0.8.2-staging.7ac8446",
+    "@dxos/async": "0.8.2-staging.7ac8446",
+    "@dxos/automerge": "0.8.2-staging.7ac8446",
+    "@dxos/client": "0.8.2-staging.7ac8446",
+    "@dxos/context": "0.8.2-staging.7ac8446",
+    "@dxos/display-name": "0.8.2-staging.7ac8446",
+    "@dxos/echo-signals": "0.8.2-staging.7ac8446",
+    "@dxos/echo-schema": "0.8.2-staging.7ac8446",
+    "@dxos/invariant": "0.8.2-staging.7ac8446",
+    "@dxos/live-object": "0.8.2-staging.7ac8446",
+    "@dxos/keys": "0.8.2-staging.7ac8446",
+    "@dxos/local-storage": "0.8.2-staging.7ac8446",
+    "@dxos/migrations": "0.8.2-staging.7ac8446",
+    "@dxos/log": "0.8.2-staging.7ac8446",
+    "@dxos/plugin-attention": "0.8.2-staging.7ac8446",
+    "@dxos/plugin-deck": "0.8.2-staging.7ac8446",
+    "@dxos/plugin-graph": "0.8.2-staging.7ac8446",
+    "@dxos/plugin-client": "0.8.2-staging.7ac8446",
+    "@dxos/artifact": "0.8.2-staging.7ac8446",
+    "@dxos/plugin-observability": "0.8.2-staging.7ac8446",
+    "@dxos/plugin-status-bar": "0.8.2-staging.7ac8446",
+    "@dxos/protocols": "0.8.2-staging.7ac8446",
+    "@dxos/react-client": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-attention": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-editor": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-form": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-list": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-searchlist": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-pickers": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-stack": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-tabs": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-syntax-highlighter": "0.8.2-staging.7ac8446",
+    "@dxos/schema": "0.8.2-staging.7ac8446",
+    "@dxos/shell": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-theme": "0.8.2-staging.7ac8446",
+    "@dxos/util": "0.8.2-staging.7ac8446"
   },
   "devDependencies": {
     "@babel/core": "^7.18.13",
@@ -88,17 +87,17 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.8.2-main.f11618f",
-    "@dxos/react-ui": "0.8.2-main.f11618f",
-    "@dxos/react-ui-theme": "0.8.2-main.f11618f",
-    "@dxos/storybook-utils": "0.8.2-main.f11618f"
+    "@dxos/random": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-theme": "0.8.2-staging.7ac8446",
+    "@dxos/storybook-utils": "0.8.2-staging.7ac8446"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.2-main.f11618f",
-    "@dxos/react-ui-theme": "0.8.2-main.f11618f"
+    "@dxos/react-ui": "0.8.2-staging.7ac8446",
+    "@dxos/react-ui-theme": "0.8.2-staging.7ac8446"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.tsx

@@ -33,7 +33,7 @@ import {
   SpaceState,
 } from './capabilities';
 import { SpaceEvents } from './events';
-import { meta } from './meta';
+import { meta, SPACE_PLUGIN } from './meta';
 import translations from './translations';
 import { CollectionAction, CollectionType, defineObjectForm } from './types';
 
@@ -57,7 +57,7 @@ export type SpacePluginOptions = {
 export const SpacePlugin = ({
   invitationUrl = window.location.origin,
   invitationParam = 'spaceInvitationCode',
-  observability = false,
+  observability = true,
 }: SpacePluginOptions = {}) => {
   const createInvitationUrl = (invitationCode: string) => {
     const baseUrl = new URL(invitationUrl);
@@ -112,6 +112,16 @@ export const SpacePlugin = ({
           }),
         ),
     }),
+    defineModule({
+      id: `${meta.id}/module/space-settings`,
+      activatesOn: SpaceEvents.SetupSettingsPanel,
+      activate: () =>
+        contributes(SpaceCapabilities.SettingsSection, {
+          id: 'properties',
+          label: ['space settings properties label', { ns: SPACE_PLUGIN }],
+          position: 'hoist',
+        }),
+    }),
     defineModule({
       id: `${meta.id}/module/schema`,
       activatesOn: ClientEvents.ClientReady,
@@ -133,7 +143,7 @@ export const SpacePlugin = ({
     defineModule({
       id: `${meta.id}/module/intent-resolver`,
       activatesOn: Events.SetupIntentResolver,
-      activate: (context) => IntentResolver({ context, createInvitationUrl, observability }),
+      activate: (context) => IntentResolver({ context, observability }),
     }),
     defineModule({
       id: `${meta.id}/module/app-graph-builder`,

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

@@ -9,12 +9,12 @@ import {
   FQ_ID_LENGTH,
   getSpace,
   isEchoObject,
+  isSpace,
   OBJECT_ID_LENGTH,
   type ReactiveEchoObject,
   SPACE_ID_LENGTH,
   SpaceState,
   type Space,
-  parseId,
 } from '@dxos/client/echo';
 import { isDeleted } from '@dxos/live-object';
 import { log } from '@dxos/log';
@@ -25,7 +25,7 @@ import { isNonNullable } from '@dxos/util';
 
 import { SpaceCapabilities } from './capabilities';
 import { SPACE_PLUGIN } from '../meta';
-import { CollectionType, SPACE_TYPE, SpaceAction, type SpaceSettingsProps } from '../types';
+import { CollectionType, SpaceAction, type SpaceSettingsProps } from '../types';
 import {
   constructObjectActions,
   constructSpaceActions,
@@ -98,45 +98,6 @@ export default (context: PluginsContext) => {
             position: 'fallback',
           },
         },
-        {
-          id: SpaceAction.OpenMembers._tag,
-          data: async () => {
-            const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-            const layout = context.requestCapability(Capabilities.Layout);
-            const client = context.requestCapability(ClientCapabilities.Client);
-            const { spaceId } = parseId(layout.workspace);
-            const space = (spaceId && client.spaces.get(spaceId)) ?? client.spaces.default;
-            await dispatch(createIntent(SpaceAction.OpenMembers, { space }));
-          },
-          properties: {
-            label: ['share space label', { ns: SPACE_PLUGIN }],
-            icon: 'ph--users--regular',
-            testId: 'spacePlugin.shareSpace',
-            keyBinding: {
-              macos: 'meta+.',
-              windows: 'alt+.',
-            },
-          },
-        },
-        {
-          id: SpaceAction.OpenSettings._tag,
-          data: async () => {
-            const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
-            const layout = context.requestCapability(Capabilities.Layout);
-            const client = context.requestCapability(ClientCapabilities.Client);
-            const { spaceId } = parseId(layout.workspace);
-            const space = (spaceId && client.spaces.get(spaceId)) ?? client.spaces.default;
-            await dispatch(createIntent(SpaceAction.OpenSettings, { space }));
-          },
-          properties: {
-            label: ['open current space settings label', { ns: SPACE_PLUGIN }],
-            icon: 'ph--faders--regular',
-            keyBinding: {
-              macos: 'meta+shift+,',
-              windows: 'ctrl+shift+,',
-            },
-          },
-        },
       ],
     }),
 
@@ -242,7 +203,7 @@ export default (context: PluginsContext) => {
     // Create space actions.
     createExtension({
       id: `${SPACE_PLUGIN}/actions`,
-      filter: (node): node is Node<Space> => node.type === SPACE_TYPE,
+      filter: (node): node is Node<Space> => isSpace(node.data),
       actions: ({ node }) => {
         const space = node.data;
         const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
@@ -260,7 +221,7 @@ export default (context: PluginsContext) => {
     // Create nodes for objects in the root collection of a space.
     createExtension({
       id: `${SPACE_PLUGIN}/root-collection`,
-      filter: (node): node is Node<Space> => node.type === SPACE_TYPE,
+      filter: (node): node is Node<Space> => isSpace(node.data),
       connector: ({ node }) => {
         const space = node.data;
         const spaceState = toSignal(
@@ -369,7 +330,7 @@ export default (context: PluginsContext) => {
             label: ['object settings label', { ns: SPACE_PLUGIN }],
             icon: 'ph--sliders--regular',
             disposition: 'hidden',
-            position: 'fallback',
+            position: 'hoist',
           },
         },
       ],

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

@@ -4,12 +4,12 @@
 
 import { Capabilities, contributes, createIntent, type PluginsContext } from '@dxos/app-framework';
 import { isSpace } from '@dxos/client/echo';
-import { live } from '@dxos/live-object';
+import { create } from '@dxos/live-object';
 
 import { SPACE_PLUGIN } from '../meta';
 import translations from '../translations';
-import { CollectionType, SpaceAction, SPACE_TYPE } from '../types';
-import { SPACES } from '../util';
+import { CollectionType, SpaceAction } from '../types';
+import { SPACES, SPACE_TYPE } from '../util';
 
 // https://stackoverflow.com/a/19016910
 const DIRECTORY_TYPE = 'text/directory';
@@ -63,7 +63,7 @@ export default (context: PluginsContext) =>
         const result = await dispatch(
           createIntent(SpaceAction.AddObject, {
             target: collection,
-            object: live(CollectionType, { name: data.name, objects: [], views: {} }),
+            object: create(CollectionType, { name: data.name, objects: [], views: {} }),
           }),
         );
 

package/src/capabilities/identity-created.ts

@@ -3,7 +3,7 @@
 //
 
 import { contributes, type PluginsContext, Capabilities } from '@dxos/app-framework';
-import { live, makeRef } from '@dxos/live-object';
+import { create, makeRef } from '@dxos/live-object';
 import { Migrations } from '@dxos/migrations';
 import { ClientCapabilities } from '@dxos/plugin-client';
 
@@ -17,7 +17,7 @@ export default async (context: PluginsContext) => {
   await defaultSpace.waitUntilReady();
 
   // Create root collection structure.
-  defaultSpace.properties[CollectionType.typename] = makeRef(live(CollectionType, { objects: [], views: {} }));
+  defaultSpace.properties[CollectionType.typename] = makeRef(create(CollectionType, { objects: [], views: {} }));
   if (Migrations.versionProperty) {
     defaultSpace.properties[Migrations.versionProperty] = Migrations.targetVersion;
   }

package/src/capabilities/intent-resolver.ts

@@ -2,10 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect } from 'effect';
+import { pipe } from 'effect';
 
 import {
   Capabilities,
+  chain,
   contributes,
   createIntent,
   createResolver,
@@ -14,14 +15,13 @@ import {
 } from '@dxos/app-framework';
 import { type Expando, getTypename, type HasId } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
-import { live, makeRef, type Live } from '@dxos/live-object';
+import { create, makeRef, type ReactiveObject } 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, 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 { isSpace, getSpace, SpaceState, type Space, fullyQualifiedId, isEchoObject } from '@dxos/react-client/echo';
 
 import { SpaceCapabilities } from './capabilities';
 import {
@@ -43,11 +43,10 @@ const SPACE_MAX_OBJECTS = 500;
 
 type IntentResolverOptions = {
   context: PluginsContext;
-  createInvitationUrl: (invitationCode: string) => string;
   observability?: boolean;
 };
 
-export default ({ context, observability, createInvitationUrl }: IntentResolverOptions) => {
+export default ({ context, observability }: IntentResolverOptions) => {
   const resolve = (typename: string) =>
     context.requestCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
 
@@ -68,14 +67,14 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     }),
     createResolver({
       intent: SpaceAction.Create,
-      resolve: async ({ name, hue, icon, edgeReplication }) => {
+      resolve: async ({ name, edgeReplication }) => {
         const client = context.requestCapability(ClientCapabilities.Client);
-        const space = await client.spaces.create({ name, hue, icon });
+        const space = await client.spaces.create({ name });
         if (edgeReplication) {
           await space.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED);
         }
         await space.waitUntilReady();
-        const collection = live(CollectionType, { objects: [], views: {} });
+        const collection = create(CollectionType, { objects: [], views: {} });
         space.properties[CollectionType.typename] = makeRef(collection);
 
         if (Migrations.versionProperty) {
@@ -121,74 +120,52 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
         ],
       }),
     }),
-    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,
-      resolve: ({ space, type, authMethod, multiUse, target }) => {
-        const invitation = space.share({ type, authMethod, multiUse, target });
+      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,
+              }),
+            ],
+          };
+        }
+
         return {
-          data: invitation,
-          intents: observability
-            ? [
-                createIntent(ObservabilityAction.SendEvent, {
-                  name: 'space.share',
-                  properties: {
-                    spaceId: space.id,
-                  },
-                }),
-              ]
-            : [],
+          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,
+                    },
+                  }),
+                ]
+              : []),
+          ],
         };
       },
     }),
-    createResolver({
-      intent: SpaceAction.GetShareLink,
-      resolve: ({ space, target, copyToClipboard }) =>
-        Effect.gen(function* () {
-          const { dispatch } = context.requestCapability(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 }) => {
@@ -255,7 +232,6 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
               part: 'popover',
               subject: POPOVER_ADD_SPACE,
               options: {
-                variant: 'react',
                 anchorId: SpaceAction.AddSpace._tag,
                 side: 'right',
               },
@@ -266,17 +242,38 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     }),
     createResolver({
       intent: SpaceAction.OpenSettings,
-      resolve: ({ space }) => ({
-        intents: [
-          createIntent(LayoutAction.Open, {
-            part: 'main',
-            subject: [`properties-settings${ATTENDABLE_PATH_SEPARATOR}${space.id}`],
-            options: {
-              workspace: space.id,
-            },
-          }),
-        ],
-      }),
+      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',
+                },
+              }),
+            ),
+          ],
+        };
+      },
     }),
     createResolver({
       intent: SpaceAction.Open,
@@ -336,7 +333,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
                 props: {
                   target,
                   shouldNavigate: navigable
-                    ? (object: Live<any>) => !(object instanceof CollectionType) || state.navigableCollections
+                    ? (object: ReactiveObject<any>) => !(object instanceof CollectionType) || state.navigableCollections
                     : () => false,
                 } satisfies Partial<CreateObjectDialogProps>,
               },
@@ -393,7 +390,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
             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 = live(CollectionType, { objects: [makeRef(object as HasId)], views: {} });
+            const collection = create(CollectionType, { objects: [makeRef(object as HasId)], views: {} });
             space.properties[CollectionType.typename] = makeRef(collection);
           }
         }
@@ -560,7 +557,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     createResolver({
       intent: CollectionAction.Create,
       resolve: async ({ name }) => ({
-        data: { object: live(CollectionType, { name, objects: [], views: {} }) },
+        data: { object: create(CollectionType, { name, objects: [], views: {} }) },
       }),
     }),
   ]);