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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-kanban",
-  "version": "0.8.4-main.9735255",
+  "version": "0.8.4-main.abd8ff62ef",
   "description": "Kanban DXOS Surface plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,90 +12,112 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#blueprints": "./src/blueprints/index.ts",
+    "#capabilities": "./src/capabilities/index.ts",
+    "#components": "./src/components/index.ts",
+    "#containers": "./src/containers/index.ts",
+    "#hooks": "./src/hooks/index.ts",
+    "#meta": "./src/meta.ts",
+    "#operations": "./src/operations/index.ts",
+    "#plugin": {
+      "browser": "./src/KanbanPlugin.tsx",
+      "node": "./src/KanbanPlugin.node.ts",
+      "default": "./src/KanbanPlugin.tsx"
+    },
+    "#testing": "./src/testing/index.ts",
+    "#translations": "./src/translations.ts",
+    "#types": "./src/types/index.ts"
+  },
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs",
-      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts"
     },
     "./blueprints": {
+      "source": "./src/blueprints/index.ts",
       "browser": "./dist/lib/browser/blueprints/index.mjs",
       "node": "./dist/lib/node-esm/blueprints/index.mjs",
-      "source": "./src/blueprints/index.ts",
       "types": "./dist/types/src/blueprints/index.d.ts"
     },
+    "./operations": {
+      "source": "./src/operations/index.ts",
+      "browser": "./dist/lib/browser/operations/index.mjs",
+      "node": "./dist/lib/node-esm/operations/index.mjs",
+      "types": "./dist/types/src/operations/index.d.ts"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.mjs"
+    },
     "./types": {
+      "source": "./src/types/index.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
       "node": "./dist/lib/node-esm/types/index.mjs",
-      "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "blueprints": [
-        "dist/types/src/blueprints/index.d.ts"
-      ],
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "effect": "3.19.11",
-    "@dxos/ai": "0.8.4-main.9735255",
-    "@dxos/app-framework": "0.8.4-main.9735255",
-    "@dxos/assistant": "0.8.4-main.9735255",
-    "@dxos/blueprints": "0.8.4-main.9735255",
-    "@dxos/echo": "0.8.4-main.9735255",
-    "@dxos/async": "0.8.4-main.9735255",
-    "@dxos/effect": "0.8.4-main.9735255",
-    "@dxos/invariant": "0.8.4-main.9735255",
-    "@dxos/functions": "0.8.4-main.9735255",
-    "@dxos/log": "0.8.4-main.9735255",
-    "@dxos/operation": "0.8.4-main.9735255",
-    "@dxos/plugin-client": "0.8.4-main.9735255",
-    "@dxos/plugin-search": "0.8.4-main.9735255",
-    "@dxos/plugin-graph": "0.8.4-main.9735255",
-    "@dxos/plugin-space": "0.8.4-main.9735255",
-    "@dxos/react-client": "0.8.4-main.9735255",
-    "@dxos/random": "0.8.4-main.9735255",
-    "@dxos/react-ui-mosaic": "0.8.4-main.9735255",
-    "@dxos/react-ui": "0.8.4-main.9735255",
-    "@dxos/react-ui-form": "0.8.4-main.9735255",
-    "@dxos/react-ui-stack": "0.8.4-main.9735255",
-    "@dxos/types": "0.8.4-main.9735255",
-    "@dxos/schema": "0.8.4-main.9735255",
-    "@dxos/util": "0.8.4-main.9735255",
-    "@dxos/react-ui-kanban": "0.8.4-main.9735255"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@radix-ui/react-context": "1.1.1",
+    "effect": "3.20.0",
+    "@dxos/ai": "0.8.4-main.abd8ff62ef",
+    "@dxos/app-framework": "0.8.4-main.abd8ff62ef",
+    "@dxos/async": "0.8.4-main.abd8ff62ef",
+    "@dxos/compute": "0.8.4-main.abd8ff62ef",
+    "@dxos/app-toolkit": "0.8.4-main.abd8ff62ef",
+    "@dxos/assistant": "0.8.4-main.abd8ff62ef",
+    "@dxos/echo": "0.8.4-main.abd8ff62ef",
+    "@dxos/echo-atom": "0.8.4-main.abd8ff62ef",
+    "@dxos/effect": "0.8.4-main.abd8ff62ef",
+    "@dxos/log": "0.8.4-main.abd8ff62ef",
+    "@dxos/invariant": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-client": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-search": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-graph": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-space": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui": "0.8.4-main.abd8ff62ef",
+    "@dxos/random": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-client": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-form": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-menu": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-mosaic": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-stack": "0.8.4-main.abd8ff62ef",
+    "@dxos/schema": "0.8.4-main.abd8ff62ef",
+    "@dxos/types": "0.8.4-main.abd8ff62ef",
+    "@dxos/util": "0.8.4-main.abd8ff62ef"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/plugin-testing": "0.8.4-main.9735255",
-    "@dxos/plugin-preview": "0.8.4-main.9735255",
-    "@dxos/plugin-theme": "0.8.4-main.9735255",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.9735255",
-    "@dxos/storybook-utils": "0.8.4-main.9735255",
-    "@dxos/test-utils": "0.8.4-main.9735255",
-    "@dxos/ui-theme": "0.8.4-main.9735255"
+    "vite": "^8.0.10",
+    "@dxos/echo-db": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-testing": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-theme": "0.8.4-main.abd8ff62ef",
+    "@dxos/plugin-preview": "0.8.4-main.abd8ff62ef",
+    "@dxos/storybook-utils": "0.8.4-main.abd8ff62ef",
+    "@dxos/keys": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.abd8ff62ef",
+    "@dxos/test-utils": "0.8.4-main.abd8ff62ef",
+    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef"
   },
   "peerDependencies": {
-    "effect": "3.19.11",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.9735255",
-    "@dxos/ui-theme": "0.8.4-main.9735255"
+    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui": "0.8.4-main.abd8ff62ef"
   },
   "publishConfig": {
     "access": "public"

package/src/KanbanPlugin.node.ts

@@ -0,0 +1,55 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+import { Annotation, Type } from '@dxos/echo';
+import { SpaceOperation } from '@dxos/plugin-space/operations';
+import { type CreateObject } from '@dxos/plugin-space/types';
+import { ViewModel } from '@dxos/schema';
+
+import { BlueprintDefinition, OperationHandler, UndoMappings } from '#capabilities';
+import { meta } from '#meta';
+import { CreateKanbanSchema, Kanban } from '#types';
+
+export const KanbanPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addMetadataModule({
+    metadata: {
+      id: Type.getTypename(Kanban.Kanban),
+      metadata: {
+        icon: Annotation.IconAnnotation.get(Kanban.Kanban).pipe(Option.getOrThrow).icon,
+        iconHue: Annotation.IconAnnotation.get(Kanban.Kanban).pipe(Option.getOrThrow).hue ?? 'white',
+        inputSchema: CreateKanbanSchema,
+        createObject: ((props, options) =>
+          Effect.gen(function* () {
+            const object = yield* Effect.promise(async () => {
+              const { view } = await ViewModel.makeFromDatabase({
+                db: options.db,
+                typename: props.typename,
+                pivotFieldName: props.initialPivotColumn,
+              });
+              return Kanban.make({ name: props.name, view });
+            });
+            return yield* Operation.invoke(SpaceOperation.AddObject, {
+              object,
+              target: options.target,
+              hidden: true,
+              targetNodeId: options.targetNodeId,
+            });
+          })) satisfies CreateObject,
+      },
+    },
+  }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addUndoMappingsModule({ activate: UndoMappings }),
+  AppPlugin.addSchemaModule({ schema: [Kanban.Kanban] }),
+  Plugin.make,
+);
+
+export default KanbanPlugin;

package/src/KanbanPlugin.test.ts

@@ -0,0 +1,31 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { AppActivationEvents } from '@dxos/app-toolkit';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { KanbanPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('KanbanPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [KanbanPlugin()],
+    });
+
+    // After autoStart: OperationHandler and UndoMappings auto-cascade from OperationPlugin.
+    expect(harness.manager.getActive()).toEqual(
+      expect.arrayContaining([moduleId('OperationHandler'), moduleId('UndoMappings')]),
+    );
+
+    // BlueprintDefinition fires when AssistantPlugin loads blueprint definitions.
+    await harness.fire(AppActivationEvents.SetupArtifactDefinition);
+    expect(harness.manager.getActive()).toContain(moduleId('BlueprintDefinition'));
+  });
+});

package/src/KanbanPlugin.tsx

@@ -3,43 +3,61 @@
 //
 
 import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
 
-import { Common, Plugin } from '@dxos/app-framework';
-import { Type } from '@dxos/echo';
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+import { Annotation, Type } from '@dxos/echo';
+import { ClientEvents } from '@dxos/plugin-client/types';
+import { SpaceOperation } from '@dxos/plugin-space/operations';
 import { type CreateObject } from '@dxos/plugin-space/types';
-import { translations as kanbanTranslations } from '@dxos/react-ui-kanban';
-import { Kanban } from '@dxos/react-ui-kanban/types';
-import { View } from '@dxos/schema';
+import { ViewModel } from '@dxos/schema';
 
-import { BlueprintDefinition, OperationResolver, ReactSurface } from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
-import { CreateKanbanSchema } from './types';
+import { BlueprintDefinition, Migrations, OperationHandler, UndoMappings, ReactSurface } from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
+import { CreateKanbanSchema, Kanban } from '#types';
 
 export const KanbanPlugin = Plugin.define(meta).pipe(
-  Common.Plugin.addTranslationsModule({ translations: [...translations, ...kanbanTranslations] }),
-  Common.Plugin.addMetadataModule({
+  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addMetadataModule({
     metadata: {
       id: Type.getTypename(Kanban.Kanban),
       metadata: {
-        icon: 'ph--kanban--regular',
-        iconHue: 'green',
+        icon: Annotation.IconAnnotation.get(Kanban.Kanban).pipe(Option.getOrThrow).icon,
+        iconHue: Annotation.IconAnnotation.get(Kanban.Kanban).pipe(Option.getOrThrow).hue ?? 'white',
         inputSchema: CreateKanbanSchema,
-        createObject: ((props, { db }) =>
-          Effect.promise(async () => {
-            const { view } = await View.makeFromDatabase({
-              db,
-              typename: props.typename,
-              pivotFieldName: props.initialPivotColumn,
+        createObject: ((props, options) =>
+          Effect.gen(function* () {
+            const object = yield* Effect.promise(async () => {
+              const { view } = await ViewModel.makeFromDatabase({
+                db: options.db,
+                typename: props.typename,
+                pivotFieldName: props.initialPivotColumn,
+              });
+              return Kanban.make({ name: props.name, view });
+            });
+            return yield* Operation.invoke(SpaceOperation.AddObject, {
+              object,
+              target: options.target,
+              hidden: true,
+              targetNodeId: options.targetNodeId,
             });
-            return Kanban.make({ name: props.name, view });
           })) satisfies CreateObject,
       },
     },
   }),
-  Common.Plugin.addSchemaModule({ schema: [Kanban.Kanban] }),
-  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
-  Common.Plugin.addOperationResolverModule({ activate: OperationResolver }),
-  Common.Plugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addUndoMappingsModule({ activate: UndoMappings }),
+  AppPlugin.addSchemaModule({ schema: [Kanban.Kanban] }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.addModule({
+    activatesOn: ClientEvents.SetupMigration,
+    activate: Migrations,
+  }),
   Plugin.make,
 );
+
+export default KanbanPlugin;

package/src/blueprints/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export * as KanbanBlueprint from './kanban-blueprint';
+export { default as KanbanBlueprint } from './kanban-blueprint';

package/src/blueprints/kanban-blueprint.ts

@@ -2,23 +2,26 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Blueprint, Template } from '@dxos/blueprints';
-import { type FunctionDefinition } from '@dxos/functions';
+import { Blueprint, Template } from '@dxos/compute';
 import { trim } from '@dxos/util';
 
-export const functions: FunctionDefinition[] = [];
-export const tools: string[] = [];
+const BLUEPRINT_KEY = 'org.dxos.blueprint.kanban';
 
-export const Key = 'dxos.org/blueprint/kanban';
-
-export const make = () =>
+const make = () =>
   Blueprint.make({
-    key: Key,
+    key: BLUEPRINT_KEY,
     name: 'Kanban',
-    tools: Blueprint.toolDefinitions({ functions, tools }),
+    tools: Blueprint.toolDefinitions({ tools: [] }),
     instructions: Template.make({
       source: trim`
         You can create and update kanban boards to show data in sorted columns defined by schema.
       `,
     }),
   });
+
+const blueprint: Blueprint.Definition = {
+  key: BLUEPRINT_KEY,
+  make,
+};
+
+export default blueprint;

package/src/capabilities/{artifact-definition/artifact-definition.ts → artifact-definition.ts}

@@ -11,16 +11,17 @@ import * as Schema from 'effect/Schema';
 import { ToolResult, createTool } from '@dxos/ai';
 import { Capabilities, Capability, type PromiseIntentDispatcher } from '@dxos/app-framework';
 import { createArtifactElement } from '@dxos/assistant';
-import { defineArtifact } from '@dxos/blueprints';
+import { defineArtifact } from '@dxos/compute';
 import { Obj, Query } from '@dxos/echo';
+import { View } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
-import { SpaceOperation } from '@dxos/plugin-space/types';
+import { SpaceOperation } from '@dxos/plugin-space/operations';
 import { Filter, type Space } from '@dxos/react-client/echo';
-import { Kanban, KanbanView } from '@dxos/react-ui-kanban';
-import { View } from '@dxos/schema';
+import { ViewModel } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
-import { meta } from '../../meta';
+import { meta } from '#meta';
+import { Kanban } from '#types';
 
 const QualifiedId = Schema.String.annotations({
   description: 'The fully qualified ID of the kanban `spaceID:objectID`',
@@ -43,7 +44,7 @@ export default Capability.makeModule(() =>
       - When adding items, you must not include the 'id' field -- it is automatically generated
       - BEFORE adding items, always make sure the board has been shown to the user!
     `,
-      schema: KanbanView,
+      schema: Kanban.Kanban,
       tools: [
         createTool(meta.id, {
           name: 'create',
@@ -69,7 +70,7 @@ export default Capability.makeModule(() =>
               return ToolResult.Error(`Schema not found: ${typename}`);
             }
 
-            const { view } = await View.makeFromDatabase({
+            const { view } = await ViewModel.makeFromDatabase({
               db: extensions.space.db,
               typename,
               pivotFieldName: pivotColumn,
@@ -100,7 +101,7 @@ export default Capability.makeModule(() =>
             const boardInfo = await Promise.all(
               objects.map(async (view) => {
                 const kanban = await view.presentation.load();
-                if (!Obj.instanceOf(KanbanView, kanban)) {
+                if (!Obj.instanceOf(Kanban.Kanban, kanban)) {
                   return null;
                 }
 
@@ -129,7 +130,7 @@ export default Capability.makeModule(() =>
               .first()) as View.View;
 
             const kanban = await view.presentation.load();
-            invariant(Obj.instanceOf(KanbanView, kanban));
+            invariant(Obj.instanceOf(Kanban.Kanban, kanban));
 
             const typename = view.query.typename;
             const schema = await space.db.schemaRegistry.query({ typename }).firstOrUndefined();
@@ -137,7 +138,7 @@ export default Capability.makeModule(() =>
 
             return ToolResult.Success({
               schema,
-              columnField: kanban.columnFieldId,
+              columnField: view.projection.pivotFieldId,
               viewFields: view.projection.fields,
             });
           },

package/src/capabilities/blueprint-definition.ts

@@ -0,0 +1,19 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+// eslint-disable-next-line unused-imports/no-unused-imports
+import type { Blueprint } from '@dxos/compute';
+
+import { KanbanBlueprint } from '#blueprints';
+
+const blueprintDefinition = Capability.makeModule<
+  [],
+  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>[]
+>(() => Effect.succeed([Capability.contributes(AppCapabilities.BlueprintDefinition, KanbanBlueprint)]));
+
+export default blueprintDefinition;

package/src/capabilities/index.ts

@@ -2,6 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './blueprint-definition';
-export * from './operation-resolver';
-export * from './react-surface';
+import { Capability } from '@dxos/app-framework';
+// eslint-disable-next-line unused-imports/no-unused-imports
+import type { Blueprint, OperationHandlerSet } from '@dxos/compute';
+
+export const BlueprintDefinition = Capability.lazy('BlueprintDefinition', () => import('./blueprint-definition'));
+export const Migrations = Capability.lazy('Migrations', () => import('./migrations'));
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
+export const UndoMappings = Capability.lazy('UndoMappings', () => import('./undo-mappings'));

package/src/capabilities/migrations.ts

@@ -0,0 +1,35 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { defineObjectMigration } from '@dxos/client/echo';
+import { ClientCapabilities } from '@dxos/plugin-client/types';
+
+import { Kanban } from '#types';
+
+/**
+ * v0.1.0 → v0.2.0: nests the existing `view` ref under a `spec: { kind: 'view', view }`
+ * discriminated union. v0.2.0 introduced an items-variant for externally-synced kanbans;
+ * pre-migration objects were all view-based by construction.
+ */
+const migrations = [
+  defineObjectMigration({
+    from: Kanban.KanbanV1,
+    to: Kanban.Kanban,
+    transform: async (from) => ({
+      name: from.name,
+      arrangement: from.arrangement,
+      spec: { kind: 'view' as const, view: from.view },
+    }),
+    onMigration: async () => {},
+  }),
+];
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(ClientCapabilities.Migration, migrations);
+  }),
+);

package/src/capabilities/operation-handler.ts

@@ -0,0 +1,14 @@
+// Copyright 2025 DXOS.org
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import type { OperationHandlerSet } from '@dxos/compute';
+
+import { KanbanOperationHandlerSet } from '#operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, KanbanOperationHandlerSet);
+  }),
+);

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

@@ -4,37 +4,40 @@
 
 import * as Effect from 'effect/Effect';
 import type * as Schema from 'effect/Schema';
+import * as SchemaAST from 'effect/SchemaAST';
 import React, { useMemo } from 'react';
 
-import { Capability, Common } from '@dxos/app-framework';
-import { Database, Obj, Type } from '@dxos/echo';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { Database, JsonSchema, Obj } from '@dxos/echo';
+import { type Collection } from '@dxos/echo';
 import { findAnnotation } from '@dxos/effect';
 import { type FormFieldComponentProps, SelectField, useFormValues } from '@dxos/react-ui-form';
-import { Kanban } from '@dxos/react-ui-kanban/types';
-import { type Collection } from '@dxos/schema';
 
-import { KanbanContainer, KanbanViewEditor } from '../../components';
-import { meta } from '../../meta';
-import { PivotColumnAnnotationId } from '../../types';
+import { KanbanContainer, KanbanSettings } from '#containers';
+import { Kanban, PivotColumnAnnotationId } from '#types';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
-    Capability.contributes(Common.Capability.ReactSurface, [
-      Common.createSurface({
-        id: meta.id,
-        role: ['article', 'section'],
-        filter: (data): data is { subject: Kanban.Kanban } => Obj.instanceOf(Kanban.Kanban, data.subject),
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: 'root',
+        // TODO(wittjosiah): Split into multiple surfaces if this filter proves too strict for non-article roles.
+        filter: AppSurface.oneOf(
+          AppSurface.object(AppSurface.Article, Kanban.Kanban),
+          AppSurface.object(AppSurface.Section, Kanban.Kanban),
+        ),
         component: ({ data, role }) => <KanbanContainer role={role} subject={data.subject} />,
       }),
-      Common.createSurface({
-        id: `${meta.id}/object-settings`,
-        role: 'object-settings',
+      Surface.create({
+        id: 'object-properties',
         position: 'hoist',
-        filter: (data): data is { subject: Kanban.Kanban } => Obj.instanceOf(Kanban.Kanban, data.subject),
-        component: ({ data }) => <KanbanViewEditor object={data.subject} />,
+        filter: AppSurface.object(AppSurface.ObjectProperties, Kanban.Kanban),
+        component: ({ data }) => <KanbanSettings subject={data.subject} />,
       }),
-      Common.createSurface({
-        id: `${meta.id}/create-initial-schema-form-[pivot-column]`,
+      Surface.create({
+        id: 'create-initial-schema-form-[pivot-column]',
         role: 'form-input',
         filter: (
           data,
@@ -42,12 +45,18 @@ export default Capability.makeModule(() =>
           prop: string;
           schema: Schema.Schema<any>;
           target: Database.Database | Collection.Collection | undefined;
+          fieldPropertyAst?: SchemaAST.AST;
         } => {
           const annotation = findAnnotation<boolean>((data.schema as Schema.Schema.All).ast, PivotColumnAnnotationId);
           return !!annotation;
         },
-        component: ({ data: { target }, ...inputProps }) => {
-          const props = inputProps as any as FormFieldComponentProps;
+        component: ({ data: { target, fieldPropertyAst }, ...inputProps }) => {
+          const ast = fieldPropertyAst;
+          if (!ast) {
+            return null;
+          }
+
+          const props = { ...inputProps, type: ast } as any as FormFieldComponentProps;
           const db = Database.isDatabase(target) ? target : target && Obj.getDatabase(target);
           if (!db) {
             return null;
@@ -59,7 +68,7 @@ export default Capability.makeModule(() =>
             [db, typename],
           );
           const singleSelectColumns = useMemo(() => {
-            const properties = Type.toJsonSchema(selectedSchema).properties;
+            const properties = JsonSchema.toJsonSchema(selectedSchema).properties;
             if (!properties) {
               return [];
             }