@dxos/plugin-automation 0.8.4-main.bc674ce → 0.8.4-main.bcb3aa67d6

package/dist/lib/browser/cli/index.mjs

@@ -1,16 +1,12 @@
-import {
-  ComputeRuntime
-} from "../chunk-BKFQBKYO.mjs";
-import {
-  AutomationEvents
-} from "../chunk-JOXPQ27I.mjs";
-import {
-  meta
-} from "../chunk-PZNBEKO5.mjs";
+import "../chunk-J5LGTIGS.mjs";
 
 // src/cli/plugin.ts
-import { Common as Common9, Plugin } from "@dxos/app-framework";
+import { Plugin } from "@dxos/app-framework";
+import { AppPlugin } from "@dxos/app-toolkit";
 import { ClientEvents } from "@dxos/plugin-client/types";
+import { ComputeRuntime } from "#capabilities";
+import { meta } from "#meta";
+import { AutomationEvents } from "#types";
 
 // src/cli/commands/trigger/index.ts
 import * as Command11 from "@effect/cli/Command";
@@ -29,8 +25,9 @@ import * as Option2 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 as Database2, Filter as Filter2, Ref as Ref2, Type as Type2 } from "@dxos/echo";
-import { Function as Function2, Trigger as Trigger2 } from "@dxos/functions";
+import { Database as Database2, Filter as Filter2, JsonSchema, Ref as Ref2 } from "@dxos/echo";
+import { Trigger as Trigger2 } from "@dxos/functions";
+import { Operation as Operation2 } from "@dxos/operation";
 
 // src/cli/commands/trigger/options.ts
 import * as Options from "@effect/cli/Options";
@@ -62,10 +59,11 @@ import * as Match from "effect/Match";
 import * as Option from "effect/Option";
 import * as SchemaAST from "effect/SchemaAST";
 import { FormBuilder } from "@dxos/cli-util";
-import { Annotation, Database, Entity, Filter, Obj, Ref, Type } from "@dxos/echo";
+import { Annotation, Database, Entity, Feed, Filter, Obj, Ref, Type } from "@dxos/echo";
 import { getProperties } from "@dxos/effect";
-import { Function, Trigger } from "@dxos/functions";
-import { QueueAnnotation } from "@dxos/schema";
+import { Trigger } from "@dxos/functions";
+import { Operation } from "@dxos/operation";
+import { FeedAnnotation } from "@dxos/schema";
 var getTriggerRemoteStatus = (trigger2, remoteCronIds) => {
   if (trigger2.spec?.kind !== "timer") {
     return "n/a";
@@ -73,10 +71,10 @@ var getTriggerRemoteStatus = (trigger2, remoteCronIds) => {
   return remoteCronIds.includes(trigger2.id) ? "available" : "not available";
 };
 var printTrigger = Effect.fn(function* (trigger2, remoteStatus) {
-  const fn6 = trigger2.function && (yield* Database.Service.load(trigger2.function));
+  const fn6 = trigger2.function && (yield* Database.load(trigger2.function));
   return FormBuilder.make({
     title: trigger2.id
-  }).pipe(FormBuilder.set("status", trigger2.enabled ? "enabled" : "disabled", trigger2.enabled ? Ansi.green : Ansi.blackBright), FormBuilder.option("kind", Option.fromNullable(trigger2.spec?.kind)), FormBuilder.option("remote", Option.fromNullable(remoteStatus), Match.type().pipe(Match.withReturnType(), Match.when("available", () => Ansi.green), Match.when("not available", () => Ansi.yellow), Match.when("n/a", () => Ansi.blackBright), Match.exhaustive)), FormBuilder.when(fn6, FormBuilder.nest("function", FormBuilder.make().pipe(FormBuilder.set("key", fn6.key), FormBuilder.set("dxn", fn6.dxn?.toString())))), FormBuilder.nestedOption("spec", Option.fromNullable(trigger2.spec).pipe(Option.map(printSpec))), FormBuilder.build);
+  }).pipe(FormBuilder.set("status", trigger2.enabled ? "enabled" : "disabled", trigger2.enabled ? Ansi.green : Ansi.blackBright), FormBuilder.option("kind", Option.fromNullable(trigger2.spec?.kind)), FormBuilder.option("remote", Option.fromNullable(remoteStatus), Match.type().pipe(Match.withReturnType(), Match.when("available", () => Ansi.green), Match.when("not available", () => Ansi.yellow), Match.when("n/a", () => Ansi.blackBright), Match.exhaustive)), FormBuilder.when(fn6, FormBuilder.nest("function", FormBuilder.make().pipe(FormBuilder.set("key", fn6.key), FormBuilder.set("dxn", Obj.getDXN(fn6).toString())))), FormBuilder.nestedOption("spec", Option.fromNullable(trigger2.spec).pipe(Option.map(printSpec))), FormBuilder.build);
 });
 var printSpec = (spec) => {
   switch (spec.kind) {
@@ -202,7 +200,7 @@ var promptForSchemaInput = Effect.fn(function* (schema, defaults) {
         inputObj[key] = templateStr === "" && defaultValue !== void 0 ? defaultValue : templateStr;
       } else {
         const annotation = Annotation.ReferenceAnnotation.getFromAst(propType).pipe(Option.getOrThrow);
-        const objects = yield* Database.Service.runQuery(Filter.typename(annotation.typename));
+        const objects = yield* Database.runQuery(Filter.typename(annotation.typename));
         if (objects.length === 0) {
           inputObj[key] = void 0;
         } else {
@@ -228,7 +226,7 @@ var promptForSchemaInput = Effect.fn(function* (schema, defaults) {
   return inputObj;
 });
 var selectFunction = Effect.fn(function* () {
-  const functions = yield* Database.Service.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"));
   }
@@ -243,14 +241,14 @@ var selectFunction = Effect.fn(function* () {
   return String(selected);
 });
 var selectTrigger = Effect.fn(function* (kind) {
-  const triggers = yield* Database.Service.runQuery(Filter.type(Trigger.Trigger));
+  const triggers = yield* Database.runQuery(Filter.type(Trigger.Trigger));
   const filteredTriggers = kind ? triggers.filter((trigger2) => trigger2.spec?.kind === kind) : triggers;
   if (filteredTriggers.length === 0) {
     return yield* Effect.fail(new Error(kind ? `No ${kind} triggers available` : "No triggers available"));
   }
   const choices = yield* Effect.all(filteredTriggers.map((trigger2) => Effect.gen(function* () {
-    const fn6 = trigger2.function ? yield* Database.Service.load(trigger2.function) : void 0;
-    const functionName = fn6 && Obj.instanceOf(Function.Function, fn6) ? fn6.name ?? fn6.key ?? fn6.id : void 0;
+    const fn6 = trigger2.function ? yield* Database.load(trigger2.function) : void 0;
+    const functionName = fn6 && Obj.instanceOf(Operation.PersistentOperation, fn6) ? fn6.name ?? fn6.key ?? fn6.id : void 0;
     const title = functionName ?? trigger2.id;
     const description = `${trigger2.enabled ? "enabled" : "disabled"} - ${trigger2.spec?.kind ?? "unknown"}`;
     return {
@@ -266,35 +264,42 @@ var selectTrigger = Effect.fn(function* (kind) {
   return String(selected);
 });
 var selectQueue = Effect.fn(function* () {
-  const schemas = yield* Database.Service.runSchemaQuery({
+  const schemas = yield* Database.runSchemaQuery({
     location: [
       "database",
       "runtime"
     ]
   });
-  const queueSchemas = schemas.filter((schema) => {
-    const annotation = QueueAnnotation.get(schema);
+  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"));
   }
   const queueChoices = [];
-  for (const schema of queueSchemas) {
+  for (const schema of feedSchemas) {
     yield* Effect.gen(function* () {
       const typename = Type.getTypename(schema);
-      const objects = yield* Database.Service.runQuery(Filter.type(typename));
+      const objects = yield* Database.runQuery(Filter.type(typename));
       for (const obj of objects) {
-        const queueRef = obj.queue;
-        if (!queueRef) {
+        const feedRef = obj.feed;
+        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
         });
       }
@@ -326,7 +331,7 @@ var queue = Command.make("queue", {
     onNone: () => selectFunction(),
     onSome: (id) => Effect2.succeed(id)
   });
-  const functions = yield* Database2.Service.runQuery(Filter2.type(Function2.Function));
+  const functions = yield* Database2.runQuery(Filter2.type(Operation2.PersistentOperation));
   const fn6 = functions.find((fn7) => fn7.id === functionId);
   if (!fn6) {
     return yield* Effect2.fail(new Error(`Function not found: ${functionId}`));
@@ -336,7 +341,7 @@ var queue = Command.make("queue", {
     onSome: (dxn) => Effect2.succeed(dxn.toString())
   });
   const input = yield* Option2.match(options.input, {
-    onNone: () => promptForSchemaInput(fn6.inputSchema ? Type2.toEffectSchema(fn6.inputSchema) : void 0),
+    onNone: () => promptForSchemaInput(fn6.inputSchema ? JsonSchema.toEffectSchema(fn6.inputSchema) : void 0),
     onSome: (value2) => Effect2.succeed(Object.fromEntries(HashMap.toEntries(value2)))
   });
   const enabled = yield* Option2.match(options.functionId, {
@@ -355,7 +360,7 @@ var queue = Command.make("queue", {
     },
     input
   });
-  yield* Database2.Service.add(trigger2);
+  yield* Database2.add(trigger2);
   if (json) {
     yield* Console2.log(JSON.stringify(trigger2, null, 2));
   } else {
@@ -364,7 +369,7 @@ var queue = Command.make("queue", {
   yield* flushAndSync({
     indexes: true
   });
-})).pipe(Command.withDescription("Create a queue trigger."), Command.provide(({ spaceId }) => spaceLayer(spaceId, true)), Command.provideEffectDiscard(() => withTypes(Function2.Function, Trigger2.Trigger)));
+})).pipe(Command.withDescription("Create a queue trigger."), Command.provide(({ spaceId }) => spaceLayer(spaceId, true)), Command.provideEffectDiscard(() => withTypes(Operation2.PersistentOperation, Trigger2.Trigger)));
 
 // src/cli/commands/trigger/create/subscription.ts
 import * as Command2 from "@effect/cli/Command";
@@ -377,8 +382,9 @@ import * as Option3 from "effect/Option";
 import { CommandConfig as CommandConfig2 } from "@dxos/cli-util";
 import { flushAndSync as flushAndSync2, print as print2, spaceLayer as spaceLayer2, withTypes as withTypes2 } from "@dxos/cli-util";
 import { Common as Common2 } from "@dxos/cli-util";
-import { Database as Database3, Filter as Filter3, Query, Ref as Ref3, Type as Type3 } from "@dxos/echo";
-import { Function as Function3, Trigger as Trigger3 } from "@dxos/functions";
+import { Database as Database3, Filter as Filter3, JsonSchema as JsonSchema2, Query, Ref as Ref3 } from "@dxos/echo";
+import { Trigger as Trigger3 } from "@dxos/functions";
+import { Operation as Operation3 } from "@dxos/operation";
 var subscription = Command2.make("subscription", {
   spaceId: Common2.spaceId.pipe(Options3.optional),
   enabled: Enabled,
@@ -393,7 +399,7 @@ var subscription = Command2.make("subscription", {
     onNone: () => selectFunction(),
     onSome: (id) => Effect3.succeed(id)
   });
-  const functions = yield* Database3.Service.runQuery(Filter3.type(Function3.Function));
+  const functions = yield* Database3.runQuery(Filter3.type(Operation3.PersistentOperation));
   const fn6 = functions.find((fn7) => fn7.id === functionId);
   if (!fn6) {
     return yield* Effect3.fail(new Error(`Function not found: ${functionId}`));
@@ -429,7 +435,7 @@ var subscription = Command2.make("subscription", {
     subscriptionOptions.delay = delayOption.value;
   }
   const input = yield* Option3.match(options.input, {
-    onNone: () => promptForSchemaInput(fn6.inputSchema ? Type3.toEffectSchema(fn6.inputSchema) : void 0),
+    onNone: () => promptForSchemaInput(fn6.inputSchema ? JsonSchema2.toEffectSchema(fn6.inputSchema) : void 0),
     onSome: (value2) => Effect3.succeed(Object.fromEntries(HashMap2.toEntries(value2)))
   });
   const enabled = yield* Option3.match(options.functionId, {
@@ -451,7 +457,7 @@ var subscription = Command2.make("subscription", {
     },
     input
   });
-  yield* Database3.Service.add(trigger2);
+  yield* Database3.add(trigger2);
   if (json) {
     yield* Console3.log(JSON.stringify(trigger2, null, 2));
   } else {
@@ -460,7 +466,7 @@ var subscription = Command2.make("subscription", {
   yield* flushAndSync2({
     indexes: true
   });
-})).pipe(Command2.withDescription("Create a subscription trigger."), Command2.provide(({ spaceId }) => spaceLayer2(spaceId, true)), Command2.provideEffectDiscard(() => withTypes2(Function3.Function, Trigger3.Trigger)));
+})).pipe(Command2.withDescription("Create a subscription trigger."), Command2.provide(({ spaceId }) => spaceLayer2(spaceId, true)), Command2.provideEffectDiscard(() => withTypes2(Operation3.PersistentOperation, Trigger3.Trigger)));
 
 // src/cli/commands/trigger/create/timer.ts
 import * as Command3 from "@effect/cli/Command";
@@ -473,8 +479,9 @@ import * as Option4 from "effect/Option";
 import { CommandConfig as CommandConfig3 } from "@dxos/cli-util";
 import { flushAndSync as flushAndSync3, print as print3, spaceLayer as spaceLayer3, withTypes as withTypes3 } from "@dxos/cli-util";
 import { Common as Common3 } from "@dxos/cli-util";
-import { Database as Database4, Filter as Filter4, Ref as Ref4, Type as Type4 } from "@dxos/echo";
-import { Function as Function4, Trigger as Trigger4 } from "@dxos/functions";
+import { Database as Database4, Filter as Filter4, JsonSchema as JsonSchema3, Ref as Ref4 } from "@dxos/echo";
+import { Trigger as Trigger4 } from "@dxos/functions";
+import { Operation as Operation4 } from "@dxos/operation";
 var timer = Command3.make("timer", {
   spaceId: Common3.spaceId.pipe(Options4.optional),
   enabled: Enabled,
@@ -487,7 +494,7 @@ var timer = Command3.make("timer", {
     onNone: () => selectFunction(),
     onSome: (id) => Effect4.succeed(id)
   });
-  const functions = yield* Database4.Service.runQuery(Filter4.type(Function4.Function));
+  const functions = yield* Database4.runQuery(Filter4.type(Operation4.PersistentOperation));
   const fn6 = functions.find((fn7) => fn7.id === functionId);
   if (!fn6) {
     return yield* Effect4.fail(new Error(`Function not found: ${functionId}`));
@@ -499,7 +506,7 @@ var timer = Command3.make("timer", {
     onSome: (value2) => Effect4.succeed(value2)
   });
   const input = yield* Option4.match(options.input, {
-    onNone: () => promptForSchemaInput(fn6.inputSchema ? Type4.toEffectSchema(fn6.inputSchema) : void 0),
+    onNone: () => promptForSchemaInput(fn6.inputSchema ? JsonSchema3.toEffectSchema(fn6.inputSchema) : void 0),
     onSome: (value2) => Effect4.succeed(Object.fromEntries(HashMap3.toEntries(value2)))
   });
   const enabled = yield* Option4.match(options.functionId, {
@@ -518,7 +525,7 @@ var timer = Command3.make("timer", {
     },
     input
   });
-  yield* Database4.Service.add(trigger2);
+  yield* Database4.add(trigger2);
   if (json) {
     yield* Console4.log(JSON.stringify(trigger2, null, 2));
   } else {
@@ -527,7 +534,7 @@ var timer = Command3.make("timer", {
   yield* flushAndSync3({
     indexes: true
   });
-})).pipe(Command3.withDescription("Create a timer trigger."), Command3.provide(({ spaceId }) => spaceLayer3(spaceId, true)), Command3.provideEffectDiscard(() => withTypes3(Function4.Function, Trigger4.Trigger)));
+})).pipe(Command3.withDescription("Create a timer trigger."), Command3.provide(({ spaceId }) => spaceLayer3(spaceId, true)), Command3.provideEffectDiscard(() => withTypes3(Operation4.PersistentOperation, Trigger4.Trigger)));
 
 // src/cli/commands/trigger/create/index.ts
 var create = Command4.make("create").pipe(Command4.withDescription("Create a trigger."), Command4.withSubcommands([
@@ -543,17 +550,22 @@ import * as Console5 from "effect/Console";
 import * as Effect5 from "effect/Effect";
 import { CommandConfig as CommandConfig4, Common as Common4, printList, spaceIdWithDefault, spaceLayer as spaceLayer4 } from "@dxos/cli-util";
 import { ClientService } from "@dxos/client";
+import { Context } from "@dxos/context";
 import { Database as Database5, Filter as Filter5 } from "@dxos/echo";
 import { Trigger as Trigger5 } from "@dxos/functions";
+var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-automation/src/cli/commands/trigger/list.ts";
 var list = Command5.make("list", {
   spaceId: Common4.spaceId.pipe(Options5.optional)
 }, Effect5.fn(function* ({ spaceId: spaceIdOption }) {
   const { json } = yield* CommandConfig4;
-  const triggers = yield* Database5.Service.runQuery(Filter5.type(Trigger5.Trigger));
+  const triggers = yield* Database5.runQuery(Filter5.type(Trigger5.Trigger));
   const remoteCronIds = yield* Effect5.gen(function* () {
     const client = yield* ClientService;
     const spaceId = yield* spaceIdWithDefault(spaceIdOption);
-    const result = yield* Effect5.promise(() => client.edge.getCronTriggers(spaceId)).pipe(Effect5.catchAll(() => Effect5.succeed({
+    const result = yield* Effect5.promise(() => client.edge.http.getCronTriggers(Context.default(void 0, {
+      F: __dxlog_file,
+      L: 33
+    }), spaceId)).pipe(Effect5.catchAll(() => Effect5.succeed({
       cronIds: []
     })));
     return result.cronIds;
@@ -597,8 +609,8 @@ var remove = Command6.make("remove", {
     onSome: (id) => Effect6.succeed(id)
   });
   const dxn = DXN2.fromLocalObjectId(triggerId);
-  const trigger2 = yield* Database6.Service.resolve(dxn, Trigger6.Trigger);
-  yield* Database6.Service.remove(trigger2);
+  const trigger2 = yield* Database6.resolve(dxn, Trigger6.Trigger);
+  yield* Database6.remove(trigger2);
   if (json) {
     yield* Console6.log(JSON.stringify({
       id: trigger2.id,
@@ -622,8 +634,9 @@ import * as Option6 from "effect/Option";
 import { CommandConfig as CommandConfig6 } from "@dxos/cli-util";
 import { flushAndSync as flushAndSync4, print as print5, spaceLayer as spaceLayer6, withTypes as withTypes5 } from "@dxos/cli-util";
 import { Common as Common6 } from "@dxos/cli-util";
-import { DXN as DXN3, Database as Database7, Filter as Filter6, Obj as Obj2, Ref as Ref5, Type as Type5 } from "@dxos/echo";
-import { Function as Function5, Trigger as Trigger7 } from "@dxos/functions";
+import { DXN as DXN3, Database as Database7, Filter as Filter6, JsonSchema as JsonSchema4, Obj as Obj2, Ref as Ref5 } from "@dxos/echo";
+import { Trigger as Trigger7 } from "@dxos/functions";
+import { Operation as Operation5 } from "@dxos/operation";
 var queue2 = Command7.make("queue", {
   spaceId: Common6.spaceId.pipe(Options7.optional),
   id: TriggerId.pipe(Options7.optional),
@@ -638,7 +651,7 @@ var queue2 = Command7.make("queue", {
     onSome: (id) => Effect7.succeed(id)
   });
   const dxn = DXN3.fromLocalObjectId(triggerId);
-  const trigger2 = yield* Database7.Service.resolve(dxn, Trigger7.Trigger);
+  const trigger2 = yield* Database7.resolve(dxn, Trigger7.Trigger);
   if (trigger2.spec?.kind !== "queue") {
     return yield* Effect7.fail(new Error(`Invalid trigger type: ${trigger2.spec?.kind}`));
   }
@@ -654,10 +667,10 @@ var queue2 = Command7.make("queue", {
   yield* flushAndSync4({
     indexes: true
   });
-})).pipe(Command7.withDescription("Update a queue trigger."), Command7.provide(({ spaceId }) => spaceLayer6(spaceId, true)), Command7.provideEffectDiscard(() => withTypes5(Function5.Function, Trigger7.Trigger)));
+})).pipe(Command7.withDescription("Update a queue trigger."), Command7.provide(({ spaceId }) => spaceLayer6(spaceId, true)), Command7.provideEffectDiscard(() => withTypes5(Operation5.PersistentOperation, Trigger7.Trigger)));
 var updateFunction = Effect7.fn(function* (trigger2, functionIdOption) {
-  let currentFn = trigger2.function ? yield* Database7.Service.load(trigger2.function) : void 0;
-  if (currentFn && !Obj2.instanceOf(Function5.Function, currentFn)) {
+  let currentFn = trigger2.function ? yield* Database7.load(trigger2.function) : void 0;
+  if (currentFn && !Obj2.instanceOf(Operation5.PersistentOperation, currentFn)) {
     currentFn = void 0;
   }
   const currentFunctionName = currentFn ? currentFn.name ?? currentFn.id : void 0;
@@ -673,9 +686,9 @@ var updateFunction = Effect7.fn(function* (trigger2, functionIdOption) {
       onNone: () => selectFunction(),
       onSome: (id) => Effect7.succeed(id)
     });
-    const functions = yield* Database7.Service.runQuery(Filter6.type(Function5.Function));
+    const functions = yield* Database7.runQuery(Filter6.type(Operation5.PersistentOperation));
     const foundFn = functions.find((fn6) => fn6.id === functionId);
-    if (!foundFn || !Obj2.instanceOf(Function5.Function, foundFn)) {
+    if (!foundFn || !Obj2.instanceOf(Operation5.PersistentOperation, foundFn)) {
       return yield* Effect7.fail(new Error(`Function not found: ${functionId}`));
     }
     Obj2.change(trigger2, (mutableTrigger) => {
@@ -726,7 +739,7 @@ var updateInput = Effect7.fn(function* (trigger2, fn6, inputOption) {
   });
   if (shouldChangeInput) {
     const inputObj = yield* Option6.match(inputOption, {
-      onNone: () => promptForSchemaInput(fn6.inputSchema ? Type5.toEffectSchema(fn6.inputSchema) : void 0, currentInput),
+      onNone: () => promptForSchemaInput(fn6.inputSchema ? JsonSchema4.toEffectSchema(fn6.inputSchema) : void 0, currentInput),
       onSome: (value2) => Effect7.succeed(value2)
     });
     Obj2.change(trigger2, (mutableTrigger) => {
@@ -758,8 +771,9 @@ import * as Option7 from "effect/Option";
 import { CommandConfig as CommandConfig7 } from "@dxos/cli-util";
 import { flushAndSync as flushAndSync5, print as print6, spaceLayer as spaceLayer7, withTypes as withTypes6 } from "@dxos/cli-util";
 import { Common as Common7 } from "@dxos/cli-util";
-import { DXN as DXN4, Database as Database8, Filter as Filter7, Obj as Obj3, Query as Query2, Ref as Ref6, Type as Type6 } from "@dxos/echo";
-import { Function as Function6, Trigger as Trigger8 } from "@dxos/functions";
+import { DXN as DXN4, Database as Database8, Filter as Filter7, JsonSchema as JsonSchema5, Obj as Obj3, Query as Query2, Ref as Ref6 } from "@dxos/echo";
+import { Trigger as Trigger8 } from "@dxos/functions";
+import { Operation as Operation6 } from "@dxos/operation";
 var subscription2 = Command8.make("subscription", {
   spaceId: Common7.spaceId.pipe(Options8.optional),
   id: TriggerId.pipe(Options8.optional),
@@ -776,7 +790,7 @@ var subscription2 = Command8.make("subscription", {
     onSome: (id) => Effect8.succeed(id)
   });
   const dxn = DXN4.fromLocalObjectId(triggerId);
-  const trigger2 = yield* Database8.Service.resolve(dxn, Trigger8.Trigger);
+  const trigger2 = yield* Database8.resolve(dxn, Trigger8.Trigger);
   if (trigger2.spec?.kind !== "subscription") {
     return yield* Effect8.fail(new Error(`Invalid trigger type: ${trigger2.spec?.kind}`));
   }
@@ -792,7 +806,7 @@ var subscription2 = Command8.make("subscription", {
   yield* flushAndSync5({
     indexes: true
   });
-})).pipe(Command8.withDescription("Update a subscription trigger."), Command8.provide(({ spaceId }) => spaceLayer7(spaceId, true)), Command8.provideEffectDiscard(() => withTypes6(Function6.Function, Trigger8.Trigger)));
+})).pipe(Command8.withDescription("Update a subscription trigger."), Command8.provide(({ spaceId }) => spaceLayer7(spaceId, true)), Command8.provideEffectDiscard(() => withTypes6(Operation6.PersistentOperation, Trigger8.Trigger)));
 var extractCurrentTypename = (spec) => {
   if (!spec?.query?.ast) {
     return Option7.none();
@@ -804,8 +818,8 @@ var extractCurrentTypename = (spec) => {
   }, (f) => Option7.fromNullable(f.typename).pipe(Option7.flatMap((dxn) => Option7.fromNullable(DXN4.tryParse(dxn))), Option7.flatMap((dxn) => Option7.fromNullable(dxn.asTypeDXN()?.type)))), Match2.orElse(() => Option7.none()))), Match2.orElse(() => Option7.none()));
 };
 var updateFunction2 = Effect8.fn(function* (trigger2, functionIdOption) {
-  let currentFn = trigger2.function ? yield* Database8.Service.load(trigger2.function) : void 0;
-  if (currentFn && !Obj3.instanceOf(Function6.Function, currentFn)) {
+  let currentFn = trigger2.function ? yield* Database8.load(trigger2.function) : void 0;
+  if (currentFn && !Obj3.instanceOf(Operation6.PersistentOperation, currentFn)) {
     currentFn = void 0;
   }
   const currentFunctionName = currentFn ? currentFn.name ?? currentFn.id : void 0;
@@ -821,9 +835,9 @@ var updateFunction2 = Effect8.fn(function* (trigger2, functionIdOption) {
       onNone: () => selectFunction(),
       onSome: (id) => Effect8.succeed(id)
     });
-    const functions = yield* Database8.Service.runQuery(Filter7.type(Function6.Function));
+    const functions = yield* Database8.runQuery(Filter7.type(Operation6.PersistentOperation));
     const foundFn = functions.find((fn6) => fn6.id === functionId);
-    if (!foundFn || !Obj3.instanceOf(Function6.Function, foundFn)) {
+    if (!foundFn || !Obj3.instanceOf(Operation6.PersistentOperation, foundFn)) {
       return yield* Effect8.fail(new Error(`Function not found: ${functionId}`));
     }
     Obj3.change(trigger2, (mutableTrigger) => {
@@ -917,7 +931,7 @@ var updateInput2 = Effect8.fn(function* (trigger2, fn6, inputOption) {
   });
   if (shouldChangeInput) {
     const inputObj = yield* Option7.match(inputOption, {
-      onNone: () => promptForSchemaInput(fn6.inputSchema ? Type6.toEffectSchema(fn6.inputSchema) : void 0, currentInput),
+      onNone: () => promptForSchemaInput(fn6.inputSchema ? JsonSchema5.toEffectSchema(fn6.inputSchema) : void 0, currentInput),
       onSome: (value2) => Effect8.succeed(value2)
     });
     Obj3.change(trigger2, (mutableTrigger) => {
@@ -948,8 +962,9 @@ import * as Option8 from "effect/Option";
 import { CommandConfig as CommandConfig8 } from "@dxos/cli-util";
 import { flushAndSync as flushAndSync6, print as print7, spaceLayer as spaceLayer8, withTypes as withTypes7 } from "@dxos/cli-util";
 import { Common as Common8 } from "@dxos/cli-util";
-import { DXN as DXN5, Database as Database9, Filter as Filter8, Obj as Obj4, Ref as Ref7, Type as Type7 } from "@dxos/echo";
-import { Function as Function7, Trigger as Trigger9 } from "@dxos/functions";
+import { DXN as DXN5, Database as Database9, Filter as Filter8, JsonSchema as JsonSchema6, Obj as Obj4, Ref as Ref7 } from "@dxos/echo";
+import { Trigger as Trigger9 } from "@dxos/functions";
+import { Operation as Operation7 } from "@dxos/operation";
 var timer2 = Command9.make("timer", {
   spaceId: Common8.spaceId.pipe(Options9.optional),
   id: TriggerId.pipe(Options9.optional),
@@ -964,7 +979,7 @@ var timer2 = Command9.make("timer", {
     onSome: (id) => Effect9.succeed(id)
   });
   const dxn = DXN5.fromLocalObjectId(triggerId);
-  const trigger2 = yield* Database9.Service.resolve(dxn, Trigger9.Trigger);
+  const trigger2 = yield* Database9.resolve(dxn, Trigger9.Trigger);
   if (!trigger2.spec || trigger2.spec?.kind !== "timer") {
     return yield* Effect9.fail(new Error(`Invalid trigger type: ${trigger2.spec?.kind}`));
   }
@@ -980,10 +995,10 @@ var timer2 = Command9.make("timer", {
   yield* flushAndSync6({
     indexes: true
   });
-})).pipe(Command9.withDescription("Update a timer trigger."), Command9.provide(({ spaceId }) => spaceLayer8(spaceId, true)), Command9.provideEffectDiscard(() => withTypes7(Function7.Function, Trigger9.Trigger)));
+})).pipe(Command9.withDescription("Update a timer trigger."), Command9.provide(({ spaceId }) => spaceLayer8(spaceId, true)), Command9.provideEffectDiscard(() => withTypes7(Operation7.PersistentOperation, Trigger9.Trigger)));
 var updateFunction3 = Effect9.fn(function* (trigger2, functionIdOption) {
-  let currentFn = trigger2.function ? yield* Database9.Service.load(trigger2.function) : void 0;
-  if (currentFn && !Obj4.instanceOf(Function7.Function, currentFn)) {
+  let currentFn = trigger2.function ? yield* Database9.load(trigger2.function) : void 0;
+  if (currentFn && !Obj4.instanceOf(Operation7.PersistentOperation, currentFn)) {
     currentFn = void 0;
   }
   const currentFunctionName = currentFn ? currentFn.name ?? currentFn.id : void 0;
@@ -999,9 +1014,9 @@ var updateFunction3 = Effect9.fn(function* (trigger2, functionIdOption) {
       onNone: () => selectFunction(),
       onSome: (id) => Effect9.succeed(id)
     });
-    const functions = yield* Database9.Service.runQuery(Filter8.type(Function7.Function));
+    const functions = yield* Database9.runQuery(Filter8.type(Operation7.PersistentOperation));
     const foundFn = functions.find((fn6) => fn6.id === functionId);
-    if (!foundFn || !Obj4.instanceOf(Function7.Function, foundFn)) {
+    if (!foundFn || !Obj4.instanceOf(Operation7.PersistentOperation, foundFn)) {
       return yield* Effect9.fail(new Error(`Function not found: ${functionId}`));
     }
     Obj4.change(trigger2, (mutableTrigger) => {
@@ -1053,7 +1068,7 @@ var updateInput3 = Effect9.fn(function* (trigger2, fn6, inputOption) {
   });
   if (shouldChangeInput) {
     const inputObj = yield* Option8.match(inputOption, {
-      onNone: () => promptForSchemaInput(fn6.inputSchema ? Type7.toEffectSchema(fn6.inputSchema) : void 0, currentInput),
+      onNone: () => promptForSchemaInput(fn6.inputSchema ? JsonSchema6.toEffectSchema(fn6.inputSchema) : void 0, currentInput),
       onSome: (value2) => Effect9.succeed(value2)
     });
     Obj4.change(trigger2, (mutableTrigger) => {
@@ -1090,7 +1105,7 @@ var trigger = Command11.make("trigger").pipe(Command11.withDescription("Manage E
 ]));
 
 // src/cli/plugin.ts
-var AutomationPlugin = Plugin.define(meta).pipe(Common9.Plugin.addCommandModule({
+var AutomationPlugin = Plugin.define(meta).pipe(AppPlugin.addCommandModule({
   commands: [
     trigger
   ]