@dxos/plugin-space 0.8.4-main.a4bbb77 → 0.8.4-main.ae835ea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.4-main.a4bbb77",
+  "version": "0.8.4-main.ae835ea",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -43,60 +43,62 @@
     "react-drag-drop-files": "^2.3.8",
     "react-is": "~19.2.0",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/ai": "0.8.4-main.a4bbb77",
-    "@dxos/app-framework": "0.8.4-main.a4bbb77",
-    "@dxos/async": "0.8.4-main.a4bbb77",
-    "@dxos/context": "0.8.4-main.a4bbb77",
-    "@dxos/display-name": "0.8.4-main.a4bbb77",
-    "@dxos/client": "0.8.4-main.a4bbb77",
-    "@dxos/echo": "0.8.4-main.a4bbb77",
-    "@dxos/echo-schema": "0.8.4-main.a4bbb77",
-    "@dxos/echo-signals": "0.8.4-main.a4bbb77",
-    "@dxos/blueprints": "0.8.4-main.a4bbb77",
-    "@dxos/effect": "0.8.4-main.a4bbb77",
-    "@dxos/invariant": "0.8.4-main.a4bbb77",
-    "@dxos/keys": "0.8.4-main.a4bbb77",
-    "@dxos/log": "0.8.4-main.a4bbb77",
-    "@dxos/local-storage": "0.8.4-main.a4bbb77",
-    "@dxos/migrations": "0.8.4-main.a4bbb77",
-    "@dxos/live-object": "0.8.4-main.a4bbb77",
-    "@dxos/plugin-client": "0.8.4-main.a4bbb77",
-    "@dxos/plugin-attention": "0.8.4-main.a4bbb77",
-    "@dxos/plugin-graph": "0.8.4-main.a4bbb77",
-    "@dxos/plugin-observability": "0.8.4-main.a4bbb77",
-    "@dxos/plugin-deck": "0.8.4-main.a4bbb77",
-    "@dxos/plugin-status-bar": "0.8.4-main.a4bbb77",
-    "@dxos/protocols": "0.8.4-main.a4bbb77",
-    "@dxos/react-client": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-attention": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-components": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-editor": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-list": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-form": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-pickers": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-searchlist": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-stack": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-tabs": "0.8.4-main.a4bbb77",
-    "@dxos/schema": "0.8.4-main.a4bbb77",
-    "@dxos/util": "0.8.4-main.a4bbb77",
-    "@dxos/shell": "0.8.4-main.a4bbb77"
+    "@dxos/ai": "0.8.4-main.ae835ea",
+    "@dxos/app-framework": "0.8.4-main.ae835ea",
+    "@dxos/async": "0.8.4-main.ae835ea",
+    "@dxos/blueprints": "0.8.4-main.ae835ea",
+    "@dxos/context": "0.8.4-main.ae835ea",
+    "@dxos/display-name": "0.8.4-main.ae835ea",
+    "@dxos/echo": "0.8.4-main.ae835ea",
+    "@dxos/echo-signals": "0.8.4-main.ae835ea",
+    "@dxos/invariant": "0.8.4-main.ae835ea",
+    "@dxos/keys": "0.8.4-main.ae835ea",
+    "@dxos/effect": "0.8.4-main.ae835ea",
+    "@dxos/local-storage": "0.8.4-main.ae835ea",
+    "@dxos/log": "0.8.4-main.ae835ea",
+    "@dxos/live-object": "0.8.4-main.ae835ea",
+    "@dxos/migrations": "0.8.4-main.ae835ea",
+    "@dxos/plugin-attention": "0.8.4-main.ae835ea",
+    "@dxos/plugin-client": "0.8.4-main.ae835ea",
+    "@dxos/plugin-deck": "0.8.4-main.ae835ea",
+    "@dxos/client": "0.8.4-main.ae835ea",
+    "@dxos/plugin-graph": "0.8.4-main.ae835ea",
+    "@dxos/plugin-observability": "0.8.4-main.ae835ea",
+    "@dxos/protocols": "0.8.4-main.ae835ea",
+    "@dxos/react-client": "0.8.4-main.ae835ea",
+    "@dxos/plugin-status-bar": "0.8.4-main.ae835ea",
+    "@dxos/react-ui": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-attention": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-components": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-form": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-editor": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-masonry": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-pickers": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-list": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-searchlist": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-stack": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-theme": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-tabs": "0.8.4-main.ae835ea",
+    "@dxos/shell": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.ae835ea",
+    "@dxos/util": "0.8.4-main.ae835ea",
+    "@dxos/schema": "0.8.4-main.ae835ea"
   },
   "devDependencies": {
     "@babel/core": "^7.18.13",
     "@effect-rx/rx-react": "0.42.4",
     "@effect/platform": "0.92.1",
-    "@types/react": "~19.2.0",
-    "@types/react-dom": "~19.2.0",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
     "effect": "3.18.3",
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "vite": "7.1.9",
-    "@dxos/random": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui": "0.8.4-main.a4bbb77",
-    "@dxos/storybook-utils": "0.8.4-main.a4bbb77"
+    "@dxos/lit-ui": "0.8.4-main.ae835ea",
+    "@dxos/random": "0.8.4-main.ae835ea",
+    "@dxos/react-ui": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-theme": "0.8.4-main.ae835ea",
+    "@dxos/storybook-utils": "0.8.4-main.ae835ea"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -104,8 +106,8 @@
     "effect": "^3.13.3",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77"
+    "@dxos/react-ui": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-theme": "0.8.4-main.ae835ea"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 import {
   Capabilities,
@@ -14,10 +14,10 @@ import {
   definePlugin,
   oneOf,
 } from '@dxos/app-framework';
-import { Ref, Type } from '@dxos/echo';
+import { Ref, Tag, Type } from '@dxos/echo';
 import { AttentionEvents } from '@dxos/plugin-attention';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { DataType, createDefaultSchema, typenameFromQuery } from '@dxos/schema';
+import { DataType, DataTypes, createDefaultSchema, getTypenameFromQuery } from '@dxos/schema';
 import { translations as shellTranslations } from '@dxos/shell/react';
 
 import {
@@ -92,6 +92,7 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
             id: Type.getTypename(DataType.Collection),
             metadata: {
               icon: 'ph--cards-three--regular',
+              iconHue: 'neutral',
               // TODO(wittjosiah): Move out of metadata.
               loadReferences: async (collection: DataType.Collection) => await Ref.Array.loadAll(collection.objects),
             },
@@ -102,7 +103,7 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
               label: (object: DataType.QueryCollection) => [
                 'typename label',
                 {
-                  ns: typenameFromQuery(object.query),
+                  ns: getTypenameFromQuery(object.query),
                   count: 2,
                   defaultValue: 'New smart collection',
                 },
@@ -114,6 +115,7 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
             id: Type.getTypename(DataType.StoredSchema),
             metadata: {
               icon: 'ph--database--regular',
+              iconHue: 'green',
             },
           }),
           contributes(Capabilities.Metadata, {
@@ -189,15 +191,7 @@ export const SpacePlugin = definePlugin<SpacePluginOptions>(
       defineModule({
         id: `${meta.id}/module/schema`,
         activatesOn: ClientEvents.SetupSchema,
-        activate: () =>
-          contributes(ClientCapabilities.Schema, [
-            DataType.View,
-            DataType.Event,
-            DataType.Organization,
-            DataType.Person,
-            DataType.Project,
-            DataType.Task,
-          ]),
+        activate: () => contributes(ClientCapabilities.Schema, [Tag.Tag, ...DataTypes]),
       }),
       defineModule({
         id: `${meta.id}/module/whitelist-schema`,

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

@@ -3,7 +3,10 @@
 //
 
 import { Rx } from '@effect-rx/rx-react';
-import { Array, Option, Schema, pipe } from 'effect';
+import * as Array from 'effect/Array';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
+import * as Schema from 'effect/Schema';
 
 import { Capabilities, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
 import { type QueryResult, type Space, SpaceState, getSpace, isSpace, parseId } from '@dxos/client/echo';
@@ -12,7 +15,7 @@ import { log } from '@dxos/log';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
 import { ROOT_ID, createExtension, rxFromObservable, rxFromSignal } from '@dxos/plugin-graph';
-import { DataType, typenameFromQuery } from '@dxos/schema';
+import { DataType, getTypenameFromQuery } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
 import { getActiveSpace } from '../hooks';
@@ -81,7 +84,7 @@ export default (context: PluginContext) => {
       position: 'hoist',
       actions: (node) =>
         Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
             Option.map(() => [
@@ -158,7 +161,7 @@ export default (context: PluginContext) => {
       position: 'hoist',
       connector: (node) =>
         Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
             Option.map(() => [spacesNode]),
@@ -174,7 +177,7 @@ export default (context: PluginContext) => {
       connector: (node) => {
         let query: QueryResult<Type.Expando> | undefined;
         return Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === SPACES ? Option.some(node) : Option.none())),
             Option.map(() => {
@@ -279,7 +282,7 @@ export default (context: PluginContext) => {
       id: `${meta.id}/actions`,
       actions: (node) =>
         Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) =>
               node.type === SPACE_TYPE && isSpace(node.data) ? Option.some(node.data) : Option.none(),
@@ -311,7 +314,7 @@ export default (context: PluginContext) => {
       id: `${meta.id}/root-collection`,
       connector: (node) =>
         Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) =>
               node.type === SPACE_TYPE && isSpace(node.data) ? Option.some(node.data) : Option.none(),
@@ -334,7 +337,7 @@ export default (context: PluginContext) => {
 
               return get(
                 rxFromSignal(() =>
-                  pipe(
+                  Function.pipe(
                     collection.objects,
                     Array.map((object) => object.target),
                     Array.filter(isNonNullable),
@@ -361,7 +364,7 @@ export default (context: PluginContext) => {
       id: `${meta.id}/objects`,
       connector: (node) =>
         Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) =>
               Obj.instanceOf(DataType.Collection, node.data) ? Option.some(node.data) : Option.none(),
@@ -372,7 +375,7 @@ export default (context: PluginContext) => {
 
               return get(
                 rxFromSignal(() =>
-                  pipe(
+                  Function.pipe(
                     collection.objects,
                     Array.map((object) => object.target),
                     Array.filter(isNonNullable),
@@ -433,14 +436,14 @@ export default (context: PluginContext) => {
       connector: (node) => {
         let query: QueryResult<Type.Expando> | undefined;
         return Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) =>
               Obj.instanceOf(DataType.QueryCollection, node.data) ? Option.some(node.data) : Option.none(),
             ),
             Option.flatMap((collection) => {
               const space = getSpace(collection);
-              const typename = typenameFromQuery(collection.query);
+              const typename = getTypenameFromQuery(collection.query);
               return typename && space ? Option.some({ typename, space }) : Option.none();
             }),
             Option.map(({ typename, space }) => {
@@ -490,11 +493,11 @@ export default (context: PluginContext) => {
       connector: (node) => {
         const client = context.getCapability(ClientCapabilities.Client);
         return Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) =>
               Obj.instanceOf(DataType.QueryCollection, node.data) &&
-              typenameFromQuery(node.data.query) === DataType.StoredSchema.typename
+              getTypenameFromQuery(node.data.query) === DataType.StoredSchema.typename
                 ? Option.some(node.data)
                 : Option.none(),
             ),
@@ -522,7 +525,7 @@ export default (context: PluginContext) => {
       actions: (node) => {
         let query: QueryResult<DataType.View> | undefined;
         return Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) => {
               const space = isSpace(node.properties.space) ? node.properties.space : undefined;
@@ -539,7 +542,7 @@ export default (context: PluginContext) => {
                 rxFromSignal(() =>
                   // TODO(wittjosiah): Remove cast.
                   views.filter(
-                    (view) => typenameFromQuery(view.query.ast) === Type.getTypename(schema as Type.Obj.Any),
+                    (view) => getTypenameFromQuery(view.query.ast) === Type.getTypename(schema as Type.Obj.Any),
                   ),
                 ),
               );
@@ -570,7 +573,7 @@ export default (context: PluginContext) => {
       connector: (node) => {
         let query: QueryResult<DataType.View> | undefined;
         return Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) => {
               const space = getSpace(node.data) ?? (isSpace(node.properties.space) ? node.properties.space : undefined);
@@ -587,7 +590,7 @@ export default (context: PluginContext) => {
               // TODO(wittjosiah): Remove cast.
               const typename = Schema.isSchema(schema) ? Type.getTypename(schema as Type.Obj.Any) : schema.typename;
               return get(rxFromQuery(query))
-                .filter((view) => typenameFromQuery(view.query.ast) === typename)
+                .filter((view) => getTypenameFromQuery(view.query.ast) === typename)
                 .map((view) =>
                   get(
                     rxFromSignal(() =>
@@ -645,11 +648,13 @@ export default (context: PluginContext) => {
       actions: (node) => {
         let query: QueryResult<DataType.View> | undefined;
         return Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) => {
               const space = getSpace(node.data);
-              return space && Obj.isObject(node.data) ? Option.some({ space, object: node.data }) : Option.none();
+              return space && Obj.isObject(node.data) && Obj.getTypename(node.data) === node.type
+                ? Option.some({ space, object: node.data })
+                : Option.none();
             }),
             Option.flatMap(({ space, object }) => {
               const isSchema = Obj.instanceOf(DataType.StoredSchema, object);
@@ -663,12 +668,12 @@ export default (context: PluginContext) => {
                 // Don't allow the Records smart collection to be deleted.
                 !(
                   Obj.instanceOf(DataType.QueryCollection, object) &&
-                  typenameFromQuery(object.query) === DataType.StoredSchema.typename
+                  getTypenameFromQuery(object.query) === DataType.StoredSchema.typename
                 );
               if (isSchema && query) {
                 const views = get(rxFromQuery(query));
                 const filteredViews = get(
-                  rxFromSignal(() => views.filter((view) => typenameFromQuery(view.query.ast) === object.typename)),
+                  rxFromSignal(() => views.filter((view) => getTypenameFromQuery(view.query.ast) === object.typename)),
                 );
                 deletable = filteredViews.length === 0;
               }
@@ -703,7 +708,7 @@ export default (context: PluginContext) => {
       id: `${meta.id}/selected-objects`,
       connector: (node) =>
         Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (Obj.instanceOf(DataType.View, node.data) ? Option.some(node) : Option.none())),
             Option.map((node) => [
@@ -728,7 +733,7 @@ export default (context: PluginContext) => {
       id: `${meta.id}/settings`,
       connector: (node) =>
         Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (Obj.isObject(node.data) ? Option.some(node) : Option.none())),
             Option.map((node) => [

package/src/capabilities/capabilities.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Schema } from 'effect';
+import type * as Schema from 'effect/Schema';
 
 import { type AnyIntentChain, type Label, defineCapability } from '@dxos/app-framework';
 import { type Space } from '@dxos/react-client/echo';
@@ -22,7 +22,12 @@ export namespace SpaceCapabilities {
   export type onCreateSpace = (params: { space: Space; rootCollection: DataType.Collection }) => AnyIntentChain;
   export const onCreateSpace = defineCapability<onCreateSpace>(`${meta.id}/capability/on-space-created`);
 
-  export type OnSchemaAdded = (params: { space: Space; schema: Schema.Schema.AnyNoContext }) => AnyIntentChain;
+  export type OnSchemaAdded = (params: {
+    space: Space;
+    schema: Schema.Schema.AnyNoContext;
+    // TODO(wittjosiah): This is leaky.
+    show?: boolean;
+  }) => AnyIntentChain;
   export const OnSchemaAdded = defineCapability<OnSchemaAdded>(`${meta.id}/capability/on-schema-added`);
 
   // TODO(burdon): Should this be view? Forms are UI concepts? (associated with a View/schema).

package/src/capabilities/intent-resolver.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect } from 'effect';
+import * as Effect from 'effect/Effect';
 
 import {
   Capabilities,
@@ -21,7 +21,9 @@ import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata
 import { SpaceState, fullyQualifiedId, getSpace, isSpace } from '@dxos/react-client/echo';
 import { Invitation, InvitationEncoder } from '@dxos/react-client/invitations';
 import { ATTENDABLE_PATH_SEPARATOR } from '@dxos/react-ui-attention';
-import { DataType, ProjectionModel, typenameFromQuery } from '@dxos/schema';
+import { iconValues } from '@dxos/react-ui-pickers';
+import { hues } from '@dxos/react-ui-theme';
+import { DataType, ProjectionModel, getTypenameFromQuery } from '@dxos/schema';
 
 import {
   CREATE_OBJECT_DIALOG,
@@ -69,8 +71,10 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     }),
     createResolver({
       intent: SpaceAction.Create,
-      resolve: async ({ name, hue, icon, edgeReplication }) => {
+      resolve: async ({ name, hue: hue_, icon: icon_, edgeReplication }) => {
         const client = context.getCapability(ClientCapabilities.Client);
+        const hue = hue_ ?? hues[Math.floor(Math.random() * hues.length)];
+        const icon = icon_ ?? iconValues[Math.floor(Math.random() * iconValues.length)];
         const space = await client.spaces.create({ name, hue, icon });
         if (edgeReplication) {
           await space.internal.setEdgeReplicationPreference(EdgeReplicationSetting.ENABLED);
@@ -88,6 +92,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
 
         // Create records smart collection.
         const records = Obj.make(DataType.QueryCollection, {
+          // NOTE: This is specifically Filter.typename due to current limitations in query collection parsing.
           query: Query.select(Filter.typename(DataType.StoredSchema.typename)).ast,
         });
         collection.objects.push(Ref.make(records));
@@ -323,7 +328,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     }),
     createResolver({
       intent: SpaceAction.UseStaticSchema,
-      resolve: async ({ space, typename }) => {
+      resolve: async ({ space, typename, show }) => {
         const client = context.getCapability(ClientCapabilities.Client);
         const schema = client.graph.schemaRegistry.schemas.find((schema) => Type.getTypename(schema) === typename);
         invariant(schema, `Schema not found: ${typename}`);
@@ -338,7 +343,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
 
         await context.activatePromise(SpaceEvents.SchemaAdded);
         const onSchemaAdded = context.getCapabilities(SpaceCapabilities.OnSchemaAdded);
-        const schemaAddedIntents = onSchemaAdded.map((onSchemaAdded) => onSchemaAdded({ space, schema }));
+        const schemaAddedIntents = onSchemaAdded.map((onSchemaAdded) => onSchemaAdded({ space, schema, show }));
 
         return {
           data: {},
@@ -361,7 +366,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     }),
     createResolver({
       intent: SpaceAction.AddSchema,
-      resolve: async ({ space, name, typename, version, schema: schemaInput }) => {
+      resolve: async ({ space, name, typename, version, schema: schemaInput, show }) => {
         const [schema] = await space.db.schemaRegistry.register([schemaInput]);
         if (name) {
           schema.storedSchema.name = name;
@@ -375,7 +380,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
 
         await context.activatePromise(SpaceEvents.SchemaAdded);
         const onSchemaAdded = context.getCapabilities(SpaceCapabilities.OnSchemaAdded);
-        const schemaAddedIntents = onSchemaAdded.map((onSchemaAdded) => onSchemaAdded({ space, schema }));
+        const schemaAddedIntents = onSchemaAdded.map((onSchemaAdded) => onSchemaAdded({ space, schema, show }));
 
         return {
           data: {
@@ -406,7 +411,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
       resolve: async ({ view, fieldId, deletionData }, undo) => {
         const space = getSpace(view);
         invariant(space);
-        const typename = typenameFromQuery(view.query.ast);
+        const typename = getTypenameFromQuery(view.query.ast);
         invariant(typename);
         const schema = await space.db.schemaRegistry.query({ typename }).firstOrUndefined();
         invariant(schema);

package/src/capabilities/react-surface.tsx

@@ -2,23 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Schema } from 'effect';
-import React, { useCallback, useMemo } from 'react';
+import type * as Schema from 'effect/Schema';
+import React, { useCallback } from 'react';
 
-import {
-  Capabilities,
-  Surface,
-  contributes,
-  createSurface,
-  useCapabilities,
-  useCapability,
-  useLayout,
-} from '@dxos/app-framework';
+import { Capabilities, Surface, contributes, createSurface, useCapability, useLayout } from '@dxos/app-framework';
 import { Obj, Type } from '@dxos/echo';
 import { findAnnotation } from '@dxos/effect';
 import { SettingsStore } from '@dxos/local-storage';
-import { ClientCapabilities } from '@dxos/plugin-client';
-import { useClient } from '@dxos/react-client';
 import {
   type Space,
   SpaceState,
@@ -29,7 +19,7 @@ import {
   parseId,
   useSpace,
 } from '@dxos/react-client/echo';
-import { Input, useTranslation } from '@dxos/react-ui';
+import { Input } from '@dxos/react-ui';
 import { type InputProps, SelectInput } from '@dxos/react-ui-form';
 import { HuePicker, IconPicker } from '@dxos/react-ui-pickers';
 import { DataType, type TypenameAnnotation, TypenameAnnotationId } from '@dxos/schema';
@@ -63,6 +53,7 @@ import {
   SyncStatus,
   ViewEditor,
 } from '../components';
+import { useTypeOptions } from '../hooks';
 import { meta } from '../meta';
 import { HueAnnotationId, IconAnnotationId, type SpaceSettingsProps } from '../types';
 
@@ -249,72 +240,10 @@ export default ({ createInvitationUrl }: ReactSurfaceOptions) =>
         return !!annotation;
       },
       component: ({ data: { schema, target }, ...inputProps }) => {
-        const { t } = useTranslation();
-        const client = useClient();
         const props = inputProps as any as InputProps;
         const space = isSpace(target) ? target : getSpace(target);
-        if (!space) {
-          return null;
-        }
-
         const annotation = findAnnotation<TypenameAnnotation[]>(schema.ast, TypenameAnnotationId)!;
-
-        const schemaWhitelists = useCapabilities(ClientCapabilities.SchemaWhiteList);
-        const whitelistedTypenames = useMemo(
-          () => new Set(schemaWhitelists.flatMap((typeArray) => typeArray.map((type) => Type.getTypename(type)))),
-          [schemaWhitelists],
-        );
-
-        const objectForms = useCapabilities(SpaceCapabilities.ObjectForm);
-        const objectFormTypenames = useMemo(
-          () =>
-            new Set(
-              objectForms
-                .map((form) => Type.getTypename(form.objectSchema))
-                // TODO(wittjosiah): Remove.
-                .filter((typename) => !OMIT.includes(typename) && !typename.endsWith('View')),
-            ),
-          [objectForms],
-        );
-
-        const fixed = client.graph.schemaRegistry.schemas.filter((schema) => {
-          const limitedStatic =
-            annotation.includes('limited-static') && whitelistedTypenames.has(Type.getTypename(schema));
-          const unusedStatic =
-            annotation.includes('unused-static') &&
-            whitelistedTypenames.has(Type.getTypename(schema)) &&
-            !space.properties.staticRecords?.includes(Type.getTypename(schema));
-          const usedStatic =
-            annotation.includes('used-static') &&
-            whitelistedTypenames.has(Type.getTypename(schema)) &&
-            space.properties.staticRecords?.includes(Type.getTypename(schema));
-          const objectForm = annotation.includes('object-form') && objectFormTypenames.has(Type.getTypename(schema));
-          return annotation.includes('static') || limitedStatic || unusedStatic || usedStatic || objectForm;
-        });
-        const dynamic = space?.db.schemaRegistry.query().runSync();
-        const typenames = Array.from(
-          new Set<string>([
-            ...(annotation.includes('limited-static') ||
-            annotation.includes('unused-static') ||
-            annotation.includes('used-static') ||
-            annotation.includes('static') ||
-            annotation.includes('object-form')
-              ? fixed.map((schema) => Type.getTypename(schema))
-              : []),
-            ...(annotation.includes('dynamic') ? dynamic.map((schema) => schema.typename) : []),
-          ]),
-        ).sort();
-
-        const options = useMemo(
-          () =>
-            typenames
-              .map((typename) => ({
-                value: typename,
-                label: t('typename label', { ns: typename, defaultValue: typename }),
-              }))
-              .toSorted((a, b) => a.label.localeCompare(b.label)),
-          [t, typenames],
-        );
+        const options = useTypeOptions({ space, annotation });
 
         return <SelectInput {...props} options={options} />;
       },

package/src/capabilities/spaces-ready.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Option } from 'effect';
+import * as Option from 'effect/Option';
 
 import { Capabilities, LayoutAction, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
 import { SubscriptionList } from '@dxos/async';