@dxos/plugin-automation 0.8.4-main.a4bbb77 → 0.8.4-main.abd8ff62ef

package/src/capabilities/compute-runtime.ts

@@ -2,135 +2,324 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Toolkit } from '@effect/ai';
-import { BrowserKeyValueStore } from '@effect/platform-browser';
-import { Effect, Layer, ManagedRuntime } from 'effect';
+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 Fiber from 'effect/Fiber';
+import * as Layer from 'effect/Layer';
+import * as ManagedRuntime from 'effect/ManagedRuntime';
 
-import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
-import { makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
+import { AiService, OpaqueToolkit } from '@dxos/ai';
+import { Capabilities, Capability, type CapabilityManager } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { AiContextBinder, AiContextService, AiSession, AiSessionService } from '@dxos/assistant';
+import { McpServer } from '@dxos/assistant-toolkit';
+import { ClientService } from '@dxos/client';
+import { SpaceProperties } from '@dxos/client-protocol';
+import {
+  Blueprint,
+  Credential,
+  Operation,
+  OperationHandlerSet,
+  OperationRegistry,
+  ServiceNotAvailableError,
+} from '@dxos/compute';
 import { Resource } from '@dxos/context';
-import { 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, asyncTaskTaggingLayer } from '@dxos/effect';
 import {
-  CredentialsService,
-  DatabaseService,
-  FunctionImplementationResolver,
   FunctionInvocationService,
-  InvocationTracer,
-  LocalFunctionExecutionService,
+  feedServiceFromQueueServiceLayer,
   QueueService,
+  credentialsLayerFromDatabase,
+} from '@dxos/functions';
+import { AgentService } from '@dxos/functions-runtime';
+import {
+  FeedTraceSink,
+  FunctionImplementationResolver,
+  FunctionInvocationServiceLayerWithLocalLoopbackExecutor,
+  ProcessManager,
   RemoteFunctionExecutionService,
+  ServiceResolver,
   TriggerDispatcher,
-} from '@dxos/functions';
-import { TriggerStateStore } from '@dxos/functions';
+  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 { log } from '@dxos/log';
+import { ClientCapabilities } from '@dxos/plugin-client/types';
+
+import { AutomationCapabilities } from '#types';
+
+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()),
+    );
+  }),
+);
 
-import { AutomationCapabilities } from './capabilities';
+declare global {
+  interface ImportMeta {
+    env: ImportMetaEnv;
+  }
 
-export default async (context: PluginContext) => {
-  const provider = await new ComputeRuntimeProviderImpl(context).open();
-  return contributes(AutomationCapabilities.ComputeRuntime, provider, async () => {
-    await provider.close();
-  });
-};
+  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, ManagedRuntime.ManagedRuntime<AutomationCapabilities.ComputeServices, never>>();
-  readonly #context: PluginContext;
+  readonly #runtimes = new Map<SpaceId, AutomationCapabilities.ComputeRuntime>();
+  readonly #subscriptions = new Map<SpaceId, () => void>();
+  readonly #capabilities: CapabilityManager.CapabilityManager;
 
-  constructor(context: PluginContext) {
+  constructor(capabilities: CapabilityManager.CapabilityManager) {
     super();
-    this.#context = context;
+    this.#capabilities = capabilities;
   }
 
   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): ManagedRuntime.ManagedRuntime<AutomationCapabilities.ComputeServices, never> {
+  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* () {
-        const client = this.#context.getCapability(ClientCapabilities.Client);
-        const serviceLayer =
-          this.#context.getCapability(Capabilities.AiServiceLayer) ?? Layer.die('AiService not found');
+        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');
+        const registry = this.#capabilities.get(Capabilities.AtomRegistry);
+
+        // TODO(dmaretskyi): Make these reactive.
+        const operationHandlers = OperationHandlerSet.merge(
+          ...this.#capabilities.getAll(Capabilities.OperationHandler),
+        );
 
-        // TODO(dmaretskyi): Make those reactive.
-        const functions = this.#context.getCapabilities(Capabilities.Functions);
-        const toolkits = this.#context.getCapabilities(Capabilities.Toolkit);
-        const handlers = this.#context.getCapabilities(Capabilities.ToolkitHandler);
+        const opaqueToolkitProvider = Layer.succeed(OpaqueToolkit.OpaqueToolkitProvider, {
+          getToolkit: () => {
+            const toolkits = this.#capabilities.getAll(AppCapabilities.Toolkit);
+            return OpaqueToolkit.merge(...toolkits);
+          },
+        });
 
-        const allFunctions = functions.flat();
-        // TODO(wittjosiah): Don't cast.
-        const toolkit = Toolkit.merge(...toolkits) as Toolkit.Toolkit<any>;
-        const handlersLayer = Layer.mergeAll(Layer.empty, ...handlers);
+        const blueprints = this.#capabilities
+          .getAll(AppCapabilities.BlueprintDefinition)
+          .flatMap((blueprint) => blueprint.make());
 
         const space = client.spaces.get(spaceId);
-        invariant(space);
+        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' })).pipe(
-          Layer.provideMerge(
-            Layer.mergeAll(
-              InvocationTracerLive,
-              TriggerStateStore.layerKv.pipe(Layer.provide(BrowserKeyValueStore.layerLocalStorage)),
-              makeToolResolverFromFunctions(allFunctions, toolkit),
-              makeToolExecutionServiceFromFunctions(toolkit, handlersLayer),
+        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(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)),
+                    ),
+                    // AiSessionService.
+                    ServiceResolver.succeed(AiSessionService, (context) =>
+                      Effect.gen(function* () {
+                        if (!context.conversation) {
+                          return yield* Effect.fail(new ServiceNotAvailableError(AiSessionService.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({
+                              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(
-            Layer.mergeAll(
-              FunctionInvocationService.layer.pipe(
+            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(
+              FunctionInvocationServiceLayerWithLocalLoopbackExecutor.pipe(
+                Layer.provideMerge(FunctionImplementationResolver.layerTest({ functions: operationHandlers })),
                 Layer.provideMerge(
-                  LocalFunctionExecutionService.layerLive.pipe(
-                    Layer.provideMerge(FunctionImplementationResolver.layerTest({ functions: allFunctions })),
-                    Layer.provideMerge(
-                      RemoteFunctionExecutionService.fromClient(
-                        client.edge.baseUrl,
-                        // If agent is not enabled do not provide spaceId because space context will be unavailable on EDGE.
+                  client.config.values.runtime?.services?.edge?.url
+                    ? 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),
-                  ),
+                      )
+                    : RemoteFunctionExecutionService.layerMock,
                 ),
               ),
             ),
-          ),
-        );
+            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 InvocationTracerLive = Layer.unwrapEffect(
-  Effect.gen(function* () {
-    const {
-      objects: [properties],
-    } = yield* DatabaseService.runQuery(Query.type(PropertiesType));
-    invariant(properties);
-    if (!properties.invocationTraceQueue) {
-      const queue = yield* QueueService.createQueue({ subspaceTag: 'trace' });
-      properties.invocationTraceQueue = Ref.fromDXN(queue.dxn);
-    }
-    const queue = properties.invocationTraceQueue.target;
-    invariant(queue);
-    return InvocationTracer.layerLive({ 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/compute';
 
-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,13 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+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

@@ -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/compute';
+
+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, useLayout } from '@dxos/app-framework';
-import { Obj } from '@dxos/echo';
-import { ScriptType } from '@dxos/functions';
-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',
+        filter: AppSurface.literal(AppSurface.Article, `${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',
+        filter: AppSurface.literal(AppSurface.Article, `${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: ScriptType; subject: 'automation' } =>
-        Obj.instanceOf(ScriptType, 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',
+        filter: AppSurface.allOf(
+          AppSurface.literal(AppSurface.Article, 'automation'),
+          AppSurface.companion(AppSurface.Article),
+        ),
+        component: ({ data }) => {
+          const space = getSpace(data.companionTo);
+          if (!space) {
+            return null;
+          }
+          return <AutomationSettings space={space} object={data.companionTo} />;
+        },
+      }),
+    ]),
+  ),
+);

package/src/commands/index.ts

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

package/src/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]),
+);