@dxos/plugin-space 0.8.4-main.c1de068 → 0.8.4-main.e098934

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.8.4-main.c1de068",
+  "version": "0.8.4-main.e098934",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,11 +10,13 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
     "./types": {
+      "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
       "node": "./dist/lib/node-esm/types/index.mjs"
@@ -33,67 +35,68 @@
     "src"
   ],
   "dependencies": {
-    "@automerge/automerge": "3.0.0",
+    "@automerge/automerge": "3.1.1",
     "@preact-signals/safe-react": "^0.9.0",
     "@preact/signals-core": "^1.9.0",
-    "effect": "3.17.0",
+    "effect": "3.17.7",
     "jszip": "^3.10.1",
     "localforage": "^1.10.0",
     "react-drag-drop-files": "^2.3.8",
     "react-is": "~18.2.0",
     "react-qr-rounded": "^1.0.0",
-    "@dxos/ai": "0.8.4-main.c1de068",
-    "@dxos/app-framework": "0.8.4-main.c1de068",
-    "@dxos/blueprints": "0.8.4-main.c1de068",
-    "@dxos/context": "0.8.4-main.c1de068",
-    "@dxos/async": "0.8.4-main.c1de068",
-    "@dxos/client": "0.8.4-main.c1de068",
-    "@dxos/echo": "0.8.4-main.c1de068",
-    "@dxos/display-name": "0.8.4-main.c1de068",
-    "@dxos/echo-schema": "0.8.4-main.c1de068",
-    "@dxos/echo-signals": "0.8.4-main.c1de068",
-    "@dxos/effect": "0.8.4-main.c1de068",
-    "@dxos/invariant": "0.8.4-main.c1de068",
-    "@dxos/keys": "0.8.4-main.c1de068",
-    "@dxos/live-object": "0.8.4-main.c1de068",
-    "@dxos/local-storage": "0.8.4-main.c1de068",
-    "@dxos/log": "0.8.4-main.c1de068",
-    "@dxos/migrations": "0.8.4-main.c1de068",
-    "@dxos/plugin-client": "0.8.4-main.c1de068",
-    "@dxos/plugin-graph": "0.8.4-main.c1de068",
-    "@dxos/plugin-observability": "0.8.4-main.c1de068",
-    "@dxos/plugin-deck": "0.8.4-main.c1de068",
-    "@dxos/plugin-status-bar": "0.8.4-main.c1de068",
-    "@dxos/react-client": "0.8.4-main.c1de068",
-    "@dxos/react-ui-attention": "0.8.4-main.c1de068",
-    "@dxos/react-ui-editor": "0.8.4-main.c1de068",
-    "@dxos/protocols": "0.8.4-main.c1de068",
-    "@dxos/react-ui-form": "0.8.4-main.c1de068",
-    "@dxos/react-ui-pickers": "0.8.4-main.c1de068",
-    "@dxos/react-ui-list": "0.8.4-main.c1de068",
-    "@dxos/react-ui-searchlist": "0.8.4-main.c1de068",
-    "@dxos/react-ui-stack": "0.8.4-main.c1de068",
-    "@dxos/plugin-attention": "0.8.4-main.c1de068",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.c1de068",
-    "@dxos/react-ui-tabs": "0.8.4-main.c1de068",
-    "@dxos/react-ui-theme": "0.8.4-main.c1de068",
-    "@dxos/schema": "0.8.4-main.c1de068",
-    "@dxos/util": "0.8.4-main.c1de068",
-    "@dxos/shell": "0.8.4-main.c1de068"
+    "@dxos/ai": "0.8.4-main.e098934",
+    "@dxos/app-framework": "0.8.4-main.e098934",
+    "@dxos/async": "0.8.4-main.e098934",
+    "@dxos/blueprints": "0.8.4-main.e098934",
+    "@dxos/context": "0.8.4-main.e098934",
+    "@dxos/client": "0.8.4-main.e098934",
+    "@dxos/display-name": "0.8.4-main.e098934",
+    "@dxos/echo-schema": "0.8.4-main.e098934",
+    "@dxos/echo-signals": "0.8.4-main.e098934",
+    "@dxos/echo": "0.8.4-main.e098934",
+    "@dxos/effect": "0.8.4-main.e098934",
+    "@dxos/invariant": "0.8.4-main.e098934",
+    "@dxos/local-storage": "0.8.4-main.e098934",
+    "@dxos/log": "0.8.4-main.e098934",
+    "@dxos/keys": "0.8.4-main.e098934",
+    "@dxos/live-object": "0.8.4-main.e098934",
+    "@dxos/migrations": "0.8.4-main.e098934",
+    "@dxos/plugin-attention": "0.8.4-main.e098934",
+    "@dxos/plugin-deck": "0.8.4-main.e098934",
+    "@dxos/plugin-graph": "0.8.4-main.e098934",
+    "@dxos/plugin-observability": "0.8.4-main.e098934",
+    "@dxos/plugin-status-bar": "0.8.4-main.e098934",
+    "@dxos/protocols": "0.8.4-main.e098934",
+    "@dxos/plugin-client": "0.8.4-main.e098934",
+    "@dxos/react-client": "0.8.4-main.e098934",
+    "@dxos/react-ui-editor": "0.8.4-main.e098934",
+    "@dxos/react-ui-components": "0.8.4-main.e098934",
+    "@dxos/react-ui-attention": "0.8.4-main.e098934",
+    "@dxos/react-ui-form": "0.8.4-main.e098934",
+    "@dxos/react-ui-pickers": "0.8.4-main.e098934",
+    "@dxos/react-ui-searchlist": "0.8.4-main.e098934",
+    "@dxos/react-ui-list": "0.8.4-main.e098934",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.e098934",
+    "@dxos/react-ui-tabs": "0.8.4-main.e098934",
+    "@dxos/react-ui-theme": "0.8.4-main.e098934",
+    "@dxos/shell": "0.8.4-main.e098934",
+    "@dxos/schema": "0.8.4-main.e098934",
+    "@dxos/util": "0.8.4-main.e098934",
+    "@dxos/react-ui-stack": "0.8.4-main.e098934"
   },
   "devDependencies": {
     "@babel/core": "^7.18.13",
     "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.89.0",
+    "@effect/platform": "0.90.2",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/react-ui": "0.8.4-main.c1de068",
-    "@dxos/storybook-utils": "0.8.4-main.c1de068",
-    "@dxos/react-ui-theme": "0.8.4-main.c1de068",
-    "@dxos/random": "0.8.4-main.c1de068"
+    "vite": "7.1.1",
+    "@dxos/random": "0.8.4-main.e098934",
+    "@dxos/react-ui": "0.8.4-main.e098934",
+    "@dxos/storybook-utils": "0.8.4-main.e098934",
+    "@dxos/react-ui-theme": "0.8.4-main.e098934"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -101,8 +104,8 @@
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.c1de068",
-    "@dxos/react-ui-theme": "0.8.4-main.c1de068"
+    "@dxos/react-ui": "0.8.4-main.e098934",
+    "@dxos/react-ui-theme": "0.8.4-main.e098934"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.ts

@@ -17,7 +17,7 @@ import {
 import { Ref, Type } from '@dxos/echo';
 import { AttentionEvents } from '@dxos/plugin-attention';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { createDefaultSchema, DataType, ViewTypeV1, ViewTypeV1ToV2, ViewTypeV2 } from '@dxos/schema';
+import { DataType, createDefaultSchema, typenameFromQuery } from '@dxos/schema';
 import { translations as shellTranslations } from '@dxos/shell/react';
 
 import {
@@ -28,16 +28,15 @@ import {
   ReactRoot,
   ReactSurface,
   SchemaDefs,
-  SchemaTools,
   SpaceCapabilities,
   SpaceSettings,
-  SpacesReady,
   SpaceState,
+  SpacesReady,
 } from './capabilities';
 import { SpaceEvents } from './events';
 import { meta } from './meta';
 import { translations } from './translations';
-import { CollectionAction, defineObjectForm, SpaceAction } from './types';
+import { CollectionAction, SpaceAction, defineObjectForm } from './types';
 
 export type SpacePluginOptions = {
   /**
@@ -104,7 +103,7 @@ export const SpacePlugin = ({
           metadata: {
             label: (object: DataType.QueryCollection) => [
               'typename label',
-              { ns: object.query.typename, count: 2, defaultValue: 'New smart collection' },
+              { ns: typenameFromQuery(object.query), count: 2, defaultValue: 'New smart collection' },
             ],
             icon: 'ph--funnel-simple--regular',
           },
@@ -133,12 +132,6 @@ export const SpacePlugin = ({
             icon: 'ph--user--regular',
           },
         }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(DataType.Project),
-          metadata: {
-            icon: 'ph--check-square-offset--regular',
-          },
-        }),
         contributes(Capabilities.Metadata, {
           id: Type.getTypename(DataType.Task),
           metadata: {
@@ -162,7 +155,8 @@ export const SpacePlugin = ({
         contributes(
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
-            objectSchema: DataType.QueryCollection,
+            // TODO(wittjosiah): Remove cast.
+            objectSchema: DataType.QueryCollection as any,
             formSchema: CollectionAction.QueryCollectionForm,
             getIntent: (props) => createIntent(CollectionAction.CreateQueryCollection, props),
           }),
@@ -196,8 +190,6 @@ export const SpacePlugin = ({
       activate: () =>
         contributes(ClientCapabilities.Schema, [
           DataType.View,
-          ViewTypeV1,
-          ViewTypeV2,
           DataType.Event,
           DataType.Organization,
           DataType.Person,
@@ -205,11 +197,6 @@ export const SpacePlugin = ({
           DataType.Task,
         ]),
     }),
-    defineModule({
-      id: `${meta.id}/module/migration`,
-      activatesOn: ClientEvents.SetupMigration,
-      activate: () => contributes(ClientCapabilities.Migration, [ViewTypeV1ToV2]),
-    }),
     defineModule({
       id: `${meta.id}/module/whitelist-schema`,
       activatesOn: ClientEvents.SetupSchema,
@@ -268,10 +255,5 @@ export const SpacePlugin = ({
       ),
       activate: SpacesReady,
     }),
-    defineModule({
-      id: `${meta.id}/module/tools`,
-      activatesOn: Events.SetupArtifactDefinition,
-      activate: SchemaTools,
-    }),
   ]);
 };

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 { 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) =>
@@ -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(() => []),
           ),
@@ -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(),
             ),
@@ -534,13 +538,23 @@ 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) === 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(() => []),
           ),
@@ -571,7 +585,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) === typename)
                 .map((view) =>
                   get(
                     rxFromSignal(() =>
@@ -592,6 +606,37 @@ export default (context: PluginContext) => {
       },
     }),
 
+    // Create record nodes.
+    createExtension({
+      id: `${SPACE_PLUGIN}/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`,
@@ -611,11 +656,17 @@ export default (context: PluginContext) => {
                 query = space.db.query(Filter.type(DataType.View));
               }
 
-              let deletable = !isSchema;
+              let deletable =
+                !isSchema &&
+                // Don't allow the Records smart collection to be deleted.
+                !(
+                  Obj.instanceOf(DataType.QueryCollection, object) &&
+                  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) === object.typename)),
                 );
                 deletable = filteredViews.length === 0;
               }

package/src/capabilities/capabilities.ts

@@ -4,10 +4,10 @@
 
 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 { type ObjectForm, type PluginState } from '../types';
@@ -25,5 +25,6 @@ export namespace SpaceCapabilities {
   export type OnSchemaAdded = (params: { space: Space; schema: Schema.Schema.AnyNoContext }) => AnyIntentChain;
   export const OnSchemaAdded = defineCapability<OnSchemaAdded>(`${SPACE_PLUGIN}/capability/on-schema-added`);
 
+  // TODO(burdon): Should this be view? Forms are UI concepts? (associated with a View/schema).
   export const ObjectForm = defineCapability<ObjectForm<any>>(`${SPACE_PLUGIN}/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 { 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,7 +88,7 @@ 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));
 
@@ -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,8 +406,9 @@ 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);
+        invariant(typename);
+        const schema = await space.db.schemaRegistry.query({ typename }).firstOrUndefined();
         invariant(schema);
         const projection = new ProjectionModel(schema.jsonSchema, view.projection);
         if (!undo) {
@@ -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) => {
@@ -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,10 +6,11 @@ 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 { SpaceCapabilities } from './capabilities';
+
 export default () =>
   contributes(Capabilities.ReactRoot, {
     id: SPACE_PLUGIN,