@dxos/plugin-automation 0.8.4-main.74a063c4e0 → 0.8.4-main.765dc60934

package/src/capabilities/compute-runtime.ts

@@ -7,33 +7,38 @@ import * as BrowserKeyValueStore from '@effect/platform-browser/BrowserKeyValueS
 import * as KeyValueStore from '@effect/platform/KeyValueStore';
 import * as Context from 'effect/Context';
 import * as Effect from 'effect/Effect';
+import * as Fiber from 'effect/Fiber';
 import * as Layer from 'effect/Layer';
 import * as ManagedRuntime from 'effect/ManagedRuntime';
 
-import { AiService, GenericToolkit } from '@dxos/ai';
+import { AiService, OpaqueToolkit } from '@dxos/ai';
 import { Capabilities, Capability, type CapabilityManager } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
-import {
-  AgentService,
-  AiContextBinder,
-  AiContextService,
-  AiConversation,
-  AiConversationService,
-  ToolExecutionServices,
-} from '@dxos/assistant';
-import { Blueprint } from '@dxos/blueprints';
+import { AiContext, AiSession } from '@dxos/assistant';
+import { McpServer } from '@dxos/assistant-toolkit';
 import { ClientService } from '@dxos/client';
-import { SpaceProperties } from '@dxos/client/echo';
+import { SpaceProperties } from '@dxos/client-protocol';
+import {
+  Blueprint,
+  Credential,
+  Operation,
+  OperationHandlerSet,
+  OperationRegistry,
+  ServiceNotAvailableError,
+  Trace,
+} from '@dxos/compute';
 import { Resource } from '@dxos/context';
-import { Database, DXN, Feed, Obj, Query, Ref } from '@dxos/echo';
+import { Database, DXN, Feed, Filter, Obj } from '@dxos/echo';
+import { AtomObj } from '@dxos/echo-atom';
 import { createFeedServiceLayer } from '@dxos/echo-db';
-import { acquireReleaseResource } from '@dxos/effect';
+import { acquireReleaseResource, asyncTaskTaggingLayer } from '@dxos/effect';
 import {
-  CredentialsService,
+  FunctionInvocationService,
   feedServiceFromQueueServiceLayer,
   QueueService,
-  ServiceNotAvailableError,
+  credentialsLayerFromDatabase,
 } from '@dxos/functions';
+import { AgentService } from '@dxos/functions-runtime';
 import {
   FeedTraceSink,
   FunctionImplementationResolver,
@@ -41,14 +46,13 @@ import {
   ProcessManager,
   RemoteFunctionExecutionService,
   ServiceResolver,
-  TracingServiceExt,
   TriggerDispatcher,
   TriggerStateStore,
 } from '@dxos/functions-runtime';
 import { invariant } from '@dxos/invariant';
 import { type SpaceId } from '@dxos/keys';
-import { OperationHandlerSet, OperationRegistry } from '@dxos/operation';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { log } from '@dxos/log';
+import { ClientCapabilities } from '@dxos/plugin-client';
 
 import { AutomationCapabilities } from '#types';
 
@@ -62,11 +66,30 @@ export default Capability.makeModule(
   }),
 );
 
+declare global {
+  interface ImportMeta {
+    env: ImportMetaEnv;
+  }
+
+  interface ImportMetaEnv {
+    DEV: boolean;
+  }
+}
+
+const isDev = import.meta.env.DEV ?? false;
+
+/** Node / test environments have no `localStorage`; browser keeps persistent trigger state. */
+const triggerStateStoreLayer =
+  typeof globalThis.localStorage !== 'undefined'
+    ? TriggerStateStore.layerKv.pipe(Layer.provide(BrowserKeyValueStore.layerLocalStorage))
+    : TriggerStateStore.layerMemory;
+
 /**
  * Adapts plugin capabilities to runtime layers.
  */
 class ComputeRuntimeProviderImpl extends Resource implements AutomationCapabilities.ComputeRuntimeProvider {
   readonly #runtimes = new Map<SpaceId, AutomationCapabilities.ComputeRuntime>();
+  readonly #subscriptions = new Map<SpaceId, () => void>();
   readonly #capabilities: CapabilityManager.CapabilityManager;
 
   constructor(capabilities: CapabilityManager.CapabilityManager) {
@@ -77,17 +100,24 @@ class ComputeRuntimeProviderImpl extends Resource implements AutomationCapabilit
   protected override async _open() {}
 
   protected override async _close() {
+    for (const unsubscribe of this.#subscriptions.values()) {
+      unsubscribe();
+    }
+    this.#subscriptions.clear();
     await Promise.all(Array.from(this.#runtimes.values()).map((rt) => rt.dispose()));
     this.#runtimes.clear();
   }
 
   getRuntime(spaceId: SpaceId): AutomationCapabilities.ComputeRuntime {
     if (this.#runtimes.has(spaceId)) {
+      log('getRuntime cache hit', { spaceId });
       return this.#runtimes.get(spaceId)!;
     }
+    log('getRuntime building', { spaceId });
 
-    const layer = Layer.unwrapEffect(
+    const layer = Layer.unwrapScoped(
       Effect.gen(this, function* () {
+        log('compute runtime layer build: start', { spaceId });
         const client = this.#capabilities.get(ClientCapabilities.Client);
         const aiServiceLayer =
           this.#capabilities.get(AppCapabilities.AiServiceLayer) ?? Layer.die('AiService not found');
@@ -98,10 +128,10 @@ class ComputeRuntimeProviderImpl extends Resource implements AutomationCapabilit
           ...this.#capabilities.getAll(Capabilities.OperationHandler),
         );
 
-        const genericToolkitProvider = Layer.succeed(GenericToolkit.GenericToolkitProvider, {
+        const opaqueToolkitProvider = Layer.succeed(OpaqueToolkit.OpaqueToolkitProvider, {
           getToolkit: () => {
             const toolkits = this.#capabilities.getAll(AppCapabilities.Toolkit);
-            return GenericToolkit.merge(...toolkits);
+            return OpaqueToolkit.merge(...toolkits);
           },
         });
 
@@ -111,136 +141,186 @@ class ComputeRuntimeProviderImpl extends Resource implements AutomationCapabilit
 
         const space = client.spaces.get(spaceId);
         invariant(space, `Invalid space: ${spaceId}`);
+        log('compute runtime layer build: waiting for space ready', { spaceId });
+        const waitStarted = Date.now();
         yield* Effect.promise(() => space.waitUntilReady());
+        log('compute runtime layer build: space ready', { spaceId, waitMs: Date.now() - waitStarted });
+
+        // Maintain a live query of space-level MCP server configs.
+        const mcpQuery = space.db.query(Filter.type(McpServer.McpServer));
+        this.#subscriptions.set(spaceId, mcpQuery.subscribe());
 
-        return Layer.mergeAll(
-          TriggerDispatcher.layer({ timeControl: 'natural' }),
-          Layer.succeed(Blueprint.RegistryService, new Blueprint.Registry(blueprints)),
-        ).pipe(
-          Layer.provideMerge(AgentService.layer()),
-          Layer.provideMerge(ProcessManager.ProcessOperationInvoker.layer),
-          Layer.provideMerge(ProcessManager.layer()),
-          // TODO(dmaretskyi): Duped in assistant testing layer.
-          Layer.provideMerge(
-            // TODO(dmaretskyi): Refactor to be able to merge resovler layers, also consider service mesh achitecture.
-            Layer.effect(
-              ServiceResolver.ServiceResolver,
-              Effect.gen(function* () {
-                const services = yield* Effect.context<Database.Service | Feed.FeedService>().pipe(
-                  Effect.map(Context.pick(Database.Service, Feed.FeedService)),
-                  Effect.map(Layer.succeedContext),
-                );
-                // AiContextBinder.
-                return ServiceResolver.compose(
-                  ServiceResolver.succeed(AiContextService, (context) =>
-                    Effect.gen(function* () {
-                      if (!context.conversation) {
-                        return yield* Effect.fail(new ServiceNotAvailableError(AiContextService.key));
-                      }
-                      const feed = yield* Database.resolve(DXN.parse(context.conversation), Feed.Feed).pipe(
-                        Effect.orDie,
-                      );
-                      const runtime = yield* Effect.runtime<Feed.FeedService>();
-                      const binder = yield* acquireReleaseResource(
-                        () =>
-                          new AiContextBinder({
-                            feed,
-                            runtime,
-                          }),
-                      );
-                      return { binder };
-                    }).pipe(Effect.provide(services)),
-                  ),
-                  // AiConversationService.
-                  ServiceResolver.succeed(AiConversationService, (context) =>
-                    Effect.gen(function* () {
-                      if (!context.conversation) {
-                        return yield* Effect.fail(new ServiceNotAvailableError(AiConversationService.key));
-                      }
-                      const feed = yield* Database.resolve(DXN.parse(context.conversation), Feed.Feed).pipe(
-                        Effect.orDie,
-                      );
-                      const runtime = yield* Effect.runtime<Feed.FeedService>();
-                      const conversation = yield* acquireReleaseResource(
-                        () =>
-                          new AiConversation({
-                            feed,
-                            runtime,
-                          }),
-                      );
-                      return conversation;
-                    }).pipe(Effect.provide(services)),
-                  ),
-                  yield* ServiceResolver.fromRequirements(
-                    Database.Service,
-                    GenericToolkit.GenericToolkitProvider,
-                    Feed.FeedService,
-                    AiService.AiService,
-                    OperationRegistry.Service,
-                    Blueprint.RegistryService,
-                  ),
-                );
+        log('compute runtime layer build: composing inner layer', { spaceId });
+        return Layer.scopedDiscard(
+          Effect.gen(function* () {
+            log('compute runtime inner layer: acquiring services', { spaceId });
+            const registry = yield* Registry.AtomRegistry;
+            const triggerDispatcher = yield* TriggerDispatcher;
+            log('compute runtime inner layer: services acquired', { spaceId });
+            // Track the in-flight start/stop so a new transition cancels the previous one
+            // (preserving ordering on rapid toggles) and surfaces failures via the Effect logger.
+            let inFlight: Fiber.RuntimeFiber<unknown, unknown> | undefined;
+            const transition = (effect: Effect.Effect<unknown, unknown>) => {
+              if (inFlight) {
+                Effect.runFork(Fiber.interrupt(inFlight));
+              }
+              inFlight = Effect.runFork(
+                effect.pipe(
+                  Effect.tapErrorCause((cause) => Effect.logError('trigger dispatcher transition failed', cause)),
+                ),
+              );
+            };
+            const unsubscribe = registry.subscribe(
+              AtomObj.make(space.properties),
+              (properties: Obj.Snapshot<SpaceProperties>) => {
+                const computeEnvironment = properties.computeEnvironment ?? 'local';
+                transition(computeEnvironment === 'local' ? triggerDispatcher.start() : triggerDispatcher.stop());
+              },
+              { immediate: true },
+            );
+            yield* Effect.addFinalizer(() =>
+              Effect.sync(() => {
+                log('compute runtime inner layer: finalize', { spaceId });
+                unsubscribe();
+                if (inFlight) {
+                  Effect.runFork(Fiber.interrupt(inFlight));
+                }
+              }),
+            );
+            log('compute runtime inner layer: acquire complete', { spaceId });
+          }),
+        )
+          .pipe(
+            Layer.provideMerge(TriggerDispatcher.layer({ timeControl: 'natural' })),
+            Layer.provideMerge(
+              AgentService.layer({
+                getMcpServers: () =>
+                  mcpQuery.results
+                    .filter(Obj.instanceOf(McpServer.McpServer))
+                    .filter((server) => server.enabled !== false)
+                    .map(({ url, protocol, apiKey }) => ({ url, protocol, apiKey })),
               }),
             ),
-          ),
-          Layer.provideMerge(Layer.succeed(Blueprint.RegistryService, new Blueprint.Registry(blueprints))),
-          Layer.provideMerge(OperationRegistry.layer),
-          Layer.provideMerge(Layer.succeed(Capability.Service, this.#capabilities)),
-          Layer.provideMerge(Layer.succeed(Registry.AtomRegistry, registry)),
-          Layer.provideMerge(
-            Layer.mergeAll(
-              TracingServiceLive,
-              FeedTraceSink.layerLive,
-              TriggerStateStore.layerKv.pipe(Layer.provide(BrowserKeyValueStore.layerLocalStorage)),
-              ToolExecutionServices,
-              KeyValueStore.layerMemory,
+            Layer.provideMerge(ProcessManager.ProcessOperationInvoker.layer),
+            Layer.provideMerge(ProcessManager.layer({ runtimeName: Trace.CommonRuntimeName.local })),
+            // TODO(dmaretskyi): Duped in assistant testing layer.
+            Layer.provideMerge(
+              // TODO(dmaretskyi): Refactor to be able to merge resovler layers, also consider service mesh achitecture.
+              Layer.effect(
+                ServiceResolver.ServiceResolver,
+                Effect.gen(function* () {
+                  const services = yield* Effect.context<Database.Service | Feed.FeedService>().pipe(
+                    Effect.map(Context.pick(Database.Service, Feed.FeedService)),
+                    Effect.map(Layer.succeedContext),
+                  );
+                  // AiContext.Binder.
+                  return ServiceResolver.compose(
+                    ServiceResolver.succeed(AiContext.Service, (context) =>
+                      Effect.gen(function* () {
+                        if (!context.conversation) {
+                          return yield* Effect.fail(new ServiceNotAvailableError(AiContext.Service.key));
+                        }
+                        const feed = yield* Database.resolve(DXN.parse(context.conversation), Feed.Feed).pipe(
+                          Effect.orDie,
+                        );
+                        const runtime = yield* Effect.runtime<Feed.FeedService>();
+                        const binder = yield* acquireReleaseResource(
+                          () =>
+                            new AiContext.Binder({
+                              feed,
+                              runtime,
+                            }),
+                        );
+                        return { binder };
+                      }).pipe(Effect.provide(services)),
+                    ),
+                    // AiSession.Service.
+                    ServiceResolver.succeed(AiSession.Service, (context) =>
+                      Effect.gen(function* () {
+                        if (!context.conversation) {
+                          return yield* Effect.fail(new ServiceNotAvailableError(AiSession.Service.key));
+                        }
+                        const feed = yield* Database.resolve(DXN.parse(context.conversation), Feed.Feed).pipe(
+                          Effect.orDie,
+                        );
+                        const runtime = yield* Effect.runtime<Feed.FeedService>();
+                        const session = yield* acquireReleaseResource(
+                          () =>
+                            new AiSession.Session({
+                              feed,
+                              runtime,
+                            }),
+                        );
+                        return session;
+                      }).pipe(Effect.provide(services)),
+                    ),
+                    yield* ServiceResolver.fromRequirements(
+                      Database.Service,
+                      OpaqueToolkit.OpaqueToolkitProvider,
+                      Feed.FeedService,
+                      QueueService,
+                      AiService.AiService,
+                      OperationRegistry.Service,
+                      Blueprint.RegistryService,
+                      Credential.CredentialsService,
+                    ),
+                  );
+                }),
+              ),
+            ),
+            Layer.provideMerge(Layer.succeed(Blueprint.RegistryService, new Blueprint.Registry(blueprints))),
+            Layer.provideMerge(Layer.succeed(Capability.Service, this.#capabilities)),
+            Layer.provideMerge(Layer.succeed(Registry.AtomRegistry, registry)),
+            Layer.provideMerge(
+              Layer.mergeAll(FeedTraceSink.layerLive, triggerStateStoreLayer, KeyValueStore.layerMemory),
+            ),
+            Layer.provideMerge(OperationRegistry.layer),
+            Layer.provideMerge(feedServiceFromQueueServiceLayer),
+            Layer.provideMerge(OperationHandlerSet.provide(operationHandlers)),
+            Layer.provideMerge(
+              Layer.effect(
+                Operation.Service,
+                Effect.gen(function* () {
+                  const fis = yield* FunctionInvocationService;
+                  return {
+                    invoke: (op: any, ...args: any[]) => (fis.invokeFunction as any)(op, args[0]),
+                    schedule: (op: any, ...args: any[]) =>
+                      (fis.invokeFunction as any)(op, args[0]).pipe(Effect.fork, Effect.asVoid),
+                    invokePromise: async () => ({ error: new Error('Not implemented') }),
+                  } as unknown as Operation.OperationService;
+                }),
+              ),
             ),
-          ),
-          Layer.provideMerge(feedServiceFromQueueServiceLayer),
-          Layer.provideMerge(OperationHandlerSet.provide(operationHandlers)),
-          Layer.provideMerge(
-            FunctionInvocationServiceLayerWithLocalLoopbackExecutor.pipe(
-              Layer.provideMerge(genericToolkitProvider),
-              Layer.provideMerge(FunctionImplementationResolver.layerTest({ functions: operationHandlers })),
-              Layer.provideMerge(
-                RemoteFunctionExecutionService.fromClient(
-                  client,
-                  client.config.get('runtime.client.edgeFeatures.agents') ? spaceId : undefined,
+            Layer.provideMerge(
+              FunctionInvocationServiceLayerWithLocalLoopbackExecutor.pipe(
+                Layer.provideMerge(FunctionImplementationResolver.layerTest({ functions: operationHandlers })),
+                Layer.provideMerge(
+                  client.config.values.runtime?.services?.edge?.url
+                    ? RemoteFunctionExecutionService.fromClient(
+                        client,
+                        client.config.get('runtime.client.edgeFeatures.agents') ? spaceId : undefined,
+                      )
+                    : RemoteFunctionExecutionService.layerMock,
                 ),
               ),
-              Layer.provideMerge(aiServiceLayer),
-              Layer.provideMerge(CredentialsService.layerFromDatabase()),
-              Layer.provideMerge(ClientService.fromClient(client)),
-              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),
             ),
-          ),
-        );
+            Layer.provideMerge(opaqueToolkitProvider),
+            Layer.provideMerge(aiServiceLayer),
+            Layer.provideMerge(credentialsLayerFromDatabase()),
+            Layer.provideMerge(ClientService.fromClient(client)),
+            Layer.provideMerge(space ? Database.layer(space.db) : Database.notAvailable),
+          )
+          .pipe(
+            Layer.provideMerge(space ? QueueService.layer(space.queues) : QueueService.notAvailable),
+            Layer.provideMerge(space ? createFeedServiceLayer(space.queues) : Feed.notAvailable),
+            Layer.provideMerge(isDev ? asyncTaskTaggingLayer() : Layer.empty),
+          );
       }),
     );
 
     const runtime = ManagedRuntime.make(layer);
+    log('getRuntime ready (managed runtime created)', { spaceId });
     this.#runtimes.set(spaceId, runtime);
     return runtime;
   }
 }
-
-const TracingServiceLive = Layer.unwrapEffect(
-  Effect.gen(function* () {
-    const objects = yield* Database.runQuery(Query.type(SpaceProperties));
-    const [properties] = objects;
-    invariant(properties);
-    // TODO(burdon): Check ref target has loaded?
-    if (!properties.invocationTraceQueue || !properties.invocationTraceQueue.target) {
-      const queue = yield* QueueService.createQueue({ subspaceTag: 'trace' });
-      Obj.change(properties, (obj) => {
-        obj.invocationTraceQueue = Ref.fromDXN(queue.dxn);
-      });
-    }
-
-    const queue = properties.invocationTraceQueue!.target;
-    invariant(queue);
-    return TracingServiceExt.layerInvocationsQueue({ invocationTraceQueue: queue });
-  }),
-);

package/src/capabilities/index.ts

@@ -3,7 +3,7 @@
 //
 
 import { Capability } from '@dxos/app-framework';
-import { OperationHandlerSet } from '@dxos/operation';
+import { OperationHandlerSet } from '@dxos/compute';
 
 export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
 export const ComputeRuntime = Capability.lazy('ComputeRuntime', () => import('./compute-runtime'));

package/src/capabilities/node.ts

@@ -3,5 +3,11 @@
 //
 
 import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/compute';
 
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
 export const ComputeRuntime = Capability.lazy('ComputeRuntime', () => import('./compute-runtime'));
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);

package/src/capabilities/operation-handler.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import type { OperationHandlerSet } from '@dxos/operation';
+import type { OperationHandlerSet } from '@dxos/compute';
 
 import { AutomationOperationHandlerSet } from '#operations';
 

package/src/capabilities/react-surface.tsx

@@ -18,8 +18,7 @@ export default Capability.makeModule(() =>
     Capability.contributes(Capabilities.ReactSurface, [
       Surface.create({
         id: 'space-settings-functions',
-        role: 'article',
-        filter: AppSurface.literalSection(`${meta.id}.space-settings-functions`),
+        filter: AppSurface.literal(AppSurface.Article, `${meta.id}.space-settings-functions`),
         component: () => {
           const space = useActiveSpace();
           if (!space) {
@@ -31,8 +30,7 @@ export default Capability.makeModule(() =>
       }),
       Surface.create({
         id: 'space-settings-automation',
-        role: 'article',
-        filter: AppSurface.literalSection(`${meta.id}.space-settings-automation`),
+        filter: AppSurface.literal(AppSurface.Article, `${meta.id}.space-settings-automation`),
         component: () => {
           const space = useActiveSpace();
           if (!space) {
@@ -44,8 +42,10 @@ export default Capability.makeModule(() =>
       }),
       Surface.create({
         id: 'companion.automation',
-        role: 'article',
-        filter: AppSurface.and(AppSurface.literalArticle('automation'), AppSurface.companionArticle()),
+        filter: AppSurface.allOf(
+          AppSurface.literal(AppSurface.Article, 'automation'),
+          AppSurface.companion(AppSurface.Article),
+        ),
         component: ({ data }) => {
           const space = getSpace(data.companionTo);
           if (!space) {

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

@@ -13,12 +13,11 @@ 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 { Trigger } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 
 import { Enabled, Input, Queue } from '../options';
-import { printTrigger, promptForSchemaInput, selectFunction, selectQueue } from '../util';
+import { printTrigger, promptForSchemaInput, selectFunction, selectFeed } from '../util';
 
 export const queue = Command.make(
   'queue',
@@ -43,8 +42,8 @@ export const queue = Command.make(
         return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
       }
 
-      const queueDxn = yield* Option.match(options.queue, {
-        onNone: () => selectQueue(),
+      const queueDXN = yield* Option.match(options.queue, {
+        onNone: () => selectFeed(),
         onSome: (dxn) => Effect.succeed(dxn.toString()),
       });
 
@@ -66,10 +65,7 @@ export const queue = Command.make(
       const trigger = Trigger.make({
         function: Ref.make(fn),
         enabled,
-        spec: {
-          kind: 'queue',
-          queue: queueDxn,
-        },
+        spec: Trigger.specQueue(queueDXN),
         input,
       });
 

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

@@ -13,9 +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 { Trigger } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 
 import { Deep, Delay, Enabled, Input, Typename } from '../options';
 import { printTrigger, promptForSchemaInput, selectFunction } from '../util';
@@ -52,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: () =>
@@ -103,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);

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

@@ -13,9 +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 { Trigger } from '@dxos/functions';
-import { Operation } from '@dxos/operation';
 
 import { Cron, Enabled, Input } from '../options';
 import { printTrigger, promptForSchemaInput, selectFunction } from '../util';
@@ -70,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,
       });
 

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

@@ -9,9 +9,9 @@ import * as Effect from 'effect/Effect';
 
 import { CommandConfig, Common, printList, spaceIdWithDefault, spaceLayer } from '@dxos/cli-util';
 import { ClientService } from '@dxos/client';
+import { Trigger } from '@dxos/compute';
 import { Context } from '@dxos/context';
-import { Database, Filter } from '@dxos/echo';
-import { Trigger } from '@dxos/functions';
+import { Database, Filter, Query } from '@dxos/echo';
 
 import { getTriggerRemoteStatus, printTrigger } from './util';
 
@@ -24,7 +24,9 @@ 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* () {

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

@@ -9,9 +9,8 @@ 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, DXN } from '@dxos/echo';
 
 import { TriggerId } from './options';
 import { printTriggerRemoved, selectTrigger } from './util';