@dxos/plugin-space 0.8.2-main.2f9c567 → 0.8.2-main.36232bc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.2-main.2f9c567",
+  "version": "0.8.2-main.36232bc",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -34,50 +34,50 @@
   ],
   "dependencies": {
     "@preact/signals-core": "^1.6.0",
-    "effect": "3.14.21",
+    "effect": "3.13.3",
     "jszip": "^3.10.1",
     "localforage": "^1.10.0",
     "lodash.get": "^4.4.2",
     "react-drag-drop-files": "^2.3.8",
     "react-is": "~18.2.0",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/app-framework": "0.8.2-main.2f9c567",
-    "@dxos/artifact": "0.8.2-main.2f9c567",
-    "@dxos/async": "0.8.2-main.2f9c567",
-    "@dxos/context": "0.8.2-main.2f9c567",
-    "@dxos/automerge": "0.8.2-main.2f9c567",
-    "@dxos/display-name": "0.8.2-main.2f9c567",
-    "@dxos/client": "0.8.2-main.2f9c567",
-    "@dxos/echo-schema": "0.8.2-main.2f9c567",
-    "@dxos/echo-signals": "0.8.2-main.2f9c567",
-    "@dxos/effect": "0.8.2-main.2f9c567",
-    "@dxos/invariant": "0.8.2-main.2f9c567",
-    "@dxos/keys": "0.8.2-main.2f9c567",
-    "@dxos/live-object": "0.8.2-main.2f9c567",
-    "@dxos/local-storage": "0.8.2-main.2f9c567",
-    "@dxos/log": "0.8.2-main.2f9c567",
-    "@dxos/plugin-client": "0.8.2-main.2f9c567",
-    "@dxos/migrations": "0.8.2-main.2f9c567",
-    "@dxos/plugin-deck": "0.8.2-main.2f9c567",
-    "@dxos/plugin-observability": "0.8.2-main.2f9c567",
-    "@dxos/plugin-graph": "0.8.2-main.2f9c567",
-    "@dxos/plugin-attention": "0.8.2-main.2f9c567",
-    "@dxos/protocols": "0.8.2-main.2f9c567",
-    "@dxos/plugin-status-bar": "0.8.2-main.2f9c567",
-    "@dxos/react-client": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-attention": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-form": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-editor": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-pickers": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-list": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-searchlist": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-stack": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-tabs": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-theme": "0.8.2-main.2f9c567",
-    "@dxos/schema": "0.8.2-main.2f9c567",
-    "@dxos/shell": "0.8.2-main.2f9c567",
-    "@dxos/util": "0.8.2-main.2f9c567"
+    "@dxos/app-framework": "0.8.2-main.36232bc",
+    "@dxos/async": "0.8.2-main.36232bc",
+    "@dxos/artifact": "0.8.2-main.36232bc",
+    "@dxos/client": "0.8.2-main.36232bc",
+    "@dxos/automerge": "0.8.2-main.36232bc",
+    "@dxos/context": "0.8.2-main.36232bc",
+    "@dxos/display-name": "0.8.2-main.36232bc",
+    "@dxos/echo-schema": "0.8.2-main.36232bc",
+    "@dxos/echo-signals": "0.8.2-main.36232bc",
+    "@dxos/invariant": "0.8.2-main.36232bc",
+    "@dxos/keys": "0.8.2-main.36232bc",
+    "@dxos/effect": "0.8.2-main.36232bc",
+    "@dxos/live-object": "0.8.2-main.36232bc",
+    "@dxos/local-storage": "0.8.2-main.36232bc",
+    "@dxos/migrations": "0.8.2-main.36232bc",
+    "@dxos/log": "0.8.2-main.36232bc",
+    "@dxos/plugin-attention": "0.8.2-main.36232bc",
+    "@dxos/plugin-deck": "0.8.2-main.36232bc",
+    "@dxos/plugin-graph": "0.8.2-main.36232bc",
+    "@dxos/plugin-client": "0.8.2-main.36232bc",
+    "@dxos/plugin-observability": "0.8.2-main.36232bc",
+    "@dxos/plugin-status-bar": "0.8.2-main.36232bc",
+    "@dxos/protocols": "0.8.2-main.36232bc",
+    "@dxos/react-ui-attention": "0.8.2-main.36232bc",
+    "@dxos/react-ui-editor": "0.8.2-main.36232bc",
+    "@dxos/react-client": "0.8.2-main.36232bc",
+    "@dxos/react-ui-form": "0.8.2-main.36232bc",
+    "@dxos/react-ui-pickers": "0.8.2-main.36232bc",
+    "@dxos/react-ui-list": "0.8.2-main.36232bc",
+    "@dxos/react-ui-searchlist": "0.8.2-main.36232bc",
+    "@dxos/react-ui-stack": "0.8.2-main.36232bc",
+    "@dxos/react-ui-tabs": "0.8.2-main.36232bc",
+    "@dxos/react-ui-theme": "0.8.2-main.36232bc",
+    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.36232bc",
+    "@dxos/schema": "0.8.2-main.36232bc",
+    "@dxos/shell": "0.8.2-main.36232bc",
+    "@dxos/util": "0.8.2-main.36232bc"
   },
   "devDependencies": {
     "@babel/core": "^7.18.13",
@@ -88,18 +88,17 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.8.2-main.2f9c567",
-    "@dxos/react-ui": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-theme": "0.8.2-main.2f9c567",
-    "@dxos/storybook-utils": "0.8.2-main.2f9c567"
+    "@dxos/random": "0.8.2-main.36232bc",
+    "@dxos/react-ui": "0.8.2-main.36232bc",
+    "@dxos/react-ui-theme": "0.8.2-main.36232bc",
+    "@dxos/storybook-utils": "0.8.2-main.36232bc"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
-    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-theme": "0.8.2-main.2f9c567"
+    "@dxos/react-ui": "0.8.2-main.36232bc",
+    "@dxos/react-ui-theme": "0.8.2-main.36232bc"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.tsx

@@ -2,8 +2,6 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
-
 import {
   allOf,
   Capabilities,
@@ -14,9 +12,10 @@ import {
   Events,
   oneOf,
 } from '@dxos/app-framework';
+import { S } from '@dxos/echo-schema';
+import { RefArray } from '@dxos/live-object';
 import { AttentionEvents } from '@dxos/plugin-attention';
 import { ClientEvents } from '@dxos/plugin-client';
-import { RefArray } from '@dxos/react-client/echo';
 import { osTranslations } from '@dxos/shell/react';
 
 import {
@@ -26,8 +25,8 @@ import {
   IntentResolver,
   ReactRoot,
   ReactSurface,
-  SchemaDefs,
-  SchemaTools,
+  Schema,
+  Tools,
   SpaceCapabilities,
   SpaceSettings,
   SpacesReady,
@@ -108,7 +107,7 @@ export const SpacePlugin = ({
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
             objectSchema: CollectionType,
-            formSchema: Schema.Struct({ name: Schema.optional(Schema.String) }),
+            formSchema: S.Struct({ name: S.optional(S.String) }),
             getIntent: (props) => createIntent(CollectionAction.Create, props),
           }),
         ),
@@ -117,7 +116,7 @@ export const SpacePlugin = ({
       id: `${meta.id}/module/schema`,
       activatesOn: ClientEvents.ClientReady,
       activatesBefore: [ClientEvents.SetupSchema],
-      activate: SchemaDefs,
+      activate: Schema,
     }),
     defineModule({
       id: `${meta.id}/module/react-root`,
@@ -168,7 +167,7 @@ export const SpacePlugin = ({
     defineModule({
       id: `${meta.id}/module/tools`,
       activatesOn: Events.SetupArtifactDefinition,
-      activate: SchemaTools,
+      activate: Tools,
     }),
   ]);
 };

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

@@ -10,7 +10,7 @@ import {
   getSpace,
   isEchoObject,
   OBJECT_ID_LENGTH,
-  type AnyLiveObject,
+  type ReactiveEchoObject,
   SPACE_ID_LENGTH,
   SpaceState,
   type Space,
@@ -348,7 +348,7 @@ export default (context: PluginsContext) => {
     // Create collection actions and action groups.
     createExtension({
       id: `${SPACE_PLUGIN}/object-actions`,
-      filter: (node): node is Node<AnyLiveObject<any>> => isEchoObject(node.data),
+      filter: (node): node is Node<ReactiveEchoObject<any>> => isEchoObject(node.data),
       actions: ({ node }) => {
         const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
         const state = context.requestCapability(SpaceCapabilities.State);
@@ -359,7 +359,7 @@ export default (context: PluginsContext) => {
     // Object settings plank companion.
     createExtension({
       id: `${SPACE_PLUGIN}/settings`,
-      filter: (node): node is Node<AnyLiveObject<any>> => isEchoObject(node.data),
+      filter: (node): node is Node<ReactiveEchoObject<any>> => isEchoObject(node.data),
       connector: ({ node }) => [
         {
           id: [node.id, 'settings'].join(ATTENDABLE_PATH_SEPARATOR),

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 SchemaDefs = lazy(() => import('./schema-defs'));
-export const SchemaTools = lazy(() => import('./schema-tools'));
+export const Schema = lazy(() => import('./schema'));
+export const Tools = 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,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect } from 'effect';
+import { Effect, pipe } from 'effect';
 
 import {
   Capabilities,
@@ -169,19 +169,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
             }),
           );
 
-          // 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);
+          const url = pipe(invitation.get(), InvitationEncoder.encode, createInvitationUrl);
           if (copyToClipboard) {
             yield* Effect.tryPromise(() => navigator.clipboard.writeText(url));
           }

package/src/capabilities/react-surface.tsx

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Schema } from 'effect';
+import { type Schema as S } from 'effect';
 import React, { useCallback } from 'react';
 
 import { Capabilities, contributes, createSurface, Surface, useCapability, useLayout } from '@dxos/app-framework';
@@ -17,7 +17,7 @@ import {
   parseId,
   SpaceState,
   useSpace,
-  type AnyLiveObject,
+  type ReactiveEchoObject,
   type Space,
 } from '@dxos/react-client/echo';
 import { Input } from '@dxos/react-ui';
@@ -93,7 +93,7 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: `${SPACE_PLUGIN}/companion/object-settings`,
       role: 'article',
-      filter: (data): data is { companionTo: AnyLiveObject<any> } =>
+      filter: (data): data is { companionTo: ReactiveEchoObject<any> } =>
         isEchoObject(data.companionTo) && data.subject === 'settings',
       component: ({ data, role }) => <ObjectSettingsContainer object={data.companionTo} role={role} />,
     }),
@@ -164,8 +164,8 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: `${SPACE_PLUGIN}/create-initial-space-form-[hue]`,
       role: 'form-input',
-      filter: (data): data is { prop: string; schema: Schema.Schema<any> } => {
-        const annotation = findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, HueAnnotationId);
+      filter: (data): data is { prop: string; schema: S.Schema<any> } => {
+        const annotation = findAnnotation<boolean>((data.schema as S.Schema.All).ast, HueAnnotationId);
         return !!annotation;
       },
       component: ({ data: _, ...inputProps }) => {
@@ -183,8 +183,8 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: `${SPACE_PLUGIN}/create-initial-space-form-[icon]`,
       role: 'form-input',
-      filter: (data): data is { prop: string; schema: Schema.Schema<any> } => {
-        const annotation = findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, IconAnnotationId);
+      filter: (data): data is { prop: string; schema: S.Schema<any> } => {
+        const annotation = findAnnotation<boolean>((data.schema as S.Schema.All).ast, IconAnnotationId);
         return !!annotation;
       },
       component: ({ data: _, ...inputProps }) => {
@@ -208,7 +208,7 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: POPOVER_RENAME_OBJECT,
       role: 'popover',
-      filter: (data): data is { props: AnyLiveObject<any> } =>
+      filter: (data): data is { props: ReactiveEchoObject<any> } =>
         data.component === POPOVER_RENAME_OBJECT && isLiveObject(data.props),
       component: ({ data }) => <PopoverRenameObject object={data.props} />,
     }),
@@ -221,13 +221,13 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
     createSurface({
       id: `${SPACE_PLUGIN}/menu-footer`,
       role: 'menu-footer',
-      filter: (data): data is { subject: AnyLiveObject<any> } => isEchoObject(data.subject),
+      filter: (data): data is { subject: ReactiveEchoObject<any> } => isEchoObject(data.subject),
       component: ({ data }) => <MenuFooter object={data.subject} />,
     }),
     createSurface({
       id: `${SPACE_PLUGIN}/navtree-presence`,
       role: 'navtree-item-end',
-      filter: (data): data is { id: string; subject: AnyLiveObject<any>; open?: boolean } =>
+      filter: (data): data is { id: string; subject: ReactiveEchoObject<any>; open?: boolean } =>
         typeof data.id === 'string' && isEchoObject(data.subject),
       component: ({ data }) => {
         // TODO(wittjosiah): Doesn't need to be mutable but readonly type messes with ComplexMap.
@@ -254,7 +254,7 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
       id: `${SPACE_PLUGIN}/navbar-presence`,
       role: 'navbar-end',
       position: 'hoist',
-      filter: (data): data is { subject: Space | AnyLiveObject<any> } =>
+      filter: (data): data is { subject: Space | ReactiveEchoObject<any> } =>
         isSpace(data.subject) || isEchoObject(data.subject),
       component: ({ data }) => {
         const space = isSpace(data.subject) ? data.subject : getSpace(data.subject);

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/components/CreateDialog/CreateSpaceDialog.tsx

@@ -2,10 +2,11 @@
 // 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';
 
@@ -15,7 +16,7 @@ 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 = () => {

package/src/components/MenuFooter.tsx

@@ -5,14 +5,14 @@
 import { Planet } from '@phosphor-icons/react';
 import React from 'react';
 
-import { type AnyLiveObject, getSpace } from '@dxos/client/echo';
+import { type ReactiveEchoObject, getSpace } from '@dxos/client/echo';
 import { useClient } from '@dxos/react-client';
 import { DropdownMenu, toLocalizedString, useTranslation } from '@dxos/react-ui';
 
 import { SPACE_PLUGIN } from '../meta';
 import { getSpaceDisplayName } from '../util';
 
-export const MenuFooter = ({ object }: { object: AnyLiveObject<any> }) => {
+export const MenuFooter = ({ object }: { object: ReactiveEchoObject<any> }) => {
   const { t } = useTranslation(SPACE_PLUGIN);
   const client = useClient();
   const space = getSpace(object);

package/src/components/ObjectSettings/AdvancedObjectSettings.tsx

@@ -5,7 +5,7 @@
 import React, { useCallback, useState } from 'react';
 
 import { type ForeignKey, ForeignKeySchema } from '@dxos/echo-schema';
-import { getMeta, type AnyLiveObject } from '@dxos/react-client/echo';
+import { getMeta, type ReactiveEchoObject } from '@dxos/react-client/echo';
 import { IconButton, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
 
@@ -18,7 +18,7 @@ const initialValues = {
 };
 
 export type AdvancedObjectSettingsProps = {
-  object: AnyLiveObject<any>;
+  object: ReactiveEchoObject<any>;
 };
 
 export const AdvancedObjectSettings = ({ object }: AdvancedObjectSettingsProps) => {

package/src/components/ObjectSettings/BaseObjectSettings.tsx

@@ -4,7 +4,7 @@
 
 import React, { type PropsWithChildren, useRef } from 'react';
 
-import { type AnyLiveObject } from '@dxos/react-client/echo';
+import { type ReactiveEchoObject } from '@dxos/react-client/echo';
 import { Input, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 
@@ -12,7 +12,7 @@ import { meta } from '../../meta';
 
 export type BaseObjectSettingsProps = ThemedClassName<
   PropsWithChildren<{
-    object: AnyLiveObject<any>;
+    object: ReactiveEchoObject<any>;
   }>
 >;
 

package/src/components/ObjectSettings/ObjectSettingsContainer.tsx

@@ -5,7 +5,7 @@
 import React, { useMemo } from 'react';
 
 import { Surface } from '@dxos/app-framework';
-import { type AnyLiveObject } from '@dxos/react-client/echo';
+import { type ReactiveEchoObject } from '@dxos/react-client/echo';
 import { Clipboard } from '@dxos/react-ui';
 import { StackItem } from '@dxos/react-ui-stack';
 
@@ -13,7 +13,7 @@ import { AdvancedObjectSettings } from './AdvancedObjectSettings';
 import { BaseObjectSettings } from './BaseObjectSettings';
 
 export type ObjectSettingsContainerProps = {
-  object: AnyLiveObject<any>;
+  object: ReactiveEchoObject<any>;
   role: string;
 };
 

package/src/components/PopoverRenameSpace.tsx

@@ -4,7 +4,6 @@
 
 import React, { useCallback, useRef, useState } from 'react';
 
-import { createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
 import { type Space } from '@dxos/react-client/echo';
 import { Button, Input, Popover, useTranslation } from '@dxos/react-ui';
 
@@ -16,16 +15,9 @@ export const PopoverRenameSpace = ({ space }: { space: Space }) => {
   const { t } = useTranslation(SPACE_PLUGIN);
   const doneButton = useRef<HTMLButtonElement>(null);
   const [name, setName] = useState(space.properties.name ?? '');
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   const handleDone = useCallback(() => {
     space.properties.name = name;
-    void dispatch(
-      createIntent(LayoutAction.UpdatePopover, {
-        part: 'popover',
-        options: { variant: 'react', anchorId: '', state: false },
-      }),
-    );
   }, [space, name]);
 
   // TODO(thure): Why does the input value need to be uncontrolled to work?

package/src/components/SpaceSettings/SpaceSettingsContainer.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { pipe, Schema } from 'effect';
+import { pipe, Schema as S } from 'effect';
 import React, { type ChangeEvent, useCallback, useMemo, useState } from 'react';
 
 import { chain, createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
@@ -25,9 +25,7 @@ import { StackItem } from '@dxos/react-ui-stack';
 import { SPACE_PLUGIN } from '../../meta';
 import { SpaceAction, SpaceForm } from '../../types';
 
-const FormSchema = SpaceForm.pipe(
-  Schema.extend(Schema.Struct({ archived: Schema.Boolean.annotations({ title: 'Archive space' }) })),
-);
+const FormSchema = SpaceForm.pipe(S.extend(S.Struct({ archived: S.Boolean.annotations({ title: 'Archive space' }) })));
 
 export type SpaceSettingsContainerProps = {
   space: Space;
@@ -56,7 +54,7 @@ export const SpaceSettingsContainer = ({ space }: SpaceSettingsContainerProps) =
   );
 
   const handleSave = useCallback(
-    (properties: Schema.Schema.Type<typeof FormSchema>) => {
+    (properties: S.Schema.Type<typeof FormSchema>) => {
       void toggleEdgeReplication(properties.edgeReplication);
       if (properties.name !== space.properties.name) {
         space.properties.name = properties.name;

package/src/hooks/useInputSurfaceLookup.tsx

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Schema } from 'effect';
+import { type Schema as S } from 'effect';
 import React, { useCallback } from 'react';
 
 import { usePluginManager, isSurfaceAvailable, Surface } from '@dxos/app-framework';
@@ -18,7 +18,7 @@ export const useInputSurfaceLookup = (baseData?: Record<string, any>) => {
   const pluginManager = usePluginManager();
 
   return useCallback(
-    ({ prop, schema, inputProps }: { prop: string; schema: Schema.Schema<any>; inputProps: InputProps }) => {
+    ({ 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;