@dxos/plugin-preview 0.8.4-main.d05673bc65 → 0.8.4-main.dfabb4ec29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-preview",
-  "version": "0.8.4-main.d05673bc65",
+  "version": "0.8.4-main.dfabb4ec29",
   "description": "Preview plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,64 +12,102 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "node": "./src/PreviewPlugin.node.ts",
+        "default": "./src/PreviewPlugin.tsx"
+      },
+      "types": "./dist/types/src/PreviewPlugin.d.ts",
+      "node": "./dist/lib/neutral/PreviewPlugin.node.mjs",
+      "default": "./dist/lib/neutral/PreviewPlugin.mjs"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    }
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs"
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
+    },
+    "./testing": {
+      "source": "./src/testing.ts",
+      "types": "./dist/types/src/testing.d.ts",
+      "default": "./dist/lib/neutral/testing.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "@dxos/app-toolkit": "0.8.4-main.d05673bc65",
-    "@dxos/app-framework": "0.8.4-main.d05673bc65",
-    "@dxos/app-graph": "0.8.4-main.d05673bc65",
-    "@dxos/client": "0.8.4-main.d05673bc65",
-    "@dxos/echo": "0.8.4-main.d05673bc65",
-    "@dxos/keys": "0.8.4-main.d05673bc65",
-    "@dxos/async": "0.8.4-main.d05673bc65",
-    "@dxos/effect": "0.8.4-main.d05673bc65",
-    "@dxos/lit-ui": "0.8.4-main.d05673bc65",
-    "@dxos/log": "0.8.4-main.d05673bc65",
-    "@dxos/operation": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-attention": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-client": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-deck": "0.8.4-main.d05673bc65",
-    "@dxos/react-client": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-editor": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-form": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-mosaic": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-menu": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-table": "0.8.4-main.d05673bc65",
-    "@dxos/schema": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-space": "0.8.4-main.d05673bc65",
-    "@dxos/types": "0.8.4-main.d05673bc65",
-    "@dxos/ui-theme": "0.8.4-main.d05673bc65",
-    "@dxos/util": "0.8.4-main.d05673bc65",
-    "@dxos/ui-editor": "0.8.4-main.d05673bc65"
+    "@dxos/app-framework": "0.8.4-main.dfabb4ec29",
+    "@dxos/app-toolkit": "0.8.4-main.dfabb4ec29",
+    "@dxos/async": "0.8.4-main.dfabb4ec29",
+    "@dxos/client": "0.8.4-main.dfabb4ec29",
+    "@dxos/app-graph": "0.8.4-main.dfabb4ec29",
+    "@dxos/keys": "0.8.4-main.dfabb4ec29",
+    "@dxos/effect": "0.8.4-main.dfabb4ec29",
+    "@dxos/lit-ui": "0.8.4-main.dfabb4ec29",
+    "@dxos/echo": "0.8.4-main.dfabb4ec29",
+    "@dxos/log": "0.8.4-main.dfabb4ec29",
+    "@dxos/operation": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-attention": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-deck": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-client": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-client": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-form": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-editor": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-menu": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.dfabb4ec29",
+    "@dxos/schema": "0.8.4-main.dfabb4ec29",
+    "@dxos/types": "0.8.4-main.dfabb4ec29",
+    "@dxos/ui-theme": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-table": "0.8.4-main.dfabb4ec29",
+    "@dxos/util": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-mosaic": "0.8.4-main.dfabb4ec29",
+    "@dxos/ui-editor": "0.8.4-main.dfabb4ec29"
   },
   "devDependencies": {
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/echo-db": "0.8.4-main.d05673bc65",
-    "@dxos/plugin-testing": "0.8.4-main.d05673bc65",
-    "@dxos/random": "0.8.4-main.d05673bc65",
-    "@dxos/react-ui-components": "0.8.4-main.d05673bc65",
-    "@dxos/storybook-utils": "0.8.4-main.d05673bc65"
+    "vite": "^8.0.10",
+    "@dxos/echo-db": "0.8.4-main.dfabb4ec29",
+    "@dxos/plugin-testing": "0.8.4-main.dfabb4ec29",
+    "@dxos/random": "0.8.4-main.dfabb4ec29",
+    "@dxos/react-ui-components": "0.8.4-main.dfabb4ec29",
+    "@dxos/storybook-utils": "0.8.4-main.dfabb4ec29"
   },
   "peerDependencies": {
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3"
   },

package/src/PreviewPlugin.node.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Organization, Person } from '@dxos/types';
+
+import { meta } from '#meta';
+
+export const PreviewPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addSchemaModule({ schema: [Person.Person, Organization.Organization] }),
+  Plugin.make,
+);
+
+export default PreviewPlugin;

package/src/PreviewPlugin.test.ts

@@ -0,0 +1,25 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { PreviewPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('PreviewPlugin', () => {
+  test('modules activate on the expected events', { timeout: 10_000 }, async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({}), PreviewPlugin()],
+    });
+
+    // After autoStart: schema auto-cascades from ClientPlugin.
+    expect(harness.manager.getActive()).toContain(moduleId('schema'));
+  });
+});

package/src/PreviewPlugin.tsx

@@ -6,12 +6,12 @@ import { ActivationEvents, Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
 import { Organization, Person } from '@dxos/types';
 
-import { PreviewPopover, ReactSurface } from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
+import { PreviewPopover, ReactSurface } from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
 
 export const PreviewPlugin = Plugin.define(meta).pipe(
-  AppPlugin.addSchemaModule({ schema: [Person.Person, Organization.Organization], id: 'schema' }),
+  AppPlugin.addSchemaModule({ schema: [Person.Person, Organization.Organization] }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule({
@@ -21,3 +21,5 @@ export const PreviewPlugin = Plugin.define(meta).pipe(
   }),
   Plugin.make,
 );
+
+export default PreviewPlugin;

package/src/capabilities/index.ts

@@ -2,5 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './preview-popover';
-export * from './react-surface';
+import { Capability } from '@dxos/app-framework';
+
+export const PreviewPopover = Capability.lazy('PreviewPopover', () => import('./preview-popover'));
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/{preview-popover/preview-popover.ts → preview-popover.ts}

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { AppCapabilities, LayoutOperation, getSpaceIdFromPath } from '@dxos/app-toolkit';
+import { AppCapabilities, LayoutOperation, getPersonalSpace, getSpaceIdFromPath } from '@dxos/app-toolkit';
 import { addEventListener } from '@dxos/async';
 import { type Client } from '@dxos/client';
 import { type Space } from '@dxos/client/echo';
@@ -49,10 +49,16 @@ export default Capability.makeModule(
       const { invokePromise } = capabilities.get(Capabilities.OperationInvoker);
       const client = capabilities.get(ClientCapabilities.Client);
       const registry = capabilities.get(Capabilities.AtomRegistry);
+      // Layout is optional: in standalone harnesses (Storybook, tests) no plugin contributes
+      // `AppCapabilities.Layout`, and `getAll` returns an empty array. Reading `registry.get(undefined)`
+      // would crash inside Atom's identity check (`'~atom/Serializable' in undefined`). When layout
+      // isn't available, fall through to the personal-space default.
       const [layoutAtom] = capabilities.getAll(AppCapabilities.Layout);
-      const layout = registry.get(layoutAtom);
-      const spaceId = getSpaceIdFromPath(layout.workspace);
-      const space = (spaceId && client.spaces.get(spaceId)) ?? client.spaces.default;
+      const spaceId = layoutAtom && getSpaceIdFromPath(registry.get(layoutAtom).workspace);
+      const space = (spaceId && client.spaces.get(spaceId)) ?? getPersonalSpace(client);
+      if (!space) {
+        return;
+      }
       const result = await handlePreviewLookup(client, space, { dxn, label });
       if (!result) {
         return;

package/src/capabilities/react-surface.tsx

@@ -0,0 +1,118 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { Obj } from '@dxos/echo';
+import { Card } from '@dxos/react-ui';
+import { Expando, type ProjectionModel } from '@dxos/schema';
+import { Organization, Person, Pipeline, Task } from '@dxos/types';
+
+import { ExpandoCard, FormCard, JsonCard, OrganizationCard, PersonCard, ProjectCard, TaskCard } from '../cards';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      //
+      // Specific schema types.
+      // TODO(burdon): Create helpers and factor out.
+      //
+
+      Surface.create<{ subject: Person.Person }>({
+        id: 'schema-popover--contact',
+        position: 'hoist',
+        filter: AppSurface.object(AppSurface.Card, Person.Person),
+        component: ({ data, role }) => {
+          return (
+            <>
+              <PersonCard role={role} subject={data.subject} />
+              <Surface.Surface type={AppSurface.Related} data={data} limit={1} />
+            </>
+          );
+        },
+      }),
+      Surface.create({
+        id: 'schema-popover--organization',
+        position: 'hoist',
+        filter: AppSurface.object(AppSurface.Card, Organization.Organization),
+        component: ({ data, role }) => {
+          return (
+            <>
+              <OrganizationCard role={role} subject={data.subject} />
+              <Surface.Surface type={AppSurface.Related} data={data} limit={1} />
+            </>
+          );
+        },
+      }),
+      Surface.create({
+        id: 'schema-popover--project',
+        position: 'hoist',
+        filter: AppSurface.object(AppSurface.Card, Pipeline.Pipeline),
+        component: ({ data, role }) => {
+          return <ProjectCard role={role} subject={data.subject} />;
+        },
+      }),
+      Surface.create({
+        id: 'schema-popover--task',
+        position: 'hoist',
+        filter: AppSurface.object(AppSurface.Card, Task.Task),
+        component: ({ data, role }) => {
+          return <TaskCard role={role} subject={data.subject} />;
+        },
+      }),
+      Surface.create<AppSurface.ObjectCardData<Expando.Expando>>({
+        id: 'schema-popover--expando',
+        filter: AppSurface.object(AppSurface.Card, Expando.Expando),
+        component: ({ data, role }) => {
+          return <ExpandoCard role={role} subject={data.subject} ignorePaths={data.ignorePaths} />;
+        },
+      }),
+
+      //
+      // Fallback for any object.
+      //
+
+      Surface.create({
+        id: 'fallback-popover',
+        role: 'card--content',
+        position: 'fallback',
+        filter: (data): data is { subject: Obj.Unknown; projection?: ProjectionModel } => Obj.isObject(data.subject),
+        component: ({ data, role }) => {
+          return <FormCard role={role} subject={data.subject} projection={data.projection} />;
+        },
+      }),
+
+      Surface.create({
+        id: 'fallback-json',
+        role: 'card--content',
+        position: 'fallback',
+        filter: (data): data is Record<string, unknown> => true,
+        component: ({ data }) => {
+          return <JsonCard data={data} />;
+        },
+      }),
+
+      Surface.create({
+        id: 'section',
+        position: 'fallback',
+        filter: AppSurface.subject(AppSurface.Section, Obj.isObject),
+        component: ({ data }) => {
+          return (
+            <div className='flex w-full justify-center'>
+              <div className='py-2 dx-card-min-width dx-card-max-width'>
+                <Card.Root>
+                  <Surface.Surface type={AppSurface.Card} data={data} limit={1} />
+                </Card.Root>
+              </div>
+            </div>
+          );
+        },
+      }),
+    ]),
+  ),
+);

package/src/cards/ExpandoCard.tsx

@@ -0,0 +1,76 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+import React, { useCallback, useMemo } from 'react';
+
+import { type AppSurface } from '@dxos/app-toolkit/ui';
+import { Obj } from '@dxos/echo';
+import { type JsonPath, splitJsonPath } from '@dxos/effect';
+import { Card } from '@dxos/react-ui';
+import { Form } from '@dxos/react-ui-form';
+
+const schemaForValue = (value: unknown): Schema.Schema.AnyNoContext | undefined => {
+  switch (typeof value) {
+    case 'string':
+      return Schema.String;
+    case 'number':
+      return Schema.Number;
+    case 'boolean':
+      return Schema.Boolean;
+    default:
+      return undefined;
+  }
+};
+
+/**
+ * Reserved keys: `id`, plus any `~`-prefixed key (ECHO uses `~`-prefixed
+ * string keys to brand entity instances and schemas — KindId,
+ * SchemaKindId, SnapshotKindId, etc. — and the `~` namespace is reserved
+ * for that purpose). They show up in `Object.keys` but aren't user data.
+ */
+const isInternalKey = (key: string) => key === 'id' || key.startsWith('~');
+
+export const ExpandoCard = ({ subject, ignorePaths }: AppSurface.ObjectCardProps) => {
+  const schema = useMemo(() => {
+    const ignored = new Set(ignorePaths ?? []);
+    const fields: Record<string, Schema.Schema.AnyNoContext> = {};
+    for (const key of Object.keys(subject)) {
+      if (isInternalKey(key) || ignored.has(key)) {
+        continue;
+      }
+      const fieldSchema = schemaForValue((subject as any)[key]);
+      if (fieldSchema) {
+        fields[key] = fieldSchema;
+      }
+    }
+    return Schema.Struct(fields);
+  }, [subject, ignorePaths]);
+
+  const handleSave = useCallback(
+    (values: any, { changed }: { changed: Record<string, boolean> }) => {
+      const paths = Object.keys(changed).filter((path) => changed[path]);
+      Obj.update(subject, () => {
+        for (const path of paths) {
+          const value = values[path];
+          const parts = splitJsonPath(path as JsonPath);
+          Obj.setValue(subject, parts, value);
+        }
+      });
+    },
+    [subject],
+  );
+
+  return (
+    <Card.Content>
+      <Form.Root schema={schema} values={subject} autoSave onSave={handleSave}>
+        <Form.Viewport>
+          <Form.Content>
+            <Form.FieldSet />
+          </Form.Content>
+        </Form.Viewport>
+      </Form.Root>
+    </Card.Content>
+  );
+};

package/src/cards/FormCard.tsx

@@ -4,7 +4,7 @@
 
 import React, { useCallback, useMemo } from 'react';
 
-import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { Obj } from '@dxos/echo';
 import { type JsonPath, splitJsonPath } from '@dxos/effect';
 import { Card, useTranslation } from '@dxos/react-ui';
@@ -12,16 +12,16 @@ import { Form, omitId } from '@dxos/react-ui-form';
 import { type ProjectionModel } from '@dxos/schema';
 import { descriptionMessage, mx } from '@dxos/ui-theme';
 
-import { meta } from '../meta';
+import { meta } from '#meta';
 
-export const FormCard = ({ subject, projection }: SurfaceComponentProps & { projection?: ProjectionModel }) => {
+export const FormCard = ({ subject, projection }: AppSurface.ObjectCardProps & { projection?: ProjectionModel }) => {
   const { t } = useTranslation(meta.id);
   const echoSchema = Obj.getSchema(subject);
   const schema = useMemo(() => echoSchema && omitId(echoSchema), [echoSchema]);
 
   const handleSave = useCallback((values: any, { changed }: { changed: Record<string, boolean> }) => {
     const paths = Object.keys(changed).filter((path) => changed[path]);
-    Obj.change(subject, () => {
+    Obj.update(subject, () => {
       for (const path of paths) {
         const value = values[path];
         const parts = splitJsonPath(path as JsonPath);
@@ -31,7 +31,7 @@ export const FormCard = ({ subject, projection }: SurfaceComponentProps & { proj
   }, []);
 
   if (!schema) {
-    return <p className={mx(descriptionMessage)}>{t('unable to create preview message')}</p>;
+    return <p className={mx(descriptionMessage)}>{t('unable-to-create-preview.message')}</p>;
   }
 
   return (

package/src/cards/JsonCard.tsx

@@ -0,0 +1,19 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React from 'react';
+
+import { Card } from '@dxos/react-ui';
+import { JsonHighlighter } from '@dxos/react-ui-syntax-highlighter';
+
+export const JsonCard = ({ data }: { data: unknown }) => {
+  return (
+    <Card.Content>
+      <span />
+      {/* TODO(wittjosiah): Span whole row. */}
+      <JsonHighlighter data={data} />
+      <span />
+    </Card.Content>
+  );
+};

package/src/cards/OrganizationCard.tsx

@@ -4,12 +4,12 @@
 
 import React from 'react';
 
-import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { Card } from '@dxos/react-ui';
 import { type Organization } from '@dxos/types';
 
-export const OrganizationCard = ({ subject }: SurfaceComponentProps<Organization.Organization>) => {
-  const { image, description, website } = subject;
+export const OrganizationCard = ({ subject }: AppSurface.ObjectCardProps<Organization.Organization>) => {
+  const { name, image, description, website } = subject;
 
   return (
     <Card.Content>

package/src/cards/PersonCard.tsx

@@ -2,16 +2,38 @@
 // Copyright 2025 DXOS.org
 //
 
-import React from 'react';
+import * as Effect from 'effect/Effect';
+import React, { useCallback } from 'react';
 
-import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation, getObjectPathFromObject, getSpacePath } from '@dxos/app-toolkit';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
+import { Obj } from '@dxos/echo';
+import { runAndForwardErrors } from '@dxos/effect';
 import { Avatar } from '@dxos/react-ui';
 import { Card } from '@dxos/react-ui';
 import { type Person } from '@dxos/types';
 
-export const PersonCard = ({ subject }: SurfaceComponentProps<Person.Person>) => {
+export const PersonCard = ({ subject }: AppSurface.ObjectCardProps<Person.Person>) => {
+  const { invoke } = useOperationInvoker();
   const { image, organization: { target: organization } = {}, emails = [] } = subject;
 
+  const handleOrganizationClick = useCallback(() => {
+    if (!organization) {
+      return;
+    }
+
+    return Effect.gen(function* () {
+      const organizationPath = getObjectPathFromObject(organization);
+      const db = Obj.getDatabase(organization);
+      yield* invoke(LayoutOperation.UpdatePopover, { state: false, anchorId: '' });
+      yield* invoke(LayoutOperation.Open, {
+        subject: [organizationPath],
+        workspace: db ? getSpacePath(db.spaceId) : undefined,
+      });
+    }).pipe(runAndForwardErrors);
+  }, [invoke, organization]);
+
   return (
     <Card.Content>
       <Avatar.Root>
@@ -20,7 +42,7 @@ export const PersonCard = ({ subject }: SurfaceComponentProps<Person.Person>) =>
             <Avatar.Content
               imgSrc={image}
               icon='ph--user--regular'
-              size={16}
+              size={20}
               classNames={!image && 'opacity-50'}
               hue='neutral'
               variant='square'
@@ -28,11 +50,7 @@ export const PersonCard = ({ subject }: SurfaceComponentProps<Person.Person>) =>
           </Card.Row>
         )}
         {organization?.name && (
-          <Card.Action
-            icon='ph--buildings--regular'
-            label={organization.name}
-            // onClick={onSelect ? () => onSelect(organization) : undefined}
-          />
+          <Card.Action icon='ph--buildings--regular' label={organization.name} onClick={handleOrganizationClick} />
         )}
         {emails.map(({ value }) => (
           <Card.Row key={value} icon='ph--at--regular'>

package/src/cards/ProjectCard.tsx

@@ -4,12 +4,12 @@
 
 import React from 'react';
 
-import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { Obj } from '@dxos/echo';
 import { Card } from '@dxos/react-ui';
 import { type Pipeline } from '@dxos/types';
 
-export const ProjectCard = ({ subject }: SurfaceComponentProps<Pipeline.Pipeline>) => {
+export const ProjectCard = ({ subject }: AppSurface.ObjectCardProps<Pipeline.Pipeline>) => {
   const { image, description } = subject;
 
   return (

package/src/cards/TaskCard.tsx

@@ -5,23 +5,26 @@
 import * as SchemaAST from 'effect/SchemaAST';
 import React from 'react';
 
-import { type SurfaceComponentProps } from '@dxos/app-toolkit/ui';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { type PropertyMetaAnnotation, PropertyMetaAnnotationId } from '@dxos/echo/internal';
 import { Card } from '@dxos/react-ui';
 import { Task } from '@dxos/types';
 
-export const TaskCard = ({ subject }: SurfaceComponentProps<Task.Task>) => {
+export const TaskCard = ({ subject }: AppSurface.ObjectCardProps<Task.Task>) => {
   const { title, status } = subject;
   const statusOption = getActiveStatusOption(status);
 
   return (
     <Card.Content>
-      <Card.Heading classNames='min-w-0 flex-1 truncate'>{title}</Card.Heading>
-      {statusOption && (
-        <span className='dx-tag' data-hue={statusOption.color}>
-          {statusOption.title}
-        </span>
-      )}
+      <Card.Row>
+        {statusOption && (
+          <div>
+            <span className='dx-tag' data-hue={statusOption.color}>
+              {statusOption.title}
+            </span>
+          </div>
+        )}
+      </Card.Row>
     </Card.Content>
   );
 };
@@ -30,11 +33,12 @@ export const TaskCard = ({ subject }: SurfaceComponentProps<Task.Task>) => {
 const getActiveStatusOption = (status?: string) => {
   const properties = SchemaAST.getPropertySignatures(Task.Task.ast);
   const statusProperty = properties.find((p) => p.name === 'status');
+  // TODO(thure): Typescript asserts `.type` doesn’t have `.types`, but in runtime it does.
   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 }[];
+
+  // TODO(thure): Typescript asserts `statusMeta` doesn’t have `.value`, but in runtime it does.
+  const options = (statusMeta as any).value.singleSelect.options as { id: string; title: string; color: string }[];
   return options.find(({ id }) => id === status);
 };