@dxos/plugin-deck 0.8.4-main.5ad4a44 → 0.8.4-main.66e292d

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-deck",
-  "version": "0.8.4-main.5ad4a44",
+  "version": "0.8.4-main.66e292d",
   "description": "DXOS Surface plugin for the main application layout.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -40,52 +40,52 @@
     "@preact/signals-core": "^1.12.1",
     "@radix-ui/react-context": "1.1.1",
     "immer": "^10.1.1",
-    "@dxos/ai": "0.8.4-main.5ad4a44",
-    "@dxos/assistant": "0.8.4-main.5ad4a44",
-    "@dxos/blueprints": "0.8.4-main.5ad4a44",
-    "@dxos/async": "0.8.4-main.5ad4a44",
-    "@dxos/debug": "0.8.4-main.5ad4a44",
-    "@dxos/echo": "0.8.4-main.5ad4a44",
-    "@dxos/app-framework": "0.8.4-main.5ad4a44",
-    "@dxos/invariant": "0.8.4-main.5ad4a44",
-    "@dxos/echo-signals": "0.8.4-main.5ad4a44",
-    "@dxos/keyboard": "0.8.4-main.5ad4a44",
-    "@dxos/live-object": "0.8.4-main.5ad4a44",
-    "@dxos/local-storage": "0.8.4-main.5ad4a44",
-    "@dxos/log": "0.8.4-main.5ad4a44",
-    "@dxos/plugin-graph": "0.8.4-main.5ad4a44",
-    "@dxos/plugin-attention": "0.8.4-main.5ad4a44",
-    "@dxos/react-client": "0.8.4-main.5ad4a44",
-    "@dxos/plugin-theme": "0.8.4-main.5ad4a44",
-    "@dxos/react-ui-form": "0.8.4-main.5ad4a44",
-    "@dxos/react-ui-attention": "0.8.4-main.5ad4a44",
-    "@dxos/react-ui-tabs": "0.8.4-main.5ad4a44",
-    "@dxos/react-ui-stack": "0.8.4-main.5ad4a44",
-    "@dxos/react-ui-text-tooltip": "0.8.4-main.5ad4a44",
-    "@dxos/util": "0.8.4-main.5ad4a44",
-    "@dxos/plugin-observability": "0.8.4-main.5ad4a44"
+    "@dxos/ai": "0.8.4-main.66e292d",
+    "@dxos/assistant": "0.8.4-main.66e292d",
+    "@dxos/async": "0.8.4-main.66e292d",
+    "@dxos/blueprints": "0.8.4-main.66e292d",
+    "@dxos/app-framework": "0.8.4-main.66e292d",
+    "@dxos/echo": "0.8.4-main.66e292d",
+    "@dxos/debug": "0.8.4-main.66e292d",
+    "@dxos/echo-signals": "0.8.4-main.66e292d",
+    "@dxos/keyboard": "0.8.4-main.66e292d",
+    "@dxos/live-object": "0.8.4-main.66e292d",
+    "@dxos/local-storage": "0.8.4-main.66e292d",
+    "@dxos/log": "0.8.4-main.66e292d",
+    "@dxos/plugin-attention": "0.8.4-main.66e292d",
+    "@dxos/plugin-graph": "0.8.4-main.66e292d",
+    "@dxos/plugin-observability": "0.8.4-main.66e292d",
+    "@dxos/plugin-theme": "0.8.4-main.66e292d",
+    "@dxos/react-client": "0.8.4-main.66e292d",
+    "@dxos/react-ui-attention": "0.8.4-main.66e292d",
+    "@dxos/invariant": "0.8.4-main.66e292d",
+    "@dxos/react-ui-form": "0.8.4-main.66e292d",
+    "@dxos/react-ui-stack": "0.8.4-main.66e292d",
+    "@dxos/react-ui-tabs": "0.8.4-main.66e292d",
+    "@dxos/react-ui-text-tooltip": "0.8.4-main.66e292d",
+    "@dxos/util": "0.8.4-main.66e292d"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.42.4",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "0.92.1",
     "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.1",
+    "@types/react-dom": "~19.2.2",
     "effect": "3.18.3",
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "vite": "7.1.9",
-    "@dxos/react-ui": "0.8.4-main.5ad4a44",
-    "@dxos/react-ui-theme": "0.8.4-main.5ad4a44",
-    "@dxos/storybook-utils": "0.8.4-main.5ad4a44"
+    "@dxos/react-ui-theme": "0.8.4-main.66e292d",
+    "@dxos/storybook-utils": "0.8.4-main.66e292d",
+    "@dxos/react-ui": "0.8.4-main.66e292d"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.5ad4a44",
-    "@dxos/react-ui-theme": "0.8.4-main.5ad4a44"
+    "@dxos/react-ui": "0.8.4-main.66e292d",
+    "@dxos/react-ui-theme": "0.8.4-main.66e292d"
   },
   "publishConfig": {
     "access": "public"

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

@@ -2,13 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
+import { Atom } from '@effect-atom/atom-react';
 import * as Function from 'effect/Function';
 import * as Option from 'effect/Option';
 
 import { Capabilities, LayoutAction, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
 import { AttentionCapabilities } from '@dxos/plugin-attention';
-import { ROOT_ID, createExtension, rxFromSignal } from '@dxos/plugin-graph';
+import { ROOT_ID, atomFromSignal, createExtension } from '@dxos/plugin-graph';
 
 import { meta } from '../meta';
 
@@ -20,7 +20,7 @@ export default (context: PluginContext) =>
     createExtension({
       id: meta.id,
       actions: (node) =>
-        Rx.make((get) =>
+        Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
@@ -29,23 +29,23 @@ export default (context: PluginContext) =>
 
               // NOTE(Zan): This is currently disabled.
               // TODO(Zan): Fullscreen needs to know the active node and provide that to the layout part.
-              const _fullscreen = {
-                id: `${LayoutAction.UpdateLayout._tag}/fullscreen`,
-                data: async () => {
-                  const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-                  await dispatch(
-                    createIntent(LayoutAction.SetLayoutMode, { part: 'mode', options: { mode: 'fullscreen' } }),
-                  );
-                },
-                properties: {
-                  label: ['toggle fullscreen label', { ns: meta.id }],
-                  icon: 'ph--arrows-out--regular',
-                  keyBinding: {
-                    macos: 'ctrl+meta+f',
-                    windows: 'shift+ctrl+f',
-                  },
-                },
-              };
+              // const _fullscreen = {
+              //   id: `${LayoutAction.UpdateLayout._tag}/fullscreen`,
+              //   data: async () => {
+              //     const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+              //     await dispatch(
+              //       createIntent(LayoutAction.SetLayoutMode, { part: 'mode', options: { mode: 'fullscreen' } }),
+              //     );
+              //   },
+              //   properties: {
+              //     label: ['toggle fullscreen label', { ns: meta.id }],
+              //     icon: 'ph--arrows-out--regular',
+              //     keyBinding: {
+              //       macos: 'ctrl+meta+f',
+              //       windows: 'shift+ctrl+f',
+              //     },
+              //   },
+              // };
 
               const closeCurrent = {
                 id: `${LayoutAction.Close._tag}/current`,
@@ -112,7 +112,7 @@ export default (context: PluginContext) =>
                 properties: {
                   label: [
                     get(
-                      rxFromSignal(() =>
+                      atomFromSignal(() =>
                         state.sidebarState === 'expanded'
                           ? 'collapse navigation sidebar label'
                           : 'open navigation sidebar label',
@@ -131,7 +131,7 @@ export default (context: PluginContext) =>
               };
 
               return get(
-                rxFromSignal(() =>
+                atomFromSignal(() =>
                   !state.deck.solo ? [closeCurrent, closeOthers, closeAll, toggleSidebar] : [toggleSidebar],
                 ),
               );

package/src/capabilities/intent-resolver.ts

@@ -91,7 +91,6 @@ export default (context: PluginContext) =>
         Schema.is(LayoutAction.UpdateComplementary.fields.input)(data),
       resolve: ({ subject, options }) => {
         const layout = context.getCapability(DeckCapabilities.MutableDeckState);
-
         if (layout.complementarySidebarPanel !== subject) {
           layout.complementarySidebarPanel = subject;
         }

package/src/capabilities/react-root.tsx

@@ -4,7 +4,8 @@
 
 import React, { useCallback } from 'react';
 
-import { Capabilities, contributes, useCapability } from '@dxos/app-framework';
+import { Capabilities, contributes } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/react';
 
 import { DeckLayout } from '../components';
 import { meta } from '../meta';

package/src/capabilities/settings.ts

@@ -16,6 +16,7 @@ export default () => {
     enableNativeRedirect: false,
     newPlankPositioning: 'start',
     overscroll: 'none',
+    encapsulatedPlanks: false,
   });
 
   return contributes(Capabilities.Settings, {

package/src/capabilities/state.ts

@@ -30,6 +30,9 @@ const migrateSidebarState = () => {
   });
 };
 
+/**
+ * @deprecated
+ */
 export const DeckStateFactory = () => {
   migrateSidebarState();
 
@@ -69,6 +72,11 @@ export const DeckStateFactory = () => {
     .prop({ key: 'activeDeck', type: LocalStorageStore.string() })
     .prop({ key: 'previousDeck', type: LocalStorageStore.string() });
 
+  // Don't allow fullscreen mode to be persisted to prevent getting stuck in it.
+  if (state.values.deck.fullscreen) {
+    state.values.deck.fullscreen = false;
+  }
+
   const layout = live<Capabilities.Layout>({
     get mode() {
       return getMode(state.values.deck);

package/src/capabilities/toolkit.ts

@@ -7,14 +7,22 @@ import * as Toolkit from '@effect/ai/Toolkit';
 import * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
 
-import { Capabilities, LayoutAction, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
+import {
+  Capabilities,
+  type Capability,
+  LayoutAction,
+  type PluginContext,
+  contributes,
+  createIntent,
+} from '@dxos/app-framework';
+import { GenericToolkit } from '@dxos/assistant';
 import { ArtifactId } from '@dxos/assistant';
 import { type SpaceId } from '@dxos/keys';
 import { trim } from '@dxos/util';
 
 import { DeckCapabilities } from './capabilities';
 
-class DeckToolkit extends Toolkit.make(
+const Toolkit$ = Toolkit.make(
   Tool.make('open-item', {
     description: trim`
       Opens an item in the application.
@@ -25,17 +33,19 @@ class DeckToolkit extends Toolkit.make(
     success: Schema.Any,
     failure: Schema.Never,
   }),
-) {
-  static layer = (context: PluginContext) =>
-    DeckToolkit.toLayer({
+);
+
+export namespace DeckToolkit {
+  export const Toolkit = Toolkit$;
+
+  export const createLayer = (context: PluginContext) =>
+    Toolkit$.toLayer({
       'open-item': ({ id }) =>
         Effect.gen(function* () {
           const state = context.getCapability(DeckCapabilities.DeckState);
-          const dxn = ArtifactId.toDXN(id, state.activeDeck as SpaceId);
-
-          // TODO(wittjosiah): Support other variants.
-          const echoDxn = dxn.asEchoDXN();
-          if (!echoDxn) {
+          const dxn = ArtifactId.toDXN(id, state.activeDeck as SpaceId).asEchoDXN();
+          if (!dxn) {
+            // TODO(wittjosiah): Support other variants.
             throw new Error(`Invalid object ID: ${id}`);
           }
 
@@ -43,7 +53,7 @@ class DeckToolkit extends Toolkit.make(
           const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
           yield* dispatch(
             createIntent(LayoutAction.Open, {
-              subject: [`${echoDxn.spaceId!}:${echoDxn.echoId}`],
+              subject: [`${dxn.spaceId!}:${dxn.echoId}`],
               part: 'main',
             }),
           );
@@ -51,7 +61,6 @@ class DeckToolkit extends Toolkit.make(
     });
 }
 
-export default (context: PluginContext) => [
-  contributes(Capabilities.Toolkit, DeckToolkit),
-  contributes(Capabilities.ToolkitHandler, DeckToolkit.layer(context)),
+export default (context: PluginContext): Capability<any>[] => [
+  contributes(Capabilities.Toolkit, GenericToolkit.make(DeckToolkit.Toolkit, DeckToolkit.createLayer(context))),
 ];

package/src/components/DeckLayout/ActiveNode.tsx

@@ -4,7 +4,7 @@
 
 import React from 'react';
 
-import { Surface, useAppGraph } from '@dxos/app-framework';
+import { Surface, useAppGraph } from '@dxos/app-framework/react';
 import { useNode } from '@dxos/plugin-graph';
 import { useAttended } from '@dxos/react-ui-attention';
 

package/src/components/DeckLayout/Banner.tsx

@@ -4,7 +4,7 @@
 
 import React from 'react';
 
-import { Surface } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/react';
 import { type ThemedClassName, useTranslation } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 

package/src/components/DeckLayout/ContentEmpty.tsx

@@ -4,7 +4,7 @@
 
 import React from 'react';
 
-import { Surface, useCapability } from '@dxos/app-framework';
+import { Surface, useCapability } from '@dxos/app-framework/react';
 
 import { DeckCapabilities } from '../../capabilities';
 import { useBreakpoints } from '../../hooks';

package/src/components/DeckLayout/DeckLayout.stories.tsx

@@ -0,0 +1,63 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import React from 'react';
+
+import { Events, IntentPlugin, SettingsPlugin, defineModule, definePlugin } from '@dxos/app-framework';
+import { withPluginManager } from '@dxos/app-framework/testing';
+import { AttentionPlugin } from '@dxos/plugin-attention';
+import { GraphPlugin } from '@dxos/plugin-graph';
+import { withTheme } from '@dxos/react-ui/testing';
+
+import { DeckStateFactory, LayoutIntentResolver } from '../../capabilities';
+import { meta as pluginMeta } from '../../meta';
+import { translations } from '../../translations';
+
+import { DeckLayout } from './DeckLayout';
+
+const meta = {
+  title: 'plugins/plugin-deck/DeckLayout',
+  component: DeckLayout,
+  render: (args) => <DeckLayout {...args} />,
+  decorators: [
+    withTheme,
+    withPluginManager({
+      plugins: [
+        AttentionPlugin(),
+        SettingsPlugin(),
+        IntentPlugin(),
+        GraphPlugin(),
+        definePlugin(
+          {
+            id: 'example.com/plutin/testing',
+            name: 'Testing',
+          },
+          () => [
+            defineModule({
+              id: `${pluginMeta.id}/module/deck-state`,
+              activatesOn: Events.AppGraphReady,
+              activate: () => DeckStateFactory(),
+            }),
+            defineModule({
+              id: `${pluginMeta.id}/module/layout-intent-resolver`,
+              activatesOn: Events.SetupIntentResolver,
+              activate: LayoutIntentResolver,
+            }),
+          ],
+        )(),
+      ],
+    }),
+  ],
+  parameters: {
+    layout: 'fullscreen',
+    translations,
+  },
+} satisfies Meta<typeof DeckLayout>;
+
+export default meta;
+
+type Story = StoryObj<typeof meta>;
+
+export const Default: Story = {};