@dxos/plugin-conductor 0.8.4-main.f9ba587 → 0.8.4-main.fcc0d83b33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (75) hide show
  1. package/README.md +7 -3
  2. package/dist/lib/browser/index.mjs +56 -83
  3. package/dist/lib/browser/index.mjs.map +4 -4
  4. package/dist/lib/browser/meta.json +1 -1
  5. package/dist/lib/browser/translations.mjs +28 -0
  6. package/dist/lib/browser/translations.mjs.map +7 -0
  7. package/dist/lib/node-esm/index.mjs +56 -82
  8. package/dist/lib/node-esm/index.mjs.map +4 -4
  9. package/dist/lib/node-esm/meta.json +1 -1
  10. package/dist/lib/node-esm/translations.mjs +30 -0
  11. package/dist/lib/node-esm/translations.mjs.map +7 -0
  12. package/dist/types/src/ConductorPlugin.d.ts +2 -1
  13. package/dist/types/src/ConductorPlugin.d.ts.map +1 -1
  14. package/dist/types/src/capabilities/index.d.ts +2 -2
  15. package/dist/types/src/capabilities/index.d.ts.map +1 -1
  16. package/dist/types/src/capabilities/react-surface.d.ts +3 -2
  17. package/dist/types/src/capabilities/react-surface.d.ts.map +1 -1
  18. package/dist/types/src/components/index.d.ts +0 -4
  19. package/dist/types/src/components/index.d.ts.map +1 -1
  20. package/dist/types/src/containers/CanvasContainer/CanvasContainer.d.ts +6 -0
  21. package/dist/types/src/containers/CanvasContainer/CanvasContainer.d.ts.map +1 -0
  22. package/dist/types/src/containers/CanvasContainer/index.d.ts +2 -0
  23. package/dist/types/src/containers/CanvasContainer/index.d.ts.map +1 -0
  24. package/dist/types/src/containers/index.d.ts +3 -0
  25. package/dist/types/src/containers/index.d.ts.map +1 -0
  26. package/dist/types/src/meta.d.ts +2 -3
  27. package/dist/types/src/meta.d.ts.map +1 -1
  28. package/dist/types/src/translations.d.ts +24 -12
  29. package/dist/types/src/translations.d.ts.map +1 -1
  30. package/dist/types/src/types/index.d.ts +1 -0
  31. package/dist/types/src/types/index.d.ts.map +1 -0
  32. package/dist/types/tsconfig.tsbuildinfo +1 -1
  33. package/package.json +54 -45
  34. package/src/ConductorPlugin.tsx +38 -56
  35. package/src/capabilities/index.ts +2 -3
  36. package/src/capabilities/react-surface.tsx +24 -15
  37. package/src/components/index.ts +1 -5
  38. package/src/{components → containers/CanvasContainer}/CanvasContainer.tsx +49 -50
  39. package/src/containers/CanvasContainer/index.ts +5 -0
  40. package/src/containers/index.ts +7 -0
  41. package/src/meta.ts +9 -7
  42. package/src/translations.ts +14 -10
  43. package/src/types/index.ts +3 -0
  44. package/dist/lib/browser/CanvasContainer-O3YC33NV.mjs +0 -98
  45. package/dist/lib/browser/CanvasContainer-O3YC33NV.mjs.map +0 -7
  46. package/dist/lib/browser/chunk-3AGZDOYQ.mjs +0 -21
  47. package/dist/lib/browser/chunk-3AGZDOYQ.mjs.map +0 -7
  48. package/dist/lib/browser/chunk-QKQZESAY.mjs +0 -26
  49. package/dist/lib/browser/chunk-QKQZESAY.mjs.map +0 -7
  50. package/dist/lib/browser/intent-resolver-YSZENT2I.mjs +0 -34
  51. package/dist/lib/browser/intent-resolver-YSZENT2I.mjs.map +0 -7
  52. package/dist/lib/browser/react-surface-QDR7HK5I.mjs +0 -31
  53. package/dist/lib/browser/react-surface-QDR7HK5I.mjs.map +0 -7
  54. package/dist/lib/browser/types.mjs +0 -8
  55. package/dist/lib/browser/types.mjs.map +0 -7
  56. package/dist/lib/node-esm/CanvasContainer-GM2APZYD.mjs +0 -100
  57. package/dist/lib/node-esm/CanvasContainer-GM2APZYD.mjs.map +0 -7
  58. package/dist/lib/node-esm/chunk-Q66FYBJJ.mjs +0 -27
  59. package/dist/lib/node-esm/chunk-Q66FYBJJ.mjs.map +0 -7
  60. package/dist/lib/node-esm/chunk-TL52TWDT.mjs +0 -23
  61. package/dist/lib/node-esm/chunk-TL52TWDT.mjs.map +0 -7
  62. package/dist/lib/node-esm/intent-resolver-H3K5WUBD.mjs +0 -35
  63. package/dist/lib/node-esm/intent-resolver-H3K5WUBD.mjs.map +0 -7
  64. package/dist/lib/node-esm/react-surface-L5YYCEA5.mjs +0 -32
  65. package/dist/lib/node-esm/react-surface-L5YYCEA5.mjs.map +0 -7
  66. package/dist/lib/node-esm/types.mjs +0 -9
  67. package/dist/lib/node-esm/types.mjs.map +0 -7
  68. package/dist/types/src/capabilities/intent-resolver.d.ts +0 -4
  69. package/dist/types/src/capabilities/intent-resolver.d.ts.map +0 -1
  70. package/dist/types/src/components/CanvasContainer.d.ts +0 -8
  71. package/dist/types/src/components/CanvasContainer.d.ts.map +0 -1
  72. package/dist/types/src/types.d.ts +0 -18
  73. package/dist/types/src/types.d.ts.map +0 -1
  74. package/src/capabilities/intent-resolver.ts +0 -27
  75. package/src/types.ts +0 -22
package/package.json CHANGED
@@ -1,73 +1,82 @@
1
1
  {
2
2
  "name": "@dxos/plugin-conductor",
3
- "version": "0.8.4-main.f9ba587",
3
+ "version": "0.8.4-main.fcc0d83b33",
4
4
  "description": "Composer plugin for conductor.",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
7
+ "repository": {
8
+ "type": "git",
9
+ "url": "https://github.com/dxos/dxos"
10
+ },
7
11
  "license": "MIT",
8
12
  "author": "DXOS.org",
9
13
  "sideEffects": true,
10
14
  "type": "module",
15
+ "imports": {
16
+ "#capabilities": "./src/capabilities/index.ts",
17
+ "#components": "./src/components/index.ts",
18
+ "#containers": "./src/containers/index.ts",
19
+ "#meta": "./src/meta.ts",
20
+ "#translations": "./src/translations.ts",
21
+ "#types": "./src/types/index.ts"
22
+ },
11
23
  "exports": {
12
24
  ".": {
13
- "types": "./dist/types/src/index.d.ts",
25
+ "source": "./src/index.ts",
14
26
  "browser": "./dist/lib/browser/index.mjs",
15
- "node": "./dist/lib/node-esm/index.mjs"
27
+ "node": "./dist/lib/node-esm/index.mjs",
28
+ "types": "./dist/types/src/index.d.ts"
16
29
  },
17
- "./types": {
18
- "types": "./dist/types/src/types.d.ts",
19
- "browser": "./dist/lib/browser/types.mjs",
20
- "node": "./dist/lib/node-esm/types.mjs"
30
+ "./translations": {
31
+ "source": "./src/translations.ts",
32
+ "types": "./dist/types/src/translations.d.ts",
33
+ "browser": "./dist/lib/browser/translations.mjs",
34
+ "node": "./dist/lib/node-esm/translations.mjs"
21
35
  }
22
36
  },
23
37
  "types": "dist/types/src/index.d.ts",
24
- "typesVersions": {
25
- "*": {
26
- "types": [
27
- "dist/types/src/types.d.ts"
28
- ]
29
- }
30
- },
31
38
  "files": [
32
39
  "dist",
33
40
  "src"
34
41
  ],
35
42
  "dependencies": {
36
- "@preact-signals/safe-react": "^0.9.0",
37
- "effect": "3.16.13",
38
- "@dxos/ai": "0.8.4-main.f9ba587",
39
- "@dxos/assistant": "0.8.4-main.f9ba587",
40
- "@dxos/app-framework": "0.8.4-main.f9ba587",
41
- "@dxos/conductor": "0.8.4-main.f9ba587",
42
- "@dxos/echo": "0.8.4-main.f9ba587",
43
- "@dxos/echo-schema": "0.8.4-main.f9ba587",
44
- "@dxos/edge-client": "0.8.4-main.f9ba587",
45
- "@dxos/functions": "0.8.4-main.f9ba587",
46
- "@dxos/live-object": "0.8.4-main.f9ba587",
47
- "@dxos/plugin-client": "0.8.4-main.f9ba587",
48
- "@dxos/plugin-space": "0.8.4-main.f9ba587",
49
- "@dxos/react-client": "0.8.4-main.f9ba587",
50
- "@dxos/log": "0.8.4-main.f9ba587",
51
- "@dxos/react-ui-canvas-compute": "0.8.4-main.f9ba587",
52
- "@dxos/react-ui-canvas-editor": "0.8.4-main.f9ba587",
53
- "@dxos/react-ui-stack": "0.8.4-main.f9ba587"
43
+ "effect": "3.20.0",
44
+ "@dxos/ai": "0.8.4-main.fcc0d83b33",
45
+ "@dxos/app-toolkit": "0.8.4-main.fcc0d83b33",
46
+ "@dxos/app-framework": "0.8.4-main.fcc0d83b33",
47
+ "@dxos/assistant": "0.8.4-main.fcc0d83b33",
48
+ "@dxos/compute": "0.8.4-main.fcc0d83b33",
49
+ "@dxos/conductor": "0.8.4-main.fcc0d83b33",
50
+ "@dxos/echo": "0.8.4-main.fcc0d83b33",
51
+ "@dxos/edge-client": "0.8.4-main.fcc0d83b33",
52
+ "@dxos/plugin-automation": "0.8.4-main.fcc0d83b33",
53
+ "@dxos/plugin-client": "0.8.4-main.fcc0d83b33",
54
+ "@dxos/debug": "0.8.4-main.fcc0d83b33",
55
+ "@dxos/log": "0.8.4-main.fcc0d83b33",
56
+ "@dxos/react-client": "0.8.4-main.fcc0d83b33",
57
+ "@dxos/plugin-space": "0.8.4-main.fcc0d83b33",
58
+ "@dxos/react-ui-canvas-compute": "0.8.4-main.fcc0d83b33",
59
+ "@dxos/react-ui-canvas-editor": "0.8.4-main.fcc0d83b33",
60
+ "@dxos/react-ui-mosaic": "0.8.4-main.fcc0d83b33",
61
+ "@dxos/react-ui-stack": "0.8.4-main.fcc0d83b33",
62
+ "@dxos/util": "0.8.4-main.fcc0d83b33"
54
63
  },
55
64
  "devDependencies": {
56
- "@types/react": "~18.2.0",
57
- "@types/react-dom": "~18.2.0",
58
- "react": "~18.2.0",
59
- "react-dom": "~18.2.0",
60
- "vite": "5.4.7",
61
- "@dxos/react-ui": "0.8.4-main.f9ba587",
62
- "@dxos/react-ui-theme": "0.8.4-main.f9ba587",
63
- "@dxos/storybook-utils": "0.8.4-main.f9ba587"
65
+ "@types/react": "~19.2.7",
66
+ "@types/react-dom": "~19.2.3",
67
+ "react": "~19.2.3",
68
+ "react-dom": "~19.2.3",
69
+ "vite": "^8.0.10",
70
+ "@dxos/storybook-utils": "0.8.4-main.fcc0d83b33",
71
+ "@dxos/ui-theme": "0.8.4-main.fcc0d83b33",
72
+ "@dxos/react-ui": "0.8.4-main.fcc0d83b33"
64
73
  },
65
74
  "peerDependencies": {
66
- "effect": "^3.13.3",
67
- "react": "~18.2.0",
68
- "react-dom": "~18.2.0",
69
- "@dxos/react-ui": "0.8.4-main.f9ba587",
70
- "@dxos/react-ui-theme": "0.8.4-main.f9ba587"
75
+ "effect": "3.20.0",
76
+ "react": "~19.2.3",
77
+ "react-dom": "~19.2.3",
78
+ "@dxos/react-ui": "0.8.4-main.fcc0d83b33",
79
+ "@dxos/ui-theme": "0.8.4-main.fcc0d83b33"
71
80
  },
72
81
  "publishConfig": {
73
82
  "access": "public"
@@ -2,62 +2,44 @@
2
2
  // Copyright 2023 DXOS.org
3
3
  //
4
4
 
5
- import { Capabilities, contributes, createIntent, defineModule, definePlugin, Events } from '@dxos/app-framework';
5
+ import * as Effect from 'effect/Effect';
6
+ import * as Option from 'effect/Option';
7
+
8
+ import { Plugin } from '@dxos/app-framework';
9
+ import { AppPlugin } from '@dxos/app-toolkit';
10
+ import { Operation } from '@dxos/compute';
6
11
  import { ComputeGraph } from '@dxos/conductor';
7
- import { FunctionTrigger } from '@dxos/functions';
8
- import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
9
- import { SpaceCapabilities } from '@dxos/plugin-space';
10
- import { defineObjectForm } from '@dxos/plugin-space/types';
11
- import { CanvasBoardType } from '@dxos/react-ui-canvas-editor';
12
+ import { Annotation } from '@dxos/echo';
13
+ import { SpaceOperation } from '@dxos/plugin-space/operations';
14
+ import { type CreateObject } from '@dxos/plugin-space/types';
15
+ import { CanvasBoard } from '@dxos/react-ui-canvas-editor';
12
16
 
13
- import { IntentResolver, ReactSurface } from './capabilities';
14
- import { meta } from './meta';
15
- import { translations } from './translations';
16
- import { ConductorAction } from './types';
17
+ import { ReactSurface } from '#capabilities';
18
+ import { meta } from '#meta';
19
+ import { translations } from '#translations';
17
20
 
18
- export const ConductorPlugin = () =>
19
- definePlugin(meta, [
20
- defineModule({
21
- id: `${meta.id}/module/translations`,
22
- activatesOn: Events.SetupTranslations,
23
- activate: () => contributes(Capabilities.Translations, translations),
24
- }),
25
- defineModule({
26
- id: `${meta.id}/module/metadata`,
27
- activatesOn: Events.SetupMetadata,
28
- activate: () =>
29
- contributes(Capabilities.Metadata, {
30
- id: CanvasBoardType.typename,
31
- metadata: {
32
- icon: 'ph--infinity--regular',
33
- },
34
- }),
35
- }),
36
- defineModule({
37
- id: `${meta.id}/module/object-form`,
38
- activatesOn: ClientEvents.SetupSchema,
39
- activate: () =>
40
- contributes(
41
- SpaceCapabilities.ObjectForm,
42
- defineObjectForm({
43
- objectSchema: CanvasBoardType,
44
- getIntent: () => createIntent(ConductorAction.Create),
45
- }),
46
- ),
47
- }),
48
- defineModule({
49
- id: `${meta.id}/module/schema`,
50
- activatesOn: ClientEvents.SetupSchema,
51
- activate: () => contributes(ClientCapabilities.Schema, [ComputeGraph, FunctionTrigger]),
52
- }),
53
- defineModule({
54
- id: `${meta.id}/module/react-surface`,
55
- activatesOn: Events.SetupReactSurface,
56
- activate: ReactSurface,
57
- }),
58
- defineModule({
59
- id: `${meta.id}/module/intent-resolver`,
60
- activatesOn: Events.SetupIntentResolver,
61
- activate: IntentResolver,
62
- }),
63
- ]);
21
+ export const ConductorPlugin = Plugin.define(meta).pipe(
22
+ AppPlugin.addMetadataModule({
23
+ metadata: {
24
+ id: CanvasBoard.CanvasBoard.typename,
25
+ metadata: {
26
+ icon: Annotation.IconAnnotation.get(CanvasBoard.CanvasBoard).pipe(Option.getOrThrow).icon,
27
+ iconHue: Annotation.IconAnnotation.get(CanvasBoard.CanvasBoard).pipe(Option.getOrThrow).hue ?? 'white',
28
+ createObject: ((props, options) =>
29
+ Effect.gen(function* () {
30
+ const object = CanvasBoard.make(props);
31
+ return yield* Operation.invoke(SpaceOperation.AddObject, {
32
+ object,
33
+ target: options.target,
34
+ hidden: true,
35
+ targetNodeId: options.targetNodeId,
36
+ });
37
+ })) satisfies CreateObject,
38
+ },
39
+ },
40
+ }),
41
+ AppPlugin.addSchemaModule({ schema: [CanvasBoard.CanvasBoard, ComputeGraph] }),
42
+ AppPlugin.addSurfaceModule({ activate: ReactSurface }),
43
+ AppPlugin.addTranslationsModule({ translations }),
44
+ Plugin.make,
45
+ );
@@ -2,7 +2,6 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- import { lazy } from '@dxos/app-framework';
5
+ import { Capability } from '@dxos/app-framework';
6
6
 
7
- export const IntentResolver = lazy(() => import('./intent-resolver'));
8
- export const ReactSurface = lazy(() => import('./react-surface'));
7
+ export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
@@ -2,22 +2,31 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
+ import * as Effect from 'effect/Effect';
5
6
  import React from 'react';
6
7
 
7
- import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
8
- import { Obj } from '@dxos/echo';
9
- import { CanvasBoardType } from '@dxos/react-ui-canvas-editor';
8
+ import { Capabilities, Capability } from '@dxos/app-framework';
9
+ import { Surface } from '@dxos/app-framework/ui';
10
+ import { AppSurface } from '@dxos/app-toolkit/ui';
11
+ import { CanvasBoard } from '@dxos/react-ui-canvas-editor';
10
12
 
11
- import { CanvasContainer } from '../components';
12
- import { CONDUCTOR_PLUGIN } from '../meta';
13
+ import { CanvasContainer } from '#containers';
13
14
 
14
- export default () =>
15
- contributes(
16
- Capabilities.ReactSurface,
17
- createSurface({
18
- id: CONDUCTOR_PLUGIN,
19
- role: ['article', 'section'],
20
- filter: (data): data is { subject: CanvasBoardType } => Obj.instanceOf(CanvasBoardType, data.subject),
21
- component: ({ data, role }) => <CanvasContainer canvas={data.subject} role={role} />,
22
- }),
23
- );
15
+ export default Capability.makeModule(() =>
16
+ Effect.succeed(
17
+ Capability.contributes(
18
+ Capabilities.ReactSurface,
19
+ Surface.create({
20
+ id: 'root',
21
+ // TODO(wittjosiah): Split into multiple surfaces if this filter proves too strict for non-article roles.
22
+ filter: AppSurface.oneOf(
23
+ AppSurface.object(AppSurface.Article, CanvasBoard.CanvasBoard),
24
+ AppSurface.object(AppSurface.Section, CanvasBoard.CanvasBoard),
25
+ ),
26
+ component: ({ data, role }) => (
27
+ <CanvasContainer role={role} subject={data.subject} attendableId={data.attendableId} />
28
+ ),
29
+ }),
30
+ ),
31
+ ),
32
+ );
@@ -1,7 +1,3 @@
1
1
  //
2
- // Copyright 2023 DXOS.org
2
+ // Copyright 2025 DXOS.org
3
3
  //
4
-
5
- import { lazy } from 'react';
6
-
7
- export const CanvasContainer = lazy(() => import('./CanvasContainer'));
@@ -2,14 +2,15 @@
2
2
  // Copyright 2024 DXOS.org
3
3
  //
4
4
 
5
- import React, { useEffect, useMemo, useRef } from 'react';
5
+ import React, { Fragment, useEffect, useMemo, useRef } from 'react';
6
6
 
7
- import { EdgeAiServiceClient } from '@dxos/ai';
8
- import { type Config } from '@dxos/client';
7
+ import { useCapability } from '@dxos/app-framework/ui';
8
+ import { type AppSurface } from '@dxos/app-toolkit/ui';
9
9
  import { ComputeGraphModel } from '@dxos/conductor';
10
- import { AiService, DatabaseService, QueueService, ServiceContainer } from '@dxos/functions';
11
- import { useConfig } from '@dxos/react-client';
12
- import { fullyQualifiedId, getSpace, type Space } from '@dxos/react-client/echo';
10
+ import { Obj } from '@dxos/echo';
11
+ import { AutomationCapabilities } from '@dxos/plugin-automation/types';
12
+ import { useObject } from '@dxos/react-client/echo';
13
+ import { Flex, type FlexProps } from '@dxos/react-ui';
13
14
  import {
14
15
  ComputeContext,
15
16
  ComputeGraphController,
@@ -20,55 +21,24 @@ import {
20
21
  useGraphMonitor,
21
22
  } from '@dxos/react-ui-canvas-compute';
22
23
  import {
23
- type CanvasBoardType,
24
+ type CanvasBoard,
24
25
  CanvasGraphModel,
25
26
  Editor,
26
27
  type EditorController,
27
28
  KeyboardContainer,
28
29
  ShapeRegistry,
29
30
  } from '@dxos/react-ui-canvas-editor';
30
- import { StackItem } from '@dxos/react-ui-stack';
31
31
 
32
- const createServices = (config: Config, space?: Space): ServiceContainer => {
33
- return new ServiceContainer().setServices({
34
- database: space == null ? undefined : DatabaseService.make(space.db),
35
- queues: space == null ? undefined : QueueService.make(space.queues, undefined),
36
- ai:
37
- config.values.runtime?.services?.ai?.server == null
38
- ? undefined
39
- : AiService.make(new EdgeAiServiceClient({ endpoint: config.values.runtime?.services?.ai?.server })),
40
- });
41
- };
32
+ export type CanvasContainerProps = AppSurface.ObjectArticleProps<CanvasBoard.CanvasBoard>;
42
33
 
43
- const useGraphController = (canvas: CanvasBoardType) => {
44
- const config = useConfig();
45
- const space = getSpace(canvas);
46
- const controller = useMemo(() => {
47
- if (!canvas.computeGraph?.target) {
48
- return null;
49
- }
50
- const model = new ComputeGraphModel(canvas.computeGraph?.target);
51
- const controller = new ComputeGraphController(createServices(config, space), model);
52
- return controller;
53
- }, [canvas.computeGraph?.target, space]);
54
-
55
- useEffect(() => {
56
- if (!controller) {
57
- return;
58
- }
59
- void controller.open();
60
- return () => {
61
- void controller.close();
62
- };
63
- }, [controller]);
64
-
65
- return controller;
66
- };
67
-
68
- export const CanvasContainer = ({ canvas, role }: { canvas: CanvasBoardType; role: string }) => {
69
- const id = fullyQualifiedId(canvas);
70
- const graph = useMemo(() => CanvasGraphModel.create<ComputeShape>(canvas.layout), [canvas.layout]);
71
- const controller = useGraphController(canvas);
34
+ export const CanvasContainer = ({ role, subject, attendableId: _attendableId }: CanvasContainerProps) => {
35
+ const [canvas] = useObject(subject);
36
+ const id = Obj.getDXN(canvas).toString();
37
+ const graph = useMemo(
38
+ () => CanvasGraphModel.create<ComputeShape>(canvas.layout, (fn) => Obj.update(subject, fn)),
39
+ [subject, canvas.layout],
40
+ );
41
+ const controller = useGraphController(subject);
72
42
  const graphMonitor = useGraphMonitor(controller?.graph);
73
43
  const registry = useMemo(() => new ShapeRegistry(computeShapes), []);
74
44
  const editorRef = useRef<EditorController>(null);
@@ -84,9 +54,11 @@ export const CanvasContainer = ({ canvas, role }: { canvas: CanvasBoardType; rol
84
54
  return;
85
55
  }
86
56
 
57
+ const Root = role === 'section' ? Container : Fragment;
58
+
87
59
  return (
88
60
  <ComputeContext.Provider value={{ controller }}>
89
- <StackItem.Content size={role === 'section' ? 'square' : 'intrinsic'}>
61
+ <Root>
90
62
  <KeyboardContainer id={id}>
91
63
  <Editor.Root
92
64
  id={id}
@@ -100,9 +72,36 @@ export const CanvasContainer = ({ canvas, role }: { canvas: CanvasBoardType; rol
100
72
  <Editor.UI showTools />
101
73
  </Editor.Root>
102
74
  </KeyboardContainer>
103
- </StackItem.Content>
75
+ </Root>
104
76
  </ComputeContext.Provider>
105
77
  );
106
78
  };
107
79
 
108
- export default CanvasContainer;
80
+ const Container = (props: FlexProps) => <Flex {...props} classNames='aspect-square' />;
81
+
82
+ const useGraphController = (canvas: CanvasBoard.CanvasBoard) => {
83
+ const db = Obj.getDatabase(canvas);
84
+ const runtime = useCapability(AutomationCapabilities.ComputeRuntime);
85
+ const [computeGraph] = useObject(canvas.computeGraph);
86
+ const controller = useMemo(() => {
87
+ if (!canvas.computeGraph?.target || !db) {
88
+ return null;
89
+ }
90
+ const model = new ComputeGraphModel(canvas.computeGraph?.target);
91
+ const controller = new ComputeGraphController(runtime.getRuntime(db.spaceId), model);
92
+ return controller;
93
+ }, [computeGraph, db]);
94
+
95
+ useEffect(() => {
96
+ if (!controller) {
97
+ return;
98
+ }
99
+
100
+ void controller.open();
101
+ return () => {
102
+ void controller.close();
103
+ };
104
+ }, [controller]);
105
+
106
+ return controller;
107
+ };
@@ -0,0 +1,5 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ export { CanvasContainer as default } from './CanvasContainer';
@@ -0,0 +1,7 @@
1
+ //
2
+ // Copyright 2024 DXOS.org
3
+ //
4
+
5
+ import { type ComponentType, lazy } from 'react';
6
+
7
+ export const CanvasContainer: ComponentType<any> = lazy(() => import('./CanvasContainer'));
package/src/meta.ts CHANGED
@@ -2,16 +2,18 @@
2
2
  // Copyright 2023 DXOS.org
3
3
  //
4
4
 
5
- import { type PluginMeta } from '@dxos/app-framework';
5
+ import { type Plugin } from '@dxos/app-framework';
6
+ import { trim } from '@dxos/util';
6
7
 
7
- export const CONDUCTOR_PLUGIN = 'dxos.org/plugin/conductor';
8
-
9
- export const meta: PluginMeta = {
10
- id: CONDUCTOR_PLUGIN,
8
+ export const meta: Plugin.Meta = {
9
+ id: 'org.dxos.plugin.conductor',
11
10
  name: 'Conductor',
12
- description:
13
- '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.',
11
+ description: trim`
12
+ Visual workflow builder using node-based compute graphs to orchestrate complex AI agent pipelines.
13
+ Connect data sources, transformations, and AI models in a drag-and-drop interface for advanced automation.
14
+ `,
14
15
  icon: 'ph--infinity--regular',
16
+ iconHue: 'sky',
15
17
  source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-conductor',
16
18
  tags: ['labs'],
17
19
  screenshots: ['https://dxos.network/plugin-details-canvas-dark.png'],
@@ -3,23 +3,27 @@
3
3
  //
4
4
 
5
5
  import { type Resource } from '@dxos/react-ui';
6
- import { CanvasBoardType } from '@dxos/react-ui-canvas-editor';
6
+ import { CanvasBoard } from '@dxos/react-ui-canvas-editor';
7
7
 
8
- import { meta } from './meta';
8
+ import { meta } from '#meta';
9
9
 
10
10
  export const translations = [
11
11
  {
12
12
  'en-US': {
13
- [CanvasBoardType.typename]: {
14
- 'typename label': 'Circuit',
15
- 'typename label_zero': 'Circuits',
16
- 'typename label_one': 'Circuit',
17
- 'typename label_other': 'Circuits',
18
- 'object name placeholder': 'New circuit',
13
+ [CanvasBoard.CanvasBoard.typename]: {
14
+ 'typename.label': 'Circuit',
15
+ 'typename.label_zero': 'Circuits',
16
+ 'typename.label_one': 'Circuit',
17
+ 'typename.label_other': 'Circuits',
18
+ 'object-name.placeholder': 'New circuit',
19
+ 'add-object.label': 'Add circuit',
20
+ 'rename-object.label': 'Rename circuit',
21
+ 'delete-object.label': 'Delete circuit',
22
+ 'object-deleted.label': 'Circuit deleted',
19
23
  },
20
24
  [meta.id]: {
21
- 'plugin name': 'Conductor',
22
- 'content placeholder': 'Enter text...',
25
+ 'plugin.name': 'Conductor',
26
+ 'content.placeholder': 'Enter text...',
23
27
  },
24
28
  },
25
29
  },
@@ -0,0 +1,3 @@
1
+ //
2
+ // Copyright 2025 DXOS.org
3
+ //
@@ -1,98 +0,0 @@
1
- // src/components/CanvasContainer.tsx
2
- import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
3
- import React, { useEffect, useMemo, useRef } from "react";
4
- import { EdgeAiServiceClient } from "@dxos/ai";
5
- import { ComputeGraphModel } from "@dxos/conductor";
6
- import { AiService, DatabaseService, QueueService, ServiceContainer } from "@dxos/functions";
7
- import { useConfig } from "@dxos/react-client";
8
- import { fullyQualifiedId, getSpace } from "@dxos/react-client/echo";
9
- import { ComputeContext, ComputeGraphController, ComputeShapeLayout, computeShapes, useComputeGraphController, useGraphMonitor } from "@dxos/react-ui-canvas-compute";
10
- import { CanvasGraphModel, Editor, KeyboardContainer, ShapeRegistry } from "@dxos/react-ui-canvas-editor";
11
- import { StackItem } from "@dxos/react-ui-stack";
12
- var createServices = (config, space) => {
13
- return new ServiceContainer().setServices({
14
- database: space == null ? void 0 : DatabaseService.make(space.db),
15
- queues: space == null ? void 0 : QueueService.make(space.queues, void 0),
16
- ai: config.values.runtime?.services?.ai?.server == null ? void 0 : AiService.make(new EdgeAiServiceClient({
17
- endpoint: config.values.runtime?.services?.ai?.server
18
- }))
19
- });
20
- };
21
- var useGraphController = (canvas) => {
22
- const config = useConfig();
23
- const space = getSpace(canvas);
24
- const controller = useMemo(() => {
25
- if (!canvas.computeGraph?.target) {
26
- return null;
27
- }
28
- const model = new ComputeGraphModel(canvas.computeGraph?.target);
29
- const controller2 = new ComputeGraphController(createServices(config, space), model);
30
- return controller2;
31
- }, [
32
- canvas.computeGraph?.target,
33
- space
34
- ]);
35
- useEffect(() => {
36
- if (!controller) {
37
- return;
38
- }
39
- void controller.open();
40
- return () => {
41
- void controller.close();
42
- };
43
- }, [
44
- controller
45
- ]);
46
- return controller;
47
- };
48
- var CanvasContainer = ({ canvas, role }) => {
49
- var _effect = _useSignals();
50
- try {
51
- const id = fullyQualifiedId(canvas);
52
- const graph = useMemo(() => CanvasGraphModel.create(canvas.layout), [
53
- canvas.layout
54
- ]);
55
- const controller = useGraphController(canvas);
56
- const graphMonitor = useGraphMonitor(controller?.graph);
57
- const registry = useMemo(() => new ShapeRegistry(computeShapes), []);
58
- const editorRef = useRef(null);
59
- useComputeGraphController({
60
- controller,
61
- graph,
62
- editorRef
63
- });
64
- const layout = useMemo(() => controller && registry ? new ComputeShapeLayout(controller, registry) : void 0, [
65
- controller,
66
- registry
67
- ]);
68
- if (!controller) {
69
- return;
70
- }
71
- return /* @__PURE__ */ React.createElement(ComputeContext.Provider, {
72
- value: {
73
- controller
74
- }
75
- }, /* @__PURE__ */ React.createElement(StackItem.Content, {
76
- size: role === "section" ? "square" : "intrinsic"
77
- }, /* @__PURE__ */ React.createElement(KeyboardContainer, {
78
- id
79
- }, /* @__PURE__ */ React.createElement(Editor.Root, {
80
- id,
81
- ref: editorRef,
82
- graph,
83
- graphMonitor,
84
- registry,
85
- layout
86
- }, /* @__PURE__ */ React.createElement(Editor.Canvas, null), /* @__PURE__ */ React.createElement(Editor.UI, {
87
- showTools: true
88
- })))));
89
- } finally {
90
- _effect.f();
91
- }
92
- };
93
- var CanvasContainer_default = CanvasContainer;
94
- export {
95
- CanvasContainer,
96
- CanvasContainer_default as default
97
- };
98
- //# sourceMappingURL=CanvasContainer-O3YC33NV.mjs.map
@@ -1,7 +0,0 @@
1
- {
2
- "version": 3,
3
- "sources": ["../../../src/components/CanvasContainer.tsx"],
4
- "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport React, { useEffect, useMemo, useRef } from 'react';\n\nimport { EdgeAiServiceClient } from '@dxos/ai';\nimport { type Config } from '@dxos/client';\nimport { ComputeGraphModel } from '@dxos/conductor';\nimport { AiService, DatabaseService, QueueService, ServiceContainer } from '@dxos/functions';\nimport { useConfig } from '@dxos/react-client';\nimport { fullyQualifiedId, getSpace, type Space } from '@dxos/react-client/echo';\nimport {\n ComputeContext,\n ComputeGraphController,\n type ComputeShape,\n ComputeShapeLayout,\n computeShapes,\n useComputeGraphController,\n useGraphMonitor,\n} from '@dxos/react-ui-canvas-compute';\nimport {\n type CanvasBoardType,\n CanvasGraphModel,\n Editor,\n type EditorController,\n KeyboardContainer,\n ShapeRegistry,\n} from '@dxos/react-ui-canvas-editor';\nimport { StackItem } from '@dxos/react-ui-stack';\n\nconst createServices = (config: Config, space?: Space): ServiceContainer => {\n return new ServiceContainer().setServices({\n database: space == null ? undefined : DatabaseService.make(space.db),\n queues: space == null ? undefined : QueueService.make(space.queues, undefined),\n ai:\n config.values.runtime?.services?.ai?.server == null\n ? undefined\n : AiService.make(new EdgeAiServiceClient({ endpoint: config.values.runtime?.services?.ai?.server })),\n });\n};\n\nconst useGraphController = (canvas: CanvasBoardType) => {\n const config = useConfig();\n const space = getSpace(canvas);\n const controller = useMemo(() => {\n if (!canvas.computeGraph?.target) {\n return null;\n }\n const model = new ComputeGraphModel(canvas.computeGraph?.target);\n const controller = new ComputeGraphController(createServices(config, space), model);\n return controller;\n }, [canvas.computeGraph?.target, space]);\n\n useEffect(() => {\n if (!controller) {\n return;\n }\n void controller.open();\n return () => {\n void controller.close();\n };\n }, [controller]);\n\n return controller;\n};\n\nexport const CanvasContainer = ({ canvas, role }: { canvas: CanvasBoardType; role: string }) => {\n const id = fullyQualifiedId(canvas);\n const graph = useMemo(() => CanvasGraphModel.create<ComputeShape>(canvas.layout), [canvas.layout]);\n const controller = useGraphController(canvas);\n const graphMonitor = useGraphMonitor(controller?.graph);\n const registry = useMemo(() => new ShapeRegistry(computeShapes), []);\n const editorRef = useRef<EditorController>(null);\n useComputeGraphController({ controller, graph, editorRef });\n\n // Layout.\n const layout = useMemo(\n () => (controller && registry ? new ComputeShapeLayout(controller, registry) : undefined),\n [controller, registry],\n );\n\n if (!controller) {\n return;\n }\n\n return (\n <ComputeContext.Provider value={{ controller }}>\n <StackItem.Content size={role === 'section' ? 'square' : 'intrinsic'}>\n <KeyboardContainer id={id}>\n <Editor.Root\n id={id}\n ref={editorRef}\n graph={graph}\n graphMonitor={graphMonitor as any}\n registry={registry}\n layout={layout}\n >\n <Editor.Canvas />\n <Editor.UI showTools />\n </Editor.Root>\n </KeyboardContainer>\n </StackItem.Content>\n </ComputeContext.Provider>\n );\n};\n\nexport default CanvasContainer;\n"],
5
- "mappings": ";;AAIA,OAAOA,SAASC,WAAWC,SAASC,cAAc;AAElD,SAASC,2BAA2B;AAEpC,SAASC,yBAAyB;AAClC,SAASC,WAAWC,iBAAiBC,cAAcC,wBAAwB;AAC3E,SAASC,iBAAiB;AAC1B,SAASC,kBAAkBC,gBAA4B;AACvD,SACEC,gBACAC,wBAEAC,oBACAC,eACAC,2BACAC,uBACK;AACP,SAEEC,kBACAC,QAEAC,mBACAC,qBACK;AACP,SAASC,iBAAiB;AAE1B,IAAMC,iBAAiB,CAACC,QAAgBC,UAAAA;AACtC,SAAO,IAAIC,iBAAAA,EAAmBC,YAAY;IACxCC,UAAUH,SAAS,OAAOI,SAAYC,gBAAgBC,KAAKN,MAAMO,EAAE;IACnEC,QAAQR,SAAS,OAAOI,SAAYK,aAAaH,KAAKN,MAAMQ,QAAQJ,MAAAA;IACpEM,IACEX,OAAOY,OAAOC,SAASC,UAAUH,IAAII,UAAU,OAC3CV,SACAW,UAAUT,KAAK,IAAIU,oBAAoB;MAAEC,UAAUlB,OAAOY,OAAOC,SAASC,UAAUH,IAAII;IAAO,CAAA,CAAA;EACvG,CAAA;AACF;AAEA,IAAMI,qBAAqB,CAACC,WAAAA;AAC1B,QAAMpB,SAASqB,UAAAA;AACf,QAAMpB,QAAQqB,SAASF,MAAAA;AACvB,QAAMG,aAAaC,QAAQ,MAAA;AACzB,QAAI,CAACJ,OAAOK,cAAcC,QAAQ;AAChC,aAAO;IACT;AACA,UAAMC,QAAQ,IAAIC,kBAAkBR,OAAOK,cAAcC,MAAAA;AACzD,UAAMH,cAAa,IAAIM,uBAAuB9B,eAAeC,QAAQC,KAAAA,GAAQ0B,KAAAA;AAC7E,WAAOJ;EACT,GAAG;IAACH,OAAOK,cAAcC;IAAQzB;GAAM;AAEvC6B,YAAU,MAAA;AACR,QAAI,CAACP,YAAY;AACf;IACF;AACA,SAAKA,WAAWQ,KAAI;AACpB,WAAO,MAAA;AACL,WAAKR,WAAWS,MAAK;IACvB;EACF,GAAG;IAACT;GAAW;AAEf,SAAOA;AACT;AAEO,IAAMU,kBAAkB,CAAC,EAAEb,QAAQc,KAAI,MAA6C;;;AACzF,UAAMC,KAAKC,iBAAiBhB,MAAAA;AAC5B,UAAMiB,QAAQb,QAAQ,MAAMc,iBAAiBC,OAAqBnB,OAAOoB,MAAM,GAAG;MAACpB,OAAOoB;KAAO;AACjG,UAAMjB,aAAaJ,mBAAmBC,MAAAA;AACtC,UAAMqB,eAAeC,gBAAgBnB,YAAYc,KAAAA;AACjD,UAAMM,WAAWnB,QAAQ,MAAM,IAAIoB,cAAcC,aAAAA,GAAgB,CAAA,CAAE;AACnE,UAAMC,YAAYC,OAAyB,IAAA;AAC3CC,8BAA0B;MAAEzB;MAAYc;MAAOS;IAAU,CAAA;AAGzD,UAAMN,SAAShB,QACb,MAAOD,cAAcoB,WAAW,IAAIM,mBAAmB1B,YAAYoB,QAAAA,IAAYtC,QAC/E;MAACkB;MAAYoB;KAAS;AAGxB,QAAI,CAACpB,YAAY;AACf;IACF;AAEA,WACE,sBAAA,cAAC2B,eAAeC,UAAQ;MAACC,OAAO;QAAE7B;MAAW;OAC3C,sBAAA,cAAC8B,UAAUC,SAAO;MAACC,MAAMrB,SAAS,YAAY,WAAW;OACvD,sBAAA,cAACsB,mBAAAA;MAAkBrB;OACjB,sBAAA,cAACsB,OAAOC,MAAI;MACVvB;MACAwB,KAAKb;MACLT;MACAI;MACAE;MACAH;OAEA,sBAAA,cAACiB,OAAOG,QAAM,IAAA,GACd,sBAAA,cAACH,OAAOI,IAAE;MAACC,WAAAA;;;;;AAMvB;AAEA,IAAA,0BAAe7B;",
6
- "names": ["React", "useEffect", "useMemo", "useRef", "EdgeAiServiceClient", "ComputeGraphModel", "AiService", "DatabaseService", "QueueService", "ServiceContainer", "useConfig", "fullyQualifiedId", "getSpace", "ComputeContext", "ComputeGraphController", "ComputeShapeLayout", "computeShapes", "useComputeGraphController", "useGraphMonitor", "CanvasGraphModel", "Editor", "KeyboardContainer", "ShapeRegistry", "StackItem", "createServices", "config", "space", "ServiceContainer", "setServices", "database", "undefined", "DatabaseService", "make", "db", "queues", "QueueService", "ai", "values", "runtime", "services", "server", "AiService", "EdgeAiServiceClient", "endpoint", "useGraphController", "canvas", "useConfig", "getSpace", "controller", "useMemo", "computeGraph", "target", "model", "ComputeGraphModel", "ComputeGraphController", "useEffect", "open", "close", "CanvasContainer", "role", "id", "fullyQualifiedId", "graph", "CanvasGraphModel", "create", "layout", "graphMonitor", "useGraphMonitor", "registry", "ShapeRegistry", "computeShapes", "editorRef", "useRef", "useComputeGraphController", "ComputeShapeLayout", "ComputeContext", "Provider", "value", "StackItem", "Content", "size", "KeyboardContainer", "Editor", "Root", "ref", "Canvas", "UI", "showTools"]
7
- }