@dxos/react-ui-canvas-compute 0.8.2-main.2f9c567 → 0.8.2-main.36232bc

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-canvas-compute",
-  "version": "0.8.2-main.2f9c567",
+  "version": "0.8.2-main.36232bc",
   "description": "A compute graph extension for the canvas editor component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -24,34 +24,33 @@
     "@antv/layout": "^1.2.13",
     "@effect/platform": "0.75.1",
     "chess.js": "^1.0.0",
-    "@dxos/app-framework": "0.8.2-main.2f9c567",
-    "@dxos/artifact": "0.8.2-main.2f9c567",
-    "@dxos/assistant": "0.8.2-main.2f9c567",
-    "@dxos/async": "0.8.2-main.2f9c567",
-    "@dxos/context": "0.8.2-main.2f9c567",
-    "@dxos/debug": "0.8.2-main.2f9c567",
-    "@dxos/echo": "0.8.2-main.2f9c567",
-    "@dxos/echo-schema": "0.8.2-main.2f9c567",
-    "@dxos/edge-client": "0.8.2-main.2f9c567",
-    "@dxos/conductor": "0.8.2-main.2f9c567",
-    "@dxos/functions": "0.8.2-main.2f9c567",
-    "@dxos/graph": "0.8.2-main.2f9c567",
-    "@dxos/invariant": "0.8.2-main.2f9c567",
-    "@dxos/keys": "0.8.2-main.2f9c567",
-    "@dxos/live-object": "0.8.2-main.2f9c567",
-    "@dxos/log": "0.8.2-main.2f9c567",
-    "@dxos/react-client": "0.8.2-main.2f9c567",
-    "@dxos/react-edge-client": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-attention": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-canvas": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-editor": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-canvas-editor": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-form": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-sfx": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-stack": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.2f9c567",
-    "@dxos/util": "0.8.2-main.2f9c567",
-    "@dxos/schema": "0.8.2-main.2f9c567"
+    "@dxos/app-framework": "0.8.2-main.36232bc",
+    "@dxos/assistant": "0.8.2-main.36232bc",
+    "@dxos/artifact": "0.8.2-main.36232bc",
+    "@dxos/conductor": "0.8.2-main.36232bc",
+    "@dxos/context": "0.8.2-main.36232bc",
+    "@dxos/debug": "0.8.2-main.36232bc",
+    "@dxos/async": "0.8.2-main.36232bc",
+    "@dxos/echo-schema": "0.8.2-main.36232bc",
+    "@dxos/edge-client": "0.8.2-main.36232bc",
+    "@dxos/invariant": "0.8.2-main.36232bc",
+    "@dxos/keys": "0.8.2-main.36232bc",
+    "@dxos/graph": "0.8.2-main.36232bc",
+    "@dxos/live-object": "0.8.2-main.36232bc",
+    "@dxos/log": "0.8.2-main.36232bc",
+    "@dxos/functions": "0.8.2-main.36232bc",
+    "@dxos/react-client": "0.8.2-main.36232bc",
+    "@dxos/react-edge-client": "0.8.2-main.36232bc",
+    "@dxos/react-ui-attention": "0.8.2-main.36232bc",
+    "@dxos/react-ui-canvas-editor": "0.8.2-main.36232bc",
+    "@dxos/react-ui-editor": "0.8.2-main.36232bc",
+    "@dxos/react-ui-canvas": "0.8.2-main.36232bc",
+    "@dxos/react-ui-form": "0.8.2-main.36232bc",
+    "@dxos/react-ui-sfx": "0.8.2-main.36232bc",
+    "@dxos/react-ui-stack": "0.8.2-main.36232bc",
+    "@dxos/react-ui-syntax-highlighter": "0.8.2-main.36232bc",
+    "@dxos/util": "0.8.2-main.36232bc",
+    "@dxos/schema": "0.8.2-main.36232bc"
   },
   "devDependencies": {
     "@effect/ai": "0.8.0",
@@ -59,26 +58,26 @@
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.14.21",
+    "effect": "3.13.3",
     "lodash.defaultsdeep": "^4.6.1",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/artifact-testing": "0.8.2-main.2f9c567",
-    "@dxos/app-framework": "0.8.2-main.2f9c567",
-    "@dxos/compute": "0.8.2-main.2f9c567",
-    "@dxos/random": "0.8.2-main.2f9c567",
-    "@dxos/echo-signals": "0.8.2-main.2f9c567",
-    "@dxos/storybook-utils": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-theme": "0.8.2-main.2f9c567",
-    "@dxos/react-ui": "0.8.2-main.2f9c567"
+    "@dxos/app-framework": "0.8.2-main.36232bc",
+    "@dxos/artifact-testing": "0.8.2-main.36232bc",
+    "@dxos/random": "0.8.2-main.36232bc",
+    "@dxos/echo-signals": "0.8.2-main.36232bc",
+    "@dxos/compute": "0.8.2-main.36232bc",
+    "@dxos/react-ui": "0.8.2-main.36232bc",
+    "@dxos/storybook-utils": "0.8.2-main.36232bc",
+    "@dxos/react-ui-theme": "0.8.2-main.36232bc"
   },
   "peerDependencies": {
     "effect": "3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.2-main.2f9c567",
-    "@dxos/react-ui-theme": "0.8.2-main.2f9c567"
+    "@dxos/react-ui": "0.8.2-main.36232bc",
+    "@dxos/react-ui-theme": "0.8.2-main.36232bc"
   },
   "publishConfig": {
     "access": "public"

package/src/compute.stories.tsx

@@ -38,7 +38,7 @@ import {
   createArtifactCircuit,
 } from './testing';
 
-// const FormSchema = Schema.omit<any, any, ['subgraph']>('subgraph')(ComputeNode);
+// const FormSchema = S.omit<any, any, ['subgraph']>('subgraph')(ComputeNode);
 
 const sidebarTypes: NonNullable<RenderProps['sidebar']>[] = ['canvas', 'compute', 'controller', 'selected'] as const;
 

package/src/hooks/useComputeNodeState.ts

@@ -2,10 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
 import { useCallback, useEffect, useState } from 'react';
 
 import type { ComputeNode, ComputeMeta, ComputeEvent } from '@dxos/conductor';
+import { S } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 
 import { useComputeContext } from './compute-context';
@@ -67,8 +67,8 @@ export const useComputeNodeState = (shape: ComputeShape): ComputeNodeState => {
   return {
     node: controller.getComputeNode(shape.node!),
     meta: meta ?? {
-      input: Schema.Struct({}),
-      output: Schema.Struct({}),
+      input: S.Struct({}),
+      output: S.Struct({}),
     },
     runtime: {
       inputs: controller.getInputs(shape.node!),

package/src/hooks/useGraphMonitor.ts

@@ -5,8 +5,9 @@
 import { useMemo } from 'react';
 
 import { type ComputeEdge, ComputeGraphModel, type ComputeNode, DEFAULT_INPUT, DEFAULT_OUTPUT } from '@dxos/conductor';
-import { Type } from '@dxos/echo';
+import { ObjectId } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
+import { DXN } from '@dxos/keys';
 import { getSpace } from '@dxos/react-client/echo';
 import { type GraphMonitor, type CanvasGraphModel, type Connection } from '@dxos/react-ui-canvas-editor';
 import { isNonNullable } from '@dxos/util';
@@ -27,7 +28,7 @@ export const mapEdge = (
   invariant(targetNode?.node);
 
   return {
-    id: Type.ObjectId.random(),
+    id: ObjectId.random(),
     source: sourceNode.node,
     target: targetNode.node,
     output,
@@ -113,8 +114,9 @@ export const createComputeGraph = (graph?: CanvasGraphModel<ComputeShape>) => {
 const linkTriggerToCompute = (graph: ComputeGraphModel, computeNode: ComputeNode, triggerData: TriggerShape) => {
   const functionTrigger = triggerData.functionTrigger?.target;
   invariant(functionTrigger);
-  functionTrigger.function = Type.ref(graph.root);
-  functionTrigger.inputNodeId = computeNode.id;
+  functionTrigger.function = DXN.fromLocalObjectId(graph.root.id).toString();
+  functionTrigger.meta ??= {};
+  functionTrigger.meta.computeNodeId = computeNode.id;
 };
 
 const deleteTriggerObjects = (computeGraph: ComputeGraphModel, deleted: CanvasGraphModel) => {

package/src/json.test.ts

@@ -2,27 +2,27 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
 import { describe, test } from 'vitest';
 
+import { S } from '@dxos/echo-schema';
 import { BaseGraphEdge, BaseGraphNode } from '@dxos/graph';
 
 import { createGptCircuit } from './testing';
 
-export const Shape = Schema.extend(
+export const Shape = S.extend(
   BaseGraphNode,
-  Schema.Struct({
-    text: Schema.optional(Schema.String),
-    guide: Schema.optional(Schema.Boolean),
-    classNames: Schema.optional(Schema.String),
+  S.Struct({
+    text: S.optional(S.String),
+    guide: S.optional(S.Boolean),
+    classNames: S.optional(S.String),
   }),
 );
 
-export const Connection = Schema.extend(
+export const Connection = S.extend(
   BaseGraphEdge,
-  Schema.Struct({
-    input: Schema.optional(Schema.String),
-    output: Schema.optional(Schema.String),
+  S.Struct({
+    input: S.optional(S.String),
+    output: S.optional(S.String),
   }),
 );
 

package/src/schema.test.ts

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
 import { describe, test } from 'vitest';
 
 import { live } from '@dxos/client/echo';
+import { S } from '@dxos/echo-schema';
 import { BaseGraphNode, Graph } from '@dxos/graph';
 import {
   Polygon,
@@ -24,10 +24,10 @@ describe('compute', () => {
     // const model = CanvasGraphModel.create<ComputeShape>();
     const node = createSwitch({ id: 'x', center: { x: 0, y: 0 }, size: { width: 80, height: 80 } });
     console.log(JSON.stringify(node, null, 2));
-    expect(Schema.is(ComputeShape)(node)).toBe(true);
-    expect(Schema.is(Polygon)(node)).toBe(true);
-    expect(Schema.is(Shape)(node)).toBe(true);
-    expect(Schema.is(BaseGraphNode)(node)).toBe(true);
+    expect(S.is(ComputeShape)(node)).toBe(true);
+    expect(S.is(Polygon)(node)).toBe(true);
+    expect(S.is(Shape)(node)).toBe(true);
+    expect(S.is(BaseGraphNode)(node)).toBe(true);
 
     const graph = live(Graph, { nodes: [], edges: [] });
     graph.nodes.push(node); // Throws.

package/src/shapes/Append.tsx

@@ -2,23 +2,23 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
 import React from 'react';
 
 import { AppendInput } from '@dxos/conductor';
+import { S } from '@dxos/echo-schema';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
 import { createFunctionAnchors, FunctionBody, getHeight } from './common';
 import { ComputeShape, createShape, type CreateShapeProps } from './defs';
 
-export const AppendShape = Schema.extend(
+export const AppendShape = S.extend(
   ComputeShape,
-  Schema.Struct({
-    type: Schema.Literal('append'),
+  S.Struct({
+    type: S.Literal('append'),
   }),
 );
 
-export type AppendShape = Schema.Schema.Type<typeof AppendShape>;
+export type AppendShape = S.Schema.Type<typeof AppendShape>;
 
 export type CreateAppendProps = CreateShapeProps<AppendShape>;
 

package/src/shapes/Array.tsx

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
 import React from 'react';
 
 import { ReducerInput, ReducerOutput } from '@dxos/conductor';
+import { S } from '@dxos/echo-schema';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
 import { createFunctionAnchors, FunctionBody, getHeight } from './common';
@@ -15,14 +15,14 @@ import { ComputeShape, createShape, type CreateShapeProps } from './defs';
 // Data
 //
 
-export const ReducerShape = Schema.extend(
+export const ReducerShape = S.extend(
   ComputeShape,
-  Schema.Struct({
-    type: Schema.Literal('reducer'),
+  S.Struct({
+    type: S.Literal('reducer'),
   }),
 );
 
-export type ReducerShape = Schema.Schema.Type<typeof ReducerShape>;
+export type ReducerShape = S.Schema.Type<typeof ReducerShape>;
 
 //
 // Components

package/src/shapes/Audio.tsx

@@ -2,23 +2,23 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
 import React, { useEffect, useState } from 'react';
 
+import { S } from '@dxos/echo-schema';
 import { Icon } from '@dxos/react-ui';
 import { createAnchorMap, type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
 import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
-export const AudioShape = Schema.extend(
+export const AudioShape = S.extend(
   ComputeShape,
-  Schema.Struct({
-    type: Schema.Literal('audio'),
+  S.Struct({
+    type: S.Literal('audio'),
   }),
 );
 
-export type AudioShape = Schema.Schema.Type<typeof AudioShape>;
+export type AudioShape = S.Schema.Type<typeof AudioShape>;
 
 export type CreateAudioProps = CreateShapeProps<AudioShape>;
 

package/src/shapes/Beacon.tsx

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
 import React from 'react';
 
 import { DEFAULT_INPUT, isTruthy } from '@dxos/conductor';
+import { S } from '@dxos/echo-schema';
 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';
@@ -13,14 +13,14 @@ import { mx } from '@dxos/react-ui-theme';
 import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
-export const BeaconShape = Schema.extend(
+export const BeaconShape = S.extend(
   ComputeShape,
-  Schema.Struct({
-    type: Schema.Literal('beacon'),
+  S.Struct({
+    type: S.Literal('beacon'),
   }),
 );
 
-export type BeaconShape = Schema.Schema.Type<typeof BeaconShape>;
+export type BeaconShape = S.Schema.Type<typeof BeaconShape>;
 
 export type CreateBeaconProps = CreateShapeProps<BeaconShape>;
 

package/src/shapes/Boolean.tsx

@@ -2,9 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
 import React, { type FC } from 'react';
 
+import { S } from '@dxos/echo-schema';
 import { type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { createAnchors, getAnchorPoints } from '@dxos/react-ui-canvas-editor';
 
@@ -17,14 +17,14 @@ import { ComputeShape, createAnchorId, createShape, type CreateShapeProps } from
 
 type GateType = 'and' | 'or' | 'not';
 
-const GateShape = Schema.extend(
+const GateShape = S.extend(
   ComputeShape,
-  Schema.Struct({
-    type: Schema.String,
+  S.Struct({
+    type: S.String,
   }),
 );
 
-type GateShape = Schema.Schema.Type<typeof GateShape>;
+type GateShape = S.Schema.Type<typeof GateShape>;
 
 type CreateGateProps = CreateShapeProps<GateShape> & { type: GateType };
 

package/src/shapes/Chat.tsx

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
 import React, { useRef } from 'react';
 
 import { DEFAULT_OUTPUT } from '@dxos/conductor';
+import { S } from '@dxos/echo-schema';
 import {
   type ShapeComponentProps,
   type ShapeDef,
@@ -23,14 +23,14 @@ import { useComputeNodeState } from '../hooks';
 // Data
 //
 
-export const ChatShape = Schema.extend(
+export const ChatShape = S.extend(
   ComputeShape,
-  Schema.Struct({
-    type: Schema.Literal('chat'),
+  S.Struct({
+    type: S.Literal('chat'),
   }),
 );
 
-export type ChatShape = Schema.Schema.Type<typeof ChatShape>;
+export type ChatShape = S.Schema.Type<typeof ChatShape>;
 
 //
 // Component

package/src/shapes/Constant.tsx

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
 import React, { useCallback, useRef, useState } from 'react';
 
 import { ComputeValueType } from '@dxos/conductor';
+import { S } from '@dxos/echo-schema';
 import { Input } from '@dxos/react-ui';
 import {
   type ShapeComponentProps,
@@ -25,15 +25,15 @@ import { useComputeNodeState } from '../hooks';
 // Data
 //
 
-export const ConstantShape = Schema.extend(
+export const ConstantShape = S.extend(
   ComputeShape,
-  Schema.Struct({
-    type: Schema.Literal('constant'),
-    value: Schema.optional(Schema.Any),
+  S.Struct({
+    type: S.Literal('constant'),
+    value: S.optional(S.Any),
   }),
 );
 
-export type ConstantShape = Schema.Schema.Type<typeof ConstantShape>;
+export type ConstantShape = S.Schema.Type<typeof ConstantShape>;
 
 //
 // Component

package/src/shapes/Database.tsx

@@ -2,23 +2,23 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
 import React from 'react';
 
+import { S } from '@dxos/echo-schema';
 import { type ShapeComponentProps, type ShapeDef } 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';
 
-export const DatabaseShape = Schema.extend(
+export const DatabaseShape = S.extend(
   ComputeShape,
-  Schema.Struct({
-    type: Schema.Literal('database'),
+  S.Struct({
+    type: S.Literal('database'),
   }),
 );
 
-export type DatabaseShape = Schema.Schema.Type<typeof DatabaseShape>;
+export type DatabaseShape = S.Schema.Type<typeof DatabaseShape>;
 
 export type CreateDatabaseProps = CreateShapeProps<DatabaseShape>;
 

package/src/shapes/Function.tsx

@@ -2,12 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
 import React, { useCallback, useRef } from 'react';
 
 import { AnyOutput, FunctionInput } from '@dxos/conductor';
-import { getSnapshot, isInstanceOf } from '@dxos/echo-schema';
-import { FunctionType, ScriptType } from '@dxos/functions';
+import { getSnapshot, isInstanceOf, S } from '@dxos/echo-schema';
+import { FunctionType, ScriptType } from '@dxos/functions/types';
 import { useClient } from '@dxos/react-client';
 import { Filter, makeRef, parseId } from '@dxos/react-client/echo';
 import {
@@ -22,14 +21,14 @@ import { Box, createFunctionAnchors } from './common';
 import { ComputeShape, createShape, type CreateShapeProps } from './defs';
 import { useComputeNodeState } from '../hooks';
 
-export const FunctionShape = Schema.extend(
+export const FunctionShape = S.extend(
   ComputeShape,
-  Schema.Struct({
-    type: Schema.Literal('function'),
+  S.Struct({
+    type: S.Literal('function'),
   }),
 );
 
-export type FunctionShape = Schema.Schema.Type<typeof FunctionShape>;
+export type FunctionShape = S.Schema.Type<typeof FunctionShape>;
 
 export type CreateFunctionProps = CreateShapeProps<FunctionShape>;
 

package/src/shapes/Gpt.tsx

@@ -2,25 +2,25 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
 import React, { useEffect, useState } from 'react';
 
 import type { GenerationStreamEvent } from '@dxos/assistant';
 import { GptInput, GptOutput } from '@dxos/conductor';
+import { S } from '@dxos/echo-schema';
 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';
 
-export const GptShape = Schema.extend(
+export const GptShape = S.extend(
   ComputeShape,
-  Schema.Struct({
-    type: Schema.Literal('gpt'),
+  S.Struct({
+    type: S.Literal('gpt'),
   }),
 );
 
-export type GptShape = Schema.Schema.Type<typeof GptShape>;
+export type GptShape = S.Schema.Type<typeof GptShape>;
 
 export type CreateGptProps = CreateShapeProps<GptShape>;
 

package/src/shapes/GptRealtime.tsx

@@ -2,9 +2,9 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
 import React, { useState } from 'react';
 
+import { S } from '@dxos/echo-schema';
 import { log } from '@dxos/log';
 import { useConfig } from '@dxos/react-client';
 import { Icon } from '@dxos/react-ui';
@@ -13,14 +13,14 @@ import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-e
 import { createFunctionAnchors } from './common';
 import { ComputeShape, createShape, type CreateShapeProps } from './defs';
 
-export const GptRealtimeShape = Schema.extend(
+export const GptRealtimeShape = S.extend(
   ComputeShape,
-  Schema.Struct({
-    type: Schema.Literal('gpt-realtime'),
+  S.Struct({
+    type: S.Literal('gpt-realtime'),
   }),
 );
 
-export type GptRealtimeShape = Schema.Schema.Type<typeof GptRealtimeShape>;
+export type GptRealtimeShape = S.Schema.Type<typeof GptRealtimeShape>;
 
 export type CreateGptRealtimeProps = CreateShapeProps<GptRealtimeShape>;
 
@@ -164,10 +164,10 @@ export const gptRealtimeShape: ShapeDef<GptRealtimeShape> = {
   getAnchors: (shape) =>
     createFunctionAnchors(
       shape,
-      Schema.Struct({
-        audio: Schema.Any,
+      S.Struct({
+        audio: S.Any,
       }),
-      Schema.Struct({}),
+      S.Struct({}),
     ),
   resizable: true,
 };

package/src/shapes/Json.tsx

@@ -2,10 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
 import React from 'react';
 
 import { DEFAULT_INPUT, DefaultOutput, JsonTransformInput } from '@dxos/conductor';
+import { S } from '@dxos/echo-schema';
 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';
@@ -18,23 +18,23 @@ import { useComputeNodeState } from '../hooks';
 // Data
 //
 
-export const JsonShape = Schema.extend(
+export const JsonShape = S.extend(
   ComputeShape,
-  Schema.Struct({
-    type: Schema.Literal('json'),
+  S.Struct({
+    type: S.Literal('json'),
   }),
 );
 
-export type JsonShape = Schema.Schema.Type<typeof JsonShape>;
+export type JsonShape = S.Schema.Type<typeof JsonShape>;
 
-export const JsonTransformShape = Schema.extend(
+export const JsonTransformShape = S.extend(
   ComputeShape,
-  Schema.Struct({
-    type: Schema.Literal('json-transform'),
+  S.Struct({
+    type: S.Literal('json-transform'),
   }),
 );
 
-export type JsonTransformShape = Schema.Schema.Type<typeof JsonTransformShape>;
+export type JsonTransformShape = S.Schema.Type<typeof JsonTransformShape>;
 
 //
 // Component