@dxos/plugin-space 0.9.0 → 0.9.1-staging.ee54ba693a

package/src/capabilities/react-surface.tsx

@@ -4,44 +4,46 @@
 
 import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
-import type * as Schema from 'effect/Schema';
-import * as SchemaAST from 'effect/SchemaAST';
 import React, { type ComponentProps, useCallback } from 'react';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { Surface, useAtomCapability, useOperationInvoker } from '@dxos/app-framework/ui';
-import { RootCollectionAnnotation } from '@dxos/app-toolkit';
+import { Surface, useAtomCapability, useOperationInvoker, useSettingsState } from '@dxos/app-framework/ui';
+import { AppAnnotation } from '@dxos/app-toolkit';
 import { AppSurface, useActiveSpace, useTypeOptions } from '@dxos/app-toolkit/ui';
-import { Annotation, Collection, Database, Entity, Obj, Type } from '@dxos/echo';
+import { Annotation, Collection, Database, Obj, Type } from '@dxos/echo';
 import { SchemaEx } from '@dxos/effect';
 import { type Space, SpaceState, getSpace, isSpace, useSpaces } from '@dxos/react-client/echo';
 import { Input } from '@dxos/react-ui';
-import { type FormFieldComponentProps, SelectField } from '@dxos/react-ui-form';
+import { type FormFieldRendererProps, SelectField } from '@dxos/react-ui-form';
 import { HuePicker, IconPicker } from '@dxos/react-ui-pickers';
 import { ViewAnnotation } from '@dxos/schema';
+import { Position } from '@dxos/util';
 
-import { SpaceSettings } from '#components';
 import {
   CollectionArticle,
   CollectionSection,
   CreateObjectDialog,
   CreateSpaceDialog,
+  DefaultProperties,
   ImportSpaceDialog,
   InlineSyncStatus,
   JoinDialog,
   MembersContainer,
   MenuFooter,
-  EntityRenamePopover,
   ObjectCardStack,
-  ObjectProperties,
   RecordArticle,
   RelatedArticle,
+  RenamePopover,
+  type RenameSubject,
   SchemaContainer,
   SmallPresenceLive,
+  SpaceHomeArticle,
+  SpaceHomeRecent,
   SpacePresence,
-  SpaceRenamePopover,
+  SpaceSettings,
   SpaceSettingsContainer,
   SyncStatus,
+  TypeCollectionArticle,
   ViewEditor,
 } from '#containers';
 import { meta } from '#meta';
@@ -49,7 +51,10 @@ import { SpaceOperation } from '#operations';
 import {
   HueAnnotationId,
   IconAnnotationId,
+  Settings,
+  SPACE_HOME_NODE_TYPE,
   SpaceCapabilities,
+  SpaceHomeContent,
   type TypeInputOptions,
   TypeInputOptionsAnnotationId,
 } from '#types';
@@ -59,8 +64,7 @@ import {
   CREATE_SPACE_DIALOG,
   IMPORT_SPACE_DIALOG,
   JOIN_DIALOG,
-  ENTITY_RENAME_POPOVER,
-  SPACE_RENAME_POPOVER,
+  RENAME_POPOVER,
 } from '../constants';
 
 type ReactSurfaceOptions = {
@@ -70,28 +74,62 @@ type ReactSurfaceOptions = {
 export default Capability.makeModule(
   Effect.fnUntraced(function* ({ createInvitationUrl }: ReactSurfaceOptions) {
     return Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: 'spaceHome',
+        filter: AppSurface.literal(AppSurface.Article, SPACE_HOME_NODE_TYPE),
+        component: ({ data, role }) => (
+          <SpaceHomeArticle role={role} attendableId={data.attendableId} space={data.properties?.space} />
+        ),
+      }),
+      Surface.create({
+        id: 'spaceHomeRecent',
+        filter: Surface.makeFilter(SpaceHomeContent),
+        component: ({ data }) => <SpaceHomeRecent space={data.space} />,
+      }),
       Surface.create({
         id: 'collectionFallback',
-        position: 'last',
+        position: Position.last,
         filter: AppSurface.object(AppSurface.Article, Collection.Collection),
         component: ({ data }) => <CollectionArticle attendableId={data.attendableId} subject={data.subject} />,
       }),
       Surface.create({
         id: 'recordArticle',
-        position: 'last',
+        position: Position.last,
         filter: AppSurface.subject(AppSurface.Article, Obj.isObject),
         component: ({ data }) => <RecordArticle subject={data.subject} />,
       }),
+      Surface.create({
+        id: 'typeCollection',
+        filter: AppSurface.subject(AppSurface.Article, Type.isType),
+        component: ({ data, role }) => {
+          const space = isSpace(data.properties?.space) ? data.properties.space : undefined;
+          if (!space) {
+            return null;
+          }
+
+          return (
+            <TypeCollectionArticle
+              role={role}
+              space={space}
+              typeUri={Type.getURI(data.subject)}
+              attendableId={data.attendableId}
+            />
+          );
+        },
+      }),
       Surface.create({
         id: 'pluginSettings',
-        filter: AppSurface.settings(AppSurface.Article, meta.id),
-        component: () => {
+        filter: AppSurface.settings(AppSurface.Article, meta.profile.key),
+        component: ({ data: { subject } }) => {
           const spaces = useSpaces();
           const { invokePromise } = useOperationInvoker();
+          const { settings, updateSettings } = useSettingsState<Settings.Settings>(subject.atom);
           return (
             <SpaceSettings
               spaces={spaces}
               onOpenSpaceSettings={(space: Space) => invokePromise(SpaceOperation.OpenSettings, { space })}
+              settings={settings}
+              onSettingsChange={updateSettings}
             />
           );
         },
@@ -102,7 +140,7 @@ export default Capability.makeModule(
           AppSurface.literal(AppSurface.Article, 'settings'),
           AppSurface.companion(AppSurface.Article),
         ),
-        component: ({ ref, data, role }) => <ObjectProperties role={role} subject={data.companionTo} ref={ref} />,
+        component: ({ ref, data, role }) => <DefaultProperties role={role} subject={data.companionTo} ref={ref} />,
       }),
       Surface.create({
         id: 'companion.related',
@@ -114,7 +152,7 @@ export default Capability.makeModule(
       }),
       Surface.create({
         id: 'spaceSettingsProperties',
-        filter: AppSurface.literal(AppSurface.Article, `${meta.id}.general`),
+        filter: AppSurface.literal(AppSurface.Article, `${meta.profile.key}.general`),
         component: ({ ref }) => {
           const space = useActiveSpace();
           if (!space) {
@@ -126,8 +164,8 @@ export default Capability.makeModule(
       }),
       Surface.create({
         id: 'spaceSettingsMembers',
-        position: 'first',
-        filter: AppSurface.literal(AppSurface.Article, `${meta.id}.members`),
+        position: Position.first,
+        filter: AppSurface.literal(AppSurface.Article, `${meta.profile.key}.members`),
         component: () => {
           const space = useActiveSpace();
           if (!space) {
@@ -139,7 +177,7 @@ export default Capability.makeModule(
       }),
       Surface.create({
         id: 'spaceSettingsSchema',
-        filter: AppSurface.literal(AppSurface.Article, `${meta.id}.schema`),
+        filter: AppSurface.literal(AppSurface.Article, `${meta.profile.key}.schema`),
         component: () => {
           const space = useActiveSpace();
           if (!space) {
@@ -151,19 +189,10 @@ export default Capability.makeModule(
       }),
       Surface.create({
         id: 'selectedObjects',
-        role: 'article',
-        filter: (data): data is { companionTo: Obj.Unknown; subject: 'selected-objects' } => {
-          if (data.subject !== 'selected-objects' || !Obj.isObject(data.companionTo)) {
-            return false;
-          }
-
-          const type = Obj.getType(data.companionTo);
-          const path = type
-            ? Option.getOrElse(ViewAnnotation.get(Type.getSchema(type)), () => [] as readonly string[])
-            : [];
-          const viewTarget = path.length > 0 ? ViewAnnotation.tryGetTargetAlongPath(data.companionTo, path) : undefined;
-          return !!viewTarget;
-        },
+        filter: AppSurface.allOf(
+          AppSurface.literal(AppSurface.Article, 'selected-objects'),
+          AppSurface.companion(AppSurface.Article, Obj.isObject),
+        ),
         // TODO(burdon): Replace with mosaic.
         component: ({ data, ref }) => {
           const type = Obj.getType(data.companionTo);
@@ -210,18 +239,14 @@ export default Capability.makeModule(
       }),
       Surface.create({
         id: 'createInitialSpaceFormHue',
-        role: 'form-input',
-        filter: (data): data is { prop: string; schema: Schema.Schema<any>; fieldPropertyAst?: SchemaAST.AST } => {
-          const annotation = SchemaEx.findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, HueAnnotationId);
-          return !!annotation;
-        },
+        filter: AppSurface.formInputBySchema((ast) => !!SchemaEx.findAnnotation<boolean>(ast, HueAnnotationId)),
         component: ({ data, ...inputProps }) => {
           const ast = data.fieldPropertyAst;
           if (!ast) {
             return null;
           }
 
-          const { label, readonly, getValue, onValueChange } = inputProps as any as FormFieldComponentProps;
+          const { label, readonly, getValue, onValueChange } = inputProps as any as FormFieldRendererProps;
           const handleChange = useCallback((nextHue: string) => onValueChange(ast, nextHue), [ast, onValueChange]);
           const handleReset = useCallback(() => onValueChange(ast, undefined), [ast, onValueChange]);
           return (
@@ -234,18 +259,14 @@ export default Capability.makeModule(
       }),
       Surface.create({
         id: 'createInitialSpaceFormIcon',
-        role: 'form-input',
-        filter: (data): data is { prop: string; schema: Schema.Schema<any>; fieldPropertyAst?: SchemaAST.AST } => {
-          const annotation = SchemaEx.findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, IconAnnotationId);
-          return !!annotation;
-        },
+        filter: AppSurface.formInputBySchema((ast) => !!SchemaEx.findAnnotation<boolean>(ast, IconAnnotationId)),
         component: ({ data, ...inputProps }) => {
           const ast = data.fieldPropertyAst;
           if (!ast) {
             return null;
           }
 
-          const { label, readonly, getValue, onValueChange } = inputProps as any as FormFieldComponentProps;
+          const { label, readonly, getValue, onValueChange } = inputProps as any as FormFieldRendererProps;
           const handleChange = useCallback((nextIcon: string) => onValueChange(ast, nextIcon), [ast, onValueChange]);
           const handleReset = useCallback(() => onValueChange(ast, undefined), [ast, onValueChange]);
           return (
@@ -263,34 +284,20 @@ export default Capability.makeModule(
       }),
       Surface.create({
         id: 'typenameFormInput',
-        role: 'form-input',
-        filter: (
-          data,
-        ): data is {
-          prop: string;
-          schema: Schema.Schema.Any;
-          target: Database.Database | Collection.Collection | undefined;
-          fieldPropertyAst?: SchemaAST.AST;
-        } => {
-          if (data.prop !== 'typename') {
-            return false;
-          }
-
-          const annotation = SchemaEx.findAnnotation(
-            (data.schema as Schema.Schema.All).ast,
-            TypeInputOptionsAnnotationId,
-          );
-          return !!annotation;
-        },
-        component: ({ data: { schema, target, fieldPropertyAst }, ...inputProps }) => {
-          const ast = fieldPropertyAst;
+        filter: AppSurface.formInput(
+          (data) =>
+            data.prop === 'typename' && !!SchemaEx.findAnnotation(data.schema.ast, TypeInputOptionsAnnotationId),
+        ),
+        component: ({ data, ...inputProps }) => {
+          const ast = data.fieldPropertyAst;
           if (!ast) {
             return null;
           }
 
-          const props = { ...inputProps, type: ast } as any as FormFieldComponentProps;
-          const db = Database.isDatabase(target) ? target : target && Obj.getDatabase(target);
-          const annotation = SchemaEx.findAnnotation<TypeInputOptions>(schema.ast, TypeInputOptionsAnnotationId)!;
+          const props = { ...inputProps, type: ast } as any as FormFieldRendererProps;
+          const target = data.target;
+          const db = Database.isDatabase(target) ? target : Obj.isObject(target) ? Obj.getDatabase(target) : undefined;
+          const annotation = SchemaEx.findAnnotation<TypeInputOptions>(data.schema.ast, TypeInputOptionsAnnotationId)!;
           const options = useTypeOptions({ db, annotation });
 
           return <SelectField {...props} options={options} />;
@@ -298,26 +305,23 @@ export default Capability.makeModule(
       }),
       Surface.create({
         id: 'objectProperties',
-        role: 'object-properties',
-        filter: (data): data is { subject: Obj.Unknown } => {
+        filter: Surface.makeFilter(AppSurface.ObjectProperties, (data) => {
           if (!Obj.isObject(data.subject)) {
             return false;
           }
-
           const type = Obj.getType(data.subject);
           const path = type
             ? Option.getOrElse(ViewAnnotation.get(Type.getSchema(type)), () => [] as readonly string[])
             : [];
           const viewTarget = path.length > 0 ? ViewAnnotation.tryGetTargetAlongPath(data.subject, path) : undefined;
           return !!viewTarget;
-        },
+        }),
         component: ({ data }) => {
           const type = Obj.getType(data.subject);
           const path = type
             ? Option.getOrElse(ViewAnnotation.get(Type.getSchema(type)), () => [] as readonly string[])
             : [];
           const view = path.length > 0 ? ViewAnnotation.tryGetTargetAlongPath(data.subject, path) : undefined;
-
           if (!view) {
             return null;
           }
@@ -326,17 +330,9 @@ export default Capability.makeModule(
         },
       }),
       Surface.create({
-        id: SPACE_RENAME_POPOVER,
-        role: 'popover',
-        filter: (data): data is { props: Space } => data.component === SPACE_RENAME_POPOVER && isSpace(data.props),
-        component: ({ data }) => <SpaceRenamePopover space={data.props} />,
-      }),
-      Surface.create({
-        id: ENTITY_RENAME_POPOVER,
-        role: 'popover',
-        filter: (data): data is { props: Entity.Unknown } =>
-          data.component === ENTITY_RENAME_POPOVER && Entity.isEntity(data.props),
-        component: ({ data }) => <EntityRenamePopover entity={data.props} />,
+        id: RENAME_POPOVER,
+        filter: AppSurface.component<RenameSubject>(AppSurface.Popover, RENAME_POPOVER),
+        component: ({ data }) => <RenamePopover subject={data.props} />,
       }),
       Surface.create({
         id: 'menuFooter',
@@ -345,9 +341,7 @@ export default Capability.makeModule(
       }),
       Surface.create({
         id: 'navtreePresence',
-        role: 'navtree-item-end',
-        filter: (data): data is { id: string; subject: Obj.Unknown; open?: boolean } =>
-          typeof data.id === 'string' && Obj.isObject(data.subject),
+        filter: AppSurface.subject(AppSurface.NavtreeItemEnd, Obj.isObject),
         component: ({ data }) => {
           const ephemeral = useAtomCapability(SpaceCapabilities.EphemeralState);
           return <SmallPresenceLive id={data.id} open={data.open} viewers={ephemeral.viewersByObject[data.id]} />;
@@ -356,28 +350,30 @@ export default Capability.makeModule(
       // TODO(wittjosiah): Attention glyph for non-echo items should be handled elsewhere.
       Surface.create({
         id: 'navtreePresenceFallback',
-        role: 'navtree-item-end',
-        position: 'last',
-        filter: (data): data is { id: string; open?: boolean } => typeof data.id === 'string',
+        position: Position.last,
+        filter: Surface.makeFilter(AppSurface.NavtreeItemEnd),
         component: ({ data }) => <SmallPresenceLive id={data.id} open={data.open} />,
       }),
       // TODO(wittjosiah): Broken?
       Surface.create({
         id: 'navtreeSyncStatus',
-        role: 'navtree-item-end',
-        filter: (data): data is { subject: Space; open?: boolean } => isSpace(data.subject),
+        filter: AppSurface.subject(AppSurface.NavtreeItemEnd, isSpace),
         component: ({ data }) => <InlineSyncStatus space={data.subject} open={data.open} />,
       }),
       Surface.create({
         id: 'navbarPresence',
-        role: 'navbar-end',
-        position: 'first',
-        filter: (data): data is { subject: Space | Obj.Unknown } => isSpace(data.subject) || Obj.isObject(data.subject),
+        position: Position.first,
+        filter: AppSurface.subject(
+          AppSurface.NavbarEnd,
+          (value): value is Space | Obj.Unknown => isSpace(value) || Obj.isObject(value),
+        ),
         component: ({ data }) => {
           const space = isSpace(data.subject) ? data.subject : getSpace(data.subject);
           const object = isSpace(data.subject)
             ? data.subject.state.get() === SpaceState.SPACE_READY
-              ? space && Annotation.get(space.properties, RootCollectionAnnotation).pipe(Option.getOrUndefined)?.target
+              ? space &&
+                Annotation.get(space.properties, AppAnnotation.RootCollectionAnnotation).pipe(Option.getOrUndefined)
+                  ?.target
               : undefined
             : data.subject;
 
@@ -391,7 +387,7 @@ export default Capability.makeModule(
       }),
       Surface.create({
         id: 'syncStatus',
-        role: 'status-indicator',
+        filter: Surface.makeFilter(AppSurface.StatusIndicator),
         component: () => <SyncStatus />,
       }),
     ]);

package/src/capabilities/repair.ts

@@ -6,7 +6,7 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { Capability } from '@dxos/app-framework';
-import { RootCollectionAnnotation } from '@dxos/app-toolkit';
+import { AppAnnotation } from '@dxos/app-toolkit';
 import { Annotation, Collection, Obj, Ref } from '@dxos/echo';
 import { type Space } from '@dxos/react-client/echo';
 
@@ -24,7 +24,9 @@ export default Capability.makeModule(() =>
  * Remove all existing query collections from the root collection.
  */
 const removeQueryCollections = async (space: Space) => {
-  const rootCollectionRef = Annotation.get(space.properties, RootCollectionAnnotation).pipe(Option.getOrUndefined);
+  const rootCollectionRef = Annotation.get(space.properties, AppAnnotation.RootCollectionAnnotation).pipe(
+    Option.getOrUndefined,
+  );
   const rootCollection: Collection.Collection | undefined = await rootCollectionRef?.load();
   if (!rootCollection) {
     return;

package/src/capabilities/settings.ts

@@ -14,7 +14,7 @@ import { Settings, SpaceCapabilities } from '#types';
 export default Capability.makeModule(() =>
   Effect.sync(() => {
     const settingsAtom = createKvsStore({
-      key: meta.id,
+      key: meta.profile.key,
       schema: Settings.Settings,
       defaultValue: () => ({}),
     });
@@ -22,7 +22,7 @@ export default Capability.makeModule(() =>
     return [
       Capability.contributes(SpaceCapabilities.Settings, settingsAtom),
       Capability.contributes(AppCapabilities.Settings, {
-        prefix: meta.id,
+        prefix: meta.profile.key,
         schema: Settings.Settings,
         atom: settingsAtom,
       }),

package/src/capabilities/spaces-ready.ts

@@ -7,19 +7,12 @@ import * as Fiber from 'effect/Fiber';
 import * as Option from 'effect/Option';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import {
-  AppCapabilities,
-  LayoutOperation,
-  RootCollectionAnnotation,
-  getSpacePath,
-  resolvePersonalSpace,
-  setPersonalSpace,
-} from '@dxos/app-toolkit';
+import { AppAnnotation, AppCapabilities, AppSpace, LayoutOperation, Paths } from '@dxos/app-toolkit';
 import { SubscriptionList } from '@dxos/async';
 import { Annotation, Collection, Filter, Obj, Type } from '@dxos/echo';
 import { SPACE_ID_LENGTH, parseId } from '@dxos/keys';
 import { log } from '@dxos/log';
-import { MigrationVersionAnnotation, Migrations } from '@dxos/migrations';
+import { Migrations, MigrationVersionAnnotation } from '@dxos/migrations';
 import { AttentionCapabilities } from '@dxos/plugin-attention';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { Graph } from '@dxos/plugin-graph';
@@ -67,13 +60,13 @@ export default Capability.makeModule(
         yield* Effect.promise(() => personalSpace.waitUntilReady());
 
         if (fromCredential) {
-          setPersonalSpace(personalSpace);
+          AppSpace.setPersonalSpace(personalSpace);
         }
 
         // Check if deck state indicates we should switch to default space.
         const layout = registry.get(layoutAtom);
         if (layout.workspace === 'default') {
-          yield* invoke(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(personalSpace.id) });
+          yield* invoke(LayoutOperation.SwitchWorkspace, { subject: Paths.getSpacePath(personalSpace.id) });
         }
 
         const queryResults = yield* Effect.promise(() =>
@@ -102,12 +95,12 @@ export default Capability.makeModule(
 
     // Try to find the personal space now, or subscribe to find it later.
     // Initialization is non-blocking so subscriptions wire immediately.
-    const resolved = resolvePersonalSpace(client);
+    const resolved = AppSpace.resolvePersonalSpace(client);
     if (resolved) {
       startPersonalSpaceInit(resolved.space, resolved);
     } else {
       const personalSpaceSub = client.spaces.subscribe(() => {
-        const resolved = resolvePersonalSpace(client);
+        const resolved = AppSpace.resolvePersonalSpace(client);
         if (resolved) {
           startPersonalSpaceInit(resolved.space, resolved);
         }
@@ -158,7 +151,7 @@ export default Capability.makeModule(
     // Cache space names.
     const spaceNamesSub = client.spaces.subscribe(async (spaces) => {
       // TODO(wittjosiah): Remove. This is a hack to be able to migrate the personal space properties.
-      const personalSpaceForMigration = resolvePersonalSpace(client);
+      const personalSpaceForMigration = AppSpace.resolvePersonalSpace(client);
       if (
         personalSpaceForMigration?.space &&
         personalSpaceForMigration.space.state.get() === SpaceState.SPACE_REQUIRES_MIGRATION
@@ -169,11 +162,11 @@ export default Capability.makeModule(
       spaces
         .filter((space) => space.state.get() === SpaceState.SPACE_READY)
         .forEach((space) => {
-          if (Option.isNone(Annotation.get(space.properties, RootCollectionAnnotation))) {
+          if (Option.isNone(Annotation.get(space.properties, AppAnnotation.RootCollectionAnnotation))) {
             const legacyRef = (space.properties as any)[Type.getTypename(Collection.Collection)];
             if (legacyRef) {
               Obj.update(space.properties, (properties) => {
-                Annotation.set(properties, RootCollectionAnnotation, legacyRef);
+                Annotation.set(properties, AppAnnotation.RootCollectionAnnotation, legacyRef);
               });
             }
           }

package/src/capabilities/state.ts

@@ -25,7 +25,7 @@ export default Capability.makeModule(
 
     // Persisted state using KVS store.
     const stateAtom = createKvsStore({
-      key: `${meta.id}.state`,
+      key: `${meta.profile.key}.state`,
       schema: SpaceCapabilities.StateSchema,
       defaultValue: () => ({ ...defaultSpaceState }),
     });

package/src/capabilities/undo-mappings.ts

@@ -30,7 +30,7 @@ export default Capability.makeModule(
             props: output.props,
             index: output.index,
           }),
-          message: ['field-deleted.label', { ns: meta.id }],
+          message: ['field-deleted.label', { ns: meta.profile.key }],
         }),
         UndoMapping.make({
           operation: SpaceOperation.RemoveObjects,
@@ -44,8 +44,8 @@ export default Capability.makeModule(
           message: (input, _output) => {
             const ns = Entity.getTypename(input.objects[0]);
             return ns && input.objects.length === 1
-              ? ['object-deleted.label', { ns: [ns, meta.id] }]
-              : ['objects-deleted.label', { ns: meta.id }];
+              ? ['object-deleted.label', { ns: [ns, meta.profile.key] }]
+              : ['objects-deleted.label', { ns: meta.profile.key }];
           },
         }),
       ]),

package/src/commands/database/add.ts

@@ -11,7 +11,7 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { type Capability, Plugin } from '@dxos/app-framework';
-import { AppActivationEvents, RootCollectionAnnotation } from '@dxos/app-toolkit';
+import { AppActivationEvents, AppAnnotation } from '@dxos/app-toolkit';
 import { CommandConfig, Common, type SpaceNotFoundError, flushAndSync, print, spaceLayer } from '@dxos/cli-util';
 import { type ClientService } from '@dxos/client';
 import { SpaceProperties } from '@dxos/client/echo';
@@ -53,7 +53,9 @@ export const add: Command.Command<
       };
 
       const [properties] = yield* Database.query(Filter.type(SpaceProperties)).run;
-      const rootCollectionRef = Annotation.get(properties, RootCollectionAnnotation).pipe(Option.getOrUndefined);
+      const rootCollectionRef = Annotation.get(properties, AppAnnotation.RootCollectionAnnotation).pipe(
+        Option.getOrUndefined,
+      );
       const collection = rootCollectionRef ? yield* Database.load<Collection.Collection>(rootCollectionRef) : undefined;
 
       const selectedTypename = yield* Option.match(typename, {

package/src/commands/queue/query.ts

@@ -9,7 +9,7 @@ import * as Effect from 'effect/Effect';
 
 import { CommandConfig, printList } from '@dxos/cli-util';
 import { ClientService } from '@dxos/client';
-import { Entity } from '@dxos/echo';
+import { Entity, Filter, Query, Scope } from '@dxos/echo';
 import { EID } from '@dxos/keys';
 
 import { printQueueObject } from './util';
@@ -37,8 +37,9 @@ export const query = Command.make(
       yield* Console.error(`Space not found: ${spaceId}`);
       return;
     }
-    const queue = space.queues.get(echoUri);
-    const objects = yield* Effect.promise(() => queue.queryObjects());
+    const objects = yield* Effect.promise(() =>
+      space.db.query(Query.select(Filter.everything()).from(Scope.feed(echoUri))).run(),
+    );
 
     if (json) {
       yield* Console.log(JSON.stringify(objects, null, 2));

package/src/components/AwaitingObject/AwaitingObject.tsx

@@ -20,7 +20,7 @@ const WAIT_FOR_OBJECT_TIMEOUT = 3 * 60 * 1_000;
 const TOAST_TIMEOUT = 4 * 60 * 1_000;
 
 export const AwaitingObject = ({ id }: { id: string }) => {
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
   const { invokePromise } = useOperationInvoker();
   const [open, setOpen] = useState(true);
   const [waiting, setWaiting] = useState(true);

package/src/components/CreateObjectPanel/CreateObjectPanel.tsx

@@ -149,7 +149,7 @@ type SelectTypeProps = Pick<CreateObjectPanelProps, 'options'> & {
 };
 
 const SelectType = ({ options, onChange }: SelectTypeProps) => {
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
 
   const { results, handleSearch } = useSearchListResults({
     items: options,
@@ -197,7 +197,7 @@ type SelectSpaceProps = Pick<CreateObjectPanelProps, 'spaces' | 'defaultSpaceId'
 };
 
 const SelectSpace = ({ spaces, defaultSpaceId, onChange }: SelectSpaceProps) => {
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
 
   const sortedSpaces = useMemo(
     () =>