@dxos/plugin-kanban 0.8.4-main.28f8d3d → 0.8.4-main.406dc2a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-kanban",
-  "version": "0.8.4-main.28f8d3d",
+  "version": "0.8.4-main.406dc2a",
   "description": "Kanban DXOS Surface plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -36,50 +36,50 @@
   ],
   "dependencies": {
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
-    "effect": "3.17.7",
-    "@dxos/ai": "0.8.4-main.28f8d3d",
-    "@dxos/assistant": "0.8.4-main.28f8d3d",
-    "@dxos/app-framework": "0.8.4-main.28f8d3d",
-    "@dxos/async": "0.8.4-main.28f8d3d",
-    "@dxos/blueprints": "0.8.4-main.28f8d3d",
-    "@dxos/echo": "0.8.4-main.28f8d3d",
-    "@dxos/effect": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-client": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-graph": "0.8.4-main.28f8d3d",
-    "@dxos/invariant": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-search": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-space": "0.8.4-main.28f8d3d",
-    "@dxos/log": "0.8.4-main.28f8d3d",
-    "@dxos/random": "0.8.4-main.28f8d3d",
-    "@dxos/react-client": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui": "0.8.4-main.28f8d3d",
-    "@dxos/echo-schema": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-kanban": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-form": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-stack": "0.8.4-main.28f8d3d",
-    "@dxos/util": "0.8.4-main.28f8d3d",
-    "@dxos/schema": "0.8.4-main.28f8d3d"
+    "@preact/signals-core": "^1.12.1",
+    "effect": "3.18.3",
+    "@dxos/ai": "0.8.4-main.406dc2a",
+    "@dxos/app-framework": "0.8.4-main.406dc2a",
+    "@dxos/assistant": "0.8.4-main.406dc2a",
+    "@dxos/async": "0.8.4-main.406dc2a",
+    "@dxos/effect": "0.8.4-main.406dc2a",
+    "@dxos/echo": "0.8.4-main.406dc2a",
+    "@dxos/functions": "0.8.4-main.406dc2a",
+    "@dxos/blueprints": "0.8.4-main.406dc2a",
+    "@dxos/invariant": "0.8.4-main.406dc2a",
+    "@dxos/log": "0.8.4-main.406dc2a",
+    "@dxos/plugin-client": "0.8.4-main.406dc2a",
+    "@dxos/plugin-graph": "0.8.4-main.406dc2a",
+    "@dxos/plugin-search": "0.8.4-main.406dc2a",
+    "@dxos/random": "0.8.4-main.406dc2a",
+    "@dxos/react-client": "0.8.4-main.406dc2a",
+    "@dxos/plugin-space": "0.8.4-main.406dc2a",
+    "@dxos/react-ui": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-kanban": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-stack": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-form": "0.8.4-main.406dc2a",
+    "@dxos/schema": "0.8.4-main.406dc2a",
+    "@dxos/util": "0.8.4-main.406dc2a"
   },
   "devDependencies": {
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/plugin-theme": "0.8.4-main.28f8d3d",
-    "@dxos/plugin-preview": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-theme": "0.8.4-main.28f8d3d",
-    "@dxos/storybook-utils": "0.8.4-main.28f8d3d",
-    "@dxos/test-utils": "0.8.4-main.28f8d3d"
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.1",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/plugin-theme": "0.8.4-main.406dc2a",
+    "@dxos/plugin-preview": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-theme": "0.8.4-main.406dc2a",
+    "@dxos/storybook-utils": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.406dc2a",
+    "@dxos/test-utils": "0.8.4-main.406dc2a"
   },
   "peerDependencies": {
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.28f8d3d",
-    "@dxos/react-ui-theme": "0.8.4-main.28f8d3d"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-theme": "0.8.4-main.406dc2a"
   },
   "publishConfig": {
     "access": "public"

package/src/KanbanPlugin.tsx

@@ -6,53 +6,58 @@ import { Capabilities, Events, contributes, createIntent, defineModule, definePl
 import { ClientEvents } from '@dxos/plugin-client';
 import { SpaceCapabilities } from '@dxos/plugin-space';
 import { defineObjectForm } from '@dxos/plugin-space/types';
-import { KanbanView, translations as kanbanTranslations } from '@dxos/react-ui-kanban';
+import { translations as kanbanTranslations } from '@dxos/react-ui-kanban';
+import { Kanban } from '@dxos/react-ui-kanban/types';
 
-import { IntentResolver, ReactSurface } from './capabilities';
+import { BlueprintDefinition, IntentResolver, ReactSurface } from './capabilities';
 import { meta } from './meta';
 import { translations } from './translations';
 import { CreateKanbanSchema, KanbanAction } from './types';
 
-export const KanbanPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, [...translations, ...kanbanTranslations]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/metadata`,
-      activatesOn: Events.SetupMetadata,
-      activate: () =>
-        contributes(Capabilities.Metadata, {
-          id: KanbanView.typename,
-          metadata: {
-            icon: 'ph--kanban--regular',
-          },
+export const KanbanPlugin = definePlugin(meta, () => [
+  defineModule({
+    id: `${meta.id}/module/translations`,
+    activatesOn: Events.SetupTranslations,
+    activate: () => contributes(Capabilities.Translations, [...translations, ...kanbanTranslations]),
+  }),
+  defineModule({
+    id: `${meta.id}/module/metadata`,
+    activatesOn: Events.SetupMetadata,
+    activate: () =>
+      contributes(Capabilities.Metadata, {
+        id: Kanban.Kanban.typename,
+        metadata: {
+          icon: 'ph--kanban--regular',
+        },
+      }),
+  }),
+  defineModule({
+    id: `${meta.id}/module/object-form`,
+    activatesOn: ClientEvents.SetupSchema,
+    activate: () =>
+      contributes(
+        SpaceCapabilities.ObjectForm,
+        defineObjectForm({
+          objectSchema: Kanban.Kanban,
+          formSchema: CreateKanbanSchema,
+          hidden: true,
+          getIntent: (props, options) => createIntent(KanbanAction.Create, { ...props, space: options.space }),
         }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/object-form`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: KanbanView,
-            formSchema: CreateKanbanSchema,
-            hidden: true,
-            getIntent: (props, options) => createIntent(KanbanAction.Create, { ...props, space: options.space }),
-          }),
-        ),
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: IntentResolver,
-    }),
-  ]);
+      ),
+  }),
+  defineModule({
+    id: `${meta.id}/module/react-surface`,
+    activatesOn: Events.SetupReactSurface,
+    activate: ReactSurface,
+  }),
+  defineModule({
+    id: `${meta.id}/module/intent-resolver`,
+    activatesOn: Events.SetupIntentResolver,
+    activate: IntentResolver,
+  }),
+  defineModule({
+    id: `${meta.id}/module/blueprint`,
+    activatesOn: Events.SetupArtifactDefinition,
+    activate: BlueprintDefinition,
+  }),
+]);

package/src/capabilities/artifact-definition.ts

@@ -5,7 +5,8 @@
 // ISSUE(burdon): defineArtifact
 // @ts-nocheck
 
-import { Schema, pipe } from 'effect';
+import * as Function from 'effect/Function';
+import * as Schema from 'effect/Schema';
 
 import { ToolResult, createTool } from '@dxos/ai';
 import { Capabilities, type PromiseIntentDispatcher, chain, contributes, createIntent } from '@dxos/app-framework';
@@ -68,7 +69,7 @@ export default () => {
             return ToolResult.Error(`Schema not found: ${typename}`);
           }
 
-          const intent = pipe(
+          const intent = Function.pipe(
             createIntent(KanbanAction.Create, {
               space: extensions.space,
               typename,

package/src/capabilities/blueprint-definition.ts

@@ -0,0 +1,30 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capabilities, contributes } from '@dxos/app-framework';
+import { Blueprint, Template } from '@dxos/blueprints';
+import { type FunctionDefinition } from '@dxos/functions';
+import { trim } from '@dxos/util';
+
+const functions: FunctionDefinition[] = [];
+const tools: string[] = [];
+
+export default () => {
+  return [
+    contributes(Capabilities.Functions, functions),
+    contributes(
+      Capabilities.BlueprintDefinition,
+      Blueprint.make({
+        key: 'dxos.org/blueprint/kanban',
+        name: 'Kanban',
+        tools: Blueprint.toolDefinitions({ functions, tools }),
+        instructions: Template.make({
+          source: trim`
+            You can create and update kanban boards to show data in sorted columns defined by schema.
+          `,
+        }),
+      }),
+    ),
+  ];
+};

package/src/capabilities/index.ts

@@ -4,5 +4,6 @@
 
 import { lazy } from '@dxos/app-framework';
 
+export const BlueprintDefinition = lazy(() => import('./blueprint-definition'));
 export const IntentResolver = lazy(() => import('./intent-resolver'));
 export const ReactSurface = lazy(() => import('./react-surface'));

package/src/capabilities/intent-resolver.ts

@@ -6,10 +6,11 @@ import { Capabilities, type PluginContext, contributes, createResolver } from '@
 import { invariant } from '@dxos/invariant';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { getSpace } from '@dxos/react-client/echo';
-import { ProjectionModel } from '@dxos/schema';
+import { Kanban } from '@dxos/react-ui-kanban/types';
+import { ProjectionModel, getTypenameFromQuery } from '@dxos/schema';
 
-import { KANBAN_PLUGIN } from '../meta';
-import { KanbanAction, createKanban } from '../types';
+import { meta } from '../meta';
+import { KanbanAction } from '../types';
 
 export default (context: PluginContext) =>
   contributes(Capabilities.IntentResolver, [
@@ -17,12 +18,12 @@ export default (context: PluginContext) =>
       intent: KanbanAction.Create,
       resolve: async ({ space, name, typename, initialPivotColumn }) => {
         const client = context.getCapability(ClientCapabilities.Client);
-        const { view } = await createKanban({
+        const { view } = await Kanban.makeView({
           client,
           space,
           name,
           typename,
-          initialPivotColumn,
+          pivotFieldName: initialPivotColumn,
         });
         return { data: { object: view } };
       },
@@ -30,7 +31,7 @@ export default (context: PluginContext) =>
     createResolver({
       intent: KanbanAction.DeleteCardField,
       resolve: async ({ view, fieldId, deletionData }, undo) => {
-        const schema = getSpace(view)?.db.schemaRegistry.getSchema(view.query.typename!);
+        const schema = getSpace(view)?.db.schemaRegistry.getSchema(getTypenameFromQuery(view.query.ast)!);
         invariant(schema);
         const projection = new ProjectionModel(schema.jsonSchema, view.projection);
 
@@ -38,7 +39,7 @@ export default (context: PluginContext) =>
           const { deleted, index } = projection.deleteFieldProjection(fieldId);
           return {
             undoable: {
-              message: ['card field deleted label', { ns: KANBAN_PLUGIN }],
+              message: ['card field deleted label', { ns: meta.id }],
               data: { deletionData: { ...deleted, index } },
             },
           };
@@ -58,7 +59,7 @@ export default (context: PluginContext) =>
           space.db.remove(card);
           return {
             undoable: {
-              message: ['card deleted label', { ns: KANBAN_PLUGIN }],
+              message: ['card deleted label', { ns: meta.id }],
               data: { card },
             },
           };

package/src/capabilities/react-surface.tsx

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Schema } from 'effect';
+import type * as Schema from 'effect/Schema';
 import React, { useMemo } from 'react';
 
 import { Capabilities, contributes, createSurface, useCapabilities } from '@dxos/app-framework';
@@ -11,7 +11,7 @@ import { findAnnotation } from '@dxos/effect';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { type Space, getSpace, isSpace } from '@dxos/react-client/echo';
 import { type InputProps, SelectInput, useFormValues } from '@dxos/react-ui-form';
-import { KanbanView } from '@dxos/react-ui-kanban';
+import { Kanban } from '@dxos/react-ui-kanban/types';
 import { DataType } from '@dxos/schema';
 
 import { KanbanContainer, KanbanViewEditor } from '../components';
@@ -24,7 +24,7 @@ export default () =>
       id: meta.id,
       role: ['article', 'section'],
       filter: (data): data is { subject: DataType.View } =>
-        Obj.instanceOf(DataType.View, data.subject) && Obj.instanceOf(KanbanView, data.subject.presentation.target),
+        Obj.instanceOf(DataType.View, data.subject) && Obj.instanceOf(Kanban.Kanban, data.subject.presentation.target),
       component: ({ data, role }) => <KanbanContainer view={data.subject} role={role} />,
     }),
     createSurface({
@@ -32,7 +32,7 @@ export default () =>
       role: 'object-settings',
       position: 'hoist',
       filter: (data): data is { subject: DataType.View } =>
-        Obj.instanceOf(DataType.View, data.subject) && Obj.instanceOf(KanbanView, data.subject.presentation.target),
+        Obj.instanceOf(DataType.View, data.subject) && Obj.instanceOf(Kanban.Kanban, data.subject.presentation.target),
       component: ({ data }) => <KanbanViewEditor view={data.subject} />,
     }),
     createSurface({

package/src/components/KanbanContainer.stories.tsx

@@ -2,14 +2,12 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useCallback, useEffect, useState } from 'react';
 
 import { IntentPlugin, SettingsPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { Obj, Type } from '@dxos/echo';
+import { Obj, type QueryAST, Type } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { ClientPlugin } from '@dxos/plugin-client';
 import { PreviewPlugin } from '@dxos/plugin-preview';
@@ -20,15 +18,15 @@ import { ThemePlugin } from '@dxos/plugin-theme';
 import { faker } from '@dxos/random';
 import { useClient } from '@dxos/react-client';
 import { Filter, useQuery, useSchema, useSpaces } from '@dxos/react-client/echo';
+import { withTheme } from '@dxos/react-ui/testing';
 import { ViewEditor } from '@dxos/react-ui-form';
-import { Kanban, KanbanView, useKanbanModel } from '@dxos/react-ui-kanban';
+import { Kanban as KanbanComponent, useKanbanModel } from '@dxos/react-ui-kanban';
+import { Kanban } from '@dxos/react-ui-kanban/types';
 import { SyntaxHighlighter } from '@dxos/react-ui-syntax-highlighter';
 import { defaultTx } from '@dxos/react-ui-theme';
-import { DataType, ProjectionModel } from '@dxos/schema';
-import { withLayout } from '@dxos/storybook-utils';
+import { DataType, ProjectionModel, getTypenameFromQuery } from '@dxos/schema';
 
 import { translations } from '../translations';
-import { createKanban } from '../types';
 
 faker.seed(0);
 
@@ -51,7 +49,8 @@ const StorybookKanban = () => {
   const views = useQuery(space, Filter.type(DataType.View));
   const [view, setView] = useState<DataType.View>();
   const [projection, setProjection] = useState<ProjectionModel>();
-  const schema = useSchema(client, space, view?.query.typename);
+  const typename = view?.query ? getTypenameFromQuery(view.query.ast) : undefined;
+  const schema = useSchema(client, space, typename);
 
   useEffect(() => {
     if (views.length && !view) {
@@ -97,14 +96,14 @@ const StorybookKanban = () => {
 
   const handleRemoveCard = useCallback((card: { id: string }) => space.db.remove(card), [space]);
 
-  const handleTypenameChanged = useCallback(
-    (typename: string) => {
+  const handleUpdateQuery = useCallback(
+    (newQuery: QueryAST.Query) => {
       invariant(schema);
       invariant(Type.isMutable(schema));
       invariant(view);
 
-      schema.updateTypename(typename);
-      view.query.typename = typename;
+      schema.updateTypename(getTypenameFromQuery(newQuery));
+      view.query.ast = newQuery;
     },
     [view, schema],
   );
@@ -115,18 +114,18 @@ const StorybookKanban = () => {
 
   return (
     <div className='grow grid grid-cols-[1fr_350px]'>
-      {model ? <Kanban model={model} onAddCard={handleAddCard} onRemoveCard={handleRemoveCard} /> : <div />}
+      {model ? <KanbanComponent model={model} onAddCard={handleAddCard} onRemoveCard={handleRemoveCard} /> : <div />}
       <div className='flex flex-col bs-full border-is border-separator overflow-y-auto'>
         <ViewEditor
           registry={space?.db.schemaRegistry}
           schema={schema}
           view={view}
-          onTypenameChanged={handleTypenameChanged}
+          onQueryChanged={handleUpdateQuery}
           onDelete={(fieldId: string) => {
             console.log('[ViewEditor]', 'onDelete', fieldId);
           }}
         />
-        <SyntaxHighlighter language='json' className='w-full text-xs'>
+        <SyntaxHighlighter language='json' className='text-xs'>
           {JSON.stringify({ view, schema }, null, 2)}
         </SyntaxHighlighter>
       </div>
@@ -142,27 +141,25 @@ type StoryProps = {
 // Story definitions.
 //
 
-const meta: Meta<StoryProps> = {
+const meta = {
   title: 'plugins/plugin-kanban/Kanban',
   component: StorybookKanban,
   render: () => <StorybookKanban />,
-  parameters: { translations },
   decorators: [
-    withLayout({ fullscreen: true }),
+    withTheme,
     withPluginManager({
       plugins: [
-        ThemePlugin({ tx: defaultTx }),
         ClientPlugin({
-          types: [DataType.Organization, DataType.Person, DataType.View, KanbanView],
+          types: [DataType.Organization, DataType.Person, DataType.View, Kanban.Kanban],
           onClientInitialized: async ({ client }) => {
             await client.halo.createIdentity();
             const space = await client.spaces.create();
             await space.waitUntilReady();
-            const { view } = await createKanban({
+            const { view } = await Kanban.makeView({
               client,
               space,
               typename: DataType.Organization.typename,
-              initialPivotColumn: 'status',
+              pivotFieldName: 'status',
             });
             space.db.add(view);
 
@@ -172,18 +169,25 @@ const meta: Meta<StoryProps> = {
             });
           },
         }),
-        StorybookLayoutPlugin(),
-        PreviewPlugin(),
-        SpacePlugin(),
+        SpacePlugin({}),
         IntentPlugin(),
         SettingsPlugin(),
+
+        // UI
+        ThemePlugin({ tx: defaultTx }),
+        PreviewPlugin(),
+        StorybookLayoutPlugin({}),
       ],
     }),
   ],
-};
+  parameters: {
+    layout: 'fullscreen',
+    translations,
+  },
+} satisfies Meta<typeof StorybookKanban>;
 
 export default meta;
 
-type Story = StoryObj<StoryProps>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {};

package/src/components/KanbanContainer.tsx

@@ -6,13 +6,13 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
 import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
 import { Filter, Obj, Type } from '@dxos/echo';
-import { EchoSchema, type TypedObject } from '@dxos/echo-schema';
+import { EchoSchema, type TypedObject } from '@dxos/echo/internal';
 import { useGlobalFilteredObjects } from '@dxos/plugin-search';
 import { useClient } from '@dxos/react-client';
 import { getSpace, useQuery } from '@dxos/react-client/echo';
 import { Kanban, useKanbanModel } from '@dxos/react-ui-kanban';
 import { StackItem } from '@dxos/react-ui-stack';
-import { type DataType, ProjectionModel } from '@dxos/schema';
+import { type DataType, ProjectionModel, getTypenameFromQuery } from '@dxos/schema';
 
 import { KanbanAction } from '../types';
 
@@ -22,6 +22,7 @@ export const KanbanContainer = ({ view }: { view: DataType.View; role: string })
   const [projection, setProjection] = useState<ProjectionModel>();
   const space = getSpace(view);
   const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const typename = view.query ? getTypenameFromQuery(view.query.ast) : undefined;
 
   const jsonSchema = useMemo(() => {
     if (!cardSchema) {
@@ -31,7 +32,6 @@ export const KanbanContainer = ({ view }: { view: DataType.View; role: string })
   }, [cardSchema]);
 
   useEffect(() => {
-    const typename = view.query.typename;
     const staticSchema = client.graph.schemaRegistry.schemas.find((schema) => Type.getTypename(schema) === typename);
     if (staticSchema) {
       setCardSchema(() => staticSchema as TypedObject<any, any>);
@@ -49,7 +49,7 @@ export const KanbanContainer = ({ view }: { view: DataType.View; role: string })
       );
       return unsubscribe;
     }
-  }, [view.query.typename, space]);
+  }, [typename, space]);
 
   useEffect(() => {
     if (jsonSchema) {

package/src/components/KanbanViewEditor.tsx

@@ -5,26 +5,27 @@
 import React, { useCallback, useMemo } from 'react';
 
 import { Type } from '@dxos/echo';
-import { EchoSchema, FormatEnum } from '@dxos/echo-schema';
+import { EchoSchema, FormatEnum } from '@dxos/echo/internal';
 import { useClient } from '@dxos/react-client';
 import { getSpace, useSchema } from '@dxos/react-client/echo';
 import { type CustomInputMap, Form, SelectInput } from '@dxos/react-ui-form';
-import { KanbanSettingsSchema, type KanbanView } from '@dxos/react-ui-kanban';
-import { type DataType, ProjectionModel } from '@dxos/schema';
+import { Kanban } from '@dxos/react-ui-kanban/types';
+import { type DataType, ProjectionModel, getTypenameFromQuery } from '@dxos/schema';
 
 type KanbanViewEditorProps = { view: DataType.View };
 
 export const KanbanViewEditor = ({ view }: KanbanViewEditorProps) => {
   const client = useClient();
   const space = getSpace(view);
-  const kanban = view.presentation.target as KanbanView;
-  const currentTypename = useMemo(() => view.query.typename, [view.query.typename]);
+  const currentTypename = view.query ? getTypenameFromQuery(view.query.ast) : undefined;
   const schema = useSchema(client, space, currentTypename);
 
   const projection = useMemo(() => {
     if (schema) {
       const jsonSchema = schema instanceof EchoSchema ? schema.jsonSchema : Type.toJsonSchema(schema);
-      return new ProjectionModel(jsonSchema, view.projection);
+      const projection = new ProjectionModel(jsonSchema, view.projection);
+      projection.normalizeView();
+      return projection;
     }
   }, [view.projection, JSON.stringify(schema)]);
 
@@ -35,12 +36,15 @@ export const KanbanViewEditor = ({ view }: KanbanViewEditorProps) => {
 
   const handleSave = useCallback(
     (values: Partial<{ columnFieldId: string }>) => {
-      kanban.columnFieldId = values.columnFieldId;
+      view.projection.pivotFieldId = values.columnFieldId;
     },
-    [kanban],
+    [view],
   );
 
-  const initialValues = useMemo(() => ({ columnFieldId: kanban.columnFieldId }), [kanban.columnFieldId]);
+  const initialValues = useMemo(
+    () => ({ columnFieldId: view.projection.pivotFieldId }),
+    [view.projection.pivotFieldId],
+  );
   const custom: CustomInputMap = useMemo(
     () => ({ columnFieldId: (props) => <SelectInput {...props} options={selectFields} /> }),
     [selectFields],
@@ -49,7 +53,7 @@ export const KanbanViewEditor = ({ view }: KanbanViewEditorProps) => {
   return (
     <Form
       Custom={custom}
-      schema={KanbanSettingsSchema}
+      schema={Kanban.SettingsSchema}
       values={initialValues}
       onSave={handleSave}
       autoSave

package/src/meta.ts

@@ -4,10 +4,8 @@
 
 import { type PluginMeta } from '@dxos/app-framework';
 
-export const KANBAN_PLUGIN = 'dxos.org/plugin/kanban';
-
 export const meta: PluginMeta = {
-  id: KANBAN_PLUGIN,
+  id: 'dxos.org/plugin/kanban',
   name: 'Kanban',
   description:
     'Kanban allows you to explore Table data in sorted columns defined by your custom schema. You can use Kanbans to track progress or trigger custom automations when cards are moved from one state to another.',

package/src/translations.ts

@@ -3,14 +3,14 @@
 //
 
 import { type Resource } from '@dxos/react-ui';
-import { KanbanView } from '@dxos/react-ui-kanban';
+import { Kanban } from '@dxos/react-ui-kanban/types';
 
 import { meta } from './meta';
 
 export const translations = [
   {
     'en-US': {
-      [KanbanView.typename]: {
+      [Kanban.Kanban.typename]: {
         'typename label': 'Kanban',
         'typename label_zero': 'Kanbans',
         'typename label_one': 'Kanban',

package/src/types/index.ts

@@ -2,6 +2,5 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './kanban';
 export * from './schema';
 export type * from './types';