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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-automation",
-  "version": "0.8.4-main.bc674ce",
+  "version": "0.8.4-main.bcb3aa67d6",
   "description": "Prompt chain plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,6 +12,21 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./src/capabilities/index.ts",
+      "browser": "./src/capabilities/index.ts",
+      "node": "./src/capabilities/node.ts"
+    },
+    "#components": "./src/components/index.ts",
+    "#containers": "./src/containers/index.ts",
+    "#hooks": "./src/hooks/index.ts",
+    "#meta": "./src/meta.ts",
+    "#operations": "./src/operations/index.ts",
+    "#testing": "./src/testing/index.ts",
+    "#types": "./src/types/index.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
@@ -30,6 +45,12 @@
       "browser": "./dist/lib/browser/hooks/index.mjs",
       "node": "./dist/lib/node-esm/hooks/index.mjs"
     },
+    "./operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "browser": "./dist/lib/browser/operations/index.mjs",
+      "node": "./dist/lib/node-esm/operations/index.mjs"
+    },
     "./types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
@@ -54,62 +75,68 @@
     "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.bc674ce",
-    "@dxos/app-framework": "0.8.4-main.bc674ce",
-    "@dxos/assistant": "0.8.4-main.bc674ce",
-    "@dxos/async": "0.8.4-main.bc674ce",
-    "@dxos/cli-util": "0.8.4-main.bc674ce",
-    "@dxos/client": "0.8.4-main.bc674ce",
-    "@dxos/conductor": "0.8.4-main.bc674ce",
-    "@dxos/echo": "0.8.4-main.bc674ce",
-    "@dxos/context": "0.8.4-main.bc674ce",
-    "@dxos/effect": "0.8.4-main.bc674ce",
-    "@dxos/functions": "0.8.4-main.bc674ce",
-    "@dxos/invariant": "0.8.4-main.bc674ce",
-    "@dxos/functions-runtime": "0.8.4-main.bc674ce",
-    "@dxos/keys": "0.8.4-main.bc674ce",
-    "@dxos/log": "0.8.4-main.bc674ce",
-    "@dxos/plugin-client": "0.8.4-main.bc674ce",
-    "@dxos/operation": "0.8.4-main.bc674ce",
-    "@dxos/plugin-graph": "0.8.4-main.bc674ce",
-    "@dxos/plugin-deck": "0.8.4-main.bc674ce",
-    "@dxos/plugin-space": "0.8.4-main.bc674ce",
-    "@dxos/react-client": "0.8.4-main.bc674ce",
-    "@dxos/random": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-components": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-editor": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-list": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-form": "0.8.4-main.bc674ce",
-    "@dxos/react-ui-stack": "0.8.4-main.bc674ce",
-    "@dxos/schema": "0.8.4-main.bc674ce",
-    "@dxos/util": "0.8.4-main.bc674ce",
-    "@dxos/types": "0.8.4-main.bc674ce"
+    "@dxos/ai": "0.8.4-main.bcb3aa67d6",
+    "@dxos/app-toolkit": "0.8.4-main.bcb3aa67d6",
+    "@dxos/app-framework": "0.8.4-main.bcb3aa67d6",
+    "@dxos/assistant": "0.8.4-main.bcb3aa67d6",
+    "@dxos/blueprints": "0.8.4-main.bcb3aa67d6",
+    "@dxos/async": "0.8.4-main.bcb3aa67d6",
+    "@dxos/cli-util": "0.8.4-main.bcb3aa67d6",
+    "@dxos/client": "0.8.4-main.bcb3aa67d6",
+    "@dxos/conductor": "0.8.4-main.bcb3aa67d6",
+    "@dxos/context": "0.8.4-main.bcb3aa67d6",
+    "@dxos/effect": "0.8.4-main.bcb3aa67d6",
+    "@dxos/echo-db": "0.8.4-main.bcb3aa67d6",
+    "@dxos/functions": "0.8.4-main.bcb3aa67d6",
+    "@dxos/invariant": "0.8.4-main.bcb3aa67d6",
+    "@dxos/echo-atom": "0.8.4-main.bcb3aa67d6",
+    "@dxos/keys": "0.8.4-main.bcb3aa67d6",
+    "@dxos/functions-runtime": "0.8.4-main.bcb3aa67d6",
+    "@dxos/log": "0.8.4-main.bcb3aa67d6",
+    "@dxos/operation": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-client": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-deck": "0.8.4-main.bcb3aa67d6",
+    "@dxos/random": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-graph": "0.8.4-main.bcb3aa67d6",
+    "@dxos/plugin-space": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-client": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-attention": "0.8.4-main.bcb3aa67d6",
+    "@dxos/echo": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-list": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-editor": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-stack": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-form": "0.8.4-main.bcb3aa67d6",
+    "@dxos/schema": "0.8.4-main.bcb3aa67d6",
+    "@dxos/types": "0.8.4-main.bcb3aa67d6",
+    "@dxos/util": "0.8.4-main.bcb3aa67d6",
+    "@dxos/react-ui-components": "0.8.4-main.bcb3aa67d6"
   },
   "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.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "7.1.9",
-    "@dxos/react-ui": "0.8.4-main.bc674ce",
-    "@dxos/ui-theme": "0.8.4-main.bc674ce",
-    "@dxos/storybook-utils": "0.8.4-main.bc674ce"
+    "vite": "^7.1.11",
+    "@dxos/react-ui": "0.8.4-main.bcb3aa67d6",
+    "@dxos/ui-theme": "0.8.4-main.bcb3aa67d6",
+    "@dxos/storybook-utils": "0.8.4-main.bcb3aa67d6"
   },
   "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.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.bc674ce",
-    "@dxos/ui-theme": "0.8.4-main.bc674ce"
+    "@dxos/react-ui": "0.8.4-main.bcb3aa67d6",
+    "@dxos/ui-theme": "0.8.4-main.bcb3aa67d6"
   },
   "publishConfig": {
     "access": "public"

package/src/AutomationPlugin.tsx

@@ -2,21 +2,24 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Common, Plugin } from '@dxos/app-framework';
-import { Function, Trigger } from '@dxos/functions';
+import { Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Trigger } from '@dxos/functions';
+import { Operation } from '@dxos/operation';
 import { ClientEvents } from '@dxos/plugin-client/types';
 
-import { AppGraphBuilder, ComputeRuntime, OperationResolver, ReactSurface } from './capabilities';
-import { meta } from './meta';
+import { meta } from '#meta';
 import { translations } from './translations';
-import { AutomationEvents } from './types';
+import { AutomationEvents } from '#types';
+
+import { AppGraphBuilder, ComputeRuntime, OperationHandler, ReactSurface } from '#capabilities';
 
 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.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSchemaModule({ schema: [Operation.PersistentOperation, Trigger.Trigger] }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule({
     activatesOn: ClientEvents.ClientReady,
     activatesAfter: [AutomationEvents.ComputeRuntimeReady],

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

@@ -0,0 +1,62 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities, AppNode } from '@dxos/app-toolkit';
+import { Script } from '@dxos/functions';
+import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
+import { meta as spaceMeta } from '@dxos/plugin-space/meta';
+import { linkedSegment } from '@dxos/react-ui-attention';
+
+import { meta } from '#meta';
+
+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`),
+        connector: (node) =>
+          Effect.succeed([
+            AppNode.makeSettingsPanel({
+              id: `${meta.id}.automations`,
+              type: `${meta.id}.space-settings-automation`,
+              label: ['automation-panel.label', { ns: meta.id }],
+              icon: 'ph--lightning--regular',
+            }),
+          ]),
+      }),
+      GraphBuilder.createExtension({
+        id: `${meta.id}.space-settings-functions`,
+        match: NodeMatcher.whenNodeType(`${spaceMeta.id}.settings`),
+        connector: (node) =>
+          Effect.succeed([
+            AppNode.makeSettingsPanel({
+              id: `${meta.id}.functions`,
+              type: `${meta.id}.space-settings-functions`,
+              label: ['functions-panel.label', { ns: meta.id }],
+              icon: 'ph--function--regular',
+            }),
+          ]),
+      }),
+      GraphBuilder.createTypeExtension({
+        id: `${meta.id}.script-companion`,
+        type: Script.Script,
+        connector: (script) =>
+          Effect.succeed([
+            AppNode.makeCompanion({
+              id: linkedSegment('automation'),
+              label: ['script-automation.label', { ns: meta.id }],
+              icon: 'ph--lightning--regular',
+              data: 'automation',
+            }),
+          ]),
+      }),
+    ]);
+
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
+  }),
+);

package/src/capabilities/{compute-runtime/compute-runtime.ts → compute-runtime.ts}

@@ -3,29 +3,40 @@
 //
 
 import * as BrowserKeyValueStore from '@effect/platform-browser/BrowserKeyValueStore';
+import * as KeyValueStore from '@effect/platform/KeyValueStore';
+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 { AiService, GenericToolkit } from '@dxos/ai';
+import { Capabilities, Capability, type CapabilityManager } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { AgentService, ToolExecutionServices } from '@dxos/assistant';
+import { ClientService } from '@dxos/client';
 import { SpaceProperties } from '@dxos/client/echo';
 import { Resource } from '@dxos/context';
-import { Database, Obj, Query, Ref } from '@dxos/echo';
-import { CredentialsService, QueueService } from '@dxos/functions';
+import { Database, Feed, Obj, Query, Ref } from '@dxos/echo';
+import { createFeedServiceLayer } from '@dxos/echo-db';
+import { CredentialsService, feedServiceFromQueueServiceLayer, QueueService } from '@dxos/functions';
 import {
+  FeedTraceSink,
   FunctionImplementationResolver,
   FunctionInvocationServiceLayerWithLocalLoopbackExecutor,
+  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 { AutomationCapabilities } from '../../types';
+import { AutomationCapabilities } from '#types';
+import { Blueprint } from '@dxos/blueprints';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* () {
@@ -65,42 +76,78 @@ 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 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, `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.layer()),
+          Layer.provideMerge(
+            ServiceResolver.layerRequirements(
+              Database.Service,
+              GenericToolkit.GenericToolkitProvider,
+              QueueService,
+              Feed.Service,
+              OperationRegistry.Service,
+              AiService.AiService,
+              CredentialsService,
+              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(
               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(
             FunctionInvocationServiceLayerWithLocalLoopbackExecutor.pipe(
-              Layer.provideMerge(FunctionImplementationResolver.layerTest({ functions })),
+              Layer.provideMerge(genericToolkitProvider),
+              Layer.provideMerge(FunctionImplementationResolver.layerTest({ functions: operationHandlers })),
               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,
                 ),
               ),
               Layer.provideMerge(aiServiceLayer),
               Layer.provideMerge(CredentialsService.layerFromDatabase()),
-              Layer.provideMerge(space ? Database.Service.layer(space.db) : Database.Service.notAvailable),
+              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),
             ),
           ),
         );
@@ -115,18 +162,18 @@ 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?
     if (!properties.invocationTraceQueue || !properties.invocationTraceQueue.target) {
       const queue = yield* QueueService.createQueue({ subspaceTag: 'trace' });
-      Obj.change(properties, (m) => {
-        m.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 TracingServiceExt.layerInvocationsQueue({ invocationTraceQueue: queue });
   }),

package/src/capabilities/index.ts

@@ -2,7 +2,13 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './app-graph-builder';
-export * from './compute-runtime';
-export * from './operation-resolver';
-export * from './react-surface';
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/operation';
+
+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/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/react-surface.tsx → 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/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 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,8 +13,9 @@ 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 { Function, Trigger } from '@dxos/functions';
+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';
@@ -36,7 +37,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(Operation.PersistentOperation));
       const fn = functions.find((fn) => fn.id === functionId);
       if (!fn) {
         return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
@@ -48,7 +49,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 +73,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));
@@ -85,5 +86,5 @@ export const queue = Command.make(
 ).pipe(
   Command.withDescription('Create a queue trigger.'),
   Command.provide(({ spaceId }) => spaceLayer(spaceId, true)),
-  Command.provideEffectDiscard(() => withTypes(Function.Function, Trigger.Trigger)),
+  Command.provideEffectDiscard(() => withTypes(Operation.PersistentOperation, Trigger.Trigger)),
 );

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

@@ -13,8 +13,9 @@ 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 { Function, Trigger } from '@dxos/functions';
+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';
@@ -38,7 +39,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(Operation.PersistentOperation));
       const fn = functions.find((fn) => fn.id === functionId);
       if (!fn) {
         return yield* Effect.fail(new Error(`Function not found: ${functionId}`));
@@ -85,7 +86,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 +112,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));
@@ -124,5 +125,5 @@ export const subscription = Command.make(
 ).pipe(
   Command.withDescription('Create a subscription trigger.'),
   Command.provide(({ spaceId }) => spaceLayer(spaceId, true)),
-  Command.provideEffectDiscard(() => withTypes(Function.Function, Trigger.Trigger)),
+  Command.provideEffectDiscard(() => withTypes(Operation.PersistentOperation, Trigger.Trigger)),
 );