@dxos/plugin-deck 0.8.4-main.422d1c7879 → 0.8.4-main.4668b7de9b

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-deck",
-  "version": "0.8.4-main.422d1c7879",
+  "version": "0.8.4-main.4668b7de9b",
   "description": "DXOS Surface plugin for the main application layout.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -8,84 +8,120 @@
     "type": "git",
     "url": "https://github.com/dxos/dxos"
   },
-  "license": "MIT",
+  "license": "FSL-1.1-Apache-2.0",
   "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"
+    "#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"
+    },
+    "#containers": {
+      "source": "./src/containers/index.ts",
+      "types": "./dist/types/src/containers/index.d.ts",
+      "default": "./dist/lib/neutral/containers/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": {
+        "workerd": "./src/DeckPlugin.workerd.ts",
+        "node": "./src/DeckPlugin.node.ts",
+        "default": "./src/DeckPlugin.ts"
+      },
+      "types": "./dist/types/src/DeckPlugin.d.ts",
+      "workerd": "./dist/lib/neutral/DeckPlugin.workerd.mjs",
+      "node": "./dist/lib/neutral/DeckPlugin.node.mjs",
+      "default": "./dist/lib/neutral/DeckPlugin.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",
       "types": "./dist/types/src/index.d.ts",
-      "browser": "./dist/lib/browser/index.mjs"
+      "default": "./dist/lib/neutral/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"
+    "./assets/PLUGIN.mdl": "./PLUGIN.mdl",
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
     },
-    "./types": {
-      "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"
+    "./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",
   "files": [
     "dist",
-    "src"
+    "src",
+    "PLUGIN.mdl"
   ],
   "dependencies": {
-    "@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",
-    "@tauri-apps/plugin-deep-link": "^2.2.0",
+    "@tauri-apps/plugin-deep-link": "^2.4.9",
     "immer": "^10.1.1",
-    "@dxos/ai": "0.8.4-main.422d1c7879",
-    "@dxos/app-graph": "0.8.4-main.422d1c7879",
-    "@dxos/app-toolkit": "0.8.4-main.422d1c7879",
-    "@dxos/assistant": "0.8.4-main.422d1c7879",
-    "@dxos/async": "0.8.4-main.422d1c7879",
-    "@dxos/blueprints": "0.8.4-main.422d1c7879",
-    "@dxos/context": "0.8.4-main.422d1c7879",
-    "@dxos/debug": "0.8.4-main.422d1c7879",
-    "@dxos/effect": "0.8.4-main.422d1c7879",
-    "@dxos/echo": "0.8.4-main.422d1c7879",
-    "@dxos/errors": "0.8.4-main.422d1c7879",
-    "@dxos/invariant": "0.8.4-main.422d1c7879",
-    "@dxos/keyboard": "0.8.4-main.422d1c7879",
-    "@dxos/app-framework": "0.8.4-main.422d1c7879",
-    "@dxos/operation": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-attention": "0.8.4-main.422d1c7879",
-    "@dxos/log": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-graph": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-client": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-observability": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-theme": "0.8.4-main.422d1c7879",
-    "@dxos/react-client": "0.8.4-main.422d1c7879",
-    "@dxos/react-error-boundary": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-attention": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-mosaic": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-form": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-menu": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-tabs": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-stack": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-text-tooltip": "0.8.4-main.422d1c7879",
-    "@dxos/ui-types": "0.8.4-main.422d1c7879",
-    "@dxos/util": "0.8.4-main.422d1c7879"
+    "@dxos/app-framework": "0.8.4-main.4668b7de9b",
+    "@dxos/app-graph": "0.8.4-main.4668b7de9b",
+    "@dxos/app-toolkit": "0.8.4-main.4668b7de9b",
+    "@dxos/compute": "0.8.4-main.4668b7de9b",
+    "@dxos/context": "0.8.4-main.4668b7de9b",
+    "@dxos/echo": "0.8.4-main.4668b7de9b",
+    "@dxos/async": "0.8.4-main.4668b7de9b",
+    "@dxos/effect": "0.8.4-main.4668b7de9b",
+    "@dxos/errors": "0.8.4-main.4668b7de9b",
+    "@dxos/keyboard": "0.8.4-main.4668b7de9b",
+    "@dxos/invariant": "0.8.4-main.4668b7de9b",
+    "@dxos/keys": "0.8.4-main.4668b7de9b",
+    "@dxos/log": "0.8.4-main.4668b7de9b",
+    "@dxos/operation": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-attention": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-client": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-observability": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-attention": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-form": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-mosaic": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-stack": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-tabs": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-text-tooltip": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-menu": "0.8.4-main.4668b7de9b",
+    "@dxos/ui-types": "0.8.4-main.4668b7de9b",
+    "@dxos/util": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-graph": "0.8.4-main.4668b7de9b"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -95,16 +131,16 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/plugin-testing": "0.8.4-main.422d1c7879",
-    "@dxos/react-hooks": "0.8.4-main.422d1c7879",
-    "@dxos/random": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui": "0.8.4-main.422d1c7879",
-    "@dxos/schema": "0.8.4-main.422d1c7879",
-    "@dxos/storybook-utils": "0.8.4-main.422d1c7879",
-    "@dxos/types": "0.8.4-main.422d1c7879",
-    "@dxos/ui-theme": "0.8.4-main.422d1c7879"
+    "vite": "^8.0.14",
+    "@dxos/random": "0.8.4-main.4668b7de9b",
+    "@dxos/plugin-testing": "0.8.4-main.4668b7de9b",
+    "@dxos/react-hooks": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui": "0.8.4-main.4668b7de9b",
+    "@dxos/schema": "0.8.4-main.4668b7de9b",
+    "@dxos/types": "0.8.4-main.4668b7de9b",
+    "@dxos/ui-theme": "0.8.4-main.4668b7de9b",
+    "@dxos/storybook-utils": "0.8.4-main.4668b7de9b"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -112,8 +148,8 @@
     "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/ui-theme": "0.8.4-main.4668b7de9b",
+    "@dxos/react-ui": "0.8.4-main.4668b7de9b"
   },
   "publishConfig": {
     "access": "public"

package/src/DeckPlugin.node.ts

@@ -0,0 +1,17 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+
+import { AppGraphBuilder, OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+
+export const DeckPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  Plugin.make,
+);
+
+export default DeckPlugin;

package/src/DeckPlugin.test.ts

@@ -0,0 +1,27 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { ActivationEvents } from '@dxos/app-framework';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { DeckPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('DeckPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [DeckPlugin()],
+    });
+
+    expect(harness.manager.getActive()).toContain(moduleId('AppGraphBuilder'));
+
+    await harness.fire(ActivationEvents.SetupProcessManager);
+    expect(harness.manager.getActive()).toContain(moduleId('OperationHandler'));
+  });
+});

package/src/DeckPlugin.ts

@@ -6,22 +6,25 @@ import { setAutoFreeze } from 'immer';
 
 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 { translations as stackTranslations } from '@dxos/react-ui-stack/translations';
 
 import {
   AppGraphBuilder,
   CheckAppScheme,
   DeckSettings,
   DeckState,
+  NotificationTracker,
   OperationHandler,
   ReactRoot,
   ReactSurface,
   UrlHandler,
 } from '#capabilities';
 import { meta } from '#meta';
+import { translations } from '#translations';
 import { DeckEvents } from '#types';
 
-import { translations } from './translations';
+// eslint-disable-next-line import/no-relative-packages
+import pluginSpec from '../PLUGIN.mdl?raw';
 
 // 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.
@@ -39,7 +42,7 @@ export const DeckPlugin = Plugin.define(meta).pipe(
     activate: DeckSettings,
   }),
   Plugin.addModule({
-    activatesOn: ActivationEvent.allOf(DeckEvents.SettingsReady, ActivationEvents.OperationInvokerReady),
+    activatesOn: ActivationEvent.allOf(DeckEvents.SettingsReady, ActivationEvents.ProcessManagerReady),
     activate: CheckAppScheme,
   }),
   Plugin.addModule({
@@ -59,8 +62,17 @@ export const DeckPlugin = Plugin.define(meta).pipe(
   //   activate: Tools,
   // }),
   Plugin.addModule({
-    activatesOn: ActivationEvent.allOf(ActivationEvents.OperationInvokerReady, DeckEvents.StateReady),
+    activatesOn: ActivationEvent.allOf(ActivationEvents.ProcessManagerReady, DeckEvents.StateReady),
     activate: UrlHandler,
   }),
+  Plugin.addModule({
+    activatesOn: ActivationEvent.allOf(ActivationEvents.ProcessManagerReady, DeckEvents.StateReady),
+    activate: NotificationTracker,
+  }),
+  AppPlugin.addPluginAssetModule({
+    asset: { pluginId: meta.id, path: 'PLUGIN.mdl', content: pluginSpec, mimeType: 'application/x-mdl' },
+  }),
   Plugin.make,
 );
+
+export default DeckPlugin;

package/src/DeckPlugin.workerd.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+
+import { OperationHandler } from '#capabilities';
+import { meta } from '#meta';
+
+export const DeckPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  Plugin.make,
+);
+
+export default DeckPlugin;

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

@@ -6,8 +6,8 @@ import * as Effect from 'effect/Effect';
 
 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 { Operation } from '@dxos/compute';
+import { AttentionCapabilities } from '@dxos/plugin-attention';
 import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 
 import { meta } from '#meta';
@@ -17,7 +17,7 @@ export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const extensions = yield* Effect.all([
       GraphBuilder.createExtension({
-        id: 'not-found',
+        id: 'notFound',
         match: NodeMatcher.whenRoot,
         connector: () => Effect.succeed([AppNode.makeNotFound()]),
       }),
@@ -112,7 +112,7 @@ export default Capability.makeModule(
                   macos: "meta+'",
                 },
                 disposition: 'pin-end',
-                position: 'hoist',
+                position: 'last',
                 l0Breakpoint: 'lg',
               },
             };

package/src/capabilities/index.ts

@@ -3,10 +3,11 @@
 //
 
 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 CheckAppScheme = Capability.lazy('CheckAppScheme', () => import('./check-app-scheme'));
+export const NotificationTracker = Capability.lazy('NotificationTracker', () => import('./notification-tracker'));
 export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
   'OperationHandler',
   () => import('./operation-handler'),

package/src/capabilities/notification-tracker.ts

@@ -0,0 +1,132 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Fiber from 'effect/Fiber';
+import * as Stream from 'effect/Stream';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { type LayoutOperation } from '@dxos/app-toolkit';
+import { Process } from '@dxos/compute';
+
+import { meta } from '#meta';
+import { DeckCapabilities } from '#types';
+
+const NOTIFY_TOAST_DURATION = 5_000;
+const ERROR_TOAST_DURATION = 10_000;
+const UNDO_TOAST_DURATION = 10_000;
+
+/**
+ * The single producer of toasts driven by operation invocations:
+ * - Per-invoke notifications ride the process monitor: each invocation spawns a process carrying the
+ *   caller's `notify` config on its params; this tracker watches process state transitions and toasts
+ *   on start / success / failure.
+ * - Undo toasts come from the history tracker's `undoable` stream (it owns the undo registry lookup);
+ *   the toast action triggers `historyTracker.undoPromise()`.
+ */
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const capabilities = yield* Capability.Service;
+    const registry = yield* Capability.get(Capabilities.AtomRegistry);
+    const ephemeralAtom = yield* Capability.get(DeckCapabilities.EphemeralState);
+    const monitor = yield* Capability.get(Capabilities.ProcessMonitor);
+
+    const addToast = (toast: LayoutOperation.Toast) => {
+      const state = registry.get(ephemeralAtom);
+      registry.set(ephemeralAtom, { ...state, toasts: [...state.toasts, toast] });
+    };
+
+    //
+    // Notifications — driven by the process monitor.
+    //
+
+    // Tracks the last-seen state per process so we only toast on transitions.
+    const lastState = new Map<Process.ID, Process.State>();
+
+    const handleProcesses = (processes: readonly Process.Info[]) => {
+      const seen = new Set<Process.ID>();
+      for (const process of processes) {
+        seen.add(process.pid);
+        const previous = lastState.get(process.pid);
+        lastState.set(process.pid, process.state);
+        if (previous === process.state) {
+          continue;
+        }
+
+        const notify = process.params.notify;
+        if (!notify) {
+          continue;
+        }
+
+        // Transition into RUNNING (the first snapshot may be a pre-RUNNING state like IDLE/HYBERNATING).
+        if (previous !== Process.State.RUNNING && process.state === Process.State.RUNNING && notify.start) {
+          addToast({ id: `notify-start-${process.pid}`, title: notify.start, duration: NOTIFY_TOAST_DURATION });
+        } else if (process.state === Process.State.SUCCEEDED && notify.success) {
+          addToast({ id: `notify-success-${process.pid}`, title: notify.success, duration: NOTIFY_TOAST_DURATION });
+        } else if (process.state === Process.State.FAILED && notify.error) {
+          addToast({
+            id: `notify-error-${process.pid}`,
+            title: notify.error,
+            ...(process.error ? { description: process.error } : {}),
+            icon: 'ph--warning--regular',
+            duration: ERROR_TOAST_DURATION,
+          });
+        }
+      }
+
+      // Drop bookkeeping for processes that have left the tree.
+      for (const pid of lastState.keys()) {
+        if (!seen.has(pid)) {
+          lastState.delete(pid);
+        }
+      }
+    };
+
+    const unsubscribeMonitor = registry.subscribe(monitor.processTreeAtom, handleProcesses);
+
+    //
+    // Undo — driven by the history tracker's `undoable` stream (it owns the registry lookup).
+    //
+
+    const showUndoToast = (message: LayoutOperation.Toast['title'], onUndo: () => void) => {
+      const undoId = `notify-undo-${crypto.randomUUID()}`;
+      const state = registry.get(ephemeralAtom);
+      // Replace the previous undo toast (only the most recent action can be undone).
+      const toasts = state.currentUndoId
+        ? state.toasts.filter((toast) => toast.id !== state.currentUndoId)
+        : state.toasts;
+      const toast: LayoutOperation.Toast = {
+        id: undoId,
+        title: message ?? ['undo-available.label', { ns: meta.id }],
+        duration: UNDO_TOAST_DURATION,
+        actionLabel: ['undo-action.label', { ns: meta.id }],
+        actionAlt: ['undo-action.alt', { ns: meta.id }],
+        closeLabel: ['undo-close.label', { ns: meta.id }],
+        onAction: onUndo,
+      };
+      registry.set(ephemeralAtom, { ...state, currentUndoId: undoId, toasts: [...toasts, toast] });
+    };
+
+    // The history tracker is contributed on ProcessManagerReady, possibly after this module activates;
+    // `waitFor` resolves it once available, then we observe its undoable stream.
+    const undoFiber = Effect.runFork(
+      Effect.gen(function* () {
+        const historyTracker = yield* Capability.waitFor(Capabilities.HistoryTracker);
+        yield* Stream.fromPubSub(historyTracker.undoable).pipe(
+          Stream.runForEach((event) =>
+            Effect.sync(() => showUndoToast(event.message, () => void historyTracker.undoPromise())),
+          ),
+        );
+      }).pipe(Effect.provideService(Capability.Service, capabilities)),
+    );
+
+    // Track both subscriptions so they are torn down when the module deactivates.
+    return Capability.contributes(Capabilities.Null, null, () =>
+      Effect.gen(function* () {
+        unsubscribeMonitor();
+        yield* Fiber.interrupt(undoFiber);
+      }),
+    );
+  }),
+);

package/src/capabilities/operation-handler.ts

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

package/src/capabilities/react-root.tsx

@@ -20,22 +20,27 @@ export default Capability.makeModule(() =>
 
         const handleDismissToast = useCallback(
           (id: string) => {
-            const index = state.toasts.findIndex((toast) => toast.id === id);
-            if (index !== -1) {
-              // Allow time for the toast to animate out.
-              // TODO(burdon): Factor out and unregister timeout.
-              setTimeout(() => {
-                updateEphemeral((s) => {
-                  const toastToRemove = s.toasts[index];
-                  const newCurrentUndoId = toastToRemove?.id === s.currentUndoId ? undefined : s.currentUndoId;
-                  return {
-                    ...s,
-                    currentUndoId: newCurrentUndoId,
-                    toasts: s.toasts.filter((_, i) => i !== index),
-                  };
-                });
-              }, 1_000);
+            if (!state.toasts.some((toast) => toast.id === id)) {
+              return;
             }
+            // Allow time for the toast exit animation (animate-toast-hide, 100ms) before unmounting.
+            // TODO(burdon): Factor out and unregister timeout.
+            setTimeout(() => {
+              // Re-resolve the toast by id inside the update: the toast list may have changed during
+              // the delay, so a captured index would point at the wrong (or a missing) entry.
+              updateEphemeral((s) => {
+                const toastToRemove = s.toasts.find((toast) => toast.id === id);
+                if (!toastToRemove) {
+                  return s;
+                }
+                const newCurrentUndoId = toastToRemove.id === s.currentUndoId ? undefined : s.currentUndoId;
+                return {
+                  ...s,
+                  currentUndoId: newCurrentUndoId,
+                  toasts: s.toasts.filter((toast) => toast.id !== id),
+                };
+              });
+            }, 150);
           },
           [state.toasts, updateEphemeral],
         );

package/src/capabilities/react-surface.tsx

@@ -18,7 +18,7 @@ export default Capability.makeModule(() =>
   Effect.succeed(
     Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
-        id: 'plugin-settings',
+        id: 'pluginSettings',
         filter: AppSurface.settings(AppSurface.Article, meta.id),
         component: ({ data: { subject } }) => {
           const { settings, updateSettings } = useSettingsState<Settings.Settings>(subject.atom);
@@ -26,7 +26,7 @@ export default Capability.makeModule(() =>
         },
       }),
       Surface.create({
-        id: 'not-found',
+        id: 'notFound',
         role: 'article',
         filter: (data): data is { attendableId: string } => data.attendableId === NOT_FOUND_PATH,
         component: () => <NotFoundArticle />,

package/src/capabilities/settings.ts

@@ -19,8 +19,7 @@ export default Capability.makeModule(() =>
       defaultValue: () => ({
         showHints: false,
         enableDeck: false,
-        enableStatusbar: false,
-        enableNativeRedirect: !import.meta.env.DEV,
+        enableNativeRedirect: false,
         encapsulatedPlanks: false,
       }),
     });

package/src/capabilities/tools.ts

@@ -15,9 +15,9 @@ import {
   type PromiseIntentDispatcher,
   createIntent,
 } from '@dxos/app-framework';
-import { type OperationInvoker } from '@dxos/app-framework/plugin-operation/invoker';
 import { LayoutOperation } from '@dxos/app-toolkit';
 import { invariant } from '@dxos/invariant';
+import { type OperationInvoker } from '@dxos/operation';
 import { trim } from '@dxos/util';
 
 import { meta } from '#meta';