@dxos/plugin-automation 0.7.5-main.ff8607b → 0.7.5-staging.2ff1350

package/dist/types/src/types/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAC;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAGtC,yBAAiB,gBAAgB,CAAC;;;;;;;;;;;;IAGhC,MAAM,OAAO,UAAW,SAAQ,eAQ9B;KAAG;;CACN"}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@dxos/plugin-automation",
-  "version": "0.7.5-main.ff8607b",
+  "version": "0.7.5-staging.2ff1350",
   "description": "Prompt chain plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
+  "type": "module",
   "exports": {
     ".": {
       "types": "./dist/types/src/index.d.ts",
@@ -28,68 +29,86 @@
     }
   },
   "files": [
+    "assets",
     "dist",
     "src"
   ],
   "dependencies": {
+    "@codemirror/autocomplete": "^6.18.1",
     "@codemirror/language": "^6.10.3",
     "@codemirror/search": "^6.5.6",
     "@codemirror/state": "^6.4.1",
     "@codemirror/view": "^6.34.1",
     "@effect/schema": "^0.75.5",
     "@preact/signals-core": "^1.6.0",
+    "jsonpointer": "^5.0.1",
     "lodash.get": "^4.4.2",
-    "@dxos/app-framework": "0.7.5-main.ff8607b",
-    "@dxos/async": "0.7.5-main.ff8607b",
-    "@dxos/assistant": "0.7.5-main.ff8607b",
-    "@dxos/compute": "0.7.5-main.ff8607b",
-    "@dxos/context": "0.7.5-main.ff8607b",
-    "@dxos/echo-db": "0.7.5-main.ff8607b",
-    "@dxos/echo-schema": "0.7.5-main.ff8607b",
-    "@dxos/functions": "0.7.5-main.ff8607b",
-    "@dxos/keys": "0.7.5-main.ff8607b",
-    "@dxos/invariant": "0.7.5-main.ff8607b",
-    "@dxos/live-object": "0.7.5-main.ff8607b",
-    "@dxos/log": "0.7.5-main.ff8607b",
-    "@dxos/plugin-chess": "0.7.5-main.ff8607b",
-    "@dxos/plugin-client": "0.7.5-main.ff8607b",
-    "@dxos/plugin-deck": "0.7.5-main.ff8607b",
-    "@dxos/plugin-graph": "0.7.5-main.ff8607b",
-    "@dxos/plugin-sketch": "0.7.5-main.ff8607b",
-    "@dxos/plugin-inbox": "0.7.5-main.ff8607b",
-    "@dxos/plugin-markdown": "0.7.5-main.ff8607b",
-    "@dxos/plugin-script": "0.7.5-main.ff8607b",
-    "@dxos/plugin-space": "0.7.5-main.ff8607b",
-    "@dxos/plugin-stack": "0.7.5-main.ff8607b",
-    "@dxos/react-client": "0.7.5-main.ff8607b",
-    "@dxos/plugin-wnfs": "0.7.5-main.ff8607b",
-    "@dxos/react-ui-form": "0.7.5-main.ff8607b",
-    "@dxos/react-ui-editor": "0.7.5-main.ff8607b",
-    "@dxos/react-ui-list": "0.7.5-main.ff8607b",
-    "@dxos/schema": "0.7.5-main.ff8607b",
-    "@dxos/util": "0.7.5-main.ff8607b",
-    "@dxos/react-ui-syntax-highlighter": "0.7.5-main.ff8607b"
+    "unified": "^11.0.0",
+    "@dxos/app-framework": "0.7.5-staging.2ff1350",
+    "@dxos/async": "0.7.5-staging.2ff1350",
+    "@dxos/assistant": "0.7.5-staging.2ff1350",
+    "@dxos/compute": "0.7.5-staging.2ff1350",
+    "@dxos/client": "0.7.5-staging.2ff1350",
+    "@dxos/conductor": "0.7.5-staging.2ff1350",
+    "@dxos/context": "0.7.5-staging.2ff1350",
+    "@dxos/echo-schema": "0.7.5-staging.2ff1350",
+    "@dxos/artifact": "0.7.5-staging.2ff1350",
+    "@dxos/echo-db": "0.7.5-staging.2ff1350",
+    "@dxos/invariant": "0.7.5-staging.2ff1350",
+    "@dxos/log": "0.7.5-staging.2ff1350",
+    "@dxos/edge-client": "0.7.5-staging.2ff1350",
+    "@dxos/functions": "0.7.5-staging.2ff1350",
+    "@dxos/keys": "0.7.5-staging.2ff1350",
+    "@dxos/live-object": "0.7.5-staging.2ff1350",
+    "@dxos/plugin-client": "0.7.5-staging.2ff1350",
+    "@dxos/plugin-deck": "0.7.5-staging.2ff1350",
+    "@dxos/plugin-inbox": "0.7.5-staging.2ff1350",
+    "@dxos/plugin-markdown": "0.7.5-staging.2ff1350",
+    "@dxos/plugin-sketch": "0.7.5-staging.2ff1350",
+    "@dxos/plugin-script": "0.7.5-staging.2ff1350",
+    "@dxos/plugin-graph": "0.7.5-staging.2ff1350",
+    "@dxos/plugin-space": "0.7.5-staging.2ff1350",
+    "@dxos/plugin-transcription": "0.7.5-staging.2ff1350",
+    "@dxos/plugin-stack": "0.7.5-staging.2ff1350",
+    "@dxos/plugin-wnfs": "0.7.5-staging.2ff1350",
+    "@dxos/react-client": "0.7.5-staging.2ff1350",
+    "@dxos/react-edge-client": "0.7.5-staging.2ff1350",
+    "@dxos/react-ui-canvas-compute": "0.7.5-staging.2ff1350",
+    "@dxos/react-ui-canvas-editor": "0.7.5-staging.2ff1350",
+    "@dxos/react-ui-components": "0.7.5-staging.2ff1350",
+    "@dxos/react-ui-dnd": "0.7.5-staging.2ff1350",
+    "@dxos/react-ui-form": "0.7.5-staging.2ff1350",
+    "@dxos/react-ui-editor": "0.7.5-staging.2ff1350",
+    "@dxos/react-ui-list": "0.7.5-staging.2ff1350",
+    "@dxos/react-ui-sfx": "0.7.5-staging.2ff1350",
+    "@dxos/react-ui-stack": "0.7.5-staging.2ff1350",
+    "@dxos/react-ui-syntax-highlighter": "0.7.5-staging.2ff1350",
+    "@dxos/schema": "0.7.5-staging.2ff1350",
+    "@dxos/util": "0.7.5-staging.2ff1350"
   },
   "devDependencies": {
-    "@phosphor-icons/react": "^2.1.5",
     "@types/lodash.get": "^4.4.7",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
+    "openapi-types": "^12.1.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/echo-db": "0.7.5-main.ff8607b",
-    "@dxos/react-ui": "0.7.5-main.ff8607b",
-    "@dxos/random": "0.7.5-main.ff8607b",
-    "@dxos/react-ui-theme": "0.7.5-main.ff8607b",
-    "@dxos/storybook-utils": "0.7.5-main.ff8607b"
+    "@dxos/artifact-testing": "0.7.5-staging.2ff1350",
+    "@dxos/echo-db": "0.7.5-staging.2ff1350",
+    "@dxos/plugin-chess": "0.7.5-staging.2ff1350",
+    "@dxos/plugin-map": "0.7.5-staging.2ff1350",
+    "@dxos/plugin-table": "0.7.5-staging.2ff1350",
+    "@dxos/random": "0.7.5-staging.2ff1350",
+    "@dxos/react-ui": "0.7.5-staging.2ff1350",
+    "@dxos/storybook-utils": "0.7.5-staging.2ff1350",
+    "@dxos/react-ui-theme": "0.7.5-staging.2ff1350"
   },
   "peerDependencies": {
-    "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.7.5-main.ff8607b",
-    "@dxos/react-ui-theme": "0.7.5-main.ff8607b"
+    "@dxos/react-ui-theme": "0.7.5-staging.2ff1350",
+    "@dxos/react-ui": "0.7.5-staging.2ff1350"
   },
   "publishConfig": {
     "access": "public"

package/src/AutomationPlugin.tsx

@@ -2,17 +2,20 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, contributes, defineModule, definePlugin, Events } from '@dxos/app-framework';
+import { Capabilities, contributes, createIntent, defineModule, definePlugin, Events } from '@dxos/app-framework';
 import { FunctionTrigger } from '@dxos/functions';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { DeckCapabilities } from '@dxos/plugin-deck';
-import { RefArray } from '@dxos/react-client/echo';
+import { DeckCapabilities, DeckEvents } from '@dxos/plugin-deck';
+import { SpaceCapabilities } from '@dxos/plugin-space';
+import { defineObjectForm } from '@dxos/plugin-space/types';
+import { RefArray, isEchoObject, getSpace } from '@dxos/react-client/echo';
 
-import { AppGraphBuilder, ReactSurface } from './capabilities';
+import { AiClient, AppGraphBuilder, IntentResolver, ReactSurface } from './capabilities';
 import { AUTOMATION_PLUGIN, meta } from './meta';
 import translations from './translations';
-import { ChainPromptType, ChainType } from './types';
+import { AutomationAction, ChainPromptType, ChainType, AIChatType, ServiceType } from './types';
 
+// TODO(wittjosiah): Rename to AssistantPlugin?
 export const AutomationPlugin = () =>
   definePlugin(meta, [
     defineModule({
@@ -23,7 +26,7 @@ export const AutomationPlugin = () =>
     defineModule({
       id: `${meta.id}/module/metadata`,
       activatesOn: Events.SetupMetadata,
-      activate: () =>
+      activate: () => [
         contributes(Capabilities.Metadata, {
           id: ChainType.typename,
           metadata: {
@@ -33,31 +36,55 @@ export const AutomationPlugin = () =>
             loadReferences: async (chain: ChainType) => await RefArray.loadAll(chain.prompts ?? []),
           },
         }),
+        contributes(Capabilities.Metadata, {
+          id: AIChatType.typename,
+          metadata: {
+            placeholder: ['object placeholder', { ns: AUTOMATION_PLUGIN }],
+            icon: 'ph--atom--regular',
+          },
+        }),
+      ],
+    }),
+    defineModule({
+      id: `${meta.id}/module/object-form`,
+      activatesOn: ClientEvents.SetupSchema,
+      activate: () =>
+        contributes(
+          SpaceCapabilities.ObjectForm,
+          defineObjectForm({
+            objectSchema: AIChatType,
+            getIntent: (_, options) => createIntent(AutomationAction.CreateChat, { spaceId: options.space.id }),
+          }),
+        ),
     }),
     defineModule({
       id: `${meta.id}/module/schema`,
       activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.SystemSchema, [ChainType, ChainPromptType, FunctionTrigger]),
+      activate: () =>
+        contributes(ClientCapabilities.Schema, [ChainType, ChainPromptType, FunctionTrigger, ServiceType]),
     }),
     defineModule({
       id: `${meta.id}/module/complementary-panels`,
-      activatesOn: Events.Startup,
+      activatesOn: DeckEvents.SetupComplementaryPanels,
       activate: () => [
+        contributes(DeckCapabilities.ComplementaryPanel, {
+          id: 'service-registry',
+          label: ['service registry label', { ns: AUTOMATION_PLUGIN }],
+          icon: 'ph--plugs--regular',
+        }),
         contributes(DeckCapabilities.ComplementaryPanel, {
           id: 'automation',
           label: ['automation panel label', { ns: AUTOMATION_PLUGIN }],
           icon: 'ph--magic-wand--regular',
-        }),
-        contributes(DeckCapabilities.ComplementaryPanel, {
-          id: 'assistant',
-          label: ['assistant panel label', { ns: AUTOMATION_PLUGIN }],
-          icon: 'ph--atom--regular',
+          filter: (node) => isEchoObject(node.data) && !!getSpace(node.data),
         }),
       ],
     }),
     defineModule({
       id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupSurfaces,
+      activatesOn: Events.SetupReactSurface,
+      // TODO(wittjosiah): Should occur before the chat is loaded when surfaces activation is more granular.
+      activatesBefore: [Events.SetupArtifactDefinition],
       activate: ReactSurface,
     }),
     defineModule({
@@ -65,4 +92,14 @@ export const AutomationPlugin = () =>
       activatesOn: Events.SetupAppGraph,
       activate: AppGraphBuilder,
     }),
+    defineModule({
+      id: `${meta.id}/module/intent-resolver`,
+      activatesOn: Events.SetupIntentResolver,
+      activate: IntentResolver,
+    }),
+    defineModule({
+      id: `${meta.id}/module/ai-client`,
+      activatesOn: ClientEvents.ClientReady,
+      activate: AiClient,
+    }),
   ]);

package/src/capabilities/ai-client.ts

@@ -0,0 +1,19 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { contributes, type PluginsContext } from '@dxos/app-framework';
+import { AIServiceClientImpl } from '@dxos/assistant';
+import { ClientCapabilities } from '@dxos/plugin-client';
+
+import { AutomationCapabilities } from './capabilities';
+
+// TODO(wittjosiah): Factor out.
+const DEFAULT_AI_SERVICE_URL = 'http://localhost:8788';
+
+export default (context: PluginsContext) => {
+  const client = context.requestCapability(ClientCapabilities.Client);
+  const endpoint = client.config.values.runtime?.services?.ai?.server ?? DEFAULT_AI_SERVICE_URL;
+  const aiClient = new AIServiceClientImpl({ endpoint });
+  return contributes(AutomationCapabilities.AiClient, aiClient);
+};

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

@@ -2,126 +2,99 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, type PluginsContext } from '@dxos/app-framework';
+import {
+  Capabilities,
+  contributes,
+  createIntent,
+  LayoutAction,
+  type PromiseIntentDispatcher,
+  type PluginsContext,
+} from '@dxos/app-framework';
+import { invariant } from '@dxos/invariant';
+import { log } from '@dxos/log';
 import { ClientCapabilities } from '@dxos/plugin-client';
-import { createExtension, toSignal } from '@dxos/plugin-graph';
-import { memoizeQuery } from '@dxos/plugin-space';
-import { getTypename, parseId, SpaceState } from '@dxos/react-client/echo';
+import { createExtension, type Node, ROOT_ID } from '@dxos/plugin-graph';
+import { SpaceAction } from '@dxos/plugin-space/types';
+import { type Space, Filter, getSpace } from '@dxos/react-client/echo';
 
-import { AUTOMATION_PLUGIN } from '../meta';
+import { ASSISTANT_DIALOG, AUTOMATION_PLUGIN } from '../meta';
+import { AIChatType, AutomationAction } from '../types';
 
-export default (context: PluginsContext) => {
-  const resolve = (typename: string) =>
-    context.requestCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {};
-
-  return contributes(Capabilities.AppGraphBuilder, [
+export default (context: PluginsContext) =>
+  contributes(Capabilities.AppGraphBuilder, [
     createExtension({
-      id: `${AUTOMATION_PLUGIN}/automation-for-subject`,
-      resolver: ({ id }) => {
-        if (!id.endsWith('~automation')) {
-          return;
-        }
-
-        const type = 'orphan-settings-for-subject';
-        const icon = 'ph--magic-wand--regular';
-
-        const client = context.requestCapability(ClientCapabilities.Client);
-        const [subjectId] = id.split('~');
-        const { spaceId, objectId } = parseId(subjectId);
-        const spaces = toSignal(
-          (onChange) => client.spaces.subscribe(() => onChange()).unsubscribe,
-          () => client.spaces.get(),
-        );
-        const space = spaces?.find((space) => space.id === spaceId && space.state.get() === SpaceState.SPACE_READY);
-        if (!objectId) {
-          // TODO(burdon): Ref SPACE_PLUGIN ns.
-          const label = space
-            ? space.properties.name || ['unnamed space label', { ns: AUTOMATION_PLUGIN }]
-            : ['unnamed object settings label', { ns: AUTOMATION_PLUGIN }];
-
-          // TODO(wittjosiah): Support comments for arbitrary subjects.
-          //   This is to ensure that the comments panel is not stuck on an old object.
-          return {
-            id,
-            type,
-            data: null,
-            properties: {
-              icon,
-              label,
-              showResolvedThreads: false,
-              object: null,
-              space,
-            },
-          };
-        }
+      id: `${AUTOMATION_PLUGIN}/assistant`,
+      filter: (node): node is Node<null> => node.id === ROOT_ID,
+      actions: () => [
+        {
+          id: `${LayoutAction.UpdateDialog._tag}/assistant/open`,
+          data: async () => {
+            const { dispatchPromise: dispatch } = context.requestCapability(Capabilities.IntentDispatcher);
+            const client = context.requestCapability(ClientCapabilities.Client);
+            const layout = context.requestCapability(Capabilities.Layout);
+            const { graph } = context.requestCapability(Capabilities.AppGraph);
 
-        const [object] = memoizeQuery(space, { id: objectId });
-        if (!object || !subjectId) {
-          return;
-        }
+            // TODO(burdon): Get space from workspace.
+            // TODO(burdon): If need to create chat, then add to dispatch stack below.
+            let chat: AIChatType | undefined;
+            if (layout.active.length > 0) {
+              const node = graph.findNode(layout.active[0]);
+              if (node) {
+                const space = getSpace(node.data);
+                if (space) {
+                  chat = await getOrCreateChat(dispatch, space);
+                }
+              }
+            } else {
+              const space = client.spaces.default;
+              chat = await getOrCreateChat(dispatch, space);
+            }
 
-        const meta = resolve(getTypename(object) ?? '');
-        const label = meta.label?.(object) ||
-          object.name ||
-          meta.placeholder || ['unnamed object settings label', { ns: AUTOMATION_PLUGIN }];
+            if (!chat) {
+              log.warn('no chat found');
+              return;
+            }
 
-        return {
-          id,
-          type,
-          data: null,
-          properties: {
-            icon,
-            label,
-            object,
+            await dispatch(
+              createIntent(LayoutAction.UpdateDialog, {
+                part: 'dialog',
+                subject: ASSISTANT_DIALOG,
+                options: {
+                  state: true,
+                  blockAlign: 'end',
+                  props: {
+                    chat,
+                  },
+                },
+              }),
+            );
           },
-        };
-      },
-    }),
-    createExtension({
-      id: `${AUTOMATION_PLUGIN}/assistant-for-subject`,
-      resolver: ({ id }) => {
-        // TODO(Zan): Find util (or make one). Effect schema!!
-        if (!id.endsWith('~assistant')) {
-          return;
-        }
-
-        const client = context.requestCapability(ClientCapabilities.Client);
-        const [subjectId] = id.split('~');
-        const { spaceId, objectId } = parseId(subjectId);
-        const spaces = toSignal(
-          (onChange) => client.spaces.subscribe(() => onChange()).unsubscribe,
-          () => client.spaces.get(),
-        );
-        const space = spaces?.find((space) => space.id === spaceId && space.state.get() === SpaceState.SPACE_READY);
-        if (!objectId) {
-          // TODO(wittjosiah): Support assistant for arbitrary subjects.
-          //   This is to ensure that the assistant panel is not stuck on an old object.
-          return {
-            id,
-            type: 'orphan-automation-for-subject',
-            data: null,
-            properties: {
-              icon: 'ph--atom--regular',
-              label: ['assistant panel label', { ns: AUTOMATION_PLUGIN }],
-              object: null,
-              space,
-            },
-          };
-        }
-
-        const [object] = memoizeQuery(space, { id: objectId });
-
-        return {
-          id,
-          type: 'orphan-automation-for-subject',
-          data: null,
           properties: {
-            icon: 'ph--atom--regular',
-            label: ['assistant panel label', { ns: AUTOMATION_PLUGIN }],
-            object,
+            label: ['open assistant label', { ns: AUTOMATION_PLUGIN }],
+            // TODO(wittjosiah): Use logo icon.
+            icon: 'ph--chat-centered-text--regular',
+            disposition: 'item',
+            position: 'hoist',
+            keyBinding: {
+              macos: 'shift+meta+k',
+              windows: 'shift+ctrl+k',
+            },
           },
-        };
-      },
+        },
+      ],
     }),
   ]);
+
+// TODO(burdon): Factor out.
+const getOrCreateChat = async (dispatch: PromiseIntentDispatcher, space: Space): Promise<AIChatType | undefined> => {
+  const { objects } = await space.db.query(Filter.schema(AIChatType)).run();
+  if (objects.length > 0) {
+    // TODO(burdon): Is this the most recent?
+    return objects[objects.length - 1];
+  }
+
+  const { data } = await dispatch(createIntent(AutomationAction.CreateChat, { spaceId: space.id }));
+  invariant(data?.object instanceof AIChatType);
+  await dispatch(createIntent(SpaceAction.AddObject, { target: space, object: data.object }));
+  return data.object;
 };

package/src/capabilities/capabilities.ts

@@ -0,0 +1,12 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { defineCapability } from '@dxos/app-framework';
+import { type AIServiceClientImpl } from '@dxos/assistant';
+
+import { AUTOMATION_PLUGIN } from '../meta';
+
+export namespace AutomationCapabilities {
+  export const AiClient = defineCapability<AIServiceClientImpl>(`${AUTOMATION_PLUGIN}/capability/ai-client`);
+}

package/src/capabilities/index.ts

@@ -4,5 +4,9 @@
 
 import { lazy } from '@dxos/app-framework';
 
+export const AiClient = lazy(() => import('./ai-client'));
 export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
+export const IntentResolver = lazy(() => import('./intent-resolver'));
 export const ReactSurface = lazy(() => import('./react-surface'));
+
+export * from './capabilities';

package/src/capabilities/intent-resolver.ts

@@ -0,0 +1,26 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capabilities, contributes, createResolver } from '@dxos/app-framework';
+import { ObjectId } from '@dxos/echo-schema';
+import { DXN, QueueSubspaceTags } from '@dxos/keys';
+import { create, refFromDXN } from '@dxos/live-object';
+
+import { AutomationAction, AIChatType } from '../types';
+
+export default () =>
+  contributes(
+    Capabilities.IntentResolver,
+    createResolver({
+      intent: AutomationAction.CreateChat,
+      resolve: ({ spaceId, name }) => ({
+        data: {
+          object: create(AIChatType, {
+            name,
+            queue: refFromDXN(new DXN(DXN.kind.QUEUE, [QueueSubspaceTags.DATA, spaceId, ObjectId.random()])),
+          }),
+        },
+      }),
+    }),
+  );

package/src/capabilities/react-surface.tsx

@@ -5,17 +5,19 @@
 import React from 'react';
 
 import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
-import { getSpace, isEchoObject, type ReactiveEchoObject } from '@dxos/react-client/echo';
+import { getSpace, isEchoObject, isSpace, type ReactiveEchoObject } from '@dxos/react-client/echo';
 
-import { AssistantPanel, AutomationPanel } from '../components';
-import { AUTOMATION_PLUGIN } from '../meta';
+import { AssistantDialog, AutomationPanel, ChatContainer, ServiceRegistry } from '../components';
+import { AUTOMATION_PLUGIN, ASSISTANT_DIALOG } from '../meta';
+import { AIChatType } from '../types';
 
 export default () =>
   contributes(Capabilities.ReactSurface, [
     createSurface({
-      id: `${AUTOMATION_PLUGIN}/assistant`,
-      role: 'complementary--assistant',
-      component: ({ data }) => <AssistantPanel subject={data.subject} />,
+      id: `${AUTOMATION_PLUGIN}/ai-chat`,
+      role: 'article',
+      filter: (data): data is { subject: AIChatType } => data.subject instanceof AIChatType,
+      component: ({ data, role }) => <ChatContainer role={role} chat={data.subject} />,
     }),
     createSurface({
       id: `${AUTOMATION_PLUGIN}/automation`,
@@ -24,4 +26,17 @@ export default () =>
         isEchoObject(data.subject) && !!getSpace(data.subject),
       component: ({ data }) => <AutomationPanel space={getSpace(data.subject)!} object={data.subject} />,
     }),
+    createSurface({
+      id: `${AUTOMATION_PLUGIN}/service-registry`,
+      role: 'complementary--service-registry',
+      component: ({ data }) => (
+        <ServiceRegistry space={isSpace(data.subject) ? data.subject : getSpace(data.subject)!} />
+      ),
+    }),
+    createSurface({
+      id: ASSISTANT_DIALOG,
+      role: 'dialog',
+      filter: (data): data is { props: { chat: AIChatType } } => data.component === ASSISTANT_DIALOG,
+      component: ({ data }) => <AssistantDialog {...data.props} />,
+    }),
   ]);