@dxos/plugin-automation 0.8.4-main.406dc2a → 0.8.4-main.548089c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-automation",
-  "version": "0.8.4-main.406dc2a",
+  "version": "0.8.4-main.548089c",
   "description": "Prompt chain plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -49,53 +49,55 @@
     "@effect/platform-browser": "0.72.0",
     "@preact-signals/safe-react": "^0.9.0",
     "@preact/signals-core": "^1.12.1",
-    "@dxos/ai": "0.8.4-main.406dc2a",
-    "@dxos/async": "0.8.4-main.406dc2a",
-    "@dxos/assistant": "0.8.4-main.406dc2a",
-    "@dxos/conductor": "0.8.4-main.406dc2a",
-    "@dxos/context": "0.8.4-main.406dc2a",
-    "@dxos/functions": "0.8.4-main.406dc2a",
-    "@dxos/invariant": "0.8.4-main.406dc2a",
-    "@dxos/keys": "0.8.4-main.406dc2a",
-    "@dxos/echo": "0.8.4-main.406dc2a",
-    "@dxos/live-object": "0.8.4-main.406dc2a",
-    "@dxos/log": "0.8.4-main.406dc2a",
-    "@dxos/app-framework": "0.8.4-main.406dc2a",
-    "@dxos/plugin-client": "0.8.4-main.406dc2a",
-    "@dxos/plugin-graph": "0.8.4-main.406dc2a",
-    "@dxos/random": "0.8.4-main.406dc2a",
-    "@dxos/react-client": "0.8.4-main.406dc2a",
-    "@dxos/plugin-deck": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-components": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-editor": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-stack": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-list": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-form": "0.8.4-main.406dc2a",
-    "@dxos/schema": "0.8.4-main.406dc2a",
-    "@dxos/util": "0.8.4-main.406dc2a",
-    "@dxos/plugin-space": "0.8.4-main.406dc2a"
+    "@dxos/ai": "0.8.4-main.548089c",
+    "@dxos/app-framework": "0.8.4-main.548089c",
+    "@dxos/assistant": "0.8.4-main.548089c",
+    "@dxos/conductor": "0.8.4-main.548089c",
+    "@dxos/context": "0.8.4-main.548089c",
+    "@dxos/functions": "0.8.4-main.548089c",
+    "@dxos/functions-runtime": "0.8.4-main.548089c",
+    "@dxos/async": "0.8.4-main.548089c",
+    "@dxos/echo": "0.8.4-main.548089c",
+    "@dxos/live-object": "0.8.4-main.548089c",
+    "@dxos/log": "0.8.4-main.548089c",
+    "@dxos/plugin-client": "0.8.4-main.548089c",
+    "@dxos/invariant": "0.8.4-main.548089c",
+    "@dxos/plugin-deck": "0.8.4-main.548089c",
+    "@dxos/plugin-graph": "0.8.4-main.548089c",
+    "@dxos/random": "0.8.4-main.548089c",
+    "@dxos/react-client": "0.8.4-main.548089c",
+    "@dxos/react-ui-components": "0.8.4-main.548089c",
+    "@dxos/plugin-space": "0.8.4-main.548089c",
+    "@dxos/react-ui-editor": "0.8.4-main.548089c",
+    "@dxos/react-ui-form": "0.8.4-main.548089c",
+    "@dxos/keys": "0.8.4-main.548089c",
+    "@dxos/react-ui-list": "0.8.4-main.548089c",
+    "@dxos/react-ui-stack": "0.8.4-main.548089c",
+    "@dxos/schema": "0.8.4-main.548089c",
+    "@dxos/util": "0.8.4-main.548089c",
+    "@dxos/types": "0.8.4-main.548089c"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.42.4",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "0.92.1",
     "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.1",
+    "@types/react-dom": "~19.2.2",
     "effect": "3.18.3",
     "react": "~19.2.0",
     "react-dom": "~19.2.0",
     "vite": "7.1.9",
-    "@dxos/react-ui": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-theme": "0.8.4-main.406dc2a",
-    "@dxos/storybook-utils": "0.8.4-main.406dc2a"
+    "@dxos/react-ui": "0.8.4-main.548089c",
+    "@dxos/react-ui-theme": "0.8.4-main.548089c",
+    "@dxos/storybook-utils": "0.8.4-main.548089c"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.406dc2a",
-    "@dxos/react-ui-theme": "0.8.4-main.406dc2a"
+    "@dxos/react-ui": "0.8.4-main.548089c",
+    "@dxos/react-ui-theme": "0.8.4-main.548089c"
   },
   "publishConfig": {
     "access": "public"

package/src/AutomationPlugin.tsx

@@ -3,7 +3,7 @@
 //
 
 import { Capabilities, Events, contributes, defineModule, definePlugin } from '@dxos/app-framework';
-import { FunctionTrigger, FunctionType } from '@dxos/functions';
+import { Function, Trigger } from '@dxos/functions';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 
 import { AppGraphBuilder, ComputeRuntime, IntentResolver, ReactSurface } from './capabilities';
@@ -20,7 +20,7 @@ export const AutomationPlugin = definePlugin(meta, () => [
   defineModule({
     id: `${meta.id}/module/schema`,
     activatesOn: ClientEvents.SetupSchema,
-    activate: () => contributes(ClientCapabilities.Schema, [FunctionType, FunctionTrigger]),
+    activate: () => contributes(ClientCapabilities.Schema, [Function.Function, Trigger.Trigger]),
   }),
   defineModule({
     id: `${meta.id}/module/app-graph-builder`,

package/src/capabilities/app-graph-builder.ts

@@ -2,13 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
+import { Atom } from '@effect-atom/atom-react';
 import * as Function from 'effect/Function';
 import * as Option from 'effect/Option';
 
 import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
-import { ScriptType } from '@dxos/functions';
+import { Script } from '@dxos/functions';
 import { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
 import { createExtension } from '@dxos/plugin-graph';
 import { meta as spaceMeta } from '@dxos/plugin-space';
@@ -20,7 +20,7 @@ export default (context: PluginContext) =>
     createExtension({
       id: `${meta.id}/space-settings-automation`,
       connector: (node) =>
-        Rx.make((get) =>
+        Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) => (node.type === `${spaceMeta.id}/settings` ? Option.some(node) : Option.none())),
@@ -42,7 +42,7 @@ export default (context: PluginContext) =>
     createExtension({
       id: `${meta.id}/space-settings-functions`,
       connector: (node) =>
-        Rx.make((get) =>
+        Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) => (node.type === `${spaceMeta.id}/settings` ? Option.some(node) : Option.none())),
@@ -64,10 +64,10 @@ export default (context: PluginContext) =>
     createExtension({
       id: `${meta.id}/script-companion`,
       connector: (node) =>
-        Rx.make((get) =>
+        Atom.make((get) =>
           Function.pipe(
             get(node),
-            Option.flatMap((node) => (Obj.instanceOf(ScriptType, node.data) ? Option.some(node) : Option.none())),
+            Option.flatMap((node) => (Obj.instanceOf(Script.Script, node.data) ? Option.some(node) : Option.none())),
             Option.map((node) => [
               {
                 id: [node.id, 'automation'].join(ATTENDABLE_PATH_SEPARATOR),

package/src/capabilities/capabilities.ts

@@ -6,15 +6,8 @@ import type * as ManagedRuntime from 'effect/ManagedRuntime';
 
 import { type AiService, type ToolExecutionService, type ToolResolverService } from '@dxos/ai';
 import { defineCapability } from '@dxos/app-framework';
-import type {
-  CredentialsService,
-  DatabaseService,
-  FunctionInvocationService,
-  InvocationTracer,
-  QueueService,
-  TriggerDispatcher,
-  TriggerStateStore,
-} from '@dxos/functions';
+import type { CredentialsService, DatabaseService, FunctionInvocationService, QueueService } from '@dxos/functions';
+import type { InvocationTracer, TriggerDispatcher, TriggerStateStore } from '@dxos/functions-runtime';
 import type { SpaceId } from '@dxos/keys';
 
 import { meta } from '../meta';

package/src/capabilities/compute-runtime.ts

@@ -2,28 +2,24 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Toolkit from '@effect/ai/Toolkit';
 import * as BrowserKeyValueStore from '@effect/platform-browser/BrowserKeyValueStore';
 import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 import * as ManagedRuntime from 'effect/ManagedRuntime';
 
 import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
-import { makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
+import { GenericToolkit, makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
 import { Resource } from '@dxos/context';
 import { Query, Ref } from '@dxos/echo';
+import { CredentialsService, DatabaseService, QueueService } from '@dxos/functions';
 import {
-  CredentialsService,
-  DatabaseService,
   FunctionImplementationResolver,
-  FunctionInvocationService,
+  FunctionInvocationServiceLayerWithLocalLoopbackExecutor,
   InvocationTracer,
-  LocalFunctionExecutionService,
-  QueueService,
   RemoteFunctionExecutionService,
   TriggerDispatcher,
-} from '@dxos/functions';
-import { TriggerStateStore } from '@dxos/functions';
+} from '@dxos/functions-runtime';
+import { TriggerStateStore } from '@dxos/functions-runtime';
 import { invariant } from '@dxos/invariant';
 import { type SpaceId } from '@dxos/keys';
 import { ClientCapabilities } from '@dxos/plugin-client';
@@ -65,15 +61,12 @@ class ComputeRuntimeProviderImpl extends Resource implements AutomationCapabilit
         const serviceLayer =
           this.#context.getCapability(Capabilities.AiServiceLayer) ?? Layer.die('AiService not found');
 
-        // TODO(dmaretskyi): Make those reactive.
-        const functions = this.#context.getCapabilities(Capabilities.Functions);
+        // TODO(dmaretskyi): Make these reactive.
+        const functions = this.#context.getCapabilities(Capabilities.Functions).flat();
         const toolkits = this.#context.getCapabilities(Capabilities.Toolkit);
-        const handlers = this.#context.getCapabilities(Capabilities.ToolkitHandler);
-
-        const allFunctions = functions.flat();
-        // TODO(wittjosiah): Don't cast.
-        const toolkit = Toolkit.merge(...toolkits) as Toolkit.Toolkit<any>;
-        const handlersLayer = Layer.mergeAll(Layer.empty, ...handlers);
+        const mergedToolkit = GenericToolkit.merge(...toolkits);
+        const toolkit = mergedToolkit.toolkit;
+        const toolkitLayer = mergedToolkit.layer;
 
         const space = client.spaces.get(spaceId);
         invariant(space);
@@ -84,29 +77,25 @@ class ComputeRuntimeProviderImpl extends Resource implements AutomationCapabilit
             Layer.mergeAll(
               InvocationTracerLive,
               TriggerStateStore.layerKv.pipe(Layer.provide(BrowserKeyValueStore.layerLocalStorage)),
-              makeToolResolverFromFunctions(allFunctions, toolkit),
-              makeToolExecutionServiceFromFunctions(toolkit, handlersLayer),
+              makeToolResolverFromFunctions(functions, toolkit),
+              makeToolExecutionServiceFromFunctions(toolkit, toolkitLayer),
             ),
           ),
           Layer.provideMerge(
             Layer.mergeAll(
-              FunctionInvocationService.layer.pipe(
+              FunctionInvocationServiceLayerWithLocalLoopbackExecutor.pipe(
+                Layer.provideMerge(FunctionImplementationResolver.layerTest({ functions })),
                 Layer.provideMerge(
-                  LocalFunctionExecutionService.layerLive.pipe(
-                    Layer.provideMerge(FunctionImplementationResolver.layerTest({ functions: allFunctions })),
-                    Layer.provideMerge(
-                      RemoteFunctionExecutionService.fromClient(
-                        client.edge.baseUrl,
-                        // If agent is not enabled do not provide spaceId because space context will be unavailable on EDGE.
-                        client.config.get('runtime.client.edgeFeatures.agents') ? spaceId : undefined,
-                      ),
-                    ),
-                    Layer.provideMerge(serviceLayer),
-                    Layer.provideMerge(CredentialsService.layerFromDatabase()),
-                    Layer.provideMerge(space ? DatabaseService.layer(space.db) : DatabaseService.notAvailable),
-                    Layer.provideMerge(space ? QueueService.layer(space.queues) : QueueService.notAvailable),
+                  RemoteFunctionExecutionService.fromClient(
+                    client,
+                    // If agent is not enabled do not provide spaceId because space context will be unavailable on EDGE.
+                    client.config.get('runtime.client.edgeFeatures.agents') ? spaceId : undefined,
                   ),
                 ),
+                Layer.provideMerge(serviceLayer),
+                Layer.provideMerge(CredentialsService.layerFromDatabase()),
+                Layer.provideMerge(space ? DatabaseService.layer(space.db) : DatabaseService.notAvailable),
+                Layer.provideMerge(space ? QueueService.layer(space.queues) : QueueService.notAvailable),
               ),
             ),
           ),

package/src/capabilities/intent-resolver.ts

@@ -10,8 +10,8 @@ import {
   createIntent,
   createResolver,
 } from '@dxos/app-framework';
-import { Obj, Ref } from '@dxos/echo';
-import { FunctionTrigger, FunctionType, ScriptType } from '@dxos/functions';
+import { Ref } from '@dxos/echo';
+import { Function, Script, Trigger } from '@dxos/functions';
 import { type DXN } from '@dxos/keys';
 import { ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
 import { SpaceAction } from '@dxos/plugin-space/types';
@@ -24,17 +24,17 @@ export default (context: PluginContext) =>
     createResolver({
       intent: AutomationAction.CreateTriggerFromTemplate,
       resolve: async ({ space, template, enabled = false, scriptName, input }) => {
-        const trigger = Obj.make(FunctionTrigger, { enabled, input });
+        const trigger = Trigger.make({ enabled, input });
 
         // TODO(wittjosiah): Factor out function lookup by script name?
         if (scriptName) {
           const {
             objects: [script],
-          } = await space.db.query(Filter.type(ScriptType, { name: scriptName })).run();
+          } = await space.db.query(Filter.type(Script.Script, { name: scriptName })).run();
           if (script) {
             const {
               objects: [fn],
-            } = await space.db.query(Filter.type(FunctionType, { source: Ref.make(script) })).run();
+            } = await space.db.query(Filter.type(Function.Function, { source: Ref.make(script) })).run();
             if (fn) {
               trigger.function = Ref.make(fn);
             }

package/src/capabilities/react-surface.tsx

@@ -4,7 +4,8 @@
 
 import React from 'react';
 
-import { Capabilities, contributes, createSurface, useLayout } from '@dxos/app-framework';
+import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
+import { useLayout } from '@dxos/app-framework/react';
 import { Obj } from '@dxos/echo';
 import { getSpace, parseId, useSpace } from '@dxos/react-client/echo';
 

package/src/components/AutomationPanel/AutomationPanel.stories.tsx

@@ -5,8 +5,7 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { Obj } from '@dxos/echo';
-import { FunctionTrigger, FunctionType } from '@dxos/functions';
+import { Function, Trigger } from '@dxos/functions';
 import { useSpaces } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withTheme } from '@dxos/react-ui/testing';
@@ -36,10 +35,10 @@ const meta = {
     withClientProvider({
       createIdentity: true,
       createSpace: true,
-      types: [FunctionType, FunctionTrigger],
+      types: [Function.Function, Trigger.Trigger],
       onCreateSpace: ({ space }) => {
         for (const fn of functions) {
-          space.db.add(Obj.make(FunctionType, fn));
+          space.db.add(Function.make(fn));
         }
       },
     }),

package/src/components/AutomationPanel/AutomationPanel.tsx

@@ -3,13 +3,13 @@
 //
 
 import * as Array from 'effect/Array';
-import * as Function from 'effect/Function';
+import * as EFn from 'effect/Function';
 import * as Match from 'effect/Match';
 import * as Schema from 'effect/Schema';
 import React, { useMemo, useState } from 'react';
 
 import { Filter, Obj, Tag } from '@dxos/echo';
-import { FunctionTrigger, FunctionType, ScriptType } from '@dxos/functions';
+import { Function, Script, Trigger } from '@dxos/functions';
 import { useTypeOptions } from '@dxos/plugin-space';
 import { type Client, useClient } from '@dxos/react-client';
 import { type Space, getSpace, useQuery } from '@dxos/react-client/echo';
@@ -17,7 +17,8 @@ import { Clipboard, IconButton, Input, Separator, type ThemedClassName, useTrans
 import { ControlItem, controlItemClasses } from '@dxos/react-ui-form';
 import { List } from '@dxos/react-ui-list';
 import { ghostHover, mx } from '@dxos/react-ui-theme';
-import { DataType } from '@dxos/schema';
+import { View } from '@dxos/schema';
+import { Project } from '@dxos/types';
 
 import { meta } from '../../meta';
 import { TriggerEditor, type TriggerEditorProps } from '../TriggerEditor';
@@ -27,7 +28,7 @@ const grid = 'grid grid-cols-[40px_1fr_32px] min-bs-[2.5rem]';
 export type AutomationPanelProps = ThemedClassName<{
   space: Space;
   object?: Obj.Any;
-  initialTrigger?: FunctionTrigger;
+  initialTrigger?: Trigger.Trigger;
   onDone?: () => void;
 }>;
 
@@ -35,28 +36,28 @@ export type AutomationPanelProps = ThemedClassName<{
 export const AutomationPanel = ({ classNames, space, object, initialTrigger, onDone }: AutomationPanelProps) => {
   const { t } = useTranslation(meta.id);
   const client = useClient();
-  const functions = useQuery(space, Filter.type(FunctionType));
-  const triggers = useQuery(space, Filter.type(FunctionTrigger));
+  const functions = useQuery(space, Filter.type(Function.Function));
+  const triggers = useQuery(space, Filter.type(Trigger.Trigger));
   const filteredTriggers = useMemo(() => {
     return object ? triggers.filter(triggerMatch(object)) : triggers;
   }, [object, triggers]);
   const tags = useQuery(space, Filter.type(Tag.Tag));
   const types = useTypeOptions({ space, annotation: ['dynamic', 'limited-static', 'object-form'] });
 
-  const [trigger, setTrigger] = useState<FunctionTrigger | undefined>(initialTrigger);
-  const [selected, setSelected] = useState<FunctionTrigger>();
+  const [trigger, setTrigger] = useState<Trigger.Trigger | undefined>(initialTrigger);
+  const [selected, setSelected] = useState<Trigger.Trigger>();
 
-  const handleSelect = (trigger: FunctionTrigger) => {
+  const handleSelect = (trigger: Trigger.Trigger) => {
     setTrigger(trigger);
     setSelected(trigger);
   };
 
   const handleAdd = () => {
-    setTrigger(Obj.make(FunctionTrigger, {}));
+    setTrigger(Trigger.make({}));
     setSelected(undefined);
   };
 
-  const handleDelete = (trigger: FunctionTrigger) => {
+  const handleDelete = (trigger: Trigger.Trigger) => {
     space.db.remove(trigger);
     setTrigger(undefined);
     setSelected(undefined);
@@ -66,7 +67,7 @@ export const AutomationPanel = ({ classNames, space, object, initialTrigger, onD
     if (selected) {
       Object.assign(selected, trigger);
     } else {
-      space.db.add(Obj.make(FunctionTrigger, trigger));
+      space.db.add(Trigger.make(trigger));
     }
 
     setTrigger(undefined);
@@ -98,20 +99,20 @@ export const AutomationPanel = ({ classNames, space, object, initialTrigger, onD
   return (
     <div className={mx(controlItemClasses, classNames)}>
       {filteredTriggers.length > 0 && (
-        <List.Root<FunctionTrigger>
+        <List.Root<Trigger.Trigger>
           items={filteredTriggers}
-          isItem={Schema.is(FunctionTrigger)}
+          isItem={Schema.is(Trigger.Trigger)}
           getId={(field) => field.id}
         >
           {({ items: filteredTriggers }) => (
-            <div role='list' className='flex flex-col w-full'>
+            <div role='list' className='flex flex-col is-full'>
               {filteredTriggers?.map((trigger) => {
                 const copyAction = getCopyAction(client, trigger);
                 return (
-                  <List.Item<FunctionTrigger>
+                  <List.Item<Trigger.Trigger>
                     key={trigger.id}
                     item={trigger}
-                    classNames={mx(grid, ghostHover, 'items-center', 'px-2')}
+                    classNames={mx(grid, ghostHover, 'items-center', 'pli-2')}
                   >
                     <Input.Root>
                       <Input.Switch
@@ -122,7 +123,7 @@ export const AutomationPanel = ({ classNames, space, object, initialTrigger, onD
 
                     <div className={'flex'}>
                       <List.ItemTitle
-                        classNames='px-1 cursor-pointer w-0 shrink truncate'
+                        classNames='pli-1 cursor-pointer w-0 shrink truncate'
                         onClick={() => handleSelect(trigger)}
                       >
                         {getFunctionName(functions, trigger) ?? '∅'}
@@ -151,7 +152,7 @@ export const AutomationPanel = ({ classNames, space, object, initialTrigger, onD
   );
 };
 
-const getCopyAction = (client: Client, trigger: FunctionTrigger | undefined) => {
+const getCopyAction = (client: Client, trigger: Trigger.Trigger | undefined) => {
   if (trigger?.spec?.kind === 'email') {
     return { translationKey: 'trigger copy email', contentProvider: () => `${getSpace(trigger)!.id}@dxos.network` };
   }
@@ -163,7 +164,7 @@ const getCopyAction = (client: Client, trigger: FunctionTrigger | undefined) =>
   return undefined;
 };
 
-const getWebhookUrl = (client: Client, trigger: FunctionTrigger) => {
+const getWebhookUrl = (client: Client, trigger: Trigger.Trigger) => {
   const spaceId = getSpace(trigger)!.id;
   const edgeUrl = new URL(client.config.values.runtime!.services!.edge!.url!);
   const isSecure = edgeUrl.protocol.startsWith('https') || edgeUrl.protocol.startsWith('wss');
@@ -171,7 +172,7 @@ const getWebhookUrl = (client: Client, trigger: FunctionTrigger) => {
   return new URL(`/webhook/${spaceId}:${trigger.id}`, edgeUrl).toString();
 };
 
-const getFunctionName = (functions: FunctionType[], trigger: FunctionTrigger) => {
+const getFunctionName = (functions: Function.Function[], trigger: Trigger.Trigger) => {
   // TODO(wittjosiah): Truncation should be done in the UI.
   //   Warning that the List component is currently a can of worms.
   const shortId = trigger.function && `${trigger.function.dxn.toString().slice(0, 16)}…`;
@@ -179,25 +180,25 @@ const getFunctionName = (functions: FunctionType[], trigger: FunctionTrigger) =>
   return functionObject?.name ?? shortId;
 };
 
-const scriptMatch = (script: ScriptType) => (trigger: FunctionTrigger) => {
+const scriptMatch = (script: Script.Script) => (trigger: Trigger.Trigger) => {
   const fn = trigger.function?.target;
-  if (!Obj.instanceOf(FunctionType, fn)) {
+  if (!Obj.instanceOf(Function.Function, fn)) {
     return false;
   }
 
   return fn.source?.target === script;
 };
 
-const projectMatch = (project: DataType.Project) => {
-  const viewQueries = Function.pipe(
+const projectMatch = (project: Project.Project) => {
+  const viewQueries = EFn.pipe(
     project.collections,
     Array.map((collection) => collection.target),
-    Array.filter(Schema.is(DataType.View)),
+    Array.filter(Schema.is(View.View)),
     Array.map((view) => Obj.getSnapshot(view).query.ast),
     Array.map((ast) => JSON.stringify(ast)),
   );
 
-  return (trigger: FunctionTrigger) => {
+  return (trigger: Trigger.Trigger) => {
     const spec = Obj.getSnapshot(trigger).spec;
     if (spec?.kind !== 'subscription') {
       return false;
@@ -209,13 +210,13 @@ const projectMatch = (project: DataType.Project) => {
 };
 
 const triggerMatch = Match.type<Obj.Any>().pipe(
-  Match.withReturnType<(trigger: FunctionTrigger) => boolean>(),
+  Match.withReturnType<(trigger: Trigger.Trigger) => boolean>(),
   Match.when(
-    (obj) => Obj.instanceOf(ScriptType, obj),
+    (obj) => Obj.instanceOf(Script.Script, obj),
     (obj) => scriptMatch(obj),
   ),
   Match.when(
-    (obj) => Obj.instanceOf(DataType.Project, obj),
+    (obj) => Obj.instanceOf(Project.Project, obj),
     (obj) => projectMatch(obj),
   ),
   Match.orElse((_obj) => () => true),

package/src/components/FunctionsContainer.tsx

@@ -11,6 +11,7 @@ import { ControlPage, ControlSection } from '@dxos/react-ui-form';
 import { meta } from '../meta';
 
 import { FunctionsPanel } from './FunctionsPanel';
+import { FunctionsRegistry } from './FunctionsRegistry';
 
 export const FunctionsContainer = ({ space }: { space: Space }) => {
   const { t } = useTranslation(meta.id);
@@ -22,6 +23,12 @@ export const FunctionsContainer = ({ space }: { space: Space }) => {
       >
         <FunctionsPanel space={space} />
       </ControlSection>
+      <ControlSection
+        title={t('functions registry verbose label', { ns: meta.id })}
+        description={t('functions registry description', { ns: meta.id })}
+      >
+        <FunctionsRegistry space={space} />
+      </ControlSection>
     </ControlPage>
   );
 };

package/src/components/FunctionsPanel/FunctionsPanel.tsx

@@ -5,10 +5,13 @@
 import * as Schema from 'effect/Schema';
 import React, { useCallback, useMemo } from 'react';
 
-import { LayoutAction, createIntent, useIntentDispatcher } from '@dxos/app-framework';
-import { FunctionType, ScriptType } from '@dxos/functions';
-import { Filter, type Space, fullyQualifiedId, useQuery } from '@dxos/react-client/echo';
-import { Button, useTranslation } from '@dxos/react-ui';
+import { LayoutAction, createIntent } from '@dxos/app-framework';
+import { useIntentDispatcher } from '@dxos/app-framework/react';
+import { Obj } from '@dxos/echo';
+import { Function, Script } from '@dxos/functions';
+import { SpaceAction } from '@dxos/plugin-space/types';
+import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
+import { Button, IconButton, useTranslation } from '@dxos/react-ui';
 import { controlItemClasses } from '@dxos/react-ui-form';
 import { List } from '@dxos/react-ui-list';
 import { ghostHover, mx } from '@dxos/react-ui-theme';
@@ -23,8 +26,8 @@ export type FunctionsPanelProps = {
 
 export const FunctionsPanel = ({ space }: FunctionsPanelProps) => {
   const { t } = useTranslation(meta.id);
-  const functions = useQuery(space, Filter.type(FunctionType));
-  const scripts = useQuery(space, Filter.type(ScriptType));
+  const functions = useQuery(space, Filter.type(Function.Function));
+  const scripts = useQuery(space, Filter.type(Script.Script));
   const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   const functionToScriptMap = useMemo(
@@ -40,13 +43,13 @@ export const FunctionsPanel = ({ space }: FunctionsPanelProps) => {
           }
           return map;
         },
-        {} as Record<string, ScriptType>,
+        {} as Record<string, Script.Script>,
       ),
     [functions, scripts],
   );
 
   const getScriptName = useCallback(
-    (func: FunctionType) => {
+    (func: Function.Function) => {
       const script = functionToScriptMap[func.id];
       return script?.name;
     },
@@ -54,23 +57,33 @@ export const FunctionsPanel = ({ space }: FunctionsPanelProps) => {
   );
 
   const handleGoToScript = useCallback(
-    (func: FunctionType) => {
+    (func: Function.Function) => {
       const script = functionToScriptMap[func.id];
       if (script) {
-        void dispatch(createIntent(LayoutAction.Open, { part: 'main', subject: [fullyQualifiedId(script)] }));
+        void dispatch(
+          createIntent(LayoutAction.Open, {
+            part: 'main',
+            subject: [Obj.getDXN(script).toString()],
+          }),
+        );
       }
     },
     [functionToScriptMap, dispatch],
   );
 
+  const handleDelete = useCallback(
+    (func: Function.Function) => dispatch(createIntent(SpaceAction.RemoveObjects, { objects: [func] })),
+    [dispatch],
+  );
+
   return (
     <div role='none' className={mx(controlItemClasses)}>
       {functions.length > 0 && (
-        <List.Root<FunctionType> items={functions} isItem={Schema.is(FunctionType)} getId={(func) => func.id}>
+        <List.Root<Function.Function> items={functions} isItem={Schema.is(Function.Function)} getId={(func) => func.id}>
           {({ items }) => (
-            <div role='list' className='flex flex-col w-full'>
+            <div role='list' className='flex flex-col is-full'>
               {items?.map((func) => (
-                <List.Item<FunctionType>
+                <List.Item<Function.Function>
                   key={func.id}
                   item={func}
                   classNames={mx(grid, ghostHover, 'items-center', 'pli-2', 'min-bs-[3rem]')}
@@ -84,6 +97,12 @@ export const FunctionsPanel = ({ space }: FunctionsPanelProps) => {
                   {functionToScriptMap[func.id] && (
                     <Button onClick={() => handleGoToScript(func)}>{t('go to function source button label')}</Button>
                   )}
+                  <IconButton
+                    iconOnly
+                    icon='ph--trash--regular'
+                    label={t('delete function button label')}
+                    onClick={() => handleDelete(func)}
+                  />
                 </List.Item>
               ))}
             </div>