@dxos/plugin-automation 0.8.4-main.a4bbb77 → 0.8.4-main.ae835ea

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-automation",
-  "version": "0.8.4-main.a4bbb77",
+  "version": "0.8.4-main.ae835ea",
   "description": "Prompt chain plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -49,42 +49,44 @@
     "@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.a4bbb77",
-    "@dxos/app-framework": "0.8.4-main.a4bbb77",
-    "@dxos/assistant": "0.8.4-main.a4bbb77",
-    "@dxos/async": "0.8.4-main.a4bbb77",
-    "@dxos/conductor": "0.8.4-main.a4bbb77",
-    "@dxos/echo": "0.8.4-main.a4bbb77",
-    "@dxos/keys": "0.8.4-main.a4bbb77",
-    "@dxos/echo-schema": "0.8.4-main.a4bbb77",
-    "@dxos/functions": "0.8.4-main.a4bbb77",
-    "@dxos/log": "0.8.4-main.a4bbb77",
-    "@dxos/invariant": "0.8.4-main.a4bbb77",
-    "@dxos/live-object": "0.8.4-main.a4bbb77",
-    "@dxos/plugin-client": "0.8.4-main.a4bbb77",
-    "@dxos/plugin-deck": "0.8.4-main.a4bbb77",
-    "@dxos/plugin-space": "0.8.4-main.a4bbb77",
-    "@dxos/random": "0.8.4-main.a4bbb77",
-    "@dxos/plugin-graph": "0.8.4-main.a4bbb77",
-    "@dxos/context": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-form": "0.8.4-main.a4bbb77",
-    "@dxos/react-client": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-list": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-stack": "0.8.4-main.a4bbb77",
-    "@dxos/util": "0.8.4-main.a4bbb77"
+    "@dxos/app-framework": "0.8.4-main.ae835ea",
+    "@dxos/assistant": "0.8.4-main.ae835ea",
+    "@dxos/ai": "0.8.4-main.ae835ea",
+    "@dxos/async": "0.8.4-main.ae835ea",
+    "@dxos/conductor": "0.8.4-main.ae835ea",
+    "@dxos/context": "0.8.4-main.ae835ea",
+    "@dxos/echo": "0.8.4-main.ae835ea",
+    "@dxos/invariant": "0.8.4-main.ae835ea",
+    "@dxos/keys": "0.8.4-main.ae835ea",
+    "@dxos/functions": "0.8.4-main.ae835ea",
+    "@dxos/live-object": "0.8.4-main.ae835ea",
+    "@dxos/log": "0.8.4-main.ae835ea",
+    "@dxos/plugin-client": "0.8.4-main.ae835ea",
+    "@dxos/plugin-deck": "0.8.4-main.ae835ea",
+    "@dxos/plugin-graph": "0.8.4-main.ae835ea",
+    "@dxos/plugin-space": "0.8.4-main.ae835ea",
+    "@dxos/random": "0.8.4-main.ae835ea",
+    "@dxos/react-client": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-components": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-editor": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-form": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-list": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-stack": "0.8.4-main.ae835ea",
+    "@dxos/schema": "0.8.4-main.ae835ea",
+    "@dxos/util": "0.8.4-main.ae835ea"
   },
   "devDependencies": {
     "@effect-rx/rx-react": "0.42.4",
     "@effect/platform": "0.92.1",
-    "@types/react": "~19.2.0",
-    "@types/react-dom": "~19.2.0",
+    "@types/react": "~19.2.2",
+    "@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.a4bbb77",
-    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77",
-    "@dxos/storybook-utils": "0.8.4-main.a4bbb77"
+    "@dxos/react-ui": "0.8.4-main.ae835ea",
+    "@dxos/storybook-utils": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-theme": "0.8.4-main.ae835ea"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -92,8 +94,8 @@
     "effect": "^3.13.3",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.a4bbb77",
-    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77"
+    "@dxos/react-ui": "0.8.4-main.ae835ea",
+    "@dxos/react-ui-theme": "0.8.4-main.ae835ea"
   },
   "publishConfig": {
     "access": "public"

package/src/AutomationPlugin.tsx

@@ -3,10 +3,11 @@
 //
 
 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';
+import { AutomationEvents } from './events';
 import { meta } from './meta';
 import { translations } from './translations';
 
@@ -19,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`,
@@ -39,6 +40,7 @@ export const AutomationPlugin = definePlugin(meta, () => [
   defineModule({
     id: `${meta.id}/module/compute-runtime`,
     activatesOn: ClientEvents.ClientReady,
+    activatesAfter: [AutomationEvents.ComputeRuntimeReady],
     activate: ComputeRuntime,
   }),
 ]);

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

@@ -3,11 +3,12 @@
 //
 
 import { Rx } from '@effect-rx/rx-react';
-import { Option, pipe } from 'effect';
+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 +21,7 @@ export default (context: PluginContext) =>
       id: `${meta.id}/space-settings-automation`,
       connector: (node) =>
         Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (node.type === `${spaceMeta.id}/settings` ? Option.some(node) : Option.none())),
             Option.map((node) => [
@@ -42,7 +43,7 @@ export default (context: PluginContext) =>
       id: `${meta.id}/space-settings-functions`,
       connector: (node) =>
         Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (node.type === `${spaceMeta.id}/settings` ? Option.some(node) : Option.none())),
             Option.map((node) => [
@@ -64,9 +65,9 @@ export default (context: PluginContext) =>
       id: `${meta.id}/script-companion`,
       connector: (node) =>
         Rx.make((get) =>
-          pipe(
+          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

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type ManagedRuntime } from 'effect';
+import type * as ManagedRuntime from 'effect/ManagedRuntime';
 
 import { type AiService, type ToolExecutionService, type ToolResolverService } from '@dxos/ai';
 import { defineCapability } from '@dxos/app-framework';
@@ -36,8 +36,9 @@ export namespace AutomationCapabilities {
     | ToolResolverService
     | ToolExecutionService;
 
+  export type ComputeRuntime = ManagedRuntime.ManagedRuntime<AutomationCapabilities.ComputeServices, never>;
   export interface ComputeRuntimeProvider {
-    getRuntime(spaceId: SpaceId): ManagedRuntime.ManagedRuntime<ComputeServices, never>;
+    getRuntime(spaceId: SpaceId): ComputeRuntime;
   }
 
   /**

package/src/capabilities/compute-runtime.ts

@@ -2,9 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Toolkit } from '@effect/ai';
-import { BrowserKeyValueStore } from '@effect/platform-browser';
-import { Effect, Layer, ManagedRuntime } from 'effect';
+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';
@@ -37,7 +39,7 @@ export default async (context: PluginContext) => {
 };
 
 class ComputeRuntimeProviderImpl extends Resource implements AutomationCapabilities.ComputeRuntimeProvider {
-  readonly #runtimes = new Map<SpaceId, ManagedRuntime.ManagedRuntime<AutomationCapabilities.ComputeServices, never>>();
+  readonly #runtimes = new Map<SpaceId, AutomationCapabilities.ComputeRuntime>();
   readonly #context: PluginContext;
 
   constructor(context: PluginContext) {
@@ -52,7 +54,7 @@ class ComputeRuntimeProviderImpl extends Resource implements AutomationCapabilit
     this.#runtimes.clear();
   }
 
-  getRuntime(spaceId: SpaceId): ManagedRuntime.ManagedRuntime<AutomationCapabilities.ComputeServices, never> {
+  getRuntime(spaceId: SpaceId): AutomationCapabilities.ComputeRuntime {
     if (this.#runtimes.has(spaceId)) {
       return this.#runtimes.get(spaceId)!;
     }

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

@@ -6,7 +6,6 @@ import React from 'react';
 
 import { Capabilities, contributes, createSurface, useLayout } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
-import { ScriptType } from '@dxos/functions';
 import { getSpace, parseId, useSpace } from '@dxos/react-client/echo';
 
 import { AutomationSettings, FunctionsContainer } from '../components';
@@ -47,8 +46,8 @@ export default () =>
     createSurface({
       id: `${meta.id}/companion/automation`,
       role: 'article',
-      filter: (data): data is { companionTo: ScriptType; subject: 'automation' } =>
-        Obj.instanceOf(ScriptType, data.companionTo) && data.subject === 'automation',
+      filter: (data): data is { companionTo: Obj.Any; subject: 'automation' } =>
+        Obj.isObject(data.companionTo) && data.subject === 'automation',
       component: ({ data }) => {
         return <AutomationSettings space={getSpace(data.companionTo)!} object={data.companionTo} />;
       },

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

@@ -2,17 +2,22 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
-import React, { useState } from 'react';
-
-import { Filter, Obj } from '@dxos/echo';
-import { FunctionTrigger, FunctionType, ScriptType } from '@dxos/functions';
+import * as Array from 'effect/Array';
+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 { 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';
 import { Clipboard, IconButton, Input, Separator, type ThemedClassName, useTranslation } from '@dxos/react-ui';
 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 { meta } from '../../meta';
 import { TriggerEditor, type TriggerEditorProps } from '../TriggerEditor';
@@ -22,7 +27,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;
 }>;
 
@@ -30,24 +35,28 @@ export type AutomationPanelProps = ThemedClassName<{
 export const AutomationPanel = ({ classNames, space, object, initialTrigger, onDone }: AutomationPanelProps) => {
   const { t } = useTranslation(meta.id);
   const client = useClient();
-  const triggers = useQuery(space, Filter.type(FunctionTrigger));
-  const functions = useQuery(space, Filter.type(FunctionType));
-  const scripts = useQuery(space, Filter.type(ScriptType));
-
-  const [trigger, setTrigger] = useState<FunctionTrigger | undefined>(initialTrigger);
-  const [selected, setSelected] = useState<FunctionTrigger>();
-
-  const handleSelect = (trigger: 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<Trigger.Trigger | undefined>(initialTrigger);
+  const [selected, setSelected] = useState<Trigger.Trigger>();
+
+  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);
@@ -57,7 +66,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);
@@ -73,21 +82,33 @@ export const AutomationPanel = ({ classNames, space, object, initialTrigger, onD
   if (trigger) {
     return (
       <ControlItem title={t('trigger editor title')}>
-        <TriggerEditor space={space} trigger={trigger} onSave={handleSave} onCancel={handleCancel} />
+        <TriggerEditor
+          space={space}
+          trigger={trigger}
+          readonlySpec={Boolean(object)}
+          tags={tags}
+          types={types}
+          onSave={handleSave}
+          onCancel={handleCancel}
+        />
       </ControlItem>
     );
   }
 
   return (
     <div className={mx(controlItemClasses, classNames)}>
-      {triggers.length > 0 && (
-        <List.Root<FunctionTrigger> items={triggers} isItem={Schema.is(FunctionTrigger)} getId={(field) => field.id}>
-          {({ items: triggers }) => (
+      {filteredTriggers.length > 0 && (
+        <List.Root<Trigger.Trigger>
+          items={filteredTriggers}
+          isItem={Schema.is(Trigger.Trigger)}
+          getId={(field) => field.id}
+        >
+          {({ items: filteredTriggers }) => (
             <div role='list' className='flex flex-col w-full'>
-              {triggers?.map((trigger) => {
+              {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')}
@@ -104,7 +125,7 @@ export const AutomationPanel = ({ classNames, space, object, initialTrigger, onD
                         classNames='px-1 cursor-pointer w-0 shrink truncate'
                         onClick={() => handleSelect(trigger)}
                       >
-                        {getFunctionName(scripts, functions, trigger) ?? '∅'}
+                        {getFunctionName(functions, trigger) ?? '∅'}
                       </List.ItemTitle>
 
                       {/* TODO: a better way to expose copy action */}
@@ -124,13 +145,13 @@ export const AutomationPanel = ({ classNames, space, object, initialTrigger, onD
           )}
         </List.Root>
       )}
-      {triggers.length > 0 && <Separator classNames='mlb-4' />}
+      {filteredTriggers.length > 0 && <Separator classNames='mlb-4' />}
       <IconButton icon='ph--plus--regular' label={t('new trigger label')} onClick={handleAdd} />
     </div>
   );
 };
 
-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` };
   }
@@ -142,7 +163,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');
@@ -150,10 +171,52 @@ const getWebhookUrl = (client: Client, trigger: FunctionTrigger) => {
   return new URL(`/webhook/${spaceId}:${trigger.id}`, edgeUrl).toString();
 };
 
-const getFunctionName = (scripts: ScriptType[], 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)}…`;
   const functionObject = functions.find((fn) => fn === trigger.function?.target);
   return functionObject?.name ?? shortId;
 };
+
+const scriptMatch = (script: Script.Script) => (trigger: Trigger.Trigger) => {
+  const fn = trigger.function?.target;
+  if (!Obj.instanceOf(Function.Function, fn)) {
+    return false;
+  }
+
+  return fn.source?.target === script;
+};
+
+const projectMatch = (project: DataType.Project) => {
+  const viewQueries = EFn.pipe(
+    project.collections,
+    Array.map((collection) => collection.target),
+    Array.filter(Schema.is(DataType.View)),
+    Array.map((view) => Obj.getSnapshot(view).query.ast),
+    Array.map((ast) => JSON.stringify(ast)),
+  );
+
+  return (trigger: Trigger.Trigger) => {
+    const spec = Obj.getSnapshot(trigger).spec;
+    if (spec?.kind !== 'subscription') {
+      return false;
+    }
+
+    // TODO(wittjosiah): Implement better way of comparing query ASTs.
+    return viewQueries.some((query) => JSON.stringify(spec.query) === query);
+  };
+};
+
+const triggerMatch = Match.type<Obj.Any>().pipe(
+  Match.withReturnType<(trigger: Trigger.Trigger) => boolean>(),
+  Match.when(
+    (obj) => Obj.instanceOf(Script.Script, obj),
+    (obj) => scriptMatch(obj),
+  ),
+  Match.when(
+    (obj) => Obj.instanceOf(DataType.Project, obj),
+    (obj) => projectMatch(obj),
+  ),
+  Match.orElse((_obj) => () => true),
+);

package/src/components/FunctionsPanel/FunctionsPanel.tsx

@@ -2,13 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema } from 'effect';
+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 { Function, Script } from '@dxos/functions';
+import { SpaceAction } from '@dxos/plugin-space/types';
 import { Filter, type Space, fullyQualifiedId, useQuery } from '@dxos/react-client/echo';
-import { Button, useTranslation } from '@dxos/react-ui';
+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 +24,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 +41,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,7 +55,7 @@ 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)] }));
@@ -63,14 +64,19 @@ export const FunctionsPanel = ({ space }: FunctionsPanelProps) => {
     [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'>
               {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 +90,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>

package/src/components/TriggerEditor/FunctionInputEditor.tsx

@@ -5,13 +5,13 @@
 import React, { useCallback, useMemo } from 'react';
 
 import { Ref, Type } from '@dxos/echo';
-import { type JsonPath } from '@dxos/echo-schema';
-import { type FunctionType } from '@dxos/functions';
+import { type JsonPath } from '@dxos/echo/internal';
+import { type Function } from '@dxos/functions';
 import { useOnTransition } from '@dxos/react-ui';
 import { Form, type FormInputStateProps, type QueryRefOptions, useFormValues } from '@dxos/react-ui-form';
 
 export type FunctionInputEditorProps = {
-  functions: FunctionType[];
+  functions: Function.Function[];
   onQueryRefOptions: QueryRefOptions;
 } & FormInputStateProps;
 
@@ -39,7 +39,13 @@ export const FunctionInputEditor = ({
   useOnTransition(
     // Clear function parameter input when the function changes.
     selectedFunctionValue,
-    (prevValue) => prevValue !== undefined && prevValue !== selectedFunctionValue,
+    (prevValue) => {
+      if (!Ref.isRef(prevValue) || !Ref.isRef(selectedFunctionValue)) {
+        return false;
+      }
+
+      return prevValue.dxn.toString() !== selectedFunctionValue.dxn.toString();
+    },
     (currValue) => currValue !== undefined,
     () => onValueChange('object', {}),
   );