@dxos/react-ui-canvas-compute 0.8.4-main.69d29f4 → 0.8.4-main.6fa680abb7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-canvas-compute",
-  "version": "0.8.4-main.69d29f4",
+  "version": "0.8.4-main.6fa680abb7",
   "description": "A compute graph extension for the canvas editor component.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -14,9 +14,9 @@
   "exports": {
     ".": {
       "source": "./src/index.ts",
-      "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
-      "node": "./dist/lib/node-esm/index.mjs"
+      "node": "./dist/lib/node-esm/index.mjs",
+      "types": "./dist/types/src/index.d.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -30,64 +30,65 @@
   "dependencies": {
     "@antv/graphlib": "^2.0.4",
     "@antv/layout": "^1.2.13",
-    "@effect/platform": "0.93.6",
+    "@effect/platform": "0.94.4",
     "chess.js": "^1.0.0",
-    "@dxos/ai": "0.8.4-main.69d29f4",
-    "@dxos/app-framework": "0.8.4-main.69d29f4",
-    "@dxos/assistant": "0.8.4-main.69d29f4",
-    "@dxos/async": "0.8.4-main.69d29f4",
-    "@dxos/blueprints": "0.8.4-main.69d29f4",
-    "@dxos/conductor": "0.8.4-main.69d29f4",
-    "@dxos/echo": "0.8.4-main.69d29f4",
-    "@dxos/debug": "0.8.4-main.69d29f4",
-    "@dxos/context": "0.8.4-main.69d29f4",
-    "@dxos/edge-client": "0.8.4-main.69d29f4",
-    "@dxos/effect": "0.8.4-main.69d29f4",
-    "@dxos/functions-runtime": "0.8.4-main.69d29f4",
-    "@dxos/functions": "0.8.4-main.69d29f4",
-    "@dxos/graph": "0.8.4-main.69d29f4",
-    "@dxos/keys": "0.8.4-main.69d29f4",
-    "@dxos/invariant": "0.8.4-main.69d29f4",
-    "@dxos/log": "0.8.4-main.69d29f4",
-    "@dxos/react-client": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-attention": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-canvas": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.69d29f4",
-    "@dxos/react-edge-client": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-editor": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-form": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-sfx": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-stack": "0.8.4-main.69d29f4",
-    "@dxos/util": "0.8.4-main.69d29f4",
-    "@dxos/types": "0.8.4-main.69d29f4",
-    "@dxos/schema": "0.8.4-main.69d29f4"
+    "@dxos/ai": "0.8.4-main.6fa680abb7",
+    "@dxos/assistant": "0.8.4-main.6fa680abb7",
+    "@dxos/async": "0.8.4-main.6fa680abb7",
+    "@dxos/app-framework": "0.8.4-main.6fa680abb7",
+    "@dxos/conductor": "0.8.4-main.6fa680abb7",
+    "@dxos/context": "0.8.4-main.6fa680abb7",
+    "@dxos/blueprints": "0.8.4-main.6fa680abb7",
+    "@dxos/debug": "0.8.4-main.6fa680abb7",
+    "@dxos/edge-client": "0.8.4-main.6fa680abb7",
+    "@dxos/effect": "0.8.4-main.6fa680abb7",
+    "@dxos/functions": "0.8.4-main.6fa680abb7",
+    "@dxos/echo": "0.8.4-main.6fa680abb7",
+    "@dxos/functions-runtime": "0.8.4-main.6fa680abb7",
+    "@dxos/graph": "0.8.4-main.6fa680abb7",
+    "@dxos/invariant": "0.8.4-main.6fa680abb7",
+    "@dxos/log": "0.8.4-main.6fa680abb7",
+    "@dxos/keys": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-attention": "0.8.4-main.6fa680abb7",
+    "@dxos/react-edge-client": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-canvas": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.6fa680abb7",
+    "@dxos/react-client": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-editor": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-form": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-stack": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-sfx": "0.8.4-main.6fa680abb7",
+    "@dxos/schema": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-mosaic": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.6fa680abb7",
+    "@dxos/types": "0.8.4-main.6fa680abb7",
+    "@dxos/util": "0.8.4-main.6fa680abb7"
   },
   "devDependencies": {
-    "@effect/ai": "0.32.1",
-    "@effect/experimental": "0.57.11",
+    "@effect/ai": "0.33.2",
+    "@effect/experimental": "0.58.0",
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.11",
+    "effect": "3.19.16",
     "lodash.defaultsdeep": "^4.6.1",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/app-framework": "0.8.4-main.69d29f4",
-    "@dxos/assistant-toolkit": "0.8.4-main.69d29f4",
-    "@dxos/random": "0.8.4-main.69d29f4",
-    "@dxos/storybook-utils": "0.8.4-main.69d29f4",
-    "@dxos/ui-theme": "0.8.4-main.69d29f4",
-    "@dxos/react-ui": "0.8.4-main.69d29f4",
-    "@dxos/compute": "0.8.4-main.69d29f4"
+    "vite": "^7.1.11",
+    "@dxos/app-framework": "0.8.4-main.6fa680abb7",
+    "@dxos/assistant-toolkit": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui": "0.8.4-main.6fa680abb7",
+    "@dxos/compute": "0.8.4-main.6fa680abb7",
+    "@dxos/ui-theme": "0.8.4-main.6fa680abb7",
+    "@dxos/storybook-utils": "0.8.4-main.6fa680abb7",
+    "@dxos/random": "0.8.4-main.6fa680abb7"
   },
   "peerDependencies": {
-    "effect": "3.19.11",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.8.4-main.69d29f4",
-    "@dxos/react-ui": "0.8.4-main.69d29f4"
+    "@dxos/react-ui": "0.8.4-main.6fa680abb7",
+    "@dxos/ui-theme": "0.8.4-main.6fa680abb7"
   },
   "publishConfig": {
     "access": "public"

package/src/README.md

@@ -42,6 +42,3 @@
       - logs associated with a node or a graph
       - node state updates (can a node have internal state separate from inputs/outputs)
       - timestep? - to correlate events that happen during a single execution time
-
-
-

package/src/compute.stories.tsx

@@ -11,12 +11,13 @@ import { AiServiceTestingPreset } from '@dxos/ai/testing';
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { capabilities } from '@dxos/assistant-toolkit/testing';
 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 { withClientProvider } from '@dxos/react-client/testing';
 import { Select, Toolbar } from '@dxos/react-ui';
-import { withTheme } from '@dxos/react-ui/testing';
+import { withLayout, withTheme } from '@dxos/react-ui/testing';
 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';
@@ -122,7 +123,7 @@ const DefaultStory = ({
   }
 
   return (
-    <div className='grid grid-cols-[1fr,360px] is-full bs-full'>
+    <div className='grid grid-cols-[1fr_360px] w-full h-full'>
       <ComputeContext.Provider value={{ controller }}>
         <Container id={id} classNames={['flex grow overflow-hidden', !sidebar && 'col-span-2']}>
           <Editor.Root<ComputeShape>
@@ -146,10 +147,10 @@ const DefaultStory = ({
       </ComputeContext.Provider>
 
       {sidebar && (
-        <Container id='sidebar' classNames='flex flex-col bs-full overflow-hidden'>
+        <Container id='sidebar' classNames='flex flex-col h-full overflow-hidden'>
           <Toolbar.Root>
             <Select.Root value={sidebar} onValueChange={(value) => setSidebar(value as RenderProps['sidebar'])}>
-              <Select.TriggerButton classNames='is-full'>{sidebar}</Select.TriggerButton>
+              <Select.TriggerButton classNames='w-full'>{sidebar}</Select.TriggerButton>
               <Select.Portal>
                 <Select.Content>
                   <Select.Viewport>
@@ -165,7 +166,7 @@ const DefaultStory = ({
             </Select.Root>
           </Toolbar.Root>
 
-          <div className='flex flex-col bs-full overflow-hidden divide-y divider-separator'>
+          <div className='flex flex-col h-full overflow-hidden divide-y divider-separator'>
             {/* TODO(burdon): Provide schema. */}
             {sidebar === 'selected' && selected && (
               <Form.Root<ComputeNode> values={getComputeNode(selected.id) ?? {}}>
@@ -190,8 +191,9 @@ const meta = {
   component: Editor.Root as any,
   render: DefaultStory,
   decorators: [
-    withTheme,
-    withAttention,
+    withTheme(),
+    withLayout({ layout: 'fullscreen' }),
+    withAttention(),
     withClientProvider({ createIdentity: true, createSpace: true }),
     withPluginManager({ capabilities }),
   ],
@@ -221,6 +223,7 @@ const ServiceLayer = Layer.empty.pipe(
       TestDatabaseLayer(),
       CredentialsService.configuredLayer([]),
       TracingService.layerNoop,
+      Feed.notAvailable,
     ),
   ),
   Layer.orDie,

package/src/graph/controller.ts

@@ -25,7 +25,7 @@ import {
   isNotExecuted,
 } from '@dxos/conductor';
 import { Resource } from '@dxos/context';
-import type { Database } from '@dxos/echo';
+import type { Database, Feed } from '@dxos/echo';
 import { unwrapExit } from '@dxos/effect';
 import {
   ComputeEventLogger,
@@ -87,6 +87,7 @@ type ComputeOutputEvent = {
 export type ComputeServices =
   | AiService.AiService
   | Database.Service
+  | Feed.Service
   | QueueService
   | CredentialsService
   | FunctionInvocationService;

package/src/graph/node-defs.ts

@@ -39,41 +39,41 @@ const nodeFactory: Record<NodeType | 'trigger', (shape: ComputeShape) => Compute
   [NODE_OUTPUT]: () => createNode(NODE_OUTPUT),
 
   // Extensions.
-  ['text-to-image' as const]: () => createNode('text-to-image'), // TODO(burdon): Rename ai-impage-tool
-  ['and' as const]: () => createNode('and'),
-  ['append' as const]: () => createNode('append'),
-  ['audio' as const]: () => createNode('audio'),
-  ['beacon' as const]: () => createNode('beacon'),
-  ['chat' as const]: () => createNode('chat'),
-  ['constant' as const]: (shape) =>
+  'text-to-image': () => createNode('text-to-image'), // TODO(burdon): Rename ai-impage-tool
+  and: () => createNode('and'),
+  append: () => createNode('append'),
+  audio: () => createNode('audio'),
+  beacon: () => createNode('beacon'),
+  chat: () => createNode('chat'),
+  constant: (shape) =>
     createNode('constant', {
       value: (shape as ConstantShape).value,
     }),
-  ['make-queue' as const]: () => createNode('make-queue'),
-  ['database' as const]: () => createNode('database'),
-  ['gpt' as const]: () => createNode('gpt'),
-  ['gpt-realtime' as const]: () => createNode('gpt-realtime'),
-  ['if' as const]: () => createNode('if'),
-  ['if-else' as const]: () => createNode('if-else'),
-  ['function' as const]: () => createNode('function'),
-  ['json' as const]: () => createNode('json'),
-  ['json-transform' as const]: () => createNode('json-transform'),
-  ['not' as const]: () => createNode('not'),
-  ['or' as const]: () => createNode('or'),
-  ['queue' as const]: () => createNode('queue'),
-  ['rng' as const]: () => createNode('rng'),
-  ['reducer' as const]: () => createNode('reducer'),
-  ['scope' as const]: () => createNode('scope'),
-  ['surface' as const]: () => createNode('surface'),
-  ['switch' as const]: () => createNode('switch'),
-  ['template' as const]: (shape) => {
+  '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 as TemplateShape).valueType, value: shape.text });
     node.inputSchema = JsonSchema.toJsonSchema(getTemplateInputSchema(node));
     return node;
   },
-  ['text' as const]: () => createNode('text'),
-  ['thread' as const]: () => createNode('thread'),
-  ['trigger' as const]: () => createNode(NODE_INPUT),
+  text: () => createNode('text'),
+  thread: () => createNode('thread'),
+  trigger: () => createNode(NODE_INPUT),
 };
 
 const createNode = (type: string, props?: Partial<ComputeNode>): ComputeNode => ({

package/src/hooks/useGraphMonitor.ts

@@ -7,7 +7,7 @@ import { useMemo } from 'react';
 import { type ComputeEdge, ComputeGraphModel, type ComputeNode, DEFAULT_INPUT, DEFAULT_OUTPUT } from '@dxos/conductor';
 import { Obj, Ref } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
-import { type CanvasGraphModel, type Connection, type GraphMonitor } from '@dxos/react-ui-canvas-editor';
+import { type CanvasBoard, type CanvasGraphModel, type GraphMonitor } from '@dxos/react-ui-canvas-editor';
 import { isNonNullable } from '@dxos/util';
 
 import { createComputeNode, isValidComputeNode } from '../graph';
@@ -18,7 +18,7 @@ import { type ComputeShape, type TriggerShape } from '../shapes';
  */
 export const mapEdge = (
   graph: CanvasGraphModel,
-  { source, target, output = DEFAULT_OUTPUT, input = DEFAULT_INPUT }: Connection,
+  { source, target, output = DEFAULT_OUTPUT, input = DEFAULT_INPUT }: CanvasBoard.Connection,
 ): ComputeEdge => {
   const sourceNode = graph.findNode(source) as ComputeShape;
   const targetNode = graph.findNode(target) as ComputeShape;

package/src/schema.test.ts

@@ -7,9 +7,9 @@ import { describe, test } from 'vitest';
 
 import { Graph } from '@dxos/graph';
 import {
+  CanvasBoard,
   CanvasGraphModel,
   Polygon,
-  Shape,
   createEllipse,
   createPath,
   createRectangle,
@@ -26,7 +26,7 @@ describe('compute', () => {
     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(CanvasBoard.Shape)(node)).toBe(true);
     expect(Schema.is(Graph.Node)(node)).toBe(true);
 
     const graph: Graph.Any = { nodes: [], edges: [] };
@@ -39,7 +39,7 @@ describe('compute', () => {
 
 describe('schema', () => {
   test('basic types', ({ expect }) => {
-    const shapes: Shape[] = [];
+    const shapes: CanvasBoard.Shape[] = [];
     shapes.push(createRectangle({ id: 'shape-1', center: { x: 0, y: 0 }, size: { width: 80, height: 80 } }));
     shapes.push(createEllipse({ id: 'shape-2', center: { x: 0, y: 0 }, size: { width: 80, height: 80 } }));
     shapes.push(createFunction({ id: 'shape-3', center: { x: 0, y: 0 } }));

package/src/shapes/Audio.tsx

@@ -35,10 +35,10 @@ export const AudioComponent = ({ shape }: ShapeComponentProps<AudioShape>) => {
 
   // https://docs.pmnd.rs/react-three-fiber/api/canvas#render-props
   return (
-    <div className='flex is-full justify-center items-center'>
+    <div className='flex w-full justify-center items-center'>
       <Icon
         icon={active ? 'ph--microphone--regular' : 'ph--microphone-slash--regular'}
-        classNames={['transition opacity-20 duration-1000', active && 'opacity-100 text-red-500']}
+        classNames={['transition opacity-20 duration-1000', active && 'opacity-100 text-error-text']}
         size={8}
         onClick={() => setActive(!active)}
       />

package/src/shapes/Beacon.tsx

@@ -33,7 +33,7 @@ export const BeaconComponent = ({ shape }: ShapeComponentProps<BeaconShape>) =>
   const value = input?.type === 'executed' ? input.value : false;
 
   return (
-    <div className='flex is-full justify-center items-center'>
+    <div className='flex w-full justify-center items-center'>
       <Icon
         icon='ph--sun--regular'
         classNames={['transition opacity-20 duration-1000', isTruthy(value) && 'opacity-100 text-yellow-500']}

package/src/shapes/Boolean.tsx

@@ -57,7 +57,7 @@ const defineShape = <S extends GateShape>({
   // Be careful not to name component factories with a capital letter.
   component: () => {
     return (
-      <div className='flex is-full justify-center items-center'>
+      <div className='flex w-full justify-center items-center'>
         <Symbol />
       </div>
     );
@@ -95,7 +95,7 @@ const createSymbol =
     const paths = pathConstructor({ startX, endX, height });
 
     return (
-      <svg viewBox={`0 0 ${width} ${height}`} className='is-full bs-full'>
+      <svg viewBox={`0 0 ${width} ${height}`} className='w-full h-full'>
         {/* Input line. */}
         {getAnchorPoints({ x: 0, y: centerY }, inputs).map(({ x, y }, i) => (
           <line key={i} x1={x} y1={y} x2={startX * 1.3} y2={y} strokeWidth={strokeWidth} className={className} />

package/src/shapes/Gpt.tsx

@@ -6,6 +6,7 @@ import * as Schema from 'effect/Schema';
 import React, { useEffect, useState } from 'react';
 
 import { GptInput, GptOutput } from '@dxos/conductor';
+import { ScrollArea } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
@@ -74,7 +75,11 @@ export const GptComponent = ({ shape }: ShapeComponentProps<GptShape>) => {
   return (
     <FunctionBody
       shape={shape}
-      content={<div className='pli-2 plb-1 overflow-y-auto'>{text}</div>}
+      content={
+        <ScrollArea.Root orientation='vertical' thin>
+          <ScrollArea.Viewport>{text}</ScrollArea.Viewport>
+        </ScrollArea.Root>
+      }
       status={`${tokens} tokens`}
       inputSchema={meta.input}
       outputSchema={meta.output}

package/src/shapes/GptRealtime.tsx

@@ -143,7 +143,7 @@ export const GptRealtimeComponent = ({ shape }: ShapeComponentProps<GptRealtimeS
   };
 
   return (
-    <div className='flex is-full justify-center items-center'>
+    <div className='flex w-full justify-center items-center'>
       <Icon
         icon={isReady ? 'ph--waveform--regular' : isLive ? 'ph--pulse--regular' : 'ph--play--regular'}
         size={16}

package/src/shapes/Queue.tsx

@@ -6,7 +6,7 @@ import * as Schema from 'effect/Schema';
 import React, { Fragment } from 'react';
 
 import { DEFAULT_OUTPUT, QueueInput, QueueOutput } from '@dxos/conductor';
-import { type ThemedClassName } from '@dxos/react-ui';
+import { ScrollArea, type ThemedClassName } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { mx } from '@dxos/ui-theme';
 
@@ -46,11 +46,13 @@ export const QueueComponent = ({ shape }: ShapeComponentProps<QueueShape>) => {
 
   return (
     <Box shape={shape} status={`${items.length} items`} onAction={handleAction}>
-      <div className='flex flex-col is-full overflow-y-auto divide-y divide-separator'>
-        {[...items].map((item, i) => (
-          <QueueItem key={i} classNames='p-1 pli-2' item={item} />
-        ))}
-      </div>
+      <ScrollArea.Root orientation='vertical'>
+        <ScrollArea.Viewport classNames='divide-y divide-separator'>
+          {[...items].map((item, i) => (
+            <QueueItem key={i} classNames='p-1 px-2' item={item} />
+          ))}
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
     </Box>
   );
 };
@@ -61,7 +63,7 @@ export const QueueItem = ({ classNames, item }: ThemedClassName<{ item: any }>)
   }
 
   return (
-    <div className={mx('grid grid-cols-[80px,1fr]', classNames)}>
+    <div className={mx('grid grid-cols-[80px_1fr]', classNames)}>
       {Object.entries(item).map(([key, value]) => (
         <Fragment key={key}>
           <div className='p-1 text-xs text-subdued'>{key}</div>

package/src/shapes/Scope.tsx

@@ -39,7 +39,7 @@ export const ScopeComponent = ({ shape }: ShapeComponentProps<ScopeShape>) => {
   const { getAverage } = useAudioStream(active);
 
   return (
-    <div className='flex is-full justify-center items-center bg-black'>
+    <div className='flex w-full justify-center items-center bg-black'>
       <Chaos active={active} getValue={getAverage} options={{ ...shaderPresets.heptapod, zoom: 1.2 }} />
     </div>
   );

package/src/shapes/Surface.tsx

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

package/src/shapes/Switch.tsx

@@ -36,7 +36,7 @@ export const SwitchComponent = ({ shape }: ShapeComponentProps<SwitchShape>) =>
   }, [value]);
 
   return (
-    <div className='flex is-full justify-center items-center' onClick={(ev) => ev.stopPropagation()}>
+    <div className='flex w-full justify-center items-center' onClick={(ev) => ev.stopPropagation()}>
       <Input.Root>
         <Input.Switch checked={value} onCheckedChange={(value) => setValue(value)} />
       </Input.Root>

package/src/shapes/Thread.tsx

@@ -6,7 +6,7 @@ import * as Schema from 'effect/Schema';
 import React, { useEffect, useRef } from 'react';
 
 import { createInputSchema, createOutputSchema } from '@dxos/conductor';
-import { type ThemedClassName } from '@dxos/react-ui';
+import { ScrollArea, type ThemedClassName } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { Message } from '@dxos/types';
 import { mx } from '@dxos/ui-theme';
@@ -42,18 +42,24 @@ export const ThreadComponent = ({ shape }: ShapeComponentProps<ThreadShape>) =>
 
   return (
     <Box shape={shape}>
-      <div ref={scrollRef} className='flex flex-col is-full overflow-y-auto gap-2 p-2'>
-        {[...items].map((item, i) => (
-          <ThreadItem key={i} item={item} />
-        ))}
-      </div>
+      <ScrollArea.Root orientation='vertical'>
+        <ScrollArea.Viewport classNames='gap-2 p-2' ref={scrollRef}>
+          {[...items].map((item, i) => (
+            <ThreadItem key={i} item={item} />
+          ))}
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
     </Box>
   );
 };
 
 export const ThreadItem = ({ classNames, item }: ThemedClassName<{ item: any }>) => {
   if (typeof item !== 'object') {
-    return <div className={mx(classNames)}>{item}</div>;
+    return (
+      <div role='none' className={mx(classNames)}>
+        {item}
+      </div>
+    );
   }
 
   // TODO(burdon): Hack; introspect type.
@@ -63,7 +69,7 @@ export const ThreadItem = ({ classNames, item }: ThemedClassName<{ item: any }>)
     <div className={mx('flex', classNames, role === 'user' && 'justify-end')}>
       <div
         className={mx(
-          'block rounded-md p-1 pli-2 text-sm',
+          'block rounded-md p-1 px-2 text-sm',
           role === 'user'
             ? 'bg-blue-100 dark:bg-blue-800'
             : role === 'system'

package/src/shapes/Trigger.tsx

@@ -6,7 +6,7 @@ import * as Schema from 'effect/Schema';
 import React, { useEffect } from 'react';
 
 import { VoidInput } from '@dxos/conductor';
-import { Filter, Obj, Query, Ref, Type } from '@dxos/echo';
+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';
@@ -21,7 +21,7 @@ export const TriggerShape = Schema.extend(
   ComputeShape,
   Schema.Struct({
     type: Schema.Literal('trigger'),
-    functionTrigger: Schema.optional(Type.Ref(Trigger.Trigger)),
+    functionTrigger: Schema.optional(Ref.Ref(Trigger.Trigger)),
   }),
 );
 
@@ -91,7 +91,7 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
 const TriggerKindSelect = ({ value, onValueChange }: Pick<SelectRootProps, 'value' | 'onValueChange'>) => {
   return (
     <Select.Root value={value} onValueChange={onValueChange}>
-      <Select.TriggerButton variant='ghost' classNames='is-full !pli-0' />
+      <Select.TriggerButton variant='ghost' classNames='w-full px-0!' />
       <Select.Portal>
         <Select.Content>
           <Select.ScrollUpButton />

package/src/shapes/common/Box.tsx

@@ -6,8 +6,7 @@ import React, { type PropsWithChildren, type ReactNode, forwardRef } from 'react
 
 import { invariant } from '@dxos/invariant';
 import { Icon, IconButton, type ThemedClassName } from '@dxos/react-ui';
-import { useEditorContext, useShapeDef } from '@dxos/react-ui-canvas-editor';
-import { type Shape } from '@dxos/react-ui-canvas-editor';
+import { type CanvasBoard, useEditorContext, useShapeDef } from '@dxos/react-ui-canvas-editor';
 import { mx } from '@dxos/ui-theme';
 
 export const headerHeight = 32;
@@ -17,7 +16,7 @@ export type BoxActionHandler = (action: 'run' | 'open' | 'close') => void;
 
 export type BoxProps = PropsWithChildren<
   ThemedClassName<{
-    shape: Shape;
+    shape: CanvasBoard.Shape;
     title?: string;
     status?: string | ReactNode;
     open?: boolean;
@@ -32,8 +31,8 @@ export const Box = forwardRef<HTMLDivElement, BoxProps>(
     const { debug } = useEditorContext();
 
     return (
-      <div ref={forwardedRef} className='flex flex-col bs-full is-full justify-between'>
-        <div className='flex shrink-0 is-full justify-between items-center bs-[32px] bg-hoverSurface'>
+      <div ref={forwardedRef} className='flex flex-col h-full w-full justify-between'>
+        <div className='flex shrink-0 w-full justify-between items-center h-[32px] bg-input-surface'>
           <Icon icon={icon} classNames='mx-2' />
           <div className='grow text-sm truncate'>{debug ? shape.type : (name ?? shape.text ?? title)}</div>
           <IconButton
@@ -50,9 +49,9 @@ export const Box = forwardRef<HTMLDivElement, BoxProps>(
             }}
           />
         </div>
-        <div className={mx('flex flex-col bs-full grow overflow-hidden', classNames)}>{children}</div>
-        <div className='flex shrink-0 is-full justify-between items-center bs-[32px] bg-hoverSurface'>
-          <div className='grow pli-2 text-sm truncate'>{debug ? shape.id : status}</div>
+        <div className={mx('flex flex-col h-full grow overflow-hidden', classNames)}>{children}</div>
+        <div className='flex shrink-0 w-full justify-between items-center h-[32px] bg-input-surface'>
+          <div className='grow px-2 text-sm truncate'>{debug ? shape.id : status}</div>
           {openable && (
             <IconButton
               classNames='p-1'