@dxos/plugin-kanban 0.8.4-main.abd8ff62ef → 0.8.4-main.bc2380dfbc

package/src/components/KanbanBoard/KanbanCard.tsx

@@ -9,90 +9,93 @@ import { AppSurface, useObjectMenuItems } from '@dxos/app-toolkit/ui';
 import { Obj } from '@dxos/echo';
 import { Card, Toolbar, useTranslation } from '@dxos/react-ui';
 import { Menu, createMenuAction } from '@dxos/react-ui-menu';
-import { Focus, Mosaic, type MosaicTileProps, useBoard } from '@dxos/react-ui-mosaic';
+import { Focus, Mosaic, useBoard } from '@dxos/react-ui-mosaic';
 
 import { meta } from '#meta';
 
-import { useKanbanBoard } from './KanbanBoard';
+import { type KanbanCardProps, useKanbanBoard } from './context';
 
-const KANBAN_CARD_TILE_NAME = 'KanbanBoard.Card';
+export { type KanbanCardProps };
 
-export type KanbanCardProps = Pick<MosaicTileProps<Obj.Unknown>, 'location' | 'data' | 'debug'>;
+const KANBAN_CARD_TILE_NAME = 'KanbanBoard.Card';
 
 /**
  * Mosaic Tile for Kanban card.
  * Uses Surface for content; requires plugin manager context.
  */
-export const KanbanCard = forwardRef<HTMLDivElement, KanbanCardProps>(({ data, location, debug }, forwardedRef) => {
-  const { t } = useTranslation(meta.id);
-  const { model } = useBoard(KANBAN_CARD_TILE_NAME);
-  const { projection, columnFieldPath, onCardRemove } = useKanbanBoard(KANBAN_CARD_TILE_NAME);
-  const [dragHandle, setDragHandle] = useState<HTMLButtonElement | null>(null);
-  const dragHandleRef = useCallback((el: HTMLButtonElement | null) => setDragHandle(el), []);
+export const KanbanCard = forwardRef<HTMLDivElement, KanbanCardProps>(
+  ({ data, location, debug, draggable }, forwardedRef) => {
+    const { t } = useTranslation(meta.id);
+    const { model } = useBoard(KANBAN_CARD_TILE_NAME);
+    const { projection, columnFieldPath, onCardRemove } = useKanbanBoard(KANBAN_CARD_TILE_NAME);
+    const [dragHandle, setDragHandle] = useState<HTMLButtonElement | null>(null);
+    const dragHandleRef = useCallback((el: HTMLButtonElement | null) => setDragHandle(el), []);
 
-  const objectMenuItems = useObjectMenuItems(data);
+    const objectMenuItems = useObjectMenuItems(data);
 
-  const menuItems = useMemo(
-    () => [
-      ...objectMenuItems,
-      ...(onCardRemove
-        ? [
-            createMenuAction('remove', () => onCardRemove(data), {
-              label: t('remove-card.label'),
-              icon: 'ph--trash--regular',
-            }),
-          ]
-        : []),
-    ],
-    [objectMenuItems, onCardRemove, data, t],
-  );
+    const menuItems = useMemo(
+      () => [
+        ...objectMenuItems,
+        ...(onCardRemove
+          ? [
+              createMenuAction('remove', () => onCardRemove(data), {
+                label: t('remove-card.label'),
+                icon: 'ph--trash--regular',
+              }),
+            ]
+          : []),
+      ],
+      [objectMenuItems, onCardRemove, data, t],
+    );
 
-  return (
-    <Menu.Root>
-      <Mosaic.Tile
-        asChild
-        id={model.getItemId(data)}
-        data={data}
-        location={location}
-        debug={debug}
-        dragHandle={dragHandle}
-      >
-        <Focus.Item asChild>
-          <Card.Root ref={forwardedRef} data-testid='board-item'>
-            <Card.Toolbar>
-              <Card.DragHandle ref={dragHandleRef} testId='mosaicBoard.cardDragHandle' />
-              <Card.Title data-testid='mosaicBoard.cardTitle'>{Obj.getLabel(data)}</Card.Title>
-              {/* TODO(wittjosiah): Reconcile with Card.Menu. */}
-              <Menu.Trigger asChild disabled={!menuItems?.length}>
-                <Toolbar.IconButton
-                  iconOnly
-                  variant='ghost'
-                  icon='ph--dots-three-vertical--regular'
-                  label={t('action-menu.label')}
-                />
-              </Menu.Trigger>
-              <Menu.Content items={menuItems} />
-            </Card.Toolbar>
-            <Card.Content>
-              {projection && (
-                <Surface.Surface
-                  type={AppSurface.Card}
-                  limit={1}
-                  data={{
-                    subject: data,
-                    projection,
-                    // Hide the pivot field: its value is already conveyed by
-                    // which column the card sits in.
-                    ignorePaths: columnFieldPath ? [columnFieldPath] : undefined,
-                  }}
-                />
-              )}
-            </Card.Content>
-          </Card.Root>
-        </Focus.Item>
-      </Mosaic.Tile>
-    </Menu.Root>
-  );
-});
+    return (
+      <Menu.Root>
+        <Mosaic.Tile
+          asChild
+          id={model.getItemId(data)}
+          data={data}
+          location={location}
+          debug={debug}
+          draggable={draggable}
+          dragHandle={dragHandle}
+        >
+          <Focus.Item asChild>
+            <Card.Root ref={forwardedRef} data-testid='board-item'>
+              <Card.Toolbar>
+                <Card.DragHandle ref={dragHandleRef} testId='mosaicBoard.cardDragHandle' />
+                <Card.Title data-testid='mosaicBoard.cardTitle'>{Obj.getLabel(data)}</Card.Title>
+                {/* TODO(wittjosiah): Reconcile with Card.Menu. */}
+                <Menu.Trigger asChild disabled={!menuItems?.length}>
+                  <Toolbar.IconButton
+                    iconOnly
+                    variant='ghost'
+                    icon='ph--dots-three-vertical--regular'
+                    label={t('action-menu.label')}
+                  />
+                </Menu.Trigger>
+                <Menu.Content items={menuItems} />
+              </Card.Toolbar>
+              <Card.Content>
+                {projection && (
+                  <Surface.Surface
+                    type={AppSurface.Card}
+                    limit={1}
+                    data={{
+                      subject: data,
+                      projection,
+                      // Hide the pivot field: its value is already conveyed by
+                      // which column the card sits in.
+                      ignorePaths: columnFieldPath ? [columnFieldPath] : undefined,
+                    }}
+                  />
+                )}
+              </Card.Content>
+            </Card.Root>
+          </Focus.Item>
+        </Mosaic.Tile>
+      </Menu.Root>
+    );
+  },
+);
 
 KanbanCard.displayName = KANBAN_CARD_TILE_NAME;

package/src/components/KanbanBoard/KanbanColumn.tsx

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { FC, forwardRef, RefObject, useRef } from 'react';
+import React, { FC, forwardRef, useState } from 'react';
 
 import type { Obj } from '@dxos/echo';
 import { Board, type MosaicTileProps, useBoard } from '@dxos/react-ui-mosaic';
@@ -10,23 +10,23 @@ import { Board, type MosaicTileProps, useBoard } from '@dxos/react-ui-mosaic';
 import { useKanbanItemEventHandler } from '#hooks';
 import { type ColumnStructure, UNCATEGORIZED_VALUE } from '#types';
 
-import { useKanbanBoard } from './KanbanBoard';
+import { type KanbanColumnProps, useKanbanBoard } from './context';
 
-const KANBAN_COLUMN_NAME = 'KanbanBoard.Column';
+export { type KanbanColumnProps };
 
-export type KanbanColumnProps = Pick<MosaicTileProps<ColumnStructure>, 'location' | 'data' | 'debug'>;
+const KANBAN_COLUMN_NAME = 'KanbanBoard.Column';
 
 /**
  * Mosaic Tile for Kanban column.
  */
 export const KanbanColumn = forwardRef<HTMLDivElement, KanbanColumnProps>(
-  ({ data: column, location, debug }, forwardedRef) => {
+  ({ data: column, location, debug, draggable }, forwardedRef) => {
     const { model } = useBoard<ColumnStructure, Obj.Unknown>(KANBAN_COLUMN_NAME);
     const { columnFieldPath, change, onCardAdd, getPivotAttributes, itemTile } = useKanbanBoard(KANBAN_COLUMN_NAME);
 
     const { title } = getPivotAttributes(column.columnValue);
     const uncategorized = column.columnValue === UNCATEGORIZED_VALUE;
-    const dragHandleRef = useRef<HTMLButtonElement | null>(null);
+    const [dragHandle, setDragHandle] = useState<HTMLButtonElement | null>(null);
 
     const eventHandler = useKanbanItemEventHandler({
       column,
@@ -41,7 +41,8 @@ export const KanbanColumn = forwardRef<HTMLDivElement, KanbanColumnProps>(
         location={location}
         classNames='grid grid-rows-[var(--dx-rail-action)_1fr_var(--dx-rail-action)]'
         debug={debug}
-        dragHandleRef={dragHandleRef}
+        draggable={draggable}
+        dragHandle={dragHandle}
         ref={forwardedRef}
       >
         {uncategorized ? (
@@ -49,7 +50,7 @@ export const KanbanColumn = forwardRef<HTMLDivElement, KanbanColumnProps>(
             <span className='font-medium'>{title}</span>
           </div>
         ) : (
-          <Board.Column.Header label={title} dragHandleRef={dragHandleRef as RefObject<HTMLButtonElement>} />
+          <Board.Column.Header label={title} dragHandleRef={setDragHandle} />
         )}
         <Board.Column.Body
           data={column}

package/src/components/KanbanBoard/context.ts

@@ -0,0 +1,54 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { createContext } from '@radix-ui/react-context';
+import { type ComponentType } from 'react';
+
+import { type Obj } from '@dxos/echo';
+import { type MosaicTileProps } from '@dxos/react-ui-mosaic';
+import { type ProjectionModel } from '@dxos/schema';
+
+import { type ColumnStructure, type KanbanChangeCallback, UNCATEGORIZED_ATTRIBUTES, UNCATEGORIZED_VALUE } from '#types';
+
+const KANBAN_BOARD_NAME = 'KanbanBoard.Context';
+
+/**
+ * Card tile props. Defined here (rather than in `KanbanCard.tsx`) so the
+ * context type can reference it without forming a cycle through that
+ * module's runtime exports — webkit treats the resulting TDZ as a hard
+ * error while other engines are lenient.
+ */
+export type KanbanCardProps = Pick<MosaicTileProps<Obj.Unknown>, 'location' | 'data' | 'debug' | 'draggable'>;
+
+/**
+ * Column tile props. See note on {@link KanbanCardProps}.
+ */
+export type KanbanColumnProps = Pick<MosaicTileProps<ColumnStructure>, 'location' | 'data' | 'debug' | 'draggable'>;
+
+/**
+ * Context value for the Kanban board.
+ * Items are Echo objects (Obj.Unknown).
+ */
+export type KanbanBoardContextValue = {
+  kanbanId: string;
+  projection: ProjectionModel | undefined;
+  columnFieldPath: string | undefined;
+  change: KanbanChangeCallback<Obj.Unknown>;
+  pivotFieldId: string | undefined;
+  getPivotAttributes: (columnValue: string) => { title: string; color: string };
+  itemTile?: ComponentType<KanbanCardProps>; // TODO(burdon): Prop.
+  onCardAdd?: (columnValue: string | undefined) => string | undefined;
+  onCardRemove?: (card: Obj.Unknown) => void;
+};
+
+export const [KanbanBoardContext, useKanbanBoard] = createContext<KanbanBoardContextValue>(KANBAN_BOARD_NAME, {
+  kanbanId: 'never',
+  projection: undefined,
+  columnFieldPath: undefined,
+  change: { kanban: () => {}, setItemField: () => {} },
+  pivotFieldId: undefined,
+  getPivotAttributes: (id: string) =>
+    id === UNCATEGORIZED_VALUE ? UNCATEGORIZED_ATTRIBUTES : { title: id, color: 'neutral' },
+  itemTile: (() => null) as ComponentType<KanbanCardProps>,
+});

package/src/containers/{KanbanContainer/KanbanContainer.stories.tsx → KanbanArticle/KanbanArticle.stories.tsx}

@@ -11,17 +11,18 @@ import { expect, waitFor, within } from 'storybook/test';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Surface } from '@dxos/app-framework/ui';
 import { AppSurface } from '@dxos/app-toolkit/ui';
-import { Obj, type QueryAST, Type } from '@dxos/echo';
-import { View } from '@dxos/echo';
+import { Filter, Obj, type QueryAST, Type, View } from '@dxos/echo';
 import { type Mutable } from '@dxos/echo/internal';
 import { invariant } from '@dxos/invariant';
-import { ClientPlugin } from '@dxos/plugin-client';
+// `/plugin` entrypoints used here for the same reason as `corePlugins()` —
+// see `@dxos/plugin-testing/src/core.ts` for the rationale.
+import { ClientPlugin } from '@dxos/plugin-client/testing';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
-import { PreviewPlugin } from '@dxos/plugin-preview';
-import { SpacePlugin } from '@dxos/plugin-space';
+import { PreviewPlugin } from '@dxos/plugin-preview/testing';
+import { SpacePlugin } from '@dxos/plugin-space/testing';
 import { StorybookPlugin, corePlugins } from '@dxos/plugin-testing';
 import { random } from '@dxos/random';
-import { Filter, type Space, useQuery, useSchema, useSpaces } from '@dxos/react-client/echo';
+import { type Space, useQuery, useSchema, useSpaces } from '@dxos/react-client/echo';
 import { ViewEditor } from '@dxos/react-ui-form';
 import { Syntax } from '@dxos/react-ui-syntax-highlighter';
 import { withLayout } from '@dxos/react-ui/testing';
@@ -56,7 +57,7 @@ type ClientSetupOptions = {
 
 /**
  * Creates the standard plugin manager decorator with client configuration.
- * Includes KanbanPlugin so the Surface resolves to KanbanContainer.
+ * Includes KanbanPlugin so the Surface resolves to KanbanArticle.
  */
 const withKanbanPlugins = ({ types = [], onSpaceCreated }: ClientSetupOptions): Decorator =>
   withPluginManager({
@@ -80,7 +81,7 @@ const withKanbanPlugins = ({ types = [], onSpaceCreated }: ClientSetupOptions):
   });
 
 /**
- * Renders the first Kanban in the space via Surface (resolves to KanbanContainer),
+ * Renders the first Kanban in the space via Surface (resolves to KanbanArticle),
  * with a sidebar containing ViewEditor and Json filter.
  */
 const DefaultComponent = () => {

package/src/containers/{KanbanContainer/KanbanContainer.tsx → KanbanArticle/KanbanArticle.tsx}

@@ -16,23 +16,23 @@ import { getTagFromQuery, getTypenameFromQuery } from '@dxos/schema';
 
 import { KanbanBoard } from '#components';
 import { useEchoChangeCallback, useItemsProjection, useProjectionModel } from '#hooks';
-import { KanbanOperation } from '#operations';
+import { KanbanOperation } from '#types';
 import { Kanban } from '#types';
 
-export type KanbanContainerProps = AppSurface.ObjectArticleProps<Kanban.Kanban>;
+export type KanbanArticleProps = AppSurface.ObjectArticleProps<Kanban.Kanban>;
 
-export const KanbanContainer = (props: KanbanContainerProps) => {
+export const KanbanArticle = (props: KanbanArticleProps) => {
   // Branch on `kanban.spec.kind`: view-variant runs a typename query through
   // `useProjectionModel`; items-variant dereferences `kanban.spec.items` and
   // uses a stub projection from `useItemsProjection`.
   return Kanban.isKanbanItems(props.subject) ? (
-    <ItemsKanbanContainer {...props} subject={props.subject} />
+    <ItemsKanbanArticle {...props} subject={props.subject} />
   ) : (
-    <ViewKanbanContainer {...props} />
+    <ViewKanbanArticle {...props} />
   );
 };
 
-const ViewKanbanContainer = ({ role, subject: object }: KanbanContainerProps) => {
+const ViewKanbanArticle = ({ role, subject: object }: KanbanArticleProps) => {
   const registry = useContext(RegistryContext);
   const schemas = useCapabilities(AppCapabilities.Schema);
   const db = Obj.getDatabase(object);
@@ -106,9 +106,9 @@ const ViewKanbanContainer = ({ role, subject: object }: KanbanContainerProps) =>
   );
 };
 
-type ItemsKanbanContainerProps = Omit<KanbanContainerProps, 'subject'> & { subject: Kanban.KanbanItems };
+type ItemsKanbanArticleProps = Omit<KanbanArticleProps, 'subject'> & { subject: Kanban.KanbanItems };
 
-const ItemsKanbanContainer = ({ role, subject: object }: ItemsKanbanContainerProps) => {
+const ItemsKanbanArticle = ({ role, subject: object }: ItemsKanbanArticleProps) => {
   const db = Obj.getDatabase(object);
   const projection = useItemsProjection(object);
   const change = useEchoChangeCallback(object);

package/src/containers/KanbanArticle/index.ts

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

package/src/containers/index.ts

@@ -4,5 +4,5 @@
 
 import { type ComponentType, lazy } from 'react';
 
-export const KanbanContainer: ComponentType<any> = lazy(() => import('./KanbanContainer'));
+export const KanbanArticle: ComponentType<any> = lazy(() => import('./KanbanArticle'));
 export const KanbanSettings: ComponentType<any> = lazy(() => import('./KanbanSettings'));

package/src/hooks/useKanbanBoardModel.browser.test.ts

@@ -7,8 +7,7 @@ import { act, renderHook } from '@testing-library/react';
 import * as Schema from 'effect/Schema';
 import { beforeEach, describe, test } from 'vitest';
 
-import { Filter, JsonSchema, Obj, Query, Type } from '@dxos/echo';
-import { type View } from '@dxos/echo';
+import { Filter, JsonSchema, Obj, Query, Type, type View } from '@dxos/echo';
 import { Format, FormatAnnotation, PropertyMetaAnnotationId } from '@dxos/echo/internal';
 import { ObjectId } from '@dxos/keys';
 import { ProjectionModel, ViewModel, createDirectChangeCallback } from '@dxos/schema';

package/src/index.ts

@@ -2,10 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Plugin } from '@dxos/app-framework';
-
-import { meta } from './meta';
-
-export const KanbanPlugin = Plugin.lazy(meta, () => import('#plugin'));
-
+export * from './blueprints';
 export * from './meta';
+export * from './operations';
+export * from './types';

package/src/operations/delete-card-field.ts

@@ -9,9 +9,9 @@ import { type EchoSchema } from '@dxos/echo/internal';
 import { invariant } from '@dxos/invariant';
 import { ProjectionModel, createEchoChangeCallback, getTypenameFromQuery } from '@dxos/schema';
 
-import { DeleteCardField } from './definitions';
+import { KanbanOperation } from '../types';
 
-const handler: Operation.WithHandler<typeof DeleteCardField> = DeleteCardField.pipe(
+const handler: Operation.WithHandler<typeof KanbanOperation.DeleteCardField> = KanbanOperation.DeleteCardField.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* ({ view, fieldId }) {
       const registry = yield* Capability.get(Capabilities.AtomRegistry);

package/src/operations/delete-card.ts

@@ -6,9 +6,9 @@ import { Operation } from '@dxos/compute';
 import { Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 
-import { DeleteCard } from './definitions';
+import { KanbanOperation } from '../types';
 
-const handler: Operation.WithHandler<typeof DeleteCard> = DeleteCard.pipe(
+const handler: Operation.WithHandler<typeof KanbanOperation.DeleteCard> = KanbanOperation.DeleteCard.pipe(
   Operation.withHandler(({ card }) =>
     Effect.sync(() => {
       const db = Obj.getDatabase(card);

package/src/operations/index.ts

@@ -2,8 +2,6 @@
 
 import { OperationHandlerSet } from '@dxos/compute';
 
-export * as KanbanOperation from './definitions';
-
 export const KanbanOperationHandlerSet = OperationHandlerSet.lazy(
   () => import('./delete-card'),
   () => import('./delete-card-field'),

package/src/operations/restore-card-field.ts

@@ -9,9 +9,9 @@ import { type EchoSchema } from '@dxos/echo/internal';
 import { invariant } from '@dxos/invariant';
 import { ProjectionModel, createEchoChangeCallback, getTypenameFromQuery } from '@dxos/schema';
 
-import { RestoreCardField } from './definitions';
+import { KanbanOperation } from '../types';
 
-const handler: Operation.WithHandler<typeof RestoreCardField> = RestoreCardField.pipe(
+const handler: Operation.WithHandler<typeof KanbanOperation.RestoreCardField> = KanbanOperation.RestoreCardField.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* ({ view, field, props, index }) {
       const registry = yield* Capability.get(Capabilities.AtomRegistry);

package/src/operations/restore-card.ts

@@ -6,9 +6,9 @@ import { Operation } from '@dxos/compute';
 import { Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 
-import { RestoreCard } from './definitions';
+import { KanbanOperation } from '../types';
 
-const handler: Operation.WithHandler<typeof RestoreCard> = RestoreCard.pipe(
+const handler: Operation.WithHandler<typeof KanbanOperation.RestoreCard> = KanbanOperation.RestoreCard.pipe(
   Operation.withHandler(({ card }) =>
     Effect.sync(() => {
       const db = Obj.getDatabase(card);

package/src/playwright/smoke.spec.ts

@@ -49,7 +49,7 @@ test.describe('Kanban MutableSchema', () => {
     expect(secondLabel).not.toBeNull();
 
     // Drag first item below the second item.
-    await column.item(0).dragTo(column.item(1).locator, { x: 0, y: 200 });
+    await column.item(0).dragTo(column.item(1).locator, { x: 0, y: 200 }, 'bottom');
 
     // Item count should stay the same.
     await expect(column.items()).toHaveCount(countBefore);
@@ -71,8 +71,8 @@ test.describe('Kanban MutableSchema', () => {
     const draggedLabel = await col1.item(0).title().textContent();
     expect(draggedLabel).not.toBeNull();
 
-    // Drop above first item. Kanban cards are taller; use larger negative y so we land in top half.
-    await col1.item(0).dragTo(col2.item(0).locator, { x: 0, y: -30 });
+    // Drop above first item.
+    await col1.item(0).dragTo(col2.item(0).locator, { x: 0, y: -30 }, 'top');
 
     await expect(col1.items()).toHaveCount(col1CountBefore - 1);
     await expect(col2.items()).toHaveCount(col2CountBefore + 1);

package/src/plugin.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const KanbanPlugin = Plugin.lazy(meta, () => import('#plugin'));
+
+export { KanbanOperationHandlerSet } from './operations';

package/src/types/Kanban.ts

@@ -4,8 +4,7 @@
 
 import * as Schema from 'effect/Schema';
 
-import { Annotation, Obj, Ref, Type } from '@dxos/echo';
-import { View } from '@dxos/echo';
+import { Annotation, Obj, Ref, Type, View } from '@dxos/echo';
 import { FormInputAnnotation, LabelAnnotation } from '@dxos/echo/internal';
 import { ViewAnnotation } from '@dxos/schema';
 

package/src/{operations/definitions.ts → types/KanbanOperation.ts}

@@ -1,4 +1,8 @@
+//
 // Copyright 2025 DXOS.org
+//
+
+// @import-as-namespace
 
 import * as Schema from 'effect/Schema';
 

package/src/types/index.ts

@@ -3,6 +3,8 @@
 //
 
 export * from './constants';
-export * as Kanban from './Kanban';
 export * from './schema';
 export type * from './types';
+
+export * as Kanban from './Kanban';
+export * as KanbanOperation from './KanbanOperation';

package/src/types/migrations.test.ts

@@ -5,8 +5,7 @@
 import * as Schema from 'effect/Schema';
 import { afterEach, beforeEach, describe, test } from 'vitest';
 
-import { defineObjectMigration } from '@dxos/client/echo';
-import { Filter, JsonSchema, Obj, Query, Ref, Type, View } from '@dxos/echo';
+import { Filter, JsonSchema, Migration, Obj, Query, Ref, Type, View } from '@dxos/echo';
 import { EchoTestBuilder } from '@dxos/echo-db/testing';
 import { ViewModel } from '@dxos/schema';
 
@@ -35,7 +34,7 @@ describe('Kanban migration v1 → v2', () => {
     await builder.close();
   });
 
-  const migration = defineObjectMigration({
+  const migration = Migration.define({
     from: KanbanV1,
     to: Kanban,
     transform: async (from) => ({

package/src/types/schema.ts

@@ -4,7 +4,7 @@
 
 import * as Schema from 'effect/Schema';
 
-import { TypeInputOptionsAnnotation } from '@dxos/plugin-space/types';
+import { TypeInputOptionsAnnotation } from '@dxos/plugin-space';
 
 /**
  * Kanban data model.

package/src/util/arrangement.test.ts

@@ -5,8 +5,7 @@
 import * as Schema from 'effect/Schema';
 import { beforeEach, describe, test } from 'vitest';
 
-import { Filter, JsonSchema, Query, Type } from '@dxos/echo';
-import { type View } from '@dxos/echo';
+import { Filter, JsonSchema, Query, Type, type View } from '@dxos/echo';
 import { ObjectId } from '@dxos/keys';
 import { ViewModel } from '@dxos/schema';