@dxos/plugin-automation 0.8.4-main.f9ba587 → 0.8.4-main.fffef41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-automation",
-  "version": "0.8.4-main.f9ba587",
+  "version": "0.8.4-main.fffef41",
   "description": "Prompt chain plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,19 +10,34 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
+    "./hooks": {
+      "source": "./src/hooks/index.ts",
+      "types": "./dist/types/src/hooks/index.d.ts",
+      "browser": "./dist/lib/browser/hooks/index.mjs",
+      "node": "./dist/lib/node-esm/hooks/index.mjs"
+    },
     "./types": {
-      "types": "./dist/types/src/types.d.ts",
-      "browser": "./dist/lib/browser/types.mjs",
-      "node": "./dist/lib/node-esm/types.mjs"
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "browser": "./dist/lib/browser/types/index.mjs",
+      "node": "./dist/lib/node-esm/types/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
-    "*": {}
+    "*": {
+      "hooks": [
+        "dist/types/src/hooks/index.d.ts"
+      ],
+      "types": [
+        "dist/types/src/types/index.d.ts"
+      ]
+    }
   },
   "files": [
     "assets",
@@ -30,49 +45,59 @@
     "src"
   ],
   "dependencies": {
+    "@effect/ai": "0.29.1",
+    "@effect/platform-browser": "0.72.0",
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
-    "@dxos/app-framework": "0.8.4-main.f9ba587",
-    "@dxos/async": "0.8.4-main.f9ba587",
-    "@dxos/conductor": "0.8.4-main.f9ba587",
-    "@dxos/echo": "0.8.4-main.f9ba587",
-    "@dxos/echo-schema": "0.8.4-main.f9ba587",
-    "@dxos/invariant": "0.8.4-main.f9ba587",
-    "@dxos/functions": "0.8.4-main.f9ba587",
-    "@dxos/live-object": "0.8.4-main.f9ba587",
-    "@dxos/log": "0.8.4-main.f9ba587",
-    "@dxos/plugin-client": "0.8.4-main.f9ba587",
-    "@dxos/plugin-graph": "0.8.4-main.f9ba587",
-    "@dxos/plugin-deck": "0.8.4-main.f9ba587",
-    "@dxos/plugin-space": "0.8.4-main.f9ba587",
-    "@dxos/react-client": "0.8.4-main.f9ba587",
-    "@dxos/random": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-form": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-stack": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-list": "0.8.4-main.f9ba587",
-    "@dxos/util": "0.8.4-main.f9ba587"
+    "@preact/signals-core": "^1.12.1",
+    "@dxos/app-framework": "0.8.4-main.fffef41",
+    "@dxos/assistant": "0.8.4-main.fffef41",
+    "@dxos/ai": "0.8.4-main.fffef41",
+    "@dxos/async": "0.8.4-main.fffef41",
+    "@dxos/conductor": "0.8.4-main.fffef41",
+    "@dxos/echo": "0.8.4-main.fffef41",
+    "@dxos/context": "0.8.4-main.fffef41",
+    "@dxos/functions-runtime": "0.8.4-main.fffef41",
+    "@dxos/invariant": "0.8.4-main.fffef41",
+    "@dxos/functions": "0.8.4-main.fffef41",
+    "@dxos/keys": "0.8.4-main.fffef41",
+    "@dxos/log": "0.8.4-main.fffef41",
+    "@dxos/live-object": "0.8.4-main.fffef41",
+    "@dxos/plugin-client": "0.8.4-main.fffef41",
+    "@dxos/plugin-deck": "0.8.4-main.fffef41",
+    "@dxos/plugin-graph": "0.8.4-main.fffef41",
+    "@dxos/plugin-space": "0.8.4-main.fffef41",
+    "@dxos/random": "0.8.4-main.fffef41",
+    "@dxos/react-ui-components": "0.8.4-main.fffef41",
+    "@dxos/react-client": "0.8.4-main.fffef41",
+    "@dxos/react-ui-form": "0.8.4-main.fffef41",
+    "@dxos/react-ui-list": "0.8.4-main.fffef41",
+    "@dxos/react-ui-stack": "0.8.4-main.fffef41",
+    "@dxos/schema": "0.8.4-main.fffef41",
+    "@dxos/types": "0.8.4-main.fffef41",
+    "@dxos/util": "0.8.4-main.fffef41",
+    "@dxos/react-ui-editor": "0.8.4-main.fffef41"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.88.0",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.16.13",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/storybook-utils": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587"
+    "@effect-atom/atom-react": "^0.3.4",
+    "@effect/platform": "0.92.1",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.2",
+    "effect": "3.18.3",
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/react-ui": "0.8.4-main.fffef41",
+    "@dxos/react-ui-theme": "0.8.4-main.fffef41",
+    "@dxos/storybook-utils": "0.8.4-main.fffef41"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.f9ba587",
-    "@dxos/react-ui-theme": "0.8.4-main.f9ba587"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.fffef41",
+    "@dxos/react-ui-theme": "0.8.4-main.fffef41"
   },
   "publishConfig": {
     "access": "public"

package/src/AutomationPlugin.tsx

@@ -2,39 +2,45 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, contributes, defineModule, definePlugin, Events } from '@dxos/app-framework';
-import { FunctionType, FunctionTrigger } from '@dxos/functions';
+import { Capabilities, Events, contributes, defineModule, definePlugin } from '@dxos/app-framework';
+import { Function, Trigger } from '@dxos/functions';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 
-import { AppGraphBuilder, IntentResolver, ReactSurface } from './capabilities';
+import { AppGraphBuilder, ComputeRuntime, IntentResolver, ReactSurface } from './capabilities';
+import { AutomationEvents } from './events';
 import { meta } from './meta';
 import { translations } from './translations';
 
-export const AutomationPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, translations),
-    }),
-    defineModule({
-      id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [FunctionType, FunctionTrigger]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: IntentResolver,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: ReactSurface,
-    }),
-  ]);
+export const AutomationPlugin = definePlugin(meta, () => [
+  defineModule({
+    id: `${meta.id}/module/translations`,
+    activatesOn: Events.SetupTranslations,
+    activate: () => contributes(Capabilities.Translations, translations),
+  }),
+  defineModule({
+    id: `${meta.id}/module/schema`,
+    activatesOn: ClientEvents.SetupSchema,
+    activate: () => contributes(ClientCapabilities.Schema, [Function.Function, Trigger.Trigger]),
+  }),
+  defineModule({
+    id: `${meta.id}/module/app-graph-builder`,
+    activatesOn: Events.SetupAppGraph,
+    activate: AppGraphBuilder,
+  }),
+  defineModule({
+    id: `${meta.id}/module/intent-resolver`,
+    activatesOn: Events.SetupIntentResolver,
+    activate: IntentResolver,
+  }),
+  defineModule({
+    id: `${meta.id}/module/react-surface`,
+    activatesOn: Events.SetupReactSurface,
+    activate: ReactSurface,
+  }),
+  defineModule({
+    id: `${meta.id}/module/compute-runtime`,
+    activatesOn: ClientEvents.ClientReady,
+    activatesAfter: [AutomationEvents.ComputeRuntimeReady],
+    activate: ComputeRuntime,
+  }),
+]);

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

@@ -2,15 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
-import { Option, pipe } from 'effect';
+import { Atom } from '@effect-atom/atom-react';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
 
-import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
-import { ScriptType } from '@dxos/functions';
-import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
+import { Script } from '@dxos/functions';
+import { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
 import { createExtension } from '@dxos/plugin-graph';
-import { SPACE_PLUGIN } from '@dxos/plugin-space';
+import { meta as spaceMeta } from '@dxos/plugin-space';
 
 import { meta } from '../meta';
 
@@ -19,10 +20,10 @@ export default (context: PluginContext) =>
     createExtension({
       id: `${meta.id}/space-settings-automation`,
       connector: (node) =>
-        Rx.make((get) =>
-          pipe(
+        Atom.make((get) =>
+          Function.pipe(
             get(node),
-            Option.flatMap((node) => (node.type === `${SPACE_PLUGIN}/settings` ? Option.some(node) : Option.none())),
+            Option.flatMap((node) => (node.type === `${spaceMeta.id}/settings` ? Option.some(node) : Option.none())),
             Option.map((node) => [
               {
                 id: `automation-${node.id}`,
@@ -41,10 +42,10 @@ export default (context: PluginContext) =>
     createExtension({
       id: `${meta.id}/space-settings-functions`,
       connector: (node) =>
-        Rx.make((get) =>
-          pipe(
+        Atom.make((get) =>
+          Function.pipe(
             get(node),
-            Option.flatMap((node) => (node.type === `${SPACE_PLUGIN}/settings` ? Option.some(node) : Option.none())),
+            Option.flatMap((node) => (node.type === `${spaceMeta.id}/settings` ? Option.some(node) : Option.none())),
             Option.map((node) => [
               {
                 id: `functions-${node.id}`,
@@ -63,10 +64,10 @@ export default (context: PluginContext) =>
     createExtension({
       id: `${meta.id}/script-companion`,
       connector: (node) =>
-        Rx.make((get) =>
-          pipe(
+        Atom.make((get) =>
+          Function.pipe(
             get(node),
-            Option.flatMap((node) => (Obj.instanceOf(ScriptType, node.data) ? Option.some(node) : Option.none())),
+            Option.flatMap((node) => (Obj.instanceOf(Script.Script, node.data) ? Option.some(node) : Option.none())),
             Option.map((node) => [
               {
                 id: [node.id, 'automation'].join(ATTENDABLE_PATH_SEPARATOR),

package/src/capabilities/capabilities.ts

@@ -0,0 +1,41 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import type * as ManagedRuntime from 'effect/ManagedRuntime';
+
+import { type AiService, type ToolExecutionService, type ToolResolverService } from '@dxos/ai';
+import { defineCapability } from '@dxos/app-framework';
+import type { CredentialsService, DatabaseService, FunctionInvocationService, QueueService } from '@dxos/functions';
+import type { InvocationTracer, TriggerDispatcher, TriggerStateStore } from '@dxos/functions-runtime';
+import type { SpaceId } from '@dxos/keys';
+
+import { meta } from '../meta';
+
+export namespace AutomationCapabilities {
+  /**
+   * Service stack for executing agents, functions, and triggers.
+   */
+  export type ComputeServices =
+    | TriggerDispatcher
+    | AiService.AiService
+    | DatabaseService
+    | QueueService
+    | CredentialsService
+    | FunctionInvocationService
+    | InvocationTracer
+    | TriggerStateStore
+    // TODO(dmaretskyi): Those should be provided at AI-chat call site.
+    | ToolResolverService
+    | ToolExecutionService;
+
+  export type ComputeRuntime = ManagedRuntime.ManagedRuntime<AutomationCapabilities.ComputeServices, never>;
+  export interface ComputeRuntimeProvider {
+    getRuntime(spaceId: SpaceId): ComputeRuntime;
+  }
+
+  /**
+   * Runtime for executing agents, functions, and triggers.
+   */
+  export const ComputeRuntime = defineCapability<ComputeRuntimeProvider>(`${meta.id}/capability/compute-runtime`);
+}

package/src/capabilities/compute-runtime.ts

@@ -0,0 +1,127 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as BrowserKeyValueStore from '@effect/platform-browser/BrowserKeyValueStore';
+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 { Resource } from '@dxos/context';
+import { Query, Ref } from '@dxos/echo';
+import { CredentialsService, DatabaseService, QueueService } from '@dxos/functions';
+import {
+  FunctionImplementationResolver,
+  FunctionInvocationServiceLayerWithLocalLoopbackExecutor,
+  InvocationTracer,
+  RemoteFunctionExecutionService,
+  TriggerDispatcher,
+} 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 { AutomationCapabilities } from './capabilities';
+
+export default async (context: PluginContext) => {
+  const provider = await new ComputeRuntimeProviderImpl(context).open();
+  return contributes(AutomationCapabilities.ComputeRuntime, provider, async () => {
+    await provider.close();
+  });
+};
+
+class ComputeRuntimeProviderImpl extends Resource implements AutomationCapabilities.ComputeRuntimeProvider {
+  readonly #runtimes = new Map<SpaceId, AutomationCapabilities.ComputeRuntime>();
+  readonly #context: PluginContext;
+
+  constructor(context: PluginContext) {
+    super();
+    this.#context = context;
+  }
+
+  protected override async _open() {}
+
+  protected override async _close() {
+    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)) {
+      return this.#runtimes.get(spaceId)!;
+    }
+
+    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');
+
+        // 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 space = client.spaces.get(spaceId);
+        invariant(space);
+        yield* Effect.promise(() => space.waitUntilReady());
+
+        return Layer.mergeAll(TriggerDispatcher.layer({ timeControl: 'natural' })).pipe(
+          Layer.provideMerge(
+            Layer.mergeAll(
+              InvocationTracerLive,
+              TriggerStateStore.layerKv.pipe(Layer.provide(BrowserKeyValueStore.layerLocalStorage)),
+              makeToolResolverFromFunctions(functions, toolkit),
+              makeToolExecutionServiceFromFunctions(toolkit, toolkitLayer),
+            ),
+          ),
+          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,
+                  ),
+                ),
+                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),
+              ),
+            ),
+          ),
+        );
+      }),
+    );
+
+    const runtime = ManagedRuntime.make(layer);
+    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

@@ -5,5 +5,8 @@
 import { lazy } from '@dxos/app-framework';
 
 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';

package/src/capabilities/intent-resolver.ts

@@ -3,15 +3,15 @@
 //
 
 import {
-  contributes,
   Capabilities,
-  createResolver,
+  LayoutAction,
   type PluginContext,
+  contributes,
   createIntent,
-  LayoutAction,
+  createResolver,
 } from '@dxos/app-framework';
-import { Obj, Ref } from '@dxos/echo';
-import { FunctionTrigger, FunctionType, ScriptType, TriggerKind } from '@dxos/functions';
+import { Ref } from '@dxos/echo';
+import { Function, Script, Trigger } from '@dxos/functions';
 import { type DXN } from '@dxos/keys';
 import { ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
 import { SpaceAction } from '@dxos/plugin-space/types';
@@ -24,17 +24,17 @@ export default (context: PluginContext) =>
     createResolver({
       intent: AutomationAction.CreateTriggerFromTemplate,
       resolve: async ({ space, template, enabled = false, scriptName, input }) => {
-        const trigger = Obj.make(FunctionTrigger, { enabled, input });
+        const trigger = Trigger.make({ enabled, input });
 
         // TODO(wittjosiah): Factor out function lookup by script name?
         if (scriptName) {
           const {
             objects: [script],
-          } = await space.db.query(Filter.type(ScriptType, { name: scriptName })).run();
+          } = await space.db.query(Filter.type(Script.Script, { name: scriptName })).run();
           if (script) {
             const {
               objects: [fn],
-            } = await space.db.query(Filter.type(FunctionType, { source: Ref.make(script) })).run();
+            } = await space.db.query(Filter.type(Function.Function, { source: Ref.make(script) })).run();
             if (fn) {
               trigger.function = Ref.make(fn);
             }
@@ -43,11 +43,11 @@ export default (context: PluginContext) =>
 
         switch (template.type) {
           case 'timer': {
-            trigger.spec = { kind: TriggerKind.Timer, cron: template.cron };
+            trigger.spec = { kind: 'timer', cron: template.cron };
             break;
           }
           case 'queue': {
-            trigger.spec = { kind: TriggerKind.Queue, queue: (template.queueDXN as DXN).toString() };
+            trigger.spec = { kind: 'queue', queue: (template.queueDXN as DXN).toString() };
             break;
           }
           default: {
@@ -57,7 +57,7 @@ export default (context: PluginContext) =>
 
         return {
           intents: [
-            createIntent(SpaceAction.AddObject, { object: trigger, target: space }),
+            createIntent(SpaceAction.AddObject, { object: trigger, target: space, hidden: true }),
             createIntent(LayoutAction.Open, {
               part: 'main',
               subject: [`automation-settings${ATTENDABLE_PATH_SEPARATOR}${space.id}`],

package/src/capabilities/react-surface.tsx

@@ -4,53 +4,53 @@
 
 import React from 'react';
 
-import { Capabilities, contributes, createSurface, useLayout } from '@dxos/app-framework';
+import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
+import { useLayout } from '@dxos/app-framework/react';
 import { Obj } from '@dxos/echo';
-import { ScriptType } from '@dxos/functions';
 import { getSpace, parseId, useSpace } from '@dxos/react-client/echo';
 
-import { AutomationContainer, FunctionsContainer } from '../components';
+import { AutomationSettings, FunctionsContainer } from '../components';
 import { meta } from '../meta';
 
 export default () =>
   contributes(Capabilities.ReactSurface, [
     createSurface({
-      id: `${meta.id}/space-settings-automation`,
+      id: `${meta.id}/space-settings-functions`,
       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-functions`,
       component: () => {
         const layout = useLayout();
         const { spaceId } = parseId(layout.workspace);
         const space = useSpace(spaceId);
-        if (!space || !spaceId) {
+        if (!space) {
           return null;
         }
 
-        return <AutomationContainer space={space} />;
+        return <FunctionsContainer space={space} />;
       },
     }),
     createSurface({
-      id: `${meta.id}/space-settings-functions`,
+      id: `${meta.id}/space-settings-automation`,
       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-automation`,
       component: () => {
         const layout = useLayout();
         const { spaceId } = parseId(layout.workspace);
         const space = useSpace(spaceId);
-        if (!space || !spaceId) {
+        if (!space) {
           return null;
         }
 
-        return <FunctionsContainer space={space} />;
+        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, role }) => {
-        return <AutomationContainer space={getSpace(data.companionTo)!} object={data.companionTo} />;
+      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} />;
       },
     }),
   ]);