@dxos/plugin-automation 0.8.4-main.c85a9c8dae → 0.8.4-main.d9fc60f731

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

@@ -13,19 +13,20 @@ 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 { Database, Filter, JsonSchema, Ref } from '@dxos/echo';
-import { Function, Trigger } from '@dxos/functions';
+import { Operation, Trigger } from '@dxos/compute';
+import { Database, Feed as FeedNs, Filter, JsonSchema, Ref } from '@dxos/echo';
+import { EID } from '@dxos/keys';
 
-import { Enabled, Input, Queue } from '../options';
-import { printTrigger, promptForSchemaInput, selectFunction, selectQueue } from '../util';
+import { Enabled, Feed, Input } from '../options';
+import { printTrigger, promptForSchemaInput, selectFunction, selectFeed } from '../util';
 
 export const queue = Command.make(
-  'queue',
+  'feed',
   {
     spaceId: Common.spaceId.pipe(Options.optional),
     enabled: Enabled,
     functionId: Common.functionId.pipe(Options.optional),
-    queue: Queue.pipe(Options.optional),
+    feed: Feed.pipe(Options.optional),
     input: Input.pipe(Options.optional),
   },
   (options) =>
@@ -36,15 +37,15 @@ export const queue = Command.make(
         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 fn = functions.find((fn) => fn.id === functionId);
       if (!fn) {
         return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
       }
 
-      const queueDxn = yield* Option.match(options.queue, {
-        onNone: () => selectQueue(),
-        onSome: (dxn) => Effect.succeed(dxn.toString()),
+      const feed = yield* Option.match(options.feed, {
+        onNone: () => selectFeed(),
+        onSome: (uri) => Database.resolve(EID.parse(uri), FeedNs.Feed),
       });
 
       const input = yield* Option.match(options.input, {
@@ -65,10 +66,7 @@ export const queue = Command.make(
       const trigger = Trigger.make({
         function: Ref.make(fn),
         enabled,
-        spec: {
-          kind: 'queue',
-          queue: queueDxn,
-        },
+        spec: Trigger.specFeed(feed),
         input,
       });
 
@@ -83,7 +81,7 @@ export const queue = Command.make(
       yield* flushAndSync({ indexes: true });
     }),
 ).pipe(
-  Command.withDescription('Create a queue trigger.'),
+  Command.withDescription('Create a feed trigger.'),
   Command.provide(({ spaceId }) => spaceLayer(spaceId, true)),
-  Command.provideEffectDiscard(() => withTypes(Function.Function, Trigger.Trigger)),
+  Command.provideEffectDiscard(() => withTypes(Operation.PersistentOperation, Trigger.Trigger)),
 );

package/src/{cli/commands → commands}/trigger/create/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 { Operation, Trigger } from '@dxos/compute';
 import { Database, Filter, JsonSchema, Query, Ref } from '@dxos/echo';
-import { Function, Trigger } from '@dxos/functions';
 
 import { Deep, Delay, Enabled, Input, Typename } from '../options';
 import { printTrigger, promptForSchemaInput, selectFunction } from '../util';
@@ -38,7 +38,7 @@ export const subscription = Command.make(
         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 fn = functions.find((fn) => fn.id === functionId);
       if (!fn) {
         return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
@@ -51,7 +51,7 @@ export const subscription = Command.make(
           }).pipe(Prompt.run),
         onSome: (value) => Effect.succeed(value),
       });
-      const queryAst = Query.select(Filter.type(typename)).ast;
+      const subscriptionQuery = Query.select(Filter.type(typename));
 
       const deepOption = yield* Option.match(options.deep, {
         onNone: () =>
@@ -102,13 +102,10 @@ export const subscription = Command.make(
       const trigger = Trigger.make({
         function: Ref.make(fn),
         enabled,
-        spec: {
-          kind: 'subscription',
-          query: {
-            ast: queryAst,
-          },
-          options: Object.keys(subscriptionOptions).length > 0 ? subscriptionOptions : undefined,
-        },
+        spec: Trigger.specSubscription(
+          subscriptionQuery,
+          Object.keys(subscriptionOptions).length > 0 ? subscriptionOptions : undefined,
+        ),
         input,
       });
       yield* Database.add(trigger);
@@ -124,5 +121,5 @@ export const subscription = Command.make(
 ).pipe(
   Command.withDescription('Create a subscription trigger.'),
   Command.provide(({ spaceId }) => spaceLayer(spaceId, true)),
-  Command.provideEffectDiscard(() => withTypes(Function.Function, Trigger.Trigger)),
+  Command.provideEffectDiscard(() => withTypes(Operation.PersistentOperation, Trigger.Trigger)),
 );

package/src/{cli/commands → commands}/trigger/create/timer.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 { Operation, Trigger } from '@dxos/compute';
 import { Database, Filter, JsonSchema, Ref } from '@dxos/echo';
-import { Function, Trigger } from '@dxos/functions';
 
 import { Cron, Enabled, Input } from '../options';
 import { printTrigger, promptForSchemaInput, selectFunction } from '../util';
@@ -37,7 +37,7 @@ export const timer = Command.make(
         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 fn = functions.find((fn) => fn.id === functionId);
       if (!fn) {
         return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
@@ -69,10 +69,7 @@ export const timer = Command.make(
       const trigger = Trigger.make({
         function: Ref.make(fn),
         enabled,
-        spec: {
-          kind: 'timer',
-          cron,
-        },
+        spec: Trigger.specTimer(cron),
         input,
       });
 
@@ -89,5 +86,5 @@ export const timer = Command.make(
 ).pipe(
   Command.withDescription('Create a timer trigger.'),
   Command.provide(({ spaceId }) => spaceLayer(spaceId, true)),
-  Command.provideEffectDiscard(() => withTypes(Function.Function, Trigger.Trigger)),
+  Command.provideEffectDiscard(() => withTypes(Operation.PersistentOperation, Trigger.Trigger)),
 );

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

@@ -9,8 +9,9 @@ import * as Effect from 'effect/Effect';
 
 import { CommandConfig, Common, printList, spaceIdWithDefault, spaceLayer } from '@dxos/cli-util';
 import { ClientService } from '@dxos/client';
-import { Database, Filter } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
+import { Trigger } from '@dxos/compute';
+import { Context } from '@dxos/context';
+import { Database, Filter, Query } from '@dxos/echo';
 
 import { getTriggerRemoteStatus, printTrigger } from './util';
 
@@ -23,13 +24,15 @@ export const list = Command.make(
     const { json } = yield* CommandConfig;
 
     // Fetch local triggers
-    const triggers = yield* Database.runQuery(Filter.type(Trigger.Trigger));
+    const triggers = yield* Database.runQuery(
+      Query.select(Filter.type(Trigger.Trigger)).debugLabel('cli.trigger.list'),
+    );
 
     // Fetch remote cron triggers to check availability
     const remoteCronIds = yield* Effect.gen(function* () {
       const client = yield* ClientService;
       const spaceId = yield* spaceIdWithDefault(spaceIdOption);
-      const result = yield* Effect.promise(() => client.edge.http.getCronTriggers(spaceId)).pipe(
+      const result = yield* Effect.promise(() => client.edge.http.getCronTriggers(Context.default(), spaceId)).pipe(
         Effect.catchAll(() => Effect.succeed({ cronIds: [] })),
       );
       return result.cronIds;

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

@@ -3,9 +3,6 @@
 //
 
 import * as Options from '@effect/cli/Options';
-import * as Schema from 'effect/Schema';
-
-import { DXN } from '@dxos/keys';
 
 export const TriggerId = Options.text('id').pipe(Options.withDescription('The id of the trigger.'));
 
@@ -42,18 +39,9 @@ export const Cron = Options.text('cron').pipe(
 );
 
 //
-// Queue
+// Feed
 //
 
-// TODO(dmaretskyi): Extract
-const DXNSchema = Schema.String.pipe(
-  Schema.transform(Schema.instanceOf(DXN), {
-    decode: (value: string) => DXN.parse(value),
-    encode: (value: DXN) => value.toString(),
-  }),
-);
-
-export const Queue = Options.text('queue').pipe(
-  Options.withDescription('The DXN of the queue for the queue trigger.'),
-  Options.withSchema(DXNSchema),
+export const Feed = Options.text('feed').pipe(
+  Options.withDescription('The EID of the feed for the feed trigger (echo://<spaceId>/<objectId>).'),
 );

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

@@ -9,9 +9,9 @@ import * as Effect from 'effect/Effect';
 import * as Option from 'effect/Option';
 
 import { CommandConfig, Common, print, spaceLayer, withTypes } from '@dxos/cli-util';
-import { DXN } from '@dxos/echo';
-import { Database } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
+import { Trigger } from '@dxos/compute';
+import { Database, Ref } from '@dxos/echo';
+import { EID } from '@dxos/keys';
 
 import { TriggerId } from './options';
 import { printTriggerRemoved, selectTrigger } from './util';
@@ -29,8 +29,8 @@ export const remove = Command.make(
         onNone: () => selectTrigger(),
         onSome: (id) => Effect.succeed(id),
       });
-      const dxn = DXN.fromLocalObjectId(triggerId);
-      const trigger = yield* Database.resolve(dxn, Trigger.Trigger);
+      const dxn = EID.make({ entityId: triggerId });
+      const trigger = yield* Database.resolve(Ref.fromURI(dxn), Trigger.Trigger);
       yield* Database.remove(trigger);
       if (json) {
         yield* Console.log(JSON.stringify({ id: trigger.id, removed: true }, null, 2));

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

@@ -12,38 +12,38 @@ 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, JsonSchema, Obj, Ref } from '@dxos/echo';
-import { Function, Trigger } from '@dxos/functions';
+import { Operation, Trigger } from '@dxos/compute';
+import { Database, Feed as FeedNs, Filter, JsonSchema, Obj, Ref } from '@dxos/echo';
+import { EID, type EntityId } from '@dxos/keys';
 
-import { Enabled, Input, Queue, TriggerId } from '../options';
-import { printTrigger, promptForSchemaInput, selectFunction, selectQueue, selectTrigger } from '../util';
+import { Enabled, Feed, Input, TriggerId } from '../options';
+import { printTrigger, promptForSchemaInput, selectFunction, selectFeed, selectTrigger } from '../util';
 
 export const queue = Command.make(
-  'queue',
+  'feed',
   {
     spaceId: Common.spaceId.pipe(Options.optional),
     id: TriggerId.pipe(Options.optional),
     enabled: Enabled,
     functionId: Common.functionId.pipe(Options.optional),
-    queue: Queue.pipe(Options.optional),
+    feed: Feed.pipe(Options.optional),
     input: Input.pipe(Options.optional),
   },
   (options) =>
     Effect.gen(function* () {
       const { json } = yield* CommandConfig;
-
       const triggerId = yield* Option.match(options.id, {
-        onNone: () => selectTrigger('queue'),
+        onNone: () => selectTrigger('feed'),
         onSome: (id) => Effect.succeed(id),
       });
-      const dxn = DXN.fromLocalObjectId(triggerId);
+      const dxn = EID.make({ entityId: triggerId as EntityId });
       const trigger = yield* Database.resolve(dxn, Trigger.Trigger);
-      if (trigger.spec?.kind !== 'queue') {
+      if (trigger.spec?.kind !== 'feed') {
         return yield* Effect.fail(new Error(`Invalid trigger type: ${trigger.spec?.kind}`));
       }
 
       const currentFn = yield* updateFunction(trigger, options.functionId);
-      yield* updateQueue(trigger, options.queue);
+      yield* updateFeed(trigger, options.feed);
       yield* updateInput(trigger, currentFn, options.input);
       yield* updateEnabled(trigger, options.id, options.enabled);
 
@@ -56,9 +56,9 @@ export const queue = Command.make(
       yield* flushAndSync({ indexes: true });
     }),
 ).pipe(
-  Command.withDescription('Update a queue trigger.'),
+  Command.withDescription('Update a feed 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 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,19 +87,19 @@ 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;
   }
 
   if (!currentFn) {
-    const functionId = trigger.function?.dxn.asEchoDXN()?.echoId ?? 'unknown';
+    const functionId = (trigger.function ? trigger.function.uri.toString() : undefined) ?? 'unknown';
     return yield* Effect.fail(new Error(`Invalid reference for ${functionId}`));
   }
 
@@ -107,32 +107,28 @@ const updateFunction = Effect.fn(function* (trigger: Trigger.Trigger, functionId
 });
 
 /**
- * Handles updating the queue DXN for a queue trigger.
- * Prompts for confirmation if queue is not provided, then updates the queue if confirmed.
+ * Handles updating the feed reference for a feed trigger.
+ * Prompts for confirmation if feed is not provided, then updates the feed if confirmed.
  */
-const updateQueue = Effect.fn(function* (trigger: Trigger.Trigger, queueOption: Option.Option<DXN>) {
-  const currentQueue = trigger.spec?.kind === 'queue' ? trigger.spec.queue : undefined;
-  const currentQueueStr = currentQueue
-    ? typeof currentQueue === 'string'
-      ? currentQueue
-      : String(currentQueue)
-    : undefined;
-  const shouldChangeQueue = yield* Option.match(queueOption, {
+const updateFeed = Effect.fn(function* (trigger: Trigger.Trigger, feedOption: Option.Option<string>) {
+  const currentFeed = trigger.spec?.kind === 'feed' ? trigger.spec.feed : undefined;
+  const currentFeedStr = currentFeed ? currentFeed.uri.toString() : undefined;
+  const shouldChangeFeed = yield* Option.match(feedOption, {
     onNone: () =>
       Prompt.confirm({
-        message: `Change the queue${currentQueueStr ? ` (current: ${currentQueueStr})` : ''}?`,
+        message: `Change the feed${currentFeedStr ? ` (current: ${currentFeedStr})` : ''}?`,
         initial: false,
       }).pipe(Prompt.run),
     onSome: () => Effect.succeed(true),
   });
-  if (shouldChangeQueue) {
-    const queueDxn = yield* Option.match(queueOption, {
-      onNone: () => selectQueue(),
-      onSome: (dxn) => Effect.succeed(dxn.toString()),
+  if (shouldChangeFeed) {
+    const feed = yield* Option.match(feedOption, {
+      onNone: () => selectFeed(),
+      onSome: (uri) => Database.resolve(EID.parse(uri), FeedNs.Feed),
     });
-    Obj.change(trigger, (mutableTrigger) => {
-      if (mutableTrigger.spec?.kind === 'queue') {
-        mutableTrigger.spec.queue = queueDxn;
+    Obj.update(trigger, (trigger) => {
+      if (trigger.spec?.kind === 'feed') {
+        trigger.spec.feed = Ref.make(feed);
       }
     });
   }
@@ -144,7 +140,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;
@@ -166,8 +162,8 @@ 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, (mutableTrigger) => {
-      mutableTrigger.input = inputObj;
+    Obj.update(trigger, (trigger) => {
+      trigger.input = inputObj;
     });
   }
 });
@@ -189,7 +185,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,9 @@ 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, JsonSchema, Obj, Query, Ref } from '@dxos/echo';
-import { Function, Trigger } from '@dxos/functions';
+import { Operation, Trigger } from '@dxos/compute';
+import { Database, Filter, JsonSchema, Obj, Query, Ref } from '@dxos/echo';
+import { DXN, EID } from '@dxos/keys';
 
 import { Deep, Delay, Enabled, Input, TriggerId, Typename } from '../options';
 import { printTrigger, promptForSchemaInput, selectFunction, selectTrigger } from '../util';
@@ -39,8 +40,8 @@ export const subscription = Command.make(
         onNone: () => selectTrigger('subscription'),
         onSome: (id) => Effect.succeed(id),
       });
-      const dxn = DXN.fromLocalObjectId(triggerId);
-      const trigger = yield* Database.resolve(dxn, Trigger.Trigger);
+      const dxn = EID.make({ entityId: triggerId });
+      const trigger = yield* Database.resolve(Ref.fromURI(dxn), Trigger.Trigger);
       if (trigger.spec?.kind !== 'subscription') {
         return yield* Effect.fail(new Error(`Invalid trigger type: ${trigger.spec?.kind}`));
       }
@@ -61,7 +62,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)),
 );
 
 /**
@@ -78,8 +79,7 @@ const extractCurrentTypename = (spec: Trigger.SubscriptionSpec | undefined): Opt
         Match.withReturnType<Option.Option<string>>(),
         Match.when({ type: 'object' }, (f) =>
           Option.fromNullable(f.typename).pipe(
-            Option.flatMap((dxn) => Option.fromNullable(DXN.tryParse(dxn))),
-            Option.flatMap((dxn) => Option.fromNullable(dxn.asTypeDXN()?.type)),
+            Option.flatMap((dxn) => Option.fromNullable(DXN.isDXN(dxn) ? DXN.getName(dxn) : undefined)),
           ),
         ),
         Match.orElse(() => Option.none()),
@@ -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,19 +115,20 @@ 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;
   }
 
   if (!currentFn) {
-    const functionId = trigger.function?.dxn.asEchoDXN()?.echoId ?? 'unknown';
+    const functionId =
+      (trigger.function ? EID.getEntityId(EID.tryParse(trigger.function.uri)!) : undefined) ?? 'unknown';
     return yield* Effect.fail(new Error(`Invalid reference for ${functionId}`));
   }
 
@@ -210,8 +211,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 +228,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;
@@ -249,8 +250,8 @@ 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, (mutableTrigger) => {
-      mutableTrigger.input = inputObj;
+    Obj.update(trigger, (trigger) => {
+      trigger.input = inputObj;
     });
   }
 });
@@ -272,7 +273,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,9 @@ 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, JsonSchema, Obj, Ref } from '@dxos/echo';
-import { Function, Trigger } from '@dxos/functions';
+import { Operation, Trigger } from '@dxos/compute';
+import { Database, Filter, JsonSchema, Obj, Ref } from '@dxos/echo';
+import { EID } from '@dxos/keys';
 
 import { Cron, Enabled, Input, TriggerId } from '../options';
 import { printTrigger, promptForSchemaInput, selectFunction, selectTrigger } from '../util';
@@ -36,8 +37,8 @@ export const timer = Command.make(
         onNone: () => selectTrigger('timer'),
         onSome: (id) => Effect.succeed(id),
       });
-      const dxn = DXN.fromLocalObjectId(triggerId);
-      const trigger = yield* Database.resolve(dxn, Trigger.Trigger);
+      const dxn = EID.make({ entityId: triggerId });
+      const trigger = yield* Database.resolve(Ref.fromURI(dxn), Trigger.Trigger);
       if (!trigger.spec || trigger.spec?.kind !== 'timer') {
         return yield* Effect.fail(new Error(`Invalid trigger type: ${trigger.spec?.kind}`));
       }
@@ -58,7 +59,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 +68,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,19 +88,20 @@ 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;
   }
 
   if (!currentFn) {
-    const functionId = trigger.function?.dxn.asEchoDXN()?.echoId ?? 'unknown';
+    const functionId =
+      (trigger.function ? EID.getEntityId(EID.tryParse(trigger.function.uri)!) : undefined) ?? 'unknown';
     return yield* Effect.fail(new Error(`Invalid reference for ${functionId}`));
   }
 
@@ -128,9 +130,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 +144,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;
@@ -164,8 +166,8 @@ 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, (mutableTrigger) => {
-      mutableTrigger.input = inputObj;
+    Obj.update(trigger, (trigger) => {
+      trigger.input = inputObj;
     });
   }
 });
@@ -187,7 +189,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;
   });
 });