@dxos/plugin-conductor 0.8.4-main.b97322e → 0.8.4-main.bc2380dfbc

package/package.json

@@ -1,74 +1,110 @@
 {
   "name": "@dxos/plugin-conductor",
-  "version": "0.8.4-main.b97322e",
+  "version": "0.8.4-main.bc2380dfbc",
   "description": "Composer plugin for conductor.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
-  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#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"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#plugin": {
+      "source": "./src/ConductorPlugin.tsx",
+      "types": "./dist/types/src/ConductorPlugin.d.ts",
+      "default": "./dist/lib/neutral/ConductorPlugin.mjs"
+    },
+    "#translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "default": "./dist/lib/neutral/translations.mjs"
+    }
+  },
   "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"
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
     },
-    "./types": {
-      "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",
-  "typesVersions": {
-    "*": {
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@preact-signals/safe-react": "^0.9.0",
-    "effect": "3.17.0",
-    "@dxos/ai": "0.8.4-main.b97322e",
-    "@dxos/app-framework": "0.8.4-main.b97322e",
-    "@dxos/assistant": "0.8.4-main.b97322e",
-    "@dxos/debug": "0.8.4-main.b97322e",
-    "@dxos/conductor": "0.8.4-main.b97322e",
-    "@dxos/edge-client": "0.8.4-main.b97322e",
-    "@dxos/echo": "0.8.4-main.b97322e",
-    "@dxos/echo-schema": "0.8.4-main.b97322e",
-    "@dxos/functions": "0.8.4-main.b97322e",
-    "@dxos/live-object": "0.8.4-main.b97322e",
-    "@dxos/log": "0.8.4-main.b97322e",
-    "@dxos/plugin-space": "0.8.4-main.b97322e",
-    "@dxos/plugin-client": "0.8.4-main.b97322e",
-    "@dxos/react-client": "0.8.4-main.b97322e",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.b97322e",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.b97322e",
-    "@dxos/react-ui-stack": "0.8.4-main.b97322e"
+    "effect": "3.20.0",
+    "@dxos/app-framework": "0.8.4-main.bc2380dfbc",
+    "@dxos/ai": "0.8.4-main.bc2380dfbc",
+    "@dxos/app-toolkit": "0.8.4-main.bc2380dfbc",
+    "@dxos/assistant": "0.8.4-main.bc2380dfbc",
+    "@dxos/conductor": "0.8.4-main.bc2380dfbc",
+    "@dxos/debug": "0.8.4-main.bc2380dfbc",
+    "@dxos/compute": "0.8.4-main.bc2380dfbc",
+    "@dxos/edge-client": "0.8.4-main.bc2380dfbc",
+    "@dxos/log": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-automation": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-client": "0.8.4-main.bc2380dfbc",
+    "@dxos/echo": "0.8.4-main.bc2380dfbc",
+    "@dxos/plugin-space": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-client": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-mosaic": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui-stack": "0.8.4-main.bc2380dfbc",
+    "@dxos/util": "0.8.4-main.bc2380dfbc"
   },
   "devDependencies": {
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/react-ui-theme": "0.8.4-main.b97322e",
-    "@dxos/react-ui": "0.8.4-main.b97322e",
-    "@dxos/storybook-utils": "0.8.4-main.b97322e"
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^8.0.13",
+    "@dxos/plugin-testing": "0.8.4-main.bc2380dfbc",
+    "@dxos/react-ui": "0.8.4-main.bc2380dfbc",
+    "@dxos/storybook-utils": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui-theme": "0.8.4-main.bc2380dfbc"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.b97322e",
-    "@dxos/react-ui-theme": "0.8.4-main.b97322e"
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/react-ui": "0.8.4-main.bc2380dfbc",
+    "@dxos/ui-theme": "0.8.4-main.bc2380dfbc"
   },
   "publishConfig": {
     "access": "public"

package/src/ConductorPlugin.test.ts

@@ -0,0 +1,27 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { ConductorPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('ConductorPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      plugins: [ClientPlugin({}), ConductorPlugin()],
+    });
+
+    // Modules expected to be active after a normal startup.
+    expect(harness.manager.getActive()).toEqual(
+      expect.arrayContaining([moduleId('CreateObject'), moduleId('schema'), moduleId('ReactSurface')]),
+    );
+  });
+});

package/src/ConductorPlugin.tsx

@@ -2,62 +2,21 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, contributes, createIntent, defineModule, definePlugin, Events } from '@dxos/app-framework';
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
 import { ComputeGraph } from '@dxos/conductor';
-import { FunctionTrigger } from '@dxos/functions';
-import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { SpaceCapabilities } from '@dxos/plugin-space';
-import { defineObjectForm } from '@dxos/plugin-space/types';
-import { CanvasBoardType } from '@dxos/react-ui-canvas-editor';
+import { CanvasBoard } from '@dxos/react-ui-canvas-editor';
 
-import { IntentResolver, ReactSurface } from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
-import { ConductorAction } from './types';
+import { CreateObject, ReactSurface } from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
 
-export const ConductorPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, translations),
-    }),
-    defineModule({
-      id: `${meta.id}/module/metadata`,
-      activatesOn: Events.SetupMetadata,
-      activate: () =>
-        contributes(Capabilities.Metadata, {
-          id: CanvasBoardType.typename,
-          metadata: {
-            icon: 'ph--infinity--regular',
-          },
-        }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/object-form`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () =>
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: CanvasBoardType,
-            getIntent: () => createIntent(ConductorAction.Create),
-          }),
-        ),
-    }),
-    defineModule({
-      id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [ComputeGraph, FunctionTrigger]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: IntentResolver,
-    }),
-  ]);
+export const ConductorPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addCreateObjectModule({ activate: CreateObject }),
+  AppPlugin.addSchemaModule({ schema: [CanvasBoard.CanvasBoard, ComputeGraph] }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
+  Plugin.make,
+);
+
+export default ConductorPlugin;

package/src/capabilities/create-object.ts

@@ -0,0 +1,29 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
+import { SpaceOperation } from '@dxos/plugin-space';
+import { SpaceCapabilities } from '@dxos/plugin-space';
+import { CanvasBoard } from '@dxos/react-ui-canvas-editor';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(SpaceCapabilities.CreateObjectEntry, {
+      id: CanvasBoard.CanvasBoard.typename,
+      createObject: (props, options) =>
+        Effect.gen(function* () {
+          const object = CanvasBoard.make(props);
+          return yield* Operation.invoke(SpaceOperation.AddObject, {
+            object,
+            target: options.target,
+            hidden: true,
+            targetNodeId: options.targetNodeId,
+          });
+        }),
+    });
+  }),
+);

package/src/capabilities/index.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { lazy } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
 
-export const IntentResolver = lazy(() => import('./intent-resolver'));
-export const ReactSurface = lazy(() => import('./react-surface'));
+export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/react-surface.tsx

@@ -2,22 +2,31 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
-import { Obj } from '@dxos/echo';
-import { CanvasBoardType } from '@dxos/react-ui-canvas-editor';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { CanvasBoard } from '@dxos/react-ui-canvas-editor';
 
-import { CanvasContainer } from '../components';
-import { CONDUCTOR_PLUGIN } from '../meta';
+import { CanvasArticle } from '#containers';
 
-export default () =>
-  contributes(
-    Capabilities.ReactSurface,
-    createSurface({
-      id: CONDUCTOR_PLUGIN,
-      role: ['article', 'section'],
-      filter: (data): data is { subject: CanvasBoardType } => Obj.instanceOf(CanvasBoardType, data.subject),
-      component: ({ data, role }) => <CanvasContainer canvas={data.subject} role={role} />,
-    }),
-  );
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(
+      Capabilities.ReactSurface,
+      Surface.create({
+        id: 'root',
+        // TODO(wittjosiah): Split into multiple surfaces if this filter proves too strict for non-article roles.
+        filter: AppSurface.oneOf(
+          AppSurface.object(AppSurface.Article, CanvasBoard.CanvasBoard),
+          AppSurface.object(AppSurface.Section, CanvasBoard.CanvasBoard),
+        ),
+        component: ({ data, role }) => (
+          <CanvasArticle role={role} subject={data.subject} attendableId={data.attendableId} />
+        ),
+      }),
+    ),
+  ),
+);

package/src/components/index.ts

@@ -1,7 +1,3 @@
 //
-// Copyright 2023 DXOS.org
+// Copyright 2025 DXOS.org
 //
-
-import { lazy } from 'react';
-
-export const CanvasContainer = lazy(() => import('./CanvasContainer'));

package/src/{components/CanvasContainer.tsx → containers/CanvasArticle/CanvasArticle.tsx}

@@ -2,15 +2,15 @@
 // Copyright 2024 DXOS.org
 //
 
-import React, { useEffect, useMemo, useRef } from 'react';
+import React, { Fragment, useEffect, useMemo, useRef } from 'react';
 
-import { AiService } from '@dxos/ai';
-import { type Config } from '@dxos/client';
+import { useCapability } from '@dxos/app-framework/ui';
+import { type AppSurface } from '@dxos/app-toolkit/ui';
 import { ComputeGraphModel } from '@dxos/conductor';
-import { todo } from '@dxos/debug';
-import { DatabaseService, QueueService, ServiceContainer } from '@dxos/functions';
-import { useConfig } from '@dxos/react-client';
-import { fullyQualifiedId, getSpace, type Space } from '@dxos/react-client/echo';
+import { Obj } from '@dxos/echo';
+import { AutomationCapabilities } from '@dxos/plugin-automation';
+import { useObject } from '@dxos/react-client/echo';
+import { Flex, type FlexProps } from '@dxos/react-ui';
 import {
   ComputeContext,
   ComputeGraphController,
@@ -21,56 +21,24 @@ import {
   useGraphMonitor,
 } from '@dxos/react-ui-canvas-compute';
 import {
-  type CanvasBoardType,
+  type CanvasBoard,
   CanvasGraphModel,
   Editor,
   type EditorController,
   KeyboardContainer,
   ShapeRegistry,
 } from '@dxos/react-ui-canvas-editor';
-import { StackItem } from '@dxos/react-ui-stack';
 
-const createServices = (config: Config, space?: Space): ServiceContainer => {
-  return new ServiceContainer().setServices({
-    database: space == null ? undefined : DatabaseService.make(space.db),
-    queues: space == null ? undefined : QueueService.make(space.queues, undefined),
-    ai:
-      config.values.runtime?.services?.ai?.server == null
-        ? undefined
-        : AiService.make(todo(`new Edge AiServiceClient({ endpoint: config.values.runtime?.services?.ai?.server })`)),
-  });
-};
-
-const useGraphController = (canvas: CanvasBoardType) => {
-  const config = useConfig();
-  const space = getSpace(canvas);
-  const controller = useMemo(() => {
-    if (!canvas.computeGraph?.target) {
-      return null;
-    }
-    const model = new ComputeGraphModel(canvas.computeGraph?.target);
-    const controller = new ComputeGraphController(createServices(config, space), model);
-    return controller;
-  }, [canvas.computeGraph?.target, space]);
-
-  useEffect(() => {
-    if (!controller) {
-      return;
-    }
+export type CanvasArticleProps = AppSurface.ObjectArticleProps<CanvasBoard.CanvasBoard>;
 
-    void controller.open();
-    return () => {
-      void controller.close();
-    };
-  }, [controller]);
-
-  return controller;
-};
-
-export const CanvasContainer = ({ canvas, role }: { canvas: CanvasBoardType; role: string }) => {
-  const id = fullyQualifiedId(canvas);
-  const graph = useMemo(() => CanvasGraphModel.create<ComputeShape>(canvas.layout), [canvas.layout]);
-  const controller = useGraphController(canvas);
+export const CanvasArticle = ({ role, subject, attendableId: _attendableId }: CanvasArticleProps) => {
+  const [canvas] = useObject(subject);
+  const id = Obj.getDXN(canvas).toString();
+  const graph = useMemo(
+    () => CanvasGraphModel.create<ComputeShape>(canvas.layout, (fn) => Obj.update(subject, fn)),
+    [subject, canvas.layout],
+  );
+  const controller = useGraphController(subject);
   const graphMonitor = useGraphMonitor(controller?.graph);
   const registry = useMemo(() => new ShapeRegistry(computeShapes), []);
   const editorRef = useRef<EditorController>(null);
@@ -86,9 +54,11 @@ export const CanvasContainer = ({ canvas, role }: { canvas: CanvasBoardType; rol
     return;
   }
 
+  const Root = role === 'section' ? Container : Fragment;
+
   return (
     <ComputeContext.Provider value={{ controller }}>
-      <StackItem.Content size={role === 'section' ? 'square' : 'intrinsic'}>
+      <Root>
         <KeyboardContainer id={id}>
           <Editor.Root
             id={id}
@@ -102,9 +72,36 @@ export const CanvasContainer = ({ canvas, role }: { canvas: CanvasBoardType; rol
             <Editor.UI showTools />
           </Editor.Root>
         </KeyboardContainer>
-      </StackItem.Content>
+      </Root>
     </ComputeContext.Provider>
   );
 };
 
-export default CanvasContainer;
+const Container = (props: FlexProps) => <Flex {...props} classNames='aspect-square' />;
+
+const useGraphController = (canvas: CanvasBoard.CanvasBoard) => {
+  const db = Obj.getDatabase(canvas);
+  const runtime = useCapability(AutomationCapabilities.ComputeRuntime);
+  const [computeGraph] = useObject(canvas.computeGraph);
+  const controller = useMemo(() => {
+    if (!canvas.computeGraph?.target || !db) {
+      return null;
+    }
+    const model = new ComputeGraphModel(canvas.computeGraph?.target);
+    const controller = new ComputeGraphController(runtime.getRuntime(db.spaceId), model);
+    return controller;
+  }, [computeGraph, db]);
+
+  useEffect(() => {
+    if (!controller) {
+      return;
+    }
+
+    void controller.open();
+    return () => {
+      void controller.close();
+    };
+  }, [controller]);
+
+  return controller;
+};

package/src/containers/CanvasArticle/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+export { CanvasArticle as default } from './CanvasArticle';

package/src/containers/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { type ComponentType, lazy } from 'react';
+
+export const CanvasArticle: ComponentType<any> = lazy(() => import('./CanvasArticle'));

package/src/index.ts

@@ -2,5 +2,4 @@
 // Copyright 2023 DXOS.org
 //
 
-export * from './ConductorPlugin';
 export * from './meta';

package/src/meta.ts

@@ -2,16 +2,18 @@
 // Copyright 2023 DXOS.org
 //
 
-import { type PluginMeta } from '@dxos/app-framework';
+import { type Plugin } from '@dxos/app-framework';
+import { trim } from '@dxos/util';
 
-export const CONDUCTOR_PLUGIN = 'dxos.org/plugin/conductor';
-
-export const meta: PluginMeta = {
-  id: CONDUCTOR_PLUGIN,
+export const meta: Plugin.Meta = {
+  id: 'org.dxos.plugin.conductor',
   name: 'Conductor',
-  description:
-    'Conductor allows you to build a node based compute graph that can handle complex workflows inside of Composer. Leverage your collaborative data along with custom scripts to orchestrate agentic workflows that operate in the background.',
+  description: trim`
+    Visual workflow builder using node-based compute graphs to orchestrate complex AI agent pipelines.
+    Connect data sources, transformations, and AI models in a drag-and-drop interface for advanced automation.
+  `,
   icon: 'ph--infinity--regular',
+  iconHue: 'sky',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-conductor',
   tags: ['labs'],
   screenshots: ['https://dxos.network/plugin-details-canvas-dark.png'],

package/src/plugin.ts

@@ -0,0 +1,9 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const ConductorPlugin = Plugin.lazy(meta, () => import('#plugin'));

package/src/translations.ts

@@ -3,25 +3,27 @@
 //
 
 import { type Resource } from '@dxos/react-ui';
-import { CanvasBoardType } from '@dxos/react-ui-canvas-editor';
+import { CanvasBoard } from '@dxos/react-ui-canvas-editor';
 
-import { meta } from './meta';
+import { meta } from '#meta';
 
 export const translations = [
   {
     'en-US': {
-      [CanvasBoardType.typename]: {
-        'typename label': 'Circuit',
-        'typename label_zero': 'Circuits',
-        'typename label_one': 'Circuit',
-        'typename label_other': 'Circuits',
-        'object name placeholder': 'New circuit',
-        'rename object label': 'Rename circuit',
-        'delete object label': 'Delete circuit',
+      [CanvasBoard.CanvasBoard.typename]: {
+        'typename.label': 'Circuit',
+        'typename.label_zero': 'Circuits',
+        'typename.label_one': 'Circuit',
+        'typename.label_other': 'Circuits',
+        'object-name.placeholder': 'New circuit',
+        'add-object.label': 'Add circuit',
+        'rename-object.label': 'Rename circuit',
+        'delete-object.label': 'Delete circuit',
+        'object-deleted.label': 'Circuit deleted',
       },
       [meta.id]: {
-        'plugin name': 'Conductor',
-        'content placeholder': 'Enter text...',
+        'plugin.name': 'Conductor',
+        'content.placeholder': 'Enter text...',
       },
     },
   },

package/src/types/index.ts

@@ -1,5 +1,3 @@
 //
 // Copyright 2025 DXOS.org
 //
-
-export * from './schema';