@dxos/plugin-pipeline 0.8.4-main.2244d791bb → 0.8.4-main.3fbcb4aa9b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-pipeline",
-  "version": "0.8.4-main.2244d791bb",
+  "version": "0.8.4-main.3fbcb4aa9b",
   "description": "Pipeline plugin for Composer",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,26 +12,70 @@
   "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"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#hooks": {
+      "source": "./src/hooks/index.ts",
+      "types": "./dist/types/src/hooks/index.d.ts",
+      "default": "./dist/lib/neutral/hooks/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "node": "./src/PipelinePlugin.node.ts",
+        "default": "./src/PipelinePlugin.tsx"
+      },
+      "types": "./dist/types/src/PipelinePlugin.d.ts",
+      "node": "./dist/lib/neutral/PipelinePlugin.node.mjs",
+      "default": "./dist/lib/neutral/PipelinePlugin.mjs"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    },
+    "#types": {
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.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"
     },
-    "./types": {
-      "source": "./src/types/index.ts",
-      "types": "./dist/types/src/types/index.d.ts",
-      "browser": "./dist/lib/browser/types/index.mjs"
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.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": {
-    "*": {
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
@@ -39,34 +83,35 @@
   "dependencies": {
     "@radix-ui/react-compose-refs": "1.1.1",
     "@radix-ui/react-context": "1.1.1",
-    "effect": "3.19.16",
-    "@dxos/app-toolkit": "0.8.4-main.2244d791bb",
-    "@dxos/app-framework": "0.8.4-main.2244d791bb",
-    "@dxos/assistant-toolkit": "0.8.4-main.2244d791bb",
-    "@dxos/async": "0.8.4-main.2244d791bb",
-    "@dxos/echo-atom": "0.8.4-main.2244d791bb",
-    "@dxos/echo": "0.8.4-main.2244d791bb",
-    "@dxos/echo-query": "0.8.4-main.2244d791bb",
-    "@dxos/devtools": "0.8.4-main.2244d791bb",
-    "@dxos/log": "0.8.4-main.2244d791bb",
-    "@dxos/operation": "0.8.4-main.2244d791bb",
-    "@dxos/plugin-client": "0.8.4-main.2244d791bb",
-    "@dxos/plugin-deck": "0.8.4-main.2244d791bb",
-    "@dxos/plugin-graph": "0.8.4-main.2244d791bb",
-    "@dxos/plugin-inbox": "0.8.4-main.2244d791bb",
-    "@dxos/plugin-markdown": "0.8.4-main.2244d791bb",
-    "@dxos/functions": "0.8.4-main.2244d791bb",
-    "@dxos/react-ui-attention": "0.8.4-main.2244d791bb",
-    "@dxos/react-client": "0.8.4-main.2244d791bb",
-    "@dxos/react-ui-components": "0.8.4-main.2244d791bb",
-    "@dxos/plugin-space": "0.8.4-main.2244d791bb",
-    "@dxos/react-ui-form": "0.8.4-main.2244d791bb",
-    "@dxos/react-ui-list": "0.8.4-main.2244d791bb",
-    "@dxos/react-ui-stack": "0.8.4-main.2244d791bb",
-    "@dxos/react-ui-mosaic": "0.8.4-main.2244d791bb",
-    "@dxos/schema": "0.8.4-main.2244d791bb",
-    "@dxos/types": "0.8.4-main.2244d791bb",
-    "@dxos/util": "0.8.4-main.2244d791bb"
+    "@radix-ui/react-slot": "1.1.2",
+    "effect": "3.20.0",
+    "@dxos/app-framework": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/assistant-toolkit": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/async": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/app-toolkit": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/compute": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/devtools": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/echo-query": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/echo-atom": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/log": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/echo": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-client": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-graph": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-deck": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-inbox": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-markdown": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-space": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-attention": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-components": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-client": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-mosaic": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-list": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/types": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-stack": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-form": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/schema": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui-menu": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/util": "0.8.4-main.3fbcb4aa9b"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -74,24 +119,25 @@
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/plugin-attention": "0.8.4-main.2244d791bb",
-    "@dxos/plugin-preview": "0.8.4-main.2244d791bb",
-    "@dxos/plugin-inbox": "0.8.4-main.2244d791bb",
-    "@dxos/plugin-testing": "0.8.4-main.2244d791bb",
-    "@dxos/plugin-theme": "0.8.4-main.2244d791bb",
-    "@dxos/storybook-utils": "0.8.4-main.2244d791bb",
-    "@dxos/random": "0.8.4-main.2244d791bb",
-    "@dxos/react-ui": "0.8.4-main.2244d791bb",
-    "@dxos/ui-theme": "0.8.4-main.2244d791bb"
+    "vite": "^8.0.10",
+    "@dxos/echo-db": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-inbox": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-preview": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/storybook-utils": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-attention": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-testing": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/plugin-theme": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/random": "0.8.4-main.3fbcb4aa9b"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.2244d791bb",
-    "@dxos/ui-theme": "0.8.4-main.2244d791bb"
+    "@dxos/ui-theme": "0.8.4-main.3fbcb4aa9b",
+    "@dxos/react-ui": "0.8.4-main.3fbcb4aa9b"
   },
   "publishConfig": {
     "access": "public"

package/src/PipelinePlugin.node.ts

@@ -0,0 +1,19 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Pipeline } from '@dxos/types';
+
+import { AppGraphBuilder, CreateObject } from '#capabilities';
+import { meta } from '#meta';
+
+export const PipelinePlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
+  AppPlugin.addSchemaModule({ schema: [Pipeline.Pipeline] }),
+  Plugin.make,
+);
+
+export default PipelinePlugin;

package/src/PipelinePlugin.test.ts

@@ -0,0 +1,27 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { PipelinePlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('PipelinePlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({}), PipelinePlugin()],
+    });
+
+    // After autoStart: AppGraphBuilder, CreateObject, schema all auto-cascade.
+    expect(harness.manager.getActive()).toEqual(
+      expect.arrayContaining([moduleId('AppGraphBuilder'), moduleId('CreateObject'), moduleId('schema')]),
+    );
+  });
+});

package/src/PipelinePlugin.tsx

@@ -2,45 +2,21 @@
 // Copyright 2023 DXOS.org
 //
 
-import * as Effect from 'effect/Effect';
-
-import { Capability, Plugin } from '@dxos/app-framework';
+import { Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/operation';
-import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
-import { type CreateObject } from '@dxos/plugin-space/types';
 import { Pipeline } from '@dxos/types';
 
-import { AppGraphBuilder, OperationResolver, ReactSurface } from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
-import { PipelineOperation } from './types';
+import { AppGraphBuilder, CreateObject, ReactSurface } from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
 
 export const PipelinePlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  AppPlugin.addMetadataModule({
-    metadata: {
-      id: Pipeline.Pipeline.typename,
-      metadata: {
-        icon: 'ph--path--regular',
-        iconHue: 'purple',
-        createObject: ((props) => Effect.sync(() => Pipeline.make(props))) satisfies CreateObject,
-      },
-    },
-  }),
-  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
   AppPlugin.addSchemaModule({ schema: [Pipeline.Pipeline] }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),
-  Plugin.addModule({
-    id: 'on-space-created',
-    activatesOn: SpaceEvents.SpaceCreated,
-    activate: () =>
-      Effect.succeed(
-        Capability.contributes(SpaceCapabilities.OnCreateSpace, (params) =>
-          Operation.invoke(PipelineOperation.OnCreateSpace, params),
-        ),
-      ),
-  }),
   Plugin.make,
 );
+
+export default PipelinePlugin;

package/src/capabilities/app-graph-builder.ts

@@ -0,0 +1,40 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities, AppNode } from '@dxos/app-toolkit';
+import { GraphBuilder } from '@dxos/plugin-graph';
+import { Pipeline } from '@dxos/types';
+
+import { meta } from '#meta';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const extensions = yield* Effect.all([
+      GraphBuilder.createTypeExtension({
+        id: 'triggers',
+        type: Pipeline.Pipeline,
+        connector: () =>
+          Effect.succeed([
+            AppNode.makeCompanion({
+              id: 'invocations',
+              label: ['pipeline-invocations.label', { ns: meta.id }],
+              icon: 'ph--clock-countdown--regular',
+              data: 'invocations',
+            }),
+            AppNode.makeCompanion({
+              id: 'automation',
+              label: ['pipeline-automation.label', { ns: meta.id }],
+              icon: 'ph--lightning--regular',
+              data: 'automation',
+            }),
+          ]),
+      }),
+    ]);
+
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
+  }),
+);

package/src/capabilities/create-object.ts

@@ -0,0 +1,29 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
+import { SpaceOperation } from '@dxos/plugin-space';
+import { SpaceCapabilities } from '@dxos/plugin-space';
+import { Pipeline } from '@dxos/types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+      id: Pipeline.Pipeline.typename,
+      createObject: (props, options) =>
+        Effect.gen(function* () {
+          const object = Pipeline.make(props);
+          return yield* Operation.invoke(SpaceOperation.AddObject, {
+            object,
+            target: options.target,
+            hidden: true,
+            targetNodeId: options.targetNodeId,
+          });
+        }),
+    });
+  }),
+);

package/src/capabilities/index.ts

@@ -2,6 +2,8 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './app-graph-builder';
-export * from './operation-resolver';
-export * from './react-surface';
+import { Capability } from '@dxos/app-framework';
+
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
+export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/react-surface.tsx

@@ -0,0 +1,53 @@
+//
+// 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 { InvocationTraceContainer } from '@dxos/devtools';
+import { Obj } from '@dxos/echo';
+import { Panel } from '@dxos/react-ui';
+import { Pipeline } from '@dxos/types';
+
+import { PipelineContainer, PipelineProperties } from '#containers';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: 'root',
+        filter: AppSurface.object(AppSurface.Article, Pipeline.Pipeline),
+        component: ({ data, role }) => (
+          <PipelineContainer role={role} subject={data.subject} attendableId={data.attendableId} />
+        ),
+      }),
+      Surface.create({
+        id: 'companion.invocations',
+        filter: AppSurface.allOf(
+          AppSurface.literal(AppSurface.Article, 'invocations'),
+          AppSurface.companion(AppSurface.Article, Pipeline.Pipeline),
+        ),
+        component: ({ data, role }) => {
+          const db = Obj.getDatabase(data.companionTo);
+          // TODO(wittjosiah): Filter the invocations to those relevant to the project.
+          return (
+            <Panel.Root role={role} className='dx-document'>
+              <Panel.Content asChild>
+                <InvocationTraceContainer db={db} detailAxis='block' />
+              </Panel.Content>
+            </Panel.Root>
+          );
+        },
+      }),
+      Surface.create({
+        id: 'object-properties',
+        filter: AppSurface.object(AppSurface.ObjectProperties, Pipeline.Pipeline),
+        component: ({ data }) => <PipelineProperties pipeline={data.subject} />,
+      }),
+    ]),
+  ),
+);

package/src/components/{PipelineColumn.tsx → PipelineComponent/PipelineColumn.tsx}

@@ -2,21 +2,23 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useAtomValue } from '@effect-atom/atom-react';
 import { useComposedRefs } from '@radix-ui/react-compose-refs';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
 import type * as Schema from 'effect/Schema';
 import React, { forwardRef, useMemo, useRef, useState } from 'react';
 
-import { Obj, Query, Type } from '@dxos/echo';
-import { resolveSchemaWithRegistry } from '@dxos/plugin-space';
+import { resolveSchemaWithRegistry } from '@dxos/app-toolkit/query';
+import { Annotation, JsonSchema, Obj, Query, Type } from '@dxos/echo';
 import { Filter, getSpace, useObject } from '@dxos/react-client/echo';
-import { useAsyncEffect, useTranslation } from '@dxos/react-ui';
-import { Board, Card, Focus, Mosaic, type MosaicTileProps, useBoard } from '@dxos/react-ui-mosaic';
+import { Panel, Toolbar, useAsyncEffect, useTranslation } from '@dxos/react-ui';
+import { Card } from '@dxos/react-ui';
+import { Menu } from '@dxos/react-ui-menu';
+import { Board, Focus, Mosaic, type MosaicTileProps } from '@dxos/react-ui-mosaic';
 import { ProjectionModel, createEchoChangeCallback } from '@dxos/schema';
 import { type Pipeline } from '@dxos/types';
-import { mx } from '@dxos/ui-theme';
 
-import { meta } from '../meta';
+import { meta } from '#meta';
 
 import { type ItemProps, usePipeline } from './PipelineComponent';
 
@@ -31,8 +33,7 @@ export type PipelineColumnProps = Pick<MosaicTileProps<Pipeline.Column>, 'classN
 // TODO(wittjosiah): Support item DnD reordering (ordering needs to be stored on the view presentation collection).
 export const PipelineColumn = ({ data: column, location, classNames, debug }: PipelineColumnProps) => {
   const { t } = useTranslation(meta.id);
-  const { model } = useBoard<Pipeline.Column, Obj.Unknown>(PIPELINE_COLUMN_NAME);
-  const items = useAtomValue(model.items(column));
+  const [dragHandle, setDragHandle] = useState<HTMLButtonElement | null>(null);
   // Subscribe to the view target for reactivity.
   const [viewSnapshot] = useObject(column.view);
   const view = column.view.target;
@@ -64,44 +65,42 @@ export const PipelineColumn = ({ data: column, location, classNames, debug }: Pi
     }
 
     // For mutable schemas (EchoSchema), use the live jsonSchema reference for reactivity.
-    const jsonSchema = Type.isMutable(schema) ? schema.jsonSchema : Type.toJsonSchema(schema);
+    const jsonSchema = Type.isMutable(schema) ? schema.jsonSchema : JsonSchema.toJsonSchema(schema);
     const change = createEchoChangeCallback(view, Type.isMutable(schema) ? schema : undefined);
     return new ProjectionModel({ view, baseSchema: jsonSchema, change });
   }, [schema, view]);
 
-  const Tile = useMemo(() => {
+  const PipelineTile = useMemo(() => {
     return forwardRef<HTMLDivElement, Pick<MosaicTileProps<Obj.Unknown>, 'classNames' | 'location' | 'data' | 'debug'>>(
-      (props, ref) => <ItemTile {...props} ref={ref} itemProps={{ item: props.data, projectionModel }} />,
+      (props, ref) => <ItemTile {...props} itemProps={{ item: props.data, projectionModel }} ref={ref} />,
     );
-  }, [Item, projectionModel]);
+  }, [projectionModel]);
 
   if (!view) {
     return null;
   }
 
-  const dragHandleRef = useRef<HTMLButtonElement>(null);
-
   return (
-    <Board.Column.Root
-      data={column}
-      location={location}
-      classNames={classNames}
-      debug={debug}
-      dragHandleRef={dragHandleRef}
-    >
-      <div
-        role='none'
-        data-testid='board-column'
-        className={mx('group/column grid bs-full overflow-hidden grid-rows-[var(--rail-action)_1fr]', classNames)}
+    <Panel.Root asChild>
+      <Board.Column.Root
+        debug={debug}
+        data={column}
+        location={location}
+        classNames={classNames}
+        dragHandle={dragHandle}
       >
-        <Board.Column.Header
-          classNames='border-be border-separator'
-          label={column.name ?? t('untitled view title')}
-          dragHandleRef={dragHandleRef}
-        />
-        <Board.Column.Body data={column} Tile={Tile} />
-      </div>
-    </Board.Column.Root>
+        <Panel.Toolbar asChild>
+          <Board.Column.Header
+            classNames='_opacity-10'
+            label={column.name || t('untitled-view.title')}
+            dragHandleRef={setDragHandle}
+          />
+        </Panel.Toolbar>
+        <Panel.Content asChild>
+          <Board.Column.Body data={column} Tile={PipelineTile} />
+        </Panel.Content>
+      </Board.Column.Root>
+    </Panel.Root>
   );
 };
 
@@ -122,22 +121,42 @@ const ItemTile = forwardRef<HTMLDivElement, ItemTileProps>(
     const rootRef = useRef<HTMLDivElement>(null);
     const composedRef = useComposedRefs<HTMLDivElement>(rootRef, forwardedRef);
     const { Item } = usePipeline(ITEM_TILE_NAME);
+    const icon = Function.pipe(
+      Obj.getSchema(data),
+      Option.fromNullable,
+      Option.flatMap(Annotation.IconAnnotation.get),
+      Option.map(({ icon }) => icon),
+      Option.getOrElse(() => 'ph--placeholder--regular'),
+    );
 
     return (
-      <Mosaic.Tile asChild id={data.id} data={data} location={location} debug={debug}>
-        <Focus.Group asChild>
-          <Card.Root classNames={classNames} ref={composedRef}>
-            <Card.Toolbar>
-              <Card.DragHandle />
-              <Card.Title>{Obj.getLabel(data)}</Card.Title>
-              <Card.Menu />
-            </Card.Toolbar>
-            <Card.Content>
-              <Item {...itemProps} />
-            </Card.Content>
-          </Card.Root>
-        </Focus.Group>
-      </Mosaic.Tile>
+      <Menu.Root>
+        <Mosaic.Tile asChild id={data.id} data={data} location={location} debug={debug}>
+          <Focus.Item asChild>
+            <Card.Root classNames={classNames} ref={composedRef}>
+              <Card.Toolbar>
+                <Card.Icon icon={icon} />
+                <Card.Title>{Obj.getLabel(data)}</Card.Title>
+                {/* TODO(wittjosiah): Reconcile with Card.Menu. */}
+                <Card.IconBlock padding>
+                  <Menu.Trigger asChild>
+                    <Toolbar.IconButton
+                      iconOnly
+                      variant='ghost'
+                      icon='ph--dots-three-vertical--regular'
+                      label='Actions'
+                    />
+                  </Menu.Trigger>
+                  <Menu.Content />
+                </Card.IconBlock>
+              </Card.Toolbar>
+              <Card.Content>
+                <Item {...itemProps} />
+              </Card.Content>
+            </Card.Root>
+          </Focus.Item>
+        </Mosaic.Tile>
+      </Menu.Root>
     );
   },
 );