@dxos/react-ui-canvas-compute 0.8.4-main.b97322e → 0.8.4-main.c4373fc

package/dist/lib/browser/index.mjs

@@ -1,94 +1,21 @@
 import "@dxos/node-std/globals";
 
 // src/graph/controller.ts
-import { Effect, Either, Exit, Scope } from "effect";
+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 { GraphExecutor, ValueBag, isNotExecuted } from "@dxos/conductor";
 import { Resource } from "@dxos/context";
 import { log } from "@dxos/log";
 
-// src/graph/node-defs.ts
-import { NODE_INPUT, NODE_OUTPUT, registry, getTemplateInputSchema } from "@dxos/conductor";
-import { raise } from "@dxos/debug";
-import { ObjectId, toJsonSchema } from "@dxos/echo-schema";
-import { invariant } from "@dxos/invariant";
-var __dxlog_file = "/__w/dxos/dxos/packages/ui/react-ui-canvas-compute/src/graph/node-defs.ts";
-var resolveComputeNode = async (node) => {
-  const impl = registry[node.type];
-  invariant(impl, `Unknown node type: ${node.type}`, {
-    F: __dxlog_file,
-    L: 22,
-    S: void 0,
-    A: [
-      "impl",
-      "`Unknown node type: ${node.type}`"
-    ]
-  });
-  return impl;
-};
-var isValidComputeNode = (type) => {
-  return nodeFactory[type] !== void 0;
-};
-var createComputeNode = (shape) => {
-  const type = shape.type ?? raise(new Error("Type not specified"));
-  const factory = nodeFactory[type] ?? raise(new Error(`Unknown shape type: ${type}`));
-  return factory(shape);
-};
-var nodeFactory = {
-  // System.
-  [NODE_INPUT]: () => createNode(NODE_INPUT),
-  [NODE_OUTPUT]: () => createNode(NODE_OUTPUT),
-  // Extensions.
-  ["text-to-image"]: () => createNode("text-to-image"),
-  ["and"]: () => createNode("and"),
-  ["append"]: () => createNode("append"),
-  ["audio"]: () => createNode("audio"),
-  ["beacon"]: () => createNode("beacon"),
-  ["chat"]: () => createNode("chat"),
-  ["constant"]: (shape) => createNode("constant", {
-    value: shape.value
-  }),
-  ["make-queue"]: () => createNode("make-queue"),
-  ["database"]: () => createNode("database"),
-  ["gpt"]: () => createNode("gpt"),
-  ["gpt-realtime"]: () => createNode("gpt-realtime"),
-  ["if"]: () => createNode("if"),
-  ["if-else"]: () => createNode("if-else"),
-  ["function"]: () => createNode("function"),
-  ["json"]: () => createNode("json"),
-  ["json-transform"]: () => createNode("json-transform"),
-  ["not"]: () => createNode("not"),
-  ["or"]: () => createNode("or"),
-  ["queue"]: () => createNode("queue"),
-  ["rng"]: () => createNode("rng"),
-  ["reducer"]: () => createNode("reducer"),
-  ["scope"]: () => createNode("scope"),
-  ["surface"]: () => createNode("surface"),
-  ["switch"]: () => createNode("switch"),
-  ["template"]: (shape) => {
-    const node = createNode("template", {
-      valueType: shape.valueType,
-      value: shape.text
-    });
-    node.inputSchema = toJsonSchema(getTemplateInputSchema(node));
-    return node;
-  },
-  ["text"]: () => createNode("text"),
-  ["thread"]: () => createNode("thread"),
-  ["trigger"]: () => createNode(NODE_INPUT)
-};
-var createNode = (type, props) => ({
-  id: ObjectId.random(),
-  type,
-  ...props
-});
-
 // src/hooks/compute-context.ts
 import { createContext, useContext } from "react";
-import { raise as raise2 } from "@dxos/debug";
+import { raise } from "@dxos/debug";
 var ComputeContext = createContext(null);
 var useComputeContext = () => {
-  return useContext(ComputeContext) ?? raise2(new Error("Missing ComputeContext"));
+  return useContext(ComputeContext) ?? raise(new Error("Missing ComputeContext"));
 };
 
 // src/hooks/useComputeGraphController.ts
@@ -142,15 +69,15 @@ var useComputeGraphController = ({ controller, graph, editorRef }) => {
 };
 
 // src/hooks/useComputeNodeState.ts
-import { Schema } from "effect";
+import * as Schema from "effect/Schema";
 import { useCallback, useEffect as useEffect2, useState as useState2 } from "react";
-import { invariant as invariant2 } from "@dxos/invariant";
-var __dxlog_file2 = "/__w/dxos/dxos/packages/ui/react-ui-canvas-compute/src/hooks/useComputeNodeState.ts";
+import { invariant } from "@dxos/invariant";
+var __dxlog_file = "/__w/dxos/dxos/packages/ui/react-ui-canvas-compute/src/hooks/useComputeNodeState.ts";
 var useComputeNodeState = (shape) => {
   const { controller } = useComputeContext();
-  invariant2(controller, void 0, {
-    F: __dxlog_file2,
-    L: 32,
+  invariant(controller, void 0, {
+    F: __dxlog_file,
+    L: 34,
     S: void 0,
     A: [
       "controller",
@@ -161,9 +88,9 @@ var useComputeNodeState = (shape) => {
   useEffect2(() => {
     let disposed = false;
     queueMicrotask(async () => {
-      invariant2(shape.node, "Node not specified", {
-        F: __dxlog_file2,
-        L: 38,
+      invariant(shape.node, "Node not specified", {
+        F: __dxlog_file,
+        L: 40,
         S: void 0,
         A: [
           "shape.node",
@@ -218,16 +145,16 @@ var useComputeNodeState = (shape) => {
 // src/hooks/useGraphMonitor.ts
 import { useMemo } from "react";
 import { ComputeGraphModel, DEFAULT_INPUT, DEFAULT_OUTPUT } from "@dxos/conductor";
-import { ObjectId as ObjectId2, Ref } from "@dxos/echo-schema";
-import { invariant as invariant3 } from "@dxos/invariant";
+import { ObjectId, Ref } from "@dxos/echo/internal";
+import { invariant as invariant2 } from "@dxos/invariant";
 import { getSpace } from "@dxos/react-client/echo";
 import { isNonNullable } from "@dxos/util";
-var __dxlog_file3 = "/__w/dxos/dxos/packages/ui/react-ui-canvas-compute/src/hooks/useGraphMonitor.ts";
+var __dxlog_file2 = "/__w/dxos/dxos/packages/ui/react-ui-canvas-compute/src/hooks/useGraphMonitor.ts";
 var mapEdge = (graph, { source, target, output = DEFAULT_OUTPUT, input = DEFAULT_INPUT }) => {
   const sourceNode = graph.findNode(source);
   const targetNode = graph.findNode(target);
-  invariant3(sourceNode?.node, void 0, {
-    F: __dxlog_file3,
+  invariant2(sourceNode?.node, void 0, {
+    F: __dxlog_file2,
     L: 26,
     S: void 0,
     A: [
@@ -235,8 +162,8 @@ var mapEdge = (graph, { source, target, output = DEFAULT_OUTPUT, input = DEFAULT
       ""
     ]
   });
-  invariant3(targetNode?.node, void 0, {
-    F: __dxlog_file3,
+  invariant2(targetNode?.node, void 0, {
+    F: __dxlog_file2,
     L: 27,
     S: void 0,
     A: [
@@ -245,7 +172,7 @@ var mapEdge = (graph, { source, target, output = DEFAULT_OUTPUT, input = DEFAULT
     ]
   });
   return {
-    id: ObjectId2.random(),
+    id: ObjectId.random(),
     source: sourceNode.node,
     target: targetNode.node,
     output,
@@ -259,8 +186,8 @@ var useGraphMonitor = (model) => {
         if (!model) {
           return;
         }
-        invariant3(node.type, void 0, {
-          F: __dxlog_file3,
+        invariant2(node.type, void 0, {
+          F: __dxlog_file2,
           L: 52,
           S: void 0,
           A: [
@@ -317,8 +244,8 @@ var createComputeGraph = (graph) => {
 };
 var linkTriggerToCompute = (graph, computeNode, triggerData) => {
   const functionTrigger = triggerData.functionTrigger?.target;
-  invariant3(functionTrigger, void 0, {
-    F: __dxlog_file3,
+  invariant2(functionTrigger, void 0, {
+    F: __dxlog_file2,
     L: 115,
     S: void 0,
     A: [
@@ -342,7 +269,96 @@ var deleteTriggerObjects = (computeGraph, deleted) => {
   }
 };
 
+// src/graph/node-defs.ts
+import { NODE_INPUT, NODE_OUTPUT, getTemplateInputSchema, registry } from "@dxos/conductor";
+import { raise as raise2 } from "@dxos/debug";
+import { ObjectId as ObjectId2, toJsonSchema } from "@dxos/echo/internal";
+import { invariant as invariant3 } from "@dxos/invariant";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/ui/react-ui-canvas-compute/src/graph/node-defs.ts";
+var resolveComputeNode = async (node) => {
+  const impl = registry[node.type];
+  invariant3(impl, `Unknown node type: ${node.type}`, {
+    F: __dxlog_file3,
+    L: 22,
+    S: void 0,
+    A: [
+      "impl",
+      "`Unknown node type: ${node.type}`"
+    ]
+  });
+  return impl;
+};
+var isValidComputeNode = (type) => {
+  return nodeFactory[type] !== void 0;
+};
+var createComputeNode = (shape) => {
+  const type = shape.type ?? raise2(new Error("Type not specified"));
+  const factory = nodeFactory[type] ?? raise2(new Error(`Unknown shape type: ${type}`));
+  return factory(shape);
+};
+var nodeFactory = {
+  // System.
+  [NODE_INPUT]: () => createNode(NODE_INPUT),
+  [NODE_OUTPUT]: () => createNode(NODE_OUTPUT),
+  // Extensions.
+  ["text-to-image"]: () => createNode("text-to-image"),
+  ["and"]: () => createNode("and"),
+  ["append"]: () => createNode("append"),
+  ["audio"]: () => createNode("audio"),
+  ["beacon"]: () => createNode("beacon"),
+  ["chat"]: () => createNode("chat"),
+  ["constant"]: (shape) => createNode("constant", {
+    value: shape.value
+  }),
+  ["make-queue"]: () => createNode("make-queue"),
+  ["database"]: () => createNode("database"),
+  ["gpt"]: () => createNode("gpt"),
+  ["gpt-realtime"]: () => createNode("gpt-realtime"),
+  ["if"]: () => createNode("if"),
+  ["if-else"]: () => createNode("if-else"),
+  ["function"]: () => createNode("function"),
+  ["json"]: () => createNode("json"),
+  ["json-transform"]: () => createNode("json-transform"),
+  ["not"]: () => createNode("not"),
+  ["or"]: () => createNode("or"),
+  ["queue"]: () => createNode("queue"),
+  ["rng"]: () => createNode("rng"),
+  ["reducer"]: () => createNode("reducer"),
+  ["scope"]: () => createNode("scope"),
+  ["surface"]: () => createNode("surface"),
+  ["switch"]: () => createNode("switch"),
+  ["template"]: (shape) => {
+    const node = createNode("template", {
+      valueType: shape.valueType,
+      value: shape.text
+    });
+    node.inputSchema = toJsonSchema(getTemplateInputSchema(node));
+    return node;
+  },
+  ["text"]: () => createNode("text"),
+  ["thread"]: () => createNode("thread"),
+  ["trigger"]: () => createNode(NODE_INPUT)
+};
+var createNode = (type, props) => ({
+  id: ObjectId2.random(),
+  type,
+  ...props
+});
+
 // src/graph/controller.ts
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -365,11 +381,6 @@ var createComputeGraphController = (graph, serviceContainer) => {
   };
 };
 var ComputeGraphController = class extends Resource {
-  constructor(_serviceContainer, _graph) {
-    super(), this._serviceContainer = _serviceContainer, this._graph = _graph, this._executor = new GraphExecutor({
-      computeNodeResolver: (node) => resolveComputeNode(node)
-    }), this._diagnostics = [], this._forcedOutputs = {}, this._runtimeStateInputs = {}, this._runtimeStateOutputs = {}, this.update = new Event(), this.output = new Event(), this.events = new Event();
-  }
   toJSON() {
     return {
       graph: this._graph,
@@ -430,7 +441,8 @@ var ComputeGraphController = class extends Resource {
     return this._runtimeStateOutputs[nodeId] ?? {};
   }
   setOutput(nodeId, property, value) {
-    this._forcedOutputs[nodeId] ??= {};
+    var _this__forcedOutputs, _nodeId;
+    (_this__forcedOutputs = this._forcedOutputs)[_nodeId = nodeId] ?? (_this__forcedOutputs[_nodeId] = {});
     this._forcedOutputs[nodeId][property] = value;
     queueMicrotask(async () => {
       try {
@@ -438,7 +450,7 @@ var ComputeGraphController = class extends Resource {
       } catch (err) {
         log.catch(err, void 0, {
           F: __dxlog_file4,
-          L: 199,
+          L: 203,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -532,7 +544,7 @@ var ComputeGraphController = class extends Resource {
       event
     }, {
       F: __dxlog_file4,
-      L: 335,
+      L: 339,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -555,11 +567,13 @@ var ComputeGraphController = class extends Resource {
     this.events.emit(event);
   }
   _onInputComputed(nodeId, property, value) {
-    this._runtimeStateInputs[nodeId] ??= {};
+    var _this__runtimeStateInputs, _nodeId;
+    (_this__runtimeStateInputs = this._runtimeStateInputs)[_nodeId = nodeId] ?? (_this__runtimeStateInputs[_nodeId] = {});
     this._runtimeStateInputs[nodeId][property] = value;
   }
   _onOutputComputed(nodeId, property, value) {
-    this._runtimeStateOutputs[nodeId] ??= {};
+    var _this__runtimeStateOutputs, _nodeId;
+    (_this__runtimeStateOutputs = this._runtimeStateOutputs)[_nodeId = nodeId] ?? (_this__runtimeStateOutputs[_nodeId] = {});
     this._runtimeStateOutputs[nodeId][property] = value;
     this.output.emit({
       nodeId,
@@ -567,6 +581,19 @@ var ComputeGraphController = class extends Resource {
       value
     });
   }
+  constructor(_serviceContainer, _graph) {
+    super(), _define_property(this, "_serviceContainer", void 0), _define_property(this, "_graph", void 0), _define_property(this, "_executor", void 0), _define_property(this, "_diagnostics", void 0), /**
+    * Canvas force-sets outputs of those nodes.
+    */
+    _define_property(this, "_forcedOutputs", void 0), /**
+    * Runtime state of the execution graph.
+    */
+    _define_property(this, "_runtimeStateInputs", void 0), _define_property(this, "_runtimeStateOutputs", void 0), // TODO(burdon): Remove? Make state reactive?
+    _define_property(this, "update", void 0), /** Computed result. */
+    _define_property(this, "output", void 0), _define_property(this, "events", void 0), this._serviceContainer = _serviceContainer, this._graph = _graph, this._executor = new GraphExecutor({
+      computeNodeResolver: (node) => resolveComputeNode(node)
+    }), this._diagnostics = [], this._forcedOutputs = {}, this._runtimeStateInputs = {}, this._runtimeStateOutputs = {}, this.update = new Event(), this.output = new Event(), this.events = new Event();
+  }
 };
 _ts_decorate([
   synchronized
@@ -681,16 +708,17 @@ var Box = /* @__PURE__ */ forwardRef(({ children, classNames, shape, title, stat
 
 // src/shapes/common/FunctionBody.tsx
 import { useSignals as _useSignals2 } from "@preact-signals/safe-react/tracking";
-import { SchemaAST as SchemaAST2 } from "effect";
+import * as SchemaAST2 from "effect/SchemaAST";
 import React2, { useRef, useState as useState3 } from "react";
 import { VoidInput, VoidOutput } from "@dxos/conductor";
 import { useCanvasContext } from "@dxos/react-ui-canvas";
-import { getParentShapeElement, createAnchors, rowHeight } from "@dxos/react-ui-canvas-editor";
+import { createAnchors, getParentShapeElement, rowHeight } from "@dxos/react-ui-canvas-editor";
 
 // src/shapes/defs.ts
-import { Schema as Schema2, SchemaAST } from "effect";
+import * as Schema2 from "effect/Schema";
+import * as SchemaAST from "effect/SchemaAST";
 import { DEFAULT_INPUT as DEFAULT_INPUT2, DEFAULT_OUTPUT as DEFAULT_OUTPUT2 } from "@dxos/conductor";
-import { ObjectId as ObjectId3 } from "@dxos/echo-schema";
+import { ObjectId as ObjectId3 } from "@dxos/echo/internal";
 import { Polygon } from "@dxos/react-ui-canvas-editor";
 var getProperties = (ast) => SchemaAST.getPropertySignatures(ast).map(({ name }) => ({
   name: name.toString()
@@ -831,7 +859,7 @@ var TypeSelect = ({ value, onValueChange }) => {
 
 // src/shapes/Array.tsx
 import { useSignals as _useSignals4 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema3 } from "effect";
+import * as Schema3 from "effect/Schema";
 import React4 from "react";
 import { ReducerInput, ReducerOutput } from "@dxos/conductor";
 var ReducerShape = Schema3.extend(ComputeShape, Schema3.Struct({
@@ -868,7 +896,7 @@ var reducerShape = {
 
 // src/shapes/Append.tsx
 import { useSignals as _useSignals5 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema4 } from "effect";
+import * as Schema4 from "effect/Schema";
 import React5 from "react";
 import { AppendInput } from "@dxos/conductor";
 var AppendShape = Schema4.extend(ComputeShape, Schema4.Struct({
@@ -904,7 +932,7 @@ var appendShape = {
 
 // src/shapes/Audio.tsx
 import { useSignals as _useSignals6 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema5 } from "effect";
+import * as Schema5 from "effect/Schema";
 import React6, { useEffect as useEffect3, useState as useState4 } from "react";
 import { Icon as Icon2 } from "@dxos/react-ui";
 import { createAnchorMap } from "@dxos/react-ui-canvas-editor";
@@ -960,7 +988,7 @@ var audioShape = {
 
 // src/shapes/Beacon.tsx
 import { useSignals as _useSignals7 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema6 } from "effect";
+import * as Schema6 from "effect/Schema";
 import React7 from "react";
 import { DEFAULT_INPUT as DEFAULT_INPUT3, isTruthy } from "@dxos/conductor";
 import { Icon as Icon3 } from "@dxos/react-ui";
@@ -1011,7 +1039,7 @@ var beaconShape = {
 };
 
 // src/shapes/Boolean.tsx
-import { Schema as Schema7 } from "effect";
+import * as Schema7 from "effect/Schema";
 import React8 from "react";
 import { getAnchorPoints } from "@dxos/react-ui-canvas-editor";
 import { createAnchors as createAnchors2 } from "@dxos/react-ui-canvas-editor";
@@ -1185,7 +1213,7 @@ var notShape = defineShape({
 
 // src/shapes/Chat.tsx
 import { useSignals as _useSignals8 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema8 } from "effect";
+import * as Schema8 from "effect/Schema";
 import React9, { useRef as useRef2 } from "react";
 import { DEFAULT_OUTPUT as DEFAULT_OUTPUT3 } from "@dxos/conductor";
 import { TextBox } from "@dxos/react-ui-canvas-editor";
@@ -1246,7 +1274,7 @@ var chatShape = {
 
 // src/shapes/Constant.tsx
 import { useSignals as _useSignals9 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema9 } from "effect";
+import * as Schema9 from "effect/Schema";
 import React10, { useCallback as useCallback2, useRef as useRef3, useState as useState5 } from "react";
 import { ComputeValueType as ComputeValueType2 } from "@dxos/conductor";
 import { Input } from "@dxos/react-ui";
@@ -1349,7 +1377,7 @@ var constantShape = {
 
 // src/shapes/Database.tsx
 import { useSignals as _useSignals10 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema10 } from "effect";
+import * as Schema10 from "effect/Schema";
 import React11 from "react";
 import { createAnchorMap as createAnchorMap5 } from "@dxos/react-ui-canvas-editor";
 var DatabaseShape = Schema10.extend(ComputeShape, Schema10.Struct({
@@ -1389,10 +1417,10 @@ var databaseShape = {
 
 // src/shapes/Function.tsx
 import { useSignals as _useSignals11 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema11 } from "effect";
+import * as Schema11 from "effect/Schema";
 import React12, { useCallback as useCallback3, useRef as useRef4 } from "react";
 import { AnyOutput, FunctionInput } from "@dxos/conductor";
-import { getSnapshot, isInstanceOf, Ref as Ref2 } from "@dxos/echo-schema";
+import { Ref as Ref2, getSnapshot, isInstanceOf } from "@dxos/echo/internal";
 import { FunctionType, ScriptType } from "@dxos/functions";
 import { useClient } from "@dxos/react-client";
 import { Filter, parseId } from "@dxos/react-client/echo";
@@ -1474,7 +1502,7 @@ var functionShape = {
 
 // src/shapes/Gpt.tsx
 import { useSignals as _useSignals12 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema12 } from "effect";
+import * as Schema12 from "effect/Schema";
 import React13, { useEffect as useEffect4, useState as useState6 } from "react";
 import { GptInput, GptOutput } from "@dxos/conductor";
 var GptShape = Schema12.extend(ComputeShape, Schema12.Struct({
@@ -1550,7 +1578,7 @@ var gptShape = {
 
 // src/shapes/Json.tsx
 import { useSignals as _useSignals13 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema13 } from "effect";
+import * as Schema13 from "effect/Schema";
 import React14 from "react";
 import { DEFAULT_INPUT as DEFAULT_INPUT4, DefaultOutput, JsonTransformInput } from "@dxos/conductor";
 import { createAnchorMap as createAnchorMap6 } from "@dxos/react-ui-canvas-editor";
@@ -1633,7 +1661,7 @@ var jsonTransformShape = {
 
 // src/shapes/Logic.tsx
 import { useSignals as _useSignals14 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema14 } from "effect";
+import * as Schema14 from "effect/Schema";
 import React15 from "react";
 import { IfElseInput, IfElseOutput, IfInput, IfOutput } from "@dxos/conductor";
 var IfShape = Schema14.extend(ComputeShape, Schema14.Struct({
@@ -1701,7 +1729,7 @@ var ifElseShape = {
 
 // src/shapes/Queue.tsx
 import { useSignals as _useSignals15 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema15 } from "effect";
+import * as Schema15 from "effect/Schema";
 import React16, { Fragment } from "react";
 import { DEFAULT_OUTPUT as DEFAULT_OUTPUT4, QueueInput, QueueOutput } from "@dxos/conductor";
 import { mx as mx2 } from "@dxos/react-ui-theme";
@@ -1774,7 +1802,7 @@ var queueShape = {
 
 // src/shapes/RNG.tsx
 import { useSignals as _useSignals16 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema16 } from "effect";
+import * as Schema16 from "effect/Schema";
 import React17, { useEffect as useEffect5, useState as useState7 } from "react";
 import { DEFAULT_OUTPUT as DEFAULT_OUTPUT5 } from "@dxos/conductor";
 import { Icon as Icon4 } from "@dxos/react-ui";
@@ -1855,11 +1883,11 @@ var randomShape = {
 
 // src/shapes/Scope.tsx
 import { useSignals as _useSignals17 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema17 } from "effect";
+import * as Schema17 from "effect/Schema";
 import React18 from "react";
 import { DEFAULT_INPUT as DEFAULT_INPUT5 } from "@dxos/conductor";
 import { createAnchorMap as createAnchorMap8 } from "@dxos/react-ui-canvas-editor";
-import { useAudioStream, Chaos, shaderPresets } from "@dxos/react-ui-sfx";
+import { Chaos, shaderPresets, useAudioStream } from "@dxos/react-ui-sfx";
 var ScopeShape = Schema17.extend(ComputeShape, Schema17.Struct({
   type: Schema17.Literal("scope")
 }));
@@ -1909,7 +1937,7 @@ var scopeShape = {
 
 // src/shapes/Surface.tsx
 import { useSignals as _useSignals18 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema18 } from "effect";
+import * as Schema18 from "effect/Schema";
 import React19 from "react";
 import { Surface } from "@dxos/app-framework";
 import { DEFAULT_INPUT as DEFAULT_INPUT6 } from "@dxos/conductor";
@@ -1967,7 +1995,7 @@ var surfaceShape = {
 
 // src/shapes/Switch.tsx
 import { useSignals as _useSignals19 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema19 } from "effect";
+import * as Schema19 from "effect/Schema";
 import React20, { useEffect as useEffect6, useState as useState8 } from "react";
 import { DEFAULT_OUTPUT as DEFAULT_OUTPUT6 } from "@dxos/conductor";
 import { Input as Input2 } from "@dxos/react-ui";
@@ -2020,7 +2048,7 @@ var switchShape = {
 
 // src/shapes/Table.tsx
 import { useSignals as _useSignals20 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema20 } from "effect";
+import * as Schema20 from "effect/Schema";
 import React21 from "react";
 import { createInputSchema, createOutputSchema } from "@dxos/conductor";
 import { DataType } from "@dxos/schema";
@@ -2059,10 +2087,10 @@ var tableShape = {
 
 // src/shapes/Template.tsx
 import { useSignals as _useSignals21 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema21 } from "effect";
+import * as Schema21 from "effect/Schema";
 import React22, { useRef as useRef5 } from "react";
-import { ComputeValueType as ComputeValueType3, getTemplateInputSchema as getTemplateInputSchema2, TemplateOutput, VoidInput as VoidInput2 } from "@dxos/conductor";
-import { toJsonSchema as toJsonSchema2 } from "@dxos/echo-schema";
+import { ComputeValueType as ComputeValueType3, TemplateOutput, VoidInput as VoidInput2, getTemplateInputSchema as getTemplateInputSchema2 } from "@dxos/conductor";
+import { toJsonSchema as toJsonSchema2 } from "@dxos/echo/internal";
 import { invariant as invariant5 } from "@dxos/invariant";
 import { TextBox as TextBox4 } from "@dxos/react-ui-canvas-editor";
 var __dxlog_file6 = "/__w/dxos/dxos/packages/ui/react-ui-canvas-compute/src/shapes/Template.tsx";
@@ -2086,7 +2114,7 @@ var TextInputComponent3 = ({ shape, title, ...props }) => {
     const handleTypeChange = (newType) => {
       invariant5(Schema21.is(ComputeValueType3)(newType), "Invalid type", {
         F: __dxlog_file6,
-        L: 58,
+        L: 59,
         S: void 0,
         A: [
           "Schema.is(ComputeValueType)(newType)",
@@ -2138,7 +2166,7 @@ var templateShape = {
 
 // src/shapes/Text.tsx
 import { useSignals as _useSignals22 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema22 } from "effect";
+import * as Schema22 from "effect/Schema";
 import React23 from "react";
 import { DEFAULT_INPUT as DEFAULT_INPUT7 } from "@dxos/conductor";
 import { TextBox as TextBox5 } from "@dxos/react-ui-canvas-editor";
@@ -2192,7 +2220,7 @@ var textShape = {
 
 // src/shapes/Thread.tsx
 import { useSignals as _useSignals23 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema23 } from "effect";
+import * as Schema23 from "effect/Schema";
 import React24, { useEffect as useEffect7, useRef as useRef6 } from "react";
 import { createInputSchema as createInputSchema2, createOutputSchema as createOutputSchema2 } from "@dxos/conductor";
 import { mx as mx3 } from "@dxos/react-ui-theme";
@@ -2267,7 +2295,7 @@ var threadShape = {
 
 // src/shapes/TextToImage.tsx
 import { useSignals as _useSignals24 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema24 } from "effect";
+import * as Schema24 from "effect/Schema";
 import React25 from "react";
 import { createAnchorMap as createAnchorMap12 } from "@dxos/react-ui-canvas-editor";
 var TextToImageShape = Schema24.extend(ComputeShape, Schema24.Struct({
@@ -2307,20 +2335,21 @@ var textToImageShape = {
 
 // src/shapes/Trigger.tsx
 import { useSignals as _useSignals25 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema25 } from "effect";
+import * as Schema25 from "effect/Schema";
 import React26, { useEffect as useEffect8 } from "react";
 import { VoidInput as VoidInput3 } from "@dxos/conductor";
-import { ObjectId as ObjectId4, Ref as Ref3 } from "@dxos/echo-schema";
-import { EmailTriggerOutput, FunctionTrigger, QueueTriggerOutput, TriggerKind, SubscriptionTriggerOutput, TimerTriggerOutput, WebhookTriggerOutput } from "@dxos/functions";
+import { Filter as Filter2, Obj, Query } from "@dxos/echo";
+import { ObjectId as ObjectId4, Ref as Ref3 } from "@dxos/echo/internal";
+import { EmailTriggerOutput, FunctionTrigger, QueueTriggerOutput, SubscriptionTriggerOutput, TimerTriggerOutput, TriggerKinds, WebhookTriggerOutput } 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 as Select2 } from "@dxos/react-ui";
 var TriggerShape = Schema25.extend(ComputeShape, Schema25.Struct({
   type: Schema25.Literal("trigger"),
   functionTrigger: Schema25.optional(Ref3(FunctionTrigger))
 }));
 var createTrigger = (props) => {
-  const functionTrigger = live(FunctionTrigger, {
+  const functionTrigger = Obj.make(FunctionTrigger, {
     enabled: true,
     spec: createTriggerSpec(props)
   });
@@ -2342,7 +2371,7 @@ var TriggerComponent = ({ shape }) => {
     useEffect8(() => {
       if (functionTrigger && !functionTrigger.spec) {
         functionTrigger.spec = createTriggerSpec({
-          triggerKind: TriggerKind.Email,
+          triggerKind: "email",
           spaceId: space?.id
         });
       }
@@ -2351,7 +2380,7 @@ var TriggerComponent = ({ shape }) => {
       functionTrigger?.spec
     ]);
     useEffect8(() => {
-      shape.size.height = getHeight(getOutputSchema(functionTrigger?.spec?.kind ?? TriggerKind.Email));
+      shape.size.height = getHeight(getOutputSchema(functionTrigger?.spec?.kind ?? "email"));
     }, [
       functionTrigger?.spec?.kind
     ]);
@@ -2388,7 +2417,7 @@ var TriggerKindSelect = ({ value, onValueChange }) => {
     }, /* @__PURE__ */ React26.createElement(Select2.TriggerButton, {
       variant: "ghost",
       classNames: "w-full !px-0"
-    }), /* @__PURE__ */ React26.createElement(Select2.Portal, null, /* @__PURE__ */ React26.createElement(Select2.Content, null, /* @__PURE__ */ React26.createElement(Select2.ScrollUpButton, null), /* @__PURE__ */ React26.createElement(Select2.Viewport, null, Object.values(TriggerKind).map((kind) => /* @__PURE__ */ React26.createElement(Select2.Option, {
+    }), /* @__PURE__ */ React26.createElement(Select2.Portal, null, /* @__PURE__ */ React26.createElement(Select2.Content, null, /* @__PURE__ */ React26.createElement(Select2.ScrollUpButton, null), /* @__PURE__ */ React26.createElement(Select2.Viewport, null, TriggerKinds.map((kind) => /* @__PURE__ */ React26.createElement(Select2.Option, {
       key: kind,
       value: kind
     }, kind))), /* @__PURE__ */ React26.createElement(Select2.ScrollDownButton, null), /* @__PURE__ */ React26.createElement(Select2.Arrow, null))));
@@ -2397,35 +2426,38 @@ var TriggerKindSelect = ({ value, onValueChange }) => {
   }
 };
 var createTriggerSpec = (props) => {
-  const kind = props.triggerKind ?? TriggerKind.Email;
+  const kind = props.triggerKind ?? "email";
   switch (kind) {
-    case TriggerKind.Timer:
+    case "timer":
       return {
-        kind: TriggerKind.Timer,
+        kind: "timer",
         cron: "*/10 * * * * *"
       };
-    case TriggerKind.Webhook:
+    case "webhook":
       return {
-        kind: TriggerKind.Webhook,
+        kind: "webhook",
         method: "POST"
       };
-    case TriggerKind.Subscription:
+    case "subscription":
       return {
-        kind: TriggerKind.Subscription,
-        filter: {}
+        kind: "subscription",
+        query: {
+          string: "Query.select(Filter.nothing())",
+          ast: Query.select(Filter2.nothing()).ast
+        }
       };
-    case TriggerKind.Email:
+    case "email":
       return {
-        kind: TriggerKind.Email
+        kind: "email"
       };
-    case TriggerKind.Queue: {
+    case "queue": {
       const dxn = new DXN(DXN.kind.QUEUE, [
         "data",
         props.spaceId ?? SpaceId.random(),
         ObjectId4.random()
       ]).toString();
       return {
-        kind: TriggerKind.Queue,
+        kind: "queue",
         queue: dxn
       };
     }
@@ -2433,11 +2465,11 @@ var createTriggerSpec = (props) => {
 };
 var getOutputSchema = (kind) => {
   const kindToSchema = {
-    [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];
 };
@@ -2447,12 +2479,12 @@ var triggerShape = {
   icon: "ph--lightning--regular",
   component: TriggerComponent,
   createShape: createTrigger,
-  getAnchors: (shape) => createFunctionAnchors(shape, VoidInput3, getOutputSchema(shape.functionTrigger?.target?.spec?.kind ?? TriggerKind.Email))
+  getAnchors: (shape) => createFunctionAnchors(shape, VoidInput3, getOutputSchema(shape.functionTrigger?.target?.spec?.kind ?? "email"))
 };
 
 // src/shapes/GptRealtime.tsx
 import { useSignals as _useSignals26 } from "@preact-signals/safe-react/tracking";
-import { Schema as Schema26 } from "effect";
+import * as Schema26 from "effect/Schema";
 import React27, { useState as useState9 } from "react";
 import { log as log2 } from "@dxos/log";
 import { useConfig } from "@dxos/react-client";
@@ -2648,12 +2680,22 @@ var computeShapes = [
 
 // src/compute-layout.ts
 import { DefaultInput, DefaultOutput as DefaultOutput2 } from "@dxos/conductor";
-import { toEffectSchema } from "@dxos/echo-schema";
+import { toEffectSchema } from "@dxos/echo/internal";
 import { ShapeLayout } from "@dxos/react-ui-canvas-editor";
-var ComputeShapeLayout = class extends ShapeLayout {
-  constructor(_controller, registry2) {
-    super(registry2), this._controller = _controller;
+function _define_property2(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
   }
+  return obj;
+}
+var ComputeShapeLayout = class extends ShapeLayout {
   // TODO(burdon): Doesn't update.
   getAnchors(shape) {
     const shapeDef = this._registry.getShapeDef(shape.type);
@@ -2668,6 +2710,9 @@ var ComputeShapeLayout = class extends ShapeLayout {
     }
     return anchors;
   }
+  constructor(_controller, registry2) {
+    super(registry2), _define_property2(this, "_controller", void 0), this._controller = _controller;
+  }
 };
 export {
   AndShape,