@dxos/plugin-thread 0.7.5-main.2567c87 → 0.7.5-main.5ae2ba8

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAKhF,yBAAiB,YAAY,CAAC;;;;;;;;;;;;;IAG5B,MAAM,OAAO,MAAO,SAAQ,WAS1B;KAAG;;;;;;;;;;IAEL,MAAM,OAAO,MAAO,SAAQ,WAM1B;KAAG;;;;;;;;;IAEL,MAAM,OAAO,cAAe,SAAQ,mBAKlC;KAAG;;;;;;;;;;;IAEL,MAAM,OAAO,MAAO,SAAQ,WAO1B;KAAG;;;;;;;;;;IAGL,MAAM,OAAO,YAAa,SAAQ,iBAMhC;KAAG;;;;;;;;;;;;;IAEL,MAAM,OAAO,aAAc,SAAQ,kBASjC;KAAG;;CACN;AAED,eAAO,MAAM,oBAAoB;;GAIhC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAE7E,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,UAAU,CAAC;CAClB;AAED,KAAK,SAAS,GAAG,MAAM,CAAC;AACxB,MAAM,MAAM,SAAS,GAAG;IAAE,mBAAmB,EAAE,OAAO,CAAA;CAAE,CAAC;AACzD,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AAErD,MAAM,MAAM,WAAW,GAAG;IACxB,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAKhF,yBAAiB,YAAY,CAAC;;;;;;;;;;;;;IAG5B,MAAM,OAAO,MAAO,SAAQ,WAS1B;KAAG;;;;;;;;;;IAEL,MAAM,OAAO,MAAO,SAAQ,WAM1B;KAAG;;;;;;;;;IAEL,MAAM,OAAO,cAAe,SAAQ,mBAKlC;KAAG;;;;;;;;;;;IAEL,MAAM,OAAO,MAAO,SAAQ,WAO1B;KAAG;;;;;;;;;;IAGL,MAAM,OAAO,YAAa,SAAQ,iBAMhC;KAAG;;;;;;;;;;;;;IAEL,MAAM,OAAO,aAAc,SAAQ,kBASjC;KAAG;;CACN;AAED,eAAO,MAAM,oBAAoB,yBAA0B,CAAC;AAE5D,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,oBAAoB,CAAC,CAAC;AAE7E,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,UAAU,CAAC;CAClB;AAED,KAAK,SAAS,GAAG,MAAM,CAAC;AACxB,MAAM,MAAM,SAAS,GAAG;IAAE,mBAAmB,EAAE,OAAO,CAAA;CAAE,CAAC;AACzD,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;AAErD,MAAM,MAAM,WAAW,GAAG;IACxB,+BAA+B;IAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC9B,CAAC"}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@dxos/plugin-thread",
-  "version": "0.7.5-main.2567c87",
+  "version": "0.7.5-main.5ae2ba8",
   "description": "DXOS Threads Surface 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",
@@ -38,29 +39,29 @@
     "@preact/signals-core": "^1.6.0",
     "date-fns": "^3.3.1",
     "lodash.get": "^4.4.2",
-    "@dxos/app-framework": "0.7.5-main.2567c87",
-    "@dxos/async": "0.7.5-main.2567c87",
-    "@dxos/echo-schema": "0.7.5-main.2567c87",
-    "@dxos/display-name": "0.7.5-main.2567c87",
-    "@dxos/live-object": "0.7.5-main.2567c87",
-    "@dxos/invariant": "0.7.5-main.2567c87",
-    "@dxos/log": "0.7.5-main.2567c87",
-    "@dxos/local-storage": "0.7.5-main.2567c87",
-    "@dxos/plugin-attention": "0.7.5-main.2567c87",
-    "@dxos/plugin-client": "0.7.5-main.2567c87",
-    "@dxos/plugin-graph": "0.7.5-main.2567c87",
-    "@dxos/plugin-deck": "0.7.5-main.2567c87",
-    "@dxos/plugin-markdown": "0.7.5-main.2567c87",
-    "@dxos/plugin-observability": "0.7.5-main.2567c87",
-    "@dxos/plugin-space": "0.7.5-main.2567c87",
-    "@dxos/react-client": "0.7.5-main.2567c87",
-    "@dxos/react-ui-attention": "0.7.5-main.2567c87",
-    "@dxos/react-ui-editor": "0.7.5-main.2567c87",
-    "@dxos/react-ui-form": "0.7.5-main.2567c87",
-    "@dxos/react-ui-mosaic": "0.7.5-main.2567c87",
-    "@dxos/react-ui-stack": "0.7.5-main.2567c87",
-    "@dxos/util": "0.7.5-main.2567c87",
-    "@dxos/react-ui-thread": "0.7.5-main.2567c87"
+    "@dxos/app-framework": "0.7.5-main.5ae2ba8",
+    "@dxos/async": "0.7.5-main.5ae2ba8",
+    "@dxos/echo-schema": "0.7.5-main.5ae2ba8",
+    "@dxos/live-object": "0.7.5-main.5ae2ba8",
+    "@dxos/invariant": "0.7.5-main.5ae2ba8",
+    "@dxos/display-name": "0.7.5-main.5ae2ba8",
+    "@dxos/log": "0.7.5-main.5ae2ba8",
+    "@dxos/local-storage": "0.7.5-main.5ae2ba8",
+    "@dxos/plugin-attention": "0.7.5-main.5ae2ba8",
+    "@dxos/plugin-client": "0.7.5-main.5ae2ba8",
+    "@dxos/plugin-deck": "0.7.5-main.5ae2ba8",
+    "@dxos/plugin-graph": "0.7.5-main.5ae2ba8",
+    "@dxos/plugin-markdown": "0.7.5-main.5ae2ba8",
+    "@dxos/plugin-observability": "0.7.5-main.5ae2ba8",
+    "@dxos/plugin-space": "0.7.5-main.5ae2ba8",
+    "@dxos/react-client": "0.7.5-main.5ae2ba8",
+    "@dxos/react-ui-editor": "0.7.5-main.5ae2ba8",
+    "@dxos/react-ui-form": "0.7.5-main.5ae2ba8",
+    "@dxos/react-ui-attention": "0.7.5-main.5ae2ba8",
+    "@dxos/react-ui-stack": "0.7.5-main.5ae2ba8",
+    "@dxos/react-ui-tabs": "0.7.5-main.5ae2ba8",
+    "@dxos/util": "0.7.5-main.5ae2ba8",
+    "@dxos/react-ui-thread": "0.7.5-main.5ae2ba8"
   },
   "devDependencies": {
     "@phosphor-icons/react": "^2.1.5",
@@ -70,17 +71,17 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.7.5-main.2567c87",
-    "@dxos/react-ui": "0.7.5-main.2567c87",
-    "@dxos/react-ui-theme": "0.7.5-main.2567c87",
-    "@dxos/storybook-utils": "0.7.5-main.2567c87"
+    "@dxos/random": "0.7.5-main.5ae2ba8",
+    "@dxos/react-ui-theme": "0.7.5-main.5ae2ba8",
+    "@dxos/react-ui": "0.7.5-main.5ae2ba8",
+    "@dxos/storybook-utils": "0.7.5-main.5ae2ba8"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui-theme": "0.7.5-main.2567c87",
-    "@dxos/react-ui": "0.7.5-main.2567c87"
+    "@dxos/react-ui": "0.7.5-main.5ae2ba8",
+    "@dxos/react-ui-theme": "0.7.5-main.5ae2ba8"
   },
   "publishConfig": {
     "access": "public"

package/src/ThreadPlugin.tsx

@@ -2,40 +2,36 @@
 // Copyright 2023 DXOS.org
 //
 
-import {
-  allOf,
-  Capabilities,
-  contributes,
-  createIntent,
-  defineModule,
-  definePlugin,
-  Events,
-  oneOf,
-  type PluginsContext,
-} from '@dxos/app-framework';
+import { Capabilities, contributes, createIntent, defineModule, definePlugin, Events } from '@dxos/app-framework';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { DeckCapabilities } from '@dxos/plugin-deck';
-import { ChannelType, MessageType, ThreadType } from '@dxos/plugin-space/types';
+import { DeckCapabilities, DeckEvents } from '@dxos/plugin-deck';
+import { MarkdownEvents } from '@dxos/plugin-markdown';
+import { SpaceCapabilities, ThreadEvents } from '@dxos/plugin-space';
+import { ChannelType, defineObjectForm, MessageType, ThreadType } from '@dxos/plugin-space/types';
 import { type ReactiveEchoObject, RefArray } from '@dxos/react-client/echo';
 import { translations as threadTranslations } from '@dxos/react-ui-thread';
 
-import { AppGraphBuilder, IntentResolver, Markdown, ReactSurface, ThreadSettings, ThreadState } from './capabilities';
+import { IntentResolver, Markdown, ReactSurface, ThreadState } from './capabilities';
 import { meta, THREAD_ITEM, THREAD_PLUGIN } from './meta';
 import translations from './translations';
-import { ThreadAction, type ThreadSettingsProps } from './types';
+import { ThreadAction } from './types';
 
 // TODO(Zan): Every instance of `cursor` should be replaced with `anchor`.
 //  NOTE(burdon): Review/discuss CursorConverter semantics.
 export const ThreadPlugin = () =>
   definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/settings`,
-      activatesOn: Events.SetupSettings,
-      activate: ThreadSettings,
-    }),
+    // TODO(wittjosiah): Currently not used but leaving because there will likely be settings for threads again.
+    // defineModule({
+    //   id: `${meta.id}/module/settings`,
+    //   activatesOn: Events.SetupSettings,
+    //   activate: ThreadSettings,
+    // }),
     defineModule({
       id: `${meta.id}/module/state`,
-      activatesOn: Events.Startup,
+      // TODO(wittjosiah): Does not integrate with settings store.
+      //   Should this be a different event?
+      //   Should settings store be renamed to be more generic?
+      activatesOn: Events.SetupSettings,
       activate: ThreadState,
     }),
     defineModule({
@@ -45,12 +41,11 @@ export const ThreadPlugin = () =>
     }),
     defineModule({
       id: `${meta.id}/module/metadata`,
-      activatesOn: oneOf(Events.Startup, Events.SetupAppGraph),
+      activatesOn: Events.SetupMetadata,
       activate: () => [
         contributes(Capabilities.Metadata, {
           id: ChannelType.typename,
           metadata: {
-            createObject: (props: { name?: string }) => createIntent(ThreadAction.Create, props),
             placeholder: ['channel name placeholder', { ns: THREAD_PLUGIN }],
             icon: 'ph--chat--regular',
             // TODO(wittjosiah): Move out of metadata.
@@ -89,55 +84,56 @@ export const ThreadPlugin = () =>
       ],
     }),
     defineModule({
-      id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.SetupClient,
-      activate: () => contributes(ClientCapabilities.SystemSchema, [ThreadType, MessageType]),
+      id: `${meta.id}/module/object-form`,
+      activatesOn: ClientEvents.SetupSchema,
+      activate: () =>
+        contributes(
+          SpaceCapabilities.ObjectForm,
+          defineObjectForm({
+            objectSchema: ChannelType,
+            getIntent: () => createIntent(ThreadAction.Create),
+          }),
+        ),
     }),
     defineModule({
-      id: `${meta.id}/module/channel-schema`,
-      activatesOn: allOf(Events.SettingsReady, ClientEvents.ClientReady),
-      activate: (context: PluginsContext) => {
-        const client = context.requestCapability(ClientCapabilities.Client);
-        const settings = context
-          .requestCapability(Capabilities.SettingsStore)
-          .getStore<ThreadSettingsProps>(THREAD_PLUGIN)!.value;
-        if (settings.standalone) {
-          // TODO(wittjosiah): Requires reload to disable.
-          client.addTypes([ChannelType]);
-          return contributes(ClientCapabilities.Schema, [ChannelType]);
-        }
-
-        return [];
-      },
+      id: `${meta.id}/module/schema`,
+      activatesOn: ClientEvents.SetupSchema,
+      activate: () => contributes(ClientCapabilities.Schema, [ThreadType, MessageType]),
     }),
     defineModule({
       id: `${meta.id}/module/complementary-panel`,
-      activatesOn: Events.Startup,
+      activatesOn: DeckEvents.SetupComplementaryPanels,
       activate: () =>
         contributes(DeckCapabilities.ComplementaryPanel, {
           id: 'comments',
           label: ['comments panel label', { ns: THREAD_PLUGIN }],
           icon: 'ph--chat-text--regular',
+          position: 'hoist',
+          // TODO(wittjosiah): Support comments on any object.
+          // filter: (node) => isEchoObject(node.data) && !!getSpace(node.data),
+          filter: (node) =>
+            !!node.data &&
+            typeof node.data === 'object' &&
+            'threads' in node.data &&
+            Array.isArray(node.data.threads) &&
+            !(node.data instanceof ChannelType),
         }),
     }),
     defineModule({
       id: `${meta.id}/module/markdown`,
-      activatesOn: Events.Startup,
+      activatesOn: MarkdownEvents.SetupExtensions,
       activate: Markdown,
     }),
     defineModule({
       id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.Startup,
+      activatesOn: Events.SetupReactSurface,
+      // TODO(wittjosiah): Should occur before the comments thread is loaded when surfaces activation is more granular.
+      activatesBefore: [ThreadEvents.SetupThread],
       activate: ReactSurface,
     }),
     defineModule({
       id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntents,
+      activatesOn: Events.SetupIntentResolver,
       activate: IntentResolver,
     }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
   ]);

package/src/capabilities/index.ts

@@ -4,7 +4,6 @@
 
 import { lazy } from '@dxos/app-framework';
 
-export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
 export const IntentResolver = lazy(() => import('./intent-resolver'));
 export const Markdown = lazy(() => import('./markdown'));
 export const ReactSurface = lazy(() => import('./react-surface'));

package/src/capabilities/intent-resolver.ts

@@ -8,7 +8,6 @@ import {
   createIntent,
   createResolver,
   LayoutAction,
-  NavigationAction,
   type PluginsContext,
 } from '@dxos/app-framework';
 import { Ref } from '@dxos/echo-schema';
@@ -23,201 +22,218 @@ import { ThreadAction } from '../types';
 
 export default (context: PluginsContext) =>
   contributes(Capabilities.IntentResolver, [
-    createResolver(ThreadAction.Create, ({ name, cursor, subject }) => {
-      if (cursor && subject) {
-        // Seed the threads array if it does not exist.
-        if (subject?.threads === undefined) {
-          try {
-            // Static schema will throw an error if subject does not support threads array property.
-            subject.threads = [];
-          } catch (err) {
-            log.error('Subject does not support threads array', { typename: subject?.typename });
-            return;
+    createResolver({
+      intent: ThreadAction.Create,
+      resolve: ({ name, cursor, subject }) => {
+        if (cursor && subject) {
+          // Seed the threads array if it does not exist.
+          if (subject?.threads === undefined) {
+            try {
+              // Static schema will throw an error if subject does not support threads array property.
+              subject.threads = [];
+            } catch (err) {
+              log.error('Subject does not support threads array', { typename: subject?.typename });
+              return;
+            }
           }
-        }
 
-        const { state } = context.requestCapability(ThreadCapabilities.MutableState);
-        const subjectId = fullyQualifiedId(subject);
-        const thread = create(ThreadType, { name, anchor: cursor, messages: [], status: 'staged' });
-        const draft = state.drafts[subjectId];
-        if (draft) {
-          draft.push(thread);
+          const { state } = context.requestCapability(ThreadCapabilities.MutableState);
+          const subjectId = fullyQualifiedId(subject);
+          const thread = create(ThreadType, { name, anchor: cursor, messages: [], status: 'staged' });
+          const draft = state.drafts[subjectId];
+          if (draft) {
+            draft.push(thread);
+          } else {
+            state.drafts[subjectId] = [thread];
+          }
+
+          return {
+            data: { object: thread },
+            intents: [
+              createIntent(ThreadAction.Select, { current: fullyQualifiedId(thread) }),
+              createIntent(LayoutAction.UpdateComplementary, { part: 'complementary', subject: 'comments' }),
+            ],
+          };
         } else {
-          state.drafts[subjectId] = [thread];
+          // TODO(wittjosiah): Create separate intent for channel creation.
+          return {
+            data: { object: create(ChannelType, { threads: [makeRef(create(ThreadType, { messages: [] }))] }) },
+          };
         }
+      },
+    }),
+    createResolver({
+      intent: ThreadAction.Select,
+      resolve: ({ current, skipOpen }) => {
+        const { state } = context.requestCapability(ThreadCapabilities.MutableState);
+        state.current = current;
 
         return {
-          data: { object: thread },
-          intents: [
-            createIntent(ThreadAction.Select, { current: fullyQualifiedId(thread) }),
-            createIntent(NavigationAction.Open, { activeParts: { complementary: 'comments' } }),
-            createIntent(LayoutAction.SetLayout, { element: 'complementary', state: true }),
-          ],
-        };
-      } else {
-        // NOTE: This is the standalone thread creation case.
-        return {
-          data: { object: create(ChannelType, { threads: [makeRef(create(ThreadType, { messages: [] }))] }) },
+          intents: !skipOpen
+            ? [createIntent(LayoutAction.UpdateComplementary, { part: 'complementary', subject: 'comments' })]
+            : undefined,
         };
-      }
-    }),
-    createResolver(ThreadAction.Select, ({ current, skipOpen }) => {
-      const { state } = context.requestCapability(ThreadCapabilities.MutableState);
-      state.current = current;
-
-      return {
-        intents: !skipOpen
-          ? [createIntent(NavigationAction.Open, { activeParts: { complementary: 'comments' } })]
-          : undefined,
-      };
-    }),
-    createResolver(ThreadAction.ToggleResolved, ({ thread }) => {
-      if (thread.status === 'active' || thread.status === undefined) {
-        thread.status = 'resolved';
-      } else if (thread.status === 'resolved') {
-        thread.status = 'active';
-      }
-
-      const space = getSpace(thread);
-      const spaceId = space?.id;
-
-      return {
-        intents: [
-          createIntent(ObservabilityAction.SendEvent, {
-            name: 'threads.toggle-resolved',
-            properties: { threadId: thread.id, spaceId },
-          }),
-        ],
-      };
+      },
     }),
-    createResolver(ThreadAction.Delete, ({ subject, thread }, undo) => {
-      const { state } = context.requestCapability(ThreadCapabilities.MutableState);
-      const subjectId = fullyQualifiedId(subject);
-      const draft = state.drafts[subjectId];
-      if (draft) {
-        // Check if we're deleting a draft; if so, remove it.
-        const index = draft.findIndex((t) => t.id === thread.id);
-        if (index !== -1) {
-          draft.splice(index, 1);
-          return;
-        }
-      }
-
-      const space = getSpace(thread);
-      if (!space || !subject.threads) {
-        return;
-      }
-
-      if (!undo) {
-        const index = subject.threads.findIndex((t: any) => t?.id === thread.id);
-        const cursor = subject.threads[index]?.anchor;
-        if (index !== -1) {
-          subject.threads?.splice(index, 1);
+    createResolver({
+      intent: ThreadAction.ToggleResolved,
+      resolve: ({ thread }) => {
+        if (thread.status === 'active' || thread.status === undefined) {
+          thread.status = 'resolved';
+        } else if (thread.status === 'resolved') {
+          thread.status = 'active';
         }
 
-        space.db.remove(thread);
+        const space = getSpace(thread);
+        const spaceId = space?.id;
 
         return {
-          undoable: {
-            message: ['thread deleted label', { ns: THREAD_PLUGIN }],
-            data: { cursor },
-          },
           intents: [
             createIntent(ObservabilityAction.SendEvent, {
-              name: 'threads.delete',
-              properties: { threadId: thread.id, spaceId: space.id },
+              name: 'threads.toggle-resolved',
+              properties: { threadId: thread.id, spaceId },
             }),
           ],
         };
-      } else {
-        // TODO(wittjosiah): SDK should do this automatically.
-        const savedThread = space.db.add(thread);
-        subject.threads.push(savedThread);
+      },
+    }),
+    createResolver({
+      intent: ThreadAction.Delete,
+      resolve: ({ subject, thread }, undo) => {
+        const { state } = context.requestCapability(ThreadCapabilities.MutableState);
+        const subjectId = fullyQualifiedId(subject);
+        const draft = state.drafts[subjectId];
+        if (draft) {
+          // Check if we're deleting a draft; if so, remove it.
+          const index = draft.findIndex((t) => t.id === thread.id);
+          if (index !== -1) {
+            draft.splice(index, 1);
+            return;
+          }
+        }
 
-        return {
-          intents: [
+        const space = getSpace(thread);
+        if (!space || !subject.threads) {
+          return;
+        }
+
+        if (!undo) {
+          const index = subject.threads.findIndex((t: any) => t?.id === thread.id);
+          const cursor = subject.threads[index]?.anchor;
+          if (index !== -1) {
+            subject.threads?.splice(index, 1);
+          }
+
+          space.db.remove(thread);
+
+          return {
+            undoable: {
+              message: ['thread deleted label', { ns: THREAD_PLUGIN }],
+              data: { cursor },
+            },
+            intents: [
+              createIntent(ObservabilityAction.SendEvent, {
+                name: 'threads.delete',
+                properties: { threadId: thread.id, spaceId: space.id },
+              }),
+            ],
+          };
+        } else {
+          // TODO(wittjosiah): SDK should do this automatically.
+          const savedThread = space.db.add(thread);
+          subject.threads.push(savedThread);
+
+          return {
+            intents: [
+              createIntent(ObservabilityAction.SendEvent, {
+                name: 'threads.undo-delete',
+                properties: { threadId: thread.id, spaceId: space.id },
+              }),
+            ],
+          };
+        }
+      },
+    }),
+    createResolver({
+      intent: ThreadAction.OnMessageAdd,
+      resolve: ({ thread, subject }) => {
+        const { state } = context.requestCapability(ThreadCapabilities.MutableState);
+        const subjectId = fullyQualifiedId(subject);
+        const space = getSpace(subject);
+        const intents = [];
+        const analyticsProperties = { threadId: thread.id, spaceId: space?.id };
+
+        if (state.drafts[subjectId]?.find((t) => t === thread)) {
+          // Move draft to document.
+          thread.status = 'active';
+          subject.threads ? subject.threads.push(makeRef(thread)) : (subject.threads = [makeRef(thread)]);
+          state.drafts[subjectId] = state.drafts[subjectId]?.filter(({ id }) => id !== thread.id);
+          intents.push(
             createIntent(ObservabilityAction.SendEvent, {
-              name: 'threads.undo-delete',
-              properties: { threadId: thread.id, spaceId: space.id },
+              name: 'threads.thread-created',
+              properties: analyticsProperties,
             }),
-          ],
-        };
-      }
-    }),
-    createResolver(ThreadAction.OnMessageAdd, ({ thread, subject }) => {
-      const { state } = context.requestCapability(ThreadCapabilities.MutableState);
-      const subjectId = fullyQualifiedId(subject);
-      const space = getSpace(subject);
-      const intents = [];
-      const analyticsProperties = { threadId: thread.id, spaceId: space?.id };
-
-      if (state.drafts[subjectId]?.find((t) => t === thread)) {
-        // Move draft to document.
-        thread.status = 'active';
-        subject.threads ? subject.threads.push(makeRef(thread)) : (subject.threads = [makeRef(thread)]);
-        state.drafts[subjectId] = state.drafts[subjectId]?.filter(({ id }) => id !== thread.id);
+          );
+        }
+
         intents.push(
           createIntent(ObservabilityAction.SendEvent, {
-            name: 'threads.thread-created',
-            properties: analyticsProperties,
+            name: 'threads.message-added',
+            properties: { ...analyticsProperties, threadLength: thread.messages.length },
           }),
         );
-      }
 
-      intents.push(
-        createIntent(ObservabilityAction.SendEvent, {
-          name: 'threads.message-added',
-          properties: { ...analyticsProperties, threadLength: thread.messages.length },
-        }),
-      );
-
-      return { intents };
+        return { intents };
+      },
     }),
-    createResolver(ThreadAction.DeleteMessage, ({ subject, thread, messageId, message, messageIndex }, undo) => {
-      const space = getSpace(subject);
+    createResolver({
+      intent: ThreadAction.DeleteMessage,
+      resolve: ({ subject, thread, messageId, message, messageIndex }, undo) => {
+        const space = getSpace(subject);
+
+        if (!undo) {
+          const messageIndex = thread.messages.findIndex(Ref.hasObjectId(messageId));
+          const message = thread.messages[messageIndex]?.target;
+          if (!message) {
+            return;
+          }
 
-      if (!undo) {
-        const messageIndex = thread.messages.findIndex(Ref.hasObjectId(messageId));
-        const message = thread.messages[messageIndex]?.target;
-        if (!message) {
-          return;
-        }
+          if (messageIndex === 0 && thread.messages.length === 1) {
+            // If the message is the only message in the thread, delete the thread.
+            return {
+              intents: [createIntent(ThreadAction.Delete, { subject, thread })],
+            };
+          } else {
+            thread.messages.splice(messageIndex, 1);
+          }
 
-        if (messageIndex === 0 && thread.messages.length === 1) {
-          // If the message is the only message in the thread, delete the thread.
           return {
-            intents: [createIntent(ThreadAction.Delete, { subject, thread })],
+            undoable: {
+              message: ['message deleted label', { ns: THREAD_PLUGIN }],
+              data: { message, messageIndex },
+            },
+            intents: [
+              createIntent(ObservabilityAction.SendEvent, {
+                name: 'threads.message.delete',
+                properties: { threadId: thread.id, spaceId: space?.id },
+              }),
+            ],
           };
         } else {
-          thread.messages.splice(messageIndex, 1);
-        }
+          if (!messageIndex || !message) {
+            return;
+          }
 
-        return {
-          undoable: {
-            message: ['message deleted label', { ns: THREAD_PLUGIN }],
-            data: { message, messageIndex },
-          },
-          intents: [
-            createIntent(ObservabilityAction.SendEvent, {
-              name: 'threads.message.delete',
-              properties: { threadId: thread.id, spaceId: space?.id },
-            }),
-          ],
-        };
-      } else {
-        if (!messageIndex || !message) {
-          return;
+          thread.messages.splice(messageIndex, 0, makeRef(message));
+          return {
+            intents: [
+              createIntent(ObservabilityAction.SendEvent, {
+                name: 'threads.message.undo-delete',
+                properties: { threadId: thread.id, spaceId: space?.id },
+              }),
+            ],
+          };
         }
-
-        thread.messages.splice(messageIndex, 0, makeRef(message));
-        return {
-          intents: [
-            createIntent(ObservabilityAction.SendEvent, {
-              name: 'threads.message.undo-delete',
-              properties: { threadId: thread.id, spaceId: space?.id },
-            }),
-          ],
-        };
-      }
+      },
     }),
   ]);