@dxos/plugin-space 0.8.4-main.72ec0f3 → 0.8.4-main.7996785055

package/src/containers/SpaceSettingsContainer/SpaceSettingsContainer.tsx

@@ -0,0 +1,210 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+import React, { type ChangeEvent, useCallback, useMemo, useState } from 'react';
+
+import { useCapabilities, useOperationInvoker } from '@dxos/app-framework/ui';
+import { getPersonalSpace, getSpacePath, isPersonalSpace, LayoutOperation } from '@dxos/app-toolkit';
+import { Obj } from '@dxos/echo';
+import { log } from '@dxos/log';
+import { EdgeReplicationSetting } from '@dxos/protocols/proto/dxos/echo/metadata';
+import { useClient } from '@dxos/react-client';
+import { type Space, SpaceState } from '@dxos/react-client/echo';
+import { Button, Input, useFileDownload, useMulticastObservable, useTranslation } from '@dxos/react-ui';
+import { Form, type FormFieldMap, Settings } from '@dxos/react-ui-form';
+import { HuePicker, IconPicker } from '@dxos/react-ui-pickers';
+
+import { meta } from '../../meta';
+import { SpaceOperation } from '../../operations';
+import { SpaceCapabilities, SpaceForm } from '../../types';
+
+const SpaceFormSchema = SpaceForm.pipe(
+  Schema.extend(
+    Schema.Struct({
+      archived: Schema.Boolean.annotations({ title: 'Archive Space' }),
+    }),
+  ),
+);
+
+export type SpaceSettingsContainerProps = {
+  space: Space;
+};
+
+// TODO(wittjosiah): Handle space migrations here?
+export const SpaceSettingsContainer = ({ space }: SpaceSettingsContainerProps) => {
+  const { t } = useTranslation(meta.id);
+  const { invokePromise } = useOperationInvoker();
+  const client = useClient();
+  const archived = useMulticastObservable(space.state) === SpaceState.SPACE_INACTIVE;
+  const [edgeReplication, setEdgeReplication] = useState(
+    space.internal.data.edgeReplication === EdgeReplicationSetting.ENABLED,
+  );
+  const toggleEdgeReplication = useCallback(
+    async (next: boolean) => {
+      setEdgeReplication(next);
+      await space?.internal
+        .setEdgeReplicationPreference(next ? EdgeReplicationSetting.ENABLED : EdgeReplicationSetting.DISABLED)
+        .catch((err: unknown) => {
+          log.catch(err);
+          setEdgeReplication(!next);
+        });
+    },
+    [space],
+  );
+
+  const handleValuesChanged = useCallback(
+    (newValues: Partial<Schema.Schema.Type<typeof SpaceFormSchema>>, meta: { changed?: Record<string, boolean> }) => {
+      const changed = meta.changed ?? {};
+      if (changed['edgeReplication']) {
+        void toggleEdgeReplication(newValues.edgeReplication ?? false);
+      }
+
+      if (changed['name'] || changed['icon'] || changed['hue']) {
+        Obj.change(space.properties, (obj) => {
+          if (changed['name'] && newValues.name !== undefined) {
+            obj.name = newValues.name;
+          }
+          if (changed['icon']) {
+            obj.icon = newValues.icon;
+          }
+          if (changed['hue']) {
+            obj.hue = newValues.hue;
+          }
+        });
+      }
+
+      if (changed['archived']) {
+        if (newValues.archived && !archived) {
+          void invokePromise(SpaceOperation.Close, { space });
+          const personalSpace = getPersonalSpace(client);
+          if (personalSpace) {
+            void invokePromise(LayoutOperation.SwitchWorkspace, {
+              subject: getSpacePath(personalSpace.id),
+            });
+          }
+        } else if (!newValues.archived && archived) {
+          void invokePromise(SpaceOperation.Open, { space });
+        }
+      }
+    },
+    [space, client, archived, invokePromise, toggleEdgeReplication],
+  );
+
+  const values = useMemo(
+    () => ({
+      name: space.properties.name,
+      icon: space.properties.icon,
+      hue: space.properties.hue,
+      edgeReplication,
+      archived,
+    }),
+    [space.properties.name, space.properties.icon, space.properties.hue, edgeReplication, archived],
+  );
+
+  const personal = isPersonalSpace(space);
+
+  const fieldMap = useMemo<FormFieldMap>(
+    () => ({
+      name: personal
+        ? () => null
+        : ({ type, label, getValue, onValueChange }) => {
+            const handleChange = useCallback(
+              ({ target: { value } }: ChangeEvent<HTMLInputElement>) => onValueChange(type, value),
+              [onValueChange, type],
+            );
+            return (
+              <Settings.ItemInput title={label} description={t('display name description')}>
+                <Input.TextInput
+                  value={getValue()}
+                  onChange={handleChange}
+                  placeholder={t('display name input placeholder')}
+                  classNames='min-w-64'
+                />
+              </Settings.ItemInput>
+            );
+          },
+      icon: personal
+        ? () => null
+        : ({ type, label, getValue, onValueChange }) => {
+            const handleChange = useCallback((icon: string) => onValueChange(type, icon), [onValueChange, type]);
+            const handleReset = useCallback(() => onValueChange(type, undefined), [onValueChange, type]);
+            return (
+              <Settings.Item title={label} description={t('icon description')}>
+                <IconPicker
+                  value={getValue()}
+                  onChange={handleChange}
+                  onReset={handleReset}
+                  classNames='justify-self-end'
+                />
+              </Settings.Item>
+            );
+          },
+      hue: ({ type, label, getValue, onValueChange }) => {
+        const handleChange = useCallback((nextHue: string) => onValueChange(type, nextHue), [onValueChange, type]);
+        const handleReset = useCallback(() => onValueChange(type, undefined), [onValueChange, type]);
+        return (
+          <Settings.Item title={label} description={t('hue description')}>
+            <HuePicker value={getValue()} onChange={handleChange} onReset={handleReset} classNames='justify-self-end' />
+          </Settings.Item>
+        );
+      },
+      edgeReplication: ({ type, label, getValue, onValueChange }) => {
+        const handleChange = useCallback((checked: boolean) => onValueChange(type, checked), [onValueChange, type]);
+        return (
+          <Settings.ItemInput title={label} description={t('edge replication description')}>
+            <Input.Switch checked={getValue()} onCheckedChange={handleChange} classNames='justify-self-end' />
+          </Settings.ItemInput>
+        );
+      },
+      archived: personal
+        ? () => null
+        : ({ type, label, getValue, onValueChange }) => {
+            const handleChange = useCallback(() => onValueChange(type, !getValue()), [onValueChange, type, getValue]);
+            return (
+              <Settings.ItemInput title={label} description={t('archive space description')}>
+                <Button variant={getValue() ? 'default' : 'destructive'} onClick={handleChange}>
+                  {getValue() ? t('unarchive space label') : t('archive space label')}
+                </Button>
+              </Settings.ItemInput>
+            );
+          },
+    }),
+    [t, space, personal],
+  );
+
+  const download = useFileDownload();
+  const handleBackup = useCallback(async () => {
+    const archive = await space.internal.export();
+    download(new Blob([archive.contents as Uint8Array<ArrayBuffer>]), archive.filename);
+  }, [space, download]);
+
+  const repairs = useCapabilities(SpaceCapabilities.Repair);
+  const handleRepair = useCallback(async () => {
+    await Promise.all(repairs.map((repair) => repair({ space, isDefault: isPersonalSpace(space) })));
+  }, [space, repairs]);
+
+  return (
+    <Settings.Root>
+      <Settings.Section
+        title={t('space properties settings verbose label')}
+        description={t('space properties settings description', { ns: meta.id })}
+      >
+        <Form.Root fieldMap={fieldMap} schema={SpaceFormSchema} values={values} onValuesChanged={handleValuesChanged}>
+          <Form.FieldSet />
+        </Form.Root>
+      </Settings.Section>
+      <Settings.Section title={t('space controls title')} description={t('space controls description')}>
+        <Settings.ItemInput title={t('backup space title')} description={t('backup space description')}>
+          <Button onClick={handleBackup}>{t('download backup label')}</Button>
+        </Settings.ItemInput>
+        <Settings.ItemInput title={t('repair space title')} description={t('repair space description')}>
+          <Button onClick={handleRepair}>{t('repair space label')}</Button>
+        </Settings.ItemInput>
+      </Settings.Section>
+    </Settings.Root>
+  );
+};
+
+SpaceSettingsContainer.displayName = 'SpaceSettingsContainer';

package/src/containers/SpaceSettingsContainer/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { SpaceSettingsContainer } from './SpaceSettingsContainer';
+
+export default SpaceSettingsContainer;

package/src/containers/SyncStatus/SyncStatus.stories.tsx

@@ -0,0 +1,40 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+
+import { withClientProvider } from '@dxos/react-client/testing';
+import { withTheme } from '@dxos/react-ui/testing';
+
+import { translations } from '../../translations';
+
+import { SyncStatusIndicator } from './SyncStatus';
+
+const meta = {
+  title: 'plugins/plugin-space/containers/SyncStatusIndicator',
+  component: SyncStatusIndicator,
+  decorators: [withTheme(), withClientProvider({ createIdentity: true })],
+  parameters: {
+    layout: 'centered',
+    translations,
+  },
+} satisfies Meta<typeof SyncStatusIndicator>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {
+  args: {
+    state: {},
+    saved: true,
+  },
+};
+
+export const Saving: Story = {
+  args: {
+    state: {},
+    saved: false,
+  },
+};

package/src/containers/SyncStatus/SyncStatus.tsx

@@ -0,0 +1,145 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import React, { useEffect, useState } from 'react';
+
+import { StatusBar } from '@dxos/plugin-status-bar';
+import { EdgeStatus } from '@dxos/protocols/proto/dxos/client/services';
+import { type QueryEdgeStatusResponse } from '@dxos/protocols/proto/dxos/client/services';
+import { useClient } from '@dxos/react-client';
+import { useStream } from '@dxos/react-client/devtools';
+import { type SpaceSyncStateMap, getSyncSummary, useSyncState } from '@dxos/react-client/echo';
+import { Icon, IconButton, Popover, useTranslation } from '@dxos/react-ui';
+import { iconSize, mx } from '@dxos/ui-theme';
+import { Unit, type UnitFormat } from '@dxos/util';
+
+import { createClientSaveTracker, getIcon, getStatus } from '../../components';
+import { meta } from '../../meta';
+import { log } from '@dxos/log';
+
+const SYNC_STALLED_TIMEOUT = 5_000;
+
+export const SyncStatus = () => {
+  const client = useClient();
+  const state = useSyncState();
+  const [saved, setSaved] = useState(true);
+  useEffect(() => createClientSaveTracker(client, (state) => setSaved(state === 'saved')), []);
+
+  return <SyncStatusIndicator state={state} saved={saved} />;
+};
+
+export const SyncStatusIndicator = ({ state, saved }: { state: SpaceSyncStateMap; saved: boolean }) => {
+  const { t } = useTranslation(meta.id);
+  const summary = getSyncSummary(state);
+  const offline = Object.values(state).length === 0;
+  const needsToUpload = summary.differentDocuments > 0 || summary.missingOnRemote > 0;
+  const needsToDownload = summary.differentDocuments > 0 || summary.missingOnLocal > 0;
+  const status = getStatus({ offline, saved, needsToUpload, needsToDownload });
+
+  const [classNames, setClassNames] = useState<string>();
+  useEffect(() => {
+    setClassNames(undefined);
+    if (offline || (!needsToUpload && !needsToDownload)) {
+      return;
+    }
+
+    const t = setTimeout(() => {
+      log.warn('sync stalled', { state });
+      // setClassNames('text-error-text');
+    }, SYNC_STALLED_TIMEOUT);
+    return () => clearTimeout(t);
+  }, [offline, needsToUpload, needsToDownload]);
+
+  return (
+    <Popover.Root>
+      <Popover.Trigger asChild>
+        <StatusBar.Item>
+          <IconButton icon={getIcon(status)} iconOnly label={t(`${status} label`)} classNames={classNames} />
+        </StatusBar.Item>
+      </Popover.Trigger>
+      <Popover.Portal>
+        <Popover.Content side='left' classNames=''>
+          <EdgeConnectionPopover />
+          <Popover.Arrow />
+        </Popover.Content>
+      </Popover.Portal>
+    </Popover.Root>
+  );
+};
+
+const EdgeConnectionPopover = () => {
+  const { t } = useTranslation(meta.id);
+  const client = useClient();
+  const { status } = useStream(
+    () => client.services.services.EdgeAgentService!.queryEdgeStatus(),
+    {} as QueryEdgeStatusResponse,
+  );
+
+  const isConnected = status?.state === EdgeStatus.ConnectionState.CONNECTED;
+
+  return (
+    <div className='flex flex-col gap-2 w-[240px] p-2' style={iconSize(4)}>
+      {/* Connection Status Header */}
+      <div className='flex items-center gap-2 mb-2'>
+        <Icon
+          icon={isConnected ? 'ph--check-circle--regular' : 'ph--warning-circle--regular'}
+          classNames={mx(isConnected ? 'text-success-text' : 'text-error-text animate-pulse')}
+        />
+        <span className='font-medium text-sm'>
+          {isConnected ? t('sync edge connected label') : t('sync edge disconnected label')}
+        </span>
+      </div>
+
+      {/* Connection Details */}
+      {status?.state === EdgeStatus.ConnectionState.NOT_CONNECTED && (
+        <div className='grid grid-cols-[min-content_1fr_min-content_min-content] gap-2'>
+          <Icon icon='ph--cloud-x--regular' />
+          <span className='text-description'>{t('sync no connection label')}</span>
+        </div>
+      )}
+
+      {status?.state === EdgeStatus.ConnectionState.CONNECTED && (
+        <div className='grid grid-cols-[min-content_1fr_min-content_min-content] gap-2 gap-y-1'>
+          {/* Latency */}
+          <div className='col-span-full grid grid-cols-subgrid gap-2 items-center text-sm'>
+            <Icon icon='ph--timer--regular' />
+            <span className='text-description'>{t('sync latency label')}</span>
+            <div />
+            <UnitValue value={status.rtt} format={Unit.Millisecond} />
+          </div>
+
+          {/* Upload Speed */}
+          <div className='col-span-full grid grid-cols-subgrid gap-2 items-center text-sm'>
+            <Icon icon='ph--arrow-up--regular' classNames='text-green-500' />
+            <span className='text-description'>{t('sync upload label')}</span>
+            <UnitValue value={status.messagesSent} format={Unit.Thousand} />
+            <UnitValue value={status.rateBytesUp} format={Unit.Kilobyte} suffix='/s' />
+          </div>
+
+          {/* Download Speed */}
+          <div className='col-span-full grid grid-cols-subgrid gap-2 items-center text-sm'>
+            <Icon icon='ph--arrow-down--regular' classNames='text-orange-500' />
+            <span className='text-description'>{t('sync download label')}</span>
+            <UnitValue value={status.messagesReceived} format={Unit.Thousand} />
+            <UnitValue value={status.rateBytesDown} format={Unit.Kilobyte} suffix='/s' />
+          </div>
+        </div>
+      )}
+    </div>
+  );
+};
+
+// TODO(burdon): Factor out.
+const UnitValue = ({ value: input, format, suffix }: { value: number; format: UnitFormat; suffix?: string }) => {
+  const { formattedValue, unit } = format(input);
+  return (
+    <span className='font-mono'>
+      {formattedValue}
+      <span className='ms-1 text-subdued'>
+        {unit.symbol}
+        {suffix}
+      </span>
+    </span>
+  );
+};

package/src/containers/SyncStatus/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { SyncStatus } from './SyncStatus';
+
+export default SyncStatus;

package/src/containers/ViewEditor/ViewEditor.tsx

@@ -0,0 +1,102 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+import React, { useCallback, useState } from 'react';
+
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { DXN, Filter, JsonSchema, Obj, Query, type QueryAST, Tag, Type } from '@dxos/echo';
+import { type View } from '@dxos/echo';
+import { type Mutable } from '@dxos/echo/internal';
+import { useClient } from '@dxos/react-client';
+import { getSpace, useQuery } from '@dxos/react-client/echo';
+import { useAsyncEffect } from '@dxos/react-ui';
+import { ViewEditor as NaturalViewEditor } from '@dxos/react-ui-form';
+import { ViewModel } from '@dxos/schema';
+
+import { resolveSchemaWithRegistry } from '../../helpers';
+import { useTypeOptions } from '../../hooks';
+import { SpaceOperation } from '../../operations';
+
+export type ViewEditorProps = { view: View.View };
+
+export const ViewEditor = ({ view }: ViewEditorProps) => {
+  const { invokePromise } = useOperationInvoker();
+  const client = useClient();
+  const space = getSpace(view);
+  const [schema, setSchema] = useState<Schema.Schema.AnyNoContext>(() => Schema.Struct({}));
+  const tags = useQuery(space?.db, Filter.type(Tag.Tag));
+  const types = useTypeOptions({
+    space,
+    annotation: {
+      location: ['database', 'runtime'],
+      kind: ['user'],
+    },
+  });
+
+  useAsyncEffect(async () => {
+    if (!view?.query || !space) {
+      return;
+    }
+
+    const foundSchema = await resolveSchemaWithRegistry(space.db.schemaRegistry, view.query.ast);
+    if (foundSchema && foundSchema !== schema) {
+      setSchema(() => foundSchema);
+    }
+  }, [client, space, view, schema]);
+
+  const handleQueryChanged = useCallback(
+    async (newQuery: QueryAST.Query, target?: string) => {
+      if (!view || !space) {
+        return;
+      }
+
+      const queue = target && DXN.tryParse(target) ? target : undefined;
+      const query = queue ? Query.fromAst(newQuery).from({ queues: [queue] }) : Query.fromAst(newQuery);
+      Obj.change(view, (obj) => {
+        obj.query.ast = query.ast as Mutable<typeof query.ast>;
+      });
+      const newSchema = await resolveSchemaWithRegistry(space.db.schemaRegistry, query.ast);
+      if (!newSchema) {
+        return;
+      }
+
+      const newView = ViewModel.make({
+        query,
+        jsonSchema: JsonSchema.toJsonSchema(newSchema),
+      });
+      Obj.change(view, (obj) => {
+        obj.projection = Obj.getSnapshot(newView).projection as Mutable<typeof obj.projection>;
+      });
+
+      setSchema(() => newSchema);
+    },
+    [view, schema],
+  );
+
+  const handleDelete = useCallback(
+    (fieldId: string) => {
+      void invokePromise(SpaceOperation.DeleteField, { view, fieldId });
+    },
+    [invokePromise, view],
+  );
+
+  if (!space || !schema) {
+    return null;
+  }
+
+  return (
+    <NaturalViewEditor
+      registry={space.db.schemaRegistry}
+      schema={schema}
+      view={view}
+      mode='tag'
+      db={space.db}
+      tags={tags}
+      types={types}
+      onQueryChanged={handleQueryChanged}
+      onDelete={Type.isMutable(schema) ? handleDelete : undefined}
+    />
+  );
+};

package/src/containers/ViewEditor/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { ViewEditor } from './ViewEditor';
+
+export default ViewEditor;

package/src/containers/index.ts

@@ -0,0 +1,28 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type ComponentType, lazy } from 'react';
+
+export type { CreateObjectDialogProps } from './CreateObjectDialog';
+
+export const CollectionArticle: ComponentType<any> = lazy(() => import('./CollectionArticle'));
+export const CollectionSection: ComponentType<any> = lazy(() => import('./CollectionSection'));
+export const CreateObjectDialog: ComponentType<any> = lazy(() => import('./CreateObjectDialog'));
+export const CreateSpaceDialog: ComponentType<any> = lazy(() => import('./CreateSpaceDialog'));
+export const InlineSyncStatus: ComponentType<any> = lazy(() => import('./InlineSyncStatus'));
+export const JoinDialog: ComponentType<any> = lazy(() => import('./JoinDialog'));
+export const MembersContainer: ComponentType<any> = lazy(() => import('./MembersContainer'));
+export const MenuFooter: ComponentType<any> = lazy(() => import('./MenuFooter'));
+export const ObjectCardStack: ComponentType<any> = lazy(() => import('./ObjectCardStack'));
+export const ObjectDetails: ComponentType<any> = lazy(() => import('./ObjectDetails'));
+export const ObjectRenamePopover: ComponentType<any> = lazy(() => import('./ObjectRenamePopover'));
+export const RecordArticle: ComponentType<any> = lazy(() => import('./RecordArticle'));
+export const SchemaContainer: ComponentType<any> = lazy(() => import('./SchemaContainer'));
+export const SmallPresenceLive: ComponentType<any> = lazy(() => import('./SmallPresenceLive'));
+export const SpacePluginSettings: ComponentType<any> = lazy(() => import('./SpacePluginSettings'));
+export const SpacePresence: ComponentType<any> = lazy(() => import('./SpacePresence'));
+export const SpaceRenamePopover: ComponentType<any> = lazy(() => import('./SpaceRenamePopover'));
+export const SpaceSettingsContainer: ComponentType<any> = lazy(() => import('./SpaceSettingsContainer'));
+export const SyncStatus: ComponentType<any> = lazy(() => import('./SyncStatus'));
+export const ViewEditor: ComponentType<any> = lazy(() => import('./ViewEditor'));

package/src/helpers/query.test.ts

@@ -15,7 +15,7 @@ describe('evalQuery', () => {
           "id": undefined,
           "props": {},
           "type": "object",
-          "typename": "dxn:type:dxos.org/type/Person:0.1.0",
+          "typename": "dxn:type:org.dxos.type.person:0.1.0",
         },
         "type": "select",
       }

package/src/helpers/query.ts

@@ -10,15 +10,15 @@ import * as Option from 'effect/Option';
 import type * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 
-import { DXN, Filter, Query, type QueryAST } from '@dxos/echo';
+import { DXN, Filter, Key, Query, type QueryAST, type SchemaRegistry } from '@dxos/echo';
 import {
   ReferenceAnnotationId,
   type ReferenceAnnotationValue,
   getTypeAnnotation,
   unwrapOptional,
 } from '@dxos/echo/internal';
+import { runAndForwardErrors } from '@dxos/effect';
 import { log } from '@dxos/log';
-import { type Client } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
 import { Person } from '@dxos/types';
 
@@ -35,26 +35,21 @@ export const evalQuery = (queryString: string): Query.Any => {
   }
 };
 
-export const resolveSchemaWithClientAndSpace = (client: Client, space: Space, query: QueryAST.Query) => {
+export const resolveSchemaWithRegistry = (registry: SchemaRegistry.SchemaRegistry, query: QueryAST.Query) => {
   const resolve = Effect.fn(function* (dxn: string) {
     const typename = DXN.parse(dxn).asTypeDXN()?.type;
     if (!typename) {
       return Option.none();
     }
 
-    const staticSchema = client.graph.schemaRegistry.getSchema(typename);
-    if (staticSchema) {
-      return Option.some(staticSchema);
-    }
-
-    const query = space.db.schemaRegistry.query({ typename });
+    const query = registry.query({ typename, location: ['database', 'runtime'] });
     const schemas = yield* Effect.promise(() => query.run());
-    return Array.head(schemas).pipe(Option.map((schema) => schema.snapshot));
+    return Array.head(schemas);
   });
 
   return resolveSchema(query, resolve).pipe(
     Effect.map((schema) => Option.getOrUndefined(schema)),
-    Effect.runPromise,
+    runAndForwardErrors,
   );
 };
 
@@ -71,12 +66,15 @@ const resolveSchema = (
         Option.getOrElse(() => Effect.succeed(Option.none<Schema.Schema.AnyNoContext>())),
       ),
     ),
-    Match.when({ type: 'filter' }, ({ filter }) =>
-      typenameFromFilter(filter).pipe(
-        Option.map((typename) => resolve(typename)),
-        Option.getOrElse(() => Effect.succeed(Option.none<Schema.Schema.AnyNoContext>())),
-      ),
-    ),
+    Match.when({ type: 'filter' }, ({ filter, selection }) => {
+      const filterResult = typenameFromFilter(filter);
+      return Option.isSome(filterResult)
+        ? filterResult.pipe(
+            Option.map((typename) => resolve(typename)),
+            Option.getOrElse(() => Effect.succeed(Option.none<Schema.Schema.AnyNoContext>())),
+          )
+        : resolveSchema(selection, resolve);
+    }),
     Match.when({ type: 'reference-traversal' }, ({ anchor, property }) =>
       resolveSchema(anchor, resolve).pipe(
         Effect.map((base) =>
@@ -142,17 +140,30 @@ const typenameFromFilter = (filter: QueryAST.Filter): Option.Option<string> =>
     Match.orElse(() => Option.none()),
   );
 
-// TODO(wittjosiah): Currently assumes options is at the top-level of the ast.
+// TODO(wittjosiah): Currently assumes from scope is at the top-level of the ast.
 export const getQueryTarget = (query: QueryAST.Query, space?: Space) => {
   return Match.value(query).pipe(
-    Match.when({ type: 'options' }, ({ options }) => {
-      return Option.fromNullable(options.queues).pipe(
+    Match.when({ type: 'from' }, ({ from }) => {
+      if (from._tag !== 'scope') {
+        return space?.db;
+      }
+      const result = Option.fromNullable(from.scope.queues).pipe(
         Option.flatMap((queues) => Array.head(queues)),
-        Option.flatMap((queueDxn) => Option.fromNullable(DXN.tryParse(queueDxn))),
-        Option.flatMap((queueDxn) => Option.fromNullable(space?.queues.get(queueDxn))),
-        Option.getOrElse(() => space),
+        Option.flatMap((queueDxn) => Option.fromNullable(DXN.tryParse(String(queueDxn)))),
+        Option.flatMap((parsed) => {
+          const q = parsed.asQueueDXN();
+          if (!q || !Key.ObjectId.isValid(q.queueId)) return Option.none();
+          return Option.fromNullable(space?.queues.get(parsed));
+        }),
       );
+      // Skip query when a requested queue is not found (structurally invalid DXN or valid DXN
+      // referencing a queue not present in space.queues, e.g. not yet synced) to avoid 400 errors.
+      // TODO(wittjosiah): Can we handle this upstream?
+      if (from.scope.queues?.length && Option.isNone(result)) {
+        return undefined;
+      }
+      return Option.getOrElse(result, () => space?.db);
     }),
-    Match.orElse(() => space),
+    Match.orElse(() => space?.db),
   );
 };

package/src/hooks/index.ts

@@ -5,4 +5,5 @@
 export * from './useActiveSpace';
 export * from './useInputSurfaceLookup';
 export * from './usePath';
+export * from './useRelatedObjects';
 export * from './useTypeOptions';