@dxos/plugin-routine 0.10.0 → 0.11.0

package/dx.config.ts

@@ -18,8 +18,9 @@ export default Config2.make({
 
       Routines are configured in their own article and surfaced on a per-object "Routines" companion
       that lists the routines connected to each object. A per-space TriggerDispatcher manages
-      execution: running locally in the browser when computeEnvironment is "local", or delegating to
-      the DXOS edge for server-side reliability; the space settings page chooses the runtime location.
+      execution: running each trigger locally in the browser, or delegating it to the DXOS edge for
+      server-side reliability when the trigger's "remote" flag is set; the space settings page toggles
+      trigger execution for the whole space.
 
       Operation handlers and skills contributed by any plugin in the application are
       automatically merged and made available to every space's OperationRegistry, so new

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-routine",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "Prompt chain plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -19,33 +19,33 @@
         "default": "./src/capabilities/index.ts"
       },
       "types": "./dist/types/src/capabilities/index.d.ts",
-      "node": "./dist/lib/neutral/capabilities/node.mjs",
-      "default": "./dist/lib/neutral/capabilities/index.mjs"
+      "node": "./dist/lib/capabilities/node.mjs",
+      "default": "./dist/lib/capabilities.mjs"
     },
     "#components": {
       "source": "./src/components/index.ts",
       "types": "./dist/types/src/components/index.d.ts",
-      "default": "./dist/lib/neutral/components/index.mjs"
+      "default": "./dist/lib/components.mjs"
     },
     "#containers": {
       "source": "./src/containers/index.ts",
       "types": "./dist/types/src/containers/index.d.ts",
-      "default": "./dist/lib/neutral/containers/index.mjs"
+      "default": "./dist/lib/containers.mjs"
     },
     "#hooks": {
       "source": "./src/hooks/index.ts",
       "types": "./dist/types/src/hooks/index.d.ts",
-      "default": "./dist/lib/neutral/hooks/index.mjs"
+      "default": "./dist/lib/hooks.mjs"
     },
     "#meta": {
       "source": "./src/meta.ts",
       "types": "./dist/types/src/meta.d.ts",
-      "default": "./dist/lib/neutral/meta.mjs"
+      "default": "./dist/lib/meta.mjs"
     },
     "#operations": {
       "source": "./src/operations/index.ts",
       "types": "./dist/types/src/operations/index.d.ts",
-      "default": "./dist/lib/neutral/operations/index.mjs"
+      "default": "./dist/lib/operations.mjs"
     },
     "#plugin": {
       "source": {
@@ -54,58 +54,58 @@
         "default": "./src/RoutinePlugin.tsx"
       },
       "types": "./dist/types/src/RoutinePlugin.d.ts",
-      "workerd": "./dist/lib/neutral/RoutinePlugin.workerd.mjs",
-      "node": "./dist/lib/neutral/RoutinePlugin.node.mjs",
-      "default": "./dist/lib/neutral/RoutinePlugin.mjs"
+      "workerd": "./dist/lib/RoutinePlugin.workerd.mjs",
+      "node": "./dist/lib/RoutinePlugin.node.mjs",
+      "default": "./dist/lib/RoutinePlugin.mjs"
     },
     "#testing": "./src/testing/index.ts",
     "#translations": {
       "source": "./src/translations.ts",
       "types": "./dist/types/src/translations.d.ts",
-      "default": "./dist/lib/neutral/translations.mjs"
+      "default": "./dist/lib/translations.mjs"
     },
     "#types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
-      "default": "./dist/lib/neutral/types/index.mjs"
+      "default": "./dist/lib/types.mjs"
     }
   },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "default": "./dist/lib/neutral/index.mjs"
+      "import": "./dist/lib/index.mjs"
     },
     "./assets/PLUGIN.mdl": "./PLUGIN.mdl",
     "./components": {
       "source": "./src/components/index.ts",
       "types": "./dist/types/src/components/index.d.ts",
-      "default": "./dist/lib/neutral/components/index.mjs"
+      "import": "./dist/lib/components.mjs"
     },
     "./hooks": {
       "source": "./src/hooks/index.ts",
       "types": "./dist/types/src/hooks/index.d.ts",
-      "default": "./dist/lib/neutral/hooks/index.mjs"
+      "import": "./dist/lib/hooks.mjs"
     },
     "./plugin": {
       "source": "./src/plugin.ts",
       "types": "./dist/types/src/plugin.d.ts",
-      "default": "./dist/lib/neutral/plugin.mjs"
+      "import": "./dist/lib/plugin.mjs"
     },
     "./testing": {
       "source": "./src/testing.ts",
       "types": "./dist/types/src/testing.d.ts",
-      "default": "./dist/lib/neutral/testing.mjs"
+      "import": "./dist/lib/testing.mjs"
     },
     "./translations": {
       "source": "./src/translations.ts",
       "types": "./dist/types/src/translations.d.ts",
-      "default": "./dist/lib/neutral/translations.mjs"
+      "import": "./dist/lib/translations.mjs"
     },
     "./types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
-      "default": "./dist/lib/neutral/types/index.mjs"
+      "import": "./dist/lib/types.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -117,54 +117,56 @@
     "PLUGIN.mdl"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.20.2",
-    "@codemirror/language": "^6.12.3",
-    "@codemirror/state": "^6.6.0",
-    "@codemirror/view": "^6.43.0",
+    "@codemirror/autocomplete": "^6.20.3",
+    "@codemirror/language": "^6.12.4",
+    "@codemirror/state": "^6.7.1",
+    "@codemirror/view": "^6.43.6",
     "@effect-atom/atom": "^0.5.3",
     "@effect/cli": "0.75.2",
     "@effect/printer-ansi": "0.49.0",
     "@radix-ui/react-compose-refs": "1.1.1",
     "cronstrue": "^2.56.0",
-    "@dxos/ai": "0.10.0",
-    "@dxos/app-framework": "0.10.0",
-    "@dxos/app-toolkit": "0.10.0",
-    "@dxos/client": "0.10.0",
-    "@dxos/client-protocol": "0.10.0",
-    "@dxos/compute": "0.10.0",
-    "@dxos/compute-runtime": "0.10.0",
-    "@dxos/assistant-toolkit": "0.10.0",
-    "@dxos/conductor": "0.10.0",
-    "@dxos/context": "0.10.0",
-    "@dxos/echo": "0.10.0",
-    "@dxos/echo-doc": "0.10.0",
-    "@dxos/cli-util": "0.10.0",
-    "@dxos/echo-react": "0.10.0",
-    "@dxos/effect": "0.10.0",
-    "@dxos/edge-client": "0.10.0",
-    "@dxos/functions-runtime": "0.10.0",
-    "@dxos/invariant": "0.10.0",
-    "@dxos/log": "0.10.0",
-    "@dxos/plugin-graph": "0.10.0",
-    "@dxos/plugin-client": "0.10.0",
-    "@dxos/plugin-space": "0.10.0",
-    "@dxos/keys": "0.10.0",
-    "@dxos/plugin-markdown": "0.10.0",
-    "@dxos/random": "0.10.0",
-    "@dxos/react-client": "0.10.0",
-    "@dxos/react-ui-components": "0.10.0",
-    "@dxos/react-ui-editor": "0.10.0",
-    "@dxos/react-ui-attention": "0.10.0",
-    "@dxos/react-ui-list": "0.10.0",
-    "@dxos/react-ui-menu": "0.10.0",
-    "@dxos/react-ui-form": "0.10.0",
-    "@dxos/react-ui-search": "0.10.0",
-    "@dxos/react-ui-syntax-highlighter": "0.10.0",
-    "@dxos/schema": "0.10.0",
-    "@dxos/types": "0.10.0",
-    "@dxos/ui": "0.10.0",
-    "@dxos/ui-editor": "0.10.0",
-    "@dxos/util": "0.10.0"
+    "@dxos/ai": "0.11.0",
+    "@dxos/app-framework": "0.11.0",
+    "@dxos/app-toolkit": "0.11.0",
+    "@dxos/assistant-toolkit": "0.11.0",
+    "@dxos/cli-util": "0.11.0",
+    "@dxos/client-protocol": "0.11.0",
+    "@dxos/client": "0.11.0",
+    "@dxos/compute": "0.11.0",
+    "@dxos/compute-runtime": "0.11.0",
+    "@dxos/conductor": "0.11.0",
+    "@dxos/context": "0.11.0",
+    "@dxos/echo-doc": "0.11.0",
+    "@dxos/echo-react": "0.11.0",
+    "@dxos/edge-compute": "0.11.0",
+    "@dxos/edge-client": "0.11.0",
+    "@dxos/effect": "0.11.0",
+    "@dxos/keys": "0.11.0",
+    "@dxos/invariant": "0.11.0",
+    "@dxos/link": "0.11.0",
+    "@dxos/log": "0.11.0",
+    "@dxos/plugin-client": "0.11.0",
+    "@dxos/plugin-graph": "0.11.0",
+    "@dxos/plugin-markdown": "0.11.0",
+    "@dxos/random": "0.11.0",
+    "@dxos/plugin-space": "0.11.0",
+    "@dxos/react-client": "0.11.0",
+    "@dxos/react-ui-attention": "0.11.0",
+    "@dxos/react-ui-components": "0.11.0",
+    "@dxos/react-ui-editor": "0.11.0",
+    "@dxos/react-ui-form": "0.11.0",
+    "@dxos/react-ui-list": "0.11.0",
+    "@dxos/react-ui-menu": "0.11.0",
+    "@dxos/react-ui-search": "0.11.0",
+    "@dxos/react-ui-syntax-highlighter": "0.11.0",
+    "@dxos/schema": "0.11.0",
+    "@dxos/types": "0.11.0",
+    "@dxos/ui": "0.11.0",
+    "@dxos/ui-editor": "0.11.0",
+    "@dxos/util": "0.11.0",
+    "@dxos/agent-runtime": "0.11.0",
+    "@dxos/echo": "0.11.0"
   },
   "devDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -174,12 +176,12 @@
     "effect": "3.21.4",
     "react": "~19.2.7",
     "react-dom": "~19.2.7",
-    "vite": "^8.0.16",
-    "@dxos/assistant": "0.10.0",
-    "@dxos/plugin-testing": "0.10.0",
-    "@dxos/react-ui": "0.10.0",
-    "@dxos/storybook-utils": "0.10.0",
-    "@dxos/ui-theme": "0.10.0"
+    "vite": "^8.1.4",
+    "@dxos/assistant": "0.11.0",
+    "@dxos/react-ui": "0.11.0",
+    "@dxos/plugin-testing": "0.11.0",
+    "@dxos/storybook-utils": "0.11.0",
+    "@dxos/ui-theme": "0.11.0"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -187,8 +189,8 @@
     "effect": "3.21.4",
     "react": "~19.2.7",
     "react-dom": "~19.2.7",
-    "@dxos/ui-theme": "0.10.0",
-    "@dxos/react-ui": "0.10.0"
+    "@dxos/react-ui": "^0.11.0",
+    "@dxos/ui-theme": "^0.11.0"
   },
   "publishConfig": {
     "access": "public"

package/src/RoutinePlugin.node.ts

@@ -4,7 +4,7 @@
 
 import { ActivationEvent, ActivationEvents, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
-import { Operation, Trace, Trigger } from '@dxos/compute';
+import { Operation, Routine, Trace, Trigger } from '@dxos/compute';
 import { ClientEvents } from '@dxos/plugin-client';
 
 import {
@@ -16,7 +16,6 @@ import {
   TriggerRuntimeController,
 } from '#capabilities';
 import { meta } from '#meta';
-import { Routine } from '#types';
 
 import { trigger } from './commands';
 

package/src/RoutinePlugin.tsx

@@ -4,14 +4,13 @@
 
 import { ActivationEvent, ActivationEvents, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
-import { Instructions, Operation, Trace, Trigger } from '@dxos/compute';
+import { Instructions, Operation, Routine, Trace, Trigger } from '@dxos/compute';
 import { ClientEvents } from '@dxos/plugin-client';
 
 import {
   AppGraphBuilder,
   CreateObject,
   LayerSpecs,
-  NavigationResolver,
   OperationHandler,
   ReactSurface,
   RegistrySync,
@@ -20,7 +19,6 @@ import {
 } from '#capabilities';
 import { meta } from '#meta';
 import { translations } from '#translations';
-import { Routine } from '#types';
 
 // eslint-disable-next-line import/no-relative-packages
 import pluginSpec from '../PLUGIN.mdl?raw';
@@ -28,7 +26,6 @@ import pluginSpec from '../PLUGIN.mdl?raw';
 export const RoutinePlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
   AppPlugin.addCreateObjectModule({ activate: CreateObject }),
-  AppPlugin.addNavigationResolverModule({ activatesOn: ClientEvents.ClientReady, activate: NavigationResolver }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   AppPlugin.addPluginAssetModule({
     asset: { pluginId: meta.profile.key, path: 'PLUGIN.mdl', content: pluginSpec, mimeType: 'application/x-mdl' },
@@ -39,6 +36,7 @@ export const RoutinePlugin = Plugin.define(meta).pipe(
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule({
+    // TODO(dmaretskyi): Seems to be contributing too late.
     activatesOn: ClientEvents.ClientReady,
     firesBeforeActivation: [ActivationEvents.SetupProcessManager],
     activate: LayerSpecs,

package/src/RoutinePlugin.workerd.ts

@@ -4,11 +4,10 @@
 
 import { Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
-import { Operation, Trace, Trigger } from '@dxos/compute';
+import { Operation, Routine, Trace, Trigger } from '@dxos/compute';
 
 import { OperationHandler, Templates } from '#capabilities';
 import { meta } from '#meta';
-import { Routine } from '#types';
 
 export const RoutinePlugin = Plugin.define(meta).pipe(
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),

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

@@ -5,16 +5,15 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { AppCapabilities, AppNode, AppNodeMatcher, Paths, TypeSection } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/compute';
+import { AppCapabilities, AppNode, AppNodeMatcher, GraphPath, TypeSection } from '@dxos/app-toolkit';
+import { Operation, Routine } from '@dxos/compute';
 import { Type } from '@dxos/echo';
 import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 import { SETTINGS_SECTION_TYPE, SpaceOperation } from '@dxos/plugin-space';
-import { linkedSegment } from '@dxos/react-ui-attention';
+import { SETTINGS_SECTION_ID } from '@dxos/plugin-space/types';
 import { Position } from '@dxos/util';
 
 import { meta } from '#meta';
-import { Routine } from '#types';
 
 import { getRoutinesPath } from '../paths';
 
@@ -22,7 +21,9 @@ export default Capability.makeModule(
   Effect.fnUntraced(function* () {
     const extensions = yield* Effect.all([
       TypeSection.createTypeSectionExtension(Routine.Routine, {
-        match: AppNodeMatcher.whenNavTreeGroup(Paths.GroupTypes.ai),
+        urlKey: 'routine',
+        match: AppNodeMatcher.whenNavTreeGroup(GraphPath.GroupTypes.ai),
+        groupSegment: GraphPath.GroupSegments.ai,
         createObject: (space) =>
           Operation.invoke(SpaceOperation.OpenCreateObject, {
             target: space.db,
@@ -32,6 +33,7 @@ export default Capability.makeModule(
       }),
       GraphBuilder.createExtension({
         id: 'spaceSettingsAutomation',
+        url: { key: 'routines', kind: 'singleton', path: [SETTINGS_SECTION_ID] },
         match: NodeMatcher.whenNodeType(SETTINGS_SECTION_TYPE),
         connector: () => {
           return Effect.succeed([
@@ -52,7 +54,7 @@ export default Capability.makeModule(
         connector: () =>
           Effect.succeed([
             AppNode.makeCompanion({
-              id: linkedSegment('automation'),
+              variant: 'automation',
               label: ['automation-companion.label', { ns: meta.profile.key }],
               icon: 'ph--lightning--regular',
               data: 'automation',
@@ -66,7 +68,7 @@ export default Capability.makeModule(
         connector: () =>
           Effect.succeed([
             AppNode.makeCompanion({
-              id: 'runs',
+              variant: 'runs',
               label: ['routine-runs.label', { ns: meta.profile.key }],
               icon: 'ph--clock-countdown--regular',
               data: 'runs',

package/src/capabilities/create-object.ts

@@ -5,12 +5,12 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { Operation } from '@dxos/compute';
+import { Operation, Routine } from '@dxos/compute';
 import { Type } from '@dxos/echo';
 import { SpaceCapabilities } from '@dxos/plugin-space';
 
 import { CreateRoutinePanel } from '#components';
-import { Routine, RoutineOperation } from '#types';
+import { RoutineOperation } from '#types';
 
 type CreateOptions = Parameters<SpaceCapabilities.CreateObjectEntry['createObject']>[1];
 

package/src/capabilities/index.ts

@@ -6,7 +6,6 @@ import { Capability } from '@dxos/app-framework';
 import { OperationHandlerSet } from '@dxos/compute';
 
 export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
-export const NavigationResolver = Capability.lazy('NavigationResolver', () => import('./navigation-resolver'));
 export const CreateObject = Capability.lazy('CreateObject', () => import('./create-object'));
 export const LayerSpecs = Capability.lazy<void, Capability.Any[]>('LayerSpecs', () => import('./layer-specs'));
 export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(

package/src/capabilities/layer-specs.ts

@@ -10,15 +10,19 @@ import { OpaqueToolkit } from '@dxos/ai';
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import { ClientService } from '@dxos/client';
-import { LayerSpec, Operation, OperationHandlerSet } from '@dxos/compute';
-import { ProcessManager } from '@dxos/compute-runtime';
-import { Database, Registry } from '@dxos/echo';
+import { LayerSpec, Operation, OperationHandlerSet, Trigger } from '@dxos/compute';
 import {
   FeedTraceSink,
-  RemoteFunctionExecutionService,
+  ProcessManager,
+  RemoteOperationInvoker,
+  RemoteProcessManager,
+  RemoteTriggerManager,
   TriggerDispatcher,
+  TriggerMonitor,
   TriggerStateStore,
-} from '@dxos/functions-runtime';
+} from '@dxos/compute-runtime';
+import { Database, Registry } from '@dxos/echo';
+import { EdgeOperationInvoker, EdgeProcessManager, EdgeTriggerManager } from '@dxos/edge-compute';
 import { invariant } from '@dxos/invariant';
 
 //
@@ -142,26 +146,71 @@ const FeedTraceSinkSpec = LayerSpec.make(
 );
 
 /**
- * Space-scoped `RemoteFunctionExecutionService`. When edge agents are enabled
- * (`runtime.client.edgeFeatures.agents`) functions are invoked without a space
+ * Space-scoped remote operation invoker (EDGE). When edge agents are enabled
+ * (`runtime.client.edgeFeatures.agents`) operations are invoked without a space
  * binding (the edge routes them); otherwise they are scoped to the space. The
  * config is read inside the factory — at slice-materialisation time, once
  * `ClientService` is available — so the owning module does not need the client
  * at activation time and can activate on `SetupProcessManager`.
  */
-const RemoteFunctionExecutionSpec = LayerSpec.make(
+const RemoteOperationInvokerSpec = LayerSpec.make(
   {
     affinity: 'space',
     requires: [ClientService],
-    provides: [RemoteFunctionExecutionService],
+    provides: [RemoteOperationInvoker.Service],
   },
   (context) =>
     Layer.unwrapEffect(
       Effect.gen(function* () {
-        invariant(context.space, 'space context required for RemoteFunctionExecutionService');
+        invariant(context.space, 'space context required for RemoteOperationInvoker');
         const client = yield* ClientService;
         const edgeAgents = client.config.get('runtime.client.edgeFeatures.agents');
-        return RemoteFunctionExecutionService.fromClient(client, edgeAgents ? undefined : context.space);
+        return EdgeOperationInvoker.fromClient(client, edgeAgents ? undefined : context.space);
+      }),
+    ),
+);
+
+/**
+ * Space-scoped remote (EDGE) trigger manager, consumed by the aggregate
+ * {@link TriggerMonitor}. Uses the EDGE implementation whenever an edge service
+ * is configured (a trigger is routed here by its own `remote` flag, so the
+ * manager should exist wherever edge is reachable), otherwise a no-op.
+ */
+const RemoteTriggerManagerSpec = LayerSpec.make(
+  {
+    affinity: 'space',
+    requires: [ClientService, AtomRegistry.AtomRegistry],
+    provides: [RemoteTriggerManager.Service],
+  },
+  (context) =>
+    Layer.unwrapEffect(
+      Effect.gen(function* () {
+        invariant(context.space, 'space context required for RemoteTriggerManager');
+        const client = yield* ClientService;
+        const edgeUrl = client.config.values.runtime?.services?.edge?.url;
+        return edgeUrl ? EdgeTriggerManager.fromClient(client, context.space) : RemoteTriggerManager.layerNoop;
+      }),
+    ),
+);
+
+/**
+ * Application-scoped remote (EDGE) process manager, providing the progress meter's cancel control.
+ * Uses the EDGE implementation whenever an edge service is configured — cancel is addressed by trigger
+ * id + space, so it is not space-scoped — otherwise a read-only no-op. Resolved by the progress trace
+ * sink to route an edge-run trigger's cancel; the aggregate {@link TriggerMonitor} view is unaffected.
+ */
+const RemoteProcessManagerSpec = LayerSpec.make(
+  {
+    affinity: 'application',
+    requires: [ClientService, AtomRegistry.AtomRegistry],
+    provides: [RemoteProcessManager.Service],
+  },
+  () =>
+    Layer.unwrapEffect(
+      Effect.gen(function* () {
+        const client = yield* ClientService;
+        const edgeUrl = client.config.values.runtime?.services?.edge?.url;
+        return edgeUrl ? EdgeProcessManager.fromClient(client) : RemoteProcessManager.layerNoop;
       }),
     ),
 );
@@ -175,6 +224,20 @@ const TriggerDispatcherSpec = LayerSpec.make(
   () => TriggerDispatcher.layer({ timeControl: 'natural' }),
 );
 
+/**
+ * Aggregate {@link Trigger.TriggerMonitorService} over the local
+ * {@link TriggerDispatcher} and the remote {@link RemoteTriggerManager.Service}.
+ * Provides a unified view of trigger state across local and edge environments.
+ */
+const TriggerMonitorSpec = LayerSpec.make(
+  {
+    affinity: 'space',
+    requires: [TriggerDispatcher, Database.Service, AtomRegistry.AtomRegistry, RemoteTriggerManager.Service],
+    provides: [Trigger.TriggerMonitorService],
+  },
+  () => TriggerMonitor.layer,
+);
+
 export default Capability.makeModule(() =>
   Effect.succeed([
     Capability.contributes(Capabilities.LayerSpec, OperationHandlerProviderSpec),
@@ -184,7 +247,10 @@ export default Capability.makeModule(() =>
     Capability.contributes(Capabilities.LayerSpec, TriggerStateStoreSpec),
     Capability.contributes(Capabilities.LayerSpec, FeedTraceSinkSpec),
     Capability.contributes(Capabilities.LayerSpec, TriggerDispatcherSpec),
-    Capability.contributes(Capabilities.LayerSpec, RemoteFunctionExecutionSpec),
+    Capability.contributes(Capabilities.LayerSpec, RemoteTriggerManagerSpec),
+    Capability.contributes(Capabilities.LayerSpec, TriggerMonitorSpec),
+    Capability.contributes(Capabilities.LayerSpec, RemoteOperationInvokerSpec),
+    Capability.contributes(Capabilities.LayerSpec, RemoteProcessManagerSpec),
     Capability.contributes(Capabilities.TraceSink, ({ resolver }) => FeedTraceSink.makeRoutingSink({ resolver })),
   ]),
 );

package/src/capabilities/{react-surface.tsx → react-surface.ts}

@@ -3,16 +3,15 @@
 //
 
 import * as Effect from 'effect/Effect';
-import React from 'react';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Surface } from '@dxos/app-framework/ui';
-import { AppSurface, useActiveSpace } from '@dxos/app-toolkit/ui';
-import { Skill } from '@dxos/compute';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { Routine, Skill } from '@dxos/compute';
 
+import { RoutineCard } from '#components';
 import { RoutineArticle, RoutineCompanion, RoutineSettings, RoutineTraceCompanion, SkillArticle } from '#containers';
 import { meta } from '#meta';
-import { Routine } from '#types';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
@@ -20,21 +19,19 @@ export default Capability.makeModule(() =>
       Surface.create({
         id: 'spaceSettingsAutomation',
         filter: AppSurface.literal(AppSurface.Article, `${meta.profile.key}.space-settings-automation`),
-        component: () => {
-          const space = useActiveSpace();
-          if (!space) {
-            return null;
-          }
-
-          return <RoutineSettings space={space} />;
-        },
+        component: RoutineSettings,
       }),
       Surface.create({
         id: 'automation.article',
         filter: AppSurface.object(AppSurface.Article, Routine.Routine),
-        component: ({ data, role }) => (
-          <RoutineArticle role={role} subject={data.subject} attendableId={data.attendableId} />
-        ),
+        component: RoutineArticle,
+        props: ({ role, data: { subject, attendableId } }) => ({ role, subject, attendableId }),
+      }),
+      Surface.create({
+        id: 'routine.card',
+        filter: AppSurface.object(AppSurface.CardContent, Routine.Routine),
+        component: RoutineCard,
+        props: ({ data: { subject } }) => ({ subject }),
       }),
       Surface.create({
         id: 'companion.automation',
@@ -42,9 +39,8 @@ export default Capability.makeModule(() =>
           AppSurface.literal(AppSurface.Article, 'automation'),
           AppSurface.companion(AppSurface.Article),
         ),
-        component: ({ data }) => {
-          return <RoutineCompanion attendableId={data.attendableId} subject={data.companionTo} />;
-        },
+        component: RoutineCompanion,
+        props: ({ data: { attendableId, companionTo } }) => ({ attendableId, subject: companionTo }),
       }),
       Surface.create({
         id: 'routine.runs',
@@ -52,14 +48,14 @@ export default Capability.makeModule(() =>
           AppSurface.literal(AppSurface.Article, 'runs'),
           AppSurface.companion(AppSurface.Article, Routine.Routine),
         ),
-        component: ({ data, role }) => <RoutineTraceCompanion role={role} subject={data.companionTo} />,
+        component: RoutineTraceCompanion,
+        props: ({ role, data: { companionTo } }) => ({ role, subject: companionTo }),
       }),
       Surface.create({
         id: 'skill',
         filter: AppSurface.object(AppSurface.Article, Skill.Skill),
-        component: ({ data, role }) => (
-          <SkillArticle role={role} subject={data.subject} attendableId={data.attendableId} />
-        ),
+        component: SkillArticle,
+        props: ({ role, data: { subject, attendableId } }) => ({ role, subject, attendableId }),
       }),
     ]),
   ),