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

package/src/capabilities/schema-tool.test.ts

@@ -2,9 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
 import { describe, it, expect } from 'vitest';
 
+import { S } from '@dxos/echo-schema';
+
 import { TypeNameSchema } from './schema-tools';
 
 describe('TypeNameSchema format', () => {
@@ -28,7 +29,7 @@ describe('TypeNameSchema format', () => {
     '.org/Type', // Must have domain
   ];
 
-  const validate = Schema.validateSync(TypeNameSchema);
+  const validate = S.validateSync(TypeNameSchema);
 
   valid.forEach((typename) => {
     it(`should accept valid typename: ${typename}`, () => {

package/src/capabilities/schema-tools.ts

@@ -2,12 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema, SchemaAST } from 'effect';
+import { DescriptionAnnotationId, ExamplesAnnotationId, TitleAnnotationId } from 'effect/SchemaAST';
 
 import { Capabilities, contributes, type PromiseIntentDispatcher } from '@dxos/app-framework';
 import { defineTool, ToolResult } from '@dxos/artifact';
 import { type Space } from '@dxos/client/echo';
-import { FormatEnum, FormatEnums, SelectOptionSchema, GeoPoint, toJsonSchema } from '@dxos/echo-schema';
+import { FormatEnum, FormatEnums, S, SelectOptionSchema, GeoPoint, toJsonSchema } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { hues } from '@dxos/react-ui-theme';
 import { getSchemaFromPropertyDefinitions } from '@dxos/schema';
@@ -21,13 +21,13 @@ declare global {
 }
 
 // TODO(ZaymonFC): Move this somewhere common.
-export const TypeNameSchema = Schema.String.pipe(
-  Schema.pattern(/^\w+\.\w{2,}\/[\w/]+$/i),
-  Schema.annotations({
-    [SchemaAST.TitleAnnotationId]: 'TypeName',
-    [SchemaAST.DescriptionAnnotationId]:
+export const TypeNameSchema = S.String.pipe(
+  S.pattern(/^\w+\.\w{2,}\/[\w/]+$/i),
+  S.annotations({
+    [TitleAnnotationId]: 'TypeName',
+    [DescriptionAnnotationId]:
       'Domain-style type name path. Dashes are not allowed. Use camel case for the final component of the type name.',
-    [SchemaAST.ExamplesAnnotationId]: ['example.com/type/Document', 'example.com/type/FlightList'],
+    [ExamplesAnnotationId]: ['example.com/type/Document', 'example.com/type/FlightList'],
   }),
 );
 
@@ -36,23 +36,23 @@ const formatDescription = `The format of the property. Additional information:
   This tuple is GeoJSON. You must specify \`${FormatEnum.GeoPoint}\` as [Longitude, Latitude]`;
 
 // TODO(ZaymonFC): All properties are default optional, but maybe we should allow for required properties.
-const PropertyDefinitionSchema = Schema.Struct({
-  name: Schema.String.annotations({ [SchemaAST.DescriptionAnnotationId]: 'The name of the property.' }),
-  format: Schema.Union(...FormatEnums.map((format) => Schema.Literal(format))).annotations({
-    [SchemaAST.DescriptionAnnotationId]: formatDescription,
+const PropertyDefinitionSchema = S.Struct({
+  name: S.String.annotations({ [DescriptionAnnotationId]: 'The name of the property.' }),
+  format: S.Union(...FormatEnums.map((format) => S.Literal(format))).annotations({
+    [DescriptionAnnotationId]: formatDescription,
   }),
-  config: Schema.optional(
-    Schema.Struct({
-      options: Schema.optional(
-        Schema.Array(SelectOptionSchema)
+  config: S.optional(
+    S.Struct({
+      options: S.optional(
+        S.Array(SelectOptionSchema)
           .annotations({
             description: `Options for SingleSelect/MultiSelect formats. Available colors: ${hues.join(', ')}`,
           })
-          .pipe(Schema.mutable),
+          .pipe(S.mutable),
       ),
     }),
   ),
-}).pipe(Schema.mutable);
+}).pipe(S.mutable);
 
 const SYSTEM_NAMESPACE = 'dxos.org/echo/schema';
 
@@ -62,7 +62,7 @@ export default () =>
       name: 'list',
       description: 'List registered schemas in the space.',
       caption: 'Listing registered schemas...',
-      schema: Schema.Struct({}),
+      schema: S.Struct({}),
       execute: async (_input, { extensions }) => {
         invariant(extensions?.space, 'No space.');
         const space = extensions.space;
@@ -80,8 +80,8 @@ export default () =>
       name: 'get',
       description: 'Get a specific schema by its typename.',
       caption: 'Getting schema...',
-      schema: Schema.Struct({
-        typename: Schema.String.annotations({
+      schema: S.Struct({
+        typename: S.String.annotations({
           description: 'The fully qualified typename of the schema.',
         }),
       }),
@@ -101,14 +101,14 @@ export default () =>
       name: 'create',
       description: 'Create a new schema with the provided definition.',
       caption: 'Creating schema...',
-      schema: Schema.Struct({
+      schema: S.Struct({
         typename: TypeNameSchema.annotations({
           description:
             'The fully qualified schema typename. Must start with a domain, and then one or more path components (e.g., "example.com/type/TypeName").',
         }),
-        properties: Schema.Array(PropertyDefinitionSchema).pipe(
-          Schema.annotations({ description: 'Array of property definitions for the schema.' }),
-          Schema.mutable,
+        properties: S.Array(PropertyDefinitionSchema).pipe(
+          S.annotations({ description: 'Array of property definitions for the schema.' }),
+          S.mutable,
         ),
       }),
       execute: async ({ typename, properties }, { extensions }) => {

package/src/capabilities/schema.ts

@@ -0,0 +1,27 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { effect } from '@preact/signals-core';
+
+import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
+import { ClientCapabilities } from '@dxos/plugin-client';
+
+import { SpaceCapabilities } from './capabilities';
+import { type ObjectForm } from '../types';
+
+export default (context: PluginsContext) => {
+  const client = context.requestCapability(ClientCapabilities.Client);
+
+  // TODO(wittjosiah): Unregister schemas when they are disabled.
+  let previous: ObjectForm[] = [];
+  const unsubscribe = effect(() => {
+    const forms = Array.from(new Set(context.requestCapabilities(SpaceCapabilities.ObjectForm)));
+    // TODO(wittjosiah): Filter out schemas which the client has already registered.
+    const newSchemas = forms.filter((form) => !previous.includes(form)).map((form) => form.objectSchema);
+    previous = forms;
+    client.addTypes(newSchemas);
+  });
+
+  return contributes(Capabilities.Null, null, () => unsubscribe());
+};

package/src/capabilities/settings.ts

@@ -3,13 +3,13 @@
 //
 
 import { Capabilities, contributes } from '@dxos/app-framework';
-import { live } from '@dxos/live-object';
+import { create } from '@dxos/live-object';
 
 import { SPACE_PLUGIN } from '../meta';
 import { type SpaceSettingsProps, SpaceSettingsSchema } from '../types';
 
 export default () => {
-  const settings = live<SpaceSettingsProps>({
+  const settings = create<SpaceSettingsProps>({
     showHidden: false,
   });
 

package/src/capabilities/spaces-ready.ts

@@ -2,13 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Option } from 'effect';
-
-import { contributes, createIntent, type PluginContext, Capabilities, LayoutAction } from '@dxos/app-framework';
+import { contributes, createIntent, type PluginsContext, Capabilities, LayoutAction } from '@dxos/app-framework';
 import { SubscriptionList } from '@dxos/async';
 import { Expando } from '@dxos/echo-schema';
 import { scheduledEffect } from '@dxos/echo-signals/core';
-import { live } from '@dxos/live-object';
+import { create } from '@dxos/live-object';
 import { log } from '@dxos/log';
 import { AttentionCapabilities } from '@dxos/plugin-attention';
 import { ClientCapabilities } from '@dxos/plugin-client';
@@ -25,17 +23,17 @@ import { COMPOSER_SPACE_LOCK, SHARED } from '../util';
 const ACTIVE_NODE_BROADCAST_INTERVAL = 30_000;
 const WAIT_FOR_OBJECT_TIMEOUT = 1000;
 
-export default async (context: PluginContext) => {
+export default async (context: PluginsContext) => {
   const subscriptions = new SubscriptionList();
   const spaceSubscriptions = new SubscriptionList();
 
-  const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-  const { graph } = context.getCapability(Capabilities.AppGraph);
-  const layout = context.getCapability(Capabilities.Layout);
-  const deck = context.getCapability(DeckCapabilities.DeckState);
-  const attention = context.getCapability(AttentionCapabilities.Attention);
-  const state = context.getCapability(SpaceCapabilities.MutableState);
-  const client = context.getCapability(ClientCapabilities.Client);
+  const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
+  const { graph } = context.requestCapability(Capabilities.AppGraph);
+  const layout = context.requestCapability(Capabilities.Layout);
+  const deck = context.requestCapability(DeckCapabilities.DeckState);
+  const attention = context.requestCapability(AttentionCapabilities.Attention);
+  const state = context.requestCapability(SpaceCapabilities.MutableState);
+  const client = context.requestCapability(ClientCapabilities.Client);
 
   const defaultSpace = client.spaces.default;
   await defaultSpace.waitUntilReady();
@@ -51,11 +49,11 @@ export default async (context: PluginContext) => {
 
   const {
     objects: [spacesOrder],
-  } = await defaultSpace.db.query(Filter.type(Expando, { key: SHARED })).run();
+  } = await defaultSpace.db.query(Filter.schema(Expando, { key: SHARED })).run();
   if (!spacesOrder) {
     // TODO(wittjosiah): Cannot be a Folder because Spaces are not TypedObjects so can't be saved in the database.
     //  Instead, we store order as an array of space ids.
-    defaultSpace.db.add(live({ key: SHARED, order: [] }));
+    defaultSpace.db.add(create({ key: SHARED, order: [] }));
   }
 
   // Await missing objects.
@@ -67,10 +65,10 @@ export default async (context: PluginContext) => {
           return;
         }
 
-        const node = graph.getNode(active[0]).pipe(Option.getOrNull);
+        const node = graph.findNode(active[0]);
         if (!node && active[0].length === FQ_ID_LENGTH) {
           const timeout = setTimeout(async () => {
-            const node = graph.getNode(active[0]).pipe(Option.getOrNull);
+            const node = graph.findNode(active[0]);
             if (!node) {
               await dispatch(createIntent(SpaceAction.WaitForObject, { id: active[0] }));
             }

package/src/capabilities/state.ts

@@ -4,7 +4,7 @@
 
 import { effect } from '@preact/signals-core';
 
-import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
 import { PublicKey } from '@dxos/keys';
 import { LocalStorageStore } from '@dxos/local-storage';
 import { ComplexMap } from '@dxos/util';
@@ -13,10 +13,12 @@ import { SpaceCapabilities } from './capabilities';
 import { SPACE_PLUGIN } from '../meta';
 import { type PluginState } from '../types';
 
-export default (context: PluginContext) => {
+export default (context: PluginsContext) => {
+  const sections = context.requestCapabilities(SpaceCapabilities.SettingsSection);
   const state = new LocalStorageStore<PluginState>(SPACE_PLUGIN, {
     awaiting: undefined,
     spaceNames: {},
+    spaceSettingsOpenSections: sections.map((section) => section.id),
     viewersByObject: {},
     // TODO(wittjosiah): Stop using (Complex)Map inside reactive object.
     viewersByIdentity: new ComplexMap(PublicKey.hash),
@@ -29,7 +31,7 @@ export default (context: PluginContext) => {
     .prop({ key: 'spaceNames', type: LocalStorageStore.json<Record<string, string>>() })
     .prop({ key: 'enabledEdgeReplication', type: LocalStorageStore.bool() });
 
-  const manager = context.getCapability(Capabilities.PluginManager);
+  const manager = context.requestCapability(Capabilities.PluginManager);
   const unsubscribe = effect(() => {
     // TODO(wittjosiah): Find a way to make this capability-based.
     const enabled = manager.enabled.includes('dxos.org/plugin/stack');

package/src/components/AwaitingObject.tsx

@@ -26,7 +26,7 @@ export const AwaitingObject = ({ id }: { id: string }) => {
   const layout = useLayout();
 
   const client = useClient();
-  const objects = useQuery(client.spaces, Filter.everything());
+  const objects = useQuery(client.spaces, Filter.all());
 
   useEffect(() => {
     if (!id) {

package/src/components/CollectionMain.tsx

@@ -5,7 +5,7 @@
 import React from 'react';
 
 import { useTranslation } from '@dxos/react-ui';
-import { baseSurface, descriptionMessage, mx } from '@dxos/react-ui-theme';
+import { baseSurface, descriptionText, mx } from '@dxos/react-ui-theme';
 
 import { SPACE_PLUGIN } from '../meta';
 import type { CollectionType } from '../types';
@@ -21,7 +21,10 @@ export const CollectionMain = ({ collection }: { collection: CollectionType }) =
     >
       <p
         role='alert'
-        className={mx(descriptionMessage, 'rounded-lg p-8 font-normal text-lg max-is-[24rem] break-words')}
+        className={mx(
+          descriptionText,
+          'border border-dashed border-neutral-400/50 rounded-lg p-8 font-normal text-lg max-is-[24rem] break-words',
+        )}
       >
         {collection.name ?? t('unnamed collection label')}
       </p>

package/src/components/CreateDialog/CreateObjectDialog.stories.tsx

@@ -7,7 +7,7 @@ import '@dxos-theme';
 import { type Meta, type StoryObj } from '@storybook/react';
 import React, { useEffect } from 'react';
 
-import { live, Filter, useQuery, useSpace } from '@dxos/react-client/echo';
+import { create, Filter, useQuery, useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Dialog } from '@dxos/react-ui';
 import { osTranslations } from '@dxos/shell/react';
@@ -35,7 +35,7 @@ const meta: Meta<typeof CreateObjectDialog> = {
   decorators: [
     withClientProvider({ createIdentity: true, createSpace: true, types: [CollectionType] }),
     withTheme,
-    withLayout(),
+    withLayout({ tooltips: true }),
   ],
   parameters: {
     translations: [...translations, osTranslations],
@@ -66,11 +66,11 @@ export const TargetSpace: StoryObj<typeof CreateObjectDialog> = {
 export const TargetCollection: StoryObj<typeof CreateObjectDialog> = {
   render: (args) => {
     const space = useSpace();
-    const [collection] = useQuery(space, Filter.type(CollectionType));
+    const [collection] = useQuery(space, Filter.schema(CollectionType));
 
     useEffect(() => {
       if (space) {
-        space.db.add(live(CollectionType, { name: 'My Collection', objects: [], views: {} }));
+        space.db.add(create(CollectionType, { name: 'My Collection', objects: [], views: {} }));
       }
     }, [space]);
 

package/src/components/CreateDialog/CreateObjectDialog.tsx

@@ -16,7 +16,7 @@ import {
 } from '@dxos/app-framework';
 import { invariant } from '@dxos/invariant';
 import { useClient } from '@dxos/react-client';
-import { getSpace, isLiveObject, isSpace, type Live, useSpaces } from '@dxos/react-client/echo';
+import { getSpace, isReactiveObject, isSpace, type ReactiveObject, useSpaces } from '@dxos/react-client/echo';
 import { Button, Dialog, Icon, useTranslation } from '@dxos/react-ui';
 
 import { CreateObjectPanel, type CreateObjectPanelProps } from './CreateObjectPanel';
@@ -27,7 +27,7 @@ import { type ObjectForm, SpaceAction } from '../../types';
 export const CREATE_OBJECT_DIALOG = `${SPACE_PLUGIN}/CreateObjectDialog`;
 
 export type CreateObjectDialogProps = Pick<CreateObjectPanelProps, 'target' | 'typename' | 'name'> & {
-  shouldNavigate?: (object: Live<any>) => boolean;
+  shouldNavigate?: (object: ReactiveObject<any>) => boolean;
 };
 
 export const CreateObjectDialog = ({
@@ -46,7 +46,7 @@ export const CreateObjectDialog = ({
 
   const resolve = useCallback(
     (typename: string) =>
-      manager.context.getCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {},
+      manager.context.requestCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {},
     [manager],
   );
 
@@ -72,7 +72,7 @@ export const CreateObjectDialog = ({
       invariant(space, 'Missing space');
       const result = await dispatch(form.getIntent(data, { space }));
       const object = result.data?.object;
-      if (isLiveObject(object)) {
+      if (isReactiveObject(object)) {
         const addObjectIntent = createIntent(SpaceAction.AddObject, { target, object, hidden: form.hidden });
         const shouldNavigate = _shouldNavigate ?? (() => true);
         if (shouldNavigate(object)) {

package/src/components/CreateDialog/CreateObjectPanel.tsx

@@ -4,20 +4,42 @@
 
 import React, { useCallback, useState } from 'react';
 
-import { getTypeAnnotation, type TypeAnnotation } from '@dxos/echo-schema';
+import { Surface, isSurfaceAvailable, usePluginManager } from '@dxos/app-framework';
+import { getTypeAnnotation, type TypeAnnotation, type S } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { type SpaceId, type Space } from '@dxos/react-client/echo';
 import { Icon, type ThemedClassName, toLocalizedString, useTranslation } from '@dxos/react-ui';
-import { Form } from '@dxos/react-ui-form';
+import { Form, type InputProps } from '@dxos/react-ui-form';
 import { SearchList } from '@dxos/react-ui-searchlist';
 import { mx } from '@dxos/react-ui-theme';
 import { isNonNullable, type MaybePromise } from '@dxos/util';
 
-import { useInputSurfaceLookup } from '../../hooks';
 import { SPACE_PLUGIN } from '../../meta';
 import { type ObjectForm, type CollectionType } from '../../types';
 import { getSpaceDisplayName } from '../../util';
 
+// TODO(ZaymonFC): Move this if you find yourself needing it elsewhere.
+/**
+ * Creates a surface input component based on plugin context.
+ * @param baseData Additional data that will be merged with form data and passed to the surface.
+ * This allows providing more context to the surface than what's available from the form itself.
+ */
+const useInputSurfaceLookup = (baseData?: Record<string, any>) => {
+  const pluginManager = usePluginManager();
+
+  return useCallback(
+    ({ prop, schema, inputProps }: { prop: string; schema: S.Schema<any>; inputProps: InputProps }) => {
+      const composedData = { prop, schema, ...baseData };
+      if (!isSurfaceAvailable(pluginManager.context, { role: 'form-input', data: composedData })) {
+        return undefined;
+      }
+
+      return <Surface role='form-input' data={composedData} {...inputProps} />;
+    },
+    [pluginManager, baseData],
+  );
+};
+
 export type CreateObjectPanelProps = ThemedClassName<{
   forms: ObjectForm[];
   spaces: Space[];

package/src/components/CreateDialog/CreateSpaceDialog.tsx

@@ -2,20 +2,20 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Effect, type Schema } from 'effect';
+import { Effect } from 'effect';
 import React, { useCallback, useRef } from 'react';
 
 import { createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
+import { type S } from '@dxos/echo-schema';
 import { Button, Dialog, Icon, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
 
-import { useInputSurfaceLookup } from '../../hooks';
 import { SPACE_PLUGIN } from '../../meta';
 import { SpaceAction, SpaceForm } from '../../types';
 
 export const CREATE_SPACE_DIALOG = `${SPACE_PLUGIN}/CreateSpaceDialog`;
 
-type FormValues = Schema.Schema.Type<typeof SpaceForm>;
+type FormValues = S.Schema.Type<typeof SpaceForm>;
 const initialValues: FormValues = { edgeReplication: true };
 
 export const CreateSpaceDialog = () => {
@@ -23,8 +23,6 @@ export const CreateSpaceDialog = () => {
   const { t } = useTranslation(SPACE_PLUGIN);
   const { dispatch } = useIntentDispatcher();
 
-  const inputSurfaceLookup = useInputSurfaceLookup();
-
   const handleCreateSpace = useCallback(
     async (data: FormValues) => {
       const program = Effect.gen(function* () {
@@ -56,7 +54,6 @@ export const CreateSpaceDialog = () => {
           autoFocus
           values={initialValues}
           schema={SpaceForm}
-          lookupComponent={inputSurfaceLookup}
           onSave={handleCreateSpace}
         />
       </div>

package/src/components/MembersContainer.stories.tsx

@@ -16,7 +16,11 @@ import translations from '../translations';
 const meta: Meta = {
   title: 'plugins/plugin-space/MembersContainer',
   component: MembersContainer,
-  decorators: [withClientProvider({ createIdentity: true, createSpace: true }), withTheme, withLayout()],
+  decorators: [
+    withClientProvider({ createIdentity: true, createSpace: true }),
+    withTheme,
+    withLayout({ tooltips: true }),
+  ],
   parameters: {
     layout: 'fullscreen',
     translations: [...translations, osTranslations],