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

package/src/shapes/Thread.tsx

@@ -2,20 +2,20 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { useEffect, useRef } from 'react';
 
-import { Message } from '@dxos/ai';
 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 { Message } from '@dxos/types';
 
-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(Message);
-const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(Message)));
+const InputSchema = createInputSchema(Message.Message);
+const OutputSchema = createOutputSchema(Schema.mutable(Schema.Array(Message.Message)));
 
 export const ThreadShape = Schema.extend(
   ComputeShape,
@@ -42,7 +42,7 @@ 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'>
+      <div ref={scrollRef} className='flex flex-col is-full overflow-y-auto gap-2 p-2'>
         {[...items].map((item, i) => (
           <ThreadItem key={i} item={item} />
         ))}
@@ -63,7 +63,7 @@ export const ThreadItem = ({ classNames, item }: ThemedClassName<{ item: any }>)
     <div className={mx('flex', classNames, role === 'user' && 'justify-end')}>
       <div
         className={mx(
-          'block rounded-md p-1 px-2 text-sm',
+          'block rounded-md p-1 pli-2 text-sm',
           role === 'user'
             ? 'bg-blue-100 dark:bg-blue-800'
             : role === 'system'

package/src/shapes/Trigger.tsx

@@ -2,57 +2,44 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { useEffect } from 'react';
 
 import { VoidInput } from '@dxos/conductor';
-import { ObjectId, Ref } from '@dxos/echo-schema';
-import {
-  type EmailTrigger,
-  EmailTriggerOutput,
-  FunctionTrigger,
-  type QueueTrigger,
-  QueueTriggerOutput,
-  type SubscriptionTrigger,
-  type TimerTrigger,
-  TriggerKind,
-  type TriggerType,
-  SubscriptionTriggerOutput,
-  TimerTriggerOutput,
-  type WebhookTrigger,
-  WebhookTriggerOutput,
-} from '@dxos/functions';
+import { Filter, Query } from '@dxos/echo';
+import { ObjectId, Ref } from '@dxos/echo/internal';
+import { Trigger, TriggerEvent } from '@dxos/functions';
 import { DXN, SpaceId } from '@dxos/keys';
-import { live, 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,
   Schema.Struct({
     type: Schema.Literal('trigger'),
-    functionTrigger: Schema.optional(Ref(FunctionTrigger)),
+    functionTrigger: Schema.optional(Ref(Trigger.Trigger)),
   }),
 );
 export type TriggerShape = Schema.Schema.Type<typeof TriggerShape>;
 
 export type CreateTriggerProps = CreateShapeProps<Omit<TriggerShape, 'functionTrigger'>> & {
   spaceId?: SpaceId;
-  triggerKind?: TriggerKind;
+  triggerKind?: Trigger.Kind;
 };
 
 export const createTrigger = (props: CreateTriggerProps): TriggerShape => {
-  const functionTrigger = live(FunctionTrigger, {
+  const functionTrigger = Trigger.make({
     enabled: true,
     spec: createTriggerSpec(props),
   });
   return createShape<TriggerShape>({
     type: 'trigger',
     functionTrigger: Ref.make(functionTrigger),
-    size: { width: 192, height: getHeight(EmailTriggerOutput) },
+    size: { width: 192, height: getHeight(TriggerEvent.EmailEvent) },
     ...props,
   });
 };
@@ -65,15 +52,15 @@ 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) => {
+  const setKind = (kind: Trigger.Kind) => {
     if (functionTrigger?.spec?.kind !== kind) {
       functionTrigger!.spec = createTriggerSpec({ triggerKind: kind, spaceId: space?.id });
     }
@@ -87,7 +74,7 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
     <FunctionBody
       shape={shape}
       status={
-        <TriggerKindSelect value={functionTrigger.spec?.kind} onValueChange={(kind) => setKind(kind as TriggerKind)} />
+        <TriggerKindSelect value={functionTrigger.spec?.kind} onValueChange={(kind) => setKind(kind as Trigger.Kind)} />
       }
       inputSchema={VoidInput}
       outputSchema={getOutputSchema(functionTrigger.spec!.kind!)}
@@ -99,12 +86,12 @@ 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='is-full !pli-0' />
       <Select.Portal>
         <Select.Content>
           <Select.ScrollUpButton />
           <Select.Viewport>
-            {Object.values(TriggerKind).map((kind) => (
+            {Trigger.Kinds.map((kind) => (
               <Select.Option key={kind} value={kind}>
                 {kind}
               </Select.Option>
@@ -118,31 +105,36 @@ const TriggerKindSelect = ({ value, onValueChange }: Pick<SelectRootProps, 'valu
   );
 };
 
-const createTriggerSpec = (props: { triggerKind?: TriggerKind; spaceId?: SpaceId }): TriggerType => {
-  const kind = props.triggerKind ?? TriggerKind.Email;
+const createTriggerSpec = (props: { triggerKind?: Trigger.Kind; spaceId?: SpaceId }): Trigger.Spec => {
+  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 Trigger.TimerSpec;
+    case 'webhook':
+      return { kind: 'webhook', method: 'POST' } satisfies Trigger.WebhookSpec;
+    case 'subscription':
+      return {
+        kind: 'subscription',
+        query: {
+          ast: Query.select(Filter.nothing()).ast,
+        },
+      } satisfies Trigger.SubscriptionSpec;
+    case 'email':
+      return { kind: 'email' } satisfies Trigger.EmailSpec;
+    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 Trigger.QueueSpec;
     }
   }
 };
 
-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,
+const getOutputSchema = (kind: Trigger.Kind) => {
+  const kindToSchema: Record<Trigger.Kind, Schema.Schema<any>> = {
+    ['email']: TriggerEvent.EmailEvent,
+    ['subscription']: TriggerEvent.SubscriptionEvent,
+    ['timer']: TriggerEvent.TimerEvent,
+    ['webhook']: TriggerEvent.WebhookEvent,
+    ['queue']: TriggerEvent.QueueEvent,
   };
   return kindToSchema[kind];
 };
@@ -154,9 +146,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';
@@ -32,10 +32,10 @@ export const Box = forwardRef<HTMLDivElement, BoxProps>(
     const { debug } = useEditorContext();
 
     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 ref={forwardedRef} className='flex flex-col bs-full is-full justify-between'>
+        <div className='flex shrink-0 is-full justify-between items-center bs-[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'
@@ -50,9 +50,9 @@ 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='grow px-2 text-sm truncate'>{debug ? shape.id : status}</div>
+        <div className={mx('flex flex-col bs-full grow overflow-hidden', classNames)}>{children}</div>
+        <div className='flex shrink-0 is-full justify-between items-center bs-[32px] bg-hoverSurface'>
+          <div className='grow pli-2 text-sm truncate'>{debug ? shape.id : status}</div>
           {openable && (
             <IconButton
               classNames='p-1'

package/src/shapes/common/FunctionBody.tsx

@@ -2,13 +2,14 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type Schema, SchemaAST } from 'effect';
+import type * as Schema from 'effect/Schema';
+import * as SchemaAST from 'effect/SchemaAST';
 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';
@@ -81,7 +82,7 @@ export const FunctionBody = ({
         {(inputs?.length ?? 0) > 0 && (
           <div className='flex flex-col'>
             {inputs?.map(({ name }) => (
-              <div key={name} className='px-2 truncate text-sm font-mono items-center' style={{ height: rowHeight }}>
+              <div key={name} className='pli-2 truncate text-sm font-mono items-center' style={{ height: rowHeight }}>
                 {name}
               </div>
             ))}
@@ -92,7 +93,7 @@ export const FunctionBody = ({
             {outputs?.map(({ name }) => (
               <div
                 key={name}
-                className='px-2 truncate text-sm font-mono items-center text-right'
+                className='pli-2 truncate text-sm font-mono items-center text-right'
                 style={{ height: rowHeight }}
               >
                 {name}

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='is-full !pli-0' />
       <Select.Portal>
         <Select.Content>
           <Select.ScrollUpButton />

package/src/shapes/defs.ts

@@ -2,10 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema, SchemaAST } from 'effect';
+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-schema';
+import { ObjectId } from '@dxos/echo/internal';
 import { Polygon } from '@dxos/react-ui-canvas-editor';
 import { type MakeOptional } from '@dxos/util';
 

package/src/testing/circuits.ts

@@ -2,9 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import { createSystemPrompt } from '@dxos/artifact';
-import { ObjectId } from '@dxos/echo-schema';
-import type { ServiceContainer } from '@dxos/functions';
+import { createSystemPrompt } from '@dxos/assistant';
+import { ObjectId } from '@dxos/echo/internal';
+import { type ServiceContainer } from '@dxos/functions-runtime';
 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 }),
         }),
       );