@dxos/plugin-kanban 0.8.4-main.fcfe5033a5 → 0.8.4-staging.60fe92afc8

package/src/containers/KanbanArticle/KanbanArticle.tsx

@@ -0,0 +1,179 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { Atom, RegistryContext } from '@effect-atom/atom-react';
+import React, { useCallback, useContext, useMemo } from 'react';
+
+import { useCapabilities, useOperationInvoker } from '@dxos/app-framework/ui';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { useSchemaFilter, type AppSurface } from '@dxos/app-toolkit/ui';
+import { Filter, Obj, Query, type Ref, Type } from '@dxos/echo';
+import { useObject, useType } from '@dxos/react-client/echo';
+import { Panel, Toolbar } from '@dxos/react-ui';
+import { getTagFromQuery, getTypeURIFromQuery } from '@dxos/schema';
+
+import { KanbanBoard } from '#components';
+import { useEchoChangeCallback, useItemsProjection, useProjectionModel } from '#hooks';
+import { KanbanOperation } from '#types';
+import { Kanban } from '#types';
+
+export type KanbanArticleProps = AppSurface.ObjectArticleProps<Kanban.Kanban>;
+
+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) ? (
+    <ItemsKanbanArticle {...props} subject={props.subject} />
+  ) : (
+    <ViewKanbanArticle {...props} />
+  );
+};
+
+const ViewKanbanArticle = ({ role, subject: object }: KanbanArticleProps) => {
+  const registry = useContext(RegistryContext);
+  const schemas = useCapabilities(AppCapabilities.Schema);
+  const db = Obj.getDatabase(object);
+  const { invokePromise } = useOperationInvoker();
+  const [view] = useObject(object.spec.kind === 'view' ? object.spec.view : undefined);
+  const typeUri = view?.query ? getTypeURIFromQuery(view.query.ast) : undefined;
+  const tag = view?.query ? getTagFromQuery(view.query.ast) : undefined;
+
+  const schemaFromDb = useType(db, typeUri);
+  const cardSchema = useMemo(
+    () => schemaFromDb ?? schemas.flat().find((schema) => Type.getURI(schema) === typeUri),
+    [schemaFromDb, schemas, typeUri],
+  );
+
+  const baseFilter = useSchemaFilter(cardSchema);
+  const items = useMemo(() => {
+    if (!db) {
+      return null;
+    }
+    const query = tag ? Query.select(baseFilter).select(Filter.tag(tag)) : Query.select(baseFilter);
+    return db.query(query).atom;
+  }, [db, baseFilter, tag]);
+
+  const projection = useProjectionModel(cardSchema, object, registry);
+  const change = useEchoChangeCallback(object);
+
+  const pivotFieldId = view?.projection?.pivotFieldId;
+  const columnFieldPath =
+    projection && pivotFieldId ? projection.tryGetFieldProjection(pivotFieldId)?.props.property : undefined;
+
+  const handleCardAdd = useCallback(
+    (columnValue: string | undefined) => {
+      if (db && cardSchema && columnFieldPath) {
+        const card = Obj.make(Type.assertObject(cardSchema), {
+          [columnFieldPath]: columnValue,
+        });
+        db.add(card);
+        return card.id;
+      }
+    },
+    [db, cardSchema, columnFieldPath],
+  );
+
+  const handleCardRemove = useCallback(
+    (card: { id: string }) => {
+      void invokePromise(KanbanOperation.DeleteCard, { card });
+    },
+    [invokePromise],
+  );
+
+  if (!object || !db || !items || !projection || !change) {
+    return null;
+  }
+
+  return (
+    <Panel.Root role={role}>
+      <Panel.Toolbar asChild>
+        <Toolbar.Root />
+      </Panel.Toolbar>
+      <KanbanBoard.Root
+        kanban={object}
+        projection={projection}
+        items={items}
+        change={change}
+        onCardAdd={handleCardAdd}
+        onCardRemove={handleCardRemove}
+      >
+        <Panel.Content asChild>
+          <KanbanBoard.Content />
+        </Panel.Content>
+      </KanbanBoard.Root>
+    </Panel.Root>
+  );
+};
+
+type ItemsKanbanArticleProps = Omit<KanbanArticleProps, 'subject'> & { subject: Kanban.KanbanItems };
+
+const ItemsKanbanArticle = ({ role, subject: object }: ItemsKanbanArticleProps) => {
+  const db = Obj.getDatabase(object);
+  const projection = useItemsProjection(object);
+  const change = useEchoChangeCallback(object);
+
+  // TODO(wittjosiah): pass refs (not loaded objects) through to the kanban
+  //   board and let `KanbanCard` subscribe to its own ref via `useObject`.
+  //   Today this atom subscribes to *every* item — any one changing causes the
+  //   container (and the model's per-column atoms) to recompute. With cards
+  //   subscribing themselves, the container only needs the refs and the
+  //   per-card render is independent. Requires:
+  //     - `KanbanCard` to accept `Ref<Obj.Unknown>` as `data` and call
+  //       `useObject(ref)` internally.
+  //     - The model to handle a ref-bearing item shape (id from
+  //       `ref.dxn.asEchoDXN()?.echoUri`) and use arrangement-only ordering
+  //       for items-variant (no pivot-value fallback, since refs don't expose
+  //       the pivot field without loading).
+  //     - `Mosaic.isItem` to accept the ref wrapper alongside `Obj.isObject`.
+  const itemsAtom = useMemo(
+    () =>
+      Atom.make((get) => {
+        const out: Obj.Unknown[] = [];
+        for (const ref of object.spec.items as ReadonlyArray<Ref.Ref<Obj.Unknown>>) {
+          const target = get(Obj.atom(ref));
+          if (target == null) {
+            continue;
+          }
+          // Drop soft-deleted cards (e.g. Trello-closed cards). The ref
+          // stays in `spec.items` so arrangement is preserved, but the card
+          // shouldn't render.
+          if (Obj.isDeleted(target)) {
+            continue;
+          }
+          out.push(target as unknown as Obj.Unknown);
+        }
+        return out;
+      }),
+    [object.spec.items],
+  );
+
+  const handleCardRemove = useCallback(() => undefined, []);
+
+  if (!object || !db || !change) {
+    return null;
+  }
+
+  // TODO(wittjosiah): wire `onCardAdd` to the create-object flow so
+  //   users can add items directly from the kanban (currently the column's
+  //   "+" button is hidden because `onCardAdd` is undefined).
+  return (
+    <Panel.Root role={role}>
+      <Panel.Toolbar asChild>
+        <Toolbar.Root />
+      </Panel.Toolbar>
+      <KanbanBoard.Root
+        kanban={object}
+        projection={projection}
+        items={itemsAtom}
+        change={change}
+        onCardRemove={handleCardRemove}
+      >
+        <Panel.Content asChild>
+          <KanbanBoard.Content />
+        </Panel.Content>
+      </KanbanBoard.Root>
+    </Panel.Root>
+  );
+};

package/src/containers/KanbanArticle/index.ts

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

package/src/containers/KanbanSettings/KanbanSettings.tsx

@@ -0,0 +1,94 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { RegistryContext } from '@effect-atom/atom-react';
+import React, { useCallback, useContext, useMemo } from 'react';
+
+import { type AppSurface } from '@dxos/app-toolkit/ui';
+import { Obj } from '@dxos/echo';
+import { Format } from '@dxos/echo/Format';
+import { useObject, useType } from '@dxos/react-client/echo';
+import { Form, type FormFieldMap, SelectField } from '@dxos/react-ui-form';
+import { getTypeURIFromQuery } from '@dxos/schema';
+
+import { useProjectionModel } from '#hooks';
+import { type Kanban, KanbanSettingsSchema, KanbanViewSettingsSchema, UNCATEGORIZED_VALUE } from '#types';
+
+export type KanbanSettingsProps = AppSurface.ObjectPropertiesProps<Kanban.Kanban>;
+
+/**
+ * Settings panel for a Kanban. Renders fields common to every kanban
+ * (currently the "Hide uncategorized column" toggle); for view-variant
+ * kanbans an additional "Column field" picker drives the View's pivot
+ * field. Items-variant kanbans use a hardcoded `spec.pivotField`, so that
+ * field is omitted there.
+ */
+export const KanbanSettings = ({ subject: object }: KanbanSettingsProps) => {
+  const registry = useContext(RegistryContext);
+  const db = Obj.getDatabase(object);
+  const isView = object.spec.kind === 'view';
+  const [view, updateView] = useObject(object.spec.kind === 'view' ? object.spec.view : undefined);
+  const [, updateKanban] = useObject(object);
+  const currentTypeUri = view?.query ? getTypeURIFromQuery(view.query.ast) : undefined;
+  const schema = useType(db, currentTypeUri);
+  const projection = useProjectionModel(schema, object, registry);
+
+  const fieldProjections = projection?.getFieldProjections() ?? [];
+  const selectFields = useMemo(
+    () =>
+      fieldProjections
+        .filter((field) => field.props.format === Format.TypeFormat.SingleSelect)
+        .map(({ field }) => ({ value: field.id, label: field.path })),
+    [fieldProjections],
+  );
+
+  const hideUncategorized = object.arrangement.columns[UNCATEGORIZED_VALUE]?.hidden ?? false;
+
+  const handleValuesChanged = useCallback(
+    (values: Partial<{ columnFieldId: string; hideUncategorized: boolean }>) => {
+      if (isView && values.columnFieldId != null) {
+        updateView((view) => {
+          view.projection.pivotFieldId = values.columnFieldId!;
+        });
+      }
+      if (values.hideUncategorized !== undefined) {
+        updateKanban((kanban) => {
+          const existing = kanban.arrangement.columns[UNCATEGORIZED_VALUE];
+          if (existing) {
+            existing.hidden = values.hideUncategorized;
+          } else {
+            kanban.arrangement.columns[UNCATEGORIZED_VALUE] = {
+              ids: [],
+              hidden: values.hideUncategorized,
+            };
+          }
+        });
+      }
+    },
+    [isView, updateView, updateKanban],
+  );
+
+  const initialValues = useMemo(
+    () => ({
+      ...(isView ? { columnFieldId: view?.projection.pivotFieldId } : {}),
+      hideUncategorized,
+    }),
+    [isView, view?.projection.pivotFieldId, hideUncategorized],
+  );
+
+  const fieldMap: FormFieldMap = useMemo(
+    () => ({ columnFieldId: (props) => <SelectField {...props} options={selectFields} /> }),
+    [selectFields],
+  );
+
+  // Schema is picked by `kanban.spec.kind` — they have different shapes,
+  // so cast for `Form.Root`'s single-schema prop.
+  const settingsSchema = (isView ? KanbanViewSettingsSchema : KanbanSettingsSchema) as any;
+
+  return (
+    <Form.Root schema={settingsSchema} values={initialValues} fieldMap={fieldMap} onValuesChanged={handleValuesChanged}>
+      <Form.FieldSet />
+    </Form.Root>
+  );
+};

package/src/containers/KanbanSettings/index.ts

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

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 KanbanViewEditor: ComponentType<any> = lazy(() => import('./KanbanViewEditor'));
+export const KanbanArticle: ComponentType<any> = lazy(() => import('./KanbanArticle'));
+export const KanbanSettings: ComponentType<any> = lazy(() => import('./KanbanSettings'));

package/src/hooks/index.ts

@@ -3,6 +3,7 @@
 //
 
 export * from './useEchoChangeCallback';
+export * from './useItemsProjection';
 export * from './useKanbanBoardModel';
 export * from './useKanbanColumnEventHandler';
 export * from './useKanbanItemEventHandler';

package/src/hooks/useEchoChangeCallback.ts

@@ -13,9 +13,9 @@ import { type Kanban, type KanbanChangeCallback } from '#types';
  * Use this when the kanban and items are stored in the ECHO database.
  */
 export const createEchoChangeCallback = <T extends Obj.Unknown>(kanban: Kanban.Kanban): KanbanChangeCallback<T> => ({
-  kanban: (mutate) => Obj.change(kanban, (kanban) => mutate(kanban)),
+  kanban: (mutate) => Obj.update(kanban, (kanban) => mutate(kanban)),
   setItemField: (item, field, value) => {
-    Obj.change(item, (item: any) => {
+    Obj.update(item, (item: any) => {
       item[field] = value;
     });
   },

package/src/hooks/useItemsProjection.ts

@@ -0,0 +1,44 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { Atom } from '@effect-atom/atom-react';
+import { useMemo } from 'react';
+
+import type { ProjectionModel } from '@dxos/schema';
+
+import { type Kanban } from '#types';
+
+/**
+ * Minimal `ProjectionModel` for `spec.kind === 'items'` (no View). Supplies `pivotField`
+ * and column options from `arrangement.columns` keys—written by sync so columns exist
+ * before refs hydrate. Stubs `getFieldProjections` / `getHiddenProperties` for shared
+ * board/card UI; hides the pivot on the card body (column shows it); Expando cards render title only.
+ */
+export const useItemsProjection = (kanban: Kanban.KanbanItems): ProjectionModel => {
+  return useMemo(() => {
+    const pivotField = kanban.spec.pivotField;
+
+    const optionIds = Object.keys(kanban.arrangement?.columns ?? {});
+    const options = optionIds.map((id) => ({ id, title: id, color: 'neutral' as const }));
+
+    const fieldProjection: any = {
+      field: { id: pivotField, path: pivotField },
+      props: { property: pivotField, options },
+    };
+
+    const fields = Atom.make(() => [fieldProjection.field]);
+
+    const stub: Pick<ProjectionModel, 'tryGetFieldProjection' | 'getFieldProjections' | 'getHiddenProperties'> & {
+      fields: typeof fields;
+    } = {
+      fields,
+      tryGetFieldProjection: (id: string) => (id === pivotField ? fieldProjection : undefined),
+      getFieldProjections: () => [],
+      getHiddenProperties: () => [pivotField],
+    };
+
+    // TODO(wittjosiah): Refactor ProjectionModel to be an interface that we can fulfill.
+    return stub as unknown as ProjectionModel;
+  }, [kanban.arrangement?.columns, kanban.spec.pivotField]);
+};

package/src/hooks/{useKanbanBoardModel.test.ts → useKanbanBoardModel.browser.test.ts}

@@ -7,10 +7,10 @@ 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 { Format, FormatAnnotation, PropertyMetaAnnotationId } from '@dxos/echo/internal';
-import { ObjectId } from '@dxos/keys';
+import { DXN, Filter, JsonSchema, Obj, Query, Type, type View } from '@dxos/echo';
+import { Format, FormatAnnotation } from '@dxos/echo/Format';
+import { PropertyMetaAnnotationId } from '@dxos/echo/internal';
+import { EntityId } from '@dxos/keys';
 import { ProjectionModel, ViewModel, createDirectChangeCallback } from '@dxos/schema';
 
 import { Kanban } from '#types';
@@ -36,14 +36,9 @@ const KanbanTaskSchema = Schema.Struct({
     }),
     Schema.optional,
   ),
-}).pipe(
-  Type.object({
-    typename: 'com.example.type.kanban-task',
-    version: '0.1.0',
-  }),
-);
+}).pipe(Type.makeObject(DXN.make('com.example.type.kanbanTask', '0.1.0')));
 
-type KanbanTask = Schema.Schema.Type<typeof KanbanTaskSchema>;
+type KanbanTask = Type.InstanceType<typeof KanbanTaskSchema>;
 
 describe('useKanbanBoardModel', () => {
   let registry: Registry.Registry;
@@ -146,7 +141,7 @@ describe('useKanbanBoardModel', () => {
     expect(orderBefore).toEqual(['__uncategorized__', 'a', 'b']);
 
     act(() => {
-      Obj.change(kanban, (kanban) => {
+      Obj.update(kanban, (kanban) => {
         kanban.arrangement.order = ['b', 'a'];
       });
     });
@@ -160,15 +155,15 @@ describe('useKanbanBoardModel', () => {
 
   test('getItems returns items in column ordered by arrangement ids', ({ expect }) => {
     const item1 = Obj.make(KanbanTaskSchema, {
-      id: ObjectId.random(),
+      id: EntityId.random(),
       status: 'a',
     });
     const item2 = Obj.make(KanbanTaskSchema, {
-      id: ObjectId.random(),
+      id: EntityId.random(),
       status: 'a',
     });
     const item3 = Obj.make(KanbanTaskSchema, {
-      id: ObjectId.random(),
+      id: EntityId.random(),
       status: 'a',
     });
     const items: KanbanTask[] = [item1, item2, item3];
@@ -187,7 +182,7 @@ describe('useKanbanBoardModel', () => {
     });
 
     act(() => {
-      Obj.change(kanban, (kanban) => {
+      Obj.update(kanban, (kanban) => {
         kanban.arrangement.columns['a'] = {
           ids: [item3.id, item1.id, item2.id],
         };
@@ -201,11 +196,11 @@ describe('useKanbanBoardModel', () => {
 
   test('subscribing to one column items atom does not fire when another column changes', ({ expect }) => {
     const itemA = Obj.make(KanbanTaskSchema, {
-      id: ObjectId.random(),
+      id: EntityId.random(),
       status: 'a',
     });
     const itemB = Obj.make(KanbanTaskSchema, {
-      id: ObjectId.random(),
+      id: EntityId.random(),
       status: 'b',
     });
     const items: KanbanTask[] = [itemA, itemB];
@@ -225,7 +220,7 @@ describe('useKanbanBoardModel', () => {
     });
 
     act(() => {
-      Obj.change(kanban, (kanban) => {
+      Obj.update(kanban, (kanban) => {
         kanban.arrangement.columns['b'] = { ids: [itemB.id] };
       });
     });

package/src/hooks/useKanbanBoardModel.ts

@@ -6,7 +6,6 @@ import { Atom, type Registry } from '@effect-atom/atom-react';
 import { useMemo } from 'react';
 
 import { Obj } from '@dxos/echo';
-import { AtomObj } from '@dxos/echo-atom';
 import type { BoardModel } from '@dxos/react-ui-mosaic';
 import type { ProjectionModel } from '@dxos/schema';
 
@@ -36,16 +35,29 @@ export function useKanbanBoardModel<T extends BaseKanbanItem = BaseKanbanItem>(
   registry: Registry.Registry,
 ): BoardModel<ColumnStructure, T> {
   // Source atoms: reactive reads from the kanban object; items come from the passed-in atom (e.g. AtomQuery or in-memory).
-  const arrangementAtom = useMemo(() => AtomObj.makeProperty(kanban, 'arrangement'), [kanban]);
+  const arrangementAtom = useMemo(() => Obj.atomProperty(kanban, 'arrangement'), [kanban]);
   const viewSnapshotAtom = useMemo(
-    () => (kanban?.view ? AtomObj.make(kanban.view) : Atom.make<undefined>(() => undefined)),
-    [kanban?.view],
+    () =>
+      kanban?.spec?.kind === 'view' && kanban.spec.view
+        ? Obj.atom(kanban.spec.view)
+        : Atom.make<undefined>(() => undefined),
+    [kanban?.spec],
   );
 
-  /** Only changes when view.projection.pivotFieldId changes; keeps columns from firing on other view updates. */
+  /**
+   * Only changes when the discriminator-relevant pivot input changes.
+   * View-variant: derived from `view.projection.pivotFieldId`.
+   * Items-variant: the kanban's `spec.pivotField` (the property name itself acts as the field id).
+   */
   const pivotFieldIdAtom = useMemo(
-    () => Atom.make((get) => get(viewSnapshotAtom)?.projection?.pivotFieldId as string | undefined),
-    [viewSnapshotAtom],
+    () =>
+      Atom.make((get) => {
+        if (kanban?.spec.kind === 'items') {
+          return kanban.spec.pivotField;
+        }
+        return get(viewSnapshotAtom)?.projection?.pivotFieldId as string | undefined;
+      }),
+    [kanban?.spec, viewSnapshotAtom],
   );
 
   // Effective per-column ids: from kanban.arrangement.columns; empty when arrangement has no columns.

package/src/hooks/useProjectionModel.ts

@@ -30,17 +30,17 @@ export const useProjectionModel = <S extends Type.AnyEntity>(
 
   useAsyncEffect(
     async (controller) => {
-      if (!schema || !kanban) {
+      if (!schema || !kanban || kanban.spec.kind !== 'view') {
         return;
       }
       try {
-        const view = await kanban.view.load();
+        const view = await kanban.spec.view.load();
         if (controller.signal.aborted) {
           return;
         }
 
-        const jsonSchema = Type.isMutable(schema) ? schema.jsonSchema : JsonSchema.toJsonSchema(schema);
-        const change = createEchoChangeCallback(view, Type.isMutable(schema) ? schema : undefined);
+        const jsonSchema = Type.getDatabase(schema) != null ? schema.jsonSchema : JsonSchema.toJsonSchema(schema);
+        const change = createEchoChangeCallback(view, Type.getDatabase(schema) != null ? schema : undefined);
 
         const projection = new ProjectionModel({ registry, view, baseSchema: jsonSchema, change });
         projection.normalizeView();

package/src/index.ts

@@ -2,6 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
+export * from './blueprints';
 export * from './meta';
-
-export * from './KanbanPlugin';
+export * from './operations';
+export * from './types';

package/src/meta.ts

@@ -2,18 +2,35 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type Plugin } from '@dxos/app-framework';
+import { Plugin } from '@dxos/app-framework';
+import { DXN } from '@dxos/echo';
 import { trim } from '@dxos/util';
 
-export const meta: Plugin.Meta = {
-  id: 'org.dxos.plugin.kanban',
+export const meta = Plugin.makeMeta({
+  key: DXN.make('org.dxos.plugin.kanban'),
   name: 'Kanban',
+  author: 'DXOS',
   description: trim`
     Visual project management using customizable kanban boards to track workflow progress.
-    Organize table data into columns, drag and drop items between stages, and trigger automations based on status changes.
+    Organize any ECHO type into drag-and-drop columns defined by a single-select field, move cards
+    between stages, and reorder both columns and cards — all changes are persisted to ECHO and
+    replicated to collaborators in real time.
+
+    Kanban boards come in two variants: view-variant boards source their cards through a linked
+    View query (any ECHO type can be pivoted on a single-select field), while items-variant boards
+    own their cards explicitly and are used by external sync integrations such as Linear or GitHub.
+    Both variants share the same arrangement storage and drag-and-drop mechanics.
+
+    Board settings let users choose which single-select field drives the column layout and
+    optionally hide the uncategorized column for items that have no pivot value.
+    Field-level undo support allows deleted card fields to be restored without data loss.
+
+    The plugin contributes a Kanban blueprint that exposes board creation and card management
+    to AI agents, enabling automated project tracking workflows.
   `,
   icon: 'ph--kanban--regular',
   iconHue: 'green',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-kanban',
+  spec: 'PLUGIN.mdl',
   screenshots: ['https://dxos.network/plugin-details-kanban-dark.png'],
-};
+});

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

@@ -3,34 +3,29 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import { JsonSchema, Obj } from '@dxos/echo';
-import { type EchoSchema } from '@dxos/echo/internal';
+import { Operation } from '@dxos/compute';
+import { Obj, Type } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
-import { ProjectionModel, createEchoChangeCallback, getTypenameFromQuery } from '@dxos/schema';
+import { ProjectionModel, createEchoChangeCallback, getTypeURIFromQuery } 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);
       const db = Obj.getDatabase(view);
       invariant(db, 'Database not found');
-      const schema = yield* Effect.promise(() =>
-        db.schemaRegistry
-          .query({
-            typename: getTypenameFromQuery(view.query.ast)!,
-            location: ['database', 'runtime'],
-          })
-          .first(),
-      );
+      const types = yield* Effect.sync(() => db.graph.registry.list().filter(Type.isType));
+      const schema = types.find((t) => Type.getURI(t) === getTypeURIFromQuery(view.query.ast));
+      invariant(schema, 'Schema not found');
 
+      invariant(Type.isType(schema), 'expected stored Type.Type for card schema');
       const projection = new ProjectionModel({
         registry,
         view,
-        baseSchema: JsonSchema.toJsonSchema(schema),
-        change: createEchoChangeCallback(view, schema as EchoSchema),
+        baseSchema: schema.jsonSchema,
+        change: createEchoChangeCallback(view, schema),
       });
 
       const result = projection.deleteFieldProjection(fieldId);

package/src/operations/delete-card.ts

@@ -2,13 +2,13 @@
 
 import * as Effect from 'effect/Effect';
 
+import { Operation } from '@dxos/compute';
 import { Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
 
-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

@@ -1,8 +1,6 @@
 // Copyright 2025 DXOS.org
 
-import { OperationHandlerSet } from '@dxos/operation';
-
-export * as KanbanOperation from './definitions';
+import { OperationHandlerSet } from '@dxos/compute';
 
 export const KanbanOperationHandlerSet = OperationHandlerSet.lazy(
   () => import('./delete-card'),