@dxos/react-ui-canvas-compute 0.8.4-main.ae835ea → 0.8.4-main.bc2380dfbc

package/src/shapes/{Queue.tsx → Feed.tsx}

@@ -6,31 +6,34 @@ import * as Schema from 'effect/Schema';
 import React, { Fragment } from 'react';
 
 import { DEFAULT_OUTPUT, QueueInput, QueueOutput } from '@dxos/conductor';
-import { type ThemedClassName } from '@dxos/react-ui';
+import { ScrollArea, type ThemedClassName } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
-import { mx } from '@dxos/react-ui-theme';
+import { mx } from '@dxos/ui-theme';
 
 import { useComputeNodeState } from '../hooks';
-
 import { createFunctionAnchors } from './common';
 import { Box, type BoxActionHandler } from './common';
 import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
-export const QueueShape = Schema.extend(
+export const FeedShape = Schema.extend(
   ComputeShape,
   Schema.Struct({
     type: Schema.Literal('queue'),
   }),
 );
 
-export type QueueShape = Schema.Schema.Type<typeof QueueShape>;
+export type FeedShape = Schema.Schema.Type<typeof FeedShape>;
 
-export type CreateQueueProps = CreateShapeProps<QueueShape>;
+export type CreateFeedProps = CreateShapeProps<FeedShape>;
 
-export const createQueue = (props: CreateQueueProps) =>
-  createShape<QueueShape>({ type: 'queue', size: { width: 256, height: 512 }, ...props });
+export const createFeed = (props: CreateFeedProps) =>
+  createShape<FeedShape>({
+    type: 'queue',
+    size: { width: 256, height: 512 },
+    ...props,
+  });
 
-export const QueueComponent = ({ shape }: ShapeComponentProps<QueueShape>) => {
+export const FeedComponent = ({ shape }: ShapeComponentProps<FeedShape>) => {
   const { runtime } = useComputeNodeState(shape);
   const items = runtime.outputs[DEFAULT_OUTPUT]?.type === 'executed' ? runtime.outputs[DEFAULT_OUTPUT].value : [];
 
@@ -42,22 +45,24 @@ export const QueueComponent = ({ shape }: ShapeComponentProps<QueueShape>) => {
 
   return (
     <Box shape={shape} status={`${items.length} items`} onAction={handleAction}>
-      <div className='flex flex-col w-full overflow-y-scroll divide-y divide-separator'>
-        {[...items].map((item, i) => (
-          <QueueItem key={i} classNames='p-1 px-2' item={item} />
-        ))}
-      </div>
+      <ScrollArea.Root orientation='vertical'>
+        <ScrollArea.Viewport classNames='divide-y divide-separator'>
+          {[...items].map((item, i) => (
+            <FeedItem key={i} classNames='p-1 px-2' item={item} />
+          ))}
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
     </Box>
   );
 };
 
-export const QueueItem = ({ classNames, item }: ThemedClassName<{ item: any }>) => {
+export const FeedItem = ({ classNames, item }: ThemedClassName<{ item: any }>) => {
   if (typeof item !== 'object') {
     return <div className={mx(classNames, 'whitespace-pre-wrap')}>{item}</div>;
   }
 
   return (
-    <div className={mx('grid grid-cols-[80px,1fr]', classNames)}>
+    <div className={mx('grid grid-cols-[80px_1fr]', classNames)}>
       {Object.entries(item).map(([key, value]) => (
         <Fragment key={key}>
           <div className='p-1 text-xs text-subdued'>{key}</div>
@@ -68,12 +73,12 @@ export const QueueItem = ({ classNames, item }: ThemedClassName<{ item: any }>)
   );
 };
 
-export const queueShape: ShapeDef<QueueShape> = {
-  type: 'queue',
-  name: 'Queue',
+export const feedShape: ShapeDef<FeedShape> = {
+  type: 'feed',
+  name: 'Feed',
   icon: 'ph--queue--regular',
-  component: QueueComponent,
-  createShape: createQueue,
+  component: FeedComponent,
+  createShape: createFeed,
   getAnchors: (shape) => createFunctionAnchors(shape, QueueInput, QueueOutput),
   resizable: true,
 };

package/src/shapes/Function.tsx

@@ -5,11 +5,13 @@
 import * as Schema from 'effect/Schema';
 import React, { useCallback, useRef } from 'react';
 
+import { Script } from '@dxos/compute';
+import { Operation } from '@dxos/compute';
 import { AnyOutput, FunctionInput } from '@dxos/conductor';
+import { Filter } from '@dxos/echo';
 import { Ref, getSnapshot, isInstanceOf } from '@dxos/echo/internal';
-import { Function, Script } from '@dxos/functions';
+import { parseId } from '@dxos/keys';
 import { useClient } from '@dxos/react-client';
-import { Filter, parseId } from '@dxos/react-client/echo';
 import {
   type ShapeComponentProps,
   type ShapeDef,
@@ -19,7 +21,6 @@ import {
 } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { Box, createFunctionAnchors } from './common';
 import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
@@ -35,7 +36,11 @@ export type FunctionShape = Schema.Schema.Type<typeof FunctionShape>;
 export type CreateFunctionProps = CreateShapeProps<FunctionShape>;
 
 export const createFunction = (props: CreateFunctionProps) =>
-  createShape<FunctionShape>({ type: 'function', size: { width: 256, height: 192 }, ...props });
+  createShape<FunctionShape>({
+    type: 'function',
+    size: { width: 256, height: 192 },
+    ...props,
+  });
 
 //
 // Component
@@ -62,17 +67,15 @@ const TextInputComponent = ({ shape, title, ...props }: TextInputComponentProps)
         return;
       }
 
-      const {
-        objects: [fn],
-      } = await space.db.query(Filter.type(Function.Function, { source: Ref.make(object) })).run();
+      const [fn] = await space.db.query(Filter.type(Operation.PersistentOperation, { source: Ref.make(object) })).run();
       if (!fn) {
         return;
       }
 
       node.value = value;
       node.function = Ref.make(fn);
-      node.inputSchema = getSnapshot(fn.inputSchema);
-      node.outputSchema = getSnapshot(fn.outputSchema);
+      node.inputSchema = fn.inputSchema ? getSnapshot(fn.inputSchema) : undefined;
+      node.outputSchema = fn.outputSchema ? getSnapshot(fn.outputSchema) : undefined;
     },
     [client, node],
   );

package/src/shapes/Gpt.tsx

@@ -6,10 +6,10 @@ import * as Schema from 'effect/Schema';
 import React, { useEffect, useState } from 'react';
 
 import { GptInput, GptOutput } from '@dxos/conductor';
+import { ScrollArea } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { FunctionBody, createFunctionAnchors, getHeight } from './common';
 import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
@@ -74,7 +74,11 @@ export const GptComponent = ({ shape }: ShapeComponentProps<GptShape>) => {
   return (
     <FunctionBody
       shape={shape}
-      content={<div className='px-2 py-1 overflow-y-scroll'>{text}</div>}
+      content={
+        <ScrollArea.Root orientation='vertical' thin>
+          <ScrollArea.Viewport>{text}</ScrollArea.Viewport>
+        </ScrollArea.Root>
+      }
       status={`${tokens} tokens`}
       inputSchema={meta.input}
       outputSchema={meta.output}

package/src/shapes/Json.tsx

@@ -8,10 +8,9 @@ import React from 'react';
 import { DEFAULT_INPUT, DefaultOutput, JsonTransformInput } from '@dxos/conductor';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
-import { JsonFilter } from '@dxos/react-ui-syntax-highlighter';
+import { Syntax } from '@dxos/react-ui-syntax-highlighter';
 
 import { useComputeNodeState } from '../hooks';
-
 import { Box, createFunctionAnchors, getHeight } from './common';
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
@@ -50,7 +49,14 @@ export const JsonComponent = ({ shape, ...props }: JsonComponentProps) => {
 
   return (
     <Box shape={shape}>
-      <JsonFilter data={value} classNames='text-xs' />
+      <Syntax.Root data={value}>
+        <Syntax.Content>
+          <Syntax.Filter />
+          <Syntax.Viewport>
+            <Syntax.Code classNames='text-xs' />
+          </Syntax.Viewport>
+        </Syntax.Content>
+      </Syntax.Root>
     </Box>
   );
 };

package/src/shapes/RNG.tsx

@@ -10,7 +10,6 @@ import { Icon, type IconProps } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef, createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
 export const RandomShape = Schema.extend(
@@ -27,7 +26,11 @@ export type RandomShape = Schema.Schema.Type<typeof RandomShape>;
 export type CreateRandomProps = CreateShapeProps<RandomShape>;
 
 export const createRandom = (props: CreateRandomProps) =>
-  createShape<RandomShape>({ type: 'rng', size: { width: 64, height: 64 }, ...props });
+  createShape<RandomShape>({
+    type: 'rng',
+    size: { width: 64, height: 64 },
+    ...props,
+  });
 
 const icons = [
   'ph--dice-one--regular',

package/src/shapes/Scope.tsx

@@ -10,7 +10,6 @@ import { type ShapeComponentProps, type ShapeDef, createAnchorMap } from '@dxos/
 import { Chaos, shaderPresets, useAudioStream } from '@dxos/react-ui-sfx';
 
 import { useComputeNodeState } from '../hooks';
-
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
 export const ScopeShape = Schema.extend(

package/src/shapes/Surface.tsx

@@ -5,13 +5,14 @@
 import * as Schema from 'effect/Schema';
 import React from 'react';
 
-import { Surface } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
 import { DEFAULT_INPUT } from '@dxos/conductor';
+import { Card } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { Box, type BoxActionHandler } from './common';
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
@@ -27,7 +28,11 @@ export type SurfaceShape = Schema.Schema.Type<typeof SurfaceShape>;
 export type CreateSurfaceProps = CreateShapeProps<SurfaceShape>;
 
 export const createSurface = (props: CreateSurfaceProps) =>
-  createShape<SurfaceShape>({ type: 'surface', size: { width: 384, height: 384 }, ...props });
+  createShape<SurfaceShape>({
+    type: 'surface',
+    size: { width: 384, height: 384 },
+    ...props,
+  });
 
 export const SurfaceComponent = ({ shape }: ShapeComponentProps<SurfaceShape>) => {
   const { runtime } = useComputeNodeState(shape);
@@ -40,9 +45,12 @@ export const SurfaceComponent = ({ shape }: ShapeComponentProps<SurfaceShape>) =
     }
   };
 
+  // TODO(burdon): Subject property?
   return (
     <Box shape={shape} onAction={handleAction}>
-      {value !== null && <Surface role='card--extrinsic' data={{ value }} limit={1} />}
+      <Card.Root>
+        {value !== null && <Surface.Surface type={AppSurface.Card} data={{ subject: value }} limit={1} />}
+      </Card.Root>
     </Box>
   );
 };

package/src/shapes/Switch.tsx

@@ -10,7 +10,6 @@ import { Input } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef, createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
 export const SwitchShape = Schema.extend(

package/src/shapes/Table.tsx

@@ -7,13 +7,13 @@ import React from 'react';
 
 import { createInputSchema, createOutputSchema } from '@dxos/conductor';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
-import { DataType } from '@dxos/schema';
+import { Message } from '@dxos/types';
 
 import { Box, createFunctionAnchors } from './common';
 import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
-const InputSchema = createInputSchema(DataType.Message);
-const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(DataType.Message)));
+const InputSchema = createInputSchema(Message.Message);
+const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(Message.Message)));
 
 export const TableShape = Schema.extend(
   ComputeShape,

package/src/shapes/Template.tsx

@@ -17,7 +17,6 @@ import {
 } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { Box, TypeSelect, createFunctionAnchors } from './common';
 import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 

package/src/shapes/Text.tsx

@@ -10,7 +10,6 @@ import { type ShapeComponentProps, type ShapeDef, TextBox } from '@dxos/react-ui
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { Box, type BoxActionHandler } from './common';
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 

package/src/shapes/Thread.tsx

@@ -6,16 +6,16 @@ import * as Schema from 'effect/Schema';
 import React, { useEffect, useRef } from 'react';
 
 import { createInputSchema, createOutputSchema } from '@dxos/conductor';
-import { type ThemedClassName } from '@dxos/react-ui';
+import { ScrollArea, type ThemedClassName } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
-import { mx } from '@dxos/react-ui-theme';
-import { DataType } from '@dxos/schema';
+import { Message } from '@dxos/types';
+import { mx } from '@dxos/ui-theme';
 
 import { Box, createFunctionAnchors } from './common';
 import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
-const InputSchema = createInputSchema(DataType.Message);
-const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(DataType.Message)));
+const InputSchema = createInputSchema(Message.Message);
+const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(Message.Message)));
 
 export const ThreadShape = Schema.extend(
   ComputeShape,
@@ -42,11 +42,13 @@ export const ThreadComponent = ({ shape }: ShapeComponentProps<ThreadShape>) =>
 
   return (
     <Box shape={shape}>
-      <div ref={scrollRef} className='flex flex-col w-full overflow-y-scroll gap-2 p-2'>
-        {[...items].map((item, i) => (
-          <ThreadItem key={i} item={item} />
-        ))}
-      </div>
+      <ScrollArea.Root orientation='vertical'>
+        <ScrollArea.Viewport classNames='gap-2 p-2' ref={scrollRef}>
+          {[...items].map((item, i) => (
+            <ThreadItem key={i} item={item} />
+          ))}
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
     </Box>
   );
 };

package/src/shapes/Trigger.tsx

@@ -5,12 +5,12 @@
 import * as Schema from 'effect/Schema';
 import React, { useEffect } from 'react';
 
+import { Trigger, TriggerEvent } from '@dxos/compute';
 import { VoidInput } from '@dxos/conductor';
-import { Filter, Query } from '@dxos/echo';
-import { ObjectId, Ref } from '@dxos/echo/internal';
-import { Trigger, TriggerEvent } from '@dxos/functions';
+import { Filter, Obj, Query, Ref } from '@dxos/echo';
+import { type Mutable } from '@dxos/echo/internal';
 import { DXN, SpaceId } from '@dxos/keys';
-import { useSpace } from '@dxos/react-client/echo';
+import { useSpaces } from '@dxos/react-client/echo';
 import { Select, type SelectRootProps } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
@@ -21,10 +21,11 @@ export const TriggerShape = Schema.extend(
   ComputeShape,
   Schema.Struct({
     type: Schema.Literal('trigger'),
-    functionTrigger: Schema.optional(Ref(Trigger.Trigger)),
+    functionTrigger: Schema.optional(Ref.Ref(Trigger.Trigger)),
   }),
 );
-export type TriggerShape = Schema.Schema.Type<typeof TriggerShape>;
+
+export interface TriggerShape extends Schema.Schema.Type<typeof TriggerShape> {}
 
 export type CreateTriggerProps = CreateShapeProps<Omit<TriggerShape, 'functionTrigger'>> & {
   spaceId?: SpaceId;
@@ -47,12 +48,14 @@ export const createTrigger = (props: CreateTriggerProps): TriggerShape => {
 export type TriggerComponentProps = ShapeComponentProps<TriggerShape>;
 
 export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
-  const space = useSpace();
+  const [space] = useSpaces();
   const functionTrigger = shape.functionTrigger?.target;
 
   useEffect(() => {
     if (functionTrigger && !functionTrigger.spec) {
-      functionTrigger.spec = createTriggerSpec({ triggerKind: 'email', spaceId: space?.id });
+      Obj.update(functionTrigger, (functionTrigger) => {
+        functionTrigger.spec = createTriggerSpec({ triggerKind: 'email', spaceId: space?.id }) as Mutable<Trigger.Spec>;
+      });
     }
   }, [functionTrigger, functionTrigger?.spec]);
 
@@ -62,7 +65,9 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
 
   const setKind = (kind: Trigger.Kind) => {
     if (functionTrigger?.spec?.kind !== kind) {
-      functionTrigger!.spec = createTriggerSpec({ triggerKind: kind, spaceId: space?.id });
+      Obj.update(functionTrigger!, (obj) => {
+        obj.spec = createTriggerSpec({ triggerKind: kind, spaceId: space?.id }) as Mutable<Trigger.Spec>;
+      });
     }
   };
 
@@ -86,7 +91,7 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
 const TriggerKindSelect = ({ value, onValueChange }: Pick<SelectRootProps, 'value' | 'onValueChange'>) => {
   return (
     <Select.Root value={value} onValueChange={onValueChange}>
-      <Select.TriggerButton variant='ghost' classNames='w-full !px-0' />
+      <Select.TriggerButton variant='ghost' classNames='w-full px-0!' />
       <Select.Portal>
         <Select.Content>
           <Select.ScrollUpButton />
@@ -109,21 +114,16 @@ const createTriggerSpec = (props: { triggerKind?: Trigger.Kind; spaceId?: SpaceI
   const kind = props.triggerKind ?? 'email';
   switch (kind) {
     case 'timer':
-      return { kind: 'timer', cron: '*/10 * * * * *' } satisfies Trigger.TimerSpec;
+      return Trigger.specTimer('*/10 * * * * *');
     case 'webhook':
-      return { kind: 'webhook', method: 'POST' } satisfies Trigger.WebhookSpec;
+      return Trigger.specWebhook({ method: 'POST' });
     case 'subscription':
-      return {
-        kind: 'subscription',
-        query: {
-          ast: Query.select(Filter.nothing()).ast,
-        },
-      } satisfies Trigger.SubscriptionSpec;
+      return Trigger.specSubscription(Query.select(Filter.nothing()));
     case 'email':
-      return { kind: 'email' } satisfies Trigger.EmailSpec;
+      return Trigger.specEmail();
     case 'queue': {
-      const dxn = new DXN(DXN.kind.QUEUE, ['data', props.spaceId ?? SpaceId.random(), ObjectId.random()]).toString();
-      return { kind: 'queue', queue: dxn } satisfies Trigger.QueueSpec;
+      const dxn = new DXN(DXN.kind.QUEUE, ['data', props.spaceId ?? SpaceId.random(), Obj.ID.random()]).toString();
+      return Trigger.specQueue(dxn);
     }
   }
 };

package/src/shapes/common/Box.tsx

@@ -6,9 +6,8 @@ import React, { type PropsWithChildren, type ReactNode, forwardRef } from 'react
 
 import { invariant } from '@dxos/invariant';
 import { Icon, IconButton, type ThemedClassName } from '@dxos/react-ui';
-import { useEditorContext, useShapeDef } from '@dxos/react-ui-canvas-editor';
-import { type Shape } from '@dxos/react-ui-canvas-editor';
-import { mx } from '@dxos/react-ui-theme';
+import { type CanvasBoard, useEditorContext, useShapeDef } from '@dxos/react-ui-canvas-editor';
+import { mx } from '@dxos/ui-theme';
 
 export const headerHeight = 32;
 export const footerHeight = 32;
@@ -17,7 +16,7 @@ export type BoxActionHandler = (action: 'run' | 'open' | 'close') => void;
 
 export type BoxProps = PropsWithChildren<
   ThemedClassName<{
-    shape: Shape;
+    shape: CanvasBoard.Shape;
     title?: string;
     status?: string | ReactNode;
     open?: boolean;
@@ -33,14 +32,13 @@ export const Box = forwardRef<HTMLDivElement, BoxProps>(
 
     return (
       <div ref={forwardedRef} className='flex flex-col h-full w-full justify-between'>
-        <div className='flex shrink-0 w-full justify-between items-center h-[32px] bg-hoverSurface'>
+        <div className='flex shrink-0 w-full justify-between items-center h-[32px] bg-input-surface'>
           <Icon icon={icon} classNames='mx-2' />
           <div className='grow text-sm truncate'>{debug ? shape.type : (name ?? shape.text ?? title)}</div>
           <IconButton
             classNames='p-1 text-green-500'
             variant='ghost'
             icon='ph--play--regular'
-            size={4}
             label='run'
             iconOnly
             onDoubleClick={(ev) => ev.stopPropagation()}
@@ -51,14 +49,13 @@ export const Box = forwardRef<HTMLDivElement, BoxProps>(
           />
         </div>
         <div className={mx('flex flex-col h-full grow overflow-hidden', classNames)}>{children}</div>
-        <div className='flex shrink-0 w-full justify-between items-center h-[32px] bg-hoverSurface'>
+        <div className='flex shrink-0 w-full justify-between items-center h-[32px] bg-input-surface'>
           <div className='grow px-2 text-sm truncate'>{debug ? shape.id : status}</div>
           {openable && (
             <IconButton
               classNames='p-1'
               variant='ghost'
               icon={open ? 'ph--caret-up--regular' : 'ph--caret-down--regular'}
-              size={4}
               label={open ? 'close' : 'open'}
               iconOnly
               onClick={(ev) => {

package/src/shapes/common/FunctionBody.tsx

@@ -8,7 +8,7 @@ import React, { type JSX, useRef, useState } from 'react';
 
 import { VoidInput, VoidOutput } from '@dxos/conductor';
 import { useCanvasContext } from '@dxos/react-ui-canvas';
-import { type Polygon, type Shape } from '@dxos/react-ui-canvas-editor';
+import { type CanvasBoard, type Polygon } from '@dxos/react-ui-canvas-editor';
 import { createAnchors, getParentShapeElement, rowHeight } from '@dxos/react-ui-canvas-editor';
 
 import { Box, type BoxProps, footerHeight, headerHeight } from '../common';
@@ -18,7 +18,7 @@ const bodyPadding = 8;
 const expandedHeight = 200;
 
 export type FunctionBodyProps = {
-  shape: Shape;
+  shape: CanvasBoard.Shape;
   name?: string;
   content?: JSX.Element;
   inputSchema?: Schema.Schema.Any;

package/src/shapes/common/TypeSelect.tsx

@@ -11,7 +11,7 @@ import { Select, type SelectRootProps } from '@dxos/react-ui';
 export const TypeSelect = ({ value, onValueChange }: Pick<SelectRootProps, 'value' | 'onValueChange'>) => {
   return (
     <Select.Root value={value} onValueChange={onValueChange}>
-      <Select.TriggerButton variant='ghost' classNames='w-full !px-0' />
+      <Select.TriggerButton variant='ghost' classNames='w-full px-0!' />
       <Select.Portal>
         <Select.Content>
           <Select.ScrollUpButton />

package/src/shapes/defs.ts

@@ -6,7 +6,7 @@ import * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 
 import { DEFAULT_INPUT, DEFAULT_OUTPUT } from '@dxos/conductor';
-import { ObjectId } from '@dxos/echo/internal';
+import { Obj } from '@dxos/echo';
 import { Polygon } from '@dxos/react-ui-canvas-editor';
 import { type MakeOptional } from '@dxos/util';
 
@@ -37,7 +37,7 @@ export const ComputeShape = Schema.extend(
   Polygon,
   Schema.Struct({
     // TODO(burdon): Rename computeNode?
-    node: Schema.optional(ObjectId.annotations({ description: 'Compute node id' })),
+    node: Schema.optional(Obj.ID.annotations({ description: 'Compute node id' })),
   }).pipe(Schema.mutable),
 );
 
@@ -45,7 +45,7 @@ export type ComputeShape = Schema.Schema.Type<typeof ComputeShape>;
 
 export const createShape = <S extends ComputeShape>({ id, ...rest }: CreateShapeProps<S> & { type: string }): S => {
   return {
-    id: id ?? ObjectId.random(),
+    id: id ?? Obj.ID.random(),
     ...rest,
   } as S;
 };

package/src/shapes/index.ts

@@ -13,11 +13,12 @@ export * from './Boolean';
 export * from './Chat';
 export * from './Constant';
 export * from './Database';
+export * from './Feed';
 export * from './Function';
 export * from './Gpt';
+export * from './GptRealtime';
 export * from './Json';
 export * from './Logic';
-export * from './Queue';
 export * from './RNG';
 export * from './Scope';
 export * from './Surface';
@@ -28,4 +29,3 @@ export * from './Text';
 export * from './Thread';
 export * from './TextToImage';
 export * from './Trigger';
-export * from './GptRealtime';

package/src/testing/circuits.ts

@@ -3,14 +3,10 @@
 //
 
 import { createSystemPrompt } from '@dxos/assistant';
-import { ObjectId } from '@dxos/echo/internal';
-import { type ServiceContainer } from '@dxos/functions';
-import { DXN, SpaceId } from '@dxos/keys';
+import { DXN, ObjectId, SpaceId } from '@dxos/keys';
 import { type Dimension, type Point } from '@dxos/react-ui-canvas';
 import { CanvasGraphModel, createNote, pointMultiply, pointsToRect, rectToPoints } from '@dxos/react-ui-canvas-editor';
 
-import { ComputeGraphController } from '../graph';
-import { createComputeGraph } from '../hooks';
 import {
   type ComputeShape,
   createAnd,
@@ -28,7 +24,7 @@ import {
   createJsonTransform,
   createNot,
   createOr,
-  createQueue,
+  createFeed,
   createRandom,
   createScope,
   createSurface,
@@ -38,19 +34,14 @@ import {
   createTextToImage,
 } from '../shapes';
 
-export const createComputeGraphController = (
-  graph: CanvasGraphModel<ComputeShape>,
-  serviceContainer: ServiceContainer,
-) => {
-  const computeGraph = createComputeGraph(graph);
-  const controller = new ComputeGraphController(serviceContainer, computeGraph);
-  return { controller, graph };
-};
-
 //
 // Circuits
 //
 
+export const createEmptyCircuit = () => {
+  return CanvasGraphModel.create<ComputeShape>();
+};
+
 export const createBasicCircuit = () => {
   const model = CanvasGraphModel.create<ComputeShape>();
   model.builder.call(({ model }) => {
@@ -250,7 +241,7 @@ export const createGptCircuit = (options: {
         }),
       );
 
-      const thread = model.createNode(createQueue(position({ x: -3, y: 3, width: 14, height: 10 })));
+      const thread = model.createNode(createFeed(position({ x: -3, y: 3, width: 14, height: 10 })));
       const append = model.createNode(createAppend(position({ x: 10, y: 6 })));
 
       builder

package/dist/types/src/shapes/Queue.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../../src/shapes/Queue.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAmB,MAAM,OAAO,CAAC;AAGxC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAOvF,OAAO,EAAgB,KAAK,gBAAgB,EAAe,MAAM,QAAQ,CAAC;AAE1E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;GAKtB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC;AAE/D,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;AAE5D,eAAO,MAAM,WAAW,GAAI,OAAO,gBAAgB;;;;;;;;;;;;;;;;;;;CACsC,CAAC;AAE1F,eAAO,MAAM,cAAc,GAAI,WAAW,mBAAmB,CAAC,UAAU,CAAC,sBAmBxE,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,sBAAsB,eAAe,CAAC;IAAE,IAAI,EAAE,GAAG,CAAA;CAAE,CAAC,sBAe7E,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,UAAU,CAQ3C,CAAC"}