@dxos/plugin-automation 0.8.4-main.69d29f4 → 0.8.4-main.6fa680abb7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-automation",
-  "version": "0.8.4-main.69d29f4",
+  "version": "0.8.4-main.6fa680abb7",
   "description": "Prompt chain plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -54,62 +54,66 @@
     "src"
   ],
   "dependencies": {
-    "@effect/ai": "0.32.1",
-    "@effect/cli": "0.72.1",
-    "@effect/platform-browser": "0.73.0",
+    "@effect-atom/atom": "^0.5.1",
+    "@effect/ai": "0.33.2",
+    "@effect/cli": "0.73.2",
+    "@effect/platform-browser": "0.74.0",
     "@effect/printer-ansi": "0.47.0",
-    "@dxos/ai": "0.8.4-main.69d29f4",
-    "@dxos/app-framework": "0.8.4-main.69d29f4",
-    "@dxos/assistant": "0.8.4-main.69d29f4",
-    "@dxos/async": "0.8.4-main.69d29f4",
-    "@dxos/cli-util": "0.8.4-main.69d29f4",
-    "@dxos/client": "0.8.4-main.69d29f4",
-    "@dxos/conductor": "0.8.4-main.69d29f4",
-    "@dxos/echo": "0.8.4-main.69d29f4",
-    "@dxos/context": "0.8.4-main.69d29f4",
-    "@dxos/effect": "0.8.4-main.69d29f4",
-    "@dxos/functions": "0.8.4-main.69d29f4",
-    "@dxos/functions-runtime": "0.8.4-main.69d29f4",
-    "@dxos/keys": "0.8.4-main.69d29f4",
-    "@dxos/invariant": "0.8.4-main.69d29f4",
-    "@dxos/log": "0.8.4-main.69d29f4",
-    "@dxos/operation": "0.8.4-main.69d29f4",
-    "@dxos/plugin-deck": "0.8.4-main.69d29f4",
-    "@dxos/plugin-client": "0.8.4-main.69d29f4",
-    "@dxos/plugin-graph": "0.8.4-main.69d29f4",
-    "@dxos/plugin-space": "0.8.4-main.69d29f4",
-    "@dxos/random": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-editor": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-components": "0.8.4-main.69d29f4",
-    "@dxos/react-client": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-list": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-form": "0.8.4-main.69d29f4",
-    "@dxos/react-ui-stack": "0.8.4-main.69d29f4",
-    "@dxos/types": "0.8.4-main.69d29f4",
-    "@dxos/schema": "0.8.4-main.69d29f4",
-    "@dxos/util": "0.8.4-main.69d29f4"
+    "@dxos/ai": "0.8.4-main.6fa680abb7",
+    "@dxos/app-framework": "0.8.4-main.6fa680abb7",
+    "@dxos/app-toolkit": "0.8.4-main.6fa680abb7",
+    "@dxos/assistant": "0.8.4-main.6fa680abb7",
+    "@dxos/async": "0.8.4-main.6fa680abb7",
+    "@dxos/cli-util": "0.8.4-main.6fa680abb7",
+    "@dxos/client": "0.8.4-main.6fa680abb7",
+    "@dxos/context": "0.8.4-main.6fa680abb7",
+    "@dxos/conductor": "0.8.4-main.6fa680abb7",
+    "@dxos/echo-db": "0.8.4-main.6fa680abb7",
+    "@dxos/echo": "0.8.4-main.6fa680abb7",
+    "@dxos/echo-atom": "0.8.4-main.6fa680abb7",
+    "@dxos/effect": "0.8.4-main.6fa680abb7",
+    "@dxos/functions": "0.8.4-main.6fa680abb7",
+    "@dxos/invariant": "0.8.4-main.6fa680abb7",
+    "@dxos/functions-runtime": "0.8.4-main.6fa680abb7",
+    "@dxos/operation": "0.8.4-main.6fa680abb7",
+    "@dxos/keys": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-client": "0.8.4-main.6fa680abb7",
+    "@dxos/log": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-graph": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-deck": "0.8.4-main.6fa680abb7",
+    "@dxos/plugin-space": "0.8.4-main.6fa680abb7",
+    "@dxos/random": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-editor": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-form": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-components": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-stack": "0.8.4-main.6fa680abb7",
+    "@dxos/schema": "0.8.4-main.6fa680abb7",
+    "@dxos/react-ui-list": "0.8.4-main.6fa680abb7",
+    "@dxos/types": "0.8.4-main.6fa680abb7",
+    "@dxos/util": "0.8.4-main.6fa680abb7",
+    "@dxos/react-client": "0.8.4-main.6fa680abb7"
   },
   "devDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
     "@types/react": "~19.2.7",
     "@types/react-dom": "~19.2.3",
-    "effect": "3.19.11",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/react-ui": "0.8.4-main.69d29f4",
-    "@dxos/storybook-utils": "0.8.4-main.69d29f4",
-    "@dxos/ui-theme": "0.8.4-main.69d29f4"
+    "vite": "^7.1.11",
+    "@dxos/react-ui": "0.8.4-main.6fa680abb7",
+    "@dxos/storybook-utils": "0.8.4-main.6fa680abb7",
+    "@dxos/ui-theme": "0.8.4-main.6fa680abb7"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
-    "effect": "3.19.11",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.69d29f4",
-    "@dxos/ui-theme": "0.8.4-main.69d29f4"
+    "@dxos/react-ui": "0.8.4-main.6fa680abb7",
+    "@dxos/ui-theme": "0.8.4-main.6fa680abb7"
   },
   "publishConfig": {
     "access": "public"

package/src/AutomationPlugin.tsx

@@ -2,7 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Common, Plugin } from '@dxos/app-framework';
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
 import { Function, Trigger } from '@dxos/functions';
 import { ClientEvents } from '@dxos/plugin-client/types';
 
@@ -12,11 +13,11 @@ import { translations } from './translations';
 import { AutomationEvents } from './types';
 
 export const AutomationPlugin = Plugin.define(meta).pipe(
-  Common.Plugin.addTranslationsModule({ translations }),
-  Common.Plugin.addSchemaModule({ schema: [Function.Function, Trigger.Trigger] }),
-  Common.Plugin.addAppGraphModule({ activate: AppGraphBuilder }),
-  Common.Plugin.addOperationResolverModule({ activate: OperationResolver }),
-  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addOperationResolverModule({ activate: OperationResolver }),
+  AppPlugin.addSchemaModule({ schema: [Function.Function, Trigger.Trigger] }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule({
     activatesOn: ClientEvents.ClientReady,
     activatesAfter: [AutomationEvents.ComputeRuntimeReady],

package/src/capabilities/app-graph-builder/app-graph-builder.ts

@@ -4,9 +4,11 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { Script } from '@dxos/functions';
-import { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
+import { COMPANION_PREFIX } from '@dxos/app-toolkit';
+import { PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
 import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 import { meta as spaceMeta } from '@dxos/plugin-space';
 
@@ -16,14 +18,14 @@ export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const extensions = yield* Effect.all([
       GraphBuilder.createExtension({
-        id: `${meta.id}/space-settings-automation`,
-        match: NodeMatcher.whenNodeType(`${spaceMeta.id}/settings`),
+        id: `${meta.id}.space-settings-automation`,
+        match: NodeMatcher.whenNodeType(`${spaceMeta.id}.settings`),
         connector: (node) =>
           Effect.succeed([
             {
-              id: `automation-${node.id}`,
-              type: `${meta.id}/space-settings-automation`,
-              data: `${meta.id}/space-settings-automation`,
+              id: `${meta.id}.automations`,
+              type: `${meta.id}.space-settings-automation`,
+              data: `${meta.id}.space-settings-automation`,
               properties: {
                 label: ['automation panel label', { ns: meta.id }],
                 icon: 'ph--lightning--regular',
@@ -32,14 +34,14 @@ export default Capability.makeModule(
           ]),
       }),
       GraphBuilder.createExtension({
-        id: `${meta.id}/space-settings-functions`,
-        match: NodeMatcher.whenNodeType(`${spaceMeta.id}/settings`),
+        id: `${meta.id}.space-settings-functions`,
+        match: NodeMatcher.whenNodeType(`${spaceMeta.id}.settings`),
         connector: (node) =>
           Effect.succeed([
             {
-              id: `functions-${node.id}`,
-              type: `${meta.id}/space-settings-functions`,
-              data: `${meta.id}/space-settings-functions`,
+              id: `${meta.id}.functions`,
+              type: `${meta.id}.space-settings-functions`,
+              data: `${meta.id}.space-settings-functions`,
               properties: {
                 label: ['functions panel label', { ns: meta.id }],
                 icon: 'ph--function--regular',
@@ -48,12 +50,12 @@ export default Capability.makeModule(
           ]),
       }),
       GraphBuilder.createTypeExtension({
-        id: `${meta.id}/script-companion`,
+        id: `${meta.id}.script-companion`,
         type: Script.Script,
         connector: (script) =>
           Effect.succeed([
             {
-              id: [script.id, 'automation'].join(ATTENDABLE_PATH_SEPARATOR),
+              id: `${COMPANION_PREFIX}automation`,
               type: PLANK_COMPANION_TYPE,
               data: 'automation',
               properties: {
@@ -66,6 +68,6 @@ export default Capability.makeModule(
       }),
     ]);
 
-    return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
   }),
 );

package/src/capabilities/compute-runtime/compute-runtime.ts

@@ -3,15 +3,19 @@
 //
 
 import * as BrowserKeyValueStore from '@effect/platform-browser/BrowserKeyValueStore';
+import { Registry } from '@effect-atom/atom';
 import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 import * as ManagedRuntime from 'effect/ManagedRuntime';
 
-import { Capability, type CapabilityManager, Common } from '@dxos/app-framework';
-import { GenericToolkit, makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
+import { GenericToolkit } from '@dxos/ai';
+import { Capabilities, Capability, type CapabilityManager } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { ToolExecutionServices } from '@dxos/assistant';
 import { SpaceProperties } from '@dxos/client/echo';
 import { Resource } from '@dxos/context';
-import { Database, Obj, Query, Ref } from '@dxos/echo';
+import { Database, Feed, Obj, Query, Ref } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-db';
 import { CredentialsService, QueueService } from '@dxos/functions';
 import {
   FunctionImplementationResolver,
@@ -65,30 +69,38 @@ class ComputeRuntimeProviderImpl extends Resource implements AutomationCapabilit
       Effect.gen(this, function* () {
         const client = this.#capabilities.get(ClientCapabilities.Client);
         const aiServiceLayer =
-          this.#capabilities.get(Common.Capability.AiServiceLayer) ?? Layer.die('AiService not found');
+          this.#capabilities.get(AppCapabilities.AiServiceLayer) ?? Layer.die('AiService not found');
+        const registry = this.#capabilities.get(Capabilities.AtomRegistry);
 
         // TODO(dmaretskyi): Make these reactive.
-        const functions = this.#capabilities.getAll(Common.Capability.Functions).flat();
-        const toolkits = this.#capabilities.getAll(Common.Capability.Toolkit);
-        const mergedToolkit = GenericToolkit.merge(...toolkits);
-        const toolkit = mergedToolkit.toolkit;
-        const toolkitLayer = mergedToolkit.layer;
+        const functions = [
+          ...this.#capabilities.getAll(AppCapabilities.Functions).flat(),
+          ...this.#capabilities.getAll(AppCapabilities.BlueprintDefinition).flatMap((blueprint) => blueprint.functions),
+        ];
+
+        const genericToolkitProvider = Layer.succeed(GenericToolkit.Provider, {
+          getToolkit: () => {
+            const toolkits = this.#capabilities.getAll(AppCapabilities.Toolkit);
+            return GenericToolkit.merge(...toolkits);
+          },
+        });
 
         const space = client.spaces.get(spaceId);
         invariant(space, `Invalid space: ${spaceId}`);
         yield* Effect.promise(() => space.waitUntilReady());
 
         return Layer.mergeAll(TriggerDispatcher.layer({ timeControl: 'natural' })).pipe(
+          Layer.provideMerge(Layer.succeed(Registry.AtomRegistry, registry)),
           Layer.provideMerge(
             Layer.mergeAll(
               TracingServiceLive,
               TriggerStateStore.layerKv.pipe(Layer.provide(BrowserKeyValueStore.layerLocalStorage)),
-              makeToolResolverFromFunctions(functions, toolkit),
-              makeToolExecutionServiceFromFunctions(toolkit, toolkitLayer),
+              ToolExecutionServices,
             ),
           ),
           Layer.provideMerge(
             FunctionInvocationServiceLayerWithLocalLoopbackExecutor.pipe(
+              Layer.provideMerge(genericToolkitProvider),
               Layer.provideMerge(FunctionImplementationResolver.layerTest({ functions })),
               Layer.provideMerge(
                 RemoteFunctionExecutionService.fromClient(
@@ -99,8 +111,9 @@ class ComputeRuntimeProviderImpl extends Resource implements AutomationCapabilit
               ),
               Layer.provideMerge(aiServiceLayer),
               Layer.provideMerge(CredentialsService.layerFromDatabase()),
-              Layer.provideMerge(space ? Database.Service.layer(space.db) : Database.Service.notAvailable),
+              Layer.provideMerge(space ? Database.layer(space.db) : Database.notAvailable),
               Layer.provideMerge(space ? QueueService.layer(space.queues) : QueueService.notAvailable),
+              Layer.provideMerge(space ? createFeedServiceLayer(space.queues) : Feed.notAvailable),
             ),
           ),
         );
@@ -115,7 +128,7 @@ class ComputeRuntimeProviderImpl extends Resource implements AutomationCapabilit
 
 const TracingServiceLive = Layer.unwrapEffect(
   Effect.gen(function* () {
-    const objects = yield* Database.Service.runQuery(Query.type(SpaceProperties));
+    const objects = yield* Database.runQuery(Query.type(SpaceProperties));
     const [properties] = objects;
     invariant(properties);
     // TODO(burdon): Check ref target has loaded?

package/src/capabilities/operation-resolver/operation-resolver.ts

@@ -4,20 +4,21 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { LayoutOperation, getSpacePath } from '@dxos/app-toolkit';
 import { Obj, Ref } from '@dxos/echo';
 import { Function, Script, Trigger } from '@dxos/functions';
 import { type DXN } from '@dxos/keys';
 import { Operation, OperationResolver } from '@dxos/operation';
-import { ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
 import { SpaceOperation } from '@dxos/plugin-space/types';
 import { Filter } from '@dxos/react-client/echo';
 
+import { meta } from '../../meta';
 import { AutomationOperation } from '../../types';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
-    return Capability.contributes(Common.Capability.OperationResolver, [
+    return Capability.contributes(Capabilities.OperationResolver, [
       OperationResolver.make({
         operation: AutomationOperation.CreateTriggerFromTemplate,
         handler: Effect.fnUntraced(function* ({ db, template, enabled = false, scriptName, input }) {
@@ -68,9 +69,9 @@ export default Capability.makeModule(
             target: db,
             hidden: true,
           });
-          yield* Operation.invoke(Common.LayoutOperation.Open, {
-            subject: [`automation-settings${ATTENDABLE_PATH_SEPARATOR}${db.spaceId}`],
-            workspace: db.spaceId,
+          yield* Operation.invoke(LayoutOperation.Open, {
+            subject: [`${getSpacePath(db.spaceId)}/settings/${meta.id}.automations`],
+            workspace: getSpacePath(db.spaceId),
           });
         }),
       }),

package/src/capabilities/react-surface/react-surface.tsx

@@ -5,25 +5,24 @@
 import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capability, Common } from '@dxos/app-framework';
-import { useLayout } from '@dxos/app-framework/react';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
 import { Obj } from '@dxos/echo';
-import { getSpace, parseId, useSpace } from '@dxos/react-client/echo';
+import { useActiveSpace } from '@dxos/plugin-space';
+import { getSpace } from '@dxos/react-client/echo';
 
-import { AutomationSettings, FunctionsContainer } from '../../components';
+import { AutomationSettings, FunctionsContainer } from '../../containers';
 import { meta } from '../../meta';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
-    Capability.contributes(Common.Capability.ReactSurface, [
-      Common.createSurface({
-        id: `${meta.id}/space-settings-functions`,
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: `${meta.id}.space-settings-functions`,
         role: 'article',
-        filter: (data): data is { subject: string } => data.subject === `${meta.id}/space-settings-functions`,
+        filter: (data): data is { subject: string } => data.subject === `${meta.id}.space-settings-functions`,
         component: () => {
-          const layout = useLayout();
-          const { spaceId } = parseId(layout.workspace);
-          const space = useSpace(spaceId);
+          const space = useActiveSpace();
           if (!space) {
             return null;
           }
@@ -31,14 +30,12 @@ export default Capability.makeModule(() =>
           return <FunctionsContainer space={space} />;
         },
       }),
-      Common.createSurface({
-        id: `${meta.id}/space-settings-automation`,
+      Surface.create({
+        id: `${meta.id}.space-settings-automation`,
         role: 'article',
-        filter: (data): data is { subject: string } => data.subject === `${meta.id}/space-settings-automation`,
+        filter: (data): data is { subject: string } => data.subject === `${meta.id}.space-settings-automation`,
         component: () => {
-          const layout = useLayout();
-          const { spaceId } = parseId(layout.workspace);
-          const space = useSpace(spaceId);
+          const space = useActiveSpace();
           if (!space) {
             return null;
           }
@@ -46,8 +43,8 @@ export default Capability.makeModule(() =>
           return <AutomationSettings space={space} />;
         },
       }),
-      Common.createSurface({
-        id: `${meta.id}/companion/automation`,
+      Surface.create({
+        id: `${meta.id}.companion.automation`,
         role: 'article',
         filter: (data): data is { companionTo: Obj.Unknown; subject: 'automation' } =>
           Obj.isObject(data.companionTo) && data.subject === 'automation',

package/src/cli/commands/trigger/create/queue.ts

@@ -13,7 +13,7 @@ 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, Ref, Type } from '@dxos/echo';
+import { Database, Filter, JsonSchema, Ref } from '@dxos/echo';
 import { Function, Trigger } from '@dxos/functions';
 
 import { Enabled, Input, Queue } from '../options';
@@ -36,7 +36,7 @@ export const queue = Command.make(
         onNone: () => selectFunction(),
         onSome: (id) => Effect.succeed(id),
       });
-      const functions = yield* Database.Service.runQuery(Filter.type(Function.Function));
+      const functions = yield* Database.runQuery(Filter.type(Function.Function));
       const fn = functions.find((fn) => fn.id === functionId);
       if (!fn) {
         return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
@@ -48,7 +48,7 @@ export const queue = Command.make(
       });
 
       const input = yield* Option.match(options.input, {
-        onNone: () => promptForSchemaInput(fn.inputSchema ? Type.toEffectSchema(fn.inputSchema) : undefined),
+        onNone: () => promptForSchemaInput(fn.inputSchema ? JsonSchema.toEffectSchema(fn.inputSchema) : undefined),
         onSome: (value) => Effect.succeed(Object.fromEntries(HashMap.toEntries(value))),
       });
 
@@ -72,7 +72,7 @@ export const queue = Command.make(
         input,
       });
 
-      yield* Database.Service.add(trigger);
+      yield* Database.add(trigger);
 
       if (json) {
         yield* Console.log(JSON.stringify(trigger, null, 2));

package/src/cli/commands/trigger/create/subscription.ts

@@ -13,7 +13,7 @@ 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, Query, Ref, Type } from '@dxos/echo';
+import { Database, Filter, JsonSchema, Query, Ref } from '@dxos/echo';
 import { Function, Trigger } from '@dxos/functions';
 
 import { Deep, Delay, Enabled, Input, Typename } from '../options';
@@ -38,7 +38,7 @@ export const subscription = Command.make(
         onNone: () => selectFunction(),
         onSome: (id) => Effect.succeed(id),
       });
-      const functions = yield* Database.Service.runQuery(Filter.type(Function.Function));
+      const functions = yield* Database.runQuery(Filter.type(Function.Function));
       const fn = functions.find((fn) => fn.id === functionId);
       if (!fn) {
         return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
@@ -85,7 +85,7 @@ export const subscription = Command.make(
       }
 
       const input = yield* Option.match(options.input, {
-        onNone: () => promptForSchemaInput(fn.inputSchema ? Type.toEffectSchema(fn.inputSchema) : undefined),
+        onNone: () => promptForSchemaInput(fn.inputSchema ? JsonSchema.toEffectSchema(fn.inputSchema) : undefined),
         onSome: (value) => Effect.succeed(Object.fromEntries(HashMap.toEntries(value))),
       });
 
@@ -111,7 +111,7 @@ export const subscription = Command.make(
         },
         input,
       });
-      yield* Database.Service.add(trigger);
+      yield* Database.add(trigger);
 
       if (json) {
         yield* Console.log(JSON.stringify(trigger, null, 2));

package/src/cli/commands/trigger/create/timer.ts

@@ -13,7 +13,7 @@ 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, Ref, Type } from '@dxos/echo';
+import { Database, Filter, JsonSchema, Ref } from '@dxos/echo';
 import { Function, Trigger } from '@dxos/functions';
 
 import { Cron, Enabled, Input } from '../options';
@@ -37,7 +37,7 @@ export const timer = Command.make(
         onNone: () => selectFunction(),
         onSome: (id) => Effect.succeed(id),
       });
-      const functions = yield* Database.Service.runQuery(Filter.type(Function.Function));
+      const functions = yield* Database.runQuery(Filter.type(Function.Function));
       const fn = functions.find((fn) => fn.id === functionId);
       if (!fn) {
         return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
@@ -52,7 +52,7 @@ export const timer = Command.make(
       });
 
       const input = yield* Option.match(options.input, {
-        onNone: () => promptForSchemaInput(fn.inputSchema ? Type.toEffectSchema(fn.inputSchema) : undefined),
+        onNone: () => promptForSchemaInput(fn.inputSchema ? JsonSchema.toEffectSchema(fn.inputSchema) : undefined),
         onSome: (value) => Effect.succeed(Object.fromEntries(HashMap.toEntries(value))),
       });
 
@@ -76,7 +76,7 @@ export const timer = Command.make(
         input,
       });
 
-      yield* Database.Service.add(trigger);
+      yield* Database.add(trigger);
 
       if (json) {
         yield* Console.log(JSON.stringify(trigger, null, 2));

package/src/cli/commands/trigger/list.ts

@@ -23,13 +23,13 @@ export const list = Command.make(
     const { json } = yield* CommandConfig;
 
     // Fetch local triggers
-    const triggers = yield* Database.Service.runQuery(Filter.type(Trigger.Trigger));
+    const triggers = yield* Database.runQuery(Filter.type(Trigger.Trigger));
 
     // 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.getCronTriggers(spaceId)).pipe(
+      const result = yield* Effect.promise(() => client.edge.http.getCronTriggers(spaceId)).pipe(
         Effect.catchAll(() => Effect.succeed({ cronIds: [] })),
       );
       return result.cronIds;

package/src/cli/commands/trigger/remove.ts

@@ -30,8 +30,8 @@ export const remove = Command.make(
         onSome: (id) => Effect.succeed(id),
       });
       const dxn = DXN.fromLocalObjectId(triggerId);
-      const trigger = yield* Database.Service.resolve(dxn, Trigger.Trigger);
-      yield* Database.Service.remove(trigger);
+      const trigger = yield* Database.resolve(dxn, Trigger.Trigger);
+      yield* Database.remove(trigger);
       if (json) {
         yield* Console.log(JSON.stringify({ id: trigger.id, removed: true }, null, 2));
       } else {

package/src/cli/commands/trigger/update/queue.ts

@@ -12,7 +12,7 @@ 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 { DXN, Database, Filter, JsonSchema, Obj, Ref } from '@dxos/echo';
 import { Function, Trigger } from '@dxos/functions';
 
 import { Enabled, Input, Queue, TriggerId } from '../options';
@@ -37,7 +37,7 @@ export const queue = Command.make(
         onSome: (id) => Effect.succeed(id),
       });
       const dxn = DXN.fromLocalObjectId(triggerId);
-      const trigger = yield* Database.Service.resolve(dxn, Trigger.Trigger);
+      const trigger = yield* Database.resolve(dxn, Trigger.Trigger);
       if (trigger.spec?.kind !== 'queue') {
         return yield* Effect.fail(new Error(`Invalid trigger type: ${trigger.spec?.kind}`));
       }
@@ -68,7 +68,7 @@ export const queue = Command.make(
  */
 const updateFunction = Effect.fn(function* (trigger: Trigger.Trigger, functionIdOption: Option.Option<string>) {
   let currentFn: Function.Function | undefined = trigger.function
-    ? yield* Database.Service.load(trigger.function) as any
+    ? yield* Database.load(trigger.function) as any
     : undefined;
   if (currentFn && !Obj.instanceOf(Function.Function, currentFn)) {
     currentFn = undefined;
@@ -87,7 +87,7 @@ const updateFunction = Effect.fn(function* (trigger: Trigger.Trigger, functionId
       onNone: () => selectFunction(),
       onSome: (id) => Effect.succeed(id),
     });
-    const functions = yield* Database.Service.runQuery(Filter.type(Function.Function));
+    const functions = yield* Database.runQuery(Filter.type(Function.Function));
     const foundFn = functions.find((fn) => fn.id === functionId);
     if (!foundFn || !Obj.instanceOf(Function.Function, foundFn)) {
       return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
@@ -163,7 +163,7 @@ 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) => {