@dxos/react-ui-canvas-compute 0.8.3 → 0.8.4-main.1da679c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-canvas-compute",
-  "version": "0.8.3",
+  "version": "0.8.4-main.1da679c",
   "description": "A compute graph extension for the canvas editor component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -9,12 +9,16 @@
   "type": "module",
   "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"
     }
   },
   "types": "dist/types/src/index.d.ts",
+  "typesVersions": {
+    "*": {}
+  },
   "files": [
     "dist",
     "src"
@@ -22,64 +26,64 @@
   "dependencies": {
     "@antv/graphlib": "^2.0.4",
     "@antv/layout": "^1.2.13",
-    "@effect/platform": "0.80.12",
+    "@effect/platform": "0.90.2",
     "@preact-signals/safe-react": "^0.9.0",
     "chess.js": "^1.0.0",
-    "@dxos/ai": "0.8.3",
-    "@dxos/artifact": "0.8.3",
-    "@dxos/assistant": "0.8.3",
-    "@dxos/async": "0.8.3",
-    "@dxos/app-framework": "0.8.3",
-    "@dxos/conductor": "0.8.3",
-    "@dxos/context": "0.8.3",
-    "@dxos/debug": "0.8.3",
-    "@dxos/echo-schema": "0.8.3",
-    "@dxos/edge-client": "0.8.3",
-    "@dxos/invariant": "0.8.3",
-    "@dxos/graph": "0.8.3",
-    "@dxos/keys": "0.8.3",
-    "@dxos/live-object": "0.8.3",
-    "@dxos/log": "0.8.3",
-    "@dxos/react-client": "0.8.3",
-    "@dxos/react-ui-attention": "0.8.3",
-    "@dxos/react-edge-client": "0.8.3",
-    "@dxos/react-ui-canvas": "0.8.3",
-    "@dxos/functions": "0.8.3",
-    "@dxos/react-ui-canvas-editor": "0.8.3",
-    "@dxos/react-ui-editor": "0.8.3",
-    "@dxos/react-ui-form": "0.8.3",
-    "@dxos/react-ui-stack": "0.8.3",
-    "@dxos/react-ui-sfx": "0.8.3",
-    "@dxos/react-ui-syntax-highlighter": "0.8.3",
-    "@dxos/schema": "0.8.3",
-    "@dxos/util": "0.8.3"
+    "@dxos/ai": "0.8.4-main.1da679c",
+    "@dxos/app-framework": "0.8.4-main.1da679c",
+    "@dxos/async": "0.8.4-main.1da679c",
+    "@dxos/blueprints": "0.8.4-main.1da679c",
+    "@dxos/assistant": "0.8.4-main.1da679c",
+    "@dxos/conductor": "0.8.4-main.1da679c",
+    "@dxos/context": "0.8.4-main.1da679c",
+    "@dxos/debug": "0.8.4-main.1da679c",
+    "@dxos/echo": "0.8.4-main.1da679c",
+    "@dxos/echo-schema": "0.8.4-main.1da679c",
+    "@dxos/functions": "0.8.4-main.1da679c",
+    "@dxos/graph": "0.8.4-main.1da679c",
+    "@dxos/invariant": "0.8.4-main.1da679c",
+    "@dxos/edge-client": "0.8.4-main.1da679c",
+    "@dxos/keys": "0.8.4-main.1da679c",
+    "@dxos/log": "0.8.4-main.1da679c",
+    "@dxos/live-object": "0.8.4-main.1da679c",
+    "@dxos/react-client": "0.8.4-main.1da679c",
+    "@dxos/react-edge-client": "0.8.4-main.1da679c",
+    "@dxos/react-ui-canvas": "0.8.4-main.1da679c",
+    "@dxos/react-ui-attention": "0.8.4-main.1da679c",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.1da679c",
+    "@dxos/react-ui-editor": "0.8.4-main.1da679c",
+    "@dxos/react-ui-form": "0.8.4-main.1da679c",
+    "@dxos/react-ui-sfx": "0.8.4-main.1da679c",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.1da679c",
+    "@dxos/react-ui-stack": "0.8.4-main.1da679c",
+    "@dxos/schema": "0.8.4-main.1da679c",
+    "@dxos/util": "0.8.4-main.1da679c"
   },
   "devDependencies": {
-    "@effect/ai": "0.8.0",
-    "@effect/platform": "^0.72.1",
+    "@effect/ai": "0.25.2",
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.14.21",
+    "effect": "3.17.7",
     "lodash.defaultsdeep": "^4.6.1",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/app-framework": "0.8.3",
-    "@dxos/artifact-testing": "0.8.3",
-    "@dxos/compute": "0.8.3",
-    "@dxos/echo-signals": "0.8.3",
-    "@dxos/random": "0.8.3",
-    "@dxos/react-ui": "0.8.3",
-    "@dxos/storybook-utils": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3"
+    "vite": "7.1.1",
+    "@dxos/app-framework": "0.8.4-main.1da679c",
+    "@dxos/assistant-testing": "0.8.4-main.1da679c",
+    "@dxos/compute": "0.8.4-main.1da679c",
+    "@dxos/echo-signals": "0.8.4-main.1da679c",
+    "@dxos/random": "0.8.4-main.1da679c",
+    "@dxos/react-ui": "0.8.4-main.1da679c",
+    "@dxos/react-ui-theme": "0.8.4-main.1da679c",
+    "@dxos/storybook-utils": "0.8.4-main.1da679c"
   },
   "peerDependencies": {
-    "effect": "3.13.3",
+    "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3"
+    "@dxos/react-ui": "0.8.4-main.1da679c",
+    "@dxos/react-ui-theme": "0.8.4-main.1da679c"
   },
   "publishConfig": {
     "access": "public"

package/src/compute.stories.tsx

@@ -4,15 +4,13 @@
 
 import '@dxos-theme';
 
-import type { Meta, StoryObj } from '@storybook/react';
+import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { type PropsWithChildren, useEffect, useMemo, useRef, useState } from 'react';
 
-import { EdgeAiServiceClient } from '@dxos/ai';
-import { createTestOllamaClient } from '@dxos/ai/testing';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { capabilities, localServiceEndpoints } from '@dxos/artifact-testing';
+import { capabilities } from '@dxos/assistant-testing';
 import { type ComputeGraphModel, type ComputeNode, type GraphDiagnostic } from '@dxos/conductor';
-import { AiService, ServiceContainer } from '@dxos/functions';
+import { ServiceContainer } from '@dxos/functions';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Select, Toolbar } from '@dxos/react-ui';
 import { withAttention } from '@dxos/react-ui-attention/testing';
@@ -34,16 +32,16 @@ import { ComputeContext, useComputeGraphController, useGraphMonitor } from './ho
 import { computeShapes } from './registry';
 import { type ComputeShape } from './shapes';
 import {
+  createArtifactCircuit,
+  createAudioCircuit,
+  createBasicCircuit,
+  createComputeGraphController,
   createControlCircuit,
   createGPTRealtimeCircuit,
-  createLogicCircuit,
-  createComputeGraphController,
-  createBasicCircuit,
   createGptCircuit,
-  createAudioCircuit,
-  createTransformCircuit,
+  createLogicCircuit,
   createTemplateCircuit,
-  createArtifactCircuit,
+  createTransformCircuit,
 } from './testing';
 
 // const FormSchema = Schema.omit<any, any, ['subgraph']>('subgraph')(ComputeNode);
@@ -158,6 +156,7 @@ const DefaultStory = ({
                       </Select.Item>
                     ))}
                   </Select.Viewport>
+                  <Select.Arrow />
                 </Select.Content>
               </Select.Portal>
             </Select.Root>
@@ -177,22 +176,22 @@ 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: [
-    withClientProvider({ createIdentity: true, createSpace: true }),
     withTheme,
     withAttention,
+    withClientProvider({ createIdentity: true, createSpace: true }),
     withLayout({ fullscreen: true }),
     withPluginManager({ capabilities }),
   ],
-};
+} satisfies Meta<typeof DefaultStory>;
 
 export default meta;
 
-type Story = StoryObj<RenderProps>;
+type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
   args: {
@@ -249,16 +248,6 @@ export const Control: Story = {
   },
 };
 
-// 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,
@@ -268,7 +257,7 @@ export const Template: Story = {
     ...createComputeGraphController(
       createTemplateCircuit(),
       new ServiceContainer().setServices({
-        ai: AiService.make(new EdgeAiServiceClient({ endpoint: localServiceEndpoints.ai })),
+        // ai: AiService.make(new Edge AiServiceClient({ endpoint: localServiceEndpoints.ai })),
       }),
     ),
   },
@@ -285,7 +274,7 @@ export const GPT: Story = {
     ...createComputeGraphController(
       createGptCircuit({ history: true }),
       new ServiceContainer().setServices({
-        ai: AiService.make(new EdgeAiServiceClient({ endpoint: localServiceEndpoints.ai })),
+        // ai: AiService.make(new Edge AiServiceClient({ endpoint: localServiceEndpoints.ai })),
       }),
     ),
   },
@@ -301,7 +290,7 @@ export const Plugins: Story = {
     ...createComputeGraphController(
       createGptCircuit({ history: true, image: true, artifact: true }),
       new ServiceContainer().setServices({
-        ai: AiService.make(new EdgeAiServiceClient({ endpoint: localServiceEndpoints.ai })),
+        // ai: AiService.make(new Edge AiServiceClient({ endpoint: SERVICES_CONFIG.local.ai.server })),
       }),
     ),
   },
@@ -317,7 +306,7 @@ export const Artifact: Story = {
     ...createComputeGraphController(
       createArtifactCircuit(),
       new ServiceContainer().setServices({
-        ai: AiService.make(new EdgeAiServiceClient({ endpoint: localServiceEndpoints.ai })),
+        // ai: AiService.make(new Edge AiServiceClient({ endpoint: SERVICES_CONFIG.local.ai.server })),
       }),
     ),
   },
@@ -334,7 +323,7 @@ export const ImageGen: Story = {
     ...createComputeGraphController(
       createGptCircuit({ image: true, artifact: true }),
       new ServiceContainer().setServices({
-        ai: AiService.make(createTestOllamaClient()),
+        // ai: AiService.make(createTestAiServiceClient()),
       }),
     ),
   },
@@ -350,7 +339,7 @@ export const Audio: Story = {
     ...createComputeGraphController(
       createAudioCircuit(),
       new ServiceContainer().setServices({
-        ai: AiService.make(createTestOllamaClient()),
+        // ai: AiService.make(createTestAiServiceClient()),
       }),
     ),
   },
@@ -365,7 +354,7 @@ export const Voice: Story = {
     ...createComputeGraphController(
       createGPTRealtimeCircuit(),
       new ServiceContainer().setServices({
-        ai: AiService.make(createTestOllamaClient()),
+        // ai: AiService.make(createTestAiServiceClient()),
       }),
     ),
   },

package/src/graph/controller.ts

@@ -4,31 +4,31 @@
 
 import { type Context, Effect, Either, Exit, Scope } from 'effect';
 
-import { type ImageContentBlock } from '@dxos/ai';
 import { Event, synchronized } from '@dxos/async';
 import {
   type ComputeEdge,
-  type ComputeEvent,
   type ComputeGraphModel,
   type ComputeMeta,
   type ComputeNode,
-  type EventLogger,
   type GptInput,
   type GptOutput,
   type GraphDiagnostic,
   GraphExecutor,
-  isNotExecuted,
   ValueBag,
+  isNotExecuted,
 } from '@dxos/conductor';
 import { Resource } from '@dxos/context';
-import type { ServiceContainer } from '@dxos/functions';
+import { type ComputeEventLogger, type ComputeEventPayload } from '@dxos/functions';
+import { type ServiceContainer } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { type CanvasGraphModel } from '@dxos/react-ui-canvas-editor';
+import { type ContentBlock } from '@dxos/schema';
 
-import { resolveComputeNode } from './node-defs';
 import { createComputeGraph } from '../hooks';
 import { type ComputeShape } from '../shapes';
 
+import { resolveComputeNode } from './node-defs';
+
 // TODO(burdon): API package for conductor.
 export const InvalidStateError = Error;
 
@@ -43,7 +43,7 @@ export interface GptExecutor {
   invoke: FunctionCallback<GptInput, GptOutput>;
 
   // TODO(dmaretskyi): A hack to get image artifacts working. Rework into querying images from the ai-service store.
-  imageCache: Map<string, ImageContentBlock>;
+  imageCache: Map<string, ContentBlock.Image>;
 }
 
 export type RuntimeValue =
@@ -110,7 +110,7 @@ export class ComputeGraphController extends Resource {
   /** Computed result. */
   public readonly output = new Event<ComputeOutputEvent>();
 
-  public readonly events = new Event<ComputeEvent>();
+  public readonly events = new Event<ComputeEventPayload>();
 
   constructor(
     private readonly _serviceContainer: ServiceContainer,
@@ -322,7 +322,7 @@ export class ComputeGraphController extends Resource {
     this.update.emit();
   }
 
-  private _createLogger(): Context.Tag.Service<EventLogger> {
+  private _createLogger(): Context.Tag.Service<ComputeEventLogger> {
     return {
       log: (event) => {
         this._handleEvent(event);
@@ -331,7 +331,7 @@ export class ComputeGraphController extends Resource {
     };
   }
 
-  private _handleEvent(event: ComputeEvent): void {
+  private _handleEvent(event: ComputeEventPayload): void {
     log('handleEvent', { event });
     switch (event.type) {
       case 'compute-input': {

package/src/graph/node-defs.ts

@@ -3,13 +3,13 @@
 //
 
 import {
-  NODE_INPUT,
-  NODE_OUTPUT,
   type ComputeNode,
   type Executable,
+  NODE_INPUT,
+  NODE_OUTPUT,
   type NodeType,
-  registry,
   getTemplateInputSchema,
+  registry,
 } from '@dxos/conductor';
 import { raise } from '@dxos/debug';
 import { ObjectId, toJsonSchema } from '@dxos/echo-schema';
@@ -49,6 +49,7 @@ const nodeFactory: Record<NodeType | 'trigger', (shape: ComputeShape) => Compute
     createNode('constant', {
       value: (shape as ConstantShape).value,
     }),
+  ['make-queue' as const]: () => createNode('make-queue'),
   ['database' as const]: () => createNode('database'),
   ['gpt' as const]: () => createNode('gpt'),
   ['gpt-realtime' as const]: () => createNode('gpt-realtime'),

package/src/hooks/useComputeGraphController.ts

@@ -5,7 +5,7 @@
 import { type RefObject, useEffect, useState } from 'react';
 
 import { type CleanupFn } from '@dxos/async';
-import { type EditorRootProps, type EditorController } from '@dxos/react-ui-canvas-editor';
+import { type EditorController, type EditorRootProps } from '@dxos/react-ui-canvas-editor';
 
 import { type ComputeGraphController } from '../graph';
 import { type ComputeShape } from '../shapes';

package/src/hooks/useComputeNodeState.ts

@@ -5,13 +5,15 @@
 import { Schema } from 'effect';
 import { useCallback, useEffect, useState } from 'react';
 
-import type { ComputeNode, ComputeMeta, ComputeEvent } from '@dxos/conductor';
+import type { ComputeMeta, ComputeNode } from '@dxos/conductor';
+import type { ComputeEventPayload } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 
-import { useComputeContext } from './compute-context';
 import { type RuntimeValue } from '../graph';
 import { type ComputeShape } from '../shapes';
 
+import { useComputeContext } from './compute-context';
+
 export type ComputeNodeState = {
   node: ComputeNode;
   meta: ComputeMeta;
@@ -20,7 +22,7 @@ export type ComputeNodeState = {
     outputs: Record<string, RuntimeValue>;
     setOutput: (property: string, value: any) => void;
     evalNode: () => void;
-    subscribeToEventLog: (cb: (event: ComputeEvent) => void) => void;
+    subscribeToEventLog: (cb: (event: ComputeEventPayload) => void) => void;
   };
 };
 
@@ -54,7 +56,7 @@ export const useComputeNodeState = (shape: ComputeShape): ComputeNodeState => {
   }, [shape.node]);
 
   const subscribeToEventLog = useCallback(
-    (cb: (event: ComputeEvent) => void) => {
+    (cb: (event: ComputeEventPayload) => void) => {
       return controller.events.on((ev) => {
         if (ev.nodeId === shape.node) {
           cb(ev);

package/src/hooks/useGraphMonitor.ts

@@ -8,7 +8,7 @@ import { type ComputeEdge, ComputeGraphModel, type ComputeNode, DEFAULT_INPUT, D
 import { ObjectId, Ref } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { getSpace } from '@dxos/react-client/echo';
-import { type GraphMonitor, type CanvasGraphModel, type Connection } from '@dxos/react-ui-canvas-editor';
+import { type CanvasGraphModel, type Connection, type GraphMonitor } from '@dxos/react-ui-canvas-editor';
 import { isNonNullable } from '@dxos/util';
 
 import { createComputeNode, isValidComputeNode } from '../graph';

package/src/registry.ts

@@ -29,10 +29,10 @@ import {
   surfaceShape,
   switchShape,
   templateShape,
-  threadShape,
+  textShape,
   textToImageShape,
+  threadShape,
   triggerShape,
-  textShape,
 } from './shapes';
 
 /**

package/src/schema.test.ts

@@ -9,15 +9,15 @@ import { live } from '@dxos/client/echo';
 import { BaseGraphNode, Graph } from '@dxos/graph';
 import {
   Polygon,
+  Shape,
   createEllipse,
   createPath,
   createRectangle,
   isPath,
   isPolygon,
-  Shape,
 } from '@dxos/react-ui-canvas-editor';
 
-import { createSwitch, ComputeShape, createFunction } from './shapes';
+import { ComputeShape, createFunction, createSwitch } from './shapes';
 
 describe('compute', () => {
   test('model', ({ expect }) => {

package/src/shapes/Append.tsx

@@ -8,8 +8,8 @@ import React from 'react';
 import { AppendInput } from '@dxos/conductor';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
-import { createFunctionAnchors, FunctionBody, getHeight } from './common';
-import { ComputeShape, createShape, type CreateShapeProps } from './defs';
+import { FunctionBody, createFunctionAnchors, getHeight } from './common';
+import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
 export const AppendShape = Schema.extend(
   ComputeShape,

package/src/shapes/Array.tsx

@@ -8,8 +8,8 @@ import React from 'react';
 import { ReducerInput, ReducerOutput } from '@dxos/conductor';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
-import { createFunctionAnchors, FunctionBody, getHeight } from './common';
-import { ComputeShape, createShape, type CreateShapeProps } from './defs';
+import { FunctionBody, createFunctionAnchors, getHeight } from './common';
+import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
 //
 // Data

package/src/shapes/Audio.tsx

@@ -6,11 +6,12 @@ import { Schema } from 'effect';
 import React, { useEffect, useState } from 'react';
 
 import { Icon } from '@dxos/react-ui';
-import { createAnchorMap, type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
+import { type ShapeComponentProps, type ShapeDef, createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
-import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
+import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
+
 export const AudioShape = Schema.extend(
   ComputeShape,
   Schema.Struct({

package/src/shapes/Beacon.tsx

@@ -7,12 +7,12 @@ import React from 'react';
 
 import { DEFAULT_INPUT, isTruthy } from '@dxos/conductor';
 import { Icon } from '@dxos/react-ui';
-import { createAnchorMap, type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
-import { mx } from '@dxos/react-ui-theme';
+import { type ShapeComponentProps, type ShapeDef, createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
-import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
+import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
+
 export const BeaconShape = Schema.extend(
   ComputeShape,
   Schema.Struct({
@@ -36,7 +36,7 @@ export const BeaconComponent = ({ shape }: ShapeComponentProps<BeaconShape>) =>
     <div className='flex w-full justify-center items-center'>
       <Icon
         icon='ph--sun--regular'
-        classNames={mx('transition opacity-20 duration-1000', isTruthy(value) && 'opacity-100 text-yellow-500')}
+        classNames={['transition opacity-20 duration-1000', isTruthy(value) && 'opacity-100 text-yellow-500']}
         size={8}
       />
     </div>

package/src/shapes/Boolean.tsx

@@ -5,10 +5,10 @@
 import { Schema } from 'effect';
 import React, { type FC } from 'react';
 
-import { getAnchorPoints, type ShapeDef } from '@dxos/react-ui-canvas-editor';
+import { type ShapeDef, getAnchorPoints } from '@dxos/react-ui-canvas-editor';
 import { createAnchors } from '@dxos/react-ui-canvas-editor';
 
-import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
+import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
 //
 // Gate utils.

package/src/shapes/Chat.tsx

@@ -15,10 +15,11 @@ import {
 } from '@dxos/react-ui-canvas-editor';
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
-import { Box } from './common';
-import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
+import { Box } from './common';
+import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
+
 //
 // Data
 //

package/src/shapes/Constant.tsx

@@ -17,10 +17,11 @@ import {
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 import { safeParseJson } from '@dxos/util';
 
-import { Box, TypeSelect } from './common';
-import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
+import { Box, TypeSelect } from './common';
+import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
+
 //
 // Data
 //

package/src/shapes/Database.tsx

@@ -9,7 +9,7 @@ import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-e
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
 import { Box } from './common';
-import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
+import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
 export const DatabaseShape = Schema.extend(
   ComputeShape,

package/src/shapes/Function.tsx

@@ -6,22 +6,23 @@ import { Schema } from 'effect';
 import React, { useCallback, useRef } from 'react';
 
 import { AnyOutput, FunctionInput } from '@dxos/conductor';
-import { getSnapshot, isInstanceOf, Ref } from '@dxos/echo-schema';
+import { Ref, getSnapshot, isInstanceOf } from '@dxos/echo-schema';
 import { FunctionType, ScriptType } from '@dxos/functions';
 import { useClient } from '@dxos/react-client';
-import { Filter, makeRef, parseId } from '@dxos/react-client/echo';
+import { Filter, parseId } from '@dxos/react-client/echo';
 import {
+  type ShapeComponentProps,
+  type ShapeDef,
   TextBox,
   type TextBoxControl,
   type TextBoxProps,
-  type ShapeComponentProps,
-  type ShapeDef,
 } from '@dxos/react-ui-canvas-editor';
 
-import { Box, createFunctionAnchors } from './common';
-import { ComputeShape, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
+import { Box, createFunctionAnchors } from './common';
+import { ComputeShape, type CreateShapeProps, createShape } from './defs';
+
 export const FunctionShape = Schema.extend(
   ComputeShape,
   Schema.Struct({
@@ -69,7 +70,7 @@ const TextInputComponent = ({ shape, title, ...props }: TextInputComponentProps)
       }
 
       node.value = value;
-      node.function = makeRef(fn);
+      node.function = Ref.make(fn);
       node.inputSchema = getSnapshot(fn.inputSchema);
       node.outputSchema = getSnapshot(fn.outputSchema);
     },