@dxos/plugin-deck 0.8.4-main.f9ba587 → 0.8.4-main.fcfe5033a5

package/package.json

@@ -1,28 +1,53 @@
 {
   "name": "@dxos/plugin-deck",
-  "version": "0.8.4-main.f9ba587",
+  "version": "0.8.4-main.fcfe5033a5",
   "description": "DXOS Surface plugin for the main application layout.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "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"
     },
+    "./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"
+    },
     "./types": {
-      "types": "./dist/types/src/types.d.ts",
-      "browser": "./dist/lib/browser/types.mjs"
+      "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"
     }
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
+      "operations": [
+        "dist/types/src/operations/index.d.ts"
+      ],
       "types": [
-        "dist/types/src/types.d.ts"
+        "dist/types/src/types/index.d.ts"
       ]
     }
   },
@@ -31,57 +56,74 @@
     "src"
   ],
   "dependencies": {
-    "@fluentui/react-tabster": "^9.24.2",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
+    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/ai": "0.33.2",
+    "@effect/experimental": "0.58.0",
+    "@fluentui/react-tabster": "9.26.11",
     "@radix-ui/react-context": "1.1.1",
-    "effect": "3.16.13",
+    "@tauri-apps/plugin-deep-link": "^2.2.0",
     "immer": "^10.1.1",
-    "@dxos/ai": "0.8.4-main.f9ba587",
-    "@dxos/app-framework": "0.8.4-main.f9ba587",
-    "@dxos/artifact": "0.8.4-main.f9ba587",
-    "@dxos/async": "0.8.4-main.f9ba587",
-    "@dxos/debug": "0.8.4-main.f9ba587",
-    "@dxos/echo": "0.8.4-main.f9ba587",
-    "@dxos/echo-schema": "0.8.4-main.f9ba587",
-    "@dxos/echo-signals": "0.8.4-main.f9ba587",
-    "@dxos/invariant": "0.8.4-main.f9ba587",
-    "@dxos/live-object": "0.8.4-main.f9ba587",
-    "@dxos/keyboard": "0.8.4-main.f9ba587",
-    "@dxos/local-storage": "0.8.4-main.f9ba587",
-    "@dxos/log": "0.8.4-main.f9ba587",
-    "@dxos/plugin-graph": "0.8.4-main.f9ba587",
-    "@dxos/plugin-attention": "0.8.4-main.f9ba587",
-    "@dxos/plugin-theme": "0.8.4-main.f9ba587",
-    "@dxos/plugin-observability": "0.8.4-main.f9ba587",
-    "@dxos/react-client": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-attention": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-form": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-stack": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-text-tooltip": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-tabs": "0.8.4-main.f9ba587",
-    "@dxos/util": "0.8.4-main.f9ba587"
+    "@dxos/ai": "0.8.4-main.fcfe5033a5",
+    "@dxos/app-framework": "0.8.4-main.fcfe5033a5",
+    "@dxos/app-toolkit": "0.8.4-main.fcfe5033a5",
+    "@dxos/async": "0.8.4-main.fcfe5033a5",
+    "@dxos/assistant": "0.8.4-main.fcfe5033a5",
+    "@dxos/context": "0.8.4-main.fcfe5033a5",
+    "@dxos/blueprints": "0.8.4-main.fcfe5033a5",
+    "@dxos/echo": "0.8.4-main.fcfe5033a5",
+    "@dxos/debug": "0.8.4-main.fcfe5033a5",
+    "@dxos/effect": "0.8.4-main.fcfe5033a5",
+    "@dxos/errors": "0.8.4-main.fcfe5033a5",
+    "@dxos/invariant": "0.8.4-main.fcfe5033a5",
+    "@dxos/log": "0.8.4-main.fcfe5033a5",
+    "@dxos/keyboard": "0.8.4-main.fcfe5033a5",
+    "@dxos/operation": "0.8.4-main.fcfe5033a5",
+    "@dxos/app-graph": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-attention": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-graph": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-observability": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-client": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-theme": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-client": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-error-boundary": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-form": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-attention": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-menu": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-mosaic": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-text-tooltip": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-tabs": "0.8.4-main.fcfe5033a5",
+    "@dxos/ui-types": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-stack": "0.8.4-main.fcfe5033a5",
+    "@dxos/util": "0.8.4-main.fcfe5033a5"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.88.0",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587",
-    "@dxos/storybook-utils": "0.8.4-main.f9ba587"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/react-hooks": "0.8.4-main.fcfe5033a5",
+    "@dxos/plugin-testing": "0.8.4-main.fcfe5033a5",
+    "@dxos/random": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui": "0.8.4-main.fcfe5033a5",
+    "@dxos/storybook-utils": "0.8.4-main.fcfe5033a5",
+    "@dxos/types": "0.8.4-main.fcfe5033a5",
+    "@dxos/schema": "0.8.4-main.fcfe5033a5",
+    "@dxos/ui-theme": "0.8.4-main.fcfe5033a5"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.fcfe5033a5",
+    "@dxos/ui-theme": "0.8.4-main.fcfe5033a5"
   },
   "publishConfig": {
     "access": "public"

package/src/DeckPlugin.ts

@@ -4,7 +4,8 @@
 
 import { setAutoFreeze } from 'immer';
 
-import { allOf, Capabilities, contributes, defineModule, definePlugin, Events, oneOf } from '@dxos/app-framework';
+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 {
@@ -12,14 +13,14 @@ import {
   CheckAppScheme,
   DeckSettings,
   DeckState,
-  LayoutIntentResolver,
+  OperationHandler,
   ReactRoot,
   ReactSurface,
-  Tools,
   UrlHandler,
-} from './capabilities';
-import { DeckEvents } from './events';
-import { meta } from './meta';
+} from '#capabilities';
+import { meta } from '#meta';
+import { DeckEvents } from '#types';
+
 import { translations } from './translations';
 
 // NOTE(Zan): When producing values with immer, we shouldn't auto-freeze them because
@@ -27,60 +28,39 @@ import { translations } from './translations';
 // TODO(Zan): Move this to a more global location if we use immer more broadly.
 setAutoFreeze(false);
 
-export const DeckPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/check-app-scheme`,
-      activatesOn: Events.SettingsReady,
-      activate: CheckAppScheme,
-    }),
-    defineModule({
-      id: `${meta.id}/module/settings`,
-      activatesOn: Events.SetupSettings,
-      activate: DeckSettings,
-    }),
-    defineModule({
-      id: `${meta.id}/module/layout`,
-      // TODO(wittjosiah): Does not integrate with settings store.
-      //   Should this be a different event?
-      //   Should settings store be renamed to be more generic?
-      activatesOn: oneOf(Events.SetupSettings, Events.SetupAppGraph),
-      activatesAfter: [Events.LayoutReady, DeckEvents.StateReady],
-      activate: DeckState,
-    }),
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, [...translations, ...stackTranslations]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-root`,
-      activatesOn: Events.Startup,
-      activate: ReactRoot,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/layout-intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: LayoutIntentResolver,
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-    defineModule({
-      id: `${meta.id}/module/tools`,
-      activatesOn: Events.SetupArtifactDefinition,
-      activate: Tools,
-    }),
-    defineModule({
-      id: `${meta.id}/module/url`,
-      activatesOn: allOf(Events.DispatcherReady, DeckEvents.StateReady),
-      activate: UrlHandler,
-    }),
-  ]);
+export const DeckPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations: [...translations, ...stackTranslations] }),
+  Plugin.addModule({
+    activatesOn: AppActivationEvents.SetupSettings,
+    firesAfterActivation: [DeckEvents.SettingsReady],
+    activate: DeckSettings,
+  }),
+  Plugin.addModule({
+    activatesOn: ActivationEvent.allOf(DeckEvents.SettingsReady, ActivationEvents.OperationInvokerReady),
+    activate: CheckAppScheme,
+  }),
+  Plugin.addModule({
+    // TODO(wittjosiah): Does not integrate with settings store.
+    //   Should this be a different event?
+    //   Should settings store be renamed to be more generic?
+    activatesOn: ActivationEvent.oneOf(AppActivationEvents.SetupSettings, AppActivationEvents.SetupAppGraph),
+    firesAfterActivation: [AppActivationEvents.LayoutReady, DeckEvents.StateReady],
+    activate: DeckState,
+  }),
+  Plugin.addModule({
+    activatesOn: ActivationEvents.Startup,
+    activate: ReactRoot,
+  }),
+  // Plugin.addModule({
+  //   activatesOn: Events.SetupArtifactDefinition,
+  //   activate: Tools,
+  // }),
+  Plugin.addModule({
+    activatesOn: ActivationEvent.allOf(ActivationEvents.OperationInvokerReady, DeckEvents.StateReady),
+    activate: UrlHandler,
+  }),
+  Plugin.make,
+);

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

@@ -2,140 +2,126 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
-import { Option, pipe } from 'effect';
+import * as Effect from 'effect/Effect';
 
-import { Capabilities, contributes, createIntent, LayoutAction, type PluginContext } from '@dxos/app-framework';
-import { AttentionCapabilities } from '@dxos/plugin-attention';
-import { createExtension, ROOT_ID, rxFromSignal } from '@dxos/plugin-graph';
+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 { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 
-import { DeckCapabilities } from './capabilities';
-import { DECK_PLUGIN } from '../meta';
+import { meta } from '#meta';
+import { DeckCapabilities } from '#types';
 
-export default (context: PluginContext) =>
-  contributes(
-    Capabilities.AppGraphBuilder,
-    createExtension({
-      id: DECK_PLUGIN,
-      actions: (node) =>
-        Rx.make((get) =>
-          pipe(
-            get(node),
-            Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
-            Option.map(() => {
-              const state = context.getCapability(DeckCapabilities.MutableDeckState);
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const extensions = yield* Effect.all([
+      GraphBuilder.createExtension({
+        id: 'not-found',
+        match: NodeMatcher.whenRoot,
+        connector: () => Effect.succeed([AppNode.makeNotFound()]),
+      }),
 
-              // 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: DECK_PLUGIN }],
-                  icon: 'ph--arrows-out--regular',
-                  keyBinding: {
-                    macos: 'ctrl+meta+f',
-                    windows: 'shift+ctrl+f',
-                  },
-                },
-              };
+      GraphBuilder.createExtension({
+        id: 'root',
+        match: NodeMatcher.whenRoot,
+        actions: (_node, get) =>
+          Effect.gen(function* () {
+            // 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.get(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`,
-                data: async () => {
-                  const attention = context.getCapability(AttentionCapabilities.Attention);
-                  const attended = attention.current.at(-1);
-                  if (attended) {
-                    const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-                    await dispatch(
-                      createIntent(LayoutAction.Close, {
-                        part: 'main',
-                        subject: [attended],
-                        options: { state: false },
-                      }),
-                    );
-                  }
-                },
-                properties: {
-                  label: ['close current label', { ns: DECK_PLUGIN }],
-                  icon: 'ph--x--regular',
-                },
-              };
+            const closeCurrent = {
+              id: `${LayoutOperation.Close.meta.key}.current`,
+              data: Effect.fnUntraced(function* () {
+                const attention = yield* Capability.get(AttentionCapabilities.Attention);
+                const attended = attention.getCurrent().at(-1);
+                if (attended) {
+                  yield* Operation.invoke(LayoutOperation.Close, { subject: [attended] });
+                }
+              }),
+              properties: {
+                label: ['close-current.label', { ns: meta.id }],
+                icon: 'ph--x--regular',
+              },
+            };
 
-              const closeOthers = {
-                id: `${LayoutAction.Close._tag}/others`,
-                data: async () => {
-                  const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-                  const attention = context.getCapability(AttentionCapabilities.Attention);
-                  const attended = attention.current.at(-1);
-                  const ids = state.deck.active.filter((id) => id !== attended) ?? [];
-                  await dispatch(
-                    createIntent(LayoutAction.Close, { part: 'main', subject: ids, options: { state: false } }),
-                  );
-                },
-                properties: {
-                  label: ['close others label', { ns: DECK_PLUGIN }],
-                  icon: 'ph--x-square--regular',
-                },
-              };
+            const closeOthers = {
+              id: `${LayoutOperation.Close.meta.key}.others`,
+              data: Effect.fnUntraced(function* () {
+                const attention = yield* Capability.get(AttentionCapabilities.Attention);
+                const deck = yield* DeckCapabilities.getDeck();
+                const attended = attention.getCurrent().at(-1);
+                const ids = deck.active.filter((id: string) => id !== attended) ?? [];
+                yield* Operation.invoke(LayoutOperation.Close, { subject: ids });
+              }),
+              properties: {
+                label: ['close-others.label', { ns: meta.id }],
+                icon: 'ph--x-square--regular',
+              },
+            };
 
-              const closeAll = {
-                id: `${LayoutAction.Close._tag}/all`,
-                data: async () => {
-                  const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-                  await dispatch(
-                    createIntent(LayoutAction.Close, {
-                      part: 'main',
-                      subject: state.deck.active,
-                      options: { state: false },
-                    }),
-                  );
-                },
-                properties: {
-                  label: ['close all label', { ns: DECK_PLUGIN }],
-                  icon: 'ph--x-circle--regular',
-                },
-              };
+            const closeAll = {
+              id: `${LayoutOperation.Close.meta.key}.all`,
+              data: Effect.fnUntraced(function* () {
+                const deck = yield* DeckCapabilities.getDeck();
+                yield* Operation.invoke(LayoutOperation.Close, { subject: deck.active });
+              }),
+              properties: {
+                label: ['close-all.label', { ns: meta.id }],
+                icon: 'ph--x-circle--regular',
+              },
+            };
 
-              const toggleSidebar = {
-                id: `${LayoutAction.UpdateSidebar._tag}/nav`,
-                data: async () => {
-                  state.sidebarState = state.sidebarState === 'expanded' ? 'collapsed' : 'expanded';
-                },
-                properties: {
-                  label: [
-                    get(
-                      rxFromSignal(() =>
-                        state.sidebarState === 'expanded'
-                          ? 'collapse navigation sidebar label'
-                          : 'open navigation sidebar label',
-                      ),
-                    ),
-                    { ns: DECK_PLUGIN },
-                  ],
-                  icon: 'ph--sidebar--regular',
-                  keyBinding: {
-                    macos: "meta+'",
-                  },
-                  disposition: 'pin-end',
-                  position: 'hoist',
-                  l0Breakpoint: 'lg',
+            const state = get(yield* Capability.get(DeckCapabilities.State));
+            const deck = state.decks[state.activeDeck];
+
+            const toggleSidebar = {
+              id: `${LayoutOperation.UpdateSidebar.meta.key}.nav`,
+              data: Effect.fnUntraced(function* () {
+                yield* Capabilities.updateAtomValue(DeckCapabilities.State, (s) => ({
+                  ...s,
+                  sidebarState: s.sidebarState === 'expanded' ? ('collapsed' as const) : ('expanded' as const),
+                }));
+              }),
+              properties: {
+                label: [
+                  state.sidebarState === 'expanded'
+                    ? 'collapse-navigation-sidebar.label'
+                    : 'open-navigation-sidebar.label',
+                  { ns: meta.id },
+                ],
+                icon: 'ph--sidebar--regular',
+                keyBinding: {
+                  macos: "meta+'",
                 },
-              };
+                disposition: 'pin-end',
+                position: 'hoist',
+                l0Breakpoint: 'lg',
+              },
+            };
+
+            return !deck?.solo ? [closeCurrent, closeOthers, closeAll, toggleSidebar] : [toggleSidebar];
+          }),
+      }),
+    ]);
 
-              return get(
-                rxFromSignal(() =>
-                  !state.deck.solo ? [closeCurrent, closeOthers, closeAll, toggleSidebar] : [toggleSidebar],
-                ),
-              );
-            }),
-            Option.getOrElse(() => []),
-          ),
-        ),
-    }),
-  );
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions.flat());
+  }),
+);