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

package/dist/lib/browser/chunk-ZBEMNWNY.mjs.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../src/hooks/useComputeRuntimeCallback.ts", "../../../src/hooks/useTriggerRuntimeControls.ts"],
+  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Cause from 'effect/Cause';\nimport * as Effect from 'effect/Effect';\nimport * as Exit from 'effect/Exit';\nimport { type DependencyList, useCallback } from 'react';\n\nimport { useCapability } from '@dxos/app-framework/ui';\nimport { type Key } from '@dxos/echo';\nimport { type FunctionDefinition, FunctionInvocationService, TracingService } from '@dxos/functions';\nimport { log } from '@dxos/log';\n\nimport { AutomationCapabilities } from '../types';\n\n/**\n * Create an effectful function that has access to compute services\n */\n// TODO(burdon): Factor out (figure out cross-plugin capabilities dependencies).\nexport const useComputeRuntimeCallback = <T>(\n  id: Key.SpaceId | undefined,\n  fn: () => Effect.Effect<T, any, AutomationCapabilities.ComputeServices>,\n  deps?: DependencyList,\n): (() => Promise<T>) => {\n  const computeRuntime = useCapability(AutomationCapabilities.ComputeRuntime);\n  const runtime = id !== undefined ? computeRuntime.getRuntime(id) : undefined;\n\n  return useCallback(() => {\n    if (!runtime) {\n      throw new TypeError('Space not provided to useComputeRuntimeCallback');\n    }\n\n    return runtime.runPromise(fn());\n  }, [runtime, ...(deps ?? [])]);\n};\n\n// TODO(wittjosiah): Function invoking should automatically be traced (DX-647).\nexport const invokeFunctionWithTracing = <I, O>(functionDef: FunctionDefinition<I, O>, inputData: I) =>\n  Effect.gen(function* () {\n    const tracer = yield* TracingService;\n    const trace = yield* tracer.traceInvocationStart({\n      target: undefined,\n      payload: {\n        data: {},\n      },\n    });\n\n    // Invoke the function.\n    const result = yield* FunctionInvocationService.invokeFunction(functionDef, inputData).pipe(\n      Effect.provide(trace.invocationTraceQueue ? TracingService.layerInvocation(trace) : TracingService.layerNoop),\n      Effect.exit,\n    );\n\n    if (Exit.isFailure(result)) {\n      const error = Cause.prettyErrors(result.cause)[0];\n      log.error(error.message, error.cause ?? error.stack);\n    }\n\n    yield* tracer.traceInvocationEnd({\n      trace,\n      // TODO(dmaretskyi): Might miss errors.\n      exception: Exit.isFailure(result) ? Cause.prettyErrors(result.cause)[0] : undefined,\n    });\n\n    return result;\n  });\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { Atom, useAtomValue } from '@effect-atom/atom-react';\nimport type * as Context from 'effect/Context';\nimport * as Effect from 'effect/Effect';\nimport { useEffect, useState } from 'react';\n\nimport { type Database, Filter } from '@dxos/echo';\nimport { Trigger } from '@dxos/functions';\nimport { TriggerDispatcher, type TriggerDispatcherState } from '@dxos/functions-runtime';\nimport { useQuery } from '@dxos/react-client/echo';\n\nimport { useComputeRuntimeCallback } from './useComputeRuntimeCallback';\n\ninterface TriggerRuntimeControls {\n  triggers: Trigger.Trigger[];\n\n  state: TriggerDispatcherState | undefined;\n\n  start: () => void;\n  stop: () => void;\n}\n\nexport const useTriggerRuntimeControls = (db: Database.Database | undefined): TriggerRuntimeControls => {\n  const triggers = useQuery(db, Filter.type(Trigger.Trigger));\n\n  const [dispatcher, setDispatcher] = useState<Context.Tag.Service<TriggerDispatcher> | undefined>(undefined);\n\n  const init = useComputeRuntimeCallback(\n    db?.spaceId,\n    Effect.fnUntraced(function* () {\n      const dispatcher = yield* TriggerDispatcher;\n      setDispatcher(dispatcher);\n    }),\n  );\n\n  useEffect(() => {\n    void init();\n  }, []);\n\n  const state = useAtomValue(dispatcher?.state ?? Atom.make(undefined));\n\n  const start = useComputeRuntimeCallback(\n    db?.spaceId,\n    Effect.fnUntraced(function* () {\n      const dispatcher = yield* TriggerDispatcher;\n      yield* dispatcher.start();\n    }),\n  );\n\n  const stop = useComputeRuntimeCallback(\n    db?.spaceId,\n    Effect.fnUntraced(function* () {\n      const dispatcher = yield* TriggerDispatcher;\n      yield* dispatcher.stop();\n    }),\n  );\n\n  return {\n    triggers,\n    state,\n    start: () => void start(),\n    stop: () => void stop(),\n  };\n};\n"],
+  "mappings": ";;;;;AAIA,YAAYA,WAAW;AACvB,YAAYC,YAAY;AACxB,YAAYC,UAAU;AACtB,SAA8BC,mBAAmB;AAEjD,SAASC,qBAAqB;AAE9B,SAAkCC,2BAA2BC,sBAAsB;AACnF,SAASC,WAAW;;AAQb,IAAMC,4BAA4B,CACvCC,IACAC,IACAC,SAAAA;AAEA,QAAMC,iBAAiBC,cAAcC,uBAAuBC,cAAc;AAC1E,QAAMC,UAAUP,OAAOQ,SAAYL,eAAeM,WAAWT,EAAAA,IAAMQ;AAEnE,SAAOE,YAAY,MAAA;AACjB,QAAI,CAACH,SAAS;AACZ,YAAM,IAAII,UAAU,iDAAA;IACtB;AAEA,WAAOJ,QAAQK,WAAWX,GAAAA,CAAAA;EAC5B,GAAG;IAACM;OAAaL,QAAQ,CAAA;GAAI;AAC/B;AAGO,IAAMW,4BAA4B,CAAOC,aAAuCC,cAC9EC,WAAI,aAAA;AACT,QAAMC,SAAS,OAAOC;AACtB,QAAMC,QAAQ,OAAOF,OAAOG,qBAAqB;IAC/CC,QAAQb;IACRc,SAAS;MACPC,MAAM,CAAC;IACT;EACF,CAAA;AAGA,QAAMC,SAAS,OAAOC,0BAA0BC,eAAeZ,aAAaC,SAAAA,EAAWY,KAC9EC,eAAQT,MAAMU,uBAAuBX,eAAeY,gBAAgBX,KAAAA,IAASD,eAAea,SAAS,GACrGC,WAAI;AAGb,MAASC,eAAUT,MAAAA,GAAS;AAC1B,UAAMU,QAAcC,mBAAaX,OAAOY,KAAK,EAAE,CAAA;AAC/CC,QAAIH,MAAMA,MAAMI,SAASJ,MAAME,SAASF,MAAMK,OAAK;;;;;;EACrD;AAEA,SAAOtB,OAAOuB,mBAAmB;IAC/BrB;;IAEAsB,WAAgBR,eAAUT,MAAAA,IAAgBW,mBAAaX,OAAOY,KAAK,EAAE,CAAA,IAAK5B;EAC5E,CAAA;AAEA,SAAOgB;AACT,CAAA;;;AC9DF,SAASkB,MAAMC,oBAAoB;AAEnC,YAAYC,aAAY;AACxB,SAASC,WAAWC,gBAAgB;AAEpC,SAAwBC,cAAc;AACtC,SAASC,eAAe;AACxB,SAASC,yBAAsD;AAC/D,SAASC,gBAAgB;AAalB,IAAMC,4BAA4B,CAACC,OAAAA;AACxC,QAAMC,WAAWC,SAASF,IAAIG,OAAOC,KAAKC,QAAQA,OAAO,CAAA;AAEzD,QAAM,CAACC,YAAYC,aAAAA,IAAiBC,SAA6DC,MAAAA;AAEjG,QAAMC,OAAOC,0BACXX,IAAIY,SACGC,mBAAW,aAAA;AAChB,UAAMP,cAAa,OAAOQ;AAC1BP,kBAAcD,WAAAA;EAChB,CAAA,CAAA;AAGFS,YAAU,MAAA;AACR,SAAKL,KAAAA;EACP,GAAG,CAAA,CAAE;AAEL,QAAMM,QAAQC,aAAaX,YAAYU,SAASE,KAAKC,KAAKV,MAAAA,CAAAA;AAE1D,QAAMW,QAAQT,0BACZX,IAAIY,SACGC,mBAAW,aAAA;AAChB,UAAMP,cAAa,OAAOQ;AAC1B,WAAOR,YAAWc,MAAK;EACzB,CAAA,CAAA;AAGF,QAAMC,OAAOV,0BACXX,IAAIY,SACGC,mBAAW,aAAA;AAChB,UAAMP,cAAa,OAAOQ;AAC1B,WAAOR,YAAWe,KAAI;EACxB,CAAA,CAAA;AAGF,SAAO;IACLpB;IACAe;IACAI,OAAO,MAAM,KAAKA,MAAAA;IAClBC,MAAM,MAAM,KAAKA,KAAAA;EACnB;AACF;",
+  "names": ["Cause", "Effect", "Exit", "useCallback", "useCapability", "FunctionInvocationService", "TracingService", "log", "useComputeRuntimeCallback", "id", "fn", "deps", "computeRuntime", "useCapability", "AutomationCapabilities", "ComputeRuntime", "runtime", "undefined", "getRuntime", "useCallback", "TypeError", "runPromise", "invokeFunctionWithTracing", "functionDef", "inputData", "gen", "tracer", "TracingService", "trace", "traceInvocationStart", "target", "payload", "data", "result", "FunctionInvocationService", "invokeFunction", "pipe", "provide", "invocationTraceQueue", "layerInvocation", "layerNoop", "exit", "isFailure", "error", "prettyErrors", "cause", "log", "message", "stack", "traceInvocationEnd", "exception", "Atom", "useAtomValue", "Effect", "useEffect", "useState", "Filter", "Trigger", "TriggerDispatcher", "useQuery", "useTriggerRuntimeControls", "db", "triggers", "useQuery", "Filter", "type", "Trigger", "dispatcher", "setDispatcher", "useState", "undefined", "init", "useComputeRuntimeCallback", "spaceId", "fnUntraced", "TriggerDispatcher", "useEffect", "state", "useAtomValue", "Atom", "make", "start", "stop"]
+}

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

@@ -1,15 +1,16 @@
 import {
   ComputeRuntime
-} from "../chunk-BKFQBKYO.mjs";
+} from "../chunk-LHJEQVX5.mjs";
 import {
   AutomationEvents
-} from "../chunk-JOXPQ27I.mjs";
+} from "../chunk-5WMYSXEH.mjs";
 import {
   meta
-} from "../chunk-PZNBEKO5.mjs";
+} from "../chunk-EL64ZPPN.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";
 
 // src/cli/commands/trigger/index.ts
@@ -29,7 +30,7 @@ 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 { Database as Database2, Filter as Filter2, JsonSchema, Ref as Ref2 } from "@dxos/echo";
 import { Function as Function2, Trigger as Trigger2 } from "@dxos/functions";
 
 // src/cli/commands/trigger/options.ts
@@ -62,10 +63,10 @@ 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 { FeedAnnotation } from "@dxos/schema";
 var getTriggerRemoteStatus = (trigger2, remoteCronIds) => {
   if (trigger2.spec?.kind !== "timer") {
     return "n/a";
@@ -73,7 +74,7 @@ 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);
@@ -202,7 +203,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 +229,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(Function.Function));
   if (functions.length === 0) {
     return yield* Effect.fail(new Error("No functions available"));
   }
@@ -243,13 +244,13 @@ 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 fn6 = trigger2.function ? yield* Database.load(trigger2.function) : void 0;
     const functionName = fn6 && Obj.instanceOf(Function.Function, fn6) ? fn6.name ?? fn6.key ?? fn6.id : void 0;
     const title = functionName ?? trigger2.id;
     const description = `${trigger2.enabled ? "enabled" : "disabled"} - ${trigger2.spec?.kind ?? "unknown"}`;
@@ -266,35 +267,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 +334,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(Function2.Function));
   const fn6 = functions.find((fn7) => fn7.id === functionId);
   if (!fn6) {
     return yield* Effect2.fail(new Error(`Function not found: ${functionId}`));
@@ -336,7 +344,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 +363,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 {
@@ -377,7 +385,7 @@ 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 { Database as Database3, Filter as Filter3, JsonSchema as JsonSchema2, Query, Ref as Ref3 } from "@dxos/echo";
 import { Function as Function3, Trigger as Trigger3 } from "@dxos/functions";
 var subscription = Command2.make("subscription", {
   spaceId: Common2.spaceId.pipe(Options3.optional),
@@ -393,7 +401,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(Function3.Function));
   const fn6 = functions.find((fn7) => fn7.id === functionId);
   if (!fn6) {
     return yield* Effect3.fail(new Error(`Function not found: ${functionId}`));
@@ -429,7 +437,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 +459,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 {
@@ -473,7 +481,7 @@ 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 { Database as Database4, Filter as Filter4, JsonSchema as JsonSchema3, Ref as Ref4 } from "@dxos/echo";
 import { Function as Function4, Trigger as Trigger4 } from "@dxos/functions";
 var timer = Command3.make("timer", {
   spaceId: Common3.spaceId.pipe(Options4.optional),
@@ -487,7 +495,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(Function4.Function));
   const fn6 = functions.find((fn7) => fn7.id === functionId);
   if (!fn6) {
     return yield* Effect4.fail(new Error(`Function not found: ${functionId}`));
@@ -499,7 +507,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 +526,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 {
@@ -549,11 +557,11 @@ 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(spaceId)).pipe(Effect5.catchAll(() => Effect5.succeed({
       cronIds: []
     })));
     return result.cronIds;
@@ -597,8 +605,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,7 +630,7 @@ 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 { DXN as DXN3, Database as Database7, Filter as Filter6, JsonSchema as JsonSchema4, Obj as Obj2, Ref as Ref5 } from "@dxos/echo";
 import { Function as Function5, Trigger as Trigger7 } from "@dxos/functions";
 var queue2 = Command7.make("queue", {
   spaceId: Common6.spaceId.pipe(Options7.optional),
@@ -638,7 +646,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}`));
   }
@@ -656,7 +664,7 @@ var queue2 = Command7.make("queue", {
   });
 })).pipe(Command7.withDescription("Update a queue trigger."), Command7.provide(({ spaceId }) => spaceLayer6(spaceId, true)), Command7.provideEffectDiscard(() => withTypes5(Function5.Function, Trigger7.Trigger)));
 var updateFunction = Effect7.fn(function* (trigger2, functionIdOption) {
-  let currentFn = trigger2.function ? yield* Database7.Service.load(trigger2.function) : void 0;
+  let currentFn = trigger2.function ? yield* Database7.load(trigger2.function) : void 0;
   if (currentFn && !Obj2.instanceOf(Function5.Function, currentFn)) {
     currentFn = void 0;
   }
@@ -673,7 +681,7 @@ 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(Function5.Function));
     const foundFn = functions.find((fn6) => fn6.id === functionId);
     if (!foundFn || !Obj2.instanceOf(Function5.Function, foundFn)) {
       return yield* Effect7.fail(new Error(`Function not found: ${functionId}`));
@@ -726,7 +734,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,7 +766,7 @@ 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 { 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 { Function as Function6, Trigger as Trigger8 } from "@dxos/functions";
 var subscription2 = Command8.make("subscription", {
   spaceId: Common7.spaceId.pipe(Options8.optional),
@@ -776,7 +784,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}`));
   }
@@ -804,7 +812,7 @@ 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;
+  let currentFn = trigger2.function ? yield* Database8.load(trigger2.function) : void 0;
   if (currentFn && !Obj3.instanceOf(Function6.Function, currentFn)) {
     currentFn = void 0;
   }
@@ -821,7 +829,7 @@ 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(Function6.Function));
     const foundFn = functions.find((fn6) => fn6.id === functionId);
     if (!foundFn || !Obj3.instanceOf(Function6.Function, foundFn)) {
       return yield* Effect8.fail(new Error(`Function not found: ${functionId}`));
@@ -917,7 +925,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,7 +956,7 @@ 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 { DXN as DXN5, Database as Database9, Filter as Filter8, JsonSchema as JsonSchema6, Obj as Obj4, Ref as Ref7 } from "@dxos/echo";
 import { Function as Function7, Trigger as Trigger9 } from "@dxos/functions";
 var timer2 = Command9.make("timer", {
   spaceId: Common8.spaceId.pipe(Options9.optional),
@@ -964,7 +972,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}`));
   }
@@ -982,7 +990,7 @@ var timer2 = Command9.make("timer", {
   });
 })).pipe(Command9.withDescription("Update a timer trigger."), Command9.provide(({ spaceId }) => spaceLayer8(spaceId, true)), Command9.provideEffectDiscard(() => withTypes7(Function7.Function, Trigger9.Trigger)));
 var updateFunction3 = Effect9.fn(function* (trigger2, functionIdOption) {
-  let currentFn = trigger2.function ? yield* Database9.Service.load(trigger2.function) : void 0;
+  let currentFn = trigger2.function ? yield* Database9.load(trigger2.function) : void 0;
   if (currentFn && !Obj4.instanceOf(Function7.Function, currentFn)) {
     currentFn = void 0;
   }
@@ -999,7 +1007,7 @@ 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(Function7.Function));
     const foundFn = functions.find((fn6) => fn6.id === functionId);
     if (!foundFn || !Obj4.instanceOf(Function7.Function, foundFn)) {
       return yield* Effect9.fail(new Error(`Function not found: ${functionId}`));
@@ -1053,7 +1061,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 +1098,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
   ]