@dxos/plugin-space 0.8.4-main.74a063c4e0 → 0.8.4-main.765dc60934

package/src/{cli/commands → commands}/database/add.ts

@@ -8,28 +8,21 @@ import * as Prompt from '@effect/cli/Prompt';
 import * as Console from 'effect/Console';
 import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
-import type * as Schema from 'effect/Schema';
 
 // eslint-disable-next-line unused-imports/no-unused-imports
 import { type Capability, Plugin } from '@dxos/app-framework';
-import { AppActivationEvents, AppCapabilities } from '@dxos/app-toolkit';
+import { AppActivationEvents } from '@dxos/app-toolkit';
 import { CommandConfig, Common, flushAndSync, print, spaceLayer } from '@dxos/cli-util';
 import { SpaceProperties } from '@dxos/client/echo';
-import { Database, Filter, Obj, Type } from '@dxos/echo';
-import { Collection } from '@dxos/echo';
-import { EntityKind, getTypeAnnotation } from '@dxos/echo/internal';
 // eslint-disable-next-line unused-imports/no-unused-imports
-import type { Operation } from '@dxos/operation';
+import type { Operation } from '@dxos/compute';
+import { Collection, Database, Filter, Obj, Type } from '@dxos/echo';
+import { EntityKind, getTypeAnnotation } from '@dxos/echo/internal';
 
-import { type CreateObject } from '#types';
+import { SpaceCapabilities } from '#types';
 
 import { printObject } from './util';
 
-export type Metadata = {
-  createObject: CreateObject;
-  inputSchema?: Schema.Schema.AnyNoContext;
-};
-
 export const add = Command.make(
   'add',
   {
@@ -42,13 +35,13 @@ export const add = Command.make(
       const manager = yield* Plugin.Service;
       const { db } = yield* Database.Service;
 
-      yield* manager.activate(AppActivationEvents.SetupMetadata);
+      yield* manager.activate(AppActivationEvents.SetupSchema);
 
       const resolve = (typename: string) => {
-        const metadata = manager.capabilities
-          .getAll(AppCapabilities.Metadata)
-          .find(({ id }) => id === typename)?.metadata;
-        return metadata?.createObject ? (metadata as Metadata) : undefined;
+        const entry = manager.capabilities
+          .getAll(SpaceCapabilities.CreateObjectEntry)
+          .find(({ id }) => id === typename);
+        return entry ?? undefined;
       };
 
       const [properties] = yield* Database.runQuery(Filter.type(SpaceProperties));
@@ -85,7 +78,9 @@ export const add = Command.make(
 /**
  * Prompts for typename selection if not provided.
  */
-const selectTypename = Effect.fn(function* (resolve: (typename: string) => Metadata | undefined) {
+const selectTypename = Effect.fn(function* (
+  resolve: (typename: string) => SpaceCapabilities.CreateObjectEntry | undefined,
+) {
   const schemas = yield* Database.runSchemaQuery({
     location: ['database', 'runtime'],
     includeSystem: false,

package/src/{cli/commands → commands}/database/stats.ts

@@ -11,8 +11,7 @@ import * as Function from 'effect/Function';
 import * as Record from 'effect/Record';
 
 import { CommandConfig, Common, printList, spaceLayer } from '@dxos/cli-util';
-import { Obj } from '@dxos/echo';
-import { Database, Filter, Query } from '@dxos/echo';
+import { Database, Filter, Obj, Query } from '@dxos/echo';
 
 import { printStats } from './util';
 

package/src/{cli/commands → commands}/queue/query.ts

@@ -10,8 +10,7 @@ import * as Schema from 'effect/Schema';
 
 import { CommandConfig, printList } from '@dxos/cli-util';
 import { ClientService } from '@dxos/client';
-import { type Queue } from '@dxos/client/echo';
-import { DXN } from '@dxos/keys';
+import { DXN, type SpaceId } from '@dxos/keys';
 
 import { printQueueObject } from './util';
 
@@ -31,14 +30,24 @@ export const query = Command.make(
   Effect.fnUntraced(function* ({ dxn }) {
     const { json } = yield* CommandConfig;
     const client = yield* ClientService;
-    const queue = (yield* Effect.promise(() => client.graph.createRefResolver({}).resolve(dxn))) as Queue<any>;
-    const objects = yield* Effect.promise(() => queue.queryObjects());
+    const parts = dxn.asQueueDXN();
+    if (!parts) {
+      yield* Console.error(`Not a queue DXN: ${dxn.toString()}`);
+      return;
+    }
+    const space = client.spaces.get(parts.spaceId as SpaceId);
+    if (!space) {
+      yield* Console.error(`Space not found: ${parts.spaceId}`);
+      return;
+    }
+    // CLI works at the raw queue layer to inspect any queue by DXN.
+    const objects = (yield* Effect.promise(() => space.queues.get(dxn).queryObjects())) ?? [];
 
     if (json) {
       yield* Console.log(JSON.stringify(objects, null, 2));
     } else {
       // TODO(wittjosiah): Interactive table of results.
-      const formatted = objects.map(printQueueObject);
+      const formatted = objects.map((obj) => printQueueObject(obj as any));
       yield* Console.log(printList(formatted));
     }
   }),

package/src/{cli/commands → commands}/space/create/create.ts

@@ -22,7 +22,7 @@ export const handler = Effect.fn(function* ({ name }: { name: Option.Option<stri
   yield* Effect.tryPromise(() => space.waitUntilReady());
 
   if (Option.isSome(name)) {
-    Obj.change(space.properties, (obj) => {
+    Obj.update(space.properties, (obj) => {
       obj.name = Option.getOrUndefined(name);
     });
   }

package/src/{cli/commands → commands}/space/info/info.test.ts

@@ -19,7 +19,7 @@ describe('space info', () => {
       yield* Effect.tryPromise(() => client.halo.createIdentity());
       const space = yield* Effect.tryPromise(() => client.spaces.create());
       yield* Effect.tryPromise(() => space.waitUntilReady());
-      yield* handler({ spaceId: Option.some(space.id) });
+      yield* handler({ spaceId: Option.some(space.id), wait: Option.none() });
       const logger = yield* TestConsole.TestConsole;
       const logs = logger.logs;
       expect(logs).toHaveLength(1);

package/src/{cli/commands → commands}/space/info/info.ts

@@ -6,20 +6,27 @@ import * as Command from '@effect/cli/Command';
 import * as Options from '@effect/cli/Options';
 import * as Console from 'effect/Console';
 import * as Effect from 'effect/Effect';
-import type * as Option from 'effect/Option';
+import * as Option from 'effect/Option';
 
 import { CommandConfig, Common, formatSpace, getSpace, print, printSpace, spaceIdWithDefault } from '@dxos/cli-util';
 import { ClientService } from '@dxos/client';
 import { type Key } from '@dxos/echo';
 
-export const handler = Effect.fn(function* ({ spaceId }: { spaceId: Option.Option<string> }) {
+export const handler = Effect.fn(function* ({
+  spaceId,
+  wait,
+}: {
+  spaceId: Option.Option<string>;
+  wait: Option.Option<number>;
+}) {
   const { json } = yield* CommandConfig;
   const client = yield* ClientService;
 
   const resolvedSpaceId = yield* spaceIdWithDefault(spaceId as Option.Option<Key.SpaceId>);
   const space = yield* getSpace(resolvedSpaceId);
 
-  const formatted = yield* formatSpace(space);
+  const waitSeconds = Option.getOrElse(wait, () => 0);
+  const formatted = yield* formatSpace(space, { waitSeconds });
 
   if (json) {
     yield* Console.log(JSON.stringify(formatted, null, 2));
@@ -32,6 +39,12 @@ export const info = Command.make(
   'info',
   {
     spaceId: Common.spaceId.pipe(Options.optional),
+    wait: Options.integer('wait').pipe(
+      Options.withDescription(
+        'Wait up to this many seconds for the space to reach SPACE_READY. Default 0 — read whatever state is available immediately.',
+      ),
+      Options.optional,
+    ),
   },
   handler,
 ).pipe(Command.withDescription('Show space info.'));

package/src/{cli/commands → commands}/space/list/list.test.ts

@@ -4,6 +4,7 @@
 
 import { describe, expect, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
 import { TestConsole, TestLayer } from '@dxos/cli-util/testing';
 import { ClientService } from '@dxos/client';
@@ -14,7 +15,7 @@ import { handler } from './list';
 describe('spaces list', () => {
   it('should list empty space list', () =>
     Effect.gen(function* () {
-      yield* handler();
+      yield* handler({ wait: Option.none() });
       const logger = yield* TestConsole.TestConsole;
       const logs = logger.logs;
       expect(logs).toHaveLength(1);
@@ -26,11 +27,11 @@ describe('spaces list', () => {
       const client = yield* ClientService;
       yield* Effect.tryPromise(() => client.halo.createIdentity());
       yield* Effect.tryPromise(() => client.spaces.create());
-      yield* handler();
+      yield* handler({ wait: Option.none() });
       const logger = yield* TestConsole.TestConsole;
       const logs = logger.logs;
       expect(logs).toHaveLength(1);
       const formattedSpaces = TestConsole.parseJson(logs[0]);
-      expect(formattedSpaces).toHaveLength(2);
+      expect(formattedSpaces).toHaveLength(1);
     }).pipe(Effect.provide(TestLayer), Effect.scoped, runAndForwardErrors));
 });

package/src/commands/space/list/list.ts

@@ -0,0 +1,42 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+import * as Options from '@effect/cli/Options';
+import * as Console from 'effect/Console';
+import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
+
+import { CommandConfig, formatSpace, printSpace } from '@dxos/cli-util';
+import { printList } from '@dxos/cli-util';
+import { ClientService } from '@dxos/client';
+
+// TODO(burdon): Move handler inline and test separate functions.
+export const handler = Effect.fn(function* ({ wait }: { wait: Option.Option<number> }) {
+  const { json } = yield* CommandConfig;
+  const client = yield* ClientService;
+  const spaces = client.spaces.get();
+  const waitSeconds = Option.getOrElse(wait, () => 0);
+  const formattedSpaces = yield* Effect.all(spaces.map((space) => formatSpace(space, { waitSeconds })));
+
+  if (json) {
+    yield* Console.log(JSON.stringify(formattedSpaces, null, 2));
+  } else {
+    const formatted = formattedSpaces.map(printSpace);
+    yield* Console.log(printList(formatted));
+  }
+});
+
+export const list = Command.make(
+  'list',
+  {
+    wait: Options.integer('wait').pipe(
+      Options.withDescription(
+        'Wait up to this many seconds for each space to reach SPACE_READY before reading. Default 0 — print whatever state is available immediately so a stuck space cannot hang the command.',
+      ),
+      Options.optional,
+    ),
+  },
+  handler,
+).pipe(Command.withDescription('List all spaces available on this device.'));

package/src/components/AwaitingObject/AwaitingObject.tsx

@@ -7,9 +7,9 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { LayoutOperation } from '@dxos/app-toolkit';
 import { useLayout } from '@dxos/app-toolkit/ui';
-import { Obj } from '@dxos/echo';
+import { Filter, Obj } from '@dxos/echo';
 import { useClient } from '@dxos/react-client';
-import { Filter, useQuery } from '@dxos/react-client/echo';
+import { useQuery } from '@dxos/react-client/echo';
 import { Button, Icon, Toast, useTranslation } from '@dxos/react-ui';
 import { osTranslations } from '@dxos/ui-theme';
 

package/src/components/CreateDialog/CreateObjectPanel.tsx

@@ -2,13 +2,12 @@
 // Copyright 2024 DXOS.org
 //
 
-import type * as Schema from 'effect/Schema';
 import React, { useCallback, useMemo } from 'react';
 
-import { type Database, Obj } from '@dxos/echo';
-import { type Collection } from '@dxos/echo';
+import { type Collection, type Database, Obj } from '@dxos/echo';
 import { type AnyProperties } from '@dxos/echo/internal';
-import { type Space, type SpaceId } from '@dxos/react-client/echo';
+import { type SpaceId } from '@dxos/keys';
+import { type Space } from '@dxos/react-client/echo';
 import { toLocalizedString, useDefaultValue, useTranslation } from '@dxos/react-ui';
 import { Form, omitId } from '@dxos/react-ui-form';
 import { SearchList, useSearchListResults } from '@dxos/react-ui-search';
@@ -16,7 +15,7 @@ import { type MaybePromise } from '@dxos/util';
 
 import { useInputSurfaceLookup } from '#hooks';
 import { meta } from '#meta';
-import { type CreateObject } from '#types';
+import { type SpaceCapabilities } from '#types';
 
 import { getSpaceDisplayName } from '../../util';
 
@@ -27,11 +26,7 @@ export type CreateObjectOption = {
   icon?: string;
 };
 
-export type Metadata = {
-  createObject: CreateObject;
-  inputSchema?: Schema.Schema.AnyNoContext;
-  icon?: string;
-};
+export type Metadata = SpaceCapabilities.CreateObjectEntry;
 
 export type CreateObjectPanelProps = {
   options: CreateObjectOption[];
@@ -76,7 +71,7 @@ export const CreateObjectPanel = ({
   const handleSelectOption = useCallback(
     async (id: string) => {
       const metadata = resolve?.(id);
-      if (metadata && !metadata.inputSchema) {
+      if (metadata && !metadata.inputSchema && !metadata.customPanel) {
         await onCreateObject?.({ metadata });
       } else {
         onTypenameChange?.(id);
@@ -91,16 +86,27 @@ export const CreateObjectPanel = ({
   );
   const inputSurfaceLookup = useInputSurfaceLookup({ target });
 
-  // TODO(wittjosiah): These inputs should be rolled into a `Form` once it supports the necessary variants.
+  // TODO(wittjosiah): Extends and use react-ui-form to handle variants.
+
   if (!metadata) {
     return <SelectType options={sortedOptions} onChange={handleSelectOption} />;
   }
 
-  // TODO(burdon): Remove.
   if (!target) {
     return <SelectSpace spaces={spaces} defaultSpaceId={defaultSpaceId} onChange={onTargetChange} />;
   }
 
+  if (metadata.customPanel) {
+    const CustomPanel = metadata.customPanel;
+    return (
+      <CustomPanel
+        target={target}
+        initialFormValues={initialFormValues}
+        onCreateObject={(data) => handleCreateObject(data)}
+      />
+    );
+  }
+
   if (metadata.inputSchema) {
     return (
       <Form.Root
@@ -141,24 +147,23 @@ const SelectType = ({ options, onChange }: SelectTypeProps) => {
 
   return (
     <SearchList.Root onSearch={handleSearch}>
-      <SearchList.Content classNames='gap-form-gap'>
-        <SearchList.Input
-          autoFocus
-          data-testid='create-object-form.schema-input'
-          placeholder={t('schema-input.placeholder')}
-        />
-        <SearchList.Viewport>
-          {results.map((option) => (
-            <SearchList.Item
-              key={option.id}
-              value={option.id}
-              label={option.label}
-              icon={option.icon ?? 'ph--placeholder--regular'}
-              onSelect={() => onChange(option.id)}
-            />
-          ))}
-        </SearchList.Viewport>
-      </SearchList.Content>
+      <SearchList.Input
+        classNames='mb-form-gap'
+        autoFocus
+        data-testid='create-object-form.schema-input'
+        placeholder={t('schema-input.placeholder')}
+      />
+      <SearchList.Viewport>
+        {results.map((option) => (
+          <SearchList.Item
+            key={option.id}
+            value={option.id}
+            label={option.label}
+            icon={option.icon ?? 'ph--placeholder--regular'}
+            onSelect={() => onChange(option.id)}
+          />
+        ))}
+      </SearchList.Viewport>
     </SearchList.Root>
   );
 };
@@ -203,25 +208,24 @@ const SelectSpace = ({ spaces, defaultSpaceId, onChange }: SelectSpaceProps) =>
 
   return (
     <SearchList.Root onSearch={handleSearch}>
-      <SearchList.Content>
-        <SearchList.Input
-          autoFocus
-          data-testid='create-object-form.space-input'
-          placeholder={t('space-input.placeholder')}
-        />
-        <SearchList.Viewport>
-          {results.map((space) => {
-            return (
-              <SearchList.Item
-                key={space.id}
-                value={space.id}
-                label={toLocalizedString(getSpaceDisplayName(space, { personal: space.id === defaultSpaceId }), t)}
-                onSelect={() => onChange?.(space.db)}
-              />
-            );
-          })}
-        </SearchList.Viewport>
-      </SearchList.Content>
+      <SearchList.Input
+        classNames='mb-form-gap'
+        autoFocus
+        data-testid='create-object-form.space-input'
+        placeholder={t('space-input.placeholder')}
+      />
+      <SearchList.Viewport>
+        {results.map((space) => {
+          return (
+            <SearchList.Item
+              key={space.id}
+              value={space.id}
+              label={toLocalizedString(getSpaceDisplayName(space, { personal: space.id === defaultSpaceId }), t)}
+              onSelect={() => onChange?.(space.db)}
+            />
+          );
+        })}
+      </SearchList.Viewport>
     </SearchList.Root>
   );
 };

package/src/components/{ObjectDetails → ForeignKeys}/index.ts

@@ -2,5 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './BaseObjectSettings';
 export * from './ForeignKeys';

package/src/components/{SpacePluginSettings/SpacePluginSettings.stories.tsx → SpaceSettings/SpaceSettings.stories.tsx}

@@ -6,19 +6,20 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { translations } from '../../translations';
-import { SpacePluginSettings } from './SpacePluginSettings';
+import { translations } from '#translations';
+
+import { SpaceSettings } from './SpaceSettings';
 
 const meta = {
-  title: 'plugins/plugin-space/components/SpacePluginSettings',
-  component: SpacePluginSettings,
+  title: 'plugins/plugin-space/components/SpaceSettings',
+  component: SpaceSettings,
   tags: ['settings'],
   decorators: [withTheme(), withLayout({ layout: 'fullscreen' })],
   parameters: {
     layout: 'fullscreen',
     translations,
   },
-} satisfies Meta<typeof SpacePluginSettings>;
+} satisfies Meta<typeof SpaceSettings>;
 
 export default meta;
 

package/src/components/{SpacePluginSettings/SpacePluginSettings.tsx → SpaceSettings/SpaceSettings.tsx}

@@ -15,7 +15,7 @@ import { type Settings } from '#types';
 
 import { getSpaceDisplayName } from '../../util';
 
-export type SpacePluginSettingsProps = AppSurface.SettingsArticleProps<
+export type SpaceSettingsProps = AppSurface.SettingsArticleProps<
   Settings.Settings,
   {
     spaces?: Space[];
@@ -23,12 +23,7 @@ export type SpacePluginSettingsProps = AppSurface.SettingsArticleProps<
   }
 >;
 
-export const SpacePluginSettings = ({
-  settings,
-  onSettingsChange,
-  spaces,
-  onOpenSpaceSettings,
-}: SpacePluginSettingsProps) => {
+export const SpaceSettings = ({ settings, onSettingsChange, spaces, onOpenSpaceSettings }: SpaceSettingsProps) => {
   const { t } = useTranslation(meta.id);
 
   return (

package/src/components/SpaceSettings/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+export { SpaceSettings as default } from './SpaceSettings';

package/src/components/SyncStatus/save-tracker.ts

@@ -4,8 +4,9 @@
 
 import { type CleanupFn } from '@dxos/async';
 import { type Client } from '@dxos/client';
-import { type Space, type SpaceId } from '@dxos/client/echo';
+import { type Space } from '@dxos/client/echo';
 import { Context } from '@dxos/context';
+import { type SpaceId } from '@dxos/keys';
 
 export const createClientSaveTracker = (client: Client, cb: (state: 'saved' | 'saving') => void) => {
   const CleanupFns: Record<SpaceId, CleanupFn> = {};

package/src/components/index.ts

@@ -6,8 +6,7 @@ import { type ComponentType, lazy } from 'react';
 
 export * from './AwaitingObject';
 export * from './CreateDialog';
-export * from './ObjectDetails';
-export * from './ObjectForm';
+export * from './ForeignKeys';
 export * from './SyncStatus';
 
-export const SpacePluginSettings: ComponentType<any> = lazy(() => import('./SpacePluginSettings'));
+export const SpaceSettings: ComponentType<any> = lazy(() => import('./SpaceSettings'));

package/src/constants.ts

@@ -6,6 +6,7 @@ import { meta } from '#meta';
 
 export const CREATE_OBJECT_DIALOG = `${meta.id}.CreateObjectDialog`;
 export const CREATE_SPACE_DIALOG = `${meta.id}.CreateSpaceDialog`;
+export const IMPORT_SPACE_DIALOG = `${meta.id}.ImportSpaceDialog`;
 export const JOIN_DIALOG = `${meta.id}.JoinDialog`;
 export const OBJECT_RENAME_POPOVER = `${meta.id}.ObjectRenamePopover`;
 export const SPACE_RENAME_POPOVER = `${meta.id}.SpaceRenamePopover`;

package/src/containers/CollectionArticle/CollectionArticle.tsx

@@ -2,13 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as Option from 'effect/Option';
 import React, { useCallback, useMemo } from 'react';
 
-import { useCapabilities, useOperationInvoker } from '@dxos/app-framework/ui';
-import { AppCapabilities, LayoutOperation, getCollectionObjectPath, getObjectPathFromObject } from '@dxos/app-toolkit';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation, getCollectionObjectPath, getObjectPathFromObject } from '@dxos/app-toolkit';
 import { type AppSurface } from '@dxos/app-toolkit/ui';
-import { Obj } from '@dxos/echo';
-import { type Collection } from '@dxos/echo';
+import { Annotation, type Collection, Obj } from '@dxos/echo';
 import { ScrollArea, toLocalizedString, useTranslation } from '@dxos/react-ui';
 import { Card } from '@dxos/react-ui';
 import { Mosaic, type MosaicStackTileComponent } from '@dxos/react-ui-mosaic';
@@ -17,21 +17,12 @@ import { getStyles } from '@dxos/ui-theme';
 
 import { meta } from '#meta';
 
-/**
- * Hook to resolve metadata (icon, iconHue, etc.) for objects based on their typename.
- */
-const useMetadataResolver = () => {
-  const allMetadata = useCapabilities(AppCapabilities.Metadata);
-  return useCallback((typename: string) => allMetadata.find((m) => m.id === typename)?.metadata ?? {}, [allMetadata]);
-};
-
 /**
  * Article view for collections.
  */
 export const CollectionArticle = ({ subject, attendableId }: AppSurface.ObjectArticleProps<Collection.Collection>) => {
   const { t } = useTranslation(meta.id);
-  const resolveMetadata = useMetadataResolver();
-  const { items, handleSearch } = useCollectionItems(subject, resolveMetadata, attendableId);
+  const { items, handleSearch } = useCollectionItems(subject, attendableId);
 
   return (
     <SearchPanel onSearch={handleSearch}>
@@ -83,7 +74,7 @@ const ObjectTile: MosaicStackTileComponent<ObjectItem> = ({ data: item }) => {
           label={label}
           icon={item.icon}
           iconOnly
-          iconClassNames={styles?.surfaceText}
+          iconClassNames={styles?.foreground}
         />
         <Card.Title>{label}</Card.Title>
         <Card.Menu />
@@ -92,16 +83,10 @@ const ObjectTile: MosaicStackTileComponent<ObjectItem> = ({ data: item }) => {
   );
 };
 
-type MetadataResolver = (typename: string) => { icon?: string; iconHue?: string };
-
 /**
  * Combined hook to get collection items with search/filter support.
  */
-const useCollectionItems = (
-  collection: Collection.Collection,
-  resolveMetadata: MetadataResolver,
-  attendableId?: string,
-) => {
+const useCollectionItems = (collection: Collection.Collection, attendableId?: string) => {
   const objects = useMemo(
     () => (collection.objects ?? []).map((ref) => ref.target).filter((obj): obj is Obj.Unknown => Obj.isObject(obj)),
     [collection.objects],
@@ -110,19 +95,19 @@ const useCollectionItems = (
   const items = useMemo(
     () =>
       objects.map((obj) => {
-        const typename = Obj.getTypename(obj);
-        const metadata = typename ? resolveMetadata(typename) : {};
+        const schema = Obj.getSchema(obj);
+        const iconAnnotation = schema ? Option.getOrUndefined(Annotation.IconAnnotation.get(schema)) : undefined;
         const targetPath = attendableId ? getCollectionObjectPath(attendableId, obj.id) : getObjectPathFromObject(obj);
 
         return {
           id: Obj.getDXN(obj).toString(),
           object: obj,
           targetPath,
-          icon: metadata.icon ?? 'ph--placeholder--regular',
-          iconHue: metadata.iconHue,
+          icon: iconAnnotation?.icon ?? 'ph--placeholder--regular',
+          iconHue: iconAnnotation?.hue,
         } satisfies ObjectItem;
       }),
-    [objects, resolveMetadata, attendableId],
+    [objects, attendableId],
   );
 
   const { results, handleSearch } = useSearchListResults({

package/src/containers/CreateObjectDialog/CreateObjectDialog.stories.tsx

@@ -14,8 +14,7 @@ import { Dialog } from '@dxos/react-ui';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { type CreateObjectOption, type Metadata, CreateObjectPanel } from '#components';
-
-import { translations } from '../../translations';
+import { translations } from '#translations';
 
 const mockOptions: CreateObjectOption[] = [
   { id: 'org.dxos.type.document', label: 'Document', icon: 'ph--file-text--regular' },
@@ -60,9 +59,9 @@ const mockInputSchema = Schema.Struct({
 });
 
 const mockMetadata: Metadata = {
+  id: 'org.dxos.type.document',
   createObject: () => Effect.succeed({ id: 'mock-id', subject: [], object: {} as any }),
   inputSchema: mockInputSchema,
-  icon: 'ph--file-text--regular',
 };
 
 const meta = {