@dxos/plugin-automation 0.8.4-main.3eb6e50203 → 0.8.4-main.3fbcb4aa9b

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

@@ -12,8 +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 { DXN, Database, Filter, Obj, Ref, Type } from '@dxos/echo';
-import { Function, Trigger } from '@dxos/functions';
+import { Operation, Trigger } from '@dxos/compute';
+import { DXN, Database, Filter, JsonSchema, Obj, Ref } from '@dxos/echo';
 
 import { Enabled, Input, Queue, TriggerId } from '../options';
 import { printTrigger, promptForSchemaInput, selectFunction, selectQueue, selectTrigger } from '../util';
@@ -31,7 +31,6 @@ export const queue = Command.make(
   (options) =>
     Effect.gen(function* () {
       const { json } = yield* CommandConfig;
-
       const triggerId = yield* Option.match(options.id, {
         onNone: () => selectTrigger('queue'),
         onSome: (id) => Effect.succeed(id),
@@ -58,7 +57,7 @@ export const queue = Command.make(
 ).pipe(
   Command.withDescription('Update a queue trigger.'),
   Command.provide(({ spaceId }) => spaceLayer(spaceId, true)),
-  Command.provideEffectDiscard(() => withTypes(Function.Function, Trigger.Trigger)),
+  Command.provideEffectDiscard(() => withTypes(Operation.PersistentOperation, Trigger.Trigger)),
 );
 
 /**
@@ -67,10 +66,10 @@ export const queue = Command.make(
  * @returns The current function (either original or newly assigned)
  */
 const updateFunction = Effect.fn(function* (trigger: Trigger.Trigger, functionIdOption: Option.Option<string>) {
-  let currentFn: Function.Function | undefined = trigger.function
+  let currentFn: Operation.PersistentOperation | undefined = trigger.function
     ? yield* Database.load(trigger.function) as any
     : undefined;
-  if (currentFn && !Obj.instanceOf(Function.Function, currentFn)) {
+  if (currentFn && !Obj.instanceOf(Operation.PersistentOperation, currentFn)) {
     currentFn = undefined;
   }
   const currentFunctionName = currentFn ? (currentFn.name ?? currentFn.id) : undefined;
@@ -87,13 +86,13 @@ const updateFunction = Effect.fn(function* (trigger: Trigger.Trigger, functionId
       onNone: () => selectFunction(),
       onSome: (id) => Effect.succeed(id),
     });
-    const functions = yield* Database.runQuery(Filter.type(Function.Function));
+    const functions = yield* Database.runQuery(Filter.type(Operation.PersistentOperation));
     const foundFn = functions.find((fn) => fn.id === functionId);
-    if (!foundFn || !Obj.instanceOf(Function.Function, foundFn)) {
+    if (!foundFn || !Obj.instanceOf(Operation.PersistentOperation, foundFn)) {
       return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
     }
-    Obj.change(trigger, (mutableTrigger) => {
-      mutableTrigger.function = Ref.make(foundFn);
+    Obj.update(trigger, (trigger) => {
+      trigger.function = Ref.make(foundFn);
     });
     currentFn = foundFn;
   }
@@ -130,9 +129,9 @@ const updateQueue = Effect.fn(function* (trigger: Trigger.Trigger, queueOption:
       onNone: () => selectQueue(),
       onSome: (dxn) => Effect.succeed(dxn.toString()),
     });
-    Obj.change(trigger, (mutableTrigger) => {
-      if (mutableTrigger.spec?.kind === 'queue') {
-        mutableTrigger.spec.queue = queueDxn;
+    Obj.update(trigger, (trigger) => {
+      if (trigger.spec?.kind === 'queue') {
+        trigger.spec.queue = queueDxn;
       }
     });
   }
@@ -144,7 +143,7 @@ const updateQueue = Effect.fn(function* (trigger: Trigger.Trigger, queueOption:
  */
 const updateInput = Effect.fn(function* (
   trigger: Trigger.Trigger,
-  fn: Function.Function,
+  fn: Operation.PersistentOperation,
   inputOption: Option.Option<Record<string, any>>,
 ) {
   const currentInput = trigger.input as Record<string, any> | undefined;
@@ -163,11 +162,11 @@ const updateInput = Effect.fn(function* (
   if (shouldChangeInput) {
     const inputObj = yield* Option.match(inputOption, {
       onNone: () =>
-        promptForSchemaInput(fn.inputSchema ? Type.toEffectSchema(fn.inputSchema) : undefined, currentInput),
+        promptForSchemaInput(fn.inputSchema ? JsonSchema.toEffectSchema(fn.inputSchema) : undefined, currentInput),
       onSome: (value) => Effect.succeed(value as Record<string, any>),
     });
-    Obj.change(trigger, (mutableTrigger) => {
-      mutableTrigger.input = inputObj;
+    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, (mutableTrigger) => {
-    mutableTrigger.enabled = enabledValue;
+  Obj.update(trigger, (trigger) => {
+    trigger.enabled = enabledValue;
   });
 });

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

@@ -13,8 +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 { DXN, Database, Filter, Obj, Query, Ref, Type } from '@dxos/echo';
-import { Function, Trigger } from '@dxos/functions';
+import { Operation, Trigger } from '@dxos/compute';
+import { DXN, Database, Filter, JsonSchema, Obj, Query, Ref } from '@dxos/echo';
 
 import { Deep, Delay, Enabled, Input, TriggerId, Typename } from '../options';
 import { printTrigger, promptForSchemaInput, selectFunction, selectTrigger } from '../util';
@@ -61,7 +61,7 @@ export const subscription = Command.make(
 ).pipe(
   Command.withDescription('Update a subscription trigger.'),
   Command.provide(({ spaceId }) => spaceLayer(spaceId, true)),
-  Command.provideEffectDiscard(() => withTypes(Function.Function, Trigger.Trigger)),
+  Command.provideEffectDiscard(() => withTypes(Operation.PersistentOperation, Trigger.Trigger)),
 );
 
 /**
@@ -95,10 +95,10 @@ const extractCurrentTypename = (spec: Trigger.SubscriptionSpec | undefined): Opt
  * @returns The current function (either original or newly assigned)
  */
 const updateFunction = Effect.fn(function* (trigger: Trigger.Trigger, functionIdOption: Option.Option<string>) {
-  let currentFn: Function.Function | undefined = trigger.function
+  let currentFn: Operation.PersistentOperation | undefined = trigger.function
     ? yield* Database.load(trigger.function) as any
     : undefined;
-  if (currentFn && !Obj.instanceOf(Function.Function, currentFn)) {
+  if (currentFn && !Obj.instanceOf(Operation.PersistentOperation, currentFn)) {
     currentFn = undefined;
   }
   const currentFunctionName = currentFn ? (currentFn.name ?? currentFn.id) : undefined;
@@ -115,13 +115,13 @@ const updateFunction = Effect.fn(function* (trigger: Trigger.Trigger, functionId
       onNone: () => selectFunction(),
       onSome: (id) => Effect.succeed(id),
     });
-    const functions = yield* Database.runQuery(Filter.type(Function.Function));
+    const functions = yield* Database.runQuery(Filter.type(Operation.PersistentOperation));
     const foundFn = functions.find((fn) => fn.id === functionId);
-    if (!foundFn || !Obj.instanceOf(Function.Function, foundFn)) {
+    if (!foundFn || !Obj.instanceOf(Operation.PersistentOperation, foundFn)) {
       return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
     }
-    Obj.change(trigger, (mutableTrigger) => {
-      mutableTrigger.function = Ref.make(foundFn);
+    Obj.update(trigger, (trigger) => {
+      trigger.function = Ref.make(foundFn);
     });
     currentFn = foundFn;
   }
@@ -210,8 +210,8 @@ const updateSpec = Effect.fn(function* (
       subscriptionOptions.delay = delayOptionValue.value;
     }
 
-    Obj.change(trigger, (mutableTrigger) => {
-      const spec = mutableTrigger.spec;
+    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.
         spec.query = { ast: queryAst } as NonNullable<typeof spec.query>;
@@ -227,7 +227,7 @@ const updateSpec = Effect.fn(function* (
  */
 const updateInput = Effect.fn(function* (
   trigger: Trigger.Trigger,
-  fn: Function.Function,
+  fn: Operation.PersistentOperation,
   inputOption: Option.Option<Record<string, any>>,
 ) {
   const currentInput = trigger.input as Record<string, any> | undefined;
@@ -246,11 +246,11 @@ const updateInput = Effect.fn(function* (
   if (shouldChangeInput) {
     const inputObj = yield* Option.match(inputOption, {
       onNone: () =>
-        promptForSchemaInput(fn.inputSchema ? Type.toEffectSchema(fn.inputSchema) : undefined, currentInput),
+        promptForSchemaInput(fn.inputSchema ? JsonSchema.toEffectSchema(fn.inputSchema) : undefined, currentInput),
       onSome: (value) => Effect.succeed(value as Record<string, any>),
     });
-    Obj.change(trigger, (mutableTrigger) => {
-      mutableTrigger.input = inputObj;
+    Obj.update(trigger, (trigger) => {
+      trigger.input = inputObj;
     });
   }
 });
@@ -272,7 +272,7 @@ const updateEnabled = Effect.fn(function* (
       }).pipe(Prompt.run),
     onSome: () => Effect.succeed(enabled),
   });
-  Obj.change(trigger, (mutableTrigger) => {
-    mutableTrigger.enabled = enabledValue;
+  Obj.update(trigger, (trigger) => {
+    trigger.enabled = enabledValue;
   });
 });

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

@@ -12,8 +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 { DXN, Database, Filter, Obj, Ref, Type } from '@dxos/echo';
-import { Function, Trigger } from '@dxos/functions';
+import { Operation, Trigger } from '@dxos/compute';
+import { DXN, Database, Filter, JsonSchema, Obj, Ref } from '@dxos/echo';
 
 import { Cron, Enabled, Input, TriggerId } from '../options';
 import { printTrigger, promptForSchemaInput, selectFunction, selectTrigger } from '../util';
@@ -58,7 +58,7 @@ export const timer = Command.make(
 ).pipe(
   Command.withDescription('Update a timer trigger.'),
   Command.provide(({ spaceId }) => spaceLayer(spaceId, true)),
-  Command.provideEffectDiscard(() => withTypes(Function.Function, Trigger.Trigger)),
+  Command.provideEffectDiscard(() => withTypes(Operation.PersistentOperation, Trigger.Trigger)),
 );
 
 /**
@@ -67,10 +67,10 @@ export const timer = Command.make(
  * @returns The current function (either original or newly assigned)
  */
 const updateFunction = Effect.fn(function* (trigger: Trigger.Trigger, functionIdOption: Option.Option<string>) {
-  let currentFn: Function.Function | undefined = trigger.function
+  let currentFn: Operation.PersistentOperation | undefined = trigger.function
     ? yield* Database.load(trigger.function) as any
     : undefined;
-  if (currentFn && !Obj.instanceOf(Function.Function, currentFn)) {
+  if (currentFn && !Obj.instanceOf(Operation.PersistentOperation, currentFn)) {
     currentFn = undefined;
   }
   const currentFunctionName = currentFn ? (currentFn.name ?? currentFn.id) : undefined;
@@ -87,13 +87,13 @@ const updateFunction = Effect.fn(function* (trigger: Trigger.Trigger, functionId
       onNone: () => selectFunction(),
       onSome: (id) => Effect.succeed(id),
     });
-    const functions = yield* Database.runQuery(Filter.type(Function.Function));
+    const functions = yield* Database.runQuery(Filter.type(Operation.PersistentOperation));
     const foundFn = functions.find((fn) => fn.id === functionId);
-    if (!foundFn || !Obj.instanceOf(Function.Function, foundFn)) {
+    if (!foundFn || !Obj.instanceOf(Operation.PersistentOperation, foundFn)) {
       return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
     }
-    Obj.change(trigger, (mutableTrigger) => {
-      mutableTrigger.function = Ref.make(foundFn);
+    Obj.update(trigger, (trigger) => {
+      trigger.function = Ref.make(foundFn);
     });
     currentFn = foundFn;
   }
@@ -128,9 +128,9 @@ const updateCron = Effect.fn(function* (trigger: Trigger.Trigger, cronOption: Op
         }).pipe(Prompt.run),
       onSome: (value) => Effect.succeed(value),
     });
-    Obj.change(trigger, (mutableTrigger) => {
-      if (mutableTrigger.spec?.kind === 'timer') {
-        mutableTrigger.spec.cron = cron;
+    Obj.update(trigger, (trigger) => {
+      if (trigger.spec?.kind === 'timer') {
+        trigger.spec.cron = cron;
       }
     });
   }
@@ -142,7 +142,7 @@ const updateCron = Effect.fn(function* (trigger: Trigger.Trigger, cronOption: Op
  */
 const updateInput = Effect.fn(function* (
   trigger: Trigger.Trigger,
-  fn: Function.Function,
+  fn: Operation.PersistentOperation,
   inputOption: Option.Option<Record<string, any>>,
 ) {
   const currentInput = trigger.input as Record<string, any> | undefined;
@@ -161,11 +161,11 @@ const updateInput = Effect.fn(function* (
   if (shouldChangeInput) {
     const inputObj = yield* Option.match(inputOption, {
       onNone: () =>
-        promptForSchemaInput(fn.inputSchema ? Type.toEffectSchema(fn.inputSchema) : undefined, currentInput),
+        promptForSchemaInput(fn.inputSchema ? JsonSchema.toEffectSchema(fn.inputSchema) : undefined, currentInput),
       onSome: (value) => Effect.succeed(value as Record<string, any>),
     });
-    Obj.change(trigger, (mutableTrigger) => {
-      mutableTrigger.input = inputObj;
+    Obj.update(trigger, (trigger) => {
+      trigger.input = inputObj;
     });
   }
 });
@@ -187,7 +187,7 @@ const updateEnabled = Effect.fn(function* (
       }).pipe(Prompt.run),
     onSome: () => Effect.succeed(enabled),
   });
-  Obj.change(trigger, (mutableTrigger) => {
-    mutableTrigger.enabled = enabledValue;
+  Obj.update(trigger, (trigger) => {
+    trigger.enabled = enabledValue;
   });
 });

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

@@ -12,10 +12,10 @@ import type * as Schema from 'effect/Schema';
 import * as SchemaAST from 'effect/SchemaAST';
 
 import { FormBuilder } from '@dxos/cli-util';
-import { Annotation, Database, Entity, 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 { Function, Trigger } from '@dxos/functions';
-import { QueueAnnotation } from '@dxos/schema';
+import { FeedAnnotation } from '@dxos/schema';
 
 export type TriggerRemoteStatus = 'available' | 'not available' | 'n/a';
 
@@ -60,7 +60,10 @@ export const printTrigger = Effect.fn(function* (trigger: Trigger.Trigger, remot
       fn,
       FormBuilder.nest(
         'function',
-        FormBuilder.make().pipe(FormBuilder.set('key', fn!.key), FormBuilder.set('dxn', fn!.dxn?.toString())),
+        FormBuilder.make().pipe(
+          FormBuilder.set('key', (fn as Operation.PersistentOperation).key),
+          FormBuilder.set('dxn', Obj.getDXN(fn as Obj.Unknown).toString()),
+        ),
       ),
     ),
     FormBuilder.nestedOption('spec', Option.fromNullable(trigger.spec).pipe(Option.map(printSpec))),
@@ -272,7 +275,7 @@ export const promptForSchemaInput = Effect.fn(function* (
  * Queries the database for functions and prompts the user to select one.
  */
 export const selectFunction = Effect.fn(function* () {
-  const functions = yield* Database.runQuery(Filter.type(Function.Function));
+  const functions = yield* Database.runQuery(Filter.type(Operation.PersistentOperation));
 
   if (functions.length === 0) {
     return yield* Effect.fail(new Error('No functions available'));
@@ -280,7 +283,7 @@ export const selectFunction = Effect.fn(function* () {
 
   const selected = yield* Prompt.select({
     message: 'Select a function:',
-    choices: functions.map((fn: Function.Function) => ({
+    choices: functions.map((fn: Operation.PersistentOperation) => ({
       title: fn.name ?? fn.id,
       value: fn.id,
       description: fn.description,
@@ -296,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) {
@@ -307,7 +312,8 @@ export const selectTrigger = Effect.fn(function* (kind?: Trigger.Kind) {
     filteredTriggers.map((trigger) =>
       Effect.gen(function* () {
         const fn = trigger.function ? yield* Database.load(trigger.function) : undefined;
-        const functionName = fn && Obj.instanceOf(Function.Function, fn) ? (fn.name ?? fn.key ?? fn.id) : undefined;
+        const functionName =
+          fn && Obj.instanceOf(Operation.PersistentOperation, fn) ? (fn.name ?? fn.key ?? fn.id) : undefined;
         const title = functionName ?? trigger.id;
         const description = `${trigger.enabled ? 'enabled' : 'disabled'} - ${trigger.spec?.kind ?? 'unknown'}`;
 
@@ -330,46 +336,55 @@ export const selectTrigger = Effect.fn(function* (kind?: Trigger.Kind) {
 
 /**
  * Selects a queue interactively from available queues in the database.
- * Queries schemas with QueueAnnotation, then queries objects of those types,
- * and extracts queue DXNs from the objects' queue properties.
+ * Queries schemas with FeedAnnotation, then queries objects of those types,
+ * and extracts queue DXNs from the objects' feed properties.
  */
 export const selectQueue = Effect.fn(function* () {
-  // Query schema registry for schemas with QueueAnnotation
+  // Query schema registry for schemas with FeedAnnotation.
   const schemas = yield* Database.runSchemaQuery({ location: ['database', 'runtime'] });
 
-  // Filter schemas that have QueueAnnotation
-  const queueSchemas = schemas.filter((schema) => {
-    const annotation = QueueAnnotation.get(schema);
+  // Filter schemas that have FeedAnnotation.
+  const feedSchemas = schemas.filter((schema) => {
+    const annotation = FeedAnnotation.get(schema);
     return Option.isSome(annotation) && annotation.value === true;
   });
 
-  if (queueSchemas.length === 0) {
-    return yield* Effect.fail(new Error('No schemas with Queue annotation found'));
+  if (feedSchemas.length === 0) {
+    return yield* Effect.fail(new Error('No schemas with Feed annotation found'));
   }
 
-  // Collect all objects with queues
+  // Collect all objects with queues.
   const queueChoices: Array<{ title: string; value: string; description?: string }> = [];
 
-  // Process each schema, skipping ones that fail
-  for (const schema of queueSchemas) {
+  // Process each feed schema, loading the Feed object to extract queue DXN.
+  for (const schema of feedSchemas) {
     yield* Effect.gen(function* () {
       const typename = Type.getTypename(schema);
       const objects = yield* Database.runQuery(Filter.type(typename));
 
       for (const obj of objects) {
-        // Access the queue property (which is a Ref<Queue>)
-        const queueRef = (obj as any).queue as Ref.Ref<any> | undefined;
-        if (!queueRef) {
+        // Access the feed property (which is a Ref<Feed>).
+        const feedRef = (obj as any).feed as Ref.Ref<any> | undefined;
+        if (!feedRef) {
+          continue;
+        }
+
+        const feedObj = yield* Effect.promise(() => feedRef.tryLoad());
+        if (!feedObj || !Obj.instanceOf(Feed.Feed, feedObj)) {
+          continue;
+        }
+
+        const queueDxn = Feed.getQueueDxn(feedObj);
+        if (!queueDxn) {
           continue;
         }
 
-        const queueDxn = queueRef.dxn.toString();
         const label = Obj.getLabel(obj) ?? obj.id;
         const description = Obj.getTypename(obj);
 
         queueChoices.push({
           title: label,
-          value: queueDxn,
+          value: queueDxn.toString(),
           description,
         });
       }

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

@@ -5,13 +5,14 @@
 import { type Meta, type StoryObj } from '@storybook/react-vite';
 import React from 'react';
 
-import { Function, Trigger } from '@dxos/functions';
+import { Operation, Trigger } from '@dxos/compute';
+import { Obj } from '@dxos/echo';
 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 { functions } from '#testing';
+import { translations } from '#translations';
 
 import { AutomationPanel } from './AutomationPanel';
 
@@ -20,14 +21,14 @@ const DefaultStory = () => {
   const space = spaces[1];
 
   return (
-    <div className='is-96'>
+    <div className='w-96'>
       <AutomationPanel space={space} />
     </div>
   );
 };
 
 const meta = {
-  title: 'plugins/plugin-automation/AutomationPanel',
+  title: 'plugins/plugin-automation/components/AutomationPanel',
   component: AutomationPanel as any,
   render: DefaultStory,
   decorators: [
@@ -35,10 +36,10 @@ const meta = {
     withClientProvider({
       createIdentity: true,
       createSpace: true,
-      types: [Function.Function, Trigger.Trigger],
+      types: [Operation.PersistentOperation, Trigger.Trigger],
       onCreateSpace: ({ space }) => {
         for (const fn of functions) {
-          space.db.add(Function.make(fn));
+          space.db.add(Obj.make(Operation.PersistentOperation, { ...fn, version: fn.version ?? '0.1.0' }));
         }
       },
     }),