@dxos/plugin-preview 0.8.3-staging.0fa589b → 0.8.4-main.1da679c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-preview",
-  "version": "0.8.3-staging.0fa589b",
+  "version": "0.8.4-main.1da679c",
   "description": "Preview plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,6 +10,7 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs"
     }
@@ -23,34 +24,39 @@
     "src"
   ],
   "dependencies": {
+    "@effect-rx/rx-react": "0.38.0",
     "@preact-signals/safe-react": "^0.9.0",
-    "effect": "3.14.21",
-    "@dxos/app-framework": "0.8.3-staging.0fa589b",
-    "@dxos/client": "0.8.3-staging.0fa589b",
-    "@dxos/async": "0.8.3-staging.0fa589b",
-    "@dxos/echo": "0.8.3-staging.0fa589b",
-    "@dxos/echo-schema": "0.8.3-staging.0fa589b",
-    "@dxos/keys": "0.8.3-staging.0fa589b",
-    "@dxos/lit-ui": "0.8.3-staging.0fa589b",
-    "@dxos/log": "0.8.3-staging.0fa589b",
-    "@dxos/plugin-client": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui": "0.8.3-staging.0fa589b",
-    "@dxos/react-client": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-editor": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-form": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-stack": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-theme": "0.8.3-staging.0fa589b",
-    "@dxos/schema": "0.8.3-staging.0fa589b",
-    "@dxos/react-ui-table": "0.8.3-staging.0fa589b",
-    "@dxos/util": "0.8.3-staging.0fa589b"
+    "@dxos/app-framework": "0.8.4-main.1da679c",
+    "@dxos/async": "0.8.4-main.1da679c",
+    "@dxos/app-graph": "0.8.4-main.1da679c",
+    "@dxos/echo": "0.8.4-main.1da679c",
+    "@dxos/client": "0.8.4-main.1da679c",
+    "@dxos/echo-schema": "0.8.4-main.1da679c",
+    "@dxos/keys": "0.8.4-main.1da679c",
+    "@dxos/log": "0.8.4-main.1da679c",
+    "@dxos/plugin-attention": "0.8.4-main.1da679c",
+    "@dxos/plugin-client": "0.8.4-main.1da679c",
+    "@dxos/plugin-deck": "0.8.4-main.1da679c",
+    "@dxos/lit-ui": "0.8.4-main.1da679c",
+    "@dxos/plugin-space": "0.8.4-main.1da679c",
+    "@dxos/react-client": "0.8.4-main.1da679c",
+    "@dxos/react-ui-editor": "0.8.4-main.1da679c",
+    "@dxos/react-ui": "0.8.4-main.1da679c",
+    "@dxos/react-ui-form": "0.8.4-main.1da679c",
+    "@dxos/react-ui-table": "0.8.4-main.1da679c",
+    "@dxos/react-ui-stack": "0.8.4-main.1da679c",
+    "@dxos/react-ui-menu": "0.8.4-main.1da679c",
+    "@dxos/react-ui-theme": "0.8.4-main.1da679c",
+    "@dxos/schema": "0.8.4-main.1da679c",
+    "@dxos/util": "0.8.4-main.1da679c"
   },
   "devDependencies": {
-    "effect": "3.14.21",
+    "effect": "3.17.7",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/random": "0.8.3-staging.0fa589b",
-    "@dxos/storybook-utils": "0.8.3-staging.0fa589b"
+    "vite": "7.1.1",
+    "@dxos/random": "0.8.4-main.1da679c",
+    "@dxos/storybook-utils": "0.8.4-main.1da679c"
   },
   "peerDependencies": {
     "effect": "^3.13.3",

package/src/PreviewPlugin.tsx

@@ -8,7 +8,7 @@ import { DataType } from '@dxos/schema';
 
 import { PreviewPopover, ReactSurface } from './capabilities';
 import { meta } from './meta';
-import translations from './translations';
+import { translations } from './translations';
 
 export const PreviewPlugin = () =>
   definePlugin(meta, [

package/src/capabilities/preview-popover.ts

@@ -2,14 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, LayoutAction, contributes, createIntent, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, LayoutAction, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
 import { addEventListener } from '@dxos/async';
-import { type Client, resolveRef } from '@dxos/client';
-import { parseId, type Space } from '@dxos/client/echo';
+import { type Client } from '@dxos/client';
+import { type Space, parseId } from '@dxos/client/echo';
 import { DXN } from '@dxos/keys';
-import { type DxRefTagActivate } from '@dxos/lit-ui';
 import { log } from '@dxos/log';
 import { ClientCapabilities } from '@dxos/plugin-client';
+import { DX_ANCHOR_ACTIVATE, type DxAnchorActivate } from '@dxos/react-ui';
 import { type PreviewLinkRef, type PreviewLinkTarget } from '@dxos/react-ui-editor';
 
 const customEventOptions = { capture: true, passive: false };
@@ -20,12 +20,7 @@ const handlePreviewLookup = async (
   { ref, label }: PreviewLinkRef,
 ): Promise<PreviewLinkTarget | null> => {
   try {
-    const dxn = DXN.parse(ref);
-    if (!dxn) {
-      return null;
-    }
-
-    const object = await resolveRef(client, dxn, defaultSpace);
+    const object = await defaultSpace.db.ref(DXN.parse(ref)).load();
     return { label, object };
   } catch (err) {
     return null;
@@ -34,7 +29,7 @@ const handlePreviewLookup = async (
 
 export default (context: PluginContext) => {
   // TODO(wittjosiah): Factor out lookup handlers to other plugins to make not ECHO-specific.
-  const handleDxRefTagActivate = async ({ refId, label, trigger }: DxRefTagActivate) => {
+  const handleDxAnchorActivate = async ({ refId, label, trigger }: DxAnchorActivate) => {
     const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
     const client = context.getCapability(ClientCapabilities.Client);
     const [layout] = context.getCapabilities(Capabilities.Layout);
@@ -62,8 +57,8 @@ export default (context: PluginContext) => {
   if (document.defaultView) {
     cleanup = addEventListener(
       document.defaultView,
-      'dx-ref-tag-activate' as any,
-      handleDxRefTagActivate,
+      DX_ANCHOR_ACTIVATE as any,
+      handleDxAnchorActivate,
       customEventOptions,
     );
   } else {

package/src/capabilities/react-surface.tsx

@@ -2,6 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Effect } from 'effect';
 import React, { useCallback } from 'react';
 
 import {
@@ -14,16 +15,21 @@ import {
   useIntentDispatcher,
 } from '@dxos/app-framework';
 import { fullyQualifiedId, getSchema, getSpace } from '@dxos/client/echo';
-import { Obj, Filter } from '@dxos/echo';
+import { Filter, Obj } from '@dxos/echo';
 import { type JsonPath, setValue } from '@dxos/echo-schema';
+import { AttentionAction } from '@dxos/plugin-attention/types';
+import { ATTENDABLE_PATH_SEPARATOR, DeckAction } from '@dxos/plugin-deck/types';
+import { useActiveSpace } from '@dxos/plugin-space';
+import { useQuery, useSpace } from '@dxos/react-client/echo';
 import { useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
 import { Card } from '@dxos/react-ui-stack';
-import { TableType } from '@dxos/react-ui-table';
+import { Table } from '@dxos/react-ui-table/types';
 import { descriptionMessage, mx } from '@dxos/react-ui-theme';
-import { DataType } from '@dxos/schema';
+import { DataType, type ProjectionModel, typenameFromQuery } from '@dxos/schema';
 
 import { ContactCard, OrganizationCard, ProjectCard } from '../components';
+import { TaskCard } from '../components/TaskCard';
 import { PREVIEW_PLUGIN } from '../meta';
 
 export default () =>
@@ -33,60 +39,104 @@ export default () =>
     //
     createSurface({
       id: `${PREVIEW_PLUGIN}/schema-popover--contact`,
-      role: ['popover', 'card--kanban', 'card--document', 'card'],
+      role: ['card--popover', 'card--intrinsic', 'card--transclusion', 'card--extrinsic', 'card'],
       filter: (data): data is { subject: DataType.Person } => Obj.instanceOf(DataType.Person, data.subject),
       component: ({ data, role }) => {
-        const { dispatchPromise: dispatch } = useIntentDispatcher();
+        const { dispatch } = useIntentDispatcher();
+        const space = getSpace(data.subject);
+        const defaultSpace = useSpace();
+        const activeSpace = useActiveSpace();
+
+        const currentSpaceOrgs = useQuery(space, Filter.type(DataType.Organization));
+        const currentSpaceViews = useQuery(space, Filter.type(DataType.View));
+        const defaultSpaceViews = useQuery(defaultSpace, Filter.type(DataType.View));
+        const currentSpaceOrgTable = currentSpaceViews.find(
+          (view) =>
+            typenameFromQuery(view.query) === DataType.Organization.typename &&
+            Obj.instanceOf(Table.Table, view.presentation.target),
+        );
+        const defaultSpaceOrgTable = defaultSpaceViews.find(
+          (view) =>
+            typenameFromQuery(view.query) === DataType.Organization.typename &&
+            Obj.instanceOf(Table.Table, view.presentation.target),
+        );
+
+        // TODO(wittjosiah): Generalized way of handling related objects navigation.
         const handleOrgClick = useCallback(
-          async (org: DataType.Organization) => {
-            const space = getSpace(org);
-            const tablesQuery = await space?.db.query(Filter.type(TableType)).run();
-            const currentSpaceOrgTable = tablesQuery?.objects.find((table) => {
-              return table.view?.target?.query?.typename === DataType.Organization.typename;
-            });
-            await dispatch(
-              createIntent(LayoutAction.UpdatePopover, {
-                part: 'popover',
-                options: {
-                  state: false,
-                  anchorId: '',
-                },
-              }),
-            );
-            if (currentSpaceOrgTable) {
-              return dispatch(
-                createIntent(LayoutAction.Open, {
-                  part: 'main',
-                  subject: [fullyQualifiedId(currentSpaceOrgTable)],
-                  options: { workspace: space?.id },
+          (org: DataType.Organization) =>
+            Effect.gen(function* () {
+              const view = currentSpaceOrgs.includes(org) ? currentSpaceOrgTable : defaultSpaceOrgTable;
+              yield* dispatch(
+                createIntent(LayoutAction.UpdatePopover, {
+                  part: 'popover',
+                  options: {
+                    state: false,
+                    anchorId: '',
+                  },
                 }),
               );
-            }
-          },
-          [dispatch],
+              if (view) {
+                const id = fullyQualifiedId(view);
+                yield* dispatch(
+                  createIntent(LayoutAction.Open, {
+                    part: 'main',
+                    subject: [id],
+                    options: { workspace: space?.id },
+                  }),
+                );
+                yield* dispatch(
+                  createIntent(DeckAction.ChangeCompanion, {
+                    primary: id,
+                    companion: [id, 'selected-objects'].join(ATTENDABLE_PATH_SEPARATOR),
+                  }),
+                );
+                yield* dispatch(
+                  createIntent(AttentionAction.Select, {
+                    contextId: id,
+                    selection: { mode: 'multi', ids: [org.id] },
+                  }),
+                );
+              }
+            }).pipe(Effect.runPromise),
+          [dispatch, currentSpaceOrgs, currentSpaceOrgTable, defaultSpaceOrgTable],
         );
+
         return (
-          <ContactCard role={role} subject={data.subject} onOrgClick={handleOrgClick}>
-            {role === 'popover' && <Surface role='related' data={data} />}
+          <ContactCard role={role} subject={data.subject} activeSpace={activeSpace} onOrgClick={handleOrgClick}>
+            {role === 'card--popover' && <Surface role='related' data={data} />}
           </ContactCard>
         );
       },
     }),
     createSurface({
       id: `${PREVIEW_PLUGIN}/schema-popover--organization`,
-      role: ['popover', 'card--kanban', 'card--document', 'card'],
+      role: ['card--popover', 'card--intrinsic', 'card--transclusion', 'card--extrinsic', 'card'],
       filter: (data): data is { subject: DataType.Organization } => Obj.instanceOf(DataType.Organization, data.subject),
-      component: ({ data, role }) => (
-        <OrganizationCard role={role} subject={data.subject}>
-          {role === 'popover' && <Surface role='related' data={data} />}
-        </OrganizationCard>
-      ),
+      component: ({ data, role }) => {
+        const activeSpace = useActiveSpace();
+
+        return (
+          <OrganizationCard role={role} subject={data.subject} activeSpace={activeSpace}>
+            {role === 'card--popover' && <Surface role='related' data={data} />}
+          </OrganizationCard>
+        );
+      },
     }),
     createSurface({
       id: `${PREVIEW_PLUGIN}/schema-popover--project`,
-      role: ['popover', 'card--kanban', 'card--document', 'card'],
+      role: ['card--popover', 'card--intrinsic', 'card--transclusion', 'card--extrinsic', 'card'],
       filter: (data): data is { subject: DataType.Project } => Obj.instanceOf(DataType.Project, data.subject),
-      component: ({ data, role }) => <ProjectCard subject={data.subject} role={role} />,
+      component: ({ data, role }) => {
+        const activeSpace = useActiveSpace();
+
+        return <ProjectCard subject={data.subject} role={role} activeSpace={activeSpace} />;
+      },
+    }),
+    createSurface({
+      id: `${PREVIEW_PLUGIN}/schema-popover--task`,
+      role: ['card--popover', 'card--intrinsic', 'card--transclusion', 'card--extrinsic', 'card'],
+      filter: (data): data is { subject: DataType.Task } => Obj.instanceOf(DataType.Task, data.subject),
+      component: ({ data, role }) => <TaskCard subject={data.subject} role={role} />,
     }),
 
     //
@@ -94,9 +144,9 @@ export default () =>
     //
     createSurface({
       id: `${PREVIEW_PLUGIN}/fallback-popover`,
-      role: ['popover', 'card--kanban', 'card--document', 'card'],
+      role: ['card--popover', 'card--intrinsic', 'card--transclusion', 'card--extrinsic', 'card'],
       position: 'fallback',
-      filter: (data): data is { subject: Obj.Any } => Obj.isObject(data.subject),
+      filter: (data): data is { subject: Obj.Any; projection?: ProjectionModel } => Obj.isObject(data.subject),
       component: ({ data, role }) => {
         const schema = getSchema(data.subject);
         const { t } = useTranslation(PREVIEW_PLUGIN);
@@ -114,16 +164,17 @@ export default () =>
         }, []);
 
         return (
-          <Card.Container role={role}>
+          <Card.SurfaceRoot role={role}>
             <Form
               schema={schema}
+              projection={data.projection}
               values={data.subject}
-              readonly={role === 'popover'}
+              readonly={role === 'card--popover' ? 'static' : false}
               onSave={handleSave}
               autoSave
-              {...(role === 'card--kanban' && { outerSpacing: 'blockStart-0' })}
+              {...(role === 'card--intrinsic' && { outerSpacing: 'blockStart-0' })}
             />
-          </Card.Container>
+          </Card.SurfaceRoot>
         );
       },
     }),

package/src/components/CardSubjectMenu.tsx

@@ -0,0 +1,67 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Rx } from '@effect-rx/rx-react';
+import React from 'react';
+
+import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
+import { ACTION_TYPE } from '@dxos/app-graph';
+import { Obj } from '@dxos/echo';
+import { SpaceAction } from '@dxos/plugin-space/types';
+import { type Space } from '@dxos/react-client/echo';
+import { IconButton, type IconButtonProps, useTranslation } from '@dxos/react-ui';
+import { type ActionGraphProps, DropdownMenu, MenuProvider, useMenuActions } from '@dxos/react-ui-menu';
+
+const useSubjectMenuGroupItems = (subject: Obj.Any, activeSpace?: Space) => {
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const result: ActionGraphProps = { edges: [], nodes: [] };
+  if (activeSpace && Obj.getDXN(subject).asQueueDXN()) {
+    result.nodes.push({
+      type: ACTION_TYPE,
+      id: `${subject.id}/add-to-space`,
+      // TODO(wittjosiah): Update reference to point to db object when adding?
+      data: () => dispatch(createIntent(SpaceAction.AddObject, { object: subject, target: activeSpace, hidden: true })),
+      properties: {
+        label: ['add object to space label', { ns: 'os' }],
+        icon: 'ph--file-plus--regular',
+      },
+    });
+  }
+  result.nodes.forEach(({ id: target }) => {
+    result.edges.push({ source: 'root', target });
+  });
+  return useMenuActions(Rx.make(result));
+};
+
+/**
+ * This is a generic menu for objects that tries to infer common actions.
+ */
+export const CardSubjectMenu = ({
+  subject,
+  activeSpace,
+  ...props
+}: Omit<IconButtonProps, 'icon' | 'label'> & { subject: Obj.Any; activeSpace?: Space }) => {
+  const { t } = useTranslation('os');
+  const menuProps = useSubjectMenuGroupItems(subject, activeSpace);
+
+  if (!activeSpace) {
+    return null;
+  }
+
+  return (
+    <MenuProvider {...menuProps}>
+      <DropdownMenu.Root>
+        <DropdownMenu.Trigger asChild>
+          <IconButton
+            iconOnly
+            variant='ghost'
+            icon='ph--dots-three-vertical--bold'
+            label={t('more options label')}
+            {...props}
+          />
+        </DropdownMenu.Trigger>
+      </DropdownMenu.Root>
+    </MenuProvider>
+  );
+};

package/src/components/ContactCard.tsx

@@ -4,29 +4,34 @@
 
 import React, { Fragment } from 'react';
 
-import { Icon, Avatar, Button } from '@dxos/react-ui';
+import { Avatar, Button, Icon } from '@dxos/react-ui';
 import { Card, cardHeading, cardText } from '@dxos/react-ui-stack';
 import { mx } from '@dxos/react-ui-theme';
 import { type DataType } from '@dxos/schema';
 
 import { type PreviewProps } from '../types';
 
+import { CardSubjectMenu } from './CardSubjectMenu';
+
 export const ContactCard = ({
   children,
-  subject: { fullName, image, organization, emails },
+  subject,
+  activeSpace,
   onOrgClick,
   role,
 }: PreviewProps<DataType.Person> & { onOrgClick?: (org: DataType.Organization) => void }) => {
+  const { fullName, image, organization, emails } = subject;
   const organizationName = organization && typeof organization === 'object' ? organization.target?.name : organization;
   return (
-    <Card.Container role={role}>
+    <Card.SurfaceRoot role={role}>
       <Avatar.Root>
         <Card.Text role='group' classNames='grid gap-3 grid-cols-[min-content_1fr]'>
           <Avatar.Content imgSrc={image} icon='ph--user--regular' size={16} hue='neutral' />
-          <div role='none' className='bs-min self-center'>
+          <div role='none' className='bs-min self-center flex items-center'>
             <Avatar.Label asChild>
-              <h2 className={cardHeading}>{fullName}</h2>
+              <h2 className={mx(cardHeading, 'grow')}>{fullName}</h2>
             </Avatar.Label>
+            <CardSubjectMenu subject={subject} activeSpace={activeSpace} />
           </div>
         </Card.Text>
       </Avatar.Root>
@@ -46,25 +51,28 @@ export const ContactCard = ({
           )}
         </Card.Chrome>
       )}
-      <dl
-        className={mx(
-          cardText,
-          'grid gap-2 grid-cols-[min-content_1fr] [&_dt]:text-subdued [&_dt]:pbs-0.5 [&_dd]:min-is-0',
-        )}
-      >
-        {emails?.length &&
-          emails.map(({ label, value }) => (
-            <Fragment key={value}>
-              <dt>
-                <Icon icon='ph--at--regular' size={5} />
-              </dt>
-              <dd key={value} className='break-words'>
-                {value}
-              </dd>
-            </Fragment>
-          ))}
-      </dl>
+      {emails?.length && (
+        <dl
+          className={mx(
+            cardText,
+            'grid gap-2 grid-cols-[min-content_1fr] [&_dt]:text-subdued [&_dt]:pbs-0.5 [&_dd]:min-is-0',
+          )}
+        >
+          {emails?.length &&
+            emails.map(({ label, value }) => (
+              <Fragment key={value}>
+                <dt>
+                  <span className='sr-only'>{label}</span>
+                  <Icon icon='ph--at--regular' size={5} />
+                </dt>
+                <dd key={value} className='break-words'>
+                  {value}
+                </dd>
+              </Fragment>
+            ))}
+        </dl>
+      )}
       {children}
-    </Card.Container>
+    </Card.SurfaceRoot>
   );
 };

package/src/components/OrganizationCard.tsx

@@ -5,20 +5,23 @@
 import React from 'react';
 
 import { Icon } from '@dxos/react-ui';
-import { Card } from '@dxos/react-ui-stack';
+import { Card, cardNoSpacing, cardSpacing } from '@dxos/react-ui-stack';
+import { mx } from '@dxos/react-ui-theme';
 import { type DataType } from '@dxos/schema';
 
 import { type PreviewProps } from '../types';
 
-export const OrganizationCard = ({
-  children,
-  subject: { name, image, description, website },
-  role,
-}: PreviewProps<DataType.Organization>) => {
+import { CardSubjectMenu } from './CardSubjectMenu';
+
+export const OrganizationCard = ({ children, subject, role, activeSpace }: PreviewProps<DataType.Organization>) => {
+  const { name, image, description, website } = subject;
   return (
-    <Card.Container role={role}>
+    <Card.SurfaceRoot role={role}>
       <Card.Poster alt={name!} {...(image ? { image } : { icon: 'ph--building-office--regular' })} />
-      <Card.Heading>{name}</Card.Heading>
+      <div role='none' className={mx('flex items-center gap-2', cardSpacing)}>
+        <Card.Heading classNames={cardNoSpacing}>{name}</Card.Heading>
+        <CardSubjectMenu subject={subject} activeSpace={activeSpace} />
+      </div>
       {description && <Card.Text classNames='line-clamp-2'>{description}</Card.Text>}
       {website && (
         <Card.Chrome>
@@ -30,12 +33,12 @@ export const OrganizationCard = ({
             rel='noreferrer'
           >
             <Icon icon='ph--link--regular' size={5} classNames='text-subdued' />
-            <span className='grow'>{website}</span>
+            <span className='min-is-0 flex-1 truncate'>{website}</span>
             <Icon icon='ph--arrow-square-out--regular' />
           </a>
         </Card.Chrome>
       )}
       {children}
-    </Card.Container>
+    </Card.SurfaceRoot>
   );
 };

package/src/components/ProjectCard.tsx

@@ -4,17 +4,25 @@
 
 import React from 'react';
 
-import { Card } from '@dxos/react-ui-stack';
+import { Obj } from '@dxos/echo';
+import { Card, cardNoSpacing, cardSpacing } from '@dxos/react-ui-stack';
+import { mx } from '@dxos/react-ui-theme';
 import { type DataType } from '@dxos/schema';
 
 import { type PreviewProps } from '../types';
 
-export const ProjectCard = ({ subject: { name, image, description }, role }: PreviewProps<DataType.Project>) => {
+import { CardSubjectMenu } from './CardSubjectMenu';
+
+export const ProjectCard = ({ subject, role, activeSpace }: PreviewProps<DataType.Project>) => {
+  const { name, image, description } = subject;
   return (
-    <Card.Container role={role}>
-      {image && <Card.Poster image={image} alt={name} aspect='auto' />}
-      <Card.Heading>{name}</Card.Heading>
+    <Card.SurfaceRoot role={role}>
+      {image && <Card.Poster image={image} alt={Obj.getLabel(subject) ?? ''} aspect='auto' />}
+      <div role='none' className={mx('flex items-center gap-2', cardSpacing)}>
+        <Card.Heading classNames={cardNoSpacing}>{name}</Card.Heading>
+        <CardSubjectMenu subject={subject} activeSpace={activeSpace} />
+      </div>
       {description && <Card.Text classNames='line-clamp-2'>{description}</Card.Text>}
-    </Card.Container>
+    </Card.SurfaceRoot>
   );
 };

package/src/components/TaskCard.tsx

@@ -0,0 +1,46 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { SchemaAST } from 'effect';
+import React from 'react';
+
+import { type PropertyMetaAnnotation, PropertyMetaAnnotationId } from '@dxos/echo-schema';
+import { Card, cardNoSpacing, cardSpacing } from '@dxos/react-ui-stack';
+import { mx } from '@dxos/react-ui-theme';
+import { DataType } from '@dxos/schema';
+
+import { type PreviewProps } from '../types';
+
+import { CardSubjectMenu } from './CardSubjectMenu';
+
+// TODO(thure): Should this move upstream as a helper? Is there an easier way to get options?
+const getActiveStatusOption = (status?: string) => {
+  const properties = SchemaAST.getPropertySignatures(DataType.Task.ast);
+  const statusProperty = properties.find((p) => p.name === 'status');
+  const statusMeta = SchemaAST.getAnnotation<PropertyMetaAnnotation>(PropertyMetaAnnotationId)(
+    // TODO(thure): Typescript asserts `.type` doesn’t have `.types`, but in runtime it does.
+    (statusProperty!.type as any).types[0],
+  );
+  const options = // TODO(thure): Typescript asserts `statusMeta` doesn’t have `.value`, but in runtime it does.
+    (statusMeta as any).value.singleSelect.options as { id: string; title: string; color: string }[];
+  return options.find(({ id }) => id === status);
+};
+
+export const TaskCard = ({ subject, role, activeSpace }: PreviewProps<DataType.Task>) => {
+  const { title, status } = subject;
+  const statusOption = getActiveStatusOption(status);
+  return (
+    <Card.SurfaceRoot role={role}>
+      <div role='none' className={mx('flex items-center gap-2', cardSpacing)}>
+        <Card.Heading classNames={[cardNoSpacing, 'min-is-0 flex-1 truncate']}>{title}</Card.Heading>
+        {statusOption && (
+          <span className='dx-tag' data-hue={statusOption.color}>
+            {statusOption.title}
+          </span>
+        )}
+        <CardSubjectMenu subject={subject} activeSpace={activeSpace} />
+      </div>
+    </Card.SurfaceRoot>
+  );
+};

package/src/index.ts

@@ -3,6 +3,6 @@
 //
 
 export * from './meta';
-export * from './types';
+export type * from './types';
 
 export * from './PreviewPlugin';