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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-canvas-compute",
-  "version": "0.8.4-main.a4bbb77",
+  "version": "0.8.4-main.ae835ea",
   "description": "A compute graph extension for the canvas editor component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -29,62 +29,61 @@
     "@effect/platform": "0.92.1",
     "@preact-signals/safe-react": "^0.9.0",
     "chess.js": "^1.0.0",
-    "@dxos/ai": "0.8.4-main.a4bbb77",
-    "@dxos/app-framework": "0.8.4-main.a4bbb77",
-    "@dxos/assistant": "0.8.4-main.a4bbb77",
-    "@dxos/async": "0.8.4-main.a4bbb77",
-    "@dxos/blueprints": "0.8.4-main.a4bbb77",
-    "@dxos/conductor": "0.8.4-main.a4bbb77",
-    "@dxos/context": "0.8.4-main.a4bbb77",
-    "@dxos/echo": "0.8.4-main.a4bbb77",
-    "@dxos/echo-schema": "0.8.4-main.a4bbb77",
-    "@dxos/edge-client": "0.8.4-main.a4bbb77",
-    "@dxos/functions": "0.8.4-main.a4bbb77",
-    "@dxos/graph": "0.8.4-main.a4bbb77",
-    "@dxos/debug": "0.8.4-main.a4bbb77",
-    "@dxos/invariant": "0.8.4-main.a4bbb77",
-    "@dxos/keys": "0.8.4-main.a4bbb77",
-    "@dxos/react-edge-client": "0.8.4-main.a4bbb77",
-    "@dxos/log": "0.8.4-main.a4bbb77",
-    "@dxos/react-client": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-attention": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-canvas": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-editor": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-form": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-sfx": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-stack": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.a4bbb77",
-    "@dxos/schema": "0.8.4-main.a4bbb77",
-    "@dxos/util": "0.8.4-main.a4bbb77",
-    "@dxos/live-object": "0.8.4-main.a4bbb77"
+    "@dxos/ai": "0.8.4-main.ae835ea",
+    "@dxos/app-framework": "0.8.4-main.ae835ea",
+    "@dxos/async": "0.8.4-main.ae835ea",
+    "@dxos/assistant": "0.8.4-main.ae835ea",
+    "@dxos/conductor": "0.8.4-main.ae835ea",
+    "@dxos/debug": "0.8.4-main.ae835ea",
+    "@dxos/context": "0.8.4-main.ae835ea",
+    "@dxos/echo": "0.8.4-main.ae835ea",
+    "@dxos/edge-client": "0.8.4-main.ae835ea",
+    "@dxos/functions": "0.8.4-main.ae835ea",
+    "@dxos/invariant": "0.8.4-main.ae835ea",
+    "@dxos/graph": "0.8.4-main.ae835ea",
+    "@dxos/keys": "0.8.4-main.ae835ea",
+    "@dxos/live-object": "0.8.4-main.ae835ea",
+    "@dxos/log": "0.8.4-main.ae835ea",
+    "@dxos/blueprints": "0.8.4-main.ae835ea",
+    "@dxos/react-client": "0.8.4-main.ae835ea",
+    "@dxos/react-edge-client": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-attention": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-canvas": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-editor": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-form": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-sfx": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.ae835ea",
+    "@dxos/schema": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-stack": "0.8.4-main.ae835ea",
+    "@dxos/util": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.ae835ea"
   },
   "devDependencies": {
     "@effect/ai": "0.29.1",
     "@effect/experimental": "0.56.0",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@types/react": "~19.2.0",
-    "@types/react-dom": "~19.2.0",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
     "effect": "3.18.3",
     "lodash.defaultsdeep": "^4.6.1",
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "vite": "7.1.9",
-    "@dxos/app-framework": "0.8.4-main.a4bbb77",
-    "@dxos/assistant-testing": "0.8.4-main.a4bbb77",
-    "@dxos/compute": "0.8.4-main.a4bbb77",
-    "@dxos/random": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui": "0.8.4-main.a4bbb77",
-    "@dxos/echo-signals": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77",
-    "@dxos/storybook-utils": "0.8.4-main.a4bbb77"
+    "@dxos/app-framework": "0.8.4-main.ae835ea",
+    "@dxos/assistant-toolkit": "0.8.4-main.ae835ea",
+    "@dxos/random": "0.8.4-main.ae835ea",
+    "@dxos/react-ui": "0.8.4-main.ae835ea",
+    "@dxos/compute": "0.8.4-main.ae835ea",
+    "@dxos/storybook-utils": "0.8.4-main.ae835ea",
+    "@dxos/echo-signals": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-theme": "0.8.4-main.ae835ea"
   },
   "peerDependencies": {
     "effect": "^3.13.3",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77"
+    "@dxos/react-ui-theme": "0.8.4-main.ae835ea",
+    "@dxos/react-ui": "0.8.4-main.ae835ea"
   },
   "publishConfig": {
     "access": "public"

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

@@ -6,7 +6,7 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { type PropsWithChildren, useEffect, useMemo, useRef, useState } from 'react';
 
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { capabilities } from '@dxos/assistant-testing';
+import { capabilities } from '@dxos/assistant-toolkit';
 import { type ComputeGraphModel, type ComputeNode, type GraphDiagnostic } from '@dxos/conductor';
 import { ServiceContainer } from '@dxos/functions';
 import { withClientProvider } from '@dxos/react-client/testing';
@@ -142,7 +142,7 @@ 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.Portal>

package/src/graph/controller.ts

@@ -2,7 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type Context, Effect, Either, Exit, Scope } from 'effect';
+import type * as Context from 'effect/Context';
+import * as Effect from 'effect/Effect';
+import * as Either from 'effect/Either';
+import * as Exit from 'effect/Exit';
+import * as Scope from 'effect/Scope';
 
 import { Event, synchronized } from '@dxos/async';
 import {
@@ -154,7 +158,14 @@ export class ComputeGraphController extends Resource {
   /**
    * Inputs and outputs for all nodes.
    */
-  get state() {
+  get state(): Record<
+    string,
+    {
+      node: ComputeNode;
+      input: Record<string, RuntimeValue>;
+      output: Record<string, RuntimeValue>;
+    }
+  > {
     const ids = [...new Set([...Object.keys(this._runtimeStateInputs), ...Object.keys(this._runtimeStateOutputs)])];
     return Object.fromEntries(
       ids.map((id) => [

package/src/graph/node-defs.ts

@@ -12,7 +12,7 @@ import {
   registry,
 } from '@dxos/conductor';
 import { raise } from '@dxos/debug';
-import { ObjectId, toJsonSchema } from '@dxos/echo-schema';
+import { ObjectId, toJsonSchema } from '@dxos/echo/internal';
 import { invariant } from '@dxos/invariant';
 
 import { type ComputeShape, type ConstantShape, type TemplateShape } from '../shapes';

package/src/hooks/useComputeNodeState.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import { useCallback, useEffect, useState } from 'react';
 
 import type { ComputeMeta, ComputeNode } from '@dxos/conductor';

package/src/hooks/useGraphMonitor.ts

@@ -5,7 +5,7 @@
 import { useMemo } from 'react';
 
 import { type ComputeEdge, ComputeGraphModel, type ComputeNode, DEFAULT_INPUT, DEFAULT_OUTPUT } from '@dxos/conductor';
-import { ObjectId, Ref } from '@dxos/echo-schema';
+import { ObjectId, Ref } from '@dxos/echo/internal';
 import { invariant } from '@dxos/invariant';
 import { getSpace } from '@dxos/react-client/echo';
 import { type CanvasGraphModel, type Connection, type GraphMonitor } from '@dxos/react-ui-canvas-editor';

package/src/json.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import { describe, test } from 'vitest';
 
 import { BaseGraphEdge, BaseGraphNode } from '@dxos/graph';

package/src/schema.test.ts

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import { describe, test } from 'vitest';
 
-import { live } from '@dxos/client/echo';
+import { live } from '@dxos/echo/internal';
 import { BaseGraphNode, Graph } from '@dxos/graph';
 import {
   Polygon,

package/src/shapes/Append.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React from 'react';
 
 import { AppendInput } from '@dxos/conductor';

package/src/shapes/Array.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React from 'react';
 
 import { ReducerInput, ReducerOutput } from '@dxos/conductor';

package/src/shapes/Audio.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { useEffect, useState } from 'react';
 
 import { Icon } from '@dxos/react-ui';

package/src/shapes/Beacon.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React from 'react';
 
 import { DEFAULT_INPUT, isTruthy } from '@dxos/conductor';

package/src/shapes/Boolean.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { type FC } from 'react';
 
 import { type ShapeDef, getAnchorPoints } from '@dxos/react-ui-canvas-editor';

package/src/shapes/Chat.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { useRef } from 'react';
 
 import { DEFAULT_OUTPUT } from '@dxos/conductor';

package/src/shapes/Constant.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { useCallback, useRef, useState } from 'react';
 
 import { ComputeValueType } from '@dxos/conductor';

package/src/shapes/Database.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React from 'react';
 
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';

package/src/shapes/Function.tsx

@@ -2,12 +2,12 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { useCallback, useRef } from 'react';
 
 import { AnyOutput, FunctionInput } from '@dxos/conductor';
-import { Ref, getSnapshot, isInstanceOf } from '@dxos/echo-schema';
-import { FunctionType, ScriptType } from '@dxos/functions';
+import { Ref, getSnapshot, isInstanceOf } from '@dxos/echo/internal';
+import { Function, Script } from '@dxos/functions';
 import { useClient } from '@dxos/react-client';
 import { Filter, parseId } from '@dxos/react-client/echo';
 import {
@@ -58,13 +58,13 @@ const TextInputComponent = ({ shape, title, ...props }: TextInputComponentProps)
 
       const space = client.spaces.get(spaceId);
       const object = space?.db.getObjectById(objectId);
-      if (!space || !isInstanceOf(ScriptType, object)) {
+      if (!space || !isInstanceOf(Script.Script, object)) {
         return;
       }
 
       const {
         objects: [fn],
-      } = await space.db.query(Filter.type(FunctionType, { source: Ref.make(object) })).run();
+      } = await space.db.query(Filter.type(Function.Function, { source: Ref.make(object) })).run();
       if (!fn) {
         return;
       }

package/src/shapes/Gpt.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { useEffect, useState } from 'react';
 
 import { GptInput, GptOutput } from '@dxos/conductor';

package/src/shapes/GptRealtime.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { useState } from 'react';
 
 import { log } from '@dxos/log';

package/src/shapes/Json.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React from 'react';
 
 import { DEFAULT_INPUT, DefaultOutput, JsonTransformInput } from '@dxos/conductor';

package/src/shapes/Logic.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React from 'react';
 
 import { IfElseInput, IfElseOutput, IfInput, IfOutput } from '@dxos/conductor';

package/src/shapes/Queue.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { Fragment } from 'react';
 
 import { DEFAULT_OUTPUT, QueueInput, QueueOutput } from '@dxos/conductor';

package/src/shapes/RNG.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { useEffect, useState } from 'react';
 
 import { DEFAULT_OUTPUT } from '@dxos/conductor';

package/src/shapes/Scope.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React from 'react';
 
 import { DEFAULT_INPUT } from '@dxos/conductor';

package/src/shapes/Surface.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React from 'react';
 
 import { Surface } from '@dxos/app-framework';

package/src/shapes/Switch.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { useEffect, useState } from 'react';
 
 import { DEFAULT_OUTPUT } from '@dxos/conductor';

package/src/shapes/Table.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React from 'react';
 
 import { createInputSchema, createOutputSchema } from '@dxos/conductor';

package/src/shapes/Template.tsx

@@ -2,11 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { useRef } from 'react';
 
 import { ComputeValueType, TemplateOutput, VoidInput, getTemplateInputSchema } from '@dxos/conductor';
-import { toJsonSchema } from '@dxos/echo-schema';
+import { toJsonSchema } from '@dxos/echo/internal';
 import { invariant } from '@dxos/invariant';
 import {
   type ShapeComponentProps,

package/src/shapes/Text.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React from 'react';
 
 import { DEFAULT_INPUT } from '@dxos/conductor';

package/src/shapes/TextToImage.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React from 'react';
 
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';

package/src/shapes/Thread.tsx

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 import React, { useEffect, useRef } from 'react';
 
 import { createInputSchema, createOutputSchema } from '@dxos/conductor';

package/src/shapes/Trigger.tsx

@@ -2,28 +2,13 @@
 // 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 { 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,
-  TimerTriggerOutput,
-  type TriggerKind,
-  TriggerKinds,
-  type TriggerType,
-  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 { useSpace } from '@dxos/react-client/echo';
 import { Select, type SelectRootProps } from '@dxos/react-ui';
@@ -36,25 +21,25 @@ 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 = Obj.make(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,
   });
 };
@@ -75,7 +60,7 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
     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 });
     }
@@ -89,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!)}
@@ -106,7 +91,7 @@ const TriggerKindSelect = ({ value, onValueChange }: Pick<SelectRootProps, 'valu
         <Select.Content>
           <Select.ScrollUpButton />
           <Select.Viewport>
-            {TriggerKinds.map((kind) => (
+            {Trigger.Kinds.map((kind) => (
               <Select.Option key={kind} value={kind}>
                 {kind}
               </Select.Option>
@@ -120,31 +105,36 @@ const TriggerKindSelect = ({ value, onValueChange }: Pick<SelectRootProps, 'valu
   );
 };
 
-const createTriggerSpec = (props: { triggerKind?: TriggerKind; spaceId?: SpaceId }): TriggerType => {
+const createTriggerSpec = (props: { triggerKind?: Trigger.Kind; spaceId?: SpaceId }): Trigger.Spec => {
   const kind = props.triggerKind ?? 'email';
   switch (kind) {
     case 'timer':
-      return { kind: 'timer', cron: '*/10 * * * * *' } satisfies TimerTrigger;
+      return { kind: 'timer', cron: '*/10 * * * * *' } satisfies Trigger.TimerSpec;
     case 'webhook':
-      return { kind: 'webhook', method: 'POST' } satisfies WebhookTrigger;
+      return { kind: 'webhook', method: 'POST' } satisfies Trigger.WebhookSpec;
     case 'subscription':
-      return { kind: 'subscription', query: Query.select(Filter.nothing()).ast } satisfies SubscriptionTrigger;
+      return {
+        kind: 'subscription',
+        query: {
+          ast: Query.select(Filter.nothing()).ast,
+        },
+      } satisfies Trigger.SubscriptionSpec;
     case 'email':
-      return { kind: 'email' } satisfies EmailTrigger;
+      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: 'queue', queue: dxn } satisfies QueueTrigger;
+      return { kind: 'queue', queue: dxn } satisfies Trigger.QueueSpec;
     }
   }
 };
 
-const getOutputSchema = (kind: TriggerKind) => {
-  const kindToSchema: Record<TriggerKind, Schema.Schema<any>> = {
-    ['email']: EmailTriggerOutput,
-    ['subscription']: SubscriptionTriggerOutput,
-    ['timer']: TimerTriggerOutput,
-    ['webhook']: WebhookTriggerOutput,
-    ['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];
 };

package/src/shapes/common/FunctionBody.tsx

@@ -2,7 +2,8 @@
 // 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';