@dxos/plugin-thread 0.7.4 → 0.7.5-main.499c70c

package/src/components/Chat.stories.tsx

@@ -7,8 +7,8 @@ import '@dxos-theme';
 import { type Meta } from '@storybook/react';
 import React, { useEffect, useState } from 'react';
 
-import { SurfaceProvider } from '@dxos/app-framework';
-import { ThreadType } from '@dxos/plugin-space/types';
+import { createSurface, SurfaceProvider } from '@dxos/app-framework';
+import { MessageType, ThreadType } from '@dxos/plugin-space/types';
 import { faker } from '@dxos/random';
 import { useClient } from '@dxos/react-client';
 import { type Space } from '@dxos/react-client/echo';
@@ -48,10 +48,12 @@ const Story = () => {
   return (
     <SurfaceProvider
       value={{
-        components: {
-          ObjectMessage: ({ role }) => {
-            return <span>{JSON.stringify({ role })}</span>;
-          },
+        surfaces: {
+          ObjectMessage: createSurface({
+            id: 'test',
+            role: 'card',
+            component: ({ role }) => <span>{JSON.stringify({ role })}</span>,
+          }),
         },
       }}
     >
@@ -71,8 +73,8 @@ const meta: Meta = {
   title: 'plugins/plugin-thread/Chat',
   component: Thread,
   // TODO(burdon): Use decorator.
-  render: () => <ClientRepeater component={Story} createIdentity createSpace types={[ThreadType]} />,
-  decorators: [withTheme, withLayout({ fullscreen: true })],
+  render: () => <ClientRepeater component={Story} createIdentity createSpace types={[ThreadType, MessageType]} />,
+  decorators: [withTheme, withLayout({ fullscreen: true, tooltips: true })],
   parameters: { translations },
 };
 

package/src/components/ChatContainer.tsx

@@ -4,16 +4,16 @@
 
 import React, { useLayoutEffect, useMemo, useRef, useState } from 'react';
 
-import { create } from '@dxos/live-object';
+import { Ref } from '@dxos/echo-schema';
+import { create, makeRef, RefArray } from '@dxos/live-object';
 import { MessageType } from '@dxos/plugin-space/types';
-import { fullyQualifiedId, getSpace, useMembers } from '@dxos/react-client/echo';
+import { fullyQualifiedId, getSpace, useMembers, type Expando } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
 import { Icon, ScrollArea, useThemeContext, useTranslation } from '@dxos/react-ui';
 import { createBasicExtensions, createThemeExtensions, listener } from '@dxos/react-ui-editor';
 import { StackItem } from '@dxos/react-ui-stack';
 import { mx } from '@dxos/react-ui-theme';
 import { MessageTextbox, type MessageTextboxProps, Thread, ThreadFooter, threadLayout } from '@dxos/react-ui-thread';
-import { nonNullable } from '@dxos/util';
 
 import { MessageContainer } from './MessageContainer';
 import { command } from './command-extension';
@@ -77,12 +77,14 @@ export const ChatContainer = ({ thread, context, current, autoFocusTextbox }: Th
     }
 
     thread.messages.push(
-      create(MessageType, {
-        sender: { identityKey: identity.identityKey.toHex() },
-        timestamp: new Date().toISOString(),
-        text: messageRef.current,
-        context,
-      }),
+      makeRef(
+        create(MessageType, {
+          sender: { identityKey: identity.identityKey.toHex() },
+          timestamp: new Date().toISOString(),
+          text: messageRef.current,
+          context: makeRef(context as Expando),
+        }),
+      ),
     );
 
     messageRef.current = '';
@@ -93,7 +95,7 @@ export const ChatContainer = ({ thread, context, current, autoFocusTextbox }: Th
   };
 
   const handleDelete = (id: string) => {
-    const messageIndex = thread.messages.filter(nonNullable).findIndex((message) => message.id === id);
+    const messageIndex = thread.messages.findIndex(Ref.hasObjectId(id));
     if (messageIndex !== -1) {
       thread.messages.splice(messageIndex, 1);
     }
@@ -108,7 +110,7 @@ export const ChatContainer = ({ thread, context, current, autoFocusTextbox }: Th
       <ScrollArea.Root classNames='col-span-2'>
         <ScrollArea.Viewport classNames='overflow-anchored after:overflow-anchor after:block after:bs-px after:-mbs-px [&>div]:min-bs-full [&>div]:!grid [&>div]:grid-rows-[1fr_0]'>
           <div role='none' className={mx(threadLayout, 'place-self-end')}>
-            {thread.messages.filter(nonNullable).map((message) => (
+            {RefArray.allResolvedTargets(thread.messages ?? []).map((message) => (
               <MessageContainer key={message.id} message={message} members={members} onDelete={handleDelete} />
             ))}
           </div>

package/src/components/CommentContainer.tsx

@@ -5,7 +5,7 @@
 import { CheckCircle, X } from '@phosphor-icons/react';
 import React, { useCallback, useMemo, useRef, useState } from 'react';
 
-import { create } from '@dxos/live-object';
+import { create, makeRef, RefArray } from '@dxos/live-object';
 import { MessageType } from '@dxos/plugin-space/types';
 import { fullyQualifiedId, getSpace, useMembers } from '@dxos/react-client/echo';
 import { useIdentity } from '@dxos/react-client/halo';
@@ -56,7 +56,7 @@ const ToggleResolvedButton = ({
         </Button>
       </Tooltip.Trigger>
       <Tooltip.Portal>
-        <Tooltip.Content classNames={'z-[21]'}>
+        <Tooltip.Content>
           {label}
           <Tooltip.Arrow />
         </Tooltip.Content>
@@ -82,7 +82,7 @@ const DeleteThreadButton = ({ onDelete }: { onDelete: () => void }) => {
         </Button>
       </Tooltip.Trigger>
       <Tooltip.Portal>
-        <Tooltip.Content classNames='z-[21]'>
+        <Tooltip.Content classNames='z-30'>
           {label}
           <Tooltip.Arrow />
         </Tooltip.Content>
@@ -135,12 +135,14 @@ export const CommentContainer = ({
     }
 
     thread.messages.push(
-      create(MessageType, {
-        sender: { identityKey: identity.identityKey.toHex() },
-        timestamp: new Date().toISOString(),
-        text: messageRef.current,
-        context,
-      }),
+      makeRef(
+        create(MessageType, {
+          sender: { identityKey: identity.identityKey.toHex() },
+          timestamp: new Date().toISOString(),
+          text: messageRef.current,
+          context: context ? makeRef(context) : undefined,
+        }),
+      ),
     );
     onComment?.(thread);
 
@@ -168,7 +170,7 @@ export const CommentContainer = ({
               <ThreadHeading detached>{thread.name}</ThreadHeading>
             </Tooltip.Trigger>
             <Tooltip.Portal>
-              <Tooltip.Content classNames='z-[21]' side='top'>
+              <Tooltip.Content classNames='z-30' side='top'>
                 {t('detached thread label')}
                 <Tooltip.Arrow />
               </Tooltip.Content>
@@ -185,7 +187,8 @@ export const CommentContainer = ({
           {onThreadDelete && <DeleteThreadButton onDelete={onThreadDelete} />}
         </div>
       </div>
-      {thread.messages.filter(nonNullable).map((message) => (
+      {/** TODO(dmaretskyi): How's `thread.messages` undefined? */}
+      {RefArray.allResolvedTargets(thread.messages?.filter(nonNullable) ?? []).map((message) => (
         <MessageContainer
           key={message.id}
           message={message}

package/src/components/MessageContainer.tsx

@@ -7,6 +7,7 @@ import { Check, PencilSimple, X } from '@phosphor-icons/react';
 import React, { forwardRef, useCallback, useEffect, useRef, useState } from 'react';
 
 import { Surface } from '@dxos/app-framework';
+import { RefArray } from '@dxos/live-object';
 import { type MessageType } from '@dxos/plugin-space/types';
 import { PublicKey } from '@dxos/react-client';
 import { type ReactiveEchoObject, type Expando, type SpaceMember } from '@dxos/react-client/echo';
@@ -22,7 +23,6 @@ import {
   mx,
 } from '@dxos/react-ui-theme';
 import { MessageHeading, MessageRoot } from '@dxos/react-ui-thread';
-import { nonNullable } from '@dxos/util';
 
 import { command } from './command-extension';
 import { useOnEditAnalytics } from '../hooks';
@@ -70,7 +70,7 @@ export const MessageContainer = ({
                 </Button>
               </Tooltip.Trigger>
               <Tooltip.Portal>
-                <Tooltip.Content classNames='z-[21]'>
+                <Tooltip.Content>
                   {editLabel}
                   <Tooltip.Arrow />
                 </Tooltip.Content>
@@ -91,7 +91,7 @@ export const MessageContainer = ({
                 </Button>
               </Tooltip.Trigger>
               <Tooltip.Portal>
-                <Tooltip.Content classNames='z-[21]'>
+                <Tooltip.Content>
                   {deleteLabel}
                   <Tooltip.Arrow />
                 </Tooltip.Content>
@@ -101,7 +101,9 @@ export const MessageContainer = ({
         </ButtonGroup>
       </MessageHeading>
       <TextboxBlock message={message} isAuthor={userIsAuthor} editing={editing} />
-      {message.parts?.filter(nonNullable).map((part, index) => <MessagePart key={index} part={part} />)}
+      {RefArray.allResolvedTargets(message.parts ?? []).map((part, index) => (
+        <MessagePart key={index} part={part} />
+      ))}
     </MessageRoot>
   );
 };
@@ -180,7 +182,7 @@ const MessageBlockObjectTile: MosaicTileComponent<ReactiveEchoObject<any>> = for
         <Surface
           role='card'
           limit={1}
-          data={{ content: item }}
+          data={{ subject: item }}
           draggableProps={draggableProps}
           fallback={title}
           {...props}

package/src/components/ThreadComplementary.tsx

@@ -4,33 +4,30 @@
 
 import React, { useEffect, useMemo } from 'react';
 
-import { LayoutAction, type Plugin, useIntentDispatcher, useResolvePlugins } from '@dxos/app-framework';
+import { createIntent, LayoutAction, type Plugin, useIntentDispatcher, useResolvePlugins } from '@dxos/app-framework';
 import { type ThreadType } from '@dxos/plugin-space';
-import { fullyQualifiedId } from '@dxos/react-client/echo';
+import { fullyQualifiedId, RefArray } from '@dxos/react-client/echo';
 import { useAttended } from '@dxos/react-ui-attention';
 import { nonNullable } from '@dxos/util';
 
 import { CommentsContainer } from '../components';
-import { THREAD_PLUGIN } from '../meta';
 import { ThreadAction, type ThreadProvides } from '../types';
 
 const providesThreadsConfig = (plugin: any): Plugin<ThreadProvides<any>> | undefined =>
   'thread' in plugin.provides ? (plugin as Plugin<ThreadProvides<any>>) : undefined;
 
 export const ThreadComplementary = ({
-  role,
   subject,
   drafts,
   current,
   showResolvedThreads,
 }: {
-  role: string;
   subject: any;
   drafts: ThreadType[] | undefined;
   current?: string;
   showResolvedThreads?: boolean;
 }) => {
-  const dispatch = useIntentDispatcher();
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   const threadsIntegrators = useResolvePlugins(providesThreadsConfig);
   const threadProvides = useMemo(() => threadsIntegrators.map((p) => p.provides.thread), [threadsIntegrators]);
@@ -40,9 +37,11 @@ export const ThreadComplementary = ({
   );
   const sort = useMemo(() => createSort?.(subject), [createSort, subject]);
 
+  const threadObjects = RefArray.allResolvedTargets(subject.threads ?? []);
+
   const threads = useMemo(() => {
-    return subject.threads.concat(drafts ?? []).filter(nonNullable) as ThreadType[];
-  }, [JSON.stringify(subject.threads), JSON.stringify(drafts)]);
+    return threadObjects.concat(drafts ?? []).filter(nonNullable) as ThreadType[];
+  }, [JSON.stringify(threadObjects), JSON.stringify(drafts)]);
 
   const detachedIds = useMemo(() => {
     return threads.filter(({ anchor }) => !anchor).map((thread) => fullyQualifiedId(thread));
@@ -72,34 +71,21 @@ export const ThreadComplementary = ({
           // TODO(wittjosiah): Should this be a thread-specific intent?
           //  The layout doesn't know about threads and this working depends on other plugins conditionally handling it.
           //  This may be overloading this intent or highjacking its intended purpose.
-          void dispatch?.([
-            {
-              action: LayoutAction.SCROLL_INTO_VIEW,
-              data: {
-                id: fullyQualifiedId(subject),
-                thread: threadId,
-                cursor: thread.anchor,
-              },
-            },
-          ]);
+          void dispatch?.(
+            createIntent(LayoutAction.ScrollIntoView, {
+              id: fullyQualifiedId(subject),
+              cursor: thread.anchor,
+              ref: threadId,
+            }),
+          );
         }
       }}
-      onThreadDelete={(thread) => {
-        return dispatch({ plugin: THREAD_PLUGIN, action: ThreadAction.DELETE, data: { subject, thread } });
-      }}
+      onThreadDelete={(thread) => dispatch(createIntent(ThreadAction.Delete, { thread, subject }))}
       onMessageDelete={(thread, messageId) =>
-        dispatch({
-          plugin: THREAD_PLUGIN,
-          action: ThreadAction.DELETE_MESSAGE,
-          data: { subject, thread, messageId },
-        })
+        dispatch(createIntent(ThreadAction.DeleteMessage, { thread, subject, messageId }))
       }
-      onThreadToggleResolved={(thread) =>
-        dispatch({ plugin: THREAD_PLUGIN, action: ThreadAction.TOGGLE_RESOLVED, data: { thread } })
-      }
-      onComment={(thread) => {
-        void dispatch({ action: ThreadAction.ON_MESSAGE_ADD, data: { thread, subject } });
-      }}
+      onThreadToggleResolved={(thread) => dispatch(createIntent(ThreadAction.ToggleResolved, { thread }))}
+      onComment={(thread) => dispatch(createIntent(ThreadAction.OnMessageAdd, { thread, subject }))}
     />
   );
 };

package/src/components/testing.ts

@@ -4,7 +4,7 @@
 
 import { Expando } from '@dxos/echo-schema';
 import { PublicKey } from '@dxos/keys';
-import { create } from '@dxos/live-object';
+import { create, makeRef } from '@dxos/live-object';
 import { MessageType, ThreadType } from '@dxos/plugin-space/types';
 import { faker } from '@dxos/random';
 import { type Identity } from '@dxos/react-client/halo';
@@ -12,20 +12,22 @@ import { type Identity } from '@dxos/react-client/halo';
 export const createChatThread = (identity: Identity) => {
   return create(ThreadType, {
     messages: Array.from({ length: 8 }).map(() =>
-      create(MessageType, {
-        sender: {
-          identityKey: faker.datatype.boolean() ? identity.identityKey.toHex() : PublicKey.random().toHex(),
-        },
-        timestamp: faker.date.recent().toISOString(),
-        text: faker.lorem.sentences(3),
-        parts: faker.helpers.multiple(
-          () =>
-            faker.datatype.boolean({ probability: 0.8 })
-              ? undefined
-              : create(Expando, { name: faker.lorem.sentence() }),
-          { count: { min: 1, max: 3 } },
-        ),
-      }),
+      makeRef(
+        create(MessageType, {
+          sender: {
+            identityKey: faker.datatype.boolean() ? identity.identityKey.toHex() : PublicKey.random().toHex(),
+          },
+          timestamp: faker.date.recent().toISOString(),
+          text: faker.lorem.sentences(3),
+          parts: faker.helpers.multiple(
+            () =>
+              faker.datatype.boolean({ probability: 0.8 })
+                ? undefined
+                : (makeRef(create(Expando, { name: faker.lorem.sentence() })) as any), // TODO(dmaretskyi): Fix types in schema.
+            { count: { min: 1, max: 3 } },
+          ),
+        }),
+      ),
     ),
   });
 };
@@ -34,13 +36,15 @@ export const createCommentThread = (identity: Identity) => {
   return create(ThreadType, {
     messages: faker.helpers.multiple(
       () =>
-        create(MessageType, {
-          sender: {
-            identityKey: faker.datatype.boolean() ? identity.identityKey.toHex() : PublicKey.random().toHex(),
-          },
-          timestamp: new Date().toISOString(),
-          text: faker.lorem.sentences(3),
-        }),
+        makeRef(
+          create(MessageType, {
+            sender: {
+              identityKey: faker.datatype.boolean() ? identity.identityKey.toHex() : PublicKey.random().toHex(),
+            },
+            timestamp: new Date().toISOString(),
+            text: faker.lorem.sentences(3),
+          }),
+        ),
       { count: { min: 2, max: 3 } },
     ),
   });

package/src/extensions/threads.ts

@@ -6,12 +6,13 @@ import { type Extension } from '@codemirror/state';
 import { EditorView } from '@codemirror/view';
 import { computed, effect } from '@preact/signals-core';
 
-import { type IntentDispatcher } from '@dxos/app-framework';
+import { createIntent, type PromiseIntentDispatcher } from '@dxos/app-framework';
+import { Ref } from '@dxos/echo-schema';
+import { RefArray } from '@dxos/live-object';
 import { type DocumentType } from '@dxos/plugin-markdown/types';
 import { ThreadType } from '@dxos/plugin-space/types';
 import { getSpace, getTextInRange, createDocAccessor, fullyQualifiedId } from '@dxos/react-client/echo';
 import { comments, createExternalCommentSync } from '@dxos/react-ui-editor';
-import { nonNullable } from '@dxos/util';
 
 import { ThreadAction, type ThreadState } from '../types';
 
@@ -19,14 +20,14 @@ import { ThreadAction, type ThreadState } from '../types';
 const getName = (doc: DocumentType, anchor: string): string | undefined => {
   if (doc.content) {
     const [start, end] = anchor.split(':');
-    return getTextInRange(createDocAccessor(doc.content, ['content']), start, end);
+    return getTextInRange(createDocAccessor(doc.content.target!, ['content']), start, end);
   }
 };
 
 /**
  * Construct plugins.
  */
-export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: IntentDispatcher): Extension => {
+export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: PromiseIntentDispatcher): Extension => {
   const space = doc && getSpace(doc);
   if (!doc || !space || !dispatch) {
     // Include no-op comments extension here to ensure that the facets are always present when they are expected.
@@ -36,7 +37,7 @@ export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: Inten
 
   // TODO(Zan): When we have the deepsignal specific equivalent of this we should use that instead.
   const threads = computed(() =>
-    [...doc.threads.filter(nonNullable), ...(state.drafts[fullyQualifiedId(doc)] ?? [])].filter(
+    [...RefArray.allResolvedTargets(doc.threads), ...(state.drafts[fullyQualifiedId(doc)] ?? [])].filter(
       (thread) => !(thread?.status === 'resolved'),
     ),
   );
@@ -44,8 +45,8 @@ export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: Inten
   return [
     EditorView.updateListener.of((update) => {
       if (update.docChanged) {
-        doc.threads.forEach((thread) => {
-          if (thread?.anchor) {
+        RefArray.allResolvedTargets(doc.threads).forEach((thread) => {
+          if (thread.anchor) {
             // Only update if the name has changed, otherwise this will cause an infinite loop.
             // Skip if the name is empty; this means comment text was deleted, but thread name should remain.
             const name = getName(doc, thread.anchor);
@@ -70,14 +71,7 @@ export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: Inten
       id: fullyQualifiedId(doc),
       onCreate: ({ cursor }) => {
         const name = getName(doc, cursor);
-        void dispatch({
-          action: ThreadAction.CREATE,
-          data: {
-            cursor,
-            name,
-            subject: doc,
-          },
-        });
+        void dispatch(createIntent(ThreadAction.Create, { cursor, name, subject: doc }));
       },
       onDelete: ({ id }) => {
         const draft = state.drafts[fullyQualifiedId(doc)];
@@ -88,7 +82,7 @@ export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: Inten
           }
         }
 
-        const thread = doc.threads.find((thread) => thread?.id === id);
+        const thread = doc.threads.find(Ref.hasObjectId(id))?.target;
         if (thread) {
           thread.anchor = undefined;
         }
@@ -96,21 +90,18 @@ export const threads = (state: ThreadState, doc?: DocumentType, dispatch?: Inten
       onUpdate: ({ id, cursor }) => {
         const thread =
           state.drafts[fullyQualifiedId(doc)]?.find((thread) => fullyQualifiedId(thread) === id) ??
-          doc.threads.find((thread) => thread?.id === id);
+          doc.threads.find(Ref.hasObjectId(id))?.target;
 
         if (thread instanceof ThreadType && thread.anchor) {
           thread.name = getName(doc, thread.anchor);
           thread.anchor = cursor;
         }
       },
-      onSelect: ({ selection: { current, closest } }) => {
-        void dispatch({
-          action: ThreadAction.SELECT,
-          data: {
-            current: current ?? closest,
-            skipOpen: true,
-          },
-        });
+      onSelect: ({ selection }) => {
+        const current = selection.current ?? selection.closest;
+        if (current) {
+          void dispatch(createIntent(ThreadAction.Select, { current, skipOpen: true }));
+        }
       },
     }),
   ];

package/src/hooks/analytics.ts

@@ -4,24 +4,20 @@
 
 import { useCallback } from 'react';
 
-import { useIntentDispatcher } from '@dxos/app-framework';
+import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
 import { type ReactiveObject } from '@dxos/live-object';
-import { ObservabilityAction } from '@dxos/plugin-observability/meta';
+import { ObservabilityAction } from '@dxos/plugin-observability/types';
 import { getSpace } from '@dxos/react-client/echo';
 import { useOnTransition } from '@dxos/react-ui';
 
 export const useAnalyticsCallback = (spaceId: string | undefined, name: string, meta?: any) => {
-  const dispatch = useIntentDispatcher();
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   return useCallback(
     (dynamicMeta?: any) => {
-      void dispatch({
-        action: ObservabilityAction.SEND_EVENT,
-        data: {
-          name,
-          properties: { ...meta, ...dynamicMeta, spaceId },
-        },
-      });
+      void dispatch(
+        createIntent(ObservabilityAction.SendEvent, { name, properties: { ...meta, ...dynamicMeta, spaceId } }),
+      );
     },
     [dispatch, name, meta, spaceId],
   );

package/src/types.ts

@@ -10,21 +10,72 @@ import type {
   SurfaceProvides,
   TranslationsProvides,
 } from '@dxos/app-framework';
+import { S } from '@dxos/echo-schema';
 import { type PanelProvides } from '@dxos/plugin-deck/types';
 import { type MarkdownExtensionProvides } from '@dxos/plugin-markdown';
 import { type SchemaProvides } from '@dxos/plugin-space';
-import { type ThreadType } from '@dxos/plugin-space/types';
+import { ChannelType, MessageType, ThreadType } from '@dxos/plugin-space/types';
+import { EchoObjectSchema } from '@dxos/react-client/echo';
 
 import { THREAD_PLUGIN } from './meta';
 
-const THREAD_ACTION = `${THREAD_PLUGIN}/action`;
-export enum ThreadAction {
-  CREATE = `${THREAD_ACTION}/create`,
-  SELECT = `${THREAD_ACTION}/select`,
-  DELETE = `${THREAD_ACTION}/delete`,
-  ON_MESSAGE_ADD = `${THREAD_ACTION}/on-message-add`,
-  DELETE_MESSAGE = `${THREAD_ACTION}/delete-message`,
-  TOGGLE_RESOLVED = `${THREAD_ACTION}/toggle-resolved`,
+export namespace ThreadAction {
+  const THREAD_ACTION = `${THREAD_PLUGIN}/action`;
+
+  export class Create extends S.TaggedClass<Create>()(`${THREAD_ACTION}/create`, {
+    input: S.Struct({
+      name: S.optional(S.String),
+      cursor: S.optional(S.String),
+      subject: S.optional(EchoObjectSchema),
+    }),
+    output: S.Struct({
+      object: S.Union(ChannelType, ThreadType),
+    }),
+  }) {}
+
+  export class Select extends S.TaggedClass<Select>()(`${THREAD_ACTION}/select`, {
+    input: S.Struct({
+      current: S.String,
+      skipOpen: S.optional(S.Boolean),
+    }),
+    output: S.Void,
+  }) {}
+
+  export class ToggleResolved extends S.TaggedClass<ToggleResolved>()(`${THREAD_ACTION}/toggle-resolved`, {
+    input: S.Struct({
+      thread: ThreadType,
+    }),
+    output: S.Void,
+  }) {}
+
+  export class Delete extends S.TaggedClass<Delete>()(`${THREAD_ACTION}/delete`, {
+    input: S.Struct({
+      thread: ThreadType,
+      subject: EchoObjectSchema,
+      cursor: S.optional(S.String),
+    }),
+    output: S.Void,
+  }) {}
+
+  // TODO(wittjosiah): Rename?
+  export class OnMessageAdd extends S.TaggedClass<OnMessageAdd>()(`${THREAD_ACTION}/on-message-add`, {
+    input: S.Struct({
+      thread: ThreadType,
+      subject: EchoObjectSchema,
+    }),
+    output: S.Void,
+  }) {}
+
+  export class DeleteMessage extends S.TaggedClass<DeleteMessage>()(`${THREAD_ACTION}/delete-message`, {
+    input: S.Struct({
+      thread: ThreadType,
+      subject: EchoObjectSchema,
+      messageId: S.String,
+      message: S.optional(MessageType),
+      messageIndex: S.optional(S.Number),
+    }),
+    output: S.Void,
+  }) {}
 }
 
 // TODO(Zan): Move this to the plugin-space plugin or another common location when we implement threads in sheets.