@dxos/plugin-automation 0.8.4-main.9be5663bfe → 0.8.4-main.abd8ff62ef

package/src/{cli/commands → commands}/trigger/update/queue.ts

@@ -12,9 +12,8 @@ import * as Option from 'effect/Option';
 import { CommandConfig } from '@dxos/cli-util';
 import { flushAndSync, print, spaceLayer, withTypes } from '@dxos/cli-util';
 import { Common } from '@dxos/cli-util';
+import { Operation, Trigger } from '@dxos/compute';
 import { DXN, Database, Filter, JsonSchema, Obj, Ref } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 
 import { Enabled, Input, Queue, TriggerId } from '../options';
 import { printTrigger, promptForSchemaInput, selectFunction, selectQueue, selectTrigger } from '../util';
@@ -92,7 +91,7 @@ const updateFunction = Effect.fn(function* (trigger: Trigger.Trigger, functionId
     if (!foundFn || !Obj.instanceOf(Operation.PersistentOperation, foundFn)) {
       return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
     }
-    Obj.change(trigger, (trigger) => {
+    Obj.update(trigger, (trigger) => {
       trigger.function = Ref.make(foundFn);
     });
     currentFn = foundFn;
@@ -130,7 +129,7 @@ const updateQueue = Effect.fn(function* (trigger: Trigger.Trigger, queueOption:
       onNone: () => selectQueue(),
       onSome: (dxn) => Effect.succeed(dxn.toString()),
     });
-    Obj.change(trigger, (trigger) => {
+    Obj.update(trigger, (trigger) => {
       if (trigger.spec?.kind === 'queue') {
         trigger.spec.queue = queueDxn;
       }
@@ -166,7 +165,7 @@ const updateInput = Effect.fn(function* (
         promptForSchemaInput(fn.inputSchema ? JsonSchema.toEffectSchema(fn.inputSchema) : undefined, currentInput),
       onSome: (value) => Effect.succeed(value as Record<string, any>),
     });
-    Obj.change(trigger, (trigger) => {
+    Obj.update(trigger, (trigger) => {
       trigger.input = inputObj;
     });
   }
@@ -189,7 +188,7 @@ const updateEnabled = Effect.fn(function* (
       }).pipe(Prompt.run),
     onSome: () => Effect.succeed(enabled),
   });
-  Obj.change(trigger, (trigger) => {
+  Obj.update(trigger, (trigger) => {
     trigger.enabled = enabledValue;
   });
 });

package/src/{cli/commands → commands}/trigger/update/subscription.ts

@@ -13,9 +13,8 @@ import * as Option from 'effect/Option';
 import { CommandConfig } from '@dxos/cli-util';
 import { flushAndSync, print, spaceLayer, withTypes } from '@dxos/cli-util';
 import { Common } from '@dxos/cli-util';
+import { Operation, Trigger } from '@dxos/compute';
 import { DXN, Database, Filter, JsonSchema, Obj, Query, Ref } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 
 import { Deep, Delay, Enabled, Input, TriggerId, Typename } from '../options';
 import { printTrigger, promptForSchemaInput, selectFunction, selectTrigger } from '../util';
@@ -121,7 +120,7 @@ const updateFunction = Effect.fn(function* (trigger: Trigger.Trigger, functionId
     if (!foundFn || !Obj.instanceOf(Operation.PersistentOperation, foundFn)) {
       return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
     }
-    Obj.change(trigger, (trigger) => {
+    Obj.update(trigger, (trigger) => {
       trigger.function = Ref.make(foundFn);
     });
     currentFn = foundFn;
@@ -211,7 +210,7 @@ const updateSpec = Effect.fn(function* (
       subscriptionOptions.delay = delayOptionValue.value;
     }
 
-    Obj.change(trigger, (trigger) => {
+    Obj.update(trigger, (trigger) => {
       const spec = trigger.spec;
       if (spec?.kind === 'subscription') {
         // Cast needed because QueryAST types are deeply readonly but spec.query expects mutable.
@@ -250,7 +249,7 @@ const updateInput = Effect.fn(function* (
         promptForSchemaInput(fn.inputSchema ? JsonSchema.toEffectSchema(fn.inputSchema) : undefined, currentInput),
       onSome: (value) => Effect.succeed(value as Record<string, any>),
     });
-    Obj.change(trigger, (trigger) => {
+    Obj.update(trigger, (trigger) => {
       trigger.input = inputObj;
     });
   }
@@ -273,7 +272,7 @@ const updateEnabled = Effect.fn(function* (
       }).pipe(Prompt.run),
     onSome: () => Effect.succeed(enabled),
   });
-  Obj.change(trigger, (trigger) => {
+  Obj.update(trigger, (trigger) => {
     trigger.enabled = enabledValue;
   });
 });

package/src/{cli/commands → commands}/trigger/update/timer.ts

@@ -12,9 +12,8 @@ import * as Option from 'effect/Option';
 import { CommandConfig } from '@dxos/cli-util';
 import { flushAndSync, print, spaceLayer, withTypes } from '@dxos/cli-util';
 import { Common } from '@dxos/cli-util';
+import { Operation, Trigger } from '@dxos/compute';
 import { DXN, Database, Filter, JsonSchema, Obj, Ref } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 
 import { Cron, Enabled, Input, TriggerId } from '../options';
 import { printTrigger, promptForSchemaInput, selectFunction, selectTrigger } from '../util';
@@ -93,7 +92,7 @@ const updateFunction = Effect.fn(function* (trigger: Trigger.Trigger, functionId
     if (!foundFn || !Obj.instanceOf(Operation.PersistentOperation, foundFn)) {
       return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
     }
-    Obj.change(trigger, (trigger) => {
+    Obj.update(trigger, (trigger) => {
       trigger.function = Ref.make(foundFn);
     });
     currentFn = foundFn;
@@ -129,7 +128,7 @@ const updateCron = Effect.fn(function* (trigger: Trigger.Trigger, cronOption: Op
         }).pipe(Prompt.run),
       onSome: (value) => Effect.succeed(value),
     });
-    Obj.change(trigger, (trigger) => {
+    Obj.update(trigger, (trigger) => {
       if (trigger.spec?.kind === 'timer') {
         trigger.spec.cron = cron;
       }
@@ -165,7 +164,7 @@ const updateInput = Effect.fn(function* (
         promptForSchemaInput(fn.inputSchema ? JsonSchema.toEffectSchema(fn.inputSchema) : undefined, currentInput),
       onSome: (value) => Effect.succeed(value as Record<string, any>),
     });
-    Obj.change(trigger, (trigger) => {
+    Obj.update(trigger, (trigger) => {
       trigger.input = inputObj;
     });
   }
@@ -188,7 +187,7 @@ const updateEnabled = Effect.fn(function* (
       }).pipe(Prompt.run),
     onSome: () => Effect.succeed(enabled),
   });
-  Obj.change(trigger, (trigger) => {
+  Obj.update(trigger, (trigger) => {
     trigger.enabled = enabledValue;
   });
 });

package/src/{cli/commands → commands}/trigger/util.ts

@@ -12,10 +12,9 @@ import type * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 
 import { FormBuilder } from '@dxos/cli-util';
-import { Annotation, Database, Entity, Feed, Filter, Obj, Ref, Type } from '@dxos/echo';
+import { Operation, Trigger } from '@dxos/compute';
+import { Annotation, Database, Entity, Feed, Filter, Obj, Query, Ref, Type } from '@dxos/echo';
 import { getProperties } from '@dxos/effect';
-import { Trigger } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 import { FeedAnnotation } from '@dxos/schema';
 
 export type TriggerRemoteStatus = 'available' | 'not available' | 'n/a';
@@ -300,7 +299,9 @@ export const selectFunction = Effect.fn(function* () {
  * Queries the database for triggers and prompts the user to select one.
  */
 export const selectTrigger = Effect.fn(function* (kind?: Trigger.Kind) {
-  const triggers = yield* Database.runQuery(Filter.type(Trigger.Trigger));
+  const triggers = yield* Database.runQuery(
+    Query.select(Filter.type(Trigger.Trigger)).debugLabel('cli.trigger.selectTrigger'),
+  );
   const filteredTriggers = kind ? triggers.filter((trigger) => trigger.spec?.kind === kind) : triggers;
 
   if (filteredTriggers.length === 0) {

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

@@ -5,16 +5,15 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
+import { Operation, Trigger } from '@dxos/compute';
 import { Obj } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 import { useSpaces } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withTheme } from '@dxos/react-ui/testing';
 
 import { functions } from '#testing';
+import { translations } from '#translations';
 
-import { translations } from '../../translations';
 import { AutomationPanel } from './AutomationPanel';
 
 const DefaultStory = () => {

package/src/components/AutomationPanel/AutomationPanel.tsx

@@ -9,12 +9,12 @@ import * as Schema from 'effect/Schema';
 import React, { useCallback, useMemo, useState } from 'react';
 
 import { useTypeOptions } from '@dxos/app-toolkit/ui';
+import { Script, Trigger } from '@dxos/compute';
+import { Operation } from '@dxos/compute';
 import { Context } from '@dxos/context';
-import { Filter, Obj, Tag } from '@dxos/echo';
-import { Script, Trigger } from '@dxos/functions';
+import { Filter, Obj, Query, Tag } from '@dxos/echo';
 import { KEY_QUEUE_CURSOR } from '@dxos/functions-runtime';
 import { FunctionsServiceClient } from '@dxos/functions-runtime/edge';
-import { Operation } from '@dxos/operation';
 import { type Client, useClient } from '@dxos/react-client';
 import { type Space, useObject, useQuery } from '@dxos/react-client/echo';
 import { Clipboard, IconButton, type IconButtonProps, Input, Separator, useTranslation } from '@dxos/react-ui';
@@ -43,7 +43,10 @@ export const AutomationPanel = ({ space, object, initialTrigger, onDone }: Autom
   const client = useClient();
   const functionsServiceClient = useMemo(() => FunctionsServiceClient.fromClient(client), [client]);
   const functions = useQuery(space.db, Filter.type(Operation.PersistentOperation));
-  const triggers = useQuery(space.db, Filter.type(Trigger.Trigger));
+  const triggers = useQuery(
+    space.db,
+    Query.select(Filter.type(Trigger.Trigger)).debugLabel('plugin-automation.AutomationPanel'),
+  );
   const filteredTriggers = useMemo(() => {
     return object ? triggers.filter(triggerMatch(object)) : triggers;
   }, [object, triggers]);
@@ -77,7 +80,7 @@ export const AutomationPanel = ({ space, object, initialTrigger, onDone }: Autom
 
   const handleSave: TriggerEditorProps['onSave'] = (trigger) => {
     if (selected) {
-      Obj.change(selected, (selected) => {
+      Obj.update(selected, (selected) => {
         Object.assign(selected, trigger);
       });
     } else {
@@ -99,7 +102,7 @@ export const AutomationPanel = ({ space, object, initialTrigger, onDone }: Autom
   };
 
   const handleResetCursor = async (trigger: Trigger.Trigger) => {
-    Obj.change(trigger, (trigger) => {
+    Obj.update(trigger, (trigger) => {
       Obj.deleteKeys(trigger, KEY_QUEUE_CURSOR);
     });
     await space.db.flush({ indexes: true });

package/src/components/FunctionsPanel/FunctionsPanel.tsx

@@ -7,8 +7,7 @@ import React, { useCallback, useMemo } from 'react';
 
 import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { LayoutOperation, getObjectPathFromObject } from '@dxos/app-toolkit';
-import { Script } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
+import { Operation, Script } from '@dxos/compute';
 import { SpaceOperation } from '@dxos/plugin-space/operations';
 import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
 import { IconButton, useTranslation } from '@dxos/react-ui';

package/src/components/FunctionsRegistry/FunctionsRegistry.tsx

@@ -6,9 +6,9 @@ import * as Schema from 'effect/Schema';
 import { useState } from 'react';
 import React, { useCallback } from 'react';
 
+import * as OperationModule from '@dxos/compute';
 import { Context } from '@dxos/context';
 import { getDeployedFunctions } from '@dxos/functions-runtime/edge';
-import * as OperationModule from '@dxos/operation';
 import { useClient } from '@dxos/react-client';
 import { Filter, Query, type Space, useQuery } from '@dxos/react-client/echo';
 import { IconButton, useAsyncEffect, useTranslation } from '@dxos/react-ui';

package/src/components/TriggerEditor/FunctionInputEditor.tsx

@@ -5,9 +5,9 @@
 import type * as SchemaAST from 'effect/SchemaAST';
 import React, { useCallback, useMemo } from 'react';
 
+import { type Operation } from '@dxos/compute';
 import { type Database, JsonSchema, Obj, Ref } from '@dxos/echo';
 import { type JsonPath } from '@dxos/echo/internal';
-import { type Operation } from '@dxos/operation';
 import { useOnTransition, useTranslation } from '@dxos/react-ui';
 import { Form, type FormFieldStateProps, type FormRootProps, useFormValues } from '@dxos/react-ui-form';
 

package/src/components/TriggerEditor/SpecSelector.tsx

@@ -4,8 +4,8 @@
 
 import React, { useCallback, useMemo } from 'react';
 
+import { Trigger } from '@dxos/compute';
 import { Filter, Query } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
 import { useTranslation } from '@dxos/react-ui';
 import { type FormFieldComponentProps, SelectField, useFormFieldState } from '@dxos/react-ui-form';
 
@@ -22,20 +22,15 @@ export const SpecSelector = (props: SpecSelectorProps) => {
       const getDefaultTriggerSpec = (kind: string) => {
         switch (kind) {
           case 'timer':
-            return { kind: 'timer', cron: '' };
+            return Trigger.specTimer('');
           case 'subscription':
-            return {
-              kind: 'subscription',
-              query: {
-                ast: Query.select(Filter.nothing()).ast,
-              },
-            };
+            return Trigger.specSubscription(Query.select(Filter.nothing()));
           case 'queue':
-            return { kind: 'queue', queue: 'dxn:queue:default' };
+            return Trigger.specQueue('dxn:queue:default');
           case 'email':
-            return { kind: 'email' };
+            return Trigger.specEmail();
           case 'webhook':
-            return { kind: 'webhook' };
+            return Trigger.specWebhook();
           default:
             return undefined;
         }

package/src/components/TriggerEditor/TriggerEditor.stories.tsx

@@ -6,21 +6,20 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React, { useState } from 'react';
 import { expect, userEvent, within } from 'storybook/test';
 
+import { Operation, Trigger } from '@dxos/compute';
 import { Filter, Obj, Ref, Tag, Type } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
-import { Operation } from '@dxos/operation';
 import { random } from '@dxos/random';
 import { useQuery } from '@dxos/react-client/echo';
 import { TestSchema, useClientStory, withClientProvider } from '@dxos/react-client/testing';
 import { useAsyncEffect } from '@dxos/react-ui';
-import { translations as formTranslations } from '@dxos/react-ui-form';
+import { translations as formTranslations } from '@dxos/react-ui-form/translations';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { Employer, Organization, Person, Pipeline } from '@dxos/types';
 
 import { functions } from '#testing';
+import { translations } from '#translations';
 
-import { translations } from '../../translations';
 import { TriggerEditor, type TriggerEditorProps } from './TriggerEditor';
 
 const types = [
@@ -47,7 +46,7 @@ const DefaultStory = (props: Partial<TriggerEditorProps>) => {
     const trigger = space.db.add(
       Trigger.make({
         function: Ref.make(fn),
-        spec: { kind: 'webhook' },
+        spec: Trigger.specWebhook(),
         input: {
           from: 'USD',
           to: 'JPY',

package/src/components/TriggerEditor/TriggerEditor.tsx

@@ -4,10 +4,9 @@
 
 import React, { useCallback, useMemo } from 'react';
 
+import { Operation, Script, Trigger } from '@dxos/compute';
 import { ComputeGraph } from '@dxos/conductor';
 import { DXN, type Database, Entity, Feed, Obj, type Query } from '@dxos/echo';
-import { Script, Trigger } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 import { Filter, Ref, useQuery } from '@dxos/react-client/echo';
 import { Input } from '@dxos/react-ui';
 import { QueryForm, type QueryFormProps } from '@dxos/react-ui-components';
@@ -41,7 +40,7 @@ export const TriggerEditor = ({ db, types, tags, readonlySpec, trigger, ...formP
 
   const handleValuesChanged = useCallback(
     (newValues: Partial<TriggerFormSchema>) => {
-      Obj.change(trigger, (trigger) => {
+      Obj.update(trigger, (trigger) => {
         Object.assign(trigger, newValues);
       });
     },

package/src/containers/AutomationSettings/AutomationSettings.tsx

@@ -4,6 +4,7 @@
 
 import React from 'react';
 
+import { AppSurface } from '@dxos/app-toolkit/ui';
 import { useTranslation } from '@dxos/react-ui';
 import { Settings } from '@dxos/react-ui-form';
 
@@ -12,7 +13,9 @@ import { meta } from '#meta';
 import { AutomationPanel, type AutomationPanelProps } from '../../components/AutomationPanel';
 import { TriggersSettings } from '../TriggerSettings';
 
-export const AutomationSettings = (props: AutomationPanelProps) => {
+export type AutomationSettingsProps = AppSurface.SpaceArticleProps<Omit<AutomationPanelProps, 'space'>>;
+
+export const AutomationSettings = (props: AutomationSettingsProps) => {
   const { t } = useTranslation(meta.id);
   return (
     <Settings.Viewport>
@@ -21,7 +24,7 @@ export const AutomationSettings = (props: AutomationPanelProps) => {
         description={t('automation.description', { ns: meta.id })}
       >
         <AutomationPanel {...props} />
-        <TriggersSettings db={props.space.db} />
+        <TriggersSettings space={props.space} />
       </Settings.Section>
     </Settings.Viewport>
   );

package/src/containers/FunctionsContainer/FunctionsContainer.tsx

@@ -4,16 +4,15 @@
 
 import React from 'react';
 
-import { type Space } from '@dxos/react-client/echo';
+import { AppSurface } from '@dxos/app-toolkit/ui';
 import { useTranslation } from '@dxos/react-ui';
 import { Settings } from '@dxos/react-ui-form';
 
 import { meta } from '#meta';
 
-import { FunctionsPanel } from '../../components/FunctionsPanel';
-import { FunctionsRegistry } from '../../components/FunctionsRegistry';
+import { FunctionsPanel, FunctionsRegistry } from '../../components';
 
-export const FunctionsContainer = ({ space }: { space: Space }) => {
+export const FunctionsContainer = ({ space }: AppSurface.SpaceArticleProps) => {
   const { t } = useTranslation(meta.id);
   return (
     <Settings.Viewport>

package/src/containers/TriggerSettings/TriggerSettings.tsx

@@ -4,22 +4,44 @@
 
 import React from 'react';
 
-import { type Database } from '@dxos/echo';
-import { Input, useTranslation } from '@dxos/react-ui';
+import { type ComputeEnvironment } from '@dxos/client-protocol';
+import { useObject } from '@dxos/echo-react';
+import { type Space } from '@dxos/react-client/echo';
+import { DropdownMenu, IconButton, useTranslation } from '@dxos/react-ui';
 import { Settings } from '@dxos/react-ui-form';
 
-import { useTriggerRuntimeControls } from '#hooks';
 import { meta } from '#meta';
 
-export const TriggersSettings = ({ db }: { db: Database.Database }) => {
-  const { state, start, stop } = useTriggerRuntimeControls(db);
-  const isRunning = state?.enabled ?? false;
+export const TriggersSettings = ({ space }: { space: Space }) => {
   const { t } = useTranslation(meta.id);
+  const [properties, changeProperties] = useObject(space.properties);
+  const selected = properties.computeEnvironment ?? 'local';
+
+  const handleUpdate = (option: ComputeEnvironment) => {
+    changeProperties((draft) => {
+      draft.computeEnvironment = option;
+    });
+  };
 
   return (
     <div className='grid grid-cols-1 md:grid-cols-[1fr_min-content]'>
       <Settings.Item title={t('runtime.label')} description={t('runtime.description')}>
-        <Input.Switch classNames='justify-self-end' checked={isRunning} onCheckedChange={isRunning ? stop : start} />
+        <DropdownMenu.Root>
+          <DropdownMenu.Trigger asChild>
+            <IconButton iconEnd icon='ph--caret-down--regular' size={4} label={t(`runtime.${selected}.label`)} />
+          </DropdownMenu.Trigger>
+          <DropdownMenu.Portal>
+            <DropdownMenu.Content side='bottom'>
+              <DropdownMenu.Viewport>
+                <DropdownMenu.Item onClick={() => handleUpdate('disabled')}>
+                  {t(`runtime.disabled.label`)}
+                </DropdownMenu.Item>
+                <DropdownMenu.Item onClick={() => handleUpdate('local')}>{t(`runtime.local.label`)}</DropdownMenu.Item>
+                <DropdownMenu.Item onClick={() => handleUpdate('edge')}>{t(`runtime.edge.label`)}</DropdownMenu.Item>
+              </DropdownMenu.Viewport>
+            </DropdownMenu.Content>
+          </DropdownMenu.Portal>
+        </DropdownMenu.Root>
       </Settings.Item>
     </div>
   );

package/src/hooks/useComputeRuntime.ts

@@ -2,15 +2,29 @@
 // Copyright 2025 DXOS.org
 //
 
-import { useCapability } from '@dxos/app-framework/ui';
+import { useEffect } from 'react';
+
+import { useCapabilities } from '@dxos/app-framework/ui';
 import { SpaceId } from '@dxos/keys';
+import { log } from '@dxos/log';
 
 import { AutomationCapabilities } from '../types';
 
 /**
  * Resolves the compute runtime for a space.
+ * Returns undefined if the AutomationPlugin is not loaded or spaceId is not provided.
  */
 export const useComputeRuntime = (id: SpaceId | undefined): AutomationCapabilities.ComputeRuntime | undefined => {
-  const computeRuntime = useCapability(AutomationCapabilities.ComputeRuntime);
-  return id !== undefined ? computeRuntime.getRuntime(id) : undefined;
+  const [computeRuntime] = useCapabilities(AutomationCapabilities.ComputeRuntime);
+  // One log per change of (capability availability, spaceId) so we can see when
+  // the React subscription actually observes the contributed runtime.
+  useEffect(() => {
+    log('useComputeRuntime', { hasCapability: !!computeRuntime, spaceId: id });
+  }, [!!computeRuntime, id]);
+
+  if (!computeRuntime || id === undefined) {
+    return undefined;
+  }
+
+  return computeRuntime.getRuntime(id);
 };

package/src/hooks/useComputeRuntimeService.ts

@@ -3,22 +3,62 @@
 //
 
 import * as Context from 'effect/Context';
-import { use } from 'react';
-import { useMemo } from 'react';
+import * as Effect from 'effect/Effect';
+import * as Exit from 'effect/Exit';
+import { useEffect, useState } from 'react';
 
-import { unwrapExit } from '@dxos/effect';
 import { SpaceId } from '@dxos/keys';
+import { log } from '@dxos/log';
 
-import { AutomationCapabilities } from '../types';
 import { useComputeRuntime } from './useComputeRuntime';
 
+type ResolvedService<T extends Context.Tag<any, any>> = Context.Tag.Service<T> | undefined;
+
+/**
+ * Resolves a service from the compute runtime for a given space.
+ *
+ * NOTE: Previously implemented via `use(useMemo(() => runtime.runPromiseExit(...)))`.
+ * React's `use()` is weird and unreliable in production builds — the Suspense
+ * boundary can stay pending indefinitely without the promise ever resolving
+ * from React's perspective (the runtime is built lazily on first invocation
+ * and one of its `acquire` steps can block). This `useState` + `useEffect`
+ * flavour avoids suspension entirely: the hook returns `undefined` while the
+ * service is being acquired or if acquisition fails / times out.
+ */
 export const useComputeRuntimeService = <T extends Context.Tag<any, any>>(
   tag: T,
   spaceId?: SpaceId,
-): (Context.Tag.Service<T> & AutomationCapabilities.ComputeRuntime) | undefined => {
+): ResolvedService<T> => {
   const runtime = useComputeRuntime(spaceId);
-  if (!runtime) {
-    return undefined;
-  }
-  return unwrapExit(use(useMemo(() => runtime.runPromiseExit(tag), [runtime, tag])));
+  const [service, setService] = useState<ResolvedService<T>>(undefined);
+
+  useEffect(() => {
+    setService(undefined);
+    if (!runtime) {
+      return;
+    }
+    let cancelled = false;
+    void (async () => {
+      try {
+        const exit = await runtime.runPromiseExit(tag.pipe(Effect.timeout('30 seconds')));
+        if (cancelled) {
+          return;
+        }
+        if (Exit.isSuccess(exit)) {
+          setService(exit.value);
+        } else {
+          log.warn('useComputeRuntimeService: failed to acquire service', { cause: exit.cause });
+        }
+      } catch (error) {
+        if (!cancelled) {
+          log.catch(error);
+        }
+      }
+    })();
+    return () => {
+      cancelled = true;
+    };
+  }, [runtime, tag]);
+
+  return service;
 };

package/src/hooks/useTriggerRuntimeControls.ts

@@ -7,8 +7,8 @@ import type * as Context from 'effect/Context';
 import * as Effect from 'effect/Effect';
 import { useEffect, useState } from 'react';
 
-import { type Database, Filter } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
+import { Trigger } from '@dxos/compute';
+import { type Database, Filter, Query } from '@dxos/echo';
 import { TriggerDispatcher, type TriggerDispatcherState } from '@dxos/functions-runtime';
 import { useQuery } from '@dxos/react-client/echo';
 
@@ -24,7 +24,10 @@ interface TriggerRuntimeControls {
 }
 
 export const useTriggerRuntimeControls = (db: Database.Database | undefined): TriggerRuntimeControls => {
-  const triggers = useQuery(db, Filter.type(Trigger.Trigger));
+  const triggers = useQuery(
+    db,
+    Query.select(Filter.type(Trigger.Trigger)).debugLabel('plugin-automation.useTriggerRuntimeControls'),
+  );
 
   const [dispatcher, setDispatcher] = useState<Context.Tag.Service<TriggerDispatcher> | undefined>(undefined);
 

package/src/index.ts

@@ -2,5 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-export { AutomationPlugin } from './AutomationPlugin';
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const AutomationPlugin = Plugin.lazy(meta, () => import('#plugin'));
 export { meta } from './meta';

package/src/operations/create-trigger-from-template.ts

@@ -5,10 +5,9 @@
 import * as Effect from 'effect/Effect';
 
 import { LayoutOperation, getSpacePath } from '@dxos/app-toolkit';
+import { Operation, Script, Trigger } from '@dxos/compute';
 import { Obj, Ref } from '@dxos/echo';
-import { Script, Trigger } from '@dxos/functions';
 import { type DXN } from '@dxos/keys';
-import { Operation } from '@dxos/operation';
 import { SpaceOperation } from '@dxos/plugin-space/operations';
 import { Filter } from '@dxos/react-client/echo';
 
@@ -31,7 +30,7 @@ const handler: Operation.WithHandler<typeof CreateTriggerFromTemplate> = CreateT
           );
           const [fn] = functions;
           if (fn) {
-            Obj.change(trigger, (trigger) => {
+            Obj.update(trigger, (trigger) => {
               trigger.function = Ref.make(fn);
             });
           }
@@ -40,17 +39,14 @@ const handler: Operation.WithHandler<typeof CreateTriggerFromTemplate> = CreateT
 
       switch (template.type) {
         case 'timer': {
-          Obj.change(trigger, (trigger) => {
-            trigger.spec = { kind: 'timer', cron: template.cron };
+          Obj.update(trigger, (trigger) => {
+            trigger.spec = Trigger.specTimer(template.cron);
           });
           break;
         }
         case 'queue': {
-          Obj.change(trigger, (trigger) => {
-            trigger.spec = {
-              kind: 'queue',
-              queue: (template.queueDXN as DXN).toString(),
-            };
+          Obj.update(trigger, (trigger) => {
+            trigger.spec = Trigger.specQueue((template.queueDXN as DXN).toString());
           });
           break;
         }

package/src/operations/definitions.ts

@@ -5,8 +5,8 @@
 import * as Schema from 'effect/Schema';
 
 import { Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
 import { Database } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
 import { meta } from '#meta';