@dxos/plugin-pipeline 0.8.4-main.c351d160a8 → 0.8.4-main.fcfe5033a5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-pipeline",
-  "version": "0.8.4-main.c351d160a8",
+  "version": "0.8.4-main.fcfe5033a5",
   "description": "Pipeline plugin for Composer",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,6 +12,14 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": "./src/capabilities/index.ts",
+    "#components": "./src/components/index.ts",
+    "#containers": "./src/containers/index.ts",
+    "#hooks": "./src/hooks/index.ts",
+    "#meta": "./src/meta.ts",
+    "#types": "./src/types/index.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
@@ -39,35 +47,36 @@
   "dependencies": {
     "@radix-ui/react-compose-refs": "1.1.1",
     "@radix-ui/react-context": "1.1.1",
-    "effect": "3.19.16",
-    "@dxos/async": "0.8.4-main.c351d160a8",
-    "@dxos/app-toolkit": "0.8.4-main.c351d160a8",
-    "@dxos/assistant-toolkit": "0.8.4-main.c351d160a8",
-    "@dxos/devtools": "0.8.4-main.c351d160a8",
-    "@dxos/echo-atom": "0.8.4-main.c351d160a8",
-    "@dxos/echo-query": "0.8.4-main.c351d160a8",
-    "@dxos/functions": "0.8.4-main.c351d160a8",
-    "@dxos/echo": "0.8.4-main.c351d160a8",
-    "@dxos/operation": "0.8.4-main.c351d160a8",
-    "@dxos/log": "0.8.4-main.c351d160a8",
-    "@dxos/plugin-client": "0.8.4-main.c351d160a8",
-    "@dxos/plugin-deck": "0.8.4-main.c351d160a8",
-    "@dxos/plugin-inbox": "0.8.4-main.c351d160a8",
-    "@dxos/plugin-graph": "0.8.4-main.c351d160a8",
-    "@dxos/plugin-space": "0.8.4-main.c351d160a8",
-    "@dxos/plugin-markdown": "0.8.4-main.c351d160a8",
-    "@dxos/react-client": "0.8.4-main.c351d160a8",
-    "@dxos/react-ui-attention": "0.8.4-main.c351d160a8",
-    "@dxos/react-ui-list": "0.8.4-main.c351d160a8",
-    "@dxos/react-ui-form": "0.8.4-main.c351d160a8",
-    "@dxos/react-ui-menu": "0.8.4-main.c351d160a8",
-    "@dxos/react-ui-mosaic": "0.8.4-main.c351d160a8",
-    "@dxos/schema": "0.8.4-main.c351d160a8",
-    "@dxos/react-ui-stack": "0.8.4-main.c351d160a8",
-    "@dxos/types": "0.8.4-main.c351d160a8",
-    "@dxos/util": "0.8.4-main.c351d160a8",
-    "@dxos/react-ui-components": "0.8.4-main.c351d160a8",
-    "@dxos/app-framework": "0.8.4-main.c351d160a8"
+    "@radix-ui/react-slot": "1.1.2",
+    "effect": "3.20.0",
+    "@dxos/assistant-toolkit": "0.8.4-main.fcfe5033a5",
+    "@dxos/app-framework": "0.8.4-main.fcfe5033a5",
+    "@dxos/app-toolkit": "0.8.4-main.fcfe5033a5",
+    "@dxos/devtools": "0.8.4-main.fcfe5033a5",
+    "@dxos/echo": "0.8.4-main.fcfe5033a5",
+    "@dxos/echo-query": "0.8.4-main.fcfe5033a5",
+    "@dxos/echo-atom": "0.8.4-main.fcfe5033a5",
+    "@dxos/async": "0.8.4-main.fcfe5033a5",
+    "@dxos/functions": "0.8.4-main.fcfe5033a5",
+    "@dxos/log": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-deck": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-graph": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-client": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-markdown": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-inbox": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-space": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-attention": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-form": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-list": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-client": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-components": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-menu": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-mosaic": "0.8.4-main.fcfe5033a5",
+    "@dxos/schema": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-stack": "0.8.4-main.fcfe5033a5",
+    "@dxos/types": "0.8.4-main.fcfe5033a5",
+    "@dxos/util": "0.8.4-main.fcfe5033a5",
+    "@dxos/operation": "0.8.4-main.fcfe5033a5"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -76,24 +85,24 @@
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "vite": "^7.1.11",
-    "@dxos/echo-db": "0.8.4-main.c351d160a8",
-    "@dxos/plugin-attention": "0.8.4-main.c351d160a8",
-    "@dxos/plugin-inbox": "0.8.4-main.c351d160a8",
-    "@dxos/plugin-preview": "0.8.4-main.c351d160a8",
-    "@dxos/plugin-testing": "0.8.4-main.c351d160a8",
-    "@dxos/plugin-theme": "0.8.4-main.c351d160a8",
-    "@dxos/react-ui": "0.8.4-main.c351d160a8",
-    "@dxos/storybook-utils": "0.8.4-main.c351d160a8",
-    "@dxos/ui-theme": "0.8.4-main.c351d160a8",
-    "@dxos/random": "0.8.4-main.c351d160a8"
+    "@dxos/echo-db": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-inbox": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-attention": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-preview": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-testing": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-theme": "0.8.4-main.fcfe5033a5",
+    "@dxos/random": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui": "0.8.4-main.fcfe5033a5",
+    "@dxos/storybook-utils": "0.8.4-main.fcfe5033a5",
+    "@dxos/ui-theme": "0.8.4-main.fcfe5033a5"
   },
   "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.c351d160a8",
-    "@dxos/ui-theme": "0.8.4-main.c351d160a8"
+    "@dxos/react-ui": "0.8.4-main.fcfe5033a5",
+    "@dxos/ui-theme": "0.8.4-main.fcfe5033a5"
   },
   "publishConfig": {
     "access": "public"

package/src/PipelinePlugin.tsx

@@ -8,11 +8,14 @@ import * as Option from 'effect/Option';
 import { Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
 import { Annotation } from '@dxos/echo';
+import { Operation } from '@dxos/operation';
+import { SpaceOperation } from '@dxos/plugin-space/operations';
 import { type CreateObject } from '@dxos/plugin-space/types';
 import { Pipeline } from '@dxos/types';
 
-import { AppGraphBuilder, OperationResolver, ReactSurface } from './capabilities';
-import { meta } from './meta';
+import { AppGraphBuilder, ReactSurface } from '#capabilities';
+import { meta } from '#meta';
+
 import { translations } from './translations';
 
 export const PipelinePlugin = Plugin.define(meta).pipe(
@@ -23,11 +26,20 @@ export const PipelinePlugin = Plugin.define(meta).pipe(
       metadata: {
         icon: Annotation.IconAnnotation.get(Pipeline.Pipeline).pipe(Option.getOrThrow).icon,
         iconHue: Annotation.IconAnnotation.get(Pipeline.Pipeline).pipe(Option.getOrThrow).hue ?? 'white',
-        createObject: ((props) => Effect.sync(() => Pipeline.make(props))) satisfies CreateObject,
+        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,
+            });
+          })) satisfies CreateObject,
       },
     },
   }),
-  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+
   AppPlugin.addSchemaModule({ schema: [Pipeline.Pipeline] }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),

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/index.ts

@@ -2,6 +2,7 @@
 // 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 ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/{react-surface/react-surface.tsx → react-surface.tsx}

@@ -7,31 +7,30 @@ 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, PipelineObjectSettings } from '../../containers';
-import { meta } from '../../meta';
+import { PipelineContainer, PipelineProperties } from '#containers';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
     Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
-        id: meta.id,
-        role: 'article',
-        filter: (data): data is { attendableId: string; subject: Pipeline.Pipeline } =>
-          typeof data.attendableId === 'string' && Obj.instanceOf(Pipeline.Pipeline, data.subject),
+        id: 'root',
+        filter: AppSurface.object(AppSurface.Article, Pipeline.Pipeline),
         component: ({ data, role }) => (
           <PipelineContainer role={role} subject={data.subject} attendableId={data.attendableId} />
         ),
       }),
       Surface.create({
-        id: `${meta.id}.companion.invocations`,
-        role: 'article',
-        filter: (data): data is { companionTo: Pipeline.Pipeline } =>
-          Obj.instanceOf(Pipeline.Pipeline, data.companionTo) && data.subject === 'invocations',
+        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.
@@ -45,10 +44,9 @@ export default Capability.makeModule(() =>
         },
       }),
       Surface.create({
-        id: `${meta.id}.object-settings`,
-        role: 'object-settings',
-        filter: (data): data is { subject: Pipeline.Pipeline } => Obj.instanceOf(Pipeline.Pipeline, data.subject),
-        component: ({ data }) => <PipelineObjectSettings pipeline={data.subject} />,
+        id: 'object-properties',
+        filter: AppSurface.object(AppSurface.ObjectProperties, Pipeline.Pipeline),
+        component: ({ data }) => <PipelineProperties pipeline={data.subject} />,
       }),
     ]),
   ),

package/src/components/PipelineComponent/PipelineColumn.tsx

@@ -8,16 +8,17 @@ import * as Option from 'effect/Option';
 import type * as Schema from 'effect/Schema';
 import React, { forwardRef, useMemo, useRef, useState } from 'react';
 
+import { resolveSchemaWithRegistry } from '@dxos/app-toolkit/query';
 import { Annotation, JsonSchema, Obj, Query, Type } from '@dxos/echo';
-import { resolveSchemaWithRegistry } from '@dxos/plugin-space';
 import { Filter, getSpace, useObject } from '@dxos/react-client/echo';
-import { useAsyncEffect, useTranslation } from '@dxos/react-ui';
+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 { meta } from '../../meta';
+import { meta } from '#meta';
 
 import { type ItemProps, usePipeline } from './PipelineComponent';
 
@@ -69,27 +70,37 @@ export const PipelineColumn = ({ data: column, location, classNames, debug }: Pi
     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;
   }
 
   return (
-    <Board.Column.Root
-      data={column}
-      location={location}
-      classNames={['group/column grid h-full overflow-hidden grid-rows-[var(--dx-rail-action)_1fr]', classNames]}
-      debug={debug}
-      dragHandleRef={dragHandleRef}
-    >
-      <Board.Column.Header label={column.name || t('untitled view title')} dragHandleRef={dragHandleRef} />
-      <Board.Column.Body data={column} Tile={Tile} />
-    </Board.Column.Root>
+    <Panel.Root asChild>
+      <Board.Column.Root
+        debug={debug}
+        data={column}
+        location={location}
+        classNames={classNames}
+        dragHandleRef={dragHandleRef}
+      >
+        <Panel.Toolbar asChild>
+          <Board.Column.Header
+            classNames='_opacity-10'
+            label={column.name || t('untitled-view.title')}
+            dragHandleRef={dragHandleRef}
+          />
+        </Panel.Toolbar>
+        <Panel.Content asChild>
+          <Board.Column.Body data={column} Tile={PipelineTile} />
+        </Panel.Content>
+      </Board.Column.Root>
+    </Panel.Root>
   );
 };
 
@@ -119,20 +130,33 @@ const ItemTile = forwardRef<HTMLDivElement, ItemTileProps>(
     );
 
     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.Icon icon={icon} />
-              <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>
     );
   },
 );

package/src/components/PipelineComponent/PipelineComponent.stories.tsx

@@ -9,20 +9,20 @@ import React, { useCallback, useContext, useEffect, useMemo } from 'react';
 import { Filter, Ref } from '@dxos/client/echo';
 import { JsonSchema, Obj, Query } from '@dxos/echo';
 import { Collection, View } from '@dxos/echo';
-import { faker } from '@dxos/random';
+import { random } from '@dxos/random';
 import { useQuery } from '@dxos/react-client/echo';
 import { useClientStory, withClientProvider } from '@dxos/react-client/testing';
-import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { Form, omitId } from '@dxos/react-ui-form';
 import { withMosaic } from '@dxos/react-ui-mosaic/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { ViewModel } from '@dxos/schema';
 import { createObjectFactory } from '@dxos/schema/testing';
 import { withRegistry } from '@dxos/storybook-utils';
 import { Person, Pipeline } from '@dxos/types';
 
-import { usePipelineBoardModel } from '../../hooks';
-import { translations } from '../../translations';
+import { usePipelineBoardModel } from '#hooks';
 
+import { translations } from '../../translations';
 import { type ItemProps, PipelineComponent } from './PipelineComponent';
 
 const StorybookProjectItem = ({ item, projectionModel }: ItemProps) => {
@@ -64,10 +64,10 @@ const DefaultStory = () => {
       fields: ['fullName'],
     });
 
-    Obj.change(pipeline, (p) => {
-      p.columns.push({
+    Obj.change(pipeline, (pipeline) => {
+      pipeline.columns.push({
         name: 'New Contacts',
-        view: Ref.make(view) as (typeof p.columns)[number]['view'],
+        view: Ref.make(view) as (typeof pipeline.columns)[number]['view'],
         order: [],
       });
     });
@@ -108,10 +108,10 @@ const MutationsStory = () => {
       fields: ['fullName'],
     });
 
-    Obj.change(pipeline, (p) => {
-      p.columns.push({
+    Obj.change(pipeline, (pipeline) => {
+      pipeline.columns.push({
         name: 'New Contacts',
-        view: Ref.make(view) as (typeof p.columns)[number]['view'],
+        view: Ref.make(view) as (typeof pipeline.columns)[number]['view'],
         order: [],
       });
     });
@@ -125,19 +125,19 @@ const MutationsStory = () => {
     }
 
     const interval = setInterval(() => {
-      const factory = createObjectFactory(space.db, faker as any);
+      const factory = createObjectFactory(space.db, random as any);
       const p = Math.random();
 
       if (p < 0.4) {
         // Append to the name
-        const contactToAdjust = faker.helpers.arrayElement(contacts);
-        Obj.change(contactToAdjust, (c) => {
-          c.fullName = (c.fullName ?? '') + ' X';
+        const contactToAdjust = random.helpers.arrayElement(contacts);
+        Obj.change(contactToAdjust, (contactToAdjust) => {
+          contactToAdjust.fullName = (contactToAdjust.fullName ?? '') + ' X';
         });
         return;
       } else if (p < 0.7 && contacts.length > 1) {
         // Remove a contact (30% chance, but only if we have more than 1)
-        const contactToRemove = faker.helpers.arrayElement(contacts);
+        const contactToRemove = random.helpers.arrayElement(contacts);
         space.db.remove(contactToRemove);
       } else {
         // Add a new contact (30% chance)
@@ -195,7 +195,7 @@ const meta = {
         );
 
         // Generate random contacts.
-        const factory = createObjectFactory(space.db, faker as any);
+        const factory = createObjectFactory(space.db, random as any);
         await factory([{ type: Person.Person, count: 12 }]);
       },
     }),

package/src/components/PipelineComponent/PipelineComponent.tsx

@@ -4,6 +4,7 @@
 
 import { useAtomValue } from '@effect-atom/atom-react';
 import { createContext } from '@radix-ui/react-context';
+import { Slot } from '@radix-ui/react-slot';
 import React, { type FC, type PropsWithChildren } from 'react';
 
 import { Obj } from '@dxos/echo';
@@ -11,8 +12,9 @@ import { Toolbar, type ToolbarRootProps, useTranslation } from '@dxos/react-ui';
 import { Board, type BoardModel, useBoard, useEventHandlerAdapter } from '@dxos/react-ui-mosaic';
 import { type ProjectionModel } from '@dxos/schema';
 import { type Pipeline } from '@dxos/types';
+import { composable, composableProps, slottable } from '@dxos/ui-theme';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
 
 import { PipelineColumn } from './PipelineColumn';
 
@@ -59,10 +61,17 @@ type PipelineContentProps = PropsWithChildren<{
   model: BoardModel<Pipeline.Column, Obj.Unknown>;
 }>;
 
-const PipelineContent = ({ model, children, ...props }: PipelineContentProps) => (
-  <Board.Root {...props} model={model}>
-    {children}
-  </Board.Root>
+const PipelineContent = slottable<HTMLDivElement, PipelineContentProps>(
+  ({ asChild, model, children, ...props }, forwardedRef) => {
+    const Comp = asChild ? Slot : 'div';
+    return (
+      <Board.Root model={model}>
+        <Comp {...composableProps(props)} ref={forwardedRef}>
+          {children}
+        </Comp>
+      </Board.Root>
+    );
+  },
 );
 
 PipelineContent.displayName = PIPELINE_CONTENT_NAME;
@@ -77,7 +86,7 @@ type PipelineColumnsProps = {
   pipeline: Pipeline.Pipeline;
 };
 
-const PipelineColumns = ({ pipeline }: PipelineColumnsProps) => {
+const PipelineColumns = composable<HTMLDivElement, PipelineColumnsProps>(({ pipeline, ...props }) => {
   const { model } = useBoard(PIPELINE_COLUMNS_NAME);
   const columns = useAtomValue(model.columns);
   const eventHandler = useEventHandlerAdapter<Pipeline.Column, Obj.Unknown>({
@@ -88,11 +97,11 @@ const PipelineColumns = ({ pipeline }: PipelineColumnsProps) => {
     get: (data) => data as unknown as Obj.Unknown,
     make: (object) => object as unknown as Pipeline.Column,
     canDrop: ({ source }) => model.isColumn(source.data),
-    onChange: (mutate) => Obj.change(pipeline, (p) => mutate(p.columns)),
+    onChange: (mutate) => Obj.change(pipeline, (pipeline) => mutate(pipeline.columns)),
   });
 
-  return <Board.Content id='pipeline' eventHandler={eventHandler} Tile={PipelineColumn} />;
-};
+  return <Board.Content {...props} id='pipeline' eventHandler={eventHandler} Tile={PipelineColumn} />;
+});
 
 PipelineColumns.displayName = PIPELINE_COLUMNS_NAME;
 
@@ -102,16 +111,16 @@ PipelineColumns.displayName = PIPELINE_COLUMNS_NAME;
 
 const PIPELINE_TOOLBAR_NAME = 'Pipeline.Toolbar';
 
-export const PipelineToolbar = (props: ToolbarRootProps) => {
+export const PipelineToolbar = composable<HTMLDivElement, ToolbarRootProps>(({ children, ...props }, forwardedRef) => {
   const { t } = useTranslation(meta.id);
   const { onAddColumn } = usePipeline(PIPELINE_TOOLBAR_NAME);
 
   return (
-    <Toolbar.Root {...props}>
-      <Toolbar.IconButton icon='ph--plus--regular' iconOnly label={t('add column label')} onClick={onAddColumn} />
+    <Toolbar.Root {...composableProps(props)} ref={forwardedRef}>
+      <Toolbar.IconButton icon='ph--plus--regular' iconOnly label={t('add-column.label')} onClick={onAddColumn} />
     </Toolbar.Root>
   );
-};
+});
 
 PipelineToolbar.displayName = PIPELINE_TOOLBAR_NAME;