@dxos/plugin-automation 0.7.4 → 0.7.5-labs.5f04cf6

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

@@ -1,4 +1,4 @@
-import { ref, S } from '@dxos/echo-schema';
+import { Expando, S } from '@dxos/echo-schema';
 export declare enum ChainInputType {
     VALUE = 0,
     PASS_THROUGH = 1,
@@ -15,17 +15,15 @@ export declare const ChainInputSchema: S.mutable<S.Struct<{
     value: S.optional<typeof S.String>;
 }>>;
 export type ChainInput = S.Schema.Type<typeof ChainInputSchema>;
-declare const ChainPromptType_base: import("@dxos/echo-schema").AbstractTypedObject<{
-    template: string;
-    command?: string | undefined;
-    inputs?: {
-        name: string;
-        value?: string | undefined;
-        type?: ChainInputType | undefined;
-    }[] | undefined;
-} & {
-    id: string;
-}, S.Struct.Encoded<{
+declare const ChainPromptType_base: import("@dxos/echo-schema").TypedObjectPrototype<import("packages/core/echo/echo-schema/dist/types/src/object/common").TypedObjectFields<{
+    command: S.optional<typeof S.String>;
+    template: typeof S.String;
+    inputs: S.optional<S.mutable<S.Array$<S.mutable<S.Struct<{
+        name: typeof S.String;
+        type: S.optional<S.Enums<typeof ChainInputType>>;
+        value: S.optional<typeof S.String>;
+    }>>>>>;
+}, import("packages/core/echo/echo-schema/dist/types/src/object/common").TypedObjectOptions>, S.Struct.Encoded<{
     command: S.optional<typeof S.String>;
     template: typeof S.String;
     inputs: S.optional<S.mutable<S.Array$<S.mutable<S.Struct<{
@@ -36,36 +34,39 @@ declare const ChainPromptType_base: import("@dxos/echo-schema").AbstractTypedObj
 }>>;
 export declare class ChainPromptType extends ChainPromptType_base {
 }
-declare const ChainType_base: import("@dxos/echo-schema").AbstractTypedObject<{
-    name?: string | undefined;
-    prompts?: import("@dxos/echo-schema").Ref<{
-        template: string;
-        command?: string | undefined;
-        inputs?: {
-            name: string;
-            value?: string | undefined;
-            type?: ChainInputType | undefined;
-        }[] | undefined;
-    } & {
-        id: string;
-    }>[] | undefined;
-} & {
-    id: string;
-}, S.Struct.Encoded<{
+declare const ChainType_base: import("@dxos/echo-schema").TypedObjectPrototype<import("packages/core/echo/echo-schema/dist/types/src/object/common").TypedObjectFields<{
+    name: S.optional<typeof S.String>;
+    prompts: S.optional<S.mutable<S.Array$<import("@dxos/echo-schema").Ref$<import("packages/core/echo/echo-schema/dist/types/src/object/common").TypedObjectFields<{
+        command: S.optional<typeof S.String>;
+        template: typeof S.String;
+        inputs: S.optional<S.mutable<S.Array$<S.mutable<S.Struct<{
+            name: typeof S.String;
+            type: S.optional<S.Enums<typeof ChainInputType>>;
+            value: S.optional<typeof S.String>;
+        }>>>>>;
+    }, import("packages/core/echo/echo-schema/dist/types/src/object/common").TypedObjectOptions>>>>>;
+}, import("packages/core/echo/echo-schema/dist/types/src/object/common").TypedObjectOptions>, S.Struct.Encoded<{
     name: S.optional<typeof S.String>;
-    prompts: S.optional<S.mutable<S.Array$<ref<{
-        template: string;
-        command?: string | undefined;
-        inputs?: {
-            name: string;
-            value?: string | undefined;
-            type?: ChainInputType | undefined;
-        }[] | undefined;
-    } & {
-        id: string;
-    }>>>>;
+    prompts: S.optional<S.mutable<S.Array$<import("@dxos/echo-schema").Ref$<import("packages/core/echo/echo-schema/dist/types/src/object/common").TypedObjectFields<{
+        command: S.optional<typeof S.String>;
+        template: typeof S.String;
+        inputs: S.optional<S.mutable<S.Array$<S.mutable<S.Struct<{
+            name: typeof S.String;
+            type: S.optional<S.Enums<typeof ChainInputType>>;
+            value: S.optional<typeof S.String>;
+        }>>>>>;
+    }, import("packages/core/echo/echo-schema/dist/types/src/object/common").TypedObjectOptions>>>>>;
 }>>;
 export declare class ChainType extends ChainType_base {
 }
+declare const GptChatType_base: import("@dxos/echo-schema").TypedObjectPrototype<import("packages/core/echo/echo-schema/dist/types/src/object/common").TypedObjectFields<{
+    name: S.optional<typeof S.String>;
+    queue: import("@dxos/echo-schema").Ref$<Expando>;
+}, import("packages/core/echo/echo-schema/dist/types/src/object/common").TypedObjectOptions>, S.Struct.Encoded<{
+    name: S.optional<typeof S.String>;
+    queue: import("@dxos/echo-schema").Ref$<Expando>;
+}>>;
+export declare class GptChatType extends GptChatType_base {
+}
 export {};
 //# sourceMappingURL=schema.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../src/types/schema.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAE,CAAC,EAAe,MAAM,mBAAmB,CAAC;AAGxD,oBAAY,cAAc;IACxB,KAAK,IAAI;IACT,YAAY,IAAI;IAChB,SAAS,IAAI;IACb,QAAQ,IAAI;IACZ,KAAK,IAAI;IACT,QAAQ,IAAI;IACZ,OAAO,IAAI;IACX,MAAM,IAAI;CACX;AAED,eAAO,MAAM,gBAAgB;;;;GAM5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;;;;;;;;;;;;;;;;;;;;AAEhE,qBAAa,eAAgB,SAAQ,oBAInC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL,qBAAa,SAAU,SAAQ,cAG7B;CAAG"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../src/types/schema.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAO,CAAC,EAAe,MAAM,mBAAmB,CAAC;AAGjE,oBAAY,cAAc;IACxB,KAAK,IAAI;IACT,YAAY,IAAI;IAChB,SAAS,IAAI;IACb,QAAQ,IAAI;IACZ,KAAK,IAAI;IACT,QAAQ,IAAI;IACZ,OAAO,IAAI;IACX,MAAM,IAAI;CACX;AAED,eAAO,MAAM,gBAAgB;;;;GAM5B,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC,CAAC;;;;;;;;;;;;;;;;;;AAEhE,qBAAa,eAAgB,SAAQ,oBAInC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;AAEL,qBAAa,SAAU,SAAQ,cAG7B;CAAG;;;;;;;;AAGL,qBAAa,WAAY,SAAQ,gBAI/B;CAAG"}

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

@@ -1,7 +1,18 @@
-import type { GraphBuilderProvides, IntentResolverProvides, MetadataRecordsProvides, SurfaceProvides, TranslationsProvides } from '@dxos/app-framework';
-import { type PanelProvides } from '@dxos/plugin-deck/types';
-import { type SchemaProvides } from '@dxos/plugin-space';
-export declare enum AutomationAction {
+import { S } from '@dxos/echo-schema';
+import { GptChatType } from './schema';
+export declare namespace AutomationAction {
+    const Create_base: S.TaggedClass<Create, "dxos.org/plugin/automation/action/create", {
+        readonly _tag: S.tag<"dxos.org/plugin/automation/action/create">;
+    } & {
+        input: S.Struct<{
+            name: S.optional<typeof S.String>;
+        }>;
+        output: S.Struct<{
+            object: typeof GptChatType;
+        }>;
+    }>;
+    export class Create extends Create_base {
+    }
+    export {};
 }
-export type AutomationPluginProvides = SurfaceProvides & IntentResolverProvides & MetadataRecordsProvides & TranslationsProvides & GraphBuilderProvides & SchemaProvides & PanelProvides;
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,oBAAoB,EACpB,sBAAsB,EACtB,uBAAuB,EACvB,eAAe,EACf,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAMzD,oBAAY,gBAAgB;CAAG;AAE/B,MAAM,MAAM,wBAAwB,GAAG,eAAe,GACpD,sBAAsB,GACtB,uBAAuB,GACvB,oBAAoB,GACpB,oBAAoB,GACpB,cAAc,GACd,aAAa,CAAC"}
+{"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,WAAW,EAAE,MAAM,UAAU,CAAC;AAGvC,yBAAiB,gBAAgB,CAAC;;;;;;;;;;;IAGhC,MAAM,OAAO,MAAO,SAAQ,WAO1B;KAAG;;CACN"}

package/dist/types/tsconfig.tsbuildinfo

@@ -0,0 +1 @@
+{"version":"5.7.2"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-automation",
-  "version": "0.7.4",
+  "version": "0.7.5-labs.5f04cf6",
   "description": "Prompt chain plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -13,11 +13,6 @@
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
-    "./meta": {
-      "types": "./dist/types/src/meta.d.ts",
-      "browser": "./dist/lib/browser/meta.mjs",
-      "node": "./dist/lib/node-esm/meta.mjs"
-    },
     "./types": {
       "types": "./dist/types/src/types/index.d.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
@@ -27,9 +22,6 @@
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
-      "meta": [
-        "dist/types/src/meta.d.ts"
-      ],
       "types": [
         "dist/types/src/types/index.d.ts"
       ]
@@ -47,57 +39,66 @@
     "@effect/schema": "^0.75.5",
     "@preact/signals-core": "^1.6.0",
     "lodash.get": "^4.4.2",
-    "@dxos/app-framework": "0.7.4",
-    "@dxos/assistant": "0.7.4",
-    "@dxos/async": "0.7.4",
-    "@dxos/chain": "0.7.4",
-    "@dxos/context": "0.7.4",
-    "@dxos/echo-db": "0.7.4",
-    "@dxos/echo-schema": "0.7.4",
-    "@dxos/functions": "0.7.4",
-    "@dxos/invariant": "0.7.4",
-    "@dxos/keys": "0.7.4",
-    "@dxos/live-object": "0.7.4",
-    "@dxos/log": "0.7.4",
-    "@dxos/plugin-chess": "0.7.4",
-    "@dxos/plugin-client": "0.7.4",
-    "@dxos/plugin-deck": "0.7.4",
-    "@dxos/plugin-graph": "0.7.4",
-    "@dxos/plugin-inbox": "0.7.4",
-    "@dxos/plugin-ipfs": "0.7.4",
-    "@dxos/plugin-script": "0.7.4",
-    "@dxos/plugin-markdown": "0.7.4",
-    "@dxos/plugin-sketch": "0.7.4",
-    "@dxos/plugin-space": "0.7.4",
-    "@dxos/plugin-stack": "0.7.4",
-    "@dxos/react-client": "0.7.4",
-    "@dxos/react-ui-editor": "0.7.4",
-    "@dxos/react-ui-form": "0.7.4",
-    "@dxos/react-ui-list": "0.7.4",
-    "@dxos/react-ui-syntax-highlighter": "0.7.4",
-    "@dxos/schema": "0.7.4",
-    "@dxos/util": "0.7.4"
+    "@dxos/app-framework": "0.7.5-labs.5f04cf6",
+    "@dxos/artifact": "0.7.5-labs.5f04cf6",
+    "@dxos/assistant": "0.7.5-labs.5f04cf6",
+    "@dxos/async": "0.7.5-labs.5f04cf6",
+    "@dxos/compute": "0.7.5-labs.5f04cf6",
+    "@dxos/conductor": "0.7.5-labs.5f04cf6",
+    "@dxos/echo-schema": "0.7.5-labs.5f04cf6",
+    "@dxos/context": "0.7.5-labs.5f04cf6",
+    "@dxos/echo-db": "0.7.5-labs.5f04cf6",
+    "@dxos/edge-client": "0.7.5-labs.5f04cf6",
+    "@dxos/functions": "0.7.5-labs.5f04cf6",
+    "@dxos/invariant": "0.7.5-labs.5f04cf6",
+    "@dxos/keys": "0.7.5-labs.5f04cf6",
+    "@dxos/live-object": "0.7.5-labs.5f04cf6",
+    "@dxos/log": "0.7.5-labs.5f04cf6",
+    "@dxos/plugin-client": "0.7.5-labs.5f04cf6",
+    "@dxos/plugin-deck": "0.7.5-labs.5f04cf6",
+    "@dxos/plugin-inbox": "0.7.5-labs.5f04cf6",
+    "@dxos/plugin-graph": "0.7.5-labs.5f04cf6",
+    "@dxos/plugin-markdown": "0.7.5-labs.5f04cf6",
+    "@dxos/plugin-sketch": "0.7.5-labs.5f04cf6",
+    "@dxos/plugin-stack": "0.7.5-labs.5f04cf6",
+    "@dxos/plugin-wnfs": "0.7.5-labs.5f04cf6",
+    "@dxos/react-client": "0.7.5-labs.5f04cf6",
+    "@dxos/plugin-space": "0.7.5-labs.5f04cf6",
+    "@dxos/react-edge-client": "0.7.5-labs.5f04cf6",
+    "@dxos/react-ui-canvas-compute": "0.7.5-labs.5f04cf6",
+    "@dxos/react-ui-canvas-editor": "0.7.5-labs.5f04cf6",
+    "@dxos/plugin-script": "0.7.5-labs.5f04cf6",
+    "@dxos/react-ui-form": "0.7.5-labs.5f04cf6",
+    "@dxos/react-ui-editor": "0.7.5-labs.5f04cf6",
+    "@dxos/react-ui-sfx": "0.7.5-labs.5f04cf6",
+    "@dxos/react-ui-stack": "0.7.5-labs.5f04cf6",
+    "@dxos/react-ui-syntax-highlighter": "0.7.5-labs.5f04cf6",
+    "@dxos/react-ui-list": "0.7.5-labs.5f04cf6",
+    "@dxos/schema": "0.7.5-labs.5f04cf6",
+    "@dxos/util": "0.7.5-labs.5f04cf6"
   },
   "devDependencies": {
-    "@phosphor-icons/react": "^2.1.5",
     "@types/lodash.get": "^4.4.7",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.7.4",
-    "@dxos/echo-db": "0.7.4",
-    "@dxos/react-ui": "0.7.4",
-    "@dxos/react-ui-theme": "0.7.4",
-    "@dxos/storybook-utils": "0.7.4"
+    "@dxos/artifact-testing": "0.7.5-labs.5f04cf6",
+    "@dxos/echo-db": "0.7.5-labs.5f04cf6",
+    "@dxos/plugin-map": "0.7.5-labs.5f04cf6",
+    "@dxos/plugin-chess": "0.7.5-labs.5f04cf6",
+    "@dxos/random": "0.7.5-labs.5f04cf6",
+    "@dxos/react-ui": "0.7.5-labs.5f04cf6",
+    "@dxos/storybook-utils": "0.7.5-labs.5f04cf6",
+    "@dxos/react-ui-theme": "0.7.5-labs.5f04cf6"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.7.4",
-    "@dxos/react-ui-theme": "0.7.4"
+    "@dxos/react-ui": "0.7.5-labs.5f04cf6",
+    "@dxos/react-ui-theme": "0.7.5-labs.5f04cf6"
   },
   "publishConfig": {
     "access": "public"

package/src/AutomationPlugin.tsx

@@ -2,207 +2,98 @@
 // Copyright 2023 DXOS.org
 //
 
-import React from 'react';
-
-import { parseMetadataResolverPlugin, type PluginDefinition, resolvePlugin } from '@dxos/app-framework';
-import { FunctionTrigger } from '@dxos/functions';
-import { invariant } from '@dxos/invariant';
-import { parseClientPlugin } from '@dxos/plugin-client';
-import { createExtension, toSignal } from '@dxos/plugin-graph';
-import { memoizeQuery } from '@dxos/plugin-space';
 import {
-  getSpace,
-  getTypename,
-  isEchoObject,
-  loadObjectReferences,
-  parseId,
-  SpaceState,
-} from '@dxos/react-client/echo';
-import { translations as formTranslations } from '@dxos/react-ui-form';
+  Capabilities,
+  contributes,
+  createIntent,
+  defineModule,
+  definePlugin,
+  Events,
+  oneOf,
+} 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 { AssistantPanel, AutomationPanel } from './components';
-import meta, { AUTOMATION_PLUGIN } from './meta';
+import { AiClient, AppGraphBuilder, IntentResolver, ReactSurface } from './capabilities';
+import { AUTOMATION_PLUGIN, meta } from './meta';
 import translations from './translations';
-import { type AutomationPluginProvides, ChainPromptType, ChainType } from './types';
+import { AutomationAction, ChainPromptType, ChainType, GptChatType } from './types';
 
-export const AutomationPlugin = (): PluginDefinition<AutomationPluginProvides> => {
-  return {
-    meta,
-    provides: {
-      metadata: {
-        records: {
-          [ChainType.typename]: {
+// TODO(wittjosiah): Rename to AssistantPlugin?
+export const AutomationPlugin = () =>
+  definePlugin(meta, [
+    defineModule({
+      id: `${meta.id}/module/ai-client`,
+      activatesOn: ClientEvents.ClientReady,
+      activate: AiClient,
+    }),
+    defineModule({
+      id: `${meta.id}/module/translations`,
+      activatesOn: Events.SetupTranslations,
+      activate: () => contributes(Capabilities.Translations, translations),
+    }),
+    defineModule({
+      id: `${meta.id}/module/metadata`,
+      activatesOn: oneOf(Events.Startup, Events.SetupAppGraph),
+      activate: () => [
+        contributes(Capabilities.Metadata, {
+          id: ChainType.typename,
+          metadata: {
             placeholder: ['object placeholder', { ns: AUTOMATION_PLUGIN }],
             icon: 'ph--magic-wand--regular',
             // TODO(wittjosiah): Move out of metadata.
-            loadReferences: (chain: ChainType) => loadObjectReferences(chain, (chain) => chain.prompts),
-          },
-        },
-      },
-      translations: [...translations, ...formTranslations],
-      echo: {
-        system: [ChainType, ChainPromptType, FunctionTrigger],
-      },
-      complementary: {
-        panels: [
-          {
-            id: 'automation',
-            label: ['open automation panel label', { ns: AUTOMATION_PLUGIN }],
-            icon: 'ph--magic-wand--regular',
+            loadReferences: async (chain: ChainType) => await RefArray.loadAll(chain.prompts ?? []),
           },
-          {
-            id: 'assistant',
-            label: ['open assistant panel label', { ns: AUTOMATION_PLUGIN }],
+        }),
+        contributes(Capabilities.Metadata, {
+          id: GptChatType.typename,
+          metadata: {
+            createObject: (props: { name?: string }) => createIntent(AutomationAction.Create, props),
+            placeholder: ['object placeholder', { ns: AUTOMATION_PLUGIN }],
             icon: 'ph--atom--regular',
           },
-        ],
-      },
-      graph: {
-        builder: (plugins) => {
-          const clientPlugin = resolvePlugin(plugins, parseClientPlugin);
-          const metadataPlugin = resolvePlugin(plugins, parseMetadataResolverPlugin);
-          const resolve = metadataPlugin?.provides.metadata.resolver;
-          const client = clientPlugin?.provides.client;
-          invariant(resolve);
-          invariant(client);
-
-          return [
-            // Create nodes for object settings.
-            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 [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,
-                    },
-                  };
-                }
-
-                const [object] = memoizeQuery(space, { id: objectId });
-                if (!object || !subjectId) {
-                  return;
-                }
-
-                const meta = resolve(getTypename(object) ?? '');
-                const label = meta.label?.(object) ||
-                  object.name ||
-                  meta.placeholder || ['unnamed object settings label', { ns: AUTOMATION_PLUGIN }];
-
-                return {
-                  id,
-                  type,
-                  data: null,
-                  properties: {
-                    icon,
-                    label,
-                    object,
-                  },
-                };
-              },
-            }),
-            createExtension({
-              id: `${AUTOMATION_PLUGIN}/assistant-for-subject`,
-              resolver: ({ id }) => {
-                // TODO(Zan): Find util (or make one). Effect schema!!
-                if (!id.endsWith('~assistant')) {
-                  return;
-                }
-
-                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,
-                  },
-                };
-              },
-            }),
-          ];
-        },
-      },
-      surface: {
-        component: ({ data, role }) => {
-          switch (role) {
-            case 'complementary--assistant':
-              return <AssistantPanel subject={data.subject as any} />;
-            case 'complementary--automation': {
-              const object = data.subject;
-              const space = isEchoObject(object) ? getSpace(object) : undefined;
-              if (space) {
-                invariant(isEchoObject(object));
-                return <AutomationPanel space={space} object={object} />;
-              }
-              break;
-            }
-          }
-
-          return null;
-        },
-      },
-      intent: {
-        resolver: (intent) => {},
-      },
-    },
-  };
-};
+        }),
+      ],
+    }),
+    defineModule({
+      id: `${meta.id}/module/schema`,
+      activatesOn: ClientEvents.SetupClient,
+      activate: () => [
+        contributes(ClientCapabilities.SystemSchema, [ChainType, ChainPromptType, FunctionTrigger]),
+        contributes(ClientCapabilities.Schema, [GptChatType]),
+      ],
+    }),
+    defineModule({
+      id: `${meta.id}/module/complementary-panels`,
+      activatesOn: Events.Startup,
+      activate: () => [
+        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',
+        }),
+      ],
+    }),
+    defineModule({
+      id: `${meta.id}/module/react-surface`,
+      activatesOn: Events.Startup,
+      activate: ReactSurface,
+    }),
+    defineModule({
+      id: `${meta.id}/module/app-graph-builder`,
+      activatesOn: Events.SetupAppGraph,
+      activate: AppGraphBuilder,
+    }),
+    defineModule({
+      id: `${meta.id}/module/intent-resolver`,
+      activatesOn: Events.SetupIntents,
+      activate: IntentResolver,
+    }),
+  ]);