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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.4-main.21d9917",
+  "version": "0.8.4-main.2244d791bb",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -45,88 +45,89 @@
   ],
   "dependencies": {
     "@automerge/automerge": "3.2.3",
-    "@effect-atom/atom": "^0.4.13",
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/cli": "0.72.1",
+    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/cli": "0.73.2",
     "jszip": "^3.10.1",
     "localforage": "^1.10.0",
     "react-drag-drop-files": "^2.3.8",
     "react-is": "~19.2.0",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/ai": "0.8.4-main.21d9917",
-    "@dxos/async": "0.8.4-main.21d9917",
-    "@dxos/blueprints": "0.8.4-main.21d9917",
-    "@dxos/cli-util": "0.8.4-main.21d9917",
-    "@dxos/app-framework": "0.8.4-main.21d9917",
-    "@dxos/client-protocol": "0.8.4-main.21d9917",
-    "@dxos/client": "0.8.4-main.21d9917",
-    "@dxos/display-name": "0.8.4-main.21d9917",
-    "@dxos/context": "0.8.4-main.21d9917",
-    "@dxos/echo-atom": "0.8.4-main.21d9917",
-    "@dxos/echo": "0.8.4-main.21d9917",
-    "@dxos/echo-protocol": "0.8.4-main.21d9917",
-    "@dxos/echo-db": "0.8.4-main.21d9917",
-    "@dxos/effect": "0.8.4-main.21d9917",
-    "@dxos/functions": "0.8.4-main.21d9917",
-    "@dxos/keys": "0.8.4-main.21d9917",
-    "@dxos/log": "0.8.4-main.21d9917",
-    "@dxos/migrations": "0.8.4-main.21d9917",
-    "@dxos/operation": "0.8.4-main.21d9917",
-    "@dxos/plugin-attention": "0.8.4-main.21d9917",
-    "@dxos/invariant": "0.8.4-main.21d9917",
-    "@dxos/plugin-deck": "0.8.4-main.21d9917",
-    "@dxos/plugin-client": "0.8.4-main.21d9917",
-    "@dxos/plugin-graph": "0.8.4-main.21d9917",
-    "@dxos/plugin-observability": "0.8.4-main.21d9917",
-    "@dxos/plugin-status-bar": "0.8.4-main.21d9917",
-    "@dxos/protocols": "0.8.4-main.21d9917",
-    "@dxos/react-client": "0.8.4-main.21d9917",
-    "@dxos/react-ui": "0.8.4-main.21d9917",
-    "@dxos/react-ui-components": "0.8.4-main.21d9917",
-    "@dxos/react-ui-editor": "0.8.4-main.21d9917",
-    "@dxos/react-ui-form": "0.8.4-main.21d9917",
-    "@dxos/react-ui-attention": "0.8.4-main.21d9917",
-    "@dxos/react-ui-list": "0.8.4-main.21d9917",
-    "@dxos/react-ui-masonry": "0.8.4-main.21d9917",
-    "@dxos/react-ui-mosaic": "0.8.4-main.21d9917",
-    "@dxos/react-ui-pickers": "0.8.4-main.21d9917",
-    "@dxos/react-ui-stack": "0.8.4-main.21d9917",
-    "@dxos/react-ui-searchlist": "0.8.4-main.21d9917",
-    "@dxos/react-ui-tabs": "0.8.4-main.21d9917",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.21d9917",
-    "@dxos/shell": "0.8.4-main.21d9917",
-    "@dxos/schema": "0.8.4-main.21d9917",
-    "@dxos/types": "0.8.4-main.21d9917",
-    "@dxos/ui-theme": "0.8.4-main.21d9917",
-    "@dxos/ui-types": "0.8.4-main.21d9917",
-    "@dxos/util": "0.8.4-main.21d9917"
+    "@dxos/ai": "0.8.4-main.2244d791bb",
+    "@dxos/app-framework": "0.8.4-main.2244d791bb",
+    "@dxos/app-toolkit": "0.8.4-main.2244d791bb",
+    "@dxos/blueprints": "0.8.4-main.2244d791bb",
+    "@dxos/cli-util": "0.8.4-main.2244d791bb",
+    "@dxos/async": "0.8.4-main.2244d791bb",
+    "@dxos/client-protocol": "0.8.4-main.2244d791bb",
+    "@dxos/client": "0.8.4-main.2244d791bb",
+    "@dxos/context": "0.8.4-main.2244d791bb",
+    "@dxos/display-name": "0.8.4-main.2244d791bb",
+    "@dxos/echo": "0.8.4-main.2244d791bb",
+    "@dxos/echo-atom": "0.8.4-main.2244d791bb",
+    "@dxos/echo-db": "0.8.4-main.2244d791bb",
+    "@dxos/echo-protocol": "0.8.4-main.2244d791bb",
+    "@dxos/effect": "0.8.4-main.2244d791bb",
+    "@dxos/invariant": "0.8.4-main.2244d791bb",
+    "@dxos/keys": "0.8.4-main.2244d791bb",
+    "@dxos/functions": "0.8.4-main.2244d791bb",
+    "@dxos/log": "0.8.4-main.2244d791bb",
+    "@dxos/migrations": "0.8.4-main.2244d791bb",
+    "@dxos/operation": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-attention": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-graph": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-observability": "0.8.4-main.2244d791bb",
+    "@dxos/protocols": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-status-bar": "0.8.4-main.2244d791bb",
+    "@dxos/react-client": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-attention": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-components": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-editor": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-list": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-masonry": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-mosaic": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-searchlist": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-stack": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-pickers": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-tabs": "0.8.4-main.2244d791bb",
+    "@dxos/schema": "0.8.4-main.2244d791bb",
+    "@dxos/shell": "0.8.4-main.2244d791bb",
+    "@dxos/ui-theme": "0.8.4-main.2244d791bb",
+    "@dxos/ui-types": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-form": "0.8.4-main.2244d791bb",
+    "@dxos/types": "0.8.4-main.2244d791bb",
+    "@dxos/util": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-client": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-deck": "0.8.4-main.2244d791bb"
   },
   "devDependencies": {
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "1.1.0",
     "@babel/core": "^7.18.13",
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.11",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "vite": "7.1.9",
-    "@dxos/plugin-testing": "0.8.4-main.21d9917",
-    "@dxos/random": "0.8.4-main.21d9917",
-    "@dxos/react-ui": "0.8.4-main.21d9917",
-    "@dxos/lit-ui": "0.8.4-main.21d9917",
-    "@dxos/storybook-utils": "0.8.4-main.21d9917",
-    "@dxos/ui-theme": "0.8.4-main.21d9917"
+    "@dxos/lit-ui": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-testing": "0.8.4-main.2244d791bb",
+    "@dxos/random": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui": "0.8.4-main.2244d791bb",
+    "@dxos/storybook-utils": "0.8.4-main.2244d791bb",
+    "@dxos/ui-theme": "0.8.4-main.2244d791bb"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
-    "effect": "3.19.11",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.8.4-main.21d9917",
-    "@dxos/react-ui": "0.8.4-main.21d9917"
+    "@dxos/react-ui": "0.8.4-main.2244d791bb",
+    "@dxos/ui-theme": "0.8.4-main.2244d791bb"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.ts

@@ -5,7 +5,8 @@
 import * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
 
-import { ActivationEvent, Capability, Common, Plugin } from '@dxos/app-framework';
+import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 import { Ref, Tag, Type } from '@dxos/echo';
 import { Operation } from '@dxos/operation';
 import { AttentionEvents } from '@dxos/plugin-attention';
@@ -23,7 +24,7 @@ import {
   HasSubject,
   Organization,
   Person,
-  Project,
+  Pipeline,
   Task,
 } from '@dxos/types';
 
@@ -45,19 +46,7 @@ import { SpaceEvents } from './types';
 import { type CreateObject, SpaceOperation, type SpacePluginOptions } from './types';
 
 export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
-  Plugin.addModule({
-    // TODO(wittjosiah): Does not integrate with settings store.
-    //   Should this be a different event?
-    //   Should settings store be renamed to be more generic?
-    activatesOn: ActivationEvent.oneOf(Common.ActivationEvent.SetupSettings, Common.ActivationEvent.SetupAppGraph),
-    activatesAfter: [SpaceEvents.StateReady],
-    activate: SpaceState,
-  }),
-  Common.Plugin.addSettingsModule({ activate: SpaceSettings }),
-  Common.Plugin.addTranslationsModule({
-    translations: [...translations, ...componentsTranslations, ...formTranslations, ...shellTranslations],
-  }),
-  Common.Plugin.addMetadataModule({
+  AppPlugin.addMetadataModule({
     metadata: [
       {
         id: Collection.Collection.typename,
@@ -122,7 +111,8 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
       },
     ],
   }),
-  Common.Plugin.addSchemaModule({
+  AppPlugin.addReactRootModule({ activate: ReactRoot }),
+  AppPlugin.addSchemaModule({
     schema: [
       ...DataTypes,
       AnchoredTo.AnchoredTo,
@@ -133,45 +123,74 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
       HasSubject.HasSubject,
       Organization.Organization,
       Person.Person,
-      Project.Project,
+      Pipeline.Pipeline,
       Tag.Tag,
       Task.Task,
     ],
   }),
-  Common.Plugin.addReactRootModule({ activate: ReactRoot }),
-  Plugin.addModule(({ invitationUrl = window.location.origin, invitationProp = 'spaceInvitationCode' }) => {
-    const createInvitationUrl = (invitationCode: string) => {
-      const baseUrl = new URL(invitationUrl);
-      baseUrl.searchParams.set(invitationProp, invitationCode);
-      return baseUrl.toString();
-    };
-
-    return {
-      id: Capability.getModuleTag(ReactSurface),
-      activatesOn: Common.ActivationEvent.SetupReactSurface,
-      // TODO(wittjosiah): Should occur before the settings dialog is loaded when surfaces activation is more granular.
-      activatesBefore: [SpaceEvents.SetupSettingsPanel],
-      activate: () => ReactSurface({ createInvitationUrl }),
-    };
+  AppPlugin.addSettingsModule({ activate: SpaceSettings }),
+  AppPlugin.addTranslationsModule({
+    translations: [...translations, ...componentsTranslations, ...formTranslations, ...shellTranslations],
+  }),
+  Plugin.addModule({
+    // TODO(wittjosiah): Does not integrate with settings store.
+    //   Should this be a different event?
+    //   Should settings store be renamed to be more generic?
+    activatesOn: ActivationEvent.oneOf(AppActivationEvents.SetupSettings, AppActivationEvents.SetupAppGraph),
+    activatesAfter: [SpaceEvents.StateReady],
+    activate: SpaceState,
   }),
-  Common.Plugin.addAppGraphModule({ activate: AppGraphBuilder }),
   Plugin.addModule(
-    ({ invitationUrl = window.location.origin, invitationProp = 'spaceInvitationCode', observability = false }) => {
+    ({
+      shareableLinkOrigin = typeof window !== 'undefined' ? window.location.origin : 'http://localhost',
+      invitationPath = '/',
+      invitationProp = 'spaceInvitationCode',
+    }) => {
       const createInvitationUrl = (invitationCode: string) => {
-        const baseUrl = new URL(invitationUrl);
+        const baseUrl = new URL(invitationPath || '/', shareableLinkOrigin);
         baseUrl.searchParams.set(invitationProp, invitationCode);
         return baseUrl.toString();
       };
+
+      return {
+        id: Capability.getModuleTag(ReactSurface),
+        activatesOn: ActivationEvents.SetupReactSurface,
+        // TODO(wittjosiah): Should occur before the settings dialog is loaded when surfaces activation is more granular.
+        activatesBefore: [SpaceEvents.SetupSettingsPanel],
+        activate: () => ReactSurface({ createInvitationUrl }),
+      };
+    },
+  ),
+  Plugin.addModule(
+    ({ shareableLinkOrigin = typeof window !== 'undefined' ? window.location.origin : 'http://localhost' }) => ({
+      id: Capability.getModuleTag(AppGraphBuilder()) ?? 'space-app-graph-builder',
+      activatesOn: AppActivationEvents.SetupAppGraph,
+      activate: () => AppGraphBuilder({ shareableLinkOrigin }),
+    }),
+  ),
+  Plugin.addModule(
+    ({
+      shareableLinkOrigin = typeof window !== 'undefined' ? window.location.origin : 'http://localhost',
+      invitationPath = '/',
+      invitationProp = 'spaceInvitationCode',
+      observability = false,
+    }) => {
+      const createInvitationUrl = (invitationCode: string) => {
+        const baseUrl = new URL(invitationPath || '/', shareableLinkOrigin);
+        baseUrl.searchParams.set(invitationProp, invitationCode);
+        return baseUrl.toString();
+      };
+
       return {
         id: Capability.getModuleTag(OperationResolver),
-        activatesOn: Common.ActivationEvent.SetupOperationResolver,
+        activatesOn: ActivationEvents.SetupOperationResolver,
         activate: () => OperationResolver({ createInvitationUrl, observability }),
       };
     },
   ),
   // TODO(wittjosiah): This could probably be deferred.
   Plugin.addModule({
-    activatesOn: Common.ActivationEvent.AppGraphReady,
+    activatesOn: AppActivationEvents.AppGraphReady,
     activate: AppGraphSerializer,
   }),
   Plugin.addModule({
@@ -181,9 +200,9 @@ export const SpacePlugin = Plugin.define<SpacePluginOptions>(meta).pipe(
   }),
   Plugin.addModule({
     activatesOn: ActivationEvent.allOf(
-      Common.ActivationEvent.OperationInvokerReady,
-      Common.ActivationEvent.LayoutReady,
-      Common.ActivationEvent.AppGraphReady,
+      ActivationEvents.OperationInvokerReady,
+      AppActivationEvents.LayoutReady,
+      AppActivationEvents.AppGraphReady,
       AttentionEvents.AttentionReady,
       SpaceEvents.StateReady,
       ClientEvents.SpacesReady,

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

@@ -7,7 +7,8 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 import * as Schema from 'effect/Schema';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { type Space, SpaceState, getSpace, isSpace, parseId } from '@dxos/client/echo';
 import { DXN, Filter, Obj, type Ref, Type } from '@dxos/echo';
 import { AtomObj, AtomQuery } from '@dxos/echo-atom';
@@ -20,7 +21,7 @@ import { isNonNullable } from '@dxos/util';
 
 import { getActiveSpace } from '../../hooks';
 import { meta } from '../../meta';
-import { SPACE_TYPE, SpaceCapabilities, SpaceOperation } from '../../types';
+import { SPACE_TYPE, SpaceCapabilities, SpaceOperation, type SpacePluginOptions } from '../../types';
 import {
   SHARED,
   constructObjectActions,
@@ -36,12 +37,13 @@ const whenSpace = (node: Node.Node): Option.Option<Space> =>
   node.type === SPACE_TYPE && isSpace(node.data) ? Option.some(node.data) : Option.none();
 
 export default Capability.makeModule(
-  Effect.fnUntraced(function* () {
+  Effect.fnUntraced(function* (props?: SpacePluginOptions) {
+    const { shareableLinkOrigin = window.location.origin } = props ?? {};
     const capabilities = yield* Capability.Service;
 
     // TODO(wittjosiah): Using `get` and being reactive seems to cause a bug with Atom where disposed atoms are accessed.
     const resolve = (get: Atom.Context) => (typename: string) =>
-      capabilities.getAll(Common.Capability.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
+      capabilities.getAll(AppCapabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
 
     const extensions = yield* Effect.all([
       // Primary actions.
@@ -134,7 +136,7 @@ export default Capability.makeModule(
             const [spacesOrder] = get(
               AtomQuery.make(client.spaces.default.db, Filter.type(Expando.Expando, { key: SHARED })),
             );
-            const { graph } = capabilities.get(Common.Capability.AppGraph);
+            const { graph } = capabilities.get(AppCapabilities.AppGraph);
 
             // Get order from spacesOrder snapshot using AtomObj (cached via Atom.family).
             const spacesOrderSnapshot = spacesOrder ? get(AtomObj.make(spacesOrder)) : undefined;
@@ -195,7 +197,7 @@ export default Capability.makeModule(
           const state = get(capabilities.get(SpaceCapabilities.State));
           const ephemeralState = get(capabilities.get(SpaceCapabilities.EphemeralState));
 
-          const { graph } = capabilities.get(Common.Capability.AppGraph);
+          const { graph } = capabilities.get(AppCapabilities.AppGraph);
           const [spacesOrder] = get(
             AtomQuery.make(client.spaces.default.db, Filter.type(Expando.Expando, { key: SHARED })),
           );
@@ -365,7 +367,7 @@ export default Capability.makeModule(
           const client = get(capabilities.atom(ClientCapabilities.Client)).at(0);
           const space = getSpace(collection);
           const schema = client?.graph.schemaRegistry
-            .query({ typename: collection.key, location: ['runtime'] })
+            .query({ typename: collection.key, location: ['runtime'], includeSystem: true })
             .runSync()[0];
           if (!space || !schema) {
             return Effect.succeed([]);
@@ -373,14 +375,15 @@ export default Capability.makeModule(
 
           return Effect.succeed(
             get(AtomQuery.make(space.db, Filter.type(schema)))
-              .map((object) =>
-                createObjectNode({
+              .map((object) => {
+                get(AtomObj.make(object));
+                return createObjectNode({
                   object,
                   db: space.db,
                   managedCollectionChild: true,
                   resolve: resolve(get),
-                }),
-              )
+                });
+              })
               .filter(isNonNullable),
           );
         },
@@ -536,7 +539,7 @@ export default Capability.makeModule(
             deletable = filteredViews.length === 0;
           }
 
-          const [appGraph] = get(capabilities.atom(Common.Capability.AppGraph));
+          const [appGraph] = get(capabilities.atom(AppCapabilities.AppGraph));
           const ephemeralAtom = capabilities.get(SpaceCapabilities.EphemeralState);
           const ephemeralState = get(ephemeralAtom);
 
@@ -552,6 +555,7 @@ export default Capability.makeModule(
               capabilities,
               deletable,
               navigable: ephemeralState.navigableCollections,
+              shareableLinkOrigin,
             }),
           );
         },
@@ -612,6 +616,6 @@ export default Capability.makeModule(
       }),
     ]);
 
-    return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
   }),
 );

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

@@ -4,7 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { isSpace } from '@dxos/client/echo';
 import { Obj } from '@dxos/echo';
 import { Collection } from '@dxos/schema';
@@ -24,7 +25,7 @@ export default Capability.makeModule(
     // Get context for lazy capability access in callbacks.
     const capabilities = yield* Capability.Service;
 
-    return Capability.contributes(Common.Capability.AppGraphSerializer, [
+    return Capability.contributes(AppCapabilities.AppGraphSerializer, [
       {
         inputType: SPACES,
         outputType: DIRECTORY_TYPE,
@@ -46,7 +47,7 @@ export default Capability.makeModule(
           type: DIRECTORY_TYPE,
         }),
         deserialize: async (data) => {
-          const { invokePromise } = capabilities.get(Common.Capability.OperationInvoker);
+          const { invokePromise } = capabilities.get(Capabilities.OperationInvoker);
           const result = await invokePromise(SpaceOperation.Create, { name: data.name, edgeReplication: true });
           return result.data?.space;
         },
@@ -68,7 +69,7 @@ export default Capability.makeModule(
             return;
           }
 
-          const { invokePromise } = capabilities.get(Common.Capability.OperationInvoker);
+          const { invokePromise } = capabilities.get(Capabilities.OperationInvoker);
           const result = await invokePromise(SpaceOperation.AddObject, {
             target: collection,
             object: Obj.make(Collection.Collection, { name: data.name, objects: [] }),