@dxos/plugin-space 0.8.4-main.67995b8 → 0.8.4-main.a4bbb77

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

@@ -3,23 +3,24 @@
 //
 
 import { Rx } from '@effect-rx/rx-react';
-import { Array, Option, pipe, Schema } from 'effect';
+import { Array, Option, Schema, pipe } from 'effect';
 
-import { Capabilities, contributes, createIntent, type PluginContext } from '@dxos/app-framework';
-import { getSpace, SpaceState, type Space, isSpace, type QueryResult } from '@dxos/client/echo';
+import { Capabilities, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
+import { type QueryResult, type Space, SpaceState, getSpace, isSpace, parseId } from '@dxos/client/echo';
 import { Filter, Obj, Query, Type } from '@dxos/echo';
 import { log } from '@dxos/log';
 import { ClientCapabilities } from '@dxos/plugin-client';
-import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
-import { createExtension, rxFromObservable, ROOT_ID, rxFromSignal } from '@dxos/plugin-graph';
-import { DataType } from '@dxos/schema';
+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 { isNonNullable } from '@dxos/util';
 
-import { SpaceCapabilities } from './capabilities';
 import { getActiveSpace } from '../hooks';
-import { SPACE_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { SPACE_TYPE, SpaceAction, type SpaceSettingsProps } from '../types';
 import {
+  SHARED,
+  SPACES,
   constructObjectActions,
   constructSpaceActions,
   constructSpaceNode,
@@ -27,10 +28,10 @@ import {
   createStaticSchemaActions,
   createStaticSchemaNode,
   rxFromQuery,
-  SHARED,
-  SPACES,
 } from '../util';
 
+import { SpaceCapabilities } from './capabilities';
+
 export default (context: PluginContext) => {
   // TODO(wittjosiah): Make reactive.
   const resolve = (typename: string) =>
@@ -41,7 +42,7 @@ export default (context: PluginContext) => {
     type: SPACES,
     cacheable: ['label', 'role'],
     properties: {
-      label: ['spaces label', { ns: SPACE_PLUGIN }],
+      label: ['spaces label', { ns: meta.id }],
       icon: 'ph--planet--regular',
       testId: 'spacePlugin.spaces',
       role: 'branch',
@@ -76,7 +77,7 @@ export default (context: PluginContext) => {
   return contributes(Capabilities.AppGraphBuilder, [
     // Primary actions.
     createExtension({
-      id: `${SPACE_PLUGIN}/primary-actions`,
+      id: `${meta.id}/primary-actions`,
       position: 'hoist',
       actions: (node) =>
         Rx.make((get) =>
@@ -91,7 +92,7 @@ export default (context: PluginContext) => {
                   await dispatch(createIntent(SpaceAction.OpenCreateSpace));
                 },
                 properties: {
-                  label: ['create space label', { ns: SPACE_PLUGIN }],
+                  label: ['create space label', { ns: meta.id }],
                   icon: 'ph--plus--regular',
                   testId: 'spacePlugin.createSpace',
                   disposition: 'menu',
@@ -104,7 +105,7 @@ export default (context: PluginContext) => {
                   await dispatch(createIntent(SpaceAction.Join));
                 },
                 properties: {
-                  label: ['join space label', { ns: SPACE_PLUGIN }],
+                  label: ['join space label', { ns: meta.id }],
                   icon: 'ph--sign-in--regular',
                   testId: 'spacePlugin.joinSpace',
                   disposition: 'menu',
@@ -119,7 +120,7 @@ export default (context: PluginContext) => {
                   await dispatch(createIntent(SpaceAction.OpenMembers, { space }));
                 },
                 properties: {
-                  label: ['share space label', { ns: SPACE_PLUGIN }],
+                  label: ['share space label', { ns: meta.id }],
                   icon: 'ph--users--regular',
                   testId: 'spacePlugin.shareSpace',
                   keyBinding: {
@@ -137,7 +138,7 @@ export default (context: PluginContext) => {
                   await dispatch(createIntent(SpaceAction.OpenSettings, { space }));
                 },
                 properties: {
-                  label: ['open current space settings label', { ns: SPACE_PLUGIN }],
+                  label: ['open current space settings label', { ns: meta.id }],
                   icon: 'ph--faders--regular',
                   keyBinding: {
                     macos: 'meta+shift+,',
@@ -153,7 +154,7 @@ export default (context: PluginContext) => {
 
     // Create spaces group node.
     createExtension({
-      id: `${SPACE_PLUGIN}/root`,
+      id: `${meta.id}/root`,
       position: 'hoist',
       connector: (node) =>
         Rx.make((get) =>
@@ -190,7 +191,7 @@ export default (context: PluginContext) => {
               }
 
               const settings = get(context.capabilities(Capabilities.SettingsStore))[0]?.getStore<SpaceSettingsProps>(
-                SPACE_PLUGIN,
+                meta.id,
               )?.value;
 
               // TODO(wittjosiah): During client reset, accessing default space throws.
@@ -275,7 +276,7 @@ export default (context: PluginContext) => {
 
     // Create space actions.
     createExtension({
-      id: `${SPACE_PLUGIN}/actions`,
+      id: `${meta.id}/actions`,
       actions: (node) =>
         Rx.make((get) =>
           pipe(
@@ -307,7 +308,7 @@ export default (context: PluginContext) => {
 
     // Create nodes for objects in the root collection of a space.
     createExtension({
-      id: `${SPACE_PLUGIN}/root-collection`,
+      id: `${meta.id}/root-collection`,
       connector: (node) =>
         Rx.make((get) =>
           pipe(
@@ -357,7 +358,7 @@ export default (context: PluginContext) => {
 
     // Create nodes for objects in a collection or by its fully qualified id.
     createExtension({
-      id: `${SPACE_PLUGIN}/objects`,
+      id: `${meta.id}/objects`,
       connector: (node) =>
         Rx.make((get) =>
           pipe(
@@ -428,7 +429,7 @@ export default (context: PluginContext) => {
 
     // Create nodes for objects in a query collection.
     createExtension({
-      id: `${SPACE_PLUGIN}/query-collection-objects`,
+      id: `${meta.id}/query-collection-objects`,
       connector: (node) => {
         let query: QueryResult<Type.Expando> | undefined;
         return Rx.make((get) =>
@@ -439,9 +440,8 @@ export default (context: PluginContext) => {
             ),
             Option.flatMap((collection) => {
               const space = getSpace(collection);
-              return collection.query.typename && space
-                ? Option.some({ typename: collection.query.typename, space })
-                : Option.none();
+              const typename = typenameFromQuery(collection.query);
+              return typename && space ? Option.some({ typename, space }) : Option.none();
             }),
             Option.map(({ typename, space }) => {
               const state = context.getCapability(SpaceCapabilities.State);
@@ -458,21 +458,25 @@ export default (context: PluginContext) => {
                   ),
                 );
               }
-              return get(rxFromQuery(query))
-                .map((object) =>
-                  get(
-                    rxFromSignal(() =>
-                      createObjectNode({
-                        object,
-                        space,
-                        resolve,
-                        droppable: false, // Cannot rearrange query collections.
-                        navigable: state.navigableCollections,
-                      }),
+              return (
+                get(rxFromQuery(query))
+                  // TODO(wittjosiah): This should be the default sort order.
+                  .toSorted((a, b) => a.id.localeCompare(b.id))
+                  .map((object) =>
+                    get(
+                      rxFromSignal(() =>
+                        createObjectNode({
+                          object,
+                          space,
+                          resolve,
+                          droppable: false, // Cannot rearrange query collections.
+                          navigable: state.navigableCollections,
+                        }),
+                      ),
                     ),
-                  ),
-                )
-                .filter(isNonNullable);
+                  )
+                  .filter(isNonNullable)
+              );
             }),
             Option.getOrElse(() => []),
           ),
@@ -482,7 +486,7 @@ export default (context: PluginContext) => {
 
     // Static schema records.
     createExtension({
-      id: `${SPACE_PLUGIN}/static-schemas`,
+      id: `${meta.id}/static-schemas`,
       connector: (node) => {
         const client = context.getCapability(ClientCapabilities.Client);
         return Rx.make((get) =>
@@ -490,7 +494,7 @@ export default (context: PluginContext) => {
             get(node),
             Option.flatMap((node) =>
               Obj.instanceOf(DataType.QueryCollection, node.data) &&
-              node.data.query.typename === DataType.StoredSchema.typename
+              typenameFromQuery(node.data.query) === DataType.StoredSchema.typename
                 ? Option.some(node.data)
                 : Option.none(),
             ),
@@ -514,7 +518,7 @@ export default (context: PluginContext) => {
 
     // Create static schema actions.
     createExtension({
-      id: `${SPACE_PLUGIN}/static-schema-actions`,
+      id: `${meta.id}/static-schema-actions`,
       actions: (node) => {
         let query: QueryResult<DataType.View> | undefined;
         return Rx.make((get) =>
@@ -534,13 +538,25 @@ export default (context: PluginContext) => {
               const filteredViews = get(
                 rxFromSignal(() =>
                   // TODO(wittjosiah): Remove cast.
-                  views.filter((view) => view.query.typename === Type.getTypename(schema as Type.Obj.Any)),
+                  views.filter(
+                    (view) => typenameFromQuery(view.query.ast) === Type.getTypename(schema as Type.Obj.Any),
+                  ),
                 ),
               );
               const deletable = filteredViews.length === 0;
 
+              const [dispatcher] = get(context.capabilities(Capabilities.IntentDispatcher));
+              if (!dispatcher) {
+                return [];
+              }
+
               // TODO(wittjosiah): Remove cast.
-              return createStaticSchemaActions({ schema: schema as Type.Obj.Any, space, deletable });
+              return createStaticSchemaActions({
+                schema: schema as Type.Obj.Any,
+                space,
+                dispatch: dispatcher.dispatchPromise,
+                deletable,
+              });
             }),
             Option.getOrElse(() => []),
           ),
@@ -550,7 +566,7 @@ export default (context: PluginContext) => {
 
     // Create nodes for schema views.
     createExtension({
-      id: `${SPACE_PLUGIN}/schema-views`,
+      id: `${meta.id}/schema-views`,
       connector: (node) => {
         let query: QueryResult<DataType.View> | undefined;
         return Rx.make((get) =>
@@ -571,7 +587,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) => view.query.typename === typename)
+                .filter((view) => typenameFromQuery(view.query.ast) === typename)
                 .map((view) =>
                   get(
                     rxFromSignal(() =>
@@ -592,9 +608,40 @@ export default (context: PluginContext) => {
       },
     }),
 
+    // Create record nodes.
+    createExtension({
+      id: `${meta.id}/records`,
+      resolver: (id) => {
+        let query: QueryResult<Type.Expando> | undefined;
+        return Rx.make((get) => {
+          const client = context.getCapability(ClientCapabilities.Client);
+          const { spaceId, objectId } = parseId(id);
+          if (!spaceId || !objectId) {
+            return null;
+          }
+
+          const space = client.spaces.get(spaceId);
+          if (!space) {
+            return null;
+          }
+
+          if (!query) {
+            query = space.db.query(Filter.ids(objectId));
+          }
+
+          const object = get(rxFromQuery(query)).at(0);
+          if (!object) {
+            return null;
+          }
+
+          return createObjectNode({ object, space, resolve, disposition: 'hidden' });
+        });
+      },
+    }),
+
     // Create collection actions and action groups.
     createExtension({
-      id: `${SPACE_PLUGIN}/object-actions`,
+      id: `${meta.id}/object-actions`,
       actions: (node) => {
         let query: QueryResult<DataType.View> | undefined;
         return Rx.make((get) =>
@@ -616,12 +663,12 @@ export default (context: PluginContext) => {
                 // Don't allow the Records smart collection to be deleted.
                 !(
                   Obj.instanceOf(DataType.QueryCollection, object) &&
-                  object.query.typename === DataType.StoredSchema.typename
+                  typenameFromQuery(object.query) === DataType.StoredSchema.typename
                 );
               if (isSchema && query) {
                 const views = get(rxFromQuery(query));
                 const filteredViews = get(
-                  rxFromSignal(() => views.filter((view) => view.query.typename === object.typename)),
+                  rxFromSignal(() => views.filter((view) => typenameFromQuery(view.query.ast) === object.typename)),
                 );
                 deletable = filteredViews.length === 0;
               }
@@ -653,7 +700,7 @@ export default (context: PluginContext) => {
 
     // View selected objects.
     createExtension({
-      id: `${SPACE_PLUGIN}/selected-objects`,
+      id: `${meta.id}/selected-objects`,
       connector: (node) =>
         Rx.make((get) =>
           pipe(
@@ -665,7 +712,7 @@ export default (context: PluginContext) => {
                 type: PLANK_COMPANION_TYPE,
                 data: 'selected-objects',
                 properties: {
-                  label: ['companion selected objects label', { ns: SPACE_PLUGIN }],
+                  label: ['companion selected objects label', { ns: meta.id }],
                   icon: 'ph--tree-view--regular',
                   disposition: 'hidden',
                 },
@@ -678,7 +725,7 @@ export default (context: PluginContext) => {
 
     // Object settings plank companion.
     createExtension({
-      id: `${SPACE_PLUGIN}/settings`,
+      id: `${meta.id}/settings`,
       connector: (node) =>
         Rx.make((get) =>
           pipe(
@@ -690,7 +737,7 @@ export default (context: PluginContext) => {
                 type: PLANK_COMPANION_TYPE,
                 data: 'settings',
                 properties: {
-                  label: ['object settings label', { ns: SPACE_PLUGIN }],
+                  label: ['object settings label', { ns: meta.id }],
                   icon: 'ph--sliders--regular',
                   disposition: 'hidden',
                   position: 'fallback',

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

@@ -7,7 +7,7 @@ import { isSpace } from '@dxos/client/echo';
 import { Obj, Type } from '@dxos/echo';
 import { DataType } from '@dxos/schema';
 
-import { SPACE_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { translations } from '../translations';
 import { SPACE_TYPE, SpaceAction } from '../types';
 import { SPACES } from '../util';
@@ -23,8 +23,8 @@ export default (context: PluginContext) =>
       inputType: SPACES,
       outputType: DIRECTORY_TYPE,
       serialize: (node) => ({
-        name: translations[0]['en-US'][SPACE_PLUGIN]['spaces label'] ?? 'Spaces',
-        data: translations[0]['en-US'][SPACE_PLUGIN]['spaces label'] ?? 'Spaces',
+        name: translations[0]['en-US'][meta.id]['spaces label'] ?? 'Spaces',
+        data: translations[0]['en-US'][meta.id]['spaces label'] ?? 'Spaces',
         type: DIRECTORY_TYPE,
       }),
       deserialize: () => {
@@ -35,8 +35,8 @@ export default (context: PluginContext) =>
       inputType: SPACE_TYPE,
       outputType: DIRECTORY_TYPE,
       serialize: (node) => ({
-        name: node.data.properties.name ?? translations[0]['en-US'][SPACE_PLUGIN]['unnamed space label'],
-        data: node.data.properties.name ?? translations[0]['en-US'][SPACE_PLUGIN]['unnamed space label'],
+        name: node.data.properties.name ?? translations[0]['en-US'][meta.id]['unnamed space label'],
+        data: node.data.properties.name ?? translations[0]['en-US'][meta.id]['unnamed space label'],
         type: DIRECTORY_TYPE,
       }),
       deserialize: async (data) => {
@@ -49,8 +49,8 @@ export default (context: PluginContext) =>
       inputType: COLLECTION_TYPE,
       outputType: DIRECTORY_TYPE,
       serialize: (node) => ({
-        name: node.data.name ?? translations[0]['en-US'][SPACE_PLUGIN]['object name placeholder'],
-        data: node.data.name ?? translations[0]['en-US'][SPACE_PLUGIN]['object name placeholder'],
+        name: node.data.name ?? translations[0]['en-US'][meta.id]['object name placeholder'],
+        data: node.data.name ?? translations[0]['en-US'][meta.id]['object name placeholder'],
         type: DIRECTORY_TYPE,
       }),
       deserialize: async (data, ancestors) => {

package/src/capabilities/capabilities.ts

@@ -4,26 +4,27 @@
 
 import { type Schema } from 'effect';
 
-import { type AnyIntentChain, defineCapability, type Label } from '@dxos/app-framework';
+import { type AnyIntentChain, type Label, defineCapability } from '@dxos/app-framework';
 import { type Space } from '@dxos/react-client/echo';
 import { type DataType } from '@dxos/schema';
-import { type Position, type DeepReadonly } from '@dxos/util';
+import { type DeepReadonly, type Position } from '@dxos/util';
 
-import { SPACE_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { type ObjectForm, type PluginState } from '../types';
 
 export namespace SpaceCapabilities {
-  export const State = defineCapability<DeepReadonly<PluginState>>(`${SPACE_PLUGIN}/capability/state`);
-  export const MutableState = defineCapability<PluginState>(`${SPACE_PLUGIN}/capability/state`);
+  export const State = defineCapability<DeepReadonly<PluginState>>(`${meta.id}/capability/state`);
+  export const MutableState = defineCapability<PluginState>(`${meta.id}/capability/state`);
 
   export type SettingsSection = { id: string; label: Label; position?: Position };
-  export const SettingsSection = defineCapability<SettingsSection>(`${SPACE_PLUGIN}/capability/settings-section`);
+  export const SettingsSection = defineCapability<SettingsSection>(`${meta.id}/capability/settings-section`);
 
-  export type OnSpaceCreated = (params: { space: Space; rootCollection: DataType.Collection }) => AnyIntentChain;
-  export const OnSpaceCreated = defineCapability<OnSpaceCreated>(`${SPACE_PLUGIN}/capability/on-space-created`);
+  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 const OnSchemaAdded = defineCapability<OnSchemaAdded>(`${SPACE_PLUGIN}/capability/on-schema-added`);
+  export const OnSchemaAdded = defineCapability<OnSchemaAdded>(`${meta.id}/capability/on-schema-added`);
 
-  export const ObjectForm = defineCapability<ObjectForm<any>>(`${SPACE_PLUGIN}/capability/object-form`);
+  // TODO(burdon): Should this be view? Forms are UI concepts? (associated with a View/schema).
+  export const ObjectForm = defineCapability<ObjectForm<any>>(`${meta.id}/capability/object-form`);
 }

package/src/capabilities/identity-created.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { contributes, type PluginContext, Capabilities } from '@dxos/app-framework';
+import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
 import { Obj, Ref } from '@dxos/echo';
 import { Migrations } from '@dxos/migrations';
 import { ClientCapabilities } from '@dxos/plugin-client';

package/src/capabilities/index.ts

@@ -11,7 +11,6 @@ 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 SpaceSettings = lazy(() => import('./settings'));
 export const SpaceState = lazy(() => import('./state'));
 export const SpacesReady = lazy(() => import('./spaces-ready'));

package/src/capabilities/intent-resolver.ts

@@ -12,31 +12,32 @@ import {
   createIntent,
   createResolver,
 } from '@dxos/app-framework';
-import { Obj, Ref, Relation, Type } from '@dxos/echo';
+import { Filter, Obj, Query, Ref, Relation, Type } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { Migrations } from '@dxos/migrations';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
-import { isSpace, getSpace, SpaceState, fullyQualifiedId } from '@dxos/react-client/echo';
+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 } from '@dxos/schema';
+import { DataType, ProjectionModel, typenameFromQuery } from '@dxos/schema';
 
-import { SpaceCapabilities } from './capabilities';
 import {
   CREATE_OBJECT_DIALOG,
   CREATE_SPACE_DIALOG,
+  type CreateObjectDialogProps,
   JOIN_DIALOG,
+  type JoinDialogProps,
   POPOVER_RENAME_OBJECT,
   POPOVER_RENAME_SPACE,
-  type CreateObjectDialogProps,
-  type JoinDialogProps,
 } from '../components';
 import { SpaceEvents } from '../events';
-import { SPACE_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { CollectionAction, SpaceAction } from '../types';
-import { cloneObject, COMPOSER_SPACE_LOCK, getNestedObjects } from '../util';
+import { COMPOSER_SPACE_LOCK, cloneObject, getNestedObjects } from '../util';
+
+import { SpaceCapabilities } from './capabilities';
 
 // TODO(wittjosiah): Remove.
 const SPACE_MAX_OBJECTS = 500;
@@ -87,15 +88,15 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
 
         // Create records smart collection.
         const records = Obj.make(DataType.QueryCollection, {
-          query: { typename: DataType.StoredSchema.typename },
+          query: Query.select(Filter.typename(DataType.StoredSchema.typename)).ast,
         });
         collection.objects.push(Ref.make(records));
 
         // Allow other plugins to add default content.
         await context.activatePromise(SpaceEvents.SpaceCreated);
-        const onSpaceCreatedCallbacks = context.getCapabilities(SpaceCapabilities.OnSpaceCreated);
-        const spaceCreatedIntents = onSpaceCreatedCallbacks.map((onSpaceCreated) =>
-          onSpaceCreated({ space, rootCollection: collection }),
+        const onCreateSpaceCallbacks = context.getCapabilities(SpaceCapabilities.onCreateSpace);
+        const spaceCreatedIntents = onCreateSpaceCallbacks.map((onCreateSpace) =>
+          onCreateSpace({ space, rootCollection: collection }),
         );
 
         return {
@@ -360,11 +361,17 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     }),
     createResolver({
       intent: SpaceAction.AddSchema,
-      resolve: async ({ space, name, schema: schemaInput }) => {
+      resolve: async ({ space, name, typename, version, schema: schemaInput }) => {
         const [schema] = await space.db.schemaRegistry.register([schemaInput]);
         if (name) {
           schema.storedSchema.name = name;
         }
+        if (typename) {
+          schema.storedSchema.typename = typename;
+        }
+        if (version) {
+          schema.storedSchema.version = version;
+        }
 
         await context.activatePromise(SpaceEvents.SchemaAdded);
         const onSchemaAdded = context.getCapabilities(SpaceCapabilities.OnSchemaAdded);
@@ -399,15 +406,16 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
       resolve: async ({ view, fieldId, deletionData }, undo) => {
         const space = getSpace(view);
         invariant(space);
-        invariant(view.query.typename);
-        const schema = await space.db.schemaRegistry.query({ typename: view.query.typename }).firstOrUndefined();
+        const typename = typenameFromQuery(view.query.ast);
+        invariant(typename);
+        const schema = await space.db.schemaRegistry.query({ typename }).firstOrUndefined();
         invariant(schema);
         const projection = new ProjectionModel(schema.jsonSchema, view.projection);
         if (!undo) {
           const { deleted, index } = projection.deleteFieldProjection(fieldId);
           return {
             undoable: {
-              message: ['field deleted label', { ns: SPACE_PLUGIN }],
+              message: ['field deleted label', { ns: meta.id }],
               data: { deletionData: { ...deleted, index } },
             },
           };
@@ -419,7 +427,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     }),
     createResolver({
       intent: SpaceAction.OpenCreateObject,
-      resolve: ({ target, typename, navigable = true, onCreateObject }) => {
+      resolve: ({ target, views, typename, initialFormValues, navigable = true, onCreateObject }) => {
         const state = context.getCapability(SpaceCapabilities.State);
 
         return {
@@ -431,7 +439,9 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
                 blockAlign: 'start',
                 props: {
                   target,
+                  views,
                   typename,
+                  initialFormValues,
                   onCreateObject,
                   shouldNavigate: navigable
                     ? (object: Obj.Any) => {
@@ -460,13 +470,13 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
               createIntent(LayoutAction.AddToast, {
                 part: 'toast',
                 subject: {
-                  id: `${SPACE_PLUGIN}/space-limit`,
-                  title: ['space limit label', { ns: SPACE_PLUGIN }],
-                  description: ['space limit description', { ns: SPACE_PLUGIN }],
+                  id: `${meta.id}/space-limit`,
+                  title: ['space limit label', { ns: meta.id }],
+                  description: ['space limit description', { ns: meta.id }],
                   duration: 5_000,
                   icon: 'ph--warning--regular',
-                  actionLabel: ['remove deleted objects label', { ns: SPACE_PLUGIN }],
-                  actionAlt: ['remove deleted objects alt', { ns: SPACE_PLUGIN }],
+                  actionLabel: ['remove deleted objects label', { ns: meta.id }],
+                  actionAlt: ['remove deleted objects alt', { ns: meta.id }],
                   closeLabel: ['close label', { ns: 'os' }],
                   onAction: () => space.db.coreDatabase.unlinkDeletedObjects(),
                 },
@@ -595,7 +605,7 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
           return {
             undoable: {
               // TODO(ZaymonFC): Pluralize if more than one object.
-              message: [undoMessageKey, { ns: SPACE_PLUGIN }],
+              message: [undoMessageKey, { ns: meta.id }],
               data: { deletionData },
             },
             intents:
@@ -687,7 +697,9 @@ export default ({ context, observability, createInvitationUrl }: IntentResolverO
     createResolver({
       intent: CollectionAction.CreateQueryCollection,
       resolve: async ({ name, typename }) => ({
-        data: { object: Obj.make(DataType.QueryCollection, { name, query: { typename } }) },
+        data: {
+          object: Obj.make(DataType.QueryCollection, { name, query: Query.select(Filter.typename(typename)).ast }),
+        },
       }),
     }),
   ]);

package/src/capabilities/react-root.tsx

@@ -6,13 +6,14 @@ import React from 'react';
 
 import { Capabilities, contributes, useCapability } from '@dxos/app-framework';
 
-import { SpaceCapabilities } from './capabilities';
 import { AwaitingObject } from '../components';
-import { SPACE_PLUGIN } from '../meta';
+import { meta } from '../meta';
+
+import { SpaceCapabilities } from './capabilities';
 
 export default () =>
   contributes(Capabilities.ReactRoot, {
-    id: SPACE_PLUGIN,
+    id: meta.id,
     root: () => {
       const state = useCapability(SpaceCapabilities.State);
       return state.awaiting ? <AwaitingObject id={state.awaiting} /> : null;