@dxos/plugin-deck 0.8.4-main.74a063c4e0 → 0.8.4-main.765dc60934

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-deck",
-  "version": "0.8.4-main.74a063c4e0",
+  "version": "0.8.4-main.765dc60934",
   "description": "DXOS Surface plugin for the main application layout.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,49 +8,79 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
   "imports": {
-    "#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",
-    "#types": "./src/types/index.ts"
-  },
-  "exports": {
-    ".": {
-      "source": "./src/index.ts",
-      "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs"
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
     },
-    "./operations": {
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/index.mjs"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/index.mjs"
+    },
+    "#hooks": {
+      "source": "./src/hooks/index.ts",
+      "types": "./dist/types/src/hooks/index.d.ts",
+      "default": "./dist/lib/neutral/hooks/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#operations": {
       "source": "./src/operations/index.ts",
       "types": "./dist/types/src/operations/index.d.ts",
-      "browser": "./dist/lib/browser/operations/index.mjs",
-      "node": "./dist/lib/node-esm/operations/index.mjs"
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
+    "#plugin": {
+      "source": {
+        "node": "./src/DeckPlugin.node.ts",
+        "default": "./src/DeckPlugin.ts"
+      },
+      "types": "./dist/types/src/DeckPlugin.d.ts",
+      "node": "./dist/lib/neutral/DeckPlugin.node.mjs",
+      "default": "./dist/lib/neutral/DeckPlugin.mjs"
     },
-    "./types": {
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    },
+    "#types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
-      "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs"
+      "default": "./dist/lib/neutral/types/index.mjs"
     }
   },
-  "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "operations": [
-        "dist/types/src/operations/index.d.ts"
-      ],
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
+  "exports": {
+    ".": {
+      "source": "./src/index.ts",
+      "types": "./dist/types/src/index.d.ts",
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
     }
   },
+  "types": "dist/types/src/index.d.ts",
   "files": [
     "dist",
     "src"
@@ -62,40 +92,39 @@
     "@effect/experimental": "0.58.0",
     "@fluentui/react-tabster": "9.26.11",
     "@radix-ui/react-context": "1.1.1",
-    "@tauri-apps/plugin-deep-link": "^2.2.0",
+    "@tauri-apps/plugin-deep-link": "^2.4.9",
     "immer": "^10.1.1",
-    "@dxos/ai": "0.8.4-main.74a063c4e0",
-    "@dxos/app-framework": "0.8.4-main.74a063c4e0",
-    "@dxos/app-toolkit": "0.8.4-main.74a063c4e0",
-    "@dxos/assistant": "0.8.4-main.74a063c4e0",
-    "@dxos/async": "0.8.4-main.74a063c4e0",
-    "@dxos/blueprints": "0.8.4-main.74a063c4e0",
-    "@dxos/context": "0.8.4-main.74a063c4e0",
-    "@dxos/echo": "0.8.4-main.74a063c4e0",
-    "@dxos/debug": "0.8.4-main.74a063c4e0",
-    "@dxos/effect": "0.8.4-main.74a063c4e0",
-    "@dxos/errors": "0.8.4-main.74a063c4e0",
-    "@dxos/invariant": "0.8.4-main.74a063c4e0",
-    "@dxos/keyboard": "0.8.4-main.74a063c4e0",
-    "@dxos/operation": "0.8.4-main.74a063c4e0",
-    "@dxos/log": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-attention": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-client": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-graph": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-observability": "0.8.4-main.74a063c4e0",
-    "@dxos/plugin-theme": "0.8.4-main.74a063c4e0",
-    "@dxos/react-client": "0.8.4-main.74a063c4e0",
-    "@dxos/react-error-boundary": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-attention": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-form": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-menu": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-mosaic": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-tabs": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-stack": "0.8.4-main.74a063c4e0",
-    "@dxos/ui-types": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-text-tooltip": "0.8.4-main.74a063c4e0",
-    "@dxos/util": "0.8.4-main.74a063c4e0",
-    "@dxos/app-graph": "0.8.4-main.74a063c4e0"
+    "@dxos/ai": "0.8.4-main.765dc60934",
+    "@dxos/app-graph": "0.8.4-main.765dc60934",
+    "@dxos/app-framework": "0.8.4-main.765dc60934",
+    "@dxos/app-toolkit": "0.8.4-main.765dc60934",
+    "@dxos/assistant": "0.8.4-main.765dc60934",
+    "@dxos/async": "0.8.4-main.765dc60934",
+    "@dxos/compute": "0.8.4-main.765dc60934",
+    "@dxos/context": "0.8.4-main.765dc60934",
+    "@dxos/debug": "0.8.4-main.765dc60934",
+    "@dxos/echo": "0.8.4-main.765dc60934",
+    "@dxos/invariant": "0.8.4-main.765dc60934",
+    "@dxos/effect": "0.8.4-main.765dc60934",
+    "@dxos/keyboard": "0.8.4-main.765dc60934",
+    "@dxos/errors": "0.8.4-main.765dc60934",
+    "@dxos/log": "0.8.4-main.765dc60934",
+    "@dxos/plugin-attention": "0.8.4-main.765dc60934",
+    "@dxos/plugin-client": "0.8.4-main.765dc60934",
+    "@dxos/plugin-graph": "0.8.4-main.765dc60934",
+    "@dxos/plugin-observability": "0.8.4-main.765dc60934",
+    "@dxos/plugin-theme": "0.8.4-main.765dc60934",
+    "@dxos/react-error-boundary": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-form": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-attention": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-menu": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-mosaic": "0.8.4-main.765dc60934",
+    "@dxos/react-client": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-stack": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-text-tooltip": "0.8.4-main.765dc60934",
+    "@dxos/ui-types": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-tabs": "0.8.4-main.765dc60934",
+    "@dxos/util": "0.8.4-main.765dc60934"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -105,16 +134,16 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/plugin-testing": "0.8.4-main.74a063c4e0",
-    "@dxos/react-hooks": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.74a063c4e0",
-    "@dxos/react-ui": "0.8.4-main.74a063c4e0",
-    "@dxos/schema": "0.8.4-main.74a063c4e0",
-    "@dxos/storybook-utils": "0.8.4-main.74a063c4e0",
-    "@dxos/ui-theme": "0.8.4-main.74a063c4e0",
-    "@dxos/random": "0.8.4-main.74a063c4e0",
-    "@dxos/types": "0.8.4-main.74a063c4e0"
+    "vite": "^8.0.13",
+    "@dxos/plugin-testing": "0.8.4-main.765dc60934",
+    "@dxos/random": "0.8.4-main.765dc60934",
+    "@dxos/react-hooks": "0.8.4-main.765dc60934",
+    "@dxos/react-ui": "0.8.4-main.765dc60934",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.765dc60934",
+    "@dxos/schema": "0.8.4-main.765dc60934",
+    "@dxos/storybook-utils": "0.8.4-main.765dc60934",
+    "@dxos/types": "0.8.4-main.765dc60934",
+    "@dxos/ui-theme": "0.8.4-main.765dc60934"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -122,10 +151,7 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.74a063c4e0",
-    "@dxos/ui-theme": "0.8.4-main.74a063c4e0"
-  },
-  "publishConfig": {
-    "access": "public"
+    "@dxos/react-ui": "0.8.4-main.765dc60934",
+    "@dxos/ui-theme": "0.8.4-main.765dc60934"
   }
 }

package/src/DeckPlugin.node.ts

@@ -0,0 +1,17 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+
+import { AppGraphBuilder, OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+
+export const DeckPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  Plugin.make,
+);
+
+export default DeckPlugin;

package/src/DeckPlugin.test.ts

@@ -0,0 +1,27 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { ActivationEvents } from '@dxos/app-framework';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { DeckPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('DeckPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [DeckPlugin()],
+    });
+
+    expect(harness.manager.getActive()).toContain(moduleId('AppGraphBuilder'));
+
+    await harness.fire(ActivationEvents.SetupOperationHandler);
+    expect(harness.manager.getActive()).toContain(moduleId('OperationHandler'));
+  });
+});

package/src/DeckPlugin.ts

@@ -6,7 +6,7 @@ import { setAutoFreeze } from 'immer';
 
 import { ActivationEvent, ActivationEvents, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
-import { translations as stackTranslations } from '@dxos/react-ui-stack';
+import { translations as stackTranslations } from '@dxos/react-ui-stack/translations';
 
 import {
   AppGraphBuilder,
@@ -19,10 +19,9 @@ import {
   UrlHandler,
 } from '#capabilities';
 import { meta } from '#meta';
+import { translations } from '#translations';
 import { DeckEvents } from '#types';
 
-import { translations } from './translations';
-
 // NOTE(Zan): When producing values with immer, we shouldn't auto-freeze them because
 //   our signal implementation needs to add some hidden properties to the produced values.
 // TODO(Zan): Move this to a more global location if we use immer more broadly.
@@ -35,7 +34,7 @@ export const DeckPlugin = Plugin.define(meta).pipe(
   AppPlugin.addTranslationsModule({ translations: [...translations, ...stackTranslations] }),
   Plugin.addModule({
     activatesOn: AppActivationEvents.SetupSettings,
-    activatesAfter: [DeckEvents.SettingsReady],
+    firesAfterActivation: [DeckEvents.SettingsReady],
     activate: DeckSettings,
   }),
   Plugin.addModule({
@@ -47,7 +46,7 @@ export const DeckPlugin = Plugin.define(meta).pipe(
     //   Should this be a different event?
     //   Should settings store be renamed to be more generic?
     activatesOn: ActivationEvent.oneOf(AppActivationEvents.SetupSettings, AppActivationEvents.SetupAppGraph),
-    activatesAfter: [AppActivationEvents.LayoutReady, DeckEvents.StateReady],
+    firesAfterActivation: [AppActivationEvents.LayoutReady, DeckEvents.StateReady],
     activate: DeckState,
   }),
   Plugin.addModule({
@@ -64,3 +63,5 @@ export const DeckPlugin = Plugin.define(meta).pipe(
   }),
   Plugin.make,
 );
+
+export default DeckPlugin;

package/src/capabilities/app-graph-builder.ts

@@ -6,8 +6,8 @@ import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { AppCapabilities, AppNode, LayoutOperation } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/operation';
-import { AttentionCapabilities } from '@dxos/plugin-attention/types';
+import { Operation } from '@dxos/compute';
+import { AttentionCapabilities } from '@dxos/plugin-attention';
 import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 
 import { meta } from '#meta';
@@ -38,7 +38,7 @@ export default Capability.makeModule(
             //     );
             //   },
             //   properties: {
-            //     label: ['toggle fullscreen label', { ns: meta.id }],
+            //     label: ['toggle-fullscreen.label', { ns: meta.id }],
             //     icon: 'ph--arrows-out--regular',
             //     keyBinding: {
             //       macos: 'ctrl+meta+f',
@@ -103,8 +103,8 @@ export default Capability.makeModule(
               properties: {
                 label: [
                   state.sidebarState === 'expanded'
-                    ? 'collapse navigation sidebar label'
-                    : 'open navigation sidebar label',
+                    ? 'collapse-navigation-sidebar.label'
+                    : 'open-navigation-sidebar.label',
                   { ns: meta.id },
                 ],
                 icon: 'ph--sidebar--regular',
@@ -112,7 +112,7 @@ export default Capability.makeModule(
                   macos: "meta+'",
                 },
                 disposition: 'pin-end',
-                position: 'hoist',
+                position: 'fallback',
                 l0Breakpoint: 'lg',
               },
             };

package/src/capabilities/index.ts

@@ -3,7 +3,7 @@
 //
 
 import { Capability } from '@dxos/app-framework';
-import { OperationHandlerSet } from '@dxos/operation';
+import { OperationHandlerSet } from '@dxos/compute';
 
 export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
 export const CheckAppScheme = Capability.lazy('CheckAppScheme', () => import('./check-app-scheme'));

package/src/capabilities/operation-handler.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import type { OperationHandlerSet } from '@dxos/operation';
+import type { OperationHandlerSet } from '@dxos/compute';
 
 import { DeckOperationHandlerSet } from '#operations';
 

package/src/capabilities/react-surface.tsx

@@ -19,8 +19,7 @@ export default Capability.makeModule(() =>
     Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
         id: 'plugin-settings',
-        role: 'article',
-        filter: AppSurface.settingsArticle(meta.id),
+        filter: AppSurface.settings(AppSurface.Article, meta.id),
         component: ({ data: { subject } }) => {
           const { settings, updateSettings } = useSettingsState<Settings.Settings>(subject.atom);
           return <DeckSettings settings={settings} onSettingsChange={updateSettings} />;

package/src/capabilities/settings.ts

@@ -20,7 +20,7 @@ export default Capability.makeModule(() =>
         showHints: false,
         enableDeck: false,
         enableStatusbar: false,
-        enableNativeRedirect: !import.meta.env.DEV,
+        enableNativeRedirect: false,
         encapsulatedPlanks: false,
       }),
     });

package/src/capabilities/tools.ts

@@ -16,11 +16,11 @@ import {
   createIntent,
 } from '@dxos/app-framework';
 import { type OperationInvoker } from '@dxos/app-framework/plugin-operation/invoker';
+import { LayoutOperation } from '@dxos/app-toolkit';
 import { invariant } from '@dxos/invariant';
 import { trim } from '@dxos/util';
 
 import { meta } from '#meta';
-import { DeckOperation } from '#operations';
 
 // TODO(burdon): Factor out.
 declare global {
@@ -59,8 +59,8 @@ export default Capability.makeModule(() =>
           invariant(invokePromise, 'No operation invoker');
 
           if (part === 'multi') {
-            const { error } = await invokePromise(DeckOperation.ChangeCompanion, {
-              companion: id,
+            const { error } = await invokePromise(LayoutOperation.UpdateCompanion, {
+              subject: id,
             });
             if (error) {
               return ToolResult.Error(error.message);

package/src/capabilities/url-handler.ts

@@ -9,14 +9,15 @@ import {
   AppCapabilities,
   LayoutOperation,
   NOT_FOUND_PATH,
+  expandPath,
   fromUrlPath,
   getWorkspaceFromPath,
   toUrlPath,
 } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
 import { runAndForwardErrors } from '@dxos/effect';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
-import { Operation } from '@dxos/operation';
 import { Node } from '@dxos/plugin-graph';
 import { isTauri } from '@dxos/util';
 
@@ -66,6 +67,7 @@ export default Capability.makeModule(
     };
 
     const handleNavigation = Effect.fn(function* (url?: URL) {
+      const { graph } = yield* Capability.get(AppCapabilities.AppGraph);
       const resolvedUrl = url ?? new URL(window.location.href);
       // When native redirect is active, check-app-scheme owns the initial dispatch
       // to prevent one-time tokens from being consumed before the native app can use them.
@@ -119,6 +121,9 @@ export default Capability.makeModule(
         // Multi-mode: restore planks from query params.
         const plankIds = deserializePlanks(resolvedUrl);
         if (plankIds.length > 0) {
+          for (const plankId of plankIds) {
+            expandPath(graph, plankId);
+          }
           updateState((state) => updateActiveDeck(state, { active: plankIds, initialized: true }));
         }
       }

package/src/components/DeckSettings/DeckSettings.stories.tsx

@@ -6,7 +6,8 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
+
 import { DeckSettings } from './DeckSettings';
 
 const meta = {

package/src/components/DeckSettings/DeckSettings.tsx

@@ -5,7 +5,7 @@
 import React from 'react';
 
 import { type AppSurface } from '@dxos/app-toolkit/ui';
-import { Input, useTranslation } from '@dxos/react-ui';
+import { useTranslation } from '@dxos/react-ui';
 import { Settings as SettingsForm } from '@dxos/react-ui-form';
 
 import { meta } from '#meta';
@@ -21,52 +21,13 @@ export const DeckSettings = ({ settings, onSettingsChange }: DeckSettingsProps)
   return (
     <SettingsForm.Viewport>
       <SettingsForm.Section title={t('settings.title', { ns: meta.id })}>
-        <SettingsForm.Item title={t('settings.enable-deck.label')} description={t('settings.enable-deck.description')}>
-          <Input.Switch
-            disabled={!onSettingsChange}
-            checked={settings.enableDeck}
-            onCheckedChange={(checked) => onSettingsChange?.((s) => ({ ...s, enableDeck: checked }))}
-          />
-        </SettingsForm.Item>
-        <SettingsForm.Item
-          title={t('settings.encapsulated-planks.label')}
-          description={t('settings.encapsulated-planks.description')}
-        >
-          <Input.Switch
-            disabled={!onSettingsChange}
-            checked={settings.encapsulatedPlanks ?? false}
-            onCheckedChange={(checked) => onSettingsChange?.((s) => ({ ...s, encapsulatedPlanks: checked }))}
-          />
-        </SettingsForm.Item>
-        <SettingsForm.Item
-          title={t('settings.enable-statusbar.label')}
-          description={t('settings.enable-statusbar.description')}
-        >
-          <Input.Switch
-            disabled={!onSettingsChange}
-            checked={settings.enableStatusbar}
-            onCheckedChange={(checked) => onSettingsChange?.((s) => ({ ...s, enableStatusbar: checked }))}
-          />
-        </SettingsForm.Item>
-        <SettingsForm.Item title={t('settings.show-hints.label')} description={t('settings.show-hints.description')}>
-          <Input.Switch
-            disabled={!onSettingsChange}
-            checked={settings.showHints}
-            onCheckedChange={(checked) => onSettingsChange?.((s) => ({ ...s, showHints: checked }))}
-          />
-        </SettingsForm.Item>
-        {!isSocket && (
-          <SettingsForm.Item
-            title={t('settings.native-redirect.label')}
-            description={t('settings.native-redirect.description')}
-          >
-            <Input.Switch
-              disabled={!onSettingsChange}
-              checked={settings.enableNativeRedirect}
-              onCheckedChange={(checked) => onSettingsChange?.((s) => ({ ...s, enableNativeRedirect: checked }))}
-            />
-          </SettingsForm.Item>
-        )}
+        <SettingsForm.FieldSet
+          readonly={!onSettingsChange}
+          schema={Settings.Settings}
+          visible={(path) => path !== 'enableNativeRedirect' || !isSocket}
+          values={settings}
+          onValuesChanged={(values) => onSettingsChange?.(() => values)}
+        />
       </SettingsForm.Section>
     </SettingsForm.Viewport>
   );

package/src/components/Matrix/Matrix.stories.tsx

@@ -9,7 +9,7 @@ import { Capabilities, Capability, Plugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Surface } from '@dxos/app-framework/ui';
 import { Graph } from '@dxos/app-graph';
-import { AppActivationEvents } from '@dxos/app-toolkit';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 import { Obj } from '@dxos/echo';
 import { corePlugins } from '@dxos/plugin-testing';
 import { random } from '@dxos/random';
@@ -18,16 +18,16 @@ import { useAttentionAttributes } from '@dxos/react-ui-attention';
 import { withAttention } from '@dxos/react-ui-attention/testing';
 import { type MosaicTileProps, Mosaic } from '@dxos/react-ui-mosaic';
 import { StackContext } from '@dxos/react-ui-stack';
-import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { Syntax } from '@dxos/react-ui-syntax-highlighter';
 import { Loading, withLayout, withTheme } from '@dxos/react-ui/testing';
 import { Text } from '@dxos/schema';
 import { Organization, Person } from '@dxos/types';
 
-import { DeckState } from '#capabilities';
+import { DeckState, OperationHandler } from '#capabilities';
 import { meta as pluginMeta } from '#meta';
+import { translations } from '#translations';
 
 import { Plank } from '../../containers/Plank';
-import { translations } from '../../translations';
 import { Matrix, type MatrixController, type MatrixRootProps } from './Matrix';
 
 random.seed(123);
@@ -38,6 +38,9 @@ const TestPlugin = Plugin.define(pluginMeta).pipe(
     activatesOn: AppActivationEvents.AppGraphReady,
     activate: () => DeckState(),
   }),
+  AppPlugin.addOperationHandlerModule({
+    activate: OperationHandler,
+  }),
   Plugin.make,
 );
 
@@ -55,13 +58,15 @@ const StoryTile = (props: MosaicTileProps<Obj.Any>) => {
               <p>{Obj.getLabel(props.data)}</p>
             </Toolbar.Root>
           </Panel.Toolbar>
-          <Json.Root data={props.data}>
+          <Syntax.Root data={props.data}>
             <Panel.Content asChild>
-              <Json.Content>
-                <Json.Data />
-              </Json.Content>
+              <Syntax.Content>
+                <Syntax.Viewport>
+                  <Syntax.Code />
+                </Syntax.Viewport>
+              </Syntax.Content>
             </Panel.Content>
-          </Json.Root>
+          </Syntax.Root>
         </Panel.Root>
       </Focus.Item>
     </Mosaic.Tile>
@@ -106,11 +111,13 @@ const TestExtension = Capability.contributes(
       }
 
       return (
-        <Json.Root data={subject}>
-          <Json.Content>
-            <Json.Data />
-          </Json.Content>
-        </Json.Root>
+        <Syntax.Root data={subject}>
+          <Syntax.Content>
+            <Syntax.Viewport>
+              <Syntax.Code />
+            </Syntax.Viewport>
+          </Syntax.Content>
+        </Syntax.Root>
       );
     },
   }),
@@ -155,7 +162,7 @@ const DefaultStory = ({ Tile }: DefaultStoryProps) => {
   const currentIndex = items.findIndex((item) => item.id === current);
 
   return (
-    <Mosaic.Root classNames='dx-container'>
+    <Mosaic.Root>
       <Matrix.Root Tile={Tile} items={items} current={current} onCurrentChange={handleCurrentChange} ref={controller}>
         <Panel.Root>
           <Panel.Toolbar asChild>

package/src/components/Matrix/Matrix.tsx

@@ -96,7 +96,7 @@ const MatrixRoot = forwardRef<MatrixController, MatrixRootProps>(
           return;
         }
 
-        const tile = viewport.querySelector<HTMLElement>(`[data-mosaic-tile-id="${CSS.escape(id)}"]`);
+        const tile = viewport.querySelector<HTMLElement>(`[data-object-id="${CSS.escape(id)}"]`);
         if (!tile) {
           return;
         }