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

package/src/shapes/Gpt.tsx

@@ -5,14 +5,14 @@
 import { Schema } from 'effect';
 import React, { useEffect, useState } from 'react';
 
-import { type GenerationStreamEvent } from '@dxos/ai';
 import { GptInput, GptOutput } 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 { useComputeNodeState } from '../hooks';
 
+import { FunctionBody, createFunctionAnchors, getHeight } from './common';
+import { ComputeShape, type CreateShapeProps, createShape } from './defs';
+
 export const GptShape = Schema.extend(
   ComputeShape,
   Schema.Struct({
@@ -43,8 +43,10 @@ export const GptComponent = ({ shape }: ShapeComponentProps<GptShape>) => {
           setText('');
           break;
         }
+
         case 'custom': {
-          const token: GenerationStreamEvent = ev.event;
+          // TODO(burdon): Any?
+          const token = ev.event;
           switch (token.type) {
             case 'content_block_delta':
               switch (token.delta.type) {

package/src/shapes/GptRealtime.tsx

@@ -11,7 +11,7 @@ import { Icon } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
 import { createFunctionAnchors } from './common';
-import { ComputeShape, createShape, type CreateShapeProps } from './defs';
+import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
 export const GptRealtimeShape = Schema.extend(
   ComputeShape,

package/src/shapes/Json.tsx

@@ -10,10 +10,11 @@ import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-e
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 import { JsonFilter } from '@dxos/react-ui-syntax-highlighter';
 
-import { createFunctionAnchors, getHeight, Box } from './common';
-import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
+import { Box, createFunctionAnchors, getHeight } from './common';
+import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
+
 //
 // Data
 //

package/src/shapes/Logic.tsx

@@ -8,8 +8,8 @@ import React from 'react';
 import { IfElseInput, IfElseOutput, IfInput, IfOutput } 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/Queue.tsx

@@ -10,10 +10,11 @@ import { 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 { useComputeNodeState } from '../hooks';
+
 import { createFunctionAnchors } from './common';
 import { Box, type BoxActionHandler } from './common';
-import { ComputeShape, createShape, type CreateShapeProps } from './defs';
-import { useComputeNodeState } from '../hooks';
+import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
 export const QueueShape = Schema.extend(
   ComputeShape,

package/src/shapes/RNG.tsx

@@ -7,12 +7,12 @@ import React, { useEffect, useState } from 'react';
 
 import { DEFAULT_OUTPUT } from '@dxos/conductor';
 import { Icon, type IconProps } 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 RandomShape = Schema.extend(
   ComputeShape,
   Schema.Struct({
@@ -69,7 +69,7 @@ export const RandomComponent = ({ shape }: ShapeComponentProps<RandomShape>) =>
 
   return (
     <div className='flex grow items-center justify-center'>
-      <Icon icon={icon} classNames={mx(spin && 'animate-[spin_1s]')} size={10} onClick={handleClick} />
+      <Icon icon={icon} classNames={spin && 'animate-[spin_1s]'} size={10} onClick={handleClick} />
     </div>
   );
 };

package/src/shapes/Scope.tsx

@@ -6,12 +6,13 @@ import { Schema } from 'effect';
 import React from 'react';
 
 import { DEFAULT_INPUT } from '@dxos/conductor';
-import { createAnchorMap, type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
-import { useAudioStream, Chaos, shaderPresets } from '@dxos/react-ui-sfx';
+import { type ShapeComponentProps, type ShapeDef, createAnchorMap } from '@dxos/react-ui-canvas-editor';
+import { Chaos, shaderPresets, useAudioStream } from '@dxos/react-ui-sfx';
 
-import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
+import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
+
 export const ScopeShape = Schema.extend(
   ComputeShape,
   Schema.Struct({

package/src/shapes/Surface.tsx

@@ -10,10 +10,11 @@ import { DEFAULT_INPUT } from '@dxos/conductor';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
-import { Box, type BoxActionHandler } from './common';
-import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
+import { Box, type BoxActionHandler } from './common';
+import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
+
 export const SurfaceShape = Schema.extend(
   ComputeShape,
   Schema.Struct({
@@ -41,7 +42,7 @@ export const SurfaceComponent = ({ shape }: ShapeComponentProps<SurfaceShape>) =
 
   return (
     <Box shape={shape} onAction={handleAction}>
-      {value !== null && <Surface role='canvas-node' data={{ value }} limit={1} />}
+      {value !== null && <Surface role='card--extrinsic' data={{ value }} limit={1} />}
     </Box>
   );
 };

package/src/shapes/Switch.tsx

@@ -7,11 +7,12 @@ import React, { useEffect, useState } from 'react';
 
 import { DEFAULT_OUTPUT } from '@dxos/conductor';
 import { Input } 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 SwitchShape = Schema.extend(
   ComputeShape,
   Schema.Struct({

package/src/shapes/Table.tsx

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

package/src/shapes/Template.tsx

@@ -5,7 +5,7 @@
 import { Schema } from 'effect';
 import React, { useRef } from 'react';
 
-import { ComputeValueType, getTemplateInputSchema, TemplateOutput, VoidInput } from '@dxos/conductor';
+import { ComputeValueType, TemplateOutput, VoidInput, getTemplateInputSchema } from '@dxos/conductor';
 import { toJsonSchema } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import {
@@ -16,10 +16,11 @@ import {
   type TextBoxProps,
 } from '@dxos/react-ui-canvas-editor';
 
-import { Box, createFunctionAnchors, TypeSelect } from './common';
-import { ComputeShape, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
+import { Box, TypeSelect, createFunctionAnchors } from './common';
+import { ComputeShape, type CreateShapeProps, createShape } from './defs';
+
 //
 // Data
 //

package/src/shapes/Text.tsx

@@ -6,13 +6,14 @@ import { Schema } from 'effect';
 import React from 'react';
 
 import { DEFAULT_INPUT } from '@dxos/conductor';
-import { TextBox, type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
+import { type ShapeComponentProps, type ShapeDef, TextBox } from '@dxos/react-ui-canvas-editor';
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
-import { Box, type BoxActionHandler } from './common';
-import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
+import { Box, type BoxActionHandler } from './common';
+import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
+
 export const TextShape = Schema.extend(
   ComputeShape,
   Schema.Struct({

package/src/shapes/TextToImage.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 TextToImageShape = Schema.extend(
   ComputeShape,

package/src/shapes/Thread.tsx

@@ -5,16 +5,17 @@
 import { Schema } from 'effect';
 import React, { useEffect, useRef } from 'react';
 
-import { createInputSchema, createOutputSchema, GptMessage } from '@dxos/conductor';
+import { createInputSchema, createOutputSchema } from '@dxos/conductor';
 import { 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 { createFunctionAnchors, Box } from './common';
-import { ComputeShape, createShape, type CreateShapeProps } from './defs';
+import { Box, createFunctionAnchors } from './common';
+import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
-const InputSchema = createInputSchema(GptMessage);
-const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(GptMessage)));
+const InputSchema = createInputSchema(DataType.Message);
+const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(DataType.Message)));
 
 export const ThreadShape = Schema.extend(
   ComputeShape,

package/src/shapes/Trigger.tsx

@@ -6,29 +6,31 @@ import { Schema } from 'effect';
 import React, { useEffect } from 'react';
 
 import { VoidInput } from '@dxos/conductor';
+import { Filter, Obj, Query } from '@dxos/echo';
 import { ObjectId, Ref } from '@dxos/echo-schema';
 import {
   type EmailTrigger,
+  EmailTriggerOutput,
   FunctionTrigger,
   type QueueTrigger,
+  QueueTriggerOutput,
   type SubscriptionTrigger,
+  SubscriptionTriggerOutput,
   type TimerTrigger,
-  TriggerKind,
+  TimerTriggerOutput,
+  type TriggerKind,
+  TriggerKinds,
   type TriggerType,
   type WebhookTrigger,
-  EmailTriggerOutput,
-  QueueTriggerOutput,
-  SubscriptionTriggerOutput,
-  TimerTriggerOutput,
   WebhookTriggerOutput,
 } from '@dxos/functions';
 import { DXN, SpaceId } from '@dxos/keys';
-import { live, makeRef, useSpace } from '@dxos/react-client/echo';
+import { useSpace } from '@dxos/react-client/echo';
 import { Select, type SelectRootProps } from '@dxos/react-ui';
 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 TriggerShape = Schema.extend(
   ComputeShape,
@@ -45,13 +47,13 @@ export type CreateTriggerProps = CreateShapeProps<Omit<TriggerShape, 'functionTr
 };
 
 export const createTrigger = (props: CreateTriggerProps): TriggerShape => {
-  const functionTrigger = live(FunctionTrigger, {
+  const functionTrigger = Obj.make(FunctionTrigger, {
     enabled: true,
     spec: createTriggerSpec(props),
   });
   return createShape<TriggerShape>({
     type: 'trigger',
-    functionTrigger: makeRef(functionTrigger),
+    functionTrigger: Ref.make(functionTrigger),
     size: { width: 192, height: getHeight(EmailTriggerOutput) },
     ...props,
   });
@@ -65,12 +67,12 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
 
   useEffect(() => {
     if (functionTrigger && !functionTrigger.spec) {
-      functionTrigger.spec = createTriggerSpec({ triggerKind: TriggerKind.Email, spaceId: space?.id });
+      functionTrigger.spec = createTriggerSpec({ triggerKind: 'email', spaceId: space?.id });
     }
   }, [functionTrigger, functionTrigger?.spec]);
 
   useEffect(() => {
-    shape.size.height = getHeight(getOutputSchema(functionTrigger?.spec?.kind ?? TriggerKind.Email));
+    shape.size.height = getHeight(getOutputSchema(functionTrigger?.spec?.kind ?? 'email'));
   }, [functionTrigger?.spec?.kind]);
 
   const setKind = (kind: TriggerKind) => {
@@ -104,7 +106,7 @@ const TriggerKindSelect = ({ value, onValueChange }: Pick<SelectRootProps, 'valu
         <Select.Content>
           <Select.ScrollUpButton />
           <Select.Viewport>
-            {Object.values(TriggerKind).map((kind) => (
+            {TriggerKinds.map((kind) => (
               <Select.Option key={kind} value={kind}>
                 {kind}
               </Select.Option>
@@ -119,30 +121,30 @@ const TriggerKindSelect = ({ value, onValueChange }: Pick<SelectRootProps, 'valu
 };
 
 const createTriggerSpec = (props: { triggerKind?: TriggerKind; spaceId?: SpaceId }): TriggerType => {
-  const kind = props.triggerKind ?? TriggerKind.Email;
+  const kind = props.triggerKind ?? 'email';
   switch (kind) {
-    case TriggerKind.Timer:
-      return { kind: TriggerKind.Timer, cron: '*/10 * * * * *' } satisfies TimerTrigger;
-    case TriggerKind.Webhook:
-      return { kind: TriggerKind.Webhook, method: 'POST' } satisfies WebhookTrigger;
-    case TriggerKind.Subscription:
-      return { kind: TriggerKind.Subscription, filter: {} } satisfies SubscriptionTrigger;
-    case TriggerKind.Email:
-      return { kind: TriggerKind.Email } satisfies EmailTrigger;
-    case TriggerKind.Queue: {
+    case 'timer':
+      return { kind: 'timer', cron: '*/10 * * * * *' } satisfies TimerTrigger;
+    case 'webhook':
+      return { kind: 'webhook', method: 'POST' } satisfies WebhookTrigger;
+    case 'subscription':
+      return { kind: 'subscription', query: Query.select(Filter.nothing()).ast } satisfies SubscriptionTrigger;
+    case 'email':
+      return { kind: 'email' } satisfies EmailTrigger;
+    case 'queue': {
       const dxn = new DXN(DXN.kind.QUEUE, ['data', props.spaceId ?? SpaceId.random(), ObjectId.random()]).toString();
-      return { kind: TriggerKind.Queue, queue: dxn } satisfies QueueTrigger;
+      return { kind: 'queue', queue: dxn } satisfies QueueTrigger;
     }
   }
 };
 
 const getOutputSchema = (kind: TriggerKind) => {
   const kindToSchema: Record<TriggerKind, Schema.Schema<any>> = {
-    [TriggerKind.Email]: EmailTriggerOutput,
-    [TriggerKind.Subscription]: SubscriptionTriggerOutput,
-    [TriggerKind.Timer]: TimerTriggerOutput,
-    [TriggerKind.Webhook]: WebhookTriggerOutput,
-    [TriggerKind.Queue]: QueueTriggerOutput,
+    ['email']: EmailTriggerOutput,
+    ['subscription']: SubscriptionTriggerOutput,
+    ['timer']: TimerTriggerOutput,
+    ['webhook']: WebhookTriggerOutput,
+    ['queue']: QueueTriggerOutput,
   };
   return kindToSchema[kind];
 };
@@ -154,9 +156,5 @@ export const triggerShape: ShapeDef<TriggerShape> = {
   component: TriggerComponent,
   createShape: createTrigger,
   getAnchors: (shape) =>
-    createFunctionAnchors(
-      shape,
-      VoidInput,
-      getOutputSchema(shape.functionTrigger?.target?.spec?.kind ?? TriggerKind.Email),
-    ),
+    createFunctionAnchors(shape, VoidInput, getOutputSchema(shape.functionTrigger?.target?.spec?.kind ?? 'email')),
 };

package/src/shapes/common/Box.tsx

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { forwardRef, type PropsWithChildren, type ReactNode } from 'react';
+import React, { type PropsWithChildren, type ReactNode, forwardRef } from 'react';
 
 import { invariant } from '@dxos/invariant';
 import { Icon, IconButton, type ThemedClassName } from '@dxos/react-ui';
@@ -35,7 +35,7 @@ export const Box = forwardRef<HTMLDivElement, BoxProps>(
       <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'>
           <Icon icon={icon} classNames='mx-2' />
-          <div className='grow text-sm truncate'>{debug ? shape.type : name ?? shape.text ?? title}</div>
+          <div className='grow text-sm truncate'>{debug ? shape.type : (name ?? shape.text ?? title)}</div>
           <IconButton
             classNames='p-1 text-green-500'
             variant='ghost'

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 { getParentShapeElement, createAnchors, rowHeight } from '@dxos/react-ui-canvas-editor';
+import { createAnchors, getParentShapeElement, rowHeight } from '@dxos/react-ui-canvas-editor';
 
 import { Box, type BoxProps, footerHeight, headerHeight } from '../common';
 import { createAnchorId, getProperties } from '../defs';

package/src/testing/circuits.ts

@@ -2,9 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import { createSystemPrompt } from '@dxos/artifact';
+import { createSystemPrompt } from '@dxos/assistant';
 import { ObjectId } from '@dxos/echo-schema';
-import type { ServiceContainer } from '@dxos/functions';
+import { type ServiceContainer } from '@dxos/functions';
 import { DXN, 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';
@@ -207,7 +207,7 @@ export const createArtifactCircuit = () => {
   model.builder.call((builder) => {
     const prompt = model.createNode(
       createTemplate({
-        text: createSystemPrompt(),
+        text: createSystemPrompt({}),
         ...position({ x: -10, y: -5, width: 8, height: 18 }),
       }),
     );
@@ -262,7 +262,7 @@ export const createGptCircuit = (options: {
     if (options.instructions) {
       const prompt = model.createNode(
         createTemplate({
-          text: createSystemPrompt(),
+          text: createSystemPrompt({}),
           ...position({ x: -18, y: -12, width: 8, height: 10 }),
         }),
       );