@dxos/app-framework 0.8.4-main.ae835ea → 0.8.4-main.bc674ce

package/src/playground/layout/Layout.tsx

@@ -2,10 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capabilities } from '../../common';
-import { contributes } from '../../core';
+import * as Common from '../../common';
+import { Capability } from '../../core';
 import { Surface } from '../../react';
 
 export const Layout = () => {
@@ -26,8 +27,11 @@ export const Layout = () => {
   );
 };
 
-export default () =>
-  contributes(Capabilities.ReactRoot, {
-    id: 'dxos.org/test/layout/root',
-    root: Layout,
-  });
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Common.Capability.ReactRoot, {
+      id: 'dxos.org/test/layout/root',
+      root: Layout,
+    }),
+  ),
+);

package/src/playground/layout/plugin.ts

@@ -2,17 +2,17 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Events } from '../../common';
-import { defineModule, definePlugin, lazy } from '../../core';
+import * as Common from '../../common';
+import { Capability, Plugin } from '../../core';
 
-const Layout = lazy(() => import('./Layout'));
+const Layout = Capability.lazy('Layout', () => import('./Layout'));
 
 const meta = { id: 'dxos.org/test/layout', name: 'Layout' };
 
-export const LayoutPlugin = definePlugin(meta, () => [
-  defineModule({
-    id: 'dxos.org/test/layout/root',
-    activatesOn: Events.Startup,
+export const LayoutPlugin = Plugin.define(meta).pipe(
+  Plugin.addModule({
+    activatesOn: Common.ActivationEvent.Startup,
     activate: Layout,
   }),
-]);
+  Plugin.make,
+);

package/src/playground/logger/Toolbar.tsx

@@ -2,29 +2,32 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as Effect from 'effect/Effect';
 import React, { useCallback } from 'react';
 
 import { Button } from '@dxos/react-ui';
 
-import { Capabilities, createSurface } from '../../common';
-import { contributes } from '../../core';
-import { createIntent } from '../../plugin-intent';
-import { useIntentDispatcher } from '../../react';
+import * as Common from '../../common';
+import { Capability } from '../../core';
+import { useOperationInvoker } from '../../react';
 
-import { Log } from './schema';
+import { LogOperation } from './schema';
 
 export const Logger = () => {
-  const { dispatchPromise } = useIntentDispatcher();
-  const handleClick = useCallback(() => dispatchPromise(createIntent(Log, { message: 'Hello, world!' })), []);
+  const { invokePromise } = useOperationInvoker();
+  const handleClick = useCallback(() => invokePromise(LogOperation, { message: 'Hello, world!' }), []);
   return <Button onClick={handleClick}>Log</Button>;
 };
 
-export default () =>
-  contributes(
-    Capabilities.ReactSurface,
-    createSurface({
-      id: 'dxos.org/test/logger/action',
-      role: 'toolbar',
-      component: Logger,
-    }),
-  );
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(
+      Common.Capability.ReactSurface,
+      Common.createSurface({
+        id: 'dxos.org/test/logger/action',
+        role: 'toolbar',
+        component: Logger,
+      }),
+    ),
+  ),
+);

package/src/playground/logger/plugin.ts

@@ -2,40 +2,41 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as Effect from 'effect/Effect';
+
 import { log } from '@dxos/log';
+import { OperationResolver } from '@dxos/operation';
 
-import { Capabilities, Events } from '../../common';
-import { contributes, defineModule, definePlugin, lazy } from '../../core';
-import { createResolver } from '../../plugin-intent';
+import * as Common from '../../common';
+import { Capability, Plugin } from '../../core';
 
-import { Log } from './schema';
+import { LogOperation } from './schema';
 
-const Toolbar = lazy(() => import('./Toolbar'));
+const Toolbar = Capability.lazy('Toolbar', () => import('./Toolbar'));
 
 const meta = {
   id: 'dxos.org/test/logger',
   name: 'Logger',
 };
 
-export const LoggerPlugin = definePlugin(meta, () => [
-  defineModule({
-    id: 'dxos.org/test/logger/intents',
-    activatesOn: Events.SetupIntentResolver,
-    activate: () => [
-      contributes(
-        Capabilities.IntentResolver,
-        createResolver({
-          intent: Log,
-          resolve: ({ message }) => {
-            log.info(message);
-          },
-        }),
+export const LoggerPlugin = Plugin.define(meta).pipe(
+  Common.Plugin.addOperationResolverModule({
+    activate: () =>
+      Effect.succeed(
+        Capability.contributes(Common.Capability.OperationResolver, [
+          OperationResolver.make({
+            operation: LogOperation,
+            handler: ({ message }) =>
+              Effect.sync(() => {
+                log.info(message);
+              }),
+          }),
+        ]),
       ),
-    ],
   }),
-  defineModule({
-    id: 'dxos.org/test/logger/surfaces',
-    activatesOn: Events.Startup,
+  Plugin.addModule({
+    activatesOn: Common.ActivationEvent.Startup,
     activate: Toolbar,
   }),
-]);
+  Plugin.make,
+);

package/src/playground/logger/schema.ts

@@ -4,9 +4,19 @@
 
 import * as Schema from 'effect/Schema';
 
+import { Operation } from '@dxos/operation';
+
 export class Log extends Schema.TaggedClass<Log>()('dxos.org/test/logger/log', {
   input: Schema.Struct({
     message: Schema.String,
   }),
   output: Schema.Void,
 }) {}
+
+export const LogOperation = Operation.make({
+  meta: { key: 'dxos.org/test/logger/log', name: 'Log' },
+  schema: {
+    input: Schema.Struct({ message: Schema.String }),
+    output: Schema.Void,
+  },
+});

package/src/playground/playground.stories.tsx

@@ -3,20 +3,28 @@
 //
 
 import { type Meta, type StoryObj } from '@storybook/react-vite';
+import * as Effect from 'effect/Effect';
 import React from 'react';
 
 import { withTheme } from '@dxos/react-ui/testing';
 
-import { useApp } from '../components';
-import { IntentPlugin } from '../plugin-intent';
+import { OperationPlugin } from '../plugin-operation';
+import { useApp } from '../react';
 
 import { DebugPlugin } from './debug';
 import { GeneratorPlugin, createNumberPlugin } from './generator';
 import { LayoutPlugin } from './layout';
 import { LoggerPlugin } from './logger';
 
-const pluginFactories = [IntentPlugin, LayoutPlugin, DebugPlugin(), LoggerPlugin(), GeneratorPlugin()];
-const plugins = pluginFactories.map((factory) => (typeof factory === 'function' ? factory() : factory));
+const plugins = [
+  // prettier-ignore
+  OperationPlugin(),
+  LayoutPlugin(),
+  DebugPlugin(),
+  LoggerPlugin(),
+  GeneratorPlugin(),
+];
+const core = plugins.map((plugin) => plugin.meta.id);
 
 const Placeholder = () => {
   return <div>Loading...</div>;
@@ -24,9 +32,9 @@ const Placeholder = () => {
 
 const DefaultStory = () => {
   const App = useApp({
-    pluginLoader: (id) => createNumberPlugin(id)(),
+    pluginLoader: (id: string) => Effect.sync(() => createNumberPlugin(id)),
     plugins,
-    core: plugins.map((plugin) => plugin.meta.id),
+    core,
     placeholder: Placeholder,
   });
 

package/src/plugin-operation/OperationPlugin.ts

@@ -0,0 +1,25 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Common from '../common';
+import { Capability, Plugin } from '../core';
+
+import { meta } from './meta';
+
+const OperationInvoker = Capability.lazy('OperationInvoker', () => import('./invoker-capability'));
+const HistoryCapabilities = Capability.lazy('HistoryCapabilities', () => import('./history/capability'));
+
+export const OperationPlugin = Plugin.define(meta).pipe(
+  Plugin.addModule({
+    activatesOn: Common.ActivationEvent.ManagedRuntimeReady,
+    activatesBefore: [Common.ActivationEvent.SetupOperationResolver],
+    activatesAfter: [Common.ActivationEvent.OperationInvokerReady],
+    activate: OperationInvoker,
+  }),
+  Plugin.addModule({
+    activatesOn: Common.ActivationEvent.OperationInvokerReady,
+    activate: HistoryCapabilities,
+  }),
+  Plugin.make,
+);

package/src/plugin-operation/history/capability.ts

@@ -0,0 +1,37 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { type OperationInvoker } from '@dxos/operation';
+
+import * as Common from '../../common';
+import { Capability } from '../../core';
+
+import * as HistoryTracker from './history-tracker';
+import * as UndoRegistry from './undo-registry';
+
+//
+// Capability Module - contributes both UndoRegistry and HistoryTracker.
+//
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    // Get the context for synchronous access in callbacks.
+    const capabilities = yield* Capability.Service;
+
+    // Create UndoRegistry.
+    const undoRegistry = UndoRegistry.make(() => capabilities.getAll(Common.Capability.UndoMapping).flat());
+
+    // Create HistoryTracker (depends on UndoRegistry and OperationInvoker).
+    const invoker = yield* Capability.get(Common.Capability.OperationInvoker);
+    // Cast to internal type - the factory always returns OperationInvokerInternal.
+    const historyTracker = HistoryTracker.make(invoker as OperationInvoker.OperationInvokerInternal, undoRegistry);
+
+    return [
+      Capability.contributes(Common.Capability.UndoRegistry, undoRegistry),
+      Capability.contributes(Common.Capability.HistoryTracker, historyTracker),
+    ];
+  }),
+);

package/src/plugin-operation/history/errors.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { OperationError } from '@dxos/operation';
+
+export class EmptyHistoryError extends OperationError {
+  constructor() {
+    super('EMPTY_HISTORY', 'Cannot undo: history is empty.');
+  }
+}