@dxos/plugin-assistant 0.8.4-main.1da679c → 0.8.4-main.1f223c7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.4-main.1da679c",
+  "version": "0.8.4-main.1f223c7",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -58,69 +58,68 @@
     "lodash.defaultsdeep": "^4.6.1",
     "unified": "^11.0.0",
     "use-deep-compare-effect": "^1.8.1",
-    "@dxos/ai": "0.8.4-main.1da679c",
-    "@dxos/app-framework": "0.8.4-main.1da679c",
-    "@dxos/assistant-testing": "0.8.4-main.1da679c",
-    "@dxos/async": "0.8.4-main.1da679c",
-    "@dxos/client": "0.8.4-main.1da679c",
-    "@dxos/compute": "0.8.4-main.1da679c",
-    "@dxos/config": "0.8.4-main.1da679c",
-    "@dxos/blueprints": "0.8.4-main.1da679c",
-    "@dxos/context": "0.8.4-main.1da679c",
-    "@dxos/assistant": "0.8.4-main.1da679c",
-    "@dxos/debug": "0.8.4-main.1da679c",
-    "@dxos/conductor": "0.8.4-main.1da679c",
-    "@dxos/devtools": "0.8.4-main.1da679c",
-    "@dxos/echo": "0.8.4-main.1da679c",
-    "@dxos/echo-db": "0.8.4-main.1da679c",
-    "@dxos/echo-schema": "0.8.4-main.1da679c",
-    "@dxos/echo-protocol": "0.8.4-main.1da679c",
-    "@dxos/edge-client": "0.8.4-main.1da679c",
-    "@dxos/effect": "0.8.4-main.1da679c",
-    "@dxos/functions": "0.8.4-main.1da679c",
-    "@dxos/graph": "0.8.4-main.1da679c",
-    "@dxos/invariant": "0.8.4-main.1da679c",
-    "@dxos/lit-ui": "0.8.4-main.1da679c",
-    "@dxos/live-object": "0.8.4-main.1da679c",
-    "@dxos/local-storage": "0.8.4-main.1da679c",
-    "@dxos/log": "0.8.4-main.1da679c",
-    "@dxos/plugin-automation": "0.8.4-main.1da679c",
-    "@dxos/plugin-attention": "0.8.4-main.1da679c",
-    "@dxos/plugin-board": "0.8.4-main.1da679c",
-    "@dxos/keys": "0.8.4-main.1da679c",
-    "@dxos/plugin-deck": "0.8.4-main.1da679c",
-    "@dxos/plugin-client": "0.8.4-main.1da679c",
-    "@dxos/plugin-explorer": "0.8.4-main.1da679c",
-    "@dxos/plugin-graph": "0.8.4-main.1da679c",
-    "@dxos/plugin-markdown": "0.8.4-main.1da679c",
-    "@dxos/plugin-preview": "0.8.4-main.1da679c",
-    "@dxos/plugin-script": "0.8.4-main.1da679c",
-    "@dxos/plugin-space": "0.8.4-main.1da679c",
-    "@dxos/plugin-transcription": "0.8.4-main.1da679c",
-    "@dxos/plugin-wnfs": "0.8.4-main.1da679c",
-    "@dxos/plugin-sketch": "0.8.4-main.1da679c",
-    "@dxos/protocols": "0.8.4-main.1da679c",
-    "@dxos/react-client": "0.8.4-main.1da679c",
-    "@dxos/react-edge-client": "0.8.4-main.1da679c",
-    "@dxos/react-ui-attention": "0.8.4-main.1da679c",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.1da679c",
-    "@dxos/plugin-stack": "0.8.4-main.1da679c",
-    "@dxos/react-ui-chat": "0.8.4-main.1da679c",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.1da679c",
-    "@dxos/react-ui-components": "0.8.4-main.1da679c",
-    "@dxos/react-ui-editor": "0.8.4-main.1da679c",
-    "@dxos/react-ui-form": "0.8.4-main.1da679c",
-    "@dxos/react-ui-graph": "0.8.4-main.1da679c",
-    "@dxos/react-ui-list": "0.8.4-main.1da679c",
-    "@dxos/react-ui-searchlist": "0.8.4-main.1da679c",
-    "@dxos/react-ui-menu": "0.8.4-main.1da679c",
-    "@dxos/react-ui-sfx": "0.8.4-main.1da679c",
-    "@dxos/react-ui-stack": "0.8.4-main.1da679c",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.1da679c",
-    "@dxos/schema": "0.8.4-main.1da679c",
-    "@dxos/react-ui-tabs": "0.8.4-main.1da679c",
-    "@dxos/util": "0.8.4-main.1da679c",
-    "@dxos/react-ui-tag-picker": "0.8.4-main.1da679c"
+    "@dxos/ai": "0.8.4-main.1f223c7",
+    "@dxos/app-framework": "0.8.4-main.1f223c7",
+    "@dxos/assistant": "0.8.4-main.1f223c7",
+    "@dxos/assistant-testing": "0.8.4-main.1f223c7",
+    "@dxos/blueprints": "0.8.4-main.1f223c7",
+    "@dxos/client": "0.8.4-main.1f223c7",
+    "@dxos/compute": "0.8.4-main.1f223c7",
+    "@dxos/async": "0.8.4-main.1f223c7",
+    "@dxos/config": "0.8.4-main.1f223c7",
+    "@dxos/context": "0.8.4-main.1f223c7",
+    "@dxos/debug": "0.8.4-main.1f223c7",
+    "@dxos/devtools": "0.8.4-main.1f223c7",
+    "@dxos/echo": "0.8.4-main.1f223c7",
+    "@dxos/conductor": "0.8.4-main.1f223c7",
+    "@dxos/echo-db": "0.8.4-main.1f223c7",
+    "@dxos/echo-schema": "0.8.4-main.1f223c7",
+    "@dxos/edge-client": "0.8.4-main.1f223c7",
+    "@dxos/effect": "0.8.4-main.1f223c7",
+    "@dxos/functions": "0.8.4-main.1f223c7",
+    "@dxos/echo-protocol": "0.8.4-main.1f223c7",
+    "@dxos/graph": "0.8.4-main.1f223c7",
+    "@dxos/invariant": "0.8.4-main.1f223c7",
+    "@dxos/keys": "0.8.4-main.1f223c7",
+    "@dxos/lit-ui": "0.8.4-main.1f223c7",
+    "@dxos/local-storage": "0.8.4-main.1f223c7",
+    "@dxos/log": "0.8.4-main.1f223c7",
+    "@dxos/plugin-attention": "0.8.4-main.1f223c7",
+    "@dxos/plugin-client": "0.8.4-main.1f223c7",
+    "@dxos/plugin-deck": "0.8.4-main.1f223c7",
+    "@dxos/live-object": "0.8.4-main.1f223c7",
+    "@dxos/plugin-explorer": "0.8.4-main.1f223c7",
+    "@dxos/plugin-graph": "0.8.4-main.1f223c7",
+    "@dxos/plugin-markdown": "0.8.4-main.1f223c7",
+    "@dxos/plugin-preview": "0.8.4-main.1f223c7",
+    "@dxos/plugin-board": "0.8.4-main.1f223c7",
+    "@dxos/plugin-sketch": "0.8.4-main.1f223c7",
+    "@dxos/plugin-script": "0.8.4-main.1f223c7",
+    "@dxos/plugin-space": "0.8.4-main.1f223c7",
+    "@dxos/plugin-stack": "0.8.4-main.1f223c7",
+    "@dxos/plugin-transcription": "0.8.4-main.1f223c7",
+    "@dxos/react-edge-client": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-attention": "0.8.4-main.1f223c7",
+    "@dxos/plugin-wnfs": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-chat": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-components": "0.8.4-main.1f223c7",
+    "@dxos/protocols": "0.8.4-main.1f223c7",
+    "@dxos/react-client": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-form": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-editor": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-graph": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-list": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-menu": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-searchlist": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-sfx": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-tabs": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-tag-picker": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-stack": "0.8.4-main.1f223c7",
+    "@dxos/schema": "0.8.4-main.1f223c7",
+    "@dxos/util": "0.8.4-main.1f223c7"
   },
   "devDependencies": {
     "@effect-rx/rx-react": "^0.38.0",
@@ -133,31 +132,31 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "7.1.1",
-    "@dxos/assistant-testing": "0.8.4-main.1da679c",
-    "@dxos/devtools": "0.8.4-main.1da679c",
-    "@dxos/echo-db": "0.8.4-main.1da679c",
-    "@dxos/plugin-attention": "0.8.4-main.1da679c",
-    "@dxos/plugin-board": "0.8.4-main.1da679c",
-    "@dxos/plugin-chess": "0.8.4-main.1da679c",
-    "@dxos/plugin-inbox": "0.8.4-main.1da679c",
-    "@dxos/plugin-map": "0.8.4-main.1da679c",
-    "@dxos/plugin-markdown": "0.8.4-main.1da679c",
-    "@dxos/plugin-preview": "0.8.4-main.1da679c",
-    "@dxos/plugin-project": "0.8.4-main.1da679c",
-    "@dxos/plugin-script": "0.8.4-main.1da679c",
-    "@dxos/plugin-stack": "0.8.4-main.1da679c",
-    "@dxos/plugin-sketch": "0.8.4-main.1da679c",
-    "@dxos/plugin-table": "0.8.4-main.1da679c",
-    "@dxos/plugin-theme": "0.8.4-main.1da679c",
-    "@dxos/plugin-thread": "0.8.4-main.1da679c",
-    "@dxos/plugin-token-manager": "0.8.4-main.1da679c",
-    "@dxos/plugin-wnfs": "0.8.4-main.1da679c",
-    "@dxos/random": "0.8.4-main.1da679c",
-    "@dxos/react-ui-menu": "0.8.4-main.1da679c",
-    "@dxos/react-ui": "0.8.4-main.1da679c",
-    "@dxos/react-ui-table": "0.8.4-main.1da679c",
-    "@dxos/storybook-utils": "0.8.4-main.1da679c",
-    "@dxos/react-ui-theme": "0.8.4-main.1da679c"
+    "@dxos/assistant-testing": "0.8.4-main.1f223c7",
+    "@dxos/devtools": "0.8.4-main.1f223c7",
+    "@dxos/echo-db": "0.8.4-main.1f223c7",
+    "@dxos/plugin-attention": "0.8.4-main.1f223c7",
+    "@dxos/plugin-automation": "0.8.4-main.1f223c7",
+    "@dxos/plugin-board": "0.8.4-main.1f223c7",
+    "@dxos/plugin-chess": "0.8.4-main.1f223c7",
+    "@dxos/plugin-inbox": "0.8.4-main.1f223c7",
+    "@dxos/plugin-markdown": "0.8.4-main.1f223c7",
+    "@dxos/plugin-map": "0.8.4-main.1f223c7",
+    "@dxos/plugin-preview": "0.8.4-main.1f223c7",
+    "@dxos/plugin-sketch": "0.8.4-main.1f223c7",
+    "@dxos/plugin-stack": "0.8.4-main.1f223c7",
+    "@dxos/plugin-script": "0.8.4-main.1f223c7",
+    "@dxos/plugin-table": "0.8.4-main.1f223c7",
+    "@dxos/plugin-thread": "0.8.4-main.1f223c7",
+    "@dxos/plugin-wnfs": "0.8.4-main.1f223c7",
+    "@dxos/plugin-token-manager": "0.8.4-main.1f223c7",
+    "@dxos/react-ui": "0.8.4-main.1f223c7",
+    "@dxos/random": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-menu": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-table": "0.8.4-main.1f223c7",
+    "@dxos/plugin-theme": "0.8.4-main.1f223c7",
+    "@dxos/storybook-utils": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-theme": "0.8.4-main.1f223c7"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -165,8 +164,8 @@
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.1da679c",
-    "@dxos/react-ui-theme": "0.8.4-main.1da679c"
+    "@dxos/react-ui": "0.8.4-main.1f223c7",
+    "@dxos/react-ui-theme": "0.8.4-main.1f223c7"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -4,7 +4,7 @@
 
 import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
 import { ResearchGraph, ResearchOn } from '@dxos/assistant-testing';
-import { Blueprint, Prompt } from '@dxos/blueprints';
+import { Blueprint } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
 import { Type } from '@dxos/echo';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
@@ -16,6 +16,7 @@ import {
   AppGraphBuilder,
   AssistantState,
   BlueprintDefinition,
+  ComputeRuntime,
   EdgeModelResolver,
   IntentResolver,
   LocalModelResolver,
@@ -104,13 +105,7 @@ export const AssistantPlugin = () =>
       id: `${meta.id}/module/schema`,
       activatesOn: ClientEvents.SetupSchema,
       activate: () =>
-        contributes(ClientCapabilities.Schema, [
-          ServiceType,
-          Assistant.CompanionTo,
-          ResearchGraph,
-          ResearchOn,
-          Prompt.Prompt,
-        ]),
+        contributes(ClientCapabilities.Schema, [ServiceType, Assistant.CompanionTo, ResearchGraph, ResearchOn]),
     }),
     defineModule({
       id: `${meta.id}/module/on-space-created`,
@@ -165,4 +160,10 @@ export const AssistantPlugin = () =>
       activatesOn: Events.Startup,
       activate: Toolkit,
     }),
+    defineModule({
+      id: `${meta.id}/module/compute-runtime`,
+      // TODO(wittjosiah): Use a different event.
+      activatesOn: Events.Startup,
+      activate: ComputeRuntime,
+    }),
   ]);

package/src/capabilities/ai-service.ts

@@ -5,10 +5,12 @@
 import { Effect, Layer } from 'effect';
 
 import { AiServiceRouter } from '@dxos/ai';
-import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
+import { type PluginContext, contributes } from '@dxos/app-framework';
+
+import { AssistantCapabilities } from './capabilities';
 
 export default (context: PluginContext) => {
-  const resolvers = context.getCapabilities(Capabilities.AiModelResolver);
+  const resolvers = context.getCapabilities(AssistantCapabilities.AiModelResolver);
 
   // TODO(dmaretskyi): Extract function to reduce them.
   const combinedLayer = resolvers.reduce(
@@ -19,7 +21,7 @@ export default (context: PluginContext) => {
   return [
     // TODO(dmaretskyi): Read config from settings.
     contributes(
-      Capabilities.AiServiceLayer,
+      AssistantCapabilities.AiServiceLayer,
       AiServiceRouter.AiModelResolver.buildAiService.pipe(Layer.provide(combinedLayer)),
     ),
   ];

package/src/capabilities/blueprint-definition.ts

@@ -8,8 +8,6 @@ import {
   DISCORD_BLUEPRINT,
   LINEAR_BLUEPRINT,
   RESEARCH_BLUEPRINT,
-  agent,
-  createResearchNote,
   fetchDiscordMessages,
   research,
   syncLinearIssues,
@@ -49,8 +47,7 @@ const blueprint = createBlueprint();
 // TODO(dmaretskyi): Consider splitting into multiple modules.
 export default (): Capability<any>[] => [
   contributes(Capabilities.Functions, functions),
-  contributes(Capabilities.Functions, [agent]),
-  contributes(Capabilities.Functions, [research, createResearchNote]),
+  contributes(Capabilities.Functions, [research]),
   contributes(Capabilities.BlueprintDefinition, blueprint),
   contributes(Capabilities.BlueprintDefinition, RESEARCH_BLUEPRINT),
   // TODO(burdon): Move out of assistant.

package/src/capabilities/capabilities.ts

@@ -2,7 +2,22 @@
 // Copyright 2025 DXOS.org
 //
 
+import { type Layer, type ManagedRuntime } from 'effect';
+
+import { type AiService, type AiServiceRouter, type ToolExecutionService, type ToolResolverService } from '@dxos/ai';
 import { defineCapability } from '@dxos/app-framework';
+import type {
+  CredentialsService,
+  DatabaseService,
+  FunctionImplementationResolver,
+  InvocationTracer,
+  LocalFunctionExecutionService,
+  QueueService,
+  RemoteFunctionExecutionService,
+  TriggerDispatcher,
+  TriggerStateStore,
+} from '@dxos/functions';
+import type { SpaceId } from '@dxos/keys';
 import { type DeepReadonly } from '@dxos/util';
 
 import { meta } from '../meta';
@@ -15,4 +30,42 @@ export namespace AssistantCapabilities {
   };
   export const State = defineCapability<DeepReadonly<AssistantState>>(`${meta.id}/capability/state`);
   export const MutableState = defineCapability<AssistantState>(`${meta.id}/capability/state`);
+
+  export type AiServiceLayer = Layer.Layer<AiService.AiService>;
+  export const AiServiceLayer = defineCapability<AiServiceLayer>(`${meta.id}/capability/ai-service-factory`);
+
+  /**
+   * Plugins can contribute them to provide model resolvers.
+   */
+  export const AiModelResolver = defineCapability<Layer.Layer<AiServiceRouter.AiModelResolver>>(
+    `${meta.id}/capability/ai-model-resolver`,
+  );
+
+  /**
+   * Service stack for executing agents, functions, and triggers.
+   */
+  export type ComputeServices =
+    | TriggerDispatcher
+    | AiService.AiService
+    | DatabaseService
+    | QueueService
+    | CredentialsService
+    | LocalFunctionExecutionService
+    | RemoteFunctionExecutionService
+    // TODO(dmaretskyi): This service is private and shouldn't be exposed as a part of public API.
+    | FunctionImplementationResolver
+    | InvocationTracer
+    | TriggerStateStore
+    // TODO(dmaretskyi): Those should be provided at AI-chat call site.
+    | ToolResolverService
+    | ToolExecutionService;
+
+  export interface ComputeRuntimeProvider {
+    getRuntime(spaceId: SpaceId): ManagedRuntime.ManagedRuntime<ComputeServices, never>;
+  }
+
+  /**
+   * 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,124 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type AiTool, AiToolkit } from '@effect/ai';
+import { BrowserKeyValueStore } from '@effect/platform-browser';
+import { Effect, Layer, ManagedRuntime } from 'effect';
+
+import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
+import { makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
+import { PropertiesType } from '@dxos/client/echo';
+import { Resource } from '@dxos/context';
+import { Query, Ref } from '@dxos/echo';
+import {
+  CredentialsService,
+  DatabaseService,
+  FunctionImplementationResolver,
+  InvocationTracer,
+  LocalFunctionExecutionService,
+  QueueService,
+  RemoteFunctionExecutionService,
+  TriggerDispatcher,
+} from '@dxos/functions';
+import { TriggerStateStore } from '@dxos/functions';
+import { invariant } from '@dxos/invariant';
+import { type SpaceId } from '@dxos/keys';
+import { ClientCapabilities } from '@dxos/plugin-client';
+
+import { AssistantCapabilities } from './capabilities';
+
+export default async (context: PluginContext) => {
+  const provider = await new ComputeRuntimeProviderImpl(context).open();
+  return contributes(AssistantCapabilities.ComputeRuntime, provider, async () => {
+    await provider.close();
+  });
+};
+
+class ComputeRuntimeProviderImpl extends Resource implements AssistantCapabilities.ComputeRuntimeProvider {
+  readonly #runtimes = new Map<SpaceId, ManagedRuntime.ManagedRuntime<AssistantCapabilities.ComputeServices, never>>();
+  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): ManagedRuntime.ManagedRuntime<AssistantCapabilities.ComputeServices, never> {
+    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(AssistantCapabilities.AiServiceLayer) ?? Layer.die('AiService not found');
+
+        // 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 allFunctions = functions.flat();
+        // TODO(wittjosiah): Don't cast.
+        const toolkit = AiToolkit.merge(...toolkits) as AiToolkit.Any as AiToolkit.AiToolkit<AiTool.Any>;
+        const handlersLayer = Layer.mergeAll(Layer.empty, ...handlers);
+
+        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(
+              IvocationTracerLive,
+              TriggerStateStore.layerKv.pipe(Layer.provide(BrowserKeyValueStore.layerLocalStorage)),
+              serviceLayer,
+              makeToolResolverFromFunctions(allFunctions, toolkit),
+              makeToolExecutionServiceFromFunctions(allFunctions, toolkit, handlersLayer),
+              CredentialsService.layerFromDatabase(),
+            ),
+          ),
+          Layer.provideMerge(
+            Layer.mergeAll(
+              space ? DatabaseService.layer(space.db) : DatabaseService.notAvailable,
+              space ? QueueService.layer(space.queues) : QueueService.notAvailable,
+              LocalFunctionExecutionService.layerLive,
+              RemoteFunctionExecutionService.mockLayer,
+            ),
+          ),
+          Layer.provideMerge(FunctionImplementationResolver.layerTest({ functions: allFunctions })),
+        );
+      }),
+    );
+
+    const runtime = ManagedRuntime.make(layer);
+    this.#runtimes.set(spaceId, runtime);
+
+    return runtime;
+  }
+}
+
+const IvocationTracerLive = 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/edge-model-resolver.ts

@@ -7,11 +7,13 @@ import { FetchHttpClient } from '@effect/platform';
 import { Layer } from 'effect';
 
 import { AiServiceRouter } from '@dxos/ai';
-import { Capabilities, type Capability, contributes } from '@dxos/app-framework';
+import { type Capability, contributes } from '@dxos/app-framework';
+
+import { AssistantCapabilities } from './capabilities';
 
 export default (): Capability<any>[] => [
   contributes(
-    Capabilities.AiModelResolver,
+    AssistantCapabilities.AiModelResolver,
     AiServiceRouter.AnthropicResolver.pipe(
       Layer.provide(
         AnthropicClient.layer({

package/src/capabilities/index.ts

@@ -14,6 +14,7 @@ export const LocalModelResolver = lazy(() => import('./local-model-resolver'));
 export const ReactSurface = lazy(() => import('./react-surface'));
 export const Settings = lazy(() => import('./settings'));
 export const Toolkit = lazy(() => import('./toolkit'));
+export const ComputeRuntime = lazy(() => import('./compute-runtime'));
 
 export * from './blueprint-definition';
 export * from './capabilities';

package/src/capabilities/local-model-resolver.ts

@@ -7,7 +7,9 @@ import { FetchHttpClient } from '@effect/platform';
 import { Layer } from 'effect';
 
 import { AiServiceRouter } from '@dxos/ai';
-import { Capabilities, type Capability, contributes } from '@dxos/app-framework';
+import { type Capability, contributes } from '@dxos/app-framework';
+
+import { AssistantCapabilities } from './capabilities';
 
 /**
  * To start LM Studio server:
@@ -17,7 +19,7 @@ import { Capabilities, type Capability, contributes } from '@dxos/app-framework'
  */
 export default (): Capability<any>[] => [
   contributes(
-    Capabilities.AiModelResolver,
+    AssistantCapabilities.AiModelResolver,
     AiServiceRouter.LMStudioResolver.pipe(
       Layer.provide(
         OpenAiClient.layer({

package/src/components/TemplateEditor/TemplateEditor.tsx

@@ -12,7 +12,6 @@ import {
   createDataExtensions,
   createMarkdownExtensions,
   createThemeExtensions,
-  decorateMarkdown,
   useTextEditor,
 } from '@dxos/react-ui-editor';
 import { mx } from '@dxos/react-ui-theme';
@@ -47,8 +46,9 @@ export const TemplateEditor = ({ id, classNames, template }: TemplateEditorProps
           placeholder: t('template placeholder'),
         }),
         createThemeExtensions({ themeMode }),
+
+        // Extend markdown with handlebars support.
         createMarkdownExtensions(),
-        decorateMarkdown(),
         handlebars(),
       ].filter(isNotFalsy),
     };

package/src/hooks/index.ts

@@ -13,3 +13,4 @@ export * from './useItemTypes';
 export * from './useOnline';
 export * from './usePresets';
 export * from './useReferencesProvider';
+export * from './useComputeRuntimeCallback';

package/src/hooks/useChatServices.ts

@@ -8,9 +8,9 @@ import { useMemo } from 'react';
 import { useCapability } from '@dxos/app-framework';
 import { type Space } from '@dxos/client/echo';
 import { TracingService } from '@dxos/functions';
-import { AutomationCapabilities } from '@dxos/plugin-automation';
 import { useClient } from '@dxos/react-client';
 
+import { AssistantCapabilities } from '../capabilities';
 import { type AiChatServices } from '../processor';
 import { type Assistant } from '../types';
 
@@ -30,7 +30,7 @@ export const useChatServices = ({
   const client = useClient();
   space ??= client.spaces.default;
 
-  const computeRuntimeResolver = useCapability(AutomationCapabilities.ComputeRuntime);
+  const computeRuntimeResolver = useCapability(AssistantCapabilities.ComputeRuntime);
 
   return useMemo(() => {
     const runtime = computeRuntimeResolver.getRuntime(space.id);

package/src/hooks/useComputeRuntimeCallback.ts

@@ -0,0 +1,25 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import type { Effect } from 'effect';
+import { useCallback } from 'react';
+
+import { useCapability } from '@dxos/app-framework';
+import type { Space } from '@dxos/client/echo';
+
+import { AssistantCapabilities } from '../capabilities';
+
+/**
+ * Create an effectful function that has access to compute services
+ */
+export const useComputeRuntimeCallback = <T>(
+  space: Space,
+  fn: () => Effect.Effect<T, any, AssistantCapabilities.ComputeServices>,
+  deps?: React.DependencyList,
+): (() => Promise<T>) => {
+  const computeRuntime = useCapability(AssistantCapabilities.ComputeRuntime);
+  const runtime = computeRuntime.getRuntime(space.id);
+
+  return useCallback(() => runtime.runPromise(fn()), [runtime, ...(deps ?? [])]);
+};