@dxos/plugin-deck 0.8.4-main.21d9917 → 0.8.4-main.2244d791bb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-deck",
-  "version": "0.8.4-main.21d9917",
+  "version": "0.8.4-main.2244d791bb",
   "description": "DXOS Surface plugin for the main application layout.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -37,61 +37,62 @@
     "src"
   ],
   "dependencies": {
-    "@effect-atom/atom": "^0.4.13",
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/ai": "0.32.1",
-    "@effect/experimental": "0.57.11",
+    "@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",
     "immer": "^10.1.1",
-    "@dxos/ai": "0.8.4-main.21d9917",
-    "@dxos/assistant": "0.8.4-main.21d9917",
-    "@dxos/app-framework": "0.8.4-main.21d9917",
-    "@dxos/async": "0.8.4-main.21d9917",
-    "@dxos/blueprints": "0.8.4-main.21d9917",
-    "@dxos/debug": "0.8.4-main.21d9917",
-    "@dxos/echo": "0.8.4-main.21d9917",
-    "@dxos/invariant": "0.8.4-main.21d9917",
-    "@dxos/log": "0.8.4-main.21d9917",
-    "@dxos/keyboard": "0.8.4-main.21d9917",
-    "@dxos/effect": "0.8.4-main.21d9917",
-    "@dxos/operation": "0.8.4-main.21d9917",
-    "@dxos/plugin-attention": "0.8.4-main.21d9917",
-    "@dxos/plugin-graph": "0.8.4-main.21d9917",
-    "@dxos/plugin-theme": "0.8.4-main.21d9917",
-    "@dxos/plugin-observability": "0.8.4-main.21d9917",
-    "@dxos/react-client": "0.8.4-main.21d9917",
-    "@dxos/react-ui-form": "0.8.4-main.21d9917",
-    "@dxos/react-ui-attention": "0.8.4-main.21d9917",
-    "@dxos/react-ui-mosaic": "0.8.4-main.21d9917",
-    "@dxos/react-ui-text-tooltip": "0.8.4-main.21d9917",
-    "@dxos/ui-types": "0.8.4-main.21d9917",
-    "@dxos/util": "0.8.4-main.21d9917",
-    "@dxos/react-ui-stack": "0.8.4-main.21d9917",
-    "@dxos/react-ui-tabs": "0.8.4-main.21d9917"
+    "@dxos/app-framework": "0.8.4-main.2244d791bb",
+    "@dxos/ai": "0.8.4-main.2244d791bb",
+    "@dxos/assistant": "0.8.4-main.2244d791bb",
+    "@dxos/async": "0.8.4-main.2244d791bb",
+    "@dxos/debug": "0.8.4-main.2244d791bb",
+    "@dxos/echo": "0.8.4-main.2244d791bb",
+    "@dxos/blueprints": "0.8.4-main.2244d791bb",
+    "@dxos/app-toolkit": "0.8.4-main.2244d791bb",
+    "@dxos/effect": "0.8.4-main.2244d791bb",
+    "@dxos/keyboard": "0.8.4-main.2244d791bb",
+    "@dxos/log": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-attention": "0.8.4-main.2244d791bb",
+    "@dxos/operation": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-graph": "0.8.4-main.2244d791bb",
+    "@dxos/invariant": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-theme": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-observability": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-attention": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-form": "0.8.4-main.2244d791bb",
+    "@dxos/react-client": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-mosaic": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-stack": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-text-tooltip": "0.8.4-main.2244d791bb",
+    "@dxos/ui-types": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-tabs": "0.8.4-main.2244d791bb",
+    "@dxos/util": "0.8.4-main.2244d791bb"
   },
   "devDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
+    "@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.19.11",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "vite": "7.1.9",
-    "@dxos/plugin-testing": "0.8.4-main.21d9917",
-    "@dxos/storybook-utils": "0.8.4-main.21d9917",
-    "@dxos/react-ui": "0.8.4-main.21d9917",
-    "@dxos/ui-theme": "0.8.4-main.21d9917"
+    "@dxos/plugin-testing": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui": "0.8.4-main.2244d791bb",
+    "@dxos/ui-theme": "0.8.4-main.2244d791bb",
+    "@dxos/storybook-utils": "0.8.4-main.2244d791bb"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
-    "effect": "3.19.11",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.21d9917",
-    "@dxos/ui-theme": "0.8.4-main.21d9917"
+    "@dxos/react-ui": "0.8.4-main.2244d791bb",
+    "@dxos/ui-theme": "0.8.4-main.2244d791bb"
   },
   "publishConfig": {
     "access": "public"

package/src/DeckPlugin.ts

@@ -4,7 +4,8 @@
 
 import { setAutoFreeze } from 'immer';
 
-import { ActivationEvent, Common, Plugin } 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 {
@@ -28,8 +29,12 @@ import { DeckEvents } from './types';
 setAutoFreeze(false);
 
 export const DeckPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addOperationResolverModule({ activate: LayoutOperationResolver }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations: [...translations, ...stackTranslations] }),
   Plugin.addModule({
-    activatesOn: Common.ActivationEvent.SetupSettings,
+    activatesOn: AppActivationEvents.SetupSettings,
     activatesAfter: [DeckEvents.SettingsReady],
     activate: DeckSettings,
   }),
@@ -41,29 +46,25 @@ export const DeckPlugin = Plugin.define(meta).pipe(
     // 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],
+    activatesOn: ActivationEvent.oneOf(AppActivationEvents.SetupSettings, AppActivationEvents.SetupAppGraph),
+    activatesAfter: [AppActivationEvents.LayoutReady, DeckEvents.StateReady],
     activate: DeckState,
   }),
-  Common.Plugin.addTranslationsModule({ translations: [...translations, ...stackTranslations] }),
   Plugin.addModule({
-    activatesOn: Common.ActivationEvent.Startup,
+    activatesOn: ActivationEvents.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,
+    activatesOn: ActivationEvents.Startup,
     activate: Toolkit,
   }),
   Plugin.addModule({
-    activatesOn: ActivationEvent.allOf(Common.ActivationEvent.OperationInvokerReady, DeckEvents.StateReady),
+    activatesOn: ActivationEvent.allOf(ActivationEvents.OperationInvokerReady, DeckEvents.StateReady),
     activate: UrlHandler,
   }),
   Plugin.make,

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

@@ -4,7 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities, LayoutOperation } from '@dxos/app-toolkit';
 import { Operation } from '@dxos/operation';
 import { AttentionCapabilities } from '@dxos/plugin-attention';
 import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
@@ -40,12 +41,12 @@ export default Capability.makeModule(
           // };
 
           const closeCurrent = {
-            id: `${Common.LayoutOperation.Close.meta.key}/current`,
+            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(Common.LayoutOperation.Close, { subject: [attended] });
+                yield* Operation.invoke(LayoutOperation.Close, { subject: [attended] });
               }
             }),
             properties: {
@@ -55,13 +56,13 @@ export default Capability.makeModule(
           };
 
           const closeOthers = {
-            id: `${Common.LayoutOperation.Close.meta.key}/others`,
+            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(Common.LayoutOperation.Close, { subject: ids });
+              yield* Operation.invoke(LayoutOperation.Close, { subject: ids });
             }),
             properties: {
               label: ['close others label', { ns: meta.id }],
@@ -70,10 +71,10 @@ export default Capability.makeModule(
           };
 
           const closeAll = {
-            id: `${Common.LayoutOperation.Close.meta.key}/all`,
+            id: `${LayoutOperation.Close.meta.key}/all`,
             data: Effect.fnUntraced(function* () {
               const deck = yield* DeckCapabilities.getDeck();
-              yield* Operation.invoke(Common.LayoutOperation.Close, { subject: deck.active });
+              yield* Operation.invoke(LayoutOperation.Close, { subject: deck.active });
             }),
             properties: {
               label: ['close all label', { ns: meta.id }],
@@ -85,9 +86,9 @@ export default Capability.makeModule(
           const deck = state.decks[state.activeDeck];
 
           const toggleSidebar = {
-            id: `${Common.LayoutOperation.UpdateSidebar.meta.key}/nav`,
+            id: `${LayoutOperation.UpdateSidebar.meta.key}/nav`,
             data: Effect.fnUntraced(function* () {
-              yield* Common.Capability.updateAtomValue(DeckCapabilities.State, (s) => ({
+              yield* Capabilities.updateAtomValue(DeckCapabilities.State, (s) => ({
                 ...s,
                 sidebarState: s.sidebarState === 'expanded' ? ('collapsed' as const) : ('expanded' as const),
               }));
@@ -113,6 +114,6 @@ export default Capability.makeModule(
         }),
     });
 
-    return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
   }),
 );

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

@@ -4,15 +4,19 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { isTauri } from '@dxos/util';
 
 import { DeckCapabilities } from '../../types';
 
-const isSocket = !!(globalThis as any).__args;
-
-// TODO(mjamesderocher): Can we get this directly from Socket?
-const appScheme = 'composer://';
+const APP_SCHEME = 'composer://';
 
+/**
+ * Attempts to redirect from the web app to the native desktop app using a custom URL scheme.
+ * Creates a hidden iframe that navigates to the custom scheme URL (e.g., composer://workspace/123).
+ * If the native app is installed and handles the scheme, the user will be redirected.
+ * The iframe is automatically removed after 3 seconds or when the page is hidden.
+ */
 // TODO(mjamesderocher): Factor out as part of NavigationPlugin.
 const checkAppScheme = (url: string) => {
   const iframe = document.createElement('iframe');
@@ -33,9 +37,9 @@ const checkAppScheme = (url: string) => {
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
-    const settings = yield* Common.Capability.getAtomValue(DeckCapabilities.Settings);
-    if (!isSocket && settings?.enableNativeRedirect) {
-      checkAppScheme(appScheme);
+    const settings = yield* Capabilities.getAtomValue(DeckCapabilities.Settings);
+    if (!isTauri() && settings?.enableNativeRedirect) {
+      checkAppScheme(APP_SCHEME);
     }
   }),
 );