@dxos/react-ui-canvas-compute 0.8.4-main.9be5663bfe → 0.8.4-main.abd8ff62ef

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-canvas-compute",
-  "version": "0.8.4-main.9be5663bfe",
+  "version": "0.8.4-main.abd8ff62ef",
   "description": "A compute graph extension for the canvas editor component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -20,9 +20,6 @@
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
@@ -32,38 +29,39 @@
     "@antv/layout": "^1.2.13",
     "@effect/platform": "0.94.4",
     "chess.js": "^1.0.0",
-    "@dxos/assistant": "0.8.4-main.9be5663bfe",
-    "@dxos/app-framework": "0.8.4-main.9be5663bfe",
-    "@dxos/async": "0.8.4-main.9be5663bfe",
-    "@dxos/conductor": "0.8.4-main.9be5663bfe",
-    "@dxos/context": "0.8.4-main.9be5663bfe",
-    "@dxos/blueprints": "0.8.4-main.9be5663bfe",
-    "@dxos/debug": "0.8.4-main.9be5663bfe",
-    "@dxos/echo": "0.8.4-main.9be5663bfe",
-    "@dxos/edge-client": "0.8.4-main.9be5663bfe",
-    "@dxos/effect": "0.8.4-main.9be5663bfe",
-    "@dxos/functions-runtime": "0.8.4-main.9be5663bfe",
-    "@dxos/graph": "0.8.4-main.9be5663bfe",
-    "@dxos/functions": "0.8.4-main.9be5663bfe",
-    "@dxos/keys": "0.8.4-main.9be5663bfe",
-    "@dxos/log": "0.8.4-main.9be5663bfe",
-    "@dxos/invariant": "0.8.4-main.9be5663bfe",
-    "@dxos/operation": "0.8.4-main.9be5663bfe",
-    "@dxos/react-client": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-attention": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-canvas": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-editor": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-mosaic": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-sfx": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-form": "0.8.4-main.9be5663bfe",
-    "@dxos/react-edge-client": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui-stack": "0.8.4-main.9be5663bfe",
-    "@dxos/schema": "0.8.4-main.9be5663bfe",
-    "@dxos/util": "0.8.4-main.9be5663bfe",
-    "@dxos/types": "0.8.4-main.9be5663bfe",
-    "@dxos/ai": "0.8.4-main.9be5663bfe"
+    "@dxos/ai": "0.8.4-main.abd8ff62ef",
+    "@dxos/app-framework": "0.8.4-main.abd8ff62ef",
+    "@dxos/app-toolkit": "0.8.4-main.abd8ff62ef",
+    "@dxos/assistant": "0.8.4-main.abd8ff62ef",
+    "@dxos/async": "0.8.4-main.abd8ff62ef",
+    "@dxos/compute": "0.8.4-main.abd8ff62ef",
+    "@dxos/conductor": "0.8.4-main.abd8ff62ef",
+    "@dxos/echo": "0.8.4-main.abd8ff62ef",
+    "@dxos/debug": "0.8.4-main.abd8ff62ef",
+    "@dxos/context": "0.8.4-main.abd8ff62ef",
+    "@dxos/effect": "0.8.4-main.abd8ff62ef",
+    "@dxos/echo-db": "0.8.4-main.abd8ff62ef",
+    "@dxos/edge-client": "0.8.4-main.abd8ff62ef",
+    "@dxos/functions-runtime": "0.8.4-main.abd8ff62ef",
+    "@dxos/functions": "0.8.4-main.abd8ff62ef",
+    "@dxos/invariant": "0.8.4-main.abd8ff62ef",
+    "@dxos/graph": "0.8.4-main.abd8ff62ef",
+    "@dxos/log": "0.8.4-main.abd8ff62ef",
+    "@dxos/keys": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-attention": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-client": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-canvas": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-editor": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-form": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-mosaic": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-sfx": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-edge-client": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.abd8ff62ef",
+    "@dxos/types": "0.8.4-main.abd8ff62ef",
+    "@dxos/util": "0.8.4-main.abd8ff62ef",
+    "@dxos/schema": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui-stack": "0.8.4-main.abd8ff62ef"
   },
   "devDependencies": {
     "@effect/ai": "0.33.2",
@@ -75,21 +73,20 @@
     "lodash.defaultsdeep": "^4.6.1",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/app-framework": "0.8.4-main.9be5663bfe",
-    "@dxos/assistant-toolkit": "0.8.4-main.9be5663bfe",
-    "@dxos/random": "0.8.4-main.9be5663bfe",
-    "@dxos/compute": "0.8.4-main.9be5663bfe",
-    "@dxos/react-ui": "0.8.4-main.9be5663bfe",
-    "@dxos/ui-theme": "0.8.4-main.9be5663bfe",
-    "@dxos/storybook-utils": "0.8.4-main.9be5663bfe"
+    "vite": "^8.0.10",
+    "@dxos/app-framework": "0.8.4-main.abd8ff62ef",
+    "@dxos/assistant-toolkit": "0.8.4-main.abd8ff62ef",
+    "@dxos/random": "0.8.4-main.abd8ff62ef",
+    "@dxos/react-ui": "0.8.4-main.abd8ff62ef",
+    "@dxos/storybook-utils": "0.8.4-main.abd8ff62ef",
+    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef"
   },
   "peerDependencies": {
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.9be5663bfe",
-    "@dxos/ui-theme": "0.8.4-main.9be5663bfe"
+    "@dxos/react-ui": "0.8.4-main.abd8ff62ef",
+    "@dxos/ui-theme": "0.8.4-main.abd8ff62ef"
   },
   "publishConfig": {
     "access": "public"

package/src/compute.stories.tsx

@@ -3,6 +3,7 @@
 //
 
 import { type Meta, type StoryObj } from '@storybook/react-vite';
+import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 import * as ManagedRuntime from 'effect/ManagedRuntime';
 import React, { type PropsWithChildren, useEffect, useMemo, useRef, useState } from 'react';
@@ -10,18 +11,18 @@ import React, { type PropsWithChildren, useEffect, useMemo, useRef, useState } f
 import { AiServiceTestingPreset } from '@dxos/ai/testing';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { capabilities } from '@dxos/assistant-toolkit/testing';
+import { Operation, OperationRegistry } from '@dxos/compute';
 import { type ComputeGraphModel, type ComputeNode, type GraphDiagnostic } from '@dxos/conductor';
 import { Feed } from '@dxos/echo';
-import { CredentialsService, TracingService } from '@dxos/functions';
-import { FunctionInvocationServiceLayerTest } from '@dxos/functions-runtime';
-import { TestDatabaseLayer } from '@dxos/functions-runtime/testing';
+import { TestDatabaseLayer } from '@dxos/echo-db/testing';
+import { configuredCredentialsLayer } from '@dxos/functions';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { Select, Toolbar } from '@dxos/react-ui';
 import { withAttention } from '@dxos/react-ui-attention/testing';
 import { Editor, type EditorController, type EditorRootProps, ShapeRegistry } from '@dxos/react-ui-canvas-editor';
 import { Container, useSelection } from '@dxos/react-ui-canvas-editor/testing';
 import { Form } from '@dxos/react-ui-form';
-import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { Syntax } from '@dxos/react-ui-syntax-highlighter';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
 import { DiagnosticOverlay } from './components';
@@ -178,12 +179,14 @@ const DefaultStory = ({
                 </Form.Viewport>
               </Form.Root>
             )}
-            <Json.Root data={json}>
-              <Json.Content>
-                <Json.Filter />
-                <Json.Data />
-              </Json.Content>
-            </Json.Root>
+            <Syntax.Root data={json}>
+              <Syntax.Content>
+                <Syntax.Filter />
+                <Syntax.Viewport>
+                  <Syntax.Code />
+                </Syntax.Viewport>
+              </Syntax.Content>
+            </Syntax.Root>
           </div>
         </Container>
       )}
@@ -221,13 +224,21 @@ export default meta;
 type Story = StoryObj<typeof meta>;
 
 const ServiceLayer = Layer.empty.pipe(
-  Layer.provideMerge(FunctionInvocationServiceLayerTest()),
+  Layer.provideMerge(
+    Layer.mergeAll(
+      Layer.succeed(Operation.Service, {
+        invoke: () => Effect.die('Operation.Service not available in test.'),
+        schedule: () => Effect.die('Operation.Service not available in test.'),
+        invokePromise: async () => ({ error: new Error('Not available') }),
+      } as any),
+      Layer.succeed(OperationRegistry.Service, { resolve: () => Effect.succeed(undefined) } as any),
+    ),
+  ),
   Layer.provideMerge(
     Layer.mergeAll(
       AiServiceTestingPreset('direct'),
       TestDatabaseLayer(),
-      CredentialsService.configuredLayer([]),
-      TracingService.layerNoop,
+      configuredCredentialsLayer([]),
       Feed.notAvailable,
     ),
   ),

package/src/graph/controller.ts

@@ -2,7 +2,6 @@
 // Copyright 2024 DXOS.org
 //
 
-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';
@@ -12,7 +11,14 @@ import * as Scope from 'effect/Scope';
 
 import type { AiService } from '@dxos/ai';
 import { Event, synchronized } from '@dxos/async';
+import { type Credential, type Operation, type OperationRegistry, Trace } from '@dxos/compute';
 import {
+  ComputeBeginEvent,
+  ComputeCustomEvent,
+  ComputeEndEvent,
+  ComputeInputEvent,
+  ComputeNodeContext,
+  ComputeOutputEvent,
   type ComputeEdge,
   type ComputeGraphModel,
   type ComputeNode,
@@ -27,15 +33,7 @@ import {
 import { Resource } from '@dxos/context';
 import type { Database, Feed } from '@dxos/echo';
 import { unwrapExit } from '@dxos/effect';
-import {
-  ComputeEventLogger,
-  type ComputeEventPayload,
-  type CredentialsService,
-  type FunctionInvocationService,
-  type QueueService,
-  Trace,
-  TracingService,
-} from '@dxos/functions';
+import { type QueueService } from '@dxos/functions';
 import { log } from '@dxos/log';
 import { type CanvasGraphModel } from '@dxos/react-ui-canvas-editor';
 import { type ContentBlock } from '@dxos/types';
@@ -83,14 +81,25 @@ type ComputeOutputEvent = {
   value: RuntimeValue;
 };
 
+/**
+ * Event emitted by the compute graph during execution.
+ */
+export type ComputeEvent =
+  | { type: 'begin-compute'; nodeId: string; inputs: ReadonlyArray<string> }
+  | { type: 'end-compute'; nodeId: string; outputs: ReadonlyArray<string> }
+  | { type: 'compute-input'; nodeId: string; property: string; value: any }
+  | { type: 'compute-output'; nodeId: string; property: string; value: any }
+  | { type: 'custom'; nodeId: string; event: any };
+
 // TODO(dmaretskyi): Re-use function servies definition.
 export type ComputeServices =
   | AiService.AiService
   | Database.Service
   | Feed.FeedService
   | QueueService
-  | CredentialsService
-  | FunctionInvocationService;
+  | Credential.CredentialsService
+  | Operation.Service
+  | OperationRegistry.Service;
 
 /**
  * Nodes that will automatically trigger the execution of the graph on startup.
@@ -134,7 +143,7 @@ export class ComputeGraphController extends Resource {
   /** Computed result. */
   public readonly output = new Event<ComputeOutputEvent>();
 
-  public readonly events = new Event<ComputeEventPayload>();
+  public readonly events = new Event<ComputeEvent>();
 
   constructor(
     private readonly _computeRuntime: ManagedRuntime.ManagedRuntime<ComputeServices, never>,
@@ -265,9 +274,9 @@ export class ComputeGraphController extends Resource {
             Effect.withSpan('runGraph'),
             Scope.extend(scope),
             Effect.provide(
-              ComputeEventLogger.layerFromTracing.pipe(
-                Layer.provideMerge(TracingService.layerNoop), // TODO(dmaretskyi): Plug-in tracing events to visual feedback in the compute graph editor.
-                Layer.provideMerge(Trace.writerLayerNoop),
+              Layer.mergeAll(
+                Layer.succeed(Trace.TraceService, this._createTraceWriter()),
+                ComputeNodeContext.layerNoop,
               ),
             ),
             Effect.flatMap(computeValueBag),
@@ -333,9 +342,9 @@ export class ComputeGraphController extends Resource {
               Scope.extend(scope),
               Effect.flatMap(computeValueBag),
               Effect.provide(
-                ComputeEventLogger.layerFromTracing.pipe(
-                  Layer.provideMerge(TracingService.layerNoop), // TODO(dmaretskyi): Plug-in tracing events to visual feedback in the compute graph editor.
-                  Layer.provideMerge(Trace.writerLayerNoop),
+                Layer.mergeAll(
+                  Layer.succeed(Trace.TraceService, this._createTraceWriter()),
+                  ComputeNodeContext.layerNoop,
                 ),
               ),
 
@@ -366,16 +375,18 @@ export class ComputeGraphController extends Resource {
     this.update.emit();
   }
 
-  private _createLogger(): Context.Tag.Service<ComputeEventLogger> {
+  private _createTraceWriter(): Trace.TraceWriter {
     return {
-      log: (event) => {
-        this._handleEvent(event);
+      write: (eventType, payload) => {
+        const event = traceEventToComputeEvent(eventType.key, payload);
+        if (event) {
+          this._handleEvent(event);
+        }
       },
-      nodeId: undefined, // Not in a context of a specific node.
     };
   }
 
-  private _handleEvent(event: ComputeEventPayload): void {
+  private _handleEvent(event: ComputeEvent): void {
     log('handleEvent', { event });
     switch (event.type) {
       case 'compute-input': {
@@ -405,6 +416,23 @@ export class ComputeGraphController extends Resource {
   }
 }
 
+const traceEventToComputeEvent = (key: string, payload: unknown): ComputeEvent | undefined => {
+  switch (key) {
+    case ComputeBeginEvent.key:
+      return { type: 'begin-compute', ...(payload as { nodeId: string; inputs: ReadonlyArray<string> }) };
+    case ComputeEndEvent.key:
+      return { type: 'end-compute', ...(payload as { nodeId: string; outputs: ReadonlyArray<string> }) };
+    case ComputeInputEvent.key:
+      return { type: 'compute-input', ...(payload as { nodeId: string; property: string; value: any }) };
+    case ComputeOutputEvent.key:
+      return { type: 'compute-output', ...(payload as { nodeId: string; property: string; value: any }) };
+    case ComputeCustomEvent.key:
+      return { type: 'custom', ...(payload as { nodeId: string; event: any }) };
+    default:
+      return undefined;
+  }
+};
+
 /**
  * Waits for all effects in the bag to complete and returns the `RuntimeValue` for each property.
  */

package/src/hooks/useComputeNodeState.ts

@@ -6,10 +6,9 @@ import * as Schema from 'effect/Schema';
 import { useCallback, useEffect, useState } from 'react';
 
 import type { ComputeNode, ComputeNodeMeta } from '@dxos/conductor';
-import type { ComputeEventPayload } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
 
-import { type RuntimeValue } from '../graph';
+import { type ComputeEvent, type RuntimeValue } from '../graph';
 import { type ComputeShape } from '../shapes';
 import { useComputeContext } from './compute-context';
 
@@ -21,7 +20,7 @@ export type ComputeNodeState = {
     outputs: Record<string, RuntimeValue>;
     setOutput: (property: string, value: any) => void;
     evalNode: () => void;
-    subscribeToEventLog: (cb: (event: ComputeEventPayload) => void) => void;
+    subscribeToEventLog: (cb: (event: ComputeEvent) => void) => () => void;
   };
 };
 
@@ -56,7 +55,7 @@ export const useComputeNodeState = (shape: ComputeShape): ComputeNodeState => {
   }, [shape.node]);
 
   const subscribeToEventLog = useCallback(
-    (cb: (event: ComputeEventPayload) => void) => {
+    (cb: (event: ComputeEvent) => void): (() => void) => {
       return controller.events.on((ev) => {
         if (ev.nodeId === shape.node) {
           cb(ev);

package/src/hooks/useGraphMonitor.ts

@@ -112,7 +112,7 @@ export const createComputeGraph = (graph?: CanvasGraphModel<ComputeShape>) => {
 const linkTriggerToCompute = (graph: ComputeGraphModel, computeNode: ComputeNode, triggerData: TriggerShape) => {
   const functionTrigger = triggerData.functionTrigger?.target;
   invariant(functionTrigger);
-  Obj.change(functionTrigger, (functionTrigger) => {
+  Obj.update(functionTrigger, (functionTrigger) => {
     functionTrigger.function = Ref.make(graph.root);
     functionTrigger.inputNodeId = computeNode.id;
   });

package/src/shapes/Function.tsx

@@ -5,10 +5,10 @@
 import * as Schema from 'effect/Schema';
 import React, { useCallback, useRef } from 'react';
 
+import { Script } from '@dxos/compute';
+import { Operation } from '@dxos/compute';
 import { AnyOutput, FunctionInput } from '@dxos/conductor';
 import { Ref, getSnapshot, isInstanceOf } from '@dxos/echo/internal';
-import { Script } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 import { useClient } from '@dxos/react-client';
 import { Filter, parseId } from '@dxos/react-client/echo';
 import {

package/src/shapes/Json.tsx

@@ -8,7 +8,7 @@ import React from 'react';
 import { DEFAULT_INPUT, DefaultOutput, JsonTransformInput } from '@dxos/conductor';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
-import { Json } from '@dxos/react-ui-syntax-highlighter';
+import { Syntax } from '@dxos/react-ui-syntax-highlighter';
 
 import { useComputeNodeState } from '../hooks';
 import { Box, createFunctionAnchors, getHeight } from './common';
@@ -49,12 +49,14 @@ export const JsonComponent = ({ shape, ...props }: JsonComponentProps) => {
 
   return (
     <Box shape={shape}>
-      <Json.Root data={value}>
-        <Json.Content>
-          <Json.Filter />
-          <Json.Data classNames='text-xs' />
-        </Json.Content>
-      </Json.Root>
+      <Syntax.Root data={value}>
+        <Syntax.Content>
+          <Syntax.Filter />
+          <Syntax.Viewport>
+            <Syntax.Code classNames='text-xs' />
+          </Syntax.Viewport>
+        </Syntax.Content>
+      </Syntax.Root>
     </Box>
   );
 };

package/src/shapes/Surface.tsx

@@ -6,6 +6,7 @@ import * as Schema from 'effect/Schema';
 import React from 'react';
 
 import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
 import { DEFAULT_INPUT } from '@dxos/conductor';
 import { Card } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
@@ -47,7 +48,9 @@ export const SurfaceComponent = ({ shape }: ShapeComponentProps<SurfaceShape>) =
   // TODO(burdon): Subject property?
   return (
     <Box shape={shape} onAction={handleAction}>
-      <Card.Root>{value !== null && <Surface.Surface role='card--content' data={{ value }} limit={1} />}</Card.Root>
+      <Card.Root>
+        {value !== null && <Surface.Surface type={AppSurface.Card} data={{ subject: value }} limit={1} />}
+      </Card.Root>
     </Box>
   );
 };

package/src/shapes/Trigger.tsx

@@ -5,10 +5,10 @@
 import * as Schema from 'effect/Schema';
 import React, { useEffect } from 'react';
 
+import { Trigger, TriggerEvent } from '@dxos/compute';
 import { VoidInput } from '@dxos/conductor';
 import { Filter, Obj, Query, Ref } from '@dxos/echo';
 import { type Mutable } from '@dxos/echo/internal';
-import { Trigger, TriggerEvent } from '@dxos/functions';
 import { DXN, SpaceId } from '@dxos/keys';
 import { useSpaces } from '@dxos/react-client/echo';
 import { Select, type SelectRootProps } from '@dxos/react-ui';
@@ -53,7 +53,7 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
 
   useEffect(() => {
     if (functionTrigger && !functionTrigger.spec) {
-      Obj.change(functionTrigger, (functionTrigger) => {
+      Obj.update(functionTrigger, (functionTrigger) => {
         functionTrigger.spec = createTriggerSpec({ triggerKind: 'email', spaceId: space?.id }) as Mutable<Trigger.Spec>;
       });
     }
@@ -65,7 +65,7 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
 
   const setKind = (kind: Trigger.Kind) => {
     if (functionTrigger?.spec?.kind !== kind) {
-      Obj.change(functionTrigger!, (obj) => {
+      Obj.update(functionTrigger!, (obj) => {
         obj.spec = createTriggerSpec({ triggerKind: kind, spaceId: space?.id }) as Mutable<Trigger.Spec>;
       });
     }
@@ -114,21 +114,16 @@ const createTriggerSpec = (props: { triggerKind?: Trigger.Kind; spaceId?: SpaceI
   const kind = props.triggerKind ?? 'email';
   switch (kind) {
     case 'timer':
-      return { kind: 'timer', cron: '*/10 * * * * *' } satisfies Trigger.TimerSpec;
+      return Trigger.specTimer('*/10 * * * * *');
     case 'webhook':
-      return { kind: 'webhook', method: 'POST' } satisfies Trigger.WebhookSpec;
+      return Trigger.specWebhook({ method: 'POST' });
     case 'subscription':
-      return {
-        kind: 'subscription',
-        query: {
-          ast: Query.select(Filter.nothing()).ast,
-        },
-      } satisfies Trigger.SubscriptionSpec;
+      return Trigger.specSubscription(Query.select(Filter.nothing()));
     case 'email':
-      return { kind: 'email' } satisfies Trigger.EmailSpec;
+      return Trigger.specEmail();
     case 'queue': {
       const dxn = new DXN(DXN.kind.QUEUE, ['data', props.spaceId ?? SpaceId.random(), Obj.ID.random()]).toString();
-      return { kind: 'queue', queue: dxn } satisfies Trigger.QueueSpec;
+      return Trigger.specQueue(dxn);
     }
   }
 };