@dxos/plugin-chess 0.8.4-main.bc674ce → 0.8.4-main.c351d160a8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-chess",
-  "version": "0.8.4-main.bc674ce",
+  "version": "0.8.4-main.c351d160a8",
   "description": "Chess for new plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -52,51 +52,52 @@
   ],
   "dependencies": {
     "@automerge/automerge": "3.2.3",
-    "@effect-atom/atom-react": "^0.4.6",
+    "@effect-atom/atom-react": "^0.5.0",
     "chess.js": "^1.0.0",
-    "effect": "3.19.11",
-    "@dxos/ai": "0.8.4-main.bc674ce",
-    "@dxos/app-framework": "0.8.4-main.bc674ce",
-    "@dxos/async": "0.8.4-main.bc674ce",
-    "@dxos/display-name": "0.8.4-main.bc674ce",
-    "@dxos/assistant": "0.8.4-main.bc674ce",
-    "@dxos/echo-db": "0.8.4-main.bc674ce",
-    "@dxos/echo": "0.8.4-main.bc674ce",
-    "@dxos/echo-react": "0.8.4-main.bc674ce",
-    "@dxos/invariant": "0.8.4-main.bc674ce",
-    "@dxos/blueprints": "0.8.4-main.bc674ce",
-    "@dxos/functions": "0.8.4-main.bc674ce",
-    "@dxos/log": "0.8.4-main.bc674ce",
-    "@dxos/plugin-client": "0.8.4-main.bc674ce",
-    "@dxos/operation": "0.8.4-main.bc674ce",
-    "@dxos/plugin-markdown": "0.8.4-main.bc674ce",
-    "@dxos/plugin-graph": "0.8.4-main.bc674ce",
-    "@dxos/react-client": "0.8.4-main.bc674ce",
-    "@dxos/plugin-space": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-gameboard": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-mosaic": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-sfx": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-stack": "0.8.4-main.bc674ce",
-    "@dxos/schema": "0.8.4-main.bc674ce",
-    "@dxos/util": "0.8.4-main.bc674ce",
-    "@dxos/types": "0.8.4-main.bc674ce"
+    "effect": "3.19.16",
+    "@dxos/ai": "0.8.4-main.c351d160a8",
+    "@dxos/app-framework": "0.8.4-main.c351d160a8",
+    "@dxos/assistant": "0.8.4-main.c351d160a8",
+    "@dxos/app-toolkit": "0.8.4-main.c351d160a8",
+    "@dxos/blueprints": "0.8.4-main.c351d160a8",
+    "@dxos/async": "0.8.4-main.c351d160a8",
+    "@dxos/display-name": "0.8.4-main.c351d160a8",
+    "@dxos/echo-db": "0.8.4-main.c351d160a8",
+    "@dxos/echo-react": "0.8.4-main.c351d160a8",
+    "@dxos/echo": "0.8.4-main.c351d160a8",
+    "@dxos/functions": "0.8.4-main.c351d160a8",
+    "@dxos/invariant": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-client": "0.8.4-main.c351d160a8",
+    "@dxos/operation": "0.8.4-main.c351d160a8",
+    "@dxos/log": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-graph": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-markdown": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-space": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-gameboard": "0.8.4-main.c351d160a8",
+    "@dxos/react-client": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-mosaic": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-stack": "0.8.4-main.c351d160a8",
+    "@dxos/schema": "0.8.4-main.c351d160a8",
+    "@dxos/util": "0.8.4-main.c351d160a8",
+    "@dxos/react-ui-sfx": "0.8.4-main.c351d160a8",
+    "@dxos/types": "0.8.4-main.c351d160a8"
   },
   "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-theme": "0.8.4-main.bc674ce",
-    "@dxos/react-ui": "0.8.4-main.bc674ce",
-    "@dxos/storybook-utils": "0.8.4-main.bc674ce",
-    "@dxos/ui-theme": "0.8.4-main.bc674ce"
+    "vite": "^7.1.11",
+    "@dxos/react-ui": "0.8.4-main.c351d160a8",
+    "@dxos/storybook-utils": "0.8.4-main.c351d160a8",
+    "@dxos/plugin-theme": "0.8.4-main.c351d160a8",
+    "@dxos/ui-theme": "0.8.4-main.c351d160a8"
   },
   "peerDependencies": {
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.bc674ce",
-    "@dxos/ui-theme": "0.8.4-main.bc674ce"
+    "@dxos/react-ui": "0.8.4-main.c351d160a8",
+    "@dxos/ui-theme": "0.8.4-main.c351d160a8"
   },
   "publishConfig": {
     "access": "public"

package/src/ChessPlugin.tsx

@@ -4,7 +4,11 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Common, Plugin } from '@dxos/app-framework';
+import * as Option from 'effect/Option';
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Annotation } from '@dxos/echo';
 import { type CreateObject } from '@dxos/plugin-space/types';
 
 import { ChessBlueprint } from './blueprints';
@@ -14,21 +18,20 @@ import { translations } from './translations';
 import { Chess } from './types';
 
 export const ChessPlugin = Plugin.define(meta).pipe(
-  Common.Plugin.addTranslationsModule({ translations }),
-  Common.Plugin.addMetadataModule({
+  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addMetadataModule({
     metadata: {
       id: Chess.Game.typename,
       metadata: {
-        icon: 'ph--shield-chevron--regular',
-        iconHue: 'amber',
-        blueprints: [ChessBlueprint.Key],
+        icon: Annotation.IconAnnotation.get(Chess.Game).pipe(Option.getOrThrow).icon,
+        iconHue: Annotation.IconAnnotation.get(Chess.Game).pipe(Option.getOrThrow).hue ?? 'white',
+        blueprints: [ChessBlueprint.key],
         createObject: ((props) => Effect.sync(() => Chess.make(props))) satisfies CreateObject,
-        addToCollectionOnCreate: true,
       },
     },
   }),
-  Common.Plugin.addSchemaModule({ schema: [Chess.Game] }),
-  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
-  Common.Plugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addSchemaModule({ schema: [Chess.Game] }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
   Plugin.make,
 );

package/src/blueprints/chess-blueprint.ts

@@ -2,19 +2,19 @@
 // Copyright 2025 DXOS.org
 //
 
+import { type AppCapabilities } from '@dxos/app-toolkit';
 import { Blueprint, Template } from '@dxos/blueprints';
-import { type FunctionDefinition } from '@dxos/functions';
 import { trim } from '@dxos/util';
 
-import { create, move, play, print } from './functions';
+import { ChessFunctions } from './functions';
 
-export const Key = 'dxos.org/blueprint/chess';
+const BLUEPRINT_KEY = 'org.dxos.blueprint.chess';
 
-export const functions: FunctionDefinition[] = [create, move, play, print];
+const functions = Object.values(ChessFunctions);
 
-export const make = () =>
+const make = () =>
   Blueprint.make({
-    key: Key,
+    key: BLUEPRINT_KEY,
     name: 'Chess',
     tools: Blueprint.toolDefinitions({ functions }),
     instructions: Template.make({
@@ -26,3 +26,11 @@ export const make = () =>
       `,
     }),
   });
+
+const blueprint: AppCapabilities.BlueprintDefinition = {
+  key: BLUEPRINT_KEY,
+  functions,
+  make,
+};
+
+export default blueprint;

package/src/blueprints/functions/create.ts

@@ -11,7 +11,7 @@ import { defineFunction } from '@dxos/functions';
 import { Chess } from '../../types';
 
 export default defineFunction({
-  key: 'dxos.org/function/chess/create',
+  key: 'org.dxos.function.chess.create',
   name: 'Create Chess',
   description: 'Creates a new chess game.',
   inputSchema: Schema.Struct({
@@ -33,6 +33,6 @@ export default defineFunction({
   }),
   outputSchema: Chess.Game,
   handler: Effect.fn(function* ({ data: { name, pgn, fen } }) {
-    return yield* Database.Service.add(Chess.make({ name, pgn, fen }));
+    return yield* Database.add(Chess.make({ name, pgn, fen }));
   }),
 });

package/src/blueprints/functions/index.ts

@@ -2,7 +2,16 @@
 // Copyright 2024 DXOS.org
 //
 
-export { default as create } from './create';
-export { default as move } from './move';
-export { default as play } from './play';
-export { default as print } from './print';
+import Create from './create';
+import Move from './move';
+import Play from './play';
+import Print from './print';
+
+export { Create, Move, Play, Print };
+
+export const ChessFunctions = {
+  Create,
+  Move,
+  Play,
+  Print,
+};

package/src/blueprints/functions/move.ts

@@ -6,18 +6,17 @@ import { Chess as ChessJS } from 'chess.js';
 import * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
 
-import { ArtifactId } from '@dxos/assistant';
-import { Database, Obj } from '@dxos/echo';
+import { Database, Obj, Ref } from '@dxos/echo';
 import { defineFunction } from '@dxos/functions';
 
 import { Chess } from '../../types';
 
 export default defineFunction({
-  key: 'dxos.org/function/chess/move',
+  key: 'org.dxos.function.chess.move',
   name: 'Move',
   description: 'Makes a move in the given chess game.',
   inputSchema: Schema.Struct({
-    id: ArtifactId.annotations({
+    game: Ref.Ref(Chess.Game).annotations({
       description: 'The ID of the chess object.',
     }),
     move: Schema.String.annotations({
@@ -30,19 +29,19 @@ export default defineFunction({
       description: 'The PGN of the game after the move was played.',
     }),
   }),
-  handler: Effect.fn(function* ({ data: { id, move } }) {
-    const object = yield* Database.Service.resolve(ArtifactId.toDXN(id), Chess.Game);
+  handler: Effect.fn(function* ({ data: { game, move } }) {
+    const obj = yield* Database.load(game);
     const chess = new ChessJS();
-    if (object.pgn) {
-      chess.loadPgn(object.pgn);
-    } else if (object.fen) {
-      chess.load(object.fen);
+    if (obj.pgn) {
+      chess.loadPgn(obj.pgn);
+    } else if (obj.fen) {
+      chess.load(obj.fen);
     }
 
     chess.move(move, { strict: false });
     const pgn = chess.pgn();
-    Obj.change(object, (o) => {
-      o.pgn = pgn;
+    Obj.change(obj, (obj) => {
+      obj.pgn = pgn;
     });
     return { pgn };
   }),

package/src/blueprints/functions/play.ts

@@ -6,18 +6,17 @@ import { Chess as ChessJS } from 'chess.js';
 import * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
 
-import { ArtifactId } from '@dxos/assistant';
-import { Database, Obj } from '@dxos/echo';
+import { Database, Obj, Ref } from '@dxos/echo';
 import { defineFunction } from '@dxos/functions';
 
 import { Chess } from '../../types';
 
 export default defineFunction({
-  key: 'dxos.org/function/chess/play',
+  key: 'org.dxos.function.chess.play',
   name: 'Play',
   description: 'Uses the chess engine to play the next move.',
   inputSchema: Schema.Struct({
-    id: ArtifactId.annotations({
+    game: Ref.Ref(Chess.Game).annotations({
       description: 'The ID of the chess object.',
     }),
     side: Schema.optional(Schema.Literal('white', 'black', 'any')).annotations({
@@ -33,8 +32,8 @@ export default defineFunction({
       description: 'The move that was played.',
     }),
   }),
-  handler: Effect.fn(function* ({ data: { id, side = 'any' } }) {
-    const object = yield* Database.Service.resolve(ArtifactId.toDXN(id), Chess.Game);
+  handler: Effect.fn(function* ({ data: { game, side = 'any' } }) {
+    const object = yield* Database.load(game);
     const chess = new ChessJS();
     if (object.pgn) {
       chess.loadPgn(object.pgn);

package/src/blueprints/functions/print.ts

@@ -9,7 +9,7 @@ import * as Schema from 'effect/Schema';
 import { defineFunction } from '@dxos/functions';
 
 export default defineFunction({
-  key: 'dxos.org/function/chess/print',
+  key: 'org.dxos.function.chess.print',
   name: 'Print game',
   description: 'Prints the chess game to ASCII.',
   inputSchema: Schema.Struct({

package/src/blueprints/index.ts

@@ -2,5 +2,5 @@
 // Copyright 2025 DXOS.org
 //
 
-export * as ChessBlueprint from './chess-blueprint';
+export { default as ChessBlueprint } from './chess-blueprint';
 export * as ChessFunctions from './functions';

package/src/capabilities/blueprint-definition/blueprint-definition.ts

@@ -4,20 +4,14 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 
 import { ChessBlueprint } from '../../blueprints';
 
-export type BlueprintCapabilities = [
-  Capability.Capability<typeof Common.Capability.Functions>,
-  Capability.Capability<typeof Common.Capability.BlueprintDefinition>,
-];
-
-const blueprintDefinition = Capability.makeModule<[], BlueprintCapabilities>(() =>
-  Effect.succeed([
-    Capability.contributes(Common.Capability.Functions, ChessBlueprint.functions),
-    Capability.contributes(Common.Capability.BlueprintDefinition, ChessBlueprint.make()),
-  ]),
-);
+const blueprintDefinition = Capability.makeModule<
+  [],
+  Capability.Capability<typeof AppCapabilities.BlueprintDefinition>[]
+>(() => Effect.succeed([Capability.contributes(AppCapabilities.BlueprintDefinition, ChessBlueprint)]));
 
 export default blueprintDefinition;

package/src/capabilities/react-surface/react-surface.tsx

@@ -5,22 +5,28 @@
 import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
 import { Obj } from '@dxos/echo';
 
-import { ChessboardContainer } from '../../components';
+import { ChessArticle, ChessCard } from '../../containers';
 import { meta } from '../../meta';
 import { Chess } from '../../types';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
-    Capability.contributes(Common.Capability.ReactSurface, [
-      Common.createSurface({
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
         id: meta.id,
-        role: ['article', 'section', 'card--content'],
-        // TODO(burdon): Could this be standardized so that we don't require a subject property.
+        role: ['article', 'section'],
         filter: (data): data is { subject: Chess.Game } => Obj.instanceOf(Chess.Game, data.subject),
-        component: ({ data, role }) => <ChessboardContainer role={role} subject={data.subject} />,
+        component: ({ data, role }) => <ChessArticle role={role} subject={data.subject} />,
+      }),
+      Surface.create({
+        id: meta.id,
+        role: ['card--content'],
+        filter: (data): data is { subject: Chess.Game } => Obj.instanceOf(Chess.Game, data.subject),
+        component: ({ data, role }) => <ChessCard role={role} subject={data.subject} />,
       }),
     ]),
   ),

package/src/cli/plugin.ts

@@ -4,7 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Common, Plugin } from '@dxos/app-framework';
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
 import { type CreateObject } from '@dxos/plugin-space/types';
 
 import { meta } from '../meta';
@@ -12,15 +13,14 @@ import { Chess } from '../types';
 
 // TODO(wittjosiah): Factor out shared modules.
 export const ChessPlugin = Plugin.define(meta).pipe(
-  Common.Plugin.addSchemaModule({ schema: [Chess.Game] }),
-  Common.Plugin.addMetadataModule({
+  AppPlugin.addMetadataModule({
     metadata: {
       id: Chess.Game.typename,
       metadata: {
         createObject: ((props) => Effect.sync(() => Chess.make(props))) satisfies CreateObject,
-        addToCollectionOnCreate: true,
       },
     },
   }),
+  AppPlugin.addSchemaModule({ schema: [Chess.Game] }),
   Plugin.make,
 );

package/src/components/{Chessboard.tsx → Chessboard/Chessboard.tsx}

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type Registry, RegistryContext } from '@effect-atom/atom-react';
+import { RegistryContext } from '@effect-atom/atom-react';
 import React, {
   type PropsWithChildren,
   forwardRef,
@@ -15,10 +15,10 @@ import React, {
 } from 'react';
 
 import { addEventListener } from '@dxos/async';
-import { Obj } from '@dxos/echo';
+import { useObject } from '@dxos/echo-react';
 import { type ThemedClassName } from '@dxos/react-ui';
 import {
-  ChessModel,
+  type ChessModel,
   Gameboard,
   type GameboardRootProps,
   Chessboard as NaturalChessboard,
@@ -29,23 +29,15 @@ import {
 import { useSoundEffect } from '@dxos/react-ui-sfx';
 import { mx } from '@dxos/ui-theme';
 
-import { type Chess } from '../types';
+import { type Chess } from '../../types';
 
 import { Info, type InfoProps } from './Info';
+import { ExtendedChessModel } from './types';
 
 export interface ChessboardController {
   setMoveNumber(index: number): void;
 }
 
-export class ExtendedChessModel extends ChessModel {
-  constructor(
-    registry: Registry.Registry,
-    readonly object: Chess.Game,
-  ) {
-    super(registry);
-  }
-}
-
 //
 // Root
 //
@@ -58,6 +50,7 @@ const Root = forwardRef<ChessboardController, RootProps>(({ game, children }, fo
   const registry = useContext(RegistryContext);
   const model = useMemo(() => new ExtendedChessModel(registry, game), [registry]);
   const click = useSoundEffect('Click');
+  const [pgn, updatePgn] = useObject(game, 'pgn');
 
   // Controller.
   useImperativeHandle(forwardedRef, () => {
@@ -66,17 +59,21 @@ const Root = forwardRef<ChessboardController, RootProps>(({ game, children }, fo
     };
   }, [model]);
 
+  // TODO(wittjosiah): Rather than useEffect to sync ECHO object to model, create an alternative model implementation.
+  //   This model would take the ECHO object and derive game state directly from that.
+  //   Mutation methods would mutate the ECHO object and other state would be derived from that.
+
   // External change.
   // NOTE: Warning if user has not interacted with the board.
   useEffect(() => {
-    if (model.pgn !== getRawPgn(game.pgn ?? '')) {
+    if (model.pgn !== getRawPgn(pgn ?? '')) {
       const silent = model.pgn === '*';
-      model.update(game.pgn);
+      model.update(pgn);
       if (!silent) {
         void click.play();
       }
     }
-  }, [game.pgn]);
+  }, [pgn]);
 
   // Move.
   const handleDrop = useCallback<NonNullable<GameboardRootProps<ChessModel>['onDrop']>>(
@@ -86,9 +83,7 @@ const Root = forwardRef<ChessboardController, RootProps>(({ game, children }, fo
       }
 
       void click.play();
-      Obj.change(game, (g) => {
-        g.pgn = model.pgn;
-      });
+      updatePgn(() => model.pgn);
       return true;
     },
     [model],
@@ -105,16 +100,17 @@ const Root = forwardRef<ChessboardController, RootProps>(({ game, children }, fo
 // Content
 //
 
-type Role = 'card--popover' | 'card--intrinsic' | 'card--extrinsic';
+type Role = 'card--content';
 
 type ContentProps = ThemedClassName<PropsWithChildren<{ role?: Role }>>;
 
 const Content = ({ classNames, children, role }: ContentProps) => {
   return (
     <Gameboard.Content
-      classNames={mx(classNames, role === 'card--popover' && 'size-container popover-square')}
-      grow={!role || role === 'card--extrinsic'}
-      contain={!role || role === 'card--extrinsic' || role === 'card--popover'}
+      classNames={mx(
+        classNames,
+        role === 'card--content' ? 'dx-size-container dx-card-square' : 'flex flex-col justify-center',
+      )}
     >
       {children}
     </Gameboard.Content>
@@ -125,11 +121,13 @@ const Content = ({ classNames, children, role }: ContentProps) => {
 // Board
 //
 
+const BOARD_NAME = 'Chessboard.Board';
+
 type BoardProps = NaturalChessboardProps;
 
 const Board = (props: BoardProps) => {
   const registry = useContext(RegistryContext);
-  const { model } = useGameboardContext<ChessModel>(Board.displayName);
+  const { model } = useGameboardContext<ChessModel>(BOARD_NAME);
 
   // Keyboard navigation.
   const ref = useRef<HTMLDivElement>(null);
@@ -164,10 +162,10 @@ const Board = (props: BoardProps) => {
     });
   }, [registry, model]);
 
-  return <NaturalChessboard ref={ref} {...props} />;
+  return <NaturalChessboard {...props} ref={ref} />;
 };
 
-Board.displayName = 'Chessboard.Board';
+Board.displayName = BOARD_NAME;
 
 //
 // Chessboard

package/src/components/{Info.tsx → Chessboard/Info.tsx}

@@ -12,9 +12,11 @@ import { Icon, IconButton, Select, type ThemedClassName, useTranslation } from '
 import { type Player, useGameboardContext } from '@dxos/react-ui-gameboard';
 import { mx } from '@dxos/ui-theme';
 
-import { meta } from '../meta';
+import { meta } from '../../meta';
 
-import { type ExtendedChessModel } from './Chessboard';
+import { type ExtendedChessModel } from './types';
+
+const INFO_NAME = 'Chessboard.Info';
 
 export type InfoProps = ThemedClassName<
   {
@@ -26,14 +28,14 @@ export type InfoProps = ThemedClassName<
 
 export const Info = ({ classNames, orientation = 'white', onOrientationChange, onClose, ...props }: InfoProps) => {
   const { t } = useTranslation(meta.id);
-  const { model } = useGameboardContext<ExtendedChessModel>(Info.displayName);
+  const { model } = useGameboardContext<ExtendedChessModel>(INFO_NAME);
   const db = Obj.getDatabase(model.object);
   const members = useMembers(db?.spaceId);
 
   return (
     <div
       className={mx(
-        'grid grid-rows-[min-content_1fr_min-content] is-full min-is-[18rem] p-2 overflow-hidden bg-groupSurface rounded-sm',
+        'grid grid-rows-[min-content_1fr_min-content] w-full min-w-[18rem] p-2 overflow-hidden bg-group-surface rounded-xs',
         classNames,
       )}
     >
@@ -89,7 +91,7 @@ export const Info = ({ classNames, orientation = 'white', onOrientationChange, o
   );
 };
 
-Info.displayName = 'Chessboard.Info';
+Info.displayName = INFO_NAME;
 
 //
 // History
@@ -154,12 +156,12 @@ const History = ({ classNames, model, min, max, onSelect }: HistoryProps) => {
       }}
     >
       {moves.map(([a, b], index) => (
-        <div key={index} className='grid grid-cols-[3rem_1fr_1fr_1rem] gap-2 pis-4 leading-1'>
+        <div key={index} className='grid grid-cols-[3rem_1fr_1fr_1rem] gap-2 ps-4 leading-1'>
           <div className='content-center text-xs text-subdued'>{index + 1}</div>
           {a && (
             <div
               data-index={a.index}
-              className={mx('pis-2 cursor-pointer', a.index === moveIndex - 1 && 'bg-primary-500')}
+              className={mx('ps-2 cursor-pointer', a.index === moveIndex - 1 && 'bg-primary-500')}
               onClick={() => onSelect?.(a.index + 1)}
             >
               {a.move}
@@ -168,7 +170,7 @@ const History = ({ classNames, model, min, max, onSelect }: HistoryProps) => {
           {b && (
             <div
               data-index={b.index}
-              className={mx('pis-2 cursor-pointer', b.index === moveIndex - 1 && 'bg-primary-500')}
+              className={mx('ps-2 cursor-pointer', b.index === moveIndex - 1 && 'bg-primary-500')}
               onClick={() => onSelect?.(b.index + 1)}
             >
               {b.move}
@@ -194,12 +196,12 @@ type PlayerIndicatorProps = PropsWithChildren<{
 const PlayerIndicator = ({ children, model, player, icon }: PlayerIndicatorProps) => {
   const turn = player === (model.game.turn() === 'w' ? 'white' : 'black');
   return (
-    <div className='grid grid-cols-[2rem_1fr_2rem] gap-2 bs-[--rail-size] pli-1 flex items-center overflow-hidden'>
+    <div className='grid grid-cols-[2rem_1fr_2rem] gap-2 h-(--dx-rail-size) px-1 flex items-center overflow-hidden'>
       <div className='place-items-center'>
         <Icon
           icon={turn ? 'ph--circle--fill' : 'ph--circle--thin'}
           size={6}
-          classNames={mx(turn && (model.game.isCheckmate() ? 'text-red-500' : 'text-green-500'))}
+          classNames={mx(turn && (model.game.isCheckmate() ? 'text-error-500' : 'text-success-text'))}
         />
       </div>
       <div className='truncate overflow-hidden items-center'>{children}</div>

package/src/components/Chessboard/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+export * from './Chessboard';

package/src/components/Chessboard/types.ts

@@ -0,0 +1,18 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { type Registry } from '@effect-atom/atom-react';
+
+import { ChessModel } from '@dxos/react-ui-gameboard';
+
+import { type Chess } from '../../types';
+
+export class ExtendedChessModel extends ChessModel {
+  constructor(
+    registry: Registry.Registry,
+    readonly object: Chess.Game,
+  ) {
+    super(registry);
+  }
+}