@dxos/app-framework 0.8.4-main.69d29f4 → 0.8.4-main.6fa680abb7

package/moon.yml

@@ -1,22 +1,22 @@
-type: library
+layer: library
 language: typescript
 tags:
   - pack
   - ts-build
   - ts-test
+  - ts-test-storybook
   - typedoc
   - storybook
 tasks:
   compile:
     args:
       - '--entryPoint=src/index.ts'
-      - '--entryPoint=src/common/index.ts'
+      - '--entryPoint=src/cli/index.ts'
       - '--entryPoint=src/core/activation-event.ts'
       - '--entryPoint=src/core/capability.ts'
       - '--entryPoint=src/core/plugin.ts'
       - '--entryPoint=src/core/plugin-manager.ts'
-      - '--entryPoint=src/react/index.ts'
+      - '--entryPoint=src/common/capabilities.ts'
+      - '--entryPoint=src/common/activation-events.ts'
+      - '--entryPoint=src/ui/index.ts'
       - '--entryPoint=src/testing/index.ts'
-  test:
-    inputs:
-      - .storybook/*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/app-framework",
-  "version": "0.8.4-main.69d29f4",
+  "version": "0.8.4-main.6fa680abb7",
   "description": "A framework for building applications from composible plugins.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -15,51 +15,63 @@
   "exports": {
     ".": {
       "source": "./src/index.ts",
-      "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "node": "./dist/lib/node-esm/index.mjs",
+      "types": "./dist/types/src/index.d.ts"
     },
     "./ActivationEvent": {
       "source": "./src/core/activation-event.ts",
-      "types": "./dist/types/src/activation-event/index.d.ts",
       "browser": "./dist/lib/browser/activation-event/index.mjs",
-      "node": "./dist/lib/node-esm/activation-event/index.mjs"
+      "node": "./dist/lib/node-esm/activation-event/index.mjs",
+      "types": "./dist/types/src/activation-event/index.d.ts"
+    },
+    "./ActivationEvents": {
+      "source": "./src/common/activation-events.ts",
+      "browser": "./dist/lib/browser/common/activation-events.mjs",
+      "node": "./dist/lib/node-esm/common/activation-events.mjs",
+      "types": "./dist/types/src/common/activation-events.d.ts"
+    },
+    "./Capabilities": {
+      "source": "./src/common/capabilities.ts",
+      "browser": "./dist/lib/browser/common/capabilities.mjs",
+      "node": "./dist/lib/node-esm/common/capabilities.mjs",
+      "types": "./dist/types/src/common/capabilities.d.ts"
     },
     "./Capability": {
       "source": "./src/core/capability.ts",
-      "types": "./dist/types/src/capability/index.d.ts",
       "browser": "./dist/lib/browser/capability/index.mjs",
-      "node": "./dist/lib/node-esm/capability/index.mjs"
-    },
-    "./Common": {
-      "source": "./src/common/index.ts",
-      "types": "./dist/types/src/common/index.d.ts",
-      "browser": "./dist/lib/browser/common/index.mjs",
-      "node": "./dist/lib/node-esm/common/index.mjs"
+      "node": "./dist/lib/node-esm/capability/index.mjs",
+      "types": "./dist/types/src/capability/index.d.ts"
     },
     "./Plugin": {
       "source": "./src/core/plugin.ts",
-      "types": "./dist/types/src/plugin/index.d.ts",
       "browser": "./dist/lib/browser/plugin/index.mjs",
-      "node": "./dist/lib/node-esm/plugin/index.mjs"
+      "node": "./dist/lib/node-esm/plugin/index.mjs",
+      "types": "./dist/types/src/plugin/index.d.ts"
     },
     "./PluginManager": {
       "source": "./src/core/plugin-manager.ts",
-      "types": "./dist/types/src/plugin-manager/index.d.ts",
       "browser": "./dist/lib/browser/plugin-manager/index.mjs",
-      "node": "./dist/lib/node-esm/plugin-manager/index.mjs"
+      "node": "./dist/lib/node-esm/plugin-manager/index.mjs",
+      "types": "./dist/types/src/plugin-manager/index.d.ts"
     },
-    "./react": {
-      "source": "./src/react/index.ts",
-      "types": "./dist/types/src/react/index.d.ts",
-      "browser": "./dist/lib/browser/react/index.mjs",
-      "node": "./dist/lib/node-esm/react/index.mjs"
+    "./cli": {
+      "source": "./src/cli/index.ts",
+      "browser": "./dist/lib/browser/cli/index.mjs",
+      "node": "./dist/lib/node-esm/cli/index.mjs",
+      "types": "./dist/types/src/cli/index.d.ts"
     },
     "./testing": {
       "source": "./src/testing/index.ts",
-      "types": "./dist/types/src/testing/index.d.ts",
       "browser": "./dist/lib/browser/testing/index.mjs",
-      "node": "./dist/lib/node-esm/testing/index.mjs"
+      "node": "./dist/lib/node-esm/testing/index.mjs",
+      "types": "./dist/types/src/testing/index.d.ts"
+    },
+    "./ui": {
+      "source": "./src/ui/index.ts",
+      "browser": "./dist/lib/browser/ui/index.mjs",
+      "node": "./dist/lib/node-esm/ui/index.mjs",
+      "types": "./dist/types/src/ui/index.d.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -68,71 +80,67 @@
       "ActivationEvent": [
         "dist/types/src/activation-event/index.d.ts"
       ],
+      "ActivationEvents": [
+        "dist/types/src/common/activation-events.d.ts"
+      ],
+      "Capabilities": [
+        "dist/types/src/common/capabilities.d.ts"
+      ],
       "Capability": [
         "dist/types/src/capability/index.d.ts"
       ],
-      "Common": [
-        "dist/types/src/common/index.d.ts"
-      ],
       "Plugin": [
         "dist/types/src/plugin/index.d.ts"
       ],
       "PluginManager": [
         "dist/types/src/plugin-manager/index.d.ts"
       ],
-      "react": [
-        "dist/types/src/react/index.d.ts"
+      "cli": [
+        "dist/types/src/cli/index.d.ts"
       ],
       "testing": [
         "dist/types/src/testing/index.d.ts"
+      ],
+      "ui": [
+        "dist/types/src/ui/index.d.ts"
       ]
     }
   },
   "dependencies": {
-    "@effect/ai": "0.32.1",
-    "@effect/cli": "0.72.1",
-    "@dxos/ai": "0.8.4-main.69d29f4",
-    "@dxos/app-graph": "0.8.4-main.69d29f4",
-    "@dxos/assistant": "0.8.4-main.69d29f4",
-    "@dxos/async": "0.8.4-main.69d29f4",
-    "@dxos/blueprints": "0.8.4-main.69d29f4",
-    "@dxos/client-protocol": "0.8.4-main.69d29f4",
-    "@dxos/debug": "0.8.4-main.69d29f4",
-    "@dxos/echo": "0.8.4-main.69d29f4",
-    "@dxos/effect": "0.8.4-main.69d29f4",
-    "@dxos/functions": "0.8.4-main.69d29f4",
-    "@dxos/invariant": "0.8.4-main.69d29f4",
-    "@dxos/keys": "0.8.4-main.69d29f4",
-    "@dxos/log": "0.8.4-main.69d29f4",
-    "@dxos/operation": "0.8.4-main.69d29f4",
-    "@dxos/react-hooks": "0.8.4-main.69d29f4",
-    "@dxos/schema": "0.8.4-main.69d29f4",
-    "@dxos/types": "0.8.4-main.69d29f4",
-    "@dxos/util": "0.8.4-main.69d29f4",
-    "@dxos/web-context": "0.8.4-main.69d29f4",
-    "@dxos/web-context-react": "0.8.4-main.69d29f4"
+    "@effect/cli": "0.73.2",
+    "@dxos/async": "0.8.4-main.6fa680abb7",
+    "@dxos/debug": "0.8.4-main.6fa680abb7",
+    "@dxos/echo": "0.8.4-main.6fa680abb7",
+    "@dxos/effect": "0.8.4-main.6fa680abb7",
+    "@dxos/invariant": "0.8.4-main.6fa680abb7",
+    "@dxos/log": "0.8.4-main.6fa680abb7",
+    "@dxos/operation": "0.8.4-main.6fa680abb7",
+    "@dxos/react-error-boundary": "0.8.4-main.6fa680abb7",
+    "@dxos/react-hooks": "0.8.4-main.6fa680abb7",
+    "@dxos/util": "0.8.4-main.6fa680abb7",
+    "@dxos/web-context": "0.8.4-main.6fa680abb7",
+    "@dxos/web-context-react": "0.8.4-main.6fa680abb7"
   },
   "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",
     "@effect/vitest": "0.27.0",
     "@types/react": "~19.2.7",
-    "effect": "3.19.11",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
     "typedoc": "0.28.1",
-    "@dxos/echo-db": "0.8.4-main.69d29f4",
-    "@dxos/random": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.69d29f4",
-    "@dxos/react-ui": "0.8.4-main.69d29f4",
-    "@dxos/storybook-utils": "0.8.4-main.69d29f4",
-    "@dxos/test-utils": "0.8.4-main.69d29f4",
-    "@dxos/ui-theme": "0.8.4-main.69d29f4"
+    "@dxos/echo-db": "0.8.4-main.6fa680abb7",
+    "@dxos/random": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui": "0.8.4-main.6fa680abb7",
+    "@dxos/storybook-utils": "0.8.4-main.6fa680abb7",
+    "@dxos/ui-theme": "0.8.4-main.6fa680abb7",
+    "@dxos/test-utils": "0.8.4-main.6fa680abb7"
   },
   "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"
   },

package/src/{cli.ts → cli/cli.ts}

@@ -8,8 +8,8 @@ import * as Layer from 'effect/Layer';
 
 import { invariant } from '@dxos/invariant';
 
-import * as Common from './common';
-import { Capability, Plugin, PluginManager } from './core';
+import { ActivationEvents, Capabilities } from '../common';
+import { Capability, Plugin, PluginManager } from '../core';
 
 const defaultPluginLoader =
   (plugins: Plugin.Plugin[]): PluginManager.ManagerOptions['pluginLoader'] =>
@@ -40,7 +40,7 @@ export type CreateCliAppOptions = {
  * @example
  * const plugins = [ClientPluginCLI()];
  * const manager = await createCliApp({ plugins });
- * const commands = manager.capabilities.getAll(Common.Capability.Command);
+ * const commands = manager.capabilities.getAll(Capabilities.Command);
  *
  * @param options.pluginManager Optional existing PluginManager instance.
  * @param options.pluginLoader Function to load plugins by ID.
@@ -73,22 +73,22 @@ export const createCliApp = Effect.fn(function* ({
     });
 
   manager.capabilities.contribute({
-    interface: Common.Capability.PluginManager,
+    interface: Capabilities.PluginManager,
     implementation: manager,
-    module: 'dxos.org/app-framework/plugin-manager',
+    module: 'org.dxos.app-framework.plugin-manager',
   });
 
   manager.capabilities.contribute({
-    interface: Common.Capability.AtomRegistry,
+    interface: Capabilities.AtomRegistry,
     implementation: manager.registry,
-    module: 'dxos.org/app-framework/atom-registry',
+    module: 'org.dxos.app-framework.atom-registry',
   });
 
   // Activate startup event to load CLI commands and Effect layers.
-  yield* manager.activate(Common.ActivationEvent.Startup);
+  yield* manager.activate(ActivationEvents.Startup);
 
   // Gather all layers and merge them into a single layer.
-  const layers = manager.capabilities.getAll(Common.Capability.Layer);
+  const layers = manager.capabilities.getAll(Capabilities.Layer);
   const capabilityServiceLayer = Layer.succeed(Capability.Service, manager.capabilities);
   const pluginServiceLayer = Layer.succeed(Plugin.Service, manager);
   const layer = (Layer.mergeAll as (...args: Layer.Layer<any, any, any>[]) => Layer.Layer<any, any, never>)(
@@ -98,7 +98,7 @@ export const createCliApp = Effect.fn(function* ({
   );
 
   // Gather all commands and provide them to the root command.
-  const pluginCommands = manager.capabilities.getAll(Common.Capability.Command);
+  const pluginCommands = manager.capabilities.getAll(Capabilities.Command);
   const subCommands = subCommandsProp ? [...subCommandsProp, ...pluginCommands] : pluginCommands;
   invariant(subCommands.length > 0, 'No subcommands provided');
   const command = rootCommand.pipe(Command.withSubcommands(subCommands as SubCommands));

package/src/{playground/debug → cli}/index.ts

@@ -2,4 +2,4 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './plugin';
+export * from './cli';

package/src/common/activation-events.ts

@@ -0,0 +1,44 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { ActivationEvent as ActivationEvent$ } from '../core';
+
+/**
+ * Fired when the app is started.
+ */
+export const Startup = ActivationEvent$.make('org.dxos.app-framework.event.startup');
+
+//
+// Dependent Events
+//
+
+/**
+ * Fired to load any newly available surfaces.
+ */
+export const SetupReactSurface = ActivationEvent$.make('org.dxos.app-framework.event.setup-react-surface');
+
+/**
+ * Fired before the operation invoker is activated.
+ */
+export const SetupOperationResolver = ActivationEvent$.make('org.dxos.app-framework.event.setup-operation-resolver');
+
+/**
+ * Fired before the managed runtime is created.
+ * Plugins should contribute their Layer capabilities before this event.
+ */
+export const SetupLayer = ActivationEvent$.make('org.dxos.app-framework.event.setup-layer');
+
+//
+// Triggered Events
+//
+
+/**
+ * Fired after the operation invoker is ready.
+ */
+export const OperationInvokerReady = ActivationEvent$.make('org.dxos.app-framework.event.operation-invoker-ready');
+
+/**
+ * Fired after the managed runtime is ready.
+ */
+export const ManagedRuntimeReady = ActivationEvent$.make('org.dxos.app-framework.event.managed-runtime-ready');

package/src/common/capabilities.ts

@@ -0,0 +1,178 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import type * as Command$ from '@effect/cli/Command';
+import { type Atom, type Registry } from '@effect-atom/atom-react';
+import * as Effect from 'effect/Effect';
+import type * as Layer$ from 'effect/Layer';
+import type * as ManagedRuntime$ from 'effect/ManagedRuntime';
+import type { FC, PropsWithChildren } from 'react';
+
+import type { OperationInvoker as OperationInvoker$, OperationResolver as OperationResolver$ } from '@dxos/operation';
+
+import { Capability as Capability$, type PluginManager as PluginManager$ } from '../core';
+import type {
+  HistoryTracker as HistoryTracker$,
+  UndoMapping as UndoMapping$,
+  UndoRegistry as UndoRegistry$,
+} from '../plugin-operation';
+import type { Surface } from '../ui';
+
+/**
+ * Null capability.
+ * @category Capability
+ */
+export const Null = Capability$.make<null>('org.dxos.app-framework.capability.null');
+
+/**
+ * @category Capability
+ */
+export const PluginManager = Capability$.make<PluginManager$.PluginManager>(
+  'org.dxos.app-framework.capability.plugin-manager',
+);
+
+/**
+ * @category Capability
+ */
+export const AtomRegistry = Capability$.make<Registry.Registry>('org.dxos.app-framework.capability.atom-registry');
+
+export type ReactContext = Readonly<{
+  id: string;
+  dependsOn?: string[];
+  context: FC<PropsWithChildren>;
+}>;
+
+/**
+ * @category Capability
+ */
+export const ReactContext = Capability$.make<ReactContext>('org.dxos.app-framework.capability.react-context');
+
+export type ReactRoot = Readonly<{ id: string; root: FC<PropsWithChildren> }>;
+
+/**
+ * @category Capability
+ */
+export const ReactRoot = Capability$.make<ReactRoot>('org.dxos.app-framework.capability.react-root');
+
+/**
+ * Surface definitions that can be either React components or Web Components.
+ */
+export type ReactSurface = Surface.Definition | readonly Surface.Definition[];
+
+/**
+ * @category Capability
+ */
+export const ReactSurface = Capability$.make<ReactSurface>('org.dxos.app-framework.common.react-surface');
+
+export type AnyCommand = Command$.Command<any, any, any, any>;
+
+/**
+ * @category Capability
+ */
+export const Command = Capability$.make<AnyCommand>('org.dxos.app-framework.capability.command');
+
+/**
+ * @category Capability
+ */
+export const Layer = Capability$.make<Layer$.Layer<any, any, any>>('org.dxos.app-framework.capability.layer');
+
+export type ManagedRuntime = ManagedRuntime$.ManagedRuntime<any, any>;
+
+/**
+ * @category Capability
+ */
+export const ManagedRuntime = Capability$.make<ManagedRuntime>('org.dxos.app-framework.capability.managed-runtime');
+
+//
+// Operation System Capabilities
+//
+
+export type OperationResolver = OperationResolver$.OperationResolver<any, any, any, any>;
+
+/**
+ * Handler registration for operations - contributed by plugins.
+ * @category Capability
+ */
+export const OperationResolver = Capability$.make<OperationResolver[]>(
+  'org.dxos.app-framework.capability.operation-resolver',
+);
+
+export type UndoMapping = UndoMapping$.UndoMapping;
+
+/**
+ * Undo mapping registration - contributed by plugins.
+ * @category Capability
+ */
+export const UndoMapping = Capability$.make<UndoMapping[]>('org.dxos.app-framework.capability.undo-mapping');
+
+export type OperationInvoker = OperationInvoker$.OperationInvoker;
+
+/**
+ * Operation invoker - provided by OperationPlugin.
+ * @category Capability
+ */
+export const OperationInvoker = Capability$.make<OperationInvoker>(
+  'org.dxos.app-framework.capability.operation-invoker',
+);
+
+export type UndoRegistry = UndoRegistry$.UndoRegistry;
+
+/**
+ * Undo registry - provided by OperationPlugin.
+ * @category Capability
+ */
+export const UndoRegistry = Capability$.make<UndoRegistry>('org.dxos.app-framework.capability.undo-registry');
+
+export type HistoryTracker = HistoryTracker$.HistoryTracker;
+
+/**
+ * History tracker - provided by OperationPlugin.
+ * @category Capability
+ */
+export const HistoryTracker = Capability$.make<HistoryTracker>('org.dxos.app-framework.capability.history-tracker');
+
+//
+// Atom Capability Helpers
+//
+
+/**
+ * Get the current value of an atom capability.
+ * @example const settings = yield* Capabilities.getAtomValue(ThreadCapabilities.Settings);
+ */
+export const getAtomValue = <T>(
+  atomCapability: Capability$.InterfaceDef<Atom.Atom<T>>,
+): Effect.Effect<T, Error, Capability$.Service> =>
+  Effect.gen(function* () {
+    const registry = yield* Capability$.get(AtomRegistry);
+    const atom = yield* Capability$.get(atomCapability);
+    return registry.get(atom);
+  });
+
+/**
+ * Update an atom capability value (requires writable atom).
+ * @example yield* Capabilities.updateAtomValue(ThreadCapabilities.Settings, (s) => ({ ...s, foo: true }));
+ */
+export const updateAtomValue = <T>(
+  atomCapability: Capability$.InterfaceDef<Atom.Writable<T>>,
+  fn: (current: T) => T,
+): Effect.Effect<void, Error, Capability$.Service> =>
+  Effect.gen(function* () {
+    const registry = yield* Capability$.get(AtomRegistry);
+    const atom = yield* Capability$.get(atomCapability);
+    registry.set(atom, fn(registry.get(atom)));
+  });
+
+/**
+ * Subscribe to an atom capability.
+ * @example const unsubscribe = yield* Capabilities.subscribeAtom(ThreadCapabilities.Settings, (value) => ...);
+ */
+export const subscribeAtom = <T>(
+  atomCapability: Capability$.InterfaceDef<Atom.Atom<T>>,
+  callback: (value: T) => void,
+): Effect.Effect<() => void, Error, Capability$.Service> =>
+  Effect.gen(function* () {
+    const registry = yield* Capability$.get(AtomRegistry);
+    const atom = yield* Capability$.get(atomCapability);
+    return registry.subscribe(atom, () => callback(registry.get(atom)));
+  });

package/src/common/index.ts

@@ -2,12 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './activation-event';
-export * from './capability';
-export * from './collaboration';
-export * from './file';
-export * from './graph';
-export * from './operations';
-export * from './plugin';
-export * from './surface';
-export * from './translations';
+export * as Capabilities from './capabilities';
+export * as ActivationEvents from './activation-events';
+export { UndoOperation } from './operations';
+export { Label } from './translations';