@dxos/app-framework 0.8.4-main.e098934 → 0.8.4-main.ead640a

package/moon.yml

@@ -5,6 +5,7 @@ tags:
   - ts-build
   - ts-test
   - typedoc
+  - storybook
 tasks:
   compile:
     args:
@@ -12,3 +13,6 @@ tasks:
       - '--entryPoint=src/testing/index.ts'
       - '--entryPoint=src/worker.ts'
       - '--preactSignalTracking'
+  test:
+    inputs:
+      - .storybook/*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/app-framework",
-  "version": "0.8.4-main.e098934",
+  "version": "0.8.4-main.ead640a",
   "description": "A framework for building applications from composible plugins.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -40,44 +40,45 @@
     }
   },
   "dependencies": {
-    "@effect/ai": "0.25.2",
+    "@effect/ai": "0.29.1",
+    "@effect/experimental": "0.56.0",
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
-    "@dxos/ai": "0.8.4-main.e098934",
-    "@dxos/async": "0.8.4-main.e098934",
-    "@dxos/app-graph": "0.8.4-main.e098934",
-    "@dxos/blueprints": "0.8.4-main.e098934",
-    "@dxos/client-protocol": "0.8.4-main.e098934",
-    "@dxos/debug": "0.8.4-main.e098934",
-    "@dxos/echo-schema": "0.8.4-main.e098934",
-    "@dxos/functions": "0.8.4-main.e098934",
-    "@dxos/invariant": "0.8.4-main.e098934",
-    "@dxos/keys": "0.8.4-main.e098934",
-    "@dxos/live-object": "0.8.4-main.e098934",
-    "@dxos/log": "0.8.4-main.e098934",
-    "@dxos/local-storage": "0.8.4-main.e098934",
-    "@dxos/react-hooks": "0.8.4-main.e098934",
-    "@dxos/util": "0.8.4-main.e098934",
-    "@dxos/schema": "0.8.4-main.e098934"
+    "@preact/signals-core": "^1.12.1",
+    "@dxos/ai": "0.8.4-main.ead640a",
+    "@dxos/app-graph": "0.8.4-main.ead640a",
+    "@dxos/blueprints": "0.8.4-main.ead640a",
+    "@dxos/client-protocol": "0.8.4-main.ead640a",
+    "@dxos/async": "0.8.4-main.ead640a",
+    "@dxos/debug": "0.8.4-main.ead640a",
+    "@dxos/echo": "0.8.4-main.ead640a",
+    "@dxos/invariant": "0.8.4-main.ead640a",
+    "@dxos/functions": "0.8.4-main.ead640a",
+    "@dxos/keys": "0.8.4-main.ead640a",
+    "@dxos/live-object": "0.8.4-main.ead640a",
+    "@dxos/local-storage": "0.8.4-main.ead640a",
+    "@dxos/log": "0.8.4-main.ead640a",
+    "@dxos/react-hooks": "0.8.4-main.ead640a",
+    "@dxos/schema": "0.8.4-main.ead640a",
+    "@dxos/util": "0.8.4-main.ead640a"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.90.2",
-    "@types/react": "~18.2.0",
-    "effect": "3.17.7",
-    "react": "~18.2.0",
+    "@effect-rx/rx-react": "0.42.4",
+    "@effect/platform": "0.92.1",
+    "@types/react": "~19.2.2",
+    "effect": "3.18.3",
+    "react": "~19.2.0",
     "typedoc": "0.28.1",
-    "@dxos/echo-signals": "0.8.4-main.e098934",
-    "@dxos/random": "0.8.4-main.e098934",
-    "@dxos/react-ui": "0.8.4-main.e098934",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.e098934",
-    "@dxos/storybook-utils": "0.8.4-main.e098934"
+    "@dxos/react-ui": "0.8.4-main.ead640a",
+    "@dxos/echo-signals": "0.8.4-main.ead640a",
+    "@dxos/random": "0.8.4-main.ead640a",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.ead640a",
+    "@dxos/storybook-utils": "0.8.4-main.ead640a"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
     "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
-    "react": "~18.2.0"
+    "react": "^19.0.0"
   },
   "publishConfig": {
     "access": "public"

package/src/common/capabilities.ts

@@ -2,11 +2,15 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type AiTool, type AiToolkit } from '@effect/ai';
+import type * as Tool from '@effect/ai/Tool';
+import type * as Toolkit from '@effect/ai/Toolkit';
 import { type Registry } from '@effect-rx/rx-react';
-import { type Layer, type Schema } from 'effect';
+import type * as Layer from 'effect/Layer';
+import type * as Schema from 'effect/Schema';
 import { type FC, type PropsWithChildren } from 'react';
 
+import { type AiService } from '@dxos/ai';
+import type * as AiServiceRouter from '@dxos/ai/AiServiceRouter';
 import { type BuilderExtensions, type GraphBuilder } from '@dxos/app-graph';
 import { type Blueprint } from '@dxos/blueprints';
 import { type Space } from '@dxos/client-protocol';
@@ -154,15 +158,17 @@ export namespace Capabilities {
    */
   export const Metadata = defineCapability<Metadata>('dxos.org/app-framework/capability/metadata');
 
+  // TODO(dmaretskyi): Consider combining Toolkit and ToolkitHandler for type-safe context.
+
   /**
    * @category Capability
    */
-  export const Toolkit = defineCapability<AiToolkit.Any>('dxos.org/app-framework/capability/ai-toolkit');
+  export const Toolkit = defineCapability<Toolkit.Any>('dxos.org/app-framework/capability/ai-toolkit');
 
   /**
    * @category Capability
    */
-  export const ToolkitHandler = defineCapability<Layer.Layer<AiTool.ToHandler<AiTool.AiTool<any>>, never, never>>(
+  export const ToolkitHandler = defineCapability<Layer.Layer<Tool.Handler<any>, never, never>>(
     'dxos.org/app-framework/capability/ai-toolkit-handler',
   );
 
@@ -173,6 +179,18 @@ export namespace Capabilities {
     'dxos.org/app-framework/capability/blueprint-definition',
   );
 
+  export type AiServiceLayer = Layer.Layer<AiService.AiService>;
+  export const AiServiceLayer = defineCapability<AiServiceLayer>(
+    'dxos.org/app-framework/capability/ai-service-factory',
+  );
+
+  /**
+   * Plugins can contribute them to provide model resolvers.
+   */
+  export const AiModelResolver = defineCapability<Layer.Layer<AiServiceRouter.AiModelResolver>>(
+    'dxos.org/app-framework/capability/ai-model-resolver',
+  );
+
   /**
    * @category Capability
    */

package/src/common/collaboration.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 import { DataType } from '@dxos/schema';
 

package/src/common/file.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 // TODO(burdon): See Accept attribute (uses MIME types).
 // E.g., 'image/*': ['.jpg', '.jpeg', '.png', '.gif'],

package/src/common/layout.ts

@@ -2,18 +2,17 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 import { Label } from '../plugin-intent';
 
-export const LAYOUT_PLUGIN = 'dxos.org/plugin/layout';
-export const LAYOUT_ACTION = `${LAYOUT_PLUGIN}/action`;
+const LAYOUT_PLUGIN = 'dxos.org/plugin/layout';
 
 /**
  * Expected payload for layout actions.
  */
 export namespace LayoutAction {
-  export const UPDATE_LAYOUT = `${LAYOUT_ACTION}/update-layout`;
+  export const UPDATE_LAYOUT = `${LAYOUT_PLUGIN}/action/update-layout`;
 
   /**
    * Generic layout action.

package/src/common/surface.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type ForwardedRef, type JSX, type PropsWithChildren, type ReactNode } from 'react';
+import type { ComponentType, PropsWithChildren, ReactNode } from 'react';
 
 import { type GuardedType, type MakeOptional, type Position } from '@dxos/util';
 
@@ -11,7 +11,7 @@ import { type ErrorBoundary } from '../react';
 /**
  * SurfaceProps are the props that are passed to the Surface component.
  */
-export type SurfaceProps<T extends Record<string, any> = Record<string, unknown>> = PropsWithChildren<{
+export type SurfaceProps<T extends Record<string, any> = Record<string, unknown>> = {
   /**
    * If specified, the Surface will be wrapped in an error boundary.
    * The fallback component will be rendered if an error occurs.
@@ -23,17 +23,16 @@ export type SurfaceProps<T extends Record<string, any> = Record<string, unknown>
    * The placeholder component will be rendered while the surface component is loading.
    */
   placeholder?: ReactNode;
-}> &
-  MakeOptional<CoreSurfaceProps<T>, 'id' | 'data'> & {
-    /**
-     * Additional props to pass to the component.
-     * These props are not used by Surface itself but may be used by components which resolve the surface.
-     */
-    [key: string]: unknown;
+} & MakeOptional<CoreSurfaceProps<T>, 'id' | 'data'> &
+  // Additional props to pass to the component.
+  // These props are not used by Surface itself but may be used by components which resolve the surface.
+  // Exclude known prop names to prevent overriding well-defined props.
+  {
+    [K in keyof Record<string, any>]: K extends keyof CoreSurfaceProps<T> | 'fallback' | 'placeholder' ? never : any;
   };
 
 // NOTE: If `[key: string]: unknown` is included in shared types, when re-used other fields become unknown as well.
-type CoreSurfaceProps<T extends Record<string, any> = Record<string, unknown>> = {
+type CoreSurfaceProps<T extends Record<string, any> = Record<string, unknown>> = PropsWithChildren<{
   /**
    * ID for debugging.
    */
@@ -53,19 +52,17 @@ type CoreSurfaceProps<T extends Record<string, any> = Record<string, unknown>> =
    * If more than one component is resolved, the limit determines how many are rendered.
    */
   limit?: number | undefined;
-};
+}>;
 
-type SurfaceComponentProps<T extends Record<string, any> = Record<string, unknown>> = PropsWithChildren<
-  CoreSurfaceProps<T> & { [key: string]: unknown }
->;
+type SurfaceComponentProps<T extends Record<string, any> = Record<string, unknown>> = CoreSurfaceProps<T> &
+  Record<string, any>;
 
 /**
  * React component used to render a surface once is has matched.
  */
-export type SurfaceComponent<T extends Record<string, any> = Record<string, unknown>> = (
-  props: SurfaceComponentProps<T>,
-  forwardedRef: ForwardedRef<HTMLElement>,
-) => JSX.Element | null;
+export type SurfaceComponent<T extends Record<string, any> = Record<string, unknown>> = ComponentType<
+  SurfaceComponentProps<T>
+>;
 
 /**
  * Definition of when a SurfaceComponent should be rendered.

package/src/common/translations.ts

@@ -2,7 +2,7 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 export const ResourceKey = Schema.Union(Schema.String, Schema.Record({ key: Schema.String, value: Schema.Any }));
 export type ResourceKey = Schema.Schema.Type<typeof ResourceKey>;

package/src/components/App.stories.tsx

@@ -2,12 +2,10 @@
 // Copyright 2022 DXOS.org
 //
 
-import '@dxos-theme';
-
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { withTheme } from '@dxos/storybook-utils';
+import { withTheme } from '@dxos/react-ui/testing';
 
 import { useApp } from './useApp';
 

package/src/components/useApp.tsx

@@ -116,6 +116,10 @@ export const useApp = ({
   }, [cacheEnabled, manager]);
 
   useEffect(() => {
+    setupDevtools(manager);
+  }, [manager]);
+
+  useAsyncEffect(async () => {
     manager.context.contributeCapability({
       interface: Capabilities.PluginManager,
       implementation: manager,
@@ -128,22 +132,16 @@ export const useApp = ({
       module: 'dxos.org/app-framework/rx-registry',
     });
 
-    return () => {
-      manager.context.removeCapability(Capabilities.PluginManager, manager);
-      manager.context.removeCapability(Capabilities.RxRegistry, manager.registry);
-    };
-  }, [manager]);
-
-  useEffect(() => {
-    setupDevtools(manager);
-  }, [manager]);
-
-  useAsyncEffect(async () => {
     await Promise.all([
       // TODO(wittjosiah): Factor out such that this could be called per surface role when attempting to render.
       manager.activate(Events.SetupReactSurface),
       manager.activate(Events.Startup),
     ]);
+
+    return () => {
+      manager.context.removeCapability(Capabilities.PluginManager, manager);
+      manager.context.removeCapability(Capabilities.RxRegistry, manager.registry);
+    };
   }, [manager]);
 
   return useCallback(

package/src/core/capabilities.test.ts

@@ -3,7 +3,7 @@
 //
 
 import { Registry } from '@effect-rx/rx-react';
-import { Effect } from 'effect';
+import * as Effect from 'effect/Effect';
 import { describe, expect, it, onTestFinished } from 'vitest';
 
 import { PluginContext, defineCapability } from './capabilities';

package/src/core/capabilities.ts

@@ -3,7 +3,7 @@
 //
 
 import { type Registry, Rx } from '@effect-rx/rx-react';
-import { Effect } from 'effect';
+import * as Effect from 'effect/Effect';
 
 import { Trigger } from '@dxos/async';
 import { invariant } from '@dxos/invariant';

package/src/core/manager.test.ts

@@ -7,7 +7,7 @@ import { afterEach, describe, expect, it } from 'vitest';
 
 import { Trigger } from '@dxos/async';
 import { raise } from '@dxos/debug';
-import { updateCounter } from '@dxos/echo-schema/testing';
+import { updateCounter } from '@dxos/echo/testing';
 import { registerSignalsRuntime } from '@dxos/echo-signals';
 import { invariant } from '@dxos/invariant';
 import { live } from '@dxos/live-object';
@@ -17,7 +17,7 @@ import { Events } from '../common';
 import { type PluginContext, contributes, defineCapability } from './capabilities';
 import { allOf, defineEvent, oneOf } from './events';
 import { PluginManager } from './manager';
-import { type Plugin, defineModule, definePlugin } from './plugin';
+import { Plugin, defineModule } from './plugin';
 
 registerSignalsRuntime();
 
@@ -43,7 +43,7 @@ describe('PluginManager', () => {
   });
 
   it('should be able to add and remove plugins', async () => {
-    const Test = definePlugin(testMeta, []);
+    const Test = new Plugin(testMeta, []);
     plugins = [Test];
 
     const manager = new PluginManager({ pluginLoader });
@@ -59,7 +59,7 @@ describe('PluginManager', () => {
       activatesOn: Events.Startup,
       activate: () => contributes(String, { string: 'hello' }),
     });
-    const Test = definePlugin(testMeta, [Hello]);
+    const Test = new Plugin(testMeta, [Hello]);
 
     const manager = new PluginManager({ plugins: [Test], core: [], pluginLoader });
     await manager.enable(testMeta.id);
@@ -76,7 +76,7 @@ describe('PluginManager', () => {
       activatesOn: Events.Startup,
       activate: () => contributes(String, { string: 'hello' }),
     });
-    const Test = definePlugin(testMeta, [Hello]);
+    const Test = new Plugin(testMeta, [Hello]);
 
     const manager = new PluginManager({ plugins: [Test], enabled: [Test.meta.id], pluginLoader });
     expect(manager.plugins).toEqual([Test]);
@@ -95,7 +95,7 @@ describe('PluginManager', () => {
       activatesOn: FailEvent,
       activate: async () => raise(new Error('test')),
     });
-    plugins = [definePlugin(testMeta, [Fail])];
+    plugins = [new Plugin(testMeta, [Fail])];
 
     const manager = new PluginManager({ pluginLoader });
     await manager.add(testMeta.id);
@@ -114,7 +114,7 @@ describe('PluginManager', () => {
       // TODO(wittjosiah): Test and catch more failure modes.
       activate: async () => async () => raise(new Error('test')),
     });
-    plugins = [definePlugin(testMeta, [Hello, Fail])];
+    plugins = [new Plugin(testMeta, [Hello, Fail])];
 
     const manager = new PluginManager({ pluginLoader });
     const activating = new Trigger<boolean>();
@@ -149,7 +149,7 @@ describe('PluginManager', () => {
         return contributes(String, { string: 'hello' });
       },
     });
-    plugins = [definePlugin(testMeta, [Hello])];
+    plugins = [new Plugin(testMeta, [Hello])];
 
     const manager = new PluginManager({ pluginLoader });
 
@@ -180,21 +180,21 @@ describe('PluginManager', () => {
   });
 
   it('should be able to fire custom activation events', async () => {
-    const Plugin1 = definePlugin({ id: 'dxos.org/test/plugin-1', name: 'Plugin 1' }, [
+    const Plugin1 = new Plugin({ id: 'dxos.org/test/plugin-1', name: 'Plugin 1' }, [
       defineModule({
         id: 'dxos.org/test/plugin-1',
         activatesOn: CountEvent,
         activate: () => [contributes(Number, { number: 1 })],
       }),
     ]);
-    const Plugin2 = definePlugin({ id: 'dxos.org/test/plugin-2', name: 'Plugin 2' }, [
+    const Plugin2 = new Plugin({ id: 'dxos.org/test/plugin-2', name: 'Plugin 2' }, [
       defineModule({
         id: 'dxos.org/test/plugin-2',
         activatesOn: CountEvent,
         activate: () => [contributes(Number, { number: 2 })],
       }),
     ]);
-    const Plugin3 = definePlugin({ id: 'dxos.org/test/plugin-3', name: 'Plugin 3' }, [
+    const Plugin3 = new Plugin({ id: 'dxos.org/test/plugin-3', name: 'Plugin 3' }, [
       defineModule({
         id: 'dxos.org/test/plugin-3',
         activatesOn: CountEvent,
@@ -231,7 +231,7 @@ describe('PluginManager', () => {
         return contributes(String, { string: 'hello' });
       },
     });
-    plugins = [definePlugin(testMeta, [Hello])];
+    plugins = [new Plugin(testMeta, [Hello])];
 
     const manager = new PluginManager({ pluginLoader });
     expect(manager.active).toEqual([]);
@@ -257,7 +257,7 @@ describe('PluginManager', () => {
         return contributes(String, { string: 'hello' });
       },
     });
-    plugins = [definePlugin(testMeta, [Hello])];
+    plugins = [new Plugin(testMeta, [Hello])];
 
     const manager = new PluginManager({ pluginLoader });
     expect(manager.active).toEqual([]);
@@ -283,7 +283,7 @@ describe('PluginManager', () => {
       state.total = numbers.reduce((acc, n) => acc + n.number, 0);
     };
 
-    const Count = definePlugin({ id: 'dxos.org/test/count', name: 'Count' }, [
+    const Count = new Plugin({ id: 'dxos.org/test/count', name: 'Count' }, [
       defineModule({
         id: 'dxos.org/test/count',
         activatesOn: Events.Startup,
@@ -295,7 +295,7 @@ describe('PluginManager', () => {
       }),
     ]);
 
-    const Test = definePlugin(testMeta, [
+    const Test = new Plugin(testMeta, [
       defineModule({
         id: 'dxos.org/test/plugin-1',
         activatesOn: CountEvent,
@@ -353,7 +353,7 @@ describe('PluginManager', () => {
     const id = 'dxos.org/test/counter';
     const stateEvent = Events.createStateEvent(id);
 
-    const Test = definePlugin(testMeta, [
+    const Test = new Plugin(testMeta, [
       defineModule({
         id,
         activatesOn: Events.Startup,
@@ -390,21 +390,21 @@ describe('PluginManager', () => {
   });
 
   it('should be reactive', async () => {
-    const Plugin1 = definePlugin({ id: 'dxos.org/test/plugin-1', name: 'Plugin 1' }, [
+    const Plugin1 = new Plugin({ id: 'dxos.org/test/plugin-1', name: 'Plugin 1' }, [
       defineModule({
         id: 'dxos.org/test/plugin-1',
         activatesOn: CountEvent,
         activate: () => [contributes(Number, { number: 1 })],
       }),
     ]);
-    const Plugin2 = definePlugin({ id: 'dxos.org/test/plugin-2', name: 'Plugin 2' }, [
+    const Plugin2 = new Plugin({ id: 'dxos.org/test/plugin-2', name: 'Plugin 2' }, [
       defineModule({
         id: 'dxos.org/test/plugin-2',
         activatesOn: CountEvent,
         activate: () => [contributes(Number, { number: 2 })],
       }),
     ]);
-    const Plugin3 = definePlugin({ id: 'dxos.org/test/plugin-3', name: 'Plugin 3' }, [
+    const Plugin3 = new Plugin({ id: 'dxos.org/test/plugin-3', name: 'Plugin 3' }, [
       defineModule({
         id: 'dxos.org/test/plugin-3',
         activatesOn: CountEvent,

package/src/core/manager.ts

@@ -4,7 +4,14 @@
 
 import { Registry } from '@effect-rx/rx-react';
 import { untracked } from '@preact/signals-core';
-import { Array, Duration, Effect, Fiber, HashSet, Match, Ref, pipe } from 'effect';
+import * as Array from 'effect/Array';
+import * as Duration from 'effect/Duration';
+import * as Effect from 'effect/Effect';
+import * as Fiber from 'effect/Fiber';
+import * as Function from 'effect/Function';
+import * as HashSet from 'effect/HashSet';
+import * as Match from 'effect/Match';
+import * as Ref from 'effect/Ref';
 
 import { Event } from '@dxos/async';
 import { type Live, live } from '@dxos/live-object';
@@ -396,7 +403,7 @@ export class PluginManager {
       this.activation.emit({ event: key, state: 'activating' });
 
       // Fire activatesBefore events.
-      yield* pipe(
+      yield* Function.pipe(
         modules,
         Array.flatMap((module) => module.activatesBefore ?? []),
         HashSet.fromIterable,
@@ -407,7 +414,7 @@ export class PluginManager {
       );
 
       // Concurrently triggers loading of lazy capabilities.
-      const getCapabilities = yield* pipe(
+      const getCapabilities = yield* Function.pipe(
         modules,
         Array.map((mod) => this._loadModule(mod)),
         Effect.allWith({ concurrency: 'unbounded' }),
@@ -418,7 +425,7 @@ export class PluginManager {
       );
 
       // Contribute the capabilities from the activated modules.
-      yield* pipe(
+      yield* Function.pipe(
         modules,
         Array.zip(getCapabilities),
         Array.map(([module, capabilities]) => this._contributeCapabilities(module, capabilities)),
@@ -428,7 +435,7 @@ export class PluginManager {
       );
 
       // Fire activatesAfter events.
-      yield* pipe(
+      yield* Function.pipe(
         modules,
         Array.flatMap((module) => module.activatesAfter ?? []),
         HashSet.fromIterable,

package/src/core/plugin.ts

@@ -124,9 +124,15 @@ export class Plugin {
   ) {}
 }
 
+export type PluginFactory<T = void> = ((args: T) => Plugin) & { meta: PluginMeta };
+
 /**
  * Helper to define a plugin.
  */
-export const definePlugin = (meta: PluginMeta, modules: PluginModule[]) => {
-  return new Plugin(meta, modules);
+export const definePlugin = <T = void>(meta: PluginMeta, provider: (args: T) => PluginModule[]): PluginFactory<T> => {
+  const factory = (args: T) => {
+    return new Plugin(meta, provider(args));
+  };
+
+  return Object.assign(factory, { meta });
 };

package/src/playground/debug/plugin.ts

@@ -7,11 +7,10 @@ import { defineModule, definePlugin, lazy } from '../../core';
 
 const Debug = lazy(() => import('./Debug'));
 
-export const DebugPlugin = () =>
-  definePlugin({ id: 'dxos.org/test/plugin-debug', name: 'Debug' }, [
-    defineModule({
-      id: 'dxos.org/test/debug/main',
-      activatesOn: Events.Startup,
-      activate: Debug,
-    }),
-  ]);
+export const DebugPlugin = definePlugin({ id: 'dxos.org/test/plugin-debug', name: 'Debug' }, () => [
+  defineModule({
+    id: 'dxos.org/test/debug/main',
+    activatesOn: Events.Startup,
+    activate: Debug,
+  }),
+]);

package/src/playground/generator/generator.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 import { Capabilities, Events } from '../../common';
 import { contributes, defineCapability, defineEvent, defineModule, definePlugin } from '../../core';
@@ -26,7 +26,7 @@ export const createGeneratorIntent = (id: string) => {
 export const createNumberPlugin = (id: string) => {
   const number = Math.floor(Math.random() * 100);
 
-  return definePlugin({ id, name: `Plugin ${id}` }, [
+  return definePlugin({ id, name: `Plugin ${id}` }, () => [
     defineModule({
       id: `${id}/main`,
       activatesOn: CountEvent,

package/src/playground/generator/plugin.ts

@@ -8,16 +8,15 @@ import { defineModule, definePlugin, lazy } from '../../core';
 const Main = lazy(() => import('./Main'));
 const Toolbar = lazy(() => import('./Toolbar'));
 
-export const GeneratorPlugin = () =>
-  definePlugin({ id: 'dxos.org/test/generator', name: 'Generator' }, [
-    defineModule({
-      id: 'dxos.org/test/generator/main',
-      activatesOn: Events.Startup,
-      activate: Main,
-    }),
-    defineModule({
-      id: 'dxos.org/test/generator/toolbar',
-      activatesOn: Events.Startup,
-      activate: Toolbar,
-    }),
-  ]);
+export const GeneratorPlugin = definePlugin({ id: 'dxos.org/test/generator', name: 'Generator' }, () => [
+  defineModule({
+    id: 'dxos.org/test/generator/main',
+    activatesOn: Events.Startup,
+    activate: Main,
+  }),
+  defineModule({
+    id: 'dxos.org/test/generator/toolbar',
+    activatesOn: Events.Startup,
+    activate: Toolbar,
+  }),
+]);