@dxos/plugin-automation 0.8.4-main.72ec0f3 → 0.8.4-main.74a063c4e0

package/src/capabilities/compute-runtime.ts

@@ -2,45 +2,76 @@
 // Copyright 2025 DXOS.org
 //
 
+import { Registry } from '@effect-atom/atom';
 import * as BrowserKeyValueStore from '@effect/platform-browser/BrowserKeyValueStore';
+import * as KeyValueStore from '@effect/platform/KeyValueStore';
+import * as Context from 'effect/Context';
 import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 import * as ManagedRuntime from 'effect/ManagedRuntime';
 
-import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
-import { GenericToolkit, makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
+import { AiService, GenericToolkit } 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 { ClientService } from '@dxos/client';
+import { SpaceProperties } from '@dxos/client/echo';
 import { Resource } from '@dxos/context';
-import { Query, Ref } from '@dxos/echo';
-import { CredentialsService, DatabaseService, QueueService } from '@dxos/functions';
+import { Database, DXN, Feed, Obj, Query, Ref } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-db';
+import { acquireReleaseResource } from '@dxos/effect';
+import {
+  CredentialsService,
+  feedServiceFromQueueServiceLayer,
+  QueueService,
+  ServiceNotAvailableError,
+} from '@dxos/functions';
 import {
+  FeedTraceSink,
   FunctionImplementationResolver,
   FunctionInvocationServiceLayerWithLocalLoopbackExecutor,
-  InvocationTracer,
+  ProcessManager,
   RemoteFunctionExecutionService,
+  ServiceResolver,
+  TracingServiceExt,
   TriggerDispatcher,
+  TriggerStateStore,
 } from '@dxos/functions-runtime';
-import { TriggerStateStore } from '@dxos/functions-runtime';
 import { invariant } from '@dxos/invariant';
 import { type SpaceId } from '@dxos/keys';
-import { ClientCapabilities } from '@dxos/plugin-client';
-import { PropertiesType } from '@dxos/react-client/echo';
+import { OperationHandlerSet, OperationRegistry } from '@dxos/operation';
+import { ClientCapabilities } from '@dxos/plugin-client/types';
 
-import { AutomationCapabilities } from './capabilities';
+import { AutomationCapabilities } from '#types';
 
-export default async (context: PluginContext) => {
-  const provider = await new ComputeRuntimeProviderImpl(context).open();
-  return contributes(AutomationCapabilities.ComputeRuntime, provider, async () => {
-    await provider.close();
-  });
-};
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const capabilities = yield* Capability.Service;
+    const provider = yield* Effect.tryPromise(() => new ComputeRuntimeProviderImpl(capabilities).open());
+    return Capability.contributes(AutomationCapabilities.ComputeRuntime, provider, () =>
+      Effect.tryPromise(() => provider.close()),
+    );
+  }),
+);
 
+/**
+ * Adapts plugin capabilities to runtime layers.
+ */
 class ComputeRuntimeProviderImpl extends Resource implements AutomationCapabilities.ComputeRuntimeProvider {
   readonly #runtimes = new Map<SpaceId, AutomationCapabilities.ComputeRuntime>();
-  readonly #context: PluginContext;
+  readonly #capabilities: CapabilityManager.CapabilityManager;
 
-  constructor(context: PluginContext) {
+  constructor(capabilities: CapabilityManager.CapabilityManager) {
     super();
-    this.#context = context;
+    this.#capabilities = capabilities;
   }
 
   protected override async _open() {}
@@ -57,46 +88,132 @@ class ComputeRuntimeProviderImpl extends Resource implements AutomationCapabilit
 
     const layer = Layer.unwrapEffect(
       Effect.gen(this, function* () {
-        const client = this.#context.getCapability(ClientCapabilities.Client);
-        const serviceLayer =
-          this.#context.getCapability(Capabilities.AiServiceLayer) ?? Layer.die('AiService not found');
+        const client = this.#capabilities.get(ClientCapabilities.Client);
+        const aiServiceLayer =
+          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.#context.getCapabilities(Capabilities.Functions).flat();
-        const toolkits = this.#context.getCapabilities(Capabilities.Toolkit);
-        const mergedToolkit = GenericToolkit.merge(...toolkits);
-        const toolkit = mergedToolkit.toolkit;
-        const toolkitLayer = mergedToolkit.layer;
+        const operationHandlers = OperationHandlerSet.merge(
+          ...this.#capabilities.getAll(Capabilities.OperationHandler),
+        );
+
+        const genericToolkitProvider = Layer.succeed(GenericToolkit.GenericToolkitProvider, {
+          getToolkit: () => {
+            const toolkits = this.#capabilities.getAll(AppCapabilities.Toolkit);
+            return GenericToolkit.merge(...toolkits);
+          },
+        });
+
+        const blueprints = this.#capabilities
+          .getAll(AppCapabilities.BlueprintDefinition)
+          .flatMap((blueprint) => blueprint.make());
 
         const space = client.spaces.get(spaceId);
-        invariant(space);
+        invariant(space, `Invalid space: ${spaceId}`);
         yield* Effect.promise(() => space.waitUntilReady());
 
-        return Layer.mergeAll(TriggerDispatcher.layer({ timeControl: 'natural' })).pipe(
+        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,
+                  ),
+                );
+              }),
+            ),
+          ),
+          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(
-              InvocationTracerLive,
+              TracingServiceLive,
+              FeedTraceSink.layerLive,
               TriggerStateStore.layerKv.pipe(Layer.provide(BrowserKeyValueStore.layerLocalStorage)),
-              makeToolResolverFromFunctions(functions, toolkit),
-              makeToolExecutionServiceFromFunctions(toolkit, toolkitLayer),
+              ToolExecutionServices,
+              KeyValueStore.layerMemory,
             ),
           ),
+          Layer.provideMerge(feedServiceFromQueueServiceLayer),
+          Layer.provideMerge(OperationHandlerSet.provide(operationHandlers)),
           Layer.provideMerge(
-            Layer.mergeAll(
-              FunctionInvocationServiceLayerWithLocalLoopbackExecutor.pipe(
-                Layer.provideMerge(FunctionImplementationResolver.layerTest({ functions })),
-                Layer.provideMerge(
-                  RemoteFunctionExecutionService.fromClient(
-                    client,
-                    // If agent is not enabled do not provide spaceId because space context will be unavailable on EDGE.
-                    client.config.get('runtime.client.edgeFeatures.agents') ? spaceId : undefined,
-                  ),
+            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(serviceLayer),
-                Layer.provideMerge(CredentialsService.layerFromDatabase()),
-                Layer.provideMerge(space ? DatabaseService.layer(space.db) : DatabaseService.notAvailable),
-                Layer.provideMerge(space ? QueueService.layer(space.queues) : QueueService.notAvailable),
               ),
+              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),
             ),
           ),
         );
@@ -105,23 +222,25 @@ class ComputeRuntimeProviderImpl extends Resource implements AutomationCapabilit
 
     const runtime = ManagedRuntime.make(layer);
     this.#runtimes.set(spaceId, runtime);
-
     return runtime;
   }
 }
 
-const InvocationTracerLive = Layer.unwrapEffect(
+const TracingServiceLive = Layer.unwrapEffect(
   Effect.gen(function* () {
-    const {
-      objects: [properties],
-    } = yield* DatabaseService.runQuery(Query.type(PropertiesType));
+    const objects = yield* Database.runQuery(Query.type(SpaceProperties));
+    const [properties] = objects;
     invariant(properties);
-    if (!properties.invocationTraceQueue) {
+    // TODO(burdon): Check ref target has loaded?
+    if (!properties.invocationTraceQueue || !properties.invocationTraceQueue.target) {
       const queue = yield* QueueService.createQueue({ subspaceTag: 'trace' });
-      properties.invocationTraceQueue = Ref.fromDXN(queue.dxn);
+      Obj.change(properties, (obj) => {
+        obj.invocationTraceQueue = Ref.fromDXN(queue.dxn);
+      });
     }
-    const queue = properties.invocationTraceQueue.target;
+
+    const queue = properties.invocationTraceQueue!.target;
     invariant(queue);
-    return InvocationTracer.layerLive({ invocationTraceQueue: queue });
+    return TracingServiceExt.layerInvocationsQueue({ invocationTraceQueue: queue });
   }),
 );

package/src/capabilities/index.ts

@@ -2,11 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-import { lazy } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/operation';
 
-export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
-export const ComputeRuntime = lazy(() => import('./compute-runtime'));
-export const IntentResolver = lazy(() => import('./intent-resolver'));
-export const ReactSurface = lazy(() => import('./react-surface'));
-
-export * from './capabilities';
+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'),
+);
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/node.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+
+export const ComputeRuntime = Capability.lazy('ComputeRuntime', () => import('./compute-runtime'));

package/src/capabilities/operation-handler.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import type { OperationHandlerSet } from '@dxos/operation';
+
+import { AutomationOperationHandlerSet } from '#operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, AutomationOperationHandlerSet);
+  }),
+);

package/src/capabilities/react-surface.tsx

@@ -2,55 +2,58 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
-import { useLayout } from '@dxos/app-framework/react';
-import { Obj } from '@dxos/echo';
-import { getSpace, parseId, useSpace } from '@dxos/react-client/echo';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface } from '@dxos/app-framework/ui';
+import { AppSurface, useActiveSpace } from '@dxos/app-toolkit/ui';
+import { getSpace } from '@dxos/react-client/echo';
 
-import { AutomationSettings, FunctionsContainer } from '../components';
-import { meta } from '../meta';
+import { AutomationSettings, FunctionsContainer } from '#containers';
+import { meta } from '#meta';
 
-export default () =>
-  contributes(Capabilities.ReactSurface, [
-    createSurface({
-      id: `${meta.id}/space-settings-functions`,
-      role: 'article',
-      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);
-        if (!space) {
-          return null;
-        }
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: 'space-settings-functions',
+        role: 'article',
+        filter: AppSurface.literalSection(`${meta.id}.space-settings-functions`),
+        component: () => {
+          const space = useActiveSpace();
+          if (!space) {
+            return null;
+          }
 
-        return <FunctionsContainer space={space} />;
-      },
-    }),
-    createSurface({
-      id: `${meta.id}/space-settings-automation`,
-      role: 'article',
-      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);
-        if (!space) {
-          return null;
-        }
+          return <FunctionsContainer space={space} />;
+        },
+      }),
+      Surface.create({
+        id: 'space-settings-automation',
+        role: 'article',
+        filter: AppSurface.literalSection(`${meta.id}.space-settings-automation`),
+        component: () => {
+          const space = useActiveSpace();
+          if (!space) {
+            return null;
+          }
 
-        return <AutomationSettings space={space} />;
-      },
-    }),
-    createSurface({
-      id: `${meta.id}/companion/automation`,
-      role: 'article',
-      filter: (data): data is { companionTo: Obj.Any; subject: 'automation' } =>
-        Obj.isObject(data.companionTo) && data.subject === 'automation',
-      component: ({ data }) => {
-        return <AutomationSettings space={getSpace(data.companionTo)!} object={data.companionTo} />;
-      },
-    }),
-  ]);
+          return <AutomationSettings space={space} />;
+        },
+      }),
+      Surface.create({
+        id: 'companion.automation',
+        role: 'article',
+        filter: AppSurface.and(AppSurface.literalArticle('automation'), AppSurface.companionArticle()),
+        component: ({ data }) => {
+          const space = getSpace(data.companionTo);
+          if (!space) {
+            return null;
+          }
+          return <AutomationSettings space={space} object={data.companionTo} />;
+        },
+      }),
+    ]),
+  ),
+);

package/src/cli/commands/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './trigger';

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

@@ -0,0 +1,14 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+
+import { queue } from './queue';
+import { subscription } from './subscription';
+import { timer } from './timer';
+
+export const create = Command.make('create').pipe(
+  Command.withDescription('Create a trigger.'),
+  Command.withSubcommands([subscription, timer, queue]),
+);

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

@@ -0,0 +1,90 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Command from '@effect/cli/Command';
+import * as Options from '@effect/cli/Options';
+import * as Prompt from '@effect/cli/Prompt';
+import * as Console from 'effect/Console';
+import * as Effect from 'effect/Effect';
+import * as HashMap from 'effect/HashMap';
+import * as Option from 'effect/Option';
+
+import { CommandConfig } from '@dxos/cli-util';
+import { flushAndSync, print, spaceLayer, withTypes } from '@dxos/cli-util';
+import { Common } from '@dxos/cli-util';
+import { Database, Filter, JsonSchema, Ref } from '@dxos/echo';
+import { Trigger } from '@dxos/functions';
+import { Operation } from '@dxos/operation';
+
+import { Enabled, Input, Queue } from '../options';
+import { printTrigger, promptForSchemaInput, selectFunction, selectQueue } from '../util';
+
+export const queue = Command.make(
+  'queue',
+  {
+    spaceId: Common.spaceId.pipe(Options.optional),
+    enabled: Enabled,
+    functionId: Common.functionId.pipe(Options.optional),
+    queue: Queue.pipe(Options.optional),
+    input: Input.pipe(Options.optional),
+  },
+  (options) =>
+    Effect.gen(function* () {
+      const { json } = yield* CommandConfig;
+
+      const functionId = yield* Option.match(options.functionId, {
+        onNone: () => selectFunction(),
+        onSome: (id) => Effect.succeed(id),
+      });
+      const functions = yield* Database.runQuery(Filter.type(Operation.PersistentOperation));
+      const fn = functions.find((fn) => fn.id === functionId);
+      if (!fn) {
+        return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
+      }
+
+      const queueDxn = yield* Option.match(options.queue, {
+        onNone: () => selectQueue(),
+        onSome: (dxn) => Effect.succeed(dxn.toString()),
+      });
+
+      const input = yield* Option.match(options.input, {
+        onNone: () => promptForSchemaInput(fn.inputSchema ? JsonSchema.toEffectSchema(fn.inputSchema) : undefined),
+        onSome: (value) => Effect.succeed(Object.fromEntries(HashMap.toEntries(value))),
+      });
+
+      // Always prompt for enabled if functionId is not provided.
+      const enabled = yield* Option.match(options.functionId, {
+        onNone: () =>
+          Prompt.confirm({
+            message: 'Enable the trigger?',
+            initial: true,
+          }).pipe(Prompt.run),
+        onSome: () => Effect.succeed(options.enabled),
+      });
+
+      const trigger = Trigger.make({
+        function: Ref.make(fn),
+        enabled,
+        spec: {
+          kind: 'queue',
+          queue: queueDxn,
+        },
+        input,
+      });
+
+      yield* Database.add(trigger);
+
+      if (json) {
+        yield* Console.log(JSON.stringify(trigger, null, 2));
+      } else {
+        yield* Console.log(print(yield* printTrigger(trigger)));
+      }
+
+      yield* flushAndSync({ indexes: true });
+    }),
+).pipe(
+  Command.withDescription('Create a queue trigger.'),
+  Command.provide(({ spaceId }) => spaceLayer(spaceId, true)),
+  Command.provideEffectDiscard(() => withTypes(Operation.PersistentOperation, Trigger.Trigger)),
+);