@dxos/react-ui-canvas-compute 0.8.4-main.f9ba587 → 0.8.4-main.fcfe5033a5

package/package.json

@@ -1,17 +1,22 @@
 {
   "name": "@dxos/react-ui-canvas-compute",
-  "version": "0.8.4-main.f9ba587",
+  "version": "0.8.4-main.fcfe5033a5",
   "description": "A compute graph extension for the canvas editor component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "type": "module",
   "exports": {
     ".": {
-      "types": "./dist/types/src/index.d.ts",
+      "source": "./src/index.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"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -25,63 +30,67 @@
   "dependencies": {
     "@antv/graphlib": "^2.0.4",
     "@antv/layout": "^1.2.13",
-    "@effect/platform": "0.88.0",
-    "@preact-signals/safe-react": "^0.9.0",
+    "@effect/platform": "0.94.4",
     "chess.js": "^1.0.0",
-    "@dxos/ai": "0.8.4-main.f9ba587",
-    "@dxos/app-framework": "0.8.4-main.f9ba587",
-    "@dxos/assistant": "0.8.4-main.f9ba587",
-    "@dxos/artifact": "0.8.4-main.f9ba587",
-    "@dxos/async": "0.8.4-main.f9ba587",
-    "@dxos/conductor": "0.8.4-main.f9ba587",
-    "@dxos/context": "0.8.4-main.f9ba587",
-    "@dxos/debug": "0.8.4-main.f9ba587",
-    "@dxos/edge-client": "0.8.4-main.f9ba587",
-    "@dxos/functions": "0.8.4-main.f9ba587",
-    "@dxos/echo-schema": "0.8.4-main.f9ba587",
-    "@dxos/graph": "0.8.4-main.f9ba587",
-    "@dxos/invariant": "0.8.4-main.f9ba587",
-    "@dxos/keys": "0.8.4-main.f9ba587",
-    "@dxos/log": "0.8.4-main.f9ba587",
-    "@dxos/live-object": "0.8.4-main.f9ba587",
-    "@dxos/react-client": "0.8.4-main.f9ba587",
-    "@dxos/react-edge-client": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-attention": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-canvas": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-editor": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-form": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-sfx": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-stack": "0.8.4-main.f9ba587",
-    "@dxos/schema": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.f9ba587",
-    "@dxos/util": "0.8.4-main.f9ba587"
+    "@dxos/ai": "0.8.4-main.fcfe5033a5",
+    "@dxos/app-framework": "0.8.4-main.fcfe5033a5",
+    "@dxos/assistant": "0.8.4-main.fcfe5033a5",
+    "@dxos/async": "0.8.4-main.fcfe5033a5",
+    "@dxos/context": "0.8.4-main.fcfe5033a5",
+    "@dxos/debug": "0.8.4-main.fcfe5033a5",
+    "@dxos/blueprints": "0.8.4-main.fcfe5033a5",
+    "@dxos/conductor": "0.8.4-main.fcfe5033a5",
+    "@dxos/edge-client": "0.8.4-main.fcfe5033a5",
+    "@dxos/echo": "0.8.4-main.fcfe5033a5",
+    "@dxos/effect": "0.8.4-main.fcfe5033a5",
+    "@dxos/app-toolkit": "0.8.4-main.fcfe5033a5",
+    "@dxos/functions-runtime": "0.8.4-main.fcfe5033a5",
+    "@dxos/graph": "0.8.4-main.fcfe5033a5",
+    "@dxos/functions": "0.8.4-main.fcfe5033a5",
+    "@dxos/keys": "0.8.4-main.fcfe5033a5",
+    "@dxos/operation": "0.8.4-main.fcfe5033a5",
+    "@dxos/invariant": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-client": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-edge-client": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-attention": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-canvas": "0.8.4-main.fcfe5033a5",
+    "@dxos/log": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-sfx": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-mosaic": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-editor": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-form": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-stack": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.fcfe5033a5",
+    "@dxos/schema": "0.8.4-main.fcfe5033a5",
+    "@dxos/types": "0.8.4-main.fcfe5033a5",
+    "@dxos/util": "0.8.4-main.fcfe5033a5"
   },
   "devDependencies": {
-    "@effect/ai": "0.22.0",
+    "@effect/ai": "0.33.2",
+    "@effect/experimental": "0.58.0",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.16.13",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.20.0",
     "lodash.defaultsdeep": "^4.6.1",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/app-framework": "0.8.4-main.f9ba587",
-    "@dxos/artifact-testing": "0.8.4-main.f9ba587",
-    "@dxos/compute": "0.8.4-main.f9ba587",
-    "@dxos/echo-signals": "0.8.4-main.f9ba587",
-    "@dxos/random": "0.8.4-main.f9ba587",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587",
-    "@dxos/storybook-utils": "0.8.4-main.f9ba587"
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/app-framework": "0.8.4-main.fcfe5033a5",
+    "@dxos/assistant-toolkit": "0.8.4-main.fcfe5033a5",
+    "@dxos/compute": "0.8.4-main.fcfe5033a5",
+    "@dxos/random": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui": "0.8.4-main.fcfe5033a5",
+    "@dxos/ui-theme": "0.8.4-main.fcfe5033a5",
+    "@dxos/storybook-utils": "0.8.4-main.fcfe5033a5"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587"
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/ui-theme": "0.8.4-main.fcfe5033a5",
+    "@dxos/react-ui": "0.8.4-main.fcfe5033a5"
   },
   "publishConfig": {
     "access": "public"

package/src/README.md

@@ -42,6 +42,3 @@
       - logs associated with a node or a graph
       - node state updates (can a node have internal state separate from inputs/outputs)
       - timestep? - to correlate events that happen during a single execution time
-
-
-

package/src/compute-layout.ts

@@ -3,7 +3,7 @@
 //
 
 import { DefaultInput, DefaultOutput } from '@dxos/conductor';
-import { toEffectSchema } from '@dxos/echo-schema';
+import { toEffectSchema } from '@dxos/echo/internal';
 import { type Anchor, ShapeLayout, type ShapeRegistry } from '@dxos/react-ui-canvas-editor';
 
 import { type ComputeGraphController } from './graph';

package/src/compute.stories.tsx

@@ -2,54 +2,54 @@
 // Copyright 2024 DXOS.org
 //
 
-import '@dxos-theme';
-
-import type { Meta, StoryObj } from '@storybook/react-vite';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+import * as ManagedRuntime from 'effect/ManagedRuntime';
 import React, { type PropsWithChildren, useEffect, useMemo, useRef, useState } from 'react';
 
-import { EdgeAiServiceClient } from '@dxos/ai';
-import { createTestAiServiceClient } from '@dxos/ai/testing';
+import { AiServiceTestingPreset } from '@dxos/ai/testing';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { capabilities, localServiceEndpoints } from '@dxos/artifact-testing';
+import { capabilities } from '@dxos/assistant-toolkit/testing';
 import { type ComputeGraphModel, type ComputeNode, type GraphDiagnostic } from '@dxos/conductor';
-import { AiService, ServiceContainer } from '@dxos/functions';
+import { Feed } from '@dxos/echo';
+import { CredentialsService } from '@dxos/functions';
+import { TestDatabaseLayer } from '@dxos/functions-runtime/testing';
+import { Operation, OperationRegistry } from '@dxos/operation';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Select, Toolbar } from '@dxos/react-ui';
 import { withAttention } from '@dxos/react-ui-attention/testing';
-import {
-  CanvasGraphModel,
-  Editor,
-  type EditorController,
-  type EditorRootProps,
-  ShapeRegistry,
-} from '@dxos/react-ui-canvas-editor';
+import { Editor, type EditorController, type EditorRootProps, ShapeRegistry } from '@dxos/react-ui-canvas-editor';
 import { Container, useSelection } from '@dxos/react-ui-canvas-editor/testing';
-import { JsonFilter } from '@dxos/react-ui-syntax-highlighter';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
+import { Form } from '@dxos/react-ui-form';
+import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { DiagnosticOverlay } from './components';
 import { ComputeShapeLayout } from './compute-layout';
-import { type ComputeGraphController } from './graph';
+import { type ComputeGraphController, createComputeGraphController } from './graph';
 import { ComputeContext, useComputeGraphController, useGraphMonitor } from './hooks';
 import { computeShapes } from './registry';
 import { type ComputeShape } from './shapes';
 import {
+  createArtifactCircuit,
+  createAudioCircuit,
+  createBasicCircuit,
   createControlCircuit,
+  createEmptyCircuit,
   createGPTRealtimeCircuit,
-  createLogicCircuit,
-  createComputeGraphController,
-  createBasicCircuit,
   createGptCircuit,
-  createAudioCircuit,
-  createTransformCircuit,
+  createLogicCircuit,
   createTemplateCircuit,
-  createArtifactCircuit,
+  createTransformCircuit,
 } from './testing';
 
-// const FormSchema = Schema.omit<any, any, ['subgraph']>('subgraph')(ComputeNode);
+// TODO(burdon): Replace ServiceContainer.
 
 const sidebarTypes: NonNullable<RenderProps['sidebar']>[] = ['canvas', 'compute', 'controller', 'selected'] as const;
 
+const hiddenArg = { table: { disable: true } };
+
 type RenderProps = EditorRootProps<ComputeShape> &
   PropsWithChildren<{
     init?: boolean;
@@ -63,9 +63,10 @@ const DefaultStory = ({
   children,
   graph,
   controller = null,
-  init,
-  sidebar: _sidebar,
+  sidebar: sidebarProp,
   registry,
+  showGrid = true,
+  snapToGrid = true,
   ...props
 }: RenderProps) => {
   const editorRef = useRef<EditorController>(null);
@@ -83,7 +84,7 @@ const DefaultStory = ({
   };
 
   // Sidebar.
-  const [sidebar, setSidebar] = useState(_sidebar);
+  const [sidebar, setSidebar] = useState<RenderProps['sidebar']>(sidebarProp);
   const json = useMemo(() => {
     switch (sidebar) {
       case 'canvas':
@@ -123,7 +124,7 @@ const DefaultStory = ({
   }
 
   return (
-    <div className='grid grid-cols-[1fr,360px] w-full h-full'>
+    <div className='grid grid-cols-[1fr_360px] h-full w-full'>
       <ComputeContext.Provider value={{ controller }}>
         <Container id={id} classNames={['flex grow overflow-hidden', !sidebar && 'col-span-2']}>
           <Editor.Root<ComputeShape>
@@ -135,6 +136,8 @@ const DefaultStory = ({
             registry={registry}
             selection={selection}
             autoZoom
+            showGrid={showGrid}
+            snapToGrid={snapToGrid}
             {...props}
           >
             <Editor.Canvas>{children}</Editor.Canvas>
@@ -146,9 +149,9 @@ const DefaultStory = ({
 
       {sidebar && (
         <Container id='sidebar' classNames='flex flex-col h-full overflow-hidden'>
-          <Toolbar.Root classNames='p-1'>
+          <Toolbar.Root>
             <Select.Root value={sidebar} onValueChange={(value) => setSidebar(value as RenderProps['sidebar'])}>
-              <Select.TriggerButton classNames='is-full'>{sidebar}</Select.TriggerButton>
+              <Select.TriggerButton classNames='w-full'>{sidebar}</Select.TriggerButton>
               <Select.Portal>
                 <Select.Content>
                   <Select.Viewport>
@@ -158,18 +161,30 @@ const DefaultStory = ({
                       </Select.Item>
                     ))}
                   </Select.Viewport>
+                  <Select.Arrow />
                 </Select.Content>
               </Select.Portal>
             </Select.Root>
           </Toolbar.Root>
 
           <div className='flex flex-col h-full overflow-hidden divide-y divider-separator'>
+            {/* TODO(burdon): Provide schema. */}
             {sidebar === 'selected' && selected && (
-              <div>Form</div>
-              // <Form<ComputeNode> schema={FormSchema} values={getComputeNode(selected.id) ?? {}} Custom={{}} />
+              <Form.Root<ComputeNode> values={getComputeNode(selected.id) ?? {}}>
+                <Form.Viewport>
+                  <Form.Content>
+                    <Form.FieldSet />
+                    <Form.Actions />
+                  </Form.Content>
+                </Form.Viewport>
+              </Form.Root>
             )}
-
-            <JsonFilter data={json} />
+            <Json.Root data={json}>
+              <Json.Content>
+                <Json.Filter />
+                <Json.Data />
+              </Json.Content>
+            </Json.Root>
           </div>
         </Container>
       )}
@@ -177,196 +192,143 @@ const DefaultStory = ({
   );
 };
 
-const meta: Meta<RenderProps> = {
+const meta = {
   title: 'ui/react-ui-canvas-compute/compute',
-  component: Editor.Root,
+  component: Editor.Root as any,
   render: DefaultStory,
   decorators: [
-    withTheme,
-    withAttention,
+    withTheme(),
+    withLayout({ layout: 'fullscreen' }),
+    withAttention(),
     withClientProvider({ createIdentity: true, createSpace: true }),
-    withLayout({ fullscreen: true }),
     withPluginManager({ capabilities }),
   ],
-};
+  parameters: {
+    layout: 'fullscreen',
+  },
+  argTypes: {
+    controller: hiddenArg,
+    graph: hiddenArg,
+    registry: hiddenArg,
+    sidebar: {
+      control: 'select',
+      options: [...sidebarTypes, null],
+    },
+  },
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
-type Story = StoryObj<RenderProps>;
+type Story = StoryObj<typeof meta>;
+
+const ServiceLayer = Layer.empty.pipe(
+  Layer.provideMerge(
+    Layer.mergeAll(
+      Layer.succeed(Operation.Service, {
+        invoke: () => Effect.die('Operation.Service not available in test.'),
+        schedule: () => Effect.die('Operation.Service not available in test.'),
+        invokePromise: async () => ({ error: new Error('Not available') }),
+      } as any),
+      Layer.succeed(OperationRegistry.Service, { resolve: () => Effect.succeed(undefined) } as any),
+    ),
+  ),
+  Layer.provideMerge(
+    Layer.mergeAll(
+      AiServiceTestingPreset('direct'),
+      TestDatabaseLayer(),
+      CredentialsService.configuredLayer([]),
+      Feed.notAvailable,
+    ),
+  ),
+  Layer.orDie,
+);
 
 export const Default: Story = {
   args: {
-    // debug: true,
-    showGrid: false,
-    snapToGrid: false,
-    sidebar: 'selected',
     registry: new ShapeRegistry(computeShapes),
-    ...createComputeGraphController(CanvasGraphModel.create<ComputeShape>(), new ServiceContainer()),
+    ...createComputeGraphController(createEmptyCircuit(), ManagedRuntime.make(ServiceLayer)),
   },
 };
 
 export const Beacon: Story = {
   args: {
-    // debug: true,
-    showGrid: false,
-    snapToGrid: false,
-    sidebar: 'selected',
     registry: new ShapeRegistry(computeShapes),
-    ...createComputeGraphController(createBasicCircuit(), new ServiceContainer()),
+    ...createComputeGraphController(createBasicCircuit(), ManagedRuntime.make(ServiceLayer)),
   },
 };
 
 export const Transform: Story = {
   args: {
-    // debug: true,
-    showGrid: false,
-    snapToGrid: false,
-    sidebar: 'selected',
     registry: new ShapeRegistry(computeShapes),
-    ...createComputeGraphController(createTransformCircuit(), new ServiceContainer()),
+    ...createComputeGraphController(createTransformCircuit(), ManagedRuntime.make(ServiceLayer)),
   },
 };
 
 export const Logic: Story = {
   args: {
-    // debug: true,
-    showGrid: false,
-    snapToGrid: false,
-    sidebar: 'compute',
     registry: new ShapeRegistry(computeShapes),
-    ...createComputeGraphController(createLogicCircuit(), new ServiceContainer()),
+    ...createComputeGraphController(createLogicCircuit(), ManagedRuntime.make(ServiceLayer)),
   },
 };
 
 export const Control: Story = {
   args: {
-    // debug: true,
-    showGrid: false,
-    snapToGrid: false,
-    sidebar: 'compute',
     registry: new ShapeRegistry(computeShapes),
-    ...createComputeGraphController(createControlCircuit(), new ServiceContainer()),
+    ...createComputeGraphController(createControlCircuit(), ManagedRuntime.make(ServiceLayer)),
   },
 };
 
-// export const Ollama: Story = {
-//   args: {
-//     // debug: true,
-//     showGrid: false,
-//     snapToGrid: false,
-//     registry: new ShapeRegistry(computeShapes),
-//     ...createComputeGraphController(createTest3(), createEdgeServices()),
-//   },
-// };
-
 export const Template: Story = {
   args: {
-    showGrid: false,
-    snapToGrid: false,
-    // sidebar: 'controller',
     registry: new ShapeRegistry(computeShapes),
-    ...createComputeGraphController(
-      createTemplateCircuit(),
-      new ServiceContainer().setServices({
-        ai: AiService.make(new EdgeAiServiceClient({ endpoint: localServiceEndpoints.ai })),
-      }),
-    ),
+    ...createComputeGraphController(createTemplateCircuit(), ManagedRuntime.make(ServiceLayer)),
   },
 };
 
 export const GPT: Story = {
   args: {
-    // debug: true,
-    showGrid: false,
-    snapToGrid: false,
-    // sidebar: 'json',
-    sidebar: 'controller',
     registry: new ShapeRegistry(computeShapes),
-    ...createComputeGraphController(
-      createGptCircuit({ history: true }),
-      new ServiceContainer().setServices({
-        ai: AiService.make(new EdgeAiServiceClient({ endpoint: localServiceEndpoints.ai })),
-      }),
-    ),
+    ...createComputeGraphController(createGptCircuit({ history: true }), ManagedRuntime.make(ServiceLayer)),
   },
 };
 
 export const Plugins: Story = {
   args: {
-    // debug: true,
-    showGrid: false,
-    snapToGrid: false,
-    // sidebar: 'json',
     registry: new ShapeRegistry(computeShapes),
     ...createComputeGraphController(
       createGptCircuit({ history: true, image: true, artifact: true }),
-      new ServiceContainer().setServices({
-        ai: AiService.make(new EdgeAiServiceClient({ endpoint: localServiceEndpoints.ai })),
-      }),
+      ManagedRuntime.make(ServiceLayer),
     ),
   },
 };
 
 export const Artifact: Story = {
   args: {
-    // debug: true,
-    showGrid: false,
-    snapToGrid: false,
-    // sidebar: 'json',
     registry: new ShapeRegistry(computeShapes),
-    ...createComputeGraphController(
-      createArtifactCircuit(),
-      new ServiceContainer().setServices({
-        ai: AiService.make(new EdgeAiServiceClient({ endpoint: localServiceEndpoints.ai })),
-      }),
-    ),
+    ...createComputeGraphController(createArtifactCircuit(), ManagedRuntime.make(ServiceLayer)),
   },
 };
 
 export const ImageGen: Story = {
   args: {
-    // debug: true,
-    showGrid: false,
-    snapToGrid: false,
-    // sidebar: 'json',
-    sidebar: 'controller',
     registry: new ShapeRegistry(computeShapes),
     ...createComputeGraphController(
       createGptCircuit({ image: true, artifact: true }),
-      new ServiceContainer().setServices({
-        ai: AiService.make(createTestAiServiceClient()),
-      }),
+      ManagedRuntime.make(ServiceLayer),
     ),
   },
 };
 
 export const Audio: Story = {
   args: {
-    // debug: true,
-    showGrid: false,
-    snapToGrid: false,
-    sidebar: 'controller',
     registry: new ShapeRegistry(computeShapes),
-    ...createComputeGraphController(
-      createAudioCircuit(),
-      new ServiceContainer().setServices({
-        ai: AiService.make(createTestAiServiceClient()),
-      }),
-    ),
+    ...createComputeGraphController(createAudioCircuit(), ManagedRuntime.make(ServiceLayer)),
   },
 };
 
 export const Voice: Story = {
   args: {
-    showGrid: false,
-    snapToGrid: false,
-    sidebar: 'controller',
     registry: new ShapeRegistry(computeShapes),
-    ...createComputeGraphController(
-      createGPTRealtimeCircuit(),
-      new ServiceContainer().setServices({
-        ai: AiService.make(createTestAiServiceClient()),
-      }),
-    ),
+    ...createComputeGraphController(createGPTRealtimeCircuit(), ManagedRuntime.make(ServiceLayer)),
   },
 };