@dxos/plugin-simple-layout 0.8.4-main.422d1c7879 → 0.8.4-main.4f23b4e393

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-simple-layout",
-  "version": "0.8.4-main.422d1c7879",
+  "version": "0.8.4-main.4f23b4e393",
   "description": "Simple layout plugin for minimal UI contexts like popover windows.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -13,19 +13,62 @@
   "sideEffects": true,
   "type": "module",
   "imports": {
-    "#capabilities": "./src/capabilities/index.ts",
-    "#components": "./src/components/index.ts",
-    "#hooks": "./src/hooks/index.ts",
-    "#meta": "./src/meta.ts",
-    "#operations": "./src/operations/index.ts",
-    "#types": "./src/types/index.ts"
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "default": "./dist/lib/neutral/components/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",
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
+    "#plugin": {
+      "source": "./src/SimpleLayoutPlugin.ts",
+      "types": "./dist/types/src/SimpleLayoutPlugin.d.ts",
+      "default": "./dist/lib/neutral/SimpleLayoutPlugin.mjs"
+    },
+    "#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",
+      "default": "./dist/lib/neutral/types/index.mjs"
+    }
   },
   "exports": {
     ".": {
       "source": "./src/index.ts",
-      "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs",
-      "types": "./dist/types/src/index.d.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",
@@ -39,23 +82,24 @@
     "@radix-ui/react-context": "1.1.1",
     "@tauri-apps/plugin-deep-link": "^2.2.0",
     "@tauri-apps/plugin-haptics": "^2.3.2",
-    "@dxos/app-toolkit": "0.8.4-main.422d1c7879",
-    "@dxos/app-framework": "0.8.4-main.422d1c7879",
-    "@dxos/context": "0.8.4-main.422d1c7879",
-    "@dxos/effect": "0.8.4-main.422d1c7879",
-    "@dxos/async": "0.8.4-main.422d1c7879",
-    "@dxos/log": "0.8.4-main.422d1c7879",
-    "@dxos/echo": "0.8.4-main.422d1c7879",
-    "@dxos/operation": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-client": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-attention": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-menu": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-mosaic": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-stack": "0.8.4-main.422d1c7879",
-    "@dxos/schema": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-search": "0.8.4-main.422d1c7879",
-    "@dxos/util": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-graph": "0.8.4-main.422d1c7879"
+    "@dxos/app-toolkit": "0.8.4-main.4f23b4e393",
+    "@dxos/app-framework": "0.8.4-main.4f23b4e393",
+    "@dxos/async": "0.8.4-main.4f23b4e393",
+    "@dxos/context": "0.8.4-main.4f23b4e393",
+    "@dxos/effect": "0.8.4-main.4f23b4e393",
+    "@dxos/compute": "0.8.4-main.4f23b4e393",
+    "@dxos/echo": "0.8.4-main.4f23b4e393",
+    "@dxos/log": "0.8.4-main.4f23b4e393",
+    "@dxos/plugin-graph": "0.8.4-main.4f23b4e393",
+    "@dxos/plugin-client": "0.8.4-main.4f23b4e393",
+    "@dxos/react-ui-list": "0.8.4-main.4f23b4e393",
+    "@dxos/react-ui-menu": "0.8.4-main.4f23b4e393",
+    "@dxos/react-ui-search": "0.8.4-main.4f23b4e393",
+    "@dxos/react-ui-mosaic": "0.8.4-main.4f23b4e393",
+    "@dxos/react-ui-attention": "0.8.4-main.4f23b4e393",
+    "@dxos/react-ui-stack": "0.8.4-main.4f23b4e393",
+    "@dxos/util": "0.8.4-main.4f23b4e393",
+    "@dxos/schema": "0.8.4-main.4f23b4e393"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
@@ -63,23 +107,23 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/plugin-preview": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-search": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-space": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-testing": "0.8.4-main.422d1c7879",
-    "@dxos/schema": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui": "0.8.4-main.422d1c7879",
-    "@dxos/storybook-utils": "0.8.4-main.422d1c7879",
-    "@dxos/app-graph": "0.8.4-main.422d1c7879",
-    "@dxos/ui-theme": "0.8.4-main.422d1c7879"
+    "vite": "^8.0.10",
+    "@dxos/app-graph": "0.8.4-main.4f23b4e393",
+    "@dxos/plugin-preview": "0.8.4-main.4f23b4e393",
+    "@dxos/plugin-search": "0.8.4-main.4f23b4e393",
+    "@dxos/plugin-testing": "0.8.4-main.4f23b4e393",
+    "@dxos/plugin-space": "0.8.4-main.4f23b4e393",
+    "@dxos/react-ui": "0.8.4-main.4f23b4e393",
+    "@dxos/storybook-utils": "0.8.4-main.4f23b4e393",
+    "@dxos/ui-theme": "0.8.4-main.4f23b4e393",
+    "@dxos/schema": "0.8.4-main.4f23b4e393"
   },
   "peerDependencies": {
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.422d1c7879",
-    "@dxos/ui-theme": "0.8.4-main.422d1c7879"
+    "@dxos/react-ui": "0.8.4-main.4f23b4e393",
+    "@dxos/ui-theme": "0.8.4-main.4f23b4e393"
   },
   "publishConfig": {
     "access": "public"

package/src/SimpleLayoutPlugin.ts

@@ -15,10 +15,9 @@ import {
   UrlHandler,
 } from '#capabilities';
 import { meta } from '#meta';
+import { translations } from '#translations';
 import { SimpleLayoutEvents } from '#types';
 
-import { translations } from './translations';
-
 export type SimpleLayoutPluginOptions = {
   /** Determines if running in popover window context (hides mobile-specific UI). */
   isPopover?: boolean;
@@ -56,3 +55,5 @@ export const SimpleLayoutPlugin = Plugin.define<SimpleLayoutPluginOptions>(meta)
   }),
   Plugin.make,
 );
+
+export default SimpleLayoutPlugin;

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

@@ -11,7 +11,7 @@ import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const extensions = yield* GraphBuilder.createExtension({
-      id: 'org.dxos.plugin.simple-layout.not-found',
+      id: 'org.dxos.plugin.simpleLayout.not-found',
       match: NodeMatcher.whenRoot,
       connector: () => Effect.succeed([AppNode.makeNotFound()]),
     });

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 OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(

package/src/capabilities/operation-handler.ts

@@ -3,7 +3,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 { SimpleLayoutOperationHandlerSet } from '#operations';
 

package/src/capabilities/react-surface.tsx

@@ -18,7 +18,7 @@ type SurfaceData = {
   properties: Record<string, any>;
 };
 
-const ALLOWED_DISPOSITIONS = ['workspace', 'user-account', 'pin-end', 'alternate-tree'];
+const ALLOWED_DISPOSITIONS = ['workspace', 'user-account', 'pin-end'];
 
 export default Capability.makeModule(() =>
   Effect.succeed(

package/src/capabilities/state.tsx

@@ -9,10 +9,9 @@ import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import { Node } from '@dxos/plugin-graph';
 
-import { type SimpleLayoutState } from '#types';
-import { SimpleLayoutState as SimpleLayoutStateCapability } from '#types';
+import { SimpleLayoutCapabilities } from '#types';
 
-const defaultState: SimpleLayoutState = {
+const defaultState: SimpleLayoutCapabilities.SimpleLayoutState = {
   dialogOpen: false,
   workspace: Node.RootId,
   previousWorkspace: Node.RootId,
@@ -23,12 +22,12 @@ const defaultState: SimpleLayoutState = {
 };
 
 export type SimpleLayoutStateOptions = {
-  initialState?: Partial<SimpleLayoutState>;
+  initialState?: Partial<SimpleLayoutCapabilities.SimpleLayoutState>;
 };
 
 export default Capability.makeModule(({ initialState }: SimpleLayoutStateOptions = {}) =>
   Effect.sync(() => {
-    const stateAtom = Atom.make<SimpleLayoutState>({ ...defaultState, ...initialState });
+    const stateAtom = Atom.make<SimpleLayoutCapabilities.SimpleLayoutState>({ ...defaultState, ...initialState });
 
     const layoutAtom = Atom.make((get): AppCapabilities.Layout => {
       const state = get(stateAtom);
@@ -45,7 +44,7 @@ export default Capability.makeModule(({ initialState }: SimpleLayoutStateOptions
     });
 
     return [
-      Capability.contributes(SimpleLayoutStateCapability, stateAtom),
+      Capability.contributes(SimpleLayoutCapabilities.State, stateAtom),
       Capability.contributes(AppCapabilities.Layout, layoutAtom),
     ];
   }),

package/src/capabilities/url-handler.ts

@@ -10,7 +10,7 @@ import { runAndForwardErrors } from '@dxos/effect';
 import { log } from '@dxos/log';
 import { isTauri } from '@dxos/util';
 
-import { type SimpleLayoutState, SimpleLayoutState as SimpleLayoutStateCapability } from '#types';
+import { SimpleLayoutCapabilities } from '#types';
 
 /**
  * URL handler for simple layout that syncs browser URL with layout state.
@@ -99,19 +99,22 @@ export default Capability.makeModule(
     // Sync URL with layout state changes.
     let lastWorkspace: string | undefined;
     let lastActive: string | undefined;
-    const unsubscribe = yield* Capabilities.subscribeAtom(SimpleLayoutStateCapability, (state: SimpleLayoutState) => {
-      const { workspace, active } = state;
-
-      if (workspace !== lastWorkspace || active !== lastActive) {
-        lastWorkspace = workspace;
-        lastActive = active;
-
-        const path = active ? toUrlPath(active) : toUrlPath(workspace);
-        if (window.location.pathname !== path) {
-          history.pushState(null, '', `${path}${window.location.search}`);
+    const unsubscribe = yield* Capabilities.subscribeAtom(
+      SimpleLayoutCapabilities.State,
+      (state: SimpleLayoutCapabilities.SimpleLayoutState) => {
+        const { workspace, active } = state;
+
+        if (workspace !== lastWorkspace || active !== lastActive) {
+          lastWorkspace = workspace;
+          lastActive = active;
+
+          const path = active ? toUrlPath(active) : toUrlPath(workspace);
+          if (window.location.pathname !== path) {
+            history.pushState(null, '', `${path}${window.location.search}`);
+          }
         }
-      }
-    });
+      },
+    );
 
     return Capability.contributes(Capabilities.Null, null, () =>
       Effect.sync(() => {

package/src/components/ContentError.stories.tsx

@@ -7,7 +7,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import { ErrorFallback } from '@dxos/react-ui';
 import { withTheme } from '@dxos/react-ui/testing';
 
-import { translations } from '../translations';
+import { translations } from '#translations';
 
 const meta = {
   title: 'plugins/plugin-simple-layout/components/ErrorFallback',

package/src/components/Home/Home.tsx

@@ -100,7 +100,7 @@ const WorkspaceTile: MosaicStackTileComponent<Node.Node> = (props) => {
       fullWidth
       tabIndex={-1} // TODO(burdon): Use Mosaic.Focus.
       data-selected={isSelected}
-      classNames={mx('dx-focus-ring', isSelected && 'bg-hover-overlay')}
+      classNames={mx('dx-focus-ring', isSelected && 'bg-selected-surface')}
       onClick={handleSelect}
       ref={cardRef}
     >

package/src/components/Loading/Loading.tsx

@@ -6,5 +6,5 @@ import React from 'react';
 
 // TODO(burdon): Show skeleton: https://github.com/dxos/dxos/issues/8259
 export const Loading = () => {
-  return <div role='none' className='grid place-items-center dx-attention-surface' />;
+  return <div className='grid place-items-center dx-attention-surface' />;
 };

package/src/components/MobileLayout/MobileLayout.tsx

@@ -56,7 +56,6 @@ const MobileLayoutRoot = forwardRef<HTMLDivElement, MobileLayoutRootProps>(
       <MobileLayoutProvider keyboardOpen={keyboardOpen}>
         <div
           {...props}
-          role='none'
           style={{
             height: 'calc(100vh - var(--kb-height, 0px))',
             transition: `height ${keyboardOpen ? 0 : transition}ms ease-out`,
@@ -95,7 +94,6 @@ const MobileLayoutPanel = forwardRef<HTMLDivElement, MobileLayoutPanelProps>(
     return (
       <div
         {...props}
-        role='none'
         style={{
           paddingTop: safe?.top ? 'env(safe-area-inset-top)' : undefined,
           paddingBottom: safe?.bottom ? `calc((1 - var(--kb-open, 0)) * env(safe-area-inset-bottom))` : undefined,

package/src/components/NavBranch/NavBranch.tsx

@@ -35,12 +35,8 @@ export const NavBranch = ({ id }: NavBranchProps) => {
 
   const children = useConnections(graph, id, 'child');
 
-  // TODO(wittjosiah): Move alternate-tree nodes to a non-child relation so they don't need filtering.
   const visibleChildren = useMemo(
-    () =>
-      children.filter(
-        (node) => node.properties.disposition !== 'alternate-tree' && node.properties.disposition !== 'hidden',
-      ),
+    () => children.filter((node) => node.properties.disposition !== 'hidden'),
     [children],
   );
 
@@ -106,7 +102,7 @@ const NavBranchTile: MosaicStackTileComponent<Node.Node> = (props) => {
       fullWidth
       tabIndex={-1} // TODO(burdon): Use Mosaic.Focus.
       data-selected={isSelected}
-      classNames={mx('dx-focus-ring cursor-pointer', isSelected && 'bg-hover-overlay')}
+      classNames={mx('dx-focus-ring cursor-pointer', isSelected && 'bg-selected-surface')}
       onClick={handleSelect}
     >
       <Card.Toolbar>

package/src/components/SimpleLayout/AppBar.stories.tsx

@@ -11,7 +11,8 @@ import { type ActionGraphProps, createMenuAction } from '@dxos/react-ui-menu';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { withRegistry } from '@dxos/storybook-utils';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
+
 import { MobileLayout } from '../MobileLayout';
 import { AppBar, type AppBarProps } from './AppBar';
 

package/src/components/SimpleLayout/NavBar.stories.tsx

@@ -11,7 +11,8 @@ import { type ActionGraphProps, createGapSeparator, createMenuAction, createMenu
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { withRegistry } from '@dxos/storybook-utils';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
+
 import { NavBar } from './NavBar';
 
 const MAIN_MENU_GROUP_ID = 'navbar-main-menu';

package/src/components/SimpleLayout/SimpleLayout.stories.tsx

@@ -9,19 +9,19 @@ import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { AppActivationEvents } from '@dxos/app-toolkit';
 import { Collection } from '@dxos/echo';
-import { ClientPlugin } from '@dxos/plugin-client';
-import { SearchPlugin } from '@dxos/plugin-search';
-import { SpacePlugin } from '@dxos/plugin-space';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { SearchPlugin } from '@dxos/plugin-search/plugin';
+import { SpacePlugin } from '@dxos/plugin-space/plugin';
 import { corePlugins } from '@dxos/plugin-testing';
-import { translations as searchTranslation } from '@dxos/react-ui-search';
+import { translations as searchTranslation } from '@dxos/react-ui-search/translations';
 import { withLayout } from '@dxos/react-ui/testing';
 
 import { ReactRoot, ReactSurface, State } from '#capabilities';
 import { meta as pluginMeta } from '#meta';
+import { translations } from '#translations';
 import { SimpleLayoutEvents } from '#types';
 
 import { type SimpleLayoutPluginOptions } from '../../SimpleLayoutPlugin';
-import { translations } from '../../translations';
 import { SimpleLayout } from './SimpleLayout';
 
 const createPluginManager = ({ isPopover }: { isPopover?: boolean }) => {

package/src/hooks/actions.ts

@@ -11,7 +11,7 @@ import { getLinkedVariant } from '@dxos/react-ui-attention';
 import { type ActionGraphProps } from '@dxos/react-ui-menu';
 import { byPosition } from '@dxos/util';
 
-import { type SimpleLayoutState } from '#types';
+import { SimpleLayoutCapabilities } from '#types';
 
 // TODO(wittjosiah): Factor out to shared location with plugin-deck.
 export const PLANK_COMPANION_TYPE = 'org.dxos.plugin.deck.plank-companion';
@@ -22,7 +22,9 @@ export type CompanionActionsConfig = {
   /** Optional: highlight companion with this variant */
   selectedVariant?: string;
   /** State updater for toggling the drawer. */
-  updateState: (fn: (state: SimpleLayoutState) => SimpleLayoutState) => void;
+  updateState: (
+    fn: (state: SimpleLayoutCapabilities.SimpleLayoutState) => SimpleLayoutCapabilities.SimpleLayoutState,
+  ) => void;
 };
 
 /**
@@ -32,7 +34,7 @@ export type CompanionActionsConfig = {
 // TODO(burdon): Use builder pattern.
 export const createCompanionActions = (
   graph: AppCapabilities.AppGraph['graph'],
-  stateAtom: Atom.Atom<SimpleLayoutState>,
+  stateAtom: Atom.Atom<SimpleLayoutCapabilities.SimpleLayoutState>,
   get: (atom: Atom.Atom<any>) => any,
   config: CompanionActionsConfig,
 ): Pick<ActionGraphProps, 'nodes' | 'edges'> => {

package/src/hooks/useAppBarProps.ts

@@ -3,7 +3,6 @@
 //
 
 import { Atom, useAtomValue } from '@effect-atom/atom-react';
-import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 import { useCallback, useMemo } from 'react';
 
@@ -16,7 +15,7 @@ import { type ActionGraphProps } from '@dxos/react-ui-menu';
 
 import { type AppBarProps } from '#components';
 import { meta } from '#meta';
-import { SimpleLayoutState as SimpleLayoutStateCapability } from '#types';
+import { SimpleLayoutCapabilities } from '#types';
 
 /**
  * Hook that computes all AppBar props from the app graph.
@@ -24,7 +23,7 @@ import { SimpleLayoutState as SimpleLayoutStateCapability } from '#types';
  */
 export const useAppBarProps = (): Omit<AppBarProps, 'classNames'> => {
   const { t } = useTranslation(meta.id);
-  const stateAtom = useCapability(SimpleLayoutStateCapability);
+  const stateAtom = useCapability(SimpleLayoutCapabilities.State);
   const state = useAtomValue(stateAtom);
   const { graph } = useAppGraph();
   const { invokePromise } = useOperationInvoker();
@@ -55,25 +54,6 @@ export const useAppBarProps = (): Omit<AppBarProps, 'classNames'> => {
           relation: 'child',
         }));
 
-        // Add alternate-tree action (e.g. Settings) from the workspace node.
-        const workspaceConnections = state.workspace ? get(graph.connections(state.workspace, 'child')) : [];
-        const alternateTreeNode = workspaceConnections.find(
-          (node: Node.Node) => node.properties.disposition === 'alternate-tree',
-        );
-        if (alternateTreeNode && activeId !== alternateTreeNode.id) {
-          const settingsAction = {
-            id: `appbar-settings-${alternateTreeNode.id}`,
-            type: Node.ActionType,
-            data: () => Effect.promise(() => invokePromise(LayoutOperation.Open, { subject: [alternateTreeNode.id] })),
-            properties: {
-              label: alternateTreeNode.properties.label ?? alternateTreeNode.id,
-              icon: alternateTreeNode.properties.icon ?? 'ph--placeholder--regular',
-            },
-          };
-          nodes.push(settingsAction);
-          edges.push({ source: 'root', target: settingsAction.id, relation: 'child' });
-        }
-
         return { nodes, edges };
       }),
     [graph, stateAtom],

package/src/hooks/useDrawerActions.ts

@@ -14,7 +14,7 @@ import { type ActionExecutor, type ActionGraphProps, createGapSeparator } from '
 
 import { useMobileLayout } from '#components';
 import { meta } from '#meta';
-import { SimpleLayoutState as SimpleLayoutStateCapability } from '#types';
+import { SimpleLayoutCapabilities } from '#types';
 
 import { createCompanionActions } from './actions';
 import { useSimpleLayoutState } from './useSimpleLayoutState';
@@ -31,7 +31,7 @@ export type DrawerActions = {
  */
 export const useDrawerActions = (consumerName: string): DrawerActions => {
   const { t } = useTranslation(meta.id);
-  const stateAtom = useCapability(SimpleLayoutStateCapability);
+  const stateAtom = useCapability(SimpleLayoutCapabilities.State);
   const { graph } = useAppGraph();
   const runAction = useActionRunner();
   const { updateState } = useSimpleLayoutState();

package/src/hooks/useNavbarActions.ts

@@ -17,7 +17,7 @@ import {
 } from '@dxos/react-ui-menu';
 
 import { meta } from '#meta';
-import { SimpleLayoutState } from '#types';
+import { SimpleLayoutCapabilities } from '#types';
 
 import { createCompanionActions } from './actions';
 import { useSimpleLayoutState } from './useSimpleLayoutState';
@@ -39,7 +39,7 @@ export const useNavbarActions = (): NavbarActions => {
   const { t } = useTranslation(meta.id);
   const { graph } = useAppGraph();
   const runAction = useActionRunner();
-  const stateAtom = useCapability(SimpleLayoutState);
+  const stateAtom = useCapability(SimpleLayoutCapabilities.State);
   const { updateState } = useSimpleLayoutState();
 
   // Create a computed atom that derives everything from graph connections and state.

package/src/hooks/useSimpleLayoutState.ts

@@ -7,20 +7,22 @@ import { useCallback, useContext } from 'react';
 
 import { useCapability } from '@dxos/app-framework/ui';
 
-import { SimpleLayoutState } from '#types';
+import { SimpleLayoutCapabilities } from '#types';
 
 export type UseSimpleLayoutState = {
-  state: SimpleLayoutState;
-  updateState: (fn: (current: SimpleLayoutState) => SimpleLayoutState) => void;
+  state: SimpleLayoutCapabilities.SimpleLayoutState;
+  updateState: (
+    fn: (current: SimpleLayoutCapabilities.SimpleLayoutState) => SimpleLayoutCapabilities.SimpleLayoutState,
+  ) => void;
 };
 
 export const useSimpleLayoutState = (): UseSimpleLayoutState => {
   const registry = useContext(RegistryContext);
-  const stateAtom = useCapability(SimpleLayoutState);
+  const stateAtom = useCapability(SimpleLayoutCapabilities.State);
   const state = useAtomValue(stateAtom);
 
   const updateState = useCallback(
-    (fn: (current: SimpleLayoutState) => SimpleLayoutState) => {
+    (fn: (current: SimpleLayoutCapabilities.SimpleLayoutState) => SimpleLayoutCapabilities.SimpleLayoutState) => {
       registry.set(stateAtom, fn(registry.get(stateAtom)));
     },
     [registry, stateAtom],

package/src/index.ts

@@ -2,4 +2,5 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './SimpleLayoutPlugin';
+export * from './meta';
+export * from './types';

package/src/meta.ts

@@ -6,11 +6,12 @@ import { type Plugin } from '@dxos/app-framework';
 import { trim } from '@dxos/util';
 
 export const meta: Plugin.Meta = {
-  id: 'org.dxos.plugin.simple-layout',
+  id: 'org.dxos.plugin.simpleLayout',
   name: 'Simple Layout',
   description: trim`
     Minimal layout plugin for simplified UI contexts like popover windows.
     Provides basic content rendering without sidebars or complex navigation.
   `,
   icon: 'ph--layout--regular',
+  tags: ['system'],
 };

package/src/operations/close.ts

@@ -3,7 +3,7 @@
 import * as Effect from 'effect/Effect';
 
 import { LayoutOperation } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { layoutStateAccess } from './state-access';
 

package/src/operations/index.ts

@@ -1,6 +1,6 @@
 // Copyright 2025 DXOS.org
 
-import { OperationHandlerSet } from '@dxos/operation';
+import { OperationHandlerSet } from '@dxos/compute';
 
 export const SimpleLayoutOperationHandlerSet = OperationHandlerSet.lazy(
   () => import('./close'),

package/src/operations/open.ts

@@ -9,9 +9,9 @@ import {
   createEdgeExistenceChecker,
   validateNavigationTarget,
 } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
 import { Context } from '@dxos/context';
-import { Operation } from '@dxos/operation';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { layoutStateAccess } from './state-access';
 

package/src/operations/revert-workspace.ts

@@ -3,7 +3,7 @@
 import * as Effect from 'effect/Effect';
 
 import { LayoutOperation } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 import { layoutStateAccess } from './state-access';
 

package/src/operations/set-layout-mode.ts

@@ -3,7 +3,7 @@
 import * as Effect from 'effect/Effect';
 
 import { LayoutOperation } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
 const handler: Operation.WithHandler<typeof LayoutOperation.SetLayoutMode> = LayoutOperation.SetLayoutMode.pipe(
   Operation.withHandler(Effect.fnUntraced(function* () {})),