@dxos/plugin-space 0.8.4-staging.60fe92afc8 → 0.9.1-main.c7dcc2e112

package/src/capabilities/spaces-ready.ts

@@ -7,14 +7,7 @@ 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';
@@ -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(
     () =>

package/src/components/ForeignKeys/ForeignKeys.tsx

@@ -31,7 +31,7 @@ type KeyItemProps = {
 };
 
 const KeyItem = ({ forignKey, onDelete }: KeyItemProps) => {
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
 
   const handleDelete = useCallback(() => {
     onDelete?.(forignKey);

package/src/components/SpaceSettings/SpaceSettings.tsx

@@ -4,7 +4,7 @@
 
 import React from 'react';
 
-import { isPersonalSpace } from '@dxos/app-toolkit';
+import { AppSpace } from '@dxos/app-toolkit';
 import { type Space } from '@dxos/react-client/echo';
 import { IconButton, Input, List, ListItem, toLocalizedString, useTranslation } from '@dxos/react-ui';
 import { Settings as SettingsForm } from '@dxos/react-ui-form';
@@ -19,7 +19,7 @@ export type SpaceSettingsProps = {
 };
 
 export const SpaceSettings = ({ spaces, onOpenSpaceSettings }: SpaceSettingsProps) => {
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
 
   return (
     <SettingsForm.Viewport>
@@ -35,7 +35,7 @@ export const SpaceSettings = ({ spaces, onOpenSpaceSettings }: SpaceSettingsProp
                 <ListItem.Heading classNames='grow truncate min-h-0!'>
                   {toLocalizedString(
                     getSpaceDisplayName(space, {
-                      personal: isPersonalSpace(space),
+                      personal: AppSpace.isPersonalSpace(space),
                     }),
                     t,
                   )}

package/src/constants.ts

@@ -6,9 +6,8 @@ import { DXN } from '@dxos/keys';
 
 import { meta } from '#meta';
 
-export const CREATE_OBJECT_DIALOG = DXN.make(`${meta.id}.createObjectDialog`);
-export const CREATE_SPACE_DIALOG = DXN.make(`${meta.id}.createSpaceDialog`);
-export const IMPORT_SPACE_DIALOG = DXN.make(`${meta.id}.importSpaceDialog`);
-export const JOIN_DIALOG = DXN.make(`${meta.id}.joinDialog`);
-export const ENTITY_RENAME_POPOVER = DXN.make(`${meta.id}.entityRenamePopover`);
-export const SPACE_RENAME_POPOVER = DXN.make(`${meta.id}.spaceRenamePopover`);
+export const CREATE_OBJECT_DIALOG = DXN.make(`${meta.profile.key}.createObjectDialog`);
+export const CREATE_SPACE_DIALOG = DXN.make(`${meta.profile.key}.createSpaceDialog`);
+export const IMPORT_SPACE_DIALOG = DXN.make(`${meta.profile.key}.importSpaceDialog`);
+export const JOIN_DIALOG = DXN.make(`${meta.profile.key}.joinDialog`);
+export const RENAME_POPOVER = DXN.make(`${meta.profile.key}.renamePopover`);

package/src/containers/CollectionArticle/CollectionArticle.tsx

@@ -5,11 +5,11 @@
 import React, { useCallback, useMemo } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
-import { LayoutOperation, getCollectionObjectPath, getObjectPathFromObject } from '@dxos/app-toolkit';
+import { LayoutOperation, Paths } from '@dxos/app-toolkit';
 import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { type Collection, Obj } from '@dxos/echo';
 import { ScrollArea, toLocalizedString, useTranslation } from '@dxos/react-ui';
-import { Card, Toolbar } from '@dxos/react-ui';
+import { Card, Icon } from '@dxos/react-ui';
 import { Mosaic, type MosaicStackTileComponent } from '@dxos/react-ui-mosaic';
 import { SearchPanel, useSearchListResults } from '@dxos/react-ui-search';
 import { getStyles } from '@dxos/ui-theme';
@@ -20,7 +20,7 @@ import { meta } from '#meta';
  * Article view for collections.
  */
 export const CollectionArticle = ({ subject, attendableId }: AppSurface.ObjectArticleProps<Collection.Collection>) => {
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
   const { items, handleSearch } = useCollectionItems(subject, attendableId);
 
   return (
@@ -51,7 +51,7 @@ type ObjectItem = {
 };
 
 const ObjectTile: MosaicStackTileComponent<ObjectItem> = ({ data: item }) => {
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
   const { invokePromise } = useOperationInvoker();
 
   const typename = Obj.getTypename(item.object) ?? '';
@@ -68,7 +68,9 @@ const ObjectTile: MosaicStackTileComponent<ObjectItem> = ({ data: item }) => {
   return (
     <Card.Root fullWidth role='button' classNames='cursor-pointer' onClick={handleClick}>
       <Card.Header>
-        <Toolbar.IconButton variant='ghost' label={label} icon={item.icon} iconOnly iconClassNames={styles?.fg} />
+        <Card.Block>
+          <Icon icon={item.icon} classNames={styles?.fg} />
+        </Card.Block>
         <Card.Title>{label}</Card.Title>
         <Card.Menu />
       </Card.Header>
@@ -89,7 +91,9 @@ const useCollectionItems = (collection: Collection.Collection, attendableId?: st
     () =>
       objects.map((obj) => {
         const iconAnnotation = Obj.getIcon(obj);
-        const targetPath = attendableId ? getCollectionObjectPath(attendableId, obj.id) : getObjectPathFromObject(obj);
+        const targetPath = attendableId
+          ? Paths.getCollectionObjectPath(attendableId, obj.id)
+          : Paths.getObjectPathFromObject(obj);
 
         return {
           id: Obj.getURI(obj),

package/src/containers/CollectionSection/CollectionSection.tsx

@@ -13,7 +13,7 @@ import { meta } from '#meta';
 export type CollectionSectionProps = AppSurface.ObjectSectionProps<Collection.Collection>;
 
 export const CollectionSection = ({ role, subject }: CollectionSectionProps) => {
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
 
   // TODO(wittjosiah): Better placeholder.
   return (

package/src/containers/CreateObjectDialog/CreateObjectDialog.tsx

@@ -9,7 +9,7 @@ import React, { useCallback, useMemo, useRef, useState } from 'react';
 
 import { Capability } from '@dxos/app-framework';
 import { useOperationInvoker, usePluginManager } from '@dxos/app-framework/ui';
-import { allTypesQuery, getPersonalSpace, LayoutOperation } from '@dxos/app-toolkit';
+import { AppSpace, LayoutOperation, TypeOptions } from '@dxos/app-toolkit';
 import { PluginRegistryButton, useLayout } from '@dxos/app-toolkit/ui';
 import { Operation } from '@dxos/compute';
 import { Annotation, Collection, Database, Obj, Type } from '@dxos/echo';
@@ -27,7 +27,7 @@ import { SpaceCapabilities } from '#types';
 
 import { getSpaceDisplayName } from '../../util';
 
-export const CREATE_OBJECT_DIALOG = `${meta.id}.CreateObjectDialog`;
+export const CREATE_OBJECT_DIALOG = `${meta.profile.key}.CreateObjectDialog`;
 
 export type CreateObjectDialogProps = Pick<CreateObjectPanelProps, 'target' | 'typename' | 'initialFormValues'> & {
   views?: boolean;
@@ -45,7 +45,7 @@ export const CreateObjectDialog = ({
   shouldNavigate: _shouldNavigate,
   targetNodeId,
 }: CreateObjectDialogProps) => {
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
   const manager = usePluginManager();
   const operationInvoker = useOperationInvoker();
   const { invoke } = operationInvoker;
@@ -57,12 +57,15 @@ export const CreateObjectDialog = ({
   const closeRef = useRef<HTMLButtonElement | null>(null);
 
   const db = Database.isDatabase(target) ? target : target && Obj.getDatabase(target);
-  const allTypes = useQuery(db, allTypesQuery);
+  const allTypes = useQuery(db, TypeOptions.allTypesQuery);
   const space = useMemo(() => spaces.find((s) => s.db === db), [spaces, db]);
   const spaceLabel = useMemo(
     () =>
       space &&
-      toLocalizedString(getSpaceDisplayName(space, { personal: space.id === getPersonalSpace(client)?.id }), t),
+      toLocalizedString(
+        getSpaceDisplayName(space, { personal: space.id === AppSpace.getPersonalSpace(client)?.id }),
+        t,
+      ),
     [space, client, t],
   );
 
@@ -86,7 +89,7 @@ export const CreateObjectDialog = ({
       for (const entry of contributions) {
         entries.push(entry);
         if (owningPlugin) {
-          pluginByEntryId.set(entry.id, owningPlugin.meta.name);
+          pluginByEntryId.set(entry.id, owningPlugin.meta.profile.name);
         }
       }
     }
@@ -205,7 +208,7 @@ export const CreateObjectDialog = ({
           target={target}
           typename={typename}
           initialFormValues={initialFormValues}
-          defaultSpaceId={getPersonalSpace(client)?.id ?? client.spaces.get()[0]?.id}
+          defaultSpaceId={AppSpace.getPersonalSpace(client)?.id ?? client.spaces.get()[0]?.id}
           resolve={resolve}
           onCreateObject={handleCreateObject}
           onTargetChange={setTarget}

package/src/containers/CreateSpaceDialog/CreateSpaceDialog.tsx

@@ -7,7 +7,7 @@ import type * as Schema from 'effect/Schema';
 import React, { useCallback, useRef } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
-import { LayoutOperation, getSpaceHomePath, getSpacePath } from '@dxos/app-toolkit';
+import { LayoutOperation, Paths } from '@dxos/app-toolkit';
 import { EffectEx } from '@dxos/effect';
 import { Column, Dialog, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
@@ -17,14 +17,14 @@ import { meta } from '#meta';
 import { SpaceOperation } from '#operations';
 import { SpaceForm } from '#types';
 
-export const CREATE_SPACE_DIALOG = `${meta.id}.CreateSpaceDialog`;
+export const CREATE_SPACE_DIALOG = `${meta.profile.key}.CreateSpaceDialog`;
 
 type FormValues = Schema.Schema.Type<typeof SpaceForm>;
 const initialValues: FormValues = { edgeReplication: true };
 
 export const CreateSpaceDialog = () => {
   const closeRef = useRef<HTMLButtonElement | null>(null);
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
   const { invokePromise } = useOperationInvoker();
 
   const inputSurfaceLookup = useInputSurfaceLookup();
@@ -36,8 +36,8 @@ export const CreateSpaceDialog = () => {
         if (result?.space) {
           yield* Effect.promise(() =>
             invokePromise(LayoutOperation.Open, {
-              subject: [getSpaceHomePath(result.space.id)],
-              workspace: getSpacePath(result.space.id),
+              subject: [Paths.getSpaceHomePath(result.space.id)],
+              workspace: Paths.getSpacePath(result.space.id),
               navigation: 'immediate',
             }),
           );

package/src/containers/ImportSpaceDialog/ImportSpaceDialog.tsx

@@ -6,14 +6,14 @@ import React, { useCallback } from 'react';
 import { FileUploader } from 'react-drag-drop-files';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
-import { LayoutOperation, getSpacePath } from '@dxos/app-toolkit';
+import { LayoutOperation, Paths } from '@dxos/app-toolkit';
 import { Button, Dialog, Icon, useTranslation } from '@dxos/react-ui';
 
 import { meta } from '#meta';
 import { SpaceOperation } from '#operations';
 
 export const ImportSpaceDialog = () => {
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
   const { invokePromise } = useOperationInvoker();
 
   const handleFile = useCallback(
@@ -24,7 +24,7 @@ export const ImportSpaceDialog = () => {
       });
       await invokePromise(LayoutOperation.UpdateDialog, { state: false });
       if (result?.space) {
-        await invokePromise(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(result.space.id) });
+        await invokePromise(LayoutOperation.SwitchWorkspace, { subject: Paths.getSpacePath(result.space.id) });
       }
     },
     [invokePromise],

package/src/containers/InlineSyncStatus/InlineSyncStatus.tsx

@@ -4,7 +4,7 @@
 
 import React, { useEffect, useState } from 'react';
 
-import { getSpacePath } from '@dxos/app-toolkit';
+import { Paths } from '@dxos/app-toolkit';
 import { EdgeStatus } from '@dxos/protocols/proto/dxos/client/services';
 import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
 import { useClient } from '@dxos/react-client';
@@ -27,8 +27,8 @@ const useEdgeStatus = (): EdgeStatus.ConnectionState => {
 };
 
 export const InlineSyncStatus = ({ space, open }: { space: Space; open?: boolean }) => {
-  const { t } = useTranslation(meta.id);
-  const qualifiedId = getSpacePath(space.id);
+  const { t } = useTranslation(meta.profile.key);
+  const qualifiedId = Paths.getSpacePath(space.id);
   const { hasAttention, isAncestor, isRelated } = useAttention(qualifiedId);
   const attended = hasAttention || isRelated;
   const containsAttended = isAncestor && !open;

package/src/containers/JoinDialog/JoinDialog.tsx

@@ -5,7 +5,7 @@
 import React, { useCallback } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
-import { LayoutOperation, getSpacePath } from '@dxos/app-toolkit';
+import { LayoutOperation, Paths } from '@dxos/app-toolkit';
 import { useAppGraph } from '@dxos/app-toolkit/ui';
 import { Trigger } from '@dxos/async';
 import { Graph } from '@dxos/plugin-graph';
@@ -19,7 +19,7 @@ import { osTranslations } from '@dxos/ui-theme';
 
 import { meta } from '#meta';
 
-export const JOIN_DIALOG = `${meta.id}.JoinDialog`;
+export const JOIN_DIALOG = `${meta.profile.key}.JoinDialog`;
 
 export type JoinDialogProps = JoinPanelProps & {
   navigableCollections?: boolean;
@@ -29,7 +29,7 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
   const { invokePromise } = useOperationInvoker();
   const client = useClient();
   const { graph } = useAppGraph();
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
 
   const handleDone = useCallback(
     async (result: InvitationResult | null) => {
@@ -40,10 +40,10 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
 
       await Promise.all([
         invokePromise(LayoutOperation.AddToast, {
-          id: `${meta.id}.join-success`,
+          id: `${meta.profile.key}.join-success`,
           duration: 5_000,
-          title: ['join-success.label', { ns: meta.id }],
-          closeLabel: ['dismiss.label', { ns: meta.id }],
+          title: ['join-success.label', { ns: meta.profile.key }],
+          closeLabel: ['dismiss.label', { ns: meta.profile.key }],
         }),
         invokePromise(LayoutOperation.UpdateDialog, { state: false }),
       ]);
@@ -61,12 +61,9 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
         space = await trigger.wait();
       }
 
-      await invokePromise(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(space.id) });
+      await invokePromise(LayoutOperation.SwitchWorkspace, { subject: Paths.getSpacePath(space.id) });
 
-      // TODO(wittjosiah): If navigableCollections is false and there's no target,
-      //   should try to navigate to the first object of the space replicates.
-      //   Potentially this could also be done on the inviters side to ensure there's always a target.
-      const target = result?.target || (navigableCollections ? space?.id : undefined);
+      const target = result?.target;
       if (target) {
         // Wait before navigating to the target node.
         // If the target has not yet replicated, this will trigger a loading toast.
@@ -75,6 +72,11 @@ export const JoinDialog = ({ navigableCollections, onDone, ...props }: JoinDialo
           invokePromise(LayoutOperation.Open, { subject: [target] }),
           invokePromise(LayoutOperation.Expose, { subject: target }),
         ]);
+      } else {
+        await invokePromise(LayoutOperation.Open, {
+          subject: [Paths.getSpaceHomePath(space.id)],
+          workspace: Paths.getSpacePath(space.id),
+        });
       }
 
       onDone?.(result);

package/src/containers/MembersContainer/MembersContainer.tsx

@@ -7,7 +7,7 @@ import React, { type Dispatch, type SetStateAction, useMemo, useState } from 're
 import { QR } from 'react-qr-rounded';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
-import { RootCollectionAnnotation } from '@dxos/app-toolkit';
+import { AppAnnotation } from '@dxos/app-toolkit';
 import { AppSurface } from '@dxos/app-toolkit/ui';
 import { Annotation, Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
@@ -48,7 +48,7 @@ export type MembersContainerProps = AppSurface.SpaceArticleProps<{
 }>;
 
 export const MembersContainer = ({ space, createInvitationUrl }: MembersContainerProps) => {
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
   const config = useConfig();
   const { invokePromise } = useOperationInvoker();
   const invitations = useSpaceInvitations(space.key);
@@ -64,8 +64,8 @@ export const MembersContainer = ({ space, createInvitationUrl }: MembersContaine
   };
 
   // TODO(wittjosiah): Track which was the most recently viewed object.
-  const target = Annotation.get(space.properties, RootCollectionAnnotation).pipe(Option.getOrUndefined)?.target
-    ?.objects[0]?.target;
+  const target = Annotation.get(space.properties, AppAnnotation.RootCollectionAnnotation).pipe(Option.getOrUndefined)
+    ?.target?.objects[0]?.target;
 
   const inviteActions = useMemo(
     (): Record<string, ActionMenuItem> => ({
@@ -210,7 +210,7 @@ const InvitationQR = ({ id, url, onCancel }: { id: string; url: string; onCancel
   const emoji = hexToEmoji(id);
   return (
     <>
-      <p className='text-description'>{t('qr-code.description', { ns: meta.id })}</p>
+      <p className='text-description'>{t('qr-code.description', { ns: meta.profile.key })}</p>
       <div role='group' className='grid grid-cols-[1fr_min-content] my-2 gap-2'>
         <div className='w-full aspect-square relative text-description'>
           <QR

package/src/containers/MenuFooter/MenuFooter.tsx

@@ -4,7 +4,7 @@
 
 import React from 'react';
 
-import { isPersonalSpace } from '@dxos/app-toolkit';
+import { AppSpace } from '@dxos/app-toolkit';
 import { getSpace } from '@dxos/client/echo';
 import { type Obj } from '@dxos/echo';
 import { DropdownMenu, Icon, toLocalizedString, useTranslation } from '@dxos/react-ui';
@@ -14,9 +14,9 @@ import { meta } from '#meta';
 import { getSpaceDisplayName } from '../../util';
 
 export const MenuFooter = ({ object }: { object: Obj.Unknown }) => {
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
   const space = getSpace(object);
-  const spaceName = space ? getSpaceDisplayName(space, { personal: isPersonalSpace(space) }) : '';
+  const spaceName = space ? getSpaceDisplayName(space, { personal: AppSpace.isPersonalSpace(space) }) : '';
   return space ? (
     <>
       <DropdownMenu.Separator />

package/src/containers/ObjectCardStack/ObjectCardStack.tsx

@@ -7,7 +7,7 @@ import React, { forwardRef, useState } from 'react';
 import { Filter, Obj, type View } from '@dxos/echo';
 import { useQuery, useType } from '@dxos/react-client/echo';
 import { Card, Message, Panel, ScrollArea, Toolbar, useTranslation } from '@dxos/react-ui';
-import { useSelected } from '@dxos/react-ui-attention';
+import { useSelection } from '@dxos/react-ui-attention';
 import { ObjectForm } from '@dxos/react-ui-form';
 import { Mosaic } from '@dxos/react-ui-mosaic';
 import { getTypeURIFromQuery } from '@dxos/schema';
@@ -24,13 +24,13 @@ export type ObjectCardStackProps = {
  * @deprecated Use Mosaic Board components.
  */
 export const ObjectCardStack = forwardRef<HTMLDivElement, ObjectCardStackProps>(({ objectId, view }, forwardedRef) => {
-  const { t } = useTranslation(meta.id);
+  const { t } = useTranslation(meta.profile.key);
   const db = Obj.getDatabase(view);
   const typeUri = view.query ? getTypeURIFromQuery(view.query.ast) : undefined;
   const type = useType(db, typeUri);
 
   const queriedObjects = useQuery(db, type ? Filter.type(type) : Filter.nothing());
-  const selectedRows = useSelected(objectId, 'multi');
+  const selectedRows = useSelection(objectId, 'multi');
   const selectedObjects = selectedRows.map((id) => queriedObjects.find((obj) => obj.id === id)).filter(isNonNullable);
 
   const [viewport, setViewport] = useState<HTMLElement | null>(null);