@dxos/plugin-deck 0.8.4-main.84f28bd → 0.8.4-main.937b3ca

package/package.json

@@ -1,28 +1,34 @@
 {
   "name": "@dxos/plugin-deck",
-  "version": "0.8.4-main.84f28bd",
+  "version": "0.8.4-main.937b3ca",
   "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",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/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"
     }
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
       "types": [
-        "dist/types/src/types.d.ts"
+        "dist/types/src/types/index.d.ts"
       ]
     }
   },
@@ -31,57 +37,61 @@
     "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.4.13",
+    "@effect-atom/atom-react": "^0.4.6",
+    "@effect/ai": "0.32.1",
+    "@effect/experimental": "0.57.11",
+    "@fluentui/react-tabster": "9.26.11",
     "@radix-ui/react-context": "1.1.1",
-    "effect": "3.16.13",
     "immer": "^10.1.1",
-    "@dxos/app-framework": "0.8.4-main.84f28bd",
-    "@dxos/async": "0.8.4-main.84f28bd",
-    "@dxos/ai": "0.8.4-main.84f28bd",
-    "@dxos/echo": "0.8.4-main.84f28bd",
-    "@dxos/debug": "0.8.4-main.84f28bd",
-    "@dxos/echo-schema": "0.8.4-main.84f28bd",
-    "@dxos/invariant": "0.8.4-main.84f28bd",
-    "@dxos/echo-signals": "0.8.4-main.84f28bd",
-    "@dxos/keyboard": "0.8.4-main.84f28bd",
-    "@dxos/live-object": "0.8.4-main.84f28bd",
-    "@dxos/artifact": "0.8.4-main.84f28bd",
-    "@dxos/local-storage": "0.8.4-main.84f28bd",
-    "@dxos/log": "0.8.4-main.84f28bd",
-    "@dxos/plugin-attention": "0.8.4-main.84f28bd",
-    "@dxos/plugin-graph": "0.8.4-main.84f28bd",
-    "@dxos/plugin-theme": "0.8.4-main.84f28bd",
-    "@dxos/plugin-observability": "0.8.4-main.84f28bd",
-    "@dxos/react-client": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-attention": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-stack": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-form": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-tabs": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-text-tooltip": "0.8.4-main.84f28bd",
-    "@dxos/util": "0.8.4-main.84f28bd"
+    "@dxos/ai": "0.8.4-main.937b3ca",
+    "@dxos/async": "0.8.4-main.937b3ca",
+    "@dxos/blueprints": "0.8.4-main.937b3ca",
+    "@dxos/app-framework": "0.8.4-main.937b3ca",
+    "@dxos/assistant": "0.8.4-main.937b3ca",
+    "@dxos/debug": "0.8.4-main.937b3ca",
+    "@dxos/echo": "0.8.4-main.937b3ca",
+    "@dxos/effect": "0.8.4-main.937b3ca",
+    "@dxos/keyboard": "0.8.4-main.937b3ca",
+    "@dxos/invariant": "0.8.4-main.937b3ca",
+    "@dxos/log": "0.8.4-main.937b3ca",
+    "@dxos/operation": "0.8.4-main.937b3ca",
+    "@dxos/plugin-attention": "0.8.4-main.937b3ca",
+    "@dxos/plugin-graph": "0.8.4-main.937b3ca",
+    "@dxos/plugin-observability": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-attention": "0.8.4-main.937b3ca",
+    "@dxos/react-client": "0.8.4-main.937b3ca",
+    "@dxos/plugin-theme": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-form": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-stack": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-tabs": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-mosaic": "0.8.4-main.937b3ca",
+    "@dxos/react-ui-text-tooltip": "0.8.4-main.937b3ca",
+    "@dxos/ui-types": "0.8.4-main.937b3ca",
+    "@dxos/util": "0.8.4-main.937b3ca"
   },
   "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.84f28bd",
-    "@dxos/storybook-utils": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-theme": "0.8.4-main.84f28bd"
+    "@effect-atom/atom-react": "^0.4.6",
+    "@effect/platform": "0.93.6",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.19.11",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "7.1.9",
+    "@dxos/storybook-utils": "0.8.4-main.937b3ca",
+    "@dxos/plugin-testing": "0.8.4-main.937b3ca",
+    "@dxos/react-ui": "0.8.4-main.937b3ca",
+    "@dxos/ui-theme": "0.8.4-main.937b3ca"
   },
   "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.84f28bd",
-    "@dxos/react-ui-theme": "0.8.4-main.84f28bd"
+    "@effect-atom/atom-react": "^0.4.6",
+    "@effect/platform": "0.93.6",
+    "effect": "3.19.11",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/ui-theme": "0.8.4-main.937b3ca",
+    "@dxos/react-ui": "0.8.4-main.937b3ca"
   },
   "publishConfig": {
     "access": "public"

package/src/DeckPlugin.ts

@@ -4,7 +4,7 @@
 
 import { setAutoFreeze } from 'immer';
 
-import { allOf, Capabilities, contributes, defineModule, definePlugin, Events, oneOf } from '@dxos/app-framework';
+import { ActivationEvent, Common, Plugin } from '@dxos/app-framework';
 import { translations as stackTranslations } from '@dxos/react-ui-stack';
 
 import {
@@ -12,75 +12,59 @@ import {
   CheckAppScheme,
   DeckSettings,
   DeckState,
-  LayoutIntentResolver,
+  LayoutOperationResolver,
   ReactRoot,
   ReactSurface,
-  Tools,
+  Toolkit,
   UrlHandler,
 } from './capabilities';
-import { DeckEvents } from './events';
 import { meta } from './meta';
 import { translations } from './translations';
+import { DeckEvents } from './types';
 
 // 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.
 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(
+  Plugin.addModule({
+    activatesOn: Common.ActivationEvent.SetupSettings,
+    activatesAfter: [DeckEvents.SettingsReady],
+    activate: DeckSettings,
+  }),
+  Plugin.addModule({
+    activatesOn: DeckEvents.SettingsReady,
+    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(Common.ActivationEvent.SetupSettings, Common.ActivationEvent.SetupAppGraph),
+    activatesAfter: [Common.ActivationEvent.LayoutReady, DeckEvents.StateReady],
+    activate: DeckState,
+  }),
+  Common.Plugin.addTranslationsModule({ translations: [...translations, ...stackTranslations] }),
+  Plugin.addModule({
+    activatesOn: Common.ActivationEvent.Startup,
+    activate: ReactRoot,
+  }),
+  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
+  Common.Plugin.addOperationResolverModule({ activate: LayoutOperationResolver }),
+  Common.Plugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  // Plugin.addModule({
+  //   activatesOn: Events.SetupArtifactDefinition,
+  //   activate: Tools,
+  // }),
+  Plugin.addModule({
+    // TODO(wittjosiah): Shouldn't use the startup event.
+    activatesOn: Common.ActivationEvent.Startup,
+    activate: Toolkit,
+  }),
+  Plugin.addModule({
+    activatesOn: ActivationEvent.allOf(Common.ActivationEvent.OperationInvokerReady, DeckEvents.StateReady),
+    activate: UrlHandler,
+  }),
+  Plugin.make,
+);

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

@@ -0,0 +1,118 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability, Common } from '@dxos/app-framework';
+import { Operation } from '@dxos/operation';
+import { AttentionCapabilities } from '@dxos/plugin-attention';
+import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
+
+import { meta } from '../../meta';
+import { DeckCapabilities } from '../../types';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const extensions = yield* GraphBuilder.createExtension({
+      id: meta.id,
+      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: `${Common.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(Common.LayoutOperation.Close, { subject: [attended] });
+              }
+            }),
+            properties: {
+              label: ['close current label', { ns: meta.id }],
+              icon: 'ph--x--regular',
+            },
+          };
+
+          const closeOthers = {
+            id: `${Common.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(Common.LayoutOperation.Close, { subject: ids });
+            }),
+            properties: {
+              label: ['close others label', { ns: meta.id }],
+              icon: 'ph--x-square--regular',
+            },
+          };
+
+          const closeAll = {
+            id: `${Common.LayoutOperation.Close.meta.key}/all`,
+            data: Effect.fnUntraced(function* () {
+              const deck = yield* DeckCapabilities.getDeck();
+              yield* Operation.invoke(Common.LayoutOperation.Close, { subject: deck.active });
+            }),
+            properties: {
+              label: ['close all label', { ns: meta.id }],
+              icon: 'ph--x-circle--regular',
+            },
+          };
+
+          const state = get(yield* Capability.get(DeckCapabilities.State));
+          const deck = state.decks[state.activeDeck];
+
+          const toggleSidebar = {
+            id: `${Common.LayoutOperation.UpdateSidebar.meta.key}/nav`,
+            data: Effect.fnUntraced(function* () {
+              yield* Common.Capability.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 Capability.contributes(Common.Capability.AppGraphBuilder, extensions);
+  }),
+);

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

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));

package/src/capabilities/{check-app-scheme.ts → check-app-scheme/check-app-scheme.ts}

@@ -2,10 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
+import * as Effect from 'effect/Effect';
 
-import { DECK_PLUGIN } from '../meta';
-import { type DeckSettingsProps } from '../types';
+import { Capability, Common } from '@dxos/app-framework';
+
+import { DeckCapabilities } from '../../types';
 
 const isSocket = !!(globalThis as any).__args;
 
@@ -30,11 +31,11 @@ const checkAppScheme = (url: string) => {
   });
 };
 
-export default async (context: PluginContext) => {
-  const settings = context.getCapability(Capabilities.SettingsStore).getStore<DeckSettingsProps>(DECK_PLUGIN)?.value;
-  if (!isSocket && settings?.enableNativeRedirect) {
-    checkAppScheme(appScheme);
-  }
-
-  return contributes(Capabilities.Null, null);
-};
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const settings = yield* Common.Capability.getAtomValue(DeckCapabilities.Settings);
+    if (!isSocket && settings?.enableNativeRedirect) {
+      checkAppScheme(appScheme);
+    }
+  }),
+);

package/src/capabilities/check-app-scheme/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const CheckAppScheme = Capability.lazy('CheckAppScheme', () => import('./check-app-scheme'));

package/src/capabilities/index.ts

@@ -2,17 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import { lazy } from '@dxos/app-framework';
-
-export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
-export const CheckAppScheme = lazy(() => import('./check-app-scheme'));
-export const DeckSettings = lazy(() => import('./settings'));
-export const DeckState = lazy(() => import('./state'));
-export const LayoutIntentResolver = lazy(() => import('./intent-resolver'));
-export const ReactRoot = lazy(() => import('./react-root'));
-export const ReactSurface = lazy(() => import('./react-surface'));
-export const Tools = lazy(() => import('./tools'));
-export const UrlHandler = lazy(() => import('./url-handler'));
-
-export * from './capabilities';
+export * from './app-graph-builder';
+export * from './check-app-scheme';
+export * from './operation-resolver';
+export * from './react-root';
+export * from './react-surface';
+export * from './settings';
 export * from './state';
+export * from './toolkit';
+// export * from './tools';
+export * from './url-handler';

package/src/capabilities/operation-resolver/index.ts

@@ -0,0 +1,10 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Capability, Capability as Capability$ } from '@dxos/app-framework';
+
+export const LayoutOperationResolver: Capability.LazyCapability = Capability$.lazy(
+  'LayoutOperationResolver',
+  () => import('./operation-resolver'),
+);